From 5492bf86d1e1648d911caa240e858bc3bd0808d2 Mon Sep 17 00:00:00 2001 From: Jimmy Shih Date: Wed, 9 Nov 2011 13:13:33 -0800 Subject: [PATCH] Rename and reorganize strings.xml variables for - Chart Settings - Sensor State - Statistic Page - Unit --- MyTracks/res/layout/chart_settings.xml | 18 +- .../res/layout/mytracks_waypoint_details.xml | 34 +- MyTracks/res/layout/sensor_state.xml | 12 +- MyTracks/res/layout/stats.xml | 30 +- MyTracks/res/layout/track_widget.xml | 6 +- MyTracks/res/values-ca/strings.xml | 62 +-- MyTracks/res/values-de/strings.xml | 90 ++-- MyTracks/res/values-es/strings.xml | 66 +-- MyTracks/res/values-fi/strings.xml | 90 ++-- MyTracks/res/values-fr/strings.xml | 64 +-- MyTracks/res/values-it/strings.xml | 66 +-- MyTracks/res/values-ja/strings.xml | 66 +-- MyTracks/res/values-pl/strings.xml | 76 ++-- MyTracks/res/values-pt-rBR/strings.xml | 46 +- MyTracks/res/values-ru/strings.xml | 88 ++-- MyTracks/res/values-sv/strings.xml | 66 +-- MyTracks/res/values-zh-rCN/strings.xml | 66 +-- MyTracks/res/values/strings.xml | 422 +++++++++--------- .../mytracks/AggregatedStatsActivity.java | 2 +- .../android/apps/mytracks/ChartView.java | 20 +- .../android/apps/mytracks/StatsActivity.java | 2 +- .../android/apps/mytracks/StatsUtilities.java | 30 +- .../android/apps/mytracks/TrackList.java | 8 +- .../apps/mytracks/io/docs/DocsHelper.java | 6 +- .../services/sensors/SensorUtils.java | 8 +- .../apps/mytracks/util/ChartURLGenerator.java | 2 +- .../apps/mytracks/util/StringUtils.java | 102 ++--- .../mytracks/widgets/TrackWidgetProvider.java | 8 +- .../apps/mytracks/ChartValueSeriesTest.java | 4 +- .../io/docs/DocsHelper_AddTrackRowTest.java | 12 +- 30 files changed, 781 insertions(+), 791 deletions(-) diff --git a/MyTracks/res/layout/chart_settings.xml b/MyTracks/res/layout/chart_settings.xml index ac0a452da..430bd79a3 100644 --- a/MyTracks/res/layout/chart_settings.xml +++ b/MyTracks/res/layout/chart_settings.xml @@ -57,7 +57,7 @@ limitations under the License. + android:text="@string/chart_settings_by_distance"/> + android:text="@string/chart_settings_by_time"/> @@ -90,34 +90,34 @@ limitations under the License. + android:text="@string/stat_elevation"/> + android:text="@string/stat_speed"/> + android:text="@string/sensor_state_power"/> + android:text="@string/sensor_state_cadence"/> + android:text="@string/sensor_state_heart_rate"/> diff --git a/MyTracks/res/layout/mytracks_waypoint_details.xml b/MyTracks/res/layout/mytracks_waypoint_details.xml index 49ea1cc8c..364cebd76 100644 --- a/MyTracks/res/layout/mytracks_waypoint_details.xml +++ b/MyTracks/res/layout/mytracks_waypoint_details.xml @@ -101,12 +101,12 @@ limitations under the License. android:id="@+id/total_distance_label" android:layout_column="1" android:layout_span="3" - android:text="@string/total_distance_label" /> + android:text="@string/stat_total_distance" /> + android:text="@string/stat_max_speed" /> @@ -125,7 +125,7 @@ limitations under the License. android:layout_column="2" android:layout_marginBottom="-9dip" android:layout_marginTop="-9dip" - android:text="@string/mile" + android:text="@string/unit_mile" android:textColor="@color/stat_label_text" /> @@ -131,7 +131,7 @@ limitations under the License. + android:text="@string/sensor_state_battery" /> diff --git a/MyTracks/res/layout/stats.xml b/MyTracks/res/layout/stats.xml index af30d0875..985903027 100644 --- a/MyTracks/res/layout/stats.xml +++ b/MyTracks/res/layout/stats.xml @@ -37,7 +37,7 @@ limitations under the License. + android:text="@string/stat_speed" /> @@ -73,12 +73,12 @@ limitations under the License. android:id="@+id/total_distance_label" android:layout_column="1" android:layout_span="3" - android:text="@string/total_distance_label" /> + android:text="@string/stat_total_distance" /> + android:text="@string/stat_max_speed" /> @@ -125,12 +125,12 @@ limitations under the License. android:id="@+id/track_time_label" android:layout_column="1" android:layout_span="3" - android:text="@string/total_time_label" /> + android:text="@string/stat_total_time" /> + android:text="@string/stat_average_speed" /> @@ -171,12 +171,12 @@ limitations under the License. android:id="@+id/moving_time_label" android:layout_column="1" android:layout_span="3" - android:text="@string/moving_time_label" /> + android:text="@string/stat_moving_time" /> + android:text="@string/stat_average_moving_speed" /> @@ -218,12 +218,12 @@ limitations under the License. android:id="@+id/elevation_label" android:layout_column="1" android:layout_span="3" - android:text="@string/elevation_label" /> + android:text="@string/stat_elevation" /> + android:text="@string/stat_elevation_gain" /> @@ -254,12 +254,12 @@ limitations under the License. android:id="@+id/min_elevation_label" android:layout_column="1" android:layout_span="3" - android:text="@string/min_elevation_label" /> + android:text="@string/stat_min_elevation" /> + android:text="@string/stat_max_elevation" /> @@ -290,12 +290,12 @@ limitations under the License. android:id="@+id/min_grade_label" android:layout_column="1" android:layout_span="3" - android:text="@string/min_grade_label" /> + android:text="@string/stat_min_grade" /> + android:text="@string/stat_max_grade" /> @@ -319,11 +319,11 @@ limitations under the License. + android:text="@string/stat_latitude" /> + android:text="@string/stat_longitude" /> diff --git a/MyTracks/res/layout/track_widget.xml b/MyTracks/res/layout/track_widget.xml index d7bb7b93e..8a0e17e75 100644 --- a/MyTracks/res/layout/track_widget.xml +++ b/MyTracks/res/layout/track_widget.xml @@ -52,7 +52,7 @@ limitations under the License. android:id="@+id/appwidget_distance_text" /> + android:text="@string/stat_total_distance" /> + android:text="@string/stat_moving_time" /> + android:text="@string/stat_speed" /> diff --git a/MyTracks/res/values-ca/strings.xml b/MyTracks/res/values-ca/strings.xml index c7b45e462..9f1751b6e 100644 --- a/MyTracks/res/values-ca/strings.xml +++ b/MyTracks/res/values-ca/strings.xml @@ -209,7 +209,7 @@ limitations under the License. El nom per defecte de la ruta serà la data i hora en que s\'ha iniciat. Els noms de les rutes seran números que s\'incrementaran per a cada nova ruta. - Ritme de pas + Ritme de pas Suportat només en Android 2.0 i superior Tipus de sensor @@ -253,40 +253,40 @@ limitations under the License. - Velocitat mitjana en moviment - Ritme mitjà en moviment + Velocitat mitjana en moviment + Ritme mitjà en moviment - Velocitat mitjana - Ritme de pas mitjà + Velocitat mitjana + Ritme de pas mitjà Gràfic d\'elevació - Guany d\'elevació - Elevació - Latitud - Longitud + Guany d\'elevació + Elevació + Latitud + Longitud - Elevació mínima - Grau mínim - Ritme de pas mínima + Elevació mínima + Grau mínim + Ritme de pas mínima - Elevació màxima - Grau màxim - Velocitat màxima + Elevació màxima + Grau màxim + Velocitat màxima S\'està carregant la ruta... Configuració del gràfic - Eix X - Per distància - Per temps + Eix X + Per distància + Per temps - Eix Y + Eix Y @@ -308,18 +308,18 @@ limitations under the License. per milla - Temps en moviment - Temps total + Temps en moviment + Temps total Temps La targeta SD no està disponible - Velocitat + Velocitat Heu d\'iniciar la marxa. Estadístiques - Distància total + Distància total Distància - Energia - Cadència - Freqüència cardíaca + Energia + Cadència + Freqüència cardíaca Freqüència cardíaca màxima S\'està esperant... @@ -395,17 +395,17 @@ limitations under the License. El sensor bluetooth no està connectat - Dades del sensor de temps + Dades del sensor de temps S\'ha habilitat el mesurador de potència S\'ha habilitat el monitor de la freqüència cardíaca Cap gestor de sensors Habilitat - S\'està connectant - S\'ha connectat - S\'ha desconnectat + S\'està connectant + S\'ha connectat + S\'ha desconnectat Cap servei de sensor S\'està cercant - S\'està enviant + S\'està enviant Cap diff --git a/MyTracks/res/values-de/strings.xml b/MyTracks/res/values-de/strings.xml index ac5a2080d..64a2bd9a9 100644 --- a/MyTracks/res/values-de/strings.xml +++ b/MyTracks/res/values-de/strings.xml @@ -212,7 +212,7 @@ limitations under the License. Der Trackname wird aus Datum und Zeit zum Aufzeichnungsbeginn zusammengesetzt. Tracknamen erhalten eine fortlaufende Nummer. - Pace + Pace Wird nur unter Android 2.0 oder höher unterstützt Sensortyp @@ -263,47 +263,47 @@ limitations under the License. - Durchschnitt in Bew. - Pace in Bew. + Durchschnitt in Bew. + Pace in Bew. - Durchschnittsgeschw. - Durchschnitts-Pace + Durchschnittsgeschw. + Durchschnitts-Pace Höhenprofil - Höhengewinn - Höhe - Breitengrad - Längengrad + Höhengewinn + Höhe + Breitengrad + Längengrad - Niedrigste Höhenlage - Minimale Steigung - Minimaler Pace + Niedrigste Höhenlage + Minimale Steigung + Minimaler Pace - Höchste Höhenlage - Maximale Steigung - Max. Geschwindigkeit + Höchste Höhenlage + Maximale Steigung + Max. Geschwindigkeit Lade Track… Diagramm-Einstellungen - X-Achse - Nach Entfernung - Nach Zeit + X-Achse + Nach Entfernung + Nach Zeit - Y-Achse + Y-Achse Stunde Stunden - Std - Min + Std + Min Minute Minuten Sekunde @@ -311,43 +311,43 @@ limitations under the License. - - + + Kilometer - Fuß - + Fuß + Meilen - + Kilometer pro Stunde - + pro Kilometer - + Meilen pro Stunde - + pro Meile - + - - - Akkukapazität + + + Akkukapazität - Zeit in Bewegung - Gesamtzeit + Zeit in Bewegung + Gesamtzeit Zeit SD-Karte nicht verfügbar - Geschwindigkeit + Geschwindigkeit Du musst erst eine Aufzeichnung beginnen. Statistik - Gesamtentfernung + Gesamtentfernung Entfernung - Kraft - Kadenz - Herzfrequenz + Kraft + Kadenz + Herzfrequenz Höchste Herzfrequenz Bitte warten… @@ -428,17 +428,17 @@ limitations under the License. Bluetooth-Sensor nicht verbunden. - Uhrzeit + Uhrzeit Kraftmesser aktiviert Herzfrequenzmessung aktiviert Keine Sensoren verfügbar Aktiviert - Verbinde... - Verbunden - Getrennt + Verbinde... + Verbunden + Getrennt Kein Sensor-Dienst Suche... - Sende... + Sende... Track-Aufzeichnungs-Benachrichtigungen empfangen diff --git a/MyTracks/res/values-es/strings.xml b/MyTracks/res/values-es/strings.xml index a3770780b..2d4956f63 100644 --- a/MyTracks/res/values-es/strings.xml +++ b/MyTracks/res/values-es/strings.xml @@ -255,7 +255,7 @@ limitations under the License. Todas tus preferencias seran borradas o restauradas a sus valores por defecto. Los recorridos se mantendran. ¿Está seguro? Todas las preferencias han sido restauradas a sus valores por defecto. - Paso + Paso Sólo soportado en Android 2.0 o superior Tipo de sensor @@ -332,40 +332,40 @@ limitations under the License. - Velocidad promedio en movimiento - Paso promedio en movimiento + Velocidad promedio en movimiento + Paso promedio en movimiento - Velocidad promedio - Paso promedio + Velocidad promedio + Paso promedio Gráfica de elevación - Aumento de elevación - Elevación - Latitud - Longitud + Aumento de elevación + Elevación + Latitud + Longitud - Elevación mínima - Pendiente mínima - Paso mínimo + Elevación mínima + Pendiente mínima + Paso mínimo - Elevación máxima - Pendiente máxima - Velocidad máxima + Elevación máxima + Pendiente máxima + Velocidad máxima Cargando recorrido... Configuración de gráficas - Eje X - Como función de distancia - Como función de tiempo + Eje X + Como función de distancia + Como función de tiempo - Eje Y + Eje Y @@ -378,7 +378,7 @@ limitations under the License. kilómetros - pies + pies millas @@ -388,21 +388,21 @@ limitations under the License. por milla - Nivel de batería + Nivel de batería - Tiempo en movimiento - Tiempo total + Tiempo en movimiento + Tiempo total Tiempo SD no disponible - Velocidad + Velocidad Debes comenzar un viaje. Estadísticas - Distancia total + Distancia total Distancia - Potencia - Cadencia - Ritmo cardíaco + Potencia + Cadencia + Ritmo cardíaco Máx ritmo cardíaco Esperando... @@ -487,17 +487,17 @@ limitations under the License. Sensor Bluetooth no conectado - Hora de los datos del sensor + Hora de los datos del sensor Sensor de batería activado Monitor de ritmo cardíaco activado No hay un gestor de sensores Activado - Conectando - Conectado - Desconectando + Conectando + Conectado + Desconectando No hay un servicio de sensores Buscando - Enviando + Enviando recibir avisos de registro de recorridos diff --git a/MyTracks/res/values-fi/strings.xml b/MyTracks/res/values-fi/strings.xml index 9a0c76408..3e872444d 100644 --- a/MyTracks/res/values-fi/strings.xml +++ b/MyTracks/res/values-fi/strings.xml @@ -247,7 +247,7 @@ limitations under the License. Kaikki asetuksesi poistetaan ja palautetaan oletusarvoisiksi. Tallennetut reitit säilytetään. Oletko varma? Oletusasetukset palautettu. - Tahti + Tahti Tuettuna vain Android 2.0 tai uudemmassa Sensorin tyyppi @@ -313,47 +313,47 @@ limitations under the License. - Keskinopeus (liikuttaessa) - Tahti (liikuttaessa) + Keskinopeus (liikuttaessa) + Tahti (liikuttaessa) - Keskinopeus - Tahti + Keskinopeus + Tahti Korkeuskaavio - Nousu - Korkeus - Leveysaste - Pituuspiiri + Nousu + Korkeus + Leveysaste + Pituuspiiri - Min Korkeus - Min Kaltevuus - Min Tahti + Min Korkeus + Min Kaltevuus + Min Tahti - Max Korkeus - Max Kaltevuus - Max Nopeus + Max Korkeus + Max Kaltevuus + Max Nopeus Ladataan reittiä... Kaavion asetukset - X-akseli - Etäisyyden mukaan - Ajan mukaan + X-akseli + Etäisyyden mukaan + Ajan mukaan - Y-akseli + Y-akseli tunti tuntia - h - min + h + min minuutti minuuttia sekunti @@ -361,42 +361,42 @@ limitations under the License. ms - m - km + m + km kilometriä - ft - mi + ft + mi mailia - km/h + km/h kilometriä tunnissa - min/km + min/km per kilometri - mi/h + mi/h mailia tunnissa - min/mi + min/mi per maili - W - rpm - bpm - Akku + W + rpm + bpm + Akku - Liikkumisaika - Kokonaisaika + Liikkumisaika + Kokonaisaika Aika Muistikortti ei ole käytettävissä - Nopeus + Nopeus Sinun pitää ensin aloittaa matka. Tilastot - Kokonaismatka + Kokonaismatka Matka - Teho - Kadenssi - Syke + Teho + Kadenssi + Syke Maksimisyke - Odotetaan... @@ -481,17 +481,17 @@ limitations under the License. Bluetooth sensoria ei ole yhdistetty - Sensorin data-aika + Sensorin data-aika Tehomittari käytössä Sykemittari käytössä Ei sensorihallintaa Käytössä - Yhdistetään - Yhdistetty - Katkaistu + Yhdistetään + Yhdistetty + Katkaistu Ei sensoripalvelua Etsitään - Lähetetään + Lähetetään Ei sensoria ANT+ -sensori diff --git a/MyTracks/res/values-fr/strings.xml b/MyTracks/res/values-fr/strings.xml index 7266ef3c4..636b18528 100644 --- a/MyTracks/res/values-fr/strings.xml +++ b/MyTracks/res/values-fr/strings.xml @@ -192,7 +192,7 @@ limitations under the License. Fréquence de séparation Temps ou distance minimum avant l\'insertion d\'un marqueur de séparation - Rythme + Rythme Nécessite au minimum Android 2.0 Type de capteur @@ -241,38 +241,38 @@ limitations under the License. - Vitesse moyenne (déplacement) - Rythme moyen (dépl.) + Vitesse moyenne (déplacement) + Rythme moyen (dépl.) - Vitesse moyenne - Rythme moyen + Vitesse moyenne + Rythme moyen Altitude maximale - Dénivelé cumulé - Altitude + Dénivelé cumulé + Altitude - Altitude min - Pente min - Rythme min + Altitude min + Pente min + Rythme min - Altitude max - Pente max - Vitesse max + Altitude max + Pente max + Vitesse max Chargement du parcours... Paramètres Graphique - Abscisse (X) - Par distance - Par durée + Abscisse (X) + Par distance + Par durée - Ordonnée (Y) + Ordonnée (Y) @@ -282,15 +282,15 @@ limitations under the License. secondes - pied + pied kilomètres milles - km/h + km/h kilomètres/heure par kilomètre - mi/h + mi/h miles/heure per mile @@ -298,20 +298,20 @@ limitations under the License. Waiting... - Durée (déplacement) - Durée totale + Durée (déplacement) + Durée totale Durée Carte SD indisponible - Vitesse + Vitesse Vous devez commencer un parcours Distance - Puissance - Cadence - Rythme cardiaque + Puissance + Cadence + Rythme cardiaque Rythme cardiaque maximum - Statistiques - Distance totale + Distance totale Patientez @@ -384,17 +384,17 @@ limitations under the License. Capteur Bluetooth non connecté - Date des données du capteur + Date des données du capteur Compteur activé Cardiofréquencemètre activé Pas de gestionnaire de capteur Activé - Connexion - Connecté - Déconnecté + Connexion + Connecté + Déconnecté Pas de capteur Recherche - Envoi + Envoi Aucun diff --git a/MyTracks/res/values-it/strings.xml b/MyTracks/res/values-it/strings.xml index 576f09d1b..021036fb2 100644 --- a/MyTracks/res/values-it/strings.xml +++ b/MyTracks/res/values-it/strings.xml @@ -195,7 +195,7 @@ limitations under the License. Frequenza di divisione Tempo o distanza massima dopo di cui il percorso verrà diviso - Andatura + Andatura Satelliti GPS @@ -218,79 +218,79 @@ limitations under the License. - Velocità media in moto - Andatura media in moto + Velocità media in moto + Andatura media in moto - Velocità media - Andatura media + Velocità media + Andatura media Grafico dell\'Altitudine - Dislivello - Altitudine - Latitudine - Longitudine + Dislivello + Altitudine + Latitudine + Longitudine - Altitudine min - Inclinazione min - Andatura min + Altitudine min + Inclinazione min + Andatura min - Altitudine max - Inclinazione max - Velocità max + Altitudine max + Inclinazione max + Velocità max Caricamento percorso in corso... Impostazioni grafico - Asse X - Distanza - Tempo + Asse X + Distanza + Tempo - Asse Y + Asse Y ora ore - h - min + h + min minuto minuti secondo secondi - m - km + m + km chilometri - pd - mi + pd + mi miglia - km/h + km/h chilometri orari - min/km + min/km per chilometro - mi/h + mi/h miglia orarie - min/mi + min/mi per miglio - Durata in moto - Durata totale + Durata in moto + Durata totale Durata Scheda SD non disponibile - Velocità + Velocità Devi prima iniziare un percorso. Statistiche - Distanza totale + Distanza totale Distanza - Attendere... diff --git a/MyTracks/res/values-ja/strings.xml b/MyTracks/res/values-ja/strings.xml index d2439180a..ce698fa43 100644 --- a/MyTracks/res/values-ja/strings.xml +++ b/MyTracks/res/values-ja/strings.xml @@ -234,7 +234,7 @@ limitations under the License. デフォルトのトラック名をトラック開始日時にします． トラック名を昇順の数字にします． - ペース + ペース Android 2.0以上でのみサポート センサータイプ @@ -301,47 +301,47 @@ limitations under the License. - 平均移動速度 - 平均移動ペース + 平均移動速度 + 平均移動ペース - 平均速度 - 平均ペース + 平均速度 + 平均ペース 標高チャート - 標高差 - 標高 - 緯度 - 経度 + 標高差 + 標高 + 緯度 + 経度 - 最小標高 - 最小勾配 - 最小ペース + 最小標高 + 最小勾配 + 最小ペース - 最大標高 - 最大勾配 - 最大速度 + 最大標高 + 最大勾配 + 最大速度 トラックの読み込み中... チャート設定 - X軸 - 距離ベース - 時間ベース + X軸 + 距離ベース + 時間ベース - Y軸 + Y軸 時 時 - 時 - 分 + 時 + 分 分 分 秒 @@ -359,18 +359,18 @@ limitations under the License. 毎マイル - 移動時間 - 合計時間 + 移動時間 + 合計時間 時間 SD が発見できません - 速度 + 速度 移動して下さい． 統計 - 合計距離 + 合計距離 距離 - 心拍強度 - ケイデンス - 心拍数 + 心拍強度 + ケイデンス + 心拍数 最大心拍数 待機中... @@ -450,17 +450,17 @@ limitations under the License. Bluetoothセンサーに接続していません - 計測日時 + 計測日時 パワーメーター有効 心拍数モニタ有効 センサーマネージャがありません 有効 - 接続中 - 接続 - 解除 + 接続中 + 接続 + 解除 センサーサービスがありません 検索中 - 送信中 + 送信中 なし diff --git a/MyTracks/res/values-pl/strings.xml b/MyTracks/res/values-pl/strings.xml index 663569caa..1091d1da6 100644 --- a/MyTracks/res/values-pl/strings.xml +++ b/MyTracks/res/values-pl/strings.xml @@ -202,7 +202,7 @@ limitations under the License. Automatyczne wznawianie rejestracji trasy Maksymalny czas w minutach, który upłynął od ostatniego restartu telefonu, a po którym nie zostania wznowiona poprzednia trasa - Tempo + Tempo Dostępne tylko w wersji Android 2.0 lub nowszej Typ Czujnika @@ -246,79 +246,79 @@ limitations under the License. - Średnia prędkość poruszania - Średnie tempo poruszania + Średnia prędkość poruszania + Średnie tempo poruszania - Średnia prędkość - Średnie tempo + Średnia prędkość + Średnie tempo Wykres wysokości - Wzrost wysokości - Wysokość - Szerokość - Długość + Wzrost wysokości + Wysokość + Szerokość + Długość - Min. wysokość - Min. nachylenie - Min. tempo + Min. wysokość + Min. nachylenie + Min. tempo - Maks. wysokość - Maks. nachylenie - Maks. prędkość + Maks. wysokość + Maks. nachylenie + Maks. prędkość Wczytywanie trasy... Ustawienia wykresów - Oś X - Według odległości - Według czasu + Oś X + Według odległości + Według czasu - Oś Y + Oś Y godzina godziny - godz. - min + godz. + min minuta minuty sekunda sekundy - m - km + m + km kilometerów - st. - mi + st. + mi mil - km/h + km/h kilometry na godzinę - min/km + min/km na kilometr - mi/h + mi/h mile na godzinę - min/mi + min/mi na milę - Czas w ruchu - Całkowity czas + Czas w ruchu + Całkowity czas Czas Karta SD niedostępna - Prędkość + Prędkość Musisz rozpocząć podróż. Statystyki - Całkowita odległość + Całkowita odległość Odległość - Oczekiwanie... @@ -399,15 +399,15 @@ limitations under the License. Urządzenie Bluetooth niepołączone - Czas Danych Czujnika + Czas Danych Czujnika Miernik mocy aktywny Pulsometr aktywny Brak Ustawień Czujników Aktywny - Łączenie - Podłączony - Rozłączony + Łączenie + Podłączony + Rozłączony Brak Serwisu Czujników Wykrywanie - Przesyłanie + Przesyłanie diff --git a/MyTracks/res/values-pt-rBR/strings.xml b/MyTracks/res/values-pt-rBR/strings.xml index 1fcad9a67..26e99a577 100644 --- a/MyTracks/res/values-pt-rBR/strings.xml +++ b/MyTracks/res/values-pt-rBR/strings.xml @@ -184,7 +184,7 @@ limitations under the License. O conteúdo do mapa também será incluído ao compartilhar Freqüência de divisão Maior tempo ou distância de uma gravação antes que ela seja dividida em duas - Passo + Passo Satélites de GPS @@ -207,51 +207,51 @@ limitations under the License. - Velocidade Méd. em Movimento - Passo Médio em Movimento + Velocidade Méd. em Movimento + Passo Médio em Movimento - Velocidade Média - Passo Médio + Velocidade Média + Passo Médio Carta de elevação - Ganho de elevação - Elevação + Ganho de elevação + Elevação - Elevação Mínima - Subida mínima - Passo Mínimo + Elevação Mínima + Subida mínima + Passo Mínimo - Elevação Máxima - Subida máxima - Velocidade Máxima + Elevação Máxima + Subida máxima + Velocidade Máxima Carregando caminho... Configurações do gráfico - Eixo X - Por Distância - Por Tempo + Eixo X + Por Distância + Por Tempo - Eixo Y + Eixo Y hora horas - h + h minuto minutos segundo segundos - pés + pés kilômetros milhas @@ -262,14 +262,14 @@ limitations under the License. por milha - Tempo em Movimento - Tempo Total + Tempo em Movimento + Tempo Total Tempo SD não disponível - Velocidade + Velocidade Você deve começar uma viagem. Estatísticas - Distância Total + Distância Total Distância - Aguardando... diff --git a/MyTracks/res/values-ru/strings.xml b/MyTracks/res/values-ru/strings.xml index 051b30aaf..706a5f13c 100644 --- a/MyTracks/res/values-ru/strings.xml +++ b/MyTracks/res/values-ru/strings.xml @@ -243,7 +243,7 @@ limitations under the License. Все ваши настройки будут стерты и восстановлены значения по умолчанию. Записанные треки будут сохранены. Вы уверены? Все настройки были возвращены к значениям по умолчанию. - Темп + Темп Поддерживается только в Android 2.0 или выше Тип датчика @@ -309,47 +309,47 @@ limitations under the License. - Средняя скорость движения - Средний темп движения + Средняя скорость движения + Средний темп движения - Средняя скорость - Средний темп + Средняя скорость + Средний темп Диаграмма высоты - Набор высоты - Высота - Широта - Долгота + Набор высоты + Высота + Широта + Долгота - Минимальная высота - Минимальный уклон - Минимальный темп + Минимальная высота + Минимальный уклон + Минимальный темп - Максимальная высота - Максимальный уклон - Максимальная скорость + Максимальная высота + Максимальный уклон + Максимальная скорость Загрузка трека... Настройки диаграммы - Ось X - По расстоянию - По времени + Ось X + По расстоянию + По времени - Ось Y + Ось Y час часов - ч - мин + ч + мин минута минут секунда @@ -357,42 +357,42 @@ limitations under the License. мс - м - км + м + км километров - футов - миль + футов + миль мили - км/ч + км/ч километров в час - мин/км + мин/км за километр - миль/ч + миль/ч миль в час - мин/миля + мин/миля за милю - Вт + Вт - об/мин - bpm + об/мин + bpm - Время движения - Общее время + Время движения + Общее время Время SD карта недоступна - Скорость + Скорость Вы должны начать путешествие. Статистика - Общее расстояние + Общее расстояние Расстояние - Мощность - Каденс - Пульс + Мощность + Каденс + Пульс Максимальный пульс - Ожидание... @@ -477,17 +477,17 @@ limitations under the License. Bluetooth датчик не подключен - Датчик времени + Датчик времени Измеритель мощности включен Монитор пульса включен Нет диспетчера датчиков Включено - Подключение - Подключено - Отключено + Подключение + Подключено + Отключено Нет службы датчиков Поиск - Отправка + Отправка Нет diff --git a/MyTracks/res/values-sv/strings.xml b/MyTracks/res/values-sv/strings.xml index d29f05289..de620cad9 100644 --- a/MyTracks/res/values-sv/strings.xml +++ b/MyTracks/res/values-sv/strings.xml @@ -198,7 +198,7 @@ limitations under the License. Delningsfrekvens Maximala tiden eller distansen varefter en ny delningsmarkör kommer infogas - Tempo + Tempo GPS-satelliter @@ -221,79 +221,79 @@ limitations under the License. - Genomsnittlig rörlig hastighet - Genomsnittlig rörligt tempo + Genomsnittlig rörlig hastighet + Genomsnittlig rörligt tempo - Genomsnittlig hastighet - Genomsnittligt tempo + Genomsnittlig hastighet + Genomsnittligt tempo Höjddiagram - Höjdvinst - Höjd - Latitud - Longitud + Höjdvinst + Höjd + Latitud + Longitud - Minimihöjd - Minimilutning - Minimitempo + Minimihöjd + Minimilutning + Minimitempo - Maxhöjd - Maxlutning - Maxhastighet + Maxhöjd + Maxlutning + Maxhastighet Laddar spår... Diagraminställningar - X-axel - Efter distans - Efter tid + X-axel + Efter distans + Efter tid - Y-axel + Y-axel timme timmar - tim - min + tim + min minut minuter sekund sekunder - m - km + m + km kilometer - ft - mi + ft + mi miles - km/h + km/h kilometer i timmen - min/km + min/km per kilometer - mi/h + mi/h miles i timmen - min/mi + min/mi per mile - Rörlig tid - Total tid + Rörlig tid + Total tid Tid SD otillgängligt - Hastighet + Hastighet Du måste starta en tur. Statistik - Total distans + Total distans Distans - Väntar... diff --git a/MyTracks/res/values-zh-rCN/strings.xml b/MyTracks/res/values-zh-rCN/strings.xml index 2550d9f15..b6ea0ca8c 100644 --- a/MyTracks/res/values-zh-rCN/strings.xml +++ b/MyTracks/res/values-zh-rCN/strings.xml @@ -244,7 +244,7 @@ limitations under the License. 你的所有设置都将恢复到默认值. 已保存的轨迹不会丢失. 确定要继续吗? 所有设置已恢复到默认值. - 节奏 + 节奏 只在 Android 2.0 及以上版本支持 感应器类型 @@ -310,47 +310,47 @@ limitations under the License. - 平均移动速度 - 平均移动步速 + 平均移动速度 + 平均移动步速 - 平均速度 - 平均步速 + 平均速度 + 平均步速 海拔图表 - 爬升 - 海拔 - 纬度 - 经度 + 爬升 + 海拔 + 纬度 + 经度 - 最小海拔 - 最小落差 - 最小步速 + 最小海拔 + 最小落差 + 最小步速 - 最大海拔 - 最大落差 - 最大速度 + 最大海拔 + 最大落差 + 最大速度 载入轨迹中... 图表设置 - 横轴 - 按距离显示 - 按时间显示 + 横轴 + 按距离显示 + 按时间显示 - 纵轴 + 纵轴 小时 小时 - 时 - 分 + 时 + 分 分钟 分钟 秒 @@ -367,18 +367,18 @@ limitations under the License. 每英里 - 移动时间 - 总时间 + 移动时间 + 总时间 时间 没有 SD 卡 - 速度 + 速度 你必须先记录轨迹. 统计 - 总距离 + 总距离 距离 - 电源 - 节奏 - 心率 + 电源 + 节奏 + 心率 最大心率 请稍候... @@ -457,17 +457,17 @@ limitations under the License. 未连接蓝牙感应器 - 感应器数据时间 + 感应器数据时间 电源计量器已启用 心率监视器已启用 没有感应器管理器 已启用 - 连接中 - 已连接 - 未连接 + 连接中 + 已连接 + 未连接 没有感应器服务 搜索中 - 发送中 + 发送中 无 diff --git a/MyTracks/res/values/strings.xml b/MyTracks/res/values/strings.xml index 68a9c9a7d..8080fa0bc 100644 --- a/MyTracks/res/values/strings.xml +++ b/MyTracks/res/values/strings.xml @@ -43,6 +43,28 @@ limitations under the License. Version: + + + By Distance + + + By Time + + + X Axis + + + Y Axis + + @@ -284,6 +306,54 @@ limitations under the License. (Part %d) + + + Battery Level + + + Cadence + + + Connected + + + Connecting + + + Last Sensor Time + + + Disconnected + + + Heart Rate + + + Power + + + Sending + + My Tracks Settings + + + + + Average Moving Pace + + + Average Moving Speed + + + Average Pace - + + Average Speed + + + Elevation + + + Elevation Gain + + + Latitude + + + Longitude + + + Max Elevation + + + Max Grade + + + Max Speed + + + Min Elevation + + + Min Grade + + + Min Pace + + + Moving Time + + + Pace + + + Speed + + + Total Distance + + + Total Time + + + bpm + + + ft + + + hr + + + km + + + km/h + + + m + + + mi + + + mi/h + + + min + + + min/km + + + min/mi + + + rpm + + + W + + @@ -1270,193 +1474,6 @@ limitations under the License. I think you might be interested in this track.\n\nTo view this track use Google Earth or other mapping software. - - - - Speed - - - Pace - - - Total Distance - - - Total Time - - - Moving Time - - - Max Speed - - - Average Speed - - - Average Moving Speed - - - Min Pace - - - Average Pace - - - Average Moving Pace - - - Elevation - - - Elevation Gain - - - Max Elevation - - - Min Elevation - - - Min Grade - - - Max Grade - - - Latitude - - - Longitude - - - - - X Axis - - - By Distance - - - By Time - - - Y Axis - - - Power - - - Cadence - - - Heart Rate - - - - - hr - - - min - - - - - km - - - m - - - mi - - - ft - - - - - km/h - - - mi/h - - - - - min/km - - - min/mi - - - - - Battery Level - - - - - W - - - rpm - - - bpm - Finished reading from SD card. - - - - Sensor Data Time - - - - - Connecting - - - Connected - - - Disconnected - - - Sending - diff --git a/MyTracks/src/com/google/android/apps/mytracks/AggregatedStatsActivity.java b/MyTracks/src/com/google/android/apps/mytracks/AggregatedStatsActivity.java index 3e2767bf2..302891967 100644 --- a/MyTracks/src/com/google/android/apps/mytracks/AggregatedStatsActivity.java +++ b/MyTracks/src/com/google/android/apps/mytracks/AggregatedStatsActivity.java @@ -74,7 +74,7 @@ public class AggregatedStatsActivity extends Activity implements } utils.setMetricUnits(metricUnits); utils.updateUnits(); - utils.setSpeedLabel(R.id.speed_label, R.string.speed, R.string.pace_label); + utils.setSpeedLabel(R.id.speed_label, R.string.stat_speed, R.string.stat_pace); utils.setSpeedLabels(); DisplayMetrics metrics = new DisplayMetrics(); diff --git a/MyTracks/src/com/google/android/apps/mytracks/ChartView.java b/MyTracks/src/com/google/android/apps/mytracks/ChartView.java index 428df8310..09bc9e002 100644 --- a/MyTracks/src/com/google/android/apps/mytracks/ChartView.java +++ b/MyTracks/src/com/google/android/apps/mytracks/ChartView.java @@ -210,7 +210,7 @@ public class ChartView extends View { R.color.elevation_border, new ZoomSettings(MAX_INTERVALS, new int[] {5, 10, 25, 50, 100, 250, 500, 1000, 2500, 5000}), - R.string.elevation_label); + R.string.stat_elevation); series[SPEED_SERIES] = new ChartValueSeries(context, @@ -219,14 +219,14 @@ public class ChartView extends View { R.color.speed_border, new ZoomSettings(MAX_INTERVALS, 0, Integer.MIN_VALUE, new int[] {1, 5, 10, 20, 50}), - R.string.speed); + R.string.stat_speed); series[POWER_SERIES] = new ChartValueSeries(context, "###,###", R.color.power_fill, R.color.power_border, new ZoomSettings(MAX_INTERVALS, 0, 1000, new int[] {5, 50, 100, 200}), - R.string.power); + R.string.sensor_state_power); series[CADENCE_SERIES] = new ChartValueSeries(context, "###,###", @@ -234,7 +234,7 @@ public class ChartView extends View { R.color.cadence_border, new ZoomSettings(MAX_INTERVALS, 0, Integer.MIN_VALUE, new int[] {5, 10, 25, 50}), - R.string.cadence); + R.string.sensor_state_cadence); series[HEART_RATE_SERIES] = new ChartValueSeries(context, "###,###", @@ -242,7 +242,7 @@ public class ChartView extends View { R.color.heartrate_border, new ZoomSettings(MAX_INTERVALS, 0, Integer.MIN_VALUE, new int[] {25, 50}), - R.string.heart_rate); + R.string.sensor_state_heart_rate); } public void clearWaypoints() { @@ -269,8 +269,8 @@ public class ChartView extends View { public void setReportSpeed(boolean reportSpeed, Context c) { series[SPEED_SERIES].setTitle(c.getString(reportSpeed - ? R.string.speed - : R.string.pace_label)); + ? R.string.stat_speed + : R.string.stat_pace)); } private void addDataPointInternal(double[] theData) { @@ -832,8 +832,8 @@ public class ChartView extends View { canvas.drawLine(leftBorder, y, rightEdge, y, borderPaint); Context c = getContext(); String s = mode == Mode.BY_DISTANCE - ? (metricUnits ? c.getString(R.string.kilometer) : c.getString(R.string.mile)) - : c.getString(R.string.min); + ? (metricUnits ? c.getString(R.string.unit_kilometer) : c.getString(R.string.unit_mile)) + : c.getString(R.string.unit_minute); canvas.drawText(s, rightEdge, effectiveHeight + .2f * UNIT_BORDER + topBorder, labelPaint); } @@ -852,7 +852,7 @@ public class ChartView extends View { Context c = getContext(); // TODO: This should really show units for all series. - String s = metricUnits ? c.getString(R.string.meter) : c.getString(R.string.feet); + String s = metricUnits ? c.getString(R.string.unit_meter) : c.getString(R.string.unit_feet); canvas.drawText(s, leftBorder - UNIT_BORDER * .2f, UNIT_BORDER * .8f + topBorder, labelPaint); } diff --git a/MyTracks/src/com/google/android/apps/mytracks/StatsActivity.java b/MyTracks/src/com/google/android/apps/mytracks/StatsActivity.java index f44be3ffa..346793781 100644 --- a/MyTracks/src/com/google/android/apps/mytracks/StatsActivity.java +++ b/MyTracks/src/com/google/android/apps/mytracks/StatsActivity.java @@ -177,7 +177,7 @@ public class StatsActivity extends Activity implements TrackDataListener { @Override public void run() { utils.updateUnits(); - utils.setSpeedLabel(R.id.speed_label, R.string.speed, R.string.pace_label); + utils.setSpeedLabel(R.id.speed_label, R.string.stat_speed, R.string.stat_pace); utils.setSpeedLabels(); } }); diff --git a/MyTracks/src/com/google/android/apps/mytracks/StatsUtilities.java b/MyTracks/src/com/google/android/apps/mytracks/StatsUtilities.java index 674122f2c..77c8a1a6b 100644 --- a/MyTracks/src/com/google/android/apps/mytracks/StatsUtilities.java +++ b/MyTracks/src/com/google/android/apps/mytracks/StatsUtilities.java @@ -20,13 +20,13 @@ import com.google.android.apps.mytracks.util.StringUtils; import com.google.android.apps.mytracks.util.UnitConversions; import com.google.android.maps.mytracks.R; -import java.text.DecimalFormat; -import java.text.NumberFormat; - import android.app.Activity; import android.util.Log; import android.widget.TextView; +import java.text.DecimalFormat; +import java.text.NumberFormat; + /** * Various utility functions for views that display statistics information. * @@ -128,24 +128,24 @@ public class StatsUtilities { public void setAltitudeUnits(int unitLabelId) { TextView unitTextView = (TextView) activity.findViewById(unitLabelId); - unitTextView.setText(metricUnits ? R.string.meter : R.string.feet); + unitTextView.setText(metricUnits ? R.string.unit_meter : R.string.unit_feet); } public void setDistanceUnits(int unitLabelId) { TextView unitTextView = (TextView) activity.findViewById(unitLabelId); - unitTextView.setText(metricUnits ? R.string.kilometer : R.string.mile); + unitTextView.setText(metricUnits ? R.string.unit_kilometer : R.string.unit_mile); } public void setSpeedUnits(int unitLabelId, int unitLabelBottomId) { TextView unitTextView = (TextView) activity.findViewById(unitLabelId); unitTextView.setText(reportSpeed - ? (metricUnits ? R.string.kilometer : R.string.mile) - : R.string.min); + ? (metricUnits ? R.string.unit_kilometer : R.string.unit_mile) + : R.string.unit_minute); unitTextView = (TextView) activity.findViewById(unitLabelBottomId); unitTextView.setText(reportSpeed - ? R.string.hr - : (metricUnits ? R.string.kilometer : R.string.mile)); + ? R.string.unit_hour + : (metricUnits ? R.string.unit_kilometer : R.string.unit_mile)); } public void setTime(int id, long l) { @@ -251,13 +251,13 @@ public class StatsUtilities { public void setSpeedLabels() { setSpeedLabel(R.id.average_speed_label, - R.string.average_speed_label, - R.string.average_pace_label); + R.string.stat_average_speed, + R.string.stat_average_pace); setSpeedLabel(R.id.average_moving_speed_label, - R.string.average_moving_speed_label, - R.string.average_moving_pace_label); + R.string.stat_average_moving_speed, + R.string.stat_average_moving_pace); setSpeedLabel(R.id.max_speed_label, - R.string.max_speed_label, - R.string.min_pace_label); + R.string.stat_max_speed, + R.string.stat_min_pace); } } diff --git a/MyTracks/src/com/google/android/apps/mytracks/TrackList.java b/MyTracks/src/com/google/android/apps/mytracks/TrackList.java index 04f495d86..a654d5945 100644 --- a/MyTracks/src/com/google/android/apps/mytracks/TrackList.java +++ b/MyTracks/src/com/google/android/apps/mytracks/TrackList.java @@ -312,17 +312,17 @@ public class TrackList extends ListActivity if (metricUnits) { if (length > 1000) { length /= 1000; - lengthUnit = getString(R.string.kilometer); + lengthUnit = getString(R.string.unit_kilometer); } else { - lengthUnit = getString(R.string.meter); + lengthUnit = getString(R.string.unit_meter); } } else { if (length > UnitConversions.MI_TO_M) { length /= UnitConversions.MI_TO_M; - lengthUnit = getString(R.string.mile); + lengthUnit = getString(R.string.unit_mile); } else { length *= UnitConversions.M_TO_FT; - lengthUnit = getString(R.string.feet); + lengthUnit = getString(R.string.unit_feet); } } textView.setText(String.format("%s %.2f %s", diff --git a/MyTracks/src/com/google/android/apps/mytracks/io/docs/DocsHelper.java b/MyTracks/src/com/google/android/apps/mytracks/io/docs/DocsHelper.java index f423e85c8..99a07a4bc 100644 --- a/MyTracks/src/com/google/android/apps/mytracks/io/docs/DocsHelper.java +++ b/MyTracks/src/com/google/android/apps/mytracks/io/docs/DocsHelper.java @@ -280,11 +280,11 @@ public class DocsHelper { TripStatistics stats = track.getStatistics(); String distanceUnit = context.getString(metricUnits ? - R.string.kilometer : R.string.mile); + R.string.unit_kilometer : R.string.unit_mile); String speedUnit = context.getString(metricUnits ? - R.string.kilometer_per_hour : R.string.mile_per_hour); + R.string.unit_kilometer_per_hour : R.string.unit_mile_per_hour); String elevationUnit = context.getString(metricUnits ? - R.string.meter : R.string.feet); + R.string.unit_meter : R.string.unit_feet); // Prepare the Post-Text we are going to send. DocsTagBuilder tagBuilder = new DocsTagBuilder(metricUnits) diff --git a/MyTracks/src/com/google/android/apps/mytracks/services/sensors/SensorUtils.java b/MyTracks/src/com/google/android/apps/mytracks/services/sensors/SensorUtils.java index 6c1d99f71..a1e2f94a5 100644 --- a/MyTracks/src/com/google/android/apps/mytracks/services/sensors/SensorUtils.java +++ b/MyTracks/src/com/google/android/apps/mytracks/services/sensors/SensorUtils.java @@ -101,13 +101,13 @@ public class SensorUtils { case NONE: return c.getString(R.string.sensor_type_value_none); case CONNECTING: - return c.getString(R.string.connecting); + return c.getString(R.string.sensor_state_connecting); case CONNECTED: - return c.getString(R.string.connected); + return c.getString(R.string.sensor_state_connected); case DISCONNECTED: - return c.getString(R.string.disconnected); + return c.getString(R.string.sensor_state_disconnected); case SENDING: - return c.getString(R.string.sending); + return c.getString(R.string.sensor_state_sending); default: return ""; } diff --git a/MyTracks/src/com/google/android/apps/mytracks/util/ChartURLGenerator.java b/MyTracks/src/com/google/android/apps/mytracks/util/ChartURLGenerator.java index 5c0336192..cc05d91ea 100644 --- a/MyTracks/src/com/google/android/apps/mytracks/util/ChartURLGenerator.java +++ b/MyTracks/src/com/google/android/apps/mytracks/util/ChartURLGenerator.java @@ -58,7 +58,7 @@ public class ChartURLGenerator { } return getChartUrl(distances, elevations, track, - context.getString(R.string.elevation_label), metricUnits); + context.getString(R.string.stat_elevation), metricUnits); } /** diff --git a/MyTracks/src/com/google/android/apps/mytracks/util/StringUtils.java b/MyTracks/src/com/google/android/apps/mytracks/util/StringUtils.java index e28445469..43f7d78fa 100644 --- a/MyTracks/src/com/google/android/apps/mytracks/util/StringUtils.java +++ b/MyTracks/src/com/google/android/apps/mytracks/util/StringUtils.java @@ -272,20 +272,20 @@ public class StringUtils implements DescriptionGenerator { String averageSpeed = getSpeedString(trackStats.getAverageSpeed(), - R.string.average_speed_label, - R.string.average_pace_label, + R.string.stat_average_speed, + R.string.stat_average_pace, displaySpeed); String averageMovingSpeed = getSpeedString(trackStats.getAverageMovingSpeed(), - R.string.average_moving_speed_label, - R.string.average_moving_pace_label, + R.string.stat_average_moving_speed, + R.string.stat_average_moving_pace, displaySpeed); String maxSpeed = getSpeedString(trackStats.getMaxSpeed(), - R.string.max_speed_label, - R.string.min_pace_label, + R.string.stat_max_speed, + R.string.stat_min_pace, displaySpeed); return String.format("%s

" @@ -306,41 +306,41 @@ public class StringUtils implements DescriptionGenerator { context.getString(R.string.send_to_google_by_mytracks), // Line 2 - context.getString(R.string.total_distance_label), - distanceInKm, context.getString(R.string.kilometer), - distanceInMiles, context.getString(R.string.mile), + context.getString(R.string.stat_total_distance), + distanceInKm, context.getString(R.string.unit_kilometer), + distanceInMiles, context.getString(R.string.unit_mile), // Line 3 - context.getString(R.string.total_time_label), + context.getString(R.string.stat_total_time), StringUtils.formatTime(trackStats.getTotalTime()), // Line 4 - context.getString(R.string.moving_time_label), + context.getString(R.string.stat_moving_time), StringUtils.formatTime(trackStats.getMovingTime()), // Line 5 averageSpeed, averageMovingSpeed, maxSpeed, // Line 6 - context.getString(R.string.min_elevation_label), - minElevationInMeters, context.getString(R.string.meter), - minElevationInFeet, context.getString(R.string.feet), + context.getString(R.string.stat_min_elevation), + minElevationInMeters, context.getString(R.string.unit_meter), + minElevationInFeet, context.getString(R.string.unit_feet), // Line 7 - context.getString(R.string.max_elevation_label), - maxElevationInMeters, context.getString(R.string.meter), - maxElevationInFeet, context.getString(R.string.feet), + context.getString(R.string.stat_max_elevation), + maxElevationInMeters, context.getString(R.string.unit_meter), + maxElevationInFeet, context.getString(R.string.unit_feet), // Line 8 - context.getString(R.string.elevation_gain_label), - elevationGainInMeters, context.getString(R.string.meter), - elevationGainInFeet, context.getString(R.string.feet), + context.getString(R.string.stat_elevation_gain), + elevationGainInMeters, context.getString(R.string.unit_meter), + elevationGainInFeet, context.getString(R.string.unit_feet), // Line 9 - context.getString(R.string.max_grade_label), maxGrade, + context.getString(R.string.stat_max_grade), maxGrade, // Line 10 - context.getString(R.string.min_grade_label), minGrade, + context.getString(R.string.stat_min_grade), minGrade, // Line 11 context.getString(R.string.recorded_date), @@ -360,8 +360,8 @@ public class StringUtils implements DescriptionGenerator { if (displaySpeed) { return String.format("%s: %.2f %s (%.1f %s)
", context.getString(speedLabel), - speedInKph, context.getString(R.string.kilometer_per_hour), - speedInMph, context.getString(R.string.mile_per_hour)); + speedInKph, context.getString(R.string.unit_kilometer_per_hour), + speedInMph, context.getString(R.string.unit_mile_per_hour)); } else { double paceInKm; double paceInMi; @@ -374,8 +374,8 @@ public class StringUtils implements DescriptionGenerator { } return String.format("%s: %.2f %s (%.1f %s)
", context.getString(paceLabel), - paceInKm, context.getString(R.string.min_per_kilometer), - paceInMi, context.getString(R.string.min_per_mile)); + paceInKm, context.getString(R.string.unit_minute_per_kilometer), + paceInMi, context.getString(R.string.unit_minute_per_mile)); } } @@ -434,34 +434,34 @@ public class StringUtils implements DescriptionGenerator { + "%s: %d %s (%d %s)\n" + "%s: %d %s\n" + "%s: %d %s\n", - context.getString(R.string.total_distance_label), - distanceInKm, context.getString(R.string.kilometer), - distanceInMiles, context.getString(R.string.mile), - context.getString(R.string.total_time_label), + context.getString(R.string.stat_total_distance), + distanceInKm, context.getString(R.string.unit_kilometer), + distanceInMiles, context.getString(R.string.unit_mile), + context.getString(R.string.stat_total_time), StringUtils.formatTime(stats.getTotalTime()), - context.getString(R.string.moving_time_label), + context.getString(R.string.stat_moving_time), StringUtils.formatTime(stats.getMovingTime()), - context.getString(R.string.average_speed_label), - averageSpeedInKmh, context.getString(R.string.kilometer_per_hour), - averageSpeedInMph, context.getString(R.string.mile_per_hour), - context.getString(R.string.average_moving_speed_label), - movingSpeedInKmh, context.getString(R.string.kilometer_per_hour), - movingSpeedInMph, context.getString(R.string.mile_per_hour), - context.getString(R.string.max_speed_label), - maxSpeedInKmh, context.getString(R.string.kilometer_per_hour), - maxSpeedInMph, context.getString(R.string.mile_per_hour), - context.getString(R.string.min_elevation_label), - minElevationInMeters, context.getString(R.string.meter), - minElevationInFeet, context.getString(R.string.feet), - context.getString(R.string.max_elevation_label), - maxElevationInMeters, context.getString(R.string.meter), - maxElevationInFeet, context.getString(R.string.feet), - context.getString(R.string.elevation_gain_label), - elevationGainInMeters, context.getString(R.string.meter), - elevationGainInFeet, context.getString(R.string.feet), - context.getString(R.string.max_grade_label), + context.getString(R.string.stat_average_speed), + averageSpeedInKmh, context.getString(R.string.unit_kilometer_per_hour), + averageSpeedInMph, context.getString(R.string.unit_mile_per_hour), + context.getString(R.string.stat_average_moving_speed), + movingSpeedInKmh, context.getString(R.string.unit_kilometer_per_hour), + movingSpeedInMph, context.getString(R.string.unit_mile_per_hour), + context.getString(R.string.stat_max_speed), + maxSpeedInKmh, context.getString(R.string.unit_kilometer_per_hour), + maxSpeedInMph, context.getString(R.string.unit_mile_per_hour), + context.getString(R.string.stat_min_elevation), + minElevationInMeters, context.getString(R.string.unit_meter), + minElevationInFeet, context.getString(R.string.unit_feet), + context.getString(R.string.stat_max_elevation), + maxElevationInMeters, context.getString(R.string.unit_meter), + maxElevationInFeet, context.getString(R.string.unit_feet), + context.getString(R.string.stat_elevation_gain), + elevationGainInMeters, context.getString(R.string.unit_meter), + elevationGainInFeet, context.getString(R.string.unit_feet), + context.getString(R.string.stat_max_grade), theMaxGrade, percent, - context.getString(R.string.min_grade_label), + context.getString(R.string.stat_min_grade), theMinGrade, percent); } } diff --git a/MyTracks/src/com/google/android/apps/mytracks/widgets/TrackWidgetProvider.java b/MyTracks/src/com/google/android/apps/mytracks/widgets/TrackWidgetProvider.java index ff7959365..8c3c7d3a7 100644 --- a/MyTracks/src/com/google/android/apps/mytracks/widgets/TrackWidgetProvider.java +++ b/MyTracks/src/com/google/android/apps/mytracks/widgets/TrackWidgetProvider.java @@ -252,9 +252,11 @@ public class TrackWidgetProvider String metricUnitsKey = context.getString(R.string.metric_units_key); if (key == null || key.equals(metricUnitsKey)) { isMetric = prefs.getBoolean(metricUnitsKey, true); - distanceLabel = context.getString(isMetric ? R.string.kilometer : R.string.mile); - speedLabel = context.getString(isMetric ? R.string.kilometer_per_hour : R.string.mile_per_hour); - paceLabel = context.getString(isMetric ? R.string.min_per_kilometer : R.string.min_per_mile); + distanceLabel = context.getString(isMetric ? R.string.unit_kilometer : R.string.unit_mile); + speedLabel = context.getString( + isMetric ? R.string.unit_kilometer_per_hour : R.string.unit_mile_per_hour); + paceLabel = context.getString( + isMetric ? R.string.unit_minute_per_kilometer : R.string.unit_minute_per_mile); } String reportSpeedKey = context.getString(R.string.report_speed_key); diff --git a/MyTracksTest/src/com/google/android/apps/mytracks/ChartValueSeriesTest.java b/MyTracksTest/src/com/google/android/apps/mytracks/ChartValueSeriesTest.java index b3623c892..c9e3311c2 100644 --- a/MyTracksTest/src/com/google/android/apps/mytracks/ChartValueSeriesTest.java +++ b/MyTracksTest/src/com/google/android/apps/mytracks/ChartValueSeriesTest.java @@ -34,7 +34,7 @@ public class ChartValueSeriesTest extends AndroidTestCase { R.color.elevation_fill, R.color.elevation_border, new ZoomSettings(5, new int[] {100}), - R.string.elevation_label); + R.string.stat_elevation); } public void testInitialConditions() { @@ -44,7 +44,7 @@ public class ChartValueSeriesTest extends AndroidTestCase { assertEquals(0, series.getMax()); assertEquals(0.0, series.getSpread()); assertEquals(Style.STROKE, series.getPaint().getStyle()); - assertEquals(getContext().getString(R.string.elevation_label), + assertEquals(getContext().getString(R.string.stat_elevation), series.getTitle()); assertTrue(series.isEnabled()); } diff --git a/MyTracksTest/src/com/google/android/apps/mytracks/io/docs/DocsHelper_AddTrackRowTest.java b/MyTracksTest/src/com/google/android/apps/mytracks/io/docs/DocsHelper_AddTrackRowTest.java index 996f77ef5..d908e0e37 100644 --- a/MyTracksTest/src/com/google/android/apps/mytracks/io/docs/DocsHelper_AddTrackRowTest.java +++ b/MyTracksTest/src/com/google/android/apps/mytracks/io/docs/DocsHelper_AddTrackRowTest.java @@ -124,18 +124,18 @@ public class DocsHelper_AddTrackRowTest extends TestCase { final Resources mockResources = AndroidMock.createMock(MockResources.class); if (useMetric) { - AndroidMock.expect(mockResources.getString(R.string.kilometer)) + AndroidMock.expect(mockResources.getString(R.string.unit_kilometer)) .andReturn("km"); - AndroidMock.expect(mockResources.getString(R.string.kilometer_per_hour)) + AndroidMock.expect(mockResources.getString(R.string.unit_kilometer_per_hour)) .andReturn("kph"); - AndroidMock.expect(mockResources.getString(R.string.meter)) + AndroidMock.expect(mockResources.getString(R.string.unit_meter)) .andReturn("meter"); } else { - AndroidMock.expect(mockResources.getString(R.string.mile)) + AndroidMock.expect(mockResources.getString(R.string.unit_mile)) .andReturn("mile"); - AndroidMock.expect(mockResources.getString(R.string.mile_per_hour)) + AndroidMock.expect(mockResources.getString(R.string.unit_mile_per_hour)) .andReturn("mph"); - AndroidMock.expect(mockResources.getString(R.string.feet)) + AndroidMock.expect(mockResources.getString(R.string.unit_feet)) .andReturn("feet"); } AndroidMock.replay(mockResources);