diff --git a/src/settings-ui/Settings.UI/Strings/en-us/Resources.resw b/src/settings-ui/Settings.UI/Strings/en-us/Resources.resw index 06e9d7b853..e9bcd424c9 100644 --- a/src/settings-ui/Settings.UI/Strings/en-us/Resources.resw +++ b/src/settings-ui/Settings.UI/Strings/en-us/Resources.resw @@ -229,7 +229,7 @@ It is not possible to use drag and drop while running PowerToys elevated. As a workaround, please restart PowerToys without elevation to edit the device layout. - Encryption Key + Encryption key Security key @@ -241,7 +241,7 @@ New key - Copy this PC name to the clipboard + Copy to clipboard Refresh connections @@ -250,7 +250,7 @@ Reestablishes connections with other devices if you are experiencing issues. - The local machine's host name is: + Host name of this device Connect @@ -301,9 +301,8 @@ Use Service - - Runs in service mode, that allows MWB to control remote machines when they're locked. Also allows control of system and administrator applications. + + Runs in service mode, that allows MWB to control remote machines when they're locked. Also allows control of system and administrator applications. Devices in a single row @@ -314,9 +313,8 @@ Wrap mouse - - Move control back to the first machine when mouse moves past the last one. + + Move control back to the first machine when mouse moves past the last one. Share clipboard @@ -354,52 +352,42 @@ This is accessible from the system tray and requires a restart. - - If share clipboard stops working, Ctrl+Alt+Del then Esc may solve the problem. + + If share clipboard stops working, Ctrl+Alt+Del then Esc may solve the problem. - - If a file (<100MB) is copied, it will be transferred to the remote machine clipboard. + + If a file (<100MB) is copied, it will be transferred to the remote machine clipboard. - - Hide the mouse cursor at the top edge of the screen when switching to other machine. This option also steals the focus from any full-screen app to ensure the keyboard input is redirected. + + Hide the mouse cursor at the top edge of the screen when switching to other machine. This option also steals the focus from any full-screen app to ensure the keyboard input is redirected. - - Mouse cursor may not be visible in Windows 10 and later versions of Windows when there is no physical mouse attached. + + Mouse cursor may not be visible in Windows 10 and later versions of Windows when there is no physical mouse attached. - - Reverse DNS lookup to validate machine IP Address. + + Reverse DNS lookup to validate machine IP Address. - - Only connect to machines in the same intranet NNN.NNN.*.* (only works when both machines have IPv4 enabled) + + Only connect to machines in the same intranet NNN.NNN.*.* (only works when both machines have IPv4 enabled) - - Prevent screen saver from starting on other machines when user is actively working on this machine. + + Prevent screen saver from starting on other machines when user is actively working on this machine. - - Use this option when remote machine's monitor settings are different, or remote machine has multiple monitors. + + Use this option when remote machine's monitor settings are different, or remote machine has multiple monitors. - - To avoid accident machine-switch at screen corners. + + To avoid accident machine-switch at screen corners. - - Show clipboard activities and network status in system tray notifications + + Show clipboard activities and network status in system tray notifications - Keyboard Shortcuts + Keyboard shortcuts keyboard is the hardware peripheral - Easy Mouse: Move between machines by moving the mouse pointer to the screen edges. + Easy Mouse: move between machines by moving the mouse pointer to the screen edges. Can also be set to move only when pressing Shift or Ctrl. @@ -2338,6 +2326,10 @@ From there, simply click on one of the supported files in the File Explorer and Learn more about Paste as Plain Text Paste as Plain Text is the name of the module. + + Learn more about Mouse Without Borders + Mouse Without Borders is the name of the module. + Learn more about File Explorer add-ons File Explorer is a product name, localize as Windows does @@ -3512,4 +3504,10 @@ Activate by holding the key for the character you want to add an accent to, then to preview the file that's currently selected in File Explorer. + + Device name + + + Security key + \ No newline at end of file diff --git a/src/settings-ui/Settings.UI/Views/MouseWithoutBordersPage.xaml b/src/settings-ui/Settings.UI/Views/MouseWithoutBordersPage.xaml index 3b5e947e78..62cfd18ca4 100644 --- a/src/settings-ui/Settings.UI/Views/MouseWithoutBordersPage.xaml +++ b/src/settings-ui/Settings.UI/Views/MouseWithoutBordersPage.xaml @@ -1,443 +1,413 @@ - + - + + x:Key="OneRowMatrixBoolToNumberOfRowsConverter" + FalseValue="2" + TrueValue="4" /> - + - - - + + + - + - + + x:Name="MouseWithoutBorders_ConnectSettings" + x:Uid="MouseWithoutBorders_SecurityKey" + HeaderIcon="{ui:FontIcon FontFamily={StaticResource SymbolThemeFontFamily}, + Glyph=}" + IsExpanded="{x:Bind Mode=TwoWay, Path=ViewModel.ConnectFieldsVisible}"> - - - - + + + - - - - - + + + + - + - - - + + + - + + + + + + + - - - + FontSize="32" + Glyph="" /> + + + + + - - + + + + + + - + - + + x:Uid="MouseWithoutBorders_UseService_ToggleSwitch" + IsEnabled="{x:Bind Mode=OneWay, Path=ViewModel.IsEnabled}" + IsOn="{x:Bind ViewModel.UseService, Mode=TwoWay}" /> - + x:Uid="MouseWithoutBorders_RunAsAdminText" + IsClosable="False" + IsOpen="{x:Bind Mode=OneWay, Path=ViewModel.CanToggleUseService, Converter={StaticResource BoolNegationConverter}}" + IsTabStop="True" + Severity="Informational" /> + + Command="{x:Bind ViewModel.UninstallServiceEventHandler}" + IsClickEnabled="{x:Bind Mode=OneWay, Path=ViewModel.CanUninstallService}" /> - + - + - - + + - + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - + - - - - - + + + + + - - - A - B - C - D - E - F - G - H - I - J - K - L - M - N - O - P - Q - R - S - T - U - V - W - X - Y - Z + + + A + B + C + D + E + F + G + H + I + J + K + L + M + N + O + P + Q + R + S + T + U + V + W + X + Y + Z - - - A - B - C - D - E - F - G - H - I - J - K - L - M - N - O - P - Q - R - S - T - U - V - W - X - Y - Z + + + A + B + C + D + E + F + G + H + I + J + K + L + M + N + O + P + Q + R + S + T + U + V + W + X + Y + Z - - - A - B - C - D - E - F - G - H - I - J - K - L - M - N - O - P - Q - R - S - T - U - V - W - X - Y - Z + + + A + B + C + D + E + F + G + H + I + J + K + L + M + N + O + P + Q + R + S + T + U + V + W + X + Y + Z - - - - A - B - C - D - E - F - G - H - I - J - K - L - M - N - O - P - Q - R - S - T - U - V - W - X - Y - Z + + + + A + B + C + D + E + F + G + H + I + J + K + L + M + N + O + P + Q + R + S + T + U + V + W + X + Y + Z - - + + - + - - + + - + Command="{x:Bind ViewModel.AddFirewallRuleEventHandler}" + IsClickEnabled="True" /> + + x:Uid="MouseWithoutBorders_ShowOriginalUI_ToggleSwitch" + IsEnabled="{x:Bind Mode=OneWay, Path=ViewModel.IsEnabled}" + IsOn="{x:Bind ViewModel.ShowOriginalUI, Mode=TwoWay}" /> - + - - + + diff --git a/src/settings-ui/Settings.UI/Views/PeekPage.xaml b/src/settings-ui/Settings.UI/Views/PeekPage.xaml index 7ba5a78af9..740a12cb81 100644 --- a/src/settings-ui/Settings.UI/Views/PeekPage.xaml +++ b/src/settings-ui/Settings.UI/Views/PeekPage.xaml @@ -10,7 +10,6 @@ AutomationProperties.LandmarkType="Main" mc:Ignorable="d"> - @@ -34,5 +33,8 @@ + + +