Upstream version 9.38.198.0

[platform/framework/web/crosswalk.git] / src / chrome / browser / resources / options / manage_profile_overlay.html

diff --git a/src/chrome/browser/resources/options/manage_profile_overlay.html b/src/chrome/browser/resources/options/manage_profile_overlay.html
index e8a6515..6b5950a 100644 (file)
--- a/src/chrome/browser/resources/options/manage_profile_overlay.html
+++ b/src/chrome/browser/resources/options/manage_profile_overlay.html
@@ -29,7 +29,7 @@
       </div>
       <div class="button-strip">
         <button id="manage-profile-cancel" i18n-content="cancel"></button>
-        <button id="manage-profile-ok" i18n-content="ok"
+        <button id="manage-profile-ok" i18n-content="manageProfilesConfirm"
             class="default-button"></button>
       </div>
     </div>
@@ -42,8 +42,8 @@
         <img id="delete-profile-icon" class="profile-icon">
         <div id="delete-profile-text"></div>
       </div>
-      <div id="delete-managed-profile-addendum"
-          i18n-values=".innerHTML:deleteManagedProfileAddendum" hidden>
+      <div id="delete-supervised-profile-addendum"
+          i18n-values=".innerHTML:deleteSupervisedProfileAddendum" hidden>
       </div>
     </div>
     <div class="action-area button-strip">
@@ -90,7 +90,7 @@
         </label>
       </div>
     </div>
-    <div id="create-profile-managed-content-area" class="content-area">
+    <div id="create-profile-supervised-content-area" class="content-area">
       <div id="create-shortcut-container" class="checkbox" hidden>
         <label>
           <input id="create-shortcut" type="checkbox">
@@ -99,33 +99,28 @@
           </span>
         </label>
       </div>
-      <div id="create-profile-managed-container" class="checkbox">
+      <div id="create-profile-supervised-container" class="checkbox">
         <label>
-          <input id="create-profile-managed" type="checkbox">
-          <span id="create-profile-managed-signed-in">
-            <span id="create-profile-managed-signed-in-label"></span>
-            <span id="create-profile-managed-account-details-out-of-date-label"
+          <input id="create-profile-supervised" type="checkbox">
+          <span id="create-profile-supervised-signed-in">
+            <span id="create-profile-supervised-signed-in-label"></span>
+            <span id="create-profile-supervised-account-details-out-of-date-label"
                 hidden>
             </span>
-            <button id="create-profile-managed-signed-in-learn-more-link"
+            <button id="create-profile-supervised-signed-in-learn-more-link"
                 class="link-button" i18n-content="learnMore">
             </button>
-            <button id="create-profile-managed-sign-in-again-link"
+            <button id="create-profile-supervised-sign-in-again-link"
                 class="link-button"
-                i18n-content="manageProfilesManagedSignInAgainLink" hidden>
+                i18n-content="manageProfilesSupervisedSignInAgainLink" hidden>
             </button>
           </span>
-          <span id="create-profile-managed-not-signed-in" hidden>
-            <span id="create-profile-managed-not-signed-in-label"
-                i18n-content="manageProfilesManagedNotSignedInLabel">
-            </span>
-            <button id="create-profile-managed-not-signed-in-link"
-                class="link-button"
-                i18n-content="manageProfilesManagedNotSignedInLink">
-            </button>
+          <span id="create-profile-supervised-not-signed-in"
+              i18n-values=".innerHTML:manageProfilesSupervisedNotSignedIn"
+              hidden>
           </span>
         </label>
-        <span id="create-profile-managed-indicator"
+        <span id="create-profile-supervised-indicator"
             class="bubble-button controlled-setting-indicator">
         </span>
       </div>
@@ -133,8 +128,8 @@
     </div>
     <div class="action-area">
       <div id="create-profile-throbber" class="throbber"></div>
-      <button id="import-existing-managed-user-link" class="link-button"
-          i18n-content="importExistingManagedUserLink" hidden>
+      <button id="import-existing-supervised-user-link" class="link-button"
+          i18n-content="importExistingSupervisedUserLink" hidden>
       </button>
       <div class="button-strip">
         <button id="create-profile-cancel" i18n-content="cancel"></button>