#92380#,#91564# New dialog with unique hid and fixed text

1 files changed, 7 insertions, 95 deletions

diff --git a/uui/source/passworddlg.src b/uui/source/passworddlg.src
index 1ae60e635c6b..9dd746317b4c 100644
--- a/uui/source/passworddlg.src
+++ b/uui/source/passworddlg.src
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: passworddlg.src,v $
  *
- *  $Revision: 1.20 $
+ *  $Revision: 1.21 $
  *
- *  last change: $Author: kz $ $Date: 2001-09-25 21:03:42 $
+ *  last change: $Author: mav $ $Date: 2001-10-11 06:53:03 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -75,42 +75,14 @@ ModalDialog DLG_UUI_PASSWORD
     Moveable = TRUE ;
     OutputSize = TRUE ;
     SVLook = TRUE ;
-    Size = MAP_APPFONT ( 265 , 100 ) ;
-    Text = "Bitte Hauptkennwort eingeben";
+    Size = MAP_APPFONT ( 265 , 64 ) ;
+    Text = "Hauptkennwort festlegen";
     Text [ English ] = "Please enter master password";
-    FixedText INFO_ENTER_PASSWORD
-    {
-        Pos = MAP_APPFONT ( 12 , 14 ) ;
-        Size = MAP_APPFONT ( 185 , 18 ) ;
-        WordBreak = TRUE ;
-        Text = "Bitte geben sie ein Hauptkennwort ein oder beenden Sie diesen Dialog mit abbrechen um nicht mit den gespeicherten Passw�rtern zu arbeiten" ;
-        Text [ English ] = "Please enter master password or press cancel to stop working with passwords storage" ;
-        Text[ english_us ] = "Please enter a master password. Only click 'Cancel' if you do not want to have any passwords stored.";
-        Text[ portuguese ] = "Indique uma senha principal ou clique em Cancelar para sair desta caixa de di�logo, se n�o desejar trabalhar com as senhas guardadas.";
-        Text[ russian ] = "������� ������� ������ � �������� �� 'OK'. ���� �� �� ������ ��������� ������, �������� ���� ������ ������� '������'.";
-        Text[ greek ] = "Please enter master password or press cancel to stop working with passwords storage";
-        Text[ dutch ] = "Typ het hoofdwachtwoord of be�indig deze dialoog met Annuleren als u niet met de opgeslagen wachtwoorden wilt werken.";
-        Text[ french ] = "Saisissez un mot de passe principal ou cliquez sur Annuler pour quitter la bo�te de dialogue si vous ne souhaitez pas enregistrer de mot de passe.";
-        Text[ spanish ] = "Introduzca por favor una contrase�a principal o cierre este di�logo con Cancelar para no trabajar con las contrase�as guardadas.";
-        Text[ finnish ] = "Please enter master password or press cancel to stop working with passwords storage";
-        Text[ italian ] = "Digitate la password principale oppure chiudete il dialogo con Annulla per non lavorare con la password registrata.";
-        Text[ danish ] = "Please enter master password or press cancel to stop working with passwords storage";
-        Text[ swedish ] = "Ange ett huvudl�senord eller avsluta den h�r dialogrutan med \"Avbryt\" om du inte vill arbeta med de sparade l�senorden";
-        Text[ polish ] = "Wpisz has�o g��wne. Przycisk 'Anuluj' nale�y klikn�� tylko wtedy, je�eli has�a nie maj� zosta� zapisane.";
-        Text[ portuguese_brazilian ] = "Please enter master password or press cancel to stop working with passwords storage";
-        Text[ japanese ] = "ﾏｽﾀｰﾊﾟｽﾜｰﾄﾞを入力してください。あるいは保存したﾊﾟｽﾜｰﾄﾞを設定しないよう［ｷｬﾝｾﾙ］ﾎﾞﾀﾝでこのﾀﾞｲｱﾛｸﾞを閉じてください。";
-        Text[ korean ] = "마스터 패스워드를 입력하거나 취소 버튼을 눌러 패스워드 저장 작업을 중지하십시오";
-        Text[ chinese_simplified ] = "请输入一个主密码。如不想使用存盘的密码就点击对话框内的取消按钮，关闭这个对话框。";
-        Text[ chinese_traditional ] = "請輸入一個主密碼。若不想使用儲存的密碼，就按對話方塊内的取消按鈕，關閉這個對話方塊。";
-        Text[ turkish ] = "Please enter master password or press cancel to stop working with passwords storage";
-        Text[ arabic ] = "Please enter master password or press cancel to stop working with passwords storage";
-        Text[ catalan ] = "Please enter master password or press cancel to stop working with passwords storage";
-    };
     FixedText FT_MASTERPASSWORD
     {
-        Pos = MAP_APPFONT ( 12 , 52 ) ;
+        Pos = MAP_APPFONT ( 12 , 27 ) ;
         Size = MAP_APPFONT ( 71 , 10 ) ;
-        Text = "Haupkennwort" ;
+        Text = "Hauptkennwort" ;
         Text [ English ] = "Master ~password" ;
         Text[ english_us ] = "Master password";
         Text[ portuguese ] = "Senha principal";
@@ -136,41 +108,7 @@ ModalDialog DLG_UUI_PASSWORD
     Edit ED_MASTERPASSWORD
     {
         Border = TRUE ;
-        Pos = MAP_APPFONT ( 86 , 51 ) ;
-        Size = MAP_APPFONT ( 94 , 12 ) ;
-        PassWord = TRUE ;
-    };
-    FixedText FT_MASTERPASSWORD_REPEAT
-    {
-        Pos = MAP_APPFONT ( 12 , 72 ) ;
-        Size = MAP_APPFONT ( 71 , 10 ) ;
-        Text = "Hauptkennwort ~best�tigen" ;
-        Text [ English ] = "~Confirm master password" ;
-        Text[ english_us ] = "~Confirm master password";
-        Text[ portuguese ] = "~Confirmar senha principal";
-        Text[ russian ] = "~����������� ������� ������";
-        Text[ greek ] = "~Confirm master password";
-        Text[ dutch ] = "~Hoofdwachtwoord bevestigen";
-        Text[ french ] = "Confirmer le mot de passe principal";
-        Text[ spanish ] = "~Confirmar contrase�a principal";
-        Text[ finnish ] = "~Confirm master password";
-        Text[ italian ] = "~Conferma password principale";
-        Text[ danish ] = "~Confirm master password";
-        Text[ swedish ] = "~Bekr�fta huvudl�senord";
-        Text[ polish ] = "~Potwierd� has�o g��wne";
-        Text[ portuguese_brazilian ] = "~Confirm master password";
-        Text[ japanese ] = "ﾏｽﾀｰﾊﾟｽﾜｰﾄﾞの確認(~C)";
-        Text[ korean ] = "마스터 패스워드 확인(C)";
-        Text[ chinese_simplified ] = "确认主密码(~C)";
-        Text[ chinese_traditional ] = "確認主密碼(~C)";
-        Text[ turkish ] = "~Confirm master password";
-        Text[ arabic ] = "~Confirm master password";
-        Text[ catalan ] = "~Confirm master password";
-    };
-    Edit ED_MASTERPASSWORD_REPEAT
-    {
-        Border = TRUE ;
-        Pos = MAP_APPFONT ( 86 , 71 ) ;
+        Pos = MAP_APPFONT ( 86 , 26 ) ;
         Size = MAP_APPFONT ( 94 , 12 ) ;
         PassWord = TRUE ;
     };
@@ -213,32 +151,6 @@ ModalDialog DLG_UUI_PASSWORD
     Text[ catalan ] = "Please enter master password";
 };
 
-String STR_ERROR_PASSWORDS_NOT_IDENTICAL
-{
-    Text = "Die beiden Kennw�rter stimmen nicht �berein, bitte noch einmal eingeben!" ;
-    Text [ English ] = "Passwords are different, please enter again!" ;
-    Text[ english_us ] = "The passwords do not match. Please enter the password again.";
-    Text[ portuguese ] = "As senhas n�o s�o iguais. Indique-as novamente.";
-    Text[ russian ] = "������ �� ���������. ��������� ����.";
-    Text[ greek ] = "Passwords are different, please enter again!";
-    Text[ dutch ] = "De beide wachtwoorden komen niet overeen. Nogmaals invoeren!";
-    Text[ french ] = "Les deux mots de passe sont diff�rents. R�p�tez la saisie !";
-    Text[ spanish ] = "Las dos contrase�as no coinciden. Introd�zcalas otra vez.";
-    Text[ finnish ] = "Passwords are different, please enter again!";
-    Text[ italian ] = "Le due password non coincidono. Digitate di nuovo la password.";
-    Text[ danish ] = "Passwords are different, please enter again!";
-    Text[ swedish ] = "De b�da l�senorden st�mmer inte �verens, mata in l�senordet igen!";
-    Text[ polish ] = "Podane has�a nie zgadzaj� si�! Nale�y wpisa� je ponownie.";
-    Text[ portuguese_brazilian ] = "Passwords are different, please enter again!";
-    Text[ japanese ] = "入力した２つのﾊﾟｽﾜｰﾄﾞは一致しません。もう一度入力しなおしてください。";
-    Text[ korean ] = "패스워드가 다릅니다. 다시 입력하십시오!";
-    Text[ chinese_simplified ] = "这两个密码不一致，请重新输入密码！";
-    Text[ chinese_traditional ] = "這兩個密碼不一致，請重新輸入！";
-    Text[ turkish ] = "Passwords are different, please enter again!";
-    Text[ arabic ] = "Passwords are different, please enter again!";
-    Text[ catalan ] = "Passwords are different, please enter again!";
-};
-
 String STR_ERROR_PASSWORD_WRONG
 {
     Text = "Sie haben ein falsches Hauptkennwort eingegeben, bitte noch einmal eingeben!" ;