merge heads

This commit is contained in:
Jimmy Shih
2011-11-10 16:51:10 -08:00
parent 44e81383f9
commit 23b5f879ae
34 changed files with 378 additions and 473 deletions
+7 -6
View File
@@ -20,8 +20,10 @@ limitations under the License.
<!-- Application Name -->
<string name="app_name">My Tracks</string>
<!-- About Page -->
<string name="about_weburl">mytracks.appspot.com</string>
<string name="my_tracks_web_url">mytracks.appspot.com</string>
<!-- About Dialog -->
<string name="about_googlegroups">mytracks@googlegroups.com</string>
<string name="about_privacy_weburl">m.google.com/privacy</string>
<string name="about_bart">Bartłomiej Niechwiej</string>
<string name="about_dylan">Dylan Casey</string>
@@ -45,9 +47,9 @@ limitations under the License.
<string name="unknown">-</string>
<!-- Send to Google URLs -->
<string name="sendtogoogle_google_mymaps_url">maps.google.com</string>
<string name="sendtogoogle_google_fusiontables_url">google.com/fusiontables</string>
<string name="sendtogoogle_google_docs_url">docs.google.com</string>
<string name="send_google_fusion_tables_url">google.com/fusiontables</string>
<string name="send_google_my_maps_url">maps.google.com</string>
<string name="send_google_docs_url">docs.google.com</string>
<!-- Google Analytics ID -->
<string name="google_analytics_id">UA-7222692-2</string>
@@ -57,7 +59,6 @@ limitations under the License.
<!-- Intent Actions -->
<string name="save_intent_action">android.intent.action.SAVE</string>
<string name="open_settings_screen">android.intent.action.settings.OPEN</string>
<string name="start_new_track_action">com.google.android.apps.mytracks.START_NEW_TRACK</string>
<string name="end_current_track_action">
com.google.android.apps.mytracks.END_CURRENT_TRACK