From 570d846f6192712e8dd392cfa936ff84c854176a Mon Sep 17 00:00:00 2001
From: lovelywcm <lovelywcm@gmail.com>
Date: Sat, 21 Feb 2009 13:26:01 +0800
Subject: [PATCH] string optimize continues...

---
 IAutoProxy.idl                            | 10 ++--
 addChecksum.pl                            |  2 +-
 chrome/content/about.xul                  | 72 +----------------------
 chrome/content/contents.rdf               |  4 +-
 chrome/content/filterStorage.js           | 14 ++---
 chrome/content/settings.js                | 12 ++--
 chrome/content/settings.xul               |  2 +-
 chrome/content/subscriptionClasses.js     |  4 +-
 chrome/content/synchronizer.js            |  2 +-
 chrome/locale/en-US/about.dtd             |  2 +-
 chrome/locale/en-US/composer.dtd          |  6 +-
 chrome/locale/en-US/global.properties     | 18 +++---
 chrome/locale/en-US/overlay.dtd           | 16 ++---
 chrome/locale/en-US/settings.dtd          |  8 +--
 chrome/locale/en-US/sidebar.dtd           |  4 +-
 chrome/locale/en-US/subscription.dtd      |  2 +-
 chrome/locale/en-US/tip_subscriptions.dtd |  8 +--
 generateLocaleContentsRDF.pl              |  2 +-
 make_release.pl                           | 10 ++--
 validateChecksum.pl                       |  2 +-
 20 files changed, 66 insertions(+), 134 deletions(-)

diff --git a/IAutoProxy.idl b/IAutoProxy.idl
index 6ee9b07..68ca91c 100644
--- a/IAutoProxy.idl
+++ b/IAutoProxy.idl
@@ -25,7 +25,7 @@
 #include "nsISupports.idl"
 
 [scriptable, uuid(2a311a4f-f32b-472a-9fc9-f1b1529924ad)]
-interface IAdblockPlusSubscription: nsISupports
+interface IAutoProxySubscription: nsISupports
 {
   /**
    * Subscription identifier, this is its URL unless the attribute external is set
@@ -89,7 +89,7 @@ interface IAdblockPlusSubscription: nsISupports
 };
 
 [scriptable, uuid(6e70a4b4-bef8-b0b3-25a2-62146012352b)]
-interface IAdblockPlus : nsISupports
+interface IAutoProxy : nsISupports
 {
   /**
    * Number of subscriptions in the list
@@ -101,14 +101,14 @@ interface IAdblockPlus : nsISupports
    *
    * @param id        subscription identifier
   */
-  IAdblockPlusSubscription getSubscription(in AString id);
+  IAutoProxySubscription getSubscription(in AString id);
 
   /**
    * Retrieves a subscription by its position in the list.
    *
    * @param index     index of the subscription in the list
   */
-  IAdblockPlusSubscription getSubscriptionAt(in PRInt32 index);
+  IAutoProxySubscription getSubscriptionAt(in PRInt32 index);
 
   /**
    * Adds an external subscription or updates subscription's patterns if it
@@ -152,7 +152,7 @@ interface IAdblockPlus : nsISupports
   void removePatterns([array, size_is(length)] in wstring patterns, in unsigned long length);
 
   /**
-   * Returns the installed version of Adblock Plus.
+   * Returns the installed version of AutoProxy.
   */
   AString getInstalledVersion();
 };
diff --git a/addChecksum.pl b/addChecksum.pl
index a95b53c..b47045a 100644
--- a/addChecksum.pl
+++ b/addChecksum.pl
@@ -2,7 +2,7 @@
 
 #############################################################################
 # This is a reference script to add checksums to downloadable               #
-# subscriptions. The checksum will be validated by Adblock Plus on download #
+# subscriptions. The checksum will be validated by AutoProxy on download    #
 # and checksum mismatches (broken downloads) will be rejected.              #
 #                                                                           #
 # To add a checksum to a subscription file, run the script like this:       #
diff --git a/chrome/content/about.xul b/chrome/content/about.xul
index 5e66258..7f74414 100644
--- a/chrome/content/about.xul
+++ b/chrome/content/about.xul
@@ -32,7 +32,7 @@
 <dialog
   xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
   title="&dialog.title;"
-  id="adblockAboutWindow"
+  id="autoProxyAboutWindow"
   windowtype="aup:about"
   onload="fillInVersion()"
   buttons="accept">
@@ -58,75 +58,7 @@
 
   <description id="contributorsTitle" value="&contributors.label;"/>
   <vbox id="contributorsBox">
-    <description value="Ahmad Zhafir - Malay translation"/>
-    <description value="Ahmet Serkan Tıratacı - Turkish translation"/>
-    <description value="Aigar Vals - Estonian translation"/>
-    <description value="Alexander Mihalkin - &quot;Morpeh Rus List&quot; filter subscription"/>
-    <description value="Antonio Urquia - Spanish translation of the Element Hiding Helper extension"/>
-    <description value="Ares2 - &quot;Ares' ABP Liste&quot; filter subscription"/>
-    <description value="Bahram Maravandi - Persian translation"/>
-    <description value="Baurzhan Muftakhidinov - Kazakh translation"/>
-    <description value="Bayarsaikhan Enkhtaivan - Mongolian translation"/>
-    <description value="Besmir Godole - Albanian translation of the Element Hiding Helper extension"/>
-    <description value="Blackdire - Chinese Simplified translation"/>
-    <description value="Brian Yi - &quot;Corset&quot; filter subscription"/>
-    <description value="Cédric Menge - &quot;Cédrics Liste&quot; filter subscription and many suggestions"/>
-    <description value="Claude Lespagnol aka Efdur - icons"/>
-    <description value="Claudio Périco - Brazilian Portuguese translation"/>
-    <description value="Dagobert_78 - French translation"/>
-    <description value="edo248 - Armenian translation"/>
-    <description value="Finn Sørensen - Danish translation"/>
-    <description value="Gárdonyi László - Hungarian translation"/>
-    <description value="Hatul - Hebrew translation"/>
-    <description value="Hrvoje Majer - Croatian translation"/>
-    <description value="Humberto Sartini - Brazilian Portuguese translation of the Element Hiding Helper extension"/>
-    <description value="Jacen - Slovak translation"/>
-    <description value="Jakub Tománek - Czech translation"/>
-    <description value="Jari Huttunen - Finnish translation of the Element Hiding Helper extension"/>
-    <description value="Jesús Vidal Panalés - Spanish translation"/>
-    <description value="jojaba - French translation"/>
-    <description value="Jonas Slivka - Lithuanian translation"/>
-    <description value="Joni Heinonen aka Akilles - Finnish translation"/>
-    <description value="Jose Sun - Chinese Traditional translation"/>
-    <description value="Kevin Keller - icons"/>
-    <description value="Kristján Bjarni Guðmundsson - Icelandic translation"/>
-    <description value="Leszek (teo) Życzkowski - Polish translation"/>
-    <description value="Luana Di Muzio - Italian translation"/>
-    <description value="Lukmanul Hakim - Indonesian translation"/>
-    <description value="Malte Kraus - &quot;Filter von Dr.Evil&quot; filter subscription"/>
-    <description value="Manuel Meixide - Galician translation"/>
-    <description value="Mark Heijl - Dutch translation of the Element Hiding Helper extension"/>
-    <description value="Mark Schlögel - German FAQ translation"/>
-    <description value="Mark Tyndall - British English translation"/>
-    <description value="Martin Srebotnjak - Slovenian translation"/>
-    <description value="MenetZ - &quot;ROList&quot; filter subscription"/>
-    <description value="Mikes Kaszmán István - Hungarian translation"/>
-    <description value="Moayad Mardini - Arabic translation"/>
-    <description value="MonztA - &quot;Filter von Dr.Evil&quot; filter subscription"/>
-    <description value="moZes - Frisian translation"/>
-    <description value="Navid Kashani - Persian translation"/>
-    <description value="NGUYỄN Mạnh Hùng - Vietnamese translation and &quot;Việt Nam List&quot; filter subscription"/>
-    <description value="Nickolay Ponomarev - start-up performance improvements"/>
-    <description value="Olexander Kasyanyuk - Ukrainian translation"/>
-    <description value="Paul Dicker - Dutch translation"/>
-    <description value="pirlouy - French translation and &quot;Liste FR&quot; filter subscription"/>
-    <description value="Premier - Japanese translation"/>
-    <description value="Raryel Costa Souza - Brasilian Portuguese translation"/>
-    <description value="Rick752 - EasyList filter subscription and many suggestions"/>
-    <description value="Rob Brown - Aardvark code reused in the Element Hiding Helper extension"/>
-    <description value="Robbie Groenewoudt - dutchblock filter subscription"/>
-    <description value="SiiiE - Hebrew translation"/>
-    <description value="srxo1978 - Spanish translation"/>
-    <description value="Stefan Lewitas - Swedish translation"/>
-    <description value="Stian Domben Bårdsen - Norwegian translation"/>
-    <description value="Suphanat Thitiphattharakon - Thai translation"/>
-    <description value="sushizang - Korean translation"/>
-    <description value="Thanos - Greek translation"/>
-    <description value="Timothy Babych - Ukrainian translation"/>
-    <description value="Toni Barrera - Catalan translation"/>
-    <description value="Tony Nguyen - Vietnamese translation"/>
-    <description value="ultravioletu - Romanian translation"/>
-    <description value="znaya - Portuguese translation"/>
+    <description value="WCM - Chinese and English translation"/>
     <spacer height="5"/>
     <description value="Wladimir Palant - Adblock Plus"/>
     <description value="Henrik Aasted Sorensen - original Adblock"/>
diff --git a/chrome/content/contents.rdf b/chrome/content/contents.rdf
index 0c7a6bc..ca45869 100644
--- a/chrome/content/contents.rdf
+++ b/chrome/content/contents.rdf
@@ -10,8 +10,8 @@
 
   <!-- package description -->
   <RDF:Description about="urn:mozilla:package:autoproxy"
-    chrome:displayName="Adblock Plus"
-    chrome:author="Wladimir Palant"
+    chrome:displayName="AutoProxy"
+    chrome:author="WCM"
     chrome:name="autoproxy"
     chrome:authorURL="http://autoproxy.org/"
     chrome:extension="true"
diff --git a/chrome/content/filterStorage.js b/chrome/content/filterStorage.js
index ce3bcd7..70e9a67 100644
--- a/chrome/content/filterStorage.js
+++ b/chrome/content/filterStorage.js
@@ -358,7 +358,7 @@ var filterStorage =
       this.file = getFileByPath(this.prefList.patternsfile[2]);   // Try default
 
     if (!this.file)
-      dump("Adblock Plus: Failed to resolve filter file location from extensions.autoproxy.patternsfile preference\n");
+      dump("AutoProxy: Failed to resolve filter file location from extensions.autoproxy.patternsfile preference\n");
 
     let stream = null;
     if (this.file)
@@ -374,7 +374,7 @@ var filterStorage =
         stream = stream.QueryInterface(Components.interfaces.nsIUnicharLineInputStream);
       }
       catch (e) {
-        dump("Adblock Plus: Failed to read filters from file " + this.file.path + ": " + e + "\n");
+        dump("AutoProxy: Failed to read filters from file " + this.file.path + ": " + e + "\n");
         stream = null;
       }
     }
@@ -432,7 +432,7 @@ var filterStorage =
 
   /**
    * Parses filter data from a stream. If the data contains user filters outside of filter
-   * groups (Adblock Plus 0.7.x data) these filters are returned - they need to be added
+   * groups (AutoProxy 0.7.x data) these filters are returned - they need to be added
    * separately.
    */
   parseIniFile: function(/**nsIUnicharLineInputStream*/ stream) /**Array of String*/
@@ -552,12 +552,12 @@ var filterStorage =
       stream.init(fileStream, "UTF-8", 16384, Components.interfaces.nsIConverterInputStream.DEFAULT_REPLACEMENT_CHARACTER);
     }
     catch (e) {
-      dump("Adblock Plus: failed to create file " + tempFile.path + ": " + e + "\n");
+      dump("AutoProxy: failed to create file " + tempFile.path + ": " + e + "\n");
       return;
     }
 
     const maxBufLength = 1024;
-    let buf = ["# Adblock Plus preferences", "version=" + this.formatVersion];
+    let buf = ["# AutoProxy preferences", "version=" + this.formatVersion];
     let lineBreak = aup.getLineBreak();
     function writeBuffer()
     {
@@ -568,7 +568,7 @@ var filterStorage =
       }
       catch (e) {
         stream.close();
-        dump("Adblock Plus: failed to write to file " + tempFile.path + ": " + e + "\n");
+        dump("AutoProxy: failed to write to file " + tempFile.path + ": " + e + "\n");
         try {
           tempFile.remove(false);
         }
@@ -615,7 +615,7 @@ var filterStorage =
       stream.close();
     }
     catch (e) {
-      dump("Adblock Plus: failed to close file " + tempFile.path + ": " + e + "\n");
+      dump("AutoProxy: failed to close file " + tempFile.path + ": " + e + "\n");
       try {
         tempFile.remove(false);
       }
diff --git a/chrome/content/settings.js b/chrome/content/settings.js
index 04507d7..34c8d22 100644
--- a/chrome/content/settings.js
+++ b/chrome/content/settings.js
@@ -468,7 +468,7 @@ function importList()
       lines.push(aup.normalizeFilter(line.value));
     stream.close();
 
-    if (/\[Adblock(?:\s*Plus\s*([\d\.]+)?)?\]/i.test(lines[0]))
+    if (/\[AutoProxy\s+\d\.\d\.\d\]/i.test(lines[0]))
     {
       let minVersion = RegExp.$1;
       let warning = "";
@@ -533,7 +533,7 @@ function exportList()
     saveDefaultDir(picker.file.parent.QueryInterface(Components.interfaces.nsILocalFile));
     let lineBreak = aup.getLineBreak();
 
-    let list = ["[Adblock]"];
+    let list = ["[AutoProxy]"];
     let minVersion = "0";
     for each (let subscription in treeView.subscriptions)
     {
@@ -584,9 +584,9 @@ function exportList()
     if (minVersion != "0")
     {
       if (aup.versionComparator.compare(minVersion, "0.7.1") >= 0)
-        list[0] = "[Adblock Plus " + minVersion + "]";
+        list[0] = "[AutoProxy " + minVersion + "]";
       else
-        list[0] = "(Adblock Plus " + minVersion + " or higher required) " + list[0];
+        list[0] = "(AutoProxy " + minVersion + " or higher required) " + list[0];
     }
 
     list.push("");
@@ -612,7 +612,7 @@ function exportList()
     }
     catch (e)
     {
-      dump("Adblock Plus: error writing to file: " + e + "\n");
+      dump("AutoProxy: error writing to file: " + e + "\n");
       alert(aup.getString("filters_write_error"));
     }
   }
@@ -1262,7 +1262,7 @@ function showTreeTooltip(/**Event*/ event) /**Boolean*/
 }
 
 /**
- * Opens About Adblock Plus dialog
+ * Opens About AutoProxy dialog
  */
 function openAbout()
 {
diff --git a/chrome/content/settings.xul b/chrome/content/settings.xul
index 65dd55f..2fcf18d 100644
--- a/chrome/content/settings.xul
+++ b/chrome/content/settings.xul
@@ -60,7 +60,7 @@
 <script type="application/x-javascript;version=1.7" src="settings.js"/>
 <script type="application/x-javascript;version=1.7" src="findbar.js"/>
 
-<keyset id="adblockKeys">
+<keyset id="autoProxyKeys">
   <key id="synchsubscription-key" key="t" modifiers="accel"/>
   <key id="synchsubscriptions-key" key="t" modifiers="accel,shift" command="synchsubscriptions-command"/>
   <key id="import-key" key="i" modifiers="accel" command="import-command"/>
diff --git a/chrome/content/subscriptionClasses.js b/chrome/content/subscriptionClasses.js
index 5fa6436..c343167 100644
--- a/chrome/content/subscriptionClasses.js
+++ b/chrome/content/subscriptionClasses.js
@@ -375,13 +375,13 @@ DownloadableSubscription.prototype =
   errors: 0,
 
   /**
-   * Minimal Adblock Plus version required for this subscription
+   * Minimal AutoProxy version required for this subscription
    * @type String
    */
   requiredVersion: null,
 
   /**
-   * Should be true if requiredVersion is higher than current Adblock Plus version
+   * Should be true if requiredVersion is higher than current AutoProxy version
    * @type Boolean
    */
   upgradeRequired: false,
diff --git a/chrome/content/synchronizer.js b/chrome/content/synchronizer.js
index 1e4ab7a..f8a9f06 100644
--- a/chrome/content/synchronizer.js
+++ b/chrome/content/synchronizer.js
@@ -93,7 +93,7 @@ var synchronizer =
   readFilters: function(subscription, text)
   {
     let lines = text.split(/[\r\n]+/);
-    if (!/\[Adblock(?:\s*Plus\s*([\d\.]+)?)?\]/i.test(lines[0]))
+    if (!/\[AutoProxy\s+\d\.\d\.\d\]/i.test(lines[0]))
     {
       this.setError(subscription, "synchronize_invalid_data");
       return null;
diff --git a/chrome/locale/en-US/about.dtd b/chrome/locale/en-US/about.dtd
index 1604bfa..9486cd0 100644
--- a/chrome/locale/en-US/about.dtd
+++ b/chrome/locale/en-US/about.dtd
@@ -29,7 +29,7 @@
 <!ENTITY description        "
   AutoProxy allows you to decide what you don't want to see on the web.
   You don't need to download all the ads and banners any more, if you
-  don't want them - tell Adblock Plus!
+  don't want them - tell AutoProxy!
 ">
 
 <!ENTITY homepage.label     "AutoProxy homepage:">
diff --git a/chrome/locale/en-US/composer.dtd b/chrome/locale/en-US/composer.dtd
index ffc9c0f..21a3664 100644
--- a/chrome/locale/en-US/composer.dtd
+++ b/chrome/locale/en-US/composer.dtd
@@ -22,13 +22,13 @@
    -
    - ***** END LICENSE BLOCK ***** -->
 
-<!ENTITY dialog.title             "Add Adblock Plus filter rule">
+<!ENTITY dialog.title             "AutoProxy filter rule">
 <!ENTITY accept.label             "Add filter">
 <!ENTITY advanced.label           "Advanced view">
 <!ENTITY basic.label              "Basic view">
 
-<!ENTITY disabled.warning.beforeLink  "Adblock Plus is currently disabled. You can still add filters but those will not be applied unless you ">
-<!ENTITY disabled.warning.link    "enable Adblock Plus">
+<!ENTITY disabled.warning.beforeLink  "AutoProxy is currently disabled. You can still add filters but those will not be applied unless you ">
+<!ENTITY disabled.warning.link    "enable AutoProxy">
 <!ENTITY disabled.warning.afterLink   ".">
 
 <!ENTITY filter.label             "New filter:">
diff --git a/chrome/locale/en-US/global.properties b/chrome/locale/en-US/global.properties
index d942f6a..5687883 100644
--- a/chrome/locale/en-US/global.properties
+++ b/chrome/locale/en-US/global.properties
@@ -24,28 +24,28 @@
 
 extensions.autoproxy@autoproxy.org.description=GFW were yesterday!
 
-status_active_label=Adblock
+status_active_label=AutoProxy
 status_disabled_label=Disabled
 
 action0_tooltip=Click to bring up context menu, middle-click to enable/disable.
 action1_tooltip=Click to open/close blockable items, middle-click to enable/disable.
 action2_tooltip=Click to open preferences, middle-click to enable/disable.
-action3_tooltip=Click to enable/disable Adblock Plus.
+action3_tooltip=Click to enable/disable AutoProxy.
 
-active_tooltip=Adblock Plus is active.
-disabled_tooltip=Adblock Plus is disabled.
-whitelisted_tooltip=Adblock Plus is active but disabled on current page.
+active_tooltip=AutoProxy is active.
+disabled_tooltip=AutoProxy is disabled.
+whitelisted_tooltip=AutoProxy is active but disabled on current page.
 
 blocked_count_tooltip=-- out of --
 
 no_blocking_suggestions=No blockable items on the current page
-whitelisted_page=Adblock Plus has been disabled for the current page
+whitelisted_page=AutoProxy has been disabled for the current page
 whitelist_description=My Exception Rules
 filterlist_description=My Ad Blocking Rules
 invalid_description=My Invalid Rules
 elemhide_description=My Element Hiding Rules
 subscription_description=Filter subscription:
-subscription_wrong_version=Some filters in this subscription require Adblock Plus -- to work properly!
+subscription_wrong_version=Some filters in this subscription require AutoProxy -- to work properly!
 subscription_source=Source:
 subscription_status=Status:
 subscription_status_autodownload=Updated automatically
@@ -55,11 +55,11 @@ subscription_status_lastdownload=Last download:
 subscription_status_lastdownload_inprogress=Downloading...
 subscription_status_lastdownload_unknown=N/A
 remove_subscription_warning=Do you really wish to remove this subscription?
-import_filters_wrong_version=Warning: some of the filters in this list require Adblock Plus -- to work properly. You should probably upgrade to the latest Adblock Plus release before importing this list.
+import_filters_wrong_version=Warning: some of the filters in this list require AutoProxy -- to work properly. You should probably upgrade to the latest AutoProxy release before importing this list.
 import_filters_warning=Do you wish to replace your current filters or append the new filters at the end of the list?
 import_filters_title=Import filters
 export_filters_title=Export filters
-invalid_filters_file=Not a valid Adblock Plus filters file.
+invalid_filters_file=Not a valid AutoProxy filters file.
 filters_write_error=There was an error writing filters to the file. Make sure the file isn't write protected or hold by another program.
 clearall_warning=Do you really wish to remove all filters from the list?
 resethitcounts_warning=Do you really wish to reset hit counts for all filters back to zero? This operation can't be undone!
diff --git a/chrome/locale/en-US/overlay.dtd b/chrome/locale/en-US/overlay.dtd
index 3480b96..1b2bd8b 100644
--- a/chrome/locale/en-US/overlay.dtd
+++ b/chrome/locale/en-US/overlay.dtd
@@ -23,20 +23,20 @@
    - ***** END LICENSE BLOCK ***** -->
 
 <!ENTITY notloaded.label        "Not loaded">
-<!ENTITY notloaded.tooltip      "Adblock Plus component couldn't be loaded, maybe it didn't install properly.">
+<!ENTITY notloaded.tooltip      "AutoProxy component couldn't be loaded, maybe it didn't install properly.">
 <!ENTITY status.tooltip         "Status:">
 <!ENTITY blocked.tooltip        "Blocked items on this page:">
 <!ENTITY filters.tooltip        "Most active filters:">
 
-<!ENTITY menuitem.label         "Adblock Plus Preferences">
+<!ENTITY menuitem.label         "AutoProxy Preferences">
 <!ENTITY menuitem.accesskey     "B">
-<!ENTITY toolbarbutton.label    "Adblock Plus">
+<!ENTITY toolbarbutton.label    "AutoProxy">
 
-<!ENTITY view.blockableItems.label  "Adblock Plus: Blockable Items">
+<!ENTITY view.blockableItems.label  "AutoProxy: Blockable Items">
 
-<!ENTITY context.image.label    "Adblock Image">
-<!ENTITY context.object.label   "Adblock Object">
-<!ENTITY context.frame.label    "Adblock Frame">
+<!ENTITY context.image.label    "Proxy Image">
+<!ENTITY context.object.label   "Proxy Object">
+<!ENTITY context.frame.label    "Proxy Frame">
 
 <!ENTITY sidebar.title          "Blockable items on current page">
 
@@ -50,4 +50,4 @@
 <!ENTITY whitelist.page.label   "Disable on this page only">
 
 <!ENTITY objecttab.title        "Block">
-<!ENTITY objecttab.tooltip      "Click here to block this object with Adblock Plus">
+<!ENTITY objecttab.tooltip      "Click here to proxy this object with AutoProxy">
diff --git a/chrome/locale/en-US/settings.dtd b/chrome/locale/en-US/settings.dtd
index 64a550c..4590649 100644
--- a/chrome/locale/en-US/settings.dtd
+++ b/chrome/locale/en-US/settings.dtd
@@ -22,7 +22,7 @@
    -
    - ***** END LICENSE BLOCK ***** -->
 
-<!ENTITY dialog.title               "Adblock Plus Preferences">
+<!ENTITY dialog.title               "AutoProxy Preferences">
 
 <!ENTITY filters.label              "Filters">
 <!ENTITY filters.accesskey          "F">
@@ -73,7 +73,7 @@
 <!ENTITY options.label              "Options">
 <!ENTITY options.accesskey          "O">
 
-<!ENTITY enable.label               "Enable Adblock Plus">
+<!ENTITY enable.label               "Enable AutoProxy">
 <!ENTITY enable.accesskey           "N">
 <!ENTITY showintoolbar.label        "Show in toolbar">
 <!ENTITY showintoolbar.accesskey    "B">
@@ -93,10 +93,10 @@
 <!ENTITY faq.label                  "Frequently Asked Questions">
 <!ENTITY faq.accesskey              "F">
 <!ENTITY faq.url                    "http://autoproxy.org/en/faq">
-<!ENTITY filterdoc.label            "Writing Adblock Plus filters">
+<!ENTITY filterdoc.label            "Writing AutoProxy filters">
 <!ENTITY filterdoc.accesskey        "R">
 <!ENTITY filterdoc.url              "http://autoproxy.org/en/filters">
-<!ENTITY about.label                "About Adblock Plus">
+<!ENTITY about.label                "About AutoProxy">
 <!ENTITY about.accesskey            "B">
 
 <!ENTITY description                "The following filters determine which addresses should be blocked and which ones should be allowed:">
diff --git a/chrome/locale/en-US/sidebar.dtd b/chrome/locale/en-US/sidebar.dtd
index 8885825..df97443 100644
--- a/chrome/locale/en-US/sidebar.dtd
+++ b/chrome/locale/en-US/sidebar.dtd
@@ -22,7 +22,7 @@
    -
    - ***** END LICENSE BLOCK ***** -->
 
-<!ENTITY detached.title           "Adblock Plus: Blockable items (detached)">
+<!ENTITY detached.title           "AutoProxy: Proxyable items (detached)">
 
 <!ENTITY detach.label             "Detach">
 <!ENTITY reattach.label           "Reattach">
@@ -38,7 +38,7 @@
 
 <!ENTITY noitems.label            "No blockable items">
 <!ENTITY whitelisted.label        "Whitelisted page">
-<!ENTITY notloaded.label          "Adblock Plus hasn't been installed properly">
+<!ENTITY notloaded.label          "AutoProxy hasn't been installed properly">
 
 <!ENTITY tooltip.address.label    "Address:">
 <!ENTITY tooltip.type.label       "Type:">
diff --git a/chrome/locale/en-US/subscription.dtd b/chrome/locale/en-US/subscription.dtd
index 530a67b..36abca1 100644
--- a/chrome/locale/en-US/subscription.dtd
+++ b/chrome/locale/en-US/subscription.dtd
@@ -27,7 +27,7 @@
 
 <!ENTITY new.description            "
   Please enter the web address or file containing a list of
-  Adblock Plus filters.
+  AutoProxy filters.
 ">
 
 <!ENTITY edit.description           "
diff --git a/chrome/locale/en-US/tip_subscriptions.dtd b/chrome/locale/en-US/tip_subscriptions.dtd
index 3723f02..90b9e79 100644
--- a/chrome/locale/en-US/tip_subscriptions.dtd
+++ b/chrome/locale/en-US/tip_subscriptions.dtd
@@ -22,11 +22,11 @@
    -
    - ***** END LICENSE BLOCK ***** -->
 
-<!ENTITY dialog.title               "Add Adblock Plus filter subscription">
+<!ENTITY dialog.title               "Add AutoProxy filter subscription">
 
 <!ENTITY description.par1           "
-  Thank you for installing Adblock Plus. This extension can
-  eliminate 99&#x25; of the advertisements you see on the web. However,
+  Thank you for installing AutoProxy. This extension can
+  eliminate 99% of the advertisements you see on the web. However,
   effective ad filtering requires you to define a good set of
   filters. You can do it yourself, or you can simply subscribe
   to filter lists others maintain for you. It will still be possible
@@ -37,7 +37,7 @@
 <!ENTITY description.par2           "
   You can choose one subscription from the
   list of recommended subscriptions below (more subscriptions can be
-  added in Adblock Plus Preferences later though usually this is not
+  added in AutoProxy Preferences later though usually this is not
   necessary):
 ">
 
diff --git a/generateLocaleContentsRDF.pl b/generateLocaleContentsRDF.pl
index ceb4b83..6ad69ee 100644
--- a/generateLocaleContentsRDF.pl
+++ b/generateLocaleContentsRDF.pl
@@ -24,7 +24,7 @@
   <RDF:Description about="urn:mozilla:locale:$locale">
     <chrome:packages>
       <RDF:Seq about="urn:mozilla:locale:$locale:packages">
-        <RDF:li resource="urn:mozilla:locale:$locale:adblockplus"/>
+        <RDF:li resource="urn:mozilla:locale:$locale:autoproxy"/>
       </RDF:Seq>
     </chrome:packages>
   </RDF:Description>
diff --git a/make_release.pl b/make_release.pl
index 87cc0bd..1d652c8 100644
--- a/make_release.pl
+++ b/make_release.pl
@@ -17,7 +17,7 @@
 print VERSION $ARGV[0];
 close(VERSION);
 
-@ARGV = ("../downloads/adblockplus-$version.xpi");
+@ARGV = ("../downloads/autoproxy-$version.xpi");
 do './create_xpi.pl';
 
 opendir(LOCALES, "chrome/locale");
@@ -27,17 +27,17 @@
 # Create new single-locale builds
 for my $locale (@locales)
 {
-  @ARGV = ("../downloads/adblockplus-$version-$locale.xpi", $locale);
+  @ARGV = ("../downloads/autoproxy-$version-$locale.xpi", $locale);
   do './create_xpi.pl';
 }
 
 chdir('..');
-system("hg add downloads/adblockplus-$version.xpi");
-system(qq(hg commit -m "Releasing Adblock Plus $version" downloads src));
+system("hg add downloads/autoproxy-$version.xpi");
+system(qq(hg commit -m "Releasing AutoProxy $version" downloads src));
 
 my $branch = $version;
 $branch =~ s/\./_/g;
-$branch = "ADBLOCK_PLUS_".$branch."_RELEASE";
+$branch = "AutoProxy_".$branch."_RELEASE";
 system(qq(hg tag $branch));
 
 system(qq(hg push));
diff --git a/validateChecksum.pl b/validateChecksum.pl
index 595fe35..17e8a4d 100644
--- a/validateChecksum.pl
+++ b/validateChecksum.pl
@@ -2,7 +2,7 @@
 
 #############################################################################
 # This is a reference script to validate the checksum in downloadable       #
-# subscription. This performs the same validation as Adblock Plus when it   #
+# subscription. This performs the same validation as AutoProxy when it      #
 # downloads the subscription.                                               #
 #                                                                           #
 # To validate a subscription file, run the script like this:                #