From 9feb7291da605e2b38dae5864af7afb9effcbb3e Mon Sep 17 00:00:00 2001
From: Ryan Nematz <rn10950@gmail.com>
Date: Fri, 22 Apr 2016 00:57:07 -0400
Subject: [PATCH] put finishing touches on 2.0

---
 editor/ui/locales/en-US/chrome/region/region.properties     | 2 +-
 mailnews/base/resources/locale/en-US/region.properties      | 6 +++---
 profile/defaults/bookmarks.html                             | 4 ++--
 suite/locales/en-US/installer/windows/README.txt            | 6 +++---
 xpfe/browser/resources/content/navigatorOverlay.xul         | 3 +++
 xpfe/browser/resources/locale/en-US/navigator.dtd           | 4 ++++
 xpfe/browser/resources/locale/en-US/region.properties       | 2 +-
 xpfe/communicator/resources/content/utilityOverlay.xul      | 6 ++++++
 xpfe/communicator/resources/locale/en-US/region.properties  | 2 +-
 xpfe/communicator/resources/locale/en-US/utilityOverlay.dtd | 3 +++
 xpfe/global/resources/content/aboutChangelog.html           | 2 ++
 xpfe/global/resources/content/aboutHome.html                | 2 +-
 xpfe/global/resources/locale/en-US/builtinURLs.rdf          | 2 +-
 xpfe/global/resources/locale/en-US/region.dtd               | 2 +-
 14 files changed, 32 insertions(+), 14 deletions(-)

diff --git a/editor/ui/locales/en-US/chrome/region/region.properties b/editor/ui/locales/en-US/chrome/region/region.properties
index cfe5adfd3..2238b724a 100644
--- a/editor/ui/locales/en-US/chrome/region/region.properties
+++ b/editor/ui/locales/en-US/chrome/region/region.properties
@@ -1,5 +1,5 @@
 #
 # editor.js
 # editor.properties
-editor.throbber.url=https://sites.google.com/site/rn10950mozilla/retrozilla
+editor.throbber.url=http://retrozilla.no-ip.org
 editor.spellcheckers.url=https://en-us.add-ons.mozilla.org/en-US/seamonkey/1.1/dictionaries/
diff --git a/mailnews/base/resources/locale/en-US/region.properties b/mailnews/base/resources/locale/en-US/region.properties
index b26431b72..a98bb8620 100644
--- a/mailnews/base/resources/locale/en-US/region.properties
+++ b/mailnews/base/resources/locale/en-US/region.properties
@@ -2,9 +2,9 @@
 # messenger.properties
 # mailnews.js
 mailnews.start_page.url=chrome://messenger/content/start.xhtml
-messenger.throbber.url=https://sites.google.com/site/rn10950mozilla/retrozilla
-compose.throbber.url=https://sites.google.com/site/rn10950mozilla/retrozilla
-addressbook.throbber.url=https://sites.google.com/site/rn10950mozilla/retrozilla
+messenger.throbber.url=http://retrozilla.no-ip.org
+compose.throbber.url=http://retrozilla.no-ip.org
+addressbook.throbber.url=http://retrozilla.no-ip.org
 # To make mapit buttons to disappear in the addressbook, specify empty string.  For example:
 # mail.addr_book.mapit_url.format=
 # The format for "mail.addr_book.mapit_url.format" is:
diff --git a/profile/defaults/bookmarks.html b/profile/defaults/bookmarks.html
index ecdcdc727..46caa0124 100644
--- a/profile/defaults/bookmarks.html
+++ b/profile/defaults/bookmarks.html
@@ -9,7 +9,7 @@ <H1>Bookmarks</H1>
 <DL><p>
     <DT><H3 PERSONAL_TOOLBAR_FOLDER="true" ID="NC:PersonalToolbarFolder">Personal Toolbar Folder</H3>
     <DL><p>
-        <DT><A HREF="https://sites.google.com/site/rn10950mozilla/retrozilla">RetroZilla</A>
+        <DT><A HREF="http://retrozilla.no-ip.org">RetroZilla</A>
         <DT><A HREF="http://www.mozillazine.org/">mozillaZine</A>
         <DT><A HREF="http://www.mozdev.org/">mozdev.org</A>
     </DL><p>
@@ -18,7 +18,7 @@ <H1>Bookmarks</H1>
         <DT><H3>mozilla.org</H3>
         <DL><p>
             <DT><A HREF="http://www.mozilla.org/">The Mozilla Organization</A>
-            <DT><A HREF="https://sites.google.com/site/rn10950mozilla/retrozilla">RetroZilla Project</a>
+            <DT><A HREF="http://retrozilla.no-ip.org">RetroZilla Project</a>
             <DT><A HREF="http://www.mozilla.org/products/">Mozilla Products</A>
             <DT><A HREF="http://www.mozilla.org/feedback.html">Feedback</A>
         </DL><p>
diff --git a/suite/locales/en-US/installer/windows/README.txt b/suite/locales/en-US/installer/windows/README.txt
index d088ac077..6a3a02c06 100644
--- a/suite/locales/en-US/installer/windows/README.txt
+++ b/suite/locales/en-US/installer/windows/README.txt
@@ -12,7 +12,7 @@ installation instructions for the Windows builds of RetroZilla.
 
 For more info on RetroZilla, see 
 
-  https://sites.google.com/site/rn10950mozilla/retrozilla
+  http://retrozilla.no-ip.org
 
 To submit bugs or other feedback, see the Navigator QA menu and check out
 GitHub at https://github.com/rn10950/RetroZilla for links to known bugs,
@@ -34,7 +34,7 @@ Keep in mind that the source code in its raw form may be buggy. If you are
 looking for a more polished version of RetroZilla, the RetroZilla project 
 releases builds of RetroZilla regularly that you can download from
 
-  https://sites.google.com/site/rn10950mozilla/retrozilla
+  http://retrozilla.no-ip.org
  
 Be sure to read the RetroZilla release notes for information on known
 problems and installation issues with RetroZilla.  The release notes 
@@ -92,7 +92,7 @@ released builds may cause problems.
 Note: These instructions do not tell you how to build RetroZilla.
 For info on building RetroZilla from the mozilla.org source code, see
 
-  https://sites.google.com/site/rn10950mozilla/retrozilla/build
+  http://rzContribute.ddns.net/
 
 
 Windows Installation Instructions
diff --git a/xpfe/browser/resources/content/navigatorOverlay.xul b/xpfe/browser/resources/content/navigatorOverlay.xul
index 5d9b4a6f1..fcaa75414 100644
--- a/xpfe/browser/resources/content/navigatorOverlay.xul
+++ b/xpfe/browser/resources/content/navigatorOverlay.xul
@@ -115,6 +115,7 @@
 
     <!-- Tools Menu -->
     <key id="searchInternetKb" key="&searchInternet.commandKey;" modifiers="accel,shift" command="Browser:SearchInternet"/>
+    <key id="extensionsMenu" key="&extensionsMenu.commandKey;" modifiers="accel,shift" command="Browser:getExtensions"/>
 
     <!-- Misc -->
           <!-- the amazing fishcam dept. -->
@@ -199,6 +200,7 @@
 
     <!-- Tools Menu -->
     <command id="Browser:SearchInternet" oncommand="BrowserSearchInternet();"/>
+    <command id="Browser:getExtensions" oncommand="openTopWin('http://rzExtensions.ddns.net')"/>
 
   </commandset>
 
@@ -486,6 +488,7 @@
     <menupopup id="taskPopup">
       <menuitem id="menu_searchWeb" label="&searchInternetCmd.label;" key="searchInternetKb" accesskey="&searchInternetCmd.accesskey;" command="Browser:SearchInternet"/>
       <menuitem id="menu_translate" label="&translateMenu.label;" accesskey="&translateMenu.accesskey;" oncommand="Translate();"/>  
+      <menuitem id="menu_getExtensions" label="&extensionsMenu.label;" accesskey="&extensionsMenu.accesskey;" command="Browser:getExtensions"/>  
       <menuseparator id="navBeginGlobalItems"/>
     </menupopup>
   </menu>
diff --git a/xpfe/browser/resources/locale/en-US/navigator.dtd b/xpfe/browser/resources/locale/en-US/navigator.dtd
index a247c5922..c63331465 100644
--- a/xpfe/browser/resources/locale/en-US/navigator.dtd
+++ b/xpfe/browser/resources/locale/en-US/navigator.dtd
@@ -76,6 +76,10 @@
 <!ENTITY translateMenu.accesskey "T">
 <!ENTITY translate.commandKey "t">
 
+<!ENTITY extensionsMenu.label "Get Extensions">
+<!ENTITY extensionsMenu.accesskey "E">
+<!ENTITY extensionsMenu.commandKey "e">
+
 <!ENTITY closeOtherTabs.label "Close Other Tabs">
 <!ENTITY closeWindow.label "Close Window">
 
diff --git a/xpfe/browser/resources/locale/en-US/region.properties b/xpfe/browser/resources/locale/en-US/region.properties
index d01bc9e6f..9072877a8 100644
--- a/xpfe/browser/resources/locale/en-US/region.properties
+++ b/xpfe/browser/resources/locale/en-US/region.properties
@@ -8,7 +8,7 @@ otherSearchURL=http://www.google.com
 # all.js
 #
 browser.startup.homepage=about:home
-browser.throbber.url=https://sites.google.com/site/rn10950mozilla/retrozilla
+browser.throbber.url=http://retrozilla.no-ip.org
 browser.search.defaulturl=http://www.google.com/search?q=
 general.useragent.contentlocale=US
 
diff --git a/xpfe/communicator/resources/content/utilityOverlay.xul b/xpfe/communicator/resources/content/utilityOverlay.xul
index a445c6991..c7cdf2d5d 100644
--- a/xpfe/communicator/resources/content/utilityOverlay.xul
+++ b/xpfe/communicator/resources/content/utilityOverlay.xul
@@ -293,6 +293,12 @@
 
       <menuseparator id="menu_HelpAboutSeparator"/>
 
+      <menuitem class="about"
+                accesskey="&contributeCmd.accesskey;"
+                label="&contributeCmd.label;"
+                id="contributeCmd"
+                oncommand="openTopWin('http://rzcontribute.ddns.net')"/>
+				
       <menuitem class="about"
                 accesskey="&aboutCommPluginsCmd.accesskey;"
                 label="&aboutCommPluginsCmd.label;"
diff --git a/xpfe/communicator/resources/locale/en-US/region.properties b/xpfe/communicator/resources/locale/en-US/region.properties
index 3af3a4cfe..239f3ef69 100644
--- a/xpfe/communicator/resources/locale/en-US/region.properties
+++ b/xpfe/communicator/resources/locale/en-US/region.properties
@@ -7,4 +7,4 @@ browser.search.defaultenginename=Google
 intl.content.langcode=en-US
 
 # update notifications: new update page
-update_notifications.provider.0.datasource=https://sites.google.com/site/rn10950mozilla/retrozilla/releases/updates/en-US.rdf
+update_notifications.provider.0.datasource=http://retrozilla.no-ip.org/releases/updates/en-US.rdf
diff --git a/xpfe/communicator/resources/locale/en-US/utilityOverlay.dtd b/xpfe/communicator/resources/locale/en-US/utilityOverlay.dtd
index 4d6b3cbd2..8a69fb5c1 100644
--- a/xpfe/communicator/resources/locale/en-US/utilityOverlay.dtd
+++ b/xpfe/communicator/resources/locale/en-US/utilityOverlay.dtd
@@ -71,6 +71,9 @@
 <!ENTITY aboutCommPluginsCmd.label			"About Plug-ins">
 <!ENTITY aboutCommPluginsCmd.accesskey			"p">
 
+<!ENTITY contributeCmd.label			"Contribute to RetroZilla">
+<!ENTITY contributeCmd.accesskey			"o">
+
 <!ENTITY direct.label                                   "Online (Proxy: None)">
 <!ENTITY direct.accesskey                               "N">
 <!ENTITY manual.label                                   "Online (Proxy: Manual)">
diff --git a/xpfe/global/resources/content/aboutChangelog.html b/xpfe/global/resources/content/aboutChangelog.html
index 8eb7bc0e4..6c1e9dad5 100644
--- a/xpfe/global/resources/content/aboutChangelog.html
+++ b/xpfe/global/resources/content/aboutChangelog.html
@@ -19,6 +19,8 @@ <h3>New Features</h3>
 			<li>New Home Page: about:home.</li>
 			<li>about:changelog.</li>
 			<li>Session Manager and Crash Restore system</li>
+			<li>Updated internal URLs to reflect new website</li>
+			<li>Added Get Extensions link to Tools menu and Contribute link to Help menu</li>
 		</ul>
 		<h3>Bug Fixes</h3>
 		<ul>
diff --git a/xpfe/global/resources/content/aboutHome.html b/xpfe/global/resources/content/aboutHome.html
index 22a202522..4a9374082 100644
--- a/xpfe/global/resources/content/aboutHome.html
+++ b/xpfe/global/resources/content/aboutHome.html
@@ -19,7 +19,7 @@
 		</div>
 		<div id="rzFooter">
 			<p id="rzFooterText">
-				<a href="https://sites.google.com/site/rn10950mozilla/retrozilla" class="rzFooterlink">
+				<a href="http://retrozilla.no-ip.org" class="rzFooterlink">
 					RetroZilla
 				</a>
 				 - 
diff --git a/xpfe/global/resources/locale/en-US/builtinURLs.rdf b/xpfe/global/resources/locale/en-US/builtinURLs.rdf
index 54a18d125..c18098232 100644
--- a/xpfe/global/resources/locale/en-US/builtinURLs.rdf
+++ b/xpfe/global/resources/locale/en-US/builtinURLs.rdf
@@ -58,7 +58,7 @@
 
   <RDF:Description about='urn:clienturl:viewmenu:intlwebcontent'>
     <NC:title>International Languages and Web Content</NC:title>
-    <NC:content>https://sites.google.com/site/rn10950mozilla/retrozilla/releases/#l10n</NC:content>
+    <NC:content>http://retrozilla.no-ip.org/releases/#l10n</NC:content>
   </RDF:Description>
 
   <!-- Composer -->
diff --git a/xpfe/global/resources/locale/en-US/region.dtd b/xpfe/global/resources/locale/en-US/region.dtd
index 6b42c3bbc..d7c1e502f 100644
--- a/xpfe/global/resources/locale/en-US/region.dtd
+++ b/xpfe/global/resources/locale/en-US/region.dtd
@@ -1,5 +1,5 @@
 <!-- brand.dtd -->
-<!ENTITY  vendorURL             "https://sites.google.com/site/rn10950mozilla/retrozilla">
+<!ENTITY  vendorURL             "http://retrozilla.no-ip.org">
 #expand <!ENTITY  releaseURL            "about:changelog">
 <!ENTITY  getNewThemesURL       "http://www.mozilla.org/themes/download/">
 #expand <!ENTITY  content.version       "__MOZILLA_REGION_VERSION__">