diff --git a/NEWS.txt b/NEWS.txt index 11ed42786..6f3be26c0 100644 --- a/NEWS.txt +++ b/NEWS.txt @@ -50,7 +50,7 @@ Version 1.3 - 2014-10-20 * New Work tag (which for Classical music is often different from the track title) saved as ID3 TOAL tag. * New Composer Sort Order tag (variable %composersort%). * Improve the Other Releases list to prioritise and separate releases which match the correct number of tracks - and your Options / Metadata / Prefered Releases settings for Country and Format. + and your Options / Metadata / Preferred Releases settings for Country and Format. * New %_absolutetracknumber% variable numbering tracks sequentially regardless of disc structure (so you can numbers tracks on multi-disc releases without a disc number) * Support dropping image directly from Google image results to cover art box diff --git a/contrib/plugins/lastfmplus/ui_options_lastfm.py b/contrib/plugins/lastfmplus/ui_options_lastfm.py index 5a53396a7..75ea29bdc 100644 --- a/contrib/plugins/lastfmplus/ui_options_lastfm.py +++ b/contrib/plugins/lastfmplus/ui_options_lastfm.py @@ -372,7 +372,7 @@ class Ui_LastfmOptionsPage(object): "\n" "

Country Nonstandard!

\n" "

Tag: %Comment:Songs-db_Custom2%

\n" -"

The country the artist or track is most associated with. Will retreive results using the country tag list on Tag Filter List Page

\n" +"

The country the artist or track is most associated with. Will retrieve results using the country tag list on Tag Filter List Page

\n" "", None, QtGui.QApplication.UnicodeUTF8)) self.use_country_tag.setText(QtGui.QApplication.translate("LastfmOptionsPage", "Country", None, QtGui.QApplication.UnicodeUTF8)) self.use_city_tag.setToolTip(QtGui.QApplication.translate("LastfmOptionsPage", "\n" diff --git a/picard/coverart/image.py b/picard/coverart/image.py index 74322ca1a..810a45deb 100644 --- a/picard/coverart/image.py +++ b/picard/coverart/image.py @@ -112,7 +112,7 @@ class CoverArtImage: # formats may have types associated with cover art, but some other sources # don't provide such information support_types = False - # `is_front` has to be explicitely set, it is used to handle CAA is_front + # `is_front` has to be explicitly set, it is used to handle CAA is_front # indicator is_front = None sourceprefix = "URL" diff --git a/picard/coverart/providers/__init__.py b/picard/coverart/providers/__init__.py index 761155994..6a5d4e209 100644 --- a/picard/coverart/providers/__init__.py +++ b/picard/coverart/providers/__init__.py @@ -99,7 +99,7 @@ class CoverArtProvider(object): potential cover art downloads (using `queue_put(). If `queue_images()` delegates the job of queuing downloads to another method (asynchronous) it should return `WAIT` and the other method has to - explicitely call `next_in_queue()`. + explicitly call `next_in_queue()`. If `FINISHED` is returned, `next_in_queue()` will be automatically called by CoverArt object. """ @@ -110,7 +110,7 @@ class CoverArtProvider(object): # next_in_queue() will be automatically called FINISHED = 1 # returned by queue_images(): - # next_in_queue() has to be called explicitely by provider + # next_in_queue() has to be called explicitly by provider WAIT = 2 def __init__(self, coverart): diff --git a/picard/file.py b/picard/file.py index 92990c153..74cf91dab 100644 --- a/picard/file.py +++ b/picard/file.py @@ -349,7 +349,7 @@ class File(QtCore.QObject, Item): patterns = encode_filename(config.setting["move_additional_files_pattern"]) patterns = filter(bool, [p.strip() for p in patterns.split()]) for pattern in patterns: - # FIXME glob1 is not documented, maybe we need our own implemention? + # FIXME glob1 is not documented, maybe we need our own implementation? for old_file in glob.glob1(old_path, pattern): new_file = os.path.join(new_path, old_file) old_file = os.path.join(old_path, old_file) diff --git a/picard/script.py b/picard/script.py index e4cb1c887..0d341dcb1 100644 --- a/picard/script.py +++ b/picard/script.py @@ -472,7 +472,7 @@ def func_add(parser, x, y): def func_sub(parser, x, y): - """Substracts ``y`` from ``x``.""" + """Subtracts ``y`` from ``x``.""" try: return str(int(x) - int(y)) except ValueError: diff --git a/picard/util/devutil/__init__.py b/picard/util/devutil/__init__.py index 10821c000..a21a444ba 100644 --- a/picard/util/devutil/__init__.py +++ b/picard/util/devutil/__init__.py @@ -24,7 +24,7 @@ def printable_node(node, indent=0): Useful to debug mbxml.py mostly and to create unit tests using "real" nodes. - Exemple of usage: + Example of usage: from picard.util.devutil import printable_node from picard import log