Merge heads

This commit is contained in:
youtaol
2012-06-25 11:08:12 +08:00
parent b337da3719
commit 1c20addf6d
122 changed files with 854 additions and 1252 deletions
+92 -38
View File
@@ -960,9 +960,9 @@ limitations under the License.
Marker type: %1$s
</string>
<string name="marker_edit_marker_type"
translation_description="In the marker edit page, the label for the marker type, including some
examples.">
Marker type (e.g. building, waterfall...)
translation_description="In the marker edit page, the label for the marker type, including an
example.">
Marker type (e.g. waterfall)
</string>
<string name="marker_edit_marker_type_hint"
translation_description="In the marker edit page, the hint in the marker type text field when it
@@ -1002,106 +1002,153 @@ limitations under the License.
<!-- Menu Items -->
<string name="menu_aggregated_statistics"
translation_description="In the menu, to go to the aggregated statistics page.">
Aggregated statistics
translation_description="In the menu, to go to the aggregated statistics page.
Character limit: ~21 (1 line)">
Aggregated stats
</string>
<string name="menu_delete"
translation_description="In the menu, to delete a track or a marker.">
translation_description="In the menu, to delete a track or a marker.
Character limit: ~21 (1 line)">
Delete
</string>
<string name="menu_delete_all"
translation_description="In the menu, to delete all the tracks.">
translation_description="In the menu, to delete all the tracks.
Character limit: ~21 (1 line)">
Delete all
</string>
<string name="menu_edit"
translation_description="In the menu, to edit a track or a marker.">
translation_description="In the menu, to edit a track or a marker.
Character limit: ~21 (1 line)">
Edit
</string>
<string name="menu_help"
translation_description="In the menu, to go to the help page.">
translation_description="In the menu, to go to the help page.
Character limit: ~21 (1 line)">
Help
</string>
<string name="menu_import"
translation_description="In the menu, to import tracks from the SD card.">
translation_description="In the menu, to import tracks from the SD card.
Character limit: ~21 (1 line)">
Import from SD card
</string>
<string name="menu_insert_marker"
translation_description="In the menu, to insert a marker.">
translation_description="In the menu, to insert a marker.
Character limit: ~21 (1 line)">
Insert marker
</string>
<string name="menu_map_mode"
translation_description="In the menu, to switch the display to the map mode.">
translation_description="In the menu, to switch the display to the map mode.
Character limit: ~21 (1 line)">
Map mode
</string>
<string name="menu_markers"
translation_description="In the menu, to show a list of markers for the current track.">
translation_description="In the menu, to show a list of markers for the current track.
Character limit: ~21 (1 line)">
Markers
</string>
<string name="menu_play"
translation_description="In the menu, to play a track.">
translation_description="In the menu, to play a track.
Character limit: ~21 (1 line)">
Play
</string>
<string name="menu_record_track"
translation_description="In the menu, to start recording a track.">
translation_description="In the menu, to start recording a track.
Character limit: ~21 (1 line)">
Record track
</string>
<string name="menu_satellite_mode"
translation_description="In the menu, to switch the display to the satellite mode.">
translation_description="In the menu, to switch the display to the satellite mode.
Character limit: ~21 (1 line)">
Satellite mode
</string>
<string name="menu_save"
translation_description="In the menu, to save a track to the SD card. This menu item has a
submenu.">
Save to SD card...
submenu.
Character limit: ~21 (1 line)">
Save to SD card
</string>
<string name="menu_save_all"
translation_description="In the menu, to save all the tracks to the SD card. This menu item has
a submenu.">
Save all to SD card...
a submenu.
Character limit: ~21 (1 line)">
Save all to SD card
</string>
<string name="menu_save_format"
translation_description="Under the save to SD card menu option, the option to save a track as a
certain file format.
%1$s: file format. 'GPX', 'KML', 'CSV', or 'TCX'.">
%1$s: file format. 'GPX', 'KML', 'CSV', or 'TCX'.
Character limit: ~21 (1 line)">
Save as %1$s
</string>
<string name="menu_search"
translation_description="In the menu, to start a textual search for tracks or markers.">
translation_description="In the menu, to start a textual search for tracks or markers.
Character limit: ~21 (1 line)">
Search
</string>
<string name="menu_send_google"
translation_description="In the menu, to send a track to Google.">
Send to Google...
translation_description="In the menu, to send a track to Google.
Character limit: ~21 (1 line)">
Send to Google
</string>
<string name="menu_sensor_state"
translation_description="In the menu, to go to the sensor state page.">
translation_description="In the menu, to go to the sensor state page.
Character limit: ~21 (1 line)">
Sensor state
</string>
<string name="menu_settings"
translation_description="In the menu, to go to the settings page.">
translation_description="In the menu, to go to the settings page.
Character limit: ~21 (1 line)">
Settings
</string>
<string name="menu_share"
translation_description="In the menu, to share a track.">
translation_description="In the menu, to share a track.
Character limit: ~21 (1 line)">
Share
</string>
<string name="menu_show_on_map"
translation_description="In the menu, to show a track or a marker on the map.">
translation_description="In the menu, to show a track or a marker on the map.
Character limit: ~21 (1 line)">
Show on map
</string>
<string name="menu_split_frequency"
translation_description="In the menu, to configure the split frequency, how frequent to insert a
split marker.">
split marker.
Character limit: ~21 (1 line)">
Split frequency
</string>
<string name="menu_stop_recording"
translation_description="In the menu, to stop recording a track.">
translation_description="In the menu, to stop recording a track.
Character limit: ~21 (1 line)">
Stop recording
</string>
<string name="menu_voice_frequency"
translation_description="In the menu, to configure the voice frequency, how frequent to announce
status.">
status.
Character limit: ~21 (1 line)">
Voice frequency
</string>
@@ -1312,6 +1359,11 @@ limitations under the License.
found.">
No account found
</string>
<string name="send_google_no_account_permission"
translation_description="When sending to Google, the message when not able to get account
permission.">
Not able to get account permission. Make sure network is available.
</string>
<string name="send_google_no_service_selected"
translation_description="When sending a track to Google, a message indicating that the user has
not selected any Google service and no data is sent.">
@@ -2148,6 +2200,11 @@ limitations under the License.
Play Store.">
You need Google Earth to play the track. Do you want to install from the Play Store?
</string>
<string name="track_detail_install_earth_error"
translation_description="Message informing the user not able to install Google Earth from the
Play Store.">
Unalbe to install Google Earth from the Play Store.
</string>
<string name="track_detail_map_tab"
translation_description="In the track detail page, the title of the tab showing the map.">
Map
@@ -2162,8 +2219,8 @@ limitations under the License.
</string>
<string name="track_edit_activity_type"
translation_description="In the page to edit a track, the label for the text field to edit the
activity type, including some examples of activity types.">
Activity type (e.g. hiking, cycling...)
activity type, including an example.">
Activity type (e.g. hiking)
</string>
<string name="track_edit_activity_type_hint"
translation_description="In the page to edit a track, the hint in the 'Activity type' text field
@@ -2925,11 +2982,8 @@ limitations under the License.
<!-- Welcome -->
<string name="welcome_message"
translation_description="The message of the welcome dialog.">
Use My Tracks while you walk, run, bike, or do anything else outdoors to record your path. While
recording, you can visualize your track and watch live statistics. You can also add markers,
have split markers inserted periodically, or hear periodic announcements of your progress.
For recorded tracks, you can play them on Google Earth, share with friends, or upload to Google
Maps, Google Fusion Tables, or Google Docs.
Welcome to My Tracks. Use this app to record your GPS tracks, aggregate your stats over time,
and share your paths with friends.\n\nHappy Exploring,\nThe My Tracks Team
</string>
<string name="welcome_title"
translation_description="The title of the welcome dialog.">