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

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

Issue 7774009: [cros] check for updates in WebUI OOBE can be cancelled in dev builds. (Closed) Base URL: http://git.chromium.org/git/chromium.git@trunk
Patch Set: Added OnActorDestroyed to UpdateScreen::Delegate. Created 9 years, 3 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/browser/chromeos/login/mock_update_screen.h » ('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 2
3 <!-- 3 <!--
4 This file contains definitions of resources that will be translated for each 4 This file contains definitions of resources that will be translated for each
5 locale. The variables is_win, is_macosx, is_linux, and is_posix are available 5 locale. The variables is_win, is_macosx, is_linux, and is_posix are available
6 for making strings OS specific. Other platform defines such as use_titlecase 6 for making strings OS specific. Other platform defines such as use_titlecase
7 are declared in build/common.gypi. 7 are declared in build/common.gypi.
8 --> 8 -->
9 9
10 <grit base_dir="." latest_public_release="0" current_release="1" 10 <grit base_dir="." latest_public_release="0" current_release="1"
(...skipping 10776 matching lines...) Expand 10 before | Expand all | Expand 10 after
10787 </message> 10787 </message>
10788 <message name="IDS_UPDATE_COMPLETED" desc="Notification for update complet ed"> 10788 <message name="IDS_UPDATE_COMPLETED" desc="Notification for update complet ed">
10789 System update complete. Please restart the system. 10789 System update complete. Please restart the system.
10790 </message> 10790 </message>
10791 <message name="IDS_INSTALLING_UPDATE" desc="Label shown on the updates ins tallation screen during OOBE"> 10791 <message name="IDS_INSTALLING_UPDATE" desc="Label shown on the updates ins tallation screen during OOBE">
10792 Please wait while <ph name="PRODUCT_NAME">$1<ex>Chrome OS</ex></ph> inst alls the latest system updates. 10792 Please wait while <ph name="PRODUCT_NAME">$1<ex>Chrome OS</ex></ph> inst alls the latest system updates.
10793 </message> 10793 </message>
10794 <message name="IDS_INSTALLING_UPDATE_DESC" desc="Additional info shown on the updates installation screen during OOBE"> 10794 <message name="IDS_INSTALLING_UPDATE_DESC" desc="Additional info shown on the updates installation screen during OOBE">
10795 Your computer will restart when the update is complete. 10795 Your computer will restart when the update is complete.
10796 </message> 10796 </message>
10797 <message name="IDS_UPDATE_CANCEL" desc="Message telling to press Escape to cancel update on a non-official build">
10798 Press ESCAPE to skip (Non-official builds only).
10799 </message>
10800 <message name="IDS_UPDATE_CANCELLED" desc="Message shown when the update h as been cancelled by user">
10801 Cancelling update...
10802 </message>
10797 <message name="IDS_WELCOME_SCREEN_TITLE" desc="Title of the OOBE welcome s creen"> 10803 <message name="IDS_WELCOME_SCREEN_TITLE" desc="Title of the OOBE welcome s creen">
10798 Connect 10804 Connect
10799 </message> 10805 </message>
10800 <message name="IDS_EULA_SCREEN_TITLE" desc="Title of the OOBE EULA screen" > 10806 <message name="IDS_EULA_SCREEN_TITLE" desc="Title of the OOBE EULA screen" >
10801 The small print 10807 The small print
10802 </message> 10808 </message>
10803 <message name="IDS_UPDATE_SCREEN_TITLE" desc="Title of the OOBE update scr een"> 10809 <message name="IDS_UPDATE_SCREEN_TITLE" desc="Title of the OOBE update scr een">
10804 Update 10810 Update
10805 </message> 10811 </message>
10806 <message name="IDS_SIGNIN_SCREEN_TITLE" desc="Title of OOBE/Add User sign in screen"> 10812 <message name="IDS_SIGNIN_SCREEN_TITLE" desc="Title of OOBE/Add User sign in screen">
(...skipping 2716 matching lines...) Expand 10 before | Expand all | Expand 10 after
13523 </messages> 13529 </messages>
13524 <structures fallback_to_english="true"> 13530 <structures fallback_to_english="true">
13525 <!-- Make sure these stay in sync with the structures in generated_resourc es.grd. --> 13531 <!-- Make sure these stay in sync with the structures in generated_resourc es.grd. -->
13526 <structure name="IDD_CHROME_FRAME_FIND_DIALOG" file="cf_resources.rc" type ="dialog" > 13532 <structure name="IDD_CHROME_FRAME_FIND_DIALOG" file="cf_resources.rc" type ="dialog" >
13527 </structure> 13533 </structure>
13528 <structure name="IDD_CHROME_FRAME_READY_PROMPT" file="cf_resources.rc" typ e="dialog" > 13534 <structure name="IDD_CHROME_FRAME_READY_PROMPT" file="cf_resources.rc" typ e="dialog" >
13529 </structure> 13535 </structure>
13530 </structures> 13536 </structures>
13531 </release> 13537 </release>
13532 </grit> 13538 </grit>
OLDNEW
« no previous file with comments | « no previous file | chrome/browser/chromeos/login/mock_update_screen.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698