This is an automated email from the ASF dual-hosted git repository.

brushed pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/jspwiki.git


The following commit(s) were added to refs/heads/master by this push:
     new 9de699a  JSPWIKI-1069 German Translation errors
9de699a is described below

commit 9de699a366c419549edb0c8020a39db27dbc8e3b
Author: brushed <dirk.frederi...@gmail.com>
AuthorDate: Wed Apr 11 22:00:10 2018 +0200

    JSPWIKI-1069 German Translation errors
---
 ChangeLog                                                     |  4 ++++
 jspwiki-war/src/main/java/org/apache/wiki/Release.java        |  2 +-
 jspwiki-war/src/main/resources/templates/default.properties   |  9 ++++++---
 .../src/main/resources/templates/default_de.properties        | 11 +++++++----
 .../src/main/resources/templates/default_fr.properties        |  7 +++++--
 .../src/main/resources/templates/default_nl.properties        |  9 ++++++---
 .../src/main/webapp/templates/haddock/AttachmentTab.jsp       |  2 +-
 jspwiki-war/src/main/webapp/templates/haddock/InfoContent.jsp |  8 ++++----
 .../src/main/webapp/templates/haddock/editors/plain.jsp       |  4 ++--
 9 files changed, 36 insertions(+), 20 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index eaaa39c..4cb10c4 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2018-04-11  Dirk Frederickx (brushed AT apache DOT org)
+
+       * 2.10.4-git-06  JSPWIKI-1069 i18n errors in german translation
+
 2018-03-31  Dirk Frederickx (brushed AT apache DOT org)
 
        * 2.10.4-git-05  JSPWIKI-1068 TitleBox rendering on Haddock
diff --git a/jspwiki-war/src/main/java/org/apache/wiki/Release.java 
b/jspwiki-war/src/main/java/org/apache/wiki/Release.java
index 3738857..f5bf8a3 100644
--- a/jspwiki-war/src/main/java/org/apache/wiki/Release.java
+++ b/jspwiki-war/src/main/java/org/apache/wiki/Release.java
@@ -72,7 +72,7 @@ public final class Release {
      *  <p>
      *  If the build identifier is empty, it is not added.
      */
-    public static final String     BUILD         = "5";
+    public static final String     BUILD         = "6";
 
     /**
      *  This is the generic version string you should use when printing out 
the version.  It is of
diff --git a/jspwiki-war/src/main/resources/templates/default.properties 
b/jspwiki-war/src/main/resources/templates/default.properties
index 3583e28..eb1cf88 100644
--- a/jspwiki-war/src/main/resources/templates/default.properties
+++ b/jspwiki-war/src/main/resources/templates/default.properties
@@ -63,7 +63,7 @@ conflict.yourtext=Here&#8217;s your text
 
 # DiffContent.jsp
 
-#diff.tab=Version changes
+diff.tab=Version management
 diff.difference=Difference between version {0} and {1}
 diff.gotofirst.title=Go to first change in this document
 diff.gotofirst=View first change
@@ -224,14 +224,15 @@ info.difftolast=to last
 
 info.tab=Info
 info.attachment.tab=Attachment Info
-info.tab.links=Links
+info.tab.links=Page References
 info.tab.outgoing=Outgoing links
 info.tab.incoming=Incoming links
 info.tab.attachments=Attachments
 
 info.uploadnew=Upload new version
 #info.uploadnew.submit=Upload new attachment
-info.uploadnew.filename=Select file:
+info.uploadnew.filename=Select file
+info.uploadnew.candraganddrop=or drop them here!
 info.uploadnew.changenote=Change note:
 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 &\#8220;Upload&\#8221;.
 info.uploadnew.nopermission=Only authorized users are allowed to upload new 
attachment versions.
@@ -518,6 +519,8 @@ view.title.view={0}: {1}
 
 editor.plain.name=Name
 editor.plain.remember=Remember me?
+editor.plain.create=Add your page content here
+editor.plain.comment=Leave a comment
 editor.plain.email=Link to homepage or email
 editor.plain.save.submit=Save
 editor.plain.save.submit.comment=Post Comment
diff --git a/jspwiki-war/src/main/resources/templates/default_de.properties 
b/jspwiki-war/src/main/resources/templates/default_de.properties
index 61995f8..97ee3ca 100644
--- a/jspwiki-war/src/main/resources/templates/default_de.properties
+++ b/jspwiki-war/src/main/resources/templates/default_de.properties
@@ -22,7 +22,7 @@
 #
 # Anrede "Du" oder "Sie"? 
http://lists.wikimedia.org/pipermail/wikide-l/2007-July/019595.html
 #
-# Momentan wird "du" verwendet, im Geiste von Janne Jalkanens witziger 
+# Momentan wird "du" verwendet, im Geiste von Janne Jalkanens witziger
 # und offener Art, Systemmeldungen in englisch zu formulieren. "Whee!".
 # "du" animiert zum mitmachen. Anrede wird klein geschrieben.
 #
@@ -83,7 +83,7 @@ conflict.yourtext=Deine Variante
 
 # DiffContent.jsp
 
-#diff.tab=Versionsunterschiede
+diff.tab=Versionsunterschiede
 diff.difference=Unterschiede zwischen Version {0} und {1}.
 diff.gotofirst.title=Springe zum ersten Unterschied in diesem Dokument
 diff.gotofirst=Zeige ersten Unterschied
@@ -263,7 +263,8 @@ info.tab.incoming=Eingehende Links
 info.tab.attachments=Anh�nge
 
 info.uploadnew=Neue Version hochladen
-info.uploadnew.filename=Datei ausw�hlen:
+info.uploadnew.filename=Dateien ausw�hlen
+info.uploadnew.candraganddrop=oder hierhin ziehen!
 info.uploadnew.changenote=Kommentar:
 info.uploadnew.help=Um dieser Seite einen neuen Anhang hinzuzuf�gen, w�hle die 
Datei mittels des folgenden \
        Dialogs aus und klicke auf 'Hochladen'!
@@ -566,6 +567,8 @@ view.title.view={0}: {1}
 
 editor.plain.name=Dein <span class='accesskey'>N</span>ame
 editor.plain.remember=Cookies benutzen?
+editor.plain.create=Seiteninhalt hier eingeben
+editor.plain.comment=Kommentieren
 editor.plain.email=Homepage oder E-<span class='accesskey'>M</span>ail
 editor.plain.save.submit=Speichern
 editor.plain.save.title=Speichern [ s ]
@@ -600,7 +603,7 @@ editor.plain.tabcompletion.title=Automatische Umwandlung 
von Schl
 editor.plain.autosuggest=Automatische Vervollst�ndigung
 #editor.plain.editassist=Edit Assist
 #editor.plain.editassist.title=Toggle Edit Assist buttons
-editor.plain.livepreview=editor.plain.sidebysidepreview=Side by Side Preview
+editor.plain.livepreview=Echtzeitvorschau
 editor.plain.edit.resize=Drag to resize the text and preview area
 
 editor.plain.sneakpreview=Schnellvorschau
diff --git a/jspwiki-war/src/main/resources/templates/default_fr.properties 
b/jspwiki-war/src/main/resources/templates/default_fr.properties
index 4e938fa..8b360a2 100644
--- a/jspwiki-war/src/main/resources/templates/default_fr.properties
+++ b/jspwiki-war/src/main/resources/templates/default_fr.properties
@@ -79,7 +79,7 @@ conflict.yourtext=Voici votre texte
 
 # DiffContent.jsp
 
-#diff.tab=Changements de version
+diff.tab=Maintenance de la version
 diff.difference=Diff\u00E9rences entre les versions {0} et {1}
 diff.gotofirst.title=Aller \u00E0 la premi\u00E8re modification apport\u00E9e 
\u00E0 ce document
 diff.gotofirst=Voir la premi\u00E8re modification
@@ -202,7 +202,7 @@ info.pagename=Nom de page name
 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.current=Version actuelle de la page
 info.feed=Source RSS de la page
 
 info.pagediff.title=Montrer les modifications de la derni\u00E8re mise \u00E0 
jour de la page
@@ -256,6 +256,7 @@ info.tab.attachments=Attachements
 info.uploadnew=T\u00E9l\u00E9charger une nouvelle version
 #info.uploadnew.submit=T\u00E9l\u00E9charger un nouvel attachement
 info.uploadnew.filename=S\u00E9lectionner le fichier\u00A0:
+info.uploadnew.candraganddrop=ou faites glisser vers cette zone!
 info.uploadnew.changenote=Modifier la note\u00A0:
 info.uploadnew.help=Pour t\u00E9l\u00E9charger un nouvel attachement \u00E0 
cette page, \
     veuillez utiliser la boite suivante pour atteindre le fichier, puis 
cliquez sur le bouton \u201CT\u00E9l\u00E9charger\u201D.
@@ -572,6 +573,8 @@ view.title.view={0}\u00A0: {1}
 
 editor.plain.name=Votre <span class='accesskey'>n</span>om
 editor.plain.remember=Se souvenir de moi
+editor.plain.create=Ajouter le contenu du page
+editor.plain.comment=Ajouter vos commentaires
 editor.plain.email=Page d\u0027accueil ou adresse e-<span 
class='accesskey'>m</span>ail
 editor.plain.save.submit=Enregistrer
 editor.plain.save.title=Enregistrer [ s ]
diff --git a/jspwiki-war/src/main/resources/templates/default_nl.properties 
b/jspwiki-war/src/main/resources/templates/default_nl.properties
index 9af9e55..7306de0 100644
--- a/jspwiki-war/src/main/resources/templates/default_nl.properties
+++ b/jspwiki-war/src/main/resources/templates/default_nl.properties
@@ -76,7 +76,7 @@ conflict.yourtext=Hier is jouw tekst
 
 # DiffContent.jsp
 
-#diff.tab=Versie beheer
+diff.tab=Versie beheer
 diff.difference=Verschillen tussen versie {0} en {1}
 diff.gotofirst.title=Ga naar het eerste verschil
 diff.gotofirst=Toon eerste verschil
@@ -251,7 +251,8 @@ info.tab.attachments=Bijlagen
 
 info.uploadnew=Bijlage op de server plaatsen
 #info.uploadnew.submit=Nieuwe bijlage op server plaatsen
-info.uploadnew.filename=Selecteer het bestand:
+info.uploadnew.filename=Selecteer het bestand
+info.uploadnew.candraganddrop=of sleep naar deze zone!
 info.uploadnew.changenote=Opmerkingen:
 info.uploadnew.help=Om een nieuwe bijlage aan deze pagina toe te voegen, \
     Gebruik volgend invoer veld om het bestand te selecteren, en klik de 
&#8220;Plaats het bestand op de server&#8221; knop.
@@ -564,6 +565,8 @@ view.title.view={0}: {1}
 
 editor.plain.name=Uw <span class='accesskey'>n</span>aam
 editor.plain.remember=Bewaar uw naam in de browser cookie?
+editor.plain.create=Voeg hier de pagina inhoud toe
+editor.plain.comment=Commentaar toevoegen
 editor.plain.email=Homepagina of e<span class='accesskey'>m</span>ail
 editor.plain.save.submit=Bewaar
 editor.plain.save.title=Bewaar [ e ]
@@ -625,7 +628,7 @@ editor.plain.tbFONT.title=Lettertype
 editor.plain.tbCHARS.title=Speciale karakters
 editor.plain.autosuggest = Auto Suggest
 editor.plain.edit.resize = Slepen om de tekst en voorvertoon gebieden te 
resizen
-editor.plain.livepreview = Live Voorvertonong
+editor.plain.livepreview = Live Voorvertoning
 editor.plain.sidebysidepreview = Preview naast elkaar
 
 editor.preview.edit.submit=Verder gaan
diff --git a/jspwiki-war/src/main/webapp/templates/haddock/AttachmentTab.jsp 
b/jspwiki-war/src/main/webapp/templates/haddock/AttachmentTab.jsp
index e2a6ff0..5228204 100644
--- a/jspwiki-war/src/main/webapp/templates/haddock/AttachmentTab.jsp
+++ b/jspwiki-war/src/main/webapp/templates/haddock/AttachmentTab.jsp
@@ -56,7 +56,7 @@
       <ul class="list-group form-col-50">
         <li class="list-group-item droppable">
           <a class="hidden delete btn btn-danger btn-xs pull-right">Delete</a>
-          <label>Select files <span class='canDragAndDrop'>or drop them 
here!</span></label>
+          <label><fmt:message key="info.uploadnew.filename" /><span 
class='canDragAndDrop'><fmt:message 
key="info.uploadnew.candraganddrop"/></span></label>
           <input type="file" name="files" id="files" size="60" 
multiple="multiple"/>
         </li>
       </ul>
diff --git a/jspwiki-war/src/main/webapp/templates/haddock/InfoContent.jsp 
b/jspwiki-war/src/main/webapp/templates/haddock/InfoContent.jsp
index 4815fd4..5edc695 100644
--- a/jspwiki-war/src/main/webapp/templates/haddock/InfoContent.jsp
+++ b/jspwiki-war/src/main/webapp/templates/haddock/InfoContent.jsp
@@ -117,7 +117,7 @@
     <wiki:Messages div="alert alert-danger" topic="rename" 
prefix='<%=LocaleSupport.getLocalizedMessage(pageContext,"prefs.errorprefix.rename")%>'/>
 
     <form action="<wiki:Link format='url' jsp='Rename.jsp'/>"
-           class="form-group"
+           class="form-group form-inline"
               id="renameform"
           method="post" accept-charset="<wiki:ContentEncoding />" >
 
@@ -153,7 +153,7 @@
 
 
   <div class="tabs">
-    <h4 id="history">History</h4>
+    <h4 id="history"><fmt:message key="info.history"/></h4>
 
     <wiki:SetPagination start="<%=startitem%>" total="<%=itemcount%>" 
pagesize="<%=pagesize%>" maxlinks="9"
                        fmtkey="info.pagination"
@@ -214,7 +214,7 @@
     </div>
     ${pagination}
 
-    <h4 id="page-refs">Page References</h4>
+    <h4 id="page-refs"><fmt:message key="info.tab.links" /></h4>
     <table class="table">
       <tr>
       <th><fmt:message key="info.tab.incoming" /></th>
@@ -237,7 +237,7 @@
 
     <%-- DIFF section --%>
     <wiki:CheckRequestContext context='diff'>
-      <h4 data-activePane id="diff">Difference</h4>
+      <h4 data-activePane id="diff"><fmt:message key="diff.tab" /></h4>
       <wiki:Include page="DiffTab.jsp"/>
     </wiki:CheckRequestContext>
 
diff --git a/jspwiki-war/src/main/webapp/templates/haddock/editors/plain.jsp 
b/jspwiki-war/src/main/webapp/templates/haddock/editors/plain.jsp
index 671a558..20d4c40 100644
--- a/jspwiki-war/src/main/webapp/templates/haddock/editors/plain.jsp
+++ b/jspwiki-war/src/main/webapp/templates/haddock/editors/plain.jsp
@@ -334,8 +334,8 @@
     <div class="row edit-area"><%-- .livepreview  .previewcolumn--%>
       <div>
         <textarea class="editor form-control snipeable"
-           <wiki:CheckRequestContext context="edit">placeholder="Add your page 
content here"</wiki:CheckRequestContext>
-           <wiki:CheckRequestContext context="comment">placeholder="Leave a 
comment"</wiki:CheckRequestContext>
+           <wiki:CheckRequestContext context="edit">placeholder="<fmt:message 
key='editor.plain.create'/>"</wiki:CheckRequestContext>
+           <wiki:CheckRequestContext 
context="comment">placeholder="<fmt:message 
key='editor.plain.comment'/>"</wiki:CheckRequestContext>
                   autofocus="autofocus"
                   rows="20" cols="80"></textarea>
         <textarea class="editor form-control hidden" id="editorarea" 
name="<%=EditorManager.REQ_EDITEDTEXT%>"

-- 
To stop receiving notification emails like this one, please contact
brus...@apache.org.

Reply via email to