Merge pull request #1025 from microsoft/languageTweaks

Language tweaks for #937
microsoft · Dec 27, 2019 · 3244056 · 3244056
2 parents b2701ad + d41962f
commit 3244056
Show file tree

Hide file tree

Showing 4 changed files with 45 additions and 7 deletions.
diff --git a/src/settings-web/src/components/GeneralSettings.tsx b/src/settings-web/src/components/GeneralSettings.tsx
@@ -122,24 +122,24 @@ export class GeneralSettings extends React.Component <any, any> {
         <Separator />
         <Text variant='xLarge'>General</Text>
         <BoolToggleSettingsControl
-          setting={{display_name: 'Start at login', value: this.state.settings.general.startup}}
+          setting={{display_name: 'Run at Startup', value: this.state.settings.general.startup}}
           on_change={this.parent_on_change}
           ref={(input) => {this.startup_reference=input;}}
         />
         <BoolToggleSettingsControl
-          setting={{display_name: 'Run PowerToys with elevated privileges', value: this.state.settings.general.run_elevated}}
+          setting={{display_name: 'Always run as administrator', value: this.state.settings.general.run_elevated}}
           on_change={this.parent_on_change}
           ref={(input) => {this.elevated_reference=input;}}
         />
         <CustomActionSettingsControl
           setting={{
             display_name: '',
             value: this.state.settings.general.is_elevated ? 
-                   'PowerToys is currently running with elevated privileges. You can restart it to run non-elevated only for this session, without changing the default setting.' :
-                   'PowerToys is currently running without elevated privileges. You can restart it to run elevated only for this session, without changing the default setting.',
+                   'Running as administrator. Do you wish to run as user instead?' :
+                   'Running as user. Do you wish to run as administrator instead?',
             button_text: this.state.settings.general.is_elevated ? 
-                          'Restart without elevated privileges' :
-                          'Restart with elevated privileges'
+                          'Restart as user' :
+                          'Restart as administrator'
           }}
           action_name={'restart_elevation'}
           action_callback={(action_name: any, value:any) => {

diff --git a/src/settings/settings-html/200.html b/src/settings/settings-html/200.html
@@ -0,0 +1,25 @@
+<!DOCTYPE html>
+<html>
+  <head>
+    <script>
+      window.output_from_webview = function(arg) {
+        if (typeof (window.external) !== 'undefined' && ('notify' in window.external)) {
+          window.external.notify(arg);
+        }
+      }
+      function receive_from_settings_app(arg) {
+        window.react_app_component.receive_config_msg(JSON.parse(arg));
+        return '';
+      }
+      function exit_settings_app() {
+        window.react_app_component.receive_exit_request();
+        return '';
+      }
+    </script>
+    <title>PowerToys Settings</title>
+  </head>
+  <body>
+    <div id="app"></div>
+    <script src="dist/bundle.js" charset="UTF-8"></script>
+  </body>
+</html>
diff --git a/src/settings/settings-html/404.html b/src/settings/settings-html/404.html
diff --git a/src/settings/settings-html/dist/bundle.js b/src/settings/settings-html/dist/bundle.js