diff --git a/README.md b/README.md index aaff26f2d5..28a6d4d965 100644 --- a/README.md +++ b/README.md @@ -1,3 +1,16 @@ +# Repo for Eclipse Lun3r and Eclipse Hydra + +Eclipse Lun3r is a fork of Pale Moon made for Windows XP. Some advantages over upstream and roytam1's New Moon are more optimzations and better interoperability with upstream. (using SQL storage intead of DBM) + +![big1](https://github.com/user-attachments/assets/e49f28fa-824f-4482-8ee7-e2785bf086eb) + +Eclipse Hydra is a fork of Basilisk made for Windows XP. Some advantages over upstream and roytam1's Serpent are more optimzations and better interoperability with upstream. (using SQL storage intead of DBM) + +![big1](https://github.com/user-attachments/assets/0bd7d7df-0d9a-46b3-9273-2ba7cae5fbdb) + +# Original repository readme + + # Unified XUL Platform (UXP) This repository holds the code for a unified application platform for XUL-based diff --git a/application/basilisk/app/hydra.exe.manifest b/application/basilisk/app/hydra.exe.manifest new file mode 100644 index 0000000000..7f777a4dc2 --- /dev/null +++ b/application/basilisk/app/hydra.exe.manifest @@ -0,0 +1,44 @@ + + + +Eclipse Hydra + + + + + + + + + + + + + + + True/PM + PerMonitorV2,PerMonitor + + + + + + + + + + + + diff --git a/application/basilisk/base/content/aboutDialog.js b/application/basilisk/base/content/aboutDialog.js index 17fd6123c1..0e6aa7b68a 100644 --- a/application/basilisk/base/content/aboutDialog.js +++ b/application/basilisk/base/content/aboutDialog.js @@ -39,21 +39,6 @@ function init(aEvent) // Pref is unset } - // Include the build ID - let versionField = document.getElementById("version"); - let version = Services.appinfo.version; - let buildID = Services.appinfo.appBuildID; - let year = buildID.slice(0, 4); - let month = buildID.slice(4, 6); - let day = buildID.slice(6, 8); - let hour = buildID.slice(8, 10); - let minute = buildID.slice(10, 12); - if (Services.prefs.getBoolPref("general.useragent.appVersionIsBuildID")) { - versionField.textContent = `${year}.${month}.${day}`; - } else { - versionField.textContent = `v` + version + ` (${year}-${month}-${day})`; - } - // Display warning if this is an "a#" (nightly or aurora) build if (/a\d+$/.test(version)) { document.getElementById("experimental").hidden = false; diff --git a/application/basilisk/base/content/aboutDialog.xul b/application/basilisk/base/content/aboutDialog.xul index e75a6fdb78..e55f3f27b5 100644 --- a/application/basilisk/base/content/aboutDialog.xul +++ b/application/basilisk/base/content/aboutDialog.xul @@ -45,7 +45,11 @@ -#expand +#ifdef HAVE_64BIT_BUILD +#expand +#else +#expand +#endif #ifndef NIGHTLY_BUILD #endif @@ -125,19 +129,19 @@ #if defined(MOZ_OFFICIAL_BRANDING) || defined(MC_OFFICIAL) #ifdef MC_PRIVATE_BUILD - This is a private build of Basilisk. If you did not manually build this copy from source yourself, then please download an official version from the . + This is a private build of Hydra. If you did not manually build this copy from source yourself, then please download an official version from the . #else - Basilisk is community software released by and Mozilla developers. Learn to this software. + is community software released by and Mozilla developers. Learn to this software. - Want to help? Please consider or get involved with our of the Unified XUL Platform. + If you wish to contribute, please consider helping out by providing support to other users on the or getting involved in our development by tackling some of the issues found in our . #endif #else - This is an unofficial build of Basilisk. For official builds, please go to . + This is an unofficial build of Hydra. For official builds, please go to . #endif diff --git a/application/basilisk/branding/official/LICENSE b/application/basilisk/branding/official/LICENSE new file mode 100644 index 0000000000..72a4bdcb82 --- /dev/null +++ b/application/basilisk/branding/official/LICENSE @@ -0,0 +1,10 @@ +This location contains official branding for the Basilisk browser. + +Please note that you are not granted any trademark rights or licenses +to the trademarks of Moonchild Productions, the Basilisk Development Team, or any other party, +including without limitation the Basilisk name or logo. + +These branding materials are Copyrighted (c) the Basilisk Development Team. All rights reserved. + +Official branding using these files is only allowed by the copyright holder +or by third parties with express permission from the copyright holder. diff --git a/application/basilisk/branding/official/VisualElements_150.png b/application/basilisk/branding/official/VisualElements_150.png new file mode 100644 index 0000000000..eb74e4adc5 Binary files /dev/null and b/application/basilisk/branding/official/VisualElements_150.png differ diff --git a/application/basilisk/branding/official/VisualElements_70.png b/application/basilisk/branding/official/VisualElements_70.png new file mode 100644 index 0000000000..571532a9ba Binary files /dev/null and b/application/basilisk/branding/official/VisualElements_70.png differ diff --git a/application/basilisk/branding/official/appname.bmp b/application/basilisk/branding/official/appname.bmp new file mode 100644 index 0000000000..1ee08c9445 Binary files /dev/null and b/application/basilisk/branding/official/appname.bmp differ diff --git a/application/basilisk/branding/official/background.png b/application/basilisk/branding/official/background.png new file mode 100644 index 0000000000..3fa4a0ec73 Binary files /dev/null and b/application/basilisk/branding/official/background.png differ diff --git a/application/basilisk/branding/official/branding.nsi b/application/basilisk/branding/official/branding.nsi new file mode 100644 index 0000000000..c040fc2551 --- /dev/null +++ b/application/basilisk/branding/official/branding.nsi @@ -0,0 +1,16 @@ +# 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 +# file, You can obtain one at http://mozilla.org/MPL/2.0/. + +# NSIS branding defines for official release builds. +# The nightly build branding.nsi is located in browser/installer/windows/nsis/ +# The unofficial build branding.nsi is located in browser/branding/unofficial/ + +# BrandFullNameInternal is used for some registry and file system values +# instead of BrandFullName and typically should not be modified. +!define BrandFullNameInternal "Eclipse Hydra" +!define CompanyName "Eclipse Community" +!define URLInfoAbout "https://eclipse.cx" +!define URLUpdateInfo "https://github.com/Eclipse-Community/UXP/releases" +!define HelpLink "https://board.eclipse.cx/viewtopic.php?t=710" +!define URLSystemRequirements "https://github.com/Eclipse-Community/UXP" diff --git a/application/basilisk/branding/official/configure.sh b/application/basilisk/branding/official/configure.sh new file mode 100644 index 0000000000..817fe5d99e --- /dev/null +++ b/application/basilisk/branding/official/configure.sh @@ -0,0 +1,25 @@ +# 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 +# file, You can obtain one at http://mozilla.org/MPL/2.0/. + +MOZ_APP_NAME=hydra + +MOZ_APP_BASENAME="Hydra" + +MOZ_APP_DISPLAYNAME="Hydra" + +MOZ_APP_UA_NAME="Hydra" + +MOZ_APP_VENDOR="Eclipse Community" + +MOZ_APP_FULLNAME="Eclipse Hydra" + +MOZ_APP_PROFILE="Eclipse Community/Hydra" + +MOZ_APP_REMOTINGNAME=com.eclipse.hydra + +MOZ_DISTRIBUTION_ID=com.eclipse + +MOZ_MACBUNDLE_NAME="hydra.app" + +MOZ_SOURCE_REPO=https://github.com/Eclipse-Community/UXP diff --git a/application/basilisk/branding/official/content/about-background.png b/application/basilisk/branding/official/content/about-background.png new file mode 100644 index 0000000000..5f549121e5 Binary files /dev/null and b/application/basilisk/branding/official/content/about-background.png differ diff --git a/application/basilisk/branding/official/content/about-logo.png b/application/basilisk/branding/official/content/about-logo.png new file mode 100644 index 0000000000..c5a838178a Binary files /dev/null and b/application/basilisk/branding/official/content/about-logo.png differ diff --git a/application/basilisk/branding/official/content/about-logo@2x.png b/application/basilisk/branding/official/content/about-logo@2x.png new file mode 100644 index 0000000000..48c31564c4 Binary files /dev/null and b/application/basilisk/branding/official/content/about-logo@2x.png differ diff --git a/application/basilisk/branding/official/content/about-wordmark.png b/application/basilisk/branding/official/content/about-wordmark.png new file mode 100644 index 0000000000..5dd55e8bf2 Binary files /dev/null and b/application/basilisk/branding/official/content/about-wordmark.png differ diff --git a/application/basilisk/branding/official/content/about-wordmark.svg b/application/basilisk/branding/official/content/about-wordmark.svg new file mode 100644 index 0000000000..d950e0944c --- /dev/null +++ b/application/basilisk/branding/official/content/about-wordmark.svg @@ -0,0 +1,75 @@ + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + @roytam1's +own fork + diff --git a/application/basilisk/branding/official/content/about.png b/application/basilisk/branding/official/content/about.png new file mode 100644 index 0000000000..e323c8df5c Binary files /dev/null and b/application/basilisk/branding/official/content/about.png differ diff --git a/application/basilisk/branding/official/content/aboutDialog.css b/application/basilisk/branding/official/content/aboutDialog.css new file mode 100644 index 0000000000..84d9cea7e4 --- /dev/null +++ b/application/basilisk/branding/official/content/aboutDialog.css @@ -0,0 +1,49 @@ +/* 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 + * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ + +#clientBox { + background-color: #F7F7F7; + color: #222; +} + +#leftBox { + background-image: url("chrome://branding/content/about-logo.png"); + background-repeat: no-repeat; + background-size: 192px auto; + /* min-width and min-height create room for the logo */ + min-width: 210px; + min-height: 210px; + margin-top: 20px; + margin-inline-start: 30px; +} + + +@media (min-resolution: 2dppx) { + #leftBox { + background-image: url("chrome://branding/content/about-logo@2x.png"); + } +} + +#rightBox { + margin-left: 30px; + margin-right: 30px; + background-image: url("chrome://branding/content/about-wordmark.png"); + background-repeat: no-repeat; + /* padding-top creates room for the wordmark */ + padding-top: 38px; + margin-top:20px; +} + + +#updateDeck > hbox > label:not([class="text-link"]) { + color: #909090; +} + +#trademark { + font-size: xx-small; + text-align: center; + color: #999; + margin-top: 10px; + margin-bottom: 10px; +} diff --git a/application/basilisk/branding/official/content/icon48.png b/application/basilisk/branding/official/content/icon48.png new file mode 100644 index 0000000000..16e022a647 Binary files /dev/null and b/application/basilisk/branding/official/content/icon48.png differ diff --git a/application/basilisk/branding/official/content/icon64.png b/application/basilisk/branding/official/content/icon64.png new file mode 100644 index 0000000000..9860917e3e Binary files /dev/null and b/application/basilisk/branding/official/content/icon64.png differ diff --git a/application/basilisk/branding/official/content/identity-icons-brand.svg b/application/basilisk/branding/official/content/identity-icons-brand.svg new file mode 100644 index 0000000000..6c33113e56 --- /dev/null +++ b/application/basilisk/branding/official/content/identity-icons-brand.svg @@ -0,0 +1,7 @@ + + + + + diff --git a/application/basilisk/branding/official/content/jar.mn b/application/basilisk/branding/official/content/jar.mn new file mode 100644 index 0000000000..4b8c5fc9d3 --- /dev/null +++ b/application/basilisk/branding/official/content/jar.mn @@ -0,0 +1,18 @@ +# 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 +# file, You can obtain one at http://mozilla.org/MPL/2.0/. + +browser.jar: +% content branding %content/branding/ contentaccessible=yes + content/branding/about.png + content/branding/about-logo.png + content/branding/about-logo@2x.png + content/branding/about-wordmark.png + content/branding/icon48.png + content/branding/icon64.png + content/branding/icon16.png (../default16.png) + content/branding/icon32.png (../default32.png) + content/branding/icon128.png (../mozicon128.png) + content/branding/identity-icons-brand.svg + content/branding/silhouette-40.svg + content/branding/aboutDialog.css diff --git a/application/basilisk/branding/official/content/moz.build b/application/basilisk/branding/official/content/moz.build new file mode 100644 index 0000000000..635fa39c99 --- /dev/null +++ b/application/basilisk/branding/official/content/moz.build @@ -0,0 +1,6 @@ +# -*- Mode: python; indent-tabs-mode: nil; tab-width: 40 -*- +# 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 +# file, You can obtain one at http://mozilla.org/MPL/2.0/. + +JAR_MANIFESTS += ['jar.mn'] \ No newline at end of file diff --git a/application/basilisk/branding/official/content/silhouette-40.svg b/application/basilisk/branding/official/content/silhouette-40.svg new file mode 100644 index 0000000000..aa17cd3093 --- /dev/null +++ b/application/basilisk/branding/official/content/silhouette-40.svg @@ -0,0 +1,1360 @@ + + + + + diff --git a/application/basilisk/branding/official/default16.png b/application/basilisk/branding/official/default16.png new file mode 100644 index 0000000000..67ef39df85 Binary files /dev/null and b/application/basilisk/branding/official/default16.png differ diff --git a/application/basilisk/branding/official/default22.png b/application/basilisk/branding/official/default22.png new file mode 100644 index 0000000000..20b378bbac Binary files /dev/null and b/application/basilisk/branding/official/default22.png differ diff --git a/application/basilisk/branding/official/default24.png b/application/basilisk/branding/official/default24.png new file mode 100644 index 0000000000..dbf121a6ea Binary files /dev/null and b/application/basilisk/branding/official/default24.png differ diff --git a/application/basilisk/branding/official/default256.png b/application/basilisk/branding/official/default256.png new file mode 100644 index 0000000000..b6278c51f3 Binary files /dev/null and b/application/basilisk/branding/official/default256.png differ diff --git a/application/basilisk/branding/official/default32.png b/application/basilisk/branding/official/default32.png new file mode 100644 index 0000000000..2f709e6b2c Binary files /dev/null and b/application/basilisk/branding/official/default32.png differ diff --git a/application/basilisk/branding/official/default48.png b/application/basilisk/branding/official/default48.png new file mode 100644 index 0000000000..02a1e14c16 Binary files /dev/null and b/application/basilisk/branding/official/default48.png differ diff --git a/application/basilisk/branding/official/default64.png b/application/basilisk/branding/official/default64.png new file mode 100644 index 0000000000..5aefe2a3c0 Binary files /dev/null and b/application/basilisk/branding/official/default64.png differ diff --git a/application/basilisk/branding/official/disk.icns b/application/basilisk/branding/official/disk.icns new file mode 100644 index 0000000000..718f1a3d3c Binary files /dev/null and b/application/basilisk/branding/official/disk.icns differ diff --git a/application/basilisk/branding/official/document.icns b/application/basilisk/branding/official/document.icns new file mode 100644 index 0000000000..ff419f2f7b Binary files /dev/null and b/application/basilisk/branding/official/document.icns differ diff --git a/application/basilisk/branding/official/document.ico b/application/basilisk/branding/official/document.ico new file mode 100644 index 0000000000..584a0a1bf0 Binary files /dev/null and b/application/basilisk/branding/official/document.ico differ diff --git a/application/basilisk/branding/official/firefox.icns b/application/basilisk/branding/official/firefox.icns new file mode 100644 index 0000000000..2c613634b6 Binary files /dev/null and b/application/basilisk/branding/official/firefox.icns differ diff --git a/application/basilisk/branding/official/firefox.ico b/application/basilisk/branding/official/firefox.ico new file mode 100644 index 0000000000..0c7acb61b3 Binary files /dev/null and b/application/basilisk/branding/official/firefox.ico differ diff --git a/application/basilisk/branding/official/hydra.VisualElementsManifest.xml b/application/basilisk/branding/official/hydra.VisualElementsManifest.xml new file mode 100644 index 0000000000..d675d573f2 --- /dev/null +++ b/application/basilisk/branding/official/hydra.VisualElementsManifest.xml @@ -0,0 +1,8 @@ + + + diff --git a/application/basilisk/branding/official/hydra.desktop b/application/basilisk/branding/official/hydra.desktop new file mode 100644 index 0000000000..6d38112231 --- /dev/null +++ b/application/basilisk/branding/official/hydra.desktop @@ -0,0 +1,353 @@ +[Desktop Entry] +Name=Hydra +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=hydra %u +Terminal=false +Type=Application +Icon=hydra +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="hydra" + +[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=hydra -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=hydra -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=hydra -private-window diff --git a/application/basilisk/branding/official/locales/browserconfig.properties b/application/basilisk/branding/official/locales/browserconfig.properties new file mode 100644 index 0000000000..06cefece3b --- /dev/null +++ b/application/basilisk/branding/official/locales/browserconfig.properties @@ -0,0 +1,6 @@ +# 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 +# file, You can obtain one at http://mozilla.org/MPL/2.0/. + +# Do NOT localize or otherwise change these values +browser.startup.homepage=about:home diff --git a/application/basilisk/branding/official/locales/en-US/brand.dtd b/application/basilisk/branding/official/locales/en-US/brand.dtd new file mode 100644 index 0000000000..db5bae1a8d --- /dev/null +++ b/application/basilisk/branding/official/locales/en-US/brand.dtd @@ -0,0 +1,10 @@ + + + + + + + + diff --git a/application/basilisk/branding/official/locales/en-US/brand.properties b/application/basilisk/branding/official/locales/en-US/brand.properties new file mode 100644 index 0000000000..1c26c34953 --- /dev/null +++ b/application/basilisk/branding/official/locales/en-US/brand.properties @@ -0,0 +1,17 @@ +# 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 +# file, You can obtain one at http://mozilla.org/MPL/2.0/. + +brandShortName=Eclipse Hydra +# The above controls the name shown in the app +brandShorterName=Hydra +brandFullName=Eclipse Hydra +vendorShortName=Eclipse Community + +homePageSingleStartMain=Internal home page with search. +homePageImport=Import your home page from %S + +homePageMigrationPageTitle=Home Page Selection +homePageMigrationDescription=Please select the home page you wish to use: + +syncBrandShortName=Sync diff --git a/application/basilisk/branding/official/locales/jar.mn b/application/basilisk/branding/official/locales/jar.mn new file mode 100644 index 0000000000..9fdfe578b4 --- /dev/null +++ b/application/basilisk/branding/official/locales/jar.mn @@ -0,0 +1,11 @@ +#filter substitution +# 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 +# file, You can obtain one at http://mozilla.org/MPL/2.0/. + + +@AB_CD@.jar: +% locale branding @AB_CD@ %locale/branding/ + locale/branding/brand.dtd (%brand.dtd) + locale/branding/brand.properties (%brand.properties) + locale/branding/browserconfig.properties diff --git a/application/basilisk/branding/official/locales/moz.build b/application/basilisk/branding/official/locales/moz.build new file mode 100644 index 0000000000..635fa39c99 --- /dev/null +++ b/application/basilisk/branding/official/locales/moz.build @@ -0,0 +1,6 @@ +# -*- Mode: python; indent-tabs-mode: nil; tab-width: 40 -*- +# 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 +# file, You can obtain one at http://mozilla.org/MPL/2.0/. + +JAR_MANIFESTS += ['jar.mn'] \ No newline at end of file diff --git a/application/basilisk/branding/official/moz.build b/application/basilisk/branding/official/moz.build new file mode 100644 index 0000000000..aba83ec3f3 --- /dev/null +++ b/application/basilisk/branding/official/moz.build @@ -0,0 +1,16 @@ +# -*- Mode: python; indent-tabs-mode: nil; tab-width: 40 -*- +# 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 +# file, You can obtain one at http://mozilla.org/MPL/2.0/. + +DIRS += ['content', 'locales'] + +DIST_SUBDIR = 'browser' +export('DIST_SUBDIR') + +include('../shared/branding.mozbuild') +ApplicationBranding() + +FINAL_TARGET_FILES['..'] += [ + 'Hydra.VisualElementsManifest.xml', +] diff --git a/application/basilisk/branding/official/mozicon128.png b/application/basilisk/branding/official/mozicon128.png new file mode 100644 index 0000000000..739b61084b Binary files /dev/null and b/application/basilisk/branding/official/mozicon128.png differ diff --git a/application/basilisk/branding/official/pref/basilisk-branding.js b/application/basilisk/branding/official/pref/basilisk-branding.js new file mode 100644 index 0000000000..9bcd3918b8 --- /dev/null +++ b/application/basilisk/branding/official/pref/basilisk-branding.js @@ -0,0 +1,46 @@ +/* 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 + * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ + +#filter substitution +#filter emptyLines + +// Set defines to construct URLs +#define BRANDING_BASEURL eclipse.cx +#define BRANDING_SITEURL eclipse.cx + +// Shared Branding Preferences +// XXX: These should REALLY go back to application preferences +#include ../../shared/preferences.inc + +// Branding Specific Preferences +pref("startup.homepage_override_url", ""); +pref("startup.homepage_welcome_url", ""); +pref("startup.homepage_welcome_url.additional", ""); +// Version release notes +pref("app.releaseNotesURL", "https://github.com/Eclipse-Community/UXP/releases"); + +// base url for web-based feedback pages +pref("app.feedback.baseURL", "https://board.eclipse.cx/viewtopic.php?t=710"); + +// Vendor home page +pref("app.vendorURL", "https://eclipse.cx"); + +pref("app.update.url", ""); + +// URL user can browse to manually if for some reason all update installation +// attempts fail. +pref("app.update.url.manual", "about:"); +// A default value for the "More information about this update" link +// supplied in the "An update is available" page of the update wizard. +pref("app.update.url.details", "about:"); + +// Provide UA Gecko and Firefox slices for web compatibility +pref("general.useragent.compatMode.firefox",true); +pref("general.useragent.compatMode.gecko",true); + +// Switch Application Updates off for unofficial branding +pref("app.update.enabled", false); + +// Shared User Agent Overrides +#include ../../shared/uaoverrides.inc diff --git a/application/basilisk/branding/official/wizHeader.bmp b/application/basilisk/branding/official/wizHeader.bmp new file mode 100644 index 0000000000..f67b452391 Binary files /dev/null and b/application/basilisk/branding/official/wizHeader.bmp differ diff --git a/application/basilisk/branding/official/wizHeaderRTL.bmp b/application/basilisk/branding/official/wizHeaderRTL.bmp new file mode 100644 index 0000000000..7c57e461ba Binary files /dev/null and b/application/basilisk/branding/official/wizHeaderRTL.bmp differ diff --git a/application/basilisk/branding/official/wizWatermark.bmp b/application/basilisk/branding/official/wizWatermark.bmp new file mode 100644 index 0000000000..05f0e7f9b2 Binary files /dev/null and b/application/basilisk/branding/official/wizWatermark.bmp differ diff --git a/application/basilisk/components/shell/nsWindowsShellService.cpp b/application/basilisk/components/shell/nsWindowsShellService.cpp index 51cbd07670..a45f539321 100644 --- a/application/basilisk/components/shell/nsWindowsShellService.cpp +++ b/application/basilisk/components/shell/nsWindowsShellService.cpp @@ -101,18 +101,18 @@ OpenKeyForReading(HKEY aKeyRoot, const nsAString& aKeyName, HKEY* aKey) // .htm .html .shtml .xht .xhtml // are mapped like so: // -// HKCU\SOFTWARE\Classes\.\ (default) REG_SZ SerpentHTML +// HKCU\SOFTWARE\Classes\.\ (default) REG_SZ HydraHTML // // as aliases to the class: // -// HKCU\SOFTWARE\Classes\SerpentHTML\ +// HKCU\SOFTWARE\Classes\HydraHTML\ // DefaultIcon (default) REG_SZ ,1 // shell\open\command (default) REG_SZ -osint -url "%1" // shell\open\ddeexec (default) REG_SZ // // - Windows Vista and above Protocol Handler // -// HKCU\SOFTWARE\Classes\SerpentURL\ (default) REG_SZ URL +// HKCU\SOFTWARE\Classes\HydraURL\ (default) REG_SZ URL // EditFlags REG_DWORD 2 // FriendlyTypeName REG_SZ URL // DefaultIcon (default) REG_SZ ,1 @@ -157,7 +157,7 @@ typedef struct { } SETTING; // Find a way to unhardcode this -#define APP_REG_NAME L"Serpent" +#define APP_REG_NAME L"Hydra" #define VAL_FILE_ICON "%APPPATH%,1" #define VAL_OPEN "\"%APPPATH%\" -osint -url \"%1\"" #define OLD_VAL_OPEN "\"%APPPATH%\" -requestPending -osint -url \"%1\"" @@ -183,10 +183,10 @@ static SETTING gSettings[] = { // File Handler Class // ***keep this as the first entry because when aForAllTypes is not set below // it will skip over this check.*** - { MAKE_KEY_NAME1("SerpentHTML", SOC), VAL_OPEN, OLD_VAL_OPEN }, + { MAKE_KEY_NAME1("HydraHTML", SOC), VAL_OPEN, OLD_VAL_OPEN }, // Protocol Handler Class - for Vista and above - { MAKE_KEY_NAME1("SerpentURL", SOC), VAL_OPEN, OLD_VAL_OPEN }, + { MAKE_KEY_NAME1("HydraURL", SOC), VAL_OPEN, OLD_VAL_OPEN }, // Protocol Handlers { MAKE_KEY_NAME1("HTTP", DI), VAL_FILE_ICON }, @@ -200,10 +200,10 @@ static SETTING gSettings[] = { // are incorrect they are fixed without notifying the user. static SETTING gDDESettings[] = { // File Handler Class - { MAKE_KEY_NAME1("Software\\Classes\\SerpentHTML", SOD) }, + { MAKE_KEY_NAME1("Software\\Classes\\HydraHTML", SOD) }, // Protocol Handler Class - for Vista and above - { MAKE_KEY_NAME1("Software\\Classes\\SerpentURL", SOD) }, + { MAKE_KEY_NAME1("Software\\Classes\\HydraURL", SOD) }, // Protocol Handlers { MAKE_KEY_NAME1("Software\\Classes\\FTP", SOD) }, @@ -340,7 +340,7 @@ IsAARDefault(const RefPtr& pAAR, return false; } - LPCWSTR progID = isProtocol ? L"SerpentURL" : L"SerpentHTML"; + LPCWSTR progID = isProtocol ? L"HydraURL" : L"HydraHTML"; bool isDefault = !wcsicmp(registeredApp, progID); CoTaskMemFree(registeredApp); @@ -397,8 +397,8 @@ nsWindowsShellService::CancelPortableMode() /* * Query's the AAR for the default status. - * This only checks for SerpentURL and if aCheckAllTypes is set, then - * it also checks for SerpentHTML. Note that those ProgIDs are shared + * This only checks for HydraURL and if aCheckAllTypes is set, then + * it also checks for HydraHTML. Note that those ProgIDs are shared * by all Basilisk browsers. */ bool diff --git a/application/basilisk/confvars.sh b/application/basilisk/confvars.sh index 34490a1c44..cfea077323 100644 --- a/application/basilisk/confvars.sh +++ b/application/basilisk/confvars.sh @@ -3,8 +3,8 @@ # 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/. -MOZ_APP_BASENAME=Serpent -MOZ_APP_VENDOR=OpenSourceContributors +MOZ_APP_BASENAME=Hydra +MOZ_APP_VENDOR=Eclipse Community MOZ_PHOENIX=1 MOZ_AUSTRALIS=1 MC_BASILISK=1 diff --git a/application/basilisk/installer/windows/app.tag b/application/basilisk/installer/windows/app.tag index 4118850173..b071d84e45 100644 --- a/application/basilisk/installer/windows/app.tag +++ b/application/basilisk/installer/windows/app.tag @@ -1,4 +1,4 @@ ;!@Install@!UTF-8! -Title="Serpent" +Title="Hydra" RunProgram="setup.exe" ;!@InstallEnd@! \ No newline at end of file diff --git a/application/basilisk/installer/windows/nsis/installer.nsi b/application/basilisk/installer/windows/nsis/installer.nsi index 62dde9d716..c275cddddb 100644 --- a/application/basilisk/installer/windows/nsis/installer.nsi +++ b/application/basilisk/installer/windows/nsis/installer.nsi @@ -379,17 +379,17 @@ Section "-Application" APP_IDX ; it doesn't cause problems always add them. ${SetUninstallKeys} - ; On install always add the SerpentHTML and SerpentURL keys. - ; An empty string is used for the 5th param because SerpentHTML is not a + ; On install always add the HydraHTML and HydraURL keys. + ; An empty string is used for the 5th param because HydraHTML is not a ; protocol handler. ${GetLongPath} "$INSTDIR\${FileMainEXE}" $8 StrCpy $2 "$\"$8$\" -osint -url $\"%1$\"" - ; In Win8, the delegate execute handler picks up the value in SerpentURL and - ; SerpentHTML to launch the desktop browser when it needs to. - ${AddDisabledDDEHandlerValues} "SerpentHTML" "$2" "$8,1" \ + ; In Win8, the delegate execute handler picks up the value in HydraURL and + ; HydraHTML to launch the desktop browser when it needs to. + ${AddDisabledDDEHandlerValues} "HydraHTML" "$2" "$8,1" \ "${AppRegName} Document" "" - ${AddDisabledDDEHandlerValues} "SerpentURL" "$2" "$8,1" "${AppRegName} URL" \ + ${AddDisabledDDEHandlerValues} "HydraURL" "$2" "$8,1" "${AppRegName} URL" \ "true" ; For pre win8, the following keys should only be set if we can write to HKLM. diff --git a/application/basilisk/installer/windows/nsis/shared.nsh b/application/basilisk/installer/windows/nsis/shared.nsh index d099376b23..460d46ec5d 100644 --- a/application/basilisk/installer/windows/nsis/shared.nsh +++ b/application/basilisk/installer/windows/nsis/shared.nsh @@ -13,9 +13,9 @@ ; start menu tile. In case there are 2 Basilisk installations, we only do ; this if the application being updated is the default. ReadRegStr $0 HKCU "Software\Microsoft\Windows\Shell\Associations\UrlAssociations\http\UserChoice" "ProgId" - ${If} $0 == "SerpentURL" + ${If} $0 == "HydraURL" ${AndIf} $9 != 0 ; We're not running in session 0 - ReadRegStr $0 HKCU "Software\Classes\SerpentURL\shell\open\command" "" + ReadRegStr $0 HKCU "Software\Classes\HydraURL\shell\open\command" "" ${GetPathFromString} "$0" $0 ${GetParent} "$0" $0 ${If} ${FileExists} "$0" @@ -282,9 +282,9 @@ ClearErrors EnumRegKey $7 HKCR "${FILE_TYPE}" 0 ${If} ${Errors} - WriteRegStr SHCTX "SOFTWARE\Classes\${FILE_TYPE}" "" "SerpentHTML" + WriteRegStr SHCTX "SOFTWARE\Classes\${FILE_TYPE}" "" "HydraHTML" ${EndIf} - WriteRegStr SHCTX "SOFTWARE\Classes\${FILE_TYPE}\OpenWithProgids" "SerpentHTML" "" + WriteRegStr SHCTX "SOFTWARE\Classes\${FILE_TYPE}\OpenWithProgids" "HydraHTML" "" !macroend !define AddAssociationIfNoneExist "!insertmacro AddAssociationIfNoneExist" @@ -296,30 +296,30 @@ StrCpy $0 "SOFTWARE\Classes" StrCpy $2 "$\"$8$\" -osint -url $\"%1$\"" - ; Associate the file handlers with SerpentHTML + ; Associate the file handlers with HydraHTML ReadRegStr $6 SHCTX "$0\.htm" "" - ${If} "$6" != "SerpentHTML" - WriteRegStr SHCTX "$0\.htm" "" "SerpentHTML" + ${If} "$6" != "HydraHTML" + WriteRegStr SHCTX "$0\.htm" "" "HydraHTML" ${EndIf} ReadRegStr $6 SHCTX "$0\.html" "" - ${If} "$6" != "SerpentHTML" - WriteRegStr SHCTX "$0\.html" "" "SerpentHTML" + ${If} "$6" != "HydraHTML" + WriteRegStr SHCTX "$0\.html" "" "HydraHTML" ${EndIf} ReadRegStr $6 SHCTX "$0\.shtml" "" - ${If} "$6" != "SerpentHTML" - WriteRegStr SHCTX "$0\.shtml" "" "SerpentHTML" + ${If} "$6" != "HydraHTML" + WriteRegStr SHCTX "$0\.shtml" "" "HydraHTML" ${EndIf} ReadRegStr $6 SHCTX "$0\.xht" "" - ${If} "$6" != "SerpentHTML" - WriteRegStr SHCTX "$0\.xht" "" "SerpentHTML" + ${If} "$6" != "HydraHTML" + WriteRegStr SHCTX "$0\.xht" "" "HydraHTML" ${EndIf} ReadRegStr $6 SHCTX "$0\.xhtml" "" - ${If} "$6" != "SerpentHTML" - WriteRegStr SHCTX "$0\.xhtml" "" "SerpentHTML" + ${If} "$6" != "HydraHTML" + WriteRegStr SHCTX "$0\.xhtml" "" "HydraHTML" ${EndIf} ${AddAssociationIfNoneExist} ".pdf" @@ -329,12 +329,12 @@ ${AddAssociationIfNoneExist} ".pdf" ${AddAssociationIfNoneExist} ".webm" - ; An empty string is used for the 5th param because SerpentHTML is not a + ; An empty string is used for the 5th param because HydraHTML is not a ; protocol handler - ${AddDisabledDDEHandlerValues} "SerpentHTML" "$2" "$8,1" \ + ${AddDisabledDDEHandlerValues} "HydraHTML" "$2" "$8,1" \ "${AppRegName} HTML Document" "" - ${AddDisabledDDEHandlerValues} "SerpentURL" "$2" "$8,1" "${AppRegName} URL" \ + ${AddDisabledDDEHandlerValues} "HydraURL" "$2" "$8,1" "${AppRegName} URL" \ "true" ; An empty string is used for the 4th & 5th params because the following ; 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" "ApplicationName" "${BrandShortName}" - WriteRegStr ${RegKey} "$0\Capabilities\FileAssociations" ".htm" "SerpentHTML" - WriteRegStr ${RegKey} "$0\Capabilities\FileAssociations" ".html" "SerpentHTML" - WriteRegStr ${RegKey} "$0\Capabilities\FileAssociations" ".shtml" "SerpentHTML" - WriteRegStr ${RegKey} "$0\Capabilities\FileAssociations" ".xht" "SerpentHTML" - WriteRegStr ${RegKey} "$0\Capabilities\FileAssociations" ".xhtml" "SerpentHTML" + WriteRegStr ${RegKey} "$0\Capabilities\FileAssociations" ".htm" "HydraHTML" + WriteRegStr ${RegKey} "$0\Capabilities\FileAssociations" ".html" "HydraHTML" + WriteRegStr ${RegKey} "$0\Capabilities\FileAssociations" ".shtml" "HydraHTML" + WriteRegStr ${RegKey} "$0\Capabilities\FileAssociations" ".xht" "HydraHTML" + WriteRegStr ${RegKey} "$0\Capabilities\FileAssociations" ".xhtml" "HydraHTML" WriteRegStr ${RegKey} "$0\Capabilities\StartMenu" "StartMenuInternet" "$R9" - WriteRegStr ${RegKey} "$0\Capabilities\URLAssociations" "ftp" "SerpentURL" - WriteRegStr ${RegKey} "$0\Capabilities\URLAssociations" "http" "SerpentURL" - WriteRegStr ${RegKey} "$0\Capabilities\URLAssociations" "https" "SerpentURL" + WriteRegStr ${RegKey} "$0\Capabilities\URLAssociations" "ftp" "HydraURL" + WriteRegStr ${RegKey} "$0\Capabilities\URLAssociations" "http" "HydraURL" + WriteRegStr ${RegKey} "$0\Capabilities\URLAssociations" "https" "HydraURL" ; Vista Registered Application WriteRegStr ${RegKey} "Software\RegisteredApplications" "${AppRegName}" "$0\Capabilities" !macroend !define SetStartMenuInternet "!insertmacro SetStartMenuInternet" -; The IconHandler reference for SerpentHTML can end up in an inconsistent state +; The IconHandler reference for HydraHTML can end up in an inconsistent state ; 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 ; icon being displayed for files associated with Basilisk (does not use SHCTX). !macro FixShellIconHandler RegKey ClearErrors - ReadRegStr $1 ${RegKey} "Software\Classes\SerpentHTML\ShellEx\IconHandler" "" + ReadRegStr $1 ${RegKey} "Software\Classes\HydraHTML\ShellEx\IconHandler" "" ${Unless} ${Errors} - ReadRegStr $1 ${RegKey} "Software\Classes\SerpentHTML\DefaultIcon" "" + ReadRegStr $1 ${RegKey} "Software\Classes\HydraHTML\DefaultIcon" "" ${GetLongPath} "$INSTDIR\${FileMainEXE}" $2 ${If} "$1" != "$2,1" - WriteRegStr ${RegKey} "Software\Classes\SerpentHTML\DefaultIcon" "" "$2,1" + WriteRegStr ${RegKey} "Software\Classes\HydraHTML\DefaultIcon" "" "$2,1" ${EndIf} ${EndUnless} !macroend @@ -567,7 +567,7 @@ ; 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 ; cleans affected installations by removing the HKLM and HKCU value if it is set -; to SerpentHTML when there is a value for PersistentHandler or by removing the +; to HydraHTML 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. !macro FixBadFileAssociation FILE_TYPE ; 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 $2 HKCR "${FILE_TYPE}\PersistentHandler" "" ${If} "$2" != "" - ; Since there is a persistent handler remove SerpentHTML as the default - ; value from both HKCU and HKLM if it set to SerpentHTML. - ${If} "$0" == "SerpentHTML" + ; Since there is a persistent handler remove HydraHTML as the default + ; value from both HKCU and HKLM if it set to HydraHTML. + ${If} "$0" == "HydraHTML" DeleteRegValue HKCU "Software\Classes\${FILE_TYPE}" "" ${EndIf} - ${If} "$1" == "SerpentHTML" + ${If} "$1" == "HydraHTML" DeleteRegValue HKLM "Software\Classes\${FILE_TYPE}" "" ${EndIf} - ${ElseIf} "$0" == "SerpentHTML" - ; Since KHCU is set to SerpentHTML remove SerpentHTML as the default value + ${ElseIf} "$0" == "HydraHTML" + ; Since KHCU is set to HydraHTML remove HydraHTML as the default value ; from HKCU if HKLM is set to a value other than an empty string. ${If} "$1" != "" DeleteRegValue HKCU "Software\Classes\${FILE_TYPE}" "" @@ -641,17 +641,17 @@ ; Only set the file and protocol handlers if the existing one under HKCR is ; for this install location. - ${IsHandlerForInstallDir} "SerpentHTML" $R9 + ${IsHandlerForInstallDir} "HydraHTML" $R9 ${If} "$R9" == "true" - ; An empty string is used for the 5th param because SerpentHTML is not a + ; An empty string is used for the 5th param because HydraHTML is not a ; protocol handler. - ${AddDisabledDDEHandlerValues} "SerpentHTML" "$2" "$8,1" \ + ${AddDisabledDDEHandlerValues} "HydraHTML" "$2" "$8,1" \ "${AppRegName} HTML Document" "" ${EndIf} - ${IsHandlerForInstallDir} "SerpentURL" $R9 + ${IsHandlerForInstallDir} "HydraURL" $R9 ${If} "$R9" == "true" - ${AddDisabledDDEHandlerValues} "SerpentURL" "$2" "$8,1" \ + ${AddDisabledDDEHandlerValues} "HydraURL" "$2" "$8,1" \ "${AppRegName} URL" "true" ${EndIf} @@ -699,10 +699,10 @@ DeleteRegValue HKLM "$0\Capabilities\URLAssociations" "gopher" ${EndUnless} - ; Delete gopher from the user's UrlAssociations if it points to SerpentURL. + ; Delete gopher from the user's UrlAssociations if it points to HydraURL. StrCpy $0 "Software\Microsoft\Windows\Shell\Associations\UrlAssociations\gopher" ReadRegStr $2 HKCU "$0\UserChoice" "Progid" - ${If} "$2" == "SerpentURL" + ${If} "$2" == "HydraURL" DeleteRegKey HKCU "$0" ${EndIf} !macroend diff --git a/application/basilisk/installer/windows/nsis/uninstaller.nsi b/application/basilisk/installer/windows/nsis/uninstaller.nsi index 9d95ac16b0..0ed6958e27 100644 --- a/application/basilisk/installer/windows/nsis/uninstaller.nsi +++ b/application/basilisk/installer/windows/nsis/uninstaller.nsi @@ -227,27 +227,27 @@ Section "Uninstall" ${un.SetAppLSPCategories} ${EndIf} - ${un.RegCleanAppHandler} "SerpentURL" - ${un.RegCleanAppHandler} "SerpentHTML" + ${un.RegCleanAppHandler} "HydraURL" + ${un.RegCleanAppHandler} "HydraHTML" ${un.RegCleanProtocolHandler} "ftp" ${un.RegCleanProtocolHandler} "http" ${un.RegCleanProtocolHandler} "https" ClearErrors - ReadRegStr $R9 HKCR "SerpentHTML" "" - ; Don't clean up the file handlers if the SerpentHTML key still exists since + ReadRegStr $R9 HKCR "HydraHTML" "" + ; Don't clean up the file handlers if the HydraHTML key still exists since ; there should be a second installation that may be the default file handler ${If} ${Errors} - ${un.RegCleanFileHandler} ".htm" "SerpentHTML" - ${un.RegCleanFileHandler} ".html" "SerpentHTML" - ${un.RegCleanFileHandler} ".shtml" "SerpentHTML" - ${un.RegCleanFileHandler} ".xht" "SerpentHTML" - ${un.RegCleanFileHandler} ".xhtml" "SerpentHTML" - ${un.RegCleanFileHandler} ".oga" "SerpentHTML" - ${un.RegCleanFileHandler} ".ogg" "SerpentHTML" - ${un.RegCleanFileHandler} ".ogv" "SerpentHTML" - ${un.RegCleanFileHandler} ".pdf" "SerpentHTML" - ${un.RegCleanFileHandler} ".webm" "SerpentHTML" + ${un.RegCleanFileHandler} ".htm" "HydraHTML" + ${un.RegCleanFileHandler} ".html" "HydraHTML" + ${un.RegCleanFileHandler} ".shtml" "HydraHTML" + ${un.RegCleanFileHandler} ".xht" "HydraHTML" + ${un.RegCleanFileHandler} ".xhtml" "HydraHTML" + ${un.RegCleanFileHandler} ".oga" "HydraHTML" + ${un.RegCleanFileHandler} ".ogg" "HydraHTML" + ${un.RegCleanFileHandler} ".ogv" "HydraHTML" + ${un.RegCleanFileHandler} ".pdf" "HydraHTML" + ${un.RegCleanFileHandler} ".webm" "HydraHTML" ${EndIf} SetShellVarContext all ; Set SHCTX to HKLM diff --git a/application/basilisk/locales/en-US/chrome/overrides/appstrings.properties b/application/basilisk/locales/en-US/chrome/overrides/appstrings.properties index 34342fcb71..610ab4f2d1 100644 --- a/application/basilisk/locales/en-US/chrome/overrides/appstrings.properties +++ b/application/basilisk/locales/en-US/chrome/overrides/appstrings.properties @@ -3,25 +3,25 @@ # file, You can obtain one at http://mozilla.org/MPL/2.0/. malformedURI=The URL is not valid and cannot be loaded. -fileNotFound=Serpent can’t find the file at %S. +fileNotFound=Hydra can’t find the file at %S. fileAccessDenied=The file at %S is not readable. -dnsNotFound=Serpent can’t find the server at %S. -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. +dnsNotFound=Hydra can’t find the server at %S. +unknownProtocolFound=Hydra 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=Hydra can’t establish a connection to the server at %S. netInterrupt=The connection to %S was interrupted while the page was loading. netTimeout=The server at %S is taking too long to respond. -redirectLoop=Serpent has detected that the server is redirecting the request for this address in a way that will never complete. +redirectLoop=Hydra 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" 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 -unknownSocketType=Serpent doesn’t know how to communicate with the server. +unknownSocketType=Hydra doesn’t know how to communicate with the server. netReset=The connection to the server was reset while the page was loading. notCached=This document is no longer available. -netOffline=Serpent is currently in offline mode and can’t browse the Web. +netOffline=Hydra is currently in offline mode and can’t browse the Web. 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. Serpent has canceled the request for your protection. -proxyResolveFailure=Serpent is configured to use a proxy server that can’t be found. -proxyConnectFailure=Serpent is configured to use a proxy server that is refusing connections. +deniedPortAccess=This address uses a network port which is normally used for purposes other than Web browsing. Hydra has canceled the request for your protection. +proxyResolveFailure=Hydra is configured to use a proxy server that can’t be found. +proxyConnectFailure=Hydra 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. 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 @@ -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. 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. -remoteXUL=This page uses an unsupported technology that is no longer available by default in Serpent. +remoteXUL=This page uses an unsupported technology that is no longer available by default in Hydra. ## LOCALIZATION NOTE (sslv3Used) - Do not translate "%S". -sslv3Used=Serpent cannot guarantee the safety of your data on %S because it uses SSLv3, a broken security protocol. +sslv3Used=Hydra cannot guarantee the safety of your data on %S because it uses SSLv3, a broken security protocol. ## LOCALIZATION NOTE (weakCryptoUsed) - Do not translate "%S". -weakCryptoUsed=The owner of %S has configured their website improperly. To protect your information from being stolen, Serpent has not connected to this website. +weakCryptoUsed=The owner of %S has configured their website improperly. To protect your information from being stolen, Hydra has not connected to this website. inadequateSecurityError=The website tried to negotiate an inadequate level of security. diff --git a/application/basilisk/locales/generic/profile/bookmarks.html.in b/application/basilisk/locales/generic/profile/bookmarks.html.in index 726cbeaf3c..14f27444cf 100644 --- a/application/basilisk/locales/generic/profile/bookmarks.html.in +++ b/application/basilisk/locales/generic/profile/bookmarks.html.in @@ -1,4 +1,8 @@ #filter substitution + +#define eclipse_icon data:image/png;base64,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 + +#define github_icon data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAACXBIWXMAAAsTAAALEwEAmpwYAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8YQUAAAHdSURBVHgBvVeLbYNADDVdoHSDG4ENwgjpBMkG6QbtBkknIBtEnaDdADoBbEA6gWuXQ3GR7wOc8qSnSPhvkzuTQSQQMaefLXFDLIiGmFvxldgRG+IX8SPLsiukAAU2xDOxx3mo2BaWgismHnE9jrZ7s6tuMR1ajO0GKRaYNrhMorh35VoSBjwzbxWDCy5Lil/ailgrPnMtAe2F2wn5Hm+J9Nbxp2AvZNKuVPwetdZrKJQuGfCPMI/0baTSOai0EJ4EKlmVC3tYCdRHwOBR5Q8wHK8aOhiO1bVorK8phqPd0/4dJIKnCxULa4dw3vEZTkK7S2oegVH0u2S3mfCpPDOcQNJKPdAK+nsJ7wW10Ixn4xA+pRwDD1x5fOUOdA6bDaQLXjpEHSfw7RC+QDrsHc+b8ZJxYXUS5OPg8b8bj2LfvvcKCxEIzshHRXkavhG3+H8HaK2zMiJoYXXrQPBKGplJsK3tjObk4gl+wXiYqfFJCHublLailZ4EysjgJ814upKdRHc4uYp4gPAIQmjRdc8oFRcwExHBjdTPFAcclOc8Kp5huNN/iI90Or5DIAGHqCM+k30DEVU41/MI26jKo4DDX3JtAidcs1vg7eM0NoEeb98EBlIBAyu50DNzKv4F8Mg9kvfoSM0AAAAASUVORK5CYII= #include @BOOKMARKS_INCLUDE_DIR@/bookmarks.inc #define ja_jp_mac ja-JP-mac #if AB_CD == ja_jp_mac @@ -17,6 +21,9 @@

@bookmarks_toolbarfolder@

@bookmarks_toolbarfolder_description@

-

Your website here (application/basilisk/locales/generic/profile/bookmarks.html.in)
+
Eclipse Main Site
+
Eclipse Community
+
Report Issues
+
Get New Releases

diff --git a/application/palemoon/app/lun3r.exe.manifest b/application/palemoon/app/lun3r.exe.manifest new file mode 100644 index 0000000000..b5181d1965 --- /dev/null +++ b/application/palemoon/app/lun3r.exe.manifest @@ -0,0 +1,49 @@ + + + +Eclipse Lun3r + + + + + + + + + + + + + + + True/PM + PerMonitorV2,PerMonitor + + + + + + + + + + + + + + + + + diff --git a/application/palemoon/base/content/aboutDialog.xul b/application/palemoon/base/content/aboutDialog.xul index ceeef5dae4..499cbaceec 100644 --- a/application/palemoon/base/content/aboutDialog.xul +++ b/application/palemoon/base/content/aboutDialog.xul @@ -31,9 +31,9 @@ #ifdef HAVE_64BIT_BUILD -#expand +#expand #else -#expand +#expand #endif diff --git a/application/palemoon/base/content/browser-title.css b/application/palemoon/base/content/browser-title.css index 1061aceb54..e3bd8b311f 100644 --- a/application/palemoon/base/content/browser-title.css +++ b/application/palemoon/base/content/browser-title.css @@ -35,14 +35,28 @@ } -#main-window::after { - padding: 0 132px; /* AppMenu button/wincontrols width offset */ - left: 0; - right: 0; +@supports not -moz-bool-pref("browser.lun3r.brand") { + #main-window::after { + padding: 0 132px; /* AppMenu button/wincontrols width offset */ + left: 0; + right: 0; + } + + #main-window[privatebrowsingmode=temporary]::after { + padding: 0px 132px 0px 152px; /* AppMenu button width offset for PB mode */ + } } -#main-window[privatebrowsingmode=temporary]::after { - padding: 0px 132px 0px 152px; /* AppMenu button width offset for PB mode */ +@supports -moz-bool-pref("browser.lun3r.brand") { + #main-window::after { + padding: 0 148px; /* AppMenu button/wincontrols width offset */ + left: 0; + right: 0; + } + + #main-window[privatebrowsingmode=temporary]::after { + padding: 0px 132px 0px 168px; /* AppMenu button width offset for PB mode */ + } } #main-window[sizemode="normal"]::after { diff --git a/application/palemoon/base/moz.build b/application/palemoon/base/moz.build index c1470f25c9..d7a7ddf5e0 100644 --- a/application/palemoon/base/moz.build +++ b/application/palemoon/base/moz.build @@ -4,6 +4,7 @@ # file, You can obtain one at http://mozilla.org/MPL/2.0/. DEFINES['MOZ_APP_VERSION'] = CONFIG['MOZ_APP_VERSION'] +DEFINES['MOZ_APP_VERSION_DISPLAY'] = CONFIG['MOZ_APP_VERSION_DISPLAY'] DEFINES['APP_LICENSE_BLOCK'] = '%s/content/overrides/app-license.html' % SRCDIR if CONFIG['MOZ_WIDGET_TOOLKIT'] in ('windows', 'gtk2', 'gtk3'): diff --git a/application/palemoon/branding/official/VisualElements_150.png b/application/palemoon/branding/official/VisualElements_150.png new file mode 100644 index 0000000000..a6cd4ac738 Binary files /dev/null and b/application/palemoon/branding/official/VisualElements_150.png differ diff --git a/application/palemoon/branding/official/VisualElements_70.png b/application/palemoon/branding/official/VisualElements_70.png new file mode 100644 index 0000000000..ad729ec492 Binary files /dev/null and b/application/palemoon/branding/official/VisualElements_70.png differ diff --git a/application/palemoon/branding/official/appname.bmp b/application/palemoon/branding/official/appname.bmp new file mode 100644 index 0000000000..e12534acab Binary files /dev/null and b/application/palemoon/branding/official/appname.bmp differ diff --git a/application/palemoon/branding/official/branding.nsi b/application/palemoon/branding/official/branding.nsi new file mode 100644 index 0000000000..80466997d9 --- /dev/null +++ b/application/palemoon/branding/official/branding.nsi @@ -0,0 +1,10 @@ +# NSIS branding defines for official release builds. + +# BrandFullNameInternal is used for some registry and file system values +# instead of BrandFullName and typically should not be modified. +!define BrandFullNameInternal "Eclipse Lun3r" +!define CompanyName "Eclipse Community" +!define URLInfoAbout "https://eclipse.cx" +!define URLUpdateInfo "https://github.com/Eclipse-Community/UXP/releases" +!define HelpLink "https://board.eclipse.cx/viewtopic.php?t=710" +!define URLSystemRequirements "https://github.com/Eclipse-Community/UXP" diff --git a/application/palemoon/branding/official/configure.sh b/application/palemoon/branding/official/configure.sh new file mode 100644 index 0000000000..30571c3147 --- /dev/null +++ b/application/palemoon/branding/official/configure.sh @@ -0,0 +1,25 @@ +# 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 +# file, You can obtain one at http://mozilla.org/MPL/2.0/. + +MOZ_APP_NAME=lun3r + +MOZ_APP_BASENAME="Lun3r" + +MOZ_APP_DISPLAYNAME="Lun3r" + +MOZ_APP_UA_NAME="Lun3r" + +MOZ_APP_VENDOR="Eclipse Community" + +MOZ_APP_FULLNAME="Eclipse Lun3r" + +MOZ_APP_PROFILE="Eclipse Community/Lun3r" + +MOZ_APP_REMOTINGNAME=com.eclipse.lun3r + +MOZ_DISTRIBUTION_ID=com.eclipse + +MOZ_MACBUNDLE_NAME="lun3r.app" + +MOZ_SOURCE_REPO=https://github.com/Eclipse-Community/UXP \ No newline at end of file diff --git a/application/palemoon/branding/official/content/PM-halloween23.jpg b/application/palemoon/branding/official/content/PM-halloween23.jpg new file mode 100644 index 0000000000..a46981c3bd Binary files /dev/null and b/application/palemoon/branding/official/content/PM-halloween23.jpg differ diff --git a/application/palemoon/branding/official/content/about-background.jpg b/application/palemoon/branding/official/content/about-background.jpg new file mode 100644 index 0000000000..71b71db191 Binary files /dev/null and b/application/palemoon/branding/official/content/about-background.jpg differ diff --git a/application/palemoon/branding/official/content/about-background.png b/application/palemoon/branding/official/content/about-background.png new file mode 100644 index 0000000000..0276cb8b40 Binary files /dev/null and b/application/palemoon/branding/official/content/about-background.png differ diff --git a/application/palemoon/branding/official/content/about-background1.png b/application/palemoon/branding/official/content/about-background1.png new file mode 100644 index 0000000000..c034041f61 Binary files /dev/null and b/application/palemoon/branding/official/content/about-background1.png differ diff --git a/application/palemoon/branding/official/content/about-backgroundwoops8bit.png b/application/palemoon/branding/official/content/about-backgroundwoops8bit.png new file mode 100644 index 0000000000..faa2f5342e Binary files /dev/null and b/application/palemoon/branding/official/content/about-backgroundwoops8bit.png differ diff --git a/application/palemoon/branding/official/content/about-logo.png b/application/palemoon/branding/official/content/about-logo.png new file mode 100644 index 0000000000..b38a1d6181 Binary files /dev/null and b/application/palemoon/branding/official/content/about-logo.png differ diff --git a/application/palemoon/branding/official/content/about-logo@2x.png b/application/palemoon/branding/official/content/about-logo@2x.png new file mode 100644 index 0000000000..6e0a1274d9 Binary files /dev/null and b/application/palemoon/branding/official/content/about-logo@2x.png differ diff --git a/application/palemoon/branding/official/content/about-wordmark.png b/application/palemoon/branding/official/content/about-wordmark.png new file mode 100644 index 0000000000..08da81decc Binary files /dev/null and b/application/palemoon/branding/official/content/about-wordmark.png differ diff --git a/application/palemoon/branding/official/content/about-wordmark.svg b/application/palemoon/branding/official/content/about-wordmark.svg new file mode 100644 index 0000000000..effcb036ec Binary files /dev/null and b/application/palemoon/branding/official/content/about-wordmark.svg differ diff --git a/application/palemoon/branding/official/content/about.png b/application/palemoon/branding/official/content/about.png new file mode 100644 index 0000000000..809f6979f7 Binary files /dev/null and b/application/palemoon/branding/official/content/about.png differ diff --git a/application/palemoon/branding/official/content/aboutDialog.css b/application/palemoon/branding/official/content/aboutDialog.css new file mode 100644 index 0000000000..01fb14da29 --- /dev/null +++ b/application/palemoon/branding/official/content/aboutDialog.css @@ -0,0 +1,88 @@ +/* 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 + * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ + +#aboutPMDialogContainer { + width: 620px !important; + height: 308px !important; + position: relative; + background-image: url("chrome://branding/content/about-background.jpg"); + background-repeat: no-repeat; + background-color: #44125A; + color: #eee; +} + +#aboutHeaderBox { + position: relative; + background-image: url("chrome://branding/content/about-wordmark.png"); + background-repeat: no-repeat; + background-position: center center; + height: 44px; +} + +#aboutVersionBox { + position: relative; + text-shadow: 1px 1px 0px #7777; +} + +#aboutTextBox { + position: relative; + animation: 1s fadeIn; + animation-fill-mode: forwards; + text-shadow: 1px 1px 0px #7777; + color: #eee; + background-color: rgba(23, 21, 28, .6); +} + +.text-link { + color: #b967e5; +} + +@keyframes fadeIn { + 0% { + opacity: 0; + } + 50% { + opacity: 0; + } + 100% { + opacity: 1; + } +} + +#aboutLinkBox { + position: relative; + padding: 15px 10px 0; +} + +#aboutPMtrademark { + position: relative; + font-size: 10px; + text-align: center; + color: #ccc; + text-shadow: 1px 1px 0px #7777; + margin-top: 10px; + margin-bottom: 10px; +} + +.bottom-link, +.bottom-link:focus { + color: #eee; + background-color: rgba(23, 21, 28, .7); +} + +.bottom-link:hover { + background-color: rgba(23, 21, 28, .95); +} + +#aboutPMDialogContainer::before { + opacity: 0; + animation-fill-mode: forwards; + content: ""; + position: absolute; + top: 0; left: 0; + width: 100%; height: 100%; + background-image: url("chrome://branding/content/PM-halloween23.jpg"); + background-repeat: no-repeat; + background-size: cover; +} diff --git a/application/palemoon/branding/official/content/icon48.png b/application/palemoon/branding/official/content/icon48.png new file mode 100644 index 0000000000..fffe52aa34 Binary files /dev/null and b/application/palemoon/branding/official/content/icon48.png differ diff --git a/application/palemoon/branding/official/content/icon64.png b/application/palemoon/branding/official/content/icon64.png new file mode 100644 index 0000000000..2051cba5e3 Binary files /dev/null and b/application/palemoon/branding/official/content/icon64.png differ diff --git a/application/palemoon/branding/official/content/jar.mn b/application/palemoon/branding/official/content/jar.mn new file mode 100644 index 0000000000..0760539aa8 --- /dev/null +++ b/application/palemoon/branding/official/content/jar.mn @@ -0,0 +1,13 @@ +browser.jar: +% content branding %content/branding/ contentaccessible=yes + content/branding/about.png (about.png) + content/branding/about-background.jpg (about-background.jpg) + content/branding/about-logo.png (about-logo.png) + content/branding/about-logo@2x.png (about-logo@2x.png) + content/branding/about-wordmark.png (about-wordmark.png) + content/branding/icon48.png (icon48.png) + content/branding/icon64.png (icon64.png) + content/branding/icon16.png (../default16.png) + content/branding/icon32.png (../default32.png) + content/branding/aboutDialog.css (aboutDialog.css) + content/branding/PM-halloween23.jpg (PM-halloween23.jpg) diff --git a/application/palemoon/branding/official/content/moz.build b/application/palemoon/branding/official/content/moz.build new file mode 100644 index 0000000000..c07ede3757 --- /dev/null +++ b/application/palemoon/branding/official/content/moz.build @@ -0,0 +1,3 @@ +# -*- Mode: python; c-basic-offset: 4; indent-tabs-mode: nil; tab-width: 40 -*- + +JAR_MANIFESTS += ['jar.mn'] diff --git a/application/palemoon/branding/official/default16.png b/application/palemoon/branding/official/default16.png new file mode 100644 index 0000000000..369e3f076e Binary files /dev/null and b/application/palemoon/branding/official/default16.png differ diff --git a/application/palemoon/branding/official/default22.png b/application/palemoon/branding/official/default22.png new file mode 100644 index 0000000000..b03c18591b Binary files /dev/null and b/application/palemoon/branding/official/default22.png differ diff --git a/application/palemoon/branding/official/default24.png b/application/palemoon/branding/official/default24.png new file mode 100644 index 0000000000..44da129ecf Binary files /dev/null and b/application/palemoon/branding/official/default24.png differ diff --git a/application/palemoon/branding/official/default256.png b/application/palemoon/branding/official/default256.png new file mode 100644 index 0000000000..11224011f3 Binary files /dev/null and b/application/palemoon/branding/official/default256.png differ diff --git a/application/palemoon/branding/official/default32.png b/application/palemoon/branding/official/default32.png new file mode 100644 index 0000000000..d16f3be095 Binary files /dev/null and b/application/palemoon/branding/official/default32.png differ diff --git a/application/palemoon/branding/official/default48.png b/application/palemoon/branding/official/default48.png new file mode 100644 index 0000000000..af36800ea1 Binary files /dev/null and b/application/palemoon/branding/official/default48.png differ diff --git a/application/palemoon/branding/official/disk.icns b/application/palemoon/branding/official/disk.icns new file mode 100644 index 0000000000..ca9a9313ae Binary files /dev/null and b/application/palemoon/branding/official/disk.icns differ diff --git a/application/palemoon/branding/official/document.icns b/application/palemoon/branding/official/document.icns new file mode 100644 index 0000000000..6733b9ff3e Binary files /dev/null and b/application/palemoon/branding/official/document.icns differ diff --git a/application/palemoon/branding/official/document.ico b/application/palemoon/branding/official/document.ico new file mode 100644 index 0000000000..50eb71cc4a Binary files /dev/null and b/application/palemoon/branding/official/document.ico differ diff --git a/application/palemoon/branding/official/dsstore b/application/palemoon/branding/official/dsstore new file mode 100644 index 0000000000..8ea7036745 Binary files /dev/null and b/application/palemoon/branding/official/dsstore differ diff --git a/application/palemoon/branding/official/firefox.icns b/application/palemoon/branding/official/firefox.icns new file mode 100644 index 0000000000..d5798228b9 Binary files /dev/null and b/application/palemoon/branding/official/firefox.icns differ diff --git a/application/palemoon/branding/official/firefox.ico b/application/palemoon/branding/official/firefox.ico new file mode 100644 index 0000000000..6d31066763 Binary files /dev/null and b/application/palemoon/branding/official/firefox.ico differ diff --git a/application/palemoon/branding/official/locales/en-US/brand.dtd b/application/palemoon/branding/official/locales/en-US/brand.dtd new file mode 100644 index 0000000000..ba6a9a83fb --- /dev/null +++ b/application/palemoon/branding/official/locales/en-US/brand.dtd @@ -0,0 +1,10 @@ + + + + + + + + diff --git a/application/palemoon/branding/official/locales/en-US/brand.properties b/application/palemoon/branding/official/locales/en-US/brand.properties new file mode 100644 index 0000000000..4f81fcd550 --- /dev/null +++ b/application/palemoon/branding/official/locales/en-US/brand.properties @@ -0,0 +1,11 @@ +# 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 +# file, You can obtain one at http://mozilla.org/MPL/2.0/. + +brandShortName=Eclipse Lun3r +# The above controls the name shown in the app +brandShorterName=Lun3r +brandFullName=Eclipse Lun3r +vendorShortName=Eclipse Community + +syncBrandShortName=Sync diff --git a/application/palemoon/branding/official/locales/jar.mn b/application/palemoon/branding/official/locales/jar.mn new file mode 100644 index 0000000000..d82e2845ba --- /dev/null +++ b/application/palemoon/branding/official/locales/jar.mn @@ -0,0 +1,7 @@ +#filter substitution + +@AB_CD@.jar: +% locale branding @AB_CD@ %locale/branding/ + locale/branding/brand.dtd (%brand.dtd) + locale/branding/brand.properties (%brand.properties) + locale/branding/browserconfig.properties (../../shared/locales/browserconfig.properties) diff --git a/application/palemoon/branding/official/locales/moz.build b/application/palemoon/branding/official/locales/moz.build new file mode 100644 index 0000000000..c07ede3757 --- /dev/null +++ b/application/palemoon/branding/official/locales/moz.build @@ -0,0 +1,3 @@ +# -*- Mode: python; c-basic-offset: 4; indent-tabs-mode: nil; tab-width: 40 -*- + +JAR_MANIFESTS += ['jar.mn'] diff --git a/application/palemoon/branding/official/lun3r.VisualElementsManifest.xml b/application/palemoon/branding/official/lun3r.VisualElementsManifest.xml new file mode 100644 index 0000000000..e9e1f136aa --- /dev/null +++ b/application/palemoon/branding/official/lun3r.VisualElementsManifest.xml @@ -0,0 +1,8 @@ + + + diff --git a/application/palemoon/branding/official/lun3r.desktop b/application/palemoon/branding/official/lun3r.desktop new file mode 100644 index 0000000000..d756e5bc9c --- /dev/null +++ b/application/palemoon/branding/official/lun3r.desktop @@ -0,0 +1,353 @@ +[Desktop Entry] +Name=Eclipse Lun3r +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=lun3r %u +Terminal=false +Type=Application +Icon=lun3r +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="lun3r" + +[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=lun3r -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=lun3r -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=lun3r -private-window diff --git a/application/palemoon/branding/official/moz.build b/application/palemoon/branding/official/moz.build new file mode 100644 index 0000000000..487678b016 --- /dev/null +++ b/application/palemoon/branding/official/moz.build @@ -0,0 +1,13 @@ +# -*- Mode: python; c-basic-offset: 4; indent-tabs-mode: nil; tab-width: 40 -*- + +DIRS += ['content', 'locales'] + +DIST_SUBDIR = 'browser' +export('DIST_SUBDIR') + +include('../shared/branding.mozbuild') +ApplicationBranding() + +FINAL_TARGET_FILES['..'] += [ + 'Lun3r.VisualElementsManifest.xml', +] diff --git a/application/palemoon/branding/official/mozicon128.png b/application/palemoon/branding/official/mozicon128.png new file mode 100644 index 0000000000..2be089c567 Binary files /dev/null and b/application/palemoon/branding/official/mozicon128.png differ diff --git a/application/palemoon/branding/official/pref/palemoon-branding.js b/application/palemoon/branding/official/pref/palemoon-branding.js new file mode 100644 index 0000000000..b314f16741 --- /dev/null +++ b/application/palemoon/branding/official/pref/palemoon-branding.js @@ -0,0 +1,13 @@ +#filter substitution +#filter emptyLines +#include ../../shared/pref/preferences.inc +#include ../../shared/pref/uaoverrides.inc + +pref("app.vendorURL", "https://eclipse.cx"); +pref("app.releaseNotesURL", "https://github.com/Eclipse-Community/UXP/releases"); +pref("app.feedback.baseURL", "https://board.eclipse.cx/viewtopic.php?t=710"); +pref("browser.lun3r.brand", true); + +// Updates disabled +pref("app.update.enabled", false); +pref("app.update.url", ""); diff --git a/application/palemoon/branding/official/wizHeader.bmp b/application/palemoon/branding/official/wizHeader.bmp new file mode 100644 index 0000000000..5a8f517c36 Binary files /dev/null and b/application/palemoon/branding/official/wizHeader.bmp differ diff --git a/application/palemoon/branding/official/wizHeaderRTL.bmp b/application/palemoon/branding/official/wizHeaderRTL.bmp new file mode 100644 index 0000000000..2c37edded3 Binary files /dev/null and b/application/palemoon/branding/official/wizHeaderRTL.bmp differ diff --git a/application/palemoon/branding/official/wizWatermark.bmp b/application/palemoon/branding/official/wizWatermark.bmp new file mode 100644 index 0000000000..34747884c1 Binary files /dev/null and b/application/palemoon/branding/official/wizWatermark.bmp differ diff --git a/application/palemoon/components/shell/nsWindowsShellService.cpp b/application/palemoon/components/shell/nsWindowsShellService.cpp index 57dbace272..100bbe9bf0 100644 --- a/application/palemoon/components/shell/nsWindowsShellService.cpp +++ b/application/palemoon/components/shell/nsWindowsShellService.cpp @@ -101,18 +101,18 @@ OpenKeyForReading(HKEY aKeyRoot, const nsAString& aKeyName, HKEY* aKey) // .htm .html .shtml .xht .xhtml // are mapped like so: // -// HKCU\SOFTWARE\Classes\.\ (default) REG_SZ NewMoonHTML +// HKCU\SOFTWARE\Classes\.\ (default) REG_SZ Lun3rHTML // // as aliases to the class: // -// HKCU\SOFTWARE\Classes\NewMoonHTML\ +// HKCU\SOFTWARE\Classes\Lun3rHTML\ // DefaultIcon (default) REG_SZ ,1 // shell\open\command (default) REG_SZ -osint -url "%1" // shell\open\ddeexec (default) REG_SZ // // - Windows Vista and above Protocol Handler // -// HKCU\SOFTWARE\Classes\NewMoonURL\ (default) REG_SZ URL +// HKCU\SOFTWARE\Classes\Lun3rURL\ (default) REG_SZ URL // EditFlags REG_DWORD 2 // FriendlyTypeName REG_SZ URL // DefaultIcon (default) REG_SZ ,1 @@ -157,7 +157,7 @@ typedef struct { } SETTING; // Find a way to unhardcode this -#define APP_REG_NAME L"New Moon" +#define APP_REG_NAME L"Lun3r" #define VAL_FILE_ICON "%APPPATH%,1" #define VAL_OPEN "\"%APPPATH%\" -osint -url \"%1\"" #define OLD_VAL_OPEN "\"%APPPATH%\" -requestPending -osint -url \"%1\"" @@ -183,10 +183,10 @@ static SETTING gSettings[] = { // File Handler Class // ***keep this as the first entry because when aForAllTypes is not set below // it will skip over this check.*** - { MAKE_KEY_NAME1("NewMoonHTML", SOC), VAL_OPEN, OLD_VAL_OPEN }, + { MAKE_KEY_NAME1("Lun3rHTML", SOC), VAL_OPEN, OLD_VAL_OPEN }, // Protocol Handler Class - for Vista and above - { MAKE_KEY_NAME1("NewMoonURL", SOC), VAL_OPEN, OLD_VAL_OPEN }, + { MAKE_KEY_NAME1("Lun3rURL", SOC), VAL_OPEN, OLD_VAL_OPEN }, // Protocol Handlers { MAKE_KEY_NAME1("HTTP", DI), VAL_FILE_ICON }, @@ -200,10 +200,10 @@ static SETTING gSettings[] = { // are incorrect they are fixed without notifying the user. static SETTING gDDESettings[] = { // File Handler Class - { MAKE_KEY_NAME1("Software\\Classes\\NewMoonHTML", SOD) }, + { MAKE_KEY_NAME1("Software\\Classes\\Lun3rHTML", SOD) }, // Protocol Handler Class - for Vista and above - { MAKE_KEY_NAME1("Software\\Classes\\NewMoonURL", SOD) }, + { MAKE_KEY_NAME1("Software\\Classes\\Lun3rURL", SOD) }, // Protocol Handlers { MAKE_KEY_NAME1("Software\\Classes\\FTP", SOD) }, @@ -340,7 +340,7 @@ IsAARDefault(const RefPtr& pAAR, return false; } - LPCWSTR progID = isProtocol ? L"NewMoonURL" : L"NewMoonHTML"; + LPCWSTR progID = isProtocol ? L"Lun3rURL" : L"Lun3rHTML"; bool isDefault = !wcsicmp(registeredApp, progID); CoTaskMemFree(registeredApp); @@ -372,8 +372,8 @@ IsDefaultBrowserWin8(bool aCheckAllTypes, bool* aIsDefaultBrowser) /* * Query's the AAR for the default status. - * This only checks for NewMoonURL and if aCheckAllTypes is set, then - * it also checks for NewMoonHTML. Note that those ProgIDs are shared + * This only checks for Lun3rURL and if aCheckAllTypes is set, then + * it also checks for Lun3rHTML. Note that those ProgIDs are shared * by all PaleMoon browsers. */ bool diff --git a/application/palemoon/confvars.sh b/application/palemoon/confvars.sh index 7a865b7d15..98f550f0af 100644 --- a/application/palemoon/confvars.sh +++ b/application/palemoon/confvars.sh @@ -6,18 +6,26 @@ # Application Basename and Vendor # MOZ_APP_BASENAME and MOZ_APP_VENDOR must not have spaces. # These values where appropriate are hardcoded in application.ini -# to "New Moon" and "Open Source Contributors" respectively for -# Pale Moon -MOZ_APP_BASENAME=Newmoon -MOZ_APP_VENDOR=OpenSourceContributors -MOZ_APP_UA_NAME=PaleMoon +# to "Lun3r" and "Eclipse Community" respectively for +# Lun3r +MOZ_APP_BASENAME=Lun3r +MOZ_APP_VENDOR=Eclipse Community +MOZ_APP_UA_NAME=Lun3r -# Application Version -# MOZ_APP_VERSION is read from ./config/version.txt -# MOZ_APP_VERSION_DISPLAY is not used in Pale Moon so set it -# to MOZ_APP_VERSION -MOZ_APP_VERSION=`cat ${_topsrcdir}/$MOZ_BUILD_APP/config/version.txt` -MOZ_APP_VERSION_DISPLAY=$MOZ_APP_VERSION +# For Lun3r we want to use 33.7.YYYY.MM.DD as MOZ_APP_VERSION in release +# builds so add-on developers have something to target while maintaining +# Pale Moon compatiblity. +# To enable add "export LUN3R_VERSION=1" to the .mozconfig file. +# However, this will cause a full rebuild at 00:00 UTC every day so +# don't export the variable if you are in development or don't care. +# When not exported we fall back the value in the version*.txt file. +if test -n "$LUN3R_VERSION" ; then + MOZ_APP_VERSION=33.7.`date --utc '+%Y.%m.%d'` + MOZ_APP_VERSION_DISPLAY=`date --utc '+%Y.%m.%d'` +else + MOZ_APP_VERSION=`cat ${_topsrcdir}/$MOZ_BUILD_APP/config/version.txt` + MOZ_APP_VERSION_DISPLAY=$MOZ_APP_VERSION +fi # Application ID # This is a unique identifier used for the application diff --git a/application/palemoon/installer/windows/app.tag b/application/palemoon/installer/windows/app.tag index cca8803662..d72d798e7a 100644 --- a/application/palemoon/installer/windows/app.tag +++ b/application/palemoon/installer/windows/app.tag @@ -1,4 +1,4 @@ ;!@Install@!UTF-8! -Title="New Moon" +Title="Lun3r" RunProgram="setup.exe" ;!@InstallEnd@! \ No newline at end of file diff --git a/application/palemoon/installer/windows/nsis/installer.nsi b/application/palemoon/installer/windows/nsis/installer.nsi index 03ccadccf0..9f9c2a98b2 100644 --- a/application/palemoon/installer/windows/nsis/installer.nsi +++ b/application/palemoon/installer/windows/nsis/installer.nsi @@ -379,17 +379,17 @@ Section "-Application" APP_IDX ; it doesn't cause problems always add them. ${SetUninstallKeys} - ; On install always add the NewMoonHTML and NewMoonURL keys. - ; An empty string is used for the 5th param because NewMoonHTML is not a + ; On install always add the Lun3rHTML and Lun3rURL keys. + ; An empty string is used for the 5th param because Lun3rHTML is not a ; protocol handler. ${GetLongPath} "$INSTDIR\${FileMainEXE}" $8 StrCpy $2 "$\"$8$\" -osint -url $\"%1$\"" - ; In Win8, the delegate execute handler picks up the value in NewMoonURL and - ; NewMoonHTML to launch the desktop browser when it needs to. - ${AddDisabledDDEHandlerValues} "NewMoonHTML" "$2" "$8,1" \ + ; In Win8, the delegate execute handler picks up the value in Lun3rURL and + ; Lun3rHTML to launch the desktop browser when it needs to. + ${AddDisabledDDEHandlerValues} "Lun3rHTML" "$2" "$8,1" \ "${AppRegName} Document" "" - ${AddDisabledDDEHandlerValues} "NewMoonURL" "$2" "$8,1" "${AppRegName} URL" \ + ${AddDisabledDDEHandlerValues} "Lun3rURL" "$2" "$8,1" "${AppRegName} URL" \ "true" ; For pre win8, the following keys should only be set if we can write to HKLM. diff --git a/application/palemoon/installer/windows/nsis/shared.nsh b/application/palemoon/installer/windows/nsis/shared.nsh index 6175ef38e0..a85afb4916 100644 --- a/application/palemoon/installer/windows/nsis/shared.nsh +++ b/application/palemoon/installer/windows/nsis/shared.nsh @@ -13,9 +13,9 @@ ; start menu tile. In case there are 2 PaleMoon installations, we only do ; this if the application being updated is the default. ReadRegStr $0 HKCU "Software\Microsoft\Windows\Shell\Associations\UrlAssociations\http\UserChoice" "ProgId" - ${If} $0 == "NewMoonURL" + ${If} $0 == "Lun3rURL" ${AndIf} $9 != 0 ; We're not running in session 0 - ReadRegStr $0 HKCU "Software\Classes\NewMoonURL\shell\open\command" "" + ReadRegStr $0 HKCU "Software\Classes\Lun3rURL\shell\open\command" "" ${GetPathFromString} "$0" $0 ${GetParent} "$0" $0 ${If} ${FileExists} "$0" @@ -282,9 +282,9 @@ ClearErrors EnumRegKey $7 HKCR "${FILE_TYPE}" 0 ${If} ${Errors} - WriteRegStr SHCTX "SOFTWARE\Classes\${FILE_TYPE}" "" "NewMoonHTML" + WriteRegStr SHCTX "SOFTWARE\Classes\${FILE_TYPE}" "" "Lun3rHTML" ${EndIf} - WriteRegStr SHCTX "SOFTWARE\Classes\${FILE_TYPE}\OpenWithProgids" "NewMoonHTML" "" + WriteRegStr SHCTX "SOFTWARE\Classes\${FILE_TYPE}\OpenWithProgids" "Lun3rHTML" "" !macroend !define AddAssociationIfNoneExist "!insertmacro AddAssociationIfNoneExist" @@ -296,30 +296,30 @@ StrCpy $0 "SOFTWARE\Classes" StrCpy $2 "$\"$8$\" -osint -url $\"%1$\"" - ; Associate the file handlers with NewMoonHTML + ; Associate the file handlers with Lun3rHTML ReadRegStr $6 SHCTX "$0\.htm" "" - ${If} "$6" != "NewMoonHTML" - WriteRegStr SHCTX "$0\.htm" "" "NewMoonHTML" + ${If} "$6" != "Lun3rHTML" + WriteRegStr SHCTX "$0\.htm" "" "Lun3rHTML" ${EndIf} ReadRegStr $6 SHCTX "$0\.html" "" - ${If} "$6" != "NewMoonHTML" - WriteRegStr SHCTX "$0\.html" "" "NewMoonHTML" + ${If} "$6" != "Lun3rHTML" + WriteRegStr SHCTX "$0\.html" "" "Lun3rHTML" ${EndIf} ReadRegStr $6 SHCTX "$0\.shtml" "" - ${If} "$6" != "NewMoonHTML" - WriteRegStr SHCTX "$0\.shtml" "" "NewMoonHTML" + ${If} "$6" != "Lun3rHTML" + WriteRegStr SHCTX "$0\.shtml" "" "Lun3rHTML" ${EndIf} ReadRegStr $6 SHCTX "$0\.xht" "" - ${If} "$6" != "NewMoonHTML" - WriteRegStr SHCTX "$0\.xht" "" "NewMoonHTML" + ${If} "$6" != "Lun3rHTML" + WriteRegStr SHCTX "$0\.xht" "" "Lun3rHTML" ${EndIf} ReadRegStr $6 SHCTX "$0\.xhtml" "" - ${If} "$6" != "NewMoonHTML" - WriteRegStr SHCTX "$0\.xhtml" "" "NewMoonHTML" + ${If} "$6" != "Lun3rHTML" + WriteRegStr SHCTX "$0\.xhtml" "" "Lun3rHTML" ${EndIf} ${AddAssociationIfNoneExist} ".pdf" @@ -329,12 +329,12 @@ ${AddAssociationIfNoneExist} ".pdf" ${AddAssociationIfNoneExist} ".webm" - ; An empty string is used for the 5th param because NewMoonHTML is not a + ; An empty string is used for the 5th param because Lun3rHTML is not a ; protocol handler - ${AddDisabledDDEHandlerValues} "NewMoonHTML" "$2" "$8,1" \ + ${AddDisabledDDEHandlerValues} "Lun3rHTML" "$2" "$8,1" \ "${AppRegName} HTML Document" "" - ${AddDisabledDDEHandlerValues} "NewMoonURL" "$2" "$8,1" "${AppRegName} URL" \ + ${AddDisabledDDEHandlerValues} "Lun3rURL" "$2" "$8,1" "${AppRegName} URL" \ "true" ; An empty string is used for the 4th & 5th params because the following ; 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" "ApplicationName" "${BrandShortName}" - WriteRegStr ${RegKey} "$0\Capabilities\FileAssociations" ".htm" "NewMoonHTML" - WriteRegStr ${RegKey} "$0\Capabilities\FileAssociations" ".html" "NewMoonHTML" - WriteRegStr ${RegKey} "$0\Capabilities\FileAssociations" ".shtml" "NewMoonHTML" - WriteRegStr ${RegKey} "$0\Capabilities\FileAssociations" ".xht" "NewMoonHTML" - WriteRegStr ${RegKey} "$0\Capabilities\FileAssociations" ".xhtml" "NewMoonHTML" + WriteRegStr ${RegKey} "$0\Capabilities\FileAssociations" ".htm" "Lun3rHTML" + WriteRegStr ${RegKey} "$0\Capabilities\FileAssociations" ".html" "Lun3rHTML" + WriteRegStr ${RegKey} "$0\Capabilities\FileAssociations" ".shtml" "Lun3rHTML" + WriteRegStr ${RegKey} "$0\Capabilities\FileAssociations" ".xht" "Lun3rHTML" + WriteRegStr ${RegKey} "$0\Capabilities\FileAssociations" ".xhtml" "Lun3rHTML" WriteRegStr ${RegKey} "$0\Capabilities\StartMenu" "StartMenuInternet" "$R9" - WriteRegStr ${RegKey} "$0\Capabilities\URLAssociations" "ftp" "NewMoonURL" - WriteRegStr ${RegKey} "$0\Capabilities\URLAssociations" "http" "NewMoonURL" - WriteRegStr ${RegKey} "$0\Capabilities\URLAssociations" "https" "NewMoonURL" + WriteRegStr ${RegKey} "$0\Capabilities\URLAssociations" "ftp" "Lun3rURL" + WriteRegStr ${RegKey} "$0\Capabilities\URLAssociations" "http" "Lun3rURL" + WriteRegStr ${RegKey} "$0\Capabilities\URLAssociations" "https" "Lun3rURL" ; Vista Registered Application WriteRegStr ${RegKey} "Software\RegisteredApplications" "${AppRegName}" "$0\Capabilities" !macroend !define SetStartMenuInternet "!insertmacro SetStartMenuInternet" -; The IconHandler reference for NewMoonHTML can end up in an inconsistent state +; The IconHandler reference for Lun3rHTML can end up in an inconsistent state ; 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 ; icon being displayed for files associated with PaleMoon (does not use SHCTX). !macro FixShellIconHandler RegKey ClearErrors - ReadRegStr $1 ${RegKey} "Software\Classes\NewMoonHTML\ShellEx\IconHandler" "" + ReadRegStr $1 ${RegKey} "Software\Classes\Lun3rHTML\ShellEx\IconHandler" "" ${Unless} ${Errors} - ReadRegStr $1 ${RegKey} "Software\Classes\NewMoonHTML\DefaultIcon" "" + ReadRegStr $1 ${RegKey} "Software\Classes\Lun3rHTML\DefaultIcon" "" ${GetLongPath} "$INSTDIR\${FileMainEXE}" $2 ${If} "$1" != "$2,1" - WriteRegStr ${RegKey} "Software\Classes\NewMoonHTML\DefaultIcon" "" "$2,1" + WriteRegStr ${RegKey} "Software\Classes\Lun3rHTML\DefaultIcon" "" "$2,1" ${EndIf} ${EndUnless} !macroend @@ -567,7 +567,7 @@ ; 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 ; cleans affected installations by removing the HKLM and HKCU value if it is set -; to NewMoonHTML when there is a value for PersistentHandler or by removing the +; to Lun3rHTML 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. !macro FixBadFileAssociation FILE_TYPE ; 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 $2 HKCR "${FILE_TYPE}\PersistentHandler" "" ${If} "$2" != "" - ; Since there is a persistent handler remove NewMoonHTML as the default - ; value from both HKCU and HKLM if it set to NewMoonHTML. - ${If} "$0" == "NewMoonHTML" + ; Since there is a persistent handler remove Lun3rHTML as the default + ; value from both HKCU and HKLM if it set to Lun3rHTML. + ${If} "$0" == "Lun3rHTML" DeleteRegValue HKCU "Software\Classes\${FILE_TYPE}" "" ${EndIf} - ${If} "$1" == "NewMoonHTML" + ${If} "$1" == "Lun3rHTML" DeleteRegValue HKLM "Software\Classes\${FILE_TYPE}" "" ${EndIf} - ${ElseIf} "$0" == "NewMoonHTML" - ; Since KHCU is set to NewMoonHTML remove NewMoonHTML as the default value + ${ElseIf} "$0" == "Lun3rHTML" + ; Since KHCU is set to Lun3rHTML remove Lun3rHTML as the default value ; from HKCU if HKLM is set to a value other than an empty string. ${If} "$1" != "" DeleteRegValue HKCU "Software\Classes\${FILE_TYPE}" "" @@ -641,17 +641,17 @@ ; Only set the file and protocol handlers if the existing one under HKCR is ; for this install location. - ${IsHandlerForInstallDir} "NewMoonHTML" $R9 + ${IsHandlerForInstallDir} "Lun3rHTML" $R9 ${If} "$R9" == "true" - ; An empty string is used for the 5th param because NewMoonHTML is not a + ; An empty string is used for the 5th param because Lun3rHTML is not a ; protocol handler. - ${AddDisabledDDEHandlerValues} "NewMoonHTML" "$2" "$8,1" \ + ${AddDisabledDDEHandlerValues} "Lun3rHTML" "$2" "$8,1" \ "${AppRegName} HTML Document" "" ${EndIf} - ${IsHandlerForInstallDir} "NewMoonURL" $R9 + ${IsHandlerForInstallDir} "Lun3rURL" $R9 ${If} "$R9" == "true" - ${AddDisabledDDEHandlerValues} "NewMoonURL" "$2" "$8,1" \ + ${AddDisabledDDEHandlerValues} "Lun3rURL" "$2" "$8,1" \ "${AppRegName} URL" "true" ${EndIf} @@ -699,10 +699,10 @@ DeleteRegValue HKLM "$0\Capabilities\URLAssociations" "gopher" ${EndUnless} - ; Delete gopher from the user's UrlAssociations if it points to NewMoonURL. + ; Delete gopher from the user's UrlAssociations if it points to Lun3rURL. StrCpy $0 "Software\Microsoft\Windows\Shell\Associations\UrlAssociations\gopher" ReadRegStr $2 HKCU "$0\UserChoice" "Progid" - ${If} "$2" == "NewMoonURL" + ${If} "$2" == "Lun3rURL" DeleteRegKey HKCU "$0" ${EndIf} !macroend diff --git a/application/palemoon/installer/windows/nsis/uninstaller.nsi b/application/palemoon/installer/windows/nsis/uninstaller.nsi index b937361483..12ffc2ad7b 100644 --- a/application/palemoon/installer/windows/nsis/uninstaller.nsi +++ b/application/palemoon/installer/windows/nsis/uninstaller.nsi @@ -227,27 +227,27 @@ Section "Uninstall" ${un.SetAppLSPCategories} ${EndIf} - ${un.RegCleanAppHandler} "NewMoonURL" - ${un.RegCleanAppHandler} "NewMoonHTML" + ${un.RegCleanAppHandler} "Lun3rURL" + ${un.RegCleanAppHandler} "Lun3rHTML" ${un.RegCleanProtocolHandler} "ftp" ${un.RegCleanProtocolHandler} "http" ${un.RegCleanProtocolHandler} "https" ClearErrors - ReadRegStr $R9 HKCR "NewMoonHTML" "" - ; Don't clean up the file handlers if the NewMoonHTML key still exists since + ReadRegStr $R9 HKCR "Lun3rHTML" "" + ; Don't clean up the file handlers if the Lun3rHTML key still exists since ; there should be a second installation that may be the default file handler ${If} ${Errors} - ${un.RegCleanFileHandler} ".htm" "NewMoonHTML" - ${un.RegCleanFileHandler} ".html" "NewMoonHTML" - ${un.RegCleanFileHandler} ".shtml" "NewMoonHTML" - ${un.RegCleanFileHandler} ".xht" "NewMoonHTML" - ${un.RegCleanFileHandler} ".xhtml" "NewMoonHTML" - ${un.RegCleanFileHandler} ".oga" "NewMoonHTML" - ${un.RegCleanFileHandler} ".ogg" "NewMoonHTML" - ${un.RegCleanFileHandler} ".ogv" "NewMoonHTML" - ${un.RegCleanFileHandler} ".pdf" "NewMoonHTML" - ${un.RegCleanFileHandler} ".webm" "NewMoonHTML" + ${un.RegCleanFileHandler} ".htm" "Lun3rHTML" + ${un.RegCleanFileHandler} ".html" "Lun3rHTML" + ${un.RegCleanFileHandler} ".shtml" "Lun3rHTML" + ${un.RegCleanFileHandler} ".xht" "Lun3rHTML" + ${un.RegCleanFileHandler} ".xhtml" "Lun3rHTML" + ${un.RegCleanFileHandler} ".oga" "Lun3rHTML" + ${un.RegCleanFileHandler} ".ogg" "Lun3rHTML" + ${un.RegCleanFileHandler} ".ogv" "Lun3rHTML" + ${un.RegCleanFileHandler} ".pdf" "Lun3rHTML" + ${un.RegCleanFileHandler} ".webm" "Lun3rHTML" ${EndIf} SetShellVarContext all ; Set SHCTX to HKLM diff --git a/application/palemoon/locales/en-US/chrome/browser/preferences/tabs.dtd b/application/palemoon/locales/en-US/chrome/browser/preferences/tabs.dtd index 68ea32f80e..0f3c0d2594 100644 --- a/application/palemoon/locales/en-US/chrome/browser/preferences/tabs.dtd +++ b/application/palemoon/locales/en-US/chrome/browser/preferences/tabs.dtd @@ -31,6 +31,6 @@ - + diff --git a/application/palemoon/locales/en-US/chrome/browser/statusbar/statusbar-overlay.dtd b/application/palemoon/locales/en-US/chrome/browser/statusbar/statusbar-overlay.dtd index 82231021e7..d0c42120a8 100644 --- a/application/palemoon/locales/en-US/chrome/browser/statusbar/statusbar-overlay.dtd +++ b/application/palemoon/locales/en-US/chrome/browser/statusbar/statusbar-overlay.dtd @@ -5,6 +5,6 @@ - + diff --git a/application/palemoon/locales/en-US/chrome/browser/statusbar/statusbar-prefs.dtd b/application/palemoon/locales/en-US/chrome/browser/statusbar/statusbar-prefs.dtd index f5351c828b..6a050e7f97 100644 --- a/application/palemoon/locales/en-US/chrome/browser/statusbar/statusbar-prefs.dtd +++ b/application/palemoon/locales/en-US/chrome/browser/statusbar/statusbar-prefs.dtd @@ -1,4 +1,4 @@ - + @@ -33,7 +33,7 @@ - + diff --git a/application/palemoon/locales/en-US/chrome/overrides/appstrings.properties b/application/palemoon/locales/en-US/chrome/overrides/appstrings.properties index b876e66fbc..50e06075ef 100644 --- a/application/palemoon/locales/en-US/chrome/overrides/appstrings.properties +++ b/application/palemoon/locales/en-US/chrome/overrides/appstrings.properties @@ -3,24 +3,24 @@ # file, You can obtain one at http://mozilla.org/MPL/2.0/. malformedURI=The URL is not valid and cannot be loaded. -fileNotFound=New Moon can't find the file at %S. -dnsNotFound=New Moon can't find the server at %S. -unknownProtocolFound=New Moon doesn't know how to open this address, because the protocol (%S) isn't associated with any program. -connectionFailure=New Moon can't establish a connection to the server at %S. +fileNotFound=Lun3r can't find the file at %S. +dnsNotFound=Lun3r can't find the server at %S. +unknownProtocolFound=Lun3r doesn't know how to open this address, because the protocol (%S) isn't associated with any program. +connectionFailure=Lun3r can't establish a connection to the server at %S. netInterrupt=The connection to %S was interrupted while the page was loading. netTimeout=The server at %S is taking too long to respond. -redirectLoop=New Moon has detected that the server is redirecting the request for this address in a way that will never complete. +redirectLoop=Lun3r 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" 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 -unknownSocketType=New Moon doesn't know how to communicate with the server. +unknownSocketType=Lun3r doesn't know how to communicate with the server. netReset=The connection to the server was reset while the page was loading. notCached=This document is no longer available. -netOffline=New Moon is currently in offline mode and can't browse the Web. +netOffline=Lun3r is currently in offline mode and can't browse the Web. 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. New Moon has canceled the request for your protection. -proxyResolveFailure=New Moon is configured to use a proxy server that can't be found. -proxyConnectFailure=New Moon is configured to use a proxy server that is refusing connections. +deniedPortAccess=This address uses a network port which is normally used for purposes other than Web browsing. Lun3r has canceled the request for your protection. +proxyResolveFailure=Lun3r is configured to use a proxy server that can't be found. +proxyConnectFailure=Lun3r 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. 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 @@ -32,6 +32,6 @@ externalProtocolLaunchBtn=Launch application 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. 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 New Moon. +remoteXUL=This page uses an unsupported technology that is no longer available by default in Lun3r. ## LOCALIZATION NOTE (sslv3Used) - Do not translate "%S". -sslv3Used=New Moon cannot guarantee the safety of your data on %S because it uses SSLv3, a broken security protocol. +sslv3Used=Lun3r cannot guarantee the safety of your data on %S because it uses SSLv3, a broken security protocol. diff --git a/application/palemoon/locales/generic/profile/bookmarks.html.in b/application/palemoon/locales/generic/profile/bookmarks.html.in index e4a4fb0227..30facd65df 100644 --- a/application/palemoon/locales/generic/profile/bookmarks.html.in +++ b/application/palemoon/locales/generic/profile/bookmarks.html.in @@ -1,4 +1,8 @@ #filter substitution + +#define eclipse_icon data:image/png;base64,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 + +#define github_icon data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAACXBIWXMAAAsTAAALEwEAmpwYAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8YQUAAAHdSURBVHgBvVeLbYNADDVdoHSDG4ENwgjpBMkG6QbtBkknIBtEnaDdADoBbEA6gWuXQ3GR7wOc8qSnSPhvkzuTQSQQMaefLXFDLIiGmFvxldgRG+IX8SPLsiukAAU2xDOxx3mo2BaWgismHnE9jrZ7s6tuMR1ajO0GKRaYNrhMorh35VoSBjwzbxWDCy5Lil/ailgrPnMtAe2F2wn5Hm+J9Nbxp2AvZNKuVPwetdZrKJQuGfCPMI/0baTSOai0EJ4EKlmVC3tYCdRHwOBR5Q8wHK8aOhiO1bVorK8phqPd0/4dJIKnCxULa4dw3vEZTkK7S2oegVH0u2S3mfCpPDOcQNJKPdAK+nsJ7wW10Ixn4xA+pRwDD1x5fOUOdA6bDaQLXjpEHSfw7RC+QDrsHc+b8ZJxYXUS5OPg8b8bj2LfvvcKCxEIzshHRXkavhG3+H8HaK2zMiJoYXXrQPBKGplJsK3tjObk4gl+wXiYqfFJCHublLailZ4EysjgJ814upKdRHc4uYp4gPAIQmjRdc8oFRcwExHBjdTPFAcclOc8Kp5huNN/iI90Or5DIAGHqCM+k30DEVU41/MI26jKo4DDX3JtAidcs1vg7eM0NoEeb98EBlIBAyu50DNzKv4F8Mg9kvfoSM0AAAAASUVORK5CYII=