r762 - in zope-zwiki/trunk: . debian i18n pagetypes plugins plugins/tracker skins/zwiki wikis/basic

Fabio Tranchitella kobold at alioth.debian.org
Sun Apr 8 14:55:29 UTC 2007


Author: kobold
Date: 2007-04-08 14:55:27 +0000 (Sun, 08 Apr 2007)
New Revision: 762

Modified:
   zope-zwiki/trunk/Admin.py
   zope-zwiki/trunk/Admin_tests.py
   zope-zwiki/trunk/CHANGES
   zope-zwiki/trunk/CMF.py
   zope-zwiki/trunk/CONTRIBUTORS
   zope-zwiki/trunk/Defaults.py
   zope-zwiki/trunk/Diff.py
   zope-zwiki/trunk/Diff_tests.py
   zope-zwiki/trunk/Editing.py
   zope-zwiki/trunk/Mail.py
   zope-zwiki/trunk/Outline.py
   zope-zwiki/trunk/OutlineSupport.py
   zope-zwiki/trunk/README
   zope-zwiki/trunk/REPO_POLICY
   zope-zwiki/trunk/RSS.py
   zope-zwiki/trunk/TODO
   zope-zwiki/trunk/Utils.py
   zope-zwiki/trunk/Views.py
   zope-zwiki/trunk/Views_tests.py
   zope-zwiki/trunk/ZWikiPage.py
   zope-zwiki/trunk/ZWikiPage_tests.py
   zope-zwiki/trunk/__init__.py
   zope-zwiki/trunk/debian/changelog
   zope-zwiki/trunk/i18n/af.po
   zope-zwiki/trunk/i18n/ar.po
   zope-zwiki/trunk/i18n/de.po
   zope-zwiki/trunk/i18n/en_GB.po
   zope-zwiki/trunk/i18n/es.po
   zope-zwiki/trunk/i18n/et.po
   zope-zwiki/trunk/i18n/fi.po
   zope-zwiki/trunk/i18n/fr.po
   zope-zwiki/trunk/i18n/he.po
   zope-zwiki/trunk/i18n/hu.po
   zope-zwiki/trunk/i18n/it.po
   zope-zwiki/trunk/i18n/ja.po
   zope-zwiki/trunk/i18n/nl.po
   zope-zwiki/trunk/i18n/pl.po
   zope-zwiki/trunk/i18n/pt.po
   zope-zwiki/trunk/i18n/pt_BR.po
   zope-zwiki/trunk/i18n/ro.po
   zope-zwiki/trunk/i18n/ru.po
   zope-zwiki/trunk/i18n/sv.po
   zope-zwiki/trunk/i18n/th.po
   zope-zwiki/trunk/i18n/tr.po
   zope-zwiki/trunk/i18n/zh_CN.po
   zope-zwiki/trunk/i18n/zh_TW.po
   zope-zwiki/trunk/i18n/zwiki.pot
   zope-zwiki/trunk/pagetypes/__init__.py
   zope-zwiki/trunk/pagetypes/html.py
   zope-zwiki/trunk/pagetypes/moin.py
   zope-zwiki/trunk/pagetypes/plaintext.py
   zope-zwiki/trunk/plugins/__init__.py
   zope-zwiki/trunk/plugins/tracker/FilterIssues.dtml
   zope-zwiki/trunk/plugins/tracker/IssueBrowser.dtml
   zope-zwiki/trunk/plugins/tracker/IssueTracker.dtml
   zope-zwiki/trunk/plugins/tracker/tracker.py
   zope-zwiki/trunk/skins/zwiki/HelpPage.stx
   zope-zwiki/trunk/skins/zwiki/RecentChanges.dtml
   zope-zwiki/trunk/skins/zwiki/SearchPage.dtml
   zope-zwiki/trunk/skins/zwiki/backlinks.pt
   zope-zwiki/trunk/skins/zwiki/pageheader.pt
   zope-zwiki/trunk/version.txt
   zope-zwiki/trunk/wikis/basic/FrontPage.stx
   zope-zwiki/trunk/wikis/basic/standard_error_message.dtml
Log:
New upstream release.


Modified: zope-zwiki/trunk/Admin.py
===================================================================
--- zope-zwiki/trunk/Admin.py	2007-04-08 14:54:05 UTC (rev 761)
+++ zope-zwiki/trunk/Admin.py	2007-04-08 14:55:27 UTC (rev 762)
@@ -212,11 +212,11 @@
         if not self.creation_time:
             pass
         elif type(self.creation_time) is not StringType:
-            self.creation_time = self.creation_time.ISO()
+            self.creation_time = self.creation_time.toZone('UTC').ISO()
             changed = 1
         elif len(self.creation_time) != 19:
             try: 
-                self.creation_time = DateTime(self.creation_time).ISO()
+                self.creation_time = DateTime(self.creation_time).toZone('UTC').ISO()
                 changed = 1
             except DateTimeSyntaxError:
                 # can't convert to ISO, just leave it be
@@ -420,12 +420,8 @@
             cid = self.catalog().getId()
             for p in self.pageObjects():
                 n = n + 1
-                try:
-                    BLATHER('indexing page %d %s in %s'%(n,p.id(),cid))
-                    p.index_object(log=0)
-                except:
-                    BLATHER('failed to index page %d %s: %s' \
-                            % (n,p.id(),formattedTraceback()))
+                BLATHER('indexing page %d %s in %s'%(n,p.id(),cid))
+                p.index_object(log=0)
             BLATHER('indexing complete, %d pages processed' % n)
         if REQUEST:
             REQUEST.RESPONSE.redirect(self.pageUrl())

Modified: zope-zwiki/trunk/Admin_tests.py
===================================================================
--- zope-zwiki/trunk/Admin_tests.py	2007-04-08 14:54:05 UTC (rev 761)
+++ zope-zwiki/trunk/Admin_tests.py	2007-04-08 14:55:27 UTC (rev 762)
@@ -64,30 +64,31 @@
         self.assertEqual(self.page.newPageTypeIdFor('nosuchtype'), self.page.defaultPageType())
 
 class AddWikiTests(unittest.TestCase):
+    pass
 
-    TEMPLATES = (
-        ('zwikidotorg',
-         (('AnnoyingQuote',       'structuredtext'),
-          ('BookMarks',           'structuredtext'),
-          ('FrontPage',           'structuredtext'),
-          ('HelpPage',            'structuredtext'),
-          ('HierarchalStructure', 'structuredtext'),
-          ('JumpSearch',          'htmldtml'),
-          ('RecentChanges',       'htmldtml'),
-          ('RemoteWikiLinks',     'structuredtext'),
-          ('RemoteWikiURL',       'structuredtext'),
-          ('SearchPage',          'htmldtml'),
-          ('StructuredTextRules', 'structuredtext'),
-          ('TextFormattingRules', 'structuredtext'),
-          ('TimeZone',            'structuredtext'),
-          ('UserName',            'structuredtext'),
-          ('UserOptions',         'structuredtextdtml'),
-          ('WikiName',            'structuredtext'),
-          ('WikiWikiWeb',         'structuredtext'),
-          ('ZWiki',               'structuredtext'),
-          ('ZopeDotOrg',          'structuredtext'),
-          )),
-        )                               # add parents
+#     PAGES = (
+#         ('zwikidotorg',
+#          (('AnnoyingQuote',       'structuredtext'),
+#           ('BookMarks',           'structuredtext'),
+#           ('FrontPage',           'structuredtext'),
+#           ('HelpPage',            'structuredtext'),
+#           ('HierarchalStructure', 'structuredtext'),
+#           ('JumpSearch',          'htmldtml'),
+#           ('RecentChanges',       'htmldtml'),
+#           ('RemoteWikiLinks',     'structuredtext'),
+#           ('RemoteWikiURL',       'structuredtext'),
+#           ('SearchPage',          'htmldtml'),
+#           ('StructuredTextRules', 'structuredtext'),
+#           ('TextFormattingRules', 'structuredtext'),
+#           ('TimeZone',            'structuredtext'),
+#           ('UserName',            'structuredtext'),
+#           ('UserOptions',         'structuredtextdtml'),
+#           ('WikiName',            'structuredtext'),
+#           ('WikiWikiWeb',         'structuredtext'),
+#           ('ZWiki',               'structuredtext'),
+#           ('ZopeDotOrg',          'structuredtext'),
+#           )),
+#         )                               # add parents
 
 #I think I've had enough
 #
@@ -118,7 +119,7 @@
 #        zc = self.ZopeContext
 #
 #        # for each sample wikiweb,
-#        for wikitype, pages in self.TEMPLATES:
+#        for wikitype, pages in self.PAGES:
 #
 #            # create one
 #            # fake form input

Modified: zope-zwiki/trunk/CHANGES
===================================================================
--- zope-zwiki/trunk/CHANGES	2007-04-08 14:54:05 UTC (rev 761)
+++ zope-zwiki/trunk/CHANGES	2007-04-08 14:55:27 UTC (rev 762)
@@ -1,4 +1,171 @@
+Zwiki 0.59.0 2007/04/02
+=======================
+
+Catchup since the last release in november: a truckload of bugfixes from
+Sascha Welter, Frank Laurijssens and many others (YAY!), support for
+conditional http get, skins code cleanup, translation updates and more.
+
+Upgrade notes
+
+  * The standard issuetracker and filterissues pages now support sorting
+    on issue name and reverse sorting (#14). To enable sorting by name,
+    visit SOMEPAGE/setupTracker (as manager) to add a required catalog
+    field.
+
+  * If you have customized IssueTracker and/or FilterIssues pages, you
+    might want to replace them with the latest code. To do this, review
+    and back up the changes you made. Then delete both pages, reinstall
+    them with SOMEPAGE/setupTracker?pages=1 (as manager), and re-apply
+    your customizations.
+  
+Installing
+
+  * show accurate page hierarchy after adding a new wiki
+
+  * #1313, updated FrontPage links in basic wiki template (Frank Laurijssens)
+
+Configuring
+
+  * reparent now obeys the edits_need_username option, so reparenting will
+    require a username when that property is true
+
+  * #1077 implement Conditional HTTP Get handling (aka If-modified-since /
+    304) for pages, stylesheet and RSS feeds.  This feature makes zwiki
+    pages more browser- and spider-cache friendly, which can potentially
+    greatly reduce page rendering time and load on your zope server.  It
+    is off by default as it doesn't yet work with Firefox's default
+    settings (requiring a reload after each edit).  See
+    http://zwiki.org/HowToEnableConditionalHTTPGET (Sascha Welter)
+
+  * #974 Property to ignore certain WikiNames Credits to Matt Kunze from
+    DataSplice. Patch logic is from him, I just simplified it a bit and
+    tested it. This has yet to be documented somewhere. (Sascha Welter)
+
+  * #1227 comment form vulnerability (Sascha Welter)
+
+Browsing
+
+  * make default site logo work with zope 2.10 (zope bug 2302)
+
+  * recent changes default period is now a week, not a day
+
+  * #976 cosmetics on "last edited xx ago" link credits to "Andreas", we
+    check if lastlog contains anything and omit the parentheses if
+    not. (Sascha Welter)
+
+  * format comment header for HTML pages #1085 (Sascha Welter)
+
+  * #1304 last-edited-by is not shown when user ID is numerical 
+    (Sascha Welter)
+
+  * #1303 Illegal utf-8 handling in Utils.py summary - Credits go to Hideo
+    at Yokohama! This patch had us worried about performance, since taking
+    a summary of a long wiki page might be slow. Some preliminary testing
+    showed that the performance price is rather low, but for sites with
+    non-ascii content the patch is really worth it. Not only will it stop
+    producing illegal utf-8, but without the patch the length of the
+    summary will never be right. (Sascha Welter)
+
+  * #1298 non-ascii characters in page names are breaking search functionality
+    (Sascha Welter)
+
+  * don't let a non-wiki page break interwiki link rendering
+
+Editing
+
+  * #1157 after reverting changes, reset last edit time make test passes,
+    tested on my zwiki and plone-zwiki instance. (Sascha Welter)
+
+  * #1314 use UTC for creation_time too (Sascha Welter)
+
+  * #1186 fix for last_edited_date losing time zone information -
+    converting to UTC This might be only relevant at hosts that do not
+    have locale support on their operating system (e.g. *BSD, Mac OS
+    X). Further tests in that direction might be necessary. It definitely
+    fixes the problem on Mac OS X. (Sascha Welter)
+
+Mail
+
+  * #1299 - mail out in plone works, could use more error handling though
+    (Sascha Welter)
+
+Feeds
+
+  * #1083 feed validation: encode & and < (Sascha Welter)
+
+  * #1083 escape html in rss feeds (Sascha Welter)
+
+  * #1294 - changes to get rss feeds to validate pages_rss and changes_rss
+    made to validate with feedvalidator.org
+
+    - Date formats in head section had to be adjusted
+    - feedvalidator.org wanted a guid element (even though specs say it's
+      optional) 
+    (Sascha Welter)
+
+Issue tracking
+
+  * #14 make the zwikitracker list allow filtering & sorting
+    (Frank Laurijssens)
+
+  * Revert allow_dtml change (#1281) (Frank Laurijssens)
+
+  * self-document the IssueTracker pages for missing allow_dtml (Sascha Welter)
+
+  * #1281 Frank's patch to set up dtml for IssueTracker pages with extra
+    check (Sascha Welter)
+
+  * #1043 Frank's patch to color issue links in "backlinks" (Sascha Welter)
+
+  * #1008 show issue form on plaintext issues, patch from Bill Page
+    (Sascha Welter)
+
+General
+
+  * make skin/template/macro handling more general, add support for
+    alternate filesystem skins, rewrite skin system developer docs
+
+  * clean up stylesheet lookup: look for a template named "stylesheet.css"
+    or "stylesheet" in that order
+
+  * siblingsAsList can include current page + sorting optional This is
+    useful mainly for "nautica" style wikipage.pt. In those one often
+    wants to make a list of pages "on the same level" as the current
+    page. That list usually includes the current page and is not sorted
+    alphabetically, but instead left in the order defined in the
+    /backlinks page. (Sascha Welter)
+  
+  * many fixes to make Zwiki's exception handling more precise. This may
+    reveal some new failure scenarios which were previously hidden
+    (Sascha Welter)
+
+  * fix a syntax error in tests
+
+  * fix a missing doublequote in standard_error_message
+
+  * clarify relicensing clause
+
+  * bumped year in copyright statement (Sascha Welter)
+
+  * signed (Sascha Welter)
+
+  * Signed CONTRIBUTORS (Frank Laurijssens)
+
+Translations
+
+  * de (Stefan Kose)
+
+  * es (Francisco Mañas)
+
+  * fr (Nicolas Velin)
+
+  * zh_CN, zh_TW (nwind)
+
+  * nl (Frank Laurijssens)
+
+
 Zwiki 0.58.0 2006/11/01
+=======================
 
 Simpler skin customization, bugfixes, cleanups.
 

Modified: zope-zwiki/trunk/CMF.py
===================================================================
--- zope-zwiki/trunk/CMF.py	2007-04-08 14:54:05 UTC (rev 761)
+++ zope-zwiki/trunk/CMF.py	2007-04-08 14:55:27 UTC (rev 762)
@@ -56,9 +56,9 @@
         security.declarePrivate('setModificationDate')
         def setModificationDate(self, modification_date=None):
             if modification_date is None:
-                self.last_edit_time = DateTime().ISO()
+                self.last_edit_time = DateTime().toZone('UTC').ISO()
             else:
-                self.last_edit_time = self._datify(modification_date).ISO()
+                self.last_edit_time = self._datify(modification_date).toZone('UTC').ISO()
 
         security.declarePublic('modified')
         def modified(self):

Modified: zope-zwiki/trunk/CONTRIBUTORS
===================================================================
--- zope-zwiki/trunk/CONTRIBUTORS	2007-04-08 14:54:05 UTC (rev 761)
+++ zope-zwiki/trunk/CONTRIBUTORS	2007-04-08 14:55:27 UTC (rev 762)
@@ -19,8 +19,9 @@
   GPL-compatible license, such as ZPL, if clearly noted as such; 
   or are public domain
 
-- may be relicensed under official future versions of their license,
-  at the Zwiki project manager's discretion
+- may be relicensed under official future versions of their license, at
+  the Zwiki project manager's discretion. Eg GPL v2 code can be rereleased
+  as GPL v3 later.
 
 - are free of known patent violations or copyright violations
 
@@ -34,6 +35,8 @@
 Encolpe Degoute <encolpe at colpi.info> - french translation, plone adjustment, extend tracker capacity
 Frank Laurijssens <frank at laurijssens.nl> - 
 John Riley <riley at uic.com> - 
+Sascha Welter <betabug.darcs at betabug.ch> -
+Ben Laurijssens <ben at laurijssens.nl> - contributed his beautiful energy and likeness to energize our site
 
 
 Contributors who have not yet signed

Modified: zope-zwiki/trunk/Defaults.py
===================================================================
--- zope-zwiki/trunk/Defaults.py	2007-04-08 14:54:05 UTC (rev 761)
+++ zope-zwiki/trunk/Defaults.py	2007-04-08 14:55:27 UTC (rev 762)
@@ -23,6 +23,10 @@
 DOUBLE_PARENTHESIS_LINKS = 0
 BORING_PAGES = ['TestPage','SandBox'] # pages we don't want to see/hear much
 IDS_TO_AVOID = ['RESPONSE','REQUEST','Epoz','epoz','URL','outline','recycle_bin']
+CONDITIONAL_HTTP_GET = 0     # handle If-modified-since headers with 304 responses
+CONDITIONAL_HTTP_GET_IGNORE = [ 'allow_dtml' ] 
+                             # ignore pages with these properties set to 
+                             # non-False values
 
 # Standard metadata fields which Zwiki will expect in page brain objects.
 # Plugins will add more of these.

Modified: zope-zwiki/trunk/Diff.py
===================================================================
--- zope-zwiki/trunk/Diff.py	2007-04-08 14:54:05 UTC (rev 761)
+++ zope-zwiki/trunk/Diff.py	2007-04-08 14:55:27 UTC (rev 762)
@@ -120,11 +120,16 @@
         rev = int(rev)
         try:
             historyentry = self.history()[rev]
-            key = historyentry['key']
-            serial = apply(pack, ('>HHHH',)+tuple(map(atoi, split(key,'.'))))
-            return historicalRevision(self, serial)
-        except: # we don't have a version that old
+        except (IndexError, AttributeError):
+            # IndexError - we don't have a version that old
+            # AttributeError - new object, no history yet,
+            # due to creation of page in unit tests without
+            # editing them yet - doesn't really happen in real use
+            # I guess
             return None
+        key = historyentry['key']
+        serial = apply(pack, ('>HHHH',)+tuple(map(atoi, split(key,'.'))))
+        return historicalRevision(self, serial)
 
     security.declareProtected(Permissions.View, 'revisionInfoFor')
     def revisionInfoFor(self, rev):
@@ -180,6 +185,7 @@
                     _('You are not authorized to rename this ZWiki Page.'))
             self.rename(old.pageName())
         self.setLastEditor(REQUEST)
+        self.last_edit_time = old.last_edit_time
         self.setLastLog('revert')
         self.index_object()
         self.sendMailToEditSubscribers(
@@ -218,7 +224,11 @@
                 n += 1
                 try:
                     p.revertEditsBy(username,REQUEST=REQUEST)
-                except:
+                except (IndexError, AttributeError):
+                    # IndexError - we don't have a version that old
+                    # AttributeError - new object, no history yet,
+                    # due to creation of page in unit tests
+                    # - doesn't really happen in real use I guess
                     BLATHER('failed to revert edits by %s at %s: %s' \
                             % (username,p.id(),formattedTraceback()))
                 if batch and n % batch == 0:
@@ -234,14 +244,19 @@
         rev = int(rev)
         try:
             note = self.history()[rev]['description']
-            match = re.search(r'"(.*)"',note)
-            if match:
-                if withQuotes: return match.group()
-                else: return match.group(1)
-            else:
-                return ''
-        except:
+        except (IndexError, AttributeError):
+            # IndexError - we don't have a version that old
+            # AttributeError - new object, no history yet,
+            # due to creation of page in unit tests without
+            # editing them yet - doesn't really happen in real use
+            # I guess
             return '' # we don't have a version that old
+        match = re.search(r'"(.*)"',note)
+        if match:
+            if withQuotes: return match.group()
+            else: return match.group(1)
+        else:
+            return ''
 
     def htmlDiff(self,revA=1,revB=0,a=None,b=None):
         """

Modified: zope-zwiki/trunk/Diff_tests.py
===================================================================
--- zope-zwiki/trunk/Diff_tests.py	2007-04-08 14:54:05 UTC (rev 761)
+++ zope-zwiki/trunk/Diff_tests.py	2007-04-08 14:55:27 UTC (rev 762)
@@ -53,3 +53,27 @@
 12</span>
 ''')
 
+    def test_revertEditsEverywhereBy(self):
+        p = self.page
+        p.last_editor = 'fred'
+        p.REQUEST.cookies['zwiki_username'] = 'fred'
+        p.edit(text='test',REQUEST=p.REQUEST)
+        p.append(text='1',REQUEST=p.REQUEST)
+        self.assertEqual(p.last_editor,'fred')
+        # if the user in question didn't edit: no change
+        before = p.read()
+        p.revertEditsEverywhereBy('joe')
+        self.assertEqual(p.read(), before)
+        # now let him change something
+        p.REQUEST.cookies['zwiki_username'] = 'joe'
+        p.edit(text='2',REQUEST=p.REQUEST)
+        self.assertEqual(p.last_editor,'joe')
+        self.assertNotEqual(p.read(), before)
+        # reverting should get us to where we were before:
+        p.revertEditsEverywhereBy('joe')
+        # self.assertEqual(p.read(), before)
+        # self.assertEqual(p.last_editor,'fred')
+        # this doesn't really work
+        # because the page objects in the tests don't have
+        # real history?
+        # for the moment we're just testing the "except" clause

Modified: zope-zwiki/trunk/Editing.py
===================================================================
--- zope-zwiki/trunk/Editing.py	2007-04-08 14:54:05 UTC (rev 761)
+++ zope-zwiki/trunk/Editing.py	2007-04-08 14:55:27 UTC (rev 762)
@@ -161,7 +161,7 @@
         oldtext = self.read()
         if not username:
             username = self.usernameFrom(REQUEST)
-            if re.match(r'^[0-9\.\s]*$',username): username = ''
+            if re.match(r'^(?:\d{1,3}\.){3}\d{1,3}$',username): username = ''
         subject_heading = self.cleanupText(subject_heading)
         text = self.cleanupText(text)
         # some subtleties here: we ensure the page comment and mail-out
@@ -910,7 +910,7 @@
             # if we have no REQUEST, at least update last editor
             self.last_editor_ip = ''
             self.last_editor = ''
-        self.last_edit_time = DateTime(time.time()).ISO()
+        self.last_edit_time = DateTime(time.time()).toZone('UTC').ISO()
 
     def hasCreatorInfo(self):
         """
@@ -925,7 +925,7 @@
         """
         record my creator, creator_ip & creation_time
         """
-        self.creation_time = DateTime(time.time()).ISO()
+        self.creation_time = DateTime(time.time()).toZone('UTC').ISO()
         if REQUEST:
             self.creator_ip = REQUEST.REMOTE_ADDR
             self.creator = self.usernameFrom(REQUEST)

Modified: zope-zwiki/trunk/Mail.py
===================================================================
--- zope-zwiki/trunk/Mail.py	2007-04-08 14:54:05 UTC (rev 761)
+++ zope-zwiki/trunk/Mail.py	2007-04-08 14:55:27 UTC (rev 762)
@@ -503,7 +503,9 @@
         address = (self.fromProperty() or
                    #self.usersEmailAddress() or
                    self.replyToProperty())
-        realname = self.usernameFrom(REQUEST,ip_address=0) or _('anonymous')
+        # splitlines to fend off header injection attacks from spammers
+        lines = self.usernameFrom(REQUEST,ip_address=0).splitlines()
+        realname = lines and lines[0] or _('anonymous')
         return '%s (%s)' % (address, realname)
 
     def replyToHeader(self):
@@ -740,7 +742,37 @@
         #        unique.append(r)
         #if self.toProperty() in unique: unique.remove(self.toProperty())
 
-        msg = """\
+        mailhost = self.mailhost()
+        if mailhost.meta_type == 'Secure Mail Host':
+            msg = text + "\n\n" +  self.signature(msgid)
+            additional_headers = {
+                                'Reply-To':self.replyToHeader(), \
+                                'X-Zwiki-Version':self.zwiki_version(), \
+                                'X-BeenThere':self.xBeenThereHeader(), \
+                                'List-Id':self.listIdHeader(), \
+                                'List-Post':self.listPostHeader(), \
+                                'List-Subscribe':'<'+self.pageUrl()+'/subscribeform>', \
+                                'List-Unsubscribe': '<'+self.pageUrl()+'/subscribeform>', \
+                                'List-Archive':'<'+self.pageUrl()+'>', \
+                                'List-Help':'<'+self.wikiUrl()+'>' }
+            if not in_reply_to:
+                additional_headers['Message-ID']=msgid
+            else:
+                additional_headers['Message-ID']=msgid + \
+                    '\nIn-reply-to: %s' % in_reply_to.splitlines()[0]
+            # XXX should we do error checking and reporting here, similar to below
+            # where we do it for normal mail hosts?
+            mailhost.secureSend(msg,
+                                mto=tohdr,
+                                mfrom=self.fromHeader(REQUEST), \
+                                subject=self.subjectHeader(subject,subjectSuffix), \
+                                mbcc=self.bccHeader(recipients), \
+                                charset='utf-8', \
+                                **additional_headers )
+
+        else: # normal "Mail Host" or "Maildrop Host"
+
+            msg = """\
 From: %s
 Reply-To: %s
 To: %s
@@ -760,46 +792,52 @@
 %s
 %s
 """ \
-        % (self.fromHeader(REQUEST),
-           self.replyToHeader(),
-           tohdr,
-           self.bccHeader(recipients),
-           self.subjectHeader(subject,subjectSuffix),
-           msgid,
-           (in_reply_to and '\nIn-reply-to: %s' % in_reply_to) or '',
-           self.zwiki_version(),
-           self.xBeenThereHeader(),
-           self.listIdHeader(),
-           self.listPostHeader(),
-           self.pageUrl(),
-           self.pageUrl(),
-           self.pageUrl(),
-           self.wikiUrl(),
-           text,
-           self.signature(msgid),
-           )
-        # send
-        try:
-            self.mailhost().send(msg)
-            #BLATHER('sent mail:\n%s' % msg)
-            BLATHER('sent mail to subscribers:\nTo: %s\nBcc: %s' % (
-                tohdr,self.bccHeader(recipients)))
-        # if there is any failure, notify admin or log
-        except:
-            BLATHER('failed to send mail to %s: %s' % (recipients,
-                                                       formattedTraceback()))
-            admin = getattr(self.folder(),'mail_admin',None)
-            if admin:
-                try:
-                    self.sendMailTo( #XXX possible infinite recursion ?
-                        [],text,REQUEST,
-                        subjectSuffix='ERROR, subscriber mailout failed',
-                        to=admin)
-                except:
-                    BLATHER('failed to send error report to admin: %s' % \
-                            formattedTraceback())
+            % (self.fromHeader(REQUEST),
+               self.replyToHeader(),
+               tohdr,
+               self.bccHeader(recipients),
+               self.subjectHeader(subject,subjectSuffix),
+               msgid,
+               (in_reply_to and '\nIn-reply-to: %s' % in_reply_to.splitlines()[0]) or '',
+               # splitlines to fend off header injection attacks from spammers
+               self.zwiki_version(),
+               self.xBeenThereHeader(),
+               self.listIdHeader(),
+               self.listPostHeader(),
+               self.pageUrl(),
+               self.pageUrl(),
+               self.pageUrl(),
+               self.wikiUrl(),
+               text,
+               self.signature(msgid),
+               )
 
+            # send
+            try:
+                mailhost.send(msg)
+                #BLATHER('sent mail:\n%s' % msg)
+                BLATHER('sent mail to subscribers:\nTo: %s\nBcc: %s' % (
+                    tohdr,self.bccHeader(recipients)))
 
+            # if there is any failure, notify admin or log
+            except: # XXX this bare except doesn't help for a lot of stuff!
+                    # e.g. if the MailHost is configured to an inexisting mail server
+                    # only the BLATHER would do anything in that case, 
+                    # admin mails fail too of course
+                BLATHER('failed to send mail to %s: %s' % (recipients,
+                                                           formattedTraceback()))
+                admin = getattr(self.folder(),'mail_admin',None)
+                if admin:
+                    try:
+                        self.sendMailTo( #XXX possible infinite recursion ?
+                            [],text,REQUEST,
+                            subjectSuffix='ERROR, subscriber mailout failed',
+                            to=admin)
+                    except:
+                        BLATHER('failed to send error report to admin: %s' % \
+                                formattedTraceback())
+
+
         # XXX experimental
         #self.sendCiaBotMail
 #    def sendCiaBotMail(self):

Modified: zope-zwiki/trunk/Outline.py
===================================================================
--- zope-zwiki/trunk/Outline.py	2007-04-08 14:54:05 UTC (rev 761)
+++ zope-zwiki/trunk/Outline.py	2007-04-08 14:55:27 UTC (rev 762)
@@ -307,17 +307,21 @@
         parents = self.parentmap().get(node,None)
         if parents: return parents[0]
         else: return None
-    def siblings(self,node): 
+    def siblings(self,node,include_me=False,sort_alpha=True): 
         """
         Return a nesting/list representing node's siblings.
 
         Ie, any other children of node's first parent. Any siblings by the
         other parents are not included.
+        Optionally include the current page (node) in the list.
+        Optionally suppress alphabetical sorting of result.
         """
         parent = self.firstParent(node)
         sibs = self.children(parent)
-        sibs.remove(node)
-        sibs.sort()
+        if not include_me:
+            sibs.remove(node)
+        if sort_alpha:
+            sibs.sort()
         return sibs
     def children(self,node=None):
         """

Modified: zope-zwiki/trunk/OutlineSupport.py
===================================================================
--- zope-zwiki/trunk/OutlineSupport.py	2007-04-08 14:54:05 UTC (rev 761)
+++ zope-zwiki/trunk/OutlineSupport.py	2007-04-08 14:55:27 UTC (rev 762)
@@ -216,23 +216,25 @@
                 return getattr(self.REQUEST,prop) and 1
             elif hasattr(self.aq_base,prop):
                 return getattr(self,prop) and 1
-            elif self.primaryParent():
-                # poor caching
-                try: return self.primaryParent().subtopicsEnabled() 
-                except:
-                    # experimental: support all-brains
-                    try: return self.primaryParent().getObject().subtopicsEnabled() 
-                    except: # XXX still run into errors here, investigate
-                        BLATHER('DEBUG: error in subtopicsEnabled for %s, primaryParent is: %s'\
-                             % (self.id(),`self.primaryParent()`))
-                        return not (getattr(getattr(self,'REQUEST',None),
-                                            'zwiki_displaymode',
-                                            None) == 'minimal')
             else:
-                #return not (getattr(getattr(self,'REQUEST',None),
-                #                    'zwiki_displaymode',
-                #                    None) == 'minimal')
-                return 1
+                primaryParent = self.primaryParent() # call only once
+                if primaryParent:
+                    try: return primaryParent.subtopicsEnabled()
+                    except AttributeError:
+                        # experimental: support all-brains
+                        try: return primaryParent.getObject().subtopicsEnabled()
+                        except AttributeError: # XXX still run into errors here, investigate
+                            BLATHER('DEBUG: error in subtopicsEnabled for %s, primaryParent is: %s'\
+                                 % (self.id(),`primaryParent`))
+                            return not (getattr(getattr(self,'REQUEST',None),
+                                                'zwiki_displaymode',
+                                                None) == 'minimal')
+                else:
+                    #return not (getattr(getattr(self,'REQUEST',None),
+                    #                    'zwiki_displaymode',
+                    #                    None) == 'minimal')
+                    return 1
+
         else:
             return 0
 
@@ -371,6 +373,10 @@
         Page names may be ids, or fuzzy, even partial. Any which do not
         resolve to an existing page or are duplicates will be ignored.
         """
+        if not self.checkSufficientId(REQUEST):
+            return self.denied(
+                _("Sorry, this wiki doesn't allow anonymous reparenting. Please configure a username in options first."))
+
         oldparents = self.getParents()
         # clean the arguments carefully to avoid parenting anomalies
         # page mgmt form must use pagename field:
@@ -528,13 +534,16 @@
         except: return [] # XXX temp, get rid of
 
     security.declareProtected(Permissions.View, 'siblingsAsList')
-    def siblingsAsList(self):
+    def siblingsAsList(self,include_me=False,sort_alpha=True):
         """
         Return the names of other pages sharing my first parent.
 
         Siblings by my other parents are ignored.
+        Optionally include the current page in the list.
+        Optionally suppress alphabetical sorting of result.
         """
-        return self.wikiOutline().siblings(self.pageName())
+        return self.wikiOutline().siblings(self.pageName(), \
+                include_me=include_me,sort_alpha=sort_alpha)
 
     security.declareProtected(Permissions.View, 'childrenAsList')
     def childrenAsList(self):

Modified: zope-zwiki/trunk/README
===================================================================
--- zope-zwiki/trunk/README	2007-04-08 14:54:05 UTC (rev 761)
+++ zope-zwiki/trunk/README	2007-04-08 14:55:27 UTC (rev 762)
@@ -3,6 +3,6 @@
 For documentation and assistance, please see http://zwiki.org .
 All feedback, bug reports and other help appreciated.
 
-(c) 1999-2004 Simon Michael <simon at joyful.com> for the zwiki community.
+(c) 1999-2007 Simon Michael <simon at joyful.com> for the zwiki community.
 This product is released under the GNU General Public License.  
 All rights reserved, all disclaimers apply, etc.

Modified: zope-zwiki/trunk/REPO_POLICY
===================================================================
--- zope-zwiki/trunk/REPO_POLICY	2007-04-08 14:54:05 UTC (rev 761)
+++ zope-zwiki/trunk/REPO_POLICY	2007-04-08 14:55:27 UTC (rev 762)
@@ -15,8 +15,8 @@
   darcs send http://zwiki.org/repos/ZWiki). Patches are forwarded to
   Simon Michael for approval.
 
-- (when I get this working..) Patches digitally signed by approved
-  committers are applied immediately.
+- Patches digitally signed by approved committers are applied 
+  immediately.
 
 - (when I get this working..) Patches which would cause unit tests to
   fail are rejected.

Modified: zope-zwiki/trunk/RSS.py
===================================================================
--- zope-zwiki/trunk/RSS.py	2007-04-08 14:54:05 UTC (rev 761)
+++ zope-zwiki/trunk/RSS.py	2007-04-08 14:55:27 UTC (rev 762)
@@ -20,17 +20,42 @@
     """
     security = ClassSecurityInfo()
 
+    def title_quote(self, title):
+        """
+        Quote a string suitable for a title element in an RSS feed.
+        We replace only &, > and <
+        this is according to RSS specs in
+        http://www.rssboard.org/rss-profile#data-types-characterdata
+        Nonetheless, http://feedvalidator.org/ claims there is html in 
+        those encoded titles.
+        """
+        title = title.replace('&', '&#x26;', -1)
+        title = title.replace('<', '&#x3C;', -1)
+        title = title.replace('>', '&#x3E;', -1)
+        return title
+
+
     security.declareProtected(Permissions.View, 'pages_rss')
     def pages_rss(self, num=10, REQUEST=None):
         """
         Provide an RSS feed showing this wiki's recently created pages.
         """
+        pages = self.pages(sort_on='creation_time',
+                            sort_order='reverse',
+                            sort_limit=num,
+                            isBoring=0)
+        if len(pages) > 0:
+            last_mod = pages[0].getObject().creationTime()
+        else:
+            last_mod = DateTime()
+        if self.handle_modified_headers(last_mod=last_mod, REQUEST=REQUEST):
+            return ''
         feedtitle = self.folder().title_or_id() + ' new pages'
         feeddescription = feedtitle
         feedlanguage = 'en'
-        feeddate = str(self.folder().bobobase_modification_time()) #XXX ?
+        feeddate = self.folder().bobobase_modification_time().rfc822()
         wikiurl = self.wikiUrl()
-        REQUEST.RESPONSE.setHeader('Content-Type','text/xml')
+        REQUEST.RESPONSE.setHeader('Content-Type','text/xml; charset=utf-8')
         t = """\
 <rss version="2.0">
 <channel>
@@ -40,26 +65,24 @@
 <language>%(feedlanguage)s</language>
 <pubDate>%(feeddate)s</pubDate>
 """ % {
-            'feedtitle':feedtitle,
-            'feeddescription':feeddescription,
+            'feedtitle':self.title_quote(feedtitle),
+            'feeddescription':html_quote(feeddescription),
             'feedurl':wikiurl,
             'feedlanguage':feedlanguage,
             'feeddate':feeddate,
             }
-        for p in self.pages(sort_on='creation_time',
-                            sort_order='reverse',
-                            sort_limit=num,
-                            isBoring=0):
+        for p in pages:
             pobj = p.getObject()
             t += """\
 <item>
 <title>%(title)s</title>
 <link>%(wikiurl)s/%(id)s</link>
+<guid>%(wikiurl)s/%(id)s</guid>
 <description><![CDATA[%(summary)s]]></description>
 <pubDate>%(creation_time)s</pubDate>
 </item>
 """ % {
-            'title':p.Title,
+            'title':self.title_quote(p.Title),
             'wikiurl':wikiurl,
             'id':p.id,
             'summary':pobj.summary(1000),
@@ -79,12 +102,22 @@
 
         This is not the same as all recent edits.
         """
+        pages = self.pages(sort_on='last_edit_time',
+                            sort_order='reverse',
+                            sort_limit=num,
+                            isBoring=0)
+        if len(pages) > 0:
+            last_mod = pages[0].getObject().lastEditTime()
+        else:
+            last_mod = DateTime()
+        if self.handle_modified_headers(last_mod=last_mod, REQUEST=REQUEST):
+            return ''
         feedtitle = self.folder().title_or_id() + ' changed pages'
         feeddescription = feedtitle
         feedlanguage = 'en'
-        feeddate = str(self.folder().bobobase_modification_time()) #XXX ?
+        feeddate = self.folder().bobobase_modification_time().rfc822()
         wikiurl = self.wikiUrl()
-        REQUEST.RESPONSE.setHeader('Content-Type','text/xml')
+        REQUEST.RESPONSE.setHeader('Content-Type','text/xml; charset=utf-8')
         t = """\
 <rss version="2.0">
 <channel>
@@ -94,26 +127,24 @@
 <language>%(feedlanguage)s</language>
 <pubDate>%(feeddate)s</pubDate>
 """ % {
-            'feedtitle':feedtitle,
-            'feeddescription':feeddescription,
+            'feedtitle':self.title_quote(feedtitle),
+            'feeddescription':html_quote(feeddescription),
             'feedurl':wikiurl,
             'feedlanguage':feedlanguage,
             'feeddate':feeddate,
             }
-        for p in self.pages(sort_on='last_edit_time',
-                            sort_order='reverse',
-                            sort_limit=num,
-                            isBoring=0):
+        for p in pages:
             pobj = p.getObject()
             t += """\
 <item>
 <title>%(title)s</title>
 <link>%(wikiurl)s/%(id)s</link>
+<guid>%(wikiurl)s/%(id)s</guid>
 <description>%(last_log)s</description>
 <pubDate>%(last_edit_time)s</pubDate>
 </item>
 """ % {
-            'title':'[%s] %s' % (p.Title,html_quote(p.last_log)),
+            'title':'[%s] %s' % (self.title_quote(p.Title),self.title_quote(p.last_log)),
             'wikiurl':wikiurl,
             'id':p.id,
             'last_log':html_quote(pobj.textDiff()),

Modified: zope-zwiki/trunk/TODO
===================================================================
--- zope-zwiki/trunk/TODO	2007-04-08 14:54:05 UTC (rev 761)
+++ zope-zwiki/trunk/TODO	2007-04-08 14:55:27 UTC (rev 762)
@@ -1,7 +1,22 @@
-General plans and todos for the zwiki project.
+General plans and todos for the zwiki project. -*- rst -*-
 
 PROCESS
--------
+=======
+efficient wiki system announcements
+ send by mail
+ possible recipients
+  zope-web 
+  wiki.zope.org
+  wiki.zope.org/zope3
+  wiki.zope.org/zope2
+  zwiki.org
+  *.zwiki.org/*.joyful.com ?
+ off-zope/off-site location
+
+repo speedups
+ partial pulling too many patches, check checkpoints
+ try darcs optimize # --reorder-patches
+
 highlight active contributors, code and docs
 author stats
 automatic release
@@ -17,6 +32,7 @@
 lighter monthly release, perhaps a more thoroughly polished quarterly release
 
 DOCS
+====
 clarify division/integration between fs and wiki docs
 publish fs docs online - darcsweb ? epydoc ? trac ? zwiki ?
 get epydoc working
@@ -25,6 +41,7 @@
 simpler more focussed wiki docs
 
 SITES
+=====
 profile, speed up, simplify
 good stats.. bite google analytics bullet ?
 better tracking of free wikis
@@ -32,14 +49,39 @@
 close down dead wikis
 
 PRODUCT
--------
+=======
 fix 1284 acquisition bug - Views_tests
 built-in helppage, editform help
 
+I18N
+----
+reduce rosetta diffs
+ handle rosetta stripping default lines
+  convert defaults to one line
+
 VIEWS AND SKINS
+---------------
 keep cleaning up and simplifying
 
+nautica
+.......
+- make stylesheet work in nautica wiki template, with/without CURRENTSKIN
+- commit nautica template
+
+tichu
+.....
+- ask kevin to confirm name
+- genericise
+- install for other wikis
+- change side bar button text
+
+skin selection
+..............
+- select default skin from option
+- select skin from request
+
 TESTS
+-----
 fix cmf tests
 aftersetup -> setup ? clarify in all fixtures
 bring back doctests ?

Modified: zope-zwiki/trunk/Utils.py
===================================================================
--- zope-zwiki/trunk/Utils.py	2007-04-08 14:54:05 UTC (rev 761)
+++ zope-zwiki/trunk/Utils.py	2007-04-08 14:55:27 UTC (rev 762)
@@ -35,7 +35,10 @@
 
 ZWIKI_BIRTHDATE='1999/11/05'
 
+ZWIKIDIR = os.path.dirname(__file__)
+def abszwikipath(path): return os.path.join(ZWIKIDIR,path)
 
+
 class PageUtils:
     """
     Miscellaneous utility methods for zwiki pages.
@@ -126,7 +129,7 @@
         strings = filter(lambda x:type(x)==type(''), strings)
         return len(join(strings,''))
 
-    def summary(self,size=200,paragraphs=1):
+    def summary(self,size=200,paragraphs=1,charset="utf-8"):
         """
         Give a short plaintext summary of this page's content.
 
@@ -137,11 +140,13 @@
         """
         size, paragraphs = int(size), int(paragraphs)
         t = self.documentPart()
+        t = t.decode(charset)  # go to unicode.
         t = re.sub(r'<(?=\S)[^>]+>','',t).strip() # strip html tags
         if paragraphs: t = join(split(t,'\n\n')[:paragraphs],'\n\n')
         if len(t) > size:
             t = t[:size]
             t = re.sub(r'\w*$',r'',t) + '...'
+        t = t.encode(charset)  # get back from unicode.
         return html_quote(t)
 
     def renderedSummary(self,size=500,paragraphs=1):
@@ -531,21 +536,13 @@
 
 
 # generic utilities
-def BLATHER(*args):
-    tmp = []
-    for arg in args: tmp.append(str(arg))
-    zLOG.LOG('ZWiki',zLOG.BLATHER,' '.join(tmp))
 
-def WARN(*args):
-    tmp = []
-    for arg in args: tmp.append(str(arg))
-    zLOG.LOG('ZWiki',zLOG.WARNING,' '.join(tmp))
+#logging
+def STDERR(*args):  sys.stderr.write(' '.join(map(str,args)) + '\n')
+def BLATHER(*args): zLOG.LOG('ZWiki',zLOG.BLATHER,' '.join(map(str,args)))
+def WARN(*args):    zLOG.LOG('ZWiki',zLOG.WARNING,' '.join(map(str,args)))
+def DEBUG(*args):   zLOG.LOG('ZWiki',zLOG.DEBUG,' '.join(map(str,args)))
 
-def DEBUG(*args):
-    tmp = []
-    for arg in args: tmp.append(str(arg))
-    zLOG.LOG('ZWiki',zLOG.DEBUG,' '.join(tmp))
-
 def formattedTraceback():
     type,val,tb = sys.exc_info()
     try:     return join(traceback.format_exception(type,val,tb),'')

Modified: zope-zwiki/trunk/Views.py
===================================================================
--- zope-zwiki/trunk/Views.py	2007-04-08 14:54:05 UTC (rev 761)
+++ zope-zwiki/trunk/Views.py	2007-04-08 14:55:27 UTC (rev 762)
@@ -1,105 +1,87 @@
 """
-Zwiki's main UI views and UI-related utilities.
+Zwiki's skin mechanism and main UI view methods.
 
-Zwiki needs to work both outside and inside Plone/CMF, so cannot rely on
-the CMF skin mechanism alone. There is a built-in mechanism which works
-like this:
+Zwiki has a built-in skin mechanism which aims to just work and be easily
+customizable, whether in standard zope, CMF or Plone, without requiring
+any extra products or setup. Here's the scoop:
 
-Overview
---------
+View methods
+------------
+*view methods* are methods which render a particular screen in Zwiki's UI
+- editform, diffform, the main page view, etc. These define the standard
+wiki page views which are always available no matter what kind of site we
+are in. Three examples: the main page view, the edit form, the backlinks
+form, rendered by __call__(), editform(), and backlinks() respectively. We
+also have helper view methods which render smaller parts of the UI. Most
+view methods are defined by the SkinViews mixin below; others are defined
+by plugins.
 
-- *view methods* are defined for wiki pages (via mixin class, usually in
-  Views.py). These define the standard views which are always available no
-  matter what kind of site we are in (main view, editform, backlinks etc.)
+Skin templates
+--------------
+view methods use a *skin template* to control their rendering.  This is a
+page template, dtml method or file of the same name as the method (perhaps
+with a suffix added). It is found by looking first in the ZODB (current
+folder, acquisition context, CMF skin layers), then on the filesystem
+(plugins, ZWiki/skins/<current skin>, ZWiki/skins/zwiki) - see
+getSkinTemplate for more details. The default zwiki skin provides all
+the standard templates, and these may be overridden selectively.
+They are listed here: http://zwiki.org/QuickReference#skin-templates
 
-- view methods usually call a *view template* of the same name to render
-  the view, sometimes passing data as arguments. These templates can be
-  customized by wiki admins.
+Skin macros
+-----------
+the standard zwiki skin uses METAL macros to break things into into
+manageable pieces. These are chunks of page template which can be reused
+in other page templates, in one of two ways:
 
-- view methods use getSkinTemplate() to find their helper templates. It
-  looks for a page template or dtml method of the specified name, in the
-  following places:
+1. including - the called template fills a space within the caller
+2. wrapping - the called template takes over, and caller fills spaces
+   (slots) within it
 
-  1. first, in the wiki folder in the ZODB
+All of the macros in the current skin are made available to all skin
+templates as here/macros.
 
-  2. or, elsewhere in the ZODB by acquisition (including the CMF skin
-     layers if we are in a CMF/Plone site)
+Plone compatibility
+-------------------
+the standard zwiki skin templates (at least) are designed to work in both
+standard zope and plone wikis. To achieve this all templates call the
+"here/main_template/macros/master" macro to wrap themselves in the overall
+site skin. This calls CMF/Plone's main template if we are in CMF, and
+Zwiki's if we are not (or if we are in plone but have selected the zwiki skin).
 
-  3. finally, in a built-in TEMPLATES dictionary containing the skin
-     templates defined by the files in skins/zwiki/ (and others registered
-     by plugins).
+Which kind of zodb object should you choose when customizing a skin template ?
+------------------------------------------------------------------------------
+page templates
+ Zope page templates are the workhorse for making dynamic views. They
+ provide better i18n features than dtml, can be well-formed HTML and can
+ be edited by WYSIWYG HTML editors without harm. They can include other
+ page templates or wrap themselves in other page templates using macros.
 
-More about templates
---------------------
+dtml methods
+ Zope DTML methods are the precursor to page templates. They are a little
+ faster, a little less explicit, not well-formed HTML, a little harder to
+ debug, and easier to understand than page templates & macros.
 
-- the standard templates use METAL macros so that they can be broken up
-  into manageable chunks (like the comment form) and reused easily.
-  Usually there is a template file to define each macro, but this is just
-  convention. At runtime all the macros are gathered from TEMPLATES and
-  made available as here/macros.
+files
+ These are best for chunks of content which do not change much and should
+ be cached. A File object works well for a stylesheet.
 
-- Currently all templates, except those provided by plugins, are defined
-  in skins/zwiki and are designed to work in both standard and CMF/Plone
-  wikis.  The need to be compatible with CMF/Plone's main_template puts
-  certain constraints on Zwiki's templates.
+images
+ These are like files, but better for graphics.
 
-- view templates call the here/main_template/macros/master macro to wrap
-  themselves in the overall site skin. This calls CMF/Plone's main
-  template if we are in CMF, or Zwiki's if we are not. (main_template is a
-  ComputedAttribute on zwiki pages, which calls the get_main_template method,
-  which calls CMF/Plone's main_template or Zwiki's main_template_zwiki template).
-
-Skin object types
------------------
-
-Aside from the view methods, which are built in to the product code, all
-skin objects - view templates, helper templates, dtml methods, files,
-images - may be customized in the ZODB. Here's a review:
-
-**page templates**
-  Zope page templates are the workhorse for making dynamic views. They
-  provide better i18n features than dtml. Zwiki's are well-formed HTML and
-  can be edited in a wysiwyg html editor without damage (untried).
-
-**macros**
-  METAL macros are chunks of page template which can be reused in other
-  page templates. They are more powerful than a simple include mechanism,
-  you could say they are used in one of two ways:
-
-  1. filling - called template fills a space within the caller
-  2. wrapping - called template takes over, and caller fills spaces
-     (slots) within it
-
-**dtml methods**
-  Zope DTML methods are the precursor to page templates. They are a little
-  faster, a little less explicit, not well-formed HTML, a little harder to
-  debug, easier to understand than macros.
-
-**files**
-  Best for chunks of content which do not change much and should be
-  cached. A File object works well when customizing the stylesheet (though
-  see below).
-
-**images**
-  Like files, but better suited to graphics. The zwiki skin includes a
-  couple of icons.
-
 Other notes
 -----------
-  
-- several Zwiki views (eg recentchanges) are developed iteratively as dtml
-  wiki pages on zwiki.org.  These are reused in the skin as dtml methods
-  (RecentChanges.dtml) embedded within page templates
-  (recentchanges.pt). The page templates may be customized to not use dtml
-  if preferred.
+- several of the standard Zwiki page templates call a dtml method to do
+  their work.  This is simply a convenience so that these views may be
+  installed either in the skin or as editable dtml-enabled wiki pages,
+  allowing more agile development and tweaking.  Eg: recentchanges.pt and
+  RecentChanges.dtml.
 
-- the stylesheet view method will accept a skin object called
-  ``stylesheet`` *or* ``stylesheet.css``.  It may be a File object, a DTML
-  Method, or an editable wiki page (see
-  http://zwiki.org/HowToSetUpAnEditableStylesheet).
+- the stylesheet method looks for a skin template object named
+  ``stylesheet.css`` of ``stylesheet``, in that order.  See also
+  http://zwiki.org/HowToSetUpAnEditableStylesheet .
 
-- from 0.54, all of the built in filesystem-based templates, dtml methods
-  and macros refresh when running in debug mode.
+- when running zope in debug mode, all filesystem-based skin templates and
+  macros will refresh, showing changes immediately without a zope restart.
 
 """
 
@@ -120,65 +102,66 @@
 from ComputedAttribute import ComputedAttribute
 
 from Defaults import PAGE_METATYPE
-from Utils import BLATHER, formattedTraceback
+from Utils import BLATHER, formattedTraceback, abszwikipath
 from I18n import _, DTMLFile, HTMLFile
 
 
-# utilities
-
 def loadPageTemplate(name,dir='skins/zwiki'):
     """
-    Load the named page template from the filesystem.
+    Load the named page template from the filesystem and return it, or None.
     """
-    return PageTemplateFile(
-        os.path.join(dir,'%s.pt' % name),
-        globals(),
-        __name__=name)
+    f = os.path.join(abszwikipath(dir),'%s.pt' % name)
+    if os.path.exists(f):
+        return PageTemplateFile(f,globals(),__name__=name)
+    else:
+        return None
 
 def loadDtmlMethod(name,dir='skins/zwiki'):
     """
-    Load the named DTML method from the filesystem.
+    Load the named dtml method from the filesystem and return it, or None.
     """
-    # need this one for i18n gettext patch to work ?
-    #dm = DTMLFile(os.path.join(dir,name), globals())
-    dm = HTMLFile(os.path.join(dir,name), globals())
-    # work around some (2.7 ?) glitch
-    if not hasattr(dm,'meta_type'): dm.meta_type = 'DTML Method (File)'
-    return dm
+    f = os.path.join(abszwikipath(dir),name)
+    if os.path.exists('%s.dtml' % f):
+        # need this one for i18n gettext patch to work ?
+        #dm = DTMLFile(os.path.join(dir,name), globals())
+        dm = HTMLFile(f, globals())
+        # work around some (2.7 ?) glitch
+        if not hasattr(dm,'meta_type'): dm.meta_type = 'DTML Method (File)'
+        return dm
+    else:
+        return None
 
 def loadStylesheet(name,dir='skins/zwiki'):
     """
     Load the stylesheet file from the filesystem.
     """
     f = loadFile(name,dir=dir)
-    if f:
-        f.content_type = 'text/css'
-        return f
+    if f: f.content_type = 'text/css'
+    return f
 
 def loadFile(name,dir='skins/zwiki'):
     """
-    Load a File from the filesystem.
-
-    Also work around a modification time bug.
+    Load and return a File from the filesystem, or None.
     """
-    THISDIR = os.path.split(os.path.abspath(__file__))[0]
-    filepath = os.path.join(THISDIR,dir,name)
-    data,mtime = '',0
-    try:
+    filepath = os.path.join(abszwikipath(dir),name)
+    if os.path.exists(filepath):
+        f = None
         try:
-            fp = open(filepath,'rb')
-            data = fp.read()
-            mtime = os.path.getmtime(filepath)
-            file = File('stylesheet','',data)
-            # bug workaround: bobobase_modification_time will otherwise be current time
-            file.bobobase_modification_time = lambda:mtime
-            return file # whee! does the finally first
-        except:
-            return None
-    finally:
-        fp.close()
+            try:
+                f = open(filepath,'rb')
+                data = f.read()
+                mtime = os.path.getmtime(filepath)
+                file = File(name,'',data)
+                # bug workaround: bobobase_modification_time will otherwise be current time
+                file.bobobase_modification_time = lambda:mtime
+                return file
+            except IOError:
+                return None
+        finally:
+            if f: f.close()
+    else:
+        return None
 
-
 def isPageTemplate(obj):
     return getattr(obj,'meta_type',None) in (
         'Page Template',            # template found in wiki folder or above
@@ -213,92 +196,93 @@
     return """<div class="error">%s</div>\n%s""" % (error,text)
 
 
-# the standard zwiki skin templates
-TEMPLATES = {}
-for t in [
-    # main view templates
-    'badtemplate', # should be first
-    'backlinks',
-    'contentspage',
-    'denied',
-    'diffform',
-    'editform',
-    'recentchanges',
-    'searchwiki',
-    'helppage',
-    'subscribeform',
-    'useroptions',
-    'wikipage',
-    # additional macro-providing templates
-    'accesskeys',
-    'commentform',
-    'content',
-    'head',
-    'hierarchylinks',
-    'links',
-    'maintemplate',
-    'pageheader',
-    'pagemanagementform',
-    'siteheader',
-    'testtemplate',
-    ]:
-    TEMPLATES[t] = loadPageTemplate(t)
+# load built-in zwiki skin templates from the filesystem
+# skins/zwiki/ defines all of these, other skins need not
 
-# helper dtml methods
-for t in [
-    'RecentChanges',
-    'SearchPage',
-    'UserOptions',
-    'subtopics_outline',
-    'subtopics_board',
-    ]:
-    TEMPLATES[t] = loadDtmlMethod(t)
+SKINS = {}
+for s in os.listdir(abszwikipath('skins')):
+    SKINS[s] = {}
+    skindir = os.path.join(abszwikipath('skins'),s)
+    for template in [
+        # main view templates
+        # these usually have a similarly named publish method
+        'backlinks',
+        'contentspage',
+        'denied',
+        'diffform',
+        'editform',
+        'recentchanges',
+        'searchwiki',
+        'helppage',
+        'subscribeform',
+        'useroptions',
+        'wikipage',
+        # macro-providing templates
+        'accesskeys',
+        'commentform',
+        'content',
+        'head',
+        'hierarchylinks',
+        'links',
+        'maintemplate',
+        'pageheader',
+        'pagemanagementform',
+        'siteheader',
+        'testtemplate',
+        'badtemplate',
+        ]:
+        obj = loadPageTemplate(template,dir=skindir)
+        if obj: SKINS[s][template] = obj
+    for template in [
+        # helper dtml methods
+        'RecentChanges',
+        'SearchPage',
+        'UserOptions',
+        'subtopics_outline',
+        'subtopics_board',
+        'stylesheet',
+        ]:
+        obj = loadDtmlMethod(template,dir=skindir)
+        if obj: SKINS[s][template] = obj
+    # extras
+    if s=='zwiki':
+        SKINS[s]['stylesheet'] = loadStylesheet('stylesheet.css')
+        # XXX this really expects to be a full wiki page
+        # for now, read it as a file and format it in helppage.pt
+        # one issue: File does not refresh in debug mode ?
+        SKINS[s]['HelpPage'] = loadFile('HelpPage.stx',dir=skindir)
 
-# other things
-TEMPLATES['stylesheet'] = loadStylesheet('stylesheet.css')
-# XXX this really expects to be a full wiki page
-# for now, read it as a file and format it in helppage.pt
-# one issue: File does not refresh in debug mode ?
-TEMPLATES['HelpPage'] = loadFile('HelpPage.stx')
+TEMPLATES = SKINS['zwiki'] # backwards compatibility
 
+#XXX get from request
+CURRENTSKIN = 'zwiki'
+#CURRENTSKIN = 'nautica'
 
-# set up easy access to all macros via here/macros.
-# XXX We use a computed attribute (below) to call getmacros on each
-# access, to ensure they are always fresh in debug mode - or when a zodb
-# template is customized. Right ?  So we have to check for customized
-# templates each time. getmacros is called a lot, are we getting into
-# performance concerns yet ? This seems a lot of work, there must
-# be some simpler acceptable setup we can offer.
-# we'll save the list of initial ZPT ids and check only these
-PAGETEMPLATEIDS = [t for t in TEMPLATES.keys()
-                   if isinstance(TEMPLATES[t],PageTemplateFile)]
-#XXX temp - need at least this too, it defines a macro
-PAGETEMPLATEIDS.extend(['ratingform'])
-MACROS = {}
+# set up easy access to all PT macros via here/macros.
+MACROS = {} # a flat dictionary of all macros defined in all templates
+# need to initialise it for some backwards compatibility assignments at startup
+[MACROS.update(t.pt_macros()) for t in TEMPLATES.values() if isPageTemplate(t)]
 def getmacros(self):
     """
-    Return a dictionary of all the latest macros from our PageTemplateFiles.
+    Return a dictionary of all the PT macros in the skin.
 
-    This is called for each access to here/macros (MACROS)
+    XXX here/macros is a computed attribute calling this for each access,
+    to ensure we always get the fresh macro in debug mode or when a
+    template is customised in the zodb. Are we getting into performance
+    concerns yet ?  Any simpler acceptable setup we can offer?
     """
-    if not self:
-        # for initialisation, just use standard templates
-        [MACROS.update(t.pt_macros())
-         for t in TEMPLATES.values() if isinstance(t,PageTemplateFile)]
-    else:
-        # when called in zope context, reflect any zodb customizations
-        for id in PAGETEMPLATEIDS:
-            MACROS.update(self.getSkinTemplate(id).pt_macros())
+    skin = SKINS[CURRENTSKIN]
+    for t in skin.keys():
+        if isPageTemplate(skin[t]):
+            MACROS.update(self.getSkinTemplate(t).pt_macros())
     return MACROS
 
 # provide old macros for backwards compatibility
 # pre-0.52 these were defined in wikipage, old custom templates may need them
 # two more were defined in contentspage, we won't support those
-getmacros(None)
 MACROS['linkpanel']   = MACROS['links']
 MACROS['navpanel']    = MACROS['hierarchylinks']
-nullmacro = ZopePageTemplate(
-    'null','<div metal:define-macro="null" />').pt_macros()['null']
+nullmacro = ZopePageTemplate('null','<div metal:define-macro="null" />').pt_macros()['null']
 MACROS['favicon']     = nullmacro
 MACROS['logolink']    = nullmacro
 MACROS['pagelinks']   = nullmacro
@@ -566,32 +550,22 @@
     security.declareProtected(Permissions.View, 'stylesheet')
     def stylesheet(self, REQUEST=None):
         """
-        Return the style sheet used by the other templates.
+        Return the style sheet used by the other skin templates.
 
-        Template-customizable. Unlike the other skin methods, this one can
-        be overridden by either a 'stylesheet' or a 'stylesheet.css'
-        template - this is a little annoying.
-
-        Also the template in this case is usually a File (but can also be
-        a page template or dtml method for a dynamic stylesheet). When a
-        File is used the Last-modified header is set to help caching.
-        (Also, all pages use a single stylesheet url -
-        DEFAULTPAGE/stylesheet).
+        Looks for a skin template object named stylesheet.css or
+        stylesheet in that order. If it is a File (the usual case), send
+        appropriate headers/reponses for good caching behaviour.
         """
-        if REQUEST: REQUEST.RESPONSE.setHeader('Content-Type', 'text/css')
-        #XXX self.getSkinTemplate('stylesheet')
-        form = getattr(self.folder(),'stylesheet',
-                       getattr(self.folder(),'stylesheet.css',
-                               TEMPLATES['stylesheet']
-                               ))
-        if isPageTemplate(form) or isDtmlMethod(form):
-            return form.__of__(self)(self,REQUEST)
-        else: # a File
-            if REQUEST:
-                modified = form.bobobase_modification_time()
-                REQUEST.RESPONSE.setHeader('Last-Modified',
-                                           rfc1123_date(modified))
-            return form.index_html(REQUEST,REQUEST.RESPONSE)
+        REQUEST.RESPONSE.setHeader('Content-Type', 'text/css')
+        form = self.getSkinTemplate('stylesheet',suffixes=['.css',''])
+        if isFile(form):
+            if self.handle_modified_headers(
+                last_mod=form.bobobase_modification_time(), REQUEST=REQUEST):
+                return ''
+            else:
+                return form.index_html(REQUEST,REQUEST.RESPONSE)
+        else:
+            return form(self,REQUEST)
 
     security.declareProtected(Permissions.View, 'subscribeform')
     def subscribeform(self, REQUEST=None):
@@ -665,33 +639,38 @@
             return self.getSkinTemplate('maintemplate')  # zwiki's
     main_template = ComputedAttribute(getmaintemplate,1)
 
-    def getSkinTemplate(self,name):
+    def getSkinTemplate(self, name, suffixes=['.pt','.dtml','']):
         """
         Get the named skin template from the ZODB or filesystem.
 
-        This will find either a Page Template or DTML Method with the
-        specified name. We look first for a template with this name in the
-        ZODB acquisition context, trying the .pt, .dtml or no suffix in
-        that order. Then we look in skins/zwiki on the filesystem. If no
-        matching template can be found, we return a generic error template.
+        A 'skin template' is responsible for some part of the Zwiki user
+        interface; it may be a Page Template, DTML Method or File.  We
+        look for a template with this name, first in the ZODB acquisition
+        context, trying the suffixes in the order given; then in
+        CURRENTSKIN on the filesystem, if CURRENTSKIN is set; and finally
+        in skins/zwiki on the filesystem.  For convenient skin
+        development, we return the template wrapped in the current page's
+        context (so here = the page, container = the folder, etc).  If no
+        matching template can be found, we return a generic error
+        template.
 
-        For convenient skin development, we return the template wrapped in
-        the current page's context (so here will be the page, container
-        will be the folder, etc).
-                
-        This is basically duplicating the CMF skin mechanism, but in a
-        way that works everywhere, and with some extra error-handling
-        to help skin customizers. Still evolving, it will all shake
-        out in the end.
+        This somewhat duplicates the CMF skin system, but will always be
+        available, and provides extra handling useful to zwiki skin
+        customisers.
         """
-        obj = getattr(self.folder(), name+'.pt',
-                      getattr(self.folder(), name+'.dtml',
-                              getattr(self.folder(), name,
-                                      None)))
-        if not isTemplate(obj): # don't accept a non-template object
-            obj = TEMPLATES.get(name, TEMPLATES['badtemplate'])
-        # return it with both folder and page in the acquisition context,
-        # setting container and here
+        # look for a similarly-named template in the zodb
+        for s in suffixes:
+            obj = getattr(self.folder(), name+s, None)
+            if obj and (isTemplate(obj) or isFile(obj)): break
+            else: obj = None
+        if not obj:
+            # look in the selected filesystem skin, or finally in the
+            # standard zwiki skin
+            currentskin = CURRENTSKIN #XXX get from request
+            obj = SKINS[currentskin].get(name,
+                              SKINS['zwiki'].get(name,
+                                            SKINS['zwiki']['badtemplate']))
+        # return it, with both folder and page in the acquisition context
         return obj.__of__(self.folder()).__of__(self)
 
     def hasSkinTemplate(self,name):

Modified: zope-zwiki/trunk/Views_tests.py
===================================================================
--- zope-zwiki/trunk/Views_tests.py	2007-04-08 14:54:05 UTC (rev 761)
+++ zope-zwiki/trunk/Views_tests.py	2007-04-08 14:55:27 UTC (rev 762)
@@ -11,7 +11,7 @@
 
     def test_templatesHaveMetaType(self):
         TEMPLATES = ZWiki.Views.TEMPLATES
-        # do all default templates have meta_type ? this has been fragile
+        # make sure all default templates have meta_type
         self.failIf(filter(lambda x:not hasattr(x,'meta_type'),TEMPLATES.values()))
 
 class BindingsTests(ZwikiTestCase):

Modified: zope-zwiki/trunk/ZWikiPage.py
===================================================================
--- zope-zwiki/trunk/ZWikiPage.py	2007-04-08 14:54:05 UTC (rev 761)
+++ zope-zwiki/trunk/ZWikiPage.py	2007-04-08 14:55:27 UTC (rev 762)
@@ -64,13 +64,14 @@
 from Defaults import AUTO_UPGRADE, IDS_TO_AVOID, \
      PAGE_METATYPE, LINK_TO_ALL_CATALOGED, LINK_TO_ALL_OBJECTS, \
      WIKINAME_LINKS, BRACKET_LINKS, DOUBLE_BRACKET_LINKS, \
-     DOUBLE_PARENTHESIS_LINKS, ISSUE_LINKS
+     DOUBLE_PARENTHESIS_LINKS, ISSUE_LINKS, \
+     CONDITIONAL_HTTP_GET, CONDITIONAL_HTTP_GET_IGNORE
 from Regexps import url, bracketedexpr, singlebracketedexpr, \
      doublebracketedexpr, doubleparenthesisexpr, wikiname, wikilink, \
      interwikilink, remotewikiurl, protected_line, zwikiidcharsexpr, \
      anywikilinkexpr, markedwikilinkexpr, localwikilink, \
      spaceandlowerexpr, dtmlorsgmlexpr, wikinamewords, hashnumberexpr
-from Utils import PageUtils, BLATHER
+from Utils import PageUtils, BLATHER, DateTimeSyntaxError
 from Views import PageViews
 from OutlineSupport import PageOutlineSupport
 from Diff import PageDiffSupport
@@ -246,6 +247,8 @@
         """
         Render this zwiki page, also upgrading it on the fly if needed.
         """
+        if self.handle_modified_headers(REQUEST=REQUEST):
+            return '' # return a 304 response with no content
         if AUTO_UPGRADE: self.upgrade(REQUEST)
         rendered = self.render(client,REQUEST,RESPONSE,**kw)
         return rendered
@@ -426,7 +429,64 @@
         """Is Epoz installed ?"""
         return hasattr(self,'Epoz')
 
-    ######################################################################
+    def handle_modified_headers(self, last_mod=None, REQUEST=None):
+        """
+        Check if the headers indicate we have changed content.
+
+        Return True if nothing changed, False otherwise. Set Headers as needed.
+        Methods using this should call this before returning any content,
+        then if a 304 is called for this method returns True and
+        the calling method should give no content to the browser.
+        """
+        RESPONSE=REQUEST.RESPONSE
+        # do we handle things at all?
+        if not getattr(self, 'conditional_http_get', CONDITIONAL_HTTP_GET):
+            return False
+        # admins can specify a list of property names that make us ignore
+        # "Conditional HTTP Get" processing if they are set
+        # especially useful for ignoring pages with allow_dtml
+        ignore = getattr(self, 'conditional_http_get_ignore', \
+                                        CONDITIONAL_HTTP_GET_IGNORE)
+        for ignore_property in ignore:
+            if getattr(self, ignore_property, False): return False
+        if last_mod == None:
+            try:
+                # bobobase_modification_time reflects also changes
+                # to voting, not like last_edit_time
+                last_mod = self.bobobase_modification_time()
+            except DateTimeSyntaxError:
+                # if anything goes wrong with the stored date, we just
+                # ignore all 304 handling and go on as if nothing happened
+                BLATHER("invalid bobobase_modification time in page %s" \
+                            % (self.id()))
+                return False
+        try: # we could have been fed an illegal date string
+            last_mod = long(DateTime(last_mod).timeTime())
+        except DateTimeSyntaxError:
+            BLATHER("invalid date input on page %s" % (self.id()))
+            return False
+        header=REQUEST.get_header('If-Modified-Since', None)
+        if header is not None:
+            header=header.split( ';')[0]
+            # Some proxies seem to send invalid date strings for this
+            # header. If the date string is not valid, we ignore it
+            # rather than raise an error to be generally consistent
+            # with common servers such as Apache (which can usually
+            # understand the screwy date string as a lucky side effect
+            # of the way they parse it).
+            # This happens to be what RFC2616 tells us to do in the face of an
+            # invalid date.
+            try:   mod_since=long(DateTime(header).timeTime())
+            except DateTimeSyntaxError: mod_since=None
+            if mod_since is not None:
+                if last_mod > 0 and last_mod <= mod_since:
+                    RESPONSE.setHeader('Last-Modified',
+                                       rfc1123_date(last_mod))
+                    RESPONSE.setStatus(304)
+                    return True
+        RESPONSE.setHeader('Last-Modified', rfc1123_date(last_mod))
+        return False
+
     # link rendering and handling
 
     def wikinameLinksAllowed(self):
@@ -575,6 +635,11 @@
         if link[0] == '!':
             return link[1:]
 
+        # ignore certain WikiNames from a property ('Lines' type property)
+        ignore_wikinames = getattr(self, 'ignore_wikinames', [])
+        if link in ignore_wikinames:
+            return link
+
         # is it an interwiki link ?
         if re.match(interwikilink,link):
             return self.renderInterwikiLink(link)
@@ -599,7 +664,7 @@
             p = self.issuePageWithNumber(self.issueNumberFrom(link))
             if p:
                 try: link = p.getId() # XXX poor caching
-                except: link = p.id   # all-brains
+                except AttributeError: link = p.id   # all-brains
                 return self.renderLinkToPage(link,
                                              linkorig=linkorig,
                                              link_title=link_title,
@@ -621,7 +686,7 @@
             p = self.pageWithFuzzyName(link)
             if p:
                 try: link = p.getId() # XXX poor caching
-                except: link = p.id   # all-brains
+                except AttributeError: link = p.id   # all-brains
                 # and fall through
             
         # must be either a WikiName link, or an existing page's id from above
@@ -647,7 +712,7 @@
             # make sure we have the page's id
             if not self.pageWithId(page): # XXX this check helps avoid zodb loads ?
                 try: page = p.getId() # XXX poor caching
-                except: page = p.id   # all-brains
+                except AttributeError: page = p.id   # all-brains
             title     = (link_title and ' title="%s"' % link_title) or '' #' title="%s"' % self.pageWithId(page).linkTitle()
             name      = (name and ' name="%s"' % name) or ''
             accesskey = (access_key and ' accesskey="%s"' % access_key) or ''
@@ -655,7 +720,7 @@
             if p.isIssue():
                 try:
                     style=' style="background-color:%s;"' % p.issueColour() # poor caching
-                except:
+                except AttributeError:
                     style=' style="background-color:%s;"' % p.issueColour # all-brains
             else:
                 style = ''
@@ -700,8 +765,9 @@
         if not self.isValidWikiLinkSyntax(local): return link
         local = re.sub(bracketedexpr, r'\1', local) #XXX should support ((..))
         # look for a RemoteWikiURL definition
-        if hasattr(self.folder(), local): 
-            m = re.search(remotewikiurl,getattr(self.folder(),local).text())
+        localpage = self.pageWithName(local)
+        if localpage:
+            m = re.search(remotewikiurl, localpage.text())
             if m:
                 return '<a href="%s%s">%s:%s</a>' \
                        % (m.group('remoteurl'),remote,local,remote)
@@ -797,31 +863,32 @@
         
         with prettyprint=1, format it for use in the standard header.
         """
-        interval = self.asAgeString(last_edit_time)
+        try:
+            interval = self.asAgeString(last_edit_time)
+        except DateTimeSyntaxError:
+            # we got fed with a non-valid date
+            interval = self.asAgeString(None)
         if not prettyprint:
             s = _("last edited %(interval)s ago") % {"interval":interval}
         else:
-            try:
-                #XXX do timezone conversion ?
-                lastlog = self.lastlog()
-                if lastlog: lastlog = ' ('+lastlog+')'
-                
-                # build the link around the interval
-                linked_interval = (
-                    ' <a href="%s/diff" title="%s (%s)" >%s</a>' % (
-                    self.pageUrl(),
-                    _('show last edit'),
-                    lastlog, 
-                    interval))
-                
-                # use the link in a clear i18n way                                                                         
-                s =  _('last edited %(interval)s ago')  % {"interval": linked_interval}
+            lastlog = self.lastlog()
+            if lastlog and len(lastlog)>0:
+                lastlog = ' ('+lastlog+')'
 
-            except:
-                s = _('last edited %(interval)s ago') % {"interval": interval}
-                
+            # build the link around the interval
+            linked_interval = (
+                ' <a href="%s/diff" title="%s%s" >%s</a>' % (
+                self.pageUrl(),
+                _('show last edit'),
+                lastlog, 
+                interval))
+
+            # use the link in a clear i18n way
+            s =  _('last edited %(interval)s ago')  % {"interval": linked_interval}
+
         if (last_editor and
-            not re.match(r'^[0-9\.\s]*$',last_editor)):
+            # anonymous? try to find out by somehow matching an ip address:
+            not re.match(r'^(?:\d{1,3}\.){3}\d{1,3}$',last_editor)):
             # escape some things that might cause trouble in an attribute
             editor = re.sub(r'"',r'',last_editor)
 
@@ -1263,7 +1330,7 @@
         p = self.pageWithNameOrId(page)
         if p:
             try: id = p.getId() # poor caching
-            except: id = p.id #all-brains
+            except AttributeError: id = p.id #all-brains
         else: id = page
         if self.hasCatalogIndexesMetadata(
             (['meta_type','path','canonicalLinks'], [])):

Modified: zope-zwiki/trunk/ZWikiPage_tests.py
===================================================================
--- zope-zwiki/trunk/ZWikiPage_tests.py	2007-04-08 14:54:05 UTC (rev 761)
+++ zope-zwiki/trunk/ZWikiPage_tests.py	2007-04-08 14:55:27 UTC (rev 762)
@@ -224,3 +224,19 @@
         self.p.edit(text='&dtml-subtopics')
         self.failUnless(self.p.displaysSubtopicsWithDtml())
 
+    def test_linkTitleFrom(self):
+        edittime = DateTime.DateTime() - 0.2
+        edittime = edittime.ISO()
+        r = self.p.linkTitleFrom()
+        self.assertEquals( r, 'last edited some time ago')
+        r = self.p.linkTitleFrom(prettyprint=1) 
+        self.failUnless( 'some time' in r )
+        self.failUnless( '<a href=' in r )
+        r = self.p.linkTitleFrom(last_edit_time=edittime, prettyprint=1)
+        self.failUnless( '4 hours' in r )
+        r = self.p.linkTitleFrom(last_edit_time=edittime, \
+                                 last_editor='fred', prettyprint=1)
+        self.failUnless( 'fred' in r )
+        edittime = 'not valid'
+        r = self.p.linkTitleFrom(last_edit_time=edittime)
+        self.failUnless( 'some time' in r )

Modified: zope-zwiki/trunk/__init__.py
===================================================================
--- zope-zwiki/trunk/__init__.py	2007-04-08 14:54:05 UTC (rev 761)
+++ zope-zwiki/trunk/__init__.py	2007-04-08 14:55:27 UTC (rev 762)
@@ -3,7 +3,7 @@
 __doc__="""
 ZWiki product
 """
-__version__='0.58.0'
+__version__='0.59.0'
 
 import os, re, os.path, string, urllib
 
@@ -278,6 +278,7 @@
         else:
             id = f._setObject(filename, File(filename, '', text))
             if type == 'css': f[filename].content_type = 'text/css'
+    f.objectValues(spec='ZWiki Page')[0].updatecontents()
 
 def addZWikiPage(self, id, title='',
                   page_type=PAGETYPES[0]._id, file=''):

Modified: zope-zwiki/trunk/debian/changelog
===================================================================
--- zope-zwiki/trunk/debian/changelog	2007-04-08 14:54:05 UTC (rev 761)
+++ zope-zwiki/trunk/debian/changelog	2007-04-08 14:55:27 UTC (rev 762)
@@ -1,9 +1,10 @@
-zope-zwiki (0.58.0-2) UNRELEASED; urgency=low
+zope-zwiki (0.59.0-1) unstable; urgency=low
 
+  * New upstream release.
   * debian/watch: added.
   * debian/control: set priority to extra.
 
- -- Fabio Tranchitella <kobold at debian.org>  Fri,  9 Feb 2007 14:03:03 +0100
+ -- Fabio Tranchitella <kobold at debian.org>  Sun, 08 Apr 2007 16:54:56 +0200
 
 zope-zwiki (0.58.0-1) unstable; urgency=low
 

Modified: zope-zwiki/trunk/i18n/af.po
===================================================================
--- zope-zwiki/trunk/i18n/af.po	2007-04-08 14:54:05 UTC (rev 761)
+++ zope-zwiki/trunk/i18n/af.po	2007-04-08 14:55:27 UTC (rev 762)
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: zwiki\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL at ADDRESS>\n"
-"POT-Creation-Date: Sat Sep  2 18:10:16 2006\n"
+"POT-Creation-Date: Tue Mar 27 14:50:46 2007\n"
 "PO-Revision-Date: 2006-03-15 21:09+0000\n"
 "Last-Translator: Simon Michael <simon at joyful.com>\n"
 "Language-Team: Afrikaans <af at li.org>\n"
@@ -17,33 +17,29 @@
 "Content-Transfer-Encoding: 8bit\n"
 "Domain: zwiki\n"
 
-#: src/ZWiki/Admin.py:62
+#: src/ZWiki/Admin.py:58
 msgid "You are not authorized to upgrade all pages."
 msgstr ""
 
-#: src/ZWiki/Admin.py:63
+#: src/ZWiki/Admin.py:59
 msgid "(folder -> Manage properties)"
 msgstr ""
 
-#: src/ZWiki/Diff.py:174
+#: src/ZWiki/Diff.py:179
 msgid "You are not authorized to reparent this ZWiki Page."
 msgstr ""
 
-#: src/ZWiki/Diff.py:180 src/ZWiki/plugins/tracker/tracker.py:332
+#: src/ZWiki/Diff.py:185 src/ZWiki/plugins/tracker/tracker.py:333
 msgid "You are not authorized to rename this ZWiki Page."
 msgstr ""
 
-#: src/ZWiki/Editing.py:156 src/ZWiki/Editing.py:294 src/ZWiki/Views.py:332
-#: src/ZWiki/Views.py:435 src/ZWiki/plugins/tracker/tracker.py:321
-msgid ""
-"Sorry, this wiki doesn't allow anonymous edits. Please configure a username "
-"in options first."
+#: src/ZWiki/Editing.py:156 src/ZWiki/Editing.py:294 src/ZWiki/Views.py:336
+#: src/ZWiki/Views.py:439 src/ZWiki/plugins/tracker/tracker.py:322
+msgid "Sorry, this wiki doesn't allow anonymous edits. Please configure a username in options first."
 msgstr ""
 
 #: src/ZWiki/Editing.py:327
-msgid ""
-"You are not authorized to reparent or change subtopics links on this ZWiki "
-"Page."
+msgid "You are not authorized to reparent or change subtopics links on this ZWiki Page."
 msgstr ""
 
 #: src/ZWiki/Editing.py:349
@@ -51,9 +47,9 @@
 msgstr ""
 
 #: src/ZWiki/Editing.py:383 src/ZWiki/Editing.py:410
-#: src/ZWiki/plugins/tracker/tracker.py:340
-#: src/ZWiki/plugins/tracker/tracker.py:347
-#: src/ZWiki/plugins/tracker/tracker.py:354
+#: src/ZWiki/plugins/tracker/tracker.py:344
+#: src/ZWiki/plugins/tracker/tracker.py:351
+#: src/ZWiki/plugins/tracker/tracker.py:358
 msgid "You are not authorized to edit this ZWiki Page."
 msgstr ""
 
@@ -62,8 +58,7 @@
 msgstr ""
 
 #: src/ZWiki/Editing.py:563
-msgid ""
-"This page was renamed to %s. You can delete this one if no longer needed.\n"
+msgid "This page was renamed to %s. You can delete this one if no longer needed.\n"
 msgstr ""
 
 #: src/ZWiki/Editing.py:659
@@ -83,9 +78,7 @@
 msgstr ""
 
 #: src/ZWiki/Editing.py:830
-msgid ""
-"your edit contained a banned link pattern. Please contact the site "
-"administrator for help."
+msgid "your edit contained a banned link pattern. Please contact the site administrator for help."
 msgstr ""
 
 #: src/ZWiki/Editing.py:841
@@ -93,10 +86,7 @@
 msgstr ""
 
 #: src/ZWiki/Editing.py:842
-msgid ""
-"adding of external links by unidentified users is restricted. Please back up "
-"and remove some of the http urls you added, or contact the site "
-"administrator for help."
+msgid "adding of external links by unidentified users is restricted. Please back up and remove some of the http urls you added, or contact the site administrator for help."
 msgstr ""
 
 #: src/ZWiki/Editing.py:853
@@ -104,85 +94,86 @@
 msgstr ""
 
 #: src/ZWiki/Editing.py:854
-msgid ""
-"adding of external links is restricted, even for identified users. Please "
-"back up and remove some of the http urls you added, or contact the site "
-"administrator for help."
+msgid "adding of external links is restricted, even for identified users. Please back up and remove some of the http urls you added, or contact the site administrator for help."
 msgstr ""
 
-#: src/ZWiki/Mail.py:506 src/ZWiki/skins/dtmlmessages.pt:58
+#: src/ZWiki/Mail.py:506 src/ZWiki/skins/dtmlmessages.pt:60
 msgid "anonymous"
 msgstr ""
 
-#: src/ZWiki/OutlineSupport.py:843 src/ZWiki/skins/zwiki/links.pt:56
+#: src/ZWiki/OutlineSupport.py:378
+msgid "Sorry, this wiki doesn't allow anonymous reparenting. Please configure a username in options first."
+msgstr ""
+
+#: src/ZWiki/OutlineSupport.py:878 src/ZWiki/skins/zwiki/links.pt:56
 msgid "which pages link to this one ?"
 msgstr ""
 
-#: src/ZWiki/OutlineSupport.py:851
+#: src/ZWiki/OutlineSupport.py:886
 msgid "You are here"
 msgstr ""
 
-#: src/ZWiki/Utils.py:465
+#: src/ZWiki/Utils.py:487
 msgid "years"
 msgstr ""
 
-#: src/ZWiki/Utils.py:465
+#: src/ZWiki/Utils.py:487
 msgid "year"
 msgstr ""
 
-#: src/ZWiki/Utils.py:467
+#: src/ZWiki/Utils.py:489
 msgid "month"
 msgstr ""
 
-#: src/ZWiki/Utils.py:467
+#: src/ZWiki/Utils.py:489
 msgid "months"
 msgstr ""
 
-#: src/ZWiki/Utils.py:469
+#: src/ZWiki/Utils.py:491
 msgid "weeks"
 msgstr ""
 
-#: src/ZWiki/Utils.py:469
+#: src/ZWiki/Utils.py:491
 msgid "week"
 msgstr ""
 
-#: src/ZWiki/Utils.py:471
+#: src/ZWiki/Utils.py:493
 msgid "day"
 msgstr ""
 
-#: src/ZWiki/Utils.py:471
+#: src/ZWiki/Utils.py:493
 msgid "days"
 msgstr ""
 
-#: src/ZWiki/Utils.py:473
+#: src/ZWiki/Utils.py:495
 msgid "hours"
 msgstr ""
 
-#: src/ZWiki/Utils.py:473
+#: src/ZWiki/Utils.py:495
 msgid "hour"
 msgstr ""
 
-#: src/ZWiki/Utils.py:475
+#: src/ZWiki/Utils.py:497
 msgid "minute"
 msgstr ""
 
-#: src/ZWiki/Utils.py:475
+#: src/ZWiki/Utils.py:497
 msgid "minutes"
 msgstr ""
 
-#: src/ZWiki/Utils.py:477
+#: src/ZWiki/Utils.py:499
 msgid "second"
 msgstr ""
 
-#: src/ZWiki/Utils.py:477
+#: src/ZWiki/Utils.py:499
 msgid "seconds"
 msgstr ""
 
-#: src/ZWiki/Views.py:346
+#: src/ZWiki/Views.py:350
 msgid "Page is locked"
 msgstr ""
 
-#: src/ZWiki/Views.py:357
+#: src/ZWiki/Views.py:361
 msgid ""
 "\n"
 "            This page has a webDAV lock. Someone is probably editing it\n"
@@ -193,60 +184,58 @@
 "            "
 msgstr ""
 
-#: src/ZWiki/Views.py:364
+#: src/ZWiki/Views.py:368
 msgid "To discard your changes and try again, click OK."
 msgstr ""
 
-#: src/ZWiki/Views.py:393
+#: src/ZWiki/Views.py:397
 msgid "Edit conflict"
 msgstr ""
 
-#: src/ZWiki/Views.py:413
+#: src/ZWiki/Views.py:417
 msgid "Someone else has saved this page while you were editing"
 msgstr ""
 
-#: src/ZWiki/Views.py:414
+#: src/ZWiki/Views.py:418
 msgid "To resolve the conflict, do this"
 msgstr ""
 
-#: src/ZWiki/Views.py:415
+#: src/ZWiki/Views.py:419
 msgid "Click your browser's back button"
 msgstr ""
 
-#: src/ZWiki/Views.py:416
+#: src/ZWiki/Views.py:420
 msgid "Copy your recent edits to the clipboard"
 msgstr ""
 
-#: src/ZWiki/Views.py:417
+#: src/ZWiki/Views.py:421
 msgid "Click your browser's refresh button"
 msgstr ""
 
-#: src/ZWiki/Views.py:418
+#: src/ZWiki/Views.py:422
 msgid "Paste in your edits again, being mindful of the latest changes"
 msgstr ""
 
-#: src/ZWiki/Views.py:419
+#: src/ZWiki/Views.py:423
 msgid "Click the Change button again"
 msgstr ""
 
-#: src/ZWiki/Views.py:420 src/ZWiki/skins/zwiki/editform.pt:163
+#: src/ZWiki/Views.py:424 src/ZWiki/skins/zwiki/editform.pt:163
 msgid "or"
 msgstr ""
 
-#: src/ZWiki/Views.py:421
+#: src/ZWiki/Views.py:425
 msgid "To discard your changes and start again, click OK"
 msgstr ""
 
-#: src/ZWiki/Views.py:490
+#: src/ZWiki/Views.py:501
 msgid ""
 "\n"
-"        Access keys can be accessed in mozilla-based browsers by pressing "
-"alt-<key>\n"
+"        Access keys can be accessed in mozilla-based browsers by pressing alt-<key>\n"
 "        IE users: must also press enter\n"
 "        Mac users: command-<key>\n"
 "        Opera users: shift-escape-<key>\n"
-"        These won't work here, back up to the previous page to try them "
-"out.\n"
+"        These won't work here, back up to the previous page to try them out.\n"
 "\n"
 "        0    show these access key assignments\n"
 "\n"
@@ -262,10 +251,8 @@
 "        s    go to search field\n"
 "        \n"
 "        page functions:\n"
-"        +    (in a plone/cmf site with skin switching set up) use zwiki's "
-"plone/cmf skin\n"
-"        -    (in a plone/cmf site with skin switching set up) use zwiki's "
-"standard skin\n"
+"        +    (in a plone/cmf site with skin switching set up) use zwiki's plone/cmf skin\n"
+"        -    (in a plone/cmf site with skin switching set up) use zwiki's standard skin\n"
 "        v    view page\n"
 "        m    mail subscription\n"
 "        b    show backlinks (links to this page)\n"
@@ -293,32 +280,31 @@
 "        "
 msgstr ""
 
-#: src/ZWiki/Wikis.py:49
-msgid "Unknown wiki type"
-msgstr ""
-
-#: src/ZWiki/ZWikiPage.py:675
+#: src/ZWiki/ZWikiPage.py:744
 msgid "create this page"
 msgstr ""
 
-#: src/ZWiki/ZWikiPage.py:798 src/ZWiki/ZWikiPage.py:814
-#: src/ZWiki/ZWikiPage.py:817
+#: src/ZWiki/ZWikiPage.py:872 src/ZWiki/ZWikiPage.py:887
 msgid "last edited %(interval)s ago"
 msgstr ""
 
-#: src/ZWiki/ZWikiPage.py:809
+#: src/ZWiki/ZWikiPage.py:882
 msgid "show last edit"
 msgstr ""
 
-#: src/ZWiki/ZWikiPage.py:826 src/ZWiki/ZWikiPage.py:828
+#: src/ZWiki/ZWikiPage.py:897 src/ZWiki/ZWikiPage.py:899
 msgid "by %(editor)s"
 msgstr ""
 
-#: src/ZWiki/__init__.py:34
+#: src/ZWiki/__init__.py:200
+msgid "Unknown wiki type"
+msgstr ""
+
+#: src/ZWiki/__init__.py:39
 msgid "No need to add a Zwiki Outline Cache"
 msgstr ""
 
-#: src/ZWiki/__init__.py:35
+#: src/ZWiki/__init__.py:40
 msgid ""
 "Zwiki Outline Cache appears in the ZMI Add menu\n"
 "        for implementation reasons, but should not be added directly.\n"
@@ -330,6 +316,10 @@
 msgid "comments"
 msgstr ""
 
+#: src/ZWiki/pagetypes/html.py:50 src/ZWiki/pagetypes/rst.py:85
+msgid "reply"
+msgstr ""
+
 #: src/ZWiki/pagetypes/moin.py:1990
 msgid "Expected \"=\" to follow \"%(token)s\""
 msgstr ""
@@ -366,10 +356,6 @@
 msgid "Expected a color value \"%(arg)s\" after \"%(key)s\""
 msgstr ""
 
-#: src/ZWiki/pagetypes/rst.py:85
-msgid "reply"
-msgstr ""
-
 #: src/ZWiki/plugins/latexwiki/wikis/latexwiki/diffform.pt:127
 #: src/ZWiki/plugins/mathaction/wikis/mathaction/old-diffform.pt:127
 msgid "full history"
@@ -443,7 +429,7 @@
 msgstr ""
 
 #: src/ZWiki/plugins/tracker/filterissues.pt:12
-#: src/ZWiki/skins/dtmlmessages.pt:30
+#: src/ZWiki/skins/dtmlmessages.pt:31
 msgid "Filter issues"
 msgstr ""
 
@@ -455,109 +441,105 @@
 msgid "Issue tracker"
 msgstr ""
 
-#: src/ZWiki/plugins/tracker/tracker.py:361
+#: src/ZWiki/plugins/tracker/tracker.py:365
 #, fuzzy
 msgid "You are not authorized to comment on this ZWiki Page."
 msgstr "Lewer kommentaar op wiki bladsy"
 
-#: src/ZWiki/skins/dtmlmessages.pt:10 src/ZWiki/skins/dtmlmessages.pt:32
+#: src/ZWiki/skins/dtmlmessages.pt:10 src/ZWiki/skins/dtmlmessages.pt:33
+msgid "name"
+msgstr ""
+
+#: src/ZWiki/skins/dtmlmessages.pt:11 src/ZWiki/skins/dtmlmessages.pt:34
 msgid "category"
 msgstr ""
 
-#: src/ZWiki/skins/dtmlmessages.pt:11 src/ZWiki/skins/dtmlmessages.pt:33
+#: src/ZWiki/skins/dtmlmessages.pt:12 src/ZWiki/skins/dtmlmessages.pt:35
 msgid "severity"
 msgstr ""
 
-#: src/ZWiki/skins/dtmlmessages.pt:12 src/ZWiki/skins/dtmlmessages.pt:34
+#: src/ZWiki/skins/dtmlmessages.pt:13 src/ZWiki/skins/dtmlmessages.pt:36
 msgid "status"
 msgstr ""
 
-#: src/ZWiki/skins/dtmlmessages.pt:13 src/ZWiki/skins/dtmlmessages.pt:35
+#: src/ZWiki/skins/dtmlmessages.pt:14 src/ZWiki/skins/dtmlmessages.pt:37
 msgid "age"
 msgstr ""
 
-#: src/ZWiki/skins/dtmlmessages.pt:14 src/ZWiki/skins/dtmlmessages.pt:36
+#: src/ZWiki/skins/dtmlmessages.pt:15 src/ZWiki/skins/dtmlmessages.pt:38
 msgid "modified"
 msgstr ""
 
-#: src/ZWiki/skins/dtmlmessages.pt:15
+#: src/ZWiki/skins/dtmlmessages.pt:16
 msgid "Add a new issue:"
 msgstr ""
 
-#: src/ZWiki/skins/dtmlmessages.pt:16
+#: src/ZWiki/skins/dtmlmessages.pt:17
 msgid "Name:"
 msgstr ""
 
-#: src/ZWiki/skins/dtmlmessages.pt:17
+#: src/ZWiki/skins/dtmlmessages.pt:18
 msgid "Category:"
 msgstr ""
 
-#: src/ZWiki/skins/dtmlmessages.pt:18
+#: src/ZWiki/skins/dtmlmessages.pt:19
 msgid "Severity:"
 msgstr ""
 
-#: src/ZWiki/skins/dtmlmessages.pt:19
-msgid "Status:"
-msgstr ""
-
 #: src/ZWiki/skins/dtmlmessages.pt:2
 msgid "Here are the wiki's issue pages."
 msgstr ""
 
 #: src/ZWiki/skins/dtmlmessages.pt:20
-msgid "Details:"
+msgid "Status:"
 msgstr ""
 
 #: src/ZWiki/skins/dtmlmessages.pt:21
-msgid "add issue"
+msgid "Details:"
 msgstr ""
 
 #: src/ZWiki/skins/dtmlmessages.pt:22
-msgid "More advanced"
+msgid "add issue"
 msgstr ""
 
 #: src/ZWiki/skins/dtmlmessages.pt:23
-msgid "issue tracker"
+msgid "More advanced"
 msgstr ""
 
 #: src/ZWiki/skins/dtmlmessages.pt:24
-msgid "search options"
+msgid "issue tracker"
 msgstr ""
 
 #: src/ZWiki/skins/dtmlmessages.pt:25
-msgid "Name contains any of:"
+msgid "search options"
 msgstr ""
 
 #: src/ZWiki/skins/dtmlmessages.pt:26
-msgid "Page text contains any of:"
+msgid "Name contains any of:"
 msgstr ""
 
 #: src/ZWiki/skins/dtmlmessages.pt:27
-msgid "Categories:"
+msgid "Page text contains any of:"
 msgstr ""
 
 #: src/ZWiki/skins/dtmlmessages.pt:28
-msgid "Severities:"
+msgid "Categories:"
 msgstr ""
 
 #: src/ZWiki/skins/dtmlmessages.pt:29
-msgid "Statuses:"
+msgid "Severities:"
 msgstr ""
 
 #: src/ZWiki/skins/dtmlmessages.pt:3
 msgid "Enter a search term, click the numbers to the right,"
 msgstr ""
 
-#: src/ZWiki/skins/dtmlmessages.pt:37
-msgid "Submitted by"
+#: src/ZWiki/skins/dtmlmessages.pt:30
+msgid "Statuses:"
 msgstr ""
 
-#: src/ZWiki/skins/dtmlmessages.pt:38
-msgid "Name"
-msgstr ""
-
 #: src/ZWiki/skins/dtmlmessages.pt:39
-msgid "Category"
+msgid "Submitted by"
 msgstr ""
 
 #: src/ZWiki/skins/dtmlmessages.pt:4
@@ -565,167 +547,165 @@
 msgstr ""
 
 #: src/ZWiki/skins/dtmlmessages.pt:40
-msgid "Severity"
+msgid "Name"
 msgstr ""
 
 #: src/ZWiki/skins/dtmlmessages.pt:41
-msgid "Status"
+msgid "Category"
 msgstr ""
 
 #: src/ZWiki/skins/dtmlmessages.pt:42
-msgid "Optional subject"
+msgid "Severity"
 msgstr ""
 
 #: src/ZWiki/skins/dtmlmessages.pt:43
+msgid "Status"
+msgstr ""
+
+#: src/ZWiki/skins/dtmlmessages.pt:44
+msgid "Optional subject"
+msgstr ""
+
+#: src/ZWiki/skins/dtmlmessages.pt:45
 msgid "Optional comment"
 msgstr ""
 
-#: src/ZWiki/skins/dtmlmessages.pt:44 src/ZWiki/skins/dtmlmessages.pt:45
+#: src/ZWiki/skins/dtmlmessages.pt:46 src/ZWiki/skins/dtmlmessages.pt:47
 #, fuzzy
 msgid "Add ZWiki"
 msgstr "Las Wiki By"
 
-#: src/ZWiki/skins/dtmlmessages.pt:46
+#: src/ZWiki/skins/dtmlmessages.pt:48
 msgid "Id:"
 msgstr ""
 
-#: src/ZWiki/skins/dtmlmessages.pt:47
+#: src/ZWiki/skins/dtmlmessages.pt:49
 msgid "Title:"
 msgstr ""
 
-#: src/ZWiki/skins/dtmlmessages.pt:48
+#: src/ZWiki/skins/dtmlmessages.pt:5
+msgid "browse open issues"
+msgstr ""
+
+#: src/ZWiki/skins/dtmlmessages.pt:50
 msgid "Template:"
 msgstr ""
 
-#: src/ZWiki/skins/dtmlmessages.pt:49
+#: src/ZWiki/skins/dtmlmessages.pt:51
 #, fuzzy
 msgid "Add wiki"
 msgstr "Las Wiki By"
 
-#: src/ZWiki/skins/dtmlmessages.pt:5
-msgid "browse open issues"
-msgstr ""
-
-#: src/ZWiki/skins/dtmlmessages.pt:50
+#: src/ZWiki/skins/dtmlmessages.pt:52
 msgid "Pages changed in the last"
 msgstr ""
 
-#: src/ZWiki/skins/dtmlmessages.pt:51
+#: src/ZWiki/skins/dtmlmessages.pt:53
 msgid "Recently changed pages, with summaries"
 msgstr ""
 
-#: src/ZWiki/skins/dtmlmessages.pt:52
+#: src/ZWiki/skins/dtmlmessages.pt:54
 msgid "Show summaries ?"
 msgstr ""
 
-#: src/ZWiki/skins/dtmlmessages.pt:53
+#: src/ZWiki/skins/dtmlmessages.pt:55
 msgid "Refresh"
 msgstr ""
 
-#: src/ZWiki/skins/dtmlmessages.pt:54
+#: src/ZWiki/skins/dtmlmessages.pt:56
 msgid "Page"
 msgstr ""
 
-#: src/ZWiki/skins/dtmlmessages.pt:55
+#: src/ZWiki/skins/dtmlmessages.pt:57
 msgid "Edited&nbsp;by"
 msgstr ""
 
-#: src/ZWiki/skins/dtmlmessages.pt:56
+#: src/ZWiki/skins/dtmlmessages.pt:58
 msgid "Time"
 msgstr ""
 
-#: src/ZWiki/skins/dtmlmessages.pt:57
+#: src/ZWiki/skins/dtmlmessages.pt:59
 msgid "NEW"
 msgstr ""
 
-#: src/ZWiki/skins/dtmlmessages.pt:59
-msgid "Pages marked (NEW) have been created within the last week"
-msgstr ""
-
 #: src/ZWiki/skins/dtmlmessages.pt:6
 msgid "search issues"
 msgstr ""
 
-#: src/ZWiki/skins/dtmlmessages.pt:60
+#: src/ZWiki/skins/dtmlmessages.pt:61
+msgid "Pages marked (NEW) have been created within the last week"
+msgstr ""
+
+#: src/ZWiki/skins/dtmlmessages.pt:62
 msgid "Enter a word or phrase and hit enter to search the entire wiki."
 msgstr ""
 
-#: src/ZWiki/skins/dtmlmessages.pt:61
+#: src/ZWiki/skins/dtmlmessages.pt:63
 msgid "This is the same as using the search field at top right."
 msgstr ""
 
-#: src/ZWiki/skins/dtmlmessages.pt:62
+#: src/ZWiki/skins/dtmlmessages.pt:64
 msgid "Tips: A single word works best for matching page names."
 msgstr ""
 
-#: src/ZWiki/skins/dtmlmessages.pt:63
-msgid ""
-"Case-insensitivity and wildcards may be supported depending on your catalog "
-"configuration."
+#: src/ZWiki/skins/dtmlmessages.pt:65
+msgid "Case-insensitivity and wildcards may be supported depending on your catalog configuration."
 msgstr ""
 
-#: src/ZWiki/skins/dtmlmessages.pt:64
+#: src/ZWiki/skins/dtmlmessages.pt:66
 msgid "Leave it blank to list all pages."
 msgstr ""
 
-#: src/ZWiki/skins/dtmlmessages.pt:65 src/ZWiki/skins/dtmlmessages.pt:66
+#: src/ZWiki/skins/dtmlmessages.pt:67 src/ZWiki/skins/dtmlmessages.pt:68
 msgid "Search"
 msgstr "Soek"
 
-#: src/ZWiki/skins/dtmlmessages.pt:67
+#: src/ZWiki/skins/dtmlmessages.pt:69
 msgid "Page names matching"
 msgstr ""
 
-#: src/ZWiki/skins/dtmlmessages.pt:68
-msgid "Text matching"
-msgstr ""
-
-#: src/ZWiki/skins/dtmlmessages.pt:69
-msgid "Thorough (non-catalog) search for text matching"
-msgstr ""
-
 #: src/ZWiki/skins/dtmlmessages.pt:7
 msgid "recent"
 msgstr ""
 
 #: src/ZWiki/skins/dtmlmessages.pt:70
-msgid "Set your preferences for this wiki:"
+msgid "Text matching"
 msgstr ""
 
 #: src/ZWiki/skins/dtmlmessages.pt:71
-msgid "User name:"
+msgid "Thorough (non-catalog) search for text matching"
 msgstr ""
 
 #: src/ZWiki/skins/dtmlmessages.pt:72
-msgid "(identifies your edits)"
+msgid "Set your preferences for this wiki:"
 msgstr ""
 
 #: src/ZWiki/skins/dtmlmessages.pt:73
-msgid "Email address:"
+msgid "User name:"
 msgstr ""
 
 #: src/ZWiki/skins/dtmlmessages.pt:74
-msgid "(allows mail subscription)"
+msgid "(identifies your edits, saves your votes, may be required)"
 msgstr ""
 
 #: src/ZWiki/skins/dtmlmessages.pt:75
-msgid "Your time zone:"
+msgid "Email address:"
 msgstr ""
 
 #: src/ZWiki/skins/dtmlmessages.pt:76
-msgid "(localizes most times)"
+msgid "(allows mail subscription)"
 msgstr ""
 
 #: src/ZWiki/skins/dtmlmessages.pt:77
-msgid "Edit form height:"
+msgid "Your time zone:"
 msgstr ""
 
 #: src/ZWiki/skins/dtmlmessages.pt:78
-msgid "(adjusts form size)"
+msgid "(localizes most times)"
 msgstr ""
 
 #: src/ZWiki/skins/dtmlmessages.pt:79
-msgid "Save options"
+msgid "Edit form height:"
 msgstr ""
 
 #: src/ZWiki/skins/dtmlmessages.pt:8
@@ -733,71 +713,71 @@
 msgstr ""
 
 #: src/ZWiki/skins/dtmlmessages.pt:80
+msgid "(adjusts form size)"
+msgstr ""
+
+#: src/ZWiki/skins/dtmlmessages.pt:81
+msgid "Save options"
+msgstr ""
+
+#: src/ZWiki/skins/dtmlmessages.pt:82
 msgid "Forget options"
 msgstr ""
 
-#: src/ZWiki/skins/dtmlmessages.pt:81 src/ZWiki/skins/dtmlmessages.pt:82
+#: src/ZWiki/skins/dtmlmessages.pt:83 src/ZWiki/skins/dtmlmessages.pt:84
 msgid "Add ZWiki Page"
 msgstr ""
 
-#: src/ZWiki/skins/dtmlmessages.pt:83
+#: src/ZWiki/skins/dtmlmessages.pt:85
 msgid "Page&nbsp;name:"
 msgstr ""
 
-#: src/ZWiki/skins/dtmlmessages.pt:84
+#: src/ZWiki/skins/dtmlmessages.pt:86
 #, fuzzy
 msgid "Add wiki page"
 msgstr "Las 'n Wiki Bladsy By"
 
-#: src/ZWiki/skins/dtmlmessages.pt:85
+#: src/ZWiki/skins/dtmlmessages.pt:87
 msgid "Topic"
 msgstr ""
 
-#: src/ZWiki/skins/dtmlmessages.pt:86
+#: src/ZWiki/skins/dtmlmessages.pt:88
 msgid "Last updated"
 msgstr ""
 
-#: src/ZWiki/skins/dtmlmessages.pt:87
+#: src/ZWiki/skins/dtmlmessages.pt:89
 msgid "Comments"
 msgstr ""
 
-#: src/ZWiki/skins/dtmlmessages.pt:88
+#: src/ZWiki/skins/dtmlmessages.pt:9 src/ZWiki/skins/dtmlmessages.pt:32
+msgid "#"
+msgstr ""
+
+#: src/ZWiki/skins/dtmlmessages.pt:90
 msgid "Views"
 msgstr ""
 
-#: src/ZWiki/skins/dtmlmessages.pt:89
+#: src/ZWiki/skins/dtmlmessages.pt:91
 msgid "Created"
 msgstr ""
 
-#: src/ZWiki/skins/dtmlmessages.pt:9 src/ZWiki/skins/dtmlmessages.pt:31
-msgid "#"
-msgstr ""
-
-#: src/ZWiki/skins/dtmlmessages.pt:90 src/ZWiki/skins/dtmlmessages.pt:92
+#: src/ZWiki/skins/dtmlmessages.pt:92 src/ZWiki/skins/dtmlmessages.pt:94
 msgid "by"
 msgstr ""
 
-#: src/ZWiki/skins/dtmlmessages.pt:91
+#: src/ZWiki/skins/dtmlmessages.pt:93
 msgid "<dtml-var lasteditinterval> ago</dtml-var>"
 msgstr ""
 
-#: src/ZWiki/skins/dtmlmessages.pt:93
+#: src/ZWiki/skins/dtmlmessages.pt:95
 msgid "on"
 msgstr ""
 
-#: src/ZWiki/skins/zwiki/backlinks.pt:108
-msgid "Subtopics"
-msgstr ""
-
-#: src/ZWiki/skins/zwiki/backlinks.pt:111
-msgid "This page has no subtopics."
-msgstr ""
-
-#: src/ZWiki/skins/zwiki/backlinks.pt:114
+#: src/ZWiki/skins/zwiki/backlinks.pt:102
 msgid "Here are it's subtopics."
 msgstr ""
 
-#: src/ZWiki/skins/zwiki/backlinks.pt:117
+#: src/ZWiki/skins/zwiki/backlinks.pt:105
 msgid "You can reorder them by clicking the ^ buttons."
 msgstr ""
 
@@ -809,60 +789,60 @@
 msgid "Parents"
 msgstr ""
 
-#: src/ZWiki/skins/zwiki/backlinks.pt:31
+#: src/ZWiki/skins/zwiki/backlinks.pt:28
 msgid "is a top-level topic."
 msgstr ""
 
-#: src/ZWiki/skins/zwiki/backlinks.pt:32
+#: src/ZWiki/skins/zwiki/backlinks.pt:29
 msgid "is a subtopic of:"
 msgstr ""
 
-#: src/ZWiki/skins/zwiki/backlinks.pt:55
+#: src/ZWiki/skins/zwiki/backlinks.pt:48
 msgid "Backlinks"
 msgstr ""
 
-#: src/ZWiki/skins/zwiki/backlinks.pt:56
+#: src/ZWiki/skins/zwiki/backlinks.pt:49
 msgid "Here are the pages which link to it:"
 msgstr ""
 
-#: src/ZWiki/skins/zwiki/backlinks.pt:57
+#: src/ZWiki/skins/zwiki/backlinks.pt:50
 msgid "No other pages link to this one."
 msgstr ""
 
-#: src/ZWiki/skins/zwiki/backlinks.pt:82
-msgid ""
-"You can set this page's parent(s) to place it within the overall page "
-"hierarchy."
+#: src/ZWiki/skins/zwiki/backlinks.pt:70
+msgid "You can set this page's parent(s) to place it within the overall page hierarchy."
 msgstr ""
 
-#: src/ZWiki/skins/zwiki/backlinks.pt:85
-msgid ""
-"Check one or more checkboxes or enter a page name here, and click the button."
+#: src/ZWiki/skins/zwiki/backlinks.pt:73
+msgid "Check one or more checkboxes or enter a page name here, and click the button."
 msgstr ""
 
-#: src/ZWiki/skins/zwiki/backlinks.pt:88
+#: src/ZWiki/skins/zwiki/backlinks.pt:76
 msgid "Enter a page name here and click the button."
 msgstr ""
 
-#: src/ZWiki/skins/zwiki/backlinks.pt:91
-msgid ""
-"You can type just the first few letters, case and punctuation are ignored."
+#: src/ZWiki/skins/zwiki/backlinks.pt:79
+msgid "You can type just the first few letters, case and punctuation are ignored."
 msgstr ""
 
-#: src/ZWiki/skins/zwiki/backlinks.pt:98
+#: src/ZWiki/skins/zwiki/backlinks.pt:86
 msgid "Reparent"
 msgstr ""
 
+#: src/ZWiki/skins/zwiki/backlinks.pt:96
+msgid "Subtopics"
+msgstr ""
+
+#: src/ZWiki/skins/zwiki/backlinks.pt:99
+msgid "This page has no subtopics."
+msgstr ""
+
 #: src/ZWiki/skins/zwiki/badtemplate.pt:12
 msgid "Bad template"
 msgstr ""
 
 #: src/ZWiki/skins/zwiki/badtemplate.pt:13
-msgid ""
-"There was a problem locating one of this wiki's skin templates. There may be "
-"a page or other non-page-template/non-dtml-method object with the same ID, "
-"obscuring the template. Or the template may be missing on the filesystem (an "
-"incomplete Zwiki installation)."
+msgid "There was a problem locating one of this wiki's skin templates. There may be a page or other non-page-template/non-dtml-method object with the same ID, obscuring the template. Or the template may be missing on the filesystem (an incomplete Zwiki installation)."
 msgstr ""
 
 #: src/ZWiki/skins/zwiki/commentform.pt:21
@@ -894,12 +874,18 @@
 msgid "add-comment"
 msgstr ""
 
-#: src/ZWiki/skins/zwiki/contentspage.pt:12
+#: src/ZWiki/skins/zwiki/contentspage.pt:10
+#: src/ZWiki/skins/zwiki/contentspage.pt:27
+msgid "Wiki contents for"
+msgstr ""
+
+#: src/ZWiki/skins/zwiki/contentspage.pt:13
+#: src/ZWiki/skins/zwiki/contentspage.pt:30
 msgid "Wiki contents"
 msgstr ""
 
-#: src/ZWiki/skins/zwiki/contentspage.pt:16
-msgid "Singletons"
+#: src/ZWiki/skins/zwiki/contentspage.pt:40
+msgid "Singletons:"
 msgstr ""
 
 #: src/ZWiki/skins/zwiki/denied.pt:12
@@ -982,11 +968,11 @@
 msgstr ""
 
 #: src/ZWiki/skins/zwiki/editform.pt:178
-msgid "preview this edit"
+msgid "Preview"
 msgstr ""
 
 #: src/ZWiki/skins/zwiki/editform.pt:178
-msgid "Preview"
+msgid "preview this edit"
 msgstr ""
 
 #: src/ZWiki/skins/zwiki/editform.pt:183
@@ -1023,13 +1009,17 @@
 msgstr ""
 
 #: src/ZWiki/skins/zwiki/editform.pt:71
-msgid "type"
+msgid "markup"
 msgstr ""
 
 #: src/ZWiki/skins/zwiki/editform.pt:72
 msgid "select the formatting and rendering style for this page"
 msgstr ""
 
+#: src/ZWiki/skins/zwiki/helppage.pt:12
+msgid "Help page"
+msgstr ""
+
 #: src/ZWiki/skins/zwiki/links.pt:102
 msgid "(external edit)"
 msgstr ""
@@ -1167,11 +1157,11 @@
 msgstr ""
 
 #: src/ZWiki/skins/zwiki/pagemanagementform.pt:45
-msgid "reparent"
+msgid "make this page a subtopic of the page you have entered"
 msgstr ""
 
 #: src/ZWiki/skins/zwiki/pagemanagementform.pt:45
-msgid "make this page a subtopic of the page you have entered"
+msgid "reparent"
 msgstr ""
 
 #: src/ZWiki/skins/zwiki/pagemanagementform.pt:50
@@ -1187,8 +1177,7 @@
 msgstr ""
 
 #: src/ZWiki/skins/zwiki/pagemanagementform.pt:55
-msgid ""
-"delete this page, and redirect links to the page you have entered, if any"
+msgid "delete this page, and redirect links to the page you have entered, if any"
 msgstr ""
 
 #: src/ZWiki/skins/zwiki/pagemanagementform.pt:60

Modified: zope-zwiki/trunk/i18n/ar.po
===================================================================
--- zope-zwiki/trunk/i18n/ar.po	2007-04-08 14:54:05 UTC (rev 761)
+++ zope-zwiki/trunk/i18n/ar.po	2007-04-08 14:55:27 UTC (rev 762)
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: zwiki\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL at ADDRESS>\n"
-"POT-Creation-Date: Sat Sep  2 18:10:16 2006\n"
+"POT-Creation-Date: Tue Mar 27 14:50:46 2007\n"
 "PO-Revision-Date: 2006-03-15 21:10+0000\n"
 "Last-Translator: Simon Michael <simon at joyful.com>\n"
 "Language-Team: Arabic <ar at li.org>\n"
@@ -17,34 +17,30 @@
 "Content-Transfer-Encoding: 8bit\n"
 "Domain: zwiki\n"
 
-#: src/ZWiki/Admin.py:62
+#: src/ZWiki/Admin.py:58
 msgid "You are not authorized to upgrade all pages."
 msgstr "غير مسمح لك بتطوير جميع الصفحات"
 
-#: src/ZWiki/Admin.py:63
+#: src/ZWiki/Admin.py:59
 msgid "(folder -> Manage properties)"
 msgstr ""
 
-#: src/ZWiki/Diff.py:174
+#: src/ZWiki/Diff.py:179
 #, fuzzy
 msgid "You are not authorized to reparent this ZWiki Page."
 msgstr "غير مسمح لك بأعادة تسمية صفحة Wiki هذه"
 
-#: src/ZWiki/Diff.py:180 src/ZWiki/plugins/tracker/tracker.py:332
+#: src/ZWiki/Diff.py:185 src/ZWiki/plugins/tracker/tracker.py:333
 msgid "You are not authorized to rename this ZWiki Page."
 msgstr "غير مسمح لك بأعادة تسمية صفحة Wiki هذه"
 
-#: src/ZWiki/Editing.py:156 src/ZWiki/Editing.py:294 src/ZWiki/Views.py:332
-#: src/ZWiki/Views.py:435 src/ZWiki/plugins/tracker/tracker.py:321
-msgid ""
-"Sorry, this wiki doesn't allow anonymous edits. Please configure a username "
-"in options first."
+#: src/ZWiki/Editing.py:156 src/ZWiki/Editing.py:294 src/ZWiki/Views.py:336
+#: src/ZWiki/Views.py:439 src/ZWiki/plugins/tracker/tracker.py:322
+msgid "Sorry, this wiki doesn't allow anonymous edits. Please configure a username in options first."
 msgstr ""
 
 #: src/ZWiki/Editing.py:327
-msgid ""
-"You are not authorized to reparent or change subtopics links on this ZWiki "
-"Page."
+msgid "You are not authorized to reparent or change subtopics links on this ZWiki Page."
 msgstr ""
 
 #: src/ZWiki/Editing.py:349
@@ -52,9 +48,9 @@
 msgstr ""
 
 #: src/ZWiki/Editing.py:383 src/ZWiki/Editing.py:410
-#: src/ZWiki/plugins/tracker/tracker.py:340
-#: src/ZWiki/plugins/tracker/tracker.py:347
-#: src/ZWiki/plugins/tracker/tracker.py:354
+#: src/ZWiki/plugins/tracker/tracker.py:344
+#: src/ZWiki/plugins/tracker/tracker.py:351
+#: src/ZWiki/plugins/tracker/tracker.py:358
 msgid "You are not authorized to edit this ZWiki Page."
 msgstr ""
 
@@ -63,8 +59,7 @@
 msgstr "غير مسمح لك بحذف صفحة Wiki هذه"
 
 #: src/ZWiki/Editing.py:563
-msgid ""
-"This page was renamed to %s. You can delete this one if no longer needed.\n"
+msgid "This page was renamed to %s. You can delete this one if no longer needed.\n"
 msgstr ""
 
 #: src/ZWiki/Editing.py:659
@@ -84,9 +79,7 @@
 msgstr ""
 
 #: src/ZWiki/Editing.py:830
-msgid ""
-"your edit contained a banned link pattern. Please contact the site "
-"administrator for help."
+msgid "your edit contained a banned link pattern. Please contact the site administrator for help."
 msgstr ""
 
 #: src/ZWiki/Editing.py:841
@@ -94,10 +87,7 @@
 msgstr ""
 
 #: src/ZWiki/Editing.py:842
-msgid ""
-"adding of external links by unidentified users is restricted. Please back up "
-"and remove some of the http urls you added, or contact the site "
-"administrator for help."
+msgid "adding of external links by unidentified users is restricted. Please back up and remove some of the http urls you added, or contact the site administrator for help."
 msgstr ""
 
 #: src/ZWiki/Editing.py:853
@@ -105,85 +95,86 @@
 msgstr ""
 
 #: src/ZWiki/Editing.py:854
-msgid ""
-"adding of external links is restricted, even for identified users. Please "
-"back up and remove some of the http urls you added, or contact the site "
-"administrator for help."
+msgid "adding of external links is restricted, even for identified users. Please back up and remove some of the http urls you added, or contact the site administrator for help."
 msgstr ""
 
-#: src/ZWiki/Mail.py:506 src/ZWiki/skins/dtmlmessages.pt:58
+#: src/ZWiki/Mail.py:506 src/ZWiki/skins/dtmlmessages.pt:60
 msgid "anonymous"
 msgstr "مجهول"
 
-#: src/ZWiki/OutlineSupport.py:843 src/ZWiki/skins/zwiki/links.pt:56
+#: src/ZWiki/OutlineSupport.py:378
+msgid "Sorry, this wiki doesn't allow anonymous reparenting. Please configure a username in options first."
+msgstr ""
+
+#: src/ZWiki/OutlineSupport.py:878 src/ZWiki/skins/zwiki/links.pt:56
 msgid "which pages link to this one ?"
 msgstr ""
 
-#: src/ZWiki/OutlineSupport.py:851
+#: src/ZWiki/OutlineSupport.py:886
 msgid "You are here"
 msgstr "أمت هنا"
 
-#: src/ZWiki/Utils.py:465
+#: src/ZWiki/Utils.py:487
 msgid "years"
 msgstr ""
 
-#: src/ZWiki/Utils.py:465
+#: src/ZWiki/Utils.py:487
 msgid "year"
 msgstr ""
 
-#: src/ZWiki/Utils.py:467
+#: src/ZWiki/Utils.py:489
 msgid "month"
 msgstr ""
 
-#: src/ZWiki/Utils.py:467
+#: src/ZWiki/Utils.py:489
 msgid "months"
 msgstr ""
 
-#: src/ZWiki/Utils.py:469
+#: src/ZWiki/Utils.py:491
 msgid "weeks"
 msgstr ""
 
-#: src/ZWiki/Utils.py:469
+#: src/ZWiki/Utils.py:491
 msgid "week"
 msgstr ""
 
-#: src/ZWiki/Utils.py:471
+#: src/ZWiki/Utils.py:493
 msgid "day"
 msgstr ""
 
-#: src/ZWiki/Utils.py:471
+#: src/ZWiki/Utils.py:493
 msgid "days"
 msgstr ""
 
-#: src/ZWiki/Utils.py:473
+#: src/ZWiki/Utils.py:495
 msgid "hours"
 msgstr ""
 
-#: src/ZWiki/Utils.py:473
+#: src/ZWiki/Utils.py:495
 msgid "hour"
 msgstr ""
 
-#: src/ZWiki/Utils.py:475
+#: src/ZWiki/Utils.py:497
 msgid "minute"
 msgstr ""
 
-#: src/ZWiki/Utils.py:475
+#: src/ZWiki/Utils.py:497
 msgid "minutes"
 msgstr ""
 
-#: src/ZWiki/Utils.py:477
+#: src/ZWiki/Utils.py:499
 msgid "second"
 msgstr ""
 
-#: src/ZWiki/Utils.py:477
+#: src/ZWiki/Utils.py:499
 msgid "seconds"
 msgstr ""
 
-#: src/ZWiki/Views.py:346
+#: src/ZWiki/Views.py:350
 msgid "Page is locked"
 msgstr ""
 
-#: src/ZWiki/Views.py:357
+#: src/ZWiki/Views.py:361
 msgid ""
 "\n"
 "            This page has a webDAV lock. Someone is probably editing it\n"
@@ -194,60 +185,58 @@
 "            "
 msgstr ""
 
-#: src/ZWiki/Views.py:364
+#: src/ZWiki/Views.py:368
 msgid "To discard your changes and try again, click OK."
 msgstr ""
 
-#: src/ZWiki/Views.py:393
+#: src/ZWiki/Views.py:397
 msgid "Edit conflict"
 msgstr ""
 
-#: src/ZWiki/Views.py:413
+#: src/ZWiki/Views.py:417
 msgid "Someone else has saved this page while you were editing"
 msgstr ""
 
-#: src/ZWiki/Views.py:414
+#: src/ZWiki/Views.py:418
 msgid "To resolve the conflict, do this"
 msgstr ""
 
-#: src/ZWiki/Views.py:415
+#: src/ZWiki/Views.py:419
 msgid "Click your browser's back button"
 msgstr ""
 
-#: src/ZWiki/Views.py:416
+#: src/ZWiki/Views.py:420
 msgid "Copy your recent edits to the clipboard"
 msgstr ""
 
-#: src/ZWiki/Views.py:417
+#: src/ZWiki/Views.py:421
 msgid "Click your browser's refresh button"
 msgstr ""
 
-#: src/ZWiki/Views.py:418
+#: src/ZWiki/Views.py:422
 msgid "Paste in your edits again, being mindful of the latest changes"
 msgstr ""
 
-#: src/ZWiki/Views.py:419
+#: src/ZWiki/Views.py:423
 msgid "Click the Change button again"
 msgstr ""
 
-#: src/ZWiki/Views.py:420 src/ZWiki/skins/zwiki/editform.pt:163
+#: src/ZWiki/Views.py:424 src/ZWiki/skins/zwiki/editform.pt:163
 msgid "or"
 msgstr ""
 
-#: src/ZWiki/Views.py:421
+#: src/ZWiki/Views.py:425
 msgid "To discard your changes and start again, click OK"
 msgstr ""
 
-#: src/ZWiki/Views.py:490
+#: src/ZWiki/Views.py:501
 msgid ""
 "\n"
-"        Access keys can be accessed in mozilla-based browsers by pressing "
-"alt-<key>\n"
+"        Access keys can be accessed in mozilla-based browsers by pressing alt-<key>\n"
 "        IE users: must also press enter\n"
 "        Mac users: command-<key>\n"
 "        Opera users: shift-escape-<key>\n"
-"        These won't work here, back up to the previous page to try them "
-"out.\n"
+"        These won't work here, back up to the previous page to try them out.\n"
 "\n"
 "        0    show these access key assignments\n"
 "\n"
@@ -263,10 +252,8 @@
 "        s    go to search field\n"
 "        \n"
 "        page functions:\n"
-"        +    (in a plone/cmf site with skin switching set up) use zwiki's "
-"plone/cmf skin\n"
-"        -    (in a plone/cmf site with skin switching set up) use zwiki's "
-"standard skin\n"
+"        +    (in a plone/cmf site with skin switching set up) use zwiki's plone/cmf skin\n"
+"        -    (in a plone/cmf site with skin switching set up) use zwiki's standard skin\n"
 "        v    view page\n"
 "        m    mail subscription\n"
 "        b    show backlinks (links to this page)\n"
@@ -294,32 +281,31 @@
 "        "
 msgstr ""
 
-#: src/ZWiki/Wikis.py:49
-msgid "Unknown wiki type"
-msgstr ""
-
-#: src/ZWiki/ZWikiPage.py:675
+#: src/ZWiki/ZWikiPage.py:744
 msgid "create this page"
 msgstr ""
 
-#: src/ZWiki/ZWikiPage.py:798 src/ZWiki/ZWikiPage.py:814
-#: src/ZWiki/ZWikiPage.py:817
+#: src/ZWiki/ZWikiPage.py:872 src/ZWiki/ZWikiPage.py:887
 msgid "last edited %(interval)s ago"
 msgstr ""
 
-#: src/ZWiki/ZWikiPage.py:809
+#: src/ZWiki/ZWikiPage.py:882
 msgid "show last edit"
 msgstr ""
 
-#: src/ZWiki/ZWikiPage.py:826 src/ZWiki/ZWikiPage.py:828
+#: src/ZWiki/ZWikiPage.py:897 src/ZWiki/ZWikiPage.py:899
 msgid "by %(editor)s"
 msgstr ""
 
-#: src/ZWiki/__init__.py:34
+#: src/ZWiki/__init__.py:200
+msgid "Unknown wiki type"
+msgstr ""
+
+#: src/ZWiki/__init__.py:39
 msgid "No need to add a Zwiki Outline Cache"
 msgstr ""
 
-#: src/ZWiki/__init__.py:35
+#: src/ZWiki/__init__.py:40
 msgid ""
 "Zwiki Outline Cache appears in the ZMI Add menu\n"
 "        for implementation reasons, but should not be added directly.\n"
@@ -331,6 +317,10 @@
 msgid "comments"
 msgstr ""
 
+#: src/ZWiki/pagetypes/html.py:50 src/ZWiki/pagetypes/rst.py:85
+msgid "reply"
+msgstr ""
+
 #: src/ZWiki/pagetypes/moin.py:1990
 msgid "Expected \"=\" to follow \"%(token)s\""
 msgstr ""
@@ -367,10 +357,6 @@
 msgid "Expected a color value \"%(arg)s\" after \"%(key)s\""
 msgstr ""
 
-#: src/ZWiki/pagetypes/rst.py:85
-msgid "reply"
-msgstr ""
-
 #: src/ZWiki/plugins/latexwiki/wikis/latexwiki/diffform.pt:127
 #: src/ZWiki/plugins/mathaction/wikis/mathaction/old-diffform.pt:127
 msgid "full history"
@@ -444,7 +430,7 @@
 msgstr ""
 
 #: src/ZWiki/plugins/tracker/filterissues.pt:12
-#: src/ZWiki/skins/dtmlmessages.pt:30
+#: src/ZWiki/skins/dtmlmessages.pt:31
 msgid "Filter issues"
 msgstr ""
 
@@ -456,109 +442,105 @@
 msgid "Issue tracker"
 msgstr ""
 
-#: src/ZWiki/plugins/tracker/tracker.py:361
+#: src/ZWiki/plugins/tracker/tracker.py:365
 #, fuzzy
 msgid "You are not authorized to comment on this ZWiki Page."
 msgstr "غير مسمح لك بأعادة تسمية صفحة Wiki هذه"
 
-#: src/ZWiki/skins/dtmlmessages.pt:10 src/ZWiki/skins/dtmlmessages.pt:32
+#: src/ZWiki/skins/dtmlmessages.pt:10 src/ZWiki/skins/dtmlmessages.pt:33
+msgid "name"
+msgstr ""
+
+#: src/ZWiki/skins/dtmlmessages.pt:11 src/ZWiki/skins/dtmlmessages.pt:34
 msgid "category"
 msgstr ""
 
-#: src/ZWiki/skins/dtmlmessages.pt:11 src/ZWiki/skins/dtmlmessages.pt:33
+#: src/ZWiki/skins/dtmlmessages.pt:12 src/ZWiki/skins/dtmlmessages.pt:35
 msgid "severity"
 msgstr ""
 
-#: src/ZWiki/skins/dtmlmessages.pt:12 src/ZWiki/skins/dtmlmessages.pt:34
+#: src/ZWiki/skins/dtmlmessages.pt:13 src/ZWiki/skins/dtmlmessages.pt:36
 msgid "status"
 msgstr ""
 
-#: src/ZWiki/skins/dtmlmessages.pt:13 src/ZWiki/skins/dtmlmessages.pt:35
+#: src/ZWiki/skins/dtmlmessages.pt:14 src/ZWiki/skins/dtmlmessages.pt:37
 msgid "age"
 msgstr ""
 
-#: src/ZWiki/skins/dtmlmessages.pt:14 src/ZWiki/skins/dtmlmessages.pt:36
+#: src/ZWiki/skins/dtmlmessages.pt:15 src/ZWiki/skins/dtmlmessages.pt:38
 msgid "modified"
 msgstr ""
 
-#: src/ZWiki/skins/dtmlmessages.pt:15
+#: src/ZWiki/skins/dtmlmessages.pt:16
 msgid "Add a new issue:"
 msgstr ""
 
-#: src/ZWiki/skins/dtmlmessages.pt:16
+#: src/ZWiki/skins/dtmlmessages.pt:17
 msgid "Name:"
 msgstr ""
 
-#: src/ZWiki/skins/dtmlmessages.pt:17
+#: src/ZWiki/skins/dtmlmessages.pt:18
 msgid "Category:"
 msgstr ""
 
-#: src/ZWiki/skins/dtmlmessages.pt:18
+#: src/ZWiki/skins/dtmlmessages.pt:19
 msgid "Severity:"
 msgstr ""
 
-#: src/ZWiki/skins/dtmlmessages.pt:19
-msgid "Status:"
-msgstr ""
-
 #: src/ZWiki/skins/dtmlmessages.pt:2
 msgid "Here are the wiki's issue pages."
 msgstr ""
 
 #: src/ZWiki/skins/dtmlmessages.pt:20
-msgid "Details:"
+msgid "Status:"
 msgstr ""
 
 #: src/ZWiki/skins/dtmlmessages.pt:21
-msgid "add issue"
+msgid "Details:"
 msgstr ""
 
 #: src/ZWiki/skins/dtmlmessages.pt:22
-msgid "More advanced"
+msgid "add issue"
 msgstr ""
 
 #: src/ZWiki/skins/dtmlmessages.pt:23
-msgid "issue tracker"
+msgid "More advanced"
 msgstr ""
 
 #: src/ZWiki/skins/dtmlmessages.pt:24
-msgid "search options"
+msgid "issue tracker"
 msgstr ""
 
 #: src/ZWiki/skins/dtmlmessages.pt:25
-msgid "Name contains any of:"
+msgid "search options"
 msgstr ""
 
 #: src/ZWiki/skins/dtmlmessages.pt:26
-msgid "Page text contains any of:"
+msgid "Name contains any of:"
 msgstr ""
 
 #: src/ZWiki/skins/dtmlmessages.pt:27
-msgid "Categories:"
+msgid "Page text contains any of:"
 msgstr ""
 
 #: src/ZWiki/skins/dtmlmessages.pt:28
-msgid "Severities:"
+msgid "Categories:"
 msgstr ""
 
 #: src/ZWiki/skins/dtmlmessages.pt:29
-msgid "Statuses:"
+msgid "Severities:"
 msgstr ""
 
 #: src/ZWiki/skins/dtmlmessages.pt:3
 msgid "Enter a search term, click the numbers to the right,"
 msgstr ""
 
-#: src/ZWiki/skins/dtmlmessages.pt:37
-msgid "Submitted by"
+#: src/ZWiki/skins/dtmlmessages.pt:30
+msgid "Statuses:"
 msgstr ""
 
-#: src/ZWiki/skins/dtmlmessages.pt:38
-msgid "Name"
-msgstr ""
-
 #: src/ZWiki/skins/dtmlmessages.pt:39
-msgid "Category"
+msgid "Submitted by"
 msgstr ""
 
 #: src/ZWiki/skins/dtmlmessages.pt:4
@@ -566,167 +548,165 @@
 msgstr ""
 
 #: src/ZWiki/skins/dtmlmessages.pt:40
-msgid "Severity"
+msgid "Name"
 msgstr ""
 
 #: src/ZWiki/skins/dtmlmessages.pt:41
-msgid "Status"
+msgid "Category"
 msgstr ""
 
 #: src/ZWiki/skins/dtmlmessages.pt:42
-msgid "Optional subject"
+msgid "Severity"
 msgstr ""
 
 #: src/ZWiki/skins/dtmlmessages.pt:43
+msgid "Status"
+msgstr ""
+
+#: src/ZWiki/skins/dtmlmessages.pt:44
+msgid "Optional subject"
+msgstr ""
+
+#: src/ZWiki/skins/dtmlmessages.pt:45
 msgid "Optional comment"
 msgstr ""
 
-#: src/ZWiki/skins/dtmlmessages.pt:44 src/ZWiki/skins/dtmlmessages.pt:45
+#: src/ZWiki/skins/dtmlmessages.pt:46 src/ZWiki/skins/dtmlmessages.pt:47
 #, fuzzy
 msgid "Add ZWiki"
 msgstr "أضافة Wiki"
 
-#: src/ZWiki/skins/dtmlmessages.pt:46
+#: src/ZWiki/skins/dtmlmessages.pt:48
 msgid "Id:"
 msgstr ""
 
-#: src/ZWiki/skins/dtmlmessages.pt:47
+#: src/ZWiki/skins/dtmlmessages.pt:49
 msgid "Title:"
 msgstr ""
 
-#: src/ZWiki/skins/dtmlmessages.pt:48
+#: src/ZWiki/skins/dtmlmessages.pt:5
+msgid "browse open issues"
+msgstr ""
+
+#: src/ZWiki/skins/dtmlmessages.pt:50
 msgid "Template:"
 msgstr ""
 
-#: src/ZWiki/skins/dtmlmessages.pt:49
+#: src/ZWiki/skins/dtmlmessages.pt:51
 #, fuzzy
 msgid "Add wiki"
 msgstr "أضافة Wiki"
 
-#: src/ZWiki/skins/dtmlmessages.pt:5
-msgid "browse open issues"
-msgstr ""
-
-#: src/ZWiki/skins/dtmlmessages.pt:50
+#: src/ZWiki/skins/dtmlmessages.pt:52
 msgid "Pages changed in the last"
 msgstr ""
 
-#: src/ZWiki/skins/dtmlmessages.pt:51
+#: src/ZWiki/skins/dtmlmessages.pt:53
 msgid "Recently changed pages, with summaries"
 msgstr ""
 
-#: src/ZWiki/skins/dtmlmessages.pt:52
+#: src/ZWiki/skins/dtmlmessages.pt:54
 msgid "Show summaries ?"
 msgstr ""
 
-#: src/ZWiki/skins/dtmlmessages.pt:53
+#: src/ZWiki/skins/dtmlmessages.pt:55
 msgid "Refresh"
 msgstr ""
 
-#: src/ZWiki/skins/dtmlmessages.pt:54
+#: src/ZWiki/skins/dtmlmessages.pt:56
 msgid "Page"
 msgstr ""
 
-#: src/ZWiki/skins/dtmlmessages.pt:55
+#: src/ZWiki/skins/dtmlmessages.pt:57
 msgid "Edited&nbsp;by"
 msgstr ""
 
-#: src/ZWiki/skins/dtmlmessages.pt:56
+#: src/ZWiki/skins/dtmlmessages.pt:58
 msgid "Time"
 msgstr ""
 
-#: src/ZWiki/skins/dtmlmessages.pt:57
+#: src/ZWiki/skins/dtmlmessages.pt:59
 msgid "NEW"
 msgstr ""
 
-#: src/ZWiki/skins/dtmlmessages.pt:59
-msgid "Pages marked (NEW) have been created within the last week"
-msgstr ""
-
 #: src/ZWiki/skins/dtmlmessages.pt:6
 msgid "search issues"
 msgstr ""
 
-#: src/ZWiki/skins/dtmlmessages.pt:60
+#: src/ZWiki/skins/dtmlmessages.pt:61
+msgid "Pages marked (NEW) have been created within the last week"
+msgstr ""
+
+#: src/ZWiki/skins/dtmlmessages.pt:62
 msgid "Enter a word or phrase and hit enter to search the entire wiki."
 msgstr ""
 
-#: src/ZWiki/skins/dtmlmessages.pt:61
+#: src/ZWiki/skins/dtmlmessages.pt:63
 msgid "This is the same as using the search field at top right."
 msgstr ""
 
-#: src/ZWiki/skins/dtmlmessages.pt:62
+#: src/ZWiki/skins/dtmlmessages.pt:64
 msgid "Tips: A single word works best for matching page names."
 msgstr ""
 
-#: src/ZWiki/skins/dtmlmessages.pt:63
-msgid ""
-"Case-insensitivity and wildcards may be supported depending on your catalog "
-"configuration."
+#: src/ZWiki/skins/dtmlmessages.pt:65
+msgid "Case-insensitivity and wildcards may be supported depending on your catalog configuration."
 msgstr ""
 
-#: src/ZWiki/skins/dtmlmessages.pt:64
+#: src/ZWiki/skins/dtmlmessages.pt:66
 msgid "Leave it blank to list all pages."
 msgstr ""
 
-#: src/ZWiki/skins/dtmlmessages.pt:65 src/ZWiki/skins/dtmlmessages.pt:66
+#: src/ZWiki/skins/dtmlmessages.pt:67 src/ZWiki/skins/dtmlmessages.pt:68
 msgid "Search"
 msgstr "بحث"
 
-#: src/ZWiki/skins/dtmlmessages.pt:67
+#: src/ZWiki/skins/dtmlmessages.pt:69
 msgid "Page names matching"
 msgstr ""
 
-#: src/ZWiki/skins/dtmlmessages.pt:68
-msgid "Text matching"
-msgstr ""
-
-#: src/ZWiki/skins/dtmlmessages.pt:69
-msgid "Thorough (non-catalog) search for text matching"
-msgstr ""
-
 #: src/ZWiki/skins/dtmlmessages.pt:7
 msgid "recent"
 msgstr ""
 
 #: src/ZWiki/skins/dtmlmessages.pt:70
-msgid "Set your preferences for this wiki:"
+msgid "Text matching"
 msgstr ""
 
 #: src/ZWiki/skins/dtmlmessages.pt:71
-msgid "User name:"
+msgid "Thorough (non-catalog) search for text matching"
 msgstr ""
 
 #: src/ZWiki/skins/dtmlmessages.pt:72
-msgid "(identifies your edits)"
+msgid "Set your preferences for this wiki:"
 msgstr ""
 
 #: src/ZWiki/skins/dtmlmessages.pt:73
-msgid "Email address:"
+msgid "User name:"
 msgstr ""
 
 #: src/ZWiki/skins/dtmlmessages.pt:74
-msgid "(allows mail subscription)"
+msgid "(identifies your edits, saves your votes, may be required)"
 msgstr ""
 
 #: src/ZWiki/skins/dtmlmessages.pt:75
-msgid "Your time zone:"
+msgid "Email address:"
 msgstr ""
 
 #: src/ZWiki/skins/dtmlmessages.pt:76
-msgid "(localizes most times)"
+msgid "(allows mail subscription)"
 msgstr ""
 
 #: src/ZWiki/skins/dtmlmessages.pt:77
-msgid "Edit form height:"
+msgid "Your time zone:"
 msgstr ""
 
 #: src/ZWiki/skins/dtmlmessages.pt:78
-msgid "(adjusts form size)"
+msgid "(localizes most times)"
 msgstr ""
 
 #: src/ZWiki/skins/dtmlmessages.pt:79
-msgid "Save options"
+msgid "Edit form height:"
 msgstr ""
 
 #: src/ZWiki/skins/dtmlmessages.pt:8
@@ -734,71 +714,71 @@
 msgstr ""
 
 #: src/ZWiki/skins/dtmlmessages.pt:80
+msgid "(adjusts form size)"
+msgstr ""
+
+#: src/ZWiki/skins/dtmlmessages.pt:81
+msgid "Save options"
+msgstr ""
+
+#: src/ZWiki/skins/dtmlmessages.pt:82
 msgid "Forget options"
 msgstr ""
 
-#: src/ZWiki/skins/dtmlmessages.pt:81 src/ZWiki/skins/dtmlmessages.pt:82
+#: src/ZWiki/skins/dtmlmessages.pt:83 src/ZWiki/skins/dtmlmessages.pt:84
 msgid "Add ZWiki Page"
 msgstr ""
 
-#: src/ZWiki/skins/dtmlmessages.pt:83
+#: src/ZWiki/skins/dtmlmessages.pt:85
 msgid "Page&nbsp;name:"
 msgstr ""
 
-#: src/ZWiki/skins/dtmlmessages.pt:84
+#: src/ZWiki/skins/dtmlmessages.pt:86
 #, fuzzy
 msgid "Add wiki page"
 msgstr "أضافة صفحة Wiki"
 
-#: src/ZWiki/skins/dtmlmessages.pt:85
+#: src/ZWiki/skins/dtmlmessages.pt:87
 msgid "Topic"
 msgstr ""
 
-#: src/ZWiki/skins/dtmlmessages.pt:86
+#: src/ZWiki/skins/dtmlmessages.pt:88
 msgid "Last updated"
 msgstr ""
 
-#: src/ZWiki/skins/dtmlmessages.pt:87
+#: src/ZWiki/skins/dtmlmessages.pt:89
 msgid "Comments"
 msgstr ""
 
-#: src/ZWiki/skins/dtmlmessages.pt:88
+#: src/ZWiki/skins/dtmlmessages.pt:9 src/ZWiki/skins/dtmlmessages.pt:32
+msgid "#"
+msgstr ""
+
+#: src/ZWiki/skins/dtmlmessages.pt:90
 msgid "Views"
 msgstr ""
 
-#: src/ZWiki/skins/dtmlmessages.pt:89
+#: src/ZWiki/skins/dtmlmessages.pt:91
 msgid "Created"
 msgstr ""
 
-#: src/ZWiki/skins/dtmlmessages.pt:9 src/ZWiki/skins/dtmlmessages.pt:31
-msgid "#"
-msgstr ""
-
-#: src/ZWiki/skins/dtmlmessages.pt:90 src/ZWiki/skins/dtmlmessages.pt:92
+#: src/ZWiki/skins/dtmlmessages.pt:92 src/ZWiki/skins/dtmlmessages.pt:94
 msgid "by"
 msgstr ""
 
-#: src/ZWiki/skins/dtmlmessages.pt:91
+#: src/ZWiki/skins/dtmlmessages.pt:93
 msgid "<dtml-var lasteditinterval> ago</dtml-var>"
 msgstr ""
 
-#: src/ZWiki/skins/dtmlmessages.pt:93
+#: src/ZWiki/skins/dtmlmessages.pt:95
 msgid "on"
 msgstr ""
 
-#: src/ZWiki/skins/zwiki/backlinks.pt:108
-msgid "Subtopics"
-msgstr ""
-
-#: src/ZWiki/skins/zwiki/backlinks.pt:111
-msgid "This page has no subtopics."
-msgstr ""
-
-#: src/ZWiki/skins/zwiki/backlinks.pt:114
+#: src/ZWiki/skins/zwiki/backlinks.pt:102
 msgid "Here are it's subtopics."
 msgstr ""
 
-#: src/ZWiki/skins/zwiki/backlinks.pt:117
+#: src/ZWiki/skins/zwiki/backlinks.pt:105
 msgid "You can reorder them by clicking the ^ buttons."
 msgstr ""
 
@@ -810,60 +790,60 @@
 msgid "Parents"
 msgstr ""
 
-#: src/ZWiki/skins/zwiki/backlinks.pt:31
+#: src/ZWiki/skins/zwiki/backlinks.pt:28
 msgid "is a top-level topic."
 msgstr ""
 
-#: src/ZWiki/skins/zwiki/backlinks.pt:32
+#: src/ZWiki/skins/zwiki/backlinks.pt:29
 msgid "is a subtopic of:"
 msgstr ""
 
-#: src/ZWiki/skins/zwiki/backlinks.pt:55
+#: src/ZWiki/skins/zwiki/backlinks.pt:48
 msgid "Backlinks"
 msgstr ""
 
-#: src/ZWiki/skins/zwiki/backlinks.pt:56
+#: src/ZWiki/skins/zwiki/backlinks.pt:49
 msgid "Here are the pages which link to it:"
 msgstr ""
 
-#: src/ZWiki/skins/zwiki/backlinks.pt:57
+#: src/ZWiki/skins/zwiki/backlinks.pt:50
 msgid "No other pages link to this one."
 msgstr ""
 
-#: src/ZWiki/skins/zwiki/backlinks.pt:82
-msgid ""
-"You can set this page's parent(s) to place it within the overall page "
-"hierarchy."
+#: src/ZWiki/skins/zwiki/backlinks.pt:70
+msgid "You can set this page's parent(s) to place it within the overall page hierarchy."
 msgstr ""
 
-#: src/ZWiki/skins/zwiki/backlinks.pt:85
-msgid ""
-"Check one or more checkboxes or enter a page name here, and click the button."
+#: src/ZWiki/skins/zwiki/backlinks.pt:73
+msgid "Check one or more checkboxes or enter a page name here, and click the button."
 msgstr ""
 
-#: src/ZWiki/skins/zwiki/backlinks.pt:88
+#: src/ZWiki/skins/zwiki/backlinks.pt:76
 msgid "Enter a page name here and click the button."
 msgstr ""
 
-#: src/ZWiki/skins/zwiki/backlinks.pt:91
-msgid ""
-"You can type just the first few letters, case and punctuation are ignored."
+#: src/ZWiki/skins/zwiki/backlinks.pt:79
+msgid "You can type just the first few letters, case and punctuation are ignored."
 msgstr ""
 
-#: src/ZWiki/skins/zwiki/backlinks.pt:98
+#: src/ZWiki/skins/zwiki/backlinks.pt:86
 msgid "Reparent"
 msgstr ""
 
+#: src/ZWiki/skins/zwiki/backlinks.pt:96
+msgid "Subtopics"
+msgstr ""
+
+#: src/ZWiki/skins/zwiki/backlinks.pt:99
+msgid "This page has no subtopics."
+msgstr ""
+
 #: src/ZWiki/skins/zwiki/badtemplate.pt:12
 msgid "Bad template"
 msgstr ""
 
 #: src/ZWiki/skins/zwiki/badtemplate.pt:13
-msgid ""
-"There was a problem locating one of this wiki's skin templates. There may be "
-"a page or other non-page-template/non-dtml-method object with the same ID, "
-"obscuring the template. Or the template may be missing on the filesystem (an "
-"incomplete Zwiki installation)."
+msgid "There was a problem locating one of this wiki's skin templates. There may be a page or other non-page-template/non-dtml-method object with the same ID, obscuring the template. Or the template may be missing on the filesystem (an incomplete Zwiki installation)."
 msgstr ""
 
 #: src/ZWiki/skins/zwiki/commentform.pt:21
@@ -895,12 +875,18 @@
 msgid "add-comment"
 msgstr ""
 
-#: src/ZWiki/skins/zwiki/contentspage.pt:12
+#: src/ZWiki/skins/zwiki/contentspage.pt:10
+#: src/ZWiki/skins/zwiki/contentspage.pt:27
+msgid "Wiki contents for"
+msgstr ""
+
+#: src/ZWiki/skins/zwiki/contentspage.pt:13
+#: src/ZWiki/skins/zwiki/contentspage.pt:30
 msgid "Wiki contents"
 msgstr ""
 
-#: src/ZWiki/skins/zwiki/contentspage.pt:16
-msgid "Singletons"
+#: src/ZWiki/skins/zwiki/contentspage.pt:40
+msgid "Singletons:"
 msgstr ""
 
 #: src/ZWiki/skins/zwiki/denied.pt:12
@@ -983,11 +969,11 @@
 msgstr ""
 
 #: src/ZWiki/skins/zwiki/editform.pt:178
-msgid "preview this edit"
+msgid "Preview"
 msgstr ""
 
 #: src/ZWiki/skins/zwiki/editform.pt:178
-msgid "Preview"
+msgid "preview this edit"
 msgstr ""
 
 #: src/ZWiki/skins/zwiki/editform.pt:183
@@ -1024,13 +1010,17 @@
 msgstr ""
 
 #: src/ZWiki/skins/zwiki/editform.pt:71
-msgid "type"
+msgid "markup"
 msgstr ""
 
 #: src/ZWiki/skins/zwiki/editform.pt:72
 msgid "select the formatting and rendering style for this page"
 msgstr ""
 
+#: src/ZWiki/skins/zwiki/helppage.pt:12
+msgid "Help page"
+msgstr ""
+
 #: src/ZWiki/skins/zwiki/links.pt:102
 msgid "(external edit)"
 msgstr ""
@@ -1168,11 +1158,11 @@
 msgstr ""
 
 #: src/ZWiki/skins/zwiki/pagemanagementform.pt:45
-msgid "reparent"
+msgid "make this page a subtopic of the page you have entered"
 msgstr ""
 
 #: src/ZWiki/skins/zwiki/pagemanagementform.pt:45
-msgid "make this page a subtopic of the page you have entered"
+msgid "reparent"
 msgstr ""
 
 #: src/ZWiki/skins/zwiki/pagemanagementform.pt:50
@@ -1188,8 +1178,7 @@
 msgstr ""
 
 #: src/ZWiki/skins/zwiki/pagemanagementform.pt:55
-msgid ""
-"delete this page, and redirect links to the page you have entered, if any"
+msgid "delete this page, and redirect links to the page you have entered, if any"
 msgstr ""
 
 #: src/ZWiki/skins/zwiki/pagemanagementform.pt:60

Modified: zope-zwiki/trunk/i18n/de.po
===================================================================
--- zope-zwiki/trunk/i18n/de.po	2007-04-08 14:54:05 UTC (rev 761)
+++ zope-zwiki/trunk/i18n/de.po	2007-04-08 14:55:27 UTC (rev 762)
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: zwiki-de\n"
 "Report-Msgid-Bugs-To:\n"
-"POT-Creation-Date: Sat Sep  2 18:10:16 2006\n"
+"POT-Creation-Date: Tue Mar 27 14:50:46 2007\n"
 "PO-Revision-Date: 2006-05-29 07:47+0000\n"
 "Last-Translator: Stefan Kose <Kamikaze482 at gmx.net>\n"
 "Language-Team: German <debian-l10n-german at lists.debian.org>\n"
@@ -21,51 +21,44 @@
 "Preferred-encodings: utf-8\n"
 "Domain: zwiki\n"
 
-#: src/ZWiki/Admin.py:62
+#: src/ZWiki/Admin.py:58
 msgid "You are not authorized to upgrade all pages."
-msgstr ""
-"Sie sind nicht berechtigt die Wiki-Seiten zu aktualisieren (You are not "
-"authorized to upgrade all pages)."
+msgstr "Sie sind nicht berechtigt die Wiki-Seiten zu aktualisieren (You are not authorized to upgrade all pages)."
 
-#: src/ZWiki/Admin.py:63
+#: src/ZWiki/Admin.py:59
 msgid "(folder -> Manage properties)"
 msgstr "(folder -> Manage properties)"
 
-#: src/ZWiki/Diff.py:174
+#: src/ZWiki/Diff.py:179
 #, fuzzy
 msgid "You are not authorized to reparent this ZWiki Page."
 msgstr "Sie sind nicht berechtigt, diese ZWiki-Seite zu löschen."
 
-#: src/ZWiki/Diff.py:180 src/ZWiki/plugins/tracker/tracker.py:332
+#: src/ZWiki/Diff.py:185 src/ZWiki/plugins/tracker/tracker.py:333
 #, fuzzy
 msgid "You are not authorized to rename this ZWiki Page."
 msgstr "Sie sind nicht berechtigt, diese ZWiki-Seite zu löschen."
 
-#: src/ZWiki/Editing.py:156 src/ZWiki/Editing.py:294 src/ZWiki/Views.py:332
-#: src/ZWiki/Views.py:435 src/ZWiki/plugins/tracker/tracker.py:321
+#: src/ZWiki/Editing.py:156 src/ZWiki/Editing.py:294 src/ZWiki/Views.py:336
+#: src/ZWiki/Views.py:439 src/ZWiki/plugins/tracker/tracker.py:322
 #, fuzzy
-msgid ""
-"Sorry, this wiki doesn't allow anonymous edits. Please configure a username "
-"in options first."
+msgid "Sorry, this wiki doesn't allow anonymous edits. Please configure a username in options first."
 msgstr ""
 "In diesem Wiki sind keine anonymen Eintragungen erlaubt. \n"
 "Bitte stellen Sie zunächst Ihren Nutzernamen in den Optionen ein."
 
 #: src/ZWiki/Editing.py:327
-msgid ""
-"You are not authorized to reparent or change subtopics links on this ZWiki "
-"Page."
-msgstr ""
-"Sie sind nicht berechtigt, Seiten in der Wiki-Hierarchie zu verschieben."
+msgid "You are not authorized to reparent or change subtopics links on this ZWiki Page."
+msgstr "Sie sind nicht berechtigt, Seiten in der Wiki-Hierarchie zu verschieben."
 
 #: src/ZWiki/Editing.py:349
 msgid "You are not authorized to change this ZWiki Page's type."
 msgstr "Sie sind nicht berechtigt, das Format dieser ZWiki-Seite zu ändern."
 
 #: src/ZWiki/Editing.py:383 src/ZWiki/Editing.py:410
-#: src/ZWiki/plugins/tracker/tracker.py:340
-#: src/ZWiki/plugins/tracker/tracker.py:347
-#: src/ZWiki/plugins/tracker/tracker.py:354
+#: src/ZWiki/plugins/tracker/tracker.py:344
+#: src/ZWiki/plugins/tracker/tracker.py:351
+#: src/ZWiki/plugins/tracker/tracker.py:358
 msgid "You are not authorized to edit this ZWiki Page."
 msgstr "Sie sind nicht berechtigt, diese ZWiki-Seite zu bearbeiten."
 
@@ -74,11 +67,8 @@
 msgstr "Sie sind nicht berechtigt, diese ZWiki-Seite zu löschen."
 
 #: src/ZWiki/Editing.py:563
-msgid ""
-"This page was renamed to %s. You can delete this one if no longer needed.\n"
-msgstr ""
-"Diese ZWiki-Seite wurde in %s umbenannt. Sie können die Seite löschen,sollte "
-"sie nicht mehr gebraucht werden.\n"
+msgid "This page was renamed to %s. You can delete this one if no longer needed.\n"
+msgstr "Diese ZWiki-Seite wurde in %s umbenannt. Sie können die Seite löschen,sollte sie nicht mehr gebraucht werden.\n"
 
 #: src/ZWiki/Editing.py:659
 msgid "You are not authorized to upload files here."
@@ -86,8 +76,7 @@
 
 #: src/ZWiki/Editing.py:663
 msgid "You are not authorized to add a link on this ZWiki Page."
-msgstr ""
-"Sie sind nicht berechtigt, einen Link zu dieser ZWiki-Seite hinzuzufügen."
+msgstr "Sie sind nicht berechtigt, einen Link zu dieser ZWiki-Seite hinzuzufügen."
 
 #: src/ZWiki/Editing.py:822
 msgid "There was a problem: %s"
@@ -99,22 +88,15 @@
 
 #: src/ZWiki/Editing.py:830
 #, fuzzy
-msgid ""
-"your edit contained a banned link pattern. Please contact the site "
-"administrator for help."
-msgstr ""
-"Ein Problem ist aufgetreten: %s. Bitte kontaktieren Sie den Administrator "
-"dieser Webseite, falls Sie Hilfe benötigen."
+msgid "your edit contained a banned link pattern. Please contact the site administrator for help."
+msgstr "Ein Problem ist aufgetreten: %s. Bitte kontaktieren Sie den Administrator dieser Webseite, falls Sie Hilfe benötigen."
 
 #: src/ZWiki/Editing.py:841
 msgid "exceeded max_anonymous_links"
 msgstr "'max_anonymous_links' überschritten"
 
 #: src/ZWiki/Editing.py:842
-msgid ""
-"adding of external links by unidentified users is restricted. Please back up "
-"and remove some of the http urls you added, or contact the site "
-"administrator for help."
+msgid "adding of external links by unidentified users is restricted. Please back up and remove some of the http urls you added, or contact the site administrator for help."
 msgstr ""
 
 #: src/ZWiki/Editing.py:853
@@ -123,85 +105,89 @@
 msgstr "'max_anonymous_links' überschritten"
 
 #: src/ZWiki/Editing.py:854
-msgid ""
-"adding of external links is restricted, even for identified users. Please "
-"back up and remove some of the http urls you added, or contact the site "
-"administrator for help."
+msgid "adding of external links is restricted, even for identified users. Please back up and remove some of the http urls you added, or contact the site administrator for help."
 msgstr ""
 
-#: src/ZWiki/Mail.py:506 src/ZWiki/skins/dtmlmessages.pt:58
+#: src/ZWiki/Mail.py:506 src/ZWiki/skins/dtmlmessages.pt:60
 msgid "anonymous"
 msgstr "anonym"
 
-#: src/ZWiki/OutlineSupport.py:843 src/ZWiki/skins/zwiki/links.pt:56
+#: src/ZWiki/OutlineSupport.py:378
+#, fuzzy
+msgid "Sorry, this wiki doesn't allow anonymous reparenting. Please configure a username in options first."
+msgstr ""
+"In diesem Wiki sind keine anonymen Eintragungen erlaubt. \n"
+"Bitte stellen Sie zunächst Ihren Nutzernamen in den Optionen ein."
+
+#: src/ZWiki/OutlineSupport.py:878 src/ZWiki/skins/zwiki/links.pt:56
 msgid "which pages link to this one ?"
 msgstr "Welche Seiten verweisen auf diese?"
 
-#: src/ZWiki/OutlineSupport.py:851
+#: src/ZWiki/OutlineSupport.py:886
 msgid "You are here"
 msgstr "Sie befinden sich hier."
 
-#: src/ZWiki/Utils.py:465
+#: src/ZWiki/Utils.py:487
 msgid "years"
 msgstr "Jahre"
 
-#: src/ZWiki/Utils.py:465
+#: src/ZWiki/Utils.py:487
 msgid "year"
 msgstr "Jahr"
 
-#: src/ZWiki/Utils.py:467
+#: src/ZWiki/Utils.py:489
 msgid "month"
 msgstr "Monat"
 
-#: src/ZWiki/Utils.py:467
+#: src/ZWiki/Utils.py:489
 msgid "months"
 msgstr "Monate"
 
-#: src/ZWiki/Utils.py:469
+#: src/ZWiki/Utils.py:491
 msgid "weeks"
 msgstr "Wochen"
 
-#: src/ZWiki/Utils.py:469
+#: src/ZWiki/Utils.py:491
 msgid "week"
 msgstr "Woche"
 
-#: src/ZWiki/Utils.py:471
+#: src/ZWiki/Utils.py:493
 msgid "day"
 msgstr "Tag"
 
-#: src/ZWiki/Utils.py:471
+#: src/ZWiki/Utils.py:493
 msgid "days"
 msgstr "Tage"
 
-#: src/ZWiki/Utils.py:473
+#: src/ZWiki/Utils.py:495
 msgid "hours"
 msgstr "Stunden"
 
-#: src/ZWiki/Utils.py:473
+#: src/ZWiki/Utils.py:495
 msgid "hour"
 msgstr "Stunde"
 
-#: src/ZWiki/Utils.py:475
+#: src/ZWiki/Utils.py:497
 msgid "minute"
 msgstr "Minute"
 
-#: src/ZWiki/Utils.py:475
+#: src/ZWiki/Utils.py:497
 msgid "minutes"
 msgstr "Minuten"
 
-#: src/ZWiki/Utils.py:477
+#: src/ZWiki/Utils.py:499
 msgid "second"
 msgstr "Sekunde"
 
-#: src/ZWiki/Utils.py:477
+#: src/ZWiki/Utils.py:499
 msgid "seconds"
 msgstr "Sekunden"
 
-#: src/ZWiki/Views.py:346
+#: src/ZWiki/Views.py:350
 msgid "Page is locked"
 msgstr "Seite ist gesperrt"
 
-#: src/ZWiki/Views.py:357
+#: src/ZWiki/Views.py:361
 msgid ""
 "\n"
 "            This page has a webDAV lock. Someone is probably editing it\n"
@@ -220,70 +206,58 @@
 "            sicherheitshalber speichern.\n"
 "            "
 
-#: src/ZWiki/Views.py:364
+#: src/ZWiki/Views.py:368
 msgid "To discard your changes and try again, click OK."
-msgstr ""
-"Um Ihre Änderungen zu verwerfen und von vorne zu beginnen, klicken Sie auf "
-"'OK'."
+msgstr "Um Ihre Änderungen zu verwerfen und von vorne zu beginnen, klicken Sie auf 'OK'."
 
-#: src/ZWiki/Views.py:393
+#: src/ZWiki/Views.py:397
 msgid "Edit conflict"
 msgstr "Bearbeitungskonflikt"
 
-#: src/ZWiki/Views.py:413
+#: src/ZWiki/Views.py:417
 msgid "Someone else has saved this page while you were editing"
 msgstr "Jemand hat diese Seite geändert, während Sie sie bearbeitet haben."
 
-#: src/ZWiki/Views.py:414
+#: src/ZWiki/Views.py:418
 msgid "To resolve the conflict, do this"
 msgstr "So können Sie diesen Konflikt lösen:"
 
-#: src/ZWiki/Views.py:415
+#: src/ZWiki/Views.py:419
 msgid "Click your browser's back button"
-msgstr ""
-"Kehren Sie zum Bearbeitungsformular zurück, indem Sie in Ihrem Browser auf "
-"die 'Zurück'-Schaltfläche klicken."
+msgstr "Kehren Sie zum Bearbeitungsformular zurück, indem Sie in Ihrem Browser auf die 'Zurück'-Schaltfläche klicken."
 
-#: src/ZWiki/Views.py:416
+#: src/ZWiki/Views.py:420
 msgid "Copy your recent edits to the clipboard"
 msgstr "Kopieren Sie Ihre letzten Änderungen in die Zwischenablage."
 
-#: src/ZWiki/Views.py:417
+#: src/ZWiki/Views.py:421
 msgid "Click your browser's refresh button"
-msgstr ""
-"Aktualisieren Sie das Bearbeitungsformular, indem Sie in Ihrem Browser auf "
-"die 'Neu laden'-Schaltfläche klicken."
+msgstr "Aktualisieren Sie das Bearbeitungsformular, indem Sie in Ihrem Browser auf die 'Neu laden'-Schaltfläche klicken."
 
-#: src/ZWiki/Views.py:418
+#: src/ZWiki/Views.py:422
 msgid "Paste in your edits again, being mindful of the latest changes"
-msgstr ""
-"Fügen Sie Ihre Änderungen erneut ein. Beachten Sie dabei, dass die Seite in "
-"der Zwischenzeit bereits von jemand anderem geändert wurde."
+msgstr "Fügen Sie Ihre Änderungen erneut ein. Beachten Sie dabei, dass die Seite in der Zwischenzeit bereits von jemand anderem geändert wurde."
 
-#: src/ZWiki/Views.py:419
+#: src/ZWiki/Views.py:423
 msgid "Click the Change button again"
 msgstr "Speichern Sie die Seite mit Ihren Änderungen erneut."
 
-#: src/ZWiki/Views.py:420 src/ZWiki/skins/zwiki/editform.pt:163
+#: src/ZWiki/Views.py:424 src/ZWiki/skins/zwiki/editform.pt:163
 msgid "or"
 msgstr "oder"
 
-#: src/ZWiki/Views.py:421
+#: src/ZWiki/Views.py:425
 msgid "To discard your changes and start again, click OK"
-msgstr ""
-"Um Ihre Änderungen zu verwerfen und von vorne zu beginnen, klicken Sie auf "
-"'OK'."
+msgstr "Um Ihre Änderungen zu verwerfen und von vorne zu beginnen, klicken Sie auf 'OK'."
 
-#: src/ZWiki/Views.py:490
+#: src/ZWiki/Views.py:501
 msgid ""
 "\n"
-"        Access keys can be accessed in mozilla-based browsers by pressing "
-"alt-<key>\n"
+"        Access keys can be accessed in mozilla-based browsers by pressing alt-<key>\n"
 "        IE users: must also press enter\n"
 "        Mac users: command-<key>\n"
 "        Opera users: shift-escape-<key>\n"
-"        These won't work here, back up to the previous page to try them "
-"out.\n"
+"        These won't work here, back up to the previous page to try them out.\n"
 "\n"
 "        0    show these access key assignments\n"
 "\n"
@@ -299,10 +273,8 @@
 "        s    go to search field\n"
 "        \n"
 "        page functions:\n"
-"        +    (in a plone/cmf site with skin switching set up) use zwiki's "
-"plone/cmf skin\n"
-"        -    (in a plone/cmf site with skin switching set up) use zwiki's "
-"standard skin\n"
+"        +    (in a plone/cmf site with skin switching set up) use zwiki's plone/cmf skin\n"
+"        -    (in a plone/cmf site with skin switching set up) use zwiki's standard skin\n"
 "        v    view page\n"
 "        m    mail subscription\n"
 "        b    show backlinks (links to this page)\n"
@@ -330,13 +302,11 @@
 "        "
 msgstr ""
 "\n"
-"        Kurztasten nutzen Sie in mozilla-basierten Browsern durch Drücken "
-"der <Alt>-Taste\n"
+"        Kurztasten nutzen Sie in mozilla-basierten Browsern durch Drücken der <Alt>-Taste\n"
 "        IE-Benutzer: müssen außerdem <enter> drücken\n"
 "        Mac-Benutzer: <Strg>-Taste\n"
 "        Opera-Benutzer: <Umschalt>-<Esc>-Taste\n"
-"        Die Kurztasten funktionieren nicht hier, sondern auf der vorherigen "
-"Seite. Kehren Sie zu dieser zurück, um sie auszuprobieren.\n"
+"        Die Kurztasten funktionieren nicht hier, sondern auf der vorherigen Seite. Kehren Sie zu dieser zurück, um sie auszuprobieren.\n"
 "\n"
 "        0    zeige diese Übersicht über Kurztasten\n"
 "\n"
@@ -352,10 +322,8 @@
 "        s    gehe zur Suche\n"
 "        \n"
 "        Seiten-bezogene Aktionen:\n"
-"        +    (in einer Plone/CMF-Webseite mit wechselbaren Skins) betrachte "
-"Seiten im Plone/CMF-Skin\n"
-"        -    (in einer Plone/CMF-Webseite mit wechselbaren Skins) betrachte "
-"Seiten im Standard-Skin\n"
+"        +    (in einer Plone/CMF-Webseite mit wechselbaren Skins) betrachte Seiten im Plone/CMF-Skin\n"
+"        -    (in einer Plone/CMF-Webseite mit wechselbaren Skins) betrachte Seiten im Standard-Skin\n"
 "        v    Seite betrachten\n"
 "        m    E-Mail-Abonnement\n"
 "        b    Backlinks zeigen (Verweise auf diese Seite)\n"
@@ -365,8 +333,7 @@
 "        x    bearbeite diese Seite mit externem Editor\n"
 "             drucke diese Seite (samt Unterthemen)\n"
 "        q    Quell-Code dieser Seite zeigen (Schnellansicht)\n"
-"             lösche den 'Render-Cache' dieser Seite und erstelle diesen dann "
-"neu\n"
+"             lösche den 'Render-Cache' dieser Seite und erstelle diesen dann neu\n"
 "             Unterthemen anzeigen\n"
 "             Kommentare anzeigen (Nachrichten)\n"
 "             gehe zur Homepage des Autors, sofern möglich\n"
@@ -383,33 +350,32 @@
 "        p    vorherige Änderung\n"
 "        "
 
-#: src/ZWiki/Wikis.py:49
-#, fuzzy
-msgid "Unknown wiki type"
-msgstr "Unbekanntes Wiki Format"
-
-#: src/ZWiki/ZWikiPage.py:675
+#: src/ZWiki/ZWikiPage.py:744
 msgid "create this page"
 msgstr "Diese Seite erstellen"
 
-#: src/ZWiki/ZWikiPage.py:798 src/ZWiki/ZWikiPage.py:814
-#: src/ZWiki/ZWikiPage.py:817
+#: src/ZWiki/ZWikiPage.py:872 src/ZWiki/ZWikiPage.py:887
 msgid "last edited %(interval)s ago"
 msgstr "Zuletzt geändert vor %(interval)s"
 
-#: src/ZWiki/ZWikiPage.py:809
+#: src/ZWiki/ZWikiPage.py:882
 msgid "show last edit"
 msgstr "Letzte Änderung zeigen"
 
-#: src/ZWiki/ZWikiPage.py:826 src/ZWiki/ZWikiPage.py:828
+#: src/ZWiki/ZWikiPage.py:897 src/ZWiki/ZWikiPage.py:899
 msgid "by %(editor)s"
 msgstr "von %(editor)s"
 
-#: src/ZWiki/__init__.py:34
+#: src/ZWiki/__init__.py:200
+#, fuzzy
+msgid "Unknown wiki type"
+msgstr "Unbekanntes Wiki Format"
+
+#: src/ZWiki/__init__.py:39
 msgid "No need to add a Zwiki Outline Cache"
 msgstr "Zwiki-Outline-Cache nicht selbst hinzufügen"
 
-#: src/ZWiki/__init__.py:35
+#: src/ZWiki/__init__.py:40
 msgid ""
 "Zwiki Outline Cache appears in the ZMI Add menu\n"
 "        for implementation reasons, but should not be added directly.\n"
@@ -426,6 +392,10 @@
 msgid "comments"
 msgstr "Kommentare"
 
+#: src/ZWiki/pagetypes/html.py:50 src/ZWiki/pagetypes/rst.py:85
+msgid "reply"
+msgstr "Antworten"
+
 #: src/ZWiki/pagetypes/moin.py:1990
 msgid "Expected \"=\" to follow \"%(token)s\""
 msgstr "Erwartete \"=\" nach \"%(token)s\""
@@ -462,10 +432,6 @@
 msgid "Expected a color value \"%(arg)s\" after \"%(key)s\""
 msgstr "Erwartete einen Farbwert \"%(arg)s\" nach \"%(key)s\""
 
-#: src/ZWiki/pagetypes/rst.py:85
-msgid "reply"
-msgstr "Antworten"
-
 #: src/ZWiki/plugins/latexwiki/wikis/latexwiki/diffform.pt:127
 #: src/ZWiki/plugins/mathaction/wikis/mathaction/old-diffform.pt:127
 msgid "full history"
@@ -493,7 +459,7 @@
 
 #: src/ZWiki/plugins/latexwiki/wikis/latexwiki/wikipage.pt:169
 msgid "show plone skin"
-msgstr ""
+msgstr "Plone-Skin anzeigen"
 
 #: src/ZWiki/plugins/latexwiki/wikis/latexwiki/wikipage.pt:172
 #, fuzzy
@@ -507,7 +473,7 @@
 
 #: src/ZWiki/plugins/latexwiki/wikis/latexwiki/wikipage.pt:179
 msgid "full"
-msgstr ""
+msgstr "vollständig"
 
 #: src/ZWiki/plugins/latexwiki/wikis/latexwiki/wikipage.pt:180
 #, fuzzy
@@ -521,11 +487,11 @@
 
 #: src/ZWiki/plugins/latexwiki/wikis/latexwiki/wikipage.pt:187
 msgid "show only essential features"
-msgstr ""
+msgstr "Nur die wichtigsten Features anzeigen"
 
 #: src/ZWiki/plugins/latexwiki/wikis/latexwiki/wikipage.pt:193
 msgid "minimal"
-msgstr ""
+msgstr "minimal"
 
 #: src/ZWiki/plugins/latexwiki/wikis/latexwiki/wikipage.pt:507
 #, fuzzy
@@ -547,7 +513,7 @@
 msgstr "Titel"
 
 #: src/ZWiki/plugins/tracker/filterissues.pt:12
-#: src/ZWiki/skins/dtmlmessages.pt:30
+#: src/ZWiki/skins/dtmlmessages.pt:31
 msgid "Filter issues"
 msgstr "Probleme filtern"
 
@@ -559,399 +525,382 @@
 msgid "Issue tracker"
 msgstr "Problemliste"
 
-#: src/ZWiki/plugins/tracker/tracker.py:361
+#: src/ZWiki/plugins/tracker/tracker.py:365
 #, fuzzy
 msgid "You are not authorized to comment on this ZWiki Page."
 msgstr "Sie sind nicht berechtigt, diese ZWiki-Seite zu bearbeiten."
 
-#: src/ZWiki/skins/dtmlmessages.pt:10 src/ZWiki/skins/dtmlmessages.pt:32
+#: src/ZWiki/skins/dtmlmessages.pt:10 src/ZWiki/skins/dtmlmessages.pt:33
 #, fuzzy
+msgid "name"
+msgstr "Name,"
+
+#: src/ZWiki/skins/dtmlmessages.pt:11 src/ZWiki/skins/dtmlmessages.pt:34
+#, fuzzy
 msgid "category"
 msgstr "Kategorie"
 
-#: src/ZWiki/skins/dtmlmessages.pt:11 src/ZWiki/skins/dtmlmessages.pt:33
+#: src/ZWiki/skins/dtmlmessages.pt:12 src/ZWiki/skins/dtmlmessages.pt:35
 #, fuzzy
 msgid "severity"
 msgstr "Schweregrad"
 
-#: src/ZWiki/skins/dtmlmessages.pt:12 src/ZWiki/skins/dtmlmessages.pt:34
+#: src/ZWiki/skins/dtmlmessages.pt:13 src/ZWiki/skins/dtmlmessages.pt:36
 #, fuzzy
 msgid "status"
 msgstr "Status"
 
-#: src/ZWiki/skins/dtmlmessages.pt:13 src/ZWiki/skins/dtmlmessages.pt:35
+#: src/ZWiki/skins/dtmlmessages.pt:14 src/ZWiki/skins/dtmlmessages.pt:37
 #, fuzzy
 msgid "age"
 msgstr "Seite"
 
-#: src/ZWiki/skins/dtmlmessages.pt:14 src/ZWiki/skins/dtmlmessages.pt:36
+#: src/ZWiki/skins/dtmlmessages.pt:15 src/ZWiki/skins/dtmlmessages.pt:38
 #, fuzzy
 msgid "modified"
 msgstr "Geändert"
 
-#: src/ZWiki/skins/dtmlmessages.pt:15
+#: src/ZWiki/skins/dtmlmessages.pt:16
 #, fuzzy
 msgid "Add a new issue:"
 msgstr "Neues Problem hinzufügen:"
 
-#: src/ZWiki/skins/dtmlmessages.pt:16
+#: src/ZWiki/skins/dtmlmessages.pt:17
 #, fuzzy
 msgid "Name:"
 msgstr "Name,"
 
-#: src/ZWiki/skins/dtmlmessages.pt:17
+#: src/ZWiki/skins/dtmlmessages.pt:18
 #, fuzzy
 msgid "Category:"
 msgstr "Kategorie:"
 
-#: src/ZWiki/skins/dtmlmessages.pt:18
+#: src/ZWiki/skins/dtmlmessages.pt:19
 #, fuzzy
 msgid "Severity:"
 msgstr "Schweregrad:"
 
-#: src/ZWiki/skins/dtmlmessages.pt:19
-#, fuzzy
-msgid "Status:"
-msgstr "Status:"
-
 #: src/ZWiki/skins/dtmlmessages.pt:2
 #, fuzzy
 msgid "Here are the wiki's issue pages."
 msgstr "Diese Wiki-Seite erstellen"
 
 #: src/ZWiki/skins/dtmlmessages.pt:20
+#, fuzzy
+msgid "Status:"
+msgstr "Status:"
+
+#: src/ZWiki/skins/dtmlmessages.pt:21
 msgid "Details:"
 msgstr "Details:"
 
-#: src/ZWiki/skins/dtmlmessages.pt:21
+#: src/ZWiki/skins/dtmlmessages.pt:22
 #, fuzzy
 msgid "add issue"
 msgstr "Problem hinzufügen"
 
-#: src/ZWiki/skins/dtmlmessages.pt:22
+#: src/ZWiki/skins/dtmlmessages.pt:23
 #, fuzzy
 msgid "More advanced"
 msgstr "Erweiterte Suche in der"
 
-#: src/ZWiki/skins/dtmlmessages.pt:23
+#: src/ZWiki/skins/dtmlmessages.pt:24
 #, fuzzy
 msgid "issue tracker"
 msgstr "Problemliste"
 
-#: src/ZWiki/skins/dtmlmessages.pt:24
+#: src/ZWiki/skins/dtmlmessages.pt:25
 msgid "search options"
 msgstr "Einstellungen speichern"
 
-#: src/ZWiki/skins/dtmlmessages.pt:25
+#: src/ZWiki/skins/dtmlmessages.pt:26
 #, fuzzy
 msgid "Name contains any of:"
 msgstr "Name enthält:"
 
-#: src/ZWiki/skins/dtmlmessages.pt:26
+#: src/ZWiki/skins/dtmlmessages.pt:27
 #, fuzzy
 msgid "Page text contains any of:"
 msgstr "Text enthält:"
 
-#: src/ZWiki/skins/dtmlmessages.pt:27
+#: src/ZWiki/skins/dtmlmessages.pt:28
 msgid "Categories:"
 msgstr "Kategorien:"
 
-#: src/ZWiki/skins/dtmlmessages.pt:28
+#: src/ZWiki/skins/dtmlmessages.pt:29
 #, fuzzy
 msgid "Severities:"
 msgstr "Schweregrade:"
 
-#: src/ZWiki/skins/dtmlmessages.pt:29
-#, fuzzy
-msgid "Statuses:"
-msgstr "Status:"
-
 #: src/ZWiki/skins/dtmlmessages.pt:3
 #, fuzzy
 msgid "Enter a search term, click the numbers to the right,"
-msgstr ""
-"Geben Sie einen Suchterm ein, klicken Sie die Nummern auf der rechten Seite "
-"an,"
+msgstr "Geben Sie einen Suchterm ein, klicken Sie die Nummern auf der rechten Seite an,"
 
-#: src/ZWiki/skins/dtmlmessages.pt:37
+#: src/ZWiki/skins/dtmlmessages.pt:30
 #, fuzzy
+msgid "Statuses:"
+msgstr "Status:"
+
+#: src/ZWiki/skins/dtmlmessages.pt:39
+#, fuzzy
 msgid "Submitted by"
 msgstr "Eingereicht von"
 
-#: src/ZWiki/skins/dtmlmessages.pt:38
+#: src/ZWiki/skins/dtmlmessages.pt:4
 #, fuzzy
+msgid "filter issues"
+msgstr "Probleme filtern"
+
+#: src/ZWiki/skins/dtmlmessages.pt:40
+#, fuzzy
 msgid "Name"
 msgstr "Name"
 
-#: src/ZWiki/skins/dtmlmessages.pt:39
+#: src/ZWiki/skins/dtmlmessages.pt:41
 #, fuzzy
 msgid "Category"
 msgstr "Kategorie"
 
-#: src/ZWiki/skins/dtmlmessages.pt:4
+#: src/ZWiki/skins/dtmlmessages.pt:42
 #, fuzzy
-msgid "filter issues"
-msgstr "Probleme filtern"
-
-#: src/ZWiki/skins/dtmlmessages.pt:40
-#, fuzzy
 msgid "Severity"
 msgstr "Schweregrad"
 
-#: src/ZWiki/skins/dtmlmessages.pt:41
+#: src/ZWiki/skins/dtmlmessages.pt:43
 #, fuzzy
 msgid "Status"
 msgstr "Status"
 
-#: src/ZWiki/skins/dtmlmessages.pt:42
+#: src/ZWiki/skins/dtmlmessages.pt:44
 #, fuzzy
 msgid "Optional subject"
 msgstr "Notiz zu den Änderungen (optional)"
 
-#: src/ZWiki/skins/dtmlmessages.pt:43
+#: src/ZWiki/skins/dtmlmessages.pt:45
 #, fuzzy
 msgid "Optional comment"
 msgstr "Notiz zu den Änderungen (optional)"
 
-#: src/ZWiki/skins/dtmlmessages.pt:44 src/ZWiki/skins/dtmlmessages.pt:45
+#: src/ZWiki/skins/dtmlmessages.pt:46 src/ZWiki/skins/dtmlmessages.pt:47
 #, fuzzy
 msgid "Add ZWiki"
 msgstr "Wiki hinzufügen"
 
-#: src/ZWiki/skins/dtmlmessages.pt:46
+#: src/ZWiki/skins/dtmlmessages.pt:48
 #, fuzzy
 msgid "Id:"
 msgstr "Id"
 
-#: src/ZWiki/skins/dtmlmessages.pt:47
+#: src/ZWiki/skins/dtmlmessages.pt:49
 #, fuzzy
 msgid "Title:"
 msgstr "Titel"
 
-#: src/ZWiki/skins/dtmlmessages.pt:48
+#: src/ZWiki/skins/dtmlmessages.pt:5
+#, fuzzy
+msgid "browse open issues"
+msgstr "offene Probleme durchsuchen"
+
+#: src/ZWiki/skins/dtmlmessages.pt:50
 msgid "Template:"
 msgstr ""
 
-#: src/ZWiki/skins/dtmlmessages.pt:49
+#: src/ZWiki/skins/dtmlmessages.pt:51
 #, fuzzy
 msgid "Add wiki"
 msgstr "Wiki hinzufügen"
 
-#: src/ZWiki/skins/dtmlmessages.pt:5
-#, fuzzy
-msgid "browse open issues"
-msgstr "offene Probleme durchsuchen"
-
-#: src/ZWiki/skins/dtmlmessages.pt:50
+#: src/ZWiki/skins/dtmlmessages.pt:52
 msgid "Pages changed in the last"
 msgstr "Seiten mit Änderungen innerhalb von"
 
-#: src/ZWiki/skins/dtmlmessages.pt:51
+#: src/ZWiki/skins/dtmlmessages.pt:53
 msgid "Recently changed pages, with summaries"
 msgstr "Kürzlich veränderte Seiten, mit Zusammenfassungen"
 
-#: src/ZWiki/skins/dtmlmessages.pt:52
+#: src/ZWiki/skins/dtmlmessages.pt:54
 msgid "Show summaries ?"
 msgstr "Auszüge anzeigen?"
 
-#: src/ZWiki/skins/dtmlmessages.pt:53
+#: src/ZWiki/skins/dtmlmessages.pt:55
 msgid "Refresh"
 msgstr "Aktualisieren"
 
-#: src/ZWiki/skins/dtmlmessages.pt:54
+#: src/ZWiki/skins/dtmlmessages.pt:56
 msgid "Page"
 msgstr "Seite"
 
-#: src/ZWiki/skins/dtmlmessages.pt:55
+#: src/ZWiki/skins/dtmlmessages.pt:57
 msgid "Edited&nbsp;by"
 msgstr "Von"
 
-#: src/ZWiki/skins/dtmlmessages.pt:56
+#: src/ZWiki/skins/dtmlmessages.pt:58
 msgid "Time"
 msgstr "Zeit"
 
-#: src/ZWiki/skins/dtmlmessages.pt:57
+#: src/ZWiki/skins/dtmlmessages.pt:59
 msgid "NEW"
 msgstr "Neu"
 
-#: src/ZWiki/skins/dtmlmessages.pt:59
-msgid "Pages marked (NEW) have been created within the last week"
-msgstr "Mit (Neu) markierte Seiten wurden innerhalb der letzten Woche erstellt"
-
 #: src/ZWiki/skins/dtmlmessages.pt:6
 #, fuzzy
 msgid "search issues"
 msgstr "Probleme filtern"
 
-#: src/ZWiki/skins/dtmlmessages.pt:60
-msgid "Enter a word or phrase and hit enter to search the entire wiki."
-msgstr ""
-"Geben Sie einen oder mehrere Begriffe ein und drücken Sie die Eingabetaste, "
-"um das gesamte Wiki zu durchsuchen."
-
 #: src/ZWiki/skins/dtmlmessages.pt:61
-msgid "This is the same as using the search field at top right."
-msgstr ""
-"Das Ergebnis ist das selbe, als wenn Sie das Suchfeld in der rechten oberen "
-"Ecke benutzen."
+msgid "Pages marked (NEW) have been created within the last week"
+msgstr "Mit (Neu) markierte Seiten wurden innerhalb der letzten Woche erstellt"
 
 #: src/ZWiki/skins/dtmlmessages.pt:62
-msgid "Tips: A single word works best for matching page names."
-msgstr ""
-"Tipp: Ein einzelner Begriff eignet sich am besten für die Suche nach "
-"passenden Seitennamen."
+msgid "Enter a word or phrase and hit enter to search the entire wiki."
+msgstr "Geben Sie einen oder mehrere Begriffe ein und drücken Sie die Eingabetaste, um das gesamte Wiki zu durchsuchen."
 
 #: src/ZWiki/skins/dtmlmessages.pt:63
-msgid ""
-"Case-insensitivity and wildcards may be supported depending on your catalog "
-"configuration."
-msgstr ""
-"Je nach Ihrer Katalogkonfiguration, werden Groß- und Kleinschreibung "
-"ignoriert und Platzhalter unterstützt."
+msgid "This is the same as using the search field at top right."
+msgstr "Das Ergebnis ist das selbe, als wenn Sie das Suchfeld in der rechten oberen Ecke benutzen."
 
 #: src/ZWiki/skins/dtmlmessages.pt:64
+msgid "Tips: A single word works best for matching page names."
+msgstr "Tipp: Ein einzelner Begriff eignet sich am besten für die Suche nach passenden Seitennamen."
+
+#: src/ZWiki/skins/dtmlmessages.pt:65
+msgid "Case-insensitivity and wildcards may be supported depending on your catalog configuration."
+msgstr "Je nach Ihrer Katalogkonfiguration, werden Groß- und Kleinschreibung ignoriert und Platzhalter unterstützt."
+
+#: src/ZWiki/skins/dtmlmessages.pt:66
 msgid "Leave it blank to list all pages."
 msgstr "Mit einem leeren Suchfeld erhalten Sie eine Liste aller Seiten."
 
-#: src/ZWiki/skins/dtmlmessages.pt:65 src/ZWiki/skins/dtmlmessages.pt:66
+#: src/ZWiki/skins/dtmlmessages.pt:67 src/ZWiki/skins/dtmlmessages.pt:68
 msgid "Search"
 msgstr "Suchen"
 
-#: src/ZWiki/skins/dtmlmessages.pt:67
+#: src/ZWiki/skins/dtmlmessages.pt:69
 msgid "Page names matching"
 msgstr "Gefundene Seitennamen"
 
-#: src/ZWiki/skins/dtmlmessages.pt:68
-msgid "Text matching"
-msgstr "Gefundene Textstellen"
-
-#: src/ZWiki/skins/dtmlmessages.pt:69
-msgid "Thorough (non-catalog) search for text matching"
-msgstr "Gründliche (nicht katalog-basierte) Suche nach passenden Textstellen"
-
 #: src/ZWiki/skins/dtmlmessages.pt:7
 #, fuzzy
 msgid "recent"
 msgstr "Unterordnen"
 
 #: src/ZWiki/skins/dtmlmessages.pt:70
+msgid "Text matching"
+msgstr "Gefundene Textstellen"
+
+#: src/ZWiki/skins/dtmlmessages.pt:71
+msgid "Thorough (non-catalog) search for text matching"
+msgstr "Gründliche (nicht katalog-basierte) Suche nach passenden Textstellen"
+
+#: src/ZWiki/skins/dtmlmessages.pt:72
 msgid "Set your preferences for this wiki:"
 msgstr "Wählen Sie Ihre Einstellungen für dieses Wiki:"
 
-#: src/ZWiki/skins/dtmlmessages.pt:71
+#: src/ZWiki/skins/dtmlmessages.pt:73
 msgid "User name:"
 msgstr "Benutzername:"
 
-#: src/ZWiki/skins/dtmlmessages.pt:72
-msgid "(identifies your edits)"
-msgstr "(kennzeichnet Ihre Änderungen)"
+#: src/ZWiki/skins/dtmlmessages.pt:74
+msgid "(identifies your edits, saves your votes, may be required)"
+msgstr ""
 
-#: src/ZWiki/skins/dtmlmessages.pt:73
+#: src/ZWiki/skins/dtmlmessages.pt:75
 msgid "Email address:"
 msgstr "E-Mail-Adresse:"
 
-#: src/ZWiki/skins/dtmlmessages.pt:74
+#: src/ZWiki/skins/dtmlmessages.pt:76
 msgid "(allows mail subscription)"
 msgstr "(für E-Mail-Abonnements)"
 
-#: src/ZWiki/skins/dtmlmessages.pt:75
+#: src/ZWiki/skins/dtmlmessages.pt:77
 msgid "Your time zone:"
 msgstr "Ihre Zeitzone:"
 
-#: src/ZWiki/skins/dtmlmessages.pt:76
+#: src/ZWiki/skins/dtmlmessages.pt:78
 msgid "(localizes most times)"
 msgstr "(für Zeitangaben im Wiki)"
 
-#: src/ZWiki/skins/dtmlmessages.pt:77
+#: src/ZWiki/skins/dtmlmessages.pt:79
 msgid "Edit form height:"
 msgstr "Höhe des Bearbeitungsformulars:"
 
-#: src/ZWiki/skins/dtmlmessages.pt:78
-msgid "(adjusts form size)"
-msgstr "(bestimmt die Größe des Textfelds)"
-
-#: src/ZWiki/skins/dtmlmessages.pt:79
-msgid "Save options"
-msgstr "Einstellungen speichern"
-
 #: src/ZWiki/skins/dtmlmessages.pt:8
 #, fuzzy
 msgid "all"
 msgstr "Alle"
 
 #: src/ZWiki/skins/dtmlmessages.pt:80
+msgid "(adjusts form size)"
+msgstr "(bestimmt die Größe des Textfelds)"
+
+#: src/ZWiki/skins/dtmlmessages.pt:81
+msgid "Save options"
+msgstr "Einstellungen speichern"
+
+#: src/ZWiki/skins/dtmlmessages.pt:82
 msgid "Forget options"
 msgstr "Einstellungen löschen"
 
-#: src/ZWiki/skins/dtmlmessages.pt:81 src/ZWiki/skins/dtmlmessages.pt:82
+#: src/ZWiki/skins/dtmlmessages.pt:83 src/ZWiki/skins/dtmlmessages.pt:84
 msgid "Add ZWiki Page"
 msgstr "ZWiki-Seite hinzufügen"
 
-#: src/ZWiki/skins/dtmlmessages.pt:83
+#: src/ZWiki/skins/dtmlmessages.pt:85
 #, fuzzy
 msgid "Page&nbsp;name:"
 msgstr "Seitenname"
 
-#: src/ZWiki/skins/dtmlmessages.pt:84
+#: src/ZWiki/skins/dtmlmessages.pt:86
 #, fuzzy
 msgid "Add wiki page"
 msgstr "Wiki-Seite hinzufügen"
 
-#: src/ZWiki/skins/dtmlmessages.pt:85
+#: src/ZWiki/skins/dtmlmessages.pt:87
 msgid "Topic"
 msgstr "Thema"
 
-#: src/ZWiki/skins/dtmlmessages.pt:86
+#: src/ZWiki/skins/dtmlmessages.pt:88
 msgid "Last updated"
 msgstr "Letzte Änderung"
 
-#: src/ZWiki/skins/dtmlmessages.pt:87
+#: src/ZWiki/skins/dtmlmessages.pt:89
 msgid "Comments"
 msgstr "Kommentare"
 
-#: src/ZWiki/skins/dtmlmessages.pt:88
+#: src/ZWiki/skins/dtmlmessages.pt:9 src/ZWiki/skins/dtmlmessages.pt:32
+msgid "#"
+msgstr "#"
+
+#: src/ZWiki/skins/dtmlmessages.pt:90
 msgid "Views"
 msgstr "Ansichten"
 
-#: src/ZWiki/skins/dtmlmessages.pt:89
+#: src/ZWiki/skins/dtmlmessages.pt:91
 msgid "Created"
 msgstr "Erstellt"
 
-#: src/ZWiki/skins/dtmlmessages.pt:9 src/ZWiki/skins/dtmlmessages.pt:31
-msgid "#"
-msgstr "#"
-
-#: src/ZWiki/skins/dtmlmessages.pt:90 src/ZWiki/skins/dtmlmessages.pt:92
+#: src/ZWiki/skins/dtmlmessages.pt:92 src/ZWiki/skins/dtmlmessages.pt:94
 msgid "by"
 msgstr "von"
 
-#: src/ZWiki/skins/dtmlmessages.pt:91
+#: src/ZWiki/skins/dtmlmessages.pt:93
 msgid "<dtml-var lasteditinterval> ago</dtml-var>"
 msgstr "<dtml-var lasteditinterval> vor</dtml-var>"
 
-#: src/ZWiki/skins/dtmlmessages.pt:93
+#: src/ZWiki/skins/dtmlmessages.pt:95
 msgid "on"
 msgstr "am"
 
-#: src/ZWiki/skins/zwiki/backlinks.pt:108
-msgid "Subtopics"
-msgstr "Unterkategorien"
-
-#: src/ZWiki/skins/zwiki/backlinks.pt:111
-msgid "This page has no subtopics."
-msgstr "Diese Seite besitzt keine Unterkategorien."
-
-#: src/ZWiki/skins/zwiki/backlinks.pt:114
+#: src/ZWiki/skins/zwiki/backlinks.pt:102
 #, fuzzy
 msgid "Here are it's subtopics."
 msgstr "Diese Seite besitzt folgende Unterkategorien:"
 
-#: src/ZWiki/skins/zwiki/backlinks.pt:117
+#: src/ZWiki/skins/zwiki/backlinks.pt:105
 #, fuzzy
 msgid "You can reorder them by clicking the ^ buttons."
-msgstr ""
-"Sie können die Reihenfolge der Unterkategorien verändern, indem Sie auf den "
-"Knopf mit dem ^ drücken."
+msgstr "Sie können die Reihenfolge der Unterkategorien verändern, indem Sie auf den Knopf mit dem ^ drücken."
 
 #: src/ZWiki/skins/zwiki/backlinks.pt:20
 #, fuzzy
@@ -962,73 +911,62 @@
 msgid "Parents"
 msgstr "Ãœbergeordnete Seiten"
 
-#: src/ZWiki/skins/zwiki/backlinks.pt:31
+#: src/ZWiki/skins/zwiki/backlinks.pt:28
 msgid "is a top-level topic."
 msgstr "hat keine Oberkategorie."
 
-#: src/ZWiki/skins/zwiki/backlinks.pt:32
+#: src/ZWiki/skins/zwiki/backlinks.pt:29
 msgid "is a subtopic of:"
 msgstr "ist eine untergeordnete Seite von:"
 
-#: src/ZWiki/skins/zwiki/backlinks.pt:55
+#: src/ZWiki/skins/zwiki/backlinks.pt:48
 msgid "Backlinks"
 msgstr "Backlinks"
 
-#: src/ZWiki/skins/zwiki/backlinks.pt:56
+#: src/ZWiki/skins/zwiki/backlinks.pt:49
 msgid "Here are the pages which link to it:"
 msgstr "Diese Seiten verweisen auf sie:"
 
-#: src/ZWiki/skins/zwiki/backlinks.pt:57
+#: src/ZWiki/skins/zwiki/backlinks.pt:50
 msgid "No other pages link to this one."
 msgstr "Keine anderen Seiten verweisen auf diese."
 
-#: src/ZWiki/skins/zwiki/backlinks.pt:82
-msgid ""
-"You can set this page's parent(s) to place it within the overall page "
-"hierarchy."
+#: src/ZWiki/skins/zwiki/backlinks.pt:70
+msgid "You can set this page's parent(s) to place it within the overall page hierarchy."
 msgstr ""
 
-#: src/ZWiki/skins/zwiki/backlinks.pt:85
-msgid ""
-"Check one or more checkboxes or enter a page name here, and click the button."
-msgstr ""
-"Wählen Sie eine oder mehrere Checkboxen an, oder geben die hier einen "
-"Seitennamen an. Bestätigen Sie per Click auf den Button."
+#: src/ZWiki/skins/zwiki/backlinks.pt:73
+msgid "Check one or more checkboxes or enter a page name here, and click the button."
+msgstr "Wählen Sie eine oder mehrere Checkboxen an, oder geben die hier einen Seitennamen an. Bestätigen Sie per Click auf den Button."
 
-#: src/ZWiki/skins/zwiki/backlinks.pt:88
+#: src/ZWiki/skins/zwiki/backlinks.pt:76
 msgid "Enter a page name here and click the button."
-msgstr ""
-"Geben Sie hier einen Seitennamen an, und bestätigen Sie per Click auf den "
-"Button"
+msgstr "Geben Sie hier einen Seitennamen an, und bestätigen Sie per Click auf den Button"
 
-#: src/ZWiki/skins/zwiki/backlinks.pt:91
+#: src/ZWiki/skins/zwiki/backlinks.pt:79
 #, fuzzy
-msgid ""
-"You can type just the first few letters, case and punctuation are ignored."
-msgstr ""
-"Sie brauchen nur wenige Anfangsbuchstaben eingeben, Groß- und "
-"Kleinschreibung sowie Zeichensetzung werden ignoriert."
+msgid "You can type just the first few letters, case and punctuation are ignored."
+msgstr "Sie brauchen nur wenige Anfangsbuchstaben eingeben, Groß- und Kleinschreibung sowie Zeichensetzung werden ignoriert."
 
-#: src/ZWiki/skins/zwiki/backlinks.pt:98
+#: src/ZWiki/skins/zwiki/backlinks.pt:86
 msgid "Reparent"
 msgstr "Unterordnen"
 
+#: src/ZWiki/skins/zwiki/backlinks.pt:96
+msgid "Subtopics"
+msgstr "Unterkategorien"
+
+#: src/ZWiki/skins/zwiki/backlinks.pt:99
+msgid "This page has no subtopics."
+msgstr "Diese Seite besitzt keine Unterkategorien."
+
 #: src/ZWiki/skins/zwiki/badtemplate.pt:12
 msgid "Bad template"
 msgstr ""
 
 #: src/ZWiki/skins/zwiki/badtemplate.pt:13
-msgid ""
-"There was a problem locating one of this wiki's skin templates. There may be "
-"a page or other non-page-template/non-dtml-method object with the same ID, "
-"obscuring the template. Or the template may be missing on the filesystem (an "
-"incomplete Zwiki installation)."
-msgstr ""
-"Ein Problem mit einem der Skin-Templates dieses Wikis ist aufgetreten. "
-"Eventuell existiert eine Seite oder ein Nicht-Page-Template- bzw. Nicht-DTML-"
-"Method-Objekt mit der selben ID, welches das Skin-Template »überdeckt«. "
-"Eventuell fehlt das Skin-Template auch im Dateisystem (eine unvollständige "
-"Zwiki-Installation)."
+msgid "There was a problem locating one of this wiki's skin templates. There may be a page or other non-page-template/non-dtml-method object with the same ID, obscuring the template. Or the template may be missing on the filesystem (an incomplete Zwiki installation)."
+msgstr "Ein Problem mit einem der Skin-Templates dieses Wikis ist aufgetreten. Eventuell existiert eine Seite oder ein Nicht-Page-Template- bzw. Nicht-DTML-Method-Objekt mit der selben ID, welches das Skin-Template »überdeckt«. Eventuell fehlt das Skin-Template auch im Dateisystem (eine unvollständige Zwiki-Installation)."
 
 #: src/ZWiki/skins/zwiki/commentform.pt:21
 msgid "subject"
@@ -1036,9 +974,7 @@
 
 #: src/ZWiki/skins/zwiki/commentform.pt:22
 msgid "a subject helps clarify threads and RecentChanges"
-msgstr ""
-"Mit aussagekräftigen Betreffen kann man Diskussionen leichter folgen und die "
-"Liste der jüngsten Änderungen wird informativer."
+msgstr "Mit aussagekräftigen Betreffen kann man Diskussionen leichter folgen und die Liste der jüngsten Änderungen wird informativer."
 
 #: src/ZWiki/skins/zwiki/commentform.pt:29
 msgid "replying"
@@ -1046,9 +982,7 @@
 
 #: src/ZWiki/skins/zwiki/commentform.pt:36
 msgid "to comment (and cc any subscribers) enter text here and click add"
-msgstr ""
-"Um diese Seite zu kommentieren (und alle Abonnenten zu benachrichtigen), "
-"geben Sie hier einen Text ein und klicken Sie auf 'Kommentar hinzufügen'."
+msgstr "Um diese Seite zu kommentieren (und alle Abonnenten zu benachrichtigen), geben Sie hier einen Text ein und klicken Sie auf 'Kommentar hinzufügen'."
 
 #: src/ZWiki/skins/zwiki/commentform.pt:56
 msgid "${nb} subscribers"
@@ -1063,12 +997,20 @@
 msgid "add-comment"
 msgstr "Kommentar hinzufügen"
 
-#: src/ZWiki/skins/zwiki/contentspage.pt:12
+#: src/ZWiki/skins/zwiki/contentspage.pt:10
+#: src/ZWiki/skins/zwiki/contentspage.pt:27
+#, fuzzy
+msgid "Wiki contents for"
+msgstr "Wiki-Inhalt"
+
+#: src/ZWiki/skins/zwiki/contentspage.pt:13
+#: src/ZWiki/skins/zwiki/contentspage.pt:30
 msgid "Wiki contents"
 msgstr "Wiki-Inhalt"
 
-#: src/ZWiki/skins/zwiki/contentspage.pt:16
-msgid "Singletons"
+#: src/ZWiki/skins/zwiki/contentspage.pt:40
+#, fuzzy
+msgid "Singletons:"
 msgstr "Singletons"
 
 #: src/ZWiki/skins/zwiki/denied.pt:12
@@ -1137,9 +1079,7 @@
 
 #: src/ZWiki/skins/zwiki/editform.pt:147
 msgid "upload a file and link it on this page ?"
-msgstr ""
-"Soll eine Datei oder ein Bild ins Wiki hochgeladen und ein Verweis darauf zu "
-"dieser Seite hinzugefügt werden?"
+msgstr "Soll eine Datei oder ein Bild ins Wiki hochgeladen und ein Verweis darauf zu dieser Seite hinzugefügt werden?"
 
 #: src/ZWiki/skins/zwiki/editform.pt:157
 msgid "For editing help, see"
@@ -1158,13 +1098,13 @@
 msgstr "${DYNAMIC_CONTENT}"
 
 #: src/ZWiki/skins/zwiki/editform.pt:178
-msgid "preview this edit"
-msgstr "Vorschau der bearbeiteten Seite"
-
-#: src/ZWiki/skins/zwiki/editform.pt:178
 msgid "Preview"
 msgstr "Vorschau"
 
+#: src/ZWiki/skins/zwiki/editform.pt:178
+msgid "preview this edit"
+msgstr "Vorschau der bearbeiteten Seite"
+
 #: src/ZWiki/skins/zwiki/editform.pt:183
 msgid "Cancel"
 msgstr "Abbrechen"
@@ -1196,20 +1136,21 @@
 
 #: src/ZWiki/skins/zwiki/editform.pt:61
 msgid "the name of this wiki page (changing this may be slow!)"
-msgstr ""
-"Der Name dieser Wiki-Seite. (es kann sehr lange dauern, den Namen einer "
-"Seite zu ändern!)"
+msgstr "Der Name dieser Wiki-Seite. (es kann sehr lange dauern, den Namen einer Seite zu ändern!)"
 
 #: src/ZWiki/skins/zwiki/editform.pt:71
-msgid "type"
-msgstr "Typ"
+msgid "markup"
+msgstr ""
 
 #: src/ZWiki/skins/zwiki/editform.pt:72
 msgid "select the formatting and rendering style for this page"
-msgstr ""
-"Wählen Sie die Art und Weise, wie diese Seite formatiert und dargestellt "
-"werden soll."
+msgstr "Wählen Sie die Art und Weise, wie diese Seite formatiert und dargestellt werden soll."
 
+#: src/ZWiki/skins/zwiki/helppage.pt:12
+#, fuzzy
+msgid "Help page"
+msgstr "HilfeSeite"
+
 #: src/ZWiki/skins/zwiki/links.pt:102
 msgid "(external edit)"
 msgstr "Diese Seite mit einem externem Editor bearbeiten"
@@ -1344,22 +1285,19 @@
 
 #: src/ZWiki/skins/zwiki/pagemanagementform.pt:40
 msgid "enter a page name and click buttons to the right (mouse over for help)"
-msgstr ""
-"geben Sie den Namen einer Seite ein und klicken Sie auf die Knöpfe rechts "
-"(eine Hilfe erscheint, wenn Sie die Maus über die Knöpfe bewegen)"
+msgstr "geben Sie den Namen einer Seite ein und klicken Sie auf die Knöpfe rechts (eine Hilfe erscheint, wenn Sie die Maus über die Knöpfe bewegen)"
 
 #: src/ZWiki/skins/zwiki/pagemanagementform.pt:45
-msgid "reparent"
-msgstr "Unterordnen"
-
-#: src/ZWiki/skins/zwiki/pagemanagementform.pt:45
 msgid "make this page a subtopic of the page you have entered"
 msgstr "Diese Seite zu einem Unterthema der eingegebenen Seite machen"
 
+#: src/ZWiki/skins/zwiki/pagemanagementform.pt:45
+msgid "reparent"
+msgstr "Unterordnen"
+
 #: src/ZWiki/skins/zwiki/pagemanagementform.pt:50
 msgid "rename this page to the name you have entered, updating all links"
-msgstr ""
-"Diese Seite in den eingegebenen Namen umbenennen und alle Links aktualisieren"
+msgstr "Diese Seite in den eingegebenen Namen umbenennen und alle Links aktualisieren"
 
 #: src/ZWiki/skins/zwiki/pagemanagementform.pt:50
 msgid "rename"
@@ -1370,16 +1308,12 @@
 msgstr "Löschen!"
 
 #: src/ZWiki/skins/zwiki/pagemanagementform.pt:55
-msgid ""
-"delete this page, and redirect links to the page you have entered, if any"
-msgstr ""
-"Diese Seite löschen. Sofern direkte Links auf die eingegebene Seite "
-"existieren, diese umleiten."
+msgid "delete this page, and redirect links to the page you have entered, if any"
+msgstr "Diese Seite löschen. Sofern direkte Links auf die eingegebene Seite existieren, diese umleiten."
 
 #: src/ZWiki/skins/zwiki/pagemanagementform.pt:60
 msgid "create a page with the name you have entered, as a subtopic of this one"
-msgstr ""
-"Erstelle eine Seite mit dem eingegebenen Namen als Unterthema dieser Seite."
+msgstr "Erstelle eine Seite mit dem eingegebenen Namen als Unterthema dieser Seite."
 
 #: src/ZWiki/skins/zwiki/pagemanagementform.pt:60
 msgid "create"
@@ -1442,10 +1376,7 @@
 #.  "              Or return to"
 #: src/ZWiki/skins/zwiki/subscribeform.pt:38
 msgid "subscribe_desc_comments"
-msgstr ""
-"Sie können diese Seite oder das gesamte Wiki abonnieren. Als Abonnent werden "
-"Sie per E-Mail benachrichtigt, wenn Kommentare hinzugefügt werden. Sie "
-"können auch zurückkehren zu"
+msgstr "Sie können diese Seite oder das gesamte Wiki abonnieren. Als Abonnent werden Sie per E-Mail benachrichtigt, wenn Kommentare hinzugefügt werden. Sie können auch zurückkehren zu"
 
 #. Default: ""
 #.  "You can subscribe to this page or to the whole wiki.\n"
@@ -1453,10 +1384,7 @@
 #.  "              Or return to"
 #: src/ZWiki/skins/zwiki/subscribeform.pt:43
 msgid "subscribe_desc_edits"
-msgstr ""
-"Sie können diese Seite oder das gesamte Wiki abonnieren. Als Abonnent werden "
-"Sie per E-Mail benachrichtigt, wenn diese Seite bzw. das Wiki verändert "
-"werden. Oder kehren Sie zurück zu"
+msgstr "Sie können diese Seite oder das gesamte Wiki abonnieren. Als Abonnent werden Sie per E-Mail benachrichtigt, wenn diese Seite bzw. das Wiki verändert werden. Oder kehren Sie zurück zu"
 
 #: src/ZWiki/skins/zwiki/subscribeform.pt:53
 msgid "Email will go to the address you have configured in site preferences."
@@ -1503,12 +1431,17 @@
 msgid "User options"
 msgstr "Benutzer Optionen"
 
+#~ msgid "(identifies your edits)"
+#~ msgstr "(kennzeichnet Ihre Änderungen)"
+
+#~ msgid "type"
+#~ msgstr "Typ"
+
 #~ msgid "your edit contained a banned link pattern"
 #~ msgstr "Ihre Bearbeitung enthielt einen verbotenen Link"
 
 #~ msgid "adding of external links by anonymous authors is restricted"
-#~ msgstr ""
-#~ "anonyme Autoren dürfen nur eine begrenzte Anzahl externer Links hinzufügen"
+#~ msgstr "anonyme Autoren dürfen nur eine begrenzte Anzahl externer Links hinzufügen"
 
 #~ msgid "Add a ZWiki web"
 #~ msgstr "Ein ZWiki-Web hinzufügen"
@@ -1522,15 +1455,8 @@
 #~ msgid "and enter"
 #~ msgstr "und betreten"
 
-#~ msgid ""
-#~ "You may create a new ZWiki Page object using the form below. You may also "
-#~ "choose to upload an existing html file from your local computer by "
-#~ "clicking the <i>Browse</i> button."
-#~ msgstr ""
-#~ "Mit Hilfe des Eingabeformulars können Sie eine neue ZWiki-Seite "
-#~ "erstellen. Sie können aber auch eine existierende HTML-Seite von ihrem "
-#~ "eigenen Computer hochladen, indem Sie den Knopf rechts vom 'Datei'-Feld "
-#~ "klicken."
+#~ msgid "You may create a new ZWiki Page object using the form below. You may also choose to upload an existing html file from your local computer by clicking the <i>Browse</i> button."
+#~ msgstr "Mit Hilfe des Eingabeformulars können Sie eine neue ZWiki-Seite erstellen. Sie können aber auch eine existierende HTML-Seite von ihrem eigenen Computer hochladen, indem Sie den Knopf rechts vom 'Datei'-Feld klicken."
 
 #~ msgid "Add"
 #~ msgstr "Hinzufügen"
@@ -1551,20 +1477,13 @@
 #~ msgstr "Zurück zur Seite"
 
 #~ msgid "help_shortname"
-#~ msgstr ""
-#~ "Achtung: In einem großen Wiki kann es sehr lange dauern, eine Seite "
-#~ "umzubenennen. Wenn möglich, werden dabei Verweise in anderen Seiten "
-#~ "aktualisiert."
+#~ msgstr "Achtung: In einem großen Wiki kann es sehr lange dauern, eine Seite umzubenennen. Wenn möglich, werden dabei Verweise in anderen Seiten aktualisiert."
 
 #~ msgid "label_body_text"
 #~ msgstr "Seiteninhalt"
 
 #~ msgid "help_wikibody"
-#~ msgstr ""
-#~ "Verwenden Sie WikiNamen oder  [eckige Klammern] um auf andere Seiten zu "
-#~ "verweisen. Verweise auf Seiten, die noch nicht existieren, werden mit "
-#~ "einem kleinen <code>?</code> gekennzeichnet. Klicken Sie auf dieses "
-#~ "Fragezeichen, um die fehlende Seite zu erstellen."
+#~ msgstr "Verwenden Sie WikiNamen oder  [eckige Klammern] um auf andere Seiten zu verweisen. Verweise auf Seiten, die noch nicht existieren, werden mit einem kleinen <code>?</code> gekennzeichnet. Klicken Sie auf dieses Fragezeichen, um die fehlende Seite zu erstellen."
 
 #~ msgid "label_note"
 #~ msgstr "Notiz für die Versionskontrolle (optional)"
@@ -1582,8 +1501,7 @@
 #~ msgstr "Seitenformat"
 
 #~ msgid "help_format"
-#~ msgstr ""
-#~ "Wenn Sie bei der Wahl des Formats unsicher sind, wählen Sie 'Plain Text'."
+#~ msgstr "Wenn Sie bei der Wahl des Formats unsicher sind, wählen Sie 'Plain Text'."
 
 #~ msgid "Save"
 #~ msgstr "Speichern"
@@ -1634,10 +1552,7 @@
 #~ msgstr "Eigenschaften ändern"
 
 #~ msgid "backlinks_reparent_help"
-#~ msgstr ""
-#~ "Sie können dieser Seite andere Seiten als Oberkategorien zuordnen, um sie "
-#~ "in der Wiki-Hierarchie zu platzieren. Setzen Sie dazu ein Häkchen vor die "
-#~ "gewünschten(n) Seite(n) oder geben Sie den Namen einer Seite ein."
+#~ msgstr "Sie können dieser Seite andere Seiten als Oberkategorien zuordnen, um sie in der Wiki-Hierarchie zu platzieren. Setzen Sie dazu ein Häkchen vor die gewünschten(n) Seite(n) oder geben Sie den Namen einer Seite ein."
 
 #~ msgid "backlinks_reparent_help2"
 #~ msgstr "und hier klicken"
@@ -1676,8 +1591,7 @@
 #~ msgstr "Wiki-Benutzer"
 
 #~ msgid "Wiki visitors, which can only view and comment on wikis."
-#~ msgstr ""
-#~ "Wiki-Besucher, die Wiki-Seiten nur betrachten oder kommentieren dürfen."
+#~ msgstr "Wiki-Besucher, die Wiki-Seiten nur betrachten oder kommentieren dürfen."
 
 #~ msgid "A Wiki Page"
 #~ msgstr "Eine Wiki-Seite"

Modified: zope-zwiki/trunk/i18n/en_GB.po
===================================================================
--- zope-zwiki/trunk/i18n/en_GB.po	2007-04-08 14:54:05 UTC (rev 761)
+++ zope-zwiki/trunk/i18n/en_GB.po	2007-04-08 14:55:27 UTC (rev 762)
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: zwiki\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL at ADDRESS>\n"
-"POT-Creation-Date: Sat Sep  2 18:10:16 2006\n"
+"POT-Creation-Date: Tue Mar 27 14:50:46 2007\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
 "Language-Team: English (United Kingdom) <en_GB at li.org>\n"
@@ -18,33 +18,29 @@
 "X-Rosetta-Version: 0.1\n"
 "Domain: zwiki\n"
 
-#: src/ZWiki/Admin.py:62
+#: src/ZWiki/Admin.py:58
 msgid "You are not authorized to upgrade all pages."
 msgstr ""
 
-#: src/ZWiki/Admin.py:63
+#: src/ZWiki/Admin.py:59
 msgid "(folder -> Manage properties)"
 msgstr ""
 
-#: src/ZWiki/Diff.py:174
+#: src/ZWiki/Diff.py:179
 msgid "You are not authorized to reparent this ZWiki Page."
 msgstr ""
 
-#: src/ZWiki/Diff.py:180 src/ZWiki/plugins/tracker/tracker.py:332
+#: src/ZWiki/Diff.py:185 src/ZWiki/plugins/tracker/tracker.py:333
 msgid "You are not authorized to rename this ZWiki Page."
 msgstr ""
 
-#: src/ZWiki/Editing.py:156 src/ZWiki/Editing.py:294 src/ZWiki/Views.py:332
-#: src/ZWiki/Views.py:435 src/ZWiki/plugins/tracker/tracker.py:321
-msgid ""
-"Sorry, this wiki doesn't allow anonymous edits. Please configure a username "
-"in options first."
+#: src/ZWiki/Editing.py:156 src/ZWiki/Editing.py:294 src/ZWiki/Views.py:336
+#: src/ZWiki/Views.py:439 src/ZWiki/plugins/tracker/tracker.py:322
+msgid "Sorry, this wiki doesn't allow anonymous edits. Please configure a username in options first."
 msgstr ""
 
 #: src/ZWiki/Editing.py:327
-msgid ""
-"You are not authorized to reparent or change subtopics links on this ZWiki "
-"Page."
+msgid "You are not authorized to reparent or change subtopics links on this ZWiki Page."
 msgstr ""
 
 #: src/ZWiki/Editing.py:349
@@ -52,9 +48,9 @@
 msgstr ""
 
 #: src/ZWiki/Editing.py:383 src/ZWiki/Editing.py:410
-#: src/ZWiki/plugins/tracker/tracker.py:340
-#: src/ZWiki/plugins/tracker/tracker.py:347
-#: src/ZWiki/plugins/tracker/tracker.py:354
+#: src/ZWiki/plugins/tracker/tracker.py:344
+#: src/ZWiki/plugins/tracker/tracker.py:351
+#: src/ZWiki/plugins/tracker/tracker.py:358
 msgid "You are not authorized to edit this ZWiki Page."
 msgstr ""
 
@@ -63,8 +59,7 @@
 msgstr ""
 
 #: src/ZWiki/Editing.py:563
-msgid ""
-"This page was renamed to %s. You can delete this one if no longer needed.\n"
+msgid "This page was renamed to %s. You can delete this one if no longer needed.\n"
 msgstr ""
 
 #: src/ZWiki/Editing.py:659
@@ -84,9 +79,7 @@
 msgstr ""
 
 #: src/ZWiki/Editing.py:830
-msgid ""
-"your edit contained a banned link pattern. Please contact the site "
-"administrator for help."
+msgid "your edit contained a banned link pattern. Please contact the site administrator for help."
 msgstr ""
 
 #: src/ZWiki/Editing.py:841
@@ -94,10 +87,7 @@
 msgstr ""
 
 #: src/ZWiki/Editing.py:842
-msgid ""
-"adding of external links by unidentified users is restricted. Please back up "
-"and remove some of the http urls you added, or contact the site "
-"administrator for help."
+msgid "adding of external links by unidentified users is restricted. Please back up and remove some of the http urls you added, or contact the site administrator for help."
 msgstr ""
 
 #: src/ZWiki/Editing.py:853
@@ -105,85 +95,86 @@
 msgstr ""
 
 #: src/ZWiki/Editing.py:854
-msgid ""
-"adding of external links is restricted, even for identified users. Please "
-"back up and remove some of the http urls you added, or contact the site "
-"administrator for help."
+msgid "adding of external links is restricted, even for identified users. Please back up and remove some of the http urls you added, or contact the site administrator for help."
 msgstr ""
 
-#: src/ZWiki/Mail.py:506 src/ZWiki/skins/dtmlmessages.pt:58
+#: src/ZWiki/Mail.py:506 src/ZWiki/skins/dtmlmessages.pt:60
 msgid "anonymous"
 msgstr ""
 
-#: src/ZWiki/OutlineSupport.py:843 src/ZWiki/skins/zwiki/links.pt:56
+#: src/ZWiki/OutlineSupport.py:378
+msgid "Sorry, this wiki doesn't allow anonymous reparenting. Please configure a username in options first."
+msgstr ""
+
+#: src/ZWiki/OutlineSupport.py:878 src/ZWiki/skins/zwiki/links.pt:56
 msgid "which pages link to this one ?"
 msgstr ""
 
-#: src/ZWiki/OutlineSupport.py:851
+#: src/ZWiki/OutlineSupport.py:886
 msgid "You are here"
 msgstr ""
 
-#: src/ZWiki/Utils.py:465
+#: src/ZWiki/Utils.py:487
 msgid "years"
 msgstr ""
 
-#: src/ZWiki/Utils.py:465
+#: src/ZWiki/Utils.py:487
 msgid "year"
 msgstr ""
 
-#: src/ZWiki/Utils.py:467
+#: src/ZWiki/Utils.py:489
 msgid "month"
 msgstr ""
 
-#: src/ZWiki/Utils.py:467
+#: src/ZWiki/Utils.py:489
 msgid "months"
 msgstr ""
 
-#: src/ZWiki/Utils.py:469
+#: src/ZWiki/Utils.py:491
 msgid "weeks"
 msgstr ""
 
-#: src/ZWiki/Utils.py:469
+#: src/ZWiki/Utils.py:491
 msgid "week"
 msgstr ""
 
-#: src/ZWiki/Utils.py:471
+#: src/ZWiki/Utils.py:493
 msgid "day"
 msgstr ""
 
-#: src/ZWiki/Utils.py:471
+#: src/ZWiki/Utils.py:493
 msgid "days"
 msgstr ""
 
-#: src/ZWiki/Utils.py:473
+#: src/ZWiki/Utils.py:495
 msgid "hours"
 msgstr ""
 
-#: src/ZWiki/Utils.py:473
+#: src/ZWiki/Utils.py:495
 msgid "hour"
 msgstr ""
 
-#: src/ZWiki/Utils.py:475
+#: src/ZWiki/Utils.py:497
 msgid "minute"
 msgstr ""
 
-#: src/ZWiki/Utils.py:475
+#: src/ZWiki/Utils.py:497
 msgid "minutes"
 msgstr ""
 
-#: src/ZWiki/Utils.py:477
+#: src/ZWiki/Utils.py:499
 msgid "second"
 msgstr ""
 
-#: src/ZWiki/Utils.py:477
+#: src/ZWiki/Utils.py:499
 msgid "seconds"
 msgstr ""
 
-#: src/ZWiki/Views.py:346
+#: src/ZWiki/Views.py:350
 msgid "Page is locked"
 msgstr ""
 
-#: src/ZWiki/Views.py:357
+#: src/ZWiki/Views.py:361
 msgid ""
 "\n"
 "            This page has a webDAV lock. Someone is probably editing it\n"
@@ -194,60 +185,58 @@
 "            "
 msgstr ""
 
-#: src/ZWiki/Views.py:364
+#: src/ZWiki/Views.py:368
 msgid "To discard your changes and try again, click OK."
 msgstr ""
 
-#: src/ZWiki/Views.py:393
+#: src/ZWiki/Views.py:397
 msgid "Edit conflict"
 msgstr ""
 
-#: src/ZWiki/Views.py:413
+#: src/ZWiki/Views.py:417
 msgid "Someone else has saved this page while you were editing"
 msgstr ""
 
-#: src/ZWiki/Views.py:414
+#: src/ZWiki/Views.py:418
 msgid "To resolve the conflict, do this"
 msgstr ""
 
-#: src/ZWiki/Views.py:415
+#: src/ZWiki/Views.py:419
 msgid "Click your browser's back button"
 msgstr ""
 
-#: src/ZWiki/Views.py:416
+#: src/ZWiki/Views.py:420
 msgid "Copy your recent edits to the clipboard"
 msgstr ""
 
-#: src/ZWiki/Views.py:417
+#: src/ZWiki/Views.py:421
 msgid "Click your browser's refresh button"
 msgstr ""
 
-#: src/ZWiki/Views.py:418
+#: src/ZWiki/Views.py:422
 msgid "Paste in your edits again, being mindful of the latest changes"
 msgstr ""
 
-#: src/ZWiki/Views.py:419
+#: src/ZWiki/Views.py:423
 msgid "Click the Change button again"
 msgstr ""
 
-#: src/ZWiki/Views.py:420 src/ZWiki/skins/zwiki/editform.pt:163
+#: src/ZWiki/Views.py:424 src/ZWiki/skins/zwiki/editform.pt:163
 msgid "or"
 msgstr ""
 
-#: src/ZWiki/Views.py:421
+#: src/ZWiki/Views.py:425
 msgid "To discard your changes and start again, click OK"
 msgstr ""
 
-#: src/ZWiki/Views.py:490
+#: src/ZWiki/Views.py:501
 msgid ""
 "\n"
-"        Access keys can be accessed in mozilla-based browsers by pressing "
-"alt-<key>\n"
+"        Access keys can be accessed in mozilla-based browsers by pressing alt-<key>\n"
 "        IE users: must also press enter\n"
 "        Mac users: command-<key>\n"
 "        Opera users: shift-escape-<key>\n"
-"        These won't work here, back up to the previous page to try them "
-"out.\n"
+"        These won't work here, back up to the previous page to try them out.\n"
 "\n"
 "        0    show these access key assignments\n"
 "\n"
@@ -263,10 +252,8 @@
 "        s    go to search field\n"
 "        \n"
 "        page functions:\n"
-"        +    (in a plone/cmf site with skin switching set up) use zwiki's "
-"plone/cmf skin\n"
-"        -    (in a plone/cmf site with skin switching set up) use zwiki's "
-"standard skin\n"
+"        +    (in a plone/cmf site with skin switching set up) use zwiki's plone/cmf skin\n"
+"        -    (in a plone/cmf site with skin switching set up) use zwiki's standard skin\n"
 "        v    view page\n"
 "        m    mail subscription\n"
 "        b    show backlinks (links to this page)\n"
@@ -294,32 +281,31 @@
 "        "
 msgstr ""
 
-#: src/ZWiki/Wikis.py:49
-msgid "Unknown wiki type"
-msgstr ""
-
-#: src/ZWiki/ZWikiPage.py:675
+#: src/ZWiki/ZWikiPage.py:744
 msgid "create this page"
 msgstr ""
 
-#: src/ZWiki/ZWikiPage.py:798 src/ZWiki/ZWikiPage.py:814
-#: src/ZWiki/ZWikiPage.py:817
+#: src/ZWiki/ZWikiPage.py:872 src/ZWiki/ZWikiPage.py:887
 msgid "last edited %(interval)s ago"
 msgstr ""
 
-#: src/ZWiki/ZWikiPage.py:809
+#: src/ZWiki/ZWikiPage.py:882
 msgid "show last edit"
 msgstr ""
 
-#: src/ZWiki/ZWikiPage.py:826 src/ZWiki/ZWikiPage.py:828
+#: src/ZWiki/ZWikiPage.py:897 src/ZWiki/ZWikiPage.py:899
 msgid "by %(editor)s"
 msgstr ""
 
-#: src/ZWiki/__init__.py:34
+#: src/ZWiki/__init__.py:200
+msgid "Unknown wiki type"
+msgstr ""
+
+#: src/ZWiki/__init__.py:39
 msgid "No need to add a Zwiki Outline Cache"
 msgstr ""
 
-#: src/ZWiki/__init__.py:35
+#: src/ZWiki/__init__.py:40
 msgid ""
 "Zwiki Outline Cache appears in the ZMI Add menu\n"
 "        for implementation reasons, but should not be added directly.\n"
@@ -331,6 +317,10 @@
 msgid "comments"
 msgstr ""
 
+#: src/ZWiki/pagetypes/html.py:50 src/ZWiki/pagetypes/rst.py:85
+msgid "reply"
+msgstr ""
+
 #: src/ZWiki/pagetypes/moin.py:1990
 msgid "Expected \"=\" to follow \"%(token)s\""
 msgstr ""
@@ -367,10 +357,6 @@
 msgid "Expected a color value \"%(arg)s\" after \"%(key)s\""
 msgstr ""
 
-#: src/ZWiki/pagetypes/rst.py:85
-msgid "reply"
-msgstr ""
-
 #: src/ZWiki/plugins/latexwiki/wikis/latexwiki/diffform.pt:127
 #: src/ZWiki/plugins/mathaction/wikis/mathaction/old-diffform.pt:127
 msgid "full history"
@@ -444,7 +430,7 @@
 msgstr ""
 
 #: src/ZWiki/plugins/tracker/filterissues.pt:12
-#: src/ZWiki/skins/dtmlmessages.pt:30
+#: src/ZWiki/skins/dtmlmessages.pt:31
 msgid "Filter issues"
 msgstr ""
 
@@ -456,108 +442,104 @@
 msgid "Issue tracker"
 msgstr ""
 
-#: src/ZWiki/plugins/tracker/tracker.py:361
+#: src/ZWiki/plugins/tracker/tracker.py:365
 msgid "You are not authorized to comment on this ZWiki Page."
 msgstr ""
 
-#: src/ZWiki/skins/dtmlmessages.pt:10 src/ZWiki/skins/dtmlmessages.pt:32
+#: src/ZWiki/skins/dtmlmessages.pt:10 src/ZWiki/skins/dtmlmessages.pt:33
+msgid "name"
+msgstr ""
+
+#: src/ZWiki/skins/dtmlmessages.pt:11 src/ZWiki/skins/dtmlmessages.pt:34
 msgid "category"
 msgstr ""
 
-#: src/ZWiki/skins/dtmlmessages.pt:11 src/ZWiki/skins/dtmlmessages.pt:33
+#: src/ZWiki/skins/dtmlmessages.pt:12 src/ZWiki/skins/dtmlmessages.pt:35
 msgid "severity"
 msgstr ""
 
-#: src/ZWiki/skins/dtmlmessages.pt:12 src/ZWiki/skins/dtmlmessages.pt:34
+#: src/ZWiki/skins/dtmlmessages.pt:13 src/ZWiki/skins/dtmlmessages.pt:36
 msgid "status"
 msgstr ""
 
-#: src/ZWiki/skins/dtmlmessages.pt:13 src/ZWiki/skins/dtmlmessages.pt:35
+#: src/ZWiki/skins/dtmlmessages.pt:14 src/ZWiki/skins/dtmlmessages.pt:37
 msgid "age"
 msgstr ""
 
-#: src/ZWiki/skins/dtmlmessages.pt:14 src/ZWiki/skins/dtmlmessages.pt:36
+#: src/ZWiki/skins/dtmlmessages.pt:15 src/ZWiki/skins/dtmlmessages.pt:38
 msgid "modified"
 msgstr ""
 
-#: src/ZWiki/skins/dtmlmessages.pt:15
+#: src/ZWiki/skins/dtmlmessages.pt:16
 msgid "Add a new issue:"
 msgstr ""
 
-#: src/ZWiki/skins/dtmlmessages.pt:16
+#: src/ZWiki/skins/dtmlmessages.pt:17
 msgid "Name:"
 msgstr ""
 
-#: src/ZWiki/skins/dtmlmessages.pt:17
+#: src/ZWiki/skins/dtmlmessages.pt:18
 msgid "Category:"
 msgstr ""
 
-#: src/ZWiki/skins/dtmlmessages.pt:18
+#: src/ZWiki/skins/dtmlmessages.pt:19
 msgid "Severity:"
 msgstr ""
 
-#: src/ZWiki/skins/dtmlmessages.pt:19
-msgid "Status:"
-msgstr ""
-
 #: src/ZWiki/skins/dtmlmessages.pt:2
 msgid "Here are the wiki's issue pages."
 msgstr ""
 
 #: src/ZWiki/skins/dtmlmessages.pt:20
-msgid "Details:"
+msgid "Status:"
 msgstr ""
 
 #: src/ZWiki/skins/dtmlmessages.pt:21
-msgid "add issue"
+msgid "Details:"
 msgstr ""
 
 #: src/ZWiki/skins/dtmlmessages.pt:22
-msgid "More advanced"
+msgid "add issue"
 msgstr ""
 
 #: src/ZWiki/skins/dtmlmessages.pt:23
-msgid "issue tracker"
+msgid "More advanced"
 msgstr ""
 
 #: src/ZWiki/skins/dtmlmessages.pt:24
-msgid "search options"
+msgid "issue tracker"
 msgstr ""
 
 #: src/ZWiki/skins/dtmlmessages.pt:25
-msgid "Name contains any of:"
+msgid "search options"
 msgstr ""
 
 #: src/ZWiki/skins/dtmlmessages.pt:26
-msgid "Page text contains any of:"
+msgid "Name contains any of:"
 msgstr ""
 
 #: src/ZWiki/skins/dtmlmessages.pt:27
-msgid "Categories:"
+msgid "Page text contains any of:"
 msgstr ""
 
 #: src/ZWiki/skins/dtmlmessages.pt:28
-msgid "Severities:"
+msgid "Categories:"
 msgstr ""
 
 #: src/ZWiki/skins/dtmlmessages.pt:29
-msgid "Statuses:"
+msgid "Severities:"
 msgstr ""
 
 #: src/ZWiki/skins/dtmlmessages.pt:3
 msgid "Enter a search term, click the numbers to the right,"
 msgstr ""
 
-#: src/ZWiki/skins/dtmlmessages.pt:37
-msgid "Submitted by"
+#: src/ZWiki/skins/dtmlmessages.pt:30
+msgid "Statuses:"
 msgstr ""
 
-#: src/ZWiki/skins/dtmlmessages.pt:38
-msgid "Name"
-msgstr ""
-
 #: src/ZWiki/skins/dtmlmessages.pt:39
-msgid "Category"
+msgid "Submitted by"
 msgstr ""
 
 #: src/ZWiki/skins/dtmlmessages.pt:4
@@ -565,39 +547,39 @@
 msgstr ""
 
 #: src/ZWiki/skins/dtmlmessages.pt:40
-msgid "Severity"
+msgid "Name"
 msgstr ""
 
 #: src/ZWiki/skins/dtmlmessages.pt:41
-msgid "Status"
+msgid "Category"
 msgstr ""
 
 #: src/ZWiki/skins/dtmlmessages.pt:42
-msgid "Optional subject"
+msgid "Severity"
 msgstr ""
 
 #: src/ZWiki/skins/dtmlmessages.pt:43
-msgid "Optional comment"
+msgid "Status"
 msgstr ""
 
-#: src/ZWiki/skins/dtmlmessages.pt:44 src/ZWiki/skins/dtmlmessages.pt:45
-msgid "Add ZWiki"
+#: src/ZWiki/skins/dtmlmessages.pt:44
+msgid "Optional subject"
 msgstr ""
 
-#: src/ZWiki/skins/dtmlmessages.pt:46
-msgid "Id:"
+#: src/ZWiki/skins/dtmlmessages.pt:45
+msgid "Optional comment"
 msgstr ""
 
-#: src/ZWiki/skins/dtmlmessages.pt:47
-msgid "Title:"
+#: src/ZWiki/skins/dtmlmessages.pt:46 src/ZWiki/skins/dtmlmessages.pt:47
+msgid "Add ZWiki"
 msgstr ""
 
 #: src/ZWiki/skins/dtmlmessages.pt:48
-msgid "Template:"
+msgid "Id:"
 msgstr ""
 
 #: src/ZWiki/skins/dtmlmessages.pt:49
-msgid "Add wiki"
+msgid "Title:"
 msgstr ""
 
 #: src/ZWiki/skins/dtmlmessages.pt:5
@@ -605,81 +587,79 @@
 msgstr ""
 
 #: src/ZWiki/skins/dtmlmessages.pt:50
-msgid "Pages changed in the last"
+msgid "Template:"
 msgstr ""
 
 #: src/ZWiki/skins/dtmlmessages.pt:51
-msgid "Recently changed pages, with summaries"
+msgid "Add wiki"
 msgstr ""
 
 #: src/ZWiki/skins/dtmlmessages.pt:52
-msgid "Show summaries ?"
+msgid "Pages changed in the last"
 msgstr ""
 
 #: src/ZWiki/skins/dtmlmessages.pt:53
-msgid "Refresh"
+msgid "Recently changed pages, with summaries"
 msgstr ""
 
 #: src/ZWiki/skins/dtmlmessages.pt:54
-msgid "Page"
+msgid "Show summaries ?"
 msgstr ""
 
 #: src/ZWiki/skins/dtmlmessages.pt:55
-msgid "Edited&nbsp;by"
+msgid "Refresh"
 msgstr ""
 
 #: src/ZWiki/skins/dtmlmessages.pt:56
-msgid "Time"
+msgid "Page"
 msgstr ""
 
 #: src/ZWiki/skins/dtmlmessages.pt:57
-msgid "NEW"
+msgid "Edited&nbsp;by"
 msgstr ""
 
+#: src/ZWiki/skins/dtmlmessages.pt:58
+msgid "Time"
+msgstr ""
+
 #: src/ZWiki/skins/dtmlmessages.pt:59
-msgid "Pages marked (NEW) have been created within the last week"
+msgid "NEW"
 msgstr ""
 
 #: src/ZWiki/skins/dtmlmessages.pt:6
 msgid "search issues"
 msgstr ""
 
-#: src/ZWiki/skins/dtmlmessages.pt:60
-msgid "Enter a word or phrase and hit enter to search the entire wiki."
-msgstr ""
-
 #: src/ZWiki/skins/dtmlmessages.pt:61
-msgid "This is the same as using the search field at top right."
+msgid "Pages marked (NEW) have been created within the last week"
 msgstr ""
 
 #: src/ZWiki/skins/dtmlmessages.pt:62
-msgid "Tips: A single word works best for matching page names."
+msgid "Enter a word or phrase and hit enter to search the entire wiki."
 msgstr ""
 
 #: src/ZWiki/skins/dtmlmessages.pt:63
-msgid ""
-"Case-insensitivity and wildcards may be supported depending on your catalog "
-"configuration."
+msgid "This is the same as using the search field at top right."
 msgstr ""
 
 #: src/ZWiki/skins/dtmlmessages.pt:64
-msgid "Leave it blank to list all pages."
+msgid "Tips: A single word works best for matching page names."
 msgstr ""
 
-#: src/ZWiki/skins/dtmlmessages.pt:65 src/ZWiki/skins/dtmlmessages.pt:66
-msgid "Search"
+#: src/ZWiki/skins/dtmlmessages.pt:65
+msgid "Case-insensitivity and wildcards may be supported depending on your catalog configuration."
 msgstr ""
 
-#: src/ZWiki/skins/dtmlmessages.pt:67
-msgid "Page names matching"
+#: src/ZWiki/skins/dtmlmessages.pt:66
+msgid "Leave it blank to list all pages."
 msgstr ""
 
-#: src/ZWiki/skins/dtmlmessages.pt:68
-msgid "Text matching"
+#: src/ZWiki/skins/dtmlmessages.pt:67 src/ZWiki/skins/dtmlmessages.pt:68
+msgid "Search"
 msgstr ""
 
 #: src/ZWiki/skins/dtmlmessages.pt:69
-msgid "Thorough (non-catalog) search for text matching"
+msgid "Page names matching"
 msgstr ""
 
 #: src/ZWiki/skins/dtmlmessages.pt:7
@@ -687,43 +667,43 @@
 msgstr ""
 
 #: src/ZWiki/skins/dtmlmessages.pt:70
-msgid "Set your preferences for this wiki:"
+msgid "Text matching"
 msgstr ""
 
 #: src/ZWiki/skins/dtmlmessages.pt:71
-msgid "User name:"
+msgid "Thorough (non-catalog) search for text matching"
 msgstr ""
 
 #: src/ZWiki/skins/dtmlmessages.pt:72
-msgid "(identifies your edits)"
+msgid "Set your preferences for this wiki:"
 msgstr ""
 
 #: src/ZWiki/skins/dtmlmessages.pt:73
-msgid "Email address:"
+msgid "User name:"
 msgstr ""
 
 #: src/ZWiki/skins/dtmlmessages.pt:74
-msgid "(allows mail subscription)"
+msgid "(identifies your edits, saves your votes, may be required)"
 msgstr ""
 
 #: src/ZWiki/skins/dtmlmessages.pt:75
-msgid "Your time zone:"
+msgid "Email address:"
 msgstr ""
 
 #: src/ZWiki/skins/dtmlmessages.pt:76
-msgid "(localizes most times)"
+msgid "(allows mail subscription)"
 msgstr ""
 
 #: src/ZWiki/skins/dtmlmessages.pt:77
-msgid "Edit form height:"
+msgid "Your time zone:"
 msgstr ""
 
 #: src/ZWiki/skins/dtmlmessages.pt:78
-msgid "(adjusts form size)"
+msgid "(localizes most times)"
 msgstr ""
 
 #: src/ZWiki/skins/dtmlmessages.pt:79
-msgid "Save options"
+msgid "Edit form height:"
 msgstr ""
 
 #: src/ZWiki/skins/dtmlmessages.pt:8
@@ -731,70 +711,70 @@
 msgstr ""
 
 #: src/ZWiki/skins/dtmlmessages.pt:80
-msgid "Forget options"
+msgid "(adjusts form size)"
 msgstr ""
 
-#: src/ZWiki/skins/dtmlmessages.pt:81 src/ZWiki/skins/dtmlmessages.pt:82
-msgid "Add ZWiki Page"
+#: src/ZWiki/skins/dtmlmessages.pt:81
+msgid "Save options"
 msgstr ""
 
-#: src/ZWiki/skins/dtmlmessages.pt:83
-msgid "Page&nbsp;name:"
+#: src/ZWiki/skins/dtmlmessages.pt:82
+msgid "Forget options"
 msgstr ""
 
-#: src/ZWiki/skins/dtmlmessages.pt:84
-msgid "Add wiki page"
+#: src/ZWiki/skins/dtmlmessages.pt:83 src/ZWiki/skins/dtmlmessages.pt:84
+msgid "Add ZWiki Page"
 msgstr ""
 
 #: src/ZWiki/skins/dtmlmessages.pt:85
-msgid "Topic"
+msgid "Page&nbsp;name:"
 msgstr ""
 
 #: src/ZWiki/skins/dtmlmessages.pt:86
-msgid "Last updated"
+msgid "Add wiki page"
 msgstr ""
 
 #: src/ZWiki/skins/dtmlmessages.pt:87
-msgid "Comments"
+msgid "Topic"
 msgstr ""
 
 #: src/ZWiki/skins/dtmlmessages.pt:88
-msgid "Views"
+msgid "Last updated"
 msgstr ""
 
 #: src/ZWiki/skins/dtmlmessages.pt:89
-msgid "Created"
+msgid "Comments"
 msgstr ""
 
-#: src/ZWiki/skins/dtmlmessages.pt:9 src/ZWiki/skins/dtmlmessages.pt:31
+#: src/ZWiki/skins/dtmlmessages.pt:9 src/ZWiki/skins/dtmlmessages.pt:32
 msgid "#"
 msgstr ""
 
-#: src/ZWiki/skins/dtmlmessages.pt:90 src/ZWiki/skins/dtmlmessages.pt:92
-msgid "by"
+#: src/ZWiki/skins/dtmlmessages.pt:90
+msgid "Views"
 msgstr ""
 
 #: src/ZWiki/skins/dtmlmessages.pt:91
-msgid "<dtml-var lasteditinterval> ago</dtml-var>"
+msgid "Created"
 msgstr ""
 
-#: src/ZWiki/skins/dtmlmessages.pt:93
-msgid "on"
+#: src/ZWiki/skins/dtmlmessages.pt:92 src/ZWiki/skins/dtmlmessages.pt:94
+msgid "by"
 msgstr ""
 
-#: src/ZWiki/skins/zwiki/backlinks.pt:108
-msgid "Subtopics"
+#: src/ZWiki/skins/dtmlmessages.pt:93
+msgid "<dtml-var lasteditinterval> ago</dtml-var>"
 msgstr ""
 
-#: src/ZWiki/skins/zwiki/backlinks.pt:111
-msgid "This page has no subtopics."
+#: src/ZWiki/skins/dtmlmessages.pt:95
+msgid "on"
 msgstr ""
 
-#: src/ZWiki/skins/zwiki/backlinks.pt:114
+#: src/ZWiki/skins/zwiki/backlinks.pt:102
 msgid "Here are it's subtopics."
 msgstr ""
 
-#: src/ZWiki/skins/zwiki/backlinks.pt:117
+#: src/ZWiki/skins/zwiki/backlinks.pt:105
 msgid "You can reorder them by clicking the ^ buttons."
 msgstr ""
 
@@ -806,60 +786,60 @@
 msgid "Parents"
 msgstr ""
 
-#: src/ZWiki/skins/zwiki/backlinks.pt:31
+#: src/ZWiki/skins/zwiki/backlinks.pt:28
 msgid "is a top-level topic."
 msgstr ""
 
-#: src/ZWiki/skins/zwiki/backlinks.pt:32
+#: src/ZWiki/skins/zwiki/backlinks.pt:29
 msgid "is a subtopic of:"
 msgstr ""
 
-#: src/ZWiki/skins/zwiki/backlinks.pt:55
+#: src/ZWiki/skins/zwiki/backlinks.pt:48
 msgid "Backlinks"
 msgstr ""
 
-#: src/ZWiki/skins/zwiki/backlinks.pt:56
+#: src/ZWiki/skins/zwiki/backlinks.pt:49
 msgid "Here are the pages which link to it:"
 msgstr ""
 
-#: src/ZWiki/skins/zwiki/backlinks.pt:57
+#: src/ZWiki/skins/zwiki/backlinks.pt:50
 msgid "No other pages link to this one."
 msgstr ""
 
-#: src/ZWiki/skins/zwiki/backlinks.pt:82
-msgid ""
-"You can set this page's parent(s) to place it within the overall page "
-"hierarchy."
+#: src/ZWiki/skins/zwiki/backlinks.pt:70
+msgid "You can set this page's parent(s) to place it within the overall page hierarchy."
 msgstr ""
 
-#: src/ZWiki/skins/zwiki/backlinks.pt:85
-msgid ""
-"Check one or more checkboxes or enter a page name here, and click the button."
+#: src/ZWiki/skins/zwiki/backlinks.pt:73
+msgid "Check one or more checkboxes or enter a page name here, and click the button."
 msgstr ""
 
-#: src/ZWiki/skins/zwiki/backlinks.pt:88
+#: src/ZWiki/skins/zwiki/backlinks.pt:76
 msgid "Enter a page name here and click the button."
 msgstr ""
 
-#: src/ZWiki/skins/zwiki/backlinks.pt:91
-msgid ""
-"You can type just the first few letters, case and punctuation are ignored."
+#: src/ZWiki/skins/zwiki/backlinks.pt:79
+msgid "You can type just the first few letters, case and punctuation are ignored."
 msgstr ""
 
-#: src/ZWiki/skins/zwiki/backlinks.pt:98
+#: src/ZWiki/skins/zwiki/backlinks.pt:86
 msgid "Reparent"
 msgstr ""
 
+#: src/ZWiki/skins/zwiki/backlinks.pt:96
+msgid "Subtopics"
+msgstr ""
+
+#: src/ZWiki/skins/zwiki/backlinks.pt:99
+msgid "This page has no subtopics."
+msgstr ""
+
 #: src/ZWiki/skins/zwiki/badtemplate.pt:12
 msgid "Bad template"
 msgstr ""
 
 #: src/ZWiki/skins/zwiki/badtemplate.pt:13
-msgid ""
-"There was a problem locating one of this wiki's skin templates. There may be "
-"a page or other non-page-template/non-dtml-method object with the same ID, "
-"obscuring the template. Or the template may be missing on the filesystem (an "
-"incomplete Zwiki installation)."
+msgid "There was a problem locating one of this wiki's skin templates. There may be a page or other non-page-template/non-dtml-method object with the same ID, obscuring the template. Or the template may be missing on the filesystem (an incomplete Zwiki installation)."
 msgstr ""
 
 #: src/ZWiki/skins/zwiki/commentform.pt:21
@@ -891,12 +871,18 @@
 msgid "add-comment"
 msgstr ""
 
-#: src/ZWiki/skins/zwiki/contentspage.pt:12
+#: src/ZWiki/skins/zwiki/contentspage.pt:10
+#: src/ZWiki/skins/zwiki/contentspage.pt:27
+msgid "Wiki contents for"
+msgstr ""
+
+#: src/ZWiki/skins/zwiki/contentspage.pt:13
+#: src/ZWiki/skins/zwiki/contentspage.pt:30
 msgid "Wiki contents"
 msgstr ""
 
-#: src/ZWiki/skins/zwiki/contentspage.pt:16
-msgid "Singletons"
+#: src/ZWiki/skins/zwiki/contentspage.pt:40
+msgid "Singletons:"
 msgstr ""
 
 #: src/ZWiki/skins/zwiki/denied.pt:12
@@ -978,11 +964,11 @@
 msgstr ""
 
 #: src/ZWiki/skins/zwiki/editform.pt:178
-msgid "preview this edit"
+msgid "Preview"
 msgstr ""
 
 #: src/ZWiki/skins/zwiki/editform.pt:178
-msgid "Preview"
+msgid "preview this edit"
 msgstr ""
 
 #: src/ZWiki/skins/zwiki/editform.pt:183
@@ -1019,13 +1005,17 @@
 msgstr ""
 
 #: src/ZWiki/skins/zwiki/editform.pt:71
-msgid "type"
+msgid "markup"
 msgstr ""
 
 #: src/ZWiki/skins/zwiki/editform.pt:72
 msgid "select the formatting and rendering style for this page"
 msgstr ""
 
+#: src/ZWiki/skins/zwiki/helppage.pt:12
+msgid "Help page"
+msgstr ""
+
 #: src/ZWiki/skins/zwiki/links.pt:102
 msgid "(external edit)"
 msgstr ""
@@ -1163,11 +1153,11 @@
 msgstr ""
 
 #: src/ZWiki/skins/zwiki/pagemanagementform.pt:45
-msgid "reparent"
+msgid "make this page a subtopic of the page you have entered"
 msgstr ""
 
 #: src/ZWiki/skins/zwiki/pagemanagementform.pt:45
-msgid "make this page a subtopic of the page you have entered"
+msgid "reparent"
 msgstr ""
 
 #: src/ZWiki/skins/zwiki/pagemanagementform.pt:50
@@ -1183,8 +1173,7 @@
 msgstr ""
 
 #: src/ZWiki/skins/zwiki/pagemanagementform.pt:55
-msgid ""
-"delete this page, and redirect links to the page you have entered, if any"
+msgid "delete this page, and redirect links to the page you have entered, if any"
 msgstr ""
 
 #: src/ZWiki/skins/zwiki/pagemanagementform.pt:60

Modified: zope-zwiki/trunk/i18n/es.po
===================================================================
--- zope-zwiki/trunk/i18n/es.po	2007-04-08 14:54:05 UTC (rev 761)
+++ zope-zwiki/trunk/i18n/es.po	2007-04-08 14:55:27 UTC (rev 762)
@@ -1,9 +1,9 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: zwiki\n"
-"POT-Creation-Date: Sat Sep  2 18:10:16 2006\n"
-"PO-Revision-Date: 2006-03-15 19:03+0000\n"
-"Last-Translator: Pablo Puppo <ilpuppo at gmail.com>\n"
+"POT-Creation-Date: Mon Mar 26 21:34:52 2007\n"
+"PO-Revision-Date: 2007-01-06 20:40+0000\n"
+"Last-Translator: Francisco Mañas <dbtoke at gmail.com>\n"
 "Language-Team: spanish <es at li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -12,48 +12,42 @@
 "Language-name: Spanish\n"
 "Preferred-encodings: utf-8 latin1\n"
 "Domain: zwiki\n"
+"X-Rosetta-Export-Date: 2007-03-26 20:58+0000\n"
 
-#: src/ZWiki/Admin.py:62
+#: src/ZWiki/Admin.py:58
 msgid "You are not authorized to upgrade all pages."
 msgstr "No estás autorizado a migrar todas las páginas."
 
-#: src/ZWiki/Admin.py:63
+#: src/ZWiki/Admin.py:59
 msgid "(folder -> Manage properties)"
 msgstr "(carpeta -> Manejar propiedades)"
 
-#: src/ZWiki/Diff.py:174
+#: src/ZWiki/Diff.py:179
 #, fuzzy
 msgid "You are not authorized to reparent this ZWiki Page."
 msgstr "No estas autorizado a renombrar esta página Zwiki."
 
-#: src/ZWiki/Diff.py:180 src/ZWiki/plugins/tracker/tracker.py:332
+#: src/ZWiki/Diff.py:185 src/ZWiki/plugins/tracker/tracker.py:333
 msgid "You are not authorized to rename this ZWiki Page."
 msgstr "No estas autorizado a renombrar esta página Zwiki."
 
-#: src/ZWiki/Editing.py:156 src/ZWiki/Editing.py:294 src/ZWiki/Views.py:332
-#: src/ZWiki/Views.py:435 src/ZWiki/plugins/tracker/tracker.py:321
-msgid ""
-"Sorry, this wiki doesn't allow anonymous edits. Please configure a username "
-"in options first."
-msgstr ""
-"Disculpa, pero este wiki no admite ediciones anónimas.Por favor primero "
-"configura un usuario en las opciones."
+#: src/ZWiki/Editing.py:156 src/ZWiki/Editing.py:294 src/ZWiki/Views.py:336
+#: src/ZWiki/Views.py:439 src/ZWiki/plugins/tracker/tracker.py:322
+msgid "Sorry, this wiki doesn't allow anonymous edits. Please configure a username in options first."
+msgstr "Disculpa, pero este wiki no admite ediciones anónimas. Por favor primero configura un usuario en las opciones."
 
 #: src/ZWiki/Editing.py:327
-msgid ""
-"You are not authorized to reparent or change subtopics links on this ZWiki "
-"Page."
-msgstr ""
-"No estás autorizado a cambiar el padre o los subtemas de esta página ZWiki."
+msgid "You are not authorized to reparent or change subtopics links on this ZWiki Page."
+msgstr "No estás autorizado a cambiar el padre o los subtemas de esta página ZWiki."
 
 #: src/ZWiki/Editing.py:349
 msgid "You are not authorized to change this ZWiki Page's type."
 msgstr "No estás autorizado a cambiar el tipo de esta página ZWiki."
 
 #: src/ZWiki/Editing.py:383 src/ZWiki/Editing.py:410
-#: src/ZWiki/plugins/tracker/tracker.py:340
-#: src/ZWiki/plugins/tracker/tracker.py:347
-#: src/ZWiki/plugins/tracker/tracker.py:354
+#: src/ZWiki/plugins/tracker/tracker.py:344
+#: src/ZWiki/plugins/tracker/tracker.py:351
+#: src/ZWiki/plugins/tracker/tracker.py:358
 msgid "You are not authorized to edit this ZWiki Page."
 msgstr "No estás autorizado a editar esta página ZWiki."
 
@@ -62,11 +56,8 @@
 msgstr "No estás autorizado a borrar esta página ZWiki."
 
 #: src/ZWiki/Editing.py:563
-msgid ""
-"This page was renamed to %s. You can delete this one if no longer needed.\n"
-msgstr ""
-"Esta página se ha renombrado a %s. Puedes borrar ésta si ya no es "
-"necesaria.\n"
+msgid "This page was renamed to %s. You can delete this one if no longer needed.\n"
+msgstr "Esta página se ha renombrado a %s. Puedes borrar ésta si ya no es necesaria.\n"
 
 #: src/ZWiki/Editing.py:659
 msgid "You are not authorized to upload files here."
@@ -78,7 +69,7 @@
 
 #: src/ZWiki/Editing.py:822
 msgid "There was a problem: %s"
-msgstr ""
+msgstr "Había un problema: %s"
 
 #: src/ZWiki/Editing.py:829
 msgid "banned_links match"
@@ -86,23 +77,16 @@
 
 #: src/ZWiki/Editing.py:830
 #, fuzzy
-msgid ""
-"your edit contained a banned link pattern. Please contact the site "
-"administrator for help."
-msgstr ""
-"Ha ocurrido un problema: %s. Por favor, contacta con el administrador para "
-"obtener ayuda."
+msgid "your edit contained a banned link pattern. Please contact the site administrator for help."
+msgstr "Ha ocurrido un problema: %s. Por favor, contacta con el administrador para obtener ayuda."
 
 #: src/ZWiki/Editing.py:841
 msgid "exceeded max_anonymous_links"
 msgstr "\"max_anonymous_links\" excedido"
 
 #: src/ZWiki/Editing.py:842
-msgid ""
-"adding of external links by unidentified users is restricted. Please back up "
-"and remove some of the http urls you added, or contact the site "
-"administrator for help."
-msgstr ""
+msgid "adding of external links by unidentified users is restricted. Please back up and remove some of the http urls you added, or contact the site administrator for help."
+msgstr "la adición de enlaces externos de los usuarios no identificados es restricto. Por favor respalde y remueva algunas de las urls http que usted agregó, o contacte con el administrador del sitio para ayuda."
 
 #: src/ZWiki/Editing.py:853
 #, fuzzy
@@ -110,85 +94,87 @@
 msgstr "\"max_anonymous_links\" excedido"
 
 #: src/ZWiki/Editing.py:854
-msgid ""
-"adding of external links is restricted, even for identified users. Please "
-"back up and remove some of the http urls you added, or contact the site "
-"administrator for help."
-msgstr ""
+msgid "adding of external links is restricted, even for identified users. Please back up and remove some of the http urls you added, or contact the site administrator for help."
+msgstr "la adición de enlaces externos es restricto, hasta para los usuarios identificados. Por favor respalde y remueva algunas de las urls http que usted agregó, o contacte con el administrador del sitio para ayuda."
 
-#: src/ZWiki/Mail.py:506 src/ZWiki/skins/dtmlmessages.pt:58
+#: src/ZWiki/Mail.py:506 src/ZWiki/skins/dtmlmessages.pt:60
 msgid "anonymous"
 msgstr "anónimo"
 
-#: src/ZWiki/OutlineSupport.py:843 src/ZWiki/skins/zwiki/links.pt:56
+#: src/ZWiki/OutlineSupport.py:378
+#, fuzzy
+msgid "Sorry, this wiki doesn't allow anonymous reparenting. Please configure a username in options first."
+msgstr "Disculpa, pero este wiki no admite ediciones anónimas. Por favor primero configura un usuario en las opciones."
+
+#: src/ZWiki/OutlineSupport.py:878 src/ZWiki/skins/zwiki/links.pt:56
 msgid "which pages link to this one ?"
 msgstr "¿ qué páginas enlazan a ésta ?"
 
-#: src/ZWiki/OutlineSupport.py:851
+#: src/ZWiki/OutlineSupport.py:886
 msgid "You are here"
 msgstr "Estás aquí"
 
-#: src/ZWiki/Utils.py:465
+#: src/ZWiki/Utils.py:487
 msgid "years"
 msgstr "años"
 
-#: src/ZWiki/Utils.py:465
+#: src/ZWiki/Utils.py:487
 msgid "year"
 msgstr "año"
 
-#: src/ZWiki/Utils.py:467
+#: src/ZWiki/Utils.py:489
 msgid "month"
 msgstr "mes"
 
-#: src/ZWiki/Utils.py:467
+#: src/ZWiki/Utils.py:489
 msgid "months"
 msgstr "meses"
 
-#: src/ZWiki/Utils.py:469
+#: src/ZWiki/Utils.py:491
 msgid "weeks"
 msgstr "semanas"
 
-#: src/ZWiki/Utils.py:469
+#: src/ZWiki/Utils.py:491
 msgid "week"
 msgstr "semana"
 
-#: src/ZWiki/Utils.py:471
+#: src/ZWiki/Utils.py:493
 msgid "day"
 msgstr "día"
 
-#: src/ZWiki/Utils.py:471
+#: src/ZWiki/Utils.py:493
 msgid "days"
 msgstr "días"
 
-#: src/ZWiki/Utils.py:473
+#: src/ZWiki/Utils.py:495
 msgid "hours"
 msgstr "horas"
 
-#: src/ZWiki/Utils.py:473
+#: src/ZWiki/Utils.py:495
 msgid "hour"
 msgstr "hora"
 
-#: src/ZWiki/Utils.py:475
+#: src/ZWiki/Utils.py:497
 msgid "minute"
 msgstr "minuto"
 
-#: src/ZWiki/Utils.py:475
+#: src/ZWiki/Utils.py:497
 msgid "minutes"
 msgstr "minutos"
 
-#: src/ZWiki/Utils.py:477
+#: src/ZWiki/Utils.py:499
 msgid "second"
 msgstr "segundo"
 
-#: src/ZWiki/Utils.py:477
+#: src/ZWiki/Utils.py:499
 msgid "seconds"
 msgstr "segundos"
 
-#: src/ZWiki/Views.py:346
+#: src/ZWiki/Views.py:350
 msgid "Page is locked"
 msgstr "La página está bloqueada"
 
-#: src/ZWiki/Views.py:357
+#: src/ZWiki/Views.py:361
 msgid ""
 "\n"
 "            This page has a webDAV lock. Someone is probably editing it\n"
@@ -200,68 +186,64 @@
 msgstr ""
 "\n"
 "            Esta página tiene un bloqueo webDAV. Probablemente alquien la\n"
-"            está editando con un editor externo. Tienes que esperar hasta "
-"que\n"
-"            acabe e intentarlo de nuevo. Si has hecho cambios, puedes "
-"guardar\n"
+"            está editando con un editor externo. Tienes que esperar hasta que\n"
+"            acabe e intentarlo de nuevo. Si has hecho cambios, puedes guardar\n"
 "            tu versión del texto para referenciarlo.\n"
 "            "
 
-#: src/ZWiki/Views.py:364
+#: src/ZWiki/Views.py:368
 msgid "To discard your changes and try again, click OK."
 msgstr "Para descartar tus cambios y volver a empezar, pulsa Ok"
 
-#: src/ZWiki/Views.py:393
+#: src/ZWiki/Views.py:397
 msgid "Edit conflict"
 msgstr "Conflicto de edición"
 
-#: src/ZWiki/Views.py:413
+#: src/ZWiki/Views.py:417
 msgid "Someone else has saved this page while you were editing"
 msgstr "Otra persona guardo esta página mientras tú estabas editando"
 
-#: src/ZWiki/Views.py:414
+#: src/ZWiki/Views.py:418
 msgid "To resolve the conflict, do this"
 msgstr "Para resolver el conflicto haz esto"
 
-#: src/ZWiki/Views.py:415
+#: src/ZWiki/Views.py:419
 msgid "Click your browser's back button"
 msgstr "Pulsa el botón de ir atrás de tu navegador"
 
-#: src/ZWiki/Views.py:416
+#: src/ZWiki/Views.py:420
 msgid "Copy your recent edits to the clipboard"
 msgstr "Copia tus cambios recientes en el portapapeles"
 
-#: src/ZWiki/Views.py:417
+#: src/ZWiki/Views.py:421
 msgid "Click your browser's refresh button"
 msgstr "Pulsa el botón de refresco de tu navegador"
 
-#: src/ZWiki/Views.py:418
+#: src/ZWiki/Views.py:422
 msgid "Paste in your edits again, being mindful of the latest changes"
 msgstr "Pega en tus ediciones otra vez, presta atención a los últimos cambios"
 
-#: src/ZWiki/Views.py:419
+#: src/ZWiki/Views.py:423
 msgid "Click the Change button again"
 msgstr "Pulsa el botón Cambiar otra vez"
 
-#: src/ZWiki/Views.py:420 src/ZWiki/skins/zwiki/editform.pt:163
+#: src/ZWiki/Views.py:424 src/ZWiki/skins/zwiki/editform.pt:163
 msgid "or"
 msgstr "o"
 
-#: src/ZWiki/Views.py:421
+#: src/ZWiki/Views.py:425
 msgid "To discard your changes and start again, click OK"
 msgstr "Para descartar tus cambios recientes y volver a empezar, pulsa Ok"
 
-#: src/ZWiki/Views.py:490
+#: src/ZWiki/Views.py:501
 #, fuzzy
 msgid ""
 "\n"
-"        Access keys can be accessed in mozilla-based browsers by pressing "
-"alt-<key>\n"
+"        Access keys can be accessed in mozilla-based browsers by pressing alt-<key>\n"
 "        IE users: must also press enter\n"
 "        Mac users: command-<key>\n"
 "        Opera users: shift-escape-<key>\n"
-"        These won't work here, back up to the previous page to try them "
-"out.\n"
+"        These won't work here, back up to the previous page to try them out.\n"
 "\n"
 "        0    show these access key assignments\n"
 "\n"
@@ -277,10 +259,8 @@
 "        s    go to search field\n"
 "        \n"
 "        page functions:\n"
-"        +    (in a plone/cmf site with skin switching set up) use zwiki's "
-"plone/cmf skin\n"
-"        -    (in a plone/cmf site with skin switching set up) use zwiki's "
-"standard skin\n"
+"        +    (in a plone/cmf site with skin switching set up) use zwiki's plone/cmf skin\n"
+"        -    (in a plone/cmf site with skin switching set up) use zwiki's standard skin\n"
 "        v    view page\n"
 "        m    mail subscription\n"
 "        b    show backlinks (links to this page)\n"
@@ -308,8 +288,7 @@
 "        "
 msgstr ""
 "\n"
-"        En navegadores mozilla, podemos acceder a las teclas rápidas "
-"pulsando alt-<key>\n"
+"        En navegadores mozilla, podemos acceder a las teclas rápidas pulsando alt-<key>\n"
 "        Usuarios IE: deben pulsar también enter\n"
 "        Usuarios Mac: command-<key>\n"
 "        Usuarios Opera: shift-escape-<key>\n"
@@ -359,43 +338,50 @@
 "        p    edición anterior\n"
 "        "
 
-#: src/ZWiki/Wikis.py:49
-msgid "Unknown wiki type"
-msgstr ""
-
-#: src/ZWiki/ZWikiPage.py:675
+#: src/ZWiki/ZWikiPage.py:744
 msgid "create this page"
 msgstr "crear esta página"
 
-#: src/ZWiki/ZWikiPage.py:798 src/ZWiki/ZWikiPage.py:814
-#: src/ZWiki/ZWikiPage.py:817
+#: src/ZWiki/ZWikiPage.py:872 src/ZWiki/ZWikiPage.py:887
 msgid "last edited %(interval)s ago"
 msgstr "editada hace %(interval)s"
 
-#: src/ZWiki/ZWikiPage.py:809
+#: src/ZWiki/ZWikiPage.py:882
 msgid "show last edit"
 msgstr "muesta última edición"
 
-#: src/ZWiki/ZWikiPage.py:826 src/ZWiki/ZWikiPage.py:828
+#: src/ZWiki/ZWikiPage.py:897 src/ZWiki/ZWikiPage.py:899
 msgid "by %(editor)s"
 msgstr "por %(editor)s"
 
-#: src/ZWiki/__init__.py:34
+#: src/ZWiki/__init__.py:200
+msgid "Unknown wiki type"
+msgstr "Tipo de wiki desconocido"
+
+#: src/ZWiki/__init__.py:39
 msgid "No need to add a Zwiki Outline Cache"
-msgstr ""
+msgstr "Ninguna necesidad de agregar un caché de contorno a Zwiki"
 
-#: src/ZWiki/__init__.py:35
+#: src/ZWiki/__init__.py:40
 msgid ""
 "Zwiki Outline Cache appears in the ZMI Add menu\n"
 "        for implementation reasons, but should not be added directly.\n"
 "        Zwiki will create it for you as needed.\n"
 "        "
 msgstr ""
+"Caché de Contorno de Zwiki aparece en el menú de añadir de ZMI\n"
+"por razones de implementación, pero no debe ser agregado directamente.\n"
+"Zwiki creará para usted según lo necesite.\n"
+"        "
 
 #: src/ZWiki/pagetypes/common.py:253
 msgid "comments"
 msgstr "comentarios"
 
+#: src/ZWiki/pagetypes/html.py:50 src/ZWiki/pagetypes/rst.py:85
+msgid "reply"
+msgstr "responder"
+
 #: src/ZWiki/pagetypes/moin.py:1990
 msgid "Expected \"=\" to follow \"%(token)s\""
 msgstr "Se esperaba \"=\" después de \"%(token)s\""
@@ -432,10 +418,6 @@
 msgid "Expected a color value \"%(arg)s\" after \"%(key)s\""
 msgstr "Se esperaba un valor de color \"%(arg)s\" después de \"%(key)s\""
 
-#: src/ZWiki/pagetypes/rst.py:85
-msgid "reply"
-msgstr "responder"
-
 #: src/ZWiki/plugins/latexwiki/wikis/latexwiki/diffform.pt:127
 #: src/ZWiki/plugins/mathaction/wikis/mathaction/old-diffform.pt:127
 msgid "full history"
@@ -510,7 +492,7 @@
 msgstr "título"
 
 #: src/ZWiki/plugins/tracker/filterissues.pt:12
-#: src/ZWiki/skins/dtmlmessages.pt:30
+#: src/ZWiki/skins/dtmlmessages.pt:31
 msgid "Filter issues"
 msgstr "Filtrar incidencias"
 
@@ -522,358 +504,349 @@
 msgid "Issue tracker"
 msgstr "Registro incidencias"
 
-#: src/ZWiki/plugins/tracker/tracker.py:361
+#: src/ZWiki/plugins/tracker/tracker.py:365
 #, fuzzy
 msgid "You are not authorized to comment on this ZWiki Page."
 msgstr "No estás autorizado a editar esta página ZWiki."
 
-#: src/ZWiki/skins/dtmlmessages.pt:10 src/ZWiki/skins/dtmlmessages.pt:32
+#: src/ZWiki/skins/dtmlmessages.pt:10 src/ZWiki/skins/dtmlmessages.pt:33
+#, fuzzy
+msgid "name"
+msgstr "cambiar nombre,"
+
+#: src/ZWiki/skins/dtmlmessages.pt:11 src/ZWiki/skins/dtmlmessages.pt:34
 msgid "category"
 msgstr "categoría"
 
-#: src/ZWiki/skins/dtmlmessages.pt:11 src/ZWiki/skins/dtmlmessages.pt:33
+#: src/ZWiki/skins/dtmlmessages.pt:12 src/ZWiki/skins/dtmlmessages.pt:35
 msgid "severity"
 msgstr "gravedad"
 
-#: src/ZWiki/skins/dtmlmessages.pt:12 src/ZWiki/skins/dtmlmessages.pt:34
+#: src/ZWiki/skins/dtmlmessages.pt:13 src/ZWiki/skins/dtmlmessages.pt:36
 msgid "status"
 msgstr "estado"
 
-#: src/ZWiki/skins/dtmlmessages.pt:13 src/ZWiki/skins/dtmlmessages.pt:35
+#: src/ZWiki/skins/dtmlmessages.pt:14 src/ZWiki/skins/dtmlmessages.pt:37
 msgid "age"
 msgstr "creada"
 
-#: src/ZWiki/skins/dtmlmessages.pt:14 src/ZWiki/skins/dtmlmessages.pt:36
+#: src/ZWiki/skins/dtmlmessages.pt:15 src/ZWiki/skins/dtmlmessages.pt:38
 msgid "modified"
 msgstr "modificada"
 
-#: src/ZWiki/skins/dtmlmessages.pt:15
+#: src/ZWiki/skins/dtmlmessages.pt:16
 msgid "Add a new issue:"
 msgstr "Añadir una nueva incidencia:"
 
-#: src/ZWiki/skins/dtmlmessages.pt:16
+#: src/ZWiki/skins/dtmlmessages.pt:17
 msgid "Name:"
 msgstr "Nombre:"
 
-#: src/ZWiki/skins/dtmlmessages.pt:17
+#: src/ZWiki/skins/dtmlmessages.pt:18
 msgid "Category:"
 msgstr "Categoría:"
 
-#: src/ZWiki/skins/dtmlmessages.pt:18
+#: src/ZWiki/skins/dtmlmessages.pt:19
 msgid "Severity:"
 msgstr "Gravedad:"
 
-#: src/ZWiki/skins/dtmlmessages.pt:19
-msgid "Status:"
-msgstr "Estado:"
-
 #: src/ZWiki/skins/dtmlmessages.pt:2
 msgid "Here are the wiki's issue pages."
 msgstr "Aquí están las páginas de incidencias del wiki."
 
 #: src/ZWiki/skins/dtmlmessages.pt:20
+msgid "Status:"
+msgstr "Estado:"
+
+#: src/ZWiki/skins/dtmlmessages.pt:21
 msgid "Details:"
 msgstr "Detalles:"
 
-#: src/ZWiki/skins/dtmlmessages.pt:21
+#: src/ZWiki/skins/dtmlmessages.pt:22
 msgid "add issue"
 msgstr "añadir incidencia"
 
-#: src/ZWiki/skins/dtmlmessages.pt:22
+#: src/ZWiki/skins/dtmlmessages.pt:23
 msgid "More advanced"
 msgstr "Avanzado"
 
-#: src/ZWiki/skins/dtmlmessages.pt:23
+#: src/ZWiki/skins/dtmlmessages.pt:24
 msgid "issue tracker"
 msgstr "registro de incidencias"
 
-#: src/ZWiki/skins/dtmlmessages.pt:24
+#: src/ZWiki/skins/dtmlmessages.pt:25
 msgid "search options"
 msgstr "opciones de búsqueda"
 
-#: src/ZWiki/skins/dtmlmessages.pt:25
+#: src/ZWiki/skins/dtmlmessages.pt:26
 msgid "Name contains any of:"
 msgstr "Nombre contiene cualquiera de:"
 
-#: src/ZWiki/skins/dtmlmessages.pt:26
+#: src/ZWiki/skins/dtmlmessages.pt:27
 msgid "Page text contains any of:"
 msgstr "Texto de la página contiene cualquiera de:"
 
-#: src/ZWiki/skins/dtmlmessages.pt:27
+#: src/ZWiki/skins/dtmlmessages.pt:28
 msgid "Categories:"
 msgstr "Categorías:"
 
-#: src/ZWiki/skins/dtmlmessages.pt:28
+#: src/ZWiki/skins/dtmlmessages.pt:29
 msgid "Severities:"
 msgstr "Gravedad:"
 
-#: src/ZWiki/skins/dtmlmessages.pt:29
-msgid "Statuses:"
-msgstr "Estados:"
-
 #: src/ZWiki/skins/dtmlmessages.pt:3
 #, fuzzy
 msgid "Enter a search term, click the numbers to the right,"
 msgstr "Introduce un término de búsqueda, o pulsa los números a la derecha, o"
 
-#: src/ZWiki/skins/dtmlmessages.pt:37
+#: src/ZWiki/skins/dtmlmessages.pt:30
+msgid "Statuses:"
+msgstr "Estados:"
+
+#: src/ZWiki/skins/dtmlmessages.pt:39
 msgid "Submitted by"
 msgstr "Enviado por"
 
-#: src/ZWiki/skins/dtmlmessages.pt:38
+#: src/ZWiki/skins/dtmlmessages.pt:4
+msgid "filter issues"
+msgstr "filtra incidencias"
+
+#: src/ZWiki/skins/dtmlmessages.pt:40
 msgid "Name"
 msgstr "Nombre"
 
-#: src/ZWiki/skins/dtmlmessages.pt:39
+#: src/ZWiki/skins/dtmlmessages.pt:41
 msgid "Category"
 msgstr "Categoría"
 
-#: src/ZWiki/skins/dtmlmessages.pt:4
-msgid "filter issues"
-msgstr "filtra incidencias"
-
-#: src/ZWiki/skins/dtmlmessages.pt:40
+#: src/ZWiki/skins/dtmlmessages.pt:42
 msgid "Severity"
 msgstr "Gravedad"
 
-#: src/ZWiki/skins/dtmlmessages.pt:41
+#: src/ZWiki/skins/dtmlmessages.pt:43
 msgid "Status"
 msgstr "Estado"
 
-#: src/ZWiki/skins/dtmlmessages.pt:42
+#: src/ZWiki/skins/dtmlmessages.pt:44
 msgid "Optional subject"
 msgstr "Asunto opcional"
 
-#: src/ZWiki/skins/dtmlmessages.pt:43
+#: src/ZWiki/skins/dtmlmessages.pt:45
 msgid "Optional comment"
 msgstr "Comentario opcional"
 
-#: src/ZWiki/skins/dtmlmessages.pt:44 src/ZWiki/skins/dtmlmessages.pt:45
+#: src/ZWiki/skins/dtmlmessages.pt:46 src/ZWiki/skins/dtmlmessages.pt:47
 #, fuzzy
 msgid "Add ZWiki"
 msgstr "Añadir Wiki"
 
-#: src/ZWiki/skins/dtmlmessages.pt:46
+#: src/ZWiki/skins/dtmlmessages.pt:48
 #, fuzzy
 msgid "Id:"
 msgstr "Id"
 
-#: src/ZWiki/skins/dtmlmessages.pt:47
+#: src/ZWiki/skins/dtmlmessages.pt:49
 #, fuzzy
 msgid "Title:"
 msgstr "Título"
 
-#: src/ZWiki/skins/dtmlmessages.pt:48
+#: src/ZWiki/skins/dtmlmessages.pt:5
+msgid "browse open issues"
+msgstr ""
+
+#: src/ZWiki/skins/dtmlmessages.pt:50
 msgid "Template:"
 msgstr ""
 
-#: src/ZWiki/skins/dtmlmessages.pt:49
+#: src/ZWiki/skins/dtmlmessages.pt:51
 #, fuzzy
 msgid "Add wiki"
 msgstr "Añadir Wiki"
 
-#: src/ZWiki/skins/dtmlmessages.pt:5
-msgid "browse open issues"
-msgstr ""
-
-#: src/ZWiki/skins/dtmlmessages.pt:50
+#: src/ZWiki/skins/dtmlmessages.pt:52
 msgid "Pages changed in the last"
 msgstr "Páginas modificadas en los últimos"
 
-#: src/ZWiki/skins/dtmlmessages.pt:51
+#: src/ZWiki/skins/dtmlmessages.pt:53
 msgid "Recently changed pages, with summaries"
 msgstr "Páginas modificadas recientemente, con sumarios"
 
-#: src/ZWiki/skins/dtmlmessages.pt:52
+#: src/ZWiki/skins/dtmlmessages.pt:54
 msgid "Show summaries ?"
 msgstr "¿Mostrar sumarios?"
 
-#: src/ZWiki/skins/dtmlmessages.pt:53
+#: src/ZWiki/skins/dtmlmessages.pt:55
 msgid "Refresh"
 msgstr "Refrescar"
 
-#: src/ZWiki/skins/dtmlmessages.pt:54
+#: src/ZWiki/skins/dtmlmessages.pt:56
 msgid "Page"
 msgstr "Página"
 
-#: src/ZWiki/skins/dtmlmessages.pt:55
+#: src/ZWiki/skins/dtmlmessages.pt:57
 msgid "Edited&nbsp;by"
 msgstr "Editada&nbsp;por"
 
-#: src/ZWiki/skins/dtmlmessages.pt:56
+#: src/ZWiki/skins/dtmlmessages.pt:58
 msgid "Time"
 msgstr "Fecha"
 
-#: src/ZWiki/skins/dtmlmessages.pt:57
+#: src/ZWiki/skins/dtmlmessages.pt:59
 msgid "NEW"
 msgstr "NUEVA"
 
-#: src/ZWiki/skins/dtmlmessages.pt:59
-msgid "Pages marked (NEW) have been created within the last week"
-msgstr "Las páginas marcadas (NUEVA) han sido creadas en la última semana"
-
 #: src/ZWiki/skins/dtmlmessages.pt:6
 msgid "search issues"
 msgstr "busca incidencias"
 
-#: src/ZWiki/skins/dtmlmessages.pt:60
+#: src/ZWiki/skins/dtmlmessages.pt:61
+msgid "Pages marked (NEW) have been created within the last week"
+msgstr "Las páginas marcadas (NUEVA) han sido creadas en la última semana"
+
+#: src/ZWiki/skins/dtmlmessages.pt:62
 msgid "Enter a word or phrase and hit enter to search the entire wiki."
-msgstr ""
-"Introduce una palabra o frase y pulsa enter para buscar en todo el wiki."
+msgstr "Introduce una palabra o frase y pulsa enter para buscar en todo el wiki."
 
-#: src/ZWiki/skins/dtmlmessages.pt:61
+#: src/ZWiki/skins/dtmlmessages.pt:63
 msgid "This is the same as using the search field at top right."
-msgstr ""
-"Esto es lo mismo que usar el campo de búsqueda en la parte superior derecha."
+msgstr "Esto es lo mismo que usar el campo de búsqueda en la parte superior derecha."
 
-#: src/ZWiki/skins/dtmlmessages.pt:62
+#: src/ZWiki/skins/dtmlmessages.pt:64
 msgid "Tips: A single word works best for matching page names."
 msgstr "Consejos: Una única palabra va mejor para encontrar nombres de página."
 
-#: src/ZWiki/skins/dtmlmessages.pt:63
-msgid ""
-"Case-insensitivity and wildcards may be supported depending on your catalog "
-"configuration."
-msgstr ""
-"No distinguir mayúsculas-minúsculas y comodines pueden ser soportadas "
-"dependiendo de la configuración del catálogo."
+#: src/ZWiki/skins/dtmlmessages.pt:65
+msgid "Case-insensitivity and wildcards may be supported depending on your catalog configuration."
+msgstr "No distinguir mayúsculas-minúsculas y comodines pueden ser soportadas dependiendo de la configuración del catálogo."
 
-#: src/ZWiki/skins/dtmlmessages.pt:64
+#: src/ZWiki/skins/dtmlmessages.pt:66
 msgid "Leave it blank to list all pages."
 msgstr "Dejar en blanco para listar todas las páginas."
 
-#: src/ZWiki/skins/dtmlmessages.pt:65 src/ZWiki/skins/dtmlmessages.pt:66
+#: src/ZWiki/skins/dtmlmessages.pt:67 src/ZWiki/skins/dtmlmessages.pt:68
 msgid "Search"
 msgstr "Buscar"
 
-#: src/ZWiki/skins/dtmlmessages.pt:67
+#: src/ZWiki/skins/dtmlmessages.pt:69
 msgid "Page names matching"
 msgstr "Nombres de página coincidentes"
 
-#: src/ZWiki/skins/dtmlmessages.pt:68
+#: src/ZWiki/skins/dtmlmessages.pt:7
+msgid "recent"
+msgstr "recientes"
+
+#: src/ZWiki/skins/dtmlmessages.pt:70
 msgid "Text matching"
 msgstr "Texto coincidente"
 
-#: src/ZWiki/skins/dtmlmessages.pt:69
+#: src/ZWiki/skins/dtmlmessages.pt:71
 msgid "Thorough (non-catalog) search for text matching"
 msgstr "Búsqueda completa (sin catálogo)"
 
-#: src/ZWiki/skins/dtmlmessages.pt:7
-msgid "recent"
-msgstr "recientes"
-
-#: src/ZWiki/skins/dtmlmessages.pt:70
+#: src/ZWiki/skins/dtmlmessages.pt:72
 msgid "Set your preferences for this wiki:"
 msgstr "Cambia tus preferencias para este wiki:"
 
-#: src/ZWiki/skins/dtmlmessages.pt:71
+#: src/ZWiki/skins/dtmlmessages.pt:73
 msgid "User name:"
 msgstr "Usuario:"
 
-#: src/ZWiki/skins/dtmlmessages.pt:72
-msgid "(identifies your edits)"
-msgstr "(identifica tus cambios)"
+#: src/ZWiki/skins/dtmlmessages.pt:74
+msgid "(identifies your edits, saves your votes, may be required)"
+msgstr ""
 
-#: src/ZWiki/skins/dtmlmessages.pt:73
+#: src/ZWiki/skins/dtmlmessages.pt:75
 msgid "Email address:"
 msgstr "Email:"
 
-#: src/ZWiki/skins/dtmlmessages.pt:74
+#: src/ZWiki/skins/dtmlmessages.pt:76
 msgid "(allows mail subscription)"
 msgstr "(permite suscripción por correo)"
 
-#: src/ZWiki/skins/dtmlmessages.pt:75
+#: src/ZWiki/skins/dtmlmessages.pt:77
 msgid "Your time zone:"
 msgstr "Tu zona de tiempo:"
 
-#: src/ZWiki/skins/dtmlmessages.pt:76
+#: src/ZWiki/skins/dtmlmessages.pt:78
 msgid "(localizes most times)"
 msgstr "(localiza la mayoría de horarios)"
 
-#: src/ZWiki/skins/dtmlmessages.pt:77
+#: src/ZWiki/skins/dtmlmessages.pt:79
 msgid "Edit form height:"
 msgstr "Edita la altura del formulario:"
 
-#: src/ZWiki/skins/dtmlmessages.pt:78
+#: src/ZWiki/skins/dtmlmessages.pt:8
+msgid "all"
+msgstr "todas"
+
+#: src/ZWiki/skins/dtmlmessages.pt:80
 msgid "(adjusts form size)"
 msgstr "(ajusta tamaño del formulario)"
 
-#: src/ZWiki/skins/dtmlmessages.pt:79
+#: src/ZWiki/skins/dtmlmessages.pt:81
 msgid "Save options"
 msgstr "Guardar opciones"
 
-#: src/ZWiki/skins/dtmlmessages.pt:8
-msgid "all"
-msgstr "todas"
-
-#: src/ZWiki/skins/dtmlmessages.pt:80
+#: src/ZWiki/skins/dtmlmessages.pt:82
 msgid "Forget options"
 msgstr "Descartar opciones"
 
-#: src/ZWiki/skins/dtmlmessages.pt:81 src/ZWiki/skins/dtmlmessages.pt:82
+#: src/ZWiki/skins/dtmlmessages.pt:83 src/ZWiki/skins/dtmlmessages.pt:84
 msgid "Add ZWiki Page"
 msgstr "Añadir una página ZWiki"
 
-#: src/ZWiki/skins/dtmlmessages.pt:83
+#: src/ZWiki/skins/dtmlmessages.pt:85
 #, fuzzy
 msgid "Page&nbsp;name:"
 msgstr "Nombre de la página"
 
-#: src/ZWiki/skins/dtmlmessages.pt:84
+#: src/ZWiki/skins/dtmlmessages.pt:86
 #, fuzzy
 msgid "Add wiki page"
 msgstr "Añadir una Página Wiki"
 
-#: src/ZWiki/skins/dtmlmessages.pt:85
+#: src/ZWiki/skins/dtmlmessages.pt:87
 msgid "Topic"
 msgstr "Tema"
 
-#: src/ZWiki/skins/dtmlmessages.pt:86
+#: src/ZWiki/skins/dtmlmessages.pt:88
 msgid "Last updated"
 msgstr "Última modificación"
 
-#: src/ZWiki/skins/dtmlmessages.pt:87
+#: src/ZWiki/skins/dtmlmessages.pt:89
 msgid "Comments"
 msgstr "Comentarios"
 
-#: src/ZWiki/skins/dtmlmessages.pt:88
+#: src/ZWiki/skins/dtmlmessages.pt:9 src/ZWiki/skins/dtmlmessages.pt:32
+msgid "#"
+msgstr ""
+
+#: src/ZWiki/skins/dtmlmessages.pt:90
 msgid "Views"
 msgstr "Visitas"
 
-#: src/ZWiki/skins/dtmlmessages.pt:89
+#: src/ZWiki/skins/dtmlmessages.pt:91
 msgid "Created"
 msgstr "Creado"
 
-#: src/ZWiki/skins/dtmlmessages.pt:9 src/ZWiki/skins/dtmlmessages.pt:31
-msgid "#"
-msgstr ""
-
-#: src/ZWiki/skins/dtmlmessages.pt:90 src/ZWiki/skins/dtmlmessages.pt:92
+#: src/ZWiki/skins/dtmlmessages.pt:92 src/ZWiki/skins/dtmlmessages.pt:94
 msgid "by"
 msgstr "por"
 
-#: src/ZWiki/skins/dtmlmessages.pt:91
+#: src/ZWiki/skins/dtmlmessages.pt:93
 msgid "<dtml-var lasteditinterval> ago</dtml-var>"
 msgstr "hace <dtml-var lasteditinterval></dtml-var>"
 
-#: src/ZWiki/skins/dtmlmessages.pt:93
+#: src/ZWiki/skins/dtmlmessages.pt:95
 msgid "on"
 msgstr "en"
 
-#: src/ZWiki/skins/zwiki/backlinks.pt:108
-msgid "Subtopics"
-msgstr "Subtemas"
-
-#: src/ZWiki/skins/zwiki/backlinks.pt:111
-msgid "This page has no subtopics."
-msgstr "Está página no tiene subtemas."
-
-#: src/ZWiki/skins/zwiki/backlinks.pt:114
+#: src/ZWiki/skins/zwiki/backlinks.pt:102
 #, fuzzy
 msgid "Here are it's subtopics."
 msgstr "Aquí están sus subtemas:"
 
-#: src/ZWiki/skins/zwiki/backlinks.pt:117
+#: src/ZWiki/skins/zwiki/backlinks.pt:105
 #, fuzzy
 msgid "You can reorder them by clicking the ^ buttons."
 msgstr "Puedes cambiar el orden de los subtemas pulsando los botones ^."
@@ -887,65 +860,62 @@
 msgid "Parents"
 msgstr "Padres"
 
-#: src/ZWiki/skins/zwiki/backlinks.pt:31
+#: src/ZWiki/skins/zwiki/backlinks.pt:28
 msgid "is a top-level topic."
 msgstr "es un tema de primer nivel"
 
-#: src/ZWiki/skins/zwiki/backlinks.pt:32
+#: src/ZWiki/skins/zwiki/backlinks.pt:29
 msgid "is a subtopic of:"
 msgstr "es un subtema de:"
 
-#: src/ZWiki/skins/zwiki/backlinks.pt:55
+#: src/ZWiki/skins/zwiki/backlinks.pt:48
 msgid "Backlinks"
 msgstr "Enlaces"
 
-#: src/ZWiki/skins/zwiki/backlinks.pt:56
+#: src/ZWiki/skins/zwiki/backlinks.pt:49
 msgid "Here are the pages which link to it:"
 msgstr "Aquí están las páginas que me enlazan:"
 
-#: src/ZWiki/skins/zwiki/backlinks.pt:57
+#: src/ZWiki/skins/zwiki/backlinks.pt:50
 msgid "No other pages link to this one."
 msgstr "Ninguna página enlaza a esta."
 
-#: src/ZWiki/skins/zwiki/backlinks.pt:82
-msgid ""
-"You can set this page's parent(s) to place it within the overall page "
-"hierarchy."
+#: src/ZWiki/skins/zwiki/backlinks.pt:70
+msgid "You can set this page's parent(s) to place it within the overall page hierarchy."
 msgstr ""
 
-#: src/ZWiki/skins/zwiki/backlinks.pt:85
-msgid ""
-"Check one or more checkboxes or enter a page name here, and click the button."
+#: src/ZWiki/skins/zwiki/backlinks.pt:73
+msgid "Check one or more checkboxes or enter a page name here, and click the button."
 msgstr ""
 
-#: src/ZWiki/skins/zwiki/backlinks.pt:88
+#: src/ZWiki/skins/zwiki/backlinks.pt:76
 msgid "Enter a page name here and click the button."
 msgstr ""
 
-#: src/ZWiki/skins/zwiki/backlinks.pt:91
-msgid ""
-"You can type just the first few letters, case and punctuation are ignored."
+#: src/ZWiki/skins/zwiki/backlinks.pt:79
+msgid "You can type just the first few letters, case and punctuation are ignored."
 msgstr ""
 
-#: src/ZWiki/skins/zwiki/backlinks.pt:98
+#: src/ZWiki/skins/zwiki/backlinks.pt:86
 msgid "Reparent"
 msgstr "Cambiar padre"
 
+#: src/ZWiki/skins/zwiki/backlinks.pt:96
+msgid "Subtopics"
+msgstr "Subtemas"
+
+#: src/ZWiki/skins/zwiki/backlinks.pt:99
+msgid "This page has no subtopics."
+msgstr "Está página no tiene subtemas."
+
 #: src/ZWiki/skins/zwiki/badtemplate.pt:12
 msgid "Bad template"
-msgstr ""
+msgstr "Mala plantilla"
 
 #: src/ZWiki/skins/zwiki/badtemplate.pt:13
 #, fuzzy
-msgid ""
-"There was a problem locating one of this wiki's skin templates. There may be "
-"a page or other non-page-template/non-dtml-method object with the same ID, "
-"obscuring the template. Or the template may be missing on the filesystem (an "
-"incomplete Zwiki installation)."
-msgstr ""
-"Hay un problema con una de las plantillas de este wiki. Puede haber un "
-"objeto con un ID de plantilla que no es un Page Template o DTML Method, o la "
-"plantilla no está."
+msgid "There was a problem locating one of this wiki's skin templates. There may be a page or other non-page-template/non-dtml-method object with the same ID, obscuring the template. Or the template may be missing on the filesystem (an incomplete Zwiki installation)."
+msgstr "Hay un problema con una de las plantillas de este wiki. Puede haber un objeto con un ID de plantilla que no es un Page Template o DTML Method, o la plantilla no está."
 
 #: src/ZWiki/skins/zwiki/commentform.pt:21
 msgid "subject"
@@ -961,9 +931,7 @@
 
 #: src/ZWiki/skins/zwiki/commentform.pt:36
 msgid "to comment (and cc any subscribers) enter text here and click add"
-msgstr ""
-"para comentar (y cc a cualquier suscriptor) introduce aquí el texto y pulsa "
-"añadir"
+msgstr "para comentar (y cc a cualquier suscriptor) introduce aquí el texto y pulsa añadir"
 
 #: src/ZWiki/skins/zwiki/commentform.pt:56
 msgid "${nb} subscribers"
@@ -978,17 +946,25 @@
 msgid "add-comment"
 msgstr "Añadir un comentario"
 
-#: src/ZWiki/skins/zwiki/contentspage.pt:12
+#: src/ZWiki/skins/zwiki/contentspage.pt:10
+#: src/ZWiki/skins/zwiki/contentspage.pt:27
+#, fuzzy
+msgid "Wiki contents for"
+msgstr "Contenidos del wiki"
+
+#: src/ZWiki/skins/zwiki/contentspage.pt:13
+#: src/ZWiki/skins/zwiki/contentspage.pt:30
 msgid "Wiki contents"
 msgstr "Contenidos del wiki"
 
-#: src/ZWiki/skins/zwiki/contentspage.pt:16
-msgid "Singletons"
-msgstr ""
+#: src/ZWiki/skins/zwiki/contentspage.pt:40
+#, fuzzy
+msgid "Singletons:"
+msgstr "Semifallos"
 
 #: src/ZWiki/skins/zwiki/denied.pt:12
 msgid "Not permitted"
-msgstr ""
+msgstr "No permitido"
 
 #: src/ZWiki/skins/zwiki/diffform.pt:24
 #, fuzzy
@@ -1003,12 +979,12 @@
 #. Default: "<<"
 #: src/ZWiki/skins/zwiki/diffform.pt:34 src/ZWiki/skins/zwiki/diffform.pt:38
 msgid " << "
-msgstr ""
+msgstr " << "
 
 #. Default: ">>"
 #: src/ZWiki/skins/zwiki/diffform.pt:52 src/ZWiki/skins/zwiki/diffform.pt:56
 msgid " >> "
-msgstr ""
+msgstr " >> "
 
 #: src/ZWiki/skins/zwiki/diffform.pt:61
 #, fuzzy
@@ -1071,13 +1047,13 @@
 msgstr ""
 
 #: src/ZWiki/skins/zwiki/editform.pt:178
-msgid "preview this edit"
-msgstr "previsualizar los cambios"
-
-#: src/ZWiki/skins/zwiki/editform.pt:178
 msgid "Preview"
 msgstr "Previsualizar"
 
+#: src/ZWiki/skins/zwiki/editform.pt:178
+msgid "preview this edit"
+msgstr "previsualizar los cambios"
+
 #: src/ZWiki/skins/zwiki/editform.pt:183
 msgid "Cancel"
 msgstr "Cancelar"
@@ -1112,13 +1088,18 @@
 msgstr "el nombre de esta página wiki (cambiarlo puede ser lento!)"
 
 #: src/ZWiki/skins/zwiki/editform.pt:71
-msgid "type"
-msgstr "tipo"
+msgid "markup"
+msgstr ""
 
 #: src/ZWiki/skins/zwiki/editform.pt:72
 msgid "select the formatting and rendering style for this page"
 msgstr "selecciona el estilo de formato y visualización para esta página"
 
+#: src/ZWiki/skins/zwiki/helppage.pt:12
+#, fuzzy
+msgid "Help page"
+msgstr "Página de Ayuda"
+
 #: src/ZWiki/skins/zwiki/links.pt:102
 msgid "(external edit)"
 msgstr "(edición externa)"
@@ -1173,7 +1154,7 @@
 
 #: src/ZWiki/skins/zwiki/links.pt:42
 msgid "uploads"
-msgstr ""
+msgstr "subidas"
 
 #: src/ZWiki/skins/zwiki/links.pt:43
 msgid "show help page"
@@ -1254,19 +1235,17 @@
 
 #: src/ZWiki/skins/zwiki/pagemanagementform.pt:40
 msgid "enter a page name and click buttons to the right (mouse over for help)"
-msgstr ""
-"introduce un nombre de página y pulsa los botones de la derecha (pasa sobre "
-"ellos para ayuda)"
+msgstr "introduce un nombre de página y pulsa los botones de la derecha (pasa sobre ellos para ayuda)"
 
 #: src/ZWiki/skins/zwiki/pagemanagementform.pt:45
+msgid "make this page a subtopic of the page you have entered"
+msgstr "hacer esta página subtema de la que has introducido"
+
+#: src/ZWiki/skins/zwiki/pagemanagementform.pt:45
 #, fuzzy
 msgid "reparent"
 msgstr "Cambiar padre"
 
-#: src/ZWiki/skins/zwiki/pagemanagementform.pt:45
-msgid "make this page a subtopic of the page you have entered"
-msgstr "hacer esta página subtema de la que has introducido"
-
 #: src/ZWiki/skins/zwiki/pagemanagementform.pt:50
 msgid "rename this page to the name you have entered, updating all links"
 msgstr "renombrar esta página con este nombre, modificando todos los enlaces"
@@ -1278,13 +1257,11 @@
 
 #: src/ZWiki/skins/zwiki/pagemanagementform.pt:55
 msgid "delete!"
-msgstr ""
+msgstr "eliminar!"
 
 #: src/ZWiki/skins/zwiki/pagemanagementform.pt:55
-msgid ""
-"delete this page, and redirect links to the page you have entered, if any"
-msgstr ""
-"borrar esta página y redirigir los enlaces a la página introducida, si la hay"
+msgid "delete this page, and redirect links to the page you have entered, if any"
+msgstr "borrar esta página y redirigir los enlaces a la página introducida, si la hay"
 
 #: src/ZWiki/skins/zwiki/pagemanagementform.pt:60
 msgid "create a page with the name you have entered, as a subtopic of this one"
@@ -1371,13 +1348,12 @@
 msgid "subscribe_desc_edits"
 msgstr ""
 "Puedes suscribirte a esta página o al wiki completo.\n"
-"          Los suscriptores reciben una copia de todas las modificaciones por "
-"correo.\n"
+"          Los suscriptores reciben una copia de todas las modificaciones por correo.\n"
 "          O vuelve a"
 
 #: src/ZWiki/skins/zwiki/subscribeform.pt:53
 msgid "Email will go to the address you have configured in site preferences."
-msgstr ""
+msgstr "El email sera enviado a la dirección que usted ha configurado en las preferencias del sitio"
 
 #: src/ZWiki/skins/zwiki/subscribeform.pt:58
 msgid "Your email address"
@@ -1425,6 +1401,12 @@
 msgid "User options"
 msgstr "opciones de búsqueda"
 
+#~ msgid "(identifies your edits)"
+#~ msgstr "(identifica tus cambios)"
+
+#~ msgid "type"
+#~ msgstr "tipo"
+
 #~ msgid "your edit contained a banned link pattern"
 #~ msgstr "tu edición contiene un patrón de enlace 'banned'"
 
@@ -1443,14 +1425,8 @@
 #~ msgid "and enter"
 #~ msgstr "y pulsa el retorno de carro"
 
-#~ msgid ""
-#~ "You may create a new ZWiki Page object using the form below. You may also "
-#~ "choose to upload an existing html file from your local computer by "
-#~ "clicking the <i>Browse</i> button."
-#~ msgstr ""
-#~ "Puedes crear una nueva página ZWiki utilizando este formulario. También "
-#~ "puedes cargar un fichero html desde tu máquina local pulsando el botón "
-#~ "<i>Browse</i>."
+#~ msgid "You may create a new ZWiki Page object using the form below. You may also choose to upload an existing html file from your local computer by clicking the <i>Browse</i> button."
+#~ msgstr "Puedes crear una nueva página ZWiki utilizando este formulario. También puedes cargar un fichero html desde tu máquina local pulsando el botón <i>Browse</i>."
 
 #~ msgid "File"
 #~ msgstr "Fichero"
@@ -1477,19 +1453,15 @@
 #~ msgstr "volver a la página"
 
 #~ msgid "help_shortname"
-#~ msgstr ""
-#~ "Nota: Renombrar una página en un wiki grande puede ser lento. Otras "
-#~ "páginas serán modificadas si es posible."
+#~ msgstr "Nota: Renombrar una página en un wiki grande puede ser lento. Otras páginas serán modificadas si es posible."
 
 #~ msgid "label_body_text"
 #~ msgstr "Texto"
 
 #~ msgid "help_wikibody"
 #~ msgstr ""
-#~ "En una página Wiki, puedes usar [corchetes] para crear enlaces. Cuando "
-#~ "guardas la página, el contenido\n"
-#~ "            de los corchetes tendrá un pequeño enlace <code>?</code> a "
-#~ "continuación, que puedes pulsar para crear\n"
+#~ "En una página Wiki, puedes usar [corchetes] para crear enlaces. Cuando guardas la página, el contenido\n"
+#~ "            de los corchetes tendrá un pequeño enlace <code>?</code> a continuación, que puedes pulsar para crear\n"
 #~ "            una nueva página con ese nombre."
 
 #~ msgid "help_wikiwords"
@@ -1574,8 +1546,7 @@
 
 #~ msgid "backlinks_reparent_help"
 #~ msgstr ""
-#~ "Puedes cambiar el padres(s) de la página para situarla dentro de la "
-#~ "jerarquía\n"
+#~ "Puedes cambiar el padres(s) de la página para situarla dentro de la jerarquía\n"
 #~ "global. Marca uno o más checks o introduce un nuevo nombre de página aquí:"
 
 #~ msgid "backlinks_reparent_help2"
@@ -1692,8 +1663,7 @@
 #~ msgstr "No estás autorizado a añadir páginas ZWiki aquí."
 
 #~ msgid "You are not authorized to set this ZWiki Page's regulations."
-#~ msgstr ""
-#~ "No estás autorizado a cambiar las regulaciones de esta página Zwiki."
+#~ msgstr "No estás autorizado a cambiar las regulaciones de esta página Zwiki."
 
 #~ msgid "Add a ZWiki web.."
 #~ msgstr "Añadir una web ZWiki.."

Modified: zope-zwiki/trunk/i18n/et.po
===================================================================
--- zope-zwiki/trunk/i18n/et.po	2007-04-08 14:54:05 UTC (rev 761)
+++ zope-zwiki/trunk/i18n/et.po	2007-04-08 14:55:27 UTC (rev 762)
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: zwiki\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL at ADDRESS>\n"
-"POT-Creation-Date: Sat Sep  2 18:10:16 2006\n"
+"POT-Creation-Date: Tue Mar 27 14:50:46 2007\n"
 "PO-Revision-Date: 2006-03-15 21:10+0000\n"
 "Last-Translator: Simon Michael <simon at joyful.com>\n"
 "Language-Team: Estonian <et at li.org>\n"
@@ -18,35 +18,31 @@
 "X-Rosetta-Version: 0.1\n"
 "Domain: zwiki\n"
 
-#: src/ZWiki/Admin.py:62
+#: src/ZWiki/Admin.py:58
 msgid "You are not authorized to upgrade all pages."
 msgstr "Sul ei ole õigust uuendada kõiki lehekülgi."
 
-#: src/ZWiki/Admin.py:63
+#: src/ZWiki/Admin.py:59
 msgid "(folder -> Manage properties)"
 msgstr ""
 
-#: src/ZWiki/Diff.py:174
+#: src/ZWiki/Diff.py:179
 #, fuzzy
 msgid "You are not authorized to reparent this ZWiki Page."
 msgstr "Sul puudub õigus kustuda see ZWiki lehekülg."
 
-#: src/ZWiki/Diff.py:180 src/ZWiki/plugins/tracker/tracker.py:332
+#: src/ZWiki/Diff.py:185 src/ZWiki/plugins/tracker/tracker.py:333
 #, fuzzy
 msgid "You are not authorized to rename this ZWiki Page."
 msgstr "Sul puudub õigus kustuda see ZWiki lehekülg."
 
-#: src/ZWiki/Editing.py:156 src/ZWiki/Editing.py:294 src/ZWiki/Views.py:332
-#: src/ZWiki/Views.py:435 src/ZWiki/plugins/tracker/tracker.py:321
-msgid ""
-"Sorry, this wiki doesn't allow anonymous edits. Please configure a username "
-"in options first."
+#: src/ZWiki/Editing.py:156 src/ZWiki/Editing.py:294 src/ZWiki/Views.py:336
+#: src/ZWiki/Views.py:439 src/ZWiki/plugins/tracker/tracker.py:322
+msgid "Sorry, this wiki doesn't allow anonymous edits. Please configure a username in options first."
 msgstr ""
 
 #: src/ZWiki/Editing.py:327
-msgid ""
-"You are not authorized to reparent or change subtopics links on this ZWiki "
-"Page."
+msgid "You are not authorized to reparent or change subtopics links on this ZWiki Page."
 msgstr ""
 
 #: src/ZWiki/Editing.py:349
@@ -54,9 +50,9 @@
 msgstr ""
 
 #: src/ZWiki/Editing.py:383 src/ZWiki/Editing.py:410
-#: src/ZWiki/plugins/tracker/tracker.py:340
-#: src/ZWiki/plugins/tracker/tracker.py:347
-#: src/ZWiki/plugins/tracker/tracker.py:354
+#: src/ZWiki/plugins/tracker/tracker.py:344
+#: src/ZWiki/plugins/tracker/tracker.py:351
+#: src/ZWiki/plugins/tracker/tracker.py:358
 msgid "You are not authorized to edit this ZWiki Page."
 msgstr "Sul puudub õigus redigeerida seda ZWiki lehekülge."
 
@@ -65,8 +61,7 @@
 msgstr "Sul puudub õigus kustuda see ZWiki lehekülg."
 
 #: src/ZWiki/Editing.py:563
-msgid ""
-"This page was renamed to %s. You can delete this one if no longer needed.\n"
+msgid "This page was renamed to %s. You can delete this one if no longer needed.\n"
 msgstr ""
 
 #: src/ZWiki/Editing.py:659
@@ -86,9 +81,7 @@
 msgstr ""
 
 #: src/ZWiki/Editing.py:830
-msgid ""
-"your edit contained a banned link pattern. Please contact the site "
-"administrator for help."
+msgid "your edit contained a banned link pattern. Please contact the site administrator for help."
 msgstr ""
 
 #: src/ZWiki/Editing.py:841
@@ -96,10 +89,7 @@
 msgstr ""
 
 #: src/ZWiki/Editing.py:842
-msgid ""
-"adding of external links by unidentified users is restricted. Please back up "
-"and remove some of the http urls you added, or contact the site "
-"administrator for help."
+msgid "adding of external links by unidentified users is restricted. Please back up and remove some of the http urls you added, or contact the site administrator for help."
 msgstr ""
 
 #: src/ZWiki/Editing.py:853
@@ -107,85 +97,86 @@
 msgstr ""
 
 #: src/ZWiki/Editing.py:854
-msgid ""
-"adding of external links is restricted, even for identified users. Please "
-"back up and remove some of the http urls you added, or contact the site "
-"administrator for help."
+msgid "adding of external links is restricted, even for identified users. Please back up and remove some of the http urls you added, or contact the site administrator for help."
 msgstr ""
 
-#: src/ZWiki/Mail.py:506 src/ZWiki/skins/dtmlmessages.pt:58
+#: src/ZWiki/Mail.py:506 src/ZWiki/skins/dtmlmessages.pt:60
 msgid "anonymous"
 msgstr "anonüümne"
 
-#: src/ZWiki/OutlineSupport.py:843 src/ZWiki/skins/zwiki/links.pt:56
+#: src/ZWiki/OutlineSupport.py:378
+msgid "Sorry, this wiki doesn't allow anonymous reparenting. Please configure a username in options first."
+msgstr ""
+
+#: src/ZWiki/OutlineSupport.py:878 src/ZWiki/skins/zwiki/links.pt:56
 msgid "which pages link to this one ?"
 msgstr ""
 
-#: src/ZWiki/OutlineSupport.py:851
+#: src/ZWiki/OutlineSupport.py:886
 msgid "You are here"
 msgstr "Sa oled siin"
 
-#: src/ZWiki/Utils.py:465
+#: src/ZWiki/Utils.py:487
 msgid "years"
 msgstr "aastat"
 
-#: src/ZWiki/Utils.py:465
+#: src/ZWiki/Utils.py:487
 msgid "year"
 msgstr "aasta"
 
-#: src/ZWiki/Utils.py:467
+#: src/ZWiki/Utils.py:489
 msgid "month"
 msgstr "kuu"
 
-#: src/ZWiki/Utils.py:467
+#: src/ZWiki/Utils.py:489
 msgid "months"
 msgstr "kuud"
 
-#: src/ZWiki/Utils.py:469
+#: src/ZWiki/Utils.py:491
 msgid "weeks"
 msgstr "nädalat"
 
-#: src/ZWiki/Utils.py:469
+#: src/ZWiki/Utils.py:491
 msgid "week"
 msgstr "nädal"
 
-#: src/ZWiki/Utils.py:471
+#: src/ZWiki/Utils.py:493
 msgid "day"
 msgstr "päev"
 
-#: src/ZWiki/Utils.py:471
+#: src/ZWiki/Utils.py:493
 msgid "days"
 msgstr "päeva"
 
-#: src/ZWiki/Utils.py:473
+#: src/ZWiki/Utils.py:495
 msgid "hours"
 msgstr "tundi"
 
-#: src/ZWiki/Utils.py:473
+#: src/ZWiki/Utils.py:495
 msgid "hour"
 msgstr "tund"
 
-#: src/ZWiki/Utils.py:475
+#: src/ZWiki/Utils.py:497
 msgid "minute"
 msgstr "minut"
 
-#: src/ZWiki/Utils.py:475
+#: src/ZWiki/Utils.py:497
 msgid "minutes"
 msgstr "minutit"
 
-#: src/ZWiki/Utils.py:477
+#: src/ZWiki/Utils.py:499
 msgid "second"
 msgstr "sekund"
 
-#: src/ZWiki/Utils.py:477
+#: src/ZWiki/Utils.py:499
 msgid "seconds"
 msgstr "sekundit"
 
-#: src/ZWiki/Views.py:346
+#: src/ZWiki/Views.py:350
 msgid "Page is locked"
 msgstr "Lehekülg on lukustatud"
 
-#: src/ZWiki/Views.py:357
+#: src/ZWiki/Views.py:361
 msgid ""
 "\n"
 "            This page has a webDAV lock. Someone is probably editing it\n"
@@ -196,60 +187,58 @@
 "            "
 msgstr ""
 
-#: src/ZWiki/Views.py:364
+#: src/ZWiki/Views.py:368
 msgid "To discard your changes and try again, click OK."
 msgstr ""
 
-#: src/ZWiki/Views.py:393
+#: src/ZWiki/Views.py:397
 msgid "Edit conflict"
 msgstr ""
 
-#: src/ZWiki/Views.py:413
+#: src/ZWiki/Views.py:417
 msgid "Someone else has saved this page while you were editing"
 msgstr ""
 
-#: src/ZWiki/Views.py:414
+#: src/ZWiki/Views.py:418
 msgid "To resolve the conflict, do this"
 msgstr ""
 
-#: src/ZWiki/Views.py:415
+#: src/ZWiki/Views.py:419
 msgid "Click your browser's back button"
 msgstr ""
 
-#: src/ZWiki/Views.py:416
+#: src/ZWiki/Views.py:420
 msgid "Copy your recent edits to the clipboard"
 msgstr ""
 
-#: src/ZWiki/Views.py:417
+#: src/ZWiki/Views.py:421
 msgid "Click your browser's refresh button"
 msgstr ""
 
-#: src/ZWiki/Views.py:418
+#: src/ZWiki/Views.py:422
 msgid "Paste in your edits again, being mindful of the latest changes"
 msgstr ""
 
-#: src/ZWiki/Views.py:419
+#: src/ZWiki/Views.py:423
 msgid "Click the Change button again"
 msgstr ""
 
-#: src/ZWiki/Views.py:420 src/ZWiki/skins/zwiki/editform.pt:163
+#: src/ZWiki/Views.py:424 src/ZWiki/skins/zwiki/editform.pt:163
 msgid "or"
 msgstr "või"
 
-#: src/ZWiki/Views.py:421
+#: src/ZWiki/Views.py:425
 msgid "To discard your changes and start again, click OK"
 msgstr ""
 
-#: src/ZWiki/Views.py:490
+#: src/ZWiki/Views.py:501
 msgid ""
 "\n"
-"        Access keys can be accessed in mozilla-based browsers by pressing "
-"alt-<key>\n"
+"        Access keys can be accessed in mozilla-based browsers by pressing alt-<key>\n"
 "        IE users: must also press enter\n"
 "        Mac users: command-<key>\n"
 "        Opera users: shift-escape-<key>\n"
-"        These won't work here, back up to the previous page to try them "
-"out.\n"
+"        These won't work here, back up to the previous page to try them out.\n"
 "\n"
 "        0    show these access key assignments\n"
 "\n"
@@ -265,10 +254,8 @@
 "        s    go to search field\n"
 "        \n"
 "        page functions:\n"
-"        +    (in a plone/cmf site with skin switching set up) use zwiki's "
-"plone/cmf skin\n"
-"        -    (in a plone/cmf site with skin switching set up) use zwiki's "
-"standard skin\n"
+"        +    (in a plone/cmf site with skin switching set up) use zwiki's plone/cmf skin\n"
+"        -    (in a plone/cmf site with skin switching set up) use zwiki's standard skin\n"
 "        v    view page\n"
 "        m    mail subscription\n"
 "        b    show backlinks (links to this page)\n"
@@ -296,32 +283,31 @@
 "        "
 msgstr ""
 
-#: src/ZWiki/Wikis.py:49
-msgid "Unknown wiki type"
-msgstr ""
-
-#: src/ZWiki/ZWikiPage.py:675
+#: src/ZWiki/ZWikiPage.py:744
 msgid "create this page"
 msgstr ""
 
-#: src/ZWiki/ZWikiPage.py:798 src/ZWiki/ZWikiPage.py:814
-#: src/ZWiki/ZWikiPage.py:817
+#: src/ZWiki/ZWikiPage.py:872 src/ZWiki/ZWikiPage.py:887
 msgid "last edited %(interval)s ago"
 msgstr ""
 
-#: src/ZWiki/ZWikiPage.py:809
+#: src/ZWiki/ZWikiPage.py:882
 msgid "show last edit"
 msgstr ""
 
-#: src/ZWiki/ZWikiPage.py:826 src/ZWiki/ZWikiPage.py:828
+#: src/ZWiki/ZWikiPage.py:897 src/ZWiki/ZWikiPage.py:899
 msgid "by %(editor)s"
 msgstr ""
 
-#: src/ZWiki/__init__.py:34
+#: src/ZWiki/__init__.py:200
+msgid "Unknown wiki type"
+msgstr ""
+
+#: src/ZWiki/__init__.py:39
 msgid "No need to add a Zwiki Outline Cache"
 msgstr ""
 
-#: src/ZWiki/__init__.py:35
+#: src/ZWiki/__init__.py:40
 msgid ""
 "Zwiki Outline Cache appears in the ZMI Add menu\n"
 "        for implementation reasons, but should not be added directly.\n"
@@ -333,6 +319,10 @@
 msgid "comments"
 msgstr "kommentaarid"
 
+#: src/ZWiki/pagetypes/html.py:50 src/ZWiki/pagetypes/rst.py:85
+msgid "reply"
+msgstr ""
+
 #: src/ZWiki/pagetypes/moin.py:1990
 msgid "Expected \"=\" to follow \"%(token)s\""
 msgstr ""
@@ -369,10 +359,6 @@
 msgid "Expected a color value \"%(arg)s\" after \"%(key)s\""
 msgstr ""
 
-#: src/ZWiki/pagetypes/rst.py:85
-msgid "reply"
-msgstr ""
-
 #: src/ZWiki/plugins/latexwiki/wikis/latexwiki/diffform.pt:127
 #: src/ZWiki/plugins/mathaction/wikis/mathaction/old-diffform.pt:127
 msgid "full history"
@@ -446,7 +432,7 @@
 msgstr ""
 
 #: src/ZWiki/plugins/tracker/filterissues.pt:12
-#: src/ZWiki/skins/dtmlmessages.pt:30
+#: src/ZWiki/skins/dtmlmessages.pt:31
 msgid "Filter issues"
 msgstr ""
 
@@ -458,109 +444,105 @@
 msgid "Issue tracker"
 msgstr ""
 
-#: src/ZWiki/plugins/tracker/tracker.py:361
+#: src/ZWiki/plugins/tracker/tracker.py:365
 #, fuzzy
 msgid "You are not authorized to comment on this ZWiki Page."
 msgstr "Sul puudub õigus redigeerida seda ZWiki lehekülge."
 
-#: src/ZWiki/skins/dtmlmessages.pt:10 src/ZWiki/skins/dtmlmessages.pt:32
+#: src/ZWiki/skins/dtmlmessages.pt:10 src/ZWiki/skins/dtmlmessages.pt:33
+msgid "name"
+msgstr ""
+
+#: src/ZWiki/skins/dtmlmessages.pt:11 src/ZWiki/skins/dtmlmessages.pt:34
 msgid "category"
 msgstr ""
 
-#: src/ZWiki/skins/dtmlmessages.pt:11 src/ZWiki/skins/dtmlmessages.pt:33
+#: src/ZWiki/skins/dtmlmessages.pt:12 src/ZWiki/skins/dtmlmessages.pt:35
 msgid "severity"
 msgstr ""
 
-#: src/ZWiki/skins/dtmlmessages.pt:12 src/ZWiki/skins/dtmlmessages.pt:34
+#: src/ZWiki/skins/dtmlmessages.pt:13 src/ZWiki/skins/dtmlmessages.pt:36
 msgid "status"
 msgstr ""
 
-#: src/ZWiki/skins/dtmlmessages.pt:13 src/ZWiki/skins/dtmlmessages.pt:35
+#: src/ZWiki/skins/dtmlmessages.pt:14 src/ZWiki/skins/dtmlmessages.pt:37
 msgid "age"
 msgstr ""
 
-#: src/ZWiki/skins/dtmlmessages.pt:14 src/ZWiki/skins/dtmlmessages.pt:36
+#: src/ZWiki/skins/dtmlmessages.pt:15 src/ZWiki/skins/dtmlmessages.pt:38
 msgid "modified"
 msgstr ""
 
-#: src/ZWiki/skins/dtmlmessages.pt:15
+#: src/ZWiki/skins/dtmlmessages.pt:16
 msgid "Add a new issue:"
 msgstr ""
 
-#: src/ZWiki/skins/dtmlmessages.pt:16
+#: src/ZWiki/skins/dtmlmessages.pt:17
 msgid "Name:"
 msgstr ""
 
-#: src/ZWiki/skins/dtmlmessages.pt:17
+#: src/ZWiki/skins/dtmlmessages.pt:18
 msgid "Category:"
 msgstr ""
 
-#: src/ZWiki/skins/dtmlmessages.pt:18
+#: src/ZWiki/skins/dtmlmessages.pt:19
 msgid "Severity:"
 msgstr ""
 
-#: src/ZWiki/skins/dtmlmessages.pt:19
-msgid "Status:"
-msgstr ""
-
 #: src/ZWiki/skins/dtmlmessages.pt:2
 msgid "Here are the wiki's issue pages."
 msgstr ""
 
 #: src/ZWiki/skins/dtmlmessages.pt:20
-msgid "Details:"
+msgid "Status:"
 msgstr ""
 
 #: src/ZWiki/skins/dtmlmessages.pt:21
-msgid "add issue"
+msgid "Details:"
 msgstr ""
 
 #: src/ZWiki/skins/dtmlmessages.pt:22
-msgid "More advanced"
+msgid "add issue"
 msgstr ""
 
 #: src/ZWiki/skins/dtmlmessages.pt:23
-msgid "issue tracker"
+msgid "More advanced"
 msgstr ""
 
 #: src/ZWiki/skins/dtmlmessages.pt:24
-msgid "search options"
+msgid "issue tracker"
 msgstr ""
 
 #: src/ZWiki/skins/dtmlmessages.pt:25
-msgid "Name contains any of:"
+msgid "search options"
 msgstr ""
 
 #: src/ZWiki/skins/dtmlmessages.pt:26
-msgid "Page text contains any of:"
+msgid "Name contains any of:"
 msgstr ""
 
 #: src/ZWiki/skins/dtmlmessages.pt:27
-msgid "Categories:"
+msgid "Page text contains any of:"
 msgstr ""
 
 #: src/ZWiki/skins/dtmlmessages.pt:28
-msgid "Severities:"
+msgid "Categories:"
 msgstr ""
 
 #: src/ZWiki/skins/dtmlmessages.pt:29
-msgid "Statuses:"
+msgid "Severities:"
 msgstr ""
 
 #: src/ZWiki/skins/dtmlmessages.pt:3
 msgid "Enter a search term, click the numbers to the right,"
 msgstr ""
 
-#: src/ZWiki/skins/dtmlmessages.pt:37
-msgid "Submitted by"
+#: src/ZWiki/skins/dtmlmessages.pt:30
+msgid "Statuses:"
 msgstr ""
 
-#: src/ZWiki/skins/dtmlmessages.pt:38
-msgid "Name"
-msgstr ""
-
 #: src/ZWiki/skins/dtmlmessages.pt:39
-msgid "Category"
+msgid "Submitted by"
 msgstr ""
 
 #: src/ZWiki/skins/dtmlmessages.pt:4
@@ -568,167 +550,165 @@
 msgstr ""
 
 #: src/ZWiki/skins/dtmlmessages.pt:40
-msgid "Severity"
+msgid "Name"
 msgstr ""
 
 #: src/ZWiki/skins/dtmlmessages.pt:41
-msgid "Status"
+msgid "Category"
 msgstr ""
 
 #: src/ZWiki/skins/dtmlmessages.pt:42
-msgid "Optional subject"
+msgid "Severity"
 msgstr ""
 
 #: src/ZWiki/skins/dtmlmessages.pt:43
+msgid "Status"
+msgstr ""
+
+#: src/ZWiki/skins/dtmlmessages.pt:44
+msgid "Optional subject"
+msgstr ""
+
+#: src/ZWiki/skins/dtmlmessages.pt:45
 msgid "Optional comment"
 msgstr ""
 
-#: src/ZWiki/skins/dtmlmessages.pt:44 src/ZWiki/skins/dtmlmessages.pt:45
+#: src/ZWiki/skins/dtmlmessages.pt:46 src/ZWiki/skins/dtmlmessages.pt:47
 #, fuzzy
 msgid "Add ZWiki"
 msgstr "Lisa Wiki"
 
-#: src/ZWiki/skins/dtmlmessages.pt:46
+#: src/ZWiki/skins/dtmlmessages.pt:48
 msgid "Id:"
 msgstr ""
 
-#: src/ZWiki/skins/dtmlmessages.pt:47
+#: src/ZWiki/skins/dtmlmessages.pt:49
 msgid "Title:"
 msgstr ""
 
-#: src/ZWiki/skins/dtmlmessages.pt:48
+#: src/ZWiki/skins/dtmlmessages.pt:5
+msgid "browse open issues"
+msgstr ""
+
+#: src/ZWiki/skins/dtmlmessages.pt:50
 msgid "Template:"
 msgstr ""
 
-#: src/ZWiki/skins/dtmlmessages.pt:49
+#: src/ZWiki/skins/dtmlmessages.pt:51
 #, fuzzy
 msgid "Add wiki"
 msgstr "Lisa Wiki"
 
-#: src/ZWiki/skins/dtmlmessages.pt:5
-msgid "browse open issues"
-msgstr ""
-
-#: src/ZWiki/skins/dtmlmessages.pt:50
+#: src/ZWiki/skins/dtmlmessages.pt:52
 msgid "Pages changed in the last"
 msgstr ""
 
-#: src/ZWiki/skins/dtmlmessages.pt:51
+#: src/ZWiki/skins/dtmlmessages.pt:53
 msgid "Recently changed pages, with summaries"
 msgstr ""
 
-#: src/ZWiki/skins/dtmlmessages.pt:52
+#: src/ZWiki/skins/dtmlmessages.pt:54
 msgid "Show summaries ?"
 msgstr ""
 
-#: src/ZWiki/skins/dtmlmessages.pt:53
+#: src/ZWiki/skins/dtmlmessages.pt:55
 msgid "Refresh"
 msgstr ""
 
-#: src/ZWiki/skins/dtmlmessages.pt:54
+#: src/ZWiki/skins/dtmlmessages.pt:56
 msgid "Page"
 msgstr ""
 
-#: src/ZWiki/skins/dtmlmessages.pt:55
+#: src/ZWiki/skins/dtmlmessages.pt:57
 msgid "Edited&nbsp;by"
 msgstr ""
 
-#: src/ZWiki/skins/dtmlmessages.pt:56
+#: src/ZWiki/skins/dtmlmessages.pt:58
 msgid "Time"
 msgstr ""
 
-#: src/ZWiki/skins/dtmlmessages.pt:57
+#: src/ZWiki/skins/dtmlmessages.pt:59
 msgid "NEW"
 msgstr ""
 
-#: src/ZWiki/skins/dtmlmessages.pt:59
-msgid "Pages marked (NEW) have been created within the last week"
-msgstr ""
-
 #: src/ZWiki/skins/dtmlmessages.pt:6
 msgid "search issues"
 msgstr ""
 
-#: src/ZWiki/skins/dtmlmessages.pt:60
+#: src/ZWiki/skins/dtmlmessages.pt:61
+msgid "Pages marked (NEW) have been created within the last week"
+msgstr ""
+
+#: src/ZWiki/skins/dtmlmessages.pt:62
 msgid "Enter a word or phrase and hit enter to search the entire wiki."
 msgstr ""
 
-#: src/ZWiki/skins/dtmlmessages.pt:61
+#: src/ZWiki/skins/dtmlmessages.pt:63
 msgid "This is the same as using the search field at top right."
 msgstr ""
 
-#: src/ZWiki/skins/dtmlmessages.pt:62
+#: src/ZWiki/skins/dtmlmessages.pt:64
 msgid "Tips: A single word works best for matching page names."
 msgstr ""
 
-#: src/ZWiki/skins/dtmlmessages.pt:63
-msgid ""
-"Case-insensitivity and wildcards may be supported depending on your catalog "
-"configuration."
+#: src/ZWiki/skins/dtmlmessages.pt:65
+msgid "Case-insensitivity and wildcards may be supported depending on your catalog configuration."
 msgstr ""
 
-#: src/ZWiki/skins/dtmlmessages.pt:64
+#: src/ZWiki/skins/dtmlmessages.pt:66
 msgid "Leave it blank to list all pages."
 msgstr ""
 
-#: src/ZWiki/skins/dtmlmessages.pt:65 src/ZWiki/skins/dtmlmessages.pt:66
+#: src/ZWiki/skins/dtmlmessages.pt:67 src/ZWiki/skins/dtmlmessages.pt:68
 msgid "Search"
 msgstr "Otsing"
 
-#: src/ZWiki/skins/dtmlmessages.pt:67
+#: src/ZWiki/skins/dtmlmessages.pt:69
 msgid "Page names matching"
 msgstr ""
 
-#: src/ZWiki/skins/dtmlmessages.pt:68
-msgid "Text matching"
-msgstr ""
-
-#: src/ZWiki/skins/dtmlmessages.pt:69
-msgid "Thorough (non-catalog) search for text matching"
-msgstr ""
-
 #: src/ZWiki/skins/dtmlmessages.pt:7
 msgid "recent"
 msgstr ""
 
 #: src/ZWiki/skins/dtmlmessages.pt:70
-msgid "Set your preferences for this wiki:"
+msgid "Text matching"
 msgstr ""
 
 #: src/ZWiki/skins/dtmlmessages.pt:71
-msgid "User name:"
+msgid "Thorough (non-catalog) search for text matching"
 msgstr ""
 
 #: src/ZWiki/skins/dtmlmessages.pt:72
-msgid "(identifies your edits)"
+msgid "Set your preferences for this wiki:"
 msgstr ""
 
 #: src/ZWiki/skins/dtmlmessages.pt:73
-msgid "Email address:"
+msgid "User name:"
 msgstr ""
 
 #: src/ZWiki/skins/dtmlmessages.pt:74
-msgid "(allows mail subscription)"
+msgid "(identifies your edits, saves your votes, may be required)"
 msgstr ""
 
 #: src/ZWiki/skins/dtmlmessages.pt:75
-msgid "Your time zone:"
+msgid "Email address:"
 msgstr ""
 
 #: src/ZWiki/skins/dtmlmessages.pt:76
-msgid "(localizes most times)"
+msgid "(allows mail subscription)"
 msgstr ""
 
 #: src/ZWiki/skins/dtmlmessages.pt:77
-msgid "Edit form height:"
+msgid "Your time zone:"
 msgstr ""
 
 #: src/ZWiki/skins/dtmlmessages.pt:78
-msgid "(adjusts form size)"
+msgid "(localizes most times)"
 msgstr ""
 
 #: src/ZWiki/skins/dtmlmessages.pt:79
-msgid "Save options"
+msgid "Edit form height:"
 msgstr ""
 
 #: src/ZWiki/skins/dtmlmessages.pt:8
@@ -736,71 +716,71 @@
 msgstr ""
 
 #: src/ZWiki/skins/dtmlmessages.pt:80
+msgid "(adjusts form size)"
+msgstr ""
+
+#: src/ZWiki/skins/dtmlmessages.pt:81
+msgid "Save options"
+msgstr ""
+
+#: src/ZWiki/skins/dtmlmessages.pt:82
 msgid "Forget options"
 msgstr ""
 
-#: src/ZWiki/skins/dtmlmessages.pt:81 src/ZWiki/skins/dtmlmessages.pt:82
+#: src/ZWiki/skins/dtmlmessages.pt:83 src/ZWiki/skins/dtmlmessages.pt:84
 msgid "Add ZWiki Page"
 msgstr ""
 
-#: src/ZWiki/skins/dtmlmessages.pt:83
+#: src/ZWiki/skins/dtmlmessages.pt:85
 msgid "Page&nbsp;name:"
 msgstr ""
 
-#: src/ZWiki/skins/dtmlmessages.pt:84
+#: src/ZWiki/skins/dtmlmessages.pt:86
 #, fuzzy
 msgid "Add wiki page"
 msgstr "Wiki lehekülg"
 
-#: src/ZWiki/skins/dtmlmessages.pt:85
+#: src/ZWiki/skins/dtmlmessages.pt:87
 msgid "Topic"
 msgstr ""
 
-#: src/ZWiki/skins/dtmlmessages.pt:86
+#: src/ZWiki/skins/dtmlmessages.pt:88
 msgid "Last updated"
 msgstr ""
 
-#: src/ZWiki/skins/dtmlmessages.pt:87
+#: src/ZWiki/skins/dtmlmessages.pt:89
 msgid "Comments"
 msgstr ""
 
-#: src/ZWiki/skins/dtmlmessages.pt:88
+#: src/ZWiki/skins/dtmlmessages.pt:9 src/ZWiki/skins/dtmlmessages.pt:32
+msgid "#"
+msgstr ""
+
+#: src/ZWiki/skins/dtmlmessages.pt:90
 msgid "Views"
 msgstr ""
 
-#: src/ZWiki/skins/dtmlmessages.pt:89
+#: src/ZWiki/skins/dtmlmessages.pt:91
 msgid "Created"
 msgstr ""
 
-#: src/ZWiki/skins/dtmlmessages.pt:9 src/ZWiki/skins/dtmlmessages.pt:31
-msgid "#"
-msgstr ""
-
-#: src/ZWiki/skins/dtmlmessages.pt:90 src/ZWiki/skins/dtmlmessages.pt:92
+#: src/ZWiki/skins/dtmlmessages.pt:92 src/ZWiki/skins/dtmlmessages.pt:94
 msgid "by"
 msgstr ""
 
-#: src/ZWiki/skins/dtmlmessages.pt:91
+#: src/ZWiki/skins/dtmlmessages.pt:93
 msgid "<dtml-var lasteditinterval> ago</dtml-var>"
 msgstr ""
 
-#: src/ZWiki/skins/dtmlmessages.pt:93
+#: src/ZWiki/skins/dtmlmessages.pt:95
 msgid "on"
 msgstr ""
 
-#: src/ZWiki/skins/zwiki/backlinks.pt:108
-msgid "Subtopics"
-msgstr ""
-
-#: src/ZWiki/skins/zwiki/backlinks.pt:111
-msgid "This page has no subtopics."
-msgstr ""
-
-#: src/ZWiki/skins/zwiki/backlinks.pt:114
+#: src/ZWiki/skins/zwiki/backlinks.pt:102
 msgid "Here are it's subtopics."
 msgstr ""
 
-#: src/ZWiki/skins/zwiki/backlinks.pt:117
+#: src/ZWiki/skins/zwiki/backlinks.pt:105
 msgid "You can reorder them by clicking the ^ buttons."
 msgstr ""
 
@@ -812,60 +792,60 @@
 msgid "Parents"
 msgstr ""
 
-#: src/ZWiki/skins/zwiki/backlinks.pt:31
+#: src/ZWiki/skins/zwiki/backlinks.pt:28
 msgid "is a top-level topic."
 msgstr ""
 
-#: src/ZWiki/skins/zwiki/backlinks.pt:32
+#: src/ZWiki/skins/zwiki/backlinks.pt:29
 msgid "is a subtopic of:"
 msgstr ""
 
-#: src/ZWiki/skins/zwiki/backlinks.pt:55
+#: src/ZWiki/skins/zwiki/backlinks.pt:48
 msgid "Backlinks"
 msgstr ""
 
-#: src/ZWiki/skins/zwiki/backlinks.pt:56
+#: src/ZWiki/skins/zwiki/backlinks.pt:49
 msgid "Here are the pages which link to it:"
 msgstr ""
 
-#: src/ZWiki/skins/zwiki/backlinks.pt:57
+#: src/ZWiki/skins/zwiki/backlinks.pt:50
 msgid "No other pages link to this one."
 msgstr ""
 
-#: src/ZWiki/skins/zwiki/backlinks.pt:82
-msgid ""
-"You can set this page's parent(s) to place it within the overall page "
-"hierarchy."
+#: src/ZWiki/skins/zwiki/backlinks.pt:70
+msgid "You can set this page's parent(s) to place it within the overall page hierarchy."
 msgstr ""
 
-#: src/ZWiki/skins/zwiki/backlinks.pt:85
-msgid ""
-"Check one or more checkboxes or enter a page name here, and click the button."
+#: src/ZWiki/skins/zwiki/backlinks.pt:73
+msgid "Check one or more checkboxes or enter a page name here, and click the button."
 msgstr ""
 
-#: src/ZWiki/skins/zwiki/backlinks.pt:88
+#: src/ZWiki/skins/zwiki/backlinks.pt:76
 msgid "Enter a page name here and click the button."
 msgstr ""
 
-#: src/ZWiki/skins/zwiki/backlinks.pt:91
-msgid ""
-"You can type just the first few letters, case and punctuation are ignored."
+#: src/ZWiki/skins/zwiki/backlinks.pt:79
+msgid "You can type just the first few letters, case and punctuation are ignored."
 msgstr ""
 
-#: src/ZWiki/skins/zwiki/backlinks.pt:98
+#: src/ZWiki/skins/zwiki/backlinks.pt:86
 msgid "Reparent"
 msgstr ""
 
+#: src/ZWiki/skins/zwiki/backlinks.pt:96
+msgid "Subtopics"
+msgstr ""
+
+#: src/ZWiki/skins/zwiki/backlinks.pt:99
+msgid "This page has no subtopics."
+msgstr ""
+
 #: src/ZWiki/skins/zwiki/badtemplate.pt:12
 msgid "Bad template"
 msgstr ""
 
 #: src/ZWiki/skins/zwiki/badtemplate.pt:13
-msgid ""
-"There was a problem locating one of this wiki's skin templates. There may be "
-"a page or other non-page-template/non-dtml-method object with the same ID, "
-"obscuring the template. Or the template may be missing on the filesystem (an "
-"incomplete Zwiki installation)."
+msgid "There was a problem locating one of this wiki's skin templates. There may be a page or other non-page-template/non-dtml-method object with the same ID, obscuring the template. Or the template may be missing on the filesystem (an incomplete Zwiki installation)."
 msgstr ""
 
 #: src/ZWiki/skins/zwiki/commentform.pt:21
@@ -897,12 +877,18 @@
 msgid "add-comment"
 msgstr ""
 
-#: src/ZWiki/skins/zwiki/contentspage.pt:12
+#: src/ZWiki/skins/zwiki/contentspage.pt:10
+#: src/ZWiki/skins/zwiki/contentspage.pt:27
+msgid "Wiki contents for"
+msgstr ""
+
+#: src/ZWiki/skins/zwiki/contentspage.pt:13
+#: src/ZWiki/skins/zwiki/contentspage.pt:30
 msgid "Wiki contents"
 msgstr ""
 
-#: src/ZWiki/skins/zwiki/contentspage.pt:16
-msgid "Singletons"
+#: src/ZWiki/skins/zwiki/contentspage.pt:40
+msgid "Singletons:"
 msgstr ""
 
 #: src/ZWiki/skins/zwiki/denied.pt:12
@@ -985,11 +971,11 @@
 msgstr ""
 
 #: src/ZWiki/skins/zwiki/editform.pt:178
-msgid "preview this edit"
+msgid "Preview"
 msgstr ""
 
 #: src/ZWiki/skins/zwiki/editform.pt:178
-msgid "Preview"
+msgid "preview this edit"
 msgstr ""
 
 #: src/ZWiki/skins/zwiki/editform.pt:183
@@ -1026,13 +1012,17 @@
 msgstr ""
 
 #: src/ZWiki/skins/zwiki/editform.pt:71
-msgid "type"
+msgid "markup"
 msgstr ""
 
 #: src/ZWiki/skins/zwiki/editform.pt:72
 msgid "select the formatting and rendering style for this page"
 msgstr ""
 
+#: src/ZWiki/skins/zwiki/helppage.pt:12
+msgid "Help page"
+msgstr ""
+
 #: src/ZWiki/skins/zwiki/links.pt:102
 msgid "(external edit)"
 msgstr ""
@@ -1170,11 +1160,11 @@
 msgstr ""
 
 #: src/ZWiki/skins/zwiki/pagemanagementform.pt:45
-msgid "reparent"
+msgid "make this page a subtopic of the page you have entered"
 msgstr ""
 
 #: src/ZWiki/skins/zwiki/pagemanagementform.pt:45
-msgid "make this page a subtopic of the page you have entered"
+msgid "reparent"
 msgstr ""
 
 #: src/ZWiki/skins/zwiki/pagemanagementform.pt:50
@@ -1190,8 +1180,7 @@
 msgstr ""
 
 #: src/ZWiki/skins/zwiki/pagemanagementform.pt:55
-msgid ""
-"delete this page, and redirect links to the page you have entered, if any"
+msgid "delete this page, and redirect links to the page you have entered, if any"
 msgstr ""
 
 #: src/ZWiki/skins/zwiki/pagemanagementform.pt:60

Modified: zope-zwiki/trunk/i18n/fi.po
===================================================================
--- zope-zwiki/trunk/i18n/fi.po	2007-04-08 14:54:05 UTC (rev 761)
+++ zope-zwiki/trunk/i18n/fi.po	2007-04-08 14:55:27 UTC (rev 762)
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: zwiki\n"
-"POT-Creation-Date: Sat Sep  2 18:10:16 2006\n"
+"POT-Creation-Date: Tue Mar 27 14:50:46 2007\n"
 "PO-Revision-Date: 2006-03-21 06:27+0000\n"
 "Last-Translator: Marko Kervinen <marko_kervinen at hotmail.com>\n"
 "Language-Team: Finnish <fi at li.org>\n"
@@ -13,39 +13,33 @@
 "Preferred-encodings: utf-8\n"
 "Domain: zwiki\n"
 
-#: src/ZWiki/Admin.py:62
+#: src/ZWiki/Admin.py:58
 #, fuzzy
 msgid "You are not authorized to upgrade all pages."
 msgstr "Sinulla ei ole oikeuksia päivittää kaikkia sivuja."
 
-#: src/ZWiki/Admin.py:63
+#: src/ZWiki/Admin.py:59
 msgid "(folder -> Manage properties)"
 msgstr "(kansio -> Hallinnoi ominaisuuksia) / (folder -> Manage properties)"
 
-#: src/ZWiki/Diff.py:174
+#: src/ZWiki/Diff.py:179
 #, fuzzy
 msgid "You are not authorized to reparent this ZWiki Page."
 msgstr "Sinulla ei ole valtuutta uudelleennimet tt ZWiki-sivua."
 
-#: src/ZWiki/Diff.py:180 src/ZWiki/plugins/tracker/tracker.py:332
+#: src/ZWiki/Diff.py:185 src/ZWiki/plugins/tracker/tracker.py:333
 msgid "You are not authorized to rename this ZWiki Page."
 msgstr "Sinulla ei ole valtuutta uudelleennimet tt ZWiki-sivua."
 
-#: src/ZWiki/Editing.py:156 src/ZWiki/Editing.py:294 src/ZWiki/Views.py:332
-#: src/ZWiki/Views.py:435 src/ZWiki/plugins/tracker/tracker.py:321
+#: src/ZWiki/Editing.py:156 src/ZWiki/Editing.py:294 src/ZWiki/Views.py:336
+#: src/ZWiki/Views.py:439 src/ZWiki/plugins/tracker/tracker.py:322
 #, fuzzy
-msgid ""
-"Sorry, this wiki doesn't allow anonymous edits. Please configure a username "
-"in options first."
-msgstr ""
-"Tämä wiki ei salli kirjautumattomia muokkauksia. Valitse käyttäjänimi "
-"valikosta ensin."
+msgid "Sorry, this wiki doesn't allow anonymous edits. Please configure a username in options first."
+msgstr "Tämä wiki ei salli kirjautumattomia muokkauksia. Valitse käyttäjänimi valikosta ensin."
 
 #: src/ZWiki/Editing.py:327
 #, fuzzy
-msgid ""
-"You are not authorized to reparent or change subtopics links on this ZWiki "
-"Page."
+msgid "You are not authorized to reparent or change subtopics links on this ZWiki Page."
 msgstr "Sinulla ei ole valtuutta list linkki tlle ZWiki-sivulle."
 
 #: src/ZWiki/Editing.py:349
@@ -54,9 +48,9 @@
 msgstr "Sinulla ei ole valtuutta muuttaa tämän ZWiki-sivun tyyppiä."
 
 #: src/ZWiki/Editing.py:383 src/ZWiki/Editing.py:410
-#: src/ZWiki/plugins/tracker/tracker.py:340
-#: src/ZWiki/plugins/tracker/tracker.py:347
-#: src/ZWiki/plugins/tracker/tracker.py:354
+#: src/ZWiki/plugins/tracker/tracker.py:344
+#: src/ZWiki/plugins/tracker/tracker.py:351
+#: src/ZWiki/plugins/tracker/tracker.py:358
 #, fuzzy
 msgid "You are not authorized to edit this ZWiki Page."
 msgstr "Sinulla ei ole valtuutta muokata tätä ZWiki-sivua."
@@ -67,10 +61,8 @@
 
 #: src/ZWiki/Editing.py:563
 #, fuzzy
-msgid ""
-"This page was renamed to %s. You can delete this one if no longer needed.\n"
-msgstr ""
-"Tämä sivu on uudelleennimetty %s. Voit tuhota sivun jos sitä ei tarvita.\n"
+msgid "This page was renamed to %s. You can delete this one if no longer needed.\n"
+msgstr "Tämä sivu on uudelleennimetty %s. Voit tuhota sivun jos sitä ei tarvita.\n"
 
 #: src/ZWiki/Editing.py:659
 msgid "You are not authorized to upload files here."
@@ -90,9 +82,7 @@
 msgstr ""
 
 #: src/ZWiki/Editing.py:830
-msgid ""
-"your edit contained a banned link pattern. Please contact the site "
-"administrator for help."
+msgid "your edit contained a banned link pattern. Please contact the site administrator for help."
 msgstr ""
 
 #: src/ZWiki/Editing.py:841
@@ -100,10 +90,7 @@
 msgstr ""
 
 #: src/ZWiki/Editing.py:842
-msgid ""
-"adding of external links by unidentified users is restricted. Please back up "
-"and remove some of the http urls you added, or contact the site "
-"administrator for help."
+msgid "adding of external links by unidentified users is restricted. Please back up and remove some of the http urls you added, or contact the site administrator for help."
 msgstr ""
 
 #: src/ZWiki/Editing.py:853
@@ -111,86 +98,88 @@
 msgstr ""
 
 #: src/ZWiki/Editing.py:854
-msgid ""
-"adding of external links is restricted, even for identified users. Please "
-"back up and remove some of the http urls you added, or contact the site "
-"administrator for help."
+msgid "adding of external links is restricted, even for identified users. Please back up and remove some of the http urls you added, or contact the site administrator for help."
 msgstr ""
 
-#: src/ZWiki/Mail.py:506 src/ZWiki/skins/dtmlmessages.pt:58
+#: src/ZWiki/Mail.py:506 src/ZWiki/skins/dtmlmessages.pt:60
 msgid "anonymous"
 msgstr ""
 
-#: src/ZWiki/OutlineSupport.py:843 src/ZWiki/skins/zwiki/links.pt:56
+#: src/ZWiki/OutlineSupport.py:378
+#, fuzzy
+msgid "Sorry, this wiki doesn't allow anonymous reparenting. Please configure a username in options first."
+msgstr "Tämä wiki ei salli kirjautumattomia muokkauksia. Valitse käyttäjänimi valikosta ensin."
+
+#: src/ZWiki/OutlineSupport.py:878 src/ZWiki/skins/zwiki/links.pt:56
 msgid "which pages link to this one ?"
 msgstr ""
 
-#: src/ZWiki/OutlineSupport.py:851
+#: src/ZWiki/OutlineSupport.py:886
 msgid "You are here"
 msgstr ""
 
-#: src/ZWiki/Utils.py:465
+#: src/ZWiki/Utils.py:487
 msgid "years"
 msgstr ""
 
-#: src/ZWiki/Utils.py:465
+#: src/ZWiki/Utils.py:487
 msgid "year"
 msgstr ""
 
-#: src/ZWiki/Utils.py:467
+#: src/ZWiki/Utils.py:489
 msgid "month"
 msgstr ""
 
-#: src/ZWiki/Utils.py:467
+#: src/ZWiki/Utils.py:489
 msgid "months"
 msgstr ""
 
-#: src/ZWiki/Utils.py:469
+#: src/ZWiki/Utils.py:491
 msgid "weeks"
 msgstr ""
 
-#: src/ZWiki/Utils.py:469
+#: src/ZWiki/Utils.py:491
 msgid "week"
 msgstr ""
 
-#: src/ZWiki/Utils.py:471
+#: src/ZWiki/Utils.py:493
 msgid "day"
 msgstr ""
 
-#: src/ZWiki/Utils.py:471
+#: src/ZWiki/Utils.py:493
 msgid "days"
 msgstr ""
 
-#: src/ZWiki/Utils.py:473
+#: src/ZWiki/Utils.py:495
 msgid "hours"
 msgstr ""
 
-#: src/ZWiki/Utils.py:473
+#: src/ZWiki/Utils.py:495
 #, fuzzy
 msgid "hour"
 msgstr "tai"
 
-#: src/ZWiki/Utils.py:475
+#: src/ZWiki/Utils.py:497
 msgid "minute"
 msgstr ""
 
-#: src/ZWiki/Utils.py:475
+#: src/ZWiki/Utils.py:497
 msgid "minutes"
 msgstr ""
 
-#: src/ZWiki/Utils.py:477
+#: src/ZWiki/Utils.py:499
 msgid "second"
 msgstr ""
 
-#: src/ZWiki/Utils.py:477
+#: src/ZWiki/Utils.py:499
 msgid "seconds"
 msgstr ""
 
-#: src/ZWiki/Views.py:346
+#: src/ZWiki/Views.py:350
 msgid "Page is locked"
 msgstr "Sivu on lukittu"
 
-#: src/ZWiki/Views.py:357
+#: src/ZWiki/Views.py:361
 #, fuzzy
 msgid ""
 "\n"
@@ -208,60 +197,58 @@
 "haluat ehk menn takaisin ja kopioida oman tekstisi talteen.\n"
 "            "
 
-#: src/ZWiki/Views.py:364
+#: src/ZWiki/Views.py:368
 msgid "To discard your changes and try again, click OK."
 msgstr "Jos haluat hylt muutoksesi ja yritt uudelleen, npyt OK."
 
-#: src/ZWiki/Views.py:393
+#: src/ZWiki/Views.py:397
 msgid "Edit conflict"
 msgstr "Muokkaustrmys"
 
-#: src/ZWiki/Views.py:413
+#: src/ZWiki/Views.py:417
 msgid "Someone else has saved this page while you were editing"
 msgstr "Joku muu on tallentanut sivun sill vlin kun muokkasit sivua"
 
-#: src/ZWiki/Views.py:414
+#: src/ZWiki/Views.py:418
 msgid "To resolve the conflict, do this"
 msgstr "Trmyksen ratkaisemiseksi tee nin"
 
-#: src/ZWiki/Views.py:415
+#: src/ZWiki/Views.py:419
 msgid "Click your browser's back button"
 msgstr "Npyt selaimesi takaisin- tai back-nappi"
 
-#: src/ZWiki/Views.py:416
+#: src/ZWiki/Views.py:420
 msgid "Copy your recent edits to the clipboard"
 msgstr "Kopioi muutoksesi leikepydlle"
 
-#: src/ZWiki/Views.py:417
+#: src/ZWiki/Views.py:421
 msgid "Click your browser's refresh button"
 msgstr "Npyt selaimesi virkistysnappia (refresh)"
 
-#: src/ZWiki/Views.py:418
+#: src/ZWiki/Views.py:422
 msgid "Paste in your edits again, being mindful of the latest changes"
 msgstr "Kopioi muutoksesi leikepydlt huomioiden tuoreet muutokset"
 
-#: src/ZWiki/Views.py:419
+#: src/ZWiki/Views.py:423
 msgid "Click the Change button again"
 msgstr "Npyt uudelleen Muuta -nappia"
 
-#: src/ZWiki/Views.py:420 src/ZWiki/skins/zwiki/editform.pt:163
+#: src/ZWiki/Views.py:424 src/ZWiki/skins/zwiki/editform.pt:163
 msgid "or"
 msgstr "tai"
 
-#: src/ZWiki/Views.py:421
+#: src/ZWiki/Views.py:425
 msgid "To discard your changes and start again, click OK"
 msgstr "Jos haluat hylt muutoksesi ja aloittaa alusta, npyt OK"
 
-#: src/ZWiki/Views.py:490
+#: src/ZWiki/Views.py:501
 msgid ""
 "\n"
-"        Access keys can be accessed in mozilla-based browsers by pressing "
-"alt-<key>\n"
+"        Access keys can be accessed in mozilla-based browsers by pressing alt-<key>\n"
 "        IE users: must also press enter\n"
 "        Mac users: command-<key>\n"
 "        Opera users: shift-escape-<key>\n"
-"        These won't work here, back up to the previous page to try them "
-"out.\n"
+"        These won't work here, back up to the previous page to try them out.\n"
 "\n"
 "        0    show these access key assignments\n"
 "\n"
@@ -277,10 +264,8 @@
 "        s    go to search field\n"
 "        \n"
 "        page functions:\n"
-"        +    (in a plone/cmf site with skin switching set up) use zwiki's "
-"plone/cmf skin\n"
-"        -    (in a plone/cmf site with skin switching set up) use zwiki's "
-"standard skin\n"
+"        +    (in a plone/cmf site with skin switching set up) use zwiki's plone/cmf skin\n"
+"        -    (in a plone/cmf site with skin switching set up) use zwiki's standard skin\n"
 "        v    view page\n"
 "        m    mail subscription\n"
 "        b    show backlinks (links to this page)\n"
@@ -308,32 +293,31 @@
 "        "
 msgstr ""
 
-#: src/ZWiki/Wikis.py:49
-msgid "Unknown wiki type"
-msgstr ""
-
-#: src/ZWiki/ZWikiPage.py:675
+#: src/ZWiki/ZWikiPage.py:744
 msgid "create this page"
 msgstr ""
 
-#: src/ZWiki/ZWikiPage.py:798 src/ZWiki/ZWikiPage.py:814
-#: src/ZWiki/ZWikiPage.py:817
+#: src/ZWiki/ZWikiPage.py:872 src/ZWiki/ZWikiPage.py:887
 msgid "last edited %(interval)s ago"
 msgstr ""
 
-#: src/ZWiki/ZWikiPage.py:809
+#: src/ZWiki/ZWikiPage.py:882
 msgid "show last edit"
 msgstr ""
 
-#: src/ZWiki/ZWikiPage.py:826 src/ZWiki/ZWikiPage.py:828
+#: src/ZWiki/ZWikiPage.py:897 src/ZWiki/ZWikiPage.py:899
 msgid "by %(editor)s"
 msgstr ""
 
-#: src/ZWiki/__init__.py:34
+#: src/ZWiki/__init__.py:200
+msgid "Unknown wiki type"
+msgstr ""
+
+#: src/ZWiki/__init__.py:39
 msgid "No need to add a Zwiki Outline Cache"
 msgstr ""
 
-#: src/ZWiki/__init__.py:35
+#: src/ZWiki/__init__.py:40
 msgid ""
 "Zwiki Outline Cache appears in the ZMI Add menu\n"
 "        for implementation reasons, but should not be added directly.\n"
@@ -345,6 +329,10 @@
 msgid "comments"
 msgstr ""
 
+#: src/ZWiki/pagetypes/html.py:50 src/ZWiki/pagetypes/rst.py:85
+msgid "reply"
+msgstr ""
+
 #: src/ZWiki/pagetypes/moin.py:1990
 msgid "Expected \"=\" to follow \"%(token)s\""
 msgstr ""
@@ -381,10 +369,6 @@
 msgid "Expected a color value \"%(arg)s\" after \"%(key)s\""
 msgstr ""
 
-#: src/ZWiki/pagetypes/rst.py:85
-msgid "reply"
-msgstr ""
-
 #: src/ZWiki/plugins/latexwiki/wikis/latexwiki/diffform.pt:127
 #: src/ZWiki/plugins/mathaction/wikis/mathaction/old-diffform.pt:127
 msgid "full history"
@@ -461,7 +445,7 @@
 msgstr "Otsikko"
 
 #: src/ZWiki/plugins/tracker/filterissues.pt:12
-#: src/ZWiki/skins/dtmlmessages.pt:30
+#: src/ZWiki/skins/dtmlmessages.pt:31
 msgid "Filter issues"
 msgstr ""
 
@@ -473,112 +457,108 @@
 msgid "Issue tracker"
 msgstr ""
 
-#: src/ZWiki/plugins/tracker/tracker.py:361
+#: src/ZWiki/plugins/tracker/tracker.py:365
 #, fuzzy
 msgid "You are not authorized to comment on this ZWiki Page."
 msgstr "Sinulla ei ole valtuutta muokata tätä ZWiki-sivua."
 
-#: src/ZWiki/skins/dtmlmessages.pt:10 src/ZWiki/skins/dtmlmessages.pt:32
+#: src/ZWiki/skins/dtmlmessages.pt:10 src/ZWiki/skins/dtmlmessages.pt:33
+#, fuzzy
+msgid "name"
+msgstr "Luo wiki"
+
+#: src/ZWiki/skins/dtmlmessages.pt:11 src/ZWiki/skins/dtmlmessages.pt:34
 msgid "category"
 msgstr ""
 
-#: src/ZWiki/skins/dtmlmessages.pt:11 src/ZWiki/skins/dtmlmessages.pt:33
+#: src/ZWiki/skins/dtmlmessages.pt:12 src/ZWiki/skins/dtmlmessages.pt:35
 msgid "severity"
 msgstr ""
 
-#: src/ZWiki/skins/dtmlmessages.pt:12 src/ZWiki/skins/dtmlmessages.pt:34
+#: src/ZWiki/skins/dtmlmessages.pt:13 src/ZWiki/skins/dtmlmessages.pt:36
 msgid "status"
 msgstr ""
 
-#: src/ZWiki/skins/dtmlmessages.pt:13 src/ZWiki/skins/dtmlmessages.pt:35
+#: src/ZWiki/skins/dtmlmessages.pt:14 src/ZWiki/skins/dtmlmessages.pt:37
 msgid "age"
 msgstr ""
 
-#: src/ZWiki/skins/dtmlmessages.pt:14 src/ZWiki/skins/dtmlmessages.pt:36
+#: src/ZWiki/skins/dtmlmessages.pt:15 src/ZWiki/skins/dtmlmessages.pt:38
 msgid "modified"
 msgstr ""
 
-#: src/ZWiki/skins/dtmlmessages.pt:15
+#: src/ZWiki/skins/dtmlmessages.pt:16
 msgid "Add a new issue:"
 msgstr ""
 
-#: src/ZWiki/skins/dtmlmessages.pt:16
+#: src/ZWiki/skins/dtmlmessages.pt:17
 msgid "Name:"
 msgstr ""
 
-#: src/ZWiki/skins/dtmlmessages.pt:17
+#: src/ZWiki/skins/dtmlmessages.pt:18
 msgid "Category:"
 msgstr ""
 
-#: src/ZWiki/skins/dtmlmessages.pt:18
+#: src/ZWiki/skins/dtmlmessages.pt:19
 msgid "Severity:"
 msgstr ""
 
-#: src/ZWiki/skins/dtmlmessages.pt:19
-msgid "Status:"
-msgstr ""
-
 #: src/ZWiki/skins/dtmlmessages.pt:2
 #, fuzzy
 msgid "Here are the wiki's issue pages."
 msgstr "Luo wiki"
 
 #: src/ZWiki/skins/dtmlmessages.pt:20
-msgid "Details:"
+msgid "Status:"
 msgstr ""
 
 #: src/ZWiki/skins/dtmlmessages.pt:21
-msgid "add issue"
+msgid "Details:"
 msgstr ""
 
 #: src/ZWiki/skins/dtmlmessages.pt:22
-msgid "More advanced"
+msgid "add issue"
 msgstr ""
 
 #: src/ZWiki/skins/dtmlmessages.pt:23
-msgid "issue tracker"
+msgid "More advanced"
 msgstr ""
 
 #: src/ZWiki/skins/dtmlmessages.pt:24
+msgid "issue tracker"
+msgstr ""
+
+#: src/ZWiki/skins/dtmlmessages.pt:25
 #, fuzzy
 msgid "search options"
 msgstr "Luo wiki"
 
-#: src/ZWiki/skins/dtmlmessages.pt:25
+#: src/ZWiki/skins/dtmlmessages.pt:26
 msgid "Name contains any of:"
 msgstr ""
 
-#: src/ZWiki/skins/dtmlmessages.pt:26
+#: src/ZWiki/skins/dtmlmessages.pt:27
 msgid "Page text contains any of:"
 msgstr ""
 
-#: src/ZWiki/skins/dtmlmessages.pt:27
+#: src/ZWiki/skins/dtmlmessages.pt:28
 msgid "Categories:"
 msgstr ""
 
-#: src/ZWiki/skins/dtmlmessages.pt:28
+#: src/ZWiki/skins/dtmlmessages.pt:29
 msgid "Severities:"
 msgstr ""
 
-#: src/ZWiki/skins/dtmlmessages.pt:29
-msgid "Statuses:"
-msgstr ""
-
 #: src/ZWiki/skins/dtmlmessages.pt:3
 msgid "Enter a search term, click the numbers to the right,"
 msgstr ""
 
-#: src/ZWiki/skins/dtmlmessages.pt:37
-msgid "Submitted by"
+#: src/ZWiki/skins/dtmlmessages.pt:30
+msgid "Statuses:"
 msgstr ""
 
-#: src/ZWiki/skins/dtmlmessages.pt:38
-#, fuzzy
-msgid "Name"
-msgstr "Luo wiki"
-
 #: src/ZWiki/skins/dtmlmessages.pt:39
-msgid "Category"
+msgid "Submitted by"
 msgstr ""
 
 #: src/ZWiki/skins/dtmlmessages.pt:4
@@ -586,126 +566,125 @@
 msgstr ""
 
 #: src/ZWiki/skins/dtmlmessages.pt:40
+#, fuzzy
+msgid "Name"
+msgstr "Luo wiki"
+
+#: src/ZWiki/skins/dtmlmessages.pt:41
+msgid "Category"
+msgstr ""
+
+#: src/ZWiki/skins/dtmlmessages.pt:42
 msgid "Severity"
 msgstr ""
 
-#: src/ZWiki/skins/dtmlmessages.pt:41
+#: src/ZWiki/skins/dtmlmessages.pt:43
 msgid "Status"
 msgstr ""
 
-#: src/ZWiki/skins/dtmlmessages.pt:42
+#: src/ZWiki/skins/dtmlmessages.pt:44
 msgid "Optional subject"
 msgstr ""
 
-#: src/ZWiki/skins/dtmlmessages.pt:43
+#: src/ZWiki/skins/dtmlmessages.pt:45
 msgid "Optional comment"
 msgstr ""
 
-#: src/ZWiki/skins/dtmlmessages.pt:44 src/ZWiki/skins/dtmlmessages.pt:45
+#: src/ZWiki/skins/dtmlmessages.pt:46 src/ZWiki/skins/dtmlmessages.pt:47
 #, fuzzy
 msgid "Add ZWiki"
 msgstr "Lis ZWiki-sivu"
 
-#: src/ZWiki/skins/dtmlmessages.pt:46
+#: src/ZWiki/skins/dtmlmessages.pt:48
 #, fuzzy
 msgid "Id:"
 msgstr "Tunniste"
 
-#: src/ZWiki/skins/dtmlmessages.pt:47
+#: src/ZWiki/skins/dtmlmessages.pt:49
 #, fuzzy
 msgid "Title:"
 msgstr "Otsikko"
 
-#: src/ZWiki/skins/dtmlmessages.pt:48
+#: src/ZWiki/skins/dtmlmessages.pt:5
+msgid "browse open issues"
+msgstr ""
+
+#: src/ZWiki/skins/dtmlmessages.pt:50
 msgid "Template:"
 msgstr ""
 
-#: src/ZWiki/skins/dtmlmessages.pt:49
+#: src/ZWiki/skins/dtmlmessages.pt:51
 #, fuzzy
 msgid "Add wiki"
 msgstr "Lis ZWiki-sivu"
 
-#: src/ZWiki/skins/dtmlmessages.pt:5
-msgid "browse open issues"
-msgstr ""
-
-#: src/ZWiki/skins/dtmlmessages.pt:50
+#: src/ZWiki/skins/dtmlmessages.pt:52
 msgid "Pages changed in the last"
 msgstr ""
 
-#: src/ZWiki/skins/dtmlmessages.pt:51
+#: src/ZWiki/skins/dtmlmessages.pt:53
 msgid "Recently changed pages, with summaries"
 msgstr ""
 
-#: src/ZWiki/skins/dtmlmessages.pt:52
+#: src/ZWiki/skins/dtmlmessages.pt:54
 msgid "Show summaries ?"
 msgstr ""
 
-#: src/ZWiki/skins/dtmlmessages.pt:53
+#: src/ZWiki/skins/dtmlmessages.pt:55
 msgid "Refresh"
 msgstr ""
 
-#: src/ZWiki/skins/dtmlmessages.pt:54
+#: src/ZWiki/skins/dtmlmessages.pt:56
 msgid "Page"
 msgstr ""
 
-#: src/ZWiki/skins/dtmlmessages.pt:55
+#: src/ZWiki/skins/dtmlmessages.pt:57
 msgid "Edited&nbsp;by"
 msgstr ""
 
-#: src/ZWiki/skins/dtmlmessages.pt:56
+#: src/ZWiki/skins/dtmlmessages.pt:58
 #, fuzzy
 msgid "Time"
 msgstr "Otsikko"
 
-#: src/ZWiki/skins/dtmlmessages.pt:57
+#: src/ZWiki/skins/dtmlmessages.pt:59
 msgid "NEW"
 msgstr ""
 
-#: src/ZWiki/skins/dtmlmessages.pt:59
-msgid "Pages marked (NEW) have been created within the last week"
-msgstr ""
-
 #: src/ZWiki/skins/dtmlmessages.pt:6
 msgid "search issues"
 msgstr ""
 
-#: src/ZWiki/skins/dtmlmessages.pt:60
-msgid "Enter a word or phrase and hit enter to search the entire wiki."
-msgstr ""
-
 #: src/ZWiki/skins/dtmlmessages.pt:61
-msgid "This is the same as using the search field at top right."
+msgid "Pages marked (NEW) have been created within the last week"
 msgstr ""
 
 #: src/ZWiki/skins/dtmlmessages.pt:62
-msgid "Tips: A single word works best for matching page names."
+msgid "Enter a word or phrase and hit enter to search the entire wiki."
 msgstr ""
 
 #: src/ZWiki/skins/dtmlmessages.pt:63
-msgid ""
-"Case-insensitivity and wildcards may be supported depending on your catalog "
-"configuration."
+msgid "This is the same as using the search field at top right."
 msgstr ""
 
 #: src/ZWiki/skins/dtmlmessages.pt:64
-msgid "Leave it blank to list all pages."
+msgid "Tips: A single word works best for matching page names."
 msgstr ""
 
-#: src/ZWiki/skins/dtmlmessages.pt:65 src/ZWiki/skins/dtmlmessages.pt:66
-msgid "Search"
+#: src/ZWiki/skins/dtmlmessages.pt:65
+msgid "Case-insensitivity and wildcards may be supported depending on your catalog configuration."
 msgstr ""
 
-#: src/ZWiki/skins/dtmlmessages.pt:67
-msgid "Page names matching"
+#: src/ZWiki/skins/dtmlmessages.pt:66
+msgid "Leave it blank to list all pages."
 msgstr ""
 
-#: src/ZWiki/skins/dtmlmessages.pt:68
-msgid "Text matching"
+#: src/ZWiki/skins/dtmlmessages.pt:67 src/ZWiki/skins/dtmlmessages.pt:68
+msgid "Search"
 msgstr ""
 
 #: src/ZWiki/skins/dtmlmessages.pt:69
-msgid "Thorough (non-catalog) search for text matching"
+msgid "Page names matching"
 msgstr ""
 
 #: src/ZWiki/skins/dtmlmessages.pt:7
@@ -713,43 +692,43 @@
 msgstr ""
 
 #: src/ZWiki/skins/dtmlmessages.pt:70
-msgid "Set your preferences for this wiki:"
+msgid "Text matching"
 msgstr ""
 
 #: src/ZWiki/skins/dtmlmessages.pt:71
-msgid "User name:"
+msgid "Thorough (non-catalog) search for text matching"
 msgstr ""
 
 #: src/ZWiki/skins/dtmlmessages.pt:72
-msgid "(identifies your edits)"
+msgid "Set your preferences for this wiki:"
 msgstr ""
 
 #: src/ZWiki/skins/dtmlmessages.pt:73
-msgid "Email address:"
+msgid "User name:"
 msgstr ""
 
 #: src/ZWiki/skins/dtmlmessages.pt:74
-msgid "(allows mail subscription)"
+msgid "(identifies your edits, saves your votes, may be required)"
 msgstr ""
 
 #: src/ZWiki/skins/dtmlmessages.pt:75
-msgid "Your time zone:"
+msgid "Email address:"
 msgstr ""
 
 #: src/ZWiki/skins/dtmlmessages.pt:76
-msgid "(localizes most times)"
+msgid "(allows mail subscription)"
 msgstr ""
 
 #: src/ZWiki/skins/dtmlmessages.pt:77
-msgid "Edit form height:"
+msgid "Your time zone:"
 msgstr ""
 
 #: src/ZWiki/skins/dtmlmessages.pt:78
-msgid "(adjusts form size)"
+msgid "(localizes most times)"
 msgstr ""
 
 #: src/ZWiki/skins/dtmlmessages.pt:79
-msgid "Save options"
+msgid "Edit form height:"
 msgstr ""
 
 #: src/ZWiki/skins/dtmlmessages.pt:8
@@ -757,74 +736,73 @@
 msgstr ""
 
 #: src/ZWiki/skins/dtmlmessages.pt:80
+msgid "(adjusts form size)"
+msgstr ""
+
+#: src/ZWiki/skins/dtmlmessages.pt:81
+msgid "Save options"
+msgstr ""
+
+#: src/ZWiki/skins/dtmlmessages.pt:82
 msgid "Forget options"
 msgstr ""
 
-#: src/ZWiki/skins/dtmlmessages.pt:81 src/ZWiki/skins/dtmlmessages.pt:82
+#: src/ZWiki/skins/dtmlmessages.pt:83 src/ZWiki/skins/dtmlmessages.pt:84
 msgid "Add ZWiki Page"
 msgstr "Lis ZWiki-sivu"
 
-#: src/ZWiki/skins/dtmlmessages.pt:83
+#: src/ZWiki/skins/dtmlmessages.pt:85
 msgid "Page&nbsp;name:"
 msgstr ""
 
-#: src/ZWiki/skins/dtmlmessages.pt:84
+#: src/ZWiki/skins/dtmlmessages.pt:86
 #, fuzzy
 msgid "Add wiki page"
 msgstr "Lis ZWiki-sivu"
 
-#: src/ZWiki/skins/dtmlmessages.pt:85
+#: src/ZWiki/skins/dtmlmessages.pt:87
 msgid "Topic"
 msgstr ""
 
-#: src/ZWiki/skins/dtmlmessages.pt:86
+#: src/ZWiki/skins/dtmlmessages.pt:88
 msgid "Last updated"
 msgstr ""
 
-#: src/ZWiki/skins/dtmlmessages.pt:87
+#: src/ZWiki/skins/dtmlmessages.pt:89
 msgid "Comments"
 msgstr ""
 
-#: src/ZWiki/skins/dtmlmessages.pt:88
+#: src/ZWiki/skins/dtmlmessages.pt:9 src/ZWiki/skins/dtmlmessages.pt:32
+msgid "#"
+msgstr ""
+
+#: src/ZWiki/skins/dtmlmessages.pt:90
 msgid "Views"
 msgstr ""
 
-#: src/ZWiki/skins/dtmlmessages.pt:89
+#: src/ZWiki/skins/dtmlmessages.pt:91
 #, fuzzy
 msgid "Created"
 msgstr "Luo wiki"
 
-#: src/ZWiki/skins/dtmlmessages.pt:9 src/ZWiki/skins/dtmlmessages.pt:31
-msgid "#"
-msgstr ""
-
-#: src/ZWiki/skins/dtmlmessages.pt:90 src/ZWiki/skins/dtmlmessages.pt:92
+#: src/ZWiki/skins/dtmlmessages.pt:92 src/ZWiki/skins/dtmlmessages.pt:94
 msgid "by"
 msgstr ""
 
-#: src/ZWiki/skins/dtmlmessages.pt:91
+#: src/ZWiki/skins/dtmlmessages.pt:93
 msgid "<dtml-var lasteditinterval> ago</dtml-var>"
 msgstr ""
 
-#: src/ZWiki/skins/dtmlmessages.pt:93
+#: src/ZWiki/skins/dtmlmessages.pt:95
 msgid "on"
 msgstr ""
 
-#: src/ZWiki/skins/zwiki/backlinks.pt:108
-msgid "Subtopics"
-msgstr ""
-
-#: src/ZWiki/skins/zwiki/backlinks.pt:111
+#: src/ZWiki/skins/zwiki/backlinks.pt:102
 #, fuzzy
-msgid "This page has no subtopics."
-msgstr "Sivun uusi nimi on %s."
-
-#: src/ZWiki/skins/zwiki/backlinks.pt:114
-#, fuzzy
 msgid "Here are it's subtopics."
 msgstr "Luo wiki"
 
-#: src/ZWiki/skins/zwiki/backlinks.pt:117
+#: src/ZWiki/skins/zwiki/backlinks.pt:105
 msgid "You can reorder them by clicking the ^ buttons."
 msgstr ""
 
@@ -836,60 +814,61 @@
 msgid "Parents"
 msgstr ""
 
-#: src/ZWiki/skins/zwiki/backlinks.pt:31
+#: src/ZWiki/skins/zwiki/backlinks.pt:28
 msgid "is a top-level topic."
 msgstr ""
 
-#: src/ZWiki/skins/zwiki/backlinks.pt:32
+#: src/ZWiki/skins/zwiki/backlinks.pt:29
 msgid "is a subtopic of:"
 msgstr ""
 
-#: src/ZWiki/skins/zwiki/backlinks.pt:55
+#: src/ZWiki/skins/zwiki/backlinks.pt:48
 msgid "Backlinks"
 msgstr ""
 
-#: src/ZWiki/skins/zwiki/backlinks.pt:56
+#: src/ZWiki/skins/zwiki/backlinks.pt:49
 msgid "Here are the pages which link to it:"
 msgstr ""
 
-#: src/ZWiki/skins/zwiki/backlinks.pt:57
+#: src/ZWiki/skins/zwiki/backlinks.pt:50
 msgid "No other pages link to this one."
 msgstr ""
 
-#: src/ZWiki/skins/zwiki/backlinks.pt:82
-msgid ""
-"You can set this page's parent(s) to place it within the overall page "
-"hierarchy."
+#: src/ZWiki/skins/zwiki/backlinks.pt:70
+msgid "You can set this page's parent(s) to place it within the overall page hierarchy."
 msgstr ""
 
-#: src/ZWiki/skins/zwiki/backlinks.pt:85
-msgid ""
-"Check one or more checkboxes or enter a page name here, and click the button."
+#: src/ZWiki/skins/zwiki/backlinks.pt:73
+msgid "Check one or more checkboxes or enter a page name here, and click the button."
 msgstr ""
 
-#: src/ZWiki/skins/zwiki/backlinks.pt:88
+#: src/ZWiki/skins/zwiki/backlinks.pt:76
 msgid "Enter a page name here and click the button."
 msgstr ""
 
-#: src/ZWiki/skins/zwiki/backlinks.pt:91
-msgid ""
-"You can type just the first few letters, case and punctuation are ignored."
+#: src/ZWiki/skins/zwiki/backlinks.pt:79
+msgid "You can type just the first few letters, case and punctuation are ignored."
 msgstr ""
 
-#: src/ZWiki/skins/zwiki/backlinks.pt:98
+#: src/ZWiki/skins/zwiki/backlinks.pt:86
 msgid "Reparent"
 msgstr ""
 
+#: src/ZWiki/skins/zwiki/backlinks.pt:96
+msgid "Subtopics"
+msgstr ""
+
+#: src/ZWiki/skins/zwiki/backlinks.pt:99
+#, fuzzy
+msgid "This page has no subtopics."
+msgstr "Sivun uusi nimi on %s."
+
 #: src/ZWiki/skins/zwiki/badtemplate.pt:12
 msgid "Bad template"
 msgstr ""
 
 #: src/ZWiki/skins/zwiki/badtemplate.pt:13
-msgid ""
-"There was a problem locating one of this wiki's skin templates. There may be "
-"a page or other non-page-template/non-dtml-method object with the same ID, "
-"obscuring the template. Or the template may be missing on the filesystem (an "
-"incomplete Zwiki installation)."
+msgid "There was a problem locating one of this wiki's skin templates. There may be a page or other non-page-template/non-dtml-method object with the same ID, obscuring the template. Or the template may be missing on the filesystem (an incomplete Zwiki installation)."
 msgstr ""
 
 #: src/ZWiki/skins/zwiki/commentform.pt:21
@@ -921,12 +900,18 @@
 msgid "add-comment"
 msgstr ""
 
-#: src/ZWiki/skins/zwiki/contentspage.pt:12
+#: src/ZWiki/skins/zwiki/contentspage.pt:10
+#: src/ZWiki/skins/zwiki/contentspage.pt:27
+msgid "Wiki contents for"
+msgstr ""
+
+#: src/ZWiki/skins/zwiki/contentspage.pt:13
+#: src/ZWiki/skins/zwiki/contentspage.pt:30
 msgid "Wiki contents"
 msgstr ""
 
-#: src/ZWiki/skins/zwiki/contentspage.pt:16
-msgid "Singletons"
+#: src/ZWiki/skins/zwiki/contentspage.pt:40
+msgid "Singletons:"
 msgstr ""
 
 #: src/ZWiki/skins/zwiki/denied.pt:12
@@ -1009,11 +994,11 @@
 msgstr ""
 
 #: src/ZWiki/skins/zwiki/editform.pt:178
-msgid "preview this edit"
+msgid "Preview"
 msgstr ""
 
 #: src/ZWiki/skins/zwiki/editform.pt:178
-msgid "Preview"
+msgid "preview this edit"
 msgstr ""
 
 #: src/ZWiki/skins/zwiki/editform.pt:183
@@ -1052,14 +1037,17 @@
 msgstr ""
 
 #: src/ZWiki/skins/zwiki/editform.pt:71
-#, fuzzy
-msgid "type"
-msgstr "Tyyppi"
+msgid "markup"
+msgstr ""
 
 #: src/ZWiki/skins/zwiki/editform.pt:72
 msgid "select the formatting and rendering style for this page"
 msgstr ""
 
+#: src/ZWiki/skins/zwiki/helppage.pt:12
+msgid "Help page"
+msgstr ""
+
 #: src/ZWiki/skins/zwiki/links.pt:102
 msgid "(external edit)"
 msgstr ""
@@ -1197,11 +1185,11 @@
 msgstr ""
 
 #: src/ZWiki/skins/zwiki/pagemanagementform.pt:45
-msgid "reparent"
+msgid "make this page a subtopic of the page you have entered"
 msgstr ""
 
 #: src/ZWiki/skins/zwiki/pagemanagementform.pt:45
-msgid "make this page a subtopic of the page you have entered"
+msgid "reparent"
 msgstr ""
 
 #: src/ZWiki/skins/zwiki/pagemanagementform.pt:50
@@ -1218,8 +1206,7 @@
 msgstr ""
 
 #: src/ZWiki/skins/zwiki/pagemanagementform.pt:55
-msgid ""
-"delete this page, and redirect links to the page you have entered, if any"
+msgid "delete this page, and redirect links to the page you have entered, if any"
 msgstr ""
 
 #: src/ZWiki/skins/zwiki/pagemanagementform.pt:60
@@ -1346,6 +1333,10 @@
 msgid "User options"
 msgstr "Luo wiki"
 
+#, fuzzy
+#~ msgid "type"
+#~ msgstr "Tyyppi"
+
 #~ msgid "Add a ZWiki web"
 #~ msgstr "Lis ZWiki-sivusto"
 
@@ -1360,10 +1351,7 @@
 #~ msgstr "(ja paina enter)"
 
 #, fuzzy
-#~ msgid ""
-#~ "You may create a new ZWiki Page object using the form below. You may also "
-#~ "choose to upload an existing html file from your local computer by "
-#~ "clicking the <i>Browse</i> button."
+#~ msgid "You may create a new ZWiki Page object using the form below. You may also choose to upload an existing html file from your local computer by clicking the <i>Browse</i> button."
 #~ msgstr ""
 #~ "Voit luoda uuden ZWiki-sivun allaolevalla lomakkeella.  Voit mys \n"
 #~ "list uuden html-tiedoston omalta koneeltasi \n"

Modified: zope-zwiki/trunk/i18n/fr.po
===================================================================
--- zope-zwiki/trunk/i18n/fr.po	2007-04-08 14:54:05 UTC (rev 761)
+++ zope-zwiki/trunk/i18n/fr.po	2007-04-08 14:55:27 UTC (rev 762)
@@ -3,9 +3,9 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: zwiki-fr\n"
-"POT-Creation-Date: Sat Sep  2 18:10:16 2006\n"
-"PO-Revision-Date: 2006-02-26 09:02+0000\n"
-"Last-Translator: Encolpe Degoute <encolpe at colpi.info>\n"
+"POT-Creation-Date: Tue Mar 27 14:50:46 2007\n"
+"PO-Revision-Date: 2006-10-07 19:02+0000\n"
+"Last-Translator: Nicolas Velin <nsv at fr.st>\n"
 "Language-Team: French <support at ingeniweb.com>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -17,47 +17,41 @@
 "Domain: zwiki\n"
 "X-Generator: KBabel 1.10.2\n"
 
-#: src/ZWiki/Admin.py:62
+#: src/ZWiki/Admin.py:58
 msgid "You are not authorized to upgrade all pages."
 msgstr "Vous n'êtes pas autorisé à mettre à niveau l'ensemble des pages."
 
-#: src/ZWiki/Admin.py:63
+#: src/ZWiki/Admin.py:59
 msgid "(folder -> Manage properties)"
 msgstr "(dossier -> Gérer les propriétés)"
 
-#: src/ZWiki/Diff.py:174
+#: src/ZWiki/Diff.py:179
 #, fuzzy
 msgid "You are not authorized to reparent this ZWiki Page."
 msgstr "Vous n'êtes pas autorisé à supprimer cette page ZWiki."
 
-#: src/ZWiki/Diff.py:180 src/ZWiki/plugins/tracker/tracker.py:332
+#: src/ZWiki/Diff.py:185 src/ZWiki/plugins/tracker/tracker.py:333
 #, fuzzy
 msgid "You are not authorized to rename this ZWiki Page."
 msgstr "Vous n'êtes pas autorisé à supprimer cette page ZWiki."
 
-#: src/ZWiki/Editing.py:156 src/ZWiki/Editing.py:294 src/ZWiki/Views.py:332
-#: src/ZWiki/Views.py:435 src/ZWiki/plugins/tracker/tracker.py:321
-msgid ""
-"Sorry, this wiki doesn't allow anonymous edits. Please configure a username "
-"in options first."
+#: src/ZWiki/Editing.py:156 src/ZWiki/Editing.py:294 src/ZWiki/Views.py:336
+#: src/ZWiki/Views.py:439 src/ZWiki/plugins/tracker/tracker.py:322
+msgid "Sorry, this wiki doesn't allow anonymous edits. Please configure a username in options first."
 msgstr ""
 
 #: src/ZWiki/Editing.py:327
-msgid ""
-"You are not authorized to reparent or change subtopics links on this ZWiki "
-"Page."
-msgstr ""
-"Vous n'êtes pas autorisé à modifier l'ascendance ou changer les liens des "
-"sous rubriques sur cette page ZWiki."
+msgid "You are not authorized to reparent or change subtopics links on this ZWiki Page."
+msgstr "Vous n'êtes pas autorisé à modifier l'ascendance ou changer les liens des sous rubriques sur cette page ZWiki."
 
 #: src/ZWiki/Editing.py:349
 msgid "You are not authorized to change this ZWiki Page's type."
 msgstr "Vous n'êtes pas autorisé à changer le type de cette page ZWiki."
 
 #: src/ZWiki/Editing.py:383 src/ZWiki/Editing.py:410
-#: src/ZWiki/plugins/tracker/tracker.py:340
-#: src/ZWiki/plugins/tracker/tracker.py:347
-#: src/ZWiki/plugins/tracker/tracker.py:354
+#: src/ZWiki/plugins/tracker/tracker.py:344
+#: src/ZWiki/plugins/tracker/tracker.py:351
+#: src/ZWiki/plugins/tracker/tracker.py:358
 msgid "You are not authorized to edit this ZWiki Page."
 msgstr "Vous n'êtes pas autorisé à éditer cette page ZWiki."
 
@@ -66,16 +60,12 @@
 msgstr "Vous n'êtes pas autorisé à supprimer cette page ZWiki."
 
 #: src/ZWiki/Editing.py:563
-msgid ""
-"This page was renamed to %s. You can delete this one if no longer needed.\n"
-msgstr ""
-"Cette page a été renommée en «%s». Vous pouvez supprimer celle-ci si elle "
-"n'est plus requise.\n"
+msgid "This page was renamed to %s. You can delete this one if no longer needed.\n"
+msgstr "Cette page a été renommée en «%s». Vous pouvez supprimer celle-ci si elle n'est plus requise.\n"
 
 #: src/ZWiki/Editing.py:659
 msgid "You are not authorized to upload files here."
-msgstr ""
-"Vous n'êtes pas autorisé à transférer des fichiers vers cette destination."
+msgstr "Vous n'êtes pas autorisé à transférer des fichiers vers cette destination."
 
 #: src/ZWiki/Editing.py:663
 msgid "You are not authorized to add a link on this ZWiki Page."
@@ -91,22 +81,15 @@
 
 #: src/ZWiki/Editing.py:830
 #, fuzzy
-msgid ""
-"your edit contained a banned link pattern. Please contact the site "
-"administrator for help."
-msgstr ""
-"Il y a un problème %s. Veuillez contacter le gestionnaire du site pour "
-"obtenir de l'aide."
+msgid "your edit contained a banned link pattern. Please contact the site administrator for help."
+msgstr "Il y a un problème %s. Veuillez contacter le gestionnaire du site pour obtenir de l'aide."
 
 #: src/ZWiki/Editing.py:841
 msgid "exceeded max_anonymous_links"
 msgstr "dépassement du nombres maximum de liens anonymes"
 
 #: src/ZWiki/Editing.py:842
-msgid ""
-"adding of external links by unidentified users is restricted. Please back up "
-"and remove some of the http urls you added, or contact the site "
-"administrator for help."
+msgid "adding of external links by unidentified users is restricted. Please back up and remove some of the http urls you added, or contact the site administrator for help."
 msgstr ""
 
 #: src/ZWiki/Editing.py:853
@@ -115,85 +98,86 @@
 msgstr "dépassement du nombres maximum de liens anonymes"
 
 #: src/ZWiki/Editing.py:854
-msgid ""
-"adding of external links is restricted, even for identified users. Please "
-"back up and remove some of the http urls you added, or contact the site "
-"administrator for help."
+msgid "adding of external links is restricted, even for identified users. Please back up and remove some of the http urls you added, or contact the site administrator for help."
 msgstr ""
 
-#: src/ZWiki/Mail.py:506 src/ZWiki/skins/dtmlmessages.pt:58
+#: src/ZWiki/Mail.py:506 src/ZWiki/skins/dtmlmessages.pt:60
 msgid "anonymous"
 msgstr "anonyme"
 
-#: src/ZWiki/OutlineSupport.py:843 src/ZWiki/skins/zwiki/links.pt:56
+#: src/ZWiki/OutlineSupport.py:378
+msgid "Sorry, this wiki doesn't allow anonymous reparenting. Please configure a username in options first."
+msgstr ""
+
+#: src/ZWiki/OutlineSupport.py:878 src/ZWiki/skins/zwiki/links.pt:56
 msgid "which pages link to this one ?"
 msgstr "quelles sont les pages liées à celle-ci ?"
 
-#: src/ZWiki/OutlineSupport.py:851
+#: src/ZWiki/OutlineSupport.py:886
 msgid "You are here"
 msgstr "Vous êtes ici"
 
-#: src/ZWiki/Utils.py:465
+#: src/ZWiki/Utils.py:487
 msgid "years"
 msgstr "ans"
 
-#: src/ZWiki/Utils.py:465
+#: src/ZWiki/Utils.py:487
 msgid "year"
 msgstr "an"
 
-#: src/ZWiki/Utils.py:467
+#: src/ZWiki/Utils.py:489
 msgid "month"
 msgstr "mois"
 
-#: src/ZWiki/Utils.py:467
+#: src/ZWiki/Utils.py:489
 msgid "months"
 msgstr "mois"
 
-#: src/ZWiki/Utils.py:469
+#: src/ZWiki/Utils.py:491
 msgid "weeks"
 msgstr "semaines"
 
-#: src/ZWiki/Utils.py:469
+#: src/ZWiki/Utils.py:491
 msgid "week"
 msgstr "semaine"
 
-#: src/ZWiki/Utils.py:471
+#: src/ZWiki/Utils.py:493
 msgid "day"
 msgstr "jour"
 
-#: src/ZWiki/Utils.py:471
+#: src/ZWiki/Utils.py:493
 msgid "days"
 msgstr "jours"
 
-#: src/ZWiki/Utils.py:473
+#: src/ZWiki/Utils.py:495
 msgid "hours"
 msgstr "heures"
 
-#: src/ZWiki/Utils.py:473
+#: src/ZWiki/Utils.py:495
 msgid "hour"
 msgstr "heure"
 
-#: src/ZWiki/Utils.py:475
+#: src/ZWiki/Utils.py:497
 msgid "minute"
 msgstr "minute"
 
-#: src/ZWiki/Utils.py:475
+#: src/ZWiki/Utils.py:497
 msgid "minutes"
 msgstr "minutes"
 
-#: src/ZWiki/Utils.py:477
+#: src/ZWiki/Utils.py:499
 msgid "second"
 msgstr "seconde"
 
-#: src/ZWiki/Utils.py:477
+#: src/ZWiki/Utils.py:499
 msgid "seconds"
 msgstr "secondes"
 
-#: src/ZWiki/Views.py:346
+#: src/ZWiki/Views.py:350
 msgid "Page is locked"
 msgstr "La page est verouillée"
 
-#: src/ZWiki/Views.py:357
+#: src/ZWiki/Views.py:361
 msgid ""
 "\n"
 "            This page has a webDAV lock. Someone is probably editing it\n"
@@ -212,62 +196,58 @@
 "            vous y référer ultérieurement.\n"
 "            "
 
-#: src/ZWiki/Views.py:364
+#: src/ZWiki/Views.py:368
 msgid "To discard your changes and try again, click OK."
 msgstr "Pour abandonner vos changements et réessayer, cliquez sur OK"
 
-#: src/ZWiki/Views.py:393
+#: src/ZWiki/Views.py:397
 msgid "Edit conflict"
 msgstr "Conflit d'édition"
 
-#: src/ZWiki/Views.py:413
+#: src/ZWiki/Views.py:417
 msgid "Someone else has saved this page while you were editing"
 msgstr "Quelqu'un d'autre a enregistré cette page pendant que vous éditiez"
 
-#: src/ZWiki/Views.py:414
+#: src/ZWiki/Views.py:418
 msgid "To resolve the conflict, do this"
 msgstr "Pour résoudre le conflit, faites ceci"
 
-#: src/ZWiki/Views.py:415
+#: src/ZWiki/Views.py:419
 msgid "Click your browser's back button"
 msgstr "Cliquez sur le bouton «Page Précédente» de votre navigateur"
 
-#: src/ZWiki/Views.py:416
+#: src/ZWiki/Views.py:420
 msgid "Copy your recent edits to the clipboard"
 msgstr "Copiez vos modifications dans le presse-papiers"
 
-#: src/ZWiki/Views.py:417
+#: src/ZWiki/Views.py:421
 msgid "Click your browser's refresh button"
 msgstr "Cliquez sur le bouton «Actualiser» de votre navigateur"
 
-#: src/ZWiki/Views.py:418
+#: src/ZWiki/Views.py:422
 msgid "Paste in your edits again, being mindful of the latest changes"
-msgstr ""
-"Collez à nouveau vos modifications, mais en tenant compte des changements "
-"apportés entre temps"
+msgstr "Collez à nouveau vos modifications, mais en tenant compte des changements apportés entre temps"
 
-#: src/ZWiki/Views.py:419
+#: src/ZWiki/Views.py:423
 msgid "Click the Change button again"
 msgstr "Cliquez sur le bouton «Changer» à nouveau"
 
-#: src/ZWiki/Views.py:420 src/ZWiki/skins/zwiki/editform.pt:163
+#: src/ZWiki/Views.py:424 src/ZWiki/skins/zwiki/editform.pt:163
 msgid "or"
 msgstr "ou"
 
-#: src/ZWiki/Views.py:421
+#: src/ZWiki/Views.py:425
 msgid "To discard your changes and start again, click OK"
 msgstr "Pour abandonner vos modifications et recommencer, cliquez sur OK."
 
-#: src/ZWiki/Views.py:490
+#: src/ZWiki/Views.py:501
 msgid ""
 "\n"
-"        Access keys can be accessed in mozilla-based browsers by pressing "
-"alt-<key>\n"
+"        Access keys can be accessed in mozilla-based browsers by pressing alt-<key>\n"
 "        IE users: must also press enter\n"
 "        Mac users: command-<key>\n"
 "        Opera users: shift-escape-<key>\n"
-"        These won't work here, back up to the previous page to try them "
-"out.\n"
+"        These won't work here, back up to the previous page to try them out.\n"
 "\n"
 "        0    show these access key assignments\n"
 "\n"
@@ -283,10 +263,8 @@
 "        s    go to search field\n"
 "        \n"
 "        page functions:\n"
-"        +    (in a plone/cmf site with skin switching set up) use zwiki's "
-"plone/cmf skin\n"
-"        -    (in a plone/cmf site with skin switching set up) use zwiki's "
-"standard skin\n"
+"        +    (in a plone/cmf site with skin switching set up) use zwiki's plone/cmf skin\n"
+"        -    (in a plone/cmf site with skin switching set up) use zwiki's standard skin\n"
 "        v    view page\n"
 "        m    mail subscription\n"
 "        b    show backlinks (links to this page)\n"
@@ -314,14 +292,11 @@
 "        "
 msgstr ""
 "\n"
-"        Les touches d'accés sont accessibles sur les navigateurs basés sur "
-"Mozilla en pressant Alt + <touche>\n"
-"Les utilisateurs d'Internet Explorer doivent en plus appuyer sur la touche « "
-"Entrée »\n"
+"        Les touches d'accés sont accessibles sur les navigateurs basés sur Mozilla en pressant Alt + <touche>\n"
+"Les utilisateurs d'Internet Explorer doivent en plus appuyer sur la touche « Entrée »\n"
 "Les utilisateurs Mac : command + <touche>\n"
 "Les utilisateurs d'Opéra : Shift + Espace + <touche>\n"
-"Cela ne fonctionnera pas sur cette page. Retournez sur la page précédente et "
-"essayez-les.\n"
+"Cela ne fonctionnera pas sur cette page. Retournez sur la page précédente et essayez-les.\n"
 "\n"
 "        0 montrer les assignements des touches d'accès rapide\n"
 "\n"
@@ -340,13 +315,11 @@
 "        v    voir la page\n"
 "        +    afficher toutes les caractéristiques (mode «complet»)\n"
 "        =    afficher les caractéristiques de base (mode «simple»)\n"
-"        -    afficher seulement caractéristiques essentielles (mode "
-"«minimal»)\n"
+"        -    afficher seulement caractéristiques essentielles (mode «minimal»)\n"
 "        m    abonnement par courriel\n"
 "        b    afficher les rétroliens (liens vers cette page)\n"
 "        d    afficher les différences (historique des dernières éditions)\n"
-"        y    afficher l'historique complet dans l'interface de gestion de "
-"Zope (ZMI)\n"
+"        y    afficher l'historique complet dans l'interface de gestion de Zope (ZMI)\n"
 "        e    éditer cette page\n"
 "        x    modifier avec un éditeur externe\n"
 "             imprimer cette page (et les sous-rubriques)\n"
@@ -367,32 +340,31 @@
 "        p    version précédente\n"
 "        "
 
-#: src/ZWiki/Wikis.py:49
-msgid "Unknown wiki type"
-msgstr ""
-
-#: src/ZWiki/ZWikiPage.py:675
+#: src/ZWiki/ZWikiPage.py:744
 msgid "create this page"
 msgstr "créer cette page"
 
-#: src/ZWiki/ZWikiPage.py:798 src/ZWiki/ZWikiPage.py:814
-#: src/ZWiki/ZWikiPage.py:817
+#: src/ZWiki/ZWikiPage.py:872 src/ZWiki/ZWikiPage.py:887
 msgid "last edited %(interval)s ago"
 msgstr "dernière édition il y a %(interval)s"
 
-#: src/ZWiki/ZWikiPage.py:809
+#: src/ZWiki/ZWikiPage.py:882
 msgid "show last edit"
 msgstr "afficher la dernière modification"
 
-#: src/ZWiki/ZWikiPage.py:826 src/ZWiki/ZWikiPage.py:828
+#: src/ZWiki/ZWikiPage.py:897 src/ZWiki/ZWikiPage.py:899
 msgid "by %(editor)s"
 msgstr "par %(editor)s"
 
-#: src/ZWiki/__init__.py:34
+#: src/ZWiki/__init__.py:200
+msgid "Unknown wiki type"
+msgstr ""
+
+#: src/ZWiki/__init__.py:39
 msgid "No need to add a Zwiki Outline Cache"
 msgstr "Il n'est pas nécessaire d'ajouter une Cache Hors-ligne ZWiki"
 
-#: src/ZWiki/__init__.py:35
+#: src/ZWiki/__init__.py:40
 msgid ""
 "Zwiki Outline Cache appears in the ZMI Add menu\n"
 "        for implementation reasons, but should not be added directly.\n"
@@ -400,8 +372,7 @@
 "        "
 msgstr ""
 "Le Cache Hors-ligne ZWiki apparait dans le menu d'ajout de la ZMI\n"
-"pour des raisons d'implémentation, mais ne peut pas être rajouter "
-"directement.\n"
+"pour des raisons d'implémentation, mais ne peut pas être rajouter directement.\n"
 "ZWiki le crée pour vous si cele est nécessaire.\n"
 "        "
 
@@ -409,6 +380,10 @@
 msgid "comments"
 msgstr "commentaires"
 
+#: src/ZWiki/pagetypes/html.py:50 src/ZWiki/pagetypes/rst.py:85
+msgid "reply"
+msgstr "répondre"
+
 #: src/ZWiki/pagetypes/moin.py:1990
 msgid "Expected \"=\" to follow \"%(token)s\""
 msgstr "« = » est attendu après « %(token)s »"
@@ -431,8 +406,7 @@
 
 #: src/ZWiki/pagetypes/moin.py:730
 msgid "Expected \"%(wanted)s\" after \"%(key)s\", got \"%(token)s\""
-msgstr ""
-"« %(wanted)s » est attendu après « %(key)s », à la place de « %(token)s »"
+msgstr "« %(wanted)s » est attendu après « %(key)s », à la place de « %(token)s »"
 
 #: src/ZWiki/pagetypes/moin.py:736
 msgid "Expected an integer \"%(key)s\" before \"%(token)s\""
@@ -446,10 +420,6 @@
 msgid "Expected a color value \"%(arg)s\" after \"%(key)s\""
 msgstr "Une couleur « %(arg)s » est attendue après « %(key)s »"
 
-#: src/ZWiki/pagetypes/rst.py:85
-msgid "reply"
-msgstr "répondre"
-
 #: src/ZWiki/plugins/latexwiki/wikis/latexwiki/diffform.pt:127
 #: src/ZWiki/plugins/mathaction/wikis/mathaction/old-diffform.pt:127
 msgid "full history"
@@ -476,13 +446,14 @@
 msgstr "Revenir à cette précédente version et"
 
 #: src/ZWiki/plugins/latexwiki/wikis/latexwiki/wikipage.pt:169
+#, fuzzy
 msgid "show plone skin"
-msgstr ""
+msgstr "afficher dans le style plone"
 
 #: src/ZWiki/plugins/latexwiki/wikis/latexwiki/wikipage.pt:172
 #, fuzzy
 msgid "plone"
-msgstr "Note de l'historique:"
+msgstr "plone"
 
 #: src/ZWiki/plugins/latexwiki/wikis/latexwiki/wikipage.pt:173
 #, fuzzy
@@ -491,7 +462,7 @@
 
 #: src/ZWiki/plugins/latexwiki/wikis/latexwiki/wikipage.pt:179
 msgid "full"
-msgstr ""
+msgstr "complet"
 
 #: src/ZWiki/plugins/latexwiki/wikis/latexwiki/wikipage.pt:180
 #, fuzzy
@@ -501,15 +472,15 @@
 #: src/ZWiki/plugins/latexwiki/wikis/latexwiki/wikipage.pt:186
 #, fuzzy
 msgid "simple"
-msgstr "Fichier"
+msgstr "simple"
 
 #: src/ZWiki/plugins/latexwiki/wikis/latexwiki/wikipage.pt:187
 msgid "show only essential features"
-msgstr ""
+msgstr "Afficher uniquement les fonctionnalités essentielles"
 
 #: src/ZWiki/plugins/latexwiki/wikis/latexwiki/wikipage.pt:193
 msgid "minimal"
-msgstr ""
+msgstr "minimal"
 
 #: src/ZWiki/plugins/latexwiki/wikis/latexwiki/wikipage.pt:507
 #, fuzzy
@@ -517,21 +488,19 @@
 msgstr "est une sous-rubrique de:"
 
 #: src/ZWiki/plugins/latexwiki/wikis/latexwiki/wikipage.pt:512
-#, fuzzy
 msgid "for this page"
-msgstr "créer cette page"
+msgstr "pour cette page"
 
 #. Default: "reparent"
 #: src/ZWiki/plugins/latexwiki/wikis/latexwiki/wikipage.pt:520
 #: src/ZWiki/plugins/latexwiki/wikis/latexwiki/wikipage.pt:525
 #: src/ZWiki/plugins/latexwiki/wikis/latexwiki/wikipage.pt:530
 #: src/ZWiki/plugins/latexwiki/wikis/latexwiki/wikipage.pt:535
-#, fuzzy
 msgid "title"
-msgstr "Titre"
+msgstr "titre"
 
 #: src/ZWiki/plugins/tracker/filterissues.pt:12
-#: src/ZWiki/skins/dtmlmessages.pt:30
+#: src/ZWiki/skins/dtmlmessages.pt:31
 msgid "Filter issues"
 msgstr "Filtrer les problèmes"
 
@@ -543,368 +512,351 @@
 msgid "Issue tracker"
 msgstr "Suivi des problèmes"
 
-#: src/ZWiki/plugins/tracker/tracker.py:361
+#: src/ZWiki/plugins/tracker/tracker.py:365
 #, fuzzy
 msgid "You are not authorized to comment on this ZWiki Page."
 msgstr "Vous n'êtes pas autorisé à éditer cette page ZWiki."
 
-#: src/ZWiki/skins/dtmlmessages.pt:10 src/ZWiki/skins/dtmlmessages.pt:32
+#: src/ZWiki/skins/dtmlmessages.pt:10 src/ZWiki/skins/dtmlmessages.pt:33
+#, fuzzy
+msgid "name"
+msgstr "nom,"
+
+#: src/ZWiki/skins/dtmlmessages.pt:11 src/ZWiki/skins/dtmlmessages.pt:34
 msgid "category"
 msgstr "catégorie"
 
-#: src/ZWiki/skins/dtmlmessages.pt:11 src/ZWiki/skins/dtmlmessages.pt:33
+#: src/ZWiki/skins/dtmlmessages.pt:12 src/ZWiki/skins/dtmlmessages.pt:35
 msgid "severity"
 msgstr "sévérité"
 
-#: src/ZWiki/skins/dtmlmessages.pt:12 src/ZWiki/skins/dtmlmessages.pt:34
+#: src/ZWiki/skins/dtmlmessages.pt:13 src/ZWiki/skins/dtmlmessages.pt:36
 msgid "status"
 msgstr "statut"
 
-#: src/ZWiki/skins/dtmlmessages.pt:13 src/ZWiki/skins/dtmlmessages.pt:35
+#: src/ZWiki/skins/dtmlmessages.pt:14 src/ZWiki/skins/dtmlmessages.pt:37
 msgid "age"
 msgstr "âge"
 
-#: src/ZWiki/skins/dtmlmessages.pt:14 src/ZWiki/skins/dtmlmessages.pt:36
+#: src/ZWiki/skins/dtmlmessages.pt:15 src/ZWiki/skins/dtmlmessages.pt:38
 msgid "modified"
 msgstr "modifié"
 
-#: src/ZWiki/skins/dtmlmessages.pt:15
+#: src/ZWiki/skins/dtmlmessages.pt:16
 msgid "Add a new issue:"
 msgstr "Ajouter un nouveau problème :"
 
-#: src/ZWiki/skins/dtmlmessages.pt:16
+#: src/ZWiki/skins/dtmlmessages.pt:17
 msgid "Name:"
 msgstr "Nom :"
 
-#: src/ZWiki/skins/dtmlmessages.pt:17
+#: src/ZWiki/skins/dtmlmessages.pt:18
 msgid "Category:"
 msgstr "Catégorie :"
 
-#: src/ZWiki/skins/dtmlmessages.pt:18
+#: src/ZWiki/skins/dtmlmessages.pt:19
 msgid "Severity:"
 msgstr "Sévérité :"
 
-#: src/ZWiki/skins/dtmlmessages.pt:19
-msgid "Status:"
-msgstr "Statut :"
-
 #: src/ZWiki/skins/dtmlmessages.pt:2
 msgid "Here are the wiki's issue pages."
 msgstr "Voici les pages de problèmes du wiki."
 
 #: src/ZWiki/skins/dtmlmessages.pt:20
+msgid "Status:"
+msgstr "Statut :"
+
+#: src/ZWiki/skins/dtmlmessages.pt:21
 msgid "Details:"
 msgstr "Détails :"
 
-#: src/ZWiki/skins/dtmlmessages.pt:21
+#: src/ZWiki/skins/dtmlmessages.pt:22
 msgid "add issue"
 msgstr "ajouter un problème"
 
-#: src/ZWiki/skins/dtmlmessages.pt:22
+#: src/ZWiki/skins/dtmlmessages.pt:23
 msgid "More advanced"
 msgstr "Plus d'options avancées"
 
-#: src/ZWiki/skins/dtmlmessages.pt:23
+#: src/ZWiki/skins/dtmlmessages.pt:24
 msgid "issue tracker"
 msgstr "suivi des problèmes"
 
-#: src/ZWiki/skins/dtmlmessages.pt:24
+#: src/ZWiki/skins/dtmlmessages.pt:25
 msgid "search options"
 msgstr "options de recherche"
 
-#: src/ZWiki/skins/dtmlmessages.pt:25
+#: src/ZWiki/skins/dtmlmessages.pt:26
 msgid "Name contains any of:"
 msgstr "Nom contenant :"
 
-#: src/ZWiki/skins/dtmlmessages.pt:26
+#: src/ZWiki/skins/dtmlmessages.pt:27
 msgid "Page text contains any of:"
 msgstr "Texte de la page contenant :"
 
-#: src/ZWiki/skins/dtmlmessages.pt:27
+#: src/ZWiki/skins/dtmlmessages.pt:28
 msgid "Categories:"
 msgstr "Catégories :"
 
-#: src/ZWiki/skins/dtmlmessages.pt:28
+#: src/ZWiki/skins/dtmlmessages.pt:29
 msgid "Severities:"
 msgstr "Sévérités :"
 
-#: src/ZWiki/skins/dtmlmessages.pt:29
-msgid "Statuses:"
-msgstr "Statuts :"
-
 #: src/ZWiki/skins/dtmlmessages.pt:3
 #, fuzzy
 msgid "Enter a search term, click the numbers to the right,"
 msgstr "Entrez un terme de recherche, ou cliquez sur les nombres à droite, ou"
 
-#: src/ZWiki/skins/dtmlmessages.pt:37
+#: src/ZWiki/skins/dtmlmessages.pt:30
+msgid "Statuses:"
+msgstr "Statuts :"
+
+#: src/ZWiki/skins/dtmlmessages.pt:39
 msgid "Submitted by"
 msgstr "Soumis par :"
 
-#: src/ZWiki/skins/dtmlmessages.pt:38
+#: src/ZWiki/skins/dtmlmessages.pt:4
+msgid "filter issues"
+msgstr "Filtrer les problèmes"
+
+#: src/ZWiki/skins/dtmlmessages.pt:40
 msgid "Name"
 msgstr "Nom"
 
-#: src/ZWiki/skins/dtmlmessages.pt:39
+#: src/ZWiki/skins/dtmlmessages.pt:41
 msgid "Category"
 msgstr "Catégorie"
 
-#: src/ZWiki/skins/dtmlmessages.pt:4
-msgid "filter issues"
-msgstr "Filtrer les problèmes"
-
-#: src/ZWiki/skins/dtmlmessages.pt:40
+#: src/ZWiki/skins/dtmlmessages.pt:42
 msgid "Severity"
 msgstr "Sévérité"
 
-#: src/ZWiki/skins/dtmlmessages.pt:41
+#: src/ZWiki/skins/dtmlmessages.pt:43
 msgid "Status"
 msgstr "Statut"
 
-#: src/ZWiki/skins/dtmlmessages.pt:42
+#: src/ZWiki/skins/dtmlmessages.pt:44
 msgid "Optional subject"
 msgstr "Sujet optionnel"
 
-#: src/ZWiki/skins/dtmlmessages.pt:43
+#: src/ZWiki/skins/dtmlmessages.pt:45
 msgid "Optional comment"
 msgstr "Commentaire optionnel"
 
-#: src/ZWiki/skins/dtmlmessages.pt:44 src/ZWiki/skins/dtmlmessages.pt:45
+#: src/ZWiki/skins/dtmlmessages.pt:46 src/ZWiki/skins/dtmlmessages.pt:47
 #, fuzzy
 msgid "Add ZWiki"
 msgstr "Ajouter une page ZWiki"
 
-#: src/ZWiki/skins/dtmlmessages.pt:46
+#: src/ZWiki/skins/dtmlmessages.pt:48
 #, fuzzy
 msgid "Id:"
 msgstr "Identifiant"
 
-#: src/ZWiki/skins/dtmlmessages.pt:47
-#, fuzzy
+#: src/ZWiki/skins/dtmlmessages.pt:49
 msgid "Title:"
-msgstr "Titre"
+msgstr "Titre :"
 
-#: src/ZWiki/skins/dtmlmessages.pt:48
-msgid "Template:"
+#: src/ZWiki/skins/dtmlmessages.pt:5
+msgid "browse open issues"
 msgstr ""
 
-#: src/ZWiki/skins/dtmlmessages.pt:49
+#: src/ZWiki/skins/dtmlmessages.pt:50
+msgid "Template:"
+msgstr "Modèle :"
+
+#: src/ZWiki/skins/dtmlmessages.pt:51
 #, fuzzy
 msgid "Add wiki"
 msgstr "Ajouter une page ZWiki"
 
-#: src/ZWiki/skins/dtmlmessages.pt:5
-msgid "browse open issues"
-msgstr ""
-
-#: src/ZWiki/skins/dtmlmessages.pt:50
+#: src/ZWiki/skins/dtmlmessages.pt:52
 msgid "Pages changed in the last"
 msgstr "Pages modifiées dans les derniers"
 
-#: src/ZWiki/skins/dtmlmessages.pt:51
+#: src/ZWiki/skins/dtmlmessages.pt:53
 msgid "Recently changed pages, with summaries"
 msgstr "Pages récemment modifiées, avec leurs résumés"
 
-#: src/ZWiki/skins/dtmlmessages.pt:52
+#: src/ZWiki/skins/dtmlmessages.pt:54
 msgid "Show summaries ?"
 msgstr "Afficher les résumés ?"
 
-#: src/ZWiki/skins/dtmlmessages.pt:53
+#: src/ZWiki/skins/dtmlmessages.pt:55
 msgid "Refresh"
 msgstr "Rafraîchir"
 
-#: src/ZWiki/skins/dtmlmessages.pt:54
+#: src/ZWiki/skins/dtmlmessages.pt:56
 msgid "Page"
 msgstr "Page"
 
-#: src/ZWiki/skins/dtmlmessages.pt:55
+#: src/ZWiki/skins/dtmlmessages.pt:57
 msgid "Edited&nbsp;by"
 msgstr "Édité&nbsp;par"
 
-#: src/ZWiki/skins/dtmlmessages.pt:56
+#: src/ZWiki/skins/dtmlmessages.pt:58
 msgid "Time"
 msgstr "Date"
 
-#: src/ZWiki/skins/dtmlmessages.pt:57
+#: src/ZWiki/skins/dtmlmessages.pt:59
 msgid "NEW"
 msgstr "NOUVEAU"
 
-#: src/ZWiki/skins/dtmlmessages.pt:59
-msgid "Pages marked (NEW) have been created within the last week"
-msgstr "Les pages marquées (NOUVEAU) ont été créées il y a moins d'une semaine"
-
 #: src/ZWiki/skins/dtmlmessages.pt:6
 msgid "search issues"
 msgstr "Rechercher des problèmes"
 
-#: src/ZWiki/skins/dtmlmessages.pt:60
-msgid "Enter a word or phrase and hit enter to search the entire wiki."
-msgstr ""
-"Entrez un mot ou une phrase and pressez sur la touche Entrée pour lancer la "
-"recherche dans l'ensemble du Wiki."
-
 #: src/ZWiki/skins/dtmlmessages.pt:61
-msgid "This is the same as using the search field at top right."
-msgstr ""
-"Cette recherche est identique à celle effectuée par le champs de recherche "
-"dans le coin supérieur droit."
+msgid "Pages marked (NEW) have been created within the last week"
+msgstr "Les pages marquées (NOUVEAU) ont été créées il y a moins d'une semaine"
 
 #: src/ZWiki/skins/dtmlmessages.pt:62
-msgid "Tips: A single word works best for matching page names."
-msgstr ""
-"Conseil: Pour trouver les noms de pages, une recherche sur un seul mot est "
-"souvent plus fructueuse."
+msgid "Enter a word or phrase and hit enter to search the entire wiki."
+msgstr "Entrez un mot ou une phrase and pressez sur la touche Entrée pour lancer la recherche dans l'ensemble du Wiki."
 
 #: src/ZWiki/skins/dtmlmessages.pt:63
-msgid ""
-"Case-insensitivity and wildcards may be supported depending on your catalog "
-"configuration."
-msgstr ""
-"L'insensibilité à la casse et les caractères de recherche approximative "
-"peuvent être supportés selon la configuration du «catalogue» (contacter "
-"l'administrateur pour plus de renseignements)."
+msgid "This is the same as using the search field at top right."
+msgstr "Cette recherche est identique à celle effectuée par le champs de recherche dans le coin supérieur droit."
 
 #: src/ZWiki/skins/dtmlmessages.pt:64
+msgid "Tips: A single word works best for matching page names."
+msgstr "Conseil: Pour trouver les noms de pages, une recherche sur un seul mot est souvent plus fructueuse."
+
+#: src/ZWiki/skins/dtmlmessages.pt:65
+msgid "Case-insensitivity and wildcards may be supported depending on your catalog configuration."
+msgstr "L'insensibilité à la casse et les caractères de recherche approximative peuvent être supportés selon la configuration du «catalogue» (contacter l'administrateur pour plus de renseignements)."
+
+#: src/ZWiki/skins/dtmlmessages.pt:66
 msgid "Leave it blank to list all pages."
 msgstr "Laissez ce champ vide pour lister toutes les pages."
 
-#: src/ZWiki/skins/dtmlmessages.pt:65 src/ZWiki/skins/dtmlmessages.pt:66
+#: src/ZWiki/skins/dtmlmessages.pt:67 src/ZWiki/skins/dtmlmessages.pt:68
 msgid "Search"
 msgstr "Rechercher"
 
-#: src/ZWiki/skins/dtmlmessages.pt:67
+#: src/ZWiki/skins/dtmlmessages.pt:69
 msgid "Page names matching"
 msgstr "Noms de page concordants"
 
-#: src/ZWiki/skins/dtmlmessages.pt:68
+#: src/ZWiki/skins/dtmlmessages.pt:7
+msgid "recent"
+msgstr "récent"
+
+#: src/ZWiki/skins/dtmlmessages.pt:70
 msgid "Text matching"
 msgstr "Concordances dans le texte"
 
-#: src/ZWiki/skins/dtmlmessages.pt:69
+#: src/ZWiki/skins/dtmlmessages.pt:71
 msgid "Thorough (non-catalog) search for text matching"
 msgstr "Recherche complète, sans le catalogue, pour la correspondance de texte"
 
-#: src/ZWiki/skins/dtmlmessages.pt:7
-msgid "recent"
-msgstr "récent"
-
-#: src/ZWiki/skins/dtmlmessages.pt:70
+#: src/ZWiki/skins/dtmlmessages.pt:72
 msgid "Set your preferences for this wiki:"
 msgstr "Veuillez définir vos préférences pour ce Wiki :"
 
-#: src/ZWiki/skins/dtmlmessages.pt:71
+#: src/ZWiki/skins/dtmlmessages.pt:73
 msgid "User name:"
 msgstr "Nom d'utilisateur :"
 
-#: src/ZWiki/skins/dtmlmessages.pt:72
-msgid "(identifies your edits)"
-msgstr "(identifie vos modifications)"
+#: src/ZWiki/skins/dtmlmessages.pt:74
+msgid "(identifies your edits, saves your votes, may be required)"
+msgstr ""
 
-#: src/ZWiki/skins/dtmlmessages.pt:73
+#: src/ZWiki/skins/dtmlmessages.pt:75
 msgid "Email address:"
 msgstr "Adresse électronique (courriel) :"
 
-#: src/ZWiki/skins/dtmlmessages.pt:74
+#: src/ZWiki/skins/dtmlmessages.pt:76
 msgid "(allows mail subscription)"
 msgstr "(autorise les abonnements par courriel)"
 
-#: src/ZWiki/skins/dtmlmessages.pt:75
+#: src/ZWiki/skins/dtmlmessages.pt:77
 msgid "Your time zone:"
 msgstr "Fuseau horaire :"
 
-#: src/ZWiki/skins/dtmlmessages.pt:76
+#: src/ZWiki/skins/dtmlmessages.pt:78
 msgid "(localizes most times)"
 msgstr "(permet la localisation de la plupart des dates)"
 
-#: src/ZWiki/skins/dtmlmessages.pt:77
+#: src/ZWiki/skins/dtmlmessages.pt:79
 msgid "Edit form height:"
 msgstr "Hauteur du formulaire d'édition :"
 
-#: src/ZWiki/skins/dtmlmessages.pt:78
+#: src/ZWiki/skins/dtmlmessages.pt:8
+msgid "all"
+msgstr "tous"
+
+#: src/ZWiki/skins/dtmlmessages.pt:80
 msgid "(adjusts form size)"
 msgstr "(ajuste la taille du formulaire)"
 
-#: src/ZWiki/skins/dtmlmessages.pt:79
+#: src/ZWiki/skins/dtmlmessages.pt:81
 msgid "Save options"
 msgstr "Enregistrer les options"
 
-#: src/ZWiki/skins/dtmlmessages.pt:8
-msgid "all"
-msgstr "tous"
-
-#: src/ZWiki/skins/dtmlmessages.pt:80
+#: src/ZWiki/skins/dtmlmessages.pt:82
 msgid "Forget options"
 msgstr "Oubliez les options"
 
-#: src/ZWiki/skins/dtmlmessages.pt:81 src/ZWiki/skins/dtmlmessages.pt:82
+#: src/ZWiki/skins/dtmlmessages.pt:83 src/ZWiki/skins/dtmlmessages.pt:84
 msgid "Add ZWiki Page"
 msgstr "Ajouter une page ZWiki"
 
-#: src/ZWiki/skins/dtmlmessages.pt:83
+#: src/ZWiki/skins/dtmlmessages.pt:85
 #, fuzzy
 msgid "Page&nbsp;name:"
 msgstr "Nom de la page"
 
-#: src/ZWiki/skins/dtmlmessages.pt:84
+#: src/ZWiki/skins/dtmlmessages.pt:86
 #, fuzzy
 msgid "Add wiki page"
 msgstr "Ajouter une page ZWiki"
 
-#: src/ZWiki/skins/dtmlmessages.pt:85
+#: src/ZWiki/skins/dtmlmessages.pt:87
 msgid "Topic"
 msgstr "Rubrique"
 
-#: src/ZWiki/skins/dtmlmessages.pt:86
+#: src/ZWiki/skins/dtmlmessages.pt:88
 msgid "Last updated"
 msgstr "Dernière modification"
 
-#: src/ZWiki/skins/dtmlmessages.pt:87
+#: src/ZWiki/skins/dtmlmessages.pt:89
 msgid "Comments"
 msgstr "Commentaires"
 
-#: src/ZWiki/skins/dtmlmessages.pt:88
+#: src/ZWiki/skins/dtmlmessages.pt:9 src/ZWiki/skins/dtmlmessages.pt:32
+msgid "#"
+msgstr "#"
+
+#: src/ZWiki/skins/dtmlmessages.pt:90
 msgid "Views"
 msgstr "Vues"
 
-#: src/ZWiki/skins/dtmlmessages.pt:89
+#: src/ZWiki/skins/dtmlmessages.pt:91
 msgid "Created"
 msgstr "Créé"
 
-#: src/ZWiki/skins/dtmlmessages.pt:9 src/ZWiki/skins/dtmlmessages.pt:31
-msgid "#"
-msgstr "#"
-
-#: src/ZWiki/skins/dtmlmessages.pt:90 src/ZWiki/skins/dtmlmessages.pt:92
+#: src/ZWiki/skins/dtmlmessages.pt:92 src/ZWiki/skins/dtmlmessages.pt:94
 msgid "by"
 msgstr "par"
 
-#: src/ZWiki/skins/dtmlmessages.pt:91
+#: src/ZWiki/skins/dtmlmessages.pt:93
 msgid "<dtml-var lasteditinterval> ago</dtml-var>"
 msgstr "il y a <dtml-var lasteditinterval> </dtml-var>"
 
-#: src/ZWiki/skins/dtmlmessages.pt:93
+#: src/ZWiki/skins/dtmlmessages.pt:95
 msgid "on"
 msgstr "sur"
 
-#: src/ZWiki/skins/zwiki/backlinks.pt:108
-msgid "Subtopics"
-msgstr "est une sous-rubrique de:"
-
-#: src/ZWiki/skins/zwiki/backlinks.pt:111
-msgid "This page has no subtopics."
-msgstr "Cette page n'a pas de sous-rubriques."
-
-#: src/ZWiki/skins/zwiki/backlinks.pt:114
+#: src/ZWiki/skins/zwiki/backlinks.pt:102
 #, fuzzy
 msgid "Here are it's subtopics."
 msgstr "Voici les sous-rubriques :"
 
-#: src/ZWiki/skins/zwiki/backlinks.pt:117
+#: src/ZWiki/skins/zwiki/backlinks.pt:105
 #, fuzzy
 msgid "You can reorder them by clicking the ^ buttons."
-msgstr ""
-"Vous pouvez modifier l'ordre des sous-rubriques en cliquant sur les boutons "
-"« ^ »."
+msgstr "Vous pouvez modifier l'ordre des sous-rubriques en cliquant sur les boutons « ^ »."
 
 #: src/ZWiki/skins/zwiki/backlinks.pt:20
 #, fuzzy
@@ -915,65 +867,61 @@
 msgid "Parents"
 msgstr "Parents"
 
-#: src/ZWiki/skins/zwiki/backlinks.pt:31
+#: src/ZWiki/skins/zwiki/backlinks.pt:28
 msgid "is a top-level topic."
 msgstr "est une rubrique de premier niveau."
 
-#: src/ZWiki/skins/zwiki/backlinks.pt:32
+#: src/ZWiki/skins/zwiki/backlinks.pt:29
 msgid "is a subtopic of:"
 msgstr "est une sous-rubrique de :"
 
-#: src/ZWiki/skins/zwiki/backlinks.pt:55
+#: src/ZWiki/skins/zwiki/backlinks.pt:48
 msgid "Backlinks"
 msgstr "Rétroliens"
 
-#: src/ZWiki/skins/zwiki/backlinks.pt:56
+#: src/ZWiki/skins/zwiki/backlinks.pt:49
 msgid "Here are the pages which link to it:"
 msgstr "Voici les pages qui pointent sur celle-ci:"
 
-#: src/ZWiki/skins/zwiki/backlinks.pt:57
+#: src/ZWiki/skins/zwiki/backlinks.pt:50
 msgid "No other pages link to this one."
 msgstr "Aucune page n'est plus liés à celle-ci."
 
-#: src/ZWiki/skins/zwiki/backlinks.pt:82
-msgid ""
-"You can set this page's parent(s) to place it within the overall page "
-"hierarchy."
+#: src/ZWiki/skins/zwiki/backlinks.pt:70
+msgid "You can set this page's parent(s) to place it within the overall page hierarchy."
 msgstr ""
 
-#: src/ZWiki/skins/zwiki/backlinks.pt:85
-msgid ""
-"Check one or more checkboxes or enter a page name here, and click the button."
+#: src/ZWiki/skins/zwiki/backlinks.pt:73
+msgid "Check one or more checkboxes or enter a page name here, and click the button."
 msgstr ""
 
-#: src/ZWiki/skins/zwiki/backlinks.pt:88
+#: src/ZWiki/skins/zwiki/backlinks.pt:76
 msgid "Enter a page name here and click the button."
 msgstr ""
 
-#: src/ZWiki/skins/zwiki/backlinks.pt:91
-msgid ""
-"You can type just the first few letters, case and punctuation are ignored."
+#: src/ZWiki/skins/zwiki/backlinks.pt:79
+msgid "You can type just the first few letters, case and punctuation are ignored."
 msgstr ""
 
-#: src/ZWiki/skins/zwiki/backlinks.pt:98
+#: src/ZWiki/skins/zwiki/backlinks.pt:86
 msgid "Reparent"
 msgstr "Ré-hiérarchiser"
 
+#: src/ZWiki/skins/zwiki/backlinks.pt:96
+msgid "Subtopics"
+msgstr "est une sous-rubrique de:"
+
+#: src/ZWiki/skins/zwiki/backlinks.pt:99
+msgid "This page has no subtopics."
+msgstr "Cette page n'a pas de sous-rubriques."
+
 #: src/ZWiki/skins/zwiki/badtemplate.pt:12
 msgid "Bad template"
 msgstr ""
 
 #: src/ZWiki/skins/zwiki/badtemplate.pt:13
-msgid ""
-"There was a problem locating one of this wiki's skin templates. There may be "
-"a page or other non-page-template/non-dtml-method object with the same ID, "
-"obscuring the template. Or the template may be missing on the filesystem (an "
-"incomplete Zwiki installation)."
-msgstr ""
-"Il y avait un problème avec un des modèles d'apparence du wiki. Il est "
-"possible qu'un objet avec un identifiant de modèle d'apparence ne soit pas "
-"un modèle de page ou une méthode DTML, ou que le modèle soit manquant sur le "
-"système de fichiers (installation incomlète de ZWiki)."
+msgid "There was a problem locating one of this wiki's skin templates. There may be a page or other non-page-template/non-dtml-method object with the same ID, obscuring the template. Or the template may be missing on the filesystem (an incomplete Zwiki installation)."
+msgstr "Il y avait un problème avec un des modèles d'apparence du wiki. Il est possible qu'un objet avec un identifiant de modèle d'apparence ne soit pas un modèle de page ou une méthode DTML, ou que le modèle soit manquant sur le système de fichiers (installation incomlète de ZWiki)."
 
 #: src/ZWiki/skins/zwiki/commentform.pt:21
 msgid "subject"
@@ -981,9 +929,7 @@
 
 #: src/ZWiki/skins/zwiki/commentform.pt:22
 msgid "a subject helps clarify threads and RecentChanges"
-msgstr ""
-"Un sujet aide à clarifier les fils de discussion et la page des changements "
-"récents"
+msgstr "Un sujet aide à clarifier les fils de discussion et la page des changements récents"
 
 #: src/ZWiki/skins/zwiki/commentform.pt:29
 msgid "replying"
@@ -991,9 +937,7 @@
 
 #: src/ZWiki/skins/zwiki/commentform.pt:36
 msgid "to comment (and cc any subscribers) enter text here and click add"
-msgstr ""
-"Pour ajouter un commentaire (et le faire parvenir aux abonnés) entrez votre "
-"texte ici et cliquez sur ajouter"
+msgstr "Pour ajouter un commentaire (et le faire parvenir aux abonnés) entrez votre texte ici et cliquez sur ajouter"
 
 #: src/ZWiki/skins/zwiki/commentform.pt:56
 msgid "${nb} subscribers"
@@ -1008,12 +952,20 @@
 msgid "add-comment"
 msgstr "ajouter un commentaire"
 
-#: src/ZWiki/skins/zwiki/contentspage.pt:12
+#: src/ZWiki/skins/zwiki/contentspage.pt:10
+#: src/ZWiki/skins/zwiki/contentspage.pt:27
+#, fuzzy
+msgid "Wiki contents for"
+msgstr "Contenu du Wiki"
+
+#: src/ZWiki/skins/zwiki/contentspage.pt:13
+#: src/ZWiki/skins/zwiki/contentspage.pt:30
 msgid "Wiki contents"
 msgstr "Contenu du Wiki"
 
-#: src/ZWiki/skins/zwiki/contentspage.pt:16
-msgid "Singletons"
+#: src/ZWiki/skins/zwiki/contentspage.pt:40
+#, fuzzy
+msgid "Singletons:"
 msgstr "Singletons"
 
 #: src/ZWiki/skins/zwiki/denied.pt:12
@@ -1026,19 +978,18 @@
 msgstr "Historique complet"
 
 #: src/ZWiki/skins/zwiki/diffform.pt:32
-#, fuzzy
 msgid "Edit:"
-msgstr "éditer"
+msgstr "Éditer :"
 
 #. Default: "<<"
 #: src/ZWiki/skins/zwiki/diffform.pt:34 src/ZWiki/skins/zwiki/diffform.pt:38
 msgid " << "
-msgstr ""
+msgstr " << "
 
 #. Default: ">>"
 #: src/ZWiki/skins/zwiki/diffform.pt:52 src/ZWiki/skins/zwiki/diffform.pt:56
 msgid " >> "
-msgstr ""
+msgstr " >> "
 
 #: src/ZWiki/skins/zwiki/diffform.pt:61
 #, fuzzy
@@ -1060,9 +1011,8 @@
 msgstr "Date"
 
 #: src/ZWiki/skins/zwiki/diffform.pt:90
-#, fuzzy
 msgid "Note:"
-msgstr "Nom :"
+msgstr "Note :"
 
 #: src/ZWiki/skins/zwiki/editform.pt:121
 msgid "toggle source/WYSIWYG mode"
@@ -1101,13 +1051,13 @@
 msgstr "${DYNAMIC_CONTENT}"
 
 #: src/ZWiki/skins/zwiki/editform.pt:178
-msgid "preview this edit"
-msgstr "Apercevoir cette modification"
-
-#: src/ZWiki/skins/zwiki/editform.pt:178
 msgid "Preview"
 msgstr "Apercevoir"
 
+#: src/ZWiki/skins/zwiki/editform.pt:178
+msgid "preview this edit"
+msgstr "Apercevoir cette modification"
+
 #: src/ZWiki/skins/zwiki/editform.pt:183
 msgid "Cancel"
 msgstr "Annuler"
@@ -1142,13 +1092,18 @@
 msgstr "le nom de cette page wiki (en changer peut être lent!)"
 
 #: src/ZWiki/skins/zwiki/editform.pt:71
-msgid "type"
-msgstr "type"
+msgid "markup"
+msgstr ""
 
 #: src/ZWiki/skins/zwiki/editform.pt:72
 msgid "select the formatting and rendering style for this page"
 msgstr "sélectionnez le style de formatage et de rendu pour cette page"
 
+#: src/ZWiki/skins/zwiki/helppage.pt:12
+#, fuzzy
+msgid "Help page"
+msgstr "Le Manuel"
+
 #: src/ZWiki/skins/zwiki/links.pt:102
 msgid "(external edit)"
 msgstr "(éditeur externe)"
@@ -1227,9 +1182,7 @@
 
 #: src/ZWiki/skins/zwiki/links.pt:63
 msgid "configure email subscription to this page or site"
-msgstr ""
-"Paramétrer l'abonnement à la diffusion électronique pour cette page ou ce "
-"site"
+msgstr "Paramétrer l'abonnement à la diffusion électronique pour cette page ou ce site"
 
 #: src/ZWiki/skins/zwiki/links.pt:73
 msgid "subscribe"
@@ -1285,25 +1238,19 @@
 
 #: src/ZWiki/skins/zwiki/pagemanagementform.pt:40
 msgid "enter a page name and click buttons to the right (mouse over for help)"
-msgstr ""
-"entrez un nom de page et cliquez sur les boutons à droite (survolez les "
-"boutons pour de l'aide)"
+msgstr "entrez un nom de page et cliquez sur les boutons à droite (survolez les boutons pour de l'aide)"
 
 #: src/ZWiki/skins/zwiki/pagemanagementform.pt:45
+msgid "make this page a subtopic of the page you have entered"
+msgstr "Placer la page courante sous la hiérarchie de la page dont vous avez entré le nom"
+
+#: src/ZWiki/skins/zwiki/pagemanagementform.pt:45
 msgid "reparent"
 msgstr "Ré-hiérarchiser"
 
-#: src/ZWiki/skins/zwiki/pagemanagementform.pt:45
-msgid "make this page a subtopic of the page you have entered"
-msgstr ""
-"Placer la page courante sous la hiérarchie de la page dont vous avez entré "
-"le nom"
-
 #: src/ZWiki/skins/zwiki/pagemanagementform.pt:50
 msgid "rename this page to the name you have entered, updating all links"
-msgstr ""
-"Renommer cette page avec le nom que vous avez entré, et mettre à jour tous "
-"les liens"
+msgstr "Renommer cette page avec le nom que vous avez entré, et mettre à jour tous les liens"
 
 #: src/ZWiki/skins/zwiki/pagemanagementform.pt:50
 msgid "rename"
@@ -1314,17 +1261,12 @@
 msgstr "supprimer"
 
 #: src/ZWiki/skins/zwiki/pagemanagementform.pt:55
-msgid ""
-"delete this page, and redirect links to the page you have entered, if any"
-msgstr ""
-"Supprimer cette page et rediriger les liens de vers la page que vous avez "
-"entré, s'il y en a une"
+msgid "delete this page, and redirect links to the page you have entered, if any"
+msgstr "Supprimer cette page et rediriger les liens de vers la page que vous avez entré, s'il y en a une"
 
 #: src/ZWiki/skins/zwiki/pagemanagementform.pt:60
 msgid "create a page with the name you have entered, as a subtopic of this one"
-msgstr ""
-"créer une page avec le nom que vous avez entré comme sous-rubrique de celle-"
-"ci"
+msgstr "créer une page avec le nom que vous avez entré comme sous-rubrique de celle-ci"
 
 #: src/ZWiki/skins/zwiki/pagemanagementform.pt:60
 msgid "create"
@@ -1462,6 +1404,12 @@
 msgid "User options"
 msgstr "options de recherche"
 
+#~ msgid "(identifies your edits)"
+#~ msgstr "(identifie vos modifications)"
+
+#~ msgid "type"
+#~ msgstr "type"
+
 #~ msgid "your edit contained a banned link pattern"
 #~ msgstr "Votre édition contient une correspondance de liens bannis"
 
@@ -1480,15 +1428,8 @@
 #~ msgid "and enter"
 #~ msgstr "et entrer"
 
-#~ msgid ""
-#~ "You may create a new ZWiki Page object using the form below. You may also "
-#~ "choose to upload an existing html file from your local computer by "
-#~ "clicking the <i>Browse</i> button."
-#~ msgstr ""
-#~ "Vous pouvez créer un nouvel object de page ZWiki en utilisant le "
-#~ "formulaire ci-dessous. Vous pouvez aussi choisir de transférer un fichier "
-#~ "html existant, depuis votre ordinateur vers le Wiki, en cliquant sur le "
-#~ "boutton <i>Parcourir</i>."
+#~ msgid "You may create a new ZWiki Page object using the form below. You may also choose to upload an existing html file from your local computer by clicking the <i>Browse</i> button."
+#~ msgstr "Vous pouvez créer un nouvel object de page ZWiki en utilisant le formulaire ci-dessous. Vous pouvez aussi choisir de transférer un fichier html existant, depuis votre ordinateur vers le Wiki, en cliquant sur le boutton <i>Parcourir</i>."
 
 #~ msgid "Add"
 #~ msgstr "Ajouter"
@@ -1500,8 +1441,7 @@
 #~ msgstr "Rétroliens pour"
 
 #~ msgid "singleton_desc"
-#~ msgstr ""
-#~ "Les singletons sont des pages qui ne sont pas connectées à d'autres."
+#~ msgstr "Les singletons sont des pages qui ne sont pas connectées à d'autres."
 
 #~ msgid "History for"
 #~ msgstr "Historique pour"
@@ -1510,19 +1450,13 @@
 #~ msgstr "Retourner à la page"
 
 #~ msgid "help_shortname"
-#~ msgstr ""
-#~ "Note: Renommer une page dans un wiki de taille importante peut être lent. "
-#~ "Les autres pages seront mises à jour si cela est possible."
+#~ msgstr "Note: Renommer une page dans un wiki de taille importante peut être lent. Les autres pages seront mises à jour si cela est possible."
 
 #~ msgid "label_body_text"
 #~ msgstr "Corps du texte"
 
 #~ msgid "help_wikibody"
-#~ msgstr ""
-#~ "Dans une page Wiki, utilisez des [crochets] pour créer des liens. Quand "
-#~ "vous enregistrerez la page, le nom entre crochets sera suffixé par un "
-#~ "<code>?</code>. Quand vous cliquerez dessus, une nouvelle page sera créée "
-#~ "avec ce nom."
+#~ msgstr "Dans une page Wiki, utilisez des [crochets] pour créer des liens. Quand vous enregistrerez la page, le nom entre crochets sera suffixé par un <code>?</code>. Quand vous cliquerez dessus, une nouvelle page sera créée avec ce nom."
 
 #~ msgid "help_wikiwords"
 #~ msgstr "Ce wiki supporte aussi les WikiMots comme mécanisme de liaison."
@@ -1557,8 +1491,7 @@
 #~ "        « ${pagename} »"
 
 #~ msgid "description_edit_wiki_page"
-#~ msgstr ""
-#~ "Une page Wiki vous permet de créer des pages richement interconnectées."
+#~ msgstr "Une page Wiki vous permet de créer des pages richement interconnectées."
 
 #~ msgid "legend_wiki_page_details"
 #~ msgstr "Détails de la page Wiki"

Modified: zope-zwiki/trunk/i18n/he.po
===================================================================
--- zope-zwiki/trunk/i18n/he.po	2007-04-08 14:54:05 UTC (rev 761)
+++ zope-zwiki/trunk/i18n/he.po	2007-04-08 14:55:27 UTC (rev 762)
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: ZWiki-0-34-0\n"
-"POT-Creation-Date: Sat Sep  2 18:10:16 2006\n"
+"POT-Creation-Date: Tue Mar 27 14:50:46 2007\n"
 "PO-Revision-Date: 2006-02-26 09:03+0000\n"
 "Last-Translator: Ofer Weisglass <ofer at plone.org.il>\n"
 "Language-Team: <zwiki at zwiki.org>\n"
@@ -14,35 +14,31 @@
 "Preferred-encodings: utf-8 latin1\n"
 "Domain: zwiki\n"
 
-#: src/ZWiki/Admin.py:62
+#: src/ZWiki/Admin.py:58
 msgid "You are not authorized to upgrade all pages."
 msgstr ""
 
-#: src/ZWiki/Admin.py:63
+#: src/ZWiki/Admin.py:59
 msgid "(folder -> Manage properties)"
 msgstr ""
 
-#: src/ZWiki/Diff.py:174
+#: src/ZWiki/Diff.py:179
 #, fuzzy
 msgid "You are not authorized to reparent this ZWiki Page."
 msgstr "אינך מורשה לעלות קבצים לעמוד זויקי זה"
 
-#: src/ZWiki/Diff.py:180 src/ZWiki/plugins/tracker/tracker.py:332
+#: src/ZWiki/Diff.py:185 src/ZWiki/plugins/tracker/tracker.py:333
 #, fuzzy
 msgid "You are not authorized to rename this ZWiki Page."
 msgstr "אינך מורשה לעלות קבצים לעמוד זויקי זה"
 
-#: src/ZWiki/Editing.py:156 src/ZWiki/Editing.py:294 src/ZWiki/Views.py:332
-#: src/ZWiki/Views.py:435 src/ZWiki/plugins/tracker/tracker.py:321
-msgid ""
-"Sorry, this wiki doesn't allow anonymous edits. Please configure a username "
-"in options first."
+#: src/ZWiki/Editing.py:156 src/ZWiki/Editing.py:294 src/ZWiki/Views.py:336
+#: src/ZWiki/Views.py:439 src/ZWiki/plugins/tracker/tracker.py:322
+msgid "Sorry, this wiki doesn't allow anonymous edits. Please configure a username in options first."
 msgstr ""
 
 #: src/ZWiki/Editing.py:327
-msgid ""
-"You are not authorized to reparent or change subtopics links on this ZWiki "
-"Page."
+msgid "You are not authorized to reparent or change subtopics links on this ZWiki Page."
 msgstr ""
 
 #: src/ZWiki/Editing.py:349
@@ -50,9 +46,9 @@
 msgstr ""
 
 #: src/ZWiki/Editing.py:383 src/ZWiki/Editing.py:410
-#: src/ZWiki/plugins/tracker/tracker.py:340
-#: src/ZWiki/plugins/tracker/tracker.py:347
-#: src/ZWiki/plugins/tracker/tracker.py:354
+#: src/ZWiki/plugins/tracker/tracker.py:344
+#: src/ZWiki/plugins/tracker/tracker.py:351
+#: src/ZWiki/plugins/tracker/tracker.py:358
 msgid "You are not authorized to edit this ZWiki Page."
 msgstr ""
 
@@ -61,8 +57,7 @@
 msgstr ""
 
 #: src/ZWiki/Editing.py:563
-msgid ""
-"This page was renamed to %s. You can delete this one if no longer needed.\n"
+msgid "This page was renamed to %s. You can delete this one if no longer needed.\n"
 msgstr ""
 
 #: src/ZWiki/Editing.py:659
@@ -82,9 +77,7 @@
 msgstr ""
 
 #: src/ZWiki/Editing.py:830
-msgid ""
-"your edit contained a banned link pattern. Please contact the site "
-"administrator for help."
+msgid "your edit contained a banned link pattern. Please contact the site administrator for help."
 msgstr ""
 
 #: src/ZWiki/Editing.py:841
@@ -92,10 +85,7 @@
 msgstr ""
 
 #: src/ZWiki/Editing.py:842
-msgid ""
-"adding of external links by unidentified users is restricted. Please back up "
-"and remove some of the http urls you added, or contact the site "
-"administrator for help."
+msgid "adding of external links by unidentified users is restricted. Please back up and remove some of the http urls you added, or contact the site administrator for help."
 msgstr ""
 
 #: src/ZWiki/Editing.py:853
@@ -103,85 +93,86 @@
 msgstr ""
 
 #: src/ZWiki/Editing.py:854
-msgid ""
-"adding of external links is restricted, even for identified users. Please "
-"back up and remove some of the http urls you added, or contact the site "
-"administrator for help."
+msgid "adding of external links is restricted, even for identified users. Please back up and remove some of the http urls you added, or contact the site administrator for help."
 msgstr ""
 
-#: src/ZWiki/Mail.py:506 src/ZWiki/skins/dtmlmessages.pt:58
+#: src/ZWiki/Mail.py:506 src/ZWiki/skins/dtmlmessages.pt:60
 msgid "anonymous"
 msgstr "אנונימי"
 
-#: src/ZWiki/OutlineSupport.py:843 src/ZWiki/skins/zwiki/links.pt:56
+#: src/ZWiki/OutlineSupport.py:378
+msgid "Sorry, this wiki doesn't allow anonymous reparenting. Please configure a username in options first."
+msgstr ""
+
+#: src/ZWiki/OutlineSupport.py:878 src/ZWiki/skins/zwiki/links.pt:56
 msgid "which pages link to this one ?"
 msgstr ""
 
-#: src/ZWiki/OutlineSupport.py:851
+#: src/ZWiki/OutlineSupport.py:886
 msgid "You are here"
 msgstr "הנך כאן"
 
-#: src/ZWiki/Utils.py:465
+#: src/ZWiki/Utils.py:487
 msgid "years"
 msgstr "שנים"
 
-#: src/ZWiki/Utils.py:465
+#: src/ZWiki/Utils.py:487
 msgid "year"
 msgstr "שנה"
 
-#: src/ZWiki/Utils.py:467
+#: src/ZWiki/Utils.py:489
 msgid "month"
 msgstr "חודש"
 
-#: src/ZWiki/Utils.py:467
+#: src/ZWiki/Utils.py:489
 msgid "months"
 msgstr "חודשים"
 
-#: src/ZWiki/Utils.py:469
+#: src/ZWiki/Utils.py:491
 msgid "weeks"
 msgstr "שבועות"
 
-#: src/ZWiki/Utils.py:469
+#: src/ZWiki/Utils.py:491
 msgid "week"
 msgstr "שבוע"
 
-#: src/ZWiki/Utils.py:471
+#: src/ZWiki/Utils.py:493
 msgid "day"
 msgstr "יום"
 
-#: src/ZWiki/Utils.py:471
+#: src/ZWiki/Utils.py:493
 msgid "days"
 msgstr "ימים"
 
-#: src/ZWiki/Utils.py:473
+#: src/ZWiki/Utils.py:495
 msgid "hours"
 msgstr "שעות"
 
-#: src/ZWiki/Utils.py:473
+#: src/ZWiki/Utils.py:495
 msgid "hour"
 msgstr "שעה"
 
-#: src/ZWiki/Utils.py:475
+#: src/ZWiki/Utils.py:497
 msgid "minute"
 msgstr "דקה"
 
-#: src/ZWiki/Utils.py:475
+#: src/ZWiki/Utils.py:497
 msgid "minutes"
 msgstr "דקות"
 
-#: src/ZWiki/Utils.py:477
+#: src/ZWiki/Utils.py:499
 msgid "second"
 msgstr "שניה"
 
-#: src/ZWiki/Utils.py:477
+#: src/ZWiki/Utils.py:499
 msgid "seconds"
 msgstr "שניות"
 
-#: src/ZWiki/Views.py:346
+#: src/ZWiki/Views.py:350
 msgid "Page is locked"
 msgstr "עמוד זה נעול"
 
-#: src/ZWiki/Views.py:357
+#: src/ZWiki/Views.py:361
 msgid ""
 "\n"
 "            This page has a webDAV lock. Someone is probably editing it\n"
@@ -192,60 +183,58 @@
 "            "
 msgstr ""
 
-#: src/ZWiki/Views.py:364
+#: src/ZWiki/Views.py:368
 msgid "To discard your changes and try again, click OK."
 msgstr ""
 
-#: src/ZWiki/Views.py:393
+#: src/ZWiki/Views.py:397
 msgid "Edit conflict"
 msgstr "קונפליקט עריכה"
 
-#: src/ZWiki/Views.py:413
+#: src/ZWiki/Views.py:417
 msgid "Someone else has saved this page while you were editing"
 msgstr ""
 
-#: src/ZWiki/Views.py:414
+#: src/ZWiki/Views.py:418
 msgid "To resolve the conflict, do this"
 msgstr ""
 
-#: src/ZWiki/Views.py:415
+#: src/ZWiki/Views.py:419
 msgid "Click your browser's back button"
 msgstr ""
 
-#: src/ZWiki/Views.py:416
+#: src/ZWiki/Views.py:420
 msgid "Copy your recent edits to the clipboard"
 msgstr ""
 
-#: src/ZWiki/Views.py:417
+#: src/ZWiki/Views.py:421
 msgid "Click your browser's refresh button"
 msgstr ""
 
-#: src/ZWiki/Views.py:418
+#: src/ZWiki/Views.py:422
 msgid "Paste in your edits again, being mindful of the latest changes"
 msgstr ""
 
-#: src/ZWiki/Views.py:419
+#: src/ZWiki/Views.py:423
 msgid "Click the Change button again"
 msgstr "לחץ על כפתור השינוי שוב"
 
-#: src/ZWiki/Views.py:420 src/ZWiki/skins/zwiki/editform.pt:163
+#: src/ZWiki/Views.py:424 src/ZWiki/skins/zwiki/editform.pt:163
 msgid "or"
 msgstr "או"
 
-#: src/ZWiki/Views.py:421
+#: src/ZWiki/Views.py:425
 msgid "To discard your changes and start again, click OK"
 msgstr ""
 
-#: src/ZWiki/Views.py:490
+#: src/ZWiki/Views.py:501
 msgid ""
 "\n"
-"        Access keys can be accessed in mozilla-based browsers by pressing "
-"alt-<key>\n"
+"        Access keys can be accessed in mozilla-based browsers by pressing alt-<key>\n"
 "        IE users: must also press enter\n"
 "        Mac users: command-<key>\n"
 "        Opera users: shift-escape-<key>\n"
-"        These won't work here, back up to the previous page to try them "
-"out.\n"
+"        These won't work here, back up to the previous page to try them out.\n"
 "\n"
 "        0    show these access key assignments\n"
 "\n"
@@ -261,10 +250,8 @@
 "        s    go to search field\n"
 "        \n"
 "        page functions:\n"
-"        +    (in a plone/cmf site with skin switching set up) use zwiki's "
-"plone/cmf skin\n"
-"        -    (in a plone/cmf site with skin switching set up) use zwiki's "
-"standard skin\n"
+"        +    (in a plone/cmf site with skin switching set up) use zwiki's plone/cmf skin\n"
+"        -    (in a plone/cmf site with skin switching set up) use zwiki's standard skin\n"
 "        v    view page\n"
 "        m    mail subscription\n"
 "        b    show backlinks (links to this page)\n"
@@ -292,33 +279,32 @@
 "        "
 msgstr ""
 
-#: src/ZWiki/Wikis.py:49
-msgid "Unknown wiki type"
-msgstr ""
-
-#: src/ZWiki/ZWikiPage.py:675
+#: src/ZWiki/ZWikiPage.py:744
 msgid "create this page"
 msgstr "צור עמוד זה"
 
-#: src/ZWiki/ZWikiPage.py:798 src/ZWiki/ZWikiPage.py:814
-#: src/ZWiki/ZWikiPage.py:817
+#: src/ZWiki/ZWikiPage.py:872 src/ZWiki/ZWikiPage.py:887
 msgid "last edited %(interval)s ago"
 msgstr ""
 
-#: src/ZWiki/ZWikiPage.py:809
+#: src/ZWiki/ZWikiPage.py:882
 #, fuzzy
 msgid "show last edit"
 msgstr "הצג פיציירים בסיסיים"
 
-#: src/ZWiki/ZWikiPage.py:826 src/ZWiki/ZWikiPage.py:828
+#: src/ZWiki/ZWikiPage.py:897 src/ZWiki/ZWikiPage.py:899
 msgid "by %(editor)s"
 msgstr ""
 
-#: src/ZWiki/__init__.py:34
+#: src/ZWiki/__init__.py:200
+msgid "Unknown wiki type"
+msgstr ""
+
+#: src/ZWiki/__init__.py:39
 msgid "No need to add a Zwiki Outline Cache"
 msgstr ""
 
-#: src/ZWiki/__init__.py:35
+#: src/ZWiki/__init__.py:40
 msgid ""
 "Zwiki Outline Cache appears in the ZMI Add menu\n"
 "        for implementation reasons, but should not be added directly.\n"
@@ -330,6 +316,10 @@
 msgid "comments"
 msgstr "הערות"
 
+#: src/ZWiki/pagetypes/html.py:50 src/ZWiki/pagetypes/rst.py:85
+msgid "reply"
+msgstr "הגב"
+
 #: src/ZWiki/pagetypes/moin.py:1990
 msgid "Expected \"=\" to follow \"%(token)s\""
 msgstr ""
@@ -366,10 +356,6 @@
 msgid "Expected a color value \"%(arg)s\" after \"%(key)s\""
 msgstr ""
 
-#: src/ZWiki/pagetypes/rst.py:85
-msgid "reply"
-msgstr "הגב"
-
 #: src/ZWiki/plugins/latexwiki/wikis/latexwiki/diffform.pt:127
 #: src/ZWiki/plugins/mathaction/wikis/mathaction/old-diffform.pt:127
 msgid "full history"
@@ -445,7 +431,7 @@
 msgstr "כותרת"
 
 #: src/ZWiki/plugins/tracker/filterissues.pt:12
-#: src/ZWiki/skins/dtmlmessages.pt:30
+#: src/ZWiki/skins/dtmlmessages.pt:31
 msgid "Filter issues"
 msgstr ""
 
@@ -457,365 +443,360 @@
 msgid "Issue tracker"
 msgstr ""
 
-#: src/ZWiki/plugins/tracker/tracker.py:361
+#: src/ZWiki/plugins/tracker/tracker.py:365
 #, fuzzy
 msgid "You are not authorized to comment on this ZWiki Page."
 msgstr "אינך מורשה לעלות קבצים לעמוד זויקי זה"
 
-#: src/ZWiki/skins/dtmlmessages.pt:10 src/ZWiki/skins/dtmlmessages.pt:32
+#: src/ZWiki/skins/dtmlmessages.pt:10 src/ZWiki/skins/dtmlmessages.pt:33
+#, fuzzy
+msgid "name"
+msgstr "שם"
+
+#: src/ZWiki/skins/dtmlmessages.pt:11 src/ZWiki/skins/dtmlmessages.pt:34
 msgid "category"
 msgstr "קטגוריה"
 
-#: src/ZWiki/skins/dtmlmessages.pt:11 src/ZWiki/skins/dtmlmessages.pt:33
+#: src/ZWiki/skins/dtmlmessages.pt:12 src/ZWiki/skins/dtmlmessages.pt:35
 msgid "severity"
 msgstr ""
 
-#: src/ZWiki/skins/dtmlmessages.pt:12 src/ZWiki/skins/dtmlmessages.pt:34
+#: src/ZWiki/skins/dtmlmessages.pt:13 src/ZWiki/skins/dtmlmessages.pt:36
 msgid "status"
 msgstr "מצב"
 
-#: src/ZWiki/skins/dtmlmessages.pt:13 src/ZWiki/skins/dtmlmessages.pt:35
+#: src/ZWiki/skins/dtmlmessages.pt:14 src/ZWiki/skins/dtmlmessages.pt:37
 msgid "age"
 msgstr "גיל"
 
-#: src/ZWiki/skins/dtmlmessages.pt:14 src/ZWiki/skins/dtmlmessages.pt:36
+#: src/ZWiki/skins/dtmlmessages.pt:15 src/ZWiki/skins/dtmlmessages.pt:38
 msgid "modified"
 msgstr "עודכן"
 
-#: src/ZWiki/skins/dtmlmessages.pt:15
+#: src/ZWiki/skins/dtmlmessages.pt:16
 #, fuzzy
 msgid "Add a new issue:"
 msgstr "הוסף נושא"
 
-#: src/ZWiki/skins/dtmlmessages.pt:16
+#: src/ZWiki/skins/dtmlmessages.pt:17
 msgid "Name:"
 msgstr "שם:"
 
-#: src/ZWiki/skins/dtmlmessages.pt:17
+#: src/ZWiki/skins/dtmlmessages.pt:18
 msgid "Category:"
 msgstr "קטגוריה:"
 
-#: src/ZWiki/skins/dtmlmessages.pt:18
+#: src/ZWiki/skins/dtmlmessages.pt:19
 msgid "Severity:"
 msgstr ""
 
-#: src/ZWiki/skins/dtmlmessages.pt:19
-msgid "Status:"
-msgstr "מצב:"
-
 #: src/ZWiki/skins/dtmlmessages.pt:2
 #, fuzzy
 msgid "Here are the wiki's issue pages."
 msgstr "צור עמוד ויקי זה"
 
 #: src/ZWiki/skins/dtmlmessages.pt:20
+msgid "Status:"
+msgstr "מצב:"
+
+#: src/ZWiki/skins/dtmlmessages.pt:21
 msgid "Details:"
 msgstr "פרטים:"
 
-#: src/ZWiki/skins/dtmlmessages.pt:21
+#: src/ZWiki/skins/dtmlmessages.pt:22
 msgid "add issue"
 msgstr "הוסף נושא"
 
-#: src/ZWiki/skins/dtmlmessages.pt:22
+#: src/ZWiki/skins/dtmlmessages.pt:23
 msgid "More advanced"
 msgstr ""
 
-#: src/ZWiki/skins/dtmlmessages.pt:23
+#: src/ZWiki/skins/dtmlmessages.pt:24
 msgid "issue tracker"
 msgstr ""
 
-#: src/ZWiki/skins/dtmlmessages.pt:24
+#: src/ZWiki/skins/dtmlmessages.pt:25
 msgid "search options"
 msgstr "אפשרויות חיפוש"
 
-#: src/ZWiki/skins/dtmlmessages.pt:25
+#: src/ZWiki/skins/dtmlmessages.pt:26
 msgid "Name contains any of:"
 msgstr ""
 
-#: src/ZWiki/skins/dtmlmessages.pt:26
+#: src/ZWiki/skins/dtmlmessages.pt:27
 msgid "Page text contains any of:"
 msgstr ""
 
-#: src/ZWiki/skins/dtmlmessages.pt:27
+#: src/ZWiki/skins/dtmlmessages.pt:28
 msgid "Categories:"
 msgstr "קטגוריות"
 
-#: src/ZWiki/skins/dtmlmessages.pt:28
+#: src/ZWiki/skins/dtmlmessages.pt:29
 msgid "Severities:"
 msgstr ""
 
-#: src/ZWiki/skins/dtmlmessages.pt:29
+#: src/ZWiki/skins/dtmlmessages.pt:3
+msgid "Enter a search term, click the numbers to the right,"
+msgstr ""
+
+#: src/ZWiki/skins/dtmlmessages.pt:30
 #, fuzzy
 msgid "Statuses:"
 msgstr "מצב:"
 
-#: src/ZWiki/skins/dtmlmessages.pt:3
-msgid "Enter a search term, click the numbers to the right,"
+#: src/ZWiki/skins/dtmlmessages.pt:39
+msgid "Submitted by"
 msgstr ""
 
-#: src/ZWiki/skins/dtmlmessages.pt:37
-msgid "Submitted by"
+#: src/ZWiki/skins/dtmlmessages.pt:4
+msgid "filter issues"
 msgstr ""
 
-#: src/ZWiki/skins/dtmlmessages.pt:38
+#: src/ZWiki/skins/dtmlmessages.pt:40
 msgid "Name"
 msgstr "שם"
 
-#: src/ZWiki/skins/dtmlmessages.pt:39
+#: src/ZWiki/skins/dtmlmessages.pt:41
 msgid "Category"
 msgstr "קטגוריה"
 
-#: src/ZWiki/skins/dtmlmessages.pt:4
-msgid "filter issues"
-msgstr ""
-
-#: src/ZWiki/skins/dtmlmessages.pt:40
+#: src/ZWiki/skins/dtmlmessages.pt:42
 msgid "Severity"
 msgstr ""
 
-#: src/ZWiki/skins/dtmlmessages.pt:41
+#: src/ZWiki/skins/dtmlmessages.pt:43
 msgid "Status"
 msgstr "מצב"
 
-#: src/ZWiki/skins/dtmlmessages.pt:42
+#: src/ZWiki/skins/dtmlmessages.pt:44
 #, fuzzy
 msgid "Optional subject"
 msgstr "נושא"
 
-#: src/ZWiki/skins/dtmlmessages.pt:43
+#: src/ZWiki/skins/dtmlmessages.pt:45
 #, fuzzy
 msgid "Optional comment"
 msgstr "נושא"
 
-#: src/ZWiki/skins/dtmlmessages.pt:44 src/ZWiki/skins/dtmlmessages.pt:45
+#: src/ZWiki/skins/dtmlmessages.pt:46 src/ZWiki/skins/dtmlmessages.pt:47
 #, fuzzy
 msgid "Add ZWiki"
 msgstr "הוסף עמוד ויקי"
 
-#: src/ZWiki/skins/dtmlmessages.pt:46
+#: src/ZWiki/skins/dtmlmessages.pt:48
 msgid "Id:"
 msgstr ""
 
-#: src/ZWiki/skins/dtmlmessages.pt:47
+#: src/ZWiki/skins/dtmlmessages.pt:49
 #, fuzzy
 msgid "Title:"
 msgstr "כותרת"
 
-#: src/ZWiki/skins/dtmlmessages.pt:48
+#: src/ZWiki/skins/dtmlmessages.pt:5
+msgid "browse open issues"
+msgstr ""
+
+#: src/ZWiki/skins/dtmlmessages.pt:50
 msgid "Template:"
 msgstr ""
 
-#: src/ZWiki/skins/dtmlmessages.pt:49
+#: src/ZWiki/skins/dtmlmessages.pt:51
 #, fuzzy
 msgid "Add wiki"
 msgstr "הוסף עמוד ויקי"
 
-#: src/ZWiki/skins/dtmlmessages.pt:5
-msgid "browse open issues"
-msgstr ""
-
-#: src/ZWiki/skins/dtmlmessages.pt:50
+#: src/ZWiki/skins/dtmlmessages.pt:52
 msgid "Pages changed in the last"
 msgstr "עמודים שהשתנו לאחרונה"
 
-#: src/ZWiki/skins/dtmlmessages.pt:51
+#: src/ZWiki/skins/dtmlmessages.pt:53
 msgid "Recently changed pages, with summaries"
 msgstr ""
 
-#: src/ZWiki/skins/dtmlmessages.pt:52
+#: src/ZWiki/skins/dtmlmessages.pt:54
 msgid "Show summaries ?"
 msgstr "הצג סיכומים?"
 
-#: src/ZWiki/skins/dtmlmessages.pt:53
+#: src/ZWiki/skins/dtmlmessages.pt:55
 msgid "Refresh"
 msgstr "רעון"
 
-#: src/ZWiki/skins/dtmlmessages.pt:54
+#: src/ZWiki/skins/dtmlmessages.pt:56
 msgid "Page"
 msgstr "עמוד"
 
-#: src/ZWiki/skins/dtmlmessages.pt:55
+#: src/ZWiki/skins/dtmlmessages.pt:57
 msgid "Edited&nbsp;by"
 msgstr ""
 
-#: src/ZWiki/skins/dtmlmessages.pt:56
+#: src/ZWiki/skins/dtmlmessages.pt:58
 msgid "Time"
 msgstr "עמוד"
 
-#: src/ZWiki/skins/dtmlmessages.pt:57
+#: src/ZWiki/skins/dtmlmessages.pt:59
 msgid "NEW"
 msgstr "חדש"
 
-#: src/ZWiki/skins/dtmlmessages.pt:59
-msgid "Pages marked (NEW) have been created within the last week"
-msgstr ""
-
 #: src/ZWiki/skins/dtmlmessages.pt:6
 #, fuzzy
 msgid "search issues"
 msgstr "אפשרויות חיפוש"
 
-#: src/ZWiki/skins/dtmlmessages.pt:60
+#: src/ZWiki/skins/dtmlmessages.pt:61
+msgid "Pages marked (NEW) have been created within the last week"
+msgstr ""
+
+#: src/ZWiki/skins/dtmlmessages.pt:62
 msgid "Enter a word or phrase and hit enter to search the entire wiki."
 msgstr ""
 
-#: src/ZWiki/skins/dtmlmessages.pt:61
+#: src/ZWiki/skins/dtmlmessages.pt:63
 msgid "This is the same as using the search field at top right."
 msgstr ""
 
-#: src/ZWiki/skins/dtmlmessages.pt:62
+#: src/ZWiki/skins/dtmlmessages.pt:64
 msgid "Tips: A single word works best for matching page names."
 msgstr ""
 
-#: src/ZWiki/skins/dtmlmessages.pt:63
-msgid ""
-"Case-insensitivity and wildcards may be supported depending on your catalog "
-"configuration."
+#: src/ZWiki/skins/dtmlmessages.pt:65
+msgid "Case-insensitivity and wildcards may be supported depending on your catalog configuration."
 msgstr ""
 
-#: src/ZWiki/skins/dtmlmessages.pt:64
+#: src/ZWiki/skins/dtmlmessages.pt:66
 msgid "Leave it blank to list all pages."
 msgstr ""
 
-#: src/ZWiki/skins/dtmlmessages.pt:65 src/ZWiki/skins/dtmlmessages.pt:66
+#: src/ZWiki/skins/dtmlmessages.pt:67 src/ZWiki/skins/dtmlmessages.pt:68
 msgid "Search"
 msgstr "חיפוש"
 
-#: src/ZWiki/skins/dtmlmessages.pt:67
+#: src/ZWiki/skins/dtmlmessages.pt:69
 msgid "Page names matching"
 msgstr ""
 
-#: src/ZWiki/skins/dtmlmessages.pt:68
+#: src/ZWiki/skins/dtmlmessages.pt:7
+msgid "recent"
+msgstr "לאחרונה"
+
+#: src/ZWiki/skins/dtmlmessages.pt:70
 msgid "Text matching"
 msgstr "טקסט תואם"
 
-#: src/ZWiki/skins/dtmlmessages.pt:69
+#: src/ZWiki/skins/dtmlmessages.pt:71
 msgid "Thorough (non-catalog) search for text matching"
 msgstr ""
 
-#: src/ZWiki/skins/dtmlmessages.pt:7
-msgid "recent"
-msgstr "לאחרונה"
-
-#: src/ZWiki/skins/dtmlmessages.pt:70
+#: src/ZWiki/skins/dtmlmessages.pt:72
 msgid "Set your preferences for this wiki:"
 msgstr ""
 
-#: src/ZWiki/skins/dtmlmessages.pt:71
+#: src/ZWiki/skins/dtmlmessages.pt:73
 #, fuzzy
 msgid "User name:"
 msgstr "שם משתמש"
 
-#: src/ZWiki/skins/dtmlmessages.pt:72
-msgid "(identifies your edits)"
+#: src/ZWiki/skins/dtmlmessages.pt:74
+msgid "(identifies your edits, saves your votes, may be required)"
 msgstr ""
 
-#: src/ZWiki/skins/dtmlmessages.pt:73
+#: src/ZWiki/skins/dtmlmessages.pt:75
 #, fuzzy
 msgid "Email address:"
 msgstr "תיבת הדואר האלקטרוני שלך"
 
-#: src/ZWiki/skins/dtmlmessages.pt:74
+#: src/ZWiki/skins/dtmlmessages.pt:76
 #, fuzzy
 msgid "(allows mail subscription)"
 msgstr "רישום לדורא"
 
-#: src/ZWiki/skins/dtmlmessages.pt:75
+#: src/ZWiki/skins/dtmlmessages.pt:77
 #, fuzzy
 msgid "Your time zone:"
 msgstr "קו זמן"
 
-#: src/ZWiki/skins/dtmlmessages.pt:76
+#: src/ZWiki/skins/dtmlmessages.pt:78
 msgid "(localizes most times)"
 msgstr ""
 
-#: src/ZWiki/skins/dtmlmessages.pt:77
+#: src/ZWiki/skins/dtmlmessages.pt:79
 msgid "Edit form height:"
 msgstr ""
 
-#: src/ZWiki/skins/dtmlmessages.pt:78
+#: src/ZWiki/skins/dtmlmessages.pt:8
+msgid "all"
+msgstr "כולם"
+
+#: src/ZWiki/skins/dtmlmessages.pt:80
 msgid "(adjusts form size)"
 msgstr ""
 
-#: src/ZWiki/skins/dtmlmessages.pt:79
+#: src/ZWiki/skins/dtmlmessages.pt:81
 msgid "Save options"
 msgstr "שמור אפשרויות"
 
-#: src/ZWiki/skins/dtmlmessages.pt:8
-msgid "all"
-msgstr "כולם"
-
-#: src/ZWiki/skins/dtmlmessages.pt:80
+#: src/ZWiki/skins/dtmlmessages.pt:82
 msgid "Forget options"
 msgstr "שכח אפשרויות"
 
-#: src/ZWiki/skins/dtmlmessages.pt:81 src/ZWiki/skins/dtmlmessages.pt:82
+#: src/ZWiki/skins/dtmlmessages.pt:83 src/ZWiki/skins/dtmlmessages.pt:84
 msgid "Add ZWiki Page"
 msgstr "הוסף עמוד ויקי"
 
-#: src/ZWiki/skins/dtmlmessages.pt:83
+#: src/ZWiki/skins/dtmlmessages.pt:85
 #, fuzzy
 msgid "Page&nbsp;name:"
 msgstr "שם עמוד"
 
-#: src/ZWiki/skins/dtmlmessages.pt:84
+#: src/ZWiki/skins/dtmlmessages.pt:86
 #, fuzzy
 msgid "Add wiki page"
 msgstr "הוסף עמוד ויקי"
 
-#: src/ZWiki/skins/dtmlmessages.pt:85
+#: src/ZWiki/skins/dtmlmessages.pt:87
 msgid "Topic"
 msgstr ""
 
-#: src/ZWiki/skins/dtmlmessages.pt:86
+#: src/ZWiki/skins/dtmlmessages.pt:88
 msgid "Last updated"
 msgstr ""
 
-#: src/ZWiki/skins/dtmlmessages.pt:87
+#: src/ZWiki/skins/dtmlmessages.pt:89
 #, fuzzy
 msgid "Comments"
 msgstr "הערות"
 
-#: src/ZWiki/skins/dtmlmessages.pt:88
+#: src/ZWiki/skins/dtmlmessages.pt:9 src/ZWiki/skins/dtmlmessages.pt:32
+msgid "#"
+msgstr ""
+
+#: src/ZWiki/skins/dtmlmessages.pt:90
 #, fuzzy
 msgid "Views"
 msgstr "צפה"
 
-#: src/ZWiki/skins/dtmlmessages.pt:89
+#: src/ZWiki/skins/dtmlmessages.pt:91
 #, fuzzy
 msgid "Created"
 msgstr "צור"
 
-#: src/ZWiki/skins/dtmlmessages.pt:9 src/ZWiki/skins/dtmlmessages.pt:31
-msgid "#"
-msgstr ""
-
-#: src/ZWiki/skins/dtmlmessages.pt:90 src/ZWiki/skins/dtmlmessages.pt:92
+#: src/ZWiki/skins/dtmlmessages.pt:92 src/ZWiki/skins/dtmlmessages.pt:94
 msgid "by"
 msgstr ""
 
-#: src/ZWiki/skins/dtmlmessages.pt:91
+#: src/ZWiki/skins/dtmlmessages.pt:93
 msgid "<dtml-var lasteditinterval> ago</dtml-var>"
 msgstr ""
 
-#: src/ZWiki/skins/dtmlmessages.pt:93
+#: src/ZWiki/skins/dtmlmessages.pt:95
 msgid "on"
 msgstr ""
 
-#: src/ZWiki/skins/zwiki/backlinks.pt:108
-msgid "Subtopics"
-msgstr ""
-
-#: src/ZWiki/skins/zwiki/backlinks.pt:111
-msgid "This page has no subtopics."
-msgstr ""
-
-#: src/ZWiki/skins/zwiki/backlinks.pt:114
+#: src/ZWiki/skins/zwiki/backlinks.pt:102
 #, fuzzy
 msgid "Here are it's subtopics."
 msgstr "צור עמוד ויקי זה"
 
-#: src/ZWiki/skins/zwiki/backlinks.pt:117
+#: src/ZWiki/skins/zwiki/backlinks.pt:105
 msgid "You can reorder them by clicking the ^ buttons."
 msgstr ""
 
@@ -829,60 +810,60 @@
 msgid "Parents"
 msgstr "לאחרונה"
 
-#: src/ZWiki/skins/zwiki/backlinks.pt:31
+#: src/ZWiki/skins/zwiki/backlinks.pt:28
 msgid "is a top-level topic."
 msgstr ""
 
-#: src/ZWiki/skins/zwiki/backlinks.pt:32
+#: src/ZWiki/skins/zwiki/backlinks.pt:29
 msgid "is a subtopic of:"
 msgstr ""
 
-#: src/ZWiki/skins/zwiki/backlinks.pt:55
+#: src/ZWiki/skins/zwiki/backlinks.pt:48
 msgid "Backlinks"
 msgstr ""
 
-#: src/ZWiki/skins/zwiki/backlinks.pt:56
+#: src/ZWiki/skins/zwiki/backlinks.pt:49
 msgid "Here are the pages which link to it:"
 msgstr ""
 
-#: src/ZWiki/skins/zwiki/backlinks.pt:57
+#: src/ZWiki/skins/zwiki/backlinks.pt:50
 msgid "No other pages link to this one."
 msgstr ""
 
-#: src/ZWiki/skins/zwiki/backlinks.pt:82
-msgid ""
-"You can set this page's parent(s) to place it within the overall page "
-"hierarchy."
+#: src/ZWiki/skins/zwiki/backlinks.pt:70
+msgid "You can set this page's parent(s) to place it within the overall page hierarchy."
 msgstr ""
 
-#: src/ZWiki/skins/zwiki/backlinks.pt:85
-msgid ""
-"Check one or more checkboxes or enter a page name here, and click the button."
+#: src/ZWiki/skins/zwiki/backlinks.pt:73
+msgid "Check one or more checkboxes or enter a page name here, and click the button."
 msgstr ""
 
-#: src/ZWiki/skins/zwiki/backlinks.pt:88
+#: src/ZWiki/skins/zwiki/backlinks.pt:76
 msgid "Enter a page name here and click the button."
 msgstr ""
 
-#: src/ZWiki/skins/zwiki/backlinks.pt:91
-msgid ""
-"You can type just the first few letters, case and punctuation are ignored."
+#: src/ZWiki/skins/zwiki/backlinks.pt:79
+msgid "You can type just the first few letters, case and punctuation are ignored."
 msgstr ""
 
-#: src/ZWiki/skins/zwiki/backlinks.pt:98
+#: src/ZWiki/skins/zwiki/backlinks.pt:86
 msgid "Reparent"
 msgstr ""
 
+#: src/ZWiki/skins/zwiki/backlinks.pt:96
+msgid "Subtopics"
+msgstr ""
+
+#: src/ZWiki/skins/zwiki/backlinks.pt:99
+msgid "This page has no subtopics."
+msgstr ""
+
 #: src/ZWiki/skins/zwiki/badtemplate.pt:12
 msgid "Bad template"
 msgstr ""
 
 #: src/ZWiki/skins/zwiki/badtemplate.pt:13
-msgid ""
-"There was a problem locating one of this wiki's skin templates. There may be "
-"a page or other non-page-template/non-dtml-method object with the same ID, "
-"obscuring the template. Or the template may be missing on the filesystem (an "
-"incomplete Zwiki installation)."
+msgid "There was a problem locating one of this wiki's skin templates. There may be a page or other non-page-template/non-dtml-method object with the same ID, obscuring the template. Or the template may be missing on the filesystem (an incomplete Zwiki installation)."
 msgstr ""
 
 #: src/ZWiki/skins/zwiki/commentform.pt:21
@@ -914,12 +895,20 @@
 msgid "add-comment"
 msgstr "הוסף הערה"
 
-#: src/ZWiki/skins/zwiki/contentspage.pt:12
+#: src/ZWiki/skins/zwiki/contentspage.pt:10
+#: src/ZWiki/skins/zwiki/contentspage.pt:27
+#, fuzzy
+msgid "Wiki contents for"
+msgstr "תכני ויקי"
+
+#: src/ZWiki/skins/zwiki/contentspage.pt:13
+#: src/ZWiki/skins/zwiki/contentspage.pt:30
 msgid "Wiki contents"
 msgstr "תכני ויקי"
 
-#: src/ZWiki/skins/zwiki/contentspage.pt:16
-msgid "Singletons"
+#: src/ZWiki/skins/zwiki/contentspage.pt:40
+#, fuzzy
+msgid "Singletons:"
 msgstr "הצעות"
 
 #: src/ZWiki/skins/zwiki/denied.pt:12
@@ -1007,13 +996,13 @@
 
 #: src/ZWiki/skins/zwiki/editform.pt:178
 #, fuzzy
-msgid "preview this edit"
-msgstr "<< עריכה קודמת"
+msgid "Preview"
+msgstr "צפה"
 
 #: src/ZWiki/skins/zwiki/editform.pt:178
 #, fuzzy
-msgid "Preview"
-msgstr "צפה"
+msgid "preview this edit"
+msgstr "<< עריכה קודמת"
 
 #: src/ZWiki/skins/zwiki/editform.pt:183
 msgid "Cancel"
@@ -1050,13 +1039,18 @@
 msgstr ""
 
 #: src/ZWiki/skins/zwiki/editform.pt:71
-msgid "type"
-msgstr "סוג"
+msgid "markup"
+msgstr ""
 
 #: src/ZWiki/skins/zwiki/editform.pt:72
 msgid "select the formatting and rendering style for this page"
 msgstr ""
 
+#: src/ZWiki/skins/zwiki/helppage.pt:12
+#, fuzzy
+msgid "Help page"
+msgstr "עמוד עזרה"
+
 #: src/ZWiki/skins/zwiki/links.pt:102
 msgid "(external edit)"
 msgstr ""
@@ -1198,14 +1192,14 @@
 msgstr ""
 
 #: src/ZWiki/skins/zwiki/pagemanagementform.pt:45
+msgid "make this page a subtopic of the page you have entered"
+msgstr ""
+
+#: src/ZWiki/skins/zwiki/pagemanagementform.pt:45
 #, fuzzy
 msgid "reparent"
 msgstr "לאחרונה"
 
-#: src/ZWiki/skins/zwiki/pagemanagementform.pt:45
-msgid "make this page a subtopic of the page you have entered"
-msgstr ""
-
 #: src/ZWiki/skins/zwiki/pagemanagementform.pt:50
 msgid "rename this page to the name you have entered, updating all links"
 msgstr ""
@@ -1220,8 +1214,7 @@
 msgstr ""
 
 #: src/ZWiki/skins/zwiki/pagemanagementform.pt:55
-msgid ""
-"delete this page, and redirect links to the page you have entered, if any"
+msgid "delete this page, and redirect links to the page you have entered, if any"
 msgstr ""
 
 #: src/ZWiki/skins/zwiki/pagemanagementform.pt:60
@@ -1350,6 +1343,9 @@
 msgid "User options"
 msgstr "אפשרויות חיפוש"
 
+#~ msgid "type"
+#~ msgstr "סוג"
+
 #~ msgid "Type"
 #~ msgstr "סוג"
 

Modified: zope-zwiki/trunk/i18n/hu.po
===================================================================
--- zope-zwiki/trunk/i18n/hu.po	2007-04-08 14:54:05 UTC (rev 761)
+++ zope-zwiki/trunk/i18n/hu.po	2007-04-08 14:55:27 UTC (rev 762)
@@ -3,7 +3,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: zwiki-hu\n"
-"POT-Creation-Date: Sat Sep  2 18:10:16 2006\n"
+"POT-Creation-Date: Tue Mar 27 14:50:46 2007\n"
 "PO-Revision-Date: 2006-02-26 09:01+0000\n"
 "Last-Translator: József Jároli (kaixo) <en at innen.hu>\n"
 "Language-Team: Hungarian <hu at li.org>\n"
@@ -16,46 +16,40 @@
 "Domain: zwiki\n"
 "X-Generator: KBabel 1.3\n"
 
-#: src/ZWiki/Admin.py:62
+#: src/ZWiki/Admin.py:58
 msgid "You are not authorized to upgrade all pages."
 msgstr "Nincs jogosultsága az összes lap aktualizálásához."
 
-#: src/ZWiki/Admin.py:63
+#: src/ZWiki/Admin.py:59
 msgid "(folder -> Manage properties)"
 msgstr "(mappa -> Tulajnonságok beállítása)"
 
-#: src/ZWiki/Diff.py:174
+#: src/ZWiki/Diff.py:179
 #, fuzzy
 msgid "You are not authorized to reparent this ZWiki Page."
 msgstr "Nincs jogosultsága átnevezni ezt a ZWiki lapot."
 
-#: src/ZWiki/Diff.py:180 src/ZWiki/plugins/tracker/tracker.py:332
+#: src/ZWiki/Diff.py:185 src/ZWiki/plugins/tracker/tracker.py:333
 msgid "You are not authorized to rename this ZWiki Page."
 msgstr "Nincs jogosultsága átnevezni ezt a ZWiki lapot."
 
-#: src/ZWiki/Editing.py:156 src/ZWiki/Editing.py:294 src/ZWiki/Views.py:332
-#: src/ZWiki/Views.py:435 src/ZWiki/plugins/tracker/tracker.py:321
-msgid ""
-"Sorry, this wiki doesn't allow anonymous edits. Please configure a username "
-"in options first."
+#: src/ZWiki/Editing.py:156 src/ZWiki/Editing.py:294 src/ZWiki/Views.py:336
+#: src/ZWiki/Views.py:439 src/ZWiki/plugins/tracker/tracker.py:322
+msgid "Sorry, this wiki doesn't allow anonymous edits. Please configure a username in options first."
 msgstr ""
 
 #: src/ZWiki/Editing.py:327
-msgid ""
-"You are not authorized to reparent or change subtopics links on this ZWiki "
-"Page."
-msgstr ""
-"Nincs jogosultsága újraszármaztatni a lapot vagy megváltoztatni a "
-"fejezetekre mutató hivatkozásokat ezen a ZWiki lapon."
+msgid "You are not authorized to reparent or change subtopics links on this ZWiki Page."
+msgstr "Nincs jogosultsága újraszármaztatni a lapot vagy megváltoztatni a fejezetekre mutató hivatkozásokat ezen a ZWiki lapon."
 
 #: src/ZWiki/Editing.py:349
 msgid "You are not authorized to change this ZWiki Page's type."
 msgstr "Nincs jogosultsága megváltoztatni a ZWiki lap típusát."
 
 #: src/ZWiki/Editing.py:383 src/ZWiki/Editing.py:410
-#: src/ZWiki/plugins/tracker/tracker.py:340
-#: src/ZWiki/plugins/tracker/tracker.py:347
-#: src/ZWiki/plugins/tracker/tracker.py:354
+#: src/ZWiki/plugins/tracker/tracker.py:344
+#: src/ZWiki/plugins/tracker/tracker.py:351
+#: src/ZWiki/plugins/tracker/tracker.py:358
 msgid "You are not authorized to edit this ZWiki Page."
 msgstr "Nincs jogosultsága szerkeszteni ezt a ZWiki lapot."
 
@@ -64,11 +58,8 @@
 msgstr "Nincs jogosultsága törölni ezt a ZWiki lapot."
 
 #: src/ZWiki/Editing.py:563
-msgid ""
-"This page was renamed to %s. You can delete this one if no longer needed.\n"
-msgstr ""
-"Ez a lap át lett nevezve. Új neve: %s. Letörölheti ezt a lapot, ha nincs rá "
-"egyébként már szükség.\n"
+msgid "This page was renamed to %s. You can delete this one if no longer needed.\n"
+msgstr "Ez a lap át lett nevezve. Új neve: %s. Letörölheti ezt a lapot, ha nincs rá egyébként már szükség.\n"
 
 #: src/ZWiki/Editing.py:659
 msgid "You are not authorized to upload files here."
@@ -87,9 +78,7 @@
 msgstr ""
 
 #: src/ZWiki/Editing.py:830
-msgid ""
-"your edit contained a banned link pattern. Please contact the site "
-"administrator for help."
+msgid "your edit contained a banned link pattern. Please contact the site administrator for help."
 msgstr ""
 
 #: src/ZWiki/Editing.py:841
@@ -97,10 +86,7 @@
 msgstr ""
 
 #: src/ZWiki/Editing.py:842
-msgid ""
-"adding of external links by unidentified users is restricted. Please back up "
-"and remove some of the http urls you added, or contact the site "
-"administrator for help."
+msgid "adding of external links by unidentified users is restricted. Please back up and remove some of the http urls you added, or contact the site administrator for help."
 msgstr ""
 
 #: src/ZWiki/Editing.py:853
@@ -108,85 +94,86 @@
 msgstr ""
 
 #: src/ZWiki/Editing.py:854
-msgid ""
-"adding of external links is restricted, even for identified users. Please "
-"back up and remove some of the http urls you added, or contact the site "
-"administrator for help."
+msgid "adding of external links is restricted, even for identified users. Please back up and remove some of the http urls you added, or contact the site administrator for help."
 msgstr ""
 
-#: src/ZWiki/Mail.py:506 src/ZWiki/skins/dtmlmessages.pt:58
+#: src/ZWiki/Mail.py:506 src/ZWiki/skins/dtmlmessages.pt:60
 msgid "anonymous"
 msgstr "névtelen"
 
-#: src/ZWiki/OutlineSupport.py:843 src/ZWiki/skins/zwiki/links.pt:56
+#: src/ZWiki/OutlineSupport.py:378
+msgid "Sorry, this wiki doesn't allow anonymous reparenting. Please configure a username in options first."
+msgstr ""
+
+#: src/ZWiki/OutlineSupport.py:878 src/ZWiki/skins/zwiki/links.pt:56
 msgid "which pages link to this one ?"
 msgstr "Mely lapokról mutat hivatkozás erre a lapra?"
 
-#: src/ZWiki/OutlineSupport.py:851
+#: src/ZWiki/OutlineSupport.py:886
 msgid "You are here"
 msgstr "Aktuális lap"
 
-#: src/ZWiki/Utils.py:465
+#: src/ZWiki/Utils.py:487
 msgid "years"
 msgstr "év"
 
-#: src/ZWiki/Utils.py:465
+#: src/ZWiki/Utils.py:487
 msgid "year"
 msgstr "év"
 
-#: src/ZWiki/Utils.py:467
+#: src/ZWiki/Utils.py:489
 msgid "month"
 msgstr "hónap"
 
-#: src/ZWiki/Utils.py:467
+#: src/ZWiki/Utils.py:489
 msgid "months"
 msgstr "hónap"
 
-#: src/ZWiki/Utils.py:469
+#: src/ZWiki/Utils.py:491
 msgid "weeks"
 msgstr "hét"
 
-#: src/ZWiki/Utils.py:469
+#: src/ZWiki/Utils.py:491
 msgid "week"
 msgstr "hét"
 
-#: src/ZWiki/Utils.py:471
+#: src/ZWiki/Utils.py:493
 msgid "day"
 msgstr "nap"
 
-#: src/ZWiki/Utils.py:471
+#: src/ZWiki/Utils.py:493
 msgid "days"
 msgstr "nap"
 
-#: src/ZWiki/Utils.py:473
+#: src/ZWiki/Utils.py:495
 msgid "hours"
 msgstr "óra"
 
-#: src/ZWiki/Utils.py:473
+#: src/ZWiki/Utils.py:495
 msgid "hour"
 msgstr "óra"
 
-#: src/ZWiki/Utils.py:475
+#: src/ZWiki/Utils.py:497
 msgid "minute"
 msgstr "perc"
 
-#: src/ZWiki/Utils.py:475
+#: src/ZWiki/Utils.py:497
 msgid "minutes"
 msgstr "perc"
 
-#: src/ZWiki/Utils.py:477
+#: src/ZWiki/Utils.py:499
 msgid "second"
 msgstr "másodperc"
 
-#: src/ZWiki/Utils.py:477
+#: src/ZWiki/Utils.py:499
 msgid "seconds"
 msgstr "másodperc"
 
-#: src/ZWiki/Views.py:346
+#: src/ZWiki/Views.py:350
 msgid "Page is locked"
 msgstr "Zárolt lap"
 
-#: src/ZWiki/Views.py:357
+#: src/ZWiki/Views.py:361
 msgid ""
 "\n"
 "            This page has a webDAV lock. Someone is probably editing it\n"
@@ -197,75 +184,66 @@
 "            "
 msgstr ""
 "\n"
-"            A lapot zárolták webDAV protokollal. Valószínűleg valaki épp "
-"szerkeszti\n"
+"            A lapot zárolták webDAV protokollal. Valószínűleg valaki épp szerkeszti\n"
 "            egy külső szerkesztővel. Meg kell várnia amíg befejezik,\n"
-"            majd újra próbálkozni.  Ha már éppen megváltoztatott néhány "
-"dolgot,\n"
-"            akkor mentse el máshol a változtatásokat és másolja be az Ön "
-"verzióját \n"
+"            majd újra próbálkozni.  Ha már éppen megváltoztatott néhány dolgot,\n"
+"            akkor mentse el máshol a változtatásokat és másolja be az Ön verzióját \n"
 "            összehasonlításképp.\n"
 "            "
 
-#: src/ZWiki/Views.py:364
+#: src/ZWiki/Views.py:368
 msgid "To discard your changes and try again, click OK."
-msgstr ""
-"A változtatások elvetéséhez és az újrakezdéshez nyomja meg az \"OK\" gombot."
+msgstr "A változtatások elvetéséhez és az újrakezdéshez nyomja meg az \"OK\" gombot."
 
-#: src/ZWiki/Views.py:393
+#: src/ZWiki/Views.py:397
 msgid "Edit conflict"
 msgstr "Ellentmondás feloldása"
 
-#: src/ZWiki/Views.py:413
+#: src/ZWiki/Views.py:417
 msgid "Someone else has saved this page while you were editing"
 msgstr "Más már rámentett az lapra, amíg Ön szerkesztette azt."
 
-#: src/ZWiki/Views.py:414
+#: src/ZWiki/Views.py:418
 msgid "To resolve the conflict, do this"
 msgstr "Az ellentmondás feloldásához tegye a következőket:"
 
-#: src/ZWiki/Views.py:415
+#: src/ZWiki/Views.py:419
 msgid "Click your browser's back button"
 msgstr "Nyomja meg a böngészője \"Vissza\" gombját."
 
-#: src/ZWiki/Views.py:416
+#: src/ZWiki/Views.py:420
 msgid "Copy your recent edits to the clipboard"
 msgstr "Másolja a legutóbbi változtatásokat a vágólapra."
 
-#: src/ZWiki/Views.py:417
+#: src/ZWiki/Views.py:421
 msgid "Click your browser's refresh button"
 msgstr "Nyomja meg böngészője \"Frissítés\" gombját"
 
-#: src/ZWiki/Views.py:418
+#: src/ZWiki/Views.py:422
 msgid "Paste in your edits again, being mindful of the latest changes"
-msgstr ""
-"Szúrja be a szerkesztett részeket újra, szem előtt tartva a legutóbbi "
-"változtatásokat."
+msgstr "Szúrja be a szerkesztett részeket újra, szem előtt tartva a legutóbbi változtatásokat."
 
-#: src/ZWiki/Views.py:419
+#: src/ZWiki/Views.py:423
 msgid "Click the Change button again"
 msgstr "Nyomja meg a \"Változtat\" gombot még egyszer."
 
-#: src/ZWiki/Views.py:420 src/ZWiki/skins/zwiki/editform.pt:163
+#: src/ZWiki/Views.py:424 src/ZWiki/skins/zwiki/editform.pt:163
 msgid "or"
 msgstr "vagy"
 
-#: src/ZWiki/Views.py:421
+#: src/ZWiki/Views.py:425
 msgid "To discard your changes and start again, click OK"
-msgstr ""
-"A változások elvetéséhez és az újrakezdéshez nyomja meg az \"OK\" gombot."
+msgstr "A változások elvetéséhez és az újrakezdéshez nyomja meg az \"OK\" gombot."
 
-#: src/ZWiki/Views.py:490
+#: src/ZWiki/Views.py:501
 #, fuzzy
 msgid ""
 "\n"
-"        Access keys can be accessed in mozilla-based browsers by pressing "
-"alt-<key>\n"
+"        Access keys can be accessed in mozilla-based browsers by pressing alt-<key>\n"
 "        IE users: must also press enter\n"
 "        Mac users: command-<key>\n"
 "        Opera users: shift-escape-<key>\n"
-"        These won't work here, back up to the previous page to try them "
-"out.\n"
+"        These won't work here, back up to the previous page to try them out.\n"
 "\n"
 "        0    show these access key assignments\n"
 "\n"
@@ -281,10 +259,8 @@
 "        s    go to search field\n"
 "        \n"
 "        page functions:\n"
-"        +    (in a plone/cmf site with skin switching set up) use zwiki's "
-"plone/cmf skin\n"
-"        -    (in a plone/cmf site with skin switching set up) use zwiki's "
-"standard skin\n"
+"        +    (in a plone/cmf site with skin switching set up) use zwiki's plone/cmf skin\n"
+"        -    (in a plone/cmf site with skin switching set up) use zwiki's standard skin\n"
 "        v    view page\n"
 "        m    mail subscription\n"
 "        b    show backlinks (links to this page)\n"
@@ -354,33 +330,32 @@
 "        p    előző szerkesztés\n"
 "        "
 
-#: src/ZWiki/Wikis.py:49
-msgid "Unknown wiki type"
-msgstr ""
-
-#: src/ZWiki/ZWikiPage.py:675
+#: src/ZWiki/ZWikiPage.py:744
 msgid "create this page"
 msgstr "Hozd létre ezt a lapot"
 
-#: src/ZWiki/ZWikiPage.py:798 src/ZWiki/ZWikiPage.py:814
-#: src/ZWiki/ZWikiPage.py:817
+#: src/ZWiki/ZWikiPage.py:872 src/ZWiki/ZWikiPage.py:887
 msgid "last edited %(interval)s ago"
 msgstr "szerkesztés óta eltelt: %(interval)s"
 
-#: src/ZWiki/ZWikiPage.py:809
+#: src/ZWiki/ZWikiPage.py:882
 #, fuzzy
 msgid "show last edit"
 msgstr "utolsó szerkesztés megjelenítése: %(lastlog)s"
 
-#: src/ZWiki/ZWikiPage.py:826 src/ZWiki/ZWikiPage.py:828
+#: src/ZWiki/ZWikiPage.py:897 src/ZWiki/ZWikiPage.py:899
 msgid "by %(editor)s"
 msgstr "<br />szerkesztette: %(editor)s"
 
-#: src/ZWiki/__init__.py:34
+#: src/ZWiki/__init__.py:200
+msgid "Unknown wiki type"
+msgstr ""
+
+#: src/ZWiki/__init__.py:39
 msgid "No need to add a Zwiki Outline Cache"
 msgstr ""
 
-#: src/ZWiki/__init__.py:35
+#: src/ZWiki/__init__.py:40
 msgid ""
 "Zwiki Outline Cache appears in the ZMI Add menu\n"
 "        for implementation reasons, but should not be added directly.\n"
@@ -392,6 +367,10 @@
 msgid "comments"
 msgstr "Hozzászólások"
 
+#: src/ZWiki/pagetypes/html.py:50 src/ZWiki/pagetypes/rst.py:85
+msgid "reply"
+msgstr "Válasz"
+
 #: src/ZWiki/pagetypes/moin.py:1990
 msgid "Expected \"=\" to follow \"%(token)s\""
 msgstr "\"=\" jelnek kellene követnie ezt: \"%(token)s\""
@@ -414,8 +393,7 @@
 
 #: src/ZWiki/pagetypes/moin.py:730
 msgid "Expected \"%(wanted)s\" after \"%(key)s\", got \"%(token)s\""
-msgstr ""
-"\"%(wanted)s\" után \"%(key)s\" kellene következzen ehelyett: \"%(token)s\""
+msgstr "\"%(wanted)s\" után \"%(key)s\" kellene következzen ehelyett: \"%(token)s\""
 
 #: src/ZWiki/pagetypes/moin.py:736
 msgid "Expected an integer \"%(key)s\" before \"%(token)s\""
@@ -429,10 +407,6 @@
 msgid "Expected a color value \"%(arg)s\" after \"%(key)s\""
 msgstr "Szín értéknek \"%(arg)s\" kellene következnie \"%(key)s\" után"
 
-#: src/ZWiki/pagetypes/rst.py:85
-msgid "reply"
-msgstr "Válasz"
-
 #: src/ZWiki/plugins/latexwiki/wikis/latexwiki/diffform.pt:127
 #: src/ZWiki/plugins/mathaction/wikis/mathaction/old-diffform.pt:127
 msgid "full history"
@@ -465,9 +439,7 @@
 #: src/ZWiki/plugins/latexwiki/wikis/latexwiki/wikipage.pt:172
 #, fuzzy
 msgid "plone"
-msgstr ""
-"Az lap előzményeinek kilistázásakor látható kiegészítő megjegyzés (nem "
-"kötelező)"
+msgstr "Az lap előzményeinek kilistázásakor látható kiegészítő megjegyzés (nem kötelező)"
 
 #: src/ZWiki/plugins/latexwiki/wikis/latexwiki/wikipage.pt:173
 msgid "show all features"
@@ -511,7 +483,7 @@
 msgstr "cím"
 
 #: src/ZWiki/plugins/tracker/filterissues.pt:12
-#: src/ZWiki/skins/dtmlmessages.pt:30
+#: src/ZWiki/skins/dtmlmessages.pt:31
 msgid "Filter issues"
 msgstr "Ügyek szűrése"
 
@@ -525,367 +497,354 @@
 msgid "Issue tracker"
 msgstr "Ügykezelő"
 
-#: src/ZWiki/plugins/tracker/tracker.py:361
+#: src/ZWiki/plugins/tracker/tracker.py:365
 #, fuzzy
 msgid "You are not authorized to comment on this ZWiki Page."
 msgstr "Nincs jogosultsága szerkeszteni ezt a ZWiki lapot."
 
-#: src/ZWiki/skins/dtmlmessages.pt:10 src/ZWiki/skins/dtmlmessages.pt:32
+#: src/ZWiki/skins/dtmlmessages.pt:10 src/ZWiki/skins/dtmlmessages.pt:33
+msgid "name"
+msgstr "név"
+
+#: src/ZWiki/skins/dtmlmessages.pt:11 src/ZWiki/skins/dtmlmessages.pt:34
 msgid "category"
 msgstr "kategória"
 
-#: src/ZWiki/skins/dtmlmessages.pt:11 src/ZWiki/skins/dtmlmessages.pt:33
+#: src/ZWiki/skins/dtmlmessages.pt:12 src/ZWiki/skins/dtmlmessages.pt:35
 msgid "severity"
 msgstr "fontosság"
 
-#: src/ZWiki/skins/dtmlmessages.pt:12 src/ZWiki/skins/dtmlmessages.pt:34
+#: src/ZWiki/skins/dtmlmessages.pt:13 src/ZWiki/skins/dtmlmessages.pt:36
 msgid "status"
 msgstr "állapot"
 
-#: src/ZWiki/skins/dtmlmessages.pt:13 src/ZWiki/skins/dtmlmessages.pt:35
+#: src/ZWiki/skins/dtmlmessages.pt:14 src/ZWiki/skins/dtmlmessages.pt:37
 msgid "age"
 msgstr "kor"
 
-#: src/ZWiki/skins/dtmlmessages.pt:14 src/ZWiki/skins/dtmlmessages.pt:36
+#: src/ZWiki/skins/dtmlmessages.pt:15 src/ZWiki/skins/dtmlmessages.pt:38
 msgid "modified"
 msgstr "módosítva"
 
-#: src/ZWiki/skins/dtmlmessages.pt:15
+#: src/ZWiki/skins/dtmlmessages.pt:16
 msgid "Add a new issue:"
 msgstr "Új Ügy hozzáadása:"
 
-#: src/ZWiki/skins/dtmlmessages.pt:16
+#: src/ZWiki/skins/dtmlmessages.pt:17
 msgid "Name:"
 msgstr "Név:"
 
-#: src/ZWiki/skins/dtmlmessages.pt:17
+#: src/ZWiki/skins/dtmlmessages.pt:18
 msgid "Category:"
 msgstr "Kategória:"
 
-#: src/ZWiki/skins/dtmlmessages.pt:18
+#: src/ZWiki/skins/dtmlmessages.pt:19
 msgid "Severity:"
 msgstr "Fontosság:"
 
-#: src/ZWiki/skins/dtmlmessages.pt:19
-msgid "Status:"
-msgstr "Állapot:"
-
 #: src/ZWiki/skins/dtmlmessages.pt:2
 msgid "Here are the wiki's issue pages."
 msgstr "A wiki ügykezelő lapjai."
 
 #: src/ZWiki/skins/dtmlmessages.pt:20
+msgid "Status:"
+msgstr "Állapot:"
+
+#: src/ZWiki/skins/dtmlmessages.pt:21
 msgid "Details:"
 msgstr "Részletek:"
 
-#: src/ZWiki/skins/dtmlmessages.pt:21
+#: src/ZWiki/skins/dtmlmessages.pt:22
 msgid "add issue"
 msgstr "Ügy hozzáadása"
 
-#: src/ZWiki/skins/dtmlmessages.pt:22
+#: src/ZWiki/skins/dtmlmessages.pt:23
 msgid "More advanced"
 msgstr "Haladó"
 
-#: src/ZWiki/skins/dtmlmessages.pt:23
+#: src/ZWiki/skins/dtmlmessages.pt:24
 msgid "issue tracker"
 msgstr "Ügykezelő"
 
-#: src/ZWiki/skins/dtmlmessages.pt:24
+#: src/ZWiki/skins/dtmlmessages.pt:25
 msgid "search options"
 msgstr "keresési beállítások"
 
-#: src/ZWiki/skins/dtmlmessages.pt:25
+#: src/ZWiki/skins/dtmlmessages.pt:26
 msgid "Name contains any of:"
 msgstr "A névben megtalálható:"
 
-#: src/ZWiki/skins/dtmlmessages.pt:26
+#: src/ZWiki/skins/dtmlmessages.pt:27
 msgid "Page text contains any of:"
 msgstr "A lap szövegében megtalálható:"
 
-#: src/ZWiki/skins/dtmlmessages.pt:27
+#: src/ZWiki/skins/dtmlmessages.pt:28
 msgid "Categories:"
 msgstr "Kategóriák:"
 
-#: src/ZWiki/skins/dtmlmessages.pt:28
+#: src/ZWiki/skins/dtmlmessages.pt:29
 msgid "Severities:"
 msgstr "Fontosságok:"
 
-#: src/ZWiki/skins/dtmlmessages.pt:29
-msgid "Statuses:"
-msgstr "Állapotok:"
-
 #: src/ZWiki/skins/dtmlmessages.pt:3
 #, fuzzy
 msgid "Enter a search term, click the numbers to the right,"
-msgstr ""
-"Írja be a kereső-kifejezést, vagy kattintson egy jobboldali számra, vagy"
+msgstr "Írja be a kereső-kifejezést, vagy kattintson egy jobboldali számra, vagy"
 
-#: src/ZWiki/skins/dtmlmessages.pt:37
+#: src/ZWiki/skins/dtmlmessages.pt:30
+msgid "Statuses:"
+msgstr "Állapotok:"
+
+#: src/ZWiki/skins/dtmlmessages.pt:39
 msgid "Submitted by"
 msgstr "Beküldte"
 
-#: src/ZWiki/skins/dtmlmessages.pt:38
+#: src/ZWiki/skins/dtmlmessages.pt:4
+msgid "filter issues"
+msgstr "ügyek szűrése"
+
+#: src/ZWiki/skins/dtmlmessages.pt:40
 msgid "Name"
 msgstr "Név"
 
-#: src/ZWiki/skins/dtmlmessages.pt:39
+#: src/ZWiki/skins/dtmlmessages.pt:41
 msgid "Category"
 msgstr "Kategória"
 
-#: src/ZWiki/skins/dtmlmessages.pt:4
-msgid "filter issues"
-msgstr "ügyek szűrése"
-
-#: src/ZWiki/skins/dtmlmessages.pt:40
+#: src/ZWiki/skins/dtmlmessages.pt:42
 msgid "Severity"
 msgstr "Fontosság"
 
-#: src/ZWiki/skins/dtmlmessages.pt:41
+#: src/ZWiki/skins/dtmlmessages.pt:43
 msgid "Status"
 msgstr "Állapot"
 
-#: src/ZWiki/skins/dtmlmessages.pt:42
+#: src/ZWiki/skins/dtmlmessages.pt:44
 #, fuzzy
 msgid "Optional subject"
 msgstr "Kiegészítő megjegyzés"
 
-#: src/ZWiki/skins/dtmlmessages.pt:43
+#: src/ZWiki/skins/dtmlmessages.pt:45
 #, fuzzy
 msgid "Optional comment"
 msgstr "Kiegészítő megjegyzés"
 
-#: src/ZWiki/skins/dtmlmessages.pt:44 src/ZWiki/skins/dtmlmessages.pt:45
+#: src/ZWiki/skins/dtmlmessages.pt:46 src/ZWiki/skins/dtmlmessages.pt:47
 #, fuzzy
 msgid "Add ZWiki"
 msgstr "Zwiki Lap hozzáadása"
 
-#: src/ZWiki/skins/dtmlmessages.pt:46
+#: src/ZWiki/skins/dtmlmessages.pt:48
 #, fuzzy
 msgid "Id:"
 msgstr "Azonosító"
 
-#: src/ZWiki/skins/dtmlmessages.pt:47
+#: src/ZWiki/skins/dtmlmessages.pt:49
 #, fuzzy
 msgid "Title:"
 msgstr "Cím"
 
-#: src/ZWiki/skins/dtmlmessages.pt:48
+#: src/ZWiki/skins/dtmlmessages.pt:5
+msgid "browse open issues"
+msgstr ""
+
+#: src/ZWiki/skins/dtmlmessages.pt:50
 msgid "Template:"
 msgstr ""
 
-#: src/ZWiki/skins/dtmlmessages.pt:49
+#: src/ZWiki/skins/dtmlmessages.pt:51
 #, fuzzy
 msgid "Add wiki"
 msgstr "Zwiki Lap hozzáadása"
 
-#: src/ZWiki/skins/dtmlmessages.pt:5
-msgid "browse open issues"
-msgstr ""
-
-#: src/ZWiki/skins/dtmlmessages.pt:50
+#: src/ZWiki/skins/dtmlmessages.pt:52
 msgid "Pages changed in the last"
 msgstr "Legutóbb változtatott lapok listája az eltelt idő szerint:"
 
-#: src/ZWiki/skins/dtmlmessages.pt:51
+#: src/ZWiki/skins/dtmlmessages.pt:53
 msgid "Recently changed pages, with summaries"
 msgstr "Legutóbb változtatott lapok, összefoglalókkal"
 
-#: src/ZWiki/skins/dtmlmessages.pt:52
+#: src/ZWiki/skins/dtmlmessages.pt:54
 msgid "Show summaries ?"
 msgstr "Összefoglalók megjelenítése?"
 
-#: src/ZWiki/skins/dtmlmessages.pt:53
+#: src/ZWiki/skins/dtmlmessages.pt:55
 msgid "Refresh"
 msgstr "Frissít"
 
-#: src/ZWiki/skins/dtmlmessages.pt:54
+#: src/ZWiki/skins/dtmlmessages.pt:56
 msgid "Page"
 msgstr "Lap"
 
-#: src/ZWiki/skins/dtmlmessages.pt:55
+#: src/ZWiki/skins/dtmlmessages.pt:57
 msgid "Edited&nbsp;by"
 msgstr "Szerkesztette:"
 
-#: src/ZWiki/skins/dtmlmessages.pt:56
+#: src/ZWiki/skins/dtmlmessages.pt:58
 msgid "Time"
 msgstr "Idő"
 
-#: src/ZWiki/skins/dtmlmessages.pt:57
+#: src/ZWiki/skins/dtmlmessages.pt:59
 msgid "NEW"
 msgstr "ÚJ"
 
-#: src/ZWiki/skins/dtmlmessages.pt:59
-msgid "Pages marked (NEW) have been created within the last week"
-msgstr "A ÚJ-ként jelölt lapokat egy héten belül hozták létre"
-
 #: src/ZWiki/skins/dtmlmessages.pt:6
 msgid "search issues"
 msgstr "Keresés az ügyek között"
 
-#: src/ZWiki/skins/dtmlmessages.pt:60
+#: src/ZWiki/skins/dtmlmessages.pt:61
+msgid "Pages marked (NEW) have been created within the last week"
+msgstr "A ÚJ-ként jelölt lapokat egy héten belül hozták létre"
+
+#: src/ZWiki/skins/dtmlmessages.pt:62
 msgid "Enter a word or phrase and hit enter to search the entire wiki."
-msgstr ""
-"Írjon be egy szót vagy kifejezést, majd nyomja meg az ENTER gombot az egész "
-"wikiben való kereséshez."
+msgstr "Írjon be egy szót vagy kifejezést, majd nyomja meg az ENTER gombot az egész wikiben való kereséshez."
 
-#: src/ZWiki/skins/dtmlmessages.pt:61
+#: src/ZWiki/skins/dtmlmessages.pt:63
 msgid "This is the same as using the search field at top right."
-msgstr ""
-"Ez ugyanaz, mintha a jobb felső sarokban található keresőmezőt használná."
+msgstr "Ez ugyanaz, mintha a jobb felső sarokban található keresőmezőt használná."
 
-#: src/ZWiki/skins/dtmlmessages.pt:62
+#: src/ZWiki/skins/dtmlmessages.pt:64
 msgid "Tips: A single word works best for matching page names."
 msgstr "Javaslat: Lapcímek keresésekor a legjobb, ha csak egy szót használ."
 
-#: src/ZWiki/skins/dtmlmessages.pt:63
-msgid ""
-"Case-insensitivity and wildcards may be supported depending on your catalog "
-"configuration."
-msgstr ""
-"Kisbetű-nagybetű különbség és speciális helyettesítő karakterek is "
-"számíthatnak a Zope katalógusának beállításaitól függően."
+#: src/ZWiki/skins/dtmlmessages.pt:65
+msgid "Case-insensitivity and wildcards may be supported depending on your catalog configuration."
+msgstr "Kisbetű-nagybetű különbség és speciális helyettesítő karakterek is számíthatnak a Zope katalógusának beállításaitól függően."
 
-#: src/ZWiki/skins/dtmlmessages.pt:64
+#: src/ZWiki/skins/dtmlmessages.pt:66
 msgid "Leave it blank to list all pages."
 msgstr "Hagyja üresen, ha az összes lapot szeretné kilistázni."
 
-#: src/ZWiki/skins/dtmlmessages.pt:65 src/ZWiki/skins/dtmlmessages.pt:66
+#: src/ZWiki/skins/dtmlmessages.pt:67 src/ZWiki/skins/dtmlmessages.pt:68
 msgid "Search"
 msgstr "Keres"
 
-#: src/ZWiki/skins/dtmlmessages.pt:67
+#: src/ZWiki/skins/dtmlmessages.pt:69
 msgid "Page names matching"
 msgstr "Az alábbi lapok neve tartalmazza a keresett kifejezést:"
 
-#: src/ZWiki/skins/dtmlmessages.pt:68
+#: src/ZWiki/skins/dtmlmessages.pt:7
+msgid "recent"
+msgstr "friss"
+
+#: src/ZWiki/skins/dtmlmessages.pt:70
 msgid "Text matching"
 msgstr "Az alábbi lapok tartalmazzák a keresett kifejezést:"
 
-#: src/ZWiki/skins/dtmlmessages.pt:69
+#: src/ZWiki/skins/dtmlmessages.pt:71
 msgid "Thorough (non-catalog) search for text matching"
 msgstr ""
 
-#: src/ZWiki/skins/dtmlmessages.pt:7
-msgid "recent"
-msgstr "friss"
-
-#: src/ZWiki/skins/dtmlmessages.pt:70
+#: src/ZWiki/skins/dtmlmessages.pt:72
 msgid "Set your preferences for this wiki:"
 msgstr "A Wiki felhasználói beállításai:"
 
-#: src/ZWiki/skins/dtmlmessages.pt:71
+#: src/ZWiki/skins/dtmlmessages.pt:73
 msgid "User name:"
 msgstr "Felhasználói név:"
 
-#: src/ZWiki/skins/dtmlmessages.pt:72
-msgid "(identifies your edits)"
-msgstr "(azonosítja az Ön szerkesztéseit)"
+#: src/ZWiki/skins/dtmlmessages.pt:74
+msgid "(identifies your edits, saves your votes, may be required)"
+msgstr ""
 
-#: src/ZWiki/skins/dtmlmessages.pt:73
+#: src/ZWiki/skins/dtmlmessages.pt:75
 msgid "Email address:"
 msgstr "E-mail cím:"
 
-#: src/ZWiki/skins/dtmlmessages.pt:74
+#: src/ZWiki/skins/dtmlmessages.pt:76
 msgid "(allows mail subscription)"
 msgstr "(lehetővé teszi az előfizetést e-mail címre)"
 
-#: src/ZWiki/skins/dtmlmessages.pt:75
+#: src/ZWiki/skins/dtmlmessages.pt:77
 msgid "Your time zone:"
 msgstr "Az Ön időzónája:"
 
-#: src/ZWiki/skins/dtmlmessages.pt:76
+#: src/ZWiki/skins/dtmlmessages.pt:78
 msgid "(localizes most times)"
 msgstr "(a legtöbb időt átváltja helyire)"
 
-#: src/ZWiki/skins/dtmlmessages.pt:77
+#: src/ZWiki/skins/dtmlmessages.pt:79
 msgid "Edit form height:"
 msgstr "Szerkesztőmező magassága:"
 
-#: src/ZWiki/skins/dtmlmessages.pt:78
+#: src/ZWiki/skins/dtmlmessages.pt:8
+msgid "all"
+msgstr "minden"
+
+#: src/ZWiki/skins/dtmlmessages.pt:80
 msgid "(adjusts form size)"
 msgstr "(beállítja a szerkesztőmező méretét)"
 
-#: src/ZWiki/skins/dtmlmessages.pt:79
+#: src/ZWiki/skins/dtmlmessages.pt:81
 msgid "Save options"
 msgstr "Beállítások mentése"
 
-#: src/ZWiki/skins/dtmlmessages.pt:8
-msgid "all"
-msgstr "minden"
-
-#: src/ZWiki/skins/dtmlmessages.pt:80
+#: src/ZWiki/skins/dtmlmessages.pt:82
 msgid "Forget options"
 msgstr "Beállítások elvetése"
 
-#: src/ZWiki/skins/dtmlmessages.pt:81 src/ZWiki/skins/dtmlmessages.pt:82
+#: src/ZWiki/skins/dtmlmessages.pt:83 src/ZWiki/skins/dtmlmessages.pt:84
 msgid "Add ZWiki Page"
 msgstr "Zwiki Lap hozzáadása"
 
-#: src/ZWiki/skins/dtmlmessages.pt:83
+#: src/ZWiki/skins/dtmlmessages.pt:85
 #, fuzzy
 msgid "Page&nbsp;name:"
 msgstr "Lap neve"
 
-#: src/ZWiki/skins/dtmlmessages.pt:84
+#: src/ZWiki/skins/dtmlmessages.pt:86
 #, fuzzy
 msgid "Add wiki page"
 msgstr "Zwiki Lap hozzáadása"
 
-#: src/ZWiki/skins/dtmlmessages.pt:85
+#: src/ZWiki/skins/dtmlmessages.pt:87
 #, fuzzy
 msgid "Topic"
 msgstr "alfejezet létrehozása"
 
-#: src/ZWiki/skins/dtmlmessages.pt:86
+#: src/ZWiki/skins/dtmlmessages.pt:88
 msgid "Last updated"
 msgstr ""
 
-#: src/ZWiki/skins/dtmlmessages.pt:87
+#: src/ZWiki/skins/dtmlmessages.pt:89
 #, fuzzy
 msgid "Comments"
 msgstr "Hozzászólások"
 
-#: src/ZWiki/skins/dtmlmessages.pt:88
+#: src/ZWiki/skins/dtmlmessages.pt:9 src/ZWiki/skins/dtmlmessages.pt:32
+msgid "#"
+msgstr ""
+
+#: src/ZWiki/skins/dtmlmessages.pt:90
 #, fuzzy
 msgid "Views"
 msgstr "Megtekint"
 
-#: src/ZWiki/skins/dtmlmessages.pt:89
+#: src/ZWiki/skins/dtmlmessages.pt:91
 #, fuzzy
 msgid "Created"
 msgstr "Létrehoz"
 
-#: src/ZWiki/skins/dtmlmessages.pt:9 src/ZWiki/skins/dtmlmessages.pt:31
-msgid "#"
-msgstr ""
-
-#: src/ZWiki/skins/dtmlmessages.pt:90 src/ZWiki/skins/dtmlmessages.pt:92
+#: src/ZWiki/skins/dtmlmessages.pt:92 src/ZWiki/skins/dtmlmessages.pt:94
 msgid "by"
 msgstr ""
 
-#: src/ZWiki/skins/dtmlmessages.pt:91
+#: src/ZWiki/skins/dtmlmessages.pt:93
 msgid "<dtml-var lasteditinterval> ago</dtml-var>"
 msgstr ""
 
-#: src/ZWiki/skins/dtmlmessages.pt:93
+#: src/ZWiki/skins/dtmlmessages.pt:95
 msgid "on"
 msgstr ""
 
-#: src/ZWiki/skins/zwiki/backlinks.pt:108
+#: src/ZWiki/skins/zwiki/backlinks.pt:102
 #, fuzzy
-msgid "Subtopics"
-msgstr "alfejezet létrehozása"
-
-#: src/ZWiki/skins/zwiki/backlinks.pt:111
-msgid "This page has no subtopics."
-msgstr ""
-
-#: src/ZWiki/skins/zwiki/backlinks.pt:114
-#, fuzzy
 msgid "Here are it's subtopics."
 msgstr "A wiki ügykezelő lapjai."
 
-#: src/ZWiki/skins/zwiki/backlinks.pt:117
+#: src/ZWiki/skins/zwiki/backlinks.pt:105
 msgid "You can reorder them by clicking the ^ buttons."
 msgstr ""
 
@@ -899,67 +858,65 @@
 msgid "Parents"
 msgstr "szülő-lap,"
 
-#: src/ZWiki/skins/zwiki/backlinks.pt:31
+#: src/ZWiki/skins/zwiki/backlinks.pt:28
 msgid "is a top-level topic."
 msgstr "a hierarchia legfelső szintjén található."
 
-#: src/ZWiki/skins/zwiki/backlinks.pt:32
+#: src/ZWiki/skins/zwiki/backlinks.pt:29
 msgid "is a subtopic of:"
 msgstr "alfejezete a következő lapnak:"
 
-#: src/ZWiki/skins/zwiki/backlinks.pt:55
+#: src/ZWiki/skins/zwiki/backlinks.pt:48
 #, fuzzy
 msgid "Backlinks"
 msgstr "idemutató"
 
-#: src/ZWiki/skins/zwiki/backlinks.pt:56
+#: src/ZWiki/skins/zwiki/backlinks.pt:49
 msgid "Here are the pages which link to it:"
 msgstr "Idemutató lapok:"
 
-#: src/ZWiki/skins/zwiki/backlinks.pt:57
+#: src/ZWiki/skins/zwiki/backlinks.pt:50
 #, fuzzy
 msgid "No other pages link to this one."
 msgstr "Mely lapokról mutat hivatkozás erre a lapra?"
 
-#: src/ZWiki/skins/zwiki/backlinks.pt:82
-msgid ""
-"You can set this page's parent(s) to place it within the overall page "
-"hierarchy."
+#: src/ZWiki/skins/zwiki/backlinks.pt:70
+msgid "You can set this page's parent(s) to place it within the overall page hierarchy."
 msgstr ""
 
-#: src/ZWiki/skins/zwiki/backlinks.pt:85
-msgid ""
-"Check one or more checkboxes or enter a page name here, and click the button."
+#: src/ZWiki/skins/zwiki/backlinks.pt:73
+msgid "Check one or more checkboxes or enter a page name here, and click the button."
 msgstr ""
 
-#: src/ZWiki/skins/zwiki/backlinks.pt:88
+#: src/ZWiki/skins/zwiki/backlinks.pt:76
 msgid "Enter a page name here and click the button."
 msgstr ""
 
-#: src/ZWiki/skins/zwiki/backlinks.pt:91
-msgid ""
-"You can type just the first few letters, case and punctuation are ignored."
+#: src/ZWiki/skins/zwiki/backlinks.pt:79
+msgid "You can type just the first few letters, case and punctuation are ignored."
 msgstr ""
 
-#: src/ZWiki/skins/zwiki/backlinks.pt:98
+#: src/ZWiki/skins/zwiki/backlinks.pt:86
 msgid "Reparent"
 msgstr "Újraszármaztat"
 
+#: src/ZWiki/skins/zwiki/backlinks.pt:96
+#, fuzzy
+msgid "Subtopics"
+msgstr "alfejezet létrehozása"
+
+#: src/ZWiki/skins/zwiki/backlinks.pt:99
+msgid "This page has no subtopics."
+msgstr ""
+
 #: src/ZWiki/skins/zwiki/badtemplate.pt:12
 msgid "Bad template"
 msgstr ""
 
 #: src/ZWiki/skins/zwiki/badtemplate.pt:13
 #, fuzzy
-msgid ""
-"There was a problem locating one of this wiki's skin templates. There may be "
-"a page or other non-page-template/non-dtml-method object with the same ID, "
-"obscuring the template. Or the template may be missing on the filesystem (an "
-"incomplete Zwiki installation)."
-msgstr ""
-"Probléma lépett fel valamelyik wiki megjelenítő sablonnal. Lehet, hogy "
-"létezik egy elem, melynek azonosítója egyezik egy sablonéval, amely nem Page "
-"Template vagy DTML Method elem, vagy hiányzik a kérdéses sablon."
+msgid "There was a problem locating one of this wiki's skin templates. There may be a page or other non-page-template/non-dtml-method object with the same ID, obscuring the template. Or the template may be missing on the filesystem (an incomplete Zwiki installation)."
+msgstr "Probléma lépett fel valamelyik wiki megjelenítő sablonnal. Lehet, hogy létezik egy elem, melynek azonosítója egyezik egy sablonéval, amely nem Page Template vagy DTML Method elem, vagy hiányzik a kérdéses sablon."
 
 #: src/ZWiki/skins/zwiki/commentform.pt:21
 msgid "subject"
@@ -967,9 +924,7 @@
 
 #: src/ZWiki/skins/zwiki/commentform.pt:22
 msgid "a subject helps clarify threads and RecentChanges"
-msgstr ""
-"A tárgy megadása segíti a hozzászólások és a LegutóbbiVáltozások "
-"nyomonkövetését."
+msgstr "A tárgy megadása segíti a hozzászólások és a LegutóbbiVáltozások nyomonkövetését."
 
 #: src/ZWiki/skins/zwiki/commentform.pt:29
 msgid "replying"
@@ -977,10 +932,7 @@
 
 #: src/ZWiki/skins/zwiki/commentform.pt:36
 msgid "to comment (and cc any subscribers) enter text here and click add"
-msgstr ""
-"Ha hozzá szeretne szólni az oldal témájához, töltse ki ezt a mezőt, majd "
-"nyomja meg a \"Hozzászólás beküldése\" gombot. (A hozzászólásról értesítést "
-"kap levélben az összes előfizető.)"
+msgstr "Ha hozzá szeretne szólni az oldal témájához, töltse ki ezt a mezőt, majd nyomja meg a \"Hozzászólás beküldése\" gombot. (A hozzászólásról értesítést kap levélben az összes előfizető.)"
 
 #: src/ZWiki/skins/zwiki/commentform.pt:56
 msgid "${nb} subscribers"
@@ -995,12 +947,20 @@
 msgid "add-comment"
 msgstr "Hozzászólás beküldése"
 
-#: src/ZWiki/skins/zwiki/contentspage.pt:12
+#: src/ZWiki/skins/zwiki/contentspage.pt:10
+#: src/ZWiki/skins/zwiki/contentspage.pt:27
+#, fuzzy
+msgid "Wiki contents for"
+msgstr "A wiki tartalma"
+
+#: src/ZWiki/skins/zwiki/contentspage.pt:13
+#: src/ZWiki/skins/zwiki/contentspage.pt:30
 msgid "Wiki contents"
 msgstr "A wiki tartalma"
 
-#: src/ZWiki/skins/zwiki/contentspage.pt:16
-msgid "Singletons"
+#: src/ZWiki/skins/zwiki/contentspage.pt:40
+#, fuzzy
+msgid "Singletons:"
 msgstr "Árva lapok"
 
 #: src/ZWiki/skins/zwiki/denied.pt:12
@@ -1061,8 +1021,7 @@
 
 #: src/ZWiki/skins/zwiki/editform.pt:133
 msgid "a note makes RecentChanges more useful"
-msgstr ""
-"A megjegyzés a LegutóbbiVáltozások című átnézeti oldalt teszi használhatóbbá."
+msgstr "A megjegyzés a LegutóbbiVáltozások című átnézeti oldalt teszi használhatóbbá."
 
 #: src/ZWiki/skins/zwiki/editform.pt:146
 msgid "Upload a file or image"
@@ -1089,13 +1048,13 @@
 msgstr ""
 
 #: src/ZWiki/skins/zwiki/editform.pt:178
-msgid "preview this edit"
-msgstr "szerkesztés előnézete"
-
-#: src/ZWiki/skins/zwiki/editform.pt:178
 msgid "Preview"
 msgstr "Előnézet"
 
+#: src/ZWiki/skins/zwiki/editform.pt:178
+msgid "preview this edit"
+msgstr "szerkesztés előnézete"
+
 #: src/ZWiki/skins/zwiki/editform.pt:183
 msgid "Cancel"
 msgstr "Elvet"
@@ -1131,13 +1090,18 @@
 msgstr "a wiki lap neve (A változtatás eltarthat egy ideig!)"
 
 #: src/ZWiki/skins/zwiki/editform.pt:71
-msgid "type"
-msgstr "típus"
+msgid "markup"
+msgstr ""
 
 #: src/ZWiki/skins/zwiki/editform.pt:72
 msgid "select the formatting and rendering style for this page"
 msgstr "A lap formázási és megjelenítési stílusának kiválasztása"
 
+#: src/ZWiki/skins/zwiki/helppage.pt:12
+#, fuzzy
+msgid "Help page"
+msgstr "SúgóLap"
+
 #: src/ZWiki/skins/zwiki/links.pt:102
 msgid "(external edit)"
 msgstr "(külső szerkesztés)"
@@ -1273,25 +1237,21 @@
 
 #: src/ZWiki/skins/zwiki/pagemanagementform.pt:40
 msgid "enter a page name and click buttons to the right (mouse over for help)"
-msgstr ""
-"írja be a lap nevét, majd kattintson a jobboldali gombokra (menjen föléjük "
-"az egérrel segítségért)"
+msgstr "írja be a lap nevét, majd kattintson a jobboldali gombokra (menjen föléjük az egérrel segítségért)"
 
 #: src/ZWiki/skins/zwiki/pagemanagementform.pt:45
 #, fuzzy
-msgid "reparent"
-msgstr "Újraszármaztat"
+msgid "make this page a subtopic of the page you have entered"
+msgstr "Újraszármaztatja az lapot az Ön által megadott szülő-laphoz."
 
 #: src/ZWiki/skins/zwiki/pagemanagementform.pt:45
 #, fuzzy
-msgid "make this page a subtopic of the page you have entered"
-msgstr "Újraszármaztatja az lapot az Ön által megadott szülő-laphoz."
+msgid "reparent"
+msgstr "Újraszármaztat"
 
 #: src/ZWiki/skins/zwiki/pagemanagementform.pt:50
 msgid "rename this page to the name you have entered, updating all links"
-msgstr ""
-"Megváltoztatja a lap nevét az ide beírt névre, a lapra mutató össze link "
-"aktualizálásával."
+msgstr "Megváltoztatja a lap nevét az ide beírt névre, a lapra mutató össze link aktualizálásával."
 
 #: src/ZWiki/skins/zwiki/pagemanagementform.pt:50
 msgid "rename"
@@ -1303,16 +1263,13 @@
 
 #: src/ZWiki/skins/zwiki/pagemanagementform.pt:55
 #, fuzzy
-msgid ""
-"delete this page, and redirect links to the page you have entered, if any"
+msgid "delete this page, and redirect links to the page you have entered, if any"
 msgstr "Újraszármaztatja az lapot az Ön által megadott szülő-laphoz."
 
 #: src/ZWiki/skins/zwiki/pagemanagementform.pt:60
 #, fuzzy
 msgid "create a page with the name you have entered, as a subtopic of this one"
-msgstr ""
-"Megváltoztatja a lap nevét az ide beírt névre, a lapra mutató össze link "
-"aktualizálásával."
+msgstr "Megváltoztatja a lap nevét az ide beírt névre, a lapra mutató össze link aktualizálásával."
 
 #: src/ZWiki/skins/zwiki/pagemanagementform.pt:60
 msgid "create"
@@ -1381,8 +1338,7 @@
 msgstr ""
 "Előfizethet csak erre a lapra, vagy az egész wikire.\n"
 "          Az előfizetők e-mailban értesülnek az új hozzászólásokról.\n"
-"          (De nem értesülnek a szövegtörzs változtatásairól, hacsak a "
-"rendszer adminisztrárora másképpen nem rendelkezett.).\n"
+"          (De nem értesülnek a szövegtörzs változtatásairól, hacsak a rendszer adminisztrárora másképpen nem rendelkezett.).\n"
 "          Vagy visszatérhet a következő lapra:"
 
 #. Default: ""
@@ -1395,8 +1351,7 @@
 msgstr ""
 "Előfizethet csak erre a lapra, vagy az egész wikire.\n"
 "          Az előfizetők e-mailban értesülnek az új hozzászólásokról.\n"
-"          (De nem értesülnek a szövegtörzs változtatásairól, hacsak a "
-"rendszer adminisztrárora másképpen nem rendelkezett.).\n"
+"          (De nem értesülnek a szövegtörzs változtatásairól, hacsak a rendszer adminisztrárora másképpen nem rendelkezett.).\n"
 "          Vagy visszatérhet a következő lapra:"
 
 #: src/ZWiki/skins/zwiki/subscribeform.pt:53
@@ -1445,6 +1400,12 @@
 msgid "User options"
 msgstr "keresési beállítások"
 
+#~ msgid "(identifies your edits)"
+#~ msgstr "(azonosítja az Ön szerkesztéseit)"
+
+#~ msgid "type"
+#~ msgstr "típus"
+
 #~ msgid "Add a ZWiki web"
 #~ msgstr "ZWiki hálózat hozzáadása"
 
@@ -1457,14 +1418,8 @@
 #~ msgid "and enter"
 #~ msgstr "és belépés"
 
-#~ msgid ""
-#~ "You may create a new ZWiki Page object using the form below. You may also "
-#~ "choose to upload an existing html file from your local computer by "
-#~ "clicking the <i>Browse</i> button."
-#~ msgstr ""
-#~ "Létrehozhat egy ZWiki Lap elemet az alábbi szerkesztőmező segítségével, "
-#~ "vagy akár feltölthet egy html fájlt a saját gépéről a <i>Tallózás</i> "
-#~ "gomb megnyomásával."
+#~ msgid "You may create a new ZWiki Page object using the form below. You may also choose to upload an existing html file from your local computer by clicking the <i>Browse</i> button."
+#~ msgstr "Létrehozhat egy ZWiki Lap elemet az alábbi szerkesztőmező segítségével, vagy akár feltölthet egy html fájlt a saját gépéről a <i>Tallózás</i> gomb megnyomásával."
 
 #~ msgid "File"
 #~ msgstr "Fájl"
@@ -1476,17 +1431,13 @@
 #~ msgstr "Hozzáad és szerkeszt"
 
 #~ msgid "log_note"
-#~ msgstr ""
-#~ "Az lap előzményeinek kilistázásakor látható kiegészítő megjegyzés (nem "
-#~ "kötelező)"
+#~ msgstr "Az lap előzményeinek kilistázásakor látható kiegészítő megjegyzés (nem kötelező)"
 
 #~ msgid "Backlinks for"
 #~ msgstr "Idemutató hivatkozások:"
 
 #~ msgid "singleton_desc"
-#~ msgstr ""
-#~ "Árva lapok azok az oldalak, amelyekre nem mutat hivatkozás egyetlen más "
-#~ "lapról sem, tehát nincsen szülő-lapjuk."
+#~ msgstr "Árva lapok azok az oldalak, amelyekre nem mutat hivatkozás egyetlen más lapról sem, tehát nincsen szülő-lapjuk."
 
 #~ msgid "History for"
 #~ msgstr "A következő oldal változtatásainak előzményei:"
@@ -1495,29 +1446,19 @@
 #~ msgstr "visszatérés ehhez a laphoz"
 
 #~ msgid "help_shortname"
-#~ msgstr ""
-#~ "Megjegyzés: A lap átnevezése sokáig tarthat, ha nagy a wiki hálózat. "
-#~ "Mindeközben a többi lap is aktualizálásra kerül, ha lehetséges."
+#~ msgstr "Megjegyzés: A lap átnevezése sokáig tarthat, ha nagy a wiki hálózat. Mindeközben a többi lap is aktualizálásra kerül, ha lehetséges."
 
 #~ msgid "label_body_text"
 #~ msgstr "Szövegtörzs"
 
 #~ msgid "help_wikibody"
-#~ msgstr ""
-#~ "A wiki lapokon szögletes zárójelek [] használatosak a hivatkozások "
-#~ "automatikus létrehozására. Ha elmenti az lapot, akkor a szögletes "
-#~ "zárójelbe tett szöveg után egy kérdőjel <code>?</code> jelenik meg, "
-#~ "melyre kattintva egy új lap szerkesztése kezdhető meg a zárójelben "
-#~ "szereplő névvel."
+#~ msgstr "A wiki lapokon szögletes zárójelek [] használatosak a hivatkozások automatikus létrehozására. Ha elmenti az lapot, akkor a szögletes zárójelbe tett szöveg után egy kérdőjel <code>?</code> jelenik meg, melyre kattintva egy új lap szerkesztése kezdhető meg a zárójelben szereplő névvel."
 
 #~ msgid "help_wikiwords"
-#~ msgstr ""
-#~ "Létrehozhatóak még hivatkozások a WikiSzavak mechanizmusával is. (A szó "
-#~ "közepén használt nagybetűvel.)"
+#~ msgstr "Létrehozhatóak még hivatkozások a WikiSzavak mechanizmusával is. (A szó közepén használt nagybetűvel.)"
 
 #~ msgid "label_note"
-#~ msgstr ""
-#~ "A lap előzményeinek listázásakor megjelenített megjegyzés (nem kötelező)"
+#~ msgstr "A lap előzményeinek listázásakor megjelenített megjegyzés (nem kötelező)"
 
 #~ msgid "help_wikinote"
 #~ msgstr "A változtatások rövid leírása."
@@ -1532,10 +1473,7 @@
 #~ msgstr "A lap szövegformátuma"
 
 #~ msgid "help_format"
-#~ msgstr ""
-#~ "Ha nem biztos abban, hogy melyik formátumot használja, akkor válassza a "
-#~ "Plain text formátumot, és írja meg a dokumentumot úgy, ahogy általában "
-#~ "szokta."
+#~ msgstr "Ha nem biztos abban, hogy melyik formátumot használja, akkor válassza a Plain text formátumot, és írja meg a dokumentumot úgy, ahogy általában szokta."
 
 #~ msgid "Save"
 #~ msgstr "Elment"
@@ -1548,9 +1486,7 @@
 #~ "        \"${pagename}\""
 
 #~ msgid "description_edit_wiki_page"
-#~ msgstr ""
-#~ "A Wiki Lap sűrű hálózattal összakapcsolt lapok létrehozását teszi "
-#~ "lehetővé."
+#~ msgstr "A Wiki Lap sűrű hálózattal összakapcsolt lapok létrehozását teszi lehetővé."
 
 #~ msgid "legend_wiki_page_details"
 #~ msgstr "Wiki Lap részletei"
@@ -1600,16 +1536,14 @@
 #~ msgid "backlinks_reparent_help"
 #~ msgstr ""
 #~ "Megváltoztathatja a lap szülő-lapját, ezzel megváltoztatja a lap helyét \n"
-#~ "a wiki hálózat hierarchiájában. Jelölje be a megfelelő opciót, vagy írjon "
-#~ "be egy új oldalnevet, majd klikkeljen az \"Újraszármaztat\"gombra.\n"
+#~ "a wiki hálózat hierarchiájában. Jelölje be a megfelelő opciót, vagy írjon be egy új oldalnevet, majd klikkeljen az \"Újraszármaztat\"gombra.\n"
 #~ "Általában egy lapnak elég egy szülő-lap."
 
 #, fuzzy
 #~ msgid "backlinks_reparent_help2"
 #~ msgstr ""
 #~ "Megváltoztathatja a lap szülő-lapját, ezzel megváltoztatja a lap helyét \n"
-#~ "a wiki hálózat hierarchiájában. Jelölje be a megfelelő opciót, vagy írjon "
-#~ "be egy új oldalnevet, majd klikkeljen az \"Újraszármaztat\"gombra.\n"
+#~ "a wiki hálózat hierarchiájában. Jelölje be a megfelelő opciót, vagy írjon be egy új oldalnevet, majd klikkeljen az \"Újraszármaztat\"gombra.\n"
 #~ "Általában egy lapnak elég egy szülő-lap."
 
 #, fuzzy
@@ -1705,9 +1639,7 @@
 #~ msgstr "Navigáció a wikiben"
 
 #~ msgid "enter comments here and click add; or, click edit"
-#~ msgstr ""
-#~ "Írja be ide hozzászólását, majd kattintson a \"Hozzáad\" gombra, vagy "
-#~ "klikkeljen a \"Szerkeszt\" gombra."
+#~ msgstr "Írja be ide hozzászólását, majd kattintson a \"Hozzáad\" gombra, vagy klikkeljen a \"Szerkeszt\" gombra."
 
 #~ msgid "Details & comments"
 #~ msgstr "Részletek és megjegyzések"
@@ -1715,12 +1647,8 @@
 #~ msgid "hits"
 #~ msgstr "találatok"
 
-#~ msgid ""
-#~ "no catalog or the catalog search gave an error, a brute-force search was "
-#~ "used"
-#~ msgstr ""
-#~ "Nem létezik katalógus, vagy a katalógusban való keresés hibaüzenetet "
-#~ "adott, ezért nyerskeresést kellett alkalmazni."
+#~ msgid "no catalog or the catalog search gave an error, a brute-force search was used"
+#~ msgstr "Nem létezik katalógus, vagy a katalógusban való keresés hibaüzenetet adott, ezért nyerskeresést kellett alkalmazni."
 
 #~ msgid "Contents"
 #~ msgstr "Tartalom"
@@ -1728,9 +1656,6 @@
 #~ msgid "Diffs for"
 #~ msgstr "Összevetés:"
 
-#~ msgid "name"
-#~ msgstr "név"
-
 #~ msgid "page rating"
 #~ msgstr "Lapértékelés"
 
@@ -1749,20 +1674,13 @@
 #~ msgstr "A listában szereplő lapok hivatkoznak erre a lapra:"
 
 #~ msgid "box_canreparent"
-#~ msgstr ""
-#~ "Megváltoztathatja a lap <em>szülő-lapját, szülő-lapjait</em> "
-#~ "megváltoztatván ezzel a lap helyét a wiki hálózat hierarchiájában. "
-#~ "Jelölje be a megfelelő opciót, vagy írjon be egy új oldalnevet, majd "
-#~ "klikkeljen az \"Újraszármaztat\" &nbsp;gombra. Egy lapnak elég általában "
-#~ "egy szülő-lap."
+#~ msgstr "Megváltoztathatja a lap <em>szülő-lapját, szülő-lapjait</em> megváltoztatván ezzel a lap helyét a wiki hálózat hierarchiájában. Jelölje be a megfelelő opciót, vagy írjon be egy új oldalnevet, majd klikkeljen az \"Újraszármaztat\" &nbsp;gombra. Egy lapnak elég általában egy szülő-lap."
 
 #~ msgid "Other parent"
 #~ msgstr "Más szülő-lap"
 
 #~ msgid "You may also click the full, simple, minimal links if provided."
-#~ msgstr ""
-#~ "Szintén klikkelhet a teljes, egyszerű és a minimális nézet "
-#~ "hivatkozásokra, ha láthatóak."
+#~ msgstr "Szintén klikkelhet a teljes, egyszerű és a minimális nézet hivatkozásokra, ha láthatóak."
 
 #~ msgid "for subscribing"
 #~ msgstr "wiki lapok előfizetéséhez"
@@ -1792,9 +1710,7 @@
 #~ msgstr "Lapok hierarchiájának megjelenítése?"
 
 #~ msgid "This wiki keeps a page hierarchy, which you can use or ignore."
-#~ msgstr ""
-#~ "A ZWiki számontartja a lapok hierarchiáját, melyet felhasználhat, vagy "
-#~ "figyelmen kívül hagyhat."
+#~ msgstr "A ZWiki számontartja a lapok hierarchiáját, melyet felhasználhat, vagy figyelmen kívül hagyhat."
 
 #~ msgid "Show search field ?"
 #~ msgstr "Keresőmező megjelenítése?"
@@ -1812,9 +1728,7 @@
 #~ msgstr "Lapkezelő űrlap megjelenítése?"
 
 #~ msgid "You must also configure a username or be logged in."
-#~ msgstr ""
-#~ "Szintén meg kell adnia egy felhasználói nevet, vagy be kell jelentkeznie "
-#~ "az oldalra."
+#~ msgstr "Szintén meg kell adnia egy felhasználói nevet, vagy be kell jelentkeznie az oldalra."
 
 #~ msgid "no subscribers"
 #~ msgstr "nincs előfizető"
@@ -1822,22 +1736,16 @@
 #~ msgid "parent_name_replace"
 #~ msgstr "új szülő-lap, új név vagy áthelyezés"
 
-#~ msgid ""
-#~ "enter a new parent, new name, replacement page (if any) or subtopic name"
-#~ msgstr ""
-#~ "új szülő-lap megadása, lap átnevezése, cserelap megadása, vagy az "
-#~ "alfejezet neve (ha létezik)"
+#~ msgid "enter a new parent, new name, replacement page (if any) or subtopic name"
+#~ msgstr "új szülő-lap megadása, lap átnevezése, cserelap megadása, vagy az alfejezet neve (ha létezik)"
 
 #~ msgid "box_zwiki_showhierarchy"
 #~ msgstr ""
-#~ "Megváltoztathatja a lap <em>szülő-lapját, szülő-lapjait</em>,"
-#~ "megváltoztatván ezzel a lap helyét \n"
-#~ "a wiki hálózat hierarchiájában. Jelölje be a megfelelő opciót, vagy írjon "
-#~ "be egy új oldalnevet, majd klikkeljen az \"Újraszármaztat\" gombra.\n"
+#~ "Megváltoztathatja a lap <em>szülő-lapját, szülő-lapjait</em>,megváltoztatván ezzel a lap helyét \n"
+#~ "a wiki hálózat hierarchiájában. Jelölje be a megfelelő opciót, vagy írjon be egy új oldalnevet, majd klikkeljen az \"Újraszármaztat\" gombra.\n"
 #~ "Egy lapnak elég általában egy szülő-lap."
 
-#~ msgid ""
-#~ "move this page to the recycle bin, and relink to the name you have entered"
+#~ msgid "move this page to the recycle bin, and relink to the name you have entered"
 #~ msgstr "Szemeteskosárba dobja a lapot, és újrahivatkoz a beírtak szerint."
 
 #~ msgid "create a new subtopic of this page"

Modified: zope-zwiki/trunk/i18n/it.po
===================================================================
--- zope-zwiki/trunk/i18n/it.po	2007-04-08 14:54:05 UTC (rev 761)
+++ zope-zwiki/trunk/i18n/it.po	2007-04-08 14:55:27 UTC (rev 762)
@@ -2,7 +2,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: ZWiki-0-32-0\n"
-"POT-Creation-Date: Sat Sep  2 18:10:16 2006\n"
+"POT-Creation-Date: Tue Mar 27 14:50:46 2007\n"
 "PO-Revision-Date: 2006-02-26 09:01+0000\n"
 "Last-Translator: Lele Gaifax <lele at seldati.it>\n"
 "Language-Team: <zwiki at zwiki.org>\n"
@@ -15,46 +15,40 @@
 "Preferred-encodings: utf-8 latin1\n"
 "Domain: zwiki\n"
 
-#: src/ZWiki/Admin.py:62
+#: src/ZWiki/Admin.py:58
 msgid "You are not authorized to upgrade all pages."
 msgstr "Non sei autorizzato ad aggiornare tutte le pagine."
 
-#: src/ZWiki/Admin.py:63
+#: src/ZWiki/Admin.py:59
 msgid "(folder -> Manage properties)"
 msgstr "(folder -> Manage properties)"
 
-#: src/ZWiki/Diff.py:174
+#: src/ZWiki/Diff.py:179
 #, fuzzy
 msgid "You are not authorized to reparent this ZWiki Page."
 msgstr "Non sei autorizzato a cambiare il nome di questa pagina ZWiki."
 
-#: src/ZWiki/Diff.py:180 src/ZWiki/plugins/tracker/tracker.py:332
+#: src/ZWiki/Diff.py:185 src/ZWiki/plugins/tracker/tracker.py:333
 msgid "You are not authorized to rename this ZWiki Page."
 msgstr "Non sei autorizzato a cambiare il nome di questa pagina ZWiki."
 
-#: src/ZWiki/Editing.py:156 src/ZWiki/Editing.py:294 src/ZWiki/Views.py:332
-#: src/ZWiki/Views.py:435 src/ZWiki/plugins/tracker/tracker.py:321
-msgid ""
-"Sorry, this wiki doesn't allow anonymous edits. Please configure a username "
-"in options first."
+#: src/ZWiki/Editing.py:156 src/ZWiki/Editing.py:294 src/ZWiki/Views.py:336
+#: src/ZWiki/Views.py:439 src/ZWiki/plugins/tracker/tracker.py:322
+msgid "Sorry, this wiki doesn't allow anonymous edits. Please configure a username in options first."
 msgstr ""
 
 #: src/ZWiki/Editing.py:327
-msgid ""
-"You are not authorized to reparent or change subtopics links on this ZWiki "
-"Page."
-msgstr ""
-"Non sei autorizzato a modificare la gerarchia o cambiare i collegamenti ai "
-"sotto argomenti di questa pagina ZWiki."
+msgid "You are not authorized to reparent or change subtopics links on this ZWiki Page."
+msgstr "Non sei autorizzato a modificare la gerarchia o cambiare i collegamenti ai sotto argomenti di questa pagina ZWiki."
 
 #: src/ZWiki/Editing.py:349
 msgid "You are not authorized to change this ZWiki Page's type."
 msgstr "Non sei autorizzato a cambiare il tipo di questa pagina ZWiki."
 
 #: src/ZWiki/Editing.py:383 src/ZWiki/Editing.py:410
-#: src/ZWiki/plugins/tracker/tracker.py:340
-#: src/ZWiki/plugins/tracker/tracker.py:347
-#: src/ZWiki/plugins/tracker/tracker.py:354
+#: src/ZWiki/plugins/tracker/tracker.py:344
+#: src/ZWiki/plugins/tracker/tracker.py:351
+#: src/ZWiki/plugins/tracker/tracker.py:358
 msgid "You are not authorized to edit this ZWiki Page."
 msgstr "Non sei autorizzato a modificare questa pagina ZWiki."
 
@@ -63,11 +57,8 @@
 msgstr "Non sei autorizzato a cancellare questa pagina ZWiki."
 
 #: src/ZWiki/Editing.py:563
-msgid ""
-"This page was renamed to %s. You can delete this one if no longer needed.\n"
-msgstr ""
-"Questa pagina è stata rinominata %s.  Puoi cancellare questa se non serve "
-"più.\n"
+msgid "This page was renamed to %s. You can delete this one if no longer needed.\n"
+msgstr "Questa pagina è stata rinominata %s.  Puoi cancellare questa se non serve più.\n"
 
 #: src/ZWiki/Editing.py:659
 msgid "You are not authorized to upload files here."
@@ -88,12 +79,8 @@
 
 #: src/ZWiki/Editing.py:830
 #, fuzzy
-msgid ""
-"your edit contained a banned link pattern. Please contact the site "
-"administrator for help."
-msgstr ""
-"C'è stato un problema: Perfavore contatta l'amministratore del sito per un "
-"aiuto"
+msgid "your edit contained a banned link pattern. Please contact the site administrator for help."
+msgstr "C'è stato un problema: Perfavore contatta l'amministratore del sito per un aiuto"
 
 #: src/ZWiki/Editing.py:841
 #, fuzzy
@@ -101,10 +88,7 @@
 msgstr "hai raggiunto un numero massimo di link anonimi"
 
 #: src/ZWiki/Editing.py:842
-msgid ""
-"adding of external links by unidentified users is restricted. Please back up "
-"and remove some of the http urls you added, or contact the site "
-"administrator for help."
+msgid "adding of external links by unidentified users is restricted. Please back up and remove some of the http urls you added, or contact the site administrator for help."
 msgstr ""
 
 #: src/ZWiki/Editing.py:853
@@ -113,85 +97,86 @@
 msgstr "hai raggiunto un numero massimo di link anonimi"
 
 #: src/ZWiki/Editing.py:854
-msgid ""
-"adding of external links is restricted, even for identified users. Please "
-"back up and remove some of the http urls you added, or contact the site "
-"administrator for help."
+msgid "adding of external links is restricted, even for identified users. Please back up and remove some of the http urls you added, or contact the site administrator for help."
 msgstr ""
 
-#: src/ZWiki/Mail.py:506 src/ZWiki/skins/dtmlmessages.pt:58
+#: src/ZWiki/Mail.py:506 src/ZWiki/skins/dtmlmessages.pt:60
 msgid "anonymous"
 msgstr "anonimo"
 
-#: src/ZWiki/OutlineSupport.py:843 src/ZWiki/skins/zwiki/links.pt:56
+#: src/ZWiki/OutlineSupport.py:378
+msgid "Sorry, this wiki doesn't allow anonymous reparenting. Please configure a username in options first."
+msgstr ""
+
+#: src/ZWiki/OutlineSupport.py:878 src/ZWiki/skins/zwiki/links.pt:56
 msgid "which pages link to this one ?"
 msgstr "quali pagine referenziano questa ?"
 
-#: src/ZWiki/OutlineSupport.py:851
+#: src/ZWiki/OutlineSupport.py:886
 msgid "You are here"
 msgstr "Ti trovi qui"
 
-#: src/ZWiki/Utils.py:465
+#: src/ZWiki/Utils.py:487
 msgid "years"
 msgstr "anni"
 
-#: src/ZWiki/Utils.py:465
+#: src/ZWiki/Utils.py:487
 msgid "year"
 msgstr "anno"
 
-#: src/ZWiki/Utils.py:467
+#: src/ZWiki/Utils.py:489
 msgid "month"
 msgstr "mese"
 
-#: src/ZWiki/Utils.py:467
+#: src/ZWiki/Utils.py:489
 msgid "months"
 msgstr "mesi"
 
-#: src/ZWiki/Utils.py:469
+#: src/ZWiki/Utils.py:491
 msgid "weeks"
 msgstr "settimane"
 
-#: src/ZWiki/Utils.py:469
+#: src/ZWiki/Utils.py:491
 msgid "week"
 msgstr "settimana"
 
-#: src/ZWiki/Utils.py:471
+#: src/ZWiki/Utils.py:493
 msgid "day"
 msgstr "giorno"
 
-#: src/ZWiki/Utils.py:471
+#: src/ZWiki/Utils.py:493
 msgid "days"
 msgstr "giorni"
 
-#: src/ZWiki/Utils.py:473
+#: src/ZWiki/Utils.py:495
 msgid "hours"
 msgstr "ore"
 
-#: src/ZWiki/Utils.py:473
+#: src/ZWiki/Utils.py:495
 msgid "hour"
 msgstr "ora"
 
-#: src/ZWiki/Utils.py:475
+#: src/ZWiki/Utils.py:497
 msgid "minute"
 msgstr "minuto"
 
-#: src/ZWiki/Utils.py:475
+#: src/ZWiki/Utils.py:497
 msgid "minutes"
 msgstr "minuti"
 
-#: src/ZWiki/Utils.py:477
+#: src/ZWiki/Utils.py:499
 msgid "second"
 msgstr "secondo"
 
-#: src/ZWiki/Utils.py:477
+#: src/ZWiki/Utils.py:499
 msgid "seconds"
 msgstr "secondi"
 
-#: src/ZWiki/Views.py:346
+#: src/ZWiki/Views.py:350
 msgid "Page is locked"
 msgstr "La pagina è bloccata"
 
-#: src/ZWiki/Views.py:357
+#: src/ZWiki/Views.py:361
 msgid ""
 "\n"
 "            This page has a webDAV lock. Someone is probably editing it\n"
@@ -209,65 +194,61 @@
 "            tua versione del testo per riferimento.\n"
 "            "
 
-#: src/ZWiki/Views.py:364
+#: src/ZWiki/Views.py:368
 msgid "To discard your changes and try again, click OK."
 msgstr "Per annullare le tue modifiche e riprovarci, premi OK."
 
-#: src/ZWiki/Views.py:393
+#: src/ZWiki/Views.py:397
 msgid "Edit conflict"
 msgstr "Modifiche in conflitto"
 
-#: src/ZWiki/Views.py:413
+#: src/ZWiki/Views.py:417
 msgid "Someone else has saved this page while you were editing"
 msgstr "Qualcun'altro ha salvato questa pagina mentre la stavi modificando"
 
-#: src/ZWiki/Views.py:414
+#: src/ZWiki/Views.py:418
 msgid "To resolve the conflict, do this"
 msgstr "Per risolvere il conflitto, fai così"
 
-#: src/ZWiki/Views.py:415
+#: src/ZWiki/Views.py:419
 #, fuzzy
 msgid "Click your browser's back button"
 msgstr "Clicca il pulsante \"back\" del tuo browser per tornare indietro"
 
-#: src/ZWiki/Views.py:416
+#: src/ZWiki/Views.py:420
 #, fuzzy
 msgid "Copy your recent edits to the clipboard"
 msgstr "Copia le tue ultime modifiche che hai fatto nel clipboard"
 
-#: src/ZWiki/Views.py:417
+#: src/ZWiki/Views.py:421
 msgid "Click your browser's refresh button"
 msgstr "Ricarica la pagina con l'apposito pulsante del browser"
 
-#: src/ZWiki/Views.py:418
+#: src/ZWiki/Views.py:422
 msgid "Paste in your edits again, being mindful of the latest changes"
-msgstr ""
-"Reinserisci le modifiche reincollandole, tenendo presenti i recenti "
-"cambiamenti"
+msgstr "Reinserisci le modifiche reincollandole, tenendo presenti i recenti cambiamenti"
 
-#: src/ZWiki/Views.py:419
+#: src/ZWiki/Views.py:423
 msgid "Click the Change button again"
 msgstr "Premi di nuovo sul pulsante Modifica"
 
-#: src/ZWiki/Views.py:420 src/ZWiki/skins/zwiki/editform.pt:163
+#: src/ZWiki/Views.py:424 src/ZWiki/skins/zwiki/editform.pt:163
 msgid "or"
 msgstr "oppure"
 
-#: src/ZWiki/Views.py:421
+#: src/ZWiki/Views.py:425
 msgid "To discard your changes and start again, click OK"
 msgstr "Per annullare le tue modifiche e rifare tutto, premi OK"
 
-#: src/ZWiki/Views.py:490
+#: src/ZWiki/Views.py:501
 #, fuzzy
 msgid ""
 "\n"
-"        Access keys can be accessed in mozilla-based browsers by pressing "
-"alt-<key>\n"
+"        Access keys can be accessed in mozilla-based browsers by pressing alt-<key>\n"
 "        IE users: must also press enter\n"
 "        Mac users: command-<key>\n"
 "        Opera users: shift-escape-<key>\n"
-"        These won't work here, back up to the previous page to try them "
-"out.\n"
+"        These won't work here, back up to the previous page to try them out.\n"
 "\n"
 "        0    show these access key assignments\n"
 "\n"
@@ -283,10 +264,8 @@
 "        s    go to search field\n"
 "        \n"
 "        page functions:\n"
-"        +    (in a plone/cmf site with skin switching set up) use zwiki's "
-"plone/cmf skin\n"
-"        -    (in a plone/cmf site with skin switching set up) use zwiki's "
-"standard skin\n"
+"        +    (in a plone/cmf site with skin switching set up) use zwiki's plone/cmf skin\n"
+"        -    (in a plone/cmf site with skin switching set up) use zwiki's standard skin\n"
 "        v    view page\n"
 "        m    mail subscription\n"
 "        b    show backlinks (links to this page)\n"
@@ -356,33 +335,32 @@
 "        p    modifica precedente\n"
 "        "
 
-#: src/ZWiki/Wikis.py:49
-msgid "Unknown wiki type"
-msgstr ""
-
-#: src/ZWiki/ZWikiPage.py:675
+#: src/ZWiki/ZWikiPage.py:744
 msgid "create this page"
 msgstr "crea questa pagina"
 
-#: src/ZWiki/ZWikiPage.py:798 src/ZWiki/ZWikiPage.py:814
-#: src/ZWiki/ZWikiPage.py:817
+#: src/ZWiki/ZWikiPage.py:872 src/ZWiki/ZWikiPage.py:887
 msgid "last edited %(interval)s ago"
 msgstr "modificata %(interval)s fa"
 
-#: src/ZWiki/ZWikiPage.py:809
+#: src/ZWiki/ZWikiPage.py:882
 #, fuzzy
 msgid "show last edit"
 msgstr "mostra l'ultima modifica %(lastlog)s"
 
-#: src/ZWiki/ZWikiPage.py:826 src/ZWiki/ZWikiPage.py:828
+#: src/ZWiki/ZWikiPage.py:897 src/ZWiki/ZWikiPage.py:899
 msgid "by %(editor)s"
 msgstr "da %(editor)s"
 
-#: src/ZWiki/__init__.py:34
+#: src/ZWiki/__init__.py:200
+msgid "Unknown wiki type"
+msgstr ""
+
+#: src/ZWiki/__init__.py:39
 msgid "No need to add a Zwiki Outline Cache"
 msgstr ""
 
-#: src/ZWiki/__init__.py:35
+#: src/ZWiki/__init__.py:40
 msgid ""
 "Zwiki Outline Cache appears in the ZMI Add menu\n"
 "        for implementation reasons, but should not be added directly.\n"
@@ -394,6 +372,10 @@
 msgid "comments"
 msgstr "commenti"
 
+#: src/ZWiki/pagetypes/html.py:50 src/ZWiki/pagetypes/rst.py:85
+msgid "reply"
+msgstr "replica"
+
 #: src/ZWiki/pagetypes/moin.py:1990
 msgid "Expected \"=\" to follow \"%(token)s\""
 msgstr "\"%(token)s\" deve essere seguito da \"=\""
@@ -430,10 +412,6 @@
 msgid "Expected a color value \"%(arg)s\" after \"%(key)s\""
 msgstr "Richiesto il nome di un colore per \"%(arg)s\" dopo \"%(key)s\""
 
-#: src/ZWiki/pagetypes/rst.py:85
-msgid "reply"
-msgstr "replica"
-
 #: src/ZWiki/plugins/latexwiki/wikis/latexwiki/diffform.pt:127
 #: src/ZWiki/plugins/mathaction/wikis/mathaction/old-diffform.pt:127
 msgid "full history"
@@ -510,7 +488,7 @@
 msgstr "titolo"
 
 #: src/ZWiki/plugins/tracker/filterissues.pt:12
-#: src/ZWiki/skins/dtmlmessages.pt:30
+#: src/ZWiki/skins/dtmlmessages.pt:31
 msgid "Filter issues"
 msgstr "Filtra i problemi"
 
@@ -524,369 +502,358 @@
 msgid "Issue tracker"
 msgstr "archivio problematiche"
 
-#: src/ZWiki/plugins/tracker/tracker.py:361
+#: src/ZWiki/plugins/tracker/tracker.py:365
 #, fuzzy
 msgid "You are not authorized to comment on this ZWiki Page."
 msgstr "Non sei autorizzato a modificare questa pagina ZWiki."
 
-#: src/ZWiki/skins/dtmlmessages.pt:10 src/ZWiki/skins/dtmlmessages.pt:32
+#: src/ZWiki/skins/dtmlmessages.pt:10 src/ZWiki/skins/dtmlmessages.pt:33
+#, fuzzy
+msgid "name"
+msgstr "nome,"
+
+#: src/ZWiki/skins/dtmlmessages.pt:11 src/ZWiki/skins/dtmlmessages.pt:34
 msgid "category"
 msgstr "categoria"
 
-#: src/ZWiki/skins/dtmlmessages.pt:11 src/ZWiki/skins/dtmlmessages.pt:33
+#: src/ZWiki/skins/dtmlmessages.pt:12 src/ZWiki/skins/dtmlmessages.pt:35
 msgid "severity"
 msgstr "severità"
 
-#: src/ZWiki/skins/dtmlmessages.pt:12 src/ZWiki/skins/dtmlmessages.pt:34
+#: src/ZWiki/skins/dtmlmessages.pt:13 src/ZWiki/skins/dtmlmessages.pt:36
 msgid "status"
 msgstr "stato"
 
-#: src/ZWiki/skins/dtmlmessages.pt:13 src/ZWiki/skins/dtmlmessages.pt:35
+#: src/ZWiki/skins/dtmlmessages.pt:14 src/ZWiki/skins/dtmlmessages.pt:37
 msgid "age"
 msgstr "età"
 
-#: src/ZWiki/skins/dtmlmessages.pt:14 src/ZWiki/skins/dtmlmessages.pt:36
+#: src/ZWiki/skins/dtmlmessages.pt:15 src/ZWiki/skins/dtmlmessages.pt:38
 msgid "modified"
 msgstr "ultima modifica"
 
-#: src/ZWiki/skins/dtmlmessages.pt:15
+#: src/ZWiki/skins/dtmlmessages.pt:16
 msgid "Add a new issue:"
 msgstr "Aggiungi un nuovo problema:"
 
-#: src/ZWiki/skins/dtmlmessages.pt:16
+#: src/ZWiki/skins/dtmlmessages.pt:17
 msgid "Name:"
 msgstr "Nome:"
 
-#: src/ZWiki/skins/dtmlmessages.pt:17
+#: src/ZWiki/skins/dtmlmessages.pt:18
 msgid "Category:"
 msgstr "Categoria:"
 
-#: src/ZWiki/skins/dtmlmessages.pt:18
+#: src/ZWiki/skins/dtmlmessages.pt:19
 msgid "Severity:"
 msgstr "Severità:"
 
-#: src/ZWiki/skins/dtmlmessages.pt:19
-msgid "Status:"
-msgstr "Stato:"
-
 #: src/ZWiki/skins/dtmlmessages.pt:2
 msgid "Here are the wiki's issue pages."
 msgstr "Ecco le pagine relative alle problematiche del wiki."
 
 #: src/ZWiki/skins/dtmlmessages.pt:20
+msgid "Status:"
+msgstr "Stato:"
+
+#: src/ZWiki/skins/dtmlmessages.pt:21
 msgid "Details:"
 msgstr "Dettagli:"
 
-#: src/ZWiki/skins/dtmlmessages.pt:21
+#: src/ZWiki/skins/dtmlmessages.pt:22
 msgid "add issue"
 msgstr "aggiungi problema"
 
-#: src/ZWiki/skins/dtmlmessages.pt:22
+#: src/ZWiki/skins/dtmlmessages.pt:23
 msgid "More advanced"
 msgstr "Altre opzioni di ricerca avanzate su"
 
-#: src/ZWiki/skins/dtmlmessages.pt:23
+#: src/ZWiki/skins/dtmlmessages.pt:24
 msgid "issue tracker"
 msgstr "archivio problematiche"
 
-#: src/ZWiki/skins/dtmlmessages.pt:24
+#: src/ZWiki/skins/dtmlmessages.pt:25
 msgid "search options"
 msgstr "opzioni di ricerca"
 
-#: src/ZWiki/skins/dtmlmessages.pt:25
+#: src/ZWiki/skins/dtmlmessages.pt:26
 msgid "Name contains any of:"
 msgstr "Il nome contiene qualsiasi:"
 
-#: src/ZWiki/skins/dtmlmessages.pt:26
+#: src/ZWiki/skins/dtmlmessages.pt:27
 msgid "Page text contains any of:"
 msgstr "Il testo della pagina contiene qualsiasi:"
 
-#: src/ZWiki/skins/dtmlmessages.pt:27
+#: src/ZWiki/skins/dtmlmessages.pt:28
 msgid "Categories:"
 msgstr "Categorie:"
 
-#: src/ZWiki/skins/dtmlmessages.pt:28
+#: src/ZWiki/skins/dtmlmessages.pt:29
 msgid "Severities:"
 msgstr "Severità:"
 
-#: src/ZWiki/skins/dtmlmessages.pt:29
-msgid "Statuses:"
-msgstr "Stati:"
-
 #: src/ZWiki/skins/dtmlmessages.pt:3
 #, fuzzy
 msgid "Enter a search term, click the numbers to the right,"
-msgstr ""
-"Inserisci un termine da cercare, o clicca su uno dei numeri sulla destra, o"
+msgstr "Inserisci un termine da cercare, o clicca su uno dei numeri sulla destra, o"
 
-#: src/ZWiki/skins/dtmlmessages.pt:37
+#: src/ZWiki/skins/dtmlmessages.pt:30
+msgid "Statuses:"
+msgstr "Stati:"
+
+#: src/ZWiki/skins/dtmlmessages.pt:39
 msgid "Submitted by"
 msgstr "Inserito da"
 
-#: src/ZWiki/skins/dtmlmessages.pt:38
+#: src/ZWiki/skins/dtmlmessages.pt:4
+msgid "filter issues"
+msgstr "filtra i problemi"
+
+#: src/ZWiki/skins/dtmlmessages.pt:40
 msgid "Name"
 msgstr "Nome"
 
-#: src/ZWiki/skins/dtmlmessages.pt:39
+#: src/ZWiki/skins/dtmlmessages.pt:41
 msgid "Category"
 msgstr "Categoria"
 
-#: src/ZWiki/skins/dtmlmessages.pt:4
-msgid "filter issues"
-msgstr "filtra i problemi"
-
-#: src/ZWiki/skins/dtmlmessages.pt:40
+#: src/ZWiki/skins/dtmlmessages.pt:42
 msgid "Severity"
 msgstr "Severità"
 
-#: src/ZWiki/skins/dtmlmessages.pt:41
+#: src/ZWiki/skins/dtmlmessages.pt:43
 msgid "Status"
 msgstr "Stato"
 
-#: src/ZWiki/skins/dtmlmessages.pt:42
+#: src/ZWiki/skins/dtmlmessages.pt:44
 #, fuzzy
 msgid "Optional subject"
 msgstr "Titolo opzionale"
 
-#: src/ZWiki/skins/dtmlmessages.pt:43
+#: src/ZWiki/skins/dtmlmessages.pt:45
 #, fuzzy
 msgid "Optional comment"
 msgstr "Annotazione opzionale"
 
-#: src/ZWiki/skins/dtmlmessages.pt:44 src/ZWiki/skins/dtmlmessages.pt:45
+#: src/ZWiki/skins/dtmlmessages.pt:46 src/ZWiki/skins/dtmlmessages.pt:47
 #, fuzzy
 msgid "Add ZWiki"
 msgstr "Aggiungi pagina ZWiki"
 
-#: src/ZWiki/skins/dtmlmessages.pt:46
+#: src/ZWiki/skins/dtmlmessages.pt:48
 #, fuzzy
 msgid "Id:"
 msgstr "Id"
 
-#: src/ZWiki/skins/dtmlmessages.pt:47
+#: src/ZWiki/skins/dtmlmessages.pt:49
 #, fuzzy
 msgid "Title:"
 msgstr "Titolo"
 
-#: src/ZWiki/skins/dtmlmessages.pt:48
+#: src/ZWiki/skins/dtmlmessages.pt:5
+msgid "browse open issues"
+msgstr ""
+
+#: src/ZWiki/skins/dtmlmessages.pt:50
 msgid "Template:"
 msgstr ""
 
-#: src/ZWiki/skins/dtmlmessages.pt:49
+#: src/ZWiki/skins/dtmlmessages.pt:51
 #, fuzzy
 msgid "Add wiki"
 msgstr "Aggiungi pagina ZWiki"
 
-#: src/ZWiki/skins/dtmlmessages.pt:5
-msgid "browse open issues"
-msgstr ""
-
-#: src/ZWiki/skins/dtmlmessages.pt:50
+#: src/ZWiki/skins/dtmlmessages.pt:52
 msgid "Pages changed in the last"
 msgstr "Pagine modificate negli ultimi"
 
-#: src/ZWiki/skins/dtmlmessages.pt:51
+#: src/ZWiki/skins/dtmlmessages.pt:53
 msgid "Recently changed pages, with summaries"
 msgstr "Pagine modificate di recente, con sommario"
 
-#: src/ZWiki/skins/dtmlmessages.pt:52
+#: src/ZWiki/skins/dtmlmessages.pt:54
 msgid "Show summaries ?"
 msgstr "Mostrare i sommari ?"
 
-#: src/ZWiki/skins/dtmlmessages.pt:53
+#: src/ZWiki/skins/dtmlmessages.pt:55
 msgid "Refresh"
 msgstr "Aggiorna"
 
-#: src/ZWiki/skins/dtmlmessages.pt:54
+#: src/ZWiki/skins/dtmlmessages.pt:56
 msgid "Page"
 msgstr "Pagina"
 
-#: src/ZWiki/skins/dtmlmessages.pt:55
+#: src/ZWiki/skins/dtmlmessages.pt:57
 msgid "Edited&nbsp;by"
 msgstr "Modificata&nbsp;da"
 
-#: src/ZWiki/skins/dtmlmessages.pt:56
+#: src/ZWiki/skins/dtmlmessages.pt:58
 msgid "Time"
 msgstr "Quando"
 
-#: src/ZWiki/skins/dtmlmessages.pt:57
+#: src/ZWiki/skins/dtmlmessages.pt:59
 msgid "NEW"
 msgstr "NUOVA"
 
-#: src/ZWiki/skins/dtmlmessages.pt:59
-msgid "Pages marked (NEW) have been created within the last week"
-msgstr "Le pagine marcate con (NUOVA) sono state create nell'ultima settimana"
-
 #: src/ZWiki/skins/dtmlmessages.pt:6
 msgid "search issues"
 msgstr "cerca tra i problemi"
 
-#: src/ZWiki/skins/dtmlmessages.pt:60
+#: src/ZWiki/skins/dtmlmessages.pt:61
+msgid "Pages marked (NEW) have been created within the last week"
+msgstr "Le pagine marcate con (NUOVA) sono state create nell'ultima settimana"
+
+#: src/ZWiki/skins/dtmlmessages.pt:62
 msgid "Enter a word or phrase and hit enter to search the entire wiki."
-msgstr ""
-"Inserisci una parola o una frase e poi invio per cercare nell'intero wiki."
+msgstr "Inserisci una parola o una frase e poi invio per cercare nell'intero wiki."
 
-#: src/ZWiki/skins/dtmlmessages.pt:61
+#: src/ZWiki/skins/dtmlmessages.pt:63
 msgid "This is the same as using the search field at top right."
-msgstr ""
-"Questo è lo stesso meccanismo usato dal campo di ricerca in alto a destra."
+msgstr "Questo è lo stesso meccanismo usato dal campo di ricerca in alto a destra."
 
-#: src/ZWiki/skins/dtmlmessages.pt:62
+#: src/ZWiki/skins/dtmlmessages.pt:64
 msgid "Tips: A single word works best for matching page names."
-msgstr ""
-"Suggerimento: Una singola parola è l'ideale per cercare nei nomi delle "
-"pagine."
+msgstr "Suggerimento: Una singola parola è l'ideale per cercare nei nomi delle pagine."
 
-#: src/ZWiki/skins/dtmlmessages.pt:63
-msgid ""
-"Case-insensitivity and wildcards may be supported depending on your catalog "
-"configuration."
+#: src/ZWiki/skins/dtmlmessages.pt:65
+msgid "Case-insensitivity and wildcards may be supported depending on your catalog configuration."
 msgstr ""
 "La possibilità di ignorare il maiuscolo/minuscolo o di usare i\n"
 "caratteri jolly dipende dalla configurazione del tuo catalogo."
 
-#: src/ZWiki/skins/dtmlmessages.pt:64
+#: src/ZWiki/skins/dtmlmessages.pt:66
 msgid "Leave it blank to list all pages."
 msgstr "Lascia in bianco per ottenere l'elenco di tutte le pagine."
 
-#: src/ZWiki/skins/dtmlmessages.pt:65 src/ZWiki/skins/dtmlmessages.pt:66
+#: src/ZWiki/skins/dtmlmessages.pt:67 src/ZWiki/skins/dtmlmessages.pt:68
 msgid "Search"
 msgstr "Cerca"
 
-#: src/ZWiki/skins/dtmlmessages.pt:67
+#: src/ZWiki/skins/dtmlmessages.pt:69
 msgid "Page names matching"
 msgstr "Cerca nei nomi delle pagine"
 
-#: src/ZWiki/skins/dtmlmessages.pt:68
+#: src/ZWiki/skins/dtmlmessages.pt:7
+msgid "recent"
+msgstr "recente"
+
+#: src/ZWiki/skins/dtmlmessages.pt:70
 msgid "Text matching"
 msgstr "Cerca nel testo"
 
-#: src/ZWiki/skins/dtmlmessages.pt:69
+#: src/ZWiki/skins/dtmlmessages.pt:71
 #, fuzzy
 msgid "Thorough (non-catalog) search for text matching"
 msgstr "ricerca accurata"
 
-#: src/ZWiki/skins/dtmlmessages.pt:7
-msgid "recent"
-msgstr "recente"
-
-#: src/ZWiki/skins/dtmlmessages.pt:70
+#: src/ZWiki/skins/dtmlmessages.pt:72
 msgid "Set your preferences for this wiki:"
 msgstr "Imposta le tue preferenze per questo wiki:"
 
-#: src/ZWiki/skins/dtmlmessages.pt:71
+#: src/ZWiki/skins/dtmlmessages.pt:73
 msgid "User name:"
 msgstr "Nome utente:"
 
-#: src/ZWiki/skins/dtmlmessages.pt:72
-msgid "(identifies your edits)"
-msgstr "(firma le tue modifiche)"
+#: src/ZWiki/skins/dtmlmessages.pt:74
+msgid "(identifies your edits, saves your votes, may be required)"
+msgstr ""
 
-#: src/ZWiki/skins/dtmlmessages.pt:73
+#: src/ZWiki/skins/dtmlmessages.pt:75
 msgid "Email address:"
 msgstr "Indirizzo email:"
 
-#: src/ZWiki/skins/dtmlmessages.pt:74
+#: src/ZWiki/skins/dtmlmessages.pt:76
 msgid "(allows mail subscription)"
 msgstr "(consenti sottoscrizione abbonamento email)"
 
-#: src/ZWiki/skins/dtmlmessages.pt:75
+#: src/ZWiki/skins/dtmlmessages.pt:77
 msgid "Your time zone:"
 msgstr "Il tuo fuso orario:"
 
-#: src/ZWiki/skins/dtmlmessages.pt:76
+#: src/ZWiki/skins/dtmlmessages.pt:78
 msgid "(localizes most times)"
 msgstr "(per mostrare l'ora locale)"
 
-#: src/ZWiki/skins/dtmlmessages.pt:77
+#: src/ZWiki/skins/dtmlmessages.pt:79
 msgid "Edit form height:"
 msgstr "Cambia l'altezza del modulo di modifica:"
 
-#: src/ZWiki/skins/dtmlmessages.pt:78
+#: src/ZWiki/skins/dtmlmessages.pt:8
+msgid "all"
+msgstr "tutti"
+
+#: src/ZWiki/skins/dtmlmessages.pt:80
 msgid "(adjusts form size)"
 msgstr "(aggiusta le dimensioni del modulo)"
 
-#: src/ZWiki/skins/dtmlmessages.pt:79
+#: src/ZWiki/skins/dtmlmessages.pt:81
 msgid "Save options"
 msgstr "Salva le opzioni"
 
-#: src/ZWiki/skins/dtmlmessages.pt:8
-msgid "all"
-msgstr "tutti"
-
-#: src/ZWiki/skins/dtmlmessages.pt:80
+#: src/ZWiki/skins/dtmlmessages.pt:82
 msgid "Forget options"
 msgstr "Dimentica le opzioni"
 
-#: src/ZWiki/skins/dtmlmessages.pt:81 src/ZWiki/skins/dtmlmessages.pt:82
+#: src/ZWiki/skins/dtmlmessages.pt:83 src/ZWiki/skins/dtmlmessages.pt:84
 msgid "Add ZWiki Page"
 msgstr "Aggiungi pagina ZWiki"
 
-#: src/ZWiki/skins/dtmlmessages.pt:83
+#: src/ZWiki/skins/dtmlmessages.pt:85
 #, fuzzy
 msgid "Page&nbsp;name:"
 msgstr "Nome della pagina"
 
-#: src/ZWiki/skins/dtmlmessages.pt:84
+#: src/ZWiki/skins/dtmlmessages.pt:86
 #, fuzzy
 msgid "Add wiki page"
 msgstr "Aggiungi pagina ZWiki"
 
-#: src/ZWiki/skins/dtmlmessages.pt:85
+#: src/ZWiki/skins/dtmlmessages.pt:87
 #, fuzzy
 msgid "Topic"
 msgstr "sotto argomento"
 
-#: src/ZWiki/skins/dtmlmessages.pt:86
+#: src/ZWiki/skins/dtmlmessages.pt:88
 msgid "Last updated"
 msgstr "Ultimo aggiornamento"
 
-#: src/ZWiki/skins/dtmlmessages.pt:87
+#: src/ZWiki/skins/dtmlmessages.pt:89
 #, fuzzy
 msgid "Comments"
 msgstr "commenti"
 
-#: src/ZWiki/skins/dtmlmessages.pt:88
+#: src/ZWiki/skins/dtmlmessages.pt:9 src/ZWiki/skins/dtmlmessages.pt:32
+msgid "#"
+msgstr ""
+
+#: src/ZWiki/skins/dtmlmessages.pt:90
 #, fuzzy
 msgid "Views"
 msgstr "visualizza"
 
-#: src/ZWiki/skins/dtmlmessages.pt:89
+#: src/ZWiki/skins/dtmlmessages.pt:91
 #, fuzzy
 msgid "Created"
 msgstr "Crea"
 
-#: src/ZWiki/skins/dtmlmessages.pt:9 src/ZWiki/skins/dtmlmessages.pt:31
-msgid "#"
-msgstr ""
-
-#: src/ZWiki/skins/dtmlmessages.pt:90 src/ZWiki/skins/dtmlmessages.pt:92
+#: src/ZWiki/skins/dtmlmessages.pt:92 src/ZWiki/skins/dtmlmessages.pt:94
 msgid "by"
 msgstr "di"
 
-#: src/ZWiki/skins/dtmlmessages.pt:91
+#: src/ZWiki/skins/dtmlmessages.pt:93
 msgid "<dtml-var lasteditinterval> ago</dtml-var>"
 msgstr "dtml-var lasteditinterval> fa </dtml-var>"
 
-#: src/ZWiki/skins/dtmlmessages.pt:93
+#: src/ZWiki/skins/dtmlmessages.pt:95
 msgid "on"
 msgstr "attivo"
 
-#: src/ZWiki/skins/zwiki/backlinks.pt:108
+#: src/ZWiki/skins/zwiki/backlinks.pt:102
 #, fuzzy
-msgid "Subtopics"
-msgstr "sotto argomento"
-
-#: src/ZWiki/skins/zwiki/backlinks.pt:111
-msgid "This page has no subtopics."
-msgstr "Questa pagina non ha sottoargomenti"
-
-#: src/ZWiki/skins/zwiki/backlinks.pt:114
-#, fuzzy
 msgid "Here are it's subtopics."
 msgstr "Ecco le pagine relative alle problematiche del wiki."
 
-#: src/ZWiki/skins/zwiki/backlinks.pt:117
+#: src/ZWiki/skins/zwiki/backlinks.pt:105
 #, fuzzy
 msgid "You can reorder them by clicking the ^ buttons."
 msgstr "Puoi cambiare l'ordine dei sottoargomenti schiacciando il bottone ^"
@@ -901,67 +868,65 @@
 msgid "Parents"
 msgstr "sovrastante,"
 
-#: src/ZWiki/skins/zwiki/backlinks.pt:31
+#: src/ZWiki/skins/zwiki/backlinks.pt:28
 msgid "is a top-level topic."
 msgstr "è un argomento principale."
 
-#: src/ZWiki/skins/zwiki/backlinks.pt:32
+#: src/ZWiki/skins/zwiki/backlinks.pt:29
 msgid "is a subtopic of:"
 msgstr "è un sotto argomento di:"
 
-#: src/ZWiki/skins/zwiki/backlinks.pt:55
+#: src/ZWiki/skins/zwiki/backlinks.pt:48
 #, fuzzy
 msgid "Backlinks"
 msgstr "riferimenti inversi"
 
-#: src/ZWiki/skins/zwiki/backlinks.pt:56
+#: src/ZWiki/skins/zwiki/backlinks.pt:49
 msgid "Here are the pages which link to it:"
 msgstr "Queste sono le pagine che la referenziano:"
 
-#: src/ZWiki/skins/zwiki/backlinks.pt:57
+#: src/ZWiki/skins/zwiki/backlinks.pt:50
 #, fuzzy
 msgid "No other pages link to this one."
 msgstr "quali pagine referenziano questa ?"
 
-#: src/ZWiki/skins/zwiki/backlinks.pt:82
-msgid ""
-"You can set this page's parent(s) to place it within the overall page "
-"hierarchy."
+#: src/ZWiki/skins/zwiki/backlinks.pt:70
+msgid "You can set this page's parent(s) to place it within the overall page hierarchy."
 msgstr ""
 
-#: src/ZWiki/skins/zwiki/backlinks.pt:85
-msgid ""
-"Check one or more checkboxes or enter a page name here, and click the button."
+#: src/ZWiki/skins/zwiki/backlinks.pt:73
+msgid "Check one or more checkboxes or enter a page name here, and click the button."
 msgstr ""
 
-#: src/ZWiki/skins/zwiki/backlinks.pt:88
+#: src/ZWiki/skins/zwiki/backlinks.pt:76
 msgid "Enter a page name here and click the button."
 msgstr ""
 
-#: src/ZWiki/skins/zwiki/backlinks.pt:91
-msgid ""
-"You can type just the first few letters, case and punctuation are ignored."
+#: src/ZWiki/skins/zwiki/backlinks.pt:79
+msgid "You can type just the first few letters, case and punctuation are ignored."
 msgstr ""
 
-#: src/ZWiki/skins/zwiki/backlinks.pt:98
+#: src/ZWiki/skins/zwiki/backlinks.pt:86
 msgid "Reparent"
 msgstr "Aggiorna gerarchia"
 
+#: src/ZWiki/skins/zwiki/backlinks.pt:96
+#, fuzzy
+msgid "Subtopics"
+msgstr "sotto argomento"
+
+#: src/ZWiki/skins/zwiki/backlinks.pt:99
+msgid "This page has no subtopics."
+msgstr "Questa pagina non ha sottoargomenti"
+
 #: src/ZWiki/skins/zwiki/badtemplate.pt:12
 msgid "Bad template"
 msgstr ""
 
 #: src/ZWiki/skins/zwiki/badtemplate.pt:13
 #, fuzzy
-msgid ""
-"There was a problem locating one of this wiki's skin templates. There may be "
-"a page or other non-page-template/non-dtml-method object with the same ID, "
-"obscuring the template. Or the template may be missing on the filesystem (an "
-"incomplete Zwiki installation)."
-msgstr ""
-"Si è verificato un problema con lo skin template di questo wiki.  Potrebbe "
-"esserci un oggetto con lo stesso nome dello skin che non è un Page Template "
-"o un metodo DTML, oppure potrebbe mancare il template."
+msgid "There was a problem locating one of this wiki's skin templates. There may be a page or other non-page-template/non-dtml-method object with the same ID, obscuring the template. Or the template may be missing on the filesystem (an incomplete Zwiki installation)."
+msgstr "Si è verificato un problema con lo skin template di questo wiki.  Potrebbe esserci un oggetto con lo stesso nome dello skin che non è un Page Template o un metodo DTML, oppure potrebbe mancare il template."
 
 #: src/ZWiki/skins/zwiki/commentform.pt:21
 msgid "subject"
@@ -977,9 +942,7 @@
 
 #: src/ZWiki/skins/zwiki/commentform.pt:36
 msgid "to comment (and cc any subscribers) enter text here and click add"
-msgstr ""
-"Per commentare (in CC agli abbonati) inserisci qui il testo e premi sul "
-"pulsante"
+msgstr "Per commentare (in CC agli abbonati) inserisci qui il testo e premi sul pulsante"
 
 #: src/ZWiki/skins/zwiki/commentform.pt:56
 msgid "${nb} subscribers"
@@ -994,12 +957,20 @@
 msgid "add-comment"
 msgstr "aggiungi un commento"
 
-#: src/ZWiki/skins/zwiki/contentspage.pt:12
+#: src/ZWiki/skins/zwiki/contentspage.pt:10
+#: src/ZWiki/skins/zwiki/contentspage.pt:27
+#, fuzzy
+msgid "Wiki contents for"
+msgstr "Contenuto del wiki"
+
+#: src/ZWiki/skins/zwiki/contentspage.pt:13
+#: src/ZWiki/skins/zwiki/contentspage.pt:30
 msgid "Wiki contents"
 msgstr "Contenuto del wiki"
 
-#: src/ZWiki/skins/zwiki/contentspage.pt:16
-msgid "Singletons"
+#: src/ZWiki/skins/zwiki/contentspage.pt:40
+#, fuzzy
+msgid "Singletons:"
 msgstr "Pagine singole"
 
 #: src/ZWiki/skins/zwiki/denied.pt:12
@@ -1087,13 +1058,13 @@
 msgstr ""
 
 #: src/ZWiki/skins/zwiki/editform.pt:178
-msgid "preview this edit"
-msgstr "anteprima delle modifiche"
-
-#: src/ZWiki/skins/zwiki/editform.pt:178
 msgid "Preview"
 msgstr "Anteprima"
 
+#: src/ZWiki/skins/zwiki/editform.pt:178
+msgid "preview this edit"
+msgstr "anteprima delle modifiche"
+
 #: src/ZWiki/skins/zwiki/editform.pt:183
 msgid "Cancel"
 msgstr "Annulla"
@@ -1126,18 +1097,21 @@
 
 #: src/ZWiki/skins/zwiki/editform.pt:61
 msgid "the name of this wiki page (changing this may be slow!)"
-msgstr ""
-"nome di questa pagina wiki (questa modifica può richiedere molto tempo!)"
+msgstr "nome di questa pagina wiki (questa modifica può richiedere molto tempo!)"
 
 #: src/ZWiki/skins/zwiki/editform.pt:71
-msgid "type"
-msgstr "tipo"
+msgid "markup"
+msgstr ""
 
 #: src/ZWiki/skins/zwiki/editform.pt:72
 msgid "select the formatting and rendering style for this page"
-msgstr ""
-"seleziona la formattazione e lo stile di visualizzazione di questa pagina"
+msgstr "seleziona la formattazione e lo stile di visualizzazione di questa pagina"
 
+#: src/ZWiki/skins/zwiki/helppage.pt:12
+#, fuzzy
+msgid "Help page"
+msgstr "PaginaAiuto"
+
 #: src/ZWiki/skins/zwiki/links.pt:102
 msgid "(external edit)"
 msgstr "(editor esterno)"
@@ -1273,19 +1247,17 @@
 
 #: src/ZWiki/skins/zwiki/pagemanagementform.pt:40
 msgid "enter a page name and click buttons to the right (mouse over for help)"
+msgstr "inserisci il nome della pagina e clicca i pulsanti sulla destra (spostaci sopra il mouse per un aiuto)"
+
+#: src/ZWiki/skins/zwiki/pagemanagementform.pt:45
+msgid "make this page a subtopic of the page you have entered"
 msgstr ""
-"inserisci il nome della pagina e clicca i pulsanti sulla destra (spostaci "
-"sopra il mouse per un aiuto)"
 
 #: src/ZWiki/skins/zwiki/pagemanagementform.pt:45
 #, fuzzy
 msgid "reparent"
 msgstr "Aggiorna gerarchia"
 
-#: src/ZWiki/skins/zwiki/pagemanagementform.pt:45
-msgid "make this page a subtopic of the page you have entered"
-msgstr ""
-
 #: src/ZWiki/skins/zwiki/pagemanagementform.pt:50
 msgid "rename this page to the name you have entered, updating all links"
 msgstr ""
@@ -1300,8 +1272,7 @@
 msgstr ""
 
 #: src/ZWiki/skins/zwiki/pagemanagementform.pt:55
-msgid ""
-"delete this page, and redirect links to the page you have entered, if any"
+msgid "delete this page, and redirect links to the page you have entered, if any"
 msgstr ""
 
 #: src/ZWiki/skins/zwiki/pagemanagementform.pt:60
@@ -1448,6 +1419,12 @@
 msgid "User options"
 msgstr "opzioni di ricerca"
 
+#~ msgid "(identifies your edits)"
+#~ msgstr "(firma le tue modifiche)"
+
+#~ msgid "type"
+#~ msgstr "tipo"
+
 #, fuzzy
 #~ msgid "your edit contained a banned link pattern"
 #~ msgstr "il tuo contenuto contiene un link non accettato"
@@ -1468,10 +1445,7 @@
 #~ msgid "and enter"
 #~ msgstr "e inserisci"
 
-#~ msgid ""
-#~ "You may create a new ZWiki Page object using the form below. You may also "
-#~ "choose to upload an existing html file from your local computer by "
-#~ "clicking the <i>Browse</i> button."
+#~ msgid "You may create a new ZWiki Page object using the form below. You may also choose to upload an existing html file from your local computer by clicking the <i>Browse</i> button."
 #~ msgstr ""
 #~ "Puoi creare una nuova pagina ZWiki usando il modulo sottostante. Puoi\n"
 #~ "scegliere invece di caricare un file html presente sul tuo computer\n"
@@ -1493,8 +1467,7 @@
 #~ msgstr "Riferimenti inversi a"
 
 #~ msgid "singleton_desc"
-#~ msgstr ""
-#~ "Le pagine singole sono quelle che non sono connesse a nessun'altra pagina."
+#~ msgstr "Le pagine singole sono quelle che non sono connesse a nessun'altra pagina."
 
 #~ msgid "History for"
 #~ msgstr "Storia di"
@@ -1503,9 +1476,7 @@
 #~ msgstr "torna alla pagina"
 
 #~ msgid "help_shortname"
-#~ msgstr ""
-#~ "Cambiare il nome di una pagina di un wiki molto esteso può richiedere "
-#~ "molto tempo.  Se possibile le altre pagine verranno aggiornate."
+#~ msgstr "Cambiare il nome di una pagina di un wiki molto esteso può richiedere molto tempo.  Se possibile le altre pagine verranno aggiornate."
 
 #~ msgid "label_body_text"
 #~ msgstr "Testo della pagina"
@@ -1518,8 +1489,7 @@
 #~ "sarà possibile creare una pagina con quel nome."
 
 #~ msgid "help_wikiwords"
-#~ msgstr ""
-#~ "Questo wiki supporta anche le ParoleWiki come meccanismo di collegamento."
+#~ msgstr "Questo wiki supporta anche le ParoleWiki come meccanismo di collegamento."
 
 #~ msgid "label_note"
 #~ msgstr "Annotazione per lo storico della pagina (opzionale)"
@@ -1552,9 +1522,7 @@
 #~ "        \"${pagename}\""
 
 #~ msgid "description_edit_wiki_page"
-#~ msgstr ""
-#~ "Una pagina Wiki ti consente di creare dei documenti con molte "
-#~ "interconnessioni."
+#~ msgstr "Una pagina Wiki ti consente di creare dei documenti con molte interconnessioni."
 
 #~ msgid "legend_wiki_page_details"
 #~ msgstr "Dettagli della pagina"
@@ -1716,9 +1684,7 @@
 #~ msgstr "Navigazione del Wiki"
 
 #~ msgid "enter comments here and click add; or, click edit"
-#~ msgstr ""
-#~ "inserisci la tua annotazione e clicca su aggiungi commento; oppure clicca "
-#~ "su modifica"
+#~ msgstr "inserisci la tua annotazione e clicca su aggiungi commento; oppure clicca su modifica"
 
 #~ msgid "Details & comments"
 #~ msgstr "Dettagli e commenti"
@@ -1726,12 +1692,8 @@
 #~ msgid "hits"
 #~ msgstr "visite"
 
-#~ msgid ""
-#~ "no catalog or the catalog search gave an error, a brute-force search was "
-#~ "used"
-#~ msgstr ""
-#~ "catalogo non presente oppure la ricerca sul catalogo ha generato un "
-#~ "errore: ho eseguito quindi una ricerca esaustiva"
+#~ msgid "no catalog or the catalog search gave an error, a brute-force search was used"
+#~ msgstr "catalogo non presente oppure la ricerca sul catalogo ha generato un errore: ho eseguito quindi una ricerca esaustiva"
 
 #~ msgid "Contents"
 #~ msgstr "Contenuti"

Modified: zope-zwiki/trunk/i18n/ja.po
===================================================================
--- zope-zwiki/trunk/i18n/ja.po	2007-04-08 14:54:05 UTC (rev 761)
+++ zope-zwiki/trunk/i18n/ja.po	2007-04-08 14:55:27 UTC (rev 762)
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: Zwiki 0.9.10\n"
-"POT-Creation-Date: Sat Sep  2 18:10:16 2006\n"
+"POT-Creation-Date: Tue Mar 27 14:50:46 2007\n"
 "PO-Revision-Date: 2006-08-23 12:28+0000\n"
 "Last-Translator: jack <jack at jk.to>\n"
 "Language-Team: Japanese <LL at li.org>\n"
@@ -13,46 +13,40 @@
 "Preferred-encodings: utf-8\n"
 "Domain: zwiki\n"
 
-#: src/ZWiki/Admin.py:62
+#: src/ZWiki/Admin.py:58
 msgid "You are not authorized to upgrade all pages."
 msgstr "全てのページをアップグレードする権限がありません"
 
-#: src/ZWiki/Admin.py:63
+#: src/ZWiki/Admin.py:59
 msgid "(folder -> Manage properties)"
 msgstr "(フォルダ -> プロパティの管理)"
 
-#: src/ZWiki/Diff.py:174
+#: src/ZWiki/Diff.py:179
 #, fuzzy
 msgid "You are not authorized to reparent this ZWiki Page."
 msgstr "このページの名前を変更する権限がありません"
 
-#: src/ZWiki/Diff.py:180 src/ZWiki/plugins/tracker/tracker.py:332
+#: src/ZWiki/Diff.py:185 src/ZWiki/plugins/tracker/tracker.py:333
 msgid "You are not authorized to rename this ZWiki Page."
 msgstr "このページの名前を変更する権限がありません"
 
-#: src/ZWiki/Editing.py:156 src/ZWiki/Editing.py:294 src/ZWiki/Views.py:332
-#: src/ZWiki/Views.py:435 src/ZWiki/plugins/tracker/tracker.py:321
-msgid ""
-"Sorry, this wiki doesn't allow anonymous edits. Please configure a username "
-"in options first."
-msgstr ""
-"匿名ユーザによる編集は許可されていません。まず、ユーザ設定をしてください。"
+#: src/ZWiki/Editing.py:156 src/ZWiki/Editing.py:294 src/ZWiki/Views.py:336
+#: src/ZWiki/Views.py:439 src/ZWiki/plugins/tracker/tracker.py:322
+msgid "Sorry, this wiki doesn't allow anonymous edits. Please configure a username in options first."
+msgstr "匿名ユーザによる編集は許可されていません。まず、ユーザ設定をしてください。"
 
 #: src/ZWiki/Editing.py:327
-msgid ""
-"You are not authorized to reparent or change subtopics links on this ZWiki "
-"Page."
-msgstr ""
-"このページのリペアレントやサブトピックリンクの変更をする権限がありません"
+msgid "You are not authorized to reparent or change subtopics links on this ZWiki Page."
+msgstr "このページのリペアレントやサブトピックリンクの変更をする権限がありません"
 
 #: src/ZWiki/Editing.py:349
 msgid "You are not authorized to change this ZWiki Page's type."
 msgstr "このページのタイプ変更をする権限がありません"
 
 #: src/ZWiki/Editing.py:383 src/ZWiki/Editing.py:410
-#: src/ZWiki/plugins/tracker/tracker.py:340
-#: src/ZWiki/plugins/tracker/tracker.py:347
-#: src/ZWiki/plugins/tracker/tracker.py:354
+#: src/ZWiki/plugins/tracker/tracker.py:344
+#: src/ZWiki/plugins/tracker/tracker.py:351
+#: src/ZWiki/plugins/tracker/tracker.py:358
 msgid "You are not authorized to edit this ZWiki Page."
 msgstr "このページの編集権限がありません"
 
@@ -61,11 +55,8 @@
 msgstr "このページの削除権限がありません"
 
 #: src/ZWiki/Editing.py:563
-msgid ""
-"This page was renamed to %s. You can delete this one if no longer needed.\n"
-msgstr ""
-"このページの名前は %s に変更されました。このページが不要であれば削除してもか"
-"まいません\n"
+msgid "This page was renamed to %s. You can delete this one if no longer needed.\n"
+msgstr "このページの名前は %s に変更されました。このページが不要であれば削除してもかまいません\n"
 
 #: src/ZWiki/Editing.py:659
 msgid "You are not authorized to upload files here."
@@ -85,9 +76,7 @@
 
 #: src/ZWiki/Editing.py:830
 #, fuzzy
-msgid ""
-"your edit contained a banned link pattern. Please contact the site "
-"administrator for help."
+msgid "your edit contained a banned link pattern. Please contact the site administrator for help."
 msgstr "問題(%s)が発生しました。サイトの管理者に連絡してください"
 
 #: src/ZWiki/Editing.py:841
@@ -95,10 +84,7 @@
 msgstr "最大匿名リンク数に到達しました"
 
 #: src/ZWiki/Editing.py:842
-msgid ""
-"adding of external links by unidentified users is restricted. Please back up "
-"and remove some of the http urls you added, or contact the site "
-"administrator for help."
+msgid "adding of external links by unidentified users is restricted. Please back up and remove some of the http urls you added, or contact the site administrator for help."
 msgstr ""
 
 #: src/ZWiki/Editing.py:853
@@ -107,85 +93,87 @@
 msgstr "最大匿名リンク数に到達しました"
 
 #: src/ZWiki/Editing.py:854
-msgid ""
-"adding of external links is restricted, even for identified users. Please "
-"back up and remove some of the http urls you added, or contact the site "
-"administrator for help."
+msgid "adding of external links is restricted, even for identified users. Please back up and remove some of the http urls you added, or contact the site administrator for help."
 msgstr ""
 
-#: src/ZWiki/Mail.py:506 src/ZWiki/skins/dtmlmessages.pt:58
+#: src/ZWiki/Mail.py:506 src/ZWiki/skins/dtmlmessages.pt:60
 msgid "anonymous"
 msgstr "匿名"
 
-#: src/ZWiki/OutlineSupport.py:843 src/ZWiki/skins/zwiki/links.pt:56
+#: src/ZWiki/OutlineSupport.py:378
+#, fuzzy
+msgid "Sorry, this wiki doesn't allow anonymous reparenting. Please configure a username in options first."
+msgstr "匿名ユーザによる編集は許可されていません。まず、ユーザ設定をしてください。"
+
+#: src/ZWiki/OutlineSupport.py:878 src/ZWiki/skins/zwiki/links.pt:56
 msgid "which pages link to this one ?"
 msgstr "どこからリンクされているでしょうか?"
 
-#: src/ZWiki/OutlineSupport.py:851
+#: src/ZWiki/OutlineSupport.py:886
 msgid "You are here"
 msgstr "現在の位置"
 
-#: src/ZWiki/Utils.py:465
+#: src/ZWiki/Utils.py:487
 msgid "years"
 msgstr "å¹´"
 
-#: src/ZWiki/Utils.py:465
+#: src/ZWiki/Utils.py:487
 msgid "year"
 msgstr "å¹´"
 
-#: src/ZWiki/Utils.py:467
+#: src/ZWiki/Utils.py:489
 msgid "month"
 msgstr "月"
 
-#: src/ZWiki/Utils.py:467
+#: src/ZWiki/Utils.py:489
 msgid "months"
 msgstr "月"
 
-#: src/ZWiki/Utils.py:469
+#: src/ZWiki/Utils.py:491
 msgid "weeks"
 msgstr "週"
 
-#: src/ZWiki/Utils.py:469
+#: src/ZWiki/Utils.py:491
 msgid "week"
 msgstr "週"
 
-#: src/ZWiki/Utils.py:471
+#: src/ZWiki/Utils.py:493
 msgid "day"
 msgstr "æ—¥"
 
-#: src/ZWiki/Utils.py:471
+#: src/ZWiki/Utils.py:493
 msgid "days"
 msgstr "æ—¥"
 
-#: src/ZWiki/Utils.py:473
+#: src/ZWiki/Utils.py:495
 msgid "hours"
 msgstr "時間"
 
-#: src/ZWiki/Utils.py:473
+#: src/ZWiki/Utils.py:495
 msgid "hour"
 msgstr "時間"
 
-#: src/ZWiki/Utils.py:475
+#: src/ZWiki/Utils.py:497
 msgid "minute"
 msgstr "分"
 
-#: src/ZWiki/Utils.py:475
+#: src/ZWiki/Utils.py:497
 msgid "minutes"
 msgstr "分"
 
-#: src/ZWiki/Utils.py:477
+#: src/ZWiki/Utils.py:499
 msgid "second"
 msgstr "秒"
 
-#: src/ZWiki/Utils.py:477
+#: src/ZWiki/Utils.py:499
 msgid "seconds"
 msgstr "秒"
 
-#: src/ZWiki/Views.py:346
+#: src/ZWiki/Views.py:350
 msgid "Page is locked"
 msgstr "ページはロックされています"
 
-#: src/ZWiki/Views.py:357
+#: src/ZWiki/Views.py:361
 msgid ""
 "\n"
 "            This page has a webDAV lock. Someone is probably editing it\n"
@@ -202,60 +190,58 @@
 "            参照用にバックアップ、コピーをすることもできます。\n"
 "            "
 
-#: src/ZWiki/Views.py:364
+#: src/ZWiki/Views.py:368
 msgid "To discard your changes and try again, click OK."
 msgstr "修正するより、最初からやり直すほうがよいなら、「OK」をクリック"
 
-#: src/ZWiki/Views.py:393
+#: src/ZWiki/Views.py:397
 msgid "Edit conflict"
 msgstr "編集の衝突"
 
-#: src/ZWiki/Views.py:413
+#: src/ZWiki/Views.py:417
 msgid "Someone else has saved this page while you were editing"
 msgstr "あなたの編集中にだれかがこのページを更新しました"
 
-#: src/ZWiki/Views.py:414
+#: src/ZWiki/Views.py:418
 msgid "To resolve the conflict, do this"
 msgstr "衝突を解消するために、以下のようにしてください"
 
-#: src/ZWiki/Views.py:415
+#: src/ZWiki/Views.py:419
 msgid "Click your browser's back button"
 msgstr "ブラウザの「戻る」ボタンをクリック"
 
-#: src/ZWiki/Views.py:416
+#: src/ZWiki/Views.py:420
 msgid "Copy your recent edits to the clipboard"
 msgstr "最後に編集した結果をクリップボードにコピーする"
 
-#: src/ZWiki/Views.py:417
+#: src/ZWiki/Views.py:421
 msgid "Click your browser's refresh button"
 msgstr "ブラウザの「更新」ボタンをクリック"
 
-#: src/ZWiki/Views.py:418
+#: src/ZWiki/Views.py:422
 msgid "Paste in your edits again, being mindful of the latest changes"
 msgstr "ペーストし、最後にされた変更に注意しながら、編集しなおす"
 
-#: src/ZWiki/Views.py:419
+#: src/ZWiki/Views.py:423
 msgid "Click the Change button again"
 msgstr "「変更」ボタンをクリック"
 
-#: src/ZWiki/Views.py:420 src/ZWiki/skins/zwiki/editform.pt:163
+#: src/ZWiki/Views.py:424 src/ZWiki/skins/zwiki/editform.pt:163
 msgid "or"
 msgstr "または"
 
-#: src/ZWiki/Views.py:421
+#: src/ZWiki/Views.py:425
 msgid "To discard your changes and start again, click OK"
 msgstr "修正するより、最初からやり直すほうがよいなら、「OK」をクリック"
 
-#: src/ZWiki/Views.py:490
+#: src/ZWiki/Views.py:501
 msgid ""
 "\n"
-"        Access keys can be accessed in mozilla-based browsers by pressing "
-"alt-<key>\n"
+"        Access keys can be accessed in mozilla-based browsers by pressing alt-<key>\n"
 "        IE users: must also press enter\n"
 "        Mac users: command-<key>\n"
 "        Opera users: shift-escape-<key>\n"
-"        These won't work here, back up to the previous page to try them "
-"out.\n"
+"        These won't work here, back up to the previous page to try them out.\n"
 "\n"
 "        0    show these access key assignments\n"
 "\n"
@@ -271,10 +257,8 @@
 "        s    go to search field\n"
 "        \n"
 "        page functions:\n"
-"        +    (in a plone/cmf site with skin switching set up) use zwiki's "
-"plone/cmf skin\n"
-"        -    (in a plone/cmf site with skin switching set up) use zwiki's "
-"standard skin\n"
+"        +    (in a plone/cmf site with skin switching set up) use zwiki's plone/cmf skin\n"
+"        -    (in a plone/cmf site with skin switching set up) use zwiki's standard skin\n"
 "        v    view page\n"
 "        m    mail subscription\n"
 "        b    show backlinks (links to this page)\n"
@@ -344,32 +328,31 @@
 "        p    前の変更\n"
 "        "
 
-#: src/ZWiki/Wikis.py:49
-msgid "Unknown wiki type"
-msgstr "不明な Wiki タイプ"
-
-#: src/ZWiki/ZWikiPage.py:675
+#: src/ZWiki/ZWikiPage.py:744
 msgid "create this page"
 msgstr "ページを作成"
 
-#: src/ZWiki/ZWikiPage.py:798 src/ZWiki/ZWikiPage.py:814
-#: src/ZWiki/ZWikiPage.py:817
+#: src/ZWiki/ZWikiPage.py:872 src/ZWiki/ZWikiPage.py:887
 msgid "last edited %(interval)s ago"
 msgstr "更新から %(interval)s 経過"
 
-#: src/ZWiki/ZWikiPage.py:809
+#: src/ZWiki/ZWikiPage.py:882
 msgid "show last edit"
 msgstr "最後の更新を表示"
 
-#: src/ZWiki/ZWikiPage.py:826 src/ZWiki/ZWikiPage.py:828
+#: src/ZWiki/ZWikiPage.py:897 src/ZWiki/ZWikiPage.py:899
 msgid "by %(editor)s"
 msgstr "編集者: %(editor)s"
 
-#: src/ZWiki/__init__.py:34
+#: src/ZWiki/__init__.py:200
+msgid "Unknown wiki type"
+msgstr "不明な Wiki タイプ"
+
+#: src/ZWiki/__init__.py:39
 msgid "No need to add a Zwiki Outline Cache"
 msgstr "Zwiki アウトラインキャッシュを追加する必要はありません"
 
-#: src/ZWiki/__init__.py:35
+#: src/ZWiki/__init__.py:40
 msgid ""
 "Zwiki Outline Cache appears in the ZMI Add menu\n"
 "        for implementation reasons, but should not be added directly.\n"
@@ -385,6 +368,10 @@
 msgid "comments"
 msgstr "コメント"
 
+#: src/ZWiki/pagetypes/html.py:50 src/ZWiki/pagetypes/rst.py:85
+msgid "reply"
+msgstr "返信"
+
 #: src/ZWiki/pagetypes/moin.py:1990
 msgid "Expected \"=\" to follow \"%(token)s\""
 msgstr "\"=\" による \"%(token)\" のフォロー待ち"
@@ -407,8 +394,7 @@
 
 #: src/ZWiki/pagetypes/moin.py:730
 msgid "Expected \"%(wanted)s\" after \"%(key)s\", got \"%(token)s\""
-msgstr ""
-"\"%(key)s\" のあとの \"%(wanted)s\" 待ち、 \"%(token)s\"を取得してください"
+msgstr "\"%(key)s\" のあとの \"%(wanted)s\" 待ち、 \"%(token)s\"を取得してください"
 
 #: src/ZWiki/pagetypes/moin.py:736
 msgid "Expected an integer \"%(key)s\" before \"%(token)s\""
@@ -422,10 +408,6 @@
 msgid "Expected a color value \"%(arg)s\" after \"%(key)s\""
 msgstr "\"%(key)s\"の後の\"%(arg)s\"には色の値が必要です"
 
-#: src/ZWiki/pagetypes/rst.py:85
-msgid "reply"
-msgstr "返信"
-
 #: src/ZWiki/plugins/latexwiki/wikis/latexwiki/diffform.pt:127
 #: src/ZWiki/plugins/mathaction/wikis/mathaction/old-diffform.pt:127
 msgid "full history"
@@ -502,7 +484,7 @@
 msgstr "タイトル"
 
 #: src/ZWiki/plugins/tracker/filterissues.pt:12
-#: src/ZWiki/skins/dtmlmessages.pt:30
+#: src/ZWiki/skins/dtmlmessages.pt:31
 msgid "Filter issues"
 msgstr "問題点フィルタの設定"
 
@@ -515,366 +497,358 @@
 msgid "Issue tracker"
 msgstr "Issue tracker"
 
-#: src/ZWiki/plugins/tracker/tracker.py:361
+#: src/ZWiki/plugins/tracker/tracker.py:365
 #, fuzzy
 msgid "You are not authorized to comment on this ZWiki Page."
 msgstr "このページの編集権限がありません"
 
-#: src/ZWiki/skins/dtmlmessages.pt:10 src/ZWiki/skins/dtmlmessages.pt:32
+#: src/ZWiki/skins/dtmlmessages.pt:10 src/ZWiki/skins/dtmlmessages.pt:33
+#, fuzzy
+msgid "name"
+msgstr "名前,"
+
+#: src/ZWiki/skins/dtmlmessages.pt:11 src/ZWiki/skins/dtmlmessages.pt:34
 msgid "category"
 msgstr "分類"
 
-#: src/ZWiki/skins/dtmlmessages.pt:11 src/ZWiki/skins/dtmlmessages.pt:33
+#: src/ZWiki/skins/dtmlmessages.pt:12 src/ZWiki/skins/dtmlmessages.pt:35
 msgid "severity"
 msgstr "緊急度"
 
-#: src/ZWiki/skins/dtmlmessages.pt:12 src/ZWiki/skins/dtmlmessages.pt:34
+#: src/ZWiki/skins/dtmlmessages.pt:13 src/ZWiki/skins/dtmlmessages.pt:36
 msgid "status"
 msgstr "状態"
 
-#: src/ZWiki/skins/dtmlmessages.pt:13 src/ZWiki/skins/dtmlmessages.pt:35
+#: src/ZWiki/skins/dtmlmessages.pt:14 src/ZWiki/skins/dtmlmessages.pt:37
 msgid "age"
 msgstr "作成後の経過時間"
 
-#: src/ZWiki/skins/dtmlmessages.pt:14 src/ZWiki/skins/dtmlmessages.pt:36
+#: src/ZWiki/skins/dtmlmessages.pt:15 src/ZWiki/skins/dtmlmessages.pt:38
 msgid "modified"
 msgstr "変更後の経過時間"
 
-#: src/ZWiki/skins/dtmlmessages.pt:15
+#: src/ZWiki/skins/dtmlmessages.pt:16
 msgid "Add a new issue:"
 msgstr "新しい問題点の登録:"
 
-#: src/ZWiki/skins/dtmlmessages.pt:16
+#: src/ZWiki/skins/dtmlmessages.pt:17
 msgid "Name:"
 msgstr "名前:"
 
-#: src/ZWiki/skins/dtmlmessages.pt:17
+#: src/ZWiki/skins/dtmlmessages.pt:18
 msgid "Category:"
 msgstr "分類:"
 
-#: src/ZWiki/skins/dtmlmessages.pt:18
+#: src/ZWiki/skins/dtmlmessages.pt:19
 msgid "Severity:"
 msgstr "緊急度:"
 
-#: src/ZWiki/skins/dtmlmessages.pt:19
-msgid "Status:"
-msgstr "状態:"
-
 #: src/ZWiki/skins/dtmlmessages.pt:2
 msgid "Here are the wiki's issue pages."
 msgstr "Wikiの問題点一覧ページです。"
 
 #: src/ZWiki/skins/dtmlmessages.pt:20
+msgid "Status:"
+msgstr "状態:"
+
+#: src/ZWiki/skins/dtmlmessages.pt:21
 msgid "Details:"
 msgstr "詳細:"
 
-#: src/ZWiki/skins/dtmlmessages.pt:21
+#: src/ZWiki/skins/dtmlmessages.pt:22
 msgid "add issue"
 msgstr "問題点の登録"
 
-#: src/ZWiki/skins/dtmlmessages.pt:22
+#: src/ZWiki/skins/dtmlmessages.pt:23
 msgid "More advanced"
 msgstr "詳細な"
 
-#: src/ZWiki/skins/dtmlmessages.pt:23
+#: src/ZWiki/skins/dtmlmessages.pt:24
 msgid "issue tracker"
 msgstr "IssueTracker"
 
-#: src/ZWiki/skins/dtmlmessages.pt:24
+#: src/ZWiki/skins/dtmlmessages.pt:25
 msgid "search options"
 msgstr "検索オプション"
 
-#: src/ZWiki/skins/dtmlmessages.pt:25
+#: src/ZWiki/skins/dtmlmessages.pt:26
 msgid "Name contains any of:"
 msgstr "名前フィルタ(以下の用語を名前に含む):"
 
-#: src/ZWiki/skins/dtmlmessages.pt:26
+#: src/ZWiki/skins/dtmlmessages.pt:27
 msgid "Page text contains any of:"
 msgstr "ページテキストフィルタ(以下の用語を含む):"
 
-#: src/ZWiki/skins/dtmlmessages.pt:27
+#: src/ZWiki/skins/dtmlmessages.pt:28
 msgid "Categories:"
 msgstr "分類:"
 
-#: src/ZWiki/skins/dtmlmessages.pt:28
+#: src/ZWiki/skins/dtmlmessages.pt:29
 msgid "Severities:"
 msgstr "緊急度:"
 
-#: src/ZWiki/skins/dtmlmessages.pt:29
-msgid "Statuses:"
-msgstr "状態:"
-
 #: src/ZWiki/skins/dtmlmessages.pt:3
 #, fuzzy
 msgid "Enter a search term, click the numbers to the right,"
 msgstr "検索用語をテキストボックスに入力、または右の数字をクリック、あるいは"
 
-#: src/ZWiki/skins/dtmlmessages.pt:37
+#: src/ZWiki/skins/dtmlmessages.pt:30
+msgid "Statuses:"
+msgstr "状態:"
+
+#: src/ZWiki/skins/dtmlmessages.pt:39
 msgid "Submitted by"
 msgstr "投稿者:"
 
-#: src/ZWiki/skins/dtmlmessages.pt:38
+#: src/ZWiki/skins/dtmlmessages.pt:4
+msgid "filter issues"
+msgstr "問題点フィルタの設定をしてください"
+
+#: src/ZWiki/skins/dtmlmessages.pt:40
 msgid "Name"
 msgstr "名前"
 
-#: src/ZWiki/skins/dtmlmessages.pt:39
+#: src/ZWiki/skins/dtmlmessages.pt:41
 msgid "Category"
 msgstr "分類"
 
-#: src/ZWiki/skins/dtmlmessages.pt:4
-msgid "filter issues"
-msgstr "問題点フィルタの設定をしてください"
-
-#: src/ZWiki/skins/dtmlmessages.pt:40
+#: src/ZWiki/skins/dtmlmessages.pt:42
 msgid "Severity"
 msgstr "緊急度"
 
-#: src/ZWiki/skins/dtmlmessages.pt:41
+#: src/ZWiki/skins/dtmlmessages.pt:43
 msgid "Status"
 msgstr "状態"
 
-#: src/ZWiki/skins/dtmlmessages.pt:42
+#: src/ZWiki/skins/dtmlmessages.pt:44
 #, fuzzy
 msgid "Optional subject"
 msgstr "オプションの題名"
 
-#: src/ZWiki/skins/dtmlmessages.pt:43
+#: src/ZWiki/skins/dtmlmessages.pt:45
 #, fuzzy
 msgid "Optional comment"
 msgstr "オプションのコメント"
 
-#: src/ZWiki/skins/dtmlmessages.pt:44 src/ZWiki/skins/dtmlmessages.pt:45
+#: src/ZWiki/skins/dtmlmessages.pt:46 src/ZWiki/skins/dtmlmessages.pt:47
 #, fuzzy
 msgid "Add ZWiki"
 msgstr "ZWikiページの新規作成"
 
-#: src/ZWiki/skins/dtmlmessages.pt:46
+#: src/ZWiki/skins/dtmlmessages.pt:48
 #, fuzzy
 msgid "Id:"
 msgstr "Id"
 
-#: src/ZWiki/skins/dtmlmessages.pt:47
+#: src/ZWiki/skins/dtmlmessages.pt:49
 #, fuzzy
 msgid "Title:"
 msgstr "タイトル"
 
-#: src/ZWiki/skins/dtmlmessages.pt:48
+#: src/ZWiki/skins/dtmlmessages.pt:5
 #, fuzzy
+msgid "browse open issues"
+msgstr "開かれている issue を見る"
+
+#: src/ZWiki/skins/dtmlmessages.pt:50
+#, fuzzy
 msgid "Template:"
 msgstr "悪いテンプレート"
 
-#: src/ZWiki/skins/dtmlmessages.pt:49
+#: src/ZWiki/skins/dtmlmessages.pt:51
 #, fuzzy
 msgid "Add wiki"
 msgstr "ZWikiページの新規作成"
 
-#: src/ZWiki/skins/dtmlmessages.pt:5
-#, fuzzy
-msgid "browse open issues"
-msgstr "開かれている issue を見る"
-
-#: src/ZWiki/skins/dtmlmessages.pt:50
+#: src/ZWiki/skins/dtmlmessages.pt:52
 msgid "Pages changed in the last"
 msgstr "最近変更されたページ:"
 
-#: src/ZWiki/skins/dtmlmessages.pt:51
+#: src/ZWiki/skins/dtmlmessages.pt:53
 msgid "Recently changed pages, with summaries"
 msgstr "最新の変更されたページ(要約付き)"
 
-#: src/ZWiki/skins/dtmlmessages.pt:52
+#: src/ZWiki/skins/dtmlmessages.pt:54
 msgid "Show summaries ?"
 msgstr "要約を表示する"
 
-#: src/ZWiki/skins/dtmlmessages.pt:53
+#: src/ZWiki/skins/dtmlmessages.pt:55
 msgid "Refresh"
 msgstr "最新情報に更新"
 
-#: src/ZWiki/skins/dtmlmessages.pt:54
+#: src/ZWiki/skins/dtmlmessages.pt:56
 msgid "Page"
 msgstr "ページ"
 
-#: src/ZWiki/skins/dtmlmessages.pt:55
+#: src/ZWiki/skins/dtmlmessages.pt:57
 msgid "Edited&nbsp;by"
 msgstr "編集者"
 
-#: src/ZWiki/skins/dtmlmessages.pt:56
+#: src/ZWiki/skins/dtmlmessages.pt:58
 msgid "Time"
 msgstr "時間"
 
-#: src/ZWiki/skins/dtmlmessages.pt:57
+#: src/ZWiki/skins/dtmlmessages.pt:59
 msgid "NEW"
 msgstr "NEW"
 
-#: src/ZWiki/skins/dtmlmessages.pt:59
-msgid "Pages marked (NEW) have been created within the last week"
-msgstr "(NEW)マークのついたページは一週間以内に作成されたページです。"
-
 #: src/ZWiki/skins/dtmlmessages.pt:6
 msgid "search issues"
 msgstr "問題点の検索"
 
-#: src/ZWiki/skins/dtmlmessages.pt:60
+#: src/ZWiki/skins/dtmlmessages.pt:61
+msgid "Pages marked (NEW) have been created within the last week"
+msgstr "(NEW)マークのついたページは一週間以内に作成されたページです。"
+
+#: src/ZWiki/skins/dtmlmessages.pt:62
 msgid "Enter a word or phrase and hit enter to search the entire wiki."
 msgstr "検索したい言葉やフレーズを入力してEnterを押すとWiki全体を検索します。"
 
-#: src/ZWiki/skins/dtmlmessages.pt:61
+#: src/ZWiki/skins/dtmlmessages.pt:63
 msgid "This is the same as using the search field at top right."
 msgstr "ここは右上の検索フィールドを使うのと同じです"
 
-#: src/ZWiki/skins/dtmlmessages.pt:62
+#: src/ZWiki/skins/dtmlmessages.pt:64
 msgid "Tips: A single word works best for matching page names."
-msgstr ""
-"ヒント: ページ名にマッチさせたい場合には一語の言葉を使うと確率が上がります。"
+msgstr "ヒント: ページ名にマッチさせたい場合には一語の言葉を使うと確率が上がります。"
 
-#: src/ZWiki/skins/dtmlmessages.pt:63
-msgid ""
-"Case-insensitivity and wildcards may be supported depending on your catalog "
-"configuration."
-msgstr ""
-"大文字小文字を区別や、ワイルドカードのサポートはZCatalogの設定に依存します"
+#: src/ZWiki/skins/dtmlmessages.pt:65
+msgid "Case-insensitivity and wildcards may be supported depending on your catalog configuration."
+msgstr "大文字小文字を区別や、ワイルドカードのサポートはZCatalogの設定に依存します"
 
-#: src/ZWiki/skins/dtmlmessages.pt:64
+#: src/ZWiki/skins/dtmlmessages.pt:66
 msgid "Leave it blank to list all pages."
 msgstr "すべてのページを一覧にする場合には検索用語を空欄にします。"
 
-#: src/ZWiki/skins/dtmlmessages.pt:65 src/ZWiki/skins/dtmlmessages.pt:66
+#: src/ZWiki/skins/dtmlmessages.pt:67 src/ZWiki/skins/dtmlmessages.pt:68
 msgid "Search"
 msgstr "検索"
 
-#: src/ZWiki/skins/dtmlmessages.pt:67
+#: src/ZWiki/skins/dtmlmessages.pt:69
 msgid "Page names matching"
 msgstr "ページ名の一致"
 
-#: src/ZWiki/skins/dtmlmessages.pt:68
+#: src/ZWiki/skins/dtmlmessages.pt:7
+msgid "recent"
+msgstr "現在"
+
+#: src/ZWiki/skins/dtmlmessages.pt:70
 msgid "Text matching"
 msgstr "テキストの一致"
 
-#: src/ZWiki/skins/dtmlmessages.pt:69
+#: src/ZWiki/skins/dtmlmessages.pt:71
 #, fuzzy
 msgid "Thorough (non-catalog) search for text matching"
 msgstr "(カタログベースでない)全文テキスト検索"
 
-#: src/ZWiki/skins/dtmlmessages.pt:7
-msgid "recent"
-msgstr "現在"
-
-#: src/ZWiki/skins/dtmlmessages.pt:70
+#: src/ZWiki/skins/dtmlmessages.pt:72
 msgid "Set your preferences for this wiki:"
 msgstr "このWikiでのユーザ設定を行います:"
 
-#: src/ZWiki/skins/dtmlmessages.pt:71
+#: src/ZWiki/skins/dtmlmessages.pt:73
 msgid "User name:"
 msgstr "ユーザ名:"
 
-#: src/ZWiki/skins/dtmlmessages.pt:72
-msgid "(identifies your edits)"
-msgstr "(編集者を識別するのに使用します)"
+#: src/ZWiki/skins/dtmlmessages.pt:74
+msgid "(identifies your edits, saves your votes, may be required)"
+msgstr ""
 
-#: src/ZWiki/skins/dtmlmessages.pt:73
+#: src/ZWiki/skins/dtmlmessages.pt:75
 msgid "Email address:"
 msgstr "メールアドレス:"
 
-#: src/ZWiki/skins/dtmlmessages.pt:74
+#: src/ZWiki/skins/dtmlmessages.pt:76
 msgid "(allows mail subscription)"
 msgstr "(メールで変更の通知を受け取れるようにします)"
 
-#: src/ZWiki/skins/dtmlmessages.pt:75
+#: src/ZWiki/skins/dtmlmessages.pt:77
 msgid "Your time zone:"
 msgstr "タイムゾーン:"
 
-#: src/ZWiki/skins/dtmlmessages.pt:76
+#: src/ZWiki/skins/dtmlmessages.pt:78
 msgid "(localizes most times)"
 msgstr "(時間表示をユーザのタイムゾーンに合わせます。日本はGMT+0900です)"
 
-#: src/ZWiki/skins/dtmlmessages.pt:77
+#: src/ZWiki/skins/dtmlmessages.pt:79
 msgid "Edit form height:"
 msgstr "編集フォームの行数:"
 
-#: src/ZWiki/skins/dtmlmessages.pt:78
+#: src/ZWiki/skins/dtmlmessages.pt:8
+msgid "all"
+msgstr "すべて"
+
+#: src/ZWiki/skins/dtmlmessages.pt:80
 msgid "(adjusts form size)"
 msgstr "(フォームのサイズを変更します)"
 
-#: src/ZWiki/skins/dtmlmessages.pt:79
+#: src/ZWiki/skins/dtmlmessages.pt:81
 msgid "Save options"
 msgstr "設定を保存する"
 
-#: src/ZWiki/skins/dtmlmessages.pt:8
-msgid "all"
-msgstr "すべて"
-
-#: src/ZWiki/skins/dtmlmessages.pt:80
+#: src/ZWiki/skins/dtmlmessages.pt:82
 msgid "Forget options"
 msgstr "設定を消去する"
 
-#: src/ZWiki/skins/dtmlmessages.pt:81 src/ZWiki/skins/dtmlmessages.pt:82
+#: src/ZWiki/skins/dtmlmessages.pt:83 src/ZWiki/skins/dtmlmessages.pt:84
 msgid "Add ZWiki Page"
 msgstr "ZWikiページの新規作成"
 
-#: src/ZWiki/skins/dtmlmessages.pt:83
+#: src/ZWiki/skins/dtmlmessages.pt:85
 #, fuzzy
 msgid "Page&nbsp;name:"
 msgstr "ページ名"
 
-#: src/ZWiki/skins/dtmlmessages.pt:84
+#: src/ZWiki/skins/dtmlmessages.pt:86
 #, fuzzy
 msgid "Add wiki page"
 msgstr "ZWikiページの新規作成"
 
-#: src/ZWiki/skins/dtmlmessages.pt:85
+#: src/ZWiki/skins/dtmlmessages.pt:87
 #, fuzzy
 msgid "Topic"
 msgstr "追加"
 
-#: src/ZWiki/skins/dtmlmessages.pt:86
+#: src/ZWiki/skins/dtmlmessages.pt:88
 msgid "Last updated"
 msgstr "最終更新"
 
-#: src/ZWiki/skins/dtmlmessages.pt:87
+#: src/ZWiki/skins/dtmlmessages.pt:89
 #, fuzzy
 msgid "Comments"
 msgstr "コメント"
 
-#: src/ZWiki/skins/dtmlmessages.pt:88
+#: src/ZWiki/skins/dtmlmessages.pt:9 src/ZWiki/skins/dtmlmessages.pt:32
+msgid "#"
+msgstr ""
+
+#: src/ZWiki/skins/dtmlmessages.pt:90
 #, fuzzy
 msgid "Views"
 msgstr "表示"
 
-#: src/ZWiki/skins/dtmlmessages.pt:89
+#: src/ZWiki/skins/dtmlmessages.pt:91
 #, fuzzy
 msgid "Created"
 msgstr "作成済み"
 
-#: src/ZWiki/skins/dtmlmessages.pt:9 src/ZWiki/skins/dtmlmessages.pt:31
-msgid "#"
-msgstr ""
-
-#: src/ZWiki/skins/dtmlmessages.pt:90 src/ZWiki/skins/dtmlmessages.pt:92
+#: src/ZWiki/skins/dtmlmessages.pt:92 src/ZWiki/skins/dtmlmessages.pt:94
 msgid "by"
 msgstr "by"
 
-#: src/ZWiki/skins/dtmlmessages.pt:91
+#: src/ZWiki/skins/dtmlmessages.pt:93
 msgid "<dtml-var lasteditinterval> ago</dtml-var>"
 msgstr "<dtml-var lasteditinterval> 前</dtml-var>"
 
-#: src/ZWiki/skins/dtmlmessages.pt:93
+#: src/ZWiki/skins/dtmlmessages.pt:95
 msgid "on"
 msgstr "on"
 
-#: src/ZWiki/skins/zwiki/backlinks.pt:108
+#: src/ZWiki/skins/zwiki/backlinks.pt:102
 #, fuzzy
-msgid "Subtopics"
-msgstr "サブトピック"
-
-#: src/ZWiki/skins/zwiki/backlinks.pt:111
-msgid "This page has no subtopics."
-msgstr "サブトピックはありません"
-
-#: src/ZWiki/skins/zwiki/backlinks.pt:114
-#, fuzzy
 msgid "Here are it's subtopics."
 msgstr "サブトピック一覧です"
 
-#: src/ZWiki/skins/zwiki/backlinks.pt:117
+#: src/ZWiki/skins/zwiki/backlinks.pt:105
 msgid "You can reorder them by clicking the ^ buttons."
 msgstr "「^」ボタンをクリックして順序を変えることができます"
 
@@ -888,69 +862,65 @@
 msgid "Parents"
 msgstr "親,"
 
-#: src/ZWiki/skins/zwiki/backlinks.pt:31
+#: src/ZWiki/skins/zwiki/backlinks.pt:28
 msgid "is a top-level topic."
 msgstr "は上位レベルのトピックです"
 
-#: src/ZWiki/skins/zwiki/backlinks.pt:32
+#: src/ZWiki/skins/zwiki/backlinks.pt:29
 msgid "is a subtopic of:"
 msgstr "は以下の下位トピックです:"
 
-#: src/ZWiki/skins/zwiki/backlinks.pt:55
+#: src/ZWiki/skins/zwiki/backlinks.pt:48
 #, fuzzy
 msgid "Backlinks"
 msgstr "バックリンク"
 
-#: src/ZWiki/skins/zwiki/backlinks.pt:56
+#: src/ZWiki/skins/zwiki/backlinks.pt:49
 msgid "Here are the pages which link to it:"
 msgstr "ここにリンクしているページ群:"
 
-#: src/ZWiki/skins/zwiki/backlinks.pt:57
+#: src/ZWiki/skins/zwiki/backlinks.pt:50
 #, fuzzy
 msgid "No other pages link to this one."
 msgstr "どこからリンクされているでしょうか?"
 
-#: src/ZWiki/skins/zwiki/backlinks.pt:82
-msgid ""
-"You can set this page's parent(s) to place it within the overall page "
-"hierarchy."
+#: src/ZWiki/skins/zwiki/backlinks.pt:70
+msgid "You can set this page's parent(s) to place it within the overall page hierarchy."
 msgstr "全てのページの階層の中から、このページの親を設定することができます"
 
-#: src/ZWiki/skins/zwiki/backlinks.pt:85
-msgid ""
-"Check one or more checkboxes or enter a page name here, and click the button."
+#: src/ZWiki/skins/zwiki/backlinks.pt:73
+msgid "Check one or more checkboxes or enter a page name here, and click the button."
 msgstr ""
 
-#: src/ZWiki/skins/zwiki/backlinks.pt:88
+#: src/ZWiki/skins/zwiki/backlinks.pt:76
 msgid "Enter a page name here and click the button."
 msgstr ""
 
-#: src/ZWiki/skins/zwiki/backlinks.pt:91
-msgid ""
-"You can type just the first few letters, case and punctuation are ignored."
-msgstr ""
-"最初の数文字を入力して下さい。なお、大文字/小文字や句読点は同一視されます"
+#: src/ZWiki/skins/zwiki/backlinks.pt:79
+msgid "You can type just the first few letters, case and punctuation are ignored."
+msgstr "最初の数文字を入力して下さい。なお、大文字/小文字や句読点は同一視されます"
 
-#: src/ZWiki/skins/zwiki/backlinks.pt:98
+#: src/ZWiki/skins/zwiki/backlinks.pt:86
 msgid "Reparent"
 msgstr "Reparent"
 
+#: src/ZWiki/skins/zwiki/backlinks.pt:96
+#, fuzzy
+msgid "Subtopics"
+msgstr "サブトピック"
+
+#: src/ZWiki/skins/zwiki/backlinks.pt:99
+msgid "This page has no subtopics."
+msgstr "サブトピックはありません"
+
 #: src/ZWiki/skins/zwiki/badtemplate.pt:12
 msgid "Bad template"
 msgstr "悪いテンプレート"
 
 #: src/ZWiki/skins/zwiki/badtemplate.pt:13
 #, fuzzy
-msgid ""
-"There was a problem locating one of this wiki's skin templates. There may be "
-"a page or other non-page-template/non-dtml-method object with the same ID, "
-"obscuring the template. Or the template may be missing on the filesystem (an "
-"incomplete Zwiki installation)."
-msgstr ""
-"Wikiのスキンテンプレートのどれかに問題があります。同じIDのページか、他のペー"
-"ジテンプレートでもdtml-method でもないオブジェクトがあるか、あいまいなテンプ"
-"レートです。またはファイルシステム上にテンプレートがみつかりません(インストー"
-"ルが不完全です)。"
+msgid "There was a problem locating one of this wiki's skin templates. There may be a page or other non-page-template/non-dtml-method object with the same ID, obscuring the template. Or the template may be missing on the filesystem (an incomplete Zwiki installation)."
+msgstr "Wikiのスキンテンプレートのどれかに問題があります。同じIDのページか、他のページテンプレートでもdtml-method でもないオブジェクトがあるか、あいまいなテンプレートです。またはファイルシステム上にテンプレートがみつかりません(インストールが不完全です)。"
 
 #: src/ZWiki/skins/zwiki/commentform.pt:21
 msgid "subject"
@@ -966,9 +936,7 @@
 
 #: src/ZWiki/skins/zwiki/commentform.pt:36
 msgid "to comment (and cc any subscribers) enter text here and click add"
-msgstr ""
-"コメントを書いて「コメントを追加」を押すと追記されます(変更通知も送信されま"
-"す)"
+msgstr "コメントを書いて「コメントを追加」を押すと追記されます(変更通知も送信されます)"
 
 #: src/ZWiki/skins/zwiki/commentform.pt:56
 msgid "${nb} subscribers"
@@ -983,12 +951,20 @@
 msgid "add-comment"
 msgstr "コメントの追加"
 
-#: src/ZWiki/skins/zwiki/contentspage.pt:12
+#: src/ZWiki/skins/zwiki/contentspage.pt:10
+#: src/ZWiki/skins/zwiki/contentspage.pt:27
+#, fuzzy
+msgid "Wiki contents for"
+msgstr "Wiki コンテンツ"
+
+#: src/ZWiki/skins/zwiki/contentspage.pt:13
+#: src/ZWiki/skins/zwiki/contentspage.pt:30
 msgid "Wiki contents"
 msgstr "Wiki コンテンツ"
 
-#: src/ZWiki/skins/zwiki/contentspage.pt:16
-msgid "Singletons"
+#: src/ZWiki/skins/zwiki/contentspage.pt:40
+#, fuzzy
+msgid "Singletons:"
 msgstr "Singletons"
 
 #: src/ZWiki/skins/zwiki/denied.pt:12
@@ -1076,13 +1052,13 @@
 msgstr "${DYNAMIC_CONTENT}"
 
 #: src/ZWiki/skins/zwiki/editform.pt:178
-msgid "preview this edit"
-msgstr "編集内容を確認します"
-
-#: src/ZWiki/skins/zwiki/editform.pt:178
 msgid "Preview"
 msgstr "プレビュー"
 
+#: src/ZWiki/skins/zwiki/editform.pt:178
+msgid "preview this edit"
+msgstr "編集内容を確認します"
+
 #: src/ZWiki/skins/zwiki/editform.pt:183
 msgid "Cancel"
 msgstr "キャンセル"
@@ -1118,13 +1094,18 @@
 msgstr "このwikiページの名前です(変更するには時間がかかります!)"
 
 #: src/ZWiki/skins/zwiki/editform.pt:71
-msgid "type"
-msgstr "タイプ"
+msgid "markup"
+msgstr ""
 
 #: src/ZWiki/skins/zwiki/editform.pt:72
 msgid "select the formatting and rendering style for this page"
 msgstr "このページのフォーマットと描画スタイルを選択してください"
 
+#: src/ZWiki/skins/zwiki/helppage.pt:12
+#, fuzzy
+msgid "Help page"
+msgstr "HelpPage"
+
 #: src/ZWiki/skins/zwiki/links.pt:102
 msgid "(external edit)"
 msgstr "(ExternalEditor)"
@@ -1260,19 +1241,17 @@
 
 #: src/ZWiki/skins/zwiki/pagemanagementform.pt:40
 msgid "enter a page name and click buttons to the right (mouse over for help)"
+msgstr "ページ名を入力して実行したい内容のボタンを押してください(マウスをボタンに重ねるとヘルプが表示されます)"
+
+#: src/ZWiki/skins/zwiki/pagemanagementform.pt:45
+msgid "make this page a subtopic of the page you have entered"
 msgstr ""
-"ページ名を入力して実行したい内容のボタンを押してください(マウスをボタンに重ね"
-"るとヘルプが表示されます)"
 
 #: src/ZWiki/skins/zwiki/pagemanagementform.pt:45
 #, fuzzy
 msgid "reparent"
 msgstr "Reparent"
 
-#: src/ZWiki/skins/zwiki/pagemanagementform.pt:45
-msgid "make this page a subtopic of the page you have entered"
-msgstr ""
-
 #: src/ZWiki/skins/zwiki/pagemanagementform.pt:50
 msgid "rename this page to the name you have entered, updating all links"
 msgstr ""
@@ -1287,8 +1266,7 @@
 msgstr ""
 
 #: src/ZWiki/skins/zwiki/pagemanagementform.pt:55
-msgid ""
-"delete this page, and redirect links to the page you have entered, if any"
+msgid "delete this page, and redirect links to the page you have entered, if any"
 msgstr ""
 
 #: src/ZWiki/skins/zwiki/pagemanagementform.pt:60
@@ -1363,8 +1341,7 @@
 msgstr ""
 "このページまたは wiki 全体を講読することができます\n"
 "        講読者になると、コメントのコピーをメールで受けとれます\n"
-"        (但し、サイト管理者によって許可されている場合以外には一般的は編集によ"
-"るものは含まれません)        Or return to(未訳)"
+"        (但し、サイト管理者によって許可されている場合以外には一般的は編集によるものは含まれません)        Or return to(未訳)"
 
 #. Default: ""
 #.  "You can subscribe to this page or to the whole wiki.\n"
@@ -1376,8 +1353,7 @@
 msgstr ""
 "このページまたは wiki 全体を講読することができます\n"
 "        講読者になると、コメントのコピーをメールで受けとれます\n"
-"        (但し、サイト管理者によって許可されている場合以外には一般的は編集によ"
-"るものは含まれません)        Or return to(未訳)"
+"        (但し、サイト管理者によって許可されている場合以外には一般的は編集によるものは含まれません)        Or return to(未訳)"
 
 #: src/ZWiki/skins/zwiki/subscribeform.pt:53
 msgid "Email will go to the address you have configured in site preferences."
@@ -1425,6 +1401,12 @@
 msgid "User options"
 msgstr "検索オプション"
 
+#~ msgid "(identifies your edits)"
+#~ msgstr "(編集者を識別するのに使用します)"
+
+#~ msgid "type"
+#~ msgstr "タイプ"
+
 #~ msgid "your edit contained a banned link pattern"
 #~ msgstr "禁止リンクパターンが編集内容に含まれています"
 
@@ -1443,14 +1425,8 @@
 #~ msgid "and enter"
 #~ msgstr "Wikiページ作成後に表示する"
 
-#~ msgid ""
-#~ "You may create a new ZWiki Page object using the form below. You may also "
-#~ "choose to upload an existing html file from your local computer by "
-#~ "clicking the <i>Browse</i> button."
-#~ msgstr ""
-#~ "下のフォームを使って新規のZWikiページオブジェクトを作成することができま"
-#~ "す。<i>参照...</i>ボタンをクリックすると、ローカルコンピュータの既存のHTML"
-#~ "ファイルをアップロードすることもできます。"
+#~ msgid "You may create a new ZWiki Page object using the form below. You may also choose to upload an existing html file from your local computer by clicking the <i>Browse</i> button."
+#~ msgstr "下のフォームを使って新規のZWikiページオブジェクトを作成することができます。<i>参照...</i>ボタンをクリックすると、ローカルコンピュータの既存のHTMLファイルをアップロードすることもできます。"
 
 #~ msgid "File"
 #~ msgstr "ファイル"
@@ -1477,19 +1453,15 @@
 #~ msgstr "ページに戻る"
 
 #~ msgid "help_shortname"
-#~ msgstr ""
-#~ "注: 大規模なwikiでページの名前を変更するのは時間がかかることがあります。他"
-#~ "のページも可能なら変更されます。"
+#~ msgstr "注: 大規模なwikiでページの名前を変更するのは時間がかかることがあります。他のページも可能なら変更されます。"
 
 #~ msgid "label_body_text"
 #~ msgstr "本文"
 
 #~ msgid "help_wikibody"
 #~ msgstr ""
-#~ "Wikiページの中では [カギかっこ] でリンクを作成できます。ページを保存すると"
-#~ "カギ括弧の\n"
-#~ "内容に<code>?</code>が付いたリンクが表示されるので、クリックするとその名前"
-#~ "でページを\n"
+#~ "Wikiページの中では [カギかっこ] でリンクを作成できます。ページを保存するとカギ括弧の\n"
+#~ "内容に<code>?</code>が付いたリンクが表示されるので、クリックするとその名前でページを\n"
 #~ "作成します。(訳注:英数字以外を使う場合はパッチが必要な場合もあります)"
 
 #~ msgid "help_wikiwords"
@@ -1511,9 +1483,7 @@
 #~ msgstr "フォーマット"
 
 #~ msgid "help_format"
-#~ msgstr ""
-#~ "どのフォーマットにするかわからない場合は、平文テキストを選んで普通に入力し"
-#~ "ます。"
+#~ msgstr "どのフォーマットにするかわからない場合は、平文テキストを選んで普通に入力します。"
 
 #~ msgid "Save"
 #~ msgstr "保存"
@@ -1571,19 +1541,15 @@
 
 #~ msgid "backlinks_reparent_help"
 #~ msgstr ""
-#~ "このページをコンテンツの階層の中でどこに配置させるかを決めるために、親を設"
-#~ "定\n"
-#~ "することもできます。チェックボックスで選択するか、他の親ページ名を入力"
-#~ "し、\n"
+#~ "このページをコンテンツの階層の中でどこに配置させるかを決めるために、親を設定\n"
+#~ "することもできます。チェックボックスで選択するか、他の親ページ名を入力し、\n"
 #~ "「Reparent」をクリックしてください。普通、親ページは一つで充分です"
 
 #, fuzzy
 #~ msgid "backlinks_reparent_help2"
 #~ msgstr ""
-#~ "このページをコンテンツの階層の中でどこに配置させるかを決めるために、親を設"
-#~ "定\n"
-#~ "することもできます。チェックボックスで選択するか、他の親ページ名を入力"
-#~ "し、\n"
+#~ "このページをコンテンツの階層の中でどこに配置させるかを決めるために、親を設定\n"
+#~ "することもできます。チェックボックスで選択するか、他の親ページ名を入力し、\n"
 #~ "「Reparent」をクリックしてください。普通、親ページは一つで充分です"
 
 #, fuzzy
@@ -1676,9 +1642,7 @@
 #~ msgstr "Wiki ナビゲーション"
 
 #~ msgid "enter comments here and click add; or, click edit"
-#~ msgstr ""
-#~ "ここにコメントを入れ、「コメントの追加」をクリックするか、「編集」をクリッ"
-#~ "クしてください"
+#~ msgstr "ここにコメントを入れ、「コメントの追加」をクリックするか、「編集」をクリックしてください"
 
 #~ msgid "Details & comments"
 #~ msgstr "詳細とコメント"
@@ -1686,9 +1650,7 @@
 #~ msgid "hits"
 #~ msgstr "ヒット"
 
-#~ msgid ""
-#~ "no catalog or the catalog search gave an error, a brute-force search was "
-#~ "used"
+#~ msgid "no catalog or the catalog search gave an error, a brute-force search was used"
 #~ msgstr "カタログがないかエラーのため、全数検索が使われました"
 
 #~ msgid "Contents"

Modified: zope-zwiki/trunk/i18n/nl.po
===================================================================
--- zope-zwiki/trunk/i18n/nl.po	2007-04-08 14:54:05 UTC (rev 761)
+++ zope-zwiki/trunk/i18n/nl.po	2007-04-08 14:55:27 UTC (rev 762)
@@ -5,10 +5,10 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: zwiki-nl\n"
-"POT-Creation-Date: Sat Sep  2 18:10:16 2006\n"
-"PO-Revision-Date: 2006-03-06 16:08+0000\n"
-"Last-Translator: Frank laurijssens <frank at laurijssens.nl>\n"
-"Language-Team: <zwiki at zwiki.org>\n"
+"POT-Creation-Date: Tue Mar 27 14:50:46 2007\n"
+"PO-Revision-Date: 2007-03-26 00:24+0100\n"
+"Last-Translator: Frank Laurijssens <frank at laurijssens.nl>\n"
+"Language-Team:  <zwiki at zwiki.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -18,49 +18,39 @@
 "Preferred-encodings: utf-8 latin1\n"
 "Domain: zwiki\n"
 
-#: src/ZWiki/Admin.py:62
+#: src/ZWiki/Admin.py:58
 msgid "You are not authorized to upgrade all pages."
 msgstr "U bent niet gemachtigd om alle pagina's te vernieuwen"
 
-#: src/ZWiki/Admin.py:63
+#: src/ZWiki/Admin.py:59
 msgid "(folder -> Manage properties)"
 msgstr "Eigenschappen"
 
-#: src/ZWiki/Diff.py:174
-#, fuzzy
+#: src/ZWiki/Diff.py:179
 msgid "You are not authorized to reparent this ZWiki Page."
-msgstr "U bent niet gemachtigd om deze Wiki pagina te verwijderen"
+msgstr "U bent niet gemachtigd om deze Wiki pagina een nieuwe ouder te geven"
 
-#: src/ZWiki/Diff.py:180 src/ZWiki/plugins/tracker/tracker.py:332
-#, fuzzy
+#: src/ZWiki/Diff.py:185 src/ZWiki/plugins/tracker/tracker.py:333
 msgid "You are not authorized to rename this ZWiki Page."
-msgstr "U bent niet gemachtigd om deze Wiki pagina te verwijderen"
+msgstr "U bent niet gemachtigd om deze Wiki pagina te hernoemen"
 
-#: src/ZWiki/Editing.py:156 src/ZWiki/Editing.py:294 src/ZWiki/Views.py:332
-#: src/ZWiki/Views.py:435 src/ZWiki/plugins/tracker/tracker.py:321
-msgid ""
-"Sorry, this wiki doesn't allow anonymous edits. Please configure a username "
-"in options first."
-msgstr ""
-"Sorry, deze wiki staat geem bewerkingen toe door anonieme gebruikers. "
-"Configureer eerst een gebruikersnaam bij opties."
+#: src/ZWiki/Editing.py:156 src/ZWiki/Editing.py:294 src/ZWiki/Views.py:336
+#: src/ZWiki/Views.py:439 src/ZWiki/plugins/tracker/tracker.py:322
+msgid "Sorry, this wiki doesn't allow anonymous edits. Please configure a username in options first."
+msgstr "Sorry, deze wiki staat geem bewerkingen toe door anonieme gebruikers. Configureer eerst een gebruikersnaam bij opties."
 
 #: src/ZWiki/Editing.py:327
-msgid ""
-"You are not authorized to reparent or change subtopics links on this ZWiki "
-"Page."
-msgstr ""
-"U bent niet gemachtigd om een nieuwe ouder te kiezen of om sub-onderwerp "
-"links te wijzigen in deze Wiki"
+msgid "You are not authorized to reparent or change subtopics links on this ZWiki Page."
+msgstr "U bent niet gemachtigd om een nieuwe ouder te kiezen of om sub-onderwerp links te wijzigen in deze Wiki"
 
 #: src/ZWiki/Editing.py:349
 msgid "You are not authorized to change this ZWiki Page's type."
 msgstr "U bent niet gemachtigd om het pagina type in deze Wiki te wijzigen"
 
 #: src/ZWiki/Editing.py:383 src/ZWiki/Editing.py:410
-#: src/ZWiki/plugins/tracker/tracker.py:340
-#: src/ZWiki/plugins/tracker/tracker.py:347
-#: src/ZWiki/plugins/tracker/tracker.py:354
+#: src/ZWiki/plugins/tracker/tracker.py:344
+#: src/ZWiki/plugins/tracker/tracker.py:351
+#: src/ZWiki/plugins/tracker/tracker.py:358
 msgid "You are not authorized to edit this ZWiki Page."
 msgstr "U bent niet gemachtigd om deze Wiki pagina te wijzigen"
 
@@ -69,11 +59,8 @@
 msgstr "U bent niet gemachtigd om deze Wiki pagina te verwijderen"
 
 #: src/ZWiki/Editing.py:563
-msgid ""
-"This page was renamed to %s. You can delete this one if no longer needed.\n"
-msgstr ""
-"Deze pagina is hernoemd naar %s. U kunt deze pagina verwijderen als hij niet "
-"meer nodig is\n"
+msgid "This page was renamed to %s. You can delete this one if no longer needed.\n"
+msgstr "Deze pagina is hernoemd naar %s. U kunt deze pagina verwijderen als hij niet meer nodig is.\n"
 
 #: src/ZWiki/Editing.py:659
 msgid "You are not authorized to upload files here."
@@ -85,116 +72,110 @@
 
 #: src/ZWiki/Editing.py:822
 msgid "There was a problem: %s"
-msgstr ""
+msgstr "Er was een probleem: %s"
 
 #: src/ZWiki/Editing.py:829
 msgid "banned_links match"
 msgstr "Je wijziging bevatte een verboden link"
 
 #: src/ZWiki/Editing.py:830
-#, fuzzy
-msgid ""
-"your edit contained a banned link pattern. Please contact the site "
-"administrator for help."
-msgstr ""
-"Er was een probleem: %s. Neem contact op met de site beheerder voor hulp."
+msgid "your edit contained a banned link pattern. Please contact the site administrator for help."
+msgstr "Je wijziging bevatte een verboden link. Neem contact op met de website beheerder voor meer informatie"
 
 #: src/ZWiki/Editing.py:841
 msgid "exceeded max_anonymous_links"
 msgstr "max_anonymous_links overschreden"
 
 #: src/ZWiki/Editing.py:842
-msgid ""
-"adding of external links by unidentified users is restricted. Please back up "
-"and remove some of the http urls you added, or contact the site "
-"administrator for help."
-msgstr ""
+msgid "adding of external links by unidentified users is restricted. Please back up and remove some of the http urls you added, or contact the site administrator for help."
+msgstr "Het toevoegen van externe links door anonieme gebruikers is beperkt. Ga terug en verwijder een aantal http url's, of neem contact op met de website beheerder voor hulp."
 
 #: src/ZWiki/Editing.py:853
-#, fuzzy
 msgid "exceeded max_identified_links"
-msgstr "max_anonymous_links overschreden"
+msgstr "max_identified_links overschreden"
 
 #: src/ZWiki/Editing.py:854
-msgid ""
-"adding of external links is restricted, even for identified users. Please "
-"back up and remove some of the http urls you added, or contact the site "
-"administrator for help."
-msgstr ""
+msgid "adding of external links is restricted, even for identified users. Please back up and remove some of the http urls you added, or contact the site administrator for help."
+msgstr "Het toevoegen van externe links is beperkt, zelfs voor bekende gebruikers. Ga terug en verwijder een aantal http url's, of neem contact op met de website beheerder voor hulp."
 
-#: src/ZWiki/Mail.py:506 src/ZWiki/skins/dtmlmessages.pt:58
+#: src/ZWiki/Mail.py:506 src/ZWiki/skins/dtmlmessages.pt:60
 msgid "anonymous"
 msgstr "anoniem"
 
-#: src/ZWiki/OutlineSupport.py:843 src/ZWiki/skins/zwiki/links.pt:56
+#: src/ZWiki/OutlineSupport.py:378
+#, fuzzy
+msgid "Sorry, this wiki doesn't allow anonymous reparenting. Please configure a username in options first."
+msgstr "Sorry, deze wiki staat geem bewerkingen toe door anonieme gebruikers. Configureer eerst een gebruikersnaam bij opties."
+
+#: src/ZWiki/OutlineSupport.py:878 src/ZWiki/skins/zwiki/links.pt:56
 msgid "which pages link to this one ?"
 msgstr "Welke pagina's linken naar deze ?"
 
-#: src/ZWiki/OutlineSupport.py:851
+#: src/ZWiki/OutlineSupport.py:886
 msgid "You are here"
 msgstr "U bent hier"
 
-#: src/ZWiki/Utils.py:465
+#: src/ZWiki/Utils.py:487
 msgid "years"
 msgstr "jaren"
 
-#: src/ZWiki/Utils.py:465
+#: src/ZWiki/Utils.py:487
 msgid "year"
 msgstr "jaar"
 
-#: src/ZWiki/Utils.py:467
+#: src/ZWiki/Utils.py:489
 msgid "month"
 msgstr "maand"
 
-#: src/ZWiki/Utils.py:467
+#: src/ZWiki/Utils.py:489
 msgid "months"
 msgstr "maanden"
 
-#: src/ZWiki/Utils.py:469
+#: src/ZWiki/Utils.py:491
 msgid "weeks"
 msgstr "weken"
 
-#: src/ZWiki/Utils.py:469
+#: src/ZWiki/Utils.py:491
 msgid "week"
 msgstr "week"
 
-#: src/ZWiki/Utils.py:471
+#: src/ZWiki/Utils.py:493
 msgid "day"
 msgstr "dag"
 
-#: src/ZWiki/Utils.py:471
+#: src/ZWiki/Utils.py:493
 msgid "days"
 msgstr "dagen"
 
-#: src/ZWiki/Utils.py:473
+#: src/ZWiki/Utils.py:495
 msgid "hours"
 msgstr "uren"
 
-#: src/ZWiki/Utils.py:473
+#: src/ZWiki/Utils.py:495
 msgid "hour"
 msgstr "uur"
 
-#: src/ZWiki/Utils.py:475
+#: src/ZWiki/Utils.py:497
 msgid "minute"
 msgstr "minuut"
 
-#: src/ZWiki/Utils.py:475
+#: src/ZWiki/Utils.py:497
 msgid "minutes"
 msgstr "minuten"
 
-#: src/ZWiki/Utils.py:477
+#: src/ZWiki/Utils.py:499
 msgid "second"
 msgstr "seconde"
 
-#: src/ZWiki/Utils.py:477
+#: src/ZWiki/Utils.py:499
 msgid "seconds"
 msgstr "seconden"
 
-#: src/ZWiki/Views.py:346
+#: src/ZWiki/Views.py:350
 msgid "Page is locked"
 msgstr "Pagina is geblokkeerd"
 
-#: src/ZWiki/Views.py:357
+#: src/ZWiki/Views.py:361
 msgid ""
 "\n"
 "            This page has a webDAV lock. Someone is probably editing it\n"
@@ -205,72 +186,65 @@
 "            "
 msgstr ""
 "\n"
-"            Deze pagina heeft een webDAV blokkering. Iemand wijzigt hem "
-"waarschijnlijk\n"
+"            Deze pagina heeft een webDAV blokkering. Iemand wijzigt hem waarschijnlijk\n"
 "            met een externe editor.  U moet wachten totdat men gereed is \n"
-"            en het dan opnieuw proberen.  Wanneer U zojuist wijzigingen hebt "
-"gemaakt,\n"
-"            zult u waarschijnlijk terug willen gaan en de wijzigingen "
-"kopiëren naar het\n"
+"            en het dan opnieuw proberen.  Wanneer U zojuist wijzigingen hebt gemaakt,\n"
+"            zult u waarschijnlijk terug willen gaan en de wijzigingen kopiëren naar het\n"
 "            klembord om ze later te kunnen toevoegen.\n"
 "            "
 
-#: src/ZWiki/Views.py:364
+#: src/ZWiki/Views.py:368
 msgid "To discard your changes and try again, click OK."
-msgstr ""
-"Klik op OK om uw wijzigingen te laten voor wat ze zijn en het opnieuw te "
-"proberen"
+msgstr "Klik op OK om uw wijzigingen te laten voor wat ze zijn en het opnieuw te proberen"
 
-#: src/ZWiki/Views.py:393
+#: src/ZWiki/Views.py:397
 msgid "Edit conflict"
 msgstr "Conflict bij bewerken"
 
-#: src/ZWiki/Views.py:413
+#: src/ZWiki/Views.py:417
 msgid "Someone else has saved this page while you were editing"
 msgstr "Iemand anders heeft deze pagina opgeslagen terwijl u hem wijzigde"
 
-#: src/ZWiki/Views.py:414
+#: src/ZWiki/Views.py:418
 msgid "To resolve the conflict, do this"
 msgstr "Doe het volgende om het conflict op te lossen"
 
-#: src/ZWiki/Views.py:415
+#: src/ZWiki/Views.py:419
 msgid "Click your browser's back button"
 msgstr "Klik op de terug-toets van uw browser"
 
-#: src/ZWiki/Views.py:416
+#: src/ZWiki/Views.py:420
 msgid "Copy your recent edits to the clipboard"
 msgstr "Kopieer uw recente wijzigingen naar het klembord"
 
-#: src/ZWiki/Views.py:417
+#: src/ZWiki/Views.py:421
 msgid "Click your browser's refresh button"
 msgstr "Klik de verversen-knop van uw browser"
 
-#: src/ZWiki/Views.py:418
+#: src/ZWiki/Views.py:422
 msgid "Paste in your edits again, being mindful of the latest changes"
 msgstr "Plak uw wijzigingen opnieuw in, let op de laatste wijzigingen"
 
-#: src/ZWiki/Views.py:419
+#: src/ZWiki/Views.py:423
 msgid "Click the Change button again"
 msgstr "Klik opnieuw op de wijzigen-knop"
 
-#: src/ZWiki/Views.py:420 src/ZWiki/skins/zwiki/editform.pt:163
+#: src/ZWiki/Views.py:424 src/ZWiki/skins/zwiki/editform.pt:163
 msgid "or"
 msgstr "of"
 
-#: src/ZWiki/Views.py:421
+#: src/ZWiki/Views.py:425
 msgid "To discard your changes and start again, click OK"
 msgstr "Om uw wijzigingen te laten vervallen, klik op OK"
 
-#: src/ZWiki/Views.py:490
+#: src/ZWiki/Views.py:501
 msgid ""
 "\n"
-"        Access keys can be accessed in mozilla-based browsers by pressing "
-"alt-<key>\n"
+"        Access keys can be accessed in mozilla-based browsers by pressing alt-<key>\n"
 "        IE users: must also press enter\n"
 "        Mac users: command-<key>\n"
 "        Opera users: shift-escape-<key>\n"
-"        These won't work here, back up to the previous page to try them "
-"out.\n"
+"        These won't work here, back up to the previous page to try them out.\n"
 "\n"
 "        0    show these access key assignments\n"
 "\n"
@@ -286,10 +260,8 @@
 "        s    go to search field\n"
 "        \n"
 "        page functions:\n"
-"        +    (in a plone/cmf site with skin switching set up) use zwiki's "
-"plone/cmf skin\n"
-"        -    (in a plone/cmf site with skin switching set up) use zwiki's "
-"standard skin\n"
+"        +    (in a plone/cmf site with skin switching set up) use zwiki's plone/cmf skin\n"
+"        -    (in a plone/cmf site with skin switching set up) use zwiki's standard skin\n"
 "        v    view page\n"
 "        m    mail subscription\n"
 "        b    show backlinks (links to this page)\n"
@@ -359,32 +331,31 @@
 "        p    vorige wijziging\n"
 "        "
 
-#: src/ZWiki/Wikis.py:49
-msgid "Unknown wiki type"
-msgstr "Onbekend wiki type"
-
-#: src/ZWiki/ZWikiPage.py:675
+#: src/ZWiki/ZWikiPage.py:744
 msgid "create this page"
 msgstr "maak deze pagina"
 
-#: src/ZWiki/ZWikiPage.py:798 src/ZWiki/ZWikiPage.py:814
-#: src/ZWiki/ZWikiPage.py:817
+#: src/ZWiki/ZWikiPage.py:872 src/ZWiki/ZWikiPage.py:887
 msgid "last edited %(interval)s ago"
 msgstr "laatst gewijzigd %(interval)s geleden"
 
-#: src/ZWiki/ZWikiPage.py:809
+#: src/ZWiki/ZWikiPage.py:882
 msgid "show last edit"
 msgstr "toon laatste wijziging"
 
-#: src/ZWiki/ZWikiPage.py:826 src/ZWiki/ZWikiPage.py:828
+#: src/ZWiki/ZWikiPage.py:897 src/ZWiki/ZWikiPage.py:899
 msgid "by %(editor)s"
 msgstr "door %(editor)s"
 
-#: src/ZWiki/__init__.py:34
+#: src/ZWiki/__init__.py:200
+msgid "Unknown wiki type"
+msgstr "Onbekend wiki type"
+
+#: src/ZWiki/__init__.py:39
 msgid "No need to add a Zwiki Outline Cache"
 msgstr "Het is niet nodig een Zwiki Outline Cache toe te voegen"
 
-#: src/ZWiki/__init__.py:35
+#: src/ZWiki/__init__.py:40
 msgid ""
 "Zwiki Outline Cache appears in the ZMI Add menu\n"
 "        for implementation reasons, but should not be added directly.\n"
@@ -400,6 +371,10 @@
 msgid "comments"
 msgstr "opmerkingen"
 
+#: src/ZWiki/pagetypes/html.py:50 src/ZWiki/pagetypes/rst.py:85
+msgid "reply"
+msgstr "antwoord"
+
 #: src/ZWiki/pagetypes/moin.py:1990
 msgid "Expected \"=\" to follow \"%(token)s\""
 msgstr "Verwacht \"=\" na \"%(token)s\""
@@ -436,10 +411,6 @@
 msgid "Expected a color value \"%(arg)s\" after \"%(key)s\""
 msgstr "Verwachtte een kleurwaarde \"%(arg)s\" na \"%(key)s\""
 
-#: src/ZWiki/pagetypes/rst.py:85
-msgid "reply"
-msgstr "antwoord"
-
 #: src/ZWiki/plugins/latexwiki/wikis/latexwiki/diffform.pt:127
 #: src/ZWiki/plugins/mathaction/wikis/mathaction/old-diffform.pt:127
 msgid "full history"
@@ -461,67 +432,59 @@
 
 #: src/ZWiki/plugins/latexwiki/wikis/latexwiki/diffform.pt:137
 #: src/ZWiki/plugins/mathaction/wikis/mathaction/old-diffform.pt:137
-#, fuzzy
 msgid "Revert this change and all successive changes"
 msgstr "Maak deze en latere wijzigingen ongedaan"
 
 #: src/ZWiki/plugins/latexwiki/wikis/latexwiki/wikipage.pt:169
 msgid "show plone skin"
-msgstr ""
+msgstr "laat Plone skin zien"
 
 #: src/ZWiki/plugins/latexwiki/wikis/latexwiki/wikipage.pt:172
-#, fuzzy
 msgid "plone"
-msgstr "Aantekening:"
+msgstr "plone"
 
 #: src/ZWiki/plugins/latexwiki/wikis/latexwiki/wikipage.pt:173
-#, fuzzy
 msgid "show all features"
-msgstr "doorzoek all pagina's"
+msgstr "laat alle eigenschappen zien"
 
 #: src/ZWiki/plugins/latexwiki/wikis/latexwiki/wikipage.pt:179
 msgid "full"
-msgstr ""
+msgstr "geheel"
 
 #: src/ZWiki/plugins/latexwiki/wikis/latexwiki/wikipage.pt:180
-#, fuzzy
 msgid "show basic features"
-msgstr "toon laatste wijziging"
+msgstr "laat basiseigenschappen zien"
 
 #: src/ZWiki/plugins/latexwiki/wikis/latexwiki/wikipage.pt:186
-#, fuzzy
 msgid "simple"
-msgstr "Bestand"
+msgstr "eenvoudig"
 
 #: src/ZWiki/plugins/latexwiki/wikis/latexwiki/wikipage.pt:187
 msgid "show only essential features"
-msgstr ""
+msgstr "laat alleen noodzakelijke eigenschapen zien"
 
 #: src/ZWiki/plugins/latexwiki/wikis/latexwiki/wikipage.pt:193
 msgid "minimal"
-msgstr ""
+msgstr "minimaal"
 
 #: src/ZWiki/plugins/latexwiki/wikis/latexwiki/wikipage.pt:507
-#, fuzzy
 msgid "subtopic"
-msgstr "Sub-onderwerpen"
+msgstr "sub-onderwerp"
 
 #: src/ZWiki/plugins/latexwiki/wikis/latexwiki/wikipage.pt:512
-#, fuzzy
 msgid "for this page"
-msgstr "maak deze pagina"
+msgstr "voor deze pagina"
 
 #. Default: "reparent"
 #: src/ZWiki/plugins/latexwiki/wikis/latexwiki/wikipage.pt:520
 #: src/ZWiki/plugins/latexwiki/wikis/latexwiki/wikipage.pt:525
 #: src/ZWiki/plugins/latexwiki/wikis/latexwiki/wikipage.pt:530
 #: src/ZWiki/plugins/latexwiki/wikis/latexwiki/wikipage.pt:535
-#, fuzzy
 msgid "title"
 msgstr "Titel"
 
 #: src/ZWiki/plugins/tracker/filterissues.pt:12
-#: src/ZWiki/skins/dtmlmessages.pt:30
+#: src/ZWiki/skins/dtmlmessages.pt:31
 msgid "Filter issues"
 msgstr "Filter issues"
 
@@ -533,430 +496,406 @@
 msgid "Issue tracker"
 msgstr "Issue logboek"
 
-#: src/ZWiki/plugins/tracker/tracker.py:361
-#, fuzzy
+#: src/ZWiki/plugins/tracker/tracker.py:365
 msgid "You are not authorized to comment on this ZWiki Page."
-msgstr "U bent niet gemachtigd om deze Wiki pagina te wijzigen"
+msgstr "U bent niet gemachtigd om deze Wiki pagina van commentaar te voorzien."
 
-#: src/ZWiki/skins/dtmlmessages.pt:10 src/ZWiki/skins/dtmlmessages.pt:32
+#: src/ZWiki/skins/dtmlmessages.pt:10 src/ZWiki/skins/dtmlmessages.pt:33
+#, fuzzy
+msgid "name"
+msgstr "naam,"
+
+#: src/ZWiki/skins/dtmlmessages.pt:11 src/ZWiki/skins/dtmlmessages.pt:34
 msgid "category"
 msgstr "categorie"
 
-#: src/ZWiki/skins/dtmlmessages.pt:11 src/ZWiki/skins/dtmlmessages.pt:33
+#: src/ZWiki/skins/dtmlmessages.pt:12 src/ZWiki/skins/dtmlmessages.pt:35
 msgid "severity"
 msgstr "ernst"
 
-#: src/ZWiki/skins/dtmlmessages.pt:12 src/ZWiki/skins/dtmlmessages.pt:34
+#: src/ZWiki/skins/dtmlmessages.pt:13 src/ZWiki/skins/dtmlmessages.pt:36
 msgid "status"
 msgstr "status"
 
-#: src/ZWiki/skins/dtmlmessages.pt:13 src/ZWiki/skins/dtmlmessages.pt:35
+#: src/ZWiki/skins/dtmlmessages.pt:14 src/ZWiki/skins/dtmlmessages.pt:37
 msgid "age"
 msgstr "leeftijd"
 
-#: src/ZWiki/skins/dtmlmessages.pt:14 src/ZWiki/skins/dtmlmessages.pt:36
+#: src/ZWiki/skins/dtmlmessages.pt:15 src/ZWiki/skins/dtmlmessages.pt:38
 msgid "modified"
 msgstr "gewijzigd"
 
-#: src/ZWiki/skins/dtmlmessages.pt:15
+#: src/ZWiki/skins/dtmlmessages.pt:16
 msgid "Add a new issue:"
 msgstr "Voeg een nieuw issue toe:"
 
-#: src/ZWiki/skins/dtmlmessages.pt:16
+#: src/ZWiki/skins/dtmlmessages.pt:17
 msgid "Name:"
 msgstr "Naam:"
 
-#: src/ZWiki/skins/dtmlmessages.pt:17
+#: src/ZWiki/skins/dtmlmessages.pt:18
 msgid "Category:"
 msgstr "Categorie:"
 
-#: src/ZWiki/skins/dtmlmessages.pt:18
+#: src/ZWiki/skins/dtmlmessages.pt:19
 msgid "Severity:"
 msgstr "Ernst:"
 
-#: src/ZWiki/skins/dtmlmessages.pt:19
-msgid "Status:"
-msgstr "Status:"
-
 #: src/ZWiki/skins/dtmlmessages.pt:2
 msgid "Here are the wiki's issue pages."
 msgstr "Dit zijn de issue pagina's van deze wiki."
 
 #: src/ZWiki/skins/dtmlmessages.pt:20
+msgid "Status:"
+msgstr "Status:"
+
+#: src/ZWiki/skins/dtmlmessages.pt:21
 msgid "Details:"
 msgstr "Details:"
 
-#: src/ZWiki/skins/dtmlmessages.pt:21
+#: src/ZWiki/skins/dtmlmessages.pt:22
 msgid "add issue"
 msgstr "issue toevoegen"
 
-#: src/ZWiki/skins/dtmlmessages.pt:22
+#: src/ZWiki/skins/dtmlmessages.pt:23
 msgid "More advanced"
 msgstr "Geavanceerdere"
 
-#: src/ZWiki/skins/dtmlmessages.pt:23
+#: src/ZWiki/skins/dtmlmessages.pt:24
 msgid "issue tracker"
 msgstr "Issue logboek"
 
-#: src/ZWiki/skins/dtmlmessages.pt:24
+#: src/ZWiki/skins/dtmlmessages.pt:25
 msgid "search options"
 msgstr "zoekopties"
 
-#: src/ZWiki/skins/dtmlmessages.pt:25
+#: src/ZWiki/skins/dtmlmessages.pt:26
 msgid "Name contains any of:"
 msgstr "Naam bevat één of meer van:"
 
-#: src/ZWiki/skins/dtmlmessages.pt:26
+#: src/ZWiki/skins/dtmlmessages.pt:27
 msgid "Page text contains any of:"
 msgstr "Pagina bevat één of meer van:"
 
-#: src/ZWiki/skins/dtmlmessages.pt:27
+#: src/ZWiki/skins/dtmlmessages.pt:28
 msgid "Categories:"
 msgstr "Categorieën:"
 
-#: src/ZWiki/skins/dtmlmessages.pt:28
+#: src/ZWiki/skins/dtmlmessages.pt:29
 msgid "Severities:"
 msgstr "Ernst:"
 
-#: src/ZWiki/skins/dtmlmessages.pt:29
-msgid "Statuses:"
-msgstr "Status:"
-
 #: src/ZWiki/skins/dtmlmessages.pt:3
-#, fuzzy
 msgid "Enter a search term, click the numbers to the right,"
 msgstr "Voer een zoekterm in, of klik op de getallen rechts, of"
 
-#: src/ZWiki/skins/dtmlmessages.pt:37
+#: src/ZWiki/skins/dtmlmessages.pt:30
+msgid "Statuses:"
+msgstr "Status:"
+
+#: src/ZWiki/skins/dtmlmessages.pt:39
 msgid "Submitted by"
 msgstr "Ingevoerd door:"
 
-#: src/ZWiki/skins/dtmlmessages.pt:38
+#: src/ZWiki/skins/dtmlmessages.pt:4
+msgid "filter issues"
+msgstr "filter issues"
+
+#: src/ZWiki/skins/dtmlmessages.pt:40
 msgid "Name"
 msgstr "Naam"
 
-#: src/ZWiki/skins/dtmlmessages.pt:39
+#: src/ZWiki/skins/dtmlmessages.pt:41
 msgid "Category"
 msgstr "Categorie"
 
-#: src/ZWiki/skins/dtmlmessages.pt:4
-msgid "filter issues"
-msgstr "filter issues"
-
-#: src/ZWiki/skins/dtmlmessages.pt:40
+#: src/ZWiki/skins/dtmlmessages.pt:42
 msgid "Severity"
 msgstr "Ernst"
 
-#: src/ZWiki/skins/dtmlmessages.pt:41
+#: src/ZWiki/skins/dtmlmessages.pt:43
 msgid "Status"
 msgstr "Status"
 
-#: src/ZWiki/skins/dtmlmessages.pt:42
+#: src/ZWiki/skins/dtmlmessages.pt:44
 msgid "Optional subject"
 msgstr "Optioneel onderwerp"
 
-#: src/ZWiki/skins/dtmlmessages.pt:43
+#: src/ZWiki/skins/dtmlmessages.pt:45
 msgid "Optional comment"
 msgstr "Optionele aantekening over deze wijziging"
 
-#: src/ZWiki/skins/dtmlmessages.pt:44 src/ZWiki/skins/dtmlmessages.pt:45
-#, fuzzy
+#: src/ZWiki/skins/dtmlmessages.pt:46 src/ZWiki/skins/dtmlmessages.pt:47
 msgid "Add ZWiki"
-msgstr "Voeg ZWiki pagina toe"
+msgstr "Voeg ZWiki toe"
 
-#: src/ZWiki/skins/dtmlmessages.pt:46
-#, fuzzy
+#: src/ZWiki/skins/dtmlmessages.pt:48
 msgid "Id:"
-msgstr "Id"
+msgstr "Id:"
 
-#: src/ZWiki/skins/dtmlmessages.pt:47
-#, fuzzy
+#: src/ZWiki/skins/dtmlmessages.pt:49
 msgid "Title:"
-msgstr "Titel"
+msgstr "Titel:"
 
-#: src/ZWiki/skins/dtmlmessages.pt:48
-msgid "Template:"
-msgstr ""
-
-#: src/ZWiki/skins/dtmlmessages.pt:49
-#, fuzzy
-msgid "Add wiki"
-msgstr "Voeg ZWiki pagina toe"
-
 #: src/ZWiki/skins/dtmlmessages.pt:5
 msgid "browse open issues"
-msgstr ""
+msgstr "door open issues browsen"
 
 #: src/ZWiki/skins/dtmlmessages.pt:50
+msgid "Template:"
+msgstr "Sjabloon:"
+
+#: src/ZWiki/skins/dtmlmessages.pt:51
+msgid "Add wiki"
+msgstr "Voeg wiki toe"
+
+#: src/ZWiki/skins/dtmlmessages.pt:52
 msgid "Pages changed in the last"
 msgstr "Pagina's die zijn gewijzigd in de laatste"
 
-#: src/ZWiki/skins/dtmlmessages.pt:51
+#: src/ZWiki/skins/dtmlmessages.pt:53
 msgid "Recently changed pages, with summaries"
 msgstr "Recent gewijzigde pagina's met samenvattingen"
 
-#: src/ZWiki/skins/dtmlmessages.pt:52
+#: src/ZWiki/skins/dtmlmessages.pt:54
 msgid "Show summaries ?"
 msgstr "Toon samenvattingen ?"
 
-#: src/ZWiki/skins/dtmlmessages.pt:53
+#: src/ZWiki/skins/dtmlmessages.pt:55
 msgid "Refresh"
 msgstr "Verversen"
 
-#: src/ZWiki/skins/dtmlmessages.pt:54
+#: src/ZWiki/skins/dtmlmessages.pt:56
 msgid "Page"
 msgstr "Pagina"
 
-#: src/ZWiki/skins/dtmlmessages.pt:55
+#: src/ZWiki/skins/dtmlmessages.pt:57
 msgid "Edited&nbsp;by"
 msgstr "Gewijzigd&nbsp;door"
 
-#: src/ZWiki/skins/dtmlmessages.pt:56
+#: src/ZWiki/skins/dtmlmessages.pt:58
 msgid "Time"
 msgstr "Tijd"
 
-#: src/ZWiki/skins/dtmlmessages.pt:57
+#: src/ZWiki/skins/dtmlmessages.pt:59
 msgid "NEW"
 msgstr "NIEUW"
 
-#: src/ZWiki/skins/dtmlmessages.pt:59
-msgid "Pages marked (NEW) have been created within the last week"
-msgstr ""
-"Pagina's die zijn gemarkeerd als (NIEUW) zijn in de afgelopen week gemaakt"
-
 #: src/ZWiki/skins/dtmlmessages.pt:6
 msgid "search issues"
 msgstr "zoek issues"
 
-#: src/ZWiki/skins/dtmlmessages.pt:60
+#: src/ZWiki/skins/dtmlmessages.pt:61
+msgid "Pages marked (NEW) have been created within the last week"
+msgstr "Pagina's die zijn gemarkeerd als (NIEUW) zijn in de afgelopen week gemaakt"
+
+#: src/ZWiki/skins/dtmlmessages.pt:62
 msgid "Enter a word or phrase and hit enter to search the entire wiki."
 msgstr "Geef een woord of een zin en toets Enter om de wiki te doorzoeken."
 
-#: src/ZWiki/skins/dtmlmessages.pt:61
+#: src/ZWiki/skins/dtmlmessages.pt:63
 msgid "This is the same as using the search field at top right."
 msgstr "Dit werkt hetzelfde als het gebruik van het zoekveld rechtsboven."
 
-#: src/ZWiki/skins/dtmlmessages.pt:62
+#: src/ZWiki/skins/dtmlmessages.pt:64
 msgid "Tips: A single word works best for matching page names."
 msgstr "Een enkel woord werkt het best voor het zoeken naar paginanamen."
 
-#: src/ZWiki/skins/dtmlmessages.pt:63
-msgid ""
-"Case-insensitivity and wildcards may be supported depending on your catalog "
-"configuration."
-msgstr ""
-"Case-onafhankelijkheid of wildcards kunnen ondersteund zijn, afhankelijk van "
-"de Catalog instellingen."
+#: src/ZWiki/skins/dtmlmessages.pt:65
+msgid "Case-insensitivity and wildcards may be supported depending on your catalog configuration."
+msgstr "Case-onafhankelijkheid of wildcards kunnen ondersteund zijn, afhankelijk van de Catalog instellingen."
 
-#: src/ZWiki/skins/dtmlmessages.pt:64
+#: src/ZWiki/skins/dtmlmessages.pt:66
 msgid "Leave it blank to list all pages."
 msgstr "Leeg laten om alle pagina's te tonen."
 
-#: src/ZWiki/skins/dtmlmessages.pt:65 src/ZWiki/skins/dtmlmessages.pt:66
+#: src/ZWiki/skins/dtmlmessages.pt:67 src/ZWiki/skins/dtmlmessages.pt:68
 msgid "Search"
 msgstr "Zoeken"
 
-#: src/ZWiki/skins/dtmlmessages.pt:67
+#: src/ZWiki/skins/dtmlmessages.pt:69
 msgid "Page names matching"
 msgstr "Paginanamen die overeenkomen"
 
-#: src/ZWiki/skins/dtmlmessages.pt:68
+#: src/ZWiki/skins/dtmlmessages.pt:7
+msgid "recent"
+msgstr "recent"
+
+#: src/ZWiki/skins/dtmlmessages.pt:70
 msgid "Text matching"
 msgstr "Tekst overeenkomsten"
 
-#: src/ZWiki/skins/dtmlmessages.pt:69
+#: src/ZWiki/skins/dtmlmessages.pt:71
 msgid "Thorough (non-catalog) search for text matching"
 msgstr "Grondige zoekactie (zonder catalogus) voor tekstvergelijking"
 
-#: src/ZWiki/skins/dtmlmessages.pt:7
-msgid "recent"
-msgstr "recent"
-
-#: src/ZWiki/skins/dtmlmessages.pt:70
+#: src/ZWiki/skins/dtmlmessages.pt:72
 msgid "Set your preferences for this wiki:"
 msgstr "Geef hier uw voorkeurinstellingen voor deze wiki aan:"
 
-#: src/ZWiki/skins/dtmlmessages.pt:71
+#: src/ZWiki/skins/dtmlmessages.pt:73
 msgid "User name:"
 msgstr "Gebruikersnaam:"
 
-#: src/ZWiki/skins/dtmlmessages.pt:72
-msgid "(identifies your edits)"
-msgstr "(laat uw wijzigingen zien)"
+#: src/ZWiki/skins/dtmlmessages.pt:74
+msgid "(identifies your edits, saves your votes, may be required)"
+msgstr ""
 
-#: src/ZWiki/skins/dtmlmessages.pt:73
+#: src/ZWiki/skins/dtmlmessages.pt:75
 msgid "Email address:"
 msgstr "E-mail adres:"
 
-#: src/ZWiki/skins/dtmlmessages.pt:74
+#: src/ZWiki/skins/dtmlmessages.pt:76
 msgid "(allows mail subscription)"
 msgstr "(staat e-mail abonnement toe)"
 
-#: src/ZWiki/skins/dtmlmessages.pt:75
+#: src/ZWiki/skins/dtmlmessages.pt:77
 msgid "Your time zone:"
 msgstr "Uw tijdzone:"
 
-#: src/ZWiki/skins/dtmlmessages.pt:76
+#: src/ZWiki/skins/dtmlmessages.pt:78
 msgid "(localizes most times)"
 msgstr "(maakt de meeste tijden lokaal)"
 
-#: src/ZWiki/skins/dtmlmessages.pt:77
+#: src/ZWiki/skins/dtmlmessages.pt:79
 msgid "Edit form height:"
 msgstr "Bewerk formulierhoogte:"
 
-#: src/ZWiki/skins/dtmlmessages.pt:78
+#: src/ZWiki/skins/dtmlmessages.pt:8
+msgid "all"
+msgstr "alles"
+
+#: src/ZWiki/skins/dtmlmessages.pt:80
 msgid "(adjusts form size)"
 msgstr "(past formuliergrootte aan)"
 
-#: src/ZWiki/skins/dtmlmessages.pt:79
+#: src/ZWiki/skins/dtmlmessages.pt:81
 msgid "Save options"
 msgstr "Bewaar deze opties"
 
-#: src/ZWiki/skins/dtmlmessages.pt:8
-msgid "all"
-msgstr "alles"
-
-#: src/ZWiki/skins/dtmlmessages.pt:80
+#: src/ZWiki/skins/dtmlmessages.pt:82
 msgid "Forget options"
 msgstr "Negeer deze opties"
 
-#: src/ZWiki/skins/dtmlmessages.pt:81 src/ZWiki/skins/dtmlmessages.pt:82
+#: src/ZWiki/skins/dtmlmessages.pt:83 src/ZWiki/skins/dtmlmessages.pt:84
 msgid "Add ZWiki Page"
 msgstr "Voeg ZWiki pagina toe"
 
-#: src/ZWiki/skins/dtmlmessages.pt:83
-#, fuzzy
+#: src/ZWiki/skins/dtmlmessages.pt:85
 msgid "Page&nbsp;name:"
 msgstr "Paginanaam"
 
-#: src/ZWiki/skins/dtmlmessages.pt:84
-#, fuzzy
+#: src/ZWiki/skins/dtmlmessages.pt:86
 msgid "Add wiki page"
-msgstr "Voeg ZWiki pagina toe"
+msgstr "Voeg wiki pagina toe"
 
-#: src/ZWiki/skins/dtmlmessages.pt:85
+#: src/ZWiki/skins/dtmlmessages.pt:87
 msgid "Topic"
 msgstr "Onderwerp"
 
-#: src/ZWiki/skins/dtmlmessages.pt:86
+#: src/ZWiki/skins/dtmlmessages.pt:88
 msgid "Last updated"
 msgstr "Laatst bijgewerkt"
 
-#: src/ZWiki/skins/dtmlmessages.pt:87
+#: src/ZWiki/skins/dtmlmessages.pt:89
 msgid "Comments"
 msgstr "Opmerkingen"
 
-#: src/ZWiki/skins/dtmlmessages.pt:88
+#: src/ZWiki/skins/dtmlmessages.pt:9 src/ZWiki/skins/dtmlmessages.pt:32
+msgid "#"
+msgstr "Nummer"
+
+#: src/ZWiki/skins/dtmlmessages.pt:90
 msgid "Views"
 msgstr "Gezichtspunten"
 
-#: src/ZWiki/skins/dtmlmessages.pt:89
+#: src/ZWiki/skins/dtmlmessages.pt:91
 msgid "Created"
 msgstr "Gemaakt"
 
-#: src/ZWiki/skins/dtmlmessages.pt:9 src/ZWiki/skins/dtmlmessages.pt:31
-msgid "#"
-msgstr "Nummer"
-
-#: src/ZWiki/skins/dtmlmessages.pt:90 src/ZWiki/skins/dtmlmessages.pt:92
+#: src/ZWiki/skins/dtmlmessages.pt:92 src/ZWiki/skins/dtmlmessages.pt:94
 msgid "by"
 msgstr "door"
 
-#: src/ZWiki/skins/dtmlmessages.pt:91
+#: src/ZWiki/skins/dtmlmessages.pt:93
 msgid "<dtml-var lasteditinterval> ago</dtml-var>"
 msgstr "<dtml-var lastEditInterval> geleden</dtml-var>"
 
-#: src/ZWiki/skins/dtmlmessages.pt:93
+#: src/ZWiki/skins/dtmlmessages.pt:95
 msgid "on"
 msgstr "op"
 
-#: src/ZWiki/skins/zwiki/backlinks.pt:108
-msgid "Subtopics"
-msgstr "Sub-onderwerpen"
-
-#: src/ZWiki/skins/zwiki/backlinks.pt:111
-msgid "This page has no subtopics."
-msgstr "Deze pagina heeft geen sub-onderwerpen."
-
-#: src/ZWiki/skins/zwiki/backlinks.pt:114
-#, fuzzy
+#: src/ZWiki/skins/zwiki/backlinks.pt:102
 msgid "Here are it's subtopics."
 msgstr "Dit zijn de sub-onderwerpen:"
 
-#: src/ZWiki/skins/zwiki/backlinks.pt:117
-#, fuzzy
+#: src/ZWiki/skins/zwiki/backlinks.pt:105
 msgid "You can reorder them by clicking the ^ buttons."
-msgstr ""
-"U kunt de volgorde van de sub-onderwerpen aanpassen door op de ^ knoppen te "
-"klikken."
+msgstr "U kunt de volgorde van de sub-onderwerpen aanpassen door op de ^ knoppen te klikken."
 
 #: src/ZWiki/skins/zwiki/backlinks.pt:20
-#, fuzzy
 msgid "Related pages"
-msgstr "maak deze pagina"
+msgstr "Gerelateerde pagina's"
 
 #: src/ZWiki/skins/zwiki/backlinks.pt:26
 msgid "Parents"
 msgstr "Ouders"
 
-#: src/ZWiki/skins/zwiki/backlinks.pt:31
+#: src/ZWiki/skins/zwiki/backlinks.pt:28
 msgid "is a top-level topic."
 msgstr "is een top-niveau onderwerp"
 
-#: src/ZWiki/skins/zwiki/backlinks.pt:32
+#: src/ZWiki/skins/zwiki/backlinks.pt:29
 msgid "is a subtopic of:"
 msgstr "is een sub-onderwerp van:"
 
-#: src/ZWiki/skins/zwiki/backlinks.pt:55
+#: src/ZWiki/skins/zwiki/backlinks.pt:48
 msgid "Backlinks"
 msgstr "Terugverwijzingen"
 
-#: src/ZWiki/skins/zwiki/backlinks.pt:56
+#: src/ZWiki/skins/zwiki/backlinks.pt:49
 msgid "Here are the pages which link to it:"
 msgstr "Dit zijn de pagina's die hiernaar verwijzen:"
 
-#: src/ZWiki/skins/zwiki/backlinks.pt:57
+#: src/ZWiki/skins/zwiki/backlinks.pt:50
 msgid "No other pages link to this one."
 msgstr "Geen enkele pagina verwijst naar deze pagina."
 
-#: src/ZWiki/skins/zwiki/backlinks.pt:82
-msgid ""
-"You can set this page's parent(s) to place it within the overall page "
-"hierarchy."
-msgstr ""
+#: src/ZWiki/skins/zwiki/backlinks.pt:70
+msgid "You can set this page's parent(s) to place it within the overall page hierarchy."
+msgstr "Je kunt de ouder(s) van deze pagina instellen om de plaats in de hierarchie te bepalen."
 
-#: src/ZWiki/skins/zwiki/backlinks.pt:85
-msgid ""
-"Check one or more checkboxes or enter a page name here, and click the button."
-msgstr ""
+#: src/ZWiki/skins/zwiki/backlinks.pt:73
+msgid "Check one or more checkboxes or enter a page name here, and click the button."
+msgstr "Vink een of meer vakjes aan of geef een paginanaam en druk op de knop."
 
-#: src/ZWiki/skins/zwiki/backlinks.pt:88
+#: src/ZWiki/skins/zwiki/backlinks.pt:76
 msgid "Enter a page name here and click the button."
-msgstr ""
+msgstr "Voer een paginanaam in en druk op de knop."
 
-#: src/ZWiki/skins/zwiki/backlinks.pt:91
-msgid ""
-"You can type just the first few letters, case and punctuation are ignored."
-msgstr ""
+#: src/ZWiki/skins/zwiki/backlinks.pt:79
+msgid "You can type just the first few letters, case and punctuation are ignored."
+msgstr "Je kunt eenvoudigweg de eerste paar letters typen."
 
-#: src/ZWiki/skins/zwiki/backlinks.pt:98
+#: src/ZWiki/skins/zwiki/backlinks.pt:86
 msgid "Reparent"
 msgstr "Nieuwe ouder"
 
+#: src/ZWiki/skins/zwiki/backlinks.pt:96
+msgid "Subtopics"
+msgstr "Sub-onderwerpen"
+
+#: src/ZWiki/skins/zwiki/backlinks.pt:99
+msgid "This page has no subtopics."
+msgstr "Deze pagina heeft geen sub-onderwerpen."
+
 #: src/ZWiki/skins/zwiki/badtemplate.pt:12
 msgid "Bad template"
-msgstr ""
+msgstr "Verkeerd sjabloon"
 
 #: src/ZWiki/skins/zwiki/badtemplate.pt:13
-msgid ""
-"There was a problem locating one of this wiki's skin templates. There may be "
-"a page or other non-page-template/non-dtml-method object with the same ID, "
-"obscuring the template. Or the template may be missing on the filesystem (an "
-"incomplete Zwiki installation)."
-msgstr ""
-"Er was een probleem met een van de \"skin\" templates. Het kan zijn dat er "
-"een object bestaat met een template ID dat geen pagina-template of DTML "
-"Method is, of het template ontbreekt."
+msgid "There was a problem locating one of this wiki's skin templates. There may be a page or other non-page-template/non-dtml-method object with the same ID, obscuring the template. Or the template may be missing on the filesystem (an incomplete Zwiki installation)."
+msgstr "Er was een probleem met een van de \"skin\" templates. Het kan zijn dat er een object bestaat met een template ID dat geen pagina-template of DTML Method is, of het template ontbreekt."
 
 #: src/ZWiki/skins/zwiki/commentform.pt:21
 msgid "subject"
@@ -964,9 +903,7 @@
 
 #: src/ZWiki/skins/zwiki/commentform.pt:22
 msgid "a subject helps clarify threads and RecentChanges"
-msgstr ""
-"een onderwerp helpt ter verduidelijking van doorverwijzingen en recente "
-"wijzigingen"
+msgstr "een onderwerp helpt ter verduidelijking van doorverwijzingen en recente wijzigingen"
 
 #: src/ZWiki/skins/zwiki/commentform.pt:29
 msgid "replying"
@@ -974,8 +911,7 @@
 
 #: src/ZWiki/skins/zwiki/commentform.pt:36
 msgid "to comment (and cc any subscribers) enter text here and click add"
-msgstr ""
-"geef commentaar (met cc aan abonnees): voer de tekst in en klik op toevoegen"
+msgstr "geef commentaar (met cc aan abonnees): voer de tekst in en klik op toevoegen"
 
 #: src/ZWiki/skins/zwiki/commentform.pt:56
 msgid "${nb} subscribers"
@@ -990,12 +926,20 @@
 msgid "add-comment"
 msgstr "voeg opmerking toe"
 
-#: src/ZWiki/skins/zwiki/contentspage.pt:12
+#: src/ZWiki/skins/zwiki/contentspage.pt:10
+#: src/ZWiki/skins/zwiki/contentspage.pt:27
+#, fuzzy
+msgid "Wiki contents for"
+msgstr "Wiki inhoud"
+
+#: src/ZWiki/skins/zwiki/contentspage.pt:13
+#: src/ZWiki/skins/zwiki/contentspage.pt:30
 msgid "Wiki contents"
 msgstr "Wiki inhoud"
 
-#: src/ZWiki/skins/zwiki/contentspage.pt:16
-msgid "Singletons"
+#: src/ZWiki/skins/zwiki/contentspage.pt:40
+#, fuzzy
+msgid "Singletons:"
 msgstr "Eenlingen"
 
 #: src/ZWiki/skins/zwiki/denied.pt:12
@@ -1003,32 +947,28 @@
 msgstr "NIet toegestaan"
 
 #: src/ZWiki/skins/zwiki/diffform.pt:24
-#, fuzzy
 msgid "Edit history"
-msgstr "volledige historie"
+msgstr "Wijzigingsgeschiedenis"
 
 #: src/ZWiki/skins/zwiki/diffform.pt:32
-#, fuzzy
 msgid "Edit:"
-msgstr "bewerken"
+msgstr "Bewerken:"
 
 #. Default: "<<"
 #: src/ZWiki/skins/zwiki/diffform.pt:34 src/ZWiki/skins/zwiki/diffform.pt:38
 msgid " << "
-msgstr ""
+msgstr " << "
 
 #. Default: ">>"
 #: src/ZWiki/skins/zwiki/diffform.pt:52 src/ZWiki/skins/zwiki/diffform.pt:56
 msgid " >> "
-msgstr ""
+msgstr " >> "
 
 #: src/ZWiki/skins/zwiki/diffform.pt:61
-#, fuzzy
 msgid "Manage"
-msgstr "Wijzig"
+msgstr "Beheer"
 
 #: src/ZWiki/skins/zwiki/diffform.pt:65
-#, fuzzy
 msgid "Revert this and later edits"
 msgstr "Maak deze en latere wijzigingen ongedaan"
 
@@ -1037,14 +977,12 @@
 msgstr "Keer terug naar de pagina"
 
 #: src/ZWiki/skins/zwiki/diffform.pt:85
-#, fuzzy
 msgid "Time:"
-msgstr "Tijd"
+msgstr "Tijd:"
 
 #: src/ZWiki/skins/zwiki/diffform.pt:90
-#, fuzzy
 msgid "Note:"
-msgstr "Naam:"
+msgstr "Aantekening:"
 
 #: src/ZWiki/skins/zwiki/editform.pt:121
 msgid "toggle source/WYSIWYG mode"
@@ -1083,13 +1021,13 @@
 msgstr "${DYNAMIC_CONTENT}"
 
 #: src/ZWiki/skins/zwiki/editform.pt:178
-msgid "preview this edit"
-msgstr "laat voorbeeld zien"
-
-#: src/ZWiki/skins/zwiki/editform.pt:178
 msgid "Preview"
 msgstr "Voorbeeld"
 
+#: src/ZWiki/skins/zwiki/editform.pt:178
+msgid "preview this edit"
+msgstr "laat voorbeeld zien"
+
 #: src/ZWiki/skins/zwiki/editform.pt:183
 msgid "Cancel"
 msgstr "Opheffen"
@@ -1124,13 +1062,18 @@
 msgstr "de naam van deze pagina (deze wijziging kan lang duren !)"
 
 #: src/ZWiki/skins/zwiki/editform.pt:71
-msgid "type"
-msgstr "type"
+msgid "markup"
+msgstr ""
 
 #: src/ZWiki/skins/zwiki/editform.pt:72
 msgid "select the formatting and rendering style for this page"
 msgstr "kies de formattering en opmaak stijl voor deze pagina"
 
+#: src/ZWiki/skins/zwiki/helppage.pt:12
+#, fuzzy
+msgid "Help page"
+msgstr "HelpPage"
+
 #: src/ZWiki/skins/zwiki/links.pt:102
 msgid "(external edit)"
 msgstr "(externe editor)"
@@ -1265,23 +1208,19 @@
 
 #: src/ZWiki/skins/zwiki/pagemanagementform.pt:40
 msgid "enter a page name and click buttons to the right (mouse over for help)"
-msgstr ""
-"voer een paginanaam in en klik op de knoppen rechts (wijs de knoppen aan met "
-"de muis voor hulp)"
+msgstr "voer een paginanaam in en klik op de knoppen rechts (wijs de knoppen aan met de muis voor hulp)"
 
 #: src/ZWiki/skins/zwiki/pagemanagementform.pt:45
-msgid "reparent"
-msgstr "nieuwe ouder"
-
-#: src/ZWiki/skins/zwiki/pagemanagementform.pt:45
 msgid "make this page a subtopic of the page you have entered"
 msgstr "geef deze pagina als nieuwe ouder de pagina die u hebt opgegeven"
 
+#: src/ZWiki/skins/zwiki/pagemanagementform.pt:45
+msgid "reparent"
+msgstr "nieuwe ouder"
+
 #: src/ZWiki/skins/zwiki/pagemanagementform.pt:50
 msgid "rename this page to the name you have entered, updating all links"
-msgstr ""
-"hernoem deze pagina naar de naam die u hebt opgegeven. Alle verwijzingen "
-"worden bijgewerkt."
+msgstr "hernoem deze pagina naar de naam die u hebt opgegeven. Alle verwijzingen worden bijgewerkt."
 
 #: src/ZWiki/skins/zwiki/pagemanagementform.pt:50
 msgid "rename"
@@ -1292,17 +1231,12 @@
 msgstr "verwijder!"
 
 #: src/ZWiki/skins/zwiki/pagemanagementform.pt:55
-msgid ""
-"delete this page, and redirect links to the page you have entered, if any"
-msgstr ""
-"verwijder deze pagina, en leid links om naar de pagina die u hebt opgegeven, "
-"indien van toepassing"
+msgid "delete this page, and redirect links to the page you have entered, if any"
+msgstr "verwijder deze pagina, en leid links om naar de pagina die u hebt opgegeven, indien van toepassing"
 
 #: src/ZWiki/skins/zwiki/pagemanagementform.pt:60
 msgid "create a page with the name you have entered, as a subtopic of this one"
-msgstr ""
-"maak een nieuwe pagina met de naam die u hebt opgegeven, als een sub-"
-"onderwerp van deze pagina"
+msgstr "maak een nieuwe pagina met de naam die u hebt opgegeven, als een sub-onderwerp van deze pagina"
 
 #: src/ZWiki/skins/zwiki/pagemanagementform.pt:60
 msgid "create"
@@ -1364,9 +1298,7 @@
 #.  "              Or return to"
 #: src/ZWiki/skins/zwiki/subscribeform.pt:38
 msgid "subscribe_desc_comments"
-msgstr ""
-"U kunt zich op deze pagina of op de hele wiki abonneren. Abonnees ontvangen "
-"een afschrift van opmerkingen die worden toegevoegd. Of keer terug naar"
+msgstr "U kunt zich op deze pagina of op de hele wiki abonneren. Abonnees ontvangen een afschrift van opmerkingen die worden toegevoegd. Of keer terug naar"
 
 #. Default: ""
 #.  "You can subscribe to this page or to the whole wiki.\n"
@@ -1374,13 +1306,11 @@
 #.  "              Or return to"
 #: src/ZWiki/skins/zwiki/subscribeform.pt:43
 msgid "subscribe_desc_edits"
-msgstr ""
-"Als u zich op wijzingingen abonneert, krijgt u van alle paginawijzigingen "
-"bericht."
+msgstr "Als u zich op wijzingingen abonneert, krijgt u van alle paginawijzigingen bericht."
 
 #: src/ZWiki/skins/zwiki/subscribeform.pt:53
 msgid "Email will go to the address you have configured in site preferences."
-msgstr ""
+msgstr "E-mail gaat naar het adres dat u in de site-voorkeuren hebt opgegeven."
 
 #: src/ZWiki/skins/zwiki/subscribeform.pt:58
 msgid "Your email address"
@@ -1420,16 +1350,20 @@
 msgstr " Neem een abonnement op deze pagina "
 
 #: src/ZWiki/skins/zwiki/useroptions.pt:12
-#, fuzzy
 msgid "User options"
-msgstr "zoekopties"
+msgstr "Gebruikersopties"
 
+#~ msgid "(identifies your edits)"
+#~ msgstr "(laat uw wijzigingen zien)"
+
+#~ msgid "type"
+#~ msgstr "type"
+
 #~ msgid "your edit contained a banned link pattern"
 #~ msgstr "uw wijziging bevat een link met een niet toegestaan patroon"
 
 #~ msgid "adding of external links by anonymous authors is restricted"
-#~ msgstr ""
-#~ "het toevoegen van externe links door anonieme gebruikers is ingeperkt"
+#~ msgstr "het toevoegen van externe links door anonieme gebruikers is ingeperkt"
 
 #~ msgid "Add a ZWiki web"
 #~ msgstr "Voeg een ZWiki web toe"
@@ -1443,14 +1377,8 @@
 #~ msgid "and enter"
 #~ msgstr "en voeg toe"
 
-#~ msgid ""
-#~ "You may create a new ZWiki Page object using the form below. You may also "
-#~ "choose to upload an existing html file from your local computer by "
-#~ "clicking the <i>Browse</i> button."
-#~ msgstr ""
-#~ "U kunt een nieuwe ZWiki pagina maken met behulp van het formulier "
-#~ "hieronder. U kunt er ook voor kiezen een bestaande HTML pagina van uw "
-#~ "computer te laden via de <i>Browse</i> knop."
+#~ msgid "You may create a new ZWiki Page object using the form below. You may also choose to upload an existing html file from your local computer by clicking the <i>Browse</i> button."
+#~ msgstr "U kunt een nieuwe ZWiki pagina maken met behulp van het formulier hieronder. U kunt er ook voor kiezen een bestaande HTML pagina van uw computer te laden via de <i>Browse</i> knop."
 
 #~ msgid "Add"
 #~ msgstr "Toevoegen"
@@ -1462,9 +1390,7 @@
 #~ msgstr "Terugverwijzingen voor"
 
 #~ msgid "singleton_desc"
-#~ msgstr ""
-#~ "Eenlingen zijn pagina's die niet zijn verbonden via verwijzingen met "
-#~ "andere pagina's."
+#~ msgstr "Eenlingen zijn pagina's die niet zijn verbonden via verwijzingen met andere pagina's."
 
 #~ msgid "History for"
 #~ msgstr "Historie voor"
@@ -1473,21 +1399,16 @@
 #~ msgstr "keer terug naar de pagina"
 
 #~ msgid "help_shortname"
-#~ msgstr ""
-#~ "NB: Hernoemen van een pagina in een grote wiki kan lang duren. Andere "
-#~ "pagina's zullen zo mogelijk worden bijgewerkt."
+#~ msgstr "NB: Hernoemen van een pagina in een grote wiki kan lang duren. Andere pagina's zullen zo mogelijk worden bijgewerkt."
 
 #~ msgid "label_body_text"
 #~ msgstr "Body tekst"
 
 #~ msgid "help_wikibody"
-#~ msgstr ""
-#~ "In een Wiki pagina gebruikt u [vierkante haken] om verwijzingen te maken. "
-#~ "Wanneer u de pagina opslaat,"
+#~ msgstr "In een Wiki pagina gebruikt u [vierkante haken] om verwijzingen te maken. Wanneer u de pagina opslaat,"
 
 #~ msgid "help_wikiwords"
-#~ msgstr ""
-#~ "Deze pagina ondersteunt WikiWoorden als een middel voor verwijzingen"
+#~ msgstr "Deze pagina ondersteunt WikiWoorden als een middel voor verwijzingen"
 
 #~ msgid "label_note"
 #~ msgstr "Aantekening voor de pagina historie (optioneel)"
@@ -1516,9 +1437,7 @@
 #~ msgstr "Wijzig"
 
 #~ msgid "description_edit_wiki_page"
-#~ msgstr ""
-#~ "Een Wikipagina maakt het mogelijk om pagina's te maken die op "
-#~ "verschillende manieren in verbinding staan met elkaar."
+#~ msgstr "Een Wikipagina maakt het mogelijk om pagina's te maken die op verschillende manieren in verbinding staan met elkaar."
 
 #~ msgid "legend_wiki_page_details"
 #~ msgstr "Wiki pagina details"
@@ -1554,9 +1473,7 @@
 #~ msgstr "Filter issues"
 
 #~ msgid "heading_wiki_issue_browser"
-#~ msgstr ""
-#~ "Dit is het issue logboek van deze wiki. Voer een zoekterm in, klik op de "
-#~ "getallen rechts, of op"
+#~ msgstr "Dit is het issue logboek van deze wiki. Voer een zoekterm in, klik op de getallen rechts, of op"
 
 #~ msgid "heading_wiki_issue_tracker"
 #~ msgstr "Issue logboek"
@@ -1565,10 +1482,7 @@
 #~ msgstr "gewijzigde eigenschappen"
 
 #~ msgid "backlinks_reparent_help"
-#~ msgstr ""
-#~ "U kunt de ouder(s) van deze pagina instellen om 'm een plaats in de "
-#~ "hiërarchie te geven. Vink één of meer hokjes aan of voer hier een "
-#~ "paginanaam in:"
+#~ msgstr "U kunt de ouder(s) van deze pagina instellen om 'm een plaats in de hiërarchie te geven. Vink één of meer hokjes aan of voer hier een paginanaam in:"
 
 #~ msgid "backlinks_reparent_help2"
 #~ msgstr "en klik dan op"

Modified: zope-zwiki/trunk/i18n/pl.po
===================================================================
--- zope-zwiki/trunk/i18n/pl.po	2007-04-08 14:54:05 UTC (rev 761)
+++ zope-zwiki/trunk/i18n/pl.po	2007-04-08 14:55:27 UTC (rev 762)
@@ -4,7 +4,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: ZWiki-0-31-0\n"
-"POT-Creation-Date: Sat Sep  2 18:10:16 2006\n"
+"POT-Creation-Date: Tue Mar 27 14:50:46 2007\n"
 "PO-Revision-Date: 2006-02-26 09:03+0000\n"
 "Last-Translator: Jakub Wiśniowski <klippe at pf.pl>\n"
 "Language-Team: Polish <pl at li.org>\n"
@@ -17,46 +17,40 @@
 "Domain: zwiki\n"
 "X-Generator: PajÄ…czek 5.2.0 Pro - testowy :(\n"
 
-#: src/ZWiki/Admin.py:62
+#: src/ZWiki/Admin.py:58
 msgid "You are not authorized to upgrade all pages."
 msgstr "Nie masz autoryzacji do zmian wszystkich stron"
 
-#: src/ZWiki/Admin.py:63
+#: src/ZWiki/Admin.py:59
 msgid "(folder -> Manage properties)"
 msgstr "(katalog -> zarządzanie właściwościami"
 
-#: src/ZWiki/Diff.py:174
+#: src/ZWiki/Diff.py:179
 #, fuzzy
 msgid "You are not authorized to reparent this ZWiki Page."
 msgstr "Nie masz odpowiednich praw do zmiany nazwy tej strony ZWiki"
 
-#: src/ZWiki/Diff.py:180 src/ZWiki/plugins/tracker/tracker.py:332
+#: src/ZWiki/Diff.py:185 src/ZWiki/plugins/tracker/tracker.py:333
 msgid "You are not authorized to rename this ZWiki Page."
 msgstr "Nie masz odpowiednich praw do zmiany nazwy tej strony ZWiki"
 
-#: src/ZWiki/Editing.py:156 src/ZWiki/Editing.py:294 src/ZWiki/Views.py:332
-#: src/ZWiki/Views.py:435 src/ZWiki/plugins/tracker/tracker.py:321
-msgid ""
-"Sorry, this wiki doesn't allow anonymous edits. Please configure a username "
-"in options first."
+#: src/ZWiki/Editing.py:156 src/ZWiki/Editing.py:294 src/ZWiki/Views.py:336
+#: src/ZWiki/Views.py:439 src/ZWiki/plugins/tracker/tracker.py:322
+msgid "Sorry, this wiki doesn't allow anonymous edits. Please configure a username in options first."
 msgstr ""
 
 #: src/ZWiki/Editing.py:327
-msgid ""
-"You are not authorized to reparent or change subtopics links on this ZWiki "
-"Page."
-msgstr ""
-"Nie masz odpowiednich praw do zmiany lub dodania tematu odnośnika na tej "
-"stronie ZWiki"
+msgid "You are not authorized to reparent or change subtopics links on this ZWiki Page."
+msgstr "Nie masz odpowiednich praw do zmiany lub dodania tematu odnośnika na tej stronie ZWiki"
 
 #: src/ZWiki/Editing.py:349
 msgid "You are not authorized to change this ZWiki Page's type."
 msgstr "Nie masz odpowiednich praw do zmiany czcionki na tej stronie ZWiki"
 
 #: src/ZWiki/Editing.py:383 src/ZWiki/Editing.py:410
-#: src/ZWiki/plugins/tracker/tracker.py:340
-#: src/ZWiki/plugins/tracker/tracker.py:347
-#: src/ZWiki/plugins/tracker/tracker.py:354
+#: src/ZWiki/plugins/tracker/tracker.py:344
+#: src/ZWiki/plugins/tracker/tracker.py:351
+#: src/ZWiki/plugins/tracker/tracker.py:358
 msgid "You are not authorized to edit this ZWiki Page."
 msgstr "Nie masz odpowiednich praw do edycji tej strony ZWiki"
 
@@ -65,11 +59,8 @@
 msgstr "Nie masz odpowiednich praw do skasowania tej strony ZWiki"
 
 #: src/ZWiki/Editing.py:563
-msgid ""
-"This page was renamed to %s. You can delete this one if no longer needed.\n"
-msgstr ""
-"Ta strona zmieniła nazwę na %s. Możesz ją skasować gdy nie będzie już "
-"potrzebna.\n"
+msgid "This page was renamed to %s. You can delete this one if no longer needed.\n"
+msgstr "Ta strona zmieniła nazwę na %s. Możesz ją skasować gdy nie będzie już potrzebna.\n"
 
 #: src/ZWiki/Editing.py:659
 msgid "You are not authorized to upload files here."
@@ -89,9 +80,7 @@
 
 #: src/ZWiki/Editing.py:830
 #, fuzzy
-msgid ""
-"your edit contained a banned link pattern. Please contact the site "
-"administrator for help."
+msgid "your edit contained a banned link pattern. Please contact the site administrator for help."
 msgstr "twój wpisa zawierał zabroniony wzór linku"
 
 #: src/ZWiki/Editing.py:841
@@ -99,10 +88,7 @@
 msgstr "przekroczona maksymalna liczba anonimowych linków"
 
 #: src/ZWiki/Editing.py:842
-msgid ""
-"adding of external links by unidentified users is restricted. Please back up "
-"and remove some of the http urls you added, or contact the site "
-"administrator for help."
+msgid "adding of external links by unidentified users is restricted. Please back up and remove some of the http urls you added, or contact the site administrator for help."
 msgstr ""
 
 #: src/ZWiki/Editing.py:853
@@ -111,85 +97,86 @@
 msgstr "przekroczona maksymalna liczba anonimowych linków"
 
 #: src/ZWiki/Editing.py:854
-msgid ""
-"adding of external links is restricted, even for identified users. Please "
-"back up and remove some of the http urls you added, or contact the site "
-"administrator for help."
+msgid "adding of external links is restricted, even for identified users. Please back up and remove some of the http urls you added, or contact the site administrator for help."
 msgstr ""
 
-#: src/ZWiki/Mail.py:506 src/ZWiki/skins/dtmlmessages.pt:58
+#: src/ZWiki/Mail.py:506 src/ZWiki/skins/dtmlmessages.pt:60
 msgid "anonymous"
 msgstr "anonimowy"
 
-#: src/ZWiki/OutlineSupport.py:843 src/ZWiki/skins/zwiki/links.pt:56
+#: src/ZWiki/OutlineSupport.py:378
+msgid "Sorry, this wiki doesn't allow anonymous reparenting. Please configure a username in options first."
+msgstr ""
+
+#: src/ZWiki/OutlineSupport.py:878 src/ZWiki/skins/zwiki/links.pt:56
 msgid "which pages link to this one ?"
 msgstr "które strony odnoszą się do tej strony?"
 
-#: src/ZWiki/OutlineSupport.py:851
+#: src/ZWiki/OutlineSupport.py:886
 msgid "You are here"
 msgstr "JesteÅ› tutaj"
 
-#: src/ZWiki/Utils.py:465
+#: src/ZWiki/Utils.py:487
 msgid "years"
 msgstr "lat temu"
 
-#: src/ZWiki/Utils.py:465
+#: src/ZWiki/Utils.py:487
 msgid "year"
 msgstr "rok"
 
-#: src/ZWiki/Utils.py:467
+#: src/ZWiki/Utils.py:489
 msgid "month"
 msgstr "miesiÄ…c"
 
-#: src/ZWiki/Utils.py:467
+#: src/ZWiki/Utils.py:489
 msgid "months"
 msgstr "miesięcy temu"
 
-#: src/ZWiki/Utils.py:469
+#: src/ZWiki/Utils.py:491
 msgid "weeks"
 msgstr "tygodnie"
 
-#: src/ZWiki/Utils.py:469
+#: src/ZWiki/Utils.py:491
 msgid "week"
 msgstr "tydzień temu"
 
-#: src/ZWiki/Utils.py:471
+#: src/ZWiki/Utils.py:493
 msgid "day"
 msgstr "dzień temu"
 
-#: src/ZWiki/Utils.py:471
+#: src/ZWiki/Utils.py:493
 msgid "days"
 msgstr "dni temu"
 
-#: src/ZWiki/Utils.py:473
+#: src/ZWiki/Utils.py:495
 msgid "hours"
 msgstr "godzin temu"
 
-#: src/ZWiki/Utils.py:473
+#: src/ZWiki/Utils.py:495
 msgid "hour"
 msgstr "godzinÄ™ temu"
 
-#: src/ZWiki/Utils.py:475
+#: src/ZWiki/Utils.py:497
 msgid "minute"
 msgstr "minutÄ™ temu"
 
-#: src/ZWiki/Utils.py:475
+#: src/ZWiki/Utils.py:497
 msgid "minutes"
 msgstr "minut temu"
 
-#: src/ZWiki/Utils.py:477
+#: src/ZWiki/Utils.py:499
 msgid "second"
 msgstr "sekundÄ™ temu"
 
-#: src/ZWiki/Utils.py:477
+#: src/ZWiki/Utils.py:499
 msgid "seconds"
 msgstr "sekund temu"
 
-#: src/ZWiki/Views.py:346
+#: src/ZWiki/Views.py:350
 msgid "Page is locked"
 msgstr "Strona jest zablokowana"
 
-#: src/ZWiki/Views.py:357
+#: src/ZWiki/Views.py:361
 msgid ""
 "\n"
 "            This page has a webDAV lock. Someone is probably editing it\n"
@@ -200,70 +187,66 @@
 "            "
 msgstr ""
 "\n"
-"            Ta strona posiada blokadÄ™ webDAV. KtoÅ› prawdopodobnie edytuje "
-"jÄ…\n"
+"            Ta strona posiada blokadÄ™ webDAV. KtoÅ› prawdopodobnie edytuje jÄ…\n"
 "           zewnętrznym edytorem.  Musisz poczekać dopóki nie skończy\n"
-"           i powtórnie spróbować jeszcze raz. Jeśli dokonałeś jakichś "
-"ważnych\n"
+"           i powtórnie spróbować jeszcze raz. Jeśli dokonałeś jakichś ważnych\n"
 "            zmian możesz chcieć zarchiwizować i skopiować swoją wersję\n"
 "           dla przyszłego wykorzystania.\n"
 "            "
 
-#: src/ZWiki/Views.py:364
+#: src/ZWiki/Views.py:368
 msgid "To discard your changes and try again, click OK."
 msgstr "Aby odrzucić dokonane zmiany i spróbować jeszcze raz naciśnij OK"
 
-#: src/ZWiki/Views.py:393
+#: src/ZWiki/Views.py:397
 msgid "Edit conflict"
 msgstr "Konflikt edycji"
 
-#: src/ZWiki/Views.py:413
+#: src/ZWiki/Views.py:417
 msgid "Someone else has saved this page while you were editing"
 msgstr "Ktoś zapisał zmiany na tej stronie podczas gdy ją edytowałeś"
 
-#: src/ZWiki/Views.py:414
+#: src/ZWiki/Views.py:418
 msgid "To resolve the conflict, do this"
 msgstr "aby rozwiązać problem, wykonaj następujące kroki"
 
-#: src/ZWiki/Views.py:415
+#: src/ZWiki/Views.py:419
 msgid "Click your browser's back button"
 msgstr "W swojej przeglądarce naciśnij przycisk wstecz"
 
-#: src/ZWiki/Views.py:416
+#: src/ZWiki/Views.py:420
 msgid "Copy your recent edits to the clipboard"
 msgstr "Skopiuj wprowadzone przez siebie zmiany do schowka"
 
-#: src/ZWiki/Views.py:417
+#: src/ZWiki/Views.py:421
 msgid "Click your browser's refresh button"
 msgstr "W swojej przeglądarce naciśnij przycisk odswież"
 
-#: src/ZWiki/Views.py:418
+#: src/ZWiki/Views.py:422
 msgid "Paste in your edits again, being mindful of the latest changes"
 msgstr "Wklej swoje zmiany uważając na dokonane przez kogoś innego modyfikacje"
 
-#: src/ZWiki/Views.py:419
+#: src/ZWiki/Views.py:423
 msgid "Click the Change button again"
 msgstr "Ponownie naciśnij przycisk Zmień"
 
-#: src/ZWiki/Views.py:420 src/ZWiki/skins/zwiki/editform.pt:163
+#: src/ZWiki/Views.py:424 src/ZWiki/skins/zwiki/editform.pt:163
 msgid "or"
 msgstr "lub"
 
-#: src/ZWiki/Views.py:421
+#: src/ZWiki/Views.py:425
 msgid "To discard your changes and start again, click OK"
 msgstr "Aby anulować zmiany i rozpocząć ponownie, wciśnij OK"
 
-#: src/ZWiki/Views.py:490
+#: src/ZWiki/Views.py:501
 #, fuzzy
 msgid ""
 "\n"
-"        Access keys can be accessed in mozilla-based browsers by pressing "
-"alt-<key>\n"
+"        Access keys can be accessed in mozilla-based browsers by pressing alt-<key>\n"
 "        IE users: must also press enter\n"
 "        Mac users: command-<key>\n"
 "        Opera users: shift-escape-<key>\n"
-"        These won't work here, back up to the previous page to try them "
-"out.\n"
+"        These won't work here, back up to the previous page to try them out.\n"
 "\n"
 "        0    show these access key assignments\n"
 "\n"
@@ -279,10 +262,8 @@
 "        s    go to search field\n"
 "        \n"
 "        page functions:\n"
-"        +    (in a plone/cmf site with skin switching set up) use zwiki's "
-"plone/cmf skin\n"
-"        -    (in a plone/cmf site with skin switching set up) use zwiki's "
-"standard skin\n"
+"        +    (in a plone/cmf site with skin switching set up) use zwiki's plone/cmf skin\n"
+"        -    (in a plone/cmf site with skin switching set up) use zwiki's standard skin\n"
 "        v    view page\n"
 "        m    mail subscription\n"
 "        b    show backlinks (links to this page)\n"
@@ -351,33 +332,32 @@
 "        p    Poprzednia edycja\n"
 "        "
 
-#: src/ZWiki/Wikis.py:49
-msgid "Unknown wiki type"
-msgstr ""
-
-#: src/ZWiki/ZWikiPage.py:675
+#: src/ZWiki/ZWikiPage.py:744
 msgid "create this page"
 msgstr "utwórz tą stronę"
 
-#: src/ZWiki/ZWikiPage.py:798 src/ZWiki/ZWikiPage.py:814
-#: src/ZWiki/ZWikiPage.py:817
+#: src/ZWiki/ZWikiPage.py:872 src/ZWiki/ZWikiPage.py:887
 msgid "last edited %(interval)s ago"
 msgstr "ostatnia modyfikacja: %(interval)s"
 
-#: src/ZWiki/ZWikiPage.py:809
+#: src/ZWiki/ZWikiPage.py:882
 #, fuzzy
 msgid "show last edit"
 msgstr "ostatnia edycja: %(lastlog)s"
 
-#: src/ZWiki/ZWikiPage.py:826 src/ZWiki/ZWikiPage.py:828
+#: src/ZWiki/ZWikiPage.py:897 src/ZWiki/ZWikiPage.py:899
 msgid "by %(editor)s"
 msgstr "przez %(editor)s"
 
-#: src/ZWiki/__init__.py:34
+#: src/ZWiki/__init__.py:200
+msgid "Unknown wiki type"
+msgstr ""
+
+#: src/ZWiki/__init__.py:39
 msgid "No need to add a Zwiki Outline Cache"
 msgstr ""
 
-#: src/ZWiki/__init__.py:35
+#: src/ZWiki/__init__.py:40
 msgid ""
 "Zwiki Outline Cache appears in the ZMI Add menu\n"
 "        for implementation reasons, but should not be added directly.\n"
@@ -389,6 +369,10 @@
 msgid "comments"
 msgstr "komentarze"
 
+#: src/ZWiki/pagetypes/html.py:50 src/ZWiki/pagetypes/rst.py:85
+msgid "reply"
+msgstr "odpowiedź"
+
 #: src/ZWiki/pagetypes/moin.py:1990
 msgid "Expected \"=\" to follow \"%(token)s\""
 msgstr ""
@@ -425,10 +409,6 @@
 msgid "Expected a color value \"%(arg)s\" after \"%(key)s\""
 msgstr "Spodziewana wartość koloru \"%(arg)\" po \"%(key)\""
 
-#: src/ZWiki/pagetypes/rst.py:85
-msgid "reply"
-msgstr "odpowiedź"
-
 #: src/ZWiki/plugins/latexwiki/wikis/latexwiki/diffform.pt:127
 #: src/ZWiki/plugins/mathaction/wikis/mathaction/old-diffform.pt:127
 msgid "full history"
@@ -505,7 +485,7 @@
 msgstr "tytuł"
 
 #: src/ZWiki/plugins/tracker/filterissues.pt:12
-#: src/ZWiki/skins/dtmlmessages.pt:30
+#: src/ZWiki/skins/dtmlmessages.pt:31
 msgid "Filter issues"
 msgstr "Szukaj spraw"
 
@@ -519,364 +499,352 @@
 msgid "Issue tracker"
 msgstr "rejestr spraw"
 
-#: src/ZWiki/plugins/tracker/tracker.py:361
+#: src/ZWiki/plugins/tracker/tracker.py:365
 #, fuzzy
 msgid "You are not authorized to comment on this ZWiki Page."
 msgstr "Nie masz odpowiednich praw do edycji tej strony ZWiki"
 
-#: src/ZWiki/skins/dtmlmessages.pt:10 src/ZWiki/skins/dtmlmessages.pt:32
+#: src/ZWiki/skins/dtmlmessages.pt:10 src/ZWiki/skins/dtmlmessages.pt:33
+msgid "name"
+msgstr "nazwa"
+
+#: src/ZWiki/skins/dtmlmessages.pt:11 src/ZWiki/skins/dtmlmessages.pt:34
 msgid "category"
 msgstr "kategoria"
 
-#: src/ZWiki/skins/dtmlmessages.pt:11 src/ZWiki/skins/dtmlmessages.pt:33
+#: src/ZWiki/skins/dtmlmessages.pt:12 src/ZWiki/skins/dtmlmessages.pt:35
 msgid "severity"
 msgstr "waga"
 
-#: src/ZWiki/skins/dtmlmessages.pt:12 src/ZWiki/skins/dtmlmessages.pt:34
+#: src/ZWiki/skins/dtmlmessages.pt:13 src/ZWiki/skins/dtmlmessages.pt:36
 msgid "status"
 msgstr "status"
 
-#: src/ZWiki/skins/dtmlmessages.pt:13 src/ZWiki/skins/dtmlmessages.pt:35
+#: src/ZWiki/skins/dtmlmessages.pt:14 src/ZWiki/skins/dtmlmessages.pt:37
 msgid "age"
 msgstr "wiek"
 
-#: src/ZWiki/skins/dtmlmessages.pt:14 src/ZWiki/skins/dtmlmessages.pt:36
+#: src/ZWiki/skins/dtmlmessages.pt:15 src/ZWiki/skins/dtmlmessages.pt:38
 msgid "modified"
 msgstr "zmodyfikowano"
 
-#: src/ZWiki/skins/dtmlmessages.pt:15
+#: src/ZWiki/skins/dtmlmessages.pt:16
 msgid "Add a new issue:"
 msgstr "Dodaj nowÄ… sprawÄ™:"
 
-#: src/ZWiki/skins/dtmlmessages.pt:16
+#: src/ZWiki/skins/dtmlmessages.pt:17
 msgid "Name:"
 msgstr "Nazwa"
 
-#: src/ZWiki/skins/dtmlmessages.pt:17
+#: src/ZWiki/skins/dtmlmessages.pt:18
 msgid "Category:"
 msgstr "Kategoria:"
 
-#: src/ZWiki/skins/dtmlmessages.pt:18
+#: src/ZWiki/skins/dtmlmessages.pt:19
 msgid "Severity:"
 msgstr "Waga:"
 
-#: src/ZWiki/skins/dtmlmessages.pt:19
-msgid "Status:"
-msgstr "Status:"
-
 #: src/ZWiki/skins/dtmlmessages.pt:2
 msgid "Here are the wiki's issue pages."
 msgstr "To jest rejestr spraw."
 
 #: src/ZWiki/skins/dtmlmessages.pt:20
+msgid "Status:"
+msgstr "Status:"
+
+#: src/ZWiki/skins/dtmlmessages.pt:21
 msgid "Details:"
 msgstr "Szczegóły:"
 
-#: src/ZWiki/skins/dtmlmessages.pt:21
+#: src/ZWiki/skins/dtmlmessages.pt:22
 msgid "add issue"
 msgstr "dodaj sprawÄ™"
 
-#: src/ZWiki/skins/dtmlmessages.pt:22
+#: src/ZWiki/skins/dtmlmessages.pt:23
 msgid "More advanced"
 msgstr "Przeszukaj"
 
-#: src/ZWiki/skins/dtmlmessages.pt:23
+#: src/ZWiki/skins/dtmlmessages.pt:24
 msgid "issue tracker"
 msgstr "rejestr spraw"
 
-#: src/ZWiki/skins/dtmlmessages.pt:24
+#: src/ZWiki/skins/dtmlmessages.pt:25
 msgid "search options"
 msgstr "określając zaawansowane parametry wyszukiwania"
 
-#: src/ZWiki/skins/dtmlmessages.pt:25
+#: src/ZWiki/skins/dtmlmessages.pt:26
 msgid "Name contains any of:"
 msgstr "Nazwa zawiera dowolne spośród:"
 
-#: src/ZWiki/skins/dtmlmessages.pt:26
+#: src/ZWiki/skins/dtmlmessages.pt:27
 msgid "Page text contains any of:"
 msgstr "Treść strony zawiera dowolne spośród:"
 
-#: src/ZWiki/skins/dtmlmessages.pt:27
+#: src/ZWiki/skins/dtmlmessages.pt:28
 msgid "Categories:"
 msgstr "Kategorie:"
 
-#: src/ZWiki/skins/dtmlmessages.pt:28
+#: src/ZWiki/skins/dtmlmessages.pt:29
 msgid "Severities:"
 msgstr "Wagi:"
 
-#: src/ZWiki/skins/dtmlmessages.pt:29
-msgid "Statuses:"
-msgstr "Statusy:"
-
 #: src/ZWiki/skins/dtmlmessages.pt:3
 #, fuzzy
 msgid "Enter a search term, click the numbers to the right,"
 msgstr "Określ parametry wyszukiwania, kliknij na numery po prawej lub"
 
-#: src/ZWiki/skins/dtmlmessages.pt:37
+#: src/ZWiki/skins/dtmlmessages.pt:30
+msgid "Statuses:"
+msgstr "Statusy:"
+
+#: src/ZWiki/skins/dtmlmessages.pt:39
 msgid "Submitted by"
 msgstr "Zatwierdzone przez"
 
-#: src/ZWiki/skins/dtmlmessages.pt:38
+#: src/ZWiki/skins/dtmlmessages.pt:4
+msgid "filter issues"
+msgstr "przeszukaj sprawy"
+
+#: src/ZWiki/skins/dtmlmessages.pt:40
 msgid "Name"
 msgstr "Nazwa"
 
-#: src/ZWiki/skins/dtmlmessages.pt:39
+#: src/ZWiki/skins/dtmlmessages.pt:41
 msgid "Category"
 msgstr "Kategoria"
 
-#: src/ZWiki/skins/dtmlmessages.pt:4
-msgid "filter issues"
-msgstr "przeszukaj sprawy"
-
-#: src/ZWiki/skins/dtmlmessages.pt:40
+#: src/ZWiki/skins/dtmlmessages.pt:42
 msgid "Severity"
 msgstr "Waga"
 
-#: src/ZWiki/skins/dtmlmessages.pt:41
+#: src/ZWiki/skins/dtmlmessages.pt:43
 msgid "Status"
 msgstr "Status"
 
-#: src/ZWiki/skins/dtmlmessages.pt:42
+#: src/ZWiki/skins/dtmlmessages.pt:44
 #, fuzzy
 msgid "Optional subject"
 msgstr "Opcjonalny temat"
 
-#: src/ZWiki/skins/dtmlmessages.pt:43
+#: src/ZWiki/skins/dtmlmessages.pt:45
 msgid "Optional comment"
 msgstr "Opcjonalna notatka"
 
-#: src/ZWiki/skins/dtmlmessages.pt:44 src/ZWiki/skins/dtmlmessages.pt:45
+#: src/ZWiki/skins/dtmlmessages.pt:46 src/ZWiki/skins/dtmlmessages.pt:47
 #, fuzzy
 msgid "Add ZWiki"
 msgstr "Dodaj stronÄ™ ZWiki"
 
-#: src/ZWiki/skins/dtmlmessages.pt:46
+#: src/ZWiki/skins/dtmlmessages.pt:48
 #, fuzzy
 msgid "Id:"
 msgstr "Id"
 
-#: src/ZWiki/skins/dtmlmessages.pt:47
+#: src/ZWiki/skins/dtmlmessages.pt:49
 #, fuzzy
 msgid "Title:"
 msgstr "Tytuł"
 
-#: src/ZWiki/skins/dtmlmessages.pt:48
+#: src/ZWiki/skins/dtmlmessages.pt:5
+msgid "browse open issues"
+msgstr ""
+
+#: src/ZWiki/skins/dtmlmessages.pt:50
 msgid "Template:"
 msgstr ""
 
-#: src/ZWiki/skins/dtmlmessages.pt:49
+#: src/ZWiki/skins/dtmlmessages.pt:51
 #, fuzzy
 msgid "Add wiki"
 msgstr "Dodaj stronÄ™ ZWiki"
 
-#: src/ZWiki/skins/dtmlmessages.pt:5
-msgid "browse open issues"
-msgstr ""
-
-#: src/ZWiki/skins/dtmlmessages.pt:50
+#: src/ZWiki/skins/dtmlmessages.pt:52
 msgid "Pages changed in the last"
 msgstr "Strony zmienione w trakcie ostatnich"
 
-#: src/ZWiki/skins/dtmlmessages.pt:51
+#: src/ZWiki/skins/dtmlmessages.pt:53
 msgid "Recently changed pages, with summaries"
 msgstr "Ostatnio zmienione strony z podsumowaniami"
 
-#: src/ZWiki/skins/dtmlmessages.pt:52
+#: src/ZWiki/skins/dtmlmessages.pt:54
 msgid "Show summaries ?"
 msgstr "Pokazać podsumowania?"
 
-#: src/ZWiki/skins/dtmlmessages.pt:53
+#: src/ZWiki/skins/dtmlmessages.pt:55
 msgid "Refresh"
 msgstr "Odśwież"
 
-#: src/ZWiki/skins/dtmlmessages.pt:54
+#: src/ZWiki/skins/dtmlmessages.pt:56
 msgid "Page"
 msgstr "Strona"
 
-#: src/ZWiki/skins/dtmlmessages.pt:55
+#: src/ZWiki/skins/dtmlmessages.pt:57
 msgid "Edited&nbsp;by"
 msgstr "Edytowana&nbsp;przez&nbsp;&nbsp;&nbsp;"
 
-#: src/ZWiki/skins/dtmlmessages.pt:56
+#: src/ZWiki/skins/dtmlmessages.pt:58
 msgid "Time"
 msgstr "Czas modyfikacji"
 
-#: src/ZWiki/skins/dtmlmessages.pt:57
+#: src/ZWiki/skins/dtmlmessages.pt:59
 msgid "NEW"
 msgstr "NOWA"
 
-#: src/ZWiki/skins/dtmlmessages.pt:59
-msgid "Pages marked (NEW) have been created within the last week"
-msgstr ""
-"Strony oznaczone jako (NOWA) zostały utworzone w trakcie ostatniego tygodnia"
-
 #: src/ZWiki/skins/dtmlmessages.pt:6
 msgid "search issues"
 msgstr "szukaj spraw"
 
-#: src/ZWiki/skins/dtmlmessages.pt:60
+#: src/ZWiki/skins/dtmlmessages.pt:61
+msgid "Pages marked (NEW) have been created within the last week"
+msgstr "Strony oznaczone jako (NOWA) zostały utworzone w trakcie ostatniego tygodnia"
+
+#: src/ZWiki/skins/dtmlmessages.pt:62
 msgid "Enter a word or phrase and hit enter to search the entire wiki."
 msgstr "Wpisz słowo lub frazę i naciśnij Enter aby przeszukać całe wiki."
 
-#: src/ZWiki/skins/dtmlmessages.pt:61
+#: src/ZWiki/skins/dtmlmessages.pt:63
 msgid "This is the same as using the search field at top right."
 msgstr "Działa to tak samo jak pole wyszukiwania w prawym górnym rogu."
 
-#: src/ZWiki/skins/dtmlmessages.pt:62
+#: src/ZWiki/skins/dtmlmessages.pt:64
 msgid "Tips: A single word works best for matching page names."
-msgstr ""
-"Rada: Wpisanie pojedynczego słowa pozwala szybko wyszukać odpowiadające mu "
-"nazwy stron."
+msgstr "Rada: Wpisanie pojedynczego słowa pozwala szybko wyszukać odpowiadające mu nazwy stron."
 
-#: src/ZWiki/skins/dtmlmessages.pt:63
-msgid ""
-"Case-insensitivity and wildcards may be supported depending on your catalog "
-"configuration."
-msgstr ""
-"Brak wrażliwości na wielkość liter i możliwość stosowania symboli "
-"wieloznacznych może być włączona - zależnie od konfiguracji katalogu."
+#: src/ZWiki/skins/dtmlmessages.pt:65
+msgid "Case-insensitivity and wildcards may be supported depending on your catalog configuration."
+msgstr "Brak wrażliwości na wielkość liter i możliwość stosowania symboli wieloznacznych może być włączona - zależnie od konfiguracji katalogu."
 
-#: src/ZWiki/skins/dtmlmessages.pt:64
+#: src/ZWiki/skins/dtmlmessages.pt:66
 msgid "Leave it blank to list all pages."
 msgstr "Pozostaw to pole puste aby wyszukać wszystkie strony."
 
-#: src/ZWiki/skins/dtmlmessages.pt:65 src/ZWiki/skins/dtmlmessages.pt:66
+#: src/ZWiki/skins/dtmlmessages.pt:67 src/ZWiki/skins/dtmlmessages.pt:68
 msgid "Search"
 msgstr "Szukaj"
 
-#: src/ZWiki/skins/dtmlmessages.pt:67
+#: src/ZWiki/skins/dtmlmessages.pt:69
 msgid "Page names matching"
 msgstr "PasujÄ…ce nazwy stron"
 
-#: src/ZWiki/skins/dtmlmessages.pt:68
+#: src/ZWiki/skins/dtmlmessages.pt:7
+msgid "recent"
+msgstr "najnowszych"
+
+#: src/ZWiki/skins/dtmlmessages.pt:70
 msgid "Text matching"
 msgstr "PasujÄ…cy tekst"
 
-#: src/ZWiki/skins/dtmlmessages.pt:69
+#: src/ZWiki/skins/dtmlmessages.pt:71
 msgid "Thorough (non-catalog) search for text matching"
 msgstr "Dokładnie (nie katalogowe) wyszukiwanie pasującego tekstu"
 
-#: src/ZWiki/skins/dtmlmessages.pt:7
-msgid "recent"
-msgstr "najnowszych"
-
-#: src/ZWiki/skins/dtmlmessages.pt:70
+#: src/ZWiki/skins/dtmlmessages.pt:72
 #, fuzzy
 msgid "Set your preferences for this wiki:"
 msgstr "Ustaw swoje preferencje dla tej strony:"
 
-#: src/ZWiki/skins/dtmlmessages.pt:71
+#: src/ZWiki/skins/dtmlmessages.pt:73
 msgid "User name:"
 msgstr "Nazwa użytkownika"
 
-#: src/ZWiki/skins/dtmlmessages.pt:72
-#, fuzzy
-msgid "(identifies your edits)"
-msgstr "identyfikuje Twoje zmiany"
+#: src/ZWiki/skins/dtmlmessages.pt:74
+msgid "(identifies your edits, saves your votes, may be required)"
+msgstr ""
 
-#: src/ZWiki/skins/dtmlmessages.pt:73
+#: src/ZWiki/skins/dtmlmessages.pt:75
 msgid "Email address:"
 msgstr "Adres e-mail:"
 
-#: src/ZWiki/skins/dtmlmessages.pt:74
+#: src/ZWiki/skins/dtmlmessages.pt:76
 #, fuzzy
 msgid "(allows mail subscription)"
 msgstr "Prenumerata e-mail"
 
-#: src/ZWiki/skins/dtmlmessages.pt:75
+#: src/ZWiki/skins/dtmlmessages.pt:77
 msgid "Your time zone:"
 msgstr "Twoja strefa czasowa"
 
-#: src/ZWiki/skins/dtmlmessages.pt:76
+#: src/ZWiki/skins/dtmlmessages.pt:78
 msgid "(localizes most times)"
 msgstr "(większość czasów lokalnych)"
 
-#: src/ZWiki/skins/dtmlmessages.pt:77
+#: src/ZWiki/skins/dtmlmessages.pt:79
 #, fuzzy
 msgid "Edit form height:"
 msgstr "Rozmiary formularza edycyjnego"
 
-#: src/ZWiki/skins/dtmlmessages.pt:78
+#: src/ZWiki/skins/dtmlmessages.pt:8
+msgid "all"
+msgstr "w sumie"
+
+#: src/ZWiki/skins/dtmlmessages.pt:80
 msgid "(adjusts form size)"
 msgstr "(dostosowuje rozmiar formatki)"
 
-#: src/ZWiki/skins/dtmlmessages.pt:79
+#: src/ZWiki/skins/dtmlmessages.pt:81
 msgid "Save options"
 msgstr "Zapisz zmiany"
 
-#: src/ZWiki/skins/dtmlmessages.pt:8
-msgid "all"
-msgstr "w sumie"
-
-#: src/ZWiki/skins/dtmlmessages.pt:80
+#: src/ZWiki/skins/dtmlmessages.pt:82
 msgid "Forget options"
 msgstr "Odrzuć zmiany"
 
-#: src/ZWiki/skins/dtmlmessages.pt:81 src/ZWiki/skins/dtmlmessages.pt:82
+#: src/ZWiki/skins/dtmlmessages.pt:83 src/ZWiki/skins/dtmlmessages.pt:84
 msgid "Add ZWiki Page"
 msgstr "Dodaj stronÄ™ ZWiki"
 
-#: src/ZWiki/skins/dtmlmessages.pt:83
+#: src/ZWiki/skins/dtmlmessages.pt:85
 #, fuzzy
 msgid "Page&nbsp;name:"
 msgstr "Nazwa strony"
 
-#: src/ZWiki/skins/dtmlmessages.pt:84
+#: src/ZWiki/skins/dtmlmessages.pt:86
 #, fuzzy
 msgid "Add wiki page"
 msgstr "Dodaj stronÄ™ ZWiki"
 
-#: src/ZWiki/skins/dtmlmessages.pt:85
+#: src/ZWiki/skins/dtmlmessages.pt:87
 msgid "Topic"
 msgstr "Temat"
 
-#: src/ZWiki/skins/dtmlmessages.pt:86
+#: src/ZWiki/skins/dtmlmessages.pt:88
 msgid "Last updated"
 msgstr "Ostatnio uaktualnione"
 
-#: src/ZWiki/skins/dtmlmessages.pt:87
+#: src/ZWiki/skins/dtmlmessages.pt:89
 msgid "Comments"
 msgstr "Komentarze"
 
-#: src/ZWiki/skins/dtmlmessages.pt:88
+#: src/ZWiki/skins/dtmlmessages.pt:9 src/ZWiki/skins/dtmlmessages.pt:32
+msgid "#"
+msgstr "Lp."
+
+#: src/ZWiki/skins/dtmlmessages.pt:90
 msgid "Views"
 msgstr "Widoki"
 
-#: src/ZWiki/skins/dtmlmessages.pt:89
+#: src/ZWiki/skins/dtmlmessages.pt:91
 msgid "Created"
 msgstr "Utworzono"
 
-#: src/ZWiki/skins/dtmlmessages.pt:9 src/ZWiki/skins/dtmlmessages.pt:31
-msgid "#"
-msgstr "Lp."
-
-#: src/ZWiki/skins/dtmlmessages.pt:90 src/ZWiki/skins/dtmlmessages.pt:92
+#: src/ZWiki/skins/dtmlmessages.pt:92 src/ZWiki/skins/dtmlmessages.pt:94
 msgid "by"
 msgstr "przez"
 
-#: src/ZWiki/skins/dtmlmessages.pt:91
+#: src/ZWiki/skins/dtmlmessages.pt:93
 msgid "<dtml-var lasteditinterval> ago</dtml-var>"
 msgstr "<dtml-var lasteditinterval> temu</dtml-var>"
 
-#: src/ZWiki/skins/dtmlmessages.pt:93
+#: src/ZWiki/skins/dtmlmessages.pt:95
 msgid "on"
 msgstr "na"
 
-#: src/ZWiki/skins/zwiki/backlinks.pt:108
-msgid "Subtopics"
-msgstr "Podtematy"
-
-#: src/ZWiki/skins/zwiki/backlinks.pt:111
-msgid "This page has no subtopics."
-msgstr "Ta strona nie ma rejestru spraw."
-
-#: src/ZWiki/skins/zwiki/backlinks.pt:114
+#: src/ZWiki/skins/zwiki/backlinks.pt:102
 #, fuzzy
 msgid "Here are it's subtopics."
 msgstr "Tu sÄ… podtematy:"
 
-#: src/ZWiki/skins/zwiki/backlinks.pt:117
+#: src/ZWiki/skins/zwiki/backlinks.pt:105
 #, fuzzy
 msgid "You can reorder them by clicking the ^ buttons."
 msgstr "Możesz zmienić kolejność spraw klikając w przyciski ^"
@@ -891,66 +859,64 @@
 msgid "Parents"
 msgstr "Rodzice"
 
-#: src/ZWiki/skins/zwiki/backlinks.pt:31
+#: src/ZWiki/skins/zwiki/backlinks.pt:28
 msgid "is a top-level topic."
 msgstr "to jest temat główny."
 
-#: src/ZWiki/skins/zwiki/backlinks.pt:32
+#: src/ZWiki/skins/zwiki/backlinks.pt:29
 msgid "is a subtopic of:"
 msgstr "to jest drugi temat z:"
 
-#: src/ZWiki/skins/zwiki/backlinks.pt:55
+#: src/ZWiki/skins/zwiki/backlinks.pt:48
 #, fuzzy
 msgid "Backlinks"
 msgstr "Łącza wsteczne"
 
-#: src/ZWiki/skins/zwiki/backlinks.pt:56
+#: src/ZWiki/skins/zwiki/backlinks.pt:49
 msgid "Here are the pages which link to it:"
 msgstr "Strony, które odnoszą się do tej strony:"
 
-#: src/ZWiki/skins/zwiki/backlinks.pt:57
+#: src/ZWiki/skins/zwiki/backlinks.pt:50
 #, fuzzy
 msgid "No other pages link to this one."
 msgstr "Żadne inne strony nie odnoszą sie do tej."
 
-#: src/ZWiki/skins/zwiki/backlinks.pt:82
-msgid ""
-"You can set this page's parent(s) to place it within the overall page "
-"hierarchy."
+#: src/ZWiki/skins/zwiki/backlinks.pt:70
+msgid "You can set this page's parent(s) to place it within the overall page hierarchy."
 msgstr ""
 
-#: src/ZWiki/skins/zwiki/backlinks.pt:85
-msgid ""
-"Check one or more checkboxes or enter a page name here, and click the button."
+#: src/ZWiki/skins/zwiki/backlinks.pt:73
+msgid "Check one or more checkboxes or enter a page name here, and click the button."
 msgstr ""
 
-#: src/ZWiki/skins/zwiki/backlinks.pt:88
+#: src/ZWiki/skins/zwiki/backlinks.pt:76
 msgid "Enter a page name here and click the button."
 msgstr ""
 
-#: src/ZWiki/skins/zwiki/backlinks.pt:91
-msgid ""
-"You can type just the first few letters, case and punctuation are ignored."
+#: src/ZWiki/skins/zwiki/backlinks.pt:79
+msgid "You can type just the first few letters, case and punctuation are ignored."
 msgstr ""
 
-#: src/ZWiki/skins/zwiki/backlinks.pt:98
+#: src/ZWiki/skins/zwiki/backlinks.pt:86
 msgid "Reparent"
 msgstr "Zmień rodzica"
 
+#: src/ZWiki/skins/zwiki/backlinks.pt:96
+msgid "Subtopics"
+msgstr "Podtematy"
+
+#: src/ZWiki/skins/zwiki/backlinks.pt:99
+msgid "This page has no subtopics."
+msgstr "Ta strona nie ma rejestru spraw."
+
 #: src/ZWiki/skins/zwiki/badtemplate.pt:12
 msgid "Bad template"
 msgstr ""
 
 #: src/ZWiki/skins/zwiki/badtemplate.pt:13
 #, fuzzy
-msgid ""
-"There was a problem locating one of this wiki's skin templates. There may be "
-"a page or other non-page-template/non-dtml-method object with the same ID, "
-"obscuring the template. Or the template may be missing on the filesystem (an "
-"incomplete Zwiki installation)."
-msgstr ""
-"Wystąpił problem z szablonami skórki wiki. Być może ID obiektu skórki nie "
-"jest szablonem lub stroną DTML lub szablon został skasowany."
+msgid "There was a problem locating one of this wiki's skin templates. There may be a page or other non-page-template/non-dtml-method object with the same ID, obscuring the template. Or the template may be missing on the filesystem (an incomplete Zwiki installation)."
+msgstr "Wystąpił problem z szablonami skórki wiki. Być może ID obiektu skórki nie jest szablonem lub stroną DTML lub szablon został skasowany."
 
 #: src/ZWiki/skins/zwiki/commentform.pt:21
 msgid "subject"
@@ -966,8 +932,7 @@
 
 #: src/ZWiki/skins/zwiki/commentform.pt:36
 msgid "to comment (and cc any subscribers) enter text here and click add"
-msgstr ""
-"aby skomentować (z kopią dla prenumeratorów) wprowadź tekst i kliknij dodaj"
+msgstr "aby skomentować (z kopią dla prenumeratorów) wprowadź tekst i kliknij dodaj"
 
 #: src/ZWiki/skins/zwiki/commentform.pt:56
 msgid "${nb} subscribers"
@@ -982,12 +947,20 @@
 msgid "add-comment"
 msgstr "Dodaj komentarz"
 
-#: src/ZWiki/skins/zwiki/contentspage.pt:12
+#: src/ZWiki/skins/zwiki/contentspage.pt:10
+#: src/ZWiki/skins/zwiki/contentspage.pt:27
+#, fuzzy
+msgid "Wiki contents for"
+msgstr "Zawartość wiki"
+
+#: src/ZWiki/skins/zwiki/contentspage.pt:13
+#: src/ZWiki/skins/zwiki/contentspage.pt:30
 msgid "Wiki contents"
 msgstr "Zawartość wiki"
 
-#: src/ZWiki/skins/zwiki/contentspage.pt:16
-msgid "Singletons"
+#: src/ZWiki/skins/zwiki/contentspage.pt:40
+#, fuzzy
+msgid "Singletons:"
 msgstr "Pojedyncze strony"
 
 #: src/ZWiki/skins/zwiki/denied.pt:12
@@ -1075,14 +1048,14 @@
 msgstr ""
 
 #: src/ZWiki/skins/zwiki/editform.pt:178
+msgid "Preview"
+msgstr "PodglÄ…d"
+
+#: src/ZWiki/skins/zwiki/editform.pt:178
 #, fuzzy
 msgid "preview this edit"
 msgstr "podglÄ…d tej edycji"
 
-#: src/ZWiki/skins/zwiki/editform.pt:178
-msgid "Preview"
-msgstr "PodglÄ…d"
-
 #: src/ZWiki/skins/zwiki/editform.pt:183
 msgid "Cancel"
 msgstr "Anuluj"
@@ -1118,13 +1091,18 @@
 msgstr "nazwa tej strony wiwki (zmiana nazwy może trwać długo)"
 
 #: src/ZWiki/skins/zwiki/editform.pt:71
-msgid "type"
-msgstr "format"
+msgid "markup"
+msgstr ""
 
 #: src/ZWiki/skins/zwiki/editform.pt:72
 msgid "select the formatting and rendering style for this page"
 msgstr "wybierz formatowanie i styl wyświetlania tej strony"
 
+#: src/ZWiki/skins/zwiki/helppage.pt:12
+#, fuzzy
+msgid "Help page"
+msgstr "Strona z pomocÄ…"
+
 #: src/ZWiki/skins/zwiki/links.pt:102
 msgid "(external edit)"
 msgstr "(zewnętrzny edytor)"
@@ -1203,8 +1181,7 @@
 
 #: src/ZWiki/skins/zwiki/links.pt:63
 msgid "configure email subscription to this page or site"
-msgstr ""
-"konfiguracja skrzynki e-mail dla prenumeraty tej strony lub całej witryny"
+msgstr "konfiguracja skrzynki e-mail dla prenumeraty tej strony lub całej witryny"
 
 #: src/ZWiki/skins/zwiki/links.pt:73
 msgid "subscribe"
@@ -1263,25 +1240,21 @@
 
 #: src/ZWiki/skins/zwiki/pagemanagementform.pt:40
 msgid "enter a page name and click buttons to the right (mouse over for help)"
-msgstr ""
-"wprowadź nazwę strony i kliknij przyciski po prawej (najedź myszką by "
-"uzyskać pomoc)"
+msgstr "wprowadź nazwę strony i kliknij przyciski po prawej (najedź myszką by uzyskać pomoc)"
 
 #: src/ZWiki/skins/zwiki/pagemanagementform.pt:45
 #, fuzzy
-msgid "reparent"
-msgstr "Zmień rodzica"
+msgid "make this page a subtopic of the page you have entered"
+msgstr "Uczyń stronę której nazwę wpisałeś rodzicem bieżącej strony"
 
 #: src/ZWiki/skins/zwiki/pagemanagementform.pt:45
 #, fuzzy
-msgid "make this page a subtopic of the page you have entered"
-msgstr "Uczyń stronę której nazwę wpisałeś rodzicem bieżącej strony"
+msgid "reparent"
+msgstr "Zmień rodzica"
 
 #: src/ZWiki/skins/zwiki/pagemanagementform.pt:50
 msgid "rename this page to the name you have entered, updating all links"
-msgstr ""
-"Zmień nazwę strony na taką jaką wpisałeś (wszystkie odnośniki zostaną "
-"zaktualizowane)"
+msgstr "Zmień nazwę strony na taką jaką wpisałeś (wszystkie odnośniki zostaną zaktualizowane)"
 
 #: src/ZWiki/skins/zwiki/pagemanagementform.pt:50
 msgid "rename"
@@ -1293,16 +1266,13 @@
 
 #: src/ZWiki/skins/zwiki/pagemanagementform.pt:55
 #, fuzzy
-msgid ""
-"delete this page, and redirect links to the page you have entered, if any"
+msgid "delete this page, and redirect links to the page you have entered, if any"
 msgstr "Uczyń stronę której nazwę wpisałeś rodzicem bieżącej strony"
 
 #: src/ZWiki/skins/zwiki/pagemanagementform.pt:60
 #, fuzzy
 msgid "create a page with the name you have entered, as a subtopic of this one"
-msgstr ""
-"Zmień nazwę strony na taką jaką wpisałeś (wszystkie odnośniki zostaną "
-"zaktualizowane)"
+msgstr "Zmień nazwę strony na taką jaką wpisałeś (wszystkie odnośniki zostaną zaktualizowane)"
 
 #: src/ZWiki/skins/zwiki/pagemanagementform.pt:60
 msgid "create"
@@ -1433,9 +1403,15 @@
 msgid "User options"
 msgstr "określając zaawansowane parametry wyszukiwania"
 
+#, fuzzy
+#~ msgid "(identifies your edits)"
+#~ msgstr "identyfikuje Twoje zmiany"
+
+#~ msgid "type"
+#~ msgstr "format"
+
 #~ msgid "adding of external links by anonymous authors is restricted"
-#~ msgstr ""
-#~ "dodawanie zewnętrznych linków przez anonimowych autorów jest zabronione"
+#~ msgstr "dodawanie zewnętrznych linków przez anonimowych autorów jest zabronione"
 
 #~ msgid "Add a ZWiki web"
 #~ msgstr "Dodaj witrynÄ™ ZWiki"
@@ -1449,14 +1425,8 @@
 #~ msgid "and enter"
 #~ msgstr "i wprowadź"
 
-#~ msgid ""
-#~ "You may create a new ZWiki Page object using the form below. You may also "
-#~ "choose to upload an existing html file from your local computer by "
-#~ "clicking the <i>Browse</i> button."
-#~ msgstr ""
-#~ "Możesz stworzyć nową stronę ZWiki korzystając z poniższego formularza. "
-#~ "Możesz także wczytać istniejący plik html ze swojego komputera, "
-#~ "wybierajÄ…c przycisk <i>Browse</i>"
+#~ msgid "You may create a new ZWiki Page object using the form below. You may also choose to upload an existing html file from your local computer by clicking the <i>Browse</i> button."
+#~ msgstr "Możesz stworzyć nową stronę ZWiki korzystając z poniższego formularza. Możesz także wczytać istniejący plik html ze swojego komputera, wybierając przycisk <i>Browse</i>"
 
 #~ msgid "File"
 #~ msgstr "Plik"
@@ -1475,8 +1445,7 @@
 #~ msgstr "Odnośniki powrotne dla"
 
 #~ msgid "singleton_desc"
-#~ msgstr ""
-#~ "Pojedyncze strony to strony, które nie są połączone z innymi stronami."
+#~ msgstr "Pojedyncze strony to strony, które nie są połączone z innymi stronami."
 
 #~ msgid "History for"
 #~ msgstr "Historia dla"
@@ -1485,24 +1454,19 @@
 #~ msgstr "powrót do strony"
 
 #~ msgid "help_shortname"
-#~ msgstr ""
-#~ "Zmiana nazwy strony w dużym wiki może trwać długo. Spowodowane jest to "
-#~ "akutalizowaniem tej nazwy na innych stronach."
+#~ msgstr "Zmiana nazwy strony w dużym wiki może trwać długo. Spowodowane jest to akutalizowaniem tej nazwy na innych stronach."
 
 #~ msgid "label_body_text"
 #~ msgstr "Treść strony"
 
 #~ msgid "help_wikibody"
 #~ msgstr ""
-#~ "Na Stronach Wiki do tworzenia odnośników używa się [nawiasów "
-#~ "kwadratowych]. Po zapisaniu strony,\n"
+#~ "Na Stronach Wiki do tworzenia odnośników używa się [nawiasów kwadratowych]. Po zapisaniu strony,\n"
 #~ "za nawiasami kwadratowymi pojawi się mały odnośnik <code>?</code>.\n"
-#~ "Po jego naciśnięciu zostanie utworzona nowa strona o nazwie takiej jak "
-#~ "wpisana wewnątrz nawiasów kwadratowych."
+#~ "Po jego naciśnięciu zostanie utworzona nowa strona o nazwie takiej jak wpisana wewnątrz nawiasów kwadratowych."
 
 #~ msgid "help_wikiwords"
-#~ msgstr ""
-#~ "To wiki umożliwia również wykorzystanie SłówWiki do tworzenia odnośników."
+#~ msgstr "To wiki umożliwia również wykorzystanie SłówWiki do tworzenia odnośników."
 
 #~ msgid "label_note"
 #~ msgstr "Notatka do historii zmian strony (opcjonalna)"
@@ -1535,9 +1499,7 @@
 #~ "        \"${pagename}\""
 
 #~ msgid "description_edit_wiki_page"
-#~ msgstr ""
-#~ "Strony Wiki pozwalają w łatwy sposób utworzyć zbiór połączonych ze sobą "
-#~ "stron."
+#~ msgstr "Strony Wiki pozwalają w łatwy sposób utworzyć zbiór połączonych ze sobą stron."
 
 #~ msgid "legend_wiki_page_details"
 #~ msgstr "Szczegóły strony"
@@ -1699,12 +1661,8 @@
 #~ msgid "Details & comments"
 #~ msgstr "Detale i komentarze"
 
-#~ msgid ""
-#~ "no catalog or the catalog search gave an error, a brute-force search was "
-#~ "used"
-#~ msgstr ""
-#~ "brak katalogu lub przeszukiwanie katalogu spowodowało błąd, użyta została "
-#~ "metoda wyszukiwania brute-force"
+#~ msgid "no catalog or the catalog search gave an error, a brute-force search was used"
+#~ msgstr "brak katalogu lub przeszukiwanie katalogu spowodowało błąd, użyta została metoda wyszukiwania brute-force"
 
 #~ msgid "Contents"
 #~ msgstr "Zawartość"
@@ -1712,9 +1670,6 @@
 #~ msgid "Diffs for"
 #~ msgstr "różnice dla"
 
-#~ msgid "name"
-#~ msgstr "nazwa"
-
 #~ msgid "page rating"
 #~ msgstr "ranking strony"
 
@@ -1740,9 +1695,7 @@
 #~ msgstr "Inny rodzic"
 
 #~ msgid "You may also click the full, simple, minimal links if provided."
-#~ msgstr ""
-#~ "Możesz też kliknąć jeden z odnośników pełny, prosty, minimalny, jeśli są "
-#~ "widoczne."
+#~ msgstr "Możesz też kliknąć jeden z odnośników pełny, prosty, minimalny, jeśli są widoczne."
 
 #~ msgid "for subscribing"
 #~ msgstr "dla prenumeraty"
@@ -1772,9 +1725,7 @@
 #~ msgstr "Pokazać hirarchię stron?"
 
 #~ msgid "This wiki keeps a page hierarchy, which you can use or ignore."
-#~ msgstr ""
-#~ "To wiki utrzymuje hierarchię stron, którą możesz wykorzystać lub "
-#~ "zignorować."
+#~ msgstr "To wiki utrzymuje hierarchię stron, którą możesz wykorzystać lub zignorować."
 
 #~ msgid "Show search field ?"
 #~ msgstr "Pokazać pole wyszukiwania?"
@@ -1800,21 +1751,16 @@
 #~ msgid "parent_name_replace"
 #~ msgstr "nowy rodzic, nazwa, usunięcie, podtemat"
 
-#~ msgid ""
-#~ "enter a new parent, new name, replacement page (if any) or subtopic name"
-#~ msgstr ""
-#~ "wprowadź dane strony podrzędnej, nowa nazwa lub zastąp stronę (jeżeli "
-#~ "istnieje)"
+#~ msgid "enter a new parent, new name, replacement page (if any) or subtopic name"
+#~ msgstr "wprowadź dane strony podrzędnej, nowa nazwa lub zastąp stronę (jeżeli istnieje)"
 
 #~ msgid "box_zwiki_showhierarchy"
 #~ msgstr ""
 #~ "Możesz zmienić <em>rodzica (ów)</em> tej strony, aby umiejscowić ją\n"
-#~ "    w hierarchii wiki.  Zaznacz ptaszki lub wpisz nowÄ… nazwÄ™ strony i "
-#~ "kliknij\n"
+#~ "    w hierarchii wiki.  Zaznacz ptaszki lub wpisz nowÄ… nazwÄ™ strony i kliknij\n"
 #~ "    Zmień rodzica. Pojedynczy rodzic jest zazwyczaj wystarczający."
 
-#~ msgid ""
-#~ "move this page to the recycle bin, and relink to the name you have entered"
+#~ msgid "move this page to the recycle bin, and relink to the name you have entered"
 #~ msgstr "umieść stronę w koszu i zaktualizuj odnośniki"
 
 #~ msgid "create a new subtopic of this page"

Modified: zope-zwiki/trunk/i18n/pt.po
===================================================================
--- zope-zwiki/trunk/i18n/pt.po	2007-04-08 14:54:05 UTC (rev 761)
+++ zope-zwiki/trunk/i18n/pt.po	2007-04-08 14:55:27 UTC (rev 762)
@@ -3,7 +3,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: ZWiki 0.41.0\n"
-"POT-Creation-Date: Sat Sep  2 18:10:16 2006\n"
+"POT-Creation-Date: Tue Mar 27 14:50:46 2007\n"
 "PO-Revision-Date: 2006-02-26 09:03+0000\n"
 "Last-Translator: João Villa-Lobos <joaovlb at gmail.com>\n"
 "Language-Team: João Villa-Lobos <joaovlb at gmail.com>\n"
@@ -15,46 +15,40 @@
 "Preferred-encodings: utf-8\n"
 "Domain: zwiki\n"
 
-#: src/ZWiki/Admin.py:62
+#: src/ZWiki/Admin.py:58
 msgid "You are not authorized to upgrade all pages."
 msgstr "Não está autorizado a actualizar todas as páginas."
 
-#: src/ZWiki/Admin.py:63
+#: src/ZWiki/Admin.py:59
 msgid "(folder -> Manage properties)"
 msgstr "(pasta -> Gerir propriedades)"
 
-#: src/ZWiki/Diff.py:174
+#: src/ZWiki/Diff.py:179
 #, fuzzy
 msgid "You are not authorized to reparent this ZWiki Page."
 msgstr "Não está autorizado a renomear esta página ZWiki."
 
-#: src/ZWiki/Diff.py:180 src/ZWiki/plugins/tracker/tracker.py:332
+#: src/ZWiki/Diff.py:185 src/ZWiki/plugins/tracker/tracker.py:333
 msgid "You are not authorized to rename this ZWiki Page."
 msgstr "Não está autorizado a renomear esta página ZWiki."
 
-#: src/ZWiki/Editing.py:156 src/ZWiki/Editing.py:294 src/ZWiki/Views.py:332
-#: src/ZWiki/Views.py:435 src/ZWiki/plugins/tracker/tracker.py:321
-msgid ""
-"Sorry, this wiki doesn't allow anonymous edits. Please configure a username "
-"in options first."
+#: src/ZWiki/Editing.py:156 src/ZWiki/Editing.py:294 src/ZWiki/Views.py:336
+#: src/ZWiki/Views.py:439 src/ZWiki/plugins/tracker/tracker.py:322
+msgid "Sorry, this wiki doesn't allow anonymous edits. Please configure a username in options first."
 msgstr ""
 
 #: src/ZWiki/Editing.py:327
-msgid ""
-"You are not authorized to reparent or change subtopics links on this ZWiki "
-"Page."
-msgstr ""
-"Não está autorizado a perfilhar ou alterar subtópicos linkados nesta página "
-"ZWiki."
+msgid "You are not authorized to reparent or change subtopics links on this ZWiki Page."
+msgstr "Não está autorizado a perfilhar ou alterar subtópicos linkados nesta página ZWiki."
 
 #: src/ZWiki/Editing.py:349
 msgid "You are not authorized to change this ZWiki Page's type."
 msgstr "Não está autorizado a alterar o tipo desta página ZWiki."
 
 #: src/ZWiki/Editing.py:383 src/ZWiki/Editing.py:410
-#: src/ZWiki/plugins/tracker/tracker.py:340
-#: src/ZWiki/plugins/tracker/tracker.py:347
-#: src/ZWiki/plugins/tracker/tracker.py:354
+#: src/ZWiki/plugins/tracker/tracker.py:344
+#: src/ZWiki/plugins/tracker/tracker.py:351
+#: src/ZWiki/plugins/tracker/tracker.py:358
 msgid "You are not authorized to edit this ZWiki Page."
 msgstr "Não está autorizado a editar esta página ZWiki."
 
@@ -63,11 +57,8 @@
 msgstr "Não está autorizado a apagar esta página ZWiki."
 
 #: src/ZWiki/Editing.py:563
-msgid ""
-"This page was renamed to %s. You can delete this one if no longer needed.\n"
-msgstr ""
-"Esta página foi renomeada para %s. Pode apaga-la caso já não seja "
-"necessária.\n"
+msgid "This page was renamed to %s. You can delete this one if no longer needed.\n"
+msgstr "Esta página foi renomeada para %s. Pode apaga-la caso já não seja necessária.\n"
 
 #: src/ZWiki/Editing.py:659
 msgid "You are not authorized to upload files here."
@@ -87,22 +78,15 @@
 
 #: src/ZWiki/Editing.py:830
 #, fuzzy
-msgid ""
-"your edit contained a banned link pattern. Please contact the site "
-"administrator for help."
-msgstr ""
-"Ocorreu um problema: %s. Por favor, contacte o administrador do sítio para "
-"auxílio."
+msgid "your edit contained a banned link pattern. Please contact the site administrator for help."
+msgstr "Ocorreu um problema: %s. Por favor, contacte o administrador do sítio para auxílio."
 
 #: src/ZWiki/Editing.py:841
 msgid "exceeded max_anonymous_links"
 msgstr ""
 
 #: src/ZWiki/Editing.py:842
-msgid ""
-"adding of external links by unidentified users is restricted. Please back up "
-"and remove some of the http urls you added, or contact the site "
-"administrator for help."
+msgid "adding of external links by unidentified users is restricted. Please back up and remove some of the http urls you added, or contact the site administrator for help."
 msgstr ""
 
 #: src/ZWiki/Editing.py:853
@@ -110,86 +94,87 @@
 msgstr ""
 
 #: src/ZWiki/Editing.py:854
-msgid ""
-"adding of external links is restricted, even for identified users. Please "
-"back up and remove some of the http urls you added, or contact the site "
-"administrator for help."
+msgid "adding of external links is restricted, even for identified users. Please back up and remove some of the http urls you added, or contact the site administrator for help."
 msgstr ""
 
-#: src/ZWiki/Mail.py:506 src/ZWiki/skins/dtmlmessages.pt:58
+#: src/ZWiki/Mail.py:506 src/ZWiki/skins/dtmlmessages.pt:60
 msgid "anonymous"
 msgstr ""
 
-#: src/ZWiki/OutlineSupport.py:843 src/ZWiki/skins/zwiki/links.pt:56
+#: src/ZWiki/OutlineSupport.py:378
+msgid "Sorry, this wiki doesn't allow anonymous reparenting. Please configure a username in options first."
+msgstr ""
+
+#: src/ZWiki/OutlineSupport.py:878 src/ZWiki/skins/zwiki/links.pt:56
 msgid "which pages link to this one ?"
 msgstr "que páginas que apontam para esta ?"
 
-#: src/ZWiki/OutlineSupport.py:851
+#: src/ZWiki/OutlineSupport.py:886
 msgid "You are here"
 msgstr ""
 
-#: src/ZWiki/Utils.py:465
+#: src/ZWiki/Utils.py:487
 msgid "years"
 msgstr "anos"
 
-#: src/ZWiki/Utils.py:465
+#: src/ZWiki/Utils.py:487
 msgid "year"
 msgstr "ano"
 
-#: src/ZWiki/Utils.py:467
+#: src/ZWiki/Utils.py:489
 msgid "month"
 msgstr "mês"
 
-#: src/ZWiki/Utils.py:467
+#: src/ZWiki/Utils.py:489
 msgid "months"
 msgstr "meses"
 
-#: src/ZWiki/Utils.py:469
+#: src/ZWiki/Utils.py:491
 msgid "weeks"
 msgstr "semanas"
 
-#: src/ZWiki/Utils.py:469
+#: src/ZWiki/Utils.py:491
 msgid "week"
 msgstr "semana"
 
-#: src/ZWiki/Utils.py:471
+#: src/ZWiki/Utils.py:493
 msgid "day"
 msgstr "dia"
 
-#: src/ZWiki/Utils.py:471
+#: src/ZWiki/Utils.py:493
 msgid "days"
 msgstr "dias"
 
-#: src/ZWiki/Utils.py:473
+#: src/ZWiki/Utils.py:495
 msgid "hours"
 msgstr "horas"
 
-#: src/ZWiki/Utils.py:473
+#: src/ZWiki/Utils.py:495
 #, fuzzy
 msgid "hour"
 msgstr "ou"
 
-#: src/ZWiki/Utils.py:475
+#: src/ZWiki/Utils.py:497
 msgid "minute"
 msgstr ""
 
-#: src/ZWiki/Utils.py:475
+#: src/ZWiki/Utils.py:497
 msgid "minutes"
 msgstr ""
 
-#: src/ZWiki/Utils.py:477
+#: src/ZWiki/Utils.py:499
 msgid "second"
 msgstr ""
 
-#: src/ZWiki/Utils.py:477
+#: src/ZWiki/Utils.py:499
 msgid "seconds"
 msgstr ""
 
-#: src/ZWiki/Views.py:346
+#: src/ZWiki/Views.py:350
 msgid "Page is locked"
 msgstr "A página está bloqueada"
 
-#: src/ZWiki/Views.py:357
+#: src/ZWiki/Views.py:361
 msgid ""
 "\n"
 "            This page has a webDAV lock. Someone is probably editing it\n"
@@ -200,70 +185,65 @@
 "            "
 msgstr ""
 "\n"
-"            Esta página está bloqueada por webDAV. Provavelmente alguém está "
-"editando-a\n"
+"            Esta página está bloqueada por webDAV. Provavelmente alguém está editando-a\n"
 "            com um editor externo. Aguarde até que a outra pessoa acabe\n"
 "            e tente novamente. Caso tenha feito alguma alteração,\n"
-"            guarde a sua versão do texto como referência e aceda novamente "
-"à\n"
+"            guarde a sua versão do texto como referência e aceda novamente à\n"
 "            página.\n"
 "            "
 
-#: src/ZWiki/Views.py:364
+#: src/ZWiki/Views.py:368
 msgid "To discard your changes and try again, click OK."
 msgstr "Para descartar suas alterações e tentar novamente, clique em OK."
 
-#: src/ZWiki/Views.py:393
+#: src/ZWiki/Views.py:397
 msgid "Edit conflict"
 msgstr "Editar conflito"
 
-#: src/ZWiki/Views.py:413
+#: src/ZWiki/Views.py:417
 msgid "Someone else has saved this page while you were editing"
 msgstr "Alguém gravou esta página enquanto a editava"
 
-#: src/ZWiki/Views.py:414
+#: src/ZWiki/Views.py:418
 msgid "To resolve the conflict, do this"
 msgstr "Para resolver o conflito, faça o seguinte"
 
-#: src/ZWiki/Views.py:415
+#: src/ZWiki/Views.py:419
 msgid "Click your browser's back button"
 msgstr "Clique no botão voltar do seu navegador"
 
-#: src/ZWiki/Views.py:416
+#: src/ZWiki/Views.py:420
 msgid "Copy your recent edits to the clipboard"
 msgstr "Copiar suas edições recentes para o clipboard"
 
-#: src/ZWiki/Views.py:417
+#: src/ZWiki/Views.py:421
 msgid "Click your browser's refresh button"
 msgstr "Clique no botão actualizar do seu navegador"
 
-#: src/ZWiki/Views.py:418
+#: src/ZWiki/Views.py:422
 msgid "Paste in your edits again, being mindful of the latest changes"
-msgstr ""
-"Cole novamente as suas edições, mantendo em mente as últimas alterações"
+msgstr "Cole novamente as suas edições, mantendo em mente as últimas alterações"
 
-#: src/ZWiki/Views.py:419
+#: src/ZWiki/Views.py:423
 msgid "Click the Change button again"
 msgstr "Clique novamente no botão Alterar"
 
-#: src/ZWiki/Views.py:420 src/ZWiki/skins/zwiki/editform.pt:163
+#: src/ZWiki/Views.py:424 src/ZWiki/skins/zwiki/editform.pt:163
 msgid "or"
 msgstr "ou"
 
-#: src/ZWiki/Views.py:421
+#: src/ZWiki/Views.py:425
 msgid "To discard your changes and start again, click OK"
 msgstr "Para descartar as suas alterações e começar de novo, clique em OK"
 
-#: src/ZWiki/Views.py:490
+#: src/ZWiki/Views.py:501
 msgid ""
 "\n"
-"        Access keys can be accessed in mozilla-based browsers by pressing "
-"alt-<key>\n"
+"        Access keys can be accessed in mozilla-based browsers by pressing alt-<key>\n"
 "        IE users: must also press enter\n"
 "        Mac users: command-<key>\n"
 "        Opera users: shift-escape-<key>\n"
-"        These won't work here, back up to the previous page to try them "
-"out.\n"
+"        These won't work here, back up to the previous page to try them out.\n"
 "\n"
 "        0    show these access key assignments\n"
 "\n"
@@ -279,10 +259,8 @@
 "        s    go to search field\n"
 "        \n"
 "        page functions:\n"
-"        +    (in a plone/cmf site with skin switching set up) use zwiki's "
-"plone/cmf skin\n"
-"        -    (in a plone/cmf site with skin switching set up) use zwiki's "
-"standard skin\n"
+"        +    (in a plone/cmf site with skin switching set up) use zwiki's plone/cmf skin\n"
+"        -    (in a plone/cmf site with skin switching set up) use zwiki's standard skin\n"
 "        v    view page\n"
 "        m    mail subscription\n"
 "        b    show backlinks (links to this page)\n"
@@ -310,34 +288,33 @@
 "        "
 msgstr ""
 
-#: src/ZWiki/Wikis.py:49
-msgid "Unknown wiki type"
-msgstr ""
-
-#: src/ZWiki/ZWikiPage.py:675
+#: src/ZWiki/ZWikiPage.py:744
 #, fuzzy
 msgid "create this page"
 msgstr "voltar à página"
 
-#: src/ZWiki/ZWikiPage.py:798 src/ZWiki/ZWikiPage.py:814
-#: src/ZWiki/ZWikiPage.py:817
+#: src/ZWiki/ZWikiPage.py:872 src/ZWiki/ZWikiPage.py:887
 msgid "last edited %(interval)s ago"
 msgstr ""
 
-#: src/ZWiki/ZWikiPage.py:809
+#: src/ZWiki/ZWikiPage.py:882
 #, fuzzy
 msgid "show last edit"
 msgstr "mostrar funcionalidades básicas"
 
-#: src/ZWiki/ZWikiPage.py:826 src/ZWiki/ZWikiPage.py:828
+#: src/ZWiki/ZWikiPage.py:897 src/ZWiki/ZWikiPage.py:899
 msgid "by %(editor)s"
 msgstr ""
 
-#: src/ZWiki/__init__.py:34
+#: src/ZWiki/__init__.py:200
+msgid "Unknown wiki type"
+msgstr ""
+
+#: src/ZWiki/__init__.py:39
 msgid "No need to add a Zwiki Outline Cache"
 msgstr ""
 
-#: src/ZWiki/__init__.py:35
+#: src/ZWiki/__init__.py:40
 msgid ""
 "Zwiki Outline Cache appears in the ZMI Add menu\n"
 "        for implementation reasons, but should not be added directly.\n"
@@ -349,6 +326,10 @@
 msgid "comments"
 msgstr "comentários"
 
+#: src/ZWiki/pagetypes/html.py:50 src/ZWiki/pagetypes/rst.py:85
+msgid "reply"
+msgstr ""
+
 #: src/ZWiki/pagetypes/moin.py:1990
 msgid "Expected \"=\" to follow \"%(token)s\""
 msgstr ""
@@ -385,10 +366,6 @@
 msgid "Expected a color value \"%(arg)s\" after \"%(key)s\""
 msgstr ""
 
-#: src/ZWiki/pagetypes/rst.py:85
-msgid "reply"
-msgstr ""
-
 #: src/ZWiki/plugins/latexwiki/wikis/latexwiki/diffform.pt:127
 #: src/ZWiki/plugins/mathaction/wikis/mathaction/old-diffform.pt:127
 msgid "full history"
@@ -465,7 +442,7 @@
 msgstr "título"
 
 #: src/ZWiki/plugins/tracker/filterissues.pt:12
-#: src/ZWiki/skins/dtmlmessages.pt:30
+#: src/ZWiki/skins/dtmlmessages.pt:31
 msgid "Filter issues"
 msgstr ""
 
@@ -477,366 +454,361 @@
 msgid "Issue tracker"
 msgstr ""
 
-#: src/ZWiki/plugins/tracker/tracker.py:361
+#: src/ZWiki/plugins/tracker/tracker.py:365
 #, fuzzy
 msgid "You are not authorized to comment on this ZWiki Page."
 msgstr "Não está autorizado a editar esta página ZWiki."
 
-#: src/ZWiki/skins/dtmlmessages.pt:10 src/ZWiki/skins/dtmlmessages.pt:32
+#: src/ZWiki/skins/dtmlmessages.pt:10 src/ZWiki/skins/dtmlmessages.pt:33
+#, fuzzy
+msgid "name"
+msgstr "Nome da página"
+
+#: src/ZWiki/skins/dtmlmessages.pt:11 src/ZWiki/skins/dtmlmessages.pt:34
 msgid "category"
 msgstr ""
 
-#: src/ZWiki/skins/dtmlmessages.pt:11 src/ZWiki/skins/dtmlmessages.pt:33
+#: src/ZWiki/skins/dtmlmessages.pt:12 src/ZWiki/skins/dtmlmessages.pt:35
 msgid "severity"
 msgstr "gravidade"
 
-#: src/ZWiki/skins/dtmlmessages.pt:12 src/ZWiki/skins/dtmlmessages.pt:34
+#: src/ZWiki/skins/dtmlmessages.pt:13 src/ZWiki/skins/dtmlmessages.pt:36
 msgid "status"
 msgstr "estado"
 
-#: src/ZWiki/skins/dtmlmessages.pt:13 src/ZWiki/skins/dtmlmessages.pt:35
+#: src/ZWiki/skins/dtmlmessages.pt:14 src/ZWiki/skins/dtmlmessages.pt:37
 #, fuzzy
 msgid "age"
 msgstr "Altere"
 
-#: src/ZWiki/skins/dtmlmessages.pt:14 src/ZWiki/skins/dtmlmessages.pt:36
+#: src/ZWiki/skins/dtmlmessages.pt:15 src/ZWiki/skins/dtmlmessages.pt:38
 msgid "modified"
 msgstr ""
 
-#: src/ZWiki/skins/dtmlmessages.pt:15
+#: src/ZWiki/skins/dtmlmessages.pt:16
 msgid "Add a new issue:"
 msgstr ""
 
-#: src/ZWiki/skins/dtmlmessages.pt:16
+#: src/ZWiki/skins/dtmlmessages.pt:17
 msgid "Name:"
 msgstr "Nome:"
 
-#: src/ZWiki/skins/dtmlmessages.pt:17
+#: src/ZWiki/skins/dtmlmessages.pt:18
 msgid "Category:"
 msgstr "Categoria:"
 
-#: src/ZWiki/skins/dtmlmessages.pt:18
+#: src/ZWiki/skins/dtmlmessages.pt:19
 msgid "Severity:"
 msgstr "Gravidade:"
 
-#: src/ZWiki/skins/dtmlmessages.pt:19
-msgid "Status:"
-msgstr "Estado:"
-
 #: src/ZWiki/skins/dtmlmessages.pt:2
 msgid "Here are the wiki's issue pages."
 msgstr ""
 
 #: src/ZWiki/skins/dtmlmessages.pt:20
+msgid "Status:"
+msgstr "Estado:"
+
+#: src/ZWiki/skins/dtmlmessages.pt:21
 msgid "Details:"
 msgstr "Detalhes:"
 
-#: src/ZWiki/skins/dtmlmessages.pt:21
+#: src/ZWiki/skins/dtmlmessages.pt:22
 msgid "add issue"
 msgstr ""
 
-#: src/ZWiki/skins/dtmlmessages.pt:22
+#: src/ZWiki/skins/dtmlmessages.pt:23
 msgid "More advanced"
 msgstr ""
 
-#: src/ZWiki/skins/dtmlmessages.pt:23
+#: src/ZWiki/skins/dtmlmessages.pt:24
 msgid "issue tracker"
 msgstr ""
 
-#: src/ZWiki/skins/dtmlmessages.pt:24
+#: src/ZWiki/skins/dtmlmessages.pt:25
 #, fuzzy
 msgid "search options"
 msgstr "mostrar o conteúdo da wiki"
 
-#: src/ZWiki/skins/dtmlmessages.pt:25
+#: src/ZWiki/skins/dtmlmessages.pt:26
 msgid "Name contains any of:"
 msgstr ""
 
-#: src/ZWiki/skins/dtmlmessages.pt:26
+#: src/ZWiki/skins/dtmlmessages.pt:27
 msgid "Page text contains any of:"
 msgstr ""
 
-#: src/ZWiki/skins/dtmlmessages.pt:27
+#: src/ZWiki/skins/dtmlmessages.pt:28
 msgid "Categories:"
 msgstr ""
 
-#: src/ZWiki/skins/dtmlmessages.pt:28
+#: src/ZWiki/skins/dtmlmessages.pt:29
 #, fuzzy
 msgid "Severities:"
 msgstr "nunca"
 
-#: src/ZWiki/skins/dtmlmessages.pt:29
-msgid "Statuses:"
-msgstr "Estados:"
-
 #: src/ZWiki/skins/dtmlmessages.pt:3
 msgid "Enter a search term, click the numbers to the right,"
 msgstr ""
 
-#: src/ZWiki/skins/dtmlmessages.pt:37
+#: src/ZWiki/skins/dtmlmessages.pt:30
+msgid "Statuses:"
+msgstr "Estados:"
+
+#: src/ZWiki/skins/dtmlmessages.pt:39
 msgid "Submitted by"
 msgstr ""
 
-#: src/ZWiki/skins/dtmlmessages.pt:38
+#: src/ZWiki/skins/dtmlmessages.pt:4
 #, fuzzy
+msgid "filter issues"
+msgstr "Filtro de assuntos"
+
+#: src/ZWiki/skins/dtmlmessages.pt:40
+#, fuzzy
 msgid "Name"
 msgstr "Nome da página"
 
-#: src/ZWiki/skins/dtmlmessages.pt:39
+#: src/ZWiki/skins/dtmlmessages.pt:41
 msgid "Category"
 msgstr "Categoria"
 
-#: src/ZWiki/skins/dtmlmessages.pt:4
-#, fuzzy
-msgid "filter issues"
-msgstr "Filtro de assuntos"
-
-#: src/ZWiki/skins/dtmlmessages.pt:40
+#: src/ZWiki/skins/dtmlmessages.pt:42
 msgid "Severity"
 msgstr "Gravidade"
 
-#: src/ZWiki/skins/dtmlmessages.pt:41
+#: src/ZWiki/skins/dtmlmessages.pt:43
 msgid "Status"
 msgstr "Estado"
 
-#: src/ZWiki/skins/dtmlmessages.pt:42
+#: src/ZWiki/skins/dtmlmessages.pt:44
 #, fuzzy
 msgid "Optional subject"
 msgstr "Nota de alteração opcional"
 
-#: src/ZWiki/skins/dtmlmessages.pt:43
+#: src/ZWiki/skins/dtmlmessages.pt:45
 #, fuzzy
 msgid "Optional comment"
 msgstr "Nota de alteração opcional"
 
-#: src/ZWiki/skins/dtmlmessages.pt:44 src/ZWiki/skins/dtmlmessages.pt:45
+#: src/ZWiki/skins/dtmlmessages.pt:46 src/ZWiki/skins/dtmlmessages.pt:47
 #, fuzzy
 msgid "Add ZWiki"
 msgstr "Adicionar Wiki"
 
-#: src/ZWiki/skins/dtmlmessages.pt:46
+#: src/ZWiki/skins/dtmlmessages.pt:48
 msgid "Id:"
 msgstr ""
 
-#: src/ZWiki/skins/dtmlmessages.pt:47
+#: src/ZWiki/skins/dtmlmessages.pt:49
 #, fuzzy
 msgid "Title:"
 msgstr "Título"
 
-#: src/ZWiki/skins/dtmlmessages.pt:48
+#: src/ZWiki/skins/dtmlmessages.pt:5
+msgid "browse open issues"
+msgstr ""
+
+#: src/ZWiki/skins/dtmlmessages.pt:50
 msgid "Template:"
 msgstr ""
 
-#: src/ZWiki/skins/dtmlmessages.pt:49
+#: src/ZWiki/skins/dtmlmessages.pt:51
 #, fuzzy
 msgid "Add wiki"
 msgstr "Adicionar Wiki"
 
-#: src/ZWiki/skins/dtmlmessages.pt:5
-msgid "browse open issues"
-msgstr ""
-
-#: src/ZWiki/skins/dtmlmessages.pt:50
+#: src/ZWiki/skins/dtmlmessages.pt:52
 msgid "Pages changed in the last"
 msgstr ""
 
-#: src/ZWiki/skins/dtmlmessages.pt:51
+#: src/ZWiki/skins/dtmlmessages.pt:53
 msgid "Recently changed pages, with summaries"
 msgstr ""
 
-#: src/ZWiki/skins/dtmlmessages.pt:52
+#: src/ZWiki/skins/dtmlmessages.pt:54
 msgid "Show summaries ?"
 msgstr ""
 
-#: src/ZWiki/skins/dtmlmessages.pt:53
+#: src/ZWiki/skins/dtmlmessages.pt:55
 msgid "Refresh"
 msgstr ""
 
-#: src/ZWiki/skins/dtmlmessages.pt:54
+#: src/ZWiki/skins/dtmlmessages.pt:56
 #, fuzzy
 msgid "Page"
 msgstr "Nome da página"
 
-#: src/ZWiki/skins/dtmlmessages.pt:55
+#: src/ZWiki/skins/dtmlmessages.pt:57
 msgid "Edited&nbsp;by"
 msgstr ""
 
-#: src/ZWiki/skins/dtmlmessages.pt:56
+#: src/ZWiki/skins/dtmlmessages.pt:58
 #, fuzzy
 msgid "Time"
 msgstr "Título"
 
-#: src/ZWiki/skins/dtmlmessages.pt:57
+#: src/ZWiki/skins/dtmlmessages.pt:59
 msgid "NEW"
 msgstr ""
 
-#: src/ZWiki/skins/dtmlmessages.pt:59
-msgid "Pages marked (NEW) have been created within the last week"
-msgstr ""
-
 #: src/ZWiki/skins/dtmlmessages.pt:6
 #, fuzzy
 msgid "search issues"
 msgstr "Filtro de assuntos"
 
-#: src/ZWiki/skins/dtmlmessages.pt:60
+#: src/ZWiki/skins/dtmlmessages.pt:61
+msgid "Pages marked (NEW) have been created within the last week"
+msgstr ""
+
+#: src/ZWiki/skins/dtmlmessages.pt:62
 msgid "Enter a word or phrase and hit enter to search the entire wiki."
 msgstr ""
 
-#: src/ZWiki/skins/dtmlmessages.pt:61
+#: src/ZWiki/skins/dtmlmessages.pt:63
 msgid "This is the same as using the search field at top right."
 msgstr ""
 
-#: src/ZWiki/skins/dtmlmessages.pt:62
+#: src/ZWiki/skins/dtmlmessages.pt:64
 msgid "Tips: A single word works best for matching page names."
 msgstr ""
 
-#: src/ZWiki/skins/dtmlmessages.pt:63
-msgid ""
-"Case-insensitivity and wildcards may be supported depending on your catalog "
-"configuration."
+#: src/ZWiki/skins/dtmlmessages.pt:65
+msgid "Case-insensitivity and wildcards may be supported depending on your catalog configuration."
 msgstr ""
 
-#: src/ZWiki/skins/dtmlmessages.pt:64
+#: src/ZWiki/skins/dtmlmessages.pt:66
 msgid "Leave it blank to list all pages."
 msgstr ""
 
-#: src/ZWiki/skins/dtmlmessages.pt:65 src/ZWiki/skins/dtmlmessages.pt:66
+#: src/ZWiki/skins/dtmlmessages.pt:67 src/ZWiki/skins/dtmlmessages.pt:68
 msgid "Search"
 msgstr ""
 
-#: src/ZWiki/skins/dtmlmessages.pt:67
+#: src/ZWiki/skins/dtmlmessages.pt:69
 #, fuzzy
 msgid "Page names matching"
 msgstr "Nome da página"
 
-#: src/ZWiki/skins/dtmlmessages.pt:68
-msgid "Text matching"
-msgstr ""
-
-#: src/ZWiki/skins/dtmlmessages.pt:69
-msgid "Thorough (non-catalog) search for text matching"
-msgstr ""
-
 #: src/ZWiki/skins/dtmlmessages.pt:7
 #, fuzzy
 msgid "recent"
 msgstr "Perfilhar"
 
 #: src/ZWiki/skins/dtmlmessages.pt:70
-msgid "Set your preferences for this wiki:"
+msgid "Text matching"
 msgstr ""
 
 #: src/ZWiki/skins/dtmlmessages.pt:71
-msgid "User name:"
-msgstr "Nome de utilizador:"
+msgid "Thorough (non-catalog) search for text matching"
+msgstr ""
 
 #: src/ZWiki/skins/dtmlmessages.pt:72
-msgid "(identifies your edits)"
+msgid "Set your preferences for this wiki:"
 msgstr ""
 
 #: src/ZWiki/skins/dtmlmessages.pt:73
+msgid "User name:"
+msgstr "Nome de utilizador:"
+
+#: src/ZWiki/skins/dtmlmessages.pt:74
+msgid "(identifies your edits, saves your votes, may be required)"
+msgstr ""
+
+#: src/ZWiki/skins/dtmlmessages.pt:75
 #, fuzzy
 msgid "Email address:"
 msgstr "O seu endereço de email"
 
-#: src/ZWiki/skins/dtmlmessages.pt:74
+#: src/ZWiki/skins/dtmlmessages.pt:76
 #, fuzzy
 msgid "(allows mail subscription)"
 msgstr "Subscrição por email"
 
-#: src/ZWiki/skins/dtmlmessages.pt:75
+#: src/ZWiki/skins/dtmlmessages.pt:77
 msgid "Your time zone:"
 msgstr ""
 
-#: src/ZWiki/skins/dtmlmessages.pt:76
+#: src/ZWiki/skins/dtmlmessages.pt:78
 msgid "(localizes most times)"
 msgstr ""
 
-#: src/ZWiki/skins/dtmlmessages.pt:77
+#: src/ZWiki/skins/dtmlmessages.pt:79
 msgid "Edit form height:"
 msgstr ""
 
-#: src/ZWiki/skins/dtmlmessages.pt:78
+#: src/ZWiki/skins/dtmlmessages.pt:8
+msgid "all"
+msgstr ""
+
+#: src/ZWiki/skins/dtmlmessages.pt:80
 msgid "(adjusts form size)"
 msgstr ""
 
-#: src/ZWiki/skins/dtmlmessages.pt:79
+#: src/ZWiki/skins/dtmlmessages.pt:81
 msgid "Save options"
 msgstr "Guardar opções"
 
-#: src/ZWiki/skins/dtmlmessages.pt:8
-msgid "all"
-msgstr ""
-
-#: src/ZWiki/skins/dtmlmessages.pt:80
+#: src/ZWiki/skins/dtmlmessages.pt:82
 msgid "Forget options"
 msgstr ""
 
-#: src/ZWiki/skins/dtmlmessages.pt:81 src/ZWiki/skins/dtmlmessages.pt:82
+#: src/ZWiki/skins/dtmlmessages.pt:83 src/ZWiki/skins/dtmlmessages.pt:84
 msgid "Add ZWiki Page"
 msgstr ""
 
-#: src/ZWiki/skins/dtmlmessages.pt:83
+#: src/ZWiki/skins/dtmlmessages.pt:85
 #, fuzzy
 msgid "Page&nbsp;name:"
 msgstr "Nome da página"
 
-#: src/ZWiki/skins/dtmlmessages.pt:84
+#: src/ZWiki/skins/dtmlmessages.pt:86
 #, fuzzy
 msgid "Add wiki page"
 msgstr "Uma Página Wiki"
 
-#: src/ZWiki/skins/dtmlmessages.pt:85
+#: src/ZWiki/skins/dtmlmessages.pt:87
 msgid "Topic"
 msgstr "Tópico"
 
-#: src/ZWiki/skins/dtmlmessages.pt:86
+#: src/ZWiki/skins/dtmlmessages.pt:88
 msgid "Last updated"
 msgstr ""
 
-#: src/ZWiki/skins/dtmlmessages.pt:87
+#: src/ZWiki/skins/dtmlmessages.pt:89
 msgid "Comments"
 msgstr "Comentários"
 
-#: src/ZWiki/skins/dtmlmessages.pt:88
+#: src/ZWiki/skins/dtmlmessages.pt:9 src/ZWiki/skins/dtmlmessages.pt:32
+msgid "#"
+msgstr "#"
+
+#: src/ZWiki/skins/dtmlmessages.pt:90
 #, fuzzy
 msgid "Views"
 msgstr "Visualizar"
 
-#: src/ZWiki/skins/dtmlmessages.pt:89
+#: src/ZWiki/skins/dtmlmessages.pt:91
 msgid "Created"
 msgstr ""
 
-#: src/ZWiki/skins/dtmlmessages.pt:9 src/ZWiki/skins/dtmlmessages.pt:31
-msgid "#"
-msgstr "#"
-
-#: src/ZWiki/skins/dtmlmessages.pt:90 src/ZWiki/skins/dtmlmessages.pt:92
+#: src/ZWiki/skins/dtmlmessages.pt:92 src/ZWiki/skins/dtmlmessages.pt:94
 msgid "by"
 msgstr "por"
 
-#: src/ZWiki/skins/dtmlmessages.pt:91
+#: src/ZWiki/skins/dtmlmessages.pt:93
 msgid "<dtml-var lasteditinterval> ago</dtml-var>"
 msgstr ""
 
-#: src/ZWiki/skins/dtmlmessages.pt:93
+#: src/ZWiki/skins/dtmlmessages.pt:95
 msgid "on"
 msgstr ""
 
-#: src/ZWiki/skins/zwiki/backlinks.pt:108
-msgid "Subtopics"
-msgstr "Subtópicos"
-
-#: src/ZWiki/skins/zwiki/backlinks.pt:111
-msgid "This page has no subtopics."
-msgstr ""
-
-#: src/ZWiki/skins/zwiki/backlinks.pt:114
+#: src/ZWiki/skins/zwiki/backlinks.pt:102
 msgid "Here are it's subtopics."
 msgstr ""
 
-#: src/ZWiki/skins/zwiki/backlinks.pt:117
+#: src/ZWiki/skins/zwiki/backlinks.pt:105
 msgid "You can reorder them by clicking the ^ buttons."
 msgstr ""
 
@@ -850,67 +822,64 @@
 msgid "Parents"
 msgstr "Perfilhar"
 
-#: src/ZWiki/skins/zwiki/backlinks.pt:31
+#: src/ZWiki/skins/zwiki/backlinks.pt:28
 msgid "is a top-level topic."
 msgstr "é um tópico principal."
 
-#: src/ZWiki/skins/zwiki/backlinks.pt:32
+#: src/ZWiki/skins/zwiki/backlinks.pt:29
 msgid "is a subtopic of:"
 msgstr "é um subtópico de:"
 
-#: src/ZWiki/skins/zwiki/backlinks.pt:55
+#: src/ZWiki/skins/zwiki/backlinks.pt:48
 #, fuzzy
 msgid "Backlinks"
 msgstr "Links para"
 
-#: src/ZWiki/skins/zwiki/backlinks.pt:56
+#: src/ZWiki/skins/zwiki/backlinks.pt:49
 msgid "Here are the pages which link to it:"
 msgstr "Aqui estão as páginas que apontam para esta:"
 
-#: src/ZWiki/skins/zwiki/backlinks.pt:57
+#: src/ZWiki/skins/zwiki/backlinks.pt:50
 #, fuzzy
 msgid "No other pages link to this one."
 msgstr "que páginas que apontam para esta ?"
 
-#: src/ZWiki/skins/zwiki/backlinks.pt:82
-msgid ""
-"You can set this page's parent(s) to place it within the overall page "
-"hierarchy."
+#: src/ZWiki/skins/zwiki/backlinks.pt:70
+msgid "You can set this page's parent(s) to place it within the overall page hierarchy."
 msgstr ""
 
-#: src/ZWiki/skins/zwiki/backlinks.pt:85
-msgid ""
-"Check one or more checkboxes or enter a page name here, and click the button."
+#: src/ZWiki/skins/zwiki/backlinks.pt:73
+msgid "Check one or more checkboxes or enter a page name here, and click the button."
 msgstr ""
 
-#: src/ZWiki/skins/zwiki/backlinks.pt:88
+#: src/ZWiki/skins/zwiki/backlinks.pt:76
 msgid "Enter a page name here and click the button."
 msgstr ""
 
-#: src/ZWiki/skins/zwiki/backlinks.pt:91
-msgid ""
-"You can type just the first few letters, case and punctuation are ignored."
+#: src/ZWiki/skins/zwiki/backlinks.pt:79
+msgid "You can type just the first few letters, case and punctuation are ignored."
 msgstr ""
 
-#: src/ZWiki/skins/zwiki/backlinks.pt:98
+#: src/ZWiki/skins/zwiki/backlinks.pt:86
 msgid "Reparent"
 msgstr "Perfilhar"
 
+#: src/ZWiki/skins/zwiki/backlinks.pt:96
+msgid "Subtopics"
+msgstr "Subtópicos"
+
+#: src/ZWiki/skins/zwiki/backlinks.pt:99
+msgid "This page has no subtopics."
+msgstr ""
+
 #: src/ZWiki/skins/zwiki/badtemplate.pt:12
 msgid "Bad template"
 msgstr ""
 
 #: src/ZWiki/skins/zwiki/badtemplate.pt:13
 #, fuzzy
-msgid ""
-"There was a problem locating one of this wiki's skin templates. There may be "
-"a page or other non-page-template/non-dtml-method object with the same ID, "
-"obscuring the template. Or the template may be missing on the filesystem (an "
-"incomplete Zwiki installation)."
-msgstr ""
-"Ocorreu um problema com um destes templates de aspecto do wiki. Talvez "
-"exista um objecto com um ID de um template de aspecto que não é um Page "
-"Template ou DTML Method, ou o template pode estar danificado."
+msgid "There was a problem locating one of this wiki's skin templates. There may be a page or other non-page-template/non-dtml-method object with the same ID, obscuring the template. Or the template may be missing on the filesystem (an incomplete Zwiki installation)."
+msgstr "Ocorreu um problema com um destes templates de aspecto do wiki. Talvez exista um objecto com um ID de um template de aspecto que não é um Page Template ou DTML Method, ou o template pode estar danificado."
 
 #: src/ZWiki/skins/zwiki/commentform.pt:21
 msgid "subject"
@@ -926,9 +895,7 @@
 
 #: src/ZWiki/skins/zwiki/commentform.pt:36
 msgid "to comment (and cc any subscribers) enter text here and click add"
-msgstr ""
-"para comentar (e contactar via cc quaisquer subscritores) introduza texto "
-"aqui e clique adicionar"
+msgstr "para comentar (e contactar via cc quaisquer subscritores) introduza texto aqui e clique adicionar"
 
 #: src/ZWiki/skins/zwiki/commentform.pt:56
 #, fuzzy
@@ -946,13 +913,21 @@
 msgid "add-comment"
 msgstr "adicionar um comentário"
 
-#: src/ZWiki/skins/zwiki/contentspage.pt:12
+#: src/ZWiki/skins/zwiki/contentspage.pt:10
+#: src/ZWiki/skins/zwiki/contentspage.pt:27
 #, fuzzy
+msgid "Wiki contents for"
+msgstr "Conteúdo da Wiki"
+
+#: src/ZWiki/skins/zwiki/contentspage.pt:13
+#: src/ZWiki/skins/zwiki/contentspage.pt:30
+#, fuzzy
 msgid "Wiki contents"
 msgstr "Conteúdo da Wiki"
 
-#: src/ZWiki/skins/zwiki/contentspage.pt:16
-msgid "Singletons"
+#: src/ZWiki/skins/zwiki/contentspage.pt:40
+#, fuzzy
+msgid "Singletons:"
 msgstr "Simples"
 
 #: src/ZWiki/skins/zwiki/denied.pt:12
@@ -1040,14 +1015,14 @@
 msgstr ""
 
 #: src/ZWiki/skins/zwiki/editform.pt:178
+msgid "Preview"
+msgstr ""
+
+#: src/ZWiki/skins/zwiki/editform.pt:178
 #, fuzzy
 msgid "preview this edit"
 msgstr "<< edição anterior"
 
-#: src/ZWiki/skins/zwiki/editform.pt:178
-msgid "Preview"
-msgstr ""
-
 #: src/ZWiki/skins/zwiki/editform.pt:183
 msgid "Cancel"
 msgstr "Cancelar"
@@ -1083,13 +1058,18 @@
 msgstr ""
 
 #: src/ZWiki/skins/zwiki/editform.pt:71
-msgid "type"
-msgstr "tipo"
+msgid "markup"
+msgstr ""
 
 #: src/ZWiki/skins/zwiki/editform.pt:72
 msgid "select the formatting and rendering style for this page"
 msgstr ""
 
+#: src/ZWiki/skins/zwiki/helppage.pt:12
+#, fuzzy
+msgid "Help page"
+msgstr "ir para a página inicial"
+
 #: src/ZWiki/skins/zwiki/links.pt:102
 #, fuzzy
 msgid "(external edit)"
@@ -1244,18 +1224,17 @@
 
 #: src/ZWiki/skins/zwiki/pagemanagementform.pt:45
 #, fuzzy
-msgid "reparent"
-msgstr "Perfilhar"
+msgid "make this page a subtopic of the page you have entered"
+msgstr "perfilhe esta página em relação à página que introduziu"
 
 #: src/ZWiki/skins/zwiki/pagemanagementform.pt:45
 #, fuzzy
-msgid "make this page a subtopic of the page you have entered"
-msgstr "perfilhe esta página em relação à página que introduziu"
+msgid "reparent"
+msgstr "Perfilhar"
 
 #: src/ZWiki/skins/zwiki/pagemanagementform.pt:50
 msgid "rename this page to the name you have entered, updating all links"
-msgstr ""
-"renomeie esta página para o nome dado por si, actualizando todos os links"
+msgstr "renomeie esta página para o nome dado por si, actualizando todos os links"
 
 #: src/ZWiki/skins/zwiki/pagemanagementform.pt:50
 #, fuzzy
@@ -1268,15 +1247,13 @@
 
 #: src/ZWiki/skins/zwiki/pagemanagementform.pt:55
 #, fuzzy
-msgid ""
-"delete this page, and redirect links to the page you have entered, if any"
+msgid "delete this page, and redirect links to the page you have entered, if any"
 msgstr "perfilhe esta página em relação à página que introduziu"
 
 #: src/ZWiki/skins/zwiki/pagemanagementform.pt:60
 #, fuzzy
 msgid "create a page with the name you have entered, as a subtopic of this one"
-msgstr ""
-"renomeie esta página para o nome dado por si, actualizando todos os links"
+msgstr "renomeie esta página para o nome dado por si, actualizando todos os links"
 
 #: src/ZWiki/skins/zwiki/pagemanagementform.pt:60
 msgid "create"
@@ -1417,6 +1394,9 @@
 msgid "User options"
 msgstr "mostrar o conteúdo da wiki"
 
+#~ msgid "type"
+#~ msgstr "tipo"
+
 #, fuzzy
 #~ msgid "Type"
 #~ msgstr "tipo"
@@ -1441,9 +1421,7 @@
 #~ msgstr "voltar à página"
 
 #~ msgid "help_shortname"
-#~ msgstr ""
-#~ "Nota: Renomear uma página numa grande wiki pode ser lento. Outras páginas "
-#~ "serão actualizadas se possível."
+#~ msgstr "Nota: Renomear uma página numa grande wiki pode ser lento. Outras páginas serão actualizadas se possível."
 
 #~ msgid "label_body_text"
 #~ msgstr "Corpo do texto"
@@ -1452,19 +1430,15 @@
 # "In a Wiki page, you use [square brackets] to create links. When you save the page, the contents\n"
 #~ msgid "help_wikibody"
 #~ msgstr ""
-#~ "Numa página Wiki, utilizam-se [parêntesis rectos] para criar links. "
-#~ "Quando a página é gravada, o conteúdo introduzido\n"
-#~ "            dentro dos parêntesis rectos terá um pequeno link <code>?</"
-#~ "code> à sua frente que pode ser utilizado para criar\n"
+#~ "Numa página Wiki, utilizam-se [parêntesis rectos] para criar links. Quando a página é gravada, o conteúdo introduzido\n"
+#~ "            dentro dos parêntesis rectos terá um pequeno link <code>?</code> à sua frente que pode ser utilizado para criar\n"
 #~ "            uma nova página com esse nome."
 
 # Default: ""
 # "In a Wiki page, you use [square brackets] to create links. When you save the page, the contents\n"
 #, fuzzy
 #~ msgid "help_wikiwords"
-#~ msgstr ""
-#~ "Numa página Wiki, utilizam-se [parêntesis rectos] para criar links. "
-#~ "Quando a página é gravada, o conteúdo introduzido"
+#~ msgstr "Numa página Wiki, utilizam-se [parêntesis rectos] para criar links. Quando a página é gravada, o conteúdo introduzido"
 
 #~ msgid "label_note"
 #~ msgstr "Nota para a história da página (opcional)"
@@ -1551,19 +1525,15 @@
 # "You can change this page's parent(s) to place it within the overall page\n"
 #~ msgid "backlinks_reparent_help"
 #~ msgstr ""
-#~ "Pode alterar o(s) pai(s) desta página de modo a colocá-la dentro da "
-#~ "hierarquia geral das páginas.\n"
-#~ " Seleccione a caixa ou insira um novo nome de página e clique em "
-#~ "Perfilhar.\n"
+#~ "Pode alterar o(s) pai(s) desta página de modo a colocá-la dentro da hierarquia geral das páginas.\n"
+#~ " Seleccione a caixa ou insira um novo nome de página e clique em Perfilhar.\n"
 #~ "Regra geral, ter apenas um pai é suficiente."
 
 # Default: ""
 # "You can change this page's parent(s) to place it within the overall page\n"
 #, fuzzy
 #~ msgid "backlinks_reparent_help2"
-#~ msgstr ""
-#~ "Pode alterar o(s) pai(s) desta página de modo a colocá-la dentro da "
-#~ "hierarquia geral das páginas."
+#~ msgstr "Pode alterar o(s) pai(s) desta página de modo a colocá-la dentro da hierarquia geral das páginas."
 
 #~ msgid "View"
 #~ msgstr "Visualizar"
@@ -1652,12 +1622,8 @@
 #~ msgid "parent_name_replace"
 #~ msgstr "novo pai, nome ou substituto"
 
-#~ msgid ""
-#~ "move this page to the recycle bin, and relink to the name you have "
-#~ "entered."
-#~ msgstr ""
-#~ "envie esta página para o recycle bin e altere o link para o nome que "
-#~ "introduziu."
+#~ msgid "move this page to the recycle bin, and relink to the name you have entered."
+#~ msgstr "envie esta página para o recycle bin e altere o link para o nome que introduziu."
 
 #, fuzzy
 #~ msgid "Here are the pages which link to"
@@ -1667,10 +1633,8 @@
 # "You can also set this page's <em>parent(s)</em>, to locate it within the\n"
 #~ msgid "box_zwiki_showhierarchy"
 #~ msgstr ""
-#~ "Pode também definir o(s) <em>pai(s)</em> desta página de modo a colocá-la "
-#~ "dentro da\n"
-#~ " hierarquia de conteúdo. Seleccione as caixas ou introduza o nome de uma "
-#~ "nova página e clique\n"
+#~ "Pode também definir o(s) <em>pai(s)</em> desta página de modo a colocá-la dentro da\n"
+#~ " hierarquia de conteúdo. Seleccione as caixas ou introduza o nome de uma nova página e clique\n"
 #~ " Perfilhar. Regra geral apenas um pai é suficiente."
 
 #~ msgid "Other parent"

Modified: zope-zwiki/trunk/i18n/pt_BR.po
===================================================================
--- zope-zwiki/trunk/i18n/pt_BR.po	2007-04-08 14:54:05 UTC (rev 761)
+++ zope-zwiki/trunk/i18n/pt_BR.po	2007-04-08 14:55:27 UTC (rev 762)
@@ -3,7 +3,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: ZWiki 0.33.0\n"
-"POT-Creation-Date: Sat Sep  2 18:10:16 2006\n"
+"POT-Creation-Date: Tue Mar 27 14:50:46 2007\n"
 "PO-Revision-Date: 2006-01-20 18:10+0000\n"
 "Last-Translator: Jean Rodrigo Ferri <jeanrodrigoferri at yahoo.com.br>\n"
 "Language-Team: TcheZope.org <tchezope at yahoogrupos.com.br>\n"
@@ -15,46 +15,40 @@
 "Preferred-encodings: utf-8\n"
 "Domain: zwiki\n"
 
-#: src/ZWiki/Admin.py:62
+#: src/ZWiki/Admin.py:58
 msgid "You are not authorized to upgrade all pages."
 msgstr "Você não está autorizado a atualizar todas as páginas."
 
-#: src/ZWiki/Admin.py:63
+#: src/ZWiki/Admin.py:59
 msgid "(folder -> Manage properties)"
 msgstr "(pasta -> Gerenciar propriedades)"
 
-#: src/ZWiki/Diff.py:174
+#: src/ZWiki/Diff.py:179
 #, fuzzy
 msgid "You are not authorized to reparent this ZWiki Page."
 msgstr "Você não está autorizado a renomear esta página ZWiki."
 
-#: src/ZWiki/Diff.py:180 src/ZWiki/plugins/tracker/tracker.py:332
+#: src/ZWiki/Diff.py:185 src/ZWiki/plugins/tracker/tracker.py:333
 msgid "You are not authorized to rename this ZWiki Page."
 msgstr "Você não está autorizado a renomear esta página ZWiki."
 
-#: src/ZWiki/Editing.py:156 src/ZWiki/Editing.py:294 src/ZWiki/Views.py:332
-#: src/ZWiki/Views.py:435 src/ZWiki/plugins/tracker/tracker.py:321
-msgid ""
-"Sorry, this wiki doesn't allow anonymous edits. Please configure a username "
-"in options first."
+#: src/ZWiki/Editing.py:156 src/ZWiki/Editing.py:294 src/ZWiki/Views.py:336
+#: src/ZWiki/Views.py:439 src/ZWiki/plugins/tracker/tracker.py:322
+msgid "Sorry, this wiki doesn't allow anonymous edits. Please configure a username in options first."
 msgstr ""
 
 #: src/ZWiki/Editing.py:327
-msgid ""
-"You are not authorized to reparent or change subtopics links on this ZWiki "
-"Page."
-msgstr ""
-"Você não está autorizado a reorientar ou alterar subtópicos linkados nesta "
-"página ZWiki."
+msgid "You are not authorized to reparent or change subtopics links on this ZWiki Page."
+msgstr "Você não está autorizado a reorientar ou alterar subtópicos linkados nesta página ZWiki."
 
 #: src/ZWiki/Editing.py:349
 msgid "You are not authorized to change this ZWiki Page's type."
 msgstr "Você não está autorizado a alterar o tipo desta página ZWiki."
 
 #: src/ZWiki/Editing.py:383 src/ZWiki/Editing.py:410
-#: src/ZWiki/plugins/tracker/tracker.py:340
-#: src/ZWiki/plugins/tracker/tracker.py:347
-#: src/ZWiki/plugins/tracker/tracker.py:354
+#: src/ZWiki/plugins/tracker/tracker.py:344
+#: src/ZWiki/plugins/tracker/tracker.py:351
+#: src/ZWiki/plugins/tracker/tracker.py:358
 msgid "You are not authorized to edit this ZWiki Page."
 msgstr "Você não está autorizado a editar esta página ZWiki."
 
@@ -63,11 +57,8 @@
 msgstr "Você não está autorizado a deletar esta página ZWiki."
 
 #: src/ZWiki/Editing.py:563
-msgid ""
-"This page was renamed to %s. You can delete this one if no longer needed.\n"
-msgstr ""
-"Esta página foi renomeada para %s. Você poderá deletá-la se não precisar "
-"mais.\n"
+msgid "This page was renamed to %s. You can delete this one if no longer needed.\n"
+msgstr "Esta página foi renomeada para %s. Você poderá deletá-la se não precisar mais.\n"
 
 #: src/ZWiki/Editing.py:659
 msgid "You are not authorized to upload files here."
@@ -86,9 +77,7 @@
 msgstr ""
 
 #: src/ZWiki/Editing.py:830
-msgid ""
-"your edit contained a banned link pattern. Please contact the site "
-"administrator for help."
+msgid "your edit contained a banned link pattern. Please contact the site administrator for help."
 msgstr ""
 
 #: src/ZWiki/Editing.py:841
@@ -96,10 +85,7 @@
 msgstr ""
 
 #: src/ZWiki/Editing.py:842
-msgid ""
-"adding of external links by unidentified users is restricted. Please back up "
-"and remove some of the http urls you added, or contact the site "
-"administrator for help."
+msgid "adding of external links by unidentified users is restricted. Please back up and remove some of the http urls you added, or contact the site administrator for help."
 msgstr ""
 
 #: src/ZWiki/Editing.py:853
@@ -107,87 +93,88 @@
 msgstr ""
 
 #: src/ZWiki/Editing.py:854
-msgid ""
-"adding of external links is restricted, even for identified users. Please "
-"back up and remove some of the http urls you added, or contact the site "
-"administrator for help."
+msgid "adding of external links is restricted, even for identified users. Please back up and remove some of the http urls you added, or contact the site administrator for help."
 msgstr ""
 
-#: src/ZWiki/Mail.py:506 src/ZWiki/skins/dtmlmessages.pt:58
+#: src/ZWiki/Mail.py:506 src/ZWiki/skins/dtmlmessages.pt:60
 msgid "anonymous"
 msgstr "anônimo"
 
-#: src/ZWiki/OutlineSupport.py:843 src/ZWiki/skins/zwiki/links.pt:56
+#: src/ZWiki/OutlineSupport.py:378
+msgid "Sorry, this wiki doesn't allow anonymous reparenting. Please configure a username in options first."
+msgstr ""
+
+#: src/ZWiki/OutlineSupport.py:878 src/ZWiki/skins/zwiki/links.pt:56
 msgid "which pages link to this one ?"
 msgstr "Que páginas linkam para esta?"
 
-#: src/ZWiki/OutlineSupport.py:851
+#: src/ZWiki/OutlineSupport.py:886
 msgid "You are here"
 msgstr "Você está aqui"
 
-#: src/ZWiki/Utils.py:465
+#: src/ZWiki/Utils.py:487
 msgid "years"
 msgstr "anos"
 
-#: src/ZWiki/Utils.py:465
+#: src/ZWiki/Utils.py:487
 msgid "year"
 msgstr "ano"
 
-#: src/ZWiki/Utils.py:467
+#: src/ZWiki/Utils.py:489
 msgid "month"
 msgstr "mês"
 
-#: src/ZWiki/Utils.py:467
+#: src/ZWiki/Utils.py:489
 msgid "months"
 msgstr "meses"
 
-#: src/ZWiki/Utils.py:469
+#: src/ZWiki/Utils.py:491
 msgid "weeks"
 msgstr "semanas"
 
-#: src/ZWiki/Utils.py:469
+#: src/ZWiki/Utils.py:491
 msgid "week"
 msgstr "semana"
 
-#: src/ZWiki/Utils.py:471
+#: src/ZWiki/Utils.py:493
 msgid "day"
 msgstr "dia"
 
-#: src/ZWiki/Utils.py:471
+#: src/ZWiki/Utils.py:493
 #, fuzzy
 msgid "days"
 msgstr "dias"
 
-#: src/ZWiki/Utils.py:473
+#: src/ZWiki/Utils.py:495
 msgid "hours"
 msgstr "horas"
 
-#: src/ZWiki/Utils.py:473
+#: src/ZWiki/Utils.py:495
 #, fuzzy
 msgid "hour"
 msgstr "hora"
 
-#: src/ZWiki/Utils.py:475
+#: src/ZWiki/Utils.py:497
 msgid "minute"
 msgstr "minuto"
 
-#: src/ZWiki/Utils.py:475
+#: src/ZWiki/Utils.py:497
 msgid "minutes"
 msgstr "minutos"
 
-#: src/ZWiki/Utils.py:477
+#: src/ZWiki/Utils.py:499
 msgid "second"
 msgstr "segundo"
 
-#: src/ZWiki/Utils.py:477
+#: src/ZWiki/Utils.py:499
 msgid "seconds"
 msgstr "segundos"
 
-#: src/ZWiki/Views.py:346
+#: src/ZWiki/Views.py:350
 msgid "Page is locked"
 msgstr "A página está bloqueada"
 
-#: src/ZWiki/Views.py:357
+#: src/ZWiki/Views.py:361
 msgid ""
 "\n"
 "            This page has a webDAV lock. Someone is probably editing it\n"
@@ -198,71 +185,66 @@
 "            "
 msgstr ""
 "\n"
-"            Esta página tem um bloqueio webDAV. Provavelmente alguém está "
-"editando-a\n"
+"            Esta página tem um bloqueio webDAV. Provavelmente alguém está editando-a\n"
 "            com um editor externo. Você precisa aguardar até isto ser\n"
-"            finalizado e então tentar novamente. Se você tiver feito alguma "
-"alteração,\n"
+"            finalizado e então tentar novamente. Se você tiver feito alguma alteração,\n"
 "            você deve voltar e copiar a sua versão do texto como\n"
 "            referência.\n"
 "            "
 
-#: src/ZWiki/Views.py:364
+#: src/ZWiki/Views.py:368
 msgid "To discard your changes and try again, click OK."
 msgstr "Para descartar suas alterações e tentar novamente, clique em OK."
 
-#: src/ZWiki/Views.py:393
+#: src/ZWiki/Views.py:397
 msgid "Edit conflict"
 msgstr "Editar conflito"
 
-#: src/ZWiki/Views.py:413
+#: src/ZWiki/Views.py:417
 msgid "Someone else has saved this page while you were editing"
 msgstr "Alguém salvou esta página enquanto você estava editando"
 
-#: src/ZWiki/Views.py:414
+#: src/ZWiki/Views.py:418
 msgid "To resolve the conflict, do this"
 msgstr "Para resolver o conflito, faça isto"
 
-#: src/ZWiki/Views.py:415
+#: src/ZWiki/Views.py:419
 msgid "Click your browser's back button"
 msgstr "Clique no botão voltar do seu navegador"
 
-#: src/ZWiki/Views.py:416
+#: src/ZWiki/Views.py:420
 msgid "Copy your recent edits to the clipboard"
 msgstr "Copiar suas edições recentes para o clipboard"
 
-#: src/ZWiki/Views.py:417
+#: src/ZWiki/Views.py:421
 msgid "Click your browser's refresh button"
 msgstr "Clique no botão atualizar do seu navegador"
 
-#: src/ZWiki/Views.py:418
+#: src/ZWiki/Views.py:422
 msgid "Paste in your edits again, being mindful of the latest changes"
-msgstr ""
-"Colar novamente nas suas edições, sendo lembradas as últimas alterações"
+msgstr "Colar novamente nas suas edições, sendo lembradas as últimas alterações"
 
-#: src/ZWiki/Views.py:419
+#: src/ZWiki/Views.py:423
 msgid "Click the Change button again"
 msgstr "Clique novamente no botão Alterar"
 
-#: src/ZWiki/Views.py:420 src/ZWiki/skins/zwiki/editform.pt:163
+#: src/ZWiki/Views.py:424 src/ZWiki/skins/zwiki/editform.pt:163
 msgid "or"
 msgstr "ou"
 
-#: src/ZWiki/Views.py:421
+#: src/ZWiki/Views.py:425
 msgid "To discard your changes and start again, click OK"
 msgstr "Para descartar suas alterações e iniciar novamente, clique em OK"
 
-#: src/ZWiki/Views.py:490
+#: src/ZWiki/Views.py:501
 #, fuzzy
 msgid ""
 "\n"
-"        Access keys can be accessed in mozilla-based browsers by pressing "
-"alt-<key>\n"
+"        Access keys can be accessed in mozilla-based browsers by pressing alt-<key>\n"
 "        IE users: must also press enter\n"
 "        Mac users: command-<key>\n"
 "        Opera users: shift-escape-<key>\n"
-"        These won't work here, back up to the previous page to try them "
-"out.\n"
+"        These won't work here, back up to the previous page to try them out.\n"
 "\n"
 "        0    show these access key assignments\n"
 "\n"
@@ -278,10 +260,8 @@
 "        s    go to search field\n"
 "        \n"
 "        page functions:\n"
-"        +    (in a plone/cmf site with skin switching set up) use zwiki's "
-"plone/cmf skin\n"
-"        -    (in a plone/cmf site with skin switching set up) use zwiki's "
-"standard skin\n"
+"        +    (in a plone/cmf site with skin switching set up) use zwiki's plone/cmf skin\n"
+"        -    (in a plone/cmf site with skin switching set up) use zwiki's standard skin\n"
 "        v    view page\n"
 "        m    mail subscription\n"
 "        b    show backlinks (links to this page)\n"
@@ -351,33 +331,32 @@
 "        p    edição anterior\n"
 "        "
 
-#: src/ZWiki/Wikis.py:49
-msgid "Unknown wiki type"
-msgstr ""
-
-#: src/ZWiki/ZWikiPage.py:675
+#: src/ZWiki/ZWikiPage.py:744
 msgid "create this page"
 msgstr "criar esta página"
 
-#: src/ZWiki/ZWikiPage.py:798 src/ZWiki/ZWikiPage.py:814
-#: src/ZWiki/ZWikiPage.py:817
+#: src/ZWiki/ZWikiPage.py:872 src/ZWiki/ZWikiPage.py:887
 msgid "last edited %(interval)s ago"
 msgstr "última edição %(interval)s atrás"
 
-#: src/ZWiki/ZWikiPage.py:809
+#: src/ZWiki/ZWikiPage.py:882
 #, fuzzy
 msgid "show last edit"
 msgstr "mostrar a última edição %(lastlog)s"
 
-#: src/ZWiki/ZWikiPage.py:826 src/ZWiki/ZWikiPage.py:828
+#: src/ZWiki/ZWikiPage.py:897 src/ZWiki/ZWikiPage.py:899
 msgid "by %(editor)s"
 msgstr "por %(editor)s"
 
-#: src/ZWiki/__init__.py:34
+#: src/ZWiki/__init__.py:200
+msgid "Unknown wiki type"
+msgstr ""
+
+#: src/ZWiki/__init__.py:39
 msgid "No need to add a Zwiki Outline Cache"
 msgstr ""
 
-#: src/ZWiki/__init__.py:35
+#: src/ZWiki/__init__.py:40
 msgid ""
 "Zwiki Outline Cache appears in the ZMI Add menu\n"
 "        for implementation reasons, but should not be added directly.\n"
@@ -390,6 +369,10 @@
 msgid "comments"
 msgstr "comentários"
 
+#: src/ZWiki/pagetypes/html.py:50 src/ZWiki/pagetypes/rst.py:85
+msgid "reply"
+msgstr "responder"
+
 #: src/ZWiki/pagetypes/moin.py:1990
 msgid "Expected \"=\" to follow \"%(token)s\""
 msgstr ""
@@ -426,10 +409,6 @@
 msgid "Expected a color value \"%(arg)s\" after \"%(key)s\""
 msgstr ""
 
-#: src/ZWiki/pagetypes/rst.py:85
-msgid "reply"
-msgstr "responder"
-
 #: src/ZWiki/plugins/latexwiki/wikis/latexwiki/diffform.pt:127
 #: src/ZWiki/plugins/mathaction/wikis/mathaction/old-diffform.pt:127
 msgid "full history"
@@ -509,7 +488,7 @@
 msgstr "Título"
 
 #: src/ZWiki/plugins/tracker/filterissues.pt:12
-#: src/ZWiki/skins/dtmlmessages.pt:30
+#: src/ZWiki/skins/dtmlmessages.pt:31
 msgid "Filter issues"
 msgstr "Filtro de ocorrências"
 
@@ -523,389 +502,378 @@
 msgid "Issue tracker"
 msgstr "acompanhamento de ocorrências"
 
-#: src/ZWiki/plugins/tracker/tracker.py:361
+#: src/ZWiki/plugins/tracker/tracker.py:365
 #, fuzzy
 msgid "You are not authorized to comment on this ZWiki Page."
 msgstr "Você não está autorizado a editar esta página ZWiki."
 
-#: src/ZWiki/skins/dtmlmessages.pt:10 src/ZWiki/skins/dtmlmessages.pt:32
+#: src/ZWiki/skins/dtmlmessages.pt:10 src/ZWiki/skins/dtmlmessages.pt:33
+#, fuzzy
+msgid "name"
+msgstr "nome"
+
+#: src/ZWiki/skins/dtmlmessages.pt:11 src/ZWiki/skins/dtmlmessages.pt:34
 msgid "category"
 msgstr "categoria"
 
-#: src/ZWiki/skins/dtmlmessages.pt:11 src/ZWiki/skins/dtmlmessages.pt:33
+#: src/ZWiki/skins/dtmlmessages.pt:12 src/ZWiki/skins/dtmlmessages.pt:35
 #, fuzzy
 msgid "severity"
 msgstr "variedade"
 
-#: src/ZWiki/skins/dtmlmessages.pt:12 src/ZWiki/skins/dtmlmessages.pt:34
+#: src/ZWiki/skins/dtmlmessages.pt:13 src/ZWiki/skins/dtmlmessages.pt:36
 msgid "status"
 msgstr "estado"
 
-#: src/ZWiki/skins/dtmlmessages.pt:13 src/ZWiki/skins/dtmlmessages.pt:35
+#: src/ZWiki/skins/dtmlmessages.pt:14 src/ZWiki/skins/dtmlmessages.pt:37
 #, fuzzy
 msgid "age"
 msgstr "idade"
 
-#: src/ZWiki/skins/dtmlmessages.pt:14 src/ZWiki/skins/dtmlmessages.pt:36
+#: src/ZWiki/skins/dtmlmessages.pt:15 src/ZWiki/skins/dtmlmessages.pt:38
 msgid "modified"
 msgstr "modificado"
 
-#: src/ZWiki/skins/dtmlmessages.pt:15
+#: src/ZWiki/skins/dtmlmessages.pt:16
 msgid "Add a new issue:"
 msgstr "Adicionar uma nova ocorrência:"
 
-#: src/ZWiki/skins/dtmlmessages.pt:16
+#: src/ZWiki/skins/dtmlmessages.pt:17
 #, fuzzy
 msgid "Name:"
 msgstr "Nome:"
 
-#: src/ZWiki/skins/dtmlmessages.pt:17
+#: src/ZWiki/skins/dtmlmessages.pt:18
 msgid "Category:"
 msgstr "Categoria:"
 
-#: src/ZWiki/skins/dtmlmessages.pt:18
+#: src/ZWiki/skins/dtmlmessages.pt:19
 #, fuzzy
 msgid "Severity:"
 msgstr "Variedade:"
 
-#: src/ZWiki/skins/dtmlmessages.pt:19
-msgid "Status:"
-msgstr "Estado:"
-
 #: src/ZWiki/skins/dtmlmessages.pt:2
 #, fuzzy
 msgid "Here are the wiki's issue pages."
 msgstr "Aqui estão as páginas de ocorrências do wiki."
 
 #: src/ZWiki/skins/dtmlmessages.pt:20
+msgid "Status:"
+msgstr "Estado:"
+
+#: src/ZWiki/skins/dtmlmessages.pt:21
 msgid "Details:"
 msgstr "Detalhes:"
 
-#: src/ZWiki/skins/dtmlmessages.pt:21
+#: src/ZWiki/skins/dtmlmessages.pt:22
 msgid "add issue"
 msgstr "adiciona ocorrência"
 
-#: src/ZWiki/skins/dtmlmessages.pt:22
+#: src/ZWiki/skins/dtmlmessages.pt:23
 msgid "More advanced"
 msgstr "Mais avançado"
 
-#: src/ZWiki/skins/dtmlmessages.pt:23
+#: src/ZWiki/skins/dtmlmessages.pt:24
 #, fuzzy
 msgid "issue tracker"
 msgstr "acompanhamento de ocorrências"
 
-#: src/ZWiki/skins/dtmlmessages.pt:24
+#: src/ZWiki/skins/dtmlmessages.pt:25
 #, fuzzy
 msgid "search options"
 msgstr "opções de busca"
 
-#: src/ZWiki/skins/dtmlmessages.pt:25
+#: src/ZWiki/skins/dtmlmessages.pt:26
 msgid "Name contains any of:"
 msgstr "Nome contém:"
 
-#: src/ZWiki/skins/dtmlmessages.pt:26
+#: src/ZWiki/skins/dtmlmessages.pt:27
 msgid "Page text contains any of:"
 msgstr "Texto da página contém:"
 
-#: src/ZWiki/skins/dtmlmessages.pt:27
+#: src/ZWiki/skins/dtmlmessages.pt:28
 msgid "Categories:"
 msgstr "Categorias:"
 
-#: src/ZWiki/skins/dtmlmessages.pt:28
+#: src/ZWiki/skins/dtmlmessages.pt:29
 #, fuzzy
 msgid "Severities:"
 msgstr "Variedades:"
 
-#: src/ZWiki/skins/dtmlmessages.pt:29
-msgid "Statuses:"
-msgstr "Estados"
-
 #: src/ZWiki/skins/dtmlmessages.pt:3
 #, fuzzy
 msgid "Enter a search term, click the numbers to the right,"
 msgstr "Insira um termo de busca, ou clique nos números a direita, ou"
 
-#: src/ZWiki/skins/dtmlmessages.pt:37
+#: src/ZWiki/skins/dtmlmessages.pt:30
+msgid "Statuses:"
+msgstr "Estados"
+
+#: src/ZWiki/skins/dtmlmessages.pt:39
 msgid "Submitted by"
 msgstr "Enviado por"
 
-#: src/ZWiki/skins/dtmlmessages.pt:38
+#: src/ZWiki/skins/dtmlmessages.pt:4
 #, fuzzy
+msgid "filter issues"
+msgstr "filtro de ocorrências"
+
+#: src/ZWiki/skins/dtmlmessages.pt:40
+#, fuzzy
 msgid "Name"
 msgstr "Nome"
 
-#: src/ZWiki/skins/dtmlmessages.pt:39
+#: src/ZWiki/skins/dtmlmessages.pt:41
 msgid "Category"
 msgstr "Categoria"
 
-#: src/ZWiki/skins/dtmlmessages.pt:4
+#: src/ZWiki/skins/dtmlmessages.pt:42
 #, fuzzy
-msgid "filter issues"
-msgstr "filtro de ocorrências"
-
-#: src/ZWiki/skins/dtmlmessages.pt:40
-#, fuzzy
 msgid "Severity"
 msgstr "Variedade"
 
-#: src/ZWiki/skins/dtmlmessages.pt:41
+#: src/ZWiki/skins/dtmlmessages.pt:43
 msgid "Status"
 msgstr "Estado"
 
-#: src/ZWiki/skins/dtmlmessages.pt:42
+#: src/ZWiki/skins/dtmlmessages.pt:44
 #, fuzzy
 msgid "Optional subject"
 msgstr "Nota opcional"
 
-#: src/ZWiki/skins/dtmlmessages.pt:43
+#: src/ZWiki/skins/dtmlmessages.pt:45
 #, fuzzy
 msgid "Optional comment"
 msgstr "Nota opcional"
 
-#: src/ZWiki/skins/dtmlmessages.pt:44 src/ZWiki/skins/dtmlmessages.pt:45
+#: src/ZWiki/skins/dtmlmessages.pt:46 src/ZWiki/skins/dtmlmessages.pt:47
 #, fuzzy
 msgid "Add ZWiki"
 msgstr "adicionar uma Página ZWiki"
 
-#: src/ZWiki/skins/dtmlmessages.pt:46
+#: src/ZWiki/skins/dtmlmessages.pt:48
 #, fuzzy
 msgid "Id:"
 msgstr "Identificador"
 
-#: src/ZWiki/skins/dtmlmessages.pt:47
+#: src/ZWiki/skins/dtmlmessages.pt:49
 #, fuzzy
 msgid "Title:"
 msgstr "Título"
 
-#: src/ZWiki/skins/dtmlmessages.pt:48
+#: src/ZWiki/skins/dtmlmessages.pt:5
+msgid "browse open issues"
+msgstr ""
+
+#: src/ZWiki/skins/dtmlmessages.pt:50
 msgid "Template:"
 msgstr ""
 
-#: src/ZWiki/skins/dtmlmessages.pt:49
+#: src/ZWiki/skins/dtmlmessages.pt:51
 #, fuzzy
 msgid "Add wiki"
 msgstr "adicionar uma Página ZWiki"
 
-#: src/ZWiki/skins/dtmlmessages.pt:5
-msgid "browse open issues"
-msgstr ""
-
-#: src/ZWiki/skins/dtmlmessages.pt:50
+#: src/ZWiki/skins/dtmlmessages.pt:52
 msgid "Pages changed in the last"
 msgstr "Páginas alteradas ultimamente"
 
-#: src/ZWiki/skins/dtmlmessages.pt:51
+#: src/ZWiki/skins/dtmlmessages.pt:53
 msgid "Recently changed pages, with summaries"
 msgstr "Páginas recentemente alteradas, com os sumários"
 
-#: src/ZWiki/skins/dtmlmessages.pt:52
+#: src/ZWiki/skins/dtmlmessages.pt:54
 msgid "Show summaries ?"
 msgstr "Mostrar sumários ?"
 
-#: src/ZWiki/skins/dtmlmessages.pt:53
+#: src/ZWiki/skins/dtmlmessages.pt:55
 msgid "Refresh"
 msgstr "Atualizar"
 
-#: src/ZWiki/skins/dtmlmessages.pt:54
+#: src/ZWiki/skins/dtmlmessages.pt:56
 #, fuzzy
 msgid "Page"
 msgstr "Página"
 
-#: src/ZWiki/skins/dtmlmessages.pt:55
+#: src/ZWiki/skins/dtmlmessages.pt:57
 msgid "Edited&nbsp;by"
 msgstr "Editado&nbsp;por"
 
-#: src/ZWiki/skins/dtmlmessages.pt:56
+#: src/ZWiki/skins/dtmlmessages.pt:58
 msgid "Time"
 msgstr "Tempo"
 
-#: src/ZWiki/skins/dtmlmessages.pt:57
+#: src/ZWiki/skins/dtmlmessages.pt:59
 msgid "NEW"
 msgstr "NOVO"
 
-#: src/ZWiki/skins/dtmlmessages.pt:59
-msgid "Pages marked (NEW) have been created within the last week"
-msgstr "Páginas marcadas (NOVO) foram criadas durante a última semana"
-
 #: src/ZWiki/skins/dtmlmessages.pt:6
 msgid "search issues"
 msgstr "buscar ocorrências"
 
-#: src/ZWiki/skins/dtmlmessages.pt:60
+#: src/ZWiki/skins/dtmlmessages.pt:61
+msgid "Pages marked (NEW) have been created within the last week"
+msgstr "Páginas marcadas (NOVO) foram criadas durante a última semana"
+
+#: src/ZWiki/skins/dtmlmessages.pt:62
 msgid "Enter a word or phrase and hit enter to search the entire wiki."
-msgstr ""
-"Insira uma paravra ou frase e acesse enter para buscar no wiki inteiro."
+msgstr "Insira uma paravra ou frase e acesse enter para buscar no wiki inteiro."
 
-#: src/ZWiki/skins/dtmlmessages.pt:61
+#: src/ZWiki/skins/dtmlmessages.pt:63
 msgid "This is the same as using the search field at top right."
 msgstr "Isto é o mesmo que usar o campo de busca no topo direito."
 
-#: src/ZWiki/skins/dtmlmessages.pt:62
+#: src/ZWiki/skins/dtmlmessages.pt:64
 msgid "Tips: A single word works best for matching page names."
-msgstr ""
-"Dicas: Uma palavra simples funciona melhor para nomes de páginas combinados."
+msgstr "Dicas: Uma palavra simples funciona melhor para nomes de páginas combinados."
 
-#: src/ZWiki/skins/dtmlmessages.pt:63
-msgid ""
-"Case-insensitivity and wildcards may be supported depending on your catalog "
-"configuration."
-msgstr ""
-"Insensível-a-caixa e wildcards podem ser suportados dependendo da "
-"configuração do seu catálogo."
+#: src/ZWiki/skins/dtmlmessages.pt:65
+msgid "Case-insensitivity and wildcards may be supported depending on your catalog configuration."
+msgstr "Insensível-a-caixa e wildcards podem ser suportados dependendo da configuração do seu catálogo."
 
-#: src/ZWiki/skins/dtmlmessages.pt:64
+#: src/ZWiki/skins/dtmlmessages.pt:66
 msgid "Leave it blank to list all pages."
 msgstr "Deixe em branco para listar todas as páginas."
 
-#: src/ZWiki/skins/dtmlmessages.pt:65 src/ZWiki/skins/dtmlmessages.pt:66
+#: src/ZWiki/skins/dtmlmessages.pt:67 src/ZWiki/skins/dtmlmessages.pt:68
 msgid "Search"
 msgstr "Buscar"
 
-#: src/ZWiki/skins/dtmlmessages.pt:67
+#: src/ZWiki/skins/dtmlmessages.pt:69
 #, fuzzy
 msgid "Page names matching"
 msgstr "Nomes das páginas combinados"
 
-#: src/ZWiki/skins/dtmlmessages.pt:68
+#: src/ZWiki/skins/dtmlmessages.pt:7
+#, fuzzy
+msgid "recent"
+msgstr "recente"
+
+#: src/ZWiki/skins/dtmlmessages.pt:70
 msgid "Text matching"
 msgstr "Texto combinado"
 
-#: src/ZWiki/skins/dtmlmessages.pt:69
+#: src/ZWiki/skins/dtmlmessages.pt:71
 msgid "Thorough (non-catalog) search for text matching"
 msgstr ""
 
-#: src/ZWiki/skins/dtmlmessages.pt:7
+#: src/ZWiki/skins/dtmlmessages.pt:72
 #, fuzzy
-msgid "recent"
-msgstr "recente"
-
-#: src/ZWiki/skins/dtmlmessages.pt:70
-#, fuzzy
 msgid "Set your preferences for this wiki:"
 msgstr "Configure suas preferências do site abaixo."
 
-#: src/ZWiki/skins/dtmlmessages.pt:71
+#: src/ZWiki/skins/dtmlmessages.pt:73
 #, fuzzy
 msgid "User name:"
 msgstr "Nome do usuário"
 
-#: src/ZWiki/skins/dtmlmessages.pt:72
-#, fuzzy
-msgid "(identifies your edits)"
-msgstr "identifique suas edições"
+#: src/ZWiki/skins/dtmlmessages.pt:74
+msgid "(identifies your edits, saves your votes, may be required)"
+msgstr ""
 
-#: src/ZWiki/skins/dtmlmessages.pt:73
+#: src/ZWiki/skins/dtmlmessages.pt:75
 #, fuzzy
 msgid "Email address:"
 msgstr "Endereço de e-mail"
 
-#: src/ZWiki/skins/dtmlmessages.pt:74
+#: src/ZWiki/skins/dtmlmessages.pt:76
 #, fuzzy
 msgid "(allows mail subscription)"
 msgstr "Envio de inscrição"
 
-#: src/ZWiki/skins/dtmlmessages.pt:75
+#: src/ZWiki/skins/dtmlmessages.pt:77
 #, fuzzy
 msgid "Your time zone:"
 msgstr "Local de tempo"
 
-#: src/ZWiki/skins/dtmlmessages.pt:76
+#: src/ZWiki/skins/dtmlmessages.pt:78
 msgid "(localizes most times)"
 msgstr "(localizar a maioria dos tempos)"
 
-#: src/ZWiki/skins/dtmlmessages.pt:77
+#: src/ZWiki/skins/dtmlmessages.pt:79
 #, fuzzy
 msgid "Edit form height:"
 msgstr "Editar formulário"
 
-#: src/ZWiki/skins/dtmlmessages.pt:78
+#: src/ZWiki/skins/dtmlmessages.pt:8
+msgid "all"
+msgstr "todos"
+
+#: src/ZWiki/skins/dtmlmessages.pt:80
 msgid "(adjusts form size)"
 msgstr ""
 
-#: src/ZWiki/skins/dtmlmessages.pt:79
+#: src/ZWiki/skins/dtmlmessages.pt:81
 #, fuzzy
 msgid "Save options"
 msgstr "Salvar opções"
 
-#: src/ZWiki/skins/dtmlmessages.pt:8
-msgid "all"
-msgstr "todos"
-
-#: src/ZWiki/skins/dtmlmessages.pt:80
+#: src/ZWiki/skins/dtmlmessages.pt:82
 #, fuzzy
 msgid "Forget options"
 msgstr "Opções esquecidas"
 
-#: src/ZWiki/skins/dtmlmessages.pt:81 src/ZWiki/skins/dtmlmessages.pt:82
+#: src/ZWiki/skins/dtmlmessages.pt:83 src/ZWiki/skins/dtmlmessages.pt:84
 #, fuzzy
 msgid "Add ZWiki Page"
 msgstr "adicionar uma Página ZWiki"
 
-#: src/ZWiki/skins/dtmlmessages.pt:83
+#: src/ZWiki/skins/dtmlmessages.pt:85
 #, fuzzy
 msgid "Page&nbsp;name:"
 msgstr "Nome da página"
 
-#: src/ZWiki/skins/dtmlmessages.pt:84
+#: src/ZWiki/skins/dtmlmessages.pt:86
 #, fuzzy
 msgid "Add wiki page"
 msgstr "adicionar uma Página ZWiki"
 
-#: src/ZWiki/skins/dtmlmessages.pt:85
+#: src/ZWiki/skins/dtmlmessages.pt:87
 #, fuzzy
 msgid "Topic"
 msgstr "é um subtópico de:"
 
-#: src/ZWiki/skins/dtmlmessages.pt:86
+#: src/ZWiki/skins/dtmlmessages.pt:88
 msgid "Last updated"
 msgstr ""
 
-#: src/ZWiki/skins/dtmlmessages.pt:87
+#: src/ZWiki/skins/dtmlmessages.pt:89
 #, fuzzy
 msgid "Comments"
 msgstr "comentários"
 
-#: src/ZWiki/skins/dtmlmessages.pt:88
+#: src/ZWiki/skins/dtmlmessages.pt:9 src/ZWiki/skins/dtmlmessages.pt:32
+msgid "#"
+msgstr ""
+
+#: src/ZWiki/skins/dtmlmessages.pt:90
 #, fuzzy
 msgid "Views"
 msgstr "visualizar"
 
-#: src/ZWiki/skins/dtmlmessages.pt:89
+#: src/ZWiki/skins/dtmlmessages.pt:91
 #, fuzzy
 msgid "Created"
 msgstr "Criar"
 
-#: src/ZWiki/skins/dtmlmessages.pt:9 src/ZWiki/skins/dtmlmessages.pt:31
-msgid "#"
-msgstr ""
-
-#: src/ZWiki/skins/dtmlmessages.pt:90 src/ZWiki/skins/dtmlmessages.pt:92
+#: src/ZWiki/skins/dtmlmessages.pt:92 src/ZWiki/skins/dtmlmessages.pt:94
 msgid "by"
 msgstr ""
 
-#: src/ZWiki/skins/dtmlmessages.pt:91
+#: src/ZWiki/skins/dtmlmessages.pt:93
 msgid "<dtml-var lasteditinterval> ago</dtml-var>"
 msgstr ""
 
-#: src/ZWiki/skins/dtmlmessages.pt:93
+#: src/ZWiki/skins/dtmlmessages.pt:95
 msgid "on"
 msgstr ""
 
-#: src/ZWiki/skins/zwiki/backlinks.pt:108
+#: src/ZWiki/skins/zwiki/backlinks.pt:102
 #, fuzzy
-msgid "Subtopics"
-msgstr "é um subtópico de:"
-
-#: src/ZWiki/skins/zwiki/backlinks.pt:111
-msgid "This page has no subtopics."
-msgstr ""
-
-#: src/ZWiki/skins/zwiki/backlinks.pt:114
-#, fuzzy
 msgid "Here are it's subtopics."
 msgstr "Aqui estão as páginas de ocorrências do wiki."
 
-#: src/ZWiki/skins/zwiki/backlinks.pt:117
+#: src/ZWiki/skins/zwiki/backlinks.pt:105
 msgid "You can reorder them by clicking the ^ buttons."
 msgstr ""
 
@@ -919,67 +887,65 @@
 msgid "Parents"
 msgstr "Reordenar"
 
-#: src/ZWiki/skins/zwiki/backlinks.pt:31
+#: src/ZWiki/skins/zwiki/backlinks.pt:28
 msgid "is a top-level topic."
 msgstr "é um tópico de nível superior."
 
-#: src/ZWiki/skins/zwiki/backlinks.pt:32
+#: src/ZWiki/skins/zwiki/backlinks.pt:29
 msgid "is a subtopic of:"
 msgstr "é um subtópico de:"
 
-#: src/ZWiki/skins/zwiki/backlinks.pt:55
+#: src/ZWiki/skins/zwiki/backlinks.pt:48
 #, fuzzy
 msgid "Backlinks"
 msgstr "links para"
 
-#: src/ZWiki/skins/zwiki/backlinks.pt:56
+#: src/ZWiki/skins/zwiki/backlinks.pt:49
 msgid "Here are the pages which link to it:"
 msgstr "Aqui estão as páginas que apontam para esta:"
 
-#: src/ZWiki/skins/zwiki/backlinks.pt:57
+#: src/ZWiki/skins/zwiki/backlinks.pt:50
 #, fuzzy
 msgid "No other pages link to this one."
 msgstr "Que páginas linkam para esta?"
 
-#: src/ZWiki/skins/zwiki/backlinks.pt:82
-msgid ""
-"You can set this page's parent(s) to place it within the overall page "
-"hierarchy."
+#: src/ZWiki/skins/zwiki/backlinks.pt:70
+msgid "You can set this page's parent(s) to place it within the overall page hierarchy."
 msgstr ""
 
-#: src/ZWiki/skins/zwiki/backlinks.pt:85
-msgid ""
-"Check one or more checkboxes or enter a page name here, and click the button."
+#: src/ZWiki/skins/zwiki/backlinks.pt:73
+msgid "Check one or more checkboxes or enter a page name here, and click the button."
 msgstr ""
 
-#: src/ZWiki/skins/zwiki/backlinks.pt:88
+#: src/ZWiki/skins/zwiki/backlinks.pt:76
 msgid "Enter a page name here and click the button."
 msgstr ""
 
-#: src/ZWiki/skins/zwiki/backlinks.pt:91
-msgid ""
-"You can type just the first few letters, case and punctuation are ignored."
+#: src/ZWiki/skins/zwiki/backlinks.pt:79
+msgid "You can type just the first few letters, case and punctuation are ignored."
 msgstr ""
 
-#: src/ZWiki/skins/zwiki/backlinks.pt:98
+#: src/ZWiki/skins/zwiki/backlinks.pt:86
 msgid "Reparent"
 msgstr "Reordenar"
 
+#: src/ZWiki/skins/zwiki/backlinks.pt:96
+#, fuzzy
+msgid "Subtopics"
+msgstr "é um subtópico de:"
+
+#: src/ZWiki/skins/zwiki/backlinks.pt:99
+msgid "This page has no subtopics."
+msgstr ""
+
 #: src/ZWiki/skins/zwiki/badtemplate.pt:12
 msgid "Bad template"
 msgstr ""
 
 #: src/ZWiki/skins/zwiki/badtemplate.pt:13
 #, fuzzy
-msgid ""
-"There was a problem locating one of this wiki's skin templates. There may be "
-"a page or other non-page-template/non-dtml-method object with the same ID, "
-"obscuring the template. Or the template may be missing on the filesystem (an "
-"incomplete Zwiki installation)."
-msgstr ""
-"Existe um problema com um destes templates de pele do wiki. Talvez exista um "
-"objeto com um ID de um template de pele que não é uma Page Template ou DTML "
-"Method, ou o template pode estar danificado."
+msgid "There was a problem locating one of this wiki's skin templates. There may be a page or other non-page-template/non-dtml-method object with the same ID, obscuring the template. Or the template may be missing on the filesystem (an incomplete Zwiki installation)."
+msgstr "Existe um problema com um destes templates de pele do wiki. Talvez exista um objeto com um ID de um template de pele que não é uma Page Template ou DTML Method, ou o template pode estar danificado."
 
 #: src/ZWiki/skins/zwiki/commentform.pt:21
 msgid "subject"
@@ -995,9 +961,7 @@
 
 #: src/ZWiki/skins/zwiki/commentform.pt:36
 msgid "to comment (and cc any subscribers) enter text here and click add"
-msgstr ""
-"para comentar (e enviar cópia para alguns inscritos) insira o texto aqui e "
-"clique em adicionar"
+msgstr "para comentar (e enviar cópia para alguns inscritos) insira o texto aqui e clique em adicionar"
 
 #: src/ZWiki/skins/zwiki/commentform.pt:56
 msgid "${nb} subscribers"
@@ -1012,13 +976,21 @@
 msgid "add-comment"
 msgstr "Adicionar um comentário"
 
-#: src/ZWiki/skins/zwiki/contentspage.pt:12
+#: src/ZWiki/skins/zwiki/contentspage.pt:10
+#: src/ZWiki/skins/zwiki/contentspage.pt:27
 #, fuzzy
+msgid "Wiki contents for"
+msgstr "Conteúdos do wiki"
+
+#: src/ZWiki/skins/zwiki/contentspage.pt:13
+#: src/ZWiki/skins/zwiki/contentspage.pt:30
+#, fuzzy
 msgid "Wiki contents"
 msgstr "Conteúdos do wiki"
 
-#: src/ZWiki/skins/zwiki/contentspage.pt:16
-msgid "Singletons"
+#: src/ZWiki/skins/zwiki/contentspage.pt:40
+#, fuzzy
+msgid "Singletons:"
 msgstr "Simples"
 
 #: src/ZWiki/skins/zwiki/denied.pt:12
@@ -1108,13 +1080,13 @@
 
 #: src/ZWiki/skins/zwiki/editform.pt:178
 #, fuzzy
-msgid "preview this edit"
-msgstr "<< edição anterior"
+msgid "Preview"
+msgstr "visualizar"
 
 #: src/ZWiki/skins/zwiki/editform.pt:178
 #, fuzzy
-msgid "Preview"
-msgstr "visualizar"
+msgid "preview this edit"
+msgstr "<< edição anterior"
 
 #: src/ZWiki/skins/zwiki/editform.pt:183
 #, fuzzy
@@ -1152,13 +1124,18 @@
 msgstr "o nome desta página wiki (a alteração disto pode ser lenta!)"
 
 #: src/ZWiki/skins/zwiki/editform.pt:71
-msgid "type"
-msgstr "tipo"
+msgid "markup"
+msgstr ""
 
 #: src/ZWiki/skins/zwiki/editform.pt:72
 msgid "select the formatting and rendering style for this page"
 msgstr "selecione o estilo de formatação e renderização desta página"
 
+#: src/ZWiki/skins/zwiki/helppage.pt:12
+#, fuzzy
+msgid "Help page"
+msgstr "PaginaDeAjuda"
+
 #: src/ZWiki/skins/zwiki/links.pt:102
 msgid "(external edit)"
 msgstr "(edição externa)"
@@ -1306,19 +1283,17 @@
 
 #: src/ZWiki/skins/zwiki/pagemanagementform.pt:45
 #, fuzzy
-msgid "reparent"
-msgstr "Reordenar"
+msgid "make this page a subtopic of the page you have entered"
+msgstr "reordene esta página na página que você quer inserir"
 
 #: src/ZWiki/skins/zwiki/pagemanagementform.pt:45
 #, fuzzy
-msgid "make this page a subtopic of the page you have entered"
-msgstr "reordene esta página na página que você quer inserir"
+msgid "reparent"
+msgstr "Reordenar"
 
 #: src/ZWiki/skins/zwiki/pagemanagementform.pt:50
 msgid "rename this page to the name you have entered, updating all links"
-msgstr ""
-"renomeie esta página para o nome que você quer inserir, atualizando todos os "
-"links"
+msgstr "renomeie esta página para o nome que você quer inserir, atualizando todos os links"
 
 #: src/ZWiki/skins/zwiki/pagemanagementform.pt:50
 #, fuzzy
@@ -1331,16 +1306,13 @@
 
 #: src/ZWiki/skins/zwiki/pagemanagementform.pt:55
 #, fuzzy
-msgid ""
-"delete this page, and redirect links to the page you have entered, if any"
+msgid "delete this page, and redirect links to the page you have entered, if any"
 msgstr "reordene esta página na página que você quer inserir"
 
 #: src/ZWiki/skins/zwiki/pagemanagementform.pt:60
 #, fuzzy
 msgid "create a page with the name you have entered, as a subtopic of this one"
-msgstr ""
-"renomeie esta página para o nome que você quer inserir, atualizando todos os "
-"links"
+msgstr "renomeie esta página para o nome que você quer inserir, atualizando todos os links"
 
 #: src/ZWiki/skins/zwiki/pagemanagementform.pt:60
 #, fuzzy
@@ -1414,8 +1386,7 @@
 msgstr ""
 "Você pode inscrever-se nesta página ou em todo o wiki.\n"
 "          Os inscritos recebem uma cópia dos comentários via e-mail\n"
-"          (porém não as edições gerais, a menos que seja habilitado pelo "
-"administrador do site).\n"
+"          (porém não as edições gerais, a menos que seja habilitado pelo administrador do site).\n"
 "          Ou retorne para"
 
 #. Default: ""
@@ -1428,8 +1399,7 @@
 msgstr ""
 "Você pode inscrever-se nesta página ou em todo o wiki.\n"
 "          Os inscritos recebem uma cópia dos comentários via e-mail\n"
-"          (porém não as edições gerais, a menos que seja habilitado pelo "
-"administrador do site).\n"
+"          (porém não as edições gerais, a menos que seja habilitado pelo administrador do site).\n"
 "          Ou retorne para"
 
 #: src/ZWiki/skins/zwiki/subscribeform.pt:53
@@ -1482,6 +1452,13 @@
 msgid "User options"
 msgstr "opções de busca"
 
+#, fuzzy
+#~ msgid "(identifies your edits)"
+#~ msgstr "identifique suas edições"
+
+#~ msgid "type"
+#~ msgstr "tipo"
+
 #~ msgid "Add a ZWiki web"
 #~ msgstr "Adicione um ZWiki web"
 
@@ -1495,14 +1472,8 @@
 #~ msgid "and enter"
 #~ msgstr "e entre"
 
-#~ msgid ""
-#~ "You may create a new ZWiki Page object using the form below. You may also "
-#~ "choose to upload an existing html file from your local computer by "
-#~ "clicking the <i>Browse</i> button."
-#~ msgstr ""
-#~ "Você pode criar um novo objeto Página ZWiki usando o formulário abaixo. "
-#~ "Você também pode escolher atualizar um arquivo html existente do seu "
-#~ "computador local clicando o botão <i>Navegar</i>."
+#~ msgid "You may create a new ZWiki Page object using the form below. You may also choose to upload an existing html file from your local computer by clicking the <i>Browse</i> button."
+#~ msgstr "Você pode criar um novo objeto Página ZWiki usando o formulário abaixo. Você também pode escolher atualizar um arquivo html existente do seu computador local clicando o botão <i>Navegar</i>."
 
 #~ msgid "File"
 #~ msgstr "Arquivo"
@@ -1532,28 +1503,22 @@
 #~ msgstr "voltar para a página"
 
 #~ msgid "help_shortname"
-#~ msgstr ""
-#~ "Nota: Renomear uma página em um wiki grande pode ser lento. Outras "
-#~ "páginas serão atualizadas se possível."
+#~ msgstr "Nota: Renomear uma página em um wiki grande pode ser lento. Outras páginas serão atualizadas se possível."
 
 #~ msgid "label_body_text"
 #~ msgstr "Corpo do texto"
 
 #~ msgid "help_wikibody"
 #~ msgstr ""
-#~ "Em uma página Wiki, você usa [colchetes] para criar links. Quando você "
-#~ "salva a página, os conteúdos\n"
-#~ "            entre colchetes terão um pequeno link <code>?</code> depois "
-#~ "deles, que você clica para criar\n"
+#~ "Em uma página Wiki, você usa [colchetes] para criar links. Quando você salva a página, os conteúdos\n"
+#~ "            entre colchetes terão um pequeno link <code>?</code> depois deles, que você clica para criar\n"
 #~ "            uma nova página com esse nome."
 
 #, fuzzy
 #~ msgid "help_wikiwords"
 #~ msgstr ""
-#~ "Em uma página Wiki, você usa [colchetes] para criar links. Quando você "
-#~ "salva a página, os conteúdos\n"
-#~ "            entre colchetes terão um pequeno link <code>?</code> depois "
-#~ "deles, que você clica para criar\n"
+#~ "Em uma página Wiki, você usa [colchetes] para criar links. Quando você salva a página, os conteúdos\n"
+#~ "            entre colchetes terão um pequeno link <code>?</code> depois deles, que você clica para criar\n"
 #~ "            uma nova página com esse nome."
 
 #~ msgid "label_note"
@@ -1587,8 +1552,7 @@
 #~ "        \"${pagename}\""
 
 #~ msgid "description_edit_wiki_page"
-#~ msgstr ""
-#~ "Uma página do Wiki permite a você criar páginas ricamente interconectadas."
+#~ msgstr "Uma página do Wiki permite a você criar páginas ricamente interconectadas."
 
 #~ msgid "legend_wiki_page_details"
 #~ msgstr "Detalhes da Página Wiki"
@@ -1633,19 +1597,15 @@
 
 #~ msgid "backlinks_reparent_help"
 #~ msgstr ""
-#~ "Você pode alterar o(s) pai(s) desta(s) página(s) para colocá-la(s) com "
-#~ "todas as páginas\n"
-#~ "da hierarquia. Selecione a caixa ou insira um novo nome de página e "
-#~ "clique em Reparentar.\n"
+#~ "Você pode alterar o(s) pai(s) desta(s) página(s) para colocá-la(s) com todas as páginas\n"
+#~ "da hierarquia. Selecione a caixa ou insira um novo nome de página e clique em Reparentar.\n"
 #~ "Um pai simples é geralmente suficiente."
 
 #, fuzzy
 #~ msgid "backlinks_reparent_help2"
 #~ msgstr ""
-#~ "Você pode alterar o(s) pai(s) desta(s) página(s) para colocá-la(s) com "
-#~ "todas as páginas\n"
-#~ "da hierarquia. Selecione a caixa ou insira um novo nome de página e "
-#~ "clique em Reparentar.\n"
+#~ "Você pode alterar o(s) pai(s) desta(s) página(s) para colocá-la(s) com todas as páginas\n"
+#~ "da hierarquia. Selecione a caixa ou insira um novo nome de página e clique em Reparentar.\n"
 #~ "Um pai simples é geralmente suficiente."
 
 #, fuzzy
@@ -1748,12 +1708,8 @@
 #~ msgid "hits"
 #~ msgstr "acessos"
 
-#~ msgid ""
-#~ "no catalog or the catalog search gave an error, a brute-force search was "
-#~ "used"
-#~ msgstr ""
-#~ "nenhum catálogo ou deu um erro no catálogo de buscas, uma busca na força-"
-#~ "bruta foi usada"
+#~ msgid "no catalog or the catalog search gave an error, a brute-force search was used"
+#~ msgstr "nenhum catálogo ou deu um erro no catálogo de buscas, uma busca na força-bruta foi usada"
 
 #~ msgid "Contents"
 #~ msgstr "Conteudos"
@@ -1761,10 +1717,6 @@
 #~ msgid "Diffs for"
 #~ msgstr "Comparações para"
 
-#, fuzzy
-#~ msgid "name"
-#~ msgstr "nome"
-
 #~ msgid "page rating"
 #~ msgstr "avaliação da página"
 
@@ -1791,9 +1743,7 @@
 #~ msgstr "Outro pai"
 
 #~ msgid "You may also click the full, simple, minimal links if provided."
-#~ msgstr ""
-#~ "Você pode tambem clicar nos links total, simples, mínimo se estiverem "
-#~ "disponíveis."
+#~ msgstr "Você pode tambem clicar nos links total, simples, mínimo se estiverem disponíveis."
 
 #~ msgid "for subscribing"
 #~ msgstr "para inscrição"
@@ -1823,8 +1773,7 @@
 #~ msgstr "Mostrar a hierarquia de páginas ?"
 
 #~ msgid "This wiki keeps a page hierarchy, which you can use or ignore."
-#~ msgstr ""
-#~ "Este wiki mantém uma hierarquia de páginas, que você pode usar ou ignorar."
+#~ msgstr "Este wiki mantém uma hierarquia de páginas, que você pode usar ou ignorar."
 
 #~ msgid "Show search field ?"
 #~ msgstr "Mostrar campo de busca ?"
@@ -1850,25 +1799,17 @@
 #~ msgid "parent_name_replace"
 #~ msgstr "novo pai, nome ou substituição"
 
-#~ msgid ""
-#~ "enter a new parent, new name, replacement page (if any) or subtopic name"
-#~ msgstr ""
-#~ "insira um novo pai, novo nome, substitua a página (se tiver) ou o nome do "
-#~ "subtópico"
+#~ msgid "enter a new parent, new name, replacement page (if any) or subtopic name"
+#~ msgstr "insira um novo pai, novo nome, substitua a página (se tiver) ou o nome do subtópico"
 
 #~ msgid "box_zwiki_showhierarchy"
 #~ msgstr ""
-#~ "Você pode também configurar o(s) <em>pai(s)</em> desta página, para "
-#~ "localizá-la na\n"
-#~ "    hierarquia de conteúdos. Selecione as caixar ou insira um novo nome "
-#~ "da página e clique \n"
+#~ "Você pode também configurar o(s) <em>pai(s)</em> desta página, para localizá-la na\n"
+#~ "    hierarquia de conteúdos. Selecione as caixar ou insira um novo nome da página e clique \n"
 #~ "    Reordenar. Um pai simples geralmente é suficiente."
 
-#~ msgid ""
-#~ "move this page to the recycle bin, and relink to the name you have entered"
-#~ msgstr ""
-#~ "mova esta página para a lixeira, e reaponte para o nome que você quer "
-#~ "inserir"
+#~ msgid "move this page to the recycle bin, and relink to the name you have entered"
+#~ msgstr "mova esta página para a lixeira, e reaponte para o nome que você quer inserir"
 
 #, fuzzy
 #~ msgid "create a new subtopic of this page"

Modified: zope-zwiki/trunk/i18n/ro.po
===================================================================
--- zope-zwiki/trunk/i18n/ro.po	2007-04-08 14:54:05 UTC (rev 761)
+++ zope-zwiki/trunk/i18n/ro.po	2007-04-08 14:55:27 UTC (rev 762)
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: zwiki\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL at ADDRESS>\n"
-"POT-Creation-Date: Sat Sep  2 18:10:16 2006\n"
+"POT-Creation-Date: Tue Mar 27 14:50:46 2007\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
 "Language-Team: Romanian <ro at li.org>\n"
@@ -18,33 +18,29 @@
 "100 > 19) || ((n % 100 == 0) && (n != 0))) ? 2: 1))\n"
 "Domain: zwiki\n"
 
-#: src/ZWiki/Admin.py:62
+#: src/ZWiki/Admin.py:58
 msgid "You are not authorized to upgrade all pages."
 msgstr ""
 
-#: src/ZWiki/Admin.py:63
+#: src/ZWiki/Admin.py:59
 msgid "(folder -> Manage properties)"
 msgstr ""
 
-#: src/ZWiki/Diff.py:174
+#: src/ZWiki/Diff.py:179
 msgid "You are not authorized to reparent this ZWiki Page."
 msgstr ""
 
-#: src/ZWiki/Diff.py:180 src/ZWiki/plugins/tracker/tracker.py:332
+#: src/ZWiki/Diff.py:185 src/ZWiki/plugins/tracker/tracker.py:333
 msgid "You are not authorized to rename this ZWiki Page."
 msgstr ""
 
-#: src/ZWiki/Editing.py:156 src/ZWiki/Editing.py:294 src/ZWiki/Views.py:332
-#: src/ZWiki/Views.py:435 src/ZWiki/plugins/tracker/tracker.py:321
-msgid ""
-"Sorry, this wiki doesn't allow anonymous edits. Please configure a username "
-"in options first."
+#: src/ZWiki/Editing.py:156 src/ZWiki/Editing.py:294 src/ZWiki/Views.py:336
+#: src/ZWiki/Views.py:439 src/ZWiki/plugins/tracker/tracker.py:322
+msgid "Sorry, this wiki doesn't allow anonymous edits. Please configure a username in options first."
 msgstr ""
 
 #: src/ZWiki/Editing.py:327
-msgid ""
-"You are not authorized to reparent or change subtopics links on this ZWiki "
-"Page."
+msgid "You are not authorized to reparent or change subtopics links on this ZWiki Page."
 msgstr ""
 
 #: src/ZWiki/Editing.py:349
@@ -52,9 +48,9 @@
 msgstr ""
 
 #: src/ZWiki/Editing.py:383 src/ZWiki/Editing.py:410
-#: src/ZWiki/plugins/tracker/tracker.py:340
-#: src/ZWiki/plugins/tracker/tracker.py:347
-#: src/ZWiki/plugins/tracker/tracker.py:354
+#: src/ZWiki/plugins/tracker/tracker.py:344
+#: src/ZWiki/plugins/tracker/tracker.py:351
+#: src/ZWiki/plugins/tracker/tracker.py:358
 msgid "You are not authorized to edit this ZWiki Page."
 msgstr ""
 
@@ -63,8 +59,7 @@
 msgstr ""
 
 #: src/ZWiki/Editing.py:563
-msgid ""
-"This page was renamed to %s. You can delete this one if no longer needed.\n"
+msgid "This page was renamed to %s. You can delete this one if no longer needed.\n"
 msgstr ""
 
 #: src/ZWiki/Editing.py:659
@@ -84,9 +79,7 @@
 msgstr ""
 
 #: src/ZWiki/Editing.py:830
-msgid ""
-"your edit contained a banned link pattern. Please contact the site "
-"administrator for help."
+msgid "your edit contained a banned link pattern. Please contact the site administrator for help."
 msgstr ""
 
 #: src/ZWiki/Editing.py:841
@@ -94,10 +87,7 @@
 msgstr ""
 
 #: src/ZWiki/Editing.py:842
-msgid ""
-"adding of external links by unidentified users is restricted. Please back up "
-"and remove some of the http urls you added, or contact the site "
-"administrator for help."
+msgid "adding of external links by unidentified users is restricted. Please back up and remove some of the http urls you added, or contact the site administrator for help."
 msgstr ""
 
 #: src/ZWiki/Editing.py:853
@@ -105,85 +95,86 @@
 msgstr ""
 
 #: src/ZWiki/Editing.py:854
-msgid ""
-"adding of external links is restricted, even for identified users. Please "
-"back up and remove some of the http urls you added, or contact the site "
-"administrator for help."
+msgid "adding of external links is restricted, even for identified users. Please back up and remove some of the http urls you added, or contact the site administrator for help."
 msgstr ""
 
-#: src/ZWiki/Mail.py:506 src/ZWiki/skins/dtmlmessages.pt:58
+#: src/ZWiki/Mail.py:506 src/ZWiki/skins/dtmlmessages.pt:60
 msgid "anonymous"
 msgstr ""
 
-#: src/ZWiki/OutlineSupport.py:843 src/ZWiki/skins/zwiki/links.pt:56
+#: src/ZWiki/OutlineSupport.py:378
+msgid "Sorry, this wiki doesn't allow anonymous reparenting. Please configure a username in options first."
+msgstr ""
+
+#: src/ZWiki/OutlineSupport.py:878 src/ZWiki/skins/zwiki/links.pt:56
 msgid "which pages link to this one ?"
 msgstr ""
 
-#: src/ZWiki/OutlineSupport.py:851
+#: src/ZWiki/OutlineSupport.py:886
 msgid "You are here"
 msgstr ""
 
-#: src/ZWiki/Utils.py:465
+#: src/ZWiki/Utils.py:487
 msgid "years"
 msgstr ""
 
-#: src/ZWiki/Utils.py:465
+#: src/ZWiki/Utils.py:487
 msgid "year"
 msgstr ""
 
-#: src/ZWiki/Utils.py:467
+#: src/ZWiki/Utils.py:489
 msgid "month"
 msgstr ""
 
-#: src/ZWiki/Utils.py:467
+#: src/ZWiki/Utils.py:489
 msgid "months"
 msgstr ""
 
-#: src/ZWiki/Utils.py:469
+#: src/ZWiki/Utils.py:491
 msgid "weeks"
 msgstr ""
 
-#: src/ZWiki/Utils.py:469
+#: src/ZWiki/Utils.py:491
 msgid "week"
 msgstr ""
 
-#: src/ZWiki/Utils.py:471
+#: src/ZWiki/Utils.py:493
 msgid "day"
 msgstr ""
 
-#: src/ZWiki/Utils.py:471
+#: src/ZWiki/Utils.py:493
 msgid "days"
 msgstr ""
 
-#: src/ZWiki/Utils.py:473
+#: src/ZWiki/Utils.py:495
 msgid "hours"
 msgstr ""
 
-#: src/ZWiki/Utils.py:473
+#: src/ZWiki/Utils.py:495
 msgid "hour"
 msgstr ""
 
-#: src/ZWiki/Utils.py:475
+#: src/ZWiki/Utils.py:497
 msgid "minute"
 msgstr ""
 
-#: src/ZWiki/Utils.py:475
+#: src/ZWiki/Utils.py:497
 msgid "minutes"
 msgstr ""
 
-#: src/ZWiki/Utils.py:477
+#: src/ZWiki/Utils.py:499
 msgid "second"
 msgstr ""
 
-#: src/ZWiki/Utils.py:477
+#: src/ZWiki/Utils.py:499
 msgid "seconds"
 msgstr ""
 
-#: src/ZWiki/Views.py:346
+#: src/ZWiki/Views.py:350
 msgid "Page is locked"
 msgstr ""
 
-#: src/ZWiki/Views.py:357
+#: src/ZWiki/Views.py:361
 msgid ""
 "\n"
 "            This page has a webDAV lock. Someone is probably editing it\n"
@@ -194,60 +185,58 @@
 "            "
 msgstr ""
 
-#: src/ZWiki/Views.py:364
+#: src/ZWiki/Views.py:368
 msgid "To discard your changes and try again, click OK."
 msgstr ""
 
-#: src/ZWiki/Views.py:393
+#: src/ZWiki/Views.py:397
 msgid "Edit conflict"
 msgstr ""
 
-#: src/ZWiki/Views.py:413
+#: src/ZWiki/Views.py:417
 msgid "Someone else has saved this page while you were editing"
 msgstr ""
 
-#: src/ZWiki/Views.py:414
+#: src/ZWiki/Views.py:418
 msgid "To resolve the conflict, do this"
 msgstr ""
 
-#: src/ZWiki/Views.py:415
+#: src/ZWiki/Views.py:419
 msgid "Click your browser's back button"
 msgstr ""
 
-#: src/ZWiki/Views.py:416
+#: src/ZWiki/Views.py:420
 msgid "Copy your recent edits to the clipboard"
 msgstr ""
 
-#: src/ZWiki/Views.py:417
+#: src/ZWiki/Views.py:421
 msgid "Click your browser's refresh button"
 msgstr ""
 
-#: src/ZWiki/Views.py:418
+#: src/ZWiki/Views.py:422
 msgid "Paste in your edits again, being mindful of the latest changes"
 msgstr ""
 
-#: src/ZWiki/Views.py:419
+#: src/ZWiki/Views.py:423
 msgid "Click the Change button again"
 msgstr ""
 
-#: src/ZWiki/Views.py:420 src/ZWiki/skins/zwiki/editform.pt:163
+#: src/ZWiki/Views.py:424 src/ZWiki/skins/zwiki/editform.pt:163
 msgid "or"
 msgstr ""
 
-#: src/ZWiki/Views.py:421
+#: src/ZWiki/Views.py:425
 msgid "To discard your changes and start again, click OK"
 msgstr ""
 
-#: src/ZWiki/Views.py:490
+#: src/ZWiki/Views.py:501
 msgid ""
 "\n"
-"        Access keys can be accessed in mozilla-based browsers by pressing "
-"alt-<key>\n"
+"        Access keys can be accessed in mozilla-based browsers by pressing alt-<key>\n"
 "        IE users: must also press enter\n"
 "        Mac users: command-<key>\n"
 "        Opera users: shift-escape-<key>\n"
-"        These won't work here, back up to the previous page to try them "
-"out.\n"
+"        These won't work here, back up to the previous page to try them out.\n"
 "\n"
 "        0    show these access key assignments\n"
 "\n"
@@ -263,10 +252,8 @@
 "        s    go to search field\n"
 "        \n"
 "        page functions:\n"
-"        +    (in a plone/cmf site with skin switching set up) use zwiki's "
-"plone/cmf skin\n"
-"        -    (in a plone/cmf site with skin switching set up) use zwiki's "
-"standard skin\n"
+"        +    (in a plone/cmf site with skin switching set up) use zwiki's plone/cmf skin\n"
+"        -    (in a plone/cmf site with skin switching set up) use zwiki's standard skin\n"
 "        v    view page\n"
 "        m    mail subscription\n"
 "        b    show backlinks (links to this page)\n"
@@ -294,32 +281,31 @@
 "        "
 msgstr ""
 
-#: src/ZWiki/Wikis.py:49
-msgid "Unknown wiki type"
-msgstr ""
-
-#: src/ZWiki/ZWikiPage.py:675
+#: src/ZWiki/ZWikiPage.py:744
 msgid "create this page"
 msgstr ""
 
-#: src/ZWiki/ZWikiPage.py:798 src/ZWiki/ZWikiPage.py:814
-#: src/ZWiki/ZWikiPage.py:817
+#: src/ZWiki/ZWikiPage.py:872 src/ZWiki/ZWikiPage.py:887
 msgid "last edited %(interval)s ago"
 msgstr ""
 
-#: src/ZWiki/ZWikiPage.py:809
+#: src/ZWiki/ZWikiPage.py:882
 msgid "show last edit"
 msgstr ""
 
-#: src/ZWiki/ZWikiPage.py:826 src/ZWiki/ZWikiPage.py:828
+#: src/ZWiki/ZWikiPage.py:897 src/ZWiki/ZWikiPage.py:899
 msgid "by %(editor)s"
 msgstr ""
 
-#: src/ZWiki/__init__.py:34
+#: src/ZWiki/__init__.py:200
+msgid "Unknown wiki type"
+msgstr ""
+
+#: src/ZWiki/__init__.py:39
 msgid "No need to add a Zwiki Outline Cache"
 msgstr ""
 
-#: src/ZWiki/__init__.py:35
+#: src/ZWiki/__init__.py:40
 msgid ""
 "Zwiki Outline Cache appears in the ZMI Add menu\n"
 "        for implementation reasons, but should not be added directly.\n"
@@ -331,6 +317,10 @@
 msgid "comments"
 msgstr ""
 
+#: src/ZWiki/pagetypes/html.py:50 src/ZWiki/pagetypes/rst.py:85
+msgid "reply"
+msgstr ""
+
 #: src/ZWiki/pagetypes/moin.py:1990
 msgid "Expected \"=\" to follow \"%(token)s\""
 msgstr ""
@@ -367,10 +357,6 @@
 msgid "Expected a color value \"%(arg)s\" after \"%(key)s\""
 msgstr ""
 
-#: src/ZWiki/pagetypes/rst.py:85
-msgid "reply"
-msgstr ""
-
 #: src/ZWiki/plugins/latexwiki/wikis/latexwiki/diffform.pt:127
 #: src/ZWiki/plugins/mathaction/wikis/mathaction/old-diffform.pt:127
 msgid "full history"
@@ -444,7 +430,7 @@
 msgstr ""
 
 #: src/ZWiki/plugins/tracker/filterissues.pt:12
-#: src/ZWiki/skins/dtmlmessages.pt:30
+#: src/ZWiki/skins/dtmlmessages.pt:31
 msgid "Filter issues"
 msgstr ""
 
@@ -456,108 +442,104 @@
 msgid "Issue tracker"
 msgstr ""
 
-#: src/ZWiki/plugins/tracker/tracker.py:361
+#: src/ZWiki/plugins/tracker/tracker.py:365
 msgid "You are not authorized to comment on this ZWiki Page."
 msgstr ""
 
-#: src/ZWiki/skins/dtmlmessages.pt:10 src/ZWiki/skins/dtmlmessages.pt:32
+#: src/ZWiki/skins/dtmlmessages.pt:10 src/ZWiki/skins/dtmlmessages.pt:33
+msgid "name"
+msgstr ""
+
+#: src/ZWiki/skins/dtmlmessages.pt:11 src/ZWiki/skins/dtmlmessages.pt:34
 msgid "category"
 msgstr ""
 
-#: src/ZWiki/skins/dtmlmessages.pt:11 src/ZWiki/skins/dtmlmessages.pt:33
+#: src/ZWiki/skins/dtmlmessages.pt:12 src/ZWiki/skins/dtmlmessages.pt:35
 msgid "severity"
 msgstr ""
 
-#: src/ZWiki/skins/dtmlmessages.pt:12 src/ZWiki/skins/dtmlmessages.pt:34
+#: src/ZWiki/skins/dtmlmessages.pt:13 src/ZWiki/skins/dtmlmessages.pt:36
 msgid "status"
 msgstr ""
 
-#: src/ZWiki/skins/dtmlmessages.pt:13 src/ZWiki/skins/dtmlmessages.pt:35
+#: src/ZWiki/skins/dtmlmessages.pt:14 src/ZWiki/skins/dtmlmessages.pt:37
 msgid "age"
 msgstr ""
 
-#: src/ZWiki/skins/dtmlmessages.pt:14 src/ZWiki/skins/dtmlmessages.pt:36
+#: src/ZWiki/skins/dtmlmessages.pt:15 src/ZWiki/skins/dtmlmessages.pt:38
 msgid "modified"
 msgstr ""
 
-#: src/ZWiki/skins/dtmlmessages.pt:15
+#: src/ZWiki/skins/dtmlmessages.pt:16
 msgid "Add a new issue:"
 msgstr ""
 
-#: src/ZWiki/skins/dtmlmessages.pt:16
+#: src/ZWiki/skins/dtmlmessages.pt:17
 msgid "Name:"
 msgstr ""
 
-#: src/ZWiki/skins/dtmlmessages.pt:17
+#: src/ZWiki/skins/dtmlmessages.pt:18
 msgid "Category:"
 msgstr ""
 
-#: src/ZWiki/skins/dtmlmessages.pt:18
+#: src/ZWiki/skins/dtmlmessages.pt:19
 msgid "Severity:"
 msgstr ""
 
-#: src/ZWiki/skins/dtmlmessages.pt:19
-msgid "Status:"
-msgstr ""
-
 #: src/ZWiki/skins/dtmlmessages.pt:2
 msgid "Here are the wiki's issue pages."
 msgstr ""
 
 #: src/ZWiki/skins/dtmlmessages.pt:20
-msgid "Details:"
+msgid "Status:"
 msgstr ""
 
 #: src/ZWiki/skins/dtmlmessages.pt:21
-msgid "add issue"
+msgid "Details:"
 msgstr ""
 
 #: src/ZWiki/skins/dtmlmessages.pt:22
-msgid "More advanced"
+msgid "add issue"
 msgstr ""
 
 #: src/ZWiki/skins/dtmlmessages.pt:23
-msgid "issue tracker"
+msgid "More advanced"
 msgstr ""
 
 #: src/ZWiki/skins/dtmlmessages.pt:24
-msgid "search options"
+msgid "issue tracker"
 msgstr ""
 
 #: src/ZWiki/skins/dtmlmessages.pt:25
-msgid "Name contains any of:"
+msgid "search options"
 msgstr ""
 
 #: src/ZWiki/skins/dtmlmessages.pt:26
-msgid "Page text contains any of:"
+msgid "Name contains any of:"
 msgstr ""
 
 #: src/ZWiki/skins/dtmlmessages.pt:27
-msgid "Categories:"
+msgid "Page text contains any of:"
 msgstr ""
 
 #: src/ZWiki/skins/dtmlmessages.pt:28
-msgid "Severities:"
+msgid "Categories:"
 msgstr ""
 
 #: src/ZWiki/skins/dtmlmessages.pt:29
-msgid "Statuses:"
+msgid "Severities:"
 msgstr ""
 
 #: src/ZWiki/skins/dtmlmessages.pt:3
 msgid "Enter a search term, click the numbers to the right,"
 msgstr ""
 
-#: src/ZWiki/skins/dtmlmessages.pt:37
-msgid "Submitted by"
+#: src/ZWiki/skins/dtmlmessages.pt:30
+msgid "Statuses:"
 msgstr ""
 
-#: src/ZWiki/skins/dtmlmessages.pt:38
-msgid "Name"
-msgstr ""
-
 #: src/ZWiki/skins/dtmlmessages.pt:39
-msgid "Category"
+msgid "Submitted by"
 msgstr ""
 
 #: src/ZWiki/skins/dtmlmessages.pt:4
@@ -565,39 +547,39 @@
 msgstr ""
 
 #: src/ZWiki/skins/dtmlmessages.pt:40
-msgid "Severity"
+msgid "Name"
 msgstr ""
 
 #: src/ZWiki/skins/dtmlmessages.pt:41
-msgid "Status"
+msgid "Category"
 msgstr ""
 
 #: src/ZWiki/skins/dtmlmessages.pt:42
-msgid "Optional subject"
+msgid "Severity"
 msgstr ""
 
 #: src/ZWiki/skins/dtmlmessages.pt:43
-msgid "Optional comment"
+msgid "Status"
 msgstr ""
 
-#: src/ZWiki/skins/dtmlmessages.pt:44 src/ZWiki/skins/dtmlmessages.pt:45
-msgid "Add ZWiki"
+#: src/ZWiki/skins/dtmlmessages.pt:44
+msgid "Optional subject"
 msgstr ""
 
-#: src/ZWiki/skins/dtmlmessages.pt:46
-msgid "Id:"
+#: src/ZWiki/skins/dtmlmessages.pt:45
+msgid "Optional comment"
 msgstr ""
 
-#: src/ZWiki/skins/dtmlmessages.pt:47
-msgid "Title:"
+#: src/ZWiki/skins/dtmlmessages.pt:46 src/ZWiki/skins/dtmlmessages.pt:47
+msgid "Add ZWiki"
 msgstr ""
 
 #: src/ZWiki/skins/dtmlmessages.pt:48
-msgid "Template:"
+msgid "Id:"
 msgstr ""
 
 #: src/ZWiki/skins/dtmlmessages.pt:49
-msgid "Add wiki"
+msgid "Title:"
 msgstr ""
 
 #: src/ZWiki/skins/dtmlmessages.pt:5
@@ -605,81 +587,79 @@
 msgstr ""
 
 #: src/ZWiki/skins/dtmlmessages.pt:50
-msgid "Pages changed in the last"
+msgid "Template:"
 msgstr ""
 
 #: src/ZWiki/skins/dtmlmessages.pt:51
-msgid "Recently changed pages, with summaries"
+msgid "Add wiki"
 msgstr ""
 
 #: src/ZWiki/skins/dtmlmessages.pt:52
-msgid "Show summaries ?"
+msgid "Pages changed in the last"
 msgstr ""
 
 #: src/ZWiki/skins/dtmlmessages.pt:53
-msgid "Refresh"
+msgid "Recently changed pages, with summaries"
 msgstr ""
 
 #: src/ZWiki/skins/dtmlmessages.pt:54
-msgid "Page"
+msgid "Show summaries ?"
 msgstr ""
 
 #: src/ZWiki/skins/dtmlmessages.pt:55
-msgid "Edited&nbsp;by"
+msgid "Refresh"
 msgstr ""
 
 #: src/ZWiki/skins/dtmlmessages.pt:56
-msgid "Time"
+msgid "Page"
 msgstr ""
 
 #: src/ZWiki/skins/dtmlmessages.pt:57
-msgid "NEW"
+msgid "Edited&nbsp;by"
 msgstr ""
 
+#: src/ZWiki/skins/dtmlmessages.pt:58
+msgid "Time"
+msgstr ""
+
 #: src/ZWiki/skins/dtmlmessages.pt:59
-msgid "Pages marked (NEW) have been created within the last week"
+msgid "NEW"
 msgstr ""
 
 #: src/ZWiki/skins/dtmlmessages.pt:6
 msgid "search issues"
 msgstr ""
 
-#: src/ZWiki/skins/dtmlmessages.pt:60
-msgid "Enter a word or phrase and hit enter to search the entire wiki."
-msgstr ""
-
 #: src/ZWiki/skins/dtmlmessages.pt:61
-msgid "This is the same as using the search field at top right."
+msgid "Pages marked (NEW) have been created within the last week"
 msgstr ""
 
 #: src/ZWiki/skins/dtmlmessages.pt:62
-msgid "Tips: A single word works best for matching page names."
+msgid "Enter a word or phrase and hit enter to search the entire wiki."
 msgstr ""
 
 #: src/ZWiki/skins/dtmlmessages.pt:63
-msgid ""
-"Case-insensitivity and wildcards may be supported depending on your catalog "
-"configuration."
+msgid "This is the same as using the search field at top right."
 msgstr ""
 
 #: src/ZWiki/skins/dtmlmessages.pt:64
-msgid "Leave it blank to list all pages."
+msgid "Tips: A single word works best for matching page names."
 msgstr ""
 
-#: src/ZWiki/skins/dtmlmessages.pt:65 src/ZWiki/skins/dtmlmessages.pt:66
-msgid "Search"
+#: src/ZWiki/skins/dtmlmessages.pt:65
+msgid "Case-insensitivity and wildcards may be supported depending on your catalog configuration."
 msgstr ""
 
-#: src/ZWiki/skins/dtmlmessages.pt:67
-msgid "Page names matching"
+#: src/ZWiki/skins/dtmlmessages.pt:66
+msgid "Leave it blank to list all pages."
 msgstr ""
 
-#: src/ZWiki/skins/dtmlmessages.pt:68
-msgid "Text matching"
+#: src/ZWiki/skins/dtmlmessages.pt:67 src/ZWiki/skins/dtmlmessages.pt:68
+msgid "Search"
 msgstr ""
 
 #: src/ZWiki/skins/dtmlmessages.pt:69
-msgid "Thorough (non-catalog) search for text matching"
+msgid "Page names matching"
 msgstr ""
 
 #: src/ZWiki/skins/dtmlmessages.pt:7
@@ -687,43 +667,43 @@
 msgstr ""
 
 #: src/ZWiki/skins/dtmlmessages.pt:70
-msgid "Set your preferences for this wiki:"
+msgid "Text matching"
 msgstr ""
 
 #: src/ZWiki/skins/dtmlmessages.pt:71
-msgid "User name:"
+msgid "Thorough (non-catalog) search for text matching"
 msgstr ""
 
 #: src/ZWiki/skins/dtmlmessages.pt:72
-msgid "(identifies your edits)"
+msgid "Set your preferences for this wiki:"
 msgstr ""
 
 #: src/ZWiki/skins/dtmlmessages.pt:73
-msgid "Email address:"
+msgid "User name:"
 msgstr ""
 
 #: src/ZWiki/skins/dtmlmessages.pt:74
-msgid "(allows mail subscription)"
+msgid "(identifies your edits, saves your votes, may be required)"
 msgstr ""
 
 #: src/ZWiki/skins/dtmlmessages.pt:75
-msgid "Your time zone:"
+msgid "Email address:"
 msgstr ""
 
 #: src/ZWiki/skins/dtmlmessages.pt:76
-msgid "(localizes most times)"
+msgid "(allows mail subscription)"
 msgstr ""
 
 #: src/ZWiki/skins/dtmlmessages.pt:77
-msgid "Edit form height:"
+msgid "Your time zone:"
 msgstr ""
 
 #: src/ZWiki/skins/dtmlmessages.pt:78
-msgid "(adjusts form size)"
+msgid "(localizes most times)"
 msgstr ""
 
 #: src/ZWiki/skins/dtmlmessages.pt:79
-msgid "Save options"
+msgid "Edit form height:"
 msgstr ""
 
 #: src/ZWiki/skins/dtmlmessages.pt:8
@@ -731,70 +711,70 @@
 msgstr ""
 
 #: src/ZWiki/skins/dtmlmessages.pt:80
-msgid "Forget options"
+msgid "(adjusts form size)"
 msgstr ""
 
-#: src/ZWiki/skins/dtmlmessages.pt:81 src/ZWiki/skins/dtmlmessages.pt:82
-msgid "Add ZWiki Page"
+#: src/ZWiki/skins/dtmlmessages.pt:81
+msgid "Save options"
 msgstr ""
 
-#: src/ZWiki/skins/dtmlmessages.pt:83
-msgid "Page&nbsp;name:"
+#: src/ZWiki/skins/dtmlmessages.pt:82
+msgid "Forget options"
 msgstr ""
 
-#: src/ZWiki/skins/dtmlmessages.pt:84
-msgid "Add wiki page"
+#: src/ZWiki/skins/dtmlmessages.pt:83 src/ZWiki/skins/dtmlmessages.pt:84
+msgid "Add ZWiki Page"
 msgstr ""
 
 #: src/ZWiki/skins/dtmlmessages.pt:85
-msgid "Topic"
+msgid "Page&nbsp;name:"
 msgstr ""
 
 #: src/ZWiki/skins/dtmlmessages.pt:86
-msgid "Last updated"
+msgid "Add wiki page"
 msgstr ""
 
 #: src/ZWiki/skins/dtmlmessages.pt:87
-msgid "Comments"
+msgid "Topic"
 msgstr ""
 
 #: src/ZWiki/skins/dtmlmessages.pt:88
-msgid "Views"
+msgid "Last updated"
 msgstr ""
 
 #: src/ZWiki/skins/dtmlmessages.pt:89
-msgid "Created"
+msgid "Comments"
 msgstr ""
 
-#: src/ZWiki/skins/dtmlmessages.pt:9 src/ZWiki/skins/dtmlmessages.pt:31
+#: src/ZWiki/skins/dtmlmessages.pt:9 src/ZWiki/skins/dtmlmessages.pt:32
 msgid "#"
 msgstr ""
 
-#: src/ZWiki/skins/dtmlmessages.pt:90 src/ZWiki/skins/dtmlmessages.pt:92
-msgid "by"
+#: src/ZWiki/skins/dtmlmessages.pt:90
+msgid "Views"
 msgstr ""
 
 #: src/ZWiki/skins/dtmlmessages.pt:91
-msgid "<dtml-var lasteditinterval> ago</dtml-var>"
+msgid "Created"
 msgstr ""
 
-#: src/ZWiki/skins/dtmlmessages.pt:93
-msgid "on"
+#: src/ZWiki/skins/dtmlmessages.pt:92 src/ZWiki/skins/dtmlmessages.pt:94
+msgid "by"
 msgstr ""
 
-#: src/ZWiki/skins/zwiki/backlinks.pt:108
-msgid "Subtopics"
+#: src/ZWiki/skins/dtmlmessages.pt:93
+msgid "<dtml-var lasteditinterval> ago</dtml-var>"
 msgstr ""
 
-#: src/ZWiki/skins/zwiki/backlinks.pt:111
-msgid "This page has no subtopics."
+#: src/ZWiki/skins/dtmlmessages.pt:95
+msgid "on"
 msgstr ""
 
-#: src/ZWiki/skins/zwiki/backlinks.pt:114
+#: src/ZWiki/skins/zwiki/backlinks.pt:102
 msgid "Here are it's subtopics."
 msgstr ""
 
-#: src/ZWiki/skins/zwiki/backlinks.pt:117
+#: src/ZWiki/skins/zwiki/backlinks.pt:105
 msgid "You can reorder them by clicking the ^ buttons."
 msgstr ""
 
@@ -806,60 +786,60 @@
 msgid "Parents"
 msgstr ""
 
-#: src/ZWiki/skins/zwiki/backlinks.pt:31
+#: src/ZWiki/skins/zwiki/backlinks.pt:28
 msgid "is a top-level topic."
 msgstr ""
 
-#: src/ZWiki/skins/zwiki/backlinks.pt:32
+#: src/ZWiki/skins/zwiki/backlinks.pt:29
 msgid "is a subtopic of:"
 msgstr ""
 
-#: src/ZWiki/skins/zwiki/backlinks.pt:55
+#: src/ZWiki/skins/zwiki/backlinks.pt:48
 msgid "Backlinks"
 msgstr ""
 
-#: src/ZWiki/skins/zwiki/backlinks.pt:56
+#: src/ZWiki/skins/zwiki/backlinks.pt:49
 msgid "Here are the pages which link to it:"
 msgstr ""
 
-#: src/ZWiki/skins/zwiki/backlinks.pt:57
+#: src/ZWiki/skins/zwiki/backlinks.pt:50
 msgid "No other pages link to this one."
 msgstr ""
 
-#: src/ZWiki/skins/zwiki/backlinks.pt:82
-msgid ""
-"You can set this page's parent(s) to place it within the overall page "
-"hierarchy."
+#: src/ZWiki/skins/zwiki/backlinks.pt:70
+msgid "You can set this page's parent(s) to place it within the overall page hierarchy."
 msgstr ""
 
-#: src/ZWiki/skins/zwiki/backlinks.pt:85
-msgid ""
-"Check one or more checkboxes or enter a page name here, and click the button."
+#: src/ZWiki/skins/zwiki/backlinks.pt:73
+msgid "Check one or more checkboxes or enter a page name here, and click the button."
 msgstr ""
 
-#: src/ZWiki/skins/zwiki/backlinks.pt:88
+#: src/ZWiki/skins/zwiki/backlinks.pt:76
 msgid "Enter a page name here and click the button."
 msgstr ""
 
-#: src/ZWiki/skins/zwiki/backlinks.pt:91
-msgid ""
-"You can type just the first few letters, case and punctuation are ignored."
+#: src/ZWiki/skins/zwiki/backlinks.pt:79
+msgid "You can type just the first few letters, case and punctuation are ignored."
 msgstr ""
 
-#: src/ZWiki/skins/zwiki/backlinks.pt:98
+#: src/ZWiki/skins/zwiki/backlinks.pt:86
 msgid "Reparent"
 msgstr ""
 
+#: src/ZWiki/skins/zwiki/backlinks.pt:96
+msgid "Subtopics"
+msgstr ""
+
+#: src/ZWiki/skins/zwiki/backlinks.pt:99
+msgid "This page has no subtopics."
+msgstr ""
+
 #: src/ZWiki/skins/zwiki/badtemplate.pt:12
 msgid "Bad template"
 msgstr ""
 
 #: src/ZWiki/skins/zwiki/badtemplate.pt:13
-msgid ""
-"There was a problem locating one of this wiki's skin templates. There may be "
-"a page or other non-page-template/non-dtml-method object with the same ID, "
-"obscuring the template. Or the template may be missing on the filesystem (an "
-"incomplete Zwiki installation)."
+msgid "There was a problem locating one of this wiki's skin templates. There may be a page or other non-page-template/non-dtml-method object with the same ID, obscuring the template. Or the template may be missing on the filesystem (an incomplete Zwiki installation)."
 msgstr ""
 
 #: src/ZWiki/skins/zwiki/commentform.pt:21
@@ -891,12 +871,18 @@
 msgid "add-comment"
 msgstr ""
 
-#: src/ZWiki/skins/zwiki/contentspage.pt:12
+#: src/ZWiki/skins/zwiki/contentspage.pt:10
+#: src/ZWiki/skins/zwiki/contentspage.pt:27
+msgid "Wiki contents for"
+msgstr ""
+
+#: src/ZWiki/skins/zwiki/contentspage.pt:13
+#: src/ZWiki/skins/zwiki/contentspage.pt:30
 msgid "Wiki contents"
 msgstr ""
 
-#: src/ZWiki/skins/zwiki/contentspage.pt:16
-msgid "Singletons"
+#: src/ZWiki/skins/zwiki/contentspage.pt:40
+msgid "Singletons:"
 msgstr ""
 
 #: src/ZWiki/skins/zwiki/denied.pt:12
@@ -978,11 +964,11 @@
 msgstr ""
 
 #: src/ZWiki/skins/zwiki/editform.pt:178
-msgid "preview this edit"
+msgid "Preview"
 msgstr ""
 
 #: src/ZWiki/skins/zwiki/editform.pt:178
-msgid "Preview"
+msgid "preview this edit"
 msgstr ""
 
 #: src/ZWiki/skins/zwiki/editform.pt:183
@@ -1019,13 +1005,17 @@
 msgstr ""
 
 #: src/ZWiki/skins/zwiki/editform.pt:71
-msgid "type"
+msgid "markup"
 msgstr ""
 
 #: src/ZWiki/skins/zwiki/editform.pt:72
 msgid "select the formatting and rendering style for this page"
 msgstr ""
 
+#: src/ZWiki/skins/zwiki/helppage.pt:12
+msgid "Help page"
+msgstr ""
+
 #: src/ZWiki/skins/zwiki/links.pt:102
 msgid "(external edit)"
 msgstr ""
@@ -1163,11 +1153,11 @@
 msgstr ""
 
 #: src/ZWiki/skins/zwiki/pagemanagementform.pt:45
-msgid "reparent"
+msgid "make this page a subtopic of the page you have entered"
 msgstr ""
 
 #: src/ZWiki/skins/zwiki/pagemanagementform.pt:45
-msgid "make this page a subtopic of the page you have entered"
+msgid "reparent"
 msgstr ""
 
 #: src/ZWiki/skins/zwiki/pagemanagementform.pt:50
@@ -1183,8 +1173,7 @@
 msgstr ""
 
 #: src/ZWiki/skins/zwiki/pagemanagementform.pt:55
-msgid ""
-"delete this page, and redirect links to the page you have entered, if any"
+msgid "delete this page, and redirect links to the page you have entered, if any"
 msgstr ""
 
 #: src/ZWiki/skins/zwiki/pagemanagementform.pt:60

Modified: zope-zwiki/trunk/i18n/ru.po
===================================================================
--- zope-zwiki/trunk/i18n/ru.po	2007-04-08 14:54:05 UTC (rev 761)
+++ zope-zwiki/trunk/i18n/ru.po	2007-04-08 14:55:27 UTC (rev 762)
@@ -4,7 +4,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: zwiki-ru\n"
-"POT-Creation-Date: Sat Sep  2 18:10:16 2006\n"
+"POT-Creation-Date: Tue Mar 27 14:50:46 2007\n"
 "PO-Revision-Date: 2006-06-14 11:27+0000\n"
 "Last-Translator: Valery Sharapov <lumbermill at yandex.ru>\n"
 "Language-Team: Russian\n"
@@ -17,46 +17,40 @@
 "Domain: zwiki\n"
 "X-Generator: KBabel 1.3.1\n"
 
-#: src/ZWiki/Admin.py:62
+#: src/ZWiki/Admin.py:58
 msgid "You are not authorized to upgrade all pages."
 msgstr "Вы не авторизованы для обновления всех страниц."
 
-#: src/ZWiki/Admin.py:63
+#: src/ZWiki/Admin.py:59
 msgid "(folder -> Manage properties)"
 msgstr "(папка -> Управление свойствами)"
 
-#: src/ZWiki/Diff.py:174
+#: src/ZWiki/Diff.py:179
 #, fuzzy
 msgid "You are not authorized to reparent this ZWiki Page."
 msgstr "Вы не авторизованы для переименования этой Zwiki страницы."
 
-#: src/ZWiki/Diff.py:180 src/ZWiki/plugins/tracker/tracker.py:332
+#: src/ZWiki/Diff.py:185 src/ZWiki/plugins/tracker/tracker.py:333
 msgid "You are not authorized to rename this ZWiki Page."
 msgstr "Вы не авторизованы для переименования этой Zwiki страницы."
 
-#: src/ZWiki/Editing.py:156 src/ZWiki/Editing.py:294 src/ZWiki/Views.py:332
-#: src/ZWiki/Views.py:435 src/ZWiki/plugins/tracker/tracker.py:321
-msgid ""
-"Sorry, this wiki doesn't allow anonymous edits. Please configure a username "
-"in options first."
+#: src/ZWiki/Editing.py:156 src/ZWiki/Editing.py:294 src/ZWiki/Views.py:336
+#: src/ZWiki/Views.py:439 src/ZWiki/plugins/tracker/tracker.py:322
+msgid "Sorry, this wiki doesn't allow anonymous edits. Please configure a username in options first."
 msgstr ""
 
 #: src/ZWiki/Editing.py:327
-msgid ""
-"You are not authorized to reparent or change subtopics links on this ZWiki "
-"Page."
-msgstr ""
-"Вы не авторизованы для изменения или переназначения ссылок подтем на "
-"этойстранице Zwiki."
+msgid "You are not authorized to reparent or change subtopics links on this ZWiki Page."
+msgstr "Вы не авторизованы для изменения или переназначения ссылок подтем на этойстранице Zwiki."
 
 #: src/ZWiki/Editing.py:349
 msgid "You are not authorized to change this ZWiki Page's type."
 msgstr "Вы не авторизованы для изменения типа этой Zwiki страницы."
 
 #: src/ZWiki/Editing.py:383 src/ZWiki/Editing.py:410
-#: src/ZWiki/plugins/tracker/tracker.py:340
-#: src/ZWiki/plugins/tracker/tracker.py:347
-#: src/ZWiki/plugins/tracker/tracker.py:354
+#: src/ZWiki/plugins/tracker/tracker.py:344
+#: src/ZWiki/plugins/tracker/tracker.py:351
+#: src/ZWiki/plugins/tracker/tracker.py:358
 msgid "You are not authorized to edit this ZWiki Page."
 msgstr "Вы не авторизованы для редактирования этой Zwiki страницы."
 
@@ -65,11 +59,8 @@
 msgstr "Вы не авторизованы для удаления этой Zwiki страницы."
 
 #: src/ZWiki/Editing.py:563
-msgid ""
-"This page was renamed to %s. You can delete this one if no longer needed.\n"
-msgstr ""
-"Эта страница была переименована в <%s>. Вы можете удалить эту, если она "
-"большене нужна.\n"
+msgid "This page was renamed to %s. You can delete this one if no longer needed.\n"
+msgstr "Эта страница была переименована в <%s>. Вы можете удалить эту, если она большене нужна.\n"
 
 #: src/ZWiki/Editing.py:659
 msgid "You are not authorized to upload files here."
@@ -89,9 +80,7 @@
 
 #: src/ZWiki/Editing.py:830
 #, fuzzy
-msgid ""
-"your edit contained a banned link pattern. Please contact the site "
-"administrator for help."
+msgid "your edit contained a banned link pattern. Please contact the site administrator for help."
 msgstr "Есть проблема: %s. За помощью, пожалуйста свяжитесь с администратором."
 
 #: src/ZWiki/Editing.py:841
@@ -99,10 +88,7 @@
 msgstr "превышено max_anonymous_links"
 
 #: src/ZWiki/Editing.py:842
-msgid ""
-"adding of external links by unidentified users is restricted. Please back up "
-"and remove some of the http urls you added, or contact the site "
-"administrator for help."
+msgid "adding of external links by unidentified users is restricted. Please back up and remove some of the http urls you added, or contact the site administrator for help."
 msgstr ""
 
 #: src/ZWiki/Editing.py:853
@@ -111,85 +97,86 @@
 msgstr "превышено max_anonymous_links"
 
 #: src/ZWiki/Editing.py:854
-msgid ""
-"adding of external links is restricted, even for identified users. Please "
-"back up and remove some of the http urls you added, or contact the site "
-"administrator for help."
+msgid "adding of external links is restricted, even for identified users. Please back up and remove some of the http urls you added, or contact the site administrator for help."
 msgstr ""
 
-#: src/ZWiki/Mail.py:506 src/ZWiki/skins/dtmlmessages.pt:58
+#: src/ZWiki/Mail.py:506 src/ZWiki/skins/dtmlmessages.pt:60
 msgid "anonymous"
 msgstr "анонимный пользователь"
 
-#: src/ZWiki/OutlineSupport.py:843 src/ZWiki/skins/zwiki/links.pt:56
+#: src/ZWiki/OutlineSupport.py:378
+msgid "Sorry, this wiki doesn't allow anonymous reparenting. Please configure a username in options first."
+msgstr ""
+
+#: src/ZWiki/OutlineSupport.py:878 src/ZWiki/skins/zwiki/links.pt:56
 msgid "which pages link to this one ?"
 msgstr "какие страницы ссылаются на эту?"
 
-#: src/ZWiki/OutlineSupport.py:851
+#: src/ZWiki/OutlineSupport.py:886
 msgid "You are here"
 msgstr "Вы находитесь тут"
 
-#: src/ZWiki/Utils.py:465
+#: src/ZWiki/Utils.py:487
 msgid "years"
 msgstr "года"
 
-#: src/ZWiki/Utils.py:465
+#: src/ZWiki/Utils.py:487
 msgid "year"
 msgstr "год"
 
-#: src/ZWiki/Utils.py:467
+#: src/ZWiki/Utils.py:489
 msgid "month"
 msgstr "месяц"
 
-#: src/ZWiki/Utils.py:467
+#: src/ZWiki/Utils.py:489
 msgid "months"
 msgstr "месяцев"
 
-#: src/ZWiki/Utils.py:469
+#: src/ZWiki/Utils.py:491
 msgid "weeks"
 msgstr "недель"
 
-#: src/ZWiki/Utils.py:469
+#: src/ZWiki/Utils.py:491
 msgid "week"
 msgstr "неделя"
 
-#: src/ZWiki/Utils.py:471
+#: src/ZWiki/Utils.py:493
 msgid "day"
 msgstr "день"
 
-#: src/ZWiki/Utils.py:471
+#: src/ZWiki/Utils.py:493
 msgid "days"
 msgstr "дней"
 
-#: src/ZWiki/Utils.py:473
+#: src/ZWiki/Utils.py:495
 msgid "hours"
 msgstr "часов"
 
-#: src/ZWiki/Utils.py:473
+#: src/ZWiki/Utils.py:495
 msgid "hour"
 msgstr "час"
 
-#: src/ZWiki/Utils.py:475
+#: src/ZWiki/Utils.py:497
 msgid "minute"
 msgstr "минута"
 
-#: src/ZWiki/Utils.py:475
+#: src/ZWiki/Utils.py:497
 msgid "minutes"
 msgstr "минут"
 
-#: src/ZWiki/Utils.py:477
+#: src/ZWiki/Utils.py:499
 msgid "second"
 msgstr "секунда"
 
-#: src/ZWiki/Utils.py:477
+#: src/ZWiki/Utils.py:499
 msgid "seconds"
 msgstr "секунд"
 
-#: src/ZWiki/Views.py:346
+#: src/ZWiki/Views.py:350
 msgid "Page is locked"
 msgstr "Страница залочена"
 
-#: src/ZWiki/Views.py:357
+#: src/ZWiki/Views.py:361
 msgid ""
 "\n"
 "            This page has a webDAV lock. Someone is probably editing it\n"
@@ -200,72 +187,66 @@
 "            "
 msgstr ""
 "\n"
-"            На этой странице - замОк WebDav. Скорее всего, кто-то "
-"редактирует её\n"
-"            внешним редактором. Вам надо подождать, пока они закончат, и "
-"затем\n"
+"            На этой странице - замОк WebDav. Скорее всего, кто-то редактирует её\n"
+"            внешним редактором. Вам надо подождать, пока они закончат, и затем\n"
 "            попытаться снова. Если Вы лишь внесли некоторые изменения, Вы,\n"
-"            скорее всего, захотите сохранить и скопировать копию Вашей "
-"версии\n"
+"            скорее всего, захотите сохранить и скопировать копию Вашей версии\n"
 "            текста, для справки.\n"
 "            "
 
-#: src/ZWiki/Views.py:364
+#: src/ZWiki/Views.py:368
 msgid "To discard your changes and try again, click OK."
 msgstr "Для отмены внесенных изменений и повторной попытки, нажмите 'Ok'."
 
-#: src/ZWiki/Views.py:393
+#: src/ZWiki/Views.py:397
 msgid "Edit conflict"
 msgstr "Конфликт редактирования"
 
-#: src/ZWiki/Views.py:413
+#: src/ZWiki/Views.py:417
 msgid "Someone else has saved this page while you were editing"
 msgstr "Кто-то другой сохранил эту страницу во время Вашего редактирования"
 
-#: src/ZWiki/Views.py:414
+#: src/ZWiki/Views.py:418
 msgid "To resolve the conflict, do this"
 msgstr "Для разрешения конфликта, сделайте следующее"
 
-#: src/ZWiki/Views.py:415
+#: src/ZWiki/Views.py:419
 msgid "Click your browser's back button"
 msgstr "Нажмите кнопку Назад в своем браузере"
 
-#: src/ZWiki/Views.py:416
+#: src/ZWiki/Views.py:420
 msgid "Copy your recent edits to the clipboard"
 msgstr "Скопируйте Ваши текущие изменения"
 
-#: src/ZWiki/Views.py:417
+#: src/ZWiki/Views.py:421
 msgid "Click your browser's refresh button"
 msgstr "Нажмите кнопку Обновить в своем браузере"
 
-#: src/ZWiki/Views.py:418
+#: src/ZWiki/Views.py:422
 msgid "Paste in your edits again, being mindful of the latest changes"
-msgstr ""
-"Вставьте скопированную ранее информацию, содержащюю последние изменения"
+msgstr "Вставьте скопированную ранее информацию, содержащюю последние изменения"
 
-#: src/ZWiki/Views.py:419
+#: src/ZWiki/Views.py:423
 msgid "Click the Change button again"
 msgstr "Нажмите кнопку Изменить снова"
 
-#: src/ZWiki/Views.py:420 src/ZWiki/skins/zwiki/editform.pt:163
+#: src/ZWiki/Views.py:424 src/ZWiki/skins/zwiki/editform.pt:163
 msgid "or"
 msgstr "или"
 
-#: src/ZWiki/Views.py:421
+#: src/ZWiki/Views.py:425
 msgid "To discard your changes and start again, click OK"
 msgstr "Для отмены внесенных изменений и что бы начать заново, нажмите 'Ok'"
 
-#: src/ZWiki/Views.py:490
+#: src/ZWiki/Views.py:501
 #, fuzzy
 msgid ""
 "\n"
-"        Access keys can be accessed in mozilla-based browsers by pressing "
-"alt-<key>\n"
+"        Access keys can be accessed in mozilla-based browsers by pressing alt-<key>\n"
 "        IE users: must also press enter\n"
 "        Mac users: command-<key>\n"
 "        Opera users: shift-escape-<key>\n"
-"        These won't work here, back up to the previous page to try them "
-"out.\n"
+"        These won't work here, back up to the previous page to try them out.\n"
 "\n"
 "        0    show these access key assignments\n"
 "\n"
@@ -281,10 +262,8 @@
 "        s    go to search field\n"
 "        \n"
 "        page functions:\n"
-"        +    (in a plone/cmf site with skin switching set up) use zwiki's "
-"plone/cmf skin\n"
-"        -    (in a plone/cmf site with skin switching set up) use zwiki's "
-"standard skin\n"
+"        +    (in a plone/cmf site with skin switching set up) use zwiki's plone/cmf skin\n"
+"        -    (in a plone/cmf site with skin switching set up) use zwiki's standard skin\n"
 "        v    view page\n"
 "        m    mail subscription\n"
 "        b    show backlinks (links to this page)\n"
@@ -354,33 +333,32 @@
 "        p    предыдущее редактирование\n"
 "        "
 
-#: src/ZWiki/Wikis.py:49
-msgid "Unknown wiki type"
-msgstr ""
-
-#: src/ZWiki/ZWikiPage.py:675
+#: src/ZWiki/ZWikiPage.py:744
 msgid "create this page"
 msgstr ""
 
-#: src/ZWiki/ZWikiPage.py:798 src/ZWiki/ZWikiPage.py:814
-#: src/ZWiki/ZWikiPage.py:817
+#: src/ZWiki/ZWikiPage.py:872 src/ZWiki/ZWikiPage.py:887
 msgid "last edited %(interval)s ago"
 msgstr "последний раз редактировал %(interval)s назад"
 
-#: src/ZWiki/ZWikiPage.py:809
+#: src/ZWiki/ZWikiPage.py:882
 #, fuzzy
 msgid "show last edit"
 msgstr "показать последнее редактирование %(lastlog)s"
 
-#: src/ZWiki/ZWikiPage.py:826 src/ZWiki/ZWikiPage.py:828
+#: src/ZWiki/ZWikiPage.py:897 src/ZWiki/ZWikiPage.py:899
 msgid "by %(editor)s"
 msgstr "%(editor)s"
 
-#: src/ZWiki/__init__.py:34
+#: src/ZWiki/__init__.py:200
+msgid "Unknown wiki type"
+msgstr ""
+
+#: src/ZWiki/__init__.py:39
 msgid "No need to add a Zwiki Outline Cache"
 msgstr "Добавление Кэш Наброска Zwiki не нужно"
 
-#: src/ZWiki/__init__.py:35
+#: src/ZWiki/__init__.py:40
 msgid ""
 "Zwiki Outline Cache appears in the ZMI Add menu\n"
 "        for implementation reasons, but should not be added directly.\n"
@@ -392,6 +370,10 @@
 msgid "comments"
 msgstr "комментарии"
 
+#: src/ZWiki/pagetypes/html.py:50 src/ZWiki/pagetypes/rst.py:85
+msgid "reply"
+msgstr "ответить"
+
 #: src/ZWiki/pagetypes/moin.py:1990
 msgid "Expected \"=\" to follow \"%(token)s\""
 msgstr "Нужен \"=\" после \"%(token)s\""
@@ -428,10 +410,6 @@
 msgid "Expected a color value \"%(arg)s\" after \"%(key)s\""
 msgstr ""
 
-#: src/ZWiki/pagetypes/rst.py:85
-msgid "reply"
-msgstr "ответить"
-
 #: src/ZWiki/plugins/latexwiki/wikis/latexwiki/diffform.pt:127
 #: src/ZWiki/plugins/mathaction/wikis/mathaction/old-diffform.pt:127
 msgid "full history"
@@ -509,7 +487,7 @@
 msgstr "Заголовок"
 
 #: src/ZWiki/plugins/tracker/filterissues.pt:12
-#: src/ZWiki/skins/dtmlmessages.pt:30
+#: src/ZWiki/skins/dtmlmessages.pt:31
 msgid "Filter issues"
 msgstr "Фильтровать задачи"
 
@@ -523,372 +501,360 @@
 msgid "Issue tracker"
 msgstr "текущая задача"
 
-#: src/ZWiki/plugins/tracker/tracker.py:361
+#: src/ZWiki/plugins/tracker/tracker.py:365
 #, fuzzy
 msgid "You are not authorized to comment on this ZWiki Page."
 msgstr "Вы не авторизованы для редактирования этой Zwiki страницы."
 
-#: src/ZWiki/skins/dtmlmessages.pt:10 src/ZWiki/skins/dtmlmessages.pt:32
+#: src/ZWiki/skins/dtmlmessages.pt:10 src/ZWiki/skins/dtmlmessages.pt:33
+msgid "name"
+msgstr "имя"
+
+#: src/ZWiki/skins/dtmlmessages.pt:11 src/ZWiki/skins/dtmlmessages.pt:34
 msgid "category"
 msgstr "категория"
 
-#: src/ZWiki/skins/dtmlmessages.pt:11 src/ZWiki/skins/dtmlmessages.pt:33
+#: src/ZWiki/skins/dtmlmessages.pt:12 src/ZWiki/skins/dtmlmessages.pt:35
 msgid "severity"
 msgstr "строгость"
 
-#: src/ZWiki/skins/dtmlmessages.pt:12 src/ZWiki/skins/dtmlmessages.pt:34
+#: src/ZWiki/skins/dtmlmessages.pt:13 src/ZWiki/skins/dtmlmessages.pt:36
 msgid "status"
 msgstr "статус"
 
-#: src/ZWiki/skins/dtmlmessages.pt:13 src/ZWiki/skins/dtmlmessages.pt:35
+#: src/ZWiki/skins/dtmlmessages.pt:14 src/ZWiki/skins/dtmlmessages.pt:37
 msgid "age"
 msgstr "возраст"
 
-#: src/ZWiki/skins/dtmlmessages.pt:14 src/ZWiki/skins/dtmlmessages.pt:36
+#: src/ZWiki/skins/dtmlmessages.pt:15 src/ZWiki/skins/dtmlmessages.pt:38
 msgid "modified"
 msgstr "модифицирован"
 
-#: src/ZWiki/skins/dtmlmessages.pt:15
+#: src/ZWiki/skins/dtmlmessages.pt:16
 msgid "Add a new issue:"
 msgstr "Добавить новую задачу:"
 
-#: src/ZWiki/skins/dtmlmessages.pt:16
+#: src/ZWiki/skins/dtmlmessages.pt:17
 msgid "Name:"
 msgstr "Имя:"
 
-#: src/ZWiki/skins/dtmlmessages.pt:17
+#: src/ZWiki/skins/dtmlmessages.pt:18
 msgid "Category:"
 msgstr "Категория:"
 
-#: src/ZWiki/skins/dtmlmessages.pt:18
+#: src/ZWiki/skins/dtmlmessages.pt:19
 msgid "Severity:"
 msgstr "Строгость:"
 
-#: src/ZWiki/skins/dtmlmessages.pt:19
-msgid "Status:"
-msgstr "Статус:"
-
 #: src/ZWiki/skins/dtmlmessages.pt:2
 msgid "Here are the wiki's issue pages."
 msgstr "Это страницы задач wiki."
 
 #: src/ZWiki/skins/dtmlmessages.pt:20
+msgid "Status:"
+msgstr "Статус:"
+
+#: src/ZWiki/skins/dtmlmessages.pt:21
 msgid "Details:"
 msgstr "Детали:"
 
-#: src/ZWiki/skins/dtmlmessages.pt:21
+#: src/ZWiki/skins/dtmlmessages.pt:22
 msgid "add issue"
 msgstr "добавить задачу"
 
-#: src/ZWiki/skins/dtmlmessages.pt:22
+#: src/ZWiki/skins/dtmlmessages.pt:23
 msgid "More advanced"
 msgstr "Расширенный"
 
-#: src/ZWiki/skins/dtmlmessages.pt:23
+#: src/ZWiki/skins/dtmlmessages.pt:24
 msgid "issue tracker"
 msgstr "текущая задача"
 
-#: src/ZWiki/skins/dtmlmessages.pt:24
+#: src/ZWiki/skins/dtmlmessages.pt:25
 msgid "search options"
 msgstr "опции поиска"
 
-#: src/ZWiki/skins/dtmlmessages.pt:25
+#: src/ZWiki/skins/dtmlmessages.pt:26
 msgid "Name contains any of:"
 msgstr "Имя содержит любое из:"
 
-#: src/ZWiki/skins/dtmlmessages.pt:26
+#: src/ZWiki/skins/dtmlmessages.pt:27
 msgid "Page text contains any of:"
 msgstr "Текст страницы содержит любое из:"
 
-#: src/ZWiki/skins/dtmlmessages.pt:27
+#: src/ZWiki/skins/dtmlmessages.pt:28
 msgid "Categories:"
 msgstr "Категории:"
 
-#: src/ZWiki/skins/dtmlmessages.pt:28
+#: src/ZWiki/skins/dtmlmessages.pt:29
 msgid "Severities:"
 msgstr "Строгость:"
 
-#: src/ZWiki/skins/dtmlmessages.pt:29
-msgid "Statuses:"
-msgstr "Статус:"
-
 #: src/ZWiki/skins/dtmlmessages.pt:3
 #, fuzzy
 msgid "Enter a search term, click the numbers to the right,"
 msgstr "Введите ключевое слово, или нажмите числа справа, или"
 
-#: src/ZWiki/skins/dtmlmessages.pt:37
+#: src/ZWiki/skins/dtmlmessages.pt:30
+msgid "Statuses:"
+msgstr "Статус:"
+
+#: src/ZWiki/skins/dtmlmessages.pt:39
 msgid "Submitted by"
 msgstr "Подана на рассмотрение"
 
-#: src/ZWiki/skins/dtmlmessages.pt:38
+#: src/ZWiki/skins/dtmlmessages.pt:4
+msgid "filter issues"
+msgstr "фильтровать задачи"
+
+#: src/ZWiki/skins/dtmlmessages.pt:40
 msgid "Name"
 msgstr "Имя"
 
-#: src/ZWiki/skins/dtmlmessages.pt:39
+#: src/ZWiki/skins/dtmlmessages.pt:41
 msgid "Category"
 msgstr "Категория"
 
-#: src/ZWiki/skins/dtmlmessages.pt:4
-msgid "filter issues"
-msgstr "фильтровать задачи"
-
-#: src/ZWiki/skins/dtmlmessages.pt:40
+#: src/ZWiki/skins/dtmlmessages.pt:42
 msgid "Severity"
 msgstr "Строгость"
 
-#: src/ZWiki/skins/dtmlmessages.pt:41
+#: src/ZWiki/skins/dtmlmessages.pt:43
 msgid "Status"
 msgstr "Статус"
 
-#: src/ZWiki/skins/dtmlmessages.pt:42
+#: src/ZWiki/skins/dtmlmessages.pt:44
 #, fuzzy
 msgid "Optional subject"
 msgstr "Возможная заметка"
 
-#: src/ZWiki/skins/dtmlmessages.pt:43
+#: src/ZWiki/skins/dtmlmessages.pt:45
 #, fuzzy
 msgid "Optional comment"
 msgstr "Возможная заметка"
 
-#: src/ZWiki/skins/dtmlmessages.pt:44 src/ZWiki/skins/dtmlmessages.pt:45
+#: src/ZWiki/skins/dtmlmessages.pt:46 src/ZWiki/skins/dtmlmessages.pt:47
 #, fuzzy
 msgid "Add ZWiki"
 msgstr "Добавить страницу ZWiki"
 
-#: src/ZWiki/skins/dtmlmessages.pt:46
+#: src/ZWiki/skins/dtmlmessages.pt:48
 #, fuzzy
 msgid "Id:"
 msgstr "Идентификатор (ID)"
 
-#: src/ZWiki/skins/dtmlmessages.pt:47
+#: src/ZWiki/skins/dtmlmessages.pt:49
 #, fuzzy
 msgid "Title:"
 msgstr "Заголовок"
 
-#: src/ZWiki/skins/dtmlmessages.pt:48
+#: src/ZWiki/skins/dtmlmessages.pt:5
+msgid "browse open issues"
+msgstr ""
+
+#: src/ZWiki/skins/dtmlmessages.pt:50
 msgid "Template:"
 msgstr ""
 
-#: src/ZWiki/skins/dtmlmessages.pt:49
+#: src/ZWiki/skins/dtmlmessages.pt:51
 #, fuzzy
 msgid "Add wiki"
 msgstr "Добавить страницу ZWiki"
 
-#: src/ZWiki/skins/dtmlmessages.pt:5
-msgid "browse open issues"
-msgstr ""
-
-#: src/ZWiki/skins/dtmlmessages.pt:50
+#: src/ZWiki/skins/dtmlmessages.pt:52
 msgid "Pages changed in the last"
 msgstr "В последний раз страница изменялась"
 
-#: src/ZWiki/skins/dtmlmessages.pt:51
+#: src/ZWiki/skins/dtmlmessages.pt:53
 msgid "Recently changed pages, with summaries"
 msgstr "Недавно измененные страницы с описаниями"
 
-#: src/ZWiki/skins/dtmlmessages.pt:52
+#: src/ZWiki/skins/dtmlmessages.pt:54
 msgid "Show summaries ?"
 msgstr "Показать описания?"
 
-#: src/ZWiki/skins/dtmlmessages.pt:53
+#: src/ZWiki/skins/dtmlmessages.pt:55
 msgid "Refresh"
 msgstr "Обновить"
 
-#: src/ZWiki/skins/dtmlmessages.pt:54
+#: src/ZWiki/skins/dtmlmessages.pt:56
 msgid "Page"
 msgstr "Страница"
 
-#: src/ZWiki/skins/dtmlmessages.pt:55
+#: src/ZWiki/skins/dtmlmessages.pt:57
 msgid "Edited&nbsp;by"
 msgstr "Отредактировано&nbsp;"
 
-#: src/ZWiki/skins/dtmlmessages.pt:56
+#: src/ZWiki/skins/dtmlmessages.pt:58
 msgid "Time"
 msgstr "Время"
 
-#: src/ZWiki/skins/dtmlmessages.pt:57
+#: src/ZWiki/skins/dtmlmessages.pt:59
 msgid "NEW"
 msgstr ""
 
-#: src/ZWiki/skins/dtmlmessages.pt:59
-msgid "Pages marked (NEW) have been created within the last week"
-msgstr "Отмеченные страницы (NEW) созданы за последнюю неделю"
-
 #: src/ZWiki/skins/dtmlmessages.pt:6
 msgid "search issues"
 msgstr "Элементы поиска"
 
-#: src/ZWiki/skins/dtmlmessages.pt:60
+#: src/ZWiki/skins/dtmlmessages.pt:61
+msgid "Pages marked (NEW) have been created within the last week"
+msgstr "Отмеченные страницы (NEW) созданы за последнюю неделю"
+
+#: src/ZWiki/skins/dtmlmessages.pt:62
 msgid "Enter a word or phrase and hit enter to search the entire wiki."
-msgstr ""
-"Введите слово или фразу и нажмите 'Enter' для начала поиска по всей wiki."
+msgstr "Введите слово или фразу и нажмите 'Enter' для начала поиска по всей wiki."
 
-#: src/ZWiki/skins/dtmlmessages.pt:61
+#: src/ZWiki/skins/dtmlmessages.pt:63
 msgid "This is the same as using the search field at top right."
 msgstr "Это то же самое, что использовать поле поиска справа."
 
-#: src/ZWiki/skins/dtmlmessages.pt:62
+#: src/ZWiki/skins/dtmlmessages.pt:64
 msgid "Tips: A single word works best for matching page names."
-msgstr ""
-"Советы: отдельное слово лучше работает на соответствие названиям страниц."
+msgstr "Советы: отдельное слово лучше работает на соответствие названиям страниц."
 
-#: src/ZWiki/skins/dtmlmessages.pt:63
-msgid ""
-"Case-insensitivity and wildcards may be supported depending on your catalog "
-"configuration."
-msgstr ""
-"Могут поддерживаться нечуствительность к регистру и специальные символы, в "
-"зависимости от конфигурации Вашего каталога."
+#: src/ZWiki/skins/dtmlmessages.pt:65
+msgid "Case-insensitivity and wildcards may be supported depending on your catalog configuration."
+msgstr "Могут поддерживаться нечуствительность к регистру и специальные символы, в зависимости от конфигурации Вашего каталога."
 
-#: src/ZWiki/skins/dtmlmessages.pt:64
+#: src/ZWiki/skins/dtmlmessages.pt:66
 msgid "Leave it blank to list all pages."
 msgstr "Оставьте пустым, что бы получить все страницы."
 
-#: src/ZWiki/skins/dtmlmessages.pt:65 src/ZWiki/skins/dtmlmessages.pt:66
+#: src/ZWiki/skins/dtmlmessages.pt:67 src/ZWiki/skins/dtmlmessages.pt:68
 msgid "Search"
 msgstr "Поиск"
 
-#: src/ZWiki/skins/dtmlmessages.pt:67
+#: src/ZWiki/skins/dtmlmessages.pt:69
 msgid "Page names matching"
 msgstr "Названия страниц, Соответствующие запросу"
 
-#: src/ZWiki/skins/dtmlmessages.pt:68
+#: src/ZWiki/skins/dtmlmessages.pt:7
+msgid "recent"
+msgstr "недавние"
+
+#: src/ZWiki/skins/dtmlmessages.pt:70
 msgid "Text matching"
 msgstr "Текст, соответствующий запросу"
 
-#: src/ZWiki/skins/dtmlmessages.pt:69
+#: src/ZWiki/skins/dtmlmessages.pt:71
 msgid "Thorough (non-catalog) search for text matching"
 msgstr ""
 
-#: src/ZWiki/skins/dtmlmessages.pt:7
-msgid "recent"
-msgstr "недавние"
-
-#: src/ZWiki/skins/dtmlmessages.pt:70
+#: src/ZWiki/skins/dtmlmessages.pt:72
 #, fuzzy
 msgid "Set your preferences for this wiki:"
 msgstr "Ниже установите настройки Вашего сайта."
 
-#: src/ZWiki/skins/dtmlmessages.pt:71
+#: src/ZWiki/skins/dtmlmessages.pt:73
 #, fuzzy
 msgid "User name:"
 msgstr "Имя пользователя"
 
-#: src/ZWiki/skins/dtmlmessages.pt:72
-#, fuzzy
-msgid "(identifies your edits)"
-msgstr "идентифицирует Ваши редактирования"
+#: src/ZWiki/skins/dtmlmessages.pt:74
+msgid "(identifies your edits, saves your votes, may be required)"
+msgstr ""
 
-#: src/ZWiki/skins/dtmlmessages.pt:73
+#: src/ZWiki/skins/dtmlmessages.pt:75
 #, fuzzy
 msgid "Email address:"
 msgstr "Email адрес"
 
-#: src/ZWiki/skins/dtmlmessages.pt:74
+#: src/ZWiki/skins/dtmlmessages.pt:76
 #, fuzzy
 msgid "(allows mail subscription)"
 msgstr "Подписка по почте"
 
-#: src/ZWiki/skins/dtmlmessages.pt:75
+#: src/ZWiki/skins/dtmlmessages.pt:77
 #, fuzzy
 msgid "Your time zone:"
 msgstr "Часовой пояс"
 
-#: src/ZWiki/skins/dtmlmessages.pt:76
+#: src/ZWiki/skins/dtmlmessages.pt:78
 msgid "(localizes most times)"
 msgstr "(локализует большинство часовых поясов)"
 
-#: src/ZWiki/skins/dtmlmessages.pt:77
+#: src/ZWiki/skins/dtmlmessages.pt:79
 #, fuzzy
 msgid "Edit form height:"
 msgstr "Форма редактирования"
 
-#: src/ZWiki/skins/dtmlmessages.pt:78
+#: src/ZWiki/skins/dtmlmessages.pt:8
+msgid "all"
+msgstr "все"
+
+#: src/ZWiki/skins/dtmlmessages.pt:80
 msgid "(adjusts form size)"
 msgstr ""
 
-#: src/ZWiki/skins/dtmlmessages.pt:79
+#: src/ZWiki/skins/dtmlmessages.pt:81
 msgid "Save options"
 msgstr "Сохранить опции"
 
-#: src/ZWiki/skins/dtmlmessages.pt:8
-msgid "all"
-msgstr "все"
-
-#: src/ZWiki/skins/dtmlmessages.pt:80
+#: src/ZWiki/skins/dtmlmessages.pt:82
 msgid "Forget options"
 msgstr "Забыть опции"
 
-#: src/ZWiki/skins/dtmlmessages.pt:81 src/ZWiki/skins/dtmlmessages.pt:82
+#: src/ZWiki/skins/dtmlmessages.pt:83 src/ZWiki/skins/dtmlmessages.pt:84
 msgid "Add ZWiki Page"
 msgstr "Добавить страницу ZWiki"
 
-#: src/ZWiki/skins/dtmlmessages.pt:83
+#: src/ZWiki/skins/dtmlmessages.pt:85
 #, fuzzy
 msgid "Page&nbsp;name:"
 msgstr "Название страницы"
 
-#: src/ZWiki/skins/dtmlmessages.pt:84
+#: src/ZWiki/skins/dtmlmessages.pt:86
 #, fuzzy
 msgid "Add wiki page"
 msgstr "Добавить страницу ZWiki"
 
-#: src/ZWiki/skins/dtmlmessages.pt:85
+#: src/ZWiki/skins/dtmlmessages.pt:87
 #, fuzzy
 msgid "Topic"
 msgstr "является подтемой:"
 
-#: src/ZWiki/skins/dtmlmessages.pt:86
+#: src/ZWiki/skins/dtmlmessages.pt:88
 msgid "Last updated"
 msgstr ""
 
-#: src/ZWiki/skins/dtmlmessages.pt:87
+#: src/ZWiki/skins/dtmlmessages.pt:89
 #, fuzzy
 msgid "Comments"
 msgstr "Добавить"
 
-#: src/ZWiki/skins/dtmlmessages.pt:88
+#: src/ZWiki/skins/dtmlmessages.pt:9 src/ZWiki/skins/dtmlmessages.pt:32
+msgid "#"
+msgstr ""
+
+#: src/ZWiki/skins/dtmlmessages.pt:90
 #, fuzzy
 msgid "Views"
 msgstr "Просмотр"
 
-#: src/ZWiki/skins/dtmlmessages.pt:89
+#: src/ZWiki/skins/dtmlmessages.pt:91
 #, fuzzy
 msgid "Created"
 msgstr "создать"
 
-#: src/ZWiki/skins/dtmlmessages.pt:9 src/ZWiki/skins/dtmlmessages.pt:31
-msgid "#"
-msgstr ""
-
-#: src/ZWiki/skins/dtmlmessages.pt:90 src/ZWiki/skins/dtmlmessages.pt:92
+#: src/ZWiki/skins/dtmlmessages.pt:92 src/ZWiki/skins/dtmlmessages.pt:94
 msgid "by"
 msgstr ""
 
-#: src/ZWiki/skins/dtmlmessages.pt:91
+#: src/ZWiki/skins/dtmlmessages.pt:93
 msgid "<dtml-var lasteditinterval> ago</dtml-var>"
 msgstr ""
 
-#: src/ZWiki/skins/dtmlmessages.pt:93
+#: src/ZWiki/skins/dtmlmessages.pt:95
 msgid "on"
 msgstr ""
 
-#: src/ZWiki/skins/zwiki/backlinks.pt:108
+#: src/ZWiki/skins/zwiki/backlinks.pt:102
 #, fuzzy
-msgid "Subtopics"
-msgstr "является подтемой:"
-
-#: src/ZWiki/skins/zwiki/backlinks.pt:111
-msgid "This page has no subtopics."
-msgstr ""
-
-#: src/ZWiki/skins/zwiki/backlinks.pt:114
-#, fuzzy
 msgid "Here are it's subtopics."
 msgstr "Это страницы задач wiki."
 
-#: src/ZWiki/skins/zwiki/backlinks.pt:117
+#: src/ZWiki/skins/zwiki/backlinks.pt:105
 msgid "You can reorder them by clicking the ^ buttons."
 msgstr ""
 
@@ -901,67 +867,65 @@
 msgid "Parents"
 msgstr "Переназначить"
 
-#: src/ZWiki/skins/zwiki/backlinks.pt:31
+#: src/ZWiki/skins/zwiki/backlinks.pt:28
 msgid "is a top-level topic."
 msgstr "тема верхнего уровня."
 
-#: src/ZWiki/skins/zwiki/backlinks.pt:32
+#: src/ZWiki/skins/zwiki/backlinks.pt:29
 msgid "is a subtopic of:"
 msgstr "является подтемой:"
 
-#: src/ZWiki/skins/zwiki/backlinks.pt:55
+#: src/ZWiki/skins/zwiki/backlinks.pt:48
 #, fuzzy
 msgid "Backlinks"
 msgstr "обратные ссылки"
 
-#: src/ZWiki/skins/zwiki/backlinks.pt:56
+#: src/ZWiki/skins/zwiki/backlinks.pt:49
 msgid "Here are the pages which link to it:"
 msgstr "Страницы, которые ссылаются на неё:"
 
-#: src/ZWiki/skins/zwiki/backlinks.pt:57
+#: src/ZWiki/skins/zwiki/backlinks.pt:50
 #, fuzzy
 msgid "No other pages link to this one."
 msgstr "какие страницы ссылаются на эту?"
 
-#: src/ZWiki/skins/zwiki/backlinks.pt:82
-msgid ""
-"You can set this page's parent(s) to place it within the overall page "
-"hierarchy."
+#: src/ZWiki/skins/zwiki/backlinks.pt:70
+msgid "You can set this page's parent(s) to place it within the overall page hierarchy."
 msgstr ""
 
-#: src/ZWiki/skins/zwiki/backlinks.pt:85
-msgid ""
-"Check one or more checkboxes or enter a page name here, and click the button."
+#: src/ZWiki/skins/zwiki/backlinks.pt:73
+msgid "Check one or more checkboxes or enter a page name here, and click the button."
 msgstr ""
 
-#: src/ZWiki/skins/zwiki/backlinks.pt:88
+#: src/ZWiki/skins/zwiki/backlinks.pt:76
 msgid "Enter a page name here and click the button."
 msgstr ""
 
-#: src/ZWiki/skins/zwiki/backlinks.pt:91
-msgid ""
-"You can type just the first few letters, case and punctuation are ignored."
+#: src/ZWiki/skins/zwiki/backlinks.pt:79
+msgid "You can type just the first few letters, case and punctuation are ignored."
 msgstr ""
 
-#: src/ZWiki/skins/zwiki/backlinks.pt:98
+#: src/ZWiki/skins/zwiki/backlinks.pt:86
 msgid "Reparent"
 msgstr "Переназначить"
 
+#: src/ZWiki/skins/zwiki/backlinks.pt:96
+#, fuzzy
+msgid "Subtopics"
+msgstr "является подтемой:"
+
+#: src/ZWiki/skins/zwiki/backlinks.pt:99
+msgid "This page has no subtopics."
+msgstr ""
+
 #: src/ZWiki/skins/zwiki/badtemplate.pt:12
 msgid "Bad template"
 msgstr ""
 
 #: src/ZWiki/skins/zwiki/badtemplate.pt:13
 #, fuzzy
-msgid ""
-"There was a problem locating one of this wiki's skin templates. There may be "
-"a page or other non-page-template/non-dtml-method object with the same ID, "
-"obscuring the template. Or the template may be missing on the filesystem (an "
-"incomplete Zwiki installation)."
-msgstr ""
-"С одним из шаблонов стиля этой wiki возникли проблемы. Возможно есть объект "
-"с ID шаблона стиля, который не является Page Template или DTML методом, или "
-"шаблона может отсутствовать."
+msgid "There was a problem locating one of this wiki's skin templates. There may be a page or other non-page-template/non-dtml-method object with the same ID, obscuring the template. Or the template may be missing on the filesystem (an incomplete Zwiki installation)."
+msgstr "С одним из шаблонов стиля этой wiki возникли проблемы. Возможно есть объект с ID шаблона стиля, который не является Page Template или DTML методом, или шаблона может отсутствовать."
 
 #: src/ZWiki/skins/zwiki/commentform.pt:21
 msgid "subject"
@@ -969,9 +933,7 @@
 
 #: src/ZWiki/skins/zwiki/commentform.pt:22
 msgid "a subject helps clarify threads and RecentChanges"
-msgstr ""
-"тема помогает сделать более понятными поток комментариев и Последние "
-"Изменения"
+msgstr "тема помогает сделать более понятными поток комментариев и Последние Изменения"
 
 #: src/ZWiki/skins/zwiki/commentform.pt:29
 msgid "replying"
@@ -979,9 +941,7 @@
 
 #: src/ZWiki/skins/zwiki/commentform.pt:36
 msgid "to comment (and cc any subscribers) enter text here and click add"
-msgstr ""
-"для добавления комментария (and cc any subscribers) введите тут текст и "
-"нажмите 'Добавить'"
+msgstr "для добавления комментария (and cc any subscribers) введите тут текст и нажмите 'Добавить'"
 
 #: src/ZWiki/skins/zwiki/commentform.pt:56
 msgid "${nb} subscribers"
@@ -996,12 +956,20 @@
 msgid "add-comment"
 msgstr "Добавить"
 
-#: src/ZWiki/skins/zwiki/contentspage.pt:12
+#: src/ZWiki/skins/zwiki/contentspage.pt:10
+#: src/ZWiki/skins/zwiki/contentspage.pt:27
+#, fuzzy
+msgid "Wiki contents for"
+msgstr "Содержание Wiki"
+
+#: src/ZWiki/skins/zwiki/contentspage.pt:13
+#: src/ZWiki/skins/zwiki/contentspage.pt:30
 msgid "Wiki contents"
 msgstr "Содержание Wiki"
 
-#: src/ZWiki/skins/zwiki/contentspage.pt:16
-msgid "Singletons"
+#: src/ZWiki/skins/zwiki/contentspage.pt:40
+#, fuzzy
+msgid "Singletons:"
 msgstr "Единственные потомки"
 
 #: src/ZWiki/skins/zwiki/denied.pt:12
@@ -1090,13 +1058,13 @@
 
 #: src/ZWiki/skins/zwiki/editform.pt:178
 #, fuzzy
-msgid "preview this edit"
-msgstr "<< предыдущее редактирование"
+msgid "Preview"
+msgstr "Просмотр"
 
 #: src/ZWiki/skins/zwiki/editform.pt:178
 #, fuzzy
-msgid "Preview"
-msgstr "Просмотр"
+msgid "preview this edit"
+msgstr "<< предыдущее редактирование"
 
 #: src/ZWiki/skins/zwiki/editform.pt:183
 msgid "Cancel"
@@ -1130,17 +1098,21 @@
 
 #: src/ZWiki/skins/zwiki/editform.pt:61
 msgid "the name of this wiki page (changing this may be slow!)"
-msgstr ""
-"название этой wiki страницы (изменение этого может происходить медленно!)"
+msgstr "название этой wiki страницы (изменение этого может происходить медленно!)"
 
 #: src/ZWiki/skins/zwiki/editform.pt:71
-msgid "type"
-msgstr "тип"
+msgid "markup"
+msgstr ""
 
 #: src/ZWiki/skins/zwiki/editform.pt:72
 msgid "select the formatting and rendering style for this page"
 msgstr "выберите стиль форматирования и отображения для этой страницы"
 
+#: src/ZWiki/skins/zwiki/helppage.pt:12
+#, fuzzy
+msgid "Help page"
+msgstr "Страница помощи"
+
 #: src/ZWiki/skins/zwiki/links.pt:102
 msgid "(external edit)"
 msgstr "(внешнее редактирование)"
@@ -1283,18 +1255,17 @@
 
 #: src/ZWiki/skins/zwiki/pagemanagementform.pt:45
 #, fuzzy
-msgid "reparent"
-msgstr "Переназначить"
+msgid "make this page a subtopic of the page you have entered"
+msgstr "переназначить эту страницу странице, которую Вы ввели"
 
 #: src/ZWiki/skins/zwiki/pagemanagementform.pt:45
 #, fuzzy
-msgid "make this page a subtopic of the page you have entered"
-msgstr "переназначить эту страницу странице, которую Вы ввели"
+msgid "reparent"
+msgstr "Переназначить"
 
 #: src/ZWiki/skins/zwiki/pagemanagementform.pt:50
 msgid "rename this page to the name you have entered, updating all links"
-msgstr ""
-"переименовать эту страницу в название, которое Вы ввели, обновив все ссылки"
+msgstr "переименовать эту страницу в название, которое Вы ввели, обновив все ссылки"
 
 #: src/ZWiki/skins/zwiki/pagemanagementform.pt:50
 msgid "rename"
@@ -1306,15 +1277,13 @@
 
 #: src/ZWiki/skins/zwiki/pagemanagementform.pt:55
 #, fuzzy
-msgid ""
-"delete this page, and redirect links to the page you have entered, if any"
+msgid "delete this page, and redirect links to the page you have entered, if any"
 msgstr "переназначить эту страницу странице, которую Вы ввели"
 
 #: src/ZWiki/skins/zwiki/pagemanagementform.pt:60
 #, fuzzy
 msgid "create a page with the name you have entered, as a subtopic of this one"
-msgstr ""
-"переименовать эту страницу в название, которое Вы ввели, обновив все ссылки"
+msgstr "переименовать эту страницу в название, которое Вы ввели, обновив все ссылки"
 
 #: src/ZWiki/skins/zwiki/pagemanagementform.pt:60
 msgid "create"
@@ -1387,8 +1356,7 @@
 msgstr ""
 "Вы можете подписаться на эту страницу или wiki вцелом.\n"
 " Подписчики получают копию комментариев по почте\n"
-" (но не общие редактирования, до тех пор, пока это не будет активировано "
-"администратором).\n"
+" (но не общие редактирования, до тех пор, пока это не будет активировано администратором).\n"
 " Или вернитесь на"
 
 #. Default: ""
@@ -1401,8 +1369,7 @@
 msgstr ""
 "Вы можете подписаться на эту страницу или wiki вцелом.\n"
 " Подписчики получают копию комментариев по почте\n"
-" (но не общие редактирования, до тех пор, пока это не будет активировано "
-"администратором).\n"
+" (но не общие редактирования, до тех пор, пока это не будет активировано администратором).\n"
 " Или вернитесь на"
 
 #: src/ZWiki/skins/zwiki/subscribeform.pt:53
@@ -1455,6 +1422,13 @@
 msgid "User options"
 msgstr "опции поиска"
 
+#, fuzzy
+#~ msgid "(identifies your edits)"
+#~ msgstr "идентифицирует Ваши редактирования"
+
+#~ msgid "type"
+#~ msgstr "тип"
+
 #~ msgid "your edit contained a banned link pattern"
 #~ msgstr "ваша правка содержала шаблон запрещенной ссылки"
 
@@ -1473,14 +1447,8 @@
 #~ msgid "and enter"
 #~ msgstr "и 'Enter'"
 
-#~ msgid ""
-#~ "You may create a new ZWiki Page object using the form below. You may also "
-#~ "choose to upload an existing html file from your local computer by "
-#~ "clicking the <i>Browse</i> button."
-#~ msgstr ""
-#~ "Вы можете создать новый объект Zwiki Page используя форму ниже. Вы так же "
-#~ "можете закачать существующий html файл со своего локального компьютера, "
-#~ "нажав кнопку <i>Browse</i>."
+#~ msgid "You may create a new ZWiki Page object using the form below. You may also choose to upload an existing html file from your local computer by clicking the <i>Browse</i> button."
+#~ msgstr "Вы можете создать новый объект Zwiki Page используя форму ниже. Вы так же можете закачать существующий html файл со своего локального компьютера, нажав кнопку <i>Browse</i>."
 
 #~ msgid "File"
 #~ msgstr "Файл"
@@ -1499,9 +1467,7 @@
 #~ msgstr "Обратные ссылки для"
 
 #~ msgid "singleton_desc"
-#~ msgstr ""
-#~ "Единственные потомки - страницы, которые не имеют ссылок на другие "
-#~ "страницы."
+#~ msgstr "Единственные потомки - страницы, которые не имеют ссылок на другие страницы."
 
 #~ msgid "History for"
 #~ msgstr "История для"
@@ -1511,8 +1477,7 @@
 
 #~ msgid "help_shortname"
 #~ msgstr ""
-#~ "Внимание: Переименование страницы в большой wiki может быть медленным. "
-#~ "Остальные страницы будут обновлены\n"
+#~ "Внимание: Переименование страницы в большой wiki может быть медленным. Остальные страницы будут обновлены\n"
 #~ "при возможности."
 
 #~ msgid "label_body_text"
@@ -1520,16 +1485,12 @@
 
 #~ msgid "help_wikibody"
 #~ msgstr ""
-#~ "На Wiki странице Вы используете [квадратные скобки] для создания ссылок. "
-#~ "Когда Вы сохраняете страницу,\n"
-#~ "содержимое квадратных скобок будет содержать маленькую ссылку в виде "
-#~ "<code>?</code> после себя, которую\n"
-#~ "Вы нажимаете для создания новой страницы с этим именем (введенное в "
-#~ "квадратные скобки)."
+#~ "На Wiki странице Вы используете [квадратные скобки] для создания ссылок. Когда Вы сохраняете страницу,\n"
+#~ "содержимое квадратных скобок будет содержать маленькую ссылку в виде <code>?</code> после себя, которую\n"
+#~ "Вы нажимаете для создания новой страницы с этим именем (введенное в квадратные скобки)."
 
 #~ msgid "help_wikiwords"
-#~ msgstr ""
-#~ "Эта Wiki так же поддерживает WikiWords, в качестве механизма ссылок."
+#~ msgstr "Эта Wiki так же поддерживает WikiWords, в качестве механизма ссылок."
 
 #~ msgid "label_note"
 #~ msgstr "Заметка для истории страницы (необязательно)"
@@ -1611,19 +1572,15 @@
 
 #~ msgid "backlinks_reparent_help"
 #~ msgstr ""
-#~ "Вы можете поменять родителя(лей) этой страницы, что бы включить ее в "
-#~ "глобальную \n"
-#~ "иерархию страницы. Отметьте боксы или введите имя новой страницы и "
-#~ "нажмите 'Переназначить'.\n"
+#~ "Вы можете поменять родителя(лей) этой страницы, что бы включить ее в глобальную \n"
+#~ "иерархию страницы. Отметьте боксы или введите имя новой страницы и нажмите 'Переназначить'.\n"
 #~ "Одного родителя, как правило, достаточно."
 
 #, fuzzy
 #~ msgid "backlinks_reparent_help2"
 #~ msgstr ""
-#~ "Вы можете поменять родителя(лей) этой страницы, что бы включить ее в "
-#~ "глобальную \n"
-#~ "иерархию страницы. Отметьте боксы или введите имя новой страницы и "
-#~ "нажмите 'Переназначить'.\n"
+#~ "Вы можете поменять родителя(лей) этой страницы, что бы включить ее в глобальную \n"
+#~ "иерархию страницы. Отметьте боксы или введите имя новой страницы и нажмите 'Переназначить'.\n"
 #~ "Одного родителя, как правило, достаточно."
 
 #, fuzzy
@@ -1716,8 +1673,7 @@
 #~ msgstr "Навигация Wiki"
 
 #~ msgid "enter comments here and click add; or, click edit"
-#~ msgstr ""
-#~ "Введите тут комментарий и нажмите 'Добавить' или нажмите 'Редактировать'"
+#~ msgstr "Введите тут комментарий и нажмите 'Добавить' или нажмите 'Редактировать'"
 
 #~ msgid "Details & comments"
 #~ msgstr "Детали и комментарии"
@@ -1725,12 +1681,8 @@
 #~ msgid "hits"
 #~ msgstr "кликов"
 
-#~ msgid ""
-#~ "no catalog or the catalog search gave an error, a brute-force search was "
-#~ "used"
-#~ msgstr ""
-#~ "нет каталога или поиск по каталогу выдал ошибку. Был использован "
-#~ "принудительный поиск"
+#~ msgid "no catalog or the catalog search gave an error, a brute-force search was used"
+#~ msgstr "нет каталога или поиск по каталогу выдал ошибку. Был использован принудительный поиск"
 
 #~ msgid "Contents"
 #~ msgstr "Содержание"
@@ -1738,9 +1690,6 @@
 #~ msgid "Diffs for"
 #~ msgstr "Различия для"
 
-#~ msgid "name"
-#~ msgstr "имя"
-
 #~ msgid "page rating"
 #~ msgstr "рейтинг страницы"
 
@@ -1764,9 +1713,7 @@
 #~ msgstr "Другой родитель"
 
 #~ msgid "You may also click the full, simple, minimal links if provided."
-#~ msgstr ""
-#~ "Вы так же можете выбрать полный, нормальный или минимальный режим, если "
-#~ "предложено."
+#~ msgstr "Вы так же можете выбрать полный, нормальный или минимальный режим, если предложено."
 
 #~ msgid "for subscribing"
 #~ msgstr "для подписи"
@@ -1796,9 +1743,7 @@
 #~ msgstr "Показать иерархию страницы?"
 
 #~ msgid "This wiki keeps a page hierarchy, which you can use or ignore."
-#~ msgstr ""
-#~ "Эта wiki содержит иерархию страницы, которую Вы можете использовать или "
-#~ "проигнорировать."
+#~ msgstr "Эта wiki содержит иерархию страницы, которую Вы можете использовать или проигнорировать."
 
 #~ msgid "Show search field ?"
 #~ msgstr "Показывать поле поиска?"
@@ -1816,8 +1761,7 @@
 #~ msgstr "Показать форму управления страницей?"
 
 #~ msgid "You must also configure a username or be logged in."
-#~ msgstr ""
-#~ "Вам так же необходимо настроить имя пользователя или быть залогиненным."
+#~ msgstr "Вам так же необходимо настроить имя пользователя или быть залогиненным."
 
 #~ msgid "no subscribers"
 #~ msgstr "подписчиков нет"
@@ -1825,28 +1769,20 @@
 #~ msgid "parent_name_replace"
 #~ msgstr "новый родитель, название или перемещение"
 
-#~ msgid ""
-#~ "enter a new parent, new name, replacement page (if any) or subtopic name"
-#~ msgstr ""
-#~ "введите нового родителя, новое название, страницу перемещения (если это "
-#~ "имеет место) или название подтемы"
+#~ msgid "enter a new parent, new name, replacement page (if any) or subtopic name"
+#~ msgstr "введите нового родителя, новое название, страницу перемещения (если это имеет место) или название подтемы"
 
 #~ msgid "box_zwiki_showhierarchy"
 #~ msgstr ""
-#~ "Вы так же можете установить <em>родителя(лей)</em> этой страницы для "
-#~ "расположения её\n"
-#~ "в иерархии контента. Отметьте ячейки или введите новое название страницы "
-#~ "и нажмите\n"
+#~ "Вы так же можете установить <em>родителя(лей)</em> этой страницы для расположения её\n"
+#~ "в иерархии контента. Отметьте ячейки или введите новое название страницы и нажмите\n"
 #~ "'Переназначить'. Одного родителя, обычно, достаточно."
 
 #~ msgid "cancel"
 #~ msgstr "отменить"
 
-#~ msgid ""
-#~ "move this page to the recycle bin, and relink to the name you have entered"
-#~ msgstr ""
-#~ "переместить эту страницу в мусорную корзину и поменять ссылку на имя, "
-#~ "которое Вы ввели"
+#~ msgid "move this page to the recycle bin, and relink to the name you have entered"
+#~ msgstr "переместить эту страницу в мусорную корзину и поменять ссылку на имя, которое Вы ввели"
 
 #~ msgid "create a new subtopic of this page"
 #~ msgstr "создать новую подтему этой страницы"

Modified: zope-zwiki/trunk/i18n/sv.po
===================================================================
--- zope-zwiki/trunk/i18n/sv.po	2007-04-08 14:54:05 UTC (rev 761)
+++ zope-zwiki/trunk/i18n/sv.po	2007-04-08 14:55:27 UTC (rev 762)
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: zwiki\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL at ADDRESS>\n"
-"POT-Creation-Date: Sat Sep  2 18:10:16 2006\n"
+"POT-Creation-Date: Tue Mar 27 14:50:46 2007\n"
 "PO-Revision-Date: 2006-03-15 21:18+0000\n"
 "Last-Translator: Simon Michael <simon at joyful.com>\n"
 "Language-Team: Swedish <sv at li.org>\n"
@@ -18,47 +18,41 @@
 "X-Rosetta-Version: 0.1\n"
 "Domain: zwiki\n"
 
-#: src/ZWiki/Admin.py:62
+#: src/ZWiki/Admin.py:58
 msgid "You are not authorized to upgrade all pages."
 msgstr "Du är inte auktoriserad att uppgradera alla sidorna."
 
-#: src/ZWiki/Admin.py:63
+#: src/ZWiki/Admin.py:59
 msgid "(folder -> Manage properties)"
 msgstr "(map -> Hantera alternativ)"
 
-#: src/ZWiki/Diff.py:174
+#: src/ZWiki/Diff.py:179
 #, fuzzy
 msgid "You are not authorized to reparent this ZWiki Page."
 msgstr "Du har inte tillåtelse att byta namn den här ZWiki sidan."
 
-#: src/ZWiki/Diff.py:180 src/ZWiki/plugins/tracker/tracker.py:332
+#: src/ZWiki/Diff.py:185 src/ZWiki/plugins/tracker/tracker.py:333
 msgid "You are not authorized to rename this ZWiki Page."
 msgstr "Du har inte tillåtelse att byta namn den här ZWiki sidan."
 
-#: src/ZWiki/Editing.py:156 src/ZWiki/Editing.py:294 src/ZWiki/Views.py:332
-#: src/ZWiki/Views.py:435 src/ZWiki/plugins/tracker/tracker.py:321
-msgid ""
-"Sorry, this wiki doesn't allow anonymous edits. Please configure a username "
-"in options first."
+#: src/ZWiki/Editing.py:156 src/ZWiki/Editing.py:294 src/ZWiki/Views.py:336
+#: src/ZWiki/Views.py:439 src/ZWiki/plugins/tracker/tracker.py:322
+msgid "Sorry, this wiki doesn't allow anonymous edits. Please configure a username in options first."
 msgstr ""
 
 #: src/ZWiki/Editing.py:327
 #, fuzzy
-msgid ""
-"You are not authorized to reparent or change subtopics links on this ZWiki "
-"Page."
-msgstr ""
-"Du har inte tillträde till omdirigera eller ändra underrubrikslänkar på den "
-"här ZWiki sidan."
+msgid "You are not authorized to reparent or change subtopics links on this ZWiki Page."
+msgstr "Du har inte tillträde till omdirigera eller ändra underrubrikslänkar på den här ZWiki sidan."
 
 #: src/ZWiki/Editing.py:349
 msgid "You are not authorized to change this ZWiki Page's type."
 msgstr "Du har inte tillträde att ändra en här Zwiki sidans typ."
 
 #: src/ZWiki/Editing.py:383 src/ZWiki/Editing.py:410
-#: src/ZWiki/plugins/tracker/tracker.py:340
-#: src/ZWiki/plugins/tracker/tracker.py:347
-#: src/ZWiki/plugins/tracker/tracker.py:354
+#: src/ZWiki/plugins/tracker/tracker.py:344
+#: src/ZWiki/plugins/tracker/tracker.py:351
+#: src/ZWiki/plugins/tracker/tracker.py:358
 msgid "You are not authorized to edit this ZWiki Page."
 msgstr "Du har inte tillåtelse att ändra den här ZWiki sidan."
 
@@ -67,11 +61,8 @@
 msgstr "Du har inte tillåtelse att tabort den här ZWiki sidan."
 
 #: src/ZWiki/Editing.py:563
-msgid ""
-"This page was renamed to %s. You can delete this one if no longer needed.\n"
-msgstr ""
-"Den här sidan hade byttnamn till %s. Du kan tabort den här om du inte "
-"behöver den.\n"
+msgid "This page was renamed to %s. You can delete this one if no longer needed.\n"
+msgstr "Den här sidan hade byttnamn till %s. Du kan tabort den här om du inte behöver den.\n"
 
 #: src/ZWiki/Editing.py:659
 msgid "You are not authorized to upload files here."
@@ -91,9 +82,7 @@
 
 #: src/ZWiki/Editing.py:830
 #, fuzzy
-msgid ""
-"your edit contained a banned link pattern. Please contact the site "
-"administrator for help."
+msgid "your edit contained a banned link pattern. Please contact the site administrator for help."
 msgstr "Något är fel: %s. Kontakta sidans administratör för hjälp."
 
 #: src/ZWiki/Editing.py:841
@@ -102,10 +91,7 @@
 msgstr "utökad max_anonymous_links"
 
 #: src/ZWiki/Editing.py:842
-msgid ""
-"adding of external links by unidentified users is restricted. Please back up "
-"and remove some of the http urls you added, or contact the site "
-"administrator for help."
+msgid "adding of external links by unidentified users is restricted. Please back up and remove some of the http urls you added, or contact the site administrator for help."
 msgstr ""
 
 #: src/ZWiki/Editing.py:853
@@ -114,88 +100,89 @@
 msgstr "utökad max_anonymous_links"
 
 #: src/ZWiki/Editing.py:854
-msgid ""
-"adding of external links is restricted, even for identified users. Please "
-"back up and remove some of the http urls you added, or contact the site "
-"administrator for help."
+msgid "adding of external links is restricted, even for identified users. Please back up and remove some of the http urls you added, or contact the site administrator for help."
 msgstr ""
 
-#: src/ZWiki/Mail.py:506 src/ZWiki/skins/dtmlmessages.pt:58
+#: src/ZWiki/Mail.py:506 src/ZWiki/skins/dtmlmessages.pt:60
 #, fuzzy
 msgid "anonymous"
 msgstr "anonym"
 
-#: src/ZWiki/OutlineSupport.py:843 src/ZWiki/skins/zwiki/links.pt:56
+#: src/ZWiki/OutlineSupport.py:378
+msgid "Sorry, this wiki doesn't allow anonymous reparenting. Please configure a username in options first."
+msgstr ""
+
+#: src/ZWiki/OutlineSupport.py:878 src/ZWiki/skins/zwiki/links.pt:56
 #, fuzzy
 msgid "which pages link to this one ?"
 msgstr "vilken sidolänk till den här?"
 
-#: src/ZWiki/OutlineSupport.py:851
+#: src/ZWiki/OutlineSupport.py:886
 #, fuzzy
 msgid "You are here"
 msgstr "Du är här"
 
-#: src/ZWiki/Utils.py:465
+#: src/ZWiki/Utils.py:487
 msgid "years"
 msgstr ""
 
-#: src/ZWiki/Utils.py:465
+#: src/ZWiki/Utils.py:487
 msgid "year"
 msgstr ""
 
-#: src/ZWiki/Utils.py:467
+#: src/ZWiki/Utils.py:489
 msgid "month"
 msgstr ""
 
-#: src/ZWiki/Utils.py:467
+#: src/ZWiki/Utils.py:489
 msgid "months"
 msgstr ""
 
-#: src/ZWiki/Utils.py:469
+#: src/ZWiki/Utils.py:491
 msgid "weeks"
 msgstr ""
 
-#: src/ZWiki/Utils.py:469
+#: src/ZWiki/Utils.py:491
 msgid "week"
 msgstr ""
 
-#: src/ZWiki/Utils.py:471
+#: src/ZWiki/Utils.py:493
 msgid "day"
 msgstr ""
 
-#: src/ZWiki/Utils.py:471
+#: src/ZWiki/Utils.py:493
 msgid "days"
 msgstr "dagar"
 
-#: src/ZWiki/Utils.py:473
+#: src/ZWiki/Utils.py:495
 msgid "hours"
 msgstr "timmar"
 
-#: src/ZWiki/Utils.py:473
+#: src/ZWiki/Utils.py:495
 msgid "hour"
 msgstr "timme"
 
-#: src/ZWiki/Utils.py:475
+#: src/ZWiki/Utils.py:497
 msgid "minute"
 msgstr "minut"
 
-#: src/ZWiki/Utils.py:475
+#: src/ZWiki/Utils.py:497
 msgid "minutes"
 msgstr "minuter"
 
-#: src/ZWiki/Utils.py:477
+#: src/ZWiki/Utils.py:499
 msgid "second"
 msgstr "sekund"
 
-#: src/ZWiki/Utils.py:477
+#: src/ZWiki/Utils.py:499
 msgid "seconds"
 msgstr "sekunder"
 
-#: src/ZWiki/Views.py:346
+#: src/ZWiki/Views.py:350
 msgid "Page is locked"
 msgstr "Sidan är låst"
 
-#: src/ZWiki/Views.py:357
+#: src/ZWiki/Views.py:361
 msgid ""
 "\n"
 "            This page has a webDAV lock. Someone is probably editing it\n"
@@ -206,62 +193,60 @@
 "            "
 msgstr ""
 
-#: src/ZWiki/Views.py:364
+#: src/ZWiki/Views.py:368
 msgid "To discard your changes and try again, click OK."
 msgstr ""
 
-#: src/ZWiki/Views.py:393
+#: src/ZWiki/Views.py:397
 #, fuzzy
 msgid "Edit conflict"
 msgstr "Ändrings Conflict"
 
-#: src/ZWiki/Views.py:413
+#: src/ZWiki/Views.py:417
 #, fuzzy
 msgid "Someone else has saved this page while you were editing"
 msgstr "Någon annan har sparat den här sidan medan du höll på att ändra"
 
-#: src/ZWiki/Views.py:414
+#: src/ZWiki/Views.py:418
 msgid "To resolve the conflict, do this"
 msgstr "För att lösa konflikten, gör så här"
 
-#: src/ZWiki/Views.py:415
+#: src/ZWiki/Views.py:419
 msgid "Click your browser's back button"
 msgstr "Clicka på din webbläsares bakåt knapp"
 
-#: src/ZWiki/Views.py:416
+#: src/ZWiki/Views.py:420
 msgid "Copy your recent edits to the clipboard"
 msgstr "Kopiera dina senaste ändringar till klippbordet"
 
-#: src/ZWiki/Views.py:417
+#: src/ZWiki/Views.py:421
 msgid "Click your browser's refresh button"
 msgstr "Klicka på din webbläsares uppdateringsknapp"
 
-#: src/ZWiki/Views.py:418
+#: src/ZWiki/Views.py:422
 msgid "Paste in your edits again, being mindful of the latest changes"
 msgstr "Klista in dina ändringar igen, var aktsam för de senase ändringarna"
 
-#: src/ZWiki/Views.py:419
+#: src/ZWiki/Views.py:423
 msgid "Click the Change button again"
 msgstr "Click på ändra knappen igen"
 
-#: src/ZWiki/Views.py:420 src/ZWiki/skins/zwiki/editform.pt:163
+#: src/ZWiki/Views.py:424 src/ZWiki/skins/zwiki/editform.pt:163
 msgid "or"
 msgstr "eller"
 
-#: src/ZWiki/Views.py:421
+#: src/ZWiki/Views.py:425
 msgid "To discard your changes and start again, click OK"
 msgstr "För att kastabort dina ändringar och börja om, klicka OK"
 
-#: src/ZWiki/Views.py:490
+#: src/ZWiki/Views.py:501
 msgid ""
 "\n"
-"        Access keys can be accessed in mozilla-based browsers by pressing "
-"alt-<key>\n"
+"        Access keys can be accessed in mozilla-based browsers by pressing alt-<key>\n"
 "        IE users: must also press enter\n"
 "        Mac users: command-<key>\n"
 "        Opera users: shift-escape-<key>\n"
-"        These won't work here, back up to the previous page to try them "
-"out.\n"
+"        These won't work here, back up to the previous page to try them out.\n"
 "\n"
 "        0    show these access key assignments\n"
 "\n"
@@ -277,10 +262,8 @@
 "        s    go to search field\n"
 "        \n"
 "        page functions:\n"
-"        +    (in a plone/cmf site with skin switching set up) use zwiki's "
-"plone/cmf skin\n"
-"        -    (in a plone/cmf site with skin switching set up) use zwiki's "
-"standard skin\n"
+"        +    (in a plone/cmf site with skin switching set up) use zwiki's plone/cmf skin\n"
+"        -    (in a plone/cmf site with skin switching set up) use zwiki's standard skin\n"
 "        v    view page\n"
 "        m    mail subscription\n"
 "        b    show backlinks (links to this page)\n"
@@ -308,32 +291,31 @@
 "        "
 msgstr ""
 
-#: src/ZWiki/Wikis.py:49
-msgid "Unknown wiki type"
-msgstr ""
-
-#: src/ZWiki/ZWikiPage.py:675
+#: src/ZWiki/ZWikiPage.py:744
 msgid "create this page"
 msgstr "skape den här sidan"
 
-#: src/ZWiki/ZWikiPage.py:798 src/ZWiki/ZWikiPage.py:814
-#: src/ZWiki/ZWikiPage.py:817
+#: src/ZWiki/ZWikiPage.py:872 src/ZWiki/ZWikiPage.py:887
 msgid "last edited %(interval)s ago"
 msgstr "förra ändingen skädde %(interval)s sedan"
 
-#: src/ZWiki/ZWikiPage.py:809
+#: src/ZWiki/ZWikiPage.py:882
 msgid "show last edit"
 msgstr ""
 
-#: src/ZWiki/ZWikiPage.py:826 src/ZWiki/ZWikiPage.py:828
+#: src/ZWiki/ZWikiPage.py:897 src/ZWiki/ZWikiPage.py:899
 msgid "by %(editor)s"
 msgstr ""
 
-#: src/ZWiki/__init__.py:34
+#: src/ZWiki/__init__.py:200
+msgid "Unknown wiki type"
+msgstr ""
+
+#: src/ZWiki/__init__.py:39
 msgid "No need to add a Zwiki Outline Cache"
 msgstr ""
 
-#: src/ZWiki/__init__.py:35
+#: src/ZWiki/__init__.py:40
 msgid ""
 "Zwiki Outline Cache appears in the ZMI Add menu\n"
 "        for implementation reasons, but should not be added directly.\n"
@@ -345,6 +327,10 @@
 msgid "comments"
 msgstr ""
 
+#: src/ZWiki/pagetypes/html.py:50 src/ZWiki/pagetypes/rst.py:85
+msgid "reply"
+msgstr "svara"
+
 #: src/ZWiki/pagetypes/moin.py:1990
 msgid "Expected \"=\" to follow \"%(token)s\""
 msgstr ""
@@ -381,10 +367,6 @@
 msgid "Expected a color value \"%(arg)s\" after \"%(key)s\""
 msgstr ""
 
-#: src/ZWiki/pagetypes/rst.py:85
-msgid "reply"
-msgstr "svara"
-
 #: src/ZWiki/plugins/latexwiki/wikis/latexwiki/diffform.pt:127
 #: src/ZWiki/plugins/mathaction/wikis/mathaction/old-diffform.pt:127
 msgid "full history"
@@ -462,7 +444,7 @@
 msgstr "Fil"
 
 #: src/ZWiki/plugins/tracker/filterissues.pt:12
-#: src/ZWiki/skins/dtmlmessages.pt:30
+#: src/ZWiki/skins/dtmlmessages.pt:31
 msgid "Filter issues"
 msgstr ""
 
@@ -474,278 +456,273 @@
 msgid "Issue tracker"
 msgstr ""
 
-#: src/ZWiki/plugins/tracker/tracker.py:361
+#: src/ZWiki/plugins/tracker/tracker.py:365
 #, fuzzy
 msgid "You are not authorized to comment on this ZWiki Page."
 msgstr "Du har inte tillåtelse att ändra den här ZWiki sidan."
 
-#: src/ZWiki/skins/dtmlmessages.pt:10 src/ZWiki/skins/dtmlmessages.pt:32
+#: src/ZWiki/skins/dtmlmessages.pt:10 src/ZWiki/skins/dtmlmessages.pt:33
+#, fuzzy
+msgid "name"
+msgstr "Användarnamn:"
+
+#: src/ZWiki/skins/dtmlmessages.pt:11 src/ZWiki/skins/dtmlmessages.pt:34
 msgid "category"
 msgstr ""
 
-#: src/ZWiki/skins/dtmlmessages.pt:11 src/ZWiki/skins/dtmlmessages.pt:33
+#: src/ZWiki/skins/dtmlmessages.pt:12 src/ZWiki/skins/dtmlmessages.pt:35
 msgid "severity"
 msgstr ""
 
-#: src/ZWiki/skins/dtmlmessages.pt:12 src/ZWiki/skins/dtmlmessages.pt:34
+#: src/ZWiki/skins/dtmlmessages.pt:13 src/ZWiki/skins/dtmlmessages.pt:36
 msgid "status"
 msgstr ""
 
-#: src/ZWiki/skins/dtmlmessages.pt:13 src/ZWiki/skins/dtmlmessages.pt:35
+#: src/ZWiki/skins/dtmlmessages.pt:14 src/ZWiki/skins/dtmlmessages.pt:37
 msgid "age"
 msgstr ""
 
-#: src/ZWiki/skins/dtmlmessages.pt:14 src/ZWiki/skins/dtmlmessages.pt:36
+#: src/ZWiki/skins/dtmlmessages.pt:15 src/ZWiki/skins/dtmlmessages.pt:38
 msgid "modified"
 msgstr ""
 
-#: src/ZWiki/skins/dtmlmessages.pt:15
+#: src/ZWiki/skins/dtmlmessages.pt:16
 msgid "Add a new issue:"
 msgstr ""
 
-#: src/ZWiki/skins/dtmlmessages.pt:16
+#: src/ZWiki/skins/dtmlmessages.pt:17
 msgid "Name:"
 msgstr ""
 
-#: src/ZWiki/skins/dtmlmessages.pt:17
+#: src/ZWiki/skins/dtmlmessages.pt:18
 msgid "Category:"
 msgstr ""
 
-#: src/ZWiki/skins/dtmlmessages.pt:18
+#: src/ZWiki/skins/dtmlmessages.pt:19
 msgid "Severity:"
 msgstr ""
 
-#: src/ZWiki/skins/dtmlmessages.pt:19
-msgid "Status:"
-msgstr ""
-
 #: src/ZWiki/skins/dtmlmessages.pt:2
 msgid "Here are the wiki's issue pages."
 msgstr ""
 
 #: src/ZWiki/skins/dtmlmessages.pt:20
-msgid "Details:"
+msgid "Status:"
 msgstr ""
 
 #: src/ZWiki/skins/dtmlmessages.pt:21
-msgid "add issue"
+msgid "Details:"
 msgstr ""
 
 #: src/ZWiki/skins/dtmlmessages.pt:22
-msgid "More advanced"
+msgid "add issue"
 msgstr ""
 
 #: src/ZWiki/skins/dtmlmessages.pt:23
-msgid "issue tracker"
+msgid "More advanced"
 msgstr ""
 
 #: src/ZWiki/skins/dtmlmessages.pt:24
-msgid "search options"
+msgid "issue tracker"
 msgstr ""
 
 #: src/ZWiki/skins/dtmlmessages.pt:25
-msgid "Name contains any of:"
+msgid "search options"
 msgstr ""
 
 #: src/ZWiki/skins/dtmlmessages.pt:26
-msgid "Page text contains any of:"
+msgid "Name contains any of:"
 msgstr ""
 
 #: src/ZWiki/skins/dtmlmessages.pt:27
-msgid "Categories:"
+msgid "Page text contains any of:"
 msgstr ""
 
 #: src/ZWiki/skins/dtmlmessages.pt:28
-msgid "Severities:"
+msgid "Categories:"
 msgstr ""
 
 #: src/ZWiki/skins/dtmlmessages.pt:29
-msgid "Statuses:"
+msgid "Severities:"
 msgstr ""
 
 #: src/ZWiki/skins/dtmlmessages.pt:3
 msgid "Enter a search term, click the numbers to the right,"
 msgstr ""
 
-#: src/ZWiki/skins/dtmlmessages.pt:37
-msgid "Submitted by"
+#: src/ZWiki/skins/dtmlmessages.pt:30
+msgid "Statuses:"
 msgstr ""
 
-#: src/ZWiki/skins/dtmlmessages.pt:38
-msgid "Name"
-msgstr "Namn"
-
 #: src/ZWiki/skins/dtmlmessages.pt:39
-msgid "Category"
-msgstr "Kategori"
+msgid "Submitted by"
+msgstr ""
 
 #: src/ZWiki/skins/dtmlmessages.pt:4
 msgid "filter issues"
 msgstr ""
 
 #: src/ZWiki/skins/dtmlmessages.pt:40
+msgid "Name"
+msgstr "Namn"
+
+#: src/ZWiki/skins/dtmlmessages.pt:41
+msgid "Category"
+msgstr "Kategori"
+
+#: src/ZWiki/skins/dtmlmessages.pt:42
 msgid "Severity"
 msgstr ""
 
-#: src/ZWiki/skins/dtmlmessages.pt:41
+#: src/ZWiki/skins/dtmlmessages.pt:43
 msgid "Status"
 msgstr "Status"
 
-#: src/ZWiki/skins/dtmlmessages.pt:42
+#: src/ZWiki/skins/dtmlmessages.pt:44
 msgid "Optional subject"
 msgstr "Alternativt änme"
 
-#: src/ZWiki/skins/dtmlmessages.pt:43
+#: src/ZWiki/skins/dtmlmessages.pt:45
 msgid "Optional comment"
 msgstr "Alternativ Kommentar"
 
-#: src/ZWiki/skins/dtmlmessages.pt:44 src/ZWiki/skins/dtmlmessages.pt:45
+#: src/ZWiki/skins/dtmlmessages.pt:46 src/ZWiki/skins/dtmlmessages.pt:47
 #, fuzzy
 msgid "Add ZWiki"
 msgstr "Lägg till Wiki"
 
-#: src/ZWiki/skins/dtmlmessages.pt:46
+#: src/ZWiki/skins/dtmlmessages.pt:48
 msgid "Id:"
 msgstr ""
 
-#: src/ZWiki/skins/dtmlmessages.pt:47
+#: src/ZWiki/skins/dtmlmessages.pt:49
 #, fuzzy
 msgid "Title:"
 msgstr "Fil"
 
-#: src/ZWiki/skins/dtmlmessages.pt:48
+#: src/ZWiki/skins/dtmlmessages.pt:5
+msgid "browse open issues"
+msgstr ""
+
+#: src/ZWiki/skins/dtmlmessages.pt:50
 msgid "Template:"
 msgstr ""
 
-#: src/ZWiki/skins/dtmlmessages.pt:49
+#: src/ZWiki/skins/dtmlmessages.pt:51
 #, fuzzy
 msgid "Add wiki"
 msgstr "Lägg till Wiki"
 
-#: src/ZWiki/skins/dtmlmessages.pt:5
-msgid "browse open issues"
-msgstr ""
-
-#: src/ZWiki/skins/dtmlmessages.pt:50
+#: src/ZWiki/skins/dtmlmessages.pt:52
 msgid "Pages changed in the last"
 msgstr ""
 
-#: src/ZWiki/skins/dtmlmessages.pt:51
+#: src/ZWiki/skins/dtmlmessages.pt:53
 msgid "Recently changed pages, with summaries"
 msgstr ""
 
-#: src/ZWiki/skins/dtmlmessages.pt:52
+#: src/ZWiki/skins/dtmlmessages.pt:54
 msgid "Show summaries ?"
 msgstr ""
 
-#: src/ZWiki/skins/dtmlmessages.pt:53
+#: src/ZWiki/skins/dtmlmessages.pt:55
 msgid "Refresh"
 msgstr ""
 
-#: src/ZWiki/skins/dtmlmessages.pt:54
+#: src/ZWiki/skins/dtmlmessages.pt:56
 msgid "Page"
 msgstr ""
 
-#: src/ZWiki/skins/dtmlmessages.pt:55
+#: src/ZWiki/skins/dtmlmessages.pt:57
 msgid "Edited&nbsp;by"
 msgstr ""
 
-#: src/ZWiki/skins/dtmlmessages.pt:56
+#: src/ZWiki/skins/dtmlmessages.pt:58
 msgid "Time"
 msgstr ""
 
-#: src/ZWiki/skins/dtmlmessages.pt:57
+#: src/ZWiki/skins/dtmlmessages.pt:59
 msgid "NEW"
 msgstr ""
 
-#: src/ZWiki/skins/dtmlmessages.pt:59
-msgid "Pages marked (NEW) have been created within the last week"
-msgstr ""
-
 #: src/ZWiki/skins/dtmlmessages.pt:6
 msgid "search issues"
 msgstr ""
 
-#: src/ZWiki/skins/dtmlmessages.pt:60
+#: src/ZWiki/skins/dtmlmessages.pt:61
+msgid "Pages marked (NEW) have been created within the last week"
+msgstr ""
+
+#: src/ZWiki/skins/dtmlmessages.pt:62
 msgid "Enter a word or phrase and hit enter to search the entire wiki."
 msgstr ""
 
-#: src/ZWiki/skins/dtmlmessages.pt:61
+#: src/ZWiki/skins/dtmlmessages.pt:63
 msgid "This is the same as using the search field at top right."
 msgstr ""
 
-#: src/ZWiki/skins/dtmlmessages.pt:62
+#: src/ZWiki/skins/dtmlmessages.pt:64
 msgid "Tips: A single word works best for matching page names."
 msgstr ""
 
-#: src/ZWiki/skins/dtmlmessages.pt:63
-msgid ""
-"Case-insensitivity and wildcards may be supported depending on your catalog "
-"configuration."
+#: src/ZWiki/skins/dtmlmessages.pt:65
+msgid "Case-insensitivity and wildcards may be supported depending on your catalog configuration."
 msgstr ""
 
-#: src/ZWiki/skins/dtmlmessages.pt:64
+#: src/ZWiki/skins/dtmlmessages.pt:66
 msgid "Leave it blank to list all pages."
 msgstr ""
 
-#: src/ZWiki/skins/dtmlmessages.pt:65 src/ZWiki/skins/dtmlmessages.pt:66
+#: src/ZWiki/skins/dtmlmessages.pt:67 src/ZWiki/skins/dtmlmessages.pt:68
 msgid "Search"
 msgstr "Sök"
 
-#: src/ZWiki/skins/dtmlmessages.pt:67
+#: src/ZWiki/skins/dtmlmessages.pt:69
 msgid "Page names matching"
 msgstr ""
 
-#: src/ZWiki/skins/dtmlmessages.pt:68
+#: src/ZWiki/skins/dtmlmessages.pt:7
+msgid "recent"
+msgstr ""
+
+#: src/ZWiki/skins/dtmlmessages.pt:70
 msgid "Text matching"
 msgstr ""
 
-#: src/ZWiki/skins/dtmlmessages.pt:69
+#: src/ZWiki/skins/dtmlmessages.pt:71
 msgid "Thorough (non-catalog) search for text matching"
 msgstr ""
 
-#: src/ZWiki/skins/dtmlmessages.pt:7
-msgid "recent"
-msgstr ""
-
-#: src/ZWiki/skins/dtmlmessages.pt:70
+#: src/ZWiki/skins/dtmlmessages.pt:72
 msgid "Set your preferences for this wiki:"
 msgstr "Ställ in inställningarna för den här wiki:"
 
-#: src/ZWiki/skins/dtmlmessages.pt:71
+#: src/ZWiki/skins/dtmlmessages.pt:73
 msgid "User name:"
 msgstr "Användarnamn:"
 
-#: src/ZWiki/skins/dtmlmessages.pt:72
-msgid "(identifies your edits)"
-msgstr ""
-
-#: src/ZWiki/skins/dtmlmessages.pt:73
-msgid "Email address:"
-msgstr ""
-
 #: src/ZWiki/skins/dtmlmessages.pt:74
-msgid "(allows mail subscription)"
+msgid "(identifies your edits, saves your votes, may be required)"
 msgstr ""
 
 #: src/ZWiki/skins/dtmlmessages.pt:75
-msgid "Your time zone:"
+msgid "Email address:"
 msgstr ""
 
 #: src/ZWiki/skins/dtmlmessages.pt:76
-msgid "(localizes most times)"
+msgid "(allows mail subscription)"
 msgstr ""
 
 #: src/ZWiki/skins/dtmlmessages.pt:77
-msgid "Edit form height:"
+msgid "Your time zone:"
 msgstr ""
 
 #: src/ZWiki/skins/dtmlmessages.pt:78
-msgid "(adjusts form size)"
+msgid "(localizes most times)"
 msgstr ""
 
 #: src/ZWiki/skins/dtmlmessages.pt:79
-msgid "Save options"
+msgid "Edit form height:"
 msgstr ""
 
 #: src/ZWiki/skins/dtmlmessages.pt:8
@@ -753,71 +730,71 @@
 msgstr ""
 
 #: src/ZWiki/skins/dtmlmessages.pt:80
+msgid "(adjusts form size)"
+msgstr ""
+
+#: src/ZWiki/skins/dtmlmessages.pt:81
+msgid "Save options"
+msgstr ""
+
+#: src/ZWiki/skins/dtmlmessages.pt:82
 msgid "Forget options"
 msgstr "Glömbort inställningarna"
 
-#: src/ZWiki/skins/dtmlmessages.pt:81 src/ZWiki/skins/dtmlmessages.pt:82
+#: src/ZWiki/skins/dtmlmessages.pt:83 src/ZWiki/skins/dtmlmessages.pt:84
 msgid "Add ZWiki Page"
 msgstr ""
 
-#: src/ZWiki/skins/dtmlmessages.pt:83
+#: src/ZWiki/skins/dtmlmessages.pt:85
 msgid "Page&nbsp;name:"
 msgstr ""
 
-#: src/ZWiki/skins/dtmlmessages.pt:84
+#: src/ZWiki/skins/dtmlmessages.pt:86
 #, fuzzy
 msgid "Add wiki page"
 msgstr "Lägg till Wiki-sida"
 
-#: src/ZWiki/skins/dtmlmessages.pt:85
+#: src/ZWiki/skins/dtmlmessages.pt:87
 msgid "Topic"
 msgstr "Ämne"
 
-#: src/ZWiki/skins/dtmlmessages.pt:86
+#: src/ZWiki/skins/dtmlmessages.pt:88
 msgid "Last updated"
 msgstr "Senase uppdateringen"
 
-#: src/ZWiki/skins/dtmlmessages.pt:87
+#: src/ZWiki/skins/dtmlmessages.pt:89
 msgid "Comments"
 msgstr "Kommentarer"
 
-#: src/ZWiki/skins/dtmlmessages.pt:88
+#: src/ZWiki/skins/dtmlmessages.pt:9 src/ZWiki/skins/dtmlmessages.pt:32
+msgid "#"
+msgstr ""
+
+#: src/ZWiki/skins/dtmlmessages.pt:90
 msgid "Views"
 msgstr ""
 
-#: src/ZWiki/skins/dtmlmessages.pt:89
+#: src/ZWiki/skins/dtmlmessages.pt:91
 msgid "Created"
 msgstr ""
 
-#: src/ZWiki/skins/dtmlmessages.pt:9 src/ZWiki/skins/dtmlmessages.pt:31
-msgid "#"
-msgstr ""
-
-#: src/ZWiki/skins/dtmlmessages.pt:90 src/ZWiki/skins/dtmlmessages.pt:92
+#: src/ZWiki/skins/dtmlmessages.pt:92 src/ZWiki/skins/dtmlmessages.pt:94
 msgid "by"
 msgstr ""
 
-#: src/ZWiki/skins/dtmlmessages.pt:91
+#: src/ZWiki/skins/dtmlmessages.pt:93
 msgid "<dtml-var lasteditinterval> ago</dtml-var>"
 msgstr ""
 
-#: src/ZWiki/skins/dtmlmessages.pt:93
+#: src/ZWiki/skins/dtmlmessages.pt:95
 msgid "on"
 msgstr ""
 
-#: src/ZWiki/skins/zwiki/backlinks.pt:108
-msgid "Subtopics"
-msgstr ""
-
-#: src/ZWiki/skins/zwiki/backlinks.pt:111
-msgid "This page has no subtopics."
-msgstr ""
-
-#: src/ZWiki/skins/zwiki/backlinks.pt:114
+#: src/ZWiki/skins/zwiki/backlinks.pt:102
 msgid "Here are it's subtopics."
 msgstr ""
 
-#: src/ZWiki/skins/zwiki/backlinks.pt:117
+#: src/ZWiki/skins/zwiki/backlinks.pt:105
 msgid "You can reorder them by clicking the ^ buttons."
 msgstr ""
 
@@ -831,60 +808,60 @@
 msgid "Parents"
 msgstr "paranteser"
 
-#: src/ZWiki/skins/zwiki/backlinks.pt:31
+#: src/ZWiki/skins/zwiki/backlinks.pt:28
 msgid "is a top-level topic."
 msgstr ""
 
-#: src/ZWiki/skins/zwiki/backlinks.pt:32
+#: src/ZWiki/skins/zwiki/backlinks.pt:29
 msgid "is a subtopic of:"
 msgstr ""
 
-#: src/ZWiki/skins/zwiki/backlinks.pt:55
+#: src/ZWiki/skins/zwiki/backlinks.pt:48
 msgid "Backlinks"
 msgstr ""
 
-#: src/ZWiki/skins/zwiki/backlinks.pt:56
+#: src/ZWiki/skins/zwiki/backlinks.pt:49
 msgid "Here are the pages which link to it:"
 msgstr ""
 
-#: src/ZWiki/skins/zwiki/backlinks.pt:57
+#: src/ZWiki/skins/zwiki/backlinks.pt:50
 msgid "No other pages link to this one."
 msgstr ""
 
-#: src/ZWiki/skins/zwiki/backlinks.pt:82
-msgid ""
-"You can set this page's parent(s) to place it within the overall page "
-"hierarchy."
+#: src/ZWiki/skins/zwiki/backlinks.pt:70
+msgid "You can set this page's parent(s) to place it within the overall page hierarchy."
 msgstr ""
 
-#: src/ZWiki/skins/zwiki/backlinks.pt:85
-msgid ""
-"Check one or more checkboxes or enter a page name here, and click the button."
+#: src/ZWiki/skins/zwiki/backlinks.pt:73
+msgid "Check one or more checkboxes or enter a page name here, and click the button."
 msgstr ""
 
-#: src/ZWiki/skins/zwiki/backlinks.pt:88
+#: src/ZWiki/skins/zwiki/backlinks.pt:76
 msgid "Enter a page name here and click the button."
 msgstr ""
 
-#: src/ZWiki/skins/zwiki/backlinks.pt:91
-msgid ""
-"You can type just the first few letters, case and punctuation are ignored."
+#: src/ZWiki/skins/zwiki/backlinks.pt:79
+msgid "You can type just the first few letters, case and punctuation are ignored."
 msgstr ""
 
-#: src/ZWiki/skins/zwiki/backlinks.pt:98
+#: src/ZWiki/skins/zwiki/backlinks.pt:86
 msgid "Reparent"
 msgstr ""
 
+#: src/ZWiki/skins/zwiki/backlinks.pt:96
+msgid "Subtopics"
+msgstr ""
+
+#: src/ZWiki/skins/zwiki/backlinks.pt:99
+msgid "This page has no subtopics."
+msgstr ""
+
 #: src/ZWiki/skins/zwiki/badtemplate.pt:12
 msgid "Bad template"
 msgstr ""
 
 #: src/ZWiki/skins/zwiki/badtemplate.pt:13
-msgid ""
-"There was a problem locating one of this wiki's skin templates. There may be "
-"a page or other non-page-template/non-dtml-method object with the same ID, "
-"obscuring the template. Or the template may be missing on the filesystem (an "
-"incomplete Zwiki installation)."
+msgid "There was a problem locating one of this wiki's skin templates. There may be a page or other non-page-template/non-dtml-method object with the same ID, obscuring the template. Or the template may be missing on the filesystem (an incomplete Zwiki installation)."
 msgstr ""
 
 #: src/ZWiki/skins/zwiki/commentform.pt:21
@@ -916,12 +893,18 @@
 msgid "add-comment"
 msgstr ""
 
-#: src/ZWiki/skins/zwiki/contentspage.pt:12
+#: src/ZWiki/skins/zwiki/contentspage.pt:10
+#: src/ZWiki/skins/zwiki/contentspage.pt:27
+msgid "Wiki contents for"
+msgstr ""
+
+#: src/ZWiki/skins/zwiki/contentspage.pt:13
+#: src/ZWiki/skins/zwiki/contentspage.pt:30
 msgid "Wiki contents"
 msgstr ""
 
-#: src/ZWiki/skins/zwiki/contentspage.pt:16
-msgid "Singletons"
+#: src/ZWiki/skins/zwiki/contentspage.pt:40
+msgid "Singletons:"
 msgstr ""
 
 #: src/ZWiki/skins/zwiki/denied.pt:12
@@ -1004,11 +987,11 @@
 msgstr ""
 
 #: src/ZWiki/skins/zwiki/editform.pt:178
-msgid "preview this edit"
+msgid "Preview"
 msgstr ""
 
 #: src/ZWiki/skins/zwiki/editform.pt:178
-msgid "Preview"
+msgid "preview this edit"
 msgstr ""
 
 #: src/ZWiki/skins/zwiki/editform.pt:183
@@ -1045,13 +1028,18 @@
 msgstr ""
 
 #: src/ZWiki/skins/zwiki/editform.pt:71
-msgid "type"
+msgid "markup"
 msgstr ""
 
 #: src/ZWiki/skins/zwiki/editform.pt:72
 msgid "select the formatting and rendering style for this page"
 msgstr ""
 
+#: src/ZWiki/skins/zwiki/helppage.pt:12
+#, fuzzy
+msgid "Help page"
+msgstr "skape den här sidan"
+
 #: src/ZWiki/skins/zwiki/links.pt:102
 msgid "(external edit)"
 msgstr ""
@@ -1189,14 +1177,14 @@
 msgstr ""
 
 #: src/ZWiki/skins/zwiki/pagemanagementform.pt:45
+msgid "make this page a subtopic of the page you have entered"
+msgstr ""
+
+#: src/ZWiki/skins/zwiki/pagemanagementform.pt:45
 #, fuzzy
 msgid "reparent"
 msgstr "paranteser"
 
-#: src/ZWiki/skins/zwiki/pagemanagementform.pt:45
-msgid "make this page a subtopic of the page you have entered"
-msgstr ""
-
 #: src/ZWiki/skins/zwiki/pagemanagementform.pt:50
 msgid "rename this page to the name you have entered, updating all links"
 msgstr ""
@@ -1211,8 +1199,7 @@
 msgstr ""
 
 #: src/ZWiki/skins/zwiki/pagemanagementform.pt:55
-msgid ""
-"delete this page, and redirect links to the page you have entered, if any"
+msgid "delete this page, and redirect links to the page you have entered, if any"
 msgstr ""
 
 #: src/ZWiki/skins/zwiki/pagemanagementform.pt:60
@@ -1341,8 +1328,7 @@
 
 #, fuzzy
 #~ msgid "adding of external links by anonymous authors is restricted"
-#~ msgstr ""
-#~ "begränsad möjlighet för anonyma författare att lägga till externa länkar"
+#~ msgstr "begränsad möjlighet för anonyma författare att lägga till externa länkar"
 
 #~ msgid "Add"
 #~ msgstr "Lägg till"

Modified: zope-zwiki/trunk/i18n/th.po
===================================================================
--- zope-zwiki/trunk/i18n/th.po	2007-04-08 14:54:05 UTC (rev 761)
+++ zope-zwiki/trunk/i18n/th.po	2007-04-08 14:55:27 UTC (rev 762)
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: zwiki\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL at ADDRESS>\n"
-"POT-Creation-Date: Sat Sep  2 18:10:16 2006\n"
+"POT-Creation-Date: Tue Mar 27 14:50:46 2007\n"
 "PO-Revision-Date: 2006-03-16 02:32+0000\n"
 "Last-Translator: Bunyawat Singchai <bunyawat.s at gmail.com>\n"
 "Language-Team: Thai <th at li.org>\n"
@@ -16,36 +16,31 @@
 "Content-Transfer-Encoding: 8bit\n"
 "Domain: zwiki\n"
 
-#: src/ZWiki/Admin.py:62
+#: src/ZWiki/Admin.py:58
 msgid "You are not authorized to upgrade all pages."
 msgstr "คุณไม่มีสิทธิในการปรับปรุงทุกหน้า"
 
-#: src/ZWiki/Admin.py:63
+#: src/ZWiki/Admin.py:59
 msgid "(folder -> Manage properties)"
 msgstr "(แฟ้ม -> จัดการคุณสมบัติ)"
 
-#: src/ZWiki/Diff.py:174
+#: src/ZWiki/Diff.py:179
 #, fuzzy
 msgid "You are not authorized to reparent this ZWiki Page."
 msgstr "คุณไม่มีสิทธิในการลบ ZWiki หน้านี้"
 
-#: src/ZWiki/Diff.py:180 src/ZWiki/plugins/tracker/tracker.py:332
+#: src/ZWiki/Diff.py:185 src/ZWiki/plugins/tracker/tracker.py:333
 #, fuzzy
 msgid "You are not authorized to rename this ZWiki Page."
 msgstr "คุณไม่มีสิทธิในการลบ ZWiki หน้านี้"
 
-#: src/ZWiki/Editing.py:156 src/ZWiki/Editing.py:294 src/ZWiki/Views.py:332
-#: src/ZWiki/Views.py:435 src/ZWiki/plugins/tracker/tracker.py:321
-msgid ""
-"Sorry, this wiki doesn't allow anonymous edits. Please configure a username "
-"in options first."
-msgstr ""
-"ขอโทษด้วย wiki นี้ไม่อนุญาติให้ผู้ใช้ที่ไมระบุตนเองทำการแก้ไข  โปรดสร้างรหัสผู้ใช้งานในตัวเลือกก่อน"
+#: src/ZWiki/Editing.py:156 src/ZWiki/Editing.py:294 src/ZWiki/Views.py:336
+#: src/ZWiki/Views.py:439 src/ZWiki/plugins/tracker/tracker.py:322
+msgid "Sorry, this wiki doesn't allow anonymous edits. Please configure a username in options first."
+msgstr "ขอโทษด้วย wiki นี้ไม่อนุญาติให้ผู้ใช้ที่ไมระบุตนเองทำการแก้ไข  โปรดสร้างรหัสผู้ใช้งานในตัวเลือกก่อน"
 
 #: src/ZWiki/Editing.py:327
-msgid ""
-"You are not authorized to reparent or change subtopics links on this ZWiki "
-"Page."
+msgid "You are not authorized to reparent or change subtopics links on this ZWiki Page."
 msgstr "คุณไม่มีสิทธิในการเปลี่ยนตัวเชื่อมสู่เนื้อหาย่อยบน ZWiki หน้านี้"
 
 #: src/ZWiki/Editing.py:349
@@ -53,9 +48,9 @@
 msgstr "คุณไม่มีสิทธิในการเปลี่ยนประเภทของ ZWiki หน้านี้"
 
 #: src/ZWiki/Editing.py:383 src/ZWiki/Editing.py:410
-#: src/ZWiki/plugins/tracker/tracker.py:340
-#: src/ZWiki/plugins/tracker/tracker.py:347
-#: src/ZWiki/plugins/tracker/tracker.py:354
+#: src/ZWiki/plugins/tracker/tracker.py:344
+#: src/ZWiki/plugins/tracker/tracker.py:351
+#: src/ZWiki/plugins/tracker/tracker.py:358
 msgid "You are not authorized to edit this ZWiki Page."
 msgstr "คุณไม่มีสิทธิในการเปลี่ยนแปลงเนื้อหาของ ZWiki หน้านี้"
 
@@ -64,8 +59,7 @@
 msgstr "คุณไม่มีสิทธิในการลบ ZWiki หน้านี้"
 
 #: src/ZWiki/Editing.py:563
-msgid ""
-"This page was renamed to %s. You can delete this one if no longer needed.\n"
+msgid "This page was renamed to %s. You can delete this one if no longer needed.\n"
 msgstr "หน้านี้ถูกเปลี่ยนชื่อเป็น %s คุณสามารถลบมันทิ้งได้ถ้าคุณไม่ต้องการมันแล้ว\n"
 
 #: src/ZWiki/Editing.py:659
@@ -86,9 +80,7 @@
 
 #: src/ZWiki/Editing.py:830
 #, fuzzy
-msgid ""
-"your edit contained a banned link pattern. Please contact the site "
-"administrator for help."
+msgid "your edit contained a banned link pattern. Please contact the site administrator for help."
 msgstr "มีปัญหาเกิดขึ้น: %s. โปรดติดต่อผู้ดูแลระบบเพิ่อขอความช่วยเหลือ"
 
 #: src/ZWiki/Editing.py:841
@@ -96,10 +88,7 @@
 msgstr ""
 
 #: src/ZWiki/Editing.py:842
-msgid ""
-"adding of external links by unidentified users is restricted. Please back up "
-"and remove some of the http urls you added, or contact the site "
-"administrator for help."
+msgid "adding of external links by unidentified users is restricted. Please back up and remove some of the http urls you added, or contact the site administrator for help."
 msgstr ""
 
 #: src/ZWiki/Editing.py:853
@@ -107,85 +96,87 @@
 msgstr ""
 
 #: src/ZWiki/Editing.py:854
-msgid ""
-"adding of external links is restricted, even for identified users. Please "
-"back up and remove some of the http urls you added, or contact the site "
-"administrator for help."
+msgid "adding of external links is restricted, even for identified users. Please back up and remove some of the http urls you added, or contact the site administrator for help."
 msgstr ""
 
-#: src/ZWiki/Mail.py:506 src/ZWiki/skins/dtmlmessages.pt:58
+#: src/ZWiki/Mail.py:506 src/ZWiki/skins/dtmlmessages.pt:60
 msgid "anonymous"
 msgstr "ผู้ใช้ที่ไม่ระบุตัวตน"
 
-#: src/ZWiki/OutlineSupport.py:843 src/ZWiki/skins/zwiki/links.pt:56
+#: src/ZWiki/OutlineSupport.py:378
+#, fuzzy
+msgid "Sorry, this wiki doesn't allow anonymous reparenting. Please configure a username in options first."
+msgstr "ขอโทษด้วย wiki นี้ไม่อนุญาติให้ผู้ใช้ที่ไมระบุตนเองทำการแก้ไข  โปรดสร้างรหัสผู้ใช้งานในตัวเลือกก่อน"
+
+#: src/ZWiki/OutlineSupport.py:878 src/ZWiki/skins/zwiki/links.pt:56
 msgid "which pages link to this one ?"
 msgstr "หน้าไหนที่ต้องการเชื่อมโยงที่จุดนี้"
 
-#: src/ZWiki/OutlineSupport.py:851
+#: src/ZWiki/OutlineSupport.py:886
 msgid "You are here"
 msgstr "คุณอยู่ที่นี้"
 
-#: src/ZWiki/Utils.py:465
+#: src/ZWiki/Utils.py:487
 msgid "years"
 msgstr ""
 
-#: src/ZWiki/Utils.py:465
+#: src/ZWiki/Utils.py:487
 msgid "year"
 msgstr ""
 
-#: src/ZWiki/Utils.py:467
+#: src/ZWiki/Utils.py:489
 msgid "month"
 msgstr ""
 
-#: src/ZWiki/Utils.py:467
+#: src/ZWiki/Utils.py:489
 msgid "months"
 msgstr ""
 
-#: src/ZWiki/Utils.py:469
+#: src/ZWiki/Utils.py:491
 msgid "weeks"
 msgstr ""
 
-#: src/ZWiki/Utils.py:469
+#: src/ZWiki/Utils.py:491
 msgid "week"
 msgstr ""
 
-#: src/ZWiki/Utils.py:471
+#: src/ZWiki/Utils.py:493
 msgid "day"
 msgstr ""
 
-#: src/ZWiki/Utils.py:471
+#: src/ZWiki/Utils.py:493
 msgid "days"
 msgstr ""
 
-#: src/ZWiki/Utils.py:473
+#: src/ZWiki/Utils.py:495
 msgid "hours"
 msgstr ""
 
-#: src/ZWiki/Utils.py:473
+#: src/ZWiki/Utils.py:495
 msgid "hour"
 msgstr ""
 
-#: src/ZWiki/Utils.py:475
+#: src/ZWiki/Utils.py:497
 msgid "minute"
 msgstr ""
 
-#: src/ZWiki/Utils.py:475
+#: src/ZWiki/Utils.py:497
 msgid "minutes"
 msgstr ""
 
-#: src/ZWiki/Utils.py:477
+#: src/ZWiki/Utils.py:499
 msgid "second"
 msgstr ""
 
-#: src/ZWiki/Utils.py:477
+#: src/ZWiki/Utils.py:499
 msgid "seconds"
 msgstr ""
 
-#: src/ZWiki/Views.py:346
+#: src/ZWiki/Views.py:350
 msgid "Page is locked"
 msgstr ""
 
-#: src/ZWiki/Views.py:357
+#: src/ZWiki/Views.py:361
 msgid ""
 "\n"
 "            This page has a webDAV lock. Someone is probably editing it\n"
@@ -196,60 +187,58 @@
 "            "
 msgstr ""
 
-#: src/ZWiki/Views.py:364
+#: src/ZWiki/Views.py:368
 msgid "To discard your changes and try again, click OK."
 msgstr ""
 
-#: src/ZWiki/Views.py:393
+#: src/ZWiki/Views.py:397
 msgid "Edit conflict"
 msgstr "การแก้ไขขัดแย้งกัน"
 
-#: src/ZWiki/Views.py:413
+#: src/ZWiki/Views.py:417
 msgid "Someone else has saved this page while you were editing"
 msgstr "มีผู้ใช้ท่านอื่นได้บัณทึกข้อมูลหน้าที่คุณกำลังแก้ไขอยู่นี้"
 
-#: src/ZWiki/Views.py:414
+#: src/ZWiki/Views.py:418
 msgid "To resolve the conflict, do this"
 msgstr ""
 
-#: src/ZWiki/Views.py:415
+#: src/ZWiki/Views.py:419
 msgid "Click your browser's back button"
 msgstr ""
 
-#: src/ZWiki/Views.py:416
+#: src/ZWiki/Views.py:420
 msgid "Copy your recent edits to the clipboard"
 msgstr ""
 
-#: src/ZWiki/Views.py:417
+#: src/ZWiki/Views.py:421
 msgid "Click your browser's refresh button"
 msgstr ""
 
-#: src/ZWiki/Views.py:418
+#: src/ZWiki/Views.py:422
 msgid "Paste in your edits again, being mindful of the latest changes"
 msgstr ""
 
-#: src/ZWiki/Views.py:419
+#: src/ZWiki/Views.py:423
 msgid "Click the Change button again"
 msgstr ""
 
-#: src/ZWiki/Views.py:420 src/ZWiki/skins/zwiki/editform.pt:163
+#: src/ZWiki/Views.py:424 src/ZWiki/skins/zwiki/editform.pt:163
 msgid "or"
 msgstr ""
 
-#: src/ZWiki/Views.py:421
+#: src/ZWiki/Views.py:425
 msgid "To discard your changes and start again, click OK"
 msgstr ""
 
-#: src/ZWiki/Views.py:490
+#: src/ZWiki/Views.py:501
 msgid ""
 "\n"
-"        Access keys can be accessed in mozilla-based browsers by pressing "
-"alt-<key>\n"
+"        Access keys can be accessed in mozilla-based browsers by pressing alt-<key>\n"
 "        IE users: must also press enter\n"
 "        Mac users: command-<key>\n"
 "        Opera users: shift-escape-<key>\n"
-"        These won't work here, back up to the previous page to try them "
-"out.\n"
+"        These won't work here, back up to the previous page to try them out.\n"
 "\n"
 "        0    show these access key assignments\n"
 "\n"
@@ -265,10 +254,8 @@
 "        s    go to search field\n"
 "        \n"
 "        page functions:\n"
-"        +    (in a plone/cmf site with skin switching set up) use zwiki's "
-"plone/cmf skin\n"
-"        -    (in a plone/cmf site with skin switching set up) use zwiki's "
-"standard skin\n"
+"        +    (in a plone/cmf site with skin switching set up) use zwiki's plone/cmf skin\n"
+"        -    (in a plone/cmf site with skin switching set up) use zwiki's standard skin\n"
 "        v    view page\n"
 "        m    mail subscription\n"
 "        b    show backlinks (links to this page)\n"
@@ -296,32 +283,31 @@
 "        "
 msgstr ""
 
-#: src/ZWiki/Wikis.py:49
-msgid "Unknown wiki type"
-msgstr ""
-
-#: src/ZWiki/ZWikiPage.py:675
+#: src/ZWiki/ZWikiPage.py:744
 msgid "create this page"
 msgstr ""
 
-#: src/ZWiki/ZWikiPage.py:798 src/ZWiki/ZWikiPage.py:814
-#: src/ZWiki/ZWikiPage.py:817
+#: src/ZWiki/ZWikiPage.py:872 src/ZWiki/ZWikiPage.py:887
 msgid "last edited %(interval)s ago"
 msgstr ""
 
-#: src/ZWiki/ZWikiPage.py:809
+#: src/ZWiki/ZWikiPage.py:882
 msgid "show last edit"
 msgstr ""
 
-#: src/ZWiki/ZWikiPage.py:826 src/ZWiki/ZWikiPage.py:828
+#: src/ZWiki/ZWikiPage.py:897 src/ZWiki/ZWikiPage.py:899
 msgid "by %(editor)s"
 msgstr ""
 
-#: src/ZWiki/__init__.py:34
+#: src/ZWiki/__init__.py:200
+msgid "Unknown wiki type"
+msgstr ""
+
+#: src/ZWiki/__init__.py:39
 msgid "No need to add a Zwiki Outline Cache"
 msgstr ""
 
-#: src/ZWiki/__init__.py:35
+#: src/ZWiki/__init__.py:40
 msgid ""
 "Zwiki Outline Cache appears in the ZMI Add menu\n"
 "        for implementation reasons, but should not be added directly.\n"
@@ -333,6 +319,10 @@
 msgid "comments"
 msgstr ""
 
+#: src/ZWiki/pagetypes/html.py:50 src/ZWiki/pagetypes/rst.py:85
+msgid "reply"
+msgstr ""
+
 #: src/ZWiki/pagetypes/moin.py:1990
 msgid "Expected \"=\" to follow \"%(token)s\""
 msgstr ""
@@ -369,10 +359,6 @@
 msgid "Expected a color value \"%(arg)s\" after \"%(key)s\""
 msgstr ""
 
-#: src/ZWiki/pagetypes/rst.py:85
-msgid "reply"
-msgstr ""
-
 #: src/ZWiki/plugins/latexwiki/wikis/latexwiki/diffform.pt:127
 #: src/ZWiki/plugins/mathaction/wikis/mathaction/old-diffform.pt:127
 msgid "full history"
@@ -446,7 +432,7 @@
 msgstr ""
 
 #: src/ZWiki/plugins/tracker/filterissues.pt:12
-#: src/ZWiki/skins/dtmlmessages.pt:30
+#: src/ZWiki/skins/dtmlmessages.pt:31
 msgid "Filter issues"
 msgstr ""
 
@@ -458,109 +444,105 @@
 msgid "Issue tracker"
 msgstr ""
 
-#: src/ZWiki/plugins/tracker/tracker.py:361
+#: src/ZWiki/plugins/tracker/tracker.py:365
 #, fuzzy
 msgid "You are not authorized to comment on this ZWiki Page."
 msgstr "คุณไม่มีสิทธิในการเปลี่ยนแปลงเนื้อหาของ ZWiki หน้านี้"
 
-#: src/ZWiki/skins/dtmlmessages.pt:10 src/ZWiki/skins/dtmlmessages.pt:32
+#: src/ZWiki/skins/dtmlmessages.pt:10 src/ZWiki/skins/dtmlmessages.pt:33
+msgid "name"
+msgstr ""
+
+#: src/ZWiki/skins/dtmlmessages.pt:11 src/ZWiki/skins/dtmlmessages.pt:34
 msgid "category"
 msgstr ""
 
-#: src/ZWiki/skins/dtmlmessages.pt:11 src/ZWiki/skins/dtmlmessages.pt:33
+#: src/ZWiki/skins/dtmlmessages.pt:12 src/ZWiki/skins/dtmlmessages.pt:35
 msgid "severity"
 msgstr ""
 
-#: src/ZWiki/skins/dtmlmessages.pt:12 src/ZWiki/skins/dtmlmessages.pt:34
+#: src/ZWiki/skins/dtmlmessages.pt:13 src/ZWiki/skins/dtmlmessages.pt:36
 msgid "status"
 msgstr ""
 
-#: src/ZWiki/skins/dtmlmessages.pt:13 src/ZWiki/skins/dtmlmessages.pt:35
+#: src/ZWiki/skins/dtmlmessages.pt:14 src/ZWiki/skins/dtmlmessages.pt:37
 msgid "age"
 msgstr ""
 
-#: src/ZWiki/skins/dtmlmessages.pt:14 src/ZWiki/skins/dtmlmessages.pt:36
+#: src/ZWiki/skins/dtmlmessages.pt:15 src/ZWiki/skins/dtmlmessages.pt:38
 msgid "modified"
 msgstr ""
 
-#: src/ZWiki/skins/dtmlmessages.pt:15
+#: src/ZWiki/skins/dtmlmessages.pt:16
 msgid "Add a new issue:"
 msgstr ""
 
-#: src/ZWiki/skins/dtmlmessages.pt:16
+#: src/ZWiki/skins/dtmlmessages.pt:17
 msgid "Name:"
 msgstr ""
 
-#: src/ZWiki/skins/dtmlmessages.pt:17
+#: src/ZWiki/skins/dtmlmessages.pt:18
 msgid "Category:"
 msgstr ""
 
-#: src/ZWiki/skins/dtmlmessages.pt:18
+#: src/ZWiki/skins/dtmlmessages.pt:19
 msgid "Severity:"
 msgstr ""
 
-#: src/ZWiki/skins/dtmlmessages.pt:19
-msgid "Status:"
-msgstr ""
-
 #: src/ZWiki/skins/dtmlmessages.pt:2
 msgid "Here are the wiki's issue pages."
 msgstr ""
 
 #: src/ZWiki/skins/dtmlmessages.pt:20
-msgid "Details:"
+msgid "Status:"
 msgstr ""
 
 #: src/ZWiki/skins/dtmlmessages.pt:21
-msgid "add issue"
+msgid "Details:"
 msgstr ""
 
 #: src/ZWiki/skins/dtmlmessages.pt:22
-msgid "More advanced"
+msgid "add issue"
 msgstr ""
 
 #: src/ZWiki/skins/dtmlmessages.pt:23
-msgid "issue tracker"
+msgid "More advanced"
 msgstr ""
 
 #: src/ZWiki/skins/dtmlmessages.pt:24
-msgid "search options"
+msgid "issue tracker"
 msgstr ""
 
 #: src/ZWiki/skins/dtmlmessages.pt:25
-msgid "Name contains any of:"
+msgid "search options"
 msgstr ""
 
 #: src/ZWiki/skins/dtmlmessages.pt:26
-msgid "Page text contains any of:"
+msgid "Name contains any of:"
 msgstr ""
 
 #: src/ZWiki/skins/dtmlmessages.pt:27
-msgid "Categories:"
+msgid "Page text contains any of:"
 msgstr ""
 
 #: src/ZWiki/skins/dtmlmessages.pt:28
-msgid "Severities:"
+msgid "Categories:"
 msgstr ""
 
 #: src/ZWiki/skins/dtmlmessages.pt:29
-msgid "Statuses:"
+msgid "Severities:"
 msgstr ""
 
 #: src/ZWiki/skins/dtmlmessages.pt:3
 msgid "Enter a search term, click the numbers to the right,"
 msgstr ""
 
-#: src/ZWiki/skins/dtmlmessages.pt:37
-msgid "Submitted by"
+#: src/ZWiki/skins/dtmlmessages.pt:30
+msgid "Statuses:"
 msgstr ""
 
-#: src/ZWiki/skins/dtmlmessages.pt:38
-msgid "Name"
-msgstr ""
-
 #: src/ZWiki/skins/dtmlmessages.pt:39
-msgid "Category"
+msgid "Submitted by"
 msgstr ""
 
 #: src/ZWiki/skins/dtmlmessages.pt:4
@@ -568,39 +550,39 @@
 msgstr ""
 
 #: src/ZWiki/skins/dtmlmessages.pt:40
-msgid "Severity"
+msgid "Name"
 msgstr ""
 
 #: src/ZWiki/skins/dtmlmessages.pt:41
-msgid "Status"
+msgid "Category"
 msgstr ""
 
 #: src/ZWiki/skins/dtmlmessages.pt:42
-msgid "Optional subject"
+msgid "Severity"
 msgstr ""
 
 #: src/ZWiki/skins/dtmlmessages.pt:43
-msgid "Optional comment"
+msgid "Status"
 msgstr ""
 
-#: src/ZWiki/skins/dtmlmessages.pt:44 src/ZWiki/skins/dtmlmessages.pt:45
-msgid "Add ZWiki"
+#: src/ZWiki/skins/dtmlmessages.pt:44
+msgid "Optional subject"
 msgstr ""
 
-#: src/ZWiki/skins/dtmlmessages.pt:46
-msgid "Id:"
+#: src/ZWiki/skins/dtmlmessages.pt:45
+msgid "Optional comment"
 msgstr ""
 
-#: src/ZWiki/skins/dtmlmessages.pt:47
-msgid "Title:"
+#: src/ZWiki/skins/dtmlmessages.pt:46 src/ZWiki/skins/dtmlmessages.pt:47
+msgid "Add ZWiki"
 msgstr ""
 
 #: src/ZWiki/skins/dtmlmessages.pt:48
-msgid "Template:"
+msgid "Id:"
 msgstr ""
 
 #: src/ZWiki/skins/dtmlmessages.pt:49
-msgid "Add wiki"
+msgid "Title:"
 msgstr ""
 
 #: src/ZWiki/skins/dtmlmessages.pt:5
@@ -608,81 +590,79 @@
 msgstr ""
 
 #: src/ZWiki/skins/dtmlmessages.pt:50
-msgid "Pages changed in the last"
+msgid "Template:"
 msgstr ""
 
 #: src/ZWiki/skins/dtmlmessages.pt:51
-msgid "Recently changed pages, with summaries"
+msgid "Add wiki"
 msgstr ""
 
 #: src/ZWiki/skins/dtmlmessages.pt:52
-msgid "Show summaries ?"
+msgid "Pages changed in the last"
 msgstr ""
 
 #: src/ZWiki/skins/dtmlmessages.pt:53
-msgid "Refresh"
+msgid "Recently changed pages, with summaries"
 msgstr ""
 
 #: src/ZWiki/skins/dtmlmessages.pt:54
-msgid "Page"
+msgid "Show summaries ?"
 msgstr ""
 
 #: src/ZWiki/skins/dtmlmessages.pt:55
-msgid "Edited&nbsp;by"
+msgid "Refresh"
 msgstr ""
 
 #: src/ZWiki/skins/dtmlmessages.pt:56
-msgid "Time"
+msgid "Page"
 msgstr ""
 
 #: src/ZWiki/skins/dtmlmessages.pt:57
-msgid "NEW"
+msgid "Edited&nbsp;by"
 msgstr ""
 
+#: src/ZWiki/skins/dtmlmessages.pt:58
+msgid "Time"
+msgstr ""
+
 #: src/ZWiki/skins/dtmlmessages.pt:59
-msgid "Pages marked (NEW) have been created within the last week"
+msgid "NEW"
 msgstr ""
 
 #: src/ZWiki/skins/dtmlmessages.pt:6
 msgid "search issues"
 msgstr ""
 
-#: src/ZWiki/skins/dtmlmessages.pt:60
-msgid "Enter a word or phrase and hit enter to search the entire wiki."
-msgstr ""
-
 #: src/ZWiki/skins/dtmlmessages.pt:61
-msgid "This is the same as using the search field at top right."
+msgid "Pages marked (NEW) have been created within the last week"
 msgstr ""
 
 #: src/ZWiki/skins/dtmlmessages.pt:62
-msgid "Tips: A single word works best for matching page names."
+msgid "Enter a word or phrase and hit enter to search the entire wiki."
 msgstr ""
 
 #: src/ZWiki/skins/dtmlmessages.pt:63
-msgid ""
-"Case-insensitivity and wildcards may be supported depending on your catalog "
-"configuration."
+msgid "This is the same as using the search field at top right."
 msgstr ""
 
 #: src/ZWiki/skins/dtmlmessages.pt:64
-msgid "Leave it blank to list all pages."
+msgid "Tips: A single word works best for matching page names."
 msgstr ""
 
-#: src/ZWiki/skins/dtmlmessages.pt:65 src/ZWiki/skins/dtmlmessages.pt:66
-msgid "Search"
+#: src/ZWiki/skins/dtmlmessages.pt:65
+msgid "Case-insensitivity and wildcards may be supported depending on your catalog configuration."
 msgstr ""
 
-#: src/ZWiki/skins/dtmlmessages.pt:67
-msgid "Page names matching"
+#: src/ZWiki/skins/dtmlmessages.pt:66
+msgid "Leave it blank to list all pages."
 msgstr ""
 
-#: src/ZWiki/skins/dtmlmessages.pt:68
-msgid "Text matching"
+#: src/ZWiki/skins/dtmlmessages.pt:67 src/ZWiki/skins/dtmlmessages.pt:68
+msgid "Search"
 msgstr ""
 
 #: src/ZWiki/skins/dtmlmessages.pt:69
-msgid "Thorough (non-catalog) search for text matching"
+msgid "Page names matching"
 msgstr ""
 
 #: src/ZWiki/skins/dtmlmessages.pt:7
@@ -690,43 +670,43 @@
 msgstr ""
 
 #: src/ZWiki/skins/dtmlmessages.pt:70
-msgid "Set your preferences for this wiki:"
+msgid "Text matching"
 msgstr ""
 
 #: src/ZWiki/skins/dtmlmessages.pt:71
-msgid "User name:"
+msgid "Thorough (non-catalog) search for text matching"
 msgstr ""
 
 #: src/ZWiki/skins/dtmlmessages.pt:72
-msgid "(identifies your edits)"
+msgid "Set your preferences for this wiki:"
 msgstr ""
 
 #: src/ZWiki/skins/dtmlmessages.pt:73
-msgid "Email address:"
+msgid "User name:"
 msgstr ""
 
 #: src/ZWiki/skins/dtmlmessages.pt:74
-msgid "(allows mail subscription)"
+msgid "(identifies your edits, saves your votes, may be required)"
 msgstr ""
 
 #: src/ZWiki/skins/dtmlmessages.pt:75
-msgid "Your time zone:"
+msgid "Email address:"
 msgstr ""
 
 #: src/ZWiki/skins/dtmlmessages.pt:76
-msgid "(localizes most times)"
+msgid "(allows mail subscription)"
 msgstr ""
 
 #: src/ZWiki/skins/dtmlmessages.pt:77
-msgid "Edit form height:"
+msgid "Your time zone:"
 msgstr ""
 
 #: src/ZWiki/skins/dtmlmessages.pt:78
-msgid "(adjusts form size)"
+msgid "(localizes most times)"
 msgstr ""
 
 #: src/ZWiki/skins/dtmlmessages.pt:79
-msgid "Save options"
+msgid "Edit form height:"
 msgstr ""
 
 #: src/ZWiki/skins/dtmlmessages.pt:8
@@ -734,70 +714,70 @@
 msgstr ""
 
 #: src/ZWiki/skins/dtmlmessages.pt:80
-msgid "Forget options"
+msgid "(adjusts form size)"
 msgstr ""
 
-#: src/ZWiki/skins/dtmlmessages.pt:81 src/ZWiki/skins/dtmlmessages.pt:82
-msgid "Add ZWiki Page"
+#: src/ZWiki/skins/dtmlmessages.pt:81
+msgid "Save options"
 msgstr ""
 
-#: src/ZWiki/skins/dtmlmessages.pt:83
-msgid "Page&nbsp;name:"
+#: src/ZWiki/skins/dtmlmessages.pt:82
+msgid "Forget options"
 msgstr ""
 
-#: src/ZWiki/skins/dtmlmessages.pt:84
-msgid "Add wiki page"
+#: src/ZWiki/skins/dtmlmessages.pt:83 src/ZWiki/skins/dtmlmessages.pt:84
+msgid "Add ZWiki Page"
 msgstr ""
 
 #: src/ZWiki/skins/dtmlmessages.pt:85
-msgid "Topic"
+msgid "Page&nbsp;name:"
 msgstr ""
 
 #: src/ZWiki/skins/dtmlmessages.pt:86
-msgid "Last updated"
+msgid "Add wiki page"
 msgstr ""
 
 #: src/ZWiki/skins/dtmlmessages.pt:87
-msgid "Comments"
+msgid "Topic"
 msgstr ""
 
 #: src/ZWiki/skins/dtmlmessages.pt:88
-msgid "Views"
+msgid "Last updated"
 msgstr ""
 
 #: src/ZWiki/skins/dtmlmessages.pt:89
-msgid "Created"
+msgid "Comments"
 msgstr ""
 
-#: src/ZWiki/skins/dtmlmessages.pt:9 src/ZWiki/skins/dtmlmessages.pt:31
+#: src/ZWiki/skins/dtmlmessages.pt:9 src/ZWiki/skins/dtmlmessages.pt:32
 msgid "#"
 msgstr ""
 
-#: src/ZWiki/skins/dtmlmessages.pt:90 src/ZWiki/skins/dtmlmessages.pt:92
-msgid "by"
+#: src/ZWiki/skins/dtmlmessages.pt:90
+msgid "Views"
 msgstr ""
 
 #: src/ZWiki/skins/dtmlmessages.pt:91
-msgid "<dtml-var lasteditinterval> ago</dtml-var>"
+msgid "Created"
 msgstr ""
 
-#: src/ZWiki/skins/dtmlmessages.pt:93
-msgid "on"
+#: src/ZWiki/skins/dtmlmessages.pt:92 src/ZWiki/skins/dtmlmessages.pt:94
+msgid "by"
 msgstr ""
 
-#: src/ZWiki/skins/zwiki/backlinks.pt:108
-msgid "Subtopics"
+#: src/ZWiki/skins/dtmlmessages.pt:93
+msgid "<dtml-var lasteditinterval> ago</dtml-var>"
 msgstr ""
 
-#: src/ZWiki/skins/zwiki/backlinks.pt:111
-msgid "This page has no subtopics."
+#: src/ZWiki/skins/dtmlmessages.pt:95
+msgid "on"
 msgstr ""
 
-#: src/ZWiki/skins/zwiki/backlinks.pt:114
+#: src/ZWiki/skins/zwiki/backlinks.pt:102
 msgid "Here are it's subtopics."
 msgstr ""
 
-#: src/ZWiki/skins/zwiki/backlinks.pt:117
+#: src/ZWiki/skins/zwiki/backlinks.pt:105
 msgid "You can reorder them by clicking the ^ buttons."
 msgstr ""
 
@@ -809,60 +789,60 @@
 msgid "Parents"
 msgstr ""
 
-#: src/ZWiki/skins/zwiki/backlinks.pt:31
+#: src/ZWiki/skins/zwiki/backlinks.pt:28
 msgid "is a top-level topic."
 msgstr ""
 
-#: src/ZWiki/skins/zwiki/backlinks.pt:32
+#: src/ZWiki/skins/zwiki/backlinks.pt:29
 msgid "is a subtopic of:"
 msgstr ""
 
-#: src/ZWiki/skins/zwiki/backlinks.pt:55
+#: src/ZWiki/skins/zwiki/backlinks.pt:48
 msgid "Backlinks"
 msgstr ""
 
-#: src/ZWiki/skins/zwiki/backlinks.pt:56
+#: src/ZWiki/skins/zwiki/backlinks.pt:49
 msgid "Here are the pages which link to it:"
 msgstr ""
 
-#: src/ZWiki/skins/zwiki/backlinks.pt:57
+#: src/ZWiki/skins/zwiki/backlinks.pt:50
 msgid "No other pages link to this one."
 msgstr ""
 
-#: src/ZWiki/skins/zwiki/backlinks.pt:82
-msgid ""
-"You can set this page's parent(s) to place it within the overall page "
-"hierarchy."
+#: src/ZWiki/skins/zwiki/backlinks.pt:70
+msgid "You can set this page's parent(s) to place it within the overall page hierarchy."
 msgstr ""
 
-#: src/ZWiki/skins/zwiki/backlinks.pt:85
-msgid ""
-"Check one or more checkboxes or enter a page name here, and click the button."
+#: src/ZWiki/skins/zwiki/backlinks.pt:73
+msgid "Check one or more checkboxes or enter a page name here, and click the button."
 msgstr ""
 
-#: src/ZWiki/skins/zwiki/backlinks.pt:88
+#: src/ZWiki/skins/zwiki/backlinks.pt:76
 msgid "Enter a page name here and click the button."
 msgstr ""
 
-#: src/ZWiki/skins/zwiki/backlinks.pt:91
-msgid ""
-"You can type just the first few letters, case and punctuation are ignored."
+#: src/ZWiki/skins/zwiki/backlinks.pt:79
+msgid "You can type just the first few letters, case and punctuation are ignored."
 msgstr ""
 
-#: src/ZWiki/skins/zwiki/backlinks.pt:98
+#: src/ZWiki/skins/zwiki/backlinks.pt:86
 msgid "Reparent"
 msgstr ""
 
+#: src/ZWiki/skins/zwiki/backlinks.pt:96
+msgid "Subtopics"
+msgstr ""
+
+#: src/ZWiki/skins/zwiki/backlinks.pt:99
+msgid "This page has no subtopics."
+msgstr ""
+
 #: src/ZWiki/skins/zwiki/badtemplate.pt:12
 msgid "Bad template"
 msgstr ""
 
 #: src/ZWiki/skins/zwiki/badtemplate.pt:13
-msgid ""
-"There was a problem locating one of this wiki's skin templates. There may be "
-"a page or other non-page-template/non-dtml-method object with the same ID, "
-"obscuring the template. Or the template may be missing on the filesystem (an "
-"incomplete Zwiki installation)."
+msgid "There was a problem locating one of this wiki's skin templates. There may be a page or other non-page-template/non-dtml-method object with the same ID, obscuring the template. Or the template may be missing on the filesystem (an incomplete Zwiki installation)."
 msgstr ""
 
 #: src/ZWiki/skins/zwiki/commentform.pt:21
@@ -894,12 +874,18 @@
 msgid "add-comment"
 msgstr ""
 
-#: src/ZWiki/skins/zwiki/contentspage.pt:12
+#: src/ZWiki/skins/zwiki/contentspage.pt:10
+#: src/ZWiki/skins/zwiki/contentspage.pt:27
+msgid "Wiki contents for"
+msgstr ""
+
+#: src/ZWiki/skins/zwiki/contentspage.pt:13
+#: src/ZWiki/skins/zwiki/contentspage.pt:30
 msgid "Wiki contents"
 msgstr ""
 
-#: src/ZWiki/skins/zwiki/contentspage.pt:16
-msgid "Singletons"
+#: src/ZWiki/skins/zwiki/contentspage.pt:40
+msgid "Singletons:"
 msgstr ""
 
 #: src/ZWiki/skins/zwiki/denied.pt:12
@@ -981,11 +967,11 @@
 msgstr ""
 
 #: src/ZWiki/skins/zwiki/editform.pt:178
-msgid "preview this edit"
+msgid "Preview"
 msgstr ""
 
 #: src/ZWiki/skins/zwiki/editform.pt:178
-msgid "Preview"
+msgid "preview this edit"
 msgstr ""
 
 #: src/ZWiki/skins/zwiki/editform.pt:183
@@ -1022,13 +1008,17 @@
 msgstr ""
 
 #: src/ZWiki/skins/zwiki/editform.pt:71
-msgid "type"
+msgid "markup"
 msgstr ""
 
 #: src/ZWiki/skins/zwiki/editform.pt:72
 msgid "select the formatting and rendering style for this page"
 msgstr ""
 
+#: src/ZWiki/skins/zwiki/helppage.pt:12
+msgid "Help page"
+msgstr ""
+
 #: src/ZWiki/skins/zwiki/links.pt:102
 msgid "(external edit)"
 msgstr ""
@@ -1166,11 +1156,11 @@
 msgstr ""
 
 #: src/ZWiki/skins/zwiki/pagemanagementform.pt:45
-msgid "reparent"
+msgid "make this page a subtopic of the page you have entered"
 msgstr ""
 
 #: src/ZWiki/skins/zwiki/pagemanagementform.pt:45
-msgid "make this page a subtopic of the page you have entered"
+msgid "reparent"
 msgstr ""
 
 #: src/ZWiki/skins/zwiki/pagemanagementform.pt:50
@@ -1186,8 +1176,7 @@
 msgstr ""
 
 #: src/ZWiki/skins/zwiki/pagemanagementform.pt:55
-msgid ""
-"delete this page, and redirect links to the page you have entered, if any"
+msgid "delete this page, and redirect links to the page you have entered, if any"
 msgstr ""
 
 #: src/ZWiki/skins/zwiki/pagemanagementform.pt:60

Modified: zope-zwiki/trunk/i18n/tr.po
===================================================================
--- zope-zwiki/trunk/i18n/tr.po	2007-04-08 14:54:05 UTC (rev 761)
+++ zope-zwiki/trunk/i18n/tr.po	2007-04-08 14:55:27 UTC (rev 762)
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: zwiki\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL at ADDRESS>\n"
-"POT-Creation-Date: Sat Sep  2 18:10:16 2006\n"
+"POT-Creation-Date: Tue Mar 27 14:50:46 2007\n"
 "PO-Revision-Date: 2006-03-15 21:18+0000\n"
 "Last-Translator: Simon Michael <simon at joyful.com>\n"
 "Language-Team: Turkish <tr at li.org>\n"
@@ -18,35 +18,31 @@
 "X-Rosetta-Version: 0.1\n"
 "Domain: zwiki\n"
 
-#: src/ZWiki/Admin.py:62
+#: src/ZWiki/Admin.py:58
 #, fuzzy
 msgid "You are not authorized to upgrade all pages."
 msgstr "Tüm sayfaları yükseltmek için yetkin yok."
 
-#: src/ZWiki/Admin.py:63
+#: src/ZWiki/Admin.py:59
 msgid "(folder -> Manage properties)"
 msgstr "(dosya ->özellikleri yönet)"
 
-#: src/ZWiki/Diff.py:174
+#: src/ZWiki/Diff.py:179
 #, fuzzy
 msgid "You are not authorized to reparent this ZWiki Page."
 msgstr "Bu ZWiki sayfasını yeniden adlandırmak için yetkin yok."
 
-#: src/ZWiki/Diff.py:180 src/ZWiki/plugins/tracker/tracker.py:332
+#: src/ZWiki/Diff.py:185 src/ZWiki/plugins/tracker/tracker.py:333
 msgid "You are not authorized to rename this ZWiki Page."
 msgstr "Bu ZWiki sayfasını yeniden adlandırmak için yetkin yok."
 
-#: src/ZWiki/Editing.py:156 src/ZWiki/Editing.py:294 src/ZWiki/Views.py:332
-#: src/ZWiki/Views.py:435 src/ZWiki/plugins/tracker/tracker.py:321
-msgid ""
-"Sorry, this wiki doesn't allow anonymous edits. Please configure a username "
-"in options first."
+#: src/ZWiki/Editing.py:156 src/ZWiki/Editing.py:294 src/ZWiki/Views.py:336
+#: src/ZWiki/Views.py:439 src/ZWiki/plugins/tracker/tracker.py:322
+msgid "Sorry, this wiki doesn't allow anonymous edits. Please configure a username in options first."
 msgstr ""
 
 #: src/ZWiki/Editing.py:327
-msgid ""
-"You are not authorized to reparent or change subtopics links on this ZWiki "
-"Page."
+msgid "You are not authorized to reparent or change subtopics links on this ZWiki Page."
 msgstr ""
 
 #: src/ZWiki/Editing.py:349
@@ -54,9 +50,9 @@
 msgstr "bu ZWiki sayfasının tipini değiştirmen için yetkin yok."
 
 #: src/ZWiki/Editing.py:383 src/ZWiki/Editing.py:410
-#: src/ZWiki/plugins/tracker/tracker.py:340
-#: src/ZWiki/plugins/tracker/tracker.py:347
-#: src/ZWiki/plugins/tracker/tracker.py:354
+#: src/ZWiki/plugins/tracker/tracker.py:344
+#: src/ZWiki/plugins/tracker/tracker.py:351
+#: src/ZWiki/plugins/tracker/tracker.py:358
 msgid "You are not authorized to edit this ZWiki Page."
 msgstr "Bu ZWiki sayfasını düzenlemek için yetkin yok."
 
@@ -65,11 +61,8 @@
 msgstr "Bu ZWiki sayfasını silmek için yetkin yok."
 
 #: src/ZWiki/Editing.py:563
-msgid ""
-"This page was renamed to %s. You can delete this one if no longer needed.\n"
-msgstr ""
-"bu sayfa %s olarak yeniden isimlendirilmiştir. Eğer ihtiyacın yoksa bunu "
-"silebilirsin.↵\n"
+msgid "This page was renamed to %s. You can delete this one if no longer needed.\n"
+msgstr "bu sayfa %s olarak yeniden isimlendirilmiştir. Eğer ihtiyacın yoksa bunu silebilirsin.↵\n"
 
 #: src/ZWiki/Editing.py:659
 msgid "You are not authorized to upload files here."
@@ -90,9 +83,7 @@
 
 #: src/ZWiki/Editing.py:830
 #, fuzzy
-msgid ""
-"your edit contained a banned link pattern. Please contact the site "
-"administrator for help."
+msgid "your edit contained a banned link pattern. Please contact the site administrator for help."
 msgstr "Bir problem var:%s. Lütfen yardım için site yöneticisine başvurun."
 
 #: src/ZWiki/Editing.py:841
@@ -101,10 +92,7 @@
 msgstr "max_anonymous_links aşıldı"
 
 #: src/ZWiki/Editing.py:842
-msgid ""
-"adding of external links by unidentified users is restricted. Please back up "
-"and remove some of the http urls you added, or contact the site "
-"administrator for help."
+msgid "adding of external links by unidentified users is restricted. Please back up and remove some of the http urls you added, or contact the site administrator for help."
 msgstr ""
 
 #: src/ZWiki/Editing.py:853
@@ -113,86 +101,87 @@
 msgstr "max_anonymous_links aşıldı"
 
 #: src/ZWiki/Editing.py:854
-msgid ""
-"adding of external links is restricted, even for identified users. Please "
-"back up and remove some of the http urls you added, or contact the site "
-"administrator for help."
+msgid "adding of external links is restricted, even for identified users. Please back up and remove some of the http urls you added, or contact the site administrator for help."
 msgstr ""
 
-#: src/ZWiki/Mail.py:506 src/ZWiki/skins/dtmlmessages.pt:58
+#: src/ZWiki/Mail.py:506 src/ZWiki/skins/dtmlmessages.pt:60
 msgid "anonymous"
 msgstr "anonim"
 
-#: src/ZWiki/OutlineSupport.py:843 src/ZWiki/skins/zwiki/links.pt:56
+#: src/ZWiki/OutlineSupport.py:378
+msgid "Sorry, this wiki doesn't allow anonymous reparenting. Please configure a username in options first."
+msgstr ""
+
+#: src/ZWiki/OutlineSupport.py:878 src/ZWiki/skins/zwiki/links.pt:56
 #, fuzzy
 msgid "which pages link to this one ?"
 msgstr "Bu sayfaya hangi sayfalar bağlanıyor??"
 
-#: src/ZWiki/OutlineSupport.py:851
+#: src/ZWiki/OutlineSupport.py:886
 msgid "You are here"
 msgstr "Şu anda burdasın"
 
-#: src/ZWiki/Utils.py:465
+#: src/ZWiki/Utils.py:487
 msgid "years"
 msgstr "yıllar"
 
-#: src/ZWiki/Utils.py:465
+#: src/ZWiki/Utils.py:487
 msgid "year"
 msgstr "yıl"
 
-#: src/ZWiki/Utils.py:467
+#: src/ZWiki/Utils.py:489
 msgid "month"
 msgstr "ay"
 
-#: src/ZWiki/Utils.py:467
+#: src/ZWiki/Utils.py:489
 msgid "months"
 msgstr "aylar"
 
-#: src/ZWiki/Utils.py:469
+#: src/ZWiki/Utils.py:491
 msgid "weeks"
 msgstr "haftalar"
 
-#: src/ZWiki/Utils.py:469
+#: src/ZWiki/Utils.py:491
 msgid "week"
 msgstr "hafta"
 
-#: src/ZWiki/Utils.py:471
+#: src/ZWiki/Utils.py:493
 msgid "day"
 msgstr "gün"
 
-#: src/ZWiki/Utils.py:471
+#: src/ZWiki/Utils.py:493
 msgid "days"
 msgstr "günler"
 
-#: src/ZWiki/Utils.py:473
+#: src/ZWiki/Utils.py:495
 msgid "hours"
 msgstr "saatler"
 
-#: src/ZWiki/Utils.py:473
+#: src/ZWiki/Utils.py:495
 msgid "hour"
 msgstr "saat"
 
-#: src/ZWiki/Utils.py:475
+#: src/ZWiki/Utils.py:497
 msgid "minute"
 msgstr "dakika"
 
-#: src/ZWiki/Utils.py:475
+#: src/ZWiki/Utils.py:497
 msgid "minutes"
 msgstr "dakikalar"
 
-#: src/ZWiki/Utils.py:477
+#: src/ZWiki/Utils.py:499
 msgid "second"
 msgstr "saniye"
 
-#: src/ZWiki/Utils.py:477
+#: src/ZWiki/Utils.py:499
 msgid "seconds"
 msgstr "saniyeler"
 
-#: src/ZWiki/Views.py:346
+#: src/ZWiki/Views.py:350
 msgid "Page is locked"
 msgstr "Sayfa kilitlenmiÅŸtir"
 
-#: src/ZWiki/Views.py:357
+#: src/ZWiki/Views.py:361
 #, fuzzy
 msgid ""
 "\n"
@@ -204,73 +193,67 @@
 "            "
 msgstr ""
 "\n"
-"            Bu sayfa webDAV kilidine sahip. Muhtemelen birisi tarafından "
-"harici bir editörle düzenleniyor. Onlar bitirene kadar beklemeniz gerekecek "
-"ve daha sonra tekrar deneyin.\n"
-"Eğer bazı değişiklikler yaptıysanız referans için metninizin sürümünü "
-"yedeklemek ve kopyalamak isteyebilirsiniz.\n"
+"            Bu sayfa webDAV kilidine sahip. Muhtemelen birisi tarafından harici bir editörle düzenleniyor. Onlar bitirene kadar beklemeniz gerekecek ve daha sonra tekrar deneyin.\n"
+"Eğer bazı değişiklikler yaptıysanız referans için metninizin sürümünü yedeklemek ve kopyalamak isteyebilirsiniz.\n"
 "            "
 
-#: src/ZWiki/Views.py:364
+#: src/ZWiki/Views.py:368
 #, fuzzy
 msgid "To discard your changes and try again, click OK."
 msgstr "Değişiklikleri silip tekrar denemek için tamam tuşuna basınız."
 
-#: src/ZWiki/Views.py:393
+#: src/ZWiki/Views.py:397
 msgid "Edit conflict"
 msgstr "Uyuşmazlığı düzenle"
 
-#: src/ZWiki/Views.py:413
+#: src/ZWiki/Views.py:417
 msgid "Someone else has saved this page while you were editing"
 msgstr "Birileri bu sayfayı siz düzenlerken kaydetmiş"
 
-#: src/ZWiki/Views.py:414
+#: src/ZWiki/Views.py:418
 msgid "To resolve the conflict, do this"
 msgstr "Uyuşmazlığı çözmek için, bunu yapın"
 
-#: src/ZWiki/Views.py:415
+#: src/ZWiki/Views.py:419
 #, fuzzy
 msgid "Click your browser's back button"
 msgstr "Browserın geri tuşuna tıklayınız"
 
-#: src/ZWiki/Views.py:416
+#: src/ZWiki/Views.py:420
 msgid "Copy your recent edits to the clipboard"
 msgstr "Geçmiş düzenlemeleri panoya kopyala"
 
-#: src/ZWiki/Views.py:417
+#: src/ZWiki/Views.py:421
 msgid "Click your browser's refresh button"
 msgstr "browserın yenileme tuşuna basınız"
 
-#: src/ZWiki/Views.py:418
+#: src/ZWiki/Views.py:422
 #, fuzzy
 msgid "Paste in your edits again, being mindful of the latest changes"
 msgstr "Düzenlemeleri tekrar yapıştır, son değişiklikler hakkında dikkatli ol"
 
-#: src/ZWiki/Views.py:419
+#: src/ZWiki/Views.py:423
 #, fuzzy
 msgid "Click the Change button again"
 msgstr "Değiştir tuşuna tekrar tıklayın"
 
-#: src/ZWiki/Views.py:420 src/ZWiki/skins/zwiki/editform.pt:163
+#: src/ZWiki/Views.py:424 src/ZWiki/skins/zwiki/editform.pt:163
 msgid "or"
 msgstr "veya"
 
-#: src/ZWiki/Views.py:421
+#: src/ZWiki/Views.py:425
 #, fuzzy
 msgid "To discard your changes and start again, click OK"
-msgstr ""
-"Yaptığın değişiklikleri iptal edip tekrar başlamak için Taman tuşuna basınız"
+msgstr "Yaptığın değişiklikleri iptal edip tekrar başlamak için Taman tuşuna basınız"
 
-#: src/ZWiki/Views.py:490
+#: src/ZWiki/Views.py:501
 msgid ""
 "\n"
-"        Access keys can be accessed in mozilla-based browsers by pressing "
-"alt-<key>\n"
+"        Access keys can be accessed in mozilla-based browsers by pressing alt-<key>\n"
 "        IE users: must also press enter\n"
 "        Mac users: command-<key>\n"
 "        Opera users: shift-escape-<key>\n"
-"        These won't work here, back up to the previous page to try them "
-"out.\n"
+"        These won't work here, back up to the previous page to try them out.\n"
 "\n"
 "        0    show these access key assignments\n"
 "\n"
@@ -286,10 +269,8 @@
 "        s    go to search field\n"
 "        \n"
 "        page functions:\n"
-"        +    (in a plone/cmf site with skin switching set up) use zwiki's "
-"plone/cmf skin\n"
-"        -    (in a plone/cmf site with skin switching set up) use zwiki's "
-"standard skin\n"
+"        +    (in a plone/cmf site with skin switching set up) use zwiki's plone/cmf skin\n"
+"        -    (in a plone/cmf site with skin switching set up) use zwiki's standard skin\n"
 "        v    view page\n"
 "        m    mail subscription\n"
 "        b    show backlinks (links to this page)\n"
@@ -317,32 +298,31 @@
 "        "
 msgstr ""
 
-#: src/ZWiki/Wikis.py:49
-msgid "Unknown wiki type"
-msgstr ""
-
-#: src/ZWiki/ZWikiPage.py:675
+#: src/ZWiki/ZWikiPage.py:744
 msgid "create this page"
 msgstr "bu sayfayı yarat"
 
-#: src/ZWiki/ZWikiPage.py:798 src/ZWiki/ZWikiPage.py:814
-#: src/ZWiki/ZWikiPage.py:817
+#: src/ZWiki/ZWikiPage.py:872 src/ZWiki/ZWikiPage.py:887
 msgid "last edited %(interval)s ago"
 msgstr "son düzenleme %(interval) önce"
 
-#: src/ZWiki/ZWikiPage.py:809
+#: src/ZWiki/ZWikiPage.py:882
 msgid "show last edit"
 msgstr "son düzenlemeyi göster"
 
-#: src/ZWiki/ZWikiPage.py:826 src/ZWiki/ZWikiPage.py:828
+#: src/ZWiki/ZWikiPage.py:897 src/ZWiki/ZWikiPage.py:899
 msgid "by %(editor)s"
 msgstr ""
 
-#: src/ZWiki/__init__.py:34
+#: src/ZWiki/__init__.py:200
+msgid "Unknown wiki type"
+msgstr ""
+
+#: src/ZWiki/__init__.py:39
 msgid "No need to add a Zwiki Outline Cache"
 msgstr ""
 
-#: src/ZWiki/__init__.py:35
+#: src/ZWiki/__init__.py:40
 msgid ""
 "Zwiki Outline Cache appears in the ZMI Add menu\n"
 "        for implementation reasons, but should not be added directly.\n"
@@ -354,6 +334,10 @@
 msgid "comments"
 msgstr "yorumlar"
 
+#: src/ZWiki/pagetypes/html.py:50 src/ZWiki/pagetypes/rst.py:85
+msgid "reply"
+msgstr "cevapla"
+
 #: src/ZWiki/pagetypes/moin.py:1990
 #, fuzzy
 msgid "Expected \"=\" to follow \"%(token)s\""
@@ -394,10 +378,6 @@
 msgid "Expected a color value \"%(arg)s\" after \"%(key)s\""
 msgstr "\"%(key)s\" sonrasında bir renk değeri \"%(arg)s\" beklenmektedir"
 
-#: src/ZWiki/pagetypes/rst.py:85
-msgid "reply"
-msgstr "cevapla"
-
 #: src/ZWiki/plugins/latexwiki/wikis/latexwiki/diffform.pt:127
 #: src/ZWiki/plugins/mathaction/wikis/mathaction/old-diffform.pt:127
 msgid "full history"
@@ -474,7 +454,7 @@
 msgstr "başlık"
 
 #: src/ZWiki/plugins/tracker/filterissues.pt:12
-#: src/ZWiki/skins/dtmlmessages.pt:30
+#: src/ZWiki/skins/dtmlmessages.pt:31
 msgid "Filter issues"
 msgstr ""
 
@@ -486,368 +466,360 @@
 msgid "Issue tracker"
 msgstr ""
 
-#: src/ZWiki/plugins/tracker/tracker.py:361
+#: src/ZWiki/plugins/tracker/tracker.py:365
 #, fuzzy
 msgid "You are not authorized to comment on this ZWiki Page."
 msgstr "Bu ZWiki sayfasını düzenlemek için yetkin yok."
 
-#: src/ZWiki/skins/dtmlmessages.pt:10 src/ZWiki/skins/dtmlmessages.pt:32
+#: src/ZWiki/skins/dtmlmessages.pt:10 src/ZWiki/skins/dtmlmessages.pt:33
+#, fuzzy
+msgid "name"
+msgstr "isim,"
+
+#: src/ZWiki/skins/dtmlmessages.pt:11 src/ZWiki/skins/dtmlmessages.pt:34
 msgid "category"
 msgstr "kategori"
 
-#: src/ZWiki/skins/dtmlmessages.pt:11 src/ZWiki/skins/dtmlmessages.pt:33
+#: src/ZWiki/skins/dtmlmessages.pt:12 src/ZWiki/skins/dtmlmessages.pt:35
 msgid "severity"
 msgstr ""
 
-#: src/ZWiki/skins/dtmlmessages.pt:12 src/ZWiki/skins/dtmlmessages.pt:34
+#: src/ZWiki/skins/dtmlmessages.pt:13 src/ZWiki/skins/dtmlmessages.pt:36
 msgid "status"
 msgstr "durum"
 
-#: src/ZWiki/skins/dtmlmessages.pt:13 src/ZWiki/skins/dtmlmessages.pt:35
+#: src/ZWiki/skins/dtmlmessages.pt:14 src/ZWiki/skins/dtmlmessages.pt:37
 msgid "age"
 msgstr "yaÅŸ"
 
-#: src/ZWiki/skins/dtmlmessages.pt:14 src/ZWiki/skins/dtmlmessages.pt:36
+#: src/ZWiki/skins/dtmlmessages.pt:15 src/ZWiki/skins/dtmlmessages.pt:38
 msgid "modified"
 msgstr "deÄŸiÅŸtirildi"
 
-#: src/ZWiki/skins/dtmlmessages.pt:15
+#: src/ZWiki/skins/dtmlmessages.pt:16
 msgid "Add a new issue:"
 msgstr ""
 
-#: src/ZWiki/skins/dtmlmessages.pt:16
+#: src/ZWiki/skins/dtmlmessages.pt:17
 msgid "Name:"
 msgstr "Ä°sim:"
 
-#: src/ZWiki/skins/dtmlmessages.pt:17
+#: src/ZWiki/skins/dtmlmessages.pt:18
 msgid "Category:"
 msgstr "Kategori:"
 
-#: src/ZWiki/skins/dtmlmessages.pt:18
+#: src/ZWiki/skins/dtmlmessages.pt:19
 msgid "Severity:"
 msgstr ""
 
-#: src/ZWiki/skins/dtmlmessages.pt:19
-msgid "Status:"
-msgstr "Durum:"
-
 #: src/ZWiki/skins/dtmlmessages.pt:2
 msgid "Here are the wiki's issue pages."
 msgstr ""
 
 #: src/ZWiki/skins/dtmlmessages.pt:20
+msgid "Status:"
+msgstr "Durum:"
+
+#: src/ZWiki/skins/dtmlmessages.pt:21
 msgid "Details:"
 msgstr "Ayrıntılar:"
 
-#: src/ZWiki/skins/dtmlmessages.pt:21
+#: src/ZWiki/skins/dtmlmessages.pt:22
 msgid "add issue"
 msgstr ""
 
-#: src/ZWiki/skins/dtmlmessages.pt:22
+#: src/ZWiki/skins/dtmlmessages.pt:23
 msgid "More advanced"
 msgstr ""
 
-#: src/ZWiki/skins/dtmlmessages.pt:23
+#: src/ZWiki/skins/dtmlmessages.pt:24
 msgid "issue tracker"
 msgstr ""
 
-#: src/ZWiki/skins/dtmlmessages.pt:24
+#: src/ZWiki/skins/dtmlmessages.pt:25
 msgid "search options"
 msgstr "arama seçenekleri"
 
-#: src/ZWiki/skins/dtmlmessages.pt:25
+#: src/ZWiki/skins/dtmlmessages.pt:26
 msgid "Name contains any of:"
 msgstr ""
 
-#: src/ZWiki/skins/dtmlmessages.pt:26
+#: src/ZWiki/skins/dtmlmessages.pt:27
 msgid "Page text contains any of:"
 msgstr ""
 
-#: src/ZWiki/skins/dtmlmessages.pt:27
+#: src/ZWiki/skins/dtmlmessages.pt:28
 msgid "Categories:"
 msgstr "Kategoriler:"
 
-#: src/ZWiki/skins/dtmlmessages.pt:28
+#: src/ZWiki/skins/dtmlmessages.pt:29
 msgid "Severities:"
 msgstr ""
 
-#: src/ZWiki/skins/dtmlmessages.pt:29
-msgid "Statuses:"
-msgstr "Durumlar:"
-
 #: src/ZWiki/skins/dtmlmessages.pt:3
 msgid "Enter a search term, click the numbers to the right,"
 msgstr ""
 
-#: src/ZWiki/skins/dtmlmessages.pt:37
+#: src/ZWiki/skins/dtmlmessages.pt:30
+msgid "Statuses:"
+msgstr "Durumlar:"
+
+#: src/ZWiki/skins/dtmlmessages.pt:39
 msgid "Submitted by"
 msgstr "tarafından önerildi."
 
-#: src/ZWiki/skins/dtmlmessages.pt:38
+#: src/ZWiki/skins/dtmlmessages.pt:4
+msgid "filter issues"
+msgstr ""
+
+#: src/ZWiki/skins/dtmlmessages.pt:40
 msgid "Name"
 msgstr ""
 
-#: src/ZWiki/skins/dtmlmessages.pt:39
+#: src/ZWiki/skins/dtmlmessages.pt:41
 #, fuzzy
 msgid "Category"
 msgstr "Kategori"
 
-#: src/ZWiki/skins/dtmlmessages.pt:4
-msgid "filter issues"
-msgstr ""
-
-#: src/ZWiki/skins/dtmlmessages.pt:40
+#: src/ZWiki/skins/dtmlmessages.pt:42
 msgid "Severity"
 msgstr ""
 
-#: src/ZWiki/skins/dtmlmessages.pt:41
+#: src/ZWiki/skins/dtmlmessages.pt:43
 msgid "Status"
 msgstr "Durum"
 
-#: src/ZWiki/skins/dtmlmessages.pt:42
+#: src/ZWiki/skins/dtmlmessages.pt:44
 msgid "Optional subject"
 msgstr "Seçimli konu"
 
-#: src/ZWiki/skins/dtmlmessages.pt:43
+#: src/ZWiki/skins/dtmlmessages.pt:45
 msgid "Optional comment"
 msgstr "Seçimli yorum"
 
-#: src/ZWiki/skins/dtmlmessages.pt:44 src/ZWiki/skins/dtmlmessages.pt:45
+#: src/ZWiki/skins/dtmlmessages.pt:46 src/ZWiki/skins/dtmlmessages.pt:47
 #, fuzzy
 msgid "Add ZWiki"
 msgstr "Wiki Ekle"
 
-#: src/ZWiki/skins/dtmlmessages.pt:46
+#: src/ZWiki/skins/dtmlmessages.pt:48
 msgid "Id:"
 msgstr ""
 
-#: src/ZWiki/skins/dtmlmessages.pt:47
+#: src/ZWiki/skins/dtmlmessages.pt:49
 #, fuzzy
 msgid "Title:"
 msgstr "Başlık"
 
-#: src/ZWiki/skins/dtmlmessages.pt:48
+#: src/ZWiki/skins/dtmlmessages.pt:5
+msgid "browse open issues"
+msgstr ""
+
+#: src/ZWiki/skins/dtmlmessages.pt:50
 msgid "Template:"
 msgstr ""
 
-#: src/ZWiki/skins/dtmlmessages.pt:49
+#: src/ZWiki/skins/dtmlmessages.pt:51
 #, fuzzy
 msgid "Add wiki"
 msgstr "Wiki Ekle"
 
-#: src/ZWiki/skins/dtmlmessages.pt:5
-msgid "browse open issues"
-msgstr ""
-
-#: src/ZWiki/skins/dtmlmessages.pt:50
+#: src/ZWiki/skins/dtmlmessages.pt:52
 msgid "Pages changed in the last"
 msgstr ""
 
-#: src/ZWiki/skins/dtmlmessages.pt:51
+#: src/ZWiki/skins/dtmlmessages.pt:53
 msgid "Recently changed pages, with summaries"
 msgstr ""
 
-#: src/ZWiki/skins/dtmlmessages.pt:52
+#: src/ZWiki/skins/dtmlmessages.pt:54
 #, fuzzy
 msgid "Show summaries ?"
 msgstr "Özetleri göster?"
 
-#: src/ZWiki/skins/dtmlmessages.pt:53
+#: src/ZWiki/skins/dtmlmessages.pt:55
 msgid "Refresh"
 msgstr "Yenile"
 
-#: src/ZWiki/skins/dtmlmessages.pt:54
+#: src/ZWiki/skins/dtmlmessages.pt:56
 msgid "Page"
 msgstr "Sayfa"
 
-#: src/ZWiki/skins/dtmlmessages.pt:55
+#: src/ZWiki/skins/dtmlmessages.pt:57
 msgid "Edited&nbsp;by"
 msgstr ""
 
-#: src/ZWiki/skins/dtmlmessages.pt:56
+#: src/ZWiki/skins/dtmlmessages.pt:58
 msgid "Time"
 msgstr "Zaman"
 
-#: src/ZWiki/skins/dtmlmessages.pt:57
+#: src/ZWiki/skins/dtmlmessages.pt:59
 msgid "NEW"
 msgstr "YENÄ°"
 
-#: src/ZWiki/skins/dtmlmessages.pt:59
-msgid "Pages marked (NEW) have been created within the last week"
-msgstr ""
-
 #: src/ZWiki/skins/dtmlmessages.pt:6
 msgid "search issues"
 msgstr ""
 
-#: src/ZWiki/skins/dtmlmessages.pt:60
+#: src/ZWiki/skins/dtmlmessages.pt:61
+msgid "Pages marked (NEW) have been created within the last week"
+msgstr ""
+
+#: src/ZWiki/skins/dtmlmessages.pt:62
 #, fuzzy
 msgid "Enter a word or phrase and hit enter to search the entire wiki."
-msgstr ""
-"Tüm Wikide aramak için bir kelime veya söz öbeği girin ve enter tuşuna basın."
+msgstr "Tüm Wikide aramak için bir kelime veya söz öbeği girin ve enter tuşuna basın."
 
-#: src/ZWiki/skins/dtmlmessages.pt:61
+#: src/ZWiki/skins/dtmlmessages.pt:63
 msgid "This is the same as using the search field at top right."
 msgstr ""
 
-#: src/ZWiki/skins/dtmlmessages.pt:62
+#: src/ZWiki/skins/dtmlmessages.pt:64
 #, fuzzy
 msgid "Tips: A single word works best for matching page names."
-msgstr ""
-"İpucu: Sayfa isimlerinin eşleştirilmesi için tek kelime kullanmak en "
-"iyisidir."
+msgstr "İpucu: Sayfa isimlerinin eşleştirilmesi için tek kelime kullanmak en iyisidir."
 
-#: src/ZWiki/skins/dtmlmessages.pt:63
-msgid ""
-"Case-insensitivity and wildcards may be supported depending on your catalog "
-"configuration."
+#: src/ZWiki/skins/dtmlmessages.pt:65
+msgid "Case-insensitivity and wildcards may be supported depending on your catalog configuration."
 msgstr ""
 
-#: src/ZWiki/skins/dtmlmessages.pt:64
+#: src/ZWiki/skins/dtmlmessages.pt:66
 #, fuzzy
 msgid "Leave it blank to list all pages."
 msgstr "Tüm sayfaları listelemek için boş bırakınız."
 
-#: src/ZWiki/skins/dtmlmessages.pt:65 src/ZWiki/skins/dtmlmessages.pt:66
+#: src/ZWiki/skins/dtmlmessages.pt:67 src/ZWiki/skins/dtmlmessages.pt:68
 msgid "Search"
 msgstr "Ara"
 
-#: src/ZWiki/skins/dtmlmessages.pt:67
+#: src/ZWiki/skins/dtmlmessages.pt:69
 #, fuzzy
 msgid "Page names matching"
 msgstr "Sayfa isimleri uyumlu"
 
-#: src/ZWiki/skins/dtmlmessages.pt:68
+#: src/ZWiki/skins/dtmlmessages.pt:7
+msgid "recent"
+msgstr ""
+
+#: src/ZWiki/skins/dtmlmessages.pt:70
 #, fuzzy
 msgid "Text matching"
 msgstr "Metin uyumlu"
 
-#: src/ZWiki/skins/dtmlmessages.pt:69
+#: src/ZWiki/skins/dtmlmessages.pt:71
 msgid "Thorough (non-catalog) search for text matching"
 msgstr ""
 
-#: src/ZWiki/skins/dtmlmessages.pt:7
-msgid "recent"
-msgstr ""
-
-#: src/ZWiki/skins/dtmlmessages.pt:70
+#: src/ZWiki/skins/dtmlmessages.pt:72
 msgid "Set your preferences for this wiki:"
 msgstr "Bu Wiki için tercihlerinizi belirleyin:"
 
-#: src/ZWiki/skins/dtmlmessages.pt:71
+#: src/ZWiki/skins/dtmlmessages.pt:73
 msgid "User name:"
 msgstr "Kullanıcı adı:"
 
-#: src/ZWiki/skins/dtmlmessages.pt:72
-msgid "(identifies your edits)"
-msgstr "(Düzenlemelerinizi tanımlar)"
+#: src/ZWiki/skins/dtmlmessages.pt:74
+msgid "(identifies your edits, saves your votes, may be required)"
+msgstr ""
 
-#: src/ZWiki/skins/dtmlmessages.pt:73
+#: src/ZWiki/skins/dtmlmessages.pt:75
 #, fuzzy
 msgid "Email address:"
 msgstr "Elektronik posta:"
 
-#: src/ZWiki/skins/dtmlmessages.pt:74
+#: src/ZWiki/skins/dtmlmessages.pt:76
 #, fuzzy
 msgid "(allows mail subscription)"
 msgstr "(posta aboneliÄŸine izin verir)"
 
-#: src/ZWiki/skins/dtmlmessages.pt:75
+#: src/ZWiki/skins/dtmlmessages.pt:77
 #, fuzzy
 msgid "Your time zone:"
 msgstr "Zaman diliminiz:"
 
-#: src/ZWiki/skins/dtmlmessages.pt:76
+#: src/ZWiki/skins/dtmlmessages.pt:78
 msgid "(localizes most times)"
 msgstr ""
 
-#: src/ZWiki/skins/dtmlmessages.pt:77
+#: src/ZWiki/skins/dtmlmessages.pt:79
 #, fuzzy
 msgid "Edit form height:"
 msgstr "Form yüksekliğini düzenle:"
 
-#: src/ZWiki/skins/dtmlmessages.pt:78
+#: src/ZWiki/skins/dtmlmessages.pt:8
+msgid "all"
+msgstr "tüm"
+
+#: src/ZWiki/skins/dtmlmessages.pt:80
 #, fuzzy
 msgid "(adjusts form size)"
 msgstr "(form boyutlarını ayarla)"
 
-#: src/ZWiki/skins/dtmlmessages.pt:79
+#: src/ZWiki/skins/dtmlmessages.pt:81
 #, fuzzy
 msgid "Save options"
 msgstr "Seçenekleri kaydet"
 
-#: src/ZWiki/skins/dtmlmessages.pt:8
-msgid "all"
-msgstr "tüm"
-
-#: src/ZWiki/skins/dtmlmessages.pt:80
+#: src/ZWiki/skins/dtmlmessages.pt:82
 msgid "Forget options"
 msgstr "Seçenekleri unut"
 
-#: src/ZWiki/skins/dtmlmessages.pt:81 src/ZWiki/skins/dtmlmessages.pt:82
+#: src/ZWiki/skins/dtmlmessages.pt:83 src/ZWiki/skins/dtmlmessages.pt:84
 msgid "Add ZWiki Page"
 msgstr "ZWiki sayfası ekle"
 
-#: src/ZWiki/skins/dtmlmessages.pt:83
+#: src/ZWiki/skins/dtmlmessages.pt:85
 #, fuzzy
 msgid "Page&nbsp;name:"
 msgstr "Sayfa ismi"
 
-#: src/ZWiki/skins/dtmlmessages.pt:84
+#: src/ZWiki/skins/dtmlmessages.pt:86
 #, fuzzy
 msgid "Add wiki page"
 msgstr "Wiki sayfası ekle"
 
-#: src/ZWiki/skins/dtmlmessages.pt:85
+#: src/ZWiki/skins/dtmlmessages.pt:87
 msgid "Topic"
 msgstr "Konu"
 
-#: src/ZWiki/skins/dtmlmessages.pt:86
+#: src/ZWiki/skins/dtmlmessages.pt:88
 msgid "Last updated"
 msgstr "Son güncelleme"
 
-#: src/ZWiki/skins/dtmlmessages.pt:87
+#: src/ZWiki/skins/dtmlmessages.pt:89
 msgid "Comments"
 msgstr "Yorumlar"
 
-#: src/ZWiki/skins/dtmlmessages.pt:88
+#: src/ZWiki/skins/dtmlmessages.pt:9 src/ZWiki/skins/dtmlmessages.pt:32
+msgid "#"
+msgstr ""
+
+#: src/ZWiki/skins/dtmlmessages.pt:90
 msgid "Views"
 msgstr "Görünüş"
 
-#: src/ZWiki/skins/dtmlmessages.pt:89
+#: src/ZWiki/skins/dtmlmessages.pt:91
 msgid "Created"
 msgstr "OluÅŸturuldu"
 
-#: src/ZWiki/skins/dtmlmessages.pt:9 src/ZWiki/skins/dtmlmessages.pt:31
-msgid "#"
-msgstr ""
-
-#: src/ZWiki/skins/dtmlmessages.pt:90 src/ZWiki/skins/dtmlmessages.pt:92
+#: src/ZWiki/skins/dtmlmessages.pt:92 src/ZWiki/skins/dtmlmessages.pt:94
 msgid "by"
 msgstr "tarafından"
 
-#: src/ZWiki/skins/dtmlmessages.pt:91
+#: src/ZWiki/skins/dtmlmessages.pt:93
 msgid "<dtml-var lasteditinterval> ago</dtml-var>"
 msgstr ""
 
-#: src/ZWiki/skins/dtmlmessages.pt:93
+#: src/ZWiki/skins/dtmlmessages.pt:95
 msgid "on"
 msgstr ""
 
-#: src/ZWiki/skins/zwiki/backlinks.pt:108
-msgid "Subtopics"
-msgstr "Altkonular"
-
-#: src/ZWiki/skins/zwiki/backlinks.pt:111
-msgid "This page has no subtopics."
-msgstr "Bu sayfa altkonuya sahip deÄŸil."
-
-#: src/ZWiki/skins/zwiki/backlinks.pt:114
+#: src/ZWiki/skins/zwiki/backlinks.pt:102
 #, fuzzy
 msgid "Here are it's subtopics."
 msgstr "Bu sayfa altkonuya sahip deÄŸil."
 
-#: src/ZWiki/skins/zwiki/backlinks.pt:117
+#: src/ZWiki/skins/zwiki/backlinks.pt:105
 msgid "You can reorder them by clicking the ^ buttons."
 msgstr ""
 
@@ -861,60 +833,60 @@
 msgid "Parents"
 msgstr "Ebeveyn"
 
-#: src/ZWiki/skins/zwiki/backlinks.pt:31
+#: src/ZWiki/skins/zwiki/backlinks.pt:28
 msgid "is a top-level topic."
 msgstr ""
 
-#: src/ZWiki/skins/zwiki/backlinks.pt:32
+#: src/ZWiki/skins/zwiki/backlinks.pt:29
 msgid "is a subtopic of:"
 msgstr ""
 
-#: src/ZWiki/skins/zwiki/backlinks.pt:55
+#: src/ZWiki/skins/zwiki/backlinks.pt:48
 msgid "Backlinks"
 msgstr ""
 
-#: src/ZWiki/skins/zwiki/backlinks.pt:56
+#: src/ZWiki/skins/zwiki/backlinks.pt:49
 msgid "Here are the pages which link to it:"
 msgstr ""
 
-#: src/ZWiki/skins/zwiki/backlinks.pt:57
+#: src/ZWiki/skins/zwiki/backlinks.pt:50
 msgid "No other pages link to this one."
 msgstr ""
 
-#: src/ZWiki/skins/zwiki/backlinks.pt:82
-msgid ""
-"You can set this page's parent(s) to place it within the overall page "
-"hierarchy."
+#: src/ZWiki/skins/zwiki/backlinks.pt:70
+msgid "You can set this page's parent(s) to place it within the overall page hierarchy."
 msgstr ""
 
-#: src/ZWiki/skins/zwiki/backlinks.pt:85
-msgid ""
-"Check one or more checkboxes or enter a page name here, and click the button."
+#: src/ZWiki/skins/zwiki/backlinks.pt:73
+msgid "Check one or more checkboxes or enter a page name here, and click the button."
 msgstr ""
 
-#: src/ZWiki/skins/zwiki/backlinks.pt:88
+#: src/ZWiki/skins/zwiki/backlinks.pt:76
 msgid "Enter a page name here and click the button."
 msgstr ""
 
-#: src/ZWiki/skins/zwiki/backlinks.pt:91
-msgid ""
-"You can type just the first few letters, case and punctuation are ignored."
+#: src/ZWiki/skins/zwiki/backlinks.pt:79
+msgid "You can type just the first few letters, case and punctuation are ignored."
 msgstr ""
 
-#: src/ZWiki/skins/zwiki/backlinks.pt:98
+#: src/ZWiki/skins/zwiki/backlinks.pt:86
 msgid "Reparent"
 msgstr ""
 
+#: src/ZWiki/skins/zwiki/backlinks.pt:96
+msgid "Subtopics"
+msgstr "Altkonular"
+
+#: src/ZWiki/skins/zwiki/backlinks.pt:99
+msgid "This page has no subtopics."
+msgstr "Bu sayfa altkonuya sahip deÄŸil."
+
 #: src/ZWiki/skins/zwiki/badtemplate.pt:12
 msgid "Bad template"
 msgstr ""
 
 #: src/ZWiki/skins/zwiki/badtemplate.pt:13
-msgid ""
-"There was a problem locating one of this wiki's skin templates. There may be "
-"a page or other non-page-template/non-dtml-method object with the same ID, "
-"obscuring the template. Or the template may be missing on the filesystem (an "
-"incomplete Zwiki installation)."
+msgid "There was a problem locating one of this wiki's skin templates. There may be a page or other non-page-template/non-dtml-method object with the same ID, obscuring the template. Or the template may be missing on the filesystem (an incomplete Zwiki installation)."
 msgstr ""
 
 #: src/ZWiki/skins/zwiki/commentform.pt:21
@@ -946,12 +918,19 @@
 msgid "add-comment"
 msgstr ""
 
-#: src/ZWiki/skins/zwiki/contentspage.pt:12
+#: src/ZWiki/skins/zwiki/contentspage.pt:10
+#: src/ZWiki/skins/zwiki/contentspage.pt:27
+#, fuzzy
+msgid "Wiki contents for"
+msgstr "wiki içeriğini göster"
+
+#: src/ZWiki/skins/zwiki/contentspage.pt:13
+#: src/ZWiki/skins/zwiki/contentspage.pt:30
 msgid "Wiki contents"
 msgstr ""
 
-#: src/ZWiki/skins/zwiki/contentspage.pt:16
-msgid "Singletons"
+#: src/ZWiki/skins/zwiki/contentspage.pt:40
+msgid "Singletons:"
 msgstr ""
 
 #: src/ZWiki/skins/zwiki/denied.pt:12
@@ -1038,13 +1017,13 @@
 msgstr ""
 
 #: src/ZWiki/skins/zwiki/editform.pt:178
-msgid "preview this edit"
-msgstr ""
-
-#: src/ZWiki/skins/zwiki/editform.pt:178
 msgid "Preview"
 msgstr "Önizleme"
 
+#: src/ZWiki/skins/zwiki/editform.pt:178
+msgid "preview this edit"
+msgstr ""
+
 #: src/ZWiki/skins/zwiki/editform.pt:183
 msgid "Cancel"
 msgstr "Ä°ptal"
@@ -1079,13 +1058,18 @@
 msgstr ""
 
 #: src/ZWiki/skins/zwiki/editform.pt:71
-msgid "type"
+msgid "markup"
 msgstr ""
 
 #: src/ZWiki/skins/zwiki/editform.pt:72
 msgid "select the formatting and rendering style for this page"
 msgstr ""
 
+#: src/ZWiki/skins/zwiki/helppage.pt:12
+#, fuzzy
+msgid "Help page"
+msgstr "Yardım sayfası"
+
 #: src/ZWiki/skins/zwiki/links.pt:102
 msgid "(external edit)"
 msgstr ""
@@ -1224,14 +1208,14 @@
 msgstr ""
 
 #: src/ZWiki/skins/zwiki/pagemanagementform.pt:45
+msgid "make this page a subtopic of the page you have entered"
+msgstr ""
+
+#: src/ZWiki/skins/zwiki/pagemanagementform.pt:45
 #, fuzzy
 msgid "reparent"
 msgstr "Ebeveyn"
 
-#: src/ZWiki/skins/zwiki/pagemanagementform.pt:45
-msgid "make this page a subtopic of the page you have entered"
-msgstr ""
-
 #: src/ZWiki/skins/zwiki/pagemanagementform.pt:50
 msgid "rename this page to the name you have entered, updating all links"
 msgstr ""
@@ -1246,8 +1230,7 @@
 msgstr ""
 
 #: src/ZWiki/skins/zwiki/pagemanagementform.pt:55
-msgid ""
-"delete this page, and redirect links to the page you have entered, if any"
+msgid "delete this page, and redirect links to the page you have entered, if any"
 msgstr ""
 
 #: src/ZWiki/skins/zwiki/pagemanagementform.pt:60
@@ -1372,13 +1355,15 @@
 msgid "User options"
 msgstr "arama seçenekleri"
 
+#~ msgid "(identifies your edits)"
+#~ msgstr "(Düzenlemelerinizi tanımlar)"
+
 #~ msgid "your edit contained a banned link pattern"
 #~ msgstr "Düzenlemeniz yasaklanmış bağlantı kalıbı içeriyor"
 
 #, fuzzy
 #~ msgid "adding of external links by anonymous authors is restricted"
-#~ msgstr ""
-#~ "Anonim yazarlar tarafından harici bağlantıların eklenmesi kısıtlanmıştır"
+#~ msgstr "Anonim yazarlar tarafından harici bağlantıların eklenmesi kısıtlanmıştır"
 
 #~ msgid "Add a ZWiki web"
 #~ msgstr "ZWiki web'i ekle"
@@ -1393,14 +1378,8 @@
 #~ msgstr "ve gir"
 
 #, fuzzy
-#~ msgid ""
-#~ "You may create a new ZWiki Page object using the form below. You may also "
-#~ "choose to upload an existing html file from your local computer by "
-#~ "clicking the <i>Browse</i> button."
-#~ msgstr ""
-#~ "Aşağıdaki formu kullanarak yeni bir ZWiki sayfa nesnesi yapabilirsin. "
-#~ "Ayrıca bilgisayarındaki yüklü bir sayfayı <i>göster</i> tuşuna tıklayarak "
-#~ "yükleyebilirsiniz."
+#~ msgid "You may create a new ZWiki Page object using the form below. You may also choose to upload an existing html file from your local computer by clicking the <i>Browse</i> button."
+#~ msgstr "Aşağıdaki formu kullanarak yeni bir ZWiki sayfa nesnesi yapabilirsin. Ayrıca bilgisayarındaki yüklü bir sayfayı <i>göster</i> tuşuna tıklayarak yükleyebilirsiniz."
 
 #~ msgid "File"
 #~ msgstr "Dosya"
@@ -1457,8 +1436,7 @@
 #~ msgstr "Wiki Kullanıcısı"
 
 #~ msgid "Wiki visitors, which can only view and comment on wikis."
-#~ msgstr ""
-#~ "Wiki ziyaretçileri, sadece izler ve Wiki hakkında yorum yapabilirler"
+#~ msgstr "Wiki ziyaretçileri, sadece izler ve Wiki hakkında yorum yapabilirler"
 
 #~ msgid "A Wiki Page"
 #~ msgstr "Bir wiki sayfası"

Modified: zope-zwiki/trunk/i18n/zh_CN.po
===================================================================
--- zope-zwiki/trunk/i18n/zh_CN.po	2007-04-08 14:54:05 UTC (rev 761)
+++ zope-zwiki/trunk/i18n/zh_CN.po	2007-04-08 14:55:27 UTC (rev 762)
@@ -1,9 +1,9 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: ZWiki-0-45-0\n"
-"POT-Creation-Date: Sat Sep  2 18:10:16 2006\n"
-"PO-Revision-Date: 2006-03-21 16:22+0000\n"
-"Last-Translator: feilfly <feilfly at gmail.com>\n"
+"POT-Creation-Date: Tue Mar 27 14:50:46 2007\n"
+"PO-Revision-Date: 2006-10-07 15:00+0000\n"
+"Last-Translator: nwind <ourseablue at 163.com>\n"
 "Language-Team: <zwiki at zwiki.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -14,36 +14,32 @@
 "Preferred-encodings: utf-8\n"
 "Domain: zwiki\n"
 
-#: src/ZWiki/Admin.py:62
+#: src/ZWiki/Admin.py:58
 msgid "You are not authorized to upgrade all pages."
 msgstr "您没有权力升级所有页面。"
 
-#: src/ZWiki/Admin.py:63
+#: src/ZWiki/Admin.py:59
 msgid "(folder -> Manage properties)"
 msgstr "(目录 -> 管理性质)"
 
-#: src/ZWiki/Diff.py:174
+#: src/ZWiki/Diff.py:179
 #, fuzzy
 msgid "You are not authorized to reparent this ZWiki Page."
 msgstr "您没有权力删除此页。"
 
-#: src/ZWiki/Diff.py:180 src/ZWiki/plugins/tracker/tracker.py:332
+#: src/ZWiki/Diff.py:185 src/ZWiki/plugins/tracker/tracker.py:333
 #, fuzzy
 msgid "You are not authorized to rename this ZWiki Page."
 msgstr "您没有权力删除此页。"
 
-#: src/ZWiki/Editing.py:156 src/ZWiki/Editing.py:294 src/ZWiki/Views.py:332
-#: src/ZWiki/Views.py:435 src/ZWiki/plugins/tracker/tracker.py:321
+#: src/ZWiki/Editing.py:156 src/ZWiki/Editing.py:294 src/ZWiki/Views.py:336
+#: src/ZWiki/Views.py:439 src/ZWiki/plugins/tracker/tracker.py:322
 #, fuzzy
-msgid ""
-"Sorry, this wiki doesn't allow anonymous edits. Please configure a username "
-"in options first."
+msgid "Sorry, this wiki doesn't allow anonymous edits. Please configure a username in options first."
 msgstr "对不起,该wiki不能匿名发表,请先填写用户名。"
 
 #: src/ZWiki/Editing.py:327
-msgid ""
-"You are not authorized to reparent or change subtopics links on this ZWiki "
-"Page."
+msgid "You are not authorized to reparent or change subtopics links on this ZWiki Page."
 msgstr "您没有权力在这页更动父页或子主题连结。"
 
 #: src/ZWiki/Editing.py:349
@@ -51,9 +47,9 @@
 msgstr "您没有权力变更页面型态。"
 
 #: src/ZWiki/Editing.py:383 src/ZWiki/Editing.py:410
-#: src/ZWiki/plugins/tracker/tracker.py:340
-#: src/ZWiki/plugins/tracker/tracker.py:347
-#: src/ZWiki/plugins/tracker/tracker.py:354
+#: src/ZWiki/plugins/tracker/tracker.py:344
+#: src/ZWiki/plugins/tracker/tracker.py:351
+#: src/ZWiki/plugins/tracker/tracker.py:358
 msgid "You are not authorized to edit this ZWiki Page."
 msgstr "您没有权力修改此页。"
 
@@ -62,8 +58,7 @@
 msgstr "您没有权力删除此页。"
 
 #: src/ZWiki/Editing.py:563
-msgid ""
-"This page was renamed to %s. You can delete this one if no longer needed.\n"
+msgid "This page was renamed to %s. You can delete this one if no longer needed.\n"
 msgstr "这页已被改名为 %s。如果此页不需要,您可以删除。\n"
 
 #: src/ZWiki/Editing.py:659
@@ -76,7 +71,7 @@
 
 #: src/ZWiki/Editing.py:822
 msgid "There was a problem: %s"
-msgstr ""
+msgstr "这曾是一个问题:%s"
 
 #: src/ZWiki/Editing.py:829
 msgid "banned_links match"
@@ -84,111 +79,104 @@
 
 #: src/ZWiki/Editing.py:830
 #, fuzzy
-msgid ""
-"your edit contained a banned link pattern. Please contact the site "
-"administrator for help."
+msgid "your edit contained a banned link pattern. Please contact the site administrator for help."
 msgstr "发生一个问题: %s。请联系管理者,协助处理这问题。"
 
 #: src/ZWiki/Editing.py:841
 msgid "exceeded max_anonymous_links"
-msgstr ""
-"您所编辑的发生一个问题:它包含一个被阻挡的连结(网址)样式。请连络网站管理"
-"者,以取得适当协助。"
+msgstr "您所编辑的发生一个问题:它包含一个被阻挡的连结(网址)样式。请连络网站管理者,以取得适当协助。"
 
 #: src/ZWiki/Editing.py:842
-msgid ""
-"adding of external links by unidentified users is restricted. Please back up "
-"and remove some of the http urls you added, or contact the site "
-"administrator for help."
+msgid "adding of external links by unidentified users is restricted. Please back up and remove some of the http urls you added, or contact the site administrator for help."
 msgstr ""
 
 #: src/ZWiki/Editing.py:853
 #, fuzzy
 msgid "exceeded max_identified_links"
-msgstr ""
-"您所编辑的发生一个问题:它包含一个被阻挡的连结(网址)样式。请连络网站管理"
-"者,以取得适当协助。"
+msgstr "您所编辑的发生一个问题:它包含一个被阻挡的连结(网址)样式。请连络网站管理者,以取得适当协助。"
 
 #: src/ZWiki/Editing.py:854
-msgid ""
-"adding of external links is restricted, even for identified users. Please "
-"back up and remove some of the http urls you added, or contact the site "
-"administrator for help."
+msgid "adding of external links is restricted, even for identified users. Please back up and remove some of the http urls you added, or contact the site administrator for help."
 msgstr ""
 
-#: src/ZWiki/Mail.py:506 src/ZWiki/skins/dtmlmessages.pt:58
+#: src/ZWiki/Mail.py:506 src/ZWiki/skins/dtmlmessages.pt:60
 msgid "anonymous"
 msgstr "访客"
 
-#: src/ZWiki/OutlineSupport.py:843 src/ZWiki/skins/zwiki/links.pt:56
+#: src/ZWiki/OutlineSupport.py:378
+#, fuzzy
+msgid "Sorry, this wiki doesn't allow anonymous reparenting. Please configure a username in options first."
+msgstr "对不起,该wiki不能匿名发表,请先填写用户名。"
+
+#: src/ZWiki/OutlineSupport.py:878 src/ZWiki/skins/zwiki/links.pt:56
 msgid "which pages link to this one ?"
 msgstr "那个页面连结到这一页?"
 
-#: src/ZWiki/OutlineSupport.py:851
+#: src/ZWiki/OutlineSupport.py:886
 msgid "You are here"
 msgstr "您现在位置"
 
-#: src/ZWiki/Utils.py:465
+#: src/ZWiki/Utils.py:487
 msgid "years"
 msgstr "å¹´"
 
-#: src/ZWiki/Utils.py:465
+#: src/ZWiki/Utils.py:487
 msgid "year"
 msgstr "å¹´"
 
-#: src/ZWiki/Utils.py:467
+#: src/ZWiki/Utils.py:489
 msgid "month"
 msgstr "月"
 
-#: src/ZWiki/Utils.py:467
+#: src/ZWiki/Utils.py:489
 msgid "months"
 msgstr "月"
 
-#: src/ZWiki/Utils.py:469
+#: src/ZWiki/Utils.py:491
 msgid "weeks"
 msgstr "周"
 
-#: src/ZWiki/Utils.py:469
+#: src/ZWiki/Utils.py:491
 msgid "week"
 msgstr "周"
 
-#: src/ZWiki/Utils.py:471
+#: src/ZWiki/Utils.py:493
 msgid "day"
 msgstr "天"
 
-#: src/ZWiki/Utils.py:471
+#: src/ZWiki/Utils.py:493
 msgid "days"
 msgstr "天"
 
-#: src/ZWiki/Utils.py:473
+#: src/ZWiki/Utils.py:495
 msgid "hours"
 msgstr "小时"
 
-#: src/ZWiki/Utils.py:473
+#: src/ZWiki/Utils.py:495
 msgid "hour"
 msgstr "小时"
 
-#: src/ZWiki/Utils.py:475
+#: src/ZWiki/Utils.py:497
 msgid "minute"
 msgstr "分"
 
-#: src/ZWiki/Utils.py:475
+#: src/ZWiki/Utils.py:497
 msgid "minutes"
 msgstr "分"
 
-#: src/ZWiki/Utils.py:477
+#: src/ZWiki/Utils.py:499
 msgid "second"
 msgstr "秒"
 
-#: src/ZWiki/Utils.py:477
+#: src/ZWiki/Utils.py:499
 msgid "seconds"
 msgstr "秒"
 
-#: src/ZWiki/Views.py:346
+#: src/ZWiki/Views.py:350
 msgid "Page is locked"
 msgstr "页面被锁"
 
-#: src/ZWiki/Views.py:357
+#: src/ZWiki/Views.py:361
 msgid ""
 "\n"
 "            This page has a webDAV lock. Someone is probably editing it\n"
@@ -205,60 +193,58 @@
 "            来,以文字的方式拷贝,好做为重新修改的参考。\n"
 "            "
 
-#: src/ZWiki/Views.py:364
+#: src/ZWiki/Views.py:368
 msgid "To discard your changes and try again, click OK."
 msgstr "放弃您变更的内容,并且再试一次,点选确认按钮(OK)。"
 
-#: src/ZWiki/Views.py:393
+#: src/ZWiki/Views.py:397
 msgid "Edit conflict"
 msgstr "修改冲突"
 
-#: src/ZWiki/Views.py:413
+#: src/ZWiki/Views.py:417
 msgid "Someone else has saved this page while you were editing"
 msgstr "当您修改时,已经有人存入新的页面"
 
-#: src/ZWiki/Views.py:414
+#: src/ZWiki/Views.py:418
 msgid "To resolve the conflict, do this"
 msgstr "要解决冲突问题,请按以下步骤"
 
-#: src/ZWiki/Views.py:415
+#: src/ZWiki/Views.py:419
 msgid "Click your browser's back button"
 msgstr "点选您浏览器的上ㄧ页按钮(Back)"
 
-#: src/ZWiki/Views.py:416
+#: src/ZWiki/Views.py:420
 msgid "Copy your recent edits to the clipboard"
 msgstr "复制您最近修改的内容到剪贴簿"
 
-#: src/ZWiki/Views.py:417
+#: src/ZWiki/Views.py:421
 msgid "Click your browser's refresh button"
 msgstr "点选您浏览器更新页面按钮(Refresh)"
 
-#: src/ZWiki/Views.py:418
+#: src/ZWiki/Views.py:422
 msgid "Paste in your edits again, being mindful of the latest changes"
 msgstr "贴上您所修改的内容,在最新变更的内容里头"
 
-#: src/ZWiki/Views.py:419
+#: src/ZWiki/Views.py:423
 msgid "Click the Change button again"
 msgstr "再按一次变更按钮(Change)"
 
-#: src/ZWiki/Views.py:420 src/ZWiki/skins/zwiki/editform.pt:163
+#: src/ZWiki/Views.py:424 src/ZWiki/skins/zwiki/editform.pt:163
 msgid "or"
 msgstr "或"
 
-#: src/ZWiki/Views.py:421
+#: src/ZWiki/Views.py:425
 msgid "To discard your changes and start again, click OK"
 msgstr "放弃所有您变更的内容,并重新再读一次,点选确认按钮(OK)"
 
-#: src/ZWiki/Views.py:490
+#: src/ZWiki/Views.py:501
 msgid ""
 "\n"
-"        Access keys can be accessed in mozilla-based browsers by pressing "
-"alt-<key>\n"
+"        Access keys can be accessed in mozilla-based browsers by pressing alt-<key>\n"
 "        IE users: must also press enter\n"
 "        Mac users: command-<key>\n"
 "        Opera users: shift-escape-<key>\n"
-"        These won't work here, back up to the previous page to try them "
-"out.\n"
+"        These won't work here, back up to the previous page to try them out.\n"
 "\n"
 "        0    show these access key assignments\n"
 "\n"
@@ -274,10 +260,8 @@
 "        s    go to search field\n"
 "        \n"
 "        page functions:\n"
-"        +    (in a plone/cmf site with skin switching set up) use zwiki's "
-"plone/cmf skin\n"
-"        -    (in a plone/cmf site with skin switching set up) use zwiki's "
-"standard skin\n"
+"        +    (in a plone/cmf site with skin switching set up) use zwiki's plone/cmf skin\n"
+"        -    (in a plone/cmf site with skin switching set up) use zwiki's standard skin\n"
 "        v    view page\n"
 "        m    mail subscription\n"
 "        b    show backlinks (links to this page)\n"
@@ -353,32 +337,31 @@
 "        p    前一修改\n"
 "        "
 
-#: src/ZWiki/Wikis.py:49
-msgid "Unknown wiki type"
-msgstr "未知的类型"
-
-#: src/ZWiki/ZWikiPage.py:675
+#: src/ZWiki/ZWikiPage.py:744
 msgid "create this page"
 msgstr "建立页面"
 
-#: src/ZWiki/ZWikiPage.py:798 src/ZWiki/ZWikiPage.py:814
-#: src/ZWiki/ZWikiPage.py:817
+#: src/ZWiki/ZWikiPage.py:872 src/ZWiki/ZWikiPage.py:887
 msgid "last edited %(interval)s ago"
 msgstr "%(interval)s 前修改"
 
-#: src/ZWiki/ZWikiPage.py:809
+#: src/ZWiki/ZWikiPage.py:882
 msgid "show last edit"
 msgstr "显示最新修改"
 
-#: src/ZWiki/ZWikiPage.py:826 src/ZWiki/ZWikiPage.py:828
+#: src/ZWiki/ZWikiPage.py:897 src/ZWiki/ZWikiPage.py:899
 msgid "by %(editor)s"
 msgstr "作者 %(editor)s"
 
-#: src/ZWiki/__init__.py:34
+#: src/ZWiki/__init__.py:200
+msgid "Unknown wiki type"
+msgstr "未知的类型"
+
+#: src/ZWiki/__init__.py:39
 msgid "No need to add a Zwiki Outline Cache"
 msgstr "不需要新增 Zwiki 大纲快取"
 
-#: src/ZWiki/__init__.py:35
+#: src/ZWiki/__init__.py:40
 msgid ""
 "Zwiki Outline Cache appears in the ZMI Add menu\n"
 "        for implementation reasons, but should not be added directly.\n"
@@ -394,6 +377,10 @@
 msgid "comments"
 msgstr "留言"
 
+#: src/ZWiki/pagetypes/html.py:50 src/ZWiki/pagetypes/rst.py:85
+msgid "reply"
+msgstr "回复"
+
 #: src/ZWiki/pagetypes/moin.py:1990
 msgid "Expected \"=\" to follow \"%(token)s\""
 msgstr "预期在 \"%(token)s\" 之后是 \"=\""
@@ -430,10 +417,6 @@
 msgid "Expected a color value \"%(arg)s\" after \"%(key)s\""
 msgstr "期待在 \"%(key)s\" 之后的 \"%(args)s\" 为色彩指定值"
 
-#: src/ZWiki/pagetypes/rst.py:85
-msgid "reply"
-msgstr "回复"
-
 #: src/ZWiki/plugins/latexwiki/wikis/latexwiki/diffform.pt:127
 #: src/ZWiki/plugins/mathaction/wikis/mathaction/old-diffform.pt:127
 msgid "full history"
@@ -461,7 +444,7 @@
 
 #: src/ZWiki/plugins/latexwiki/wikis/latexwiki/wikipage.pt:169
 msgid "show plone skin"
-msgstr ""
+msgstr "显示Plone外观"
 
 #: src/ZWiki/plugins/latexwiki/wikis/latexwiki/wikipage.pt:172
 #, fuzzy
@@ -475,7 +458,7 @@
 
 #: src/ZWiki/plugins/latexwiki/wikis/latexwiki/wikipage.pt:179
 msgid "full"
-msgstr ""
+msgstr "完全"
 
 #: src/ZWiki/plugins/latexwiki/wikis/latexwiki/wikipage.pt:180
 #, fuzzy
@@ -489,11 +472,11 @@
 
 #: src/ZWiki/plugins/latexwiki/wikis/latexwiki/wikipage.pt:187
 msgid "show only essential features"
-msgstr ""
+msgstr "只显示必要功能"
 
 #: src/ZWiki/plugins/latexwiki/wikis/latexwiki/wikipage.pt:193
 msgid "minimal"
-msgstr ""
+msgstr "极简"
 
 #: src/ZWiki/plugins/latexwiki/wikis/latexwiki/wikipage.pt:507
 #, fuzzy
@@ -515,7 +498,7 @@
 msgstr "标题"
 
 #: src/ZWiki/plugins/tracker/filterissues.pt:12
-#: src/ZWiki/skins/dtmlmessages.pt:30
+#: src/ZWiki/skins/dtmlmessages.pt:31
 msgid "Filter issues"
 msgstr "过滤事例"
 
@@ -527,61 +510,61 @@
 msgid "Issue tracker"
 msgstr "事例追踪"
 
-#: src/ZWiki/plugins/tracker/tracker.py:361
+#: src/ZWiki/plugins/tracker/tracker.py:365
 #, fuzzy
 msgid "You are not authorized to comment on this ZWiki Page."
 msgstr "您没有权力修改此页。"
 
-#: src/ZWiki/skins/dtmlmessages.pt:10 src/ZWiki/skins/dtmlmessages.pt:32
+#: src/ZWiki/skins/dtmlmessages.pt:10 src/ZWiki/skins/dtmlmessages.pt:33
 #, fuzzy
+msgid "name"
+msgstr "名称,"
+
+#: src/ZWiki/skins/dtmlmessages.pt:11 src/ZWiki/skins/dtmlmessages.pt:34
+#, fuzzy
 msgid "category"
 msgstr "分类"
 
-#: src/ZWiki/skins/dtmlmessages.pt:11 src/ZWiki/skins/dtmlmessages.pt:33
+#: src/ZWiki/skins/dtmlmessages.pt:12 src/ZWiki/skins/dtmlmessages.pt:35
 #, fuzzy
 msgid "severity"
 msgstr "程度"
 
-#: src/ZWiki/skins/dtmlmessages.pt:12 src/ZWiki/skins/dtmlmessages.pt:34
+#: src/ZWiki/skins/dtmlmessages.pt:13 src/ZWiki/skins/dtmlmessages.pt:36
 #, fuzzy
 msgid "status"
 msgstr "状态"
 
-#: src/ZWiki/skins/dtmlmessages.pt:13 src/ZWiki/skins/dtmlmessages.pt:35
+#: src/ZWiki/skins/dtmlmessages.pt:14 src/ZWiki/skins/dtmlmessages.pt:37
 #, fuzzy
 msgid "age"
 msgstr "页面"
 
-#: src/ZWiki/skins/dtmlmessages.pt:14 src/ZWiki/skins/dtmlmessages.pt:36
+#: src/ZWiki/skins/dtmlmessages.pt:15 src/ZWiki/skins/dtmlmessages.pt:38
 #, fuzzy
 msgid "modified"
 msgstr "变更"
 
-#: src/ZWiki/skins/dtmlmessages.pt:15
+#: src/ZWiki/skins/dtmlmessages.pt:16
 #, fuzzy
 msgid "Add a new issue:"
 msgstr "新增一则事例:"
 
-#: src/ZWiki/skins/dtmlmessages.pt:16
+#: src/ZWiki/skins/dtmlmessages.pt:17
 #, fuzzy
 msgid "Name:"
 msgstr "名称,"
 
-#: src/ZWiki/skins/dtmlmessages.pt:17
+#: src/ZWiki/skins/dtmlmessages.pt:18
 #, fuzzy
 msgid "Category:"
 msgstr "分类:"
 
-#: src/ZWiki/skins/dtmlmessages.pt:18
+#: src/ZWiki/skins/dtmlmessages.pt:19
 #, fuzzy
 msgid "Severity:"
 msgstr "程度:"
 
-#: src/ZWiki/skins/dtmlmessages.pt:19
-#, fuzzy
-msgid "Status:"
-msgstr "状态:"
-
 #: src/ZWiki/skins/dtmlmessages.pt:2
 #, fuzzy
 msgid "Here are the wiki's issue pages."
@@ -589,324 +572,319 @@
 
 #: src/ZWiki/skins/dtmlmessages.pt:20
 #, fuzzy
+msgid "Status:"
+msgstr "状态:"
+
+#: src/ZWiki/skins/dtmlmessages.pt:21
+#, fuzzy
 msgid "Details:"
 msgstr "细节:"
 
-#: src/ZWiki/skins/dtmlmessages.pt:21
+#: src/ZWiki/skins/dtmlmessages.pt:22
 #, fuzzy
 msgid "add issue"
 msgstr "事例"
 
-#: src/ZWiki/skins/dtmlmessages.pt:22
+#: src/ZWiki/skins/dtmlmessages.pt:23
 #, fuzzy
 msgid "More advanced"
 msgstr "更多进阶的"
 
-#: src/ZWiki/skins/dtmlmessages.pt:23
+#: src/ZWiki/skins/dtmlmessages.pt:24
 #, fuzzy
 msgid "issue tracker"
 msgstr "事例追踪"
 
-#: src/ZWiki/skins/dtmlmessages.pt:24
+#: src/ZWiki/skins/dtmlmessages.pt:25
 #, fuzzy
 msgid "search options"
 msgstr "搜索选项"
 
-#: src/ZWiki/skins/dtmlmessages.pt:25
+#: src/ZWiki/skins/dtmlmessages.pt:26
 #, fuzzy
 msgid "Name contains any of:"
 msgstr "页面名称包含任意的:"
 
-#: src/ZWiki/skins/dtmlmessages.pt:26
+#: src/ZWiki/skins/dtmlmessages.pt:27
 #, fuzzy
 msgid "Page text contains any of:"
 msgstr "页面文字包含任意的:"
 
-#: src/ZWiki/skins/dtmlmessages.pt:27
+#: src/ZWiki/skins/dtmlmessages.pt:28
 #, fuzzy
 msgid "Categories:"
 msgstr "分类:"
 
-#: src/ZWiki/skins/dtmlmessages.pt:28
+#: src/ZWiki/skins/dtmlmessages.pt:29
 #, fuzzy
 msgid "Severities:"
 msgstr "程度:"
 
-#: src/ZWiki/skins/dtmlmessages.pt:29
-#, fuzzy
-msgid "Statuses:"
-msgstr "状态:"
-
 #: src/ZWiki/skins/dtmlmessages.pt:3
 #, fuzzy
 msgid "Enter a search term, click the numbers to the right,"
 msgstr "输入搜寻的字词, 或点选右边的数字, 或"
 
-#: src/ZWiki/skins/dtmlmessages.pt:37
+#: src/ZWiki/skins/dtmlmessages.pt:30
 #, fuzzy
+msgid "Statuses:"
+msgstr "状态:"
+
+#: src/ZWiki/skins/dtmlmessages.pt:39
+#, fuzzy
 msgid "Submitted by"
 msgstr "提出者"
 
-#: src/ZWiki/skins/dtmlmessages.pt:38
+#: src/ZWiki/skins/dtmlmessages.pt:4
 #, fuzzy
+msgid "filter issues"
+msgstr "过滤事例"
+
+#: src/ZWiki/skins/dtmlmessages.pt:40
+#, fuzzy
 msgid "Name"
 msgstr "名称,"
 
-#: src/ZWiki/skins/dtmlmessages.pt:39
+#: src/ZWiki/skins/dtmlmessages.pt:41
 #, fuzzy
 msgid "Category"
 msgstr "分类"
 
-#: src/ZWiki/skins/dtmlmessages.pt:4
+#: src/ZWiki/skins/dtmlmessages.pt:42
 #, fuzzy
-msgid "filter issues"
-msgstr "过滤事例"
-
-#: src/ZWiki/skins/dtmlmessages.pt:40
-#, fuzzy
 msgid "Severity"
 msgstr "程度"
 
-#: src/ZWiki/skins/dtmlmessages.pt:41
+#: src/ZWiki/skins/dtmlmessages.pt:43
 #, fuzzy
 msgid "Status"
 msgstr "状态"
 
-#: src/ZWiki/skins/dtmlmessages.pt:42
+#: src/ZWiki/skins/dtmlmessages.pt:44
 #, fuzzy
 msgid "Optional subject"
 msgstr "变更注记(选项)"
 
-#: src/ZWiki/skins/dtmlmessages.pt:43
+#: src/ZWiki/skins/dtmlmessages.pt:45
 #, fuzzy
 msgid "Optional comment"
 msgstr "可选注释(选项)"
 
-#: src/ZWiki/skins/dtmlmessages.pt:44 src/ZWiki/skins/dtmlmessages.pt:45
+#: src/ZWiki/skins/dtmlmessages.pt:46 src/ZWiki/skins/dtmlmessages.pt:47
 #, fuzzy
 msgid "Add ZWiki"
 msgstr "新增快纪"
 
-#: src/ZWiki/skins/dtmlmessages.pt:46
+#: src/ZWiki/skins/dtmlmessages.pt:48
 #, fuzzy
 msgid "Id:"
 msgstr "名称"
 
-#: src/ZWiki/skins/dtmlmessages.pt:47
+#: src/ZWiki/skins/dtmlmessages.pt:49
 #, fuzzy
 msgid "Title:"
 msgstr "标题"
 
-#: src/ZWiki/skins/dtmlmessages.pt:48
+#: src/ZWiki/skins/dtmlmessages.pt:5
+msgid "browse open issues"
+msgstr "打开浏览器出错"
+
+#: src/ZWiki/skins/dtmlmessages.pt:50
 msgid "Template:"
 msgstr ""
 
-#: src/ZWiki/skins/dtmlmessages.pt:49
+#: src/ZWiki/skins/dtmlmessages.pt:51
 #, fuzzy
 msgid "Add wiki"
 msgstr "新增快纪"
 
-#: src/ZWiki/skins/dtmlmessages.pt:5
-msgid "browse open issues"
-msgstr ""
-
-#: src/ZWiki/skins/dtmlmessages.pt:50
+#: src/ZWiki/skins/dtmlmessages.pt:52
 msgid "Pages changed in the last"
 msgstr "最近更动的页面"
 
-#: src/ZWiki/skins/dtmlmessages.pt:51
+#: src/ZWiki/skins/dtmlmessages.pt:53
 msgid "Recently changed pages, with summaries"
 msgstr "最近变更的页面, 包含概略的摘要"
 
-#: src/ZWiki/skins/dtmlmessages.pt:52
+#: src/ZWiki/skins/dtmlmessages.pt:54
 msgid "Show summaries ?"
 msgstr "显示摘要?"
 
-#: src/ZWiki/skins/dtmlmessages.pt:53
+#: src/ZWiki/skins/dtmlmessages.pt:55
 msgid "Refresh"
 msgstr "æ›´æ–°"
 
-#: src/ZWiki/skins/dtmlmessages.pt:54
+#: src/ZWiki/skins/dtmlmessages.pt:56
 msgid "Page"
 msgstr "页面"
 
-#: src/ZWiki/skins/dtmlmessages.pt:55
+#: src/ZWiki/skins/dtmlmessages.pt:57
 msgid "Edited&nbsp;by"
 msgstr "修改者"
 
-#: src/ZWiki/skins/dtmlmessages.pt:56
+#: src/ZWiki/skins/dtmlmessages.pt:58
 msgid "Time"
 msgstr "时间"
 
-#: src/ZWiki/skins/dtmlmessages.pt:57
+#: src/ZWiki/skins/dtmlmessages.pt:59
 msgid "NEW"
 msgstr "æ–°çš„"
 
-#: src/ZWiki/skins/dtmlmessages.pt:59
-msgid "Pages marked (NEW) have been created within the last week"
-msgstr "页面注记(新的)表示是在最近一周内所建立的"
-
 #: src/ZWiki/skins/dtmlmessages.pt:6
 msgid "search issues"
 msgstr "过滤事例"
 
-#: src/ZWiki/skins/dtmlmessages.pt:60
+#: src/ZWiki/skins/dtmlmessages.pt:61
+msgid "Pages marked (NEW) have been created within the last week"
+msgstr "页面注记(新的)表示是在最近一周内所建立的"
+
+#: src/ZWiki/skins/dtmlmessages.pt:62
 msgid "Enter a word or phrase and hit enter to search the entire wiki."
 msgstr "输入一个字或一段话,并且点选 输入 开始搜寻整个wiki。"
 
-#: src/ZWiki/skins/dtmlmessages.pt:61
+#: src/ZWiki/skins/dtmlmessages.pt:63
 msgid "This is the same as using the search field at top right."
 msgstr "这和在右上角搜寻字段的作用是一样的。"
 
-#: src/ZWiki/skins/dtmlmessages.pt:62
+#: src/ZWiki/skins/dtmlmessages.pt:64
 msgid "Tips: A single word works best for matching page names."
 msgstr "技巧:使用单独的字,对于按页面名称搜寻来说最好。"
 
-#: src/ZWiki/skins/dtmlmessages.pt:63
-msgid ""
-"Case-insensitivity and wildcards may be supported depending on your catalog "
-"configuration."
+#: src/ZWiki/skins/dtmlmessages.pt:65
+msgid "Case-insensitivity and wildcards may be supported depending on your catalog configuration."
 msgstr "大小写无关与万用字元,依您的目录索引设定而定,也许会被支持。"
 
-#: src/ZWiki/skins/dtmlmessages.pt:64
+#: src/ZWiki/skins/dtmlmessages.pt:66
 msgid "Leave it blank to list all pages."
 msgstr "如果让它空白的话,可列出所有页面。"
 
-#: src/ZWiki/skins/dtmlmessages.pt:65 src/ZWiki/skins/dtmlmessages.pt:66
+#: src/ZWiki/skins/dtmlmessages.pt:67 src/ZWiki/skins/dtmlmessages.pt:68
 msgid "Search"
 msgstr "搜寻"
 
-#: src/ZWiki/skins/dtmlmessages.pt:67
+#: src/ZWiki/skins/dtmlmessages.pt:69
 msgid "Page names matching"
 msgstr "页面名称相符"
 
-#: src/ZWiki/skins/dtmlmessages.pt:68
-msgid "Text matching"
-msgstr "文字相符"
-
-#: src/ZWiki/skins/dtmlmessages.pt:69
-msgid "Thorough (non-catalog) search for text matching"
-msgstr "透过(非编目方式)搜寻得到文字相符"
-
 #: src/ZWiki/skins/dtmlmessages.pt:7
 #, fuzzy
 msgid "recent"
 msgstr "变更父层"
 
 #: src/ZWiki/skins/dtmlmessages.pt:70
+msgid "Text matching"
+msgstr "文字相符"
+
+#: src/ZWiki/skins/dtmlmessages.pt:71
+msgid "Thorough (non-catalog) search for text matching"
+msgstr "透过(非编目方式)搜寻得到文字相符"
+
+#: src/ZWiki/skins/dtmlmessages.pt:72
 msgid "Set your preferences for this wiki:"
 msgstr "设定在这个站台个人相关偏好。"
 
-#: src/ZWiki/skins/dtmlmessages.pt:71
+#: src/ZWiki/skins/dtmlmessages.pt:73
 msgid "User name:"
 msgstr "使用者名称:"
 
-#: src/ZWiki/skins/dtmlmessages.pt:72
-msgid "(identifies your edits)"
-msgstr "(您编辑文章时的名称)"
+#: src/ZWiki/skins/dtmlmessages.pt:74
+msgid "(identifies your edits, saves your votes, may be required)"
+msgstr ""
 
-#: src/ZWiki/skins/dtmlmessages.pt:73
+#: src/ZWiki/skins/dtmlmessages.pt:75
 msgid "Email address:"
 msgstr "电子邮件:"
 
-#: src/ZWiki/skins/dtmlmessages.pt:74
+#: src/ZWiki/skins/dtmlmessages.pt:76
 msgid "(allows mail subscription)"
 msgstr "(得以订阅邮件)"
 
-#: src/ZWiki/skins/dtmlmessages.pt:75
+#: src/ZWiki/skins/dtmlmessages.pt:77
 msgid "Your time zone:"
 msgstr "您所在时区:"
 
-#: src/ZWiki/skins/dtmlmessages.pt:76
+#: src/ZWiki/skins/dtmlmessages.pt:78
 msgid "(localizes most times)"
 msgstr "(选择接近的时间)"
 
-#: src/ZWiki/skins/dtmlmessages.pt:77
+#: src/ZWiki/skins/dtmlmessages.pt:79
 msgid "Edit form height:"
 msgstr "修改字段高度:"
 
-#: src/ZWiki/skins/dtmlmessages.pt:78
-msgid "(adjusts form size)"
-msgstr "(调整表格大小)"
-
-#: src/ZWiki/skins/dtmlmessages.pt:79
-msgid "Save options"
-msgstr "储存设定"
-
 #: src/ZWiki/skins/dtmlmessages.pt:8
 #, fuzzy
 msgid "all"
 msgstr "全部"
 
 #: src/ZWiki/skins/dtmlmessages.pt:80
+msgid "(adjusts form size)"
+msgstr "(调整表格大小)"
+
+#: src/ZWiki/skins/dtmlmessages.pt:81
+msgid "Save options"
+msgstr "储存设定"
+
+#: src/ZWiki/skins/dtmlmessages.pt:82
 msgid "Forget options"
 msgstr "预设设定"
 
-#: src/ZWiki/skins/dtmlmessages.pt:81 src/ZWiki/skins/dtmlmessages.pt:82
+#: src/ZWiki/skins/dtmlmessages.pt:83 src/ZWiki/skins/dtmlmessages.pt:84
 msgid "Add ZWiki Page"
 msgstr "新增快纪页面"
 
-#: src/ZWiki/skins/dtmlmessages.pt:83
+#: src/ZWiki/skins/dtmlmessages.pt:85
 #, fuzzy
 msgid "Page&nbsp;name:"
 msgstr "页面名称"
 
-#: src/ZWiki/skins/dtmlmessages.pt:84
+#: src/ZWiki/skins/dtmlmessages.pt:86
 #, fuzzy
 msgid "Add wiki page"
 msgstr "新增快纪页面"
 
-#: src/ZWiki/skins/dtmlmessages.pt:85
+#: src/ZWiki/skins/dtmlmessages.pt:87
 msgid "Topic"
 msgstr "主题"
 
-#: src/ZWiki/skins/dtmlmessages.pt:86
+#: src/ZWiki/skins/dtmlmessages.pt:88
 msgid "Last updated"
 msgstr "最近更新"
 
-#: src/ZWiki/skins/dtmlmessages.pt:87
+#: src/ZWiki/skins/dtmlmessages.pt:89
 msgid "Comments"
 msgstr "留言"
 
-#: src/ZWiki/skins/dtmlmessages.pt:88
+#: src/ZWiki/skins/dtmlmessages.pt:9 src/ZWiki/skins/dtmlmessages.pt:32
+#, fuzzy
+msgid "#"
+msgstr "#"
+
+#: src/ZWiki/skins/dtmlmessages.pt:90
 msgid "Views"
 msgstr "检视"
 
-#: src/ZWiki/skins/dtmlmessages.pt:89
+#: src/ZWiki/skins/dtmlmessages.pt:91
 msgid "Created"
 msgstr "建立"
 
-#: src/ZWiki/skins/dtmlmessages.pt:9 src/ZWiki/skins/dtmlmessages.pt:31
-#, fuzzy
-msgid "#"
-msgstr "#"
-
-#: src/ZWiki/skins/dtmlmessages.pt:90 src/ZWiki/skins/dtmlmessages.pt:92
+#: src/ZWiki/skins/dtmlmessages.pt:92 src/ZWiki/skins/dtmlmessages.pt:94
 msgid "by"
 msgstr "作者"
 
-#: src/ZWiki/skins/dtmlmessages.pt:91
+#: src/ZWiki/skins/dtmlmessages.pt:93
 msgid "<dtml-var lasteditinterval> ago</dtml-var>"
 msgstr "<dtml-var lasteditinterval> 之前</dtml-var>"
 
-#: src/ZWiki/skins/dtmlmessages.pt:93
+#: src/ZWiki/skins/dtmlmessages.pt:95
 msgid "on"
 msgstr "在"
 
-#: src/ZWiki/skins/zwiki/backlinks.pt:108
-msgid "Subtopics"
-msgstr "子页面"
-
-#: src/ZWiki/skins/zwiki/backlinks.pt:111
-msgid "This page has no subtopics."
-msgstr "这页没有任何子页面。"
-
-#: src/ZWiki/skins/zwiki/backlinks.pt:114
+#: src/ZWiki/skins/zwiki/backlinks.pt:102
 #, fuzzy
 msgid "Here are it's subtopics."
 msgstr "这是它的子页面:"
 
-#: src/ZWiki/skins/zwiki/backlinks.pt:117
+#: src/ZWiki/skins/zwiki/backlinks.pt:105
 #, fuzzy
 msgid "You can reorder them by clicking the ^ buttons."
 msgstr "您可以透过点选 ^ 按钮,变更子页面顺序。"
@@ -920,64 +898,61 @@
 msgid "Parents"
 msgstr "父层"
 
-#: src/ZWiki/skins/zwiki/backlinks.pt:31
+#: src/ZWiki/skins/zwiki/backlinks.pt:28
 msgid "is a top-level topic."
 msgstr "是最顶层主题。"
 
-#: src/ZWiki/skins/zwiki/backlinks.pt:32
+#: src/ZWiki/skins/zwiki/backlinks.pt:29
 msgid "is a subtopic of:"
 msgstr "子主题上层为:"
 
-#: src/ZWiki/skins/zwiki/backlinks.pt:55
+#: src/ZWiki/skins/zwiki/backlinks.pt:48
 msgid "Backlinks"
 msgstr "回溯"
 
-#: src/ZWiki/skins/zwiki/backlinks.pt:56
+#: src/ZWiki/skins/zwiki/backlinks.pt:49
 msgid "Here are the pages which link to it:"
 msgstr "底下是相关连结到的页面:"
 
-#: src/ZWiki/skins/zwiki/backlinks.pt:57
+#: src/ZWiki/skins/zwiki/backlinks.pt:50
 msgid "No other pages link to this one."
 msgstr "没有任何其它页面连到这一页。"
 
-#: src/ZWiki/skins/zwiki/backlinks.pt:82
-msgid ""
-"You can set this page's parent(s) to place it within the overall page "
-"hierarchy."
+#: src/ZWiki/skins/zwiki/backlinks.pt:70
+msgid "You can set this page's parent(s) to place it within the overall page hierarchy."
 msgstr ""
 
-#: src/ZWiki/skins/zwiki/backlinks.pt:85
-msgid ""
-"Check one or more checkboxes or enter a page name here, and click the button."
+#: src/ZWiki/skins/zwiki/backlinks.pt:73
+msgid "Check one or more checkboxes or enter a page name here, and click the button."
 msgstr ""
 
-#: src/ZWiki/skins/zwiki/backlinks.pt:88
+#: src/ZWiki/skins/zwiki/backlinks.pt:76
 msgid "Enter a page name here and click the button."
-msgstr ""
+msgstr "输入页面名然后点击按钮"
 
-#: src/ZWiki/skins/zwiki/backlinks.pt:91
-msgid ""
-"You can type just the first few letters, case and punctuation are ignored."
+#: src/ZWiki/skins/zwiki/backlinks.pt:79
+msgid "You can type just the first few letters, case and punctuation are ignored."
 msgstr ""
 
-#: src/ZWiki/skins/zwiki/backlinks.pt:98
+#: src/ZWiki/skins/zwiki/backlinks.pt:86
 msgid "Reparent"
 msgstr "变更父层"
 
+#: src/ZWiki/skins/zwiki/backlinks.pt:96
+msgid "Subtopics"
+msgstr "子页面"
+
+#: src/ZWiki/skins/zwiki/backlinks.pt:99
+msgid "This page has no subtopics."
+msgstr "这页没有任何子页面。"
+
 #: src/ZWiki/skins/zwiki/badtemplate.pt:12
 msgid "Bad template"
 msgstr ""
 
 #: src/ZWiki/skins/zwiki/badtemplate.pt:13
-msgid ""
-"There was a problem locating one of this wiki's skin templates. There may be "
-"a page or other non-page-template/non-dtml-method object with the same ID, "
-"obscuring the template. Or the template may be missing on the filesystem (an "
-"incomplete Zwiki installation)."
-msgstr ""
-"这 Wiki 的风格(skin)样板有些问题。也许有页面或其它非 ZPT / 非 DTML 方法的对"
-"象有相同 ID,隐藏在样板里头。也或许是样板在档案系统中遗漏了(安装 Zwiki 不完"
-"全造成的)。"
+msgid "There was a problem locating one of this wiki's skin templates. There may be a page or other non-page-template/non-dtml-method object with the same ID, obscuring the template. Or the template may be missing on the filesystem (an incomplete Zwiki installation)."
+msgstr "这 Wiki 的风格(skin)样板有些问题。也许有页面或其它非 ZPT / 非 DTML 方法的对象有相同 ID,隐藏在样板里头。也或许是样板在档案系统中遗漏了(安装 Zwiki 不完全造成的)。"
 
 #: src/ZWiki/skins/zwiki/commentform.pt:21
 msgid "subject"
@@ -993,8 +968,7 @@
 
 #: src/ZWiki/skins/zwiki/commentform.pt:36
 msgid "to comment (and cc any subscribers) enter text here and click add"
-msgstr ""
-"想写留言(并且给所有订阅者邮件复本)请在这里输入文字然后点选 新增(add)按钮"
+msgstr "想写留言(并且给所有订阅者邮件复本)请在这里输入文字然后点选 新增(add)按钮"
 
 #: src/ZWiki/skins/zwiki/commentform.pt:56
 msgid "${nb} subscribers"
@@ -1009,12 +983,20 @@
 msgid "add-comment"
 msgstr "新增留言"
 
-#: src/ZWiki/skins/zwiki/contentspage.pt:12
+#: src/ZWiki/skins/zwiki/contentspage.pt:10
+#: src/ZWiki/skins/zwiki/contentspage.pt:27
+#, fuzzy
+msgid "Wiki contents for"
+msgstr "快纪内容"
+
+#: src/ZWiki/skins/zwiki/contentspage.pt:13
+#: src/ZWiki/skins/zwiki/contentspage.pt:30
 msgid "Wiki contents"
 msgstr "快纪内容"
 
-#: src/ZWiki/skins/zwiki/contentspage.pt:16
-msgid "Singletons"
+#: src/ZWiki/skins/zwiki/contentspage.pt:40
+#, fuzzy
+msgid "Singletons:"
 msgstr "独立页面"
 
 #: src/ZWiki/skins/zwiki/denied.pt:12
@@ -1102,13 +1084,13 @@
 msgstr "${DYNAMIC_CONTENT}"
 
 #: src/ZWiki/skins/zwiki/editform.pt:178
-msgid "preview this edit"
-msgstr "预览这份编辑文件"
-
-#: src/ZWiki/skins/zwiki/editform.pt:178
 msgid "Preview"
 msgstr "预览"
 
+#: src/ZWiki/skins/zwiki/editform.pt:178
+msgid "preview this edit"
+msgstr "预览这份编辑文件"
+
 #: src/ZWiki/skins/zwiki/editform.pt:183
 msgid "Cancel"
 msgstr "取消"
@@ -1143,13 +1125,18 @@
 msgstr "这页快纪的名称(进行变更也许很慢!)"
 
 #: src/ZWiki/skins/zwiki/editform.pt:71
-msgid "type"
-msgstr "型态"
+msgid "markup"
+msgstr ""
 
 #: src/ZWiki/skins/zwiki/editform.pt:72
 msgid "select the formatting and rendering style for this page"
 msgstr "选择这页的格式与表现方式"
 
+#: src/ZWiki/skins/zwiki/helppage.pt:12
+#, fuzzy
+msgid "Help page"
+msgstr "辅助页面"
+
 #: src/ZWiki/skins/zwiki/links.pt:102
 msgid "(external edit)"
 msgstr "(外部编辑器修改)"
@@ -1287,13 +1274,13 @@
 msgstr "输入一页面名称并点选右边按钮(光标停驻出现相关讯息)"
 
 #: src/ZWiki/skins/zwiki/pagemanagementform.pt:45
-msgid "reparent"
-msgstr "变更父层"
-
-#: src/ZWiki/skins/zwiki/pagemanagementform.pt:45
 msgid "make this page a subtopic of the page you have entered"
 msgstr "变更这个页面成为你进入页面之下的子主题页面"
 
+#: src/ZWiki/skins/zwiki/pagemanagementform.pt:45
+msgid "reparent"
+msgstr "变更父层"
+
 #: src/ZWiki/skins/zwiki/pagemanagementform.pt:50
 msgid "rename this page to the name you have entered, updating all links"
 msgstr "变更这页面名称为您已输入的,更新所有连结"
@@ -1307,8 +1294,7 @@
 msgstr "删除!"
 
 #: src/ZWiki/skins/zwiki/pagemanagementform.pt:55
-msgid ""
-"delete this page, and redirect links to the page you have entered, if any"
+msgid "delete this page, and redirect links to the page you have entered, if any"
 msgstr "删除这个页面,如果存在你所输入的页面名称,将会转址进入"
 
 #: src/ZWiki/skins/zwiki/pagemanagementform.pt:60
@@ -1437,13 +1423,17 @@
 msgid "User options"
 msgstr "搜索选项"
 
+#~ msgid "(identifies your edits)"
+#~ msgstr "(您编辑文章时的名称)"
+
+#~ msgid "type"
+#~ msgstr "型态"
+
 #~ msgid "your edit contained a banned link pattern"
 #~ msgstr "您所编辑的内容,含有一个被拒绝出现的连结"
 
 #~ msgid "adding of external links by anonymous authors is restricted"
-#~ msgstr ""
-#~ "您所编辑的发生一个问题:这个网站不允许匿名使用者能够新增对外连结网址。请连"
-#~ "络网站管理者,以取得适当协助。"
+#~ msgstr "您所编辑的发生一个问题:这个网站不允许匿名使用者能够新增对外连结网址。请连络网站管理者,以取得适当协助。"
 
 #~ msgid "Add a ZWiki web"
 #~ msgstr "新增一快纪网站"
@@ -1457,10 +1447,7 @@
 #~ msgid "and enter"
 #~ msgstr "并输入"
 
-#~ msgid ""
-#~ "You may create a new ZWiki Page object using the form below. You may also "
-#~ "choose to upload an existing html file from your local computer by "
-#~ "clicking the <i>Browse</i> button."
+#~ msgid "You may create a new ZWiki Page object using the form below. You may also choose to upload an existing html file from your local computer by clicking the <i>Browse</i> button."
 #~ msgstr ""
 #~ "您可以用下面的表单建立新的ZWiki页面。您也可以点选 <i>浏览</i> 按钮\n"
 #~ "上传您计算机中已经存在的 HTML 档案。"
@@ -1484,9 +1471,7 @@
 #~ msgstr "回到页面"
 
 #~ msgid "help_shortname"
-#~ msgstr ""
-#~ "注意: 在一个有很多内容的Wiki页面,变更名称将会非常慢。因为其它页面有可能都"
-#~ "需要更新。"
+#~ msgstr "注意: 在一个有很多内容的Wiki页面,变更名称将会非常慢。因为其它页面有可能都需要更新。"
 
 #~ msgid "label_body_text"
 #~ msgstr "主体内容"

Modified: zope-zwiki/trunk/i18n/zh_TW.po
===================================================================
--- zope-zwiki/trunk/i18n/zh_TW.po	2007-04-08 14:54:05 UTC (rev 761)
+++ zope-zwiki/trunk/i18n/zh_TW.po	2007-04-08 14:55:27 UTC (rev 762)
@@ -1,8 +1,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: ZWiki-0-45-0\n"
-"POT-Creation-Date: Sat Sep  2 18:10:16 2006\n"
-"PO-Revision-Date: 2006-01-20 18:11+0000\n"
+"POT-Creation-Date: Tue Mar 27 14:50:46 2007\n"
+"PO-Revision-Date: 2006-09-04 01:45+0000\n"
 "Last-Translator: Simon Michael <simon at joyful.com>\n"
 "Language-Team: <zwiki at zwiki.org>\n"
 "MIME-Version: 1.0\n"
@@ -14,35 +14,31 @@
 "Preferred-encodings: utf-8\n"
 "Domain: zwiki\n"
 
-#: src/ZWiki/Admin.py:62
+#: src/ZWiki/Admin.py:58
 msgid "You are not authorized to upgrade all pages."
 msgstr "您沒有權力升級所有頁面。"
 
-#: src/ZWiki/Admin.py:63
+#: src/ZWiki/Admin.py:59
 msgid "(folder -> Manage properties)"
 msgstr "(目錄 -> 管理性質)"
 
-#: src/ZWiki/Diff.py:174
+#: src/ZWiki/Diff.py:179
 #, fuzzy
 msgid "You are not authorized to reparent this ZWiki Page."
 msgstr "您沒有權力刪除此頁。"
 
-#: src/ZWiki/Diff.py:180 src/ZWiki/plugins/tracker/tracker.py:332
+#: src/ZWiki/Diff.py:185 src/ZWiki/plugins/tracker/tracker.py:333
 #, fuzzy
 msgid "You are not authorized to rename this ZWiki Page."
 msgstr "您沒有權力刪除此頁。"
 
-#: src/ZWiki/Editing.py:156 src/ZWiki/Editing.py:294 src/ZWiki/Views.py:332
-#: src/ZWiki/Views.py:435 src/ZWiki/plugins/tracker/tracker.py:321
-msgid ""
-"Sorry, this wiki doesn't allow anonymous edits. Please configure a username "
-"in options first."
+#: src/ZWiki/Editing.py:156 src/ZWiki/Editing.py:294 src/ZWiki/Views.py:336
+#: src/ZWiki/Views.py:439 src/ZWiki/plugins/tracker/tracker.py:322
+msgid "Sorry, this wiki doesn't allow anonymous edits. Please configure a username in options first."
 msgstr ""
 
 #: src/ZWiki/Editing.py:327
-msgid ""
-"You are not authorized to reparent or change subtopics links on this ZWiki "
-"Page."
+msgid "You are not authorized to reparent or change subtopics links on this ZWiki Page."
 msgstr "您沒有權力在這頁更動父頁或子主題連結。"
 
 #: src/ZWiki/Editing.py:349
@@ -50,9 +46,9 @@
 msgstr "您沒有權力變更頁面型態。"
 
 #: src/ZWiki/Editing.py:383 src/ZWiki/Editing.py:410
-#: src/ZWiki/plugins/tracker/tracker.py:340
-#: src/ZWiki/plugins/tracker/tracker.py:347
-#: src/ZWiki/plugins/tracker/tracker.py:354
+#: src/ZWiki/plugins/tracker/tracker.py:344
+#: src/ZWiki/plugins/tracker/tracker.py:351
+#: src/ZWiki/plugins/tracker/tracker.py:358
 msgid "You are not authorized to edit this ZWiki Page."
 msgstr "您沒有權力修改此頁。"
 
@@ -61,8 +57,7 @@
 msgstr "您沒有權力刪除此頁。"
 
 #: src/ZWiki/Editing.py:563
-msgid ""
-"This page was renamed to %s. You can delete this one if no longer needed.\n"
+msgid "This page was renamed to %s. You can delete this one if no longer needed.\n"
 msgstr "這頁已被改名為 %s。如果此頁不需要,您可以刪除。\n"
 
 #: src/ZWiki/Editing.py:659
@@ -83,111 +78,103 @@
 
 #: src/ZWiki/Editing.py:830
 #, fuzzy
-msgid ""
-"your edit contained a banned link pattern. Please contact the site "
-"administrator for help."
+msgid "your edit contained a banned link pattern. Please contact the site administrator for help."
 msgstr "發生一個問題: %s。請聯繫管理者,協助處理這問題。"
 
 #: src/ZWiki/Editing.py:841
 msgid "exceeded max_anonymous_links"
-msgstr ""
-"您所編輯的發生一個問題:它包含一個被阻擋的連結(網址)樣式。請連絡網站管理"
-"者,以取得適當協助。"
+msgstr "您所編輯的發生一個問題:它包含一個被阻擋的連結(網址)樣式。請連絡網站管理者,以取得適當協助。"
 
 #: src/ZWiki/Editing.py:842
-msgid ""
-"adding of external links by unidentified users is restricted. Please back up "
-"and remove some of the http urls you added, or contact the site "
-"administrator for help."
+msgid "adding of external links by unidentified users is restricted. Please back up and remove some of the http urls you added, or contact the site administrator for help."
 msgstr ""
 
 #: src/ZWiki/Editing.py:853
 #, fuzzy
 msgid "exceeded max_identified_links"
-msgstr ""
-"您所編輯的發生一個問題:它包含一個被阻擋的連結(網址)樣式。請連絡網站管理"
-"者,以取得適當協助。"
+msgstr "您所編輯的發生一個問題:它包含一個被阻擋的連結(網址)樣式。請連絡網站管理者,以取得適當協助。"
 
 #: src/ZWiki/Editing.py:854
-msgid ""
-"adding of external links is restricted, even for identified users. Please "
-"back up and remove some of the http urls you added, or contact the site "
-"administrator for help."
+msgid "adding of external links is restricted, even for identified users. Please back up and remove some of the http urls you added, or contact the site administrator for help."
 msgstr ""
 
-#: src/ZWiki/Mail.py:506 src/ZWiki/skins/dtmlmessages.pt:58
+#: src/ZWiki/Mail.py:506 src/ZWiki/skins/dtmlmessages.pt:60
 msgid "anonymous"
 msgstr "訪客"
 
-#: src/ZWiki/OutlineSupport.py:843 src/ZWiki/skins/zwiki/links.pt:56
+#: src/ZWiki/OutlineSupport.py:378
+msgid "Sorry, this wiki doesn't allow anonymous reparenting. Please configure a username in options first."
+msgstr ""
+
+#: src/ZWiki/OutlineSupport.py:878 src/ZWiki/skins/zwiki/links.pt:56
 msgid "which pages link to this one ?"
 msgstr "那個頁面連結到這一頁?"
 
-#: src/ZWiki/OutlineSupport.py:851
+#: src/ZWiki/OutlineSupport.py:886
 msgid "You are here"
 msgstr "您現在位置"
 
-#: src/ZWiki/Utils.py:465
+#: src/ZWiki/Utils.py:487
 msgid "years"
 msgstr "å¹´"
 
-#: src/ZWiki/Utils.py:465
+#: src/ZWiki/Utils.py:487
 msgid "year"
 msgstr "å¹´"
 
-#: src/ZWiki/Utils.py:467
+#: src/ZWiki/Utils.py:489
 msgid "month"
 msgstr "月"
 
-#: src/ZWiki/Utils.py:467
+#: src/ZWiki/Utils.py:489
 msgid "months"
 msgstr "月"
 
-#: src/ZWiki/Utils.py:469
+#: src/ZWiki/Utils.py:491
 msgid "weeks"
 msgstr "週"
 
-#: src/ZWiki/Utils.py:469
+#: src/ZWiki/Utils.py:491
 msgid "week"
 msgstr "週"
 
-#: src/ZWiki/Utils.py:471
+#: src/ZWiki/Utils.py:493
 msgid "day"
 msgstr "天"
 
-#: src/ZWiki/Utils.py:471
+#: src/ZWiki/Utils.py:493
 msgid "days"
 msgstr "天"
 
-#: src/ZWiki/Utils.py:473
+#: src/ZWiki/Utils.py:495
 msgid "hours"
 msgstr "小時"
 
-#: src/ZWiki/Utils.py:473
+#: src/ZWiki/Utils.py:495
 msgid "hour"
 msgstr "小時"
 
-#: src/ZWiki/Utils.py:475
+#: src/ZWiki/Utils.py:497
 msgid "minute"
 msgstr "分"
 
-#: src/ZWiki/Utils.py:475
+#: src/ZWiki/Utils.py:497
 msgid "minutes"
 msgstr "分"
 
-#: src/ZWiki/Utils.py:477
+#: src/ZWiki/Utils.py:499
 msgid "second"
 msgstr "秒"
 
-#: src/ZWiki/Utils.py:477
+#: src/ZWiki/Utils.py:499
 msgid "seconds"
 msgstr "秒"
 
-#: src/ZWiki/Views.py:346
+#: src/ZWiki/Views.py:350
 msgid "Page is locked"
 msgstr "頁面被鎖"
 
-#: src/ZWiki/Views.py:357
+#: src/ZWiki/Views.py:361
 msgid ""
 "\n"
 "            This page has a webDAV lock. Someone is probably editing it\n"
@@ -204,60 +191,58 @@
 "            來,以文字的方式拷貝,好做為重新修改的參考。\n"
 "            "
 
-#: src/ZWiki/Views.py:364
+#: src/ZWiki/Views.py:368
 msgid "To discard your changes and try again, click OK."
 msgstr "放棄您變更的內容,並且再試一次,點選確認按鈕(OK)。"
 
-#: src/ZWiki/Views.py:393
+#: src/ZWiki/Views.py:397
 msgid "Edit conflict"
 msgstr "修改衝突"
 
-#: src/ZWiki/Views.py:413
+#: src/ZWiki/Views.py:417
 msgid "Someone else has saved this page while you were editing"
 msgstr "當您修改時,已經有人存入新的頁面"
 
-#: src/ZWiki/Views.py:414
+#: src/ZWiki/Views.py:418
 msgid "To resolve the conflict, do this"
 msgstr "要解決衝突問題,請按以下步驟"
 
-#: src/ZWiki/Views.py:415
+#: src/ZWiki/Views.py:419
 msgid "Click your browser's back button"
 msgstr "點選您瀏覽器的上ㄧ頁按鈕(Back)"
 
-#: src/ZWiki/Views.py:416
+#: src/ZWiki/Views.py:420
 msgid "Copy your recent edits to the clipboard"
 msgstr "複製您最近修改的內容到剪貼簿"
 
-#: src/ZWiki/Views.py:417
+#: src/ZWiki/Views.py:421
 msgid "Click your browser's refresh button"
 msgstr "點選您瀏覽器更新頁面按鈕(Refresh)"
 
-#: src/ZWiki/Views.py:418
+#: src/ZWiki/Views.py:422
 msgid "Paste in your edits again, being mindful of the latest changes"
 msgstr "貼上您所修改的內容,在最新變更的內容裡頭"
 
-#: src/ZWiki/Views.py:419
+#: src/ZWiki/Views.py:423
 msgid "Click the Change button again"
 msgstr "再按一次變更按鈕(Change)"
 
-#: src/ZWiki/Views.py:420 src/ZWiki/skins/zwiki/editform.pt:163
+#: src/ZWiki/Views.py:424 src/ZWiki/skins/zwiki/editform.pt:163
 msgid "or"
 msgstr "或"
 
-#: src/ZWiki/Views.py:421
+#: src/ZWiki/Views.py:425
 msgid "To discard your changes and start again, click OK"
 msgstr "放棄所有您變更的內容,並重新再讀一次,點選確認按鈕(OK)"
 
-#: src/ZWiki/Views.py:490
+#: src/ZWiki/Views.py:501
 msgid ""
 "\n"
-"        Access keys can be accessed in mozilla-based browsers by pressing "
-"alt-<key>\n"
+"        Access keys can be accessed in mozilla-based browsers by pressing alt-<key>\n"
 "        IE users: must also press enter\n"
 "        Mac users: command-<key>\n"
 "        Opera users: shift-escape-<key>\n"
-"        These won't work here, back up to the previous page to try them "
-"out.\n"
+"        These won't work here, back up to the previous page to try them out.\n"
 "\n"
 "        0    show these access key assignments\n"
 "\n"
@@ -273,10 +258,8 @@
 "        s    go to search field\n"
 "        \n"
 "        page functions:\n"
-"        +    (in a plone/cmf site with skin switching set up) use zwiki's "
-"plone/cmf skin\n"
-"        -    (in a plone/cmf site with skin switching set up) use zwiki's "
-"standard skin\n"
+"        +    (in a plone/cmf site with skin switching set up) use zwiki's plone/cmf skin\n"
+"        -    (in a plone/cmf site with skin switching set up) use zwiki's standard skin\n"
 "        v    view page\n"
 "        m    mail subscription\n"
 "        b    show backlinks (links to this page)\n"
@@ -352,32 +335,31 @@
 "        p    前一修改\n"
 "        "
 
-#: src/ZWiki/Wikis.py:49
-msgid "Unknown wiki type"
-msgstr ""
-
-#: src/ZWiki/ZWikiPage.py:675
+#: src/ZWiki/ZWikiPage.py:744
 msgid "create this page"
 msgstr "建立頁面"
 
-#: src/ZWiki/ZWikiPage.py:798 src/ZWiki/ZWikiPage.py:814
-#: src/ZWiki/ZWikiPage.py:817
+#: src/ZWiki/ZWikiPage.py:872 src/ZWiki/ZWikiPage.py:887
 msgid "last edited %(interval)s ago"
 msgstr "%(interval)s 前修改"
 
-#: src/ZWiki/ZWikiPage.py:809
+#: src/ZWiki/ZWikiPage.py:882
 msgid "show last edit"
 msgstr "顯示最新修改"
 
-#: src/ZWiki/ZWikiPage.py:826 src/ZWiki/ZWikiPage.py:828
+#: src/ZWiki/ZWikiPage.py:897 src/ZWiki/ZWikiPage.py:899
 msgid "by %(editor)s"
 msgstr "作者 %(editor)s"
 
-#: src/ZWiki/__init__.py:34
+#: src/ZWiki/__init__.py:200
+msgid "Unknown wiki type"
+msgstr ""
+
+#: src/ZWiki/__init__.py:39
 msgid "No need to add a Zwiki Outline Cache"
 msgstr "不需要新增 Zwiki 大綱快取"
 
-#: src/ZWiki/__init__.py:35
+#: src/ZWiki/__init__.py:40
 msgid ""
 "Zwiki Outline Cache appears in the ZMI Add menu\n"
 "        for implementation reasons, but should not be added directly.\n"
@@ -393,6 +375,10 @@
 msgid "comments"
 msgstr "留言"
 
+#: src/ZWiki/pagetypes/html.py:50 src/ZWiki/pagetypes/rst.py:85
+msgid "reply"
+msgstr "回覆"
+
 #: src/ZWiki/pagetypes/moin.py:1990
 msgid "Expected \"=\" to follow \"%(token)s\""
 msgstr "預期在 \"%(token)s\" 之後是 \"=\""
@@ -429,10 +415,6 @@
 msgid "Expected a color value \"%(arg)s\" after \"%(key)s\""
 msgstr "期待在 \"%(key)s\" 之後的 \"%(args)s\" 為色彩指定值"
 
-#: src/ZWiki/pagetypes/rst.py:85
-msgid "reply"
-msgstr "回覆"
-
 #: src/ZWiki/plugins/latexwiki/wikis/latexwiki/diffform.pt:127
 #: src/ZWiki/plugins/mathaction/wikis/mathaction/old-diffform.pt:127
 msgid "full history"
@@ -460,7 +442,7 @@
 
 #: src/ZWiki/plugins/latexwiki/wikis/latexwiki/wikipage.pt:169
 msgid "show plone skin"
-msgstr ""
+msgstr "顯示Plone外觀"
 
 #: src/ZWiki/plugins/latexwiki/wikis/latexwiki/wikipage.pt:172
 #, fuzzy
@@ -474,7 +456,7 @@
 
 #: src/ZWiki/plugins/latexwiki/wikis/latexwiki/wikipage.pt:179
 msgid "full"
-msgstr ""
+msgstr "完全"
 
 #: src/ZWiki/plugins/latexwiki/wikis/latexwiki/wikipage.pt:180
 #, fuzzy
@@ -488,11 +470,11 @@
 
 #: src/ZWiki/plugins/latexwiki/wikis/latexwiki/wikipage.pt:187
 msgid "show only essential features"
-msgstr ""
+msgstr "只顯示必要功能"
 
 #: src/ZWiki/plugins/latexwiki/wikis/latexwiki/wikipage.pt:193
 msgid "minimal"
-msgstr ""
+msgstr "極簡"
 
 #: src/ZWiki/plugins/latexwiki/wikis/latexwiki/wikipage.pt:507
 #, fuzzy
@@ -514,7 +496,7 @@
 msgstr "標題"
 
 #: src/ZWiki/plugins/tracker/filterissues.pt:12
-#: src/ZWiki/skins/dtmlmessages.pt:30
+#: src/ZWiki/skins/dtmlmessages.pt:31
 msgid "Filter issues"
 msgstr "過濾事例"
 
@@ -526,61 +508,61 @@
 msgid "Issue tracker"
 msgstr "事例追蹤"
 
-#: src/ZWiki/plugins/tracker/tracker.py:361
+#: src/ZWiki/plugins/tracker/tracker.py:365
 #, fuzzy
 msgid "You are not authorized to comment on this ZWiki Page."
 msgstr "您沒有權力修改此頁。"
 
-#: src/ZWiki/skins/dtmlmessages.pt:10 src/ZWiki/skins/dtmlmessages.pt:32
+#: src/ZWiki/skins/dtmlmessages.pt:10 src/ZWiki/skins/dtmlmessages.pt:33
 #, fuzzy
+msgid "name"
+msgstr "名稱,"
+
+#: src/ZWiki/skins/dtmlmessages.pt:11 src/ZWiki/skins/dtmlmessages.pt:34
+#, fuzzy
 msgid "category"
 msgstr "分類"
 
-#: src/ZWiki/skins/dtmlmessages.pt:11 src/ZWiki/skins/dtmlmessages.pt:33
+#: src/ZWiki/skins/dtmlmessages.pt:12 src/ZWiki/skins/dtmlmessages.pt:35
 #, fuzzy
 msgid "severity"
 msgstr "程度"
 
-#: src/ZWiki/skins/dtmlmessages.pt:12 src/ZWiki/skins/dtmlmessages.pt:34
+#: src/ZWiki/skins/dtmlmessages.pt:13 src/ZWiki/skins/dtmlmessages.pt:36
 #, fuzzy
 msgid "status"
 msgstr "狀態"
 
-#: src/ZWiki/skins/dtmlmessages.pt:13 src/ZWiki/skins/dtmlmessages.pt:35
+#: src/ZWiki/skins/dtmlmessages.pt:14 src/ZWiki/skins/dtmlmessages.pt:37
 #, fuzzy
 msgid "age"
 msgstr "頁面"
 
-#: src/ZWiki/skins/dtmlmessages.pt:14 src/ZWiki/skins/dtmlmessages.pt:36
+#: src/ZWiki/skins/dtmlmessages.pt:15 src/ZWiki/skins/dtmlmessages.pt:38
 #, fuzzy
 msgid "modified"
 msgstr "變更"
 
-#: src/ZWiki/skins/dtmlmessages.pt:15
+#: src/ZWiki/skins/dtmlmessages.pt:16
 #, fuzzy
 msgid "Add a new issue:"
 msgstr "新增一則事例:"
 
-#: src/ZWiki/skins/dtmlmessages.pt:16
+#: src/ZWiki/skins/dtmlmessages.pt:17
 #, fuzzy
 msgid "Name:"
 msgstr "名稱,"
 
-#: src/ZWiki/skins/dtmlmessages.pt:17
+#: src/ZWiki/skins/dtmlmessages.pt:18
 #, fuzzy
 msgid "Category:"
 msgstr "分類:"
 
-#: src/ZWiki/skins/dtmlmessages.pt:18
+#: src/ZWiki/skins/dtmlmessages.pt:19
 #, fuzzy
 msgid "Severity:"
 msgstr "程度:"
 
-#: src/ZWiki/skins/dtmlmessages.pt:19
-#, fuzzy
-msgid "Status:"
-msgstr "狀態:"
-
 #: src/ZWiki/skins/dtmlmessages.pt:2
 #, fuzzy
 msgid "Here are the wiki's issue pages."
@@ -588,325 +570,320 @@
 
 #: src/ZWiki/skins/dtmlmessages.pt:20
 #, fuzzy
+msgid "Status:"
+msgstr "狀態:"
+
+#: src/ZWiki/skins/dtmlmessages.pt:21
+#, fuzzy
 msgid "Details:"
 msgstr "細節:"
 
-#: src/ZWiki/skins/dtmlmessages.pt:21
+#: src/ZWiki/skins/dtmlmessages.pt:22
 #, fuzzy
 msgid "add issue"
 msgstr "事例"
 
-#: src/ZWiki/skins/dtmlmessages.pt:22
+#: src/ZWiki/skins/dtmlmessages.pt:23
 #, fuzzy
 msgid "More advanced"
 msgstr "更多進階的"
 
-#: src/ZWiki/skins/dtmlmessages.pt:23
+#: src/ZWiki/skins/dtmlmessages.pt:24
 #, fuzzy
 msgid "issue tracker"
 msgstr "事例追蹤"
 
-#: src/ZWiki/skins/dtmlmessages.pt:24
+#: src/ZWiki/skins/dtmlmessages.pt:25
 #, fuzzy
 msgid "search options"
 msgstr "儲存設定"
 
-#: src/ZWiki/skins/dtmlmessages.pt:25
+#: src/ZWiki/skins/dtmlmessages.pt:26
 #, fuzzy
 msgid "Name contains any of:"
 msgstr "頁面名稱包含任意的:"
 
-#: src/ZWiki/skins/dtmlmessages.pt:26
+#: src/ZWiki/skins/dtmlmessages.pt:27
 #, fuzzy
 msgid "Page text contains any of:"
 msgstr "頁面文字包含任意的:"
 
-#: src/ZWiki/skins/dtmlmessages.pt:27
+#: src/ZWiki/skins/dtmlmessages.pt:28
 #, fuzzy
 msgid "Categories:"
 msgstr "分類:"
 
-#: src/ZWiki/skins/dtmlmessages.pt:28
+#: src/ZWiki/skins/dtmlmessages.pt:29
 #, fuzzy
 msgid "Severities:"
 msgstr "程度:"
 
-#: src/ZWiki/skins/dtmlmessages.pt:29
-#, fuzzy
-msgid "Statuses:"
-msgstr "狀態:"
-
 #: src/ZWiki/skins/dtmlmessages.pt:3
 #, fuzzy
 msgid "Enter a search term, click the numbers to the right,"
 msgstr "輸入搜尋的字詞, 或點選右邊的數字, 或"
 
-#: src/ZWiki/skins/dtmlmessages.pt:37
+#: src/ZWiki/skins/dtmlmessages.pt:30
 #, fuzzy
+msgid "Statuses:"
+msgstr "狀態:"
+
+#: src/ZWiki/skins/dtmlmessages.pt:39
+#, fuzzy
 msgid "Submitted by"
 msgstr "提出者"
 
-#: src/ZWiki/skins/dtmlmessages.pt:38
+#: src/ZWiki/skins/dtmlmessages.pt:4
 #, fuzzy
+msgid "filter issues"
+msgstr "過濾事例"
+
+#: src/ZWiki/skins/dtmlmessages.pt:40
+#, fuzzy
 msgid "Name"
 msgstr "名稱,"
 
-#: src/ZWiki/skins/dtmlmessages.pt:39
+#: src/ZWiki/skins/dtmlmessages.pt:41
 #, fuzzy
 msgid "Category"
 msgstr "分類"
 
-#: src/ZWiki/skins/dtmlmessages.pt:4
+#: src/ZWiki/skins/dtmlmessages.pt:42
 #, fuzzy
-msgid "filter issues"
-msgstr "過濾事例"
-
-#: src/ZWiki/skins/dtmlmessages.pt:40
-#, fuzzy
 msgid "Severity"
 msgstr "程度"
 
-#: src/ZWiki/skins/dtmlmessages.pt:41
+#: src/ZWiki/skins/dtmlmessages.pt:43
 #, fuzzy
 msgid "Status"
 msgstr "狀態"
 
-#: src/ZWiki/skins/dtmlmessages.pt:42
+#: src/ZWiki/skins/dtmlmessages.pt:44
 #, fuzzy
 msgid "Optional subject"
 msgstr "變更註記(選項)"
 
-#: src/ZWiki/skins/dtmlmessages.pt:43
+#: src/ZWiki/skins/dtmlmessages.pt:45
 #, fuzzy
 msgid "Optional comment"
 msgstr "變更註記(選項)"
 
-#: src/ZWiki/skins/dtmlmessages.pt:44 src/ZWiki/skins/dtmlmessages.pt:45
+#: src/ZWiki/skins/dtmlmessages.pt:46 src/ZWiki/skins/dtmlmessages.pt:47
 #, fuzzy
 msgid "Add ZWiki"
 msgstr "新增快紀"
 
-#: src/ZWiki/skins/dtmlmessages.pt:46
+#: src/ZWiki/skins/dtmlmessages.pt:48
 #, fuzzy
 msgid "Id:"
 msgstr "名稱"
 
-#: src/ZWiki/skins/dtmlmessages.pt:47
+#: src/ZWiki/skins/dtmlmessages.pt:49
 #, fuzzy
 msgid "Title:"
 msgstr "標題"
 
-#: src/ZWiki/skins/dtmlmessages.pt:48
+#: src/ZWiki/skins/dtmlmessages.pt:5
+msgid "browse open issues"
+msgstr ""
+
+#: src/ZWiki/skins/dtmlmessages.pt:50
 msgid "Template:"
 msgstr ""
 
-#: src/ZWiki/skins/dtmlmessages.pt:49
+#: src/ZWiki/skins/dtmlmessages.pt:51
 #, fuzzy
 msgid "Add wiki"
 msgstr "新增快紀"
 
-#: src/ZWiki/skins/dtmlmessages.pt:5
-msgid "browse open issues"
-msgstr ""
-
-#: src/ZWiki/skins/dtmlmessages.pt:50
+#: src/ZWiki/skins/dtmlmessages.pt:52
 msgid "Pages changed in the last"
 msgstr "最近更動的頁面"
 
-#: src/ZWiki/skins/dtmlmessages.pt:51
+#: src/ZWiki/skins/dtmlmessages.pt:53
 msgid "Recently changed pages, with summaries"
 msgstr "最近變更的頁面, 包含概略的摘要"
 
-#: src/ZWiki/skins/dtmlmessages.pt:52
+#: src/ZWiki/skins/dtmlmessages.pt:54
 msgid "Show summaries ?"
 msgstr "顯示摘要?"
 
-#: src/ZWiki/skins/dtmlmessages.pt:53
+#: src/ZWiki/skins/dtmlmessages.pt:55
 msgid "Refresh"
 msgstr "æ›´æ–°"
 
-#: src/ZWiki/skins/dtmlmessages.pt:54
+#: src/ZWiki/skins/dtmlmessages.pt:56
 msgid "Page"
 msgstr "頁面"
 
-#: src/ZWiki/skins/dtmlmessages.pt:55
+#: src/ZWiki/skins/dtmlmessages.pt:57
 msgid "Edited&nbsp;by"
 msgstr "修改者"
 
-#: src/ZWiki/skins/dtmlmessages.pt:56
+#: src/ZWiki/skins/dtmlmessages.pt:58
 msgid "Time"
 msgstr "時間"
 
-#: src/ZWiki/skins/dtmlmessages.pt:57
+#: src/ZWiki/skins/dtmlmessages.pt:59
 msgid "NEW"
 msgstr "æ–°çš„"
 
-#: src/ZWiki/skins/dtmlmessages.pt:59
-msgid "Pages marked (NEW) have been created within the last week"
-msgstr "頁面註記(新的)表示是在最近一週內所建立的"
-
 #: src/ZWiki/skins/dtmlmessages.pt:6
 #, fuzzy
 msgid "search issues"
 msgstr "過濾事例"
 
-#: src/ZWiki/skins/dtmlmessages.pt:60
+#: src/ZWiki/skins/dtmlmessages.pt:61
+msgid "Pages marked (NEW) have been created within the last week"
+msgstr "頁面註記(新的)表示是在最近一週內所建立的"
+
+#: src/ZWiki/skins/dtmlmessages.pt:62
 msgid "Enter a word or phrase and hit enter to search the entire wiki."
 msgstr "輸入一個字或一段話,並且點選 輸入 開始搜尋整個wiki。"
 
-#: src/ZWiki/skins/dtmlmessages.pt:61
+#: src/ZWiki/skins/dtmlmessages.pt:63
 msgid "This is the same as using the search field at top right."
 msgstr "這和在右上角搜尋欄位的作用是一樣的。"
 
-#: src/ZWiki/skins/dtmlmessages.pt:62
+#: src/ZWiki/skins/dtmlmessages.pt:64
 msgid "Tips: A single word works best for matching page names."
 msgstr "技巧:使用單獨的字,對於按頁面名稱搜尋來說最好。"
 
-#: src/ZWiki/skins/dtmlmessages.pt:63
-msgid ""
-"Case-insensitivity and wildcards may be supported depending on your catalog "
-"configuration."
+#: src/ZWiki/skins/dtmlmessages.pt:65
+msgid "Case-insensitivity and wildcards may be supported depending on your catalog configuration."
 msgstr "大小寫無關與萬用字元,依您的目錄索引設定而定,也許會被支援。"
 
-#: src/ZWiki/skins/dtmlmessages.pt:64
+#: src/ZWiki/skins/dtmlmessages.pt:66
 msgid "Leave it blank to list all pages."
 msgstr "如果讓它空白的話,可列出所有頁面。"
 
-#: src/ZWiki/skins/dtmlmessages.pt:65 src/ZWiki/skins/dtmlmessages.pt:66
+#: src/ZWiki/skins/dtmlmessages.pt:67 src/ZWiki/skins/dtmlmessages.pt:68
 msgid "Search"
 msgstr "搜尋"
 
-#: src/ZWiki/skins/dtmlmessages.pt:67
+#: src/ZWiki/skins/dtmlmessages.pt:69
 msgid "Page names matching"
 msgstr "頁面名稱相符"
 
-#: src/ZWiki/skins/dtmlmessages.pt:68
-msgid "Text matching"
-msgstr "文字相符"
-
-#: src/ZWiki/skins/dtmlmessages.pt:69
-msgid "Thorough (non-catalog) search for text matching"
-msgstr "透過(非編目方式)搜尋得到文字相符"
-
 #: src/ZWiki/skins/dtmlmessages.pt:7
 #, fuzzy
 msgid "recent"
 msgstr "變更父層"
 
 #: src/ZWiki/skins/dtmlmessages.pt:70
+msgid "Text matching"
+msgstr "文字相符"
+
+#: src/ZWiki/skins/dtmlmessages.pt:71
+msgid "Thorough (non-catalog) search for text matching"
+msgstr "透過(非編目方式)搜尋得到文字相符"
+
+#: src/ZWiki/skins/dtmlmessages.pt:72
 msgid "Set your preferences for this wiki:"
 msgstr "設定在這個站台個人相關偏好。"
 
-#: src/ZWiki/skins/dtmlmessages.pt:71
+#: src/ZWiki/skins/dtmlmessages.pt:73
 msgid "User name:"
 msgstr "使用者名稱:"
 
-#: src/ZWiki/skins/dtmlmessages.pt:72
-msgid "(identifies your edits)"
-msgstr "(您編輯文章時的名稱)"
+#: src/ZWiki/skins/dtmlmessages.pt:74
+msgid "(identifies your edits, saves your votes, may be required)"
+msgstr ""
 
-#: src/ZWiki/skins/dtmlmessages.pt:73
+#: src/ZWiki/skins/dtmlmessages.pt:75
 msgid "Email address:"
 msgstr "電子郵件:"
 
-#: src/ZWiki/skins/dtmlmessages.pt:74
+#: src/ZWiki/skins/dtmlmessages.pt:76
 msgid "(allows mail subscription)"
 msgstr "(得以訂閱郵件)"
 
-#: src/ZWiki/skins/dtmlmessages.pt:75
+#: src/ZWiki/skins/dtmlmessages.pt:77
 msgid "Your time zone:"
 msgstr "您所在時區:"
 
-#: src/ZWiki/skins/dtmlmessages.pt:76
+#: src/ZWiki/skins/dtmlmessages.pt:78
 msgid "(localizes most times)"
 msgstr "(選擇接近的時間)"
 
-#: src/ZWiki/skins/dtmlmessages.pt:77
+#: src/ZWiki/skins/dtmlmessages.pt:79
 msgid "Edit form height:"
 msgstr "修改欄位高度:"
 
-#: src/ZWiki/skins/dtmlmessages.pt:78
-msgid "(adjusts form size)"
-msgstr "(調整表格大小)"
-
-#: src/ZWiki/skins/dtmlmessages.pt:79
-msgid "Save options"
-msgstr "儲存設定"
-
 #: src/ZWiki/skins/dtmlmessages.pt:8
 #, fuzzy
 msgid "all"
 msgstr "全部"
 
 #: src/ZWiki/skins/dtmlmessages.pt:80
+msgid "(adjusts form size)"
+msgstr "(調整表格大小)"
+
+#: src/ZWiki/skins/dtmlmessages.pt:81
+msgid "Save options"
+msgstr "儲存設定"
+
+#: src/ZWiki/skins/dtmlmessages.pt:82
 msgid "Forget options"
 msgstr "預設設定"
 
-#: src/ZWiki/skins/dtmlmessages.pt:81 src/ZWiki/skins/dtmlmessages.pt:82
+#: src/ZWiki/skins/dtmlmessages.pt:83 src/ZWiki/skins/dtmlmessages.pt:84
 msgid "Add ZWiki Page"
 msgstr "新增快紀頁面"
 
-#: src/ZWiki/skins/dtmlmessages.pt:83
+#: src/ZWiki/skins/dtmlmessages.pt:85
 #, fuzzy
 msgid "Page&nbsp;name:"
 msgstr "頁面名稱"
 
-#: src/ZWiki/skins/dtmlmessages.pt:84
+#: src/ZWiki/skins/dtmlmessages.pt:86
 #, fuzzy
 msgid "Add wiki page"
 msgstr "新增快紀頁面"
 
-#: src/ZWiki/skins/dtmlmessages.pt:85
+#: src/ZWiki/skins/dtmlmessages.pt:87
 msgid "Topic"
 msgstr "主題"
 
-#: src/ZWiki/skins/dtmlmessages.pt:86
+#: src/ZWiki/skins/dtmlmessages.pt:88
 msgid "Last updated"
 msgstr "最近更新"
 
-#: src/ZWiki/skins/dtmlmessages.pt:87
+#: src/ZWiki/skins/dtmlmessages.pt:89
 msgid "Comments"
 msgstr "留言"
 
-#: src/ZWiki/skins/dtmlmessages.pt:88
+#: src/ZWiki/skins/dtmlmessages.pt:9 src/ZWiki/skins/dtmlmessages.pt:32
+#, fuzzy
+msgid "#"
+msgstr "#"
+
+#: src/ZWiki/skins/dtmlmessages.pt:90
 msgid "Views"
 msgstr "檢視"
 
-#: src/ZWiki/skins/dtmlmessages.pt:89
+#: src/ZWiki/skins/dtmlmessages.pt:91
 msgid "Created"
 msgstr "建立"
 
-#: src/ZWiki/skins/dtmlmessages.pt:9 src/ZWiki/skins/dtmlmessages.pt:31
-#, fuzzy
-msgid "#"
-msgstr "#"
-
-#: src/ZWiki/skins/dtmlmessages.pt:90 src/ZWiki/skins/dtmlmessages.pt:92
+#: src/ZWiki/skins/dtmlmessages.pt:92 src/ZWiki/skins/dtmlmessages.pt:94
 msgid "by"
 msgstr "作者"
 
-#: src/ZWiki/skins/dtmlmessages.pt:91
+#: src/ZWiki/skins/dtmlmessages.pt:93
 msgid "<dtml-var lasteditinterval> ago</dtml-var>"
 msgstr "<dtml-var lasteditinterval> 之前</dtml-var>"
 
-#: src/ZWiki/skins/dtmlmessages.pt:93
+#: src/ZWiki/skins/dtmlmessages.pt:95
 msgid "on"
 msgstr "在"
 
-#: src/ZWiki/skins/zwiki/backlinks.pt:108
-msgid "Subtopics"
-msgstr "子頁面"
-
-#: src/ZWiki/skins/zwiki/backlinks.pt:111
-msgid "This page has no subtopics."
-msgstr "這頁沒有任何子頁面。"
-
-#: src/ZWiki/skins/zwiki/backlinks.pt:114
+#: src/ZWiki/skins/zwiki/backlinks.pt:102
 #, fuzzy
 msgid "Here are it's subtopics."
 msgstr "這是它的子頁面:"
 
-#: src/ZWiki/skins/zwiki/backlinks.pt:117
+#: src/ZWiki/skins/zwiki/backlinks.pt:105
 #, fuzzy
 msgid "You can reorder them by clicking the ^ buttons."
 msgstr "您可以透過點選 ^ 按鈕,變更子頁面順序。"
@@ -920,64 +897,61 @@
 msgid "Parents"
 msgstr "父層"
 
-#: src/ZWiki/skins/zwiki/backlinks.pt:31
+#: src/ZWiki/skins/zwiki/backlinks.pt:28
 msgid "is a top-level topic."
 msgstr "是最頂層主題。"
 
-#: src/ZWiki/skins/zwiki/backlinks.pt:32
+#: src/ZWiki/skins/zwiki/backlinks.pt:29
 msgid "is a subtopic of:"
 msgstr "子主題上層為:"
 
-#: src/ZWiki/skins/zwiki/backlinks.pt:55
+#: src/ZWiki/skins/zwiki/backlinks.pt:48
 msgid "Backlinks"
 msgstr "回溯"
 
-#: src/ZWiki/skins/zwiki/backlinks.pt:56
+#: src/ZWiki/skins/zwiki/backlinks.pt:49
 msgid "Here are the pages which link to it:"
 msgstr "底下是相關連結到的頁面:"
 
-#: src/ZWiki/skins/zwiki/backlinks.pt:57
+#: src/ZWiki/skins/zwiki/backlinks.pt:50
 msgid "No other pages link to this one."
 msgstr "沒有任何其他頁面連到這一頁。"
 
-#: src/ZWiki/skins/zwiki/backlinks.pt:82
-msgid ""
-"You can set this page's parent(s) to place it within the overall page "
-"hierarchy."
+#: src/ZWiki/skins/zwiki/backlinks.pt:70
+msgid "You can set this page's parent(s) to place it within the overall page hierarchy."
 msgstr ""
 
-#: src/ZWiki/skins/zwiki/backlinks.pt:85
-msgid ""
-"Check one or more checkboxes or enter a page name here, and click the button."
+#: src/ZWiki/skins/zwiki/backlinks.pt:73
+msgid "Check one or more checkboxes or enter a page name here, and click the button."
 msgstr ""
 
-#: src/ZWiki/skins/zwiki/backlinks.pt:88
+#: src/ZWiki/skins/zwiki/backlinks.pt:76
 msgid "Enter a page name here and click the button."
 msgstr ""
 
-#: src/ZWiki/skins/zwiki/backlinks.pt:91
-msgid ""
-"You can type just the first few letters, case and punctuation are ignored."
+#: src/ZWiki/skins/zwiki/backlinks.pt:79
+msgid "You can type just the first few letters, case and punctuation are ignored."
 msgstr ""
 
-#: src/ZWiki/skins/zwiki/backlinks.pt:98
+#: src/ZWiki/skins/zwiki/backlinks.pt:86
 msgid "Reparent"
 msgstr "變更父層"
 
+#: src/ZWiki/skins/zwiki/backlinks.pt:96
+msgid "Subtopics"
+msgstr "子頁面"
+
+#: src/ZWiki/skins/zwiki/backlinks.pt:99
+msgid "This page has no subtopics."
+msgstr "這頁沒有任何子頁面。"
+
 #: src/ZWiki/skins/zwiki/badtemplate.pt:12
 msgid "Bad template"
 msgstr ""
 
 #: src/ZWiki/skins/zwiki/badtemplate.pt:13
-msgid ""
-"There was a problem locating one of this wiki's skin templates. There may be "
-"a page or other non-page-template/non-dtml-method object with the same ID, "
-"obscuring the template. Or the template may be missing on the filesystem (an "
-"incomplete Zwiki installation)."
-msgstr ""
-"這 Wiki 的風格(skin)樣板有些問題。也許有頁面或其他非 ZPT / 非 DTML 方法的物"
-"件有相同 ID,隱藏在樣板裡頭。也或許是樣板在檔案系統中遺漏了(安裝 Zwiki 不完"
-"全造成的)。"
+msgid "There was a problem locating one of this wiki's skin templates. There may be a page or other non-page-template/non-dtml-method object with the same ID, obscuring the template. Or the template may be missing on the filesystem (an incomplete Zwiki installation)."
+msgstr "這 Wiki 的風格(skin)樣板有些問題。也許有頁面或其他非 ZPT / 非 DTML 方法的物件有相同 ID,隱藏在樣板裡頭。也或許是樣板在檔案系統中遺漏了(安裝 Zwiki 不完全造成的)。"
 
 #: src/ZWiki/skins/zwiki/commentform.pt:21
 msgid "subject"
@@ -993,8 +967,7 @@
 
 #: src/ZWiki/skins/zwiki/commentform.pt:36
 msgid "to comment (and cc any subscribers) enter text here and click add"
-msgstr ""
-"想寫留言(並且給所有訂閱者郵件複本)請在這裡輸入文字然後點選 新增(add)按鈕"
+msgstr "想寫留言(並且給所有訂閱者郵件複本)請在這裡輸入文字然後點選 新增(add)按鈕"
 
 #: src/ZWiki/skins/zwiki/commentform.pt:56
 msgid "${nb} subscribers"
@@ -1009,12 +982,20 @@
 msgid "add-comment"
 msgstr "新增留言"
 
-#: src/ZWiki/skins/zwiki/contentspage.pt:12
+#: src/ZWiki/skins/zwiki/contentspage.pt:10
+#: src/ZWiki/skins/zwiki/contentspage.pt:27
+#, fuzzy
+msgid "Wiki contents for"
+msgstr "快紀內容"
+
+#: src/ZWiki/skins/zwiki/contentspage.pt:13
+#: src/ZWiki/skins/zwiki/contentspage.pt:30
 msgid "Wiki contents"
 msgstr "快紀內容"
 
-#: src/ZWiki/skins/zwiki/contentspage.pt:16
-msgid "Singletons"
+#: src/ZWiki/skins/zwiki/contentspage.pt:40
+#, fuzzy
+msgid "Singletons:"
 msgstr "獨立頁面"
 
 #: src/ZWiki/skins/zwiki/denied.pt:12
@@ -1102,13 +1083,13 @@
 msgstr "${DYNAMIC_CONTENT}"
 
 #: src/ZWiki/skins/zwiki/editform.pt:178
-msgid "preview this edit"
-msgstr "預覽這份編輯文件"
-
-#: src/ZWiki/skins/zwiki/editform.pt:178
 msgid "Preview"
 msgstr "預覽"
 
+#: src/ZWiki/skins/zwiki/editform.pt:178
+msgid "preview this edit"
+msgstr "預覽這份編輯文件"
+
 #: src/ZWiki/skins/zwiki/editform.pt:183
 msgid "Cancel"
 msgstr "取消"
@@ -1143,13 +1124,18 @@
 msgstr "這頁快紀的名稱(進行變更也許很慢!)"
 
 #: src/ZWiki/skins/zwiki/editform.pt:71
-msgid "type"
-msgstr "åž‹æ…‹"
+msgid "markup"
+msgstr ""
 
 #: src/ZWiki/skins/zwiki/editform.pt:72
 msgid "select the formatting and rendering style for this page"
 msgstr "選擇這頁的格式與表現方式"
 
+#: src/ZWiki/skins/zwiki/helppage.pt:12
+#, fuzzy
+msgid "Help page"
+msgstr "輔助頁面"
+
 #: src/ZWiki/skins/zwiki/links.pt:102
 msgid "(external edit)"
 msgstr "(外部編輯器修改)"
@@ -1287,13 +1273,13 @@
 msgstr "輸入一頁面名稱並點選右邊按鈕(游標停駐出現相關訊息)"
 
 #: src/ZWiki/skins/zwiki/pagemanagementform.pt:45
-msgid "reparent"
-msgstr "變更父層"
-
-#: src/ZWiki/skins/zwiki/pagemanagementform.pt:45
 msgid "make this page a subtopic of the page you have entered"
 msgstr "變更這個頁面成為你進入頁面之下的子主題頁面"
 
+#: src/ZWiki/skins/zwiki/pagemanagementform.pt:45
+msgid "reparent"
+msgstr "變更父層"
+
 #: src/ZWiki/skins/zwiki/pagemanagementform.pt:50
 msgid "rename this page to the name you have entered, updating all links"
 msgstr "變更這頁面名稱為您已輸入的,更新所有連結"
@@ -1307,8 +1293,7 @@
 msgstr "刪除!"
 
 #: src/ZWiki/skins/zwiki/pagemanagementform.pt:55
-msgid ""
-"delete this page, and redirect links to the page you have entered, if any"
+msgid "delete this page, and redirect links to the page you have entered, if any"
 msgstr "刪除這個頁面,如果存在你所輸入的頁面名稱,將會轉址進入"
 
 #: src/ZWiki/skins/zwiki/pagemanagementform.pt:60
@@ -1437,13 +1422,17 @@
 msgid "User options"
 msgstr "儲存設定"
 
+#~ msgid "(identifies your edits)"
+#~ msgstr "(您編輯文章時的名稱)"
+
+#~ msgid "type"
+#~ msgstr "åž‹æ…‹"
+
 #~ msgid "your edit contained a banned link pattern"
 #~ msgstr "您所編輯的內容,含有一個被拒絕出現的連結"
 
 #~ msgid "adding of external links by anonymous authors is restricted"
-#~ msgstr ""
-#~ "您所編輯的發生一個問題:這個網站不允許匿名使用者能夠新增對外連結網址。請連"
-#~ "絡網站管理者,以取得適當協助。"
+#~ msgstr "您所編輯的發生一個問題:這個網站不允許匿名使用者能夠新增對外連結網址。請連絡網站管理者,以取得適當協助。"
 
 #~ msgid "Add a ZWiki web"
 #~ msgstr "新增一快紀網站"
@@ -1457,10 +1446,7 @@
 #~ msgid "and enter"
 #~ msgstr "並輸入"
 
-#~ msgid ""
-#~ "You may create a new ZWiki Page object using the form below. You may also "
-#~ "choose to upload an existing html file from your local computer by "
-#~ "clicking the <i>Browse</i> button."
+#~ msgid "You may create a new ZWiki Page object using the form below. You may also choose to upload an existing html file from your local computer by clicking the <i>Browse</i> button."
 #~ msgstr ""
 #~ "您可以用下面的表單建立新的ZWiki頁面。您也可以點選 <i>瀏覽</i> 按鈕\n"
 #~ "上傳您電腦中已經存在的 HTML 檔案。"
@@ -1484,9 +1470,7 @@
 #~ msgstr "回到頁面"
 
 #~ msgid "help_shortname"
-#~ msgstr ""
-#~ "注意: 在一個有很多內容的Wiki頁面,變更名稱將會非常慢。因為其他頁面有可能都"
-#~ "需要更新。"
+#~ msgstr "注意: 在一個有很多內容的Wiki頁面,變更名稱將會非常慢。因為其他頁面有可能都需要更新。"
 
 #~ msgid "label_body_text"
 #~ msgstr "主體內容"

Modified: zope-zwiki/trunk/i18n/zwiki.pot
===================================================================
--- zope-zwiki/trunk/i18n/zwiki.pot	2007-04-08 14:54:05 UTC (rev 761)
+++ zope-zwiki/trunk/i18n/zwiki.pot	2007-04-08 14:55:27 UTC (rev 762)
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
-"Project-Id-Version: ZWiki-0-56-0\n"
-"POT-Creation-Date: Sat Sep  2 18:10:16 2006\n"
+"Project-Id-Version: ZWiki-0-59-0rc3\n"
+"POT-Creation-Date: Tue Mar 27 14:50:46 2007\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
 "Language-Team: <zwiki at zwiki.org>\n"
@@ -14,28 +14,28 @@
 "Preferred-encodings: utf-8 latin1\n"
 "Domain: zwiki\n"
 
-#: src/ZWiki/Admin.py:62
+#: src/ZWiki/Admin.py:58
 msgid "You are not authorized to upgrade all pages."
 msgstr ""
 
-#: src/ZWiki/Admin.py:63
+#: src/ZWiki/Admin.py:59
 msgid "(folder -> Manage properties)"
 msgstr ""
 
-#: src/ZWiki/Diff.py:174
+#: src/ZWiki/Diff.py:179
 msgid "You are not authorized to reparent this ZWiki Page."
 msgstr ""
 
-#: src/ZWiki/Diff.py:180
-#: src/ZWiki/plugins/tracker/tracker.py:332
+#: src/ZWiki/Diff.py:185
+#: src/ZWiki/plugins/tracker/tracker.py:333
 msgid "You are not authorized to rename this ZWiki Page."
 msgstr ""
 
 #: src/ZWiki/Editing.py:156
 #: src/ZWiki/Editing.py:294
-#: src/ZWiki/Views.py:332
-#: src/ZWiki/Views.py:435
-#: src/ZWiki/plugins/tracker/tracker.py:321
+#: src/ZWiki/Views.py:336
+#: src/ZWiki/Views.py:439
+#: src/ZWiki/plugins/tracker/tracker.py:322
 msgid "Sorry, this wiki doesn't allow anonymous edits. Please configure a username in options first."
 msgstr ""
 
@@ -49,9 +49,9 @@
 
 #: src/ZWiki/Editing.py:383
 #: src/ZWiki/Editing.py:410
-#: src/ZWiki/plugins/tracker/tracker.py:340
-#: src/ZWiki/plugins/tracker/tracker.py:347
-#: src/ZWiki/plugins/tracker/tracker.py:354
+#: src/ZWiki/plugins/tracker/tracker.py:344
+#: src/ZWiki/plugins/tracker/tracker.py:351
+#: src/ZWiki/plugins/tracker/tracker.py:358
 msgid "You are not authorized to edit this ZWiki Page."
 msgstr ""
 
@@ -101,80 +101,84 @@
 msgstr ""
 
 #: src/ZWiki/Mail.py:506
-#: src/ZWiki/skins/dtmlmessages.pt:58
+#: src/ZWiki/skins/dtmlmessages.pt:60
 msgid "anonymous"
 msgstr ""
 
-#: src/ZWiki/OutlineSupport.py:843
+#: src/ZWiki/OutlineSupport.py:378
+msgid "Sorry, this wiki doesn't allow anonymous reparenting. Please configure a username in options first."
+msgstr ""
+
+#: src/ZWiki/OutlineSupport.py:878
 #: src/ZWiki/skins/zwiki/links.pt:56
 msgid "which pages link to this one ?"
 msgstr ""
 
-#: src/ZWiki/OutlineSupport.py:851
+#: src/ZWiki/OutlineSupport.py:886
 msgid "You are here"
 msgstr ""
 
-#: src/ZWiki/Utils.py:465
+#: src/ZWiki/Utils.py:487
 msgid "years"
 msgstr ""
 
-#: src/ZWiki/Utils.py:465
+#: src/ZWiki/Utils.py:487
 msgid "year"
 msgstr ""
 
-#: src/ZWiki/Utils.py:467
+#: src/ZWiki/Utils.py:489
 msgid "month"
 msgstr ""
 
-#: src/ZWiki/Utils.py:467
+#: src/ZWiki/Utils.py:489
 msgid "months"
 msgstr ""
 
-#: src/ZWiki/Utils.py:469
+#: src/ZWiki/Utils.py:491
 msgid "weeks"
 msgstr ""
 
-#: src/ZWiki/Utils.py:469
+#: src/ZWiki/Utils.py:491
 msgid "week"
 msgstr ""
 
-#: src/ZWiki/Utils.py:471
+#: src/ZWiki/Utils.py:493
 msgid "day"
 msgstr ""
 
-#: src/ZWiki/Utils.py:471
+#: src/ZWiki/Utils.py:493
 msgid "days"
 msgstr ""
 
-#: src/ZWiki/Utils.py:473
+#: src/ZWiki/Utils.py:495
 msgid "hours"
 msgstr ""
 
-#: src/ZWiki/Utils.py:473
+#: src/ZWiki/Utils.py:495
 msgid "hour"
 msgstr ""
 
-#: src/ZWiki/Utils.py:475
+#: src/ZWiki/Utils.py:497
 msgid "minute"
 msgstr ""
 
-#: src/ZWiki/Utils.py:475
+#: src/ZWiki/Utils.py:497
 msgid "minutes"
 msgstr ""
 
-#: src/ZWiki/Utils.py:477
+#: src/ZWiki/Utils.py:499
 msgid "second"
 msgstr ""
 
-#: src/ZWiki/Utils.py:477
+#: src/ZWiki/Utils.py:499
 msgid "seconds"
 msgstr ""
 
-#: src/ZWiki/Views.py:346
+#: src/ZWiki/Views.py:350
 msgid "Page is locked"
 msgstr ""
 
-#: src/ZWiki/Views.py:357
+#: src/ZWiki/Views.py:361
 msgid ""
 "\n"
 "            This page has a webDAV lock. Someone is probably editing it\n"
@@ -185,52 +189,52 @@
 "            "
 msgstr ""
 
-#: src/ZWiki/Views.py:364
+#: src/ZWiki/Views.py:368
 msgid "To discard your changes and try again, click OK."
 msgstr ""
 
-#: src/ZWiki/Views.py:393
+#: src/ZWiki/Views.py:397
 msgid "Edit conflict"
 msgstr ""
 
-#: src/ZWiki/Views.py:413
+#: src/ZWiki/Views.py:417
 msgid "Someone else has saved this page while you were editing"
 msgstr ""
 
-#: src/ZWiki/Views.py:414
+#: src/ZWiki/Views.py:418
 msgid "To resolve the conflict, do this"
 msgstr ""
 
-#: src/ZWiki/Views.py:415
+#: src/ZWiki/Views.py:419
 msgid "Click your browser's back button"
 msgstr ""
 
-#: src/ZWiki/Views.py:416
+#: src/ZWiki/Views.py:420
 msgid "Copy your recent edits to the clipboard"
 msgstr ""
 
-#: src/ZWiki/Views.py:417
+#: src/ZWiki/Views.py:421
 msgid "Click your browser's refresh button"
 msgstr ""
 
-#: src/ZWiki/Views.py:418
+#: src/ZWiki/Views.py:422
 msgid "Paste in your edits again, being mindful of the latest changes"
 msgstr ""
 
-#: src/ZWiki/Views.py:419
+#: src/ZWiki/Views.py:423
 msgid "Click the Change button again"
 msgstr ""
 
-#: src/ZWiki/Views.py:420
+#: src/ZWiki/Views.py:424
 #: src/ZWiki/skins/zwiki/editform.pt:163
 msgid "or"
 msgstr ""
 
-#: src/ZWiki/Views.py:421
+#: src/ZWiki/Views.py:425
 msgid "To discard your changes and start again, click OK"
 msgstr ""
 
-#: src/ZWiki/Views.py:490
+#: src/ZWiki/Views.py:501
 msgid ""
 "\n"
 "        Access keys can be accessed in mozilla-based browsers by pressing alt-<key>\n"
@@ -282,34 +286,33 @@
 "        "
 msgstr ""
 
-#: src/ZWiki/Wikis.py:49
-msgid "Unknown wiki type"
-msgstr ""
-
-#: src/ZWiki/ZWikiPage.py:675
+#: src/ZWiki/ZWikiPage.py:744
 msgid "create this page"
 msgstr ""
 
-#: src/ZWiki/ZWikiPage.py:798
-#: src/ZWiki/ZWikiPage.py:814
-#: src/ZWiki/ZWikiPage.py:817
+#: src/ZWiki/ZWikiPage.py:872
+#: src/ZWiki/ZWikiPage.py:887
 msgid "last edited %(interval)s ago"
 msgstr ""
 
-#: src/ZWiki/ZWikiPage.py:809
+#: src/ZWiki/ZWikiPage.py:882
 msgid "show last edit"
 msgstr ""
 
-#: src/ZWiki/ZWikiPage.py:826
-#: src/ZWiki/ZWikiPage.py:828
+#: src/ZWiki/ZWikiPage.py:897
+#: src/ZWiki/ZWikiPage.py:899
 msgid "by %(editor)s"
 msgstr ""
 
-#: src/ZWiki/__init__.py:34
+#: src/ZWiki/__init__.py:200
+msgid "Unknown wiki type"
+msgstr ""
+
+#: src/ZWiki/__init__.py:39
 msgid "No need to add a Zwiki Outline Cache"
 msgstr ""
 
-#: src/ZWiki/__init__.py:35
+#: src/ZWiki/__init__.py:40
 msgid ""
 "Zwiki Outline Cache appears in the ZMI Add menu\n"
 "        for implementation reasons, but should not be added directly.\n"
@@ -321,6 +324,11 @@
 msgid "comments"
 msgstr ""
 
+#: src/ZWiki/pagetypes/html.py:50
+#: src/ZWiki/pagetypes/rst.py:85
+msgid "reply"
+msgstr ""
+
 #: src/ZWiki/pagetypes/moin.py:1990
 msgid "Expected \"=\" to follow \"%(token)s\""
 msgstr ""
@@ -359,10 +367,6 @@
 msgid "Expected a color value \"%(arg)s\" after \"%(key)s\""
 msgstr ""
 
-#: src/ZWiki/pagetypes/rst.py:85
-msgid "reply"
-msgstr ""
-
 #: src/ZWiki/plugins/latexwiki/wikis/latexwiki/diffform.pt:127
 #: src/ZWiki/plugins/mathaction/wikis/mathaction/old-diffform.pt:127
 msgid "full history"
@@ -436,7 +440,7 @@
 msgstr ""
 
 #: src/ZWiki/plugins/tracker/filterissues.pt:12
-#: src/ZWiki/skins/dtmlmessages.pt:30
+#: src/ZWiki/skins/dtmlmessages.pt:31
 msgid "Filter issues"
 msgstr ""
 
@@ -448,53 +452,54 @@
 msgid "Issue tracker"
 msgstr ""
 
-#: src/ZWiki/plugins/tracker/tracker.py:361
+#: src/ZWiki/plugins/tracker/tracker.py:365
 msgid "You are not authorized to comment on this ZWiki Page."
 msgstr ""
 
 #: src/ZWiki/skins/dtmlmessages.pt:10
-#: src/ZWiki/skins/dtmlmessages.pt:32
-msgid "category"
+#: src/ZWiki/skins/dtmlmessages.pt:33
+msgid "name"
 msgstr ""
 
 #: src/ZWiki/skins/dtmlmessages.pt:11
-#: src/ZWiki/skins/dtmlmessages.pt:33
-msgid "severity"
+#: src/ZWiki/skins/dtmlmessages.pt:34
+msgid "category"
 msgstr ""
 
 #: src/ZWiki/skins/dtmlmessages.pt:12
-#: src/ZWiki/skins/dtmlmessages.pt:34
-msgid "status"
+#: src/ZWiki/skins/dtmlmessages.pt:35
+msgid "severity"
 msgstr ""
 
 #: src/ZWiki/skins/dtmlmessages.pt:13
-#: src/ZWiki/skins/dtmlmessages.pt:35
-msgid "age"
+#: src/ZWiki/skins/dtmlmessages.pt:36
+msgid "status"
 msgstr ""
 
 #: src/ZWiki/skins/dtmlmessages.pt:14
-#: src/ZWiki/skins/dtmlmessages.pt:36
-msgid "modified"
+#: src/ZWiki/skins/dtmlmessages.pt:37
+msgid "age"
 msgstr ""
 
 #: src/ZWiki/skins/dtmlmessages.pt:15
-msgid "Add a new issue:"
+#: src/ZWiki/skins/dtmlmessages.pt:38
+msgid "modified"
 msgstr ""
 
 #: src/ZWiki/skins/dtmlmessages.pt:16
-msgid "Name:"
+msgid "Add a new issue:"
 msgstr ""
 
 #: src/ZWiki/skins/dtmlmessages.pt:17
-msgid "Category:"
+msgid "Name:"
 msgstr ""
 
 #: src/ZWiki/skins/dtmlmessages.pt:18
-msgid "Severity:"
+msgid "Category:"
 msgstr ""
 
 #: src/ZWiki/skins/dtmlmessages.pt:19
-msgid "Status:"
+msgid "Severity:"
 msgstr ""
 
 #: src/ZWiki/skins/dtmlmessages.pt:2
@@ -502,59 +507,55 @@
 msgstr ""
 
 #: src/ZWiki/skins/dtmlmessages.pt:20
-msgid "Details:"
+msgid "Status:"
 msgstr ""
 
 #: src/ZWiki/skins/dtmlmessages.pt:21
-msgid "add issue"
+msgid "Details:"
 msgstr ""
 
 #: src/ZWiki/skins/dtmlmessages.pt:22
-msgid "More advanced"
+msgid "add issue"
 msgstr ""
 
 #: src/ZWiki/skins/dtmlmessages.pt:23
-msgid "issue tracker"
+msgid "More advanced"
 msgstr ""
 
 #: src/ZWiki/skins/dtmlmessages.pt:24
-msgid "search options"
+msgid "issue tracker"
 msgstr ""
 
 #: src/ZWiki/skins/dtmlmessages.pt:25
-msgid "Name contains any of:"
+msgid "search options"
 msgstr ""
 
 #: src/ZWiki/skins/dtmlmessages.pt:26
-msgid "Page text contains any of:"
+msgid "Name contains any of:"
 msgstr ""
 
 #: src/ZWiki/skins/dtmlmessages.pt:27
-msgid "Categories:"
+msgid "Page text contains any of:"
 msgstr ""
 
 #: src/ZWiki/skins/dtmlmessages.pt:28
-msgid "Severities:"
+msgid "Categories:"
 msgstr ""
 
 #: src/ZWiki/skins/dtmlmessages.pt:29
-msgid "Statuses:"
+msgid "Severities:"
 msgstr ""
 
 #: src/ZWiki/skins/dtmlmessages.pt:3
 msgid "Enter a search term, click the numbers to the right,"
 msgstr ""
 
-#: src/ZWiki/skins/dtmlmessages.pt:37
-msgid "Submitted by"
+#: src/ZWiki/skins/dtmlmessages.pt:30
+msgid "Statuses:"
 msgstr ""
 
-#: src/ZWiki/skins/dtmlmessages.pt:38
-msgid "Name"
-msgstr ""
-
 #: src/ZWiki/skins/dtmlmessages.pt:39
-msgid "Category"
+msgid "Submitted by"
 msgstr ""
 
 #: src/ZWiki/skins/dtmlmessages.pt:4
@@ -562,40 +563,40 @@
 msgstr ""
 
 #: src/ZWiki/skins/dtmlmessages.pt:40
-msgid "Severity"
+msgid "Name"
 msgstr ""
 
 #: src/ZWiki/skins/dtmlmessages.pt:41
-msgid "Status"
+msgid "Category"
 msgstr ""
 
 #: src/ZWiki/skins/dtmlmessages.pt:42
-msgid "Optional subject"
+msgid "Severity"
 msgstr ""
 
 #: src/ZWiki/skins/dtmlmessages.pt:43
-msgid "Optional comment"
+msgid "Status"
 msgstr ""
 
 #: src/ZWiki/skins/dtmlmessages.pt:44
+msgid "Optional subject"
+msgstr ""
+
 #: src/ZWiki/skins/dtmlmessages.pt:45
-msgid "Add ZWiki"
+msgid "Optional comment"
 msgstr ""
 
 #: src/ZWiki/skins/dtmlmessages.pt:46
-msgid "Id:"
-msgstr ""
-
 #: src/ZWiki/skins/dtmlmessages.pt:47
-msgid "Title:"
+msgid "Add ZWiki"
 msgstr ""
 
 #: src/ZWiki/skins/dtmlmessages.pt:48
-msgid "Template:"
+msgid "Id:"
 msgstr ""
 
 #: src/ZWiki/skins/dtmlmessages.pt:49
-msgid "Add wiki"
+msgid "Title:"
 msgstr ""
 
 #: src/ZWiki/skins/dtmlmessages.pt:5
@@ -603,80 +604,80 @@
 msgstr ""
 
 #: src/ZWiki/skins/dtmlmessages.pt:50
-msgid "Pages changed in the last"
+msgid "Template:"
 msgstr ""
 
 #: src/ZWiki/skins/dtmlmessages.pt:51
-msgid "Recently changed pages, with summaries"
+msgid "Add wiki"
 msgstr ""
 
 #: src/ZWiki/skins/dtmlmessages.pt:52
-msgid "Show summaries ?"
+msgid "Pages changed in the last"
 msgstr ""
 
 #: src/ZWiki/skins/dtmlmessages.pt:53
-msgid "Refresh"
+msgid "Recently changed pages, with summaries"
 msgstr ""
 
 #: src/ZWiki/skins/dtmlmessages.pt:54
-msgid "Page"
+msgid "Show summaries ?"
 msgstr ""
 
 #: src/ZWiki/skins/dtmlmessages.pt:55
-msgid "Edited&nbsp;by"
+msgid "Refresh"
 msgstr ""
 
 #: src/ZWiki/skins/dtmlmessages.pt:56
-msgid "Time"
+msgid "Page"
 msgstr ""
 
 #: src/ZWiki/skins/dtmlmessages.pt:57
-msgid "NEW"
+msgid "Edited&nbsp;by"
 msgstr ""
 
+#: src/ZWiki/skins/dtmlmessages.pt:58
+msgid "Time"
+msgstr ""
+
 #: src/ZWiki/skins/dtmlmessages.pt:59
-msgid "Pages marked (NEW) have been created within the last week"
+msgid "NEW"
 msgstr ""
 
 #: src/ZWiki/skins/dtmlmessages.pt:6
 msgid "search issues"
 msgstr ""
 
-#: src/ZWiki/skins/dtmlmessages.pt:60
-msgid "Enter a word or phrase and hit enter to search the entire wiki."
-msgstr ""
-
 #: src/ZWiki/skins/dtmlmessages.pt:61
-msgid "This is the same as using the search field at top right."
+msgid "Pages marked (NEW) have been created within the last week"
 msgstr ""
 
 #: src/ZWiki/skins/dtmlmessages.pt:62
-msgid "Tips: A single word works best for matching page names."
+msgid "Enter a word or phrase and hit enter to search the entire wiki."
 msgstr ""
 
 #: src/ZWiki/skins/dtmlmessages.pt:63
-msgid "Case-insensitivity and wildcards may be supported depending on your catalog configuration."
+msgid "This is the same as using the search field at top right."
 msgstr ""
 
 #: src/ZWiki/skins/dtmlmessages.pt:64
-msgid "Leave it blank to list all pages."
+msgid "Tips: A single word works best for matching page names."
 msgstr ""
 
 #: src/ZWiki/skins/dtmlmessages.pt:65
+msgid "Case-insensitivity and wildcards may be supported depending on your catalog configuration."
+msgstr ""
+
 #: src/ZWiki/skins/dtmlmessages.pt:66
-msgid "Search"
+msgid "Leave it blank to list all pages."
 msgstr ""
 
 #: src/ZWiki/skins/dtmlmessages.pt:67
-msgid "Page names matching"
-msgstr ""
-
 #: src/ZWiki/skins/dtmlmessages.pt:68
-msgid "Text matching"
+msgid "Search"
 msgstr ""
 
 #: src/ZWiki/skins/dtmlmessages.pt:69
-msgid "Thorough (non-catalog) search for text matching"
+msgid "Page names matching"
 msgstr ""
 
 #: src/ZWiki/skins/dtmlmessages.pt:7
@@ -684,43 +685,43 @@
 msgstr ""
 
 #: src/ZWiki/skins/dtmlmessages.pt:70
-msgid "Set your preferences for this wiki:"
+msgid "Text matching"
 msgstr ""
 
 #: src/ZWiki/skins/dtmlmessages.pt:71
-msgid "User name:"
+msgid "Thorough (non-catalog) search for text matching"
 msgstr ""
 
 #: src/ZWiki/skins/dtmlmessages.pt:72
-msgid "(identifies your edits)"
+msgid "Set your preferences for this wiki:"
 msgstr ""
 
 #: src/ZWiki/skins/dtmlmessages.pt:73
-msgid "Email address:"
+msgid "User name:"
 msgstr ""
 
 #: src/ZWiki/skins/dtmlmessages.pt:74
-msgid "(allows mail subscription)"
+msgid "(identifies your edits, saves your votes, may be required)"
 msgstr ""
 
 #: src/ZWiki/skins/dtmlmessages.pt:75
-msgid "Your time zone:"
+msgid "Email address:"
 msgstr ""
 
 #: src/ZWiki/skins/dtmlmessages.pt:76
-msgid "(localizes most times)"
+msgid "(allows mail subscription)"
 msgstr ""
 
 #: src/ZWiki/skins/dtmlmessages.pt:77
-msgid "Edit form height:"
+msgid "Your time zone:"
 msgstr ""
 
 #: src/ZWiki/skins/dtmlmessages.pt:78
-msgid "(adjusts form size)"
+msgid "(localizes most times)"
 msgstr ""
 
 #: src/ZWiki/skins/dtmlmessages.pt:79
-msgid "Save options"
+msgid "Edit form height:"
 msgstr ""
 
 #: src/ZWiki/skins/dtmlmessages.pt:8
@@ -728,73 +729,73 @@
 msgstr ""
 
 #: src/ZWiki/skins/dtmlmessages.pt:80
-msgid "Forget options"
+msgid "(adjusts form size)"
 msgstr ""
 
 #: src/ZWiki/skins/dtmlmessages.pt:81
+msgid "Save options"
+msgstr ""
+
 #: src/ZWiki/skins/dtmlmessages.pt:82
-msgid "Add ZWiki Page"
+msgid "Forget options"
 msgstr ""
 
 #: src/ZWiki/skins/dtmlmessages.pt:83
-msgid "Page&nbsp;name:"
-msgstr ""
-
 #: src/ZWiki/skins/dtmlmessages.pt:84
-msgid "Add wiki page"
+msgid "Add ZWiki Page"
 msgstr ""
 
 #: src/ZWiki/skins/dtmlmessages.pt:85
-msgid "Topic"
+msgid "Page&nbsp;name:"
 msgstr ""
 
 #: src/ZWiki/skins/dtmlmessages.pt:86
-msgid "Last updated"
+msgid "Add wiki page"
 msgstr ""
 
 #: src/ZWiki/skins/dtmlmessages.pt:87
-msgid "Comments"
+msgid "Topic"
 msgstr ""
 
 #: src/ZWiki/skins/dtmlmessages.pt:88
-msgid "Views"
+msgid "Last updated"
 msgstr ""
 
 #: src/ZWiki/skins/dtmlmessages.pt:89
-msgid "Created"
+msgid "Comments"
 msgstr ""
 
 #: src/ZWiki/skins/dtmlmessages.pt:9
-#: src/ZWiki/skins/dtmlmessages.pt:31
+#: src/ZWiki/skins/dtmlmessages.pt:32
 msgid "#"
 msgstr ""
 
 #: src/ZWiki/skins/dtmlmessages.pt:90
-#: src/ZWiki/skins/dtmlmessages.pt:92
-msgid "by"
+msgid "Views"
 msgstr ""
 
 #: src/ZWiki/skins/dtmlmessages.pt:91
-msgid "<dtml-var lasteditinterval> ago</dtml-var>"
+msgid "Created"
 msgstr ""
 
-#: src/ZWiki/skins/dtmlmessages.pt:93
-msgid "on"
+#: src/ZWiki/skins/dtmlmessages.pt:92
+#: src/ZWiki/skins/dtmlmessages.pt:94
+msgid "by"
 msgstr ""
 
-#: src/ZWiki/skins/zwiki/backlinks.pt:108
-msgid "Subtopics"
+#: src/ZWiki/skins/dtmlmessages.pt:93
+msgid "<dtml-var lasteditinterval> ago</dtml-var>"
 msgstr ""
 
-#: src/ZWiki/skins/zwiki/backlinks.pt:111
-msgid "This page has no subtopics."
+#: src/ZWiki/skins/dtmlmessages.pt:95
+msgid "on"
 msgstr ""
 
-#: src/ZWiki/skins/zwiki/backlinks.pt:114
+#: src/ZWiki/skins/zwiki/backlinks.pt:102
 msgid "Here are it's subtopics."
 msgstr ""
 
-#: src/ZWiki/skins/zwiki/backlinks.pt:117
+#: src/ZWiki/skins/zwiki/backlinks.pt:105
 msgid "You can reorder them by clicking the ^ buttons."
 msgstr ""
 
@@ -806,46 +807,54 @@
 msgid "Parents"
 msgstr ""
 
-#: src/ZWiki/skins/zwiki/backlinks.pt:31
+#: src/ZWiki/skins/zwiki/backlinks.pt:28
 msgid "is a top-level topic."
 msgstr ""
 
-#: src/ZWiki/skins/zwiki/backlinks.pt:32
+#: src/ZWiki/skins/zwiki/backlinks.pt:29
 msgid "is a subtopic of:"
 msgstr ""
 
-#: src/ZWiki/skins/zwiki/backlinks.pt:55
+#: src/ZWiki/skins/zwiki/backlinks.pt:48
 msgid "Backlinks"
 msgstr ""
 
-#: src/ZWiki/skins/zwiki/backlinks.pt:56
+#: src/ZWiki/skins/zwiki/backlinks.pt:49
 msgid "Here are the pages which link to it:"
 msgstr ""
 
-#: src/ZWiki/skins/zwiki/backlinks.pt:57
+#: src/ZWiki/skins/zwiki/backlinks.pt:50
 msgid "No other pages link to this one."
 msgstr ""
 
-#: src/ZWiki/skins/zwiki/backlinks.pt:82
+#: src/ZWiki/skins/zwiki/backlinks.pt:70
 msgid "You can set this page's parent(s) to place it within the overall page hierarchy."
 msgstr ""
 
-#: src/ZWiki/skins/zwiki/backlinks.pt:85
+#: src/ZWiki/skins/zwiki/backlinks.pt:73
 msgid "Check one or more checkboxes or enter a page name here, and click the button."
 msgstr ""
 
-#: src/ZWiki/skins/zwiki/backlinks.pt:88
+#: src/ZWiki/skins/zwiki/backlinks.pt:76
 msgid "Enter a page name here and click the button."
 msgstr ""
 
-#: src/ZWiki/skins/zwiki/backlinks.pt:91
+#: src/ZWiki/skins/zwiki/backlinks.pt:79
 msgid "You can type just the first few letters, case and punctuation are ignored."
 msgstr ""
 
-#: src/ZWiki/skins/zwiki/backlinks.pt:98
+#: src/ZWiki/skins/zwiki/backlinks.pt:86
 msgid "Reparent"
 msgstr ""
 
+#: src/ZWiki/skins/zwiki/backlinks.pt:96
+msgid "Subtopics"
+msgstr ""
+
+#: src/ZWiki/skins/zwiki/backlinks.pt:99
+msgid "This page has no subtopics."
+msgstr ""
+
 #: src/ZWiki/skins/zwiki/badtemplate.pt:12
 msgid "Bad template"
 msgstr ""
@@ -883,12 +892,18 @@
 msgid "add-comment"
 msgstr ""
 
-#: src/ZWiki/skins/zwiki/contentspage.pt:12
+#: src/ZWiki/skins/zwiki/contentspage.pt:10
+#: src/ZWiki/skins/zwiki/contentspage.pt:27
+msgid "Wiki contents for"
+msgstr ""
+
+#: src/ZWiki/skins/zwiki/contentspage.pt:13
+#: src/ZWiki/skins/zwiki/contentspage.pt:30
 msgid "Wiki contents"
 msgstr ""
 
-#: src/ZWiki/skins/zwiki/contentspage.pt:16
-msgid "Singletons"
+#: src/ZWiki/skins/zwiki/contentspage.pt:40
+msgid "Singletons:"
 msgstr ""
 
 #: src/ZWiki/skins/zwiki/denied.pt:12
@@ -973,11 +988,11 @@
 msgstr ""
 
 #: src/ZWiki/skins/zwiki/editform.pt:178
-msgid "preview this edit"
+msgid "Preview"
 msgstr ""
 
 #: src/ZWiki/skins/zwiki/editform.pt:178
-msgid "Preview"
+msgid "preview this edit"
 msgstr ""
 
 #: src/ZWiki/skins/zwiki/editform.pt:183
@@ -1019,13 +1034,17 @@
 msgstr ""
 
 #: src/ZWiki/skins/zwiki/editform.pt:71
-msgid "type"
+msgid "markup"
 msgstr ""
 
 #: src/ZWiki/skins/zwiki/editform.pt:72
 msgid "select the formatting and rendering style for this page"
 msgstr ""
 
+#: src/ZWiki/skins/zwiki/helppage.pt:12
+msgid "Help page"
+msgstr ""
+
 #: src/ZWiki/skins/zwiki/links.pt:102
 msgid "(external edit)"
 msgstr ""
@@ -1163,11 +1182,11 @@
 msgstr ""
 
 #: src/ZWiki/skins/zwiki/pagemanagementform.pt:45
-msgid "reparent"
+msgid "make this page a subtopic of the page you have entered"
 msgstr ""
 
 #: src/ZWiki/skins/zwiki/pagemanagementform.pt:45
-msgid "make this page a subtopic of the page you have entered"
+msgid "reparent"
 msgstr ""
 
 #: src/ZWiki/skins/zwiki/pagemanagementform.pt:50

Modified: zope-zwiki/trunk/pagetypes/__init__.py
===================================================================
--- zope-zwiki/trunk/pagetypes/__init__.py	2007-04-08 14:54:05 UTC (rev 761)
+++ zope-zwiki/trunk/pagetypes/__init__.py	2007-04-08 14:55:27 UTC (rev 762)
@@ -135,7 +135,7 @@
     else:
         try:
             __import__('Products.ZWiki.pagetypes.%s' % m)
-        except:
+        except ImportError:
             BLATHER('could not load %s page type, skipping (traceback follows)\n%s' % (
                 m, formattedTraceback()))
 

Modified: zope-zwiki/trunk/pagetypes/html.py
===================================================================
--- zope-zwiki/trunk/pagetypes/html.py	2007-04-08 14:54:05 UTC (rev 761)
+++ zope-zwiki/trunk/pagetypes/html.py	2007-04-08 14:55:27 UTC (rev 762)
@@ -26,6 +26,32 @@
         t = page.addSkinTo(t,**kw)
         return t
 
+    def makeCommentHeading(self, page,
+                           subject, username, time, 
+                           message_id=None,in_reply_to=None):
+        """
+        Generate HTML markup for a comment heading in a HTML page.
+
+        Note that we just work on the comment heading here. The content of the 
+        comment is left as is, not certain what to do with it. Users likely 
+        expect to be able to write comments like on every other page type
+        (e.g. with two newlines to format paragraphs) - but what kind of markup
+        would be expected on a html page? XXX
+        """
+        heading = '\n\n<p class="commentheading"> '
+        heading += '<strong>%s</strong> --' % (subject or '...')
+        if username: heading = heading + '%s, ' % (username)
+        heading += time or ''
+        heading += ' <a class="reference" href="%s?subject=%s%s#bottom">%s</a>' % (
+            page.pageUrl(),
+            quote(subject or ''),
+            ((message_id and '&amp;in_reply_to='+quote(message_id))
+             or ''),
+            _("reply"),
+            )
+        heading += '\n\n</p>'
+        return heading
+
 registerPageType(PageTypeHtml)
 
 # backwards compatibility - need this here for old zodb objects

Modified: zope-zwiki/trunk/pagetypes/moin.py
===================================================================
--- zope-zwiki/trunk/pagetypes/moin.py	2007-04-08 14:54:05 UTC (rev 761)
+++ zope-zwiki/trunk/pagetypes/moin.py	2007-04-08 14:55:27 UTC (rev 762)
@@ -1493,7 +1493,7 @@
     def endContent(self):
         try:
             cid = self._content_ids.pop()
-        except:
+        except IndexError:
             cid = 'content'
         if cid!='content':
             aid = 'bottom_%s' % (cid,)

Modified: zope-zwiki/trunk/pagetypes/plaintext.py
===================================================================
--- zope-zwiki/trunk/pagetypes/plaintext.py	2007-04-08 14:54:05 UTC (rev 761)
+++ zope-zwiki/trunk/pagetypes/plaintext.py	2007-04-08 14:55:27 UTC (rev 762)
@@ -18,6 +18,8 @@
 
     def render(self, page, REQUEST={}, RESPONSE=None, **kw):
         t = page.preRendered()
+        if page.isIssue() and kw.get('show_issueproperties',1):
+            t = page.addIssueFormTo(t)
         t = page.renderMidsectionIn(t,**kw)
         t = page.addSkinTo(t,**kw)
         return t

Modified: zope-zwiki/trunk/plugins/__init__.py
===================================================================
--- zope-zwiki/trunk/plugins/__init__.py	2007-04-08 14:54:05 UTC (rev 761)
+++ zope-zwiki/trunk/plugins/__init__.py	2007-04-08 14:55:27 UTC (rev 762)
@@ -86,6 +86,6 @@
     else:
         try:
             __import__('Products.ZWiki.plugins.%s' % m)
-        except:
+        except ImportError:
             BLATHER('could not load %s plugin, skipping (traceback follows)\n%s' % (
                 m, formattedTraceback()))

Modified: zope-zwiki/trunk/plugins/tracker/FilterIssues.dtml
===================================================================
--- zope-zwiki/trunk/plugins/tracker/FilterIssues.dtml	2007-04-08 14:54:05 UTC (rev 761)
+++ zope-zwiki/trunk/plugins/tracker/FilterIssues.dtml	2007-04-08 14:55:27 UTC (rev 762)
@@ -1,4 +1,24 @@
 <dtml-call "RESPONSE.setHeader('Content-Type','text/html; charset=utf-8')">
+
+<dtml-comment>
+
+--------------------------------------
+
+**dtml is not enabled**
+
+This page looks **broken**, because it needs dtml enabled to work.
+
+You can enable dtml by setting a boolean property called allow_dtml to true 
+on this page.
+
+You might then want to lock this page by going to the security tab and 
+unchecking the "Zwiki:Edit pages" and "Zwiki:Add comments" permissions 
+from non-manager users if you are security conscious.
+
+--------------------------------------
+
+</dtml-comment>
+
 <dtml-let
  scrollto="'' #'#tracker'"
  issueCount=issueCount 
@@ -172,8 +192,14 @@
   sortonend="_.string.find(QUERY_STRING,'&',sortonstart)"
   sortonend="(sortonend != -1) and (sortonend+1) or _.len(QUERY_STRING)"
   query="(sortonstart == -1) and QUERY_STRING or (QUERY_STRING[:sortonstart]+QUERY_STRING[sortonend:])"
+  sortorderstart="_.string.find(query,'sort_order')"
+  sortorderend="_.string.find(query,'&',sortorderstart)"
+  sortorderend="(sortorderend != -1) and (sortorderend+1) or _.len(query)"
+  amp="(sortorderstart == -1) and '*' or query[sortorderstart-1]"
+  sortorderstart="(amp == '&') and sortorderstart-1 or sortorderstart"
+  query="(sortorderstart == -1) and query or (query[:sortorderstart]+query[sortorderend:])"
   query="query and ('&'+query) or ''"
-  order="REQUEST.get('sort_order','') and '&sort_order=' or '&sort_order=reverse' #not used"
+  order="(not (REQUEST.get('sort_order','') == 'reverse')) and '&sort_order=reverse' or '&sort_order=ascending' "
   issues="
   (searchexpr and
    (pages(isIssue=1, sort_on=sort_on, sort_limit=num, Title=searchexpr) +
@@ -195,45 +221,52 @@
   >
    <table border=0 width="100%">
      <tr>
-       <td align=left valign=top>
+       <td align=left valign=top width="1%">
          <dtml-let bold="sort_on=='issueNumber'">
          <dtml-var "bold and '<b>' or ''">
-         <a href="&dtml-URL;?sort_on=issueNumber&dtml-query;&dtml-scrollto;"><dtml-translate domain=zwiki>#</dtml-translate></a>
+         <a href="&dtml-URL;?sort_on=issueNumber&dtml-query;&dtml-order;&dtml-scrollto;"><dtml-translate domain=zwiki>#</dtml-translate></a>
          <dtml-var "bold and '</b>' or ''">
          </dtml-let>
        </td>
+       <td align=left valign=top>
+         <dtml-let bold="sort_on=='issuename'">
+         <dtml-var "bold and '<b>' or ''">
+         <a href="&dtml-URL;?sort_on=issuename&dtml-query;&dtml-order;&dtml-scrollto;"><dtml-translate domain=zwiki>name</dtml-translate></a>
+         <dtml-var "bold and '</b>' or ''">
+         </dtml-let>
+       </td>
        <td align=left valign=top width="1%">
          <dtml-let bold="sort_on=='category_index'">
          <dtml-var "bold and '<b>' or ''">
-         <a href="&dtml-URL;?sort_on=category_index&dtml-query;&dtml-scrollto;"><dtml-translate domain=zwiki>category</dtml-translate></a>
+         <a href="&dtml-URL;?sort_on=category_index&dtml-query;&dtml-order;&dtml-scrollto;"><dtml-translate domain=zwiki>category</dtml-translate></a>
          <dtml-var "bold and '</b>' or ''">
          </dtml-let>
        </td>
        <td align=left valign=top width="1%">
          <dtml-let bold="sort_on=='severity_index'">
          <dtml-var "bold and '<b>' or ''">
-         <a href="&dtml-URL;?sort_on=severity_index&dtml-query;&dtml-scrollto;"><dtml-translate domain=zwiki>severity</dtml-translate></a>
+         <a href="&dtml-URL;?sort_on=severity_index&dtml-query;&dtml-order;&dtml-scrollto;"><dtml-translate domain=zwiki>severity</dtml-translate></a>
          <dtml-var "bold and '</b>' or ''">
          </dtml-let>
        </td>
        <td align=left valign=top width="1%">
          <dtml-let bold="sort_on=='status_index'">
          <dtml-var "bold and '<b>' or ''">
-         <a href="&dtml-URL;?sort_on=status_index&dtml-query;&dtml-scrollto;"><dtml-translate domain=zwiki>status</dtml-translate></a>
+         <a href="&dtml-URL;?sort_on=status_index&dtml-query;&dtml-order;&dtml-scrollto;"><dtml-translate domain=zwiki>status</dtml-translate></a>
          <dtml-var "bold and '</b>' or ''">
          </dtml-let>
        </td>
        <td align=left valign=top width="1%">
          <dtml-let bold="sort_on=='creation_time'">
          <dtml-var "bold and '<b>' or ''">
-         <a href="&dtml-URL;?sort_on=creation_time&dtml-query;&dtml-scrollto;"><dtml-translate domain=zwiki>age</dtml-translate></a>
+         <a href="&dtml-URL;?sort_on=creation_time&dtml-query;&dtml-order;&dtml-scrollto;"><dtml-translate domain=zwiki>age</dtml-translate></a>
          <dtml-var "bold and '</b>' or ''">
          </dtml-let>
        </td>
        <td align=left valign=top width="1%">
          <dtml-let bold="sort_on=='lastEditTime'">
          <dtml-var "bold and '<b>' or ''">
-         <a href="&dtml-URL;?sort_on=lastEditTime&dtml-query;&sort_order=reverse&dtml-scrollto;"><dtml-translate domain=zwiki>modified</dtml-translate></a>
+         <a href="&dtml-URL;?sort_on=lastEditTime&dtml-query;&dtml-order;&dtml-scrollto;"><dtml-translate domain=zwiki>modified</dtml-translate></a>
          <dtml-var "bold and '</b>' or ''">
          </dtml-let>
        </td>
@@ -245,6 +278,9 @@
           bold="0#(status in ('open','pending') and 
           #severity not in ('wishlist',) and 
           #page.ageInDays() > 60)"
+	  titleseparator="_.string.find(Title,' ')"
+	  issuenmbr="titleseparator != -1 and Title[:titleseparator] or 'None'"
+	  issuenam="titleseparator != -1 and Title[titleseparator+1:] or 'None'"
           >
            <tr bgcolor="&dtml-issueColour;">
              <td align=left valign=top>
@@ -253,9 +289,18 @@
                </dtml-comment>
                <dtml-var "bold and '<b>' or ''"
                ><a href="&dtml-wiki_url;/&dtml-id;" 
-                   title="<dtml-var "'' #page.linkTitle()">">&dtml-Title;</a>
+                   title="<dtml-var "'' #page.linkTitle()">">&dtml-issuenmbr;</a>
                <dtml-var "bold and '</b>' or ''">
              </td>
+             <td align=left valign=top>
+               <dtml-comment>
+               <dtml-var "wikilink('['+Title+']')">
+               </dtml-comment>
+               <dtml-var "bold and '<b>' or ''"
+               ><a href="&dtml-wiki_url;/&dtml-id;" 
+                   title="<dtml-var "'' #page.linkTitle()">">&dtml-issuenam;</a>
+               <dtml-var "bold and '</b>' or ''">
+             </td>
              <td align=left valign=top nowrap><dtml-var category></td>
              <td align=left valign=top nowrap><dtml-var severity></td>
              <td align=left valign=top nowrap>

Modified: zope-zwiki/trunk/plugins/tracker/IssueBrowser.dtml
===================================================================
--- zope-zwiki/trunk/plugins/tracker/IssueBrowser.dtml	2007-04-08 14:54:05 UTC (rev 761)
+++ zope-zwiki/trunk/plugins/tracker/IssueBrowser.dtml	2007-04-08 14:55:27 UTC (rev 762)
@@ -1,3 +1,23 @@
+
+<dtml-comment>
+
+--------------------------------------
+
+**dtml not enabled**
+
+This page looks **broken**, because it needs dtml enabled to work.
+
+You can enable dtml by setting a boolean property called allow_dtml to true 
+on this page.
+
+You might then want to lock this page by going to the security tab and 
+unchecking the "Zwiki:Edit pages" and "Zwiki:Add comments" permissions 
+from non-manager users if you are security conscious.
+
+--------------------------------------
+
+</dtml-comment>
+
 <!-- category box and font sizes adjusted for number of open issues --> 
 <a name="categories"></a>
 <dtml-let 

Modified: zope-zwiki/trunk/plugins/tracker/IssueTracker.dtml
===================================================================
--- zope-zwiki/trunk/plugins/tracker/IssueTracker.dtml	2007-04-08 14:54:05 UTC (rev 761)
+++ zope-zwiki/trunk/plugins/tracker/IssueTracker.dtml	2007-04-08 14:55:27 UTC (rev 762)
@@ -1,4 +1,24 @@
 <dtml-call "RESPONSE.setHeader('Content-Type','text/html; charset=utf-8')">
+
+<dtml-comment>
+
+--------------------------------------
+
+**dtml not enabled**
+
+This page looks **broken**, because it needs dtml enabled to work.
+
+You can enable dtml by setting a boolean property called allow_dtml to true 
+on this page.
+
+You might then want to lock this page by going to the security tab and 
+unchecking the "Zwiki:Edit pages" and "Zwiki:Add comments" permissions 
+from non-manager users if you are security conscious.
+
+--------------------------------------
+
+</dtml-comment>
+
 <dtml-let
  scrollto="'' #'#tracker'"
  issueCount=issueCount 
@@ -169,8 +189,14 @@
   sortonend="_.string.find(QUERY_STRING,'&',sortonstart)"
   sortonend="(sortonend != -1) and (sortonend+1) or _.len(QUERY_STRING)"
   query="(sortonstart == -1) and QUERY_STRING or (QUERY_STRING[:sortonstart]+QUERY_STRING[sortonend:])"
+  sortorderstart="_.string.find(query,'sort_order')"
+  sortorderend="_.string.find(query,'&',sortorderstart)"
+  sortorderend="(sortorderend != -1) and (sortorderend+1) or _.len(query)"
+  amp="(sortorderstart == -1) and '*' or query[sortorderstart-1]"
+  sortorderstart="(amp == '&') and sortorderstart-1 or sortorderstart"
+  query="(sortorderstart == -1) and query or (query[:sortorderstart]+query[sortorderend:])"
   query="query and ('&'+query) or ''"
-  order="REQUEST.get('sort_order','') and '&sort_order=' or '&sort_order=reverse' #not used"
+  order="(not (REQUEST.get('sort_order','') == 'reverse')) and '&sort_order=reverse' or '&sort_order=ascending' "
   issues="
   (searchexpr and
    (pages(isIssue=1, sort_on=sort_on, sort_limit=num, Title=searchexpr) +
@@ -194,45 +220,56 @@
   >
    <table border=0 width="100%">
      <tr>
-       <td align=left valign=top>
+       <td align=left valign=top width="1%">
          <dtml-let bold="sort_on=='issueNumber'">
          <dtml-var "bold and '<b>' or ''">
-         <a href="&dtml-URL;?sort_on=issueNumber&dtml-query;&dtml-scrollto;"><dtml-translate domain=zwiki>#</dtml-translate></a>
+         <a href="&dtml-URL;?sort_on=issueNumber&dtml-query;&dtml-order;&dtml-scrollto;"><dtml-translate domain=zwiki>#</dtml-translate></a>
          <dtml-var "bold and '</b>' or ''">
          </dtml-let>
        </td>
+       <td align=left valign=top>
+         <dtml-if "hasCatalogIndexesMetadata((['issueName'],[]))">
+           <dtml-let bold="sort_on=='issueName'">
+           <dtml-var "bold and '<b>' or ''">
+           <a href="&dtml-URL;?sort_on=issueName&dtml-query;&dtml-order;&dtml-scrollto;"><dtml-translate domain=zwiki>name</dtml-translate></a>
+           <dtml-var "bold and '</b>' or ''">
+           </dtml-let>
+         <dtml-else>
+           <span style="font-size:small; font-style:italic; color: gray">visit /setupTracker to sort by name</span>
+         </dtml-if>
+       </td>
        <td align=left valign=top width="1%">
          <dtml-let bold="sort_on=='category_index'">
          <dtml-var "bold and '<b>' or ''">
-         <a href="&dtml-URL;?sort_on=category_index&dtml-query;&dtml-scrollto;"><dtml-translate domain=zwiki>category</dtml-translate></a>
+         <a href="&dtml-URL;?sort_on=category_index&dtml-query;&dtml-order;&dtml-scrollto;"><dtml-translate domain=zwiki>category</dtml-translate></a>
          <dtml-var "bold and '</b>' or ''">
          </dtml-let>
        </td>
        <td align=left valign=top width="1%">
          <dtml-let bold="sort_on=='severity_index'">
          <dtml-var "bold and '<b>' or ''">
-         <a href="&dtml-URL;?sort_on=severity_index&dtml-query;&dtml-scrollto;"><dtml-translate domain=zwiki>severity</dtml-translate></a>
+         <a href="&dtml-URL;?sort_on=severity_index&dtml-query;&dtml-order;&dtml-scrollto;"><dtml-translate domain=zwiki>severity</dtml-translate></a>
          <dtml-var "bold and '</b>' or ''">
          </dtml-let>
        </td>
        <td align=left valign=top width="1%">
          <dtml-let bold="sort_on=='status_index'">
          <dtml-var "bold and '<b>' or ''">
-         <a href="&dtml-URL;?sort_on=status_index&dtml-query;&dtml-scrollto;"><dtml-translate domain=zwiki>status</dtml-translate></a>
+         <a href="&dtml-URL;?sort_on=status_index&dtml-query;&dtml-order;&dtml-scrollto;"><dtml-translate domain=zwiki>status</dtml-translate></a>
          <dtml-var "bold and '</b>' or ''">
          </dtml-let>
        </td>
        <td align=left valign=top width="1%">
          <dtml-let bold="sort_on=='creation_time'">
          <dtml-var "bold and '<b>' or ''">
-         <a href="&dtml-URL;?sort_on=creation_time&dtml-query;&dtml-scrollto;"><dtml-translate domain=zwiki>age</dtml-translate></a>
+         <a href="&dtml-URL;?sort_on=creation_time&dtml-query;&dtml-order;&dtml-scrollto;"><dtml-translate domain=zwiki>age</dtml-translate></a>
          <dtml-var "bold and '</b>' or ''">
          </dtml-let>
        </td>
        <td align=left valign=top width="1%">
          <dtml-let bold="sort_on=='lastEditTime'">
          <dtml-var "bold and '<b>' or ''">
-         <a href="&dtml-URL;?sort_on=lastEditTime&dtml-query;&sort_order=reverse&dtml-scrollto;"><dtml-translate domain=zwiki>modified</dtml-translate></a>
+         <a href="&dtml-URL;?sort_on=lastEditTime&dtml-query;&dtml-order;&dtml-scrollto;"><dtml-translate domain=zwiki>modified</dtml-translate></a>
          <dtml-var "bold and '</b>' or ''">
          </dtml-let>
        </td>
@@ -243,7 +280,10 @@
           linktitle="'' #getObject().linkTitle()"
           bold="0#(status in ('open','pending') and 
           #severity not in ('wishlist',) and 
-          #page.ageInDays() > 60)"
+	  #page.ageInDays() > 60)"
+	  titleseparator="_.string.find(Title,' ')"
+	  issuenmbr="titleseparator != -1 and Title[:titleseparator] or 'None'"
+	  issuenam="titleseparator != -1 and Title[titleseparator+1:] or 'None'"
           >
            <tr bgcolor="&dtml-issueColour;">
              <td align=left valign=top>
@@ -252,9 +292,18 @@
                </dtml-comment>
                <dtml-var "bold and '<b>' or ''"
                ><a href="&dtml-wiki_url;/&dtml-id;" 
-                   title="<dtml-var "'' #page.linkTitle()">">&dtml-Title;</a>
+                   title="<dtml-var "'' #page.linkTitle()">">&dtml-issuenmbr;</a>
                <dtml-var "bold and '</b>' or ''">
              </td>
+             <td align=left valign=top>
+               <dtml-comment>
+               <dtml-var "wikilink('['+Title+']')">
+               </dtml-comment>
+               <dtml-var "bold and '<b>' or ''"
+               ><a href="&dtml-wiki_url;/&dtml-id;" 
+                   title="<dtml-var "'' #page.linkTitle()">">&dtml-issuenam;</a>
+               <dtml-var "bold and '</b>' or ''">
+             </td>
              <td align=left valign=top nowrap><dtml-var category></td>
              <td align=left valign=top nowrap><dtml-var severity></td>
              <td align=left valign=top nowrap>

Modified: zope-zwiki/trunk/plugins/tracker/tracker.py
===================================================================
--- zope-zwiki/trunk/plugins/tracker/tracker.py	2007-04-08 14:54:05 UTC (rev 761)
+++ zope-zwiki/trunk/plugins/tracker/tracker.py	2007-04-08 14:55:27 UTC (rev 762)
@@ -332,6 +332,7 @@
                     raise 'Unauthorized', (_('You are not authorized to rename this ZWiki Page.'))
                 self.rename(newpagename, updatebacklinks=1, sendmail=0,
                             REQUEST=REQUEST)
+ 
         if category:
             old = getattr(self,'category','')
             if category != old:
@@ -523,7 +524,7 @@
             'severity_index',
             'status',
             'status_index',
-            ]
+            'issueName']
         KeywordIndexes = [
             ]
         DateIndexes = [
@@ -560,21 +561,20 @@
                 if not self.pageWithName(page):
                     self.create(page,
                                 text=open(os.path.join(dir,page+'.dtml'),'r').read(),
-                                sendmail=0)
+                                sendmail=0,
+                                type='stx')
+
             # also, disable subtopics display under IssueTracker
             self.IssueTracker.setSubtopicsPropertyStatus(0)
+
         # index each page, to make all indexes and metadata current
         # may duplicate some work in setupCatalog
         n = 0
         cid = self.catalog().getId()
         for p in self.pageObjects():
             n = n + 1
-            try:
-                BLATHER('indexing page #%d %s in %s'%(n,p.id(),cid))
-                p.index_object(log=0)
-            except:
-                BLATHER('failed to index page #%d %s: %s' \
-                        % (n,p.id(),formattedTraceback()))
+            BLATHER('indexing page #%d %s in %s'%(n,p.id(),cid))
+            p.index_object(log=0)
         BLATHER('indexing complete, %d pages processed' % n)
         # and a dummy issue to enable site navigation links
         if not self.hasIssues():
@@ -626,6 +626,7 @@
                     self.manage_addProperty(prop,values,'selection')
                     if default: setattr(self,prop,default)
                     changed = 1
+
         return changed
 
 InitializeClass(PluginTracker)

Modified: zope-zwiki/trunk/skins/zwiki/HelpPage.stx
===================================================================
--- zope-zwiki/trunk/skins/zwiki/HelpPage.stx	2007-04-08 14:54:05 UTC (rev 761)
+++ zope-zwiki/trunk/skins/zwiki/HelpPage.stx	2007-04-08 14:55:27 UTC (rev 762)
@@ -1,4 +1,4 @@
-This is the quick help page for Zwiki version 0.58.0
+This is the quick help page for Zwiki version 0.59.0
 <dtml-var "'(This site is currently running '"><dtml-var zwiki_version><dtml-var "').'"> 
 See also the more complete docs at http://zwiki.org , such as the 
 "UsersGuide":http://zwiki.org/UsersGuide .

Modified: zope-zwiki/trunk/skins/zwiki/RecentChanges.dtml
===================================================================
--- zope-zwiki/trunk/skins/zwiki/RecentChanges.dtml	2007-04-08 14:54:05 UTC (rev 761)
+++ zope-zwiki/trunk/skins/zwiki/RecentChanges.dtml	2007-04-08 14:55:27 UTC (rev 762)
@@ -2,7 +2,7 @@
 <dtml-let 
  wikiurl=wiki_url
  summaries="REQUEST.get('summaries',0)"
- period="_.string.lower(REQUEST.get('period','day'))"
+ period="_.string.lower(REQUEST.get('period','week'))"
  days="{
    'day':1,
    'week':7,

Modified: zope-zwiki/trunk/skins/zwiki/SearchPage.dtml
===================================================================
--- zope-zwiki/trunk/skins/zwiki/SearchPage.dtml	2007-04-08 14:54:05 UTC (rev 761)
+++ zope-zwiki/trunk/skins/zwiki/SearchPage.dtml	2007-04-08 14:55:27 UTC (rev 762)
@@ -101,7 +101,7 @@
   <dl>
   <dtml-try>
     <dt><a href="&dtml-wikiurl;/&dtml.url_quote-id;"><dtml-var "formatWikiname(Title)"></a></dt>
-    <dd><small><em><dtml-var "pageWithName(id).excerptAt(cleanexpr,size=500)"></em></small></dd>
+    <dd><small><em><dtml-var "pageWithName(Title).excerptAt(cleanexpr,size=500)"></em></small></dd>
   </dl>
   <dtml-except>
     <dt>error</dt>

Modified: zope-zwiki/trunk/skins/zwiki/backlinks.pt
===================================================================
--- zope-zwiki/trunk/skins/zwiki/backlinks.pt	2007-04-08 14:54:05 UTC (rev 761)
+++ zope-zwiki/trunk/skins/zwiki/backlinks.pt	2007-04-08 14:55:27 UTC (rev 762)
@@ -9,7 +9,7 @@
   <body>
     <div metal:fill-slot="main"
          tal:define="
-                     canreparent python:user.has_permission('Zwiki: Reparent pages',here);
+                     canreparent python:user.has_permission('Zwiki: Reparent pages',here) and here.checkSufficientId(request);
                      thispage here/pageName;
                      thisparents here/parents;
                      backlinks python:here.backlinksFor(thispage);
@@ -24,10 +24,7 @@
             <td width="50%">
               <p>
                 <b i18n:translate="">Parents</b><br />
-                <a href="page_url" title="linkTitle"
-                   tal:attributes="href here/pageUrl; title here/linkTitle;" 
-                   tal:content="thispage"
-                   >thispage</a> 
+		<a tal:replace="structure python:here.wikilink('['+thispage+']')"> </a> 
                 <span tal:condition="not:here/parents" i18n:translate="">is a top-level topic.</span>
                 <span tal:condition="here/parents" i18n:translate="">is a subtopic of:</span>
               </p>
@@ -41,12 +38,8 @@
                     <input type="checkbox" name="parents" value="parent" checked="checked" class="formfield"
                            tal:attributes="value parent;"
                            tal:condition="canreparent" />
-                    <a href="" title=""
-                       tal:attributes="href python:here.wiki_url()+'/'+here.canonicalIdFrom(parent);
-                                       title nothing;"
-                       tal:content="parent"
-                       >parent</a>
-                    <br />
+		    <a tal:replace="structure python:here.wikilink('['+parent+']')"> </a> 
+       		    <br />
                   </span>
                 </li>
               </ol>
@@ -65,13 +58,8 @@
                     <input type="checkbox" name="parents" value="blpage" class="formfield"
                            tal:attributes="checked blisparent; value blpage;"
                            tal:condition="canreparent" />
-                    <a href="blurl" title=""
-                       tal:define="blid bl/id"
-                       tal:attributes="href python:here.wiki_url()+'/'+blid;
-                                       title bl/linkTitle|nothing;"
-                       tal:content="blpage"
-                       >blpage</a>
-                    <br />
+		    <a tal:define="bltitle bl/Title" tal:replace="structure python:here.wikilink('['+bltitle+']')"> </a> 
+       		    <br />
                   </span>
                 </li>
               </ol>
@@ -127,12 +115,8 @@
                   <input type="submit" value="^" style="padding:0px;visibility:hidden;" tal:condition="not:repeat/cname/index" />
                   <input type="submit" value="^" style="padding:0px;" tal:condition="repeat/cname/index" />
                 </form>
-                <a tal:define="cpage python:here.pageWithName(cname);"
-                   tal:attributes="href cpage/pageUrl;
-                                   title cpage/linkTitle|nothing;"
-                   tal:content="cname"
-                   >cpage</a>
-                <br />
+		<a tal:replace="structure python:here.wikilink('['+cname+']')"> </a>
+		<br />
               </li>
             </ol>
           </td>

Modified: zope-zwiki/trunk/skins/zwiki/pageheader.pt
===================================================================
--- zope-zwiki/trunk/skins/zwiki/pageheader.pt	2007-04-08 14:54:05 UTC (rev 761)
+++ zope-zwiki/trunk/skins/zwiki/pageheader.pt	2007-04-08 14:55:27 UTC (rev 762)
@@ -22,9 +22,15 @@
                 <a tal:attributes="href here/wiki_url"
                    title="go to home page" 
                    i18n:attributes="title">
-                  <img src="misc_/ZWiki/ZWikiPage_icon" height="48" width="48" 
+                  <p tal:condition="nothing">workaround for zope bug http://www.zope.org/Collectors/Zope/2302</p>
+                  <img tal:condition="here/site_logo|nothing"
+                       tal:replace="structure here/site_logo"
+                       />
+                  <img tal:condition="not:here/site_logo|nothing"
+                       src="misc_/ZWiki/ZWikiPage_icon" height="48" width="48"
                        border="0" alt="home" i18n:attributes="alt"
-                       tal:replace="structure here/site_logo|default" /></a>
+                       />
+                </a>
                 &nbsp;
               </span>
             </td>

Modified: zope-zwiki/trunk/version.txt
===================================================================
--- zope-zwiki/trunk/version.txt	2007-04-08 14:54:05 UTC (rev 761)
+++ zope-zwiki/trunk/version.txt	2007-04-08 14:55:27 UTC (rev 762)
@@ -1 +1 @@
-ZWiki-0-58-0
+ZWiki-0-59-0

Modified: zope-zwiki/trunk/wikis/basic/FrontPage.stx
===================================================================
--- zope-zwiki/trunk/wikis/basic/FrontPage.stx	2007-04-08 14:54:05 UTC (rev 761)
+++ zope-zwiki/trunk/wikis/basic/FrontPage.stx	2007-04-08 14:55:27 UTC (rev 762)
@@ -12,7 +12,7 @@
 
 - **Permissions** <br />
 You normally configure permissions in the wiki folder's Security tab in
-the ZMI. ZWiki:FAQs has a list.
+the ZMI. ZWiki:QuickReference has a list.
 
 - **Mail out (subscription)** <br /> 
 To mail out comments, use the ZMI to add a 'mail_replyto' string property
@@ -22,7 +22,7 @@
 
 - **Mail in** <br />
 So that users will be able to reply to comments by mail - 
-see ZWiki:WikiMail.
+see ZWiki:ConfiguringWikiMail.
 
 - **External (client-side) editing** <br /> 
 
@@ -32,12 +32,12 @@
 
 - **A bug tracker** <br />
 A simple issue tracker integrated with the wiki.  See
-ZWiki:HowToInstallAZwikiTracker
+ZWiki:HowToSetUpAZwikiTracker
 
 - **DTML** <br /> 
 If you want to enable live DTML code in pages, add a true allow_dtml
 boolean property on the folder. This makes your server much more
-vulnerable to abuse, you should be aware of the ZWiki:ZwikiSecurity
+vulnerable to abuse, you should be aware of the ZWiki:SecurityDiscussion
 implications.
 
 Enjoy your wiki!

Modified: zope-zwiki/trunk/wikis/basic/standard_error_message.dtml
===================================================================
--- zope-zwiki/trunk/wikis/basic/standard_error_message.dtml	2007-04-08 14:54:05 UTC (rev 761)
+++ zope-zwiki/trunk/wikis/basic/standard_error_message.dtml	2007-04-08 14:55:27 UTC (rev 762)
@@ -39,7 +39,7 @@
         <input type="hidden" name="page" value="&dtml-searchexpr;">
         <input type="submit" value="create this page">
       </form>
-      <form action="<dtml-var "here.searchUrl()">
+      <form action="<dtml-var "here.searchUrl()">"
             method="GET" enctype="multipart/form-data">
         <input type="hidden" name="expr" value="&dtml-searchexpr;">
         <input type="submit" value="search for it">




More information about the pkg-zope-commits mailing list