jspwiki-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From juanpa...@apache.org
Subject svn commit: r1225830 [1/4] - in /incubator/jspwiki/trunk/src/WebContent: WEB-INF/classes/ WEB-INF/classes/templates/ templates/default/editors/ templates/default/layout/
Date Fri, 30 Dec 2011 14:02:29 GMT
Author: juanpablo
Date: Fri Dec 30 14:02:28 2011
New Revision: 1225830

URL: http://svn.apache.org/viewvc?rev=1225830&view=rev
Log:
3.0.0-svn-234

JSPWIKI-693

fixed following items:
- quick navigation image is mis-placed outside quick navigation box (see attached p1.png) (may be because of that, horizontal scroll appears on view page)
- edit area should get as wide as it can
- horizontal & vertical scrolls appear on edit page
- tooltip on quick navigation button refers to ?find.submit.go? 

because of the last item, the i18n resource with key org.apache.wiki.action.SearchActionBean.go in CoreResources_*.properties has been moved to sbox.go in default_*.properties (also, the es translation contains some more fixes).

Finally, main layouts weren't including doctypes inside the layout itself which caused some other style issues.

Modified:
    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_pt_BR.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_pt_BR.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/templates/default/editors/plain.jsp
    incubator/jspwiki/trunk/src/WebContent/templates/default/layout/DefaultLayout.jsp
    incubator/jspwiki/trunk/src/WebContent/templates/default/layout/EditorLayout.jsp
    incubator/jspwiki/trunk/src/WebContent/templates/default/layout/SearchBox.jsp
    incubator/jspwiki/trunk/src/WebContent/templates/default/layout/StaticLayout.jsp

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=1225830&r1=1225829&r2=1225830&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/WebContent/WEB-INF/classes/CoreResources.properties (original)
+++ incubator/jspwiki/trunk/src/WebContent/WEB-INF/classes/CoreResources.properties Fri Dec 30 14:02:28 2011
@@ -134,7 +134,7 @@ install.installer.unable.read.props=Unab
 install.installer.default.appname=MyWiki
 install.installer.default.pagedir=Please configure me!
 install.installer.props.saved=Your new properties have been saved.  Please restart your container (unless this was your first install).  Scroll down a bit to see your new jspwiki.properties.
-install.installer.props.notsaved=Unable to write properties: {0}. Please copy the file below as your jspwiki.properties:\n{1}
+install.installer.props.notsaved=Unable to write properties\: {0}. Please copy the file below as your jspwiki.properties\:\n{1}
 install.installer.validate.baseurl=You must define the base URL for this wiki.
 install.installer.validate.pagedir=You must define the location where the files are stored.
 install.installer.validate.appname=You must define the application name.
@@ -378,8 +378,6 @@ org.apache.wiki.action.DeleteActionBean.
 org.apache.wiki.action.RenameActionBean.rename=Rename page
 #Formerly login.lostpw.submit. Formerly named resetPassword.
 org.apache.wiki.action.LostPasswordActionBean.reset=Reset password
-#Copied from src/WebContent/WEB-INF/classes/templates/default.properties.. Formerly named find.submit.go.. Formerly named org.apache.wiki.action.SearchActionBean.search.
-org.apache.wiki.action.SearchActionBean.go=Go
 #Copied from src/WebContent/WEB-INF/classes/templates/default.properties.. Formerly named find.submit.find.
 org.apache.wiki.action.SearchActionBean.search=Find
 #Copied from src/WebContent/WEB-INF/classes/templates/default.properties.. Formerly named find.scope.all.

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=1225830&r1=1225829&r2=1225830&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 Dec 30 14:02:28 2011
@@ -80,7 +80,7 @@ login.error.noaccess=Du hast offenbar ke
 
 # 0 = login name, 1 = password, 2 = URL, 3 = Application name (as signature)
 # This is text, not HTML.
-lostpwd.newpassword.email=Das Passwort für deinen Zugang bei {3} wurde wie gewünscht zurückgesetzt: \n\nBenutzername: {0}\nPasswort    : {1}\n\nDu kannst dich unter {2} neu einloggen! Bitte ändere dieses generierte Passwort in ein eigenes.\n\n-- {3}
+lostpwd.newpassword.email=Das Passwort f\u00FCr deinen Zugang bei {3} wurde wie gew\u00FCnscht zur\u00FCckgesetzt\: \n\nBenutzername\: {0}\nPasswort    \: {1}\n\nDu kannst dich unter {2} neu einloggen\! Bitte \u00E4ndere dieses generierte Passwort in ein eigenes.\n\n-- {3}
 lostpwd.newpassword.subject=Neues Passwort für {0}
 lostpwd.nouser=Ein Benutzer mit der E-Mail-Adresse {0} konnte nicht gefunden werden!
 lostpwd.nomail=Interner Fehler: Die E-Mail konnte nicht gesendet werden. Bitte kontaktiere den Administrator dieser Seite!
@@ -139,7 +139,7 @@ install.installer.unable.read.props=Fehl
 install.installer.default.appname=MeinWiki
 install.installer.default.pagedir=Bitte konfigurieren!
 install.installer.props.saved=Deine neuen Einstellungen wurden gespeichert. Bitte starte deinen Container neu, um die Einstellungen zu übernehmen (sofern dies nicht die Erstinstallation war). Scrolle etwas weiter nach unten, um deine neue jspwiki.properties zu sehen.
-install.installer.props.notsaved=Fehler beim Schreiben der Einstellungen: {0}. Bitte speichere die untenstehende Datei als deine jspwiki.properties ab:\n{1}
+install.installer.props.notsaved=Fehler beim Schreiben der Einstellungen\: {0}. Bitte speichere die untenstehende Datei als deine jspwiki.properties ab\:\n{1}
 install.installer.validate.baseurl=Du musst die Basis-URL für dieses Wiki angeben.
 install.installer.validate.pagedir=Du musst das Verzeichnis angeben, in dem die Wiki-Inhalte gespeichert werden sollen.
 install.installer.validate.appname=Du musst einen Anwendungsnamen angeben.
@@ -349,8 +349,6 @@ org.apache.wiki.action.DeleteActionBean.
 org.apache.wiki.action.RenameActionBean.rename=Seite umbenennen
 #Formerly login.lostpw.submit. Formerly named resetPassword.
 org.apache.wiki.action.LostPasswordActionBean.reset=Passwort zurücksetzen
-#Copied from src/WebContent/WEB-INF/classes/templates/default.properties.. Formerly named find.submit.go.. Formerly named org.apache.wiki.action.SearchActionBean.search.
-org.apache.wiki.action.SearchActionBean.go=Los!
 #Copied from src/WebContent/WEB-INF/classes/templates/default.properties.. Formerly named find.submit.find.
 org.apache.wiki.action.SearchActionBean.search=Finde!
 #Copied from src/WebContent/WEB-INF/classes/templates/default.properties.. Formerly named find.scope.all.

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=1225830&r1=1225829&r2=1225830&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 Dec 30 14:02:28 2011
@@ -76,7 +76,7 @@ login.error.noaccess=Parece que no tiene
 # Lostpassword
 
 # 0 = login name, 1 = password, 2 = URL, 3 = Application name (as signature)
-lostpwd.newpassword.email=Tal como pediste, tu nueva contraseña para tu id. de acceso "{0}" es "{1}" \n\nPuedes identificarte en {2}.\n\n-- {3}
+lostpwd.newpassword.email=Tal como pediste, tu nueva contrase\u00F1a para tu id. de acceso "{0}" es "{1}" \n\nPuedes identificarte en {2}.\n\n-- {3}
 lostpwd.newpassword.subject=Nueva contraseña para {0}
 lostpwd.nouser=No se encontró usuario o e-mail para '{0}'.
 lostpwd.nomail=Error interno: ¡no se pudo enviar el correo electrónico! Por favor, contacte con el administrador del sitio.
@@ -136,7 +136,7 @@ install.installer.unable.read.props=Inca
 install.installer.default.appname=MiWiki
 install.installer.default.pagedir=¡Por favor configúrame!
 install.installer.props.saved=Tus nuevas propiedades han sido guardadas.  Por favor, reinicia tu contenedor de aplicaciones (excepto si ha sido tu primera instalación).  Navega hacia el final de la página para ver el contenido de tu fichero jspwiki.properties.
-install.installer.props.notsaved=Incapaz de escribir las propiedades: {0}. Por favor copia el guarda el siguiente fichero como jspwiki.properties:\n{1}
+install.installer.props.notsaved=Incapaz de escribir las propiedades\: {0}. Por favor copia el guarda el siguiente fichero como jspwiki.properties\:\n{1}
 install.installer.validate.baseurl=Tienes que definir el URL base para este wiki.
 install.installer.validate.pagedir=Tienes que definir la ruta dónde quieres guardar los ficheros.
 install.installer.validate.appname=Tienes que definir el nombre de la aplicación.
@@ -346,11 +346,9 @@ org.apache.wiki.action.DeleteActionBean.
 #Copied from src/WebContent/WEB-INF/classes/templates/default.properties.. Formerly named info.rename.submit.. Formerly named org.apache.wiki.action.ViewActionBean.delete.. Formerly named org.apache.wiki.action.ViewActionBean.rename.
 org.apache.wiki.action.RenameActionBean.rename=Renombrar página
 #Formerly named resetPassword.
-org.apache.wiki.action.LostPasswordActionBean.reset=¡Resetear contraseña!
-#Copied from src/WebContent/WEB-INF/classes/templates/default.properties.. Formerly named find.submit.go.. Formerly named org.apache.wiki.action.SearchActionBean.search.
-org.apache.wiki.action.SearchActionBean.go=¡Ir!
+org.apache.wiki.action.LostPasswordActionBean.reset=\u00A1Resetear contrase\u00F1a\!
 #Copied from src/WebContent/WEB-INF/classes/templates/default.properties.. Formerly named find.submit.find.
-org.apache.wiki.action.SearchActionBean.search=¡Buscar!
+org.apache.wiki.action.SearchActionBean.search=\u00A1Buscar\!
 #Copied from src/WebContent/WEB-INF/classes/templates/default.properties.. Formerly named find.scope.all.
 SearchScope.ALL=Buscar en todos lados
 #Copied from src/WebContent/WEB-INF/classes/templates/default.properties.. Formerly named find.scope.authors.

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=1225830&r1=1225829&r2=1225830&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 Dec 30 14:02:28 2011
@@ -61,7 +61,7 @@ rename.unknownerror=Tuntematon härjö (
 
 # 0 = login name, 1 = password, 2 = URL, 3 = Application name (as signature)
 # This is plain text, not HTML.
-lostpwd.newpassword.email=Uusi salasanasi tunnukselle "{0}" on "{1}" \n\nVoit käyttää sitä menemällä osoitteeseen {2}.\n\n-- Terveisin, {3}
+lostpwd.newpassword.email=Uusi salasanasi tunnukselle "{0}" on "{1}" \n\nVoit k\u00E4ytt\u00E4\u00E4 sit\u00E4 menem\u00E4ll\u00E4 osoitteeseen {2}.\n\n-- Terveisin, {3}
 lostpwd.newpassword.subject={0}: Uusi salasanasi
 lostpwd.nouser=Käyttäjää tai sähköpostiosoitetta "{0}" ei löydetty.
 lostpwd.nomail=Järjestelmävirhe: en voinut lähettää sähköpostia.  Olisitko niin kiltti, että ilmoittaisit asiasta ylläpidolle?
@@ -242,8 +242,6 @@ org.apache.wiki.action.DeleteActionBean.
 org.apache.wiki.action.RenameActionBean.rename=Vaihda sivun nimeä
 #Formerly named resetPassword.
 org.apache.wiki.action.LostPasswordActionBean.reset=Lähetä uusi salasana!
-#Copied from src/WebContent/WEB-INF/classes/templates/default.properties.. Formerly named find.submit.go.. Formerly named org.apache.wiki.action.SearchActionBean.search.
-org.apache.wiki.action.SearchActionBean.go=Mene!
 #Copied from src/WebContent/WEB-INF/classes/templates/default.properties.. Formerly named find.submit.find.
 org.apache.wiki.action.SearchActionBean.search=Etsi!
 #Copied from src/WebContent/WEB-INF/classes/templates/default.properties.. Formerly named find.scope.all.

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=1225830&r1=1225829&r2=1225830&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 Dec 30 14:02:28 2011
@@ -77,7 +77,7 @@ login.error.noaccess=Il semble que vous 
 
 # 0 = identifiant, 1 = mot de passe, 2 = URL, 3 = Nom d'application  (comme signature)
 # Ceci est du texte brut, et non de l'HTML.
-lostpwd.newpassword.email=Comme demandé, votre nouveau mot de passe pour l''identifiant "{0}" est "{1}" \n\nVous pouvez vous identifier en tant que {2}.\n\n-- {3}
+lostpwd.newpassword.email=Comme demand\u00E9, votre nouveau mot de passe pour l''identifiant "{0}" est "{1}" \n\nVous pouvez vous identifier en tant que {2}.\n\n-- {3}
 lostpwd.newpassword.subject=Nouveau mot de passe pour {0}
 lostpwd.nouser=Aucun identifiant ou adresse e-mail "{0}" n''ont pu être trouvés.
 lostpwd.nomail=Erreur interne : impossible d'envoyer un e-mail ! Veuillez contacter l'administrateur du site.
@@ -137,7 +137,7 @@ install.installer.unable.read.props=Impo
 install.installer.default.appname=MonWiki
 install.installer.default.pagedir=Configurez-moi !
 install.installer.props.saved=Vous nouvelles propriétés ont été enregistrées. Veuillez redémarrer votre conteneur Web (à moins que ceci soit votre première installation). Déroulez un peu vers le bas votre ascenseur pour voir votre nouveau jspwiki.properties.
-install.installer.props.notsaved=Impossible d''écrire le fichier de propriétés : {0}. Veuillez créer votre jspwiki.properties avec le contenu ci-dessous :\n{1}
+install.installer.props.notsaved=Impossible d''\u00E9crire le fichier de propri\u00E9t\u00E9s\u00A0\: {0}. Veuillez cr\u00E9er votre jspwiki.properties avec le contenu ci-dessous\u00A0\:\n{1}
 install.installer.validate.baseurl=Vous devez définir l' URL de base de ce wiki.
 install.installer.validate.pagedir=Vous devez définir la localisation de stockage des fichiers.
 install.installer.validate.appname=Vous devez définir le nom de l'application.
@@ -194,9 +194,9 @@ attach.add.selectfile=Sélectionner le f
 #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{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 terminer ses modifications (ce verrou expire dans {1} minutes.)
+edit.locked=L''utilisateur \u201C{0}\u201D a commenc\u00E9 \u00E0 \u00E9diter la page, mais ne l''a pas encore enregistr\u00E9e. Rien ne vous emp\u00EAche d''\u00E9diter cette page, MAIS sachez que vous risquez de beaucoup l''ennuyer\u00A0\! Il serait plus courtois d''attendre que son verrou expire, ou de laisser 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.
+edit.restoring=Vous \u00EAtes sur le point de restaurer la version {2}. Cliquez sur \u201CEnregistrer\u201D pour restaurer. Vous pouvez aussi \u00E9diter 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.name.
@@ -257,8 +257,6 @@ org.apache.wiki.action.DeleteActionBean.
 org.apache.wiki.action.RenameActionBean.rename=Renommer la page
 #Formerly named resetPassword.
 org.apache.wiki.action.LostPasswordActionBean.reset=Réinitialiser le mot de passe !
-#Copied from src/WebContent/WEB-INF/classes/templates/default.properties.. Formerly named find.submit.go.. Formerly named org.apache.wiki.action.SearchActionBean.search.
-org.apache.wiki.action.SearchActionBean.go=Ouvrir le meilleur résultat !
 #Copied from src/WebContent/WEB-INF/classes/templates/default.properties.. Formerly named find.submit.find.
 org.apache.wiki.action.SearchActionBean.search=Trouver !
 #Copied from src/WebContent/WEB-INF/classes/templates/default.properties.. Formerly named find.scope.all.

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=1225830&r1=1225829&r2=1225830&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 Dec 30 14:02:28 2011
@@ -74,7 +74,7 @@ login.error.noaccess=Spiacente, sembra c
 
 # 0 = login name, 1 = password, 2 = URL, 3 = Application name (as signature)
 # This is text, not HTML.
-lostpwd.newpassword.email=Come richiesto, la nuova password per l'autenticazione di "{0}" è "{1}" \n\nPuoi collegarti a: {2}.\n\n-- {3}
+lostpwd.newpassword.email=Come richiesto, la nuova password per l'autenticazione di "{0}" è "{1}" \n\nPuoi collegarti a\: {2}.\n\n-- {3}
 lostpwd.newpassword.subject=Nuova password per {0}
 lostpwd.nouser=Nessun utente o email '{0}' trovato.
 lostpwd.nomail=Errore Interno: impossibile inviare la mail!  Vi preghiamo di contattare l'amministratore del sito.
@@ -135,7 +135,7 @@ install.installer.unable.read.props=Impo
 install.installer.default.appname=MyWiki
 install.installer.default.pagedir=Per favore, configurami !
 install.installer.props.saved=Le vostre nuove propriet&agrave sono state salvate.  Per favore, fate ripartire il Container (a meno che questa non fosse la vostra primaistallazione).  Scrollate per vedere il vostro nuovo jspwiki.properties.
-install.installer.props.notsaved=Impossibile scrivere le proprietà: {0}. Per favore copiate il file sottostante come il vostro nuovo jspwiki.properties:\n{1}
+install.installer.props.notsaved=Impossibile scrivere le proprietà\: {0}. Per favore copiate il file sottostante come il vostro nuovo jspwiki.properties\:\n{1}
 install.installer.validate.baseurl=Occorre definire il base URL per questo wiki.
 install.installer.validate.pagedir=Occorre definire il posto dove salvare i file.
 install.installer.validate.appname=Occorre definire il nome dell'applicazione.
@@ -255,8 +255,6 @@ org.apache.wiki.action.DeleteActionBean.
 org.apache.wiki.action.RenameActionBean.rename=Rinomina la pagina
 #Formerly named resetPassword.
 org.apache.wiki.action.LostPasswordActionBean.reset=Cambia la password !
-#Copied from src/WebContent/WEB-INF/classes/templates/default.properties.. Formerly named find.submit.go.. Formerly named org.apache.wiki.action.SearchActionBean.search.
-org.apache.wiki.action.SearchActionBean.go=Vai!
 #Copied from src/WebContent/WEB-INF/classes/templates/default.properties.. Formerly named find.submit.find.
 org.apache.wiki.action.SearchActionBean.search=Cerca!
 #Copied from src/WebContent/WEB-INF/classes/templates/default.properties.. Formerly named find.scope.all.

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=1225830&r1=1225829&r2=1225830&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 Dec 30 14:02:28 2011
@@ -133,7 +133,7 @@ install.installer.unable.read.props=Kan 
 install.installer.default.appname=MijnWiki
 install.installer.default.pagedir=Configureer mij!
 install.installer.props.saved=Je nieuwe properties zijn opgeslagen.  Herstart je container (behalve wanneer dit je eerste installatie was).  Scroll naar beneden om je nieuwe jspwiki.properties te zien.
-install.installer.props.notsaved=Kan de properties niet wegschrijven: {0}. Sla onderstaande file op als jspwiki.properties:\n{1}
+install.installer.props.notsaved=Kan de properties niet wegschrijven\: {0}. Sla onderstaande file op als jspwiki.properties\:\n{1}
 install.installer.validate.baseurl=Je moet de base URL voor deze wiki definieren.
 install.installer.validate.pagedir=Je moet de plek configureren waar de pagina's moeten worden opgeslagen.
 install.installer.validate.appname=Je moet de applicatie naam opgeven
@@ -307,8 +307,6 @@ org.apache.wiki.action.DeleteActionBean.
 org.apache.wiki.action.RenameActionBean.rename=Pagina Hernoemen
 #Formerly named resetPassword.
 org.apache.wiki.action.LostPasswordActionBean.reset=Genereer een nieuw wachtwoord !
-#Copied from src/WebContent/WEB-INF/classes/templates/default.properties.. Formerly named find.submit.go.. Formerly named org.apache.wiki.action.SearchActionBean.search.
-org.apache.wiki.action.SearchActionBean.go=Ga!
 #Copied from src/WebContent/WEB-INF/classes/templates/default.properties.. Formerly named find.submit.find.
 org.apache.wiki.action.SearchActionBean.search=Zoek!
 #Copied from src/WebContent/WEB-INF/classes/templates/default.properties.. Formerly named find.scope.all.

Modified: incubator/jspwiki/trunk/src/WebContent/WEB-INF/classes/CoreResources_pt_BR.properties
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/WebContent/WEB-INF/classes/CoreResources_pt_BR.properties?rev=1225830&r1=1225829&r2=1225830&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/WebContent/WEB-INF/classes/CoreResources_pt_BR.properties (original)
+++ incubator/jspwiki/trunk/src/WebContent/WEB-INF/classes/CoreResources_pt_BR.properties Fri Dec 30 14:02:28 2011
@@ -75,7 +75,7 @@ login.error.noaccess=Você não possui a
 
 # 0 = login name, 1 = password, 2 = URL, 3 = Application name (as signature)
 # This is text, not HTML.
-lostpwd.newpassword.email=Como pedido, sua nova senha para login "{0}" é "{1}" \n\nVocê pode se autenticar em {2}.\n\n-- {3}
+lostpwd.newpassword.email=Como pedido, sua nova senha para login "{0}" \u00E9 "{1}" \n\nVoc\u00EA pode se autenticar em {2}.\n\n-- {3}
 lostpwd.newpassword.subject=Nova senha para {0}
 lostpwd.nouser=Nenhum usuário ou email "{0}" foi encontrado.
 lostpwd.nomail=Erro interno: o email não pode ser enviado!  Por favor entre em contato com o admnistrador.
@@ -137,7 +137,7 @@ install.installer.unable.read.props=Não
 install.installer.default.appname=MinhaWiki
 install.installer.default.pagedir=Por favor me configure!
 install.installer.props.saved=Suas novas propriedades foram salvas.  Por favor reinicie o seu container (a não ser que esta seja sua primeira instalação).  Desça um pouco para ver o seu novo arquivo jspwiki.properties.
-install.installer.props.notsaved=Não foi possível escrever as propriedades: {0}. Por favor copie o arquivo abaixo como o seu jspwiki.properties:\n{1}
+install.installer.props.notsaved=N\u00E3o foi poss\u00EDvel escrever as propriedades\: {0}. Por favor copie o arquivo abaixo como o seu jspwiki.properties\:\n{1}
 install.installer.validate.baseurl=Você deve definir a URL base para esta wiki.
 install.installer.validate.pagedir=Você deve definir o local onde os arquivos serão armazenados.
 install.installer.validate.appname=Você deve definir o nome da aplicação.
@@ -195,8 +195,6 @@ org.apache.wiki.content.inspect.AsirraCa
 org.apache.wiki.content.inspect.AsirraCaptcha.adoptMe=Me adote
 #Copied from src/WebContent/WEB-INF/classes/templates/default.properties.. Formerly named info.delete.submit.
 org.apache.wiki.action.DeleteActionBean.delete=Delete entire page
-#Copied from src/WebContent/WEB-INF/classes/templates/default.properties.. Formerly named find.submit.go.. Formerly named org.apache.wiki.action.SearchActionBean.search.
-org.apache.wiki.action.SearchActionBean.go=Go!
 #Copied from src/WebContent/WEB-INF/classes/templates/default.properties.. Formerly named find.submit.find.
 org.apache.wiki.action.SearchActionBean.search=Find!
 #Copied from src/WebContent/WEB-INF/classes/templates/default.properties.. Formerly named find.scope.all.

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=1225830&r1=1225829&r2=1225830&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 Dec 30 14:02:28 2011
@@ -42,235 +42,233 @@ common.timeformat=HH:mm:ss
 common.dateformat=EEEE, MMMM d, yyyy
 # "Unknown author"
 
-common.unknownauthor=\u0410\u0432\u0442\u043e\u0440 \u043d\u0435\u0438\u0437\u0432\u0435\u0441\u0442\u0435\u043d
+common.unknownauthor=\u0410\u0432\u0442\u043E\u0440 \u043D\u0435\u0438\u0437\u0432\u0435\u0441\u0442\u0435\u043D
 # Decisions: {0}=task owner; {1}=requester; {2-9}=additional message arguments for workflow
-decision.editWikiApproval=\u0420\u0435\u0434\u0430\u043a\u0442\u0438\u0440\u043e\u0432\u0430\u0442\u044c \u0441\u0442\u0440\u0430\u043d\u0438\u0446\u0443 {2}
+decision.editWikiApproval=\u0420\u0435\u0434\u0430\u043A\u0442\u0438\u0440\u043E\u0432\u0430\u0442\u044C \u0441\u0442\u0440\u0430\u043D\u0438\u0446\u0443 {2}
 # Security
 
-security.error.noaccess.logged=\u0423 \u0432\u0430\u0441 \u043d\u0435\u0442 \u043f\u0440\u0430\u0432 \u0434\u043b\u044f \u0432\u0445\u043e\u0434\u0430 \u0432 '{0}'. \u0425\u043e\u0442\u0438\u0442\u0435 \u0437\u0430\u0439\u0442\u0438 \u043f\u043e\u0434 \u0434\u0440\u0443\u0433\u0438\u043c \u043f\u043e\u043b\u044c\u0437\u043e\u0432\u0430\u0442\u0435\u043b\u0435\u043c ?.
-security.error.noaccess=\u0423 \u0432\u0430\u0441 \u043d\u0435\u0442 \u043f\u0440\u0430\u0432 \u0434\u043b\u044f \u0432\u0445\u043e\u0434\u0430 \u0432 '{0}'. \u0412\u0432\u043e\u0439\u0434\u0438\u0442\u0435 \u0441\u043f\u0435\u0440\u0432\u0430.
-security.error.wrongip=\u041f\u043e\u043f\u044b\u0442\u043a\u0430 \u043f\u0443\u0431\u043b\u0438\u043a\u0430\u0446\u0438\u0438 \u0441 IP \u0430\u0434\u0440\u0435\u0441\u0430, \u043e\u0442\u043b\u0438\u0447\u0438\u043c\u043e\u0433\u043e \u043e\u0442 IP \u0442\u0432\u043e\u0440\u0446\u0430 \u0441\u0442\u0440\u0430\u043d\u0438\u0446\u044b
-security.error.createprofilebeforelogin=\u0412\u044b \u0434\u043e\u043b\u0436\u043d\u044b \u0432\u0432\u043e\u0439\u0442\u0438 \u0432 \u0443\u0447\u0451\u0442\u043d\u0443\u044e \u0437\u0430\u043f\u0438\u0441\u044c
-security.error.blankpassword=\u041f\u0430\u0440\u043e\u043b\u044c \u043d\u0435 \u043c\u043e\u0436\u0435\u0442 \u0431\u044b\u0442\u044c \u043f\u0443\u0441\u0442\u044b\u043c
-security.error.passwordnomatch=\u041f\u0430\u0440\u043e\u043b\u0438 \u043d\u0435 \u0441\u043e\u0432\u043f\u0430\u0434\u0430\u044e\u0442
-security.error.illegalfullname=\u0418\u043c\u044f "{0}" \u0443\u0436\u0435 \u0437\u0430\u043d\u044f\u0442\u043e
-security.error.illegalloginname=\u041b\u043e\u0433\u0438\u043d "{0}" \u0437\u0430\u043d\u044f\u0442
+security.error.noaccess.logged=\u0423 \u0432\u0430\u0441 \u043D\u0435\u0442 \u043F\u0440\u0430\u0432 \u0434\u043B\u044F \u0432\u0445\u043E\u0434\u0430 \u0432 &\#39;{0}&\#39;. \u0425\u043E\u0442\u0438\u0442\u0435 \u0437\u0430\u0439\u0442\u0438 \u043F\u043E\u0434 \u0434\u0440\u0443\u0433\u0438\u043C \u043F\u043E\u043B\u044C\u0437\u043E\u0432\u0430\u0442\u0435\u043B\u0435\u043C ?.
+security.error.noaccess=\u0423 \u0432\u0430\u0441 \u043D\u0435\u0442 \u043F\u0440\u0430\u0432 \u0434\u043B\u044F \u0432\u0445\u043E\u0434\u0430 \u0432 &\#39;{0}&\#39;. \u0412\u0432\u043E\u0439\u0434\u0438\u0442\u0435 \u0441\u043F\u0435\u0440\u0432\u0430.
+security.error.wrongip=\u041F\u043E\u043F\u044B\u0442\u043A\u0430 \u043F\u0443\u0431\u043B\u0438\u043A\u0430\u0446\u0438\u0438 \u0441 IP \u0430\u0434\u0440\u0435\u0441\u0430, \u043E\u0442\u043B\u0438\u0447\u0438\u043C\u043E\u0433\u043E \u043E\u0442 IP \u0442\u0432\u043E\u0440\u0446\u0430 \u0441\u0442\u0440\u0430\u043D\u0438\u0446\u044B
+security.error.createprofilebeforelogin=\u0412\u044B \u0434\u043E\u043B\u0436\u043D\u044B \u0432\u0432\u043E\u0439\u0442\u0438 \u0432 \u0443\u0447\u0451\u0442\u043D\u0443\u044E \u0437\u0430\u043F\u0438\u0441\u044C
+security.error.blankpassword=\u041F\u0430\u0440\u043E\u043B\u044C \u043D\u0435 \u043C\u043E\u0436\u0435\u0442 \u0431\u044B\u0442\u044C \u043F\u0443\u0441\u0442\u044B\u043C
+security.error.passwordnomatch=\u041F\u0430\u0440\u043E\u043B\u0438 \u043D\u0435 \u0441\u043E\u0432\u043F\u0430\u0434\u0430\u044E\u0442
+security.error.illegalfullname=\u0418\u043C\u044F "{0}" \u0443\u0436\u0435 \u0437\u0430\u043D\u044F\u0442\u043E
+security.error.illegalloginname=\u041B\u043E\u0433\u0438\u043D "{0}" \u0437\u0430\u043D\u044F\u0442
 # These should roughly match whatever is used in default.properties for UserProfile.jsp
-security.user.loginname=\u041b\u043e\u0433\u0438\u043d
-security.user.fullname=\u0418\u043c\u044f
-security.user.email=\u042d\u043b\u0435\u043a\u0442\u0440\u043e\u043d\u043d\u0430\u044f \u043f\u043e\u0447\u0442\u0430
+security.user.loginname=\u041B\u043E\u0433\u0438\u043D
+security.user.fullname=\u0418\u043C\u044F
+security.user.email=\u042D\u043B\u0435\u043A\u0442\u0440\u043E\u043D\u043D\u0430\u044F \u043F\u043E\u0447\u0442\u0430
 # Renaming
 
-rename.empty=\u041f\u0443\u0441\u0442\u043e\u0435 \u0438\u043c\u044f \u0441\u0442\u0440\u0430\u043d\u0438\u0446\u044b. 
-rename.error.title=\u041d\u0435\u0432\u043e\u0437\u043c\u043e\u0436\u043d\u043e \u043f\u0435\u0440\u0435\u0438\u043c\u0435\u043d\u043e\u0432\u0430\u0442\u044c \u0441\u0442\u0440\u0430\u043d\u0438\u0446\u0443
-rename.error.reason=\u041f\u0440\u0438\u0447\u0438\u043d\u0430:
-rename.identical=\u0418\u043c\u0435\u043d\u0430 \u0441\u0442\u0440\u0430\u043d\u0438\u0446 \u0441\u043e\u0432\u043f\u0430\u0434\u0430\u044e\u0442. 
-rename.exists=\u0421\u0442\u0440\u0430\u043d\u0438\u0446\u0430 "{1}" \u0443\u0436\u0435 \u0435\u0441\u0442\u044c. \u041f\u043e\u0436\u0430\u043b\u0443\u0439\u0441\u0442\u0430, \u0441\u043c\u0435\u043d\u0438\u0442\u0435 \u0438\u043c\u044f \u0441\u0442\u0440\u0430\u043d\u0438\u0446\u044b \u0438\u043b\u0438 \u0443\u0434\u0430\u043b\u0438\u0442\u0435 \u0441\u0442\u0430\u0440\u0443\u044e.
-rename.unknownerror=\u041d\u0435\u0438\u0437\u0432\u0435\u0441\u0442\u043d\u0430\u044f \u043e\u0448\u0438\u0431\u043a\u0430 ({0})
+rename.empty=\u041F\u0443\u0441\u0442\u043E\u0435 \u0438\u043C\u044F \u0441\u0442\u0440\u0430\u043D\u0438\u0446\u044B. 
+rename.error.title=\u041D\u0435\u0432\u043E\u0437\u043C\u043E\u0436\u043D\u043E \u043F\u0435\u0440\u0435\u0438\u043C\u0435\u043D\u043E\u0432\u0430\u0442\u044C \u0441\u0442\u0440\u0430\u043D\u0438\u0446\u0443
+rename.error.reason=\u041F\u0440\u0438\u0447\u0438\u043D\u0430\:
+rename.identical=\u0418\u043C\u0435\u043D\u0430 \u0441\u0442\u0440\u0430\u043D\u0438\u0446 \u0441\u043E\u0432\u043F\u0430\u0434\u0430\u044E\u0442. 
+rename.exists=\u0421\u0442\u0440\u0430\u043D\u0438\u0446\u0430 "{1}" \u0443\u0436\u0435 \u0435\u0441\u0442\u044C. \u041F\u043E\u0436\u0430\u043B\u0443\u0439\u0441\u0442\u0430, \u0441\u043C\u0435\u043D\u0438\u0442\u0435 \u0438\u043C\u044F \u0441\u0442\u0440\u0430\u043D\u0438\u0446\u044B \u0438\u043B\u0438 \u0443\u0434\u0430\u043B\u0438\u0442\u0435 \u0441\u0442\u0430\u0440\u0443\u044E.
+rename.unknownerror=\u041D\u0435\u0438\u0437\u0432\u0435\u0441\u0442\u043D\u0430\u044F \u043E\u0448\u0438\u0431\u043A\u0430 ({0})
 # Login.jsp
 #login.error.capslock=\u041d\u0435\u0432\u0435\u0440\u043d\u044b\u0439 \u043b\u043e\u0433\u0438\u043d (\u043f\u0440\u043e\u0432\u0435\u0440\u0442\u0435 \u043a\u043b\u0430\u0432\u0438\u0448\u0443 Caps Lock) #obsolete
-login.error.password=\u041d\u0435\u0432\u0435\u0440\u043d\u044b\u0439 \u043b\u043e\u0433\u0438\u043d.
-login.error.noaccess=\u0423 \u0412\u0430\u0441 \u043d\u0435\u0442 \u0434\u043e\u0441\u0442\u0443\u043f\u0430 \u043a \u044d\u0442\u043e\u043c\u0443. \u0418\u0437\u0432\u0438\u043d\u0438\u0442\u0435.
+login.error.password=\u041D\u0435\u0432\u0435\u0440\u043D\u044B\u0439 \u043B\u043E\u0433\u0438\u043D.
+login.error.noaccess=\u0423 \u0412\u0430\u0441 \u043D\u0435\u0442 \u0434\u043E\u0441\u0442\u0443\u043F\u0430 \u043A \u044D\u0442\u043E\u043C\u0443. \u0418\u0437\u0432\u0438\u043D\u0438\u0442\u0435.
 # Lostpassword.jsp
 
 # 0 = login name, 1 = password, 2 = URL, 3 = Application name (as signature)
 # This is text, not HTML.
-lostpwd.newpassword.email=\u041f\u043e \u0412\u0430\u0448\u0435\u043c\u0443 \u0437\u0430\u043f\u0440\u043e\u0441\u0443 \u0434\u043b\u044f \u043b\u043e\u0433\u0438\u043d\u0430 "{0}" \u0431\u044b\u043b \u0441\u0433\u0435\u043d\u0435\u0440\u0438\u0440\u043e\u0432\u0430\u043d \u043d\u043e\u0432\u044b\u0439 \u043f\u0430\u0440\u043e\u043b\u044c "{1}" \n\n\u041c\u043e\u0436\u0435\u0442\u0435 \u0437\u0430\u0439\u0442\u0438 {2}.\n\n-- {3}
-lostpwd.newpassword.subject=\u041d\u043e\u0432\u044b\u0439 \u043f\u0430\u0440\u043e\u043b\u044c \u0434\u043b\u044f {0}
-lostpwd.nouser=\u041b\u043e\u0433\u0438\u043d \u0438\u043b\u0438 \u043f\u043e\u0447\u0442\u0430 "{0}" \u043d\u0435 \u043d\u0430\u0439\u0434\u0435\u043d\u044b.
-lostpwd.nomail=\u0412\u043d\u0443\u0442\u0440\u0435\u043d\u044f\u044f: \u043d\u0435\u0432\u043e\u0437\u043c\u043e\u0436\u043d\u043e \u043e\u0442\u043f\u0440\u0430\u0432\u0438\u0442\u044c \u0441\u043e\u043e\u0431\u0449\u0435\u043d\u0438\u0435! \u041e\u0431\u0440\u0430\u0442\u0438\u0442\u0435\u0441\u044c \u043a \u0412\u0430\u0448\u0435\u043c\u0443 \u0441\u0438\u0441\u0442\u0435\u043c\u043d\u043e\u043c\u0443 \u0430\u0434\u043c\u0438\u043d\u0438\u0441\u0442\u0440\u0430\u0442\u043e\u0440\u0443.
-lostpwd.emailed=\u041d\u043e\u0432\u044b\u0439 \u043f\u0430\u0440\u043e\u043b\u044c \u0431\u044b\u043b \u043e\u0442\u043f\u0440\u0430\u0432\u043b\u0435\u043d \u043d\u0430 \u043f\u043e\u0447\u0442\u0443 \u043f\u043e\u043b\u044c\u0437\u043e\u0432\u0430\u0442\u0435\u043b\u044f.
-lostpwd.reset.title=\u041e\u0431\u043d\u0443\u043b\u0438\u0442\u044c \u043f\u0430\u0440\u043e\u043b\u044c
-lostpwd.reset.unable=\u041d\u0435\u0432\u043e\u0437\u043c\u043e\u0436\u043d\u043e \u043e\u0431\u043d\u0443\u043b\u0438\u0442\u044c \u043f\u0430\u0440\u043e\u043b\u044c.  \u041f\u043e\u043f\u0440\u043e\u0431\u0443\u0439\u0441\u0442\u0435 \u0435\u0449\u0451 \u0440\u0430\u0437.
-lostpwd.reset.blurb=\u041f\u043e\u0442\u0435\u0440\u044f\u043d \u0438\u043b\u0438 \u0437\u0430\u0431\u044b\u0442 \u043f\u0430\u0440\u043e\u043b\u044c?  \u0412\u0432\u0435\u0434\u0438\u0442\u0435 \u0438\u043c\u044f \u0443\u0447\u0451\u0442\u043d\u043e\u0439 \u0437\u0430\u043f\u0438\u0441\u0438 \u0438\u043b\u0438 \u043f\u043e\u0447\u0442\u0443:
-lostpwd.reset.submit=\u041e\u0431\u043d\u0443\u043b\u0438\u0442\u044c \u043f\u0430\u0440\u043e\u043b\u044c!
+lostpwd.newpassword.email=\u041F\u043E \u0412\u0430\u0448\u0435\u043C\u0443 \u0437\u0430\u043F\u0440\u043E\u0441\u0443 \u0434\u043B\u044F \u043B\u043E\u0433\u0438\u043D\u0430 "{0}" \u0431\u044B\u043B \u0441\u0433\u0435\u043D\u0435\u0440\u0438\u0440\u043E\u0432\u0430\u043D \u043D\u043E\u0432\u044B\u0439 \u043F\u0430\u0440\u043E\u043B\u044C "{1}" \n\n\u041C\u043E\u0436\u0435\u0442\u0435 \u0437\u0430\u0439\u0442\u0438 {2}.\n\n-- {3}
+lostpwd.newpassword.subject=\u041D\u043E\u0432\u044B\u0439 \u043F\u0430\u0440\u043E\u043B\u044C \u0434\u043B\u044F {0}
+lostpwd.nouser=\u041B\u043E\u0433\u0438\u043D \u0438\u043B\u0438 \u043F\u043E\u0447\u0442\u0430 "{0}" \u043D\u0435 \u043D\u0430\u0439\u0434\u0435\u043D\u044B.
+lostpwd.nomail=\u0412\u043D\u0443\u0442\u0440\u0435\u043D\u044F\u044F\: \u043D\u0435\u0432\u043E\u0437\u043C\u043E\u0436\u043D\u043E \u043E\u0442\u043F\u0440\u0430\u0432\u0438\u0442\u044C \u0441\u043E\u043E\u0431\u0449\u0435\u043D\u0438\u0435\! \u041E\u0431\u0440\u0430\u0442\u0438\u0442\u0435\u0441\u044C \u043A \u0412\u0430\u0448\u0435\u043C\u0443 \u0441\u0438\u0441\u0442\u0435\u043C\u043D\u043E\u043C\u0443 \u0430\u0434\u043C\u0438\u043D\u0438\u0441\u0442\u0440\u0430\u0442\u043E\u0440\u0443.
+lostpwd.emailed=\u041D\u043E\u0432\u044B\u0439 \u043F\u0430\u0440\u043E\u043B\u044C \u0431\u044B\u043B \u043E\u0442\u043F\u0440\u0430\u0432\u043B\u0435\u043D \u043D\u0430 \u043F\u043E\u0447\u0442\u0443 \u043F\u043E\u043B\u044C\u0437\u043E\u0432\u0430\u0442\u0435\u043B\u044F.
+lostpwd.reset.title=\u041E\u0431\u043D\u0443\u043B\u0438\u0442\u044C \u043F\u0430\u0440\u043E\u043B\u044C
+lostpwd.reset.unable=\u041D\u0435\u0432\u043E\u0437\u043C\u043E\u0436\u043D\u043E \u043E\u0431\u043D\u0443\u043B\u0438\u0442\u044C \u043F\u0430\u0440\u043E\u043B\u044C.  \u041F\u043E\u043F\u0440\u043E\u0431\u0443\u0439\u0441\u0442\u0435 \u0435\u0449\u0451 \u0440\u0430\u0437.
+lostpwd.reset.blurb=\u041F\u043E\u0442\u0435\u0440\u044F\u043D \u0438\u043B\u0438 \u0437\u0430\u0431\u044B\u0442 \u043F\u0430\u0440\u043E\u043B\u044C?  \u0412\u0432\u0435\u0434\u0438\u0442\u0435 \u0438\u043C\u044F \u0443\u0447\u0451\u0442\u043D\u043E\u0439 \u0437\u0430\u043F\u0438\u0441\u0438 \u0438\u043B\u0438 \u043F\u043E\u0447\u0442\u0443\:
+lostpwd.reset.submit=\u041E\u0431\u043D\u0443\u043B\u0438\u0442\u044C \u043F\u0430\u0440\u043E\u043B\u044C\!
 # TraditionalDiffProvider
 
-diff.traditional.added=\u0421\u0442\u0440\u043e\u043a\u0430 {0} \u0434\u043e\u0431\u0430\u0432\u043b\u0435\u043d\u0430 {1}
-diff.traditional.changed=\u0421\u0442\u0440\u043e\u043a\u0430 {0} \u0438\u0437\u043c\u0435\u043d\u0435\u043d\u0430 {1}
-diff.traditional.removed=\u0421\u0442\u0440\u043e\u043a\u0430 {0} \u0443\u0434\u0430\u043b\u0435\u043d\u0430 {1}
-diff.traditional.oneline=\u043e\u0434\u043d\u0430 \u0441\u0442\u0440\u043e\u043a\u0430
-diff.traditional.lines={2} \u0441\u0442\u0440\u043e\u043a
+diff.traditional.added=\u0421\u0442\u0440\u043E\u043A\u0430 {0} \u0434\u043E\u0431\u0430\u0432\u043B\u0435\u043D\u0430 {1}
+diff.traditional.changed=\u0421\u0442\u0440\u043E\u043A\u0430 {0} \u0438\u0437\u043C\u0435\u043D\u0435\u043D\u0430 {1}
+diff.traditional.removed=\u0421\u0442\u0440\u043E\u043A\u0430 {0} \u0443\u0434\u0430\u043B\u0435\u043D\u0430 {1}
+diff.traditional.oneline=\u043E\u0434\u043D\u0430 \u0441\u0442\u0440\u043E\u043A\u0430
+diff.traditional.lines={2} \u0441\u0442\u0440\u043E\u043A
 # InputValidator
 
-validate.unsafechars={0} \u043d\u0435 \u043c\u043e\u0436\u0435\u0442 \u0441\u043e\u0434\u0435\u0440\u0436\u0430\u0442\u044c \u0441\u0438\u043c\u0432\u043e\u043b\u044b: {1}
-validate.invalidemail={0} \u043d\u0435\u0432\u0435\u0440\u043d\u043e
-validate.cantbenull={0} \u043d\u0435 \u043c\u043e\u0436\u0435\u0442 \u0431\u044b\u0442\u044c \u043f\u0443\u0441\u0442\u044b\u043c
+validate.unsafechars={0} \u043D\u0435 \u043C\u043E\u0436\u0435\u0442 \u0441\u043E\u0434\u0435\u0440\u0436\u0430\u0442\u044C \u0441\u0438\u043C\u0432\u043E\u043B\u044B\: {1}
+validate.invalidemail={0} \u043D\u0435\u0432\u0435\u0440\u043D\u043E
+validate.cantbenull={0} \u043D\u0435 \u043C\u043E\u0436\u0435\u0442 \u0431\u044B\u0442\u044C \u043F\u0443\u0441\u0442\u044B\u043C
 # UserProfileTag
 
-userprofile.nogroups=(\u043d\u0435\u0442)
-userprofile.noroles=(\u043d\u0435\u0442)
+userprofile.nogroups=(\u043D\u0435\u0442)
+userprofile.noroles=(\u043D\u0435\u0442)
 # NewGroup.jsp
-newgroup.exists=\u0413\u0440\u0443\u043f\u043f\u0430 {0} \u0443\u0436\u0435 \u0435\u0441\u0442\u044c. \u0418\u0441\u043f\u043e\u043b\u044c\u0437\u0443\u0439\u0442\u0435 \u0434\u0440\u0443\u0433\u043e\u0435 \u0438\u043c\u044f.
+newgroup.exists=\u0413\u0440\u0443\u043F\u043F\u0430 {0} \u0443\u0436\u0435 \u0435\u0441\u0442\u044C. \u0418\u0441\u043F\u043E\u043B\u044C\u0437\u0443\u0439\u0442\u0435 \u0434\u0440\u0443\u0433\u043E\u0435 \u0438\u043C\u044F.
 # JSPWikiMarkupParser
 
-markupparser.error.invalidset=\u041d\u0430\u0439\u0434\u0435\u043d\u043e \u043d\u0435\u0432\u0435\u0440\u043d\u043e\u0435 SET : {0}
-markupparser.error.nointerwikiref=\u041d\u0435 \u0443\u043a\u0430\u0437\u0430\u043d\u0430 \u043f\u0435\u0440\u0435\u043c\u0435\u043d\u043d\u0430\u044f \u0412\u0438\u043a\u0438 "{0}"!
-markupparser.error.parserfailure=\u041e\u0448\u0438\u0431\u043a\u0430 \u043e\u0431\u0440\u0430\u0431\u043e\u0442\u043a\u0438: {0}
-markupparser.error.javascriptattempt=\u041f\u043e\u043f\u044b\u0442\u043a\u0430 \u0432\u044b\u0432\u043e\u0434\u0430 javascript!
-markupparser.link.create=\u0421\u043e\u0437\u0434\u0430\u0442\u044c "{0}"
+markupparser.error.invalidset=\u041D\u0430\u0439\u0434\u0435\u043D\u043E \u043D\u0435\u0432\u0435\u0440\u043D\u043E\u0435 SET \: {0}
+markupparser.error.nointerwikiref=\u041D\u0435 \u0443\u043A\u0430\u0437\u0430\u043D\u0430 \u043F\u0435\u0440\u0435\u043C\u0435\u043D\u043D\u0430\u044F \u0412\u0438\u043A\u0438 "{0}"\!
+markupparser.error.parserfailure=\u041E\u0448\u0438\u0431\u043A\u0430 \u043E\u0431\u0440\u0430\u0431\u043E\u0442\u043A\u0438\: {0}
+markupparser.error.javascriptattempt=\u041F\u043E\u043F\u044B\u0442\u043A\u0430 \u0432\u044B\u0432\u043E\u0434\u0430 javascript\!
+markupparser.link.create=\u0421\u043E\u0437\u0434\u0430\u0442\u044C "{0}"
 # Captcha.jsp
-captcha.js.humancheckcomplete.alert=\u0423\u043a\u0430\u0436\u0438\u0442\u0435 \u043f\u043e\u0436\u0430\u043b\u0443\u0439\u0441\u0442\u0430 \u043d\u0430 \u043a\u043e\u0442\u044f\u0442.
-captcha.asirra.please.select=\u0412\u044b\u0431\u0435\u0440\u0435\u0442\u0435 \u043a\u0430\u0440\u0442\u0438\u043d\u043a\u0438, \u043d\u0430 \u043a\u043e\u0442\u043e\u0440\u044b\u0445 \u0438\u0437\u043e\u0431\u0440\u0430\u0436\u0435\u043d\u044b \u043a\u043e\u0442\u044f\u0442\u0430.
-captcha.asirra.a.get.challenge=\u0417\u0430\u043f\u0440\u043e\u0441 \u0440\u0430\u0437\u043d\u044b\u0445 \u0440\u0438\u0441\u0443\u043d\u043a\u043e\u0432.
-captcha.asirra.a.whatsthis=\u0427\u0442\u043e \u044d\u0442\u043e \u0442\u0430\u043a\u043e\u0435?
-captcha.submit=\u041f\u0443\u0441\u043a
+captcha.js.humancheckcomplete.alert=\u0423\u043A\u0430\u0436\u0438\u0442\u0435 \u043F\u043E\u0436\u0430\u043B\u0443\u0439\u0441\u0442\u0430 \u043D\u0430 \u043A\u043E\u0442\u044F\u0442.
+captcha.asirra.please.select=\u0412\u044B\u0431\u0435\u0440\u0435\u0442\u0435 \u043A\u0430\u0440\u0442\u0438\u043D\u043A\u0438, \u043D\u0430 \u043A\u043E\u0442\u043E\u0440\u044B\u0445 \u0438\u0437\u043E\u0431\u0440\u0430\u0436\u0435\u043D\u044B \u043A\u043E\u0442\u044F\u0442\u0430.
+captcha.asirra.a.get.challenge=\u0417\u0430\u043F\u0440\u043E\u0441 \u0440\u0430\u0437\u043D\u044B\u0445 \u0440\u0438\u0441\u0443\u043D\u043A\u043E\u0432.
+captcha.asirra.a.whatsthis=\u0427\u0442\u043E \u044D\u0442\u043E \u0442\u0430\u043A\u043E\u0435?
+captcha.submit=\u041F\u0443\u0441\u043A
 \u0443\u0441\u0442\u0430\u043d\u043e\u0432\u043a\u0438=JSPWiki.  
 \u0415\u0441\u043b\u0438=\u0412\u044b \u0432\u0438\u0434\u0438\u0442\u0435 \u044d\u0442\u0443 \u0441\u0442\u0440\u0430\u043d\u0438\u0446\u0443, \u0437\u043d\u0438\u0447\u0430\u0442 \u0432\u044b \u0443\u0441\u043f\u0435\u0448\u043d\u043e \u0443\u0441\u0442\u0430\u043d\u043e\u0432\u0438\u043b\u0438 JSPWiki  
 \u0432\u043d\u0443\u0442\u0440\u0438=\u043a\u043e\u043d\u0442\u0435\u0439\u043d\u0435\u0440\u0430. 
 \u0412\u044b=\u043c\u043e\u0436\u0435\u0442\u0435 \u0435\u0433\u043e \u043d\u0430\u0439\u0442\u0438 \u0432 \u0434\u0438\u0440\u0435\u043a\u0442\u043e\u0440\u0438\u0438 <code>yourwiki/WEB-INF/</code>
-install.jsp.install.info=\u041f\u043e\u0437\u0434\u0440\u0430\u0432\u043b\u044f\u044e: 
-install.jsp.install.warning=\u0412\u043d\u0438\u043c\u0430\u043d\u0438\u0435: 
-install.jsp.install.error=\u041d\u0435\u0432\u043e\u0437\u043c\u043e\u0436\u043d\u043e \u0441\u043e\u0445\u0440\u0430\u043d\u0438\u0442\u044c \u043a\u043e\u043d\u0444\u0438\u0433\u0443\u0440\u0430\u0446\u0438\u044e: 
-install.jsp.install.msg.rnd.pwd=\u041f\u043e\u0441\u043a\u043e\u043b\u044c\u043a\u0443 \u0435\u0449\u0451 \u043d\u0435\u0431\u044b\u043b\u043e \u0441\u0443\u043f\u0435\u0440\u043f\u043e\u043b\u044c\u0437\u043e\u0432\u0430\u0442\u0435\u043b\u044c\u0441\u043a\u0438\u0445 \u0437\u0430\u043f\u0438\u0441\u0435\u0439, \u0443\u0441\u0442\u0430\u043d\u043e\u0432\u0449\u0438\u043a \u0441\u043e\u0437\u0434\u0430\u043b \u043e\u0434\u043d\u0443 \u0441  \u0432\u044b\u0431\u043e\u0440\u043e\u0447\u043d\u044b\u0439 \u043f\u0430\u0440\u043e\u043b\u0435\u043c, \u043a\u043e\u0442\u043e\u0440\u044b\u0439 \u0412\u044b \u0441\u043c\u043e\u0436\u0435\u0442\u0435 \u0438\u0437\u043c\u0435\u043d\u0438\u0442\u044c \u043f\u043e\u0437\u0436\u0435. \u0423\u0447\u0451\u0442\u043d\u044b\u0439 \u043d\u043e\u043c\u0435\u0440 \u0437\u0430\u043f\u0438\u0441\u0438 {0}, \u043f\u0430\u0440\u043e\u043b\u044c {1}. \u0421\u043e\u0445\u0440\u0430\u043d\u0438\u0442\u0435 \u044d\u0442\u0443 \u0438\u043d\u0444\u043e\u0
 440\u043c\u0430\u0446\u0438\u044e, \u043f\u043e\u0441\u043a\u043e\u043b\u044c\u043a\u0443 \u044d\u0442\u043e \u0435\u0434\u0438\u043d\u0441\u0442\u0432\u0435\u043d\u043d\u043e\u0435 \u043c\u0435\u0441\u0442\u043e \u0433\u0434\u0435 \u043e\u043d\u0430  \u043e\u043f\u0443\u0431\u043b\u0438\u043a\u043e\u0432\u0430\u043d\u0430. \u0422\u0430\u043a\u0436\u0435 \u0443\u0441\u0442\u0430\u043d\u043e\u0432\u0449\u0438\u043a \u0441\u043e\u0437\u0434\u0430\u043b \u0433\u0440\u0443\u043f\u043f\u0443 {2} \u0432 \u043a\u043e\u0442\u043e\u0440\u0443\u044e \u0432\u0445\u043e\u0434\u0438\u0442 \u0434\u0430\u043d\u044b\u0439 \u043f\u043e\u043b\u044c\u0437\u043e\u0432\u0430\u0442\u0435\u043b\u044c.
-install.jsp.install.msg.admin.notexists=\u0415\u0441\u043b\u0438 \u0412\u044b \u0432\u043f\u0435\u0440\u0432\u044b\u0435 \u043f\u043e\u043b\u044c\u0437\u0443\u0435\u0442\u0435\u0441\u044c \u0443\u0441\u0442\u0430\u043d\u043e\u0432\u0449\u0438\u043a\u043e\u043c, \u0442\u043e \u0434\u043e\u043b\u0436\u043d\u044b \u0437\u043d\u0430\u0442\u044c, \u0447\u0442\u043e \u043f\u043e\u0441\u043b\u0435 \u0443\u0441\u0442\u0430\u043d\u043e\u0432\u043a\u0438 \u0438 \u0441\u043e\u0445\u0440\u0430\u043d\u0435\u043d\u0438\u044f \u043a\u043e\u043d\u0444\u0438\u0433\u0443\u0440\u0430\u0446\u0438\u0438, \u0412\u044b \u0441\u043c\u043e\u0436\u0435\u0442\u0435 \u043f\u043e\u043f\u0430\u0441\u0442\u044c \u043d\u0430 \u044d\u0442\u0443 \u0441\u0442\u0440\u0430\u043d\u0438\u0446\u0443 \u0442\u043e\u043b\u044c\u043a\u043e \u043e\u0442 \u0438\u043c\u0435\u043d\u0438  
+install.jsp.install.info=\u041F\u043E\u0437\u0434\u0440\u0430\u0432\u043B\u044F\u044E\: 
+install.jsp.install.warning=\u0412\u043D\u0438\u043C\u0430\u043D\u0438\u0435\: 
+install.jsp.install.error=\u041D\u0435\u0432\u043E\u0437\u043C\u043E\u0436\u043D\u043E \u0441\u043E\u0445\u0440\u0430\u043D\u0438\u0442\u044C \u043A\u043E\u043D\u0444\u0438\u0433\u0443\u0440\u0430\u0446\u0438\u044E\: 
+install.jsp.install.msg.rnd.pwd=\u041F\u043E\u0441\u043A\u043E\u043B\u044C\u043A\u0443 \u0435\u0449\u0451 \u043D\u0435\u0431\u044B\u043B\u043E \u0441\u0443\u043F\u0435\u0440\u043F\u043E\u043B\u044C\u0437\u043E\u0432\u0430\u0442\u0435\u043B\u044C\u0441\u043A\u0438\u0445 \u0437\u0430\u043F\u0438\u0441\u0435\u0439, \u0443\u0441\u0442\u0430\u043D\u043E\u0432\u0449\u0438\u043A \u0441\u043E\u0437\u0434\u0430\u043B \u043E\u0434\u043D\u0443 \u0441  \u0432\u044B\u0431\u043E\u0440\u043E\u0447\u043D\u044B\u0439 \u043F\u0430\u0440\u043E\u043B\u0435\u043C, \u043A\u043E\u0442\u043E\u0440\u044B\u0439 \u0412\u044B \u0441\u043C\u043E\u0436\u0435\u0442\u0435 \u0438\u0437\u043C\u0435\u043D\u0438\u0442\u044C \u043F\u043E\u0437\u0436\u0435. \u0423\u0447\u0451\u0442\u043D\u044B\u0439 \u043D\u043E\u043C\u0435\u0440 \u0437\u0430\u043F\u0438\u0441\u0438 {0}, \u043F\u0430\u0440\u043E\u043B\u044C {1}. \u0421\u043E\u0445\u0440\u0430\u043D\u0438\u0442\u0435 \u044D\u0442\u0443 \u0438\u043D\u0444\u043E\u0
 440\u043C\u0430\u0446\u0438\u044E, \u043F\u043E\u0441\u043A\u043E\u043B\u044C\u043A\u0443 \u044D\u0442\u043E \u0435\u0434\u0438\u043D\u0441\u0442\u0432\u0435\u043D\u043D\u043E\u0435 \u043C\u0435\u0441\u0442\u043E \u0433\u0434\u0435 \u043E\u043D\u0430  \u043E\u043F\u0443\u0431\u043B\u0438\u043A\u043E\u0432\u0430\u043D\u0430. \u0422\u0430\u043A\u0436\u0435 \u0443\u0441\u0442\u0430\u043D\u043E\u0432\u0449\u0438\u043A \u0441\u043E\u0437\u0434\u0430\u043B \u0433\u0440\u0443\u043F\u043F\u0443 {2} \u0432 \u043A\u043E\u0442\u043E\u0440\u0443\u044E \u0432\u0445\u043E\u0434\u0438\u0442 \u0434\u0430\u043D\u044B\u0439 \u043F\u043E\u043B\u044C\u0437\u043E\u0432\u0430\u0442\u0435\u043B\u044C.
+install.jsp.install.msg.admin.notexists=\u0415\u0441\u043B\u0438 \u0412\u044B \u0432\u043F\u0435\u0440\u0432\u044B\u0435 \u043F\u043E\u043B\u044C\u0437\u0443\u0435\u0442\u0435\u0441\u044C \u0443\u0441\u0442\u0430\u043D\u043E\u0432\u0449\u0438\u043A\u043E\u043C, \u0442\u043E \u0434\u043E\u043B\u0436\u043D\u044B \u0437\u043D\u0430\u0442\u044C, \u0447\u0442\u043E \u043F\u043E\u0441\u043B\u0435 \u0443\u0441\u0442\u0430\u043D\u043E\u0432\u043A\u0438 \u0438 \u0441\u043E\u0445\u0440\u0430\u043D\u0435\u043D\u0438\u044F \u043A\u043E\u043D\u0444\u0438\u0433\u0443\u0440\u0430\u0446\u0438\u0438, \u0412\u044B \u0441\u043C\u043E\u0436\u0435\u0442\u0435 \u043F\u043E\u043F\u0430\u0441\u0442\u044C \u043D\u0430 \u044D\u0442\u0443 \u0441\u0442\u0440\u0430\u043D\u0438\u0446\u0443 \u0442\u043E\u043B\u044C\u043A\u043E \u043E\u0442 \u0438\u043C\u0435\u043D\u0438  
 \u0441\u0443\u043f\u0435\u0440\u043f\u043e\u043b\u044c\u0437\u043e\u0432\u0430\u0442\u0435\u043b\u044f.=
-install.jsp.security.title=\u0411\u0435\u0437\u043e\u043f\u0430\u0441\u043d\u043e\u0441\u0442\u044c
-install.jsp.security.sec.conf.label=\u041a\u043e\u043d\u0444\u0438\u0433\u0443\u0440\u0430\u0446\u0438\u044f \u0431\u0435\u0437\u043e\u043f\u0430\u0441\u043d\u043e\u0441\u0442\u0438
-install.jsp.security.sec.conf.opt1=\u0421\u0438\u0441\u0442\u0435\u043c\u0430 \u0431\u0435\u0437\u043e\u043f\u0430\u0441\u043d\u043e\u0441\u0442\u0438 \u043a\u043e\u043d\u0442\u0435\u0439\u043d\u0435\u0440\u0430 JAAS (\u043f\u043e \u0443\u043c\u043e\u043b\u0447\u0430\u043d\u0438\u044e)
-install.jsp.security.sec.conf.opt2=\u0422\u043e\u043b\u044c\u043a\u043e \u0437\u0430\u0449\u0438\u0442\u0430 \u043a\u043e\u043d\u0442\u0435\u0439\u043d\u0435\u0440\u0430.
-install.jsp.security.sec.conf.desc=\u041f\u043e \u0443\u043c\u043e\u043b\u0447\u0430\u043d\u0438\u044e, JSPWiki \u0443\u043f\u0440\u0430\u0432\u043b\u044f\u0435\u0442 \u0434\u043e\u0441\u0442\u0443\u043f\u043e\u043c \u0441 \u043f\u043e\u043c\u043e\u0449\u044c\u044e JAAS \u0441\u0445\u043e\u0436\u0435\u0439 \u0441\u0438\u0441\u0442\u0435\u043c\u044b \u0431\u0435\u0437\u043e\u043f\u0430\u0441\u043d\u043e\u0441\u0442\u0438. \t\u042d\u0442\u043e \u0442\u0430\u043a\u0436\u0435 \u044f\u0432\u043b\u044f\u0435\u0442\u0441\u044f \u0438\u043d\u0441\u0442\u0440\u0443\u043c\u0435\u043d\u0442\u043e\u043c \u043e\u0433\u0440\u0430\u043d\u0438\u0447\u0435\u043d\u0438\u044f \u0431\u0435\u0437\u043e\u043f\u0430\u0441\u043d\u043e\u0441\u0442\u0438 \u043a\u0430\u0436\u0434\u043e\u0433\u043e \u043e\u0442\u0434\u0435\u043b\u044c\u043d\u043e\u0433\u043e \u043a\u043e\u043d\u0442\u0435\u0439\u043d\u0435\u0440\u0430  \u0435\u0441\u043b\u0438 \u0434\u0430\u043d\u0430\u044f \u0444\u0443\u043d\u043a\u04
 46\u0438\u044f \u0432\u043a\u043b\u044e\u0447\u0435\u043d\u0430 \u0432 \u0444\u0430\u0439\u043b\u0435 <code>web.xml</code>. \u0415\u0441\u043b\u0438 \u0432\u044b \u0432\u044b\u043a\u043b\u044e\u0447\u0438\u0442\u0435 JAAS,  \u0435\u0441\u0442\u044c \u0431\u043e\u043b\u044c\u0448\u0430\u044f \u0432\u0435\u0440\u043e\u044f\u0442\u043d\u043e\u0441\u0442\u044c \u0442\u043e\u0433\u043e \u0447\u0442\u043e JSPWiki \u0431\u0443\u0434\u0435\u0442 \u0440\u0430\u0431\u043e\u0442\u0430\u0442\u044c \u043d\u0435\u043a\u043e\u0440\u0440\u0435\u043a\u0442\u043d\u043e, \u043d\u043e \u0438\u043d\u043e\u0433\u0434\u0430 \u044d\u0442\u043e   
+install.jsp.security.title=\u0411\u0435\u0437\u043E\u043F\u0430\u0441\u043D\u043E\u0441\u0442\u044C
+install.jsp.security.sec.conf.label=\u041A\u043E\u043D\u0444\u0438\u0433\u0443\u0440\u0430\u0446\u0438\u044F \u0431\u0435\u0437\u043E\u043F\u0430\u0441\u043D\u043E\u0441\u0442\u0438
+install.jsp.security.sec.conf.opt1=\u0421\u0438\u0441\u0442\u0435\u043C\u0430 \u0431\u0435\u0437\u043E\u043F\u0430\u0441\u043D\u043E\u0441\u0442\u0438 \u043A\u043E\u043D\u0442\u0435\u0439\u043D\u0435\u0440\u0430 JAAS (\u043F\u043E \u0443\u043C\u043E\u043B\u0447\u0430\u043D\u0438\u044E)
+install.jsp.security.sec.conf.opt2=\u0422\u043E\u043B\u044C\u043A\u043E \u0437\u0430\u0449\u0438\u0442\u0430 \u043A\u043E\u043D\u0442\u0435\u0439\u043D\u0435\u0440\u0430.
+install.jsp.security.sec.conf.desc=\u041F\u043E \u0443\u043C\u043E\u043B\u0447\u0430\u043D\u0438\u044E, JSPWiki \u0443\u043F\u0440\u0430\u0432\u043B\u044F\u0435\u0442 \u0434\u043E\u0441\u0442\u0443\u043F\u043E\u043C \u0441 \u043F\u043E\u043C\u043E\u0449\u044C\u044E JAAS \u0441\u0445\u043E\u0436\u0435\u0439 \u0441\u0438\u0441\u0442\u0435\u043C\u044B \u0431\u0435\u0437\u043E\u043F\u0430\u0441\u043D\u043E\u0441\u0442\u0438. \t\u042D\u0442\u043E \u0442\u0430\u043A\u0436\u0435 \u044F\u0432\u043B\u044F\u0435\u0442\u0441\u044F \u0438\u043D\u0441\u0442\u0440\u0443\u043C\u0435\u043D\u0442\u043E\u043C \u043E\u0433\u0440\u0430\u043D\u0438\u0447\u0435\u043D\u0438\u044F \u0431\u0435\u0437\u043E\u043F\u0430\u0441\u043D\u043E\u0441\u0442\u0438 \u043A\u0430\u0436\u0434\u043E\u0433\u043E \u043E\u0442\u0434\u0435\u043B\u044C\u043D\u043E\u0433\u043E \u043A\u043E\u043D\u0442\u0435\u0439\u043D\u0435\u0440\u0430  \u0435\u0441\u043B\u0438 \u0434\u0430\u043D\u0430\u044F \u0444\u0443\u043D\u043A\u04
 46\u0438\u044F \u0432\u043A\u043B\u044E\u0447\u0435\u043D\u0430 \u0432 \u0444\u0430\u0439\u043B\u0435 <code>web.xml</code>. \u0415\u0441\u043B\u0438 \u0432\u044B \u0432\u044B\u043A\u043B\u044E\u0447\u0438\u0442\u0435 JAAS,  \u0435\u0441\u0442\u044C \u0431\u043E\u043B\u044C\u0448\u0430\u044F \u0432\u0435\u0440\u043E\u044F\u0442\u043D\u043E\u0441\u0442\u044C \u0442\u043E\u0433\u043E \u0447\u0442\u043E JSPWiki \u0431\u0443\u0434\u0435\u0442 \u0440\u0430\u0431\u043E\u0442\u0430\u0442\u044C \u043D\u0435\u043A\u043E\u0440\u0440\u0435\u043A\u0442\u043D\u043E, \u043D\u043E \u0438\u043D\u043E\u0433\u0434\u0430 \u044D\u0442\u043E   
 \u043d\u0443\u0436\u043d\u043e=\u0434\u043b\u044f \u043e\u0442\u043b\u0430\u0434\u043a\u0438 \u043a\u043e\u043d\u0444\u0438\u0433\u0443\u0440\u0430\u0446\u0438\u0438. \t   \t
-install.jsp.security.admaccount.label=\u0410\u0434\u043c\u0438\u043d\u0438\u0441\u0442\u0440\u0430\u0442\u0438\u0432\u043d\u0430\u044f \u0437\u0430\u043f\u0438\u0441\u044c
-install.jsp.security.admaccount.enabled=\u0412\u043a\u043b\u044e\u0447\u0435\u043d\u043e
-install.jsp.security.admaccount.notenabled=\u041d\u0435\u0434\u043e\u0441\u0442\u0443\u043f\u043d\u043e
-install.jsp.security.admaccount.enabled.desc=\u042d\u0442\u0430 \u0432\u0438\u043a\u0438 \u0443\u0436\u0435 \u0438\u043c\u0435\u0435\u0442 \u0441\u0443\u043f\u0435\u0440\u043f\u043e\u043b\u044c\u0437\u043e\u0432\u0430\u0442\u0435\u043b\u044c\u0441\u043a\u0438\u0439 \u0430\u043a\u043a\u0430\u0443\u043d\u0442 <strong>admin</strong>, \u043a\u043e\u0442\u043e\u0440\u044b\u0439  \u0432\u0445\u043e\u0434\u0438\u0442 \u0432 \u0433\u0440\u0443\u043f\u043f\u0443 <strong>Admin</strong>. \u041f\u043e \u0443\u043c\u043e\u043b\u0447\u0430\u043d\u0438\u044e, \u0431\u0435\u0437\u043e\u043f\u0430\u0441\u043d\u043e\u0441\u0442\u044c JSPWiki \u0443\u0441\u0442\u0440\u043e\u0435\u043d\u0430 \u0442\u0430\u043a\u0438\u043c \u043e\u0431\u0440\u0430\u0437\u043e\u043c,  \u0447\u0442\u043e \u0432\u0441\u0435 \u043f\u043e\u043b\u044c\u0437\u043e\u0432\u0430\u0442\u0435\u043b\u0438, \u0432\u0445\u043e\u0434\u044f\u0449\u0438\u0435 \u0432 \u0433\u0440\u0443\u043f\u043f\u0443 \u0410\u0434\u043c\u0438\u0
 43d \u0438\u043c\u0435\u044e\u0442 \u043f\u0440\u0430\u0432\u0430 <code>AllPermission</code>. 
-install.jsp.security.admaccount.notenabled.desc=\u041f\u043e\u0445\u043e\u0436\u0435, \u044d\u0442\u0430 \u0432\u0438\u043a\u0438 \u043d\u0435 \u0438\u043c\u0435\u0435\u0442 \u0443\u0447\u0451\u0442\u043d\u043e\u0439 \u0437\u0430\u043f\u0438\u0441\u0438 \u0441\u0443\u043f\u0435\u0440\u043f\u043e\u043b\u044c\u0437\u043e\u0432\u0430\u0442\u0435\u043b\u044f. \u041a\u043e\u0433\u0434\u0430 \u0432\u044b \u043a\u043b\u0438\u043a\u043d\u0438\u0442\u0435 <em>\u0423\u0441\u0442\u0430\u043d\u043e\u0432\u043a\u0430!</em>, JSPWiki \u0441\u043e\u0437\u0434\u0430\u0441\u0442 \u0437\u0430\u043f\u0438\u0441\u044c \u0430\u0432\u0442\u043e\u043c\u0430\u0442\u0438\u0447\u0435\u0441\u043a\u0438.
+install.jsp.security.admaccount.label=\u0410\u0434\u043C\u0438\u043D\u0438\u0441\u0442\u0440\u0430\u0442\u0438\u0432\u043D\u0430\u044F \u0437\u0430\u043F\u0438\u0441\u044C
+install.jsp.security.admaccount.enabled=\u0412\u043A\u043B\u044E\u0447\u0435\u043D\u043E
+install.jsp.security.admaccount.notenabled=\u041D\u0435\u0434\u043E\u0441\u0442\u0443\u043F\u043D\u043E
+install.jsp.security.admaccount.enabled.desc=\u042D\u0442\u0430 \u0432\u0438\u043A\u0438 \u0443\u0436\u0435 \u0438\u043C\u0435\u0435\u0442 \u0441\u0443\u043F\u0435\u0440\u043F\u043E\u043B\u044C\u0437\u043E\u0432\u0430\u0442\u0435\u043B\u044C\u0441\u043A\u0438\u0439 \u0430\u043A\u043A\u0430\u0443\u043D\u0442 <strong>admin</strong>, \u043A\u043E\u0442\u043E\u0440\u044B\u0439  \u0432\u0445\u043E\u0434\u0438\u0442 \u0432 \u0433\u0440\u0443\u043F\u043F\u0443 <strong>Admin</strong>. \u041F\u043E \u0443\u043C\u043E\u043B\u0447\u0430\u043D\u0438\u044E, \u0431\u0435\u0437\u043E\u043F\u0430\u0441\u043D\u043E\u0441\u0442\u044C JSPWiki \u0443\u0441\u0442\u0440\u043E\u0435\u043D\u0430 \u0442\u0430\u043A\u0438\u043C \u043E\u0431\u0440\u0430\u0437\u043E\u043C,  \u0447\u0442\u043E \u0432\u0441\u0435 \u043F\u043E\u043B\u044C\u0437\u043E\u0432\u0430\u0442\u0435\u043B\u0438, \u0432\u0445\u043E\u0434\u044F\u0449\u0438\u0435 \u0432 \u0433\u0440\u0443\u043F\u043F\u0443 \u0410\u0434\u043C\u0438\u0
 43D \u0438\u043C\u0435\u044E\u0442 \u043F\u0440\u0430\u0432\u0430 <code>AllPermission</code>. 
+install.jsp.security.admaccount.notenabled.desc=\u041F\u043E\u0445\u043E\u0436\u0435, \u044D\u0442\u0430 \u0432\u0438\u043A\u0438 \u043D\u0435 \u0438\u043C\u0435\u0435\u0442 \u0443\u0447\u0451\u0442\u043D\u043E\u0439 \u0437\u0430\u043F\u0438\u0441\u0438 \u0441\u0443\u043F\u0435\u0440\u043F\u043E\u043B\u044C\u0437\u043E\u0432\u0430\u0442\u0435\u043B\u044F. \u041A\u043E\u0433\u0434\u0430 \u0432\u044B \u043A\u043B\u0438\u043A\u043D\u0438\u0442\u0435 <em>\u0423\u0441\u0442\u0430\u043D\u043E\u0432\u043A\u0430\!</em>, JSPWiki \u0441\u043E\u0437\u0434\u0430\u0441\u0442 \u0437\u0430\u043F\u0438\u0441\u044C \u0430\u0432\u0442\u043E\u043C\u0430\u0442\u0438\u0447\u0435\u0441\u043A\u0438.
 # Installer.java
-install.installer.unable.read.props=\u041d\u0435\u0432\u043e\u0437\u043c\u043e\u0436\u043d\u043e \u043f\u0440\u043e\u0447\u0435\u0441\u0442\u044c \u043d\u0430\u0441\u0442\u0440\u043e\u0439\u043a\u0438: {0}
-install.installer.default.appname=\u041c\u043e\u044f \u0412\u0438\u043a\u0438
-install.installer.default.pagedir=\u041e\u0442\u0440\u0435\u0434\u0430\u043a\u0442\u0438\u0440\u0443\u0439 \u043c\u0435\u043d\u044f!
-install.installer.props.saved=\u0412\u0430\u0448\u0438 \u0438\u0437\u043c\u0435\u043d\u0435\u043d\u0438\u044f \u0431\u044b\u043b\u0438 \u0441\u043e\u0445\u043d\u0430\u0440\u0435\u043d\u044b.  \u041f\u043e\u0436\u0430\u043b\u0443\u0439\u0441\u0442\u0430, \u043f\u0435\u0440\u0435\u0433\u0440\u0443\u0437\u0438\u0442\u0435 \u043a\u043e\u043d\u0442\u0435\u0439\u043d\u0435\u0440 (\u0435\u0441\u043b\u0438 \u044d\u0442\u043e \u043f\u0435\u0440\u0432\u0430\u044f  \u0443\u0441\u0442\u0430\u043d\u043e\u0432\u043a\u0430).  \u041d\u0438\u0436\u0435 \u043c\u043e\u0436\u0435\u0442\u0435 \u0443\u0432\u0438\u0434\u0435\u0442\u044c \u043d\u0430\u0441\u0442\u0440\u043e\u0439\u043a\u0438 (jspwiki.properties).
-install.installer.props.notsaved=\u041d\u0435\u0432\u043e\u0437\u043c\u043e\u0436\u043d\u043e \u0437\u0430\u043f\u0438\u0441\u0430\u0442\u044c \u043d\u0430\u0441\u0442\u0440\u043e\u0439\u043a\u0438: {0}. \u041f\u043e\u0436\u0430\u043b\u0443\u0439\u0441\u0442\u0430, \u0438\u0441\u043f\u0440\u0430\u0432\u0442\u0435 \u043e\u0448\u0438\u0431\u043a\u0438 \u0432 \u0444\u0430\u0439\u043b\u0435 jspwiki.properties: \n{1}
-install.installer.validate.baseurl=\u0412\u044b \u0434\u043e\u043b\u0436\u043d\u044b \u0443\u043a\u0430\u0437\u0430\u0442\u044c URL \u0434\u043b\u044f \u044d\u0442\u043e\u0439 \u0432\u0438\u043a\u0438.
-install.installer.validate.pagedir=\u0412\u044b \u0434\u043e\u043b\u0436\u043d\u044b \u0443\u043a\u0430\u0437\u0430\u0442\u044c \u0434\u0438\u0440\u0435\u043a\u0442\u043e\u0440\u0438\u044e \u0445\u0440\u0430\u043d\u0435\u043d\u0438\u044f \u0437\u0430\u043f\u0438\u0441\u0435\u0439.
-install.installer.validate.appname=\u0412\u044b \u0434\u043e\u043b\u0436\u043d\u044b \u0443\u043a\u0430\u0437\u0430\u0442\u044c \u0438\u043c\u044f \u0432\u0438\u043a\u0438.
-install.installer.validate.workdir=\u0412\u044b \u0434\u043e\u043b\u0436\u043d\u044b \u0443\u043a\u0430\u0437\u0430\u0442\u044c \u0440\u0430\u0431\u043e\u0447\u0443\u044e \u0434\u0438\u0440\u0435\u043a\u0442\u043e\u0440\u0438\u044e.
-install.installer.validate.logdir=\u0412\u044b \u0434\u043e\u043b\u0436\u043d\u044b \u0443\u043a\u0430\u0437\u0430\u0442\u044c \u0434\u0438\u0440\u0435\u043a\u0442\u043e\u0440\u0438\u044e \u0434\u043b\u044f \u043b\u043e\u0433\u0438\u0440\u043e\u0432\u0430\u043d\u0438\u044f.
+install.installer.unable.read.props=\u041D\u0435\u0432\u043E\u0437\u043C\u043E\u0436\u043D\u043E \u043F\u0440\u043E\u0447\u0435\u0441\u0442\u044C \u043D\u0430\u0441\u0442\u0440\u043E\u0439\u043A\u0438\: {0}
+install.installer.default.appname=\u041C\u043E\u044F \u0412\u0438\u043A\u0438
+install.installer.default.pagedir=\u041E\u0442\u0440\u0435\u0434\u0430\u043A\u0442\u0438\u0440\u0443\u0439 \u043C\u0435\u043D\u044F\!
+install.installer.props.saved=\u0412\u0430\u0448\u0438 \u0438\u0437\u043C\u0435\u043D\u0435\u043D\u0438\u044F \u0431\u044B\u043B\u0438 \u0441\u043E\u0445\u043D\u0430\u0440\u0435\u043D\u044B.  \u041F\u043E\u0436\u0430\u043B\u0443\u0439\u0441\u0442\u0430, \u043F\u0435\u0440\u0435\u0433\u0440\u0443\u0437\u0438\u0442\u0435 \u043A\u043E\u043D\u0442\u0435\u0439\u043D\u0435\u0440 (\u0435\u0441\u043B\u0438 \u044D\u0442\u043E \u043F\u0435\u0440\u0432\u0430\u044F  \u0443\u0441\u0442\u0430\u043D\u043E\u0432\u043A\u0430).  \u041D\u0438\u0436\u0435 \u043C\u043E\u0436\u0435\u0442\u0435 \u0443\u0432\u0438\u0434\u0435\u0442\u044C \u043D\u0430\u0441\u0442\u0440\u043E\u0439\u043A\u0438 (jspwiki.properties).
+install.installer.props.notsaved=\u041D\u0435\u0432\u043E\u0437\u043C\u043E\u0436\u043D\u043E \u0437\u0430\u043F\u0438\u0441\u0430\u0442\u044C \u043D\u0430\u0441\u0442\u0440\u043E\u0439\u043A\u0438\: {0}. \u041F\u043E\u0436\u0430\u043B\u0443\u0439\u0441\u0442\u0430, \u0438\u0441\u043F\u0440\u0430\u0432\u0442\u0435 \u043E\u0448\u0438\u0431\u043A\u0438 \u0432 \u0444\u0430\u0439\u043B\u0435 jspwiki.properties\: \n{1}
+install.installer.validate.baseurl=\u0412\u044B \u0434\u043E\u043B\u0436\u043D\u044B \u0443\u043A\u0430\u0437\u0430\u0442\u044C URL \u0434\u043B\u044F \u044D\u0442\u043E\u0439 \u0432\u0438\u043A\u0438.
+install.installer.validate.pagedir=\u0412\u044B \u0434\u043E\u043B\u0436\u043D\u044B \u0443\u043A\u0430\u0437\u0430\u0442\u044C \u0434\u0438\u0440\u0435\u043A\u0442\u043E\u0440\u0438\u044E \u0445\u0440\u0430\u043D\u0435\u043D\u0438\u044F \u0437\u0430\u043F\u0438\u0441\u0435\u0439.
+install.installer.validate.appname=\u0412\u044B \u0434\u043E\u043B\u0436\u043D\u044B \u0443\u043A\u0430\u0437\u0430\u0442\u044C \u0438\u043C\u044F \u0432\u0438\u043A\u0438.
+install.installer.validate.workdir=\u0412\u044B \u0434\u043E\u043B\u0436\u043D\u044B \u0443\u043A\u0430\u0437\u0430\u0442\u044C \u0440\u0430\u0431\u043E\u0447\u0443\u044E \u0434\u0438\u0440\u0435\u043A\u0442\u043E\u0440\u0438\u044E.
+install.installer.validate.logdir=\u0412\u044B \u0434\u043E\u043B\u0436\u043D\u044B \u0443\u043A\u0430\u0437\u0430\u0442\u044C \u0434\u0438\u0440\u0435\u043A\u0442\u043E\u0440\u0438\u044E \u0434\u043B\u044F \u043B\u043E\u0433\u0438\u0440\u043E\u0432\u0430\u043D\u0438\u044F.
 # RSSImageLinkTag
-rss.title=RSS \u043f\u043e\u0442\u043e\u043a \u0434\u043b\u044f \u0441\u0442\u0440\u0430\u043d\u0438\u0446\u044b {0}
+rss.title=RSS \u043F\u043E\u0442\u043E\u043A \u0434\u043B\u044F \u0441\u0442\u0440\u0430\u043D\u0438\u0446\u044B {0}
 # AttachmentManager
-attach.unwanted.file=\u0438\u043c\u044f \u0444\u0430\u0439\u043b\u0430 \u043d\u0435 \u0438\u0441\u043a\u043e\u043c\u043e\u0435.
-attach.empty.file=\u0418\u043c\u044f \u0444\u0430\u0439\u043b\u0430 \u043f\u0443\u0441\u0442\u043e\u0435.
-attach.parent.not.exist=\u041e\u0442\u0441\u0443\u0442\u0441\u0442\u0432\u0443\u0435\u0442 \u0440\u043e\u0434\u0438\u0442\u0435\u043b\u044c\u0441\u043a\u0430\u044f \u0441\u0442\u0440\u0430\u043d\u0438\u0446\u0430
+attach.unwanted.file=\u0438\u043C\u044F \u0444\u0430\u0439\u043B\u0430 \u043D\u0435 \u0438\u0441\u043A\u043E\u043C\u043E\u0435.
+attach.empty.file=\u0418\u043C\u044F \u0444\u0430\u0439\u043B\u0430 \u043F\u0443\u0441\u0442\u043E\u0435.
+attach.parent.not.exist=\u041E\u0442\u0441\u0443\u0442\u0441\u0442\u0432\u0443\u0435\u0442 \u0440\u043E\u0434\u0438\u0442\u0435\u043B\u044C\u0441\u043A\u0430\u044F \u0441\u0442\u0440\u0430\u043D\u0438\u0446\u0430
 # VariableManager
-varmgr.not.logged.in=\u043d\u0435 \u0432\u043e\u0448\u0435\u043b
-varmgr.authenticated=\u043f\u0440\u0438\u0441\u0443\u0442\u0441\u0442\u0432\u0443\u0435\u0442
-varmgr.asserted=\u0432 \u043f\u0440\u043e\u0446\u0435\u0441\u0441\u0435
-varmgr.anonymous=\u0433\u043e\u0441\u0442\u044c
+varmgr.not.logged.in=\u043D\u0435 \u0432\u043E\u0448\u0435\u043B
+varmgr.authenticated=\u043F\u0440\u0438\u0441\u0443\u0442\u0441\u0442\u0432\u0443\u0435\u0442
+varmgr.asserted=\u0432 \u043F\u0440\u043E\u0446\u0435\u0441\u0441\u0435
+varmgr.anonymous=\u0433\u043E\u0441\u0442\u044C
 ######################################################################
 
 #  JSPWiki field labels used by <stripes:*> tags
 
 ######################################################################
 
-loginName=\u041b\u043e\u0433\u0438\u043d
-password=\u041f\u0430\u0440\u043e\u043b\u044c
+loginName=\u041B\u043E\u0433\u0438\u043D
+password=\u041F\u0430\u0440\u043E\u043B\u044C
 #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
-profile.loginName=\u041b\u043e\u0433\u0438\u043d
-profile.password=\u041f\u0430\u0440\u043e\u043b\u044c
-passwordAgain=\u041f\u0440\u043e\u0432\u0435\u0440\u043a\u0430 \u043f\u0430\u0440\u043e\u043b\u044f
-profile.fullname=\u0418\u043c\u044f
-org.apache.wiki.action.UserProfileActionBean.save=\u0421\u043e\u0445\u0440\u0430\u043d\u0438\u0442\u044c \u043f\u0440\u043e\u0444\u0438\u043b\u044c
-assertedName=\u0418\u043c\u044f
-editor=\u0420\u0435\u0434\u0430\u043a\u0442\u043e\u0440
-sectionEditing=\u0421\u0435\u043a\u0446\u0438\u044f \u0440\u0435\u0434\u0430\u043a\u0442\u0438\u0440\u043e\u0432\u0430\u043d\u0438\u044f
-skin=\u041e\u0431\u043b\u043e\u0436\u043a\u0430
-locale=\u042f\u0437\u044b\u043a
-orientation=\u041e\u0440\u0438\u0435\u043d\u0442\u0430\u0446\u0438\u044f \u043c\u0435\u043d\u044e 
-Orientation.LEFT=\u041b\u0435\u0432\u043e
-Orientation.RIGHT=\u041f\u0440\u0430\u0432\u043e
-timeFormat=\u0412\u0440\u0435\u043c\u0435\u043d\u043d\u043e\u0439 \u0444\u043e\u0440\u043c\u0430\u0442
-timeZone=\u0412\u0440\u0435\u043c\u0435\u043d\u043d\u0430\u044f \u0437\u043e\u043d\u0430
-org.apache.wiki.action.UserPreferencesActionBean.save=\u0421\u043e\u0445\u0440\u0430\u043d\u0438\u0442\u044c \u043d\u0430\u0441\u0442\u0440\u043e\u0439\u043a\u0438
-clearAssertedName=\u041e\u0447\u0438\u0441\u0442\u0438\u0442\u044c \u043d\u0430\u0441\u0442\u0440\u043e\u0439\u043a\u0438
+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
+profile.loginName=\u041B\u043E\u0433\u0438\u043D
+profile.password=\u041F\u0430\u0440\u043E\u043B\u044C
+passwordAgain=\u041F\u0440\u043E\u0432\u0435\u0440\u043A\u0430 \u043F\u0430\u0440\u043E\u043B\u044F
+profile.fullname=\u0418\u043C\u044F
+org.apache.wiki.action.UserProfileActionBean.save=\u0421\u043E\u0445\u0440\u0430\u043D\u0438\u0442\u044C \u043F\u0440\u043E\u0444\u0438\u043B\u044C
+assertedName=\u0418\u043C\u044F
+editor=\u0420\u0435\u0434\u0430\u043A\u0442\u043E\u0440
+sectionEditing=\u0421\u0435\u043A\u0446\u0438\u044F \u0440\u0435\u0434\u0430\u043A\u0442\u0438\u0440\u043E\u0432\u0430\u043D\u0438\u044F
+skin=\u041E\u0431\u043B\u043E\u0436\u043A\u0430
+locale=\u042F\u0437\u044B\u043A
+orientation=\u041E\u0440\u0438\u0435\u043D\u0442\u0430\u0446\u0438\u044F \u043C\u0435\u043D\u044E 
+Orientation.LEFT=\u041B\u0435\u0432\u043E
+Orientation.RIGHT=\u041F\u0440\u0430\u0432\u043E
+timeFormat=\u0412\u0440\u0435\u043C\u0435\u043D\u043D\u043E\u0439 \u0444\u043E\u0440\u043C\u0430\u0442
+timeZone=\u0412\u0440\u0435\u043C\u0435\u043D\u043D\u0430\u044F \u0437\u043E\u043D\u0430
+org.apache.wiki.action.UserPreferencesActionBean.save=\u0421\u043E\u0445\u0440\u0430\u043D\u0438\u0442\u044C \u043D\u0430\u0441\u0442\u0440\u043E\u0439\u043A\u0438
+clearAssertedName=\u041E\u0447\u0438\u0441\u0442\u0438\u0442\u044C \u043D\u0430\u0441\u0442\u0440\u043E\u0439\u043A\u0438
 #Copied from src/WebContent/WEB-INF/classes/templates/default.properties.
-common.nopage=\u042d\u0442\u0430 \u0441\u0442\u0440\u0430\u043d\u0438\u0446\u0430 \u043d\u0435 \u0441\u0443\u0449\u0435\u0441\u0442\u0432\u0443\u0435\u0442.  \u041f\u043e\u0447\u0435\u043c\u0443 \u0431\u044b \u0432\u0430\u043c \u0435\u0435 \u043d\u0435 \u0441\u043e\u0437\u0434\u0430\u0442\u044c {0}?
+common.nopage=\u042D\u0442\u0430 \u0441\u0442\u0440\u0430\u043D\u0438\u0446\u0430 \u043D\u0435 \u0441\u0443\u0449\u0435\u0441\u0442\u0432\u0443\u0435\u0442.  \u041F\u043E\u0447\u0435\u043C\u0443 \u0431\u044B \u0432\u0430\u043C \u0435\u0435 \u043D\u0435 \u0441\u043E\u0437\u0434\u0430\u0442\u044C {0}?
 #Copied from src/WebContent/WEB-INF/classes/templates/default.properties.. Formerly named info.deleteattachment.submit.
-org.apache.wiki.action.ViewActionBean.deleteAttachment=\u0423\u0434\u0430\u043b\u0438\u0442\u044c \u043f\u0440\u0438\u043a\u0440\u0435\u043f\u043b\u0435\u043d\u0438\u0435
+org.apache.wiki.action.ViewActionBean.deleteAttachment=\u0423\u0434\u0430\u043B\u0438\u0442\u044C \u043F\u0440\u0438\u043A\u0440\u0435\u043F\u043B\u0435\u043D\u0438\u0435
 #Copied from src/WebContent/WEB-INF/classes/templates/default.properties.. Formerly named attach.add.submit.
-org.apache.wiki.action.ViewActionBean.upload=\u0417\u0430\u0433\u0440\u0443\u0437\u0438\u0442\u044c
+org.apache.wiki.action.ViewActionBean.upload=\u0417\u0430\u0433\u0440\u0443\u0437\u0438\u0442\u044C
 #Copied from src/WebContent/WEB-INF/classes/templates/default.properties.
-attach.add.selectfile=\u0412\u044b\u0431\u0440\u0430\u0442\u044c \u0444\u0430\u0439\u043b:
+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:
+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;{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.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. 
 #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. 
+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
+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.name.
-author=\u0412\u0430\u0448\u0435 <span class='accesskey'>\u0438</span>\u043c\u044f
+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
+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
+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
+cancel=\u041E\u0442\u043C\u0435\u043D\u0430
 #Formerly named install.jsp.instr.submit.
-org.apache.wiki.action.InstallActionBean.save=\u0423\u0441\u0442\u0430\u043d\u043e\u0432\u043a\u0430!
+org.apache.wiki.action.InstallActionBean.save=\u0423\u0441\u0442\u0430\u043D\u043E\u0432\u043A\u0430\!
 #Formerly named install.jsp.basics.appname.label.. Formerly named applicationName.
-properties.jspwiki.jspwiki_applicationName=\u041d\u0430\u0437\u0432\u0430\u043d\u0438\u0435 \u0432\u0438\u043a\u0438
+properties.jspwiki.jspwiki_applicationName=\u041D\u0430\u0437\u0432\u0430\u043D\u0438\u0435 \u0432\u0438\u043A\u0438
 #Formerly named install.jsp.basics.baseurl.label.. Formerly named baseURL.
-properties.jspwiki.jspwiki_baseURL=\u041f\u0443\u0442\u044c
+properties.jspwiki.jspwiki_baseURL=\u041F\u0443\u0442\u044C
 #Formerly named install.jsp.adv.settings.workdir.label.. Formerly named workDir.
-properties.jspwiki.jspwiki_workDir=\u0420\u0430\u0431\u043e\u0447\u0430\u044f \u0434\u0438\u0440\u0435\u043a\u0442\u043e\u0440\u0438\u044f
+properties.jspwiki.jspwiki_workDir=\u0420\u0430\u0431\u043E\u0447\u0430\u044F \u0434\u0438\u0440\u0435\u043A\u0442\u043E\u0440\u0438\u044F
 #Formerly named install.jsp.adv.settings.logfile.label.. Formerly named logFile.. Formerly named properties.log4j.log4j_appender_FileLog_File.
-logDirectory=\u0416\u0443\u0440\u043d\u0430\u043b \u0441\u043e\u043e\u0431\u0449\u0435\u043d\u0438\u0439 (\u043b\u043e\u0433\u0438\u0440\u043e\u0432\u0430\u043d\u0438\u0435)
+logDirectory=\u0416\u0443\u0440\u043D\u0430\u043B \u0441\u043E\u043E\u0431\u0449\u0435\u043D\u0438\u0439 (\u043B\u043E\u0433\u0438\u0440\u043E\u0432\u0430\u043D\u0438\u0435)
 #Formerly named install.jsp.basics.page.storage.label.. Formerly named pageDir.. Formerly named properties.jspwiki.jspwiki_fileSystemProvider_pageDir.
-properties.priha.priha_provider_defaultProvider_directory=\u0425\u0440\u0430\u043d\u0438\u043b\u0438\u0449\u0435 \u0441\u0442\u0440\u0430\u043d\u0438\u0446 
+properties.priha.priha_provider_defaultProvider_directory=\u0425\u0440\u0430\u043D\u0438\u043B\u0438\u0449\u0435 \u0441\u0442\u0440\u0430\u043D\u0438\u0446 
 #Copied from src/WebContent/WEB-INF/classes/templates/default.properties.. Formerly named editor.plain.changenote.. Formerly named changenote.
-changeNote=\u0418\u0437\u043c\u0438\u043d\u0435\u043d\u0438\u044f
+changeNote=\u0418\u0437\u043C\u0438\u043D\u0435\u043D\u0438\u044F
 #Copied from src/WebContent/WEB-INF/classes/templates/default.properties.. Formerly named editor.plain.find.submit.
-org.apache.wiki.action.EditActionBean.findAndReplace=\u0417\u0430\u043c\u0435\u043d\u0438\u0442\u044c
+org.apache.wiki.action.EditActionBean.findAndReplace=\u0417\u0430\u043C\u0435\u043D\u0438\u0442\u044C
 #Copied from src/WebContent/WEB-INF/classes/templates/default.properties.. Formerly named grp.savegroup.
-org.apache.wiki.action.GroupActionBean.save=\u0421\u043e\u0445\u0440\u0430\u043d\u0438\u0442\u044c \u0433\u0440\u0443\u043f\u043f\u0443
+org.apache.wiki.action.GroupActionBean.save=\u0421\u043E\u0445\u0440\u0430\u043D\u0438\u0442\u044C \u0433\u0440\u0443\u043F\u043F\u0443
 #Copied from etc/i18n/templates/default.properties.. Formerly named newgroup.name.
-group=\u0418\u043c\u044f
+group=\u0418\u043C\u044F
 #Copied from src/WebContent/WEB-INF/classes/templates/default.properties.. Formerly named group.members.
-members=\u0423\u0447\u0430\u0441\u043d\u0438\u043a\u0438 \u0433\u0440\u0443\u043f\u043f\u044b
-org.apache.wiki.action.WorkflowActionBean.abort=\u041f\u0440\u0435\u0440\u0432\u0430\u0442\u044c
+members=\u0423\u0447\u0430\u0441\u043D\u0438\u043A\u0438 \u0433\u0440\u0443\u043F\u043F\u044B
+org.apache.wiki.action.WorkflowActionBean.abort=\u041F\u0440\u0435\u0440\u0432\u0430\u0442\u044C
 #Copied from src/WebContent/WEB-INF/classes/templates/default.properties.. Formerly named outcome.step.abort.
-Outcome.step.abort=\u041f\u0440\u0435\u0440\u0432\u0430\u0442\u044c
+Outcome.step.abort=\u041F\u0440\u0435\u0440\u0432\u0430\u0442\u044C
 #Copied from src/WebContent/WEB-INF/classes/templates/default.properties.. Formerly named outcome.step.complete.
-Outcome.step.complete=\u0412\u044b\u043f\u043e\u043b\u043d\u0435\u043d\u043e
+Outcome.step.complete=\u0412\u044B\u043F\u043E\u043B\u043D\u0435\u043D\u043E
 #Copied from src/WebContent/WEB-INF/classes/templates/default.properties.. Formerly named outcome.step.continue.
-Outcome.step.continue=\u041f\u0440\u043e\u0434\u043e\u043b\u0436\u0438\u0442\u044c
+Outcome.step.continue=\u041F\u0440\u043E\u0434\u043E\u043B\u0436\u0438\u0442\u044C
 #Copied from src/WebContent/WEB-INF/classes/templates/default.properties.. Formerly named outcome.decision.acknowledge.
-Outcome.decision.acknowledge=\u0425\u043e\u0440\u043e\u0448\u043e
+Outcome.decision.acknowledge=\u0425\u043E\u0440\u043E\u0448\u043E
 #Copied from src/WebContent/WEB-INF/classes/templates/default.properties.. Formerly named outcome.decision.approve.
-Outcome.decision.approve=\u041e\u0434\u043e\u0431\u0440\u0438\u0442\u044c
+Outcome.decision.approve=\u041E\u0434\u043E\u0431\u0440\u0438\u0442\u044C
 #Copied from src/WebContent/WEB-INF/classes/templates/default.properties.. Formerly named outcome.decision.deny.
-Outcome.decision.deny=\u0417\u0430\u043f\u0440\u0435\u0442\u0438\u0442\u044c
+Outcome.decision.deny=\u0417\u0430\u043F\u0440\u0435\u0442\u0438\u0442\u044C
 #Copied from src/WebContent/WEB-INF/classes/templates/default.properties.. Formerly named outcome.decision.hold.
-Outcome.decision.hold=\u0417\u0430\u0434\u0435\u0440\u0436\u0430\u0442\u044c
+Outcome.decision.hold=\u0417\u0430\u0434\u0435\u0440\u0436\u0430\u0442\u044C
 #Copied from src/WebContent/WEB-INF/classes/templates/default.properties.. Formerly named outcome.decision.reassign.
-Outcome.decision.reassign=\u041f\u0435\u0440\u0435\u043d\u0430\u0437\u043d\u0430\u0447\u0438\u0442\u044c
+Outcome.decision.reassign=\u041F\u0435\u0440\u0435\u043D\u0430\u0437\u043D\u0430\u0447\u0438\u0442\u044C
 #Formerly named captcha.description.
-org.apache.wiki.content.inspect.AsirraCaptcha.description=\u041c\u044b \u0432\u0435\u0440\u0438\u043c \u0447\u0442\u043e \u0412\u044b \u043d\u0435 \u0440\u043e\u0431\u043e\u0442 \u0438\u043b\u0438 \u0441\u043f\u0430\u043c\u0435\u0440. \u0427\u0442\u043e\u0431\u044b \u0443\u0431\u0435\u0434\u0438\u0442\u0441\u044f, \u0441\u043e\u0441\u0447\u0438\u0442\u0430\u0439\u0442\u0435 \u043a\u043e\u0442\u044f\u0442 \u043d\u0430 \u043a\u0430\u0440\u0442\u0438\u043d\u043a\u0435.
+org.apache.wiki.content.inspect.AsirraCaptcha.description=\u041C\u044B \u0432\u0435\u0440\u0438\u043C \u0447\u0442\u043E \u0412\u044B \u043D\u0435 \u0440\u043E\u0431\u043E\u0442 \u0438\u043B\u0438 \u0441\u043F\u0430\u043C\u0435\u0440. \u0427\u0442\u043E\u0431\u044B \u0443\u0431\u0435\u0434\u0438\u0442\u0441\u044F, \u0441\u043E\u0441\u0447\u0438\u0442\u0430\u0439\u0442\u0435 \u043A\u043E\u0442\u044F\u0442 \u043D\u0430 \u043A\u0430\u0440\u0442\u0438\u043D\u043A\u0435.
 #Formerly named captcha.asirra.adopt.me.
-org.apache.wiki.content.inspect.AsirraCaptcha.adoptMe=\u041f\u0440\u0438\u0439\u043c\u0438 \u043c\u0435\u043d\u044f \u0432 \u0441\u0435\u043c\u044c\u044e
+org.apache.wiki.content.inspect.AsirraCaptcha.adoptMe=\u041F\u0440\u0438\u0439\u043C\u0438 \u043C\u0435\u043D\u044F \u0432 \u0441\u0435\u043C\u044C\u044E
 #Copied from src/WebContent/WEB-INF/classes/templates/default.properties.. Formerly named info.delete.submit.
-org.apache.wiki.action.DeleteActionBean.delete=\u0423\u0434\u0430\u043b\u0438\u0442\u044c \u0441\u043e\u0434\u0435\u0440\u0436\u0430\u0449\u0443\u044e \u0441\u0442\u0440\u0430\u043d\u0438\u0446\u0443
+org.apache.wiki.action.DeleteActionBean.delete=\u0423\u0434\u0430\u043B\u0438\u0442\u044C \u0441\u043E\u0434\u0435\u0440\u0436\u0430\u0449\u0443\u044E \u0441\u0442\u0440\u0430\u043D\u0438\u0446\u0443
 #Copied from src/WebContent/WEB-INF/classes/templates/default.properties.. Formerly named info.rename.submit.. Formerly named org.apache.wiki.action.ViewActionBean.delete.. Formerly named org.apache.wiki.action.ViewActionBean.rename.
-org.apache.wiki.action.RenameActionBean.rename=\u041f\u0435\u0440\u0435\u0438\u043c\u0435\u043d\u043e\u0432\u0430\u0442\u044c \u0441\u0442\u0440\u0430\u043d\u0438\u0446\u0443
+org.apache.wiki.action.RenameActionBean.rename=\u041F\u0435\u0440\u0435\u0438\u043C\u0435\u043D\u043E\u0432\u0430\u0442\u044C \u0441\u0442\u0440\u0430\u043D\u0438\u0446\u0443
 #Formerly named resetPassword.
-org.apache.wiki.action.LostPasswordActionBean.reset=\u0421\u0431\u0440\u043e\u0441\u0438\u0442\u044c \u043f\u0430\u0440\u043e\u043b\u044c !
-#Copied from src/WebContent/WEB-INF/classes/templates/default.properties.. Formerly named find.submit.go.. Formerly named org.apache.wiki.action.SearchActionBean.search.
-org.apache.wiki.action.SearchActionBean.go=\u041f\u043e\u0435\u0445\u0430\u043b\u0438!
+org.apache.wiki.action.LostPasswordActionBean.reset=\u0421\u0431\u0440\u043E\u0441\u0438\u0442\u044C \u043F\u0430\u0440\u043E\u043B\u044C \!
 #Copied from src/WebContent/WEB-INF/classes/templates/default.properties.. Formerly named find.submit.find.
-org.apache.wiki.action.SearchActionBean.search=\u041d\u0430\u0439\u0442\u0438!
+org.apache.wiki.action.SearchActionBean.search=\u041D\u0430\u0439\u0442\u0438\!
 #Copied from src/WebContent/WEB-INF/classes/templates/default.properties.. Formerly named find.scope.all.
-SearchScope.ALL=\u041f\u043e\u0438\u0441\u043a \u0432\u0435\u0437\u0434\u0435
+SearchScope.ALL=\u041F\u043E\u0438\u0441\u043A \u0432\u0435\u0437\u0434\u0435
 #Copied from src/WebContent/WEB-INF/classes/templates/default.properties.. Formerly named find.scope.authors.
-SearchScope.AUTHORS=\u0410\u0432\u0442\u043e\u0440\u044b
+SearchScope.AUTHORS=\u0410\u0432\u0442\u043E\u0440\u044B
 #Copied from src/WebContent/WEB-INF/classes/templates/default.properties.. Formerly named find.scope.content.
-SearchScope.CONTENTS=\u0421\u043e\u0434\u0435\u0440\u0436\u0430\u043d\u0438\u0435 \u0441\u0442\u0440\u0430\u043d\u0438\u0446\u044b
+SearchScope.CONTENTS=\u0421\u043E\u0434\u0435\u0440\u0436\u0430\u043D\u0438\u0435 \u0441\u0442\u0440\u0430\u043D\u0438\u0446\u044B
 #Copied from src/WebContent/WEB-INF/classes/templates/default.properties.. Formerly named find.scope.attach.
-SearchScope.ATTACHMENTS=\u041f\u0440\u0438\u043a\u0440\u0435\u043f\u043b\u0435\u043d\u0438\u044f
+SearchScope.ATTACHMENTS=\u041F\u0440\u0438\u043A\u0440\u0435\u043F\u043B\u0435\u043D\u0438\u044F
 #Copied from src/WebContent/WEB-INF/classes/templates/default.properties.. Formerly named find.scope.pagename.. Formerly named SearchScope.PAGE_NAME.
-SearchScope.PAGE_NAMES=\u041d\u0430\u0437\u0432\u0430\u043d\u0438\u044f \u0441\u0442\u0440\u0430\u043d\u0438\u0446
+SearchScope.PAGE_NAMES=\u041D\u0430\u0437\u0432\u0430\u043D\u0438\u044F \u0441\u0442\u0440\u0430\u043D\u0438\u0446



Mime
View raw message