You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jspwiki.apache.org by me...@apache.org on 2013/06/06 21:06:20 UTC
svn commit: r1490397 - in /incubator/jspwiki/trunk: ./ jspwiki-war/src/main/java/org/apache/wiki/ jspwiki-war/src/main/resources/templates/

Author: metskem
Date: Thu Jun  6 19:06:19 2013
New Revision: 1490397

URL: http://svn.apache.org/r1490397
Log:
2013-06-06  Harry Metske (metskem@apache.org)

       * 2.10.0-svn-7

       * removed duplicate keys from translation files.

Modified:
    incubator/jspwiki/trunk/ChangeLog
    incubator/jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/Release.java
    incubator/jspwiki/trunk/jspwiki-war/src/main/resources/templates/default_de.properties
    incubator/jspwiki/trunk/jspwiki-war/src/main/resources/templates/default_fi.properties
    incubator/jspwiki/trunk/jspwiki-war/src/main/resources/templates/default_fr.properties
    incubator/jspwiki/trunk/jspwiki-war/src/main/resources/templates/default_it.properties
    incubator/jspwiki/trunk/jspwiki-war/src/main/resources/templates/default_nl.properties
    incubator/jspwiki/trunk/jspwiki-war/src/main/resources/templates/default_pt_BR.properties
    incubator/jspwiki/trunk/jspwiki-war/src/main/resources/templates/default_ru.properties
    incubator/jspwiki/trunk/jspwiki-war/src/main/resources/templates/default_zh_CN.properties

Modified: incubator/jspwiki/trunk/ChangeLog
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/ChangeLog?rev=1490397&r1=1490396&r2=1490397&view=diff
==============================================================================
--- incubator/jspwiki/trunk/ChangeLog (original)
+++ incubator/jspwiki/trunk/ChangeLog Thu Jun  6 19:06:19 2013
@@ -1,3 +1,9 @@
+2013-06-06  Harry Metske (metskem@apache.org)
+
+       * 2.10.0-svn-7
+
+       * removed duplicate keys from translation files.
+
 2013-06-05  Harry Metske (metskem@apache.org)
 
        * 2.10.0-svn-5

Modified: incubator/jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/Release.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/Release.java?rev=1490397&r1=1490396&r2=1490397&view=diff
==============================================================================
--- incubator/jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/Release.java (original)
+++ incubator/jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/Release.java Thu Jun  6 19:06:19 2013
@@ -75,7 +75,7 @@ public final class Release
      *  <p>
      *  If the build identifier is empty, it is not added.
      */
-    public static final String     BUILD         = "6";
+    public static final String     BUILD         = "7";
     
     /**
      *  This is the generic version string you should use

Modified: incubator/jspwiki/trunk/jspwiki-war/src/main/resources/templates/default_de.properties
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/jspwiki-war/src/main/resources/templates/default_de.properties?rev=1490397&r1=1490396&r2=1490397&view=diff
==============================================================================
--- incubator/jspwiki/trunk/jspwiki-war/src/main/resources/templates/default_de.properties (original)
+++ incubator/jspwiki/trunk/jspwiki-war/src/main/resources/templates/default_de.properties Thu Jun  6 19:06:19 2013
@@ -202,7 +202,6 @@ info.parent=Ursprungsseite
 info.lastmodified=Diese Seite (Version-{0}) wurde zuletzt am {1} von {2} geändert.
 info.createdon=Diese Seite wurde am {0} von {1} erstellt.
 info.current=Aktuelle Version der Seite
-info.noversions=Keine Versionen vorhanden.
 info.feed=Seiten-Feed
 
 info.pagediff.title=Zeige die Änderungen der letzten Aktualisierung an
@@ -410,7 +409,6 @@ prefs.assertedname.description=Dies ist 
 prefs.assertedname.create=Neues Benutzerprofil erstellen
 prefs.submit.setname=Benutzernamen setzen
 prefs.save.prefs.submit=Benutzereinstellungen speichern
-prefs.save.submit=Benutzereinstellungen speichern
 prefs.clear.submit=Benutzereinstellungen zurücksetzen
 prefs.clear.description=Falls du den Benutzernamen und deine Einstellungen von diesem Rechner löschen willst, \
 	klicke auf 'Benutzereinstellungen zurücksetzen'!<br /> \

Modified: incubator/jspwiki/trunk/jspwiki-war/src/main/resources/templates/default_fi.properties
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/jspwiki-war/src/main/resources/templates/default_fi.properties?rev=1490397&r1=1490396&r2=1490397&view=diff
==============================================================================
--- incubator/jspwiki/trunk/jspwiki-war/src/main/resources/templates/default_fi.properties (original)
+++ incubator/jspwiki/trunk/jspwiki-war/src/main/resources/templates/default_fi.properties Thu Jun  6 19:06:19 2013
@@ -179,7 +179,6 @@ info.parent=Yläsivu
 info.lastmodified=Tätä sivua (versio-{0}) muokkasi viimeksi {2}, {1}
 info.createdon=Tämä sivun loi {1}, {0}
 info.current=Viimeisin versio
-info.noversions=Ei versioita
 info.feed=RSS-syöte
 
 info.pagediff.title=Näytä viimeisin muutos, mikä tälle sivulle on tehty

Modified: incubator/jspwiki/trunk/jspwiki-war/src/main/resources/templates/default_fr.properties
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/jspwiki-war/src/main/resources/templates/default_fr.properties?rev=1490397&r1=1490396&r2=1490397&view=diff
==============================================================================
--- incubator/jspwiki/trunk/jspwiki-war/src/main/resources/templates/default_fr.properties (original)
+++ incubator/jspwiki/trunk/jspwiki-war/src/main/resources/templates/default_fr.properties Thu Jun  6 19:06:19 2013
@@ -193,7 +193,6 @@ info.parent=Page parente
 info.lastmodified=Cette page (r\u00E9vision-{0}) a \u00E9t\u00E9 modifi\u00E9e pour la derni\u00E8re fois le {1} par {2}
 info.createdon=Cette page a \u00E9t\u00E9 cr\u00E9\u00E9e le {0} par {1}
 info.current=Version actuelle de la page 
-info.noversions=Aucune version.
 info.feed=Source RSS de la page
 
 info.pagediff.title=Montrer les modifications de la derni\u00E8re mise \u00E0 jour de la page

Modified: incubator/jspwiki/trunk/jspwiki-war/src/main/resources/templates/default_it.properties
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/jspwiki-war/src/main/resources/templates/default_it.properties?rev=1490397&r1=1490396&r2=1490397&view=diff
==============================================================================
--- incubator/jspwiki/trunk/jspwiki-war/src/main/resources/templates/default_it.properties (original)
+++ incubator/jspwiki/trunk/jspwiki-war/src/main/resources/templates/default_it.properties Thu Jun  6 19:06:19 2013
@@ -188,7 +188,6 @@ info.parent=Pagina superiore
 info.lastmodified=Questa pagina (revision-{0}) &egrave; stata cambiata il {1} da {2}
 info.createdon=Questa pagina &egrave; stata creata il {0} da {1}
 info.current=Versione della pagina corrente
-info.noversions=Nessuna versione.
 info.feed=Feed RSS della pagina
 
 info.pagediff.title=Mostra le modifiche dell&#8217; ultimo aggiornamento
@@ -635,7 +634,6 @@ javascript.favs.show=Click per vedere i 
 javascript.favs.hide=Click per nascondere i Favorites
 javascript.quick.edit=Modifica questa sezione
 
-javascript.quick.edit=[Modifica]
 javascript.quick.edit.title=Modifica la sezione {0}...
 
 javascript.collapse=Click per chiudere

Modified: incubator/jspwiki/trunk/jspwiki-war/src/main/resources/templates/default_nl.properties
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/jspwiki-war/src/main/resources/templates/default_nl.properties?rev=1490397&r1=1490396&r2=1490397&view=diff
==============================================================================
--- incubator/jspwiki/trunk/jspwiki-war/src/main/resources/templates/default_nl.properties (original)
+++ incubator/jspwiki/trunk/jspwiki-war/src/main/resources/templates/default_nl.properties Thu Jun  6 19:06:19 2013
@@ -190,7 +190,6 @@ info.parent=Hoofd-pagina
 info.lastmodified=Deze pagina (versie-{0}) werd voor het laatst gewijzigd op {1} door {2}
 info.createdon=Deze pagina werd aangemaakt op {0} door {1}
 info.current=Huidige versie van deze pagina
-info.noversions=Geen versies.
 info.feed=Pagina RSS feed
 
 info.pagediff.title=Toon de laatste wijziging van de pagina

Modified: incubator/jspwiki/trunk/jspwiki-war/src/main/resources/templates/default_pt_BR.properties
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/jspwiki-war/src/main/resources/templates/default_pt_BR.properties?rev=1490397&r1=1490396&r2=1490397&view=diff
==============================================================================
--- incubator/jspwiki/trunk/jspwiki-war/src/main/resources/templates/default_pt_BR.properties (original)
+++ incubator/jspwiki/trunk/jspwiki-war/src/main/resources/templates/default_pt_BR.properties Thu Jun  6 19:06:19 2013
@@ -205,7 +205,6 @@ info.backtomainpage=Back to {0}
 info.backtoparentpage=Back to {0} (parent page)
 
 info.history=Page revision history
-info.noversions=This page has only one version
 info.showrevisions=Show all revisions from {0} down to {1}
 info.showfrom=Show {0} revisions from {1} to {2}
 

Modified: incubator/jspwiki/trunk/jspwiki-war/src/main/resources/templates/default_ru.properties
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/jspwiki-war/src/main/resources/templates/default_ru.properties?rev=1490397&r1=1490396&r2=1490397&view=diff
==============================================================================
--- incubator/jspwiki/trunk/jspwiki-war/src/main/resources/templates/default_ru.properties (original)
+++ incubator/jspwiki/trunk/jspwiki-war/src/main/resources/templates/default_ru.properties Thu Jun  6 19:06:19 2013
@@ -184,7 +184,6 @@ info.parent=\u0420\u043e\u0434\u0438\u04
 info.lastmodified=\u041f\u043e\u0441\u043b\u0435\u0434\u043d\u0438\u0439 \u0440\u0430\u0437 \u044d\u0442\u0430 \u0441\u0442\u0440\u0430\u043d\u0438\u0446\u0430 (\u0432\u0435\u0440\u0441\u0438\u044f-{0}) \u0431\u044b\u043b\u0430 \u0438\u0437\u043c\u0435\u043d\u0435\u043d\u0430 {1} \u043f\u043e\u043b\u044c\u0437\u043e\u0432\u0430\u0442\u0435\u043b\u0435\u043c {2}
 info.createdon=\u042d\u0442\u0430 \u0441\u0442\u0440\u0430\u043d\u0438\u0446\u0430 \u0431\u044b\u043b\u0430 \u0441\u043e\u0437\u0434\u0430\u043d\u0430 {0} \u043f\u043e\u043b\u044c\u0437\u043e\u0432\u0430\u0442\u0435\u043b\u0435\u043c {1}
 info.current=\u041f\u043e\u0442\u043e\u0447\u043d\u0430\u044f \u0432\u0435\u0440\u0441\u0438\u044f \u0441\u0442\u0440\u0430\u043d\u0438\u0446\u044b
-info.noversions=\u041d\u0435\u0442 \u0432\u0435\u0440\u0441\u0438\u0439.
 info.feed=\u041f\u043e\u0442\u043e\u043a \u0441\u0442\u0440\u0430\u043d\u0438\u0446\u044b
 
 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

Modified: incubator/jspwiki/trunk/jspwiki-war/src/main/resources/templates/default_zh_CN.properties
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/jspwiki-war/src/main/resources/templates/default_zh_CN.properties?rev=1490397&r1=1490396&r2=1490397&view=diff
==============================================================================
--- incubator/jspwiki/trunk/jspwiki-war/src/main/resources/templates/default_zh_CN.properties (original)
+++ incubator/jspwiki/trunk/jspwiki-war/src/main/resources/templates/default_zh_CN.properties Thu Jun  6 19:06:19 2013
@@ -191,7 +191,6 @@ info.parent=\u7236\u9875\u9762
 info.lastmodified=\u8be5\u9875\u9762\uff08\u4fee\u8ba2\u7248 {0}\uff09\u6700\u540e\u7531 {2} \u5728 {1} \u4fee\u6539\u3002
 info.createdon=\u8be5\u9875\u9762\u7531 {1} \u521b\u5efa\u4e8e {0}
 info.current=\u5f53\u524d\u9875\u9762\u7248\u672c
-info.noversions=\u65e0\u7248\u672c\u4fe1\u606f\u3002
 info.feed=\u9875\u9762\u8ba2\u9605\u6e90
 
 info.pagediff.title=\u663e\u793a\u4e0a\u4e00\u6b21\u9875\u9762\u66f4\u65b0\u6240\u505a\u7684\u66f4\u6539