Skip to content

feat(ConflictPicker): move conflict picker dialog from @nextcloud/upload #1971

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
susnux merged 2 commits into from
Oct 6, 2025
Merged

feat(ConflictPicker): move conflict picker dialog from @nextcloud/upload #1971

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
cc47489
feat(ConflictPicker): move conflict picker dialog from `@nextcloud/up…
susnux Sep 27, 2025
c06629b
test: add component tests for conflict picker
susnux Sep 30, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
170 changes: 170 additions & 0 deletions LICENSES/CC-BY-SA-4.0.txt
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion REUSE.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ SPDX-PackageSupplier = "Nextcloud <info@nextcloud.com>"
SPDX-PackageDownloadLocation = "https://github.com/nextcloud-libraries/nextcloud-dialogs"

[[annotations]]
path = ["package-lock.json", "package.json", "tsconfig-typedoc.json", "tsconfig.json", "test/tsconfig.json"]
path = ["package-lock.json", "package.json", "tsconfig-typedoc.json", "tsconfig.json"]
precedence = "aggregate"
SPDX-FileCopyrightText = "2019-2024 Nextcloud GmbH and Nextcloud contributors"
SPDX-License-Identifier = "AGPL-3.0-or-later"
Expand Down
60 changes: 60 additions & 0 deletions l10n/messages.pot
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,12 +20,25 @@ msgstr ""
msgid "\"/\" is not allowed inside a folder name."
msgstr ""

msgid "%n file conflict"
msgid_plural "%n files conflict"
msgstr[0] ""
msgstr[1] ""

msgid "%n file conflict in {dirname}"
msgid_plural "%n file conflicts in {dirname}"
msgstr[0] ""
msgstr[1] ""

msgid "All files"
msgstr ""

msgid "Cancel"
msgstr ""

msgid "Cancel the entire operation"
msgstr ""

msgid "Choose"
msgstr ""

Expand All @@ -37,6 +50,9 @@ msgid_plural "Choose %n files"
msgstr[0] ""
msgstr[1] ""

msgid "Continue"
msgstr ""

msgid "Copy"
msgstr ""

Expand All @@ -61,6 +77,9 @@ msgstr ""
msgid "Enter your name"
msgstr ""

msgid "Existing version"
msgstr ""

msgid "Failed to set nickname."
msgstr ""

Expand All @@ -85,9 +104,15 @@ msgstr ""
msgid "Home"
msgstr ""

msgid "If you select both versions, the incoming file will have a number added to its name."
msgstr ""

msgid "Invalid name."
msgstr ""

msgid "Last modified date unknown"
msgstr ""

msgid "Modified"
msgstr ""

Expand Down Expand Up @@ -121,6 +146,9 @@ msgstr ""
msgid "New folder name"
msgstr ""

msgid "New version"
msgstr ""

msgid "No files in here"
msgstr ""

Expand All @@ -136,9 +164,18 @@ msgstr ""
msgid "Recent"
msgstr ""

msgid "Select all checkboxes"
msgstr ""

msgid "Select all entries"
msgstr ""

msgid "Select all existing files"
msgstr ""

msgid "Select all new files"
msgstr ""

msgid "Select entry"
msgstr ""

Expand All @@ -148,6 +185,14 @@ msgstr ""
msgid "Size"
msgstr ""

msgid "Skip %n file"
msgid_plural "Skip %n files"
msgstr[0] ""
msgstr[1] ""

msgid "Skip this file"
msgstr ""

msgid "Submit name"
msgstr ""

Expand All @@ -157,6 +202,15 @@ msgstr ""
msgid "Upload some content or sync with your devices!"
msgstr ""

msgid "When an incoming folder is selected, any conflicting files within it will also be overwritten."
msgstr ""

msgid "When an incoming folder is selected, the content is written into the existing folder and a recursive conflict resolution is performed."
msgstr ""

msgid "Which files do you want to keep?"
msgstr ""

msgid "You are currently identified as {nickname}."
msgstr ""

Expand All @@ -165,3 +219,9 @@ msgstr ""

msgid "You cannot leave the name empty."
msgstr ""

msgid "You need to choose at least one conflict solution"
msgstr ""

msgid "You need to select at least one version of each file to continue."
msgstr ""
Loading