Addresses #605, Combine alert titles and messages
This commit is contained in:
parent
498c9986da
commit
a3a8751259
|
@ -67,8 +67,8 @@ function onDataDirUpdate(event) {
|
|||
var buttonFlags = (ps.BUTTON_POS_0) * (ps.BUTTON_TITLE_IS_STRING)
|
||||
+ (ps.BUTTON_POS_1) * (ps.BUTTON_TITLE_CANCEL);
|
||||
var index = ps.confirmEx(window,
|
||||
Zotero.getString('general.restartRequired'),
|
||||
Zotero.getString('general.restartFirefox.singular'),
|
||||
'',
|
||||
buttonFlags,
|
||||
Zotero.getString('general.restartNow'),
|
||||
null, null, null, {});
|
||||
|
|
|
@ -158,7 +158,8 @@ var Zotero = new function(){
|
|||
+ (ps.BUTTON_POS_1) * (ps.BUTTON_TITLE_IS_STRING)
|
||||
+ (ps.BUTTON_POS_2) * (ps.BUTTON_TITLE_IS_STRING);
|
||||
var index = ps.confirmEx(win,
|
||||
_startupError,
|
||||
Zotero.getString('general.error'),
|
||||
_startupError + '\n\n' +
|
||||
Zotero.getString('dataDir.previousDir') + ' '
|
||||
+ Zotero.Prefs.get('lastDataDir'),
|
||||
buttonFlags, null,
|
||||
|
@ -328,8 +329,8 @@ var Zotero = new function(){
|
|||
buttonFlags += (ps.BUTTON_POS_1) * (ps.BUTTON_TITLE_IS_STRING);
|
||||
}
|
||||
var index = ps.confirmEx(win,
|
||||
Zotero.getString('general.restartRequired'),
|
||||
Zotero.getString('general.restartFirefox.singular'),
|
||||
'',
|
||||
buttonFlags,
|
||||
Zotero.getString('general.restartNow'),
|
||||
forceRestartNow ? null : Zotero.getString('general.restartLater'),
|
||||
|
|
|
@ -1,5 +1,7 @@
|
|||
general.error = Error
|
||||
general.dontShowWarningAgain = Don't show this warning again.
|
||||
general.locate = Locate...
|
||||
general.restartRequired = Restart Required
|
||||
general.restartFirefox.singular = Firefox must be restarted for the change to take effect.
|
||||
general.restartFirefox.plural = Firefox must be restarted for the changes to take effect.
|
||||
general.restartNow = Restart now
|
||||
|
|
Loading…
Reference in New Issue
Block a user