Merge pull request #1393 from simonasd/patch-1

add some "notes" for zh-CN and en

source/db/en-projects.json

@@ -2853,7 +2853,7 @@
     "description": "Metasearch engine based in New York and the Netherlands. ",
     "license_url": "",
     "logo": "ixquick.png",
-    "notes": "",
+    "notes": "Ixquick returns the top ten results from multiple search engines.\n\n In contrast to ixquick.com, its sibling project Startpage.com offer results from the Google search engine.\n\n It also provides the stand-alone Ixquick Proxy service that allows users to open search results via proxy.",
     "privacy_url": "https://ixquick.com/eng/privacy-policy.html",
     "source_url": "",
     "name": "Ixquick",
@@ -5601,7 +5601,7 @@
     "description": "Private, unlogged web searches.",
     "license_url": "",
     "logo": "startpage.png",
-    "notes": "Startpage is a SaaS hosted in the USA and the Netherlands that provides you with anonymous Google search and image results through a free proxy.",
+    "notes": "Startpage is a SaaS hosted in the USA and the Netherlands that provides you with anonymous Google search and image results through a free proxy. Its sibling project ixquick.com, however, offer results from other search engine.\n\n It also provides the stand-alone Ixquick Proxy service that allows users to open search results via proxy.\n\n As of February 19, 2015, Startpage.com is the default search engine in the Tor Browser.",
     "privacy_url": "https://startpage.com/eng/protect-privacy.html",
     "source_url": "",
     "name": "Startpage",

source/db/zh-CN-projects.json

@@ -468,7 +468,7 @@
     "description": "Bookie是一个开源的收藏夹程序。",
     "license_url": "https://github.com/bookieio/Bookie/blob/develop/COPYING",
     "logo": "bookie.png",
-    "notes": "Bookie.io将会在2015年7月5日<strong>关闭</strong>。然而，你依然可以自己架设这个程序。在[这条推文中](https://twitter.com/BookieBmarks/status/606388573852430337)可以看到更多信息。",
+    "notes": "Bookie.io已经于2015年7月5日<strong>关闭</strong>。然而，你依然可以自己架设这个程序。在[这里](http://docs.bmark.us/en/latest/hosting.html)可以了解到更多信息。",
     "privacy_url": "",
     "source_url": "https://github.com/bookieio/Bookie",
     "name": "Bookie",
@@ -2853,7 +2853,7 @@
     "description": "Ixquick是一个位于纽约和荷兰的元搜索引擎。",
     "license_url": "",
     "logo": "ixquick.png",
-    "notes": "Ixquick与Startpage来自同一家公司，提供100多个数据源的搜索结果，包括google。",
+    "notes": "Ixquick与Startpage来自同一家公司。Ixquick提供100多个数据源的搜索结果，但不包括google。",
     "privacy_url": "https://ixquick.com/eng/privacy-policy.html",
     "source_url": "",
     "name": "Ixquick",
@@ -5973,7 +5973,7 @@
     "description": "用于实现在线匿名的自由软件。Tor将网络流量通过一个由超过4000个中继志愿者组成的全球性自由网络转发，使用户免于受到网络监控或流量分析，避免泄漏地理位置等信息。使用Tor让网络活动更难以追踪，包括\"访问网站、发帖、即时通讯和其他通讯形式\"。Tor致力于保护用户隐私，同时保护他们通过网络开展秘密活动的自由和能力。",
     "license_url": "https://gitweb.torproject.org/tor.git/blob/HEAD:/LICENSE",
     "logo": "tor.png",
-    "notes": "",
+    "notes": "在网络封锁严重的地区，比如中国大陆，Tor的使用可能需要借助meek插件，这个插件的运作依赖于微软、亚马逊等公司的云服务器。",
     "privacy_url": "",
     "source_url": "https://gitweb.torproject.org/tor.git",
     "name": "Tor",
@@ -6025,7 +6025,7 @@
     "notes": "使用Tor浏览器（TBB）登录包含你真实信息的ID只会适得其反，还会触发网站的欺诈保护机制。在登录网站之前，你还需要检查是否是HTTPS，因为通过http登录可能导致您的信息被恶意Tor出口节点捕获。",
     "privacy_url": "https://www.torproject.org/about/overview.html.en",
     "source_url": "https://gitweb.torproject.org/tor.git",
-    "name": "Tor Browser Bundle",
+    "name": "Tor浏览器套装",
     "tos_url": "",
     "url": "https://www.torproject.org/projects/torbrowser.html.en",
     "wikipedia_url": "https://en.wikipedia.org/wiki/Tor_Browser_Bundle",