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

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

Issue 11896021: Change the one-click sign in confirmation bubble into a modal dialog (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebased Created 7 years, 11 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 | « no previous file | 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 813 matching lines...) Expand 10 before | Expand all | Expand 10 after
824 <!-- Sync promo page chrome://signin --> 824 <!-- Sync promo page chrome://signin -->
825 <message name="IDS_SYNC_PROMO_V_LEARN_MORE" desc="Learn more link at the b ottom of the sync promo."> 825 <message name="IDS_SYNC_PROMO_V_LEARN_MORE" desc="Learn more link at the b ottom of the sync promo.">
826 See <ph name="BEGIN_LINK">&lt;a target="_blank" href="$1"&gt;</ph>more b enefits<ph name="END_LINK">&lt;/a&gt;</ph> of signing in to Chromium. 826 See <ph name="BEGIN_LINK">&lt;a target="_blank" href="$1"&gt;</ph>more b enefits<ph name="END_LINK">&lt;/a&gt;</ph> of signing in to Chromium.
827 </message> 827 </message>
828 <message name="IDS_SYNC_DIFFERENT_EMAIL" desc="Error message to display wh en setting up sync for a second time and the user name is different from the pre vious user name."> 828 <message name="IDS_SYNC_DIFFERENT_EMAIL" desc="Error message to display wh en setting up sync for a second time and the user name is different from the pre vious user name.">
829 You were previously signed in with a different account, signing in will merge your data. Consider creating a new Chromium user via the <ph name="BEGIN_L INK">&lt;a href="chrome://settings/search#Users" target="_parent"&gt;</ph>settin gs page<ph name="END_LINK">&lt;/a&gt;</ph> for your Chromium stuff. 829 You were previously signed in with a different account, signing in will merge your data. Consider creating a new Chromium user via the <ph name="BEGIN_L INK">&lt;a href="chrome://settings/search#Users" target="_parent"&gt;</ph>settin gs page<ph name="END_LINK">&lt;/a&gt;</ph> for your Chromium stuff.
830 </message> 830 </message>
831 831
832 <!-- One click sign in infobar --> 832 <!-- One click sign in infobar -->
833 <if expr="not pp_ifdef('chromeos')"> 833 <if expr="not pp_ifdef('chromeos')">
834 <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." >
835 You're signed in to Chromium!
836 </message>
834 <message name="IDS_ONE_CLICK_SIGNIN_INFOBAR_MESSAGE" desc="The string sh own in the infobar explaining that the user can connect his profile to a Google account instead of logging in only here."> 837 <message name="IDS_ONE_CLICK_SIGNIN_INFOBAR_MESSAGE" desc="The string sh own in the infobar explaining that the user can connect his profile to a Google account instead of logging in only here.">
835 Use this Google Account to sync all your Chromium stuff? 838 Use this Google Account to sync all your Chromium stuff?
836 </message> 839 </message>
837 <message name="IDS_ONE_CLICK_SIGNIN_BUBBLE_MESSAGE" desc="The body of th e sync promo NTP bubble."> 840 <message name="IDS_ONE_CLICK_SIGNIN_BUBBLE_MESSAGE" desc="The body of th e sync promo NTP bubble.">
838 You're now signed in to Chromium! Your bookmarks, history, and other s ettings will be synced to your Google Account. 841 You're now signed in to Chromium! Your bookmarks, history, and other s ettings will be synced to your Google Account.
839 </message> 842 </message>
840 <message name="IDS_ONE_CLICK_SIGNIN_DIALOG_HEADING" desc="The heading of the reverse auto-login dialog."> 843 <message name="IDS_ONE_CLICK_SIGNIN_DIALOG_HEADING" desc="The heading of the reverse auto-login dialog.">
841 Sign in to Chromium 844 Sign in to Chromium
842 </message> 845 </message>
843 </if> 846 </if>
(...skipping 100 matching lines...) Expand 10 before | Expand all | Expand 10 after
944 <!-- App list --> 947 <!-- App list -->
945 <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."> 948 <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.">
946 Chromium Apps Launcher 949 Chromium Apps Launcher
947 </message> 950 </message>
948 <message name="IDS_APP_LIST_OPT_IN_TEXT" desc="Text to appear in the promp t to use the Chrome app list."> 951 <message name="IDS_APP_LIST_OPT_IN_TEXT" desc="Text to appear in the promp t to use the Chrome app list.">
949 Use the Chromium Apps Launcher to launch your apps. 952 Use the Chromium Apps Launcher to launch your apps.
950 </message> 953 </message>
951 </messages> 954 </messages>
952 </release> 955 </release>
953 </grit> 956 </grit>
OLDNEW
« no previous file with comments | « no previous file | chrome/app/generated_resources.grd » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698