diff --git a/browser/gopher/LICENSE.txt b/browser/gopher/LICENSE.txt
index 348f4486d6..15a04b314c 100644
--- a/browser/gopher/LICENSE.txt
+++ b/browser/gopher/LICENSE.txt
@@ -1,4 +1,4 @@
-*** FOR MORE DETAILED CREDIT INFORMATION, TYPE about:gopher AFTER INSTALL ***
+*** FOR MORE DETAILED CREDIT INFORMATION, SEE THE SOURCE AND BUILD DOCUMENTATION ***
This code is issued under a disjunctive tri-license giving you the choice of
one of the three following sets of free software/open source licensing terms:
@@ -66,4 +66,3 @@ License along with this library; if not, write to the Free Software
Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
[ or http://www.gnu.org/licenses/lgpl-2.1.html ]
-
diff --git a/browser/gopher/README.md b/browser/gopher/README.md
index d106dc2980..5cb004ec11 100644
--- a/browser/gopher/README.md
+++ b/browser/gopher/README.md
@@ -1,6 +1,6 @@
## libgopher
-libgopher is a fork of OverbiteFF, a plugin which lets you browse Gopher sites on legacy Firefox-based browsers such as Dactyloidae.
+libgopher (a fork of overbiteff) lets you browse Gopher sites directly in legacy Firefox-based browsers such as Dactyloidae.
In this tree it is built into the browser rather than installed as an add-on. The browser registers the Gopher protocol handler during startup, so `gopher://` links work immediately in a new profile.
@@ -9,11 +9,10 @@ In this tree it is built into the browser rather than installed as an add-on. Th
The integration is split into the same pieces used by other browser-native features:
- `moz.build` adds the component files, default preferences, and chrome package to the browser build.
-- `components/protocol.manifest` registers the Gopher protocol, while `components/about.manifest` registers the `about:gopher` and `about:overbite` pages.
+- `components/protocol.manifest` registers the Gopher protocol.
- `components/protocol.js` implements Gopher networking, directory conversion, internal resources, and supported item types.
-- `components/about.js` supplies the Overbite information page.
-- `jar.mn` packages the `overbiteff` content and locale namespaces.
-- `defaults/preferences/overbiteff.js` initializes the build marker preference.
+- `jar.mn` packages the `libgopher` content and locale namespaces.
+- `defaults/preferences/gopher.js` initializes the build marker preference.
The browser-level build entry is `browser/moz.build`; no XPI installation or add-on manager registration is required.
@@ -25,12 +24,7 @@ The primary entry point is any Gopher URL, for example:
gopher://gopher.floodgap.com/
```
-The built-in information pages are available at:
-
-```text
-about:gopher
-about:overbite
-```
+There are no built-in informational `about:` pages; navigation starts from a normal `gopher://` URL.
The protocol handler also serves the generated internal resources used by Gopher directory pages, including icons, CSS, and the page interaction script. These resources are addressed through `gopher:///internal-*` URLs and are resolved from the packaged `content/chrome/` directory.
@@ -44,8 +38,8 @@ The protocol handler first checks the profile’s `gopherchrome` directory for r
The following preferences are recognized when present:
-- `extensions.overbiteff.dotless` — enables dotless text cleanup.
-- `extensions.overbiteff.fixitype` — enables the legacy item-type correction behavior.
-- `extensions.overbiteff.buildmark` — records the initialized OverbiteFF build number.
+- `network.gopher.dotless` — enables dotless text cleanup.
+- `network.gopher.fixitype` — enables the legacy item-type correction behavior.
+- `network.gopher.buildmark` — records the initialized libgopher build number.
Only the build marker is given a default value by the built-in preference file; the other options remain opt-in.
diff --git a/browser/gopher/components/about.js b/browser/gopher/components/about.js
deleted file mode 100644
index ba1077e4ff..0000000000
--- a/browser/gopher/components/about.js
+++ /dev/null
@@ -1,177 +0,0 @@
-/*
-
-This code is issued under a disjunctive tri-license giving you the choice of
-one of the three following sets of free software/open source licensing terms:
-
- * Mozilla Public License, version 1.1
- * GNU General Public License, version 2.0
- * GNU Lesser General Public License, version 2.1
-
-For users under the Mozilla Public License:
-
-The contents of this file are subject to the Mozilla Public License
-Version 1.1 (the "License"); you may not use this file except in
-compliance with the License. You may obtain a copy of the License at
-http://www.mozilla.org/MPL/
-
-Software distributed under the License is distributed on an "AS IS"
-basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See the
-License for the specific language governing rights and limitations
-under the License.
-
-The Original Code is the OverbiteFF Gopher addon.
-
-The Initial Developer of the Original Code is Cameron Kaiser.
-Portions created by Cameron Kaiser are Copyright (C) 2008-2011
-Cameron Kaiser. All Rights Reserved. Copyright (C) 2008-2011 Contributors
-to the Overbite Project.
-
-For users under the GNU Public License:
-
-OverbiteFF Gopher/CSO Firefox addon
-Copyright (C) 2008-2011 Cameron Kaiser
-Copyright (C) 2008-2011 Contributors to the Overbite Project
-
-This program is free software; you can redistribute it and/or
-modify it under the terms of the GNU General Public License
-as published by the Free Software Foundation; version 2.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program; if not, write to the Free Software
-Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-[ or http://www.gnu.org/licenses/gpl-2.0.html ]
-
-For users under the GNU Lesser General Public License:
-
-OverbiteFF Gopher/CSO Firefox addon
-Copyright (C) 2008-2011 Cameron Kaiser
-Copyright (C) 2008-2011 Contributors to the Overbite Project
-
-This library is free software; you can redistribute it and/or
-modify it under the terms of the GNU Lesser General Public
-License as published by the Free Software Foundation; version 2.1.
-
-This library is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-Lesser General Public License for more details.
-
-You should have received a copy of the GNU Lesser General Public
-License along with this library; if not, write to the Free Software
-Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-[ or http://www.gnu.org/licenses/lgpl-2.1.html ]
-
-
-*/
-
-const OBFFABOUT = "chrome://overbiteff/content/infobabe.html";
-// register this to three contract IDs
-const OBFFABOUT_CONTRACTID1 = "@mozilla.org/network/protocol/about;1?what=gopher";
-const OBFFABOUT_CONTRACTID2 = "@mozilla.org/network/protocol/about;1?what=overbite";
-//const OBFFABOUT_CONTRACTID3 = "@mozilla.org/network/protocol/about;1?what=overbiteff";
-
-const OBFFABOUT_CID = Components.ID("{80d3faa0-de53-11dc-95ff-0800200c9a66}");
-
-const nsISupports = Components.interfaces.nsISupports;
-const nsIFactory = Components.interfaces.nsIFactory;
-const nsIModule = Components.interfaces.nsIModule;
-const nsIAboutModule = Components.interfaces.nsIAboutModule;
-const nsIIOService = Components.interfaces.nsIIOService;
-const nsIObserver = Components.interfaces.nsIObserver;
-const nsIComponentRegistrar = Components.interfaces.nsIComponentRegistrar;
-
-Components.utils.import("resource://gre/modules/XPCOMUtils.jsm");
-
-var OverbiteAbout = {
-
- classID: OBFFABOUT_CID,
-
- // nsISupports
- QueryInterface : XPCOMUtils.generateQI([nsISupports,
- nsIObserver,
- nsIFactory,
- nsIAboutModule]),
-
- // nsIObserver
- observe : function(subject, topic, data) {
- // nothing yet
- },
-
- // nsIAboutModule
- newChannel : function(uri) {
- var chan = Components
- .classes["@mozilla.org/network/io-service;1"]
- .getService(nsIIOService)
- .newChannel(OBFFABOUT, null, null);
- chan.originalURI = uri;
- return chan;
- },
-
- getURIFlags : function(uri) { return 0; },
-
- // nsIFactory
- createInstance : function(outer, iid) {
- if (outer != null)
- throw Components.results.NS_ERROR_NO_AGGREGATION;
- return this.QueryInterface(iid);
- },
-
- lockFactory : function(lock) { // ignored
- }
-};
-
-var Module = {
-
- // nsISupports
- QueryInterface : XPCOMUtils.generateQI([nsISupports,
- nsIModule]),
-
- // nsIModule
- getClassObject : function(compMgr, cid, iid) {
- if (cid.equals(OBFFABOUT_CID)) {
- return OverbiteAbout.QueryInterface(iid);
- }
-
- throw Components.results.NS_ERROR_FACTORY_NOT_REGISTERED;
- },
- registerSelf : function(compMgr, fileSpec, location, type) {
- var compReg = compMgr.QueryInterface(nsIComponentRegistrar);
-
- // do the treble
- compReg.registerFactoryLocation(OBFFABOUT_CID,
- "about:gopher",
- OBFFABOUT_CONTRACTID1,
- fileSpec,
- location,
- type);
- compReg.registerFactoryLocation(OBFFABOUT_CID,
- "about:overbite",
- OBFFABOUT_CONTRACTID2,
- fileSpec,
- location,
- type);
-/* sigh. it must not like the length.
- compReg.registerFactoryLocation(OBFFABOUT_CID,
- "about:overbiteff",
- OBFFABOUT_CONTRACTID3,
- fileSpec,
- location,
- type);
-*/
- },
- unregisterSelf : function(compMgr, location, type) {
- var compReg = compMgr.QueryInterface(nsIComponentRegistrar);
-
- // undo the treble
- compReg.unregisterFactoryLocation(OBFFABOUT_CID, location);
- },
- canUnload : function(compMgr) { return true; }
-};
-
-function NSGetModule(compMgr, fileSpec) { return Module; }
-function NSGetFactory(component) { return OverbiteAbout; }
diff --git a/browser/gopher/components/about.manifest b/browser/gopher/components/about.manifest
deleted file mode 100644
index e2046883dd..0000000000
--- a/browser/gopher/components/about.manifest
+++ /dev/null
@@ -1,5 +0,0 @@
-component {80d3faa0-de53-11dc-95ff-0800200c9a66} about.js
-contract @mozilla.org/network/protocol/about;1?what=gopher {80d3faa0-de53-11dc-95ff-0800200c9a66}
-contract @mozilla.org/network/protocol/about;1?what=overbite {80d3faa0-de53-11dc-95ff-0800200c9a66}
-category profile-after-change OverbiteAbout @mozilla.org/network/protocol/about;1?what=gopher
-category profile-after-change OverbiteAbout @mozilla.org/network/protocol/about;1?what=overbite
diff --git a/browser/gopher/components/protocol.js b/browser/gopher/components/protocol.js
index d16d14199e..7b543587b3 100644
--- a/browser/gopher/components/protocol.js
+++ b/browser/gopher/components/protocol.js
@@ -69,12 +69,11 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*/
const OBFFVERS = 3.1;
const OBFFBUILD = 1695;
-const OBFFBUILDPREF = "extensions.overbiteff.buildmark";
-const OBFFDOTLESSPREF = "extensions.overbiteff.dotless";
-const OBFFFIXITYPEPREF = "extensions.overbiteff.fixitype";
+const OBFFBUILDPREF = "network.gopher.buildmark";
+const OBFFDOTLESSPREF = "network.gopher.dotless";
+const OBFFFIXITYPEPREF = "network.gopher.fixitype";
const OBFFSCHEME = "gopher";
-const OBFFCHROMEURL = "chrome://overbiteff";
-const OBFFABOUTURL = (OBFFCHROMEURL + "/content/infobabe.html");
+const OBFFCHROMEURL = "chrome://libgopher";
const OBFFRABOUTURL = (OBFFCHROMEURL + "/content/startpage.html");
const OBFFPROT_HANDLER_CONTRACTID = "@mozilla.org/network/protocol;1?name="+OBFFSCHEME;
const OBFFPROT_HANDLER_CID = Components.ID("{977ffc4c-a635-433d-8477-ea575bfb7b19}");
@@ -123,7 +122,7 @@ var nullcaps = {
function OverbiteLogAlways(msg, error) {
var consoleService = Cc["@mozilla.org/consoleservice;1"]
.getService(Ci.nsIConsoleService);
- msg = "OverbiteFF says: "+msg;
+ msg = "libgopher: "+msg;
if (error) {
consoleService.logStringError(msg);
} else {
@@ -1897,20 +1896,10 @@ OverbiteProtocol.prototype = {
return ioService.newChannel(IURL, null, null);
}
- // otherwise
- // make chrome channel to about page if
- // input_uri lacks a hostname
+ // Reject empty-host Gopher URLs. The legacy about-page fallback has
+ // intentionally been removed from the built-in browser integration.
if (!input_uri.host.length) {
- OverbiteLog("internal about page served up instead");
- OverbiteSetPrefs(); // sigh
-
- // SEKRIT FUNKTION. gopher:/// clears the caps cache
- capscache = new Object();
- OverbiteLogAlways("caps cache is cleared");
-
- return ioService.newChannel(
- OBFFABOUTURL,
- null, null);
+ throw Cr.NS_ERROR_MALFORMED_URI;
}
// otherwise
@@ -1956,15 +1945,7 @@ function NSGetModule(compMgr, fileSpec) {
if (XPCOMUtils.generateNSGetFactory)
var NSGetFactory = XPCOMUtils.generateNSGetFactory(components);
-function OverbiteSetPrefs() {
- var prefs = Cc["@mozilla.org/preferences-service;1"];
- var prefserv = prefs.getService(Ci.nsIPrefService);
- prefs = prefs.getService(Ci.nsIPrefBranch);
- prefs.setIntPref(OBFFBUILDPREF, OBFFBUILD);
- prefserv.savePrefFile(null);
-}
-
OverbiteLog("startup with version "+OBFFVERS+" build "+OBFFBUILD);
-// The legacy add-on opened about:overbite on first startup. Built-in browser
-// integration must not create or select a tab during application startup.
+// Built-in browser integration must not create or select a tab during
+// application startup.
diff --git a/browser/gopher/content/infobabe.html b/browser/gopher/content/infobabe.html
deleted file mode 100644
index 169b1921f0..0000000000
--- a/browser/gopher/content/infobabe.html
+++ /dev/null
@@ -1,356 +0,0 @@
-
-
-
-
-
-
-About OverbiteFF
-
-
-
-
-
-
-
-
-
-
-
-
-
-
Version
-3.1-Mozilla
-()
-
-
-
-
![]()
-
-
-
-
-Cato Auestad,
-Shaine Mata,
-David Meyer,
-
Máté Nagy,
-
Roman Pavlov,
-
Jacob Dahl Pind,
-Jeroen Schot,
-Dennis Schulmeister,
-B.J. Stobiecki,
-Benoit Triquet,
-Stegozor
-
-
-
-Cato Auestad,
-Sridhar Ayengar,
-Michael Casadevall,
-Philip Chee,
-
John Goerzen,
-Brian Koontz,
-
Jacob Head,
-David Meyer,
-Avery Morrow,
-José Moya,
-
Máté Nagy,
-
Roman Pavlov,
-
Jacob Dahl Pind,
-
Rob Sayers,
-Jeroen Schot,
-Dennis Schulmeister,
-B.J. Stobiecki,
-Benoit Triquet,
-Peter Tynan,
-Stegozor
-
-Overbite Mascot, Copyright © 2008- Cameron Kaiser.
-
-
-
-
-
-
-
-
-
-
diff --git a/browser/gopher/content/mascot.png b/browser/gopher/content/mascot.png
deleted file mode 100644
index dd70e21ab5..0000000000
Binary files a/browser/gopher/content/mascot.png and /dev/null differ
diff --git a/browser/gopher/defaults/preferences/gopher.js b/browser/gopher/defaults/preferences/gopher.js
index 741c51cc92..d07b33537a 100644
--- a/browser/gopher/defaults/preferences/gopher.js
+++ b/browser/gopher/defaults/preferences/gopher.js
@@ -1 +1 @@
-pref("extensions.overbiteff.buildmark", 0);
+pref("network.gopher.buildmark", 0);
diff --git a/browser/gopher/jar.mn b/browser/gopher/jar.mn
index 47ecba546c..5002f63c3b 100644
--- a/browser/gopher/jar.mn
+++ b/browser/gopher/jar.mn
@@ -4,19 +4,19 @@
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
gopher.jar:
-% content overbiteff %content/
-% locale overbiteff da-DK %locale/da-DK/
-% locale overbiteff de-DE %locale/de-DE/
-% locale overbiteff en-US %locale/en-US/
-% locale overbiteff es-ES %locale/es-ES/
-% locale overbiteff fr-FR %locale/fr-FR/
-% locale overbiteff hu-HU %locale/hu-HU/
-% locale overbiteff ja-JP %locale/ja-JP/
-% locale overbiteff nb-NO %locale/nb-NO/
-% locale overbiteff nl-NL %locale/nl-NL/
-% locale overbiteff pl-PL %locale/pl-PL/
-% locale overbiteff ru-RU %locale/ru-RU/
-% locale overbiteff tr-TR %locale/tr-TR/
+% content libgopher %content/
+% locale libgopher da-DK %locale/da-DK/
+% locale libgopher de-DE %locale/de-DE/
+% locale libgopher en-US %locale/en-US/
+% locale libgopher es-ES %locale/es-ES/
+% locale libgopher fr-FR %locale/fr-FR/
+% locale libgopher hu-HU %locale/hu-HU/
+% locale libgopher ja-JP %locale/ja-JP/
+% locale libgopher nb-NO %locale/nb-NO/
+% locale libgopher nl-NL %locale/nl-NL/
+% locale libgopher pl-PL %locale/pl-PL/
+% locale libgopher ru-RU %locale/ru-RU/
+% locale libgopher tr-TR %locale/tr-TR/
content/ (content/*)
locale/da-DK/ (locale/da-DK/*)
diff --git a/browser/gopher/locale/da-DK/aboutp.properties b/browser/gopher/locale/da-DK/aboutp.properties
deleted file mode 100644
index 90dc55da86..0000000000
--- a/browser/gopher/locale/da-DK/aboutp.properties
+++ /dev/null
@@ -1,13 +0,0 @@
-oinstalled=OverbiteFF synes at være blevet installert vellykket.
-ostartwith=Start Gopher med
-v2=Søg med Veronica-2
-world=Floodgap list over servere
-blurb=Gopher tilføjelsen til Mozilla Firefox og SeaMonkey
-programming=Programming
-testers=Testere
-l10n=Lokalisering/Internationalisering
-allrights=Alle rettigheder forbeholdes.
-logolicense=Overbite maskotten optræder i OverbiteFF under Creative Commons BY-NC-ND licensen.
-iconlicense=Visse ikoner og GUI elementer brugt i OverbiteFF stammer oprindeligt fra Netscape Navigator og Mozilla Project, og er underlagt vilkårene fra Mozilla Public Licensen. Adobe Acrobat og Acrobat logoet er registered varemærker fra Adobe Systems, Inc.
-codelicense1=Alt andet orginalt materiale i OverbiteFF er distribueret under Mozilla Public License/GNU Public License/GNU Lesser Public License.
-codelicense2=Brug udeover denne license er strengt forbudt.
diff --git a/browser/gopher/locale/da-DK/obff.properties b/browser/gopher/locale/da-DK/obff.properties
index 0475d55bb0..cb638d0321 100644
--- a/browser/gopher/locale/da-DK/obff.properties
+++ b/browser/gopher/locale/da-DK/obff.properties
@@ -1,13 +1,13 @@
-extensions.overbiteff.description=Gopher tilføjelse til firefox
+network.gopher.description=Gopher tilføjelse til firefox
hurl.error.title=Usikker URL %S
hurl.error=Denne URL indholder et usikker mål for omdirigering og er blevet udeladt.
-hurl.warning.title=Gopher hURL omdirigering
+hurl.warning.title=Gopher hURL omdirigering
hurl.warning=Dette element vil omdirigere dig til følgende ny URL:\n\n\t%S\n\nHvis du ikke genkender eller stoler på denne url, skal du trykke Cancel. Ellers tryk OK for at forsætte.
search.title=Angive parametere
search=Angive parametere som fjern serveren skal behandele:
cso.title=Angive CSO/ph forspørsel
cso=Angive nøgleord som der skal søges efter (eller en fuldstændig CSO/ph kommand begyndene med 'query').\n\nDin forspørgsel vil blive sendt uden nogen signatur.
-csobogus.title=Ugyldig CSO/ph forspørgelse
+csobogus.title=Ugyldig CSO/ph forspørgelse
csobogus=Denne forspørgelse er blevet annuleret da ingen kommando eller nøgleord blev modtaget.
baditype.title=Ugyldig element type
baditype=Dette element kan ikke vises direkte i din browser.
diff --git a/browser/gopher/locale/de-DE/aboutp.properties b/browser/gopher/locale/de-DE/aboutp.properties
deleted file mode 100644
index 028874c724..0000000000
--- a/browser/gopher/locale/de-DE/aboutp.properties
+++ /dev/null
@@ -1,13 +0,0 @@
-oinstalled=OverbiteFF wurde anscheinend erfolgreich installiert.
-ostartwith=Starte Gopher mit
-v2=Suche mit Veronica-2
-world=Floodgap-Liste der Server
-blurb=Das Gopher-AddOn für Mozilla Firefox und SeaMonkey
-programming=Programmierung
-testers=Tester
-l10n=Lokalisierung/Internationalisierung
-allrights=Alle Rechte vorbehalten.
-logolicense=Das Overbite-Maskottchen wird in OverbiteFF unter den Bedingungen der Creative Commons BY-NC-ND-Lizenz verwendet.
-iconlicense=Bestimmte Ikonen und Elemente der Benutzungsoberfläche, welche in OverbiteFF verwendet werden, entstammen dem Netscape Navigator und Mozilla Projekt. Sie wurden unter den Bedingungen der Mozilla Public License veröffentlicht. Adobe Acrobat und das Acrobat-Logo sind eingetragene Warenzeichen von Adobe Systems, Inc.
-codelicense1=Alle anderen, originären Inhalte von OverbiteFF werden unter den Bedingungen der Mozilla Public License/GNU Public License/GNU Lesser Public License veröffentlicht.
-codelicense2=Die Nutzung außerhalb dieser Lizenzbestimmungen ist untersagt.
diff --git a/browser/gopher/locale/de-DE/obff.properties b/browser/gopher/locale/de-DE/obff.properties
index 768b5f0afd..20a256bf77 100644
--- a/browser/gopher/locale/de-DE/obff.properties
+++ b/browser/gopher/locale/de-DE/obff.properties
@@ -1,15 +1,15 @@
-extensions.overbiteff.description=Gopher-Erweiterung für Firefox
-hurl.error.title=Unsichere URL %S
-hurl.error=Diese URL verweist auf ein unsicheres Ziel. Die Weiterleitung wurde darum nicht durchgeführt.
-hurl.warning.title=Gopher hURL-Weiterleitung
-hurl.warning=Dieser Selektor leitet Sie zur folgenden URL weiter:\n\n\t%S\n\nFalls Sie diese URL nicht kennen, oder sich ihrer Vertrauenswürdigkeit unsicher sind, sollten Sie auf Abbrechen drücken. Andernfalls drücken Sie bitte auf OK um fortzufahren.
-search.title=Suchparameter
-search=Bitte geben Sie die Parameter für den entfernten Server ein:
-cso.title=CSO/ph-Anfrage
-cso=Bitte geben Sie die zu suchenden Schlagwörter (oder ein komplettes CSO/ph-Kommando beginnend mit 'query') ein.\n\nIhre Anfrage wird ohne Authentifizierung gesendet.
-csobogus.title=Ungültige CSO/ph-Anfrage
-csobogus=Die Anfrage konnte nicht durchgeführt werden, da weder ein Schlagwort noch ein Kommando angegeben wurde.
-baditype.title=Ungültiger Item-Typ
-baditype=Ihr Browser kann mit diesem Item-Typ leider nicht umgehen.
-swapitype.title=Wrong item type?
-swapitype=Usually menus are itemtype 1. Would you like the browser to fix this for you?
+network.gopher.description=Gopher-Erweiterung für Firefox
+hurl.error.title=Unsichere URL %S
+hurl.error=Diese URL verweist auf ein unsicheres Ziel. Die Weiterleitung wurde darum nicht durchgeführt.
+hurl.warning.title=Gopher hURL-Weiterleitung
+hurl.warning=Dieser Selektor leitet Sie zur folgenden URL weiter:\n\n\t%S\n\nFalls Sie diese URL nicht kennen, oder sich ihrer Vertrauenswürdigkeit unsicher sind, sollten Sie auf Abbrechen drücken. Andernfalls drücken Sie bitte auf OK um fortzufahren.
+search.title=Suchparameter
+search=Bitte geben Sie die Parameter für den entfernten Server ein:
+cso.title=CSO/ph-Anfrage
+cso=Bitte geben Sie die zu suchenden Schlagwörter (oder ein komplettes CSO/ph-Kommando beginnend mit 'query') ein.\n\nIhre Anfrage wird ohne Authentifizierung gesendet.
+csobogus.title=Ungültige CSO/ph-Anfrage
+csobogus=Die Anfrage konnte nicht durchgeführt werden, da weder ein Schlagwort noch ein Kommando angegeben wurde.
+baditype.title=Ungültiger Item-Typ
+baditype=Ihr Browser kann mit diesem Item-Typ leider nicht umgehen.
+swapitype.title=Wrong item type?
+swapitype=Usually menus are itemtype 1. Would you like the browser to fix this for you?
diff --git a/browser/gopher/locale/en-US/aboutp.properties b/browser/gopher/locale/en-US/aboutp.properties
deleted file mode 100644
index 4521de2067..0000000000
--- a/browser/gopher/locale/en-US/aboutp.properties
+++ /dev/null
@@ -1,13 +0,0 @@
-oinstalled=OverbiteFF appears to have been successfully installed.
-ostartwith=Start Gopher with
-v2=Search Veronica-2
-world=Floodgap list of servers
-blurb=The Gopher addon for Mozilla Firefox and SeaMonkey
-programming=Programming
-testers=Testers
-l10n=Localization/Internationalization
-allrights=All rights reserved.
-logolicense=The Overbite Mascot appears in OverbiteFF under a Creative Commons BY-NC-ND license.
-iconlicense=Certain icons and UI elements used in OverbiteFF originated with Netscape Navigator and the Mozilla Project, and appear under the terms of the Mozilla Public License. Adobe Acrobat and the Acrobat logo are registered trademarks of Adobe Systems, Inc.
-codelicense1=All other original content in OverbiteFF is distributed under the Mozilla Public License/GNU Public License/GNU Lesser Public License.
-codelicense2=Use outside of this license is strictly prohibited.
diff --git a/browser/gopher/locale/en-US/obff.properties b/browser/gopher/locale/en-US/obff.properties
index e94f43c68b..adca1790c0 100644
--- a/browser/gopher/locale/en-US/obff.properties
+++ b/browser/gopher/locale/en-US/obff.properties
@@ -1,4 +1,4 @@
-extensions.overbiteff.description=Gopher extension for Firefox
+network.gopher.description=Gopher extension for Firefox
hurl.error.title=Unsafe URL %S
hurl.error=This URL contains an unsafe target for redirection and has been suppressed.
hurl.warning.title=Gopher hURL redirect
diff --git a/browser/gopher/locale/es-ES/aboutp.properties b/browser/gopher/locale/es-ES/aboutp.properties
deleted file mode 100644
index 3faaecdae9..0000000000
--- a/browser/gopher/locale/es-ES/aboutp.properties
+++ /dev/null
@@ -1,13 +0,0 @@
-oinstalled=OverbiteFF parece haber instalado correctamente.
-ostartwith=Iniciar Gopher con
-v2=Buscar Veronica-2
-world=Lista de servidores Floodgap
-blurb=Complemento Gopher para Mozilla Firefox y SeaMonkey
-programming=Programación
-testers=Probadores
-l10n=Localización/Internacionalización
-allrights=Reservados Todos los Derechos.
-logolicense=El Overbite Mascot aparece en OverbiteFF bajo licencias Creative Commons BY-NC-ND.
-iconlicense=Ciertos iconos y elementos UI usados en OverbiteFF se originaron con Netscape Navigator y proyecto Mozilla, y aparecen bajo los términos de Mozilla Public License. Adobe Acrobat y el logo Acrobat son marcas registradas de Adobe Systems, Inc.
-codelicense1=Cualquier otro contenido original en OverbiteFF se distribuye bajo Mozilla Public License/GNU Public License/GNU Lesser Public License.
-codelicense2=Está estrictamente prohibido el uso fuera de los terminos de esta licencia.
diff --git a/browser/gopher/locale/es-ES/obff.properties b/browser/gopher/locale/es-ES/obff.properties
index 8180823944..c7281a8bbd 100644
--- a/browser/gopher/locale/es-ES/obff.properties
+++ b/browser/gopher/locale/es-ES/obff.properties
@@ -1,4 +1,4 @@
-extensions.overbiteff.description=Extensión Gopher para Firefox
+network.gopher.description=Extensión Gopher para Firefox
hurl.error.title=URL Insegura %S
hurl.error=Esta URL contiene un destino de reorientación inseguro y ha sido suprimida.
hurl.warning.title=Redirección Gopher hURL
diff --git a/browser/gopher/locale/fr-FR/aboutp.properties b/browser/gopher/locale/fr-FR/aboutp.properties
deleted file mode 100644
index f8a455e284..0000000000
--- a/browser/gopher/locale/fr-FR/aboutp.properties
+++ /dev/null
@@ -1,13 +0,0 @@
-oinstalled=OverbiteFF semble avoir été installée avec succès.
-ostartwith=Démarrer sur Gopher avec
-v2=Recherche Veronica-2
-world=Liste de serveurs Floodgap
-blurb=Extension Gopher pour Mozilla Firefox et SeaMonkey
-programming=Programmation
-testers=Testeurs
-l10n=Localisation/Internationalisation
-allrights=Tous droits réservés.
-logolicense=La mascotte Overbite apparaît dans OverbiteFF sous licence Creative Commons BY-NC-ND.
-iconlicense=Certains éléments de l'interface graphique et icônes utilisés dans OverbiteFF viennent de Netscape Navigator et du Projet Mozilla, et sont couverts par la licence publique Mozilla. Adobe Acrobat et le logo Acrobat sont des marques déposées d'Adobe Systems, Inc.
-codelicense1=Tout autre contenu original dans OverbiteFF est distribué sous Mozilla Public License/GNU Public License/GNU Lesser Public License.
-codelicense2=L'utilisation en dehors du cadre de ces licences est strictement interdite.
diff --git a/browser/gopher/locale/fr-FR/obff.properties b/browser/gopher/locale/fr-FR/obff.properties
index 664ac151ba..2ac126bbda 100644
--- a/browser/gopher/locale/fr-FR/obff.properties
+++ b/browser/gopher/locale/fr-FR/obff.properties
@@ -1,4 +1,4 @@
-extensions.overbiteff.description=Extension Gopher pour Firefox
+network.gopher.description=Extension Gopher pour Firefox
hurl.error.title=URL peu sûr %S
hurl.error=Cet URL contient une cible de redirection peu sûre et a été supprimée.
hurl.warning.title=Redirection hURL Gopher
diff --git a/browser/gopher/locale/hu-HU/aboutp.properties b/browser/gopher/locale/hu-HU/aboutp.properties
deleted file mode 100644
index 16496b1757..0000000000
--- a/browser/gopher/locale/hu-HU/aboutp.properties
+++ /dev/null
@@ -1,13 +0,0 @@
-oinstalled=Úgy fest, hogy az OverbiteFF sikeresen installálva lett.
-ostartwith=A Gopher elindítása:
-v2=Veronica-2 keresés
-world=Floodgap szerverlista
-blurb=A Gopher kiegészítés Mozilla Firefox/SeaMonkey-hoz
-programming=Programozás
-testers=Tesztelés
-l10n=Honosítás
-allrights=Minden jog fenntartva.
-logolicense=Az Overbite kabala a Creative Commons BY-NC-ND licensz alatt jelenik meg az OverbiteFF-ben.
-iconlicense=Az OverbiteFF bizonyos ikonjai és felhasználói felület-elemei a Netscape Navigator-ból és a Mozilla Project-től erednek, és a Mozilla Public License alatt jelennek meg. Az Adobe Acrobat és az Acrobat logo az Adobe Systems, Inc. védjegye.
-codelicense1=Minden más eredeti tartalmat az OverbiteFF-ben a Mozilla Public License, a GNU Public License vagy a GNU Lesser Public License szerint terjesztünk.
-codelicense2=Bármilyen felhasználás, ami ezen a licenszen kívül esik, szigorúan tilos.
diff --git a/browser/gopher/locale/hu-HU/obff.properties b/browser/gopher/locale/hu-HU/obff.properties
index 85f0e6ef93..3aef92a5a7 100644
--- a/browser/gopher/locale/hu-HU/obff.properties
+++ b/browser/gopher/locale/hu-HU/obff.properties
@@ -1,4 +1,4 @@
-extensions.overbiteff.description=Gopher kiegészítés a Firefox-hoz
+network.gopher.description=Gopher kiegészítés a Firefox-hoz
hurl.error.title=Nem biztonságos URL %S
hurl.error=Ez az URL átirányítást tartalmaz egy nem biztonságos címre, ezért figyelmen kívül hagytam.
hurl.warning.title=Gopher hURL átirányítás
diff --git a/browser/gopher/locale/ja-JP/aboutp.properties b/browser/gopher/locale/ja-JP/aboutp.properties
deleted file mode 100644
index 1b38c85be7..0000000000
--- a/browser/gopher/locale/ja-JP/aboutp.properties
+++ /dev/null
@@ -1,13 +0,0 @@
-oinstalled=OverbiteFFのインストールが成功された。
-ostartwith=Gopherを起動：
-v2=Veronica-2で検索
-world=Floodgapのサーバ一覧
-blurb=GopherのMozilla FirefoxとSeaMonkey拡張機能
-programming=開発
-testers=テスト
-l10n=地域化・国際化
-allrights=無断複写・転載を禁じます。
-logolicense=オーバーバイト・マスコットはクリエイティブ・コモンズの表示-非営利-改変禁止ライセンスの下でOverbiteFFに利用されている。
-iconlicense=OverbiteFFで利用されているアイコンとユーザー・インターフェース要素の一部はNetscape NavigatorおよびMozilla計画に考案されて、Mozilla Public Licenseの下で利用されています。Adobe AcrobatとAcrobatのロゴはAdobe Systems Incorporatedの登録商標です。
-codelicense1=その他すべてのOverbiteFFのオリジナルコンテンツはMozilla Public License・GNU一般公衆利用許諾契約書・GNU劣等一般公衆利用許諾契約書の下で配布している。
-codelicense2=以上のライセンスに定めていない利用は固く禁じられる。
diff --git a/browser/gopher/locale/ja-JP/obff.properties b/browser/gopher/locale/ja-JP/obff.properties
index f952262cd8..a83478a506 100644
--- a/browser/gopher/locale/ja-JP/obff.properties
+++ b/browser/gopher/locale/ja-JP/obff.properties
@@ -1,4 +1,4 @@
-extensions.overbiteff.description=GopherのFirefox拡張機能
+network.gopher.description=GopherのFirefox拡張機能
hurl.error.title=危険なURL：%S
hurl.error=このURLは危険なリダイレクト先を含んでいるため抑制された。
hurl.warning.title=Gopher hURLリダイレクト
diff --git a/browser/gopher/locale/nb-NO/aboutp.properties b/browser/gopher/locale/nb-NO/aboutp.properties
deleted file mode 100644
index d7224b99b0..0000000000
--- a/browser/gopher/locale/nb-NO/aboutp.properties
+++ /dev/null
@@ -1,13 +0,0 @@
-oinstalled=OverbiteFF-installasjonen var vellykket.
-ostartwith=Start Gopher med
-v2=Søk med Veronica-2
-world=Floodgaps liste over servere
-blurb=Gopher-utvidelse til Mozilla Firefox og SeaMonkey
-programming=Programmering
-testers=Testere
-l10n=Lokalisering/Internasjonalisering
-allrights=Alle rettigheter forbeholdes.
-logolicense=Overbite maskotten fremvises i OverbiteFF under Creative Commons BY-NC-ND lisensen.
-iconlicense=Visse ikoner og GUI elementer brukt i OverbiteFF stammer opprinnelig fra Netscape Navigator og Mozilla Project, og er underlagt vilkårene fra Mozilla Public License. Adobe Acrobat og Acrobat logoen er registered varemerker av Adobe Systems, Inc.
-codelicense1=Alt annet av orginalt materiale i OverbiteFF er distribuert under Mozilla Public License/GNU Public License/GNU Lesser Public License.
-codelicense2=Bruk utenfor denne lisensen er strengt forbudt.
diff --git a/browser/gopher/locale/nb-NO/obff.properties b/browser/gopher/locale/nb-NO/obff.properties
index a9572ead12..1644e64757 100644
--- a/browser/gopher/locale/nb-NO/obff.properties
+++ b/browser/gopher/locale/nb-NO/obff.properties
@@ -1,13 +1,13 @@
-extensions.overbiteff.description=Gopher utvidelse til firefox
+network.gopher.description=Gopher utvidelse til firefox
hurl.error.title=Usikker URL %S
hurl.error=Denne URL peker mot et usikker mål for videresending og har blitt utestengt.
-hurl.warning.title=Gopher hURL videresending
+hurl.warning.title=Gopher hURL videresending
hurl.warning=Dette elementet vil videresende deg til følgende URL:\n\n\t%S\n\nHvis du ikke gjenkjenner eller stoler på denne URLen, må du trykke Cancel. Ellers trykk OK for å fortsette.
search.title=Angi parametere
search=Angi parametere som verten skal behandle:
cso.title=Angi CSO/ph forespørsel
cso=Angi nøkkelord som skal søkes etter (eller en fulstendig CSO/ph kommando som begynner med 'query').\n\nDin forespørsel vil bli sendt uten noen signatur.
-csobogus.title=Ugyldig CSO/ph forespørsel
+csobogus.title=Ugyldig CSO/ph forespørsel
csobogus=Denne forespørselen har blitt annulert da ingen kommando eller nøkkelord ble mottatt..
baditype.title=Ugyldig element type
baditype=Dette elementet kan ikke vises direkte i din nettleser.
diff --git a/browser/gopher/locale/nl-NL/aboutp.properties b/browser/gopher/locale/nl-NL/aboutp.properties
deleted file mode 100644
index b5fb3ccebf..0000000000
--- a/browser/gopher/locale/nl-NL/aboutp.properties
+++ /dev/null
@@ -1,13 +0,0 @@
-oinstalled=OverbiteFF lijkt succesvol te zijn geïnstalleerd.
-ostartwith=Start Gopher met
-v2=Veronica-2 doorzoeken
-world=Floodgap serverlijst
-blurb=De Gopher add-on voor Mozilla Firefox en SeaMonkey
-programming=Programmeren
-testers=Testers
-l10n=Internationalisatie/Lokalisatie
-allrights=Alle rechten voorbehouden.
-logolicense=De Overbite Mascotte als onderdeel van OverbiteFF valt onder de Creative Commons BY-NC-ND licentie.
-iconlicense=Sommige pictogrammen en UI elementen die door OverbiteFF gebruikt worden komen van Netscape Navigator en het Mozilla Project. Deze vallen onder de voorwaarden van de Mozilla Public License. Adobe Acrobat en het Acrobat logo zijn geregistreerde handelsmerken van Adobe Systems, Inc.
-codelicense1=Alle andere originele werken in OverbiteFF zijn verspreid onder de Mozilla Public License/GNU Public License/GNU Lesser Public License.
-codelicense2=Gebruik buiten deze licentie is streng verboden.
diff --git a/browser/gopher/locale/nl-NL/obff.properties b/browser/gopher/locale/nl-NL/obff.properties
index dee53f758d..fb9ad7859d 100644
--- a/browser/gopher/locale/nl-NL/obff.properties
+++ b/browser/gopher/locale/nl-NL/obff.properties
@@ -1,9 +1,9 @@
-extensions.overbiteff.description=Gopherextensie voor Firefox
+network.gopher.description=Gopherextensie voor Firefox
hurl.error.title=Onveilige URL %S
hurl.error=Deze URL bevat een onveilige doorverwijzing en is daarom geblokkeerd.
hurl.warning.title=Gopher-hURL-doorverwijzing
hurl.warning=Deze selector zal u doorsturen naar de volgende nieuwe URL:\n\n\t%S\n\nAls u deze URL niet herkend of vertrouwd, klik dan op Annuleren. Klik anders op OK om door te gaan.
-search.title=Voer zoektermen in
+search.title=Voer zoektermen in
search=Geef de zoektermen op die de server moet verwerken:
cso.title=Voer de CS/ph zoekterm in
cso=Voer zoektermen in (of een complete CSO/ph opdracht door te beginnen met 'query').\n\nUw verzoek zal zonder authenticatie worden verstuurd.
diff --git a/browser/gopher/locale/pl-PL/aboutp.properties b/browser/gopher/locale/pl-PL/aboutp.properties
deleted file mode 100644
index 05a4bf82e3..0000000000
--- a/browser/gopher/locale/pl-PL/aboutp.properties
+++ /dev/null
@@ -1,13 +0,0 @@
-oinstalled=OverbiteFF wydaje się być zainstalowany pomyślnie.
-ostartwith=Rozpocznij gopherowanie poprzez
-v2=wyszukiwarkę Veronica-2
-world=Lista serwerów na Floodgap
-blurb=Rozszerzenie Gopher dla Mozilla Firefox/SeaMonkey
-programming=Programowanie
-testers=Testerzy
-l10n=Lokalizacja
-allrights=Wszelkie prawa zastrzeżone.
-logolicense=Maskotka Overbite zawarta w OverbiteFF znajduje się pod licencją Creative Commons BY-NC-ND.
-iconlicense=Niektóre ikony i elementy interfejsu użytkownika zastosowane w OverbiteFF mają źródło w Netscape Navigator oraz Mozilla Project, wykorzystano na zasadach Mozilla Public License.
-codelicense1=Pozostałe treści OverbiteFF są rozpowszechniane na zasadach Mozilla Public License/GNU Public License/GNU Lesser Public License.
-codelicense2=Użytkowanie niezgodne z licencją surowo wzbronione.
diff --git a/browser/gopher/locale/pl-PL/obff.properties b/browser/gopher/locale/pl-PL/obff.properties
index 15cb155e26..31135c6c7f 100644
--- a/browser/gopher/locale/pl-PL/obff.properties
+++ b/browser/gopher/locale/pl-PL/obff.properties
@@ -1,4 +1,4 @@
-extensions.overbiteff.description=Rozszerzenie protokołu Gopher dla Firefox
+network.gopher.description=Rozszerzenie protokołu Gopher dla Firefox
hurl.error.title=Niepewny URL %S
hurl.error=Ten URL zawiera niepewny cel przekierowania i został wstrzymany.
hurl.warning.title=Przekierowanie Gopher hURL
diff --git a/browser/gopher/locale/ru-RU/aboutp.properties b/browser/gopher/locale/ru-RU/aboutp.properties
deleted file mode 100644
index 981f372be2..0000000000
--- a/browser/gopher/locale/ru-RU/aboutp.properties
+++ /dev/null
@@ -1,13 +0,0 @@
-oinstalled=OverbiteFF успешно установлен.
-ostartwith=Начните с этих серверов
-v2=Поисковая система Veronica-2
-world=Каталог серверов gopher
-blurb=Расширение Gopher для Mozilla Firefox/SeaMonkey
-programming=Программирование
-testers=Тестирование
-l10n=Локализация/Интернационализация
-allrights=Все права защищены.
-logolicense=Overbite Mascot используется в OverbiteFF по лицензии Creative Commons BY-NC-ND.
-iconlicense=Некоторые значки и элементы интерфейса, используемые в OverbiteFF, заимствованы из Netscape Navigator и проекта Mozilla и используются в соответствии с Mozilla Public License. Adobe Acrobat и логотип Acrobat являются зарегистрированными торговыми марками Adobe Systems, Inc.
-codelicense1=Остальной оригинальный контент OverbiteFF распространяется в соответствии с Mozilla Public License/GNU Public License/GNU Lesser Public License.
-codelicense2=Использование, противоречащее этой лицензии, строго запрещено.
diff --git a/browser/gopher/locale/ru-RU/obff.properties b/browser/gopher/locale/ru-RU/obff.properties
index 07a53f6fa6..b88ed60780 100644
--- a/browser/gopher/locale/ru-RU/obff.properties
+++ b/browser/gopher/locale/ru-RU/obff.properties
@@ -1,4 +1,4 @@
-extensions.overbiteff.description=Расширение Gopher для Firefox
+network.gopher.description=Расширение Gopher для Firefox
hurl.error.title=Небезопасный URL %S
hurl.error=Этот URL отклонён, поскольку содержит переадресацию на небезопасный ресурс.
hurl.warning.title=Переадресация Gopher hURL
diff --git a/browser/gopher/locale/tr-TR/aboutp.properties b/browser/gopher/locale/tr-TR/aboutp.properties
deleted file mode 100644
index e8930e3476..0000000000
--- a/browser/gopher/locale/tr-TR/aboutp.properties
+++ /dev/null
@@ -1,13 +0,0 @@
-oinstalled=OverbiteFF başarılı bir şekilde kurulmuştur.
-ostartwith=Gopher için başlangıç sayfaları
-v2=Veronica-2 ile arama
-world=Floodgap'ın sunucu listesi
-blurb=Mozilla Firefox/SeaMonkey için Gopher eklentisi
-programming=Programlama
-testers=Deneyiciler
-l10n=Tercüme
-allrights=Tüm hakları saklıdır.
-logolicense=Overbite Maskotu OverbiteFF eklentisinde Creative Commons BY-NC-ND lisansı kapsamında bulunmaktadır.
-iconlicense=OverbiteFF'de kullanılan bazı ikonların ve arayüz unsurlarının kaynakları Netscape Navigator ile Mozilla Projesidir ve bu ikonlar Mozilla Kamu Lisansı kapsamındadır. Adobe Acrobat ve Acrobat logosu Adobe Systems, Inc. şirketinin tescilli markalarıdır.
-codelicense1=OverbiteFF'deki diğer tüm özgün içerik Mozilla Kamu Lisansı/GNU Genel Kamu Lisansı/GNU Daha Az Genel Kamu Lisansı kapsamında dağıtıma sunulmuştur.
-codelicense2=Bu lisansların dışında kullanımı yasaktır.
diff --git a/browser/gopher/locale/tr-TR/obff.properties b/browser/gopher/locale/tr-TR/obff.properties
index 7d7af200c0..9cc7de3f44 100644
--- a/browser/gopher/locale/tr-TR/obff.properties
+++ b/browser/gopher/locale/tr-TR/obff.properties
@@ -1,4 +1,4 @@
-extensions.overbiteff.description=Firefox için Gopher eklentisi
+network.gopher.description=Firefox için Gopher eklentisi
hurl.error.title=Güvenli olmayan URL %S
hurl.error=Bu URL yönlendirme için güvenli olmayan bir hedef içerir ve silinmiştir.
hurl.warning.title=Gopher hURL yönlendirme
diff --git a/browser/gopher/moz.build b/browser/gopher/moz.build
index a1a58436d2..7b4e9758aa 100644
--- a/browser/gopher/moz.build
+++ b/browser/gopher/moz.build
@@ -8,12 +8,10 @@ JAR_MANIFESTS += ['jar.mn']
FINAL_TARGET = 'dist/bin/browser'
FINAL_TARGET_FILES.components += [
- 'components/about.js',
- 'components/about.manifest',
'components/protocol.js',
'components/protocol.manifest',
]
FINAL_TARGET_FILES['defaults/preferences'] += [
- 'defaults/preferences/overbiteff.js',
+ 'defaults/preferences/gopher.js',
]
diff --git a/browser/installer/package-manifest.in b/browser/installer/package-manifest.in
index 1c7ac731d7..0d0b453f1c 100644
--- a/browser/installer/package-manifest.in
+++ b/browser/installer/package-manifest.in
@@ -360,8 +360,6 @@
@RESPATH@/browser/components/nsSetDefaultBrowser.js
@RESPATH@/browser/components/internaluserscripts.js
@RESPATH@/browser/components/internaluserscripts.manifest
-@RESPATH@/browser/components/about.manifest
-@RESPATH@/browser/components/about.js
@RESPATH@/browser/components/protocol.manifest
@RESPATH@/browser/components/protocol.js
@RESPATH@/browser/components/devtools-startup.manifest
@@ -634,7 +632,7 @@
@RESPATH@/browser/@PREF_DIR@/basilisk.js
@RESPATH@/browser/@PREF_DIR@/basilisk-branding.js
@RESPATH@/browser/@PREF_DIR@/internaluserscripts.js
-@RESPATH@/browser/@PREF_DIR@/overbiteff.js
+@RESPATH@/browser/@PREF_DIR@/gopher.js
@RESPATH@/goanna.js
@RESPATH@/defaults/autoconfig/prefcalls.js
@RESPATH@/browser/defaults/permissions