-
FFmpeg can be used to fix album art issues. Run the following command to remove album art data from a file:
-
ffmpeg -map 0:a -c:a copy -map_metadata -1 -i in.mp3 out.mp3
+
Вы можете использовать FFmpeg для исправления проблемных обложек. Выполните следующую команду для удаления обложки из файла:
+
ffmpeg -map 0:a -c:a copy -map_metadata -1 -i исходный.mp3 новый.mp3
where in.mp3 is the file path of the corrupted file and out.mp3 is the path to export the re-encoded file.
diff --git a/NickvisionTagger.Shared/Docs/yelp/cs/corrupted.page b/NickvisionTagger.Shared/Docs/yelp/cs/corrupted.page
index c705f63a..180963bf 100644
--- a/NickvisionTagger.Shared/Docs/yelp/cs/corrupted.page
+++ b/NickvisionTagger.Shared/Docs/yelp/cs/corrupted.page
@@ -23,7 +23,7 @@
Poškozené soubory
Tato stránka vysvětluje hudební soubory s poškozenými daty.
Pokud Označovač nedokáže přečíst soubor, bude ignorován a bude zobrazen dialog se seznamem poškozených souborů, které následně můžete spravovat a opravit.
-
This dialog will offer the option to have Tagger run the appropriate command to try and fix the corrupted file.
+
Tento dialog vám nabídne možnost nechat aplikaci spustit příslušný příkaz a pokusit se opravit poškozený soubor.
Neplatná data
Neplatná hlavička značky nebo nevyžádaná data v souboru mohou způsobit problémy při čtení informací o souboru a dokonce i problémy s přehráváním. Některé webové stránky přidávají do souborů další nevyžádaná data, která následně způsobují poškození.
@@ -37,11 +37,11 @@
- Invalid Album Art
- An invalid or corrupted embedded album art format can cause issues in displaying music files in Tagger.
+ Neplatný obal alba
+ Neplatný nebo poškozený formát vloženého obalu alba může způsobit problémy při zobrazování hudebních souborů v aplikaci Označovač.
- FFmpeg can be used to fix album art issues. Run the following command to remove album art data from a file:
- ffmpeg -map 0:a -c:a copy -map_metadata -1 -i in.mp3 out.mp3
+ Pro opravení problémů s obalem alba lze použít FFmpeg. Spusťte následující příkaz pro odebrání data o obalu alba ze souboru:
+ ffmpeg -map 0:a -c:a copy -map_metadata -1 -i vstup.mp3 vystup.mp3
kde je vstup.mp3 cesta k poškozenému souboru a výstup.mp3 cesta k exportovanému opětovně kódovanému souboru.
diff --git a/NickvisionTagger.Shared/Docs/yelp/es/corrupted.page b/NickvisionTagger.Shared/Docs/yelp/es/corrupted.page
index 284e7bd2..b1c575fd 100644
--- a/NickvisionTagger.Shared/Docs/yelp/es/corrupted.page
+++ b/NickvisionTagger.Shared/Docs/yelp/es/corrupted.page
@@ -23,7 +23,7 @@
Archivos dañados
En esta página se explican los archivos de música con datos dañados.
Si Tagger no puede leer un archivo, se ignorará y se mostrará un diálogo con una lista de los archivos dañados para que los gestione y corrija en consecuencia.
-
This dialog will offer the option to have Tagger run the appropriate command to try and fix the corrupted file.
+
Este cuadro de diálogo ofrecerá la opción de que Tagger ejecute el comando adecuado para intentar reparar el archivo dañado.
Datos no válidos
Un encabezado de etiqueta no válido o datos basura en un archivo pueden causar problemas al leer la información sobre un archivo e incluso causar problemas de reproducción. Algunas páginas web añaden datos basura a los archivos, lo que a su vez provoca su corrupción.
@@ -37,10 +37,10 @@
- Invalid Album Art
- An invalid or corrupted embedded album art format can cause issues in displaying music files in Tagger.
+ Carátula del álbum no válida
+ Un formato de carátula no válido o dañado puede causar problemas en la visualización de los archivos de música en Tagger.
- FFmpeg can be used to fix album art issues. Run the following command to remove album art data from a file:
+ FFmpeg puede utilizarse para solucionar problemas en las carátulas de los álbumes. Ejecute el siguiente comando para eliminar los datos de las carátulas de un archivo:
ffmpeg -map 0:a -c:a copy -map_metadata -1 -i in.mp3 out.mp3
donde in.mp3 es la ruta del archivo dañado y out.mp3 es la ruta para exportar el archivo recodificado.
diff --git a/NickvisionTagger.Shared/Docs/yelp/ru/corrupted.page b/NickvisionTagger.Shared/Docs/yelp/ru/corrupted.page
index d817b543..c3ad4a0b 100644
--- a/NickvisionTagger.Shared/Docs/yelp/ru/corrupted.page
+++ b/NickvisionTagger.Shared/Docs/yelp/ru/corrupted.page
@@ -29,7 +29,7 @@
Повреждённые файлы
This page explains music files with corrupted data.
If Tagger is unable to read a file, it will be ignored and a dialog will be displayed listing corrupted files for you to manage and fix accordingly.
-This dialog will offer the option to have Tagger run the appropriate command to try and fix the corrupted file.
+В этом окне будет предложена опция, при которой Tagger выполнит команду, которая, возможно, исправит повреждённый файл.
Invalid Data
An invalid tag header or junk data in a file can cause issues when reading information about a file and even cause playback issues. Some websites add extra junk data in files which in turn causes corruption.
@@ -43,11 +43,11 @@
- Invalid Album Art
- An invalid or corrupted embedded album art format can cause issues in displaying music files in Tagger.
+ Неправильное изображение обложки
+ Неправильное или повреждённое встроенное изображение обложки альбома может создавать проблемы при отображении музыки в Tagger.
- FFmpeg can be used to fix album art issues. Run the following command to remove album art data from a file:
- ffmpeg -map 0:a -c:a copy -map_metadata -1 -i in.mp3 out.mp3
+ Вы можете использовать FFmpeg для исправления проблемных обложек. Выполните следующую команду для удаления обложки из файла:
+ ffmpeg -map 0:a -c:a copy -map_metadata -1 -i исходный.mp3 новый.mp3
where in.mp3 is the file path of the corrupted file and out.mp3 is the path to export the re-encoded file.
diff --git a/NickvisionTagger.Shared/Models/MusicFile.cs b/NickvisionTagger.Shared/Models/MusicFile.cs
index 2ba8c7fe..3138e4c9 100644
--- a/NickvisionTagger.Shared/Models/MusicFile.cs
+++ b/NickvisionTagger.Shared/Models/MusicFile.cs
@@ -79,15 +79,15 @@ public class MusicFile : IComparable, IDisposable, IEquatable() { '"', '<', '>', ':', '\\', '/', '|', '?', '*' };
+ _invalidWindowsFilenameCharacters = new List() { '"', '<', '>', ':', '\\', '|', '?', '*' };
_invalidSystemFilenameCharacters = System.IO.Path.GetInvalidPathChars().Union(System.IO.Path.GetInvalidFileNameChars()).ToList();
if (RuntimeInformation.IsOSPlatform(OSPlatform.Windows))
{
_invalidSystemFilenameCharacters.Remove('\\');
}
- else if (RuntimeInformation.IsOSPlatform(OSPlatform.Linux))
+ else
{
- _invalidSystemFilenameCharacters.Remove('/');
+ _invalidSystemFilenameCharacters.Remove(System.IO.Path.DirectorySeparatorChar);
}
SortFilesBy = SortBy.Path;
LimitFilenameCharacters = false;
@@ -542,15 +542,15 @@ public bool SaveTagToDisk(bool preserveModificationTimestamp)
{
var newPath = $"{System.IO.Path.GetDirectoryName(Path)}{System.IO.Path.DirectorySeparatorChar}{Filename}";
Directory.CreateDirectory(System.IO.Path.GetDirectoryName(newPath)!);
- if(File.Exists(newPath))
- {
- newPath = newPath.Remove(newPath.IndexOf(_dotExtension)) + $" (1){_dotExtension}";
- }
- var i = 2;
- while (File.Exists(newPath))
+ if (File.Exists(newPath))
{
- newPath = newPath.Remove(newPath.IndexOf($" ({i - 1})")) + $" ({i}){_dotExtension}";
- i++;
+ newPath = newPath.Remove(newPath.IndexOf(_dotExtension));
+ var i = 1;
+ while (File.Exists($"{newPath} ({i}){_dotExtension}"))
+ {
+ i++;
+ }
+ newPath += $" ({i}){_dotExtension}";
}
File.Move(Path, newPath);
Path = newPath;
@@ -886,6 +886,7 @@ public bool TagToFilename(string formatString)
{
replace = PublishingDate == DateTime.MinValue ? "" : PublishingDate.ToShortDateString();
}
+ replace = replace.Replace(System.IO.Path.DirectorySeparatorChar, '_');
formatString = formatString.Replace(match.Value, replace);
}
else if (customProps.Contains(value))
diff --git a/NickvisionTagger.Shared/NickvisionTagger.Shared.csproj b/NickvisionTagger.Shared/NickvisionTagger.Shared.csproj
index 956dc41b..e9ba6156 100644
--- a/NickvisionTagger.Shared/NickvisionTagger.Shared.csproj
+++ b/NickvisionTagger.Shared/NickvisionTagger.Shared.csproj
@@ -23,7 +23,7 @@
\n"
"Language-Team: Czech \n"
"Language-Team: German \n"
-"Language-Team: Spanish \n"
"Language-Team: Finnish \n"
"Language-Team: French \n"
"Language-Team: Hebrew \n"
"Language-Team: Croatian \n"
"Language-Team: Italian \n"
"Language-Team: Dutch \n"
"Language-Team: Polish \n"
-"Language-Team: Russian \n"
"Language-Team: LANGUAGE \n"
@@ -134,7 +134,7 @@ msgstr ""
#: ../../../../NickvisionTagger.GNOME/Views/LyricsDialog.cs:241
#: ../../../../NickvisionTagger.GNOME/Views/MainWindow.cs:1161
#: ../../../../NickvisionTagger.WinUI/Views/LyricsDialog.xaml.cs:54
-#: ../../../../NickvisionTagger.WinUI/Views/LyricsDialog.xaml.cs:216
+#: ../../../../NickvisionTagger.WinUI/Views/LyricsDialog.xaml.cs:56
#: ../../../../NickvisionTagger.WinUI/Views/MainWindow.xaml.cs:145
#: ../../../../NickvisionTagger.WinUI/Views/MainWindow.xaml.cs:217
#: ../../../../NickvisionTagger.WinUI/Views/MainWindow.xaml.cs:1106
@@ -166,8 +166,8 @@ msgstr ""
#: ../../../Controllers/MainWindowController.cs:188
#: ../../../Controllers/MainWindowController.cs:1355
-#: ../../../Models/MusicFile.cs:81 ../../../Models/MusicFile.cs:701
-#: ../../../Models/MusicFile.cs:828
+#: ../../../Models/MusicFile.cs:81 ../../../Models/MusicFile.cs:707
+#: ../../../Models/MusicFile.cs:834
msgid "album"
msgstr ""
@@ -191,13 +191,13 @@ msgstr ""
#: ../../../Controllers/MainWindowController.cs:189
#: ../../../Controllers/MainWindowController.cs:1404
-#: ../../../Models/MusicFile.cs:81 ../../../Models/MusicFile.cs:729
-#: ../../../Models/MusicFile.cs:844
+#: ../../../Models/MusicFile.cs:81 ../../../Models/MusicFile.cs:735
+#: ../../../Models/MusicFile.cs:850
msgid "albumartist"
msgstr ""
#: ../../../../NickvisionTagger.WinUI/Controls/CreatePlaylistDialog.xaml.cs:101
-#: ../../../../NickvisionTagger.WinUI/Views/LyricsDialog.xaml.cs:298
+#: ../../../../NickvisionTagger.WinUI/Views/LyricsDialog.xaml.cs:296
#: ../../../../NickvisionTagger.WinUI/Views/MainWindow.xaml.cs:1067
msgid "All files"
msgstr ""
@@ -261,8 +261,8 @@ msgstr ""
#: ../../../Controllers/MainWindowController.cs:188
#: ../../../Controllers/MainWindowController.cs:1351
-#: ../../../Models/MusicFile.cs:81 ../../../Models/MusicFile.cs:697
-#: ../../../Models/MusicFile.cs:824
+#: ../../../Models/MusicFile.cs:81 ../../../Models/MusicFile.cs:703
+#: ../../../Models/MusicFile.cs:830
msgid "artist"
msgstr ""
@@ -299,15 +299,15 @@ msgstr ""
#: ../../../Controllers/MainWindowController.cs:190
#: ../../../Controllers/MainWindowController.cs:1416
-#: ../../../Models/MusicFile.cs:81 ../../../Models/MusicFile.cs:741
-#: ../../../Models/MusicFile.cs:856
+#: ../../../Models/MusicFile.cs:81 ../../../Models/MusicFile.cs:747
+#: ../../../Models/MusicFile.cs:862
msgid "beatsperminute"
msgstr ""
#: ../../../Controllers/MainWindowController.cs:190
#: ../../../Controllers/MainWindowController.cs:1416
-#: ../../../Models/MusicFile.cs:81 ../../../Models/MusicFile.cs:741
-#: ../../../Models/MusicFile.cs:856
+#: ../../../Models/MusicFile.cs:81 ../../../Models/MusicFile.cs:747
+#: ../../../Models/MusicFile.cs:862
msgid "bpm"
msgstr ""
@@ -334,7 +334,6 @@ msgstr ""
#: ../../../../NickvisionTagger.GNOME/Views/MainWindow.cs:1291
#: ../../../../NickvisionTagger.WinUI/Controls/CreatePlaylistDialog.xaml.cs:34
#: ../../../../NickvisionTagger.WinUI/Views/LyricsDialog.xaml.cs:41
-#: ../../../../NickvisionTagger.WinUI/Views/LyricsDialog.xaml.cs:216
#: ../../../../NickvisionTagger.WinUI/Views/MainWindow.xaml.cs:304
#: ../../../../NickvisionTagger.WinUI/Views/MainWindow.xaml.cs:578
#: ../../../../NickvisionTagger.WinUI/Views/MainWindow.xaml.cs:613
@@ -360,7 +359,7 @@ msgstr ""
msgid "Check for Updates"
msgstr ""
-#: ../../../../NickvisionTagger.WinUI/Views/LyricsDialog.xaml.cs:55
+#: ../../../../NickvisionTagger.WinUI/Views/LyricsDialog.xaml.cs:57
#: NickvisionTagger.GNOME/Blueprints/lyrics_dialog.blp:137
msgid "Clear All Lyrics"
msgstr ""
@@ -381,8 +380,8 @@ msgstr ""
#: ../../../Controllers/MainWindowController.cs:190
#: ../../../Controllers/MainWindowController.cs:1412
-#: ../../../Models/MusicFile.cs:81 ../../../Models/MusicFile.cs:737
-#: ../../../Models/MusicFile.cs:852
+#: ../../../Models/MusicFile.cs:81 ../../../Models/MusicFile.cs:743
+#: ../../../Models/MusicFile.cs:858
msgid "comment"
msgstr ""
@@ -393,8 +392,8 @@ msgstr ""
#: ../../../Controllers/MainWindowController.cs:191
#: ../../../Controllers/MainWindowController.cs:1431
-#: ../../../Models/MusicFile.cs:81 ../../../Models/MusicFile.cs:749
-#: ../../../Models/MusicFile.cs:860
+#: ../../../Models/MusicFile.cs:81 ../../../Models/MusicFile.cs:755
+#: ../../../Models/MusicFile.cs:866
msgid "composer"
msgstr ""
@@ -517,8 +516,8 @@ msgstr ""
#: ../../../Controllers/MainWindowController.cs:191
#: ../../../Controllers/MainWindowController.cs:1435
-#: ../../../Models/MusicFile.cs:81 ../../../Models/MusicFile.cs:753
-#: ../../../Models/MusicFile.cs:864
+#: ../../../Models/MusicFile.cs:81 ../../../Models/MusicFile.cs:759
+#: ../../../Models/MusicFile.cs:870
msgid "description"
msgstr ""
@@ -585,15 +584,15 @@ msgstr ""
#: ../../../Controllers/MainWindowController.cs:191
#: ../../../Controllers/MainWindowController.cs:1439
-#: ../../../Models/MusicFile.cs:81 ../../../Models/MusicFile.cs:757
-#: ../../../Models/MusicFile.cs:868
+#: ../../../Models/MusicFile.cs:81 ../../../Models/MusicFile.cs:763
+#: ../../../Models/MusicFile.cs:874
msgid "discnumber"
msgstr ""
#: ../../../Controllers/MainWindowController.cs:192
#: ../../../Controllers/MainWindowController.cs:1454
-#: ../../../Models/MusicFile.cs:81 ../../../Models/MusicFile.cs:765
-#: ../../../Models/MusicFile.cs:872
+#: ../../../Models/MusicFile.cs:81 ../../../Models/MusicFile.cs:771
+#: ../../../Models/MusicFile.cs:878
msgid "disctotal"
msgstr ""
@@ -754,13 +753,13 @@ msgstr ""
msgid "Error"
msgstr ""
-#: ../../../Models/MusicFile.cs:446 ../../../Models/MusicFile.cs:909
-#: ../../../Models/MusicFile.cs:1074
+#: ../../../Models/MusicFile.cs:447 ../../../Models/MusicFile.cs:919
+#: ../../../Models/MusicFile.cs:1084
msgid "ERROR"
msgstr ""
#: ../../../../NickvisionTagger.GNOME/Views/LyricsDialog.cs:279
-#: ../../../../NickvisionTagger.WinUI/Views/LyricsDialog.xaml.cs:259
+#: ../../../../NickvisionTagger.WinUI/Views/LyricsDialog.xaml.cs:257
msgid "Existing Lyrics"
msgstr ""
@@ -788,7 +787,7 @@ msgid "Export Front Album Art"
msgstr ""
#: ../../../../NickvisionTagger.GNOME/Views/LyricsDialog.cs:323
-#: ../../../../NickvisionTagger.WinUI/Views/LyricsDialog.xaml.cs:57
+#: ../../../../NickvisionTagger.WinUI/Views/LyricsDialog.xaml.cs:59
#: NickvisionTagger.GNOME/Blueprints/lyrics_dialog.blp:151
msgid "Export to LRC"
msgstr ""
@@ -802,7 +801,7 @@ msgid "Exported front album art to file successfully"
msgstr ""
#: ../../../../NickvisionTagger.GNOME/Views/LyricsDialog.cs:341
-#: ../../../../NickvisionTagger.WinUI/Views/LyricsDialog.xaml.cs:310
+#: ../../../../NickvisionTagger.WinUI/Views/LyricsDialog.xaml.cs:308
msgid "Exported successfully to: {0}"
msgstr ""
@@ -914,8 +913,8 @@ msgstr ""
#: ../../../Controllers/MainWindowController.cs:190
#: ../../../Controllers/MainWindowController.cs:1408
-#: ../../../Models/MusicFile.cs:81 ../../../Models/MusicFile.cs:733
-#: ../../../Models/MusicFile.cs:848
+#: ../../../Models/MusicFile.cs:81 ../../../Models/MusicFile.cs:739
+#: ../../../Models/MusicFile.cs:854
msgid "genre"
msgstr ""
@@ -966,7 +965,7 @@ msgid "Hide Extras Pane"
msgstr ""
#: ../../../../NickvisionTagger.GNOME/Views/LyricsDialog.cs:268
-#: ../../../../NickvisionTagger.WinUI/Views/LyricsDialog.xaml.cs:56
+#: ../../../../NickvisionTagger.WinUI/Views/LyricsDialog.xaml.cs:58
#: NickvisionTagger.GNOME/Blueprints/lyrics_dialog.blp:144
msgid "Import from LRC"
msgstr ""
@@ -1011,7 +1010,7 @@ msgid "Inserting album art..."
msgstr ""
#: ../../../../NickvisionTagger.GNOME/Views/LyricsDialog.cs:281
-#: ../../../../NickvisionTagger.WinUI/Views/LyricsDialog.xaml.cs:261
+#: ../../../../NickvisionTagger.WinUI/Views/LyricsDialog.xaml.cs:259
msgid "Keep Tagger's lyrics"
msgstr ""
@@ -1040,7 +1039,7 @@ msgstr[1] ""
msgid "Loading music files from library..."
msgstr ""
-#: ../../../Models/MusicFile.cs:81 ../../../Models/MusicFile.cs:816
+#: ../../../Models/MusicFile.cs:81 ../../../Models/MusicFile.cs:822
msgid "lyrics"
msgstr ""
@@ -1105,7 +1104,6 @@ msgid "New Custom Property"
msgstr ""
#: ../../../../NickvisionTagger.GNOME/Views/LyricsDialog.cs:241
-#: ../../../../NickvisionTagger.WinUI/Views/LyricsDialog.xaml.cs:216
msgid "New Synchronized Lyric"
msgstr ""
@@ -1328,8 +1326,8 @@ msgstr ""
#: ../../../Controllers/MainWindowController.cs:192
#: ../../../Controllers/MainWindowController.cs:1469
-#: ../../../Models/MusicFile.cs:81 ../../../Models/MusicFile.cs:773
-#: ../../../Models/MusicFile.cs:876
+#: ../../../Models/MusicFile.cs:81 ../../../Models/MusicFile.cs:779
+#: ../../../Models/MusicFile.cs:882
msgid "publisher"
msgstr ""
@@ -1345,8 +1343,8 @@ msgstr ""
#: ../../../Controllers/MainWindowController.cs:192
#: ../../../Controllers/MainWindowController.cs:1473
-#: ../../../Models/MusicFile.cs:81 ../../../Models/MusicFile.cs:777
-#: ../../../Models/MusicFile.cs:880
+#: ../../../Models/MusicFile.cs:81 ../../../Models/MusicFile.cs:783
+#: ../../../Models/MusicFile.cs:886
msgid "publishingdate"
msgstr ""
@@ -1387,6 +1385,7 @@ msgid "Remove from Playlist"
msgstr ""
#: ../../../../NickvisionTagger.GNOME/Views/LyricsDialog.cs:183
+#: ../../../../NickvisionTagger.WinUI/Controls/SyncLyricRow.xaml.cs:34
msgid "Remove Lyric"
msgstr ""
@@ -1578,14 +1577,14 @@ msgid "TiB"
msgstr ""
#: ../../../../NickvisionTagger.GNOME/Views/LyricsDialog.cs:241
-#: ../../../../NickvisionTagger.WinUI/Views/LyricsDialog.xaml.cs:216
+#: ../../../../NickvisionTagger.WinUI/Views/LyricsDialog.xaml.cs:55
msgid "Timestamp (hh:mm:ss or mm:ss.xx)"
msgstr ""
#: ../../../Controllers/MainWindowController.cs:188
#: ../../../Controllers/MainWindowController.cs:1347
-#: ../../../Models/MusicFile.cs:81 ../../../Models/MusicFile.cs:693
-#: ../../../Models/MusicFile.cs:820
+#: ../../../Models/MusicFile.cs:81 ../../../Models/MusicFile.cs:699
+#: ../../../Models/MusicFile.cs:826
msgid "title"
msgstr ""
@@ -1604,8 +1603,8 @@ msgstr ""
#: ../../../Controllers/MainWindowController.cs:189
#: ../../../Controllers/MainWindowController.cs:1374
-#: ../../../Models/MusicFile.cs:81 ../../../Models/MusicFile.cs:713
-#: ../../../Models/MusicFile.cs:836
+#: ../../../Models/MusicFile.cs:81 ../../../Models/MusicFile.cs:719
+#: ../../../Models/MusicFile.cs:842
msgid "track"
msgstr ""
@@ -1619,8 +1618,8 @@ msgstr ""
#: ../../../Controllers/MainWindowController.cs:189
#: ../../../Controllers/MainWindowController.cs:1389
-#: ../../../Models/MusicFile.cs:81 ../../../Models/MusicFile.cs:721
-#: ../../../Models/MusicFile.cs:840
+#: ../../../Models/MusicFile.cs:81 ../../../Models/MusicFile.cs:727
+#: ../../../Models/MusicFile.cs:846
msgid "tracktotal"
msgstr ""
@@ -1656,7 +1655,7 @@ msgid "Unable to download and install update."
msgstr ""
#: ../../../../NickvisionTagger.GNOME/Views/LyricsDialog.cs:345
-#: ../../../../NickvisionTagger.WinUI/Views/LyricsDialog.xaml.cs:316
+#: ../../../../NickvisionTagger.WinUI/Views/LyricsDialog.xaml.cs:314
msgid "Unable to export to LRC."
msgstr ""
@@ -1666,7 +1665,7 @@ msgid "Unable to fix file"
msgstr ""
#: ../../../../NickvisionTagger.GNOME/Views/LyricsDialog.cs:294
-#: ../../../../NickvisionTagger.WinUI/Views/LyricsDialog.xaml.cs:281
+#: ../../../../NickvisionTagger.WinUI/Views/LyricsDialog.xaml.cs:279
msgid "Unable to import from LRC."
msgstr ""
@@ -1706,7 +1705,7 @@ msgid "Update"
msgstr ""
#: ../../../../NickvisionTagger.GNOME/Views/LyricsDialog.cs:284
-#: ../../../../NickvisionTagger.WinUI/Views/LyricsDialog.xaml.cs:262
+#: ../../../../NickvisionTagger.WinUI/Views/LyricsDialog.xaml.cs:260
msgid "Use LRC's lyrics"
msgstr ""
@@ -1733,7 +1732,7 @@ msgid "Web Services"
msgstr ""
#: ../../../../NickvisionTagger.GNOME/Views/LyricsDialog.cs:279
-#: ../../../../NickvisionTagger.WinUI/Views/LyricsDialog.xaml.cs:260
+#: ../../../../NickvisionTagger.WinUI/Views/LyricsDialog.xaml.cs:258
msgid ""
"What would you like Tagger to do with lyrics found from the LRC file that "
"conflict with existing lyrics of the same timestamp?"
@@ -1761,8 +1760,8 @@ msgstr ""
#: ../../../Controllers/MainWindowController.cs:189
#: ../../../Controllers/MainWindowController.cs:1359
-#: ../../../Models/MusicFile.cs:81 ../../../Models/MusicFile.cs:705
-#: ../../../Models/MusicFile.cs:832
+#: ../../../Models/MusicFile.cs:81 ../../../Models/MusicFile.cs:711
+#: ../../../Models/MusicFile.cs:838
msgid "year"
msgstr ""
diff --git a/NickvisionTagger.Shared/Resources/po/tr.po b/NickvisionTagger.Shared/Resources/po/tr.po
index a941a8e5..99da9038 100644
--- a/NickvisionTagger.Shared/Resources/po/tr.po
+++ b/NickvisionTagger.Shared/Resources/po/tr.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2023-11-05 13:06-0500\n"
+"POT-Creation-Date: 2023-11-06 22:15-0500\n"
"PO-Revision-Date: 2023-10-23 03:05+0000\n"
"Last-Translator: Sabri Ünal \n"
"Language-Team: Turkish org.nickvision.tagger
-
+
- - Added the ability to specify ""/"" in a Tag to File Name format string to move files to a new directory when renaming files
- - Tagger now has the ability to fix corrupted file right from within the app
- - Tagger will now display files with corrupted album art as corrupted files
- - Fixed an issue where some custom properties for vorbis and wav files could not be removed
+ - On GNOME, fixed an issue where specifying the directory separator in Tag to File Name when Limit Filename Characters was enabled caused new directories to not be made
+ - On WinUI, improved the UX of the Lyrics dialog
- Updated translations (Thanks everyone on Weblate!)
diff --git a/NickvisionTagger.WinUI/App.xaml.cs b/NickvisionTagger.WinUI/App.xaml.cs
index a91afd0b..c580ce50 100644
--- a/NickvisionTagger.WinUI/App.xaml.cs
+++ b/NickvisionTagger.WinUI/App.xaml.cs
@@ -23,10 +23,7 @@ public App()
InitializeComponent();
_controller = new MainWindowController(Array.Empty());
_controller.AppInfo.Changelog =
- @"- Added the ability to specify ""\"" in a Tag to File Name format string to move files to a new directory when renaming files
-- Tagger now has the ability to fix corrupted file right from within the app
-- Tagger will now display files with corrupted album art as corrupted files
-- Fixed an issue where some custom properties for vorbis and wav files could not be removed
+ @"- Improved the UX of the Lyrics dialog
- Updated translations (Thanks everyone on Weblate!)";
if (_controller.Theme != Theme.System)
{
diff --git a/NickvisionTagger.WinUI/Controls/SyncLyricRow.xaml b/NickvisionTagger.WinUI/Controls/SyncLyricRow.xaml
index 4a89b96a..aa51bfb0 100644
--- a/NickvisionTagger.WinUI/Controls/SyncLyricRow.xaml
+++ b/NickvisionTagger.WinUI/Controls/SyncLyricRow.xaml
@@ -13,12 +13,6 @@
-
-
-
-
- /// Occurs when a lyric's text is applied
+ /// Occurs when a lyric's text is changed
///
- public event EventHandler? LyricApplied;
+ public event EventHandler? LyricChanged;
///
/// Occurs when a lyric is to be removed
///
@@ -29,6 +30,8 @@ public SyncLyricRow(SynchronizedLyricsEventArgs e)
InitializeComponent();
Card.Header = e.Timestamp.MillisecondsToTimecode();
TxtLyric.Text = e.Lyric;
+ //Localize Strings
+ ToolTipService.SetToolTip(BtnRemove, _("Remove Lyric"));
}
///
@@ -36,14 +39,7 @@ public SyncLyricRow(SynchronizedLyricsEventArgs e)
///
///
- /// Occurs when the apply button is clicked
- ///
- ///
/// Occurs when the remove button is clicked
diff --git a/NickvisionTagger.WinUI/Installer/InnoSetupScript.iss b/NickvisionTagger.WinUI/Installer/InnoSetupScript.iss
index da1c4470..72d5c755 100644
--- a/NickvisionTagger.WinUI/Installer/InnoSetupScript.iss
+++ b/NickvisionTagger.WinUI/Installer/InnoSetupScript.iss
@@ -3,7 +3,7 @@
#define MyAppName "Nickvision Tagger"
#define MyAppShortName "Tagger"
-#define MyAppVersion "2023.11.1"
+#define MyAppVersion "2023.11.2"
#define MyAppPublisher "Nickvision"
#define MyAppURL "https://nickvision.org"
#define MyAppExeName "NickvisionTagger.WinUI.exe"
@@ -33,13 +33,14 @@ SolidCompression=yes
WizardStyle=modern
PrivilegesRequired=admin
DirExistsWarning=no
+CloseApplications=force
[Code]
procedure SetupDotnet();
var
ResultCode: Integer;
begin
- if not Exec(ExpandConstant('{app}\deps\dotnet-runtime-7.0.11-win-x64.exe'), '/install /quiet /norestart', '', SW_SHOWNORMAL, ewWaitUntilTerminated, ResultCode)
+ if not Exec(ExpandConstant('{app}\deps\dotnet-runtime-7.0.11-win-x64.exe'), '/install /quiet /norestart', '', SW_HIDE, ewWaitUntilTerminated, ResultCode)
then
MsgBox('Unable to install .NET . Please try again', mbError, MB_OK);
end;
@@ -48,7 +49,7 @@ procedure SetupWinAppSDK();
var
ResultCode: Integer;
begin
- if not Exec(ExpandConstant('{app}\deps\WindowsAppRuntimeInstall-x64.exe'), '--quiet', '', SW_SHOWNORMAL, ewWaitUntilTerminated, ResultCode)
+ if not Exec(ExpandConstant('{app}\deps\WindowsAppRuntimeInstall-x64.exe'), '--quiet', '', SW_HIDE, ewWaitUntilTerminated, ResultCode)
then
MsgBox('Unable to install Windows App SDK. Please try again', mbError, MB_OK);
end;
diff --git a/NickvisionTagger.WinUI/NickvisionTagger.WinUI.csproj b/NickvisionTagger.WinUI/NickvisionTagger.WinUI.csproj
index d4512fd5..fddbe50d 100644
--- a/NickvisionTagger.WinUI/NickvisionTagger.WinUI.csproj
+++ b/NickvisionTagger.WinUI/NickvisionTagger.WinUI.csproj
@@ -32,7 +32,7 @@
+
-
+
+
+
+
+
+
+
+
diff --git a/NickvisionTagger.WinUI/Views/LyricsDialog.xaml.cs b/NickvisionTagger.WinUI/Views/LyricsDialog.xaml.cs
index 8671bcab..80c02455 100644
--- a/NickvisionTagger.WinUI/Views/LyricsDialog.xaml.cs
+++ b/NickvisionTagger.WinUI/Views/LyricsDialog.xaml.cs
@@ -52,6 +52,8 @@ public LyricsDialog(LyricsDialogController controller, Action initialize
ToolTipService.SetToolTip(BtnApplyOffset, _("Apply"));
LblEdit.Text = _("Edit");
LblBtnAddSyncLyric.Text = _("Add");
+ TxtAddSyncLyric.Header = _("Timestamp (hh:mm:ss or mm:ss.xx)");
+ BtnAddSyncLyricConfirm.Content = _("Add");
ToolTipService.SetToolTip(BtnClearAllSyncLyrics, _("Clear All Lyrics"));
ToolTipService.SetToolTip(BtnImportLRC, _("Import from LRC"));
ToolTipService.SetToolTip(BtnExportLRC, _("Export to LRC"));
@@ -121,7 +123,7 @@ private void CreateSyncRow(object? sender, SynchronizedLyricsEventArgs e)
if (!_syncRows.ContainsKey(e.Timestamp))
{
var row = new SyncLyricRow(e);
- row.LyricApplied += (s, ea) => _controller.SetSynchronizedLyric(e.Timestamp, ea);
+ row.LyricChanged += (s, ea) => _controller.SetSynchronizedLyric(e.Timestamp, ea);
row.LyricRemoved += (s, ea) => _controller.RemoveSynchronizedLyric(e.Timestamp);
ListSync.Children.Add(row);
_syncRows.Add(e.Timestamp, row);
@@ -206,29 +208,25 @@ private void ApplyOffset(object sender, RoutedEventArgs e)
}
}
+ ///
+ /// Occurs when TxtAddSyncLyric's text is changed
+ ///
+ ///
/// Occurs when the add sync lyric button is clicked
///
///
-
+