summaryrefslogtreecommitdiffstats
path: root/chrome/app
diff options
context:
space:
mode:
authorrlp@chromium.org <rlp@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-01-23 03:06:21 +0000
committerrlp@chromium.org <rlp@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-01-23 03:06:21 +0000
commit877abaf399bee52b359d02cf7edbdbba2ae967a1 (patch)
tree0dd1e2f114f68a24cecb4831c7ddab43d4ae4cfa /chrome/app
parent3979df9a92bc1ec8a5325f37c11f43e5e7d635b2 (diff)
downloadchromium_src-877abaf399bee52b359d02cf7edbdbba2ae967a1.zip
chromium_src-877abaf399bee52b359d02cf7edbdbba2ae967a1.tar.gz
chromium_src-877abaf399bee52b359d02cf7edbdbba2ae967a1.tar.bz2
[Hotword] Putting preferences under search for hotword service. Putting behind a flag.
In order to test/see the new settings run chrome with "--force-fieldtrials=VoiceTrigger/abc/ BUG=325439,289023 Review URL: https://codereview.chromium.org/134103005 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@246500 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/app')
-rw-r--r--chrome/app/generated_resources.grd15
1 files changed, 15 insertions, 0 deletions
diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources.grd
index 64d4f37..6ab8055 100644
--- a/chrome/app/generated_resources.grd
+++ b/chrome/app/generated_resources.grd
@@ -6923,6 +6923,21 @@ Keep your key file in a safe place. You will need it to create new versions of y
Set which search engine is used when searching from the
<ph name="BEGIN_LINK">&lt;a target="_blank" href="$1"&gt;</ph>omnibox<ph name="END_LINK">&lt;/a&gt;<ex>&lt;/a&gt;</ex></ph>.
</message>
+ <message name="IDS_HOTWORD_SEARCH_PREF_CHKBOX" desc="A checkbox under Search on the Settings page to allow audio capture devices to initiate searches.">
+ Enable "Ok Google" to start a voice search. <ph name="BEGIN_LINK">&lt;a target="_blank" href="$1"&gt;</ph>Learn more<ph name="END_LINK">&lt;/a&gt;<ex>&lt;/a&gt;</ex></ph>
+ </message>
+ <message name="IDS_HOTWORD_SEARCH_PREF_DESCRIPTION" desc="Description of the hotword search preference">
+ Important: If you enable this feature, Chrome will listen for you to say "Ok Google" and then send the sound of the next thing you say, plus a few seconds before, to Google.
+ </message>
+ <message name="IDS_HOTWORD_SEARCH_TIMEOUT_PREF_CHKBOX" desc="A checkbox under the hotword search preference to define the preference for whether to stop listening after 5 minutes.">
+ Stop listening for "Ok Google" after 5 minutes
+ </message>
+ <message name="IDS_HOTWORD_SEARCH_TIMEOUT_PREF_DESCRIPTION" desc="Description of the hotword listening timeout preference.">
+ This will help reduce battery consumption on a laptop
+ </message>
+ <message name="IDS_HOTWORD_SEARCH_INCOGNITO_PREF_CHKBOX" desc="A checkbox under the hotword search preference to allow hotword searching in incognito mode.">
+ Allow in incognito
+ </message>
<!-- Conflicts page -->
<message name="IDS_CONFLICTS_CHECK_PAGE_TABLE_TITLE_SUFFIX_ONE" desc="What gets appended after the page title if no conflicts were found.">