From d51e44b9e65dd802b607e8a2b40530dab1316549 Mon Sep 17 00:00:00 2001 From: Georg Schwitalla Date: Sat, 24 Oct 2020 13:29:44 +0200 Subject: [PATCH 1/3] Issue #3569 changed the the text from Keep both to keep all --- beets/ui/commands.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/beets/ui/commands.py b/beets/ui/commands.py index 49c4b4dc6..f8c2decab 100755 --- a/beets/ui/commands.py +++ b/beets/ui/commands.py @@ -807,7 +807,7 @@ class TerminalImportSession(importer.ImportSession): )) sel = ui.input_options( - (u'Skip new', u'Keep both', u'Remove old', u'Merge all') + (u'Skip new', u'Keep all', u'Remove old', u'Merge all') ) if sel == u's': From e7013f9f6ff1cccbf752c33489686254173ec70d Mon Sep 17 00:00:00 2001 From: Georg Schwitalla Date: Sat, 24 Oct 2020 13:34:23 +0200 Subject: [PATCH 2/3] Added the changelog --- docs/changelog.rst | 1 + 1 file changed, 1 insertion(+) diff --git a/docs/changelog.rst b/docs/changelog.rst index e33299fab..0de5fda95 100644 --- a/docs/changelog.rst +++ b/docs/changelog.rst @@ -6,6 +6,7 @@ Changelog New features: +* When importing a duplicate album it ask if it should "Keep all" instead of "Keep both". * :doc:`/plugins/chroma`: Update file metadata after generating fingerprints through the `submit` command. * :doc:`/plugins/lastgenre`: Added more heavy metal genres: https://en.wikipedia.org/wiki/Heavy_metal_genres to genres.txt and genres-tree.yaml * :doc:`/plugins/subsonicplaylist`: import playlist from a subsonic server. From 272463aa4a26f0680f721eb2d13be32f3bc223db Mon Sep 17 00:00:00 2001 From: Sudo-kun Date: Sun, 25 Oct 2020 11:06:00 +0100 Subject: [PATCH 3/3] Edited the changelog entry to contain the Issue number --- docs/changelog.rst | 1 + 1 file changed, 1 insertion(+) diff --git a/docs/changelog.rst b/docs/changelog.rst index 0de5fda95..ac7435abc 100644 --- a/docs/changelog.rst +++ b/docs/changelog.rst @@ -7,6 +7,7 @@ Changelog New features: * When importing a duplicate album it ask if it should "Keep all" instead of "Keep both". + :bug:`3569` * :doc:`/plugins/chroma`: Update file metadata after generating fingerprints through the `submit` command. * :doc:`/plugins/lastgenre`: Added more heavy metal genres: https://en.wikipedia.org/wiki/Heavy_metal_genres to genres.txt and genres-tree.yaml * :doc:`/plugins/subsonicplaylist`: import playlist from a subsonic server.