diff --git a/crates/pdfs-gui/src/app/pages/activity_text.rs b/crates/pdfs-gui/src/app/pages/activity_text.rs index 6a57621..f18f82a 100644 --- a/crates/pdfs-gui/src/app/pages/activity_text.rs +++ b/crates/pdfs-gui/src/app/pages/activity_text.rs @@ -341,6 +341,59 @@ fn detail_label(entry: &ActivityEntry) -> Option { &[("name", alt)], )); } + if let Some((reason, copy)) = detail.split_once("; local changes uploaded as ") { + let args = [("name", copy)]; + return Some(match edit_conflict(reason) { + // Translators: {name} is the copy the changes made on this + // computer were uploaded as. + EditConflict::Gone => gettext_f( + "It no longer exists on Proton Drive, so your changes were uploaded as {name}", + &args, + ), + // Translators: {name} is the copy the changes made on this + // computer were uploaded as. + EditConflict::Trashed => gettext_f( + "It was moved to the Trash on Proton Drive, so your changes were uploaded as {name}", + &args, + ), + // Translators: {name} is the copy the changes made on this + // computer were uploaded as. + EditConflict::Changed => gettext_f( + "It was changed on Proton Drive, so your changes were uploaded as {name}", + &args, + ), + // Translators: {name} is the copy the changes made on this + // computer were uploaded as. + EditConflict::Other => gettext_f("Your changes were uploaded as {name}", &args), + }); + } + if let Some((reason, path)) = detail.split_once("; local changes kept at ") { + let path = tilde_path(path); + let args = [("path", path.as_str())]; + return Some(match edit_conflict(reason) { + // Translators: {path} is the file on this computer that holds the + // changes which could not be uploaded. + EditConflict::Gone => gettext_f( + "It no longer exists on Proton Drive, so your changes were kept in {path}", + &args, + ), + // Translators: {path} is the file on this computer that holds the + // changes which could not be uploaded. + EditConflict::Trashed => gettext_f( + "It was moved to the Trash on Proton Drive, so your changes were kept in {path}", + &args, + ), + // Translators: {path} is the file on this computer that holds the + // changes which could not be uploaded. + EditConflict::Changed => gettext_f( + "It was changed on Proton Drive, so your changes were kept in {path}", + &args, + ), + // Translators: {path} is the file on this computer that holds the + // changes which could not be uploaded. + EditConflict::Other => gettext_f("Your changes were kept in {path}", &args), + }); + } if let Some(base) = detail.strip_prefix("differs from ") { // Translators: {name} is the file the conflicting copy was made from. return Some(gettext_f("Differs from {name}", &[("name", base)])); @@ -388,6 +441,26 @@ fn detail_label(entry: &ActivityEntry) -> Option { Some(capitalize(detail)) } +/// Why a queued edit could not land on its file, from the reason the daemon +/// gives before "; local changes uploaded as" or "; local changes kept at". +enum EditConflict { + Gone, + Trashed, + Changed, + Other, +} + +fn edit_conflict(reason: &str) -> EditConflict { + match reason { + "the file no longer exists remotely" => EditConflict::Gone, + "the file was trashed remotely" => EditConflict::Trashed, + r if r.starts_with("the remote revision changed under the queued write") => { + EditConflict::Changed + } + _ => EditConflict::Other, + } +} + /// A sync pass summary such as "2 uploaded, 1 folder(s) created", as a /// list of counts. `None` when a part is not one the daemon writes. fn sync_summary(detail: &str) -> Option { @@ -596,6 +669,38 @@ mod tests { assert_eq!(d.details, vec!["1 person can view"]); } + #[test] + fn an_edit_kept_as_a_copy_says_why_in_words() { + let d = describe(&entry( + ActivityKind::Upload, + "notes.txt", + "the remote revision changed under the queued write \ + (based on revision r1, remote now at r2); \ + local changes uploaded as notes (sync-conflict 1700000000).txt", + false, + )); + assert_eq!( + d.details, + vec![ + "It was changed on Proton Drive, so your changes were uploaded as \ + notes (sync-conflict 1700000000).txt" + ] + ); + let d = describe(&entry( + ActivityKind::Upload, + "notes.txt", + "the file was trashed remotely; local changes kept at /var/staging/7", + false, + )); + assert_eq!( + d.details, + vec![ + "It was moved to the Trash on Proton Drive, so your changes were kept in \ + /var/staging/7" + ] + ); + } + #[test] fn unknown_details_show_as_written() { let d = describe(&entry( diff --git a/docs/BUGS.md b/docs/BUGS.md index acd6a69..f88aa99 100644 --- a/docs/BUGS.md +++ b/docs/BUGS.md @@ -12,6 +12,33 @@ Conventions: --- +## B181 — The app shows a queued edit kept as a conflict copy in English + +**Status:** Fixed. +**Found:** 2026-10-05, checking that every name collision and conflict the drain resolves is +reported (`docs/MILESTONE-3.0.0.md` §6.2). Each one is in the activity log, and the app words +each in the user's language but one. + +**Where:** `detail_label` in `crates/pdfs-gui/src/app/pages/activity_text.rs`; the daemon +writes the entry in `Core::keep_as_conflict_copy` and `Core::abandon_to_staging` +(`crates/pdfs-fuse/src/drain.rs`). + +**Cause.** A queued edit whose file was changed, trashed or removed on Drive meanwhile is +uploaded as a conflict copy, or kept in staging when it cannot be. The entry's detail is the +reason followed by "; local changes uploaded as {copy}" or "; local changes kept at {path}". +The app knew neither shape, so it showed the detail as the daemon wrote it, in English: "The +remote revision changed under the queued write (based on revision …); local changes uploaded +as …". + +**Fix.** The app reads both shapes and the three reasons the daemon gives, and says each as +one sentence: "It was changed on Proton Drive, so your changes were uploaded as {name}". A +reason it does not know still gets a sentence without the why. Translated in every catalog. + +**Test:** `an_edit_kept_as_a_copy_says_why_in_words` in +`crates/pdfs-gui/src/app/pages/activity_text.rs`. + +--- + ## B180 — A stop waits 10 s for a drain worker that slept through it **Status:** Fixed. diff --git a/docs/CHANGELOG.md b/docs/CHANGELOG.md index 8bc7802..c3b8d70 100644 --- a/docs/CHANGELOG.md +++ b/docs/CHANGELOG.md @@ -89,6 +89,8 @@ by its local id, in the queue, the stored tree and pins alike. - **A folder made while offline or with sync paused no longer fails with "Input/output error"** once it is refreshed or the connection comes back (B125). - **The daemon no longer hangs when a file being read changes on Drive** (B130). +- **The Activity page says in your language why an edit was kept as a conflicting copy**, + instead of the daemon's English (B181). - **A file renamed just as its upload finished keeps its new name.** The mount no longer showed the old name, and a second rename no longer failed with "No such file or directory" (B152, B172). diff --git a/docs/MILESTONE-3.0.0-STATUS.md b/docs/MILESTONE-3.0.0-STATUS.md index 6f51458..4085894 100644 --- a/docs/MILESTONE-3.0.0-STATUS.md +++ b/docs/MILESTONE-3.0.0-STATUS.md @@ -9,7 +9,7 @@ Tracks `docs/MILESTONE-3.0.0.md`. Update it with every commit that moves a phase - **Phase 2**: local ids, inode = local id, one tree for every mount (2.10.0). - **Phase 3, first part**: mkdir, create, rename, unlink and rmdir on the mount are recorded locally and sent from the queue; `"local_first": false` brings back the old path (5e0f30c). -- Fixes from the simulation and account runs since then: B125, B127, B130 and B141 to B180. +- Fixes from the simulation and account runs since then: B125, B127, B130 and B141 to B181. - **Sync issues, first cut** (§6.2): refusals sorted into issues, shown at once in the app, tray and CLI; Export button and `pdfs sync export`; `pdfs sync issues`. @@ -24,6 +24,9 @@ Tracks `docs/MILESTONE-3.0.0.md`. Update it with every commit that moves a phase - [x] `pdfs sync issues`, and the issue shown in `pdfs sync queue`. - [x] The app's Sync page shows each issue with what the user can do; Export and Retry buttons; translated in every catalog. + - [x] A name collision lands under a conflict name (create, rename, move, re-homed create) + and goes in the activity log, as does a queued edit kept as a conflict copy. The app + words each one in the user's language (the last one since B181). - [ ] Discard an issue on purpose (after export, or for a change with no content), and undo the local change it stood for. Not in the first cut. - [ ] Show the issue on the node itself (file browser emblem or status). Not in the first diff --git a/po/de.po b/po/de.po index b162a59..8870f4c 100644 --- a/po/de.po +++ b/po/de.po @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: proton-drive-linux 2.1.0\n" "Report-Msgid-Bugs-To: https://github.com/narrrl/proton-drive-linux/issues\n" -"POT-Creation-Date: 2026-10-04 03:16+0200\n" +"POT-Creation-Date: 2026-10-05 00:14+0200\n" "PO-Revision-Date: 2026-09-23 12:00+0200\n" "Last-Translator: Proton Drive for Linux contributors\n" "Language-Team: German\n" @@ -58,7 +58,7 @@ msgid "%A, %B %-d, %Y, %H:%M" msgstr "%A, %-d. %B %Y, %H:%M" #: crates/pdfs-gui/src/app/main.rs:743 -#: crates/pdfs-gui/src/app/pages/activity_text.rs:466 +#: crates/pdfs-gui/src/app/pages/activity_text.rs:539 #: crates/pdfs-gui/src/app/pages/browser.rs:454 #: crates/pdfs-gui/src/app/pages/browser.rs:819 #: crates/pdfs-gui/src/app/pages/browser.rs:1217 @@ -1018,54 +1018,104 @@ msgstr "" "Sein Ordner wurde in Proton Drive in den Papierkorb verschoben, daher auf " "oberster Ebene als {name} erstellt" +#: crates/pdfs-gui/src/app/pages/activity_text.rs:350 +#, rust-format +msgid "" +"It no longer exists on Proton Drive, so your changes were uploaded as {name}" +msgstr "Die Datei existiert in Proton Drive nicht mehr, daher wurden deine Änderungen als {name} hochgeladen" + +#: crates/pdfs-gui/src/app/pages/activity_text.rs:356 +#, rust-format +msgid "" +"It was moved to the Trash on Proton Drive, so your changes were uploaded as " +"{name}" +msgstr "Die Datei wurde in Proton Drive in den Papierkorb verschoben, daher wurden deine Änderungen als {name} hochgeladen" + +#: crates/pdfs-gui/src/app/pages/activity_text.rs:362 +#, rust-format +msgid "It was changed on Proton Drive, so your changes were uploaded as {name}" +msgstr "Die Datei wurde in Proton Drive geändert, daher wurden deine Änderungen als {name} hochgeladen" + +#. Translators: {name} is the copy the changes made on this +#. computer were uploaded as. +#: crates/pdfs-gui/src/app/pages/activity_text.rs:367 +#, rust-format +msgid "Your changes were uploaded as {name}" +msgstr "Deine Änderungen wurden als {name} hochgeladen" + +#: crates/pdfs-gui/src/app/pages/activity_text.rs:377 +#, rust-format +msgid "" +"It no longer exists on Proton Drive, so your changes were kept in {path}" +msgstr "Die Datei existiert in Proton Drive nicht mehr, daher wurden deine Änderungen in {path} aufbewahrt" + +#: crates/pdfs-gui/src/app/pages/activity_text.rs:383 +#, rust-format +msgid "" +"It was moved to the Trash on Proton Drive, so your changes were kept in " +"{path}" +msgstr "Die Datei wurde in Proton Drive in den Papierkorb verschoben, daher wurden deine Änderungen in {path} aufbewahrt" + +#: crates/pdfs-gui/src/app/pages/activity_text.rs:389 +#, rust-format +msgid "It was changed on Proton Drive, so your changes were kept in {path}" +msgstr "Die Datei wurde in Proton Drive geändert, daher wurden deine Änderungen in {path} aufbewahrt" + +#. Translators: {path} is the file on this computer that holds the +#. changes which could not be uploaded. +#: crates/pdfs-gui/src/app/pages/activity_text.rs:394 +#, rust-format +msgid "Your changes were kept in {path}" +msgstr "Deine Änderungen wurden in {path} aufbewahrt" + #. Translators: {name} is the file the conflicting copy was made from. -#: crates/pdfs-gui/src/app/pages/activity_text.rs:346 +#: crates/pdfs-gui/src/app/pages/activity_text.rs:399 #: crates/pdfs-gui/src/app/pages/locations.rs:878 #, rust-format msgid "Differs from {name}" msgstr "Unterscheidet sich von {name}" #. Translators: {name} is the file the conflicting copy was made from. -#: crates/pdfs-gui/src/app/pages/activity_text.rs:353 +#: crates/pdfs-gui/src/app/pages/activity_text.rs:406 #, rust-format msgid "{name} no longer exists" msgstr "{name} existiert nicht mehr" #. Translators: {name} is the file the conflicting copy was made from. -#: crates/pdfs-gui/src/app/pages/activity_text.rs:360 +#: crates/pdfs-gui/src/app/pages/activity_text.rs:413 #, rust-format msgid "Same as {name}" msgstr "Identisch mit {name}" -#: crates/pdfs-gui/src/app/pages/activity_text.rs:367 +#: crates/pdfs-gui/src/app/pages/activity_text.rs:420 #, rust-format msgid "{n} person can view" msgid_plural "{n} people can view" msgstr[0] "{n} Person kann ansehen" msgstr[1] "{n} Personen können ansehen" -#: crates/pdfs-gui/src/app/pages/activity_text.rs:368 +#: crates/pdfs-gui/src/app/pages/activity_text.rs:421 #, rust-format msgid "{n} person can edit" msgid_plural "{n} people can edit" msgstr[0] "{n} Person kann bearbeiten" msgstr[1] "{n} Personen können bearbeiten" -#: crates/pdfs-gui/src/app/pages/activity_text.rs:369 +#: crates/pdfs-gui/src/app/pages/activity_text.rs:422 #, rust-format msgid "{n} person invited" msgid_plural "{n} people invited" msgstr[0] "{n} Person eingeladen" msgstr[1] "{n} Personen eingeladen" -#: crates/pdfs-gui/src/app/pages/activity_text.rs:374 +#: crates/pdfs-gui/src/app/pages/activity_text.rs:427 #, rust-format msgid "{n} file kept as a conflicting copy" msgid_plural "{n} files kept as conflicting copies" msgstr[0] "{n} Datei als Konfliktkopie behalten" msgstr[1] "{n} Dateien als Konfliktkopien behalten" -#: crates/pdfs-gui/src/app/pages/activity_text.rs:382 +#: crates/pdfs-gui/src/app/pages/activity_text.rs:435 #, rust-format msgid "{n} item failed and will be tried again" msgid_plural "{n} items failed and will be tried again" @@ -1073,8 +1123,8 @@ msgstr[0] "{n} Element fehlgeschlagen, wird erneut versucht" msgstr[1] "{n} Elemente fehlgeschlagen, werden erneut versucht" #. Translators: part of a list summing up a sync pass. -#: crates/pdfs-gui/src/app/pages/activity_text.rs:400 -#: crates/pdfs-gui/src/app/pages/activity_text.rs:431 +#: crates/pdfs-gui/src/app/pages/activity_text.rs:473 +#: crates/pdfs-gui/src/app/pages/activity_text.rs:504 #, rust-format msgid "{n} uploaded" msgid_plural "{n} uploaded" @@ -1082,7 +1132,7 @@ msgstr[0] "{n} hochgeladen" msgstr[1] "{n} hochgeladen" #. Translators: part of a list summing up a sync pass. -#: crates/pdfs-gui/src/app/pages/activity_text.rs:402 +#: crates/pdfs-gui/src/app/pages/activity_text.rs:475 #, rust-format msgid "{n} downloaded" msgid_plural "{n} downloaded" @@ -1090,7 +1140,7 @@ msgstr[0] "{n} heruntergeladen" msgstr[1] "{n} heruntergeladen" #. Translators: part of a list summing up a sync pass. -#: crates/pdfs-gui/src/app/pages/activity_text.rs:404 +#: crates/pdfs-gui/src/app/pages/activity_text.rs:477 #, rust-format msgid "{n} folder created" msgid_plural "{n} folders created" @@ -1098,7 +1148,7 @@ msgstr[0] "{n} Ordner erstellt" msgstr[1] "{n} Ordner erstellt" #. Translators: part of a list summing up a sync pass. -#: crates/pdfs-gui/src/app/pages/activity_text.rs:406 +#: crates/pdfs-gui/src/app/pages/activity_text.rs:479 #, rust-format msgid "{n} deleted" msgid_plural "{n} deleted" @@ -1106,7 +1156,7 @@ msgstr[0] "{n} gelöscht" msgstr[1] "{n} gelöscht" #. Translators: part of a list summing up a sync pass. -#: crates/pdfs-gui/src/app/pages/activity_text.rs:408 +#: crates/pdfs-gui/src/app/pages/activity_text.rs:481 #, rust-format msgid "{n} in conflict" msgid_plural "{n} in conflict" @@ -1115,7 +1165,7 @@ msgstr[1] "{n} im Konflikt" #. Translators: part of a list summing up a sync pass; the files are #. still open in another app. -#: crates/pdfs-gui/src/app/pages/activity_text.rs:411 +#: crates/pdfs-gui/src/app/pages/activity_text.rs:484 #, rust-format msgid "{n} still open" msgid_plural "{n} still open" @@ -1123,28 +1173,28 @@ msgstr[0] "{n} noch geöffnet" msgstr[1] "{n} noch geöffnet" #. Translators: part of a list summing up a sync pass. -#: crates/pdfs-gui/src/app/pages/activity_text.rs:413 -#: crates/pdfs-gui/src/app/pages/activity_text.rs:436 +#: crates/pdfs-gui/src/app/pages/activity_text.rs:486 +#: crates/pdfs-gui/src/app/pages/activity_text.rs:509 #, rust-format msgid "{n} failed" msgid_plural "{n} failed" msgstr[0] "{n} fehlgeschlagen" msgstr[1] "{n} fehlgeschlagen" -#: crates/pdfs-gui/src/app/pages/activity_text.rs:425 +#: crates/pdfs-gui/src/app/pages/activity_text.rs:498 msgid "Cancelled" msgstr "Abgebrochen" #. Translators: photos an import skipped because they were already #. in Proton Drive. -#: crates/pdfs-gui/src/app/pages/activity_text.rs:434 +#: crates/pdfs-gui/src/app/pages/activity_text.rs:507 #, rust-format msgid "{n} already there" msgid_plural "{n} already there" msgstr[0] "{n} bereits vorhanden" msgstr[1] "{n} bereits vorhanden" -#: crates/pdfs-gui/src/app/pages/activity_text.rs:435 +#: crates/pdfs-gui/src/app/pages/activity_text.rs:508 #: crates/pdfs-gui/src/app/pages/albums.rs:107 #: crates/pdfs-gui/src/app/pages/albums.rs:692 #, rust-format diff --git a/po/en_GB.po b/po/en_GB.po index 1096de6..bdb2e9c 100644 --- a/po/en_GB.po +++ b/po/en_GB.po @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: proton-drive-linux 2.1.0\n" "Report-Msgid-Bugs-To: https://github.com/narrrl/proton-drive-linux/issues\n" -"POT-Creation-Date: 2026-10-04 03:16+0200\n" +"POT-Creation-Date: 2026-10-05 00:14+0200\n" "PO-Revision-Date: 2026-09-23 12:00+0200\n" "Last-Translator: Proton Drive for Linux contributors\n" "Language-Team: English (United Kingdom)\n" @@ -58,7 +58,7 @@ msgid "%A, %B %-d, %Y, %H:%M" msgstr "%A %-d %B %Y, %H:%M" #: crates/pdfs-gui/src/app/main.rs:743 -#: crates/pdfs-gui/src/app/pages/activity_text.rs:466 +#: crates/pdfs-gui/src/app/pages/activity_text.rs:539 #: crates/pdfs-gui/src/app/pages/browser.rs:454 #: crates/pdfs-gui/src/app/pages/browser.rs:819 #: crates/pdfs-gui/src/app/pages/browser.rs:1217 @@ -1011,54 +1011,104 @@ msgstr "" "Its folder was moved to the Trash on Proton Drive, so it was created at the " "top as {name}" +#: crates/pdfs-gui/src/app/pages/activity_text.rs:350 +#, rust-format +msgid "" +"It no longer exists on Proton Drive, so your changes were uploaded as {name}" +msgstr "It no longer exists on Proton Drive, so your changes were uploaded as {name}" + +#: crates/pdfs-gui/src/app/pages/activity_text.rs:356 +#, rust-format +msgid "" +"It was moved to the Trash on Proton Drive, so your changes were uploaded as " +"{name}" +msgstr "It was moved to the Trash on Proton Drive, so your changes were uploaded as {name}" + +#: crates/pdfs-gui/src/app/pages/activity_text.rs:362 +#, rust-format +msgid "It was changed on Proton Drive, so your changes were uploaded as {name}" +msgstr "It was changed on Proton Drive, so your changes were uploaded as {name}" + +#. Translators: {name} is the copy the changes made on this +#. computer were uploaded as. +#: crates/pdfs-gui/src/app/pages/activity_text.rs:367 +#, rust-format +msgid "Your changes were uploaded as {name}" +msgstr "Your changes were uploaded as {name}" + +#: crates/pdfs-gui/src/app/pages/activity_text.rs:377 +#, rust-format +msgid "" +"It no longer exists on Proton Drive, so your changes were kept in {path}" +msgstr "It no longer exists on Proton Drive, so your changes were kept in {path}" + +#: crates/pdfs-gui/src/app/pages/activity_text.rs:383 +#, rust-format +msgid "" +"It was moved to the Trash on Proton Drive, so your changes were kept in " +"{path}" +msgstr "It was moved to the Trash on Proton Drive, so your changes were kept in {path}" + +#: crates/pdfs-gui/src/app/pages/activity_text.rs:389 +#, rust-format +msgid "It was changed on Proton Drive, so your changes were kept in {path}" +msgstr "It was changed on Proton Drive, so your changes were kept in {path}" + +#. Translators: {path} is the file on this computer that holds the +#. changes which could not be uploaded. +#: crates/pdfs-gui/src/app/pages/activity_text.rs:394 +#, rust-format +msgid "Your changes were kept in {path}" +msgstr "Your changes were kept in {path}" + #. Translators: {name} is the file the conflicting copy was made from. -#: crates/pdfs-gui/src/app/pages/activity_text.rs:346 +#: crates/pdfs-gui/src/app/pages/activity_text.rs:399 #: crates/pdfs-gui/src/app/pages/locations.rs:878 #, rust-format msgid "Differs from {name}" msgstr "Differs from {name}" #. Translators: {name} is the file the conflicting copy was made from. -#: crates/pdfs-gui/src/app/pages/activity_text.rs:353 +#: crates/pdfs-gui/src/app/pages/activity_text.rs:406 #, rust-format msgid "{name} no longer exists" msgstr "{name} no longer exists" #. Translators: {name} is the file the conflicting copy was made from. -#: crates/pdfs-gui/src/app/pages/activity_text.rs:360 +#: crates/pdfs-gui/src/app/pages/activity_text.rs:413 #, rust-format msgid "Same as {name}" msgstr "Same as {name}" -#: crates/pdfs-gui/src/app/pages/activity_text.rs:367 +#: crates/pdfs-gui/src/app/pages/activity_text.rs:420 #, rust-format msgid "{n} person can view" msgid_plural "{n} people can view" msgstr[0] "{n} person can view" msgstr[1] "{n} people can view" -#: crates/pdfs-gui/src/app/pages/activity_text.rs:368 +#: crates/pdfs-gui/src/app/pages/activity_text.rs:421 #, rust-format msgid "{n} person can edit" msgid_plural "{n} people can edit" msgstr[0] "{n} person can edit" msgstr[1] "{n} people can edit" -#: crates/pdfs-gui/src/app/pages/activity_text.rs:369 +#: crates/pdfs-gui/src/app/pages/activity_text.rs:422 #, rust-format msgid "{n} person invited" msgid_plural "{n} people invited" msgstr[0] "{n} person invited" msgstr[1] "{n} people invited" -#: crates/pdfs-gui/src/app/pages/activity_text.rs:374 +#: crates/pdfs-gui/src/app/pages/activity_text.rs:427 #, rust-format msgid "{n} file kept as a conflicting copy" msgid_plural "{n} files kept as conflicting copies" msgstr[0] "{n} file kept as a conflicting copy" msgstr[1] "{n} files kept as conflicting copies" -#: crates/pdfs-gui/src/app/pages/activity_text.rs:382 +#: crates/pdfs-gui/src/app/pages/activity_text.rs:435 #, rust-format msgid "{n} item failed and will be tried again" msgid_plural "{n} items failed and will be tried again" @@ -1066,8 +1116,8 @@ msgstr[0] "{n} item failed and will be tried again" msgstr[1] "{n} items failed and will be tried again" #. Translators: part of a list summing up a sync pass. -#: crates/pdfs-gui/src/app/pages/activity_text.rs:400 -#: crates/pdfs-gui/src/app/pages/activity_text.rs:431 +#: crates/pdfs-gui/src/app/pages/activity_text.rs:473 +#: crates/pdfs-gui/src/app/pages/activity_text.rs:504 #, rust-format msgid "{n} uploaded" msgid_plural "{n} uploaded" @@ -1075,7 +1125,7 @@ msgstr[0] "{n} uploaded" msgstr[1] "{n} uploaded" #. Translators: part of a list summing up a sync pass. -#: crates/pdfs-gui/src/app/pages/activity_text.rs:402 +#: crates/pdfs-gui/src/app/pages/activity_text.rs:475 #, rust-format msgid "{n} downloaded" msgid_plural "{n} downloaded" @@ -1083,7 +1133,7 @@ msgstr[0] "{n} downloaded" msgstr[1] "{n} downloaded" #. Translators: part of a list summing up a sync pass. -#: crates/pdfs-gui/src/app/pages/activity_text.rs:404 +#: crates/pdfs-gui/src/app/pages/activity_text.rs:477 #, rust-format msgid "{n} folder created" msgid_plural "{n} folders created" @@ -1091,7 +1141,7 @@ msgstr[0] "{n} folder created" msgstr[1] "{n} folders created" #. Translators: part of a list summing up a sync pass. -#: crates/pdfs-gui/src/app/pages/activity_text.rs:406 +#: crates/pdfs-gui/src/app/pages/activity_text.rs:479 #, rust-format msgid "{n} deleted" msgid_plural "{n} deleted" @@ -1099,7 +1149,7 @@ msgstr[0] "{n} deleted" msgstr[1] "{n} deleted" #. Translators: part of a list summing up a sync pass. -#: crates/pdfs-gui/src/app/pages/activity_text.rs:408 +#: crates/pdfs-gui/src/app/pages/activity_text.rs:481 #, rust-format msgid "{n} in conflict" msgid_plural "{n} in conflict" @@ -1108,7 +1158,7 @@ msgstr[1] "{n} in conflict" #. Translators: part of a list summing up a sync pass; the files are #. still open in another app. -#: crates/pdfs-gui/src/app/pages/activity_text.rs:411 +#: crates/pdfs-gui/src/app/pages/activity_text.rs:484 #, rust-format msgid "{n} still open" msgid_plural "{n} still open" @@ -1116,28 +1166,28 @@ msgstr[0] "{n} still open" msgstr[1] "{n} still open" #. Translators: part of a list summing up a sync pass. -#: crates/pdfs-gui/src/app/pages/activity_text.rs:413 -#: crates/pdfs-gui/src/app/pages/activity_text.rs:436 +#: crates/pdfs-gui/src/app/pages/activity_text.rs:486 +#: crates/pdfs-gui/src/app/pages/activity_text.rs:509 #, rust-format msgid "{n} failed" msgid_plural "{n} failed" msgstr[0] "{n} failed" msgstr[1] "{n} failed" -#: crates/pdfs-gui/src/app/pages/activity_text.rs:425 +#: crates/pdfs-gui/src/app/pages/activity_text.rs:498 msgid "Cancelled" msgstr "Cancelled" #. Translators: photos an import skipped because they were already #. in Proton Drive. -#: crates/pdfs-gui/src/app/pages/activity_text.rs:434 +#: crates/pdfs-gui/src/app/pages/activity_text.rs:507 #, rust-format msgid "{n} already there" msgid_plural "{n} already there" msgstr[0] "{n} already there" msgstr[1] "{n} already there" -#: crates/pdfs-gui/src/app/pages/activity_text.rs:435 +#: crates/pdfs-gui/src/app/pages/activity_text.rs:508 #: crates/pdfs-gui/src/app/pages/albums.rs:107 #: crates/pdfs-gui/src/app/pages/albums.rs:692 #, rust-format diff --git a/po/es.po b/po/es.po index f8b179e..ba02d4c 100644 --- a/po/es.po +++ b/po/es.po @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: proton-drive-linux 2.1.0\n" "Report-Msgid-Bugs-To: https://github.com/narrrl/proton-drive-linux/issues\n" -"POT-Creation-Date: 2026-10-04 03:16+0200\n" +"POT-Creation-Date: 2026-10-05 00:14+0200\n" "PO-Revision-Date: 2026-09-23 12:00+0200\n" "Last-Translator: Proton Drive for Linux contributors\n" "Language-Team: Spanish\n" @@ -58,7 +58,7 @@ msgid "%A, %B %-d, %Y, %H:%M" msgstr "%A, %-d de %B de %Y, %H:%M" #: crates/pdfs-gui/src/app/main.rs:743 -#: crates/pdfs-gui/src/app/pages/activity_text.rs:466 +#: crates/pdfs-gui/src/app/pages/activity_text.rs:539 #: crates/pdfs-gui/src/app/pages/browser.rs:454 #: crates/pdfs-gui/src/app/pages/browser.rs:819 #: crates/pdfs-gui/src/app/pages/browser.rs:1217 @@ -1016,54 +1016,104 @@ msgstr "" "Su carpeta se movió a la papelera en Proton Drive, así que se creó en el " "nivel superior como {name}" +#: crates/pdfs-gui/src/app/pages/activity_text.rs:350 +#, rust-format +msgid "" +"It no longer exists on Proton Drive, so your changes were uploaded as {name}" +msgstr "Ya no existe en Proton Drive, así que sus cambios se subieron como {name}" + +#: crates/pdfs-gui/src/app/pages/activity_text.rs:356 +#, rust-format +msgid "" +"It was moved to the Trash on Proton Drive, so your changes were uploaded as " +"{name}" +msgstr "Se movió a la papelera en Proton Drive, así que sus cambios se subieron como {name}" + +#: crates/pdfs-gui/src/app/pages/activity_text.rs:362 +#, rust-format +msgid "It was changed on Proton Drive, so your changes were uploaded as {name}" +msgstr "Se modificó en Proton Drive, así que sus cambios se subieron como {name}" + +#. Translators: {name} is the copy the changes made on this +#. computer were uploaded as. +#: crates/pdfs-gui/src/app/pages/activity_text.rs:367 +#, rust-format +msgid "Your changes were uploaded as {name}" +msgstr "Sus cambios se subieron como {name}" + +#: crates/pdfs-gui/src/app/pages/activity_text.rs:377 +#, rust-format +msgid "" +"It no longer exists on Proton Drive, so your changes were kept in {path}" +msgstr "Ya no existe en Proton Drive, así que sus cambios se guardaron en {path}" + +#: crates/pdfs-gui/src/app/pages/activity_text.rs:383 +#, rust-format +msgid "" +"It was moved to the Trash on Proton Drive, so your changes were kept in " +"{path}" +msgstr "Se movió a la papelera en Proton Drive, así que sus cambios se guardaron en {path}" + +#: crates/pdfs-gui/src/app/pages/activity_text.rs:389 +#, rust-format +msgid "It was changed on Proton Drive, so your changes were kept in {path}" +msgstr "Se modificó en Proton Drive, así que sus cambios se guardaron en {path}" + +#. Translators: {path} is the file on this computer that holds the +#. changes which could not be uploaded. +#: crates/pdfs-gui/src/app/pages/activity_text.rs:394 +#, rust-format +msgid "Your changes were kept in {path}" +msgstr "Sus cambios se guardaron en {path}" + #. Translators: {name} is the file the conflicting copy was made from. -#: crates/pdfs-gui/src/app/pages/activity_text.rs:346 +#: crates/pdfs-gui/src/app/pages/activity_text.rs:399 #: crates/pdfs-gui/src/app/pages/locations.rs:878 #, rust-format msgid "Differs from {name}" msgstr "Difiere de {name}" #. Translators: {name} is the file the conflicting copy was made from. -#: crates/pdfs-gui/src/app/pages/activity_text.rs:353 +#: crates/pdfs-gui/src/app/pages/activity_text.rs:406 #, rust-format msgid "{name} no longer exists" msgstr "{name} ya no existe" #. Translators: {name} is the file the conflicting copy was made from. -#: crates/pdfs-gui/src/app/pages/activity_text.rs:360 +#: crates/pdfs-gui/src/app/pages/activity_text.rs:413 #, rust-format msgid "Same as {name}" msgstr "Igual que {name}" -#: crates/pdfs-gui/src/app/pages/activity_text.rs:367 +#: crates/pdfs-gui/src/app/pages/activity_text.rs:420 #, rust-format msgid "{n} person can view" msgid_plural "{n} people can view" msgstr[0] "{n} persona puede ver" msgstr[1] "{n} personas pueden ver" -#: crates/pdfs-gui/src/app/pages/activity_text.rs:368 +#: crates/pdfs-gui/src/app/pages/activity_text.rs:421 #, rust-format msgid "{n} person can edit" msgid_plural "{n} people can edit" msgstr[0] "{n} persona puede editar" msgstr[1] "{n} personas pueden editar" -#: crates/pdfs-gui/src/app/pages/activity_text.rs:369 +#: crates/pdfs-gui/src/app/pages/activity_text.rs:422 #, rust-format msgid "{n} person invited" msgid_plural "{n} people invited" msgstr[0] "{n} persona invitada" msgstr[1] "{n} personas invitadas" -#: crates/pdfs-gui/src/app/pages/activity_text.rs:374 +#: crates/pdfs-gui/src/app/pages/activity_text.rs:427 #, rust-format msgid "{n} file kept as a conflicting copy" msgid_plural "{n} files kept as conflicting copies" msgstr[0] "{n} archivo se conservó como copia en conflicto" msgstr[1] "{n} archivos se conservaron como copias en conflicto" -#: crates/pdfs-gui/src/app/pages/activity_text.rs:382 +#: crates/pdfs-gui/src/app/pages/activity_text.rs:435 #, rust-format msgid "{n} item failed and will be tried again" msgid_plural "{n} items failed and will be tried again" @@ -1071,8 +1121,8 @@ msgstr[0] "{n} elemento falló y se volverá a intentar" msgstr[1] "{n} elementos fallaron y se volverán a intentar" #. Translators: part of a list summing up a sync pass. -#: crates/pdfs-gui/src/app/pages/activity_text.rs:400 -#: crates/pdfs-gui/src/app/pages/activity_text.rs:431 +#: crates/pdfs-gui/src/app/pages/activity_text.rs:473 +#: crates/pdfs-gui/src/app/pages/activity_text.rs:504 #, rust-format msgid "{n} uploaded" msgid_plural "{n} uploaded" @@ -1080,7 +1130,7 @@ msgstr[0] "{n} subido" msgstr[1] "{n} subidos" #. Translators: part of a list summing up a sync pass. -#: crates/pdfs-gui/src/app/pages/activity_text.rs:402 +#: crates/pdfs-gui/src/app/pages/activity_text.rs:475 #, rust-format msgid "{n} downloaded" msgid_plural "{n} downloaded" @@ -1088,7 +1138,7 @@ msgstr[0] "{n} descargado" msgstr[1] "{n} descargados" #. Translators: part of a list summing up a sync pass. -#: crates/pdfs-gui/src/app/pages/activity_text.rs:404 +#: crates/pdfs-gui/src/app/pages/activity_text.rs:477 #, rust-format msgid "{n} folder created" msgid_plural "{n} folders created" @@ -1096,7 +1146,7 @@ msgstr[0] "{n} carpeta creada" msgstr[1] "{n} carpetas creadas" #. Translators: part of a list summing up a sync pass. -#: crates/pdfs-gui/src/app/pages/activity_text.rs:406 +#: crates/pdfs-gui/src/app/pages/activity_text.rs:479 #, rust-format msgid "{n} deleted" msgid_plural "{n} deleted" @@ -1104,7 +1154,7 @@ msgstr[0] "{n} eliminado" msgstr[1] "{n} eliminados" #. Translators: part of a list summing up a sync pass. -#: crates/pdfs-gui/src/app/pages/activity_text.rs:408 +#: crates/pdfs-gui/src/app/pages/activity_text.rs:481 #, rust-format msgid "{n} in conflict" msgid_plural "{n} in conflict" @@ -1113,7 +1163,7 @@ msgstr[1] "{n} en conflicto" #. Translators: part of a list summing up a sync pass; the files are #. still open in another app. -#: crates/pdfs-gui/src/app/pages/activity_text.rs:411 +#: crates/pdfs-gui/src/app/pages/activity_text.rs:484 #, rust-format msgid "{n} still open" msgid_plural "{n} still open" @@ -1121,28 +1171,28 @@ msgstr[0] "{n} aún abierto" msgstr[1] "{n} aún abiertos" #. Translators: part of a list summing up a sync pass. -#: crates/pdfs-gui/src/app/pages/activity_text.rs:413 -#: crates/pdfs-gui/src/app/pages/activity_text.rs:436 +#: crates/pdfs-gui/src/app/pages/activity_text.rs:486 +#: crates/pdfs-gui/src/app/pages/activity_text.rs:509 #, rust-format msgid "{n} failed" msgid_plural "{n} failed" msgstr[0] "{n} fallido" msgstr[1] "{n} fallidos" -#: crates/pdfs-gui/src/app/pages/activity_text.rs:425 +#: crates/pdfs-gui/src/app/pages/activity_text.rs:498 msgid "Cancelled" msgstr "Cancelado" #. Translators: photos an import skipped because they were already #. in Proton Drive. -#: crates/pdfs-gui/src/app/pages/activity_text.rs:434 +#: crates/pdfs-gui/src/app/pages/activity_text.rs:507 #, rust-format msgid "{n} already there" msgid_plural "{n} already there" msgstr[0] "{n} ya existía" msgstr[1] "{n} ya existían" -#: crates/pdfs-gui/src/app/pages/activity_text.rs:435 +#: crates/pdfs-gui/src/app/pages/activity_text.rs:508 #: crates/pdfs-gui/src/app/pages/albums.rs:107 #: crates/pdfs-gui/src/app/pages/albums.rs:692 #, rust-format diff --git a/po/fr.po b/po/fr.po index 4219a5e..6222c7b 100644 --- a/po/fr.po +++ b/po/fr.po @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: proton-drive-linux 2.1.0\n" "Report-Msgid-Bugs-To: https://github.com/narrrl/proton-drive-linux/issues\n" -"POT-Creation-Date: 2026-10-04 03:16+0200\n" +"POT-Creation-Date: 2026-10-05 00:14+0200\n" "PO-Revision-Date: 2026-09-23 12:00+0200\n" "Last-Translator: Proton Drive for Linux contributors\n" "Language-Team: French\n" @@ -58,7 +58,7 @@ msgid "%A, %B %-d, %Y, %H:%M" msgstr "%A %-d %B %Y à %H:%M" #: crates/pdfs-gui/src/app/main.rs:743 -#: crates/pdfs-gui/src/app/pages/activity_text.rs:466 +#: crates/pdfs-gui/src/app/pages/activity_text.rs:539 #: crates/pdfs-gui/src/app/pages/browser.rs:454 #: crates/pdfs-gui/src/app/pages/browser.rs:819 #: crates/pdfs-gui/src/app/pages/browser.rs:1217 @@ -1023,54 +1023,104 @@ msgstr "" "Son dossier a été mis à la corbeille sur Proton Drive, l’élément a donc été " "créé à la racine sous le nom {name}" +#: crates/pdfs-gui/src/app/pages/activity_text.rs:350 +#, rust-format +msgid "" +"It no longer exists on Proton Drive, so your changes were uploaded as {name}" +msgstr "Le fichier n’existe plus sur Proton Drive, vos modifications ont donc été envoyées sous le nom {name}" + +#: crates/pdfs-gui/src/app/pages/activity_text.rs:356 +#, rust-format +msgid "" +"It was moved to the Trash on Proton Drive, so your changes were uploaded as " +"{name}" +msgstr "Le fichier a été mis à la corbeille sur Proton Drive, vos modifications ont donc été envoyées sous le nom {name}" + +#: crates/pdfs-gui/src/app/pages/activity_text.rs:362 +#, rust-format +msgid "It was changed on Proton Drive, so your changes were uploaded as {name}" +msgstr "Le fichier a été modifié sur Proton Drive, vos modifications ont donc été envoyées sous le nom {name}" + +#. Translators: {name} is the copy the changes made on this +#. computer were uploaded as. +#: crates/pdfs-gui/src/app/pages/activity_text.rs:367 +#, rust-format +msgid "Your changes were uploaded as {name}" +msgstr "Vos modifications ont été envoyées sous le nom {name}" + +#: crates/pdfs-gui/src/app/pages/activity_text.rs:377 +#, rust-format +msgid "" +"It no longer exists on Proton Drive, so your changes were kept in {path}" +msgstr "Le fichier n’existe plus sur Proton Drive, vos modifications ont donc été conservées dans {path}" + +#: crates/pdfs-gui/src/app/pages/activity_text.rs:383 +#, rust-format +msgid "" +"It was moved to the Trash on Proton Drive, so your changes were kept in " +"{path}" +msgstr "Le fichier a été mis à la corbeille sur Proton Drive, vos modifications ont donc été conservées dans {path}" + +#: crates/pdfs-gui/src/app/pages/activity_text.rs:389 +#, rust-format +msgid "It was changed on Proton Drive, so your changes were kept in {path}" +msgstr "Le fichier a été modifié sur Proton Drive, vos modifications ont donc été conservées dans {path}" + +#. Translators: {path} is the file on this computer that holds the +#. changes which could not be uploaded. +#: crates/pdfs-gui/src/app/pages/activity_text.rs:394 +#, rust-format +msgid "Your changes were kept in {path}" +msgstr "Vos modifications ont été conservées dans {path}" + #. Translators: {name} is the file the conflicting copy was made from. -#: crates/pdfs-gui/src/app/pages/activity_text.rs:346 +#: crates/pdfs-gui/src/app/pages/activity_text.rs:399 #: crates/pdfs-gui/src/app/pages/locations.rs:878 #, rust-format msgid "Differs from {name}" msgstr "Diffère de {name}" #. Translators: {name} is the file the conflicting copy was made from. -#: crates/pdfs-gui/src/app/pages/activity_text.rs:353 +#: crates/pdfs-gui/src/app/pages/activity_text.rs:406 #, rust-format msgid "{name} no longer exists" msgstr "{name} n’existe plus" #. Translators: {name} is the file the conflicting copy was made from. -#: crates/pdfs-gui/src/app/pages/activity_text.rs:360 +#: crates/pdfs-gui/src/app/pages/activity_text.rs:413 #, rust-format msgid "Same as {name}" msgstr "Identique à {name}" -#: crates/pdfs-gui/src/app/pages/activity_text.rs:367 +#: crates/pdfs-gui/src/app/pages/activity_text.rs:420 #, rust-format msgid "{n} person can view" msgid_plural "{n} people can view" msgstr[0] "{n} personne peut consulter" msgstr[1] "{n} personnes peuvent consulter" -#: crates/pdfs-gui/src/app/pages/activity_text.rs:368 +#: crates/pdfs-gui/src/app/pages/activity_text.rs:421 #, rust-format msgid "{n} person can edit" msgid_plural "{n} people can edit" msgstr[0] "{n} personne peut modifier" msgstr[1] "{n} personnes peuvent modifier" -#: crates/pdfs-gui/src/app/pages/activity_text.rs:369 +#: crates/pdfs-gui/src/app/pages/activity_text.rs:422 #, rust-format msgid "{n} person invited" msgid_plural "{n} people invited" msgstr[0] "{n} personne invitée" msgstr[1] "{n} personnes invitées" -#: crates/pdfs-gui/src/app/pages/activity_text.rs:374 +#: crates/pdfs-gui/src/app/pages/activity_text.rs:427 #, rust-format msgid "{n} file kept as a conflicting copy" msgid_plural "{n} files kept as conflicting copies" msgstr[0] "{n} fichier conservé comme copie en conflit" msgstr[1] "{n} fichiers conservés comme copies en conflit" -#: crates/pdfs-gui/src/app/pages/activity_text.rs:382 +#: crates/pdfs-gui/src/app/pages/activity_text.rs:435 #, rust-format msgid "{n} item failed and will be tried again" msgid_plural "{n} items failed and will be tried again" @@ -1078,8 +1128,8 @@ msgstr[0] "{n} élément a échoué et sera réessayé" msgstr[1] "{n} éléments ont échoué et seront réessayés" #. Translators: part of a list summing up a sync pass. -#: crates/pdfs-gui/src/app/pages/activity_text.rs:400 -#: crates/pdfs-gui/src/app/pages/activity_text.rs:431 +#: crates/pdfs-gui/src/app/pages/activity_text.rs:473 +#: crates/pdfs-gui/src/app/pages/activity_text.rs:504 #, rust-format msgid "{n} uploaded" msgid_plural "{n} uploaded" @@ -1087,7 +1137,7 @@ msgstr[0] "{n} téléversé" msgstr[1] "{n} téléversés" #. Translators: part of a list summing up a sync pass. -#: crates/pdfs-gui/src/app/pages/activity_text.rs:402 +#: crates/pdfs-gui/src/app/pages/activity_text.rs:475 #, rust-format msgid "{n} downloaded" msgid_plural "{n} downloaded" @@ -1095,7 +1145,7 @@ msgstr[0] "{n} téléchargé" msgstr[1] "{n} téléchargés" #. Translators: part of a list summing up a sync pass. -#: crates/pdfs-gui/src/app/pages/activity_text.rs:404 +#: crates/pdfs-gui/src/app/pages/activity_text.rs:477 #, rust-format msgid "{n} folder created" msgid_plural "{n} folders created" @@ -1103,7 +1153,7 @@ msgstr[0] "{n} dossier créé" msgstr[1] "{n} dossiers créés" #. Translators: part of a list summing up a sync pass. -#: crates/pdfs-gui/src/app/pages/activity_text.rs:406 +#: crates/pdfs-gui/src/app/pages/activity_text.rs:479 #, rust-format msgid "{n} deleted" msgid_plural "{n} deleted" @@ -1111,7 +1161,7 @@ msgstr[0] "{n} supprimé" msgstr[1] "{n} supprimés" #. Translators: part of a list summing up a sync pass. -#: crates/pdfs-gui/src/app/pages/activity_text.rs:408 +#: crates/pdfs-gui/src/app/pages/activity_text.rs:481 #, rust-format msgid "{n} in conflict" msgid_plural "{n} in conflict" @@ -1120,7 +1170,7 @@ msgstr[1] "{n} en conflit" #. Translators: part of a list summing up a sync pass; the files are #. still open in another app. -#: crates/pdfs-gui/src/app/pages/activity_text.rs:411 +#: crates/pdfs-gui/src/app/pages/activity_text.rs:484 #, rust-format msgid "{n} still open" msgid_plural "{n} still open" @@ -1128,28 +1178,28 @@ msgstr[0] "{n} encore ouvert" msgstr[1] "{n} encore ouverts" #. Translators: part of a list summing up a sync pass. -#: crates/pdfs-gui/src/app/pages/activity_text.rs:413 -#: crates/pdfs-gui/src/app/pages/activity_text.rs:436 +#: crates/pdfs-gui/src/app/pages/activity_text.rs:486 +#: crates/pdfs-gui/src/app/pages/activity_text.rs:509 #, rust-format msgid "{n} failed" msgid_plural "{n} failed" msgstr[0] "{n} en échec" msgstr[1] "{n} en échec" -#: crates/pdfs-gui/src/app/pages/activity_text.rs:425 +#: crates/pdfs-gui/src/app/pages/activity_text.rs:498 msgid "Cancelled" msgstr "Annulé" #. Translators: photos an import skipped because they were already #. in Proton Drive. -#: crates/pdfs-gui/src/app/pages/activity_text.rs:434 +#: crates/pdfs-gui/src/app/pages/activity_text.rs:507 #, rust-format msgid "{n} already there" msgid_plural "{n} already there" msgstr[0] "{n} déjà présent" msgstr[1] "{n} déjà présents" -#: crates/pdfs-gui/src/app/pages/activity_text.rs:435 +#: crates/pdfs-gui/src/app/pages/activity_text.rs:508 #: crates/pdfs-gui/src/app/pages/albums.rs:107 #: crates/pdfs-gui/src/app/pages/albums.rs:692 #, rust-format diff --git a/po/it.po b/po/it.po index 7ee1b56..67c2354 100644 --- a/po/it.po +++ b/po/it.po @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: proton-drive-linux 2.1.0\n" "Report-Msgid-Bugs-To: https://github.com/narrrl/proton-drive-linux/issues\n" -"POT-Creation-Date: 2026-10-04 03:16+0200\n" +"POT-Creation-Date: 2026-10-05 00:14+0200\n" "PO-Revision-Date: 2026-09-23 12:00+0200\n" "Last-Translator: Proton Drive for Linux contributors\n" "Language-Team: Italian\n" @@ -58,7 +58,7 @@ msgid "%A, %B %-d, %Y, %H:%M" msgstr "%A %-d %B %Y, %H:%M" #: crates/pdfs-gui/src/app/main.rs:743 -#: crates/pdfs-gui/src/app/pages/activity_text.rs:466 +#: crates/pdfs-gui/src/app/pages/activity_text.rs:539 #: crates/pdfs-gui/src/app/pages/browser.rs:454 #: crates/pdfs-gui/src/app/pages/browser.rs:819 #: crates/pdfs-gui/src/app/pages/browser.rs:1217 @@ -1017,54 +1017,104 @@ msgstr "" "La sua cartella è stata spostata nel cestino su Proton Drive, quindi è stato " "creato al primo livello come {name}" +#: crates/pdfs-gui/src/app/pages/activity_text.rs:350 +#, rust-format +msgid "" +"It no longer exists on Proton Drive, so your changes were uploaded as {name}" +msgstr "Non esiste più su Proton Drive, quindi le tue modifiche sono state caricate come {name}" + +#: crates/pdfs-gui/src/app/pages/activity_text.rs:356 +#, rust-format +msgid "" +"It was moved to the Trash on Proton Drive, so your changes were uploaded as " +"{name}" +msgstr "È stato spostato nel cestino su Proton Drive, quindi le tue modifiche sono state caricate come {name}" + +#: crates/pdfs-gui/src/app/pages/activity_text.rs:362 +#, rust-format +msgid "It was changed on Proton Drive, so your changes were uploaded as {name}" +msgstr "È stato modificato su Proton Drive, quindi le tue modifiche sono state caricate come {name}" + +#. Translators: {name} is the copy the changes made on this +#. computer were uploaded as. +#: crates/pdfs-gui/src/app/pages/activity_text.rs:367 +#, rust-format +msgid "Your changes were uploaded as {name}" +msgstr "Le tue modifiche sono state caricate come {name}" + +#: crates/pdfs-gui/src/app/pages/activity_text.rs:377 +#, rust-format +msgid "" +"It no longer exists on Proton Drive, so your changes were kept in {path}" +msgstr "Non esiste più su Proton Drive, quindi le tue modifiche sono state conservate in {path}" + +#: crates/pdfs-gui/src/app/pages/activity_text.rs:383 +#, rust-format +msgid "" +"It was moved to the Trash on Proton Drive, so your changes were kept in " +"{path}" +msgstr "È stato spostato nel cestino su Proton Drive, quindi le tue modifiche sono state conservate in {path}" + +#: crates/pdfs-gui/src/app/pages/activity_text.rs:389 +#, rust-format +msgid "It was changed on Proton Drive, so your changes were kept in {path}" +msgstr "È stato modificato su Proton Drive, quindi le tue modifiche sono state conservate in {path}" + +#. Translators: {path} is the file on this computer that holds the +#. changes which could not be uploaded. +#: crates/pdfs-gui/src/app/pages/activity_text.rs:394 +#, rust-format +msgid "Your changes were kept in {path}" +msgstr "Le tue modifiche sono state conservate in {path}" + #. Translators: {name} is the file the conflicting copy was made from. -#: crates/pdfs-gui/src/app/pages/activity_text.rs:346 +#: crates/pdfs-gui/src/app/pages/activity_text.rs:399 #: crates/pdfs-gui/src/app/pages/locations.rs:878 #, rust-format msgid "Differs from {name}" msgstr "Diverso da {name}" #. Translators: {name} is the file the conflicting copy was made from. -#: crates/pdfs-gui/src/app/pages/activity_text.rs:353 +#: crates/pdfs-gui/src/app/pages/activity_text.rs:406 #, rust-format msgid "{name} no longer exists" msgstr "{name} non esiste più" #. Translators: {name} is the file the conflicting copy was made from. -#: crates/pdfs-gui/src/app/pages/activity_text.rs:360 +#: crates/pdfs-gui/src/app/pages/activity_text.rs:413 #, rust-format msgid "Same as {name}" msgstr "Uguale a {name}" -#: crates/pdfs-gui/src/app/pages/activity_text.rs:367 +#: crates/pdfs-gui/src/app/pages/activity_text.rs:420 #, rust-format msgid "{n} person can view" msgid_plural "{n} people can view" msgstr[0] "{n} persona può visualizzare" msgstr[1] "{n} persone possono visualizzare" -#: crates/pdfs-gui/src/app/pages/activity_text.rs:368 +#: crates/pdfs-gui/src/app/pages/activity_text.rs:421 #, rust-format msgid "{n} person can edit" msgid_plural "{n} people can edit" msgstr[0] "{n} persona può modificare" msgstr[1] "{n} persone possono modificare" -#: crates/pdfs-gui/src/app/pages/activity_text.rs:369 +#: crates/pdfs-gui/src/app/pages/activity_text.rs:422 #, rust-format msgid "{n} person invited" msgid_plural "{n} people invited" msgstr[0] "{n} persona invitata" msgstr[1] "{n} persone invitate" -#: crates/pdfs-gui/src/app/pages/activity_text.rs:374 +#: crates/pdfs-gui/src/app/pages/activity_text.rs:427 #, rust-format msgid "{n} file kept as a conflicting copy" msgid_plural "{n} files kept as conflicting copies" msgstr[0] "{n} file mantenuto come copia in conflitto" msgstr[1] "{n} file mantenuti come copie in conflitto" -#: crates/pdfs-gui/src/app/pages/activity_text.rs:382 +#: crates/pdfs-gui/src/app/pages/activity_text.rs:435 #, rust-format msgid "{n} item failed and will be tried again" msgid_plural "{n} items failed and will be tried again" @@ -1072,8 +1122,8 @@ msgstr[0] "{n} elemento non riuscito, verrà riprovato" msgstr[1] "{n} elementi non riusciti, verranno riprovati" #. Translators: part of a list summing up a sync pass. -#: crates/pdfs-gui/src/app/pages/activity_text.rs:400 -#: crates/pdfs-gui/src/app/pages/activity_text.rs:431 +#: crates/pdfs-gui/src/app/pages/activity_text.rs:473 +#: crates/pdfs-gui/src/app/pages/activity_text.rs:504 #, rust-format msgid "{n} uploaded" msgid_plural "{n} uploaded" @@ -1081,7 +1131,7 @@ msgstr[0] "{n} caricato" msgstr[1] "{n} caricati" #. Translators: part of a list summing up a sync pass. -#: crates/pdfs-gui/src/app/pages/activity_text.rs:402 +#: crates/pdfs-gui/src/app/pages/activity_text.rs:475 #, rust-format msgid "{n} downloaded" msgid_plural "{n} downloaded" @@ -1089,7 +1139,7 @@ msgstr[0] "{n} scaricato" msgstr[1] "{n} scaricati" #. Translators: part of a list summing up a sync pass. -#: crates/pdfs-gui/src/app/pages/activity_text.rs:404 +#: crates/pdfs-gui/src/app/pages/activity_text.rs:477 #, rust-format msgid "{n} folder created" msgid_plural "{n} folders created" @@ -1097,7 +1147,7 @@ msgstr[0] "{n} cartella creata" msgstr[1] "{n} cartelle create" #. Translators: part of a list summing up a sync pass. -#: crates/pdfs-gui/src/app/pages/activity_text.rs:406 +#: crates/pdfs-gui/src/app/pages/activity_text.rs:479 #, rust-format msgid "{n} deleted" msgid_plural "{n} deleted" @@ -1105,7 +1155,7 @@ msgstr[0] "{n} eliminato" msgstr[1] "{n} eliminati" #. Translators: part of a list summing up a sync pass. -#: crates/pdfs-gui/src/app/pages/activity_text.rs:408 +#: crates/pdfs-gui/src/app/pages/activity_text.rs:481 #, rust-format msgid "{n} in conflict" msgid_plural "{n} in conflict" @@ -1114,7 +1164,7 @@ msgstr[1] "{n} in conflitto" #. Translators: part of a list summing up a sync pass; the files are #. still open in another app. -#: crates/pdfs-gui/src/app/pages/activity_text.rs:411 +#: crates/pdfs-gui/src/app/pages/activity_text.rs:484 #, rust-format msgid "{n} still open" msgid_plural "{n} still open" @@ -1122,28 +1172,28 @@ msgstr[0] "{n} ancora aperto" msgstr[1] "{n} ancora aperti" #. Translators: part of a list summing up a sync pass. -#: crates/pdfs-gui/src/app/pages/activity_text.rs:413 -#: crates/pdfs-gui/src/app/pages/activity_text.rs:436 +#: crates/pdfs-gui/src/app/pages/activity_text.rs:486 +#: crates/pdfs-gui/src/app/pages/activity_text.rs:509 #, rust-format msgid "{n} failed" msgid_plural "{n} failed" msgstr[0] "{n} non riuscito" msgstr[1] "{n} non riusciti" -#: crates/pdfs-gui/src/app/pages/activity_text.rs:425 +#: crates/pdfs-gui/src/app/pages/activity_text.rs:498 msgid "Cancelled" msgstr "Annullato" #. Translators: photos an import skipped because they were already #. in Proton Drive. -#: crates/pdfs-gui/src/app/pages/activity_text.rs:434 +#: crates/pdfs-gui/src/app/pages/activity_text.rs:507 #, rust-format msgid "{n} already there" msgid_plural "{n} already there" msgstr[0] "{n} già presente" msgstr[1] "{n} già presenti" -#: crates/pdfs-gui/src/app/pages/activity_text.rs:435 +#: crates/pdfs-gui/src/app/pages/activity_text.rs:508 #: crates/pdfs-gui/src/app/pages/albums.rs:107 #: crates/pdfs-gui/src/app/pages/albums.rs:692 #, rust-format diff --git a/po/nl.po b/po/nl.po index a8e94de..7705390 100644 --- a/po/nl.po +++ b/po/nl.po @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: proton-drive-linux 2.1.0\n" "Report-Msgid-Bugs-To: https://github.com/narrrl/proton-drive-linux/issues\n" -"POT-Creation-Date: 2026-10-04 03:16+0200\n" +"POT-Creation-Date: 2026-10-05 00:14+0200\n" "PO-Revision-Date: 2026-09-23 12:00+0200\n" "Last-Translator: Proton Drive for Linux contributors\n" "Language-Team: Dutch\n" @@ -58,7 +58,7 @@ msgid "%A, %B %-d, %Y, %H:%M" msgstr "%A %-d %B %Y, %H:%M" #: crates/pdfs-gui/src/app/main.rs:743 -#: crates/pdfs-gui/src/app/pages/activity_text.rs:466 +#: crates/pdfs-gui/src/app/pages/activity_text.rs:539 #: crates/pdfs-gui/src/app/pages/browser.rs:454 #: crates/pdfs-gui/src/app/pages/browser.rs:819 #: crates/pdfs-gui/src/app/pages/browser.rs:1217 @@ -1015,54 +1015,104 @@ msgstr "" "De map ervan is in Proton Drive naar de prullenbak verplaatst, dus " "aangemaakt op het hoogste niveau als {name}" +#: crates/pdfs-gui/src/app/pages/activity_text.rs:350 +#, rust-format +msgid "" +"It no longer exists on Proton Drive, so your changes were uploaded as {name}" +msgstr "Het bestaat niet meer in Proton Drive, dus je wijzigingen zijn geüpload als {name}" + +#: crates/pdfs-gui/src/app/pages/activity_text.rs:356 +#, rust-format +msgid "" +"It was moved to the Trash on Proton Drive, so your changes were uploaded as " +"{name}" +msgstr "Het is in Proton Drive naar de prullenbak verplaatst, dus je wijzigingen zijn geüpload als {name}" + +#: crates/pdfs-gui/src/app/pages/activity_text.rs:362 +#, rust-format +msgid "It was changed on Proton Drive, so your changes were uploaded as {name}" +msgstr "Het is in Proton Drive gewijzigd, dus je wijzigingen zijn geüpload als {name}" + +#. Translators: {name} is the copy the changes made on this +#. computer were uploaded as. +#: crates/pdfs-gui/src/app/pages/activity_text.rs:367 +#, rust-format +msgid "Your changes were uploaded as {name}" +msgstr "Je wijzigingen zijn geüpload als {name}" + +#: crates/pdfs-gui/src/app/pages/activity_text.rs:377 +#, rust-format +msgid "" +"It no longer exists on Proton Drive, so your changes were kept in {path}" +msgstr "Het bestaat niet meer in Proton Drive, dus je wijzigingen zijn bewaard in {path}" + +#: crates/pdfs-gui/src/app/pages/activity_text.rs:383 +#, rust-format +msgid "" +"It was moved to the Trash on Proton Drive, so your changes were kept in " +"{path}" +msgstr "Het is in Proton Drive naar de prullenbak verplaatst, dus je wijzigingen zijn bewaard in {path}" + +#: crates/pdfs-gui/src/app/pages/activity_text.rs:389 +#, rust-format +msgid "It was changed on Proton Drive, so your changes were kept in {path}" +msgstr "Het is in Proton Drive gewijzigd, dus je wijzigingen zijn bewaard in {path}" + +#. Translators: {path} is the file on this computer that holds the +#. changes which could not be uploaded. +#: crates/pdfs-gui/src/app/pages/activity_text.rs:394 +#, rust-format +msgid "Your changes were kept in {path}" +msgstr "Je wijzigingen zijn bewaard in {path}" + #. Translators: {name} is the file the conflicting copy was made from. -#: crates/pdfs-gui/src/app/pages/activity_text.rs:346 +#: crates/pdfs-gui/src/app/pages/activity_text.rs:399 #: crates/pdfs-gui/src/app/pages/locations.rs:878 #, rust-format msgid "Differs from {name}" msgstr "Verschilt van {name}" #. Translators: {name} is the file the conflicting copy was made from. -#: crates/pdfs-gui/src/app/pages/activity_text.rs:353 +#: crates/pdfs-gui/src/app/pages/activity_text.rs:406 #, rust-format msgid "{name} no longer exists" msgstr "{name} bestaat niet meer" #. Translators: {name} is the file the conflicting copy was made from. -#: crates/pdfs-gui/src/app/pages/activity_text.rs:360 +#: crates/pdfs-gui/src/app/pages/activity_text.rs:413 #, rust-format msgid "Same as {name}" msgstr "Hetzelfde als {name}" -#: crates/pdfs-gui/src/app/pages/activity_text.rs:367 +#: crates/pdfs-gui/src/app/pages/activity_text.rs:420 #, rust-format msgid "{n} person can view" msgid_plural "{n} people can view" msgstr[0] "{n} persoon kan bekijken" msgstr[1] "{n} personen kunnen bekijken" -#: crates/pdfs-gui/src/app/pages/activity_text.rs:368 +#: crates/pdfs-gui/src/app/pages/activity_text.rs:421 #, rust-format msgid "{n} person can edit" msgid_plural "{n} people can edit" msgstr[0] "{n} persoon kan bewerken" msgstr[1] "{n} personen kunnen bewerken" -#: crates/pdfs-gui/src/app/pages/activity_text.rs:369 +#: crates/pdfs-gui/src/app/pages/activity_text.rs:422 #, rust-format msgid "{n} person invited" msgid_plural "{n} people invited" msgstr[0] "{n} persoon uitgenodigd" msgstr[1] "{n} personen uitgenodigd" -#: crates/pdfs-gui/src/app/pages/activity_text.rs:374 +#: crates/pdfs-gui/src/app/pages/activity_text.rs:427 #, rust-format msgid "{n} file kept as a conflicting copy" msgid_plural "{n} files kept as conflicting copies" msgstr[0] "{n} bestand behouden als conflictkopie" msgstr[1] "{n} bestanden behouden als conflictkopieën" -#: crates/pdfs-gui/src/app/pages/activity_text.rs:382 +#: crates/pdfs-gui/src/app/pages/activity_text.rs:435 #, rust-format msgid "{n} item failed and will be tried again" msgid_plural "{n} items failed and will be tried again" @@ -1070,8 +1120,8 @@ msgstr[0] "{n} item mislukt en wordt opnieuw geprobeerd" msgstr[1] "{n} items mislukt en worden opnieuw geprobeerd" #. Translators: part of a list summing up a sync pass. -#: crates/pdfs-gui/src/app/pages/activity_text.rs:400 -#: crates/pdfs-gui/src/app/pages/activity_text.rs:431 +#: crates/pdfs-gui/src/app/pages/activity_text.rs:473 +#: crates/pdfs-gui/src/app/pages/activity_text.rs:504 #, rust-format msgid "{n} uploaded" msgid_plural "{n} uploaded" @@ -1079,7 +1129,7 @@ msgstr[0] "{n} geüpload" msgstr[1] "{n} geüpload" #. Translators: part of a list summing up a sync pass. -#: crates/pdfs-gui/src/app/pages/activity_text.rs:402 +#: crates/pdfs-gui/src/app/pages/activity_text.rs:475 #, rust-format msgid "{n} downloaded" msgid_plural "{n} downloaded" @@ -1087,7 +1137,7 @@ msgstr[0] "{n} gedownload" msgstr[1] "{n} gedownload" #. Translators: part of a list summing up a sync pass. -#: crates/pdfs-gui/src/app/pages/activity_text.rs:404 +#: crates/pdfs-gui/src/app/pages/activity_text.rs:477 #, rust-format msgid "{n} folder created" msgid_plural "{n} folders created" @@ -1095,7 +1145,7 @@ msgstr[0] "{n} map aangemaakt" msgstr[1] "{n} mappen aangemaakt" #. Translators: part of a list summing up a sync pass. -#: crates/pdfs-gui/src/app/pages/activity_text.rs:406 +#: crates/pdfs-gui/src/app/pages/activity_text.rs:479 #, rust-format msgid "{n} deleted" msgid_plural "{n} deleted" @@ -1103,7 +1153,7 @@ msgstr[0] "{n} verwijderd" msgstr[1] "{n} verwijderd" #. Translators: part of a list summing up a sync pass. -#: crates/pdfs-gui/src/app/pages/activity_text.rs:408 +#: crates/pdfs-gui/src/app/pages/activity_text.rs:481 #, rust-format msgid "{n} in conflict" msgid_plural "{n} in conflict" @@ -1112,7 +1162,7 @@ msgstr[1] "{n} in conflict" #. Translators: part of a list summing up a sync pass; the files are #. still open in another app. -#: crates/pdfs-gui/src/app/pages/activity_text.rs:411 +#: crates/pdfs-gui/src/app/pages/activity_text.rs:484 #, rust-format msgid "{n} still open" msgid_plural "{n} still open" @@ -1120,28 +1170,28 @@ msgstr[0] "{n} nog geopend" msgstr[1] "{n} nog geopend" #. Translators: part of a list summing up a sync pass. -#: crates/pdfs-gui/src/app/pages/activity_text.rs:413 -#: crates/pdfs-gui/src/app/pages/activity_text.rs:436 +#: crates/pdfs-gui/src/app/pages/activity_text.rs:486 +#: crates/pdfs-gui/src/app/pages/activity_text.rs:509 #, rust-format msgid "{n} failed" msgid_plural "{n} failed" msgstr[0] "{n} mislukt" msgstr[1] "{n} mislukt" -#: crates/pdfs-gui/src/app/pages/activity_text.rs:425 +#: crates/pdfs-gui/src/app/pages/activity_text.rs:498 msgid "Cancelled" msgstr "Geannuleerd" #. Translators: photos an import skipped because they were already #. in Proton Drive. -#: crates/pdfs-gui/src/app/pages/activity_text.rs:434 +#: crates/pdfs-gui/src/app/pages/activity_text.rs:507 #, rust-format msgid "{n} already there" msgid_plural "{n} already there" msgstr[0] "{n} al aanwezig" msgstr[1] "{n} al aanwezig" -#: crates/pdfs-gui/src/app/pages/activity_text.rs:435 +#: crates/pdfs-gui/src/app/pages/activity_text.rs:508 #: crates/pdfs-gui/src/app/pages/albums.rs:107 #: crates/pdfs-gui/src/app/pages/albums.rs:692 #, rust-format diff --git a/po/pdfs.pot b/po/pdfs.pot index 903d63e..4e7f626 100644 --- a/po/pdfs.pot +++ b/po/pdfs.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: proton-drive-linux 2.10.0\n" "Report-Msgid-Bugs-To: https://github.com/narrrl/proton-drive-linux/issues\n" -"POT-Creation-Date: 2026-10-04 03:16+0200\n" +"POT-Creation-Date: 2026-10-05 00:14+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -61,7 +61,7 @@ msgid "%A, %B %-d, %Y, %H:%M" msgstr "" #: crates/pdfs-gui/src/app/main.rs:743 -#: crates/pdfs-gui/src/app/pages/activity_text.rs:466 +#: crates/pdfs-gui/src/app/pages/activity_text.rs:539 #: crates/pdfs-gui/src/app/pages/browser.rs:454 #: crates/pdfs-gui/src/app/pages/browser.rs:819 #: crates/pdfs-gui/src/app/pages/browser.rs:1217 @@ -983,54 +983,104 @@ msgid "" "top as {name}" msgstr "" +#: crates/pdfs-gui/src/app/pages/activity_text.rs:350 +#, rust-format +msgid "" +"It no longer exists on Proton Drive, so your changes were uploaded as {name}" +msgstr "" + +#: crates/pdfs-gui/src/app/pages/activity_text.rs:356 +#, rust-format +msgid "" +"It was moved to the Trash on Proton Drive, so your changes were uploaded as " +"{name}" +msgstr "" + +#: crates/pdfs-gui/src/app/pages/activity_text.rs:362 +#, rust-format +msgid "It was changed on Proton Drive, so your changes were uploaded as {name}" +msgstr "" + +#. Translators: {name} is the copy the changes made on this +#. computer were uploaded as. +#: crates/pdfs-gui/src/app/pages/activity_text.rs:367 +#, rust-format +msgid "Your changes were uploaded as {name}" +msgstr "" + +#: crates/pdfs-gui/src/app/pages/activity_text.rs:377 +#, rust-format +msgid "" +"It no longer exists on Proton Drive, so your changes were kept in {path}" +msgstr "" + +#: crates/pdfs-gui/src/app/pages/activity_text.rs:383 +#, rust-format +msgid "" +"It was moved to the Trash on Proton Drive, so your changes were kept in " +"{path}" +msgstr "" + +#: crates/pdfs-gui/src/app/pages/activity_text.rs:389 +#, rust-format +msgid "It was changed on Proton Drive, so your changes were kept in {path}" +msgstr "" + +#. Translators: {path} is the file on this computer that holds the +#. changes which could not be uploaded. +#: crates/pdfs-gui/src/app/pages/activity_text.rs:394 +#, rust-format +msgid "Your changes were kept in {path}" +msgstr "" + #. Translators: {name} is the file the conflicting copy was made from. -#: crates/pdfs-gui/src/app/pages/activity_text.rs:346 +#: crates/pdfs-gui/src/app/pages/activity_text.rs:399 #: crates/pdfs-gui/src/app/pages/locations.rs:878 #, rust-format msgid "Differs from {name}" msgstr "" #. Translators: {name} is the file the conflicting copy was made from. -#: crates/pdfs-gui/src/app/pages/activity_text.rs:353 +#: crates/pdfs-gui/src/app/pages/activity_text.rs:406 #, rust-format msgid "{name} no longer exists" msgstr "" #. Translators: {name} is the file the conflicting copy was made from. -#: crates/pdfs-gui/src/app/pages/activity_text.rs:360 +#: crates/pdfs-gui/src/app/pages/activity_text.rs:413 #, rust-format msgid "Same as {name}" msgstr "" -#: crates/pdfs-gui/src/app/pages/activity_text.rs:367 +#: crates/pdfs-gui/src/app/pages/activity_text.rs:420 #, rust-format msgid "{n} person can view" msgid_plural "{n} people can view" msgstr[0] "" msgstr[1] "" -#: crates/pdfs-gui/src/app/pages/activity_text.rs:368 +#: crates/pdfs-gui/src/app/pages/activity_text.rs:421 #, rust-format msgid "{n} person can edit" msgid_plural "{n} people can edit" msgstr[0] "" msgstr[1] "" -#: crates/pdfs-gui/src/app/pages/activity_text.rs:369 +#: crates/pdfs-gui/src/app/pages/activity_text.rs:422 #, rust-format msgid "{n} person invited" msgid_plural "{n} people invited" msgstr[0] "" msgstr[1] "" -#: crates/pdfs-gui/src/app/pages/activity_text.rs:374 +#: crates/pdfs-gui/src/app/pages/activity_text.rs:427 #, rust-format msgid "{n} file kept as a conflicting copy" msgid_plural "{n} files kept as conflicting copies" msgstr[0] "" msgstr[1] "" -#: crates/pdfs-gui/src/app/pages/activity_text.rs:382 +#: crates/pdfs-gui/src/app/pages/activity_text.rs:435 #, rust-format msgid "{n} item failed and will be tried again" msgid_plural "{n} items failed and will be tried again" @@ -1038,8 +1088,8 @@ msgstr[0] "" msgstr[1] "" #. Translators: part of a list summing up a sync pass. -#: crates/pdfs-gui/src/app/pages/activity_text.rs:400 -#: crates/pdfs-gui/src/app/pages/activity_text.rs:431 +#: crates/pdfs-gui/src/app/pages/activity_text.rs:473 +#: crates/pdfs-gui/src/app/pages/activity_text.rs:504 #, rust-format msgid "{n} uploaded" msgid_plural "{n} uploaded" @@ -1047,7 +1097,7 @@ msgstr[0] "" msgstr[1] "" #. Translators: part of a list summing up a sync pass. -#: crates/pdfs-gui/src/app/pages/activity_text.rs:402 +#: crates/pdfs-gui/src/app/pages/activity_text.rs:475 #, rust-format msgid "{n} downloaded" msgid_plural "{n} downloaded" @@ -1055,7 +1105,7 @@ msgstr[0] "" msgstr[1] "" #. Translators: part of a list summing up a sync pass. -#: crates/pdfs-gui/src/app/pages/activity_text.rs:404 +#: crates/pdfs-gui/src/app/pages/activity_text.rs:477 #, rust-format msgid "{n} folder created" msgid_plural "{n} folders created" @@ -1063,7 +1113,7 @@ msgstr[0] "" msgstr[1] "" #. Translators: part of a list summing up a sync pass. -#: crates/pdfs-gui/src/app/pages/activity_text.rs:406 +#: crates/pdfs-gui/src/app/pages/activity_text.rs:479 #, rust-format msgid "{n} deleted" msgid_plural "{n} deleted" @@ -1071,7 +1121,7 @@ msgstr[0] "" msgstr[1] "" #. Translators: part of a list summing up a sync pass. -#: crates/pdfs-gui/src/app/pages/activity_text.rs:408 +#: crates/pdfs-gui/src/app/pages/activity_text.rs:481 #, rust-format msgid "{n} in conflict" msgid_plural "{n} in conflict" @@ -1080,7 +1130,7 @@ msgstr[1] "" #. Translators: part of a list summing up a sync pass; the files are #. still open in another app. -#: crates/pdfs-gui/src/app/pages/activity_text.rs:411 +#: crates/pdfs-gui/src/app/pages/activity_text.rs:484 #, rust-format msgid "{n} still open" msgid_plural "{n} still open" @@ -1088,28 +1138,28 @@ msgstr[0] "" msgstr[1] "" #. Translators: part of a list summing up a sync pass. -#: crates/pdfs-gui/src/app/pages/activity_text.rs:413 -#: crates/pdfs-gui/src/app/pages/activity_text.rs:436 +#: crates/pdfs-gui/src/app/pages/activity_text.rs:486 +#: crates/pdfs-gui/src/app/pages/activity_text.rs:509 #, rust-format msgid "{n} failed" msgid_plural "{n} failed" msgstr[0] "" msgstr[1] "" -#: crates/pdfs-gui/src/app/pages/activity_text.rs:425 +#: crates/pdfs-gui/src/app/pages/activity_text.rs:498 msgid "Cancelled" msgstr "" #. Translators: photos an import skipped because they were already #. in Proton Drive. -#: crates/pdfs-gui/src/app/pages/activity_text.rs:434 +#: crates/pdfs-gui/src/app/pages/activity_text.rs:507 #, rust-format msgid "{n} already there" msgid_plural "{n} already there" msgstr[0] "" msgstr[1] "" -#: crates/pdfs-gui/src/app/pages/activity_text.rs:435 +#: crates/pdfs-gui/src/app/pages/activity_text.rs:508 #: crates/pdfs-gui/src/app/pages/albums.rs:107 #: crates/pdfs-gui/src/app/pages/albums.rs:692 #, rust-format diff --git a/po/pl.po b/po/pl.po index 46a6dc7..a4fa530 100644 --- a/po/pl.po +++ b/po/pl.po @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: proton-drive-linux 2.1.0\n" "Report-Msgid-Bugs-To: https://github.com/narrrl/proton-drive-linux/issues\n" -"POT-Creation-Date: 2026-10-04 03:16+0200\n" +"POT-Creation-Date: 2026-10-05 00:14+0200\n" "PO-Revision-Date: 2026-09-23 12:00+0200\n" "Last-Translator: Proton Drive for Linux contributors\n" "Language-Team: Polish\n" @@ -60,7 +60,7 @@ msgid "%A, %B %-d, %Y, %H:%M" msgstr "%A, %-d %B %Y, %H:%M" #: crates/pdfs-gui/src/app/main.rs:743 -#: crates/pdfs-gui/src/app/pages/activity_text.rs:466 +#: crates/pdfs-gui/src/app/pages/activity_text.rs:539 #: crates/pdfs-gui/src/app/pages/browser.rs:454 #: crates/pdfs-gui/src/app/pages/browser.rs:819 #: crates/pdfs-gui/src/app/pages/browser.rs:1217 @@ -1034,26 +1034,76 @@ msgstr "" "Jego katalog został przeniesiony do kosza w Proton Drive, więc utworzono go " "na najwyższym poziomie jako {name}" +#: crates/pdfs-gui/src/app/pages/activity_text.rs:350 +#, rust-format +msgid "" +"It no longer exists on Proton Drive, so your changes were uploaded as {name}" +msgstr "Plik już nie istnieje w Proton Drive, więc Twoje zmiany przesłano jako {name}" + +#: crates/pdfs-gui/src/app/pages/activity_text.rs:356 +#, rust-format +msgid "" +"It was moved to the Trash on Proton Drive, so your changes were uploaded as " +"{name}" +msgstr "Plik został przeniesiony do kosza w Proton Drive, więc Twoje zmiany przesłano jako {name}" + +#: crates/pdfs-gui/src/app/pages/activity_text.rs:362 +#, rust-format +msgid "It was changed on Proton Drive, so your changes were uploaded as {name}" +msgstr "Plik został zmieniony w Proton Drive, więc Twoje zmiany przesłano jako {name}" + +#. Translators: {name} is the copy the changes made on this +#. computer were uploaded as. +#: crates/pdfs-gui/src/app/pages/activity_text.rs:367 +#, rust-format +msgid "Your changes were uploaded as {name}" +msgstr "Twoje zmiany przesłano jako {name}" + +#: crates/pdfs-gui/src/app/pages/activity_text.rs:377 +#, rust-format +msgid "" +"It no longer exists on Proton Drive, so your changes were kept in {path}" +msgstr "Plik już nie istnieje w Proton Drive, więc Twoje zmiany zachowano w {path}" + +#: crates/pdfs-gui/src/app/pages/activity_text.rs:383 +#, rust-format +msgid "" +"It was moved to the Trash on Proton Drive, so your changes were kept in " +"{path}" +msgstr "Plik został przeniesiony do kosza w Proton Drive, więc Twoje zmiany zachowano w {path}" + +#: crates/pdfs-gui/src/app/pages/activity_text.rs:389 +#, rust-format +msgid "It was changed on Proton Drive, so your changes were kept in {path}" +msgstr "Plik został zmieniony w Proton Drive, więc Twoje zmiany zachowano w {path}" + +#. Translators: {path} is the file on this computer that holds the +#. changes which could not be uploaded. +#: crates/pdfs-gui/src/app/pages/activity_text.rs:394 +#, rust-format +msgid "Your changes were kept in {path}" +msgstr "Twoje zmiany zachowano w {path}" + #. Translators: {name} is the file the conflicting copy was made from. -#: crates/pdfs-gui/src/app/pages/activity_text.rs:346 +#: crates/pdfs-gui/src/app/pages/activity_text.rs:399 #: crates/pdfs-gui/src/app/pages/locations.rs:878 #, rust-format msgid "Differs from {name}" msgstr "Różni się od {name}" #. Translators: {name} is the file the conflicting copy was made from. -#: crates/pdfs-gui/src/app/pages/activity_text.rs:353 +#: crates/pdfs-gui/src/app/pages/activity_text.rs:406 #, rust-format msgid "{name} no longer exists" msgstr "{name} już nie istnieje" #. Translators: {name} is the file the conflicting copy was made from. -#: crates/pdfs-gui/src/app/pages/activity_text.rs:360 +#: crates/pdfs-gui/src/app/pages/activity_text.rs:413 #, rust-format msgid "Same as {name}" msgstr "Taki sam jak {name}" -#: crates/pdfs-gui/src/app/pages/activity_text.rs:367 +#: crates/pdfs-gui/src/app/pages/activity_text.rs:420 #, rust-format msgid "{n} person can view" msgid_plural "{n} people can view" @@ -1061,7 +1111,7 @@ msgstr[0] "Osoby z prawem do wyświetlania: {n}" msgstr[1] "Osoby z prawem do wyświetlania: {n}" msgstr[2] "Osoby z prawem do wyświetlania: {n}" -#: crates/pdfs-gui/src/app/pages/activity_text.rs:368 +#: crates/pdfs-gui/src/app/pages/activity_text.rs:421 #, rust-format msgid "{n} person can edit" msgid_plural "{n} people can edit" @@ -1069,7 +1119,7 @@ msgstr[0] "Osoby z prawem do edycji: {n}" msgstr[1] "Osoby z prawem do edycji: {n}" msgstr[2] "Osoby z prawem do edycji: {n}" -#: crates/pdfs-gui/src/app/pages/activity_text.rs:369 +#: crates/pdfs-gui/src/app/pages/activity_text.rs:422 #, rust-format msgid "{n} person invited" msgid_plural "{n} people invited" @@ -1077,7 +1127,7 @@ msgstr[0] "Zaproszone osoby: {n}" msgstr[1] "Zaproszone osoby: {n}" msgstr[2] "Zaproszone osoby: {n}" -#: crates/pdfs-gui/src/app/pages/activity_text.rs:374 +#: crates/pdfs-gui/src/app/pages/activity_text.rs:427 #, rust-format msgid "{n} file kept as a conflicting copy" msgid_plural "{n} files kept as conflicting copies" @@ -1085,7 +1135,7 @@ msgstr[0] "Pliki zachowane jako kopie konfliktowe: {n}" msgstr[1] "Pliki zachowane jako kopie konfliktowe: {n}" msgstr[2] "Pliki zachowane jako kopie konfliktowe: {n}" -#: crates/pdfs-gui/src/app/pages/activity_text.rs:382 +#: crates/pdfs-gui/src/app/pages/activity_text.rs:435 #, rust-format msgid "{n} item failed and will be tried again" msgid_plural "{n} items failed and will be tried again" @@ -1094,8 +1144,8 @@ msgstr[1] "Nieudane elementy, które zostaną ponowione: {n}" msgstr[2] "Nieudane elementy, które zostaną ponowione: {n}" #. Translators: part of a list summing up a sync pass. -#: crates/pdfs-gui/src/app/pages/activity_text.rs:400 -#: crates/pdfs-gui/src/app/pages/activity_text.rs:431 +#: crates/pdfs-gui/src/app/pages/activity_text.rs:473 +#: crates/pdfs-gui/src/app/pages/activity_text.rs:504 #, rust-format msgid "{n} uploaded" msgid_plural "{n} uploaded" @@ -1104,7 +1154,7 @@ msgstr[1] "Wysłano: {n}" msgstr[2] "Wysłano: {n}" #. Translators: part of a list summing up a sync pass. -#: crates/pdfs-gui/src/app/pages/activity_text.rs:402 +#: crates/pdfs-gui/src/app/pages/activity_text.rs:475 #, rust-format msgid "{n} downloaded" msgid_plural "{n} downloaded" @@ -1113,7 +1163,7 @@ msgstr[1] "Pobrano: {n}" msgstr[2] "Pobrano: {n}" #. Translators: part of a list summing up a sync pass. -#: crates/pdfs-gui/src/app/pages/activity_text.rs:404 +#: crates/pdfs-gui/src/app/pages/activity_text.rs:477 #, rust-format msgid "{n} folder created" msgid_plural "{n} folders created" @@ -1122,7 +1172,7 @@ msgstr[1] "Utworzone katalogi: {n}" msgstr[2] "Utworzone katalogi: {n}" #. Translators: part of a list summing up a sync pass. -#: crates/pdfs-gui/src/app/pages/activity_text.rs:406 +#: crates/pdfs-gui/src/app/pages/activity_text.rs:479 #, rust-format msgid "{n} deleted" msgid_plural "{n} deleted" @@ -1131,7 +1181,7 @@ msgstr[1] "Usunięto: {n}" msgstr[2] "Usunięto: {n}" #. Translators: part of a list summing up a sync pass. -#: crates/pdfs-gui/src/app/pages/activity_text.rs:408 +#: crates/pdfs-gui/src/app/pages/activity_text.rs:481 #, rust-format msgid "{n} in conflict" msgid_plural "{n} in conflict" @@ -1141,7 +1191,7 @@ msgstr[2] "W konflikcie: {n}" #. Translators: part of a list summing up a sync pass; the files are #. still open in another app. -#: crates/pdfs-gui/src/app/pages/activity_text.rs:411 +#: crates/pdfs-gui/src/app/pages/activity_text.rs:484 #, rust-format msgid "{n} still open" msgid_plural "{n} still open" @@ -1150,8 +1200,8 @@ msgstr[1] "Wciąż otwarte: {n}" msgstr[2] "Wciąż otwarte: {n}" #. Translators: part of a list summing up a sync pass. -#: crates/pdfs-gui/src/app/pages/activity_text.rs:413 -#: crates/pdfs-gui/src/app/pages/activity_text.rs:436 +#: crates/pdfs-gui/src/app/pages/activity_text.rs:486 +#: crates/pdfs-gui/src/app/pages/activity_text.rs:509 #, rust-format msgid "{n} failed" msgid_plural "{n} failed" @@ -1159,13 +1209,13 @@ msgstr[0] "Niepowodzenia: {n}" msgstr[1] "Niepowodzenia: {n}" msgstr[2] "Niepowodzenia: {n}" -#: crates/pdfs-gui/src/app/pages/activity_text.rs:425 +#: crates/pdfs-gui/src/app/pages/activity_text.rs:498 msgid "Cancelled" msgstr "Anulowano" #. Translators: photos an import skipped because they were already #. in Proton Drive. -#: crates/pdfs-gui/src/app/pages/activity_text.rs:434 +#: crates/pdfs-gui/src/app/pages/activity_text.rs:507 #, rust-format msgid "{n} already there" msgid_plural "{n} already there" @@ -1173,7 +1223,7 @@ msgstr[0] "Już obecne: {n}" msgstr[1] "Już obecne: {n}" msgstr[2] "Już obecne: {n}" -#: crates/pdfs-gui/src/app/pages/activity_text.rs:435 +#: crates/pdfs-gui/src/app/pages/activity_text.rs:508 #: crates/pdfs-gui/src/app/pages/albums.rs:107 #: crates/pdfs-gui/src/app/pages/albums.rs:692 #, rust-format diff --git a/po/pt_BR.po b/po/pt_BR.po index 66c4163..e568470 100644 --- a/po/pt_BR.po +++ b/po/pt_BR.po @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: proton-drive-linux 2.1.0\n" "Report-Msgid-Bugs-To: https://github.com/narrrl/proton-drive-linux/issues\n" -"POT-Creation-Date: 2026-10-04 03:16+0200\n" +"POT-Creation-Date: 2026-10-05 00:14+0200\n" "PO-Revision-Date: 2026-09-23 12:00+0200\n" "Last-Translator: Proton Drive for Linux contributors\n" "Language-Team: Portuguese (Brazil)\n" @@ -58,7 +58,7 @@ msgid "%A, %B %-d, %Y, %H:%M" msgstr "%A, %-d de %B de %Y, %H:%M" #: crates/pdfs-gui/src/app/main.rs:743 -#: crates/pdfs-gui/src/app/pages/activity_text.rs:466 +#: crates/pdfs-gui/src/app/pages/activity_text.rs:539 #: crates/pdfs-gui/src/app/pages/browser.rs:454 #: crates/pdfs-gui/src/app/pages/browser.rs:819 #: crates/pdfs-gui/src/app/pages/browser.rs:1217 @@ -1014,54 +1014,104 @@ msgstr "" "A pasta dele foi movida para a lixeira no Proton Drive, então foi criado no " "nível superior como {name}" +#: crates/pdfs-gui/src/app/pages/activity_text.rs:350 +#, rust-format +msgid "" +"It no longer exists on Proton Drive, so your changes were uploaded as {name}" +msgstr "Ele não existe mais no Proton Drive, então suas alterações foram enviadas como {name}" + +#: crates/pdfs-gui/src/app/pages/activity_text.rs:356 +#, rust-format +msgid "" +"It was moved to the Trash on Proton Drive, so your changes were uploaded as " +"{name}" +msgstr "Ele foi movido para a lixeira no Proton Drive, então suas alterações foram enviadas como {name}" + +#: crates/pdfs-gui/src/app/pages/activity_text.rs:362 +#, rust-format +msgid "It was changed on Proton Drive, so your changes were uploaded as {name}" +msgstr "Ele foi alterado no Proton Drive, então suas alterações foram enviadas como {name}" + +#. Translators: {name} is the copy the changes made on this +#. computer were uploaded as. +#: crates/pdfs-gui/src/app/pages/activity_text.rs:367 +#, rust-format +msgid "Your changes were uploaded as {name}" +msgstr "Suas alterações foram enviadas como {name}" + +#: crates/pdfs-gui/src/app/pages/activity_text.rs:377 +#, rust-format +msgid "" +"It no longer exists on Proton Drive, so your changes were kept in {path}" +msgstr "Ele não existe mais no Proton Drive, então suas alterações foram mantidas em {path}" + +#: crates/pdfs-gui/src/app/pages/activity_text.rs:383 +#, rust-format +msgid "" +"It was moved to the Trash on Proton Drive, so your changes were kept in " +"{path}" +msgstr "Ele foi movido para a lixeira no Proton Drive, então suas alterações foram mantidas em {path}" + +#: crates/pdfs-gui/src/app/pages/activity_text.rs:389 +#, rust-format +msgid "It was changed on Proton Drive, so your changes were kept in {path}" +msgstr "Ele foi alterado no Proton Drive, então suas alterações foram mantidas em {path}" + +#. Translators: {path} is the file on this computer that holds the +#. changes which could not be uploaded. +#: crates/pdfs-gui/src/app/pages/activity_text.rs:394 +#, rust-format +msgid "Your changes were kept in {path}" +msgstr "Suas alterações foram mantidas em {path}" + #. Translators: {name} is the file the conflicting copy was made from. -#: crates/pdfs-gui/src/app/pages/activity_text.rs:346 +#: crates/pdfs-gui/src/app/pages/activity_text.rs:399 #: crates/pdfs-gui/src/app/pages/locations.rs:878 #, rust-format msgid "Differs from {name}" msgstr "Difere de {name}" #. Translators: {name} is the file the conflicting copy was made from. -#: crates/pdfs-gui/src/app/pages/activity_text.rs:353 +#: crates/pdfs-gui/src/app/pages/activity_text.rs:406 #, rust-format msgid "{name} no longer exists" msgstr "{name} não existe mais" #. Translators: {name} is the file the conflicting copy was made from. -#: crates/pdfs-gui/src/app/pages/activity_text.rs:360 +#: crates/pdfs-gui/src/app/pages/activity_text.rs:413 #, rust-format msgid "Same as {name}" msgstr "Igual a {name}" -#: crates/pdfs-gui/src/app/pages/activity_text.rs:367 +#: crates/pdfs-gui/src/app/pages/activity_text.rs:420 #, rust-format msgid "{n} person can view" msgid_plural "{n} people can view" msgstr[0] "{n} pessoa pode ver" msgstr[1] "{n} pessoas podem ver" -#: crates/pdfs-gui/src/app/pages/activity_text.rs:368 +#: crates/pdfs-gui/src/app/pages/activity_text.rs:421 #, rust-format msgid "{n} person can edit" msgid_plural "{n} people can edit" msgstr[0] "{n} pessoa pode editar" msgstr[1] "{n} pessoas podem editar" -#: crates/pdfs-gui/src/app/pages/activity_text.rs:369 +#: crates/pdfs-gui/src/app/pages/activity_text.rs:422 #, rust-format msgid "{n} person invited" msgid_plural "{n} people invited" msgstr[0] "{n} pessoa convidada" msgstr[1] "{n} pessoas convidadas" -#: crates/pdfs-gui/src/app/pages/activity_text.rs:374 +#: crates/pdfs-gui/src/app/pages/activity_text.rs:427 #, rust-format msgid "{n} file kept as a conflicting copy" msgid_plural "{n} files kept as conflicting copies" msgstr[0] "{n} arquivo mantido como cópia em conflito" msgstr[1] "{n} arquivos mantidos como cópias em conflito" -#: crates/pdfs-gui/src/app/pages/activity_text.rs:382 +#: crates/pdfs-gui/src/app/pages/activity_text.rs:435 #, rust-format msgid "{n} item failed and will be tried again" msgid_plural "{n} items failed and will be tried again" @@ -1069,8 +1119,8 @@ msgstr[0] "{n} item falhou e será tentado novamente" msgstr[1] "{n} itens falharam e serão tentados novamente" #. Translators: part of a list summing up a sync pass. -#: crates/pdfs-gui/src/app/pages/activity_text.rs:400 -#: crates/pdfs-gui/src/app/pages/activity_text.rs:431 +#: crates/pdfs-gui/src/app/pages/activity_text.rs:473 +#: crates/pdfs-gui/src/app/pages/activity_text.rs:504 #, rust-format msgid "{n} uploaded" msgid_plural "{n} uploaded" @@ -1078,7 +1128,7 @@ msgstr[0] "{n} enviado" msgstr[1] "{n} enviados" #. Translators: part of a list summing up a sync pass. -#: crates/pdfs-gui/src/app/pages/activity_text.rs:402 +#: crates/pdfs-gui/src/app/pages/activity_text.rs:475 #, rust-format msgid "{n} downloaded" msgid_plural "{n} downloaded" @@ -1086,7 +1136,7 @@ msgstr[0] "{n} baixado" msgstr[1] "{n} baixados" #. Translators: part of a list summing up a sync pass. -#: crates/pdfs-gui/src/app/pages/activity_text.rs:404 +#: crates/pdfs-gui/src/app/pages/activity_text.rs:477 #, rust-format msgid "{n} folder created" msgid_plural "{n} folders created" @@ -1094,7 +1144,7 @@ msgstr[0] "{n} pasta criada" msgstr[1] "{n} pastas criadas" #. Translators: part of a list summing up a sync pass. -#: crates/pdfs-gui/src/app/pages/activity_text.rs:406 +#: crates/pdfs-gui/src/app/pages/activity_text.rs:479 #, rust-format msgid "{n} deleted" msgid_plural "{n} deleted" @@ -1102,7 +1152,7 @@ msgstr[0] "{n} excluído" msgstr[1] "{n} excluídos" #. Translators: part of a list summing up a sync pass. -#: crates/pdfs-gui/src/app/pages/activity_text.rs:408 +#: crates/pdfs-gui/src/app/pages/activity_text.rs:481 #, rust-format msgid "{n} in conflict" msgid_plural "{n} in conflict" @@ -1111,7 +1161,7 @@ msgstr[1] "{n} em conflito" #. Translators: part of a list summing up a sync pass; the files are #. still open in another app. -#: crates/pdfs-gui/src/app/pages/activity_text.rs:411 +#: crates/pdfs-gui/src/app/pages/activity_text.rs:484 #, rust-format msgid "{n} still open" msgid_plural "{n} still open" @@ -1119,28 +1169,28 @@ msgstr[0] "{n} ainda aberto" msgstr[1] "{n} ainda abertos" #. Translators: part of a list summing up a sync pass. -#: crates/pdfs-gui/src/app/pages/activity_text.rs:413 -#: crates/pdfs-gui/src/app/pages/activity_text.rs:436 +#: crates/pdfs-gui/src/app/pages/activity_text.rs:486 +#: crates/pdfs-gui/src/app/pages/activity_text.rs:509 #, rust-format msgid "{n} failed" msgid_plural "{n} failed" msgstr[0] "{n} com falha" msgstr[1] "{n} com falha" -#: crates/pdfs-gui/src/app/pages/activity_text.rs:425 +#: crates/pdfs-gui/src/app/pages/activity_text.rs:498 msgid "Cancelled" msgstr "Cancelado" #. Translators: photos an import skipped because they were already #. in Proton Drive. -#: crates/pdfs-gui/src/app/pages/activity_text.rs:434 +#: crates/pdfs-gui/src/app/pages/activity_text.rs:507 #, rust-format msgid "{n} already there" msgid_plural "{n} already there" msgstr[0] "{n} já existia" msgstr[1] "{n} já existiam" -#: crates/pdfs-gui/src/app/pages/activity_text.rs:435 +#: crates/pdfs-gui/src/app/pages/activity_text.rs:508 #: crates/pdfs-gui/src/app/pages/albums.rs:107 #: crates/pdfs-gui/src/app/pages/albums.rs:692 #, rust-format