Return-Path: Delivered-To: apmail-incubator-jspwiki-dev-archive@locus.apache.org Received: (qmail 23806 invoked from network); 12 Jan 2009 14:16:58 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 12 Jan 2009 14:16:58 -0000 Received: (qmail 85157 invoked by uid 500); 12 Jan 2009 14:16:57 -0000 Delivered-To: apmail-incubator-jspwiki-dev-archive@incubator.apache.org Received: (qmail 85145 invoked by uid 500); 12 Jan 2009 14:16:57 -0000 Mailing-List: contact jspwiki-dev-help@incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: jspwiki-dev@incubator.apache.org Delivered-To: mailing list jspwiki-dev@incubator.apache.org Received: (qmail 85134 invoked by uid 99); 12 Jan 2009 14:16:57 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 12 Jan 2009 06:16:57 -0800 X-ASF-Spam-Status: No, hits=1.0 required=10.0 tests=FUZZY_AMBIEN,SPF_PASS X-Spam-Check-By: apache.org Received-SPF: pass (nike.apache.org: domain of andrew.r.jaquith@gmail.com designates 209.85.146.182 as permitted sender) Received: from [209.85.146.182] (HELO wa-out-1112.google.com) (209.85.146.182) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 12 Jan 2009 14:16:46 +0000 Received: by wa-out-1112.google.com with SMTP id l24so5483257waf.12 for ; Mon, 12 Jan 2009 06:16:24 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:mime-version:received:in-reply-to:references :date:message-id:subject:from:to:content-type :content-transfer-encoding; bh=iccbHTblzZysGub3VEZ/4CoFdN2WRrlt232LyYWEbBE=; b=OGu9rG1kCyjELMFGKl/PUjisKB4wjBalbEigOU9Lup2J1vuwZzESazavWZQHzWZAxh 50ikaHdnNaSLvzfSSWOWmAHa43v9LMgIX3Z4Sm0dsxSNfJ6Mksehe/NGEETZCdr0w+zs eW8ctRy7Y0FDaTDh//zMZwcZZOKyZars9hfeQ= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=mime-version:in-reply-to:references:date:message-id:subject:from:to :content-type:content-transfer-encoding; b=tWnmg9z5WmIzGoPFoWtSJ7V/kwvSTkuPAWJYxu6g16lPvz9A2FdLLQWJiEjh0HiATS M2Z98R6QtchWxA2Foo6iwleeXCrxEwuEKzNgmbglRWER8qb7G56ZGRIiXmFjAH6+M2d6 uVCYTt0/+OcLLXMSvUm95wIxeJDG3+prCdzfg= MIME-Version: 1.0 Received: by 10.114.74.18 with SMTP id w18mr19183912waa.205.1231769784062; Mon, 12 Jan 2009 06:16:24 -0800 (PST) In-Reply-To: <3a6c97f00901112240v426a514ama1bf8450284f1783@mail.gmail.com> References: <20090110143933.7AA9B238898E@eris.apache.org> <3a6c97f00901100855i2971bf5cm923aaa18e763b8db@mail.gmail.com> <3a6c97f00901112240v426a514ama1bf8450284f1783@mail.gmail.com> Date: Mon, 12 Jan 2009 09:16:23 -0500 Message-ID: Subject: Re: svn commit: r733278 [1/2] - in /incubator/jspwiki/trunk: etc/ etc/i18n/ etc/i18n/templates/ src/com/ecyrd/jspwiki/action/ src/com/ecyrd/jspwiki/preferences/ src/webdocs/ src/webdocs/templates/default/ From: Andrew Jaquith To: jspwiki-dev@incubator.apache.org Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: quoted-printable X-Virus-Checked: Checked by ClamAV on apache.org Harry, you are correct. We could add a CoreResources message that looks something like this: login.error.password=3DNot a valid login. {2} However, although something like that would work, the fix is actually more complicated. What we *should* be doing, I think, is propagating localized messages generated by the LoginModules themselves -- so that the text substituted into position {2} is already localized. One of the consequences of this is that UserDatabaseLoginModule should throw LoginExceptions that have been initialized with a localized message. Right now, I'm trying to figure out how get the Locale into the LoginModule. One way would be to create a new class called a LocaleCallback that we would pass to the WikiCallBackHandler. This, in turn implies that we'd need to supply the Locale when login() is called. At the moment I think the cleanest way to do this is to add a variant of the login() method that accepts a Locale parameter. We could pass this from the caller (LoginActionBean). We'd keep the old login() method but mark it deprecated, and note that callers who used the old methods will get error messages that aren't localized. An alternative approach -- which on balance I think is too complicated -- would simply use the Locale returned by WikiSession.getLocale(). The problem with this is that the Locale WikiSession stashes can't be modified during the session, so that if the user changes Locales we're hosed. We *could* add a WikiSession.setLocale() method, but I'd rather not keep track of Locales in two places (prefs + WikiSession). A third approach -- which would be a longer-term fix, and would require more thinking -- would be to simply to have WikiSession keep a reference to the user's Preferences pbject. We should probably be doing this anyway. Hmmmmm.... perhaps Janne and Dirk would like to weigh in on this? On Mon, Jan 12, 2009 at 1:40 AM, Harry Metske wrot= e: > Andrew, > > it works fine. > Although I cannot explain it if I read the LocalizableError docs at > http://stripes.sourceforge.net/docs/current/javadoc/net/sourceforge/strip= es/validation/LocalizableError.html#LocalizableError(java.lang.String,%20ja= va.lang.Object.. > .) > > There is no placeholder in CoreResources.properties : > login.error.password=3DNot a valid login > to be replaced with the e.getMessage() > > Is this a hidden Stripes feature ? > > regards, > Harry > > > 2009/1/11 Andrew Jaquith > >> Harry -- I don't have access to your setup. Could you try the >> following substitution for line 127: >> >> errors.addGlobalError( new LocalizableError( "login.error.password" ), >> e.getMessage() ) >> >> That *should* propagate the error message correctly. >> >> On Sat, Jan 10, 2009 at 11:55 AM, Harry Metske >> wrote: >> > Andrew, >> > >> > is there a specific reason you reverted my last change on the >> > LoginActionBean : >> > >> > --- >> > incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/action/LoginActionBean.j= ava >> > (original) >> > +++ >> > incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/action/LoginActionBean.j= ava >> > Sat Jan 10 06:39:30 2009 >> > @@ -124,7 +124,7 @@ >> > catch ( LoginException e ) >> > { >> > log.info( "Failed to authenticate user " + m_username + ", >> > reason: " + e.getMessage()); >> > - errors.addGlobalError( new SimpleError( e.getMessage() ) = ); >> > + errors.addGlobalError( new LocalizableError( >> > "login.error.password" ) ); >> > } >> > catch( WikiSecurityException e ) >> > { >> > >> > >> > The message that is returned in the Exception (through the >> > TextOutputCallback) is now not shown anymore to the user. >> > >> > regards, >> > Harry >> > >> > >> > 2009/1/10 >> > >> >> Author: ajaquith >> >> Date: Sat Jan 10 06:39:30 2009 >> >> New Revision: 733278 >> >> >> >> URL: http://svn.apache.org/viewvc?rev=3D733278&view=3Drev >> >> Log: >> >> Header.jsp, PageActions*.jsp, UserBox.jsp, Footer.jsp refactored to u= se >> >> Stripes tags. i18n messages have been renamed and moved to >> CoreResources. >> >> SisterSites.jsp and rss.jsp now reference the oscache TLD buy URI, >> making >> >> the need to copy it into the webapp unnecessary. >> >> >> >> Removed: >> >> incubator/jspwiki/trunk/etc/oscache.tld >> >> Modified: >> >> incubator/jspwiki/trunk/etc/i18n/CoreResources.properties >> >> incubator/jspwiki/trunk/etc/i18n/CoreResources_de.properties >> >> incubator/jspwiki/trunk/etc/i18n/CoreResources_es.properties >> >> incubator/jspwiki/trunk/etc/i18n/CoreResources_fi.properties >> >> incubator/jspwiki/trunk/etc/i18n/CoreResources_fr.properties >> >> incubator/jspwiki/trunk/etc/i18n/CoreResources_it.properties >> >> incubator/jspwiki/trunk/etc/i18n/CoreResources_nl.properties >> >> incubator/jspwiki/trunk/etc/i18n/CoreResources_ru.properties >> >> incubator/jspwiki/trunk/etc/i18n/CoreResources_zh_CN.properties >> >> incubator/jspwiki/trunk/etc/i18n/templates/default.properties >> >> incubator/jspwiki/trunk/etc/i18n/templates/default_de.properties >> >> incubator/jspwiki/trunk/etc/i18n/templates/default_es.properties >> >> incubator/jspwiki/trunk/etc/i18n/templates/default_fi.properties >> >> incubator/jspwiki/trunk/etc/i18n/templates/default_fr.properties >> >> incubator/jspwiki/trunk/etc/i18n/templates/default_it.properties >> >> incubator/jspwiki/trunk/etc/i18n/templates/default_nl.properties >> >> incubator/jspwiki/trunk/etc/i18n/templates/default_ru.properties >> >> incubator/jspwiki/trunk/etc/i18n/templates/default_zh_CN.propertie= s >> >> >> >> >> incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/action/LoginActionBean.ja= va >> >> >> >> >> incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/preferences/Preferences.j= ava >> >> incubator/jspwiki/trunk/src/webdocs/SisterSites.jsp >> >> incubator/jspwiki/trunk/src/webdocs/rss.jsp >> >> incubator/jspwiki/trunk/src/webdocs/templates/default/EditLayout.j= sp >> >> incubator/jspwiki/trunk/src/webdocs/templates/default/Footer.jsp >> >> incubator/jspwiki/trunk/src/webdocs/templates/default/Header.jsp >> >> >> >> >> incubator/jspwiki/trunk/src/webdocs/templates/default/PageActionsBottom= .jsp >> >> >> incubator/jspwiki/trunk/src/webdocs/templates/default/PageActionsTop.js= p >> >> >> incubator/jspwiki/trunk/src/webdocs/templates/default/PreferencesTab.js= p >> >> incubator/jspwiki/trunk/src/webdocs/templates/default/UserBox.jsp >> >> incubator/jspwiki/trunk/src/webdocs/templates/default/ViewLayout.j= sp >> >> >> incubator/jspwiki/trunk/src/webdocs/templates/default/commonheader.jsp >> >> incubator/jspwiki/trunk/src/webdocs/templates/default/jspwiki.css >> >> >> >> Modified: incubator/jspwiki/trunk/etc/i18n/CoreResources.properties >> >> URL: >> >> >> http://svn.apache.org/viewvc/incubator/jspwiki/trunk/etc/i18n/CoreResour= ces.properties?rev=3D733278&r1=3D733277&r2=3D733278&view=3Ddiff >> >> >> >> >> =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D >> >> --- incubator/jspwiki/trunk/etc/i18n/CoreResources.properties (origin= al) >> >> +++ incubator/jspwiki/trunk/etc/i18n/CoreResources.properties Sat Jan= 10 >> >> 06:39:30 2009 >> >> @@ -298,12 +298,36 @@ >> >> # Formerly login.lostpw.submit >> >> resetPassword=3DReset password >> >> # Formerly prefs.loginname >> >> -profile.loginName=3DLogin name * >> >> +profile.loginName=3DLogin name >> >> # Formerly prefs.password >> >> -profile.password=3DPassword * >> >> +profile.password=3DPassword >> >> # Formerly prefs.password2 >> >> -passwordAgain=3DPassword verify * >> >> +passwordAgain=3DPassword verify >> >> # Formerly prefs.fullname >> >> -profile.fullname=3DName * >> >> +profile.fullname=3DName >> >> # Formerly prefs.save.submit >> >> com.ecyrd.jspwiki.action.UserProfileActionBean.save=3DSave profile >> >> +#Formerly prefs.assertedname >> >> +assertedName=3D >> >> +#Formerly edit.chooseeditor >> >> +editor=3DName >> >> +#Formerly prefs.user.sectionediting >> >> +sectionEditing=3DSection editing >> >> +#Formerly prefs.user.skin >> >> +skin=3DSkin >> >> +#Formerly prefs.user.language >> >> +locale=3DLanguage >> >> +#Formerly prefs.user.orientation >> >> +orientation=3DFavorites style >> >> +#Formerly prefs.user.orientation.left >> >> +Orientation.LEFT=3DLeft >> >> +#Formerly prefs.user.orientation.right >> >> +Orientation.RIGHT=3DRight >> >> +#Formerly prefs.user.timeformat >> >> +timeFormat=3DTime format >> >> +#Formerly prefs.user.timezone >> >> +timeZone=3DTime zone >> >> +#Formerly prefs.save.prefs.submit >> >> +com.ecyrd.jspwiki.action.UserPreferencesActionBean.save=3DSave >> preferences >> >> +# Formerly prefs.clear.submit >> >> +clearAssertedName=3DReset preferences >> >> >> >> Modified: incubator/jspwiki/trunk/etc/i18n/CoreResources_de.propertie= s >> >> URL: >> >> >> http://svn.apache.org/viewvc/incubator/jspwiki/trunk/etc/i18n/CoreResour= ces_de.properties?rev=3D733278&r1=3D733277&r2=3D733278&view=3Ddiff >> >> >> >> >> =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D >> >> --- incubator/jspwiki/trunk/etc/i18n/CoreResources_de.properties >> (original) >> >> +++ incubator/jspwiki/trunk/etc/i18n/CoreResources_de.properties Sat = Jan >> 10 >> >> 06:39:30 2009 >> >> @@ -244,8 +244,20 @@ >> >> login=3DAnmeldung >> >> email=3DE-Mail-Adresse >> >> resetPassword=3DPasswort zur=FCcksetzen! >> >> -profile.loginName=3Ddein Benutzername (*) >> >> -profile.password=3Ddein Passwort (*) >> >> -passwordAgain=3DPasswort wiederholen (*) >> >> -profile.fullname=3Ddein voller Name (*) >> >> +profile.loginName=3Ddein Benutzername >> >> +profile.password=3Ddein Passwort >> >> +passwordAgain=3DPasswort wiederholen >> >> +profile.fullname=3Ddein voller Name >> >> com.ecyrd.jspwiki.action.UserProfileActionBean.save=3DProfil speiche= rn >> >> +assertedName=3DName >> >> +editor=3DEditor >> >> +sectionEditing=3DBearbeiten von Abschnitten >> >> +skin=3DSkin >> >> +locale=3DSprache >> >> +orientation=3DPosition der Favoriten >> >> +Orientation.LEFT=3Dlinks >> >> +Orientation.RIGHT=3Drechts >> >> +timeFormat=3DZeitformat >> >> +timeZone=3DZeitzone >> >> >> +com.ecyrd.jspwiki.action.UserPreferencesActionBean.save=3DBenutzereinst= ellungen >> >> speichern >> >> +clearAssertedName=3DBenutzereinstellungen zur=FCcksetzen >> >> >> >> Modified: incubator/jspwiki/trunk/etc/i18n/CoreResources_es.propertie= s >> >> URL: >> >> >> http://svn.apache.org/viewvc/incubator/jspwiki/trunk/etc/i18n/CoreResour= ces_es.properties?rev=3D733278&r1=3D733277&r2=3D733278&view=3Ddiff >> >> >> >> >> =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D >> >> --- incubator/jspwiki/trunk/etc/i18n/CoreResources_es.properties >> (original) >> >> +++ incubator/jspwiki/trunk/etc/i18n/CoreResources_es.properties Sat = Jan >> 10 >> >> 06:39:30 2009 >> >> @@ -224,8 +224,20 @@ >> >> login=3DIniciar sesi=F3n >> >> email=3DDirecci=F3n E-mail >> >> resetPassword=3D¡Resetear contrase=F1a! >> >> -profile.loginName=3DNombre de inicio de sesi=F3n * >> >> -profile.password=3DContrase=F1a * >> >> -passwordAgain=3DVerificaci=F3n de contrase=F1a * >> >> -profile.fullname=3DNombre * >> >> +profile.loginName=3DNombre de inicio de sesi=F3n >> >> +profile.password=3DContrase=F1a >> >> +passwordAgain=3DVerificaci=F3n de contrase=F1a >> >> +profile.fullname=3DNombre >> >> com.ecyrd.jspwiki.action.UserProfileActionBean.save=3DGuardar perfil >> >> +assertedName=3DNombre >> >> +editor=3DEditor >> >> +sectionEditing=3DEdici=F3n de Secciones >> >> +skin=3DApariencia >> >> +locale=3DSelecciona Idioma >> >> +orientation=3DEstilo de los favoritos >> >> +Orientation.LEFT=3DIzquierda >> >> +Orientation.RIGHT=3DDerecha >> >> +timeFormat=3DSelecciona el formato de la Hora >> >> +timeZone=3DSelecciona la Zona Horaria >> >> +com.ecyrd.jspwiki.action.UserPreferencesActionBean.save=3DGuardar >> >> Preferencias de Usuario >> >> +clearAssertedName=3DBorrar Preferencias de Usuario >> >> >> >> Modified: incubator/jspwiki/trunk/etc/i18n/CoreResources_fi.propertie= s >> >> URL: >> >> >> http://svn.apache.org/viewvc/incubator/jspwiki/trunk/etc/i18n/CoreResour= ces_fi.properties?rev=3D733278&r1=3D733277&r2=3D733278&view=3Ddiff >> >> >> >> >> =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D >> >> --- incubator/jspwiki/trunk/etc/i18n/CoreResources_fi.properties >> (original) >> >> +++ incubator/jspwiki/trunk/etc/i18n/CoreResources_fi.properties Sat = Jan >> 10 >> >> 06:39:30 2009 >> >> @@ -179,8 +179,20 @@ >> >> login=3DKirjaudu >> >> email=3DS=E4hk=F6postiosoite >> >> resetPassword=3DL=E4het=E4 uusi salasana! >> >> -profile.loginName=3DK=E4ytt=E4j=E4tunnus * >> >> -profile.password=3DSalasana * >> >> -passwordAgain=3DVahvista salasana * >> >> -profile.fullname=3DNimi * >> >> +profile.loginName=3DK=E4ytt=E4j=E4tunnus >> >> +profile.password=3DSalasana >> >> +passwordAgain=3DVahvista salasana >> >> +profile.fullname=3DNimi >> >> com.ecyrd.jspwiki.action.UserProfileActionBean.save=3DTallenna profi= ili >> >> +assertedName=3DNimi >> >> +editor=3DMuokkain >> >> +sectionEditing=3DOsioiden muokkaus >> >> +skin=3DTyyli >> >> +locale=3DValitse kieli >> >> +orientation=3DSivupalkin paikka >> >> +Orientation.LEFT=3DVasemmalla >> >> +Orientation.RIGHT=3DOikealla >> >> +timeFormat=3DValitse ajan esitysmuoto >> >> +timeZone=3DValitse aikavy=F6hykkeesi >> >> +com.ecyrd.jspwiki.action.UserPreferencesActionBean.save=3DTallenna >> asetukset >> >> +clearAssertedName=3DPoista k=E4ytt=E4j=E4nimi >> >> >> >> Modified: incubator/jspwiki/trunk/etc/i18n/CoreResources_fr.propertie= s >> >> URL: >> >> >> http://svn.apache.org/viewvc/incubator/jspwiki/trunk/etc/i18n/CoreResour= ces_fr.properties?rev=3D733278&r1=3D733277&r2=3D733278&view=3Ddiff >> >> >> >> >> =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D >> >> --- incubator/jspwiki/trunk/etc/i18n/CoreResources_fr.properties >> (original) >> >> +++ incubator/jspwiki/trunk/etc/i18n/CoreResources_fr.properties Sat = Jan >> 10 >> >> 06:39:30 2009 >> >> @@ -237,8 +237,20 @@ >> >> login=3DS\u0027identifier >> >> email=3DAdresse e-mail >> >> resetPassword=3DR\u00E9initialiser le mot de passe\u00A0! >> >> -profile.loginName=3DIdentifiant * >> >> -profile.password=3DMot de passe * >> >> -passwordAgain=3DV\u00E9rification du mot de passe * >> >> -profile.fullname=3DNom * >> >> +profile.loginName=3DIdentifiant >> >> +profile.password=3DMot de passe >> >> +passwordAgain=3DV\u00E9rification du mot de passe >> >> +profile.fullname=3DNom >> >> com.ecyrd.jspwiki.action.UserProfileActionBean.save=3DEnregistrer le >> profil >> >> +assertedName=3DNom >> >> +editor=3DEditeur >> >> +sectionEditing=3DEdition de sections >> >> +skin=3DSkin >> >> +locale=3DLangue >> >> +orientation=3DStyle des favoris >> >> +Orientation.LEFT=3DGauche >> >> +Orientation.RIGHT=3DDroite >> >> +timeFormat=3DS\u00E9lectionner le format horaire >> >> +timeZone=3DS\u00E9lectionner le fuseau horaire >> >> +com.ecyrd.jspwiki.action.UserPreferencesActionBean.save=3DEnregistre= r les >> >> pr\u00E9f\u00E9rences utilisateur >> >> +clearAssertedName=3DNettoyer les pr\u00E9f\u00E9rences utilisateur >> >> >> >> Modified: incubator/jspwiki/trunk/etc/i18n/CoreResources_it.propertie= s >> >> URL: >> >> >> http://svn.apache.org/viewvc/incubator/jspwiki/trunk/etc/i18n/CoreResour= ces_it.properties?rev=3D733278&r1=3D733277&r2=3D733278&view=3Ddiff >> >> >> >> >> =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D >> >> --- incubator/jspwiki/trunk/etc/i18n/CoreResources_it.properties >> (original) >> >> +++ incubator/jspwiki/trunk/etc/i18n/CoreResources_it.properties Sat = Jan >> 10 >> >> 06:39:30 2009 >> >> @@ -218,8 +218,20 @@ >> >> login=3DLogin >> >> email=3DIndirizzo E-mail >> >> resetPassword=3DCambia la password ! >> >> -profile.loginName=3DLogin nome * >> >> -profile.password=3DPassword * >> >> -passwordAgain=3DVerifica password * >> >> -profile.fullname=3DNome * >> >> +profile.loginName=3DLogin nome >> >> +profile.password=3DPassword >> >> +passwordAgain=3DVerifica password >> >> +profile.fullname=3DNome >> >> com.ecyrd.jspwiki.action.UserProfileActionBean.save=3DSalva il profi= lo >> >> +assertedName=3DNome >> >> +editor=3DEditor >> >> +sectionEditing=3DEditing Sezioni >> >> +skin=3DSkin >> >> +locale=3DSeleziona il linguaggio >> >> +orientation=3DStile dei preferiti >> >> +Orientation.LEFT=3DSinistra >> >> +Orientation.RIGHT=3DDestra >> >> +timeFormat=3DFormato della data >> >> +timeZone=3DSeleziona la Time Zone >> >> +com.ecyrd.jspwiki.action.UserPreferencesActionBean.save=3DSalva le >> >> preferenze >> >> +clearAssertedName=3DRipulisci le preferenze >> >> >> >> Modified: incubator/jspwiki/trunk/etc/i18n/CoreResources_nl.propertie= s >> >> URL: >> >> >> http://svn.apache.org/viewvc/incubator/jspwiki/trunk/etc/i18n/CoreResour= ces_nl.properties?rev=3D733278&r1=3D733277&r2=3D733278&view=3Ddiff >> >> >> >> >> =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D >> >> --- incubator/jspwiki/trunk/etc/i18n/CoreResources_nl.properties >> (original) >> >> +++ incubator/jspwiki/trunk/etc/i18n/CoreResources_nl.properties Sat = Jan >> 10 >> >> 06:39:30 2009 >> >> @@ -223,8 +223,20 @@ >> >> login=3DLogin >> >> email=3DEmail adres >> >> resetPassword=3DGenereer een nieuw wachtwoord ! >> >> -profile.loginName=3DLogin naam * >> >> -profile.password=3DWachtwoord * >> >> -passwordAgain=3DBevestig Wachtwoord * >> >> -profile.fullname=3DNaam * >> >> +profile.loginName=3DLogin naam >> >> +profile.password=3DWachtwoord >> >> +passwordAgain=3DBevestig wachtwoord >> >> +profile.fullname=3DNaam >> >> com.ecyrd.jspwiki.action.UserProfileActionBean.save=3DBewaar >> >> Gebruikersprofiel >> >> +assertedName=3DNaam >> >> +editor=3DEditor >> >> +sectionEditing=3DSectie Editing >> >> +skin=3DLayout >> >> +locale=3DWijzig de Taal >> >> +orientation=3DWijzig de Layout Orientatie >> >> +Orientation.LEFT=3DLinks >> >> +Orientation.RIGHT=3DRechts >> >> +timeFormat=3DWijzig het Datum/Tijd-formaat >> >> +timeZone=3DWijzig de Tijd-zone >> >> +com.ecyrd.jspwiki.action.UserPreferencesActionBean.save=3DBewaar >> Gebruikers >> >> Instellingen >> >> +clearAssertedName=3DVerwijder Gebruikers Instellingen >> >> >> >> Modified: incubator/jspwiki/trunk/etc/i18n/CoreResources_ru.propertie= s >> >> URL: >> >> >> http://svn.apache.org/viewvc/incubator/jspwiki/trunk/etc/i18n/CoreResour= ces_ru.properties?rev=3D733278&r1=3D733277&r2=3D733278&view=3Ddiff >> >> >> >> >> =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D >> >> --- incubator/jspwiki/trunk/etc/i18n/CoreResources_ru.properties >> (original) >> >> +++ incubator/jspwiki/trunk/etc/i18n/CoreResources_ru.properties Sat = Jan >> 10 >> >> 06:39:30 2009 >> >> @@ -222,8 +222,20 @@ >> >> login=3D\u041b\u043e\u0433\u0438\u043d >> >> >> email=3D\u042d\u043b\u0435\u043a\u0442\u043e\u0440\u043d\u043d\u0430\u0= 44f >> >> \u043f\u043e\u0447\u0442\u0430 >> >> resetPassword=3D\u0421\u0431\u0440\u043e\u0441\u0438\u0442\u044c >> >> \u043f\u0430\u0440\u043e\u043b\u044c ! >> >> -profile.loginName=3D\u041b\u043e\u0433\u0438\u043d * >> >> -profile.password=3D\u041f\u0430\u0440\u043e\u043b\u044c * >> >> -passwordAgain=3D\u041f\u0440\u043e\u0432\u0435\u0440\u043a\u0430 >> >> \u043f\u0430\u0440\u043e\u043b\u044f * >> >> -profile.fullname=3D\u0418\u043c\u044f * >> >> +profile.loginName=3D\u041b\u043e\u0433\u0438\u043d >> >> +profile.password=3D\u041f\u0430\u0440\u043e\u043b\u044c >> >> +passwordAgain=3D\u041f\u0440\u043e\u0432\u0435\u0440\u043a\u0430 >> >> \u043f\u0430\u0440\u043e\u043b\u044f >> >> +profile.fullname=3D\u0418\u043c\u044f >> >> >> com.ecyrd.jspwiki.action.UserProfileActionBean.save=3D\u0421\u043e\u044= 5\u0440\u0430\u043d\u0438\u0442\u044c >> >> \u043f\u0440\u043e\u0444\u0438\u043b\u044c >> >> +assertedName=3D\u0418\u043c\u044f >> >> +editor=3D\u0420\u0435\u0434\u0430\u043a\u0442\u043e\u0440 >> >> +sectionEditing=3D\u0421\u0435\u043a\u0446\u0438\u044f >> >> >> \u0440\u0435\u0434\u0430\u043a\u0442\u0438\u0440\u043e\u0432\u0430\u043d= \u0438\u044f >> >> +skin=3D\u041e\u0431\u043b\u043e\u0436\u043a\u0430 >> >> +locale=3D\u042f\u0437\u044b\u043a >> >> >> +orientation=3D\u041e\u0440\u0438\u0435\u043d\u0442\u0430\u0446\u0438\u0= 44f >> >> \u043c\u0435\u043d\u044e >> >> +Orientation.LEFT=3D\u041b\u0435\u0432\u043e >> >> +Orientation.RIGHT=3D\u041f\u0440\u0430\u0432\u043e >> >> +timeFormat=3D\u0412\u0440\u0435\u043c\u0435\u043d\u043d\u043e\u0439 >> >> \u0444\u043e\u0440\u043c\u0430\u0442 >> >> +timeZone=3D\u0412\u0440\u0435\u043c\u0435\u043d\u043d\u0430\u044f >> >> \u0437\u043e\u043d\u0430 >> >> >> +com.ecyrd.jspwiki.action.UserPreferencesActionBean.save=3D\u0421\u043e\= u0445\u0440\u0430\u043d\u0438\u0442\u044c >> >> \u043d\u0430\u0441\u0442\u0440\u043e\u0439\u043a\u0438 >> >> +clearAssertedName=3D\u041e\u0447\u0438\u0441\u0442\u0438\u0442\u044c >> >> \u043d\u0430\u0441\u0442\u0440\u043e\u0439\u043a\u0438 >> >> >> >> Modified: >> incubator/jspwiki/trunk/etc/i18n/CoreResources_zh_CN.properties >> >> URL: >> >> >> http://svn.apache.org/viewvc/incubator/jspwiki/trunk/etc/i18n/CoreResour= ces_zh_CN.properties?rev=3D733278&r1=3D733277&r2=3D733278&view=3Ddiff >> >> >> >> >> =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D >> >> --- incubator/jspwiki/trunk/etc/i18n/CoreResources_zh_CN.properties >> >> (original) >> >> +++ incubator/jspwiki/trunk/etc/i18n/CoreResources_zh_CN.properties S= at >> Jan >> >> 10 06:39:30 2009 >> >> @@ -221,8 +221,20 @@ >> >> login=3D\u767b\u5f55\u540d >> >> email=3D\u7535\u5b50\u90ae\u4ef6\u5730\u5740 >> >> resetPassword=3D\u91cd\u8bbe\u5bc6\u7801\uff01 >> >> -profile.loginName=3D\u767b\u5f55\u540d * >> >> -profile.password=3D\u5bc6\u7801 * >> >> -passwordAgain=3D\u5bc6\u7801\u9a8c\u8bc1 * >> >> -profile.fullname=3D\u540d\u5b57 * >> >> +profile.loginName=3D\u767b\u5f55\u540d >> >> +profile.password=3D\u5bc6\u7801 >> >> +passwordAgain=3D\u5bc6\u7801\u9a8c\u8bc1 >> >> +profile.fullname=3D\u540d\u5b57 >> >> >> >> >> com.ecyrd.jspwiki.action.UserProfileActionBean.save=3D\u4fdd\u5b58\u698= 2\u8981\u4fe1\u606f >> >> +assertedName=3D\u540d\u5b57 >> >> +editor=3D\u7f16\u8f91\u5668 >> >> +sectionEditing=3D\u6bb5\u843d\u7f16\u8f91 >> >> +skin=3D\u5916\u8868 >> >> +locale=3D\u8bed\u8a00 >> >> +orientation=3D\u83dc\u5355\u4f4d\u7f6e >> >> +Orientation.LEFT=3D\u5de6\u4fa7 >> >> +Orientation.RIGHT=3D\u53f3\u4fa7 >> >> +timeFormat=3D\u65f6\u95f4\u683c\u5f0f >> >> +timeZone=3D\u65f6\u533a >> >> >> >> >> +com.ecyrd.jspwiki.action.UserPreferencesActionBean.save=3D\u4fdd\u5b58\= u7528\u6237\u9996\u9009\u9879 >> >> +clearAssertedName=3D\u6e05\u9664\u7528\u6237\u9996\u9009\u9879 >> >> >> >> Modified: incubator/jspwiki/trunk/etc/i18n/templates/default.properti= es >> >> URL: >> >> >> http://svn.apache.org/viewvc/incubator/jspwiki/trunk/etc/i18n/templates/= default.properties?rev=3D733278&r1=3D733277&r2=3D733278&view=3Ddiff >> >> >> >> >> =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D >> >> --- incubator/jspwiki/trunk/etc/i18n/templates/default.properties >> >> (original) >> >> +++ incubator/jspwiki/trunk/etc/i18n/templates/default.properties Sat >> Jan >> >> 10 06:39:30 2009 >> >> @@ -74,7 +74,6 @@ >> >> {1} minutes. >> >> edit.restoring=3DYou are about to restore version {0}. \ >> >> Click on “Save” to restore. You may also edit the pa= ge >> >> before restoring it. >> >> -edit.chooseeditor=3DEditor >> >> edit.tab.attachments=3DAttachments >> >> edit.tab.help=3DHelp >> >> edit.tab.edit=3DEdit >> >> @@ -360,21 +359,12 @@ >> >> >> >> prefs.cookies=3DYour choices will be saved in your browser as cookie= s. >> >> >> >> -prefs.user.skin=3DSkin >> >> -prefs.user.orientation=3DFavorites style >> >> -prefs.user.orientation.left=3DLeft >> >> -prefs.user.orientation.right=3DRight >> >> #prefs.user.editorareaheight=3DEditor area height //not user anymor= e >> >> -prefs.user.sectionediting=3DSection Editing >> >> prefs.user.sectionediting.text=3DEnable section editing via > >> class=3D"editsection">[edit] links >> >> -prefs.user.timeformat=3DTime Format >> >> -prefs.user.timezone=3DTime Zone >> >> prefs.user.timezone.server=3D[SERVER] >> >> -prefs.user.language=3DLanguage >> >> prefs.user.language.default=3D[DEFAULT] >> >> >> >> prefs.instructions=3DSet your user preferences here. Your choices wi= ll be >> >> saved in your browser as cookies. >> >> -prefs.assertedname=3DName >> >> prefs.assertedname.description=3DYour name. \ >> >> If you haven’t created a user profile yet, you can tell {0}= \ >> >> who you are by ‘asserting’ an identity. You >> wouldn’t >> >> lie to us would you? \ >> >> @@ -387,8 +377,6 @@ >> >> secure. >> >> prefs.assertedname.create=3DCreate a new user profile >> >> prefs.submit.setname=3DSet user name >> >> -prefs.save.prefs.submit=3DSave User Preferences >> >> -prefs.clear.submit=3DClear User Preferences >> >> prefs.clear.description=3D\ >> >> In some cases, you may need to remove your ‘asserted’ >> user >> >> name and \ >> >> your user preferences from this computer. \ >> >> >> >> Modified: >> incubator/jspwiki/trunk/etc/i18n/templates/default_de.properties >> >> URL: >> >> >> http://svn.apache.org/viewvc/incubator/jspwiki/trunk/etc/i18n/templates/= default_de.properties?rev=3D733278&r1=3D733277&r2=3D733278&view=3Ddiff >> >> >> >> >> =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D >> >> --- incubator/jspwiki/trunk/etc/i18n/templates/default_de.properties >> >> (original) >> >> +++ incubator/jspwiki/trunk/etc/i18n/templates/default_de.properties = Sat >> >> Jan 10 06:39:30 2009 >> >> @@ -79,8 +79,6 @@ >> >> h=F6flicher zu warten bis derjenige fertig ist. Diese "Sperre"= wird >> in >> >> {1} Minuten aufgehoben. >> >> edit.restoring=3DSoll die Version {0} wiederhergestellt werden? \ >> >> Falls ja, klicke auf 'Speichern'! Die Seite kann auch vorher n= och >> >> bearbeitet werden. >> >> -edit.chooseeditor=3DEditor >> >> -edit.tab.attachments=3DAnh=E4nge >> >> edit.tab.help=3DHilfe >> >> edit.tab.edit=3DBearbeiten >> >> edit.tab.findreplacehelp=3DHilfe zu Suchen und Ersetzen >> >> @@ -364,20 +362,11 @@ >> >> >> >> prefs.cookies=3DDeine Einstellungen werden als Cookie im Web-Browser >> >> gespeichert. >> >> >> >> -prefs.user.skin=3DSkin >> >> -prefs.user.orientation=3DPosition der Favoriten >> >> -prefs.user.orientation.left=3Dlinks >> >> -prefs.user.orientation.right=3Drechts >> >> -prefs.user.sectionediting=3DBearbeiten von Abschnitten >> >> prefs.user.sectionediting.text=3DBearbeiten von Abschnitten via >> [Abschnitt >> >> bearbeiten]-Links aktivieren >> >> -prefs.user.timeformat=3DZeitformat >> >> -prefs.user.timezone=3DZeitzone >> >> prefs.user.timezone.server=3D[SERVER] >> >> -prefs.user.language=3DSprache >> >> prefs.user.language.default=3D[STANDARD] >> >> >> >> prefs.instructions=3DNimm hier deine Benutzereinstellungen vor. Sie >> werden >> >> als Cookie im Web-Browser gespeichert. >> >> -prefs.assertedname=3DName >> >> prefs.assertedname.description=3DDies ist dein Name. Wenn du noch ke= in >> >> Benutzerprofil bei {0} angelegt hast, kannst du \ >> >> hier einen vor=FCbergehenden Namen angeben.
\ >> >> Beachte: Dies ist jedoch keine richtige >> Anmeldung, >> >> da die Einstellungen lediglich als Cookie in \ >> >> @@ -386,9 +375,6 @@ >> >> sich mit Benutzernamen und Passwort angemeldet hat. >> >> prefs.assertedname.create=3DNeues Benutzerprofil erstellen >> >> prefs.submit.setname=3DBenutzernamen setzen >> >> -prefs.save.prefs.submit=3DBenutzereinstellungen speichern >> >> -prefs.save.submit=3DBenutzereinstellungen speichern >> >> -prefs.clear.submit=3DBenutzereinstellungen zur=FCcksetzen >> >> prefs.clear.description=3DFalls du den Benutzernamen und deine >> Einstellungen >> >> von diesem Rechner l=F6schen willst, \ >> >> klicke auf 'Benutzereinstellungen zur=FCcksetzen'!
\ >> >> Beachte: Es werden alle Einstellungen >> vollst=E4ndig >> >> und permanent gel=F6scht und \ >> >> >> >> Modified: >> incubator/jspwiki/trunk/etc/i18n/templates/default_es.properties >> >> URL: >> >> >> http://svn.apache.org/viewvc/incubator/jspwiki/trunk/etc/i18n/templates/= default_es.properties?rev=3D733278&r1=3D733277&r2=3D733278&view=3Ddiff >> >> >> >> >> =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D >> >> --- incubator/jspwiki/trunk/etc/i18n/templates/default_es.properties >> >> (original) >> >> +++ incubator/jspwiki/trunk/etc/i18n/templates/default_es.properties = Sat >> >> Jan 10 06:39:30 2009 >> >> @@ -73,7 +73,6 @@ >> >> {1} minutos. >> >> edit.restoring=3DEst=E1s apunto de restaurar la versi=F3n {0}. \ >> >> Haz click en “Guardar” para restaurarla. Tambi= =E9n >> >> puedes editar la p=E1gina antes de hacerlo. >> >> -edit.chooseeditor=3DEditor >> >> edit.tab.attachments=3DAdjuntos >> >> edit.tab.help=3DAyuda >> >> edit.tab.edit=3DEditar >> >> @@ -354,17 +353,9 @@ >> >> >> >> prefs.cookies=3DTus elecciones se guardar=E1n en el navegador como c= ookies. >> >> >> >> -prefs.user.skin=3DApariencia >> >> -prefs.user.orientation=3DEstilo de los favoritos >> >> -prefs.user.orientation.left=3DIzquierda >> >> -prefs.user.orientation.right=3DDerecha >> >> #prefs.user.editorareaheight=3DAltura del =E1rea del Editor >> >> -prefs.user.sectionediting=3DEdici=F3n de Secciones >> >> prefs.user.sectionediting.text=3DActivar la edici=F3n de secciones v= =EDa >> enlaces >> >> [editar] >> >> -prefs.user.timeformat=3DSelecciona el formato de la Hora >> >> -prefs.user.timezone=3DSelecciona la Zona Horaria >> >> prefs.user.timezone.server=3D[SERVIDOR] >> >> -prefs.user.language=3DSelecciona Idioma >> >> prefs.user.language.default=3D[POR DEFECTO] >> >> >> >> #pref.fontsize.title.down=3DDisminuir el tama=F1o del Texto >> >> @@ -373,7 +364,6 @@ >> >> #pref.fontsize.title.up=3DAumentar el tama=F1o del Texto >> >> >> >> prefs.instructions=3DEstablece tus preferencias aqu=ED. Tus cambios = se >> >> guardar=E1n en el navegador como cookies. >> >> -prefs.assertedname=3DNombre >> >> prefs.assertedname.description=3DTu nombre. Si no te has creado un p= erfil >> de >> >> usuario \ >> >> todav=EDa, puedes decirle a {0} \ >> >> qui=E9n eres “declarando” una identidad. No ser=EDas ca= paz \ >> >> @@ -387,8 +377,6 @@ >> >> mayor seguridad, prueba a crearte un perfil. >> >> prefs.assertedname.create=3DCrea un nuevo perfil de usuario >> >> prefs.submit.setname=3DEstablecer nombre de usuario >> >> -prefs.save.prefs.submit=3DGuardar Preferencias de Usuario >> >> -prefs.clear.submit=3DBorrar Preferencias de Usuario >> >> prefs.clear.description=3D\ >> >> En alg=FAn caso puede que necesites borrar tu nombre >> >> ‘declarado’ y tus \ >> >> preferencias de usuario de este ordenador. \ >> >> >> >> Modified: >> incubator/jspwiki/trunk/etc/i18n/templates/default_fi.properties >> >> URL: >> >> >> http://svn.apache.org/viewvc/incubator/jspwiki/trunk/etc/i18n/templates/= default_fi.properties?rev=3D733278&r1=3D733277&r2=3D733278&view=3Ddiff >> >> >> >> >> =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D >> >> --- incubator/jspwiki/trunk/etc/i18n/templates/default_fi.properties >> >> (original) >> >> +++ incubator/jspwiki/trunk/etc/i18n/templates/default_fi.properties = Sat >> >> Jan 10 06:39:30 2009 >> >> @@ -68,7 +68,6 @@ >> >> lopettanna. >> >> edit.restoring=3DOlet palauttamassa versiota {0}. Paina >> >> "Tallenna" palauttaaksesi. \ >> >> Voit my=F6s muokata sivua ennen kuin tallennat. >> >> -edit.chooseeditor=3DMuokkain: >> >> edit.tab.attachments=3DLiitteet >> >> edit.tab.help=3DOhjeet >> >> edit.tab.edit=3DMuokkaus >> >> @@ -339,13 +338,7 @@ >> >> prefs.tab.prefs=3DAsetukset >> >> prefs.tab.profile=3DProfiili >> >> >> >> -prefs.user.skin=3DTyyli >> >> -prefs.user.timeformat=3DValitse ajan esitysmuoto >> >> -prefs.user.timezone=3DValitse aikavy=F6hykkeesi >> >> - >> >> - >> >> prefs.instructions=3DAseta selainkohtaiset k=E4ytt=E4j=E4asetuksesi = t=E4=E4ll=E4. Ne >> >> tallennetaan selaimeesi ev=E4steen avulla. >> >> -prefs.assertedname=3DNimi >> >> prefs.assertedname.description=3DNimesi. \ >> >> Jos et ole viel=E4 luonut k=E4ytt=E4j=E4profiilia, voit kertoa ku= ka olet \ >> >> vain kirjoittamalla t=E4h=E4n nimesi. Eth=E4n valehtelisi meille= , eth=E4n? >> \ >> >> @@ -356,7 +349,6 @@ >> >> salasanan (joka on paljon turvallisempi), {1}. >> >> prefs.assertedname.create=3Dluo uusi k=E4ytt=E4j=E4tunnus >> >> prefs.submit.setname=3DAseta k=E4ytt=E4j=E4nimi >> >> -prefs.clear.submit=3DPoista k=E4ytt=E4j=E4nimi >> >> prefs.clear.description=3DJoissain tapauksissa, esimerkiksi jos k=E4= yt=E4t >> >> jaettua tietokonetta, \ >> >> voit joutua poistamaan k=E4ytt=E4j=E4nimesi t=E4lt=E4 tietokon= eelta. Paina >> >> "Poista k=E4ytt=E4j=E4nimi" \ >> >>
\ >> >> @@ -391,23 +383,16 @@ >> >> prefs.lastmodified=3DLoit k=E4ytt=E4j=E4tilisi {0}, ja muutit sit=E4= viimeksi {1} >> >> prefs.save.description=3DPaina "Tallenna profiili" >> tallentaaksesi >> >> profiilisi (duh). >> >> >> >> -prefs.save.prefs.submit=3DTallenna asetukset >> >> prefs.cookies=3DAsetuksesi tallennetaan t=E4m=E4n selaimen ev=E4stei= siin. >> >> prefs.clear.heading=3DAsetusten poisto >> >> >> >> -prefs.user.orientation=3DSivupalkin paikka >> >> -prefs.user.orientation.left=3DVasemmalla >> >> -prefs.user.orientation.right=3DOikealla >> >> - >> >> prefs.roles=3DRoolit >> >> prefs.groups=3DRyhm=E4t >> >> prefs.creationdate=3DLuontihetki >> >> prefs.profile.lastmodified=3DViimeksi muutettu >> >> -prefs.user.language =3D Valitse kieli >> >> prefs.user.language.default =3D [OLETUS] >> >> prefs.user.timezone.server =3D [T=E4m=E4n palvelimen oma] >> >> prefs.errorprefix.rename =3D En voinut nimet=E4 sivua uudelleen:&nbs= p; >> >> -prefs.user.sectionediting =3D Osioiden muokkaus >> >> prefs.user.sectionediting.text =3D Salli osioiden muokkaus lis=E4=E4= m=E4ll=E4 >> > >> class=3D"editsection">[muokkaa] linkit joka = osioon. >> >> >> >> # Workflow generic messages >> >> >> >> Modified: >> incubator/jspwiki/trunk/etc/i18n/templates/default_fr.properties >> >> URL: >> >> >> http://svn.apache.org/viewvc/incubator/jspwiki/trunk/etc/i18n/templates/= default_fr.properties?rev=3D733278&r1=3D733277&r2=3D733278&view=3Ddiff >> >> >> >> >> =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D >> >> --- incubator/jspwiki/trunk/etc/i18n/templates/default_fr.properties >> >> (original) >> >> +++ incubator/jspwiki/trunk/etc/i18n/templates/default_fr.properties = Sat >> >> Jan 10 06:39:30 2009 >> >> @@ -76,7 +76,6 @@ >> >> (ce verrou expire dans {1} minutes.) >> >> edit.restoring=3DVous \u00EAtes sur le point de restaurer la version= {0}. >> \ >> >> Cliquez sur \u201CEnregistrer\u201D pour restaurer. Vous pouvez >> aussi >> >> \u00E9diter la page avant de la restaurer. >> >> -edit.chooseeditor=3DEditeur >> >> edit.tab.attachments=3DAttachements >> >> edit.tab.help=3DAide >> >> edit.tab.edit=3DEditer >> >> @@ -357,21 +356,12 @@ >> >> >> >> prefs.cookies=3DVos choix seront enregistr\u00E9s dans les cookies d= e >> votre >> >> navigateur. >> >> >> >> -prefs.user.skin=3DSkin >> >> -prefs.user.orientation=3DStyle des favoris >> >> -prefs.user.orientation.left=3DGauche >> >> -prefs.user.orientation.right=3DDroite >> >> #prefs.user.editorareaheight=3DHauteur de la zone d\u0027\u00E9ditio= n >> >> //desormais inutilise >> >> -prefs.user.sectionediting=3DEdition de sections >> >> prefs.user.sectionediting.text=3DAutoriser l\u0027\u00E9dition de >> sections >> >> via des liens [Editer]<= /span> >> >> -prefs.user.timeformat=3DS\u00E9lectionner le format horaire >> >> -prefs.user.timezone=3DS\u00E9lectionner le fuseau horaire >> >> prefs.user.timezone.server=3D[SERVEUR] >> >> -prefs.user.language=3DLangue >> >> prefs.user.language.default=3D[DEFAUT] >> >> >> >> prefs.instructions=3DModifiez vos pr\u00E9f\u00E9rences utilisateur = ici. >> Vos >> >> choix seront enregistr\u00E9s dans les cookies de votre navigateur. >> >> -prefs.assertedname=3DNom >> >> prefs.assertedname.description=3DVotre nom. \ >> >> Si n\u0027\u0027avez pas encore cr\u00E9\u00E9 de profil >> utilisateur, >> >> vous pouvez dire \u00E0 {0} \ >> >> qui vous \u00EAtes, en \u201Csupposant\u201D votre identit\u00E9. >> Mais >> >> vous ne voudriez pas \ >> >> @@ -385,8 +375,6 @@ >> >> et un mot de passe classiques, qui sont plus s\u00FBrs. >> >> prefs.assertedname.create=3DCr\u00E9er un nouveau profil utilisateur >> >> prefs.submit.setname=3DModifier le nom de l\u0027utilisateur >> >> -prefs.save.prefs.submit=3DEnregistrer les pr\u00E9f\u00E9rences >> utilisateur >> >> -prefs.clear.submit=3DNettoyer les pr\u00E9f\u00E9rences utilisateur >> >> prefs.clear.description=3D\ >> >> Dans certains cas, vous pouvez avoir besoin de supprimer votre no= m >> >> d\u0027utilisateur de votre profil \ >> >> \u201Csuppos\u00E9\u201D sur cet ordinateur. \ >> >> >> >> Modified: >> incubator/jspwiki/trunk/etc/i18n/templates/default_it.properties >> >> URL: >> >> >> http://svn.apache.org/viewvc/incubator/jspwiki/trunk/etc/i18n/templates/= default_it.properties?rev=3D733278&r1=3D733277&r2=3D733278&view=3Ddiff >> >> >> >> >> =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D >> >> --- incubator/jspwiki/trunk/etc/i18n/templates/default_it.properties >> >> (original) >> >> +++ incubator/jspwiki/trunk/etc/i18n/templates/default_it.properties = Sat >> >> Jan 10 06:39:30 2009 >> >> @@ -71,7 +71,6 @@ >> >> Sarebbe estremamente cortese attendere cha abbia finito - o >> attendere >> >> almeno che scada il lock, tra {1} minuti. >> >> edit.restoring=3DStai per ripristinare la versione {0}. \ >> >> Click su “Salva” per ripristinare. Puoi anche >> modificare >> >> la pagina prima di ripristinarla. >> >> -edit.chooseeditor=3DEditor >> >> edit.tab.attachments=3DAllegati >> >> edit.tab.help=3DAiuto >> >> edit.tab.edit=3DEdit >> >> @@ -353,19 +352,11 @@ >> >> >> >> prefs.cookies=3DLe tue preferenze sono salvate nel browser via cooki= e. >> >> >> >> -prefs.user.skin=3DSkin >> >> -prefs.user.orientation=3DStile dei preferiti >> >> -prefs.user.orientation.left=3DSinistra >> >> -prefs.user.orientation.right=3DDestra >> >> #prefs.user.editorareaheight=3DAltezza dell’aerea di editing >> >> -prefs.user.timeformat=3DFormato della data >> >> -prefs.user.timezone=3DSeleziona la Time Zone >> >> prefs.user.timezone.server=3D[SERVER] >> >> -prefs.user.language=3DSeleziona il linguaggio >> >> prefs.user.language.default=3D[DEFAULT] >> >> >> >> prefs.instructions=3DInserisci qui le tue preferenze. Le tue prefere= nze >> sono >> >> salvate nel browser via cookie. >> >> -prefs.assertedname=3DNome >> >> prefs.assertedname.description=3DIl tuo nome. \ >> >> Se non hai ancora creato un profilo, puoi dire {0} \ >> >> chi sei ‘asserendo’ un identità (senza dire bu= gie >> >> ...). \ >> >> @@ -376,8 +367,6 @@ >> >> privilegi limitati. {0} se preferisci essere identificato tramite >> >> identificativo utente e password. >> >> prefs.assertedname.create=3DCrea un nuovo profilo utente >> >> prefs.submit.setname=3DNome utente >> >> -prefs.save.prefs.submit=3DSalva le preferenze >> >> -prefs.clear.submit=3DRipulisci le preferenze >> >> prefs.clear.description=3D\ >> >> In qualche caso, potresti aver bisogno di rimuovere le tue >> credenziali >> >> da questo computer. \ >> >> Seleziona il bottone ‘Ripulisci le preferenze’ per >> farlo. \ >> >> @@ -633,5 +622,4 @@ >> >> >> >> javascript.sectionediting.label =3D Riassunto della Sezione >> >> prefs.errorprefix.rename =3D Impossibile rinominare la pagina:  >> >> -prefs.user.sectionediting =3D Editing Sezioni >> >> prefs.user.sectionediting.text =3D Abilita l'editing delle sezioni c= on il >> >> collegamento[modifica]<= /span> >> >> >> >> Modified: >> incubator/jspwiki/trunk/etc/i18n/templates/default_nl.properties >> >> URL: >> >> >> http://svn.apache.org/viewvc/incubator/jspwiki/trunk/etc/i18n/templates/= default_nl.properties?rev=3D733278&r1=3D733277&r2=3D733278&view=3Ddiff >> >> >> >> >> =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D >> >> --- incubator/jspwiki/trunk/etc/i18n/templates/default_nl.properties >> >> (original) >> >> +++ incubator/jspwiki/trunk/etc/i18n/templates/default_nl.properties = Sat >> >> Jan 10 06:39:30 2009 >> >> @@ -73,7 +73,6 @@ >> >> {1} minuten. >> >> edit.restoring=3DDe actie herstelt versie {0} van deze pagina. \ >> >> Klik op “Bewaar” om te herstellen. U kan de pagina oo= k >> nog >> >> bewerken indien U dat wenst. >> >> -edit.chooseeditor=3DEditor >> >> edit.tab.attachments=3DBijlagen >> >> edit.tab.help=3DHelp >> >> edit.tab.edit=3DBewerk >> >> @@ -354,21 +353,12 @@ >> >> >> >> prefs.cookies=3DUw voorkeuren worden bewaard in de cookies van de br= owser >> >> >> >> -prefs.user.skin=3DLayout >> >> -prefs.user.orientation=3DWijzig de Layout Orientatie >> >> -prefs.user.orientation.left=3DLinks >> >> -prefs.user.orientation.right=3DRechts >> >> #prefs.user.editorareaheight=3DWijzig Editor hoogte >> >> -prefs.user.sectionediting=3DSectie Editing >> >> prefs.user.sectionediting.text=3DActiveer sectie editing d.m.v. de <= span >> >> class=3D"editsection">[edit] links >> >> -prefs.user.timeformat=3DWijzig het Datum/Tijd-formaat >> >> -prefs.user.timezone=3DWijzig de Tijd-zone >> >> prefs.user.timezone.server=3D[SERVER] >> >> -prefs.user.language=3DWijzig de Taal >> >> prefs.user.language.default=3D[DEFAULT] >> >> >> >> prefs.instructions=3DHier kan U de Gebruikers Instellingen wijzigen.= Deze >> >> worden bewaard in de cookies van de browser >> >> -prefs.assertedname=3DNaam >> >> prefs.assertedname.description=3D'Asserted' Naam. \ >> >> Inden je nog geen gebruikersprofiel beziet, kan je {0} \ >> >> melden wie je bent eenvoudig door het invoeren van je idendity (d= .i. >> >> ‘asserting’) \ >> >> @@ -380,8 +370,6 @@ >> >> Het gebruik van een traditionele gebruikersnaam en wachtwoord, is >> een >> >> veiligere toegangsmethode. >> >> prefs.assertedname.create=3DMaak een nieuw gebruikersprofiel >> >> prefs.submit.setname=3DSet gebruikersnaam >> >> -prefs.save.prefs.submit=3DBewaar Gebruikers Instellingen >> >> -prefs.clear.submit=3DVerwijder Gebruikers Instellingen >> >> prefs.clear.description=3D\ >> >> In bepaalde gevallen kan de gebruiker het nodig achten om zijn >> >> ‘asserted’ gebruikersnaam en de \ >> >> gebruikersinstellingen van deze computer te verwijderen. \ >> >> >> >> Modified: >> incubator/jspwiki/trunk/etc/i18n/templates/default_ru.properties >> >> URL: >> >> >> http://svn.apache.org/viewvc/incubator/jspwiki/trunk/etc/i18n/templates/= default_ru.properties?rev=3D733278&r1=3D733277&r2=3D733278&view=3Ddiff >> >> >> >> >> =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D >> >> --- incubator/jspwiki/trunk/etc/i18n/templates/default_ru.properties >> >> (original) >> >> +++ incubator/jspwiki/trunk/etc/i18n/templates/default_ru.properties = Sat >> >> Jan 10 06:39:30 2009 >> >> @@ -67,7 +67,6 @@ >> >> \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=3D\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 >> >> “\u0421\u043e\u0445\u0440\u0430\u043d\u0438\u0442\u044c”. >> >> \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.chooseeditor=3D\u0420\u0435\u0434\u0430\u043a\u0442\u043e\u0440 >> >> >> >> >> edit.tab.attachments=3D\u041f\u0440\u0438\u043a\u0440\u0435\u043f\u043b= \u0435\u043d\u0438\u044f >> >> edit.tab.help=3D\u041f\u043e\u043c\u043e\u0449\u044c >> >> >> >> >> edit.tab.edit=3D\u0420\u0435\u0434\u0430\u043a\u0442\u0438\u0440\u043e\= u0432\u0430\u0442\u044c >> >> @@ -350,29 +349,18 @@ >> >> >> >> prefs.cookies=3D\u0412\u0430\u0448\u0438 >> >> \u043d\u0430\u0441\u0442\u0440\u043e\u0439\u043a\u0438 >> >> \u0431\u0443\u0434\u0443\u0442\u044c >> >> \u0441\u043e\u0445\u0440\u0430\u043d\u0435\u043d\u044b >> >> \u0431\u0440\u0430\u0443\u0437\u0435\u0440\u043e\u043c >> \u043a\u0430\u043a >> >> \u043a\u0443\u043a\u0438. >> >> >> >> -prefs.user.skin=3D\u041e\u0431\u043b\u043e\u0436\u043a\u0430 >> >> >> -prefs.user.orientation=3D\u041e\u0440\u0438\u0435\u043d\u0442\u0430\u04= 46\u0438\u044f >> >> \u043c\u0435\u043d\u044e >> >> -prefs.user.orientation.left=3D\u041b\u0435\u0432\u043e >> >> -prefs.user.orientation.right=3D\u041f\u0440\u0430\u0432\u043e >> >> #prefs.user.editorareaheight=3DEditor area height //not user anymor= e >> >> -prefs.user.sectionediting=3D\u0421\u0435\u043a\u0446\u0438\u044f >> >> >> \u0440\u0435\u0434\u0430\u043a\u0442\u0438\u0440\u043e\u0432\u0430\u043d= \u0438\u044f >> >> >> prefs.user.sectionediting.text=3D\u0412\u043a\u043b\u044e\u0447\u0438\u= 0442\u044c >> >> \u0441\u0435\u043a\u0446\u0438\u044e >> >> >> \u0440\u0435\u0434\u0430\u043a\u0442\u0438\u0440\u043e\u0432\u0430\u043d= \u0438\u044f >> >> \u0447\u0435\u0440\u0435\u0437 \ >> >> > >> href=3D"#">[e] \u0441\u0441\u044b\u043b\u043e\u043a >> >> >> -prefs.user.timeformat=3D\u0412\u0440\u0435\u043c\u0435\u043d\u043d\u043= e\u0439 >> >> \u0444\u043e\u0440\u043c\u0430\u0442 >> >> >> -prefs.user.timezone=3D\u0412\u0440\u0435\u043c\u0435\u043d\u043d\u0430\= u044f >> >> \u0437\u043e\u043d\u0430 >> >> prefs.user.timezone.server=3D[\u0441\u0435\u0440\u0432\u0435\u0440] >> >> -prefs.user.language=3D\u042f\u0437\u044b\u043a >> >> prefs.user.language.default=3D[\u043f\u043e >> >> \u0443\u043c\u043e\u043b\u0447\u0430\u043d\u0438\u044e] >> >> >> >> prefs.instructions=3D\u0423\u043a\u0430\u0436\u0438\u0442\u0435 >> >> \u0442\u0443\u0442 \u0432\u0430\u0448\u0438 >> >> >> \u043f\u043e\u043b\u044c\u0437\u043e\u0432\u0430\u0442\u0435\u043b\u044c= \u0441\u043a\u0438\u0435 >> >> \u043d\u0430\u0441\u0442\u0440\u043e\u0439\u043a\u0438. \ >> >> \u0412\u0430\u0448\u0438 >> >> \u043f\u0440\u0435\u0444\u0435\u0440\u0435\u043d\u0446\u0438\u0438 >> >> \u0431\u0443\u0434\u0443\u0442 >> >> \u0441\u043e\u0445\u0440\u0430\u043d\u0435\u043d\u044b >> >> \u0431\u0440\u0430\u0443\u0437\u0435\u0440\u043e\u043c >> \u043a\u0430\u043a >> >> \u043a\u0443\u043a\u0438. >> >> -prefs.assertedname=3D\u0418\u043c\u044f >> >> prefs.assertedname.description=3D\u0412\u0430\u0448\u0435 >> >> \u0438\u043c\u044f. \ >> >> \u0411\u0443\u0434\u0435\u043c >> >> \u043d\u0430\u0434\u0435\u044f\u0442\u0441\u044f \u043e\u043d\u043e >> >> \u043d\u0430\u0441\u0442\u043e\u044f\u0449\u0435\u0435.) >> >> prefs.assertedname.create=3D\u0421\u043e\u0437\u0434\u0430\u0442\u04= 4c >> >> \u043d\u043e\u0432\u044b\u0439 >> >> >> \u043f\u043e\u043b\u044c\u0437\u043e\u0432\u0430\u0442\u0435\u043b\u044c= \u0441\u043a\u0438\u0439 >> >> \u043f\u0440\u043e\u0444\u0438\u043b\u044c >> >> prefs.submit.setname=3D\u0423\u043a\u0430\u0436\u0438\u0442\u0435 >> >> \u0438\u043c\u044f >> >> \u043f\u043e\u043b\u044c\u0437\u043e\u0432\u0430\u0442\u0435\u043b\u0= 44f >> >> >> -prefs.save.prefs.submit=3D\u0421\u043e\u0445\u0440\u0430\u043d\u0438\u0= 442\u044c >> >> \u043d\u0430\u0441\u0442\u0440\u043e\u0439\u043a\u0438 >> >> -prefs.clear.submit=3D\u041e\u0447\u0438\u0441\u0442\u0438\u0442\u044= c >> >> \u043d\u0430\u0441\u0442\u0440\u043e\u0439\u043a\u0438 >> >> prefs.clear.description=3D\u0414\u043b\u044f >> >> \u0443\u0434\u0430\u043b\u0435\u043d\u0438\u044f >> >> \u0432\u0440\u0435\u043c\u0435\u043d\u043d\u044b\u0445 >> >> \u0434\u0430\u043d\u044b\u0445 >> >> \u043a\u043b\u0438\u043a\u043d\u0438\u0442\u0435 >> >> ‘\u041e\u0447\u0438\u0441\u0442\u0438\u0442\u044c >> >> \u043d\u0430\u0441\u0442\u0440\u043e\u0439\u043a\u0438’ >> >> >> >> prefs.newprofile=3D\u0421\u043e\u0437\u0434\u0430\u0442\u044c >> >> \u043d\u043e\u0432\u044b\u0439 >> >> >> \u043f\u043e\u043b\u044c\u0437\u043e\u0432\u0430\u0442\u0435\u043b\u044c= \u0441\u043a\u0438\u0439 >> >> \u043f\u0440\u043e\u0444\u0438\u043b\u044c >> >> >> >> Modified: >> >> incubator/jspwiki/trunk/etc/i18n/templates/default_zh_CN.properties >> >> URL: >> >> >> http://svn.apache.org/viewvc/incubator/jspwiki/trunk/etc/i18n/templates/= default_zh_CN.properties?rev=3D733278&r1=3D733277&r2=3D733278&view=3Ddiff >> >> >> >> >> =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D >> >> --- incubator/jspwiki/trunk/etc/i18n/templates/default_zh_CN.properti= es >> >> (original) >> >> +++ incubator/jspwiki/trunk/etc/i18n/templates/default_zh_CN.properti= es >> Sat >> >> Jan 10 06:39:30 2009 >> >> @@ -70,7 +70,6 @@ >> >> edit.restoring=3D\u5c06\u6062\u590d\u7248\u672c {0}\u3002\ >> >> >> \u5355\u51fb\u201c\u4fdd\u5b58\u201d\u6765\u8fdb\u884c\u6062\u590d\u300= 2\ >> >> >> >> >> \u4e5f\u53ef\u4ee5\u5728\u6062\u590d\u9875\u9762\u524d\u8fdb\u884c\u7f1= 6\u8f91\u3002 >> >> -edit.chooseeditor=3D\u7f16\u8f91\u5668 >> >> edit.tab.attachments=3D\u9644\u4ef6 >> >> edit.tab.help=3D\u5e2e\u52a9 >> >> edit.tab.edit=3D\u7f16\u8f91 >> >> @@ -348,21 +347,12 @@ >> >> >> >> >> prefs.cookies=3D\u60a8\u7684\u9009\u62e9\u5c06\u4fdd\u5b58\u4e3a\u6d4f\= u89c8\u5668\u4e2d\u7684 >> >> cookie\u3002 >> >> >> >> -prefs.user.skin=3D\u5916\u8868 >> >> -prefs.user.orientation=3D\u83dc\u5355\u4f4d\u7f6e >> >> -prefs.user.orientation.left=3D\u5de6\u4fa7 >> >> -prefs.user.orientation.right=3D\u53f3\u4fa7 >> >> #prefs.user.editorareaheight=3DEditor area height //not user anymor= e >> >> -prefs.user.sectionediting=3D\u6bb5\u843d\u7f16\u8f91 >> >> prefs.user.sectionediting.text=3D\u901a\u8fc7> >> >> href=3D"#">[\u7f16\u8f91]\u94fe\u63a5\u542f\u7528\u6bb5\u843d= \u7f16\u8f91 >> >> -prefs.user.timeformat=3D\u65f6\u95f4\u683c\u5f0f >> >> -prefs.user.timezone=3D\u65f6\u533a >> >> prefs.user.timezone.server=3D[\u670d\u52a1\u5668] >> >> -prefs.user.language=3D\u8bed\u8a00 >> >> prefs.user.language.default=3D[\u7f3a\u7701\u503c] >> >> >> >> >> prefs.instructions=3D\u5728\u6b64\u8bbe\u7f6e\u7528\u6237\u9996\u9009\u= 9879\u3002\u60a8\u7684\u9009\u62e9\u5c06\u4fdd\u5b58\u4e3a\u6d4f\u89c8\u566= 8\u4e2d\u7684 >> >> cookie\u3002 >> >> -prefs.assertedname=3D\u540d\u5b57 >> >> prefs.assertedname.description=3D\u60a8\u7684\u59d3\u540d\u3002\ >> >> >> \u5982\u679c\u8fd8\u672a\u521b\u5efa\u7528\u6237\u6982\u8981\u4fe1\u606= f\uff0c\u60a8\u53ef\u4ee5\u544a\u8bc9 >> >> {0} >> >> >> \u60a8\u7684\u540d\u5b57\u6765\u201c\u58f0\u660e\u201d\u81ea\u5df1\u7684= \u8eab\u4efd\u3002\ >> >> \u8bf7\u4e0d\u8981\u6b3a\u9a97\u6211\u4eec\u3002\ >> >> @@ -371,8 +361,6 @@ >> >> {0} >> >> >> \u5982\u679c\u8981\u4f7f\u7528\u4f20\u7edf\u7684\u7528\u6237\u540d\u548c= \u5bc6\u7801\uff0c\u8fd9\u9700\u8981\u66f4\u591a\u5b89\u5168\u6027\u3002 >> >> prefs.assertedname.create=3D\u521b\u5efa\u65b0\u7528\u6237\u4fe1\u60= 6f >> >> prefs.submit.setname=3D\u8bbe\u7f6e\u7528\u6237\u540d >> >> -prefs.save.prefs.submit=3D\u4fdd\u5b58\u7528\u6237\u9996\u9009\u9879 >> >> -prefs.clear.submit=3D\u6e05\u9664\u7528\u6237\u9996\u9009\u9879 >> >> >> >> >> prefs.clear.description=3D\u5728\u67d0\u4e9b\u60c5\u51b5\u4e0b\uff0c\u6= 0a8\u53ef\u80fd\u9700\u8981\u4ece\u8ba1\u7b97\u673a\u5220\u9664\u201cassert= ed\u201d\u7528\u6237\u540d\u548c\u7528\u6237\u9996\u9009\u9879\u3002\ >> >> >> >> >> \u8981\u8fd9\u6837\u505a\uff0c\u8bf7\u5355\u51fb\u201c\u6e05\u9664\u752= 8\u6237\u9996\u9009\u9879\u201d\u6309\u94ae\u3002\ >> >>
> >> >> />\u6ce8\u610f\uff0c\u8fd9\u5c06\u6c38\u8fdc\u5220\u9664\u60a8\u6240\u8b= be\u7f6e\u7684\u6240\u6709\u7528\u6237\u9996\u9009\u9879\u3002\ >> >> >> >> Modified: >> >> >> incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/action/LoginActionBean.jav= a >> >> URL: >> >> >> http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/com/ecyrd/jspwi= ki/action/LoginActionBean.java?rev=3D733278&r1=3D733277&r2=3D733278&view=3D= diff >> >> >> >> >> =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D >> >> --- >> >> >> incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/action/LoginActionBean.jav= a >> >> (original) >> >> +++ >> >> >> incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/action/LoginActionBean.jav= a >> >> Sat Jan 10 06:39:30 2009 >> >> @@ -124,7 +124,7 @@ >> >> catch ( LoginException e ) >> >> { >> >> log.info( "Failed to authenticate user " + m_username + "= , >> >> reason: " + e.getMessage()); >> >> - errors.addGlobalError( new SimpleError( e.getMessage() )= ); >> >> + errors.addGlobalError( new LocalizableError( >> >> "login.error.password" ) ); >> >> } >> >> catch( WikiSecurityException e ) >> >> { >> >> >> >> Modified: >> >> >> incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/preferences/Preferences.ja= va >> >> URL: >> >> >> http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/com/ecyrd/jspwi= ki/preferences/Preferences.java?rev=3D733278&r1=3D733277&r2=3D733278&view= =3Ddiff >> >> >> >> >> =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D >> >> --- >> >> >> incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/preferences/Preferences.ja= va >> >> (original) >> >> +++ >> >> >> incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/preferences/Preferences.ja= va >> >> Sat Jan 10 06:39:30 2009 >> >> @@ -132,7 +132,7 @@ >> >> /** >> >> * Cookie name for the user's preferred template skin. >> >> */ >> >> - public static final String PREFS_SKIN =3D "SkinName"; >> >> + public static final String PREFS_SKIN =3D "Skin"; >> >> >> >> private static final long serialVersionUID =3D 2L; >> >> >> >> >> >> Modified: incubator/jspwiki/trunk/src/webdocs/SisterSites.jsp >> >> URL: >> >> >> http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/webdocs/SisterS= ites.jsp?rev=3D733278&r1=3D733277&r2=3D733278&view=3Ddiff >> >> >> >> >> =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D >> >> --- incubator/jspwiki/trunk/src/webdocs/SisterSites.jsp (original) >> >> +++ incubator/jspwiki/trunk/src/webdocs/SisterSites.jsp Sat Jan 10 >> 06:39:30 >> >> 2009 >> >> @@ -4,7 +4,7 @@ >> >> <%@ page import=3D"java.text.*" %> >> >> <%@ page import=3D"com.ecyrd.jspwiki.rss.*" %> >> >> <%@ page import=3D"com.ecyrd.jspwiki.util.*" %> >> >> -<%@ taglib uri=3D"/WEB-INF/oscache.tld" prefix=3D"oscache" %> >> >> +<%@ taglib uri=3D"http://www.opensymphony.com/oscache" prefix=3D"osc= ache" >> %> >> >> <%! >> >> Logger log =3D LoggerFactory.getLogger("JSPWiki"); >> >> %> >> >> >> >> Modified: incubator/jspwiki/trunk/src/webdocs/rss.jsp >> >> URL: >> >> >> http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/webdocs/rss.jsp= ?rev=3D733278&r1=3D733277&r2=3D733278&view=3Ddiff >> >> >> >> >> =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D >> >> --- incubator/jspwiki/trunk/src/webdocs/rss.jsp (original) >> >> +++ incubator/jspwiki/trunk/src/webdocs/rss.jsp Sat Jan 10 06:39:30 2= 009 >> >> @@ -7,7 +7,7 @@ >> >> <%@ page import=3D"com.ecyrd.jspwiki.util.*" %> >> >> <%@ page import=3D"com.opensymphony.oscache.base.*" %> >> >> <%@ page import=3D"org.apache.jspwiki.api.WikiPage" %> >> >> -<%@ taglib uri=3D"/WEB-INF/oscache.tld" prefix=3D"oscache" %> >> >> +<%@ taglib uri=3D"http://www.opensymphony.com/oscache" prefix=3D"osc= ache" >> %> >> >> >> >> <%! >> >> Logger log =3D LoggerFactory.getLogger("JSPWiki"); >> >> >> >> Modified: >> >> incubator/jspwiki/trunk/src/webdocs/templates/default/EditLayout.jsp >> >> URL: >> >> >> http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/webdocs/templat= es/default/EditLayout.jsp?rev=3D733278&r1=3D733277&r2=3D733278&view=3Ddiff >> >> >> >> >> =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D >> >> --- incubator/jspwiki/trunk/src/webdocs/templates/default/EditLayout.= jsp >> >> (original) >> >> +++ incubator/jspwiki/trunk/src/webdocs/templates/default/EditLayout.= jsp >> >> Sat Jan 10 06:39:30 2009 >> >> @@ -6,50 +6,45 @@ >> >> >> >> >> >> >> >> - >> >> - >> >> - >> >> - <wiki:CheckRequestContext context=3D"edit"> >> >> - <fmt:message key=3D"edit.title.edit"> >> >> - <fmt:param><wiki:Variable var=3D"ApplicationName" /></fmt:para= m> >> >> - <fmt:param><wiki:PageName/></fmt:param> >> >> - </fmt:message> >> >> - </wiki:CheckRequestContext> >> >> - <wiki:CheckRequestContext context=3D"comment"> >> >> - <fmt:message key=3D"comment.title.comment"> >> >> - <fmt:param><wiki:Variable var=3D"ApplicationName" /></fmt:para= m> >> >> - <fmt:param><wiki:PageName/></fmt:param> >> >> - </fmt:message> >> >> - </wiki:CheckRequestContext> >> >> - >> >> - >> >> - >> >> - >> >> - >> >> -> >> context=3D'edit'>class=3D"edit" >> >> > >> context=3D'comment'>class=3D"comment" > >> >> - >> >> -
>> >> - >> >> - >> >> - >> >> -
>> >> - >> >> -
>> >> - >> >> - >> >> - >> >> -
>> >> - >> >> - >> >> - >> >> -
>> >> -
>> >> - >> >> - >> >> - >> >> -
>> >> - >> >> - >> >> + >> >> + >> >> + <wiki:CheckRequestContext context=3D"edit"> >> >> + <fmt:message key=3D"edit.title.edit"> >> >> + <fmt:param><wiki:Variable var=3D"ApplicationName" /></fmt:pa= ram> >> >> + <fmt:param><wiki:PageName/></fmt:param> >> >> + </fmt:message> >> >> + </wiki:CheckRequestContext> >> >> + <wiki:CheckRequestContext context=3D"comment"> >> >> + <fmt:message key=3D"comment.title.comment"> >> >> + <fmt:param><wiki:Variable var=3D"ApplicationName" /></fmt:pa= ram> >> >> + <fmt:param><wiki:PageName/></fmt:param> >> >> + </fmt:message> >> >> + </wiki:CheckRequestContext> >> >> + >> >> + >> >> + >> >> + >> >> + >> >> + >> >> +
>> >> + >> >> + >> >> + >> >> +
>> >> +
>> >> + >> >> + >> >> + >> >> +
>> >> + >> >> +
>> >> +
>> >> + >> >> + >> >> + >> >> +
>> >> + >> >> + >> >> >> >> >> >> >> >> >> >> Modified: >> incubator/jspwiki/trunk/src/webdocs/templates/default/Footer.jsp >> >> URL: >> >> >> http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/webdocs/templat= es/default/Footer.jsp?rev=3D733278&r1=3D733277&r2=3D733278&view=3Ddiff >> >> >> >> >> =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D >> >> --- incubator/jspwiki/trunk/src/webdocs/templates/default/Footer.jsp >> >> (original) >> >> +++ incubator/jspwiki/trunk/src/webdocs/templates/default/Footer.jsp = Sat >> >> Jan 10 06:39:30 2009 >> >> @@ -1,17 +1,13 @@ >> >> <%@ taglib uri=3D"http://jakarta.apache.org/jspwiki.tld" prefix=3D"w= iki" >> %> >> >> +<%@ taglib uri=3D"http://java.sun.com/jsp/jstl/core" prefix=3D"c" %> >> >> <%@ taglib uri=3D"http://java.sun.com/jsp/jstl/fmt" prefix=3D"fmt" %= > >> >> +<%@ taglib uri=3D"http://stripes.sourceforge.net/stripes.tld" >> >> prefix=3D"stripes" %> >> >> <%@ page import=3D"com.ecyrd.jspwiki.*" %> >> >> -<%@ page import=3D"javax.servlet.jsp.jstl.fmt.*" %> >> >> -<%@ page import=3D"com.ecyrd.jspwiki.action.WikiContextFactory" %> >> >> -<% >> >> - WikiContext c =3D WikiContextFactory.findContext( pageContext ); >> >> - String frontpage =3D c.getEngine().getFrontPage(); >> >> -%> >> >>
>> >> >> >> -
>> >> - ' format=3D'url'= />" >> >> - title=3D"> >> ><%=3Dfrontpage%> ">> >> key=3D'actions.home' /> >> >> +
>> >> + > >> >> >> /> >> >> + > >> title=3D"${frontPageTitle}">> /> >> >>
>> >> >> >>
>> >> >> >> Modified: >> incubator/jspwiki/trunk/src/webdocs/templates/default/Header.jsp >> >> URL: >> >> >> http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/webdocs/templat= es/default/Header.jsp?rev=3D733278&r1=3D733277&r2=3D733278&view=3Ddiff >> >> >> >> >> =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D >> >> --- incubator/jspwiki/trunk/src/webdocs/templates/default/Header.jsp >> >> (original) >> >> +++ incubator/jspwiki/trunk/src/webdocs/templates/default/Header.jsp = Sat >> >> Jan 10 06:39:30 2009 >> >> @@ -1,19 +1,14 @@ >> >> <%@ taglib uri=3D"http://jakarta.apache.org/jspwiki.tld" prefix=3D"w= iki" >> %> >> >> +<%@ taglib uri=3D"http://java.sun.com/jsp/jstl/core" prefix=3D"c" %> >> >> <%@ taglib uri=3D"http://java.sun.com/jsp/jstl/fmt" prefix=3D"fmt" %= > >> >> -<%@ page import=3D"com.ecyrd.jspwiki.*" %> >> >> -<%@ page import=3D"com.ecyrd.jspwiki.action.WikiContextFactory" %> >> >> -<% >> >> - WikiContext c =3D WikiContextFactory.findContext( pageContext ); >> >> - String frontpage =3D c.getEngine().getFrontPage(); >> >> -%> >> >> - >> >> +<%@ taglib uri=3D"http://stripes.sourceforge.net/stripes.tld" >> >> prefix=3D"stripes" %> >> >>
>> >> >> >>
>> >> >> >> -
>> >> - ' format=3D'url'= />" >> >> - title=3D"> >> ><%=3Dfrontpage%> ">> >> key=3D'actions.home' /> >> >> +
>> >> + > >> >> >> /> >> >> + > >> title=3D"${frontPageTitle}">> /> >> >>
>> >> >> >>
>> >> >> >> Modified: >> >> >> incubator/jspwiki/trunk/src/webdocs/templates/default/PageActionsBottom.= jsp >> >> URL: >> >> >> http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/webdocs/templat= es/default/PageActionsBottom.jsp?rev=3D733278&r1=3D733277&r2=3D733278&view= =3Ddiff >> >> >> >> >> =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D >> >> --- >> >> >> incubator/jspwiki/trunk/src/webdocs/templates/default/PageActionsBottom.= jsp >> >> (original) >> >> +++ >> >> >> incubator/jspwiki/trunk/src/webdocs/templates/default/PageActionsBottom.= jsp >> >> Sat Jan 10 06:39:30 2009 >> >> @@ -1,38 +1,30 @@ >> >> <%@ taglib uri=3D"http://jakarta.apache.org/jspwiki.tld" prefix=3D"w= iki" >> %> >> >> -<%@ page import=3D"com.ecyrd.jspwiki.*" %> >> >> -<%@ taglib uri=3D"http://java.sun.com/jsp/jstl/core" prefix=3D"c" %> >> >> <%@ taglib uri=3D"http://java.sun.com/jsp/jstl/fmt" prefix=3D"fmt" %= > >> >> -<%@ page import=3D"com.ecyrd.jspwiki.action.WikiContextFactory" %> >> >> -<%@ page import=3D"org.apache.jspwiki.api.WikiPage" %> >> >> -<% >> >> - WikiContext c =3D WikiContextFactory.findContext( pageContext ); >> >> - WikiPage wikipage =3D c.getPage(); >> >> -%> >> >> >> >> -
>> >> - >> >> - >> >> - > >> key=3D'actions.gototop' />">« >> >> - >> >> - >> >> - >> >> - >> >> - > >> newVersion=3D"previous">> >> /> >> >> - >> >> - >> >> - >> >> - >> >> - >> >> - >> >> - > >> /> >> >> - >> >> - >> >> - >> >> - >> >> - >> >> - >> >> - >> >> - >> >> - > >> /> >> >> -
>> >> +
>> >> + >> >> + >> >> + > >> key=3D'actions.gototop' />">« >> >> + >> >> + >> >> + >> >> + >> >> + > >> newVersion=3D"previous">> >> /> >> >> + >> >> + >> >> + >> >> + >> >> + >> >> + >> >> + > >> /> >> >> + >> >> + >> >> + >> >> + >> >> + >> >> + >> >> + >> >> + >> >> + > >> /> >> >> +
>> >> >> >> \ No newline at end of file >> >> >> >> Modified: >> >> incubator/jspwiki/trunk/src/webdocs/templates/default/PageActionsTop.= jsp >> >> URL: >> >> >> http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/webdocs/templat= es/default/PageActionsTop.jsp?rev=3D733278&r1=3D733277&r2=3D733278&view=3Dd= iff >> >> >> >> >> =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D >> >> --- >> >> incubator/jspwiki/trunk/src/webdocs/templates/default/PageActionsTop.= jsp >> >> (original) >> >> +++ >> >> incubator/jspwiki/trunk/src/webdocs/templates/default/PageActionsTop.= jsp >> Sat >> >> Jan 10 06:39:30 2009 >> >> @@ -1,26 +1,45 @@ >> >> <%@ taglib uri=3D"http://jakarta.apache.org/jspwiki.tld" prefix=3D"w= iki" >> %> >> >> -<%@ page import=3D"com.ecyrd.jspwiki.*" %> >> >> <%@ taglib uri=3D"http://java.sun.com/jsp/jstl/core" prefix=3D"c" %> >> >> <%@ taglib uri=3D"http://java.sun.com/jsp/jstl/fmt" prefix=3D"fmt" %= > >> >> +<%@ taglib uri=3D"http://stripes.sourceforge.net/stripes.tld" >> >> prefix=3D"stripes" %> >> >>
>> >>
    >> >> - >> >> + >> >> >> >> - >> >> -
  • >> >> - >> >> - " accesskey=3D"= e" >> >> class=3D"action edit" title=3D"> >> />"> >> >> - >> >> - >> >> - Edit.jsp?page=3D" >> >> accesskey=3D"e" class=3D"action edit" title=3D"> >> key=3D'actions.editparent.title' />">> >> /> >> >> - >> >> -
    • >> >> -     >> >> + >> >> +
  • >> >> + >> >> + > key=3D"actions.edit.title" >> >> /> >> >> + > >> + beanclass=3D"com.ecyrd.jspwiki.action.EditActionBean" >> >> event=3D"edit" >> >> + accesskey=3D"e" class=3D"action edit" >> >> + title=3D"${editTitle}"> >> >> + >> >> + > wikiContext.page.name}" >> >> /> >> >> + >> >> + >> >> + >> >> + > >> key=3D"actions.editparent.title" /> >> >> + > >> + beanclass=3D"com.ecyrd.jspwiki.action.EditActionBean" >> >> event=3D"edit" >> >> + accesskey=3D"e" class=3D"action edit" >> >> + title=3D"${editParentTitle}"> >> >> + >> >> + > >> name=3D"page"> >> >> + >> >> + >> >> +
    • >> >> +     >> >>     >> >> >> >> <%-- converted to popup menu by jspwiki-common.js--%> >> >>
  • >> >> - " >> class=3D"action >> >> more"> >> >> + > >> + beanclass=3D"com.ecyrd.jspwiki.action.ViewActionBean" >> >> + class=3D"action more"> >> >> + >> >> + >> >> + >> >>
    • >> >> >> >>
>> >> >> >> Modified: >> >> incubator/jspwiki/trunk/src/webdocs/templates/default/PreferencesTab.= jsp >> >> URL: >> >> >> http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/webdocs/templat= es/default/PreferencesTab.jsp?rev=3D733278&r1=3D733277&r2=3D733278&view=3Dd= iff >> >> >> >> >> =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D >> >> --- >> >> incubator/jspwiki/trunk/src/webdocs/templates/default/PreferencesTab.= jsp >> >> (original) >> >> +++ >> >> incubator/jspwiki/trunk/src/webdocs/templates/default/PreferencesTab.= jsp >> Sat >> >> Jan 10 06:39:30 2009 >> >> @@ -27,7 +27,7 @@ >> >> > >> beanclass=3D"com.ecyrd.jspwiki.action.UserPreferencesActionBean" >> >> class=3D"wikiform" id=3D"setCookie" method=3D"post" acceptcharset=3D"= UTF-8"> >> >> >> >> >> >> - >> >> + >> >> >> >> - >> >> >> >> >> >> >> >> - >> >> + >> >> >> >> >> >> >> >> - >> >> + >> >> >> >> - >> >> + >> >> >> >> >> >> >> >> >> >> >> >> - >> >> + >> >> >> >> >> >> >> >> >> >> - >> >> + >> >> >> >> >> >> >> >> - >> >> + >> >> >> >> >> >> >> >> @@ -164,7 +164,7 @@ >> >> >> >> > >> beanclass=3D"com.ecyrd.jspwiki.action.UserPreferencesActionBean" >> >> id=3D"clearCookie" method=3D"post" acceptcharset=3D"UTF-8"> >> >>
>> >> - > >> key=3D'prefs.clear.submit' /> >> >> + >> >>
>> >>
> />
>> >> >> >> >> >> Modified: >> incubator/jspwiki/trunk/src/webdocs/templates/default/UserBox.jsp >> >> URL: >> >> >> http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/webdocs/templat= es/default/UserBox.jsp?rev=3D733278&r1=3D733277&r2=3D733278&view=3Ddiff >> >> >> >> >> =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D >> >> --- incubator/jspwiki/trunk/src/webdocs/templates/default/UserBox.jsp >> >> (original) >> >> +++ incubator/jspwiki/trunk/src/webdocs/templates/default/UserBox.jsp >> Sat >> >> Jan 10 06:39:30 2009 >> >> @@ -1,11 +1,7 @@ >> >> <%@ taglib uri=3D"http://jakarta.apache.org/jspwiki.tld" prefix=3D"w= iki" >> %> >> >> +<%@ taglib uri=3D"http://java.sun.com/jsp/jstl/core" prefix=3D"c" %> >> >> <%@ taglib uri=3D"http://java.sun.com/jsp/jstl/fmt" prefix=3D"fmt" %= > >> >> -<%@ page import=3D"javax.servlet.jsp.jstl.fmt.*" %> >> >> -<%@ page import=3D"com.ecyrd.jspwiki.*" %> >> >> -<%@ page import=3D"com.ecyrd.jspwiki.action.WikiContextFactory" %> >> >> -<% >> >> - WikiContext c =3D WikiContextFactory.findContext( pageContext ); >> >> -%> >> >> +<%@ taglib uri=3D"http://stripes.sourceforge.net/stripes.tld" >> >> prefix=3D"stripes" %> >> >>
>> >> >> >> >> >> @@ -30,31 +26,41 @@ >> >> >> >> <%-- action buttons --%> >> >> >> >> - >> >> - >> >> - > >> - name=3D'redirect' >> >> >> value=3D'<%=3Dc.getEngine().encodeName(c.getPage().getName())%>'/>" >> >> - class=3D"action login" >> >> - title=3D"">> >> key=3D"actions.login"/> >> >> - >> >> - >> >> + >> >> + >> >> + > >> /> >> >> + > >> + beanclass=3D"com.ecyrd.jspwiki.action.LoginActionBean" >> >> + class=3D"action login" >> >> + title=3D"${loginTitle}"> >> >> + > wikiContext.page.name}" >> >> /> >> >> + >> >> + >> >> + >> >> + >> >> >> >> >> >> >> >> - " >> >> - class=3D"action logout" >> >> - title=3D"">> >> key=3D"actions.logout"/> >> >> - <%--onclick=3D"return( confirm('> >> key=3D"actions.confirmlogout"/>') && (location=3Dthis.href) );"--%> >> >> + > >> /> >> >> + > >> + beanclass=3D"com.ecyrd.jspwiki.action.LoginActionBean" >> event=3D"logout" >> >> + class=3D"action logout" >> >> + title=3D"${logoutTitle}"> >> >> + >> >> + >> >> >> >> >> >> >> >> - >> >> - > >> >> >> - >> >> >> value=3D'<%=3Dc.getEngine().encodeName(c.getPage().getName())%>'/>" >> >> - class=3D"action prefs" accesskey=3D"p" >> >> - title=3D"">> >> key=3D"actions.prefs" /> >> >> - >> >> - >> >> + >> >> + > >> /> >> >> + > >> + beanclass=3D"com.ecyrd.jspwiki.action.UserPreferencesActionB= ean" >> >> + class=3D"action prefs" accesskey=3D"p" >> >> + title=3D"${prefsTitle}"> >> >> + > }" >> >> /> >> >> + >> >> + >> >> + >> >> >> >> >> >>
>> >> >> >> Modified: >> >> incubator/jspwiki/trunk/src/webdocs/templates/default/ViewLayout.jsp >> >> URL: >> >> >> http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/webdocs/templat= es/default/ViewLayout.jsp?rev=3D733278&r1=3D733277&r2=3D733278&view=3Ddiff >> >> >> >> >> =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D >> >> --- incubator/jspwiki/trunk/src/webdocs/templates/default/ViewLayout.= jsp >> >> (original) >> >> +++ incubator/jspwiki/trunk/src/webdocs/templates/default/ViewLayout.= jsp >> >> Sat Jan 10 06:39:30 2009 >> >> @@ -1,56 +1,50 @@ >> >> <%@ taglib uri=3D"http://jakarta.apache.org/jspwiki.tld" prefix=3D"w= iki" >> %> >> >> <%@ taglib uri=3D"http://java.sun.com/jsp/jstl/fmt" prefix=3D"fmt" %= > >> >> <%@ taglib uri=3D"http://stripes.sourceforge.net/stripes.tld" >> >> prefix=3D"stripes" %> >> >> -<%@ page import=3D"com.ecyrd.jspwiki.*" %> >> >> > >> http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> >> >> >> >> >> >> >> >> >> >> - >> >> - >> >> - >> >> - <fmt:message key=3D"view.title.view"> >> >> - <fmt:param><wiki:Variable var=3D"ApplicationName" /></fmt:para= m> >> >> - <fmt:param><wiki:PageName/></fmt:param> >> >> - </fmt:message> >> >> - >> >> - >> >> - >> >> - >> >> - >> >> - >> >> - >> >> - >> >> - >> >> - >> >> - >> >> - >> >> - >> >> - >> >> - >> >> -
>> >> - >> >> - >> >> - >> >> -
>> >> - >> >> -
>> >> - >> >> - >> >> - >> >> + >> >> + >> >> + <fmt:message key=3D"view.title.view"> >> >> + <fmt:param><wiki:Variable var=3D"ApplicationName" /></fmt:pa= ram> >> >> + <fmt:param><wiki:PageName/></fmt:param> >> >> + </fmt:message> >> >> + >> >> + >> >> + >> >> + >> >> + >> >> + >> >> + >> >> + >> >> + >> >> + >> >> + >> >> + >> >> + >> >> + >> >> +
>> >> + >> >> + >> >> + >> >> +
>> >> +
>> >> + >> >> + >> >> + >> >> +
>> >> + >> >> +
>> >> +
>> >> + >> >> + >> >> + >> >>
>> >> + >> >> >> >> - >> >> - >> >> -
>> >> -
>> >> - >> >> - >> >> - >> >> -
>> >> - >> >> - >> >> >> >> >> >> >> >> >> >> Modified: >> >> incubator/jspwiki/trunk/src/webdocs/templates/default/commonheader.js= p >> >> URL: >> >> >> http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/webdocs/templat= es/default/commonheader.jsp?rev=3D733278&r1=3D733277&r2=3D733278&view=3Ddif= f >> >> >> >> >> =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D >> >> --- >> incubator/jspwiki/trunk/src/webdocs/templates/default/commonheader.jsp >> >> (original) >> >> +++ >> incubator/jspwiki/trunk/src/webdocs/templates/default/commonheader.jsp >> >> Sat Jan 10 06:39:30 2009 >> >> @@ -37,7 +37,7 @@ >> >> >> >> >> >> >> >> -> />' >> >> /> >> >> + >> >> ' /> >> >> > />' >> >> /> >> >> ' /> >> >> @@ -45,7 +45,7 @@ >> >> ' >> >> /><%--pagename without blanks--%> >> >> ' /> >> >> > >> templatefile=3D"" />' /> >> >> -> >> var=3D"ApplicationName" />' /> >> >> +> content=3D'${wikiEngine.applicationName}' >> >> /> >> >> >> >> >> >> >> >> > >> charset=3D" /> >> >> -" >> >> title=3D'Search ' /> >> >> +" >> >> title=3D'Search ${wikiEngine.applicationName}' /> >> >> > >> page=3D'TextFormattingRules' />" title=3D"Help" /> >> >> -<% >> >> - WikiContext c =3D WikiContextFactory.findContext( pageContext ); >> >> - String frontpage =3D c.getEngine().getFrontPage(); >> >> - %> >> >> - > page=3D'<%=3Dfrontpage%>' >> >> />" title=3D"Front page" /> >> >> +> >> page=3D'${wikiEngine.frontPage}' />" title=3D"Front page" /> >> >> > >> format=3D'url' templatefile=3D'jspwiki_print.css' />" title=3D"Print = friendly" >> /> >> >> > >> format=3D'url' templatefile=3D'jspwiki.css' />" title=3D"Standard" /> >> >> > >> format=3D'url' jsp=3D'images/favicon.ico' />" /> >> >> @@ -79,13 +75,13 @@ >> >> >> >> >> >> <%-- SKINS : extra stylesheets, extra javascript --%> >> >> -> (prefs.SkinName!=3D"PlainVanilla") >> >> }'> >> >> -> print" >> >> href=3D"> >> value=3D'${prefs.SkinName}/skin.css' />" /> >> >> + >> >> +> print" >> >> href=3D"> templatefile=3D'skins/${prefs.Skin}/skin.css' >> >> />" /> >> >> <%-- >> >> > >> - href=3D"> >> value=3D'${prefs.SkinName}/print_skin.css' />" /> >> >> + href=3D"> >> templatefile=3D'skins/${prefs.Skin}/print_skin.css' />" /> >> >> --%> >> >> - >> >> + >> >> >> >> >> >> >> >> \ No newline at end of file >> >> >> >> >> >> >> > >> >
> /> >> >> > >> size=3D"20"> >> >> >> >> @@ -52,7 +52,7 @@ >> >> >> >> >> >>
>> >> + >> >>
> name=3D"prefs.user.sectionediting" >> >> /> >> >> > >> checked=3D"true" /> >> >> >> >> @@ -73,7 +73,7 @@ >> >>
>> >> >> >> >> >> @@ -84,28 +84,28 @@ >> >> >> >> >> >>
> /> >> >> >> >> >> >> >> >> - >> >> + >> >>
> >> /> >> >> >> >> - > >> enum=3D"com.ecyrd.jspwiki.preferences.Preferences.Orientation" /> >> >> + > >> enum=3D"com.ecyrd.jspwiki.preferences.Preferences.Orientation" >> label=3D"name" /> >> >> >> >> >> >>
> >> /> >> >> >> >> >> >> @@ -115,7 +115,7 @@ >> >>
> /> >> >> >> >> >> >> @@ -148,7 +148,7 @@ >> >>
  >> >> - > >> key=3D'prefs.save.prefs.submit' /> >> >> + >> >> > >> default=3D'' /> >> >>
>> >>