Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-09 19:35:51 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

make clearer warning to users deleting old Mozilla installations

Browse Source 
Bug 69153, patch by opi@gmx.net, r/sr=dveditz, a=chofmann
This commit is contained in:
mvl%exedo.nl 2004-02-14 19:09:41 +00:00
parent 0d0404f9cb
commit 20faa7f7e1
3 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
xpinstall/packager/unix/config.it
View File

@ -244,4 +244,4 @@ Arguments=-installer
;-------------------------------------------------------------------------
Filename=mozilla-bin
; *** LOCALIZE ME BABY ***
Message=An older installation of Mozilla was detected. Please choose to delete the directory contents of your current Mozilla installation by pressing the 'Delete' button. Alternatively, please press the 'Cancel' button and choose a different destination directory.
Message=The selected directory already contains a Mozilla installation. To delete %s completely, please press the 'Delete Directory' button. Information in your Mozilla profile(s) should not be affected. Or, please press the 'Cancel' button and choose a different destination directory.

2
xpinstall/wizard/unix/src2/installer.ini
View File

@ -21,7 +21,7 @@ DOESNT_EXIST=Directory %s doesn't exist. Create it?
YES_LABEL=Yes
NO_LABEL=No
OK_LABEL=OK
DELETE_LABEL=Delete
DELETE_LABEL=Delete Directory
CANCEL_LABEL=Cancel
ERROR=Error [%d]: %s
FATAL_ERROR=Fatal error [%d]: %s

5
xpinstall/wizard/unix/src2/nsSetupTypeDlg.cpp
View File

@ -858,8 +858,9 @@ nsSetupTypeDlg::DeleteOldInst()
GtkWidget *label = NULL;
GtkWidget *deleteBtn = NULL; /* delete button */
GtkWidget *cancelBtn = NULL; /* cancel button */
char *msg = NULL, *msgPtr = NULL, *msgChunkPtr = NULL, *msgEndPtr = NULL;
char *msgPtr = NULL, *msgChunkPtr = NULL, *msgEndPtr = NULL;
char msgChunk[MAXCHARS+1];
char msg[MAXPATHLEN+512];
nsLegacyCheck *currLC = NULL;
currLC = sLegacyChecks;
@ -889,7 +890,7 @@ nsSetupTypeDlg::DeleteOldInst()
gtk_signal_connect(GTK_OBJECT(cancelBtn), "clicked",
GTK_SIGNAL_FUNC(DeleteInstCancel), sDelInstDlg);
msg = currLC->GetMessage();
snprintf(msg, sizeof(msg), currLC->GetMessage(), gCtx->opt->mDestination);
msgPtr = msg;
msgEndPtr = msg + strlen(msg);
// wrap message at MAXCHARS colums (or last space inside MAXCHARS)