diff options
| author | maxbogue <maxbogue@chromium.org> | 2015-04-17 11:21:14 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2015-04-17 18:22:29 +0000 |
| commit | 803ed45377abd56203f9627a27ff52cf5d414240 (patch) | |
| tree | 58a2e7b85b8eec15d59c7d929a2afe329d985ea0 | |
| parent | 7bcca3d12be321fb3afd56abd77c704e80054b25 (diff) | |
| download | chromium_src-803ed45377abd56203f9627a27ff52cf5d414240.zip chromium_src-803ed45377abd56203f9627a27ff52cf5d414240.tar.gz chromium_src-803ed45377abd56203f9627a27ff52cf5d414240.tar.bz2 | |
[Sync] Fix a resource string conflict.
See bug for more information.
BUG=478170
Review URL: https://codereview.chromium.org/1090283002
Cr-Commit-Position: refs/heads/master@{#325681}
| -rw-r--r-- | chrome/android/java/strings/android_chrome_strings.grd | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/chrome/android/java/strings/android_chrome_strings.grd b/chrome/android/java/strings/android_chrome_strings.grd index f7ee83b..69491e8 100644 --- a/chrome/android/java/strings/android_chrome_strings.grd +++ b/chrome/android/java/strings/android_chrome_strings.grd @@ -946,7 +946,7 @@ To obtain new licenses, connect to the internet and play your downloaded content <message name="IDS_SYNC_PASSPHRASE_CANNOT_BE_BLANK" desc="Inform user that they cannot use a blank password [CHAR-LIMIT=40]"> This field cannot be blank </message> - <message name="IDS_SYNC_PASSPHRASE_RESET_INSTRUCTIONS" desc="Inform the user how they can reset their passphrase if they have forgotten it."> + <message name="IDS_SYNC_PASSPHRASE_RESET_INSTRUCTIONS" desc="Inform the user how they can reset their passphrase if they have forgotten it." meaning="Android"> If you've forgotten your passphrase, stop and reset Sync via <ph name="BEGIN_LINK"><link></ph>Google Dashboard<ph name="END_LINK"></link></ph>. </message> <message name="IDS_SYNC_PASSPHRASES_DO_NOT_MATCH" desc="Inform user that their sync password does not match."> |