mirror/PowerToys
1
0
Fork 0
mirror of https://github.com/microsoft/PowerToys.git synced 2024-12-04 03:49:07 +08:00
Code Issues Actions 7 Packages Projects Releases Wiki Activity

Merge pull request #7983 from microsoft/dev/crutkas/madeWithLove

Browse Source 
added made with love
This commit is contained in:
Clint Rutkas 2020-11-11 12:49:52 -08:00 committed by GitHub
commit 56af486790
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 18 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/core/Microsoft.PowerToys.Settings.UI/Strings/en-us/Resources.resw
View File

@ -336,7 +336,7 @@
<value>Zone highlight opacity</value>
</data>
<data name="FancyZones_HotkeyEditorControl.Header" xml:space="preserve">
<value>Open layout editor</value>
<value>Open layout editor</value>
<comment>Shortcut to launch the FancyZones layout editor application</comment>
</data>
<data name="SettingsPage_SetShortcut.AutomationProperties.Name" xml:space="preserve">
@ -484,6 +484,7 @@
</data>
<data name="ShortcutGuide_PressTime.Header" xml:space="preserve">
<value>Press duration before showing (ms)</value>
<comment>pressing a key in milliseconds</comment>
</data>
<data name="ShortcutGuide_Appearance_Behavior.Text" xml:space="preserve">
<value>Appearance &amp; behavior</value>
@ -564,24 +565,29 @@
</data>
<data name="ImageResizer_ENCODER_TIFF_CCITT3.Content" xml:space="preserve">
<value>CCITT3</value>
<comment>do not loc</comment>
</data>
<data name="ImageResizer_ENCODER_TIFF_CCITT4.Content" xml:space="preserve">
<value>CCITT4</value>
<comment>do not loc</comment>
</data>
<data name="ImageResizer_ENCODER_TIFF_Default.Content" xml:space="preserve">
<value>Default</value>
</data>
<data name="ImageResizer_ENCODER_TIFF_LZW.Content" xml:space="preserve">
<value>LZW</value>
<comment>do not loc</comment>
</data>
<data name="ImageResizer_ENCODER_TIFF_None.Content" xml:space="preserve">
<value>None</value>
</data>
<data name="ImageResizer_ENCODER_TIFF_RLE.Content" xml:space="preserve">
<value>RLE</value>
<comment>do not loc</comment>
</data>
<data name="ImageResizer_ENCODER_TIFF_Zip.Content" xml:space="preserve">
<value>Zip</value>
<comment>do not loc</comment>
</data>
<data name="ImageResizer_FallbackEncoder_BMP.Content" xml:space="preserve">
<value>BMP encoder</value>
@ -708,6 +714,7 @@
</data>
<data name="ShortcutWarningLabel.Text" xml:space="preserve">
<value>Only shortcuts with the following hotkeys are valid:</value>
<comment>keyboard shortcuts and</comment>
</data>
<data name="FancyZones_RestoreSize.Content" xml:space="preserve">
<value>Restore the original size of windows when unsnapping</value>
@ -824,4 +831,7 @@
<value>Use Boost library (provides extended features but may use different regex syntax)</value>
<comment>Boost is a product name, should not be translated</comment>
</data>
<data name="MadeWithOssLove.Text" xml:space="preserve">
<value>Made with 💗 by Microsoft and the PowerToys community.</value>
</data>
</root>

13
src/core/Microsoft.PowerToys.Settings.UI/Views/GeneralPage.xaml
View File

@ -146,12 +146,13 @@
Width="{StaticResource SidePanelWidth}"
Grid.Column="1">
<StackPanel x:Name="DescriptionPanel">
<TextBlock x:Uid="GeneralPage_AboutPowerToysHeader" x:Name="AboutTitle" Grid.ColumnSpan="2"
Style="{StaticResource SettingsGroupTitleStyle}"
Margin="{StaticResource XSmallBottomMargin}"/>
<TextBlock x:Uid="About_PowerToys"
TextWrapping="Wrap"
Grid.Row="1" />
<TextBlock x:Uid="GeneralPage_AboutPowerToysHeader"
x:Name="AboutTitle"
Grid.ColumnSpan="2"
Style="{StaticResource SettingsGroupTitleStyle}"
Margin="{StaticResource XSmallBottomMargin}"/>
<TextBlock x:Uid="About_PowerToys" TextWrapping="Wrap" />
<TextBlock x:Uid="MadeWithOssLove" TextWrapping="Wrap" Margin="0, 10, 0, 0" />
</StackPanel>
<Border x:Name="AboutImage"