karol/OpenTracks
1
0
Fork 0
forked from upstream-mirrors/OpenTracks
Code Pull Requests Actions Releases 2 Activity

Combine save and send to google into export.

Browse Source
This commit is contained in:
Jimmy Shih
2013-06-04 15:32:19 -07:00
parent 5a5b1431eb
commit f89c6696b3
32 changed files with 467 additions and 475 deletions
Download Patch File Download Diff File Expand all files Collapse all files
MyTracks/res/values/do_not_translate.xml
+4 -4
View File
@@ -70,6 +70,10 @@ Google은 이용자에 대한 위치정보의 이용∙제공사실을 위치정
대표자: 염동훈\n
주소 : 서울 강남구 역삼동 737 강남파이낸스센터 22층\n
전화번호 : (02) 531-9000\n</string>
<string name="export_google_drive_url">drive.google.com</string>
<string name="export_google_fusion_tables_url">google.com/fusiontables</string>
<string name="export_google_maps_url">maps.google.com</string>
<string name="export_google_spreadsheets_url">drive.google.com</string>
<string name="maps_public_unlisted_url">support.google.com/maps/bin/answer.py?answer=144365</string>
<string name="marker_statistics_icon_url">http://maps.google.com/mapfiles/ms/micons/ylw-pushpin.png</string>
<string name="marker_waypoint_icon_url">http://maps.google.com/mapfiles/ms/micons/blue-pushpin.png</string>
@@ -79,10 +83,6 @@ Google은 이용자에 대한 위치정보의 이용∙제공사실을 위치정
<string name="my_tracks_support_url">groups.google.com/a/googleproductforums.com/forum/#!categories/maps/mytracks</string>
<string name="my_tracks_web_url">www.google.com/mobile/mytracks</string>
<string name="permission_notification_value">com.google.android.apps.mytracks.MYTRACKS_NOTIFICATIONS</string>
<string name="send_google_drive_url">drive.google.com</string>
<string name="send_google_fusion_tables_url">google.com/fusiontables</string>
<string name="send_google_maps_url">maps.google.com</string>
<string name="send_google_spreadsheets_url">drive.google.com</string>
<string name="sensor_type_value_ant">ANT</string>
<string name="sensor_type_value_none">NONE</string>
<string name="sensor_type_value_polar">POLAR</string>
MyTracks/res/values/keys.xml
+4 -6
View File
@@ -25,19 +25,17 @@ limitations under the License.
<string name="chart_show_power_key">chartShowPower</string>
<string name="chart_show_speed_key">chartShowSpeed</string>
<string name="default_activity_key">defaultActivity</string>
<string name="default_map_public_key">defaultMapPublic</string>
<string name="default_table_public_key">defaultTablePublic</string>
<string name="export_external_storage_format_key">exportExternalStorageFormat</string>
<string name="export_google_fusion_tables_public_key">exportGoogleFusionTablesPublic</string>
<string name="export_google_maps_public_key">exportGoogleMapsPublic</string>
<string name="export_type_key">exportType</string>
<string name="map_type_key">mapType</string>
<string name="max_recording_distance_key">maxRecordingDistance</string>
<string name="metric_units_key">metricUnits</string>
<string name="min_recording_distance_key">minRecordingDistance</string>
<string name="min_recording_interval_key">minRecordingInterval</string>
<string name="min_required_accuracy_key">minRequiredAccuracy</string>
<string name="pick_existing_map_key">pickExistingMap</string>
<string name="report_speed_key">reportSpeed</string>
<string name="send_to_fusion_tables_key">sendToFusionTables</string>
<string name="send_to_maps_key">sendToMaps</string>
<string name="send_to_spreadsheets_key">sendToSpreadsheets</string>
<string name="sensor_type_key">sensorType</string>
<string name="share_track_key">shareTrack</string>
<string name="split_frequency_key">splitFrequency</string>
MyTracks/res/values/strings.xml
+54 -106
View File
@@ -612,6 +612,59 @@ limitations under the License.
Terms of Service
</string>
<!-- Export -->
<string name="export_external_storage"
translation_description="When exporting a track, the option to export to external storage.">
External storage
</string>
<string name="export_external_storage_option"
translation_description="When exporting a track to external storage, the option to export as a
certain file format.
%1$s: file format. 'GPX', 'KML', 'CSV', or 'TCX'.">
as %1$s file
</string>
<string name="export_google_drive"
translation_description="When exporting a track, the option to export to Google Drive.">
Google Drive
</string>
<string name="export_google_fusion_tables"
translation_description="When exporting a track, the option to export to Google Fusion Tables.">
Google Fusion Tables
</string>
<string name="export_google_fusion_tables_private"
translation_description="When exporting a track to Google Fusion Tables, the option to export as
a new private table as opposed to a new public table.">
as new private table
</string>
<string name="export_google_fusion_tables_public"
translation_description="When exporting a trck to Google Fusion Tables, the option to export as
a new public table as opposed to a new private table.">
as new public table
</string>
<string name="export_google_maps"
translation_description="When exporting a track, the option to export to Google Maps.">
Google Maps
</string>
<string name="export_google_maps_public"
translation_description="When exporting a track to Google Maps, the option to export as a new
public map as opposed to a new unlisted map.">
as new public map
</string>
<string name="export_google_maps_unlisted"
translation_description="When sending a track to Google Maps, the option to export as a new
unlisted map as opposed to a new public map.">
as new unlisted map
</string>
<string name="export_google_spreadsheets"
translation_description="When exporting a track, the option to export to Google Spreadsheets.">
Google Spreadsheets
</string>
<string name="export_dialog_title"
translation_description="The dialog title when exporting a track.">
Export to&#8230;
</string>
<!-- External Storage -->
<string name="external_storage_not_available"
translation_description="Error message when the external storage is not available.">
@@ -1299,50 +1352,11 @@ limitations under the License.
translation_description="When sending to Google, the dialog title to choose a Google account.">
Choose account
</string>
<string name="send_google_drive"
translation_description="When sending a track to Google, under the 'Send to...' dialog, the
checkbox option to send to Google Drive.">
Google Drive
</string>
<string name="send_google_error"
translation_description="When sending a track to Google, a message indicating that an error has
occurred and ask the user to try again.">
An error has occurred. Please try again.
</string>
<string name="send_google_existing_map"
translation_description="When sending a track to Google Maps, the radio option to use an
existing map as opposed to create a new map.">
Use existing map
</string>
<string name="send_google_fusion_tables"
translation_description="When sending a track to Google, the Google Fusion Tables name.">
Google Fusion Tables
</string>
<string name="send_google_fusion_tables_private"
translation_description="When sending a track to Google Fusion Tables, indicate a new private
table will get created.">
(new private table)
</string>
<string name="send_google_fusion_tables_public"
translation_description="When sending a track to Google Fusion Tables, indicate a new public
table will get created.">
(new public table)
</string>
<string name="send_google_maps"
translation_description="When sending a track to Google, under the 'Send to...' dialog, the
checkbox option to send to Google Maps.">
Google Maps
</string>
<string name="send_google_new_public_map"
translation_description="When sending a track to Google Maps, the radio option to create a new
public map as opposed to use an existing map.">
Create new public map
</string>
<string name="send_google_new_unlisted_map"
translation_description="When sending a track to Google Maps, the radio option to create a new
unlisted map as opposed to use an existing map.">
Create new unlisted map
</string>
<string name="send_google_no_account_message"
translation_description="When sending to Google, the dialog message when no Google account is
found.">
@@ -1358,38 +1372,17 @@ limitations under the License.
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.">
You did not select any service. The track was not sent.
</string>
<string name="send_google_progress_message"
translation_description="When sending a track to a Google service, the progress message.
%1$s: service name. 'Google Maps', 'Google Fusion Tables', or 'Google Spreadsheets'.">
Sending to %1$s&#8230;
</string>
<string name="send_google_send_now"
translation_description="When sending a track to Google, under the 'Send to...' dialog, the
button on the bottom to send the track to the selected Google services.">
Send now
</string>
<string name="send_google_spreadsheets"
translation_description="When sending a track to Google, under the 'Send to...' dialog, the
checkbox option to send to Google Spreadsheets.">
Google Spreadsheets
</string>
<string name="send_google_success_footer"
translation_description="When sending a track to Google, the additional comment on the bottom of
the result page.">
It may take a few minutes before new tracks appear.
</string>
<string name="send_google_title"
translation_description="When sending a track to Google, the dialog title to choose the Google
services to send the track to. The user can choose Google Maps, Google Fusion Tables, and
Google Spreadsheets.">
Send to&#8230;
</string>
<string name="send_google_track_part_label"
translation_description="When sending a track to Google, the label to name segments of a large
track. E.g., 'track_name (Part 1)'.
@@ -1632,51 +1625,6 @@ limitations under the License.
Character limit: ~23 (1 line)">
Sync Google Drive
</string>
<string name="settings_google_fusion_tables_public_summary_off"
translation_description="In the 'Google' settings, the summary for the 'New tables public'
checkbox when it is unchecked explaining that new tables created in Google Fusion Tables will
be private, instead of public.">
New tables created in Google Fusion Tables will be private, instead of public.
</string>
<string name="settings_google_fusion_tables_public_summary_on"
translation_description="In the 'Google' settings, the summary for the 'New tables public'
checkbox when it is checked explaining that new tables created in Google Fusion Tables will be
public, instead of private.">
New tables created in Google Fusion Tables will be public, instead of private.
</string>
<string name="settings_google_fusion_tables_public_title"
translation_description="In the 'Google' settings, the checkbox to make new tables created in
Google Fusion Tables public instead of private.
Character limit: ~23 (1 line)">
New tables public
</string>
<string name="settings_google_maps_public_summary_off"
translation_description="In the 'Google' settings, the summary for the 'New maps public'
checkbox 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.
%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_google_maps_public_summary_on"
translation_description="In the 'Google' settings, the summary for the 'New maps public'
checkbox 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 public, instead of unlisted. See %1$s for more info.
</string>
<string name="settings_google_maps_public_title"
translation_description="In the 'Google' settings, the checkbox 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)">
New maps public
</string>
<!-- Settings Map -->
<string name="settings_map_medium"
@@ -2207,7 +2155,7 @@ limitations under the License.
translation_description="In the 'Stats' page, the grade. Grade is the amount of inclination to
the horizontal, also known as slope or incline.">
Grade
</string>
</string>
<string name="stats_latitude"
translation_description="In the 'Stats' page, the latitude.">
Latitude
MyTracks/res/values/styles.xml
+6 -13
View File
@@ -32,19 +32,6 @@ limitations under the License.
<item name="android:layout_width">match_parent</item>
<item name="android:orientation">horizontal</item>
</style>
<!-- choose upload service checkbox -->
<style name="ChooseUploadServiceCheckBox" parent="@style/TextMedium">
<item name="android:layout_gravity">center_vertical</item>
<item name="android:layout_marginLeft">8dp</item>
<item name="android:layout_width">0dp</item>
<item name="android:maxLines">5</item>
</style>
<!-- choose upload service image view -->
<style name="ChooseUploadServiceImageView">
<item name="android:layout_gravity">center</item>
<item name="android:layout_height">wrap_content</item>
<item name="android:layout_width">wrap_content</item>
</style>
<!-- edit category -->
<style name="EditCategory" parent="@style/TextMedium">
<item name="android:layout_width">match_parent</item>
@@ -85,6 +72,12 @@ limitations under the License.
<item name="android:selectAllOnFocus">true</item>
<item name="android:singleLine">true</item>
</style>
<!-- export radio group -->
<style name="ExportRadioGroup">
<item name="android:layout_height">wrap_content</item>
<item name="android:layout_marginLeft">16dp</item>
<item name="android:layout_width">match_parent</item>
</style>
<!-- help answer -->
<style name="HelpAnswer" parent="@style/TextSmall">
<item name="android:autoLink">web</item>