mirror of
https://repo.dactyloidae.xyz/Dactyloidae/UXP.git
synced 2026-10-31 11:37:30 +09:00
Merge remote-tracking branch 'origin/tracking' into custom
This commit is contained in:
commit
7f068ecce3
969 changed files with 96279 additions and 469 deletions
|
|
@ -1878,7 +1878,11 @@ var gHeader = {
|
|||
|
||||
// XXXunf Temporary until bug 371900 is fixed.
|
||||
let key = document.getElementById("focusSearch").getAttribute("key");
|
||||
#ifdef XP_MACOSX
|
||||
let keyModifier = aEvent.metaKey;
|
||||
#else
|
||||
let keyModifier = aEvent.ctrlKey;
|
||||
#endif
|
||||
if (String.fromCharCode(aEvent.charCode) == key && keyModifier) {
|
||||
this.focusSearchBox();
|
||||
return;
|
||||
|
|
|
|||
|
|
@ -100,7 +100,11 @@
|
|||
oncommand="gUpdateWizard.shouldAutoCheck = this.checked;"/>
|
||||
</vbox>
|
||||
<separator flex="1"/>
|
||||
#ifndef XP_MACOSX
|
||||
<label>&clickFinish.label;</label>
|
||||
#else
|
||||
<label>&clickFinish.labelMac;</label>
|
||||
#endif
|
||||
<separator class="thin"/>
|
||||
</wizardpage>
|
||||
|
||||
|
|
@ -140,7 +144,11 @@
|
|||
<description flex="1">&installerrors.intro.label;</description>
|
||||
</hbox>
|
||||
<separator flex="1"/>
|
||||
#ifndef XP_MACOSX
|
||||
<label>&clickFinish.label;</label>
|
||||
#else
|
||||
<label>&clickFinish.labelMac;</label>
|
||||
#endif
|
||||
<separator class="thin"/>
|
||||
</wizardpage>
|
||||
|
||||
|
|
@ -153,7 +161,11 @@
|
|||
<description flex="1">&adminDisabled.warning.label;</description>
|
||||
</hbox>
|
||||
<separator flex="1"/>
|
||||
#ifndef XP_MACOSX
|
||||
<label>&clickFinish.label;</label>
|
||||
#else
|
||||
<label>&clickFinish.labelMac;</label>
|
||||
#endif
|
||||
<separator class="thin"/>
|
||||
</wizardpage>
|
||||
|
||||
|
|
@ -172,7 +184,11 @@
|
|||
oncommand="gUpdateWizard.shouldAutoCheck = this.checked;"/>
|
||||
</vbox>
|
||||
<separator flex="1"/>
|
||||
#ifndef XP_MACOSX
|
||||
<label>&clickFinish.label;</label>
|
||||
#else
|
||||
<label>&clickFinish.labelMac;</label>
|
||||
#endif
|
||||
<separator class="thin"/>
|
||||
</wizardpage>
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue