Skip to content

GitLab

T
tangled
Commit 20062064 authored by Peter Boström's avatar Peter Boström Committed by Commit Bot
Browse files
Options

Add missing titlecase for device-chooser titles. 

Adds use_titlecase entries for USB device selection, Bluetooth pairing
and device permissions.

Bug: chromium:807886
Change-Id: I355d944e151c14967998d283d5ad578ba512ae9d
Reviewed-on: https://chromium-review.googlesource.com/898246Reviewed-by: default avatarIstiaque Ahmed <lazyboy@chromium.org>
Commit-Queue: Peter Boström <pbos@chromium.org>
Cr-Commit-Position: refs/heads/master@{#534561}
parent 6abf8819
Hide whitespace changes
Inline Side-by-side
Showing with 44 additions and 18 deletions
chrome/app/generated_resources.grd
View file @ 20062064
...@@ -10891,18 +10891,34 @@ For more information, visit our <ph name="BEGIN_LINK">&lt;a target="_blank" href ...@@ -10891,18 +10891,34 @@ For more information, visit our <ph name="BEGIN_LINK">&lt;a target="_blank" href
<if expr="not is_android"> <if expr="not is_android">
<!-- Device Chooser Prompt --> <!-- Device Chooser Prompt -->
<message name="IDS_BLUETOOTH_DEVICE_CHOOSER_PROMPT_ORIGIN" desc="The label that is used to introduce Bluetooth chooser details to the user in a popup when it is from a website."> <if expr="use_titlecase">
<ph name="Origin">$1<ex>www.google.com</ex></ph> wants to pair <message name="IDS_BLUETOOTH_DEVICE_CHOOSER_PROMPT_ORIGIN" desc="In Title Case: The label that is used to introduce Bluetooth chooser details to the user in a popup when it is from a website.">
</message> <ph name="Origin">$1<ex>www.google.com</ex></ph> Wants to Pair
<message name="IDS_BLUETOOTH_DEVICE_CHOOSER_PROMPT_EXTENSION_NAME" desc="The label that is used to introduce Bluetooth chooser details to the user in a popup when it is from a Chrome extension."> </message>
"<ph name="CHROME_EXTENSION_NAME">$1<ex>Chrome extension name</ex></ph>" wants to pair <message name="IDS_BLUETOOTH_DEVICE_CHOOSER_PROMPT_EXTENSION_NAME" desc="In Title Case: The label that is used to introduce Bluetooth chooser details to the user in a popup when it is from a Chrome extension.">
</message> "<ph name="CHROME_EXTENSION_NAME">$1<ex>Chrome Extension Name</ex></ph>" Wants to Pair
<message name="IDS_USB_DEVICE_CHOOSER_PROMPT_ORIGIN" desc="The label that is used to introduce USB chooser details to the user in a popup when it is from a website."> </message>
<ph name="Origin">$1<ex>www.google.com</ex></ph> wants to connect <message name="IDS_USB_DEVICE_CHOOSER_PROMPT_ORIGIN" desc="In Title Case: The label that is used to introduce USB chooser details to the user in a popup when it is from a website.">
</message> <ph name="Origin">$1<ex>www.google.com</ex></ph> Wants to Connect
<message name="IDS_USB_DEVICE_CHOOSER_PROMPT_EXTENSION_NAME" desc="The label that is used to introduce USB chooser details to the user in a popup when it is from a Chrome extension."> </message>
"<ph name="CHROME_EXTENSION_NAME">$1<ex>Chrome extension name</ex></ph>" wants to connect <message name="IDS_USB_DEVICE_CHOOSER_PROMPT_EXTENSION_NAME" desc="In Title Case: The label that is used to introduce USB chooser details to the user in a popup when it is from a Chrome extension.">
</message> "<ph name="CHROME_EXTENSION_NAME">$1<ex>Chrome Extension Name</ex></ph>" Wants to Connect
</message>
</if>
<if expr="not use_titlecase">
<message name="IDS_BLUETOOTH_DEVICE_CHOOSER_PROMPT_ORIGIN" desc="The label that is used to introduce Bluetooth chooser details to the user in a popup when it is from a website.">
<ph name="Origin">$1<ex>www.google.com</ex></ph> wants to pair
</message>
<message name="IDS_BLUETOOTH_DEVICE_CHOOSER_PROMPT_EXTENSION_NAME" desc="The label that is used to introduce Bluetooth chooser details to the user in a popup when it is from a Chrome extension.">
"<ph name="CHROME_EXTENSION_NAME">$1<ex>Chrome Extension Name</ex></ph>" wants to pair
</message>
<message name="IDS_USB_DEVICE_CHOOSER_PROMPT_ORIGIN" desc="The label that is used to introduce USB chooser details to the user in a popup when it is from a website.">
<ph name="Origin">$1<ex>www.google.com</ex></ph> wants to connect
</message>
<message name="IDS_USB_DEVICE_CHOOSER_PROMPT_EXTENSION_NAME" desc="The label that is used to introduce USB chooser details to the user in a popup when it is from a Chrome extension.">
"<ph name="CHROME_EXTENSION_NAME">$1<ex>Chrome Extension Name</ex></ph>" wants to connect
</message>
</if>
<message name="IDS_DEVICE_CHOOSER_NO_DEVICES_FOUND_PROMPT" desc="The label shown to the user to inform them that no USB devices were found matching the requirements that the application provided."> <message name="IDS_DEVICE_CHOOSER_NO_DEVICES_FOUND_PROMPT" desc="The label shown to the user to inform them that no USB devices were found matching the requirements that the application provided.">
No compatible devices found. No compatible devices found.
</message> </message>
......
extensions/strings/extensions_strings.grd
View file @ 20062064
...@@ -286,12 +286,22 @@ ...@@ -286,12 +286,22 @@
<message name="IDS_DEVICE_NAME_WITH_UNKNOWN_PRODUCT_VENDOR_SERIAL" desc="String describing a device by its vendor name and serial number when only the numeric product ID is available."> <message name="IDS_DEVICE_NAME_WITH_UNKNOWN_PRODUCT_VENDOR_SERIAL" desc="String describing a device by its vendor name and serial number when only the numeric product ID is available.">
Unknown product <ph name="PRODUCT_ID">$1<ex>1234</ex></ph> from <ph name="VENDOR_NAME">$2<ex>Griffin Technology</ex></ph> (serial number <ph name="SERIAL_NUMBER">$3<ex>00001</ex></ph>) Unknown product <ph name="PRODUCT_ID">$1<ex>1234</ex></ph> from <ph name="VENDOR_NAME">$2<ex>Griffin Technology</ex></ph> (serial number <ph name="SERIAL_NUMBER">$3<ex>00001</ex></ph>)
</message> </message>
<message name="IDS_DEVICE_PERMISSIONS_PROMPT_SINGLE_SELECTION" desc="Instructions asking the user to select one device for use with an app."> <if expr="use_titlecase">
"<ph name="APP_NAME">$1<ex>Chrome Dev Editor</ex></ph>" is requesting access to one of your devices: <message name="IDS_DEVICE_PERMISSIONS_PROMPT_SINGLE_SELECTION" desc="In Title Case: Instructions asking the user to select one device for use with an app.">
</message> "<ph name="APP_NAME">$1<ex>Chrome Dev Editor</ex></ph>" Is Requesting Access to One of Your Devices
<message name="IDS_DEVICE_PERMISSIONS_PROMPT_MULTIPLE_SELECTION" desc="Instructions asking the user to select one or more devices for use with an app."> </message>
"<ph name="APP_NAME">$1<ex>Chrome Dev Editor</ex></ph>" is requesting access to one or more of your devices: <message name="IDS_DEVICE_PERMISSIONS_PROMPT_MULTIPLE_SELECTION" desc="In Title Case: Instructions asking the user to select one or more devices for use with an app.">
</message> "<ph name="APP_NAME">$1<ex>Chrome Dev Editor</ex></ph>" Is Requesting Access to One or More of Your Devices
</message>
</if>
<if expr="not use_titlecase">
<message name="IDS_DEVICE_PERMISSIONS_PROMPT_SINGLE_SELECTION" desc="Instructions asking the user to select one device for use with an app.">
"<ph name="APP_NAME">$1<ex>Chrome Dev Editor</ex></ph>" is requesting access to one of your devices
</message>
<message name="IDS_DEVICE_PERMISSIONS_PROMPT_MULTIPLE_SELECTION" desc="Instructions asking the user to select one or more devices for use with an app.">
"<ph name="APP_NAME">$1<ex>Chrome Dev Editor</ex></ph>" is requesting access to one or more of your devices
</message>
</if>
<message name="IDS_CAMERA_FACING_USER" desc="Camera that faces the user. Aka. front camera."> <message name="IDS_CAMERA_FACING_USER" desc="Camera that faces the user. Aka. front camera.">
User-facing User-facing
</message> </message>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment