From c5e340b31e01c6a0b73d27a6381fc4f0f678ed82 Mon Sep 17 00:00:00 2001
From: "cbiesinger%web.de"
 <cbiesinger%web.de@18797224-902f-48f8-a5cc-f745e15eee43>
Date: Wed, 31 Jul 2002 11:23:08 +0000
Subject: [PATCH] bug 111702 r=ssu sr=dveditz a=asa `No' is not the opposite of
 `Accept'

git-svn-id: svn://10.0.0.236/trunk@126108 18797224-902f-48f8-a5cc-f745e15eee43
---
 mozilla/xpinstall/packager/windows/config.it     | 2 +-
 mozilla/xpinstall/packager/windows/install.it    | 2 +-
 mozilla/xpinstall/wizard/windows/setup/dialogs.c | 2 +-
 mozilla/xpinstall/wizard/windows/setup/extra.c   | 2 +-
 mozilla/xpinstall/wizard/windows/setup/setup.h   | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/mozilla/xpinstall/packager/windows/config.it b/mozilla/xpinstall/packager/windows/config.it
index 086c359cc38..6d723266f11 100644
--- a/mozilla/xpinstall/packager/windows/config.it
+++ b/mozilla/xpinstall/packager/windows/config.it
@@ -149,7 +149,7 @@ License File=license.txt
 ;*** LOCALIZE ME BABY ***
 Message0=Please read the following license agreement.  Use the scroll bar to view the rest of this agreement.
 ;*** LOCALIZE ME BABY ***
-Message1=Click Accept if you accept the terms of the preceeding license agreement.  If No is clicked, setup will quit.
+Message1=Click Accept if you accept the terms of the preceeding license agreement.  If Decline is clicked, setup will quit.
 
 [Dialog Setup Type]
 Show Dialog=TRUE
diff --git a/mozilla/xpinstall/packager/windows/install.it b/mozilla/xpinstall/packager/windows/install.it
index fe55ac3037f..942650e0e46 100644
--- a/mozilla/xpinstall/packager/windows/install.it
+++ b/mozilla/xpinstall/packager/windows/install.it
@@ -32,7 +32,7 @@ FILE=File:
 URL=URL:
 TO=To Path:
 ACCEPT_=&Accept
-NO_=&No
+DECLINE_=&Decline
 PROGRAMFOLDER_=&Program Folder:
 EXISTINGFOLDERS_=E&xisting Folders:
 SETUPMESSAGE=Setup has finished copying files to your computer.  Before you can use the program, you must restart Windows or your computer. Choose one of the following options and click OK to finish setup.
diff --git a/mozilla/xpinstall/wizard/windows/setup/dialogs.c b/mozilla/xpinstall/wizard/windows/setup/dialogs.c
index bbaab86b873..c8506ec451b 100644
--- a/mozilla/xpinstall/wizard/windows/setup/dialogs.c
+++ b/mozilla/xpinstall/wizard/windows/setup/dialogs.c
@@ -185,7 +185,7 @@ LRESULT CALLBACK DlgProcLicense(HWND hDlg, UINT msg, WPARAM wParam, LONG lParam)
 
       SetDlgItemText(hDlg, IDWIZBACK, sgInstallGui.szBack_);
       SetDlgItemText(hDlg, IDWIZNEXT, sgInstallGui.szAccept_);
-      SetDlgItemText(hDlg, IDCANCEL, sgInstallGui.szNo_);
+      SetDlgItemText(hDlg, IDCANCEL, sgInstallGui.szDecline_);
       SendDlgItemMessage (hDlg, IDC_MESSAGE0, WM_SETFONT, (WPARAM)sgInstallGui.definedFont, 0L);
       SendDlgItemMessage (hDlg, IDC_MESSAGE1, WM_SETFONT, (WPARAM)sgInstallGui.definedFont, 0L);
       SendDlgItemMessage (hDlg, IDC_EDIT_LICENSE, WM_SETFONT, (WPARAM)sgInstallGui.definedFont, 0L);
diff --git a/mozilla/xpinstall/wizard/windows/setup/extra.c b/mozilla/xpinstall/wizard/windows/setup/extra.c
index 5cf49262241..d3813990ce2 100644
--- a/mozilla/xpinstall/wizard/windows/setup/extra.c
+++ b/mozilla/xpinstall/wizard/windows/setup/extra.c
@@ -6306,7 +6306,7 @@ HRESULT ParseInstallIni()
   GetPrivateProfileString("General", "URL", "", sgInstallGui.szUrl, sizeof(sgInstallGui.szUrl), szFileIniInstall);
   GetPrivateProfileString("General", "TO", "", sgInstallGui.szTo, sizeof(sgInstallGui.szTo), szFileIniInstall);
   GetPrivateProfileString("General", "ACCEPT_", "", sgInstallGui.szAccept_, sizeof(sgInstallGui.szAccept_), szFileIniInstall);
-  GetPrivateProfileString("General", "NO_", "", sgInstallGui.szNo_, sizeof(sgInstallGui.szNo_), szFileIniInstall);
+  GetPrivateProfileString("General", "DECLINE_", "", sgInstallGui.szDecline_, sizeof(sgInstallGui.szDecline_), szFileIniInstall);
   GetPrivateProfileString("General", "PROGRAMFOLDER_", "", sgInstallGui.szProgramFolder_, sizeof(sgInstallGui.szProgramFolder_), szFileIniInstall);
   GetPrivateProfileString("General", "EXISTINGFOLDERS_", "", sgInstallGui.szExistingFolder_, sizeof(sgInstallGui.szExistingFolder_), szFileIniInstall);
   GetPrivateProfileString("General", "SETUPMESSAGE", "", sgInstallGui.szSetupMessage, sizeof(sgInstallGui.szSetupMessage), szFileIniInstall);
diff --git a/mozilla/xpinstall/wizard/windows/setup/setup.h b/mozilla/xpinstall/wizard/windows/setup/setup.h
index c6861fe6731..a3359f5ac5d 100644
--- a/mozilla/xpinstall/wizard/windows/setup/setup.h
+++ b/mozilla/xpinstall/wizard/windows/setup/setup.h
@@ -496,7 +496,7 @@ typedef struct dlgInstall
     char szUrl[MAX_BUF];
     char szTo[MAX_BUF];
     char szAccept_[MAX_BUF];
-    char szNo_[MAX_BUF];
+    char szDecline_[MAX_BUF];
     char szProgramFolder_[MAX_BUF];
     char szExistingFolder_[MAX_BUF];
     char szSetupMessage[MAX_BUF];