jspwiki-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ajaqu...@apache.org
Subject svn commit: r751135 [1/3] - in /incubator/jspwiki/trunk: ./ src/WebContent/ src/WebContent/WEB-INF/ src/WebContent/WEB-INF/classes/ src/WebContent/WEB-INF/classes/templates/ src/WebContent/scripts/ src/WebContent/templates/default/ src/WebContent/templ...
Date Fri, 06 Mar 2009 23:31:05 GMT
Author: ajaquith
Date: Fri Mar  6 23:31:03 2009
New Revision: 751135

URL: http://svn.apache.org/viewvc?rev=751135&view=rev
Log:
Checked in Stripsified Edit.jsp. Spam detection does NOT work yet. Attachment uploading now supports up to 5 uploads courtesy of Stripes. AttachmentServlet's days are numbered. Merged Janne's JCR checkins into my new code; some inconsistencies still need to be ironed out. "Sneak preview" has hereby been renamed "live preview".

Added:
    incubator/jspwiki/trunk/src/WebContent/templates/default/DefaultLayout.jsp
      - copied, changed from r746887, incubator/jspwiki/trunk/src/WebContent/templates/default/ViewLayout.jsp
Removed:
    incubator/jspwiki/trunk/src/WebContent/templates/default/EditLayout.jsp
    incubator/jspwiki/trunk/src/WebContent/templates/default/ViewLayout.jsp
    incubator/jspwiki/trunk/src/java/org/apache/wiki/ui/WikiJSPFilter.java
Modified:
    incubator/jspwiki/trunk/.classpath
    incubator/jspwiki/trunk/ChangeLog
    incubator/jspwiki/trunk/build.properties
    incubator/jspwiki/trunk/src/WebContent/Attachments.jsp
    incubator/jspwiki/trunk/src/WebContent/Comment.jsp
    incubator/jspwiki/trunk/src/WebContent/CreateProfile.jsp
    incubator/jspwiki/trunk/src/WebContent/Edit.jsp
    incubator/jspwiki/trunk/src/WebContent/EditGroup.jsp
    incubator/jspwiki/trunk/src/WebContent/Group.jsp
    incubator/jspwiki/trunk/src/WebContent/LoginForm.jsp
    incubator/jspwiki/trunk/src/WebContent/LostPassword.jsp
    incubator/jspwiki/trunk/src/WebContent/PageInfo.jsp
    incubator/jspwiki/trunk/src/WebContent/Preview.jsp
    incubator/jspwiki/trunk/src/WebContent/UserPreferences.jsp
    incubator/jspwiki/trunk/src/WebContent/WEB-INF/classes/CoreResources.properties
    incubator/jspwiki/trunk/src/WebContent/WEB-INF/classes/CoreResources_de.properties
    incubator/jspwiki/trunk/src/WebContent/WEB-INF/classes/CoreResources_es.properties
    incubator/jspwiki/trunk/src/WebContent/WEB-INF/classes/CoreResources_fi.properties
    incubator/jspwiki/trunk/src/WebContent/WEB-INF/classes/CoreResources_fr.properties
    incubator/jspwiki/trunk/src/WebContent/WEB-INF/classes/CoreResources_it.properties
    incubator/jspwiki/trunk/src/WebContent/WEB-INF/classes/CoreResources_nl.properties
    incubator/jspwiki/trunk/src/WebContent/WEB-INF/classes/CoreResources_ru.properties
    incubator/jspwiki/trunk/src/WebContent/WEB-INF/classes/CoreResources_zh_CN.properties
    incubator/jspwiki/trunk/src/WebContent/WEB-INF/classes/templates/default.properties
    incubator/jspwiki/trunk/src/WebContent/WEB-INF/classes/templates/default_de.properties
    incubator/jspwiki/trunk/src/WebContent/WEB-INF/classes/templates/default_es.properties
    incubator/jspwiki/trunk/src/WebContent/WEB-INF/classes/templates/default_fi.properties
    incubator/jspwiki/trunk/src/WebContent/WEB-INF/classes/templates/default_fr.properties
    incubator/jspwiki/trunk/src/WebContent/WEB-INF/classes/templates/default_it.properties
    incubator/jspwiki/trunk/src/WebContent/WEB-INF/classes/templates/default_nl.properties
    incubator/jspwiki/trunk/src/WebContent/WEB-INF/classes/templates/default_ru.properties
    incubator/jspwiki/trunk/src/WebContent/WEB-INF/classes/templates/default_zh_CN.properties
    incubator/jspwiki/trunk/src/WebContent/WEB-INF/web.xml
    incubator/jspwiki/trunk/src/WebContent/Wiki.jsp
    incubator/jspwiki/trunk/src/WebContent/scripts/jspwiki-edit.js
    incubator/jspwiki/trunk/src/WebContent/templates/default/AttachmentTab.jsp
    incubator/jspwiki/trunk/src/WebContent/templates/default/EditContent.jsp
    incubator/jspwiki/trunk/src/WebContent/templates/default/PreviewContent.jsp
    incubator/jspwiki/trunk/src/WebContent/templates/default/editors/plain.jsp
    incubator/jspwiki/trunk/src/WebContent/templates/default/jspwiki.css
    incubator/jspwiki/trunk/src/WebContent/templates/default/skins/OrderedList/skin.css
    incubator/jspwiki/trunk/src/WebContent/templates/default/skins/Smart/skin.css
    incubator/jspwiki/trunk/src/java/org/apache/wiki/action/AbstractPageActionBean.java
    incubator/jspwiki/trunk/src/java/org/apache/wiki/action/DeleteActionBean.java
    incubator/jspwiki/trunk/src/java/org/apache/wiki/action/EditActionBean.java
    incubator/jspwiki/trunk/src/java/org/apache/wiki/action/RenameActionBean.java
    incubator/jspwiki/trunk/src/java/org/apache/wiki/action/UploadActionBean.java
    incubator/jspwiki/trunk/src/java/org/apache/wiki/action/ViewActionBean.java
    incubator/jspwiki/trunk/src/java/org/apache/wiki/attachment/Attachment.java
    incubator/jspwiki/trunk/src/java/org/apache/wiki/attachment/AttachmentManager.java
    incubator/jspwiki/trunk/src/java/org/apache/wiki/attachment/AttachmentServlet.java
    incubator/jspwiki/trunk/src/java/org/apache/wiki/filters/SpamFilter.java
    incubator/jspwiki/trunk/src/java/org/apache/wiki/tags/IncludeResourcesTag.java
    incubator/jspwiki/trunk/src/java/org/apache/wiki/tags/RequestResourceTag.java
    incubator/jspwiki/trunk/src/java/org/apache/wiki/ui/EditorManager.java
    incubator/jspwiki/trunk/src/java/org/apache/wiki/ui/TemplateManager.java
    incubator/jspwiki/trunk/tests/java/org/apache/wiki/attachment/AttachmentManagerTest.java

Modified: incubator/jspwiki/trunk/.classpath
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/.classpath?rev=751135&r1=751134&r2=751135&view=diff
==============================================================================
--- incubator/jspwiki/trunk/.classpath (original)
+++ incubator/jspwiki/trunk/.classpath Fri Mar  6 23:31:03 2009
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
 	<classpathentry kind="src" path="src/java"/>
-	<classpathentry excluding="**/package.html" kind="src" output="build/testclasses" path="tests/java"/>
+	<classpathentry excluding="**/package.html" kind="src" output="build/tests/classes" path="tests/java"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
 	<classpathentry kind="con" path="org.eclipse.jst.server.core.container/org.eclipse.jst.server.tomcat.runtimeTarget/Apache Tomcat v5.5"/>
 	<classpathentry kind="con" path="org.eclipse.jst.j2ee.internal.web.container"/>

Modified: incubator/jspwiki/trunk/ChangeLog
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/ChangeLog?rev=751135&r1=751134&r2=751135&view=diff
==============================================================================
--- incubator/jspwiki/trunk/ChangeLog (original)
+++ incubator/jspwiki/trunk/ChangeLog Fri Mar  6 23:31:03 2009
@@ -1,3 +1,14 @@
+2009-02-22  Andrew Jaquith <ajaquith AT apache DOT org>
+
+        * 3.0.0-svn-81
+        
+        * Checked in Stripsified Edit.jsp. Spam detection does NOT
+        work yet. Attachment uploading now supports up to 5 uploads
+        courtesy of Stripes. AttachmentServlet's days are
+        numbered. Merged Janne's JCR checkins into my new code; some
+        inconsistencies still need to be ironed out. "Sneak preview"
+        has hereby been renamed "live preview".
+
 2009-03-06  Janne Jalkanen <jalkanen@apache.org>
 
         * 3.0.0-svn-80

Modified: incubator/jspwiki/trunk/build.properties
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/build.properties?rev=751135&r1=751134&r2=751135&view=diff
==============================================================================
--- incubator/jspwiki/trunk/build.properties (original)
+++ incubator/jspwiki/trunk/build.properties Fri Mar  6 23:31:03 2009
@@ -7,10 +7,10 @@
 #  jspwiki.properties-file when it is run.
 #
 @appname@=JSPWiki
-@pagedir@=/tmp/jspwiki/wikipages
-@logfile@=/tmp/jspwiki/logs/jspwiki.log
-@securitylog@=/tmp/jspwiki/logs/security.log
-@spamlog@=/tmp/jspwiki/logs/spamlog.log
+@pagedir@=/Users/arj/Library/Application Support/JSPWiki/repository
+@logfile@=/Users/arj/Library/Logs/JSPWiki/jspwiki.log
+@securitylog@=/Users/arj/Library/Logs/JSPWiki/security.log
+@spamlog@=/Users/arj/Library/Logs/JSPWiki/spamlog.log
 
 @tests.pagedir@=/tmp/testrepository
 @tests.workdir@=/tmp/testworkdir
@@ -28,7 +28,7 @@
 
 #  Set this property to 'true' if you want to build WARs
 #  that contain pre-compiled JSPs (which load faster).
-compile.jsps = true
+compile.jsps = false
 
 #  Enable these if you wish to create a static content tarball
 #  for use with Apache or another front-end web server.
@@ -50,20 +50,20 @@
 jdbc.admin.password=
 jdbc.user.id=jspwiki
 jdbc.user.password=password
+install.fulldir=/Users/arj/workspace/lib/tomcat/webapps
 
 #
 #  Running webtests
 #
 
 #  Which browser to use?
-#webtests.browser=*safari
+webtests.browser=*firefox
 #  if you run firefox, and it is not in your PATH, you can specify this :
 #webtests.browser=*firefox /usr/lib/firefox/firefox-2-bin
-webtests.browser=*firefox /tmp/ff/usr/lib/firefox/firefox-2-bin
 
 # For generating API diffs (you must have DependencyFinder installed)
 #dependencyfinder.dir=../lib/DependencyFinder
 #jarfile.old=../JSPWiki-2.6.3-src/build/JSPWiki.jar
 
 # Stripes migration
-#stripes.migrator.migrateForms=false
\ No newline at end of file
+stripes.migrator.migrateForms=true
\ No newline at end of file

Modified: incubator/jspwiki/trunk/src/WebContent/Attachments.jsp
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/WebContent/Attachments.jsp?rev=751135&r1=751134&r2=751135&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/WebContent/Attachments.jsp (original)
+++ incubator/jspwiki/trunk/src/WebContent/Attachments.jsp Fri Mar  6 23:31:03 2009
@@ -6,7 +6,7 @@
 <%@ page import="org.apache.wiki.attachment.*" %>
 <%@ page import="javax.servlet.jsp.jstl.fmt.*" %>
 <s:useActionBean beanclass="org.apache.wiki.action.ViewActionBean" event="attachments" executeResolution="true" id="wikiActionBean" />
-<s:layout-render name="/templates/default/ViewLayout.jsp">
+<s:layout-render name="/templates/default/DefaultLayout.jsp">
 
   <s:layout-component name="content">
     <wiki:NoSuchPage>

Modified: incubator/jspwiki/trunk/src/WebContent/Comment.jsp
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/WebContent/Comment.jsp?rev=751135&r1=751134&r2=751135&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/WebContent/Comment.jsp (original)
+++ incubator/jspwiki/trunk/src/WebContent/Comment.jsp Fri Mar  6 23:31:03 2009
@@ -16,10 +16,16 @@
 <%@ taglib uri="http://jakarta.apache.org/jspwiki.tld" prefix="wiki" %>
 <%@ taglib uri="http://java.sun.com/jsp/jstl/fmt" prefix="fmt" %>
 <%@ page import="javax.servlet.jsp.jstl.fmt.*" %>
-<%@ taglib uri="http://stripes.sourceforge.net/stripes.tld" prefix="stripes" %>
+<%@ taglib uri="http://stripes.sourceforge.net/stripes.tld" prefix="s" %>
 <%@ page import="org.apache.wiki.util.TextUtil" %>
 <%@ page import="org.apache.wiki.api.WikiPage" %>
-<stripes:useActionBean beanclass="org.apache.wiki.action.EditActionBean" event="comment" id="wikiActionBean" />
+<s:useActionBean beanclass="org.apache.wiki.action.EditActionBean" event="comment" id="wikiActionBean" />
+<s:layout-component name="head.title">
+  <fmt:message key="comment.title.comment">
+    <fmt:param><wiki:Variable var="ApplicationName" /></fmt:param>
+    <fmt:param><wiki:PageName/></fmt:param>
+  </fmt:message>
+</s:layout-component>
 <%!
     Logger log = LoggerFactory.getLogger("JSPWiki");
 

Modified: incubator/jspwiki/trunk/src/WebContent/CreateProfile.jsp
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/WebContent/CreateProfile.jsp?rev=751135&r1=751134&r2=751135&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/WebContent/CreateProfile.jsp (original)
+++ incubator/jspwiki/trunk/src/WebContent/CreateProfile.jsp Fri Mar  6 23:31:03 2009
@@ -1,6 +1,6 @@
 <%@ taglib uri="http://stripes.sourceforge.net/stripes.tld" prefix="stripes" %>
 <stripes:useActionBean beanclass="org.apache.wiki.action.UserProfileActionBean" event="create" id="wikiActionBean" />
-<stripes:layout-render name="/templates/default/ViewLayout.jsp">
+<stripes:layout-render name="/templates/default/DefaultLayout.jsp">
   <stripes:layout-component name="content">
     <jsp:include page="/templates/default/CreateProfileContent.jsp" />
   </stripes:layout-component>

Modified: incubator/jspwiki/trunk/src/WebContent/Edit.jsp
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/WebContent/Edit.jsp?rev=751135&r1=751134&r2=751135&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/WebContent/Edit.jsp (original)
+++ incubator/jspwiki/trunk/src/WebContent/Edit.jsp Fri Mar  6 23:31:03 2009
@@ -1,273 +1,25 @@
-<%@ page import="org.apache.wiki.log.Logger" %>
-<%@ page import="org.apache.wiki.log.LoggerFactory" %>
-<%@ page import="org.apache.wiki.*" %>
-<%@ page import="org.apache.wiki.filters.*" %>
-<%@ page import="java.util.*" %>
-<%@ page import="org.apache.wiki.htmltowiki.HtmlStringToWikiTranslator" %>
-<%@ page import="org.apache.wiki.ui.EditorManager" %>
-<%@ page import="org.apache.wiki.workflow.DecisionRequiredException" %>
-<%@ page import="org.apache.wiki.api.WikiPage" %>
-<%@ page errorPage="/Error.jsp" %>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/fmt" prefix="fmt" %>
 <%@ taglib uri="http://jakarta.apache.org/jspwiki.tld" prefix="wiki" %>
-<%@ taglib uri="http://stripes.sourceforge.net/stripes.tld" prefix="stripes" %>
-<%@ page import="org.apache.wiki.util.TextUtil" %>
-<stripes:useActionBean beanclass="org.apache.wiki.action.EditActionBean" event="edit" executeResolution="true" id="wikiActionBean" />
-
-<%!
-    Logger log = LoggerFactory.getLogger("JSPWiki");
-
-    String findParam( PageContext ctx, String key )
-    {
-        ServletRequest req = ctx.getRequest();
-
-        String val = req.getParameter( key );
-
-        if( val == null )
-        {
-            val = (String)ctx.findAttribute( key );
-        }
-
-        return val;
-    }
-%>
-
-<%
-    WikiEngine wiki = WikiEngine.getInstance( getServletConfig() );
-    // Create wiki context and check for authorization
-    WikiContext wikiContext = wiki.createContext( request, WikiContext.EDIT );
-    String pagereq = wikiContext.getPage().getName();
-
-    WikiSession wikiSession = wikiContext.getWikiSession();
-    String user = wikiSession.getUserPrincipal().getName();
-    String action  = request.getParameter("action");
-    String ok      = request.getParameter("ok");
-    String preview = request.getParameter("preview");
-    String cancel  = request.getParameter("cancel");
-    String append  = request.getParameter("append");
-    String edit    = request.getParameter("edit");
-    String author  = TextUtil.replaceEntities( findParam( pageContext, "author" ) );
-    String changenote = TextUtil.replaceEntities( findParam( pageContext, "changenote" ) );
-    String text    = EditorManager.getEditedText( pageContext );
-    String link    = TextUtil.replaceEntities( findParam( pageContext, "link") );
-    String spamhash = findParam( pageContext, SpamFilter.getHashFieldName(request) );
-    String captcha = (String)session.getAttribute("captcha");
-
-    if ( !wikiSession.isAuthenticated() && wikiSession.isAnonymous()
-         && author != null )
-    {
-        user  = TextUtil.replaceEntities( findParam( pageContext, "author" ) );
-    }
-
-    //
-    //  WYSIWYG editor sends us its greetings
-    //
-    String htmlText = findParam( pageContext, "htmlPageText" );
-    if( htmlText != null && cancel == null )
-    {
-        text = new HtmlStringToWikiTranslator().translate(htmlText,wikiContext);
-    }
-
-    WikiPage wikipage = wikiContext.getPage();
-    WikiPage latestversion = wiki.getPage( pagereq );
-
-    if( latestversion == null )
-    {
-        latestversion = wikiContext.getPage();
-    }
-
-    //
-    //  Set the response type before we branch.
-    //
-
-    response.setContentType("text/html; charset="+wiki.getContentEncoding() );
-    response.setHeader( "Cache-control", "max-age=0" );
-    response.setDateHeader( "Expires", new Date().getTime() );
-    response.setDateHeader( "Last-Modified", new Date().getTime() );
-
-    //log.debug("Request character encoding="+request.getCharacterEncoding());
-    //log.debug("Request content type+"+request.getContentType());
-    log.debug("preview="+preview+", ok="+ok);
-
-    if( ok != null || captcha != null )
-    {
-        log.info("Saving page "+pagereq+". User="+user+", host="+request.getRemoteAddr() );
-
-        //
-        //  Check for session expiry
-        //
-        
-        if( !SpamFilter.checkHash(wikiContext,pageContext) )
-        {
-            return;
-        }
-        
-        WikiPage modifiedPage = (WikiPage)wikiContext.getPage().clone();
-
-        //  FIXME: I am not entirely sure if the JSP page is the
-        //  best place to check for concurrent changes.  It certainly
-        //  is the best place to show errors, though.
-
-        String h = SpamFilter.getSpamHash( latestversion, request );
-
-        if( !h.equals(spamhash) )
-        {
-            //
-            // Someone changed the page while we were editing it!
-            //
-
-            log.info("Page changed, warning user.");
-
-            session.setAttribute( EditorManager.REQ_EDITEDTEXT, EditorManager.getEditedText(pageContext) );
-            response.sendRedirect( wiki.getURL(WikiContext.CONFLICT, pagereq, null, false) );
-            return;
-        }
-
-        //
-        //  We expire ALL locks at this moment, simply because someone has
-        //  already broken it.
-        //
-        PageLock lock = wiki.getPageManager().getCurrentLock( wikipage );
-        wiki.getPageManager().unlockPage( lock );
-        session.removeAttribute( "lock-"+pagereq );
-
-        //
-        //  Set author information and other metadata
-        //
-
-        modifiedPage.setAuthor( user );
-
-        if( changenote == null ) changenote = (String) session.getAttribute("changenote");
-
-        session.removeAttribute("changenote");
-
-        if( changenote != null && changenote.length() > 0 )
-        {
-            modifiedPage.setAttribute( WikiPage.CHANGENOTE, changenote );
-        }
-        else
-        {
-            modifiedPage.removeAttribute( WikiPage.CHANGENOTE );
-        }
-
-        //
-        //  Figure out the actual page text
-        //
-
-        if( text == null )
-        {
-            throw new ServletException( "No parameter text set!" );
-        }
-
-        //
-        //  If this is an append, then we just append it to the page.
-        //  If it is a full edit, then we will replace the previous contents.
-        //
-
-        try
-        {
-            wikiContext.setPage( modifiedPage );
-
-            if( captcha != null )
-            {
-                wikiContext.setVariable( "captcha", Boolean.TRUE );
-                session.removeAttribute( "captcha" );
-            }
-
-            if( append != null )
-            {
-                StringBuffer pageText = new StringBuffer(wiki.getText( pagereq ));
-
-                pageText.append( text );
-
-                wiki.saveText( wikiContext, pageText.toString() );
-            }
-            else
-            {
-                wiki.saveText( wikiContext, text );
-            }
-        }
-        catch( DecisionRequiredException ex )
-        {
-        	String redirect = wikiContext.getURL(WikiContext.VIEW,"ApprovalRequiredForPageChanges");
-            response.sendRedirect( redirect );
-            return;
-        }
-        catch( RedirectException ex )
-        {
-            // FIXME: Cut-n-paste code.
-            wikiContext.getWikiSession().addMessage( ex.getMessage() ); // FIXME: should work, but doesn't
-            session.setAttribute( "message", ex.getMessage() );
-            session.setAttribute(EditorManager.REQ_EDITEDTEXT,
-                                 EditorManager.getEditedText(pageContext));
-            session.setAttribute("author",user);
-            session.setAttribute("link",link != null ? link : "" );
-            if( htmlText != null ) session.setAttribute( EditorManager.REQ_EDITEDTEXT, text );
-
-            session.setAttribute("changenote", changenote != null ? changenote : "" );
-            session.setAttribute(SpamFilter.getHashFieldName(request), spamhash);
-            response.sendRedirect( ex.getRedirect() );
-            return;
-        }
-
-        response.sendRedirect(wiki.getViewURL(pagereq));
-        return;
-    }
-    else if( preview != null )
-    {
-        log.debug("Previewing "+pagereq);
-        session.setAttribute(EditorManager.REQ_EDITEDTEXT,
-                             EditorManager.getEditedText(pageContext));
-        session.setAttribute("author",user);
-        session.setAttribute("link",link != null ? link : "" );
-
-        if( htmlText != null ) session.setAttribute( EditorManager.REQ_EDITEDTEXT, text );
-
-        session.setAttribute("changenote", changenote != null ? changenote : "" );
-        response.sendRedirect( wiki.getURL(WikiContext.PREVIEW,pagereq,null,false) );
-        return;
-    }
-    else if( cancel != null )
-    {
-        log.debug("Cancelled editing "+pagereq);
-        PageLock lock = (PageLock) session.getAttribute( "lock-"+pagereq );
-
-        if( lock != null )
-        {
-            wiki.getPageManager().unlockPage( lock );
-            session.removeAttribute( "lock-"+pagereq );
-        }
-        response.sendRedirect( wiki.getViewURL(pagereq) );
-        return;
-    }
-
-    session.removeAttribute( EditorManager.REQ_EDITEDTEXT );
-
-    log.info("Editing page "+pagereq+". User="+user+", host="+request.getRemoteAddr() );
-
-    //
-    //  Determine and store the date the latest version was changed.  Since
-    //  the newest version is the one that is changed, we need to track
-    //  that instead of the edited version.
-    //
-    String lastchange = SpamFilter.getSpamHash( latestversion, request );
-
-    pageContext.setAttribute( "lastchange",
-                              lastchange,
-                              PageContext.REQUEST_SCOPE );
-
-    //
-    //  Attempt to lock the page.
-    //
-    PageLock lock = wiki.getPageManager().lockPage( wikipage,
-                                                    user );
-
-    if( lock != null )
-    {
-        session.setAttribute( "lock-"+pagereq, lock );
-    }
-
-    String contentPage = wiki.getTemplateManager().findJSP( pageContext,
-                                                            wikiContext.getTemplate(),
-                                                            "EditTemplate.jsp" );
-
-%><wiki:Include page="<%=contentPage%>" />
\ No newline at end of file
+<%@ taglib uri="http://stripes.sourceforge.net/stripes.tld" prefix="s" %>
+<s:useActionBean beanclass="org.apache.wiki.action.EditActionBean" event="edit" executeResolution="true" id="wikiActionBean" />
+<s:layout-render name="/templates/default/DefaultLayout.jsp">
+
+  <%-- Page title should say Edit: + pagename --%>
+  <s:layout-component name="head.title">
+    <fmt:message key="edit.title.edit">
+      <fmt:param><wiki:Variable var="ApplicationName" /></fmt:param>
+      <fmt:param><wiki:PageName/></fmt:param>
+    </fmt:message>
+  </s:layout-component>
+
+  <!-- Add Javascript for editors -->
+  <s:layout-component name="script">
+    <script type="text/javascript" src="<wiki:Link format='url' jsp='scripts/jspwiki-edit.js' />"></script>
+    <script type="text/javascript" src="<wiki:Link format='url' jsp='scripts/posteditor.js' />"></script>
+  </s:layout-component>
+
+  <s:layout-component name="content">
+    <jsp:include page="/templates/default/EditContent.jsp" />
+  </s:layout-component>
+  
+</s:layout-render>

Modified: incubator/jspwiki/trunk/src/WebContent/EditGroup.jsp
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/WebContent/EditGroup.jsp?rev=751135&r1=751134&r2=751135&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/WebContent/EditGroup.jsp (original)
+++ incubator/jspwiki/trunk/src/WebContent/EditGroup.jsp Fri Mar  6 23:31:03 2009
@@ -1,6 +1,6 @@
 <%@ taglib uri="http://stripes.sourceforge.net/stripes.tld" prefix="stripes" %>
 <stripes:useActionBean beanclass="org.apache.wiki.action.GroupActionBean" event="save" id="wikiActionBean" />
-<stripes:layout-render name="/templates/default/ViewLayout.jsp">
+<stripes:layout-render name="/templates/default/DefaultLayout.jsp">
   <stripes:layout-component name="content">
     <jsp:include page="/templates/default/EditGroupContent.jsp" />
   </stripes:layout-component>

Modified: incubator/jspwiki/trunk/src/WebContent/Group.jsp
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/WebContent/Group.jsp?rev=751135&r1=751134&r2=751135&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/WebContent/Group.jsp (original)
+++ incubator/jspwiki/trunk/src/WebContent/Group.jsp Fri Mar  6 23:31:03 2009
@@ -1,6 +1,6 @@
 <%@ taglib uri="http://stripes.sourceforge.net/stripes.tld" prefix="stripes" %>
 <stripes:useActionBean beanclass="org.apache.wiki.action.GroupActionBean" event="view" executeResolution="true" id="wikiActionBean" />
-<stripes:layout-render name="/templates/default/ViewLayout.jsp">
+<stripes:layout-render name="/templates/default/DefaultLayout.jsp">
   <stripes:layout-component name="content">
     <jsp:include page="/templates/default/GroupContent.jsp" />
   </stripes:layout-component>

Modified: incubator/jspwiki/trunk/src/WebContent/LoginForm.jsp
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/WebContent/LoginForm.jsp?rev=751135&r1=751134&r2=751135&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/WebContent/LoginForm.jsp (original)
+++ incubator/jspwiki/trunk/src/WebContent/LoginForm.jsp Fri Mar  6 23:31:03 2009
@@ -1,6 +1,6 @@
 <%@ taglib uri="http://stripes.sourceforge.net/stripes.tld" prefix="stripes" %>
 <stripes:useActionBean beanclass="org.apache.wiki.action.LoginActionBean" event="view" id="wikiActionBean" />
-<stripes:layout-render name="/templates/default/ViewLayout.jsp">
+<stripes:layout-render name="/templates/default/DefaultLayout.jsp">
   <stripes:layout-component name="content">
     <jsp:include page="/templates/default/LoginContent.jsp" />
   </stripes:layout-component>

Modified: incubator/jspwiki/trunk/src/WebContent/LostPassword.jsp
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/WebContent/LostPassword.jsp?rev=751135&r1=751134&r2=751135&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/WebContent/LostPassword.jsp (original)
+++ incubator/jspwiki/trunk/src/WebContent/LostPassword.jsp Fri Mar  6 23:31:03 2009
@@ -1,6 +1,6 @@
 <%@ taglib uri="http://stripes.sourceforge.net/stripes.tld" prefix="stripes" %>
 <stripes:useActionBean beanclass="org.apache.wiki.action.LoginActionBean" event="view" id="wikiActionBean" />
-<stripes:layout-render name="/templates/default/ViewLayout.jsp">
+<stripes:layout-render name="/templates/default/DefaultLayout.jsp">
   <stripes:layout-component name="content">
     <jsp:include page="/templates/default/LostPasswordContent.jsp" />
   </stripes:layout-component>

Modified: incubator/jspwiki/trunk/src/WebContent/PageInfo.jsp
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/WebContent/PageInfo.jsp?rev=751135&r1=751134&r2=751135&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/WebContent/PageInfo.jsp (original)
+++ incubator/jspwiki/trunk/src/WebContent/PageInfo.jsp Fri Mar  6 23:31:03 2009
@@ -1,7 +1,7 @@
 <%@ taglib uri="http://jakarta.apache.org/jspwiki.tld" prefix="wiki" %>
 <%@ taglib uri="http://stripes.sourceforge.net/stripes.tld" prefix="s" %>
 <s:useActionBean beanclass="org.apache.wiki.action.ViewActionBean" event="info" executeResolution="true" id="wikiActionBean" />
-<s:layout-render name="/templates/default/ViewLayout.jsp">
+<s:layout-render name="/templates/default/DefaultLayout.jsp">
 
   <s:layout-component name="content">
     <wiki:NoSuchPage>

Modified: incubator/jspwiki/trunk/src/WebContent/Preview.jsp
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/WebContent/Preview.jsp?rev=751135&r1=751134&r2=751135&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/WebContent/Preview.jsp (original)
+++ incubator/jspwiki/trunk/src/WebContent/Preview.jsp Fri Mar  6 23:31:03 2009
@@ -1,6 +1,6 @@
 <%@ taglib uri="http://stripes.sourceforge.net/stripes.tld" prefix="stripes" %>
-<stripes:useActionBean beanclass="org.apache.wiki.action.EditActionBean" event="preview" id="wikiActionBean" />
-<stripes:layout-render name="/templates/default/ViewLayout.jsp">
+<stripes:useActionBean beanclass="org.apache.wiki.action.EditActionBean" event="preview" executeResolution="true" id="wikiActionBean" />
+<stripes:layout-render name="/templates/default/DefaultLayout.jsp">
   <stripes:layout-component name="content">
     <jsp:include page="/templates/default/PreviewContent.jsp" />
   </stripes:layout-component>

Modified: incubator/jspwiki/trunk/src/WebContent/UserPreferences.jsp
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/WebContent/UserPreferences.jsp?rev=751135&r1=751134&r2=751135&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/WebContent/UserPreferences.jsp (original)
+++ incubator/jspwiki/trunk/src/WebContent/UserPreferences.jsp Fri Mar  6 23:31:03 2009
@@ -1,6 +1,6 @@
 <%@ taglib uri="http://stripes.sourceforge.net/stripes.tld" prefix="stripes" %>
 <stripes:useActionBean beanclass="org.apache.wiki.action.UserPreferencesActionBean" event="prefs" id="wikiActionBean" />
-<stripes:layout-render name="/templates/default/ViewLayout.jsp">
+<stripes:layout-render name="/templates/default/DefaultLayout.jsp">
   <stripes:layout-component name="content">
     <jsp:include page="/templates/default/PreferencesContent.jsp" />
   </stripes:layout-component>

Modified: incubator/jspwiki/trunk/src/WebContent/WEB-INF/classes/CoreResources.properties
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/WebContent/WEB-INF/classes/CoreResources.properties?rev=751135&r1=751134&r2=751135&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/WebContent/WEB-INF/classes/CoreResources.properties (original)
+++ incubator/jspwiki/trunk/src/WebContent/WEB-INF/classes/CoreResources.properties Fri Mar  6 23:31:03 2009
@@ -145,7 +145,7 @@
 # RSSImageLinkTag
 rss.title=RSS feed for page {0}
 # AttachmentManager
-attach.unwanted.file=Unwanted file name.
+attach.unwanted.file=Unwanted file name: {2}
 attach.empty.file=Empty file name given.
 attach.parent.not.exist=Parent page does not exist
 # VariableManager
@@ -234,7 +234,7 @@
 loginName=Login
 # Formerly login.password
 password=Password
-# Formerly login.remember
+#Copied from src/WebContent/WEB-INF/classes/templates/default.properties.. Formerly named editor.plain.remember.
 remember=Remember me?
 # Formerly login.submit.login
 login=Login
@@ -288,6 +288,23 @@
 #Copied from src/WebContent/WEB-INF/classes/templates/default.properties.. Formerly named attach.add.submit.
 org.apache.wiki.action.ViewActionBean.upload=Upload
 #Copied from src/WebContent/WEB-INF/classes/templates/default.properties.
-attach.add.selectfile=Select file:
+attach.add.selectfile=Select files:
 #Copied from src/WebContent/WEB-INF/classes/templates/default.properties.
-attach.add.changenote=Change Note:
+attach.add.changenote=Change note:
+attach.bad.filetype=File {2} cannot be uploaded to this wiki because it contains a file type we don't like
+#Copied from src/WebContent/WEB-INF/classes/templates/default.properties.
+edit.locked=User &#8220;{2}&#8221; has started to edit this page, but has not yet saved.  I won&#8217;t stop you from editing this page anyway, BUT be aware that the other person might be quite annoyed.  It would be courteous to wait for the lock to expire or until the person stops editing the page.  The lock expires in {3} minutes.
+#Copied from src/WebContent/WEB-INF/classes/templates/default.properties.
+edit.restoring=You are about to restore version {2}. Click on &#8220;Save&#8221; to restore.  You may also edit the page before restoring it.
+#Copied from src/WebContent/WEB-INF/classes/templates/default.properties.. Formerly named editor.plain.sneakpreview.
+livePreview=Live preview
+#Copied from src/WebContent/WEB-INF/classes/templates/default.properties.. Formerly named editor.plain.changenote.
+changenote=Change note
+#Copied from src/WebContent/WEB-INF/classes/templates/default.properties.. Formerly named editor.plain.name.
+author=Your <span class='accesskey'>n</span>ame
+#Copied from src/WebContent/WEB-INF/classes/templates/default.properties.. Formerly named editor.plain.save.submit.
+save=Save
+#Copied from src/WebContent/WEB-INF/classes/templates/default.properties.. Formerly named editor.plain.preview.submit.
+preview=Preview
+#Copied from src/WebContent/WEB-INF/classes/templates/default.properties.. Formerly named editor.plain.cancel.submit.
+cancel=Cancel

Modified: incubator/jspwiki/trunk/src/WebContent/WEB-INF/classes/CoreResources_de.properties
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/WebContent/WEB-INF/classes/CoreResources_de.properties?rev=751135&r1=751134&r2=751135&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/WebContent/WEB-INF/classes/CoreResources_de.properties (original)
+++ incubator/jspwiki/trunk/src/WebContent/WEB-INF/classes/CoreResources_de.properties Fri Mar  6 23:31:03 2009
@@ -238,8 +238,8 @@
 loginName=Benutzername
 # Formerly login.password
 password=Passwort
-# Formerly login.remember
-remember=Anmeldung merken?
+#Copied from src/WebContent/WEB-INF/classes/templates/default.properties.. Formerly named editor.plain.remember.
+remember=Cookies benutzen?
 # Formerly login.submit.login
 login=Anmeldung
 # Formerly login.lostpw.name, prefs.email
@@ -294,6 +294,22 @@
 attach.add.selectfile=Datei auswählen:
 #Copied from src/WebContent/WEB-INF/classes/templates/default.properties.
 attach.add.changenote=Kommentar:
+#Copied from src/WebContent/WEB-INF/classes/templates/default.properties.
+edit.locked=Der Benutzer {2} hat damit begonnen, diese Seite zu bearbeiten, aber hat sie noch nicht gespeichert. Du wirst nicht davon abgehalten die Seite weiter zu bearbeiten, aber bedenke, dass {3} nicht begeistert sein wird, wenn jemand anders die Seite zwischenzeitlich ändert. Es wäre höflicher zu warten bis derjenige fertig ist. Diese "Sperre" wird in {1} Minuten aufgehoben.
+#Copied from src/WebContent/WEB-INF/classes/templates/default.properties.
+edit.restoring=Soll die Version {2} wiederhergestellt werden? Falls ja, klicke auf 'Speichern'! Die Seite kann auch vorher noch bearbeitet werden.
+#Copied from src/WebContent/WEB-INF/classes/templates/default.properties.. Formerly named editor.plain.sneakpreview.
+livePreview=Schnellvorschau
+#Copied from src/WebContent/WEB-INF/classes/templates/default.properties.. Formerly named editor.plain.changenote.
+changenote=Kommentar:
+#Copied from src/WebContent/WEB-INF/classes/templates/default.properties.. Formerly named editor.plain.name.
+author=Dein <span class='accesskey'>N</span>ame
+#Copied from src/WebContent/WEB-INF/classes/templates/default.properties.. Formerly named editor.plain.save.submit.
+save=Speichern
+#Copied from src/WebContent/WEB-INF/classes/templates/default.properties.. Formerly named editor.plain.preview.submit.
+preview=Vorschau
+#Copied from src/WebContent/WEB-INF/classes/templates/default.properties.. Formerly named editor.plain.cancel.submit.
+cancel=Abbrechen
 # Outdated or superfluous properties since 3.0.0
 
 # folgende Properties sind in der aktuellen 'default en' Datei nicht enthalten

Modified: incubator/jspwiki/trunk/src/WebContent/WEB-INF/classes/CoreResources_es.properties
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/WebContent/WEB-INF/classes/CoreResources_es.properties?rev=751135&r1=751134&r2=751135&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/WebContent/WEB-INF/classes/CoreResources_es.properties (original)
+++ incubator/jspwiki/trunk/src/WebContent/WEB-INF/classes/CoreResources_es.properties Fri Mar  6 23:31:03 2009
@@ -163,6 +163,7 @@
 
 loginName=Nombre de inicio de sesión
 password=Contraseña
+#Copied from src/WebContent/WEB-INF/classes/templates/default.properties.. Formerly named editor.plain.remember.
 remember=&#191;Recordarme?
 login=Iniciar sesión
 email=Dirección E-mail
@@ -198,3 +199,19 @@
 attach.add.selectfile=Seleccione el archivo:
 #Copied from src/WebContent/WEB-INF/classes/templates/default.properties.
 attach.add.changenote=Nota de cambio:
+#Copied from src/WebContent/WEB-INF/classes/templates/default.properties.
+edit.locked=El usuario &#8220;{2}&#8221; ha empezado a editar esta página, pero aún no la ha guardado.  Aún así no voy a impedirte editar la página, PERO sé consciente de que la otra persona puede sentirse bastante molesta.  Lo educado sería esperar a que el bloqueo expire o hasta que la otra persona deje de editar la página.  El bloqueo terminará en {3} minutos.
+#Copied from src/WebContent/WEB-INF/classes/templates/default.properties.
+edit.restoring=Estás apunto de restaurar la versión {2}.  Haz click en &#8220;Guardar&#8221; para restaurarla.  También puedes editar la página antes de hacerlo.
+#Copied from src/WebContent/WEB-INF/classes/templates/default.properties.. Formerly named editor.plain.sneakpreview.
+livePreview=Vista rápida de la edición
+#Copied from src/WebContent/WEB-INF/classes/templates/default.properties.. Formerly named editor.plain.changenote.
+changenote=Nota de Cambio
+#Copied from src/WebContent/WEB-INF/classes/templates/default.properties.. Formerly named editor.plain.name.
+author=Tu <span class='accesskey'>n</span>ombre
+#Copied from src/WebContent/WEB-INF/classes/templates/default.properties.. Formerly named editor.plain.save.submit.
+save=Guardar
+#Copied from src/WebContent/WEB-INF/classes/templates/default.properties.. Formerly named editor.plain.preview.submit.
+preview=Previsualizar
+#Copied from src/WebContent/WEB-INF/classes/templates/default.properties.. Formerly named editor.plain.cancel.submit.
+cancel=Cancelar

Modified: incubator/jspwiki/trunk/src/WebContent/WEB-INF/classes/CoreResources_fi.properties
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/WebContent/WEB-INF/classes/CoreResources_fi.properties?rev=751135&r1=751134&r2=751135&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/WebContent/WEB-INF/classes/CoreResources_fi.properties (original)
+++ incubator/jspwiki/trunk/src/WebContent/WEB-INF/classes/CoreResources_fi.properties Fri Mar  6 23:31:03 2009
@@ -151,7 +151,8 @@
 
 loginName=Käyttäjätunnus
 password=Salasana
-remember=Muista minut?
+#Copied from src/WebContent/WEB-INF/classes/templates/default.properties.. Formerly named editor.plain.remember.
+remember=Muista minut
 login=Kirjaudu
 email=Sähköpostiosoite
 resetPassword=Lähetä uusi salasana!
@@ -186,3 +187,19 @@
 attach.add.selectfile=Valitse tiedosto:
 #Copied from src/WebContent/WEB-INF/classes/templates/default.properties.
 attach.add.changenote=Päivitystieto:
+#Copied from src/WebContent/WEB-INF/classes/templates/default.properties.
+edit.locked=Huppistakeikkaa! Käättäjä &quot;{2}&quot; on mennynnä muokkaamaan tätä sivua mutta ei oo vielä kehanna tallettaa.  Minen sinnuu estä, jos nyt väen vängällä tahonnii sivua mennä mulkkamahan, mutta suattaapi tuo toinen vähän hermostua. Jos nyt vielä viittisit vuottaa {3} minnuuttii, niin eiköpähän tuo ruojake sitten ole lopettanna.
+#Copied from src/WebContent/WEB-INF/classes/templates/default.properties.
+edit.restoring=Olet palauttamassa versiota {2}.  Paina &quot;Tallenna&quot; palauttaaksesi. Voit myös muokata sivua ennen kuin tallennat.
+#Copied from src/WebContent/WEB-INF/classes/templates/default.properties.. Formerly named editor.plain.sneakpreview.
+livePreview=Pikaesikatselu
+#Copied from src/WebContent/WEB-INF/classes/templates/default.properties.. Formerly named editor.plain.changenote.
+changenote=Päivitystieto
+#Copied from src/WebContent/WEB-INF/classes/templates/default.properties.. Formerly named editor.plain.name.
+author=Nimesi
+#Copied from src/WebContent/WEB-INF/classes/templates/default.properties.. Formerly named editor.plain.save.submit.
+save=Tallenna
+#Copied from src/WebContent/WEB-INF/classes/templates/default.properties.. Formerly named editor.plain.preview.submit.
+preview=Esikatsele
+#Copied from src/WebContent/WEB-INF/classes/templates/default.properties.. Formerly named editor.plain.cancel.submit.
+cancel=Peruuta

Modified: incubator/jspwiki/trunk/src/WebContent/WEB-INF/classes/CoreResources_fr.properties
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/WebContent/WEB-INF/classes/CoreResources_fr.properties?rev=751135&r1=751134&r2=751135&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/WebContent/WEB-INF/classes/CoreResources_fr.properties (original)
+++ incubator/jspwiki/trunk/src/WebContent/WEB-INF/classes/CoreResources_fr.properties Fri Mar  6 23:31:03 2009
@@ -164,6 +164,7 @@
 
 loginName=Identifiant
 password=Mot de passe
+#Copied from src/WebContent/WEB-INF/classes/templates/default.properties.. Formerly named editor.plain.remember.
 remember=Se souvenir de moi
 login=S'identifier
 email=Adresse e-mail
@@ -199,3 +200,20 @@
 attach.add.selectfile=Sélectionner le fichier :
 #Copied from src/WebContent/WEB-INF/classes/templates/default.properties.
 attach.add.changenote=Modifier la note :
+#Copied from src/WebContent/WEB-INF/classes/templates/default.properties.
+edit.locked=L''utilisateur \u201c{2}\u201d a commencé à éditer la page, mais ne l''a pas encore enregistrée. Rien ne vous empêche d''éditer cette page, MAIS sachez que vous risquez de beaucoup l''ennuyer ! Il serait plus courtois d''attendre que son verrou expire, ou de laisser {3} terminer ses modifications (ce verrou expire dans {1} minutes.)
+#Copied from src/WebContent/WEB-INF/classes/templates/default.properties.
+edit.restoring=Vous êtes sur le point de restaurer la version {2}. Cliquez sur \u201cEnregistrer\u201d pour restaurer. Vous pouvez aussi éditer la page avant de la restaurer.
+#Copied from src/WebContent/WEB-INF/classes/templates/default.properties.. Formerly named editor.plain.sneakpreview.
+livePreview=Aperçu rapide
+#Copied from src/WebContent/WEB-INF/classes/templates/default.properties.. Formerly named editor.plain.changenote.
+changenote=Note de changement
+#Copied from src/WebContent/WEB-INF/classes/templates/default.properties.. Formerly named editor.plain.name.
+author=Votre <span class='accesskey'>n</span>om
+#Copied from src/WebContent/WEB-INF/classes/templates/default.properties.. Formerly named editor.plain.save.submit.
+save=Enregistrer
+#Copied from src/WebContent/WEB-INF/classes/templates/default.properties.. Formerly named editor.plain.preview.submit.
+preview=Aperçu
+#Copied from src/WebContent/WEB-INF/classes/templates/default.properties.. Formerly named editor.plain.cancel.submit.
+cancel=Abandonner
+#Copied from src/WebContent/WEB-INF/classes/templates/default.properties.. Formerly named editor.plain.save.title.

Modified: incubator/jspwiki/trunk/src/WebContent/WEB-INF/classes/CoreResources_it.properties
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/WebContent/WEB-INF/classes/CoreResources_it.properties?rev=751135&r1=751134&r2=751135&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/WebContent/WEB-INF/classes/CoreResources_it.properties (original)
+++ incubator/jspwiki/trunk/src/WebContent/WEB-INF/classes/CoreResources_it.properties Fri Mar  6 23:31:03 2009
@@ -162,7 +162,8 @@
 
 loginName=Login nome
 password=Password
-remember=Ricordati di me?
+#Copied from src/WebContent/WEB-INF/classes/templates/default.properties.. Formerly named editor.plain.remember.
+remember=Ricorda?
 login=Login
 email=Indirizzo E-mail
 resetPassword=Cambia la password !
@@ -197,3 +198,20 @@
 attach.add.selectfile=Seleziona un file:
 #Copied from src/WebContent/WEB-INF/classes/templates/default.properties.
 attach.add.changenote=Nota alla modifica:
+#Copied from src/WebContent/WEB-INF/classes/templates/default.properties.
+edit.locked=L&#8217;utente &#8220;{2}&#8221; ha iniziato a modificare questa pagina, ma non l&#8217;ha ancora salvata. Puoi continuare a modificare, ma attenzione, l&#8217;altra persona potrebbe non esserne molto contenta ... Sarebbe estremamente cortese attendere cha abbia finito - o attendere almeno che scada il lock, tra {3} minuti.
+#Copied from src/WebContent/WEB-INF/classes/templates/default.properties.
+edit.restoring=Stai per ripristinare la versione {2}. Click su &#8220;Salva&#8221; per ripristinare.  Puoi anche modificare la pagina prima di ripristinarla.
+#Copied from src/WebContent/WEB-INF/classes/templates/default.properties.. Formerly named editor.plain.sneakpreview.
+livePreview=Anteprima
+#Copied from src/WebContent/WEB-INF/classes/templates/default.properties.. Formerly named editor.plain.changenote.
+changenote=Nota alla revisione
+#Copied from src/WebContent/WEB-INF/classes/templates/default.properties.. Formerly named editor.plain.name.
+author=Il tuo <span class='accesskey'>n</span>ome
+#Copied from src/WebContent/WEB-INF/classes/templates/default.properties.. Formerly named editor.plain.save.submit.
+save=Salva
+#Copied from src/WebContent/WEB-INF/classes/templates/default.properties.. Formerly named editor.plain.preview.submit.
+preview=Anteprima
+#Copied from src/WebContent/WEB-INF/classes/templates/default.properties.. Formerly named editor.plain.cancel.submit.
+cancel=Annulla
+#Copied from src/WebContent/WEB-INF/classes/templates/default.properties.. Formerly named editor.plain.save.title.

Modified: incubator/jspwiki/trunk/src/WebContent/WEB-INF/classes/CoreResources_nl.properties
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/WebContent/WEB-INF/classes/CoreResources_nl.properties?rev=751135&r1=751134&r2=751135&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/WebContent/WEB-INF/classes/CoreResources_nl.properties (original)
+++ incubator/jspwiki/trunk/src/WebContent/WEB-INF/classes/CoreResources_nl.properties Fri Mar  6 23:31:03 2009
@@ -196,39 +196,54 @@
 attach.add.selectfile=Selecteer een bestand:
 #Copied from src/WebContent/WEB-INF/classes/templates/default.properties.
 attach.add.changenote=Opmerking:
-
-converter.byte.outOfRange = De waarde ({1}) opgegeven in veld {0} is buiten het bereik van {2} tot {3}
-converter.creditCard.invalidCreditCard = De waarde ({1}) is geen geldig credit card number
-converter.date.invalidDate = De waarde ({1}) opgegeven in veld {0} moet een geldige datum zijn
-converter.email.invalidEmail = De opgegeven waarde ({1}) is geen geldig email address
-converter.enum.notAnEnumeratedValue = De waarde "{1}" is niet geldig voor veld {0}
-converter.float.outOfRange = De waarde ({1}) opgegeven in veld {0} is buiten het bereik van {2} tot {3}
-converter.integer.outOfRange = De waarde ({1}) opgegeven in veld {0} is buiten het bereik van {2} tot {3}
-converter.number.invalidNumber = De waarde ({1}) opgegeven in veld {0} moet een geldig getal zijn
-converter.short.outOfRange = De waarde ({1}) opgegeven in veld {0} is buiten het bereik van {2} tot {3}
-profile.nameCollision = The {0} is al in gebruik
-profile.noPasswordMatch = Wachtwoorde moeten gelijk zijn
-profile.saveError = Onverwacht probleem bij het opslaan van het profiel
-stripes.errors.afterError = </li>
-stripes.errors.beforeError = <li style="color: #b72222;">
-stripes.errors.footer = </ol>
-stripes.errors.header = <div style="color:#b72222; font-weight: bold">Gaarne de volgende fouten herstellen:</div><ol>
-stripes.fieldErrors.afterError = </span><br />
-stripes.fieldErrors.beforeError = <span style="color: #b72222;">
-stripes.fieldErrors.footer = 
-stripes.fieldErrors.header = 
-stripes.messages.afterMessage = </li>
-stripes.messages.beforeMessage = <li>
-stripes.messages.footer = </ul>
-stripes.messages.header = <ul class="messages">
-validation.expression.valueFailedExpression = De waarde opgegeven ({1}) voor veld {0} is ongeldig
-validation.file.postBodyTooBig = Totale upload size van {3} KB overschrijdt de maximaal toegestane waarde van {2} KB
-validation.mask.valueDoesNotMatch = <em>{1}</em> is geen geldig {0}
-validation.maxlength.valueTooLong = {0} dient meer dan {2} characters lang te zijn
-validation.maxvalue.valueAboveMaximum = De maximale waarde voor {0} is {2}
-validation.minlength.valueTooShort = {0} moet minimaal {2} characters lang zijn
-validation.minvalue.valueBelowMinimum = De minimale waarde voor {0} is {2}
-validation.required.valueNotPresent = {0} is een verplicht veld
-varmgr.dateformat.invalid.format = Geen geldig datum formaat opgegeven: 
-varmgr.dateformat.invalid.parm = Parameter niet herkend:
-version.invalid = Versie {1} bestaat niet.
\ No newline at end of file
+converter.byte.outOfRange=De waarde ({1}) opgegeven in veld {0} is buiten het bereik van {2} tot {3}
+converter.creditCard.invalidCreditCard=De waarde ({1}) is geen geldig credit card number
+converter.date.invalidDate=De waarde ({1}) opgegeven in veld {0} moet een geldige datum zijn
+converter.email.invalidEmail=De opgegeven waarde ({1}) is geen geldig email address
+converter.enum.notAnEnumeratedValue=De waarde "{1}" is niet geldig voor veld {0}
+converter.float.outOfRange=De waarde ({1}) opgegeven in veld {0} is buiten het bereik van {2} tot {3}
+converter.integer.outOfRange=De waarde ({1}) opgegeven in veld {0} is buiten het bereik van {2} tot {3}
+converter.number.invalidNumber=De waarde ({1}) opgegeven in veld {0} moet een geldig getal zijn
+converter.short.outOfRange=De waarde ({1}) opgegeven in veld {0} is buiten het bereik van {2} tot {3}
+profile.nameCollision=The {0} is al in gebruik
+profile.noPasswordMatch=Wachtwoorde moeten gelijk zijn
+profile.saveError=Onverwacht probleem bij het opslaan van het profiel
+stripes.errors.afterError=</li>
+stripes.errors.beforeError=<li style="color: #b72222;">
+stripes.errors.footer=</ol>
+stripes.errors.header=<div style="color:#b72222; font-weight: bold">Gaarne de volgende fouten herstellen:</div><ol>
+stripes.fieldErrors.afterError=</span><br />
+stripes.fieldErrors.beforeError=<span style="color: #b72222;">
+stripes.fieldErrors.footer=
+stripes.fieldErrors.header=
+stripes.messages.afterMessage=</li>
+stripes.messages.beforeMessage=<li>
+stripes.messages.footer=</ul>
+stripes.messages.header=<ul class="messages">
+validation.expression.valueFailedExpression=De waarde opgegeven ({1}) voor veld {0} is ongeldig
+validation.file.postBodyTooBig=Totale upload size van {3} KB overschrijdt de maximaal toegestane waarde van {2} KB
+validation.mask.valueDoesNotMatch=<em>{1}</em> is geen geldig {0}
+validation.maxlength.valueTooLong={0} dient meer dan {2} characters lang te zijn
+validation.maxvalue.valueAboveMaximum=De maximale waarde voor {0} is {2}
+validation.minlength.valueTooShort={0} moet minimaal {2} characters lang zijn
+validation.minvalue.valueBelowMinimum=De minimale waarde voor {0} is {2}
+validation.required.valueNotPresent={0} is een verplicht veld
+varmgr.dateformat.invalid.format=Geen geldig datum formaat opgegeven: 
+varmgr.dateformat.invalid.parm=Parameter niet herkend:
+version.invalid=Versie {1} bestaat niet.
+#Copied from src/WebContent/WEB-INF/classes/templates/default.properties.
+edit.locked=Gebruiker &#8220;{2}&#8221; bewerkt momenteel dit document. Als U wil kan U deze pagina toch wijzigen, MAAR weet dat de andere persoon dit misschien niet zal appreciëren.  Wees hoffelijk en wacht tot de pagina lock is verlopen of tot de andere persoon zijn bewerkingen heeft beëindigd.  De pagina lock verloopt na {3} minuten.
+#Copied from src/WebContent/WEB-INF/classes/templates/default.properties.
+edit.restoring=De actie herstelt versie {2} van deze pagina. Klik op &#8220;Bewaar&#8221; om te herstellen. U kan de pagina ook nog bewerken indien U dat wenst.
+#Copied from src/WebContent/WEB-INF/classes/templates/default.properties.. Formerly named editor.plain.sneakpreview.
+livePreview=Sneak Preview
+#Copied from src/WebContent/WEB-INF/classes/templates/default.properties.. Formerly named editor.plain.changenote.
+changenote=Opmerking
+#Copied from src/WebContent/WEB-INF/classes/templates/default.properties.. Formerly named editor.plain.name.
+author=Uw <span class='accesskey'>n</span>aam
+#Copied from src/WebContent/WEB-INF/classes/templates/default.properties.. Formerly named editor.plain.save.submit.
+save=Bewaar
+#Copied from src/WebContent/WEB-INF/classes/templates/default.properties.. Formerly named editor.plain.preview.submit.
+preview=Preview
+#Copied from src/WebContent/WEB-INF/classes/templates/default.properties.. Formerly named editor.plain.cancel.submit.
+cancel=Annuleer

Modified: incubator/jspwiki/trunk/src/WebContent/WEB-INF/classes/CoreResources_ru.properties
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/WebContent/WEB-INF/classes/CoreResources_ru.properties?rev=751135&r1=751134&r2=751135&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/WebContent/WEB-INF/classes/CoreResources_ru.properties (original)
+++ incubator/jspwiki/trunk/src/WebContent/WEB-INF/classes/CoreResources_ru.properties Fri Mar  6 23:31:03 2009
@@ -168,7 +168,8 @@
 
 loginName=\u041b\u043e\u0433\u0438\u043d
 password=\u041f\u0430\u0440\u043e\u043b\u044c
-remember=\u0417\u0430\u043f\u043e\u043c\u043d\u0438\u0442\u044c \u043c\u0435\u043d\u044f?
+#Copied from src/WebContent/WEB-INF/classes/templates/default.properties.. Formerly named editor.plain.remember.
+remember=\u0417\u0430\u043f\u043e\u043c\u043d\u0438\u0442\u044c?
 login=\u041b\u043e\u0433\u0438\u043d
 email=\u042d\u043b\u0435\u043a\u0442\u043e\u0440\u043d\u043d\u0430\u044f \u043f\u043e\u0447\u0442\u0430
 resetPassword=\u0421\u0431\u0440\u043e\u0441\u0438\u0442\u044c \u043f\u0430\u0440\u043e\u043b\u044c !
@@ -203,3 +204,19 @@
 attach.add.selectfile=\u0412\u044b\u0431\u0440\u0430\u0442\u044c \u0444\u0430\u0439\u043b:
 #Copied from src/WebContent/WEB-INF/classes/templates/default.properties.
 attach.add.changenote=\u0421\u0434\u0435\u043b\u0430\u043d\u044b\u0435 \u0438\u0441\u043f\u0440\u0430\u0432\u043b\u0435\u043d\u0438\u044f:
+#Copied from src/WebContent/WEB-INF/classes/templates/default.properties.
+edit.locked=\u041f\u043e\u043b\u044c\u0437\u043e\u0432\u0430\u0442\u0435\u043b\u044c &#8220;{2}&#8221; \u043d\u0430\u0447\u0430\u043b \u0440\u0435\u0434\u0430\u043a\u0442\u0438\u0440\u043e\u0432\u0430\u0442\u044c \u0441\u0442\u0440\u0430\u043d\u0438\u0446\u0443, \u043d\u043e \u0435\u0449\u0451 \u043d\u0435 \u0441\u043e\u0445\u0440\u0430\u043d\u0438\u043b \u0435\u0451. \u0421\u043e\u0432\u0435\u0442\u0443\u044e \u043d\u0435 \u0440\u0435\u0434\u0430\u043a\u0442\u0438\u0440\u043e\u0432\u0430\u0442\u044c\u0438 \u043f\u043e\u0434\u043e\u0436\u0434\u0430\u0442\u044c \u043f\u0440\u0438\u043c\u0435\u0440\u043d\u043e {3} \u043c\u0438\u043d\u0443\u0442. 
+#Copied from src/WebContent/WEB-INF/classes/templates/default.properties.
+edit.restoring=\u0412\u044b \u0445\u043e\u0442\u0438\u0442\u0435 \u0430\u043a\u0442\u0443\u0430\u043b\u0438\u0437\u0438\u0440\u043e\u0432\u0430\u0442\u044c \u0432\u0435\u0440\u0441\u0438\u044e  {2}. \u0414\u043b\u044f \u0441\u043e\u0445\u0440\u0430\u043d\u0435\u043d\u0438\u044f \u0432\u044b\u0431\u043e\u0440\u0430 \u043a\u043b\u0438\u043a\u043d\u0438\u0442\u0435 &#8220;\u0421\u043e\u0445\u0440\u0430\u043d\u0438\u0442\u044c&#8221;. \u0422\u0430\u043a\u0436\u0435 \u0432\u044b \u043c\u043e\u0436\u0435\u0442\u0435 \u0441\u043f\u0435\u0440\u0432\u0430 \u0435\u0451 \u043e\u0442\u0440\u0435\u0434\u0430\u043a\u0442\u0438\u0440\u043e\u0432\u0430\u0442\u044c. 
+#Copied from src/WebContent/WEB-INF/classes/templates/default.properties.. Formerly named editor.plain.sneakpreview.
+livePreview=\u041f\u0440\u0435\u0434\u0432\u0430\u0440\u0438\u0442\u0435\u043b\u044c\u043d\u044b\u0439 \u043f\u0440\u043e\u0441\u043c\u043e\u0442\u0440
+#Copied from src/WebContent/WEB-INF/classes/templates/default.properties.. Formerly named editor.plain.changenote.
+changenote=\u0418\u0437\u043c\u0438\u043d\u0435\u043d\u0438\u044f
+#Copied from src/WebContent/WEB-INF/classes/templates/default.properties.. Formerly named editor.plain.name.
+author=\u0412\u0430\u0448\u0435 <span class='accesskey'>\u0438</span>\u043c\u044f
+#Copied from src/WebContent/WEB-INF/classes/templates/default.properties.. Formerly named editor.plain.save.submit.
+save=\u0421\u043e\u0445\u0440\u0430\u043d\u0438\u0442\u044c
+#Copied from src/WebContent/WEB-INF/classes/templates/default.properties.. Formerly named editor.plain.preview.submit.
+preview=\u041f\u0440\u043e\u0441\u043c\u043e\u0442\u0440
+#Copied from src/WebContent/WEB-INF/classes/templates/default.properties.. Formerly named editor.plain.cancel.submit.
+cancel=\u041e\u0442\u043c\u0435\u043d\u0430

Modified: incubator/jspwiki/trunk/src/WebContent/WEB-INF/classes/CoreResources_zh_CN.properties
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/WebContent/WEB-INF/classes/CoreResources_zh_CN.properties?rev=751135&r1=751134&r2=751135&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/WebContent/WEB-INF/classes/CoreResources_zh_CN.properties (original)
+++ incubator/jspwiki/trunk/src/WebContent/WEB-INF/classes/CoreResources_zh_CN.properties Fri Mar  6 23:31:03 2009
@@ -235,7 +235,7 @@
 loginName=\u767b\u5f55\u540d
 # Formerly login.password
 password=\u5bc6\u7801
-# Formerly login.remember
+#Copied from src/WebContent/WEB-INF/classes/templates/default.properties.. Formerly named editor.plain.remember.
 remember=\u662f\u5426\u8bb0\u4f4f\u6211\u7684\u4fe1\u606f\uff1f
 # Formerly login.submit.login
 login=\u767b\u5f55
@@ -291,3 +291,20 @@
 attach.add.selectfile=\u9009\u62e9\u6587\u4ef6\uff1a
 #Copied from src/WebContent/WEB-INF/classes/templates/default.properties.
 attach.add.changenote=\u53d8\u66f4\u6ce8\u91ca\uff1a
+#Copied from src/WebContent/WEB-INF/classes/templates/default.properties.
+edit.locked=\u7528\u6237 <strong>{2}</strong> \u5df2\u5f00\u59cb\u7f16\u8f91\u8be5\u9875\u9762\uff0c\u4f46\u8fd8\u672a\u4fdd\u5b58\u3002\u6211\u4e0d\u4f1a\u963b\u6b62\u60a8\u7f16\u8f91\u8be5\u9875\u9762\uff0c\u4f46\u662f\u8981\u77e5\u9053\u5176\u4ed6\u4eba\u53ef\u80fd\u4f1a\u5f88\u70e6\u3002\u7b49\u5f85\u9501\u5b9a\u8fc7\u671f\u6216\u522b\u4eba\u505c\u6b62\u7f16\u8f91\uff0c\u8fd9\u6837\u4f1a\u6bd4\u8f83\u793c\u8c8c\u3002\u9501\u5b9a\u4f1a\u5728 {3} \u5206\u949f\u540e\u8fc7\u671f\u3002
+#Copied from src/WebContent/WEB-INF/classes/templates/default.properties.
+edit.restoring=\u5c06\u6062\u590d\u7248\u672c {2}\u3002\u5355\u51fb\u201c\u4fdd\u5b58\u201d\u6765\u8fdb\u884c\u6062\u590d\u3002\u4e5f\u53ef\u4ee5\u5728\u6062\u590d\u9875\u9762\u524d\u8fdb\u884c\u7f16\u8f91\u3002
+#Copied from src/WebContent/WEB-INF/classes/templates/default.properties.. Formerly named editor.plain.sneakpreview.
+livePreview=\u62a2\u5148\u9884\u89c8
+#Copied from src/WebContent/WEB-INF/classes/templates/default.properties.. Formerly named editor.plain.changenote.
+changenote=\u66f4\u6539\u6ce8\u91ca
+#Copied from src/WebContent/WEB-INF/classes/templates/default.properties.. Formerly named editor.plain.name.
+author=\u60a8\u7684\u540d\u79f0(<span class='accesskey'>N</span>)
+#Copied from src/WebContent/WEB-INF/classes/templates/default.properties.. Formerly named editor.plain.save.submit.
+save=\u4fdd\u5b58
+#Copied from src/WebContent/WEB-INF/classes/templates/default.properties.. Formerly named editor.plain.preview.submit.
+preview=\u9884\u89c8
+#Copied from src/WebContent/WEB-INF/classes/templates/default.properties.. Formerly named editor.plain.cancel.submit.
+cancel=\u53d6\u6d88
+#Copied from src/WebContent/WEB-INF/classes/templates/default.properties.. Formerly named editor.plain.save.title.

Modified: incubator/jspwiki/trunk/src/WebContent/WEB-INF/classes/templates/default.properties
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/WebContent/WEB-INF/classes/templates/default.properties?rev=751135&r1=751134&r2=751135&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/WebContent/WEB-INF/classes/templates/default.properties (original)
+++ incubator/jspwiki/trunk/src/WebContent/WEB-INF/classes/templates/default.properties Fri Mar  6 23:31:03 2009
@@ -42,10 +42,6 @@
 diff.goback=Back to {0}, or {1}
 diff.versionhistory={0} page info
 diff.nodiff=No difference detected.
-# EditContent.jsp
-
-edit.locked=User &#8220;{0}&#8221; has started to edit this page, but has not yet saved.  I won&#8217;t stop you from editing this page anyway, BUT be aware that the other person might be quite annoyed.  It would be courteous to wait for the lock to expire or until the person stops editing the page.  The lock expires in {1} minutes.
-edit.restoring=You are about to restore version {0}. Click on &#8220;Save&#8221; to restore.  You may also edit the page before restoring it.
 edit.tab.attachments=Attachments
 edit.tab.help=Help
 edit.tab.edit=Edit
@@ -375,18 +371,10 @@
 # 0 : Application Name
 # 1 : Page name
 view.title.view={0}: {1}
-# The built-in editors also have their localized strings in this file.
-
-editor.plain.name=Your <span class='accesskey'>n</span>ame
-editor.plain.remember=Remember me?
 editor.plain.email=Homepage or e<span class='accesskey'>m</span>ail
-editor.plain.save.submit=Save
 editor.plain.save.title=Save [ s ]
-editor.plain.preview.submit=Preview
 editor.plain.preview.title=Preview [ v ]
-editor.plain.cancel.submit=Cancel
 editor.plain.cancel.title=Cancel editing. Your changes will be lost. [ q ]
-editor.plain.changenote=Change Note
 editor.commentsignature=Comment signature
 editor.plain.toolbar=Toolbar
 editor.plain.find=Find
@@ -406,10 +394,7 @@
 editor.plain.smartpairs.title=Auto pairing of () [] {} &lt;&gt; &quot;&quot; &#39;&#39;
 editor.plain.tabcompletion=Tab Completion (keyword+Tab)
 editor.plain.tabcompletion.title=Auto expansion of keyword to Wiki Markup
-#editor.plain.editassist=Edit Assist
-#editor.plain.editassist.title=Toggle Edit Assist buttons
-editor.plain.sneakpreview=Sneak Preview
-editor.plain.sneakpreview.title=Sneak Preview. Click outside the textarea to refresh the sneak preview area.
+editor.plain.sneakpreview.title=Live Preview. The live preview will automatically update when you click outside the editor text area.
 editor.plain.tbLink.title=link - Insert wiki link
 editor.plain.tbH1.title=h1 - Insert heading1
 editor.plain.tbH2.title=h2 - Insert heading2

Modified: incubator/jspwiki/trunk/src/WebContent/WEB-INF/classes/templates/default_de.properties
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/WebContent/WEB-INF/classes/templates/default_de.properties?rev=751135&r1=751134&r2=751135&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/WebContent/WEB-INF/classes/templates/default_de.properties (original)
+++ incubator/jspwiki/trunk/src/WebContent/WEB-INF/classes/templates/default_de.properties Fri Mar  6 23:31:03 2009
@@ -55,10 +55,6 @@
 diff.goback=Zurück zu Version {0}, oder {1}
 diff.versionhistory=Seiteninformationen zu Version {0}
 diff.nodiff=Keine Unterschiede vorhanden.
-# EditContent.jsp
-
-edit.locked=Der Benutzer {0} hat damit begonnen, diese Seite zu bearbeiten, aber hat sie noch nicht gespeichert. Du wirst nicht davon abgehalten die Seite weiter zu bearbeiten, aber bedenke, dass {0} nicht begeistert sein wird, wenn jemand anders die Seite zwischenzeitlich ändert. Es wäre höflicher zu warten bis derjenige fertig ist. Diese "Sperre" wird in {1} Minuten aufgehoben.
-edit.restoring=Soll die Version {0} wiederhergestellt werden? Falls ja, klicke auf 'Speichern'! Die Seite kann auch vorher noch bearbeitet werden.
 edit.tab.attachments=Anhänge
 edit.tab.help=Hilfe
 edit.tab.edit=Bearbeiten
@@ -394,18 +390,10 @@
 # 0 : Application Name
 # 1 : Page name
 view.title.view={0}: {1}
-# The built-in editors also have their localized strings in this file.
-
-editor.plain.name=Dein <span class='accesskey'>N</span>ame
-editor.plain.remember=Cookies benutzen?
 editor.plain.email=Homepage oder E-<span class='accesskey'>M</span>ail
-editor.plain.save.submit=Speichern
 editor.plain.save.title=Speichern [ s ]
-editor.plain.preview.submit=Vorschau
 editor.plain.preview.title=Vorschau [ v ]
-editor.plain.cancel.submit=Abbrechen
 editor.plain.cancel.title=Bearbeiten abbrechen. Deine Änderungen gehen dabei verloren. [ q ]
-editor.plain.changenote=Kommentar:
 editor.commentsignature=Signatur
 editor.plain.toolbar=Werkzeugleiste
 editor.plain.find=Ersetze
@@ -425,7 +413,6 @@
 editor.plain.smartpairs.title=Automatische Paarbildung von () [] {} &lt;&gt; "" ''
 editor.plain.tabcompletion=Tab-Vervollständigung (Schlüsselwort+Tab)
 editor.plain.tabcompletion.title=Automatische Umwandlung von Schlüsselwörtern in Wiki-Markup
-editor.plain.sneakpreview=Schnellvorschau
 editor.plain.sneakpreview.title=Schnellvorschau. Klicke außerhalb des Textfeldes, um die Schnellvorschau zu aktualisieren.
 editor.plain.tbLink.title=link - einen Wiki-Link einfügen
 editor.plain.tbH1.title=h1 - Überschrift 1 einfügen

Modified: incubator/jspwiki/trunk/src/WebContent/WEB-INF/classes/templates/default_es.properties
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/WebContent/WEB-INF/classes/templates/default_es.properties?rev=751135&r1=751134&r2=751135&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/WebContent/WEB-INF/classes/templates/default_es.properties (original)
+++ incubator/jspwiki/trunk/src/WebContent/WEB-INF/classes/templates/default_es.properties Fri Mar  6 23:31:03 2009
@@ -41,10 +41,6 @@
 diff.goback=Atrás a {0}, o {1}
 diff.versionhistory={0} histórico de versiones
 diff.nodiff=No se detectaron diferencias.
-# EditContent.jsp
-
-edit.locked=El usuario &#8220;{0}&#8221; ha empezado a editar esta página, pero aún no la ha guardado.  Aún así no voy a impedirte editar la página, PERO sé consciente de que la otra persona puede sentirse bastante molesta.  Lo educado sería esperar a que el bloqueo expire o hasta que la otra persona deje de editar la página.  El bloqueo terminará en {1} minutos.
-edit.restoring=Estás apunto de restaurar la versión {0}.  Haz click en &#8220;Guardar&#8221; para restaurarla.  También puedes editar la página antes de hacerlo.
 edit.tab.attachments=Adjuntos
 edit.tab.help=Ayuda
 edit.tab.edit=Editar
@@ -372,18 +368,10 @@
 # 0 : Application Name
 # 1 : Page name
 view.title.view={0}: {1}
-# The built-in editors also have their localized strings in this file.
-
-editor.plain.name=Tu <span class='accesskey'>n</span>ombre
-editor.plain.remember=&#191;Recordarme?
 editor.plain.email=Página personal o e-<span class='accesskey'>m</span>ail
-editor.plain.save.submit=Guardar
 editor.plain.save.title=Guardar [ s ]
-editor.plain.preview.submit=Previsualizar
 editor.plain.preview.title=Previsualizar [ v ]
-editor.plain.cancel.submit=Cancelar
 editor.plain.cancel.title=Cancelar la edición. Tus cambios se perderán. [ q ]
-editor.plain.changenote=Nota de Cambio
 editor.commentsignature=Firma del comentario
 editor.plain.toolbar=Barra de herramientas
 editor.plain.find=Encontrar
@@ -403,9 +391,6 @@
 editor.plain.smartpairs.title=Auto emparejamiento de () [] {} &lt;&gt; &quot;&quot; &#39;&#39;
 editor.plain.tabcompletion=Autocompletado (palabra clave+Tab)
 editor.plain.tabcompletion.title=expansión de la palabra clave a marcado Wiki
-#editor.plain.editassist=Activar Asistente de Edición
-#editor.plain.editassist.title=Activar Asistente de Edición
-editor.plain.sneakpreview=Vista rápida de la edición
 editor.plain.sneakpreview.title=Vista rápida de la edición
 editor.plain.tbLink.title=enlace - Insertar enlace a página del wiki
 editor.plain.tbH1.title=h1 - Insertar encabezado1

Modified: incubator/jspwiki/trunk/src/WebContent/WEB-INF/classes/templates/default_fi.properties
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/WebContent/WEB-INF/classes/templates/default_fi.properties?rev=751135&r1=751134&r2=751135&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/WebContent/WEB-INF/classes/templates/default_fi.properties (original)
+++ incubator/jspwiki/trunk/src/WebContent/WEB-INF/classes/templates/default_fi.properties Fri Mar  6 23:31:03 2009
@@ -41,10 +41,6 @@
 diff.goback=Takaisin sivulle {0}, tai {1}
 diff.versionhistory={0} sivun tiedot
 diff.nodiff=Ei muutoksia havaittu
-# EditContent.jsp
-
-edit.locked=Huppistakeikkaa! Käättäjä &quot;{0}&quot; on mennynnä muokkaamaan tätä sivua mutta ei oo vielä kehanna tallettaa.  Minen sinnuu estä, jos nyt väen vängällä tahonnii sivua mennä mulkkamahan, mutta suattaapi tuo toinen vähän hermostua. Jos nyt vielä viittisit vuottaa {1} minnuuttii, niin eiköpähän tuo ruojake sitten ole lopettanna.
-edit.restoring=Olet palauttamassa versiota {0}.  Paina &quot;Tallenna&quot; palauttaaksesi. Voit myös muokata sivua ennen kuin tallennat.
 edit.tab.attachments=Liitteet
 edit.tab.help=Ohjeet
 edit.tab.edit=Muokkaus
@@ -362,18 +358,10 @@
 # 0 : Application Name
 # 1 : Page name
 view.title.view={0}: {1}
-# The built-in editors also have their localized strings in this file.
-
-editor.plain.name=Nimesi
-editor.plain.remember=Muista minut
 editor.plain.email=Kotisivu tai sähköposti
-editor.plain.save.submit=Tallenna
 editor.plain.save.title=Tallenna [s]
-editor.plain.preview.submit=Esikatsele
 editor.plain.preview.title=Esikatsele [v]
-editor.plain.cancel.submit=Peruuta
 editor.plain.cancel.title=Peruuta muokkaus.  Muutokset menetetään. [ q ]
-editor.plain.changenote=Päivitystieto
 editor.commentsignature=Kommentin allekirjoitus
 editor.plain.find=Etsi
 editor.plain.replace=Korvaa
@@ -425,7 +413,6 @@
 editor.plain.smartpairs.title=Automaattinen merkkien paritus () [] {} &lt;&gt; &quot;&quot; &#39;&#39;
 editor.plain.tabcompletion=Tabulaattoritäydennys (avainsana+Tab)
 editor.plain.tabcompletion.title=Täydentää automaattisesti avainsanoista oikean wikikielen
-editor.plain.sneakpreview=Pikaesikatselu
 editor.plain.toolbar=Työkalupalkki
 editor.plain.sneakpreview.title=Pikaesikatselu.  Klikkaa muokkainalueen ulkopuolelle niin esikatselu päivittyy.
 #  The Javascript stuff

Modified: incubator/jspwiki/trunk/src/WebContent/WEB-INF/classes/templates/default_fr.properties
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/WebContent/WEB-INF/classes/templates/default_fr.properties?rev=751135&r1=751134&r2=751135&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/WebContent/WEB-INF/classes/templates/default_fr.properties (original)
+++ incubator/jspwiki/trunk/src/WebContent/WEB-INF/classes/templates/default_fr.properties Fri Mar  6 23:31:03 2009
@@ -48,10 +48,6 @@
 diff.goback=Retour à {0} ou {1}
 diff.versionhistory=Infos sur la page {0}
 diff.nodiff=Aucune différence trouvée.
-# EditContent.jsp
-
-edit.locked=L''utilisateur \u201c{0}\u201d a commencé à éditer la page, mais ne l''a pas encore enregistrée. Rien ne vous empêche d''éditer cette page, MAIS sachez que vous risquez de beaucoup l''ennuyer ! Il serait plus courtois d''attendre que son verrou expire, ou de laisser {0} terminer ses modifications (ce verrou expire dans {1} minutes.)
-edit.restoring=Vous êtes sur le point de restaurer la version {0}. Cliquez sur \u201cEnregistrer\u201d pour restaurer. Vous pouvez aussi éditer la page avant de la restaurer.
 edit.tab.attachments=Attachements
 edit.tab.help=Aide
 edit.tab.edit=Editer
@@ -375,18 +371,10 @@
 # 0 : Application Name
 # 1 : Page name
 view.title.view={0} : {1}
-# The built-in editors also have their localized strings in this file.
-
-editor.plain.name=Votre <span class='accesskey'>n</span>om
-editor.plain.remember=Se souvenir de moi
 editor.plain.email=Page d'accueil ou adresse e-<span class='accesskey'>m</span>ail
-editor.plain.save.submit=Enregistrer
 editor.plain.save.title=Enregistrer [ s ]
-editor.plain.preview.submit=Aperçu
 editor.plain.preview.title=Aperçu [ p ]
-editor.plain.cancel.submit=Abandonner
 editor.plain.cancel.title=Abandonner l'édition. Vos modifications seront perdues. [ q ]
-editor.plain.changenote=Note de changement
 editor.commentsignature=Commenter la signature
 editor.plain.toolbar=Barre d'outils
 editor.plain.find=Trouver
@@ -406,9 +394,6 @@
 editor.plain.smartpairs.title=Auto pairage de () [] {} &lt;&gt; &quot;&quot; ''
 editor.plain.tabcompletion=Tab Completion (mot-clé+Tab)
 editor.plain.tabcompletion.title=Auto expansion de mots-clés vers le Wiki Markup
-#editor.plain.editassist=Assistant d\u0027\u00E9diteur
-#editor.plain.editassist.title=Basculer les boutons de l\u0027assistant d\u0027\u00E9diteur
-editor.plain.sneakpreview=Aperçu rapide
 editor.plain.sneakpreview.title=Aperçu rapide. Cliquez en dehors de la zone d'édition pour rafraîchir l'aperçu rapide.
 editor.plain.tbLink.title=link - Insérer un lien Wiki
 editor.plain.tbH1.title=h1 - Insérer un titre de niveau 1

Modified: incubator/jspwiki/trunk/src/WebContent/WEB-INF/classes/templates/default_it.properties
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/WebContent/WEB-INF/classes/templates/default_it.properties?rev=751135&r1=751134&r2=751135&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/WebContent/WEB-INF/classes/templates/default_it.properties (original)
+++ incubator/jspwiki/trunk/src/WebContent/WEB-INF/classes/templates/default_it.properties Fri Mar  6 23:31:03 2009
@@ -44,10 +44,6 @@
 diff.goback=Indietro a {0}, o {1}
 diff.versionhistory={0} info della pagina
 diff.nodiff=Nessuna differenza trovata.
-# EditContent.jsp
-
-edit.locked=L&#8217;utente &#8220;{0}&#8221; ha iniziato a modificare questa pagina, ma non l&#8217;ha ancora salvata. Puoi continuare a modificare, ma attenzione, l&#8217;altra persona potrebbe non esserne molto contenta ... Sarebbe estremamente cortese attendere cha abbia finito - o attendere almeno che scada il lock, tra {1} minuti.
-edit.restoring=Stai per ripristinare la versione {0}. Click su &#8220;Salva&#8221; per ripristinare.  Puoi anche modificare la pagina prima di ripristinarla.
 edit.tab.attachments=Allegati
 edit.tab.help=Aiuto
 edit.tab.edit=Edit
@@ -369,18 +365,10 @@
 # 0 : Application Name
 # 1 : Page name
 view.title.view={0}: {1}
-# The built-in editors also have their localized strings in this file.
-
-editor.plain.name=Il tuo <span class='accesskey'>n</span>ome
-editor.plain.remember=Ricorda?
 editor.plain.email=Homepage o e<span class='accesskey'>m</span>ail
-editor.plain.save.submit=Salva
 editor.plain.save.title=Salva [ s ]
-editor.plain.preview.submit=Anteprima
 editor.plain.preview.title=Anteprima [ v ]
-editor.plain.cancel.submit=Annulla
 editor.plain.cancel.title=Annulla. Le modifiche saranno perdute. [ q ]
-editor.plain.changenote=Nota alla revisione
 editor.commentsignature=Firma il commento
 editor.plain.toolbar=Toolbar
 editor.plain.find=Cerca
@@ -400,9 +388,6 @@
 editor.plain.smartpairs.title=Controllo automatico delle chiusure di () [] {} &lt;&gt; &quot;&quot; &#39;&#39;
 editor.plain.tabcompletion=Completamento Tab (keyword+Tab)
 editor.plain.tabcompletion.title=Espansione automatica delle keyword in Wiki Markup
-#editor.plain.editassist=Assistente
-#editor.plain.editassist.title=Cambia i bottoni dell'assistente
-editor.plain.sneakpreview=Anteprima
 editor.plain.sneakpreview.title=Anteprima. Cliccate fuori dall&quot;area di testo per rinfrescare la area di anteprima.
 editor.plain.tbLink.title=link - Inserisci un link wiki 
 editor.plain.tbH1.title=h1 - Inserisci heading1

Modified: incubator/jspwiki/trunk/src/WebContent/WEB-INF/classes/templates/default_nl.properties
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/WebContent/WEB-INF/classes/templates/default_nl.properties?rev=751135&r1=751134&r2=751135&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/WebContent/WEB-INF/classes/templates/default_nl.properties (original)
+++ incubator/jspwiki/trunk/src/WebContent/WEB-INF/classes/templates/default_nl.properties Fri Mar  6 23:31:03 2009
@@ -367,18 +367,10 @@
 # 0 : Application Name
 # 1 : Page name
 view.title.view={0}: {1}
-# The built-in editors also have their localized strings in this file.
-
-editor.plain.name=Uw <span class='accesskey'>n</span>aam
-editor.plain.remember=Bewaar uw naam in de browser cookie?
 editor.plain.email=Homepagina of e<span class='accesskey'>m</span>ail
-editor.plain.save.submit=Bewaar
 editor.plain.save.title=Bewaar [ e ]
-editor.plain.preview.submit=Preview
 editor.plain.preview.title=Preview [ v ]
-editor.plain.cancel.submit=Annuleer
 editor.plain.cancel.title=Annuleer. Uw wijzigingen worden niet bewaard. [ q ]
-editor.plain.changenote=Opmerking
 editor.commentsignature=Commentaar signatuur
 editor.plain.toolbar=Toolbar
 editor.plain.find=Zoek
@@ -398,9 +390,6 @@
 editor.plain.smartpairs.title=Automatisch balanceren van () [] {} &lt;&gt; &quot;&quot; &#39;&#39;
 editor.plain.tabcompletion=Tab expansie (keyword+Tab)
 editor.plain.tabcompletion.title=Auto expansie van een keyword naar wiki opmaak
-#editor.plain.editassist=Assistentie knoppen
-#editor.plain.editassist.title=Toon/verberg assistentie knoppen
-editor.plain.sneakpreview=Sneak Preview
 editor.plain.sneakpreview.title=Sneak PreviewKlik buiten het tekstveld om een nieuwe preview te krijgen van de pagina
 editor.plain.tbLink.title=link - Voeg wiki link in
 editor.plain.tbH1.title=h1 - Voeg paragraaf niveau 1 in
@@ -445,6 +434,8 @@
 javascript.edit.toolbar.makeSelection=Gelieve eerst een selectie te maken
 javascript.edit.resize=Sleep om de grootte van het tekstveld te wijzigen
 javascript.edit.areyousure=Indien u de Bewaar knop niet gebruikt, worden uw wijzigingen niet bewaard. Weet u zeker dat u deze pagina wilt verlaten ?
+javascript.favs.show=Click om favorieten weer te geven
+javascript.favs.hide=Click om favorieten te verbergen
 javascript.quick.edit=[Bewerk]
 javascript.quick.edit.title=Bewerk sectie {0}...
 javascript.collapse=Klik om de inhoud dicht te klappen
@@ -466,11 +457,10 @@
 javascript.sectionediting.label=Sectie Overzicht
 javascript.tip.default.title=Meer...
 javascript.prefs.areyousure=Indien u de Bewaar Gebruikers Instellingen knop niet gebruikt, worden uw wijzigingen niet bewaard. Weet u zeker dat u deze pagina wilt verlaten ?
-
-Orientation.LEFT = Links
-Orientation.RIGHT = Rechts
-editgroup.illegalname = De groep naam {1} is ongeldig. Kies een andere!
-javascript.favorites.hide = Klik om je favorieten te verbergen
-javascript.favorites.show = Klik om je favorieten te tonen
-login.lostpw.name = Account email
-login.lostpw.submit = Reset wachtwoord!
\ No newline at end of file
+Orientation.LEFT=Links
+Orientation.RIGHT=Rechts
+editgroup.illegalname=De groep naam {1} is ongeldig. Kies een andere!
+javascript.favorites.hide=Klik om je favorieten te verbergen
+javascript.favorites.show=Klik om je favorieten te tonen
+login.lostpw.name=Account email
+login.lostpw.submit=Reset wachtwoord!

Modified: incubator/jspwiki/trunk/src/WebContent/WEB-INF/classes/templates/default_ru.properties
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/WebContent/WEB-INF/classes/templates/default_ru.properties?rev=751135&r1=751134&r2=751135&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/WebContent/WEB-INF/classes/templates/default_ru.properties (original)
+++ incubator/jspwiki/trunk/src/WebContent/WEB-INF/classes/templates/default_ru.properties Fri Mar  6 23:31:03 2009
@@ -42,10 +42,6 @@
 diff.goback=\u0412\u0435\u0440\u043d\u0443\u0442\u0441\u044f \u0434\u043e {0} \u0438\u043b\u0438 {1}
 diff.versionhistory={0} \u0438\u043d\u0444\u043e\u0440\u043c\u0430\u0446\u0438\u044f \u043e \u0441\u0442\u0440\u0430\u043d\u0438\u0446\u0435
 diff.nodiff=\u0418\u0437\u043c\u0435\u043d\u0435\u043d\u0438\u0439 \u043d\u0435 \u043e\u0431\u043d\u0430\u0440\u0443\u0436\u0435\u043d\u043e
-# EditContent.jsp
-
-edit.locked=\u041f\u043e\u043b\u044c\u0437\u043e\u0432\u0430\u0442\u0435\u043b\u044c &#8220;{0}&#8221; \u043d\u0430\u0447\u0430\u043b \u0440\u0435\u0434\u0430\u043a\u0442\u0438\u0440\u043e\u0432\u0430\u0442\u044c \u0441\u0442\u0440\u0430\u043d\u0438\u0446\u0443, \u043d\u043e \u0435\u0449\u0451 \u043d\u0435 \u0441\u043e\u0445\u0440\u0430\u043d\u0438\u043b \u0435\u0451. \u0421\u043e\u0432\u0435\u0442\u0443\u044e \u043d\u0435 \u0440\u0435\u0434\u0430\u043a\u0442\u0438\u0440\u043e\u0432\u0430\u0442\u044c\u0438 \u043f\u043e\u0434\u043e\u0436\u0434\u0430\u0442\u044c \u043f\u0440\u0438\u043c\u0435\u0440\u043d\u043e {1} \u043c\u0438\u043d\u0443\u0442. 
-edit.restoring=\u0412\u044b \u0445\u043e\u0442\u0438\u0442\u0435 \u0430\u043a\u0442\u0443\u0430\u043b\u0438\u0437\u0438\u0440\u043e\u0432\u0430\u0442\u044c \u0432\u0435\u0440\u0441\u0438\u044e  {0}. \u0414\u043b\u044f \u0441\u043e\u0445\u0440\u0430\u043d\u0435\u043d\u0438\u044f \u0432\u044b\u0431\u043e\u0440\u0430 \u043a\u043b\u0438\u043a\u043d\u0438\u0442\u0435 &#8220;\u0421\u043e\u0445\u0440\u0430\u043d\u0438\u0442\u044c&#8221;. \u0422\u0430\u043a\u0436\u0435 \u0432\u044b \u043c\u043e\u0436\u0435\u0442\u0435 \u0441\u043f\u0435\u0440\u0432\u0430 \u0435\u0451 \u043e\u0442\u0440\u0435\u0434\u0430\u043a\u0442\u0438\u0440\u043e\u0432\u0430\u0442\u044c. 
 edit.tab.attachments=\u041f\u0440\u0438\u043a\u0440\u0435\u043f\u043b\u0435\u043d\u0438\u044f
 edit.tab.help=\u041f\u043e\u043c\u043e\u0449\u044c
 edit.tab.edit=\u0420\u0435\u0434\u0430\u043a\u0442\u0438\u0440\u043e\u0432\u0430\u0442\u044c
@@ -376,18 +372,10 @@
 # 0 : Application Name
 # 1 : Page name
 view.title.view={0}: {1}
-# The built-in editors also have their localized strings in this file.
-
-editor.plain.name=\u0412\u0430\u0448\u0435 <span class='accesskey'>\u0438</span>\u043c\u044f
-editor.plain.remember=\u0417\u0430\u043f\u043e\u043c\u043d\u0438\u0442\u044c?
 editor.plain.email=\u0414\u043e\u043c. \u0441\u0442\u0440\u0430\u043d\u0438\u0446\u0430 \u0438\u043b\u0438 or e<span class='accesskey'>\u043c</span>\u0435\u0439\u043b
-editor.plain.save.submit=\u0421\u043e\u0445\u0440\u0430\u043d\u0438\u0442\u044c
 editor.plain.save.title=\u0421\u043e\u0445\u0440\u0430\u043d\u0438\u0442\u044c [ s ]
-editor.plain.preview.submit=\u041f\u0440\u043e\u0441\u043c\u043e\u0442\u0440
 editor.plain.preview.title=\u041f\u0440\u043e\u0441\u043c\u043e\u0442\u0440 [ v ]
-editor.plain.cancel.submit=\u041e\u0442\u043c\u0435\u043d\u0430
 editor.plain.cancel.title=\u041e\u0442\u043c\u0435\u043d\u0438\u0442\u044c \u0440\u0435\u0434\u0430\u043a\u0442\u0438\u0440\u043e\u0432\u0430\u043d\u0438\u0435. \u0412\u0430\u0448\u0438 \u0438\u0437\u043c\u0435\u043d\u0435\u043d\u0438\u044f \u0431\u0443\u0434\u0443\u0442 \u043f\u043e\u0442\u0435\u0440\u044f\u043d\u044b. [ q ]
-editor.plain.changenote=\u0418\u0437\u043c\u0438\u043d\u0435\u043d\u0438\u044f
 editor.commentsignature=\u041f\u043e\u0434\u043f\u0438\u0441\u044c \u043a\u043e\u043c\u043c\u0435\u043d\u0442\u0430\u0440\u0438\u044f
 editor.plain.toolbar=\u0418\u043d\u0441\u0442\u0440\u0443\u043c\u0435\u043d\u0442\u044b
 editor.plain.find=\u041f\u043e\u0438\u0441\u043a
@@ -407,9 +395,6 @@
 editor.plain.smartpairs.title=\u0410\u0432\u0442\u043e\u043c\u0430\u0442\u043e\u043c \u0437\u0430\u043a\u0440\u044b\u0432\u0430\u0442\u044c \u0442\u0435\u0433\u0438 () [] {} &lt;&gt; &quot;&quot; &#39;&#39;
 editor.plain.tabcompletion=\u0422\u0430\u0431\u0443\u043b\u044f\u0446\u0438\u044f (\u0441\u043b\u043e\u0432\u043e+Tab)
 editor.plain.tabcompletion.title=\u0410\u0432\u0442\u043e\u043c\u0430\u0442\u043e\u043c \u0434\u043e\u0431\u0430\u0432\u043b\u044f\u0442\u044c \u0431\u0443\u043a\u0432\u044b Wiki \u0440\u0435\u0437\u043c\u0435\u0442\u043a\u0438
-#editor.plain.editassist=\u0420\u0435\u0434\u0430\u043a\u0442\u0438\u0440\u043e\u0432\u0430\u0442\u044c \u043f\u043e\u043c\u043e\u0449\u043d\u0438\u043a\u0430
-#editor.plain.editassist.title=\u0420\u0435\u0434\u0430\u043a\u0442\u0438\u0440\u043e\u0432\u0430\u0442\u044c \u043a\u043d\u043e\u043f\u043a\u0438 \u043f\u043e\u043c\u043e\u0449\u043d\u0438\u043a\u0430
-editor.plain.sneakpreview=\u041f\u0440\u0435\u0434\u0432\u0430\u0440\u0438\u0442\u0435\u043b\u044c\u043d\u044b\u0439 \u043f\u0440\u043e\u0441\u043c\u043e\u0442\u0440
 editor.plain.sneakpreview.title=\u041f\u0440\u0435\u0434\u0432\u0430\u0440\u0438\u0442\u0435\u043b\u044c\u043d\u044b\u0439 \u043f\u0440\u043e\u0441\u043c\u043e\u0442\u0440. \u0414\u043b\u044f \u043e\u0431\u043d\u043e\u0432\u043b\u0435\u043d\u0438\u044f \u043f\u0440\u043e\u0441\u043c\u043e\u0442\u0440\u0430, \u043a\u043b\u0438\u043a\u043d\u0438\u0442\u0435 \u0432\u043d\u0435 \u0442\u0435\u043a\u0441\u0442\u043e\u0432\u043e\u0433\u043e \u0431\u043b\u043e\u043a\u0430.
 editor.plain.tbLink.title=link - \u0412\u0441\u0442\u0430\u0432\u0438\u0442\u044c \u0432\u0438\u043a\u0438-\u0441\u0441\u044b\u043b\u043a\u0443
 editor.plain.tbH1.title=h1 - \u0412\u0441\u0442\u0430\u0432\u0438\u0442\u044c \u0437\u0430\u0433\u043e\u043b\u043e\u0432\u043e\u043a 1 \u0443\u0440\u043e\u0432\u043d\u044f



Mime
View raw message