INTEGRATION: CWS dba22ui (1.2.122); FILE MERGED

2006/12/04 11:17:28 fs 1.2.122.2: #i71773#
2006/10/25 10:14:53 fs 1.2.122.1: #i62664# STR_CANNOT_CONVERT_STRING

1 files changed, 49 insertions, 5 deletions

diff --git a/connectivity/source/resource/conn_shared_res.src b/connectivity/source/resource/conn_shared_res.src
index 449af69f6259..c7d0a45b76d2 100644
--- a/connectivity/source/resource/conn_shared_res.src
+++ b/connectivity/source/resource/conn_shared_res.src
@@ -4,9 +4,9 @@
  *
  *  $RCSfile: conn_shared_res.src,v $
  *
- *  $Revision: 1.2 $
+ *  $Revision: 1.3 $
  *
- *  last change: $Author: obo $ $Date: 2006-03-29 12:20:59 $
+ *  last change: $Author: kz $ $Date: 2006-12-13 16:25:28 $
  *
  *  The Contents of this file are made available subject to
  *  the terms of GNU Lesser General Public License Version 2.1.
@@ -33,9 +33,12 @@
  *
  ************************************************************************/
 
-#ifndef CONNECTIVITY_SHARED_RES_HRC
-#include "conn_shared_res.hrc"
-#endif
+#include "resource/common_res.hrc"
+#include "resource/mozab_res.hrc"
+
+// ============================================================================
+// = the mozab driver's resource strings
+// ============================================================================
 
 String STR_NO_MOZIILA_ADDRESSBOOK
 {
@@ -126,3 +129,44 @@ String STR_CANT_FIND_CARD_FOR_ROW
     Text [ de ] = "Die Karte für die angeforderte Zeile wurde nicht gefunden.";
     Text [ en-US ] = "Can't find the card for the requested row.";
 };
+
+// ============================================================================
+// = common strings
+// ============================================================================
+
+String STR_STRING_LENGTH_EXCEEDED
+{
+    Text [ de ] = "Die Zeichenkette '$string$' ist länger als $maxlen$ Zeichen, nachdem sie in den Ziel-Zeichensatz '$charset$' konvertiert wurde.";
+    Text [ en-US ] = "The string '$string$' exceeds the maximum length of $maxlen$ characters when converted to the target character set '$charset$'.";
+};
+
+String STR_CANNOT_CONVERT_STRING
+{
+    Text [ de ] = "Die Zeichenkette '$string$' kann nicht in den Zeichensatz '$charset' konvertiert werden.";
+    Text [ en-US ] = "The string '$string$' cannot be converted using the encoding '$charset'.";
+};
+
+String STR_URI_SYNTAX_ERROR
+{
+    Text [ de ] = "Die Verbindungs-URL ist ungültig.";
+    Text [ en-US ] = "The connection URL is invalid.";
+};
+
+String STR_NO_HOSTNAME
+{
+    Text [ de ] = "Es wurde kein Server-Name angegeben.";
+    Text [ en-US ] = "No hostname was provided.";
+};
+
+String STR_NO_BASEDN
+{
+    Text [ de ] = "Es wurde keine Basis DN angegeben.";
+    Text [ en-US ] = "No Base DN was provided.";
+    Text [ x-comment ] = "'Base DN' is a technical term related to LDAP servers.";
+};
+
+String STR_COULD_NOT_CONNECT_LDAP
+{
+    Text [ de ] = "Die Verbindung zum LDAP-Server konnte nicht hergestellt werden.";
+    Text [ en-US ] = "The connection to the LDAP server could not be established.";
+};