Skip to content

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

Merge PR #2685: #2685 e9b383978 LRC-LIB-CATALOG-IMPORT: ask whether a Lightroom catalog merges into th

francoisgn2fe910115373
diff --cc crates/ui-egui/locales/cs-formats.json
index 8c8ac8aa6,0edd5b2a2..1eb882f09
--- a/crates/ui-egui/locales/cs-formats.json
+++ b/crates/ui-egui/locales/cs-formats.json
@@@ -299,9 -298,6 +299,11 @@@
"Move {n} photo{} to “{}”?": "Přesunout do „{1}“ fotografie: {n}{0:.0}?",
"Listing folders — folders: {folders}, files: {files}": "Procházení složek – složky: {folders}, soubory: {files}",
"Moved {n} photo{} to “{}”. Edit → Undo moves them back.": "Do „{1}“ přesunuto fotografií: {n}{0:.0}. Úpravy → Zpět je vrátí.",
+ "Drop to review {n} item{} for import": "Pusťte pro kontrolu před importem (položek: {n}){:.0}",
+ "Drop to import {n} item{}": "Pusťte pro import (položek: {n}){:.0}",
+ "Drop to import {n} preset{}": "Pusťte pro import přednastavení: {n}{:.0}",
+ "Could not read {name}: {e}": "Soubor {name} se nepodařilo přečíst: {e}",
- "Added {n} photo{}": "Přidáno fotografií: {n}{:.0}"
++ "Added {n} photo{}": "Přidáno fotografií: {n}{:.0}",
+ "Where should the Lightroom catalog “{catalog}” go?": "Kam má jít katalog Lightroomu „{catalog}“?",
+ "Merge into the open library “{library}” ({count} photo{})": "Sloučit s otevřenou knihovnou „{library}“ (fotografie: {count}{:.0})"
}
diff --cc crates/ui-egui/locales/de-formats.json
index b8f958ba4,640e66bce..0aeb0720c
--- a/crates/ui-egui/locales/de-formats.json
+++ b/crates/ui-egui/locales/de-formats.json
@@@ -299,9 -298,6 +299,11 @@@
"Move {n} photo{} to “{}”?": "{n} Foto{0} nach „{1}“ verschieben?",
"Listing folders — folders: {folders}, files: {files}": "Ordner werden aufgelistet – Ordner: {folders}, Dateien: {files}",
"Moved {n} photo{} to “{}”. Edit → Undo moves them back.": "{n} Foto{0} nach „{1}“ verschoben. Bearbeiten → Rückgängig holt sie zurück.",
+ "Drop to review {n} item{} for import": "Ablegen, um vor dem Import zu prüfen (Objekte: {n}){:.0}",
+ "Drop to import {n} item{}": "Ablegen zum Importieren (Objekte: {n}){:.0}",
+ "Drop to import {n} preset{}": "Ablegen zum Importieren von Vorgaben: {n}{:.0}",
+ "Could not read {name}: {e}": "{name} konnte nicht gelesen werden: {e}",
- "Added {n} photo{}": "{n} Foto{} hinzugefügt"
++ "Added {n} photo{}": "{n} Foto{} hinzugefügt",
+ "Where should the Lightroom catalog “{catalog}” go?": "Wohin soll der Lightroom-Katalog „{catalog}“?",
+ "Merge into the open library “{library}” ({count} photo{})": "Mit der geöffneten Bibliothek „{library}“ zusammenführen ({count} Foto{})"
}
diff --cc crates/ui-egui/locales/es-formats.json
index f3db96856,e8e682940..33e5f52fc
--- a/crates/ui-egui/locales/es-formats.json
+++ b/crates/ui-egui/locales/es-formats.json
@@@ -299,9 -298,6 +299,11 @@@
"Move {n} photo{} to “{}”?": "¿Mover {n} foto{0} a “{1}”?",
"Listing folders — folders: {folders}, files: {files}": "Listando carpetas — carpetas: {folders}, archivos: {files}",
"Moved {n} photo{} to “{}”. Edit → Undo moves them back.": "{n} foto{0} movida{0} a “{1}”. Editar → Deshacer las devuelve.",
+ "Drop to review {n} item{} for import": "Suelta para revisar {n} elemento{} antes de importar",
+ "Drop to import {n} item{}": "Suelta para importar {n} elemento{}",
+ "Drop to import {n} preset{}": "Suelta para importar {n} ajuste{0} preestablecido{0}",
+ "Could not read {name}: {e}": "No se pudo leer {name}: {e}",
- "Added {n} photo{}": "{n} foto{0} añadida{0}"
++ "Added {n} photo{}": "{n} foto{0} añadida{0}",
+ "Where should the Lightroom catalog “{catalog}” go?": "¿Dónde debe ir el catálogo de Lightroom “{catalog}”?",
+ "Merge into the open library “{library}” ({count} photo{})": "Combinar con la biblioteca abierta “{library}” ({count} foto{})"
}
diff --cc crates/ui-egui/locales/fi-formats.json
index dc425bd98,eae511cd8..1daab3dab
--- a/crates/ui-egui/locales/fi-formats.json
+++ b/crates/ui-egui/locales/fi-formats.json
@@@ -299,9 -298,6 +299,11 @@@
"• {assumption}": "• {assumption}",
"… and {more} more": "… ja {more} lisää",
"…and {more} more": "…ja {more} lisää",
+ "Added {n} photo{}": "Lisättyjä kuvia: {n}{:.0}",
+ "Could not read {name}: {e}": "Tiedostoa {name} ei voitu lukea: {e}",
+ "Drop to import {n} item{}": "Pudota tuodaksesi (kohteita: {n}){:.0}",
+ "Drop to import {n} preset{}": "Pudota tuodaksesi esiasetuksia: {n}{:.0}",
- "Drop to review {n} item{} for import": "Pudota tarkistaaksesi ennen tuontia (kohteita: {n}){:.0}"
++ "Drop to review {n} item{} for import": "Pudota tarkistaaksesi ennen tuontia (kohteita: {n}){:.0}",
+ "Where should the Lightroom catalog “{catalog}” go?": "Minne Lightroom-luettelo ”{catalog}” tuodaan?",
+ "Merge into the open library “{library}” ({count} photo{})": "Yhdistä avoimeen kirjastoon ”{library}” (kuvia: {count}{:.0})"
}
diff --cc crates/ui-egui/locales/fr-formats.json
index 31dbe2d3a,58c91aa5c..294273781
--- a/crates/ui-egui/locales/fr-formats.json
+++ b/crates/ui-egui/locales/fr-formats.json
@@@ -298,10 -297,7 +298,12 @@@
"Move {n} photo{} to “{}”": "Déplacer {n} photo{} vers « {} »",
"Move {n} photo{} to “{}”?": "Déplacer {n} photo{} vers « {} » ?",
"Listing folders — folders: {folders}, files: {files}": "Liste des dossiers — dossiers : {folders}, fichiers : {files}",
- "Moved {n} photo{} to “{}”. Edit → Undo moves them back.": "{n} photo{} déplacée(s) vers « {} ». Modifier → Annuler les remet en place.",
+ "Moved {n} photo{} to “{}”. Edit → Undo moves them back.": "{n} photo{0} déplacée{0} vers « {1} ». Modifier → Annuler les remet en place.",
+ "Drop to review {n} item{} for import": "Déposez pour vérifier {n} élément{} avant l'import",
+ "Drop to import {n} item{}": "Déposez pour importer {n} élément{}",
+ "Drop to import {n} preset{}": "Déposez pour importer {n} préréglage{}",
+ "Could not read {name}: {e}": "Impossible de lire {name} : {e}",
- "Added {n} photo{}": "{n} photo{} ajoutée(s)"
++ "Added {n} photo{}": "{n} photo{} ajoutée(s)",
+ "Where should the Lightroom catalog “{catalog}” go?": "Où importer le catalogue Lightroom « {catalog} » ?",
+ "Merge into the open library “{library}” ({count} photo{})": "Fusionner avec la bibliothèque ouverte « {library} » ({count} photo{})"
}
diff --cc crates/ui-egui/locales/fr.json
index fc850ee9e,5b05dc9cf..07624dde9
--- a/crates/ui-egui/locales/fr.json
+++ b/crates/ui-egui/locales/fr.json
@@@ -2340,16 -2341,16 +2340,28 @@@
"CPU": "Processeur",
"A face model uses the GPU only when a check shows it gives the same results faster.": "Un modèle de visages n’utilise le GPU que si une vérification montre qu’il donne les mêmes résultats plus vite.",
"Checking the GPU for faces": "Vérification du GPU pour les visages",
+ "Layout Image": "Image de mise en page",
+ "Detail View": "Vue de détail",
+ "Edit Panel": "Panneau Modifier",
+ "Close the open dialog, then drop the files again": "Fermez la boîte de dialogue ouverte, puis déposez à nouveau les fichiers",
+ "Close the open dialog to drop files here": "Fermez la boîte de dialogue ouverte pour déposer des fichiers ici",
+ "Drop to open the face model": "Déposez pour ouvrir le modèle de visages",
+ "Drop to import": "Déposez pour importer",
+ "Dropped Files": "Fichiers déposés",
+ "Import dropped files without review": "Importer les fichiers déposés sans vérification",
+ "An import is running": "Une importation est en cours",
+ "An import is running. Drop photos when it has finished": "Une importation est en cours. Déposez les photos quand elle sera terminée",
- "Finish Lightroom catalog import before adding photos": "Terminez l'importation du catalogue Lightroom avant d'ajouter des photos"
++ "Finish Lightroom catalog import before adding photos": "Terminez l'importation du catalogue Lightroom avant d'ajouter des photos",
+ "The library is empty: the catalog's photos, collections and edits become its first.": "La bibliothèque est vide : les photos, collections et retouches du catalogue seront les premières.",
+ "The catalog's photos, collections and edits join the ones already in this library.": "Les photos, collections et retouches du catalogue rejoignent celles déjà présentes dans cette bibliothèque.",
+ "Create a new library": "Créer une nouvelle bibliothèque",
+ "LightCraft opens the new library, then imports the catalog into it. Its folder must be new or empty.": "LightCraft ouvre la nouvelle bibliothèque, puis y importe le catalogue. Son dossier doit être nouveau ou vide.",
+ "Don't ask again (always merge into the open library)": "Ne plus demander (toujours fusionner avec la bibliothèque ouverte)",
+ "To be asked again: Settings → General → When importing a Lightroom catalog.": "Pour que la question revienne : Réglages → Général → À l’importation d’un catalogue Lightroom.",
+ "Create Library and Import": "Créer la bibliothèque et importer",
+ "Another library was opened since this window appeared: nothing was imported": "Une autre bibliothèque a été ouverte depuis l’apparition de cette fenêtre : rien n’a été importé",
+ "When importing a Lightroom catalog": "À l’importation d’un catalogue Lightroom",
+ "Ask where to import it": "Demander où l’importer",
+ "Always merge into the open library": "Toujours fusionner avec la bibliothèque ouverte",
+ "The import reads the catalog without changing it. Next, choose whether its photos, edits, keywords and collections join the library open now or go into a new library.": "L’importation lit le catalogue sans le modifier. Ensuite, choisissez si ses photos, retouches, mots-clés et collections rejoignent la bibliothèque ouverte ou une nouvelle bibliothèque."
}
diff --cc crates/ui-egui/locales/id-formats.json
index 45073d5d2,8af0670bf..7fc325522
--- a/crates/ui-egui/locales/id-formats.json
+++ b/crates/ui-egui/locales/id-formats.json
@@@ -298,10 -298,6 +298,12 @@@
"{what} merge added at {mp}, the largest a panorama can be (its full size is {full})": "Hasil penggabungan {what} ditambahkan dengan resolusi {mp}, resolusi maksimum untuk panorama (resolusi penuhnya {full})",
"{skipped} catalog images were not imported because their records in the catalog are incomplete.": "{skipped} catalog images were not imported because their records in the catalog are incomplete.",
"Listing folders — folders: {folders}, files: {files}": "Listing folders — folders: {folders}, files: {files}",
+ "Added {n} photo{}": "{n} foto ditambahkan{:.0}",
+ "Could not read {name}: {e}": "Tidak dapat membaca {name}: {e}",
+ "Drop to import {n} item{}": "Jatuhkan untuk mengimpor {n} item{:.0}",
+ "Drop to import {n} preset{}": "Jatuhkan untuk mengimpor {n} preset{:.0}",
+ "Drop to review {n} item{} for import": "Jatuhkan untuk meninjau {n} item sebelum impor{:.0}",
- "Inside: {names}": "Di dalam: {names}"
++ "Inside: {names}": "Di dalam: {names}",
+ "Where should the Lightroom catalog “{catalog}” go?": "Ke mana katalog Lightroom “{catalog}” diimpor?",
+ "Merge into the open library “{library}” ({count} photo{})": "Gabungkan ke pustaka yang terbuka “{library}” ({count} foto{:.0})"
}
diff --cc crates/ui-egui/locales/it-formats.json
index ae08bdd88,21fed49aa..7efae90e9
--- a/crates/ui-egui/locales/it-formats.json
+++ b/crates/ui-egui/locales/it-formats.json
@@@ -299,9 -298,6 +299,11 @@@
"Move {n} photo{} to “{}”?": "Spostare le foto in “{1}” ({n})?{0:.0}",
"Moved {n} photo{} to “{}”. Edit → Undo moves them back.": "Foto spostate in “{1}”: {n}{0:.0}. Modifica → Annulla le riporta indietro.",
"Listing folders — folders: {folders}, files: {files}": "Elenco delle cartelle — cartelle: {folders}, file: {files}",
+ "Drop to review {n} item{} for import": "Rilascia per rivedere prima dell'importazione (elementi: {n}){:.0}",
+ "Drop to import {n} item{}": "Rilascia per importare (elementi: {n}){:.0}",
+ "Drop to import {n} preset{}": "Rilascia per importare predefiniti: {n}{:.0}",
+ "Could not read {name}: {e}": "Impossibile leggere {name}: {e}",
- "Added {n} photo{}": "Foto aggiunte: {n}{:.0}"
++ "Added {n} photo{}": "Foto aggiunte: {n}{:.0}",
+ "Where should the Lightroom catalog “{catalog}” go?": "Dove importare il catalogo Lightroom “{catalog}”?",
+ "Merge into the open library “{library}” ({count} photo{})": "Unisci alla libreria aperta “{library}” (foto: {count}{:.0})"
}
diff --cc crates/ui-egui/locales/ja-formats.json
index 10e35ab3d,0f38bfc9b..99c14bf16
--- a/crates/ui-egui/locales/ja-formats.json
+++ b/crates/ui-egui/locales/ja-formats.json
@@@ -299,9 -298,6 +299,11 @@@
"{what} merge added at {mp}: its full size, {full}, needs more memory than this computer has": "{what}合成を{mp}で追加しました:フルサイズ({full})にはこのコンピューターのメモリが足りません",
"Listing folders — folders: {folders}, files: {files}": "フォルダーを一覧中 — フォルダー:{folders}、ファイル:{files}",
"{what} merge added at {mp}, the largest a panorama can be (its full size is {full})": "{what}合成を{mp}で追加しました。パノラマの最大サイズです(フルサイズ:{full})",
+ "Drop to review {n} item{} for import": "ドロップして {n} 件を確認してから読み込み{:.0}",
+ "Drop to import {n} item{}": "ドロップして {n} 件を読み込み{:.0}",
+ "Drop to import {n} preset{}": "ドロップして {n} 件のプリセットを読み込み{:.0}",
+ "Could not read {name}: {e}": "{name} を読み取れませんでした: {e}",
- "Added {n} photo{}": "{n}枚を追加しました{:.0}"
++ "Added {n} photo{}": "{n}枚を追加しました{:.0}",
+ "Where should the Lightroom catalog “{catalog}” go?": "Lightroom カタログ「{catalog}」をどこに読み込みますか?",
+ "Merge into the open library “{library}” ({count} photo{})": "開いているライブラリ「{library}」に統合(写真{count}枚){:.0}"
}
diff --cc crates/ui-egui/locales/ka-formats.json
index ee6028621,cc3419a2f..460368261
--- a/crates/ui-egui/locales/ka-formats.json
+++ b/crates/ui-egui/locales/ka-formats.json
@@@ -299,9 -298,6 +299,11 @@@
"Move {n} photo{} to “{}”?": "Move {n} photo{} to “{}”?",
"Listing folders — folders: {folders}, files: {files}": "საქაღალდეების ჩამოთვლა — საქაღალდეები: {folders}, ფაილები: {files}",
"Moved {n} photo{} to “{}”. Edit → Undo moves them back.": "Moved {n} photo{} to “{}”. Edit → Undo moves them back.",
+ "Drop to review {n} item{} for import": "ჩააგდეთ იმპორტამდე გადასახედად (ელემენტები: {n}){:.0}",
+ "Drop to import {n} item{}": "ჩააგდეთ იმპორტისთვის (ელემენტები: {n}){:.0}",
+ "Drop to import {n} preset{}": "ჩააგდეთ პრესეტების იმპორტისთვის: {n}{:.0}",
+ "Could not read {name}: {e}": "ვერ წაიკითხა {name}: {e}",
- "Added {n} photo{}": "დაემატა ფოტო: {n}{:.0}"
++ "Added {n} photo{}": "დაემატა ფოტო: {n}{:.0}",
+ "Where should the Lightroom catalog “{catalog}” go?": "სად გადავიტანოთ Lightroom-ის კატალოგი „{catalog}“?",
+ "Merge into the open library “{library}” ({count} photo{})": "გაერთიანება ღია ბიბლიოთეკასთან „{library}“ (ფოტოები: {count}){:.0}"
}
diff --cc crates/ui-egui/locales/pl-formats.json
index 6fc26d90e,03c8a805a..20c7f840d
--- a/crates/ui-egui/locales/pl-formats.json
+++ b/crates/ui-egui/locales/pl-formats.json
@@@ -298,10 -298,6 +298,12 @@@
"Move {n} photo{} to “{}”?": "Przenieść do „{1}” — zdjęcia: {n}{0:.0}?",
"Listing folders — folders: {folders}, files: {files}": "Przeglądanie folderów — foldery: {folders}, pliki: {files}",
"Moved {n} photo{} to “{}”. Edit → Undo moves them back.": "Przeniesiono do „{1}” — zdjęcia: {n}{0:.0}. Edytuj → Cofnij przywróci je.",
+ "Drop to review {n} item{} for import": "Upuść, aby przejrzeć przed importem (elementy: {n}){:.0}",
+ "Drop to import {n} item{}": "Upuść, aby zaimportować (elementy: {n}){:.0}",
+ "Drop to import {n} preset{}": "Upuść, aby zaimportować ustawienia wstępne: {n}{:.0}",
+ "Could not read {name}: {e}": "Nie można odczytać {name}: {e}",
+ "Added {n} photo{}": "Dodano zdjęcia: {n}{:.0}",
- "Inside: {names}": "Wewnątrz: {names}"
++ "Inside: {names}": "Wewnątrz: {names}",
+ "Where should the Lightroom catalog “{catalog}” go?": "Dokąd zaimportować katalog Lightroom „{catalog}”?",
+ "Merge into the open library “{library}” ({count} photo{})": "Scal z otwartą biblioteką „{library}” (zdjęcia: {count}){:.0}"
}
diff --cc crates/ui-egui/locales/pt-br-formats.json
index 68483b141,c2e9961fd..f17f2c0fd
--- a/crates/ui-egui/locales/pt-br-formats.json
+++ b/crates/ui-egui/locales/pt-br-formats.json
@@@ -299,9 -298,6 +299,11 @@@
"{what} merge added at {mp}: its full size, {full}, needs more memory than this computer has": "{what} mesclagem adicionada em {mp}: o tamanho completo, {full}, precisa de mais memória do que este computador tem",
"Listing folders — folders: {folders}, files: {files}": "Listando pastas — pastas: {folders}, arquivos: {files}",
"{what} merge added at {mp}, the largest a panorama can be (its full size is {full})": "{what} mesclagem adicionada em {mp}, o maior tamanho possível para um panorama (tamanho completo: {full})",
+ "Drop to review {n} item{} for import": "Solte para revisar antes de importar (itens: {n}){:.0}",
+ "Drop to import {n} item{}": "Solte para importar (itens: {n}){:.0}",
+ "Drop to import {n} preset{}": "Solte para importar predefinições: {n}{:.0}",
+ "Could not read {name}: {e}": "Não foi possível ler {name}: {e}",
- "Added {n} photo{}": "{n} foto{0} adicionada{0}"
++ "Added {n} photo{}": "{n} foto{0} adicionada{0}",
+ "Where should the Lightroom catalog “{catalog}” go?": "Para onde vai o catálogo do Lightroom “{catalog}”?",
+ "Merge into the open library “{library}” ({count} photo{})": "Mesclar na biblioteca aberta “{library}” ({count} foto{})"
}
diff --cc crates/ui-egui/locales/ru-formats.json
index 10ab27bed,2a12782f2..76b7af427
--- a/crates/ui-egui/locales/ru-formats.json
+++ b/crates/ui-egui/locales/ru-formats.json
@@@ -299,9 -298,6 +299,11 @@@
"Move {n} photo{} to “{}”?": "Переместить в «{1}» фото: {n}{0:.0}?",
"Listing folders — folders: {folders}, files: {files}": "Просмотр папок — папок: {folders}, файлов: {files}",
"Moved {n} photo{} to “{}”. Edit → Undo moves them back.": "В «{1}» перемещено фото: {n}{0:.0}. Правка → Отменить вернёт их.",
+ "Drop to review {n} item{} for import": "Отпустите для проверки перед импортом (элементов: {n}){:.0}",
+ "Drop to import {n} item{}": "Отпустите для импорта (элементов: {n}){:.0}",
+ "Drop to import {n} preset{}": "Отпустите для импорта пресетов: {n}{:.0}",
+ "Could not read {name}: {e}": "Не удалось прочитать {name}: {e}",
- "Added {n} photo{}": "Добавлено фото: {n}{:.0}"
++ "Added {n} photo{}": "Добавлено фото: {n}{:.0}",
+ "Where should the Lightroom catalog “{catalog}” go?": "Куда импортировать каталог Lightroom «{catalog}»?",
+ "Merge into the open library “{library}” ({count} photo{})": "Объединить с открытой библиотекой «{library}» (фото: {count}){:.0}"
}
diff --cc crates/ui-egui/locales/sv-formats.json
index 7a0114a77,ab0183e05..9a71a0288
--- a/crates/ui-egui/locales/sv-formats.json
+++ b/crates/ui-egui/locales/sv-formats.json
@@@ -298,10 -298,6 +298,12 @@@
"{n} selected photos · {pages} pages": "{n} selected photos · {pages} pages",
"{skipped} catalog images were not imported because their records in the catalog are incomplete.": "{skipped} catalog images were not imported because their records in the catalog are incomplete.",
"Listing folders — folders: {folders}, files: {files}": "Listing folders — folders: {folders}, files: {files}",
+ "Added {n} photo{}": "{n} foto tillagda{:.0}",
+ "Could not read {name}: {e}": "Kunde inte läsa {name}: {e}",
+ "Drop to import {n} item{}": "Släpp för att importera {n} objekt{:.0}",
+ "Drop to import {n} preset{}": "Släpp för att importera {n} förinställningar{:.0}",
+ "Drop to review {n} item{} for import": "Släpp för att granska {n} objekt före import{:.0}",
- "Inside: {names}": "Inuti: {names}"
++ "Inside: {names}": "Inuti: {names}",
+ "Where should the Lightroom catalog “{catalog}” go?": "Vart ska Lightroom-katalogen ”{catalog}” importeras?",
+ "Merge into the open library “{library}” ({count} photo{})": "Slå samman med det öppna biblioteket ”{library}” ({count} foto{:.0})"
}
diff --cc crates/ui-egui/locales/uk-formats.json
index 4cca48044,b33ff744e..36022ac1a
--- a/crates/ui-egui/locales/uk-formats.json
+++ b/crates/ui-egui/locales/uk-formats.json
@@@ -299,9 -298,6 +299,11 @@@
"Move {n} photo{} to “{}”?": "Перемістити до «{1}» фото: {n}{0:.0}?",
"Listing folders — folders: {folders}, files: {files}": "Перегляд тек — тек: {folders}, файлів: {files}",
"Moved {n} photo{} to “{}”. Edit → Undo moves them back.": "До «{1}» переміщено фото: {n}{0:.0}. Редагування → Скасувати поверне їх.",
+ "Drop to review {n} item{} for import": "Відпустіть для перегляду перед імпортом (елементів: {n}){:.0}",
+ "Drop to import {n} item{}": "Відпустіть для імпорту (елементів: {n}){:.0}",
+ "Drop to import {n} preset{}": "Відпустіть для імпорту наборів налаштувань: {n}{:.0}",
+ "Could not read {name}: {e}": "Не вдалося прочитати {name}: {e}",
- "Added {n} photo{}": "Додано фото: {n}{:.0}"
++ "Added {n} photo{}": "Додано фото: {n}{:.0}",
+ "Where should the Lightroom catalog “{catalog}” go?": "Куди імпортувати каталог Lightroom «{catalog}»?",
+ "Merge into the open library “{library}” ({count} photo{})": "Об’єднати з відкритою бібліотекою «{library}» (фото: {count}){:.0}"
}
diff --cc crates/ui-egui/locales/vi-formats.json
index fe4d50492,5a620d219..d5e28bff0
--- a/crates/ui-egui/locales/vi-formats.json
+++ b/crates/ui-egui/locales/vi-formats.json
@@@ -299,9 -298,6 +299,11 @@@
"• {assumption}": "• {assumption}",
"… and {more} more": "… và {more} nữa",
"…and {more} more": "…and {more} more",
+ "Added {n} photo{}": "Đã thêm {n} ảnh{:.0}",
+ "Could not read {name}: {e}": "Không thể đọc {name}: {e}",
+ "Drop to import {n} item{}": "Thả để nhập {n} mục{:.0}",
+ "Drop to import {n} preset{}": "Thả để nhập {n} thiết lập sẵn{:.0}",
- "Drop to review {n} item{} for import": "Thả để xem lại {n} mục trước khi nhập{:.0}"
++ "Drop to review {n} item{} for import": "Thả để xem lại {n} mục trước khi nhập{:.0}",
+ "Where should the Lightroom catalog “{catalog}” go?": "Nhập danh mục Lightroom «{catalog}» vào đâu?",
+ "Merge into the open library “{library}” ({count} photo{})": "Gộp vào thư viện đang mở «{library}» ({count} ảnh{:.0})"
}
diff --cc crates/ui-egui/locales/zh-hans-formats.json
index 84bec24a7,40b84a0de..7406c39b8
--- a/crates/ui-egui/locales/zh-hans-formats.json
+++ b/crates/ui-egui/locales/zh-hans-formats.json
@@@ -299,9 -298,6 +299,11 @@@
"{what} merge added at {mp}: its full size, {full}, needs more memory than this computer has": "已添加 {what} 合并({mp}):完整尺寸({full})所需的内存超出了这台电脑的内存",
"Listing folders — folders: {folders}, files: {files}": "正在列出文件夹 — 文件夹:{folders},文件:{files}",
"{what} merge added at {mp}, the largest a panorama can be (its full size is {full})": "已添加 {what} 合并({mp}),这是全景图的最大尺寸(完整尺寸:{full})",
+ "Drop to review {n} item{} for import": "松开鼠标以在导入前检查 {n} 个项目{:.0}",
+ "Drop to import {n} item{}": "松开鼠标以导入 {n} 个项目{:.0}",
+ "Drop to import {n} preset{}": "松开鼠标以导入 {n} 个预设{:.0}",
+ "Could not read {name}: {e}": "无法读取 {name}:{e}",
- "Added {n} photo{}": "已添加 {n} 张照片{:.0}"
++ "Added {n} photo{}": "已添加 {n} 张照片{:.0}",
+ "Where should the Lightroom catalog “{catalog}” go?": "Lightroom 目录“{catalog}”要导入到哪里?",
+ "Merge into the open library “{library}” ({count} photo{})": "合并到当前打开的图库“{library}”({count} 张照片){:.0}"
}
diff --cc crates/ui-egui/locales/zh-hant-formats.json
index 0f4bfbc06,c099b2eb4..d5c4eb279
--- a/crates/ui-egui/locales/zh-hant-formats.json
+++ b/crates/ui-egui/locales/zh-hant-formats.json
@@@ -299,9 -298,6 +299,11 @@@
"{what} merge added at {mp}: its full size, {full}, needs more memory than this computer has": "已新增{what}合併照片({mp}):完整尺寸({full})所需的記憶體超過這台電腦的記憶體",
"Listing folders — folders: {folders}, files: {files}": "正在列出資料夾 — 資料夾:{folders},檔案:{files}",
"{what} merge added at {mp}, the largest a panorama can be (its full size is {full})": "已新增{what}合併照片({mp}),這是全景圖的最大尺寸(完整尺寸:{full})",
+ "Drop to review {n} item{} for import": "放開滑鼠以在匯入前檢查 {n} 個項目{:.0}",
+ "Drop to import {n} item{}": "放開滑鼠以匯入 {n} 個項目{:.0}",
+ "Drop to import {n} preset{}": "放開滑鼠以匯入 {n} 個預設集{:.0}",
+ "Could not read {name}: {e}": "無法讀取 {name}:{e}",
- "Added {n} photo{}": "已加入 {n} 張照片{:.0}"
++ "Added {n} photo{}": "已加入 {n} 張照片{:.0}",
+ "Where should the Lightroom catalog “{catalog}” go?": "Lightroom 目錄「{catalog}」要匯入到哪裡?",
+ "Merge into the open library “{library}” ({count} photo{})": "合併到目前開啟的照片庫「{library}」({count} 張照片){:.0}"
}
diff --cc crates/ui-egui/src/control.rs
index e3f62ce24,a0825e1a2..7e04f1356
--- a/crates/ui-egui/src/control.rs
+++ b/crates/ui-egui/src/control.rs
@@@ -409,9 -392,9 +409,10 @@@ pub fn handle(app: &mut LightcraftApp,
| crate::state::Dialog::SamModel { .. }
| crate::state::Dialog::SmartRules { .. }
| crate::state::Dialog::SaveEffect { .. }
+ | crate::state::Dialog::CaptureTime { .. }
))
|| (r.is_ok() && crate::panels::dialogs::keeps_open(app, &d))
+ || (r.is_err() && crate::lightroom_destination::keeps_open_on_error(app, &d))
{
app.ui.dialog = Some(d);
}
diff --cc crates/ui-egui/src/panels/dialogs.rs
index 534f83d3d,c0b3c19e8..2f0fcc40b
--- a/crates/ui-egui/src/panels/dialogs.rs
+++ b/crates/ui-egui/src/panels/dialogs.rs
@@@ -1553,11 -1507,12 +1560,17 @@@ pub fn show(app: &mut LightcraftApp, ct
app.toast(ctx, e);
close = true;
}
+ // photos whose capture time doesn't read are left as they were: say so
+ Ok(r) if matches!(dlg, Dialog::CaptureTime { .. }) && r["unreadable"].as_u64().is_some_and(|n| n > 0) => {
+ app.toast(ctx, crate::i18n::tr("Photos whose capture time can't be read were left as they were"));
+ close = true;
+ }
+ // where a Lightroom catalog goes: stays open to be corrected (a folder that isn't
+ // empty), unless the library it names has gone
+ Err(e) if matches!(dlg, Dialog::LightroomDestination { .. }) => {
+ close = !crate::lightroom_destination::keeps_open_on_error(app, &dlg);
+ app.toast(ctx, e);
+ }
Ok(_) if keeps_open(app, &dlg) => {
if let Dialog::SamModel { error, .. } = &mut dlg {
*error = None;
diff --cc docs/parity-checklist.md
index 0f4cf7a2b,70e60a882..3298580c1
--- a/docs/parity-checklist.md
+++ b/docs/parity-checklist.md
@@@ -936,16 -927,4 +936,17 @@@ Latin stays upright. Advanced Japanese
| 2026-10-16 | minor | LR-VIEW-PHOTOGRID: when the photos shown change by those an edit touched (an import's batch, a capture time, a crop), the grid reads only those photos' dates and shapes again instead of every photo of the list (a 16-photo batch at 181,749 photos: grid frame 101 ms → 7 ms); status unchanged |
| 2026-10-19 | minor | LRC-LIB-LIBFOLDERS: the sidebar trees indent by a narrower step (14 / 12 / 10 / 8 pt) when the deepest open row would not fit the panel, instead of cutting its name or scrolling sideways at once (issue #2298); status unchanged (✅) |
| 2026-10-15 | patch | LR-EXP-DIM: Width & Height (`fit: widthHeight`) limits the width and the height as the photo stands, beside Dimensions (W × H, either orientation), as in Lightroom (#1620); status unchanged (✅) |
+| 2026-10-16 | patch | LR-BEHAV-BG-TASKS: progress bars and spinners come from one component (`progress.rs`): the activity stack, model downloads, denoise and the face scan share it; busy buttons and a themed thumbnail placeholder added; status unchanged |
+| 2026-10-17 | minor | MENU-VIEW-DETAIL, MENU-VIEW-EDIT, MENU-VIEW-CLIPPING, MENU-VIEW-MASKOVERLAY, MENU-VIEW-PHOTOCOUNT, MENU-VIEW-BEFOREAFTER, LR-VIEW-FOCUSPOINT: menu labels renamed: switches are named for what they show (Photo Counts, Focus Point, Clipping, Mask Overlay, All Mask Overlays, Mask Pins, Layout Image), View ▸ Detail is Detail View, Window ▸ Edit is Edit Panel, Compare Before and After is Before/After Side by Side, Clear Preview Cache is Discard Preview Cache; shortcuts and commands unchanged; statuses unchanged |
+| 2026-10-15 | patch | LR-BEHAV-LOCALIZE: cites `docs/localization-pl.md` (Polish format messages finished, counts right for every number); status unchanged (🟡) |
+| 2026-10-17 | minor | LR-IMP-DRAGDROP: files dragged over the window show what dropping will do, and dropped photos and folders open the import review (Settings ▸ Import can import them at once); a drop while a dialog is open or an import is running is refused; a finished scan no longer replaces an open dialog; the web build tells the person when a dropped file can't be read or imported. LR-BEHAV-EMPTY-STATES, LR-BEHAV-DRAGDROP: text updated; status unchanged (✅) |
+
+### 2026-10-18 — export regression integration (maintenance)
+
+Graphic watermarks honour EXIF rotation/mirroring through the shared `read_graphic` path and keep their aspect ratio when fitted to the output. HDR JPEG `limitKb` includes the gain map and metadata. Refreshed onto main fb7ac08b, retaining upstream export bounds, colour metadata, JPEG encoding and opaque RGB/real-alpha handling (#1691); no feature-count or readiness estimate changes.
+
+### 2026-10-20 — graphic watermark inset regression
+
+Oversized graphics fit the space remaining after the applicable anchor insets, with one aspect-preserving scale before quarter-turn rotation. Centered axes continue to ignore insets. Pixel-bound regressions cover edge/corner anchors, centered placement and all four rotations. Main d999e382 is integrated; HDR size-limit and EXIF-orientation fixes are unchanged.
+| 2026-10-13 | minor | LRC-LIB-KEYWORDS: the Keyword List marks a keyword that has an applied keyword inside it (a dot in its box); status unchanged |
+ | 2026-10-23 | minor | LRC-LIB-CATALOG-IMPORT: Import Lightroom Catalog… (and Open Library's offer for a Lightroom catalog) asks whether the catalog merges into the open library or goes into a new library made next to it; Settings ▸ General or "Don't ask again" switches the question off; `file.importLightroom` takes `into` / `name` / `location` (#2672); status unchanged (🟡) |
diff --cc docs/whats-new.md
index 1f1040df2,2faf7ee05..ac7dc732d
--- a/docs/whats-new.md
+++ b/docs/whats-new.md
@@@ -1,10 -1,15 +1,20 @@@
# What's new in LightCraft
+## 2026-10-22
+
+### Find the grid shortcut in View
+- Photo Grid and Square Grid now show the grid-cycle shortcut (G by default) in the View menu. The hints follow
+ shortcut changes; clicking a menu row still selects that grid (issue #2500).
+ ## 2026-10-23
+
+ ### Choose where a Lightroom catalog goes
+ - File ▸ Import Lightroom Catalog… now asks first: merge the catalog's photos, collections and edits into the
+ library open now, or create a new library for them, named after the catalog and placed next to the open library
+ (both can be changed). LightCraft opens the new library, then imports the catalog into it. Cancel does nothing.
+ Open Library… on a Lightroom catalog goes through the same choice.
+ - To import as before without the question, choose Settings ▸ General ▸ When importing a Lightroom catalog ▸
+ Always merge into the open library, or tick Don't ask again in the window. Ask where to import it brings the
+ question back.
## 2026-10-21