From 7c9d91c59f24f2762e94989e21731d1f29f63ced Mon Sep 17 00:00:00 2001 From: Alberto Balbo Date: Tue, 17 Nov 2026 22:10:58 +0100 Subject: [PATCH] docs: bring the owner review 6 documentation in step with the fixes MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The docs commit 59235e7c predates the third to sixth verification rounds. The brief now says how Integrate decides who may trash a server photo (per sequence, owner or admin with Delete; otherwise the server's version stays out of its Main), that the Details stage stops on a server change, how a merge re-plans, keeps its links undoable and names its classes, the Two versions... list of owner Q3, the three-button rows and twins with a sibling only, with an amendment row per round. DESIGN, ARCHITECTURE, DECISIONS, CHANGELOG, STATUS 8.7 and the request doc follow; the Windows captures are no longer listed as open. The glossaries gain the match terms in every language, read from the shipped strings. Hindi merging reads मर्ज, apart from मिलान (match); Croatian names the matching sequence podudarna sekvenca; Finnish no longer puts kohteen right after a count. Refs #73 Co-Authored-By: Claude Opus 5.5 --- docs/ARCHITECTURE.md | 8 +- docs/BRIEF.md | 89 ++++++++++++++++------ docs/CHANGELOG.md | 10 +++ docs/DECISIONS.md | 8 +- docs/STATUS.md | 2 +- docs/requests/2026-11-16-owner-review-6.md | 2 +- docs/ui/DESIGN.md | 47 ++++++++---- i18n/GLOSSARY.md | 7 +- i18n/ar/glossary.tsv | 8 ++ i18n/bg/glossary.tsv | 8 ++ i18n/cs/glossary.tsv | 8 ++ i18n/da/glossary.tsv | 8 ++ i18n/de/glossary.tsv | 8 ++ i18n/el/glossary.tsv | 8 ++ i18n/es/glossary.tsv | 8 ++ i18n/et/glossary.tsv | 8 ++ i18n/fi/Server.fi.resx | 4 +- i18n/fi/glossary.tsv | 8 ++ i18n/fr/glossary.tsv | 8 ++ i18n/he/glossary.tsv | 8 ++ i18n/hi/Admin.hi.resx | 2 +- i18n/hi/Errors.hi.resx | 4 +- i18n/hi/Jobs.hi.resx | 4 +- i18n/hi/Server.hi.resx | 12 +-- i18n/hi/Tooltips.hi.resx | 14 ++-- i18n/hi/glossary.tsv | 10 ++- i18n/hr/Tooltips.hr.resx | 4 +- i18n/hr/glossary.tsv | 8 ++ i18n/hu/glossary.tsv | 8 ++ i18n/id/glossary.tsv | 8 ++ i18n/ja/glossary.tsv | 8 ++ i18n/ko/glossary.tsv | 8 ++ i18n/lt/glossary.tsv | 8 ++ i18n/lv/glossary.tsv | 8 ++ i18n/ms/glossary.tsv | 8 ++ i18n/nb/glossary.tsv | 8 ++ i18n/nl/glossary.tsv | 8 ++ i18n/pl/glossary.tsv | 8 ++ i18n/pt-BR/glossary.tsv | 8 ++ i18n/pt-PT/glossary.tsv | 8 ++ i18n/ro/glossary.tsv | 8 ++ i18n/ru/glossary.tsv | 8 ++ i18n/sk/glossary.tsv | 8 ++ i18n/sl/glossary.tsv | 8 ++ i18n/sv/glossary.tsv | 8 ++ i18n/th/glossary.tsv | 8 ++ i18n/tr/glossary.tsv | 8 ++ i18n/uk/glossary.tsv | 8 ++ i18n/vi/glossary.tsv | 8 ++ i18n/zh-Hans/glossary.tsv | 8 ++ i18n/zh-Hant/glossary.tsv | 8 ++ 51 files changed, 437 insertions(+), 70 deletions(-) diff --git a/docs/ARCHITECTURE.md b/docs/ARCHITECTURE.md index a03699e0..4e734e62 100644 --- a/docs/ARCHITECTURE.md +++ b/docs/ARCHITECTURE.md @@ -62,13 +62,13 @@ Dependencies point one way: `Core` ← `Core.Windows`, `Data`, `Protocol` ← `S | `Jobs` | `JobEngine` (one job at a time; reviews the priority queue and makes a lower running job yield, requeued with its checkpoint; no history purge, the housekeeping schedule's clean-up does it), `JobPriorityQueue` (a level per job kind, the claim order, settings round trip), `IJobHandler`, `IJobHandlerProvider`, `JobContext` (progress, checkpoints, follow-up jobs that never interrupt their parent), `JobThroughput`/`JobEta` (rate and bounded time left), `ICancelledJobHandler` (a handler's clean-up after a cancel: `JobEngine.CancelAsync` calls it for a paused or failed job no handler runs, and waits first for a paused job's run that has not ended). Owner review 5, #65: `JobContext.ReportAsync(done, total, JobDetail)`, `CheckpointAsync(…, detail)` and `ReportItemAsync` (item counts of the current detail with no allocation); publishing throttled to one report per `JobEngineOptions.ProgressInterval` (500 ms) per job with bypass for the first report, a step change and a completed count; `JobWire` maps the detail (`DetailJson`, `ParseDetailJson` never throws); `jobs.progress_detail` (migration 0011). Owner review 6, #73: a `JobPriority.Background` job never makes a running job yield; kinds `Integrate` (25) and `MergeSequences` (26), high by default; steps `Details`, `Projects` and `Trash` | | `Scheduling` | `Scheduler` (one per host: seeds the host's system schedules, claims due runs by compare-and-set, catch-up, clock changes, create/edit/reset/delete/run now as API v1 DTOs), `ScheduleRecurrence` (the in-house `every:`/`daily:`/`weekly:`/`monthly:` form, wall-clock times across DST), `ScheduleActions` (action names, parameters, availability, the archive jobs a run queues), `IScheduleHost` and `SystemSchedule` (what the server and the desktop supply), `ScheduleOutcome`, `ScheduleMapping` (model ↔ DTO) | | `Housekeeping` | `BackupJobHandler`, `CleanupJobHandler`, `ICleanupStep` with the shared steps (`CleanupSteps`: job history, audit log, trash report that never deletes); hosts add their own steps through `ArchiveServiceOptions.CleanupSteps` | -| `Archiving` | `ArchiveService` (create/adopt/open, archive settings written to `archive.json` then the index, `ArchiveSettings.CheckTemplates` and `TemplateRuleException` holding a template given anew to the template rules; `UnderLeaseAsync`: a write under a sequence's lease with its row read under it; `EditSettingsAsync`: settings an index edit writes, written to `project.json` under the lease first and put back when the index does not take them), `ArchiveIndexer` (scan, rebuild; a sequence found in another folder takes its exports' paths along; a full scan or a rebuild takes the projects' sidecars back too), `ArchiveIngest` (uploads and imports, named through `FrameNaming`; content a conversion replaced is a duplicate of the frame holding its conversion; a restore or a replacement not settled yet refuses the batch), `ImportService`, `ArchiveVerifier`, `ArchiveImages` (thumbnail and proxy passes, several photos at once through `OrderedWork`, which hands results back in frame order), `FrameTiers` (decode tier, `PreviewOnly`/`Undecodable` flags and preview size of frames, written to sidecar and index by the light analysis, deep analysis, renders and image passes), `GprCompanions` (the JPEG of each GoPro GPR, found in the index when an import kept it in another sequence), `ArchiveMaintenance` (also a conversion job's staging and journals, by the job's state; those of a job this index does not know go together, by age), `MassRenamer` (mass rename and Reorganize: the dry run reads each sidecar for a file template; each step checked under its leases before anything of it moves (where its sequences are, what is inside and at its new folder, a sidecar of a newer format, the title it was planned from when it changes it or names the folder or files after it), then the folder, with the sequences of the plan an earlier step left as they were inside it (taken along, their title and file names kept), every index row (the frame paths and render paths of the exports inside it, a file or an image-sequence folder, its own unless the export is still at the old place and another sequence's when it moved with it, follow it in one transaction; a sidecar that cannot be read or written then still has its row follow, and fails the step), then the files under the plan's journal in `journal/` (a sequence whose photos changed since, such as one still receiving them, or whose files are found changed or in use or have their new names taken keeps its file names, the renames being pinned by digest, and the step and the plan go on); the journal keeps the tally of the whole plan, and a plan its job held (paused, cancelled or failed) is left to that job, only its half-done file renames completed at an archive open, which completes any other plan an interruption left and tells each sequence changed; the file renames of a step: sidecar, a sequence whose sidecar cannot be read staying as it is with every folder around it, index (`FrameRepository.RenameFilesAsync`) and the sequence's journal), `SequenceFolders` (`Holds`: the folder the index has for a sequence is there and its sidecar names no other sequence; every writer into a sequence's folder asks it), `SequenceTrash` (delete into the archive's hidden trash with a dry run, restore; the folder moves back when the index step fails; lists sequence and photo entries; `SequenceTrash.Empty`: the emptying's dry run, fingerprint and erase, each entry checked against its fingerprint again under its lease, `TrashKept` with its `TrashKeptReason` for each entry kept; `SequenceTrash.Replaced`: where a replaced entry's conversions are, read from the archive's sidecars (in the index's or the entry's folder, in the trash, else by one `SidecarWalk` of the archive per dry run or emptying) through their replaced tombstones, a conversion deleted only on the archive's word (a tombstone, the trash, or an `ErasureRecord` in `trash/.erased/`, written when an emptying erases a deleted sequence a replaced entry still needs), `TrashEntry.ConversionDeleted` in the dry run and its fingerprint, the erase weighed under the entry's and the sequence's leases once the sequence is settled; `BusyAsync`: what running and paused jobs hold, but the job asking, from `JobRepository.ListHoldsAsync`), `FrameTrash` (photos of a sequence into `trash/photos` with a dry run, a journal that undoes an interrupted deletion whose entry stays unlisted until its sidecar is written, tombstones (a photo never hashed is hashed as it goes; one whose original is missing goes without a file or tombstone; a frame that stays and may be a twin is hashed, its hash kept), positions parked and placed back, proxies and thumbnails moved to follow their frames; `FrameTrash.Restore`: restore re-hashes each file and says why each kept photo stayed (`KeptReason`), under a journal of its own into the sequence that another writer settles only under the entry's lease, into a new sequence through the ingest when theirs is gone, each original staged inside its own entry and the record rewritten after each photo filed; a replaced entry swaps back while its converted frames are unchanged (`SwapBackAsync`); `FrameTrash.Replace`: the files of frames swapped in place, same ids and indices, the old files into one `Replaced` entry with their replacements' hashes, a copy of `analysis.json` and the job's id, the incoming files named never onto a file there, tombstones aliasing old content to new, under `.chronos/replace.pending.json` (its phase and the new names: the next writer completes it when the sidecar lists them, else undoes it; `EnsureReplaced`: the writers of a sequence's frames wait for one not settled); `ReplaceMissingAsync`: a frame missing here takes its photo back in another encoding, nothing to the trash; `FollowUps`: the passes a swap cleared), `MassConverter` (conversion's dry run: busy sequences (running and paused jobs, pending conversions), offline and unreadable ones, the space against `ArchiveServiceOptions.FreeSpace` for the archive root and its staging folder; `QueueAsync`: a confirmed plan's job queued under a process lock, its confirmed photos written first into `journal/convert-.photos` (`ConfirmedPhotos`) under the job's id, a second conversion of its sequences refused, `ConversionQueuedException`; the job, a sequence at a time: under its lease, settled, planned again and held to the confirmed photos (`Confirmed`, `Held`), pinned in `journal/convert-.pins` (`PinLog`); stage A converts into `staging/convert-/` with `OrderedWork`, the space watched before each photo, counting every photo still being written (`SpaceWatch`), each staged file appended to `journal/convert-.staged` (`StagedLog`); stage B per sequence, all or nothing: replace through `FrameTrash.ReplaceAsync` (the sequence's folder read again under its lease, as every writer does), or a new sequence through the ingest with the source's tags, rating, notes and project (a retry finishes the copy the journal names; a source another done conversion copied since is `Superseded`); `ConvertJournal` (`convert-.json`: each sequence's outcome and whether its passes were queued); each sequence replaced or made told, and its passes queued, as it completes), job handlers. Owner review 6, #73: `SequenceMerger` (the merge of a local match: `PlanAsync` (kept sequence, photos by policy, last copies, renders, details, projects with free names, session keys, links, blocks, a fingerprint from its own per-sequence frames stamp), `EnqueueAsync`, `CreateHandler`), `Jobs/MergeJobHandler` (`merge-sequences`, 26: copy, renders, verify, replace, details, projects, links, trash, each resumable from `MergeJournal`, `.chronos/journal/merge-.json` with its staging folder; the other into its archive's trash only at the frames version it verified), `SequencePayloadWriter` (the settled details written under the lease at the planned settings version); `FrameTrash` and `SequenceTrash` take the job holding the sequence (`exceptJob`) and expected frames versions | +| `Archiving` | `ArchiveService` (create/adopt/open, archive settings written to `archive.json` then the index, `ArchiveSettings.CheckTemplates` and `TemplateRuleException` holding a template given anew to the template rules; `UnderLeaseAsync`: a write under a sequence's lease with its row read under it; `EditSettingsAsync`: settings an index edit writes, written to `project.json` under the lease first and put back when the index does not take them), `ArchiveIndexer` (scan, rebuild; a sequence found in another folder takes its exports' paths along; a full scan or a rebuild takes the projects' sidecars back too), `ArchiveIngest` (uploads and imports, named through `FrameNaming`; content a conversion replaced is a duplicate of the frame holding its conversion; a restore or a replacement not settled yet refuses the batch), `ImportService`, `ArchiveVerifier`, `ArchiveImages` (thumbnail and proxy passes, several photos at once through `OrderedWork`, which hands results back in frame order), `FrameTiers` (decode tier, `PreviewOnly`/`Undecodable` flags and preview size of frames, written to sidecar and index by the light analysis, deep analysis, renders and image passes), `GprCompanions` (the JPEG of each GoPro GPR, found in the index when an import kept it in another sequence), `ArchiveMaintenance` (also a conversion job's staging and journals, by the job's state; those of a job this index does not know go together, by age), `MassRenamer` (mass rename and Reorganize: the dry run reads each sidecar for a file template; each step checked under its leases before anything of it moves (where its sequences are, what is inside and at its new folder, a sidecar of a newer format, the title it was planned from when it changes it or names the folder or files after it), then the folder, with the sequences of the plan an earlier step left as they were inside it (taken along, their title and file names kept), every index row (the frame paths and render paths of the exports inside it, a file or an image-sequence folder, its own unless the export is still at the old place and another sequence's when it moved with it, follow it in one transaction; a sidecar that cannot be read or written then still has its row follow, and fails the step), then the files under the plan's journal in `journal/` (a sequence whose photos changed since, such as one still receiving them, or whose files are found changed or in use or have their new names taken keeps its file names, the renames being pinned by digest, and the step and the plan go on); the journal keeps the tally of the whole plan, and a plan its job held (paused, cancelled or failed) is left to that job, only its half-done file renames completed at an archive open, which completes any other plan an interruption left and tells each sequence changed; the file renames of a step: sidecar, a sequence whose sidecar cannot be read staying as it is with every folder around it, index (`FrameRepository.RenameFilesAsync`) and the sequence's journal), `SequenceFolders` (`Holds`: the folder the index has for a sequence is there and its sidecar names no other sequence; every writer into a sequence's folder asks it), `SequenceTrash` (delete into the archive's hidden trash with a dry run, restore; the folder moves back when the index step fails; lists sequence and photo entries; `SequenceTrash.Empty`: the emptying's dry run, fingerprint and erase, each entry checked against its fingerprint again under its lease, `TrashKept` with its `TrashKeptReason` for each entry kept; `SequenceTrash.Replaced`: where a replaced entry's conversions are, read from the archive's sidecars (in the index's or the entry's folder, in the trash, else by one `SidecarWalk` of the archive per dry run or emptying) through their replaced tombstones, a conversion deleted only on the archive's word (a tombstone, the trash, or an `ErasureRecord` in `trash/.erased/`, written when an emptying erases a deleted sequence a replaced entry still needs), `TrashEntry.ConversionDeleted` in the dry run and its fingerprint, the erase weighed under the entry's and the sequence's leases once the sequence is settled; `BusyAsync`: what running and paused jobs hold, but the job asking, from `JobRepository.ListHoldsAsync`), `FrameTrash` (photos of a sequence into `trash/photos` with a dry run, a journal that undoes an interrupted deletion whose entry stays unlisted until its sidecar is written, tombstones (a photo never hashed is hashed as it goes; one whose original is missing goes without a file or tombstone; a frame that stays and may be a twin is hashed, its hash kept), positions parked and placed back, proxies and thumbnails moved to follow their frames; `FrameTrash.Restore`: restore re-hashes each file and says why each kept photo stayed (`KeptReason`), under a journal of its own into the sequence that another writer settles only under the entry's lease, into a new sequence through the ingest when theirs is gone, each original staged inside its own entry and the record rewritten after each photo filed; a replaced entry swaps back while its converted frames are unchanged (`SwapBackAsync`); `FrameTrash.Replace`: the files of frames swapped in place, same ids and indices, the old files into one `Replaced` entry with their replacements' hashes, a copy of `analysis.json` and the job's id, the incoming files named never onto a file there, tombstones aliasing old content to new, under `.chronos/replace.pending.json` (its phase and the new names: the next writer completes it when the sidecar lists them, else undoes it; `EnsureReplaced`: the writers of a sequence's frames wait for one not settled); `ReplaceMissingAsync`: a frame missing here takes its photo back in another encoding, nothing to the trash; `FollowUps`: the passes a swap cleared), `MassConverter` (conversion's dry run: busy sequences (running and paused jobs, pending conversions), offline and unreadable ones, the space against `ArchiveServiceOptions.FreeSpace` for the archive root and its staging folder; `QueueAsync`: a confirmed plan's job queued under a process lock, its confirmed photos written first into `journal/convert-.photos` (`ConfirmedPhotos`) under the job's id, a second conversion of its sequences refused, `ConversionQueuedException`; the job, a sequence at a time: under its lease, settled, planned again and held to the confirmed photos (`Confirmed`, `Held`), pinned in `journal/convert-.pins` (`PinLog`); stage A converts into `staging/convert-/` with `OrderedWork`, the space watched before each photo, counting every photo still being written (`SpaceWatch`), each staged file appended to `journal/convert-.staged` (`StagedLog`); stage B per sequence, all or nothing: replace through `FrameTrash.ReplaceAsync` (the sequence's folder read again under its lease, as every writer does), or a new sequence through the ingest with the source's tags, rating, notes and project (a retry finishes the copy the journal names; a source another done conversion copied since is `Superseded`); `ConvertJournal` (`convert-.json`: each sequence's outcome and whether its passes were queued); each sequence replaced or made told, and its passes queued, as it completes), job handlers. Owner review 6, #73: `SequenceMerger` (the merge of a local match: `PlanAsync` (kept sequence, photos by policy, last copies, renders, details, projects with free names, session keys, links, blocks, a fingerprint from its own per-sequence frames stamp), `EnqueueAsync`, `CreateHandler`; `HeldAsync`: a drop project the kept sequence already holds a copy of, by name and history content; `FolderChangedAsync`: photos in the other's folder the index has not read, `CopyBlock.FolderChanged`; the hashes it read kept by frame, size and write time so a re-plan reads only what changed), `Jobs/MergeJobHandler` (`merge-sequences`, 26: copy, renders, verify, replace, details, projects, links, trash, each resumable from `MergeJournal`, `.chronos/journal/merge-.json` with its staging folder; the trash checks run before the links stage, whose `MergeLinksUndo` (`FoundCopyStore.UndoOfMoveAsync`/`MoveBackAsync`) an abandoned merge applies; `DropSettingsVersion`, `SettledElsewhere` and `FlaggedVerified` re-checked before the trash, a stale journal deleted so the retry plans again; the other into its archive's trash only at the frames version it verified, `SequenceTrash` asking the merge's folder check under the lease), `SequencePayloadWriter` (the settled details written under the lease at the planned settings version); `FrameTrash` and `SequenceTrash` take the job holding the sequence (`exceptJob`) and expected frames versions | | `Processing` | `ProcessingService`, `SequenceAnalyser`, `DeepReports` (a saved deep report while it still describes the frames), `SequenceRender`, `ProjectStore` (a newer format refused as `Errors.Render.NewerSettings`), `ProjectBundles` (a `.chronos` file for a sequence, and the sequence a file names), `ProcessingJobs` (`Routed`: a render job sized from its resolved preset box through `RenderSize` and given its `RequiredSettingsFormat`, read from the job's own export and never below the stored settings' format; `RequiredFormat` over a batch's presets, used by the desktop's gates; `BatchExport` carrying the playback; `Still`: a still job, `StillFrame` and `StillPhoto`, format 3), `RenderNodeClient` (registers the node's settings format), job handlers (`RenderJobHandler` hashes each single-file output and records its kind, stills included) | | `Videos` | Owner review 1, R9: `IVideoLibrary` (`ArchiveService.Videos`; the server's and the desktop's one library: list and get as `VideoItem` with state and copies, `PlanDeleteAsync` and `DeleteAsync` by fingerprint, `RestoreAsync` by trash entry, `CopiesAsync`, `CopyJob`, `FolderProblem`; `VideoQuery`, `VideoErrors` and `VideoLibraryException`, `VideoTrashNames`), `VideoLibrary` (`ProtectedFolders`: the host's folders a videos folder may not be in, the workspace on the desktop, the data folder on the server; `RecoverAsync` at open), `VideoTrash` (`.chronos/trash/videos/`: delete under the sequence's lease with a `.pending` record journal, a rename or a verified cross-volume copy, the row removed and `rendered_count` recounted, `.leftover` markers for a source a copy could not remove; restore after a re-hash under a free name, same render id; entries listed through `SequenceTrash` as `TrashKind.Videos`, titled by their sequence), `VideoCopyJobHandler` (`video-copy`, 24: free space for every render first, `.incoming-.part`, hash, rename without overwrite, `render_copies`; a server's render downloaded on the desktop; checkpoint `done:`), `VideosFolder` (validation, free space, " (2)" collision names, part-file names) | | `Projects` | `ProjectService` (`ArchiveService.Projects`: the projects of this PC's sequences as a home, under the sequence's lease and only in a folder that holds the sequence (`SequenceFolders.Holds`; otherwise `SequenceFolderMovedException`: reads answer from the index, writes are refused); reads wait 3 s for the lease, then answer from the index; a read-only archive is read without writing (an index-only Main written back once it takes writes): list, create, rename, delete (the folder into `projects/.trash` first, then the deleted record; never Main), history, head (NotFound once deleted), `StoredAsync` (a version file read back and checked), push with fast-forward / idempotent repeat / divergence / hash, portability, strict format and 64 MiB checks; each call first catches up: the sidecars into the index, Main made from the sequence's settings, settings another path wrote appended to Main as an `external` version or, with a push whose mirror was cut short, merged into one `merge` version where they win, a mirror never written over `project.json` settings it has not taken in (`MovedSharedAsync`), records behind the index healed (`HealAsync`, `UpdatedAfter`), projects the archive lost written back (`WriteBackAsync`); a push to Main mirrored into `project.json` and the settings with the settings version check), `ProjectIndexer` (the reconcile, also run by full scans and rebuilds: the projects' trash read before the live folders, so a deletion wins and the live folder's late version files move beside it; a record that cannot be read held back, never taken for a deletion; a lost record written again from the index only once its folder settled (`RecordSettle`, 2 minutes) and no trash folder holds it back (`TrashRecordGrace`, 1 day); a creation cut before its record left as it is; a version file a push left past its record adopted, a stray one moved to `versions/.stray`; `BehindAsync`, one rule for a record behind the index; `SettleMainAsync` and `SwapMainAsync`, one Main from the records, passed in one transaction), `ProjectSidecars` (record and immutable version files, the settings as a JSON string checked against their hash, `MaxVersionBytes` 64 MiB refused before writing), `ProjectMerge` (three-way merge member by member, pending frames merged photo by photo, conflicts, `Replay` of local commits on a moved head; `NewerSettingsException` rather than merge a newer format; `OneFraming`: a turn or mirror on one side and a framing edit on the other are one conflict at the orientation member), `IProjectHome` and `ArchiveProjectHome` (the home a workspace pushes to and pulls from: `HoldsAsync` reads a version back, `FramesStampAsync` says when the frames changed, an offline archive or busy lease is `HomeUnavailableException`), `ServerProjectHome` (phase 5b: a server sequence's `/projects` over `ChronosClient`; a server out of reach, an expired sign-in, a 503 lease, offline archive or `projects_unreadable`, a 409 `folder_in_use` and a server without the projects are `HomeUnavailableException`, a 404 `sequence`/`project`/`version` and a refused name `ProjectException` (a deleted project's head is 404 `project`), a 422 `too_large` the `TooLarge` outcome, other refusals keep their `ChronosApiException`; `HoldsAsync` reads the version back (`?stored=true`), `FramesStampAsync` from `…/frames/stamp`, version pages read on past a page the server ended early, a 413 the `TooLarge` outcome; its sequences name an archive id made from the server's key), `HomePhotos` (a sequence's photos as positions name them, with the encodings its Replaced tombstones join; the server's frames endpoint and render nodes build the same), what each call changed (`ProjectChangeSet` to `ArchiveServiceOptions.ProjectsChanged`, once the lease is let go: projects made, renamed, deleted or with a new head, compared before and after under the lease, and whether Main's head was written into the sequence's settings), `CatchUpAsync` (the catch-up alone, saying why it cannot run), `ProjectWire` (projects, versions, push outcomes and a home's frames to and from API v1 DTOs, for the server and a client of it). Owner review 6, #73: `ProjectTransplant` (`IProjectCopier`: a project and its history copied to another home for an Integrate or a merge, an intent journaled before the copy is made, each pushed version verified against its content hash, a copy someone else changed left alone; `FreeName` "name (PC)", "(2)"… within the name limit; `TransplantFormatException` for a newer settings format) | | `Workspaces` | `WorkspaceStore` (a folder outside the library: `workspace.json` written atomically, one folder per project, no index; a leftover folder holding only stale lease files removed on listing), `WorkspaceProject` (`project.chronos` working state, `media/` with `media.json`, `proxies/.jpg` (and `-.jpg` while a copy replaces one) and `analysis.json`, `versions/` with `.replaced` (versions set aside, pruned by age and count) and `.replaced.since`, `sync.json` for a conflict, a restore or the journal of a replay or a Save both, `exports/`, the lease `.lock.lease`; `UnreadableVersions`), `WorkspaceMedia` (`NamedAsAt`: the media learn the home's hashes and aliases), `WorkspaceSync` (checkout, open under the lease, save, commit, push, pull with replay and merge, the base in `project.chronos` as every write's commit point, `SettleAsync` finishing or undoing a cut push, replay or Save both, conflicts settled by keep mine, take server or save both only as shown, restore, status with Gone, Damaged and `MediaOutdated`, the home's frames read again only when their stamp moved; `FollowNameAsync`: the home's name and Main written into the copy at every pull and at a server's `renamed`), `WorkspaceCopyJobHandler` (`WorkspaceJobs.Copy` and `CopyFactsAsync`, registered by the desktop only: the archive only read, from a folder that holds the sequence; a workspace inside a library refused; the archive's current proxies copied, the others made in the workspace, each hash-verified, resumable from a checkpoint of its frames version and folder, free space checked against its estimate plus 512 MiB; the encodings conversions joined kept in `media.json`; the working state's positions moved by frame where frames stay, by photo where they came or went; a cancelled first copy's media cleared under the project's lease only when no other copy of the project waits or runs, through `ICancelledJobHandler` too; a project whose home is a server, `WorkspaceJobs.CopyFromServer`, phase 5b: downloaded through the desktop's session (`ISyncConnector`), never through this PC's archive, the frames of one frames version with the aliases of the server's conversions, each proxy (else the thumbnail standing in, `WorkspaceFrame.FileKind`) hashed as it arrives and checked on the disk, four at a time, the editor's current file never overwritten, resumable from the same checkpoint, a `.thumb` marker beside a thumbnail standing in until the commit, free space checked against the server's proxy sizes); phase 5c: `WorkspaceProject` gains `media/originals/-` (`OriginalName`), the ledger `exports/renders.json` (`WorkspaceRenders`, `WorkspaceRenderEntry`; `ContainedExportFile` keeps every ledger path inside `exports/`), `media.json` format 2 while it holds originals or was cleaned (`WorkspaceMedia.Cleaned`) and the project file format 3 while its media are Originals; `WorkspaceOriginals` (Proxies only's plan and apply, and `ClearOriginals`: every file of `media/originals` hashed and deleted only when the home's frames hold its SHA-256, the rest moved to the trash), `WorkspaceTrash` and `WorkspaceTrashBuilder` (`/.trash`: entries `-` filled under `.incoming--` and renamed when whole, listed with a fingerprint of every file's path, size and time, emptied only by a plan that still matches), `WorkspaceCleaner` (the clean-up of media of projects in step with their home: Clean after, Size limit, the reasons a project is kept in `WorkspaceKeep`, `UnsentRenders`), `WorkspaceMover` (survey, plan fingerprint, the journal `/.move.json` with stages Moving and Switched, rename on one volume or copy and hash-verify across volumes, resume, abandon, clear after the switch), `WorkspaceJobRoots` (internal, in `WorkspaceJobs.cs`: the folder a copy, render or send works in, the one that holds its project now, refused while a move has not switched) and the job parameters `WorkspaceRenderParameters`, `WorkspaceSendParameters`, `WorkspaceMoveParameters` in `WorkspaceJson`. Owner review 5, #66: `WorkspaceHomes` (the parent `workspace.json` format 2, layout "homes": `local` and `servers/`, each an ordinary store with `server.json`, `ServerHomeRecord`; `StoreFor(home)`, `All()`), `WorkspaceStore` refusing the homes layout and a read-only legacy view, `WorkspaceJobRoots` searching every home, `WorkspaceJobOptions.SameServer`/`IsSameServer` (aliases, used by the copy and send handlers' home checks), `WorkspaceMover` and `WorkspaceCleaner` over every home | | `Sync` | `SyncService` (sync table of one server: compare, link by content through the aliases, settle conflicts, enqueue transfers), `SyncRules` (status, settings merge and differences, the proxies this PC can send, aliases followed; no I/O), `SyncTombstones` (photos either side removed are not offered back; the replaced tombstones of both sides join the encodings of one photo, union-find, each compared as the smallest SHA-256 among them, a deletion covering them all; immutable once made), `SyncPositions` (the settings' frame positions translated by photo to the frames of the copy they go to), `SyncLinkStore` (`sync_links`, `sync_state`), `SyncTransfers` and `SyncJobHandler` (resumable, hash-verified uploads and downloads as jobs; downloads commit through the archive ingest, and a frame missing here whose photo the server holds in another encoding takes that file through `FrameTrash.ReplaceMissingAsync`; job log lines from the catalog), `SyncAgent` (background comparison, server events, backoff, offline proxies; a server's `projectChanged` passed on as `ProjectChanged`, and null after a lost event stream once the stream is open again and a comparison made after that reached the server: `ISyncRemote.EventsAsync(connected, ct)`), `ProxyCache` and `RemoteSequence` (server sequences opened with proxies), `ISyncRemote` (the server calls; `ChronosSyncRemote` over `ChronosClient`). Owner review 5, #66: `ServerIdentity` (`KnownServerKey`; `Key`, `Canonical`, `Same`, `KeysOf`, `FolderName`, `With`), `SyncOptions.ServersDirectory` and `Identity`, `ProxyCache` per server with alias and 1.0 fallback reads, `SyncService.RekeyAsync`/`SyncLinkStore.RekeyAsync`. Owner review 6, #73: `CopyComparer` (`CopyComparison.cs`, pure, O(n log n): every photo of two copies classed Same, Converted, SameUnhashed, DeletedHere/There, Differs, Versions, OnlyHere/There, and the score; records in `CopyComparisonModel.cs`); `SyncService` no longer links by content (`MatchByContentAsync` removed): `RefreshAsync` runs `Finder.FindServerAsync` after releasing its gate and raises `CopiesFound`; `UnlinkAsync`, the 404 marks, `ApplyAgreedAsync` (agreed details, server first), `EnqueueUploadAsync` with a priority; `SyncTransfers.SendPhotosAsync`/`FetchPhotosAsync` (only the photos asked for, never creating or retargeting a server sequence, `RemoteGoneException`) and linked uploads with `intoTarget`; `SyncAgent` queues an integrated pair's automatic photos (Background) and counts `PhotoFailures`, `PhotosNotSent` after `NotSentAfter` (3); `ISyncRemote` gains `LookupPhotosAsync`, `UploadFileIntoAsync`, `DeleteFramesAsync` and a capabilities read cached per remote | -| `Copies` | Owner review 6, #73 (namespace `Chronos.Data.Copies`; matches: the same time-lapse on a server and on this PC, or twice on this PC). Contracts: `CopyModel` (`FoundCopy`, `CopyKind`, `CopyState`, `CopyEvidence`, `CopyScore`, `CopyLinking`, `CopyPhotoPolicy`, `CopyProjects`), `CopyReviewModel` (what the Compare dialog shows), `CopyPlans` (`IntegratePlan`, `MergePlan`, `CopyBlock`, `CopyPlanContext`, the trash plans), `CopyJobParameters`, `ICopyEngine` (the App's one entry). `FoundCopyStore` (`found_copies` and `copy_probes`, migration 0012: upserts that never touch the answer, state by compare-and-set, an Integrating row whose job failed or is gone read as its previous state, `EnsureLinkedAsync`, the 404 marks, `ReleaseAsync`, the merge's links stage `MoveToKeptAsync`, the local overlap queries, the probes; re-keyed with the links by `SyncLinkStore.RekeyAsync`). `CopyRules` (pure: `IsCopy`, `Decide` by the *Link matches* setting, `SameOriginals` (1.1's rule), `AsksAgain`, fingerprints, hints, the probe sample). `CopyPayload` (pure: details as portable lines, `Merge` of the chosen sides into one payload, `ExcludeVersions`). `CopySides` (both sides from the index and a server; `HeldElsewhereAsync`, the last-copy check across every archive; `VersionsAsync`, second versions). `CopyFinder` (`FindServerAsync` after each refresh: probes, `POST /photos/lookup` in batches, manifest comparison, at most 50 a refresh (20 on an older server), `Decide`; `FindLocalAsync`; `ResetProbesAsync`). `CopyReviewBuilder` (facts, full comparison, detail lines, projects, renders, capabilities with their blocks). `IntegratePlanner` (the Integrate dry run and fingerprint), `IntegrateJobHandler` and `IntegrateJournal` (`integrate`, 25: journal `.chronos/journal/integrate-.json`; link, photos both ways, trash after the winner's hash, details through `SyncService.ApplyAgreedAsync`, projects through `ProjectTransplant`), `CopyJobs` (handler and queuing, pair to Integrating by compare-and-set). `CopyEngine` (`ICopyEngine` composed: list, find, compare, plan and queue Integrate and merges, keep apart, ask again, link, unlink, keep here, trash here and there with a re-read of the other side, twins; optional dependencies keep App types out). `UploadAllRule` (pure: what *Upload all local* skips and why). Owned by the copies code; `Sync`, `Archiving` and `Projects` call into it only through `FoundCopyStore` and `CopyFinder` | +| `Copies` | Owner review 6, #73 (namespace `Chronos.Data.Copies`; matches: the same time-lapse on a server and on this PC, or twice on this PC). Contracts: `CopyModel` (`FoundCopy`, `CopyKind`, `CopyState`, `CopyEvidence`, `CopyScore`, `CopyLinking`, `CopyPhotoPolicy`, `CopyProjects`), `CopyReviewModel` (what the Compare dialog shows), `CopyPlans` (`IntegratePlan` with `ServerUsesOurs` and `StaysForDelete`, `MergePlan`, `CopyBlock`, `CopyPlanContext`: `OwnsOrAdmin` is the admin role only, ownership is per server sequence by `UserId` against its `OwnerUserId`; the trash plans, `DropVersionPlan`), `CopyJobParameters`, `ICopyEngine` (the App's one entry). `FoundCopyStore` (`found_copies` and `copy_probes`, migration 0012: upserts that never touch the answer, state by compare-and-set, an Integrating row whose job failed or is gone read as its previous state, `EnsureLinkedAsync`, the 404 marks, `ReleaseAsync`, the merge's links stage `MoveToKeptAsync` with its undo (`UndoOfMoveAsync`, `MoveBackAsync`, `MoveUndo`), `DeleteCandidateAsync` (detection removes only an unanswered pair), the local overlap queries, the probes; re-keyed with the links by `SyncLinkStore.RekeyAsync`). `CopyRules` (pure: `IsCopy`, `Decide` by the *Link matches* setting, `SameOriginals` (1.1's rule), `AsksAgain`, fingerprints, hints, the probe sample). `CopyPayload` (pure: details as portable lines, `Merge` of the chosen sides into one payload, `ExcludeVersions`, `ExcludedKeys`, `KeepVersion`: Main takes the version that stays when the one it used is dropped). `CopySides` (both sides from the index and a server; `HeldElsewhereAsync`, the last-copy check across every archive; `VersionsAsync`, second versions). `CopyFinder` (`FindServerAsync` after each refresh: probes, `POST /photos/lookup` in batches, manifest comparison, at most 50 a refresh (20 on an older server), `Decide`; `FindLocalAsync`; `ResetProbesAsync`). `CopyReviewBuilder` (facts, full comparison, detail lines, projects, renders, capabilities with their blocks). `IntegratePlanner` (the Integrate dry run and fingerprint), `IntegrateJobHandler` and `IntegrateJournal` (`integrate`, 25: journal `.chronos/journal/integrate-.json`; link, photos both ways, trash after the winner's hash, details through `SyncService.ApplyAgreedAsync`, projects through `ProjectTransplant`), `CopyJobs` (handler and queuing, pair to Integrating by compare-and-set; `IntegrateJobContext.UserId`, the planning account). `CopyLog` (why a losing version was kept, in the UI language, for the Integrate and merge logs). `CopyEngine` (`ICopyEngine` composed: list, find, compare, plan and queue Integrate and merges, keep apart, ask again, link, unlink, keep here, trash here (from the sequence named, a merge's kept one) and there with a re-read of the other side and of the last copies, `VersionsAsync` and the drop of one of two versions, unlink by the local side, twins only with a sibling at the other home; optional dependencies keep App types out). `UploadAllRule` (pure: what *Upload all local* skips and why). Owned by the copies code; `Sync`, `Archiving` and `Projects` call into it only through `FoundCopyStore` and `CopyFinder` | | `Homes` | Owner review 5, #66: `HomeLayoutMigration` (`PlanAsync`, `ApplyAsync`: the 1.0 workspace and cache sorted into homes by same-folder renames checked by inventory, deferrals for leased projects, an offline workspace and an unfinished move; `RekeyAsync`: an address home renamed to the server id at sign-in), `HomeLayoutJournal` (the journal in the data folder that resumes after a crash) | ### 2.3 Chronos.App areas @@ -77,13 +77,13 @@ Dependencies point one way: `Core` ← `Core.Windows`, `Data`, `Protocol` ← `S |---|---| | `Shell` | `MainWindow` (rail and its shortcuts, taskbar progress), `ShellViewModel` (rail, sections, first run), `OsNotifications` (toasts as Windows notifications while the window is minimised or in the background), dialogs, `ErrorText` (the sentence of an error toast), `ScreenCapture` (`--capture` scenes), `SectionTemplates.xaml` (view model → view) | | `Sections` | One `XxxView.xaml` + `XxxViewModel` per screen: Welcome, Library, Sequence (the Edit section: the editor, `SequencePickerView` choosing in place a project of the workspace or a sequence of the library, the in-window dialogs of the workspace, and the opening of this PC's sequences as workspace projects: the project opened last, else "Open in workspace", the checkout and the copy job followed until it opens), Import, Videos (owner review 1, R9: `VideosView` and `VideosViewModel`, the rail section on Ctrl+4 that implements `IVideosSection`: filters, order, cards or list, the selection's actions with their reasons, Delete… dry runs per home, the player pane), Archive, Jobs (two tabs, Queue and Scheduled: `SchedulesView` shows `Jobs/SchedulesViewModel`), Server, Settings (its last page is About; Archive's *Videos folder* row) | -| `Library` | Filter, facets, pager, timeline, saved views, quick and mass actions (`MassActions`: Reorganize and Convert for the sequences of one archive), remote cards and thumbnails, thumbnail cache, list export | +| `Library` | Filter, facets, pager, timeline, saved views, quick and mass actions (`MassActions`: Reorganize and Convert for the sequences of one archive), remote cards and thumbnails, thumbnail cache, list export. Owner review 6, #73: `VersionsDialogViewModel` (*Two versions…*: a local sequence's photos kept in two versions, each with *Drop…*; `Menu.Card`, `Menu.CardMatch`, `Menu.CardMatchRemote`) | | `Editor` | `EditorSession` (project, undo/redo, saving, merges through `Data/Projects/ProjectMerge`), `ISequenceSource` (`LocalSequenceSource`, `RemoteSequenceSource`, `WorkspaceSequenceSource`: a workspace project over its media, the working state saved in `project.chronos` under the project's lease and merged photo by photo in the portable form (`Merge`, a setting both sides changed asked through `ProjectConflictException`), `ReadOnlyChanged` for a project of a newer Chronos, an unstored edit kept aside in `versions/.replaced` (`SetAsideAsync`), renders at the home with the portable settings through `IProjectRenders`, naming a version only while none waits to be sent; a server home's analyses and renders are the server's jobs over `WorkspaceServerHome(connect, session)`, which connects again when the sign-in changes, a render naming the version the server holds when the project is in step with it), `ServerJobs` (a server sequence's analyses and renders followed through its events, shared by `RemoteSequenceSource` and a server home's `WorkspaceSequenceSource`), the steps of the Edit path (`EditPath`: their order, each step's state, the step of each finding, the memory of the step shown; tabs Analysis, Frames, Exposure, Motion, Camera, Time, Stack, Export), the step rows (`CameraTab`: Aspect, Rotation, Mirror, Flip, Straighten, Crop size/X/Y and Reset framing through `EditorSession.Orient` and `ResetFraming`, the crop kept locked by `EditorSession.KeepCropLocked`; `ExposureTab`'s Look group; `ExportTab`'s Output size, Resolution, the Encoding and Playback rows and the footer (owner review 1, R3/R8); `ExportGroups` (`SettingGroup`: a collapsible group with its summary, open state in `EditorSettings.Groups`, which `AppSettings.EditorGroups` keeps; `ExportRules`: what rate control, keyframes, B-frames and profile offer per codec and depth, keyframes in seconds, the standard resolutions); `PresetTable` (the preset rows and their groups); `RenderMenu` (the header's Render ▾ entries, built on each opening: recommended, batch, recent, Other presets by group, Render batch, Add to queue, Save frame, Videos); `VideosLink` (the editor's way to the Videos section on a sequence); `EditorSession.StillRequests` (Save frame through the source's routing, `IProjectStills` for workspace projects); `SettingRows`: `SwitchRow`, `IconActionsRow`, `GroupRow`; `SliderActivity`, the Straighten slider showing the grid), `CropCommit` (a finished crop drag on the preview to `EditorViewModel.CommitCropCommand`, one undo step), `PreviewRenderer` (Source framing in the view frame through `RenderGeometry.ViewFor`, the mask from `EditableCrop` or `FootprintInView`, `FrameFinish` on the corrected picture only, motion vectors without it), `ExportPlanner`, `ExportSync`, `SavedCopies`, `SequenceJobs`, `ProjectFiles` (save and open `.chronos` project files: format 2 opens its workspace project, format 1 gives its settings to Main) | | `Videos` | Owner review 1, R9: `VideoSources` (WPF-free: `VideoEntry` rows of this PC's library, the signed-in server's `/videos` and the workspace's unsent renders merged by render id, `VideoFilter` and its order, `VideoServerState` for a server not signed in, without `videos` or out of reach, `WithLocalCopies` for server renders downloaded here; `VideosFolders`: the default `Videos\Chronos` and the folder's refusals), `VideoRows` (cards and list rows with their chips), `VideoPlayerPane` and `VideoPlayerViewModel` (in-process playback: `MediaElement` for videos, an image for stills and a GIF's or APNG's first frame, *Cannot play here*); the trash dialog restores video entries through `IVideoLibrary` | | `Workspace` | Owner review 2, R8: `WorkspaceHost` (the desktop's `WorkspaceStore` and `WorkspaceSync` over Settings › Workspace's folder, this PC's archive or, through `SyncHost.ProjectHome`, the signed-in server as the home (a server it is not signed in to reads as offline; `HomeChanged` from the server's `projectChanged`, texts worded for it by `WorkspaceText.ForHome`); checkout and copy with its size and free space, status, Save version with the sync after it, sync, resolve, restore, history, open, new, rename, delete, the plan and removal of a local copy whose files but the media go to `/.trash` (put back whole when a move fails), pruning past Kept versions after `HoldsAsync`, copies a newer Chronos wrote or that cannot be read listed as such and never changed, a folder inside a library refused, `PlanFolderAsync` and `UseFolderAsync`; phase 5c partials: `WorkspaceHost.Media` (Copy originals, Proxies only), `.Render` (local renders, Send again), `.Cleanup` (usage, the clean-up after each copy and by schedule, the trash's plan and Empty, the removal's unsent renders and originals) and `.Move` (move plan and job, `IsMoving` gate, `MoveEnded`, the unfinished move)), `WorkspaceFolderChange` (Settings › Workspace › Change…, Move… and Resume, and the refused folder's Choose folder), `ProjectMenuViewModel` (the title's ▾: state chip read again after edits, the menu, Update media; `IWorkspaceUi` is what it asks of the section, `ShowDialogWhenFree` holding a background conflict until the open dialog closes), `WorkspaceDialogs` (Open in workspace with unreadable projects listed disabled, project name, Save version, History, conflict, a format conflict offering only Save both, Remove local copy with its typed confirmations; `WorkspaceDialogs.xaml`), `WorkspaceProjectItem` (a picker row), `WorkspaceText` (states, versions, authors, failures). Owner review 5, #66: `WorkspaceHost.Homes`, `Find`, `SyncOf`/`SyncFor` (one sync per store), `SameServer`, `Identity`, `Reopen` (the `Store` and `Sync` properties are gone) | | `Import` | `CardPool` (inserted cards, remembered cards, folders), camera profiles, plans and choices, destinations (archive, folder, server through `ServerImportSink`), card actions (verified delete, format, eject) | | `Archive` | `CurrentArchive`, `ArchiveTree`, figures for the charts, maintenance reports, Reorganize (`ReorganizeDialogViewModel`: folder, file and title templates each with its switch, the dry run, Apply queues the `move` job of that plan; `ReorganizePlans`: each template's check, the plan as rows and a summary; `ReorganizeOffer`: per archive, the templates Settings › Archive's toast offers, joined while that archive's toast is up), Convert (`ConvertDialogViewModel`: format, JPEG quality and a mode chosen at every run, the dry run made once per format and quality, Apply behind the mode's confirmation queues the `convert` job of that plan through `MassConverter.QueueAsync`; `ConvertPlans`: the plan as rows in the mode's words, a summary, the space line, the Replace confirmation that types the number of photos and the New sequence one that counts the photos not copied; `ConvertUndo`: the Undo the Jobs screen's toast offers when Replace conversions end, which restores the `Replaced` trash entries their jobs made, by the job's id), retag, delete and trash dialogs (`SequenceDeletion`, `DeletePlans`, `TrashEmptyPlans`: Empty… behind a dry run and a typed confirmation, every entry whose conversion was deleted named first), `ArchiveFailures` | -| `Server` | `ServerSession`, `ConnectFlow` (trust on first use), `SyncHost` (sync engine, agent, metered hold (`UploadHold`: uploads, downloads and the workspace's server copies and sends), editor connections, Export Sync; `HasProjects`, `ProjectHome` and `ProjectChanged`, also told with null at each session start and stop: the server as a project home), sync table, `RemoteSequenceApi`. Owner review 5: `SyncHost.Identity`, `KeyOf`, `LastServer`, `KnownServersChanged`, `IdentityClash`, `OriginalsArchiveAsync`/`OriginalsForDownloadAsync`/`OriginalsArchivesAsync` and the re-key in `SwitchAsync` (#66); `ServerJobsApi` (`IServerJobsApi`) and `ServerJobsViewModel`/`ServerJobsView`, the connected server's running and paused jobs (#65); `LibraryShare` (`ShareState`, `ShareClient`, `ShareUploadsStep`: this PC's library shared on the LAN through `Chronos.Server`'s `HostedServer`, #67) and `ConnectFlow` refusing the own share (`ConnectError.OwnLibrary`). Owner review 6, #73: `Server/Copies` (`CopyListViewModel` and `CopyRow`: Server › Matches, its chip, actions, toasts and the Library statuses; `CopyText`: the pure words, glyphs and actions of a pair; `CopyDialogViewModel` with `CopyPhotoRow`, `CopyDetailRow`, `CopyProjectRow`, `CopyPlanLine` and `CopyDialogs.xaml`: the in-window Compare/Integrate and merge dialog hosted by `ServerView`; `CopyScenes`: the capture and test scenes), `CopyWatch` (local detection after the index opens and after jobs that change photos), `WorkspaceCopyGuard` (`IWorkspaceGuard` over `WorkspaceHost.HasUnsentWorkAsync`), `SyncHost.Copies` (the `CopyEngine`), `UploadHold` holding `Integrate`, `SyncTableViewModel` applying `UploadAllRule` | +| `Server` | `ServerSession`, `ConnectFlow` (trust on first use), `SyncHost` (sync engine, agent, metered hold (`UploadHold`: uploads, downloads and the workspace's server copies and sends), editor connections, Export Sync; `HasProjects`, `ProjectHome` and `ProjectChanged`, also told with null at each session start and stop: the server as a project home), sync table, `RemoteSequenceApi`. Owner review 5: `SyncHost.Identity`, `KeyOf`, `LastServer`, `KnownServersChanged`, `IdentityClash`, `OriginalsArchiveAsync`/`OriginalsForDownloadAsync`/`OriginalsArchivesAsync` and the re-key in `SwitchAsync` (#66); `ServerJobsApi` (`IServerJobsApi`) and `ServerJobsViewModel`/`ServerJobsView`, the connected server's running and paused jobs (#65); `LibraryShare` (`ShareState`, `ShareClient`, `ShareUploadsStep`: this PC's library shared on the LAN through `Chronos.Server`'s `HostedServer`, #67) and `ConnectFlow` refusing the own share (`ConnectError.OwnLibrary`). Owner review 6, #73: `Server/Copies` (`CopyListViewModel` and `CopyRow`: Server › Matches, its chip, actions, toasts and the Library statuses; `CopyText`: the pure words, glyphs and actions of a pair, three row buttons at most, `MiddleTrim` for long names, the merge's classes by role; `CopyDialogViewModel` with `CopyPhotoRow`, `CopyDetailRow`, `CopyProjectRow`, `CopyPlanLine` and `CopyDialogs.xaml`: the in-window Compare/Integrate and merge dialog hosted by `ServerView`; `CopyScenes`: the capture and test scenes), `CopyWatch` (local detection after the index opens and after jobs that change photos), `WorkspaceCopyGuard` (`IWorkspaceGuard` over `WorkspaceHost.HasUnsentWorkAsync`), `SyncHost.Copies` (the `CopyEngine`), `UploadHold` holding `Integrate` and resuming only the jobs it paused (their ids in the app setting `sync.meteredHeld`; `Forget` from Jobs, the sync table and Matches), `SyncTableViewModel` applying `UploadAllRule` | | `Jobs`, `Settings`, `About` | Job list and buffering, `JobNotices` (which job endings raise a toast, conversions among them; `JobEndings` lets a batch speak once); the schedules of Jobs › Scheduled (`DesktopScheduleHost`: the desktop's `IScheduleHost` and its system schedules `archive-scan`, `index-backup`, `housekeeping`, `workspace-cleanup`; `CacheTrimStep`, `WorkspaceCleanStep` and `WorkspaceTrashStep`, the host's clean-up steps; `SchedulesViewModel`, `ScheduleRowViewModel`, `ScheduleEditorViewModel` and `ScheduleDialogs.xaml`, the in-window editor; `ScheduleText`); settings rows (`LogSettingsRows`: Advanced's log rows; `WorkspaceSettingsRows`: Settings › Workspace), encoder and format inventories, `ProcessingTuning` (Settings › Rendering and Analysis applied to each job: parallelism, memory budget, quality), `InterfacePriority`, language catalog, naming preview; `AboutViewModel` (owned by the shell, not a section: Settings › About, the update notice of Settings › Updates and the update check on start), update check and download. Owner review 5: `JobText.Status`/`RowStatus`/`RowStatusToolTip` (the status line of a job's detail, `BarStatusLength` 60) and `JobEntry.Detail` (#65); `Settings/HomeRows` (`HomeFolderRow`, `KnownServerRow`, #66) and `Settings/ShareSettingsRows` (#67). Owner review 6, #73: `Settings/CopySettingsRows` (Link matches, Integrate photos, Integrate projects; `SettingsOption.ToolTip` per option); Jobs opens Server › Matches for an Integrate and the kept sequence for a merge | | `Infrastructure` | `AppServices` (composition root; `SequenceReorganized`, raised after each Reorganize step and each sequence a conversion replaced or made, reloads an editor open on that sequence; the archive engine's free space from `VolumeInfo.FreeBytesAt`), `AppSettings`, `AppLogging` (Settings › Advanced › Logs applied to the log files from their first line, a launch that only hands over included, and at every save), `AppEnvironment` (installed or portable), `AppClock` (today's date, frozen by `--capture`), `StartWithWindows` (this copy's sign-in entry), `UiLanguage`, `LiveRegion`, `RenderNodeHost`, `DiagnosticsBundle`, `ShellActions` (BRIEF §8.6), `SingleInstance` (one Chronos per data folder; a later launch hands its file over a named pipe, or waits for a closing one to exit and starts in its place), device monitor. Owner review 5: `AppSettings.KnownServers` and `Share`, `AppServices.SortHomesAsync` with `HomeLayout`/`HomeLayoutError`, `CacheStore.ServersFolder`/`ServerFolder`, `AppServices.Share` | | `DesignTime` | `SampleData`: the archive, jobs and server the screenshots and smoke tests run on, dated from the fixed `SampleData.Now`; `SampleJobDetails.Apply` (the sample jobs' details), `SampleServerJobs` (the server jobs capture); `SampleCopies` (`SampleCopyEngine`, the sample matches in every state; owner review 6, #73) | diff --git a/docs/BRIEF.md b/docs/BRIEF.md index 14f54af8..7f07547c 100644 --- a/docs/BRIEF.md +++ b/docs/BRIEF.md @@ -1328,7 +1328,16 @@ player smoke test on Windows CI. share of photos shared, or the other archive) or *Deleted there* (the match deleted photos this one still holds), on its card and in the list. *Compare…* in the card's context menu and the list row opens Server › Matches searched by the sequence's title. The statuses survive a - refresh of the Library. + refresh of the Library. Amended 2026-11-17 (owner Q3 "default unione": a differing photo + kept in both versions stays listed so the user can drop one): a local sequence's card and + row menu offer *Two versions…*, the photos it keeps in two versions (two usable hashed + frames of one capture instant with different SHA-256, e.g. left by a Union merge whose pair + is gone; an empty list says so), each version with *Drop…*: a dry run that says why it + cannot go (archive offline or read-only, a job on the sequence, the frames changed) instead + of asking, a confirmation naming the version that goes and the one that stays, then the + archive trash, only while the other version is still there, usable and verified by + content. A merge job's *Open* shows the list when the kept sequence has any. A server + sequence's card in a match offers *Compare…* alone. ### 12.3 Edit (amended 2026-10-16, R7; formerly "Sequence editor"; amended 2026-10-26, R8; amended 2026-11-04, owner review 1 R5/R6) @@ -1363,7 +1372,9 @@ player smoke test on Windows CI. that cannot open. Amended 2026-11-16, owner review 6 R5: a Workspace row whose time-lapse (a linked or integrated match) also has a workspace project at the other home shows a muted *Twin* chip right after the project name, its tooltip naming the other home (the server by - name) and project. + name, its Main in the UI language) and project. Only a sibling makes a twin (amended + 2026-11-17): the other home holds a project of the same name, or of the name *Copy across* + gave it (` ()`, ` ()`), either way round, ignoring case. - The steps form a guided path, freely navigable: **Analysis** (every finding of the analyses with the step that deals with it; light, flicker, exposure steps received, shake and flagged frames; Analyse), **Frames** (virtualized table: index, time, @@ -1737,12 +1748,21 @@ workspace work not sent home, has a detail or a differing photo not chosen, hold photo nothing else holds, holds photos in the other's folder the index has not read (copied in by hand, or filed by another index; checked again before the links move and at the trash), or the space is short (512 MiB kept free). *Merge* asks to type the other's photo -count, then the `merge-sequences` job copies and files the other's photos (hash-checked, -tombstones honoured), moves the renders, re-hashes every original of the other against the -kept one, sends the losing versions to the photo trash, writes the details, copies the -projects, moves keys and links, and moves the other into its archive's trash only at the -frames version it verified. Its journal resumes each stage after a crash; a retry whose pair -was answered meanwhile, or whose other sequence changed, plans again instead. +count (digits without separators, the prompt naming the number), then the `merge-sequences` +job copies and files the other's photos (hash-checked, tombstones honoured), moves the +renders, re-hashes every original of the other against the kept one, sends the losing +versions to the photo trash, writes the details, copies the projects (one the kept sequence +already holds a copy of, by name and history content, is not copied again and its renders +name that copy), runs its trash checks, moves keys and links, and moves the other into its +archive's trash only at the frames version it verified. Its journal resumes each stage after +a crash; a retry whose pair was answered meanwhile, or whose other sequence changed (work +sent to it since the plan, photos a third sequence no longer holds), drops the journal and +plans again instead; a resumed merge verifies a photo flagged damaged since its first verify +before anything goes to the trash. A merge abandoned after the +links moved gives the other sequence back its links, session keys and pairs (amended +2026-11-17). The dialog's photos read *Kept* and *Other* from its first plan; once a +sequence is kept, its one-sided classes are named by role (*Only in kept*, *Deleted in +other*), and *To trash…* on *Deleted in other* trashes from the kept sequence. Maintenance › *Trash…* (amended 2026-10-26, R6) lists the archive's trash (§7), newest first: deleted sequences and photos deleted from sequences, each with its kind, photos, @@ -2023,7 +2043,8 @@ lets the user choose what to do with each: index opens and 10 s after a Scan, Rebuild, Verify, Import, Download, Convert, merge, Integrate or Empty trash ends. A folder of sequences kept elsewhere is added with *Adopt folder…* and compared like any archive; there are no watched folders. *Find matches* - probes everything again. + probes everything again. Detection removes only unanswered pairs: an answer given while it + runs stays. - *Link matches* (Settings › Server, §12.8) decides what a server match becomes: *Ask always* (default) lists it; *When identical* links it when both sides hold exactly the same photos by SHA-256; *Half shared* keeps 1.1's rule (the same first second and camera, half @@ -2035,7 +2056,12 @@ lets the user choose what to do with each: *integrated*, *deleted there · n*, *deleted on server*, *kept here*) and the actions of the state: *Compare…*, *Integrate…* (*Merge…* for a local pair), *Keep apart*, *Ask again*, *Unlink*, *Review*, *Keep here*, *Upload again*, *To trash…*. A disabled action says why. - *Keep apart* and *Unlink* toast with *Undo*; *Keep apart* is remembered and asked again + A row shows three buttons at most (a linked pair with photos deleted there: *Compare…*, + *Unlink*, *Review*); a long archive or server name is cut in its middle, whole in the + tooltip (amended 2026-11-17). *Unlink* and *Keep apart* act on the local sequence the row + names and leave alone a link that joins another sequence since; *Link only* waits while an + integration of either side runs, and an integration never undoes a link given to another + sequence since. *Keep apart* and *Unlink* toast with *Undo*; *Keep apart* is remembered and asked again only when the match becomes identical or its shared photos grow by the larger of 10 and a quarter of those shared when it was answered. The rail badge counts conflicts and matches that need attention. In the sync table a sequence in an unanswered match reads *match found* with *Compare…* first, and a linked @@ -2050,23 +2076,34 @@ lets the user choose what to do with each: the one that stays, with its hero and keyframes; amended 2026-11-17), *To trash…* for photos deleted there and *Delete on server…* for photos deleted here (the owner of the server sequence or an admin, with Delete). *Details*: one row per title, tags, rating, notes and setting, each side's value and a choice *This - PC | Server* with nothing preselected, *All this PC* / *All server* above. *Projects*: + PC | Server* with nothing preselected (each segment's tooltip says which value it takes), + *All this PC* / *All server* above. *Projects*: *Copy across | Leave them* and each side's projects with where each goes. *Plan*: what each side receives, sends, keeps in two versions, sends to the trash (last copies first), the details changed, projects copied, free space and quota left, whether new photos will move by themselves, and each block with its reason and, where one exists, the action that clears it; *Link only* (a server match not linked yet) links without moving anything. + *Apply* plans again first when the shown plan is pending or was made for other choices. - *Integrate* (local and server; R3, owner Q2 "Completa entrambe") is blocked while a detail has no choice (the dialog then opens on Details), either side is busy or gone, the server - lacks `upload-into` or the account may not add to or delete from its sequence as the plan - needs, or space is short. A plan that replaces photos asks first (*Replace photos?*, the - losing versions listed under the side that loses them). The `integrate` job links the two, - moves the photos each side lacks both ways (never creating or retargeting a server - sequence), sends a losing version to the trash only after the winner is confirmed by hash - on that side (on the server through a dry run, then at the frames version it read; the - server allows it to the sequence's owner or an admin), writes the agreed details to both - sides as one change, and copies the projects (§14.5). Its journal resumes each stage; a - retry after the user answered the pair otherwise refuses. + lacks `upload-into` or the account may not add photos to its sequence (it neither owns it + nor may edit), or space is short. A plan that replaces photos asks first (*Replace + photos?*, the losing versions listed under the side that loses them). The `integrate` job + links the two, moves the photos each side lacks both ways (never creating or retargeting a + server sequence), sends a losing version to the trash only after the winner is confirmed by + hash on that side (on the server through a dry run, then at the frames version it read), + writes the agreed details to both sides as one change, and copies the projects (§14.5). Its + journal resumes each stage; a retry after the user answered the pair otherwise refuses. + Amended 2026-11-17: who may trash a server sequence's photos is decided per sequence, as + the server's `frames/delete` allows it: the account that owns that sequence or an admin, + each with Delete (the job carries the planning account, so it plans as the dialog did). + For anyone else the server's losing version stays and is kept out of the server's Main, + which uses this PC's version; the plan lists it as needing the Delete right instead of + blocking. A server title, tags, rating or notes change made while the job runs stops its + Details stage on a line where the user kept this PC's value (nothing is overwritten on + either side); a change on a line the plan did not have, or where the user took the + server's value, is taken in. The job checks at its Link, Trash and Details stages that the + link still joins its two sides. - After an Integrate that left nothing out, the pair is *integrated*: its new photos move by themselves both ways (§14.5); three failures in a row raise "{title}: photos not sent" · *Show* and the row reads *not sent* with the reason. An Integrate that left photos out @@ -2074,13 +2111,16 @@ lets the user choose what to do with each: - Deleted there: photos the other side deleted that this side still holds read *deleted there · n* with *Review* (the dialog on that class) and go to this PC's trash only through *To trash…*, after a dry run and a confirmation naming last copies, and only while the other - side still has them deleted. + side still has them deleted; a photo that became a last copy since the plan stops it as + stale (amended 2026-11-17). - Deleted on server: a linked server sequence that answers 404 is marked once per refresh (only on a server known by its id, at most once every 10 minutes, never in a sweep where 5 or more links answer 404 and none answers); a second 404 at least 10 minutes later makes the row read *deleted on server*, with *Keep here* (then *kept here*, *Upload again* only), *Upload again* (a new server sequence) and *To trash…* (the Library's delete, last - copies named). A sequence that comes back is linked or asked again. + copies named). A sequence that comes back is linked or asked again. The sync table's row + of that sequence offers the same three actions; a single pair's 404 is confirmed with the + server, a sweep of many is not asked again pair by pair (amended 2026-11-17). - *Upload all local* (R7, owner Q8 "Saltale e segnalale") skips sequences in an unanswered or kept-apart match, in an integrating pair or a job's hands, whose server copy was deleted, or in any server's originals archive; each skipped row reads *skipped* with the reason @@ -3817,7 +3857,10 @@ questions asked and the answers; DECISIONS rows give the reasons. | 2026-11-16 | Owner review 6, R2/R3/R4 (compare, integrate, merge, #73) | §5, §12.5, §12.7, §12.8, §14.3, §14.4, §14.6 | The Compare dialog (Photos, Details line by line, Projects, Plan); *Link only* and *Unlink*; *Integrate* (`integrate`, 25) completes a local sequence and its server match both ways under the *Integrate photos* policy (*Union* by default, *Choose each*, one side wins for differing photos), losing versions to the trash only after the winner is hash-confirmed, the details applied as one change; the merge of two local sequences (`merge-sequences`, 26) into the kept one, the other into its archive's trash after every photo is verified, typed by photo count; both journaled and resumable; uploads into a target (`intoTarget`, capability `upload-into`) copied on the server; a background job never interrupts a running one. | | 2026-11-16 | Owner review 6, R5 (projects across, #73) | §12.3, §12.8, §14.5 | Other projects leave their home only through an Integrate with *Copy across* (the default of *Integrate projects*) or a merge, with their histories, ` ()` on a clash; with *Leave them* the two workspace copies are twins in the Edit picker. | | 2026-11-16 | Owner review 6, R6 (sync after integrating, #73) | §12.2, §12.7, §14.5 | New photos of an integrated pair move by themselves both ways at background priority, held on metered connections, told as *not sent* after three failures; settings sync as for any link; *deleted there* goes to the trash only on confirmation; a server sequence that answers 404 twice reads *deleted on server* with *Keep here*, *Upload again* and *To trash…*. | -| 2026-11-17 | Owner review 6, verification round 5 (#73) | §12.7 | *Pause metered transfers* resumes only what it paused, a restart included; a merge's *Choose each* has no *Leave* and blocks until each differing photo is chosen; a merge is blocked while the other's folder holds photos the index has not read; *Drop…* of the version Main uses lets Main use the one that stays (*In Main* marks it). | +| 2026-11-17 | Owner review 6, verification round 3 (#73) | §12.7 | Integrate trashes a server photo only for the server sequence's owner or an admin, with Delete (decided per sequence, as `frames/delete` allows); for anyone else the server's losing version stays, out of the server's Main, listed as needing the Delete right; a server detail change made while the job runs stops its Details stage where the user kept this PC's value; detection keeps pairs answered while it ran; a sync row whose match the server deleted offers *Keep here*, *Upload again* and *To trash…*. | +| 2026-11-17 | Owner review 6, verification round 4 (#73) | §12.2, §12.5, §12.7 | *Two versions…* on a local sequence's Library menu lists the photos it keeps in two versions, each with *Drop…* (owner Q3), and a merge job's *Open* shows it; a merge skips only a project the kept sequence holds a real copy of, runs its trash checks before the links move and gives the other back its links if abandoned; the merge confirmation types the count without separators; *Apply* plans again when the plan is stale; Matches rows cut long names in their middle. | +| 2026-11-17 | Owner review 6, verification round 5 (#73) | §12.2, §12.5, §12.7 | *Pause metered transfers* resumes only what it paused, a restart included; a merge's *Choose each* has no *Leave* and blocks until each differing photo is chosen; a merge is blocked while the other's folder holds photos the index has not read; *Drop…* says why it cannot go before asking, and *Drop…* of the version Main uses lets Main use the one that stays (*In Main* marks it); a server card in a match offers *Compare…* alone. | +| 2026-11-17 | Owner review 6, verification round 6 (#73) | §12.3, §12.5, §12.7 | A merge that finds the other changed drops its journal and plans again; *Unlink* and *Keep apart* act on the local side they name; *Link only* waits while either side integrates, and an integration keeps a link given to another sequence since; a sweep of 404s is not confirmed pair by pair; *To trash…* trashes from the kept sequence of a merge and stops when a photo became a last copy since the plan; a row shows three buttons at most; a Details segment says which value it takes; a twin needs its sibling at the other home. | ## Appendix A — `CLAUDE.md` content (create verbatim in Phase 0, keep updated) diff --git a/docs/CHANGELOG.md b/docs/CHANGELOG.md index 963fbe84..d4f94ccf 100644 --- a/docs/CHANGELOG.md +++ b/docs/CHANGELOG.md @@ -36,6 +36,11 @@ match. A 1.1 server works as before, without Integrate; a 1.2 server adds the ph - **Merge sequences** (R3): two matches on this PC are merged into the kept one; the other goes to its archive's trash only after every one of its photos is verified in the kept one. The confirmation asks to type its photo count; the *Merge sequences* job resumes after a crash at each stage and moves renders, projects, session keys and links. +- **Two versions…** (owner Q3): a local sequence's Library menu lists the photos it keeps in two versions (a Union + merge leaves them), each version with *Drop…*: a dry run, a confirmation naming the version that stays, then the + archive trash; a merge job's *Open* shows the list. +- Integrate trashes a server photo only for the server sequence's owner or an admin, with Delete; for anyone else the + server's losing version stays, out of the server's Main. - **Projects across** (R5): an Integrate with *Copy across* (the default) copies each side's projects, with their histories, to the other home, named "name (PC)" on a clash; with *Leave them* the Edit picker marks the two workspace copies *Twin*. @@ -192,6 +197,11 @@ match. A 1.1 server works as before, without Integrate; a 1.2 server adds the ph - The Edit picker marks a project as a twin only when the other home holds its sibling (the same name, or the name Copy across gave it). - Italian: *Solo in quella tenuta*, *Eliminate in quella tenuta*; the replace tooltips name the kept sequence. + - Hindi: merging sequences reads मर्ज, no longer close to मिलान (match); Croatian: the matching sequence reads + *podudarna sekvenca* in the Compare and skip tooltips; Finnish: the replaced-photos line of a merge confirmation + no longer reads as a count of items. + - The translation glossaries list the match terms (Match, Integrate, Merge sequences, Keep apart, Twin, Link only + and Unlink, Union, Kept and Other) for every language. ## [1.1.1] — 2026-11-16 diff --git a/docs/DECISIONS.md b/docs/DECISIONS.md index 96c8d35d..c946b2d0 100644 --- a/docs/DECISIONS.md +++ b/docs/DECISIONS.md @@ -940,7 +940,7 @@ One line per decision: date · decision · alternative · reason. | 2026-11-17 | A reconcile that finds a linked or integrated pair with no score yet (a plain upload or download link) computes its full detection score once (#73) | Leave it at zero | Ask again after an Unlink must compare against real counts | | 2026-11-17 | `SyncService.ApplyAgreedAsync` writes the server first, by content, absorbing one-sided server changes and retrying a 409 up to three times, then this PC under the strict version check; a side that already holds the final payload is not written again (#73) | This PC first; write both always | A server change made meanwhile must not be lost silently; a resumed job must not write twice | | 2026-11-17 | The plan context (rights, names) travels with an Integrate job (`IntegrateJobParameters.Context`, a JSON copy without the id sets); a job queued without one plans with `IntegrateJobContext.Permissive` (#73) | Plan the job without the context | Rights and names change the fingerprint: the job must plan as the user's plan did | -| 2026-11-17 | Until a server tells ownership per sequence, the desktop's plan context reads `OwnsOrAdmin` as the Delete right or an admin right (ManageArchive, ManageUsers); the server still enforces ownership on `frames/delete` (#73) | Ask the server for each sequence's owner | The client does not know who owns each server sequence; a wrong guess fails at the dry run, before anything moves | +| 2026-11-17 | (Superseded by the 2026-11-17 row deciding ownership per sequence, below.) Until a server tells ownership per sequence, the desktop's plan context reads `OwnsOrAdmin` as the Delete right or an admin right (ManageArchive, ManageUsers); the server still enforces ownership on `frames/delete` (#73) | Ask the server for each sequence's owner | The client does not know who owns each server sequence; a wrong guess fails at the dry run, before anything moves | | 2026-11-17 | An Integrate's journal is kept after a failure (the job resumes) and deleted on a cancel and when the job finishes; a job that ends with steps or projects kept leaves the pair Linked, not Integrated, and fails with `Errors.Copies.Kept` or `ProjectsKept`; a server sequence gone during it raises `RemoteGoneException` (#73) | Keep the journal on cancel; call the pair integrated | A cancel drops the plan; a pair that kept something apart must not move photos by itself | | 2026-11-17 | Busy, for both planners, is a running transfer of the pair plus the pending and running jobs on the local id, its archive and the remote id, the job itself excepted; the quota left is a warning in the Integrate plan, not a block; a merge keeps 512 MiB free (#73) | `ListHoldsAsync` and `ListPendingTargetsAsync`; block on quota | One query covers transfers and jobs; the server refuses an upload over quota itself | | 2026-11-17 | A merge's fingerprint uses its own per-sequence frames stamp (count, bytes, hashed count, flag counts, tombstones) and a hash of each side's details, not the archive's convert stamp; Busy and Offline found by the trash dry run are reported as the merge's Busy and ArchiveOffline blocks (#73) | `GetConvertStampAsync`; list them as TrashBlocked | The convert stamp moves with any import in the archive and misses a title edit; one cause, one line | @@ -1002,3 +1002,9 @@ One line per decision: date · decision · alternative · reason. | 2026-11-17 | A Details segment's tooltip says which value it takes (*Take the value of Studio NAS: 33*; a merge: the kept or the other sequence's); a raw value tooltip wraps at 480 px (#73) | One tooltip for the row | The two segments did not say which side was which | | 2026-11-17 | A workspace project is a twin only when the other home holds its sibling: the same name, or the name Copy across gave it ("name (PC)", "name (server)"), either way round, ignoring case (#73) | Any project of a linked sequence | Every project read as a twin, one with no counterpart too | | 2026-11-17 | Italian: *Solo in quella tenuta* and *Eliminate in quella tenuta* (four words, over the three-word label rule, as the finding proposed: *quella* says it is a sequence, not a place) (#73) | Solo nella tenuta | "Nella tenuta" read as a place | +| 2026-11-17 | The Integrate and merge logs give the reason a losing version was kept in the UI language (`CopyLog`: one `Archive.Log.KeptReason.*` phrase per dry-run block, the stale-plan and server-refusal phrases, else the system's message), and name the files and projects they replaced or copied; an unreachable server's projects are named by the server's name (#73) | Log the block enum names | The job log is read by the user; an enum name says nothing | +| 2026-11-17 | *Upload again* on a Matches row and its sync row is enabled only for an account that may send sequences (`SyncHost.CanSendSync`: Upload and Edit), as the sync table's uploads are (#73) | Upload alone | A new server sequence takes the settings too, which needs Edit; the server would refuse it after the click | +| 2026-11-17 | The owner review 6 terms get a row in `i18n/GLOSSARY.md` and in each culture's `glossary.tsv` (Match/Matches, Integrate, Merge sequences, Keep apart, Twin, Link only/Unlink, Union, Kept/Other), each culture's term read from its own resx, so the glossary describes what ships (#73) | Write the glossary before the strings | The 36 cultures were translated at the release step; the glossary now fixes those choices for the next strings | +| 2026-11-17 | Hindi: merging two sequences reads मर्ज (*सीक्वेंस मर्ज करें*, *मर्ज जारी*), as project merges already did, instead of मिलाएँ/मिलाना; *मिलान* stays the match term; merging import sessions keeps मिलाएँ (#73) | Keep मिलाएँ for both merges | *मिलाना · 40 %* (merging) and *मिलान · 3* (matches) sat side by side in one State column and read as one word | +| 2026-11-17 | Croatian keeps *podudaranje* for a match (the Windows term of Find › Match), but the matching sequence itself is *podudarna sekvenca*: "s njoj podudarnom sekvencom", "odvojeno od podudarne sekvence" (#73) | *podudarnost*; *par* | "Njezino podudaranje" reads as "its matching", an act, where the tooltip means the other sequence | +| 2026-11-17 | Finnish keeps *kohteen {0}* for a name in a placeholder (the usual way to avoid inflecting it), but never right after a count: "{0:N0} kuvaa kohteesta {1}" instead of "{0:N0} kohteen {1} kuvaa" (#73) | Inflect the placeholder | After a number *kohteen* reads as "of n items" | diff --git a/docs/STATUS.md b/docs/STATUS.md index cf4ea401..bd71fcb9 100644 --- a/docs/STATUS.md +++ b/docs/STATUS.md @@ -20,7 +20,7 @@ by its `windows` job once a Windows runner is registered (`WINDOWS_RUNNER`), and | 8.4 Owner review 4 | Done (request and plan: `docs/requests/2026-11-06-owner-review-4.md`): released as `v0.1.0-rc.14` with owner review 1 phase 6 (the deploy guide `docs/deploy/`), then as `v1.0.0` (#23), the first stable release: R1 work board of every video made or published, the published apart from workspace work (#29); R2 the anonymous usage counts removed, nothing sent by itself (#30); R3 the archive's whole folder structure created inside the chosen archive path, desktop and server (#31); R4 the repository on Gitea in order (earlier work as closed issues #32–#54 in their milestones, the original documentation in `docs/reference/original`, `fe50b877`); R5 licensing set aside and recorded in #24. | | 8.5 Owner review 5 | Done (request, answers and plan: `docs/requests/2026-11-15-owner-review-5.md`; issues #64–#67, milestone v1.1.0), released as `v1.1.0`: one setup for Chronos Desktop and Chronos Uploader with the Uploader's update check (#64); the detail of mass passes (step, photo x of y, sequence n of m, rate, time left) on the desktop, the admin panel and, for the connected server's jobs, the desktop's Server section (#65); separate homes per server keyed by a stable server id, with the 1.0 workspace and cache sorted at the first start and a separate originals archive per server (#66); Chronos Desktop sharing its library on the LAN in place of Chronos Server for Windows, running on in the tray while it shares (#67). One review round, 15 findings fixed; strings in all 38 languages. Not run on the PC: the Windows-only smoke tests, `installer-test.ps1` and the release dry run (CI runs them). Follow-ups: a firewall status row, Change…/Forget on known servers, the LAN beacon announcing the server id, docs/ui DESIGN and mockups for the new screens. | | 8.6 Windows test of 1.1.0 | Done (#70, milestone v1.1.1), released as `v1.1.1`: the App and Core.Windows suites run whole on the development PC (5 stale screen tests brought up to date); a hands-on test of a portable 1.1.0 (import, Reorganize, sharing, a client, tray, Exit with clients); fixes: job log times in local time, the Jobs Type column, Forget in Bulgarian, the Reorganize capture. Still to do by the owner: the real 1.0 → 1.1 upgrade on this PC (UAC). | -| 8.7 Owner review 6 | In progress (request, answers and plan: `docs/requests/2026-11-16-owner-review-6.md`; #73, milestone v1.2.0), implemented on `or6-duplicates`, not released: matches, the same time-lapse on a server and on this PC under different ids or twice on this PC, found after each sync refresh (the server's new photo lookup) and after jobs that change photos (migration 0012, `Chronos.Data.Copies`); Server › Matches with Keep apart, Link only, Unlink and the Compare dialog (Photos, Details line by line, Projects, Plan); Integrate of a local and a server sequence (job 25: photos both ways under Union by default, details as one change, projects copied across, losers to the trash only after a hash check) and the merge of two local sequences (job 26: the other to its archive's trash once every photo is verified); new photos of integrated pairs moved by themselves, *deleted there* and *deleted on server* reviewed by the user; Settings › Server › Link matches (Ask always), Integrate photos (Union), Integrate projects (Copy across); Upload all local skips suspected matches. Eight parcels, one review round (correctness, safety, conformance) with every verified finding fixed, a gap round and six verification rounds; the strings in all 38 languages. Still to do: the PostgreSQL tests in CI, the Windows capture of the new screens against the design, the release. The photos a sequence keeps in two versions are listed with Drop… from the Library (Two versions…) and a merge job's Open. Follow-ups: a field-level merge of an integrated pair's settings (to ask the owner), the Import › Folder… warning, the same list in Edit. | +| 8.7 Owner review 6 | In progress (request, answers and plan: `docs/requests/2026-11-16-owner-review-6.md`; #73, milestone v1.2.0), implemented on `or6-duplicates`, not released: matches, the same time-lapse on a server and on this PC under different ids or twice on this PC, found after each sync refresh (the server's new photo lookup) and after jobs that change photos (migration 0012, `Chronos.Data.Copies`); Server › Matches with Keep apart, Link only, Unlink and the Compare dialog (Photos, Details line by line, Projects, Plan); Integrate of a local and a server sequence (job 25: photos both ways under Union by default, details as one change, projects copied across, losers to the trash only after a hash check) and the merge of two local sequences (job 26: the other to its archive's trash once every photo is verified); new photos of integrated pairs moved by themselves, *deleted there* and *deleted on server* reviewed by the user; Settings › Server › Link matches (Ask always), Integrate photos (Union), Integrate projects (Copy across); Upload all local skips suspected matches. Eight parcels, one review round (correctness, safety, conformance) with every verified finding fixed, a gap round and six verification rounds; the strings in all 38 languages, the match terms in every language's glossary; the Windows captures of the new screens are committed as screenshot baselines (`server-copies-*`, `library-copies-*`, `server-sync-copyfound-*`, `edit-picker-twins-*`); the photos a sequence keeps in two versions are listed with Drop… from the Library (Two versions…) and a merge job's Open. Still to do: the PostgreSQL tests in CI, the release. Follow-ups: a field-level merge of an integrated pair's settings (to ask the owner), the Import › Folder… warning, the same two-versions list in Edit, a capture scene of the Two versions… dialog. | | 9 Monetization | Not started: requires explicit approval (§22); the proposal is recorded in issue #24 (owner review 4, R5). | ## Verification (2026-10-12) diff --git a/docs/requests/2026-11-16-owner-review-6.md b/docs/requests/2026-11-16-owner-review-6.md index eab51596..4cc66110 100644 --- a/docs/requests/2026-11-16-owner-review-6.md +++ b/docs/requests/2026-11-16-owner-review-6.md @@ -67,7 +67,7 @@ local folders and *Upload all local*). The owner answered in Italian; quoted wor | Phase | Content | State | Commit | |---|---|---|---| -| 1 | `v1.2.0`: R1–R7 (#73); R8 tracking. Parcels: P0 foundation (contracts, migration 0012, store, wire, trash and job hooks, keys), P1a pure comparison and rules, P1b detection and sync integration, P2 server photo lookup and uploads into a target, P3 Integrate, P4 merge of two local sequences, P5 engine composition and automatic photos, P6 the desktop surfaces; then one review round (correctness, safety, conformance) with every verified finding fixed, a gap round and five verification rounds. BRIEF §5, §6.2, §12.2, §12.3, §12.5, §12.7, §12.8, §14.3, §14.4, §14.5, §14.6, §24 and Appendix C amended; DESIGN §4 *Matches*; DECISIONS rows dated 2026-11-16 and 2026-11-17 citing #73 | in progress: implemented on `or6-duplicates`, not released; strings in all 38 languages; the PostgreSQL tests and the Windows capture still to run | `283d04d9` … `2c06e7ac`, then the commit closing the fifth verification round | +| 1 | `v1.2.0`: R1–R7 (#73); R8 tracking. Parcels: P0 foundation (contracts, migration 0012, store, wire, trash and job hooks, keys), P1a pure comparison and rules, P1b detection and sync integration, P2 server photo lookup and uploads into a target, P3 Integrate, P4 merge of two local sequences, P5 engine composition and automatic photos, P6 the desktop surfaces; then one review round (correctness, safety, conformance) with every verified finding fixed, a gap round and six verification rounds. BRIEF §5, §6.2, §12.2, §12.3, §12.5, §12.7, §12.8, §14.3, §14.4, §14.5, §14.6, §24 and Appendix C amended; DESIGN §4 *Matches*; DECISIONS rows dated 2026-11-16 and 2026-11-17 citing #73 | in progress: implemented on `or6-duplicates`, not released; strings in all 38 languages and their glossaries; the Windows captures committed as baselines; the PostgreSQL tests in CI still to run | `283d04d9` … `38764972`, then the documentation pass | Follow-ups kept out of 1.2.0: a field-level three-way merge of an integrated pair's settings (settings sync as today, owner Q6; to be asked of the owner), the Import › Folder… warning for photos already on a server, merging two diff --git a/docs/ui/DESIGN.md b/docs/ui/DESIGN.md index ceba5275..f1030df5 100644 --- a/docs/ui/DESIGN.md +++ b/docs/ui/DESIGN.md @@ -96,28 +96,45 @@ Label column left of controls: 116 px in panels, 180 px in Settings. attention); while selected it replaces the sync table with the same row style: Sequence, This side, Other side (counts first, "{archive} · {n} photos"), State as glyph and word (*match found* ▲ Warning, *kept apart* ○ faint, *linked* ● Accent, *integrating · x of y* and *merging* ● Accent with the job's share, *integrated* ● green, - *deleted there · n*, *deleted on server* ▲, *kept here* ○), then the state's 26 px row actions. Attention first. + *deleted there · n*, *deleted on server* ▲, *kept here* ○), then the state's 26 px row actions, three at most + (a linked pair with photos deleted there: *Compare…*, *Unlink*, *Review*). Columns: Sequence `*`, the two sides + `1.4*` (180 px at least), State 160 px, Actions `1.4*` (280 px at least); an archive or server name longer than 24 characters is cut + in its middle ("ChronosArch…Studio NAS"), the whole text in the tooltip. Attention first. Toolbar *Find matches*; empty state "No matches found." with *Find matches*. - *Compare dialog*: an in-window dialog over the section's scrim, 920 px wide, at most 600 px high, its parts scrolling inside. Header: each side's place, photos, size and time span; a SegmentedControl *Photos · Details · Projects · Plan*. Photos: the policy ComboBox, a class table of 28 px rows (glyph and class, count here, count there, size, a tooltip per class that follows the policy) and the selected class's virtualised photo list with - column headings (*Bring* check box, the *Keep both / This PC's / Server's / Leave* ComboBox, *Drop…*, *To trash…*). - Details: one row per setting, both values ellipsed (full in the tooltip) and a *This PC | Server* SegmentedControl, - nothing preselected; *All this PC* / *All server* links above. Projects: *Copy across | Leave them* and two lists - with the target name ("→ Vertical (STUDIO-PC)"). Plan: two columns of lines in Text, last copies first with the - Warning glyph, *Link only* as a secondary row button, each block as a `Status.DialogError` line with at most one - action. Two buttons: *Cancel* (safe, Esc) and *Integrate* (primary). - - *Merge dialog*: the same dialog titled *Merge sequences*, *Kept* and *Other* in place of this PC and the server, - the kept-sequence radio rows first in the Plan, the projects choice fixed to *Copy across* (disabled, with its - tooltip), primary *Merge*. + column headings (*Bring* check box, the *Keep both / This PC's / Server's / Leave* ComboBox, *Drop…*, *To trash…*); + the last column's heading reads *Version* while the rows offer a choice, the version Main uses reads *In Main* in + Text.Secondary, and a choice not made is read *Not chosen* by a screen reader. The policy ComboBox (here and in + Settings › Server) is 240 px and the version ComboBox 185 px, sized by a test over every shipped language; a longer + label trims with an ellipsis. The photo and Details lists always show their vertical scroll bar and their headings + keep its width, so the headings stay over their columns. + Details: one row per setting, both values ellipsed (full in the tooltip, wrapping at 480 px) and a *This PC | + Server* SegmentedControl, nothing preselected, each segment's tooltip naming the value it takes ("Take the value of + Studio NAS: 33"); *All this PC* / *All server* links above. Projects: *Copy across | Leave them* and two lists with + the target name ("→ Vertical (STUDIO-PC)"), rows trimmed with the whole row in the tooltip, the headings over their + lists, both lists scrolling together when they do not fit. Plan: two columns of lines in Text, last copies first + with the Warning glyph, *Link only* as a secondary row button, each block as a `Status.DialogError` line with at + most one action. Two buttons: *Cancel* (safe, Esc) and *Integrate* (primary). + - *Merge dialog*: the same dialog titled *Merge sequences*, *Kept* and *Other* in place of this PC and the server + (from the first plan, made on opening), the kept-sequence radio rows first in the Plan, the projects choice fixed + to *Copy across* (disabled, with its tooltip), primary *Merge*. Its one-sided classes are named by role (*Only in + kept*, *Deleted in other*); under *Choose each* a differing photo offers *Keep both / Kept / Other* (no *Leave*). - *Confirmations*: *Replace photos?* (the losing versions under the side that loses them, last copies first) and - *Merge sequences?* (typed photo count) as destructive `ConfirmDialog`s; Unlink and Keep apart use a toast with - *Undo* instead. + *Merge sequences?* (the photo count typed without separators; the prompt names the number) as destructive + `ConfirmDialog`s; every line of a trash or replace confirmation carries its prefix (*Only copy:*, *Replaced:*, + *Held elsewhere:*). Unlink and Keep apart use a toast with *Undo* instead. - *Library card status*: *Also elsewhere* or *Deleted there* as a Warning status glyph with its word, second on the - card, in the list too; *Compare…* in the context menu and the row actions. + card, in the list too; *Compare…* in the context menu and the row actions. A server card in a match offers + *Compare…* alone. + - *Two versions…* (a local card's and row's context menu; a merge job's *Open*): an in-window dialog 640 px wide, at + most 520 px high, titled with the sequence; a list of 48 px rows, one per version (file name in SemiBold, its + detail in Text.Secondary with tabular figures, *In Main* where Main uses it, *Drop…* as the row button); an empty + list reads a muted line; *Close* (default and Esc) with the dialog's `Status.DialogError` line beside it. - *Edit picker twin*: a muted *Twin* chip right after the project name of a Workspace row; its tooltip names the - other home and project. + other home and project. Only a project whose sibling is at the other home carries it. - **Crop overlay** (preview, Camera step; owner review 1, R5): the box is drawn over the whole view frame (oriented, straightened) and is always locked to the output aspect. States (tiles under the Camera screen in `Editor.html`): - *Shown*: Crop mask on, any step: Scrim (#99000000 dark, #66000000 light) outside, 1 px TextMuted outline. @@ -202,7 +219,7 @@ from the SVG geometry (no raster assets checked in as sources). Badges only at | Mockup | Brief | Notes | |---|---|---| -| `Main.html` | §12.2 Library | grid/list, year·camera·status filters, selection panel | +| `Main.html` | §12.2 Library | grid/list, year·camera·status filters, selection panel; the match statuses and *Two versions…* (owner review 6) have no mockup: built from §4 *Matches*; the statuses are checked against the `library-copies-*` captures, the *Two versions…* dialog has no capture scene yet | | `Editor.html` | §12.3 Edit | three parts, one below the other. Exposure step: step bar, title ▾ (Change sequence), wipe compare (the corrected side carries the look), curves, advisor Auto pills, the Look group (Filter, Strength) at the end of the panel, Previous · n / m · Next. Camera step (`#camera`): the whole view frame with a 9:16 crop being edited (handles), the zoom-keyframe curve under the filmstrip, rows Aspect · Rotation (Rotate left/right and the value) · Mirror · Flip · Straighten · Crop size · Crop X · Crop Y, the keyframes line, then Reset framing on its own line (three buttons do not fit the 292 px panel) above Optimise section · Reset (Reset framing disabled, with `ResetFramingNone`, when nothing is set). Crop overlay states: Shown, Editable, Dragging, Straightening, Locked | | `Export.html` | §12.3 / §11.4 | the Export step (owner review 1, R3, phase 5): step bar with Export current, the header's fixed-width *Render ▾*, the grouped preset table (28 px rows, Recommended chip, batch ticks, a folded group), the Output panel's four collapsible groups (Output open, Encoding and Playback folded with their summaries, File open) and its fixed footer (result line, Render now, Add to queue · Batch (2), Videos (3) · Reveal), Previous · 8 / 8 · Next sequence; under it the Render menu open with *Other presets ›* expanded. Resolution offers the standard boxes and Custom shows the preset's box; the **Output size** row under it shows what is rendered: the chosen proportions fitted in the box (4K at 9:16 = 2160 × 3840; "source" keeps the preset), the preset name unchanged; when the encoder caps it, the value reads "1296 × 2304 (capped)" with `Tooltips.Editor.Export.OutputCapped`. The preview mask is the output's footprint in the view frame | | `Videos.html` | §12.10 | the Videos section (owner review 1, R9): toolbar (search, Kind, Codec, Year, Source, Order, cards/list, Refresh), the sequence chip, the selection bar (Play, Show in folder, Copy to folder, Copy on server, Open in Edit, Delete…), cards with state chips, the player pane open on the right; under it the list view and the Delete… confirmation | diff --git a/i18n/GLOSSARY.md b/i18n/GLOSSARY.md index 5738b3fa..cb267918 100644 --- a/i18n/GLOSSARY.md +++ b/i18n/GLOSSARY.md @@ -99,8 +99,11 @@ dotnet run --project src/Chronos.Tools -- i18n check | Main | Name of every sequence's first project, holding the sequence's own settings | Principale | | Versions | The saved states of a project, listed in its history | Versioni | | Workspace copy | The job that copies a project's photos into the workspace | Copia di lavoro | -| Match | Two copies of one time-lapse found here and on a server, or twice on this PC (owner review 6); never "duplicate" or "copy", which name the photo duplicates report | Corrispondenza (mai Doppione, Duplicato o Copia) | +| Match / Matches | Two copies of one time-lapse found here and on a server, or twice on this PC (owner review 6); never "duplicate" or "copy", which name the photo duplicates report | Corrispondenza / Corrispondenze (mai Doppione, Duplicato o Copia) | | Integrate | Complete two matched sequences with each other's photos, settle their differences once, then keep them in sync | Integra | -| Merge sequences | Join two matched sequences of this PC into the kept one; the other goes to the trash after verification | Unisci sequenze | +| Merge sequences | Join two matched sequences of this PC into the kept one; the other goes to the trash after verification. Keep it apart from the Match term where the two share a root (hi: मर्ज, not मिलाएँ) | Unisci sequenze | | Keep apart | Answer to a match: the two stay separate sequences and are not asked about again | Tieni separate | | Twin | A workspace project of the same time-lapse at the other home, marked in the Edit picker | Gemello | +| Link only / Unlink | Link a server match without moving photos / end the link of a pair (*linked* is its state) | Collega soltanto / Scollega | +| Union | The default *Integrate photos* choice: every photo to both sides, a differing photo kept in both versions | Unione | +| Kept / Other (merge) | The sequence a merge keeps and the one that goes to the trash; classes are named by role (*Only in kept*) | Quella tenuta / Altra | diff --git a/i18n/ar/glossary.tsv b/i18n/ar/glossary.tsv index 0f22c5f6..a6ef13e8 100644 --- a/i18n/ar/glossary.tsv +++ b/i18n/ar/glossary.tsv @@ -236,3 +236,11 @@ Project المشروع a named set of edits of one sequence, with a linear versi Main الرئيسي name of every sequence's first project, holding the sequence's own settings Versions الإصدارات the saved states of a project, listed in its history Workspace copy نسخة العمل the job that copies a project's photos into the workspace +Match تطابق pl. التطابقات; "match found": عُثر على تطابق; two copies of one time-lapse (owner review 6); never the Duplicates or Copy term +Integrate تكامل integrated: متكاملة; Integrate photos: صور التكامل; complete a local and a server sequence with each other's photos +Merge sequences دمج التسلسلات button: دمج; job kind: دمج التسلسلات; two sequences of this PC into the kept one +Keep apart إبقاء منفصلين kept apart: منفصلة; answer to a match, not asked again +Twin توأم a workspace project with a sibling at the other home (Edit picker chip) +Link only / Unlink الربط فقط / إلغاء الربط linked: مرتبطة; Link matches: ربط التطابقات +Union الاتحاد the default Integrate photos choice: every photo to both sides, a differing one kept in both versions +Kept / Other (merge) المحتفظ به / الآخر the kept sequence of a merge and the one that goes to the trash; Only in kept: فقط في المحتفظ به; Kept one wins: الأولوية للمحتفظ به diff --git a/i18n/bg/glossary.tsv b/i18n/bg/glossary.tsv index b33436e6..221e1a4c 100644 --- a/i18n/bg/glossary.tsv +++ b/i18n/bg/glossary.tsv @@ -234,3 +234,11 @@ Project Проект a named set of edits of one sequence, with a linear version Main Основен name of every sequence's first project, holding the sequence's own settings Versions Версии the saved states of a project, listed in its history Workspace copy Работно копие the job that copies a project's photos into the workspace +Match съвпадение pl. Съвпадения; "match found": открито съвпадение; two copies of one time-lapse (owner review 6); never the Duplicates or Copy term +Integrate Интегриране integrated: интегрирани; Integrate photos: Снимки при интегриране; complete a local and a server sequence with each other's photos +Merge sequences Обединяване на серии button: Обединяване; job kind: Обединяване на серии; two sequences of this PC into the kept one +Keep apart Запазване поотделно kept apart: запазени поотделно; answer to a match, not asked again +Twin Близнак a workspace project with a sibling at the other home (Edit picker chip) +Link only / Unlink Само свързване / Премахване на връзката linked: свързани; Link matches: Свързване на съвпадения +Union Всички снимки the default Integrate photos choice: every photo to both sides, a differing one kept in both versions +Kept / Other (merge) Запазена / Другата the kept sequence of a merge and the one that goes to the trash; Only in kept: Само в запазената; Kept one wins: Запазената печели diff --git a/i18n/cs/glossary.tsv b/i18n/cs/glossary.tsv index 5005c7a5..1ad2430d 100644 --- a/i18n/cs/glossary.tsv +++ b/i18n/cs/glossary.tsv @@ -263,3 +263,11 @@ Project Projekt a named set of edits of one sequence, with a linear version hist Main Hlavní name of every sequence's first project, holding the sequence's own settings Versions Verze the saved states of a project, listed in its history Workspace copy Pracovní kopie the job that copies a project's photos into the workspace +Match shoda pl. Shody; "match found": nalezena shoda; two copies of one time-lapse (owner review 6); never the Duplicates or Copy term +Integrate Integrovat integrated: integrovány; Integrate photos: Fotografie při integraci; complete a local and a server sequence with each other's photos +Merge sequences Sloučit sekvence button: Sloučit; job kind: Sloučení sekvencí; two sequences of this PC into the kept one +Keep apart Ponechat oddělené kept apart: ponechány odděleně; answer to a match, not asked again +Twin Dvojče a workspace project with a sibling at the other home (Edit picker chip) +Link only / Unlink Jen propojit / Zrušit propojení linked: propojeny; Link matches: Propojování shod +Union Sjednocení the default Integrate photos choice: every photo to both sides, a differing one kept in both versions +Kept / Other (merge) Ponechaná / Druhá the kept sequence of a merge and the one that goes to the trash; Only in kept: Jen v ponechané; Kept one wins: Vyhrává ponechaná diff --git a/i18n/da/glossary.tsv b/i18n/da/glossary.tsv index 307c521f..fe8dbe29 100644 --- a/i18n/da/glossary.tsv +++ b/i18n/da/glossary.tsv @@ -209,3 +209,11 @@ Project Projekt a named set of edits of one sequence, with a linear version hist Main Hoved name of every sequence's first project, holding the sequence's own settings Versions Versioner the saved states of a project, listed in its history Workspace copy Arbejdskopi the job that copies a project's photos into the workspace +Match match pl. Match; "match found": match fundet; two copies of one time-lapse (owner review 6); never the Duplicates or Copy term +Integrate Integrer integrated: integreret; Integrate photos: Integrering af fotos; complete a local and a server sequence with each other's photos +Merge sequences Flet sekvenser button: Flet; job kind: Fletning af sekvenser; two sequences of this PC into the kept one +Keep apart Hold adskilt kept apart: holdt adskilt; answer to a match, not asked again +Twin Tvilling a workspace project with a sibling at the other home (Edit picker chip) +Link only / Unlink Kobl kun sammen / Fjern kobling linked: koblet; Link matches: Kobl match +Union Alle fra begge the default Integrate photos choice: every photo to both sides, a differing one kept in both versions +Kept / Other (merge) Beholdt / Den anden the kept sequence of a merge and the one that goes to the trash; Only in kept: Kun i beholdt; Kept one wins: Den beholdte vinder diff --git a/i18n/de/glossary.tsv b/i18n/de/glossary.tsv index 5b9a6fc3..6546fd56 100644 --- a/i18n/de/glossary.tsv +++ b/i18n/de/glossary.tsv @@ -262,3 +262,11 @@ Project Projekt a named set of edits of one sequence, with a linear version hist Main Hauptprojekt name of every sequence's first project, holding the sequence's own settings Versions Versionen the saved states of a project, listed in its history Workspace copy Arbeitskopie the job that copies a project's photos into the workspace +Match Übereinstimmung pl. Übereinstimmungen; "match found": Übereinstimmung gefunden; two copies of one time-lapse (owner review 6); never the Duplicates or Copy term +Integrate Integrieren integrated: integriert; Integrate photos: Fotos integrieren; complete a local and a server sequence with each other's photos +Merge sequences Sequenzen zusammenführen button: Zusammenführen; job kind: Sequenzen zusammenführen; two sequences of this PC into the kept one +Keep apart Getrennt halten kept apart: getrennt gehalten; answer to a match, not asked again +Twin Zwilling a workspace project with a sibling at the other home (Edit picker chip) +Link only / Unlink Nur verknüpfen / Verknüpfung lösen linked: verknüpft; Link matches: Übereinstimmungen verknüpfen +Union Vereinigung the default Integrate photos choice: every photo to both sides, a differing one kept in both versions +Kept / Other (merge) Bleibende / Andere the kept sequence of a merge and the one that goes to the trash; Only in kept: Nur in bleibender; Kept one wins: Bleibende gewinnt diff --git a/i18n/el/glossary.tsv b/i18n/el/glossary.tsv index 135f8698..6a0fc3df 100644 --- a/i18n/el/glossary.tsv +++ b/i18n/el/glossary.tsv @@ -265,3 +265,11 @@ Workspace Χώρος εργασίας the folder on this PC where projects are e Main Κύριο name of every sequence's first project, holding the sequence's own settings Versions Εκδόσεις the saved states of a project, listed in its history Workspace copy Αντιγραφή χώρου εργασίας the job that copies a project's photos into the workspace +Match αντιστοιχία pl. Αντιστοιχίες; "match found": βρέθηκε αντιστοιχία; two copies of one time-lapse (owner review 6); never the Duplicates or Copy term +Integrate Ενσωμάτωση integrated: ενσωματωμένες; Integrate photos: Ενσωμάτωση φωτογραφιών; complete a local and a server sequence with each other's photos +Merge sequences Συγχώνευση ακολουθιών button: Συγχώνευση; job kind: Συγχώνευση ακολουθιών; two sequences of this PC into the kept one +Keep apart Διατήρηση χωριστά kept apart: χωριστές; answer to a match, not asked again +Twin Δίδυμο a workspace project with a sibling at the other home (Edit picker chip) +Link only / Unlink Μόνο σύνδεση / Αποσύνδεση linked: συνδεδεμένες; Link matches: Σύνδεση αντιστοιχιών +Union Ένωση the default Integrate photos choice: every photo to both sides, a differing one kept in both versions +Kept / Other (merge) Διατηρούμενη / Άλλη the kept sequence of a merge and the one that goes to the trash; Only in kept: Μόνο στη διατηρούμενη; Kept one wins: Υπερισχύει η διατηρούμενη diff --git a/i18n/es/glossary.tsv b/i18n/es/glossary.tsv index d7752cab..55efd8a0 100644 --- a/i18n/es/glossary.tsv +++ b/i18n/es/glossary.tsv @@ -210,3 +210,11 @@ Project Proyecto a named set of edits of one sequence, with a linear version his Main Principal name of every sequence's first project, holding the sequence's own settings Versions Versiones the saved states of a project, listed in its history Workspace copy Copia al espacio de trabajo the job that copies a project's photos into the workspace +Match coincidencia pl. Coincidencias; "match found": coincidencia encontrada; two copies of one time-lapse (owner review 6); never the Duplicates or Copy term +Integrate Integrar integrated: integradas; Integrate photos: Fotos al integrar; complete a local and a server sequence with each other's photos +Merge sequences Unir secuencias button: Unir; job kind: Unir secuencias; two sequences of this PC into the kept one +Keep apart Mantener separadas kept apart: mantenidas separadas; answer to a match, not asked again +Twin Gemelo a workspace project with a sibling at the other home (Edit picker chip) +Link only / Unlink Solo vincular / Desvincular linked: vinculadas; Link matches: Vincular coincidencias +Union Unión the default Integrate photos choice: every photo to both sides, a differing one kept in both versions +Kept / Other (merge) Conservada / Otra the kept sequence of a merge and the one that goes to the trash; Only in kept: Solo en la conservada; Kept one wins: Gana la conservada diff --git a/i18n/et/glossary.tsv b/i18n/et/glossary.tsv index 257ddf4f..bd59853b 100644 --- a/i18n/et/glossary.tsv +++ b/i18n/et/glossary.tsv @@ -225,3 +225,11 @@ Project Projekt a named set of edits of one sequence, with a linear version hist Main Põhiprojekt name of every sequence's first project, holding the sequence's own settings Versions Versioonid the saved states of a project, listed in its history Workspace copy Tööruumi koopia the job that copies a project's photos into the workspace +Match vaste pl. Vasted; "match found": vaste leitud; two copies of one time-lapse (owner review 6); never the Duplicates or Copy term +Integrate Integreeri integrated: integreeritud; Integrate photos: Fotode integreerimine; complete a local and a server sequence with each other's photos +Merge sequences Liida jadad button: Liida; job kind: Jadade liitmine; two sequences of this PC into the kept one +Keep apart Hoia lahus kept apart: lahus hoitud; answer to a match, not asked again +Twin Kaksik a workspace project with a sibling at the other home (Edit picker chip) +Link only / Unlink Ainult seo / Eemalda seos linked: seotud; Link matches: Seo vasted +Union Ühend the default Integrate photos choice: every photo to both sides, a differing one kept in both versions +Kept / Other (merge) Säilitatav / Teine the kept sequence of a merge and the one that goes to the trash; Only in kept: Ainult säilitatavas; Kept one wins: Säilitatav võidab diff --git a/i18n/fi/Server.fi.resx b/i18n/fi/Server.fi.resx index d948c8bf..b987bdf4 100644 --- a/i18n/fi/Server.fi.resx +++ b/i18n/fi/Server.fi.resx @@ -65,8 +65,8 @@ {0} siirtyy kohteen {1} roskakoriin, kun jokainen kuva on tarkistettu kohteessa {2}. {0:N0} kuva on vain kohteessa {1} {0:N0} kuvaa on vain kohteessa {1} - {0:N0} kohteen {1} kuva siirtyy roskakoriin korvattuna - {0:N0} kohteen {1} kuvaa siirtyy roskakoriin korvattuina + {0:N0} kuva kohteesta {1} siirtyy roskakoriin korvattuna + {0:N0} kuvaa kohteesta {1} siirtyy roskakoriin korvattuina Yhdistetäänkö sarjat? Vahvista kirjoittamalla kohteen {0} ({1}) kuvien määrä {0:N0} kuva siirtyy roskakoriin, kun voittava versio on paikallaan. diff --git a/i18n/fi/glossary.tsv b/i18n/fi/glossary.tsv index e12b7efe..6f549a8f 100644 --- a/i18n/fi/glossary.tsv +++ b/i18n/fi/glossary.tsv @@ -229,3 +229,11 @@ Workspace Työtila the folder on this PC where projects are edited, outside the Main Pääprojekti name of every sequence's first project, holding the sequence's own settings Versions Versiot the saved states of a project, listed in its history Workspace copy Työtilan kopiointi the job that copies a project's photos into the workspace +Match vastaavuus pl. Vastaavuudet; "match found": vastaavuus löytyi; two copies of one time-lapse (owner review 6); never the Duplicates or Copy term; a name in a placeholder takes kohteen/kohteessa/kohteeseen/kohteesta {0}; after a count use "{0:N0} kuvaa kohteesta {1}", never "{0:N0} kohteen {1}" (it reads as a count of items) +Integrate Integroi integrated: integroitu; Integrate photos: Integroitavat kuvat; complete a local and a server sequence with each other's photos +Merge sequences Yhdistä sarjat button: Yhdistä; job kind: Sarjojen yhdistäminen; two sequences of this PC into the kept one +Keep apart Pidä erillään kept apart: pidetty erillään; answer to a match, not asked again +Twin Kaksonen a workspace project with a sibling at the other home (Edit picker chip) +Link only / Unlink Vain linkitä / Pura linkitys linked: linkitetty; Link matches: Linkitä vastaavuudet +Union Yhdiste the default Integrate photos choice: every photo to both sides, a differing one kept in both versions +Kept / Other (merge) Säilytettävä / Toinen the kept sequence of a merge and the one that goes to the trash; Only in kept: Vain säilytettävässä; Kept one wins: Säilytettävä voittaa diff --git a/i18n/fr/glossary.tsv b/i18n/fr/glossary.tsv index 3f419928..66816ba9 100644 --- a/i18n/fr/glossary.tsv +++ b/i18n/fr/glossary.tsv @@ -213,3 +213,11 @@ Project Projet a named set of edits of one sequence, with a linear version histo Main Principal name of every sequence's first project, holding the sequence's own settings Versions Versions the saved states of a project, listed in its history Workspace copy Copie de travail the job that copies a project's photos into the workspace +Match correspondance pl. Correspondances; "match found": correspondance trouvée; two copies of one time-lapse (owner review 6); never the Duplicates or Copy term +Integrate Intégrer integrated: intégrées; Integrate photos: Photos à intégrer; complete a local and a server sequence with each other's photos +Merge sequences Fusionner les séquences button: Fusionner; job kind: Fusion de séquences; two sequences of this PC into the kept one +Keep apart Garder séparées kept apart: gardées séparées; answer to a match, not asked again +Twin Jumeau a workspace project with a sibling at the other home (Edit picker chip) +Link only / Unlink Lier seulement / Délier linked: liées; Link matches: Lier les correspondances +Union Union the default Integrate photos choice: every photo to both sides, a differing one kept in both versions +Kept / Other (merge) Conservée / Autre the kept sequence of a merge and the one that goes to the trash; Only in kept: Uniquement dans la conservée; Kept one wins: La conservée gagne diff --git a/i18n/he/glossary.tsv b/i18n/he/glossary.tsv index 2aa2f116..3d2fc538 100644 --- a/i18n/he/glossary.tsv +++ b/i18n/he/glossary.tsv @@ -226,3 +226,11 @@ Project פרויקט a named set of edits of one sequence, with a linear version Main ראשי name of every sequence's first project, holding the sequence's own settings Versions גרסאות the saved states of a project, listed in its history Workspace copy העתקה לסביבת העבודה the job that copies a project's photos into the workspace +Match התאמה pl. התאמות; "match found": נמצאה התאמה; two copies of one time-lapse (owner review 6); never the Duplicates or Copy term +Integrate שילוב integrated: שולבו; Integrate photos: תמונות לשילוב; complete a local and a server sequence with each other's photos +Merge sequences מיזוג רצפים button: מזג; job kind: מיזוג רצפים; two sequences of this PC into the kept one +Keep apart השאר נפרדים kept apart: נשארו נפרדים; answer to a match, not asked again +Twin תאום a workspace project with a sibling at the other home (Edit picker chip) +Link only / Unlink קשר בלבד / בטל קישור linked: מקושרים; Link matches: קישור התאמות +Union איחוד the default Integrate photos choice: every photo to both sides, a differing one kept in both versions +Kept / Other (merge) נשמר / השני the kept sequence of a merge and the one that goes to the trash; Only in kept: רק בנשמר; Kept one wins: הנשמר גובר diff --git a/i18n/hi/Admin.hi.resx b/i18n/hi/Admin.hi.resx index 54fcde99..8d8ac210 100644 --- a/i18n/hi/Admin.hi.resx +++ b/i18n/hi/Admin.hi.resx @@ -213,7 +213,7 @@ सीक्वेंस एकीकरण त्वरित विश्लेषण रखरखाव - सीक्वेंस मिलाना + सीक्वेंस मर्ज करना पुनर्व्यवस्थापन अनाथ फ़ाइलें प्रॉक्सी diff --git a/i18n/hi/Errors.hi.resx b/i18n/hi/Errors.hi.resx index 0c3a64d0..58f7144d 100644 --- a/i18n/hi/Errors.hi.resx +++ b/i18n/hi/Errors.hi.resx @@ -12,9 +12,9 @@ {0} का संग्रह ऑफ़लाइन है; इसे कनेक्ट करें और फिर से प्रयास करें। दोनों सीक्वेंस {0} से लिंक हैं: पहले उन्हें वहाँ एकीकृत करें। कोई कार्य इनमें से एक सीक्वेंस पर काम कर रहा है; उसके समाप्त होने पर फिर से प्रयास करें। - मिलाते समय {0} बदल गया; ट्रैश में कुछ नहीं गया। + मर्ज के दौरान {0} बदल गया; ट्रैश में कुछ नहीं गया। {0} अब अपने दर्ज हैश से मेल नहीं खाती; ट्रैश में कुछ नहीं गया। “सत्यापित करें” चलाएँ। - सत्यापन को {0} में बदली हुई या क्षतिग्रस्त फ़ोटो मिलीं जो और कहीं नहीं हैं; मिलाने से पहले उन्हें ठीक करें। + सत्यापन को {0} में बदली हुई या क्षतिग्रस्त फ़ोटो मिलीं जो और कहीं नहीं हैं; मर्ज करने से पहले उन्हें ठीक करें। इस बीच एक पक्ष पर विवरण बदल गए; फ़ोटो अपनी जगह पर हैं, फिर से तुलना करें। पहले {0} विवरण चुनें। पहले {0} विवरण चुनें। diff --git a/i18n/hi/Jobs.hi.resx b/i18n/hi/Jobs.hi.resx index 1228120a..de8d96a1 100644 --- a/i18n/hi/Jobs.hi.resx +++ b/i18n/hi/Jobs.hi.resx @@ -80,7 +80,7 @@ सीक्वेंस एकीकरण त्वरित विश्लेषण रखरखाव - सीक्वेंस मिलाना + सीक्वेंस मर्ज करना पुनर्व्यवस्थापन अनाथ फ़ाइलें प्रॉक्सी @@ -258,6 +258,6 @@ कतार शेड्यूल किए गए {0} एकीकृत करें - {0} में मिलाएँ + {0} में मर्ज करें यह PC diff --git a/i18n/hi/Server.hi.resx b/i18n/hi/Server.hi.resx index 88317aa4..8fe91bd5 100644 --- a/i18n/hi/Server.hi.resx +++ b/i18n/hi/Server.hi.resx @@ -34,8 +34,8 @@ अलग रखें यहाँ रखें केवल लिंक करें - मिलाएँ - मिलाएँ… + मर्ज करें + मर्ज करें… समीक्षा करें ट्रैश में… पूर्ववत करें @@ -67,7 +67,7 @@ {0:N0} फ़ोटो केवल {1} में हैं {1} की {0:N0} फ़ोटो बदली जाकर ट्रैश में जाती है {1} की {0:N0} फ़ोटो बदली जाकर ट्रैश में जाती हैं - सीक्वेंस मिलाएँ? + सीक्वेंस मर्ज करें? पुष्टि के लिए {0} ({1}) की फ़ोटो की संख्या टाइप करें चुना गया संस्करण अपनी जगह पर आते ही {0:N0} फ़ोटो ट्रैश में जाती है। चुना गया संस्करण अपनी जगह पर आते ही {0:N0} फ़ोटो ट्रैश में जाती हैं। @@ -89,8 +89,8 @@ यह PC सीक्वेंस की तुलना तुलना: {0} - सीक्वेंस मिलाएँ - मिलाएँ: {0} + सीक्वेंस मर्ज करें + मर्ज करें: {0} कोई मिलान नहीं मिला। {1} · {0:N0} फ़ोटो · {2} {1} · {0:N0} फ़ोटो · {2} @@ -173,7 +173,7 @@ अलग रखे गए यहाँ रखा गया लिंक किए गए - मिलाना · {0} % + मर्ज जारी · {0} % {1} में से {0} सर्वर पर हटाया गया {0} · {1} diff --git a/i18n/hi/Tooltips.hi.resx b/i18n/hi/Tooltips.hi.resx index 3cc208d9..3d4f10c2 100644 --- a/i18n/hi/Tooltips.hi.resx +++ b/i18n/hi/Tooltips.hi.resx @@ -789,13 +789,13 @@ वे फ़ोटो जो केवल रखे गए सीक्वेंस में हैं; वे उसी में रहती हैं। वे फ़ोटो जो केवल दूसरे पक्ष पर हैं; “एकीकृत करें” उन्हें यहाँ कॉपी करता है। वे फ़ोटो जो केवल दूसरे पक्ष पर हैं; “एकीकृत करें” आपकी टिक की गई फ़ोटो यहाँ कॉपी करता है। - वे फ़ोटो जो केवल दूसरे सीक्वेंस में हैं; “मिलाएँ” हर एक को रखे गए सीक्वेंस में कॉपी करता है। + वे फ़ोटो जो केवल दूसरे सीक्वेंस में हैं; “मर्ज करें” हर एक को रखे गए सीक्वेंस में कॉपी करता है। दोनों पक्षों पर वही फ़ाइलें, SHA-256 के अनुसार। - वही आकार और कैप्चर समय; एक पक्ष अभी सत्यापित नहीं है। मिलाने से पहले हैश से उनकी जाँच होती है। + वही आकार और कैप्चर समय; एक पक्ष अभी सत्यापित नहीं है। मर्ज करने से पहले हैश से उनकी जाँच होती है। वही आकार और कैप्चर समय; एक पक्ष अभी सत्यापित नहीं है। “एकीकृत करें” उन्हें एक फ़ोटो गिनता है और किसी को नहीं ले जाता। एक ही कैप्चर समय की दो फ़ाइलें; दूसरे पक्ष की फ़ाइल “मुख्य” में बाहर रखी गई है। देखें कि दोनों सीक्वेंस के बीच कौन-सी फ़ोटो, विवरण और प्रोजेक्ट भिन्न हैं। - मिलाएँ, फिर सत्यापन के बाद दूसरे सीक्वेंस को ट्रैश में ले जाएँ। + मर्ज करें, फिर सत्यापन के बाद दूसरे सीक्वेंस को ट्रैश में ले जाएँ। एकीकृत करें, फिर बदले गए संस्करणों को ट्रैश में ले जाएँ। कुछ बदले बिना बंद करें। आपकी पुष्टि की गई योजना के बाद इन फ़ोटो को सर्वर के ट्रैश में ले जाएँ। @@ -818,7 +818,7 @@ वह सीक्वेंस जो रहता है; दूसरे की फ़ोटो उसमें जुड़ती हैं। फ़ोटो ले जाए बिना दोनों को लिंक करें; अगली तुलना समान विवरणों को मिलाती है। इनमें से एक सीक्वेंस पहले से {0} के किसी दूसरे सीक्वेंस से लिंक है। - दोनों को रखे गए सीक्वेंस में मिलाएँ; सत्यापन के बाद दूसरा ट्रैश में जाता है। + दोनों को रखे गए सीक्वेंस में मर्ज करें; सत्यापन के बाद दूसरा ट्रैश में जाता है। सीक्वेंस एकीकृत करने के लिए इस सर्वर को अपडेट की आवश्यकता है। भिन्न शीर्षक, टैग, रेटिंग, नोट्स और सेटिंग्स, पंक्ति दर पंक्ति। हर सीक्वेंस की फ़ोटो, और हर पक्ष कौन-सा संस्करण रखता है। @@ -843,7 +843,7 @@ हर पक्ष के अन्य प्रोजेक्ट अपने इतिहास के साथ दूसरे स्रोत पर दिखते हैं, नाम टकराने पर नए नाम के साथ। अन्य प्रोजेक्ट जहाँ हैं वहीं रहते हैं; संपादन दोनों वर्कस्पेस प्रोजेक्ट को जुड़वाँ के रूप में चिह्नित करता है। “मुख्य” आपके चुने गए विवरणों का पालन करता है। - मिलाना हमेशा दूसरे के प्रोजेक्ट कॉपी करता है: उसका स्रोत ट्रैश में जाता है। + मर्ज हमेशा दूसरे के प्रोजेक्ट कॉपी करता है: उसका स्रोत ट्रैश में जाता है। दूसरे पक्ष पर हटाई गई फ़ोटो पर तुलना खोलें। मिले हुए मिलानों की सूची खोलें। पहले फ़ोटो चुनें। @@ -857,7 +857,7 @@ आपने {0} को इन्हें अलग रखना चुना। सर्वर द्वारा अपना सीक्वेंस हटाने के बाद आपने इस PC का सीक्वेंस रखा। लिंक हैं: सिंक उनकी तुलना करता है; फ़ोटो “अपलोड करें” और “डाउनलोड करें” से जाती हैं। - मिलाना जारी है; कार्य हर चरण दिखाता है। + मर्ज जारी है; कार्य हर चरण दिखाता है। सर्वर ने अपना सीक्वेंस हटा दिया; इस PC का सीक्वेंस अपरिवर्तित है। आपकी पुष्टि की गई योजना के बाद इन फ़ोटो को इस PC के संग्रह ट्रैश में ले जाएँ। इस PC के सीक्वेंस को संग्रह ट्रैश में ले जाएँ; यह अंतिम कॉपी हो सकती है। @@ -932,7 +932,7 @@ इस PC की सेटिंग्स की सहेजी गई कॉपी फ़ाइल एक्सप्लोरर में दिखाएँ वह सीक्वेंस दिखाएँ जिसकी नई फ़ोटो नहीं भेजी गईं। “सभी स्थानीय अपलोड करें” द्वारा छोड़े गए सीक्वेंस “केवल स्थानीय” में सबसे ऊपर दिखाएँ। - कोई कार्य इसे एकीकृत कर रहा है या मिला रहा है + कोई कार्य इसे एकीकृत या मर्ज कर रहा है सर्वर ने अपना सीक्वेंस हटा दिया आपने इसे किसी मिलान से अलग रखा यह किसी सर्वर से आया है diff --git a/i18n/hi/glossary.tsv b/i18n/hi/glossary.tsv index 27c086fb..01ce992f 100644 --- a/i18n/hi/glossary.tsv +++ b/i18n/hi/glossary.tsv @@ -132,7 +132,7 @@ Tag टैग invariant in plural; Retag…: टैग बदलें… Eject बाहर निकालें distinct from Remove (निकालें) Format (card) फ़ॉर्मेट करें noun: फ़ॉर्मेट Skip छोड़ें skipped: छोड़ी गई / छोड़ी गईं -Merge मिलाएँ +Merge मिलाएँ merge sessions; Merge sequences: सीक्वेंस मर्ज करें Split विभाजित करें Split here: यहाँ विभाजित करें Destination गंतव्य Source स्रोत @@ -222,3 +222,11 @@ Project प्रोजेक्ट a named set of edits of one sequence, with a Main मुख्य name of every sequence's first project, holding the sequence's own settings Versions संस्करण the saved states of a project, listed in its history Workspace copy वर्कस्पेस कॉपी the job that copies a project's photos into the workspace +Match मिलान pl. मिलान; "match found": मिलान मिला; two copies of one time-lapse (owner review 6); never the Duplicates or Copy term +Integrate एकीकृत करें integrated: एकीकृत; Integrate photos: एकीकृत करने को फ़ोटो; complete a local and a server sequence with each other's photos +Merge sequences सीक्वेंस मर्ज करें button: मर्ज करें; job kind: सीक्वेंस मर्ज करना; two sequences of this PC into the kept one; मर्ज, not मिलाएँ: मिलाना reads too close to मिलान (match); merging sessions keeps मिलाएँ +Keep apart अलग रखें kept apart: अलग रखे गए; answer to a match, not asked again +Twin जुड़वाँ a workspace project with a sibling at the other home (Edit picker chip) +Link only / Unlink केवल लिंक करें / अनलिंक करें linked: लिंक किए गए; Link matches: मिलान लिंक करें +Union दोनों में सभी the default Integrate photos choice: every photo to both sides, a differing one kept in both versions +Kept / Other (merge) रखा गया / दूसरा the kept sequence of a merge and the one that goes to the trash; Only in kept: केवल रखे गए में; Kept one wins: रखा गया जीतता है diff --git a/i18n/hr/Tooltips.hr.resx b/i18n/hr/Tooltips.hr.resx index 6bbc0703..12468e23 100644 --- a/i18n/hr/Tooltips.hr.resx +++ b/i18n/hr/Tooltips.hr.resx @@ -660,7 +660,7 @@ Klik odabire · Ctrl+klik dodaje · dvoklik otvara s proxy kopijama · samo na poslužitelju, ovdje nema listanja kadrova Ponovno prikazuje sve sekvence Poništava odabir svih sekvenci - Uspoređuje ovu sekvencu s njezinim podudaranjem. + Uspoređuje ovu sekvencu s njoj podudarnom sekvencom. Rad s arhivom poslužitelja Chronos Server Sprema odabrane retke kao CSV u mapu po vašem izboru Prikazuje mapu sekvence u Eksploreru za datoteke @@ -955,7 +955,7 @@ Prikazuje sekvence koje je Prenesi sve lokalne izostavio, prve u filtru Samo lokalno. zadatak je upravo integrira ili spaja poslužitelj je izbrisao svoju sekvencu - držali ste je odvojeno od podudaranja + zadržali ste je odvojeno od podudarne sekvence došla je s poslužitelja možda je ista kao sekvenca na poslužitelju {0} možda je ista kao sekvenca u arhivi {0} diff --git a/i18n/hr/glossary.tsv b/i18n/hr/glossary.tsv index 92fb3e45..f0614319 100644 --- a/i18n/hr/glossary.tsv +++ b/i18n/hr/glossary.tsv @@ -255,3 +255,11 @@ Project Projekt a named set of edits of one sequence, with a linear version hist Main Glavni name of every sequence's first project, holding the sequence's own settings Versions Verzije the saved states of a project, listed in its history Workspace copy Kopiranje u radni prostor the job that copies a project's photos into the workspace +Match podudaranje pl. Podudaranja; "match found": pronađeno podudaranje; two copies of one time-lapse (owner review 6); never the Duplicates or Copy term; the matching sequence itself: podudarna sekvenca ("s njoj podudarnom sekvencom"), never "njezino podudaranje" +Integrate Integriraj integrated: integrirano; Integrate photos: Integriranje fotografija; complete a local and a server sequence with each other's photos +Merge sequences Spajanje sekvenci button: Spoji; job kind: Spajanje sekvenci; two sequences of this PC into the kept one +Keep apart Drži odvojeno kept apart: odvojeno; answer to a match, not asked again +Twin Blizanac a workspace project with a sibling at the other home (Edit picker chip) +Link only / Unlink Samo poveži / Raskini vezu linked: povezano; Link matches: Povezivanje podudaranja +Union Unija the default Integrate photos choice: every photo to both sides, a differing one kept in both versions +Kept / Other (merge) Zadržana / Druga the kept sequence of a merge and the one that goes to the trash; Only in kept: Samo u zadržanoj; Kept one wins: Prednost zadržanoj diff --git a/i18n/hu/glossary.tsv b/i18n/hu/glossary.tsv index 3d43ade6..48d5cc59 100644 --- a/i18n/hu/glossary.tsv +++ b/i18n/hu/glossary.tsv @@ -238,3 +238,11 @@ Project Projekt a named set of edits of one sequence, with a linear version hist Main Fő name of every sequence's first project, holding the sequence's own settings Versions Verziók the saved states of a project, listed in its history Workspace copy Munkaterület-másolás the job that copies a project's photos into the workspace +Match egyezés pl. Egyezések; "match found": egyezés található; two copies of one time-lapse (owner review 6); never the Duplicates or Copy term +Integrate Integrálás integrated: integrálva; Integrate photos: Fotók integrálása; complete a local and a server sequence with each other's photos +Merge sequences Sorozatok egyesítése button: Egyesítés; job kind: Sorozatok egyesítése; two sequences of this PC into the kept one +Keep apart Külön tartás kept apart: külön tartva; answer to a match, not asked again +Twin Iker a workspace project with a sibling at the other home (Edit picker chip) +Link only / Unlink Csak összekapcsolás / Szétkapcsolás linked: összekapcsolva; Link matches: Egyezések összekapcsolása +Union Unió the default Integrate photos choice: every photo to both sides, a differing one kept in both versions +Kept / Other (merge) Megtartott / Másik the kept sequence of a merge and the one that goes to the trash; Only in kept: Csak a megtartottban; Kept one wins: A megtartott nyer diff --git a/i18n/id/glossary.tsv b/i18n/id/glossary.tsv index 7291525a..eaa5f299 100644 --- a/i18n/id/glossary.tsv +++ b/i18n/id/glossary.tsv @@ -239,3 +239,11 @@ Project Proyek a named set of edits of one sequence, with a linear version histo Main Utama name of every sequence's first project, holding the sequence's own settings Versions Versi the saved states of a project, listed in its history Workspace copy Penyalinan ruang kerja the job that copies a project's photos into the workspace +Match padanan pl. Padanan; "match found": padanan ditemukan; two copies of one time-lapse (owner review 6); never the Duplicates or Copy term +Integrate Integrasikan integrated: terintegrasi; Integrate photos: Integrasi foto; complete a local and a server sequence with each other's photos +Merge sequences Gabungkan sekuens button: Gabungkan; job kind: Penggabungan sekuens; two sequences of this PC into the kept one +Keep apart Biarkan terpisah kept apart: dibiarkan terpisah; answer to a match, not asked again +Twin Kembar a workspace project with a sibling at the other home (Edit picker chip) +Link only / Unlink Tautkan saja / Putuskan tautan linked: tertaut; Link matches: Tautkan padanan +Union Gabungan the default Integrate photos choice: every photo to both sides, a differing one kept in both versions +Kept / Other (merge) Dipertahankan / Lainnya the kept sequence of a merge and the one that goes to the trash; Only in kept: Hanya di yang dipertahankan; Kept one wins: Yang dipertahankan menang diff --git a/i18n/ja/glossary.tsv b/i18n/ja/glossary.tsv index 85304719..94059f9e 100644 --- a/i18n/ja/glossary.tsv +++ b/i18n/ja/glossary.tsv @@ -289,3 +289,11 @@ Project プロジェクト a named set of edits of one sequence, with a linear v Main メイン name of every sequence's first project, holding the sequence's own settings Versions バージョン the saved states of a project, listed in its history Workspace copy ワークスペースへのコピー the job that copies a project's photos into the workspace +Match 一致 pl. 一致; "match found": 一致を検出; two copies of one time-lapse (owner review 6); never the Duplicates or Copy term +Integrate 統合 integrated: 統合済み; Integrate photos: 写真の統合; complete a local and a server sequence with each other's photos +Merge sequences シーケンスの結合 button: 結合; job kind: シーケンスの結合; two sequences of this PC into the kept one +Keep apart 別々に保持 kept apart: 別々に保持; answer to a match, not asked again +Twin ツイン a workspace project with a sibling at the other home (Edit picker chip) +Link only / Unlink リンクのみ / リンク解除 linked: リンク済み; Link matches: 一致のリンク +Union 和集合 the default Integrate photos choice: every photo to both sides, a differing one kept in both versions +Kept / Other (merge) 残す側 / もう一方 the kept sequence of a merge and the one that goes to the trash; Only in kept: 残す側のみ; Kept one wins: 残す側を優先 diff --git a/i18n/ko/glossary.tsv b/i18n/ko/glossary.tsv index a5b939b0..1f0507bb 100644 --- a/i18n/ko/glossary.tsv +++ b/i18n/ko/glossary.tsv @@ -301,3 +301,11 @@ Project 프로젝트 a named set of edits of one sequence, with a linear version Main 기본 name of every sequence's first project, holding the sequence's own settings Versions 버전 the saved states of a project, listed in its history Workspace copy 작업 공간 복사 the job that copies a project's photos into the workspace +Match 일치 항목 pl. 일치 항목; "match found": 일치 항목 찾음; two copies of one time-lapse (owner review 6); never the Duplicates or Copy term +Integrate 통합 integrated: 통합됨; Integrate photos: 사진 통합; complete a local and a server sequence with each other's photos +Merge sequences 시퀀스 병합 button: 병합; job kind: 시퀀스 병합; two sequences of this PC into the kept one +Keep apart 따로 유지 kept apart: 따로 유지됨; answer to a match, not asked again +Twin 쌍둥이 a workspace project with a sibling at the other home (Edit picker chip) +Link only / Unlink 연결만 / 연결 해제 linked: 연결됨; Link matches: 일치 항목 연결 +Union 모두 합치기 the default Integrate photos choice: every photo to both sides, a differing one kept in both versions +Kept / Other (merge) 유지 시퀀스 / 다른 시퀀스 the kept sequence of a merge and the one that goes to the trash; Only in kept: 유지 시퀀스에만; Kept one wins: 유지 시퀀스 우선 diff --git a/i18n/lt/glossary.tsv b/i18n/lt/glossary.tsv index 8f0b689b..c8f1836a 100644 --- a/i18n/lt/glossary.tsv +++ b/i18n/lt/glossary.tsv @@ -236,3 +236,11 @@ Workspace Darbo sritis the folder on this PC where projects are edited, outside Main Pagrindinis name of every sequence's first project, holding the sequence's own settings Versions Versijos the saved states of a project, listed in its history Workspace copy Darbo srities kopijavimas the job that copies a project's photos into the workspace +Match atitikmuo pl. Atitikmenys; "match found": rastas atitikmuo; two copies of one time-lapse (owner review 6); never the Duplicates or Copy term +Integrate Integruoti integrated: integruotos; Integrate photos: Integruojamos nuotraukos; complete a local and a server sequence with each other's photos +Merge sequences Sujungti sekas button: Sujungti; job kind: Sekų sujungimas; two sequences of this PC into the kept one +Keep apart Laikyti atskirai kept apart: laikomos atskirai; answer to a match, not asked again +Twin Dvynys a workspace project with a sibling at the other home (Edit picker chip) +Link only / Unlink Tik susieti / Atsieti linked: susietos; Link matches: Susieti atitikmenis +Union Sąjunga the default Integrate photos choice: every photo to both sides, a differing one kept in both versions +Kept / Other (merge) Paliekama / Kita the kept sequence of a merge and the one that goes to the trash; Only in kept: Tik paliekamoje; Kept one wins: Laimi paliekama diff --git a/i18n/lv/glossary.tsv b/i18n/lv/glossary.tsv index 6c2ff3ec..5d784ca6 100644 --- a/i18n/lv/glossary.tsv +++ b/i18n/lv/glossary.tsv @@ -237,3 +237,11 @@ Project Projekts a named set of edits of one sequence, with a linear version his Main Galvenais name of every sequence's first project, holding the sequence's own settings Versions Versijas the saved states of a project, listed in its history Workspace copy Kopēšana darbvietā the job that copies a project's photos into the workspace +Match atbilstība pl. Atbilstības; "match found": atrasta atbilstība; two copies of one time-lapse (owner review 6); never the Duplicates or Copy term +Integrate Integrēt integrated: integrētas; Integrate photos: Integrējamie fotoattēli; complete a local and a server sequence with each other's photos +Merge sequences Apvienot secības button: Apvienot; job kind: Secību apvienošana; two sequences of this PC into the kept one +Keep apart Paturēt atsevišķi kept apart: paturētas atsevišķi; answer to a match, not asked again +Twin Dvīnis a workspace project with a sibling at the other home (Edit picker chip) +Link only / Unlink Tikai saistīt / Atsaistīt linked: saistītas; Link matches: Saistīt atbilstības +Union Apvienojums the default Integrate photos choice: every photo to both sides, a differing one kept in both versions +Kept / Other (merge) Paturētā / Otra the kept sequence of a merge and the one that goes to the trash; Only in kept: Tikai paturētajā; Kept one wins: Uzvar paturētā diff --git a/i18n/ms/glossary.tsv b/i18n/ms/glossary.tsv index ac75fb26..941df8bd 100644 --- a/i18n/ms/glossary.tsv +++ b/i18n/ms/glossary.tsv @@ -259,3 +259,11 @@ Project Projek a named set of edits of one sequence, with a linear version histo Main Utama name of every sequence's first project, holding the sequence's own settings Versions Versi the saved states of a project, listed in its history Workspace copy Salinan ruang kerja the job that copies a project's photos into the workspace +Match padanan pl. Padanan; "match found": padanan ditemui; two copies of one time-lapse (owner review 6); never the Duplicates or Copy term +Integrate Integrasikan integrated: diintegrasikan; Integrate photos: Integrasi foto; complete a local and a server sequence with each other's photos +Merge sequences Gabung jujukan button: Gabung; job kind: Gabung jujukan; two sequences of this PC into the kept one +Keep apart Kekalkan berasingan kept apart: dikekalkan berasingan; answer to a match, not asked again +Twin Kembar a workspace project with a sibling at the other home (Edit picker chip) +Link only / Unlink Paut sahaja / Nyahpaut linked: dipautkan; Link matches: Paut padanan +Union Gabungan the default Integrate photos choice: every photo to both sides, a differing one kept in both versions +Kept / Other (merge) Dikekalkan / Lain the kept sequence of a merge and the one that goes to the trash; Only in kept: Hanya dalam yang dikekalkan; Kept one wins: Yang dikekalkan menang diff --git a/i18n/nb/glossary.tsv b/i18n/nb/glossary.tsv index bbeaafff..c3d3946e 100644 --- a/i18n/nb/glossary.tsv +++ b/i18n/nb/glossary.tsv @@ -274,3 +274,11 @@ Project Prosjekt a named set of edits of one sequence, with a linear version his Main Hoved name of every sequence's first project, holding the sequence's own settings Versions Versjoner the saved states of a project, listed in its history Workspace copy Kopiering til arbeidsområde the job that copies a project's photos into the workspace +Match samsvar pl. Samsvar; "match found": samsvar funnet; two copies of one time-lapse (owner review 6); never the Duplicates or Copy term +Integrate Integrer integrated: integrert; Integrate photos: Integrer bilder; complete a local and a server sequence with each other's photos +Merge sequences Slå sammen sekvenser button: Slå sammen; job kind: Sammenslåing av sekvenser; two sequences of this PC into the kept one +Keep apart Hold atskilt kept apart: holdt atskilt; answer to a match, not asked again +Twin Tvilling a workspace project with a sibling at the other home (Edit picker chip) +Link only / Unlink Bare koble / Koble fra linked: koblet; Link matches: Koble samsvar +Union Alt fra begge the default Integrate photos choice: every photo to both sides, a differing one kept in both versions +Kept / Other (merge) Beholdt / Andre the kept sequence of a merge and the one that goes to the trash; Only in kept: Bare i beholdt; Kept one wins: Beholdt vinner diff --git a/i18n/nl/glossary.tsv b/i18n/nl/glossary.tsv index 1430e486..9ce789ed 100644 --- a/i18n/nl/glossary.tsv +++ b/i18n/nl/glossary.tsv @@ -259,3 +259,11 @@ Project Project a named set of edits of one sequence, with a linear version hist Main Hoofd name of every sequence's first project, holding the sequence's own settings Versions Versies the saved states of a project, listed in its history Workspace copy Werkruimtekopie the job that copies a project's photos into the workspace +Match overeenkomst pl. Overeenkomsten; "match found": overeenkomst gevonden; two copies of one time-lapse (owner review 6); never the Duplicates or Copy term +Integrate Integreren integrated: geïntegreerd; Integrate photos: Foto's integreren; complete a local and a server sequence with each other's photos +Merge sequences Reeksen samenvoegen button: Samenvoegen; job kind: Reeksen samenvoegen; two sequences of this PC into the kept one +Keep apart Gescheiden houden kept apart: gescheiden gehouden; answer to a match, not asked again +Twin Tweeling a workspace project with a sibling at the other home (Edit picker chip) +Link only / Unlink Alleen koppelen / Ontkoppelen linked: gekoppeld; Link matches: Overeenkomsten koppelen +Union Alles van beide the default Integrate photos choice: every photo to both sides, a differing one kept in both versions +Kept / Other (merge) Behouden / Andere the kept sequence of a merge and the one that goes to the trash; Only in kept: Alleen in behouden; Kept one wins: Behouden wint diff --git a/i18n/pl/glossary.tsv b/i18n/pl/glossary.tsv index cdf3b444..137e3292 100644 --- a/i18n/pl/glossary.tsv +++ b/i18n/pl/glossary.tsv @@ -208,3 +208,11 @@ Project Projekt a named set of edits of one sequence, with a linear version hist Main Główny name of every sequence's first project, holding the sequence's own settings Versions Wersje the saved states of a project, listed in its history Workspace copy Kopiowanie do obszaru roboczego the job that copies a project's photos into the workspace +Match dopasowanie pl. Dopasowania; "match found": znaleziono dopasowanie; two copies of one time-lapse (owner review 6); never the Duplicates or Copy term +Integrate Zintegruj integrated: zintegrowana; Integrate photos: Integracja zdjęć; complete a local and a server sequence with each other's photos +Merge sequences Scal sekwencje button: Scal; job kind: Scalanie sekwencji; two sequences of this PC into the kept one +Keep apart Zachowaj osobno kept apart: zachowana osobno; answer to a match, not asked again +Twin Bliźniak a workspace project with a sibling at the other home (Edit picker chip) +Link only / Unlink Tylko połącz / Rozłącz linked: połączona; Link matches: Łączenie dopasowań +Union Wszystkie z obu the default Integrate photos choice: every photo to both sides, a differing one kept in both versions +Kept / Other (merge) Zachowana / Druga the kept sequence of a merge and the one that goes to the trash; Only in kept: Tylko w zachowanej; Kept one wins: Wygrywa zachowana diff --git a/i18n/pt-BR/glossary.tsv b/i18n/pt-BR/glossary.tsv index 51fbf965..1c2c2843 100644 --- a/i18n/pt-BR/glossary.tsv +++ b/i18n/pt-BR/glossary.tsv @@ -240,3 +240,11 @@ Project Projeto a named set of edits of one sequence, with a linear version hist Main Principal name of every sequence's first project, holding the sequence's own settings Versions Versões the saved states of a project, listed in its history Workspace copy Cópia de trabalho the job that copies a project's photos into the workspace +Match correspondência pl. Correspondências; "match found": correspondência encontrada; two copies of one time-lapse (owner review 6); never the Duplicates or Copy term +Integrate Integrar integrated: integrada; Integrate photos: Fotos a integrar; complete a local and a server sequence with each other's photos +Merge sequences Mesclar sequências button: Mesclar; job kind: Mesclagem de sequências; two sequences of this PC into the kept one +Keep apart Manter separadas kept apart: mantida separada; answer to a match, not asked again +Twin Gêmeo a workspace project with a sibling at the other home (Edit picker chip) +Link only / Unlink Só vincular / Desvincular linked: vinculada; Link matches: Vincular correspondências +Union União the default Integrate photos choice: every photo to both sides, a differing one kept in both versions +Kept / Other (merge) Mantida / Outra the kept sequence of a merge and the one that goes to the trash; Only in kept: Só na mantida; Kept one wins: Mantida vence diff --git a/i18n/pt-PT/glossary.tsv b/i18n/pt-PT/glossary.tsv index 85680f44..c002941b 100644 --- a/i18n/pt-PT/glossary.tsv +++ b/i18n/pt-PT/glossary.tsv @@ -271,3 +271,11 @@ Project Projeto a named set of edits of one sequence, with a linear version hist Main Principal name of every sequence's first project, holding the sequence's own settings Versions Versões the saved states of a project, listed in its history Workspace copy Cópia de trabalho the job that copies a project's photos into the workspace +Match correspondência pl. Correspondências; "match found": correspondência encontrada; two copies of one time-lapse (owner review 6); never the Duplicates or Copy term +Integrate Integrar integrated: integradas; Integrate photos: Fotografias a integrar; complete a local and a server sequence with each other's photos +Merge sequences Unir sequências button: Unir; job kind: União de sequências; two sequences of this PC into the kept one +Keep apart Manter separadas kept apart: mantidas separadas; answer to a match, not asked again +Twin Gémeo a workspace project with a sibling at the other home (Edit picker chip) +Link only / Unlink Só ligar / Desligar linked: ligadas; Link matches: Ligar correspondências +Union União the default Integrate photos choice: every photo to both sides, a differing one kept in both versions +Kept / Other (merge) Mantida / Outra the kept sequence of a merge and the one that goes to the trash; Only in kept: Só na mantida; Kept one wins: Vence a mantida diff --git a/i18n/ro/glossary.tsv b/i18n/ro/glossary.tsv index 168853e0..24d37fe6 100644 --- a/i18n/ro/glossary.tsv +++ b/i18n/ro/glossary.tsv @@ -188,3 +188,11 @@ Project Proiect a named set of edits of one sequence, with a linear version hist Main Principal name of every sequence's first project, holding the sequence's own settings Versions Versiuni the saved states of a project, listed in its history Workspace copy Copiere de lucru the job that copies a project's photos into the workspace +Match corespondență pl. Corespondențe; "match found": corespondență găsită; two copies of one time-lapse (owner review 6); never the Duplicates or Copy term +Integrate Integrare integrated: integrate; Integrate photos: Fotografii de integrat; complete a local and a server sequence with each other's photos +Merge sequences Îmbinare secvențe button: Îmbinare; job kind: Îmbinare secvențe; two sequences of this PC into the kept one +Keep apart Păstrare separată kept apart: păstrate separat; answer to a match, not asked again +Twin Geamăn a workspace project with a sibling at the other home (Edit picker chip) +Link only / Unlink Doar legare / Anulare legătură linked: legate; Link matches: Legare corespondențe +Union Uniune the default Integrate photos choice: every photo to both sides, a differing one kept in both versions +Kept / Other (merge) Păstrată / Cealaltă the kept sequence of a merge and the one that goes to the trash; Only in kept: Doar în cea păstrată; Kept one wins: Câștigă cea păstrată diff --git a/i18n/ru/glossary.tsv b/i18n/ru/glossary.tsv index 5a7b1859..6957028a 100644 --- a/i18n/ru/glossary.tsv +++ b/i18n/ru/glossary.tsv @@ -215,3 +215,11 @@ Project Проект a named set of edits of one sequence, with a linear version Main Основной name of every sequence's first project, holding the sequence's own settings Versions Версии the saved states of a project, listed in its history Workspace copy Рабочая копия the job that copies a project's photos into the workspace +Match совпадение pl. Совпадения; "match found": найдено совпадение; two copies of one time-lapse (owner review 6); never the Duplicates or Copy term +Integrate Интегрировать integrated: интегрированы; Integrate photos: Интеграция фото; complete a local and a server sequence with each other's photos +Merge sequences Объединение серий button: Объединить; job kind: Объединение серий; two sequences of this PC into the kept one +Keep apart Оставить раздельно kept apart: оставлены раздельно; answer to a match, not asked again +Twin Двойник a workspace project with a sibling at the other home (Edit picker chip) +Link only / Unlink Только связать / Отвязать linked: связаны; Link matches: Связывание совпадений +Union Всё вместе the default Integrate photos choice: every photo to both sides, a differing one kept in both versions +Kept / Other (merge) Сохраняемая / Другая the kept sequence of a merge and the one that goes to the trash; Only in kept: Только в сохраняемой; Kept one wins: Приоритет сохраняемой diff --git a/i18n/sk/glossary.tsv b/i18n/sk/glossary.tsv index c6fa49b6..9acc22da 100644 --- a/i18n/sk/glossary.tsv +++ b/i18n/sk/glossary.tsv @@ -241,3 +241,11 @@ Project Projekt a named set of edits of one sequence, with a linear version hist Main Hlavný name of every sequence's first project, holding the sequence's own settings Versions Verzie the saved states of a project, listed in its history Workspace copy Pracovná kópia the job that copies a project's photos into the workspace +Match zhoda pl. Zhody; "match found": nájdená zhoda; two copies of one time-lapse (owner review 6); never the Duplicates or Copy term +Integrate Integrovať integrated: integrované; Integrate photos: Integrácia fotografií; complete a local and a server sequence with each other's photos +Merge sequences Zlúčenie sekvencií button: Zlúčiť; job kind: Zlúčenie sekvencií; two sequences of this PC into the kept one +Keep apart Ponechať oddelene kept apart: ponechané oddelene; answer to a match, not asked again +Twin Dvojča a workspace project with a sibling at the other home (Edit picker chip) +Link only / Unlink Iba prepojiť / Zrušiť prepojenie linked: prepojené; Link matches: Prepojenie zhôd +Union Zjednotenie the default Integrate photos choice: every photo to both sides, a differing one kept in both versions +Kept / Other (merge) Ponechaná / Druhá the kept sequence of a merge and the one that goes to the trash; Only in kept: Iba v ponechanej; Kept one wins: Vyhráva ponechaná diff --git a/i18n/sl/glossary.tsv b/i18n/sl/glossary.tsv index e7f506f4..d9e90088 100644 --- a/i18n/sl/glossary.tsv +++ b/i18n/sl/glossary.tsv @@ -231,3 +231,11 @@ Project Projekt a named set of edits of one sequence, with a linear version hist Main Glavni name of every sequence's first project, holding the sequence's own settings Versions Različice the saved states of a project, listed in its history Workspace copy Kopiranje v delovni prostor the job that copies a project's photos into the workspace +Match ujemanje pl. Ujemanja; "match found": najdeno ujemanje; two copies of one time-lapse (owner review 6); never the Duplicates or Copy term +Integrate Integriraj integrated: integrirano; Integrate photos: Integracija fotografij; complete a local and a server sequence with each other's photos +Merge sequences Združevanje sekvenc button: Združi; job kind: Združevanje sekvenc; two sequences of this PC into the kept one +Keep apart Ohrani ločeno kept apart: ohranjeno ločeno; answer to a match, not asked again +Twin Dvojček a workspace project with a sibling at the other home (Edit picker chip) +Link only / Unlink Samo poveži / Odveži linked: povezano; Link matches: Poveži ujemanja +Union Unija the default Integrate photos choice: every photo to both sides, a differing one kept in both versions +Kept / Other (merge) Ohranjena / Druga the kept sequence of a merge and the one that goes to the trash; Only in kept: Samo v ohranjeni; Kept one wins: Velja ohranjena diff --git a/i18n/sv/glossary.tsv b/i18n/sv/glossary.tsv index 90a9b2ab..ca7db41f 100644 --- a/i18n/sv/glossary.tsv +++ b/i18n/sv/glossary.tsv @@ -222,3 +222,11 @@ Project Projekt a named set of edits of one sequence, with a linear version hist Main Huvudprojekt name of every sequence's first project, holding the sequence's own settings Versions Versioner the saved states of a project, listed in its history Workspace copy Kopiering till arbetsyta the job that copies a project's photos into the workspace +Match matchning pl. Matchningar; "match found": matchning hittad; two copies of one time-lapse (owner review 6); never the Duplicates or Copy term +Integrate Integrera integrated: integrerad; Integrate photos: Integrera foton; complete a local and a server sequence with each other's photos +Merge sequences Slå ihop sekvenser button: Slå ihop; job kind: Sammanslagning av sekvenser; two sequences of this PC into the kept one +Keep apart Håll isär kept apart: hålls isär; answer to a match, not asked again +Twin Tvilling a workspace project with a sibling at the other home (Edit picker chip) +Link only / Unlink Länka bara / Ta bort länk linked: länkad; Link matches: Länka matchningar +Union Union the default Integrate photos choice: every photo to both sides, a differing one kept in both versions +Kept / Other (merge) Behållen / Andra the kept sequence of a merge and the one that goes to the trash; Only in kept: Bara i behållen; Kept one wins: Behållen vinner diff --git a/i18n/th/glossary.tsv b/i18n/th/glossary.tsv index 493e0820..b2388877 100644 --- a/i18n/th/glossary.tsv +++ b/i18n/th/glossary.tsv @@ -212,3 +212,11 @@ Workspace พื้นที่ทำงาน the folder on this PC where proje Main หลัก name of every sequence's first project, holding the sequence's own settings Versions เวอร์ชัน the saved states of a project, listed in its history Workspace copy คัดลอกไปยังพื้นที่ทำงาน the job that copies a project's photos into the workspace +Match รายการที่ตรงกัน pl. รายการที่ตรงกัน; "match found": พบรายการที่ตรงกัน; two copies of one time-lapse (owner review 6); never the Duplicates or Copy term +Integrate ผสานรวม integrated: ผสานรวมแล้ว; Integrate photos: ผสานรวมภาพถ่าย; complete a local and a server sequence with each other's photos +Merge sequences รวมซีเควนซ์ button: รวม; job kind: รวมซีเควนซ์; two sequences of this PC into the kept one +Keep apart แยกไว้ kept apart: แยกไว้แล้ว; answer to a match, not asked again +Twin แฝด a workspace project with a sibling at the other home (Edit picker chip) +Link only / Unlink เชื่อมโยงเท่านั้น / เลิกเชื่อมโยง linked: เชื่อมโยงแล้ว; Link matches: เชื่อมโยงรายการที่ตรงกัน +Union รวมทั้งหมด the default Integrate photos choice: every photo to both sides, a differing one kept in both versions +Kept / Other (merge) ที่เก็บไว้ / อีกซีเควนซ์ the kept sequence of a merge and the one that goes to the trash; Only in kept: เฉพาะในที่เก็บไว้; Kept one wins: ใช้ของที่เก็บไว้ diff --git a/i18n/tr/glossary.tsv b/i18n/tr/glossary.tsv index 51a3ea54..05245d4d 100644 --- a/i18n/tr/glossary.tsv +++ b/i18n/tr/glossary.tsv @@ -269,3 +269,11 @@ Project Proje a named set of edits of one sequence, with a linear version histor Main Ana name of every sequence's first project, holding the sequence's own settings Versions Sürümler the saved states of a project, listed in its history Workspace copy Çalışma alanı kopyalama the job that copies a project's photos into the workspace +Match eşleşme pl. Eşleşmeler; "match found": eşleşme bulundu; two copies of one time-lapse (owner review 6); never the Duplicates or Copy term +Integrate Bütünleştir integrated: bütünleştirildi; Integrate photos: Fotoğrafları bütünleştir; complete a local and a server sequence with each other's photos +Merge sequences Sekansları birleştir button: Birleştir; job kind: Sekans birleştirme; two sequences of this PC into the kept one +Keep apart Ayrı tut kept apart: ayrı tutuldu; answer to a match, not asked again +Twin İkiz a workspace project with a sibling at the other home (Edit picker chip) +Link only / Unlink Yalnızca bağla / Bağlantıyı kaldır linked: bağlandı; Link matches: Eşleşmeleri bağla +Union Birleşim the default Integrate photos choice: every photo to both sides, a differing one kept in both versions +Kept / Other (merge) Korunan / Diğeri the kept sequence of a merge and the one that goes to the trash; Only in kept: Yalnızca korunanda; Kept one wins: Korunan kazanır diff --git a/i18n/uk/glossary.tsv b/i18n/uk/glossary.tsv index 944856ac..3126add2 100644 --- a/i18n/uk/glossary.tsv +++ b/i18n/uk/glossary.tsv @@ -240,3 +240,11 @@ Project Проєкт a named set of edits of one sequence, with a linear version Main Основний name of every sequence's first project, holding the sequence's own settings Versions Версії the saved states of a project, listed in its history Workspace copy Копіювання до робочого простору the job that copies a project's photos into the workspace +Match збіг pl. Збіги; "match found": знайдено збіг; two copies of one time-lapse (owner review 6); never the Duplicates or Copy term +Integrate Інтегрувати integrated: інтегровано; Integrate photos: Інтеграція фото; complete a local and a server sequence with each other's photos +Merge sequences Об’єднання послідовностей button: Об’єднати; job kind: Об’єднання послідовностей; two sequences of this PC into the kept one +Keep apart Тримати окремо kept apart: окремо; answer to a match, not asked again +Twin Двійник a workspace project with a sibling at the other home (Edit picker chip) +Link only / Unlink Лише пов’язати / Від’єднати linked: пов’язано; Link matches: Пов’язувати збіги +Union Усе з обох the default Integrate photos choice: every photo to both sides, a differing one kept in both versions +Kept / Other (merge) Залишена / Інша the kept sequence of a merge and the one that goes to the trash; Only in kept: Лише в залишеній; Kept one wins: Перемагає залишена diff --git a/i18n/vi/glossary.tsv b/i18n/vi/glossary.tsv index b20d711d..5b852ffc 100644 --- a/i18n/vi/glossary.tsv +++ b/i18n/vi/glossary.tsv @@ -221,3 +221,11 @@ Project Dự án a named set of edits of one sequence, with a linear version his Main Chính name of every sequence's first project, holding the sequence's own settings Versions Phiên bản the saved states of a project, listed in its history Workspace copy Sao chép vào không gian làm việc the job that copies a project's photos into the workspace +Match cặp tương ứng pl. Cặp tương ứng; "match found": đã tìm thấy cặp tương ứng; two copies of one time-lapse (owner review 6); never the Duplicates or Copy term +Integrate Tích hợp integrated: đã tích hợp; Integrate photos: Tích hợp ảnh; complete a local and a server sequence with each other's photos +Merge sequences Gộp chuỗi ảnh button: Gộp; job kind: Gộp chuỗi ảnh; two sequences of this PC into the kept one +Keep apart Giữ riêng kept apart: đã giữ riêng; answer to a match, not asked again +Twin Song sinh a workspace project with a sibling at the other home (Edit picker chip) +Link only / Unlink Chỉ liên kết / Hủy liên kết linked: đã liên kết; Link matches: Liên kết cặp tương ứng +Union Hợp nhất the default Integrate photos choice: every photo to both sides, a differing one kept in both versions +Kept / Other (merge) Chuỗi giữ lại / Chuỗi kia the kept sequence of a merge and the one that goes to the trash; Only in kept: Chỉ ở chuỗi giữ lại; Kept one wins: Ưu tiên chuỗi giữ lại diff --git a/i18n/zh-Hans/glossary.tsv b/i18n/zh-Hans/glossary.tsv index 0abd0e26..ac1d9bcd 100644 --- a/i18n/zh-Hans/glossary.tsv +++ b/i18n/zh-Hans/glossary.tsv @@ -207,3 +207,11 @@ Project 项目 a named set of edits of one sequence, with a linear version histo Main 主项目 name of every sequence's first project, holding the sequence's own settings Versions 版本 the saved states of a project, listed in its history Workspace copy 工作区复制 the job that copies a project's photos into the workspace +Match 匹配项 pl. 匹配项; "match found": 找到匹配项; two copies of one time-lapse (owner review 6); never the Duplicates or Copy term +Integrate 整合 integrated: 已整合; Integrate photos: 整合照片; complete a local and a server sequence with each other's photos +Merge sequences 合并序列 button: 合并; job kind: 合并序列; two sequences of this PC into the kept one +Keep apart 保持分开 kept apart: 已保持分开; answer to a match, not asked again +Twin 孪生 a workspace project with a sibling at the other home (Edit picker chip) +Link only / Unlink 仅关联 / 取消关联 linked: 已关联; Link matches: 关联匹配项 +Union 并集 the default Integrate photos choice: every photo to both sides, a differing one kept in both versions +Kept / Other (merge) 保留的 / 另一个 the kept sequence of a merge and the one that goes to the trash; Only in kept: 仅在保留的中; Kept one wins: 以保留的为准 diff --git a/i18n/zh-Hant/glossary.tsv b/i18n/zh-Hant/glossary.tsv index c2c7c543..3b550b0e 100644 --- a/i18n/zh-Hant/glossary.tsv +++ b/i18n/zh-Hant/glossary.tsv @@ -247,3 +247,11 @@ Project 專案 a named set of edits of one sequence, with a linear version histo Main 主要專案 name of every sequence's first project, holding the sequence's own settings Versions 版本 the saved states of a project, listed in its history Workspace copy 工作區複製 the job that copies a project's photos into the workspace +Match 相符項目 pl. 相符項目; "match found": 找到相符項目; two copies of one time-lapse (owner review 6); never the Duplicates or Copy term +Integrate 整合 integrated: 已整合; Integrate photos: 整合相片; complete a local and a server sequence with each other's photos +Merge sequences 合併序列 button: 合併; job kind: 合併序列; two sequences of this PC into the kept one +Keep apart 保持分開 kept apart: 已保持分開; answer to a match, not asked again +Twin 孿生 a workspace project with a sibling at the other home (Edit picker chip) +Link only / Unlink 僅連結 / 取消連結 linked: 已連結; Link matches: 連結相符項目 +Union 聯集 the default Integrate photos choice: every photo to both sides, a differing one kept in both versions +Kept / Other (merge) 保留的 / 另一個 the kept sequence of a merge and the one that goes to the trash; Only in kept: 僅在保留的中; Kept one wins: 以保留的為準