Break TOS into paragraphs to match the existing strings in the

translation console. Thus we do not need to retranslate the
TOS.

MyTracks/res/values/strings.xml

@@ -472,42 +472,67 @@ limitations under the License.
       Screenshot: eula.png">
     Decline
   </string>
-  <string name="eula_message"
+  <string name="eula_message_body"
-    translation_description="The message for the 'Terms of service' dialog.
+    translation_description="The body in the Google mobile terms of service. See
+      http://m.google.com/toscountry.">
+    By using Google\'s mobile products and services ("Services"), you:
+  </string>
+  <string name="eula_message_date"
+    translation_description="The date in the Google mobile terms of service. See
+      http://m.google.com/toscountry.">
+    December 1, 2010
+  </string>
+  <string name="eula_message_footer"
+    translation_description="The footer in the Google mobile terms of service. See
+      http://m.google.com/toscountry.
 
-      Google Mobile Terms of Service. Already translated at http://m.google.com/toscountry. Please
+      %1$s: legal notice url, 'm.google.com/legalnotices'">
-      cut and paste the translations from the web site.">
+    The Services may contain third party content. Any required attribution or notice for the third
-    December 1, 2010\n
+    party content may be found at %1$s.
-    \n
+  </string>
-    Mobile Terms of Service\n 
+  <string name="eula_message_header"
-    \n
+    translation_description="The header in the Google mobile terms of service. See
-    By using Google\'s mobile products and services ("Services"), you:\n
+      http://m.google.com/toscountry.">
-    \n
+    Mobile Terms of Service
-    1. Agree to be bound by these terms and a) the YouTube Terms of Use (m.google.com/tos_youtube)
+  </string>
-    for YouTube-related Services, b) the Google Maps Terms and Conditions (m.google.com/tos_maps)
+  <string name="eula_message_item1"
-    for mapping, local and location-based Services, c) the Google Buzz Terms and Conditions for
+    translation_description="The first item in the Google mobile terms of service. See
-    Google Buzz-related Services (m.google.com/tos_buzz), d) the Google Books Terms of Service
+      http://m.google.com/toscountry.
-    (m.google.com/tos_books) for Books-related Services, and e) the Google Terms of Service
+
-    (m.google.com/utos) for all other Services, as updated from time to time. You may use the
+      %1$s: youtube terms of service url, 'm.google.com/tos_youtube'
-    Services only as set forth in these agreements. Do not manipulate while driving.\n
+      %2$s: maps terms of service url, 'm.google.com/tos_maps'
-    \n
+      %3$s: buzz terms of service url, 'm.google.com/tos_buzz'
+      %4$s: books terms of service url, 'm.google.com/tos_books'
+      %5$s: google terms of service url, 'm.google.com/utos'">
+    1. Agree to be bound by these terms and a) the YouTube Terms of Use (%1$s) for YouTube-related
+    Services, b) the Google Maps Terms and Conditions (%2$s) for mapping, local and location-based
+    Services, c) the Google Buzz Terms and Conditions for Google Buzz-related Services (%3$s), d)
+    the Google Books Terms of Service (%4$s) for Books-related Services, and e) the Google Terms of
+    Service (%5$s) for all other Services, as updated from time to time. You may use the Services
+    only as set forth in these agreements. Do not manipulate while driving.
+  </string>
+  <string name="eula_message_item2"
+    translation_description="The second item in the Google mobile terms of service. See
+      http://m.google.com/toscountry.">
     2. Acknowledge and agree that third parties may offer Services, and that you may be subject to
     third party terms and that third parties may enforce terms against you. Google is not
-    responsible for third party changes to the Services.\n
+    responsible for third party changes to the Services.
-    \n 
+  </string>
+  <string name="eula_message_item3"
+    translation_description="The third item in the Google mobile terms of service. See
+      http://m.google.com/toscountry.
+
+       %1$s: privacy url, 'm.google.com/privacy'">
     3. Consent to the collection, use, sharing, and onward transfer of your data, including but not
-    limited to voice and location data, as outlined in the Mobile Privacy Policy
+    limited to voice and location data, as outlined in the Mobile Privacy Policy (%1$s). Location
-    (m.google.com/privacy). Location data may be from mixed sources and may not be accurate. Use at
+    data may be from mixed sources and may not be accurate. Use at your own risk.
-    your own risk.\n
+  </string>
-    \n
+  <string name="eula_message_item4"
+    translation_description="The fourth item in the Google mobile terms of service. See
+      http://m.google.com/toscountry.">
     4. Acknowledge that certain Services require phone service, data access or text messaging
     capability. Except as otherwise noted, Google does not charge for the Services, but carrier
-    rates for phone, data and text messaging may apply.\n
+    rates for phone, data and text messaging may apply.
-    \n
-    The Services may contain third party content. Any required attribution or notice for the third
-    party content may be found at m.google.com/legalnotices.\n
-    \n
-    ©2011\n    
   </string>
   <string name="eula_title"
     translation_description="The title for the 'Terms of service' dialog, asking the user to accept

MyTracks/src/com/google/android/apps/mytracks/MyTracks.java

@@ -266,7 +266,7 @@ public class MyTracks extends TabActivity implements OnTouchListener {
       case DIALOG_EULA_ID:
         AlertDialog.Builder builder = new AlertDialog.Builder(this);
         builder.setTitle(R.string.eula_title);
-        builder.setMessage(R.string.eula_message);
+        builder.setMessage(EulaUtil.getEulaMessage(this));
         builder.setPositiveButton(R.string.eula_accept, new DialogInterface.OnClickListener() {
           @Override
           public void onClick(DialogInterface dialog, int which) {

MyTracks/src/com/google/android/apps/mytracks/WelcomeActivity.java

@@ -15,6 +15,7 @@
  */
 package com.google.android.apps.mytracks;
 
+import com.google.android.apps.mytracks.util.EulaUtil;
 import com.google.android.apps.mytracks.util.SystemUtils;
 import com.google.android.maps.mytracks.R;
 
@@ -77,7 +78,7 @@ public class WelcomeActivity extends Activity {
       case DIALOG_EULA_ID:
         builder = new AlertDialog.Builder(this);
         builder.setTitle(R.string.eula_title);
-        builder.setMessage(R.string.eula_message);
+        builder.setMessage(EulaUtil.getEulaMessage(this));
         builder.setPositiveButton(R.string.generic_ok, null);
         builder.setCancelable(true);
         return builder.create();     

MyTracks/src/com/google/android/apps/mytracks/util/EulaUtil.java

@@ -15,19 +15,30 @@
  */
 package com.google.android.apps.mytracks.util;
 
+import com.google.android.maps.mytracks.R;
+
 import android.content.Context;
 import android.content.SharedPreferences;
 import android.content.SharedPreferences.Editor;
 
 /**
- * Utilities for the EULA preference value.
+ * Utilities for EULA.
  */
 public class EulaUtil {
   private static final String EULA_PREFERENCE_FILE = "eula";
-  
+
   // Accepting Google mobile terms of service
   private static final String EULA_PREFERENCE_KEY = "eula.google_mobile_tos_accepted";
 
+  private static final String COPYRIGHT = "©2011";
+  private static final String LEGAL_NOTICES_URL = "m.google.com/legalnotices";
+  private static final String PRIVACY_URL = "m.google.com/privacy";
+  private static final String YOUTUBE_TOS_URL = "m.google.com/tos_youtube";
+  private static final String MAPS_TOS_URL = "m.google.com/tos_maps";
+  private static final String BUZZ_TOS_URL = "m.google.com/tos_buzz";
+  private static final String BOOKS_TOS_URL = "m.google.com/tos_books";
+  private static final String GOOGLE_TOS_URL = "m.google.com/utos";
+
   private EulaUtil() {}
 
   public static boolean getEulaValue(Context context) {
@@ -43,4 +54,30 @@ public class EulaUtil {
     editor.putBoolean(EULA_PREFERENCE_KEY, true);
     ApiFeatures.getInstance().getApiAdapter().applyPreferenceChanges(editor);
   }
+
+  public static String getEulaMessage(Context context) {
+    String item1 = String.format(context.getString(R.string.eula_message_item1), YOUTUBE_TOS_URL,
+        MAPS_TOS_URL, BUZZ_TOS_URL, BOOKS_TOS_URL, GOOGLE_TOS_URL);
+    String item3 = String.format(context.getString(R.string.eula_message_item3), PRIVACY_URL);
+    String footer = String.format(
+        context.getString(R.string.eula_message_footer), LEGAL_NOTICES_URL);
+
+    return context.getString(R.string.eula_message_date)
+        + "\n\n"
+        + context.getString(R.string.eula_message_header)
+        + "\n\n"
+        + context.getString(R.string.eula_message_body)
+        + "\n\n"
+        + item1
+        + "\n\n"
+        + context.getString(R.string.eula_message_item2)
+        + "\n\n"
+        + item3
+        + "\n\n"
+        + context.getString(R.string.eula_message_item4)
+        + "\n\n"
+        + footer
+        + "\n\n"
+        + COPYRIGHT;
+  }
 }