merge heads

This commit is contained in:
Jimmy Shih
2011-10-31 09:41:15 -07:00
parent c1d4dd92cd
commit 507ab6723c
26 changed files with 570 additions and 289 deletions
+12 -14
View File
@@ -71,30 +71,30 @@ limitations under the License.
<string name="progress_message">发送你的轨迹到 Google.</string>
<string name="progress_message_reading_track">读取轨迹中...</string>
<string name="progress_message_preparing_track">准备轨迹中...</string>
<string name="progress_message_authenticating_fusiontables">登录 Google Fusion Tables 中...</string>
<string name="progress_message_authenticating_fusion_tables">登录 Google Fusion Tables 中...</string>
<string name="progress_message_authenticating_docs">登录 Google Docs 中...</string>
<string name="progress_message_sending_docs">发送轨迹到 Google Docs 中...</string>
<string name="progress_message_sending_fusiontables">发送轨迹到 Google Fusion Tables 中...</string>
<string name="progress_message_creating_fusiontable">创建新的 Fusion Table 中...</string>
<string name="progress_message_sending_fusion_tables">发送轨迹到 Google Fusion Tables 中...</string>
<string name="progress_message_creating_fusion_table">创建新的 Fusion Table 中...</string>
<string name="progress_message_creating_map">创建新的 My Map...</string>
<string name="progress_message_sending_fusiontables">发送轨迹到 Fusion Tables...</string>
<string name="progress_message_creating_fusiontable">创建新的 Fusion table...</string>
<string name="import_progress_message">导入 GPS 轨迹中. 请稍候.</string>
<string name="write_progress_message">写入文件到 SD 卡中. 请稍候.</string>
<string name="progress_message_sending_fusion_tables">发送轨迹到 Fusion Tables...</string>
<string name="progress_message_creating_fusion_table">创建新的 Fusion table...</string>
<string name="progress_message_import">导入 GPS 轨迹中. 请稍候.</string>
<string name="progress_message_export">写入文件到 SD 卡中. 请稍候.</string>
<string name="progress_message_updating_track">更新轨迹统计信息中...</string>
<!-- Used by DeleteAllDataHandler -->
<string name="are_you_sure_question">请确认</string>
<string name="confirmation_title_are_you_sure">请确认</string>
<string name="all_data_will_be_permanently_deleted">所以轨迹和标记都将被从本机删除.</string>
<string name="track_will_be_permanently_deleted">选定轨迹和它相关的标记都将被从本机彻底删除.</string>
<string name="marker_will_be_permanently_deleted">选定标记将被从本机删除.</string>
<!-- Text and links when uploading to Google Fusion Tables -->
<string name="new_map_description">由 Android 平台的 My Tracks 创建.</string>
<string name="fusiontable_link">由 Android 平台的 &lt;a href=\'http://mytracks.appspot.com\'&gt;My Tracks&lt;/a&gt; 创建.</string>
<string name="send_to_google_by_mytracks">由 Android 平台的 &lt;a href=\'http://mytracks.appspot.com\'&gt;My Tracks&lt;/a&gt; 创建.</string>
<!-- Text and links when uploading to Google My Maps -->
<string name="fusiontable_link">由 Android 上的 &lt;a href=\'http://mytracks.appspot.com\'&gt;My Tracks&lt;/a&gt; 创建.</string>
<string name="send_to_google_by_mytracks">由 Android 上的 &lt;a href=\'http://mytracks.appspot.com\'&gt;My Tracks&lt;/a&gt; 创建.</string>
<string name="new_map_title">新地图</string>
<!-- Formatting of track and marker descriptions -->
@@ -102,11 +102,11 @@ limitations under the License.
<string name="recorded_date">记录日期</string>
<string name="category">活动类型</string>
<string name="waypoint_category">标记类型</string>
<string name="part">(第 %d 部分)</string>
<string name="track_part_format">(第 %d 部分)</string>
<!-- Used by the track recording service -->
<string name="recording_your_track">记录轨迹中...</string>
<string name="new_track">轨迹 %d</string>
<string name="new_track_format">轨迹 %d</string>
<!-- Common -->
<string name="no">否</string>
@@ -117,8 +117,6 @@ limitations under the License.
<string name="waypoint">路点</string>
<string name="license">授权</string>
<string name="cancel">取消</string>
<string name="close">关闭</string>
<string name="edit">编辑</string>
<string name="save">保存</string>
<!-- Placemark labels for start and end of track -->