Rename as aLbums option (#518)

This commit is contained in:
Thomas Scholtes 2014-02-01 12:56:17 +01:00
parent d6013f51d2
commit 736835ce72
2 changed files with 9 additions and 9 deletions

View file

@ -472,7 +472,7 @@ def choose_candidate(candidates, singleton, rec, cur_artist=None,
.format(itemcount))
print_('For help, see: '
'http://beets.readthedocs.org/en/latest/faq.html#nomatch')
opts = ('Use as-is', 'as Tracks', 'as aLbums', 'Skip', 'Enter search',
opts = ('Use as-is', 'as Tracks', 'Group albums', 'Skip', 'Enter search',
'enter Id', 'aBort')
sel = ui.input_options(opts)
if sel == 'u':
@ -488,7 +488,7 @@ def choose_candidate(candidates, singleton, rec, cur_artist=None,
raise importer.ImportAbort()
elif sel == 'i':
return importer.action.MANUAL_ID
elif sel == 'l':
elif sel == 'g':
return importer.action.ALBUMS
else:
assert False
@ -540,7 +540,7 @@ def choose_candidate(candidates, singleton, rec, cur_artist=None,
opts = ('Skip', 'Use as-is', 'Enter search', 'enter Id',
'aBort')
else:
opts = ('Skip', 'Use as-is', 'as Tracks', 'as aLbums',
opts = ('Skip', 'Use as-is', 'as Tracks', 'Group albums',
'Enter search', 'enter Id', 'aBort')
sel = ui.input_options(opts, numrange=(1, len(candidates)))
if sel == 's':
@ -558,7 +558,7 @@ def choose_candidate(candidates, singleton, rec, cur_artist=None,
raise importer.ImportAbort()
elif sel == 'i':
return importer.action.MANUAL_ID
elif sel == 'l':
elif sel == 'g':
return importer.action.ALBUMS
else: # Numerical selection.
match = candidates[sel - 1]
@ -584,7 +584,7 @@ def choose_candidate(candidates, singleton, rec, cur_artist=None,
'Enter search', 'enter Id', 'aBort')
else:
opts = ('Apply', 'More candidates', 'Skip', 'Use as-is',
'as Tracks', 'as aLbums', 'Enter search', 'enter Id',
'as Tracks', 'Group albums', 'Enter search', 'enter Id',
'aBort')
default = config['import']['default_action'].as_choice({
'apply': 'a',
@ -597,7 +597,7 @@ def choose_candidate(candidates, singleton, rec, cur_artist=None,
sel = ui.input_options(opts, require=require, default=default)
if sel == 'a':
return match
elif sel == 'l':
elif sel == 'g':
return importer.action.ALBUMS
elif sel == 's':
return importer.action.SKIP

View file

@ -51,7 +51,7 @@ all of these limitations.
release. If two adjacent albums have a common prefix, followed by "disc,"
"disk," or "CD" and then a number, they are tagged together.
Second, the *L* ("as aLbums") option described below can help you split a
Second, the *G* ("Group albums") option described below can help you split a
directory containing multiple albums into its components. Use this for
disorganized jumbles of tracks.
@ -157,7 +157,7 @@ When beets needs your input about a match, it says something like this::
[A]pply, More candidates, Skip, Use as-is, as Tracks, Enter search, or aBort?
When beets asks you this question, it wants you to enter one of the capital
letters: A, M, S, U, T, L, E, or B. That is, you can choose one of the
letters: A, M, S, U, T, G, E, or B. That is, you can choose one of the
following:
* *A*: Apply the suggested changes shown and move on.
@ -175,7 +175,7 @@ following:
tracks that aren't a full album. This will temporarily flip the tagger into
*singleton* mode, which attempts to match each track individually.
* *L*: Group tracks in this directory by *album artist* and *album* and import
* *G*: Group tracks in this directory by *album artist* and *album* and import
groups as albums. If the album artist for a track is not set then the artist
is used to group that track. For each group importing proceeds as for
directories. This is helpful if a directory contains multiple albums.