Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1297)

Side by Side Diff: chrome/app/generated_resources.grd

Issue 8137003: Add display of available bluetooth devices, and mechanism for retrieving the list. (Closed) Base URL: http://git.chromium.org/git/chromium.git@trunk
Patch Set: Remove addition of animated spinner in favour of reusing an existing throbber class. Created 9 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « no previous file | chrome/browser/resources/options/chromeos/bluetooth_list_element.js » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 <?xml version="1.0" encoding="UTF-8"?> 1 <?xml version="1.0" encoding="UTF-8"?>
2 2
3 <!-- 3 <!--
4 This file contains definitions of resources that will be translated for each 4 This file contains definitions of resources that will be translated for each
5 locale. The variables is_win, is_macosx, is_linux, and is_posix are available 5 locale. The variables is_win, is_macosx, is_linux, and is_posix are available
6 for making strings OS specific. Other platform defines such as use_titlecase 6 for making strings OS specific. Other platform defines such as use_titlecase
7 are declared in build/common.gypi. 7 are declared in build/common.gypi.
8 --> 8 -->
9 9
10 <grit base_dir="." latest_public_release="0" current_release="1" 10 <grit base_dir="." latest_public_release="0" current_release="1"
(...skipping 11299 matching lines...) Expand 10 before | Expand all | Expand 10 after
11310 </message> 11310 </message>
11311 <message name="IDS_OPTIONS_SETTINGS_SENSITIVITY_MORE_DESCRIPTION" desc="In the settings tab, the text under the right (more sensitive) side of the slider for the touchpad touch sensitivity."> 11311 <message name="IDS_OPTIONS_SETTINGS_SENSITIVITY_MORE_DESCRIPTION" desc="In the settings tab, the text under the right (more sensitive) side of the slider for the touchpad touch sensitivity.">
11312 Fast 11312 Fast
11313 </message> 11313 </message>
11314 <message name="IDS_OPTIONS_SETTINGS_BLUETOOTH_ENABLE"> 11314 <message name="IDS_OPTIONS_SETTINGS_BLUETOOTH_ENABLE">
11315 Enable bluetooth 11315 Enable bluetooth
11316 </message> 11316 </message>
11317 <message name="IDS_OPTIONS_SETTINGS_FIND_BLUETOOTH_DEVICES"> 11317 <message name="IDS_OPTIONS_SETTINGS_FIND_BLUETOOTH_DEVICES">
11318 Find devices 11318 Find devices
11319 </message> 11319 </message>
11320 <message name="IDS_OPTIONS_SETTINGS_BLUETOOTH_SCANNING">
11321 Scanning
11322 </message>
11323 <message name="IDS_OPTIONS_SETTINGS_BLUETOOTH_CONNECTED">
11324 Connected
11325 </message>
11326 <message name="IDS_OPTIONS_SETTINGS_BLUETOOTH_NOT_PAIRED">
11327 Not Paired
11328 </message>
11320 <message name="IDS_OPTIONS_SETTINGS_ACCESSIBILITY_DESCRIPTION" desc="In th e settings tab, the text next to the checkbox for accessbility."> 11329 <message name="IDS_OPTIONS_SETTINGS_ACCESSIBILITY_DESCRIPTION" desc="In th e settings tab, the text next to the checkbox for accessbility.">
11321 Enable accessibility features 11330 Enable accessibility features
11322 </message> 11331 </message>
11323 <message name="IDS_OPTIONS_SETTINGS_KEYBOARD_LAYOUT_TEXT" desc="In the set tings tab, the text of the keyboard layouti label."> 11332 <message name="IDS_OPTIONS_SETTINGS_KEYBOARD_LAYOUT_TEXT" desc="In the set tings tab, the text of the keyboard layouti label.">
11324 Keyboard Layout: 11333 Keyboard Layout:
11325 </message> 11334 </message>
11326 <message name="IDS_OPTIONS_SETTINGS_CONNECT" desc="In the settings tab, th e text on the button to connect to a network."> 11335 <message name="IDS_OPTIONS_SETTINGS_CONNECT" desc="In the settings tab, th e text on the button to connect to a network.">
11327 Connect 11336 Connect
11328 </message> 11337 </message>
11329 <message name="IDS_OPTIONS_SETTINGS_DISCONNECT" desc="In the settings tab, the text on the button to disconnect from a network."> 11338 <message name="IDS_OPTIONS_SETTINGS_DISCONNECT" desc="In the settings tab, the text on the button to disconnect from a network.">
(...skipping 2624 matching lines...) Expand 10 before | Expand all | Expand 10 after
13954 </messages> 13963 </messages>
13955 <structures fallback_to_english="true"> 13964 <structures fallback_to_english="true">
13956 <!-- Make sure these stay in sync with the structures in generated_resourc es.grd. --> 13965 <!-- Make sure these stay in sync with the structures in generated_resourc es.grd. -->
13957 <structure name="IDD_CHROME_FRAME_FIND_DIALOG" file="cf_resources.rc" type ="dialog" > 13966 <structure name="IDD_CHROME_FRAME_FIND_DIALOG" file="cf_resources.rc" type ="dialog" >
13958 </structure> 13967 </structure>
13959 <structure name="IDD_CHROME_FRAME_READY_PROMPT" file="cf_resources.rc" typ e="dialog" > 13968 <structure name="IDD_CHROME_FRAME_READY_PROMPT" file="cf_resources.rc" typ e="dialog" >
13960 </structure> 13969 </structure>
13961 </structures> 13970 </structures>
13962 </release> 13971 </release>
13963 </grit> 13972 </grit>
OLDNEW
« no previous file with comments | « no previous file | chrome/browser/resources/options/chromeos/bluetooth_list_element.js » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698