You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jspwiki.apache.org by aj...@apache.org on 2009/11/25 12:08:25 UTC
svn commit: r884038 - /incubator/jspwiki/trunk/src/WebContent/WEB-INF/classes/templates/

Author: ajaquith
Date: Wed Nov 25 11:08:24 2009
New Revision: 884038

URL: http://svn.apache.org/viewvc?rev=884038&view=rev
Log:
Trimmed unneeded entries.

Modified:
    incubator/jspwiki/trunk/src/WebContent/WEB-INF/classes/templates/default.properties
    incubator/jspwiki/trunk/src/WebContent/WEB-INF/classes/templates/default_es.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/templates/default.properties
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/WebContent/WEB-INF/classes/templates/default.properties?rev=884038&r1=884037&r2=884038&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 Wed Nov 25 11:08:24 2009
@@ -292,7 +292,6 @@
 prefs.tab.prefs=Preferences
 prefs.tab.profile=Profile
 prefs.cookies=Your choices will be saved in your browser as cookies.
-#prefs.user.editorareaheight=Editor area height  //not user anymore
 prefs.user.sectionediting.text=Enable section editing via <span class="editsection"><a href="#">[edit]</a></span> links
 prefs.user.timezone.server=[SERVER]
 prefs.user.language.default=[DEFAULT]
@@ -540,4 +539,5 @@
 install.ldap=LDAP Configuration
 install.success=Congratulations
 install.success.description=You have successfully installed JSPWiki. Nice work!
-install.success.clickhere=Click here to continue...
\ No newline at end of file
+install.success.clickhere=Click here to continue...
+overrideConflict=Override the other person&#8217;s changes
\ No newline at end of file

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=884038&r1=884037&r2=884038&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 Wed Nov 25 11:08:24 2009
@@ -290,7 +290,6 @@
 prefs.tab.prefs=Preferencias
 prefs.tab.profile=Perfil
 prefs.cookies=Tus elecciones se guardarán en el navegador como cookies.
-#prefs.user.editorareaheight=Altura del área del Editor
 prefs.user.sectionediting.text=Activar la edición de secciones vía enlaces <span class="editsection"><a href="#">[editar]</a></span>
 prefs.user.timezone.server=[SERVIDOR]
 prefs.user.language.default=[POR DEFECTO]

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=884038&r1=884037&r2=884038&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 Wed Nov 25 11:08:24 2009
@@ -294,7 +294,6 @@
 prefs.tab.prefs=Préférences
 prefs.tab.profile=Profil
 prefs.cookies=Vos choix seront enregistrés dans les cookies de votre navigateur.
-#prefs.user.editorareaheight=Hauteur de la zone d\u0027\u00E9dition //desormais inutilise
 prefs.user.sectionediting.text=Autoriser l'édition de sections via des liens <span class="editsection"><a href="#">[Editer]</a></span>
 prefs.user.timezone.server=[SERVEUR]
 prefs.user.language.default=[DEFAUT]

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=884038&r1=884037&r2=884038&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 Wed Nov 25 11:08:24 2009
@@ -290,7 +290,6 @@
 prefs.tab.prefs=Preferenze
 prefs.tab.profile=Profilo
 prefs.cookies=Le tue preferenze sono salvate nel browser via cookie.
-#prefs.user.editorareaheight=Altezza dell&#8217;aerea di editing
 prefs.user.timezone.server=[SERVER]
 prefs.user.language.default=[DEFAULT]
 prefs.instructions=Inserisci qui le tue preferenze. Le tue preferenze sono salvate nel browser via cookie.

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=884038&r1=884037&r2=884038&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 Wed Nov 25 11:08:24 2009
@@ -289,7 +289,6 @@
 prefs.tab.prefs=Voorkeuren
 prefs.tab.profile=Profiel
 prefs.cookies=Uw voorkeuren worden bewaard in de cookies van de browser
-#prefs.user.editorareaheight=Wijzig Editor hoogte
 prefs.user.sectionediting.text=Activeer sectie editing d.m.v. de <span class="editsection"><a href="#">[edit]</a></span> links
 prefs.user.timezone.server=[SERVER]
 prefs.user.language.default=[DEFAULT]

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=884038&r1=884037&r2=884038&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 Wed Nov 25 11:08:24 2009
@@ -309,7 +309,6 @@
 prefs.user.orientation=Favorites style
 prefs.user.orientation.left=Left
 prefs.user.orientation.right=Right
-#prefs.user.editorareaheight=Editor area height  //not user anymore
 prefs.user.sectionediting=Section Editing
 prefs.user.sectionediting.text=Enable section editing via <span class="editsection"><a href="#">[edit]</a></span> links
 prefs.user.timeformat=Time Format

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=884038&r1=884037&r2=884038&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 Wed Nov 25 11:08:24 2009
@@ -290,7 +290,6 @@
 prefs.tab.prefs=\u041d\u0430\u0441\u0442\u0440\u043e\u0439\u043a\u0438
 prefs.tab.profile=\u041f\u0440\u043e\u0444\u0438\u043b\u044c
 prefs.cookies=\u0412\u0430\u0448\u0438 \u043d\u0430\u0441\u0442\u0440\u043e\u0439\u043a\u0438 \u0431\u0443\u0434\u0443\u0442\u044c \u0441\u043e\u0445\u0440\u0430\u043d\u0435\u043d\u044b \u0431\u0440\u0430\u0443\u0437\u0435\u0440\u043e\u043c \u043a\u0430\u043a \u043a\u0443\u043a\u0438.
-#prefs.user.editorareaheight=Editor area height  //not user anymore
 prefs.user.sectionediting.text=\u0412\u043a\u043b\u044e\u0447\u0438\u0442\u044c \u0441\u0435\u043a\u0446\u0438\u044e \u0440\u0435\u0434\u0430\u043a\u0442\u0438\u0440\u043e\u0432\u0430\u043d\u0438\u044f \u0447\u0435\u0440\u0435\u0437  
 <span=class="editsection"><a href="#">[e]</a></span> \u0441\u0441\u044b\u043b\u043e\u043a
 prefs.user.timezone.server=[\u0441\u0435\u0440\u0432\u0435\u0440]

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=884038&r1=884037&r2=884038&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 Wed Nov 25 11:08:24 2009
@@ -292,7 +292,6 @@
 prefs.tab.prefs=\u9996\u9009\u9879
 prefs.tab.profile=\u6982\u8981\u4fe1\u606f
 prefs.cookies=\u60a8\u7684\u9009\u62e9\u5c06\u4fdd\u5b58\u4e3a\u6d4f\u89c8\u5668\u4e2d\u7684 cookie\u3002
-#prefs.user.editorareaheight=Editor area height  //not user anymore
 prefs.user.sectionediting.text=\u901a\u8fc7<span class="editsection"><a href="#">[\u7f16\u8f91]</a></span>\u94fe\u63a5\u542f\u7528\u6bb5\u843d\u7f16\u8f91
 prefs.user.timezone.server=[\u670d\u52a1\u5668]
 prefs.user.language.default=[\u7f3a\u7701\u503c]