Merge heads

This commit is contained in:
youtaol
2012-07-06 14:41:50 +08:00
parent 9a24f12e11
commit 812ca57d42
180 changed files with 1201 additions and 737 deletions
+38 -37
View File
@@ -63,6 +63,11 @@ limitations under the License.
completion suggestion for blimp.">
blimp
</string>
<string name="activity_type_boat"
translation_description="When entering an 'Activity type', in the auto-complete text box, the
completion suggestion for boat.">
boat
</string>
<string name="activity_type_climbing"
translation_description="When entering an 'Activity type', in the auto-complete text box, the
completion suggestion for climbing.">
@@ -734,19 +739,6 @@ limitations under the License.
translation_description="In the 'Help' page, the question on elevation precision.">
How precise is the elevation measurement?
</string>
<string name="help_google_services_answer"
translation_description="In the 'Help' page, the answer on locations of google services.
%1$s url. E.g., 'maps.google.com'.
%2$s url. E.g., 'google.com/fusiontables'.
%3$s url. E.g., 'docs.google.com'.">
For Google Maps, go to %1$s and click on \"My Places\". For Google Fusion Tables, go to %2$s.
For Google Docs, go to %3$s.
</string>
<string name="help_google_services_question"
translation_description="In the 'Help' page, the question on locations of google services.">
Where are the tracks after sending to Google?
</string>
<string name="help_gps_signal_answer"
translation_description="In the 'Help' page, the answer on the GPS signal message.">
For My Tracks to work, your phone needs to be in line-of-sight contact with the GPS satellites.
@@ -806,13 +798,28 @@ limitations under the License.
translation_description="In the 'Help' page, the question on saved files.">
What can I do with tracks after saving them to the SD card or sharing such files with friends?
</string>
<string name="help_send_track_answer"
translation_description="In the 'Help' page, the answer on sending a track.
%1$s url. E.g., 'maps.google.com'.
%2$s url. E.g., 'google.com/fusiontables'.
%3$s url. E.g., 'docs.google.com'.">
You can send a track to Google Maps, Google Fusion Tables, and Google Docs. Tracks sent to
Google Maps are at %1$s, \"My Places\". Tracks sent to Google Fusion Tables are at %2$s. Tracks
sent to Google Docs are at %3$s.
</string>
<string name="help_send_track_question"
translation_description="In the 'Help' page, the question on sending a track.">
Where can I send a track?
</string>
<string name="help_share_friends_answer"
translation_description="In the 'Help' page, the answer on sharing with friends.">
You can share a track as a link to Google Map. Your track will first get uploaded to Google Map.
You can share a track as a link to Google Maps. Your track will first get uploaded to Google
Maps.
</string>
<string name="help_share_friends_question"
translation_description="In the 'Help' page, the question on sharing with friends.">
How do I share tracks with friends and the rest of the world?
How do I share a track with friends?
</string>
<string name="help_share_visibility_answer"
translation_description="In the 'Help' page, the answer on share visibility.">
@@ -1950,37 +1957,31 @@ limitations under the License.
Tracks data.">
Other apps can read, write, start/stop recording My Tracks data.
</string>
<string name="settings_sharing_map_public"
translation_description="In the 'Sharing' settings, the title of the option to make new maps
created in Google Maps public, as opposed to unlisted. See
<string name="settings_sharing_new_map_public"
translation_description="In the 'Sharing' settings, the checkbox option to make new maps created
in Google Maps public, instead of unlisted. See
http://support.google.com/maps/bin/answer.py?answer=144365 for public versus unlisted.
Character limit: ~23 (1 line)">
Make new maps public
New maps public
</string>
<string name="settings_sharing_map_public_summary"
translation_description="In the 'Sharing' settings, the summary for the 'Make new maps public'
option explaining that new maps created in Google Maps will be public, as opposed to unlisted.
See http://support.google.com/maps/bin/answer.py?answer=144365 for public versus unlisted.
%1$s url. E.g., 'support.google.com/maps/bin/answer.py?answer=144365'.">
New maps created in Google Maps will be public. See %1$s for more info.
</string>
<string name="settings_sharing_map_unlisted"
translation_description="In the 'Sharing' settings, the title of the option to make new maps
created in Google Maps unlisted, as opposed to public. See
<string name="settings_sharing_new_map_public_summary_off"
translation_description="In the 'Sharing' settings, the summary for the 'New maps public'
checkbox option when it is unchecked explaining that new maps created in Google Maps will be
unlisted, instead of public. See
http://support.google.com/maps/bin/answer.py?answer=144365 for public versus unlisted.
Character limit: ~23 (1 line)">
Make new maps unlisted
%1$s url. E.g., 'support.google.com/maps/bin/answer.py?answer=144365'.">
New maps created in Google Maps will be unlisted, instead of public. See %1$s for more info.
</string>
<string name="settings_sharing_map_unlisted_summary"
translation_description="In the 'Sharing' settings, the summary for the 'Make new maps unlisted'
option explaining that new maps created in Google Maps will be unlisted, as opposed to public.
See http://support.google.com/maps/bin/answer.py?answer=144365 for public versus unlisted.
<string name="settings_sharing_new_map_public_summary_on"
translation_description="In the 'Sharing' settings, the summary for the 'New maps public'
checkbox option when it is checked explaining that new maps created in Google Maps will be
public, instead of unlisted. See
http://support.google.com/maps/bin/answer.py?answer=144365 for public versus unlisted.
%1$s url. E.g., 'support.google.com/maps/bin/answer.py?answer=144365'.">
New maps created in Google Maps will be unlisted. See %1$s for more info.
New maps created in Google Maps will be public, instead of unlisted. See %1$s for more info.
</string>
<!-- Settings Show -->