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

Side by Side Diff: chrome/app/chromium_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/chromeos_strings.grdp ('k') | chrome/app/generated_resources.grd » ('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 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 811 matching lines...) Expand 10 before | Expand all | Expand 10 after
822 Chromium 822 Chromium
823 </message> 823 </message>
824 <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."> 824 <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.">
825 Chromium Helper 825 Chromium Helper
826 </message> 826 </message>
827 <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."> 827 <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.">
828 Chromium Helper 828 Chromium Helper
829 </message> 829 </message>
830 </if> 830 </if>
831 831
832 <!-- Chrome sign in page --> 832 <!-- Chrome sign-in page -->
833 <message name="IDS_CHROME_SIGNIN_TITLE" desc="Title on the about:chrome-si gnin page"> 833 <message name="IDS_CHROME_SIGNIN_TITLE" desc="Title on the about:chrome-si gnin page">
834 Chromium 834 Chromium
835 </message> 835 </message>
836 836
837 <!-- Sync Promo New Tab Page bubble strings --> 837 <!-- Sync Promo New Tab Page bubble strings -->
838 <message name="IDS_SYNC_PROMO_NTP_BUBBLE_MESSAGE_NEW" desc="The body of th e sync promo NTP bubble."> 838 <message name="IDS_SYNC_PROMO_NTP_BUBBLE_MESSAGE_NEW" desc="The body of th e sync promo NTP bubble.">
839 Now that you're signed in, you can get your tabs, bookmarks and other Ch romium stuff across your laptop, phone and tablet. You will also receive more re levant suggestions and features on Google services. 839 Now that you're signed in, you can get your tabs, bookmarks and other Ch romium stuff across your laptop, phone and tablet. You will also receive more re levant suggestions and features on Google services.
840 </message> 840 </message>
841 841
842 <!-- One click sign in infobar --> 842 <!-- One click sign-in infobar -->
843 <if expr="not pp_ifdef('chromeos')"> 843 <if expr="not pp_ifdef('chromeos')">
844 <!-- New one-click signin dialog contents for SAML support --> 844 <!-- New one-click sign-in dialog contents for SAML support -->
845 <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."> 845 <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.">
846 You're signed in to Chromium! 846 You're signed in to Chromium!
847 </message> 847 </message>
848 <message name="IDS_ONE_CLICK_SIGNIN_DIALOG_MESSAGE_NEW" desc="The messag e of the one click sign in dialog."> 848 <message name="IDS_ONE_CLICK_SIGNIN_DIALOG_MESSAGE_NEW" desc="The messag e of the one click sign-in dialog.">
849 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. 849 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.
850 </message> 850 </message>
851 <message name="IDS_ONE_CLICK_SIGNIN_BUBBLE_MESSAGE_FULL" desc="The entir e message of the one click sign in bubble."> 851 <message name="IDS_ONE_CLICK_SIGNIN_BUBBLE_MESSAGE_FULL" desc="The entir e message of the one click sign-in bubble.">
852 You're now signed in to Chromium! Your bookmarks, history, and other s ettings will be synced to your Google Account. 852 You're now signed in to Chromium! Your bookmarks, history, and other s ettings will be synced to your Google Account.
853 </message> 853 </message>
854 <message name="IDS_ONE_CLICK_SIGNIN_BUBBLE_MESSAGE_NEW" desc="The body o f the sync promo NTP bubble."> 854 <message name="IDS_ONE_CLICK_SIGNIN_BUBBLE_MESSAGE_NEW" desc="The body o f the sync promo NTP bubble.">
855 Now that you're signed in, you can get your tabs, bookmarks and other Chromium stuff across your laptop, phone and tablet. You will also receive more relevant suggestions and features on Google services. 855 Now that you're signed in, you can get your tabs, bookmarks and other Chromium stuff across your laptop, phone and tablet. You will also receive more relevant suggestions and features on Google services.
856 </message> 856 </message>
857 <message name="IDS_ONE_CLICK_SIGNIN_BUBBLE_SYNC_DISABLED_MESSAGE" desc=" The body of the signin bubble, when sync has been disabled."> 857 <message name="IDS_ONE_CLICK_SIGNIN_BUBBLE_SYNC_DISABLED_MESSAGE" desc=" The body of the sign-in bubble, when sync has been disabled.">
858 You're now signed in to Chromium! Sync is disabled by your administrat or. 858 You're now signed in to Chromium! Sync is disabled by your administrat or.
859 </message> 859 </message>
860 <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."> 860 <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.">
861 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. 861 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.
862 </message> 862 </message>
863 <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."> 863 <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.">
864 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. 864 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.
865 865
866 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>. 866 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>.
867 </message> 867 </message>
868 </if> 868 </if>
869 869
870 <!-- Enterprise sign-in profile linking --> 870 <!-- Enterprise sign-in profile linking -->
871 <message name="IDS_ENTERPRISE_SIGNIN_TITLE" desc="The title of the dialog to confirm linking the browser profile with the signed-in enterprise account"> 871 <message name="IDS_ENTERPRISE_SIGNIN_TITLE" desc="The title of the dialog to confirm linking the browser profile with the signed-in enterprise account">
872 Important information regarding your Chromium data 872 Important information regarding your Chromium data
873 </message> 873 </message>
874 <message name="IDS_ENTERPRISE_SIGNIN_EXPLANATION" desc="The warning messag e displayed to an enterprise user about to link their profile to their Google ac count. This message is followed by a 'Learn more' link."> 874 <message name="IDS_ENTERPRISE_SIGNIN_EXPLANATION" desc="The warning messag e displayed to an enterprise user about to link their profile to their Google ac count. This message is followed by a 'Learn more' link.">
875 You are signing in with a managed account and giving its administrator c ontrol over your Chromium profile. Your Chromium data, such as your apps, bookma rks, 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 thi s data via the Google Accounts Dashboard, but you will not be able to associate this data with another account. 875 You are signing in with a managed account and giving its administrator c ontrol over your Chromium profile. Your Chromium data, such as your apps, bookma rks, 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 thi s data via the Google Accounts Dashboard, but you will not be able to associate this data with another account.
876 </message> 876 </message>
877 <message name="IDS_ENTERPRISE_SIGNIN_CREATE_NEW_PROFILE_MESSAGE" desc="The text of the prompt to create a new profile after signing into an enterprise acc ount"> 877 <message name="IDS_ENTERPRISE_SIGNIN_CREATE_NEW_PROFILE_MESSAGE" desc="The text of the prompt to create a new profile after signing in to an enterprise ac count">
878 If you prefer to keep your existing Chromium data separate, you can crea te a new Chromium user for <ph name="USER_NAME">$1<ex>pat@example.com</ex></ph>. 878 If you prefer to keep your existing Chromium data separate, you can crea te a new Chromium user for <ph name="USER_NAME">$1<ex>pat@example.com</ex></ph>.
879 </message> 879 </message>
880 <message name="IDS_ENTERPRISE_SIGNIN_CONTINUE" desc="Text of the button to link the current profile with the signed-in enterprise account"> 880 <message name="IDS_ENTERPRISE_SIGNIN_CONTINUE" desc="Text of the button to link the current profile with the signed-in enterprise account">
881 Link my Chromium data to this account 881 Link my Chromium data to this account
882 </message> 882 </message>
883 883
884 <!-- Enterprise sign-in dialog (new-style) --> 884 <!-- Enterprise sign-in dialog (new-style) -->
885 <!-- TODO(dconnelly): remove "new-style" once the old dialog is gone. --> 885 <!-- TODO(dconnelly): remove "new-style" once the old dialog is gone. -->
886 <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"> 886 <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">
887 Link your Chromium data to this account? 887 Link your Chromium data to this account?
888 </message> 888 </message>
889 <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."> 889 <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.">
890 You are signing in with a managed account and giving its administrator c ontrol over your Chromium profile. Your Chromium data, such as your apps, bookma rks, 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 thi s data via the Google Accounts Dashboard, but you will not be able to associate this data with another account. <ph name="LEARN_MORE">$2<ex>Learn more</ex></ph> 890 You are signing in with a managed account and giving its administrator c ontrol over your Chromium profile. Your Chromium data, such as your apps, bookma rks, 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 thi s data via the Google Accounts Dashboard, but you will not be able to associate this data with another account. <ph name="LEARN_MORE">$2<ex>Learn more</ex></ph>
891 </message> 891 </message>
892 <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."> 892 <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.">
893 You are signing in with a managed account and giving its administrator c ontrol over your Chromium profile. Your Chromium data, such as your apps, bookma rks, 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 thi s data via the Google Accounts Dashboard, but you will not be able to associate this data with another account. You can optionally create a new profile to keep your existing Chromium data separate. <ph name="LEARN_MORE">$2<ex>Learn more</ex ></ph> 893 You are signing in with a managed account and giving its administrator c ontrol over your Chromium profile. Your Chromium data, such as your apps, bookma rks, 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 thi s data via the Google Accounts Dashboard, but you will not be able to associate this data with another account. You can optionally create a new profile to keep your existing Chromium data separate. <ph name="LEARN_MORE">$2<ex>Learn more</ex ></ph>
894 </message> 894 </message>
895 895
896 <!-- Sync sign-in global error message-->
897 <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.">
898 Chromium could not sync your data. Please update your Sync passphrase.
899 </message>
900 <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 .">
901 Chromium could not sync your data because your account sign-in details a re out of date.
902 </message>
903 <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.">
904 Chromium could not sync your data because Sync is not available for your domain.
905 </message>
906 <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.">
907 Chromium could not sync your data due to an error signing in.
908 </message>
909
896 <message name="IDS_OPTIONS_PASSWORDS_MAC_WARNING" desc="The warning for OS X that passwords are shared across profiles in the keychain."> 910 <message name="IDS_OPTIONS_PASSWORDS_MAC_WARNING" desc="The warning for OS X that passwords are shared across profiles in the keychain.">
897 On Mac, passwords are saved to your Keychain and may be accessed or sync ed by other Chromium users sharing this OS X account. 911 On Mac, passwords are saved to your Keychain and may be accessed or sync ed by other Chromium users sharing this OS X account.
898 </message> 912 </message>
899 913
900 <message name="IDS_AUTOFILL_CC_INFOBAR_TEXT" desc="Text to show in the Aut ofill credit card request infobar."> 914 <message name="IDS_AUTOFILL_CC_INFOBAR_TEXT" desc="Text to show in the Aut ofill credit card request infobar.">
901 Do you want Chromium to save this credit card information for completing web forms? 915 Do you want Chromium to save this credit card information for completing web forms?
902 </message> 916 </message>
903 <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."> 917 <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.">
904 Save details in Chromium 918 Save details in Chromium
905 </message> 919 </message>
(...skipping 71 matching lines...) Expand 10 before | Expand all | Expand 10 after
977 <message name="IDS_APP_LIST_SHORTCUT_NAME" desc="Name for the Chromium App List to appear in the taskbar and in any shortcuts to it."> 991 <message name="IDS_APP_LIST_SHORTCUT_NAME" desc="Name for the Chromium App List to appear in the taskbar and in any shortcuts to it.">
978 Chromium App Launcher 992 Chromium App Launcher
979 </message> 993 </message>
980 <message name="IDS_APP_LIST_SHORTCUT_NAME_CANARY" desc="Name for the Chrom ium App List to appear in the taskbar and in any shortcuts to it."> 994 <message name="IDS_APP_LIST_SHORTCUT_NAME_CANARY" desc="Name for the Chrom ium App List to appear in the taskbar and in any shortcuts to it.">
981 Chromium App Launcher 995 Chromium App Launcher
982 </message> 996 </message>
983 <message name="IDS_APP_LIST_SIGNIN_HEADING" desc="Heading for when the lau ncher needs to sign in."> 997 <message name="IDS_APP_LIST_SIGNIN_HEADING" desc="Heading for when the lau ncher needs to sign in.">
984 Sign in to Chromium 998 Sign in to Chromium
985 </message> 999 </message>
986 <message name="IDS_APP_LIST_SIGNIN_TEXT" desc="Text for when the launcher needs to sign in."> 1000 <message name="IDS_APP_LIST_SIGNIN_TEXT" desc="Text for when the launcher needs to sign in.">
987 You need to be signed into Chromium to use apps. This allows Chromium to sync your apps, bookmarks, history, passwords and other settings across devices . 1001 You need to be signed in to Chromium to use apps. This allows Chromium t o sync your apps, bookmarks, history, passwords and other settings across device s.
988 </message> 1002 </message>
989 1003
990 <!-- App shortcuts --> 1004 <!-- App shortcuts -->
991 <message name="IDS_APP_SHORTCUTS_SUBDIR_NAME" desc="Name for the Chromium Apps Start Menu folder name."> 1005 <message name="IDS_APP_SHORTCUTS_SUBDIR_NAME" desc="Name for the Chromium Apps Start Menu folder name.">
992 Chromium Apps 1006 Chromium Apps
993 </message> 1007 </message>
994 <message name="IDS_APP_SHORTCUTS_SUBDIR_NAME_CANARY" desc="Name for the Ch rome Apps Start Menu folder name."> 1008 <message name="IDS_APP_SHORTCUTS_SUBDIR_NAME_CANARY" desc="Name for the Ch rome Apps Start Menu folder name.">
995 Chromium Apps 1009 Chromium Apps
996 </message> 1010 </message>
997 1011
(...skipping 39 matching lines...) Expand 10 before | Expand all | Expand 10 after
1037 </message> 1051 </message>
1038 1052
1039 <!-- ProcessSingleton --> 1053 <!-- ProcessSingleton -->
1040 <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."> 1054 <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.">
1041 The profile appears to be in use by another Chromium process (<ph name=" PROCESS_ID">$1<ex>12345</ex></ph>) on another computer (<ph name="HOST_NAME">$2< ex>example.com</ex></ph>). Chromium has locked the profile so that it doesn't ge t corrupted. If you are sure no other processes are using this profile, you can unlock the profile and relaunch Chromium. 1055 The profile appears to be in use by another Chromium process (<ph name=" PROCESS_ID">$1<ex>12345</ex></ph>) on another computer (<ph name="HOST_NAME">$2< ex>example.com</ex></ph>). Chromium has locked the profile so that it doesn't ge t corrupted. If you are sure no other processes are using this profile, you can unlock the profile and relaunch Chromium.
1042 </message> 1056 </message>
1043 1057
1044 </messages> 1058 </messages>
1045 </release> 1059 </release>
1046 </grit> 1060 </grit>
OLDNEW
« no previous file with comments | « chrome/app/chromeos_strings.grdp ('k') | chrome/app/generated_resources.grd » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698