changeset 1541:7796119a6233

Pulled from main repo
author Jaiditya Mathur <jaiditya.mathur@gmail.com>
date Wed, 18 Jul 2012 00:51:44 +0530
parents 25736b92353b (current diff) 9a165b096ff9 (diff)
children 7deb0683d641
files MoinMoin/config/default.py MoinMoin/static/js/common.js MoinMoin/static/js/index_action.js MoinMoin/templates/common.js
diffstat 14 files changed, 3655 insertions(+), 2347 deletions(-) [+]
line wrap: on
line diff
--- a/MoinMoin/apps/frontend/views.py	Wed Jul 18 00:42:48 2012 +0530
+++ b/MoinMoin/apps/frontend/views.py	Wed Jul 18 00:51:44 2012 +0530
@@ -18,6 +18,7 @@
 import re
 import difflib
 import time
+import mimetypes
 from datetime import datetime
 from itertools import chain
 from collections import namedtuple
@@ -28,7 +29,7 @@
 except ImportError:
     import simplejson as json
 
-from flask import request, url_for, flash, Response, redirect, session, abort, jsonify
+from flask import request, url_for, flash, Response, make_response, redirect, session, abort, jsonify
 from flask import current_app as app
 from flask import g as flaskg
 from flaskext.babel import format_date
@@ -1870,6 +1871,18 @@
                            item_name=tag,
                            item_names=item_names)
 
+
+@frontend.route('/+template/<path:filename>')
+def template(filename):
+    """
+    serve a rendered template from <filename>
+    """
+    content = render_template(filename)
+    ct, enc = mimetypes.guess_type(filename)
+    response = make_response((content, 200, {'content-type': ct or 'text/plain;charset=utf-8'}))
+    return response
+
+
 @frontend.errorhandler(404)
 def page_not_found(e):
     return render_template('404.html',
--- a/MoinMoin/config/default.py	Wed Jul 18 00:42:48 2012 +0530
+++ b/MoinMoin/config/default.py	Wed Jul 18 00:51:44 2012 +0530
@@ -366,9 +366,8 @@
         ('frontend.modify_item', L_('Modify'), L_('Edit or Upload'), True, ),
         ('special.supplementation', None, None, False, ),
         ('frontend.index', L_('Index'), L_('List sub-items'), False, ),
-        # The | character in the comments and transclusions lines below separate the off/on title (tooltip) values used by javascript
-        ('special.comments', L_('Comments'), L_('Show comments|Hide comments'), True, ),
-        ('special.transclusions', L_('Transclusions'), L_('Show transclusions|Hide transclusions'), True, ),
+        ('special.comments', L_('Comments'), L_('Hide comments'), True, ),
+        ('special.transclusions', L_('Transclusions'), L_('Show transclusions'), True, ),
         ('frontend.highlight_item', L_('Highlight'), L_('Show with Syntax-Highlighting'), True, ),
         ('frontend.show_item_meta', L_('Meta'), L_('Display Metadata'), True, ),
         ('frontend.quicklink_item', None, L_('Create or remove a navigation link to this item'), False, ),
--- a/MoinMoin/static/js/common.js	Wed Jul 18 00:42:48 2012 +0530
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,490 +0,0 @@
-//
-// MoinMoin2 commonly used JavaScript functions
-//
-/*jslint browser: true, */
-/*global $:false */
-
-
-// Enter edit mode when user doubleclicks within the page body.  Executed once on page load.
-function editOnDoubleClick() {
-    "use strict";
-    var modifyButton;
-    // is edit on doubleclick available for this user and item?
-    if (document.getElementById('moin-edit-on-doubleclick')) {
-        modifyButton = $('.moin-modify-button')[0];
-        if (modifyButton) {
-            // add a doubleclick action to the body tag
-            $('body').dblclick(function () {
-                document.location = modifyButton.href;
-            });
-        }
-    }
-}
-$(document).ready(editOnDoubleClick);
-
-
-
-// Insert Zero-Width-Space characters into long text strings of textNode elements.  Executed on page load.
-// Firefox does not support CSS with {word-wrap: break-word;} within tables.
-// As a result, Firefox may display tables with long urls or page names as very wide tables.
-// This function alters table cells by inserting a zero-width-space into long text strings after every 5 characters.
-// The moin-wordbreak class is intended for use on TD elements, but may be used on TABLE, TR, THEAD, TBODY, or TFOOT.
-function moinFirefoxWordBreak() {
-    "use strict";
-    // TODO:  Test for browser version when/if a future Firefox supports break-word within tables.
-    if (!$.browser.mozilla) {
-        return;
-    }
-    var child, words, parents, i, j;
-    // Only textNodes are of interest, but there is no way to select them directly.
-    // Select all elements with the moin-wordbreak class and add all selectable descendants of those elements.
-    // Then search for children that are textNodes; TDs or THs and elements descended from them are likely parents of textNodes.
-    parents = $(".moin-wordbreak").add(".moin-wordbreak *");
-    for (i = 0; i < parents.length; i += 1) {
-        child = parents[i].firstChild;
-        while (child) {
-            if (child.nodeType === 3) {
-                words = child.textContent.split(" ");
-                for (j = 0; j < words.length; j += 1) {
-                    // \u200B denotes a zero-width-space character (for easy testing, replace with a visible character like Q)
-                    words[j] = words[j].replace(/(.{5})/g, "$1\u200B");
-                }
-                child.textContent = words.join(" ");
-            }
-            child = child.nextSibling;
-        }
-    }
-}
-$(moinFirefoxWordBreak);
-
-
-
-// toggleComments is executed when user clicks a Comments button and conditionally on dom ready.
-var pageComments = null, // will hold list of elements with class "comment"
-    commentsShowTitle = '', // "Show comments"
-    commentsHideTitle = ''; // "Hide comments"
-function toggleComments() {
-    "use strict";
-    // Toggle visibility of every tag with class "comment"
-    var buttons = $('.moin-toggle-comments-button > a');
-    if (pageComments.is(':hidden')) {
-        pageComments.show();
-        buttons.attr('title', commentsHideTitle);
-    } else {
-        pageComments.hide();
-        buttons.attr('title', commentsShowTitle);
-    }
-}
-
-// Comments initialization is executed once after document ready.
-function initToggleComments() {
-    "use strict";
-    var titles;
-    pageComments = $('.comment');
-    if (pageComments.length > 0) {
-        // There are comments, so show itemview Comments button
-        $('.moin-toggle-comments-button').css('display', '');
-        // read translated show|hide Comments button title, split into show and hide parts, and save
-        titles = $('.moin-toggle-comments-button > a').attr('title').split('|');
-        if (titles.length === 2) {
-            commentsShowTitle = titles[0];
-            commentsHideTitle = titles[1];
-            $('.moin-toggle-comments-button > a').attr('title', commentsHideTitle);
-        }
-        // comments are visible; per user option, hide comments if there is not a <br id="moin-show-comments" />
-        if (!document.getElementById('moin-show-comments')) {
-            toggleComments();
-        }
-    }
-}
-$(document).ready(initToggleComments);
-
-
-
-// toggleTransclusionOverlays is executed when user clicks a Transclusions button on the Show item page.
-var transclusionShowTitle = '', // "Show Transclusions"
-    transclusionHideTitle = ''; // "Hide Transclusions"
-function toggleTransclusionOverlays() {
-    "use strict";
-    var overlays = $('.moin-item-overlay-ul, .moin-item-overlay-lr'),
-        buttons;
-    if (overlays.length > 0) {
-        buttons = $('.moin-transclusions-button > a');
-        if (overlays.is(':visible')) {
-            overlays.hide();
-            buttons.attr('title', transclusionShowTitle);
-        } else {
-            overlays.show();
-            buttons.attr('title', transclusionHideTitle);
-        }
-    }
-}
-
-// Transclusion initialization is executed once after document ready.
-function initTransclusionOverlays() {
-    "use strict";
-    var elem, overlayUL, overlayLR, wrapper, wrappers, transclusions, titles,
-        rightArrow = '\u2192';
-    // get list of elements to be wrapped; must work in reverse order in case there are nested transclusions
-    transclusions = $($('.moin-transclusion').get().reverse());
-    transclusions.each(function (index) {
-        elem = transclusions[index];
-        // if this is the transcluded item page, do not wrap (avoid creating useless overlay links to same page)
-        if (location.pathname !== elem.getAttribute('data-href')) {
-            if (elem.tagName === 'DIV') {
-                wrapper = $('<div class="moin-item-wrapper"></div>');
-            } else {
-                wrapper = $('<span class="moin-item-wrapper"></span>');
-            }
-            overlayUL = $('<a class="moin-item-overlay-ul"></a>');
-            $(overlayUL).attr('href', elem.getAttribute('data-href'));
-            $(overlayUL).append(rightArrow);
-            overlayLR = $(overlayUL).clone(true);
-            $(overlayLR).attr('class', 'moin-item-overlay-lr');
-            // if the parent of this element is an A, then wrap parent (avoid A's within A's)
-            if ($(elem).parent()[0].tagName === 'A') {
-                elem = $(elem).parent()[0];
-            }
-            // wrap element, add UL and LR overlay siblings, and replace old elem with wrapped elem
-            $(wrapper).append($(elem).clone(true));
-            $(wrapper).append(overlayUL);
-            $(wrapper).append(overlayLR);
-            $(elem).replaceWith(wrapper);
-        }
-    });
-    // if an element was wrapped above, then make the Transclusions buttons visible
-    wrappers = $('.moin-item-wrapper');
-    if (wrappers.length > 0) {
-        $('.moin-transclusions-button').css('display', '');
-        // read translated show|hide Transclusions button title, split into show and hide parts, and save
-        titles = $('.moin-transclusions-button > a').attr('title').split('|');
-        if (titles.length === 2) {
-            transclusionShowTitle = titles[0];
-            transclusionHideTitle = titles[1];
-            $('.moin-transclusions-button > a').attr('title', transclusionShowTitle);
-        }
-    }
-}
-$(document).ready(initTransclusionOverlays);
-
-
-
-// Executed on page load.  If logged in user has less than 6 quicklinks,  do nothing.
-// Else, show the first five links, hide the others, and append a >>> button to show hidden quicklinks on mouseover.
-function QuicklinksExpander() {
-    "use strict";
-    var QUICKLINKS_EXPAND = ">>>",
-        QUICKLINKS_COLLAPSE = "<<<",
-        QUICKLINKS_MAX = 5,
-        newThis;
-    // 8 helper functions
-    function getLinks() {
-        return $(".userlink:not(.moin-navibar-icon)");
-    }
-    function createIcon(txt) {
-        var li = document.createElement("li"),
-            arrows = document.createTextNode(txt);
-        li.setAttribute("class", "moin-userlink moin-navibar-icon");
-        li.appendChild(arrows);
-        return li;
-    }
-    function appendIcon(txt) {
-        var elem = createIcon(txt);
-        document.getElementById("moin-navibar").appendChild(elem);
-        return elem;
-    }
-    function shouldHide(links) {
-        // links should be hidden only if user has created so many that it impacts nice page layout
-        return (links.length > QUICKLINKS_MAX);
-    }
-    function getHideableLinks() {
-        return getLinks().slice(QUICKLINKS_MAX);
-    }
-    function hideShowHideableLinks(action) {
-        getHideableLinks().each(function (i) {
-            if (action === "hide") {
-                $(this).hide();
-            } else {
-                $(this).show();
-            }
-        });
-    }
-    function hideLinks() {
-        hideShowHideableLinks("hide");
-    }
-    function showLinks() {
-        hideShowHideableLinks("show");
-    }
-
-    this.getLinks = getLinks;
-    this.appendIcon = appendIcon;
-    this.shouldHide = shouldHide;
-    this.getHideableLinks = getHideableLinks;
-    this.hideLinks = hideLinks;
-    this.showLinks = showLinks;
-    this.navibar = $("#moin-header");
-    this.link = this.getLinks();
-    this.hideable = this.getHideableLinks();
-
-    if (this.shouldHide(this.link)) {
-        this.expandIcon = $(this.appendIcon(QUICKLINKS_EXPAND));
-        this.closeIcon = $(this.appendIcon(QUICKLINKS_COLLAPSE));
-        this.closeIcon.hide();
-        // Hide everything after the first QUICKLINKS_MAX links
-        this.hideLinks();
-        newThis = this;
-        // When the user mouses over the icon link,
-        // Show the hidden links
-        this.expandIcon.mouseenter(function (e) {
-            newThis.showLinks();
-            newThis.expandIcon.hide();
-            newThis.closeIcon.show();
-        });
-        this.closeIcon.mouseenter(function (e) {
-            newThis.hideLinks();
-            newThis.expandIcon.show();
-            newThis.closeIcon.hide();
-        });
-    }
-}
-$(document).ready(QuicklinksExpander);
-
-
-
-// When a page has subitems, this toggles the subtrees in the Subitems sidebar.
-function toggleSubtree(item) {
-    "use strict";
-    var subtree = $(item).siblings("ul");
-    subtree.toggle(200);
-}
-
-
-
-// guessContentType is a helper function for the transcludeSubitem and linkSubItem functions defined below.
-function guessContentType() {
-    "use strict";
-    // Used in the modify_text template to guess the data content type client-side
-    // This approach has the advantage of reacting to content type changes for the
-    // link/transclude code without having to re-fetch the page
-    var match,
-        meta_text = $("#f_meta_text").val(),
-        ctype_regex = /["']contenttype["']\s*:\s*["']([\w-_+.]+\/[\w-_+.]+)(;|["'])/;
-    if (meta_text) {
-        match = ctype_regex.exec(meta_text);
-        if (match) {return match[1]; }
-    }
-    // text/plain is the default value
-    return "text/plain";
-}
-
-// Executed when user clicks transclude-action button defined in modify_text.html.
-// When a page with subitems is modified, a subitems sidebar is present. User may
-// position caret in textarea and click button to insert transclusion into textarea.
-function transcludeSubitem(subitem_name, fullname) {
-    "use strict";
-    function moinwiki(subitem_name, fullname) {
-        return "{{" + fullname.replace("{{", "\\}}") + "}} ";
-    }
-    function mediawiki(subitem_name, fullname) {
-        return "{{:" + fullname.replace("}}", "\\}}") + "}} ";
-    }
-    function rst(subitem_name, fullname) {
-        return "\n.. include:: " + subitem_name + "\n";
-    }
-    function docbook(subitem_name, fullname) {
-        return ""; //XXX: the docbook converter currently doesn't handle transclusion with <ref> tags
-    }
-    var transclude_formats = {
-            "text/x.moin.wiki" : moinwiki,
-            "text/x.moin.creole" : moinwiki,
-            "text/x-mediawiki" : mediawiki,
-            "text/x-rst" : rst,
-            "application/docbook+xml" : docbook,
-            "text/plain" : function (x) {return x + " "; }
-        },
-        ctype = guessContentType(),
-        input_element = $("#f_data_text"),
-        ctype_format = transclude_formats[ctype];
-    if (!ctype_format) {
-        ctype_format = transclude_formats["text/plain"];
-    }
-    input_element.val(input_element.val() + ctype_format(subitem_name, fullname));
-    input_element.focus();
-}
-
-// Executed when user clicks link-action button defined in modify_text.html.
-// When a page with subitems is modified, a subitems sidebar is present. User may
-// position caret in textarea and click button to insert link into textarea.
-function linkSubitem(subitem_name, fullname) {
-    "use strict";
-    function moinwiki(subitem_name, fullname) {
-        return "[[" + fullname.replace("]", "\\]") + "|" + subitem_name.replace("]", "\\]") + "]] ";
-    }
-    function rst(subitem_name, fullname) {
-        return "`" + subitem_name.replace(">", "\\>").replace("`", "\\`") + " <" + fullname.replace(">", "\\>") + ">`_ ";
-    }
-    function docbook(subitem_name, fullname) {
-        return '<ulink url="/' + fullname.replace('"', '\\"') + '">' + subitem_name + "</ulink>";
-    }
-    var link_formats = {
-            "text/x.moin.wiki" : moinwiki,
-            "text/x.moin.creole" : moinwiki,
-            "text/x-mediawiki" : moinwiki,
-            "text/x-rst" : rst,
-            "application/docbook+xml" : docbook,
-            "text/plain" : function (x) {return x + " "; }
-        },
-        ctype = guessContentType(),
-        input_element = $("#f_data_text"),
-        ctype_format = link_formats[ctype];
-    if (!ctype_format) {
-        ctype_format = link_formats["text/plain"];
-    }
-    input_element.val(input_element.val() + ctype_format(subitem_name, fullname));
-    input_element.focus();
-}
-
-
-
-// Executed on page load.  If this is the user "Settings" page, make the long 6-form page
-// appear as a shorter page with a row of tabs near the top.  User clicks a tab to select target form.
-function initMoinTabs() {
-    "use strict";
-    // find all .moin-tabs elements and initialize them
-    $('.moin-tabs').each(function () {
-        var tabs = $(this),
-            titles = $(document.createElement('ul')),
-            lastLocationHash;
-        titles.addClass('moin-tab-titles');
-
-        // switching between tabs based on the current location hash
-        function updateFromLocationHash() {
-            if (location.hash !== undefined && location.hash !== '' && tabs.children(location.hash).length) {
-                if (location.hash !== lastLocationHash) {
-                    lastLocationHash = location.hash;
-                    tabs.children('.moin-tab-body').hide();
-                    tabs.children(location.hash).show();
-                    titles.children('li').children('a').removeClass('current');
-                    titles.children('li').children('a[href="' + location.hash + '"]').addClass('current');
-                }
-            } else {
-                $(titles.children('li').children('a')[0]).click();
-            }
-        }
-
-        // move all tab titles to an <ul> at the beginning of .moin-tabs
-        tabs.children('.moin-tab-title').each(function () {
-            var li = $(document.createElement('li')),
-                a = $(this).children('a');
-            a.click(function () {
-                location.hash = this.hash;
-                updateFromLocationHash();
-                return false;
-            });
-            li.append(a);
-            titles.append(li);
-            $(this).remove();
-        });
-        tabs.prepend(titles);
-
-        updateFromLocationHash();
-        setInterval(updateFromLocationHash, 40); // there is no event for that
-    });
-}
-$(document).ready(initMoinTabs);
-
-
-
-// Executed on page load.  Useful only if this is the user "Settings" page.
-// Saves initial values of user "Settings" forms on client side.
-// Detects unsaved changes and sets visual indicator.
-// Processes form Submit and displays status messages and updated data.
-function initMoinUsersettings() {
-    "use strict";
-    // save initial values of each form
-    $('#moin-usersettings form').each(function () {
-        $(this).data('initialForm', $(this).serialize());
-    });
-
-    // check if any changes were made, add indicator if user changes tabs without saving form
-    function changeHandler(ev) {
-        var form = $(ev.currentTarget),
-            title = $('.moin-tab-titles a.current', form.parentsUntil('.moin-tabs').parent()),
-            e;
-        if (form.data('initialForm') === form.serialize()) {
-            // current values are identicaly to initial ones, remove all change indicators (if any)
-            $('.change-indicator', title).remove();
-        } else {
-            // the values differ
-            if (!$('.change-indicator', title).length) {
-                // only add a change indicator if there none
-                e = $(document.createElement('span'));
-                e.addClass('change-indicator');
-                e.text('*');
-                title.append(e);
-            }
-        }
-    }
-    // attach above function to all forms on page
-    $('#moin-usersettings form').change(changeHandler);
-
-    // executed when user clicks submit button on one of the tabbed forms
-    function submitHandler(ev) {
-        var form = $(ev.target),
-            button = $('button', form),
-            buttonBaseText = button.html(),
-            buttonDotList = [' .&nbsp;&nbsp;', ' &nbsp;.&nbsp;', ' &nbsp;&nbsp;.'],
-            buttonDotIndex = 0,
-            buttonDotAnimation;
-
-        // disable the button
-        button.attr('disabled', true);
-
-        // remove change indicators from the current tab as we are now saving it
-        $('.moin-tab-titles a.current .change-indicator',
-                form.parentsUntil('.moin-tabs').parent()).remove();
-
-        // animate the submit button to indicating a running request
-        function buttonRunAnimation() {
-            button.html(buttonBaseText + buttonDotList[buttonDotIndex % buttonDotList.length]);
-            buttonDotIndex += 1;
-        }
-        buttonDotAnimation = setInterval(buttonRunAnimation, 500);
-        buttonRunAnimation();
-
-        // send the form to the server
-        $.post(form.attr('action'), form.serialize(), function (data) {
-            var i, f, newform;
-            clearInterval(buttonDotAnimation);
-            // if the response indicates a redirect, set the new location
-            if (data.redirect) {
-                location.href = data.redirect;
-                return;
-            }
-            // remove all flash messages previously added via javascript
-            $('#moin-flash .moin-flash-javascript').remove();
-            // add new flash messages from the response
-            for (i = 0; i < data.flash.length; i += 1) {
-                f = $(document.createElement('p'));
-                f.html(data.flash[i][0]);
-                f.addClass('moin-flash');
-                f.addClass('moin-flash-javascript');
-                f.addClass('moin-flash-' + data.flash[i][1]);
-                $('#moin-flash').append(f);
-            }
-            // get the new form element from the response
-            newform = $(data.form);
-            // set event handlers on the new form
-            newform.submit(submitHandler);
-            newform.change(changeHandler);
-            // store the forms initial data
-            newform.data('initialForm', newform.serialize());
-            // replace the old form with the new one
-            form.replaceWith(newform);
-        }, 'json');
-        return false;
-    }
-    // attach above function to all form submit buttons
-    $('#moin-usersettings form').submit(submitHandler);
-}
-$(document).ready(initMoinUsersettings);
--- a/MoinMoin/static/js/index_action.js	Wed Jul 18 00:42:48 2012 +0530
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,286 +0,0 @@
-/*
- * Click and submit handlers for form elements on the global index page.
- * Copyright 2011, AkashSinha<akash2607@gmail.com>
- * License: GNU GPL v2 (or any later version), see LICENSE.txt for details.
- */
-
-/*jslint browser: true, */
-/*global $:false */
-
-// This anonymous function is executed once after a global index page loads.
-$("document").ready(function () {
-    "use strict";
-
-    var POPUP_FADE_TIME = 200, // fade in, fade out times for selected popups
-        IFRAME_CREATE_DELAY = 200, // delay between start of multiple downloads
-        IFRAME_REMOVE_DELAY = 3000, // life expectancy of iframe used for file downloads
-        MESSAGE_VIEW_TIME = 4000, // life expectancy of delete/destroy status messages
-        ACTION_LOADING = {"delete": "Deleting..", "destroy": "Destroying.."}, // process started messages
-        ACTION_DONE = {"delete": "deleted", "destroy": "destroyed"}; // process completed messages
-
-    // called by click handlers New Item, Delete item, and Destroy item within Actions dropdown menu
-    function showpop(action) {
-        // hide Actions popup and show either New Item or Comment popup
-        $(".popup-container").css("display", "none");
-        if (action === "newitem") {
-            $("#popup-for-newitem").css("display", "block");
-            $("#file_upload").appendTo("#popup-for-newitem .popup-body");
-            $(".upload-form").css("display", "block");
-        } else {
-            $("#popup-for-action").css("display", "block");
-            $(".popup-comment").removeClass("blank");
-            $(".popup-comment").val("");
-            $(".popup-action").val(action);
-        }
-        $("#popup").fadeIn();
-        $("#lightbox").css("display", "block");
-    }
-
-    // called by click handlers within "Create new item" and "Please provide comment" popups
-    function hidepop() {
-        // hide popup
-        $("#popup").css("display", "none");
-        $("#lightbox").css("display", "none");
-    }
-
-    // called by Actions Download click handler
-    function startFileDownload(elem) {
-        // create a hidden iframe to start a file download, then remove it after 3 seconds
-        var frame = $('<iframe style="display: none;"></iframe>');
-        frame.attr('src', $(elem).attr('href'));
-        $(elem).after(frame);
-        setTimeout(function () { frame.remove(); }, IFRAME_REMOVE_DELAY);
-    }
-
-    // called by do_action when an item is successfully deleted or destroyed
-    function hide(item_link) {
-        // remove a deleted or destroyed item from current display
-        item_link.parent().remove();
-    }
-
-    // called by do_action when item cannot be deleted or destroyed
-    function show_conflict(item_link) {
-        // mark an item as having failed a delete or destroy operation
-        item_link.removeClass().addClass("moin-conflict");
-        item_link.parent().removeClass();
-    }
-
-    // executed via the "provide comment" popup triggered by an Actions Delete or Destroy selection
-    function do_action(comment, action) {
-        // create an array of selected item names
-        var links = [],
-            itemnames,
-            actionTrigger,
-            url;
-        $(".selected-item").children("a.moin-item").each(function () {
-            var itemname = $(this).attr("title");
-            links.push(itemname);
-        });
-        // hide comment popup, display "deleting..." or "destroying..."
-        $("#popup").css("display", "none");
-        $(".moin-index-message span").text(ACTION_LOADING[action]);
-        $(".moin-index-message").css("display", "block");
-        // create a transaction to delete or destroy selected items
-        itemnames = JSON.stringify(links);
-        actionTrigger = "moin-" + action + "-trigger";
-        url = $("#" + actionTrigger).attr("data-actionurl");
-        $.post(url, {
-            itemnames: itemnames,
-            comment: comment
-        }, function (data) {
-            // process post results
-            var itemnames = data.itemnames,
-                action_status = data.status,
-                success_item = 0,
-                left_item = 0,
-                message;
-            $.each(itemnames, function (itemindex, itemname) {
-                // hide (remove) deleted/destroyed items, or show conflict (ACL rules, or ?)
-                if (action_status[itemindex]) {
-                    hide($('.selected-item').children('a.moin-item[title="' + itemname + '"]'));
-                    success_item += 1;
-                } else {
-                    show_conflict($('.selected-item').children('a.moin-item[title="' + itemname + '"]'));
-                    left_item += 1;
-                }
-            });
-            // show a message summarizing delete/destroy results for 4 seconds
-            message = "Items " + ACTION_DONE[action] + ": " + success_item;
-            if (left_item) {
-                message += ", Items not " + ACTION_DONE[action] + ": " + left_item + ".";
-            }
-            $(".moin-index-message span").text(message);
-            setTimeout(function () {
-                $(".moin-index-message").fadeOut();
-            }, MESSAGE_VIEW_TIME);
-        }, "json");
-    }
-
-    // -- Select All handlers start here
-
-    // add click handler to "Select All" tab to select/deselect all items
-    $(".moin-select-allitem").click(function () {
-        // toggle classes
-        if ($(this).hasClass("allitem-toselect")) {
-            $(".moin-item-index div").removeClass().addClass("selected-item");
-            $(this).removeClass("allitem-toselect").addClass("allitem-selected");
-        } else {
-            $(this).removeClass("allitem-selected").addClass("allitem-toselect");
-            $(".moin-item-index div").removeClass();
-        }
-    });
-
-    // -- Actions handlers start here
-
-    // add click handler to "Actions" drop down list
-    // also executed via .click call when user clicks on an action (new, download, delete, destroy)
-    $(".show-action").click(function () {
-        // show/hide actions drop down list
-        var actionsDiv = $(this).parent().parent();
-        if (actionsDiv.find("ul:first").is(":visible")) {
-            actionsDiv.find("ul:first").fadeOut(POPUP_FADE_TIME);
-            actionsDiv.removeClass("action-visible");
-        } else {
-            actionsDiv.find("ul:first").fadeIn(POPUP_FADE_TIME);
-            actionsDiv.addClass("action-visible");
-        }
-    });
-
-    // add click handler to "New Item" action tab entry
-    $("#moin-create-newitem").click(function () {
-        // show new item popup and hide actions dropdown
-        showpop("newitem");
-        $(".show-action").trigger("click");
-    });
-
-    // add click handler to close button "X" on new item popup
-    $(".popup-cancel").click(function () {
-        // if files are selected for upload, add to drag and drop area; hide popup
-        if ($("#popup-for-newitem:visible").length) {
-            $("#file_upload").appendTo("#moin-upload-cont");
-            $(".upload-form").css("display", "none");
-        }
-        hidepop();
-    });
-
-    // add submit handler to "Create" button on new item popup
-    // This is a workaround for browsers that do not support "required" attribute (ie9, safari 5.1)
-    // note: The creation of a new item is performed via action=... attribute on form
-    $("#popup-for-newitem").find("form:first").submit(function () {
-        // if no item name was provided show hint and stop form action
-        var itembox = $(this).children("input[name='newitem']"),
-            itemname = itembox.val();
-        if ($.trim(itemname) === "") {
-            itembox.addClass("blank");
-            itembox.focus();
-            return false;
-        }
-    });
-
-    // add click handler to "Download" button of Actions dropdown
-    $("#moin-download-trigger").click(function () {
-        if (!($("div.selected-item").length)) {
-            // no items selected, show message for 4 seconds
-            $(".moin-index-message span").text("Nothing was selected.");
-            $(".moin-index-message").fadeIn();
-            setTimeout(function () {
-                $(".moin-index-message").fadeOut();
-            }, MESSAGE_VIEW_TIME);
-        } else {
-            // download selected files (add small delay to start of multiple downloads for IE9)
-            $(".selected-item").children(".moin-download-link").each(function (index, element) {
-                // at 0 ms IE9 skipped 41 of 42 downloads, at 100 ms IE9 skipped 14 of 42, success at 200 ms
-                var wait = index * IFRAME_CREATE_DELAY;
-                setTimeout(function () { startFileDownload(element); }, wait);
-            });
-        }
-        // hide the list of actions
-        $(".show-action").trigger("click");
-    });
-
-    // add click handler to "Delete" and "Destroy" buttons of Actions dropdown
-    $(".moin-action-tab").click(function () {
-        // Show error msg if nothing selected, else show comment popup. Hide actions dropdown.
-        if (!($("div.selected-item").length)) {
-            $(".moin-index-message span").text("Nothing was selected.");
-            $(".moin-index-message").fadeIn();
-            setTimeout(function () {
-                $(".moin-index-message").fadeOut();
-            }, MESSAGE_VIEW_TIME);
-        } else {
-            if (this.id === "moin-delete-trigger") {
-                showpop("delete");
-            } else {
-                showpop("destroy");
-            }
-        }
-        $(".show-action").trigger("click");
-    });
-
-    // add click handler to "Submit" button on "Please provide comment..." popup
-    $(".popup-submit").click(function () {
-        // process delete or destroy action
-        var comment = $(".popup-comment").val(),
-            action = $(".popup-action").val();
-        comment = $.trim(comment);
-        do_action(comment, action);
-        hidepop();
-    });
-
-    // -- Filter by content type handlers start here
-
-    // add click handler to "Filter by content type" button
-    $(".moin-contenttypes-wrapper").children("div").click(function () {
-        // show/hide content type dropdown
-        var wrapper = $(this).parent();
-        if (wrapper.find("form:visible").length) {
-            $(".moin-contenttypes-wrapper").find("form").fadeOut(POPUP_FADE_TIME);
-            $(this).removeClass().addClass("ct-hide");
-        } else {
-            $(".moin-contenttypes-wrapper").find("form").fadeIn(POPUP_FADE_TIME);
-            $(this).removeClass().addClass("ct-shown");
-        }
-    });
-
-    // add click handler to "Toggle" button on "Filter by content type" dropdown
-    $(".filter-toggle").click(function () {
-        // reverse checked/unchecked for each content type
-        $(".moin-contenttypes-wrapper form").find("input[type='checkbox']").each(function () {
-            if ($(this).attr("checked")) {
-                $(this).removeAttr("checked");
-            } else {
-                $(this).attr("checked", "checked");
-            }
-        });
-        return false;
-    });
-
-    // add click handler to "More" button on "Filter by content type" dropdown
-    $(".filter-more").click(function () {
-        // show/hide help text describing each content type
-        var helper_texts = $(".moin-contenttypes-wrapper form").find(".helper-text:visible");
-        if (helper_texts.length) {
-            helper_texts.fadeOut();
-        } else {
-            $(".moin-contenttypes-wrapper form").find(".helper-text").css("display", "block");
-        }
-
-        return false;
-    });
-
-    // -- individual item handlers start here
-
-    // add click handlers to all items shown on global index page
-    $(".moin-select-item").click(function () {
-        // toggle selection classes
-        if ($(this).parent().hasClass("selected-item")) {
-            $(this).parent().removeClass("selected-item");
-            if ($(".moin-select-allitem").hasClass("allitem-selected")) {
-                $(".moin-select-allitem").removeClass("allitem-selected").addClass("allitem-toselect");
-            }
-        } else {
-            $(this).parent().addClass("selected-item");
-        }
-    });
-});
-
--- a/MoinMoin/templates/base.html	Wed Jul 18 00:42:48 2012 +0530
+++ b/MoinMoin/templates/base.html	Wed Jul 18 00:51:44 2012 +0530
@@ -48,7 +48,7 @@
     {% block head_scripts %}
     <script src="{{ url_for('serve.files', name='jquery', filename='jquery.min.js') }}"></script>
     <script src="{{ url_for('serve.files', name='svgweb', filename='svg.js') }}"></script>
-    <script src="{{ url_for('static', filename='js/common.js') }}"></script>
+    <script src="{{ url_for('frontend.template', filename='common.js') }}"></script>
     {{ scripts }}
     <!--[if lt IE 9]>
         {# TODO: use a local copy later #}
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/MoinMoin/templates/common.js	Wed Jul 18 00:51:44 2012 +0530
@@ -0,0 +1,476 @@
+//
+// MoinMoin2 commonly used JavaScript functions
+//
+/*jslint browser: true, */
+/*global $:false */
+
+
+// Enter edit mode when user doubleclicks within the page body.  Executed once on page load.
+function editOnDoubleClick() {
+    "use strict";
+    var modifyButton;
+    // is edit on doubleclick available for this user and item?
+    if (document.getElementById('moin-edit-on-doubleclick')) {
+        modifyButton = $('.moin-modify-button')[0];
+        if (modifyButton) {
+            // add a doubleclick action to the body tag
+            $('body').dblclick(function () {
+                document.location = modifyButton.href;
+            });
+        }
+    }
+}
+$(document).ready(editOnDoubleClick);
+
+
+
+// Insert Zero-Width-Space characters into long text strings of textNode elements.  Executed on page load.
+// Firefox does not support CSS with {word-wrap: break-word;} within tables.
+// As a result, Firefox may display tables with long urls or page names as very wide tables.
+// This function alters table cells by inserting a zero-width-space into long text strings after every 5 characters.
+// The moin-wordbreak class is intended for use on TD elements, but may be used on TABLE, TR, THEAD, TBODY, or TFOOT.
+function moinFirefoxWordBreak() {
+    "use strict";
+    // TODO:  Test for browser version when/if a future Firefox supports break-word within tables.
+    if (!$.browser.mozilla) {
+        return;
+    }
+    var child, words, parents, i, j;
+    // Only textNodes are of interest, but there is no way to select them directly.
+    // Select all elements with the moin-wordbreak class and add all selectable descendants of those elements.
+    // Then search for children that are textNodes; TDs or THs and elements descended from them are likely parents of textNodes.
+    parents = $(".moin-wordbreak").add(".moin-wordbreak *");
+    for (i = 0; i < parents.length; i += 1) {
+        child = parents[i].firstChild;
+        while (child) {
+            if (child.nodeType === 3) {
+                words = child.textContent.split(" ");
+                for (j = 0; j < words.length; j += 1) {
+                    // \u200B denotes a zero-width-space character (for easy testing, replace with a visible character like Q)
+                    words[j] = words[j].replace(/(.{5})/g, "$1\u200B");
+                }
+                child.textContent = words.join(" ");
+            }
+            child = child.nextSibling;
+        }
+    }
+}
+$(moinFirefoxWordBreak);
+
+
+
+// toggleComments is executed when user clicks a Comments button and conditionally on dom ready.
+var pageComments = null; // will hold list of elements with class "comment"
+function toggleComments() {
+    "use strict";
+    // Toggle visibility of every tag with class "comment"
+    var buttons = $('.moin-toggle-comments-button > a');
+    if (pageComments.is(':hidden')) {
+        pageComments.show();
+        {{ "buttons.attr('title', '%s');" % _("Hide comments") }}
+    } else {
+        pageComments.hide();
+        {{ "buttons.attr('title', '%s');" % _("Show comments") }}
+    }
+}
+
+// Comments initialization is executed once after document ready.
+function initToggleComments() {
+    "use strict";
+    var titles;
+    pageComments = $('.comment');
+    if (pageComments.length > 0) {
+        // There are comments, so show itemview Comments button
+        $('.moin-toggle-comments-button').css('display', '');
+        // comments are visible; per user option, hide comments if there is not a <br id="moin-show-comments" />
+        if (!document.getElementById('moin-show-comments')) {
+            toggleComments();
+        }
+    }
+}
+$(document).ready(initToggleComments);
+
+
+
+// toggleTransclusionOverlays is executed when user clicks a Transclusions button on the Show item page.
+function toggleTransclusionOverlays() {
+    "use strict";
+    var overlays = $('.moin-item-overlay-ul, .moin-item-overlay-lr'),
+        buttons;
+    if (overlays.length > 0) {
+        buttons = $('.moin-transclusions-button > a');
+        if (overlays.is(':visible')) {
+            overlays.hide();
+            {{ "buttons.attr('title', '%s');" % _("Show transclusions") }}
+        } else {
+            overlays.show();
+            {{ "buttons.attr('title', '%s');" % _("Hide transclusions") }}
+        }
+    }
+}
+
+// Transclusion initialization is executed once after document ready.
+function initTransclusionOverlays() {
+    "use strict";
+    var elem, overlayUL, overlayLR, wrapper, wrappers, transclusions, titles,
+        rightArrow = '\u2192';
+    // get list of elements to be wrapped; must work in reverse order in case there are nested transclusions
+    transclusions = $($('.moin-transclusion').get().reverse());
+    transclusions.each(function (index) {
+        elem = transclusions[index];
+        // if this is the transcluded item page, do not wrap (avoid creating useless overlay links to same page)
+        if (location.pathname !== elem.getAttribute('data-href')) {
+            if (elem.tagName === 'DIV') {
+                wrapper = $('<div class="moin-item-wrapper"></div>');
+            } else {
+                wrapper = $('<span class="moin-item-wrapper"></span>');
+            }
+            overlayUL = $('<a class="moin-item-overlay-ul"></a>');
+            $(overlayUL).attr('href', elem.getAttribute('data-href'));
+            $(overlayUL).append(rightArrow);
+            overlayLR = $(overlayUL).clone(true);
+            $(overlayLR).attr('class', 'moin-item-overlay-lr');
+            // if the parent of this element is an A, then wrap parent (avoid A's within A's)
+            if ($(elem).parent()[0].tagName === 'A') {
+                elem = $(elem).parent()[0];
+            }
+            // wrap element, add UL and LR overlay siblings, and replace old elem with wrapped elem
+            $(wrapper).append($(elem).clone(true));
+            $(wrapper).append(overlayUL);
+            $(wrapper).append(overlayLR);
+            $(elem).replaceWith(wrapper);
+        }
+    });
+    // if an element was wrapped above, then make the Transclusions buttons visible
+    wrappers = $('.moin-item-wrapper');
+    if (wrappers.length > 0) {
+        $('.moin-transclusions-button').css('display', '');
+    }
+}
+$(document).ready(initTransclusionOverlays);
+
+
+
+// Executed on page load.  If logged in user has less than 6 quicklinks,  do nothing.
+// Else, show the first five links, hide the others, and append a >>> button to show hidden quicklinks on mouseover.
+function QuicklinksExpander() {
+    "use strict";
+    var QUICKLINKS_EXPAND = ">>>",
+        QUICKLINKS_COLLAPSE = "<<<",
+        QUICKLINKS_MAX = 5,
+        newThis;
+    // 8 helper functions
+    function getLinks() {
+        return $(".userlink:not(.moin-navibar-icon)");
+    }
+    function createIcon(txt) {
+        var li = document.createElement("li"),
+            arrows = document.createTextNode(txt);
+        li.setAttribute("class", "moin-userlink moin-navibar-icon");
+        li.appendChild(arrows);
+        return li;
+    }
+    function appendIcon(txt) {
+        var elem = createIcon(txt);
+        document.getElementById("moin-navibar").appendChild(elem);
+        return elem;
+    }
+    function shouldHide(links) {
+        // links should be hidden only if user has created so many that it impacts nice page layout
+        return (links.length > QUICKLINKS_MAX);
+    }
+    function getHideableLinks() {
+        return getLinks().slice(QUICKLINKS_MAX);
+    }
+    function hideShowHideableLinks(action) {
+        getHideableLinks().each(function (i) {
+            if (action === "hide") {
+                $(this).hide();
+            } else {
+                $(this).show();
+            }
+        });
+    }
+    function hideLinks() {
+        hideShowHideableLinks("hide");
+    }
+    function showLinks() {
+        hideShowHideableLinks("show");
+    }
+
+    this.getLinks = getLinks;
+    this.appendIcon = appendIcon;
+    this.shouldHide = shouldHide;
+    this.getHideableLinks = getHideableLinks;
+    this.hideLinks = hideLinks;
+    this.showLinks = showLinks;
+    this.navibar = $("#moin-header");
+    this.link = this.getLinks();
+    this.hideable = this.getHideableLinks();
+
+    if (this.shouldHide(this.link)) {
+        this.expandIcon = $(this.appendIcon(QUICKLINKS_EXPAND));
+        this.closeIcon = $(this.appendIcon(QUICKLINKS_COLLAPSE));
+        this.closeIcon.hide();
+        // Hide everything after the first QUICKLINKS_MAX links
+        this.hideLinks();
+        newThis = this;
+        // When the user mouses over the icon link,
+        // Show the hidden links
+        this.expandIcon.mouseenter(function (e) {
+            newThis.showLinks();
+            newThis.expandIcon.hide();
+            newThis.closeIcon.show();
+        });
+        this.closeIcon.mouseenter(function (e) {
+            newThis.hideLinks();
+            newThis.expandIcon.show();
+            newThis.closeIcon.hide();
+        });
+    }
+}
+$(document).ready(QuicklinksExpander);
+
+
+
+// When a page has subitems, this toggles the subtrees in the Subitems sidebar.
+function toggleSubtree(item) {
+    "use strict";
+    var subtree = $(item).siblings("ul");
+    subtree.toggle(200);
+}
+
+
+
+// guessContentType is a helper function for the transcludeSubitem and linkSubItem functions defined below.
+function guessContentType() {
+    "use strict";
+    // Used in the modify_text template to guess the data content type client-side
+    // This approach has the advantage of reacting to content type changes for the
+    // link/transclude code without having to re-fetch the page
+    var match,
+        meta_text = $("#f_meta_text").val(),
+        ctype_regex = /["']contenttype["']\s*:\s*["']([\w-_+.]+\/[\w-_+.]+)(;|["'])/;
+    if (meta_text) {
+        match = ctype_regex.exec(meta_text);
+        if (match) {return match[1]; }
+    }
+    // text/plain is the default value
+    return "text/plain";
+}
+
+// Executed when user clicks transclude-action button defined in modify_text.html.
+// When a page with subitems is modified, a subitems sidebar is present. User may
+// position caret in textarea and click button to insert transclusion into textarea.
+function transcludeSubitem(subitem_name, fullname) {
+    "use strict";
+    function moinwiki(subitem_name, fullname) {
+        // note: keep the many plusses, to avoid jinja2 templating kicking in
+        // when seeing two curly opening / closing braces
+        return "{"+"{" + fullname.replace("{"+"{", "\\"+"}"+"}") + "}"+"} ";
+    }
+    function mediawiki(subitem_name, fullname) {
+        // note: keep the many plusses, to avoid jinja2 templating kicking in
+        // when seeing two curly opening / closing braces
+        return "{"+"{:" + fullname.replace("}"+"}", "\\"+"}"+"}") + "}"+"} ";
+    }
+    function rst(subitem_name, fullname) {
+        return "\n.. include:: " + subitem_name + "\n";
+    }
+    function docbook(subitem_name, fullname) {
+        return ""; //XXX: the docbook converter currently doesn't handle transclusion with <ref> tags
+    }
+    var transclude_formats = {
+            "text/x.moin.wiki" : moinwiki,
+            "text/x.moin.creole" : moinwiki,
+            "text/x-mediawiki" : mediawiki,
+            "text/x-rst" : rst,
+            "application/docbook+xml" : docbook,
+            "text/plain" : function (x) {return x + " "; }
+        },
+        ctype = guessContentType(),
+        input_element = $("#f_data_text"),
+        ctype_format = transclude_formats[ctype];
+    if (!ctype_format) {
+        ctype_format = transclude_formats["text/plain"];
+    }
+    input_element.val(input_element.val() + ctype_format(subitem_name, fullname));
+    input_element.focus();
+}
+
+// Executed when user clicks link-action button defined in modify_text.html.
+// When a page with subitems is modified, a subitems sidebar is present. User may
+// position caret in textarea and click button to insert link into textarea.
+function linkSubitem(subitem_name, fullname) {
+    "use strict";
+    function moinwiki(subitem_name, fullname) {
+        return "[[" + fullname.replace("]", "\\]") + "|" + subitem_name.replace("]", "\\]") + "]] ";
+    }
+    function rst(subitem_name, fullname) {
+        return "`" + subitem_name.replace(">", "\\>").replace("`", "\\`") + " <" + fullname.replace(">", "\\>") + ">`_ ";
+    }
+    function docbook(subitem_name, fullname) {
+        return '<ulink url="/' + fullname.replace('"', '\\"') + '">' + subitem_name + "</ulink>";
+    }
+    var link_formats = {
+            "text/x.moin.wiki" : moinwiki,
+            "text/x.moin.creole" : moinwiki,
+            "text/x-mediawiki" : moinwiki,
+            "text/x-rst" : rst,
+            "application/docbook+xml" : docbook,
+            "text/plain" : function (x) {return x + " "; }
+        },
+        ctype = guessContentType(),
+        input_element = $("#f_data_text"),
+        ctype_format = link_formats[ctype];
+    if (!ctype_format) {
+        ctype_format = link_formats["text/plain"];
+    }
+    input_element.val(input_element.val() + ctype_format(subitem_name, fullname));
+    input_element.focus();
+}
+
+
+
+// Executed on page load.  If this is the user "Settings" page, make the long 6-form page
+// appear as a shorter page with a row of tabs near the top.  User clicks a tab to select target form.
+function initMoinTabs() {
+    "use strict";
+    // find all .moin-tabs elements and initialize them
+    $('.moin-tabs').each(function () {
+        var tabs = $(this),
+            titles = $(document.createElement('ul')),
+            lastLocationHash;
+        titles.addClass('moin-tab-titles');
+
+        // switching between tabs based on the current location hash
+        function updateFromLocationHash() {
+            if (location.hash !== undefined && location.hash !== '' && tabs.children(location.hash).length) {
+                if (location.hash !== lastLocationHash) {
+                    lastLocationHash = location.hash;
+                    tabs.children('.moin-tab-body').hide();
+                    tabs.children(location.hash).show();
+                    titles.children('li').children('a').removeClass('current');
+                    titles.children('li').children('a[href="' + location.hash + '"]').addClass('current');
+                }
+            } else {
+                $(titles.children('li').children('a')[0]).click();
+            }
+        }
+
+        // move all tab titles to an <ul> at the beginning of .moin-tabs
+        tabs.children('.moin-tab-title').each(function () {
+            var li = $(document.createElement('li')),
+                a = $(this).children('a');
+            a.click(function () {
+                location.hash = this.hash;
+                updateFromLocationHash();
+                return false;
+            });
+            li.append(a);
+            titles.append(li);
+            $(this).remove();
+        });
+        tabs.prepend(titles);
+
+        updateFromLocationHash();
+        setInterval(updateFromLocationHash, 40); // there is no event for that
+    });
+}
+$(document).ready(initMoinTabs);
+
+
+
+// Executed on page load.  Useful only if this is the user "Settings" page.
+// Saves initial values of user "Settings" forms on client side.
+// Detects unsaved changes and sets visual indicator.
+// Processes form Submit and displays status messages and updated data.
+function initMoinUsersettings() {
+    "use strict";
+    // save initial values of each form
+    $('#moin-usersettings form').each(function () {
+        $(this).data('initialForm', $(this).serialize());
+    });
+
+    // check if any changes were made, add indicator if user changes tabs without saving form
+    function changeHandler(ev) {
+        var form = $(ev.currentTarget),
+            title = $('.moin-tab-titles a.current', form.parentsUntil('.moin-tabs').parent()),
+            e;
+        if (form.data('initialForm') === form.serialize()) {
+            // current values are identicaly to initial ones, remove all change indicators (if any)
+            $('.change-indicator', title).remove();
+        } else {
+            // the values differ
+            if (!$('.change-indicator', title).length) {
+                // only add a change indicator if there none
+                e = $(document.createElement('span'));
+                e.addClass('change-indicator');
+                e.text('*');
+                title.append(e);
+            }
+        }
+    }
+    // attach above function to all forms on page
+    $('#moin-usersettings form').change(changeHandler);
+
+    // executed when user clicks submit button on one of the tabbed forms
+    function submitHandler(ev) {
+        var form = $(ev.target),
+            button = $('button', form),
+            buttonBaseText = button.html(),
+            buttonDotList = [' .&nbsp;&nbsp;', ' &nbsp;.&nbsp;', ' &nbsp;&nbsp;.'],
+            buttonDotIndex = 0,
+            buttonDotAnimation;
+
+        // disable the button
+        button.attr('disabled', true);
+
+        // remove change indicators from the current tab as we are now saving it
+        $('.moin-tab-titles a.current .change-indicator',
+                form.parentsUntil('.moin-tabs').parent()).remove();
+
+        // animate the submit button to indicating a running request
+        function buttonRunAnimation() {
+            button.html(buttonBaseText + buttonDotList[buttonDotIndex % buttonDotList.length]);
+            buttonDotIndex += 1;
+        }
+        buttonDotAnimation = setInterval(buttonRunAnimation, 500);
+        buttonRunAnimation();
+
+        // send the form to the server
+        $.post(form.attr('action'), form.serialize(), function (data) {
+            var i, f, newform;
+            clearInterval(buttonDotAnimation);
+            // if the response indicates a redirect, set the new location
+            if (data.redirect) {
+                location.href = data.redirect;
+                return;
+            }
+            // remove all flash messages previously added via javascript
+            $('#moin-flash .moin-flash-javascript').remove();
+            // add new flash messages from the response
+            for (i = 0; i < data.flash.length; i += 1) {
+                f = $(document.createElement('p'));
+                f.html(data.flash[i][0]);
+                f.addClass('moin-flash');
+                f.addClass('moin-flash-javascript');
+                f.addClass('moin-flash-' + data.flash[i][1]);
+                $('#moin-flash').append(f);
+            }
+            // get the new form element from the response
+            newform = $(data.form);
+            // set event handlers on the new form
+            newform.submit(submitHandler);
+            newform.change(changeHandler);
+            // store the forms initial data
+            newform.data('initialForm', newform.serialize());
+            // replace the old form with the new one
+            form.replaceWith(newform);
+        }, 'json');
+        return false;
+    }
+    // attach above function to all form submit buttons
+    $('#moin-usersettings form').submit(submitHandler);
+}
+$(document).ready(initMoinUsersettings);
--- a/MoinMoin/templates/index.html	Wed Jul 18 00:42:48 2012 +0530
+++ b/MoinMoin/templates/index.html	Wed Jul 18 00:51:44 2012 +0530
@@ -9,7 +9,7 @@
 
 {% block head_scripts %}
 {{ super() }}
-    <script src="{{ url_for('static', filename='js/index_action.js') }}"></script>
+    <script src="{{ url_for('frontend.template', filename='index_action.js') }}"></script>
 {% endblock %}
 
 {% block content %}
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/MoinMoin/templates/index_action.js	Wed Jul 18 00:51:44 2012 +0530
@@ -0,0 +1,288 @@
+/*
+ * Click and submit handlers for form elements on the global index page.
+ * Copyright 2011, AkashSinha<akash2607@gmail.com>
+ * License: GNU GPL v2 (or any later version), see LICENSE.txt for details.
+ */
+
+/*jslint browser: true, */
+/*global $:false */
+
+// This anonymous function is executed once after a global index page loads.
+$("document").ready(function () {
+    "use strict";
+
+    var POPUP_FADE_TIME = 200, // fade in, fade out times for selected popups
+        IFRAME_CREATE_DELAY = 200, // delay between start of multiple downloads
+        IFRAME_REMOVE_DELAY = 3000, // life expectancy of iframe used for file downloads
+        MESSAGE_VIEW_TIME = 4000, // life expectancy of delete/destroy status messages
+        // delete and destroy process started and completed messages
+        {{ "ACTION_LOADING = {'delete': '%s', 'destroy': '%s'}," % (_("Deleting.."), _("Destroying..")) }}
+        {{ "ACTION_DONE = {'delete': '%s', 'destroy': '%s'}," % (_("Items deleted: "), _("Items destroyed: ")) }}
+        {{ "ACTION_FAILED = {'delete': '%s', 'destroy': '%s'};" % (_(", Items not deleted: "), _(", Items not destroyed: ")) }}
+
+    // called by click handlers New Item, Delete item, and Destroy item within Actions dropdown menu
+    function showpop(action) {
+        // hide Actions popup and show either New Item or Comment popup
+        $(".popup-container").css("display", "none");
+        if (action === "newitem") {
+            $("#popup-for-newitem").css("display", "block");
+            $("#file_upload").appendTo("#popup-for-newitem .popup-body");
+            $(".upload-form").css("display", "block");
+        } else {
+            $("#popup-for-action").css("display", "block");
+            $(".popup-comment").removeClass("blank");
+            $(".popup-comment").val("");
+            $(".popup-action").val(action);
+        }
+        $("#popup").fadeIn();
+        $("#lightbox").css("display", "block");
+    }
+
+    // called by click handlers within "Create new item" and "Please provide comment" popups
+    function hidepop() {
+        // hide popup
+        $("#popup").css("display", "none");
+        $("#lightbox").css("display", "none");
+    }
+
+    // called by Actions Download click handler
+    function startFileDownload(elem) {
+        // create a hidden iframe to start a file download, then remove it after 3 seconds
+        var frame = $('<iframe style="display: none;"></iframe>');
+        frame.attr('src', $(elem).attr('href'));
+        $(elem).after(frame);
+        setTimeout(function () { frame.remove(); }, IFRAME_REMOVE_DELAY);
+    }
+
+    // called by do_action when an item is successfully deleted or destroyed
+    function hide(item_link) {
+        // remove a deleted or destroyed item from current display
+        item_link.parent().remove();
+    }
+
+    // called by do_action when item cannot be deleted or destroyed
+    function show_conflict(item_link) {
+        // mark an item as having failed a delete or destroy operation
+        item_link.removeClass().addClass("moin-conflict");
+        item_link.parent().removeClass();
+    }
+
+    // executed via the "provide comment" popup triggered by an Actions Delete or Destroy selection
+    function do_action(comment, action) {
+        // create an array of selected item names
+        var links = [],
+            itemnames,
+            actionTrigger,
+            url;
+        $(".selected-item").children("a.moin-item").each(function () {
+            var itemname = $(this).attr("title");
+            links.push(itemname);
+        });
+        // hide comment popup, display "deleting..." or "destroying..."
+        $("#popup").css("display", "none");
+        $(".moin-index-message span").text(ACTION_LOADING[action]);
+        $(".moin-index-message").css("display", "block");
+        // create a transaction to delete or destroy selected items
+        itemnames = JSON.stringify(links);
+        actionTrigger = "moin-" + action + "-trigger";
+        url = $("#" + actionTrigger).attr("data-actionurl");
+        $.post(url, {
+            itemnames: itemnames,
+            comment: comment
+        }, function (data) {
+            // process post results
+            var itemnames = data.itemnames,
+                action_status = data.status,
+                success_item = 0,
+                left_item = 0,
+                message;
+            $.each(itemnames, function (itemindex, itemname) {
+                // hide (remove) deleted/destroyed items, or show conflict (ACL rules, or ?)
+                if (action_status[itemindex]) {
+                    hide($('.selected-item').children('a.moin-item[title="' + itemname + '"]'));
+                    success_item += 1;
+                } else {
+                    show_conflict($('.selected-item').children('a.moin-item[title="' + itemname + '"]'));
+                    left_item += 1;
+                }
+            });
+            // show a message summarizing delete/destroy results for 4 seconds
+            message = ACTION_DONE[action] + success_item;
+            if (left_item) {
+                message += ACTION_FAILED[action] + left_item + ".";
+            }
+            $(".moin-index-message span").text(message);
+            setTimeout(function () {
+                $(".moin-index-message").fadeOut();
+            }, MESSAGE_VIEW_TIME);
+        }, "json");
+    }
+
+    // -- Select All handlers start here
+
+    // add click handler to "Select All" tab to select/deselect all items
+    $(".moin-select-allitem").click(function () {
+        // toggle classes
+        if ($(this).hasClass("allitem-toselect")) {
+            $(".moin-item-index div").removeClass().addClass("selected-item");
+            $(this).removeClass("allitem-toselect").addClass("allitem-selected");
+        } else {
+            $(this).removeClass("allitem-selected").addClass("allitem-toselect");
+            $(".moin-item-index div").removeClass();
+        }
+    });
+
+    // -- Actions handlers start here
+
+    // add click handler to "Actions" drop down list
+    // also executed via .click call when user clicks on an action (new, download, delete, destroy)
+    $(".show-action").click(function () {
+        // show/hide actions drop down list
+        var actionsDiv = $(this).parent().parent();
+        if (actionsDiv.find("ul:first").is(":visible")) {
+            actionsDiv.find("ul:first").fadeOut(POPUP_FADE_TIME);
+            actionsDiv.removeClass("action-visible");
+        } else {
+            actionsDiv.find("ul:first").fadeIn(POPUP_FADE_TIME);
+            actionsDiv.addClass("action-visible");
+        }
+    });
+
+    // add click handler to "New Item" action tab entry
+    $("#moin-create-newitem").click(function () {
+        // show new item popup and hide actions dropdown
+        showpop("newitem");
+        $(".show-action").trigger("click");
+    });
+
+    // add click handler to close button "X" on new item popup
+    $(".popup-cancel").click(function () {
+        // if files are selected for upload, add to drag and drop area; hide popup
+        if ($("#popup-for-newitem:visible").length) {
+            $("#file_upload").appendTo("#moin-upload-cont");
+            $(".upload-form").css("display", "none");
+        }
+        hidepop();
+    });
+
+    // add submit handler to "Create" button on new item popup
+    // This is a workaround for browsers that do not support "required" attribute (ie9, safari 5.1)
+    // note: The creation of a new item is performed via action=... attribute on form
+    $("#popup-for-newitem").find("form:first").submit(function () {
+        // if no item name was provided show hint and stop form action
+        var itembox = $(this).children("input[name='newitem']"),
+            itemname = itembox.val();
+        if ($.trim(itemname) === "") {
+            itembox.addClass("blank");
+            itembox.focus();
+            return false;
+        }
+    });
+
+    // add click handler to "Download" button of Actions dropdown
+    $("#moin-download-trigger").click(function () {
+        if (!($("div.selected-item").length)) {
+            // no items selected, show message for 4 seconds
+            {{ "$('.moin-index-message span').text('%s');" % _("Nothing was selected.") }}
+            $(".moin-index-message").fadeIn();
+            setTimeout(function () {
+                $(".moin-index-message").fadeOut();
+            }, MESSAGE_VIEW_TIME);
+        } else {
+            // download selected files (add small delay to start of multiple downloads for IE9)
+            $(".selected-item").children(".moin-download-link").each(function (index, element) {
+                // at 0 ms IE9 skipped 41 of 42 downloads, at 100 ms IE9 skipped 14 of 42, success at 200 ms
+                var wait = index * IFRAME_CREATE_DELAY;
+                setTimeout(function () { startFileDownload(element); }, wait);
+            });
+        }
+        // hide the list of actions
+        $(".show-action").trigger("click");
+    });
+
+    // add click handler to "Delete" and "Destroy" buttons of Actions dropdown
+    $(".moin-action-tab").click(function () {
+        // Show error msg if nothing selected, else show comment popup. Hide actions dropdown.
+        if (!($("div.selected-item").length)) {
+            {{ "$('.moin-index-message span').text('%s');" % _("Nothing was selected.") }}
+            $(".moin-index-message").fadeIn();
+            setTimeout(function () {
+                $(".moin-index-message").fadeOut();
+            }, MESSAGE_VIEW_TIME);
+        } else {
+            if (this.id === "moin-delete-trigger") {
+                showpop("delete");
+            } else {
+                showpop("destroy");
+            }
+        }
+        $(".show-action").trigger("click");
+    });
+
+    // add click handler to "Submit" button on "Please provide comment..." popup
+    $(".popup-submit").click(function () {
+        // process delete or destroy action
+        var comment = $(".popup-comment").val(),
+            action = $(".popup-action").val();
+        comment = $.trim(comment);
+        do_action(comment, action);
+        hidepop();
+    });
+
+    // -- Filter by content type handlers start here
+
+    // add click handler to "Filter by content type" button
+    $(".moin-contenttypes-wrapper").children("div").click(function () {
+        // show/hide content type dropdown
+        var wrapper = $(this).parent();
+        if (wrapper.find("form:visible").length) {
+            $(".moin-contenttypes-wrapper").find("form").fadeOut(POPUP_FADE_TIME);
+            $(this).removeClass().addClass("ct-hide");
+        } else {
+            $(".moin-contenttypes-wrapper").find("form").fadeIn(POPUP_FADE_TIME);
+            $(this).removeClass().addClass("ct-shown");
+        }
+    });
+
+    // add click handler to "Toggle" button on "Filter by content type" dropdown
+    $(".filter-toggle").click(function () {
+        // reverse checked/unchecked for each content type
+        $(".moin-contenttypes-wrapper form").find("input[type='checkbox']").each(function () {
+            if ($(this).attr("checked")) {
+                $(this).removeAttr("checked");
+            } else {
+                $(this).attr("checked", "checked");
+            }
+        });
+        return false;
+    });
+
+    // add click handler to "More" button on "Filter by content type" dropdown
+    $(".filter-more").click(function () {
+        // show/hide help text describing each content type
+        var helper_texts = $(".moin-contenttypes-wrapper form").find(".helper-text:visible");
+        if (helper_texts.length) {
+            helper_texts.fadeOut();
+        } else {
+            $(".moin-contenttypes-wrapper form").find(".helper-text").css("display", "block");
+        }
+
+        return false;
+    });
+
+    // -- individual item handlers start here
+
+    // add click handlers to all items shown on global index page
+    $(".moin-select-item").click(function () {
+        // toggle selection classes
+        if ($(this).parent().hasClass("selected-item")) {
+            $(this).parent().removeClass("selected-item");
+            if ($(".moin-select-allitem").hasClass("allitem-selected")) {
+                $(".moin-select-allitem").removeClass("allitem-selected").addClass("allitem-toselect");
+            }
+        } else {
+            $(this).parent().addClass("selected-item");
+        }
+    });
+});
+
--- a/MoinMoin/translations/MoinMoin.pot	Wed Jul 18 00:42:48 2012 +0530
+++ b/MoinMoin/translations/MoinMoin.pot	Wed Jul 18 00:51:44 2012 +0530
@@ -1,14 +1,14 @@
 # Translations template for moin.
-# Copyright (C) 2011 Moin Core Team, see http://moinmo.in/MoinCoreTeamGroup
+# Copyright (C) 2012 Moin Core Team, see http://moinmo.in/MoinCoreTeamGroup
 # This file is distributed under the same license as the moin project.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2011.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
 #
 #, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: moin 2.0.0a0\n"
 "Report-Msgid-Bugs-To: English <moin-user@lists.sourceforge.net>\n"
-"POT-Creation-Date: 2011-12-17 20:40+0100\n"
+"POT-Creation-Date: 2012-07-15 23:32+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -17,6 +17,46 @@
 "Content-Transfer-Encoding: 8bit\n"
 "Generated-By: Babel 0.9.6\n"
 
+#: MoinMoin/forms.py:37
+msgid "OpenID"
+msgstr ""
+
+#: MoinMoin/forms.py:37
+msgid "OpenID address"
+msgstr ""
+
+#: MoinMoin/forms.py:39
+msgid "Your OpenID address"
+msgstr ""
+
+#: MoinMoin/forms.py:41
+msgid "E-Mail"
+msgstr ""
+
+#: MoinMoin/forms.py:41
+msgid "E-Mail address"
+msgstr ""
+
+#: MoinMoin/forms.py:43
+msgid "Your E-Mail address"
+msgstr ""
+
+#: MoinMoin/forms.py:45
+msgid "Password"
+msgstr ""
+
+#: MoinMoin/forms.py:56 MoinMoin/config/default.py:336
+msgid "Tags"
+msgstr ""
+
+#: MoinMoin/forms.py:58
+msgid "Search Query"
+msgstr ""
+
+#: MoinMoin/forms.py:70
+msgid "OK"
+msgstr ""
+
 #: MoinMoin/user.py:54
 #, python-format
 msgid ""
@@ -29,26 +69,26 @@
 msgid "This user name already belongs to somebody else."
 msgstr ""
 
-#: MoinMoin/user.py:66
+#: MoinMoin/user.py:68
 #, python-format
 msgid "Password not acceptable: %(msg)s"
 msgstr ""
 
-#: MoinMoin/user.py:81
+#: MoinMoin/user.py:78
 msgid ""
 "Please provide your email address. If you lose your login information, "
 "you can get it by email."
 msgstr ""
 
-#: MoinMoin/user.py:87
+#: MoinMoin/user.py:84
 msgid "This email already belongs to somebody else."
 msgstr ""
 
-#: MoinMoin/user.py:92
+#: MoinMoin/user.py:90
 msgid "This OpenID already belongs to somebody else."
 msgstr ""
 
-#: MoinMoin/user.py:709
+#: MoinMoin/user.py:730
 #, python-format
 msgid ""
 "Somebody has requested to email you a password recovery link.\n"
@@ -61,12 +101,12 @@
 "\n"
 msgstr ""
 
-#: MoinMoin/user.py:712
+#: MoinMoin/user.py:733
 #, python-format
 msgid "[%(sitename)s] Your wiki password recovery link"
 msgstr ""
 
-#: MoinMoin/user.py:731
+#: MoinMoin/user.py:751
 #, python-format
 msgid ""
 "Somebody has created an account with this email address.\n"
@@ -79,7 +119,7 @@
 "\n"
 msgstr ""
 
-#: MoinMoin/user.py:734
+#: MoinMoin/user.py:754
 #, python-format
 msgid "[%(sitename)s] Please verify your email address"
 msgstr ""
@@ -153,11 +193,12 @@
 msgstr ""
 
 #: MoinMoin/apps/admin/views.py:226 MoinMoin/converter/archive_in.py:59
-#: MoinMoin/templates/history.html:24
+#: MoinMoin/templates/atom.html:8 MoinMoin/templates/diff_text_atom.html:9
+#: MoinMoin/templates/history.html:27
 msgid "Size"
 msgstr ""
 
-#: MoinMoin/apps/admin/views.py:227 MoinMoin/templates/index.html:153
+#: MoinMoin/apps/admin/views.py:227 MoinMoin/templates/index.html:162
 msgid "Item name"
 msgstr ""
 
@@ -167,6 +208,8 @@
 
 #: MoinMoin/apps/admin/templates/admin/highlighterhelp.html:4
 #: MoinMoin/apps/admin/templates/admin/index.html:20
+#: MoinMoin/apps/admin/templates/user/highlighterhelp.html:4
+#: MoinMoin/apps/admin/templates/user/index_user.html:9
 msgid "Available Highlighters"
 msgstr ""
 
@@ -196,26 +239,33 @@
 msgstr ""
 
 #: MoinMoin/apps/admin/templates/admin/index.html:14
+#: MoinMoin/apps/admin/templates/user/index_user.html:3
 msgid "User Menu"
 msgstr ""
 
 #: MoinMoin/apps/admin/templates/admin/index.html:16
-#: MoinMoin/apps/frontend/views.py:827 MoinMoin/apps/frontend/views.py:829
+#: MoinMoin/apps/admin/templates/user/index_user.html:5
+#: MoinMoin/apps/frontend/views.py:903 MoinMoin/apps/frontend/views.py:905
 msgid "Wanted Items"
 msgstr ""
 
 #: MoinMoin/apps/admin/templates/admin/index.html:17
-#: MoinMoin/apps/frontend/views.py:843 MoinMoin/apps/frontend/views.py:846
+#: MoinMoin/apps/admin/templates/user/index_user.html:6
+#: MoinMoin/apps/frontend/views.py:919 MoinMoin/apps/frontend/views.py:922
 msgid "Orphaned Items"
 msgstr ""
 
 #: MoinMoin/apps/admin/templates/admin/index.html:18
 #: MoinMoin/apps/admin/templates/admin/itemsize.html:4
+#: MoinMoin/apps/admin/templates/user/index_user.html:7
+#: MoinMoin/apps/admin/templates/user/itemsize.html:4
 msgid "Item sizes (latest revision)"
 msgstr ""
 
 #: MoinMoin/apps/admin/templates/admin/index.html:19
 #: MoinMoin/apps/admin/templates/admin/interwikihelp.html:4
+#: MoinMoin/apps/admin/templates/user/index_user.html:8
+#: MoinMoin/apps/admin/templates/user/interwikihelp.html:4
 msgid "Known InterWiki names"
 msgstr ""
 
@@ -238,7 +288,7 @@
 msgstr ""
 
 #: MoinMoin/apps/admin/templates/admin/userbrowser.html:8
-#: MoinMoin/templates/history.html:29
+#: MoinMoin/templates/history.html:32
 msgid "Actions"
 msgstr ""
 
@@ -291,436 +341,438 @@
 msgid "Description"
 msgstr ""
 
-#: MoinMoin/apps/feed/views.py:81
+#: MoinMoin/apps/feed/views.py:85
 msgid "MoinMoin feels unhappy."
 msgstr ""
 
-#: MoinMoin/apps/frontend/views.py:130
-msgid "Search query too short."
+#: MoinMoin/apps/frontend/views.py:133
+msgid "name"
+msgstr ""
+
+#: MoinMoin/apps/frontend/views.py:134
+msgid "name_exact"
+msgstr ""
+
+#: MoinMoin/apps/frontend/views.py:135
+msgid "itemid"
+msgstr ""
+
+#: MoinMoin/apps/frontend/views.py:136
+msgid "revid"
+msgstr ""
+
+#: MoinMoin/apps/frontend/views.py:137
+msgid "userid"
+msgstr ""
+
+#: MoinMoin/apps/frontend/views.py:138
+msgid "language"
+msgstr ""
+
+#: MoinMoin/apps/frontend/views.py:139
+msgid "itemlinks"
+msgstr ""
+
+#: MoinMoin/apps/frontend/views.py:140
+msgid "itemtransclusions"
 msgstr ""
 
 #: MoinMoin/apps/frontend/views.py:141
-msgid "Search Query"
+msgid "refs"
 msgstr ""
 
-#: MoinMoin/apps/frontend/views.py:142
+#: MoinMoin/apps/frontend/views.py:143 MoinMoin/search/__init__.py:29
 msgid "search also in non-current revisions"
 msgstr ""
 
-#: MoinMoin/apps/frontend/views.py:143 MoinMoin/apps/frontend/views.py:150
+#: MoinMoin/apps/frontend/views.py:144 MoinMoin/apps/frontend/views.py:168
+#: MoinMoin/templates/lookup.html:6
+msgid "Lookup"
+msgstr ""
+
+#: MoinMoin/apps/frontend/views.py:227 MoinMoin/search/__init__.py:30
 msgid "Search"
 msgstr ""
 
-#: MoinMoin/apps/frontend/views.py:394 MoinMoin/templates/history.html:28
-msgid "Comment"
-msgstr ""
-
-#: MoinMoin/apps/frontend/views.py:394
-msgid "Comment about your change"
-msgstr ""
-
-#: MoinMoin/apps/frontend/views.py:395
-msgid "OK"
-msgstr ""
-
-#: MoinMoin/apps/frontend/views.py:398
+#: MoinMoin/apps/frontend/views.py:470
 msgid "Target"
 msgstr ""
 
-#: MoinMoin/apps/frontend/views.py:398
+#: MoinMoin/apps/frontend/views.py:470
 msgid "The name of the target item"
 msgstr ""
 
-#: MoinMoin/apps/frontend/views.py:414
+#: MoinMoin/apps/frontend/views.py:486
 msgid "markup text"
 msgstr ""
 
-#: MoinMoin/apps/frontend/views.py:415
+#: MoinMoin/apps/frontend/views.py:487
 msgid "other text"
 msgstr ""
 
-#: MoinMoin/apps/frontend/views.py:416
+#: MoinMoin/apps/frontend/views.py:488
 msgid "image"
 msgstr ""
 
-#: MoinMoin/apps/frontend/views.py:417
+#: MoinMoin/apps/frontend/views.py:489
 msgid "audio"
 msgstr ""
 
-#: MoinMoin/apps/frontend/views.py:418
+#: MoinMoin/apps/frontend/views.py:490
 msgid "video"
 msgstr ""
 
-#: MoinMoin/apps/frontend/views.py:419
+#: MoinMoin/apps/frontend/views.py:491
 msgid "other"
 msgstr ""
 
-#: MoinMoin/apps/frontend/views.py:420
+#: MoinMoin/apps/frontend/views.py:492
 msgid "unknown"
 msgstr ""
 
-#: MoinMoin/apps/frontend/views.py:421
+#: MoinMoin/apps/frontend/views.py:493
 msgid "Filter"
 msgstr ""
 
-#: MoinMoin/apps/frontend/views.py:666 MoinMoin/config/default.py:337
-#: MoinMoin/templates/index.html:71 MoinMoin/templates/index.html:81
+#: MoinMoin/apps/frontend/views.py:746 MoinMoin/config/default.py:335
+#: MoinMoin/templates/index.html:7 MoinMoin/templates/index.html:81
 msgid "Global Index"
 msgstr ""
 
-#: MoinMoin/apps/frontend/views.py:687 MoinMoin/apps/frontend/views.py:688
+#: MoinMoin/apps/frontend/views.py:766 MoinMoin/apps/frontend/views.py:767
 msgid "My Changes"
 msgstr ""
 
-#: MoinMoin/apps/frontend/views.py:719
-msgid "Refers Here"
+#: MoinMoin/apps/frontend/views.py:798
+#, python-format
+msgid "Items which refer to '%(item_name)s'"
 msgstr ""
 
-#: MoinMoin/apps/frontend/views.py:793 MoinMoin/config/default.py:336
+#: MoinMoin/apps/frontend/views.py:869 MoinMoin/config/default.py:334
 #: MoinMoin/templates/global_history.html:10
 msgid "Global History"
 msgstr ""
 
-#: MoinMoin/apps/frontend/views.py:856 MoinMoin/apps/frontend/views.py:875
+#: MoinMoin/apps/frontend/views.py:932 MoinMoin/apps/frontend/views.py:951
 #, python-format
 msgid "You must login to use this action: %(action)s."
 msgstr ""
 
-#: MoinMoin/apps/frontend/views.py:859
+#: MoinMoin/apps/frontend/views.py:935
 msgid "A quicklink to this page could not be added for you."
 msgstr ""
 
-#: MoinMoin/apps/frontend/views.py:862
+#: MoinMoin/apps/frontend/views.py:938
 msgid "Your quicklink to this page could not be removed."
 msgstr ""
 
-#: MoinMoin/apps/frontend/views.py:877
+#: MoinMoin/apps/frontend/views.py:953
 msgid "You are not allowed to subscribe to an item you may not read."
 msgstr ""
 
-#: MoinMoin/apps/frontend/views.py:881
+#: MoinMoin/apps/frontend/views.py:957
 msgid "Can't remove regular expression subscription!"
 msgstr ""
 
-#: MoinMoin/apps/frontend/views.py:882
+#: MoinMoin/apps/frontend/views.py:958
 msgid "Edit the subscription regular expressions in your settings."
 msgstr ""
 
-#: MoinMoin/apps/frontend/views.py:886
+#: MoinMoin/apps/frontend/views.py:962
 msgid "You could not get subscribed to this item."
 msgstr ""
 
-#: MoinMoin/apps/frontend/views.py:895 MoinMoin/apps/frontend/views.py:1096
-#: MoinMoin/apps/frontend/views.py:1237
+#: MoinMoin/apps/frontend/views.py:971 MoinMoin/apps/frontend/views.py:1164
+#: MoinMoin/apps/frontend/views.py:1297
 msgid "The passwords do not match."
 msgstr ""
 
-#: MoinMoin/apps/frontend/views.py:911 MoinMoin/apps/frontend/views.py:927
-#: MoinMoin/apps/frontend/views.py:1054 MoinMoin/apps/frontend/views.py:1114
-#: MoinMoin/apps/frontend/views.py:1181 MoinMoin/apps/frontend/views.py:1303
-#: MoinMoin/converter/archive_in.py:59 MoinMoin/templates/history.html:21
+#: MoinMoin/apps/frontend/views.py:987 MoinMoin/apps/frontend/views.py:1122
+#: MoinMoin/apps/frontend/views.py:1182 MoinMoin/apps/frontend/views.py:1249
+#: MoinMoin/apps/frontend/views.py:1362 MoinMoin/converter/archive_in.py:59
+#: MoinMoin/templates/history.html:24
 msgid "Name"
 msgstr ""
 
-#: MoinMoin/apps/frontend/views.py:911 MoinMoin/apps/frontend/views.py:927
-#: MoinMoin/apps/frontend/views.py:1303
+#: MoinMoin/apps/frontend/views.py:987 MoinMoin/apps/frontend/views.py:1362
 msgid "The login name you want to use"
 msgstr ""
 
-#: MoinMoin/apps/frontend/views.py:912 MoinMoin/apps/frontend/views.py:913
-#: MoinMoin/apps/frontend/views.py:928 MoinMoin/apps/frontend/views.py:929
-#: MoinMoin/apps/frontend/views.py:1182
-msgid "Password"
-msgstr ""
-
-#: MoinMoin/apps/frontend/views.py:912 MoinMoin/apps/frontend/views.py:928
-#: MoinMoin/apps/frontend/views.py:1116 MoinMoin/apps/frontend/views.py:1261
+#: MoinMoin/apps/frontend/views.py:988 MoinMoin/apps/frontend/views.py:1184
+#: MoinMoin/apps/frontend/views.py:1323
 msgid "The login password you want to use"
 msgstr ""
 
-#: MoinMoin/apps/frontend/views.py:913 MoinMoin/apps/frontend/views.py:929
-#: MoinMoin/apps/frontend/views.py:1117 MoinMoin/apps/frontend/views.py:1262
+#: MoinMoin/apps/frontend/views.py:989 MoinMoin/apps/frontend/views.py:1185
+#: MoinMoin/apps/frontend/views.py:1324
 msgid "Repeat the same password"
 msgstr ""
 
-#: MoinMoin/apps/frontend/views.py:914 MoinMoin/apps/frontend/views.py:931
-#: MoinMoin/apps/frontend/views.py:1055 MoinMoin/apps/frontend/views.py:1269
-msgid "E-Mail"
-msgstr ""
-
-#: MoinMoin/apps/frontend/views.py:914 MoinMoin/apps/frontend/views.py:931
-#: MoinMoin/apps/frontend/views.py:1055 MoinMoin/apps/frontend/views.py:1269
-msgid "Your E-Mail address"
-msgstr ""
-
-#: MoinMoin/apps/frontend/views.py:915 MoinMoin/apps/frontend/views.py:932
-#: MoinMoin/apps/frontend/views.py:1183 MoinMoin/apps/frontend/views.py:1305
-msgid "OpenID"
-msgstr ""
-
-#: MoinMoin/apps/frontend/views.py:915 MoinMoin/apps/frontend/views.py:932
-#: MoinMoin/apps/frontend/views.py:1305
-msgid "Your OpenID address"
-msgstr ""
-
-#: MoinMoin/apps/frontend/views.py:916 MoinMoin/apps/frontend/views.py:963
-#: MoinMoin/templates/openid_register.html:21
+#: MoinMoin/apps/frontend/views.py:992 MoinMoin/apps/frontend/views.py:1031
 msgid "Register"
 msgstr ""
 
-#: MoinMoin/apps/frontend/views.py:1007
+#: MoinMoin/apps/frontend/views.py:1075
 msgid ""
 "Account verification required, please see the email we sent to your "
 "address."
 msgstr ""
 
-#: MoinMoin/apps/frontend/views.py:1009
+#: MoinMoin/apps/frontend/views.py:1077
 #, python-format
 msgid ""
 "An error occurred while sending the verification email: \"%(message)s\" "
 "Please contact an administrator to activate your account."
 msgstr ""
 
-#: MoinMoin/apps/frontend/views.py:1012
+#: MoinMoin/apps/frontend/views.py:1080
 msgid "Account created, please log in now."
 msgstr ""
 
-#: MoinMoin/apps/frontend/views.py:1030
+#: MoinMoin/apps/frontend/views.py:1098
 msgid "Your account has been activated, you can log in now."
 msgstr ""
 
-#: MoinMoin/apps/frontend/views.py:1032 MoinMoin/apps/frontend/views.py:1141
+#: MoinMoin/apps/frontend/views.py:1100 MoinMoin/apps/frontend/views.py:1209
 msgid "Your token is invalid!"
 msgstr ""
 
-#: MoinMoin/apps/frontend/views.py:1039
+#: MoinMoin/apps/frontend/views.py:1107
 msgid "Your user name or your email address is needed."
 msgstr ""
 
-#: MoinMoin/apps/frontend/views.py:1054 MoinMoin/apps/frontend/views.py:1114
+#: MoinMoin/apps/frontend/views.py:1122 MoinMoin/apps/frontend/views.py:1182
 msgid "Your login name"
 msgstr ""
 
-#: MoinMoin/apps/frontend/views.py:1056
+#: MoinMoin/apps/frontend/views.py:1124
 msgid "Recover password"
 msgstr ""
 
-#: MoinMoin/apps/frontend/views.py:1064 MoinMoin/templates/lostpass.html:5
+#: MoinMoin/apps/frontend/views.py:1132 MoinMoin/templates/lostpass.html:5
 msgid "Lost Password"
 msgstr ""
 
-#: MoinMoin/apps/frontend/views.py:1086
+#: MoinMoin/apps/frontend/views.py:1154
 msgid "If this account exists, you will be notified."
 msgstr ""
 
-#: MoinMoin/apps/frontend/views.py:1097 MoinMoin/apps/frontend/views.py:1239
+#: MoinMoin/apps/frontend/views.py:1165 MoinMoin/apps/frontend/views.py:1299
 msgid "New password is unacceptable, encoding trouble."
 msgstr ""
 
-#: MoinMoin/apps/frontend/views.py:1115
+#: MoinMoin/apps/frontend/views.py:1183
 msgid "Recovery token"
 msgstr ""
 
-#: MoinMoin/apps/frontend/views.py:1115
+#: MoinMoin/apps/frontend/views.py:1183
 msgid "The recovery token that has been sent to you"
 msgstr ""
 
-#: MoinMoin/apps/frontend/views.py:1116 MoinMoin/apps/frontend/views.py:1261
+#: MoinMoin/apps/frontend/views.py:1184 MoinMoin/apps/frontend/views.py:1323
 msgid "New password"
 msgstr ""
 
-#: MoinMoin/apps/frontend/views.py:1117 MoinMoin/apps/frontend/views.py:1262
+#: MoinMoin/apps/frontend/views.py:1185 MoinMoin/apps/frontend/views.py:1324
 msgid "New password (repeat)"
 msgstr ""
 
-#: MoinMoin/apps/frontend/views.py:1118 MoinMoin/apps/frontend/views.py:1263
-#: MoinMoin/templates/usersettings.html:9
+#: MoinMoin/apps/frontend/views.py:1186 MoinMoin/apps/frontend/views.py:1325
+#: MoinMoin/templates/usersettings_forms.html:28
 msgid "Change password"
 msgstr ""
 
-#: MoinMoin/apps/frontend/views.py:1126 MoinMoin/templates/recoverpass.html:5
+#: MoinMoin/apps/frontend/views.py:1194 MoinMoin/templates/recoverpass.html:5
 msgid "Recover Password"
 msgstr ""
 
-#: MoinMoin/apps/frontend/views.py:1139
+#: MoinMoin/apps/frontend/views.py:1207
 msgid "Your password has been changed, you can log in now."
 msgstr ""
 
-#: MoinMoin/apps/frontend/views.py:1153
+#: MoinMoin/apps/frontend/views.py:1221
 msgid "Either your username or password was invalid."
 msgstr ""
 
-#: MoinMoin/apps/frontend/views.py:1154
+#: MoinMoin/apps/frontend/views.py:1222
 msgid "Failed to authenticate with this OpenID."
 msgstr ""
 
-#: MoinMoin/apps/frontend/views.py:1194 MoinMoin/templates/layout.html:62
+#: MoinMoin/apps/frontend/views.py:1252
+msgid "Log in"
+msgstr ""
+
+#: MoinMoin/apps/frontend/views.py:1260 MoinMoin/templates/layout.html:62
 msgid "Login"
 msgstr ""
 
-#: MoinMoin/apps/frontend/views.py:1229
+#: MoinMoin/apps/frontend/views.py:1289
 msgid "You are now logged out."
 msgstr ""
 
-#: MoinMoin/apps/frontend/views.py:1238
+#: MoinMoin/apps/frontend/views.py:1298
 msgid "The current password was wrong."
 msgstr ""
 
-#: MoinMoin/apps/frontend/views.py:1260
+#: MoinMoin/apps/frontend/views.py:1322
 msgid "Current Password"
 msgstr ""
 
-#: MoinMoin/apps/frontend/views.py:1260
+#: MoinMoin/apps/frontend/views.py:1322
 msgid "Your current login password"
 msgstr ""
 
-#: MoinMoin/apps/frontend/views.py:1270 MoinMoin/apps/frontend/views.py:1276
-#: MoinMoin/apps/frontend/views.py:1291 MoinMoin/apps/frontend/views.py:1314
-#: MoinMoin/apps/frontend/views.py:1325
+#: MoinMoin/apps/frontend/views.py:1330 MoinMoin/apps/frontend/views.py:1336
+#: MoinMoin/apps/frontend/views.py:1351 MoinMoin/apps/frontend/views.py:1373
+#: MoinMoin/apps/frontend/views.py:1384
+#: MoinMoin/templates/usersettings_forms.html:14
+#: MoinMoin/templates/usersettings_forms.html:42
+#: MoinMoin/templates/usersettings_forms.html:56
+#: MoinMoin/templates/usersettings_forms.html:67
+#: MoinMoin/templates/usersettings_forms.html:81
 msgid "Save"
 msgstr ""
 
-#: MoinMoin/apps/frontend/views.py:1287
+#: MoinMoin/apps/frontend/views.py:1347
 msgid "Publish my email (not my wiki homepage) in author info"
 msgstr ""
 
-#: MoinMoin/apps/frontend/views.py:1288
+#: MoinMoin/apps/frontend/views.py:1348
 msgid "Open editor on double click"
 msgstr ""
 
-#: MoinMoin/apps/frontend/views.py:1289
+#: MoinMoin/apps/frontend/views.py:1349
 msgid "Show comment sections"
 msgstr ""
 
-#: MoinMoin/apps/frontend/views.py:1290
+#: MoinMoin/apps/frontend/views.py:1350
 msgid "Disable this account forever"
 msgstr ""
 
-#: MoinMoin/apps/frontend/views.py:1298 MoinMoin/templates/usersettings.html:6
+#: MoinMoin/apps/frontend/views.py:1357 MoinMoin/templates/usersettings.html:5
 msgid "User Settings"
 msgstr ""
 
-#: MoinMoin/apps/frontend/views.py:1304
+#: MoinMoin/apps/frontend/views.py:1363
 msgid "Alias-Name"
 msgstr ""
 
-#: MoinMoin/apps/frontend/views.py:1304
+#: MoinMoin/apps/frontend/views.py:1363
 msgid "Your alias name (informational)"
 msgstr ""
 
-#: MoinMoin/apps/frontend/views.py:1308
+#: MoinMoin/apps/frontend/views.py:1367
 msgid "Timezone"
 msgstr ""
 
-#: MoinMoin/apps/frontend/views.py:1313
+#: MoinMoin/apps/frontend/views.py:1372
 msgid "Locale"
 msgstr ""
 
-#: MoinMoin/apps/frontend/views.py:1321
+#: MoinMoin/apps/frontend/views.py:1380
 msgid "Theme name"
 msgstr ""
 
-#: MoinMoin/apps/frontend/views.py:1322
+#: MoinMoin/apps/frontend/views.py:1381
 msgid "User CSS URL"
 msgstr ""
 
-#: MoinMoin/apps/frontend/views.py:1322
+#: MoinMoin/apps/frontend/views.py:1381
 msgid "Give the URL of your custom CSS (optional)"
 msgstr ""
 
-#: MoinMoin/apps/frontend/views.py:1323
+#: MoinMoin/apps/frontend/views.py:1382
 msgid "Editor size"
 msgstr ""
 
-#: MoinMoin/apps/frontend/views.py:1323
+#: MoinMoin/apps/frontend/views.py:1382
 msgid "Editor textarea height (0=auto)"
 msgstr ""
 
-#: MoinMoin/apps/frontend/views.py:1324
+#: MoinMoin/apps/frontend/views.py:1383
 msgid "History results per page"
 msgstr ""
 
-#: MoinMoin/apps/frontend/views.py:1324
+#: MoinMoin/apps/frontend/views.py:1383
 msgid "Number of results per page (0=no paging)"
 msgstr ""
 
-#: MoinMoin/apps/frontend/views.py:1353
+#: MoinMoin/apps/frontend/views.py:1426
 msgid "Your password has been changed."
 msgstr ""
 
-#: MoinMoin/apps/frontend/views.py:1358
+#: MoinMoin/apps/frontend/views.py:1431
 msgid "This openid is already in use."
 msgstr ""
 
-#: MoinMoin/apps/frontend/views.py:1362
+#: MoinMoin/apps/frontend/views.py:1435
 msgid "This username is already in use."
 msgstr ""
 
-#: MoinMoin/apps/frontend/views.py:1368
+#: MoinMoin/apps/frontend/views.py:1441
 msgid "This email is already in use"
 msgstr ""
 
-#: MoinMoin/apps/frontend/views.py:1381
+#: MoinMoin/apps/frontend/views.py:1456
 msgid ""
 "Your account has been disabled because you changed your email address. "
 "Please see the email we sent to your address to reactivate it."
 msgstr ""
 
-#: MoinMoin/apps/frontend/views.py:1387
+#: MoinMoin/apps/frontend/views.py:1463
 msgid ""
 "Your email address was not changed because sending the verification email"
 " failed. Please try again later."
 msgstr ""
 
-#: MoinMoin/apps/frontend/views.py:1395
-msgid ""
-"Changing your email address requires you to verify it. A link will be "
-"sent to you."
+#: MoinMoin/apps/frontend/views.py:1469
+msgid "Your changes have been saved."
 msgstr ""
 
-#: MoinMoin/apps/frontend/views.py:1424
+#: MoinMoin/apps/frontend/views.py:1521
 msgid "You must log in to use bookmarks."
 msgstr ""
 
-#: MoinMoin/apps/frontend/views.py:1549 MoinMoin/config/default.py:380
-msgid "Items with similar names"
+#: MoinMoin/apps/frontend/views.py:1647
+#, python-format
+msgid "Items with similar names to '%(item_name)s'"
 msgstr ""
 
-#: MoinMoin/apps/frontend/views.py:1731 MoinMoin/apps/frontend/views.py:1758
+#: MoinMoin/apps/frontend/views.py:1829 MoinMoin/apps/frontend/views.py:1856
 msgid "All tags in this wiki"
 msgstr ""
 
-#: MoinMoin/apps/frontend/views.py:1772
+#: MoinMoin/apps/frontend/views.py:1870
 #, python-format
 msgid "Items tagged with %(tag)s"
 msgstr ""
 
-#: MoinMoin/auth/__init__.py:242 MoinMoin/auth/ldap_login.py:129
+#: MoinMoin/auth/__init__.py:244 MoinMoin/auth/ldap_login.py:130
 msgid "Missing password. Please enter user name and password."
 msgstr ""
 
-#: MoinMoin/auth/__init__.py:250 MoinMoin/auth/ldap_login.py:199
-#: MoinMoin/auth/ldap_login.py:245
+#: MoinMoin/auth/__init__.py:252 MoinMoin/auth/ldap_login.py:200
+#: MoinMoin/auth/ldap_login.py:248
 msgid "Invalid username or password."
 msgstr ""
 
-#: MoinMoin/auth/__init__.py:254
+#: MoinMoin/auth/__init__.py:256
 #, python-format
 msgid ""
 "If you do not have an account, <a href=\"%(register_url)s\">you can "
 "create one now</a>. "
 msgstr ""
 
-#: MoinMoin/auth/__init__.py:256
+#: MoinMoin/auth/__init__.py:258
 #, python-format
 msgid "<a href=\"%(recover_url)s\">Forgot your password?</a>"
 msgstr ""
 
-#: MoinMoin/auth/http.py:61
+#: MoinMoin/auth/http.py:59
 msgid "Please log in first."
 msgstr ""
 
-#: MoinMoin/auth/ldap_login.py:259
+#: MoinMoin/auth/ldap_login.py:262
 #, python-format
 msgid "LDAP server %(server)s failed."
 msgstr ""
@@ -733,23 +785,23 @@
 msgid "OpenID verification cancelled."
 msgstr ""
 
-#: MoinMoin/auth/openidrp.py:106
+#: MoinMoin/auth/openidrp.py:105
 msgid "This OpenID provider is not trusted."
 msgstr ""
 
-#: MoinMoin/auth/openidrp.py:111
+#: MoinMoin/auth/openidrp.py:110
 msgid "OpenID failure."
 msgstr ""
 
-#: MoinMoin/auth/openidrp.py:145
+#: MoinMoin/auth/openidrp.py:144
 msgid "Failed to resolve OpenID."
 msgstr ""
 
-#: MoinMoin/auth/openidrp.py:147
+#: MoinMoin/auth/openidrp.py:146
 msgid "OpenID discovery failure, not a valid OpenID."
 msgstr ""
 
-#: MoinMoin/auth/openidrp.py:151
+#: MoinMoin/auth/openidrp.py:150
 msgid "No OpenID service at this URL."
 msgstr ""
 
@@ -771,161 +823,173 @@
 msgid "Password is too easy to guess (keyboard sequence)."
 msgstr ""
 
-#: MoinMoin/config/default.py:335
+#: MoinMoin/config/default.py:333
 msgid "Home"
 msgstr ""
 
-#: MoinMoin/config/default.py:335
+#: MoinMoin/config/default.py:333
 msgid "Home Page"
 msgstr ""
 
-#: MoinMoin/config/default.py:336 MoinMoin/config/default.py:364
+#: MoinMoin/config/default.py:334 MoinMoin/config/default.py:362
 msgid "History"
 msgstr ""
 
-#: MoinMoin/config/default.py:337 MoinMoin/config/default.py:369
+#: MoinMoin/config/default.py:335 MoinMoin/config/default.py:367
 msgid "Index"
 msgstr ""
 
-#: MoinMoin/config/default.py:338
-msgid "Tags"
-msgstr ""
-
-#: MoinMoin/config/default.py:338
+#: MoinMoin/config/default.py:336
 msgid "Global Tags Index"
 msgstr ""
 
-#: MoinMoin/config/default.py:339 MoinMoin/templates/index.html:50
-#: MoinMoin/templates/index.html:123
+#: MoinMoin/config/default.py:337 MoinMoin/templates/index.html:56
+#: MoinMoin/templates/index.html:132
 msgid "More"
 msgstr ""
 
-#: MoinMoin/config/default.py:339
+#: MoinMoin/config/default.py:337
 msgid "Administration & Docs"
 msgstr ""
 
-#: MoinMoin/config/default.py:362
+#: MoinMoin/config/default.py:360
 msgid "Show"
 msgstr ""
 
-#: MoinMoin/config/default.py:363 MoinMoin/templates/index.html:27
+#: MoinMoin/config/default.py:361 MoinMoin/templates/index.html:33
 msgid "Download"
 msgstr ""
 
-#: MoinMoin/config/default.py:364
+#: MoinMoin/config/default.py:362
 msgid "Revision History"
 msgstr ""
 
-#: MoinMoin/config/default.py:367 MoinMoin/templates/show.html:9
+#: MoinMoin/config/default.py:365 MoinMoin/templates/show.html:9
 msgid "Modify"
 msgstr ""
 
+#: MoinMoin/config/default.py:365
+msgid "Edit or Upload"
+msgstr ""
+
 #: MoinMoin/config/default.py:367
-msgid "Edit or Upload"
+msgid "List sub-items"
+msgstr ""
+
+#: MoinMoin/config/default.py:368
+msgid "Comments"
+msgstr ""
+
+#: MoinMoin/config/default.py:368 MoinMoin/templates/common.js:70
+msgid "Hide comments"
 msgstr ""
 
 #: MoinMoin/config/default.py:369
-msgid "List sub-items"
+msgid "Transclusions"
 msgstr ""
 
-#: MoinMoin/config/default.py:370
-msgid "Comments"
+#: MoinMoin/config/default.py:369 MoinMoin/templates/common.js:104
+msgid "Show transclusions"
 msgstr ""
 
 #: MoinMoin/config/default.py:370
-msgid "Switch showing comments on or off"
+msgid "Highlight"
+msgstr ""
+
+#: MoinMoin/config/default.py:370
+msgid "Show with Syntax-Highlighting"
 msgstr ""
 
 #: MoinMoin/config/default.py:371
-msgid "Highlight"
+msgid "Meta"
 msgstr ""
 
 #: MoinMoin/config/default.py:371
-msgid "Show with Syntax-Highlighting"
+msgid "Display Metadata"
 msgstr ""
 
 #: MoinMoin/config/default.py:372
-msgid "Meta"
-msgstr ""
-
-#: MoinMoin/config/default.py:372
-msgid "Display Metadata"
+msgid "Create or remove a navigation link to this item"
 msgstr ""
 
 #: MoinMoin/config/default.py:373
-msgid "Create or remove a navigation link to this item"
+msgid "Switch notifications about item changes on or off"
 msgstr ""
 
 #: MoinMoin/config/default.py:374
-msgid "Switch notifications about item changes on or off"
+msgid "Rename"
 msgstr ""
 
-#: MoinMoin/config/default.py:375
-msgid "Rename"
+#: MoinMoin/config/default.py:374
+msgid "Rename this item"
+msgstr ""
+
+#: MoinMoin/config/default.py:375 MoinMoin/templates/index.html:37
+msgid "Delete"
 msgstr ""
 
 #: MoinMoin/config/default.py:375
-msgid "Rename this item"
+msgid "Delete this item"
 msgstr ""
 
-#: MoinMoin/config/default.py:376 MoinMoin/templates/index.html:31
-msgid "Delete"
+#: MoinMoin/config/default.py:376 MoinMoin/templates/index.html:42
+msgid "Destroy"
 msgstr ""
 
 #: MoinMoin/config/default.py:376
-msgid "Delete this item"
-msgstr ""
-
-#: MoinMoin/config/default.py:377 MoinMoin/templates/index.html:36
-msgid "Destroy"
+msgid "Completely destroy this item"
 msgstr ""
 
 #: MoinMoin/config/default.py:377
-msgid "Completely destroy this item"
+msgid "Referrers"
 msgstr ""
 
-#: MoinMoin/config/default.py:378
-msgid "Referrers"
+#: MoinMoin/config/default.py:377
+msgid "What refers here?"
 msgstr ""
 
 #: MoinMoin/config/default.py:378
-msgid "What refers here?"
+msgid "Site Map"
+msgstr ""
+
+#: MoinMoin/config/default.py:378
+msgid "Local Site Map of this item"
 msgstr ""
 
 #: MoinMoin/config/default.py:379
-msgid "Site Map"
+msgid "Similar"
 msgstr ""
 
 #: MoinMoin/config/default.py:379
-msgid "Local Site Map of this item"
-msgstr ""
-
-#: MoinMoin/config/default.py:380
-msgid "Similar"
+msgid "Items with similar names"
 msgstr ""
 
 #: MoinMoin/converter/archive_in.py:59
 msgid "Date"
 msgstr ""
 
-#: MoinMoin/converter/html_out.py:524
+#: MoinMoin/converter/html_out.py:539
 msgid "Link to this heading"
 msgstr ""
 
-#: MoinMoin/converter/html_out.py:592
+#: MoinMoin/converter/html_out.py:605
 msgid "Contents"
 msgstr ""
 
-#: MoinMoin/converter/macro.py:84
+#: MoinMoin/converter/macro.py:81
+msgid "Error: invalid macro name."
+msgstr ""
+
+#: MoinMoin/converter/macro.py:91 MoinMoin/converter/macro_Verbatim.py:68
 #, python-format
 msgid "<<%(macro_name)s: execution failed [%(error_msg)s] (see also the log)>>"
 msgstr ""
 
-#: MoinMoin/converter/moinwiki_in.py:1035
+#: MoinMoin/converter/moinwiki_in.py:1034
 msgid "Error:"
 msgstr ""
 
-#: MoinMoin/converter/moinwiki_in.py:1036
+#: MoinMoin/converter/moinwiki_in.py:1035
 msgid "is invalid within"
 msgstr ""
 
@@ -934,47 +998,52 @@
 msgid "%(item_name)s does not exist. Create it?"
 msgstr ""
 
-#: MoinMoin/items/__init__.py:660
+#: MoinMoin/items/__init__.py:624
 msgid "Invalid JSON."
 msgstr ""
 
-#: MoinMoin/items/__init__.py:704 MoinMoin/items/__init__.py:1153
-#: MoinMoin/items/__init__.py:1320 MoinMoin/items/__init__.py:1410
-#: MoinMoin/items/__init__.py:1496
+#: MoinMoin/items/__init__.py:635 MoinMoin/templates/atom.html:12
+#: MoinMoin/templates/diff_text_atom.html:13 MoinMoin/templates/history.html:31
+msgid "Comment"
+msgstr ""
+
+#: MoinMoin/items/__init__.py:635
+msgid "Comment about your change"
+msgstr ""
+
+#: MoinMoin/items/__init__.py:669
 msgid "MetaData (JSON)"
 msgstr ""
 
-#: MoinMoin/items/__init__.py:705 MoinMoin/items/__init__.py:1155
-#: MoinMoin/items/__init__.py:1321 MoinMoin/items/__init__.py:1411
-#: MoinMoin/items/__init__.py:1497
+#: MoinMoin/items/__init__.py:670
 msgid "Upload file:"
 msgstr ""
 
-#: MoinMoin/items/__init__.py:731
+#: MoinMoin/items/__init__.py:740
 msgid ""
 "The items have the same data hash code (that means they very likely have "
 "the same data)."
 msgstr ""
 
-#: MoinMoin/items/__init__.py:733
+#: MoinMoin/items/__init__.py:742
 msgid "The items have different data."
 msgstr ""
 
-#: MoinMoin/items/__init__.py:740
+#: MoinMoin/items/__init__.py:754
 #, python-format
 msgid "Impossible to convert the data to the contenttype: %(contenttype)s"
 msgstr ""
 
-#: MoinMoin/items/__init__.py:1154
+#: MoinMoin/items/__init__.py:1120
 msgid "Type your text here"
 msgstr ""
 
-#: MoinMoin/items/__init__.py:1350 MoinMoin/items/__init__.py:1445
+#: MoinMoin/items/__init__.py:1359 MoinMoin/items/__init__.py:1427
 #, python-format
 msgid "Edit drawing %(filename)s (opens in new window)"
 msgstr ""
 
-#: MoinMoin/items/__init__.py:1365 MoinMoin/items/__init__.py:1462
+#: MoinMoin/items/__init__.py:1374 MoinMoin/items/__init__.py:1444
 #, python-format
 msgid "Clickable drawing: %(filename)s"
 msgstr ""
@@ -996,6 +1065,10 @@
 msgid "Mail sent successfully"
 msgstr ""
 
+#: MoinMoin/search/__init__.py:17
+msgid "Search query too short."
+msgstr ""
+
 #: MoinMoin/security/textcha.py:158
 msgid "The entered TextCha was incorrect."
 msgstr ""
@@ -1013,17 +1086,30 @@
 msgid "The item '%(item_name)s' does not exist."
 msgstr ""
 
+#: MoinMoin/templates/atom.html:4 MoinMoin/templates/diff_text_atom.html:5
+#: MoinMoin/templates/meta.html:12
+msgid "Revision"
+msgstr ""
+
+#: MoinMoin/templates/common.js:73
+msgid "Show comments"
+msgstr ""
+
+#: MoinMoin/templates/common.js:107
+msgid "Hide transclusions"
+msgstr ""
+
 #: MoinMoin/templates/delete.html:4
 #, python-format
 msgid "Delete '%(item_name)s'"
 msgstr ""
 
-#: MoinMoin/templates/destroy.html:5
+#: MoinMoin/templates/destroy.html:4
 #, python-format
 msgid "DESTROY COMPLETE item '%(item_name)s'"
 msgstr ""
 
-#: MoinMoin/templates/destroy.html:17
+#: MoinMoin/templates/destroy.html:20
 #, python-format
 msgid "DESTROY REVISION '%(item_name)s' (rev %(rev_id)s)"
 msgstr ""
@@ -1045,28 +1131,28 @@
 msgid "Line"
 msgstr ""
 
-#: MoinMoin/templates/forms.html:80
+#: MoinMoin/templates/forms.html:158
 msgid "Upload"
 msgstr ""
 
-#: MoinMoin/templates/forms.html:81
+#: MoinMoin/templates/forms.html:159
 msgid "Upload files"
 msgstr ""
 
-#: MoinMoin/templates/forms.html:86
+#: MoinMoin/templates/forms.html:164
 msgid "Start All"
 msgstr ""
 
-#: MoinMoin/templates/forms.html:87
+#: MoinMoin/templates/forms.html:165
 msgid "Cancel All"
 msgstr ""
 
-#: MoinMoin/templates/forms.html:91
+#: MoinMoin/templates/forms.html:169
 msgid "Start"
 msgstr ""
 
-#: MoinMoin/templates/forms.html:92 MoinMoin/templates/index.html:143
-#: MoinMoin/templates/index.html:161
+#: MoinMoin/templates/forms.html:170 MoinMoin/templates/index.html:152
+#: MoinMoin/templates/index.html:170
 msgid "Cancel"
 msgstr ""
 
@@ -1078,142 +1164,142 @@
 msgid "Delete bookmark"
 msgstr ""
 
-#: MoinMoin/templates/highlight.html:4
+#: MoinMoin/templates/highlight.html:3
 #, python-format
 msgid "Syntax highlighting for Item: %(name)s"
 msgstr ""
 
-#: MoinMoin/templates/history.html:8
-msgid "Previous"
-msgstr ""
-
-#: MoinMoin/templates/history.html:11
-msgid "Next"
-msgstr ""
-
-#: MoinMoin/templates/history.html:14
+#: MoinMoin/templates/history.html:4
 #, python-format
 msgid "History of '%(item_name)s'"
 msgstr ""
 
-#: MoinMoin/templates/history.html:22
+#: MoinMoin/templates/history.html:11
+msgid "Previous"
+msgstr ""
+
+#: MoinMoin/templates/history.html:14
+msgid "Next"
+msgstr ""
+
+#: MoinMoin/templates/history.html:25
 msgid "Rev."
 msgstr ""
 
-#: MoinMoin/templates/history.html:23
+#: MoinMoin/templates/history.html:26
 msgid "Timestamp"
 msgstr ""
 
-#: MoinMoin/templates/history.html:26
+#: MoinMoin/templates/history.html:29
 msgid "Editor"
 msgstr ""
 
-#: MoinMoin/templates/history.html:27
+#: MoinMoin/templates/history.html:30
 msgid "Content-Type"
 msgstr ""
 
-#: MoinMoin/templates/history.html:48
-msgid "show"
-msgstr ""
-
-#: MoinMoin/templates/history.html:49
-msgid "meta"
-msgstr ""
-
-#: MoinMoin/templates/history.html:50
-msgid "download"
-msgstr ""
-
 #: MoinMoin/templates/history.html:51
-msgid "highlight"
+msgid "show"
+msgstr ""
+
+#: MoinMoin/templates/history.html:52
+msgid "meta"
 msgstr ""
 
 #: MoinMoin/templates/history.html:53
+msgid "download"
+msgstr ""
+
+#: MoinMoin/templates/history.html:54
+msgid "highlight"
+msgstr ""
+
+#: MoinMoin/templates/history.html:56
 msgid "revert"
 msgstr ""
 
-#: MoinMoin/templates/history.html:56
+#: MoinMoin/templates/history.html:59
 msgid "destroy"
 msgstr ""
 
-#: MoinMoin/templates/index.html:16
-msgid "Select All"
-msgstr ""
-
-#: MoinMoin/templates/index.html:26
-msgid "New item"
-msgstr ""
-
-#: MoinMoin/templates/index.html:44
-msgid "Filter by content type"
-msgstr ""
-
-#: MoinMoin/templates/index.html:45
-msgid "items having unknown mime types"
-msgstr ""
-
-#: MoinMoin/templates/index.html:49
-msgid "Toggle"
-msgstr ""
-
-#: MoinMoin/templates/index.html:69
+#: MoinMoin/templates/index.html:5
 #, python-format
 msgid "Index of subitems of '%(item_name)s'"
 msgstr ""
 
-#: MoinMoin/templates/index.html:86
+#: MoinMoin/templates/index.html:22
+msgid "Select All"
+msgstr ""
+
+#: MoinMoin/templates/index.html:32
+msgid "New item"
+msgstr ""
+
+#: MoinMoin/templates/index.html:50
+msgid "Filter by content type"
+msgstr ""
+
+#: MoinMoin/templates/index.html:51
+msgid "items having unknown mime types"
+msgstr ""
+
+#: MoinMoin/templates/index.html:55
+msgid "Toggle"
+msgstr ""
+
+#: MoinMoin/templates/index.html:96
 msgid "Recently uploaded items"
 msgstr ""
 
-#: MoinMoin/templates/index.html:95 MoinMoin/templates/index.html:97
+#: MoinMoin/templates/index.html:105 MoinMoin/templates/index.html:107
 msgid "All"
 msgstr ""
 
-#: MoinMoin/templates/index.html:135 MoinMoin/templates/index.html:148
+#: MoinMoin/templates/index.html:144 MoinMoin/templates/index.html:157
 msgid "Close"
 msgstr ""
 
-#: MoinMoin/templates/index.html:136
+#: MoinMoin/templates/index.html:145
 msgid "Please provide comment for this action"
 msgstr ""
 
-#: MoinMoin/templates/index.html:139
+#: MoinMoin/templates/index.html:148
 msgid "Enter your comment"
 msgstr ""
 
-#: MoinMoin/templates/index.html:142
+#: MoinMoin/templates/index.html:151
 msgid "Submit"
 msgstr ""
 
-#: MoinMoin/templates/index.html:149
+#: MoinMoin/templates/index.html:158
 msgid "Create new item"
 msgstr ""
 
-#: MoinMoin/templates/index.html:155 MoinMoin/templates/index.html:157
+#: MoinMoin/templates/index.html:164 MoinMoin/templates/index.html:166
 msgid "Enter item name here"
 msgstr ""
 
-#: MoinMoin/templates/index.html:160
+#: MoinMoin/templates/index.html:169
 msgid "Create"
 msgstr ""
 
-#: MoinMoin/templates/index.html:171
+#: MoinMoin/templates/index.html:180
 msgid "(Drag and drop multiple files to this white area to upload them.)"
 msgstr ""
 
-#: MoinMoin/templates/itemviews.html:43
+#: MoinMoin/templates/itemviews.html:49
 msgid "Remove Link"
 msgstr ""
 
-#: MoinMoin/templates/itemviews.html:45
+#: MoinMoin/templates/itemviews.html:51
 msgid "Add Link"
 msgstr ""
 
-#: MoinMoin/templates/itemviews.html:54
+#: MoinMoin/templates/itemviews.html:61
 msgid "Unsubscribe"
 msgstr ""
 
-#: MoinMoin/templates/itemviews.html:56
+#: MoinMoin/templates/itemviews.html:63
 msgid "Subscribe"
 msgstr ""
 
@@ -1229,27 +1315,27 @@
 msgid "Moin login"
 msgstr ""
 
-#: MoinMoin/templates/login.html:21 MoinMoin/templates/login.html:35
-msgid "Log in"
+#: MoinMoin/templates/login.html:25
+msgid "OpenID login"
 msgstr ""
 
-#: MoinMoin/templates/login.html:28
-msgid "OpenID login"
+#: MoinMoin/templates/lookup.html:30
+msgid "No results"
+msgstr ""
+
+#: MoinMoin/templates/lookup.html:32
+msgid "More than one result"
 msgstr ""
 
 #: MoinMoin/templates/lostpass.html:7
 msgid "Please note that you only need to fill out one form field."
 msgstr ""
 
-#: MoinMoin/templates/meta.html:9
+#: MoinMoin/templates/meta.html:3
 #, python-format
 msgid "Metadata of '%(item_name)s'"
 msgstr ""
 
-#: MoinMoin/templates/meta.html:10
-msgid "Revision"
-msgstr ""
-
 #: MoinMoin/templates/modify_anywikidraw.html:18
 #: MoinMoin/templates/modify_twikidraw.html:13
 msgid "NOTE:"
@@ -1317,32 +1403,37 @@
 msgid "Revert '%(item_name)s' (rev %(rev_id)s)"
 msgstr ""
 
-#: MoinMoin/templates/search.html:7
+#: MoinMoin/templates/search.html:10
 #, python-format
 msgid "%(result_len)d results found (%(runtime).3f secs)."
 msgstr ""
 
-#: MoinMoin/templates/search.html:12
+#: MoinMoin/templates/search.html:15
 #, python-format
 msgid "No results found (%(runtime).3f secs)."
 msgstr ""
 
-#: MoinMoin/templates/search.html:26
+#: MoinMoin/templates/search.html:29
 #, python-format
 msgid "name term suggestions: %(termlist)s"
 msgstr ""
 
-#: MoinMoin/templates/search.html:27
+#: MoinMoin/templates/search.html:30
 #, python-format
 msgid "content term suggestions: %(termlist)s"
 msgstr ""
 
-#: MoinMoin/templates/search.html:40
+#: MoinMoin/templates/search.html:45 MoinMoin/templates/show.html:54
+#, python-format
+msgid "Summary: %(summary)s"
+msgstr ""
+
+#: MoinMoin/templates/search.html:51
 #, python-format
 msgid "Revision: %(revid)s Last Change: %(mtime)s"
 msgstr ""
 
-#: MoinMoin/templates/search.html:48
+#: MoinMoin/templates/search.html:59
 msgid "You don't have read permission for this item."
 msgstr ""
 
@@ -1362,15 +1453,15 @@
 msgid "no newer revision"
 msgstr ""
 
-#: MoinMoin/templates/show.html:72
+#: MoinMoin/templates/show.html:77
 msgid "modified"
 msgstr ""
 
-#: MoinMoin/templates/show.html:73
+#: MoinMoin/templates/show.html:78
 msgid "by"
 msgstr ""
 
-#: MoinMoin/templates/show.html:74
+#: MoinMoin/templates/show.html:79
 msgid "tagged"
 msgstr ""
 
@@ -1380,39 +1471,40 @@
 msgstr ""
 
 #: MoinMoin/templates/usersettings.html:8
-#: MoinMoin/templates/usersettings.html:17
 msgid "Personal Settings"
 msgstr ""
 
-#: MoinMoin/templates/usersettings.html:10
-#: MoinMoin/templates/usersettings.html:47
+#: MoinMoin/templates/usersettings.html:13
+msgid "Change Password"
+msgstr ""
+
+#: MoinMoin/templates/usersettings.html:18
 msgid "Notification Settings"
 msgstr ""
 
-#: MoinMoin/templates/usersettings.html:11
-#: MoinMoin/templates/usersettings.html:59
+#: MoinMoin/templates/usersettings.html:23
 msgid "Wiki Appearance Settings"
 msgstr ""
 
-#: MoinMoin/templates/usersettings.html:12
-#: MoinMoin/templates/usersettings.html:74
+#: MoinMoin/templates/usersettings.html:28
 msgid "Navigation Settings"
 msgstr ""
 
-#: MoinMoin/templates/usersettings.html:13
-#: MoinMoin/templates/usersettings.html:86
+#: MoinMoin/templates/usersettings.html:33
 msgid "Options"
 msgstr ""
 
-#: MoinMoin/templates/usersettings.html:33
-msgid "Change Password"
+#: MoinMoin/templates/usersettings_forms.html:35
+msgid ""
+"Changing your email address requires you to verify it. A link will be "
+"sent to you."
 msgstr ""
 
-#: MoinMoin/templates/utils.html:58
+#: MoinMoin/templates/utils.html:62
 msgid "Expand Subitem"
 msgstr ""
 
-#: MoinMoin/templates/utils.html:75
+#: MoinMoin/templates/utils.html:79
 msgid "Subitems"
 msgstr ""
 
@@ -1424,7 +1516,7 @@
 msgid "You are not allowed to access this resource."
 msgstr ""
 
-#: MoinMoin/themes/__init__.py:293
+#: MoinMoin/themes/__init__.py:292
 msgid "anonymous"
 msgstr ""
 
--- a/MoinMoin/translations/de/LC_MESSAGES/messages.po	Wed Jul 18 00:42:48 2012 +0530
+++ b/MoinMoin/translations/de/LC_MESSAGES/messages.po	Wed Jul 18 00:51:44 2012 +0530
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: MoinMoin 2.0\n"
 "Report-Msgid-Bugs-To: German <moin-user@lists.sourceforge.net>\n"
-"POT-Creation-Date: 2011-07-10 21:27+0200\n"
+"POT-Creation-Date: 2012-07-15 23:32+0200\n"
 "PO-Revision-Date: 2011-03-20 23:37+0100\n"
 "Last-Translator: Julian Brost <julian.brost@googlemail.com>\n"
 "Language-Team: German <moin-user@lists.sourceforge.net>\n"
@@ -18,7 +18,47 @@
 "Content-Transfer-Encoding: 8bit\n"
 "Generated-By: Babel 0.9.6\n"
 
-#: MoinMoin/user.py:48
+#: MoinMoin/forms.py:37
+msgid "OpenID"
+msgstr "OpenID"
+
+#: MoinMoin/forms.py:37
+msgid "OpenID address"
+msgstr "OpenID-Adresse"
+
+#: MoinMoin/forms.py:39
+msgid "Your OpenID address"
+msgstr "Ihre OpenID-Adresse"
+
+#: MoinMoin/forms.py:41
+msgid "E-Mail"
+msgstr "E-Mail"
+
+#: MoinMoin/forms.py:41
+msgid "E-Mail address"
+msgstr "E-Mail-Adresse"
+
+#: MoinMoin/forms.py:43
+msgid "Your E-Mail address"
+msgstr "Ihre E-Mail-Adresse"
+
+#: MoinMoin/forms.py:45
+msgid "Password"
+msgstr "Passwort"
+
+#: MoinMoin/forms.py:56 MoinMoin/config/default.py:336
+msgid "Tags"
+msgstr "Schlagworte"
+
+#: MoinMoin/forms.py:58
+msgid "Search Query"
+msgstr "Such-Anfrage"
+
+#: MoinMoin/forms.py:70
+msgid "OK"
+msgstr "OK"
+
+#: MoinMoin/user.py:54
 #, python-format
 msgid ""
 "Invalid user name '%(name)s'.\n"
@@ -31,16 +71,16 @@
 "vorkommen dürfen. Der Benutzername darf auch kein existierender "
 "Gruppenname sein."
 
-#: MoinMoin/user.py:54
+#: MoinMoin/user.py:60
 msgid "This user name already belongs to somebody else."
 msgstr "Dieser Benutzername ist bereits vergeben."
 
-#: MoinMoin/user.py:60
+#: MoinMoin/user.py:68
 #, python-format
 msgid "Password not acceptable: %(msg)s"
 msgstr "Dieses Passwort ist nicht ausreichend: %(msg)s"
 
-#: MoinMoin/user.py:72
+#: MoinMoin/user.py:78
 msgid ""
 "Please provide your email address. If you lose your login information, "
 "you can get it by email."
@@ -48,19 +88,15 @@
 "Bitte geben Sie Ihre E-Mail-Adresse an. Wenn Sie Ihre Logindaten "
 "vergessen, können Sie Ihnen per E-Mail zugesendet werden."
 
-#: MoinMoin/user.py:78
+#: MoinMoin/user.py:84
 msgid "This email already belongs to somebody else."
 msgstr "Diese E-Mail-Adresse wird bereits verwendet."
 
-#: MoinMoin/user.py:83
+#: MoinMoin/user.py:90
 msgid "This OpenID already belongs to somebody else."
 msgstr "Diese OpenID gehört bereits zu jemand anderem."
 
-#: MoinMoin/user.py:726
-msgid "<unknown>"
-msgstr "<unbekannt>"
-
-#: MoinMoin/user.py:784
+#: MoinMoin/user.py:730
 #, python-format
 msgid ""
 "Somebody has requested to email you a password recovery link.\n"
@@ -84,61 +120,126 @@
 "ignorieren.\n"
 "\n"
 
-#: MoinMoin/user.py:787
+#: MoinMoin/user.py:733
 #, python-format
 msgid "[%(sitename)s] Your wiki password recovery link"
 msgstr "[%(sitename)s] Passwort vergessen"
 
-#: MoinMoin/apps/admin/views.py:63
+#: MoinMoin/user.py:751
+#, python-format
+msgid ""
+"Somebody has created an account with this email address.\n"
+"\n"
+"Please use the link below to verify your email address:\n"
+"\n"
+"%(link)s\n"
+"\n"
+"If you didn't create this account, please ignore this email.\n"
+"\n"
+msgstr ""
+"Jemand hat ein Benutzerkonto mit dieser E-Mail-Adresse angelegt.\n"
+"\n"
+"Bitte benutzen Sie den unten stehenden Link, um Ihre E-Mail-Adresse zu verifizieren:\n"
+"\n"
+"%(link)s\n"
+"\n"
+"Falls Sie dieses Benutzerkonto nicht angelegt haben, sollten Sie diese E-Mail "
+"ignorieren.\n"
+"\n"
+
+#: MoinMoin/user.py:754
+#, python-format
+msgid "[%(sitename)s] Please verify your email address"
+msgstr ""
+
+#: MoinMoin/apps/admin/views.py:30
+msgid "Admin"
+msgstr ""
+
+#: MoinMoin/apps/admin/views.py:48
+#: MoinMoin/apps/admin/templates/admin/index.html:9
+msgid "User Browser"
+msgstr "Benutzer-Browser"
+
+#: MoinMoin/apps/admin/views.py:60
 #, python-format
 msgid "User profile of %(username)s: %(email)r"
 msgstr "Profil von %(username)s: %(email)r"
 
-#: MoinMoin/apps/admin/views.py:113
+#: MoinMoin/apps/admin/views.py:104
+#: MoinMoin/apps/admin/templates/admin/sysitems_upgrade.html:3
+msgid "System items upgrade"
+msgstr "System-Items upgraden"
+
+#: MoinMoin/apps/admin/views.py:110
 #, python-format
 msgid "System items upgrade failed due to the following error: %(error)s."
 msgstr ""
 "Das Upgrade der Systemitems ist aus folgendem Grund fehlgeschlagen: "
 "%(error)s."
 
-#: MoinMoin/apps/admin/views.py:115
+#: MoinMoin/apps/admin/views.py:112
 msgid "System items have been upgraded successfully!"
 msgstr "Das Upgrade der Systemitems war erfolgreich!"
 
-#: MoinMoin/apps/admin/views.py:199
+#: MoinMoin/apps/admin/views.py:159
+msgid "Wiki Configuration"
+msgstr "Wiki-Konfiguration"
+
+#: MoinMoin/apps/admin/views.py:188
+msgid "Wiki Configuration Help"
+msgstr "Wiki-Konfigurations-Hilfe"
+
+#: MoinMoin/apps/admin/views.py:196
 msgid "Lexer description"
 msgstr "Lexer-Beschreibung"
 
-#: MoinMoin/apps/admin/views.py:200
+#: MoinMoin/apps/admin/views.py:197
 msgid "Lexer names"
 msgstr "Lexer-Namen"
 
-#: MoinMoin/apps/admin/views.py:201
+#: MoinMoin/apps/admin/views.py:198
 msgid "File patterns"
 msgstr "Dateitypen"
 
-#: MoinMoin/apps/admin/views.py:202
+#: MoinMoin/apps/admin/views.py:199
 msgid "Mimetypes"
 msgstr "MIME-Typen"
 
-#: MoinMoin/apps/admin/views.py:216
+#: MoinMoin/apps/admin/views.py:205
+msgid "Highlighter Help"
+msgstr "Highlighter-Hilfe"
+
+#: MoinMoin/apps/admin/views.py:213
 msgid "InterWiki name"
 msgstr "InterWiki-Name"
 
-#: MoinMoin/apps/admin/views.py:217
+#: MoinMoin/apps/admin/views.py:214
 msgid "URL"
 msgstr "URL"
 
-#: MoinMoin/apps/admin/views.py:229 MoinMoin/templates/history.html:13
+#: MoinMoin/apps/admin/views.py:218
+msgid "Interwiki Help"
+msgstr "InterWiki-Hilfe"
+
+#: MoinMoin/apps/admin/views.py:226 MoinMoin/converter/archive_in.py:59
+#: MoinMoin/templates/atom.html:8 MoinMoin/templates/diff_text_atom.html:9
+#: MoinMoin/templates/history.html:27
 msgid "Size"
 msgstr "Größe"
 
-#: MoinMoin/apps/admin/views.py:230
+#: MoinMoin/apps/admin/views.py:227 MoinMoin/templates/index.html:162
 msgid "Item name"
 msgstr "Item-Name"
 
+#: MoinMoin/apps/admin/views.py:233
+msgid "Item Size"
+msgstr "Item-Größe"
+
 #: MoinMoin/apps/admin/templates/admin/highlighterhelp.html:4
 #: MoinMoin/apps/admin/templates/admin/index.html:20
+#: MoinMoin/apps/admin/templates/user/highlighterhelp.html:4
+#: MoinMoin/apps/admin/templates/user/index_user.html:9
 msgid "Available Highlighters"
 msgstr "Verfügbare Highlighter"
 
@@ -154,10 +255,6 @@
 msgid "Admin Menu"
 msgstr "Admin-Menü"
 
-#: MoinMoin/apps/admin/templates/admin/index.html:9
-msgid "User Browser"
-msgstr "Benutzer-Browser"
-
 #: MoinMoin/apps/admin/templates/admin/index.html:10
 #: MoinMoin/apps/admin/templates/admin/sysitems_upgrade.html:10
 msgid "Upgrade system items"
@@ -172,33 +269,36 @@
 msgstr "Wiki-Konfigurations-Hilfe anzeigen"
 
 #: MoinMoin/apps/admin/templates/admin/index.html:14
+#: MoinMoin/apps/admin/templates/user/index_user.html:3
 msgid "User Menu"
 msgstr "Benutzer-Menü"
 
 #: MoinMoin/apps/admin/templates/admin/index.html:16
-#: MoinMoin/apps/frontend/views.py:588
+#: MoinMoin/apps/admin/templates/user/index_user.html:5
+#: MoinMoin/apps/frontend/views.py:903 MoinMoin/apps/frontend/views.py:905
 msgid "Wanted Items"
 msgstr "Fehlende Items"
 
 #: MoinMoin/apps/admin/templates/admin/index.html:17
-#: MoinMoin/apps/frontend/views.py:636
+#: MoinMoin/apps/admin/templates/user/index_user.html:6
+#: MoinMoin/apps/frontend/views.py:919 MoinMoin/apps/frontend/views.py:922
 msgid "Orphaned Items"
 msgstr "Verwaiste Items"
 
 #: MoinMoin/apps/admin/templates/admin/index.html:18
 #: MoinMoin/apps/admin/templates/admin/itemsize.html:4
+#: MoinMoin/apps/admin/templates/user/index_user.html:7
+#: MoinMoin/apps/admin/templates/user/itemsize.html:4
 msgid "Item sizes (latest revision)"
 msgstr "Item-Größen (neueste Revision)"
 
 #: MoinMoin/apps/admin/templates/admin/index.html:19
 #: MoinMoin/apps/admin/templates/admin/interwikihelp.html:4
+#: MoinMoin/apps/admin/templates/user/index_user.html:8
+#: MoinMoin/apps/admin/templates/user/interwikihelp.html:4
 msgid "Known InterWiki names"
 msgstr "Bekannte InterWiki-Namen"
 
-#: MoinMoin/apps/admin/templates/admin/sysitems_upgrade.html:3
-msgid "System items upgrade"
-msgstr "System-Items upgraden"
-
 #: MoinMoin/apps/admin/templates/admin/sysitems_upgrade.html:5
 msgid ""
 "You can upgrade your system items by uploading an xml file with new items"
@@ -220,7 +320,7 @@
 msgstr "E-Mail-Adresse"
 
 #: MoinMoin/apps/admin/templates/admin/userbrowser.html:8
-#: MoinMoin/templates/history.html:18
+#: MoinMoin/templates/history.html:32
 msgid "Actions"
 msgstr "Aktionen"
 
@@ -277,320 +377,430 @@
 msgid "Description"
 msgstr "Beschreibung"
 
-#: MoinMoin/apps/feed/views.py:63
+#: MoinMoin/apps/feed/views.py:85
 msgid "MoinMoin feels unhappy."
 msgstr "MoinMoin ist unglücklich."
 
-#: MoinMoin/apps/frontend/views.py:114
-msgid "Search query too short."
-msgstr "Such-Anfrage ist zu kurz."
+#: MoinMoin/apps/frontend/views.py:133
+msgid "name"
+msgstr ""
 
-#: MoinMoin/apps/frontend/views.py:125
-msgid "Search Query"
-msgstr "Such-Anfrage"
+#: MoinMoin/apps/frontend/views.py:134
+msgid "name_exact"
+msgstr ""
 
-#: MoinMoin/apps/frontend/views.py:126
+#: MoinMoin/apps/frontend/views.py:135
+msgid "itemid"
+msgstr ""
+
+#: MoinMoin/apps/frontend/views.py:136
+msgid "revid"
+msgstr ""
+
+#: MoinMoin/apps/frontend/views.py:137
+msgid "userid"
+msgstr ""
+
+#: MoinMoin/apps/frontend/views.py:138
+msgid "language"
+msgstr ""
+
+#: MoinMoin/apps/frontend/views.py:139
+msgid "itemlinks"
+msgstr ""
+
+#: MoinMoin/apps/frontend/views.py:140
+msgid "itemtransclusions"
+msgstr ""
+
+#: MoinMoin/apps/frontend/views.py:141
+msgid "refs"
+msgstr ""
+
+#: MoinMoin/apps/frontend/views.py:143 MoinMoin/search/__init__.py:29
+msgid "search also in non-current revisions"
+msgstr ""
+
+#: MoinMoin/apps/frontend/views.py:144 MoinMoin/apps/frontend/views.py:168
+#: MoinMoin/templates/lookup.html:6
+msgid "Lookup"
+msgstr ""
+
+#: MoinMoin/apps/frontend/views.py:227 MoinMoin/search/__init__.py:30
 msgid "Search"
 msgstr "Suche"
 
-#: MoinMoin/apps/frontend/views.py:308
-#: MoinMoin/templates/global_history.html:20 MoinMoin/templates/history.html:17
-msgid "Comment"
-msgstr "Kommentar"
-
-#: MoinMoin/apps/frontend/views.py:308
-msgid "Comment about your change"
-msgstr "Kommentar zu Ihrer Änderung"
-
-#: MoinMoin/apps/frontend/views.py:309
-msgid "OK"
-msgstr "OK"
-
-#: MoinMoin/apps/frontend/views.py:312
+#: MoinMoin/apps/frontend/views.py:470
 msgid "Target"
 msgstr "Ziel"
 
-#: MoinMoin/apps/frontend/views.py:312
+#: MoinMoin/apps/frontend/views.py:470
 msgid "The name of the target item"
 msgstr "Name des Ziel-Items"
 
-#: MoinMoin/apps/frontend/views.py:531
-msgid "Refers Here"
-msgstr "Hierauf linkt"
+#: MoinMoin/apps/frontend/views.py:486
+msgid "markup text"
+msgstr ""
 
-#: MoinMoin/apps/frontend/views.py:672 MoinMoin/apps/frontend/views.py:691
+#: MoinMoin/apps/frontend/views.py:487
+msgid "other text"
+msgstr ""
+
+#: MoinMoin/apps/frontend/views.py:488
+msgid "image"
+msgstr ""
+
+#: MoinMoin/apps/frontend/views.py:489
+msgid "audio"
+msgstr ""
+
+#: MoinMoin/apps/frontend/views.py:490
+msgid "video"
+msgstr ""
+
+#: MoinMoin/apps/frontend/views.py:491
+msgid "other"
+msgstr ""
+
+#: MoinMoin/apps/frontend/views.py:492
+msgid "unknown"
+msgstr "unbekannt"
+
+#: MoinMoin/apps/frontend/views.py:493
+msgid "Filter"
+msgstr ""
+
+#: MoinMoin/apps/frontend/views.py:746 MoinMoin/config/default.py:335
+#: MoinMoin/templates/index.html:7 MoinMoin/templates/index.html:81
+msgid "Global Index"
+msgstr "Globaler Index"
+
+#: MoinMoin/apps/frontend/views.py:766 MoinMoin/apps/frontend/views.py:767
+msgid "My Changes"
+msgstr ""
+
+#: MoinMoin/apps/frontend/views.py:798
+#, python-format
+msgid "Items which refer to '%(item_name)s'"
+msgstr "Items, die auf '%(item_name)s' verweisen"
+
+#: MoinMoin/apps/frontend/views.py:869 MoinMoin/config/default.py:334
+#: MoinMoin/templates/global_history.html:10
+msgid "Global History"
+msgstr "Globale Historie"
+
+#: MoinMoin/apps/frontend/views.py:932 MoinMoin/apps/frontend/views.py:951
 #, python-format
 msgid "You must login to use this action: %(action)s."
 msgstr "Sie müssen sich hierzu anmelden: %(action)s."
 
-#: MoinMoin/apps/frontend/views.py:675
+#: MoinMoin/apps/frontend/views.py:935
 msgid "A quicklink to this page could not be added for you."
 msgstr "Es konnte kein Quicklink zu dieser Item für Sie erstellt werden."
 
-#: MoinMoin/apps/frontend/views.py:678
+#: MoinMoin/apps/frontend/views.py:938
 msgid "Your quicklink to this page could not be removed."
 msgstr "Ihr Quicklink zu dieser Item konnte nicht entfernt werden."
 
-#: MoinMoin/apps/frontend/views.py:693
+#: MoinMoin/apps/frontend/views.py:953
 msgid "You are not allowed to subscribe to an item you may not read."
 msgstr "Sie dürfen kein Item abonnieren, für das Sie keine Leserechte haben."
 
-#: MoinMoin/apps/frontend/views.py:697
+#: MoinMoin/apps/frontend/views.py:957
 msgid "Can't remove regular expression subscription!"
 msgstr ""
 "Ein auf einem regulären Ausdruck basierendes Abonnement kann nicht "
 "entfernt werden."
 
-#: MoinMoin/apps/frontend/views.py:698
+#: MoinMoin/apps/frontend/views.py:958
 msgid "Edit the subscription regular expressions in your settings."
 msgstr ""
 "Bitte bearbeiten Sie die zu den Abonnements gehörenden regulären "
 "Ausdrücke in Ihren Einstellungen."
 
-#: MoinMoin/apps/frontend/views.py:702
+#: MoinMoin/apps/frontend/views.py:962
 msgid "You could not get subscribed to this item."
 msgstr "Sie konnten nicht zu den Abonnenten dieses Items hinzugefügt werden."
 
-#: MoinMoin/apps/frontend/views.py:711 MoinMoin/apps/frontend/views.py:904
-#: MoinMoin/apps/frontend/views.py:1041
+#: MoinMoin/apps/frontend/views.py:971 MoinMoin/apps/frontend/views.py:1164
+#: MoinMoin/apps/frontend/views.py:1297
 msgid "The passwords do not match."
 msgstr "Die Passwörter stimmen nicht überein."
 
-#: MoinMoin/apps/frontend/views.py:727 MoinMoin/apps/frontend/views.py:743
-#: MoinMoin/apps/frontend/views.py:863 MoinMoin/apps/frontend/views.py:922
-#: MoinMoin/apps/frontend/views.py:989 MoinMoin/apps/frontend/views.py:1107
-#: MoinMoin/templates/global_history.html:16 MoinMoin/templates/history.html:10
+#: MoinMoin/apps/frontend/views.py:987 MoinMoin/apps/frontend/views.py:1122
+#: MoinMoin/apps/frontend/views.py:1182 MoinMoin/apps/frontend/views.py:1249
+#: MoinMoin/apps/frontend/views.py:1362 MoinMoin/converter/archive_in.py:59
+#: MoinMoin/templates/history.html:24
 msgid "Name"
 msgstr "Name"
 
-#: MoinMoin/apps/frontend/views.py:727 MoinMoin/apps/frontend/views.py:743
-#: MoinMoin/apps/frontend/views.py:1107
+#: MoinMoin/apps/frontend/views.py:987 MoinMoin/apps/frontend/views.py:1362
 msgid "The login name you want to use"
 msgstr "Der Anmelde-Name, den Sie benutzen wollen"
 
-#: MoinMoin/apps/frontend/views.py:728 MoinMoin/apps/frontend/views.py:729
-#: MoinMoin/apps/frontend/views.py:744 MoinMoin/apps/frontend/views.py:745
-#: MoinMoin/apps/frontend/views.py:990
-msgid "Password"
-msgstr "Passwort"
-
-#: MoinMoin/apps/frontend/views.py:728 MoinMoin/apps/frontend/views.py:744
-#: MoinMoin/apps/frontend/views.py:924 MoinMoin/apps/frontend/views.py:1065
+#: MoinMoin/apps/frontend/views.py:988 MoinMoin/apps/frontend/views.py:1184
+#: MoinMoin/apps/frontend/views.py:1323
 msgid "The login password you want to use"
 msgstr "Das Anmelde-Passwort, das Sie benutzen wollen"
 
-#: MoinMoin/apps/frontend/views.py:729 MoinMoin/apps/frontend/views.py:745
-#: MoinMoin/apps/frontend/views.py:925 MoinMoin/apps/frontend/views.py:1066
+#: MoinMoin/apps/frontend/views.py:989 MoinMoin/apps/frontend/views.py:1185
+#: MoinMoin/apps/frontend/views.py:1324
 msgid "Repeat the same password"
 msgstr "Wiederholen Sie das gleiche Passwort"
 
-#: MoinMoin/apps/frontend/views.py:730 MoinMoin/apps/frontend/views.py:747
-#: MoinMoin/apps/frontend/views.py:864 MoinMoin/apps/frontend/views.py:1073
-msgid "E-Mail"
-msgstr "E-Mail"
-
-#: MoinMoin/apps/frontend/views.py:730 MoinMoin/apps/frontend/views.py:747
-#: MoinMoin/apps/frontend/views.py:864 MoinMoin/apps/frontend/views.py:1073
-msgid "Your E-Mail address"
-msgstr "Ihre E-Mail-Adresse"
-
-#: MoinMoin/apps/frontend/views.py:731 MoinMoin/apps/frontend/views.py:748
-#: MoinMoin/apps/frontend/views.py:991 MoinMoin/apps/frontend/views.py:1109
-msgid "OpenID"
-msgstr "OpenID"
-
-#: MoinMoin/apps/frontend/views.py:731 MoinMoin/apps/frontend/views.py:748
-#: MoinMoin/apps/frontend/views.py:1109
-msgid "Your OpenID address"
-msgstr "Ihre OpenID-Adresse"
-
-#: MoinMoin/apps/frontend/views.py:732
-#: MoinMoin/templates/openid_register.html:21
+#: MoinMoin/apps/frontend/views.py:992 MoinMoin/apps/frontend/views.py:1031
 msgid "Register"
 msgstr "Registrieren"
 
-#: MoinMoin/apps/frontend/views.py:810 MoinMoin/apps/frontend/views.py:836
+#: MoinMoin/apps/frontend/views.py:1075
+msgid ""
+"Account verification required, please see the email we sent to your "
+"address."
+msgstr ""
+
+#: MoinMoin/apps/frontend/views.py:1077
+#, python-format
+msgid ""
+"An error occurred while sending the verification email: \"%(message)s\" "
+"Please contact an administrator to activate your account."
+msgstr ""
+
+#: MoinMoin/apps/frontend/views.py:1080
 msgid "Account created, please log in now."
 msgstr "Das Benutzerkonto wurde erstellt. Bitte melden Sie sich an."
 
-#: MoinMoin/apps/frontend/views.py:848
+#: MoinMoin/apps/frontend/views.py:1098
+msgid "Your account has been activated, you can log in now."
+msgstr "Ihr Account wurde aktiviert, Sie können sich jetzt anmelden."
+
+#: MoinMoin/apps/frontend/views.py:1100 MoinMoin/apps/frontend/views.py:1209
+msgid "Your token is invalid!"
+msgstr "Ihr Code ist ungültig!"
+
+#: MoinMoin/apps/frontend/views.py:1107
 msgid "Your user name or your email address is needed."
 msgstr "Bitte geben Sie Ihren Benutzernamen oder Ihre E-Mail-Adresse an."
 
-#: MoinMoin/apps/frontend/views.py:863 MoinMoin/apps/frontend/views.py:922
+#: MoinMoin/apps/frontend/views.py:1122 MoinMoin/apps/frontend/views.py:1182
 msgid "Your login name"
 msgstr "Ihr Anmelde-Name"
 
-#: MoinMoin/apps/frontend/views.py:865
+#: MoinMoin/apps/frontend/views.py:1124
 msgid "Recover password"
 msgstr "Passwort zurücksetzen"
 
-#: MoinMoin/apps/frontend/views.py:894
+#: MoinMoin/apps/frontend/views.py:1132 MoinMoin/templates/lostpass.html:5
+msgid "Lost Password"
+msgstr "Passwort vergessen"
+
+#: MoinMoin/apps/frontend/views.py:1154
 msgid "If this account exists, you will be notified."
 msgstr "Wenn dieses Benutzerkonto existiert, werden Sie benachrichtigt."
 
-#: MoinMoin/apps/frontend/views.py:905 MoinMoin/apps/frontend/views.py:1043
+#: MoinMoin/apps/frontend/views.py:1165 MoinMoin/apps/frontend/views.py:1299
 msgid "New password is unacceptable, encoding trouble."
 msgstr ""
 "Das neue Passwort kann nicht verwendet werden, da es Probleme bei der "
 "Kodierung gab."
 
-#: MoinMoin/apps/frontend/views.py:923
+#: MoinMoin/apps/frontend/views.py:1183
 msgid "Recovery token"
 msgstr "Wiederherstellungscode"
 
-#: MoinMoin/apps/frontend/views.py:923
+#: MoinMoin/apps/frontend/views.py:1183
 msgid "The recovery token that has been sent to you"
 msgstr "Das Recovery-Token, das an Sie gesendet wurde"
 
-#: MoinMoin/apps/frontend/views.py:924 MoinMoin/apps/frontend/views.py:1065
+#: MoinMoin/apps/frontend/views.py:1184 MoinMoin/apps/frontend/views.py:1323
 msgid "New password"
 msgstr "Neues Passwort"
 
-#: MoinMoin/apps/frontend/views.py:925 MoinMoin/apps/frontend/views.py:1066
+#: MoinMoin/apps/frontend/views.py:1185 MoinMoin/apps/frontend/views.py:1324
 msgid "New password (repeat)"
 msgstr "Neues Passwort (wiederholen)"
 
-#: MoinMoin/apps/frontend/views.py:926 MoinMoin/apps/frontend/views.py:1067
-#: MoinMoin/templates/usersettings.html:9
+#: MoinMoin/apps/frontend/views.py:1186 MoinMoin/apps/frontend/views.py:1325
+#: MoinMoin/templates/usersettings_forms.html:28
 msgid "Change password"
 msgstr "Passwort ändern"
 
-#: MoinMoin/apps/frontend/views.py:947
+#: MoinMoin/apps/frontend/views.py:1194 MoinMoin/templates/recoverpass.html:5
+msgid "Recover Password"
+msgstr "Passwort wiederherstellen"
+
+#: MoinMoin/apps/frontend/views.py:1207
 msgid "Your password has been changed, you can log in now."
 msgstr "Ihr Passwort wurde geändert. Sie können sich jetzt anmelden."
 
-#: MoinMoin/apps/frontend/views.py:949
-msgid "Your token is invalid!"
-msgstr "Ihr Code ist ungültig!"
-
-#: MoinMoin/apps/frontend/views.py:961
+#: MoinMoin/apps/frontend/views.py:1221
 msgid "Either your username or password was invalid."
 msgstr "Ihr Benutzername oder Passwort war ungültig."
 
-#: MoinMoin/apps/frontend/views.py:962
+#: MoinMoin/apps/frontend/views.py:1222
 msgid "Failed to authenticate with this OpenID."
 msgstr "Mit dieser OpenID konnte nicht authentifiziert werden."
 
-#: MoinMoin/apps/frontend/views.py:1031
+#: MoinMoin/apps/frontend/views.py:1252
+msgid "Log in"
+msgstr "Anmelden"
+
+#: MoinMoin/apps/frontend/views.py:1260 MoinMoin/templates/layout.html:62
+msgid "Login"
+msgstr "Anmelden"
+
+#: MoinMoin/apps/frontend/views.py:1289
 msgid "You are now logged out."
 msgstr "Sie sind jetzt abgemeldet."
 
-#: MoinMoin/apps/frontend/views.py:1042
+#: MoinMoin/apps/frontend/views.py:1298
 msgid "The current password was wrong."
 msgstr "Das aktuelle Passwort war nicht korrekt."
 
-#: MoinMoin/apps/frontend/views.py:1064
+#: MoinMoin/apps/frontend/views.py:1322
 msgid "Current Password"
 msgstr "Aktuelles Passwort"
 
-#: MoinMoin/apps/frontend/views.py:1064
+#: MoinMoin/apps/frontend/views.py:1322
 msgid "Your current login password"
 msgstr "Ihr aktuelles Anmelde-Passwort"
 
-#: MoinMoin/apps/frontend/views.py:1074 MoinMoin/apps/frontend/views.py:1080
-#: MoinMoin/apps/frontend/views.py:1095 MoinMoin/apps/frontend/views.py:1118
-#: MoinMoin/apps/frontend/views.py:1128
+#: MoinMoin/apps/frontend/views.py:1330 MoinMoin/apps/frontend/views.py:1336
+#: MoinMoin/apps/frontend/views.py:1351 MoinMoin/apps/frontend/views.py:1373
+#: MoinMoin/apps/frontend/views.py:1384
+#: MoinMoin/templates/usersettings_forms.html:14
+#: MoinMoin/templates/usersettings_forms.html:42
+#: MoinMoin/templates/usersettings_forms.html:56
+#: MoinMoin/templates/usersettings_forms.html:67
+#: MoinMoin/templates/usersettings_forms.html:81
 msgid "Save"
 msgstr "Speichern"
 
-#: MoinMoin/apps/frontend/views.py:1091
+#: MoinMoin/apps/frontend/views.py:1347
 msgid "Publish my email (not my wiki homepage) in author info"
 msgstr ""
 "Veröffentliche meine E-Mail-Adresse (statt meiner Wiki-Homepage) in den "
 "Autoreninformationen"
 
-#: MoinMoin/apps/frontend/views.py:1092
+#: MoinMoin/apps/frontend/views.py:1348
 msgid "Open editor on double click"
 msgstr "Editor durch Doppelklick öffnen"
 
-#: MoinMoin/apps/frontend/views.py:1093
+#: MoinMoin/apps/frontend/views.py:1349
 msgid "Show comment sections"
 msgstr "Kommentarbereiche anzeigen"
 
-#: MoinMoin/apps/frontend/views.py:1094
+#: MoinMoin/apps/frontend/views.py:1350
 msgid "Disable this account forever"
 msgstr "Benutzerkonto dauerhaft deaktivieren"
 
-#: MoinMoin/apps/frontend/views.py:1108
+#: MoinMoin/apps/frontend/views.py:1357 MoinMoin/templates/usersettings.html:5
+msgid "User Settings"
+msgstr "Benutzer-Einstellungen"
+
+#: MoinMoin/apps/frontend/views.py:1363
 msgid "Alias-Name"
 msgstr "Alias-Name"
 
-#: MoinMoin/apps/frontend/views.py:1108
+#: MoinMoin/apps/frontend/views.py:1363
 msgid "Your alias name (informational)"
 msgstr "Ihr Alias-Name (informativ)"
 
-#: MoinMoin/apps/frontend/views.py:1112
+#: MoinMoin/apps/frontend/views.py:1367
 msgid "Timezone"
 msgstr "Zeitzone"
 
-#: MoinMoin/apps/frontend/views.py:1117
+#: MoinMoin/apps/frontend/views.py:1372
 msgid "Locale"
 msgstr "Lokalisierung"
 
-#: MoinMoin/apps/frontend/views.py:1125
+#: MoinMoin/apps/frontend/views.py:1380
 msgid "Theme name"
 msgstr "Theme-Name"
 
-#: MoinMoin/apps/frontend/views.py:1126
+#: MoinMoin/apps/frontend/views.py:1381
 msgid "User CSS URL"
 msgstr "Benutzerdefiniertes CSS"
 
-#: MoinMoin/apps/frontend/views.py:1126
+#: MoinMoin/apps/frontend/views.py:1381
 msgid "Give the URL of your custom CSS (optional)"
 msgstr "Geben Sie die URL Ihres benutzerspezifischen CSS an (optional)"
 
-#: MoinMoin/apps/frontend/views.py:1127
+#: MoinMoin/apps/frontend/views.py:1382
 msgid "Editor size"
 msgstr "Größe des Editors"
 
-#: MoinMoin/apps/frontend/views.py:1127
+#: MoinMoin/apps/frontend/views.py:1382
 msgid "Editor textarea height (0=auto)"
 msgstr "Höhe des Editors (0=automatisch)"
 
-#: MoinMoin/apps/frontend/views.py:1156
+#: MoinMoin/apps/frontend/views.py:1383
+msgid "History results per page"
+msgstr ""
+
+#: MoinMoin/apps/frontend/views.py:1383
+msgid "Number of results per page (0=no paging)"
+msgstr ""
+
+#: MoinMoin/apps/frontend/views.py:1426
 msgid "Your password has been changed."
 msgstr "Ihr Passwort wurde geändert."
 
-#: MoinMoin/apps/frontend/views.py:1161
+#: MoinMoin/apps/frontend/views.py:1431
 msgid "This openid is already in use."
 msgstr "Diese OpenID wird bereits verwendet."
 
-#: MoinMoin/apps/frontend/views.py:1165
+#: MoinMoin/apps/frontend/views.py:1435
 msgid "This username is already in use."
 msgstr "Dieser Benutzername wird bereits verwendet."
 
-#: MoinMoin/apps/frontend/views.py:1171
+#: MoinMoin/apps/frontend/views.py:1441
 msgid "This email is already in use"
 msgstr "Diese E-Mail-Adresse wird bereits verwendet."
 
-#: MoinMoin/apps/frontend/views.py:1209
+#: MoinMoin/apps/frontend/views.py:1456
+msgid ""
+"Your account has been disabled because you changed your email address. "
+"Please see the email we sent to your address to reactivate it."
+msgstr ""
+
+#: MoinMoin/apps/frontend/views.py:1463
+msgid ""
+"Your email address was not changed because sending the verification email"
+" failed. Please try again later."
+msgstr ""
+
+#: MoinMoin/apps/frontend/views.py:1469
+msgid "Your changes have been saved."
+msgstr ""
+
+#: MoinMoin/apps/frontend/views.py:1521
 msgid "You must log in to use bookmarks."
 msgstr "Sie müssen sich anmelden, um Lesezeichen verwenden zu können."
 
-#: MoinMoin/apps/frontend/views.py:1362 MoinMoin/config/default.py:374
-msgid "Items with similar names"
-msgstr "Items mit ähnlichen Namen"
+#: MoinMoin/apps/frontend/views.py:1647
+#, python-format
+msgid "Items with similar names to '%(item_name)s'"
+msgstr "Items mit ähnlichen Namen wie '%(item_name)s'"
 
-#: MoinMoin/apps/frontend/views.py:1563
+#: MoinMoin/apps/frontend/views.py:1829 MoinMoin/apps/frontend/views.py:1856
 msgid "All tags in this wiki"
 msgstr "Alle Schlagworte in diesem Wiki"
 
-#: MoinMoin/apps/frontend/views.py:1575
+#: MoinMoin/apps/frontend/views.py:1870
 #, python-format
 msgid "Items tagged with %(tag)s"
 msgstr "Items, die mit dem Schlagwort %(tag)s markiert wurden"
 
-#: MoinMoin/auth/__init__.py:242 MoinMoin/auth/ldap_login.py:129
+#: MoinMoin/auth/__init__.py:244 MoinMoin/auth/ldap_login.py:130
 msgid "Missing password. Please enter user name and password."
 msgstr "Fehlendes Passwort. Bitte geben Sie Benutzername und Passwort ein."
 
-#: MoinMoin/auth/__init__.py:250 MoinMoin/auth/ldap_login.py:199
-#: MoinMoin/auth/ldap_login.py:245
+#: MoinMoin/auth/__init__.py:252 MoinMoin/auth/ldap_login.py:200
+#: MoinMoin/auth/ldap_login.py:248
 msgid "Invalid username or password."
 msgstr "Benutzername oder Passwort ungültig."
 
-#: MoinMoin/auth/__init__.py:254
+#: MoinMoin/auth/__init__.py:256
 #, python-format
 msgid ""
 "If you do not have an account, <a href=\"%(register_url)s\">you can "
@@ -599,57 +809,57 @@
 "Wenn Sie kein Benutzerkonto haben, <a href=\"%(register_url)s\">können "
 "Sie jetzt eines anlegen</a>. "
 
-#: MoinMoin/auth/__init__.py:256
+#: MoinMoin/auth/__init__.py:258
 #, python-format
 msgid "<a href=\"%(recover_url)s\">Forgot your password?</a>"
 msgstr "<a href=\"%(recover_url)s\">Passwort vergessen?</a>"
 
-#: MoinMoin/auth/http.py:62
+#: MoinMoin/auth/http.py:59
 msgid "Please log in first."
 msgstr "Bitte melden Sie sich erst an."
 
-#: MoinMoin/auth/ldap_login.py:259
+#: MoinMoin/auth/ldap_login.py:262
 #, python-format
 msgid "LDAP server %(server)s failed."
 msgstr "Verbindung zum LDAP-Server %(server)s fehlgeschlagen."
 
-#: MoinMoin/auth/openidrp.py:63
+#: MoinMoin/auth/openidrp.py:64
 msgid "OpenID Error"
 msgstr "OpenID-Fehler"
 
-#: MoinMoin/auth/openidrp.py:70
+#: MoinMoin/auth/openidrp.py:71
 msgid "OpenID verification cancelled."
 msgstr "OpenID-Überprüfung abgebrochen."
 
-#: MoinMoin/auth/openidrp.py:104
+#: MoinMoin/auth/openidrp.py:105
 msgid "This OpenID provider is not trusted."
 msgstr "Diesem OpenID-Provider wird nicht vertraut."
 
-#: MoinMoin/auth/openidrp.py:109
+#: MoinMoin/auth/openidrp.py:110
 msgid "OpenID failure."
 msgstr "OpenID-Fehlschlag."
 
-#: MoinMoin/auth/openidrp.py:143
+#: MoinMoin/auth/openidrp.py:144
 msgid "Failed to resolve OpenID."
 msgstr "Auflösen der OpenID fehlgeschlagen."
 
-#: MoinMoin/auth/openidrp.py:145
+#: MoinMoin/auth/openidrp.py:146
 msgid "OpenID discovery failure, not a valid OpenID."
 msgstr "OpenID-Discovery fehlgeschlagen, dies ist keine gültige OpenID."
 
-#: MoinMoin/auth/openidrp.py:149
+#: MoinMoin/auth/openidrp.py:150
 msgid "No OpenID service at this URL."
 msgstr "Kein OpenID-Service unter dieser URL."
 
-#: MoinMoin/config/default.py:250
+#: MoinMoin/config/default.py:258
 msgid "Password is too short."
 msgstr "Das Passwort ist zu kurz."
 
-#: MoinMoin/config/default.py:252
+#: MoinMoin/config/default.py:260
 msgid "Password has not enough different characters."
 msgstr "Das Passwort besteht nicht aus genug verschiedenen Zeichen."
 
-#: MoinMoin/config/default.py:258
+#: MoinMoin/config/default.py:266
 msgid ""
 "Password is too easy to guess (password contains name or name contains "
 "password)."
@@ -657,200 +867,209 @@
 "Das Passwort ist zu leicht zu erraten (Passwort ist Teil des "
 "Benutzernamens oder umgekehrt)."
 
-#: MoinMoin/config/default.py:267
+#: MoinMoin/config/default.py:275
 msgid "Password is too easy to guess (keyboard sequence)."
 msgstr "Das Passwort ist zu leicht zu erraten (Zeichenfolge auf der Tastatur)."
 
-#: MoinMoin/config/default.py:327
+#: MoinMoin/config/default.py:333
 msgid "Home"
 msgstr "Start"
 
-#: MoinMoin/config/default.py:327
+#: MoinMoin/config/default.py:333
 msgid "Home Page"
 msgstr "HomePage"
 
-#: MoinMoin/config/default.py:328 MoinMoin/config/default.py:356
+#: MoinMoin/config/default.py:334 MoinMoin/config/default.py:362
 msgid "History"
 msgstr "Historie"
 
-#: MoinMoin/config/default.py:328 MoinMoin/templates/global_history.html:10
-msgid "Global History"
-msgstr "Globale Historie"
-
-#: MoinMoin/config/default.py:329 MoinMoin/config/default.py:361
-#: MoinMoin/config/default.py:362
+#: MoinMoin/config/default.py:335 MoinMoin/config/default.py:367
 msgid "Index"
 msgstr "Index"
 
-#: MoinMoin/config/default.py:329 MoinMoin/templates/global_index.html:4
-msgid "Global Index"
-msgstr "Globaler Index"
-
-#: MoinMoin/config/default.py:330
-msgid "Tags"
-msgstr "Schlagworte"
-
-#: MoinMoin/config/default.py:330
+#: MoinMoin/config/default.py:336
 msgid "Global Tags Index"
 msgstr "Globaler Schlagwort-Index"
 
-#: MoinMoin/config/default.py:331
+#: MoinMoin/config/default.py:337 MoinMoin/templates/index.html:56
+#: MoinMoin/templates/index.html:132
 msgid "More"
 msgstr "Mehr"
 
-#: MoinMoin/config/default.py:331
+#: MoinMoin/config/default.py:337
 msgid "Administration & Docs"
 msgstr "Administration & Doku"
 
-#: MoinMoin/config/default.py:354
+#: MoinMoin/config/default.py:360
 msgid "Show"
 msgstr "Anzeigen"
 
-#: MoinMoin/config/default.py:355
+#: MoinMoin/config/default.py:361 MoinMoin/templates/index.html:33
 msgid "Download"
 msgstr "Herunterladen"
 
-#: MoinMoin/config/default.py:356
+#: MoinMoin/config/default.py:362
 msgid "Revision History"
 msgstr "Revisions-Historie"
 
-#: MoinMoin/config/default.py:359 MoinMoin/templates/show.html:9
+#: MoinMoin/config/default.py:365 MoinMoin/templates/show.html:9
 msgid "Modify"
 msgstr "Bearbeiten"
 
-#: MoinMoin/config/default.py:359
+#: MoinMoin/config/default.py:365
 msgid "Edit or Upload"
 msgstr "Bearbeiten oder Hochladen"
 
-#: MoinMoin/config/default.py:361 MoinMoin/config/default.py:362
+#: MoinMoin/config/default.py:367
 msgid "List sub-items"
 msgstr "Liste untergeordneter Items"
 
-#: MoinMoin/config/default.py:363
+#: MoinMoin/config/default.py:368
 msgid "Comments"
 msgstr "Kommentare"
 
-#: MoinMoin/config/default.py:363
-msgid "Switch showing comments on or off"
-msgstr "Anzeige von Kommentaren ein- oder ausschalten"
+#: MoinMoin/config/default.py:368 MoinMoin/templates/common.js:70
+msgid "Hide comments"
+msgstr "Kommentare verstecken"
 
-#: MoinMoin/config/default.py:364
+#: MoinMoin/config/default.py:369
+msgid "Transclusions"
+msgstr ""
+
+#: MoinMoin/config/default.py:369 MoinMoin/templates/common.js:104
+msgid "Show transclusions"
+msgstr ""
+
+#: MoinMoin/config/default.py:370
 msgid "Highlight"
 msgstr "Hervorheben"
 
-#: MoinMoin/config/default.py:364
+#: MoinMoin/config/default.py:370
 msgid "Show with Syntax-Highlighting"
 msgstr "Mit Syntax-Highlighting anzeigen"
 
-#: MoinMoin/config/default.py:365
+#: MoinMoin/config/default.py:371
 msgid "Meta"
 msgstr "Meta"
 
-#: MoinMoin/config/default.py:365
+#: MoinMoin/config/default.py:371
 msgid "Display Metadata"
 msgstr "Metadaten anzeigen"
 
-#: MoinMoin/config/default.py:366
+#: MoinMoin/config/default.py:372
 msgid "Create or remove a navigation link to this item"
 msgstr "Einen Navigations-Link zu diesem Item anlegen oder entfernen"
 
-#: MoinMoin/config/default.py:367
+#: MoinMoin/config/default.py:373
 msgid "Switch notifications about item changes on or off"
 msgstr "Benachrichtigungen über Item-Änderungen an- oder abschalten"
 
-#: MoinMoin/config/default.py:368
-msgid "Copy"
-msgstr "Kopieren"
-
-#: MoinMoin/config/default.py:368
-msgid "Create a copy of this item"
-msgstr "Eine Kopie dieses Items erzeugen"
-
-#: MoinMoin/config/default.py:369
+#: MoinMoin/config/default.py:374
 msgid "Rename"
 msgstr "Umbenennen"
 
-#: MoinMoin/config/default.py:369
+#: MoinMoin/config/default.py:374
 msgid "Rename this item"
 msgstr "Dieses Item umbenennen"
 
-#: MoinMoin/config/default.py:370
+#: MoinMoin/config/default.py:375 MoinMoin/templates/index.html:37
 msgid "Delete"
 msgstr "Löschen"
 
-#: MoinMoin/config/default.py:370
-msgid "Move this item to the trash"
-msgstr "Dieses Item in den Mülleimer verschieben"
+#: MoinMoin/config/default.py:375
+msgid "Delete this item"
+msgstr "Dieses Item löschen"
 
-#: MoinMoin/config/default.py:371
+#: MoinMoin/config/default.py:376 MoinMoin/templates/index.html:42
 msgid "Destroy"
 msgstr "Vernichten"
 
-#: MoinMoin/config/default.py:371
+#: MoinMoin/config/default.py:376
 msgid "Completely destroy this item"
 msgstr "Dieses Item vollständig zerstören"
 
-#: MoinMoin/config/default.py:372
+#: MoinMoin/config/default.py:377
 msgid "Referrers"
 msgstr "Referenzen"
 
-#: MoinMoin/config/default.py:372
+#: MoinMoin/config/default.py:377
 msgid "What refers here?"
 msgstr "Was verweist hierher?"
 
-#: MoinMoin/config/default.py:373
+#: MoinMoin/config/default.py:378
 msgid "Site Map"
 msgstr "Sitemap"
 
-#: MoinMoin/config/default.py:373
+#: MoinMoin/config/default.py:378
 msgid "Local Site Map of this item"
 msgstr "Lokale Sitemap dieses Items"
 
-#: MoinMoin/config/default.py:374
+#: MoinMoin/config/default.py:379
 msgid "Similar"
 msgstr "Ähnliches"
 
-#: MoinMoin/converter/html_out.py:591
+#: MoinMoin/config/default.py:379
+msgid "Items with similar names"
+msgstr "Items mit ähnlichen Namen"
+
+#: MoinMoin/converter/archive_in.py:59
+msgid "Date"
+msgstr ""
+
+#: MoinMoin/converter/html_out.py:539
+msgid "Link to this heading"
+msgstr ""
+
+#: MoinMoin/converter/html_out.py:605
 msgid "Contents"
 msgstr "Inhaltsverzeichnis"
 
-#: MoinMoin/converter/macro.py:84
+#: MoinMoin/converter/macro.py:81
+msgid "Error: invalid macro name."
+msgstr ""
+
+#: MoinMoin/converter/macro.py:91 MoinMoin/converter/macro_Verbatim.py:68
 #, python-format
 msgid "<<%(macro_name)s: execution failed [%(error_msg)s] (see also the log)>>"
 msgstr ""
 "<<%(macro_name)s: Ausführung fehlgeschlagen [%(error_msg)s] (Sie finden "
 "weitere Informationen im Log)>>"
 
-#: MoinMoin/converter/moinwiki_in.py:1032
+#: MoinMoin/converter/moinwiki_in.py:1034
 msgid "Error:"
 msgstr "Fehler:"
 
-#: MoinMoin/converter/moinwiki_in.py:1033
+#: MoinMoin/converter/moinwiki_in.py:1035
 msgid "is invalid within"
 msgstr "ist ungültig innerhalb von"
 
-#: MoinMoin/converter/nonexistent_in.py:30
+#: MoinMoin/converter/nonexistent_in.py:31
 #, python-format
 msgid "%(item_name)s does not exist. Create it?"
 msgstr "%(item_name)s existiert nicht, möchten Sie es jetzt erstellen?"
 
-#: MoinMoin/items/__init__.py:654
+#: MoinMoin/items/__init__.py:624
 msgid "Invalid JSON."
 msgstr "Ungültiges JSON"
 
-#: MoinMoin/items/__init__.py:700 MoinMoin/items/__init__.py:1156
-#: MoinMoin/items/__init__.py:1353 MoinMoin/items/__init__.py:1445
-#: MoinMoin/items/__init__.py:1533
+#: MoinMoin/items/__init__.py:635 MoinMoin/templates/atom.html:12
+#: MoinMoin/templates/diff_text_atom.html:13 MoinMoin/templates/history.html:31
+msgid "Comment"
+msgstr "Kommentar"
+
+#: MoinMoin/items/__init__.py:635
+msgid "Comment about your change"
+msgstr "Kommentar zu Ihrer Änderung"
+
+#: MoinMoin/items/__init__.py:669
 msgid "MetaData (JSON)"
 msgstr "Meta-Daten (JSON)"
 
-#: MoinMoin/items/__init__.py:701 MoinMoin/items/__init__.py:1158
-#: MoinMoin/items/__init__.py:1354 MoinMoin/items/__init__.py:1446
-#: MoinMoin/items/__init__.py:1534
+#: MoinMoin/items/__init__.py:670
 msgid "Upload file:"
 msgstr "Datei hochladen:"
 
-#: MoinMoin/items/__init__.py:735
+#: MoinMoin/items/__init__.py:740
 msgid ""
 "The items have the same data hash code (that means they very likely have "
 "the same data)."
@@ -858,249 +1077,321 @@
 "Die Items haben die gleiche Hash-Code (das bedeutet, dass sie "
 "wahrscheinlich den selben Inhalt haben)."
 
-#: MoinMoin/items/__init__.py:737
+#: MoinMoin/items/__init__.py:742
 msgid "The items have different data."
 msgstr "Der Inhalt der Items ist verschieden."
 
-#: MoinMoin/items/__init__.py:744
+#: MoinMoin/items/__init__.py:754
 #, python-format
 msgid "Impossible to convert the data to the contenttype: %(contenttype)s"
 msgstr ""
 "Es ist nicht möglich, die Daten zu diesem Contenttype umzuwandeln: "
 "%(contenttype)s"
 
-#: MoinMoin/items/__init__.py:1157
+#: MoinMoin/items/__init__.py:1120
 msgid "Type your text here"
 msgstr "Tippen Sie hier"
 
-#: MoinMoin/items/__init__.py:1384 MoinMoin/items/__init__.py:1481
+#: MoinMoin/items/__init__.py:1359 MoinMoin/items/__init__.py:1427
 #, python-format
 msgid "Edit drawing %(filename)s (opens in new window)"
 msgstr "Zeichnung %(filename)s bearbeiten (öffnet in neuem Fenster)"
 
-#: MoinMoin/items/__init__.py:1399 MoinMoin/items/__init__.py:1498
+#: MoinMoin/items/__init__.py:1374 MoinMoin/items/__init__.py:1444
 #, python-format
 msgid "Clickable drawing: %(filename)s"
 msgstr "Anklickbare Zeichnung: %(filename)s"
 
-#: MoinMoin/mail/sendmail.py:86
+#: MoinMoin/mail/sendmail.py:94
 msgid "No recipients, nothing to do"
 msgstr "Keine Empfänger, nichts zu tun"
 
-#: MoinMoin/mail/sendmail.py:162
+#: MoinMoin/mail/sendmail.py:170
 #, python-format
 msgid "Connection to mailserver '%(server)s' failed: %(reason)s"
 msgstr "Verbindung zum Mailserver '%(server)s' fehlgeschlagen: %(reason)s"
 
-#: MoinMoin/mail/sendmail.py:176
+#: MoinMoin/mail/sendmail.py:184
 msgid "Mail not sent"
 msgstr "E-Mail wurde nicht versandt"
 
-#: MoinMoin/mail/sendmail.py:179
+#: MoinMoin/mail/sendmail.py:187
 msgid "Mail sent successfully"
 msgstr "E-Mail wurde erfolgreich versandt"
 
-#: MoinMoin/security/textcha.py:159
+#: MoinMoin/search/__init__.py:17
+msgid "Search query too short."
+msgstr "Such-Anfrage ist zu kurz."
+
+#: MoinMoin/security/textcha.py:158
 msgid "The entered TextCha was incorrect."
 msgstr "Das eingegebene TextCha war falsch."
 
-#: MoinMoin/security/textcha.py:160
+#: MoinMoin/security/textcha.py:159
 msgid "The TextCha question is invalid or has expired. Please try again."
 msgstr ""
 "Die TextCha-Frage ist ungültig oder ist abgelaufen. Bitte versuchen Sie "
 "es erneut."
 
-#: MoinMoin/security/textcha.py:179
+#: MoinMoin/security/textcha.py:178
 msgid "TextCha"
 msgstr "TextCha"
 
-#: MoinMoin/storage/error.py:42
-msgid "Permission denied!"
-msgstr "Zugriff verweigert!"
-
-#: MoinMoin/storage/error.py:44
-msgid "You"
-msgstr "Sie"
+#: MoinMoin/templates/404.html:6
+#, python-format
+msgid "The item '%(item_name)s' does not exist."
+msgstr "Das Item '%(item_name)s' existiert nicht."
 
-#: MoinMoin/storage/error.py:46
-#, python-format
-msgid "%(username)s may not %(priv)s '%(item)s'."
-msgstr "%(username)s darf '%(item)s' nicht %(priv)s."
+#: MoinMoin/templates/atom.html:4 MoinMoin/templates/diff_text_atom.html:5
+#: MoinMoin/templates/meta.html:12
+msgid "Revision"
+msgstr "Revision"
 
-#: MoinMoin/templates/copy.html:4
-#, python-format
-msgid "Copy '%(item_name)s'"
-msgstr "'%(item_name)s' kopieren"
+#: MoinMoin/templates/common.js:73
+msgid "Show comments"
+msgstr "Kommentare anzeigen"
+
+#: MoinMoin/templates/common.js:107
+msgid "Hide transclusions"
+msgstr ""
 
 #: MoinMoin/templates/delete.html:4
 #, python-format
 msgid "Delete '%(item_name)s'"
 msgstr "'%(item_name)s' löschen"
 
-#: MoinMoin/templates/destroy.html:5
+#: MoinMoin/templates/destroy.html:4
 #, python-format
 msgid "DESTROY COMPLETE item '%(item_name)s'"
 msgstr "Item '%(item_name)s' VOLLSTÄNDIG VERNICHTEN"
 
-#: MoinMoin/templates/destroy.html:17
+#: MoinMoin/templates/destroy.html:20
 #, python-format
-msgid "DESTROY REVISION '%(item_name)s' (rev %(rev_no)d)"
-msgstr "Revision '%(item_name)s' (Rev %(rev_no)d) VERNICHTEN"
+msgid "DESTROY REVISION '%(item_name)s' (rev %(rev_id)s)"
+msgstr "ZERSTÖREN der Revision '%(item_name)s' (Rev %(rev_id)s)"
 
 #: MoinMoin/templates/diff.html:4
 #, python-format
-msgid "Item: %(item_name)s (Diff between revision %(oldrevno)s and %(newrevno)s)"
-msgstr "Item: %(item_name)s (Unterschiede zwischen %(oldrevno)s und %(newrevno)s)"
-
-#: MoinMoin/templates/diff_text.html:28
-msgid "No older revision"
-msgstr "Keine älteren Revisionen vorhanden"
-
-#: MoinMoin/templates/diff_text.html:32
-msgid "Use older revision"
-msgstr "Ältere Revision verwenden"
+msgid "Diff for '%(item_name)s'"
+msgstr "Differenz für '%(item_name)s'"
 
 #: MoinMoin/templates/diff_text.html:34
-#, python-format
-msgid "Revision %(revno)d as of %(date_time)s"
-msgstr "Revision %(revno)d vom %(date_time)s"
-
-#: MoinMoin/templates/diff_text.html:37
-msgid "No newer revision"
-msgstr "Keine neueren Revisionen vorhanden"
-
-#: MoinMoin/templates/diff_text.html:41
-msgid "Use newer revision"
-msgstr "Neuere Revision verwenden"
-
-#: MoinMoin/templates/diff_text.html:75
 msgid "Deletions are marked like this."
 msgstr "Löschungen sind auf diese Art markiert."
 
-#: MoinMoin/templates/diff_text.html:76
+#: MoinMoin/templates/diff_text.html:35
 msgid "Additions are marked like this."
 msgstr "Hinzufügungen sind auf diese Art markiert."
 
-#: MoinMoin/templates/diff_text.html:80 MoinMoin/templates/diff_text.html:81
+#: MoinMoin/templates/diff_text.html:39 MoinMoin/templates/diff_text.html:40
 msgid "Line"
 msgstr "Zeile"
 
-#: MoinMoin/templates/global_history.html:14 MoinMoin/templates/history.html:12
-msgid "Timestamp"
-msgstr "Zeit"
-
-#: MoinMoin/templates/global_history.html:15
-msgid "Action"
-msgstr "Aktion"
+#: MoinMoin/templates/forms.html:158
+msgid "Upload"
+msgstr ""
 
-#: MoinMoin/templates/global_history.html:17 MoinMoin/templates/history.html:11
-msgid "Rev."
-msgstr "Rev."
+#: MoinMoin/templates/forms.html:159
+msgid "Upload files"
+msgstr "Dateien hochladen"
 
-#: MoinMoin/templates/global_history.html:18 MoinMoin/templates/history.html:16
-msgid "Content-Type"
-msgstr "Content-Type"
+#: MoinMoin/templates/forms.html:164
+msgid "Start All"
+msgstr ""
 
-#: MoinMoin/templates/global_history.html:19 MoinMoin/templates/history.html:15
-msgid "Editor"
-msgstr "Autor"
+#: MoinMoin/templates/forms.html:165
+msgid "Cancel All"
+msgstr ""
 
-#: MoinMoin/templates/highlight.html:4
+#: MoinMoin/templates/forms.html:169
+msgid "Start"
+msgstr ""
+
+#: MoinMoin/templates/forms.html:170 MoinMoin/templates/index.html:152
+#: MoinMoin/templates/index.html:170
+msgid "Cancel"
+msgstr ""
+
+#: MoinMoin/templates/global_history.html:19
+msgid "Set bookmark"
+msgstr ""
+
+#: MoinMoin/templates/global_history.html:49
+msgid "Delete bookmark"
+msgstr ""
+
+#: MoinMoin/templates/highlight.html:3
 #, python-format
 msgid "Syntax highlighting for Item: %(name)s"
 msgstr "Syntax-Hervorhebung für das Item: %(name)s"
 
-#: MoinMoin/templates/history.html:5
+#: MoinMoin/templates/history.html:4
 #, python-format
 msgid "History of '%(item_name)s'"
 msgstr "Historie von '%(item_name)s'"
 
-#: MoinMoin/templates/history.html:35
+#: MoinMoin/templates/history.html:11
+msgid "Previous"
+msgstr ""
+
+#: MoinMoin/templates/history.html:14
+msgid "Next"
+msgstr ""
+
+#: MoinMoin/templates/history.html:25
+msgid "Rev."
+msgstr "Rev."
+
+#: MoinMoin/templates/history.html:26
+msgid "Timestamp"
+msgstr "Zeit"
+
+#: MoinMoin/templates/history.html:29
+msgid "Editor"
+msgstr "Autor"
+
+#: MoinMoin/templates/history.html:30
+msgid "Content-Type"
+msgstr "Content-Type"
+
+#: MoinMoin/templates/history.html:51
 msgid "show"
 msgstr "Anzeigen"
 
-#: MoinMoin/templates/history.html:36
+#: MoinMoin/templates/history.html:52
 msgid "meta"
 msgstr "Metadaten"
 
-#: MoinMoin/templates/history.html:37
+#: MoinMoin/templates/history.html:53
 msgid "download"
 msgstr "Herunterladen"
 
-#: MoinMoin/templates/history.html:38
+#: MoinMoin/templates/history.html:54
 msgid "highlight"
 msgstr "Hervorheben"
 
-#: MoinMoin/templates/history.html:39
+#: MoinMoin/templates/history.html:56
 msgid "revert"
 msgstr "Wiederherstellen"
 
-#: MoinMoin/templates/history.html:40
+#: MoinMoin/templates/history.html:59
 msgid "destroy"
 msgstr "Vernichten"
 
-#: MoinMoin/templates/index.html:4 MoinMoin/templates/index2.html:9
+#: MoinMoin/templates/index.html:5
 #, python-format
 msgid "Index of subitems of '%(item_name)s'"
 msgstr "Liste der Subitems von '%(item_name)s'"
 
-#: MoinMoin/templates/itemviews.html:30
+#: MoinMoin/templates/index.html:22
+msgid "Select All"
+msgstr ""
+
+#: MoinMoin/templates/index.html:32
+msgid "New item"
+msgstr "Neues item"
+
+#: MoinMoin/templates/index.html:50
+msgid "Filter by content type"
+msgstr ""
+
+#: MoinMoin/templates/index.html:51
+msgid "items having unknown mime types"
+msgstr ""
+
+#: MoinMoin/templates/index.html:55
+msgid "Toggle"
+msgstr "Umschalten"
+
+#: MoinMoin/templates/index.html:96
+msgid "Recently uploaded items"
+msgstr ""
+
+#: MoinMoin/templates/index.html:105 MoinMoin/templates/index.html:107
+msgid "All"
+msgstr ""
+
+#: MoinMoin/templates/index.html:144 MoinMoin/templates/index.html:157
+msgid "Close"
+msgstr ""
+
+#: MoinMoin/templates/index.html:145
+msgid "Please provide comment for this action"
+msgstr ""
+
+#: MoinMoin/templates/index.html:148
+msgid "Enter your comment"
+msgstr ""
+
+#: MoinMoin/templates/index.html:151
+msgid "Submit"
+msgstr ""
+
+#: MoinMoin/templates/index.html:158
+msgid "Create new item"
+msgstr "Neues Item erstellen"
+
+#: MoinMoin/templates/index.html:164 MoinMoin/templates/index.html:166
+msgid "Enter item name here"
+msgstr ""
+
+#: MoinMoin/templates/index.html:169
+msgid "Create"
+msgstr ""
+
+#: MoinMoin/templates/index.html:180
+msgid "(Drag and drop multiple files to this white area to upload them.)"
+msgstr ""
+
+#: MoinMoin/templates/itemviews.html:49
 msgid "Remove Link"
 msgstr "Link entfernen"
 
-#: MoinMoin/templates/itemviews.html:32
+#: MoinMoin/templates/itemviews.html:51
 msgid "Add Link"
 msgstr "Link hinzufügen"
 
-#: MoinMoin/templates/itemviews.html:41
+#: MoinMoin/templates/itemviews.html:61
 msgid "Unsubscribe"
 msgstr "Nicht abonnieren"
 
-#: MoinMoin/templates/itemviews.html:43
+#: MoinMoin/templates/itemviews.html:63
 msgid "Subscribe"
 msgstr "Abonnieren"
 
-#: MoinMoin/templates/layout.html:46 MoinMoin/templates/usersettings.html:6
+#: MoinMoin/templates/layout.html:50
 msgid "Settings"
 msgstr "Einstellungen"
 
-#: MoinMoin/templates/layout.html:52
+#: MoinMoin/templates/layout.html:56
 msgid "Logout"
 msgstr "Abmelden"
 
-#: MoinMoin/templates/layout.html:58
-msgid "Login"
-msgstr "Anmelden"
-
 #: MoinMoin/templates/login.html:9
 msgid "Moin login"
 msgstr "Moin-Login"
 
-#: MoinMoin/templates/login.html:21 MoinMoin/templates/login.html:35
-msgid "Log in"
-msgstr "Anmelden"
-
-#: MoinMoin/templates/login.html:28
+#: MoinMoin/templates/login.html:25
 msgid "OpenID login"
 msgstr "OpenID-Login"
 
-#: MoinMoin/templates/lostpass.html:5
-msgid "Lost Password"
-msgstr "Passwort vergessen"
+#: MoinMoin/templates/lookup.html:30
+msgid "No results"
+msgstr ""
+
+#: MoinMoin/templates/lookup.html:32
+msgid "More than one result"
+msgstr ""
 
 #: MoinMoin/templates/lostpass.html:7
 msgid "Please note that you only need to fill out one form field."
 msgstr "Sie müssen nur eines der Felder ausfüllen."
 
-#: MoinMoin/templates/meta.html:9
+#: MoinMoin/templates/meta.html:3
 #, python-format
 msgid "Metadata of '%(item_name)s'"
 msgstr "Metadaten von '%(item_name)s'"
 
-#: MoinMoin/templates/meta.html:10
-msgid "Revision"
-msgstr "Revision"
-
 #: MoinMoin/templates/modify_anywikidraw.html:18
 #: MoinMoin/templates/modify_twikidraw.html:13
 msgid "NOTE:"
@@ -1142,14 +1433,26 @@
 "Dieses Item existiert (noch) nicht, aber Sie können es jetzt erstellen. "
 "Bitte wählen Sie die Art das Items, das Sie erstellen wollen, aus."
 
+#: MoinMoin/templates/modify_text.html:9
+msgid "Link to Subitem"
+msgstr ""
+
+#: MoinMoin/templates/modify_text.html:9
+msgid "Link"
+msgstr ""
+
+#: MoinMoin/templates/modify_text.html:12
+msgid "Transclude Subitem"
+msgstr ""
+
+#: MoinMoin/templates/modify_text.html:12
+msgid "Transclude"
+msgstr ""
+
 #: MoinMoin/templates/openid_register.html:5 MoinMoin/templates/register.html:5
 msgid "Create Account"
 msgstr "Benutzerkonto erstellen"
 
-#: MoinMoin/templates/recoverpass.html:5
-msgid "Recover Password"
-msgstr "Passwort wiederherstellen"
-
 #: MoinMoin/templates/rename.html:4
 #, python-format
 msgid "Rename '%(item_name)s'"
@@ -1157,8 +1460,42 @@
 
 #: MoinMoin/templates/revert.html:4
 #, python-format
-msgid "Revert '%(item_name)s' (rev %(rev_no)d)"
-msgstr "Wiederherstellen von '%(item_name)s' (Rev %(rev_no)d)"
+msgid "Revert '%(item_name)s' (rev %(rev_id)s)"
+msgstr "Wiederherstellen von '%(item_name)s' (Rev %(rev_id)s)"
+
+#: MoinMoin/templates/search.html:10
+#, python-format
+msgid "%(result_len)d results found (%(runtime).3f secs)."
+msgstr ""
+
+#: MoinMoin/templates/search.html:15
+#, python-format
+msgid "No results found (%(runtime).3f secs)."
+msgstr ""
+
+#: MoinMoin/templates/search.html:29
+#, python-format
+msgid "name term suggestions: %(termlist)s"
+msgstr ""
+
+#: MoinMoin/templates/search.html:30
+#, python-format
+msgid "content term suggestions: %(termlist)s"
+msgstr ""
+
+#: MoinMoin/templates/search.html:45 MoinMoin/templates/show.html:54
+#, python-format
+msgid "Summary: %(summary)s"
+msgstr ""
+
+#: MoinMoin/templates/search.html:51
+#, python-format
+msgid "Revision: %(revid)s Last Change: %(mtime)s"
+msgstr "Revision: %(revid)s Letzte Änderung: %(mtime)s"
+
+#: MoinMoin/templates/search.html:59
+msgid "You don't have read permission for this item."
+msgstr ""
 
 #: MoinMoin/templates/show.html:23
 msgid "older"
@@ -1176,19 +1513,15 @@
 msgid "no newer revision"
 msgstr "keine neueren Revisionen"
 
-#: MoinMoin/templates/show.html:47
-msgid "This item exists, but it has no revisions."
-msgstr "Dieses Item existiert, hat jedoch keine Revisionen."
-
-#: MoinMoin/templates/show.html:72
+#: MoinMoin/templates/show.html:77
 msgid "modified"
 msgstr "bearbeitet am"
 
-#: MoinMoin/templates/show.html:73
+#: MoinMoin/templates/show.html:78
 msgid "by"
 msgstr "von"
 
-#: MoinMoin/templates/show.html:74
+#: MoinMoin/templates/show.html:79
 msgid "tagged"
 msgstr "markiert mit"
 
@@ -1198,48 +1531,52 @@
 msgstr "Sitemap von %(item_name)s"
 
 #: MoinMoin/templates/usersettings.html:8
-#: MoinMoin/templates/usersettings.html:17
 msgid "Personal Settings"
 msgstr "Persönliche Einstellungen"
 
-#: MoinMoin/templates/usersettings.html:10
-#: MoinMoin/templates/usersettings.html:47
+#: MoinMoin/templates/usersettings.html:13
+msgid "Change Password"
+msgstr "Passwort ändern"
+
+#: MoinMoin/templates/usersettings.html:18
 msgid "Notification Settings"
 msgstr "Benachrichtigungseinstellungen"
 
-#: MoinMoin/templates/usersettings.html:11
-#: MoinMoin/templates/usersettings.html:59
+#: MoinMoin/templates/usersettings.html:23
 msgid "Wiki Appearance Settings"
 msgstr "Erscheinungsbildeinstellungen"
 
-#: MoinMoin/templates/usersettings.html:12
-#: MoinMoin/templates/usersettings.html:73
+#: MoinMoin/templates/usersettings.html:28
 msgid "Navigation Settings"
 msgstr "Navigationseinstellungen"
 
-#: MoinMoin/templates/usersettings.html:13
-#: MoinMoin/templates/usersettings.html:85
+#: MoinMoin/templates/usersettings.html:33
 msgid "Options"
 msgstr "Optionen"
 
-#: MoinMoin/templates/usersettings.html:33
-msgid "Change Password"
-msgstr "Passwort ändern"
+#: MoinMoin/templates/usersettings_forms.html:35
+msgid ""
+"Changing your email address requires you to verify it. A link will be "
+"sent to you."
+msgstr ""
 
-#: MoinMoin/templates/wanteds.html:7
-#, python-format
-msgid "Total: %(total)s"
-msgstr "Insgesamt: %(total)s"
+#: MoinMoin/templates/utils.html:62
+msgid "Expand Subitem"
+msgstr ""
 
-#: MoinMoin/themes/__init__.py:54
+#: MoinMoin/templates/utils.html:79
+msgid "Subitems"
+msgstr "Untergeordnete Items"
+
+#: MoinMoin/themes/__init__.py:57
 msgid "Access denied"
 msgstr "Zugriff verweigert"
 
-#: MoinMoin/themes/__init__.py:55
+#: MoinMoin/themes/__init__.py:58
 msgid "You are not allowed to access this resource."
 msgstr "Sie haben nicht die notwendigen Rechte, um auf diese Ressource zuzugreifen"
 
-#: MoinMoin/themes/__init__.py:286
+#: MoinMoin/themes/__init__.py:292
 msgid "anonymous"
 msgstr "anonym"
 
@@ -1313,3 +1650,58 @@
 msgid "No argument named \"%(name)s\""
 msgstr "Kein Argument mit dem Namen \"%(name)s\""
 
+#~ msgid "Refers Here"
+#~ msgstr "Hierauf linkt"
+
+#~ msgid "Switch showing comments on or off"
+#~ msgstr "Anzeige von Kommentaren ein- oder ausschalten"
+
+#~ msgid "Copy"
+#~ msgstr "Kopieren"
+
+#~ msgid "Create a copy of this item"
+#~ msgstr "Eine Kopie dieses Items erzeugen"
+
+#~ msgid "Move this item to the trash"
+#~ msgstr "Dieses Item in den Mülleimer verschieben"
+
+#~ msgid "Permission denied!"
+#~ msgstr "Zugriff verweigert!"
+
+#~ msgid "You"
+#~ msgstr "Sie"
+
+#~ msgid "%(username)s may not %(priv)s '%(item)s'."
+#~ msgstr "%(username)s darf '%(item)s' nicht %(priv)s."
+
+#~ msgid "DESTROY REVISION '%(item_name)s' (rev %(rev_no)d)"
+#~ msgstr "Revision '%(item_name)s' (Rev %(rev_no)d) VERNICHTEN"
+
+#~ msgid ""
+#~ "Item: %(item_name)s (Diff between revision "
+#~ "%(oldrevno)s and %(newrevno)s)"
+#~ msgstr ""
+#~ "Item: %(item_name)s (Unterschiede zwischen "
+#~ "%(oldrevno)s und %(newrevno)s)"
+
+#~ msgid "No older revision"
+#~ msgstr "Keine älteren Revisionen vorhanden"
+
+#~ msgid "Use older revision"
+#~ msgstr "Ältere Revision verwenden"
+
+#~ msgid "No newer revision"
+#~ msgstr "Keine neueren Revisionen vorhanden"
+
+#~ msgid "Use newer revision"
+#~ msgstr "Neuere Revision verwenden"
+
+#~ msgid "Action"
+#~ msgstr "Aktion"
+
+#~ msgid "This item exists, but it has no revisions."
+#~ msgstr "Dieses Item existiert, hat jedoch keine Revisionen."
+
+#~ msgid "Total: %(total)s"
+#~ msgstr "Insgesamt: %(total)s"
+
--- a/MoinMoin/translations/pt_BR/LC_MESSAGES/messages.po	Wed Jul 18 00:42:48 2012 +0530
+++ b/MoinMoin/translations/pt_BR/LC_MESSAGES/messages.po	Wed Jul 18 00:51:44 2012 +0530
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: moin 2.0.0a0\n"
 "Report-Msgid-Bugs-To: English <moin-user@lists.sourceforge.net>\n"
-"POT-Creation-Date: 2011-07-10 21:27+0200\n"
+"POT-Creation-Date: 2012-07-15 23:32+0200\n"
 "PO-Revision-Date: 2012-04-03 05:10-0300\n"
 "Last-Translator: MoinMoin:DiogenesAugusto\n"
 "Language-Team: pt_BR <LL@li.org>\n"
@@ -17,7 +17,49 @@
 "Content-Transfer-Encoding: 8bit\n"
 "Generated-By: Babel 0.9.6\n"
 
-#: MoinMoin/user.py:48
+#: MoinMoin/forms.py:37
+msgid "OpenID"
+msgstr "OpenID"
+
+#: MoinMoin/forms.py:37
+#, fuzzy
+msgid "OpenID address"
+msgstr "Seu endereço OpenID"
+
+#: MoinMoin/forms.py:39
+msgid "Your OpenID address"
+msgstr "Seu endereço OpenID"
+
+#: MoinMoin/forms.py:41
+msgid "E-Mail"
+msgstr "Email"
+
+#: MoinMoin/forms.py:41
+#, fuzzy
+msgid "E-Mail address"
+msgstr "Endereço de email"
+
+#: MoinMoin/forms.py:43
+msgid "Your E-Mail address"
+msgstr "Seu endereço de email"
+
+#: MoinMoin/forms.py:45
+msgid "Password"
+msgstr "Senha"
+
+#: MoinMoin/forms.py:56 MoinMoin/config/default.py:336
+msgid "Tags"
+msgstr "Tags"
+
+#: MoinMoin/forms.py:58
+msgid "Search Query"
+msgstr "Busca"
+
+#: MoinMoin/forms.py:70
+msgid "OK"
+msgstr "OK"
+
+#: MoinMoin/user.py:54
 #, python-format
 msgid ""
 "Invalid user name '%(name)s'.\n"
@@ -25,35 +67,37 @@
 "space between words. Group page name is not allowed."
 msgstr ""
 "Nome de usuário inválido: '%(name)s'.\n"
-"O nome de usuário pode conter qualquer caracter Unicode alfa numérico, com apenas um\n"
-"único espaço em branco opcional entre palavras. Nomes de grupos não são permitidos."
+"O nome de usuário pode conter qualquer caracter Unicode alfa numérico, "
+"com apenas um\n"
+"único espaço em branco opcional entre palavras. Nomes de grupos não são "
+"permitidos."
 
-#: MoinMoin/user.py:54
+#: MoinMoin/user.py:60
 msgid "This user name already belongs to somebody else."
 msgstr "Este nome de usuário já pertence a alguém."
 
-#: MoinMoin/user.py:60
+#: MoinMoin/user.py:68
 #, python-format
 msgid "Password not acceptable: %(msg)s"
 msgstr "Senha inválida : %(msg)s"
 
-#: MoinMoin/user.py:72
-msgid "Please provide your email address. If you lose your login information, you can get it by email."
-msgstr "Por favor forneça um endereço de email válido. Se você perder seus dados de login, poderá recuperá-los neste endereço."
+#: MoinMoin/user.py:78
+msgid ""
+"Please provide your email address. If you lose your login information, "
+"you can get it by email."
+msgstr ""
+"Por favor forneça um endereço de email válido. Se você perder seus dados "
+"de login, poderá recuperá-los neste endereço."
 
-#: MoinMoin/user.py:78
+#: MoinMoin/user.py:84
 msgid "This email already belongs to somebody else."
 msgstr "Este endereço de email já está cadastrado por alguém."
 
-#: MoinMoin/user.py:83
+#: MoinMoin/user.py:90
 msgid "This OpenID already belongs to somebody else."
 msgstr "Este OpenID já pertence a alguém."
 
-#: MoinMoin/user.py:726
-msgid "<unknown>"
-msgstr "<desconhecido>"
-
-#: MoinMoin/user.py:784
+#: MoinMoin/user.py:730
 #, python-format
 msgid ""
 "Somebody has requested to email you a password recovery link.\n"
@@ -65,69 +109,143 @@
 "If you didn't forget your password, please ignore this email.\n"
 "\n"
 msgstr ""
-"Alguém pediu para ser enviado um link de recuperação de senha para este endereço de email\n"
+"Alguém pediu para ser enviado um link de recuperação de senha para este "
+"endereço de email\n"
 "\n"
 "Utilize o link abaixo para mudar sua senha:\n"
 "\n"
 "%(link)s\n"
 "\n"
-"Se você sabe sua senha ou se não pediu para receber este email, por favor desconsidere esta mensagem.\n"
+"Se você sabe sua senha ou se não pediu para receber este email, por favor"
+" desconsidere esta mensagem.\n"
 "\n"
 
-#: MoinMoin/user.py:787
+#: MoinMoin/user.py:733
 #, python-format
 msgid "[%(sitename)s] Your wiki password recovery link"
 msgstr "[%(sitename)s] Link para recuperação de senha"
 
-#: MoinMoin/apps/admin/views.py:63
+#: MoinMoin/user.py:751
+#, fuzzy, python-format
+msgid ""
+"Somebody has created an account with this email address.\n"
+"\n"
+"Please use the link below to verify your email address:\n"
+"\n"
+"%(link)s\n"
+"\n"
+"If you didn't create this account, please ignore this email.\n"
+"\n"
+msgstr ""
+"Alguém pediu para ser enviado um link de recuperação de senha para este "
+"endereço de email\n"
+"\n"
+"Utilize o link abaixo para mudar sua senha:\n"
+"\n"
+"%(link)s\n"
+"\n"
+"Se você sabe sua senha ou se não pediu para receber este email, por favor"
+" desconsidere esta mensagem.\n"
+"\n"
+
+#: MoinMoin/user.py:754
+#, python-format
+msgid "[%(sitename)s] Please verify your email address"
+msgstr ""
+
+#: MoinMoin/apps/admin/views.py:30
+msgid "Admin"
+msgstr ""
+
+#: MoinMoin/apps/admin/views.py:48
+#: MoinMoin/apps/admin/templates/admin/index.html:9
+msgid "User Browser"
+msgstr "Gerenciador de usuários"
+
+#: MoinMoin/apps/admin/views.py:60
 #, python-format
 msgid "User profile of %(username)s: %(email)r"
 msgstr "Perfil do usuário %(username)s: %(email)r"
 
-#: MoinMoin/apps/admin/views.py:113
+#: MoinMoin/apps/admin/views.py:104
+#: MoinMoin/apps/admin/templates/admin/sysitems_upgrade.html:3
+msgid "System items upgrade"
+msgstr "Atualização de itens de sistema"
+
+#: MoinMoin/apps/admin/views.py:110
 #, python-format
 msgid "System items upgrade failed due to the following error: %(error)s."
-msgstr "A atualização de itens de sistema falhou devido aos seguintes erros: %(error)s."
+msgstr ""
+"A atualização de itens de sistema falhou devido aos seguintes erros: "
+"%(error)s."
 
-#: MoinMoin/apps/admin/views.py:115
+#: MoinMoin/apps/admin/views.py:112
 msgid "System items have been upgraded successfully!"
 msgstr "Itens de sistema foram atualizados corretamente!"
 
-#: MoinMoin/apps/admin/views.py:199
+#: MoinMoin/apps/admin/views.py:159
+#, fuzzy
+msgid "Wiki Configuration"
+msgstr "Configuração do Wiki"
+
+#: MoinMoin/apps/admin/views.py:188
+#, fuzzy
+msgid "Wiki Configuration Help"
+msgstr "Configuração do Wiki"
+
+#: MoinMoin/apps/admin/views.py:196
 msgid "Lexer description"
 msgstr "Descrição Lexer"
 
-#: MoinMoin/apps/admin/views.py:200
+#: MoinMoin/apps/admin/views.py:197
 msgid "Lexer names"
 msgstr "Nomes Lexer"
 
-#: MoinMoin/apps/admin/views.py:201
+#: MoinMoin/apps/admin/views.py:198
 msgid "File patterns"
 msgstr "Padrões para arquivos"
 
-#: MoinMoin/apps/admin/views.py:202
+#: MoinMoin/apps/admin/views.py:199
 msgid "Mimetypes"
 msgstr "Mimetypes"
 
-#: MoinMoin/apps/admin/views.py:216
+#: MoinMoin/apps/admin/views.py:205
+#, fuzzy
+msgid "Highlighter Help"
+msgstr "realçe"
+
+#: MoinMoin/apps/admin/views.py:213
 msgid "InterWiki name"
 msgstr "Nome InterWiki"
 
-#: MoinMoin/apps/admin/views.py:217
+#: MoinMoin/apps/admin/views.py:214
 msgid "URL"
 msgstr "URL"
 
-#: MoinMoin/apps/admin/views.py:229
-#: MoinMoin/templates/history.html:13
+#: MoinMoin/apps/admin/views.py:218
+#, fuzzy
+msgid "Interwiki Help"
+msgstr "Nome InterWiki"
+
+#: MoinMoin/apps/admin/views.py:226 MoinMoin/converter/archive_in.py:59
+#: MoinMoin/templates/atom.html:8 MoinMoin/templates/diff_text_atom.html:9
+#: MoinMoin/templates/history.html:27
 msgid "Size"
 msgstr "Tamanho"
 
-#: MoinMoin/apps/admin/views.py:230
+#: MoinMoin/apps/admin/views.py:227 MoinMoin/templates/index.html:162
 msgid "Item name"
 msgstr "Nome do item"
 
+#: MoinMoin/apps/admin/views.py:233
+#, fuzzy
+msgid "Item Size"
+msgstr "Tamanho do editor"
+
 #: MoinMoin/apps/admin/templates/admin/highlighterhelp.html:4
 #: MoinMoin/apps/admin/templates/admin/index.html:20
+#: MoinMoin/apps/admin/templates/user/highlighterhelp.html:4
+#: MoinMoin/apps/admin/templates/user/index_user.html:9
 msgid "Available Highlighters"
 msgstr "Realçadores disponíveis"
 
@@ -143,10 +261,6 @@
 msgid "Admin Menu"
 msgstr "Menu Admin"
 
-#: MoinMoin/apps/admin/templates/admin/index.html:9
-msgid "User Browser"
-msgstr "Gerenciador de usuários"
-
 #: MoinMoin/apps/admin/templates/admin/index.html:10
 #: MoinMoin/apps/admin/templates/admin/sysitems_upgrade.html:10
 msgid "Upgrade system items"
@@ -161,36 +275,43 @@
 msgstr "Mostrar ajuda para configuração do Wiki"
 
 #: MoinMoin/apps/admin/templates/admin/index.html:14
+#: MoinMoin/apps/admin/templates/user/index_user.html:3
 msgid "User Menu"
 msgstr "Menu do usuário"
 
 #: MoinMoin/apps/admin/templates/admin/index.html:16
-#: MoinMoin/apps/frontend/views.py:588
+#: MoinMoin/apps/admin/templates/user/index_user.html:5
+#: MoinMoin/apps/frontend/views.py:903 MoinMoin/apps/frontend/views.py:905
 msgid "Wanted Items"
 msgstr "Itens desejados (tem link para eles, mas não existem)"
 
 #: MoinMoin/apps/admin/templates/admin/index.html:17
-#: MoinMoin/apps/frontend/views.py:636
+#: MoinMoin/apps/admin/templates/user/index_user.html:6
+#: MoinMoin/apps/frontend/views.py:919 MoinMoin/apps/frontend/views.py:922
 msgid "Orphaned Items"
 msgstr "Itens órfãos (existem, mas não há link para eles)"
 
 #: MoinMoin/apps/admin/templates/admin/index.html:18
 #: MoinMoin/apps/admin/templates/admin/itemsize.html:4
+#: MoinMoin/apps/admin/templates/user/index_user.html:7
+#: MoinMoin/apps/admin/templates/user/itemsize.html:4
 msgid "Item sizes (latest revision)"
 msgstr "Tamanho dos itens (última revisão)"
 
 #: MoinMoin/apps/admin/templates/admin/index.html:19
 #: MoinMoin/apps/admin/templates/admin/interwikihelp.html:4
+#: MoinMoin/apps/admin/templates/user/index_user.html:8
+#: MoinMoin/apps/admin/templates/user/interwikihelp.html:4
 msgid "Known InterWiki names"
 msgstr "Nomes InterWiki conhecidos"
 
-#: MoinMoin/apps/admin/templates/admin/sysitems_upgrade.html:3
-msgid "System items upgrade"
-msgstr "Atualização de itens de sistema"
-
 #: MoinMoin/apps/admin/templates/admin/sysitems_upgrade.html:5
-msgid "You can upgrade your system items by uploading an xml file with new items below."
-msgstr "Você pode atualizar os itens de sistema fazendo o upload de um arquivo xml com os novos itens abaixo."
+msgid ""
+"You can upgrade your system items by uploading an xml file with new items"
+" below."
+msgstr ""
+"Você pode atualizar os itens de sistema fazendo o upload de um arquivo "
+"xml com os novos itens abaixo."
 
 #: MoinMoin/apps/admin/templates/admin/userbrowser.html:5
 msgid "User name"
@@ -205,7 +326,7 @@
 msgstr "Endereço de email"
 
 #: MoinMoin/apps/admin/templates/admin/userbrowser.html:8
-#: MoinMoin/templates/history.html:18
+#: MoinMoin/templates/history.html:32
 msgid "Actions"
 msgstr "Ações"
 
@@ -230,8 +351,16 @@
 msgstr "Configuração do Wiki"
 
 #: MoinMoin/apps/admin/templates/admin/wikiconfig.html:5
-msgid "This table shows all settings in this wiki that do not have default values. Settings that the configuration system doesn't know about are shown in italic, those may be due to third-party extensions needing configuration or settings that were removed from Moin."
-msgstr "Esta tabela mostra todos as configurações deste wiki que não tem valores padrão. Configurações que o sistema não conhece são exibidas em itálico, e podem ser desconhecidas por extensões de terceiros que necessitam de configuração ou configurações que foram removidas do Moin."
+msgid ""
+"This table shows all settings in this wiki that do not have default "
+"values. Settings that the configuration system doesn't know about are "
+"shown in italic, those may be due to third-party extensions needing "
+"configuration or settings that were removed from Moin."
+msgstr ""
+"Esta tabela mostra todos as configurações deste wiki que não tem valores "
+"padrão. Configurações que o sistema não conhece são exibidas em itálico, "
+"e podem ser desconhecidas por extensões de terceiros que necessitam de "
+"configuração ou configurações que foram removidas do Moin."
 
 #: MoinMoin/apps/admin/templates/admin/wikiconfig.html:14
 #: MoinMoin/apps/admin/templates/admin/wikiconfighelp.html:12
@@ -254,856 +383,1022 @@
 msgid "Description"
 msgstr "Descrição"
 
-#: MoinMoin/apps/feed/views.py:63
+#: MoinMoin/apps/feed/views.py:85
 msgid "MoinMoin feels unhappy."
 msgstr "MoinMoin está triste."
 
-#: MoinMoin/apps/frontend/views.py:114
-msgid "Search query too short."
-msgstr "Expressão de busca muito curta."
+#: MoinMoin/apps/frontend/views.py:133
+#, fuzzy
+msgid "name"
+msgstr "Renomear"
 
-#: MoinMoin/apps/frontend/views.py:125
-msgid "Search Query"
-msgstr "Busca"
+#: MoinMoin/apps/frontend/views.py:134
+msgid "name_exact"
+msgstr ""
 
-#: MoinMoin/apps/frontend/views.py:126
+#: MoinMoin/apps/frontend/views.py:135
+msgid "itemid"
+msgstr ""
+
+#: MoinMoin/apps/frontend/views.py:136
+msgid "revid"
+msgstr ""
+
+#: MoinMoin/apps/frontend/views.py:137
+msgid "userid"
+msgstr ""
+
+#: MoinMoin/apps/frontend/views.py:138
+msgid "language"
+msgstr ""
+
+#: MoinMoin/apps/frontend/views.py:139
+msgid "itemlinks"
+msgstr ""
+
+#: MoinMoin/apps/frontend/views.py:140
+msgid "itemtransclusions"
+msgstr ""
+
+#: MoinMoin/apps/frontend/views.py:141
+msgid "refs"
+msgstr ""
+
+#: MoinMoin/apps/frontend/views.py:143 MoinMoin/search/__init__.py:29
+msgid "search also in non-current revisions"
+msgstr ""
+
+#: MoinMoin/apps/frontend/views.py:144 MoinMoin/apps/frontend/views.py:168
+#: MoinMoin/templates/lookup.html:6
+msgid "Lookup"
+msgstr ""
+
+#: MoinMoin/apps/frontend/views.py:227 MoinMoin/search/__init__.py:30
 msgid "Search"
 msgstr "Busca"
 
-#: MoinMoin/apps/frontend/views.py:308
-#: MoinMoin/templates/global_history.html:20
-#: MoinMoin/templates/history.html:17
-msgid "Comment"
-msgstr "Comentário"
-
-#: MoinMoin/apps/frontend/views.py:308
-msgid "Comment about your change"
-msgstr "Comente suas mudanças"
-
-#: MoinMoin/apps/frontend/views.py:309
-msgid "OK"
-msgstr "OK"
-
-#: MoinMoin/apps/frontend/views.py:312
+#: MoinMoin/apps/frontend/views.py:470
 msgid "Target"
 msgstr "Alvo"
 
-#: MoinMoin/apps/frontend/views.py:312
+#: MoinMoin/apps/frontend/views.py:470
 msgid "The name of the target item"
 msgstr "Nome do item alvo"
 
-#: MoinMoin/apps/frontend/views.py:531
-msgid "Refers Here"
-msgstr "Faz referência aqui"
+#: MoinMoin/apps/frontend/views.py:486
+msgid "markup text"
+msgstr ""
 
-#: MoinMoin/apps/frontend/views.py:672
-#: MoinMoin/apps/frontend/views.py:691
+#: MoinMoin/apps/frontend/views.py:487
+msgid "other text"
+msgstr ""
+
+#: MoinMoin/apps/frontend/views.py:488
+msgid "image"
+msgstr ""
+
+#: MoinMoin/apps/frontend/views.py:489
+msgid "audio"
+msgstr ""
+
+#: MoinMoin/apps/frontend/views.py:490
+msgid "video"
+msgstr ""
+
+#: MoinMoin/apps/frontend/views.py:491
+#, fuzzy
+msgid "other"
+msgstr "mais antigas"
+
+#: MoinMoin/apps/frontend/views.py:492
+#, fuzzy
+msgid "unknown"
+msgstr "<desconhecido>"
+
+#: MoinMoin/apps/frontend/views.py:493
+msgid "Filter"
+msgstr ""
+
+#: MoinMoin/apps/frontend/views.py:746 MoinMoin/config/default.py:335
+#: MoinMoin/templates/index.html:7 MoinMoin/templates/index.html:81
+msgid "Global Index"
+msgstr "Índice Global"
+
+#: MoinMoin/apps/frontend/views.py:766 MoinMoin/apps/frontend/views.py:767
+msgid "My Changes"
+msgstr ""
+
+#: MoinMoin/apps/frontend/views.py:798
+#, fuzzy, python-format
+msgid "Items which refer to '%(item_name)s'"
+msgstr "Renomear '%(item_name)s'"
+
+#: MoinMoin/apps/frontend/views.py:869 MoinMoin/config/default.py:334
+#: MoinMoin/templates/global_history.html:10
+msgid "Global History"
+msgstr "Histórico Global"
+
+#: MoinMoin/apps/frontend/views.py:932 MoinMoin/apps/frontend/views.py:951
 #, python-format
 msgid "You must login to use this action: %(action)s."
 msgstr "Você deve fazer o login para usar esta ação: %(action)s."
 
-#: MoinMoin/apps/frontend/views.py:675
+#: MoinMoin/apps/frontend/views.py:935
 msgid "A quicklink to this page could not be added for you."
 msgstr "Um quicklink para esta página não pode ser adicionado."
 
-#: MoinMoin/apps/frontend/views.py:678
+#: MoinMoin/apps/frontend/views.py:938
 msgid "Your quicklink to this page could not be removed."
 msgstr "O quicklink para esta página não pode ser removido."
 
-#: MoinMoin/apps/frontend/views.py:693
+#: MoinMoin/apps/frontend/views.py:953
 msgid "You are not allowed to subscribe to an item you may not read."
 msgstr "Você não tem permissão para se inscrever em um item o qual não pode ler."
 
-#: MoinMoin/apps/frontend/views.py:697
+#: MoinMoin/apps/frontend/views.py:957
 msgid "Can't remove regular expression subscription!"
 msgstr "Impossível remover acompanhamento por expressão regular!"
 
-#: MoinMoin/apps/frontend/views.py:698
+#: MoinMoin/apps/frontend/views.py:958
 msgid "Edit the subscription regular expressions in your settings."
 msgstr "Edite seu acompanhamento por expressão regular nas suas configurações."
 
-#: MoinMoin/apps/frontend/views.py:702
+#: MoinMoin/apps/frontend/views.py:962
 msgid "You could not get subscribed to this item."
 msgstr "Você não pode se inscrever neste item."
 
-#: MoinMoin/apps/frontend/views.py:711
-#: MoinMoin/apps/frontend/views.py:904
-#: MoinMoin/apps/frontend/views.py:1041
+#: MoinMoin/apps/frontend/views.py:971 MoinMoin/apps/frontend/views.py:1164
+#: MoinMoin/apps/frontend/views.py:1297
 msgid "The passwords do not match."
 msgstr "As senhas não conferem."
 
-#: MoinMoin/apps/frontend/views.py:727
-#: MoinMoin/apps/frontend/views.py:743
-#: MoinMoin/apps/frontend/views.py:863
-#: MoinMoin/apps/frontend/views.py:922
-#: MoinMoin/apps/frontend/views.py:989
-#: MoinMoin/apps/frontend/views.py:1107
-#: MoinMoin/templates/global_history.html:16
-#: MoinMoin/templates/history.html:10
+#: MoinMoin/apps/frontend/views.py:987 MoinMoin/apps/frontend/views.py:1122
+#: MoinMoin/apps/frontend/views.py:1182 MoinMoin/apps/frontend/views.py:1249
+#: MoinMoin/apps/frontend/views.py:1362 MoinMoin/converter/archive_in.py:59
+#: MoinMoin/templates/history.html:24
 msgid "Name"
 msgstr "Nome"
 
-#: MoinMoin/apps/frontend/views.py:727
-#: MoinMoin/apps/frontend/views.py:743
-#: MoinMoin/apps/frontend/views.py:1107
+#: MoinMoin/apps/frontend/views.py:987 MoinMoin/apps/frontend/views.py:1362
 msgid "The login name you want to use"
 msgstr "O nome de usuário que você quer usar para fazer login no sistema"
 
-#: MoinMoin/apps/frontend/views.py:728
-#: MoinMoin/apps/frontend/views.py:729
-#: MoinMoin/apps/frontend/views.py:744
-#: MoinMoin/apps/frontend/views.py:745
-#: MoinMoin/apps/frontend/views.py:990
-msgid "Password"
-msgstr "Senha"
-
-#: MoinMoin/apps/frontend/views.py:728
-#: MoinMoin/apps/frontend/views.py:744
-#: MoinMoin/apps/frontend/views.py:924
-#: MoinMoin/apps/frontend/views.py:1065
+#: MoinMoin/apps/frontend/views.py:988 MoinMoin/apps/frontend/views.py:1184
+#: MoinMoin/apps/frontend/views.py:1323
 msgid "The login password you want to use"
 msgstr "A senha que você que usar para fazer login no sistema"
 
-#: MoinMoin/apps/frontend/views.py:729
-#: MoinMoin/apps/frontend/views.py:745
-#: MoinMoin/apps/frontend/views.py:925
-#: MoinMoin/apps/frontend/views.py:1066
+#: MoinMoin/apps/frontend/views.py:989 MoinMoin/apps/frontend/views.py:1185
+#: MoinMoin/apps/frontend/views.py:1324
 msgid "Repeat the same password"
 msgstr "Repita a mesma senha"
 
-#: MoinMoin/apps/frontend/views.py:730
-#: MoinMoin/apps/frontend/views.py:747
-#: MoinMoin/apps/frontend/views.py:864
-#: MoinMoin/apps/frontend/views.py:1073
-msgid "E-Mail"
-msgstr "Email"
-
-#: MoinMoin/apps/frontend/views.py:730
-#: MoinMoin/apps/frontend/views.py:747
-#: MoinMoin/apps/frontend/views.py:864
-#: MoinMoin/apps/frontend/views.py:1073
-msgid "Your E-Mail address"
-msgstr "Seu endereço de email"
-
-#: MoinMoin/apps/frontend/views.py:731
-#: MoinMoin/apps/frontend/views.py:748
-#: MoinMoin/apps/frontend/views.py:991
-#: MoinMoin/apps/frontend/views.py:1109
-msgid "OpenID"
-msgstr "OpenID"
-
-#: MoinMoin/apps/frontend/views.py:731
-#: MoinMoin/apps/frontend/views.py:748
-#: MoinMoin/apps/frontend/views.py:1109
-msgid "Your OpenID address"
-msgstr "Seu endereço OpenID"
-
-#: MoinMoin/apps/frontend/views.py:732
-#: MoinMoin/templates/openid_register.html:21
+#: MoinMoin/apps/frontend/views.py:992 MoinMoin/apps/frontend/views.py:1031
 msgid "Register"
 msgstr "Cadastrar"
 
-#: MoinMoin/apps/frontend/views.py:810
-#: MoinMoin/apps/frontend/views.py:836
+#: MoinMoin/apps/frontend/views.py:1075
+msgid ""
+"Account verification required, please see the email we sent to your "
+"address."
+msgstr ""
+
+#: MoinMoin/apps/frontend/views.py:1077
+#, python-format
+msgid ""
+"An error occurred while sending the verification email: \"%(message)s\" "
+"Please contact an administrator to activate your account."
+msgstr ""
+
+#: MoinMoin/apps/frontend/views.py:1080
 msgid "Account created, please log in now."
 msgstr "Conta criada, você pode logar agora."
 
-#: MoinMoin/apps/frontend/views.py:848
+#: MoinMoin/apps/frontend/views.py:1098
+#, fuzzy
+msgid "Your account has been activated, you can log in now."
+msgstr "Sua senha foi alterada. Você pode se conectar agora."
+
+#: MoinMoin/apps/frontend/views.py:1100 MoinMoin/apps/frontend/views.py:1209
+msgid "Your token is invalid!"
+msgstr "Seu código de recuperação de senha é inválido!"
+
+#: MoinMoin/apps/frontend/views.py:1107
 msgid "Your user name or your email address is needed."
 msgstr "Seu nome de usuário ou endereço de email são necessários."
 
-#: MoinMoin/apps/frontend/views.py:863
-#: MoinMoin/apps/frontend/views.py:922
+#: MoinMoin/apps/frontend/views.py:1122 MoinMoin/apps/frontend/views.py:1182
 msgid "Your login name"
 msgstr "Seu nome de usuário"
 
-#: MoinMoin/apps/frontend/views.py:865
+#: MoinMoin/apps/frontend/views.py:1124
 msgid "Recover password"
 msgstr "Recuperar a senha"
 
-#: MoinMoin/apps/frontend/views.py:894
+#: MoinMoin/apps/frontend/views.py:1132 MoinMoin/templates/lostpass.html:5
+msgid "Lost Password"
+msgstr "Perdi minha senha"
+
+#: MoinMoin/apps/frontend/views.py:1154
 msgid "If this account exists, you will be notified."
 msgstr "Se esta conta já existe, você será avisado"
 
-#: MoinMoin/apps/frontend/views.py:905
-#: MoinMoin/apps/frontend/views.py:1043
+#: MoinMoin/apps/frontend/views.py:1165 MoinMoin/apps/frontend/views.py:1299
 msgid "New password is unacceptable, encoding trouble."
 msgstr "Esta senha é inválida, problema de codificação de caracteres."
 
-#: MoinMoin/apps/frontend/views.py:923
+#: MoinMoin/apps/frontend/views.py:1183
 msgid "Recovery token"
 msgstr "Código para recuperação de senha"
 
-#: MoinMoin/apps/frontend/views.py:923
+#: MoinMoin/apps/frontend/views.py:1183
 msgid "The recovery token that has been sent to you"
 msgstr "O código de recuperação de senha foi enviado para você"
 
-#: MoinMoin/apps/frontend/views.py:924
-#: MoinMoin/apps/frontend/views.py:1065
+#: MoinMoin/apps/frontend/views.py:1184 MoinMoin/apps/frontend/views.py:1323
 msgid "New password"
 msgstr "Nova senha"
 
-#: MoinMoin/apps/frontend/views.py:925
-#: MoinMoin/apps/frontend/views.py:1066
+#: MoinMoin/apps/frontend/views.py:1185 MoinMoin/apps/frontend/views.py:1324
 msgid "New password (repeat)"
 msgstr "Nova senha (repetir)"
 
-#: MoinMoin/apps/frontend/views.py:926
-#: MoinMoin/apps/frontend/views.py:1067
-#: MoinMoin/templates/usersettings.html:9
+#: MoinMoin/apps/frontend/views.py:1186 MoinMoin/apps/frontend/views.py:1325
+#: MoinMoin/templates/usersettings_forms.html:28
 msgid "Change password"
 msgstr "Mudar a senha"
 
-#: MoinMoin/apps/frontend/views.py:947
+#: MoinMoin/apps/frontend/views.py:1194 MoinMoin/templates/recoverpass.html:5
+msgid "Recover Password"
+msgstr "Recuperar senha"
+
+#: MoinMoin/apps/frontend/views.py:1207
 msgid "Your password has been changed, you can log in now."
 msgstr "Sua senha foi alterada. Você pode se conectar agora."
 
-#: MoinMoin/apps/frontend/views.py:949
-msgid "Your token is invalid!"
-msgstr "Seu código de recuperação de senha é inválido!"
-
-#: MoinMoin/apps/frontend/views.py:961
+#: MoinMoin/apps/frontend/views.py:1221
 msgid "Either your username or password was invalid."
 msgstr "Seu nome de usuário ou senha são invalidos."
 
-#: MoinMoin/apps/frontend/views.py:962
+#: MoinMoin/apps/frontend/views.py:1222
 msgid "Failed to authenticate with this OpenID."
 msgstr "Falha ao autenticar com este OpenID"
 
-#: MoinMoin/apps/frontend/views.py:1031
+#: MoinMoin/apps/frontend/views.py:1252
+msgid "Log in"
+msgstr "Login"
+
+#: MoinMoin/apps/frontend/views.py:1260 MoinMoin/templates/layout.html:62
+msgid "Login"
+msgstr "Entrar"
+
+#: MoinMoin/apps/frontend/views.py:1289
 msgid "You are now logged out."
 msgstr "Você está desconectado."
 
-#: MoinMoin/apps/frontend/views.py:1042
+#: MoinMoin/apps/frontend/views.py:1298
 msgid "The current password was wrong."
 msgstr "Sua senha atual está incorreta."
 
-#: MoinMoin/apps/frontend/views.py:1064
+#: MoinMoin/apps/frontend/views.py:1322
 msgid "Current Password"
 msgstr "Senha atual"
 
-#: MoinMoin/apps/frontend/views.py:1064
+#: MoinMoin/apps/frontend/views.py:1322
 msgid "Your current login password"
 msgstr "Sua senha atual"
 
-#: MoinMoin/apps/frontend/views.py:1074
-#: MoinMoin/apps/frontend/views.py:1080
-#: MoinMoin/apps/frontend/views.py:1095
-#: MoinMoin/apps/frontend/views.py:1118
-#: MoinMoin/apps/frontend/views.py:1128
+#: MoinMoin/apps/frontend/views.py:1330 MoinMoin/apps/frontend/views.py:1336
+#: MoinMoin/apps/frontend/views.py:1351 MoinMoin/apps/frontend/views.py:1373
+#: MoinMoin/apps/frontend/views.py:1384
+#: MoinMoin/templates/usersettings_forms.html:14
+#: MoinMoin/templates/usersettings_forms.html:42
+#: MoinMoin/templates/usersettings_forms.html:56
+#: MoinMoin/templates/usersettings_forms.html:67
+#: MoinMoin/templates/usersettings_forms.html:81
 msgid "Save"
 msgstr "Salvar"
 
-#: MoinMoin/apps/frontend/views.py:1091
+#: MoinMoin/apps/frontend/views.py:1347
 msgid "Publish my email (not my wiki homepage) in author info"
-msgstr "Publicar meu email (não minha página inicial wiki) nas informações de autor"
+msgstr ""
+"Publicar meu email (não minha página inicial wiki) nas informações de "
+"autor"
 
-#: MoinMoin/apps/frontend/views.py:1092
+#: MoinMoin/apps/frontend/views.py:1348
 msgid "Open editor on double click"
 msgstr "Abra o editor com um duplo clique"
 
-#: MoinMoin/apps/frontend/views.py:1093
+#: MoinMoin/apps/frontend/views.py:1349
 msgid "Show comment sections"
 msgstr "Mostrar comentários"
 
-#: MoinMoin/apps/frontend/views.py:1094
+#: MoinMoin/apps/frontend/views.py:1350
 msgid "Disable this account forever"
 msgstr "Desligar esta conta para sempre"
 
-#: MoinMoin/apps/frontend/views.py:1108
+#: MoinMoin/apps/frontend/views.py:1357 MoinMoin/templates/usersettings.html:5
+#, fuzzy
+msgid "User Settings"
+msgstr "Configurações"
+
+#: MoinMoin/apps/frontend/views.py:1363
 msgid "Alias-Name"
 msgstr "Apelido"
 
-#: MoinMoin/apps/frontend/views.py:1108
+#: MoinMoin/apps/frontend/views.py:1363
 msgid "Your alias name (informational)"
 msgstr "Seu apelido (informativo)"
 
-#: MoinMoin/apps/frontend/views.py:1112
+#: MoinMoin/apps/frontend/views.py:1367
 msgid "Timezone"
 msgstr "Fuso horário"
 
-#: MoinMoin/apps/frontend/views.py:1117
+#: MoinMoin/apps/frontend/views.py:1372
 msgid "Locale"
 msgstr "Local"
 
-#: MoinMoin/apps/frontend/views.py:1125
+#: MoinMoin/apps/frontend/views.py:1380
 msgid "Theme name"
 msgstr "Nome do tema"
 
-#: MoinMoin/apps/frontend/views.py:1126
+#: MoinMoin/apps/frontend/views.py:1381
 msgid "User CSS URL"
 msgstr "URL para CSS do usuário"
 
-#: MoinMoin/apps/frontend/views.py:1126
+#: MoinMoin/apps/frontend/views.py:1381
 msgid "Give the URL of your custom CSS (optional)"
 msgstr "forneça um URL para seu CSS customizado (opcional)"
 
-#: MoinMoin/apps/frontend/views.py:1127
+#: MoinMoin/apps/frontend/views.py:1382
 msgid "Editor size"
 msgstr "Tamanho do editor"
 
-#: MoinMoin/apps/frontend/views.py:1127
+#: MoinMoin/apps/frontend/views.py:1382
 msgid "Editor textarea height (0=auto)"
 msgstr "Altura da textarea do editor (0=auto)"
 
-#: MoinMoin/apps/frontend/views.py:1156
+#: MoinMoin/apps/frontend/views.py:1383
+msgid "History results per page"
+msgstr ""
+
+#: MoinMoin/apps/frontend/views.py:1383
+msgid "Number of results per page (0=no paging)"
+msgstr ""
+
+#: MoinMoin/apps/frontend/views.py:1426
 msgid "Your password has been changed."
 msgstr "Sua senha foi alterada."
 
-#: MoinMoin/apps/frontend/views.py:1161
+#: MoinMoin/apps/frontend/views.py:1431
 msgid "This openid is already in use."
 msgstr "Este OpenID está em uso."
 
-#: MoinMoin/apps/frontend/views.py:1165
+#: MoinMoin/apps/frontend/views.py:1435
 msgid "This username is already in use."
 msgstr "Este nome de usuário já está em uso."
 
-#: MoinMoin/apps/frontend/views.py:1171
+#: MoinMoin/apps/frontend/views.py:1441
 msgid "This email is already in use"
 msgstr "Este email já está em uso"
 
-#: MoinMoin/apps/frontend/views.py:1209
+#: MoinMoin/apps/frontend/views.py:1456
+msgid ""
+"Your account has been disabled because you changed your email address. "
+"Please see the email we sent to your address to reactivate it."
+msgstr ""
+
+#: MoinMoin/apps/frontend/views.py:1463
+msgid ""
+"Your email address was not changed because sending the verification email"
+" failed. Please try again later."
+msgstr ""
+
+#: MoinMoin/apps/frontend/views.py:1469
+msgid "Your changes have been saved."
+msgstr ""
+
+#: MoinMoin/apps/frontend/views.py:1521
 msgid "You must log in to use bookmarks."
 msgstr "Você deve se conectar para usar os marcadores de histórico"
 
-#: MoinMoin/apps/frontend/views.py:1362
-#: MoinMoin/config/default.py:374
-msgid "Items with similar names"
+#: MoinMoin/apps/frontend/views.py:1647
+#, fuzzy, python-format
+msgid "Items with similar names to '%(item_name)s'"
 msgstr "Itens com nomes similares"
 
-#: MoinMoin/apps/frontend/views.py:1563
+#: MoinMoin/apps/frontend/views.py:1829 MoinMoin/apps/frontend/views.py:1856
 msgid "All tags in this wiki"
 msgstr "Todas as tags deste wiki"
 
-#: MoinMoin/apps/frontend/views.py:1575
+#: MoinMoin/apps/frontend/views.py:1870
 #, python-format
 msgid "Items tagged with %(tag)s"
 msgstr "Itens marcados com %(tag)s"
 
-#: MoinMoin/auth/__init__.py:242
-#: MoinMoin/auth/ldap_login.py:129
+#: MoinMoin/auth/__init__.py:244 MoinMoin/auth/ldap_login.py:130
 msgid "Missing password. Please enter user name and password."
 msgstr "Senha inválida. Por favor entre com seu nome de usuário e senha."
 
-#: MoinMoin/auth/__init__.py:250
-#: MoinMoin/auth/ldap_login.py:199
-#: MoinMoin/auth/ldap_login.py:245
+#: MoinMoin/auth/__init__.py:252 MoinMoin/auth/ldap_login.py:200
+#: MoinMoin/auth/ldap_login.py:248
 msgid "Invalid username or password."
 msgstr "Nome de usuário ou senha inválidos."
 
-#: MoinMoin/auth/__init__.py:254
+#: MoinMoin/auth/__init__.py:256
 #, python-format
-msgid "If you do not have an account, <a href=\"%(register_url)s\">you can create one now</a>. "
-msgstr "Se você ainda não tem uma conta, <a href=\"%(register_url)s\">crie uma agora</a>. "
+msgid ""
+"If you do not have an account, <a href=\"%(register_url)s\">you can "
+"create one now</a>. "
+msgstr ""
+"Se você ainda não tem uma conta, <a href=\"%(register_url)s\">crie uma "
+"agora</a>. "
 
-#: MoinMoin/auth/__init__.py:256
+#: MoinMoin/auth/__init__.py:258
 #, python-format
 msgid "<a href=\"%(recover_url)s\">Forgot your password?</a>"
 msgstr "<a href=\"%(recover_url)s\">Esqueceu sua senha?</a>"
 
-#: MoinMoin/auth/http.py:62
+#: MoinMoin/auth/http.py:59
 msgid "Please log in first."
 msgstr "Por favor conecte-se primeiro."
 
-#: MoinMoin/auth/ldap_login.py:259
+#: MoinMoin/auth/ldap_login.py:262
 #, python-format
 msgid "LDAP server %(server)s failed."
 msgstr "O servidor LDAP  %(server)s falhou."
 
-#: MoinMoin/auth/openidrp.py:63
+#: MoinMoin/auth/openidrp.py:64
 msgid "OpenID Error"
 msgstr "Erro de OpenID"
 
-#: MoinMoin/auth/openidrp.py:70
+#: MoinMoin/auth/openidrp.py:71
 msgid "OpenID verification cancelled."
 msgstr "Verificação OpenID cancelada"
 
-#: MoinMoin/auth/openidrp.py:104
+#: MoinMoin/auth/openidrp.py:105
 msgid "This OpenID provider is not trusted."
 msgstr "Este provedor de OpenID não é confiável"
 
-#: MoinMoin/auth/openidrp.py:109
+#: MoinMoin/auth/openidrp.py:110
 msgid "OpenID failure."
 msgstr "Falha de OpenID"
 
-#: MoinMoin/auth/openidrp.py:143
+#: MoinMoin/auth/openidrp.py:144
 msgid "Failed to resolve OpenID."
 msgstr "Falha ao resolver OpenID"
 
-#: MoinMoin/auth/openidrp.py:145
+#: MoinMoin/auth/openidrp.py:146
 msgid "OpenID discovery failure, not a valid OpenID."
 msgstr "Falha de descoberta por OpenID. Não é um OpenID válido."
 
-#: MoinMoin/auth/openidrp.py:149
+#: MoinMoin/auth/openidrp.py:150
 msgid "No OpenID service at this URL."
 msgstr "Não existe um serviço de OpenID neste URL"
 
-#: MoinMoin/config/default.py:250
+#: MoinMoin/config/default.py:258
 msgid "Password is too short."
 msgstr "Senha muito curta."
 
-#: MoinMoin/config/default.py:252
+#: MoinMoin/config/default.py:260
 msgid "Password has not enough different characters."
 msgstr "A senha não tem caracteres diferentes o suficiente."
 
-#: MoinMoin/config/default.py:258
-msgid "Password is too easy to guess (password contains name or name contains password)."
-msgstr "Senha muito fácil de adivinhar (senha contém nome de usuário ou nome de usuário contém senha)."
+#: MoinMoin/config/default.py:266
+msgid ""
+"Password is too easy to guess (password contains name or name contains "
+"password)."
+msgstr ""
+"Senha muito fácil de adivinhar (senha contém nome de usuário ou nome de "
+"usuário contém senha)."
 
-#: MoinMoin/config/default.py:267
+#: MoinMoin/config/default.py:275
 msgid "Password is too easy to guess (keyboard sequence)."
 msgstr "Senha muito fácil de adivinhar (sequencia de teclado)."
 
-#: MoinMoin/config/default.py:327
+#: MoinMoin/config/default.py:333
 msgid "Home"
 msgstr "Início"
 
-#: MoinMoin/config/default.py:327
+#: MoinMoin/config/default.py:333
 msgid "Home Page"
 msgstr "Página Inicial"
 
-#: MoinMoin/config/default.py:328
-#: MoinMoin/config/default.py:356
+#: MoinMoin/config/default.py:334 MoinMoin/config/default.py:362
 msgid "History"
 msgstr "Histórico"
 
-#: MoinMoin/config/default.py:328
-#: MoinMoin/templates/global_history.html:10
-msgid "Global History"
-msgstr "Histórico Global"
-
-#: MoinMoin/config/default.py:329
-#: MoinMoin/config/default.py:361
-#: MoinMoin/config/default.py:362
+#: MoinMoin/config/default.py:335 MoinMoin/config/default.py:367
 msgid "Index"
 msgstr "Índice"
 
-#: MoinMoin/config/default.py:329
-#: MoinMoin/templates/global_index.html:4
-msgid "Global Index"
-msgstr "Índice Global"
-
-#: MoinMoin/config/default.py:330
-msgid "Tags"
-msgstr "Tags"
-
-#: MoinMoin/config/default.py:330
+#: MoinMoin/config/default.py:336
 msgid "Global Tags Index"
 msgstr "Índice geral de Tags"
 
-#: MoinMoin/config/default.py:331
+#: MoinMoin/config/default.py:337 MoinMoin/templates/index.html:56
+#: MoinMoin/templates/index.html:132
 msgid "More"
 msgstr "Mais"
 
-#: MoinMoin/config/default.py:331
+#: MoinMoin/config/default.py:337
 msgid "Administration & Docs"
 msgstr "Administração e Documentos"
 
-#: MoinMoin/config/default.py:354
+#: MoinMoin/config/default.py:360
 msgid "Show"
 msgstr "Mostrar"
 
-#: MoinMoin/config/default.py:355
+#: MoinMoin/config/default.py:361 MoinMoin/templates/index.html:33
 msgid "Download"
 msgstr "Download"
 
-#: MoinMoin/config/default.py:356
+#: MoinMoin/config/default.py:362
 msgid "Revision History"
 msgstr "Histórico de revisões"
 
-#: MoinMoin/config/default.py:359
-#: MoinMoin/templates/show.html:9
+#: MoinMoin/config/default.py:365 MoinMoin/templates/show.html:9
 msgid "Modify"
 msgstr "Modificar"
 
-#: MoinMoin/config/default.py:359
+#: MoinMoin/config/default.py:365
 msgid "Edit or Upload"
 msgstr "Editar ou fazer upload"
 
-#: MoinMoin/config/default.py:361
-#: MoinMoin/config/default.py:362
+#: MoinMoin/config/default.py:367
 msgid "List sub-items"
 msgstr "Listar sub itens"
 
-#: MoinMoin/config/default.py:363
+#: MoinMoin/config/default.py:368
 msgid "Comments"
 msgstr "Comentários"
 
-#: MoinMoin/config/default.py:363
-msgid "Switch showing comments on or off"
-msgstr "Ligar/desligar comentários"
+#: MoinMoin/config/default.py:368 MoinMoin/templates/common.js:70
+#, fuzzy
+msgid "Hide comments"
+msgstr "Comentários"
 
-#: MoinMoin/config/default.py:364
+#: MoinMoin/config/default.py:369
+msgid "Transclusions"
+msgstr ""
+
+#: MoinMoin/config/default.py:369 MoinMoin/templates/common.js:104
+msgid "Show transclusions"
+msgstr ""
+
+#: MoinMoin/config/default.py:370
 msgid "Highlight"
 msgstr "Realçar"
 
-#: MoinMoin/config/default.py:364
+#: MoinMoin/config/default.py:370
 msgid "Show with Syntax-Highlighting"
 msgstr "Mostrar com realçador de sintaxe"
 
-#: MoinMoin/config/default.py:365
+#: MoinMoin/config/default.py:371
 msgid "Meta"
 msgstr "Meta"
 
-#: MoinMoin/config/default.py:365
+#: MoinMoin/config/default.py:371
 msgid "Display Metadata"
 msgstr "Mostrar metadados"
 
-#: MoinMoin/config/default.py:366
+#: MoinMoin/config/default.py:372
 msgid "Create or remove a navigation link to this item"
 msgstr "Criar ou remover um link de navegação para este item"
 
-#: MoinMoin/config/default.py:367
+#: MoinMoin/config/default.py:373
 msgid "Switch notifications about item changes on or off"
 msgstr "Ligar/desligar notificações de modificações de item"
 
-#: MoinMoin/config/default.py:368
-msgid "Copy"
-msgstr "Copiar"
-
-#: MoinMoin/config/default.py:368
-msgid "Create a copy of this item"
-msgstr "Criar uma cópia deste item"
-
-#: MoinMoin/config/default.py:369
+#: MoinMoin/config/default.py:374
 msgid "Rename"
 msgstr "Renomear"
 
-#: MoinMoin/config/default.py:369
+#: MoinMoin/config/default.py:374
 msgid "Rename this item"
 msgstr "Renomear este item"
 
-#: MoinMoin/config/default.py:370
+#: MoinMoin/config/default.py:375 MoinMoin/templates/index.html:37
 msgid "Delete"
 msgstr "Apagar"
 
-#: MoinMoin/config/default.py:370
-msgid "Move this item to the trash"
-msgstr "Mover este item para a lixeira"
+#: MoinMoin/config/default.py:375
+#, fuzzy
+msgid "Delete this item"
+msgstr "Renomear este item"
 
-#: MoinMoin/config/default.py:371
+#: MoinMoin/config/default.py:376 MoinMoin/templates/index.html:42
 msgid "Destroy"
 msgstr "Destruir"
 
-#: MoinMoin/config/default.py:371
+#: MoinMoin/config/default.py:376
 msgid "Completely destroy this item"
 msgstr "Destruir completamente este item"
 
-#: MoinMoin/config/default.py:372
+#: MoinMoin/config/default.py:377
 msgid "Referrers"
 msgstr "Referências"
 
-#: MoinMoin/config/default.py:372
+#: MoinMoin/config/default.py:377
 msgid "What refers here?"
 msgstr "O que faz referência para cá?"
 
-#: MoinMoin/config/default.py:373
+#: MoinMoin/config/default.py:378
 msgid "Site Map"
 msgstr "Mapa do site"
 
-#: MoinMoin/config/default.py:373
+#: MoinMoin/config/default.py:378
 msgid "Local Site Map of this item"
 msgstr "Mapa do site local para este item"
 
-#: MoinMoin/config/default.py:374
+#: MoinMoin/config/default.py:379
 msgid "Similar"
 msgstr "Similar"
 
-#: MoinMoin/converter/html_out.py:591
+#: MoinMoin/config/default.py:379
+msgid "Items with similar names"
+msgstr "Itens com nomes similares"
+
+#: MoinMoin/converter/archive_in.py:59
+msgid "Date"
+msgstr ""
+
+#: MoinMoin/converter/html_out.py:539
+msgid "Link to this heading"
+msgstr ""
+
+#: MoinMoin/converter/html_out.py:605
 msgid "Contents"
 msgstr "Conteúdo"
 
-#: MoinMoin/converter/macro.py:84
+#: MoinMoin/converter/macro.py:81
+msgid "Error: invalid macro name."
+msgstr ""
+
+#: MoinMoin/converter/macro.py:91 MoinMoin/converter/macro_Verbatim.py:68
 #, python-format
 msgid "<<%(macro_name)s: execution failed [%(error_msg)s] (see also the log)>>"
 msgstr "<<%(macro_name)s: execução falhou [%(error_msg)s] (veja também o log)>>"
 
-#: MoinMoin/converter/moinwiki_in.py:1032
+#: MoinMoin/converter/moinwiki_in.py:1034
 msgid "Error:"
 msgstr "Erro:"
 
-#: MoinMoin/converter/moinwiki_in.py:1033
+#: MoinMoin/converter/moinwiki_in.py:1035
 msgid "is invalid within"
 msgstr "é inválido em"
 
-#: MoinMoin/converter/nonexistent_in.py:30
+#: MoinMoin/converter/nonexistent_in.py:31
 #, python-format
 msgid "%(item_name)s does not exist. Create it?"
 msgstr "%(item_name)s não existe. Criar?"
 
-#: MoinMoin/items/__init__.py:654
+#: MoinMoin/items/__init__.py:624
 msgid "Invalid JSON."
 msgstr "JSON inválido"
 
-#: MoinMoin/items/__init__.py:700
-#: MoinMoin/items/__init__.py:1156
-#: MoinMoin/items/__init__.py:1353
-#: MoinMoin/items/__init__.py:1445
-#: MoinMoin/items/__init__.py:1533
+#: MoinMoin/items/__init__.py:635 MoinMoin/templates/atom.html:12
+#: MoinMoin/templates/diff_text_atom.html:13 MoinMoin/templates/history.html:31
+msgid "Comment"
+msgstr "Comentário"
+
+#: MoinMoin/items/__init__.py:635
+msgid "Comment about your change"
+msgstr "Comente suas mudanças"
+
+#: MoinMoin/items/__init__.py:669
 msgid "MetaData (JSON)"
 msgstr "Metadado (JSON)"
 
-#: MoinMoin/items/__init__.py:701
-#: MoinMoin/items/__init__.py:1158
-#: MoinMoin/items/__init__.py:1354
-#: MoinMoin/items/__init__.py:1446
-#: MoinMoin/items/__init__.py:1534
+#: MoinMoin/items/__init__.py:670
 msgid "Upload file:"
 msgstr "Upload de arquivo:"
 
-#: MoinMoin/items/__init__.py:735
-msgid "The items have the same data hash code (that means they very likely have the same data)."
-msgstr "Itens tem o mesmo código hash (significa que provavelmente eles têm o mesmo conteúdo)"
+#: MoinMoin/items/__init__.py:740
+msgid ""
+"The items have the same data hash code (that means they very likely have "
+"the same data)."
+msgstr ""
+"Itens tem o mesmo código hash (significa que provavelmente eles têm o "
+"mesmo conteúdo)"
 
-#: MoinMoin/items/__init__.py:737
+#: MoinMoin/items/__init__.py:742
 msgid "The items have different data."
 msgstr "Os itens tem conteúdos diferentes."
 
-#: MoinMoin/items/__init__.py:744
+#: MoinMoin/items/__init__.py:754
 #, python-format
 msgid "Impossible to convert the data to the contenttype: %(contenttype)s"
 msgstr "Impossível converter o conteúdo do contenttype: %(contenttype)s"
 
-#: MoinMoin/items/__init__.py:1157
+#: MoinMoin/items/__init__.py:1120
 msgid "Type your text here"
 msgstr "Digite seu texto aqui"
 
-#: MoinMoin/items/__init__.py:1384
-#: MoinMoin/items/__init__.py:1481
+#: MoinMoin/items/__init__.py:1359 MoinMoin/items/__init__.py:1427
 #, python-format
 msgid "Edit drawing %(filename)s (opens in new window)"
 msgstr "Editar desenho %(filename)s (abre em nova janela)"
 
-#: MoinMoin/items/__init__.py:1399
-#: MoinMoin/items/__init__.py:1498
+#: MoinMoin/items/__init__.py:1374 MoinMoin/items/__init__.py:1444
 #, python-format
 msgid "Clickable drawing: %(filename)s"
 msgstr "Desenho clicável: %(filename)s"
 
-#: MoinMoin/mail/sendmail.py:86
+#: MoinMoin/mail/sendmail.py:94
 msgid "No recipients, nothing to do"
 msgstr "Sem destinatário, nada a fazer."
 
-#: MoinMoin/mail/sendmail.py:162
+#: MoinMoin/mail/sendmail.py:170
 #, python-format
 msgid "Connection to mailserver '%(server)s' failed: %(reason)s"
 msgstr "Conexão com o servidor de email '%(server)s' falhou: %(reason)s"
 
-#: MoinMoin/mail/sendmail.py:176
+#: MoinMoin/mail/sendmail.py:184
 msgid "Mail not sent"
 msgstr "Email não enviado"
 
-#: MoinMoin/mail/sendmail.py:179
+#: MoinMoin/mail/sendmail.py:187
 msgid "Mail sent successfully"
 msgstr "Email enviado"
 
-#: MoinMoin/security/textcha.py:159
+#: MoinMoin/search/__init__.py:17
+msgid "Search query too short."
+msgstr "Expressão de busca muito curta."
+
+#: MoinMoin/security/textcha.py:158
 msgid "The entered TextCha was incorrect."
 msgstr "O TextCha inserido está incorreto."
 
-#: MoinMoin/security/textcha.py:160
+#: MoinMoin/security/textcha.py:159
 msgid "The TextCha question is invalid or has expired. Please try again."
 msgstr "A questão do TextCha expirou ou está inválida. Tente novamente."
 
-#: MoinMoin/security/textcha.py:179
+#: MoinMoin/security/textcha.py:178
 msgid "TextCha"
 msgstr "TextCha"
 
-#: MoinMoin/storage/error.py:42
-msgid "Permission denied!"
-msgstr "Permissão negada!"
-
-#: MoinMoin/storage/error.py:44
-msgid "You"
-msgstr "Você"
+#: MoinMoin/templates/404.html:6
+#, fuzzy, python-format
+msgid "The item '%(item_name)s' does not exist."
+msgstr "%(item_name)s não existe. Criar?"
 
-#: MoinMoin/storage/error.py:46
-#, python-format
-msgid "%(username)s may not %(priv)s '%(item)s'."
-msgstr "%(username)s não pode %(priv)s '%(item)s'."
+#: MoinMoin/templates/atom.html:4 MoinMoin/templates/diff_text_atom.html:5
+#: MoinMoin/templates/meta.html:12
+msgid "Revision"
+msgstr "Revisao"
 
-#: MoinMoin/templates/copy.html:4
-#, python-format
-msgid "Copy '%(item_name)s'"
-msgstr "Copiar '%(item_name)s'"
+#: MoinMoin/templates/common.js:73
+#, fuzzy
+msgid "Show comments"
+msgstr "Mostrar comentários"
+
+#: MoinMoin/templates/common.js:107
+msgid "Hide transclusions"
+msgstr ""
 
 #: MoinMoin/templates/delete.html:4
 #, python-format
 msgid "Delete '%(item_name)s'"
 msgstr "Apagar '%(item_name)s'"
 
-#: MoinMoin/templates/destroy.html:5
+#: MoinMoin/templates/destroy.html:4
 #, python-format
 msgid "DESTROY COMPLETE item '%(item_name)s'"
 msgstr "DESTRUIR COMPLETAMENTE o item '%(item_name)s'"
 
-#: MoinMoin/templates/destroy.html:17
-#, python-format
-msgid "DESTROY REVISION '%(item_name)s' (rev %(rev_no)d)"
-msgstr "DESTRUIR REVISÃO '%(item_name)s' (rev %(rev_no)d)"
+#: MoinMoin/templates/destroy.html:20
+#, fuzzy, python-format
+msgid "DESTROY REVISION '%(item_name)s' (rev %(rev_id)s)"
+msgstr "Reverter '%(item_name)s' (rev %(rev_no)d)"
 
 #: MoinMoin/templates/diff.html:4
-#, python-format
-msgid "Item: %(item_name)s (Diff between revision %(oldrevno)s and %(newrevno)s)"
-msgstr "Item: %(item_name)s (Diff entre revisão %(oldrevno)s e %(newrevno)s)"
-
-#: MoinMoin/templates/diff_text.html:28
-msgid "No older revision"
-msgstr "Não há revisão mais antiga"
-
-#: MoinMoin/templates/diff_text.html:32
-msgid "Use older revision"
-msgstr "Usar revisão mais antiga"
+#, fuzzy, python-format
+msgid "Diff for '%(item_name)s'"
+msgstr "Copiar '%(item_name)s'"
 
 #: MoinMoin/templates/diff_text.html:34
-#, python-format
-msgid "Revision %(revno)d as of %(date_time)s"
-msgstr "Revisão %(revno)d em %(date_time)s"
-
-#: MoinMoin/templates/diff_text.html:37
-msgid "No newer revision"
-msgstr "Não há revisão mais nova"
-
-#: MoinMoin/templates/diff_text.html:41
-msgid "Use newer revision"
-msgstr "Usar revisão mais nova"
-
-#: MoinMoin/templates/diff_text.html:75
 msgid "Deletions are marked like this."
 msgstr "Deleções são marcadas assim"
 
-#: MoinMoin/templates/diff_text.html:76
+#: MoinMoin/templates/diff_text.html:35
 msgid "Additions are marked like this."
 msgstr "Adições são marcadas assim"
 
-#: MoinMoin/templates/diff_text.html:80
-#: MoinMoin/templates/diff_text.html:81
+#: MoinMoin/templates/diff_text.html:39 MoinMoin/templates/diff_text.html:40
 msgid "Line"
 msgstr "Linha"
 
-#: MoinMoin/templates/global_history.html:14
-#: MoinMoin/templates/history.html:12
-msgid "Timestamp"
-msgstr "Hora e Data (timestamp)"
-
-#: MoinMoin/templates/global_history.html:15
-msgid "Action"
-msgstr "Ação"
+#: MoinMoin/templates/forms.html:158
+msgid "Upload"
+msgstr ""
 
-#: MoinMoin/templates/global_history.html:17
-#: MoinMoin/templates/history.html:11
-msgid "Rev."
-msgstr "Revisão"
+#: MoinMoin/templates/forms.html:159
+#, fuzzy
+msgid "Upload files"
+msgstr "Upload de arquivo:"
 
-#: MoinMoin/templates/global_history.html:18
-#: MoinMoin/templates/history.html:16
-msgid "Content-Type"
-msgstr "Content-Type"
+#: MoinMoin/templates/forms.html:164
+msgid "Start All"
+msgstr ""
+
+#: MoinMoin/templates/forms.html:165
+msgid "Cancel All"
+msgstr ""
+
+#: MoinMoin/templates/forms.html:169
+msgid "Start"
+msgstr ""
+
+#: MoinMoin/templates/forms.html:170 MoinMoin/templates/index.html:152
+#: MoinMoin/templates/index.html:170
+msgid "Cancel"
+msgstr ""
 
 #: MoinMoin/templates/global_history.html:19
-#: MoinMoin/templates/history.html:15
-msgid "Editor"
-msgstr "Editor"
+msgid "Set bookmark"
+msgstr ""
 
-#: MoinMoin/templates/highlight.html:4
+#: MoinMoin/templates/global_history.html:49
+msgid "Delete bookmark"
+msgstr ""
+
+#: MoinMoin/templates/highlight.html:3
 #, python-format
 msgid "Syntax highlighting for Item: %(name)s"
 msgstr "Realçe de sintaxe para o item: %(name)s"
 
-#: MoinMoin/templates/history.html:5
+#: MoinMoin/templates/history.html:4
 #, python-format
 msgid "History of '%(item_name)s'"
 msgstr "Histórico do item: '%(item_name)s'"
 
-#: MoinMoin/templates/history.html:35
+#: MoinMoin/templates/history.html:11
+msgid "Previous"
+msgstr ""
+
+#: MoinMoin/templates/history.html:14
+#, fuzzy
+msgid "Next"
+msgstr "Índice"
+
+#: MoinMoin/templates/history.html:25
+msgid "Rev."
+msgstr "Revisão"
+
+#: MoinMoin/templates/history.html:26
+msgid "Timestamp"
+msgstr "Hora e Data (timestamp)"
+
+#: MoinMoin/templates/history.html:29
+msgid "Editor"
+msgstr "Editor"
+
+#: MoinMoin/templates/history.html:30
+msgid "Content-Type"
+msgstr "Content-Type"
+
+#: MoinMoin/templates/history.html:51
 msgid "show"
 msgstr "mostrar"
 
-#: MoinMoin/templates/history.html:36
+#: MoinMoin/templates/history.html:52
 msgid "meta"
 msgstr "meta"
 
-#: MoinMoin/templates/history.html:37
+#: MoinMoin/templates/history.html:53
 msgid "download"
 msgstr "download"
 
-#: MoinMoin/templates/history.html:38
+#: MoinMoin/templates/history.html:54
 msgid "highlight"
 msgstr "realçe"
 
-#: MoinMoin/templates/history.html:39
+#: MoinMoin/templates/history.html:56
 msgid "revert"
 msgstr "reverter"
 
-#: MoinMoin/templates/history.html:40
+#: MoinMoin/templates/history.html:59
 msgid "destroy"
 msgstr "destruir"
 
-#: MoinMoin/templates/index.html:4
-#: MoinMoin/templates/index2.html:9
+#: MoinMoin/templates/index.html:5
 #, python-format
 msgid "Index of subitems of '%(item_name)s'"
 msgstr "Índice dos subitens de '%(item_name)s'"
 
-#: MoinMoin/templates/itemviews.html:30
+#: MoinMoin/templates/index.html:22
+msgid "Select All"
+msgstr ""
+
+#: MoinMoin/templates/index.html:32
+#, fuzzy
+msgid "New item"
+msgstr "Criar novo item?"
+
+#: MoinMoin/templates/index.html:50
+msgid "Filter by content type"
+msgstr ""
+
+#: MoinMoin/templates/index.html:51
+msgid "items having unknown mime types"
+msgstr ""
+
+#: MoinMoin/templates/index.html:55
+#, fuzzy
+msgid "Toggle"
+msgstr "marcado com tag"
+
+#: MoinMoin/templates/index.html:96
+msgid "Recently uploaded items"
+msgstr ""
+
+#: MoinMoin/templates/index.html:105 MoinMoin/templates/index.html:107
+msgid "All"
+msgstr ""
+
+#: MoinMoin/templates/index.html:144 MoinMoin/templates/index.html:157
+msgid "Close"
+msgstr ""
+
+#: MoinMoin/templates/index.html:145
+msgid "Please provide comment for this action"
+msgstr ""
+
+#: MoinMoin/templates/index.html:148
+msgid "Enter your comment"
+msgstr ""
+
+#: MoinMoin/templates/index.html:151
+msgid "Submit"
+msgstr ""
+
+#: MoinMoin/templates/index.html:158
+#, fuzzy
+msgid "Create new item"
+msgstr "Criar novo item?"
+
+#: MoinMoin/templates/index.html:164 MoinMoin/templates/index.html:166
+msgid "Enter item name here"
+msgstr ""
+
+#: MoinMoin/templates/index.html:169
+msgid "Create"
+msgstr ""
+
+#: MoinMoin/templates/index.html:180
+msgid "(Drag and drop multiple files to this white area to upload them.)"
+msgstr ""
+
+#: MoinMoin/templates/itemviews.html:49
 msgid "Remove Link"
 msgstr "Remover Link"
 
-#: MoinMoin/templates/itemviews.html:32
+#: MoinMoin/templates/itemviews.html:51
 msgid "Add Link"
 msgstr "Adicionar Link"
 
-#: MoinMoin/templates/itemviews.html:41
+#: MoinMoin/templates/itemviews.html:61
 msgid "Unsubscribe"
 msgstr "Não acompanhar"
 
-#: MoinMoin/templates/itemviews.html:43
+#: MoinMoin/templates/itemviews.html:63
 msgid "Subscribe"
 msgstr "Acompanhar"
 
-#: MoinMoin/templates/layout.html:46
-#: MoinMoin/templates/usersettings.html:6
+#: MoinMoin/templates/layout.html:50
 msgid "Settings"
 msgstr "Configurações"
 
-#: MoinMoin/templates/layout.html:52
+#: MoinMoin/templates/layout.html:56
 msgid "Logout"
 msgstr "Sair"
 
-#: MoinMoin/templates/layout.html:58
-msgid "Login"
-msgstr "Entrar"
-
 #: MoinMoin/templates/login.html:9
 msgid "Moin login"
 msgstr "Login Moin"
 
-#: MoinMoin/templates/login.html:21
-#: MoinMoin/templates/login.html:35
-msgid "Log in"
-msgstr "Login"
-
-#: MoinMoin/templates/login.html:28
+#: MoinMoin/templates/login.html:25
 msgid "OpenID login"
 msgstr "Login OpenID"
 
-#: MoinMoin/templates/lostpass.html:5
-msgid "Lost Password"
-msgstr "Perdi minha senha"
+#: MoinMoin/templates/lookup.html:30
+msgid "No results"
+msgstr ""
+
+#: MoinMoin/templates/lookup.html:32
+msgid "More than one result"
+msgstr ""
 
 #: MoinMoin/templates/lostpass.html:7
 msgid "Please note that you only need to fill out one form field."
 msgstr "Note que você precisa preencher apenas um campo do formulário"
 
-#: MoinMoin/templates/meta.html:9
+#: MoinMoin/templates/meta.html:3
 #, python-format
 msgid "Metadata of '%(item_name)s'"
 msgstr "Metadados de '%(item_name)s'"
 
-#: MoinMoin/templates/meta.html:10
-msgid "Revision"
-msgstr "Revisao"
-
 #: MoinMoin/templates/modify_anywikidraw.html:18
 #: MoinMoin/templates/modify_twikidraw.html:13
 msgid "NOTE:"
@@ -1126,35 +1421,89 @@
 
 #: MoinMoin/templates/modify_show_template_selection.html:5
 #, python-format
-msgid "You can either <a href='%(modifyhref)s'>create the item from scratch</a> or select a template."
-msgstr "Você pode <a href='%(modifyhref)s'>começar 'do zero'</a> ou selecionar um modelo pré definido."
+msgid ""
+"You can either <a href='%(modifyhref)s'>create the item from scratch</a> "
+"or select a template."
+msgstr ""
+"Você pode <a href='%(modifyhref)s'>começar 'do zero'</a> ou selecionar um"
+" modelo pré definido."
 
 #: MoinMoin/templates/modify_show_template_selection.html:8
 msgid "Available template items"
 msgstr "Modelos de item disponíveis"
 
 #: MoinMoin/templates/modify_show_type_selection.html:5
-msgid "This item does not exist (yet), but you can try creating it now. Please select the type of the item you want to create."
-msgstr "Este item não existe (ainda), mas você pode tentar criá-lo agora. Selecione o tipo de item que você quer criar."
+msgid ""
+"This item does not exist (yet), but you can try creating it now. Please "
+"select the type of the item you want to create."
+msgstr ""
+"Este item não existe (ainda), mas você pode tentar criá-lo agora. "
+"Selecione o tipo de item que você quer criar."
 
-#: MoinMoin/templates/openid_register.html:5
-#: MoinMoin/templates/register.html:5
+#: MoinMoin/templates/modify_text.html:9
+#, fuzzy
+msgid "Link to Subitem"
+msgstr "Listar sub itens"
+
+#: MoinMoin/templates/modify_text.html:9
+msgid "Link"
+msgstr ""
+
+#: MoinMoin/templates/modify_text.html:12
+msgid "Transclude Subitem"
+msgstr ""
+
+#: MoinMoin/templates/modify_text.html:12
+msgid "Transclude"
+msgstr ""
+
+#: MoinMoin/templates/openid_register.html:5 MoinMoin/templates/register.html:5
 msgid "Create Account"
 msgstr "Criar conta"
 
-#: MoinMoin/templates/recoverpass.html:5
-msgid "Recover Password"
-msgstr "Recuperar senha"
-
 #: MoinMoin/templates/rename.html:4
 #, python-format
 msgid "Rename '%(item_name)s'"
 msgstr "Renomear '%(item_name)s'"
 
 #: MoinMoin/templates/revert.html:4
+#, fuzzy, python-format
+msgid "Revert '%(item_name)s' (rev %(rev_id)s)"
+msgstr "Reverter '%(item_name)s' (rev %(rev_no)d)"
+
+#: MoinMoin/templates/search.html:10
 #, python-format
-msgid "Revert '%(item_name)s' (rev %(rev_no)d)"
-msgstr "Reverter '%(item_name)s' (rev %(rev_no)d)"
+msgid "%(result_len)d results found (%(runtime).3f secs)."
+msgstr ""
+
+#: MoinMoin/templates/search.html:15
+#, python-format
+msgid "No results found (%(runtime).3f secs)."
+msgstr ""
+
+#: MoinMoin/templates/search.html:29
+#, python-format
+msgid "name term suggestions: %(termlist)s"
+msgstr ""
+
+#: MoinMoin/templates/search.html:30
+#, python-format
+msgid "content term suggestions: %(termlist)s"
+msgstr ""
+
+#: MoinMoin/templates/search.html:45 MoinMoin/templates/show.html:54
+#, python-format
+msgid "Summary: %(summary)s"
+msgstr ""
+
+#: MoinMoin/templates/search.html:51
+#, fuzzy, python-format
+msgid "Revision: %(revid)s Last Change: %(mtime)s"
+msgstr "Revisão %(revno)d em %(date_time)s"
+
+#: MoinMoin/templates/search.html:59
+msgid "You don't have read permission for this item."
+msgstr ""
 
 #: MoinMoin/templates/show.html:23
 msgid "older"
@@ -1172,19 +1521,15 @@
 msgid "no newer revision"
 msgstr "nenhuma revisão mais nova"
 
-#: MoinMoin/templates/show.html:47
-msgid "This item exists, but it has no revisions."
-msgstr "Este item existe, mas não tem revisões"
-
-#: MoinMoin/templates/show.html:72
+#: MoinMoin/templates/show.html:77
 msgid "modified"
 msgstr "modificado"
 
-#: MoinMoin/templates/show.html:73
+#: MoinMoin/templates/show.html:78
 msgid "by"
 msgstr "por"
 
-#: MoinMoin/templates/show.html:74
+#: MoinMoin/templates/show.html:79
 msgid "tagged"
 msgstr "marcado com tag"
 
@@ -1194,48 +1539,53 @@
 msgstr "Mapa do site de %(item_name)s"
 
 #: MoinMoin/templates/usersettings.html:8
-#: MoinMoin/templates/usersettings.html:17
 msgid "Personal Settings"
 msgstr "Configurações Pessoais"
 
-#: MoinMoin/templates/usersettings.html:10
-#: MoinMoin/templates/usersettings.html:47
+#: MoinMoin/templates/usersettings.html:13
+msgid "Change Password"
+msgstr "Mudar senha"
+
+#: MoinMoin/templates/usersettings.html:18
 msgid "Notification Settings"
 msgstr "Configurações de Notificações"
 
-#: MoinMoin/templates/usersettings.html:11
-#: MoinMoin/templates/usersettings.html:59
+#: MoinMoin/templates/usersettings.html:23
 msgid "Wiki Appearance Settings"
 msgstr "Configurações de Aparência do Wiki"
 
-#: MoinMoin/templates/usersettings.html:12
-#: MoinMoin/templates/usersettings.html:73
+#: MoinMoin/templates/usersettings.html:28
 msgid "Navigation Settings"
 msgstr "Configurações de Navegação"
 
-#: MoinMoin/templates/usersettings.html:13
-#: MoinMoin/templates/usersettings.html:85
+#: MoinMoin/templates/usersettings.html:33
 msgid "Options"
 msgstr "Opções"
 
-#: MoinMoin/templates/usersettings.html:33
-msgid "Change Password"
-msgstr "Mudar senha"
+#: MoinMoin/templates/usersettings_forms.html:35
+msgid ""
+"Changing your email address requires you to verify it. A link will be "
+"sent to you."
+msgstr ""
 
-#: MoinMoin/templates/wanteds.html:7
-#, python-format
-msgid "Total: %(total)s"
-msgstr "Total: %(total)s"
+#: MoinMoin/templates/utils.html:62
+msgid "Expand Subitem"
+msgstr ""
 
-#: MoinMoin/themes/__init__.py:54
+#: MoinMoin/templates/utils.html:79
+#, fuzzy
+msgid "Subitems"
+msgstr "Listar sub itens"
+
+#: MoinMoin/themes/__init__.py:57
 msgid "Access denied"
 msgstr "Acesso negado"
 
-#: MoinMoin/themes/__init__.py:55
+#: MoinMoin/themes/__init__.py:58
 msgid "You are not allowed to access this resource."
 msgstr "Você não tem permissão para acessar este recurso."
 
-#: MoinMoin/themes/__init__.py:286
+#: MoinMoin/themes/__init__.py:292
 msgid "anonymous"
 msgstr "anônimo"
 
@@ -1262,7 +1612,9 @@
 #: MoinMoin/util/paramparser.py:373
 #, python-format
 msgid "Argument \"%(name)s\" must be a floating point value, not \"%(value)s\""
-msgstr "O argumento \"%(name)s\" deve ser um número em ponto flutuante, e não \"%(value)s\""
+msgstr ""
+"O argumento \"%(name)s\" deve ser um número em ponto flutuante, e não "
+"\"%(value)s\""
 
 #: MoinMoin/util/paramparser.py:376
 #, python-format
@@ -1282,7 +1634,9 @@
 #: MoinMoin/util/paramparser.py:460
 #, python-format
 msgid "Argument \"%(name)s\" must be one of \"%(choices)s\", not \"%(value)s\""
-msgstr "O argumento \"%(name)s\" deve ser um dos \"%(choices)s\", e não \"%(value)s\""
+msgstr ""
+"O argumento \"%(name)s\" deve ser um dos \"%(choices)s\", e não "
+"\"%(value)s\""
 
 #: MoinMoin/util/paramparser.py:465
 #, python-format
@@ -1307,3 +1661,56 @@
 msgid "No argument named \"%(name)s\""
 msgstr "Nenhum argumento de nome \"%(name)s\""
 
+#~ msgid "Refers Here"
+#~ msgstr "Faz referência aqui"
+
+#~ msgid "Switch showing comments on or off"
+#~ msgstr "Ligar/desligar comentários"
+
+#~ msgid "Copy"
+#~ msgstr "Copiar"
+
+#~ msgid "Create a copy of this item"
+#~ msgstr "Criar uma cópia deste item"
+
+#~ msgid "Move this item to the trash"
+#~ msgstr "Mover este item para a lixeira"
+
+#~ msgid "Permission denied!"
+#~ msgstr "Permissão negada!"
+
+#~ msgid "You"
+#~ msgstr "Você"
+
+#~ msgid "%(username)s may not %(priv)s '%(item)s'."
+#~ msgstr "%(username)s não pode %(priv)s '%(item)s'."
+
+#~ msgid "DESTROY REVISION '%(item_name)s' (rev %(rev_no)d)"
+#~ msgstr "DESTRUIR REVISÃO '%(item_name)s' (rev %(rev_no)d)"
+
+#~ msgid ""
+#~ "Item: %(item_name)s (Diff between revision "
+#~ "%(oldrevno)s and %(newrevno)s)"
+#~ msgstr "Item: %(item_name)s (Diff entre revisão %(oldrevno)s e %(newrevno)s)"
+
+#~ msgid "No older revision"
+#~ msgstr "Não há revisão mais antiga"
+
+#~ msgid "Use older revision"
+#~ msgstr "Usar revisão mais antiga"
+
+#~ msgid "No newer revision"
+#~ msgstr "Não há revisão mais nova"
+
+#~ msgid "Use newer revision"
+#~ msgstr "Usar revisão mais nova"
+
+#~ msgid "Action"
+#~ msgstr "Ação"
+
+#~ msgid "This item exists, but it has no revisions."
+#~ msgstr "Este item existe, mas não tem revisões"
+
+#~ msgid "Total: %(total)s"
+#~ msgstr "Total: %(total)s"
+
--- a/MoinMoin/translations/ru/LC_MESSAGES/messages.po	Wed Jul 18 00:42:48 2012 +0530
+++ b/MoinMoin/translations/ru/LC_MESSAGES/messages.po	Wed Jul 18 00:51:44 2012 +0530
@@ -3,7 +3,7 @@
 msgstr ""
 "Project-Id-Version: moin 2.0\n"
 "Report-Msgid-Bugs-To: Russian <moin-user@lists.sourceforge.net>\n"
-"POT-Creation-Date: 2011-07-10 21:27+0200\n"
+"POT-Creation-Date: 2012-07-15 23:32+0200\n"
 "PO-Revision-Date: 2011-12-04 17:55+0400\n"
 "Last-Translator: S Kinder <skinder0@gmail.com>\n"
 "Language-Team: Russian <moin-devel@lists.sourceforge.net>\n"
@@ -14,7 +14,49 @@
 "Content-Transfer-Encoding: 8bit\n"
 "Generated-By: Babel 0.9.6\n"
 
-#: MoinMoin/user.py:48
+#: MoinMoin/forms.py:37
+msgid "OpenID"
+msgstr "OpenID"
+
+#: MoinMoin/forms.py:37
+#, fuzzy
+msgid "OpenID address"
+msgstr "Ваш OpenID"
+
+#: MoinMoin/forms.py:39
+msgid "Your OpenID address"
+msgstr "Ваш OpenID"
+
+#: MoinMoin/forms.py:41
+msgid "E-Mail"
+msgstr "Адрес электронной почты"
+
+#: MoinMoin/forms.py:41
+#, fuzzy
+msgid "E-Mail address"
+msgstr "Адрес электронной почты"
+
+#: MoinMoin/forms.py:43
+msgid "Your E-Mail address"
+msgstr "Адрес Вашей электронной почты"
+
+#: MoinMoin/forms.py:45
+msgid "Password"
+msgstr "Пароль"
+
+#: MoinMoin/forms.py:56 MoinMoin/config/default.py:336
+msgid "Tags"
+msgstr "Теги"
+
+#: MoinMoin/forms.py:58
+msgid "Search Query"
+msgstr "Поиск"
+
+#: MoinMoin/forms.py:70
+msgid "OK"
+msgstr "OK"
+
+#: MoinMoin/user.py:54
 #, python-format
 msgid ""
 "Invalid user name '%(name)s'.\n"
@@ -25,16 +67,16 @@
 "Имя может содержать буквы и цифры любого языка, между словами - не более "
 "одного пробела. Нельзя использовать имя группы."
 
-#: MoinMoin/user.py:54
+#: MoinMoin/user.py:60
 msgid "This user name already belongs to somebody else."
 msgstr "Это имя уже занято."
 
-#: MoinMoin/user.py:60
+#: MoinMoin/user.py:68
 #, python-format
 msgid "Password not acceptable: %(msg)s"
 msgstr "Пароль не принят: %(msg)s"
 
-#: MoinMoin/user.py:72
+#: MoinMoin/user.py:78
 msgid ""
 "Please provide your email address. If you lose your login information, "
 "you can get it by email."
@@ -42,19 +84,15 @@
 "Пожалуйста, укажите Ваш почтовый адрес. Если Вы потеряете данные для "
 "аутентификации (входа в вики), Вы сможете получить их по почте."
 
-#: MoinMoin/user.py:78
+#: MoinMoin/user.py:84
 msgid "This email already belongs to somebody else."
 msgstr "Этот почтовый адрес уже кем-то используется."
 
-#: MoinMoin/user.py:83
+#: MoinMoin/user.py:90
 msgid "This OpenID already belongs to somebody else."
 msgstr "Этот OpenID уже кем-то используется."
 
-#: MoinMoin/user.py:726
-msgid "<unknown>"
-msgstr "<неизвестно>"
-
-#: MoinMoin/user.py:784
+#: MoinMoin/user.py:730
 #, python-format
 msgid ""
 "Somebody has requested to email you a password recovery link.\n"
@@ -75,59 +113,128 @@
 "Если Вы не забывали свой пароль, проигнорируйте это письмо.\n"
 "\n"
 
-#: MoinMoin/user.py:787
+#: MoinMoin/user.py:733
 #, python-format
 msgid "[%(sitename)s] Your wiki password recovery link"
 msgstr "[%(sitename)s] Ваша ссылка для восстановления пароля"
 
-#: MoinMoin/apps/admin/views.py:63
+#: MoinMoin/user.py:751
+#, fuzzy, python-format
+msgid ""
+"Somebody has created an account with this email address.\n"
+"\n"
+"Please use the link below to verify your email address:\n"
+"\n"
+"%(link)s\n"
+"\n"
+"If you didn't create this account, please ignore this email.\n"
+"\n"
+msgstr ""
+"Кто-то запросил отправку Вам ссылки для сброса пароля.\n"
+"\n"
+"Пожалуйста, пройдите по ссылке ниже, чтобы сменить ваш пароль:\n"
+"\n"
+"%(link)s\n"
+"\n"
+"Если Вы не забывали свой пароль, проигнорируйте это письмо.\n"
+"\n"
+
+#: MoinMoin/user.py:754
+#, python-format
+msgid "[%(sitename)s] Please verify your email address"
+msgstr ""
+
+#: MoinMoin/apps/admin/views.py:30
+msgid "Admin"
+msgstr ""
+
+#: MoinMoin/apps/admin/views.py:48
+#: MoinMoin/apps/admin/templates/admin/index.html:9
+msgid "User Browser"
+msgstr "Просмотр пользователей"
+
+#: MoinMoin/apps/admin/views.py:60
 #, python-format
 msgid "User profile of %(username)s: %(email)r"
 msgstr "Профиль пользователя %(username)s: %(email)r"
 
-#: MoinMoin/apps/admin/views.py:113
+#: MoinMoin/apps/admin/views.py:104
+#: MoinMoin/apps/admin/templates/admin/sysitems_upgrade.html:3
+msgid "System items upgrade"
+msgstr "Обновление системных объектов"
+
+#: MoinMoin/apps/admin/views.py:110
 #, python-format
 msgid "System items upgrade failed due to the following error: %(error)s."
 msgstr "Обновление системных объектов не удалось из-за следущей ошибки: %(error)s."
 
-#: MoinMoin/apps/admin/views.py:115
+#: MoinMoin/apps/admin/views.py:112
 msgid "System items have been upgraded successfully!"
 msgstr "Системные объекты успешно обновились!"
 
-#: MoinMoin/apps/admin/views.py:199
+#: MoinMoin/apps/admin/views.py:159
+#, fuzzy
+msgid "Wiki Configuration"
+msgstr "Конфигурация вики"
+
+#: MoinMoin/apps/admin/views.py:188
+#, fuzzy
+msgid "Wiki Configuration Help"
+msgstr "Конфигурация вики"
+
+#: MoinMoin/apps/admin/views.py:196
 msgid "Lexer description"
 msgstr "Описание лексера"
 
-#: MoinMoin/apps/admin/views.py:200
+#: MoinMoin/apps/admin/views.py:197
 msgid "Lexer names"
 msgstr "Имя лексера"
 
-#: MoinMoin/apps/admin/views.py:201
+#: MoinMoin/apps/admin/views.py:198
 msgid "File patterns"
 msgstr "Типы файлов"
 
-#: MoinMoin/apps/admin/views.py:202
+#: MoinMoin/apps/admin/views.py:199
 msgid "Mimetypes"
 msgstr "MIME-типы"
 
-#: MoinMoin/apps/admin/views.py:216
+#: MoinMoin/apps/admin/views.py:205
+#, fuzzy
+msgid "Highlighter Help"
+msgstr "подсветка"
+
+#: MoinMoin/apps/admin/views.py:213
 msgid "InterWiki name"
 msgstr "Имя ИнтерВики"
 
-#: MoinMoin/apps/admin/views.py:217
+#: MoinMoin/apps/admin/views.py:214
 msgid "URL"
 msgstr "URL"
 
-#: MoinMoin/apps/admin/views.py:229 MoinMoin/templates/history.html:13
+#: MoinMoin/apps/admin/views.py:218
+#, fuzzy
+msgid "Interwiki Help"
+msgstr "Имя ИнтерВики"
+
+#: MoinMoin/apps/admin/views.py:226 MoinMoin/converter/archive_in.py:59
+#: MoinMoin/templates/atom.html:8 MoinMoin/templates/diff_text_atom.html:9
+#: MoinMoin/templates/history.html:27
 msgid "Size"
 msgstr "Размер"
 
-#: MoinMoin/apps/admin/views.py:230
+#: MoinMoin/apps/admin/views.py:227 MoinMoin/templates/index.html:162
 msgid "Item name"
 msgstr "Имя объекта"
 
+#: MoinMoin/apps/admin/views.py:233
+#, fuzzy
+msgid "Item Size"
+msgstr "Размер окна редактирования"
+
 #: MoinMoin/apps/admin/templates/admin/highlighterhelp.html:4
 #: MoinMoin/apps/admin/templates/admin/index.html:20
+#: MoinMoin/apps/admin/templates/user/highlighterhelp.html:4
+#: MoinMoin/apps/admin/templates/user/index_user.html:9
 msgid "Available Highlighters"
 msgstr "Доступные варианты подстветки синтаксиса"
 
@@ -143,10 +250,6 @@
 msgid "Admin Menu"
 msgstr "Меню администрирования"
 
-#: MoinMoin/apps/admin/templates/admin/index.html:9
-msgid "User Browser"
-msgstr "Просмотр пользователей"
-
 #: MoinMoin/apps/admin/templates/admin/index.html:10
 #: MoinMoin/apps/admin/templates/admin/sysitems_upgrade.html:10
 msgid "Upgrade system items"
@@ -161,33 +264,36 @@
 msgstr "Показать помощь по конфигурации вики"
 
 #: MoinMoin/apps/admin/templates/admin/index.html:14
+#: MoinMoin/apps/admin/templates/user/index_user.html:3
 msgid "User Menu"
 msgstr "Пользовательское меню"
 
 #: MoinMoin/apps/admin/templates/admin/index.html:16
-#: MoinMoin/apps/frontend/views.py:588
+#: MoinMoin/apps/admin/templates/user/index_user.html:5
+#: MoinMoin/apps/frontend/views.py:903 MoinMoin/apps/frontend/views.py:905
 msgid "Wanted Items"
 msgstr "Требуемые объекты"
 
 #: MoinMoin/apps/admin/templates/admin/index.html:17
-#: MoinMoin/apps/frontend/views.py:636
+#: MoinMoin/apps/admin/templates/user/index_user.html:6
+#: MoinMoin/apps/frontend/views.py:919 MoinMoin/apps/frontend/views.py:922
 msgid "Orphaned Items"
 msgstr "Объекты-сироты"
 
 #: MoinMoin/apps/admin/templates/admin/index.html:18
 #: MoinMoin/apps/admin/templates/admin/itemsize.html:4
+#: MoinMoin/apps/admin/templates/user/index_user.html:7
+#: MoinMoin/apps/admin/templates/user/itemsize.html:4
 msgid "Item sizes (latest revision)"
 msgstr "Размеры объектов (последних версий)"
 
 #: MoinMoin/apps/admin/templates/admin/index.html:19
 #: MoinMoin/apps/admin/templates/admin/interwikihelp.html:4
+#: MoinMoin/apps/admin/templates/user/index_user.html:8
+#: MoinMoin/apps/admin/templates/user/interwikihelp.html:4
 msgid "Known InterWiki names"
 msgstr "Известные имена ИнтерВики"
 
-#: MoinMoin/apps/admin/templates/admin/sysitems_upgrade.html:3
-msgid "System items upgrade"
-msgstr "Обновление системных объектов"
-
 #: MoinMoin/apps/admin/templates/admin/sysitems_upgrade.html:5
 msgid ""
 "You can upgrade your system items by uploading an xml file with new items"
@@ -209,7 +315,7 @@
 msgstr "Адрес электронной почты"
 
 #: MoinMoin/apps/admin/templates/admin/userbrowser.html:8
-#: MoinMoin/templates/history.html:18
+#: MoinMoin/templates/history.html:32
 msgid "Actions"
 msgstr "Действия"
 
@@ -266,316 +372,431 @@
 msgid "Description"
 msgstr "Описание"
 
-#: MoinMoin/apps/feed/views.py:63
+#: MoinMoin/apps/feed/views.py:85
 msgid "MoinMoin feels unhappy."
 msgstr "МойнМойн плохо себя чувствует."
 
-#: MoinMoin/apps/frontend/views.py:114
-msgid "Search query too short."
-msgstr "Слишком короткий поисковой запрос."
+#: MoinMoin/apps/frontend/views.py:133
+#, fuzzy
+msgid "name"
+msgstr "Переименовать"
 
-#: MoinMoin/apps/frontend/views.py:125
-msgid "Search Query"
-msgstr "Поиск"
+#: MoinMoin/apps/frontend/views.py:134
+msgid "name_exact"
+msgstr ""
 
-#: MoinMoin/apps/frontend/views.py:126
+#: MoinMoin/apps/frontend/views.py:135
+msgid "itemid"
+msgstr ""
+
+#: MoinMoin/apps/frontend/views.py:136
+msgid "revid"
+msgstr ""
+
+#: MoinMoin/apps/frontend/views.py:137
+msgid "userid"
+msgstr ""
+
+#: MoinMoin/apps/frontend/views.py:138
+msgid "language"
+msgstr ""
+
+#: MoinMoin/apps/frontend/views.py:139
+msgid "itemlinks"
+msgstr ""
+
+#: MoinMoin/apps/frontend/views.py:140
+msgid "itemtransclusions"
+msgstr ""
+
+#: MoinMoin/apps/frontend/views.py:141
+msgid "refs"
+msgstr ""
+
+#: MoinMoin/apps/frontend/views.py:143 MoinMoin/search/__init__.py:29
+msgid "search also in non-current revisions"
+msgstr ""
+
+#: MoinMoin/apps/frontend/views.py:144 MoinMoin/apps/frontend/views.py:168
+#: MoinMoin/templates/lookup.html:6
+msgid "Lookup"
+msgstr ""
+
+#: MoinMoin/apps/frontend/views.py:227 MoinMoin/search/__init__.py:30
 msgid "Search"
 msgstr "Искать"
 
-#: MoinMoin/apps/frontend/views.py:308
-#: MoinMoin/templates/global_history.html:20 MoinMoin/templates/history.html:17
-msgid "Comment"
-msgstr "Комментарий"
-
-#: MoinMoin/apps/frontend/views.py:308
-msgid "Comment about your change"
-msgstr "Описание правки"
-
-#: MoinMoin/apps/frontend/views.py:309
-msgid "OK"
-msgstr "OK"
-
-#: MoinMoin/apps/frontend/views.py:312
+#: MoinMoin/apps/frontend/views.py:470
 msgid "Target"
 msgstr "Цель"
 
-#: MoinMoin/apps/frontend/views.py:312
+#: MoinMoin/apps/frontend/views.py:470
 msgid "The name of the target item"
 msgstr "Имя объекта"
 
-#: MoinMoin/apps/frontend/views.py:531
-msgid "Refers Here"
-msgstr "Ссылки сюда"
+#: MoinMoin/apps/frontend/views.py:486
+msgid "markup text"
+msgstr ""
 
-#: MoinMoin/apps/frontend/views.py:672 MoinMoin/apps/frontend/views.py:691
+#: MoinMoin/apps/frontend/views.py:487
+msgid "other text"
+msgstr ""
+
+#: MoinMoin/apps/frontend/views.py:488
+msgid "image"
+msgstr ""
+
+#: MoinMoin/apps/frontend/views.py:489
+msgid "audio"
+msgstr ""
+
+#: MoinMoin/apps/frontend/views.py:490
+msgid "video"
+msgstr ""
+
+#: MoinMoin/apps/frontend/views.py:491
+#, fuzzy
+msgid "other"
+msgstr "предыдущая версия"
+
+#: MoinMoin/apps/frontend/views.py:492
+#, fuzzy
+msgid "unknown"
+msgstr "<неизвестно>"
+
+#: MoinMoin/apps/frontend/views.py:493
+msgid "Filter"
+msgstr ""
+
+#: MoinMoin/apps/frontend/views.py:746 MoinMoin/config/default.py:335
+#: MoinMoin/templates/index.html:7 MoinMoin/templates/index.html:81
+msgid "Global Index"
+msgstr "Глобальный указатель"
+
+#: MoinMoin/apps/frontend/views.py:766 MoinMoin/apps/frontend/views.py:767
+msgid "My Changes"
+msgstr ""
+
+#: MoinMoin/apps/frontend/views.py:798
+#, fuzzy, python-format
+msgid "Items which refer to '%(item_name)s'"
+msgstr "Переименовать «%(item_name)s»"
+
+#: MoinMoin/apps/frontend/views.py:869 MoinMoin/config/default.py:334
+#: MoinMoin/templates/global_history.html:10
+msgid "Global History"
+msgstr "Глобальная история"
+
+#: MoinMoin/apps/frontend/views.py:932 MoinMoin/apps/frontend/views.py:951
 #, python-format
 msgid "You must login to use this action: %(action)s."
 msgstr "Вам необходимо войти, чтобы использовать действие %(action)s."
 
-#: MoinMoin/apps/frontend/views.py:675
+#: MoinMoin/apps/frontend/views.py:935
 msgid "A quicklink to this page could not be added for you."
 msgstr "Закладка на эту страницу не может быть добавлена для Вас."
 
-#: MoinMoin/apps/frontend/views.py:678
+#: MoinMoin/apps/frontend/views.py:938
 msgid "Your quicklink to this page could not be removed."
 msgstr "Ваша закладка на эту страницу не может быть удалена."
 
-#: MoinMoin/apps/frontend/views.py:693
+#: MoinMoin/apps/frontend/views.py:953
 msgid "You are not allowed to subscribe to an item you may not read."
 msgstr "Вы не можете подписаться на объект, который Вам нельзя читать."
 
-#: MoinMoin/apps/frontend/views.py:697
+#: MoinMoin/apps/frontend/views.py:957
 msgid "Can't remove regular expression subscription!"
 msgstr "Невозможно удалить подписку по регулярному выражению."
 
-#: MoinMoin/apps/frontend/views.py:698
+#: MoinMoin/apps/frontend/views.py:958
 msgid "Edit the subscription regular expressions in your settings."
 msgstr "Отредактируйте регулярные выражения подписки в ваших настройках."
 
-#: MoinMoin/apps/frontend/views.py:702
+#: MoinMoin/apps/frontend/views.py:962
 msgid "You could not get subscribed to this item."
 msgstr "Не удалось подписаться на этот объект."
 
-#: MoinMoin/apps/frontend/views.py:711 MoinMoin/apps/frontend/views.py:904
-#: MoinMoin/apps/frontend/views.py:1041
+#: MoinMoin/apps/frontend/views.py:971 MoinMoin/apps/frontend/views.py:1164
+#: MoinMoin/apps/frontend/views.py:1297
 msgid "The passwords do not match."
 msgstr "Пароли не совпадают."
 
-#: MoinMoin/apps/frontend/views.py:727 MoinMoin/apps/frontend/views.py:743
-#: MoinMoin/apps/frontend/views.py:863 MoinMoin/apps/frontend/views.py:922
-#: MoinMoin/apps/frontend/views.py:989 MoinMoin/apps/frontend/views.py:1107
-#: MoinMoin/templates/global_history.html:16 MoinMoin/templates/history.html:10
+#: MoinMoin/apps/frontend/views.py:987 MoinMoin/apps/frontend/views.py:1122
+#: MoinMoin/apps/frontend/views.py:1182 MoinMoin/apps/frontend/views.py:1249
+#: MoinMoin/apps/frontend/views.py:1362 MoinMoin/converter/archive_in.py:59
+#: MoinMoin/templates/history.html:24
 msgid "Name"
 msgstr "Имя"
 
-#: MoinMoin/apps/frontend/views.py:727 MoinMoin/apps/frontend/views.py:743
-#: MoinMoin/apps/frontend/views.py:1107
+#: MoinMoin/apps/frontend/views.py:987 MoinMoin/apps/frontend/views.py:1362
 msgid "The login name you want to use"
 msgstr "Имя, которое Вы хотите использовать при входе"
 
-#: MoinMoin/apps/frontend/views.py:728 MoinMoin/apps/frontend/views.py:729
-#: MoinMoin/apps/frontend/views.py:744 MoinMoin/apps/frontend/views.py:745
-#: MoinMoin/apps/frontend/views.py:990
-msgid "Password"
-msgstr "Пароль"
-
-#: MoinMoin/apps/frontend/views.py:728 MoinMoin/apps/frontend/views.py:744
-#: MoinMoin/apps/frontend/views.py:924 MoinMoin/apps/frontend/views.py:1065
+#: MoinMoin/apps/frontend/views.py:988 MoinMoin/apps/frontend/views.py:1184
+#: MoinMoin/apps/frontend/views.py:1323
 msgid "The login password you want to use"
 msgstr "Пароль, который Вы хотите использовать при входе"
 
-#: MoinMoin/apps/frontend/views.py:729 MoinMoin/apps/frontend/views.py:745
-#: MoinMoin/apps/frontend/views.py:925 MoinMoin/apps/frontend/views.py:1066
+#: MoinMoin/apps/frontend/views.py:989 MoinMoin/apps/frontend/views.py:1185
+#: MoinMoin/apps/frontend/views.py:1324
 msgid "Repeat the same password"
 msgstr "Повторите тот же пароль"
 
-#: MoinMoin/apps/frontend/views.py:730 MoinMoin/apps/frontend/views.py:747
-#: MoinMoin/apps/frontend/views.py:864 MoinMoin/apps/frontend/views.py:1073
-msgid "E-Mail"
-msgstr "Адрес электронной почты"
-
-#: MoinMoin/apps/frontend/views.py:730 MoinMoin/apps/frontend/views.py:747
-#: MoinMoin/apps/frontend/views.py:864 MoinMoin/apps/frontend/views.py:1073
-msgid "Your E-Mail address"
-msgstr "Адрес Вашей электронной почты"
-
-#: MoinMoin/apps/frontend/views.py:731 MoinMoin/apps/frontend/views.py:748
-#: MoinMoin/apps/frontend/views.py:991 MoinMoin/apps/frontend/views.py:1109
-msgid "OpenID"
-msgstr "OpenID"
-
-#: MoinMoin/apps/frontend/views.py:731 MoinMoin/apps/frontend/views.py:748
-#: MoinMoin/apps/frontend/views.py:1109
-msgid "Your OpenID address"
-msgstr "Ваш OpenID"
-
-#: MoinMoin/apps/frontend/views.py:732
-#: MoinMoin/templates/openid_register.html:21
+#: MoinMoin/apps/frontend/views.py:992 MoinMoin/apps/frontend/views.py:1031
 msgid "Register"
 msgstr "Зарегистрироваться"
 
-#: MoinMoin/apps/frontend/views.py:810 MoinMoin/apps/frontend/views.py:836
+#: MoinMoin/apps/frontend/views.py:1075
+msgid ""
+"Account verification required, please see the email we sent to your "
+"address."
+msgstr ""
+
+#: MoinMoin/apps/frontend/views.py:1077
+#, python-format
+msgid ""
+"An error occurred while sending the verification email: \"%(message)s\" "
+"Please contact an administrator to activate your account."
+msgstr ""
+
+#: MoinMoin/apps/frontend/views.py:1080
 msgid "Account created, please log in now."
 msgstr "Учетная запись создана, теперь Вы можете войти в систему."
 
-#: MoinMoin/apps/frontend/views.py:848
+#: MoinMoin/apps/frontend/views.py:1098
+#, fuzzy
+msgid "Your account has been activated, you can log in now."
+msgstr "Ваш пароль был изменен, теперь Вы можете войти в систему."
+
+#: MoinMoin/apps/frontend/views.py:1100 MoinMoin/apps/frontend/views.py:1209
+msgid "Your token is invalid!"
+msgstr "Строка сброса неверна."
+
+#: MoinMoin/apps/frontend/views.py:1107
 msgid "Your user name or your email address is needed."
 msgstr "Необходимо Ваше имя пользователя или адрес электронной почты."
 
-#: MoinMoin/apps/frontend/views.py:863 MoinMoin/apps/frontend/views.py:922
+#: MoinMoin/apps/frontend/views.py:1122 MoinMoin/apps/frontend/views.py:1182
 msgid "Your login name"
 msgstr "Ваше имя пользователя"
 
-#: MoinMoin/apps/frontend/views.py:865
+#: MoinMoin/apps/frontend/views.py:1124
 msgid "Recover password"
 msgstr "Восстановить пароль"
 
-#: MoinMoin/apps/frontend/views.py:894
+#: MoinMoin/apps/frontend/views.py:1132 MoinMoin/templates/lostpass.html:5
+msgid "Lost Password"
+msgstr "Забытый пароль"
+
+#: MoinMoin/apps/frontend/views.py:1154
 msgid "If this account exists, you will be notified."
 msgstr ""
 "Если данная учетная запись существует, то по связанному с ней почтовому "
 "адресу будет выслано оповещение."
 
-#: MoinMoin/apps/frontend/views.py:905 MoinMoin/apps/frontend/views.py:1043
+#: MoinMoin/apps/frontend/views.py:1165 MoinMoin/apps/frontend/views.py:1299
 msgid "New password is unacceptable, encoding trouble."
 msgstr "Новый пароль не может быть принят, проблема с преобразованием кодировок."
 
-#: MoinMoin/apps/frontend/views.py:923
+#: MoinMoin/apps/frontend/views.py:1183
 msgid "Recovery token"
 msgstr "Строка сброса пароля"
 
-#: MoinMoin/apps/frontend/views.py:923
+#: MoinMoin/apps/frontend/views.py:1183
 msgid "The recovery token that has been sent to you"
 msgstr "Строка сброса пароля, которая была отправлена Вам"
 
-#: MoinMoin/apps/frontend/views.py:924 MoinMoin/apps/frontend/views.py:1065
+#: MoinMoin/apps/frontend/views.py:1184 MoinMoin/apps/frontend/views.py:1323
 msgid "New password"
 msgstr "Новый пароль"
 
-#: MoinMoin/apps/frontend/views.py:925 MoinMoin/apps/frontend/views.py:1066
+#: MoinMoin/apps/frontend/views.py:1185 MoinMoin/apps/frontend/views.py:1324
 msgid "New password (repeat)"
 msgstr "Повторите новый пароль"
 
-#: MoinMoin/apps/frontend/views.py:926 MoinMoin/apps/frontend/views.py:1067
-#: MoinMoin/templates/usersettings.html:9
+#: MoinMoin/apps/frontend/views.py:1186 MoinMoin/apps/frontend/views.py:1325
+#: MoinMoin/templates/usersettings_forms.html:28
 msgid "Change password"
 msgstr "Поменять пароль"
 
-#: MoinMoin/apps/frontend/views.py:947
+#: MoinMoin/apps/frontend/views.py:1194 MoinMoin/templates/recoverpass.html:5
+msgid "Recover Password"
+msgstr "Восстановить пароль"
+
+#: MoinMoin/apps/frontend/views.py:1207
 msgid "Your password has been changed, you can log in now."
 msgstr "Ваш пароль был изменен, теперь Вы можете войти в систему."
 
-#: MoinMoin/apps/frontend/views.py:949
-msgid "Your token is invalid!"
-msgstr "Строка сброса неверна."
-
-#: MoinMoin/apps/frontend/views.py:961
+#: MoinMoin/apps/frontend/views.py:1221
 msgid "Either your username or password was invalid."
 msgstr "Неверное имя пользователя или пароль."
 
-#: MoinMoin/apps/frontend/views.py:962
+#: MoinMoin/apps/frontend/views.py:1222
 msgid "Failed to authenticate with this OpenID."
 msgstr "Ошибка при аутентификации с этим OpenID."
 
-#: MoinMoin/apps/frontend/views.py:1031
+#: MoinMoin/apps/frontend/views.py:1252
+msgid "Log in"
+msgstr "Войти"
+
+#: MoinMoin/apps/frontend/views.py:1260 MoinMoin/templates/layout.html:62
+msgid "Login"
+msgstr "Войти"
+
+#: MoinMoin/apps/frontend/views.py:1289
 msgid "You are now logged out."
 msgstr "Вы вышли."
 
-#: MoinMoin/apps/frontend/views.py:1042
+#: MoinMoin/apps/frontend/views.py:1298
 msgid "The current password was wrong."
 msgstr "Текущий пароль указан неверно."
 
-#: MoinMoin/apps/frontend/views.py:1064
+#: MoinMoin/apps/frontend/views.py:1322
 msgid "Current Password"
 msgstr "Текущий пароль"
 
-#: MoinMoin/apps/frontend/views.py:1064
+#: MoinMoin/apps/frontend/views.py:1322
 msgid "Your current login password"
 msgstr "Ваш текущий пароль"
 
-#: MoinMoin/apps/frontend/views.py:1074 MoinMoin/apps/frontend/views.py:1080
-#: MoinMoin/apps/frontend/views.py:1095 MoinMoin/apps/frontend/views.py:1118
-#: MoinMoin/apps/frontend/views.py:1128
+#: MoinMoin/apps/frontend/views.py:1330 MoinMoin/apps/frontend/views.py:1336
+#: MoinMoin/apps/frontend/views.py:1351 MoinMoin/apps/frontend/views.py:1373
+#: MoinMoin/apps/frontend/views.py:1384
+#: MoinMoin/templates/usersettings_forms.html:14
+#: MoinMoin/templates/usersettings_forms.html:42
+#: MoinMoin/templates/usersettings_forms.html:56
+#: MoinMoin/templates/usersettings_forms.html:67
+#: MoinMoin/templates/usersettings_forms.html:81
 msgid "Save"
 msgstr "Сохранить"
 
-#: MoinMoin/apps/frontend/views.py:1091
+#: MoinMoin/apps/frontend/views.py:1347
 msgid "Publish my email (not my wiki homepage) in author info"
 msgstr ""
 "Показывать мой почтовый адрес (вместо домашней страницы) в информации об "
 "авторе"
 
-#: MoinMoin/apps/frontend/views.py:1092
+#: MoinMoin/apps/frontend/views.py:1348
 msgid "Open editor on double click"
 msgstr "Открывать редактор по двойному щелчку"
 
-#: MoinMoin/apps/frontend/views.py:1093
+#: MoinMoin/apps/frontend/views.py:1349
 msgid "Show comment sections"
 msgstr "Показывать комментарии по умолчанию при загрузке страницы"
 
-#: MoinMoin/apps/frontend/views.py:1094
+#: MoinMoin/apps/frontend/views.py:1350
 msgid "Disable this account forever"
 msgstr "Заблокировать эту учетную запись навсегда"
 
-#: MoinMoin/apps/frontend/views.py:1108
+#: MoinMoin/apps/frontend/views.py:1357 MoinMoin/templates/usersettings.html:5
+#, fuzzy
+msgid "User Settings"
+msgstr "Настройки"
+
+#: MoinMoin/apps/frontend/views.py:1363
 msgid "Alias-Name"
 msgstr "Псевдоним"
 
-#: MoinMoin/apps/frontend/views.py:1108
+#: MoinMoin/apps/frontend/views.py:1363
 msgid "Your alias name (informational)"
 msgstr "Ваш псевдоним"
 
-#: MoinMoin/apps/frontend/views.py:1112
+#: MoinMoin/apps/frontend/views.py:1367
 msgid "Timezone"
 msgstr "Часовой пояс"
 
-#: MoinMoin/apps/frontend/views.py:1117
+#: MoinMoin/apps/frontend/views.py:1372
 msgid "Locale"
 msgstr "Язык"
 
-#: MoinMoin/apps/frontend/views.py:1125
+#: MoinMoin/apps/frontend/views.py:1380
 msgid "Theme name"
 msgstr "Тема оформления"
 
-#: MoinMoin/apps/frontend/views.py:1126
+#: MoinMoin/apps/frontend/views.py:1381
 msgid "User CSS URL"
 msgstr "URL пользовательского CSS"
 
-#: MoinMoin/apps/frontend/views.py:1126
+#: MoinMoin/apps/frontend/views.py:1381
 msgid "Give the URL of your custom CSS (optional)"
 msgstr "Ссылка на URL пользовательского CSS (опционально)"
 
-#: MoinMoin/apps/frontend/views.py:1127
+#: MoinMoin/apps/frontend/views.py:1382
 msgid "Editor size"
 msgstr "Размер окна редактирования"
 
-#: MoinMoin/apps/frontend/views.py:1127
+#: MoinMoin/apps/frontend/views.py:1382
 msgid "Editor textarea height (0=auto)"
 msgstr "Высота текстового поля (0=по умолчанию)"
 
-#: MoinMoin/apps/frontend/views.py:1156
+#: MoinMoin/apps/frontend/views.py:1383
+msgid "History results per page"
+msgstr ""
+
+#: MoinMoin/apps/frontend/views.py:1383
+msgid "Number of results per page (0=no paging)"
+msgstr ""
+
+#: MoinMoin/apps/frontend/views.py:1426
 msgid "Your password has been changed."
 msgstr "Ваш пароль был изменен."
 
-#: MoinMoin/apps/frontend/views.py:1161
+#: MoinMoin/apps/frontend/views.py:1431
 msgid "This openid is already in use."
 msgstr "Этот OpenID уже кем-то используется."
 
-#: MoinMoin/apps/frontend/views.py:1165
+#: MoinMoin/apps/frontend/views.py:1435
 msgid "This username is already in use."
 msgstr "Это имя пользователя уже кем-то используется"
 
-#: MoinMoin/apps/frontend/views.py:1171
+#: MoinMoin/apps/frontend/views.py:1441
 msgid "This email is already in use"
 msgstr "Этот адрес электронной почты уже кем-то используется"
 
-#: MoinMoin/apps/frontend/views.py:1209
+#: MoinMoin/apps/frontend/views.py:1456
+msgid ""
+"Your account has been disabled because you changed your email address. "
+"Please see the email we sent to your address to reactivate it."
+msgstr ""
+
+#: MoinMoin/apps/frontend/views.py:1463
+msgid ""
+"Your email address was not changed because sending the verification email"
+" failed. Please try again later."
+msgstr ""
+
+#: MoinMoin/apps/frontend/views.py:1469
+msgid "Your changes have been saved."
+msgstr ""
+
+#: MoinMoin/apps/frontend/views.py:1521
 msgid "You must log in to use bookmarks."
 msgstr "Вы должны войти, чтобы пользоваться закладками."
 
-#: MoinMoin/apps/frontend/views.py:1362 MoinMoin/config/default.py:374
-msgid "Items with similar names"
+#: MoinMoin/apps/frontend/views.py:1647
+#, fuzzy, python-format
+msgid "Items with similar names to '%(item_name)s'"
 msgstr "Объекты с похожими именами"
 
-#: MoinMoin/apps/frontend/views.py:1563
+#: MoinMoin/apps/frontend/views.py:1829 MoinMoin/apps/frontend/views.py:1856
 msgid "All tags in this wiki"
 msgstr "Все теги в этой вики"
 
-#: MoinMoin/apps/frontend/views.py:1575
+#: MoinMoin/apps/frontend/views.py:1870
 #, python-format
 msgid "Items tagged with %(tag)s"
 msgstr "Объекты с тегом %(tag)s"
 
-#: MoinMoin/auth/__init__.py:242 MoinMoin/auth/ldap_login.py:129
+#: MoinMoin/auth/__init__.py:244 MoinMoin/auth/ldap_login.py:130
 msgid "Missing password. Please enter user name and password."
 msgstr "Отсутствует пароль. Пожалуйста, введите имя пользователя и пароль."
 
-#: MoinMoin/auth/__init__.py:250 MoinMoin/auth/ldap_login.py:199
-#: MoinMoin/auth/ldap_login.py:245
+#: MoinMoin/auth/__init__.py:252 MoinMoin/auth/ldap_login.py:200
+#: MoinMoin/auth/ldap_login.py:248
 msgid "Invalid username or password."
 msgstr "Неправильное имя пользователя или пароль."
 
-#: MoinMoin/auth/__init__.py:254
+#: MoinMoin/auth/__init__.py:256
 #, python-format
 msgid ""
 "If you do not have an account, <a href=\"%(register_url)s\">you can "
@@ -584,59 +805,59 @@
 "Если у Вас нет учетной записи, <a href=\"%(register_url)s\">Вы можете "
 "создать ее сейчас</a>. "
 
-#: MoinMoin/auth/__init__.py:256
+#: MoinMoin/auth/__init__.py:258
 #, python-format
 msgid "<a href=\"%(recover_url)s\">Forgot your password?</a>"
 msgstr "<a href=\"%(recover_url)s\">Забыли пароль?</a>"
 
-#: MoinMoin/auth/http.py:62
+#: MoinMoin/auth/http.py:59
 msgid "Please log in first."
 msgstr "Пожалуйста, предварительно аутентифицируйтесь на вики."
 
-#: MoinMoin/auth/ldap_login.py:259
+#: MoinMoin/auth/ldap_login.py:262
 #, python-format
 msgid "LDAP server %(server)s failed."
 msgstr "LDAP-сервер %(server)s недоступен."
 
-#: MoinMoin/auth/openidrp.py:63
+#: MoinMoin/auth/openidrp.py:64
 msgid "OpenID Error"
 msgstr "Ошибка OpenID"
 
-#: MoinMoin/auth/openidrp.py:70
+#: MoinMoin/auth/openidrp.py:71
 msgid "OpenID verification cancelled."
 msgstr "Проверка OpenID прервана."
 
-#: MoinMoin/auth/openidrp.py:104
+#: MoinMoin/auth/openidrp.py:105
 msgid "This OpenID provider is not trusted."
 msgstr "Этот провайдер OpenID не является доверенным."
 
-#: MoinMoin/auth/openidrp.py:109
+#: MoinMoin/auth/openidrp.py:110
 msgid "OpenID failure."
 msgstr "Ошибка OpenID."
 
-#: MoinMoin/auth/openidrp.py:143
+#: MoinMoin/auth/openidrp.py:144
 msgid "Failed to resolve OpenID."
 msgstr "Ошибка при разрешении OpenID."
 
-#: MoinMoin/auth/openidrp.py:145
+#: MoinMoin/auth/openidrp.py:146
 msgid "OpenID discovery failure, not a valid OpenID."
 msgstr "Ошибка нахождения OpenID, OpenID не верный."
 
-#: MoinMoin/auth/openidrp.py:149
+#: MoinMoin/auth/openidrp.py:150
 msgid "No OpenID service at this URL."
 msgstr "По заданному адресу не найдено сервиса OpenID."
 
-#: MoinMoin/config/default.py:250
+#: MoinMoin/config/default.py:258
 msgid "Password is too short."
 msgstr "Пароль слишком короткий."
 
-#: MoinMoin/config/default.py:252
+#: MoinMoin/config/default.py:260
 msgid "Password has not enough different characters."
 msgstr ""
 "Слишком простой пароль — в пароле должно присутствовать больше разных "
 "символов."
 
-#: MoinMoin/config/default.py:258
+#: MoinMoin/config/default.py:266
 msgid ""
 "Password is too easy to guess (password contains name or name contains "
 "password)."
@@ -644,200 +865,211 @@
 "Слишком простой пароль — в пароле присутствует имя пользователя, либо "
 "пароль содержится в имени."
 
-#: MoinMoin/config/default.py:267
+#: MoinMoin/config/default.py:275
 msgid "Password is too easy to guess (keyboard sequence)."
 msgstr "Слишком простой пароль — клавиатурная последовательность."
 
-#: MoinMoin/config/default.py:327
+#: MoinMoin/config/default.py:333
 msgid "Home"
 msgstr "Домой"
 
-#: MoinMoin/config/default.py:327
+#: MoinMoin/config/default.py:333
 msgid "Home Page"
 msgstr "Домашняя страница"
 
-#: MoinMoin/config/default.py:328 MoinMoin/config/default.py:356
+#: MoinMoin/config/default.py:334 MoinMoin/config/default.py:362
 msgid "History"
 msgstr "История"
 
-#: MoinMoin/config/default.py:328 MoinMoin/templates/global_history.html:10
-msgid "Global History"
-msgstr "Глобальная история"
-
-#: MoinMoin/config/default.py:329 MoinMoin/config/default.py:361
-#: MoinMoin/config/default.py:362
+#: MoinMoin/config/default.py:335 MoinMoin/config/default.py:367
 msgid "Index"
 msgstr "Указатель"
 
-#: MoinMoin/config/default.py:329 MoinMoin/templates/global_index.html:4
-msgid "Global Index"
-msgstr "Глобальный указатель"
-
-#: MoinMoin/config/default.py:330
-msgid "Tags"
-msgstr "Теги"
-
-#: MoinMoin/config/default.py:330
+#: MoinMoin/config/default.py:336
 msgid "Global Tags Index"
 msgstr "Указатель глобальных тегов"
 
-#: MoinMoin/config/default.py:331
+#: MoinMoin/config/default.py:337 MoinMoin/templates/index.html:56
+#: MoinMoin/templates/index.html:132
 msgid "More"
 msgstr "Прочее"
 
-#: MoinMoin/config/default.py:331
+#: MoinMoin/config/default.py:337
 msgid "Administration & Docs"
 msgstr "Администрирование и документация"
 
-#: MoinMoin/config/default.py:354
+#: MoinMoin/config/default.py:360
 msgid "Show"
 msgstr "Показать"
 
-#: MoinMoin/config/default.py:355
+#: MoinMoin/config/default.py:361 MoinMoin/templates/index.html:33
 msgid "Download"
 msgstr "Загрузить"
 
-#: MoinMoin/config/default.py:356
+#: MoinMoin/config/default.py:362
 msgid "Revision History"
 msgstr "История изменений"
 
-#: MoinMoin/config/default.py:359 MoinMoin/templates/show.html:9
+#: MoinMoin/config/default.py:365 MoinMoin/templates/show.html:9
 msgid "Modify"
 msgstr "Изменить"
 
-#: MoinMoin/config/default.py:359
+#: MoinMoin/config/default.py:365
 msgid "Edit or Upload"
 msgstr "Править или загрузить"
 
-#: MoinMoin/config/default.py:361 MoinMoin/config/default.py:362
+#: MoinMoin/config/default.py:367
 msgid "List sub-items"
 msgstr "Список дочерних объектов"
 
-#: MoinMoin/config/default.py:363
+#: MoinMoin/config/default.py:368
 msgid "Comments"
 msgstr "Комментарии"
 
-#: MoinMoin/config/default.py:363
-msgid "Switch showing comments on or off"
-msgstr "Показать или скрыть комментарии"
+#: MoinMoin/config/default.py:368 MoinMoin/templates/common.js:70
+#, fuzzy
+msgid "Hide comments"
+msgstr "Комментарии"
 
-#: MoinMoin/config/default.py:364
+#: MoinMoin/config/default.py:369
+msgid "Transclusions"
+msgstr ""
+
+#: MoinMoin/config/default.py:369 MoinMoin/templates/common.js:104
+msgid "Show transclusions"
+msgstr ""
+
+#: MoinMoin/config/default.py:370
 msgid "Highlight"
 msgstr "Подсветка"
 
-#: MoinMoin/config/default.py:364
+#: MoinMoin/config/default.py:370
 msgid "Show with Syntax-Highlighting"
 msgstr "Показать с подстветкой синтаксиса"
 
-#: MoinMoin/config/default.py:365
+#: MoinMoin/config/default.py:371
 msgid "Meta"
 msgstr "Мета"
 
-#: MoinMoin/config/default.py:365
+#: MoinMoin/config/default.py:371
 msgid "Display Metadata"
 msgstr "Показать метаданные"
 
-#: MoinMoin/config/default.py:366
+#: MoinMoin/config/default.py:372
 msgid "Create or remove a navigation link to this item"
 msgstr "Добавить или удалить ссылку на объект в панель навигации"
 
-#: MoinMoin/config/default.py:367
+#: MoinMoin/config/default.py:373
 msgid "Switch notifications about item changes on or off"
 msgstr "Выключить или включить уведомления об изменениях объекта"
 
-#: MoinMoin/config/default.py:368
-msgid "Copy"
-msgstr "Копировать"
-
-#: MoinMoin/config/default.py:368
-msgid "Create a copy of this item"
-msgstr "Создать копию этого объекта"
-
-#: MoinMoin/config/default.py:369
+#: MoinMoin/config/default.py:374
 msgid "Rename"
 msgstr "Переименовать"
 
-#: MoinMoin/config/default.py:369
+#: MoinMoin/config/default.py:374
 msgid "Rename this item"
 msgstr "Переименовать этот объект"
 
-#: MoinMoin/config/default.py:370
+#: MoinMoin/config/default.py:375 MoinMoin/templates/index.html:37
 msgid "Delete"
 msgstr "Удалить"
 
-#: MoinMoin/config/default.py:370
-msgid "Move this item to the trash"
-msgstr "Переместить объект в корзину"
+#: MoinMoin/config/default.py:375
+#, fuzzy
+msgid "Delete this item"
+msgstr "Переименовать этот объект"
 
-#: MoinMoin/config/default.py:371
+#: MoinMoin/config/default.py:376 MoinMoin/templates/index.html:42
 msgid "Destroy"
 msgstr "Уничтожить"
 
-#: MoinMoin/config/default.py:371
+#: MoinMoin/config/default.py:376
 msgid "Completely destroy this item"
 msgstr "Полностью уничтожить этот объект"
 
-#: MoinMoin/config/default.py:372
+#: MoinMoin/config/default.py:377
 msgid "Referrers"
 msgstr "Ссылки"
 
-#: MoinMoin/config/default.py:372
+#: MoinMoin/config/default.py:377
 msgid "What refers here?"
 msgstr "Ссылки сюда"
 
-#: MoinMoin/config/default.py:373
+#: MoinMoin/config/default.py:378
 msgid "Site Map"
 msgstr "Карта сайта"
 
-#: MoinMoin/config/default.py:373
+#: MoinMoin/config/default.py:378
 msgid "Local Site Map of this item"
 msgstr "Карта окрестностей этого объекта"
 
-#: MoinMoin/config/default.py:374
+#: MoinMoin/config/default.py:379
 msgid "Similar"
 msgstr "Похожее"
 
-#: MoinMoin/converter/html_out.py:591
+#: MoinMoin/config/default.py:379
+msgid "Items with similar names"
+msgstr "Объекты с похожими именами"
+
+#: MoinMoin/converter/archive_in.py:59
+msgid "Date"
+msgstr ""
+
+#: MoinMoin/converter/html_out.py:539
+msgid "Link to this heading"
+msgstr ""
+
+#: MoinMoin/converter/html_out.py:605
 msgid "Contents"
 msgstr "Содержимое"
 
-#: MoinMoin/converter/macro.py:84
+#: MoinMoin/converter/macro.py:81
+msgid "Error: invalid macro name."
+msgstr ""
+
+#: MoinMoin/converter/macro.py:91 MoinMoin/converter/macro_Verbatim.py:68
 #, python-format
 msgid "<<%(macro_name)s: execution failed [%(error_msg)s] (see also the log)>>"
 msgstr ""
 "<<%(macro_name)s: выполнение завершилось с ошибкой «%(error_msg)s» (см. "
 "диагностику на сервере)>>"
 
-#: MoinMoin/converter/moinwiki_in.py:1032
+#: MoinMoin/converter/moinwiki_in.py:1034
 msgid "Error:"
 msgstr "Ошибка"
 
-#: MoinMoin/converter/moinwiki_in.py:1033
+#: MoinMoin/converter/moinwiki_in.py:1035
 msgid "is invalid within"
 msgstr "неверно в пределах"
 
-#: MoinMoin/converter/nonexistent_in.py:30
+#: MoinMoin/converter/nonexistent_in.py:31
 #, python-format
 msgid "%(item_name)s does not exist. Create it?"
 msgstr "Объект %(item_name)s не существет. Создать его?"
 
-#: MoinMoin/items/__init__.py:654
+#: MoinMoin/items/__init__.py:624
 msgid "Invalid JSON."
 msgstr "Неправильный JSON."
 
-#: MoinMoin/items/__init__.py:700 MoinMoin/items/__init__.py:1156
-#: MoinMoin/items/__init__.py:1353 MoinMoin/items/__init__.py:1445
-#: MoinMoin/items/__init__.py:1533
+#: MoinMoin/items/__init__.py:635 MoinMoin/templates/atom.html:12
+#: MoinMoin/templates/diff_text_atom.html:13 MoinMoin/templates/history.html:31
+msgid "Comment"
+msgstr "Комментарий"
+
+#: MoinMoin/items/__init__.py:635
+msgid "Comment about your change"
+msgstr "Описание правки"
+
+#: MoinMoin/items/__init__.py:669
 msgid "MetaData (JSON)"
 msgstr "Метаданные (JSON)"
 
-#: MoinMoin/items/__init__.py:701 MoinMoin/items/__init__.py:1158
-#: MoinMoin/items/__init__.py:1354 MoinMoin/items/__init__.py:1446
-#: MoinMoin/items/__init__.py:1534
+#: MoinMoin/items/__init__.py:670
 msgid "Upload file:"
 msgstr "Загрузить файл:"
 
-#: MoinMoin/items/__init__.py:735
+#: MoinMoin/items/__init__.py:740
 msgid ""
 "The items have the same data hash code (that means they very likely have "
 "the same data)."
@@ -845,245 +1077,323 @@
 "У объектов одинаковый хеш (скорее всего, в них содержится одинаковая "
 "информация)."
 
-#: MoinMoin/items/__init__.py:737
+#: MoinMoin/items/__init__.py:742
 msgid "The items have different data."
 msgstr "В объектах разные данные."
 
-#: MoinMoin/items/__init__.py:744
+#: MoinMoin/items/__init__.py:754
 #, python-format
 msgid "Impossible to convert the data to the contenttype: %(contenttype)s"
 msgstr "Невозможно перевести данные в тип %(contenttype)s"
 
-#: MoinMoin/items/__init__.py:1157
+#: MoinMoin/items/__init__.py:1120
 msgid "Type your text here"
 msgstr "Введите Ваш текст сюда"
 
-#: MoinMoin/items/__init__.py:1384 MoinMoin/items/__init__.py:1481
+#: MoinMoin/items/__init__.py:1359 MoinMoin/items/__init__.py:1427
 #, python-format
 msgid "Edit drawing %(filename)s (opens in new window)"
 msgstr "Изменить рисунок «%(filename)s» (откроется в новом окне)"
 
-#: MoinMoin/items/__init__.py:1399 MoinMoin/items/__init__.py:1498
+#: MoinMoin/items/__init__.py:1374 MoinMoin/items/__init__.py:1444
 #, python-format
 msgid "Clickable drawing: %(filename)s"
 msgstr "Рисунок, содержащий активные зоны: «%(filename)s»"
 
-#: MoinMoin/mail/sendmail.py:86
+#: MoinMoin/mail/sendmail.py:94
 msgid "No recipients, nothing to do"
 msgstr "Получатели не указаны, никаких действий не требуется."
 
-#: MoinMoin/mail/sendmail.py:162
+#: MoinMoin/mail/sendmail.py:170
 #, python-format
 msgid "Connection to mailserver '%(server)s' failed: %(reason)s"
 msgstr "Соединиться с почтовым сервером «%(server)s» не удалось: «%(reason)s»"
 
-#: MoinMoin/mail/sendmail.py:176
+#: MoinMoin/mail/sendmail.py:184
 msgid "Mail not sent"
 msgstr "Почта не отправлена."
 
-#: MoinMoin/mail/sendmail.py:179
+#: MoinMoin/mail/sendmail.py:187
 msgid "Mail sent successfully"
 msgstr "Почта отправлена."
 
-#: MoinMoin/security/textcha.py:159
+#: MoinMoin/search/__init__.py:17
+msgid "Search query too short."
+msgstr "Слишком короткий поисковой запрос."
+
+#: MoinMoin/security/textcha.py:158
 msgid "The entered TextCha was incorrect."
 msgstr "Введенная текстовая капча была неверной."
 
-#: MoinMoin/security/textcha.py:160
+#: MoinMoin/security/textcha.py:159
 msgid "The TextCha question is invalid or has expired. Please try again."
 msgstr "Текстовая капча неверна или просрочена. Попробуйте снова."
 
-#: MoinMoin/security/textcha.py:179
+#: MoinMoin/security/textcha.py:178
 msgid "TextCha"
 msgstr "Текстовая капча"
 
-#: MoinMoin/storage/error.py:42
-msgid "Permission denied!"
-msgstr "Доступ запрещен!"
-
-#: MoinMoin/storage/error.py:44
-msgid "You"
-msgstr "Вы"
+#: MoinMoin/templates/404.html:6
+#, fuzzy, python-format
+msgid "The item '%(item_name)s' does not exist."
+msgstr "Объект %(item_name)s не существет. Создать его?"
 
-#: MoinMoin/storage/error.py:46
-#, python-format
-msgid "%(username)s may not %(priv)s '%(item)s'."
-msgstr "%(username)s не может %(priv)s «%(item)s»."
+#: MoinMoin/templates/atom.html:4 MoinMoin/templates/diff_text_atom.html:5
+#: MoinMoin/templates/meta.html:12
+msgid "Revision"
+msgstr "Версия"
 
-#: MoinMoin/templates/copy.html:4
-#, python-format
-msgid "Copy '%(item_name)s'"
-msgstr "Копировать «%(item_name)s»"
+#: MoinMoin/templates/common.js:73
+#, fuzzy
+msgid "Show comments"
+msgstr "Показывать комментарии по умолчанию при загрузке страницы"
+
+#: MoinMoin/templates/common.js:107
+msgid "Hide transclusions"
+msgstr ""
 
 #: MoinMoin/templates/delete.html:4
 #, python-format
 msgid "Delete '%(item_name)s'"
 msgstr "Удалить «%(item_name)s»"
 
-#: MoinMoin/templates/destroy.html:5
+#: MoinMoin/templates/destroy.html:4
 #, python-format
 msgid "DESTROY COMPLETE item '%(item_name)s'"
 msgstr "УНИЧТОЖИТЬ ВЕСЬ объект «%(item_name)s»"
 
-#: MoinMoin/templates/destroy.html:17
-#, python-format
-msgid "DESTROY REVISION '%(item_name)s' (rev %(rev_no)d)"
-msgstr "УНИЧТОЖИТЬ ВЕРСИЮ «%(item_name)s» (вер. %(rev_no)d)"
+#: MoinMoin/templates/destroy.html:20
+#, fuzzy, python-format
+msgid "DESTROY REVISION '%(item_name)s' (rev %(rev_id)s)"
+msgstr "Вернуть «%(item_name)s» (вер. %(rev_no)d)"
 
 #: MoinMoin/templates/diff.html:4
-#, python-format
-msgid "Item: %(item_name)s (Diff between revision %(oldrevno)s and %(newrevno)s)"
-msgstr "Объект: %(item_name)s (Разница между версиями %(oldrevno)s и %(newrevno)s)"
-
-#: MoinMoin/templates/diff_text.html:28
-msgid "No older revision"
-msgstr "Нет более старых версий"
-
-#: MoinMoin/templates/diff_text.html:32
-msgid "Use older revision"
-msgstr "Использовать более старую версию"
+#, fuzzy, python-format
+msgid "Diff for '%(item_name)s'"
+msgstr "Копировать «%(item_name)s»"
 
 #: MoinMoin/templates/diff_text.html:34
-#, python-format
-msgid "Revision %(revno)d as of %(date_time)s"
-msgstr "Версия: %(revno)d на момент %(date_time)s"
-
-#: MoinMoin/templates/diff_text.html:37
-msgid "No newer revision"
-msgstr "Нет более новых версий"
-
-#: MoinMoin/templates/diff_text.html:41
-msgid "Use newer revision"
-msgstr "Использовать более новую версию"
-
-#: MoinMoin/templates/diff_text.html:75
 msgid "Deletions are marked like this."
 msgstr "Удаления помечены так."
 
-#: MoinMoin/templates/diff_text.html:76
+#: MoinMoin/templates/diff_text.html:35
 msgid "Additions are marked like this."
 msgstr "Добавления помечены так."
 
-#: MoinMoin/templates/diff_text.html:80 MoinMoin/templates/diff_text.html:81
+#: MoinMoin/templates/diff_text.html:39 MoinMoin/templates/diff_text.html:40
 msgid "Line"
 msgstr "Строка"
 
-#: MoinMoin/templates/global_history.html:14 MoinMoin/templates/history.html:12
-msgid "Timestamp"
-msgstr "Дата"
-
-#: MoinMoin/templates/global_history.html:15
-msgid "Action"
-msgstr "Действие"
+#: MoinMoin/templates/forms.html:158
+msgid "Upload"
+msgstr ""
 
-#: MoinMoin/templates/global_history.html:17 MoinMoin/templates/history.html:11
-msgid "Rev."
-msgstr "Вер."
+#: MoinMoin/templates/forms.html:159
+#, fuzzy
+msgid "Upload files"
+msgstr "Загрузить файл:"
 
-#: MoinMoin/templates/global_history.html:18 MoinMoin/templates/history.html:16
-msgid "Content-Type"
-msgstr "Content-Type"
+#: MoinMoin/templates/forms.html:164
+msgid "Start All"
+msgstr ""
 
-#: MoinMoin/templates/global_history.html:19 MoinMoin/templates/history.html:15
-msgid "Editor"
-msgstr "Редактор"
+#: MoinMoin/templates/forms.html:165
+msgid "Cancel All"
+msgstr ""
 
-#: MoinMoin/templates/highlight.html:4
+#: MoinMoin/templates/forms.html:169
+msgid "Start"
+msgstr ""
+
+#: MoinMoin/templates/forms.html:170 MoinMoin/templates/index.html:152
+#: MoinMoin/templates/index.html:170
+msgid "Cancel"
+msgstr ""
+
+#: MoinMoin/templates/global_history.html:19
+msgid "Set bookmark"
+msgstr ""
+
+#: MoinMoin/templates/global_history.html:49
+msgid "Delete bookmark"
+msgstr ""
+
+#: MoinMoin/templates/highlight.html:3
 #, python-format
 msgid "Syntax highlighting for Item: %(name)s"
 msgstr "Подсветка синтаксиса для объекта %(name)s"
 
-#: MoinMoin/templates/history.html:5
+#: MoinMoin/templates/history.html:4
 #, python-format
 msgid "History of '%(item_name)s'"
 msgstr "История «%(item_name)s»"
 
-#: MoinMoin/templates/history.html:35
+#: MoinMoin/templates/history.html:11
+msgid "Previous"
+msgstr ""
+
+#: MoinMoin/templates/history.html:14
+#, fuzzy
+msgid "Next"
+msgstr "Указатель"
+
+#: MoinMoin/templates/history.html:25
+msgid "Rev."
+msgstr "Вер."
+
+#: MoinMoin/templates/history.html:26
+msgid "Timestamp"
+msgstr "Дата"
+
+#: MoinMoin/templates/history.html:29
+msgid "Editor"
+msgstr "Редактор"
+
+#: MoinMoin/templates/history.html:30
+msgid "Content-Type"
+msgstr "Content-Type"
+
+#: MoinMoin/templates/history.html:51
 msgid "show"
 msgstr "показать"
 
-#: MoinMoin/templates/history.html:36
+#: MoinMoin/templates/history.html:52
 msgid "meta"
 msgstr "мета"
 
-#: MoinMoin/templates/history.html:37
+#: MoinMoin/templates/history.html:53
 msgid "download"
 msgstr "загрузить"
 
-#: MoinMoin/templates/history.html:38
+#: MoinMoin/templates/history.html:54
 msgid "highlight"
 msgstr "подсветка"
 
-#: MoinMoin/templates/history.html:39
+#: MoinMoin/templates/history.html:56
 msgid "revert"
 msgstr "возвратить"
 
-#: MoinMoin/templates/history.html:40
+#: MoinMoin/templates/history.html:59
 msgid "destroy"
 msgstr "уничтожить"
 
-#: MoinMoin/templates/index.html:4 MoinMoin/templates/index2.html:9
+#: MoinMoin/templates/index.html:5
 #, python-format
 msgid "Index of subitems of '%(item_name)s'"
 msgstr "Подобъекты объекта «%(item_name)s»"
 
-#: MoinMoin/templates/itemviews.html:30
+#: MoinMoin/templates/index.html:22
+msgid "Select All"
+msgstr ""
+
+#: MoinMoin/templates/index.html:32
+#, fuzzy
+msgid "New item"
+msgstr "Создать новый объект?"
+
+#: MoinMoin/templates/index.html:50
+msgid "Filter by content type"
+msgstr ""
+
+#: MoinMoin/templates/index.html:51
+msgid "items having unknown mime types"
+msgstr ""
+
+#: MoinMoin/templates/index.html:55
+#, fuzzy
+msgid "Toggle"
+msgstr "теги:"
+
+#: MoinMoin/templates/index.html:96
+msgid "Recently uploaded items"
+msgstr ""
+
+#: MoinMoin/templates/index.html:105 MoinMoin/templates/index.html:107
+msgid "All"
+msgstr ""
+
+#: MoinMoin/templates/index.html:144 MoinMoin/templates/index.html:157
+msgid "Close"
+msgstr ""
+
+#: MoinMoin/templates/index.html:145
+msgid "Please provide comment for this action"
+msgstr ""
+
+#: MoinMoin/templates/index.html:148
+msgid "Enter your comment"
+msgstr ""
+
+#: MoinMoin/templates/index.html:151
+msgid "Submit"
+msgstr ""
+
+#: MoinMoin/templates/index.html:158
+#, fuzzy
+msgid "Create new item"
+msgstr "Создать новый объект?"
+
+#: MoinMoin/templates/index.html:164 MoinMoin/templates/index.html:166
+msgid "Enter item name here"
+msgstr ""
+
+#: MoinMoin/templates/index.html:169
+msgid "Create"
+msgstr ""
+
+#: MoinMoin/templates/index.html:180
+msgid "(Drag and drop multiple files to this white area to upload them.)"
+msgstr ""
+
+#: MoinMoin/templates/itemviews.html:49
 msgid "Remove Link"
 msgstr "Убрать из закладок"
 
-#: MoinMoin/templates/itemviews.html:32
+#: MoinMoin/templates/itemviews.html:51
 msgid "Add Link"
 msgstr "Добавить в закладки"
 
-#: MoinMoin/templates/itemviews.html:41
+#: MoinMoin/templates/itemviews.html:61
 msgid "Unsubscribe"
 msgstr "Отписаться"
 
-#: MoinMoin/templates/itemviews.html:43
+#: MoinMoin/templates/itemviews.html:63
 msgid "Subscribe"
 msgstr "Подписаться"
 
-#: MoinMoin/templates/layout.html:46 MoinMoin/templates/usersettings.html:6
+#: MoinMoin/templates/layout.html:50
 msgid "Settings"
 msgstr "Настройки"
 
-#: MoinMoin/templates/layout.html:52
+#: MoinMoin/templates/layout.html:56
 msgid "Logout"
 msgstr "Выйти"
 
-#: MoinMoin/templates/layout.html:58
-msgid "Login"
-msgstr "Войти"
-
 #: MoinMoin/templates/login.html:9
 msgid "Moin login"
 msgstr "Аутентификация на вики"
 
-#: MoinMoin/templates/login.html:21 MoinMoin/templates/login.html:35
-msgid "Log in"
-msgstr "Войти"
-
-#: MoinMoin/templates/login.html:28
+#: MoinMoin/templates/login.html:25
 msgid "OpenID login"
 msgstr "Вход по OpenID"
 
-#: MoinMoin/templates/lostpass.html:5
-msgid "Lost Password"
-msgstr "Забытый пароль"
+#: MoinMoin/templates/lookup.html:30
+msgid "No results"
+msgstr ""
+
+#: MoinMoin/templates/lookup.html:32
+msgid "More than one result"
+msgstr ""
 
 #: MoinMoin/templates/lostpass.html:7
 msgid "Please note that you only need to fill out one form field."
 msgstr "Обратите внимание: вам необходимо заполнить только одно поле формы."
 
-#: MoinMoin/templates/meta.html:9
+#: MoinMoin/templates/meta.html:3
 #, python-format
 msgid "Metadata of '%(item_name)s'"
 msgstr "Метаданные «%(item_name)s»"
 
-#: MoinMoin/templates/meta.html:10
-msgid "Revision"
-msgstr "Версия"
-
 #: MoinMoin/templates/modify_anywikidraw.html:18
 #: MoinMoin/templates/modify_twikidraw.html:13
 msgid "NOTE:"
@@ -1127,23 +1437,70 @@
 "Этот объект (еще) не существует, но Вы можете создать его. Пожалуйста, "
 "выберите тип желаемого объекта."
 
+#: MoinMoin/templates/modify_text.html:9
+#, fuzzy
+msgid "Link to Subitem"
+msgstr "Список дочерних объектов"
+
+#: MoinMoin/templates/modify_text.html:9
+msgid "Link"
+msgstr ""
+
+#: MoinMoin/templates/modify_text.html:12
+msgid "Transclude Subitem"
+msgstr ""
+
+#: MoinMoin/templates/modify_text.html:12
+msgid "Transclude"
+msgstr ""
+
 #: MoinMoin/templates/openid_register.html:5 MoinMoin/templates/register.html:5
 msgid "Create Account"
 msgstr "Создать уетную запись"
 
-#: MoinMoin/templates/recoverpass.html:5
-msgid "Recover Password"
-msgstr "Восстановить пароль"
-
 #: MoinMoin/templates/rename.html:4
 #, python-format
 msgid "Rename '%(item_name)s'"
 msgstr "Переименовать «%(item_name)s»"
 
 #: MoinMoin/templates/revert.html:4
+#, fuzzy, python-format
+msgid "Revert '%(item_name)s' (rev %(rev_id)s)"
+msgstr "Вернуть «%(item_name)s» (вер. %(rev_no)d)"
+
+#: MoinMoin/templates/search.html:10
 #, python-format
-msgid "Revert '%(item_name)s' (rev %(rev_no)d)"
-msgstr "Вернуть «%(item_name)s» (вер. %(rev_no)d)"
+msgid "%(result_len)d results found (%(runtime).3f secs)."
+msgstr ""
+
+#: MoinMoin/templates/search.html:15
+#, python-format
+msgid "No results found (%(runtime).3f secs)."
+msgstr ""
+
+#: MoinMoin/templates/search.html:29
+#, python-format
+msgid "name term suggestions: %(termlist)s"
+msgstr ""
+
+#: MoinMoin/templates/search.html:30
+#, python-format
+msgid "content term suggestions: %(termlist)s"
+msgstr ""
+
+#: MoinMoin/templates/search.html:45 MoinMoin/templates/show.html:54
+#, python-format
+msgid "Summary: %(summary)s"
+msgstr ""
+
+#: MoinMoin/templates/search.html:51
+#, fuzzy, python-format
+msgid "Revision: %(revid)s Last Change: %(mtime)s"
+msgstr "Версия: %(revno)d на момент %(date_time)s"
+
+#: MoinMoin/templates/search.html:59
+msgid "You don't have read permission for this item."
+msgstr ""
 
 #: MoinMoin/templates/show.html:23
 msgid "older"
@@ -1161,19 +1518,15 @@
 msgid "no newer revision"
 msgstr "нет более новых версий"
 
-#: MoinMoin/templates/show.html:47
-msgid "This item exists, but it has no revisions."
-msgstr "Этот объект существует, но не имеет версий."
-
-#: MoinMoin/templates/show.html:72
+#: MoinMoin/templates/show.html:77
 msgid "modified"
 msgstr "изменен"
 
-#: MoinMoin/templates/show.html:73
+#: MoinMoin/templates/show.html:78
 msgid "by"
 msgstr "пользователем"
 
-#: MoinMoin/templates/show.html:74
+#: MoinMoin/templates/show.html:79
 msgid "tagged"
 msgstr "теги:"
 
@@ -1183,48 +1536,53 @@
 msgstr "КартаОкрестностей для %(item_name)s"
 
 #: MoinMoin/templates/usersettings.html:8
-#: MoinMoin/templates/usersettings.html:17
 msgid "Personal Settings"
 msgstr "Личные настройки"
 
-#: MoinMoin/templates/usersettings.html:10
-#: MoinMoin/templates/usersettings.html:47
+#: MoinMoin/templates/usersettings.html:13
+msgid "Change Password"
+msgstr "Сменить пароль"
+
+#: MoinMoin/templates/usersettings.html:18
 msgid "Notification Settings"
 msgstr "Настройки уведомлений"
 
-#: MoinMoin/templates/usersettings.html:11
-#: MoinMoin/templates/usersettings.html:59
+#: MoinMoin/templates/usersettings.html:23
 msgid "Wiki Appearance Settings"
 msgstr "Настройки внешнего вида вики"
 
-#: MoinMoin/templates/usersettings.html:12
-#: MoinMoin/templates/usersettings.html:73
+#: MoinMoin/templates/usersettings.html:28
 msgid "Navigation Settings"
 msgstr "Настройки навигации"
 
-#: MoinMoin/templates/usersettings.html:13
-#: MoinMoin/templates/usersettings.html:85
+#: MoinMoin/templates/usersettings.html:33
 msgid "Options"
 msgstr "Параметры"
 
-#: MoinMoin/templates/usersettings.html:33
-msgid "Change Password"
-msgstr "Сменить пароль"
+#: MoinMoin/templates/usersettings_forms.html:35
+msgid ""
+"Changing your email address requires you to verify it. A link will be "
+"sent to you."
+msgstr ""
 
-#: MoinMoin/templates/wanteds.html:7
-#, python-format
-msgid "Total: %(total)s"
-msgstr "Всего: %(total)s"
+#: MoinMoin/templates/utils.html:62
+msgid "Expand Subitem"
+msgstr ""
 
-#: MoinMoin/themes/__init__.py:54
+#: MoinMoin/templates/utils.html:79
+#, fuzzy
+msgid "Subitems"
+msgstr "Список дочерних объектов"
+
+#: MoinMoin/themes/__init__.py:57
 msgid "Access denied"
 msgstr "Доступ запрещен"
 
-#: MoinMoin/themes/__init__.py:55
+#: MoinMoin/themes/__init__.py:58
 msgid "You are not allowed to access this resource."
 msgstr "Вам запрещен доступ к этому ресурсу"
 
-#: MoinMoin/themes/__init__.py:286
+#: MoinMoin/themes/__init__.py:292
 msgid "anonymous"
 msgstr "анонимно"
 
@@ -1302,4 +1660,58 @@
 msgid "No argument named \"%(name)s\""
 msgstr "Нет параметров с именем «%(name)s»"
 
+#~ msgid "Refers Here"
+#~ msgstr "Ссылки сюда"
 
+#~ msgid "Switch showing comments on or off"
+#~ msgstr "Показать или скрыть комментарии"
+
+#~ msgid "Copy"
+#~ msgstr "Копировать"
+
+#~ msgid "Create a copy of this item"
+#~ msgstr "Создать копию этого объекта"
+
+#~ msgid "Move this item to the trash"
+#~ msgstr "Переместить объект в корзину"
+
+#~ msgid "Permission denied!"
+#~ msgstr "Доступ запрещен!"
+
+#~ msgid "You"
+#~ msgstr "Вы"
+
+#~ msgid "%(username)s may not %(priv)s '%(item)s'."
+#~ msgstr "%(username)s не может %(priv)s «%(item)s»."
+
+#~ msgid "DESTROY REVISION '%(item_name)s' (rev %(rev_no)d)"
+#~ msgstr "УНИЧТОЖИТЬ ВЕРСИЮ «%(item_name)s» (вер. %(rev_no)d)"
+
+#~ msgid ""
+#~ "Item: %(item_name)s (Diff between revision "
+#~ "%(oldrevno)s and %(newrevno)s)"
+#~ msgstr ""
+#~ "Объект: %(item_name)s (Разница между версиями"
+#~ " %(oldrevno)s и %(newrevno)s)"
+
+#~ msgid "No older revision"
+#~ msgstr "Нет более старых версий"
+
+#~ msgid "Use older revision"
+#~ msgstr "Использовать более старую версию"
+
+#~ msgid "No newer revision"
+#~ msgstr "Нет более новых версий"
+
+#~ msgid "Use newer revision"
+#~ msgstr "Использовать более новую версию"
+
+#~ msgid "Action"
+#~ msgstr "Действие"
+
+#~ msgid "This item exists, but it has no revisions."
+#~ msgstr "Этот объект существует, но не имеет версий."
+
+#~ msgid "Total: %(total)s"
+#~ msgstr "Всего: %(total)s"
+
--- a/MoinMoin/user.py	Wed Jul 18 00:42:48 2012 +0530
+++ b/MoinMoin/user.py	Wed Jul 18 00:51:44 2012 +0530
@@ -322,7 +322,10 @@
                     MAILTO_AUTHOR, SHOW_COMMENTS, RESULTS_PER_PAGE, EDIT_ON_DOUBLECLICK,
                     THEME_NAME, LOCALE, TIMEZONE, SUBSCRIBED_ITEMS, QUICKLINKS,
                    ]:
-            return self.profile[name]
+            try:
+                return self.profile[name]
+            except KeyError:
+                raise AttributeError(name)
         else:
             raise AttributeError(name)
 
--- a/setup.py	Wed Jul 18 00:42:48 2012 +0530
+++ b/setup.py	Wed Jul 18 00:51:44 2012 +0530
@@ -126,7 +126,9 @@
     message_extractors={
         '': [
             ('MoinMoin/templates/**.html', 'jinja2', None),
+            ('MoinMoin/templates/**.js', 'javascript', None),
             ('MoinMoin/apps/**/templates/**.html', 'jinja2', None),
+            ('MoinMoin/apps/**/templates/**.js', 'javascript', None),
             ('MoinMoin/**/_tests/**', 'ignore', None),
             ('MoinMoin/static/**', 'ignore', None),
             ('MoinMoin/**.py', 'python', None),