fix conflict

source/locales/zh-CN.json

@@ -3,9 +3,9 @@
   "Audit Notes": "审查提示",
   "Audit Report": "审查报告",
   "Audited": "审查通过",
-  "Bookmark Sync": "Bookmark Sync",
+  "Bookmark Sync": "书签同步",
   "by": "by",
-  "Cellular": "Cellular",
+  "Cellular": "蜂窝网络",
   "Communication Protocols": "通信协议",
   "Digital Distribution": "数字分发",
   "Disk Encryption": "磁盘加密",
@@ -24,12 +24,12 @@
   "Mail Servers": "邮件服务器",
   "Mail Transfer Agents": "邮件传送代理",
   "Mesh Networks": "网状网络",
-  "Operating Systems": "操作需同",
+  "Operating Systems": "操作系统",
   "Operating Systems (Live)": "操作系统(即插即用)",
   "Operating Systems (Mobile)": "操作系统 (移动平台)",
-  "Password Managers": "Password Managers",
+  "Password Managers": "密码管理",
   "Productivity": "云办公",
-  "Raspberry Pi": "Raspberry Pi平台",
+  "Raspberry Pi": "树莓派(Raspberry Pi)平台",
   "SIP Servers": "SIP服务",
   "Social Networks": "社交网络",
   "Video & Voice": "视频与音频",
@@ -49,14 +49,14 @@
   "warning-ios": "警告：苹果的IOS设备受到了棱镜监控系统的控制。使用IOS设备可能会严重损害你的隐私。如果你有隐私需求，那么我们强烈建议你用运行[Replicant](../../projects/replicant) 或[Cyanogenmod](../../projects/cyanogenmod)的安卓设备替换苹果的IOS设备。",
   "warning-mac": "警告：苹果OS X系统受到了棱镜监控系统的控制。使用IOS设备可能会严重损害你的隐私。如果你有隐私需求，那么我们强烈建议你用[Linux](../gnu-linux) 或者[BSD](../bsd)操作系统替换OS X。",
   "warning-windows": "警告：微软windows系统受到了棱镜监控系统的控制。使用IOS设备可能会严重损害你的隐私。如果你有隐私需求，那么我们强烈建议你用[Linux](../gnu-linux) 或者[BSD](../bsd)操作系统替换它。",
-  "Communication": "Communication",
-  "Anonymity": "Anonymity",
-  "Encryption": "Encryption",
-  "Synchronization": "Synchronization",
+  "Communication": "通讯",
+  "Anonymity": "匿名",
+  "Encryption": "加密",
+  "Synchronization": "同步",
   "Syndication": "Syndication",
-  "Routers": "Routers",
-  "Servers": "Servers",
-  "Web Services": "Web Services",
+  "Routers": "路由器",
+  "Servers": "服务器",
+  "Web Services": "网络服务",
   "About": "关于",
   "All": "全部",
   "All Categories": "全部分类",
@@ -82,23 +82,23 @@
   "Platform Types": "平台类型",
   "Protocols": "协议",
   "Project License": "项目许可",
-  "Project License Unavailable": "项目许可无法获取",
+  "Project License Unavailable": "暂无项目许可",
   "Projects Supported": "受支持的项目",
   "Projects": "项目",
   "Security Notes": "安全提示",
   "Source Code": "源代码",
-  "Source Code Unavailable": "源代码无法获取",
+  "Source Code Unavailable": "暂无源代码",
   "Supported Projects": "受支持的项目",
   "Supported Protocols": "受支持的协议",
   "Terms of Service": "服务条款",
-  "Wikipedia Article": "维基百科此条",
+  "Wikipedia Article": "维基百科词条",
   "Web Service": "网络服务",
-  "site-protocols-index": "**Browse by Protocol**\n\nBrowse F/OSS projects by supported protocol.",
-  "site-categories-index": "**Browse by Category**\n\nBrowse F/OSS projects by platform categories.",
-  "site-about-index": "**About**\n\nAbout the PRISM Break project.",
+  "site-protocols-index": "**按协议浏览**\n\n按支持的协议浏览F/OSS项目。",
+  "site-categories-index": "**按分类浏览**\n\n按平台分类浏览F/OSS项目。",
+  "site-about-index": "**关于**\n\n关于粉碎棱镜（PRISM Break）项目。",
   "site-about-privacy": "* 本网站不会搜集任何关于你的信息。 * 本网站不会追踪你的IP信息。 * 本网站不使用任何前端JavaScript脚本。",
-  "site-title": "粉碎棱镜——安全、隐私、自由的选项。让我们逃离所有类似于棱镜项目、XKeyscore项目和Tempora项目的全球信息监控项目。",
-  "meta-description": "粉碎棱镜——安全、隐私、自由的选项。让我们逃离所有类似于棱镜、XKeyscore和Tempora的全球信息监控项目。用自由软件替代闭源软件，再也无需向任何人汇报自己的隐私！",
+  "site-title": "粉碎棱镜——保护你自己的安全、隐私和自由！让我们逃离所有类似于棱镜项目、XKeyscore项目和Tempora项目的全球信息监控项目。",
+  "meta-description": "粉碎棱镜——保护你自己的安全、隐私和自由！让我们逃离所有类似于棱镜、XKeyscore和Tempora的全球信息监控项目。用自由软件替代闭源软件，再也无需向任何人汇报自己的隐私！",
   "site-introduction": "<strong>让我们逃离棱镜（美国国家安全局的全球信息监控工程）和所有其他类似的监控项目</strong>全民参与，让大规模监控变得昂贵而困难！所有人都有隐私权，现在，你可以从这里开始，从试着加密你的信息开始，从摆脱闭源软件开始！",
   "Menu": "菜单",
   "Proprietary": "专有的*",
@@ -108,9 +108,9 @@
   "trisquel": "FSF（自由软件基金会）认可的，对用户友好的 GNU/Linux 发行版",
   "operating-systems-notes": "<p>Apple、Google和Microsoft是PRISM项目的一部分。他们专有的操作系统不能被信任来保护你的个人信息不被泄露给美国国家安全局NSA。</p><p>这留给我们两个免费替代品: <strong><a href='https://www.gnu.org/distros/free-distros.html'>GNU/Linux</a></strong> 和 <strong><a href='https://en.wikipedia.org/wiki/Comparison_of_BSD_operating_systems'>BSD</a></strong>.</p> <p>GNU/Linux 有一个更大的社区来帮助你的转换过程。我们建议新手先从适合你的<a href='http://distrowatch.com/'>GNU/Linux发行版</a>开始。</p><p>Canonical&rsquo;s Ubuntu本站并不推荐，因为其默认配置存在<a href='https://www.eff.org/deeplinks/2012/10/privacy-ubuntu-1210-amazon-ads-and-data-leaks'>亚马逊广告和数据泄漏漏洞</a>如果你已经用上了Ubuntu，你可以从Fix Ubuntu网站获得亡羊补牢的建议措施。</p>",
   "Live CDS and VM Images": "即插即用系统 和 虚拟机镜像",
-  "operating-systems-live-notes": "<p>A live distribution like <strong>Tails</strong> is the fastest and easiest way to a secure operating system. All you have to do is create a bootable CD or USB drive with the files provided and you&rsquo;re set. Everything else will be preconfigured for you.</p><p>A virtual machine (VM) image like <strong>Whonix</strong> is designed to be run inside of a virtualization package like <a href='https://www.virtualbox.org/'>VirtualBox</a>. VirtualBox can be installed on Windows, Linux, OS X, and Solaris. This means that if you're stuck using Windows or OS X for whatever reason, you can install VirtualBox and use Whonix to increase your privacy and security.</p>",
+  "operating-systems-live-notes": "<p>一个即插即用（live）发行版，比如<strong>Tails</strong>，是通往安全操作系统的最便捷的道路。你需要做的仅仅是使用项目文件创建一个可启动的光盘或U盘，然后用它们启动电脑即可，一切都预先设置好了。</p><p>虚拟机（VM）镜像，比如<strong>Whonix</strong>，则是为虚拟环境，例如<a href='https://www.virtualbox.org/'>VirtualBox</a>设计的。VirtualBox可以安装在Windows, Linux, OS X和Solaris系统中。这意味着如果你因为一些原因不得不使用windows或OS X之类的不安全系统，你可以使用虚拟机来（有限地）提高安全性。</p>",
   "Android": "Android安卓系统",
-  "android-notes": "<p><strong>CyanogenMod</strong> licensing: &ldquo;CyanogenMod does still include various hardware-specific code, which is also slowly being open-sourced anyway.&rdquo; &mdash;<a href='https://en.wikipedia.org/wiki/CyanogenMod#Licensing'>Wikipedia</a></p><p><strong>F-Droid</strong> is a free alternative to the Google Play app store.</p><p>We believe that replacing your Android device's OS with open source software can greatly improve the privacy and security of your device. However, it is possible that your device's closed-source hardware will still remain capable of certain privacy violations.</p>",
+  "android-notes": "<p><strong>CyanogenMod</strong>的许可协议：CyanogenMod依然包含来部分特定硬件的代码，但它们也在逐渐开源中。参见<a href='https://en.wikipedia.org/wiki/CyanogenMod#Licensing'>维基百科</a></p><p><strong>F-Droid</strong>是Google Play应用市场的自由替代。</p><p>我们相信，用开源操作系统运行安卓硬件会极大提升你设备的隐私和安全性，但是请记住，你的设备的闭源硬件代码仍然有可能侵犯你的隐私。</p>",
   "communication-protocols-notes": "--",
   "iOS and WP": "iOS系统和Windows Phone系统",
   "No Alternatives": "没有替代选项",
@@ -228,12 +228,12 @@
   "Chinese (Simplified)": "简体中文",
   "Updated": "更新于",
   "By": "By",
-  "Donate Bitcoin": "捐赠 Bitcoin",
+  "Donate Bitcoin": "捐赠比特币",
   "Contribute": "贡献",
   "License": "许可",
   "Changelog": "更新日志",
-  "site-disclaimer": "Disclaimer: Using the recommended projects on this site will not guarantee that 100% of your communications will be shielded against surveillance states. Please do your own research before trusting these softwares with sensitive information.",
+  "site-disclaimer": "免责声明：使用本网站推荐的开源项目并不能保证您的通信100％不受监视。在您选择相信这些软件，赋予其敏感信息之前，请先进行深入了解。",
   "Privacy Policy": "隐私条款",
   "site-donate-index-title": "捐赠比特币，支持粉碎棱镜项目",
-  "site-donate-index-content": "<p><a href='https://prism-break.org/'>PRISM Break</a> launched on June 10th, 2013 on the heels of Edward Snowden's revelations about NSA mass surveillance. Since launch, nearly 750,000 privacy-conscious visitors have viewed the site over one million times around the world.</p><p>While the first version of prism-break.org took only two days to build and launch, maintaining and improving the site over the past two months has taken up much of my time. As of August 3rd, 2013, I've pushed 1,208 edits to the site and spent hundreds of hours poring over privacy resources. I've made this effort in order to ensure that PRISM Break offers you the best methods to combat government surveillance.</p><p>With so many people visiting prism-break.org, I would love to devote my full attention to fixing possible security bugs, improving the projects list and making the content more user-friendly. However&mdash;like anyone else&mdash;I still need to pay my rent and buy food, and this project doesn't generate any income. This is where you can help.</p><p>If you would like to support PRISM Break, please consider donating Bitcoin to fund future development. I suggest at least 0.05 BTC, but any amount is appreciated. If you donate 0.50 BTC or more and leave a name, I will add you to this page as a PRISM Break sponsor.</p><p>Donate address:<br /><strong>1NAfx5GEZHR8t69LjxTeShPP4XXaxeUqQw</strong></p><p>I appreciate your support.</p><p>Peng Zhong<br />PRISM Break developer</p><p>P.S. The developers of the fine projects listed on <a href='https://prism-break.org'>PRISM Break</a> would also be grateful for your support. If you enjoy using their app, seriously consider throwing som} mo}ey their way to fund development.</p>"
+  "site-donate-index-content": "<p><a href='https://prism-break.org/'>粉碎棱镜（PRISM Break）</a>项目启动于2013年6月10日，主要受到了爱德华·斯诺登曝光美国国家安全局大规模监视事件的启发。项目启动以来，来自全球各地超过75万名关注隐私的访客浏览本站超过100万次。尽管这个网站最初只花了两天就制作完成并上线，但仅仅在最初的两个月，数百个小时的钻研和1208次编辑花费了我大量的精力。我做的所有这些都是为了本站能提供尽可能可靠的对抗政府监视的方法。</p><p>本站有如此众多的访客，因此我希望能够贡献出我全部的力量来修复安全漏洞并完善内容。但我只是一介凡夫，我也需要养家餬口，而这个网站并不给我带来任何收入。因此，在这里，我请求您们的帮助。</p><p>如果您认为我做得有价值，请考虑捐助比特币来帮助【粉碎棱镜】进一步发展。您的帮助无论多少我都会铭记在心，但如果您捐助超过0.05 BTC并愿意留下姓名，我会在这个页面将您记载为光荣的赞助人。</p><p>捐助地址<br /><strong>1NAfx5GEZHR8t69LjxTeShPP4XXaxeUqQw</strong></p><p>感谢您的帮助。</p><p>Peng Zhong<br />PRISM Break的开发者</p><p>另外，本站所记载的那些开源项目同样需要您的帮助。如果您正在使用它们的软件并认为它们值得您欣赏，建议您考虑资助它们的发展。</p>"
 }