INTEGRATION: CWS mergebuild (1.36.16); FILE MERGED

2004/04/21 01:14:10 hjs 1.36.16.4: RESYNC: (1.36-1.37); FILE MERGED
2004/02/23 13:00:52 ihi 1.36.16.3: Merge-While-Build update
2003/11/11 19:27:10 ihi 1.36.16.2: en -> en-US
2003/11/10 18:02:06 ihi 1.36.16.1: #111234# Merge during build

1 files changed, 22 insertions, 292 deletions

diff --git a/uui/source/logindlg.src b/uui/source/logindlg.src
index af84bf49abc4..a652f834d1aa 100644
--- a/uui/source/logindlg.src
+++ b/uui/source/logindlg.src
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: logindlg.src,v $
  *
- *  $Revision: 1.37 $
+ *  $Revision: 1.38 $
  *
- *  last change: $Author: vg $ $Date: 2003-12-17 18:40:57 $
+ *  last change: $Author: hjs $ $Date: 2004-06-26 03:13:06 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -77,8 +77,7 @@ ModalDialog DLG_UUI_LOGIN
     OutputSize = TRUE ;
     SVLook = TRUE ;
     Size = MAP_APPFONT ( 265 , 158 ) ;
-    Text = "Benutzername und Kennwort erforderlich" ;
-    Text [ English ] = "User Name and Password required" ;
+    Text [ de ] = "Benutzername und Kennwort erforderlich" ;
     FixedText INFO_LOGIN_ERROR
     {
         Pos = MAP_APPFONT ( 12 , 14 ) ;
@@ -89,104 +88,23 @@ ModalDialog DLG_UUI_LOGIN
     {
         Pos = MAP_APPFONT ( 6 , 3 ) ;
         Size = MAP_APPFONT ( 197 , 8 ) ;
-        Text = "Meldung vom Server" ;
-        Text [ English ] = "Report from server" ;
-        Text [ english_us ] = "Message from server" ;
-        Text [ portuguese_brazilian ] = "Mensagem do servidor" ;
-        Text [ swedish ] = "Meddelande fr�n servern" ;
-        Text [ danish ] = "Meddelelse fra server" ;
-        Text [ italian ] = "Segnalazione dal server" ;
-        Text [ spanish ] = "Mensaje del servidor" ;
-        Text [ french ] = "Message en provenance du serveur" ;
-        Text [ dutch ] = "Servermelding" ;
-        Text [ portuguese ] = "Mensagem do servidor" ;
-        Text[ chinese_simplified ] = "服务器报告";
-        Text[ russian ] = "��������� � �������";
-        Text[ polish ] = "Wiadomo�� z serwera";
-        Text[ japanese ] = "サーバーからのメッセージ";
-        Text[ chinese_traditional ] = "伺服器報告";
-        Text[ greek ] = "������ ��� �� ����������";
-        Text[ korean ] = "서버로부터 메시지";
-        Text[ arabic ] = "����� �� �������";
-        Text[ turkish ] = "Sunucudan gelen mesaj";
-        Text[ catalan ] = "Missatge del servidor";
-        Text[ finnish ] = "Sanoma palvelimelta";
-        Text[ thai ] = "ข้อความจากเซิร์ฟเวอร์";
-        Text[ czech ] = "Zpráva ze serveru";
-        Text[ hebrew ] = "‮הודעה מהשרת‬";
-        Text[ hindi ] = "सर्वर से संदेश";
-        Text[ slovak ] = "Hlásenie serveru";
-        Text[ hungarian ] = "Üzenet a kiszolgálótól";
-        Text[ slovenian ] = "Sporočilo s strežnika";
+        Text [ de ] = "Meldung vom Server" ;
+        Text [ en-US ] = "Message from server" ;
     };
     FixedText INFO_LOGIN_REQUEST
     {
         Pos = MAP_APPFONT ( 12 , 55 ) ;
         Size = MAP_APPFONT ( 185 , 18 ) ;
         WordBreak = TRUE ;
-        Text = "Bitte geben Sie hier Benutzernamen und Kennwort f�r %1 ein." ;
-        Text [ English ] = "Please enter user name and password here for %1." ;
-        Text [ portuguese ] = "Indique o nome do utilizador e a senha para %1." ;
-        Text [ english_us ] = "Enter the user name and password for %1 here." ;
-        Text [ portuguese_brazilian ] = "Indique aqui o nome do usu�rio e a senha para %1." ;
-        Text [ swedish ] = "Mata in anv�ndarnamn och l�senord h�r f�r %1." ;
-        Text [ danish ] = "Indtast brugernavn og adgangskode for %1 her." ;
-        Text [ italian ] = "Digitate qui il nome dell'utente e la password per %1." ;
-        Text [ spanish ] = "Especifique el nombre de usuario y la contrase�a para %1." ;
-        Text [ french ] = "Saisissez vos nom d'utilisateur et mot de passe pour %1." ;
-        Text [ dutch ] = "Voer hier de gebruikersnaam en het wachtwoord voor %1 in." ;
-        Text[ chinese_simplified ] = "请您在此为 %1 输入使用名和密码。";
-        Text[ russian ] = "������� ��� ������������ � ������ ��� %1.";
-        Text[ polish ] = "Wprowad� tutaj nazw� u�ytkownika i has�o do %1.";
-        Text[ japanese ] = "%1 のユーザー名とパスワードをここに入力してください。";
-        Text[ chinese_traditional ] = "請爲 %1 輸入使用者名稱和密碼。";
-        Text[ greek ] = "�������� ���������� ��� �� ����� ��� ������ ��� ��� ������ ��������� ��� �� %1.";
-        Text[ korean ] = "%1의 사용자 이름과 암호를 입력하십시오.";
-        Text[ arabic ] = "������ ����� ��� �������� ����� ���� �� %1 ���.";
-        Text[ turkish ] = "%1 i�in kullan�c� ad� ve parolay� buraya girin.";
-        Text[ catalan ] = "Especifiqueu el nom d'usuari i contrasenya per %1.";
-        Text[ finnish ] = "Kirjoita kohteen %1 k�ytt�j�tunnus ja salasana t�h�n.";
-        Text[ thai ] = "ใส่ชื่อผู้ใช้และรหัสผ่าน %1 ที่นี่";
-        Text[ czech ] = "Zde zadejte uživatelské jméno a heslo pro %1.";
-        Text[ hebrew ] = "‮נא להקליד את שם המשתמש והססמה עבור %1 כאן.‬";
-        Text[ hindi ] = "%1 के लिए यहाँ पर उपभोक्ता का नाम और कूटशब्द प्रविष्ट करो ।";
-        Text[ slovak ] = "Sem zadajte užívateľské meno a heslo pre %1.";
-        Text[ hungarian ] = "Írja be a felhasználói nevét és a jelszavát a következőhöz: %1";
-        Text[ slovenian ] = "Tu vnesite uporabniško ime in geslo za %1.";
+        Text [ de ] = "Bitte geben Sie hier Benutzernamen und Kennwort f�r %1 ein." ;
+        Text [ en-US ] = "Enter the user name and password for %1 here." ;
     };
     FixedText FT_LOGIN_PATH
     {
         Pos = MAP_APPFONT ( 12 , 77 ) ;
         Size = MAP_APPFONT ( 57 , 10 ) ;
-        Text = "~Pfad" ;
-        Text [ English ] = "~Path" ;
-        Text [ english_us ] = "~Path" ;
-        Text [ portuguese_brazilian ] = "~Caminho" ;
-        Text [ swedish ] = "S�~kv�g" ;
-        Text [ danish ] = "~Sti" ;
-        Text [ italian ] = "~Percorso" ;
-        Text [ spanish ] = "~Ruta" ;
-        Text [ french ] = "Chemin" ;
-        Text [ dutch ] = "~Pad" ;
-        Text [ portuguese ] = "~Atalho" ;
-        Text[ chinese_simplified ] = "路径(~P)";
-        Text[ russian ] = "����";
-        Text[ polish ] = "�cie�~ka";
-        Text[ japanese ] = "パス(~P)";
-        Text[ chinese_traditional ] = "路徑(~P)";
-        Text[ greek ] = "��������";
-        Text[ korean ] = "경로(~P)";
-        Text[ arabic ] = "������";
-        Text[ turkish ] = " ~Dizin";
-        Text[ catalan ] = "~Cam�";
-        Text[ finnish ] = "~Polku";
-        Text[ thai ] = "เ~ส้นทาง";
-        Text[ czech ] = "Cesta";
-        Text[ hebrew ] = "‮מסלול ספריות‬";
-        Text[ hindi ] = "~मार्ग";
-        Text[ slovak ] = "Ce~sta";
-        Text[ hungarian ] = "Ú~tvonal";
-        Text[ slovenian ] = "~Pot";
+        Text [ de ] = "~Pfad" ;
+        Text [ en-US ] = "~Path" ;
     };
     Edit ED_LOGIN_PATH
     {
@@ -210,35 +128,8 @@ ModalDialog DLG_UUI_LOGIN
     {
         Pos = MAP_APPFONT ( 12 , 92 ) ;
         Size = MAP_APPFONT ( 57 , 10 ) ;
-        Text = "~Benutzername" ;
-        Text [ English ] = "~Username" ;
-        Text [ english_us ] = "~User name" ;
-        Text [ portuguese_brazilian ] = "~Nome de usu�rio" ;
-        Text [ swedish ] = "~Anv�ndarnamn" ;
-        Text [ danish ] = "~Brugernavn" ;
-        Text [ italian ] = "Nome ~utente" ;
-        Text [ spanish ] = "~Nombre del usuario" ;
-        Text [ french ] = "~Nom d'utilisateur" ;
-        Text [ dutch ] = "~Gebruikersnaam" ;
-        Text [ portuguese ] = "~Nome do utilizador" ;
-        Text[ chinese_simplified ] = "使用名(~U)";
-        Text[ russian ] = "��� ������������";
-        Text[ polish ] = "Nazwa ~u�ytkownika";
-        Text[ japanese ] = "ユーザー名(~U)";
-        Text[ chinese_traditional ] = "使用者名稱(~U)";
-        Text[ greek ] = "����� ������";
-        Text[ korean ] = "사용자 이름(~U)";
-        Text[ arabic ] = "��� ��������";
-        Text[ turkish ] = "~Kullan�c� ad�";
-        Text[ catalan ] = "Nom d'~usuari";
-        Text[ finnish ] = "K~�ytt�j�tunnus";
-        Text[ thai ] = "ชื่อ~ผู้ใช้";
-        Text[ czech ] = "Uživatelské jméno";
-        Text[ hebrew ] = "‮שם משתמש‬";
-        Text[ hindi ] = "~उपभोक्ता का नाम";
-        Text[ slovak ] = "~Užívateľské meno";
-        Text[ hungarian ] = "~Felhasználói név";
-        Text[ slovenian ] = "~Uporabniško ime";
+        Text [ de ] = "~Benutzername" ;
+        Text [ en-US ] = "~User name" ;
     };
     Edit ED_LOGIN_USERNAME
     {
@@ -256,35 +147,8 @@ ModalDialog DLG_UUI_LOGIN
     {
         Pos = MAP_APPFONT ( 12 , 107 ) ;
         Size = MAP_APPFONT ( 57 , 10 ) ;
-        Text = "P~asswort" ;
-        Text [ English ] = "P~assword" ;
-        Text [ english_us ] = "Pass~word" ;
-        Text [ portuguese_brazilian ] = "~Senha" ;
-        Text [ swedish ] = "L�sen~ord" ;
-        Text [ danish ] = "A~dgangskode" ;
-        Text [ italian ] = "P~assword" ;
-        Text [ spanish ] = "~Contrase�a" ;
-        Text [ french ] = "~Mot de passe" ;
-        Text [ dutch ] = "W~achtwoord" ;
-        Text [ portuguese ] = "~Senha" ;
-        Text[ chinese_simplified ] = "密码(~W)";
-        Text[ russian ] = "������";
-        Text[ polish ] = "~Has�o";
-        Text[ japanese ] = "パスワード(~W)";
-        Text[ chinese_traditional ] = "密碼(~W)";
-        Text[ greek ] = "������� �����~����";
-        Text[ korean ] = "암호(~W)";
-        Text[ arabic ] = "���� ����";
-        Text[ turkish ] = "~Parola";
-        Text[ catalan ] = "Contra~senya";
-        Text[ finnish ] = "Sala~sana";
-        Text[ thai ] = "รหัส~ผ่าน";
-        Text[ czech ] = "Heslo";
-        Text[ hebrew ] = "‮סיסמה‬";
-        Text[ hindi ] = "कूट~शब्द";
-        Text[ slovak ] = "He~slo";
-        Text[ hungarian ] = "~Jelszó";
-        Text[ slovenian ] = "Ges~lo";
+        Text [ de ] = "P~asswort" ;
+        Text [ en-US ] = "Pass~word" ;
     };
     Edit ED_LOGIN_PASSWORD
     {
@@ -297,35 +161,8 @@ ModalDialog DLG_UUI_LOGIN
     {
         Pos = MAP_APPFONT ( 12 , 122 ) ;
         Size = MAP_APPFONT ( 57 , 10 ) ;
-        Text = "A~ccount" ;
-        Text [ English ] = "A~ccount" ;
-        Text[ english_us ] = "A~ccount";
-        Text[ portuguese ] = "~Conta";
-        Text[ russian ] = "������� ������";
-        Text[ dutch ] = "A~ccount";
-        Text[ french ] = "C~ompte";
-        Text[ spanish ] = "~Cuenta";
-        Text[ italian ] = "A~ccount";
-        Text[ danish ] = "K~onto";
-        Text[ swedish ] = "~Konto";
-        Text[ polish ] = "~Konto";
-        Text[ portuguese_brazilian ] = "~Conta";
-        Text[ japanese ] = "アカウント(~C)";
-        Text[ chinese_simplified ] = "帐号(~C)";
-        Text[ chinese_traditional ] = "帳號(~C)";
-        Text[ greek ] = "����������~�";
-        Text[ korean ] = "계정(~C)";
-        Text[ arabic ] = "������";
-        Text[ turkish ] = "~Hesap";
-        Text[ catalan ] = "~Compte";
-        Text[ finnish ] = "T~ili";
-        Text[ thai ] = "บั~ญชีผู้ใช้";
-        Text[ czech ] = "Účet";
-        Text[ hebrew ] = "‮חשבון‬";
-        Text[ hindi ] = "हि~साब";
-        Text[ slovak ] = "Úč~et";
-        Text[ hungarian ] = "~Fiók";
-        Text[ slovenian ] = "R~ačun";
+        Text [ de ] = "A~ccount" ;
+        Text [ en-US ] = "A~ccount";
     };
     Edit ED_LOGIN_ACCOUNT
     {
@@ -338,69 +175,15 @@ ModalDialog DLG_UUI_LOGIN
     {
         Pos = MAP_APPFONT ( 12 , 136 ) ;
         Size = MAP_APPFONT ( 185 , 10 ) ;
-        Text = "Kennwort ~speichern" ;
-        Text [ English ] = "~Save password" ;
-        Text [ english_us ] = "~Save password" ;
-        Text [ italian ] = "Memorizza pa~ssword" ;
-        Text [ spanish ] = "Guardar ~contrase�a" ;
-        Text [ french ] = "Enregistrement du mot de passe" ;
-        Text [ dutch ] = "Wachtwoord ~opslaan" ;
-        Text [ swedish ] = "~Spara l�senord" ;
-        Text [ danish ] = "~Gem adgangskode" ;
-        Text [ portuguese ] = "Guardar ~senha" ;
-        Text [ portuguese_brazilian ] = "Salvar ~senha" ;
-        Text[ chinese_simplified ] = "存盘密码(~S)";
-        Text[ russian ] = "��������� ������";
-        Text[ polish ] = "~Zapisz has�o";
-        Text[ japanese ] = "パスワードの保存(~S)";
-        Text[ chinese_traditional ] = "儲存密碼(~S)";
-        Text[ greek ] = "��������~�� ������� ���������";
-        Text[ korean ] = "암호 저장(~S)";
-        Text[ arabic ] = "��� ���� ����";
-        Text[ turkish ] = "Parola ~sakla";
-        Text[ catalan ] = "~Desa la contrasenya";
-        Text[ finnish ] = "~Tallenna salasana";
-        Text[ thai ] = "~บันทึกรหัสผ่าน";
-        Text[ czech ] = "Uložit heslo";
-        Text[ hebrew ] = "‮שמירת סיסמה‬";
-        Text[ hindi ] = "कूटशब्द ~संचित करो";
-        Text[ slovak ] = "Uložiť he~slo";
-        Text[ hungarian ] = "Jelszó menté~se";
-        Text[ slovenian ] = "~Shrani geslo";
+        Text [ de ] = "Kennwort ~speichern" ;
+        Text [ en-US ] = "~Save password" ;
     };
     FixedLine GB_LOGIN_LOGIN
     {
         Pos = MAP_APPFONT ( 7 , 44 ) ;
         Size = MAP_APPFONT ( 197 , 8 ) ;
-        Text = "Anmelden" ;
-        Text [ English ] = "Connect" ;
-        Text [ english_us ] = "Log in" ;
-        Text [ portuguese_brazilian ] = "Login" ;
-        Text [ swedish ] = "Logga in" ;
-        Text [ danish ] = "Log ind" ;
-        Text [ italian ] = "Log in" ;
-        Text [ spanish ] = "Registrarse" ;
-        Text [ french ] = "Login" ;
-        Text [ dutch ] = "Aanmelden" ;
-        Text [ portuguese ] = "Login" ;
-        Text[ chinese_simplified ] = "登录";
-        Text[ russian ] = "���� � �������";
-        Text[ polish ] = "Zalogowanie";
-        Text[ japanese ] = "ログイン";
-        Text[ chinese_traditional ] = "登入";
-        Text[ greek ] = "�������";
-        Text[ korean ] = "로그인";
-        Text[ arabic ] = "����� ������";
-        Text[ turkish ] = "Oturum a�";
-        Text[ catalan ] = "Registreu-vos";
-        Text[ finnish ] = "Kirjaudu sis��n";
-        Text[ thai ] = "เข้าสู่ระบบ";
-        Text[ czech ] = "Přihlásit se";
-        Text[ hebrew ] = "‮לוג און‬";
-        Text[ hindi ] = "लॉग इन";
-        Text[ slovak ] = "Prihlásiť sa";
-        Text[ hungarian ] = "Bejelentkezés";
-        Text[ slovenian ] = "Prijava";
+        Text [ de ] = "Anmelden" ;
+        Text [ en-US ] = "Log in" ;
     };
     OKButton BTN_LOGIN_OK
     {
@@ -420,63 +203,10 @@ ModalDialog DLG_UUI_LOGIN
     };
     String STR_LOGIN_REALM
     {
-        Text = "Bitte geben Sie hier Benutzernamen und Kennwort f�r \"%2\" auf %1 ein." ;
-        Text [ English ] = "Please enter user name and password here for \"%2\" on %1." ;
-        Text [ portuguese ] = "Indique o nome do utilizador e a senha para %2 em %1." ;
-        Text [ english_us ] = "Please enter user name and password for \"%2\" on %1 here." ;
-        Text [ portuguese_brazilian ] = "Por favor, indique aqui o nome do usu�rio e a senha para %2 em %1." ;
-        Text [ swedish ] = "Mata in anv�ndarnamn och l�senord f�r \"%2\" p� %1 h�r." ;
-        Text [ danish ] = "Indtast brugernavn og adgangskode for \"%2\" p� %1 her." ;
-        Text [ italian ] = "Digitate qui il nome dell'utente e la password per \"%2\" su %1." ;
-        Text [ spanish ] = "Especifique el nombre de usuario y la contrase�a para \"%2\" en %1." ;
-        Text [ french ] = "Saisissez vos nom d'utilisateur et mot de passe pour \"%2\" sur %1." ;
-        Text [ dutch ] = "Voer hier de gebruikersnaam en het wachtwoord voor \"%2\" op %1 in." ;
-        Text[ chinese_simplified ] = "请在此为 %1 输入 \"%2\" 的使用名和密码。";
-        Text[ russian ] = "������� ��� � ������ ������������ ��� \"%2\" � %1.";
-        Text[ polish ] = "Podaj nazw� u�ytkownika i has�o dla \"%2\" na %1.";
-        Text[ japanese ] = "%1 の \"%2\" に必要なユーザー名とパスワードをここに入力してください。";
-        Text[ chinese_traditional ] = "請在這裡爲 %1 輸入 %2 的使用者名稱和密碼。";
-        Text[ greek ] = "���������� ����� ������ ��� ������ ��������� ��� �� \"%2\" ��� %1 ���.";
-        Text[ korean ] = "여기에 %1의 %2에 필요한 사용자 이름과 암호를 입력하십시오.";
-        Text[ arabic ] = "���";
-        Text[ turkish ] = "%1 deki \"%2\" i�in kullan�c� ismi ve parolay� buraya girin.";
-        Text[ catalan ] = "a";
-        Text[ finnish ] = "Kirjoita k�ytt�j�tunnus ja salasana kohteelle \"%2\" kohteessa %1 t�h�n.";
-        Text[ thai ] = "ถึง ";
-        Text[ czech ] = "Prosím zadejte uživatelské jméno a heslo pro \"%2\" na %1.";
-        Text[ hebrew ] = "‮נא להקליד שם משתמש וססמה עבור \"%2\" על %1 כאן.‬";
-        Text[ hindi ] = "कृपया \"%2\" केलिए  %1 में यहाँ पर उपभोक्ता का नाम और कूटशब्द प्रविष्ट कीजिए । ";
-        Text[ slovak ] = "Prosím zadajte užívateľské meno a heslo pre \"%2\" na %1.";
-        Text[ hungarian ] = "Írja be ide a felhasználói nevet és a jelszót %1 helyen levő \"%2\" számára.";
-        Text[ slovenian ] = "Tu vnesite uporabniško ime in geslo za \"%2\" na %1.";
+        Text [ de ] = "Bitte geben Sie hier Benutzernamen und Kennwort f�r \"%2\" auf %1 ein." ;
+        Text [ en-US ] = "Please enter user name and password for \"%2\" on %1 here." ;
     };
-    Text [ english_us ] = "User Name and Password Required" ;
-    Text [ portuguese_brazilian ] = "S�o necess�rios o nome de usu�rio e a senha" ;
-    Text [ swedish ] = "Anv�ndarnamn och l�senord kr�vs" ;
-    Text [ danish ] = "Brugernavn og adgangskode er n�dvendig" ;
-    Text [ italian ] = "Nome utente e password sono necessari" ;
-    Text [ spanish ] = "Se requieren el nombre de usuario y la contrase�a" ;
-    Text [ french ] = "Nom d'utilisateur et mot de passe requis" ;
-    Text [ dutch ] = "Gebruikersnaam en wachtwoord vereist" ;
-    Text [ portuguese ] = "Requere-se nome de utilizador e senha" ;
-    Text[ chinese_simplified ] = "要求输入使用者名称和密码";
-    Text[ russian ] = "���������� ��� ������������ � ������";
-    Text[ polish ] = "Wymagana nazwa u�ytkownika i has�o.";
-    Text[ japanese ] = "ユーザー名とパスワードが必要";
-    Text[ chinese_traditional ] = "必須輸入使用名稱和密碼";
-    Text[ greek ] = "���������� �� ����� ��� ������ ��� � ������� ���������";
-    Text[ korean ] = "사용자 이름 및 암호 필요";
-    Text[ arabic ] = "����� ����� ��� �������� ����� ����";
-    Text[ turkish ] = "Kullan�c� Ad� ve Paralo Gereklidir";
-    Text[ catalan ] = "Es necessita el nom d'usuari i la contrasenya";
-    Text[ finnish ] = "K�ytt�j�tunnus ja salasana pakolliset";
-    Text[ thai ] = "ต้องการชื่อผู้ใช้และรหัสผ่าน";
-    Text[ czech ] = "Je vyžadováno uživatelské jméno a heslo";
-    Text[ hebrew ] = "‮שם משתמש וסיסמה נדרשים‬";
-    Text[ hindi ] = "उपभोक्ता का नाम और कूटशब्द चाहिए ";
-    Text[ slovak ] = "Je vyžadované užívateľské meno a heslo";
-    Text[ hungarian ] = "Felhasználói név és jelszó kötelező";
-    Text[ slovenian ] = "Potrebna sta uporabniško ime in geslo";
+    Text [ en-US ] = "User Name and Password Required" ;
 };