Free, open-source file converter. Convert 263 formats offline by drag & drop — images, PDF, Word, Excel, PowerPoint, HWP/HWPX, video, audio, e-books and archives. No upload, no Office needed.
C# audio-converteravaloniabatch-conversionconvertercsharpdocument-converterdocx-to-pdfdotnetdrag-and-dropfile-conversionfile-converterheic-converterhwphwpximage-converterlinuxmacospdf-convertervideo-converterwindows
Renumber #349's migration to 37; media tool strings for fr, zh-TW, ne
KnifeLemon352fe377bbba
diff --git a/src/Filee.App/Assets/i18n/fr.json b/src/Filee.App/Assets/i18n/fr.jsonindex 5790e61d..4e6bf707 100644--- a/src/Filee.App/Assets/i18n/fr.json+++ b/src/Filee.App/Assets/i18n/fr.json@@ -86,6 +86,7 @@"error.cannot_turn": "La rotation et le retournement ne s'appliquent qu'aux images","error.no_transparency": "Ce format n'a pas de transparence : il n'y a rien à rogner","error.too_many_frames": "Trop d'images à enregistrer, augmentez « Une image sur N »",+ "error.too_many_pictures": "Trop d'images pour une seule vidéo, répartissez-les en plusieurs","error.not_enough_space": "Pas assez d'espace disque libre pour les images","error.no_motion_photo": "Cette photo ne contient aucune vidéo lisible par Filee (une Motion Photo Android, ou une Live Photo d'iPhone avec son MOV à côté)","error.live_photo_start": "L'extrait commence après la fin de cette vidéo. Choisissez un « Début de l'extrait » plus tôt",@@ -227,6 +228,14 @@"preset.extract_motion": "Vidéo Live","preset.live_photo_iphone": "Live Photo (iPhone)","preset.motion_photo_android": "Motion Photo (Android)",+ "preset.compress_image": "Compresser l'image",+ "preset.compress_video": "Compresser la vidéo",+ "preset.video_from_images": "Vidéo à partir d'images",+ "preset.extract_audio": "Extraire l'audio",+ "preset.merge_videos": "Fusionner les vidéos",+ "preset.compress_audio": "Compresser l'audio",+ "preset.merge_audio": "Fusionner l'audio",+ "preset.remove_metadata": "Supprimer les métadonnées","format.folder": "Dossier","format.category.Image": "Image",@@ -496,6 +505,9 @@"presets.frame_estimate": "Une minute de vidéo à 30 i/s donne {0} images, au plus {1} par vidéo.","presets.extract_motion_photo": "Extraire la vidéo Live/Motion Photo","presets.extract_motion_photo_hint": "Une photo devient la vidéo enregistrée avec elle : celle contenue dans une Motion Photo Android, ou le MOV à côté d'une Live Photo d'iPhone.\nLes autres images deviennent une vidéo de l'image fixe.",+ "presets.slide_seconds": "Secondes par image",+ "presets.crossfade": "Fondu enchaîné entre les images",+ "presets.crossfade_hint": "Chaque image se fond dans la suivante en une seconde au lieu d'y passer d'un coup.","presets.group.live_photo": "Live / Motion Photo","presets.live_photo": "Une vidéo devient","presets.live_photo.None": "Une image fixe",diff --git a/src/Filee.App/Assets/i18n/ne.json b/src/Filee.App/Assets/i18n/ne.jsonindex 6fb452e5..7d4e72a6 100644--- a/src/Filee.App/Assets/i18n/ne.json+++ b/src/Filee.App/Assets/i18n/ne.json@@ -80,6 +80,7 @@"error.cannot_turn": "घुमाउने र उल्ट्याउने कार्य केवल छविहरूमा मात्र काम गर्छ","error.no_transparency": "यो ढाँचामा पारदर्शिता हुँदैन, त्यसैले काट्नुपर्ने केही छैन","error.too_many_frames": "छविका रूपमा सुरक्षित गर्न धेरै फ्रेमहरू छन्, \"प्रत्येक N-औं फ्रेम\" बढाउनुहोस्",+ "error.too_many_pictures": "एउटा भिडियोका लागि धेरै तस्बिरहरू छन्, तिनलाई केही भागमा बाँड्नुहोस्","error.not_enough_space": "छविहरूका लागि डिस्कमा पर्याप्त खाली ठाउँ छैन","error.no_motion_photo": "यस तस्बिरमा Filee ले पढ्न सक्ने कुनै भिडियो छैन (Android मोशन फोटो, वा छेउमा MOV भएको iPhone लाइभ फोटो)","error.live_photo_start": "क्लिप यस भिडियो सकिएपछि सुरु हुन्छ। पहिलेको \"क्लिप सुरु\" समय रोज्नुहोस्",@@ -217,6 +218,14 @@"preset.extract_motion": "लाइभ फोटो भिडियो निकाल्नुहोस्","preset.live_photo_iphone": "लाइभ फोटो (iPhone)","preset.motion_photo_android": "मोशन फोटो (Android)",+ "preset.compress_image": "छवि कम्प्रेस गर्नुहोस्",+ "preset.compress_video": "भिडियो कम्प्रेस गर्नुहोस्",+ "preset.video_from_images": "छविहरूबाट भिडियो",+ "preset.extract_audio": "अडियो निकाल्नुहोस्",+ "preset.merge_videos": "भिडियोहरू मर्ज गर्नुहोस्",+ "preset.compress_audio": "अडियो कम्प्रेस गर्नुहोस्",+ "preset.merge_audio": "अडियो मर्ज गर्नुहोस्",+ "preset.remove_metadata": "मेटाडाटा हटाउनुहोस्","format.folder": "फोल्डर","format.category.Image": "छवि","format.category.Pdf": "PDF",@@ -481,6 +490,9 @@"presets.frame_estimate": "३० fps को एक मिनेटको भिडियोबाट {0} तस्बिरहरू बन्छन्, प्रति भिडियो बढीमा {1}।","presets.extract_motion_photo": "लाइभ/मोशन फोटो भिडियो निकाल्नुहोस्","presets.extract_motion_photo_hint": "फोटो त्यसैसँग सुरक्षित गरिएको भिडियो बन्दछ: Android मोशन फोटो भित्रको, वा iPhone लाइभ फोटोको छेउमा रहेको MOV फाइल।\nअन्य तस्बिरहरू स्थिर तस्बिरको भिडियो बन्छन्।",+ "presets.slide_seconds": "प्रति तस्बिर सेकेन्ड",+ "presets.crossfade": "तस्बिरहरूबीच क्रसफेड",+ "presets.crossfade_hint": "प्रत्येक तस्बिर सिधै काटिनुको सट्टा एक सेकेन्डमा बिस्तारै अर्कोमा बदलिन्छ।","presets.group.live_photo": "लाइभ / मोशन फोटो","presets.live_photo": "भिडियो के बन्छ","presets.live_photo.None": "एउटा स्थिर फ्रेम",diff --git a/src/Filee.App/Assets/i18n/zh-TW.json b/src/Filee.App/Assets/i18n/zh-TW.jsonindex 377f5a37..7546206a 100644--- a/src/Filee.App/Assets/i18n/zh-TW.json+++ b/src/Filee.App/Assets/i18n/zh-TW.json@@ -86,6 +86,7 @@"error.cannot_turn": "只能旋轉和翻轉圖片","error.no_transparency": "此格式沒有透明部分,無需裁切","error.too_many_frames": "影格數太多,請調大「每 N 個影格」",+ "error.too_many_pictures": "圖片太多,無法放進同一部影片,請分成幾次","error.not_enough_space": "磁碟空間不足,無法儲存這些圖片","error.no_motion_photo": "這張照片中沒有可讀取的影片(Android 動態相片,或旁邊有 MOV 的 iPhone 原況照片)","error.live_photo_start": "片段開始位置在影片結束之後。請把「片段開始」設得更早",@@ -227,6 +228,14 @@"preset.extract_motion": "擷取原況/動態相片影片","preset.live_photo_iphone": "原況照片(iPhone)","preset.motion_photo_android": "動態相片(Android)",+ "preset.compress_image": "壓縮圖片",+ "preset.compress_video": "壓縮影片",+ "preset.video_from_images": "圖片製成影片",+ "preset.extract_audio": "擷取音訊",+ "preset.merge_videos": "合併影片",+ "preset.compress_audio": "壓縮音訊",+ "preset.merge_audio": "合併音訊",+ "preset.remove_metadata": "移除中繼資料","format.folder": "資料夾","format.category.Image": "圖片",@@ -496,6 +505,9 @@"presets.frame_estimate": "30 fps 的影片每分鐘產生 {0} 張圖片,每個影片最多 {1} 張。","presets.extract_motion_photo": "擷取原況/動態相片中的影片","presets.extract_motion_photo_hint": "取出與照片一起儲存的影片。Android 動態相片取其中內嵌的影片,iPhone 原況照片取旁邊同名的 MOV。\n其他圖片仍轉換為靜態畫面的影片。",+ "presets.slide_seconds": "每張圖片秒數",+ "presets.crossfade": "圖片之間交叉淡化",+ "presets.crossfade_hint": "每張圖片在一秒內漸變到下一張,而不是直接切換。","presets.group.live_photo": "原況/動態相片","presets.live_photo": "影片儲存為","presets.live_photo.None": "一張靜態畫面",diff --git a/src/Filee.Core/Presets/BuiltInData.cs b/src/Filee.Core/Presets/BuiltInData.csindex 45ac163f..539d8d56 100644--- a/src/Filee.Core/Presets/BuiltInData.cs+++ b/src/Filee.Core/Presets/BuiltInData.cs@@ -127,7 +127,7 @@ public static class BuiltInData];/// <summary>- /// Everyday tools (added in settings schema 33): smaller copies of images, videos and audio, a video of photos,+ /// Everyday tools (added in settings schema 37): smaller copies of images, videos and audio, a video of photos,/// a video's sound as M4A, videos or audio files joined into one, and a copy without metadata. On the back faces/// of the images, PDF, video and audio donuts where they have room./// </summary>diff --git a/src/Filee.Core/Settings/AppSettings.cs b/src/Filee.Core/Settings/AppSettings.csindex da7d09fd..abbde438 100644--- a/src/Filee.Core/Settings/AppSettings.cs+++ b/src/Filee.Core/Settings/AppSettings.cs@@ -112,7 +112,7 @@ public sealed class DonutSettingspublic sealed class AppSettings{/// <summary>Current schema version. Increase when the format changes and add a migration.</summary>- public const int CurrentSchemaVersion = 36;+ public const int CurrentSchemaVersion = 37;public int SchemaVersion { get; set; } = CurrentSchemaVersion;diff --git a/src/Filee.Core/Settings/UserDataStore.cs b/src/Filee.Core/Settings/UserDataStore.csindex 182f4814..a6b22665 100644--- a/src/Filee.Core/Settings/UserDataStore.cs+++ b/src/Filee.Core/Settings/UserDataStore.cs@@ -785,11 +785,11 @@ internal static class SettingsMigrationschanged |= LearnExtensions(profiles, out _, ["ics", "ical"]);changed |= AddCalendarPreset(presets, profiles);}- // v33: everyday tools (compress image / video / audio, video from images, extract audio, merge videos / audio,+ // v37: everyday tools (compress image / video / audio, video from images, extract audio, merge videos / audio,// remove metadata), after "Motion Photo (Android)" as in a new library, and on the back faces of the// built-in donuts before "One ZIP" where they have room and the user hasn't put them there already.// "Extract audio" replaces the plain M4A slice on the video donut's back.- if (from < 33)+ if (from < 37)changed |= AddMediaTools(presets, profiles);return changed;}@@ -816,8 +816,8 @@ internal static class SettingsMigrationsreturn changed;}- /// <summary>Where schema 33 offers its tools: (donut, presets for its back face).</summary>- private static readonly (string Profile, string[] Presets)[] Version33Offers =+ /// <summary>Where schema 37 offers its tools: (donut, presets for its back face).</summary>+ private static readonly (string Profile, string[] Presets)[] Version37Offers =[("images", ["compress-image", "remove-metadata"]),("pdf", ["remove-metadata"]),@@ -837,7 +837,7 @@ internal static class SettingsMigrationspresets.Insert(Math.Min(at++, presets.Count), tool);changed = true;}- foreach (var (profileId, ids) in Version33Offers)+ foreach (var (profileId, ids) in Version37Offers){if (profiles.FirstOrDefault(p => p.Id == profileId) is not { BackPresetIds: { } back } profile)continue;diff --git a/tests/Filee.App.Tests/DonutFlipTests.cs b/tests/Filee.App.Tests/DonutFlipTests.csindex 5f906bb9..fc27b259 100644--- a/tests/Filee.App.Tests/DonutFlipTests.cs+++ b/tests/Filee.App.Tests/DonutFlipTests.cs@@ -682,7 +682,7 @@ public class DonutFlipTestsRenderTests.Save(window, $"toolbar-back-face-{language}{(dark ? "-dark" : "")}.png");var back = ImageBack;- // The built-in back face is full (settings schema 33): a slice goes before another comes in.+ // The built-in back face is full (settings schema 37): a slice goes before another comes in.page.RemoveAt(page.SliceCount - 1);Assert.True(page.Insert("to-psd", 0));page.Move(0, 2);diff --git a/tests/Filee.Core.Tests/MediaToolTests.cs b/tests/Filee.Core.Tests/MediaToolTests.csindex 5f78c6c6..6bcbab38 100644--- a/tests/Filee.Core.Tests/MediaToolTests.cs+++ b/tests/Filee.Core.Tests/MediaToolTests.cs@@ -1,4 +1,4 @@-// The everyday media tools of settings schema 33: their presets, how existing libraries get them, and the queue+// The everyday media tools of settings schema 37: their presets, how existing libraries get them, and the queue// joining videos, audio files and pictures into one file.using Filee.Core.Conversion;@@ -74,13 +74,13 @@ public class MediaToolTests}[Fact]- public void Version_32_libraries_get_the_tools_and_back_faces_with_room_offer_them()+ public void Version_36_libraries_get_the_tools_and_back_faces_with_room_offer_them(){var presets = BuiltInData.CreatePresets().Where(p => !ToolIds.Contains(p.Id)).ToList();var profiles = BuiltInData.CreateProfiles();foreach (var profile in profiles)profile.BackPresetIds!.RemoveAll(ToolIds.Contains);- // The video donut's back face of schema 32, with the plain M4A slice.+ // The video donut's back face of schema 36, with the plain M4A slice.profiles.Single(p => p.Id == "video").BackPresetIds = ["mp4-av1", "to-webp", "extract-frames-png", "extract-frames-jpg","live-photo-iphone", "motion-photo-android", "to-m4a", "to-wav", "to-flac", "zip-all"];// A back face the user filled up stays as it is.@@ -89,7 +89,7 @@ public class MediaToolTestspdf.BackPresetIds.Insert(0, presets.First(p => !pdf.BackPresetIds.Contains(p.Id) && !pdf.PresetIds.Contains(p.Id)).Id);var full = pdf.BackPresetIds.ToList();- Assert.True(SettingsMigrations.ApplyToLibrary(32, presets, profiles));+ Assert.True(SettingsMigrations.ApplyToLibrary(36, presets, profiles));Assert.All(ToolIds, id => Assert.Single(presets, p => p.Id == id));var audio = profiles.Single(p => p.Id == "audio").BackPresetIds!;@@ -98,7 +98,7 @@ public class MediaToolTestsvar video = profiles.Single(p => p.Id == "video").BackPresetIds!;Assert.Equal(BuiltInData.CreateProfiles().Single(p => p.Id == "video").BackPresetIds, video);Assert.Equal(full, pdf.BackPresetIds);- Assert.False(SettingsMigrations.ApplyToLibrary(32, presets, profiles)); // once only+ Assert.False(SettingsMigrations.ApplyToLibrary(36, presets, profiles)); // once onlyAssert.False(SettingsMigrations.ApplyToLibrary(AppSettings.CurrentSchemaVersion, presets, profiles));}@@ -110,7 +110,7 @@ public class MediaToolTestsvar video = profiles.Single(p => p.Id == "video");video.BackPresetIds = ["mp4-av1", "to-wav", "zip-all"];- Assert.True(SettingsMigrations.ApplyToLibrary(32, presets, profiles));+ Assert.True(SettingsMigrations.ApplyToLibrary(36, presets, profiles));Assert.Equal(["mp4-av1", "to-wav", "compress-video", "merge-videos", "extract-audio", "zip-all"], video.BackPresetIds);}