diff --git a/docs/CHANGELOG.md b/docs/CHANGELOG.md
index 64bcabd4..963fbe84 100644
--- a/docs/CHANGELOG.md
+++ b/docs/CHANGELOG.md
@@ -178,6 +178,20 @@ match. A 1.1 server works as before, without Integrate; a 1.2 server adds the ph
- A server sequence's Library card in a match offers Compare… alone.
- Italian: *attività* for job and *spazio di lavoro* for workspace in the match strings; *Quella tenuta*; Settings ›
Server reads *Integrazione foto* and *Integrazione progetti*.
+ - A merge stopped after the other changed plans again on the next retry instead of failing on the same journal.
+ - *Unlink* or *Keep apart* of a pair that no longer holds the link leaves the other pair's link and integration
+ alone; *Link only* waits while an integration of either side runs, and an integration never undoes a link given
+ to another sequence since.
+ - A sweep of server sequences no longer found asks the server once, not once per pair.
+ - *To trash…* on *Deleted in other* of a merge trashes from the kept sequence, after a swap too, and on any trash
+ stops when a photo became a last copy since the plan; the version Main uses is marked from the kept sequence.
+ - A linked match whose server deleted photos shows three row buttons (*Compare…*, *Unlink*, *Review*).
+ - The policy and version choices, and Settings › Server's three match rows, fit in every language; the side of a
+ version reads whole and Drop… keeps its gap; each choice of a Details line says which value it takes, naming the
+ server; a long raw value wraps in its tooltip; the Projects headings stay over their lists.
+ - 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.
## [1.1.1] — 2026-11-16
diff --git a/docs/DECISIONS.md b/docs/DECISIONS.md
index 235bb432..96c8d35d 100644
--- a/docs/DECISIONS.md
+++ b/docs/DECISIONS.md
@@ -993,3 +993,12 @@ One line per decision: date · decision · alternative · reason.
| 2026-11-17 | A server sequence's Library card in a match offers *Compare…* alone (`Menu.CardMatchRemote`): Two versions… lists a local sequence's own photos (#73) | The local card's menu | Two versions… on a server card listed nothing it could act on |
| 2026-11-17 | Italian: Job is *attività* and workspace *spazio di lavoro* in every new string (`i18n/GLOSSARY.md`); Kept reads *Quella tenuta*; the Settings rows read *Integrazione foto* and *Integrazione progetti* (#73) | Lavoro | The glossary fixes both terms; "lavoro" read as work, not a job |
| 2026-11-17 | Finding 9 of the fifth verification round (a pair of this PC's sequences dropping a version listed "0 photos") is not reproduced: `DropVersionPlan.Photos` counts each local side's version, 2 for two local sequences; a test keeps it so (#73) | Change the count | The count was right; the test proves it |
+| 2026-11-17 | A merge that finds the other changed since its journal (frames version, a frame not verified, the trash re-check) deletes the journal before it fails, so the retry plans again (#73) | Keep the journal | Every retry failed on the same stale journal |
+| 2026-11-17 | Unlink names the local side it unlinks (`SyncService.UnlinkAsync(server, remote, local)`): a link that now joins another local is left alone; an integrating pair is refused (*Busy*); the state moves by compare-and-set. Link only is refused while a pair of either side integrates, and the Integrate job checks at Link, Trash and Details that the link still joins its two sides (#73) | Unlink by the remote alone | Unlinking a stale pair cut the link and the integration of the pair that held it |
+| 2026-11-17 | A sweep of 404s (`MarkGoneAsync` over many pairs) does not ask the server for each pair again; only a single pair's 404 is confirmed (#73) | Confirm each | A sweep asked the server once per pair, the sweep's own question |
+| 2026-11-17 | To trash… names the sequence it trashes from (`PlanTrashHereAsync(copy, fromSequence, …)`): a merge's *Deleted in other* trashes from the kept sequence, after a swap too; every trash or drop re-checks for photos that became a last copy since the plan and fails as stale (#73) | Always the pair's first | After a swap the trash came from the sequence that goes to the trash anyway |
+| 2026-11-17 | A row shows three buttons at most: a linked pair with photos deleted there drops *Integrate…* (Compare… and Review both reach it); a test holds every state to three. No new sample pair for it, to keep the captures (#73) | Four buttons | The fourth button overflowed the actions column |
+| 2026-11-17 | The policy boxes (dialog and Settings › Server) are 240 px and the version box 185 px, sized by a test that measures every label in every shipped language (Greek is the longest); the label trims with an ellipsis if a future one is longer (#73) | Fixed narrower widths | Long translations were cut without a sign |
+| 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 |
diff --git a/docs/STATUS.md b/docs/STATUS.md
index b91c62b7..cf4ea401 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 five 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. 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. |
| 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/i18n/ar/Tooltips.ar.resx b/i18n/ar/Tooltips.ar.resx
index 3047516c..ca3ccadc 100644
--- a/i18n/ar/Tooltips.ar.resx
+++ b/i18n/ar/Tooltips.ar.resx
@@ -840,6 +840,10 @@
أخذ قيمة التسلسل المحتفظ به لكل اختلاف.
أخذ قيمة التسلسل الآخر لكل اختلاف.
أخذ قيمة {0} لكل اختلاف.
+ أخذ قيمة هذا الكمبيوتر: {0}
+ أخذ قيمة {0}: {1}
+ أخذ قيمة التسلسل المحتفظ به: {0}
+ أخذ قيمة التسلسل الآخر: {0}
نقل هذا الإصدار إلى سلة محذوفات كل جانب يحتوي عليه.
يستخدم الفاصل الزمني والعروض في الرئيسي هذه النسخة؛ الأخرى مستبعدة.
البحث الآن عن تطابقات لهذه التسلسلات على {0} وعلى هذا الكمبيوتر.
diff --git a/i18n/bg/Tooltips.bg.resx b/i18n/bg/Tooltips.bg.resx
index 261f3c86..0c5ddf52 100644
--- a/i18n/bg/Tooltips.bg.resx
+++ b/i18n/bg/Tooltips.bg.resx
@@ -804,6 +804,10 @@
Взема стойността на запазената серия за всяка разлика.
Взема стойността на другата серия за всяка разлика.
Взема стойността на {0} за всяка разлика.
+ Взема стойността на този компютър: {0}
+ Взема стойността на {0}: {1}
+ Взема стойността на запазената серия: {0}
+ Взема стойността на другата серия: {0}
Премества тази версия в кошчето на всяка страна, която я има.
Таймлапсът и рендерите на Основен използват тази версия; другата е изключена.
Търси сега съвпадения на тези серии на {0} и на този компютър.
diff --git a/i18n/cs/Tooltips.cs.resx b/i18n/cs/Tooltips.cs.resx
index 0925497e..53c0dd22 100644
--- a/i18n/cs/Tooltips.cs.resx
+++ b/i18n/cs/Tooltips.cs.resx
@@ -822,6 +822,10 @@
U každého rozdílu převezme hodnotu ponechané sekvence.
U každého rozdílu převezme hodnotu druhé sekvence.
U každého rozdílu převezme hodnotu z {0}.
+ Převezme hodnotu z tohoto počítače: {0}
+ Převezme hodnotu z {0}: {1}
+ Převezme hodnotu ponechané sekvence: {0}
+ Převezme hodnotu druhé sekvence: {0}
Přesune tuto verzi do koše každé strany, která ji má.
Časosběr a rendery Hlavního používají tuto verzi; druhá je vyloučená.
Hned vyhledá shody těchto sekvencí na {0} a v tomto počítači.
diff --git a/i18n/da/Tooltips.da.resx b/i18n/da/Tooltips.da.resx
index 749d8a8f..19ac805c 100644
--- a/i18n/da/Tooltips.da.resx
+++ b/i18n/da/Tooltips.da.resx
@@ -804,6 +804,10 @@
Brug den beholdte sekvens' værdi for hver forskel.
Brug den anden sekvens' værdi for hver forskel.
Brug værdien fra {0} for hver forskel.
+ Brug værdien fra denne pc: {0}
+ Brug værdien fra {0}: {1}
+ Brug den beholdte sekvens' værdi: {0}
+ Brug den anden sekvens' værdi: {0}
Flyt denne version til papirkurven på hver side, der har den.
Hoveds timelapse og renderinger bruger denne version; den anden er udeladt.
Søg nu efter match til disse sekvenser på {0} og på denne pc.
diff --git a/i18n/de/Tooltips.de.resx b/i18n/de/Tooltips.de.resx
index 2f9e552e..35a7103a 100644
--- a/i18n/de/Tooltips.de.resx
+++ b/i18n/de/Tooltips.de.resx
@@ -804,6 +804,10 @@
Für jede Abweichung den Wert der bleibenden Sequenz übernehmen.
Für jede Abweichung den Wert der anderen Sequenz übernehmen.
Für jede Abweichung den Wert von {0} übernehmen.
+ Den Wert dieses PCs übernehmen: {0}
+ Den Wert von {0} übernehmen: {1}
+ Den Wert der bleibenden Sequenz übernehmen: {0}
+ Den Wert der anderen Sequenz übernehmen: {0}
Diese Version in den Papierkorb jeder Seite verschieben, die sie enthält.
Zeitraffer und Renderings des Hauptprojekts verwenden diese Version; die andere ist ausgeschlossen.
Jetzt auf {0} und auf diesem PC nach Übereinstimmungen dieser Sequenzen suchen.
diff --git a/i18n/el/Tooltips.el.resx b/i18n/el/Tooltips.el.resx
index e3a8f927..6d208c7f 100644
--- a/i18n/el/Tooltips.el.resx
+++ b/i18n/el/Tooltips.el.resx
@@ -804,6 +804,10 @@
Χρήση της τιμής της διατηρούμενης ακολουθίας για κάθε διαφορά.
Χρήση της τιμής της άλλης ακολουθίας για κάθε διαφορά.
Χρήση της τιμής του διακομιστή {0} για κάθε διαφορά.
+ Χρήση της τιμής αυτού του υπολογιστή: {0}
+ Χρήση της τιμής του διακομιστή {0}: {1}
+ Χρήση της τιμής της διατηρούμενης ακολουθίας: {0}
+ Χρήση της τιμής της άλλης ακολουθίας: {0}
Μετακίνηση αυτής της έκδοσης στον κάδο κάθε πλευράς που την έχει.
Το time-lapse και οι αποδόσεις του Κύριου χρησιμοποιούν αυτή την έκδοση· η άλλη εξαιρείται.
Αναζήτηση τώρα αντιστοιχιών αυτών των ακολουθιών στον διακομιστή {0} και σε αυτόν τον υπολογιστή.
diff --git a/i18n/en/Tooltips.resx b/i18n/en/Tooltips.resx
index e3ea32a5..0a40d15b 100644
--- a/i18n/en/Tooltips.resx
+++ b/i18n/en/Tooltips.resx
@@ -1232,6 +1232,10 @@
The value both sequences take.
Take this PC's value for every difference.
Take the value of {0} for every difference.
+ Take this PC's value: {0}
+ Take the value of {0}: {1}
+ Take the kept sequence's value: {0}
+ Take the other sequence's value: {0}
Take the kept sequence's value for every difference.
Take the other sequence's value for every difference.
Each side's other projects appear on the other home with their history, renamed on a clash.
diff --git a/i18n/es/Tooltips.es.resx b/i18n/es/Tooltips.es.resx
index aa641d38..c93641c6 100644
--- a/i18n/es/Tooltips.es.resx
+++ b/i18n/es/Tooltips.es.resx
@@ -804,6 +804,10 @@
Toma el valor de la secuencia conservada en cada diferencia.
Toma el valor de la otra secuencia en cada diferencia.
Toma el valor de {0} en cada diferencia.
+ Toma el valor de este equipo: {0}
+ Toma el valor de {0}: {1}
+ Toma el valor de la secuencia conservada: {0}
+ Toma el valor de la otra secuencia: {0}
Mueve esta versión a la papelera de cada lado que la tiene.
El timelapse y los renders de Principal usan esta versión; la otra está excluida.
Busca ahora coincidencias de estas secuencias en {0} y en este equipo.
diff --git a/i18n/et/Tooltips.et.resx b/i18n/et/Tooltips.et.resx
index a3054c62..ba53a393 100644
--- a/i18n/et/Tooltips.et.resx
+++ b/i18n/et/Tooltips.et.resx
@@ -804,6 +804,10 @@
Võtke iga erinevuse puhul säilitatava jada väärtus.
Võtke iga erinevuse puhul teise jada väärtus.
Võtke iga erinevuse puhul serveri {0} väärtus.
+ Võtke selle arvuti väärtus: {0}
+ Võtke serveri {0} väärtus: {1}
+ Võtke säilitatava jada väärtus: {0}
+ Võtke teise jada väärtus: {0}
Teisaldage see versioon iga poole prügikasti, kus see on.
Põhiprojekti aegvõte ja renderdused kasutavad seda versiooni; teine on välja jäetud.
Otsige kohe nende jadade vasteid serverist {0} ja sellest arvutist.
diff --git a/i18n/fi/Tooltips.fi.resx b/i18n/fi/Tooltips.fi.resx
index 866976bf..b3b10bbe 100644
--- a/i18n/fi/Tooltips.fi.resx
+++ b/i18n/fi/Tooltips.fi.resx
@@ -804,6 +804,10 @@
Käytä säilytettävän sarjan arvoa jokaisessa erossa.
Käytä toisen sarjan arvoa jokaisessa erossa.
Käytä kohteen {0} arvoa jokaisessa erossa.
+ Käytä tämän tietokoneen arvoa: {0}
+ Käytä kohteen {0} arvoa: {1}
+ Käytä säilytettävän sarjan arvoa: {0}
+ Käytä toisen sarjan arvoa: {0}
Siirrä tämä versio jokaisen sen sisältävän puolen roskakoriin.
Pääprojektin aikaväli ja renderöinnit käyttävät tätä versiota; toinen on jätetty pois.
Etsi nyt näiden sarjojen vastaavuuksia palvelimelta {0} ja tältä tietokoneelta.
diff --git a/i18n/fr/Tooltips.fr.resx b/i18n/fr/Tooltips.fr.resx
index a6536778..0103b9d4 100644
--- a/i18n/fr/Tooltips.fr.resx
+++ b/i18n/fr/Tooltips.fr.resx
@@ -804,6 +804,10 @@
Prendre la valeur de la séquence conservée pour chaque différence.
Prendre la valeur de l'autre séquence pour chaque différence.
Prendre la valeur de {0} pour chaque différence.
+ Prendre la valeur de ce PC : {0}
+ Prendre la valeur de {0} : {1}
+ Prendre la valeur de la séquence conservée : {0}
+ Prendre la valeur de l'autre séquence : {0}
Mettre cette version à la corbeille de chaque côté qui la contient.
Le timelapse et les rendus de Principal utilisent cette version ; l'autre est exclue.
Rechercher maintenant les correspondances de ces séquences sur {0} et sur ce PC.
diff --git a/i18n/he/Tooltips.he.resx b/i18n/he/Tooltips.he.resx
index 7b522afc..0082d122 100644
--- a/i18n/he/Tooltips.he.resx
+++ b/i18n/he/Tooltips.he.resx
@@ -822,6 +822,10 @@
לקיחת הערך של הרצף הנשמר לכל הבדל.
לקיחת הערך של הרצף השני לכל הבדל.
לקיחת הערך של {0} לכל הבדל.
+ לקיחת הערך של המחשב הזה: {0}
+ לקיחת הערך של {0}: {1}
+ לקיחת הערך של הרצף הנשמר: {0}
+ לקיחת הערך של הרצף השני: {0}
העברת הגרסה הזו לאשפה של כל צד שמחזיק אותה.
הצילום בהילוך מהיר והרינדורים של ראשי משתמשים בגרסה זו; האחרת מוחרגת.
חיפוש עכשיו של התאמות לרצפים האלה ב-{0} ובמחשב הזה.
diff --git a/i18n/hi/Tooltips.hi.resx b/i18n/hi/Tooltips.hi.resx
index 67b48d0e..3cc208d9 100644
--- a/i18n/hi/Tooltips.hi.resx
+++ b/i18n/hi/Tooltips.hi.resx
@@ -804,6 +804,10 @@
हर अंतर के लिए रखे गए सीक्वेंस का मान लें।
हर अंतर के लिए दूसरे सीक्वेंस का मान लें।
हर अंतर के लिए {0} का मान लें।
+ इस PC का मान लें: {0}
+ {0} का मान लें: {1}
+ रखे गए सीक्वेंस का मान लें: {0}
+ दूसरे सीक्वेंस का मान लें: {0}
इस संस्करण को उसे रखने वाले हर पक्ष के ट्रैश में ले जाएँ।
मुख्य का टाइम-लैप्स और रेंडर इस संस्करण का उपयोग करते हैं; दूसरा बाहर है।
अभी {0} पर और इस PC पर इन सीक्वेंस के मिलान खोजें।
diff --git a/i18n/hr/Tooltips.hr.resx b/i18n/hr/Tooltips.hr.resx
index f6fb1832..6bbc0703 100644
--- a/i18n/hr/Tooltips.hr.resx
+++ b/i18n/hr/Tooltips.hr.resx
@@ -822,6 +822,10 @@
Preuzima vrijednost zadržane sekvence za svaku razliku.
Preuzima vrijednost druge sekvence za svaku razliku.
Preuzima vrijednost poslužitelja {0} za svaku razliku.
+ Preuzima vrijednost ovog računala: {0}
+ Preuzima vrijednost poslužitelja {0}: {1}
+ Preuzima vrijednost zadržane sekvence: {0}
+ Preuzima vrijednost druge sekvence: {0}
Premješta ovu verziju u koš svake strane koja je sadrži.
Timelapse i renderi Glavnog koriste ovu verziju; druga je isključena.
Odmah traži podudaranja ovih sekvenci na poslužitelju {0} i na ovom računalu.
diff --git a/i18n/hu/Tooltips.hu.resx b/i18n/hu/Tooltips.hu.resx
index be0941d1..71493119 100644
--- a/i18n/hu/Tooltips.hu.resx
+++ b/i18n/hu/Tooltips.hu.resx
@@ -804,6 +804,10 @@
Minden eltérésnél a megtartott sorozat értékét veszi át.
Minden eltérésnél a másik sorozat értékét veszi át.
Minden eltérésnél a(z) {0} szerver értékét veszi át.
+ A számítógép értékét veszi át: {0}
+ A(z) {0} szerver értékét veszi át: {1}
+ A megtartott sorozat értékét veszi át: {0}
+ A másik sorozat értékét veszi át: {0}
Ezt a verziót minden olyan oldalon a lomtárba helyezi, ahol megvan.
A Fő projekt timelapse-e és renderei ezt a verziót használják; a másik ki van zárva.
Most egyezéseket keres ezekhez a sorozatokhoz a(z) {0} szerveren és ezen a számítógépen.
diff --git a/i18n/id/Tooltips.id.resx b/i18n/id/Tooltips.id.resx
index 109aba3f..0ec8080b 100644
--- a/i18n/id/Tooltips.id.resx
+++ b/i18n/id/Tooltips.id.resx
@@ -804,6 +804,10 @@
Pakai nilai sekuens yang dipertahankan untuk setiap perbedaan.
Pakai nilai sekuens lain untuk setiap perbedaan.
Pakai nilai {0} untuk setiap perbedaan.
+ Pakai nilai PC ini: {0}
+ Pakai nilai {0}: {1}
+ Pakai nilai sekuens yang dipertahankan: {0}
+ Pakai nilai sekuens lain: {0}
Pindahkan versi ini ke sampah setiap sisi yang memilikinya.
Time-lapse dan render Utama memakai versi ini; versi lain dikecualikan.
Cari padanan sekuens ini di {0} dan di PC ini sekarang.
diff --git a/i18n/it/Server.it.resx b/i18n/it/Server.it.resx
index 3cb3ff71..6a065809 100644
--- a/i18n/it/Server.it.resx
+++ b/i18n/it/Server.it.resx
@@ -368,9 +368,9 @@
Eliminate qui
Eliminate là
Due versioni
- Solo nella tenuta
+ Solo in quella tenuta
Solo nell'altra
- Eliminate nella tenuta
+ Eliminate in quella tenuta
Eliminate nell'altra
Nessuna foto diversa.
Foto
diff --git a/i18n/it/Tooltips.it.resx b/i18n/it/Tooltips.it.resx
index 49d4a0f4..c4046c8f 100644
--- a/i18n/it/Tooltips.it.resx
+++ b/i18n/it/Tooltips.it.resx
@@ -1206,8 +1206,8 @@
Stesso nome e ora di scatto, file diversi. Unione tiene entrambe le versioni.
Stesso nome e ora di scatto, file diversi. Il file di questo PC sostituisce quello del server, che va nel cestino.
Stesso nome e ora di scatto, file diversi. Il file del server sostituisce quello di questo PC, che va nel cestino.
- Stesso nome e ora di scatto, file diversi. Il file della sequenza tenuta resta; quello dell'altra va nel cestino con lei.
- Stesso nome e ora di scatto, file diversi. Il file dell'altra sequenza sostituisce quello della tenuta, che va nel cestino.
+ Stesso nome e ora di scatto, file diversi. Il file della sequenza tenuta resta; quello dell'altra va nel cestino insieme a essa.
+ Stesso nome e ora di scatto, file diversi. Il file dell'altra sequenza sostituisce quello della sequenza tenuta, che va nel cestino.
Stesso nome e ora di scatto, file diversi. Scegli per ogni foto; Lascia non cambia nulla.
Stesso nome e ora di scatto, file diversi. Scegli per ogni foto: entrambe, quella tenuta o l'altra.
Stesso nome e ora di scatto, file diversi. La sequenza tenuta conserva entrambe le versioni.
@@ -1230,6 +1230,10 @@
Il valore che prendono entrambe le sequenze.
Prende il valore di questo PC per ogni differenza.
Prende il valore di {0} per ogni differenza.
+ Prende il valore di questo PC: {0}
+ Prende il valore di {0}: {1}
+ Prende il valore della sequenza tenuta: {0}
+ Prende il valore dell'altra sequenza: {0}
Prende il valore della sequenza tenuta per ogni differenza.
Prende il valore dell'altra sequenza per ogni differenza.
Gli altri progetti di ogni lato compaiono nell'altra sede con la loro storia, rinominati se il nome è preso.
diff --git a/i18n/ja/Tooltips.ja.resx b/i18n/ja/Tooltips.ja.resx
index 2b140e88..c9a709ed 100644
--- a/i18n/ja/Tooltips.ja.resx
+++ b/i18n/ja/Tooltips.ja.resx
@@ -804,6 +804,10 @@
すべての相違点で残すシーケンスの値を採用します。
すべての相違点でもう一方のシーケンスの値を採用します。
すべての相違点で {0} の値を採用します。
+ この PC の値を採用します: {0}
+ {0} の値を採用します: {1}
+ 残すシーケンスの値を採用します: {0}
+ もう一方のシーケンスの値を採用します: {0}
このバージョンを、それを保持する各側のごみ箱に移動します。
メインのタイムラプスとレンダリングはこのバージョンを使用します。もう一方は除外されています。
{0} とこの PC で、これらのシーケンスの一致を今すぐ検索します。
diff --git a/i18n/ko/Tooltips.ko.resx b/i18n/ko/Tooltips.ko.resx
index 90abfd75..3de063b5 100644
--- a/i18n/ko/Tooltips.ko.resx
+++ b/i18n/ko/Tooltips.ko.resx
@@ -804,6 +804,10 @@
모든 차이에 유지 시퀀스의 값을 사용합니다.
모든 차이에 다른 시퀀스의 값을 사용합니다.
모든 차이에 {0}의 값을 사용합니다.
+ 이 PC의 값을 사용합니다: {0}
+ {0}의 값을 사용합니다: {1}
+ 유지 시퀀스의 값을 사용합니다: {0}
+ 다른 시퀀스의 값을 사용합니다: {0}
이 버전을 보관하고 있는 각 쪽의 휴지통으로 이동합니다.
기본의 타임랩스와 렌더링은 이 버전을 사용합니다. 다른 버전은 제외됩니다.
지금 {0} 서버와 이 PC에서 이 시퀀스의 일치 항목을 찾습니다.
diff --git a/i18n/lt/Tooltips.lt.resx b/i18n/lt/Tooltips.lt.resx
index 1ef9b38d..8d964862 100644
--- a/i18n/lt/Tooltips.lt.resx
+++ b/i18n/lt/Tooltips.lt.resx
@@ -822,6 +822,10 @@
Kiekvienam skirtumui imti paliekamos sekos reikšmę.
Kiekvienam skirtumui imti kitos sekos reikšmę.
Kiekvienam skirtumui imti reikšmę iš {0}.
+ Imti šio kompiuterio reikšmę: {0}
+ Imti reikšmę iš {0}: {1}
+ Imti paliekamos sekos reikšmę: {0}
+ Imti kitos sekos reikšmę: {0}
Perkelti šią versiją į kiekvienos ją turinčios pusės šiukšlinę.
Pagrindinio laiko intervalų vaizdas ir atvaizdai naudoja šią versiją; kita neįtraukta.
Dabar ieškoti šių sekų atitikmenų serveryje {0} ir šiame kompiuteryje.
diff --git a/i18n/lv/Tooltips.lv.resx b/i18n/lv/Tooltips.lv.resx
index f02f4a25..cba9e47b 100644
--- a/i18n/lv/Tooltips.lv.resx
+++ b/i18n/lv/Tooltips.lv.resx
@@ -822,6 +822,10 @@
Katrai atšķirībai ņemt paturētās secības vērtību.
Katrai atšķirībai ņemt otras secības vērtību.
Katrai atšķirībai ņemt vērtību no {0}.
+ Ņemt šī datora vērtību: {0}
+ Ņemt vērtību no {0}: {1}
+ Ņemt paturētās secības vērtību: {0}
+ Ņemt otras secības vērtību: {0}
Pārvietot šo versiju uz katras puses atkritni, kurā tā ir.
Galvenā laika intervāla video un renderējumi izmanto šo versiju; otra ir izslēgta.
Tagad meklēt šo secību atbilstības serverī {0} un šajā datorā.
diff --git a/i18n/ms/Tooltips.ms.resx b/i18n/ms/Tooltips.ms.resx
index 49ec6ce0..ef8a17c5 100644
--- a/i18n/ms/Tooltips.ms.resx
+++ b/i18n/ms/Tooltips.ms.resx
@@ -804,6 +804,10 @@
Ambil nilai jujukan yang dikekalkan bagi setiap perbezaan.
Ambil nilai jujukan lain bagi setiap perbezaan.
Ambil nilai {0} bagi setiap perbezaan.
+ Ambil nilai PC ini: {0}
+ Ambil nilai {0}: {1}
+ Ambil nilai jujukan yang dikekalkan: {0}
+ Ambil nilai jujukan lain: {0}
Pindahkan versi ini ke tong sampah setiap pihak yang menyimpannya.
Selang masa dan render Utama menggunakan versi ini; versi lain dikecualikan.
Cari padanan jujukan ini pada {0} dan pada PC ini sekarang.
diff --git a/i18n/nb/Tooltips.nb.resx b/i18n/nb/Tooltips.nb.resx
index 00fad23c..a5e0bd18 100644
--- a/i18n/nb/Tooltips.nb.resx
+++ b/i18n/nb/Tooltips.nb.resx
@@ -804,6 +804,10 @@
Bruk verdien fra den beholdte sekvensen for alle forskjeller.
Bruk verdien fra den andre sekvensen for alle forskjeller.
Bruk verdien fra {0} for alle forskjeller.
+ Bruk verdien fra denne PC-en: {0}
+ Bruk verdien fra {0}: {1}
+ Bruk verdien fra den beholdte sekvensen: {0}
+ Bruk verdien fra den andre sekvensen: {0}
Flytt denne versjonen til papirkurven på hver side som har den.
Hoveds timelapse og gjengivelser bruker denne versjonen; den andre er utelatt.
Søk etter samsvar for disse sekvensene på {0} og på denne PC-en nå.
diff --git a/i18n/nl/Tooltips.nl.resx b/i18n/nl/Tooltips.nl.resx
index 73a9fd74..5fc75c66 100644
--- a/i18n/nl/Tooltips.nl.resx
+++ b/i18n/nl/Tooltips.nl.resx
@@ -804,6 +804,10 @@
Neem voor elk verschil de waarde van de behouden reeks.
Neem voor elk verschil de waarde van de andere reeks.
Neem voor elk verschil de waarde van {0}.
+ Neem de waarde van deze pc: {0}
+ Neem de waarde van {0}: {1}
+ Neem de waarde van de behouden reeks: {0}
+ Neem de waarde van de andere reeks: {0}
Verplaats deze versie naar de prullenbak van elke kant die haar heeft.
De timelapse en renders van Hoofd gebruiken deze versie; de andere is uitgesloten.
Zoek nu naar overeenkomsten van deze reeksen op {0} en op deze pc.
diff --git a/i18n/pl/Tooltips.pl.resx b/i18n/pl/Tooltips.pl.resx
index 5f0cdce4..658c18f6 100644
--- a/i18n/pl/Tooltips.pl.resx
+++ b/i18n/pl/Tooltips.pl.resx
@@ -840,6 +840,10 @@
Przyjmij wartość zachowanej sekwencji dla każdej różnicy.
Przyjmij wartość drugiej sekwencji dla każdej różnicy.
Przyjmij wartość z {0} dla każdej różnicy.
+ Przyjmij wartość z tego komputera: {0}
+ Przyjmij wartość z {0}: {1}
+ Przyjmij wartość zachowanej sekwencji: {0}
+ Przyjmij wartość drugiej sekwencji: {0}
Przenieś tę wersję do kosza po każdej stronie, która ją ma.
Timelapse i rendery projektu Główny używają tej wersji; druga jest wykluczona.
Wyszukaj teraz dopasowania tych sekwencji na {0} i na tym komputerze.
diff --git a/i18n/pt-BR/Tooltips.pt-BR.resx b/i18n/pt-BR/Tooltips.pt-BR.resx
index ecc0910e..56f72f4f 100644
--- a/i18n/pt-BR/Tooltips.pt-BR.resx
+++ b/i18n/pt-BR/Tooltips.pt-BR.resx
@@ -804,6 +804,10 @@
Usa o valor da sequência mantida em todas as diferenças.
Usa o valor da outra sequência em todas as diferenças.
Usa o valor de {0} em todas as diferenças.
+ Usa o valor deste PC: {0}
+ Usa o valor de {0}: {1}
+ Usa o valor da sequência mantida: {0}
+ Usa o valor da outra sequência: {0}
Move esta versão para a lixeira de cada lado que a tem.
O time-lapse e as renderizações do Principal usam esta versão; a outra está excluída.
Procura agora correspondências destas sequências em {0} e neste PC.
diff --git a/i18n/pt-PT/Tooltips.pt-PT.resx b/i18n/pt-PT/Tooltips.pt-PT.resx
index 0a5f6e97..ce5ff40f 100644
--- a/i18n/pt-PT/Tooltips.pt-PT.resx
+++ b/i18n/pt-PT/Tooltips.pt-PT.resx
@@ -804,6 +804,10 @@
Usar o valor da sequência mantida em todas as diferenças.
Usar o valor da outra sequência em todas as diferenças.
Usar o valor de {0} em todas as diferenças.
+ Usar o valor deste PC: {0}
+ Usar o valor de {0}: {1}
+ Usar o valor da sequência mantida: {0}
+ Usar o valor da outra sequência: {0}
Mover esta versão para o lixo de cada lado que a contém.
O time-lapse e as renderizações do Principal usam esta versão; a outra está excluída.
Procurar agora correspondências destas sequências em {0} e neste PC.
diff --git a/i18n/ro/Tooltips.ro.resx b/i18n/ro/Tooltips.ro.resx
index 53180e3f..37a9dec1 100644
--- a/i18n/ro/Tooltips.ro.resx
+++ b/i18n/ro/Tooltips.ro.resx
@@ -822,6 +822,10 @@
Preluați valoarea secvenței păstrate pentru fiecare diferență.
Preluați valoarea celeilalte secvențe pentru fiecare diferență.
Preluați valoarea din {0} pentru fiecare diferență.
+ Preluați valoarea acestui PC: {0}
+ Preluați valoarea din {0}: {1}
+ Preluați valoarea secvenței păstrate: {0}
+ Preluați valoarea celeilalte secvențe: {0}
Mutați această versiune în coșul de gunoi al fiecărei părți care o deține.
Time-lapse-ul și randările din Principal folosesc această versiune; cealaltă este exclusă.
Căutați acum corespondențe ale acestor secvențe pe {0} și pe acest PC.
diff --git a/i18n/ru/Tooltips.ru.resx b/i18n/ru/Tooltips.ru.resx
index 58613a08..0304e3b5 100644
--- a/i18n/ru/Tooltips.ru.resx
+++ b/i18n/ru/Tooltips.ru.resx
@@ -840,6 +840,10 @@
Взять значение сохраняемой серии для всех различий.
Взять значение другой серии для всех различий.
Взять значение из {0} для всех различий.
+ Взять значение этого ПК: {0}
+ Взять значение из {0}: {1}
+ Взять значение сохраняемой серии: {0}
+ Взять значение другой серии: {0}
Переместить эту версию в корзину на каждой стороне, где она есть.
Таймлапс и рендеры Основного используют эту версию; другая исключена.
Найти сейчас совпадения этих серий на сервере «{0}» и на этом ПК.
diff --git a/i18n/sk/Tooltips.sk.resx b/i18n/sk/Tooltips.sk.resx
index 4caf0db3..d4ef33fa 100644
--- a/i18n/sk/Tooltips.sk.resx
+++ b/i18n/sk/Tooltips.sk.resx
@@ -822,6 +822,10 @@
Použije hodnotu ponechanej sekvencie pre každý rozdiel.
Použije hodnotu druhej sekvencie pre každý rozdiel.
Použije hodnotu z {0} pre každý rozdiel.
+ Použije hodnotu tohto počítača: {0}
+ Použije hodnotu z {0}: {1}
+ Použije hodnotu ponechanej sekvencie: {0}
+ Použije hodnotu druhej sekvencie: {0}
Presunie túto verziu do koša na každej strane, ktorá ju má.
Časozber a rendery Hlavného používajú túto verziu; druhá je vylúčená.
Teraz vyhľadá zhody týchto sekvencií na serveri {0} a na tomto počítači.
diff --git a/i18n/sl/Tooltips.sl.resx b/i18n/sl/Tooltips.sl.resx
index 46ebc6a1..01935520 100644
--- a/i18n/sl/Tooltips.sl.resx
+++ b/i18n/sl/Tooltips.sl.resx
@@ -822,6 +822,10 @@
Prevzemi vrednost ohranjene sekvence za vsako razliko.
Prevzemi vrednost druge sekvence za vsako razliko.
Prevzemi vrednost strežnika {0} za vsako razliko.
+ Prevzemi vrednost tega računalnika: {0}
+ Prevzemi vrednost strežnika {0}: {1}
+ Prevzemi vrednost ohranjene sekvence: {0}
+ Prevzemi vrednost druge sekvence: {0}
Premakni to različico v koš vsake strani, ki jo ima.
Časovni zamik in upodobitve Glavnega uporabljajo to različico; druga je izključena.
Zdaj poišči ujemanja teh sekvenc na strežniku {0} in v tem računalniku.
diff --git a/i18n/sv/Tooltips.sv.resx b/i18n/sv/Tooltips.sv.resx
index 2f56e20d..4c9e2f67 100644
--- a/i18n/sv/Tooltips.sv.resx
+++ b/i18n/sv/Tooltips.sv.resx
@@ -804,6 +804,10 @@
Använd den behållna sekvensens värde för varje skillnad.
Använd den andra sekvensens värde för varje skillnad.
Använd värdet från {0} för varje skillnad.
+ Använd den här datorns värde: {0}
+ Använd värdet från {0}: {1}
+ Använd den behållna sekvensens värde: {0}
+ Använd den andra sekvensens värde: {0}
Flytta den här versionen till papperskorgen på varje sida som har den.
Huvudprojektets timelapse och renderingar använder den här versionen; den andra är utesluten.
Sök efter matchningar för de här sekvenserna på {0} och på den här datorn nu.
diff --git a/i18n/th/Tooltips.th.resx b/i18n/th/Tooltips.th.resx
index bfb47d5d..2b95bc83 100644
--- a/i18n/th/Tooltips.th.resx
+++ b/i18n/th/Tooltips.th.resx
@@ -804,6 +804,10 @@
ใช้ค่าของซีเควนซ์ที่เก็บไว้สำหรับทุกความแตกต่าง
ใช้ค่าของอีกซีเควนซ์สำหรับทุกความแตกต่าง
ใช้ค่าของ {0} สำหรับทุกความแตกต่าง
+ ใช้ค่าของพีซีเครื่องนี้: {0}
+ ใช้ค่าของ {0}: {1}
+ ใช้ค่าของซีเควนซ์ที่เก็บไว้: {0}
+ ใช้ค่าของอีกซีเควนซ์: {0}
ย้ายเวอร์ชันนี้ไปที่ถังขยะของทุกฝั่งที่มีเวอร์ชันนี้
ไทม์แลปส์และการเรนเดอร์ของหลักใช้เวอร์ชันนี้ อีกเวอร์ชันถูกยกเว้น
ค้นหารายการที่ตรงกันของซีเควนซ์เหล่านี้บน {0} และบนพีซีเครื่องนี้ทันที
diff --git a/i18n/tr/Tooltips.tr.resx b/i18n/tr/Tooltips.tr.resx
index 74a9e73e..794ee99d 100644
--- a/i18n/tr/Tooltips.tr.resx
+++ b/i18n/tr/Tooltips.tr.resx
@@ -804,6 +804,10 @@
Her fark için korunan sekansın değerini alır.
Her fark için diğer sekansın değerini alır.
Her fark için {0} sunucusunun değerini alır.
+ Bu bilgisayarın değerini alır: {0}
+ {0} sunucusunun değerini alır: {1}
+ Korunan sekansın değerini alır: {0}
+ Diğer sekansın değerini alır: {0}
Bu sürümü, onu tutan her tarafın çöp kutusuna taşır.
Ana projenin hızlandırılmış videosu ve çıktıları bu sürümü kullanır; diğeri hariç tutulur.
Bu sekansların eşleşmelerini şimdi {0} sunucusunda ve bu bilgisayarda arar.
diff --git a/i18n/uk/Tooltips.uk.resx b/i18n/uk/Tooltips.uk.resx
index ae51d70f..03f53bf5 100644
--- a/i18n/uk/Tooltips.uk.resx
+++ b/i18n/uk/Tooltips.uk.resx
@@ -840,6 +840,10 @@
Взяти значення залишеної послідовності для кожної відмінності.
Взяти значення іншої послідовності для кожної відмінності.
Взяти значення {0} для кожної відмінності.
+ Взяти значення цього ПК: {0}
+ Взяти значення {0}: {1}
+ Взяти значення залишеної послідовності: {0}
+ Взяти значення іншої послідовності: {0}
Перемістити цю версію до кошика кожного боку, де вона є.
Таймлапс і рендери Основного використовують цю версію; інша виключена.
Зараз шукати збіги цих послідовностей на {0} і на цьому ПК.
diff --git a/i18n/vi/Tooltips.vi.resx b/i18n/vi/Tooltips.vi.resx
index a16b04fa..d5b1dea1 100644
--- a/i18n/vi/Tooltips.vi.resx
+++ b/i18n/vi/Tooltips.vi.resx
@@ -804,6 +804,10 @@
Lấy giá trị của chuỗi giữ lại cho mọi khác biệt.
Lấy giá trị của chuỗi kia cho mọi khác biệt.
Lấy giá trị của {0} cho mọi khác biệt.
+ Lấy giá trị của máy tính này: {0}
+ Lấy giá trị của {0}: {1}
+ Lấy giá trị của chuỗi giữ lại: {0}
+ Lấy giá trị của chuỗi kia: {0}
Chuyển phiên bản này vào thùng rác của mỗi bên đang giữ nó.
Time-lapse và bản kết xuất của Chính dùng phiên bản này; phiên bản kia bị loại trừ.
Tìm ngay các cặp tương ứng của những chuỗi ảnh này trên {0} và trên máy tính này.
diff --git a/i18n/zh-Hans/Tooltips.zh-Hans.resx b/i18n/zh-Hans/Tooltips.zh-Hans.resx
index 0ac9ed26..2ea36393 100644
--- a/i18n/zh-Hans/Tooltips.zh-Hans.resx
+++ b/i18n/zh-Hans/Tooltips.zh-Hans.resx
@@ -804,6 +804,10 @@
对每处差异采用保留序列的值。
对每处差异采用另一个序列的值。
对每处差异采用 {0} 的值。
+ 采用此电脑的值:{0}
+ 采用 {0} 的值:{1}
+ 采用保留序列的值:{0}
+ 采用另一个序列的值:{0}
将此版本移到持有它的每一端的回收站。
主项目的延时视频和渲染使用此版本;另一个已排除。
立即在 {0} 和此电脑上查找这些序列的匹配项。
diff --git a/i18n/zh-Hant/Tooltips.zh-Hant.resx b/i18n/zh-Hant/Tooltips.zh-Hant.resx
index 0a7b86ec..85948b0d 100644
--- a/i18n/zh-Hant/Tooltips.zh-Hant.resx
+++ b/i18n/zh-Hant/Tooltips.zh-Hant.resx
@@ -804,6 +804,10 @@
對每項差異採用保留序列的值。
對每項差異採用另一個序列的值。
對每項差異採用 {0} 的值。
+ 採用此電腦的值:{0}
+ 採用 {0} 的值:{1}
+ 採用保留序列的值:{0}
+ 採用另一個序列的值:{0}
將此版本移至持有它的每一端的垃圾桶。
主要專案的縮時影片和算繪使用此版本;另一個已排除。
立即在 {0} 和此電腦上尋找這些序列的相符項目。
diff --git a/src/Chronos.App/DesignTime/SampleCopies.cs b/src/Chronos.App/DesignTime/SampleCopies.cs
index 5b9cf777..aeccd30e 100644
--- a/src/Chronos.App/DesignTime/SampleCopies.cs
+++ b/src/Chronos.App/DesignTime/SampleCopies.cs
@@ -8,9 +8,16 @@ using Chronos.Data.Sync;
namespace Chronos.App.DesignTime;
-/// One sample pair: the pair, both sides, the photos of each class, the details that differ and the projects.
+///
+/// One sample pair: the pair, both sides, the photos of each class, the details that differ and the projects; the photos
+/// each side's Main leaves out (of a photo kept in two versions, the one it does not use).
+///
internal sealed record SampleCopy(FoundCopy Copy, CopyFacts Here, CopyFacts There, IReadOnlyList Photos,
- IReadOnlyList Details, CopyProjectsView Projects, Guid? PreselectedKeep = null);
+ IReadOnlyList Details, CopyProjectsView Projects, Guid? PreselectedKeep = null)
+{
+ public IReadOnlySet ExcludedHere { get; init; } = new HashSet(StringComparer.Ordinal);
+ public IReadOnlySet ExcludedThere { get; init; } = new HashSet(StringComparer.Ordinal);
+}
///
/// The matches engine of the screenshots and the App tests (owner review 6, #73, design §8.7): pairs held in memory over the
@@ -51,11 +58,17 @@ internal sealed class SampleCopyEngine : ICopyEngine
///
internal Action WithManyProjects(Guid copyId, int count)
{
- var at = _pairs.FindIndex(p => p.Copy.Id == copyId);
- var saved = _pairs[at];
IReadOnlyList Lines(string suffix, int days) =>
[SampleCopies.Project("Main", true, 2, days), .. Enumerable.Range(1, count - 1).Select(i => SampleCopies.Project($"Cut {i:00}{suffix}", false, 1 + i % 3, days + i))];
- _pairs[at] = saved with { Projects = saved.Projects with { Here = Lines(string.Empty, 1), There = Lines(" NAS", 3) } };
+ return With(copyId, saved => saved with { Projects = saved.Projects with { Here = Lines(string.Empty, 1), There = Lines(" NAS", 3) } });
+ }
+
+ /// Changes pair for a while (tests); the returned action puts its own back.
+ internal Action With(Guid copyId, Func change)
+ {
+ var at = _pairs.FindIndex(p => p.Copy.Id == copyId);
+ var saved = _pairs[at];
+ _pairs[at] = change(saved);
return () => _pairs[at] = saved;
}
@@ -80,7 +93,11 @@ internal sealed class SampleCopyEngine : ICopyEngine
var renders = new CopyRendersView(2, 1, 1, 180_000_000, 90_000_000);
var can = new CopyCapabilities(Integrate: true, LinkOnly: pair.Copy is { Kind: CopyKind.LocalServer, State: CopyState.Candidate }, DeleteThere: true, []);
return Task.FromResult(new CopyReview(pair.Copy, pair.Here, pair.There, new CopyComparisonResult(pair.Photos, totals, pair.Copy.Score),
- pair.Details, pair.Projects, renders, can));
+ pair.Details, pair.Projects, renders, can)
+ {
+ ExcludedHere = pair.ExcludedHere,
+ ExcludedThere = pair.ExcludedThere,
+ });
}
public Task PlanIntegrateAsync(Guid copyId, ISyncRemote remote, IntegrateChoices choices, CancellationToken ct)
@@ -159,9 +176,13 @@ internal sealed class SampleCopyEngine : ICopyEngine
public Task UnlinkAsync(Guid copyId, ISyncRemote? remote, CancellationToken ct) => Change(copyId, c => c with { State = CopyState.KeptApart, PreviousState = c.State });
- public Task PlanTrashHereAsync(Guid copyId, IReadOnlyCollection photoKeys, CancellationToken ct) =>
- Task.FromResult(new TrashHerePlan(new FrameDeletePlan(new Sequence { Id = Pair(copyId).Copy.LocalId, ArchiveId = Guid.Empty, Folder = string.Empty }, [], 0, []),
- []));
+ public Task PlanTrashHereAsync(Guid copyId, Guid fromSequence, IReadOnlyCollection photoKeys, CancellationToken ct)
+ {
+ var copy = Pair(copyId).Copy;
+ if (fromSequence != copy.LocalId && fromSequence != copy.OtherId)
+ throw new ArgumentException($"Sequence {fromSequence} is not a side of pair {copyId}.", nameof(fromSequence));
+ return Task.FromResult(new TrashHerePlan(new FrameDeletePlan(new Sequence { Id = fromSequence, ArchiveId = Guid.Empty, Folder = string.Empty }, [], 0, []), []));
+ }
public Task PlanDropVersionAsync(Guid copyId, string key, ISyncRemote? remote, CancellationToken ct)
{
@@ -185,7 +206,7 @@ internal sealed class SampleCopyEngine : ICopyEngine
public Task> ListAllPairsAsync(CancellationToken ct) => Task.FromResult>([.. _pairs.Select(p => p.Copy)]);
- public Task TrashHereAsync(Guid copyId, FrameDeletePlan plan, ISyncRemote? remote, CancellationToken ct) => Task.FromResult(plan.Frames.Count);
+ public Task TrashHereAsync(Guid copyId, TrashHerePlan plan, ISyncRemote? remote, CancellationToken ct) => Task.FromResult(plan.Plan.Frames.Count);
public Task PlanTrashThereAsync(Guid copyId, ISyncRemote remote, IReadOnlyCollection photoKeys, CancellationToken ct)
{
@@ -202,9 +223,10 @@ internal sealed class SampleCopyEngine : ICopyEngine
public async Task> TwinsAsync(CancellationToken ct)
{
IReadOnlyList more = MoreTwins is { } read ? await read() : [];
+ // Each home's projects as the pair lists them: Main pairs with Main; a project only one home has is no twin.
return [.. _pairs.Where(p => p.Copy is { Kind: CopyKind.LocalServer, State: CopyState.Integrated or CopyState.Linked })
- .Select(p => new CopyTwin(p.Copy.Id, p.Copy.LocalId, p.Here.Where, "Main", p.Copy.Server ?? string.Empty, p.Copy.RemoteId ?? Guid.Empty, "Vertical",
- p.There.Where)), .. more];
+ .Select(p => new CopyTwin(p.Copy.Id, p.Copy.LocalId, p.Here.Where, [.. p.Projects.Here.Select(l => l.Name)], p.Copy.Server ?? string.Empty,
+ p.Copy.RemoteId ?? Guid.Empty, [.. p.Projects.There.Select(l => l.Name)], p.There.Where, AppEnvironment.SamplePcName)), .. more];
}
///
diff --git a/src/Chronos.App/DesignTime/SampleData.cs b/src/Chronos.App/DesignTime/SampleData.cs
index f8df15aa..5937d415 100644
--- a/src/Chronos.App/DesignTime/SampleData.cs
+++ b/src/Chronos.App/DesignTime/SampleData.cs
@@ -386,15 +386,21 @@ public sealed class SampleData
// (4) Alps 2025 twice on this PC: the copy downloaded into the server's originals archive is kept.
var alps = await SequenceAsync("Alps 2025", main.Id, 940, new DateTime(2025, 7, 14, 5, 30, 0), "Canon EOS R5");
var alpsNas = await SequenceAsync("Alps 2025", originals.Id, 902, new DateTime(2025, 7, 14, 5, 30, 0), "Canon EOS R5");
+ // Both copies keep both versions of one photo (as the comparer finds them); each Main uses another one.
+ var versions = SampleCopies.Photos(PhotoClass.Versions, 2, start, 938, true, true, "IMG_V").ToList();
photos =
[
.. SampleCopies.Photos(PhotoClass.Same, 900, start, 0, true, true),
.. SampleCopies.Photos(PhotoClass.OnlyHere, 38, start, 900, true, false),
- .. SampleCopies.Photos(PhotoClass.Versions, 2, start, 938, true, false, "IMG_V"),
+ .. versions,
];
engine.Add(new SampleCopy(Copy(alps, CopyKind.LocalLocal, CopyState.Candidate, photos, other: alpsNas.Id),
SampleCopies.Facts(alps, main.Name, 940), SampleCopies.Facts(alpsNas, originals.Name, 902, originals: true, servers: [ServerName]), photos,
- [new DetailLine("sequence.rating", "5", "4")], Projects(other: true), PreselectedKeep: alpsNas.Id));
+ [new DetailLine("sequence.rating", "5", "4")], Projects(other: true), PreselectedKeep: alpsNas.Id)
+ {
+ ExcludedHere = new HashSet([versions[1].Key], StringComparer.Ordinal),
+ ExcludedThere = new HashSet([versions[0].Key], StringComparer.Ordinal),
+ });
// (5) Garden 2026: the server deleted its copy.
var garden = await SequenceAsync("Garden 2026", main.Id, 480, new DateTime(2026, 5, 2, 6, 0, 0), "Canon EOS R6");
@@ -407,7 +413,7 @@ public sealed class SampleData
var workspace = _services.Workspace;
engine.MoreTwins = async () => !workspace.IsAvailable ? []
: [.. (await workspace.ListAsync()).Where(e => !e.IsServerHome).Take(1)
- .Select(e => new CopyTwin(Guid.Empty, e.SequenceId, main.Name, e.Name, server, Guid.Empty, "Main", ServerName))];
+ .Select(e => new CopyTwin(Guid.Empty, e.SequenceId, main.Name, [e.Name], server, Guid.Empty, [e.Name], ServerName, AppEnvironment.SamplePcName))];
_services.Sync.Copies = engine;
return engine;
}
diff --git a/src/Chronos.App/Sections/SequencePickerViewModel.cs b/src/Chronos.App/Sections/SequencePickerViewModel.cs
index 7a94ae3b..5714885c 100644
--- a/src/Chronos.App/Sections/SequencePickerViewModel.cs
+++ b/src/Chronos.App/Sections/SequencePickerViewModel.cs
@@ -350,8 +350,9 @@ public sealed class SequencePickerViewModel : LocalizedViewModel
}
///
- /// Marks the projects whose time-lapse (a linked or integrated match) has a workspace project at the other home too
- /// (owner review 6, #73): a muted Twin chip, "Also at {home}: {project}".
+ /// Marks the projects whose time-lapse (a linked or integrated match) has their sibling at the other home (owner review
+ /// 6, #73; BRIEF §12.3): the same project name there, or the name Copy across gave it. A muted Twin chip, "Also at
+ /// {home}: {project}", naming that sibling; a project with none at the other home is not a twin.
///
private async Task MarkTwinsAsync(IReadOnlyList items)
{
@@ -361,14 +362,16 @@ public sealed class SequencePickerViewModel : LocalizedViewModel
var twins = await copies.TwinsAsync(CancellationToken.None);
foreach (var item in items)
{
- var twin = item.Entry.IsServerHome
- ? twins.FirstOrDefault(t => t.RemoteId == item.SequenceId && t.LocalProject is not null)
- : twins.FirstOrDefault(t => t.LocalId == item.SequenceId && t.ServerProject is not null);
- if (twin is null) continue;
- var server = string.Equals(twin.Server, Shell.Services.Sync.Server, StringComparison.OrdinalIgnoreCase)
- ? Shell.Services.Server.Flow.Info?.Name ?? twin.ServerName : twin.ServerName;
- if (item.Entry.IsServerHome) item.SetTwin(twin.LocalHome, twin.LocalProject);
- else item.SetTwin(server, twin.ServerProject);
+ var atServer = item.Entry.IsServerHome;
+ foreach (var twin in twins.Where(t => atServer ? t.RemoteId == item.SequenceId : t.LocalId == item.SequenceId))
+ {
+ var server = string.Equals(twin.Server, Shell.Services.Sync.Server, StringComparison.OrdinalIgnoreCase)
+ ? Shell.Services.Server.Flow.Info?.Name ?? twin.ServerName : twin.ServerName;
+ if (twin.CounterpartOf(item.Entry.Name, atServer, server) is not { } sibling) continue;
+ if (atServer) item.SetTwin(twin.LocalHome, sibling);
+ else item.SetTwin(server, sibling);
+ break;
+ }
}
}
catch (Exception ex) when (ex is IOException or InvalidOperationException or DatabaseException)
diff --git a/src/Chronos.App/Sections/SettingsView.xaml b/src/Chronos.App/Sections/SettingsView.xaml
index 55fac5ca..551c1910 100644
--- a/src/Chronos.App/Sections/SettingsView.xaml
+++ b/src/Chronos.App/Sections/SettingsView.xaml
@@ -78,6 +78,10 @@
+
+
+
+
@@ -682,7 +686,7 @@
AutomationProperties.Name="{l:Loc Settings.Server.Default}" FlowDirection="LeftToRight" />
-
+
+
+
+
+
+
+
+
+
+