From 1e4a6c04c239b0ed65d020d183bc18e612d939c9 Mon Sep 17 00:00:00 2001
From: Jimmy Shih <jshih@google.com>
Date: Wed, 25 Apr 2012 10:16:51 -0700
Subject: [PATCH] Rename "Share with friends..." to "Share".

---
 MyTracks/res/menu/track_detail.xml            |  8 ++--
 MyTracks/res/values/strings.xml               | 46 +++++++++----------
 .../apps/mytracks/TrackDetailActivity.java    |  4 +-
 3 files changed, 28 insertions(+), 30 deletions(-)

diff --git a/MyTracks/res/menu/track_detail.xml b/MyTracks/res/menu/track_detail.xml
index 778874656..6d020ed56 100644
--- a/MyTracks/res/menu/track_detail.xml
+++ b/MyTracks/res/menu/track_detail.xml
@@ -37,11 +37,11 @@ limitations under the License.
     android:title="@string/menu_share">
     <menu>
       <item
-        android:id="@+id/track_detail_share_map"
-        android:title="@string/menu_share_map"/>
+        android:id="@+id/track_detail_share_map_url"
+        android:title="@string/menu_share_map_url"/>
       <item
-        android:id="@+id/track_detail_share_fusion_table"
-        android:title="@string/menu_share_fusion_table"/>
+        android:id="@+id/track_detail_share_fusion_table_url"
+        android:title="@string/menu_share_fusion_table_url"/>
       <item android:id="@+id/track_detail_share_gpx"/>
       <item android:id="@+id/track_detail_share_kml"/>
       <item android:id="@+id/track_detail_share_csv"/>
diff --git a/MyTracks/res/values/strings.xml b/MyTracks/res/values/strings.xml
index a22310692..f008342e2 100644
--- a/MyTracks/res/values/strings.xml
+++ b/MyTracks/res/values/strings.xml
@@ -1128,6 +1128,28 @@ limitations under the License.
     translation_description="In the menu, to go to the settings page.">
     Settings
   </string>
+  <string name="menu_share"
+    translation_description="In the menu, to share a track.">
+    Share
+  </string>
+  <string name="menu_share_file"
+    translation_description="Under the 'Share' menu option, the option to share a track as a
+      certain file format.
+
+      %1$s: file format. 'GPX', 'KML', 'CSV', or 'TCX'.">
+    %1$s file
+  </string>
+  <string name="menu_share_fusion_table_url"
+    translation_description="Under the 'Share' menu option, the option to save a track to Google
+      Fusion Tables and share the Fusion Table URL with friends. 'Fusion Table URL' in this context
+      means a Google Fusion Table URL.">
+    Fusion Table URL
+  </string>
+  <string name="menu_share_map_url"
+    translation_description="Under the 'Share' menu option, the option to save a track to Google
+      Maps and share the Map URL with friends. 'Map URL' in this context means a Google Map URL.">
+    Map URL
+  </string>
   <string name="menu_show_on_map"
     translation_description="In the menu, to show a marker on map.">
     Show on map
@@ -1136,30 +1158,6 @@ limitations under the License.
     translation_description="In the menu, to stop recording a track.">
     Stop recording
   </string>
-  <string name="menu_share"
-    translation_description="In the menu, to share a track with friends through other
-      applications.">
-    Share with friends...
-  </string>
-  <string name="menu_share_file"
-    translation_description="Under the 'Share with friends...' menu option, the option to share a
-      track as a certain file format.
-
-      %1$s: file format. 'GPX', 'KML', 'CSV', or 'TCX'.">
-    A %1$s file
-  </string>
-  <string name="menu_share_fusion_table"
-    translation_description="Under the 'Share with friends...' menu option, the option to save a
-      track to Google Fusion Tables and share the Fusion Table url with friends. 'Fusion Table' in
-      this context means a Google Fusion Table.">
-    Fusion Table
-  </string>
-  <string name="menu_share_map"
-    translation_description="Under the 'Share with friends...' menu option, the option to save a
-      track to Google Maps and share the Map url with friends. 'Map' in this context means a Google
-      Map.">
-    Map
-  </string>
 
   <!-- My Location -->
   <string name="my_location_approximate_location"
diff --git a/MyTracks/src/com/google/android/apps/mytracks/TrackDetailActivity.java b/MyTracks/src/com/google/android/apps/mytracks/TrackDetailActivity.java
index 96d34bf96..7f627dc9b 100644
--- a/MyTracks/src/com/google/android/apps/mytracks/TrackDetailActivity.java
+++ b/MyTracks/src/com/google/android/apps/mytracks/TrackDetailActivity.java
@@ -287,12 +287,12 @@ public class TrackDetailActivity extends AbstractMyTracksActivity {
               getSupportFragmentManager(), InstallEarthDialogFragment.INSTALL_EARTH_DIALOG_TAG);
         }
         return true;
-      case R.id.track_detail_share_map:
+      case R.id.track_detail_share_map_url:
         intent = IntentUtils.newIntent(this, UploadServiceChooserActivity.class)
             .putExtra(SendRequest.SEND_REQUEST_KEY, new SendRequest(trackId, true, false, false));
         startActivity(intent);
         return true;
-      case R.id.track_detail_share_fusion_table:
+      case R.id.track_detail_share_fusion_table_url:
         intent = IntentUtils.newIntent(this, UploadServiceChooserActivity.class)
             .putExtra(SendRequest.SEND_REQUEST_KEY, new SendRequest(trackId, false, true, false));
         startActivity(intent);