Author: ajaquith
Date: Sat Jan 30 15:34:36 2010
New Revision: 904797
URL: http://svn.apache.org/viewvc?rev=904797&view=rev
Log:
i18n changes to support JSP consolidation in build 3.0.0-201
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
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=904797&r1=904796&r2=904797&view=diff
==============================================================================
---
incubator/jspwiki/trunk/src/WebContent/WEB-INF/classes/CoreResources.properties
(original)
+++
incubator/jspwiki/trunk/src/WebContent/WEB-INF/classes/CoreResources.properties
Sat Jan 30 15:34:36 2010
@@ -335,8 +335,6 @@
ldap.showConfig=Configure LDAP...
#Formerly named install.jsp.basics.page.storage.label.. Formerly named
properties.jspwiki.jspwiki_fileSystemProvider_pageDir.
properties.priha.priha_provider_defaultProvider_directory=Page storage
-#Copied from src/WebContent/WEB-INF/classes/templates/default.properties..
Formerly named info.rename.submit.. Formerly named
org.apache.wiki.action.ViewActionBean.delete.
-org.apache.wiki.action.ViewActionBean.rename=Rename page
#Copied from src/WebContent/WEB-INF/classes/templates/default.properties..
Formerly named editor.plain.changenote.. Formerly named changenote.
changeNote=Change note
#Copied from src/WebContent/WEB-INF/classes/templates/default.properties..
Formerly named editor.plain.find.submit.
@@ -376,7 +374,11 @@
org.apache.wiki.content.inspect.AsirraCaptcha.description=If you are human,
please select all of the cats from the images below.
#Formerly named captcha.asirra.adopt.me.
org.apache.wiki.content.inspect.AsirraCaptcha.adoptMe=Adopt me
-org.apache.wiki.content.inspect.PasswordChallenge.description = To confirm
your changes, enter your password.
-captcha = CAPTCHA test
-changed.email = When you save this page, we will use your profile's e-mail {0}
instead of the cookie value {1}. If you want to use {1} instead, change the
e-mail address in your profile.
-AdminBeanTypeConverter.illegalAdminBean = AdminBean with ID {2} was not found.
\ No newline at end of file
+org.apache.wiki.content.inspect.PasswordChallenge.description=To confirm your
changes, enter your password.
+captcha=CAPTCHA test
+changed.email=When you save this page, we will use your profile's e-mail {0}
instead of the cookie value {1}. If you want to use {1} instead, change the
e-mail address in your profile.
+AdminBeanTypeConverter.illegalAdminBean=AdminBean with ID {2} was not found.
+#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 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=Rename page
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=904797&r1=904796&r2=904797&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
Sat Jan 30 15:34:36 2010
@@ -314,8 +314,6 @@
logDirectory=Log-Dateien
#Formerly named install.jsp.basics.page.storage.label.. Formerly named
pageDir.. Formerly named properties.jspwiki.jspwiki_fileSystemProvider_pageDir.
properties.priha.priha_provider_defaultProvider_directory=Seitenspeicherung
-#Copied from src/WebContent/WEB-INF/classes/templates/default.properties..
Formerly named info.rename.submit.. Formerly named
org.apache.wiki.action.ViewActionBean.delete.
-org.apache.wiki.action.ViewActionBean.rename=Seite umbenennen
#Copied from src/WebContent/WEB-INF/classes/templates/default.properties..
Formerly named editor.plain.changenote.. Formerly named changenote.
changeNote=Kommentar:
#Copied from src/WebContent/WEB-INF/classes/templates/default.properties..
Formerly named editor.plain.find.submit.
@@ -347,6 +345,10 @@
org.apache.wiki.content.inspect.AsirraCaptcha.description=Wir befürchten, du
könntest ein Automat oder Spammer sein! Um zu zeigen, dass du ein normales
menschliches Geschöpf bist, wähle bitte aus der folgenden Bilderserie alle
Katzen aus!
#Formerly named captcha.asirra.adopt.me.
org.apache.wiki.content.inspect.AsirraCaptcha.adoptMe=Adoptier' mich!
+#Copied from src/WebContent/WEB-INF/classes/templates/default.properties..
Formerly named info.delete.submit.
+org.apache.wiki.action.DeleteActionBean.delete=Komplette Seite löschen
+#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=Seite umbenennen
# Outdated or superfluous properties since 3.0.0
# folgende Properties sind in der aktuellen 'default en' Datei nicht enthalten
Modified:
incubator/jspwiki/trunk/src/WebContent/WEB-INF/classes/CoreResources_es.properties
URL:
http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/WebContent/WEB-INF/classes/CoreResources_es.properties?rev=904797&r1=904796&r2=904797&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
Sat Jan 30 15:34:36 2010
@@ -315,8 +315,6 @@
ldap.showConfig=Configurar LDAP..
#Formerly named install.jsp.basics.page.storage.label.. Formerly named
pageDir.. Formerly named properties.jspwiki.jspwiki_fileSystemProvider_pageDir.
properties.priha.priha_provider_defaultProvider_directory=Almacenamiento de
páginas
-#Copied from src/WebContent/WEB-INF/classes/templates/default.properties..
Formerly named info.rename.submit.. Formerly named
org.apache.wiki.action.ViewActionBean.delete.
-org.apache.wiki.action.ViewActionBean.rename=Renombrar página
#Copied from src/WebContent/WEB-INF/classes/templates/default.properties..
Formerly named editor.plain.changenote.. Formerly named changenote.
changeNote=Nota de Cambio
#Copied from src/WebContent/WEB-INF/classes/templates/default.properties..
Formerly named editor.plain.find.submit.
@@ -348,3 +346,7 @@
org.apache.wiki.content.inspect.AsirraCaptcha.description=Creemos que eres o
bien un robot o bien un spammer. ¿Podrías por favor seleccionar los gatitos
del juego de imágenes inferior, de tal modo que sepamos que eres un ser humano
normal?
#Formerly named captcha.asirra.adopt.me.
org.apache.wiki.content.inspect.AsirraCaptcha.adoptMe=Adóptame
+#Copied from src/WebContent/WEB-INF/classes/templates/default.properties..
Formerly named info.delete.submit.
+org.apache.wiki.action.DeleteActionBean.delete=Borrar toda la página
+#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
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=904797&r1=904796&r2=904797&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
Sat Jan 30 15:34:36 2010
@@ -206,8 +206,6 @@
logDirectory=Lokitiedostot
#Formerly named install.jsp.basics.page.storage.label.. Formerly named
pageDir.. Formerly named properties.jspwiki.jspwiki_fileSystemProvider_pageDir.
properties.priha.priha_provider_defaultProvider_directory=Tallennushakemisto
-#Copied from src/WebContent/WEB-INF/classes/templates/default.properties..
Formerly named info.rename.submit.. Formerly named
org.apache.wiki.action.ViewActionBean.delete.
-org.apache.wiki.action.ViewActionBean.rename=Vaihda sivun nimeä
#Copied from src/WebContent/WEB-INF/classes/templates/default.properties..
Formerly named editor.plain.changenote.. Formerly named changenote.
changeNote=Päivitystieto
#Copied from src/WebContent/WEB-INF/classes/templates/default.properties..
Formerly named editor.plain.find.submit.
@@ -239,3 +237,7 @@
org.apache.wiki.content.inspect.AsirraCaptcha.description=Epäilemme sinua
robotiksi tai roskapostittajaksi. Voisitko ystävällisesti poimia kissan kuvat
seuraavista kuvista, jotta tiedämme, että olet hyvä ihminen?
#Captcha.jsp. Formerly named captcha.asirra.adopt.me.
org.apache.wiki.content.inspect.AsirraCaptcha.adoptMe=Adoptoi minut
+#Copied from src/WebContent/WEB-INF/classes/templates/default.properties..
Formerly named info.delete.submit.
+org.apache.wiki.action.DeleteActionBean.delete=Poista koko sivu
+#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=Vaihda sivun nimeä
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=904797&r1=904796&r2=904797&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
Sat Jan 30 15:34:36 2010
@@ -220,8 +220,6 @@
logDirectory=Fichiers de journalisation
#Formerly named install.jsp.basics.page.storage.label.. Formerly named
pageDir.. Formerly named properties.jspwiki.jspwiki_fileSystemProvider_pageDir.
properties.priha.priha_provider_defaultProvider_directory=Stockage des pages
-#Copied from src/WebContent/WEB-INF/classes/templates/default.properties..
Formerly named info.rename.submit.. Formerly named
org.apache.wiki.action.ViewActionBean.delete.
-org.apache.wiki.action.ViewActionBean.rename=Renommer la page
#Copied from src/WebContent/WEB-INF/classes/templates/default.properties..
Formerly named editor.plain.changenote.. Formerly named changenote.
changeNote=Note de changement
#Copied from src/WebContent/WEB-INF/classes/templates/default.properties..
Formerly named editor.plain.find.submit.
@@ -254,3 +252,7 @@
org.apache.wiki.content.inspect.AsirraCaptcha.description=Nous avous de bonnes
raisons de croire que vous soyez un robot ou un spammer. Pourriez-vous
sélectionner les photos de chats parmi celles ci-dessous, pour être sûr que
vous soyez un humain ?
#Formerly named captcha.asirra.adopt.me.
org.apache.wiki.content.inspect.AsirraCaptcha.adoptMe=M'adopter
+#Copied from src/WebContent/WEB-INF/classes/templates/default.properties..
Formerly named info.delete.submit.
+org.apache.wiki.action.DeleteActionBean.delete=Supprimer la page entière
+#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=Renommer la page
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=904797&r1=904796&r2=904797&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
Sat Jan 30 15:34:36 2010
@@ -218,8 +218,6 @@
logDirectory=File di Log
#Formerly named install.jsp.basics.page.storage.label.. Formerly named
pageDir.. Formerly named properties.jspwiki.jspwiki_fileSystemProvider_pageDir.
properties.priha.priha_provider_defaultProvider_directory=Memorizzazione delle
pagine
-#Copied from src/WebContent/WEB-INF/classes/templates/default.properties..
Formerly named info.rename.submit.. Formerly named
org.apache.wiki.action.ViewActionBean.delete.
-org.apache.wiki.action.ViewActionBean.rename=Rinomina la pagina
#Copied from src/WebContent/WEB-INF/classes/templates/default.properties..
Formerly named editor.plain.changenote.. Formerly named changenote.
changeNote=Nota alla revisione
#Copied from src/WebContent/WEB-INF/classes/templates/default.properties..
Formerly named editor.plain.find.submit.
@@ -252,3 +250,7 @@
org.apache.wiki.content.inspect.AsirraCaptcha.description=Occorre che capiamo
se sei uno spammer o un robot o un essere umano. Per favore, seleziona i gatti
nelle immagini, in modo da dimostrarci di essere un umano?
#Formerly named captcha.asirra.adopt.me.
org.apache.wiki.content.inspect.AsirraCaptcha.adoptMe=Adottami
+#Copied from src/WebContent/WEB-INF/classes/templates/default.properties..
Formerly named info.delete.submit.
+org.apache.wiki.action.DeleteActionBean.delete=Elimina l’intera pagina
+#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=Rinomina la pagina
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=904797&r1=904796&r2=904797&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
Sat Jan 30 15:34:36 2010
@@ -275,8 +275,6 @@
ldap.showConfig=Configureer LDAP...
#Formerly named install.jsp.basics.page.storage.label.. Formerly named
pageDir.. Formerly named properties.jspwiki.jspwiki_fileSystemProvider_pageDir.
properties.priha.priha_provider_defaultProvider_directory=Pagina opslag
-#Copied from src/WebContent/WEB-INF/classes/templates/default.properties..
Formerly named info.rename.submit.. Formerly named
org.apache.wiki.action.ViewActionBean.delete.
-org.apache.wiki.action.ViewActionBean.rename=Pagina Hernoemen
#Copied from src/WebContent/WEB-INF/classes/templates/default.properties..
Formerly named editor.plain.changenote.. Formerly named changenote.
changeNote=Opmerking
#Copied from src/WebContent/WEB-INF/classes/templates/default.properties..
Formerly named editor.plain.find.submit.
@@ -308,3 +306,7 @@
org.apache.wiki.content.inspect.AsirraCaptcha.description=We denken dat je een
robot of een spammer bent. Kun je hieronder de katten selecteren, zodat we
zeker weten dat je een mens bent ?
#Formerly named captcha.asirra.adopt.me.
org.apache.wiki.content.inspect.AsirraCaptcha.adoptMe=Adopteer me
+#Copied from src/WebContent/WEB-INF/classes/templates/default.properties..
Formerly named info.delete.submit.
+org.apache.wiki.action.DeleteActionBean.delete=Pagina Verwijderen
+#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=Pagina Hernoemen
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=904797&r1=904796&r2=904797&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
Sat Jan 30 15:34:36 2010
@@ -193,3 +193,5 @@
org.apache.wiki.content.inspect.AsirraCaptcha.description=Nós acreditamos que
você possa vir a ser um robô ou um spammer. Você pode por favor escolher os
gatinhos do conjunto abaixo de imagens, para que nós saibamos que você é um ser
humano?
#Formerly named captcha.asirra.adopt.me.
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
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=904797&r1=904796&r2=904797&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
Sat Jan 30 15:34:36 2010
@@ -224,8 +224,6 @@
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
-#Copied from src/WebContent/WEB-INF/classes/templates/default.properties..
Formerly named info.rename.submit.. Formerly named
org.apache.wiki.action.ViewActionBean.delete.
-org.apache.wiki.action.ViewActionBean.rename=\u041f\u0435\u0440\u0435\u0438\u043c\u0435\u043d\u043e\u0432\u0430\u0442\u044c
\u0441\u0442\u0440\u0430\u043d\u0438\u0446\u0443
#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
#Copied from src/WebContent/WEB-INF/classes/templates/default.properties..
Formerly named editor.plain.find.submit.
@@ -257,3 +255,7 @@
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
+#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
+#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
Modified:
incubator/jspwiki/trunk/src/WebContent/WEB-INF/classes/CoreResources_zh_CN.properties
URL:
http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/WebContent/WEB-INF/classes/CoreResources_zh_CN.properties?rev=904797&r1=904796&r2=904797&view=diff
==============================================================================
---
incubator/jspwiki/trunk/src/WebContent/WEB-INF/classes/CoreResources_zh_CN.properties
(original)
+++
incubator/jspwiki/trunk/src/WebContent/WEB-INF/classes/CoreResources_zh_CN.properties
Sat Jan 30 15:34:36 2010
@@ -311,8 +311,6 @@
logDirectory=\u65e5\u5fd7\u6587\u4ef6
#Formerly named install.jsp.basics.page.storage.label.. Formerly named
pageDir.. Formerly named properties.jspwiki.jspwiki_fileSystemProvider_pageDir.
properties.priha.priha_provider_defaultProvider_directory=\u9875\u9762\u5b58\u50a8
-#Copied from src/WebContent/WEB-INF/classes/templates/default.properties..
Formerly named info.rename.submit.. Formerly named
org.apache.wiki.action.ViewActionBean.delete.
-org.apache.wiki.action.ViewActionBean.rename=\u91cd\u547d\u540d\u9875\u9762
#Copied from src/WebContent/WEB-INF/classes/templates/default.properties..
Formerly named editor.plain.changenote.. Formerly named changenote.
changeNote=\u66f4\u6539\u6ce8\u91ca
#Copied from src/WebContent/WEB-INF/classes/templates/default.properties..
Formerly named editor.plain.find.submit.
@@ -345,3 +343,7 @@
org.apache.wiki.content.inspect.AsirraCaptcha.description=\u6211\u4eec\u76f8\u4fe1\u60a8\u53ef\u80fd\u662f\u4e00\u4e2a\u673a\u5668\u4eba\u7a0b\u5e8f\u6216\u8005\u5783\u573e\u90ae\u4ef6\u6563\u64ad\u8005\u3002\u8bf7\u4ece\u4e0b\u9762\u7684\u4e00\u7ec4\u56fe\u4e2d\u8df3\u51fa\u5c0f\u732b\uff08kittens\uff09\uff0c\u8fd9\u6837\u6211\u4eec\u53ef\u4ee5\u77e5\u9053\u60a8\u662f\u6b63\u5e38\u7684\u4eba\u7c7b\uff1f
#Formerly named captcha.asirra.adopt.me.
org.apache.wiki.content.inspect.AsirraCaptcha.adoptMe=\u6536\u517b\u6211
+#Copied from src/WebContent/WEB-INF/classes/templates/default.properties..
Formerly named info.delete.submit.
+org.apache.wiki.action.DeleteActionBean.delete=\u5220\u9664\u6574\u4e2a\u9875\u9762
+#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=\u91cd\u547d\u540d\u9875\u9762
Modified:
incubator/jspwiki/trunk/src/WebContent/WEB-INF/classes/templates/default.properties
URL:
http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/WebContent/WEB-INF/classes/templates/default.properties?rev=904797&r1=904796&r2=904797&view=diff
==============================================================================
---
incubator/jspwiki/trunk/src/WebContent/WEB-INF/classes/templates/default.properties
(original)
+++
incubator/jspwiki/trunk/src/WebContent/WEB-INF/classes/templates/default.properties
Sat Jan 30 15:34:36 2010
@@ -128,8 +128,8 @@
group.modifier={0} saved this group on {1}
group.creator={0} created it on {1}.
# GroupTab.jsp
-grp.createdon=Created on {0} by {1}
-grp.lastmodified=Last modified on {0} by {1}
+grp.createdon={1} created this group on {0}.
+grp.lastmodified={1} changed this group on {0}.
grp.groupnames.title=Click to edit this group
grp.newgroupname=(new group name)
grp.savenewgroup=Save new group
@@ -144,24 +144,23 @@
# InfoContent.jsp
info.pagename=Page name
info.parent=Parent page
-info.lastmodified=This page (revision-{0}) was last changed on {1} by {2}
-info.createdon=This page was created on {0} by {1}
+info.lastmodified={2} changed this page on {1}. This is version {0}.
+info.createdon={1} created this page on {0}.
info.current=Current page version
info.noversions=This page has only one version
info.feed=Page feed
info.pagediff.title=Show changes of last page update
info.updatereferrers=Update referrers?
info.rename.permission=Only authorized users are allowed to rename pages.
-info.delete.submit=Delete entire page
#info.delete.attachmentwarning=<i>First delete all attachments of this page</i>
info.confirmdelete=Please confirm that you want to delete this content
permanently!
info.delete.permission=Only authorized users are allowed to delete pages.
info.moreinfo=More Info...
info.backtomainpage=Back to {0}
info.backtoparentpage=Back to {0} (parent page)
-info.history=Page revision history
-info.showrevisions=Show all revisions from {0} down to {1}
-info.showfrom=Show {0} revisions from {1} to {2}
+info.history=Page version history
+info.showrevisions=Show all versions from {0} down to {1}
+info.showfrom=Show {0} versions from {1} to {2}
info.pagination=Pagination:
info.pagination.first=<span class="first">First</span>
info.pagination.last=<span class="last">Last</span>
@@ -193,7 +192,7 @@
info.uploadnew.help=In order to upload a new attachment to this page, please
use the following box to find the file, then click on “Upload”.
info.uploadnew.nopermission=Only authorized users are allowed to upload new
attachment versions.
info.deleteattachment=Delete attachment
-info.attachment.history=Attachment revision history
+info.attachment.history=Attachment version history
info.attachment.type=Kind
info.attachment.name=Attachment Name
info.kilobytes=kB
@@ -534,3 +533,6 @@
members.description=The membership for this group. Enter each user’s
name or wiki name, separated by carriage returns.
install.approver.saveWikiPage.description=Name of the role or wiki group that
can approve page changes. If users can change pages themselves without
approval, leave this blank. Specify the role "SU" if you want the superuser to
approve all page changes.
install.approver.createUserProfile.description=Name of the role or wiki group
that can approve new wiki profiles. If users can self-enroll without approval,
leave this blank. Specify the role "SU" if you want the superuser to approve
all new accounts.
+attachments.zero=Attachments
+attachments.one=Attachments ({0})
+attachments.many=Attachments ({0})
Modified:
incubator/jspwiki/trunk/src/WebContent/WEB-INF/classes/templates/default_de.properties
URL:
http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/WebContent/WEB-INF/classes/templates/default_de.properties?rev=904797&r1=904796&r2=904797&view=diff
==============================================================================
---
incubator/jspwiki/trunk/src/WebContent/WEB-INF/classes/templates/default_de.properties
(original)
+++
incubator/jspwiki/trunk/src/WebContent/WEB-INF/classes/templates/default_de.properties
Sat Jan 30 15:34:36 2010
@@ -170,7 +170,6 @@
info.pagediff.title=Zeige die Änderungen der letzten Aktualisierung an
info.updatereferrers=referenzierende Seiten aktualisieren
info.rename.permission=Du bist nicht autorisiert, diese Seite umzubenennen.
-info.delete.submit=Komplette Seite löschen
info.confirmdelete=Soll dieser Inhalt wirklich dauerhaft gelöscht werden?
info.delete.permission=Du bist nicht autorisiert, diese Seite zu löschen.
info.moreinfo=Weitere Informationen...
Modified:
incubator/jspwiki/trunk/src/WebContent/WEB-INF/classes/templates/default_es.properties
URL:
http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/WebContent/WEB-INF/classes/templates/default_es.properties?rev=904797&r1=904796&r2=904797&view=diff
==============================================================================
---
incubator/jspwiki/trunk/src/WebContent/WEB-INF/classes/templates/default_es.properties
(original)
+++
incubator/jspwiki/trunk/src/WebContent/WEB-INF/classes/templates/default_es.properties
Sat Jan 30 15:34:36 2010
@@ -150,7 +150,6 @@
info.pagediff.title=Mostrar cambios de la última actualización de la página
info.updatereferrers=¿Actualizar referencias a esta página?
info.rename.permission=Solo pueden renombrar páginas los usuarios autorizados.
-info.delete.submit=Borrar toda la página
#info.delete.attachmentwarning=<i>Tienes que borrar primero los adjuntos
asociados a la página</i>
info.confirmdelete=¡Por favor, confirma que quieres borrar el contenido
permanentemente!
info.delete.permission=Solo pueden borrar páginas los usuarios autorizados.
Modified:
incubator/jspwiki/trunk/src/WebContent/WEB-INF/classes/templates/default_fi.properties
URL:
http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/WebContent/WEB-INF/classes/templates/default_fi.properties?rev=904797&r1=904796&r2=904797&view=diff
==============================================================================
---
incubator/jspwiki/trunk/src/WebContent/WEB-INF/classes/templates/default_fi.properties
(original)
+++
incubator/jspwiki/trunk/src/WebContent/WEB-INF/classes/templates/default_fi.properties
Sat Jan 30 15:34:36 2010
@@ -146,7 +146,6 @@
info.pagediff.title=Näytä viimeisin muutos, mikä tälle sivulle on tehty
info.updatereferrers=Päivitä myös viittaukset?
info.rename.permission=Vain luvan saaneet käyttäjät voivat vaihtaa sivun nimeä.
-info.delete.submit=Poista koko sivu
info.confirmdelete=Oletko varma, että haluat poistaa sivun pysyvästi?
info.delete.permission=Vain luvan saaneet käyttäjät voivat poistaa sivuja.
info.moreinfo=Lisätietoja...
Modified:
incubator/jspwiki/trunk/src/WebContent/WEB-INF/classes/templates/default_fr.properties
URL:
http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/WebContent/WEB-INF/classes/templates/default_fr.properties?rev=904797&r1=904796&r2=904797&view=diff
==============================================================================
---
incubator/jspwiki/trunk/src/WebContent/WEB-INF/classes/templates/default_fr.properties
(original)
+++
incubator/jspwiki/trunk/src/WebContent/WEB-INF/classes/templates/default_fr.properties
Sat Jan 30 15:34:36 2010
@@ -156,7 +156,6 @@
info.pagediff.title=Montrer les modifications de la dernière mise à jour de la
page
info.updatereferrers=Mettre à jour les références ?
info.rename.permission=Seuls les utilisateurs autorisés ont le droit de
renommer des pages.
-info.delete.submit=Supprimer la page entière
#info.delete.attachmentwarning=<i>Supprimez d\u0027abord tous les attachements
de cette page</i>
info.confirmdelete=Veuillez confirmer que vous voulez supprimer ce contenu de
manière permanente !
info.delete.permission=Seuls les utilisateurs authentifiés ont le droit de
supprimer des pages.
Modified:
incubator/jspwiki/trunk/src/WebContent/WEB-INF/classes/templates/default_it.properties
URL:
http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/WebContent/WEB-INF/classes/templates/default_it.properties?rev=904797&r1=904796&r2=904797&view=diff
==============================================================================
---
incubator/jspwiki/trunk/src/WebContent/WEB-INF/classes/templates/default_it.properties
(original)
+++
incubator/jspwiki/trunk/src/WebContent/WEB-INF/classes/templates/default_it.properties
Sat Jan 30 15:34:36 2010
@@ -152,7 +152,6 @@
info.pagediff.title=Mostra le modifiche dell’ ultimo aggiornamento
info.updatereferrers=Aggiorna i riferimenti?
info.rename.permission=Solo gli utenti autorizzati possono rinominare una
pagina.
-info.delete.submit=Elimina l’intera pagina
#info.delete.attachmentwarning=<i>Cancella prima tutti gli allegati di questa
pagina</i>
info.confirmdelete=Per favore, conferma che vuoi eliminare questi contenuti
permanentemente!
info.delete.permission=Solo gli utenti autorizzati possono eliminare una
pagina.
Modified:
incubator/jspwiki/trunk/src/WebContent/WEB-INF/classes/templates/default_nl.properties
URL:
http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/WebContent/WEB-INF/classes/templates/default_nl.properties?rev=904797&r1=904796&r2=904797&view=diff
==============================================================================
---
incubator/jspwiki/trunk/src/WebContent/WEB-INF/classes/templates/default_nl.properties
(original)
+++
incubator/jspwiki/trunk/src/WebContent/WEB-INF/classes/templates/default_nl.properties
Sat Jan 30 15:34:36 2010
@@ -151,7 +151,6 @@
info.pagediff.title=Toon de laatste wijziging van de pagina
info.updatereferrers=Gelinkte pagina's aanpassen?
info.rename.permission=Enkel geautoriseerde gebruikers kunnen de naam van wiki
pagina's wijzigen.
-info.delete.submit=Pagina Verwijderen
#info.delete.attachmentwarning=<i>Let op. Verwijder eerst alle bijlagen</i>
info.confirmdelete=Weet U zeker dat U deze pagina definitief wilt verwijderen?
info.delete.permission=Enkel geautoriseerde gebruikers kunnen wiki pagina's
verwijderen.
Modified:
incubator/jspwiki/trunk/src/WebContent/WEB-INF/classes/templates/default_pt_BR.properties
URL:
http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/WebContent/WEB-INF/classes/templates/default_pt_BR.properties?rev=904797&r1=904796&r2=904797&view=diff
==============================================================================
---
incubator/jspwiki/trunk/src/WebContent/WEB-INF/classes/templates/default_pt_BR.properties
(original)
+++
incubator/jspwiki/trunk/src/WebContent/WEB-INF/classes/templates/default_pt_BR.properties
Sat Jan 30 15:34:36 2010
@@ -159,7 +159,6 @@
info.rename.submit=Rename page
info.updatereferrers=Update referrers?
info.rename.permission=Only authorized users are allowed to rename pages.
-info.delete.submit=Delete entire page
#info.delete.attachmentwarning=<i>First delete all attachments of this page</i>
info.confirmdelete=Please confirm that you want to delete this content
permanently!
info.delete.permission=Only authorized users are allowed to delete pages.
Modified:
incubator/jspwiki/trunk/src/WebContent/WEB-INF/classes/templates/default_ru.properties
URL:
http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/WebContent/WEB-INF/classes/templates/default_ru.properties?rev=904797&r1=904796&r2=904797&view=diff
==============================================================================
---
incubator/jspwiki/trunk/src/WebContent/WEB-INF/classes/templates/default_ru.properties
(original)
+++
incubator/jspwiki/trunk/src/WebContent/WEB-INF/classes/templates/default_ru.properties
Sat Jan 30 15:34:36 2010
@@ -152,7 +152,6 @@
info.pagediff.title=\u041f\u043e\u043a\u0430\u0437\u0430\u0442\u044c
\u0438\u0437\u043c\u0435\u043d\u0435\u043d\u0438\u044f
\u043f\u043e\u0441\u043b\u0435\u0434\u043d\u0435\u0433\u043e
\u0440\u0435\u0434\u0430\u043a\u0442\u0438\u0440\u043e\u0432\u0430\u043d\u0438\u044f
info.updatereferrers=\u041e\u0431\u043d\u043e\u0432\u0438\u0442\u044c
\u0440\u0435\u0444\u0435\u0440\u0430\u043b\u043e\u0432?
info.rename.permission=\u0422\u043e\u043b\u044c\u043a\u043e
\u0430\u0432\u0442\u043e\u0440\u0438\u0437\u0438\u0440\u043e\u0432\u0430\u043d\u044b\u0435
\u043f\u043e\u043b\u044c\u0437\u043e\u0432\u0430\u0442\u0435\u043b\u0438
\u043c\u043e\u0433\u0443\u0442
\u043f\u0435\u0440\u0435\u0438\u043c\u0435\u043d\u043e\u0432\u044b\u0432\u0430\u0442\u044c
\u0441\u0442\u0440\u0430\u043d\u0438\u0446\u044b.
-info.delete.submit=\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
#info.delete.attachmentwarning=<i>First delete all attachments of this page</i>
info.confirmdelete=\u041f\u043e\u0436\u0430\u043b\u0443\u0439\u0441\u0442\u0430,
\u043f\u043e\u0434\u0442\u0432\u0435\u0440\u0434\u0438\u0442\u0435
\u0436\u0435\u043b\u0430\u043d\u0438\u0435
\u0443\u0434\u0430\u043b\u0438\u0442\u044c \u044d\u0442\u043e\u0442
\u043a\u043e\u043d\u0442\u0435\u043d\u0442!
info.delete.permission=\u0422\u043e\u043b\u044c\u043a\u043e
\u0430\u0432\u0442\u043e\u0440\u0438\u0437\u0438\u0440\u043e\u0432\u0430\u043d\u044b\u0435
\u043f\u043e\u043b\u044c\u0437\u043e\u0432\u0430\u0442\u0435\u043b\u0438
\u043c\u043e\u0433\u0443\u0442 \u0443\u0434\u0430\u043b\u044f\u0442\u044c
\u0441\u0442\u0440\u0430\u043d\u0438\u0446\u044b.
Modified:
incubator/jspwiki/trunk/src/WebContent/WEB-INF/classes/templates/default_zh_CN.properties
URL:
http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/WebContent/WEB-INF/classes/templates/default_zh_CN.properties?rev=904797&r1=904796&r2=904797&view=diff
==============================================================================
---
incubator/jspwiki/trunk/src/WebContent/WEB-INF/classes/templates/default_zh_CN.properties
(original)
+++
incubator/jspwiki/trunk/src/WebContent/WEB-INF/classes/templates/default_zh_CN.properties
Sat Jan 30 15:34:36 2010
@@ -152,7 +152,6 @@
info.pagediff.title=\u663e\u793a\u4e0a\u4e00\u6b21\u9875\u9762\u66f4\u65b0\u6240\u505a\u7684\u66f4\u6539
info.updatereferrers=\u662f\u5426\u66f4\u65b0\u5f15\u7528\uff1f
info.rename.permission=\u53ea\u6709\u6388\u6743\u7684\u7528\u6237\u624d\u80fd\u91cd\u547d\u540d\u9875\u9762\u3002
-info.delete.submit=\u5220\u9664\u6574\u4e2a\u9875\u9762
#info.delete.attachmentwarning=<i>First delete all attachments of this page</i>
info.confirmdelete=\u8bf7\u786e\u8ba4\u662f\u5426\u8981\u6c38\u4e45\u5220\u9664\u6b64\u5185\u5bb9\uff01
info.delete.permission=\u53ea\u6709\u6388\u6743\u7684\u7528\u6237\u624d\u80fd\u5220\u9664\u9875\u9762\u3002
