diff options
| author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2017-03-08 10:28:10 +0100 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2017-03-20 13:40:30 +0000 |
| commit | e733310db58160074f574c429d48f8308c0afe17 (patch) | |
| tree | f8aef4b7e62a69928dbcf880620eece20f98c6df /chromium/components/sync_ui_strings.grdp | |
| parent | 2f583e4aec1ae3a86fa047829c96b310dc12ecdf (diff) | |
| download | qtwebengine-chromium-e733310db58160074f574c429d48f8308c0afe17.tar.gz | |
BASELINE: Update Chromium to 56.0.2924.122
Change-Id: I4e04de8f47e47e501c46ed934c76a431c6337ced
Reviewed-by: Michael Brüning <michael.bruning@qt.io>
Diffstat (limited to 'chromium/components/sync_ui_strings.grdp')
| -rw-r--r-- | chromium/components/sync_ui_strings.grdp | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/chromium/components/sync_ui_strings.grdp b/chromium/components/sync_ui_strings.grdp index b5cbb0b02fd..72c0e6827ed 100644 --- a/chromium/components/sync_ui_strings.grdp +++ b/chromium/components/sync_ui_strings.grdp @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> <grit-part> - <if expr="not android"> + <if expr="not is_android"> <message name="IDS_SYNC_BASIC_ENCRYPTION_DATA" desc="Text of the radio that when selected enables basic encryption."> Encrypt synced passwords with your Google credentials </message> @@ -37,9 +37,6 @@ <message name="IDS_SYNC_FULL_ENCRYPTION_DATA" desc="Text of the radio that when selected enables full encryption."> Encrypt all synced data with your own sync passphrase </message> - <message name="IDS_SYNC_LOGIN_INFO_OUT_OF_DATE" desc="The login information for the user is out of date - for example, the user changed their password and therefore signing in again is required."> - Account sign-in details are out of date. - </message> <message name="IDS_SYNC_LOGIN_SETTING_UP" desc="A progress message"> Setting up... </message> @@ -50,7 +47,7 @@ You must enter the same passphrase twice. </message> <message name="IDS_SYNC_SERVICE_UNAVAILABLE" desc="Error message to display when the user domain entered by the user has sync disabled."> - Sync service is not available for your domain. + Sync is not available for your domain </message> </if> <message name="IDS_SYNC_ENTER_PASSPHRASE_BODY_WITH_DATE" desc="Instructions for the dialog where the user enters the passphrase."> |