From 395902b7fadad69b67fe696a81782014d168e1e2 Mon Sep 17 00:00:00 2001
From: sephinroth <jingcheng01@gmail.com>
Date: Thu, 18 Sep 2014 10:06:57 +0800
Subject: [PATCH] Update some translations.

---
 res/values-en/strings.xml | 85 +++++++++++++++++++--------------------
 res/values/strings.xml    | 37 +++++++++--------
 2 files changed, 60 insertions(+), 62 deletions(-)

diff --git a/res/values-en/strings.xml b/res/values-en/strings.xml
index b1be944..bf86f39 100644
--- a/res/values-en/strings.xml
+++ b/res/values-en/strings.xml
@@ -2,7 +2,7 @@
 <resources>
 
     <string name="app_name">Emmagee</string>
-    <string name="setting">Setting</string>
+    <string name="setting">Settings</string>
     <string name="exit">Exit</string>
 
     <string name="start_test">Start Test</string>
@@ -13,57 +13,56 @@
     <string name="sender">Sender:</string>
     <string name="password">Password:</string>
     <string name="smtp">SMTP Server:</string>
-    <string name="receiver">Receiver(Space division multiple people):</string>
-    <string name="floating_window">Whether to display the floating window</string>
+    <string name="receiver">Receivers(seperated by space):</string>
+    <string name="floating_window">Show floating window</string>
     <string name="save">Save</string>
 
-    <string name="calculating">Calculating, please waiting...</string>
-    <string name="open_wifi">Open Wifi</string>
-    <string name="close_wifi">Close wifi</string>
-    <string name="process_free_mem">Process/Free Memory:</string>
-    <string name="process_overall_cpu">Process/Total CPU:</string>
+    <string name="calculating">Calculating...</string>
+    <string name="open_wifi">Enable WIFI</string>
+    <string name="close_wifi">Disable WIFI</string>
+    <string name="process_free_mem">App/Avaiable Memory:</string>
+    <string name="process_overall_cpu">App/System CPU:</string>
     <string name="start_time">Start Time:</string>
     <string name="total_usage">Total usage</string>
-    <string name="app_monitor_title">The Monitor Information of Specified Process</string>
-    <string name="process_package">Process Package</string>
-    <string name="process_name">Process name</string>
-    <string name="process_pid">Process PID</string>
-    <string name="mem_size">Mobile Memory Size</string>
-    <string name="cpu_type">Mobile CPU Type</string>
-    <string name="android_system_version">Android System Version</string>
-    <string name="mobile_type">Mobile Type</string>
-    <string name="datetime">Datetime</string>
-    <string name="used_mem_PSS">App Used Memory(PSS)</string>
-    <string name="used_mem_ratio">App Used Memory Ratio比</string>
-    <string name="mobile_free_mem">Free Memory</string>
-    <string name="app_used_cpu_ratio">App Used CPU Ratio</string>
-    <string name="total_used_cpu_ratio">Total Used CPU Ratio</string>
-    <string name="traffic">Traffic</string>
-    <string name="battery">Battery</string>
-    <string name="current">Current</string>
-    <string name="temperature">Temperature</string>
-    <string name="voltage">Voltage</string>
+    <string name="process_package">Package Name</string>
+    <string name="process_name">App Name</string>
+    <string name="process_pid">App PID</string>
+    <string name="mem_size">Device Memory Size</string>
+    <string name="cpu_type">Device CPU Type</string>
+    <string name="android_system_version">Android Version</string>
+    <string name="mobile_type">Device Brand/Model</string>
+    <string name="datetime">Timestamp</string>
+    <string name="used_mem_PSS">App Used Memory(PSS, MB)</string>
+    <string name="used_mem_ratio">App Used Memory(%)</string>
+    <string name="mobile_free_mem">System Available Memory(MB)</string>
+    <string name="app_used_cpu_ratio">App Used CPU(%)</string>
+    <string name="total_used_cpu_ratio">Total Used CPU(%)</string>
+    <string name="traffic">Net Traffic(KB)</string>
+    <string name="battery">Battery(%)</string>
+    <string name="current">Current(mA)</string>
+    <string name="temperature">Temperature(C)</string>
+    <string name="voltage">Voltage(V)</string>
     <string name="stat_error">Stat Error</string>
 
-    <string name="comment1">Comment:Some known devices are not supported:https://github.com/NetEase/Emmagee/wiki/Some-devices-are-not-supported</string>
-    <string name="comment2">Current:less then 0 is discharging and greater then 0 is charging.</string>
-    <string name="comment3">Start time is blank means the app have started or failed to get the start time.</string>
-    <string name="comment4">N/A means not supported or data exception.</string>
+    <string name="comment1">Note: for unsupported devices refer to: https://github.com/NetEase/Emmagee/wiki/Some-devices-are-not-supported</string>
+    <string name="comment2">Current: negative for discharging while positive for charging</string>
+    <string name="comment3">Start time: empty means either the app has been started or failed to fetch start time</string>
+    <string name="comment4">N/A: not supported or data exception</string>
 
-    <string name="can_not_start_app_toast">The app can not start</string>
-    <string name="choose_app_toast">Please select the test app</string>
-    <string name="test_result_file_toast">The test result file:</string>
-    <string name="save_success_toast">Saved successfully</string>
-    <string name="sender_mail_toast">Sender email</string>
-    <string name="receiver_mail_toast">Receiver email</string>
-    <string name="format_incorrect_format">\'s format is incorrect</string>
-    <string name="info_incomplete_toast">The email setting is incomplete, please finish them.</string>
-    <string name="wifi_fail_toast">Operate wifi failed</string>
-    <string name="send_success_toast">The test result have send to your email.</string>
-    <string name="send_fail_toast">The test result have not send to your email, saved at:</string>
+    <string name="can_not_start_app_toast">The app can not be launched</string>
+    <string name="choose_app_toast">Please select target app</string>
+    <string name="test_result_file_toast">Test result file:</string>
+    <string name="save_success_toast">Saved</string>
+    <string name="sender_mail_toast">Sender's email</string>
+    <string name="receiver_mail_toast">Receiver's email</string>
+    <string name="format_incorrect_format">Invalid email format</string>
+    <string name="info_incomplete_toast">Incomplete email settings</string>
+    <string name="wifi_fail_toast">Failed to set WIFI</string>
+    <string name="send_success_toast">Test result has been sent to:</string>
+    <string name="send_fail_toast">Test result failed to be sent to your mailbox, saved at:</string>
 
     <string name="ok">OK</string>
     <string name="cancel">Cancel</string>
     <string name="confirm">Are you sure to exit？</string>
 
-</resources>
\ No newline at end of file
+</resources>
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 6aa4653..89766c0 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -17,38 +17,37 @@
     <string name="floating_window">是否显示浮窗</string>
     <string name="save">保存</string>
 
-    <string name="calculating">计算中,请稍后...</string>
-    <string name="open_wifi">开启wifi</string>
-    <string name="close_wifi">关闭wifi</string>
+    <string name="calculating">计算中...</string>
+    <string name="open_wifi">开启WIFI</string>
+    <string name="close_wifi">关闭WIFI</string>
     <string name="process_free_mem">应用/剩余内存:</string>
     <string name="process_overall_cpu">应用/总体CPU:</string>
     <string name="start_time">启动时间:</string>
     <string name="total_usage">总使用率</string>
-    <string name="app_monitor_title">指定应用的CPU内存监控情况</string>
     <string name="process_package">应用包名</string>
     <string name="process_name">应用名称</string>
     <string name="process_pid">应用PID</string>
     <string name="mem_size">机器内存大小</string>
     <string name="cpu_type">机器CPU型号</string>
-    <string name="android_system_version">机器Android系统版本</string>
+    <string name="android_system_version">Android系统版本</string>
     <string name="mobile_type">手机型号</string>
     <string name="datetime">时间</string>
-    <string name="used_mem_PSS">应用占用内存PSS</string>
+    <string name="used_mem_PSS">应用占用内存PSS(MB)</string>
     <string name="used_mem_ratio">应用占用内存比</string>
-    <string name="mobile_free_mem">机器剩余内存</string>
+    <string name="mobile_free_mem">机器剩余内存(MB)</string>
     <string name="app_used_cpu_ratio">应用占用CPU率</string>
     <string name="total_used_cpu_ratio">CPU总使用率</string>
-    <string name="traffic">流量</string>
-    <string name="battery">电量</string>
-    <string name="current">电流</string>
-    <string name="temperature">温度</string>
-    <string name="voltage">电压</string>
+    <string name="traffic">流量(KB)</string>
+    <string name="battery">电量(%)</string>
+    <string name="current">电流(mA)</string>
+    <string name="temperature">温度(C)</string>
+    <string name="voltage">电压(V)</string>
     <string name="stat_error">统计出错</string>
 
     <string name="comment1">注释:已知部分不支持的机型可在此查阅:https://github.com/NetEase/Emmagee/wiki/Some-devices-are-not-supported</string>
-    <string name="comment2">电流:小于0是放电,大于0是充电</string>
-    <string name="comment3">启动时间:为空是应用已启动或者未搜集到启动时间</string>
-    <string name="comment4">N/A表示不支持或者数据异常</string>
+    <string name="comment2">电流: 小于0是放电,大于0是充电</string>
+    <string name="comment3">启动时间: 为空是应用已启动或者未搜集到启动时间</string>
+    <string name="comment4">N/A: 不支持或者数据异常</string>
 
     <string name="can_not_start_app_toast">该程序无法启动</string>
     <string name="choose_app_toast">请选择需要测试的应用程序</string>
@@ -58,12 +57,12 @@
     <string name="receiver_mail_toast">收件人邮箱</string>
     <string name="format_incorrect_format">格式不正确</string>
     <string name="info_incomplete_toast">邮箱配置不完整，请完善所有信息</string>
-    <string name="wifi_fail_toast">操作wifi失败</string>
-    <string name="send_success_toast">"测试结果报表已发送至邮箱:"</string>
-    <string name="send_fail_toast">"测试结果未成功发送至邮箱，结果保存在:"</string>
+    <string name="wifi_fail_toast">操作WIFI失败</string>
+    <string name="send_success_toast">测试结果报表已发送至邮箱:</string>
+    <string name="send_fail_toast">测试结果未成功发送至邮箱，结果保存在:</string>
 
     <string name="ok">确定</string>
     <string name="cancel">取消</string>
     <string name="confirm">确定退出程序？</string>
 
-</resources>
\ No newline at end of file
+</resources>
-- 
GitLab