From e75fb208b90baff826c53053b0003a6f6d58902e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Taro?= <tomas@getadblock.com>
Date: Sun, 4 Sep 2016 22:50:56 +0200
Subject: [PATCH] Release version v1.4.6
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Tomáš Taro <tomas@getadblock.com>
---
 CHANGELOG.txt |   8 +++
 Info.plist    | 174 +++++++++++++++++++++++++-------------------------
 manifest.json |   2 +-
 3 files changed, 96 insertions(+), 88 deletions(-)

diff --git a/CHANGELOG.txt b/CHANGELOG.txt
index b718f8ac..662453ab 100644
--- a/CHANGELOG.txt
+++ b/CHANGELOG.txt
@@ -1,5 +1,13 @@
 ## Versions ##
 
+1.4.6:
+- Name change of popover on Safari from "AdBlock" to "CatBlock" (#59)
+- Drop support for Safari 5.x (#61)
+- Change references to CatBlock on Safari (#62)
+- Unified code style (#63)
+- Fixed throwing an error when "getAttribute" property of an element is undefined (#66)
+- Updated translations
+
 1.4.5:
 - Add checks for undefined tabs, while getting info about them (#56)
 - Simplified code for getting tab info in popup (#56)
diff --git a/Info.plist b/Info.plist
index 819933c8..73e7214e 100644
--- a/Info.plist
+++ b/Info.plist
@@ -2,92 +2,92 @@
 <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
 <plist version="1.0">
 <dict>
-	<key>Author</key>
-	<string>CatBlock Team</string>
-	<key>Builder Version</key>
-	<string>12602.1.40.4</string>
-	<key>CFBundleDisplayName</key>
-	<string>CatBlock</string>
-	<key>CFBundleIdentifier</key>
-	<string>com.catblock.adblockwithcatblock</string>
-	<key>CFBundleInfoDictionaryVersion</key>
-	<string>6.0</string>
-	<key>CFBundleShortVersionString</key>
-	<string>1.4.5</string>
-	<key>CFBundleVersion</key>
-	<string>101.4.5</string>
-	<key>Chrome</key>
-	<dict>
-		<key>Global Page</key>
-		<string>background_safari.html</string>
-		<key>Toolbar Items</key>
-		<array>
-			<dict>
-				<key>Command</key>
-				<string></string>
-				<key>Identifier</key>
-				<string>CatBlockOptions</string>
-				<key>Image</key>
-				<string>img/icon16_grayscale.png</string>
-				<key>Label</key>
-				<string>Options</string>
-				<key>Palette Label</key>
-				<string></string>
-				<key>Tool Tip</key>
-				<string>CatBlock Options</string>
-			</dict>
-		</array>
-	</dict>
-	<key>Content</key>
-	<dict>
-		<key>Scripts</key>
-		<dict>
-			<key>End</key>
-			<array>
-				<string>lib/punycode.min.js</string>
-				<string>uiscripts/load_jquery_ui.js</string>
-				<string>uiscripts/blacklisting/rightclick_hook.js</string>
-				<string>uiscripts/blacklisting/overlay.js</string>
-				<string>uiscripts/blacklisting/clickwatcher.js</string>
-				<string>uiscripts/blacklisting/elementchain.js</string>
-				<string>uiscripts/blacklisting/blacklistui.js</string>
-				<string>uiscripts/send_content_to_back.js</string>
-				<string>uiscripts/top_open_blacklist_ui.js</string>
-				<string>uiscripts/top_open_whitelist_ui.js</string>
-				<string>uiscripts/safari_hooks.js</string>
-			</array>
-			<key>Start</key>
-			<array>
-				<string>lib/jquery.min.js</string>
-				<string>js/port.js</string>
-				<string>js/functions.js</string>
-				<string>filtering/filteroptions.js</string>
-				<string>js/bandaids.js</string>
-				<string>js/adblock_start_common.js</string>
-				<string>js/adblock_start_safari.js</string>
-				<string>catblock/contentscript.js</string>
-			</array>
-		</dict>
-	</dict>
-	<key>Description</key>
-	<string>CatBlock is like an ad blocker, but instead of blocking ads it shows you pictures of cats (configurable)</string>
-	<key>DeveloperIdentifier</key>
-	<string>WJ8AQBVVRG</string>
-	<key>ExtensionInfoDictionaryVersion</key>
-	<string>1.0</string>
-	<key>Permissions</key>
-	<dict>
-		<key>Website Access</key>
-		<dict>
-			<key>Include Secure Pages</key>
-			<true/>
-			<key>Level</key>
-			<string>All</string>
-		</dict>
-	</dict>
-	<key>Update From Gallery</key>
-	<true/>
-	<key>Website</key>
-	<string>http://catblock.tk</string>
+    <key>Author</key>
+    <string>CatBlock Team</string>
+    <key>Builder Version</key>
+    <string>12602.1.40.4</string>
+    <key>CFBundleDisplayName</key>
+    <string>CatBlock</string>
+    <key>CFBundleIdentifier</key>
+    <string>com.catblock.adblockwithcatblock</string>
+    <key>CFBundleInfoDictionaryVersion</key>
+    <string>6.0</string>
+    <key>CFBundleShortVersionString</key>
+    <string>1.4.6</string>
+    <key>CFBundleVersion</key>
+    <string>101.4.6/string>
+    <key>Chrome</key>
+    <dict>
+        <key>Global Page</key>
+        <string>background_safari.html</string>
+        <key>Toolbar Items</key>
+        <array>
+            <dict>
+                <key>Command</key>
+                <string></string>
+                <key>Identifier</key>
+                <string>CatBlockOptions</string>
+                <key>Image</key>
+                <string>img/icon16_grayscale.png</string>
+                <key>Label</key>
+                <string>Options</string>
+                <key>Palette Label</key>
+                <string></string>
+                <key>Tool Tip</key>
+                <string>CatBlock Options</string>
+            </dict>
+        </array>
+    </dict>
+    <key>Content</key>
+    <dict>
+        <key>Scripts</key>
+        <dict>
+            <key>End</key>
+            <array>
+                <string>lib/punycode.min.js</string>
+                <string>uiscripts/load_jquery_ui.js</string>
+                <string>uiscripts/blacklisting/rightclick_hook.js</string>
+                <string>uiscripts/blacklisting/overlay.js</string>
+                <string>uiscripts/blacklisting/clickwatcher.js</string>
+                <string>uiscripts/blacklisting/elementchain.js</string>
+                <string>uiscripts/blacklisting/blacklistui.js</string>
+                <string>uiscripts/send_content_to_back.js</string>
+                <string>uiscripts/top_open_blacklist_ui.js</string>
+                <string>uiscripts/top_open_whitelist_ui.js</string>
+                <string>uiscripts/safari_hooks.js</string>
+            </array>
+            <key>Start</key>
+            <array>
+                <string>lib/jquery.min.js</string>
+                <string>js/port.js</string>
+                <string>js/functions.js</string>
+                <string>filtering/filteroptions.js</string>
+                <string>js/bandaids.js</string>
+                <string>js/adblock_start_common.js</string>
+                <string>js/adblock_start_safari.js</string>
+                <string>catblock/contentscript.js</string>
+            </array>
+        </dict>
+    </dict>
+    <key>Description</key>
+    <string>CatBlock is like an ad blocker, but instead of blocking ads it shows you pictures of cats (configurable)</string>
+    <key>DeveloperIdentifier</key>
+    <string>WJ8AQBVVRG</string>
+    <key>ExtensionInfoDictionaryVersion</key>
+    <string>1.0</string>
+    <key>Permissions</key>
+    <dict>
+        <key>Website Access</key>
+        <dict>
+            <key>Include Secure Pages</key>
+            <true/>
+            <key>Level</key>
+            <string>All</string>
+        </dict>
+    </dict>
+    <key>Update From Gallery</key>
+    <true/>
+    <key>Website</key>
+    <string>http://catblock.tk</string>
 </dict>
 </plist>
diff --git a/manifest.json b/manifest.json
index e72a8199..3c2a0239 100644
--- a/manifest.json
+++ b/manifest.json
@@ -1,6 +1,6 @@
 {
     "name": "CatBlock",
-    "version": "1.4.5",
+    "version": "1.4.6",
     "description": "CatBlock is like an ad blocker, but instead of blocking ads it shows you pictures of cats (configurable)",
     "author": "CatBlock Team",
     "icons": {