Merge: i18n,conflict res/

AndroidManifest.xml

@@ -11,22 +11,18 @@
         <activity
             android:name=".activity.MainPageActivity"
             android:label="@string/app_name"
-            android:configChanges="orientation|keyboardHidden" 
+            android:configChanges="orientation|keyboardHidden"
             android:launchMode="singleInstance" >   <!-- 防止程序横屏以后重新启动 -->
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
                 <!-- <category android:name="android.intent.category.DEFAULT" /> -->
                 <category android:name="android.intent.category.LAUNCHER" />
             </intent-filter>
         </activity>
-        <activity
-            android:name=".activity.SystemActivity"
-            android:label="@string/app_name2" >
-        </activity>
-
+
         <activity
             android:name=".activity.SettingsActivity"
-            android:label="@string/app_name4" >
+            android:label="@string/setting" >
         </activity>
 
         <activity android:name=".activity.AboutActivity" />
@@ -37,6 +33,7 @@
             android:name="com.netease.qa.emmagee.service.EmmageeService">
         </service>
     </application>
+
     <uses-permission android:name="android.permission.SYSTEM_ALERT_WINDOW" />
     <uses-permission android:name="android.permission.MOUNT_UNMOUNT_FILESYSTEMS"/>
     <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" /> 

res/layout/floating.xml

@@ -63,7 +63,7 @@
                     android:layout_height="40dp" />
                 <Button
                     android:id="@+id/stop"
-                    android:text="停止测试"
+                    android:text="@string/stop_test"
                     android:textSize = "12dp"
                     android:layout_width="80dp"
                     android:layout_height="40dp" />

res/layout/mainpage.xml

@@ -24,7 +24,7 @@
             android:layout_height="wrap_content"
             android:layout_marginBottom="6dp"
             android:gravity="center_horizontal"
-            android:text="@string/bg" />
+            android:text="@string/start_test" />
     </LinearLayout>
 
 </LinearLayout>

res/layout/navigation_bar.xml

@@ -19,7 +19,7 @@
         android:layout_weight="1"
         android:gravity="center"
         android:singleLine="true"
-        android:text="@string/app_name4"
+        android:text="@string/setting"
         android:textColor="@color/white"
         android:textSize="@dimen/text_size_big" />
 

res/layout/settings.xml

@@ -13,8 +13,8 @@
         <include
             android:id="@+id/etNumCpuCores"
             android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            layout="@layout/navigation_bar" />
+            android:layout_height="wrap_content"
+            layout="@layout/navigation_bar" />
     </LinearLayout>
 
     <LinearLayout
@@ -44,7 +44,7 @@
                 <TextView
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:text="@string/collect"
+                    android:text="@string/collecting_frequency"
                     android:textColor="@color/black"
                     android:textSize="@dimen/text_size" />
 
@@ -84,7 +84,7 @@
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_centerVertical="true"
-                    android:text="@string/window"
+                    android:text="@string/floating_window"
                     android:textColor="@color/black"
                     android:textSize="@dimen/text_size" />
 
@@ -166,5 +166,5 @@
                 </LinearLayout>
             </LinearLayout>
         </LinearLayout>
-    </LinearLayout>
-</LinearLayout>
+    </LinearLayout>
+</LinearLayout>

res/values-zh-rCN/strings.xml

@@ -0,0 +1,71 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+
+    <string name="app_name">Emmagee</string>
+    <string name="setting">设置</string>
+    <string name="exit">退出</string>
+
+    <string name="start_test">开始测试</string>
+    <string name="stop_test">停止测试</string>
+
+    <string name="collecting_frequency">采集频率:</string>
+    <string name="seconds">秒</string>
+    <string name="sender">发件人:</string>
+    <string name="password">密码:</string>
+    <string name="smtp">SMTP服务器:</string>
+    <string name="receiver">收件人(多人以空格分割):</string>
+    <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="process_free_mem">应用/剩余内存:</string>
+    <string name="process_overall_cpu">应用/总体CPU:</string>
+    <string name="start_time">启动时间:</string>
+    <string name="total_usage">总使用率(%)</string>
+    <string name="process_package">应用包名</string>
+    <string name="process_name">应用名称</string>
+    <string name="process_pid">应用PID</string>
+    <string name="mem_size">机器内存大小(MB)</string>
+    <string name="cpu_type">机器CPU型号</string>
+    <string name="android_system_version">Android系统版本</string>
+    <string name="mobile_type">手机型号</string>
+    <string name="timestamp">时间</string>
+    <string name="used_mem_PSS">应用占用内存PSS(MB)</string>
+    <string name="used_mem_ratio">应用占用内存比(%)</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">流量(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="can_not_start_app_toast">该程序无法启动</string>
+    <string name="choose_app_toast">请选择需要测试的应用程序</string>
+    <string name="test_result_file_toast">测试结果文件：</string>
+    <string name="save_success_toast">保存成功</string>
+    <string name="sender_mail_toast">发件人邮箱:</string>
+    <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="ok">确定</string>
+    <string name="cancel">取消</string>
+    <string name="confirm">确定退出程序？</string>
+
+    <string name="about">关于</string>
+    <string name="mail_settings">邮件发送配置</string>
+
+</resources>