- rename and sort marker related variables

- rename and sort gps related variables
- clean up unused strings in AndroidManifest.xml

MyTracks/res/values-zh-rCN/strings.xml

@@ -34,12 +34,12 @@ limitations under the License.
 
   <!-- Error messages -->
   <string name="error_no_location_manager">此设备上没有位置管理器!</string>
-  <string name="error_no_gps">此设备上没有 GPS 定位装置.</string>
+  <string name="gps_not_found">此设备上没有 GPS 定位装置.</string>
   <string name="error_sending_to_my_maps">发送轨迹到 Google My Map 时发生错误.</string>
   <string name="error_sending_to_fusion_tables">发送轨迹到 Google Fusion Tables 时发生错误. 请稍后重试.</string>
   <string name="error_sending_to_docs">发送轨迹到 Google Docs 时发生错误. 请稍后重试.</string>
   <string name="error_sending_generic">请稍后再试.</string>
-  <string name="error_unable_to_start_recording">无法开始记录. 请重试.</string>
+  <string name="track_unable_to_start_recording">无法开始记录. 请重试.</string>
   <string name="error_unable_to_stop_recording">无法停止记录. 请重试.</string>
   <string name="error_import_unable_to_read_file">无法读取文件.</string>
   <string name="error_import_invalid_gpx_format">文件不是有效的 GPX 格式.</string>
@@ -47,10 +47,10 @@ limitations under the License.
   <string name="error_export_track_does_not_exist">轨迹不存在.</string>
   <string name="error_export_operation_canceled">操作已被取消.</string>
   <string name="error_import_out_of_memory">文件太大 (必须小于 500 KB). 中止操作.</string>
-  <string name="error_unable_to_insert_marker">无法插入标记. 定位尚未完成.</string>
+  <string name="marker_insert_error">无法插入标记. 定位尚未完成.</string>
 
   <!-- Status messages -->
-  <string name="status_wait_for_gps_fix">等待更准确的 GPS 定位. 请确定可以看见天空.</string>
+  <string name="gps_wait_for_fix">等待更准确的 GPS 定位. 请确定可以看见天空.</string>
   <string name="status_now_recording">现在开始记录新的轨迹.</string>
   <string name="status_stopped_recording">停止记录你的轨迹.</string>
   <string name="sending_to_my_maps_success_new_map">已在 maps.google.com 创建了新的 Google My Map.</string>
@@ -59,11 +59,11 @@ limitations under the License.
   <string name="sending_to_docs_success_new_doc">你的轨迹已经作为新的电子表格发送到 docs.google.com.</string>
   <string name="sending_to_docs_success_existing_doc">你的轨迹已经发送到 docs.google.com.</string>
   <string name="sending_to_google_additional_info">可能需要等待几分钟才能看见新的轨迹.</string>
-  <string name="status_need_to_enable_gps">请点击这里进入\'安全和位置设置\'并勾选上\'启用 GPS 卫星\'. 然后用后退键返回.</string>
+  <string name="gps_need_to_enable">请点击这里进入\'安全和位置设置\'并勾选上\'启用 GPS 卫星\'. 然后用后退键返回.</string>
   <string name="status_approximate_current_location">注意: 当前显示的位置是根据无线信号和无线网络计算的近似位置.</string>
   <string name="status_no_current_location">目前无法定位. 请启用更多的位置来源 (在\'安全和位置设置\'中) 并确认天空是可见的. 再重试.</string>
   <string name="status_waypoint_inserted">插入了一个路点标记.</string>
-  <string name="status_marker_inserted">插入了一个统计标记.</string>
+  <string name="marker_insert_success">插入了一个统计标记.</string>
   <string name="sending_to_google_upload_status">上传状态:</string>
 
   <!-- Progress dialog -->
@@ -114,14 +114,14 @@ limitations under the License.
   <string name="ok">确定</string>
   <string name="error">错误</string>
   <string name="success">成功</string>
-  <string name="waypoint">路点</string>
+  <string name="marker_type_waypoint">路点</string>
   <string name="license">授权</string>
   <string name="cancel">取消</string>
   <string name="save">保存</string>
 
   <!-- Placemark labels for start and end of track -->
-  <string name="start">(开始)</string>
-  <string name="end">(结束)</string>
+  <string name="marker_label_start">(开始)</string>
+  <string name="marker_label_end">(结束)</string>
 
   <!--  TrackList -->
   <string name="tracklist_show_track">显示</string>
@@ -167,13 +167,13 @@ limitations under the License.
 
   <!-- Waypoints list -->
   <string name="waypointslist_btn_delete_all">删除所有标记</string>
-  <string name="waypointslist_this_waypoint">此标记</string>
-  <string name="waypointslist_delete_waypoint">删除</string>
-  <string name="waypointslist_edit_waypoint">编辑详情</string>
-  <string name="waypointslist_show_waypoint">在地图上显示</string>
-  <string name="waypointslist_btn_insert_waypoint">插入路点</string>
-  <string name="waypointslist_btn_insert_statistics">插入统计信息</string>
-  <string name="waypointslist_pick_one">选择一个标记. 长按弹出操作菜单.</string>
+  <string name="marker_list_this_marker">此标记</string>
+  <string name="marker_list_delete_marker">删除</string>
+  <string name="marker_list_edit_marker">编辑详情</string>
+  <string name="marker_list_show_on_map">在地图上显示</string>
+  <string name="marker_list_insert_waypoint">插入路点</string>
+  <string name="marker_list_insert_statistics">插入统计信息</string>
+  <string name="marker_list_pick_one">选择一个标记. 长按弹出操作菜单.</string>
 
   <!-- MyTracks Details -->
   <string name="trackdetails_title">轨迹详细信息</string>
@@ -185,13 +185,11 @@ limitations under the License.
   <string name="trackdetails_category_hint">活动类型</string>
 
   <!-- MyTracks Waypoint Details -->
-  <string name="waypointdetails_title">标记详细信息</string>
-  <string name="waypointdetails_name">标记名称</string>
-  <string name="waypointdetails_name_hint">标记名称</string>
-  <string name="waypointdetails_description">标记描述</string>
-  <string name="waypointdetails_description_hint">标记描述</string>
-  <string name="waypointdetails_category">标记类型 (例如: 建筑, 陷坑, 景点...)</string>
-  <string name="waypointdetails_category_hint">标记类型</string>
+  <string name="marker_detail_title">标记详细信息</string>
+  <string name="marker_detail_marker_name">标记名称</string>
+  <string name="marker_detail_marker_description">标记描述</string>
+  <string name="marker_detail_marker_type">标记类型 (例如: 建筑, 陷坑, 景点...)</string>
+  <string name="marker_detail_marker_type_hint">标记类型</string>
 
   <!-- MyTracks Settings -->
   <string name="settings_title">My Tracks 设置</string>
@@ -377,7 +375,7 @@ limitations under the License.
   <string name="sd_unavail">没有 SD 卡</string>
   <string name="speed">速度</string>
   <string name="start_trip">你必须先记录轨迹.</string>
-  <string name="statistics">统计</string>
+  <string name="marker_type_statistics">统计</string>
   <string name="total_distance_label">总距离</string>
   <string name="distance_label">距离</string>
   <string name="power">电源</string>