Feodor2
/
Mypal
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[Mypal] Remove plaemoon.org links.

master
Fedor 2020-09-17 09:40:59 +03:00
parent e2067ba6df
commit 6dbc40f631
19 changed files with 52 additions and 1295 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
application/palemoon/app/permissions
View File

@ -7,8 +7,8 @@
# See nsPermissionManager.cpp for more... # See nsPermissionManager.cpp for more...
# XPInstall # XPInstall
origin install 1 http://www.palemoon.org origin install 1 http://nothing
origin install 1 https://www.palemoon.org origin install 1 https://nothing
origin install 1 http://addons.palemoon.org origin install 1 http://nothing
origin install 1 https://addons.palemoon.org origin install 1 https://nothing

22
application/palemoon/app/profile/mypal.js
View File

@ -37,7 +37,7 @@ pref("extensions.strictCompatibility", false);
// for it to be compatible by default. // for it to be compatible by default.
pref("extensions.minCompatibleAppVersion", "1.5"); pref("extensions.minCompatibleAppVersion", "1.5");
#define AM_DOMAIN addons.palemoon.org #define AM_DOMAIN nothing.isnothing
#define AM_AUS_ARGS reqVersion=%REQ_VERSION%&id=%ITEM_ID%&version=%ITEM_VERSION%&maxAppVersion=%ITEM_MAXAPPVERSION%&status=%ITEM_STATUS%&appID=%APP_ID%&appVersion=%APP_VERSION%&appOS=%APP_OS%&appABI=%APP_ABI%&locale=%APP_LOCALE%&currentAppVersion=%CURRENT_APP_VERSION%&updateType=%UPDATE_TYPE%&compatMode=%COMPATIBILITY_MODE% #define AM_AUS_ARGS reqVersion=%REQ_VERSION%&id=%ITEM_ID%&version=%ITEM_VERSION%&maxAppVersion=%ITEM_MAXAPPVERSION%&status=%ITEM_STATUS%&appID=%APP_ID%&appVersion=%APP_VERSION%&appOS=%APP_OS%&appABI=%APP_ABI%&locale=%APP_LOCALE%&currentAppVersion=%CURRENT_APP_VERSION%&updateType=%UPDATE_TYPE%&compatMode=%COMPATIBILITY_MODE%
// Preferences for AMO integration // Preferences for AMO integration
@ -59,9 +59,9 @@ pref("extensions.blocklist.level.updated", false);
// Controls what level the blocklist switches from warning about items to forcibly // Controls what level the blocklist switches from warning about items to forcibly
// blocking them. // blocking them.
pref("extensions.blocklist.level", 2); pref("extensions.blocklist.level", 2);
pref("extensions.blocklist.url", "https://blocklist.palemoon.org/?version=%VERSION%"); pref("extensions.blocklist.url", "");
pref("extensions.blocklist.detailsURL", "https://blocklist.palemoon.org/about.shtml"); pref("extensions.blocklist.detailsURL", "");
pref("extensions.blocklist.itemURL", "https://blocklist.palemoon.org/info/?id=%blockID%"); pref("extensions.blocklist.itemURL", "");
pref("extensions.update.autoUpdateDefault", true); pref("extensions.update.autoUpdateDefault", true);
@ -79,7 +79,7 @@ pref("browser.getdevtools.url","https://@AM_DOMAIN@/?component=integration&type=
pref("browser.feedback.url", "https://github.com/Feodor2/Mypal/issues"); pref("browser.feedback.url", "https://github.com/Feodor2/Mypal/issues");
// Help button in slow startup dialog // Help button in slow startup dialog
pref("browser.slowstartup.help.url", "http://www.palemoon.org/support/slowstartup.shtml"); pref("browser.slowstartup.help.url", "");
// Whether to escape to a content-less page if a user presses "Get me out of here" // Whether to escape to a content-less page if a user presses "Get me out of here"
// on a network error page (e.g. cert error) // on a network error page (e.g. cert error)
@ -139,7 +139,7 @@ pref("app.update.cert.maxErrors", 5);
// when the |app.update.cert.checkAttributes| preference is set to false. Also, // when the |app.update.cert.checkAttributes| preference is set to false. Also,
// the |app.update.url.override| preference should ONLY be used for testing. // the |app.update.url.override| preference should ONLY be used for testing.
pref("app.update.certs.1.issuerName", "CN=COMODO RSA Domain Validation Secure Server CA,O=COMODO CA Limited,L=Salford,ST=Greater Manchester,C=GB"); pref("app.update.certs.1.issuerName", "CN=COMODO RSA Domain Validation Secure Server CA,O=COMODO CA Limited,L=Salford,ST=Greater Manchester,C=GB");
pref("app.update.certs.1.commonName", "*.palemoon.org"); pref("app.update.certs.1.commonName", "");
// Whether or not app updates are enabled // Whether or not app updates are enabled
pref("app.update.enabled", true); pref("app.update.enabled", true);
@ -160,7 +160,7 @@ pref("app.update.silent", false);
pref("app.update.staging.enabled", true); pref("app.update.staging.enabled", true);
// Update service URL: // Update service URL:
pref("app.update.url", "https://aus.palemoon.org/?application=%PRODUCT%&version=%VERSION%&arch=%BUILD_TARGET%&buildid=%BUILD_ID%&channel=%CHANNEL%"); pref("app.update.url", "");
// app.update.url.manual is in branding section // app.update.url.manual is in branding section
// app.update.url.details is in branding section // app.update.url.details is in branding section
@ -807,9 +807,9 @@ pref("gecko.handlerService.schemes.ircs.3.uriTemplate", "chrome://browser-region
// By default, we don't want protocol/content handlers to be registered from a different host, see bug 402287 // By default, we don't want protocol/content handlers to be registered from a different host, see bug 402287
pref("gecko.handlerService.allowRegisterFromDifferentHost", false); pref("gecko.handlerService.allowRegisterFromDifferentHost", false);
pref("browser.geolocation.warning.infoURL", "http://www.palemoon.org/info-url/geolocation.shtml"); pref("browser.geolocation.warning.infoURL", "");
pref("browser.mixedcontent.warning.infoURL", "http://www.palemoon.org/info-url/mixedcontent.shtml"); pref("browser.mixedcontent.warning.infoURL", "");
pref("browser.push.warning.infoURL", "https://www.palemoon.org/info-url/push.shtml"); pref("browser.push.warning.infoURL", "");
pref("browser.EULA.version", 3); pref("browser.EULA.version", 3);
pref("browser.rights.version", 3); pref("browser.rights.version", 3);
@ -989,7 +989,7 @@ pref("browser.taskbar.lists.refreshInSeconds", 120);
#ifdef MOZ_SERVICES_SYNC #ifdef MOZ_SERVICES_SYNC
// Info when outdated sync detected // Info when outdated sync detected
pref("services.sync.outdated.url", "http://www.palemoon.org/sync/update/"); pref("services.sync.outdated.url", "");
// The sync engines to use. // The sync engines to use.
pref("services.sync.registerEngines", "Bookmarks,Form,History,Password,Prefs,Tab,Addons"); pref("services.sync.registerEngines", "Bookmarks,Form,History,Password,Prefs,Tab,Addons");
// Preferences to be synced by default // Preferences to be synced by default

1221
application/palemoon/app/profile/palemoon.js
View File

File diff suppressed because it is too large Load Diff

1
application/palemoon/base/content/overrides/app-license.html
View File

@ -2,6 +2,5 @@
- License, v. 2.0. If a copy of the MPL was not distributed with this - License, v. 2.0. If a copy of the MPL was not distributed with this
- file, You can obtain one at http://mozilla.org/MPL/2.0/. --> - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
<p><b>Binaries</b> of this product have been made available to you by the <p><b>Binaries</b> of this product have been made available to you by the
<a href="http://www.palemoon.org/">Pale Moon project team</a> and
<a href="https://github.com/Feodor2">Feodor</a> under the Mozilla <a href="https://github.com/Feodor2">Feodor</a> under the Mozilla
Public License 2.0 (MPL). <a href="about:rights">Know your rights</a>.</p> Public License 2.0 (MPL). <a href="about:rights">Know your rights</a>.</p>

16
application/palemoon/branding/shared/pref/preferences.inc
View File

@ -11,7 +11,7 @@ pref("browser.identity.ssl_domain_display", 1); //show domain verified SSL (blue
// ===| Application Update Service |=========================================== // ===| Application Update Service |===========================================
pref("app.update.url", "https://aus.palemoon.org/?application=%PRODUCT%&version=%VERSION%&arch=%BUILD_TARGET%&buildid=%BUILD_ID%&channel=%CHANNEL%"); pref("app.update.url", "");
// The time interval between the downloading of mar file chunks in the // The time interval between the downloading of mar file chunks in the
// background (in seconds) // background (in seconds)
@ -25,7 +25,7 @@ pref("app.update.promptWaitTime", 172800);
// ===| Add-ons Manager |====================================================== // ===| Add-ons Manager |======================================================
// Add-on window fixes // Add-on window fixes
pref("extensions.getMoreThemesURL", "https://addons.palemoon.org/themes/"); pref("extensions.getMoreThemesURL", "");
pref("extensions.update.autoUpdateDefault", true); // Automatically update extensions by default pref("extensions.update.autoUpdateDefault", true); // Automatically update extensions by default
pref("extensions.getAddons.maxResults", 10); pref("extensions.getAddons.maxResults", 10);
@ -65,12 +65,12 @@ pref("image.mem.decode_bytes_at_a_time", 65536); //larger chunks
// ===| Sync |================================================================= // ===| Sync |=================================================================
// Pale Moon Sync server URLs // Pale Moon Sync server URLs
pref("services.sync.serverURL","https://pmsync.palemoon.org/sync/index.php/"); pref("services.sync.serverURL","");
pref("services.sync.jpake.serverURL","https://keyserver.palemoon.org/"); pref("services.sync.jpake.serverURL","");
pref("services.sync.termsURL", "http://www.palemoon.org/sync/terms.shtml"); pref("services.sync.termsURL", "");
pref("services.sync.privacyURL", "http://www.palemoon.org/sync/privacy.shtml"); pref("services.sync.privacyURL", "");
pref("services.sync.statusURL", "https://pmsync.palemoon.org/status/"); pref("services.sync.statusURL", "");
pref("services.sync.syncKeyHelpURL", "http://www.palemoon.org/sync/help/recoverykey.shtml"); pref("services.sync.syncKeyHelpURL", "");
pref("services.sync.APILevel", 1); // FSyncMS doesn't support 'info/configuration' requests pref("services.sync.APILevel", 1); // FSyncMS doesn't support 'info/configuration' requests

26
application/palemoon/branding/shared/pref/uaoverrides.inc
View File

@ -5,7 +5,7 @@
#define GRE_VERSION @MOZILLA_UAVERSION_U@ #define GRE_VERSION @MOZILLA_UAVERSION_U@
#define GRE_VERSION_SLICE Goanna/@GRE_VERSION@ #define GRE_VERSION_SLICE Goanna/@GRE_VERSION@
#define GRE_DATE_SLICE Goanna/20170101 #define GRE_DATE_SLICE Goanna/20170101
#define PM_SLICE PaleMoon/@MOZ_APP_VERSION@ #define PM_SLICE Mypal/@MOZ_APP_VERSION@
#define GK_VERSION @MOZILLA_COMPATVERSION_U@ #define GK_VERSION @MOZILLA_COMPATVERSION_U@
#define GK_SLICE Gecko/20100101 #define GK_SLICE Gecko/20100101
@ -27,25 +27,25 @@
pref("@GUAO_PREF@.addons.mozilla.org","Mozilla/5.0 (@OS_SLICE@ rv:@GRE_VERSION@) @GRE_DATE_SLICE@ @PM_SLICE@"); pref("@GUAO_PREF@.addons.mozilla.org","Mozilla/5.0 (@OS_SLICE@ rv:@GRE_VERSION@) @GRE_DATE_SLICE@ @PM_SLICE@");
// Required for domains that have proven unresponsive to requests from users // Required for domains that have proven unresponsive to requests from users
pref("@GUAO_PREF@.aol.com","Mozilla/5.0 (@OS_SLICE@ rv:@GK_VERSION@) @GK_SLICE@ @FX_SLICE@ (Pale Moon)"); pref("@GUAO_PREF@.aol.com","Mozilla/5.0 (@OS_SLICE@ rv:@GK_VERSION@) @GK_SLICE@ @FX_SLICE@");
pref("@GUAO_PREF@.bing.com","Mozilla/5.0 (@OS_SLICE@ rv:@GK_VERSION@) @GK_SLICE@ @FX_SLICE@ (Pale Moon)"); pref("@GUAO_PREF@.bing.com","Mozilla/5.0 (@OS_SLICE@ rv:@GK_VERSION@) @GK_SLICE@ @FX_SLICE@");
pref("@GUAO_PREF@.chase.com","Mozilla/5.0 (@OS_SLICE@ rv:79.0) @GK_SLICE@ Firefox/79.0"); pref("@GUAO_PREF@.chase.com","Mozilla/5.0 (@OS_SLICE@ rv:79.0) @GK_SLICE@ Firefox/79.0");
pref("@GUAO_PREF@.dropbox.com","Mozilla/5.0 (@OS_SLICE@ rv:99.9) @GK_SLICE@ Firefox/99.9 (Pale Moon)"); pref("@GUAO_PREF@.dropbox.com","Mozilla/5.0 (@OS_SLICE@ rv:99.9) @GK_SLICE@ Firefox/99.9");
pref("@GUAO_PREF@.google.com","Mozilla/5.0 (@OS_SLICE@ rv:71.0) @GK_SLICE@ Firefox/71.0 @PM_SLICE@"); pref("@GUAO_PREF@.google.com","Mozilla/5.0 (@OS_SLICE@ rv:71.0) @GK_SLICE@ Firefox/71.0 @PM_SLICE@");
pref("@GUAO_PREF@.googlevideos.com","Mozilla/5.0 (@OS_SLICE@ rv:38.9) @GK_SLICE@ @GRE_VERSION_SLICE@ Firefox/38.9 @PM_SLICE@"); pref("@GUAO_PREF@.googlevideos.com","Mozilla/5.0 (@OS_SLICE@ rv:38.9) @GK_SLICE@ @GRE_VERSION_SLICE@ Firefox/38.9 @PM_SLICE@");
pref("@GUAO_PREF@.gstatic.com","Mozilla/5.0 (@OS_SLICE@ rv:71.0) @GK_SLICE@ Firefox/71.0 @PM_SLICE@"); pref("@GUAO_PREF@.gstatic.com","Mozilla/5.0 (@OS_SLICE@ rv:71.0) @GK_SLICE@ Firefox/71.0 @PM_SLICE@");
pref("@GUAO_PREF@.live.com","Mozilla/5.0 (@OS_SLICE@ rv:@GK_VERSION@) @GK_SLICE@ @FX_SLICE@ (Pale Moon)"); pref("@GUAO_PREF@.live.com","Mozilla/5.0 (@OS_SLICE@ rv:@GK_VERSION@) @GK_SLICE@ @FX_SLICE@");
pref("@GUAO_PREF@.msn.com","Mozilla/5.0 (@OS_SLICE@ rv:@GK_VERSION@) @GK_SLICE@ @FX_SLICE@ (Pale Moon)"); pref("@GUAO_PREF@.msn.com","Mozilla/5.0 (@OS_SLICE@ rv:@GK_VERSION@) @GK_SLICE@ @FX_SLICE@");
pref("@GUAO_PREF@.patientaccess.com","Mozilla/5.0 (@OS_SLICE@ rv:60.0) @GK_SLICE@ Firefox/60.0 @PM_SLICE@"); pref("@GUAO_PREF@.patientaccess.com","Mozilla/5.0 (@OS_SLICE@ rv:60.0) @GK_SLICE@ Firefox/60.0 @PM_SLICE@");
pref("@GUAO_PREF@.outlook.com","Mozilla/5.0 (@OS_SLICE@ rv:@GK_VERSION@) @GK_SLICE@ @FX_SLICE@ (Pale Moon)"); pref("@GUAO_PREF@.outlook.com","Mozilla/5.0 (@OS_SLICE@ rv:@GK_VERSION@) @GK_SLICE@ @FX_SLICE@");
pref("@GUAO_PREF@.web.de","Mozilla/5.0 (@OS_SLICE@ rv:@GK_VERSION@) @GK_SLICE@ @FX_SLICE@ (Pale Moon)"); pref("@GUAO_PREF@.web.de","Mozilla/5.0 (@OS_SLICE@ rv:@GK_VERSION@) @GK_SLICE@ @FX_SLICE@");
pref("@GUAO_PREF@.yahoo.com","Mozilla/5.0 (@OS_SLICE@ rv:99.9) @GK_SLICE@ Firefox/99.9 (Pale Moon)"); pref("@GUAO_PREF@.yahoo.com","Mozilla/5.0 (@OS_SLICE@ rv:99.9) @GK_SLICE@ Firefox/99.9");
pref("@GUAO_PREF@.calendar.yahoo.com","Mozilla/5.0 (@OS_SLICE@ rv:@GK_VERSION@) @GK_SLICE@ @FX_SLICE@ (Pale Moon)"); pref("@GUAO_PREF@.calendar.yahoo.com","Mozilla/5.0 (@OS_SLICE@ rv:@GK_VERSION@) @GK_SLICE@ @FX_SLICE@");
pref("@GUAO_PREF@.youtube.com","Mozilla/5.0 (@OS_SLICE@ rv:60.0) @GK_SLICE@ Firefox/60.0 @PM_SLICE@"); pref("@GUAO_PREF@.youtube.com","Mozilla/5.0 (@OS_SLICE@ rv:60.0) @GK_SLICE@ Firefox/60.0 @PM_SLICE@");
pref("@GUAO_PREF@.gaming.youtube.com","Mozilla/5.0 (@OS_SLICE@ rv:42.0) @GK_SLICE@ Firefox/42.0"); pref("@GUAO_PREF@.gaming.youtube.com","Mozilla/5.0 (@OS_SLICE@ rv:42.0) @GK_SLICE@ Firefox/42.0");
// For Amazon Prime videos // For Amazon Prime videos
pref("@GUAO_PREF@.www.amazon.com","Mozilla/5.0 (@OS_SLICE@ rv:45.9) @GK_SLICE@ Firefox/45.9 (Pale Moon)"); pref("@GUAO_PREF@.www.amazon.com","Mozilla/5.0 (@OS_SLICE@ rv:45.9) @GK_SLICE@ Firefox/45.9");
// Soundcloud uses Firefox-exclusive combinations of code. Never pass Firefox slice. // Soundcloud uses Firefox-exclusive combinations of code. Never pass Firefox slice.
pref("@GUAO_PREF@.soundcloud.com","Mozilla/5.0 (@OS_SLICE@ rv:@GRE_VERSION@) @GRE_DATE_SLICE@ @PM_SLICE@"); pref("@GUAO_PREF@.soundcloud.com","Mozilla/5.0 (@OS_SLICE@ rv:@GRE_VERSION@) @GRE_DATE_SLICE@ @PM_SLICE@");
// Daily motion only likes strict Firefox UAs // Daily motion only likes strict Firefox UAs
@ -61,9 +61,9 @@ pref("@GUAO_PREF@.firefox.com","Mozilla/5.0 (@OS_SLICE@ rv:@GRE_VERSION@) @GRE_D
pref("@GUAO_PREF@.github.com","Mozilla/5.0 (@OS_SLICE@ rv:@GRE_VERSION@) @GRE_DATE_SLICE@ @PM_SLICE@"); pref("@GUAO_PREF@.github.com","Mozilla/5.0 (@OS_SLICE@ rv:@GRE_VERSION@) @GRE_DATE_SLICE@ @PM_SLICE@");
// UA-Sniffing domains below have indicated no interest in supporting Pale Moon (BOO!) // UA-Sniffing domains below have indicated no interest in supporting Pale Moon (BOO!)
pref("@GUAO_PREF@.humblebundle.com","Mozilla/5.0 (@OS_SLICE@ rv:@GK_VERSION@) @GK_SLICE@ @FX_SLICE@ (Pale Moon)"); pref("@GUAO_PREF@.humblebundle.com","Mozilla/5.0 (@OS_SLICE@ rv:@GK_VERSION@) @GK_SLICE@ @FX_SLICE@");
pref("@GUAO_PREF@.privat24.ua","Mozilla/5.0 (@OS_SLICE@ rv:38.0) @GK_SLICE@ Firefox/38.0"); pref("@GUAO_PREF@.privat24.ua","Mozilla/5.0 (@OS_SLICE@ rv:38.0) @GK_SLICE@ Firefox/38.0");
pref("@GUAO_PREF@.citi.com","Mozilla/5.0 (@OS_SLICE@ rv:57.0) @GK_SLICE@ Firefox/57.0 (Pale Moon)"); pref("@GUAO_PREF@.citi.com","Mozilla/5.0 (@OS_SLICE@ rv:57.0) @GK_SLICE@ Firefox/57.0");
pref("@GUAO_PREF@.netflix.com","Mozilla/5.0 (@OS_SLICE@ rv:45.9) @GK_SLICE@ Firefox/45.9"); pref("@GUAO_PREF@.netflix.com","Mozilla/5.0 (@OS_SLICE@ rv:45.9) @GK_SLICE@ Firefox/45.9");
pref("@GUAO_PREF@.netflximg.net","Mozilla/5.0 (@OS_SLICE@ rv:45.9) @GK_SLICE@ Firefox/45.9"); pref("@GUAO_PREF@.netflximg.net","Mozilla/5.0 (@OS_SLICE@ rv:45.9) @GK_SLICE@ Firefox/45.9");

13
application/palemoon/components/nsBrowserGlue.js
View File

@ -1382,19 +1382,6 @@ BrowserGlue.prototype = {
} }
} }
if (currentUIVersion < 16) {
// Migrate Sync from pmsync.palemoon.net to pmsync.palemoon.org
try {
let syncURL = Services.prefs.getCharPref("services.sync.clusterURL");
let newSyncURL = syncURL.replace(/pmsync\.palemoon\.net/i,"pmsync.palemoon.org");
if (newSyncURL != syncURL) {
Services.prefs.setCharPref("services.sync.clusterURL", newSyncURL);
}
} catch(ex) {
// Pref not found: Sync not in use, nothing to do.
}
}
if (currentUIVersion < 17) { if (currentUIVersion < 17) {
this._notifyNotificationsUpgrade(); this._notifyNotificationsUpgrade();
} }

2
application/palemoon/components/sync/addDevice.xul
View File

@ -43,7 +43,7 @@
&pairDevice.dialog.description.label; &pairDevice.dialog.description.label;
<label class="text-link" <label class="text-link"
value="&addDevice.showMeHow.label;" value="&addDevice.showMeHow.label;"
href="http://www.palemoon.org/sync/help/easy-setup.shtml"/> href=""/>
</description> </description>
<separator class="groove-thin"/> <separator class="groove-thin"/>
<description> <description>

2
application/palemoon/components/sync/genericChange.xul
View File

@ -105,7 +105,7 @@
<description> <description>
&existingRecoveryKey.description; &existingRecoveryKey.description;
<label class="text-link" <label class="text-link"
href="http://www.palemoon.org/sync/help/recoverykey.shtml"> href="">
&addDevice.showMeHow.label; &addDevice.showMeHow.label;
</label> </label>
</description> </description>

2
application/palemoon/components/sync/key.xhtml
View File

@ -44,7 +44,7 @@
<p><em>&syncKey.keepItSafe1.description;</em>&syncKey.keepItSafe2.description;<em>&syncKey.keepItSafe3.description;</em>&syncKey.keepItSafe4a.description;</p> <p><em>&syncKey.keepItSafe1.description;</em>&syncKey.keepItSafe2.description;<em>&syncKey.keepItSafe3.description;</em>&syncKey.keepItSafe4a.description;</p>
</div> </div>
<p>&syncKey.findOutMore1.label;<a href="http://www.palemoon.org/sync/">http://www.palemoon.org/sync/</a>&syncKey.findOutMore2.label;</p> <p>&syncKey.findOutMore1.label;<a href="">http://xxx</a>&syncKey.findOutMore2.label;</p>
<footer> <footer>
&syncKey.footer1.label;<a id="tosLink" href="termsURL">termsURL</a>&syncKey.footer2.label;<a id="ppLink" href="privacyURL">privacyURL</a>&syncKey.footer3.label; &syncKey.footer1.label;<a id="tosLink" href="termsURL">termsURL</a>&syncKey.footer2.label;<a id="ppLink" href="privacyURL">privacyURL</a>&syncKey.footer3.label;

4
application/palemoon/components/sync/setup.xul
View File

@ -43,7 +43,7 @@
&pairDevice.dialog.description.label; &pairDevice.dialog.description.label;
<label class="text-link" <label class="text-link"
value="&addDevice.showMeHow.label;" value="&addDevice.showMeHow.label;"
href="http://www.palemoon.org/sync/help/easy-setup.shtml"/> href=""/>
</description> </description>
<separator class="groove-thin"/> <separator class="groove-thin"/>
<description> <description>
@ -221,7 +221,7 @@
&pairDevice.setup.description.label; &pairDevice.setup.description.label;
<label class="text-link" <label class="text-link"
value="&addDevice.showMeHow.label;" value="&addDevice.showMeHow.label;"
href="http://www.palemoon.org/sync/help/easy-setup.shtml"/> href=""/>
</description> </description>
<label value="&addDevice.setup.enterCode.label;" <label value="&addDevice.setup.enterCode.label;"
control="easySetupPIN1"/> control="easySetupPIN1"/>

2
application/palemoon/locales/Makefile.in
View File

@ -35,7 +35,7 @@ ZIP_IN ?= $(_ABS_DIST)/$(PACKAGE)
WIN32_INSTALLER_IN ?= $(_ABS_DIST)/$(PKG_INST_PATH)$(PKG_INST_BASENAME).exe WIN32_INSTALLER_IN ?= $(_ABS_DIST)/$(PKG_INST_PATH)$(PKG_INST_BASENAME).exe
RETRIEVE_WINDOWS_INSTALLER = 1 RETRIEVE_WINDOWS_INSTALLER = 1
MOZ_LANGPACK_EID=langpack-$(AB_CD)@palemoon.org MOZ_LANGPACK_EID=langpack-$(AB_CD)@mypal.org
L10N_PREF_JS_EXPORTS = $(call MERGE_FILE,mypal-l10n.js) L10N_PREF_JS_EXPORTS = $(call MERGE_FILE,mypal-l10n.js)
L10N_PREF_JS_EXPORTS_PATH = $(FINAL_TARGET)/$(PREF_DIR) L10N_PREF_JS_EXPORTS_PATH = $(FINAL_TARGET)/$(PREF_DIR)

2
application/palemoon/locales/en-US/defines.inc
View File

@ -3,7 +3,7 @@
# file, You can obtain one at http://mozilla.org/MPL/2.0/. # file, You can obtain one at http://mozilla.org/MPL/2.0/.
#filter emptyLines #filter emptyLines
#define MOZ_LANGPACK_CREATOR palemoon.org #define MOZ_LANGPACK_CREATOR mypal.org
# If non-English locales wish to credit multiple contributors, uncomment this # If non-English locales wish to credit multiple contributors, uncomment this
# variable definition and use the format specified. # variable definition and use the format specified.

4
application/palemoon/locales/generic/profile/bookmarks.html.in
View File

@ -11,9 +11,5 @@
<DT><H3 PERSONAL_TOOLBAR_FOLDER="true" ID="rdf:#$FvPhC3">@bookmarks_toolbarfolder@</H3> <DT><H3 PERSONAL_TOOLBAR_FOLDER="true" ID="rdf:#$FvPhC3">@bookmarks_toolbarfolder@</H3>
<DD>@bookmarks_toolbarfolder_description@ <DD>@bookmarks_toolbarfolder_description@
<DL><p> <DL><p>
<DT><A HREF="http://www.palemoon.org/" ICON_URI="http://www.palemoon.org/favicon.ico" ICON="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAADe0lEQVQ4jW2T7VPTBQDHfwd/gpZW57bwuvJFIQ1lPgy9g7KzNCO4A9sDA8FNTCyg0KD9GBuCIrYhHYPw6Ygd2xB0rAFrEfxikA03YibyIO4pYGwONlhbx923F72I2/V5/f18X32/BBHDrox6ejKnlTxSaqRKlROuK5op1w3DHKUfdZC1d36hxeY3Qca9lVFH7uG2RFLPdKGo0YqOQTcouw/T7hBcy2E4l9YjuhGHmCDJuFg7bmd6mXrXMRleO9EEZp4axc2T6DH/CddyGN5ABMH1vxGObMC/GoVp3N1JEJtKXmadEdPY50FLJ/FGphIHzurx5Y1HMFiW8HB2BX84gvD4wghHNvBXdAMeXxi3fpj5+l+ZWUjbzsyL0NjFeDOjAcm823inxIjSVjuMD72g7D5YZ1fw2BmEbzWCQCgK29wK6rXTEYF0aAexPTmX3MbkY+fhYqQKlMgW/wiObAzFzZNo1s9D/2ARk/OrGPrdB5PVC5PVi7HHz3FaYUN29ZCYePFt/vDW3VwkfnARR4tuouAyBUGdGbw6C9r6HTDZlmF/tgoN5UFbnwPynjk06+chUz1B2vn7Q8RLyTzX1kQOEg59iiOF3+IkOQCejIJQboXi3lOMzwQw7Q5h5JEf6mEPbhudEF2fwNGKEbBOqZ0ELYXn2pLIwQvMPLB5cmSU68C7NIqSlilcveuCweLH+EwI1tkg9A8WofrZDW6tBccvDoN9Wu0k6Ck8alsSB6+kFCDpIylOlPUgR0JB+I0V4g43FL1+dFIhGH5bR1v/EiTfP4VIPoHMykGkCjXDBC1FUEXbywFjfz7Y2VJkXtAhp2oQIrkNEvUC6nV+NPaH0NgXQv19PyranTjbZEeOhMLBQhVJMFhCBmPvJ9GE/Twwj5fj/c+04NaMoKT1CRp6A7g+sAZFXxByQxBXdc8h1S6hst2BD8sHIkknv6MTBEEQ9H25klf3ccE8VobMLzQQXrNA0ulB08AamoxraOwPoaE3gNruZZAqN0QKGw6JtFWblpwVT2fxtQkH8pFeoAS/hsKFW7O4cs+Ha/oA6rq9qOlahLjDBaHchrRz3VqCyIqPuUNW/A5WfvXr71VE3z3XBX7tGMraplHZ/gxf3ZnH5y1T4MhGo6kiTfX/yP/BOEwyducopWlFXeYs8U8Lgsu/LvAvmc0fV5ikrFwVIzb/D6b/QY5z63dPAAAAAElFTkSuQmCC">Pale Moon</A>
<DT><A HREF="https://forum.palemoon.org/index.php" ICON_URI="https://forum.palemoon.org/favicon.ico" ICON="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAADWUlEQVQ4jW1T60+Tdxj9Bf4CyXRR21Kixgheq1baAo2IaLkIpi0tpdQCBZHLNIIgQvGlpVkHOnnpFKrOTafUtjIuVYmXKBZREzLB4A0NbOVFghVtcEOqJid+YMlI50meb+ecPM/JeQgJQESymcNTNVHx+7vcJdYBps7+dNTS9tz9s2uQ0pQ7OIH8OaCCVqb+QG3ItPqj81tRYHmIltsMeh5PYoh5D8Y7Dc/EPzNnrzw5TCgqKFAdtCSuzL480YQlO34CL8uO4qZBtN0bB+OdxmvfDKamP2Ha/xmTU3503h25SMgck0XCosOsqO/AiqXAiinFvDAhlvK2ImpLEuIkKdgqSUG2bje8kz588H/G2JsPOGZ/qJ8VxxSwv12f7V8sLELEzqMIl1SAEPLV6fvjEd69/4iBYR/qnS9mlJXtbLKIn0ct4GkQJi5GtNYKhf464tP2ghACmUyOevokpHIlVoSHw+a6h5v9Xtx/9ha5dD+Sy69WkwXrte6Q1WqsSqyApOAMdHVuiNMNIIRAkZ6Byz1D6HvyCiftt9HUPgi6fRjNV/5ErW0I4sLWO2ThBg0TsjoDYTFFiM89gfTqa4hW1IAQAhabg81xCdiWmIraY7/A3j2KX294kG95BMmhu4jUOTyEzc9kQlap8M26LESpG7CzzIWYdNP/7lepNfi9+yVs3WNQm/uQfNANUd7FUcKJ3NUzf40KC/k6rE01YkdpOwSy2Q2ksjQYjpzG9/Q5NJ5qRXPnCGouDCOfHoC06hYEOS13CEeQW8PaqEKoIAsihRHS8k4IZfrZEBVq1DleorHLh8arPtR3TKLyvAeFxx9DaXCDrz1LkbDYktBQvsrPjczEuqQyJOx1IurfDGTKTNAdDBq7ptDQNYUjrneodU6g6rwHKRXXZyLk9Gy1Q0U6A3dTBnhJJZAecCClsBkrwlciZ3cx6M4xWK79jR8v+2Bue4Nq2xjy6QEIcltq5jRZHsyJ1F7iCrMRm2OFxtSNcsstmM704mjHa5jbvDBdmoC+hUFeQz/EBU4nIfLggHeQB7NFeYZl2yr9ccWt0JgfoPT0C1T99hcqzo1gn/UZ1KZev0hnM3xF/B+42ynumrQTRvEeR69Mf3Nca34wnmF09yYccBnXKpu4gfwvLIL1Qrog43cAAAAASUVORK5CYII=" LAST_CHARSET="UTF-8">Pale Moon forum</A>
<DT><A HREF="https://forum.palemoon.org/viewforum.php?f=24" ICON_URI="http://www.palemoon.org/favicon.ico" ICON="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAADe0lEQVQ4jW2T7VPTBQDHfwd/gpZW57bwuvJFIQ1lPgy9g7KzNCO4A9sDA8FNTCyg0KD9GBuCIrYhHYPw6Ygd2xB0rAFrEfxikA03YibyIO4pYGwONlhbx923F72I2/V5/f18X32/BBHDrox6ejKnlTxSaqRKlROuK5op1w3DHKUfdZC1d36hxeY3Qca9lVFH7uG2RFLPdKGo0YqOQTcouw/T7hBcy2E4l9YjuhGHmCDJuFg7bmd6mXrXMRleO9EEZp4axc2T6DH/CddyGN5ABMH1vxGObMC/GoVp3N1JEJtKXmadEdPY50FLJ/FGphIHzurx5Y1HMFiW8HB2BX84gvD4wghHNvBXdAMeXxi3fpj5+l+ZWUjbzsyL0NjFeDOjAcm823inxIjSVjuMD72g7D5YZ1fw2BmEbzWCQCgK29wK6rXTEYF0aAexPTmX3MbkY+fhYqQKlMgW/wiObAzFzZNo1s9D/2ARk/OrGPrdB5PVC5PVi7HHz3FaYUN29ZCYePFt/vDW3VwkfnARR4tuouAyBUGdGbw6C9r6HTDZlmF/tgoN5UFbnwPynjk06+chUz1B2vn7Q8RLyTzX1kQOEg59iiOF3+IkOQCejIJQboXi3lOMzwQw7Q5h5JEf6mEPbhudEF2fwNGKEbBOqZ0ELYXn2pLIwQvMPLB5cmSU68C7NIqSlilcveuCweLH+EwI1tkg9A8WofrZDW6tBccvDoN9Wu0k6Ck8alsSB6+kFCDpIylOlPUgR0JB+I0V4g43FL1+dFIhGH5bR1v/EiTfP4VIPoHMykGkCjXDBC1FUEXbywFjfz7Y2VJkXtAhp2oQIrkNEvUC6nV+NPaH0NgXQv19PyranTjbZEeOhMLBQhVJMFhCBmPvJ9GE/Twwj5fj/c+04NaMoKT1CRp6A7g+sAZFXxByQxBXdc8h1S6hst2BD8sHIkknv6MTBEEQ9H25klf3ccE8VobMLzQQXrNA0ulB08AamoxraOwPoaE3gNruZZAqN0QKGw6JtFWblpwVT2fxtQkH8pFeoAS/hsKFW7O4cs+Ha/oA6rq9qOlahLjDBaHchrRz3VqCyIqPuUNW/A5WfvXr71VE3z3XBX7tGMraplHZ/gxf3ZnH5y1T4MhGo6kiTfX/yP/BOEwyducopWlFXeYs8U8Lgsu/LvAvmc0fV5ikrFwVIzb/D6b/QY5z63dPAAAAAElFTkSuQmCC">F.A.Q.</A>
<DT><A HREF="http://www.palemoon.org/releasenotes.shtml" ICON_URI="http://www.palemoon.org/favicon.ico" ICON="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAADe0lEQVQ4jW2T7VPTBQDHfwd/gpZW57bwuvJFIQ1lPgy9g7KzNCO4A9sDA8FNTCyg0KD9GBuCIrYhHYPw6Ygd2xB0rAFrEfxikA03YibyIO4pYGwONlhbx923F72I2/V5/f18X32/BBHDrox6ejKnlTxSaqRKlROuK5op1w3DHKUfdZC1d36hxeY3Qca9lVFH7uG2RFLPdKGo0YqOQTcouw/T7hBcy2E4l9YjuhGHmCDJuFg7bmd6mXrXMRleO9EEZp4axc2T6DH/CddyGN5ABMH1vxGObMC/GoVp3N1JEJtKXmadEdPY50FLJ/FGphIHzurx5Y1HMFiW8HB2BX84gvD4wghHNvBXdAMeXxi3fpj5+l+ZWUjbzsyL0NjFeDOjAcm823inxIjSVjuMD72g7D5YZ1fw2BmEbzWCQCgK29wK6rXTEYF0aAexPTmX3MbkY+fhYqQKlMgW/wiObAzFzZNo1s9D/2ARk/OrGPrdB5PVC5PVi7HHz3FaYUN29ZCYePFt/vDW3VwkfnARR4tuouAyBUGdGbw6C9r6HTDZlmF/tgoN5UFbnwPynjk06+chUz1B2vn7Q8RLyTzX1kQOEg59iiOF3+IkOQCejIJQboXi3lOMzwQw7Q5h5JEf6mEPbhudEF2fwNGKEbBOqZ0ELYXn2pLIwQvMPLB5cmSU68C7NIqSlilcveuCweLH+EwI1tkg9A8WofrZDW6tBccvDoN9Wu0k6Ck8alsSB6+kFCDpIylOlPUgR0JB+I0V4g43FL1+dFIhGH5bR1v/EiTfP4VIPoHMykGkCjXDBC1FUEXbywFjfz7Y2VJkXtAhp2oQIrkNEvUC6nV+NPaH0NgXQv19PyranTjbZEeOhMLBQhVJMFhCBmPvJ9GE/Twwj5fj/c+04NaMoKT1CRp6A7g+sAZFXxByQxBXdc8h1S6hst2BD8sHIkknv6MTBEEQ9H25klf3ccE8VobMLzQQXrNA0ulB08AamoxraOwPoaE3gNruZZAqN0QKGw6JtFWblpwVT2fxtQkH8pFeoAS/hsKFW7O4cs+Ha/oA6rq9qOlahLjDBaHchrRz3VqCyIqPuUNW/A5WfvXr71VE3z3XBX7tGMraplHZ/gxf3ZnH5y1T4MhGo6kiTfX/yP/BOEwyducopWlFXeYs8U8Lgsu/LvAvmc0fV5ikrFwVIzb/D6b/QY5z63dPAAAAAElFTkSuQmCC">Release notes</A>
</DL><p> </DL><p>
</DL><p> </DL><p>

2
docs/CODE_OF_CONDUCT.md
View File

@ -44,7 +44,7 @@ This Code of Conduct applies within project spaces (forum, website, IRC, reposit
We expect our community to apply a good measure of self-regulation when it comes to the conduct displayed by its members. We believe that any community of adults is capable of applying the concepts of common sense, common decency and common courtesy to interactions between its members. We expect our community to apply a good measure of self-regulation when it comes to the conduct displayed by its members. We believe that any community of adults is capable of applying the concepts of common sense, common decency and common courtesy to interactions between its members.
That said, there are always exception situations possible where things need to be escalated, which is where this section comes into play. That said, there are always exception situations possible where things need to be escalated, which is where this section comes into play.
Incidents involving abusive, harassing, or otherwise unacceptable behavior that need to be escalated for resolution may be reported by contacting the project owner at moonchild@palemoon.org. The project owner will then review and investigate all complaints and related communication of the case, and will respond in a way that they deem appropriate for the circumstances. Incidents involving abusive, harassing, or otherwise unacceptable behavior that need to be escalated for resolution may be reported by contacting the project owner. The project owner will then review and investigate all complaints and related communication of the case, and will respond in a way that they deem appropriate for the circumstances.
## Confidentiality ## Confidentiality

2
docshell/base/nsAboutRedirector.cpp
View File

@ -53,7 +53,7 @@ static RedirEntry kRedirMap[] = {
{ "config", "chrome://global/content/config.xul", 0 }, { "config", "chrome://global/content/config.xul", 0 },
{ "console", "chrome://global/content/console.xul", 0 }, { "console", "chrome://global/content/console.xul", 0 },
{ {
"credits", "http://www.palemoon.org/Contributors.shtml", "credits", "",
nsIAboutModule::URI_SAFE_FOR_UNTRUSTED_CONTENT | nsIAboutModule::URI_SAFE_FOR_UNTRUSTED_CONTENT |
nsIAboutModule::MAKE_LINKABLE nsIAboutModule::MAKE_LINKABLE
}, },

14
services/sync/services-sync.js
View File

@ -2,13 +2,13 @@
* License, v. 2.0. If a copy of the MPL was not distributed with this * License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
pref("services.sync.serverURL", "https://pmsync.palemoon.org/sync/index.php/"); pref("services.sync.serverURL", "");
pref("services.sync.userURL", "user/"); pref("services.sync.userURL", "user/");
pref("services.sync.miscURL", "misc/"); pref("services.sync.miscURL", "misc/");
pref("services.sync.termsURL", "http://www.palemoon.org/sync/terms.shtml"); pref("services.sync.termsURL", "");
pref("services.sync.privacyURL", "http://www.palemoon.org/sync/privacy.shtml"); pref("services.sync.privacyURL", "");
pref("services.sync.statusURL", "https://pmsync.palemoon.org/status/"); pref("services.sync.statusURL", "");
pref("services.sync.syncKeyHelpURL", "http://www.palemoon.org/sync/keyhelp.shtml"); pref("services.sync.syncKeyHelpURL", "");
pref("services.sync.lastversion", "firstrun"); pref("services.sync.lastversion", "firstrun");
pref("services.sync.sendVersionInfo", true); pref("services.sync.sendVersionInfo", true);
@ -33,7 +33,7 @@ pref("services.sync.engine.prefs", true);
pref("services.sync.engine.tabs", true); pref("services.sync.engine.tabs", true);
pref("services.sync.engine.tabs.filteredUrls", "^(about:.*|chrome://weave/.*|wyciwyg:.*|file:.*|blob:.*)$"); pref("services.sync.engine.tabs.filteredUrls", "^(about:.*|chrome://weave/.*|wyciwyg:.*|file:.*|blob:.*)$");
pref("services.sync.jpake.serverURL", "https://keyserver.palemoon.org/"); pref("services.sync.jpake.serverURL", "");
pref("services.sync.jpake.pollInterval", 1000); pref("services.sync.jpake.pollInterval", 1000);
pref("services.sync.jpake.firstMsgMaxTries", 300); // 5 minutes pref("services.sync.jpake.firstMsgMaxTries", 300); // 5 minutes
pref("services.sync.jpake.lastMsgMaxTries", 300); // 5 minutes pref("services.sync.jpake.lastMsgMaxTries", 300); // 5 minutes
@ -48,7 +48,7 @@ pref("services.sync.addons.ignoreRepositoryChecking", true);
pref("services.sync.addons.ignoreUserEnabledChanges", false); pref("services.sync.addons.ignoreUserEnabledChanges", false);
// Comma-delimited list of hostnames to trust for add-on install. // Comma-delimited list of hostnames to trust for add-on install.
pref("services.sync.addons.trustedSourceHostnames", "addons.palemoon.org,addons.mozilla.org"); pref("services.sync.addons.trustedSourceHostnames", "addons.mozilla.org");
pref("services.sync.log.appender.console", "Warn"); pref("services.sync.log.appender.console", "Warn");
pref("services.sync.log.appender.dump", "Error"); pref("services.sync.log.appender.dump", "Error");

2
toolkit/components/reader/Readerable.js
View File

@ -53,10 +53,8 @@ var Readerable = {
_blockedHosts: [ _blockedHosts: [
"amazon.com", "amazon.com",
"basilisk-browser.org",
"github.com", "github.com",
"mail.google.com", "mail.google.com",
"palemoon.org",
"pinterest.com", "pinterest.com",
"reddit.com", "reddit.com",
"twitter.com", "twitter.com",

2
toolkit/content/aboutRights.xhtml
View File

@ -32,9 +32,7 @@
<!-- Point 2 discusses Mozilla trademarks, and isn't needed when the build is unbranded. <!-- Point 2 discusses Mozilla trademarks, and isn't needed when the build is unbranded.
- Point 3 discusses privacy policy, unbranded builds get a placeholder (for the vendor to replace) - Point 3 discusses privacy policy, unbranded builds get a placeholder (for the vendor to replace)
- Point 4 discusses web service terms, unbranded builds gets a placeholder (for the vendor to replace) --> - Point 4 discusses web service terms, unbranded builds gets a placeholder (for the vendor to replace) -->
<li>&rights.intro-point2-a;<a href="http://www.palemoon.org/branding.shtml">&rights.intro-point2-b;</a>&rights.intro-point2-c;</li>
<li>&rights.intro-point2.5;</li> <li>&rights.intro-point2.5;</li>
<li>&rights2.intro-point3a;<a href="http://www.palemoon.org/privacy.shtml">&rights2.intro-point3b;</a>&rights.intro-point3c;</li>
<li>&rights2.intro-point4a;<a href="about:rights#webservices" onclick="showServices();">&rights.intro-point4b;</a>&rights.intro-point4c;</li> <li>&rights2.intro-point4a;<a href="about:rights#webservices" onclick="showServices();">&rights.intro-point4b;</a>&rights.intro-point4c;</li>
<li>&rights.intro-point5;</li> <li>&rights.intro-point5;</li>
</ul> </ul>