Updated translations.

NickeManarin · Jan 8, 2017 · a06031f · a06031f
1 parent 8bd309a
commit a06031f
Show file tree

Hide file tree

Showing 7 changed files with 1,203 additions and 807 deletions.
diff --git a/ScreenToGif/App.xaml b/ScreenToGif/App.xaml
@@ -343,6 +343,7 @@
             <!--Tooltip Style-->
             <Style TargetType="{x:Type ToolTip}">
                 <Setter Property="Foreground" Value="#FF5D5D5D"/>
+                <Setter Property="MinWidth" Value="20"/>
 
                 <Setter Property="Template">
                     <Setter.Value>
@@ -373,7 +374,7 @@
                                 <Border BorderBrush="#FFBEBEBE" BorderThickness="1" Effect="{DynamicResource Shadow.Border.Large}" Margin="5" Background="White" Padding="5">
                                     <!--<TextBlock Text="{TemplateBinding Content}" Foreground="#FF5D5D5D" Padding="5" TextWrapping="WrapWithOverflow" 
                                                    Width="Auto" HorizontalAlignment="Center" MinWidth="40" TextAlignment="Center" />-->
-                                    <ContentPresenter Content="{TemplateBinding Content}" Width="Auto" HorizontalAlignment="Center" MinWidth="40"/>
+                                    <ContentPresenter Content="{TemplateBinding Content}" Width="Auto" HorizontalAlignment="Center"/>
                                 </Border>
                             </Grid>
                         </ControlTemplate>

diff --git a/ScreenToGif/Readme.md b/ScreenToGif/Readme.md
@@ -13,8 +13,8 @@ Version 2.4:
 • Error messages are now more user-friendly.
 • You can now configure where the location of the logs folder.
 • The playback buttons are now disabled during the opening of a side panel.
-• Now it remembers the paste behavior (Clipboard > Paste behavior).
-• Updated Danish and Russian translations.
+• Now it remembers the clipboard paste behavior (Clipboard > Paste behavior).
+• Updated Danish, Chinese (simplified) and Russian translations.
 •
 
 Fixed:
@@ -25,6 +25,7 @@ Fixed:
 ♦ Clipboard list was not being cleared after resetting.
 ♦ Color picker: While returning to the initial color, the numbers were not replaced with the selected color.
 ♦ The validation of negative numbers for numeric inputs.
+♦ Error while pasting and undoing the paste of frames (quickly).
 
 Known bugs:
 

diff --git a/ScreenToGif/Resources/Localization/StringResources.de.xaml b/ScreenToGif/Resources/Localization/StringResources.de.xaml
diff --git a/ScreenToGif/Resources/Localization/StringResources.ru.xaml b/ScreenToGif/Resources/Localization/StringResources.ru.xaml
@@ -8,7 +8,7 @@
 
     <!--Основное-->
     <s:String x:Key="Ok">ОК</s:String>
-    <s:String x:Key="Back">Back</s:String>
+    <s:String x:Key="Back">Назад</s:String>
     <s:String x:Key="Cancel">Отмена</s:String>
     <s:String x:Key="Yes">Да</s:String>
     <s:String x:Key="No">Нет</s:String>

diff --git a/ScreenToGif/Resources/Localization/StringResources.zh-CN.xaml b/ScreenToGif/Resources/Localization/StringResources.zh-CN.xaml
diff --git a/ScreenToGif/Windows/Editor.xaml b/ScreenToGif/Windows/Editor.xaml
@@ -2365,7 +2365,7 @@
                                 </ComboBox>
 
                                 <Label Grid.Row="3" Grid.Column="0" Content="{DynamicResource Caption.Size}" VerticalAlignment="Center" Padding="0"/>
-                                <n:IntegerUpDown Grid.Row="3" Grid.Column="1" x:Name="TitleFrameFontSizeNumericUpDown" Minimum="10" Maximum="1000" Margin="10,5" MinWidth="70" 
+                                <n:IntegerUpDown Grid.Row="3" Grid.Column="1" x:Name="TitleFrameFontSizeNumericUpDown" Minimum="5" Maximum="200" Margin="10,5" MinWidth="70" 
                                                  Value="{Binding Source={x:Static u:UserSettings.All}, Path=TitleFrameFontSize}"/>
 
                                 <Label Grid.Row="4" Grid.Column="0" Content="{DynamicResource Caption.Color}" VerticalAlignment="Center" Padding="0"/>
@@ -2382,7 +2382,7 @@
                                 </Grid.ColumnDefinitions>
 
                                 <Label Grid.Column="0" Content="{DynamicResource String.DelayMs}" VerticalAlignment="Center" Padding="0"/>
-                                <n:IntegerUpDown Grid.Column="1" x:Name="TitleFrameDelayIntegerUpDown" Minimum="10" Maximum="1000" Margin="10,5" MinWidth="70" 
+                                <n:IntegerUpDown Grid.Column="1" x:Name="TitleFrameDelayIntegerUpDown" Minimum="10" Maximum="25500" Margin="10,5" MinWidth="70" 
                                                  Value="{Binding Source={x:Static u:UserSettings.All}, Path=TitleFrameDelay, Mode=TwoWay}"/>
                             </Grid>
 

diff --git a/ScreenToGif/Windows/Options.xaml b/ScreenToGif/Windows/Options.xaml
@@ -608,7 +608,7 @@
                         <n:ImageListBoxItem Image="{StaticResource France}" Tag="fr" Content="French" Author="Adrick"
                                             MaxSize="25" IsSelected="{Binding LanguageCode, ConverterParameter=fr, Converter={StaticResource TagToSelection}}"/>
 
-                        <n:ImageListBoxItem Image="{StaticResource Germany}" Tag="de" Content="German" Author="Michael Reukauff"
+                        <n:ImageListBoxItem Image="{StaticResource Germany}" Tag="de" Content="German" Author="Michael Reukauff, PeterK."
                                             MaxSize="25" IsSelected="{Binding LanguageCode, ConverterParameter=de, Converter={StaticResource TagToSelection}}"/>
 
                         <n:ImageListBoxItem Image="{StaticResource Italy}" Tag="it" Content="Italian" Author="Giovanni Rinaldin"