bug 995777 - browser.properties: rename getUserMedia.videoDevice.prompt to reflect new string. r=mfinkle
☠☠ backed out by 64a84390c1b2 ☠ ☠
authorBrad Lassey <blassey@mozilla.com>
Fri, 18 Apr 2014 15:01:56 -0400
changeset 180411 0096df4879f78182fd30ac4c6011a2f845579c3c
parent 180410 ecdb94250102f1483c999b2baa931da7d5518859
child 180412 9fab567879bcdca54be1ef6180c77d72f878fd51
push id272
push userpvanderbeken@mozilla.com
push dateMon, 05 May 2014 16:31:18 +0000
reviewersmfinkle
bugs995777
milestone31.0a1
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