bug 995777 - browser.properties: rename getUserMedia.videoDevice.prompt to reflect new string r=mfinkle
☠☠ backed out by 3838be7a8148 ☠ ☠
authorBrad Lassey <blassey@mozilla.com>
Fri, 18 Apr 2014 15:01:56 -0400
changeset 181925 e2bba39c038567df43fe8a60af8e6549107e398a
parent 181924 25e04f0991908bc4321b9b6f7f7648b848c1196e
child 181926 9fb5cb82cb131613ea079819b480afee7ddecc62
push id26739
push usercbook@mozilla.com
push dateWed, 07 May 2014 12:10:36 +0000
treeherdermozilla-central@41b9eb3d1075 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersmfinkle
bugs995777
milestone32.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 995777 - browser.properties: rename getUserMedia.videoDevice.prompt to reflect new string r=mfinkle
mobile/android/chrome/content/WebrtcUI.js
mobile/android/locales/en-US/chrome/browser.properties
--- a/mobile/android/chrome/content/WebrtcUI.js
+++ b/mobile/android/chrome/content/WebrtcUI.js
@@ -192,18 +192,18 @@ var WebrtcUI = {
     let options = { inputs: [] };
     // if the users only option would be to select "No Audio" or "No Video"
     // i.e. we're only showing audio or only video and there is only one device for that type
     // don't bother showing a menulist to select from
     var extraItems = null;
     if (videoDevices.length > 1 || audioDevices.length > 0) {
       // Only show the No Video option if there are also Audio devices to choose from
       if (audioDevices.length > 0)
-        extraItems = [ Strings.browser.GetStringFromName("getUserMedia.videoDevice.none") ];
-      this._addDevicesToOptions(videoDevices, "videoDevice", options, extraItems);
+        extraItems = [ Strings.browser.GetStringFromName("getUserMedia.videoSource.none") ];
+      this._addDevicesToOptions(videoDevices, "videoSource", options, extraItems);
     }
 
     if (audioDevices.length > 1 || videoDevices.length > 0) {
       // Only show the No Audio option if there are also Video devices to choose from
       if (videoDevices.length > 0)
         extraItems = [ Strings.browser.GetStringFromName("getUserMedia.audioDevice.none") ];
       this._addDevicesToOptions(audioDevices, "audioDevice", options, extraItems);
     }
--- a/mobile/android/locales/en-US/chrome/browser.properties
+++ b/mobile/android/locales/en-US/chrome/browser.properties
@@ -294,22 +294,22 @@ lwthemeInstallRequest.message=This site 
 lwthemeInstallRequest.allowButton=Allow
 
 # LOCALIZATION NOTE (getUserMedia.shareCamera.message, getUserMedia.shareMicrophone.message, getUserMedia.shareCameraAndMicrophone.message, getUserMedia.sharingCamera.message, getUserMedia.sharingMicrophone.message, getUserMedia.sharingCameraAndMicrophone.message): %S is the website origin (e.g. www.mozilla.org)
 getUserMedia.shareCamera.message = Would you like to share your camera with %S?
 getUserMedia.shareMicrophone.message = Would you like to share your microphone with %S?
 getUserMedia.shareCameraAndMicrophone.message = Would you like to share your camera and microphone with %S?
 getUserMedia.denyRequest.label = Don't Share
 getUserMedia.shareRequest.label = Share
-getUserMedia.videoDevice.default = Camera %S
-getUserMedia.videoDevice.frontCamera = Front facing camera
-getUserMedia.videoDevice.backCamera = Back facing camera
-getUserMedia.videoDevice.none = No Video
-getUserMedia.videoDevice.tabShare = Choose a tab to stream
-getUserMedia.videoDevice.prompt = Video source
+getUserMedia.videoSource.default = Camera %S
+getUserMedia.videoSource.frontCamera = Front facing camera
+getUserMedia.videoSource.backCamera = Back facing camera
+getUserMedia.videoSource.none = No Video
+getUserMedia.videoSource.tabShare = Choose a tab to stream
+getUserMedia.videoSource.prompt = Video source
 getUserMedia.audioDevice.default = Microphone %S
 getUserMedia.audioDevice.none = No Audio
 getUserMedia.audioDevice.prompt = Microphone to use
 getUserMedia.sharingCamera.message2 = Camera is on
 getUserMedia.sharingMicrophone.message2 = Microphone is on
 getUserMedia.sharingCameraAndMicrophone.message2 = Camera and microphone are on
 
 #Reader mode