directory-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From fel...@apache.org
Subject svn commit: r720772 - in /directory/studio/trunk/connection-ui/src/main: java/org/apache/directory/studio/connection/ui/ java/org/apache/directory/studio/connection/ui/actions/ java/org/apache/directory/studio/connection/ui/widgets/ resources/org/apach...
Date Wed, 26 Nov 2008 09:19:54 GMT
Author: felixk
Date: Wed Nov 26 01:19:53 2008
New Revision: 720772

URL: http://svn.apache.org/viewvc?rev=720772&view=rev
Log:
- Formatting
- Add license header to properties files
- Replace the *begin *End construct in the properties files by using parameter {0}, what is
much better practice than what I did yesterday .... I'll need to refactor all the other stuff
from yesterday as well.

Modified:
    directory/studio/trunk/connection-ui/src/main/java/org/apache/directory/studio/connection/ui/UIAuthHandler.java
    directory/studio/trunk/connection-ui/src/main/java/org/apache/directory/studio/connection/ui/actions/PropertiesAction.java
    directory/studio/trunk/connection-ui/src/main/java/org/apache/directory/studio/connection/ui/widgets/NetworkParameterPage.java
    directory/studio/trunk/connection-ui/src/main/resources/org/apache/directory/studio/connection/ui/actions/messages.properties
    directory/studio/trunk/connection-ui/src/main/resources/org/apache/directory/studio/connection/ui/actions/messages_de.properties
    directory/studio/trunk/connection-ui/src/main/resources/org/apache/directory/studio/connection/ui/dialogs/messages.properties
    directory/studio/trunk/connection-ui/src/main/resources/org/apache/directory/studio/connection/ui/dialogs/messages_de.properties
    directory/studio/trunk/connection-ui/src/main/resources/org/apache/directory/studio/connection/ui/messages.properties
    directory/studio/trunk/connection-ui/src/main/resources/org/apache/directory/studio/connection/ui/messages_de.properties
    directory/studio/trunk/connection-ui/src/main/resources/org/apache/directory/studio/connection/ui/properties/messages.properties
    directory/studio/trunk/connection-ui/src/main/resources/org/apache/directory/studio/connection/ui/properties/messages_de.properties
    directory/studio/trunk/connection-ui/src/main/resources/org/apache/directory/studio/connection/ui/widgets/messages.properties
    directory/studio/trunk/connection-ui/src/main/resources/org/apache/directory/studio/connection/ui/widgets/messages_de.properties
    directory/studio/trunk/connection-ui/src/main/resources/org/apache/directory/studio/connection/ui/wizards/messages.properties
    directory/studio/trunk/connection-ui/src/main/resources/org/apache/directory/studio/connection/ui/wizards/messages_de.properties

Modified: directory/studio/trunk/connection-ui/src/main/java/org/apache/directory/studio/connection/ui/UIAuthHandler.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/connection-ui/src/main/java/org/apache/directory/studio/connection/ui/UIAuthHandler.java?rev=720772&r1=720771&r2=720772&view=diff
==============================================================================
--- directory/studio/trunk/connection-ui/src/main/java/org/apache/directory/studio/connection/ui/UIAuthHandler.java
(original)
+++ directory/studio/trunk/connection-ui/src/main/java/org/apache/directory/studio/connection/ui/UIAuthHandler.java
Wed Nov 26 01:19:53 2008
@@ -26,6 +26,7 @@
 import org.apache.directory.studio.connection.core.IAuthHandler;
 import org.apache.directory.studio.connection.core.ICredentials;
 import org.apache.directory.studio.connection.ui.dialogs.CredentialsDialog;
+import org.eclipse.osgi.util.NLS;
 import org.eclipse.ui.PlatformUI;
 
 
@@ -61,9 +62,12 @@
             {
                 public void run()
                 {
-                    CredentialsDialog dialog = new CredentialsDialog( PlatformUI.getWorkbench().getDisplay()
-                        .getActiveShell(), Messages.getString("UIAuthHandler.EnterPasswordForStart")
+ connectionParameter.getName() + Messages.getString("UIAuthHandler.EnterPasswordForEnd"),
-                        Messages.getString("UIAuthHandler.PleaseEnterPasswordOfUser") + connectionParameter.getBindPrincipal()
+ ":", "", null ); //$NON-NLS-2$ //$NON-NLS-3$
+                    CredentialsDialog dialog = new CredentialsDialog(
+                        PlatformUI.getWorkbench().getDisplay().getActiveShell(),
+                        NLS
+                            .bind(
+                                Messages.getString( "UIAuthHandler.EnterPasswordFor" ), new
String[] { connectionParameter.getName() } ), //$NON-NLS-1$
+                        Messages.getString( "UIAuthHandler.PleaseEnterPasswordOfUser" ) +
connectionParameter.getBindPrincipal() + ":", "", null ); //$NON-NLS-2$ //$NON-NLS-3$
                     if ( dialog.open() == CredentialsDialog.OK )
                     {
                         pw[0] = dialog.getValue();

Modified: directory/studio/trunk/connection-ui/src/main/java/org/apache/directory/studio/connection/ui/actions/PropertiesAction.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/connection-ui/src/main/java/org/apache/directory/studio/connection/ui/actions/PropertiesAction.java?rev=720772&r1=720771&r2=720772&view=diff
==============================================================================
--- directory/studio/trunk/connection-ui/src/main/java/org/apache/directory/studio/connection/ui/actions/PropertiesAction.java
(original)
+++ directory/studio/trunk/connection-ui/src/main/java/org/apache/directory/studio/connection/ui/actions/PropertiesAction.java
Wed Nov 26 01:19:53 2008
@@ -26,6 +26,7 @@
 import org.eclipse.core.runtime.IAdaptable;
 import org.eclipse.jface.preference.PreferenceDialog;
 import org.eclipse.jface.resource.ImageDescriptor;
+import org.eclipse.osgi.util.NLS;
 import org.eclipse.ui.dialogs.PreferencesUtil;
 import org.eclipse.ui.texteditor.IWorkbenchActionDefinitionIds;
 
@@ -52,7 +53,7 @@
      */
     public String getText()
     {
-        return Messages.getString("PropertiesAction.Properties");
+        return Messages.getString( "PropertiesAction.Properties" );
     }
 
 
@@ -106,7 +107,8 @@
             PreferenceDialog dialog = PreferencesUtil.createPropertyDialogOn( getShell(),
element, pageId, null, null );
             if ( dialog != null )
                 title = Utils.shorten( title, 30 );
-            dialog.getShell().setText( Messages.getString("PropertiesAction.PropertiesForStart")
+ title + Messages.getString("PropertiesAction.PropertiesForEnd") );
+            dialog.getShell().setText(
+                NLS.bind( Messages.getString( "PropertiesAction.PropertiesFor" ), new String[]
{ title } ) ); //$NON-NLS-1$
             dialog.open();
 
         }

Modified: directory/studio/trunk/connection-ui/src/main/java/org/apache/directory/studio/connection/ui/widgets/NetworkParameterPage.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/connection-ui/src/main/java/org/apache/directory/studio/connection/ui/widgets/NetworkParameterPage.java?rev=720772&r1=720771&r2=720772&view=diff
==============================================================================
--- directory/studio/trunk/connection-ui/src/main/java/org/apache/directory/studio/connection/ui/widgets/NetworkParameterPage.java
(original)
+++ directory/studio/trunk/connection-ui/src/main/java/org/apache/directory/studio/connection/ui/widgets/NetworkParameterPage.java
Wed Nov 26 01:19:53 2008
@@ -37,6 +37,7 @@
 import org.apache.directory.studio.connection.ui.RunnableContextRunner;
 import org.eclipse.core.runtime.IStatus;
 import org.eclipse.jface.dialogs.MessageDialog;
+import org.eclipse.osgi.util.NLS;
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.events.ModifyEvent;
 import org.eclipse.swt.events.ModifyListener;
@@ -170,12 +171,13 @@
         Composite composite = BaseWidgetUtils.createColumnContainer( parent, 1, 1 );
 
         Composite nameComposite = BaseWidgetUtils.createColumnContainer( composite, 2, 1
);
-        BaseWidgetUtils.createLabel( nameComposite, Messages.getString("NetworkParameterPage.ConnectionName"),
1 );
+        BaseWidgetUtils.createLabel( nameComposite, Messages.getString( "NetworkParameterPage.ConnectionName"
), 1 );
         nameText = BaseWidgetUtils.createText( nameComposite, "", 1 ); //$NON-NLS-1$
 
         BaseWidgetUtils.createSpacer( composite, 1 );
 
-        Group group = BaseWidgetUtils.createGroup( composite, Messages.getString("NetworkParameterPage.NetworkParameter"),
1 );
+        Group group = BaseWidgetUtils.createGroup( composite, Messages
+            .getString( "NetworkParameterPage.NetworkParameter" ), 1 );
 
         Composite groupComposite = BaseWidgetUtils.createColumnContainer( group, 3, 1 );
         BaseWidgetUtils.createLabel( groupComposite, "Hostname:", 1 ); //$NON-NLS-1$
@@ -189,17 +191,15 @@
         portCombo.setText( "389" ); //$NON-NLS-1$
 
         String[] encMethods = new String[]
-            { Messages.getString("NetworkParameterPage.NoEncryption"), Messages.getString("NetworkParameterPage.UseSSLEncryption"),
-        		Messages.getString("NetworkParameterPage.UseStartTLS") };
+            { Messages.getString( "NetworkParameterPage.NoEncryption" ),
+                Messages.getString( "NetworkParameterPage.UseSSLEncryption" ),
+                Messages.getString( "NetworkParameterPage.UseStartTLS" ) };
         int index = 0;
-        BaseWidgetUtils.createLabel( groupComposite, Messages.getString("NetworkParameterPage.EncryptionMethod"),
1 );
+        BaseWidgetUtils.createLabel( groupComposite, Messages.getString( "NetworkParameterPage.EncryptionMethod"
), 1 );
         encryptionMethodCombo = BaseWidgetUtils.createReadonlyCombo( groupComposite, encMethods,
index, 2 );
         BaseWidgetUtils.createSpacer( groupComposite, 1 );
-        BaseWidgetUtils
-            .createLabel(
-                groupComposite,
-                Messages.getString("NetworkParameterPage.WarningCertificateValidation"),
-                2 );
+        BaseWidgetUtils.createLabel( groupComposite, Messages
+            .getString( "NetworkParameterPage.WarningCertificateValidation" ), 2 );
 
         BaseWidgetUtils.createSpacer( groupComposite, 2 );
         checkConnectionButton = new Button( groupComposite, SWT.PUSH );
@@ -207,7 +207,7 @@
         gd.horizontalAlignment = SWT.RIGHT;
         gd.verticalAlignment = SWT.BOTTOM;
         checkConnectionButton.setLayoutData( gd );
-        checkConnectionButton.setText( Messages.getString("NetworkParameterPage.CheckNetworkParameter")
);
+        checkConnectionButton.setText( Messages.getString( "NetworkParameterPage.CheckNetworkParameter"
) );
 
         nameText.setFocus();
     }
@@ -227,20 +227,22 @@
         errorMessage = null;
         if ( "".equals( portCombo.getText() ) ) //$NON-NLS-1$
         {
-            message = Messages.getString("NetworkParameterPage.PleaseEnterPort");
+            message = Messages.getString( "NetworkParameterPage.PleaseEnterPort" );
         }
         if ( "".equals( hostCombo.getText() ) ) //$NON-NLS-1$
         {
-            message = Messages.getString("NetworkParameterPage.PleaseEnterHostname");
+            message = Messages.getString( "NetworkParameterPage.PleaseEnterHostname" );
         }
         if ( "".equals( nameText.getText() ) ) //$NON-NLS-1$
         {
-            message = Messages.getString("NetworkParameterPage.PleaseEnterConnectionName");
+            message = Messages.getString( "NetworkParameterPage.PleaseEnterConnectionName"
);
         }
         if ( ConnectionCorePlugin.getDefault().getConnectionManager().getConnectionByName(
nameText.getText() ) != null
             && ( connectionParameter == null || !nameText.getText().equals( connectionParameter.getName()
) ) )
         {
-            errorMessage = Messages.getString("NetworkParameterPage.ConnectionExistsStart")
+ nameText.getText() + Messages.getString("NetworkParameterPage.ConnectionExistsEnd");
+            errorMessage = NLS
+                .bind(
+                    Messages.getString( "NetworkParameterPage.ConnectionExists" ), new String[]
{ nameText.getText() } ); //$NON-NLS-1$
         }
     }
 
@@ -317,8 +319,9 @@
                 IStatus status = RunnableContextRunner.execute( runnable, runnableContext,
true );
                 if ( status.isOK() )
                 {
-                    MessageDialog.openInformation( Display.getDefault().getActiveShell(),
Messages.getString("NetworkParameterPage.CheckNetworkParameter"),
-                        Messages.getString("NetworkParameterPage.ConnectionEstablished")
);
+                    MessageDialog.openInformation( Display.getDefault().getActiveShell(),
Messages
+                        .getString( "NetworkParameterPage.CheckNetworkParameter" ), Messages
+                        .getString( "NetworkParameterPage.ConnectionEstablished" ) );
                 }
             }
         } );

Modified: directory/studio/trunk/connection-ui/src/main/resources/org/apache/directory/studio/connection/ui/actions/messages.properties
URL: http://svn.apache.org/viewvc/directory/studio/trunk/connection-ui/src/main/resources/org/apache/directory/studio/connection/ui/actions/messages.properties?rev=720772&r1=720771&r2=720772&view=diff
==============================================================================
--- directory/studio/trunk/connection-ui/src/main/resources/org/apache/directory/studio/connection/ui/actions/messages.properties
(original)
+++ directory/studio/trunk/connection-ui/src/main/resources/org/apache/directory/studio/connection/ui/actions/messages.properties
Wed Nov 26 01:19:53 2008
@@ -1,3 +1,20 @@
+# 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.
+
 CloseConnectionAction.CloseConnections=Close Connections
 CloseConnectionAction.CloseConnection=Close Connection
 CopyAction.Copy=Copy
@@ -28,8 +45,7 @@
 PasteAction.PasteConnectionFolders=Paste Connection Folders
 PasteAction.PasteConnections=Paste Connections
 PropertiesAction.Properties=Properties
-PropertiesAction.PropertiesForEnd='
-PropertiesAction.PropertiesForStart=Properties for '
+PropertiesAction.PropertiesFor=Properties for "{0}"
 RenameAction.Connection=Rename Connection...
 RenameAction.ConnectionAlreadyExists=A connection with this name already exists.
 RenameAction.ConnectionFolder=Rename Connection Folder...

Modified: directory/studio/trunk/connection-ui/src/main/resources/org/apache/directory/studio/connection/ui/actions/messages_de.properties
URL: http://svn.apache.org/viewvc/directory/studio/trunk/connection-ui/src/main/resources/org/apache/directory/studio/connection/ui/actions/messages_de.properties?rev=720772&r1=720771&r2=720772&view=diff
==============================================================================
--- directory/studio/trunk/connection-ui/src/main/resources/org/apache/directory/studio/connection/ui/actions/messages_de.properties
(original)
+++ directory/studio/trunk/connection-ui/src/main/resources/org/apache/directory/studio/connection/ui/actions/messages_de.properties
Wed Nov 26 01:19:53 2008
@@ -1,3 +1,20 @@
+# 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.
+
 CloseConnectionAction.CloseConnections=Verbindungen schliessen
 CloseConnectionAction.CloseConnection=Verbindung schliessen
 CopyAction.Copy=Kopieren
@@ -28,8 +45,7 @@
 PasteAction.PasteConnectionFolders=Verbindungsordner einf\u00FCgen (mehrere)
 PasteAction.PasteConnections=Verbindungen einf\u00FCgen
 PropertiesAction.Properties=Eigenschaften
-PropertiesAction.PropertiesForEnd='
-PropertiesAction.PropertiesForStart=Eigenschaften f\u00FCr '
+PropertiesAction.PropertiesFor=Eigenschaften f\u00FCr "{0}"
 RenameAction.Connection=Verbindung umbenennen...
 RenameAction.ConnectionAlreadyExists=Eine Verbindung mit diesem Namen existiert bereits.
 RenameAction.ConnectionFolder=Verbindungsordner umbenennen...

Modified: directory/studio/trunk/connection-ui/src/main/resources/org/apache/directory/studio/connection/ui/dialogs/messages.properties
URL: http://svn.apache.org/viewvc/directory/studio/trunk/connection-ui/src/main/resources/org/apache/directory/studio/connection/ui/dialogs/messages.properties?rev=720772&r1=720771&r2=720772&view=diff
==============================================================================
--- directory/studio/trunk/connection-ui/src/main/resources/org/apache/directory/studio/connection/ui/dialogs/messages.properties
(original)
+++ directory/studio/trunk/connection-ui/src/main/resources/org/apache/directory/studio/connection/ui/dialogs/messages.properties
Wed Nov 26 01:19:53 2008
@@ -1,2 +1,19 @@
+# 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.
+
 SelectReferralConnectionDialog.SelectConnectionToHandleReferral=Please select a connection
to handle referral 
 SelectReferralConnectionDialog.SelectReferralConenction=Select Referral Connection

Modified: directory/studio/trunk/connection-ui/src/main/resources/org/apache/directory/studio/connection/ui/dialogs/messages_de.properties
URL: http://svn.apache.org/viewvc/directory/studio/trunk/connection-ui/src/main/resources/org/apache/directory/studio/connection/ui/dialogs/messages_de.properties?rev=720772&r1=720771&r2=720772&view=diff
==============================================================================
--- directory/studio/trunk/connection-ui/src/main/resources/org/apache/directory/studio/connection/ui/dialogs/messages_de.properties
(original)
+++ directory/studio/trunk/connection-ui/src/main/resources/org/apache/directory/studio/connection/ui/dialogs/messages_de.properties
Wed Nov 26 01:19:53 2008
@@ -1,2 +1,19 @@
+# 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.
+
 SelectReferralConnectionDialog.SelectConnectionToHandleReferral=Bitte w\u00E4hlen Sie den
Verweis verwaltende Verbindung aus 
 SelectReferralConnectionDialog.SelectReferralConenction=W\u00E4hlen Sie die verweisende Verbindung
aus

Modified: directory/studio/trunk/connection-ui/src/main/resources/org/apache/directory/studio/connection/ui/messages.properties
URL: http://svn.apache.org/viewvc/directory/studio/trunk/connection-ui/src/main/resources/org/apache/directory/studio/connection/ui/messages.properties?rev=720772&r1=720771&r2=720772&view=diff
==============================================================================
--- directory/studio/trunk/connection-ui/src/main/resources/org/apache/directory/studio/connection/ui/messages.properties
(original)
+++ directory/studio/trunk/connection-ui/src/main/resources/org/apache/directory/studio/connection/ui/messages.properties
Wed Nov 26 01:19:53 2008
@@ -1,6 +1,22 @@
+# 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.
+
 ConnectionParameterPageManager.UnableCreateConnectionParamPage=Unable to create connection
parameter page 
 ConnectionUIPlugin.UnableGetPluginProperties=Unable to get the plugin properties.
 ExceptionHandler.Error=Error
-UIAuthHandler.EnterPasswordForEnd='
-UIAuthHandler.EnterPasswordForStart=Enter Password for '
+UIAuthHandler.EnterPasswordFor=Enter Password for "{0}"
 UIAuthHandler.PleaseEnterPasswordOfUser=Please enter password of user 

Modified: directory/studio/trunk/connection-ui/src/main/resources/org/apache/directory/studio/connection/ui/messages_de.properties
URL: http://svn.apache.org/viewvc/directory/studio/trunk/connection-ui/src/main/resources/org/apache/directory/studio/connection/ui/messages_de.properties?rev=720772&r1=720771&r2=720772&view=diff
==============================================================================
--- directory/studio/trunk/connection-ui/src/main/resources/org/apache/directory/studio/connection/ui/messages_de.properties
(original)
+++ directory/studio/trunk/connection-ui/src/main/resources/org/apache/directory/studio/connection/ui/messages_de.properties
Wed Nov 26 01:19:53 2008
@@ -1,6 +1,22 @@
+# 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.
+
 ConnectionParameterPageManager.UnableCreateConnectionParamPage=Die Verbindungsparameter Seite
kann nicht erstellt werden 
 ConnectionUIPlugin.UnableGetPluginProperties=Plugin Eigenschaften sind nicht auffindbar.
 ExceptionHandler.Error=Fehler
-UIAuthHandler.EnterPasswordForEnd=' eingeben
-UIAuthHandler.EnterPasswordForStart=Passwort f\u00FCr '
+UIAuthHandler.EnterPasswordFor=Passwort f\u00FCr "{0}" eingeben
 UIAuthHandler.PleaseEnterPasswordOfUser=Bitte Passwort f\u00FCr Benutzer eingeben

Modified: directory/studio/trunk/connection-ui/src/main/resources/org/apache/directory/studio/connection/ui/properties/messages.properties
URL: http://svn.apache.org/viewvc/directory/studio/trunk/connection-ui/src/main/resources/org/apache/directory/studio/connection/ui/properties/messages.properties?rev=720772&r1=720771&r2=720772&view=diff
==============================================================================
--- directory/studio/trunk/connection-ui/src/main/resources/org/apache/directory/studio/connection/ui/properties/messages.properties
(original)
+++ directory/studio/trunk/connection-ui/src/main/resources/org/apache/directory/studio/connection/ui/properties/messages.properties
Wed Nov 26 01:19:53 2008
@@ -1,2 +1,19 @@
+# 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.
+
 ConnectionPropertyPage.Connection=Connection 
 ConnectionPropertyPage.NoConnection=No connection

Modified: directory/studio/trunk/connection-ui/src/main/resources/org/apache/directory/studio/connection/ui/properties/messages_de.properties
URL: http://svn.apache.org/viewvc/directory/studio/trunk/connection-ui/src/main/resources/org/apache/directory/studio/connection/ui/properties/messages_de.properties?rev=720772&r1=720771&r2=720772&view=diff
==============================================================================
--- directory/studio/trunk/connection-ui/src/main/resources/org/apache/directory/studio/connection/ui/properties/messages_de.properties
(original)
+++ directory/studio/trunk/connection-ui/src/main/resources/org/apache/directory/studio/connection/ui/properties/messages_de.properties
Wed Nov 26 01:19:53 2008
@@ -1,2 +1,19 @@
+# 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.
+
 ConnectionPropertyPage.Connection=Verbindung
 ConnectionPropertyPage.NoConnection=Keine Verbindung

Modified: directory/studio/trunk/connection-ui/src/main/resources/org/apache/directory/studio/connection/ui/widgets/messages.properties
URL: http://svn.apache.org/viewvc/directory/studio/trunk/connection-ui/src/main/resources/org/apache/directory/studio/connection/ui/widgets/messages.properties?rev=720772&r1=720771&r2=720772&view=diff
==============================================================================
--- directory/studio/trunk/connection-ui/src/main/resources/org/apache/directory/studio/connection/ui/widgets/messages.properties
(original)
+++ directory/studio/trunk/connection-ui/src/main/resources/org/apache/directory/studio/connection/ui/widgets/messages.properties
Wed Nov 26 01:19:53 2008
@@ -1,3 +1,20 @@
+# 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.
+
 AuthenticationParameterPage.BindDNOrUser=Bind DN or user:
 AuthenticationParameterPage.AuthenticationMethod=Authentication Method
 AuthenticationParameterPage.AuthenticationParameter=Authentication Parameter
@@ -10,8 +27,7 @@
 AuthenticationParameterPage.SavePassword=Save password
 NetworkParameterPage.CheckNetworkParameter=Check Network Parameter
 NetworkParameterPage.ConnectionEstablished=The connection was established successfully.
-NetworkParameterPage.ConnectionExistsEnd=' already exists.
-NetworkParameterPage.ConnectionExistsStart=A connection named '
+NetworkParameterPage.ConnectionExists=A connection named "{0}" already exists.
 NetworkParameterPage.ConnectionName=Connection name:
 NetworkParameterPage.EncryptionMethod=Encryption method:
 NetworkParameterPage.NetworkParameter=Network Parameter
@@ -21,6 +37,4 @@
 NetworkParameterPage.PleaseEnterPort=Please enter a port. The default LDAP port is 389.
 NetworkParameterPage.UseSSLEncryption=Use SSL encryption (ldaps://)
 NetworkParameterPage.UseStartTLS=Use StartTLS extension
-NetworkParameterPage.WarningCertificateValidation=Warning:\n\
- The current version doesn't support certificate validation, \n\
- aware of invalid certificates or man-in-the-middle attacks\!
+NetworkParameterPage.WarningCertificateValidation=Warning\:\nThe current version doesn't
support certificate validation, \naware of invalid certificates or man-in-the-middle attacks\!

Modified: directory/studio/trunk/connection-ui/src/main/resources/org/apache/directory/studio/connection/ui/widgets/messages_de.properties
URL: http://svn.apache.org/viewvc/directory/studio/trunk/connection-ui/src/main/resources/org/apache/directory/studio/connection/ui/widgets/messages_de.properties?rev=720772&r1=720771&r2=720772&view=diff
==============================================================================
--- directory/studio/trunk/connection-ui/src/main/resources/org/apache/directory/studio/connection/ui/widgets/messages_de.properties
(original)
+++ directory/studio/trunk/connection-ui/src/main/resources/org/apache/directory/studio/connection/ui/widgets/messages_de.properties
Wed Nov 26 01:19:53 2008
@@ -1,3 +1,20 @@
+# 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.
+
 AuthenticationParameterPage.BindDNOrUser=Bind DN oder Benutzer\:
 AuthenticationParameterPage.AuthenticationMethod=Authentifizierungs-Methode
 AuthenticationParameterPage.AuthenticationParameter=Authentifizierungs-Parameter
@@ -10,8 +27,7 @@
 AuthenticationParameterPage.SavePassword=Passwort speichern
 NetworkParameterPage.CheckNetworkParameter=Netzwerkparameter \u00FCberpr\u00FCfen
 NetworkParameterPage.ConnectionEstablished=Die Verbindung wurde erfolgreich aufgebaut.
-NetworkParameterPage.ConnectionExistsEnd=' existiert bereits.
-NetworkParameterPage.ConnectionExistsStart=Eine Verbindung mit dem Namen '
+NetworkParameterPage.ConnectionExists=Eine Verbindung mit dem Namen "{0}" existiert bereits.
 NetworkParameterPage.ConnectionName=Verbindungsname\:
 NetworkParameterPage.EncryptionMethod=Verschl\u00FCsselungs-Methode\:
 NetworkParameterPage.NetworkParameter=Netzwerkparameter
@@ -21,6 +37,4 @@
 NetworkParameterPage.PleaseEnterPort=Geben Sie bitte einen Port ein. LDAP Standard ist Port
389.
 NetworkParameterPage.UseSSLEncryption=Verwende SSL Verschl\u00FCsselung (ldaps\://)
 NetworkParameterPage.UseStartTLS=Verwende StartTLS Erweiterung
-NetworkParameterPage.WarningCertificateValidation=Warnung:\n\
- Die aktuelle Version unterst\u00FCtzt Zertifikat\u00FCberpr\u00FCfung nicht,\n\
- sind Sie sich der Gefahr von ung\u00FCltigen Zertifikaten order 'man-in-the-middle' Angriffen
bewusst\!
+NetworkParameterPage.WarningCertificateValidation=Warnung\:\nDie aktuelle Version unterst\u00FCtzt
Zertifikat\u00FCberpr\u00FCfung nicht,\nsind Sie sich der Gefahr von ung\u00FCltigen Zertifikaten
order 'man-in-the-middle' Angriffen bewusst\!

Modified: directory/studio/trunk/connection-ui/src/main/resources/org/apache/directory/studio/connection/ui/wizards/messages.properties
URL: http://svn.apache.org/viewvc/directory/studio/trunk/connection-ui/src/main/resources/org/apache/directory/studio/connection/ui/wizards/messages.properties?rev=720772&r1=720771&r2=720772&view=diff
==============================================================================
--- directory/studio/trunk/connection-ui/src/main/resources/org/apache/directory/studio/connection/ui/wizards/messages.properties
(original)
+++ directory/studio/trunk/connection-ui/src/main/resources/org/apache/directory/studio/connection/ui/wizards/messages.properties
Wed Nov 26 01:19:53 2008
@@ -1 +1,18 @@
+# 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.
+
 NewConnectionWizard.NewLdapConnection=New LDAP Connection

Modified: directory/studio/trunk/connection-ui/src/main/resources/org/apache/directory/studio/connection/ui/wizards/messages_de.properties
URL: http://svn.apache.org/viewvc/directory/studio/trunk/connection-ui/src/main/resources/org/apache/directory/studio/connection/ui/wizards/messages_de.properties?rev=720772&r1=720771&r2=720772&view=diff
==============================================================================
--- directory/studio/trunk/connection-ui/src/main/resources/org/apache/directory/studio/connection/ui/wizards/messages_de.properties
(original)
+++ directory/studio/trunk/connection-ui/src/main/resources/org/apache/directory/studio/connection/ui/wizards/messages_de.properties
Wed Nov 26 01:19:53 2008
@@ -1 +1,18 @@
+# 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.
+
 NewConnectionWizard.NewLdapConnection=Neue LDAP Verbindung



Mime
View raw message