Hardcoded generic branding

This commit is contained in:
K4sum1 2025-04-26 22:51:02 -07:00
commit 76fa1af460
42 changed files with 646 additions and 252 deletions

View file

@ -79,7 +79,7 @@ static void Output(const char *fmt, ... )
decltype(MessageBoxW)* messageBoxW = decltype(MessageBoxW)* messageBoxW =
(decltype(MessageBoxW)*) GetProcAddress(user32, "MessageBoxW"); (decltype(MessageBoxW)*) GetProcAddress(user32, "MessageBoxW");
if (messageBoxW) { if (messageBoxW) {
messageBoxW(nullptr, wide_msg, L"Basilisk", MB_OK messageBoxW(nullptr, wide_msg, L"XULRunner", MB_OK
| MB_ICONERROR | MB_ICONERROR
| MB_SETFOREGROUND); | MB_SETFOREGROUND);
} }

View file

@ -3,10 +3,10 @@
<assemblyIdentity <assemblyIdentity
version="1.0.0.0" version="1.0.0.0"
processorArchitecture="*" processorArchitecture="*"
name="Basilisk" name="Serpent"
type="win32" type="win32"
/> />
<description>Firefox</description> <description>Serpent</description>
<dependency> <dependency>
<dependentAssembly> <dependentAssembly>
<assemblyIdentity <assemblyIdentity

View file

@ -9,8 +9,8 @@
# BrandFullNameInternal is used for some registry and file system values # BrandFullNameInternal is used for some registry and file system values
# instead of BrandFullName and typically should not be modified. # instead of BrandFullName and typically should not be modified.
!define BrandFullNameInternal "Serpent" !define BrandFullNameInternal "Serpent"
!define CompanyName "Moonchild Productions" !define CompanyName "Open Source Contributors"
!define URLInfoAbout "https://www.basilisk-browser.org" !define URLInfoAbout "about:blank"
!define URLUpdateInfo "https://www.basilisk-browser.org" !define URLUpdateInfo "about:blank"
!define HelpLink "https://msfn.org/board/topic/177125-my-build-of-new-moon-temp-name-aka-pale-moon-fork-targetting-xp/?do=getNewComment" !define HelpLink "about:blank"
!define URLSystemRequirements "https://www.basilisk-browser.org" !define URLSystemRequirements "about:blank"

View file

@ -2,4 +2,24 @@
# 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/.
MOZ_APP_DISPLAYNAME=Serpent MOZ_APP_NAME=serpent
MOZ_APP_BASENAME="Serpent"
MOZ_APP_DISPLAYNAME="Serpent"
MOZ_APP_UA_NAME="Basilisk"
MOZ_APP_VENDOR="Open Source Contributors"
MOZ_APP_FULLNAME="Serpent"
MOZ_APP_PROFILE="OpenSource/Serpent"
MOZ_APP_REMOTINGNAME=com.opensource.serpent
MOZ_DISTRIBUTION_ID=com.opensource
MOZ_MACBUNDLE_NAME="serpent.app"
MOZ_SOURCE_REPO=https://github.com/Eclipse-Community/UXP

View file

@ -5,6 +5,6 @@
<!ENTITY brandShorterName "Serpent"> <!ENTITY brandShorterName "Serpent">
<!ENTITY brandShortName "Serpent"> <!ENTITY brandShortName "Serpent">
<!ENTITY brandFullName "Serpent"> <!ENTITY brandFullName "Serpent">
<!ENTITY vendorShortName "Moonchild"> <!ENTITY vendorShortName "Open Source Contributors">
<!ENTITY vendorFullName "Moonchild Productions"> <!ENTITY vendorFullName "Open Source Contributors">
<!ENTITY trademarkInfo.part1 " "> <!ENTITY trademarkInfo.part1 " ">

View file

@ -5,7 +5,7 @@
brandShorterName=Serpent brandShorterName=Serpent
brandShortName=Serpent brandShortName=Serpent
brandFullName=Serpent brandFullName=Serpent
vendorShortName=Moonchild vendorShortName=Open Source Contributors
vendorFullName=Moonchild Productions vendorFullName=Open Source Contributors
syncBrandShortName=Sync syncBrandShortName=Sync

View file

@ -10,3 +10,7 @@ export('DIST_SUBDIR')
include('../shared/branding.mozbuild') include('../shared/branding.mozbuild')
ApplicationBranding() ApplicationBranding()
FINAL_TARGET_FILES['..'] += [
'serpent.VisualElementsManifest.xml',
]

View file

@ -5,10 +5,6 @@
#filter substitution #filter substitution
#filter emptyLines #filter emptyLines
// Set defines to construct URLs
#define BRANDING_BASEURL basilisk-browser.org
#define BRANDING_SITEURL www.@BRANDING_BASEURL@
// Shared Branding Preferences // Shared Branding Preferences
// XXX: These should REALLY go back to application preferences // XXX: These should REALLY go back to application preferences
#include ../../shared/preferences.inc #include ../../shared/preferences.inc
@ -19,10 +15,10 @@ pref("startup.homepage_welcome_url", "");
pref("startup.homepage_welcome_url.additional", ""); pref("startup.homepage_welcome_url.additional", "");
// Version release notes // Version release notes
pref("app.releaseNotesURL", "https://rtfreesoft.blogspot.com/search/label/serpent"); pref("app.releaseNotesURL", "");
// base url for web-based feedback pages // base url for web-based feedback pages
pref("app.feedback.baseURL", "https://msfn.org/board/topic/177125-my-build-of-new-moon-temp-name-aka-pale-moon-fork-targetting-xp/?do=getNewComment"); pref("app.feedback.baseURL", "");
// Vendor home page // Vendor home page
pref("app.vendorURL", "about:"); pref("app.vendorURL", "about:");

View file

@ -0,0 +1,8 @@
<Application xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance'>
<VisualElements
ShowNameOnSquare150x150Logo='on'
Square150x150Logo='browser\VisualElements\VisualElements_150.png'
Square70x70Logo='browser\VisualElements\VisualElements_70.png'
ForegroundText='light'
BackgroundColor='#304D7E'/>
</Application>

View file

@ -0,0 +1,353 @@
[Desktop Entry]
Name=Serpent
GenericName=Web Browser
GenericName[ar]=متصفح ويب
GenericName[ast]=Restolador Web
GenericName[bn]=ওয়েব ব্রাউজার
GenericName[ca]=Navegador web
GenericName[cs]=Webový prohlížeč
GenericName[da]=Webbrowser
GenericName[el]=Περιηγητής διαδικτύου
GenericName[es]=Navegador web
GenericName[et]=Veebibrauser
GenericName[fa]=مرورگر اینترنتی
GenericName[fi]=WWW-selain
GenericName[fr]=Navigateur Web
GenericName[gl]=Navegador Web
GenericName[he]=דפדפן אינטרנט
GenericName[hr]=Web preglednik
GenericName[hu]=Webböngésző
GenericName[it]=Browser web
GenericName[ja]=ウェブ・ブラウザ
GenericName[ko]=웹 브라우저
GenericName[ku]=Geroka torê
GenericName[lt]=Interneto naršyklė
GenericName[nb]=Nettleser
GenericName[nl]=Webbrowser
GenericName[nn]=Nettlesar
GenericName[no]=Nettleser
GenericName[pl]=Przeglądarka WWW
GenericName[pt]=Navegador Web
GenericName[pt_BR]=Navegador Web
GenericName[ro]=Navigator Internet
GenericName[ru]=Веб-браузер
GenericName[sk]=Internetový prehliadač
GenericName[sl]=Spletni brskalnik
GenericName[sv]=Webbläsare
GenericName[tr]=Web Tarayıcı
GenericName[ug]=توركۆرگۈ
GenericName[uk]=Веб-браузер
GenericName[vi]=Trình duyệt Web
GenericName[zh_CN]=网络浏览器
GenericName[zh_TW]=網路瀏覽器
Comment=Browse the World Wide Web
Comment[ar]=تصفح الشبكة العنكبوتية العالمية
Comment[ast]=Restola pela Rede
Comment[bn]=ইন্টারনেট ব্রাউজ করুন
Comment[ca]=Navegueu per la web
Comment[cs]=Prohlížení stránek World Wide Webu
Comment[da]=Surf på internettet
Comment[de]=Im Internet surfen
Comment[el]=Μπορείτε να περιηγηθείτε στο διαδίκτυο (Web)
Comment[es]=Navegue por la web
Comment[et]=Lehitse veebi
Comment[fa]=صفحات شبکه جهانی اینترنت را مرور نمایید
Comment[fi]=Selaa Internetin WWW-sivuja
Comment[fr]=Naviguer sur le Web
Comment[gl]=Navegar pola rede
Comment[he]=גלישה ברחבי האינטרנט
Comment[hr]=Pretražite web
Comment[hu]=A világháló böngészése
Comment[it]=Esplora il web
Comment[ja]=ウェブを閲覧します
Comment[ko]=웹을 돌아 다닙니다
Comment[ku]=Li torê bigere
Comment[lt]=Naršykite internete
Comment[nb]=Surf på nettet
Comment[nl]=Verken het internet
Comment[nn]=Surf på nettet
Comment[no]=Surf på nettet
Comment[pl]=Przeglądanie stron WWW
Comment[pt]=Navegue na Internet
Comment[pt_BR]=Navegue na Internet
Comment[ro]=Navigați pe Internet
Comment[ru]=Доступ в Интернет
Comment[sk]=Prehliadanie internetu
Comment[sl]=Brskajte po spletu
Comment[sv]=Surfa på webben
Comment[tr]=İnternet'te Gezinin
Comment[ug]=دۇنيادىكى توربەتلەرنى كۆرگىلى بولىدۇ
Comment[uk]=Перегляд сторінок Інтернету
Comment[vi]=Để duyệt các trang web
Comment[zh_CN]=浏览互联网
Comment[zh_TW]=瀏覽網際網路
Exec=serpent %u
Terminal=false
Type=Application
Icon=serpent
Categories=Network;WebBrowser;
MimeType=text/html;text/xml;application/xhtml+xml;application/vnd.mozilla.xul+xml;text/mml;x-scheme-handler/http;x-scheme-handler/https;x-scheme-handler/ftp;
StartupNotify=false
Actions=NewTab;NewWindow;NewPrivateWindow;
StartupWMClass="serpent"
[Desktop Action NewTab]
Name=Open new tab
Name[ach]=Yab dirica matidi manyen
Name[af]=Open nuwe oortjie
Name[an]=Ubrir una pestanya nueva
Name[ar]=افتح لسانًا جديدًا
Name[as]=নতুন টেব খোলক
Name[ast]=Abrir llingüeta nueva
Name[az]=Yeni vərəq aç
Name[be]=Адкрыць новую ўстаўку
Name[bg]=Отваряне на нов подпрозорец
Name[bn_BD]=নতুন ট্যাব খুলুন
Name[bn_IN]=নতুন ট্যাব খুলুন
Name[br]=Digeriñ un ivinell nevez
Name[bs]=Otvori novi tab
Name[ca]=Obre una pestanya nova
Name[cs]=Otevřít nový panel
Name[cy]=Agor tab newydd
Name[da]=Åbn nyt faneblad
Name[de]=Neuen Tab öffnen
Name[dsb]=Nowy rejtark wócyniś
Name[el]=Άνοιγμα νέας καρτέλας
Name[eo]=Malfermi novan langeton
Name[es_AR]=Abrir nueva pestaña
Name[es_CL]=Abrir nueva pestaña
Name[es_ES]=Abrir pestaña nueva
Name[es_MX]=Abrir una pestaña nueva
Name[et]=Ava uus kaart
Name[eu]=Ireki fitxa berria
Name[ff]=Uddit tabbere hesere
Name[fi]=Avaa uusi välilehti
Name[fr]=Ouvrir un nouvel onglet
Name[fy_NL]=Iepenje nij ljepblêd
Name[ga_IE]=Oscail i gcluaisín nua
Name[gd]=Fosgail taba ùr
Name[gl]=Abrir unha nova lapela
Name[gu_IN]=નવી ટૅબને ખોલો
Name[he]=פתיחת לשונית חדשה
Name[hi_IN]=नया टैब खोलें
Name[hr]=Otvori novu karticu
Name[hsb]=Nowy rajtark wočinić
Name[hu]=Új lap megnyitása
Name[hy_AM]=Բացել նոր ներդիր
Name[id]=Buka tab baru
Name[is]=Opna nýjan flipa
Name[it]=Apri nuova scheda
Name[ja]=新しいタブ
Name[kk]=Жаңа бетті ашу
Name[kn]=ಹೊಸ ಹಾಳೆಯನ್ನು ತೆರೆ
Name[ko]=새 탭 열기
Name[lij]=Àrvi nêuvo féuggio
Name[lt]=Atverti naują kortelę
Name[mai]=नव टैब खोलू
Name[mk]=Отвори ново јазиче
Name[ml]=പുതിയ റ്റാബ് തുറക്കുക
Name[mr]=नवीन टॅब उघडा
Name[ms]=Buka tab baru
Name[nb_NO]=Åpne ny fane
Name[nl]=Nieuw tabblad openen
Name[nn_NO]=Opna ny fane
Name[or]=ନୂତନ ଟ୍ୟାବ ଖୋଲନ୍ତୁ
Name[pa_IN]=ਨਵੀਂ ਟੈਬ ਖੋਲ੍ਹੋ
Name[pl]=Otwórz nową kartę
Name[pt_BR]=Nova aba
Name[pt_PT]=Abrir novo separador
Name[rm]=Avrir in nov tab
Name[ro]=Deschide o filă nouă
Name[ru]=Открыть новую вкладку
Name[si]=නව ටැබය විවෘත කරන්න
Name[sk]=Otvoriť novú kartu
Name[sl]=Odpri nov zavihek
Name[son]=Nor loku taaga feeri
Name[sq]=Hap skedë të re
Name[sr]=Отвори нови језичак
Name[sv_SE]=Öppna ny flik
Name[ta]=புதிய கீற்றைத் திற
Name[te]=కొత్త టాబ్ తెరువుము
Name[th]=เปิดแท็บใหม่
Name[tr]=Yeni sekme aç
Name[uk]=Відкрити нову вкладку
Name[uz]=Yangi ichki oyna ochish
Name[vi]=Mở thẻ mới
Name[xh]=Vula ithebhu entsha
Name[zh_CN]=打开新标签页
Name[zh_TW]=開啟新分頁
Exec=serpent -new-tab
[Desktop Action NewWindow]
Name=Open new window
Name[ach]=Yab dirica manyen
Name[af]=Open nuwe venster
Name[an]=Ubrir una nueva finestra
Name[ar]=افتح نافذة جديدة
Name[as]=নতুন উইন্ডো খোলক
Name[ast]=Abrir ventana nueva
Name[az]=Yeni pəncərə aç
Name[be]=Адкрыць новае акно
Name[bg]=Отваряне на нов прозорец
Name[bn_BD]=নতুন উইন্ডো খুলুন
Name[bn_IN]=নতুন উইন্ডো খুলুন
Name[br]=Digeriñ ur prenestr nevez
Name[bs]=Otvori novi prozor
Name[ca]=Obre una finestra nova
Name[cs]=Otevřít nové okno
Name[cy]=Agor ffenestr newydd
Name[da]=Åbn nyt vindue
Name[de]=Neues Fenster öffnen
Name[dsb]=Nowe wokno wócyniś
Name[el]=Άνοιγμα νέου παραθύρου
Name[eo]=Malfermi novan fenestron
Name[es_AR]=Abrir nueva ventana
Name[es_CL]=Abrir nueva ventana
Name[es_ES]=Abrir nueva ventana
Name[es_MX]=Abrir nueva ventana
Name[et]=Ava uus aken
Name[eu]=Ireki leiho berria
Name[ff]=Uddit henorde hesere
Name[fi]=Avaa uusi ikkuna
Name[fr]=Ouvrir une nouvelle fenêtre
Name[fy_NL]=Iepenje nij finster
Name[ga_IE]=Oscail fuinneog nua
Name[gd]=Fosgail uinneag ùr
Name[gl]=Abrir unha nova xanela
Name[gu_IN]=નવી વિન્ડોને ખોલો
Name[he]=פתח חלון חדש
Name[hi_IN]=नई विंडो खोलें
Name[hr]=Otvori novi prozor
Name[hsb]=Nowe wokno wočinić
Name[hu]=Új ablak megnyitása
Name[hy_AM]=Բացել նոր պատուհան
Name[id]=Buka jendela baru
Name[is]=Opna nýjan glugga
Name[it]=Apri nuova finestra
Name[ja]=新しいウィンドウ
Name[kk]=Жаңа терезені ашу
Name[kn]=ಹೊಸ ವಿಂಡೊವನ್ನು ತೆರೆ
Name[ko]=새 창 열기
Name[lij]=Àrvi nêuvo barcón
Name[lt]=Atverti naują langą
Name[mai]=नई विंडो खोलू
Name[mk]=Отвори нов прозорец
Name[ml]=പുതിയ ജാലകം തുറക്കുക
Name[mr]=नवीन पटल उघडा
Name[ms]=Buka tetingkap baru
Name[nb_NO]=Åpne nytt vindu
Name[nl]=Een nieuw venster openen
Name[nn_NO]=Opna nytt vindauge
Name[or]=ନୂତନ ୱିଣ୍ଡୋ ଖୋଲନ୍ତୁ
Name[pa_IN]=ਨਵੀਂ ਵਿੰਡੋ ਖੋਲ੍ਹੋ
Name[pl]=Otwórz nowe okno
Name[pt_BR]=Nova janela
Name[pt_PT]=Abrir nova janela
Name[rm]=Avrir ina nova fanestra
Name[ro]=Deschide o nouă fereastră
Name[ru]=Открыть новое окно
Name[si]=නව කවුළුවක් විවෘත කරන්න
Name[sk]=Otvoriť nové okno
Name[sl]=Odpri novo okno
Name[son]=Zanfun taaga feeri
Name[sq]=Hap dritare të re
Name[sr]=Отвори нови прозор
Name[sv_SE]=Öppna nytt fönster
Name[ta]=புதிய சாளரத்தை திற
Name[te]=కొత్త విండో తెరువుము
Name[th]=เปิดหน้าต่างใหม่
Name[tr]=Yeni pencere aç
Name[uk]=Відкрити нове вікно
Name[uz]=Yangi oyna ochish
Name[vi]=Mở cửa sổ mới
Name[xh]=Vula iwindow entsha
Name[zh_CN]=打开新窗口
Name[zh_TW]=開啟新視窗
Exec=serpent -new-window
[Desktop Action NewPrivateWindow]
Name=New private window
Name[ach]=Dirica manyen me mung
Name[af]=Nuwe privaatvenster
Name[an]=Nueva finestra de navegación privada
Name[ar]=نافذة خاصة جديدة
Name[as]=নতুন ব্যক্তিগত উইন্ডো
Name[ast]=Ventana privada nueva
Name[az]=Yeni məxfi pəncərə
Name[be]=Новае акно адасаблення
Name[bg]=Нов прозорец за поверително сърфиране
Name[bn_BD]=নতুন ব্যক্তিগত উইন্ডো
Name[bn_IN]=নতুন ব্যাক্তিগত উইন্ডো
Name[br]=Prenestr merdeiñ prevez nevez
Name[bs]=Novi privatni prozor
Name[ca]=Finestra privada nova
Name[cs]=Nové anonymní okno
Name[cy]=Ffenestr breifat newydd
Name[da]=Nyt privat vindue
Name[de]=Neues privates Fenster öffnen
Name[dsb]=Nowe priwatne wokno
Name[el]=Νέο παράθυρο ιδιωτικής περιήγησης
Name[eo]=Nova privata fenestro
Name[es_AR]=Nueva ventana privada
Name[es_CL]=Nueva ventana privada
Name[es_ES]=Nueva ventana privada
Name[es_MX]=Nueva ventana privada
Name[et]=Uus privaatne aken
Name[eu]=Leiho pribatu berria
Name[ff]=Henorde suturo hesere
Name[fi]=Uusi yksityinen ikkuna
Name[fr]=Nouvelle fenêtre de navigation privée
Name[fy_NL]=Nij priveefinster
Name[ga_IE]=Fuinneog nua phríobháideach
Name[gd]=Uinneag phrìobhaideach ùr
Name[gl]=Nova xanela privada
Name[gu_IN]=નવી ખાનગી વિન્ડો
Name[he]=חלון פרטי חדש
Name[hi_IN]=नया निजी विंडो
Name[hr]=Novi privatni prozor
Name[hsb]=Nowe priwatne wokno
Name[hu]=Új privát ablak
Name[hy_AM]=Գաղտնի դիտարկում
Name[id]=Jendela mode pribadi baru
Name[is]=Nýr einkagluggi
Name[it]=Nuova finestra anonima
Name[ja]=新しいプライベートウィンドウ
Name[kk]=Жаңа жекелік терезе
Name[kn]=ಹೊಸ ಖಾಸಗಿ ಕಿಟಕಿ
Name[ko]=새 사생활 보호 창
Name[lij]=Nêuvo barcón privòu
Name[lt]=Atverti privačiojo naršymo langą
Name[mai]=नव निज विंडो
Name[mk]=Нов прозорец за приватно сурфање
Name[ml]=പുതിയ സ്വകാര്യ ജാലകം
Name[mr]=नवीन वैयक्तिक पटल
Name[ms]=Tetingkap peribadi baharu
Name[nb_NO]=Nytt privat vindu
Name[nl]=Nieuw privévenster
Name[nn_NO]=Nytt privat vindauge
Name[or]=ନୂତନ ବ୍ୟକ୍ତିଗତ ୱିଣ୍ଡୋ
Name[pa_IN]=ਨਵੀਂ ਪ੍ਰਾਈਵੇਟ ਵਿੰਡੋ
Name[pl]=Nowe okno w trybie prywatnym
Name[pt_BR]=Nova janela privativa
Name[pt_PT]=Nova janela privada
Name[rm]=Nova fanestra privata
Name[ro]=Fereastră fără urme nouă
Name[ru]=Новое приватное окно
Name[si]=නව පුද්ගලික කවුළුව
Name[sk]=Nové okno v režime Súkromné prehliadanie
Name[sl]=Novo zasebno okno
Name[son]=Sutura zanfun taaga
Name[sq]=Dritare e re private
Name[sr]=Нови приватни прозор
Name[sv_SE]=Nytt privat fönster
Name[ta]=புதிய தனிப்பட்ட சாளரம்
Name[te]=కొత్త ఆంతరంగిక విండో
Name[th]=หน้าต่างท่องเว็บแบบส่วนตัวใหม่
Name[tr]=Yeni gizli pencere
Name[uk]=Нове приватне вікно
Name[uz]=Yangi shaxsiy oyna
Name[vi]=Cửa sổ riêng tư mới
Name[xh]=Ifestile yangasese entsha
Name[zh_CN]=新建隐私浏览窗口
Name[zh_TW]=新增隱私視窗
Exec=serpent -private-window

View file

@ -101,18 +101,18 @@ OpenKeyForReading(HKEY aKeyRoot, const nsAString& aKeyName, HKEY* aKey)
// .htm .html .shtml .xht .xhtml // .htm .html .shtml .xht .xhtml
// are mapped like so: // are mapped like so:
// //
// HKCU\SOFTWARE\Classes\.<ext>\ (default) REG_SZ BasiliskHTML // HKCU\SOFTWARE\Classes\.<ext>\ (default) REG_SZ SerpentHTML
// //
// as aliases to the class: // as aliases to the class:
// //
// HKCU\SOFTWARE\Classes\BasiliskHTML\ // HKCU\SOFTWARE\Classes\SerpentHTML\
// DefaultIcon (default) REG_SZ <apppath>,1 // DefaultIcon (default) REG_SZ <apppath>,1
// shell\open\command (default) REG_SZ <apppath> -osint -url "%1" // shell\open\command (default) REG_SZ <apppath> -osint -url "%1"
// shell\open\ddeexec (default) REG_SZ <empty string> // shell\open\ddeexec (default) REG_SZ <empty string>
// //
// - Windows Vista and above Protocol Handler // - Windows Vista and above Protocol Handler
// //
// HKCU\SOFTWARE\Classes\BasiliskURL\ (default) REG_SZ <appname> URL // HKCU\SOFTWARE\Classes\SerpentURL\ (default) REG_SZ <appname> URL
// EditFlags REG_DWORD 2 // EditFlags REG_DWORD 2
// FriendlyTypeName REG_SZ <appname> URL // FriendlyTypeName REG_SZ <appname> URL
// DefaultIcon (default) REG_SZ <apppath>,1 // DefaultIcon (default) REG_SZ <apppath>,1
@ -156,7 +156,8 @@ typedef struct {
const char* oldValueData; const char* oldValueData;
} SETTING; } SETTING;
#define APP_REG_NAME L"Basilisk" // Find a way to unhardcode this
#define APP_REG_NAME L"Serpent"
#define VAL_FILE_ICON "%APPPATH%,1" #define VAL_FILE_ICON "%APPPATH%,1"
#define VAL_OPEN "\"%APPPATH%\" -osint -url \"%1\"" #define VAL_OPEN "\"%APPPATH%\" -osint -url \"%1\""
#define OLD_VAL_OPEN "\"%APPPATH%\" -requestPending -osint -url \"%1\"" #define OLD_VAL_OPEN "\"%APPPATH%\" -requestPending -osint -url \"%1\""
@ -182,10 +183,10 @@ static SETTING gSettings[] = {
// File Handler Class // File Handler Class
// ***keep this as the first entry because when aForAllTypes is not set below // ***keep this as the first entry because when aForAllTypes is not set below
// it will skip over this check.*** // it will skip over this check.***
{ MAKE_KEY_NAME1("BasiliskHTML", SOC), VAL_OPEN, OLD_VAL_OPEN }, { MAKE_KEY_NAME1("SerpentHTML", SOC), VAL_OPEN, OLD_VAL_OPEN },
// Protocol Handler Class - for Vista and above // Protocol Handler Class - for Vista and above
{ MAKE_KEY_NAME1("BasiliskURL", SOC), VAL_OPEN, OLD_VAL_OPEN }, { MAKE_KEY_NAME1("SerpentURL", SOC), VAL_OPEN, OLD_VAL_OPEN },
// Protocol Handlers // Protocol Handlers
{ MAKE_KEY_NAME1("HTTP", DI), VAL_FILE_ICON }, { MAKE_KEY_NAME1("HTTP", DI), VAL_FILE_ICON },
@ -199,10 +200,10 @@ static SETTING gSettings[] = {
// are incorrect they are fixed without notifying the user. // are incorrect they are fixed without notifying the user.
static SETTING gDDESettings[] = { static SETTING gDDESettings[] = {
// File Handler Class // File Handler Class
{ MAKE_KEY_NAME1("Software\\Classes\\BasiliskHTML", SOD) }, { MAKE_KEY_NAME1("Software\\Classes\\SerpentHTML", SOD) },
// Protocol Handler Class - for Vista and above // Protocol Handler Class - for Vista and above
{ MAKE_KEY_NAME1("Software\\Classes\\BasiliskURL", SOD) }, { MAKE_KEY_NAME1("Software\\Classes\\SerpentURL", SOD) },
// Protocol Handlers // Protocol Handlers
{ MAKE_KEY_NAME1("Software\\Classes\\FTP", SOD) }, { MAKE_KEY_NAME1("Software\\Classes\\FTP", SOD) },
@ -339,7 +340,7 @@ IsAARDefault(const RefPtr<IApplicationAssociationRegistration>& pAAR,
return false; return false;
} }
LPCWSTR progID = isProtocol ? L"BasiliskURL" : L"BasiliskHTML"; LPCWSTR progID = isProtocol ? L"SerpentURL" : L"SerpentHTML";
bool isDefault = !wcsicmp(registeredApp, progID); bool isDefault = !wcsicmp(registeredApp, progID);
CoTaskMemFree(registeredApp); CoTaskMemFree(registeredApp);
@ -396,8 +397,8 @@ nsWindowsShellService::CancelPortableMode()
/* /*
* Query's the AAR for the default status. * Query's the AAR for the default status.
* This only checks for BasiliskURL and if aCheckAllTypes is set, then * This only checks for SerpentURL and if aCheckAllTypes is set, then
* it also checks for BasiliskHTML. Note that those ProgIDs are shared * it also checks for SerpentHTML. Note that those ProgIDs are shared
* by all Basilisk browsers. * by all Basilisk browsers.
*/ */
bool bool

View file

@ -3,8 +3,8 @@
# 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/.
MOZ_APP_BASENAME=Basilisk MOZ_APP_BASENAME=Serpent
MOZ_APP_VENDOR=Moonchild MOZ_APP_VENDOR=OpenSourceContributors
MOZ_PHOENIX=1 MOZ_PHOENIX=1
MOZ_AUSTRALIS=1 MOZ_AUSTRALIS=1
MC_BASILISK=1 MC_BASILISK=1

View file

@ -1,4 +1,4 @@
;!@Install@!UTF-8! ;!@Install@!UTF-8!
Title="Basilisk" Title="Serpent"
RunProgram="setup.exe" RunProgram="setup.exe"
;!@InstallEnd@! ;!@InstallEnd@!

View file

@ -379,17 +379,17 @@ Section "-Application" APP_IDX
; it doesn't cause problems always add them. ; it doesn't cause problems always add them.
${SetUninstallKeys} ${SetUninstallKeys}
; On install always add the BasiliskHTML and BasiliskURL keys. ; On install always add the SerpentHTML and SerpentURL keys.
; An empty string is used for the 5th param because BasiliskHTML is not a ; An empty string is used for the 5th param because SerpentHTML is not a
; protocol handler. ; protocol handler.
${GetLongPath} "$INSTDIR\${FileMainEXE}" $8 ${GetLongPath} "$INSTDIR\${FileMainEXE}" $8
StrCpy $2 "$\"$8$\" -osint -url $\"%1$\"" StrCpy $2 "$\"$8$\" -osint -url $\"%1$\""
; In Win8, the delegate execute handler picks up the value in BasiliskURL and ; In Win8, the delegate execute handler picks up the value in SerpentURL and
; BasiliskHTML to launch the desktop browser when it needs to. ; SerpentHTML to launch the desktop browser when it needs to.
${AddDisabledDDEHandlerValues} "BasiliskHTML" "$2" "$8,1" \ ${AddDisabledDDEHandlerValues} "SerpentHTML" "$2" "$8,1" \
"${AppRegName} Document" "" "${AppRegName} Document" ""
${AddDisabledDDEHandlerValues} "BasiliskURL" "$2" "$8,1" "${AppRegName} URL" \ ${AddDisabledDDEHandlerValues} "SerpentURL" "$2" "$8,1" "${AppRegName} URL" \
"true" "true"
; For pre win8, the following keys should only be set if we can write to HKLM. ; For pre win8, the following keys should only be set if we can write to HKLM.

View file

@ -13,9 +13,9 @@
; start menu tile. In case there are 2 Basilisk installations, we only do ; start menu tile. In case there are 2 Basilisk installations, we only do
; this if the application being updated is the default. ; this if the application being updated is the default.
ReadRegStr $0 HKCU "Software\Microsoft\Windows\Shell\Associations\UrlAssociations\http\UserChoice" "ProgId" ReadRegStr $0 HKCU "Software\Microsoft\Windows\Shell\Associations\UrlAssociations\http\UserChoice" "ProgId"
${If} $0 == "BasiliskURL" ${If} $0 == "SerpentURL"
${AndIf} $9 != 0 ; We're not running in session 0 ${AndIf} $9 != 0 ; We're not running in session 0
ReadRegStr $0 HKCU "Software\Classes\BasiliskURL\shell\open\command" "" ReadRegStr $0 HKCU "Software\Classes\SerpentURL\shell\open\command" ""
${GetPathFromString} "$0" $0 ${GetPathFromString} "$0" $0
${GetParent} "$0" $0 ${GetParent} "$0" $0
${If} ${FileExists} "$0" ${If} ${FileExists} "$0"
@ -282,9 +282,9 @@
ClearErrors ClearErrors
EnumRegKey $7 HKCR "${FILE_TYPE}" 0 EnumRegKey $7 HKCR "${FILE_TYPE}" 0
${If} ${Errors} ${If} ${Errors}
WriteRegStr SHCTX "SOFTWARE\Classes\${FILE_TYPE}" "" "BasiliskHTML" WriteRegStr SHCTX "SOFTWARE\Classes\${FILE_TYPE}" "" "SerpentHTML"
${EndIf} ${EndIf}
WriteRegStr SHCTX "SOFTWARE\Classes\${FILE_TYPE}\OpenWithProgids" "BasiliskHTML" "" WriteRegStr SHCTX "SOFTWARE\Classes\${FILE_TYPE}\OpenWithProgids" "SerpentHTML" ""
!macroend !macroend
!define AddAssociationIfNoneExist "!insertmacro AddAssociationIfNoneExist" !define AddAssociationIfNoneExist "!insertmacro AddAssociationIfNoneExist"
@ -296,30 +296,30 @@
StrCpy $0 "SOFTWARE\Classes" StrCpy $0 "SOFTWARE\Classes"
StrCpy $2 "$\"$8$\" -osint -url $\"%1$\"" StrCpy $2 "$\"$8$\" -osint -url $\"%1$\""
; Associate the file handlers with BasiliskHTML ; Associate the file handlers with SerpentHTML
ReadRegStr $6 SHCTX "$0\.htm" "" ReadRegStr $6 SHCTX "$0\.htm" ""
${If} "$6" != "BasiliskHTML" ${If} "$6" != "SerpentHTML"
WriteRegStr SHCTX "$0\.htm" "" "BasiliskHTML" WriteRegStr SHCTX "$0\.htm" "" "SerpentHTML"
${EndIf} ${EndIf}
ReadRegStr $6 SHCTX "$0\.html" "" ReadRegStr $6 SHCTX "$0\.html" ""
${If} "$6" != "BasiliskHTML" ${If} "$6" != "SerpentHTML"
WriteRegStr SHCTX "$0\.html" "" "BasiliskHTML" WriteRegStr SHCTX "$0\.html" "" "SerpentHTML"
${EndIf} ${EndIf}
ReadRegStr $6 SHCTX "$0\.shtml" "" ReadRegStr $6 SHCTX "$0\.shtml" ""
${If} "$6" != "BasiliskHTML" ${If} "$6" != "SerpentHTML"
WriteRegStr SHCTX "$0\.shtml" "" "BasiliskHTML" WriteRegStr SHCTX "$0\.shtml" "" "SerpentHTML"
${EndIf} ${EndIf}
ReadRegStr $6 SHCTX "$0\.xht" "" ReadRegStr $6 SHCTX "$0\.xht" ""
${If} "$6" != "BasiliskHTML" ${If} "$6" != "SerpentHTML"
WriteRegStr SHCTX "$0\.xht" "" "BasiliskHTML" WriteRegStr SHCTX "$0\.xht" "" "SerpentHTML"
${EndIf} ${EndIf}
ReadRegStr $6 SHCTX "$0\.xhtml" "" ReadRegStr $6 SHCTX "$0\.xhtml" ""
${If} "$6" != "BasiliskHTML" ${If} "$6" != "SerpentHTML"
WriteRegStr SHCTX "$0\.xhtml" "" "BasiliskHTML" WriteRegStr SHCTX "$0\.xhtml" "" "SerpentHTML"
${EndIf} ${EndIf}
${AddAssociationIfNoneExist} ".pdf" ${AddAssociationIfNoneExist} ".pdf"
@ -329,12 +329,12 @@
${AddAssociationIfNoneExist} ".pdf" ${AddAssociationIfNoneExist} ".pdf"
${AddAssociationIfNoneExist} ".webm" ${AddAssociationIfNoneExist} ".webm"
; An empty string is used for the 5th param because BasiliskHTML is not a ; An empty string is used for the 5th param because SerpentHTML is not a
; protocol handler ; protocol handler
${AddDisabledDDEHandlerValues} "BasiliskHTML" "$2" "$8,1" \ ${AddDisabledDDEHandlerValues} "SerpentHTML" "$2" "$8,1" \
"${AppRegName} HTML Document" "" "${AppRegName} HTML Document" ""
${AddDisabledDDEHandlerValues} "BasiliskURL" "$2" "$8,1" "${AppRegName} URL" \ ${AddDisabledDDEHandlerValues} "SerpentURL" "$2" "$8,1" "${AppRegName} URL" \
"true" "true"
; An empty string is used for the 4th & 5th params because the following ; An empty string is used for the 4th & 5th params because the following
; protocol handlers already have a display name and the additional keys ; protocol handlers already have a display name and the additional keys
@ -404,35 +404,35 @@
WriteRegStr ${RegKey} "$0\Capabilities" "ApplicationIcon" "$8,0" WriteRegStr ${RegKey} "$0\Capabilities" "ApplicationIcon" "$8,0"
WriteRegStr ${RegKey} "$0\Capabilities" "ApplicationName" "${BrandShortName}" WriteRegStr ${RegKey} "$0\Capabilities" "ApplicationName" "${BrandShortName}"
WriteRegStr ${RegKey} "$0\Capabilities\FileAssociations" ".htm" "BasiliskHTML" WriteRegStr ${RegKey} "$0\Capabilities\FileAssociations" ".htm" "SerpentHTML"
WriteRegStr ${RegKey} "$0\Capabilities\FileAssociations" ".html" "BasiliskHTML" WriteRegStr ${RegKey} "$0\Capabilities\FileAssociations" ".html" "SerpentHTML"
WriteRegStr ${RegKey} "$0\Capabilities\FileAssociations" ".shtml" "BasiliskHTML" WriteRegStr ${RegKey} "$0\Capabilities\FileAssociations" ".shtml" "SerpentHTML"
WriteRegStr ${RegKey} "$0\Capabilities\FileAssociations" ".xht" "BasiliskHTML" WriteRegStr ${RegKey} "$0\Capabilities\FileAssociations" ".xht" "SerpentHTML"
WriteRegStr ${RegKey} "$0\Capabilities\FileAssociations" ".xhtml" "BasiliskHTML" WriteRegStr ${RegKey} "$0\Capabilities\FileAssociations" ".xhtml" "SerpentHTML"
WriteRegStr ${RegKey} "$0\Capabilities\StartMenu" "StartMenuInternet" "$R9" WriteRegStr ${RegKey} "$0\Capabilities\StartMenu" "StartMenuInternet" "$R9"
WriteRegStr ${RegKey} "$0\Capabilities\URLAssociations" "ftp" "BasiliskURL" WriteRegStr ${RegKey} "$0\Capabilities\URLAssociations" "ftp" "SerpentURL"
WriteRegStr ${RegKey} "$0\Capabilities\URLAssociations" "http" "BasiliskURL" WriteRegStr ${RegKey} "$0\Capabilities\URLAssociations" "http" "SerpentURL"
WriteRegStr ${RegKey} "$0\Capabilities\URLAssociations" "https" "BasiliskURL" WriteRegStr ${RegKey} "$0\Capabilities\URLAssociations" "https" "SerpentURL"
; Vista Registered Application ; Vista Registered Application
WriteRegStr ${RegKey} "Software\RegisteredApplications" "${AppRegName}" "$0\Capabilities" WriteRegStr ${RegKey} "Software\RegisteredApplications" "${AppRegName}" "$0\Capabilities"
!macroend !macroend
!define SetStartMenuInternet "!insertmacro SetStartMenuInternet" !define SetStartMenuInternet "!insertmacro SetStartMenuInternet"
; The IconHandler reference for BasiliskHTML can end up in an inconsistent state ; The IconHandler reference for SerpentHTML can end up in an inconsistent state
; due to changes not being detected by the IconHandler for side by side ; due to changes not being detected by the IconHandler for side by side
; installs (see bug 268512). The symptoms can be either an incorrect icon or no ; installs (see bug 268512). The symptoms can be either an incorrect icon or no
; icon being displayed for files associated with Basilisk (does not use SHCTX). ; icon being displayed for files associated with Basilisk (does not use SHCTX).
!macro FixShellIconHandler RegKey !macro FixShellIconHandler RegKey
ClearErrors ClearErrors
ReadRegStr $1 ${RegKey} "Software\Classes\BasiliskHTML\ShellEx\IconHandler" "" ReadRegStr $1 ${RegKey} "Software\Classes\SerpentHTML\ShellEx\IconHandler" ""
${Unless} ${Errors} ${Unless} ${Errors}
ReadRegStr $1 ${RegKey} "Software\Classes\BasiliskHTML\DefaultIcon" "" ReadRegStr $1 ${RegKey} "Software\Classes\SerpentHTML\DefaultIcon" ""
${GetLongPath} "$INSTDIR\${FileMainEXE}" $2 ${GetLongPath} "$INSTDIR\${FileMainEXE}" $2
${If} "$1" != "$2,1" ${If} "$1" != "$2,1"
WriteRegStr ${RegKey} "Software\Classes\BasiliskHTML\DefaultIcon" "" "$2,1" WriteRegStr ${RegKey} "Software\Classes\SerpentHTML\DefaultIcon" "" "$2,1"
${EndIf} ${EndIf}
${EndUnless} ${EndUnless}
!macroend !macroend
@ -567,7 +567,7 @@
; HKCU Software\Classes keys when associating handlers. The fix uses the merged ; HKCU Software\Classes keys when associating handlers. The fix uses the merged
; view in HKCR to check for existance of an existing association. This macro ; view in HKCR to check for existance of an existing association. This macro
; cleans affected installations by removing the HKLM and HKCU value if it is set ; cleans affected installations by removing the HKLM and HKCU value if it is set
; to BasiliskHTML when there is a value for PersistentHandler or by removing the ; to SerpentHTML when there is a value for PersistentHandler or by removing the
; HKCU value when the HKLM value has a value other than an empty string. ; HKCU value when the HKLM value has a value other than an empty string.
!macro FixBadFileAssociation FILE_TYPE !macro FixBadFileAssociation FILE_TYPE
; Only delete the default value in case the key has values for OpenWithList, ; Only delete the default value in case the key has values for OpenWithList,
@ -576,16 +576,16 @@
ReadRegStr $1 HKLM "Software\Classes\${FILE_TYPE}" "" ReadRegStr $1 HKLM "Software\Classes\${FILE_TYPE}" ""
ReadRegStr $2 HKCR "${FILE_TYPE}\PersistentHandler" "" ReadRegStr $2 HKCR "${FILE_TYPE}\PersistentHandler" ""
${If} "$2" != "" ${If} "$2" != ""
; Since there is a persistent handler remove BasiliskHTML as the default ; Since there is a persistent handler remove SerpentHTML as the default
; value from both HKCU and HKLM if it set to BasiliskHTML. ; value from both HKCU and HKLM if it set to SerpentHTML.
${If} "$0" == "BasiliskHTML" ${If} "$0" == "SerpentHTML"
DeleteRegValue HKCU "Software\Classes\${FILE_TYPE}" "" DeleteRegValue HKCU "Software\Classes\${FILE_TYPE}" ""
${EndIf} ${EndIf}
${If} "$1" == "BasiliskHTML" ${If} "$1" == "SerpentHTML"
DeleteRegValue HKLM "Software\Classes\${FILE_TYPE}" "" DeleteRegValue HKLM "Software\Classes\${FILE_TYPE}" ""
${EndIf} ${EndIf}
${ElseIf} "$0" == "BasiliskHTML" ${ElseIf} "$0" == "SerpentHTML"
; Since KHCU is set to BasiliskHTML remove BasiliskHTML as the default value ; Since KHCU is set to SerpentHTML remove SerpentHTML as the default value
; from HKCU if HKLM is set to a value other than an empty string. ; from HKCU if HKLM is set to a value other than an empty string.
${If} "$1" != "" ${If} "$1" != ""
DeleteRegValue HKCU "Software\Classes\${FILE_TYPE}" "" DeleteRegValue HKCU "Software\Classes\${FILE_TYPE}" ""
@ -641,17 +641,17 @@
; Only set the file and protocol handlers if the existing one under HKCR is ; Only set the file and protocol handlers if the existing one under HKCR is
; for this install location. ; for this install location.
${IsHandlerForInstallDir} "BasiliskHTML" $R9 ${IsHandlerForInstallDir} "SerpentHTML" $R9
${If} "$R9" == "true" ${If} "$R9" == "true"
; An empty string is used for the 5th param because BasiliskHTML is not a ; An empty string is used for the 5th param because SerpentHTML is not a
; protocol handler. ; protocol handler.
${AddDisabledDDEHandlerValues} "BasiliskHTML" "$2" "$8,1" \ ${AddDisabledDDEHandlerValues} "SerpentHTML" "$2" "$8,1" \
"${AppRegName} HTML Document" "" "${AppRegName} HTML Document" ""
${EndIf} ${EndIf}
${IsHandlerForInstallDir} "BasiliskURL" $R9 ${IsHandlerForInstallDir} "SerpentURL" $R9
${If} "$R9" == "true" ${If} "$R9" == "true"
${AddDisabledDDEHandlerValues} "BasiliskURL" "$2" "$8,1" \ ${AddDisabledDDEHandlerValues} "SerpentURL" "$2" "$8,1" \
"${AppRegName} URL" "true" "${AppRegName} URL" "true"
${EndIf} ${EndIf}
@ -699,10 +699,10 @@
DeleteRegValue HKLM "$0\Capabilities\URLAssociations" "gopher" DeleteRegValue HKLM "$0\Capabilities\URLAssociations" "gopher"
${EndUnless} ${EndUnless}
; Delete gopher from the user's UrlAssociations if it points to BasiliskURL. ; Delete gopher from the user's UrlAssociations if it points to SerpentURL.
StrCpy $0 "Software\Microsoft\Windows\Shell\Associations\UrlAssociations\gopher" StrCpy $0 "Software\Microsoft\Windows\Shell\Associations\UrlAssociations\gopher"
ReadRegStr $2 HKCU "$0\UserChoice" "Progid" ReadRegStr $2 HKCU "$0\UserChoice" "Progid"
${If} "$2" == "BasiliskURL" ${If} "$2" == "SerpentURL"
DeleteRegKey HKCU "$0" DeleteRegKey HKCU "$0"
${EndIf} ${EndIf}
!macroend !macroend

View file

@ -227,27 +227,27 @@ Section "Uninstall"
${un.SetAppLSPCategories} ${un.SetAppLSPCategories}
${EndIf} ${EndIf}
${un.RegCleanAppHandler} "BasiliskURL" ${un.RegCleanAppHandler} "SerpentURL"
${un.RegCleanAppHandler} "BasiliskHTML" ${un.RegCleanAppHandler} "SerpentHTML"
${un.RegCleanProtocolHandler} "ftp" ${un.RegCleanProtocolHandler} "ftp"
${un.RegCleanProtocolHandler} "http" ${un.RegCleanProtocolHandler} "http"
${un.RegCleanProtocolHandler} "https" ${un.RegCleanProtocolHandler} "https"
ClearErrors ClearErrors
ReadRegStr $R9 HKCR "BasiliskHTML" "" ReadRegStr $R9 HKCR "SerpentHTML" ""
; Don't clean up the file handlers if the BasiliskHTML key still exists since ; Don't clean up the file handlers if the SerpentHTML key still exists since
; there should be a second installation that may be the default file handler ; there should be a second installation that may be the default file handler
${If} ${Errors} ${If} ${Errors}
${un.RegCleanFileHandler} ".htm" "BasiliskHTML" ${un.RegCleanFileHandler} ".htm" "SerpentHTML"
${un.RegCleanFileHandler} ".html" "BasiliskHTML" ${un.RegCleanFileHandler} ".html" "SerpentHTML"
${un.RegCleanFileHandler} ".shtml" "BasiliskHTML" ${un.RegCleanFileHandler} ".shtml" "SerpentHTML"
${un.RegCleanFileHandler} ".xht" "BasiliskHTML" ${un.RegCleanFileHandler} ".xht" "SerpentHTML"
${un.RegCleanFileHandler} ".xhtml" "BasiliskHTML" ${un.RegCleanFileHandler} ".xhtml" "SerpentHTML"
${un.RegCleanFileHandler} ".oga" "BasiliskHTML" ${un.RegCleanFileHandler} ".oga" "SerpentHTML"
${un.RegCleanFileHandler} ".ogg" "BasiliskHTML" ${un.RegCleanFileHandler} ".ogg" "SerpentHTML"
${un.RegCleanFileHandler} ".ogv" "BasiliskHTML" ${un.RegCleanFileHandler} ".ogv" "SerpentHTML"
${un.RegCleanFileHandler} ".pdf" "BasiliskHTML" ${un.RegCleanFileHandler} ".pdf" "SerpentHTML"
${un.RegCleanFileHandler} ".webm" "BasiliskHTML" ${un.RegCleanFileHandler} ".webm" "SerpentHTML"
${EndIf} ${EndIf}
SetShellVarContext all ; Set SHCTX to HKLM SetShellVarContext all ; Set SHCTX to HKLM

View file

@ -3,25 +3,25 @@
# file, You can obtain one at http://mozilla.org/MPL/2.0/. # file, You can obtain one at http://mozilla.org/MPL/2.0/.
malformedURI=The URL is not valid and cannot be loaded. malformedURI=The URL is not valid and cannot be loaded.
fileNotFound=Basilisk can’t find the file at %S. fileNotFound=Serpent can’t find the file at %S.
fileAccessDenied=The file at %S is not readable. fileAccessDenied=The file at %S is not readable.
dnsNotFound=Basilisk can’t find the server at %S. dnsNotFound=Serpent can’t find the server at %S.
unknownProtocolFound=Basilisk doesn’t know how to open this address, because one of the following protocols (%S) isn’t associated with any program or is not allowed in this context. unknownProtocolFound=Serpent doesn’t know how to open this address, because one of the following protocols (%S) isn’t associated with any program or is not allowed in this context.
connectionFailure=Firefox can’t establish a connection to the server at %S. connectionFailure=Firefox can’t establish a connection to the server at %S.
netInterrupt=The connection to %S was interrupted while the page was loading. netInterrupt=The connection to %S was interrupted while the page was loading.
netTimeout=The server at %S is taking too long to respond. netTimeout=The server at %S is taking too long to respond.
redirectLoop=Basilisk has detected that the server is redirecting the request for this address in a way that will never complete. redirectLoop=Serpent has detected that the server is redirecting the request for this address in a way that will never complete.
## LOCALIZATION NOTE (confirmRepostPrompt): In this item, don’t translate "%S" ## LOCALIZATION NOTE (confirmRepostPrompt): In this item, don’t translate "%S"
confirmRepostPrompt=To display this page, %S must send information that will repeat any action (such as a search or order confirmation) that was performed earlier. confirmRepostPrompt=To display this page, %S must send information that will repeat any action (such as a search or order confirmation) that was performed earlier.
resendButton.label=Resend resendButton.label=Resend
unknownSocketType=Basilisk doesn’t know how to communicate with the server. unknownSocketType=Serpent doesn’t know how to communicate with the server.
netReset=The connection to the server was reset while the page was loading. netReset=The connection to the server was reset while the page was loading.
notCached=This document is no longer available. notCached=This document is no longer available.
netOffline=Basilisk is currently in offline mode and can’t browse the Web. netOffline=Serpent is currently in offline mode and can’t browse the Web.
isprinting=The document cannot change while Printing or in Print Preview. isprinting=The document cannot change while Printing or in Print Preview.
deniedPortAccess=This address uses a network port which is normally used for purposes other than Web browsing. Basilisk has canceled the request for your protection. deniedPortAccess=This address uses a network port which is normally used for purposes other than Web browsing. Serpent has canceled the request for your protection.
proxyResolveFailure=Basilisk is configured to use a proxy server that can’t be found. proxyResolveFailure=Serpent is configured to use a proxy server that can’t be found.
proxyConnectFailure=Basilisk is configured to use a proxy server that is refusing connections. proxyConnectFailure=Serpent is configured to use a proxy server that is refusing connections.
contentEncodingError=The page you are trying to view cannot be shown because it uses an invalid or unsupported form of compression. contentEncodingError=The page you are trying to view cannot be shown because it uses an invalid or unsupported form of compression.
unsafeContentType=The page you are trying to view cannot be shown because it is contained in a file type that may not be safe to open. Please contact the website owners to inform them of this problem. unsafeContentType=The page you are trying to view cannot be shown because it is contained in a file type that may not be safe to open. Please contact the website owners to inform them of this problem.
externalProtocolTitle=External Protocol Request externalProtocolTitle=External Protocol Request
@ -35,9 +35,9 @@ unwantedBlocked=The site at %S has been reported as serving unwanted software an
deceptiveBlocked=This web page at %S has been reported as a deceptive site and has been blocked based on your security preferences. deceptiveBlocked=This web page at %S has been reported as a deceptive site and has been blocked based on your security preferences.
cspBlocked=This page has a content security policy that prevents it from being loaded in this way. cspBlocked=This page has a content security policy that prevents it from being loaded in this way.
corruptedContentErrorv2=The site at %S has experienced a network protocol violation that cannot be repaired. corruptedContentErrorv2=The site at %S has experienced a network protocol violation that cannot be repaired.
remoteXUL=This page uses an unsupported technology that is no longer available by default in Basilisk. remoteXUL=This page uses an unsupported technology that is no longer available by default in Serpent.
## LOCALIZATION NOTE (sslv3Used) - Do not translate "%S". ## LOCALIZATION NOTE (sslv3Used) - Do not translate "%S".
sslv3Used=Basilisk cannot guarantee the safety of your data on %S because it uses SSLv3, a broken security protocol. sslv3Used=Serpent cannot guarantee the safety of your data on %S because it uses SSLv3, a broken security protocol.
## LOCALIZATION NOTE (weakCryptoUsed) - Do not translate "%S". ## LOCALIZATION NOTE (weakCryptoUsed) - Do not translate "%S".
weakCryptoUsed=The owner of %S has configured their website improperly. To protect your information from being stolen, Basilisk has not connected to this website. weakCryptoUsed=The owner of %S has configured their website improperly. To protect your information from being stolen, Serpent has not connected to this website.
inadequateSecurityError=The website tried to negotiate an inadequate level of security. inadequateSecurityError=The website tried to negotiate an inadequate level of security.

View file

@ -5,8 +5,6 @@
#define AB_CD ja #define AB_CD ja
#endif #endif
#define mozilla_icon data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABmJLR0QA/wD/AP+gvaeTAAAACXBIWXMAAAsTAAALEwEAmpwYAAAAB3RJTUUH3gwMDAsTBZbkNwAAAB1pVFh0Q29tbWVudAAAAAAAQ3JlYXRlZCB3aXRoIEdJTVBkLmUHAAABNElEQVQ4y8WSsU0DURBE3yyWIaAJaqAAN4DPSL6AlIACKIEOyJEgRsIgOOkiInJqgAKowNg7BHdn7MOksNl+zZ//dvbDf5cAiklp22BdVtXdeTEpDYDB9m1VzU6OJuVp2NdEQCaI96fH2YHG4+mDduKYNMYINTcjcGbXzQVDEAphG0k48zUsajIbnAiMIXThpW8EICE0RAK4dvoKg9NIcTiQ589otyHOZLnwqK5nLwBFUZ4igc3iM0d1ff8CMC6mZ6Ihiaqq3gi1aUAnArD00SW1fq5OLBg0ymYmSZsR2/t4e/rGyCLW0sbp3oq+yTYqVgytQWui2FS7XYF7GFprY921T4CNQt8zr47dNzCkIX7y/jBtH+v+RGMQrc828W8pApnZbmEVQp/Ae7BlOy2ttib81/UFc+WRWEbjckIAAAAASUVORK5CYII=
<!-- This Source Code Form is subject to the terms of the Mozilla Public <!-- This Source Code Form is subject to the terms of the Mozilla Public
- 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/. -->
@ -18,14 +16,7 @@
<dl><p> <dl><p>
<dt><h3 personal_toolbar_folder="true">@bookmarks_toolbarfolder@</h3></dt> <dt><h3 personal_toolbar_folder="true">@bookmarks_toolbarfolder@</h3></dt>
<dd>@bookmarks_toolbarfolder_description@ <dd>@bookmarks_toolbarfolder_description@
<dl>
<p><dt><a href="http://www.basilisk-browser.org/">Basilisk</a></dt>
</dl>
<p><dt><h3>@firefox_heading@</h3></dt>
<dl><p> <dl><p>
<dt><a href="https://support.mozilla.org/@AB_CD@/products/firefox" icon="@mozilla_icon@">@firefox_help@</a> <p><dt><a href="http://www.example.com/" icon_uri="http://www.example.com/favicon.ico" icon="your icon here">Your website here (application/basilisk/locales/generic/profile/bookmarks.html.in)</a></dt>
<dt><a href="https://www.mozilla.org/@AB_CD@/firefox/customize/" icon="@mozilla_icon@">@firefox_customize@</a> </dl><p>
<dt><a href="https://www.mozilla.org/@AB_CD@/contribute/" icon="@mozilla_icon@">@firefox_community@</a>
<dt><a href="https://www.mozilla.org/@AB_CD@/about/" icon="@mozilla_icon@">@firefox_about@</a>
</dl>
</dl> </dl>

View file

@ -3,10 +3,10 @@
<assemblyIdentity <assemblyIdentity
version="1.0.0.0" version="1.0.0.0"
processorArchitecture="*" processorArchitecture="*"
name="Pale Moon" name="New Moon"
type="win32" type="win32"
/> />
<description>Pale Moon</description> <description>New Moon</description>
<dependency> <dependency>
<dependentAssembly> <dependentAssembly>
<assemblyIdentity <assemblyIdentity

View file

@ -75,7 +75,7 @@ static void Output(const char *fmt, ... )
decltype(MessageBoxW)* messageBoxW = decltype(MessageBoxW)* messageBoxW =
(decltype(MessageBoxW)*) GetProcAddress(user32, "MessageBoxW"); (decltype(MessageBoxW)*) GetProcAddress(user32, "MessageBoxW");
if (messageBoxW) { if (messageBoxW) {
messageBoxW(nullptr, wide_msg, L"Pale Moon", MB_OK messageBoxW(nullptr, wide_msg, L"XULRunner", MB_OK
| MB_ICONERROR | MB_ICONERROR
| MB_SETFOREGROUND); | MB_SETFOREGROUND);
} }

View file

@ -73,9 +73,6 @@ pref("browser.dictionaries.download.url", "https://@AM_DOMAIN@/dictionaries/");
// Get More Tools link URL // Get More Tools link URL
pref("browser.getdevtools.url","https://@AM_DOMAIN@/?component=integration&type=external&request=devtools"); pref("browser.getdevtools.url","https://@AM_DOMAIN@/?component=integration&type=external&request=devtools");
// Feedback URL
pref("browser.feedback.url", "https://msfn.org/board/topic/177125-my-build-of-new-moon-temp-name-aka-pale-moon-fork-targetting-xp/?do=getNewComment");
// Help button in slow startup dialog // Help button in slow startup dialog
pref("browser.slowstartup.help.url", "https://support.mozilla.org/en-US/kb/firefox-takes-long-time-start-up"); pref("browser.slowstartup.help.url", "https://support.mozilla.org/en-US/kb/firefox-takes-long-time-start-up");
@ -229,10 +226,10 @@ pref("keyword.enabled", true);
pref("general.useragent.locale", "@AB_CD@"); pref("general.useragent.locale", "@AB_CD@");
pref("general.skins.selectedSkin", "classic/1.0"); pref("general.skins.selectedSkin", "classic/1.0");
// Native UA mode by default for unbranded // Firefox UA mode by default
pref("general.useragent.compatMode", 0); pref("general.useragent.compatMode", 2);
pref("general.useragent.compatMode.gecko", false); pref("general.useragent.compatMode.gecko", true);
pref("general.useragent.compatMode.firefox", false); pref("general.useragent.compatMode.firefox", true);
pref("general.smoothScroll", true); pref("general.smoothScroll", true);
#ifdef UNIX_BUT_NOT_MAC #ifdef UNIX_BUT_NOT_MAC
@ -255,7 +252,7 @@ pref("browser.defaultbrowser.notificationbar", false);
// 0 = blank, 1 = home (browser.startup.homepage), 2 = last visited page, 3 = resume previous browser session // 0 = blank, 1 = home (browser.startup.homepage), 2 = last visited page, 3 = resume previous browser session
// The behavior of option 3 is detailed at: http://wiki.mozilla.org/Session_Restore // The behavior of option 3 is detailed at: http://wiki.mozilla.org/Session_Restore
pref("browser.startup.page", 1); pref("browser.startup.page", 1);
pref("browser.startup.homepage", "chrome://branding/locale/browserconfig.properties"); pref("browser.startup.homepage", "");
pref("browser.slowStartup.notificationDisabled", false); pref("browser.slowStartup.notificationDisabled", false);
pref("browser.slowStartup.timeThreshold", 60000); pref("browser.slowStartup.timeThreshold", 60000);

View file

@ -1,11 +1,5 @@
// ===| General |============================================================== // ===| General |==============================================================
pref("startup.homepage_welcome_url","http://www.palemoon.org/firstrun.shtml");
pref("app.vendorURL", "http://www.palemoon.org/");
// User Interface
pref("browser.identity.ssl_domain_display", 1); //show domain verified SSL (blue) pref("browser.identity.ssl_domain_display", 1); //show domain verified SSL (blue)
// ============================================================================ // ============================================================================

View file

@ -9,8 +9,8 @@
# BrandFullNameInternal is used for some registry and file system values # BrandFullNameInternal is used for some registry and file system values
# instead of BrandFullName and typically should not be modified. # instead of BrandFullName and typically should not be modified.
!define BrandFullNameInternal "New Moon" !define BrandFullNameInternal "New Moon"
!define CompanyName "Moonchild Productions" !define CompanyName "Open Source Contributors"
!define URLInfoAbout "http://www.palemoon.org" !define URLInfoAbout "about:blank"
!define URLUpdateInfo "http://www.palemoon.org" !define URLUpdateInfo "about:blank"
!define HelpLink "https://msfn.org/board/topic/177125-my-build-of-new-moon-temp-name-aka-pale-moon-fork-targetting-xp/?do=getNewComment" !define HelpLink "about:blank"
!define URLSystemRequirements "http://www.palemoon.org/download.shtml" !define URLSystemRequirements "about:blank"

View file

@ -2,4 +2,24 @@
# 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/.
MOZ_APP_NAME=newmoon
MOZ_APP_BASENAME="New Moon"
MOZ_APP_DISPLAYNAME="New Moon" MOZ_APP_DISPLAYNAME="New Moon"
MOZ_APP_UA_NAME="PaleMoon"
MOZ_APP_VENDOR="Open Source Contributors"
MOZ_APP_FULLNAME="New Moon"
MOZ_APP_PROFILE="OpenSource/New Moon"
MOZ_APP_REMOTINGNAME=com.opensource.newmoon
MOZ_DISTRIBUTION_ID=com.opensource
MOZ_MACBUNDLE_NAME="newmoon.app"
MOZ_SOURCE_REPO=https://github.com/Eclipse-Community/UXP

View file

@ -4,5 +4,5 @@
<!ENTITY brandShortName "New Moon"> <!ENTITY brandShortName "New Moon">
<!ENTITY brandFullName "New Moon"> <!ENTITY brandFullName "New Moon">
<!ENTITY vendorShortName "a community developer"> <!ENTITY vendorShortName "Open Source Contributors">
<!ENTITY trademarkInfo.part1 " "> <!ENTITY trademarkInfo.part1 " ">

View file

@ -4,6 +4,6 @@
brandShortName=New Moon brandShortName=New Moon
brandFullName=New Moon brandFullName=New Moon
vendorShortName=Moonchild vendorShortName=Open Source Contributors
syncBrandShortName=Sync syncBrandShortName=Sync

View file

@ -10,3 +10,7 @@ export('DIST_SUBDIR')
include('../shared/branding.mozbuild') include('../shared/branding.mozbuild')
ApplicationBranding() ApplicationBranding()
FINAL_TARGET_FILES['..'] += [
'newmoon.VisualElementsManifest.xml',
]

View file

@ -0,0 +1,8 @@
<Application xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance'>
<VisualElements
ShowNameOnSquare150x150Logo='on'
Square150x150Logo='browser\VisualElements\VisualElements_150.png'
Square70x70Logo='browser\VisualElements\VisualElements_70.png'
ForegroundText='light'
BackgroundColor='#171717'/>
</Application>

View file

@ -81,10 +81,10 @@ Comment[uk]=Перегляд сторінок Інтернету
Comment[vi]=Để duyệt các trang web Comment[vi]=Để duyệt các trang web
Comment[zh_CN]=浏览互联网 Comment[zh_CN]=浏览互联网
Comment[zh_TW]=瀏覽網際網路 Comment[zh_TW]=瀏覽網際網路
Exec=palemoon %u Exec=newmoon %u
Terminal=false Terminal=false
Type=Application Type=Application
Icon=palemoon Icon=newmoon
Categories=Network;WebBrowser; Categories=Network;WebBrowser;
MimeType=text/html;text/xml;application/xhtml+xml;application/vnd.mozilla.xul+xml;text/mml;x-scheme-handler/http;x-scheme-handler/https;x-scheme-handler/ftp; MimeType=text/html;text/xml;application/xhtml+xml;application/vnd.mozilla.xul+xml;text/mml;x-scheme-handler/http;x-scheme-handler/https;x-scheme-handler/ftp;
StartupNotify=false StartupNotify=false
@ -176,7 +176,7 @@ Name[vi]=Mở thẻ mới
Name[xh]=Vula ithebhu entsha Name[xh]=Vula ithebhu entsha
Name[zh_CN]=打开新标签页 Name[zh_CN]=打开新标签页
Name[zh_TW]=開啟新分頁 Name[zh_TW]=開啟新分頁
Exec=palemoon -new-tab Exec=newmoon -new-tab
[Desktop Action NewWindow] [Desktop Action NewWindow]
Name=Open new window Name=Open new window
@ -263,7 +263,7 @@ Name[vi]=Mở cửa sổ mới
Name[xh]=Vula iwindow entsha Name[xh]=Vula iwindow entsha
Name[zh_CN]=打开新窗口 Name[zh_CN]=打开新窗口
Name[zh_TW]=開啟新視窗 Name[zh_TW]=開啟新視窗
Exec=palemoon -new-window Exec=newmoon -new-window
[Desktop Action NewPrivateWindow] [Desktop Action NewPrivateWindow]
Name=New private window Name=New private window
@ -350,4 +350,4 @@ Name[vi]=Cửa sổ riêng tư mới
Name[xh]=Ifestile yangasese entsha Name[xh]=Ifestile yangasese entsha
Name[zh_CN]=新建隐私浏览窗口 Name[zh_CN]=新建隐私浏览窗口
Name[zh_TW]=新增隱私視窗 Name[zh_TW]=新增隱私視窗
Exec=palemoon -private-window Exec=newmoon -private-window

View file

@ -4,7 +4,7 @@
#include ../../shared/pref/uaoverrides.inc #include ../../shared/pref/uaoverrides.inc
pref("startup.homepage_override_url",""); pref("startup.homepage_override_url","");
pref("app.releaseNotesURL", "https://rtfreesoft.blogspot.com/search/label/newmoon"); pref("app.releaseNotesURL", "");
// Updates disabled // Updates disabled
pref("app.update.enabled", false); pref("app.update.enabled", false);

View file

@ -101,18 +101,18 @@ OpenKeyForReading(HKEY aKeyRoot, const nsAString& aKeyName, HKEY* aKey)
// .htm .html .shtml .xht .xhtml // .htm .html .shtml .xht .xhtml
// are mapped like so: // are mapped like so:
// //
// HKCU\SOFTWARE\Classes\.<ext>\ (default) REG_SZ PaleMoonHTML // HKCU\SOFTWARE\Classes\.<ext>\ (default) REG_SZ NewMoonHTML
// //
// as aliases to the class: // as aliases to the class:
// //
// HKCU\SOFTWARE\Classes\PaleMoonHTML\ // HKCU\SOFTWARE\Classes\NewMoonHTML\
// DefaultIcon (default) REG_SZ <apppath>,1 // DefaultIcon (default) REG_SZ <apppath>,1
// shell\open\command (default) REG_SZ <apppath> -osint -url "%1" // shell\open\command (default) REG_SZ <apppath> -osint -url "%1"
// shell\open\ddeexec (default) REG_SZ <empty string> // shell\open\ddeexec (default) REG_SZ <empty string>
// //
// - Windows Vista and above Protocol Handler // - Windows Vista and above Protocol Handler
// //
// HKCU\SOFTWARE\Classes\PaleMoonURL\ (default) REG_SZ <appname> URL // HKCU\SOFTWARE\Classes\NewMoonURL\ (default) REG_SZ <appname> URL
// EditFlags REG_DWORD 2 // EditFlags REG_DWORD 2
// FriendlyTypeName REG_SZ <appname> URL // FriendlyTypeName REG_SZ <appname> URL
// DefaultIcon (default) REG_SZ <apppath>,1 // DefaultIcon (default) REG_SZ <apppath>,1
@ -156,7 +156,8 @@ typedef struct {
const char* oldValueData; const char* oldValueData;
} SETTING; } SETTING;
#define APP_REG_NAME L"Pale Moon" // Find a way to unhardcode this
#define APP_REG_NAME L"New Moon"
#define VAL_FILE_ICON "%APPPATH%,1" #define VAL_FILE_ICON "%APPPATH%,1"
#define VAL_OPEN "\"%APPPATH%\" -osint -url \"%1\"" #define VAL_OPEN "\"%APPPATH%\" -osint -url \"%1\""
#define OLD_VAL_OPEN "\"%APPPATH%\" -requestPending -osint -url \"%1\"" #define OLD_VAL_OPEN "\"%APPPATH%\" -requestPending -osint -url \"%1\""
@ -182,10 +183,10 @@ static SETTING gSettings[] = {
// File Handler Class // File Handler Class
// ***keep this as the first entry because when aForAllTypes is not set below // ***keep this as the first entry because when aForAllTypes is not set below
// it will skip over this check.*** // it will skip over this check.***
{ MAKE_KEY_NAME1("PaleMoonHTML", SOC), VAL_OPEN, OLD_VAL_OPEN }, { MAKE_KEY_NAME1("NewMoonHTML", SOC), VAL_OPEN, OLD_VAL_OPEN },
// Protocol Handler Class - for Vista and above // Protocol Handler Class - for Vista and above
{ MAKE_KEY_NAME1("PaleMoonURL", SOC), VAL_OPEN, OLD_VAL_OPEN }, { MAKE_KEY_NAME1("NewMoonURL", SOC), VAL_OPEN, OLD_VAL_OPEN },
// Protocol Handlers // Protocol Handlers
{ MAKE_KEY_NAME1("HTTP", DI), VAL_FILE_ICON }, { MAKE_KEY_NAME1("HTTP", DI), VAL_FILE_ICON },
@ -199,10 +200,10 @@ static SETTING gSettings[] = {
// are incorrect they are fixed without notifying the user. // are incorrect they are fixed without notifying the user.
static SETTING gDDESettings[] = { static SETTING gDDESettings[] = {
// File Handler Class // File Handler Class
{ MAKE_KEY_NAME1("Software\\Classes\\PaleMoonHTML", SOD) }, { MAKE_KEY_NAME1("Software\\Classes\\NewMoonHTML", SOD) },
// Protocol Handler Class - for Vista and above // Protocol Handler Class - for Vista and above
{ MAKE_KEY_NAME1("Software\\Classes\\PaleMoonURL", SOD) }, { MAKE_KEY_NAME1("Software\\Classes\\NewMoonURL", SOD) },
// Protocol Handlers // Protocol Handlers
{ MAKE_KEY_NAME1("Software\\Classes\\FTP", SOD) }, { MAKE_KEY_NAME1("Software\\Classes\\FTP", SOD) },
@ -339,7 +340,7 @@ IsAARDefault(const RefPtr<IApplicationAssociationRegistration>& pAAR,
return false; return false;
} }
LPCWSTR progID = isProtocol ? L"PaleMoonURL" : L"PaleMoonHTML"; LPCWSTR progID = isProtocol ? L"NewMoonURL" : L"NewMoonHTML";
bool isDefault = !wcsicmp(registeredApp, progID); bool isDefault = !wcsicmp(registeredApp, progID);
CoTaskMemFree(registeredApp); CoTaskMemFree(registeredApp);
@ -371,8 +372,8 @@ IsDefaultBrowserWin8(bool aCheckAllTypes, bool* aIsDefaultBrowser)
/* /*
* Query's the AAR for the default status. * Query's the AAR for the default status.
* This only checks for PaleMoonURL and if aCheckAllTypes is set, then * This only checks for NewMoonURL and if aCheckAllTypes is set, then
* it also checks for PaleMoonHTML. Note that those ProgIDs are shared * it also checks for NewMoonHTML. Note that those ProgIDs are shared
* by all PaleMoon browsers. * by all PaleMoon browsers.
*/ */
bool bool

View file

@ -6,10 +6,10 @@
# Application Basename and Vendor # Application Basename and Vendor
# MOZ_APP_BASENAME and MOZ_APP_VENDOR must not have spaces. # MOZ_APP_BASENAME and MOZ_APP_VENDOR must not have spaces.
# These values where appropriate are hardcoded in application.ini # These values where appropriate are hardcoded in application.ini
# to "Pale Moon" and "Moonchild Productions" respectively for # to "New Moon" and "Open Source Contributors" respectively for
# Pale Moon # Pale Moon
MOZ_APP_BASENAME=Palemoon MOZ_APP_BASENAME=Newmoon
MOZ_APP_VENDOR=Moonchild MOZ_APP_VENDOR=OpenSourceContributors
MOZ_APP_UA_NAME=PaleMoon MOZ_APP_UA_NAME=PaleMoon
# Application Version # Application Version

View file

@ -1,4 +1,4 @@
;!@Install@!UTF-8! ;!@Install@!UTF-8!
Title="Pale Moon" Title="New Moon"
RunProgram="setup.exe" RunProgram="setup.exe"
;!@InstallEnd@! ;!@InstallEnd@!

View file

@ -379,17 +379,17 @@ Section "-Application" APP_IDX
; it doesn't cause problems always add them. ; it doesn't cause problems always add them.
${SetUninstallKeys} ${SetUninstallKeys}
; On install always add the PaleMoonHTML and PaleMoonURL keys. ; On install always add the NewMoonHTML and NewMoonURL keys.
; An empty string is used for the 5th param because PaleMoonHTML is not a ; An empty string is used for the 5th param because NewMoonHTML is not a
; protocol handler. ; protocol handler.
${GetLongPath} "$INSTDIR\${FileMainEXE}" $8 ${GetLongPath} "$INSTDIR\${FileMainEXE}" $8
StrCpy $2 "$\"$8$\" -osint -url $\"%1$\"" StrCpy $2 "$\"$8$\" -osint -url $\"%1$\""
; In Win8, the delegate execute handler picks up the value in PaleMoonURL and ; In Win8, the delegate execute handler picks up the value in NewMoonURL and
; PaleMoonHTML to launch the desktop browser when it needs to. ; NewMoonHTML to launch the desktop browser when it needs to.
${AddDisabledDDEHandlerValues} "PaleMoonHTML" "$2" "$8,1" \ ${AddDisabledDDEHandlerValues} "NewMoonHTML" "$2" "$8,1" \
"${AppRegName} Document" "" "${AppRegName} Document" ""
${AddDisabledDDEHandlerValues} "PaleMoonURL" "$2" "$8,1" "${AppRegName} URL" \ ${AddDisabledDDEHandlerValues} "NewMoonURL" "$2" "$8,1" "${AppRegName} URL" \
"true" "true"
; For pre win8, the following keys should only be set if we can write to HKLM. ; For pre win8, the following keys should only be set if we can write to HKLM.

View file

@ -13,9 +13,9 @@
; start menu tile. In case there are 2 PaleMoon installations, we only do ; start menu tile. In case there are 2 PaleMoon installations, we only do
; this if the application being updated is the default. ; this if the application being updated is the default.
ReadRegStr $0 HKCU "Software\Microsoft\Windows\Shell\Associations\UrlAssociations\http\UserChoice" "ProgId" ReadRegStr $0 HKCU "Software\Microsoft\Windows\Shell\Associations\UrlAssociations\http\UserChoice" "ProgId"
${If} $0 == "PaleMoonURL" ${If} $0 == "NewMoonURL"
${AndIf} $9 != 0 ; We're not running in session 0 ${AndIf} $9 != 0 ; We're not running in session 0
ReadRegStr $0 HKCU "Software\Classes\PaleMoonURL\shell\open\command" "" ReadRegStr $0 HKCU "Software\Classes\NewMoonURL\shell\open\command" ""
${GetPathFromString} "$0" $0 ${GetPathFromString} "$0" $0
${GetParent} "$0" $0 ${GetParent} "$0" $0
${If} ${FileExists} "$0" ${If} ${FileExists} "$0"
@ -282,9 +282,9 @@
ClearErrors ClearErrors
EnumRegKey $7 HKCR "${FILE_TYPE}" 0 EnumRegKey $7 HKCR "${FILE_TYPE}" 0
${If} ${Errors} ${If} ${Errors}
WriteRegStr SHCTX "SOFTWARE\Classes\${FILE_TYPE}" "" "PaleMoonHTML" WriteRegStr SHCTX "SOFTWARE\Classes\${FILE_TYPE}" "" "NewMoonHTML"
${EndIf} ${EndIf}
WriteRegStr SHCTX "SOFTWARE\Classes\${FILE_TYPE}\OpenWithProgids" "PaleMoonHTML" "" WriteRegStr SHCTX "SOFTWARE\Classes\${FILE_TYPE}\OpenWithProgids" "NewMoonHTML" ""
!macroend !macroend
!define AddAssociationIfNoneExist "!insertmacro AddAssociationIfNoneExist" !define AddAssociationIfNoneExist "!insertmacro AddAssociationIfNoneExist"
@ -296,30 +296,30 @@
StrCpy $0 "SOFTWARE\Classes" StrCpy $0 "SOFTWARE\Classes"
StrCpy $2 "$\"$8$\" -osint -url $\"%1$\"" StrCpy $2 "$\"$8$\" -osint -url $\"%1$\""
; Associate the file handlers with PaleMoonHTML ; Associate the file handlers with NewMoonHTML
ReadRegStr $6 SHCTX "$0\.htm" "" ReadRegStr $6 SHCTX "$0\.htm" ""
${If} "$6" != "PaleMoonHTML" ${If} "$6" != "NewMoonHTML"
WriteRegStr SHCTX "$0\.htm" "" "PaleMoonHTML" WriteRegStr SHCTX "$0\.htm" "" "NewMoonHTML"
${EndIf} ${EndIf}
ReadRegStr $6 SHCTX "$0\.html" "" ReadRegStr $6 SHCTX "$0\.html" ""
${If} "$6" != "PaleMoonHTML" ${If} "$6" != "NewMoonHTML"
WriteRegStr SHCTX "$0\.html" "" "PaleMoonHTML" WriteRegStr SHCTX "$0\.html" "" "NewMoonHTML"
${EndIf} ${EndIf}
ReadRegStr $6 SHCTX "$0\.shtml" "" ReadRegStr $6 SHCTX "$0\.shtml" ""
${If} "$6" != "PaleMoonHTML" ${If} "$6" != "NewMoonHTML"
WriteRegStr SHCTX "$0\.shtml" "" "PaleMoonHTML" WriteRegStr SHCTX "$0\.shtml" "" "NewMoonHTML"
${EndIf} ${EndIf}
ReadRegStr $6 SHCTX "$0\.xht" "" ReadRegStr $6 SHCTX "$0\.xht" ""
${If} "$6" != "PaleMoonHTML" ${If} "$6" != "NewMoonHTML"
WriteRegStr SHCTX "$0\.xht" "" "PaleMoonHTML" WriteRegStr SHCTX "$0\.xht" "" "NewMoonHTML"
${EndIf} ${EndIf}
ReadRegStr $6 SHCTX "$0\.xhtml" "" ReadRegStr $6 SHCTX "$0\.xhtml" ""
${If} "$6" != "PaleMoonHTML" ${If} "$6" != "NewMoonHTML"
WriteRegStr SHCTX "$0\.xhtml" "" "PaleMoonHTML" WriteRegStr SHCTX "$0\.xhtml" "" "NewMoonHTML"
${EndIf} ${EndIf}
${AddAssociationIfNoneExist} ".pdf" ${AddAssociationIfNoneExist} ".pdf"
@ -329,12 +329,12 @@
${AddAssociationIfNoneExist} ".pdf" ${AddAssociationIfNoneExist} ".pdf"
${AddAssociationIfNoneExist} ".webm" ${AddAssociationIfNoneExist} ".webm"
; An empty string is used for the 5th param because PaleMoonHTML is not a ; An empty string is used for the 5th param because NewMoonHTML is not a
; protocol handler ; protocol handler
${AddDisabledDDEHandlerValues} "PaleMoonHTML" "$2" "$8,1" \ ${AddDisabledDDEHandlerValues} "NewMoonHTML" "$2" "$8,1" \
"${AppRegName} HTML Document" "" "${AppRegName} HTML Document" ""
${AddDisabledDDEHandlerValues} "PaleMoonURL" "$2" "$8,1" "${AppRegName} URL" \ ${AddDisabledDDEHandlerValues} "NewMoonURL" "$2" "$8,1" "${AppRegName} URL" \
"true" "true"
; An empty string is used for the 4th & 5th params because the following ; An empty string is used for the 4th & 5th params because the following
; protocol handlers already have a display name and the additional keys ; protocol handlers already have a display name and the additional keys
@ -404,35 +404,35 @@
WriteRegStr ${RegKey} "$0\Capabilities" "ApplicationIcon" "$8,0" WriteRegStr ${RegKey} "$0\Capabilities" "ApplicationIcon" "$8,0"
WriteRegStr ${RegKey} "$0\Capabilities" "ApplicationName" "${BrandShortName}" WriteRegStr ${RegKey} "$0\Capabilities" "ApplicationName" "${BrandShortName}"
WriteRegStr ${RegKey} "$0\Capabilities\FileAssociations" ".htm" "PaleMoonHTML" WriteRegStr ${RegKey} "$0\Capabilities\FileAssociations" ".htm" "NewMoonHTML"
WriteRegStr ${RegKey} "$0\Capabilities\FileAssociations" ".html" "PaleMoonHTML" WriteRegStr ${RegKey} "$0\Capabilities\FileAssociations" ".html" "NewMoonHTML"
WriteRegStr ${RegKey} "$0\Capabilities\FileAssociations" ".shtml" "PaleMoonHTML" WriteRegStr ${RegKey} "$0\Capabilities\FileAssociations" ".shtml" "NewMoonHTML"
WriteRegStr ${RegKey} "$0\Capabilities\FileAssociations" ".xht" "PaleMoonHTML" WriteRegStr ${RegKey} "$0\Capabilities\FileAssociations" ".xht" "NewMoonHTML"
WriteRegStr ${RegKey} "$0\Capabilities\FileAssociations" ".xhtml" "PaleMoonHTML" WriteRegStr ${RegKey} "$0\Capabilities\FileAssociations" ".xhtml" "NewMoonHTML"
WriteRegStr ${RegKey} "$0\Capabilities\StartMenu" "StartMenuInternet" "$R9" WriteRegStr ${RegKey} "$0\Capabilities\StartMenu" "StartMenuInternet" "$R9"
WriteRegStr ${RegKey} "$0\Capabilities\URLAssociations" "ftp" "PaleMoonURL" WriteRegStr ${RegKey} "$0\Capabilities\URLAssociations" "ftp" "NewMoonURL"
WriteRegStr ${RegKey} "$0\Capabilities\URLAssociations" "http" "PaleMoonURL" WriteRegStr ${RegKey} "$0\Capabilities\URLAssociations" "http" "NewMoonURL"
WriteRegStr ${RegKey} "$0\Capabilities\URLAssociations" "https" "PaleMoonURL" WriteRegStr ${RegKey} "$0\Capabilities\URLAssociations" "https" "NewMoonURL"
; Vista Registered Application ; Vista Registered Application
WriteRegStr ${RegKey} "Software\RegisteredApplications" "${AppRegName}" "$0\Capabilities" WriteRegStr ${RegKey} "Software\RegisteredApplications" "${AppRegName}" "$0\Capabilities"
!macroend !macroend
!define SetStartMenuInternet "!insertmacro SetStartMenuInternet" !define SetStartMenuInternet "!insertmacro SetStartMenuInternet"
; The IconHandler reference for PaleMoonHTML can end up in an inconsistent state ; The IconHandler reference for NewMoonHTML can end up in an inconsistent state
; due to changes not being detected by the IconHandler for side by side ; due to changes not being detected by the IconHandler for side by side
; installs (see bug 268512). The symptoms can be either an incorrect icon or no ; installs (see bug 268512). The symptoms can be either an incorrect icon or no
; icon being displayed for files associated with PaleMoon (does not use SHCTX). ; icon being displayed for files associated with PaleMoon (does not use SHCTX).
!macro FixShellIconHandler RegKey !macro FixShellIconHandler RegKey
ClearErrors ClearErrors
ReadRegStr $1 ${RegKey} "Software\Classes\PaleMoonHTML\ShellEx\IconHandler" "" ReadRegStr $1 ${RegKey} "Software\Classes\NewMoonHTML\ShellEx\IconHandler" ""
${Unless} ${Errors} ${Unless} ${Errors}
ReadRegStr $1 ${RegKey} "Software\Classes\PaleMoonHTML\DefaultIcon" "" ReadRegStr $1 ${RegKey} "Software\Classes\NewMoonHTML\DefaultIcon" ""
${GetLongPath} "$INSTDIR\${FileMainEXE}" $2 ${GetLongPath} "$INSTDIR\${FileMainEXE}" $2
${If} "$1" != "$2,1" ${If} "$1" != "$2,1"
WriteRegStr ${RegKey} "Software\Classes\PaleMoonHTML\DefaultIcon" "" "$2,1" WriteRegStr ${RegKey} "Software\Classes\NewMoonHTML\DefaultIcon" "" "$2,1"
${EndIf} ${EndIf}
${EndUnless} ${EndUnless}
!macroend !macroend
@ -567,7 +567,7 @@
; HKCU Software\Classes keys when associating handlers. The fix uses the merged ; HKCU Software\Classes keys when associating handlers. The fix uses the merged
; view in HKCR to check for existance of an existing association. This macro ; view in HKCR to check for existance of an existing association. This macro
; cleans affected installations by removing the HKLM and HKCU value if it is set ; cleans affected installations by removing the HKLM and HKCU value if it is set
; to PaleMoonHTML when there is a value for PersistentHandler or by removing the ; to NewMoonHTML when there is a value for PersistentHandler or by removing the
; HKCU value when the HKLM value has a value other than an empty string. ; HKCU value when the HKLM value has a value other than an empty string.
!macro FixBadFileAssociation FILE_TYPE !macro FixBadFileAssociation FILE_TYPE
; Only delete the default value in case the key has values for OpenWithList, ; Only delete the default value in case the key has values for OpenWithList,
@ -576,16 +576,16 @@
ReadRegStr $1 HKLM "Software\Classes\${FILE_TYPE}" "" ReadRegStr $1 HKLM "Software\Classes\${FILE_TYPE}" ""
ReadRegStr $2 HKCR "${FILE_TYPE}\PersistentHandler" "" ReadRegStr $2 HKCR "${FILE_TYPE}\PersistentHandler" ""
${If} "$2" != "" ${If} "$2" != ""
; Since there is a persistent handler remove PaleMoonHTML as the default ; Since there is a persistent handler remove NewMoonHTML as the default
; value from both HKCU and HKLM if it set to PaleMoonHTML. ; value from both HKCU and HKLM if it set to NewMoonHTML.
${If} "$0" == "PaleMoonHTML" ${If} "$0" == "NewMoonHTML"
DeleteRegValue HKCU "Software\Classes\${FILE_TYPE}" "" DeleteRegValue HKCU "Software\Classes\${FILE_TYPE}" ""
${EndIf} ${EndIf}
${If} "$1" == "PaleMoonHTML" ${If} "$1" == "NewMoonHTML"
DeleteRegValue HKLM "Software\Classes\${FILE_TYPE}" "" DeleteRegValue HKLM "Software\Classes\${FILE_TYPE}" ""
${EndIf} ${EndIf}
${ElseIf} "$0" == "PaleMoonHTML" ${ElseIf} "$0" == "NewMoonHTML"
; Since KHCU is set to PaleMoonHTML remove PaleMoonHTML as the default value ; Since KHCU is set to NewMoonHTML remove NewMoonHTML as the default value
; from HKCU if HKLM is set to a value other than an empty string. ; from HKCU if HKLM is set to a value other than an empty string.
${If} "$1" != "" ${If} "$1" != ""
DeleteRegValue HKCU "Software\Classes\${FILE_TYPE}" "" DeleteRegValue HKCU "Software\Classes\${FILE_TYPE}" ""
@ -641,17 +641,17 @@
; Only set the file and protocol handlers if the existing one under HKCR is ; Only set the file and protocol handlers if the existing one under HKCR is
; for this install location. ; for this install location.
${IsHandlerForInstallDir} "PaleMoonHTML" $R9 ${IsHandlerForInstallDir} "NewMoonHTML" $R9
${If} "$R9" == "true" ${If} "$R9" == "true"
; An empty string is used for the 5th param because PaleMoonHTML is not a ; An empty string is used for the 5th param because NewMoonHTML is not a
; protocol handler. ; protocol handler.
${AddDisabledDDEHandlerValues} "PaleMoonHTML" "$2" "$8,1" \ ${AddDisabledDDEHandlerValues} "NewMoonHTML" "$2" "$8,1" \
"${AppRegName} HTML Document" "" "${AppRegName} HTML Document" ""
${EndIf} ${EndIf}
${IsHandlerForInstallDir} "PaleMoonURL" $R9 ${IsHandlerForInstallDir} "NewMoonURL" $R9
${If} "$R9" == "true" ${If} "$R9" == "true"
${AddDisabledDDEHandlerValues} "PaleMoonURL" "$2" "$8,1" \ ${AddDisabledDDEHandlerValues} "NewMoonURL" "$2" "$8,1" \
"${AppRegName} URL" "true" "${AppRegName} URL" "true"
${EndIf} ${EndIf}
@ -699,10 +699,10 @@
DeleteRegValue HKLM "$0\Capabilities\URLAssociations" "gopher" DeleteRegValue HKLM "$0\Capabilities\URLAssociations" "gopher"
${EndUnless} ${EndUnless}
; Delete gopher from the user's UrlAssociations if it points to PaleMoonURL. ; Delete gopher from the user's UrlAssociations if it points to NewMoonURL.
StrCpy $0 "Software\Microsoft\Windows\Shell\Associations\UrlAssociations\gopher" StrCpy $0 "Software\Microsoft\Windows\Shell\Associations\UrlAssociations\gopher"
ReadRegStr $2 HKCU "$0\UserChoice" "Progid" ReadRegStr $2 HKCU "$0\UserChoice" "Progid"
${If} "$2" == "PaleMoonURL" ${If} "$2" == "NewMoonURL"
DeleteRegKey HKCU "$0" DeleteRegKey HKCU "$0"
${EndIf} ${EndIf}
!macroend !macroend

View file

@ -227,27 +227,27 @@ Section "Uninstall"
${un.SetAppLSPCategories} ${un.SetAppLSPCategories}
${EndIf} ${EndIf}
${un.RegCleanAppHandler} "PaleMoonURL" ${un.RegCleanAppHandler} "NewMoonURL"
${un.RegCleanAppHandler} "PaleMoonHTML" ${un.RegCleanAppHandler} "NewMoonHTML"
${un.RegCleanProtocolHandler} "ftp" ${un.RegCleanProtocolHandler} "ftp"
${un.RegCleanProtocolHandler} "http" ${un.RegCleanProtocolHandler} "http"
${un.RegCleanProtocolHandler} "https" ${un.RegCleanProtocolHandler} "https"
ClearErrors ClearErrors
ReadRegStr $R9 HKCR "PaleMoonHTML" "" ReadRegStr $R9 HKCR "NewMoonHTML" ""
; Don't clean up the file handlers if the PaleMoonHTML key still exists since ; Don't clean up the file handlers if the NewMoonHTML key still exists since
; there should be a second installation that may be the default file handler ; there should be a second installation that may be the default file handler
${If} ${Errors} ${If} ${Errors}
${un.RegCleanFileHandler} ".htm" "PaleMoonHTML" ${un.RegCleanFileHandler} ".htm" "NewMoonHTML"
${un.RegCleanFileHandler} ".html" "PaleMoonHTML" ${un.RegCleanFileHandler} ".html" "NewMoonHTML"
${un.RegCleanFileHandler} ".shtml" "PaleMoonHTML" ${un.RegCleanFileHandler} ".shtml" "NewMoonHTML"
${un.RegCleanFileHandler} ".xht" "PaleMoonHTML" ${un.RegCleanFileHandler} ".xht" "NewMoonHTML"
${un.RegCleanFileHandler} ".xhtml" "PaleMoonHTML" ${un.RegCleanFileHandler} ".xhtml" "NewMoonHTML"
${un.RegCleanFileHandler} ".oga" "PaleMoonHTML" ${un.RegCleanFileHandler} ".oga" "NewMoonHTML"
${un.RegCleanFileHandler} ".ogg" "PaleMoonHTML" ${un.RegCleanFileHandler} ".ogg" "NewMoonHTML"
${un.RegCleanFileHandler} ".ogv" "PaleMoonHTML" ${un.RegCleanFileHandler} ".ogv" "NewMoonHTML"
${un.RegCleanFileHandler} ".pdf" "PaleMoonHTML" ${un.RegCleanFileHandler} ".pdf" "NewMoonHTML"
${un.RegCleanFileHandler} ".webm" "PaleMoonHTML" ${un.RegCleanFileHandler} ".webm" "NewMoonHTML"
${EndIf} ${EndIf}
SetShellVarContext all ; Set SHCTX to HKLM SetShellVarContext all ; Set SHCTX to HKLM

View file

@ -31,6 +31,6 @@
<!ENTITY newtabPage.label "When opening a new tab, show:"> <!ENTITY newtabPage.label "When opening a new tab, show:">
<!ENTITY newtabPage.custom.label "A custom URL"> <!ENTITY newtabPage.custom.label "A custom URL">
<!ENTITY newtabPage.blank.label "A blank page"> <!ENTITY newtabPage.blank.label "A blank page">
<!ENTITY newtabPage.home.label "The Pale Moon start page"> <!ENTITY newtabPage.home.label "The New Moon start page">
<!ENTITY newtabPage.myhome.label "My home page"> <!ENTITY newtabPage.myhome.label "My home page">
<!ENTITY newtabPage.quickdial.label "The Quickdial page"> <!ENTITY newtabPage.quickdial.label "The Quickdial page">

View file

@ -5,6 +5,6 @@
<!ENTITY status4evar.throbber.widget.title "Activity Indicator"> <!ENTITY status4evar.throbber.widget.title "Activity Indicator">
<!ENTITY status4evar.download.widget.title "Download Status"> <!ENTITY status4evar.download.widget.title "Download Status">
<!ENTITY status4evar.options.widget.title "Status Bar Preferences"> <!ENTITY status4evar.options.widget.title "Status Bar Preferences">
<!ENTITY status4evar.options.widget.label "Pale Moon status bar"> <!ENTITY status4evar.options.widget.label "New Moon status bar">
<!ENTITY status4evar.menu.options.label "Status Bar Preferences"> <!ENTITY status4evar.menu.options.label "Status Bar Preferences">

View file

@ -1,4 +1,4 @@
<!ENTITY status4evar.window.title "Pale Moon status bar preferences"> <!ENTITY status4evar.window.title "New Moon status bar preferences">
<!ENTITY status4evar.pane.status "Status"> <!ENTITY status4evar.pane.status "Status">
<!ENTITY status4evar.pane.progress "Progress"> <!ENTITY status4evar.pane.progress "Progress">
@ -33,7 +33,7 @@
<!ENTITY status4evar.option.no-repeat "No Repeat"> <!ENTITY status4evar.option.no-repeat "No Repeat">
<!ENTITY status4evar.option.space "Space"> <!ENTITY status4evar.option.space "Space">
<!ENTITY status4evar.option.round "Round"> <!ENTITY status4evar.option.round "Round">
<!ENTITY status4evar.option.firefoxdefault "Pale Moon default"> <!ENTITY status4evar.option.firefoxdefault "New Moon default">
<!ENTITY status4evar.option.download.library "Library"> <!ENTITY status4evar.option.download.library "Library">
<!ENTITY status4evar.option.download.tab "Tab"> <!ENTITY status4evar.option.download.tab "Tab">
<!ENTITY status4evar.option.download.thirdparty "3rd Party"> <!ENTITY status4evar.option.download.thirdparty "3rd Party">

View file

@ -3,24 +3,24 @@
# file, You can obtain one at http://mozilla.org/MPL/2.0/. # file, You can obtain one at http://mozilla.org/MPL/2.0/.
malformedURI=The URL is not valid and cannot be loaded. malformedURI=The URL is not valid and cannot be loaded.
fileNotFound=Pale Moon can't find the file at %S. fileNotFound=New Moon can't find the file at %S.
dnsNotFound=Pale Moon can't find the server at %S. dnsNotFound=New Moon can't find the server at %S.
unknownProtocolFound=Pale Moon doesn't know how to open this address, because the protocol (%S) isn't associated with any program. unknownProtocolFound=New Moon doesn't know how to open this address, because the protocol (%S) isn't associated with any program.
connectionFailure=Pale Moon can't establish a connection to the server at %S. connectionFailure=New Moon can't establish a connection to the server at %S.
netInterrupt=The connection to %S was interrupted while the page was loading. netInterrupt=The connection to %S was interrupted while the page was loading.
netTimeout=The server at %S is taking too long to respond. netTimeout=The server at %S is taking too long to respond.
redirectLoop=Pale Moon has detected that the server is redirecting the request for this address in a way that will never complete. redirectLoop=New Moon has detected that the server is redirecting the request for this address in a way that will never complete.
## LOCALIZATION NOTE (confirmRepostPrompt): In this item, don't translate "%S" ## LOCALIZATION NOTE (confirmRepostPrompt): In this item, don't translate "%S"
confirmRepostPrompt=To display this page, %S must send information that will repeat any action (such as a search or order confirmation) that was performed earlier. confirmRepostPrompt=To display this page, %S must send information that will repeat any action (such as a search or order confirmation) that was performed earlier.
resendButton.label=Resend resendButton.label=Resend
unknownSocketType=Pale Moon doesn't know how to communicate with the server. unknownSocketType=New Moon doesn't know how to communicate with the server.
netReset=The connection to the server was reset while the page was loading. netReset=The connection to the server was reset while the page was loading.
notCached=This document is no longer available. notCached=This document is no longer available.
netOffline=Pale Moon is currently in offline mode and can't browse the Web. netOffline=New Moon is currently in offline mode and can't browse the Web.
isprinting=The document cannot change while Printing or in Print Preview. isprinting=The document cannot change while Printing or in Print Preview.
deniedPortAccess=This address uses a network port which is normally used for purposes other than Web browsing. Pale Moon has canceled the request for your protection. deniedPortAccess=This address uses a network port which is normally used for purposes other than Web browsing. New Moon has canceled the request for your protection.
proxyResolveFailure=Pale Moon is configured to use a proxy server that can't be found. proxyResolveFailure=New Moon is configured to use a proxy server that can't be found.
proxyConnectFailure=Pale Moon is configured to use a proxy server that is refusing connections. proxyConnectFailure=New Moon is configured to use a proxy server that is refusing connections.
contentEncodingError=The page you are trying to view cannot be shown because it uses an invalid or unsupported form of compression. contentEncodingError=The page you are trying to view cannot be shown because it uses an invalid or unsupported form of compression.
unsafeContentType=The page you are trying to view cannot be shown because it is contained in a file type that may not be safe to open. Please contact the website owners to inform them of this problem. unsafeContentType=The page you are trying to view cannot be shown because it is contained in a file type that may not be safe to open. Please contact the website owners to inform them of this problem.
externalProtocolTitle=External Protocol Request externalProtocolTitle=External Protocol Request
@ -32,6 +32,6 @@ externalProtocolLaunchBtn=Launch application
cspBlocked=This page has a content security policy that prevents it from being embedded in this way. cspBlocked=This page has a content security policy that prevents it from being embedded in this way.
xssBlockMode=This page contains an XSS attack that has been blocked for your security. xssBlockMode=This page contains an XSS attack that has been blocked for your security.
corruptedContentError=The page you are trying to view cannot be shown because an error in the data transmission was detected. corruptedContentError=The page you are trying to view cannot be shown because an error in the data transmission was detected.
remoteXUL=This page uses an unsupported technology that is no longer available by default in Pale Moon. remoteXUL=This page uses an unsupported technology that is no longer available by default in New Moon.
## LOCALIZATION NOTE (sslv3Used) - Do not translate "%S". ## LOCALIZATION NOTE (sslv3Used) - Do not translate "%S".
sslv3Used=Pale Moon cannot guarantee the safety of your data on %S because it uses SSLv3, a broken security protocol. sslv3Used=New Moon cannot guarantee the safety of your data on %S because it uses SSLv3, a broken security protocol.

View file

@ -11,9 +11,6 @@
<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/9hAAAAFXRFWHRDcmVhdGlvbiBUaW1lAAfjBQQNKi3s6zvVAAAAB3RJTUUH4wUFDiY4QniqfgAAAAlwSFlzAAAK8AAACvABQqw0mAAAAn1JREFUeNpVU9FKW0EUnLO7NzdFY5uqRSMSoSj1F/paP0EEoU/2H/pWIkiLX+GzH5HnQj9BENQqpSgWkdbeu/fubudsCKQ3CSS7M3PmzDmRb5f3mH1SShsGcmAF7wTYaGMC35cQjBNwYoxczeJlKpASrAFGHYOP3cKUJMO3Cb4JMPwhIggJdZNwLEaOKBiU52bIp73S7jp+iyyJFNG2/JBlSBYC6KrsWhnR1XYQ2Sc1GuRKcTTXMbudwqpcfokxUPtamV/heGWdgaVKYWXPpvRp0sLF/ZB3Z72uKx0B3ocswis8VQ0CRf7yTMWflRZTh00bq1awpS18IK8kXltBQWDbBroK2X7Byxc9m9tIk7Qyju66EThwjHhHyS3DQpG0dSYVEELM9rWdyKskmmDMEpaphjpAnOw4VhuayAMGBi85cX0UzF7xVEfUdJNyV5Ltu5wNYIJsOK1GPji6TFKBkm3wJxq6iLQkMWVXhkmqkAktHHF/qgDnfXsZUhi03mTVqm7gFKiDzuPUXWg4FabPqbdRRVWcZOcuiJXx02P1VgjU8HJM2rtWysFOzh1dcXSaPizolEKdue5Yvp7fDn+efz+LtS81Bt2YIHn1Jn0SqLO31ubwtLzlGfekerm5vuWss1fzz3vHtxc/RpE9q4cmkcCKUW2yGc2EFLQpTdcei8OVL8a567zKCyuLR78f6u37m7s9iS0rE1HrhD1qilXC6vyIddCr/mr/dH516bNy8ypz3mHwZrD/anPt0JuyqkOBqtJlKrhMFk2dUPkID1MtvV45XNsevCcn/vdvnD6+btbvbn4dPNw+7lSVH+pZOde96i8vjJcH/ZNO6a5n8f8A5KRcUpQlS3kAAAAASUVORK5CYII=">Pale Moon</A> <DT><A HREF="http://www.example.com/" ICON_URI="http://www.example.com/favicon.ico" ICON="your icon here">Your website here (application/palemoon/locales/generic/profile/bookmarks.html.in)</A>
<DT><A HREF="https://forum.palemoon.org/index.php" ICON_URI="https://forum.palemoon.org/favicon.ico" ICON="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAFXRFWHRDcmVhdGlvbiBUaW1lAAfjBQQNKi3s6zvVAAAAB3RJTUUH4wUFDiY4QniqfgAAAAlwSFlzAAAK8AAACvABQqw0mAAAAn1JREFUeNpVU9FKW0EUnLO7NzdFY5uqRSMSoSj1F/paP0EEoU/2H/pWIkiLX+GzH5HnQj9BENQqpSgWkdbeu/fubudsCKQ3CSS7M3PmzDmRb5f3mH1SShsGcmAF7wTYaGMC35cQjBNwYoxczeJlKpASrAFGHYOP3cKUJMO3Cb4JMPwhIggJdZNwLEaOKBiU52bIp73S7jp+iyyJFNG2/JBlSBYC6KrsWhnR1XYQ2Sc1GuRKcTTXMbudwqpcfokxUPtamV/heGWdgaVKYWXPpvRp0sLF/ZB3Z72uKx0B3ocswis8VQ0CRf7yTMWflRZTh00bq1awpS18IK8kXltBQWDbBroK2X7Byxc9m9tIk7Qyju66EThwjHhHyS3DQpG0dSYVEELM9rWdyKskmmDMEpaphjpAnOw4VhuayAMGBi85cX0UzF7xVEfUdJNyV5Ltu5wNYIJsOK1GPji6TFKBkm3wJxq6iLQkMWVXhkmqkAktHHF/qgDnfXsZUhi03mTVqm7gFKiDzuPUXWg4FabPqbdRRVWcZOcuiJXx02P1VgjU8HJM2rtWysFOzh1dcXSaPizolEKdue5Yvp7fDn+efz+LtS81Bt2YIHn1Jn0SqLO31ubwtLzlGfekerm5vuWss1fzz3vHtxc/RpE9q4cmkcCKUW2yGc2EFLQpTdcei8OVL8a567zKCyuLR78f6u37m7s9iS0rE1HrhD1qilXC6vyIddCr/mr/dH516bNy8ypz3mHwZrD/anPt0JuyqkOBqtJlKrhMFk2dUPkID1MtvV45XNsevCcn/vdvnD6+btbvbn4dPNw+7lSVH+pZOde96i8vjJcH/ZNO6a5n8f8A5KRcUpQlS3kAAAAASUVORK5CYII=" 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/9hAAAAFXRFWHRDcmVhdGlvbiBUaW1lAAfjBQQNKi3s6zvVAAAAB3RJTUUH4wUFDiY4QniqfgAAAAlwSFlzAAAK8AAACvABQqw0mAAAAn1JREFUeNpVU9FKW0EUnLO7NzdFY5uqRSMSoSj1F/paP0EEoU/2H/pWIkiLX+GzH5HnQj9BENQqpSgWkdbeu/fubudsCKQ3CSS7M3PmzDmRb5f3mH1SShsGcmAF7wTYaGMC35cQjBNwYoxczeJlKpASrAFGHYOP3cKUJMO3Cb4JMPwhIggJdZNwLEaOKBiU52bIp73S7jp+iyyJFNG2/JBlSBYC6KrsWhnR1XYQ2Sc1GuRKcTTXMbudwqpcfokxUPtamV/heGWdgaVKYWXPpvRp0sLF/ZB3Z72uKx0B3ocswis8VQ0CRf7yTMWflRZTh00bq1awpS18IK8kXltBQWDbBroK2X7Byxc9m9tIk7Qyju66EThwjHhHyS3DQpG0dSYVEELM9rWdyKskmmDMEpaphjpAnOw4VhuayAMGBi85cX0UzF7xVEfUdJNyV5Ltu5wNYIJsOK1GPji6TFKBkm3wJxq6iLQkMWVXhkmqkAktHHF/qgDnfXsZUhi03mTVqm7gFKiDzuPUXWg4FabPqbdRRVWcZOcuiJXx02P1VgjU8HJM2rtWysFOzh1dcXSaPizolEKdue5Yvp7fDn+efz+LtS81Bt2YIHn1Jn0SqLO31ubwtLzlGfekerm5vuWss1fzz3vHtxc/RpE9q4cmkcCKUW2yGc2EFLQpTdcei8OVL8a567zKCyuLR78f6u37m7s9iS0rE1HrhD1qilXC6vyIddCr/mr/dH516bNy8ypz3mHwZrD/anPt0JuyqkOBqtJlKrhMFk2dUPkID1MtvV45XNsevCcn/vdvnD6+btbvbn4dPNw+7lSVH+pZOde96i8vjJcH/ZNO6a5n8f8A5KRcUpQlS3kAAAAASUVORK5CYII=">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/9hAAAAFXRFWHRDcmVhdGlvbiBUaW1lAAfjBQQNKi3s6zvVAAAAB3RJTUUH4wUFDiY4QniqfgAAAAlwSFlzAAAK8AAACvABQqw0mAAAAn1JREFUeNpVU9FKW0EUnLO7NzdFY5uqRSMSoSj1F/paP0EEoU/2H/pWIkiLX+GzH5HnQj9BENQqpSgWkdbeu/fubudsCKQ3CSS7M3PmzDmRb5f3mH1SShsGcmAF7wTYaGMC35cQjBNwYoxczeJlKpASrAFGHYOP3cKUJMO3Cb4JMPwhIggJdZNwLEaOKBiU52bIp73S7jp+iyyJFNG2/JBlSBYC6KrsWhnR1XYQ2Sc1GuRKcTTXMbudwqpcfokxUPtamV/heGWdgaVKYWXPpvRp0sLF/ZB3Z72uKx0B3ocswis8VQ0CRf7yTMWflRZTh00bq1awpS18IK8kXltBQWDbBroK2X7Byxc9m9tIk7Qyju66EThwjHhHyS3DQpG0dSYVEELM9rWdyKskmmDMEpaphjpAnOw4VhuayAMGBi85cX0UzF7xVEfUdJNyV5Ltu5wNYIJsOK1GPji6TFKBkm3wJxq6iLQkMWVXhkmqkAktHHF/qgDnfXsZUhi03mTVqm7gFKiDzuPUXWg4FabPqbdRRVWcZOcuiJXx02P1VgjU8HJM2rtWysFOzh1dcXSaPizolEKdue5Yvp7fDn+efz+LtS81Bt2YIHn1Jn0SqLO31ubwtLzlGfekerm5vuWss1fzz3vHtxc/RpE9q4cmkcCKUW2yGc2EFLQpTdcei8OVL8a567zKCyuLR78f6u37m7s9iS0rE1HrhD1qilXC6vyIddCr/mr/dH516bNy8ypz3mHwZrD/anPt0JuyqkOBqtJlKrhMFk2dUPkID1MtvV45XNsevCcn/vdvnD6+btbvbn4dPNw+7lSVH+pZOde96i8vjJcH/ZNO6a5n8f8A5KRcUpQlS3kAAAAASUVORK5CYII=">Release notes</A>
</DL><p> </DL><p>
</DL><p> </DL><p>

View file

@ -977,8 +977,8 @@ this.AddonUpdateChecker = {
// Define an array of internally used IDs to NOT send to AUS. // Define an array of internally used IDs to NOT send to AUS.
let internalIDS = [ let internalIDS = [
'{972ce4c6-7e08-4474-a285-3208198ce6fd}', // Global Default Theme '{972ce4c6-7e08-4474-a285-3208198ce6fd}', // Global Default Theme
'modern@themes.mozilla.org', // Modern Theme for Borealis/Suite-based Applications 'modern@themes.mozilla.org', // Modern Theme for BNavigator/Suite-based Applications
'xplatform@interlink.projects.binaryoutcast.com', // Pref-set default theme for Interlink 'xplatform@themes.mozilla.org', // Pref-set default theme for MailNews
'{e2fda1a4-762b-4020-b5ad-a41df1933103}', // Lightning/Calendar Extension '{e2fda1a4-762b-4020-b5ad-a41df1933103}', // Lightning/Calendar Extension
'{a62ef8ec-5fdc-40c2-873c-223b8a6925cc}' // Provider for Google Calendar (gdata) Extension '{a62ef8ec-5fdc-40c2-873c-223b8a6925cc}' // Provider for Google Calendar (gdata) Extension
]; ];