diff options
| author | zelidrag@chromium.org <zelidrag@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-07-25 06:19:02 +0000 |
|---|---|---|
| committer | zelidrag@chromium.org <zelidrag@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-07-25 06:19:02 +0000 |
| commit | 3976e5dfe1b2c23bb8e573f34d1da1a05403e41f (patch) | |
| tree | 858230a49fceabe22c886a1a70c3a771f3708560 /chrome/app | |
| parent | 434da4e43076f7cdb7faf899c2841b6829c01541 (diff) | |
| download | chromium_src-3976e5dfe1b2c23bb8e573f34d1da1a05403e41f.zip chromium_src-3976e5dfe1b2c23bb8e573f34d1da1a05403e41f.tar.gz chromium_src-3976e5dfe1b2c23bb8e573f34d1da1a05403e41f.tar.bz2 | |
Revert 93838 - Merged already reviewed CLs for r/o zip support in ChromeOS file browser:
Re-landing http://codereview.chromium.org/7457001:
Adding support for mount point different from removable
devices to MountLibrary
(work in progress..have to add GetMountPoints support)
tested on ChromeOS with these three patches:
http://gerrit.chromium.org/gerrit/#change,4447
http://gerrit.chromium.org/gerrit/#change,4449
http://gerrit.chromium.org/gerrit/#change,4544
http://codereview.chromium.org/7471039/:
UI for mounting/unmounting archive files.
BUG=chromium-os:17673, chromium-os:17783
TEST=Made sure mounting devices still works and that MountCompleted event gets through to file_browser_event_router (checking ui and chrome logs for mount completed entries)
TBR=tbarzic, dgozman
Review URL: http://codereview.chromium.org/7488044
TBR=zelidrag@chromium.org
Review URL: http://codereview.chromium.org/7495024
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@93849 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/app')
| -rw-r--r-- | chrome/app/generated_resources.grd | 19 |
1 files changed, 3 insertions, 16 deletions
diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources.grd index 965e792..60a4e531 100644 --- a/chrome/app/generated_resources.grd +++ b/chrome/app/generated_resources.grd @@ -8817,15 +8817,12 @@ ls' lab."> <message name="IDS_FILE_BROWSER_DOWNLOADS_DIRECTORY_LABEL" desc="/Downloads directory label."> File Shelf </message> - <message name="IDS_FILE_BROWSER_ARCHIVE_DIRECTORY_LABEL" desc="/archive directory label."> - Archives - </message> - <message name="IDS_FILE_BROWSER_REMOVABLE_DIRECTORY_LABEL" desc="/removable directory label."> - External Storage - </message> <message name="IDS_FILE_BROWSER_DOWNLOADS_DIRECTORY_WARNING" desc="Warning displayed to user when viewing downloads folder."> <ph name="BEGIN_BOLD"><strong></ph>Caution:<ph name="END_BOLD"></strong></ph> These files are temporary and may be automatically deleted to free up disk space. <ph name="BEGIN_LINK"><a href="$1"></ph>Learn More<ph name="END_LINK"></a></ph> </message> + <message name="IDS_FILE_BROWSER_MEDIA_DIRECTORY_LABEL" desc="/media directory label."> + External Storage + </message> <message name="IDS_FILE_BROWSER_NAME_COLUMN_LABEL" desc="Name column label."> Name </message> @@ -8883,16 +8880,6 @@ ls' lab."> Read Only </message> - <message name="IDS_FILE_BROWSER_ARCHIVE_MOUNT_FAILED" desc="Title of the error dialog when file mount operation failed."> - Unable to open open "$1": $2 - </message> - <message name="IDS_FILE_BROWSER_MOUNT_ARCHIVE" desc="Title of the action for mounting an archive file to work with its contents."> - Open archive - </message> - <message name="IDS_FILE_BROWSER_UNMOUNT_ARCHIVE" desc="Title of the action for unmounting the archive file."> - Close archive - </message> - <message name="IDS_FILE_BROWSER_CONFIRM_OVERWRITE_FILE" desc="Asks the user if they are sure they want to overwrite an existing file with another one."> A file named "$1" already exists. Do you want to replace it? </message> |