[files-progress] Add new strings for transfer details.

There are 2 messages for time display as it may show time in 2 parts
like '1 hour 2 min' or 1 part like '2 hours' or '3 min'.

We already have Dismiss label but its ID and usage is for drive banner.
Added this new one as a general one to prevent confusion when
referencing in the code or changing the other one.

Bug: 953308
Change-Id: I7b7a2603e81ab8aea36a518d334546e1c4b8c905
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2306112Reviewed-by: Noel Gordon <noel@chromium.org>
Commit-Queue: Omid Tourzan <oto@chromium.org>
Cr-Commit-Position: refs/heads/master@{#789982}

chrome/browser/chromeos/file_manager/file_manager_string_util.cc

@@ -425,6 +425,7 @@ std::unique_ptr<base::DictionaryValue> GetFileManagerStrings() {
   SET_STRING("FEEDBACK_COLLAPSE_LABEL",
              IDS_FILE_BROWSER_FEEDBACK_COLLAPSE_LABEL);
   SET_STRING("FILES_FEEDBACK_WINDOW", IDS_FILE_BROWSER_FILES_FEEDBACK_WINDOW);
+  SET_STRING("COMPLETE_LABEL", IDS_FILE_BROWSER_COMPLETE_LABEL);
   SET_STRING("CONFIGURE_VOLUME_BUTTON_LABEL",
              IDS_FILE_BROWSER_CONFIGURE_VOLUME_BUTTON_LABEL);
   SET_STRING("CONFIRM_MOBILE_DATA_USE",
@@ -450,10 +451,6 @@ std::unique_ptr<base::DictionaryValue> GetFileManagerStrings() {
   SET_STRING("COPY_FILE_NAME_LONG", IDS_FILE_BROWSER_COPY_FILE_NAME_LONG);
   SET_STRING("COPY_ITEMS_REMAINING_LONG",
              IDS_FILE_BROWSER_COPY_ITEMS_REMAINING_LONG);
-  SET_STRING("COPY_TIME_REMAINING_ESTIMATE",
-             IDS_FILE_BROWSER_COPY_TIME_REMAINING_ESTIMATE);
-  SET_STRING("COPY_TIME_REMAINING_CLOSE",
-             IDS_FILE_BROWSER_COPY_TIME_REMAINING_CLOSE);
   SET_STRING("COPY_PROGRESS_SUMMARY", IDS_FILE_BROWSER_COPY_PROGRESS_SUMMARY);
   SET_STRING("COPY_SOURCE_NOT_FOUND_ERROR",
              IDS_FILE_BROWSER_COPY_SOURCE_NOT_FOUND_ERROR);
@@ -493,6 +490,7 @@ std::unique_ptr<base::DictionaryValue> GetFileManagerStrings() {
              IDS_FILE_BROWSER_DISABLED_MOBILE_SYNC_NOTIFICATION_ENABLE_BUTTON);
   SET_STRING("DISABLED_MOBILE_SYNC_NOTIFICATION_MESSAGE",
              IDS_FILE_BROWSER_DISABLED_MOBILE_SYNC_NOTIFICATION_MESSAGE);
+  SET_STRING("DISMISS_LABEL", IDS_FILE_BROWSER_DISMISS_LABEL);
   SET_STRING("DOWNLOADS_DIRECTORY_LABEL",
              IDS_FILE_BROWSER_DOWNLOADS_DIRECTORY_LABEL);
   SET_STRING("DOWNLOADS_DIRECTORY_WARNING",
@@ -735,6 +733,7 @@ std::unique_ptr<base::DictionaryValue> GetFileManagerStrings() {
   SET_STRING("PASTE_BUTTON_LABEL", IDS_FILE_BROWSER_PASTE_BUTTON_LABEL);
   SET_STRING("PASTE_INTO_FOLDER_BUTTON_LABEL",
              IDS_FILE_BROWSER_PASTE_INTO_FOLDER_BUTTON_LABEL);
+  SET_STRING("PENDING_LABEL", IDS_FILE_BROWSER_PENDING_LABEL);
   SET_STRING("PLUGIN_VM_DIRECTORY_LABEL",
              IDS_FILE_BROWSER_PLUGIN_VM_DIRECTORY_LABEL);
   SET_STRING("PREPARING_LABEL", IDS_FILE_BROWSER_PREPARING_LABEL);
@@ -893,6 +892,10 @@ std::unique_ptr<base::DictionaryValue> GetFileManagerStrings() {
   SET_STRING("TASK_OPEN_GSLIDES", IDS_FILE_BROWSER_TASK_OPEN_GSLIDES);
   SET_STRING("TASK_VIEW", IDS_FILE_BROWSER_TASK_VIEW);
   SET_STRING("THUMBNAIL_VIEW_TOOLTIP", IDS_FILE_BROWSER_THUMBNAIL_VIEW_TOOLTIP);
+  SET_STRING("TIME_REMAINING_ESTIMATE",
+             IDS_FILE_BROWSER_TIME_REMAINING_ESTIMATE);
+  SET_STRING("TIME_REMAINING_ESTIMATE_2",
+             IDS_FILE_BROWSER_TIME_REMAINING_ESTIMATE_2);
   SET_STRING("TIME_TODAY", IDS_FILE_BROWSER_TIME_TODAY);
   SET_STRING("TIME_YESTERDAY", IDS_FILE_BROWSER_TIME_YESTERDAY);
   SET_STRING("TRANSFER_PROGRESS_SUMMARY",
@@ -928,6 +931,7 @@ std::unique_ptr<base::DictionaryValue> GetFileManagerStrings() {
   SET_STRING("GRID_VIEW_FILES_TITLE", IDS_FILE_BROWSER_GRID_VIEW_FILES_TITLE);
   SET_STRING("LOCATION_BREADCRUMB_ELIDER_BUTTON_LABEL",
              IDS_FILE_BROWSER_LOCATION_BREADCRUMB_ELIDER_BUTTON_LABEL);
+
 #undef SET_STRING
 
   dict->SetString(

ui/chromeos/file_manager_strings.grdp

@@ -738,11 +738,13 @@
   <message name="IDS_FILE_BROWSER_COPY_ITEMS_REMAINING_LONG" desc="File Manager status message including destination folder when copying multiple files or folders. 'Item' is used here as a generic term for file or directory.">
     Copying <ph name="NUMBER_OF_ITEMS">$1<ex>3</ex></ph> items to <ph name="FOLDER_NAME">$2<ex>images</ex></ph>
   </message>
-  <message name="IDS_FILE_BROWSER_COPY_TIME_REMAINING_ESTIMATE" desc="File Manager remaining time message when copying or moving files.">
-   About <ph name="REMAINING_TIME">$1<ex>2 min</ex></ph>
+  <message name="IDS_FILE_BROWSER_TIME_REMAINING_ESTIMATE"
+           desc="The progress panel message indicating estimate of remaining time of a file operation. The time will be in 1 part (hour or minute) like '2 hours' or '3 min'.">
+    About <ph name="REMAINING_TIME">$1<ex>1 min</ex></ph> remaining
   </message>
-  <message name="IDS_FILE_BROWSER_COPY_TIME_REMAINING_CLOSE" desc="File Manager close to finish remaining time message when copying or moving files.">
-   Less than <ph name="REMAINING_TIME">$1<ex>1 min</ex></ph>
+  <message name="IDS_FILE_BROWSER_TIME_REMAINING_ESTIMATE_2"
+           desc="The progress panel message indicating estimate of remaining time of a file operation. The time will be in 2 parts and has both hour and minute like '2 hours 1 min'.">
+    About <ph name="REMAINING_TIME_HOUR">$1<ex>2 hours</ex></ph> <ph name="REMAINING_TIME_MINUTE">$2<ex>3 min</ex></ph> remaining
   </message>
   <message name="IDS_FILE_BROWSER_COPY_TARGET_EXISTS_ERROR" desc="File Manager error message. 'Item' is used here as a generic term for file or directory.">
     Whoops, <ph name="FILE_NAME">$1<ex>movie.avi</ex></ph> already exists. Rename it and try again.
@@ -889,6 +891,15 @@
   <message name="IDS_FILE_BROWSER_UPLOAD_LABEL" desc="Upload label.">
     Upload
   </message>
+  <message name="IDS_FILE_BROWSER_COMPLETE_LABEL" desc="Complete label.">
+    Complete
+  </message>
+  <message name="IDS_FILE_BROWSER_DISMISS_LABEL" desc="Dismiss label.">
+    Dismiss
+  </message>
+  <message name="IDS_FILE_BROWSER_PENDING_LABEL" desc="Pending label.">
+    Pending
+  </message>
   <message name="IDS_FILE_BROWSER_SEARCH_TEXT_LABEL" desc="Search text field label.">
     Search
   </message>

ui/chromeos/file_manager_strings_grdp/IDS_FILE_BROWSER_COMPLETE_LABEL.png.sha1

+cb6e7057bf647912d8cb17b3d518b8883592579a
\ No newline at end of file

ui/chromeos/file_manager_strings_grdp/IDS_FILE_BROWSER_COPY_TIME_REMAINING_CLOSE.png.sha1

-ae92434fea771fbf80149dfb68e3dc09f7ca5826
\ No newline at end of file

ui/chromeos/file_manager_strings_grdp/IDS_FILE_BROWSER_COPY_TIME_REMAINING_ESTIMATE.png.sha1

-65421e7c1dc4d4d785c2171cef8349b07087febf
\ No newline at end of file

ui/chromeos/file_manager_strings_grdp/IDS_FILE_BROWSER_DISMISS_LABEL.png.sha1

+cb6e7057bf647912d8cb17b3d518b8883592579a
\ No newline at end of file

ui/chromeos/file_manager_strings_grdp/IDS_FILE_BROWSER_PENDING_LABEL.png.sha1

+83bbff6f4484cf333764bc7c7c2f5d60f6ef7cc5
\ No newline at end of file

ui/chromeos/file_manager_strings_grdp/IDS_FILE_BROWSER_TIME_REMAINING_ESTIMATE.png.sha1

+39dc258a62e6020b22b66fd662e7b4a23a230ed2
\ No newline at end of file

ui/chromeos/file_manager_strings_grdp/IDS_FILE_BROWSER_TIME_REMAINING_ESTIMATE_2.png.sha1

+7e0a467a93244d07c548e6ea291f5bc29a0ff83d
\ No newline at end of file