From c99fbe54bd9d6faf875626cf29c47faf32e1de74 Mon Sep 17 00:00:00 2001 From: Niels Laute Date: Tue, 27 Oct 2020 15:48:15 +0100 Subject: [PATCH] Fix conflict --- .../Strings/en-us/Resources.resw | 783 +----------------- 1 file changed, 3 insertions(+), 780 deletions(-) diff --git a/src/core/Microsoft.PowerToys.Settings.UI/Strings/en-us/Resources.resw b/src/core/Microsoft.PowerToys.Settings.UI/Strings/en-us/Resources.resw index 160e386ea6..aa1d6a8402 100644 --- a/src/core/Microsoft.PowerToys.Settings.UI/Strings/en-us/Resources.resw +++ b/src/core/Microsoft.PowerToys.Settings.UI/Strings/en-us/Resources.resw @@ -336,783 +336,6 @@ Open zones editor - - Set Shortcut - - - Information Symbol - - - Launch zones editor - - - Make dragged window transparent - - - Use a non-primary mouse button to toggle zone activation - - - Move windows between zones across all monitors - - - Override Windows Snap shortcut (Win + Arrow) to move windows between zones - - - Hold Shift key to activate zones while dragging - - - Show zones on all monitors while dragging a window - - - Move newly created windows to their last known zone - - - Move newly created windows to the current active monitor (EXPERIMENTAL) - - - Follow mouse cursor instead of focus when launching editor in a multi screen environment - - - Zone behavior - - - Zone highlight color (Default: #0078D7) - - - During zone layout changes, windows assigned to a zone will match new size/positions - - - Give feedback - - - Module overview - - - Attribution - - - About PowerToys - - - PowerToys Icon - - - Check for updates - - - Privacy statement - - - Report a bug - - - Request a feature - - - Restart as administrator - - - Run at startup - - - A Windows Shell extension for more advanced bulk renaming using search and replace or regular expressions. - - - Shell integration - - - Enable PowerRename - - - Show icon on context menu - - - Appear only in extended context menu (Shift + Right-click) - - - Maximum number of items - - - Show values from last use - - - Enable Markdown (.md) preview - - - Enable SVG (.svg) preview - - - Enable SVG (.svg) thumbnails - - - These settings allow you to manage your Windows File Explorer custom preview handlers. - - - Autocomplete - - - Open-source notice - - - Enable autocomplete for the search and replace fields - - - Zone border color (Default: #FFFFFF) - - - Zone inactive color (Default: #F5FCFF) - - - Shows a help overlay with Windows shortcuts when the Windows key is pressed. - - - Press duration before showing (ms) - - - Appearance & behavior - - - Enable Shortcut Guide - - - Opacity of background - - - Image sizes - - - Lets you resize images by right-clicking. - - - Enable Image Resizer - - - Image Size - - - Configurations - - - Configuration Name - - - Fit Property - - - Width Property - - - Height Property - - - Size Property - - - Times Symbol - - - Remove - - - Image Resizer - - - Add size - - - Save sizes - - - JPEG quality level - - - PNG interlacing - - - TIFF compression - - - File - - - Default - - - CCITT3 - - - CCITT4 - - - Default - - - LZW - - - None - - - RLE - - - Zip - - - BMP encoder - - - GIF encoder - - - JPEG encoder - - - PNG encoder - - - TIFF encoder - - - WMPhoto encoder - - - Fill - - - Fit - - - Stretch - - - Centimeters - - - Inches - - - Percent - - - Pixels - - - Off - - - On - - - Learn more about administrator mode - - - Download updates automatically (Except on metered connections) - - - Currently running as administrator - - - Always run as administrator - - - Running as user - - - Running as administrator - - - About FancyZones - - - About File Explorer - - - File Explorer - - - About Image Resizer - - - About Keyboard Manager - - - About Color Picker - - - Color Picker - - - About PowerToys Run - - - PowerToys Run - - - About Power Rename - - - Power Rename - - - About Shortcut Guide - - - Shortcut Guide - - - GitHub repository - - - Updates - - - Version: - - - Background theme - - - Administrator mode - - - You need to run as administrator to use this setting - - - Only shortcuts with the following hotkeys are valid: - - - Restore the original size of windows when unsnapping - - - Fallback encoder - - - The following parameters can be used: - - - Filename format - - - Use original date modified - - - Encoding - - - Remap keys to other keys or shortcuts. - - - Remap shortcuts to other shortcuts or keys. Additionally, mappings can be targeted to specific applications as well. - - - Microsoft PowerToys is a set of utilities for power users to tune and streamline their Windows experience for greater productivity. - - - Allow zones to span across monitors (all monitors must have the same DPI scaling) - - - Actual height - - - Actual width - - - Original filename - - - Selected height - - - Selected width - - - Size name - - - Move windows based on their position - - - New update available - - - You have the latest available version. - - - Icon Preview - - - Preview Pane - - - You need to run as administrator to modify these settings - - - The settings on this page affect all users on the system - - - A reboot may be required for changes to these settings to take effect - - - Example: outlook.exe - - - Example: %1 (%2) - - - Choose a mode - - - Dark - - - Light - - - Windows default - - - Windows color settings - -======= - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - text/microsoft-resx - - - 2.0 - - - System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - Microsoft.PowerToys.Settings.UI - Application display name - - - Microsoft.PowerToys.Settings.UI - Application description - - - Main - Navigation view item name for Main - - - General - Navigation view item name for General - - - PowerToys Run - Navigation view item name for PowerToys Run - - - PowerRename - Navigation view item name for PowerRename - - - Shortcut Guide - Navigation view item name for Shortcut Guide - - - File Explorer - Navigation view item name for File Explorer Preview - - - FancyZones - Navigation view item name for FancyZones - - - Image Resizer - Navigation view item name for Image Resizer - - - Color Picker - Navigation view item name for Color Picker - - - Keyboard Manager - Navigation view item name for Keyboard Manager - - - Current configuration - Keyboard Manager current configuration header - - - Reconfigure your keyboard by remapping keys and shortcuts. - Keyboard Manager page description - - - Enable Keyboard Manager - Keyboard Manager enable toggle header - - - Select the profile to display the active key remap and shortcuts - Keyboard Manager configuration dropdown description - - - Remap a key - Keyboard Manager remap keyboard button content - - - Remap keys - Keyboard Manager remap keyboard header - - - Remap a shortcut - Keyboard Manager remap shortcuts button - - - Remap shortcuts - Keyboard Manager remap shortcuts header - - - Current Key Remappings - - - Current Shortcut Remappings - - - Key Remapping - - - Shortcut Remapping - - - Remapped to - - - Remapped to - - - For Target Application - - - Keyboard Manager - - - Quick and simple system-wide color picker. - - - Enable Color Picker - - - Change cursor when picking a color - - - Copied color representation - - - Open Color Picker - - - A quick launcher that has additional capabilities without sacrificing performance. - - - Enable PowerToys Run - - - Search & results - - - Search result preference - - - Most recently used - - - Alphabetical order - - - Running processes/open applications - - - Search type preference - - - Application name - - - A string that is contained in the application - - - Executable name - - - Maximum number of results - - - Shortcuts - - - Open PowerToys Run - - - Open file location - - - Copy path location - - - Open console - - - Override Win+R shortcut - - - Override Win+S shortcut - - - Ignore shortcuts in fullscreen mode - - - Disable drive detection warning for the indexer plugin - - - Clear the previous query on launch - - - To: - Keyboard Manager mapping keys view right header - - - About this feature - - - Appearance - - - FancyZones windows - - - Create window layouts to help make multi-tasking easy. - - - Keep windows in their zones when the screen resolution changes - - - Enable FancyZones - - - Excluded apps - - - To exclude an application from snapping to zones add its name here (one per line). These apps will react only to Windows Snap. - - - Zone highlight opacity - - - Open zones editor - Shortcut setting @@ -1200,6 +423,9 @@ Enable PowerRename + + Settings theme + Show icon on context menu @@ -1446,9 +672,6 @@ Version: - - Background theme - Administrator mode