INTEGRATION: CWS mergebuild (1.6.16); FILE MERGED

2004/04/21 01:14:24 hjs 1.6.16.3: RESYNC: (1.6-1.7); FILE MERGED
2003/11/11 19:27:10 ihi 1.6.16.2: en -> en-US
2003/11/10 18:02:07 ihi 1.6.16.1: #111234# Merge during build

1 files changed, 6 insertions, 60 deletions

diff --git a/uui/source/masterpassworddlg.src b/uui/source/masterpassworddlg.src
index 70476721e93f..516a62d10c25 100644
--- a/uui/source/masterpassworddlg.src
+++ b/uui/source/masterpassworddlg.src
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: masterpassworddlg.src,v $
  *
- *  $Revision: 1.7 $
+ *  $Revision: 1.8 $
  *
- *  last change: $Author: vg $ $Date: 2003-12-17 18:41:27 $
+ *  last change: $Author: hjs $ $Date: 2004-06-26 03:13:58 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -76,41 +76,13 @@ ModalDialog DLG_UUI_MASTERPASSWORD
     OutputSize = TRUE ;
     SVLook = TRUE ;
     Size = MAP_APPFONT ( 265 , 64 ) ;
-    Text = "Hauptkennwort festlegen";
-    Text [ English ] = "Please enter master password";
+    Text [ de ] = "Hauptkennwort festlegen";
     FixedText FT_MASTERPASSWORD
     {
         Pos = MAP_APPFONT ( 12 , 27 ) ;
         Size = MAP_APPFONT ( 71 , 10 ) ;
-        Text = "Hauptkennwort" ;
-        Text [ English ] = "Master ~password" ;
-        Text[ english_us ] = "Master password";
-        Text[ portuguese ] = "Senha principal";
-        Text[ russian ] = "�������� ������";
-        Text[ greek ] = "Master ~password";
-        Text[ dutch ] = "Hoofdwachtwoord";
-        Text[ french ] = "Mot de passe principal";
-        Text[ spanish ] = "Contrase�a principal";
-        Text[ finnish ] = "Master ~password";
-        Text[ italian ] = "Password principale";
-        Text[ danish ] = "Hovedadgangskode";
-        Text[ swedish ] = "Huvudl�senord";
-        Text[ polish ] = "Has�o g��wne";
-        Text[ portuguese_brazilian ] = "Senha ~principal";
-        Text[ japanese ] = "マスターパスワード";
-        Text[ korean ] = "마스터 암호";
-        Text[ chinese_simplified ] = "主密码";
-        Text[ chinese_traditional ] = "主密碼";
-        Text[ turkish ] = "Ana Parola";
-        Text[ arabic ] = "Master ~password";
-        Text[ catalan ] = "Contrasenya ~mestra";
-        Text[ thai ] = "รหัสผ่านหลัก";
-        Text[ czech ] = "Hlavní heslo";
-        Text[ hebrew ] = "Hauptkennwort";
-        Text[ hindi ] = "मास्टर कूटशब्द";
-        Text[ slovak ] = "Hlavné heslo";
-        Text[ hungarian ] = "Mesterjelszó";
-        Text[ slovenian ] = "Glavno geslo";
+        Text [ de ] = "Hauptkennwort" ;
+        Text [ en-US ] = "Master password";
     };
     Edit ED_MASTERPASSWORD
     {
@@ -136,33 +108,7 @@ ModalDialog DLG_UUI_MASTERPASSWORD
         Pos = MAP_APPFONT ( 209 , 43 ) ;
         Size = MAP_APPFONT ( 50 , 14 ) ;
     };
-    Text[ english_us ] = "Enter Master Password";
-    Text[ portuguese ] = "Indique a senha principal.";
-    Text[ russian ] = "������ �������� ������";
-    Text[ greek ] = "Please enter master password";
-    Text[ dutch ] = "Hoofwachtwoord invoeren";
-    Text[ french ] = "Saisie du mot de passe principal";
-    Text[ spanish ] = "Introduzca la contrase�a principal";
-    Text[ finnish ] = "Please enter master password";
-    Text[ italian ] = "Digitate la password principale";
-    Text[ danish ] = "Indtast hovedadgangskode";
-    Text[ swedish ] = "Definiera huvudl�senord";
-    Text[ polish ] = "Zdefiniuj has�o g��wne";
-    Text[ portuguese_brazilian ] = "Digite a senha principal";
-    Text[ japanese ] = "マスターパスワードの入力";
-    Text[ korean ] = "마스터 암호 입력";
-    Text[ chinese_simplified ] = "输入主密码";
-    Text[ chinese_traditional ] = "輸入主密碼";
-    Text[ turkish ] = "Ana Parolay� Girin";
-    Text[ arabic ] = "Please enter master password";
-    Text[ catalan ] = "Introdu�u la contrasenya mestra";
-    Text[ thai ] = "ใส่รหัสผ่านหลัก";
-    Text[ czech ] = "Zadat hlavní heslo";
-    Text[ hebrew ] = "Hauptkennwort festlegen";
-    Text[ hindi ] = "Enter Master Password";
-    Text[ slovak ] = "Zadajte hlavné heslo";
-    Text[ hungarian ] = "Mesterjelszó bevitele";
-    Text[ slovenian ] = "Vnesite glavno geslo";
+    Text [ en-US ] = "Enter Master Password";
 };