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

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

Issue 55143011: [sync] New strings for sign-in confirmation dialogs (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Merely add _NEW strings before string freeze. Undo actual UI changes. Created 7 years, 1 month 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 | « no previous file | chrome/app/google_chrome_strings.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 832 matching lines...) Expand 10 before | Expand all | Expand 10 after
843 Chromium 843 Chromium
844 </message> 844 </message>
845 <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."> 845 <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.">
846 Chromium Helper 846 Chromium Helper
847 </message> 847 </message>
848 <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."> 848 <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.">
849 Chromium Helper 849 Chromium Helper
850 </message> 850 </message>
851 </if> 851 </if>
852 852
853 <!-- Sync Promo New Tab Page bubble strings -->
854 <message name="IDS_SYNC_PROMO_NTP_BUBBLE_MESSAGE_NEW" desc="The body of th e sync promo NTP bubble.">
855 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.
856 </message>
857
853 <!-- One click sign in infobar --> 858 <!-- One click sign in infobar -->
854 <if expr="not pp_ifdef('chromeos')"> 859 <if expr="not pp_ifdef('chromeos')">
855 <!-- New one-click signin dialog contents for SAML support --> 860 <!-- New one-click signin dialog contents for SAML support -->
856 <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."> 861 <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.">
857 You're signed in to Chromium! 862 You're signed in to Chromium!
858 </message> 863 </message>
859 <message name="IDS_ONE_CLICK_SIGNIN_DIALOG_MESSAGE_NEW" desc="The messag e of the one click sign in dialog."> 864 <message name="IDS_ONE_CLICK_SIGNIN_DIALOG_MESSAGE_NEW" desc="The messag e of the one click sign in dialog.">
860 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. 865 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.
861 </message> 866 </message>
862 <message name="IDS_ONE_CLICK_SIGNIN_BUBBLE_MESSAGE" desc="The body of th e sync promo NTP bubble."> 867 <message name="IDS_ONE_CLICK_SIGNIN_BUBBLE_MESSAGE" desc="The body of th e sync promo NTP bubble.">
863 You're now signed in to Chromium! Your bookmarks, history, and other s ettings will be synced to your Google Account. 868 You're now signed in to Chromium! Your bookmarks, history, and other s ettings will be synced to your Google Account.
864 </message> 869 </message>
870 <message name="IDS_ONE_CLICK_SIGNIN_BUBBLE_MESSAGE_NEW" desc="The body o f the sync promo NTP bubble.">
871 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.
872 </message>
865 <message name="IDS_ONE_CLICK_SIGNIN_BUBBLE_SYNC_DISABLED_MESSAGE" desc=" The body of the signin bubble, when sync has been disabled."> 873 <message name="IDS_ONE_CLICK_SIGNIN_BUBBLE_SYNC_DISABLED_MESSAGE" desc=" The body of the signin bubble, when sync has been disabled.">
866 You're now signed in to Chromium! Sync is disabled by your administrat or. 874 You're now signed in to Chromium! Sync is disabled by your administrat or.
867 </message> 875 </message>
868 <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."> 876 <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.">
869 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. 877 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.
870 </message> 878 </message>
871 <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."> 879 <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.">
872 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. 880 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.
873 881
874 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>. 882 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>.
(...skipping 173 matching lines...) Expand 10 before | Expand all | Expand 10 after
1048 <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."> 1056 <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.">
1049 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. 1057 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.
1050 </message> 1058 </message>
1051 <message name="IDS_PROFILE_IN_USE_LINUX_RELAUNCH" desc="Text of button in dialog to delete the profile lock file."> 1059 <message name="IDS_PROFILE_IN_USE_LINUX_RELAUNCH" desc="Text of button in dialog to delete the profile lock file.">
1052 Unlock Profile and Relaunch 1060 Unlock Profile and Relaunch
1053 </message> 1061 </message>
1054 1062
1055 </messages> 1063 </messages>
1056 </release> 1064 </release>
1057 </grit> 1065 </grit>
OLDNEW
« no previous file with comments | « no previous file | chrome/app/google_chrome_strings.grd » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698