wuggy/Dactyloidae
wuggy/Dactyloidae
1
0
Fork 0
mirror of https://repo.dactyloidae.xyz/Dactyloidae/UXP.git synced 2026-09-08 16:58:38 +09:00
Code Issues Projects Releases Packages Wiki Activity

Merge remote-tracking branch 'origin/master' into custom

Browse source
This commit is contained in:
Roy Tam 2019-06-21 10:00:27 +08:00
commit fbb9e05a43
6 changed files with 19 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

4
application/basilisk/installer/package-manifest.in
View file

@ -483,8 +483,10 @@
@RESPATH@/browser/components/SelfSupportService.manifest
@RESPATH@/browser/components/SelfSupportService.js
#endif
#ifdef MOZ_SERVICES_SYNC
@RESPATH@/components/SyncComponents.manifest
@RESPATH@/components/Weave.js
#endif
@RESPATH@/components/CaptivePortalDetectComponents.manifest
@RESPATH@/components/captivedetect.js
@RESPATH@/components/servicesComponents.manifest
@ -645,7 +647,9 @@
@RESPATH@/defaults/pref/channel-prefs.js
; Services (gre) prefs
#ifdef MOZ_SERVICES_SYNC
@RESPATH@/defaults/pref/services-sync.js
#endif
; [Layout Engine Resources]
; Style Sheets, Graphics and other Resources used by the layout engine.

2
application/basilisk/locales/Makefile.in
View file

@ -97,7 +97,9 @@ DEFINES += -DBOOKMARKS_INCLUDE_DIR=$(dir $(call MERGE_FILE,profile/bookmarks.inc
libs-%:
$(NSINSTALL) -D $(DIST)/install
@$(MAKE) -C $(DEPTH)/toolkit/locales libs-$* XPI_ROOT_APPID='$(XPI_ROOT_APPID)'
ifdef MOZ_SERVICES_SYNC
@$(MAKE) -C $(DEPTH)/services/sync/locales AB_CD=$* XPI_NAME=locale-$*
endif
@$(MAKE) -C $(DEPTH)/extensions/spellcheck/locales AB_CD=$* XPI_NAME=locale-$*
# @$(MAKE) -C ../extensions/pocket/locale AB_CD=$* XPI_NAME=locale-$*
@$(MAKE) -C $(DEPTH)/intl/locales AB_CD=$* XPI_NAME=locale-$*

2
application/basilisk/locales/l10n.ini
View file

@ -16,7 +16,9 @@ dirs = browser
# non-central apps might want to use %(topsrcdir)s here, or other vars
# RFE: that needs to be supported by compare-locales, too, though
toolkit = toolkit/locales/l10n.ini
#ifdef MOZ_SERVICES_SYNC
services_sync = services/sync/locales/l10n.ini
#endif
[extras]
dirs = extensions/spellcheck

1
toolkit/content/aboutSupport.js
View file

@ -40,6 +40,7 @@ var snapshotFormatters = {
$("application-box").textContent = data.name;
$("useragent-box").textContent = data.userAgent;
$("os-box").textContent = data.osVersion;
$("binary-box").textContent = Services.dirsvc.get("XREExeF", Ci.nsIFile).path;
$("supportLink").href = data.supportURL;
let version = AppConstants.MOZ_APP_VERSION_DISPLAY;
if (data.versionArch) {

9
toolkit/content/aboutSupport.xhtml
View file

@ -147,6 +147,15 @@
</td>
</tr>
<tr class="no-copy">
<th class="column">
&aboutSupport.appBasicsBinary;
</th>
<td id="binary-box">
</td>
</tr>
<tr id="profile-row" class="no-copy">
<th class="column">
#ifdef XP_WIN

1
toolkit/locales/en-US/chrome/global/aboutSupport.dtd
View file

@ -45,6 +45,7 @@ This is likely the same like id.heading in crashes.dtd. -->
<!ENTITY aboutSupport.appBasicsUpdateHistory "Update History">
<!ENTITY aboutSupport.appBasicsShowUpdateHistory "Show Update History">
<!ENTITY aboutSupport.appBasicsBinary "Application Binary">
<!ENTITY aboutSupport.appBasicsProfileDir "Profile Directory">
<!-- LOCALIZATION NOTE (aboutSupport.appBasicsProfileDirWinMac):
This is the Windows- and Mac-specific variant of aboutSupport.appBasicsProfileDir.