Merge "Change the dialog text in USB device tyep chooser." into nyc-dev am: 9856531

am: 03f89ff

* commit '03f89ff4fabd7b93d3ad7ed4df04ed88363a12cc':
  Change the dialog text in USB device tyep chooser.

Change-Id: I1a84b9946436824abd71519cd192e6262da453da
This commit is contained in:
Daichi Hirono
2016-03-31 00:40:42 +00:00
committed by android-build-merger

View File

@@ -6727,7 +6727,7 @@
<!-- Title of one of the choices in a dialog (with title defined in usb_use) that lets the user <!-- Title of one of the choices in a dialog (with title defined in usb_use) that lets the user
select what the USB connection for this device should be used for. This choice select what the USB connection for this device should be used for. This choice
is for charging only. --> is for charging only. -->
<string name="usb_use_charging_only">Charging</string> <string name="usb_use_charging_only">Charge this device</string>
<!-- Decription of one of the choices in a dialog (with title defined in usb_use) that lets the <!-- Decription of one of the choices in a dialog (with title defined in usb_use) that lets the
user select what the USB connection for this device should be used for. This choice user select what the USB connection for this device should be used for. This choice
is for charging only. --> is for charging only. -->
@@ -6735,15 +6735,15 @@
<!-- Title of one of the choices in a dialog (with title defined in usb_use) that lets the user <!-- Title of one of the choices in a dialog (with title defined in usb_use) that lets the user
select what the USB connection for this device should be used for. This choice select what the USB connection for this device should be used for. This choice
is for powering the other device only. --> is for powering the other device only. -->
<string name="usb_use_power_only">Power supply</string> <string name="usb_use_power_only">Supply power</string>
<!-- Decription of one of the choices in a dialog (with title defined in usb_use) that lets the <!-- Decription of one of the choices in a dialog (with title defined in usb_use) that lets the
user select what the USB connection for this device should be used for. This choice user select what the USB connection for this device should be used for. This choice
is for powering the other device only. --> is for powering the other device. -->
<string name="usb_use_power_only_desc">Charge the other connected device</string> <string name="usb_use_power_only_desc">Supply power to the other connected device</string>
<!-- Title of one of the choices in a dialog (with title defined in usb_use) that lets the user <!-- Title of one of the choices in a dialog (with title defined in usb_use) that lets the user
select what the USB connection for this device should be used for. This choice select what the USB connection for this device should be used for. This choice
is for transferring files via MTP. --> is for transferring files via MTP. -->
<string name="usb_use_file_transfers">File transfers</string> <string name="usb_use_file_transfers">Transfer files</string>
<!-- Description of one of the choices in a dialog (with title defined in usb_use) that lets the user <!-- Description of one of the choices in a dialog (with title defined in usb_use) that lets the user
select what the USB connection for this device should be used for. This choice select what the USB connection for this device should be used for. This choice
is for transferring files via MTP. --> is for transferring files via MTP. -->
@@ -6751,7 +6751,7 @@
<!-- Title of one of the choices in a dialog (with title defined in usb_use) that lets the user <!-- Title of one of the choices in a dialog (with title defined in usb_use) that lets the user
select what the USB connection for this device should be used for. This choice select what the USB connection for this device should be used for. This choice
is for transferring photos via PTP. --> is for transferring photos via PTP. -->
<string name="usb_use_photo_transfers">Photo transfer (PTP)</string> <string name="usb_use_photo_transfers">Transfer photos (PTP)</string>
<!-- Description of one of the choices in a dialog (with title defined in usb_use) that lets the user <!-- Description of one of the choices in a dialog (with title defined in usb_use) that lets the user
select what the USB connection for this device should be used for. This choice select what the USB connection for this device should be used for. This choice
is for transferring photos via PTP. --> is for transferring photos via PTP. -->
@@ -6759,15 +6759,15 @@
<!-- Title of one of the choices in a dialog (with title defined in usb_use) that lets the user <!-- Title of one of the choices in a dialog (with title defined in usb_use) that lets the user
select what the USB connection for this device should be used for. This choice select what the USB connection for this device should be used for. This choice
is for entering MIDI mode. --> is for entering MIDI mode. -->
<string name="usb_use_MIDI">MIDI</string> <string name="usb_use_MIDI">Use device as MIDI</string>
<!-- Description of one of the choices in a dialog (with title defined in usb_use) that lets the user <!-- Description of one of the choices in a dialog (with title defined in usb_use) that lets the user
select what the USB connection for this device should be used for. This choice select what the USB connection for this device should be used for. This choice
is for entering MIDI mode. --> is for entering MIDI mode. -->
<string name="usb_use_MIDI_desc">Use device for MIDI input</string> <string name="usb_use_MIDI_desc">Use this device as MIDI</string>
<!-- The title used in a dialog which lets the user select what the USB connection <!-- The title used in a dialog which lets the user select what the USB connection
for this device should be used for. Choices are usb_use_charging_only, for this device should be used for. Choices are usb_use_charging_only,
usb_use_file_transfer, use_use_photo_transfer, and usb_use_MIDI --> usb_use_file_transfer, use_use_photo_transfer, and usb_use_MIDI -->
<string name="usb_use">Use USB for</string> <string name="usb_use">Use USB to</string>
<!-- Settings item title for background check prefs [CHAR LIMIT=35] --> <!-- Settings item title for background check prefs [CHAR LIMIT=35] -->
<string name="background_check_pref">Background check</string> <string name="background_check_pref">Background check</string>