karol/OpenTracks
1
0
Fork 0
forked from upstream-mirrors/OpenTracks
Code Pull Requests Actions Releases 2 Activity

fix comment on 78a330b32e6f

Browse Source
This commit is contained in:
Jimmy Shih
2011-11-04 15:04:15 -07:00
parent fe8cd0b884
commit fe9e6d47a2
15 changed files with 187 additions and 182 deletions
Download Patch File Download Diff File Expand all files Collapse all files
MyTracks/res/values-ca/strings.xml
+12 -12
View File
@@ -294,22 +294,22 @@ limitations under the License.
<!-- Units --> <!-- Units -->
<!-- Time --> <!-- Time -->
<string name="hour">hora</string> <string name="voice_hour">hora</string>
<string name="hours">hores</string> <string name="voice_hours">hores</string>
<string name="minute">minut</string> <string name="voice_minute">minut</string>
<string name="minutes">minuts</string> <string name="voice_minutes">minuts</string>
<string name="second">segon</string> <string name="voice_second">segon</string>
<string name="seconds">segons</string> <string name="voice_seconds">segons</string>
<!-- Distance --> <!-- Distance -->
<string name="kilometers_long">kilòmetres</string> <string name="voice_kilometers">kilòmetres</string>
<string name="miles_long">milles</string> <string name="voice_miles">milles</string>
<!-- Speed and Pace --> <!-- Speed and Pace -->
<string name="kilometer_per_hour_long">kilòmetres per hora</string> <string name="voice_kilometer_per_hour">kilòmetres per hora</string>
<string name="per_kilometer">per kilòmetre</string> <string name="voice_per_kilometer">per kilòmetre</string>
<string name="mile_per_hour_long">milles per hora</string> <string name="voice_mile_per_hour">milles per hora</string>
<string name="per_mile">per milla</string> <string name="voice_per_mile">per milla</string>
<!-- Stats Labels --> <!-- Stats Labels -->
<string name="moving_time_label">Temps en moviment</string> <string name="moving_time_label">Temps en moviment</string>
MyTracks/res/values-de/strings.xml
+12 -12
View File
@@ -304,33 +304,33 @@ limitations under the License.
<!-- Units --> <!-- Units -->
<!-- Time --> <!-- Time -->
<string name="hour">Stunde</string> <string name="voice_hour">Stunde</string>
<string name="hours">Stunden</string> <string name="voice_hours">Stunden</string>
<string name="hr">Std</string> <string name="hr">Std</string>
<string name="min">Min</string> <string name="min">Min</string>
<string name="minute">Minute</string> <string name="voice_minute">Minute</string>
<string name="minutes">Minuten</string> <string name="voice_minutes">Minuten</string>
<string name="second">Sekunde</string> <string name="voice_second">Sekunde</string>
<string name="seconds">Sekunden</string> <string name="voice_seconds">Sekunden</string>
<!--string name="milliseconds">ms</string--> <!--string name="milliseconds">ms</string-->
<!-- Distance --> <!-- Distance -->
<!--string name="meter">m</string--> <!--string name="meter">m</string-->
<!--string name="kilometer">km</string--> <!--string name="kilometer">km</string-->
<string name="kilometers_long">Kilometer</string> <string name="voice_kilometers">Kilometer</string>
<string name="feet">Fuß</string> <string name="feet">Fuß</string>
<!--string name="mile">mi</string--> <!--string name="mile">mi</string-->
<string name="miles_long">Meilen</string> <string name="voice_miles">Meilen</string>
<!-- Speed and Pace --> <!-- Speed and Pace -->
<!--string name="kilometer_per_hour">km/h</string--> <!--string name="kilometer_per_hour">km/h</string-->
<string name="kilometer_per_hour_long">Kilometer pro Stunde</string> <string name="voice_kilometer_per_hour">Kilometer pro Stunde</string>
<!--string name="min_per_kilometer">min/km</string--> <!--string name="min_per_kilometer">min/km</string-->
<string name="per_kilometer">pro Kilometer</string> <string name="voice_per_kilometer">pro Kilometer</string>
<!--string name="mile_per_hour">mi/h</string--> <!--string name="mile_per_hour">mi/h</string-->
<string name="mile_per_hour_long">Meilen pro Stunde</string> <string name="voice_mile_per_hour">Meilen pro Stunde</string>
<!--string name="min_per_mile">min/mi</string--> <!--string name="min_per_mile">min/mi</string-->
<string name="per_mile">pro Meile</string> <string name="voice_per_mile">pro Meile</string>
<!-- Sensors --> <!-- Sensors -->
<!--string name="watts">W</string--> <!--string name="watts">W</string-->
MyTracks/res/values-es/strings.xml
+12 -12
View File
@@ -373,23 +373,23 @@ limitations under the License.
<!-- Units --> <!-- Units -->
<!-- Time --> <!-- Time -->
<string name="hour">hora</string> <string name="voice_hour">hora</string>
<string name="hours">horas</string> <string name="voice_hours">horas</string>
<string name="minute">minuto</string> <string name="voice_minute">minuto</string>
<string name="minutes">minutos</string> <string name="voice_minutes">minutos</string>
<string name="second">segundo</string> <string name="voice_second">segundo</string>
<string name="seconds">segundos</string> <string name="voice_seconds">segundos</string>
<!-- Distance --> <!-- Distance -->
<string name="kilometers_long">kilómetros</string> <string name="voice_kilometers">kilómetros</string>
<string name="feet">pies</string> <string name="feet">pies</string>
<string name="miles_long">millas</string> <string name="voice_miles">millas</string>
<!-- Speed and Pace --> <!-- Speed and Pace -->
<string name="kilometer_per_hour_long">kilómetros por hora</string> <string name="voice_kilometer_per_hour">kilómetros por hora</string>
<string name="per_kilometer">por kilómetro</string> <string name="voice_per_kilometer">por kilómetro</string>
<string name="mile_per_hour_long">millas por hora</string> <string name="voice_mile_per_hour">millas por hora</string>
<string name="per_mile">por milla</string> <string name="voice_per_mile">por milla</string>
<!-- Sensors --> <!-- Sensors -->
<string name="battery_level">Nivel de batería</string> <string name="battery_level">Nivel de batería</string>
MyTracks/res/values-fi/strings.xml
+12 -12
View File
@@ -354,33 +354,33 @@ limitations under the License.
<!-- Units --> <!-- Units -->
<!-- Time --> <!-- Time -->
<string name="hour">tunti</string> <string name="voice_hour">tunti</string>
<string name="hours">tuntia</string> <string name="voice_hours">tuntia</string>
<string name="hr">h</string> <string name="hr">h</string>
<string name="min">min</string> <string name="min">min</string>
<string name="minute">minuutti</string> <string name="voice_minute">minuutti</string>
<string name="minutes">minuuttia</string> <string name="voice_minutes">minuuttia</string>
<string name="second">sekunti</string> <string name="voice_second">sekunti</string>
<string name="seconds">sekuntia</string> <string name="voice_seconds">sekuntia</string>
<string name="milliseconds">ms</string> <string name="milliseconds">ms</string>
<!-- Distance --> <!-- Distance -->
<string name="meter">m</string> <string name="meter">m</string>
<string name="kilometer">km</string> <string name="kilometer">km</string>
<string name="kilometers_long">kilometriä</string> <string name="voice_kilometers">kilometriä</string>
<string name="feet">ft</string> <string name="feet">ft</string>
<string name="mile">mi</string> <string name="mile">mi</string>
<string name="miles_long">mailia</string> <string name="voice_miles">mailia</string>
<!-- Speed and Pace --> <!-- Speed and Pace -->
<string name="kilometer_per_hour">km/h</string> <string name="kilometer_per_hour">km/h</string>
<string name="kilometer_per_hour_long">kilometriä tunnissa</string> <string name="voice_kilometer_per_hour">kilometriä tunnissa</string>
<string name="min_per_kilometer">min/km</string> <string name="min_per_kilometer">min/km</string>
<string name="per_kilometer">per kilometri</string> <string name="voice_per_kilometer">per kilometri</string>
<string name="mile_per_hour">mi/h</string> <string name="mile_per_hour">mi/h</string>
<string name="mile_per_hour_long">mailia tunnissa</string> <string name="voice_mile_per_hour">mailia tunnissa</string>
<string name="min_per_mile">min/mi</string> <string name="min_per_mile">min/mi</string>
<string name="per_mile">per maili</string> <string name="voice_per_mile">per maili</string>
<!-- Sensors --> <!-- Sensors -->
<string name="watts">W</string> <string name="watts">W</string>
MyTracks/res/values-fr/strings.xml
+10 -10
View File
@@ -280,23 +280,23 @@ limitations under the License.
<!-- Units --> <!-- Units -->
<!-- Time --> <!-- Time -->
<string name="hour">heure</string> <string name="voice_hour">heure</string>
<string name="hours">heures</string> <string name="voice_hours">heures</string>
<string name="second">seconde</string> <string name="voice_second">seconde</string>
<string name="seconds">secondes</string> <string name="voice_seconds">secondes</string>
<!-- Distance --> <!-- Distance -->
<string name="feet">pied</string> <string name="feet">pied</string>
<string name="kilometers_long">kilomètres</string> <string name="voice_kilometers">kilomètres</string>
<string name="miles_long">milles</string> <string name="voice_miles">milles</string>
<!-- Speed and Pace --> <!-- Speed and Pace -->
<string name="kilometer_per_hour">km/h</string> <string name="kilometer_per_hour">km/h</string>
<string name="kilometer_per_hour_long">kilomètres/heure</string> <string name="voice_kilometer_per_hour">kilomètres/heure</string>
<string name="per_kilometer">par kilomètre</string> <string name="voice_per_kilometer">par kilomètre</string>
<string name="mile_per_hour">mi/h</string> <string name="mile_per_hour">mi/h</string>
<string name="mile_per_hour_long">miles/heure</string> <string name="voice_mile_per_hour">miles/heure</string>
<string name="per_mile">per mile</string> <string name="voice_per_mile">per mile</string>
<string name="waiting">Waiting...</string> <string name="waiting">Waiting...</string>
MyTracks/res/values-it/strings.xml
+12 -12
View File
@@ -259,32 +259,32 @@ limitations under the License.
<!-- Units --> <!-- Units -->
<!-- Time --> <!-- Time -->
<string name="hour">ora</string> <string name="voice_hour">ora</string>
<string name="hours">ore</string> <string name="voice_hours">ore</string>
<string name="hr">h</string> <string name="hr">h</string>
<string name="min">min</string> <string name="min">min</string>
<string name="minute">minuto</string> <string name="voice_minute">minuto</string>
<string name="minutes">minuti</string> <string name="voice_minutes">minuti</string>
<string name="second">secondo</string> <string name="voice_second">secondo</string>
<string name="seconds">secondi</string> <string name="voice_seconds">secondi</string>
<!-- Distance --> <!-- Distance -->
<string name="meter">m</string> <string name="meter">m</string>
<string name="kilometer">km</string> <string name="kilometer">km</string>
<string name="kilometers_long">chilometri</string> <string name="voice_kilometers">chilometri</string>
<string name="feet">pd</string> <string name="feet">pd</string>
<string name="mile">mi</string> <string name="mile">mi</string>
<string name="miles_long">miglia</string> <string name="voice_miles">miglia</string>
<!-- Speed and Pace --> <!-- Speed and Pace -->
<string name="kilometer_per_hour">km/h</string> <string name="kilometer_per_hour">km/h</string>
<string name="kilometer_per_hour_long">chilometri orari</string> <string name="voice_kilometer_per_hour">chilometri orari</string>
<string name="min_per_kilometer">min/km</string> <string name="min_per_kilometer">min/km</string>
<string name="per_kilometer">per chilometro</string> <string name="voice_per_kilometer">per chilometro</string>
<string name="mile_per_hour">mi/h</string> <string name="mile_per_hour">mi/h</string>
<string name="mile_per_hour_long">miglia orarie</string> <string name="voice_mile_per_hour">miglia orarie</string>
<string name="min_per_mile">min/mi</string> <string name="min_per_mile">min/mi</string>
<string name="per_mile">per miglio</string> <string name="voice_per_mile">per miglio</string>
<!-- Stats Labels --> <!-- Stats Labels -->
<string name="moving_time_label">Durata in moto</string> <string name="moving_time_label">Durata in moto</string>
MyTracks/res/values-ja/strings.xml
+12 -12
View File
@@ -342,25 +342,25 @@ limitations under the License.
<!-- Units --> <!-- Units -->
<!-- Time --> <!-- Time -->
<string name="hour">時</string> <string name="voice_hour">時</string>
<string name="hours">時</string> <string name="voice_hours">時</string>
<string name="hr">時</string> <string name="hr">時</string>
<string name="min">分</string> <string name="min">分</string>
<string name="minute">分</string> <string name="voice_minute">分</string>
<string name="minutes">分</string> <string name="voice_minutes">分</string>
<string name="second">秒</string> <string name="voice_second">秒</string>
<string name="seconds">秒</string> <string name="voice_seconds">秒</string>
<string name="milliseconds">ミリ秒</string> <string name="milliseconds">ミリ秒</string>
<!-- Distance --> <!-- Distance -->
<string name="kilometers_long">キロメータ</string> <string name="voice_kilometers">キロメータ</string>
<string name="miles_long">マイル</string> <string name="voice_miles">マイル</string>
<!-- Speed and Pace --> <!-- Speed and Pace -->
<string name="kilometer_per_hour_long">キロメータ毎時</string> <string name="voice_kilometer_per_hour">キロメータ毎時</string>
<string name="per_kilometer">毎キロメータ</string> <string name="voice_per_kilometer">毎キロメータ</string>
<string name="mile_per_hour_long">マイル毎時</string> <string name="voice_mile_per_hour">マイル毎時</string>
<string name="per_mile">毎マイル</string> <string name="voice_per_mile">毎マイル</string>
<!-- Stats Labels --> <!-- Stats Labels -->
<string name="moving_time_label">移動時間</string> <string name="moving_time_label">移動時間</string>
MyTracks/res/values-pl/strings.xml
+12 -12
View File
@@ -287,32 +287,32 @@ limitations under the License.
<!-- Units --> <!-- Units -->
<!-- Time --> <!-- Time -->
<string name="hour">godzina</string> <string name="voice_hour">godzina</string>
<string name="hours">godziny</string> <string name="voice_hours">godziny</string>
<string name="hr">godz.</string> <string name="hr">godz.</string>
<string name="min">min</string> <string name="min">min</string>
<string name="minute">minuta</string> <string name="voice_minute">minuta</string>
<string name="minutes">minuty</string> <string name="voice_minutes">minuty</string>
<string name="second">sekunda</string> <string name="voice_second">sekunda</string>
<string name="seconds">sekundy</string> <string name="voice_seconds">sekundy</string>
<!-- Distance --> <!-- Distance -->
<string name="meter">m</string> <string name="meter">m</string>
<string name="kilometer">km</string> <string name="kilometer">km</string>
<string name="kilometers_long">kilometerów</string> <string name="voice_kilometers">kilometerów</string>
<string name="feet">st.</string> <string name="feet">st.</string>
<string name="mile">mi</string> <string name="mile">mi</string>
<string name="miles_long">mil</string> <string name="voice_miles">mil</string>
<!-- Speed and Pace --> <!-- Speed and Pace -->
<string name="kilometer_per_hour">km/h</string> <string name="kilometer_per_hour">km/h</string>
<string name="kilometer_per_hour_long">kilometry na godzinę</string> <string name="voice_kilometer_per_hour">kilometry na godzinę</string>
<string name="min_per_kilometer">min/km</string> <string name="min_per_kilometer">min/km</string>
<string name="per_kilometer">na kilometr</string> <string name="voice_per_kilometer">na kilometr</string>
<string name="mile_per_hour">mi/h</string> <string name="mile_per_hour">mi/h</string>
<string name="mile_per_hour_long">mile na godzinę</string> <string name="voice_mile_per_hour">mile na godzinę</string>
<string name="min_per_mile">min/mi</string> <string name="min_per_mile">min/mi</string>
<string name="per_mile">na milę</string> <string name="voice_per_mile">na milę</string>
<!-- Stats Labels --> <!-- Stats Labels -->
<string name="moving_time_label">Czas w ruchu</string> <string name="moving_time_label">Czas w ruchu</string>
MyTracks/res/values-pt-rBR/strings.xml
+12 -12
View File
@@ -246,24 +246,24 @@ limitations under the License.
<!-- Units --> <!-- Units -->
<!-- Time --> <!-- Time -->
<string name="hour">hora</string> <string name="voice_hour">hora</string>
<string name="hours">horas</string> <string name="voice_hours">horas</string>
<string name="hr">h</string> <string name="hr">h</string>
<string name="minute">minuto</string> <string name="voice_minute">minuto</string>
<string name="minutes">minutos</string> <string name="voice_minutes">minutos</string>
<string name="second">segundo</string> <string name="voice_second">segundo</string>
<string name="seconds">segundos</string> <string name="voice_seconds">segundos</string>
<!-- Distance --> <!-- Distance -->
<string name="feet">pés</string> <string name="feet">pés</string>
<string name="kilometers_long">kilômetros</string> <string name="voice_kilometers">kilômetros</string>
<string name="miles_long">milhas</string> <string name="voice_miles">milhas</string>
<!-- Speed and Pace --> <!-- Speed and Pace -->
<string name="kilometer_per_hour_long">kilômetros por hora</string> <string name="voice_kilometer_per_hour">kilômetros por hora</string>
<string name="per_kilometer">por kilômetro</string> <string name="voice_per_kilometer">por kilômetro</string>
<string name="mile_per_hour_long">milhas por hora</string> <string name="voice_mile_per_hour">milhas por hora</string>
<string name="per_mile">por milha</string> <string name="voice_per_mile">por milha</string>
<!-- Stats Labels --> <!-- Stats Labels -->
<string name="moving_time_label">Tempo em Movimento</string> <string name="moving_time_label">Tempo em Movimento</string>
MyTracks/res/values-ru/strings.xml
+12 -12
View File
@@ -350,33 +350,33 @@ limitations under the License.
<!-- Units --> <!-- Units -->
<!-- Time --> <!-- Time -->
<string name="hour">час</string> <string name="voice_hour">час</string>
<string name="hours">часов</string> <string name="voice_hours">часов</string>
<string name="hr">ч</string> <string name="hr">ч</string>
<string name="min">мин</string> <string name="min">мин</string>
<string name="minute">минута</string> <string name="voice_minute">минута</string>
<string name="minutes">минут</string> <string name="voice_minutes">минут</string>
<string name="second">секунда</string> <string name="voice_second">секунда</string>
<string name="seconds">секунд</string> <string name="voice_seconds">секунд</string>
<string name="milliseconds">мс</string> <string name="milliseconds">мс</string>
<!-- Distance --> <!-- Distance -->
<string name="meter">м</string> <string name="meter">м</string>
<string name="kilometer">км</string> <string name="kilometer">км</string>
<string name="kilometers_long">километров</string> <string name="voice_kilometers">километров</string>
<string name="feet">футов</string> <string name="feet">футов</string>
<string name="mile">миль</string> <string name="mile">миль</string>
<string name="miles_long">мили</string> <string name="voice_miles">мили</string>
<!-- Speed and Pace --> <!-- Speed and Pace -->
<string name="kilometer_per_hour">км/ч</string> <string name="kilometer_per_hour">км/ч</string>
<string name="kilometer_per_hour_long">километров в час</string> <string name="voice_kilometer_per_hour">километров в час</string>
<string name="min_per_kilometer">мин/км</string> <string name="min_per_kilometer">мин/км</string>
<string name="per_kilometer">за километр</string> <string name="voice_per_kilometer">за километр</string>
<string name="mile_per_hour">миль/ч</string> <string name="mile_per_hour">миль/ч</string>
<string name="mile_per_hour_long">миль в час</string> <string name="voice_mile_per_hour">миль в час</string>
<string name="min_per_mile">мин/миля</string> <string name="min_per_mile">мин/миля</string>
<string name="per_mile">за милю</string> <string name="voice_per_mile">за милю</string>
<!-- Sensors --> <!-- Sensors -->
<string name="watts">Вт</string> <string name="watts">Вт</string>
MyTracks/res/values-sv/strings.xml
+12 -12
View File
@@ -262,32 +262,32 @@ limitations under the License.
<!-- Units --> <!-- Units -->
<!-- Time --> <!-- Time -->
<string name="hour">timme</string> <string name="voice_hour">timme</string>
<string name="hours">timmar</string> <string name="voice_hours">timmar</string>
<string name="hr">tim</string> <string name="hr">tim</string>
<string name="min">min</string> <string name="min">min</string>
<string name="minute">minut</string> <string name="voice_minute">minut</string>
<string name="minutes">minuter</string> <string name="voice_minutes">minuter</string>
<string name="second">sekund</string> <string name="voice_second">sekund</string>
<string name="seconds">sekunder</string> <string name="voice_seconds">sekunder</string>
<!-- Distance --> <!-- Distance -->
<string name="meter">m</string> <string name="meter">m</string>
<string name="kilometer">km</string> <string name="kilometer">km</string>
<string name="kilometers_long">kilometer</string> <string name="voice_kilometers">kilometer</string>
<string name="feet">ft</string> <string name="feet">ft</string>
<string name="mile">mi</string> <string name="mile">mi</string>
<string name="miles_long">miles</string> <string name="voice_miles">miles</string>
<!-- Speed and Pace --> <!-- Speed and Pace -->
<string name="kilometer_per_hour">km/h</string> <string name="kilometer_per_hour">km/h</string>
<string name="kilometer_per_hour_long">kilometer i timmen</string> <string name="voice_kilometer_per_hour">kilometer i timmen</string>
<string name="min_per_kilometer">min/km</string> <string name="min_per_kilometer">min/km</string>
<string name="per_kilometer">per kilometer</string> <string name="voice_per_kilometer">per kilometer</string>
<string name="mile_per_hour">mi/h</string> <string name="mile_per_hour">mi/h</string>
<string name="mile_per_hour_long">miles i timmen</string> <string name="voice_mile_per_hour">miles i timmen</string>
<string name="min_per_mile">min/mi</string> <string name="min_per_mile">min/mi</string>
<string name="per_mile">per mile</string> <string name="voice_per_mile">per mile</string>
<!-- Stats Labels --> <!-- Stats Labels -->
<string name="moving_time_label">Rörlig tid</string> <string name="moving_time_label">Rörlig tid</string>
MyTracks/res/values-zh-rCN/strings.xml
+12 -12
View File
@@ -351,24 +351,24 @@ limitations under the License.
<!-- Units --> <!-- Units -->
<!-- Time --> <!-- Time -->
<string name="hour">小时</string> <string name="voice_hour">小时</string>
<string name="hours">小时</string> <string name="voice_hours">小时</string>
<string name="hr">时</string> <string name="hr">时</string>
<string name="min">分</string> <string name="min">分</string>
<string name="minute">分钟</string> <string name="voice_minute">分钟</string>
<string name="minutes">分钟</string> <string name="voice_minutes">分钟</string>
<string name="second">秒</string> <string name="voice_second">秒</string>
<string name="seconds">秒</string> <string name="voice_seconds">秒</string>
<!-- Distance --> <!-- Distance -->
<string name="kilometers_long">千米</string> <string name="voice_kilometers">千米</string>
<string name="miles_long">英里</string> <string name="voice_miles">英里</string>
<!-- Speed and Pace --> <!-- Speed and Pace -->
<string name="kilometer_per_hour_long">千米每小时</string> <string name="voice_kilometer_per_hour">千米每小时</string>
<string name="per_kilometer">每千米</string> <string name="voice_per_kilometer">每千米</string>
<string name="mile_per_hour_long">英里每小时</string> <string name="voice_mile_per_hour">英里每小时</string>
<string name="per_mile">每英里</string> <string name="voice_per_mile">每英里</string>
<!-- Stats Labels --> <!-- Stats Labels -->
<string name="moving_time_label">移动时间</string> <string name="moving_time_label">移动时间</string>
MyTracks/res/values/strings.xml
+31 -31
View File
@@ -1259,59 +1259,59 @@ limitations under the License.
Heart Rate Heart Rate
</string> </string>
<!-- Voice announcements --> <!-- Voice -->
<string name="hour" <string name="voice_hour"
translation_description="For voice announcement, to say hour like 'one hour'."> translation_description="For voice announcement, to say hour like 'one hour'.">
hour hour
</string> </string>
<string name="hours" <string name="voice_hours"
translation_description="For voice announcement, to say hours like 'two hours'."> translation_description="For voice announcement, to say hours like 'two hours'.">
hours hours
</string> </string>
<string name="minute" <string name="voice_kilometer_per_hour"
translation_description="For voice announcement, to say minute like 'one minute'.">
minute
</string>
<string name="minutes"
translation_description="For voice announcement, to say minutes like 'two minutes'.">
minutes
</string>
<string name="second"
translation_description="For voice announcement, to say second like 'one second'.">
second
</string>
<string name="seconds"
translation_description="For voice announcement, to say seconds like 'two seconds'.">
seconds
</string>
<string name="kilometers_long"
translation_description="For voice announcement, to say kilometers like 'two kilometers'.">
kilometers
</string>
<string name="miles_long"
translation_description="For voice announcement, to say miles like 'two miles'.">
miles
</string>
<string name="kilometer_per_hour_long"
translation_description="For voice announcement, to say 'kilometers per hour' for speed like translation_description="For voice announcement, to say 'kilometers per hour' for speed like
'two kilometers per hour'."> 'two kilometers per hour'.">
kilometers per hour kilometers per hour
</string> </string>
<string name="mile_per_hour_long" <string name="voice_kilometers"
translation_description="For voice announcement, to say kilometers like 'two kilometers'.">
kilometers
</string>
<string name="voice_mile_per_hour"
translation_description="For voice announcement, to say 'miles per hour' for speed like 'two translation_description="For voice announcement, to say 'miles per hour' for speed like 'two
miles per hour'."> miles per hour'.">
miles per hour miles per hour
</string> </string>
<string name="per_kilometer" <string name="voice_miles"
translation_description="For voice announcement, to say miles like 'two miles'.">
miles
</string>
<string name="voice_minute"
translation_description="For voice announcement, to say minute like 'one minute'.">
minute
</string>
<string name="voice_minutes"
translation_description="For voice announcement, to say minutes like 'two minutes'.">
minutes
</string>
<string name="voice_per_kilometer"
translation_description="For voice announcement, to say 'per kilometer' for pace like 'two translation_description="For voice announcement, to say 'per kilometer' for pace like 'two
minutes per kilometer'."> minutes per kilometer'.">
per kilometer per kilometer
</string> </string>
<string name="per_mile" <string name="voice_per_mile"
translation_description="For voice announcement, to say 'per mile' for pace like 'two minutes translation_description="For voice announcement, to say 'per mile' for pace like 'two minutes
per mile'."> per mile'.">
per mile per mile
</string> </string>
<string name="voice_second"
translation_description="For voice announcement, to say second like 'one second'.">
second
</string>
<string name="voice_seconds"
translation_description="For voice announcement, to say seconds like 'two seconds'.">
seconds
</string>
<!-- time --> <!-- time -->
<string name="hr" <string name="hr"
MyTracks/src/com/google/android/apps/mytracks/services/tasks/StatusAnnouncerTask.java
+6 -6
View File
@@ -182,17 +182,17 @@ public class StatusAnnouncerTask implements PeriodicTask {
int speedLabel; int speedLabel;
if (metricUnits) { if (metricUnits) {
if (reportSpeed) { if (reportSpeed) {
speedLabel = R.string.kilometer_per_hour_long; speedLabel = R.string.voice_kilometer_per_hour;
} else { } else {
speedLabel = R.string.per_kilometer; speedLabel = R.string.voice_per_kilometer;
} }
} else { } else {
s *= UnitConversions.KMH_TO_MPH; s *= UnitConversions.KMH_TO_MPH;
d *= UnitConversions.KM_TO_MI; d *= UnitConversions.KM_TO_MI;
if (reportSpeed) { if (reportSpeed) {
speedLabel = R.string.mile_per_hour_long; speedLabel = R.string.voice_mile_per_hour;
} else { } else {
speedLabel = R.string.per_mile; speedLabel = R.string.voice_per_mile;
} }
} }
@@ -214,8 +214,8 @@ public class StatusAnnouncerTask implements PeriodicTask {
context.getString(R.string.total_distance_label), context.getString(R.string.total_distance_label),
d, d,
context.getString(metricUnits context.getString(metricUnits
? R.string.kilometers_long ? R.string.voice_kilometers
: R.string.miles_long), : R.string.voice_miles),
stringUtils.formatTimeLong(stats.getMovingTime()), stringUtils.formatTimeLong(stats.getMovingTime()),
speed, speed,
context.getString(speedLabel)); context.getString(speedLabel));
MyTracks/src/com/google/android/apps/mytracks/util/StringUtils.java
+8 -3
View File
@@ -221,14 +221,19 @@ public class StringUtils implements DescriptionGenerator {
this.context = context; this.context = context;
} }
/**
* Formats a time for voice announcement.
*
* @param time the time
*/
public String formatTimeLong(long time) { public String formatTimeLong(long time) {
int[] parts = getTimeParts(time); int[] parts = getTimeParts(time);
String secLabel = String secLabel =
context.getString(parts[0] == 1 ? R.string.second : R.string.seconds); context.getString(parts[0] == 1 ? R.string.voice_second : R.string.voice_seconds);
String minLabel = String minLabel =
context.getString(parts[1] == 1 ? R.string.minute : R.string.minutes); context.getString(parts[1] == 1 ? R.string.voice_minute : R.string.voice_minutes);
String hourLabel = String hourLabel =
context.getString(parts[2] == 1 ? R.string.hour : R.string.hours); context.getString(parts[2] == 1 ? R.string.voice_hour : R.string.voice_hours);
StringBuilder sb = new StringBuilder(); StringBuilder sb = new StringBuilder();
if (parts[2] != 0) { if (parts[2] != 0) {