From 40e5921b9e879ec5879ceb1111c343b3ed436cf8 Mon Sep 17 00:00:00 2001
From: MaysWind <i@mayswind.net>
Date: Thu, 7 Jul 2016 00:22:02 +0800
Subject: [PATCH] modify text

---
 src/index.html                        | 2 +-
 src/langs/zh_CN.json                  | 7 +++----
 src/scripts/config/defaultLanguage.js | 7 +++----
 src/views/list.html                   | 2 +-
 src/views/task-detail.html            | 6 +++---
 5 files changed, 11 insertions(+), 13 deletions(-)

diff --git a/src/index.html b/src/index.html
index bb06380..0de4d55 100644
--- a/src/index.html
+++ b/src/index.html
@@ -115,7 +115,7 @@
                             </li>
                             <li>
                                 <a class="pointer-cursor" ng-click="changeDisplayOrder('percent:desc')">
-                                    <span translate>By Completed Percent</span>
+                                    <span translate>By Progress</span>
                                     <i class="fa" ng-class="{'fa-check': isSetDisplayOrder('percent')}"></i>
                                 </a>
                             </li>
diff --git a/src/langs/zh_CN.json b/src/langs/zh_CN.json
index 1f4d4f1..ac742ff 100644
--- a/src/langs/zh_CN.json
+++ b/src/langs/zh_CN.json
@@ -21,7 +21,7 @@
     "Clear Stopped Tasks": "清空已结束任务",
     "By File Name": "按文件名",
     "By File Size": "按文件大小",
-    "By Completed Percent": "按进度",
+    "By Progress": "按进度",
     "By Remain Time": "按剩余时间",
     "By Download Speed": "按下载速度",
     "By Upload Speed": "按上传速度",
@@ -50,7 +50,7 @@
     "Aria2 Status": "Aria2 状态",
     "File Name": "文件名",
     "File Size": "大小",
-    "Completed Percent": "进度",
+    "Progress": "进度",
     "Share Ratio": "分享率",
     "Remain Time": "剩余时间",
     "Download Speed": "下载速度",
@@ -65,7 +65,7 @@
     "Task Size": "任务大小",
     "Task Status": "任务状态",
     "Error Description": "错误描述",
-    "Health Percent": "健康度",
+    "Health Percentage": "健康度",
     "Info Hash": "特征值",
     "Seeders": "种子数",
     "Connections": "连接数",
@@ -80,7 +80,6 @@
     "Archives": "存档文件",
     "Address": "地址",
     "Status": "状态",
-    "Percent": "完成度",
     "Speed": "速度",
     "(local)": "(本机)",
     "No Data": "无数据",
diff --git a/src/scripts/config/defaultLanguage.js b/src/scripts/config/defaultLanguage.js
index b67f2da..4be82b3 100644
--- a/src/scripts/config/defaultLanguage.js
+++ b/src/scripts/config/defaultLanguage.js
@@ -25,7 +25,7 @@
             'Clear Stopped Tasks': 'Clear Stopped Tasks',
             'By File Name': 'By File Name',
             'By File Size': 'By File Size',
-            'By Completed Percent': 'By Completed Percent',
+            'By Progress': 'By Progress',
             'By Remain Time': 'By Remain Time',
             'By Download Speed': 'By Download Speed',
             'By Upload Speed': 'By Upload Speed',
@@ -54,7 +54,7 @@
             'Aria2 Status': 'Aria2 Status',
             'File Name': 'File Name',
             'File Size': 'File Size',
-            'Completed Percent': 'Percent',
+            'Progress': 'Progress',
             'Share Ratio': 'Share Ratio',
             'Remain Time': 'Remain',
             'Download Speed': 'Download Speed',
@@ -69,7 +69,7 @@
             'Task Size': 'Task Size',
             'Task Status': 'Task Status',
             'Error Description': 'Error Description',
-            'Health Percent': 'Health Percent',
+            'Health Percentage': 'Health Percentage',
             'Info Hash': 'Info Hash',
             'Seeders': 'Seeders',
             'Connections': 'Connections',
@@ -84,7 +84,6 @@
             'Archives': 'Archives',
             'Address': 'Address',
             'Status': 'Status',
-            'Percent': 'Percent',
             'Speed': 'Speed',
             '(local)': '(local)',
             'No Data': 'No Data',
diff --git a/src/views/list.html b/src/views/list.html
index 74ef48c..cdef392 100644
--- a/src/views/list.html
+++ b/src/views/list.html
@@ -17,7 +17,7 @@
                 <div class="col-sm-2">
                     <div class="row">
                         <div class="col-sm-6">
-                            <a ng-click="changeDisplayOrder('percent:desc', true)" translate>Completed Percent</a>
+                            <a ng-click="changeDisplayOrder('percent:desc', true)" translate>Progress</a>
                             <i class="fa" ng-class="{'fa-sort-asc fa-order-asc': isSetDisplayOrder('percent:asc'), 'fa-sort-desc fa-order-desc': isSetDisplayOrder('percent:desc')}"></i>
                         </div>
                         <div class="col-sm-6">
diff --git a/src/views/task-detail.html b/src/views/task-detail.html
index d1fa64b..0874cf0 100644
--- a/src/views/task-detail.html
+++ b/src/views/task-detail.html
@@ -58,7 +58,7 @@
                     </div>
                     <div class="row" ng-if="task">
                         <div class="setting-key col-sm-4">
-                            <span ng-bind="('Completed Percent' | translate) + (task.status == 'active' && task.bittorrent ? ' (' + ('Health Percent' | translate) + ')' : '')"></span>
+                            <span ng-bind="('Progress' | translate) + (task.status == 'active' && task.bittorrent ? ' (' + ('Health Percentage' | translate) + ')' : '')"></span>
                         </div>
                         <div class="setting-value col-sm-8">
                             <span ng-bind="(task.completePercent | percent: 2) + '%' + (task.status == 'active' && task.bittorrent ? ' (' + (context.healthPercent | percent: 2) + '%' + ')' : '')"></span>
@@ -160,7 +160,7 @@
                                 <a ng-click="showChooseFilesToolbar()" ng-if="task && task.files && task.files.length > 1 && (task.status == 'waiting' || task.status == 'paused')" translate>(Choose Files)</a>
                             </div>
                             <div class="col-sm-2">
-                                <a ng-click="changeFileListDisplayOrder('percent:desc', true)" translate>Completed Percent</a>
+                                <a ng-click="changeFileListDisplayOrder('percent:desc', true)" translate>Progress</a>
                                 <i class="fa" ng-class="{'fa-sort-asc fa-order-asc': isSetFileListDisplayOrder('percent:asc'), 'fa-sort-desc fa-order-desc': isSetFileListDisplayOrder('percent:desc')}"></i>
                             </div>
                             <div class="col-sm-2">
@@ -242,7 +242,7 @@
                                 <span translate>Status</span>
                             </div>
                             <div class="col-sm-2 col-xs-4">
-                                <a ng-click="changePeerListDisplayOrder('percent:desc', true)" translate>Percent</a>
+                                <a ng-click="changePeerListDisplayOrder('percent:desc', true)" translate>Progress</a>
                                 <i class="fa" ng-class="{'fa-sort-asc fa-order-asc': isSetPeerListDisplayOrder('percent:asc'), 'fa-sort-desc fa-order-desc': isSetPeerListDisplayOrder('percent:desc')}"></i>
                             </div>
                             <div class="col-sm-4 col-xs-4">