Bug 593891 - Part 2 : Use a different title for the capture picker [r=mfinkle]
authorFabrice Desré <fabrice@mozilla.com>
Mon, 26 Sep 2011 17:25:41 -0700
changeset 78956 8ecc8009b371dd616e40666860db9acec154121d
parent 78955 0df8c6fcea9ec287ea2063d3e275c6d14857fd8c
child 78957 78b3f8faf4e3469ea4ba1c89f62cc421ca1b7352
push id78
push userclegnitto@mozilla.com
push dateFri, 16 Dec 2011 17:32:24 +0000
treeherdermozilla-release@79d24e644fdd [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersmfinkle
bugs593891
milestone9.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 593891 - Part 2 : Use a different title for the capture picker [r=mfinkle]
dom/locales/en-US/chrome/layout/HtmlForm.properties
layout/forms/nsFileControlFrame.cpp
--- a/dom/locales/en-US/chrome/layout/HtmlForm.properties
+++ b/dom/locales/en-US/chrome/layout/HtmlForm.properties
@@ -33,16 +33,17 @@
 # the terms of any one of the MPL, the GPL or the LGPL.
 #
 # ***** END LICENSE BLOCK *****
 
 Reset=Reset
 Submit=Submit Query
 Browse=Browse…
 FileUpload=File Upload
+MediaUpload=Media Upload
 # LOCALIZATION NOTE (IsIndexPromptWithSpace): The last character of the string 
 # should be a space (U+0020) in most locales. The prompt is followed by an 
 # input field. The space needs be escaped in the property file to avoid 
 # trimming.
 IsIndexPromptWithSpace=This is a searchable index. Enter search keywords:\u0020
 ForgotPostWarning=Form contains enctype=%S, but does not contain method=post.  Submitting normally with method=GET and no enctype instead.
 ForgotFileEnctypeWarning=Form contains a file input, but is missing method=POST and enctype=multipart/form-data on the form.  The file will not be sent.
 # LOCALIZATION NOTE (DefaultFormSubject): %S will be replaced with brandShortName
--- a/layout/forms/nsFileControlFrame.cpp
+++ b/layout/forms/nsFileControlFrame.cpp
@@ -433,17 +433,17 @@ nsFileControlFrame::CaptureMouseListener
 
   nsCOMPtr<nsIDocument> doc = content->GetDocument();
   if (!doc)
     return NS_ERROR_FAILURE;
 
   // Get Loc title
   nsXPIDLString title;
   nsContentUtils::GetLocalizedString(nsContentUtils::eFORMS_PROPERTIES,
-                                     "FileUpload", title);
+                                     "MediaUpload", title);
 
   nsPIDOMWindow* win = doc->GetWindow();
   if (!win) {
     return NS_ERROR_FAILURE;
   }
 
   nsCOMPtr<nsICapturePicker> capturePicker;
   capturePicker = do_CreateInstance("@mozilla.org/capturepicker;1");