summaryrefslogtreecommitdiffstats
path: root/chrome/app
diff options
context:
space:
mode:
authorjohnnyg@chromium.org <johnnyg@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-01-11 01:41:34 +0000
committerjohnnyg@chromium.org <johnnyg@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-01-11 01:41:34 +0000
commit69c03be52ad42b06ff1d29db55245c2b3ca6bbe8 (patch)
treee5495caa9d8928049a94ecdf7c381dc2858ab494 /chrome/app
parent1c54823d55bfe39a4caa679f5f867b0c96368e05 (diff)
downloadchromium_src-69c03be52ad42b06ff1d29db55245c2b3ca6bbe8.zip
chromium_src-69c03be52ad42b06ff1d29db55245c2b3ca6bbe8.tar.gz
chromium_src-69c03be52ad42b06ff1d29db55245c2b3ca6bbe8.tar.bz2
Further tweaks to passphrase UI: change the text and spacing so that it fits better on windows. Add the reset UI to the "enter passphrase" screen so there is a solution if you can't remember the passphrase at that point. Also removing some code rendered unnecessary by my last change.
BUG=61027 TEST=none Review URL: http://codereview.chromium.org/6142010 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@70982 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/app')
-rw-r--r--chrome/app/generated_resources.grd6
1 files changed, 3 insertions, 3 deletions
diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources.grd
index b14a851..7a561d6 100644
--- a/chrome/app/generated_resources.grd
+++ b/chrome/app/generated_resources.grd
@@ -8492,7 +8492,7 @@ Keep your key file in a safe place. You will need it to create new versions of y
Set up encrypted sync
</message>
<message name="IDS_SYNC_FIRST_PASSPHRASE_MESSAGE" desc="Message for setting up first passphrase.">
- To sync passwords, <ph name="PRODUCT_NAME">$1<ex>Chrome</ex></ph> requires you to encrypt your data using either your Google password or your own passphrase.
+ To sync passwords, <ph name="PRODUCT_NAME">$1<ex>Chrome</ex></ph> requires you to encrypt certain data using either your Google password or your own passphrase.
</message>
<message name="IDS_SYNC_PASSPHRASE_OPT_GOOGLE" desc="Radio button label for using Google password.">
Use my Google password.
@@ -8507,7 +8507,7 @@ Keep your key file in a safe place. You will need it to create new versions of y
You have chosen to encrypt data using your Google password; you can always change your mind later by changing your sync settings.
</message>
<message name="IDS_SYNC_PASSPHRASE_MSG_EXPLICIT" desc="Message when explicit passphrase is selected.">
- Only someone with your passphrase can read your data. Google does not store your passphrase. If you lose or forget your passphrase, you will have to reset sync.
+ Only someone with your passphrase can read your data. Google does not store your passphrase. If you forget your passphrase, you will need to reset sync.
</message>
<message name="IDS_SYNC_PASSPHRASE_MSG_CANCEL" desc="Message when not syncing passwords is selected.">
You have chosen not to sync passwords; you can always change your mind later by changing your sync settings.
@@ -8659,7 +8659,7 @@ Keep your key file in a safe place. You will need it to create new versions of y
Use a sync passphrase to encrypt my data
</message>
<message name="IDS_SYNC_PASSPHRASE_WARNING" desc="Warning message about using a passphrase for sync.">
- You are currently using a passphrase. If you've lost or forgotten your passphrase, you can reset sync to clear your synced data from Google's servers using the Google Privacy Dashboard.
+ You are currently using a passphrase. If you have forgotten your passphrase, you can reset sync to clear your synced data from Google's servers using the Google Privacy Dashboard.
</message>
<message name="IDS_SYNC_CLEAR_DATA_LINK" desc="Link to the Google Dashboard.">
Go to Google Privacy Dashboard