You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@directory.apache.org by fe...@apache.org on 2008/11/26 13:43:17 UTC
svn commit: r720835 - in /directory/studio/trunk/schemaeditor/src/main:
java/org/apache/directory/studio/schemaeditor/view/editors/attributetype/
resources/org/apache/directory/studio/schemaeditor/view/editors/attributetype/
Author: felixk
Date: Wed Nov 26 04:43:12 2008
New Revision: 720835
URL: http://svn.apache.org/viewvc?rev=720835&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/attributetype/messages_de.properties (with props)
Modified:
directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/editors/attributetype/ATEMatchingRulesComboLabelProvider.java
directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/editors/attributetype/ATESuperiorComboLabelProvider.java
directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/editors/attributetype/ATESyntaxComboLabelProvider.java
directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/editors/attributetype/AttributeTypeEditorInput.java
directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/editors/attributetype/AttributeTypeEditorUsedByPage.java
directory/studio/trunk/schemaeditor/src/main/resources/org/apache/directory/studio/schemaeditor/view/editors/attributetype/messages.properties
Modified: directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/editors/attributetype/ATEMatchingRulesComboLabelProvider.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/editors/attributetype/ATEMatchingRulesComboLabelProvider.java?rev=720835&r1=720834&r2=720835&view=diff
==============================================================================
--- directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/editors/attributetype/ATEMatchingRulesComboLabelProvider.java (original)
+++ directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/editors/attributetype/ATEMatchingRulesComboLabelProvider.java Wed Nov 26 04:43:12 2008
@@ -23,6 +23,7 @@
import org.apache.directory.studio.schemaeditor.model.MatchingRuleImpl;
import org.apache.directory.studio.schemaeditor.view.editors.NonExistingMatchingRule;
import org.eclipse.jface.viewers.LabelProvider;
+import org.eclipse.osgi.util.NLS;
/**
@@ -49,7 +50,7 @@
}
else
{
- return Messages.getString("ATEMatchingRulesComboLabelProvider.None") + mr.getOid() + ")"; //$NON-NLS-2$
+ return NLS.bind( Messages.getString("ATEMatchingRulesComboLabelProvider.None"), new String[]{mr.getOid()}); //$NON-NLS-1$
}
}
else if ( obj instanceof NonExistingMatchingRule )
Modified: directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/editors/attributetype/ATESuperiorComboLabelProvider.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/editors/attributetype/ATESuperiorComboLabelProvider.java?rev=720835&r1=720834&r2=720835&view=diff
==============================================================================
--- directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/editors/attributetype/ATESuperiorComboLabelProvider.java (original)
+++ directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/editors/attributetype/ATESuperiorComboLabelProvider.java Wed Nov 26 04:43:12 2008
@@ -24,6 +24,7 @@
import org.apache.directory.studio.schemaeditor.view.ViewUtils;
import org.apache.directory.studio.schemaeditor.view.editors.NonExistingAttributeType;
import org.eclipse.jface.viewers.LabelProvider;
+import org.eclipse.osgi.util.NLS;
/**
@@ -50,7 +51,7 @@
}
else
{
- return Messages.getString("ATESuperiorComboLabelProvider.None") + at.getOid() + ")"; //$NON-NLS-2$
+ return NLS.bind( Messages.getString("ATESuperiorComboLabelProvider.None"),new String[]{ at.getOid()}); //$NON-NLS-1$
}
}
else if ( obj instanceof NonExistingAttributeType )
Modified: directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/editors/attributetype/ATESyntaxComboLabelProvider.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/editors/attributetype/ATESyntaxComboLabelProvider.java?rev=720835&r1=720834&r2=720835&view=diff
==============================================================================
--- directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/editors/attributetype/ATESyntaxComboLabelProvider.java (original)
+++ directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/editors/attributetype/ATESyntaxComboLabelProvider.java Wed Nov 26 04:43:12 2008
@@ -23,6 +23,7 @@
import org.apache.directory.studio.schemaeditor.model.SyntaxImpl;
import org.apache.directory.studio.schemaeditor.view.editors.NonExistingSyntax;
import org.eclipse.jface.viewers.LabelProvider;
+import org.eclipse.osgi.util.NLS;
/**
@@ -49,7 +50,7 @@
}
else
{
- return Messages.getString("ATESyntaxComboLabelProvider.None") + syntax.getOid() + ")"; //$NON-NLS-2$
+ return NLS.bind( Messages.getString("ATESyntaxComboLabelProvider.None"), new String[]{ syntax.getOid()}); //$NON-NLS-1$
}
}
else if ( obj instanceof NonExistingSyntax )
Modified: directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/editors/attributetype/AttributeTypeEditorInput.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/editors/attributetype/AttributeTypeEditorInput.java?rev=720835&r1=720834&r2=720835&view=diff
==============================================================================
--- directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/editors/attributetype/AttributeTypeEditorInput.java (original)
+++ directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/editors/attributetype/AttributeTypeEditorInput.java Wed Nov 26 04:43:12 2008
@@ -23,6 +23,7 @@
import org.apache.directory.studio.schemaeditor.model.AttributeTypeImpl;
import org.eclipse.jface.resource.ImageDescriptor;
+import org.eclipse.osgi.util.NLS;
import org.eclipse.ui.IEditorInput;
import org.eclipse.ui.IPersistableElement;
@@ -99,7 +100,7 @@
*/
public String getToolTipText()
{
- return getName() + Messages.getString("AttributeTypeEditorInput.FromSchemaBegin") + attributeType.getSchema() + Messages.getString("AttributeTypeEditorInput.FromSchemaEnd");
+ return NLS.bind( Messages.getString("AttributeTypeEditorInput.FromSchema"),new String[]{ getName(), attributeType.getSchema()});
}
Modified: directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/editors/attributetype/AttributeTypeEditorUsedByPage.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/editors/attributetype/AttributeTypeEditorUsedByPage.java?rev=720835&r1=720834&r2=720835&view=diff
==============================================================================
--- directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/editors/attributetype/AttributeTypeEditorUsedByPage.java (original)
+++ directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/editors/attributetype/AttributeTypeEditorUsedByPage.java Wed Nov 26 04:43:12 2008
@@ -35,6 +35,7 @@
import org.apache.log4j.Logger;
import org.eclipse.jface.viewers.StructuredSelection;
import org.eclipse.jface.viewers.TableViewer;
+import org.eclipse.osgi.util.NLS;
import org.eclipse.swt.SWT;
import org.eclipse.swt.events.MouseAdapter;
import org.eclipse.swt.events.MouseEvent;
@@ -263,13 +264,11 @@
String names[] = modifiedAttributeType.getNamesRef();
if ( ( names != null ) && ( names.length > 0 ) )
{
- mandatoryAttributeSection.setDescription( Messages.getString("AttributeTypeEditorUsedByPage.AttributeTypeMandatoryBegin") + " '" + ViewUtils.concateAliases( names ) //$NON-NLS-2$
- + "' " + Messages.getString("AttributeTypeEditorUsedByPage.AttributeTypeMandatoryEnd") ); //$NON-NLS-1$
+ mandatoryAttributeSection.setDescription( NLS.bind( Messages.getString("AttributeTypeEditorUsedByPage.AttributeTypeMandatory"), new String[]{ ViewUtils.concateAliases( names )}) ); //$NON-NLS-1$
}
else
{
- mandatoryAttributeSection.setDescription( Messages.getString("AttributeTypeEditorUsedByPage.AttributeTypeMandatoryBegin") + " '" + modifiedAttributeType.getOid() //$NON-NLS-2$
- + "' " + Messages.getString("AttributeTypeEditorUsedByPage.AttributeTypeMandatoryEnd") ); //$NON-NLS-1$
+ mandatoryAttributeSection.setDescription( NLS.bind( Messages.getString("AttributeTypeEditorUsedByPage.AttributeTypeMandatory"), new String[]{modifiedAttributeType.getOid()}) ); //$NON-NLS-1$
}
mandatoryAttributeSection.setText( Messages.getString("AttributeTypeEditorUsedByPage.AsMandatoryAttribute") );
@@ -306,13 +305,11 @@
String names[] = modifiedAttributeType.getNamesRef();
if ( ( names != null ) && ( names.length > 0 ) )
{
- optionalAttributeSection.setDescription( Messages.getString("AttributeTypeEditorUsedByPage.AttributeTypeOptionalBegin") + " '" + ViewUtils.concateAliases( names ) //$NON-NLS-2$
- + "' " + Messages.getString("AttributeTypeEditorUsedByPage.AttributeTypeOptionalEnd") ); //$NON-NLS-1$
+ optionalAttributeSection.setDescription( NLS.bind( Messages.getString("AttributeTypeEditorUsedByPage.AttributeTypeOptional"),new String[]{ViewUtils.concateAliases( names )}) ); //$NON-NLS-1$
}
else
{
- optionalAttributeSection.setDescription( Messages.getString("AttributeTypeEditorUsedByPage.AttributeTypeOptionalBegin") + " '" + modifiedAttributeType.getOid() //$NON-NLS-2$
- + "' " + Messages.getString("AttributeTypeEditorUsedByPage.AttributeTypeOptionalEnd") ); //$NON-NLS-1$
+ optionalAttributeSection.setDescription( NLS.bind( Messages.getString("AttributeTypeEditorUsedByPage.AttributeTypeOptional"), new String[]{modifiedAttributeType.getOid()}) ); //$NON-NLS-1$
}
optionalAttributeSection.setText( Messages.getString("AttributeTypeEditorUsedByPage.AsOptionalAttribute") );
Modified: directory/studio/trunk/schemaeditor/src/main/resources/org/apache/directory/studio/schemaeditor/view/editors/attributetype/messages.properties
URL: http://svn.apache.org/viewvc/directory/studio/trunk/schemaeditor/src/main/resources/org/apache/directory/studio/schemaeditor/view/editors/attributetype/messages.properties?rev=720835&r1=720834&r2=720835&view=diff
==============================================================================
--- directory/studio/trunk/schemaeditor/src/main/resources/org/apache/directory/studio/schemaeditor/view/editors/attributetype/messages.properties (original)
+++ directory/studio/trunk/schemaeditor/src/main/resources/org/apache/directory/studio/schemaeditor/view/editors/attributetype/messages.properties Wed Nov 26 04:43:12 2008
@@ -15,13 +15,12 @@
# specific language governing permissions and limitations
# under the License.
-ATEMatchingRulesComboLabelProvider.None=(None) - (
-ATESuperiorComboLabelProvider.None=(None) - (
-ATESyntaxComboLabelProvider.None=(None) - (
+ATEMatchingRulesComboLabelProvider.None=(None) - ({0})
+ATESuperiorComboLabelProvider.None=(None) - ({0})
+ATESyntaxComboLabelProvider.None=(None) - ({0})
AttributeTypeEditor.AttributeErrors=The editor of the Source Code contains errors, you cannot save the attribute type until these errors are fixed.
AttributeTypeEditor.CodeErrors=The editor of the Source Code contains errors, you cannot return to the Overview page until these errors are fixed.
-AttributeTypeEditorInput.FromSchemaBegin=\ from the
-AttributeTypeEditorInput.FromSchemaEnd=\ schema
+AttributeTypeEditorInput.FromSchema={0} from the {1} schema
AttributeTypeEditorOverviewPage.Aliases=Aliases:
AttributeTypeEditorOverviewPage.Collective=Collective
AttributeTypeEditorOverviewPage.Description=Description:
@@ -48,8 +47,6 @@
AttributeTypeEditorSourceCodePage.SourceCode=Source Code
AttributeTypeEditorUsedByPage.AsMandatoryAttribute=As Mandatory Attribute
AttributeTypeEditorUsedByPage.AsOptionalAttribute=As Optional Attribute
-AttributeTypeEditorUsedByPage.AttributeTypeMandatoryBegin=The attribute type
-AttributeTypeEditorUsedByPage.AttributeTypeMandatoryEnd=is used as a mandatory attribute in the following object classes.
-AttributeTypeEditorUsedByPage.AttributeTypeOptionalBegin=The attribute type
-AttributeTypeEditorUsedByPage.AttributeTypeOptionalEnd=is used as an optional attribute in the following object classes.
+AttributeTypeEditorUsedByPage.AttributeTypeMandatory=The attribute type {0} is used as a mandatory attribute in the following object classes.
+AttributeTypeEditorUsedByPage.AttributeTypeOptional=The attribute type {0} is used as an optional attribute in the following object classes.
AttributeTypeEditorUsedByPage.UsedBy=Used By
Added: directory/studio/trunk/schemaeditor/src/main/resources/org/apache/directory/studio/schemaeditor/view/editors/attributetype/messages_de.properties
URL: http://svn.apache.org/viewvc/directory/studio/trunk/schemaeditor/src/main/resources/org/apache/directory/studio/schemaeditor/view/editors/attributetype/messages_de.properties?rev=720835&view=auto
==============================================================================
--- directory/studio/trunk/schemaeditor/src/main/resources/org/apache/directory/studio/schemaeditor/view/editors/attributetype/messages_de.properties (added)
+++ directory/studio/trunk/schemaeditor/src/main/resources/org/apache/directory/studio/schemaeditor/view/editors/attributetype/messages_de.properties Wed Nov 26 04:43:12 2008
@@ -0,0 +1,52 @@
+# 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.
+
+ATEMatchingRulesComboLabelProvider.None=(Keine) - ({0})
+ATESuperiorComboLabelProvider.None=(Keine) - ({0})
+ATESyntaxComboLabelProvider.None=(Keine) - ({0})
+AttributeTypeEditor.AttributeErrors=Der Editor des Source Codes enth\u00E4lt Fehler, Sie k\u00F6nnen den Attribut Typ nicht speichern bis diese Fehler behoben sind.
+AttributeTypeEditor.CodeErrors=Der Editor des Source Codes enth\u00E4lt Fehler, Sie k\u00F6nne solange nicht auf die \u00DCbersichtseite zur\u00FCckkehren, bis diese Fehler behoben sind.
+AttributeTypeEditorInput.FromSchema={0} aus dem {1} Schema
+AttributeTypeEditorOverviewPage.Aliases=Aliase\:
+AttributeTypeEditorOverviewPage.Collective=Gemeinsam
+AttributeTypeEditorOverviewPage.Description=Beschreibung\:
+AttributeTypeEditorOverviewPage.EditAliases=Aliase editieren
+AttributeTypeEditorOverviewPage.ElementOIDExists=Es existiert bereits ein Element mit dieser OID.
+AttributeTypeEditorOverviewPage.Equality=Gleichheit\:
+AttributeTypeEditorOverviewPage.GeneralInformation=Allgemeine Informationen
+AttributeTypeEditorOverviewPage.MalformedOID=Ung\u00FCltige OID.
+AttributeTypeEditorOverviewPage.MatchingRules=Passende Regeln
+AttributeTypeEditorOverviewPage.None=(Keine)
+AttributeTypeEditorOverviewPage.Obsolete=Obsolet
+AttributeTypeEditorOverviewPage.OID=OID:
+AttributeTypeEditorOverviewPage.Ordering=Sortierung\:
+AttributeTypeEditorOverviewPage.Overview=\u00DCbersicht
+AttributeTypeEditorOverviewPage.Schema=Schema:
+AttributeTypeEditorOverviewPage.SingleValue=Einzel-Wert
+AttributeTypeEditorOverviewPage.SpecifyGeneralInformation=Spezfikation allgemeiner Informationen (aliase, OID, etc.).
+AttributeTypeEditorOverviewPage.SpecifyMatchingRules=Spezifikation passender Regeln (Gleichheit, Sortierung & Teilstring).
+AttributeTypeEditorOverviewPage.Substring=Substring:
+AttributeTypeEditorOverviewPage.SuperiorType=\u00DCbergeordneter Typ\:
+AttributeTypeEditorOverviewPage.Syntax=Syntax:
+AttributeTypeEditorOverviewPage.SyntaxLength=Syntaxl\u00E4nge\:
+AttributeTypeEditorOverviewPage.Usage=Verwendung\:
+AttributeTypeEditorSourceCodePage.SourceCode=Source Code
+AttributeTypeEditorUsedByPage.AsMandatoryAttribute=Als Pflichtattribut
+AttributeTypeEditorUsedByPage.AsOptionalAttribute=Als optionales Attribut
+AttributeTypeEditorUsedByPage.AttributeTypeMandatory=Der Attribut-Typ {0} wird als Pflichtattribut in folgenden Objekt Klassen verwendet.
+AttributeTypeEditorUsedByPage.AttributeTypeOptional=Der Attribut Typ {0} wird als optinales Attribut in folgenden Objekt Klassen verwendet.
+AttributeTypeEditorUsedByPage.UsedBy=Benutzt von
Propchange: directory/studio/trunk/schemaeditor/src/main/resources/org/apache/directory/studio/schemaeditor/view/editors/attributetype/messages_de.properties
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: directory/studio/trunk/schemaeditor/src/main/resources/org/apache/directory/studio/schemaeditor/view/editors/attributetype/messages_de.properties
------------------------------------------------------------------------------
svn:keywords = Id