merge heads

This commit is contained in:
Jimmy Shih
2011-12-16 15:04:32 -08:00
parent f973ab8ac2
commit 4ce0809948
96 changed files with 2689 additions and 13446 deletions
+100 -55
View File
@@ -472,42 +472,68 @@ limitations under the License.
Screenshot: eula.png">
Decline
</string>
<string name="eula_message"
translation_description="The message for the 'Terms of service' dialog.
<string name="eula_message_body"
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
cut and paste the translations from the web site.">
December 1, 2010\n
\n
Mobile Terms of Service\n
\n
By using Google\'s mobile products and services ("Services"), you:\n
\n
1. Agree to be bound by these terms and a) the YouTube Terms of Use (m.google.com/tos_youtube)
for YouTube-related Services, b) the Google Maps Terms and Conditions (m.google.com/tos_maps)
for mapping, local and location-based Services, c) the Google Buzz Terms and Conditions for
Google Buzz-related Services (m.google.com/tos_buzz), d) the Google Books Terms of Service
(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
Services only as set forth in these agreements. Do not manipulate while driving.\n
\n
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
\n
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
(m.google.com/privacy). Location data may be from mixed sources and may not be accurate. Use at
your own risk.\n
\n
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
\n
%1$s: host name, 'm.google.com'">
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
party content may be found at %1$s/legalnotices.
</string>
<string name="eula_message_header"
translation_description="The header in the Google mobile terms of service. See
http://m.google.com/toscountry.">
Mobile Terms of Service
</string>
<string name="eula_message_item1"
translation_description="The first item in the Google mobile terms of service. See
http://m.google.com/toscountry.
%1$s: host name, 'm.google.com'
%2$s: host name, 'm.google.com'
%3$s: host name, 'm.google.com'
%4$s: host name, 'm.google.com'
%5$s: host name, 'm.google.com'">
Agree to be bound by these terms and a) the YouTube Terms of Use (%1$s/tos_youtube) for
YouTube-related Services, b) the Google Maps Terms and Conditions (%2$s/tos_maps) for mapping,
local and location-based Services, c) the Google Buzz Terms and Conditions for Google
Buzz-related Services (%3$s/tos_buzz), d) the Google Books Terms of Service (%4$s/tos_books) for
Books-related Services, and e) the Google Terms of Service (%5$s/utos) 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.">
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.
</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: host name, 'm.google.com'">
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 (%1$s/privacy).
Location data may be from mixed sources and may not be accurate. Use at your own risk.
</string>
<string name="eula_message_item4"
translation_description="The fourth item in the Google mobile terms of service. See
http://m.google.com/toscountry.">
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.
</string>
<string name="eula_title"
translation_description="The title for the 'Terms of service' dialog, asking the user to accept
@@ -1214,6 +1240,14 @@ limitations under the License.
Screenshot: sensor_state_none.png">
Battery level
</string>
<string name="sensor_state_battery_value"
translation_description="In the 'Sensor state' page, the value for the 'Battery level'. E.g,
'Battery level: 50 %'.
%1$d: a number. E.g., '50'.
%%: escape sequence for the '%' character.">
%1$d %%
</string>
<string name="sensor_state_cadence"
translation_description="In the 'Sensor state' page, the label for the cadence on the bike
sensor. Cadence is the number of revolutions of the crank per minute. E.g.,
@@ -1222,6 +1256,13 @@ limitations under the License.
Screenshot: sensor_state_none.png">
Cadence
</string>
<string name="sensor_state_cadence_value"
translation_description="In the 'Sensor state' page, the value for the 'Cadence'. Cadence is the
number of revolutions of the crank per minute. E.g., 'Cadence: 80 rpm'.
%1$d: a number. E.g., '80'.">
%1$d rpm
</string>
<string name="sensor_state_connected"
translation_description="In the 'Sensor state' page, the 'Sensor state' value when the sensor
has connected.
@@ -1250,6 +1291,13 @@ limitations under the License.
Screenshot: sensor_state_none.png">
Heart rate
</string>
<string name="sensor_state_heart_rate_value"
translation_description="In the 'Sensor state' page, the value for the 'Heart rate'. E.g.,
'Hear rate: 100 bpm'.
%1$d: a number. E.g., '100'.">
%1$d bpm
</string>
<string name="sensor_state_last_sensor_time"
translation_description="In the 'Sensor state' page, the label for the last time the sensor has
sent a data. E.g., 'Last sensor time: 10:05 am'.
@@ -1264,6 +1312,13 @@ limitations under the License.
Screenshot: sensor_state_none.png">
Power
</string>
<string name="sensor_state_power_value"
translation_description="In the 'Sensor state' page, the value for the 'Power'. Power is the
power output of the rider. E.g., 'Power: 50 W'.
%1$d: a number. E.g., '50'.">
%1$d W
</string>
<string name="sensor_state_sending"
translation_description="In the 'Sensor state' page, the 'Sensor state' value when the sensor is
sending data.
@@ -1732,7 +1787,7 @@ limitations under the License.
</string>
<string name="settings_sensor_ant_options"
translation_description="In the 'Sensor' settings, the section header to configure the ANT+
options.
options. Note that ANT+ is a radio standard.
Character limit: ~40 (1 line)
Screenshot: settings_sensor.png">
@@ -1795,7 +1850,7 @@ limitations under the License.
</string>
<string name="settings_sensor_type_ant"
translation_description="In the 'Sensor' settings, for the 'Sensor type' dropdown, the option to
connect to an ANT+ heart rate sensor.
connect to an ANT+ heart rate sensor. Note that ANT+ is a radio standard.
Character limit: ~21 (1 line)
Screenshot: settings_sensor_type.png">
@@ -1811,7 +1866,8 @@ limitations under the License.
</string>
<string name="settings_sensor_type_polar"
translation_description="In the 'Sensor' settings, for the 'Sensor type' dropdown, the option to
connect to a Polar bluetooth sensor.
connect to a Polar bluetooth sensor. Do not translate Polar, the company name, but can
translate Bluetooth, the radio standard.
Character limit: ~21 (1 line)
Screenshot: settings_sensor_type.png">
@@ -1819,7 +1875,8 @@ limitations under the License.
</string>
<string name="settings_sensor_type_srm"
translation_description="In the 'Sensor' settings, for the 'Sensor type' dropdown, the option to
connect to a SRM ANT+ bridge.
connect to a SRM ANT+ bridge. Do not trasnlate SRM, the company name, but can translate
ANT+, the radio standard, and bridge (network bridge).
Character limit: ~21 (1 line)
Screenshot: settings_sensor_type.png">
@@ -1834,7 +1891,8 @@ limitations under the License.
</string>
<string name="settings_sensor_type_zephyr"
translation_description="In the 'Sensor' settings, for the 'Sensor type' dropdown, the option to
connect to a Zephyr bluetooth sensor.
connect to a Zephyr bluetooth sensor. Do not translate Zephyr, the company name, but can
translate Bluetooth, the radio standard.
Character limit: ~21 (1 line)
Screenshot: settings_sensor_type.png">
@@ -1842,7 +1900,7 @@ limitations under the License.
</string>
<string name="settings_sensor_unpair_ant"
translation_description="In the 'Sensor' settings, under the 'ANT+ options' configurations, the
option to unpair an ANT+ heart rate sensor.
option to unpair an ANT+ heart rate sensor. Note that ANT+ is a radio standard.
Character limit: ~26 (1 line)
Screenshot: settings_sensor.png">
@@ -1850,7 +1908,8 @@ limitations under the License.
</string>
<string name="settings_sensor_unpair_srm"
translation_description="In the 'Sensor' settings, under the 'ANT+ options' configurations, the
option to unpair a SRM ANT+ bridge.
option to unpair a SRM ANT+ bridge. Do not trasnlate SRM, the company name, but can translate
ANT+, the radio standard, and bridge (network bridge).
Character limit: ~26 (1 line)
Screenshot: settings_sensor.png">
@@ -2291,11 +2350,6 @@ limitations under the License.
</string>
<!-- Unit -->
<string name="unit_beat_per_minute"
translation_description="Abbreviation for beats per minute, unit for heart rate. E.g.,
'Heart rate: 80 bpm'.">
bpm
</string>
<string name="unit_feet"
translation_description="Abbreviation for feet. E.g., '2 ft'.">
ft
@@ -2336,15 +2390,6 @@ limitations under the License.
translation_description="Abbreviation for minutes per mile. E.g, '5 min/mi'.">
min/mi
</string>
<string name="unit_revolution_per_minute"
translation_description="Abbreviation for revolutions per minute, unit for cadence. E.g.,
'Cadence: 80 rpm'.">
rpm
</string>
<string name="unit_watt"
translation_description="Abbreviation for watts, unit for power. E.g., 'Power: 80 W'.">
W
</string>
<!-- Value -->
<string name="value_adapt_accuracy"