Fixed licence displaying (line breaks)

This commit is contained in:
Tichau committed 2016-08-17 08:33:07 +02:00
1 parent 85b8eee165
commit 85d7a8ce23
5 files changed
+53 -19

No files matched your search

+23 -5
View File
@@ -646,11 +646,29 @@ namespace FileConverter.Properties {
}
/// <summary>
/// Looks up a localized string similar to **This program is free software**.\n You can redistribute it and/or modify it under the terms of the GNU General Public License.\n\nThis program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY. See the GNU General Public License (available in the installation folder: `LICENSE.md`) for more details.\n\n.
/// Looks up a localized string similar to **This program is free software**..
/// </summary>
public static string LicenceHeader {
public static string LicenceHeader1 {
get {
return ResourceManager.GetString("LicenceHeader", resourceCulture);
return ResourceManager.GetString("LicenceHeader1", resourceCulture);
}
}
/// <summary>
/// Looks up a localized string similar to You can redistribute it and/or modify it under the terms of the GNU General Public License..
/// </summary>
public static string LicenceHeader2 {
get {
return ResourceManager.GetString("LicenceHeader2", resourceCulture);
}
}
/// <summary>
/// Looks up a localized string similar to This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY. See the GNU General Public License (available in the installation folder: `LICENSE.md`) for more details..
/// </summary>
public static string LicenceHeader3 {
get {
return ResourceManager.GetString("LicenceHeader3", resourceCulture);
}
}
@@ -693,9 +711,9 @@ namespace FileConverter.Properties {
/// <summary>
/// Looks up a localized string similar to Constant bitrate encoding.
/// </summary>
public static string Mp3CbrDescrption {
public static string Mp3CbrDescription {
get {
return ResourceManager.GetString("Mp3CbrDescrption", resourceCulture);
return ResourceManager.GetString("Mp3CbrDescription", resourceCulture);
}
}
@@ -189,9 +189,6 @@
<data name="FileConverterStartHelp2" xml:space="preserve">
<value>That means it is integrated into the Windows explorer.</value>
</data>
<data name="FileConverterStartHelp3" xml:space="preserve">
<value>To use File Converter please open the explorer and right-click on any file you like to bring up the context menu where you will find File Converter commands (see the readme file to see the list of compatible file formats).</value>
</data>
<data name="FileNameTemplate" xml:space="preserve">
<value>File name template</value>
</data>
@@ -234,7 +231,7 @@
<data name="MoveUpSelectedPreset" xml:space="preserve">
<value>Move up selected preset</value>
</data>
<data name="Mp3CbrDescrption" xml:space="preserve">
<data name="Mp3CbrDescription" xml:space="preserve">
<value>Constant bitrate encoding</value>
</data>
<data name="Mp3VbrDescription" xml:space="preserve">
@@ -436,9 +433,6 @@ use maj for uppercase version</value>
<data name="DownloadingChangeLog" xml:space="preserve">
<value>###Downloading change log ...</value>
</data>
<data name="LicenceHeader" xml:space="preserve">
<value>**This program is free software**.\n You can redistribute it and/or modify it under the terms of the GNU General Public License.\n\nThis program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY. See the GNU General Public License (available in the installation folder: `LICENSE.md`) for more details.\n\n</value>
</data>
<data name="ConversionArchives" xml:space="preserve">
<value>Conversion Archives</value>
</data>
@@ -499,4 +493,16 @@ use maj for uppercase version</value>
<data name="StereoOption" xml:space="preserve">
<value>Stereo</value>
</data>
<data name="FileConverterStartHelp3" xml:space="preserve">
<value>To use File Converter please open the explorer and right-click on any file you like to bring up the context menu where you will find File Converter commands (see the online documentation to see the list of compatible file formats).</value>
</data>
<data name="LicenceHeader1" xml:space="preserve">
<value>**This program is free software**.</value>
</data>
<data name="LicenceHeader2" xml:space="preserve">
<value>You can redistribute it and/or modify it under the terms of the GNU General Public License.</value>
</data>
<data name="LicenceHeader3" xml:space="preserve">
<value>This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY. See the GNU General Public License (available in the installation folder: `LICENSE.md`) for more details.</value>
</data>
</root>
@@ -234,7 +234,7 @@
<data name="MoveUpSelectedPreset" xml:space="preserve">
<value>Move up selected preset</value>
</data>
<data name="Mp3CbrDescrption" xml:space="preserve">
<data name="Mp3CbrDescription" xml:space="preserve">
<value>Constant bitrate encoding</value>
</data>
<data name="Mp3VbrDescription" xml:space="preserve">
@@ -436,9 +436,6 @@ use maj for uppercase version</value>
<data name="DownloadingChangeLog" xml:space="preserve">
<value>###Downloading change log ...</value>
</data>
<data name="LicenceHeader" xml:space="preserve">
<value>**This program is free software**.\n You can redistribute it and/or modify it under the terms of the GNU General Public License.\n\nThis program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY. See the GNU General Public License (available in the installation folder: `LICENSE.md`) for more details.\n\n</value>
</data>
<data name="ConversionArchives" xml:space="preserve">
<value>Conversion Archives</value>
</data>
@@ -499,4 +496,13 @@ use maj for uppercase version</value>
<data name="StereoOption" xml:space="preserve">
<value>Stereo</value>
</data>
<data name="LicenceHeader1" xml:space="preserve">
<value>**This program is free software**.</value>
</data>
<data name="LicenceHeader2" xml:space="preserve">
<value>You can redistribute it and/or modify it under the terms of the GNU General Public License.</value>
</data>
<data name="LicenceHeader3" xml:space="preserve">
<value>This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY. See the GNU General Public License (available in the installation folder: `LICENSE.md`) for more details.</value>
</data>
</root>
@@ -180,7 +180,7 @@
<Label Grid.Row="0" Grid.Column="0" Content="{x:Static project:Resources.Encoding}" />
<DockPanel Grid.Row="0" Grid.Column="1">
<RadioButton x:Name="VBRradioButton" Content="VBR" ToolTip="{x:Static project:Resources.Mp3VbrDescription}" Margin="5" IsChecked="{Binding SelectedPreset.Settings, ConverterParameter=AudioEncodingMode|Mp3VBR, Converter={StaticResource ConversionSettingsEquals}, ElementName=window, Mode=TwoWay}" />
<RadioButton x:Name="CBRradioButton" Content="CBR" ToolTip="{x:Static project:Resources.Mp3CbrDescrption}" Margin="5" IsChecked="{Binding SelectedPreset.Settings, ConverterParameter=AudioEncodingMode|Mp3CBR, Converter={StaticResource ConversionSettingsEquals}, ElementName=window, Mode=TwoWay}"/>
<RadioButton x:Name="CBRradioButton" Content="CBR" ToolTip="{x:Static project:Resources.Mp3CbrDescription}" Margin="5" IsChecked="{Binding SelectedPreset.Settings, ConverterParameter=AudioEncodingMode|Mp3CBR, Converter={StaticResource ConversionSettingsEquals}, ElementName=window, Mode=TwoWay}"/>
</DockPanel>
<Label Grid.Row="1" Grid.Column="0" Content="{x:Static project:Resources.Quality}" />
@@ -191,8 +191,12 @@ namespace FileConverter
public string AboutSectionContent
{
get
{
return Properties.Resources.LicenceHeader + this.releaseNoteContent;
{
string content = Properties.Resources.LicenceHeader1 + "\n";
content += Properties.Resources.LicenceHeader2 + "\n\n";
content += Properties.Resources.LicenceHeader3 + "\n\n";
content += this.releaseNoteContent;
return content;
}
set