1.优化区分信号弱/无信号(4种状态：1. wifi zone 中/关机/休眠/充电/超时无上报-关，2. 信号大于50-强，信号大于0小于50 -弱，3. 信号等于0-无)

2.修复围栏编辑和添加保存时/删除时，还可以输入内容和点‘取消’按钮
3.修复删除围栏时，还可以点击编辑按钮
4.修复轨迹页面围栏名字太长，列表对不齐
5.修复轨迹只有3个点时，滑块滑不动的bug
6.修复直播页面第三个导航无法点击bug
7.校对多语言字符

app/src/main/res/values/strings.xml

@@ -97,9 +97,9 @@
         <item>86</item>
         <item>81</item>
     </integer-array>
-    <!--字符串英文-->
-    <!--Key Name English-->
     <!--http://stackoverflow.com/questions/17502824/whats-wrong-with-this-format-string-->
+
+    <!-- English-Android	 -->
     <!-- login -->
     <string name="start_txt_asking">Already have a GPS Tracker?</string>
     <string name="start_txt_no">Not yet</string>
@@ -262,7 +262,7 @@
     <string name="map_navigate_map_google">Google Map</string>
     <string name="map_navigate_map_gaode">Gaode Map</string>
     <string name="map_navigate_cancel">Cancel</string>
-    <string name="txt_no_install">Install the map app to navigate</string>
+    <string name="txt_no_install">The APP is not installed, please download and install the app first</string>
     <!-- Data -->
     <string name="data_active_time">Active Time</string>
     <string name="data_active_goal">Goal</string>
@@ -796,7 +796,7 @@
     <string name="txt_hours">hours</string>
     <string name="txt_search_device">Searching…</string>
     <string name="txt_no_search_device">Keep tracker on and nearby to scan.</string>
-    <string name="txt_battery_less_than">Less than %s%%</string>
+    <string name="txt_battery_less_than">Battery less than %s%%</string>
     <string name="txt_outside">Outside</string>
     <string name="txt_inside">Inside</string>
     <string name="txt_7days_avg">7 Days Avg.</string>
@@ -823,7 +823,7 @@
     <string name="txt_no_signal">No signal</string>
     <string name="txt_wifi">WiFi</string>
     <string name="txt_set_measurement_units">Select measurement unit</string>
-    <string name="txt_metric">Metric(cm, kg)</string>
+    <string name="txt_metric">Metric(cm, kg)  </string>
     <string name="txt_imperial">Imperial(in, lb)</string>
     <string name="txt_km_h">km/h</string>
     <string name="txt_mph">mph</string>
@@ -941,12 +941,12 @@
     <string name="txt_renewal_month">Renewal: $%s/month on %s</string>
     <string name="txt_renewal_month1">Renewal:</string>
     <string name="txt_renewal_month2">/month on</string>
-    <string name="txt_annual_care">Replacement Coverage</string>
+    <string name="txt_annual_care">Annual Care Protection</string>
     <string name="txt_replace_guarantee_dec">$12.90/year for peace of mind and easy 1-unit replacement annually.</string>
     <string name="txt_replace_guarantee">Replacement Guarantee</string>
     <string name="txt_enter_discount_code">Enter discount code</string>
     <string name="txt_check">Check</string>
-    <string name="txt_annual_care_text">Replacement Coverage</string>
+    <string name="txt_annual_care_text">Annual Care</string>
     <string name="txt_annual_care_text1">Annual Care: </string>
     <string name="txt_ble_connect_fail">Bluetooth connection failed</string>
     <string name="txt_led_light_set">LED Light Settings</string>
@@ -1008,7 +1008,7 @@
     <string name="txt_delete_succe">Delete successfully</string>
     <string name="txt_edit_pay_method">Edit Payment Method</string>
     <string name="txt_sure_delete_card">Sure to delete this card?</string>
-    <string name="txt_account_exists_log_in">Account exists. Log in now?</string>
+    <string name="txt_account_exists_log_in">Account exists. Log in now?</string>
     <string name="txt_time_out_of_range">Selected date is out of range</string>
     <string name="txt_power_on_off_install_tip">Shake to wake your tracker next time.</string>
     <string name="txt_check_tracker_status_top_tip">Turn on the tracker, open the app, go to \'Pet\' > \'Tracker\' on the dashboard, then tap \'Network\', \'GPS\', \'Battery\', \'WiFi zone\', \'Bluetooth\', or \'Light\' to check connectivity, signal, or battery status.</string>
@@ -1022,6 +1022,9 @@
     <string name="txt_please_enter_email">Please enter email address.</string>
     <string name="txt_wifi_password_dec">Wi-Fi ensures your tracker stays connected when LTE signals are weak.</string>
     <string name="txt_update_time">Updated: %s</string>
+    <string name="txt_1_year_subscription">1 Year Subscription</string>
+    <string name="txt_2_year_subscription">2 Year Subscription</string>
+    <string name="txt_3_year_subscription">3 Year Subscription</string>
     <string name="txt_as_low_as">As low as</string>
     <string name="txt_payment_manager">Payment Manager</string>
     <string name="txt_billed_annually">Billed annually</string>
@@ -1031,42 +1034,34 @@
     <string name="txt_activity_logs">Activity/Resting Logs</string>
     <string name="txt_notifications_emergencies">Notifications for Emergencies</string>
     <string name="txt_customized_led">Customized LED</string>
-    <string name="txt_bluetooth_radar">Bluetooth Radar</string>
     <string name="txt_geofencing">Geofencing</string>
     <string name="txt_route_records">Route History Records</string>
     <string name="txt_family_sharing">Family Members Sharing</string>
     <string name="txt_customer_support">Premium Customer Support</string>
-    <string name="txt_renewal_years">Renewal: $%s/%s years on %s</string>
-    <string name="txt_renewal_months">Renewal: $%s/%s months on %s</string>
-    <string name="txt_replacement_year">1 replacement/year, any reason</string>
-    <string name="txt_expiry_time">Expiry Time:</string>
-    <string name="txt_year_care">%s Year Care</string>
-    <string name="txt_fence_saved">Saved. Active when online.</string>
     <string name="txt_show_crash">The program has an exception and is about to exit</string>
     <string name="txt_activate_subscribe">Activate Subscription</string>
     <string name="txt_powered_off">Powered off</string>
     <string name="txt_near">Near %s</string>
     <string name="txt_charging">Charging</string>
-    <string name="txt_total_time">Total Time</string>
     <string name="txt_live_works_cellular">Live works on cellular only</string>
     <string name="txt_unbind_device">Unbind Device</string>
     <string name="txt_edit_profile">Edit Profile</string>
     <string name="txt_no_internet">No internet connection</string>
+    <string name="txt_per_day">/day</string>
+    <string name="txt_renewal_day">Renewal: $%s/%s day on %s</string>
+    <string name="txt_day_unit">/day x%s</string>
+    <string name="txt_location_tip">ABBIDOT APP collects location data,The route and distance between the current location and the device can be calculated.</string>
+    <string name="txt_auto_subscription_day">(Renew at $%s per %s day thereafter)</string>
+    <string name="txt_auto_subscription_days">(Renew at $%s/%s days thereafter)</string>
+    <string name="txt_auto_subscription_years">(Renew at $%s/%s years thereafter)</string>
+    <string name="txt_auto_subscription_months">(Renew at $%s/%s months thereafter)</string>
     <string name="txt_system_error">System Error: Please try again later.</string>
     <string name="txt_missing_param">Missing Parameters.</string>
     <string name="txt_tracker_busy">Tracker Busy. Please wait and retry.</string>
     <string name="txt_tracker_offline">Tracker Offline. Unable to proceed.</string>
     <string name="txt_tracker_live">Live stream in progress. Settings unavailable.</string>
     <string name="txt_abnormity">Operation failed. Please try again.</string>
-    <string name="txt_per_day">/day</string>
-    <string name="txt_renewal_day">Renewal: $%s/%s day on %s</string>
-    <string name="txt_day_unit">/day x%s</string>
-    <string name="txt_location_tip">"ABBIDOT APP collects location data,The route and distance between the current location and the device can be calculated."</string>
-    <string name="txt_auto_subscription_day">(Renew at $%s per day thereafter)</string>
-    <string name="txt_auto_subscription_days">(Renew at $%s/%s days thereafter)</string>
     <string name="txt_locating">Locating&#8230;</string>
-    <string name="txt_auto_subscription_years">(Renew at $%s/%s years thereafter)</string>
-    <string name="txt_auto_subscription_months">(Renew at $%s/%s months thereafter)</string>
     <string name="txt_tone">Tone</string>
     <string name="txt_locate_works">Locate works on cellular only</string>
     <string name="txt_pet_close">Pet is close, try Radar</string>
@@ -1075,9 +1070,17 @@
     <string name="txt_fully_charged">Fully charged</string>
     <string name="txt_fell_asleep">Fell asleep %s ago</string>
     <string name="txt_move_wake_up">Move %s to wake up</string>
-    <string name="map_baidu_map">Baidu Map</string>
     <string name="txt_time_line">Timeline</string>
     <string name="txt_phone_close_device">Keep phone close to device</string>
     <string name="txt_auto_renew_cancel">Auto-Renew: Cancel</string>
+    <string name="txt_year_care">%s Year Care</string>
+    <string name="txt_expiry_time">Expiry Time:</string>
+    <string name="txt_replacement_year">1 replacement/year, any reason</string>
+    <string name="txt_total_time">Total Time</string>
+    <string name="txt_bluetooth_radar">Bluetooth Radar</string>
+    <string name="txt_fence_saved">Saved. Active when online.</string>
+    <string name="txt_renewal_years">Renewal: $%s/%s years on %s</string>
+    <string name="txt_renewal_months">Renewal: $%s/%s months on %s</string>
+    <string name="map_baidu_map">Baidu Map</string>
 
 </resources>