Upstream version 10.39.225.0

[platform/framework/web/crosswalk.git] / src / remoting / resources / remoting_strings.grd

diff --git a/src/remoting/resources/remoting_strings.grd b/src/remoting/resources/remoting_strings.grd
index 0af6d94..604db9a 100644 (file)
--- a/src/remoting/resources/remoting_strings.grd
+++ b/src/remoting/resources/remoting_strings.grd
@@ -716,6 +716,12 @@ For information about privacy, please see the Google Privacy Policy (http://goo.
       <message desc="Label for button to reconnect to the previous Me2Me host. This button appears on the 'session-finished' page." name="IDS_RECONNECT">
         Reconnect
       </message>
+      <message desc="Button for starting video frame recording, to capture frame sequences for debugging purposes." name="IDS_START_RECORDING">
+        Start Recording
+      </message>
+      <message desc="Button for stopping recording of video frames." name="IDS_STOP_RECORDING">
+        Stop Recording
+      </message>
       <message desc="Button for enabling or disabling the 'resize-to-client' functionality, whereby the host desktop is resized to match the client size as closely as possible." name="IDS_RESIZE_TO_CLIENT">
         Resize desktop to fit
       </message>
@@ -848,6 +854,21 @@ For information about privacy, please see the Google Privacy Policy (http://goo.
       <message desc="Label for the Feedback button displayed in the Android Help screen. Pressing this button causes the Feedback screen to be shown." name="IDS_ACTIONBAR_FEEDBACK" formatter_data="android_java">
         Feedback
       </message>
+      <message desc="Message displayed in the Hangouts confirm dialog. This message is shown to the Hangouts participant receiving remote assistance before the access code is generated.  The dialog informs the user of the implications of accepting remote assistance.  It also provides a way for the user to decline the assistance." name="IDS_HANGOUTS_CONFIRM_DIALOG_MESSAGE_1" >
+        A participant in this hangout has offered to help you by controlling your computer.  If you accept:
+      </message>
+      <message desc="Message displayed in the Hangouts confirm dialog. This message is shown to the Hangouts participant receiving remote assistance before the access code is generated.  The dialog informs the user of the implications of accepting remote assistance.  It also provides a way for the user to decline the assistance." name="IDS_HANGOUTS_CONFIRM_DIALOG_MESSAGE_2" >
+        The person helping you will be able to control your mouse and keyboard.
+      </message>
+      <message desc="Message displayed in the Hangouts confirm dialog. This message is shown to the Hangouts participant receiving remote assistance before the access code is generated.  The dialog informs the user of the implications of accepting remote assistance.  It also provides a way for the user to decline the assistance." name="IDS_HANGOUTS_CONFIRM_DIALOG_MESSAGE_3" >
+        You can end at any time.
+      </message>
+      <message desc="Label for button to accept remote assistance.  This button appears in the Hangouts confirm dialog." name="IDS_HANGOUTS_CONFIRM_DIALOG_ACCEPT" >
+        Accept
+      </message>
+      <message desc="Label for button to decline remote assistance.  This button appears in the Hangouts confirm dialog." name="IDS_HANGOUTS_CONFIRM_DIALOG_DECLINE" >
+        Decline
+      </message>
     </messages>
   </release>
 </grit>