Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(625)

Side by Side Diff: chrome/app/google_chrome_strings.grd

Issue 145273019: Clean up sign-in grammar (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebase Created 6 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « chrome/app/generated_resources.grd ('k') | chrome/browser/signin/signin_global_error.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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 specific to 2 <!-- This file contains definitions of strings that are specific to
3 Google Chrome. These strings will be translated for each locale that Google 3 Google Chrome. These strings will be translated for each locale that Google
4 Chrome supports. --> 4 Chrome supports. -->
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/google_chrome_strings.h" type="rc_header"> 9 <output filename="grit/google_chrome_strings.h" type="rc_header">
10 <emit emit_type='prepend'></emit> 10 <emit emit_type='prepend'></emit>
(...skipping 735 matching lines...) Expand 10 before | Expand all | Expand 10 after
746 Chrome 746 Chrome
747 </message> 747 </message>
748 <message name="IDS_HELPER_NAME" desc="The helper application's name. Sh ould contain the Chrome application name (IDS_PRODUCT_NAME). Example: Google Chr ome Helper."> 748 <message name="IDS_HELPER_NAME" desc="The helper application's name. Sh ould contain the Chrome application name (IDS_PRODUCT_NAME). Example: Google Chr ome Helper.">
749 Google Chrome Helper 749 Google Chrome Helper
750 </message> 750 </message>
751 <message name="IDS_SHORT_HELPER_NAME" desc="The helper application's sho rt name, used for the Mac's application menu, activity monitor, etc. Example: Ch rome Helper, not Google Chrome Helper."> 751 <message name="IDS_SHORT_HELPER_NAME" desc="The helper application's sho rt name, used for the Mac's application menu, activity monitor, etc. Example: Ch rome Helper, not Google Chrome Helper.">
752 Chrome Helper 752 Chrome Helper
753 </message> 753 </message>
754 </if> 754 </if>
755 755
756 <!-- Chrome sign in page --> 756 <!-- Chrome sign-in page -->
757 <message name="IDS_CHROME_SIGNIN_TITLE" desc="Title on the about:chrome-si gnin page"> 757 <message name="IDS_CHROME_SIGNIN_TITLE" desc="Title on the about:chrome-si gnin page">
758 Chrome 758 Chrome
759 </message> 759 </message>
760 760
761 <!-- Sync Promo New Tab Page bubble strings --> 761 <!-- Sync Promo New Tab Page bubble strings -->
762 <message name="IDS_SYNC_PROMO_NTP_BUBBLE_MESSAGE_NEW" desc="The body of th e sync promo NTP bubble."> 762 <message name="IDS_SYNC_PROMO_NTP_BUBBLE_MESSAGE_NEW" desc="The body of th e sync promo NTP bubble.">
763 Now that you're signed in, you can get your tabs, bookmarks and other Ch rome stuff across your laptop, phone and tablet. You will also receive more rele vant suggestions and features on Google services. 763 Now that you're signed in, you can get your tabs, bookmarks and other Ch rome stuff across your laptop, phone and tablet. You will also receive more rele vant suggestions and features on Google services.
764 </message> 764 </message>
765 765
766 <!-- One click sign in infobar --> 766 <!-- One click sign-in infobar -->
767 <if expr="not pp_ifdef('chromeos')"> 767 <if expr="not pp_ifdef('chromeos')">
768 <!-- New one-click signin dialog contents for SAML support --> 768 <!-- New one-click sign-in dialog contents for SAML support -->
769 <message name="IDS_ONE_CLICK_SIGNIN_DIALOG_TITLE_NEW" desc="The title of the modal dialog window that opens when the user chooses to use one click sign in."> 769 <message name="IDS_ONE_CLICK_SIGNIN_DIALOG_TITLE_NEW" desc="The title of the modal dialog window that opens when the user chooses to use one click sign- in.">
770 You're signed in to Chrome! 770 You're signed in to Chrome!
771 </message> 771 </message>
772 <message name="IDS_ONE_CLICK_SIGNIN_DIALOG_MESSAGE_NEW" desc="The messag e of the one click sign in dialog."> 772 <message name="IDS_ONE_CLICK_SIGNIN_DIALOG_MESSAGE_NEW" desc="The messag e of the one click sign-in dialog.">
773 You're signed in as <ph name="USER_EMAIL_ADDRESS">$1<ex>foo@gmail.com< /ex></ph>. Now you can access your bookmarks, history, and other settings on all your signed in devices. 773 You're signed in as <ph name="USER_EMAIL_ADDRESS">$1<ex>foo@gmail.com< /ex></ph>. Now you can access your bookmarks, history, and other settings on all your signed in devices.
774 </message> 774 </message>
775 <message name="IDS_ONE_CLICK_SIGNIN_BUBBLE_MESSAGE_FULL" desc="The entir e message of the one click sign in bubble."> 775 <message name="IDS_ONE_CLICK_SIGNIN_BUBBLE_MESSAGE_FULL" desc="The entir e message of the one click sign-in bubble.">
776 You're now signed in to Chrome! Your bookmarks, history, and other set tings will be synced to your Google Account. 776 You're now signed in to Chrome! Your bookmarks, history, and other set tings will be synced to your Google Account.
777 </message> 777 </message>
778 <message name="IDS_ONE_CLICK_SIGNIN_BUBBLE_MESSAGE_NEW" desc="The body o f the sync promo NTP bubble."> 778 <message name="IDS_ONE_CLICK_SIGNIN_BUBBLE_MESSAGE_NEW" desc="The body o f the sync promo NTP bubble.">
779 Now that you're signed in, you can get your tabs, bookmarks and other Chrome stuff across your laptop, phone and tablet. You will also receive more re levant suggestions and features on Google services. 779 Now that you're signed in, you can get your tabs, bookmarks and other Chrome stuff across your laptop, phone and tablet. You will also receive more re levant suggestions and features on Google services.
780 </message> 780 </message>
781 <message name="IDS_ONE_CLICK_SIGNIN_BUBBLE_SYNC_DISABLED_MESSAGE" desc=" The body of the signin bubble, when sync has been disabled."> 781 <message name="IDS_ONE_CLICK_SIGNIN_BUBBLE_SYNC_DISABLED_MESSAGE" desc=" The body of the sign-in bubble, when sync has been disabled.">
782 You're now signed in to Chrome! Sync is disabled by your administrator . 782 You're now signed in to Chrome! Sync is disabled by your administrator .
783 </message> 783 </message>
784 <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."> 784 <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.">
785 You were signed in to Chrome as <ph name="USER_EMAIL_ADDRESS">$1<ex>fo o@gmail.com</ex></ph>. Please use the same account to sign in again. 785 You were signed in to Chrome as <ph name="USER_EMAIL_ADDRESS">$1<ex>fo o@gmail.com</ex></ph>. Please use the same account to sign in again.
786 </message> 786 </message>
787 <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."> 787 <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.">
788 Someone previously signed in to Chrome on this computer as <ph name="A CCOUNT_EMAIL_LAST">$1<ex>user@example.com</ex></ph>. If that isn't your account, create a new Chrome user to keep your information separate. 788 Someone previously signed in to Chrome on this computer as <ph name="A CCOUNT_EMAIL_LAST">$1<ex>user@example.com</ex></ph>. If that isn't your account, create a new Chrome user to keep your information separate.
789 789
790 Signing in anyway will merge Chrome information like bookmarks, history, and oth er settings to <ph name="ACCOUNT_EMAIL_NEW">$2<ex>user@example.com</ex></ph>. 790 Signing in anyway will merge Chrome information like bookmarks, history, and oth er settings to <ph name="ACCOUNT_EMAIL_NEW">$2<ex>user@example.com</ex></ph>.
791 </message> 791 </message>
792 </if> 792 </if>
793 793
794 <!-- Enterprise sign-in profile linking --> 794 <!-- Enterprise sign-in profile linking -->
795 <message name="IDS_ENTERPRISE_SIGNIN_PROFILE_LINK_DIALOG_TITLE" desc="The title of the dialog to confirm linking the browser profile with the signed-in en terprise account"> 795 <message name="IDS_ENTERPRISE_SIGNIN_PROFILE_LINK_DIALOG_TITLE" desc="The title of the dialog to confirm linking the browser profile with the signed-in en terprise account">
796 Important information regarding your Chrome data 796 Important information regarding your Chrome data
797 </message> 797 </message>
798 <message name="IDS_ENTERPRISE_SIGNIN_PROFILE_LINK_MESSAGE" desc="The warni ng message displayed to an enterprise user about to link their profile to their Google account. This message is followed by a 'Learn more' link."> 798 <message name="IDS_ENTERPRISE_SIGNIN_PROFILE_LINK_MESSAGE" desc="The warni ng message displayed to an enterprise user about to link their profile to their Google account. This message is followed by a 'Learn more' link.">
799 You are signing in with a managed account and giving its administrator c ontrol over your Google Chrome profile. Your Chrome data, such as your apps, boo kmarks, history, passwords, and other settings will become permanently tied to < ph name="USER_NAME">$1<ex>pat@example.com</ex></ph>. You will be able to delete this data via the Google Accounts Dashboard, but you will not be able to associa te this data with another account. 799 You are signing in with a managed account and giving its administrator c ontrol over your Google Chrome profile. Your Chrome data, such as your apps, boo kmarks, history, passwords, and other settings will become permanently tied to < ph name="USER_NAME">$1<ex>pat@example.com</ex></ph>. You will be able to delete this data via the Google Accounts Dashboard, but you will not be able to associa te this data with another account.
800 </message> 800 </message>
801 <message name="IDS_ENTERPRISE_SIGNIN_CREATE_NEW_PROFILE_PROMPT" desc="The text of the prompt to create a new profile after signing into an enterprise acco unt"> 801 <message name="IDS_ENTERPRISE_SIGNIN_CREATE_NEW_PROFILE_PROMPT" desc="The text of the prompt to create a new profile after signing in to an enterprise acc ount">
802 If you prefer to keep your existing Chrome data separate, you can create a new Chrome user for <ph name="USER_NAME">$1<ex>pat@example.com</ex></ph>. 802 If you prefer to keep your existing Chrome data separate, you can create a new Chrome user for <ph name="USER_NAME">$1<ex>pat@example.com</ex></ph>.
803 </message> 803 </message>
804 <message name="IDS_ENTERPRISE_SIGNIN_CREATE_NEW_PROFILE_NO" desc="Text of the button to link the current profile with the signed-in enterprise account"> 804 <message name="IDS_ENTERPRISE_SIGNIN_CREATE_NEW_PROFILE_NO" desc="Text of the button to link the current profile with the signed-in enterprise account">
805 Link my Chrome data to this account 805 Link my Chrome data to this account
806 </message> 806 </message>
807 807
808 <!-- Enterprise sign-in dialog (new-style) --> 808 <!-- Enterprise sign-in dialog (new-style) -->
809 <!-- TODO(dconnelly): remove "new-style" once the old dialog is gone. --> 809 <!-- TODO(dconnelly): remove "new-style" once the old dialog is gone. -->
810 <message name="IDS_ENTERPRISE_SIGNIN_TITLE_NEW_STYLE" desc="The title of t he dialog to confirm linking the browser profile with the signed-in enterprise a ccount"> 810 <message name="IDS_ENTERPRISE_SIGNIN_TITLE_NEW_STYLE" desc="The title of t he dialog to confirm linking the browser profile with the signed-in enterprise a ccount">
811 Link your Chrome data to this account? 811 Link your Chrome data to this account?
812 </message> 812 </message>
813 <message name="IDS_ENTERPRISE_SIGNIN_EXPLANATION_WITHOUT_PROFILE_CREATION_ NEW_STYLE" desc="The warning message displayed to an enterprise user about to li nk their profile to their Google account. This message is followed by a 'Learn m ore' link."> 813 <message name="IDS_ENTERPRISE_SIGNIN_EXPLANATION_WITHOUT_PROFILE_CREATION_ NEW_STYLE" desc="The warning message displayed to an enterprise user about to li nk their profile to their Google account. This message is followed by a 'Learn m ore' link.">
814 You are signing in with a managed account and giving its administrator c ontrol over your Google Chrome profile. Your Chrome data, such as your apps, boo kmarks, history, passwords, and other settings will become permanently tied to < ph name="USER_NAME">$1<ex>pat@example.com</ex></ph>. You will be able to delete this data via the Google Accounts Dashboard, but you will not be able to associa te this data with another account. <ph name="LEARN_MORE">$2<ex>Learn more</ex></ ph> 814 You are signing in with a managed account and giving its administrator c ontrol over your Google Chrome profile. Your Chrome data, such as your apps, boo kmarks, history, passwords, and other settings will become permanently tied to < ph name="USER_NAME">$1<ex>pat@example.com</ex></ph>. You will be able to delete this data via the Google Accounts Dashboard, but you will not be able to associa te this data with another account. <ph name="LEARN_MORE">$2<ex>Learn more</ex></ ph>
815 </message> 815 </message>
816 <message name="IDS_ENTERPRISE_SIGNIN_EXPLANATION_WITH_PROFILE_CREATION_NEW _STYLE" desc="The warning message displayed to an enterprise user about to link their profile to their Google account. Additionally notifies the user that they can create a new profile instead. This message is followed by a 'Learn more' lin k."> 816 <message name="IDS_ENTERPRISE_SIGNIN_EXPLANATION_WITH_PROFILE_CREATION_NEW _STYLE" desc="The warning message displayed to an enterprise user about to link their profile to their Google account. Additionally notifies the user that they can create a new profile instead. This message is followed by a 'Learn more' lin k.">
817 You are signing in with a managed account and giving its administrator c ontrol over your Google Chrome profile. Your Chrome data, such as your apps, boo kmarks, history, passwords, and other settings will become permanently tied to < ph name="USER_NAME">$1<ex>pat@example.com</ex></ph>. You will be able to delete this data via the Google Accounts Dashboard, but you will not be able to associa te this data with another account. You can optionally create a new profile to ke ep your existing Chrome data separate. <ph name="LEARN_MORE">$2<ex>Learn more</e x></ph> 817 You are signing in with a managed account and giving its administrator c ontrol over your Google Chrome profile. Your Chrome data, such as your apps, boo kmarks, history, passwords, and other settings will become permanently tied to < ph name="USER_NAME">$1<ex>pat@example.com</ex></ph>. You will be able to delete this data via the Google Accounts Dashboard, but you will not be able to associa te this data with another account. You can optionally create a new profile to ke ep your existing Chrome data separate. <ph name="LEARN_MORE">$2<ex>Learn more</e x></ph>
818 </message> 818 </message>
819 819
820 <!-- Sync sign-in global error message-->
821 <message name="IDS_SYNC_PASSPHRASE_ERROR_BUBBLE_VIEW_MESSAGE" desc="Messag e in the sync error bubble view when the user needs to update their sync passphr ase.">
822 Google Chrome could not sync your data. Please update your Sync passphra se.
823 </message>
824 <message name="IDS_SYNC_SIGN_IN_ERROR_BUBBLE_VIEW_MESSAGE" desc="Message i n the sync error bubble view when the user's sign-in credentials are out of date .">
825 Google Chrome could not sync your data because your account sign-in deta ils are out of date.
826 </message>
827 <message name="IDS_SYNC_UNAVAILABLE_ERROR_BUBBLE_VIEW_MESSAGE" desc="Messa ge in the sync error bubble view when sync is not available for their domain.">
828 Google Chrome could not sync your data because Sync is not available for your domain.
829 </message>
830 <message name="IDS_SYNC_OTHER_SIGN_IN_ERROR_BUBBLE_VIEW_MESSAGE" desc="Mes sage in the sync error bubble view when there's an error signing in.">
831 Google Chrome could not sync your data due to an error signing in.
832 </message>
833
820 <message name="IDS_OPTIONS_PASSWORDS_MAC_WARNING" desc="The warning for OS X that passwords are shared across profiles in the keychain."> 834 <message name="IDS_OPTIONS_PASSWORDS_MAC_WARNING" desc="The warning for OS X that passwords are shared across profiles in the keychain.">
821 On Mac, passwords are saved to your Keychain and may be accessed or sync ed by other Chrome users sharing this OS X account. 835 On Mac, passwords are saved to your Keychain and may be accessed or sync ed by other Chrome users sharing this OS X account.
822 </message> 836 </message>
823 837
824 <message name="IDS_AUTOFILL_CC_INFOBAR_TEXT" desc="Text to show in the Aut ofill credit card request infobar."> 838 <message name="IDS_AUTOFILL_CC_INFOBAR_TEXT" desc="Text to show in the Aut ofill credit card request infobar.">
825 Do you want Chrome to save this credit card information for completing w eb forms? 839 Do you want Chrome to save this credit card information for completing w eb forms?
826 </message> 840 </message>
827 <message name="IDS_AUTOFILL_DIALOG_SAVE_LOCALLY_CHECKBOX" desc="Checkbox t hat controls whether info the user types into the autofill dialog is saved by ch rome."> 841 <message name="IDS_AUTOFILL_DIALOG_SAVE_LOCALLY_CHECKBOX" desc="Checkbox t hat controls whether info the user types into the autofill dialog is saved by ch rome.">
828 Save details in Chrome 842 Save details in Chrome
829 </message> 843 </message>
(...skipping 71 matching lines...) Expand 10 before | Expand all | Expand 10 after
901 <message name="IDS_APP_LIST_SHORTCUT_NAME" desc="Name for the Chrome App L ist to appear in the taskbar and in any shortcuts to it."> 915 <message name="IDS_APP_LIST_SHORTCUT_NAME" desc="Name for the Chrome App L ist to appear in the taskbar and in any shortcuts to it.">
902 Chrome App Launcher 916 Chrome App Launcher
903 </message> 917 </message>
904 <message name="IDS_APP_LIST_SHORTCUT_NAME_CANARY" desc="Name for the Chrom e App List to appear in the taskbar and in any shortcuts to it for the Canary ch annel."> 918 <message name="IDS_APP_LIST_SHORTCUT_NAME_CANARY" desc="Name for the Chrom e App List to appear in the taskbar and in any shortcuts to it for the Canary ch annel.">
905 Chrome App Launcher Canary 919 Chrome App Launcher Canary
906 </message> 920 </message>
907 <message name="IDS_APP_LIST_SIGNIN_HEADING" desc="Heading for when the lau ncher needs to sign in."> 921 <message name="IDS_APP_LIST_SIGNIN_HEADING" desc="Heading for when the lau ncher needs to sign in.">
908 Sign in to Chrome 922 Sign in to Chrome
909 </message> 923 </message>
910 <message name="IDS_APP_LIST_SIGNIN_TEXT" desc="Text for when the launcher needs to sign in."> 924 <message name="IDS_APP_LIST_SIGNIN_TEXT" desc="Text for when the launcher needs to sign in.">
911 You need to be signed into Chrome to use apps. This allows Chrome to syn c your apps, bookmarks, history, passwords and other settings across devices. 925 You need to be signed in to Chrome to use apps. This allows Chrome to sy nc your apps, bookmarks, history, passwords and other settings across devices.
912 </message> 926 </message>
913 927
914 <!-- App shortcuts --> 928 <!-- App shortcuts -->
915 <message name="IDS_APP_SHORTCUTS_SUBDIR_NAME" desc="Name for the Chrome Ap ps Start Menu folder name."> 929 <message name="IDS_APP_SHORTCUTS_SUBDIR_NAME" desc="Name for the Chrome Ap ps Start Menu folder name.">
916 Chrome Apps 930 Chrome Apps
917 </message> 931 </message>
918 <message name="IDS_APP_SHORTCUTS_SUBDIR_NAME_CANARY" desc="Name for the Ch rome Apps Start Menu folder name for the Canary channel."> 932 <message name="IDS_APP_SHORTCUTS_SUBDIR_NAME_CANARY" desc="Name for the Ch rome Apps Start Menu folder name for the Canary channel.">
919 Chrome Canary Apps 933 Chrome Canary Apps
920 </message> 934 </message>
921 935
(...skipping 39 matching lines...) Expand 10 before | Expand all | Expand 10 after
961 </message> 975 </message>
962 976
963 <!-- ProcessSingleton --> 977 <!-- ProcessSingleton -->
964 <message name="IDS_PROFILE_IN_USE_LINUX" desc="Message shown when the brow ser cannot start because the profile is in use on a different host."> 978 <message name="IDS_PROFILE_IN_USE_LINUX" desc="Message shown when the brow ser cannot start because the profile is in use on a different host.">
965 The profile appears to be in use by another Google Chrome process (<ph n ame="PROCESS_ID">$1<ex>12345</ex></ph>) on another computer (<ph name="HOST_NAME ">$2<ex>example.com</ex></ph>). Chrome has locked the profile so that it doesn' t get corrupted. If you are sure no other processes are using this profile, you can unlock the profile and relaunch Chrome. 979 The profile appears to be in use by another Google Chrome process (<ph n ame="PROCESS_ID">$1<ex>12345</ex></ph>) on another computer (<ph name="HOST_NAME ">$2<ex>example.com</ex></ph>). Chrome has locked the profile so that it doesn' t get corrupted. If you are sure no other processes are using this profile, you can unlock the profile and relaunch Chrome.
966 </message> 980 </message>
967 981
968 </messages> 982 </messages>
969 </release> 983 </release>
970 </grit> 984 </grit>
OLDNEW
« no previous file with comments | « chrome/app/generated_resources.grd ('k') | chrome/browser/signin/signin_global_error.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698