| OLD | NEW |
| 1 <?xml version="1.0" encoding="UTF-8"?> | 1 <?xml version="1.0" encoding="UTF-8"?> |
| 2 <!-- This file contains definitions of strings that are distribution specific. | 2 <!-- This file contains definitions of strings that are distribution specific. |
| 3 These strings will not be translated and only english versions will | 3 These strings will not be translated and only english versions will |
| 4 be available for now. --> | 4 be available for now. --> |
| 5 | 5 |
| 6 <grit base_dir="." latest_public_release="0" current_release="1" | 6 <grit base_dir="." latest_public_release="0" current_release="1" |
| 7 source_lang_id="en" enc_check="möl"> | 7 source_lang_id="en" enc_check="möl"> |
| 8 <outputs> | 8 <outputs> |
| 9 <output filename="grit/chromium_strings.h" type="rc_header"> | 9 <output filename="grit/chromium_strings.h" type="rc_header"> |
| 10 <emit emit_type='prepend'></emit> | 10 <emit emit_type='prepend'></emit> |
| (...skipping 832 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 843 <message name="IDS_ONE_CLICK_SIGNIN_DIALOG_MESSAGE_NEW" desc="The messag
e of the one click sign in dialog."> | 843 <message name="IDS_ONE_CLICK_SIGNIN_DIALOG_MESSAGE_NEW" desc="The messag
e of the one click sign in dialog."> |
| 844 You're signing in to Chromium using your <ph name="USER_EMAIL_ADDRESS"
>$1<ex>foo@gmail.com</ex></ph> account. You will be able to access your bookmark
s, history, and other settings on all of your signed in devices. | 844 You're signing in to Chromium using your <ph name="USER_EMAIL_ADDRESS"
>$1<ex>foo@gmail.com</ex></ph> account. You will be able to access your bookmark
s, history, and other settings on all of your signed in devices. |
| 845 </message> | 845 </message> |
| 846 <!-- Delete DIALOG_TITLE/MESSAGE when we switch to the _NEW versions --> | 846 <!-- Delete DIALOG_TITLE/MESSAGE when we switch to the _NEW versions --> |
| 847 <message name="IDS_ONE_CLICK_SIGNIN_DIALOG_TITLE" desc="The title of the
modal dialog window that opens when the user chooses to use one click sign in."
> | 847 <message name="IDS_ONE_CLICK_SIGNIN_DIALOG_TITLE" desc="The title of the
modal dialog window that opens when the user chooses to use one click sign in."
> |
| 848 You're signed in to Chromium! | 848 You're signed in to Chromium! |
| 849 </message> | 849 </message> |
| 850 <message name="IDS_ONE_CLICK_SIGNIN_BUBBLE_MESSAGE" desc="The body of th
e sync promo NTP bubble."> | 850 <message name="IDS_ONE_CLICK_SIGNIN_BUBBLE_MESSAGE" desc="The body of th
e sync promo NTP bubble."> |
| 851 You're now signed in to Chromium! Your bookmarks, history, and other s
ettings will be synced to your Google Account. | 851 You're now signed in to Chromium! Your bookmarks, history, and other s
ettings will be synced to your Google Account. |
| 852 </message> | 852 </message> |
| 853 <message name="IDS_ONE_CLICK_SIGNIN_BUBBLE_SYNC_DISABLED_MESSAGE" desc="
The body of the signin bubble, when sync has been disabled."> |
| 854 You're now signed in to Chromium! Sync is disabled by your administrat
or. |
| 855 </message> |
| 853 <message name="IDS_SYNC_WRONG_EMAIL" desc="Message shown when sync setup
failed due to the user entering the wrong email address for sign in."> | 856 <message name="IDS_SYNC_WRONG_EMAIL" desc="Message shown when sync setup
failed due to the user entering the wrong email address for sign in."> |
| 854 You were signed in to Chromium as <ph name="USER_EMAIL_ADDRESS">$1<ex>
foo@gmail.com</ex></ph>. Please use the same account to sign in again. | 857 You were signed in to Chromium as <ph name="USER_EMAIL_ADDRESS">$1<ex>
foo@gmail.com</ex></ph>. Please use the same account to sign in again. |
| 855 </message> | 858 </message> |
| 856 <message name="IDS_ONE_CLICK_SIGNIN_CONFIRM_EMAIL_DIALOG_MESSAGE" desc="
Error message to display when setting up sync for a second time and the user nam
e is different from the previous user name."> | 859 <message name="IDS_ONE_CLICK_SIGNIN_CONFIRM_EMAIL_DIALOG_MESSAGE" desc="
Error message to display when setting up sync for a second time and the user nam
e is different from the previous user name."> |
| 857 Someone previously signed in to Chromium on this computer as <ph name=
"ACCOUNT_EMAIL_LAST">$1<ex>user@example.com</ex></ph>. If that isn't your accoun
t, create a new Chromium user to keep your information separate. | 860 Someone previously signed in to Chromium on this computer as <ph name=
"ACCOUNT_EMAIL_LAST">$1<ex>user@example.com</ex></ph>. If that isn't your accoun
t, create a new Chromium user to keep your information separate. |
| 858 | 861 |
| 859 Signing in anyway will merge Chromium information like bookmarks, history, and o
ther settings to <ph name="ACCOUNT_EMAIL_NEW">$2<ex>user@example.com</ex></ph>. | 862 Signing in anyway will merge Chromium information like bookmarks, history, and o
ther settings to <ph name="ACCOUNT_EMAIL_NEW">$2<ex>user@example.com</ex></ph>. |
| 860 </message> | 863 </message> |
| 861 </if> | 864 </if> |
| 862 | 865 |
| (...skipping 96 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 959 | 962 |
| 960 <!-- Chrome OS OOBE Terms of Service screen--> | 963 <!-- Chrome OS OOBE Terms of Service screen--> |
| 961 <if expr="pp_ifdef('chromeos')"> | 964 <if expr="pp_ifdef('chromeos')"> |
| 962 <message name="IDS_TERMS_OF_SERVICE_SCREEN_SUBHEADING" desc="Subheading
at the top of the Terms of Service screen."> | 965 <message name="IDS_TERMS_OF_SERVICE_SCREEN_SUBHEADING" desc="Subheading
at the top of the Terms of Service screen."> |
| 963 <ph name="DOMAIN">$1<ex>example.com</ex></ph> requires that you read a
nd accept the following Terms of Service before using this device. These terms d
o not expand, modify or limit the Chromium OS Terms. | 966 <ph name="DOMAIN">$1<ex>example.com</ex></ph> requires that you read a
nd accept the following Terms of Service before using this device. These terms d
o not expand, modify or limit the Chromium OS Terms. |
| 964 </message> | 967 </message> |
| 965 </if> | 968 </if> |
| 966 </messages> | 969 </messages> |
| 967 </release> | 970 </release> |
| 968 </grit> | 971 </grit> |
| OLD | NEW |