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

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

Issue 7067020: Moving mediaplayer to the chrome filebrowser. Observable behaviour should not change. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Resolved conflicts. Created 9 years, 7 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/browser_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 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. OS values are passed through from Python's sys.platform: 5 locale. OS values are passed through from Python's sys.platform:
6 6
7 win32 - Windows 7 win32 - Windows
8 darwin - Mac 8 darwin - Mac
9 linux2 - Linux (both Views and GTK+) 9 linux2 - Linux (both Views and GTK+)
10 10
(...skipping 8609 matching lines...) Expand 10 before | Expand all | Expand 10 after
8620 </message> 8620 </message>
8621 <message name="IDS_FILE_BROWSER_NOTHING_SELECTED" desc="Nothing selected." > 8621 <message name="IDS_FILE_BROWSER_NOTHING_SELECTED" desc="Nothing selected." >
8622 No files selected 8622 No files selected
8623 </message> 8623 </message>
8624 <message name="IDS_FILE_BROWSER_ONE_FILE_SELECTED" desc="One file selected ."> 8624 <message name="IDS_FILE_BROWSER_ONE_FILE_SELECTED" desc="One file selected .">
8625 One file selected, $1 8625 One file selected, $1
8626 </message> 8626 </message>
8627 <message name="IDS_FILE_BROWSER_MANY_FILES_SELECTED" desc="Many files sele cted."> 8627 <message name="IDS_FILE_BROWSER_MANY_FILES_SELECTED" desc="Many files sele cted.">
8628 $1 files selected, $2 8628 $1 files selected, $2
8629 </message> 8629 </message>
8630 <message name="IDS_FILE_BROWSER_PLAYBACK_ERROR" desc="Error playing back." >
8631 Error playing back
8632 </message>
8630 8633
8631 <!-- Bookmark manager --> 8634 <!-- Bookmark manager -->
8632 <message name="IDS_BOOKMARK_MANAGER_TITLE" desc="Title of the bookmark man ager window."> 8635 <message name="IDS_BOOKMARK_MANAGER_TITLE" desc="Title of the bookmark man ager window.">
8633 Bookmark Manager 8636 Bookmark Manager
8634 </message> 8637 </message>
8635 <message name="IDS_BOOKMARK_MANAGER_SEARCH_BUTTON" desc="Title of the butt on in the bookmark manager that triggers a search"> 8638 <message name="IDS_BOOKMARK_MANAGER_SEARCH_BUTTON" desc="Title of the butt on in the bookmark manager that triggers a search">
8636 Search bookmarks 8639 Search bookmarks
8637 </message> 8640 </message>
8638 <if expr="not pp_ifdef('use_titlecase')"> 8641 <if expr="not pp_ifdef('use_titlecase')">
8639 <message name="IDS_BOOKMARK_MANAGER" desc="The label of the menu item th at shows the bookmark manager"> 8642 <message name="IDS_BOOKMARK_MANAGER" desc="The label of the menu item th at shows the bookmark manager">
(...skipping 3927 matching lines...) Expand 10 before | Expand all | Expand 10 after
12567 </includes> 12570 </includes>
12568 <structures fallback_to_english="true"> 12571 <structures fallback_to_english="true">
12569 <structure name="IDD_CHROME_FRAME_FIND_DIALOG" file="cf_resources.rc" type ="dialog" > 12572 <structure name="IDD_CHROME_FRAME_FIND_DIALOG" file="cf_resources.rc" type ="dialog" >
12570 </structure> 12573 </structure>
12571 <structure name="IDD_CHROME_FRAME_READY_PROMPT" file="cf_resources.rc" typ e="dialog" > 12574 <structure name="IDD_CHROME_FRAME_READY_PROMPT" file="cf_resources.rc" typ e="dialog" >
12572 </structure> 12575 </structure>
12573 </structures> 12576 </structures>
12574 12577
12575 </release> 12578 </release>
12576 </grit> 12579 </grit>
OLDNEW
« no previous file with comments | « no previous file | chrome/browser/browser_resources.grd » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698