merge heads

MyTracks/AndroidManifest.xml

@@ -17,8 +17,8 @@ limitations under the License.
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
           package="com.google.android.maps.mytracks"
           android:installLocation="auto"
-          android:versionCode="34"
-          android:versionName="1.1.11">
+          android:versionCode="35"
+          android:versionName="1.1.12">
   <application android:icon="@drawable/arrow_icon"
                android:label="@string/my_tracks_app_name"
                android:name="com.google.android.apps.mytracks.MyTracksApplication"

MyTracks/res/values-es-rES/strings.xml

@@ -1,35 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-Copyright 2010 Google Inc.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-     http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
--->
-<resources>
-  <string name="about_license">Licencia</string>
-  <string name="about_privacy">Privacidad:</string>
-  <string name="about_support">Soporte:</string>
-  <string name="about_version">Versión:</string>
-  <string name="generic_save">Guardar</string>
-  <string name="menu_markers">Señales</string>
-  <string name="sd_card_error_read_file">No es posible leer del fichero.</string>
-  <string name="sd_card_success_read_file">Lectura de tarjeta SD terminada.</string>
-  <string name="sd_card_success_write_file">Grabación a tarjeta SD terminada.</string>
-  <string name="send_google_choose_account_title">Elegir cuenta</string>
-  <string name="send_google_no_account_message">No se ha encontrado la cuenta a la que subir los recorridos.</string>
-  <string name="send_google_no_account_title">No se ha encontrado la cuenta</string>
-  <string name="settings_display_speed">Mostrar velocidad</string>
-  <string name="settings_recording_voice_not_available">No está disponible en su versión de Android</string>
-  <string name="settings_sensor_type_ant">ANT+ Sensores</string>
-  <string name="settings_sensor_type_none">Ninguna</string>
-  <string name="settings_sensor_type_srm">SRM ANT+ Puente</string>
-</resources>

MyTracks/res/values/strings.xml

@@ -1158,10 +1158,8 @@ limitations under the License.
     translation_description="When sending a track to Google, a note indicating it is created by
       My Tracks on Android.
 
-      %1$s: the html anchor opening tag, '<a href=\'http://mytracks.appspot.com\'>'. Please
-      place this placeholder before the app name, 'My Tracks'.
-      %2$s: the html anchor closing tag, '</a>'. Please place this placeholder after the app
-      name, 'My Tracks'.">
+      %1$s: the html anchor opening tag, Place this placeholder before the app name, 'My Tracks'.
+      %2$s: the html anchor closing tag, Place this placeholder after the app name, 'My Tracks'.">
     Created by %1$sMy Tracks%2$s on Android.
   </string>
   <string name="send_google_choose_account_title"

MyTracks/res/values/styles.xml

@@ -44,7 +44,7 @@ limitations under the License.
   
   <!-- Button -->
   <style name="Button">
-    <item name="android:layout_height">48dip</item>
+    <item name="android:layout_height">fill_parent</item>
     <item name="android:layout_weight">1</item>
     <item name="android:layout_width">0dip</item>
     <item name="android:maxLines">2</item>