summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorwolfbeast <mcwerewolf@wolfbeast.com>2019-06-20 14:41:46 +0200
committerwolfbeast <mcwerewolf@wolfbeast.com>2019-06-20 14:41:46 +0200
commit2a5466cfbaab490c9abd96ff166689ad8a6d2121 (patch)
treeb236072c14ba34e7af981492b8e9023b8cc68823
parent32d13a1648a64fe26be66de026bffca8c1afa88f (diff)
parenta2f961b3401bbc0911e77a684ae5638fd71d215b (diff)
downloadUXP-2a5466cfbaab490c9abd96ff166689ad8a6d2121.tar
UXP-2a5466cfbaab490c9abd96ff166689ad8a6d2121.tar.gz
UXP-2a5466cfbaab490c9abd96ff166689ad8a6d2121.tar.lz
UXP-2a5466cfbaab490c9abd96ff166689ad8a6d2121.tar.xz
UXP-2a5466cfbaab490c9abd96ff166689ad8a6d2121.zip
Merge branch 'master' of https://github.com/MoonchildProductions/UXP
-rw-r--r--application/basilisk/installer/package-manifest.in4
-rw-r--r--application/basilisk/locales/Makefile.in2
-rw-r--r--application/basilisk/locales/l10n.ini2
-rw-r--r--toolkit/content/aboutSupport.js1
-rw-r--r--toolkit/content/aboutSupport.xhtml9
-rw-r--r--toolkit/locales/en-US/chrome/global/aboutSupport.dtd1
6 files changed, 19 insertions, 0 deletions
diff --git a/application/basilisk/installer/package-manifest.in b/application/basilisk/installer/package-manifest.in
index 22655bc33..71f775904 100644
--- a/application/basilisk/installer/package-manifest.in
+++ b/application/basilisk/installer/package-manifest.in
@@ -477,8 +477,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
@@ -629,7 +631,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.
diff --git a/application/basilisk/locales/Makefile.in b/application/basilisk/locales/Makefile.in
index b8aee0f14..527922b11 100644
--- a/application/basilisk/locales/Makefile.in
+++ b/application/basilisk/locales/Makefile.in
@@ -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-$*
diff --git a/application/basilisk/locales/l10n.ini b/application/basilisk/locales/l10n.ini
index f1d22c259..78bafe8ca 100644
--- a/application/basilisk/locales/l10n.ini
+++ b/application/basilisk/locales/l10n.ini
@@ -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
diff --git a/toolkit/content/aboutSupport.js b/toolkit/content/aboutSupport.js
index b1d7ab5f6..8908a0f80 100644
--- a/toolkit/content/aboutSupport.js
+++ b/toolkit/content/aboutSupport.js
@@ -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) {
diff --git a/toolkit/content/aboutSupport.xhtml b/toolkit/content/aboutSupport.xhtml
index 5eb64d437..5e6319182 100644
--- a/toolkit/content/aboutSupport.xhtml
+++ b/toolkit/content/aboutSupport.xhtml
@@ -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
diff --git a/toolkit/locales/en-US/chrome/global/aboutSupport.dtd b/toolkit/locales/en-US/chrome/global/aboutSupport.dtd
index a0dd3531b..a2477fb2e 100644
--- a/toolkit/locales/en-US/chrome/global/aboutSupport.dtd
+++ b/toolkit/locales/en-US/chrome/global/aboutSupport.dtd
@@ -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.