Mailing-List: contact commits-help@directory.apache.org; run by ezmlm
Precedence: bulk
Reply-To: dev@directory.apache.org
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r720844 - in
 /directory/studio/trunk/schemaeditor/src/main:
 java/org/apache/directory/studio/schemaeditor/view/editors/objectclass/
 resources/org/apache/directory/studio/schemaeditor/view/editors/objectclass/
Date: Wed, 26 Nov 2008 13:32:36 -0000
To: commits@directory.apache.org
From: felixk@apache.org
Message-Id: <20081126133236.9668D23888A6@eris.apache.org>

Author: felixk
Date: Wed Nov 26 05:32:35 2008
New Revision: 720844

URL: http://svn.apache.org/viewvc?rev=720844&view=rev
Log:
- Fix NLS parameter stuff
- Add German translation

Added:
    directory/studio/trunk/schemaeditor/src/main/resources/org/apache/directory/studio/schemaeditor/view/editors/objectclass/messages_de.properties   (with props)
Modified:
    directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/editors/objectclass/ObjectClassEditorAttributesTableLabelProvider.java
    directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/editors/objectclass/ObjectClassEditorInput.java
    directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/editors/objectclass/ObjectClassEditorSuperiorsTableLabelProvider.java
    directory/studio/trunk/schemaeditor/src/main/resources/org/apache/directory/studio/schemaeditor/view/editors/objectclass/messages.properties

Modified: directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/editors/objectclass/ObjectClassEditorAttributesTableLabelProvider.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/editors/objectclass/ObjectClassEditorAttributesTableLabelProvider.java?rev=720844&r1=720843&r2=720844&view=diff
==============================================================================
--- directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/editors/objectclass/ObjectClassEditorAttributesTableLabelProvider.java (original)
+++ directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/editors/objectclass/ObjectClassEditorAttributesTableLabelProvider.java Wed Nov 26 05:32:35 2008
@@ -28,6 +28,7 @@
 import org.apache.directory.studio.schemaeditor.view.editors.NonExistingAttributeType;
 import org.eclipse.jface.viewers.ITableLabelProvider;
 import org.eclipse.jface.viewers.LabelProvider;
+import org.eclipse.osgi.util.NLS;
 import org.eclipse.swt.graphics.Image;
 
 
@@ -70,7 +71,7 @@
             }
             else
             {
-                return Messages.getString("ObjectClassEditorAttributesTableLabelProvider.none") + at.getOid() + ")"; //$NON-NLS-2$
+                return NLS.bind( Messages.getString("ObjectClassEditorAttributesTableLabelProvider.none"), new String[]{at.getOid()}); //$NON-NLS-1$
             }
         }
         else if ( element instanceof NonExistingAttributeType )

Modified: directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/editors/objectclass/ObjectClassEditorInput.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/editors/objectclass/ObjectClassEditorInput.java?rev=720844&r1=720843&r2=720844&view=diff
==============================================================================
--- directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/editors/objectclass/ObjectClassEditorInput.java (original)
+++ directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/editors/objectclass/ObjectClassEditorInput.java Wed Nov 26 05:32:35 2008
@@ -23,6 +23,7 @@
 
 import org.apache.directory.studio.schemaeditor.model.ObjectClassImpl;
 import org.eclipse.jface.resource.ImageDescriptor;
+import org.eclipse.osgi.util.NLS;
 import org.eclipse.ui.IEditorInput;
 import org.eclipse.ui.IPersistableElement;
 
@@ -97,7 +98,7 @@
      */
     public String getToolTipText()
     {
-        return getName() + Messages.getString("ObjectClassEditorInput.FromSchemaBegin") + objectClass.getSchema() + Messages.getString("ObjectClassEditorInput.FromSchemaEnd");
+        return NLS.bind( Messages.getString("ObjectClassEditorInput.FromSchema"), new String[]{getName(), objectClass.getSchema()});
     }
 
 

Modified: directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/editors/objectclass/ObjectClassEditorSuperiorsTableLabelProvider.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/editors/objectclass/ObjectClassEditorSuperiorsTableLabelProvider.java?rev=720844&r1=720843&r2=720844&view=diff
==============================================================================
--- directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/editors/objectclass/ObjectClassEditorSuperiorsTableLabelProvider.java (original)
+++ directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/editors/objectclass/ObjectClassEditorSuperiorsTableLabelProvider.java Wed Nov 26 05:32:35 2008
@@ -28,6 +28,7 @@
 import org.apache.directory.studio.schemaeditor.view.editors.NonExistingObjectClass;
 import org.eclipse.jface.viewers.ITableLabelProvider;
 import org.eclipse.jface.viewers.LabelProvider;
+import org.eclipse.osgi.util.NLS;
 import org.eclipse.swt.graphics.Image;
 
 
@@ -70,7 +71,7 @@
             }
             else
             {
-                return Messages.getString("ObjectClassEditorSuperiorsTableLabelProvider.2") + oc.getOid() + ")"; //$NON-NLS-2$
+                return NLS.bind( Messages.getString("ObjectClassEditorSuperiorsTableLabelProvider.None"), new String[]{oc.getOid()}); //$NON-NLS-1$
             }
         }
         else if ( element instanceof NonExistingObjectClass )

Modified: directory/studio/trunk/schemaeditor/src/main/resources/org/apache/directory/studio/schemaeditor/view/editors/objectclass/messages.properties
URL: http://svn.apache.org/viewvc/directory/studio/trunk/schemaeditor/src/main/resources/org/apache/directory/studio/schemaeditor/view/editors/objectclass/messages.properties?rev=720844&r1=720843&r2=720844&view=diff
==============================================================================
--- directory/studio/trunk/schemaeditor/src/main/resources/org/apache/directory/studio/schemaeditor/view/editors/objectclass/messages.properties (original)
+++ directory/studio/trunk/schemaeditor/src/main/resources/org/apache/directory/studio/schemaeditor/view/editors/objectclass/messages.properties Wed Nov 26 05:32:35 2008
@@ -17,19 +17,18 @@
 
 ObjectClassEditor.CodeError=The editor of the Source Code contains errors, you cannot return to the Overview page until these errors are fixed.
 ObjectClassEditor.CodeErrorObject=The editor of the Source Code contains errors, you cannot save the object class until these errors are fixed.
-ObjectClassEditorAttributesTableLabelProvider.none=(None)  -  (
-ObjectClassEditorInput.FromSchemaBegin=\ from the 
-ObjectClassEditorInput.FromSchemaEnd=\ schema
+ObjectClassEditorAttributesTableLabelProvider.none=(None)  -  ({0})
+ObjectClassEditorInput.FromSchema={0} from the {1} schema 
 ObjectClassEditorOverviewPage.Abstract=Abstract
 ObjectClassEditorOverviewPage.Add=Add...
 ObjectClassEditorOverviewPage.Aliases=Aliases:
 ObjectClassEditorOverviewPage.Auxiliary=Auxiliary
 ObjectClassEditorOverviewPage.ClassType=Class type:
 ObjectClassEditorOverviewPage.Description=Description:
-ObjectClassEditorOverviewPage.EditAliases=Edit_Aliases
+ObjectClassEditorOverviewPage.EditAliases=Edit aliases
 ObjectClassEditorOverviewPage.ElementOIDExists=An element with same oid already exists.
 ObjectClassEditorOverviewPage.GeneralInformation=General information
-ObjectClassEditorOverviewPage.MalformedOID=Malformed_OID.
+ObjectClassEditorOverviewPage.MalformedOID=Malformed OID.
 ObjectClassEditorOverviewPage.MandatoryAttributes=Mandatory attributes
 ObjectClassEditorOverviewPage.None=(None)
 ObjectClassEditorOverviewPage.Obesolete=Obsolete
@@ -43,4 +42,4 @@
 ObjectClassEditorOverviewPage.SpecifyOptionalAttributes=Specify the optional attribute types.
 ObjectClassEditorOverviewPage.Structural=Structural
 ObjectClassEditorOverviewPage.SuperiorClasses=Superior classes:
-ObjectClassEditorSuperiorsTableLabelProvider.2=(None)  -  (
+ObjectClassEditorSuperiorsTableLabelProvider.None=(None)  -  ({0})

Added: directory/studio/trunk/schemaeditor/src/main/resources/org/apache/directory/studio/schemaeditor/view/editors/objectclass/messages_de.properties
URL: http://svn.apache.org/viewvc/directory/studio/trunk/schemaeditor/src/main/resources/org/apache/directory/studio/schemaeditor/view/editors/objectclass/messages_de.properties?rev=720844&view=auto
==============================================================================
--- directory/studio/trunk/schemaeditor/src/main/resources/org/apache/directory/studio/schemaeditor/view/editors/objectclass/messages_de.properties (added)
+++ directory/studio/trunk/schemaeditor/src/main/resources/org/apache/directory/studio/schemaeditor/view/editors/objectclass/messages_de.properties Wed Nov 26 05:32:35 2008
@@ -0,0 +1,45 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
+ObjectClassEditor.CodeError=Der Editor des Source Codes enth\u00E4lt Fehler, Sie k\u00F6nne solange nicht auf die \u00DCbersichtseite zur\u00FCckkehren, bis diese Fehler behoben sind.
+ObjectClassEditor.CodeErrorObject=Der Editor des Source Codes enth\u00E4lt Fehler, Sie k\u00F6nnen den Objekt Klasse nicht speichern bis diese Fehler behoben sind.
+ObjectClassEditorAttributesTableLabelProvider.none=(Keine)  -  ({0})
+ObjectClassEditorInput.FromSchema={0} aus dem {1} Schema 
+ObjectClassEditorOverviewPage.Abstract=Abstrakt
+ObjectClassEditorOverviewPage.Add=Hinzuf\u00FCgen...
+ObjectClassEditorOverviewPage.Aliases=Aliase\:
+ObjectClassEditorOverviewPage.Auxiliary=Zus\u00E4tzlich
+ObjectClassEditorOverviewPage.ClassType=Klassen Typ\:
+ObjectClassEditorOverviewPage.Description=Beschreibung
+ObjectClassEditorOverviewPage.EditAliases=Aliase editieren
+ObjectClassEditorOverviewPage.ElementOIDExists=Es existiert bereits ein Element mit dieser OID.
+ObjectClassEditorOverviewPage.GeneralInformation=Allgemeine Informationen
+ObjectClassEditorOverviewPage.MalformedOID=Ung\u00FCltige OID.
+ObjectClassEditorOverviewPage.MandatoryAttributes=Pflichtattribute
+ObjectClassEditorOverviewPage.None=(Keine)
+ObjectClassEditorOverviewPage.Obesolete=Obsolet
+ObjectClassEditorOverviewPage.OID=OID:
+ObjectClassEditorOverviewPage.OptionalAttributes=Optionale Attribute
+ObjectClassEditorOverviewPage.Overview=\u00DCbersicht
+ObjectClassEditorOverviewPage.Remove=L\u00F6schen
+ObjectClassEditorOverviewPage.Schema=Schema:
+ObjectClassEditorOverviewPage.SpecifyGeneralInformation=Spezifizieren Sie allgemeine Informationen (Aliase, OID, etc.).
+ObjectClassEditorOverviewPage.SpecifyMandatoryAttributes=Spezifizieren Sie Pflichtattribut-Typen.
+ObjectClassEditorOverviewPage.SpecifyOptionalAttributes=Spezifzieren Sie opeionale Attribut-Typen.
+ObjectClassEditorOverviewPage.Structural=Strukturell
+ObjectClassEditorOverviewPage.SuperiorClasses=\u00DCbergeordnete Klassen\:
+ObjectClassEditorSuperiorsTableLabelProvider.None=(Keine)  -  ({0})

Propchange: directory/studio/trunk/schemaeditor/src/main/resources/org/apache/directory/studio/schemaeditor/view/editors/objectclass/messages_de.properties
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: directory/studio/trunk/schemaeditor/src/main/resources/org/apache/directory/studio/schemaeditor/view/editors/objectclass/messages_de.properties
------------------------------------------------------------------------------
    svn:keywords = Id