Skip to content

LightCraft: An open-source non-destructive photo editor written by scratch in pure Rust

Merge PR #1834 (rebased)

Brandon Thomas11351ef141df
diff --cc crates/ui-egui/locales/cs-formats.json
index 387922e63,a784e3e79..8c3c97427
--- a/crates/ui-egui/locales/cs-formats.json
+++ b/crates/ui-egui/locales/cs-formats.json
@@@ -290,6 -290,8 +290,10 @@@
"“{to}” is already a person. Combining them makes one person; Undo separates them again.": "“{to}” is already a person. Combining them makes one person; Undo separates them again.",
"{what} merge added at {mp}: its full size, {full}, needs more memory than this computer has": "{what} merge added at {mp}: its full size, {full}, needs more memory than this computer has",
"{what} merge added at {mp}, the largest a panorama can be (its full size is {full})": "{what} merge added at {mp}, the largest a panorama can be (its full size is {full})",
+ "Color space: Rec. 2020 {curve} (HDR AVIF)": "Color space: Rec. 2020 {curve} (HDR AVIF)",
- "{n} selected photos · {pages} pages": "{n} selected photos · {pages} pages"
++ "{n} selected photos · {pages} pages": "{n} selected photos · {pages} pages",
+ "Already in “{}”": "Již v „{}“",
+ "Move {n} photo{} to “{}”": "Přesunout do „{1}“ fotografie: {n}{0:.0}",
+ "Move {n} photo{} to “{}”?": "Přesunout do „{1}“ fotografie: {n}{0:.0}?",
+ "Moved {n} photo{} to “{}”. Edit → Undo moves them back.": "Do „{1}“ přesunuto fotografií: {n}{0:.0}. Úpravy → Zpět je vrátí."
}
diff --cc crates/ui-egui/locales/de.json
index 8ca737315,a3fd18261..ee9678740
--- a/crates/ui-egui/locales/de.json
+++ b/crates/ui-egui/locales/de.json
@@@ -294,8 -292,13 +297,14 @@@
"Concrete Cool": "Kühler Beton",
"Confirm before deleting": "Vor dem Löschen bestätigen",
"Confirm before moving photos to Recently Deleted": "Vor dem Verschieben nach „Zuletzt gelöscht“ bestätigen",
+ "Move Photos": "Fotos verschieben",
+ "Their files and XMP sidecars move on disk. Edit → Undo moves them back.": "Ihre Dateien und XMP-Filialdateien werden auf dem Datenträger verschoben. Bearbeiten → Rückgängig holt sie zurück.",
+ "Don't ask again": "Nicht mehr fragen",
+ "Another library was opened since the photos were dropped: nothing was moved": "Seit dem Ablegen der Fotos wurde eine andere Bibliothek geöffnet: Es wurde nichts verschoben",
+ "Settings → Confirm before moving photos to another folder on disk turns it back on": "Einstellungen → „Vor dem Verschieben in einen anderen Ordner auf dem Datenträger bestätigen“ schaltet es wieder ein",
+ "Confirm before moving photos to another folder on disk": "Vor dem Verschieben in einen anderen Ordner auf dem Datenträger bestätigen",
"Constrain Crop": "Zuschnitt beschränken",
+ "Contact Sheet PDF": "Kontaktabzug-PDF",
"Continue": "Fortfahren",
"Continue Without Saving": "Ohne Speichern fortfahren",
"Contrast": "Kontrast",
diff --cc crates/ui-egui/locales/es.json
index 2b756319a,1723afe8e..482ecc706
--- a/crates/ui-egui/locales/es.json
+++ b/crates/ui-egui/locales/es.json
@@@ -283,8 -281,13 +286,14 @@@
"Concrete Cool": "Hormigón frío",
"Confirm before deleting": "Confirmar antes de eliminar",
"Confirm before moving photos to Recently Deleted": "Confirmar antes de mover fotos a Eliminadas recientemente",
+ "Move Photos": "Mover fotos",
+ "Their files and XMP sidecars move on disk. Edit → Undo moves them back.": "Sus archivos y archivos XMP auxiliares se mueven en el disco. Editar → Deshacer los devuelve.",
+ "Don't ask again": "No volver a preguntar",
+ "Another library was opened since the photos were dropped: nothing was moved": "Se abrió otra biblioteca después de soltar las fotos: no se movió nada",
+ "Settings → Confirm before moving photos to another folder on disk turns it back on": "Ajustes → Confirmar antes de mover fotos a otra carpeta del disco lo vuelve a activar",
+ "Confirm before moving photos to another folder on disk": "Confirmar antes de mover fotos a otra carpeta del disco",
"Constrain Crop": "Restringir recorte",
+ "Contact Sheet PDF": "PDF de hoja de contactos",
"Continue": "Continuar",
"Continue Without Saving": "Continuar sin guardar",
"Contrast": "Contraste",
diff --cc crates/ui-egui/locales/fr.json
index 16ab45a24,ffc450a1d..5defb1239
--- a/crates/ui-egui/locales/fr.json
+++ b/crates/ui-egui/locales/fr.json
@@@ -268,8 -266,13 +271,14 @@@
"Concrete Cool": "Béton froid",
"Confirm before deleting": "Confirmer avant de supprimer",
"Confirm before moving photos to Recently Deleted": "Confirmer avant de déplacer des photos vers Supprimées récemment",
+ "Move Photos": "Déplacer les photos",
+ "Their files and XMP sidecars move on disk. Edit → Undo moves them back.": "Leurs fichiers et fichiers annexes XMP sont déplacés sur le disque. Modifier → Annuler les remet en place.",
+ "Don't ask again": "Ne plus demander",
+ "Another library was opened since the photos were dropped: nothing was moved": "Une autre bibliothèque a été ouverte depuis le dépôt des photos : rien n’a été déplacé",
+ "Settings → Confirm before moving photos to another folder on disk turns it back on": "Réglages → Confirmer avant de déplacer des photos vers un autre dossier sur le disque le réactive",
+ "Confirm before moving photos to another folder on disk": "Confirmer avant de déplacer des photos vers un autre dossier sur le disque",
"Constrain Crop": "Contraindre le recadrage",
+ "Contact Sheet PDF": "Planche contact PDF",
"Continue": "Continuer",
"Continue Without Saving": "Continuer sans enregistrer",
"Contrast": "Contraste",
diff --cc crates/ui-egui/locales/ja.json
index 44a9225c7,440fed2ea..e17b03a5a
--- a/crates/ui-egui/locales/ja.json
+++ b/crates/ui-egui/locales/ja.json
@@@ -264,8 -262,13 +267,14 @@@
"Concrete Cool": "クールコンクリート",
"Confirm before deleting": "削除前に確認",
"Confirm before moving photos to Recently Deleted": "「最近削除した写真」に移動する前に確認",
+ "Move Photos": "写真を移動",
+ "Their files and XMP sidecars move on disk. Edit → Undo moves them back.": "ファイルと XMP サイドカーがディスク上で移動します。編集 → 取り消す で元に戻せます。",
+ "Don't ask again": "今後確認しない",
+ "Another library was opened since the photos were dropped: nothing was moved": "写真をドロップした後に別のライブラリが開かれました。何も移動していません",
+ "Settings → Confirm before moving photos to another folder on disk turns it back on": "設定 → 「ディスク上の別のフォルダに移動する前に確認」で元に戻せます",
+ "Confirm before moving photos to another folder on disk": "ディスク上の別のフォルダに移動する前に確認",
"Constrain Crop": "切り抜きを制限",
+ "Contact Sheet PDF": "コンタクトシート PDF",
"Continue": "続行",
"Contrast": "コントラスト",
"Contributors": "コントリビューター",
diff --cc crates/ui-egui/locales/pl-formats.json
index 7de52b85e,cd8a56dcf..1886098df
--- a/crates/ui-egui/locales/pl-formats.json
+++ b/crates/ui-egui/locales/pl-formats.json
@@@ -290,6 -290,8 +290,10 @@@
"“{to}” is already a person. Combining them makes one person; Undo separates them again.": "“{to}” is already a person. Combining them makes one person; Undo separates them again.",
"{what} merge added at {mp}: its full size, {full}, needs more memory than this computer has": "{what} merge added at {mp}: its full size, {full}, needs more memory than this computer has",
"{what} merge added at {mp}, the largest a panorama can be (its full size is {full})": "{what} merge added at {mp}, the largest a panorama can be (its full size is {full})",
+ "Color space: Rec. 2020 {curve} (HDR AVIF)": "Color space: Rec. 2020 {curve} (HDR AVIF)",
- "{n} selected photos · {pages} pages": "{n} selected photos · {pages} pages"
++ "{n} selected photos · {pages} pages": "{n} selected photos · {pages} pages",
+ "Already in “{}”": "Już w „{}”",
+ "Move {n} photo{} to “{}”": "Przenieś do „{1}” — zdjęcia: {n}{0:.0}",
+ "Move {n} photo{} to “{}”?": "Przenieść do „{1}” — zdjęcia: {n}{0:.0}?",
+ "Moved {n} photo{} to “{}”. Edit → Undo moves them back.": "Przeniesiono do „{1}” — zdjęcia: {n}{0:.0}. Edytuj → Cofnij przywróci je."
}
diff --cc crates/ui-egui/locales/pt-br.json
index 867372cc9,30dd80fc4..73ebd4040
--- a/crates/ui-egui/locales/pt-br.json
+++ b/crates/ui-egui/locales/pt-br.json
@@@ -276,8 -274,13 +279,14 @@@
"Concrete Cool": "Concreto frio",
"Confirm before deleting": "Confirmar antes de excluir",
"Confirm before moving photos to Recently Deleted": "Confirmar antes de mover as fotos para Excluídos recentemente",
+ "Move Photos": "Mover fotos",
+ "Their files and XMP sidecars move on disk. Edit → Undo moves them back.": "Os arquivos e os arquivos XMP auxiliares são movidos no disco. Editar → Desfazer os traz de volta.",
+ "Don't ask again": "Não perguntar novamente",
+ "Another library was opened since the photos were dropped: nothing was moved": "Outra biblioteca foi aberta depois que as fotos foram soltas: nada foi movido",
+ "Settings → Confirm before moving photos to another folder on disk turns it back on": "Ajustes → Confirmar antes de mover fotos para outra pasta no disco o reativa",
+ "Confirm before moving photos to another folder on disk": "Confirmar antes de mover fotos para outra pasta no disco",
"Constrain Crop": "Restringir recorte",
+ "Contact Sheet PDF": "Folha de contato em PDF",
"Continue": "Continuar",
"Continue Without Saving": "Continuar sem salvar",
"Contrast": "Contraste",
diff --cc crates/ui-egui/locales/ru.json
index 83809deec,0fcd94d4e..751ff6d25
--- a/crates/ui-egui/locales/ru.json
+++ b/crates/ui-egui/locales/ru.json
@@@ -227,8 -225,13 +230,14 @@@
"Concrete Cool": "Холодный бетон",
"Confirm before deleting": "Подтверждать удаление",
"Confirm before moving photos to Recently Deleted": "Подтверждать перемещение фото в «Недавно удалённые»",
+ "Move Photos": "Перемещение фото",
+ "Their files and XMP sidecars move on disk. Edit → Undo moves them back.": "Их файлы и XMP-файлы перемещаются на диске. Правка → Отменить вернёт их.",
+ "Don't ask again": "Больше не спрашивать",
+ "Another library was opened since the photos were dropped: nothing was moved": "После перетаскивания фото была открыта другая библиотека: ничего не перемещено",
+ "Settings → Confirm before moving photos to another folder on disk turns it back on": "Настройки → «Подтверждать перемещение фото в другую папку на диске» включает его снова",
+ "Confirm before moving photos to another folder on disk": "Подтверждать перемещение фото в другую папку на диске",
"Constrain Crop": "Ограничить кадрирование",
+ "Contact Sheet PDF": "PDF контактного листа",
"Continue Without Saving": "Продолжить без сохранения",
"Contrast": "Контрастность",
"Convert to DNG": "Преобразовать в DNG",
diff --cc crates/ui-egui/locales/zh-hans.json
index 9c0cbdc41,6e97c3cb1..9c0462cf3
--- a/crates/ui-egui/locales/zh-hans.json
+++ b/crates/ui-egui/locales/zh-hans.json
@@@ -274,8 -272,13 +277,14 @@@
"Concrete Cool": "冷调混凝土",
"Confirm before deleting": "删除前确认",
"Confirm before moving photos to Recently Deleted": "将照片移到“最近删除”前确认",
+ "Move Photos": "移动照片",
+ "Their files and XMP sidecars move on disk. Edit → Undo moves them back.": "它们的文件和 XMP 附属文件会在磁盘上移动。编辑 → 撤销 可移回。",
+ "Don't ask again": "不再询问",
+ "Another library was opened since the photos were dropped: nothing was moved": "拖放照片后打开了另一个图库:未移动任何内容",
+ "Settings → Confirm before moving photos to another folder on disk turns it back on": "设置 → “将照片移到磁盘上其他文件夹前确认”可重新开启",
+ "Confirm before moving photos to another folder on disk": "将照片移到磁盘上其他文件夹前确认",
"Constrain Crop": "限制裁剪",
+ "Contact Sheet PDF": "联系表 PDF",
"Continue": "继续",
"Continue Without Saving": "不保存继续",
"Contrast": "对比度",
diff --cc crates/ui-egui/locales/zh-hant.json
index 9d84d28fc,6d0322c61..8d5592bf5
--- a/crates/ui-egui/locales/zh-hant.json
+++ b/crates/ui-egui/locales/zh-hant.json
@@@ -274,8 -272,13 +277,14 @@@
"Concrete Cool": "冷調混凝土",
"Confirm before deleting": "刪除前確認",
"Confirm before moving photos to Recently Deleted": "將照片移至「最近刪除」前確認",
+ "Move Photos": "移動照片",
+ "Their files and XMP sidecars move on disk. Edit → Undo moves them back.": "它們的檔案和 XMP 附屬檔案會在磁碟上移動。編輯 → 復原 可移回。",
+ "Don't ask again": "不再詢問",
+ "Another library was opened since the photos were dropped: nothing was moved": "拖放照片後開啟了另一個圖庫:未移動任何內容",
+ "Settings → Confirm before moving photos to another folder on disk turns it back on": "設定 → 「將照片移至磁碟上其他資料夾前確認」可重新開啟",
+ "Confirm before moving photos to another folder on disk": "將照片移至磁碟上其他資料夾前確認",
"Constrain Crop": "限制裁切範圍",
+ "Contact Sheet PDF": "縮圖目錄 PDF",
"Continue": "繼續",
"Continue Without Saving": "繼續使用但不儲存",
"Contrast": "對比",
diff --cc crates/ui-egui/src/lib.rs
index be0996418,c57f8d7d9..d3d076e86
--- a/crates/ui-egui/src/lib.rs
+++ b/crates/ui-egui/src/lib.rs
@@@ -90,8 -79,8 +90,10 @@@ mod tests_error_kinds
#[cfg(test)]
mod tests_filmstrip;
#[cfg(test)]
+mod tests_focus_point;
+#[cfg(test)]
+ mod tests_folder_drop;
+ #[cfg(test)]
mod tests_grading;
#[cfg(test)]
mod tests_grid;