diff --git a/Application/FileConverter/FileConverter.csproj b/Application/FileConverter/FileConverter.csproj index d5903f9..69fcdbb 100644 --- a/Application/FileConverter/FileConverter.csproj +++ b/Application/FileConverter/FileConverter.csproj @@ -418,6 +418,9 @@ + + + copy /Y "$(SolutionDir)Middleware\ffmpeg\$(PlatformName)\ffmpeg.exe" "$(TargetDir)ffmpeg.exe" diff --git a/Application/FileConverter/Properties/Resources.Designer.cs b/Application/FileConverter/Properties/Resources.Designer.cs index 51db265..d357b63 100644 --- a/Application/FileConverter/Properties/Resources.Designer.cs +++ b/Application/FileConverter/Properties/Resources.Designer.cs @@ -360,9 +360,9 @@ namespace FileConverter.Properties { /// /// Looks up a localized string similar to Logs. /// - public static string DiagnosticsButtonTitle { + public static string DiagnosticsButtonTooltip { get { - return ResourceManager.GetString("DiagnosticsButtonTitle", resourceCulture); + return ResourceManager.GetString("DiagnosticsButtonTooltip", resourceCulture); } } @@ -1150,9 +1150,9 @@ namespace FileConverter.Properties { /// /// Looks up a localized string similar to Settings. /// - public static string SettingsButtonTitle { + public static string SettingsButtonTooltip { get { - return ResourceManager.GetString("SettingsButtonTitle", resourceCulture); + return ResourceManager.GetString("SettingsButtonTooltip", resourceCulture); } } diff --git a/Application/FileConverter/Properties/Resources.en.resx b/Application/FileConverter/Properties/Resources.en.resx index 62fef2d..2c35246 100644 --- a/Application/FileConverter/Properties/Resources.en.resx +++ b/Application/FileConverter/Properties/Resources.en.resx @@ -159,7 +159,7 @@ Logs - + Logs @@ -310,7 +310,7 @@ use maj for uppercase version File Converter Settings - + Settings diff --git a/Application/FileConverter/Properties/Resources.es-ES.resx b/Application/FileConverter/Properties/Resources.es-ES.resx index 8b9a824..c37383e 100644 --- a/Application/FileConverter/Properties/Resources.es-ES.resx +++ b/Application/FileConverter/Properties/Resources.es-ES.resx @@ -159,7 +159,7 @@ Registros - + Registros @@ -313,7 +313,7 @@ Use May para versión en mayúsculas Configuración - + Configuración diff --git a/Application/FileConverter/Properties/Resources.fr.resx b/Application/FileConverter/Properties/Resources.fr.resx index b5bab6d..4a172d5 100644 --- a/Application/FileConverter/Properties/Resources.fr.resx +++ b/Application/FileConverter/Properties/Resources.fr.resx @@ -161,7 +161,7 @@ Historique d'activité - + Historique d'activité @@ -321,7 +321,7 @@ utilisez maj pour une version en majuscules Configuration de File Converter - + Configuration diff --git a/Application/FileConverter/Properties/Resources.it-IT.resx b/Application/FileConverter/Properties/Resources.it-IT.resx index 0c5d87d..a74c6f5 100644 --- a/Application/FileConverter/Properties/Resources.it-IT.resx +++ b/Application/FileConverter/Properties/Resources.it-IT.resx @@ -173,7 +173,7 @@ Log Logs - + Log Logs @@ -389,7 +389,7 @@ use maj for uppercase version Impostazioni Settings - + Impostazioni Settings diff --git a/Application/FileConverter/Properties/Resources.pt-BR.resx b/Application/FileConverter/Properties/Resources.pt-BR.resx index 7f31f7c..8ac4866 100644 --- a/Application/FileConverter/Properties/Resources.pt-BR.resx +++ b/Application/FileConverter/Properties/Resources.pt-BR.resx @@ -159,7 +159,7 @@ Logs - + Logs @@ -313,7 +313,7 @@ Use maj para a versão em maiúsculas Configurações - + Configurações diff --git a/Application/FileConverter/Properties/Resources.pt.resx b/Application/FileConverter/Properties/Resources.pt.resx index fdf37c1..48fbb8f 100644 --- a/Application/FileConverter/Properties/Resources.pt.resx +++ b/Application/FileConverter/Properties/Resources.pt.resx @@ -159,7 +159,7 @@ Logs - + Logs @@ -313,7 +313,7 @@ Use maj para a versão em maiúsculas Definições - + Definições diff --git a/Application/FileConverter/Properties/Resources.resx b/Application/FileConverter/Properties/Resources.resx index 651787e..f02d00e 100644 --- a/Application/FileConverter/Properties/Resources.resx +++ b/Application/FileConverter/Properties/Resources.resx @@ -159,7 +159,7 @@ Logs - + Logs @@ -313,7 +313,7 @@ use maj for uppercase version Settings - + Settings diff --git a/Application/FileConverter/Resources/LogIcon.png b/Application/FileConverter/Resources/LogIcon.png new file mode 100644 index 0000000..65187dd Binary files /dev/null and b/Application/FileConverter/Resources/LogIcon.png differ diff --git a/Application/FileConverter/Views/DiagnosticsWindow.xaml b/Application/FileConverter/Views/DiagnosticsWindow.xaml index db0d73f..c6aad8b 100644 --- a/Application/FileConverter/Views/DiagnosticsWindow.xaml +++ b/Application/FileConverter/Views/DiagnosticsWindow.xaml @@ -21,10 +21,19 @@ - + -