Merge branch 'master' into PICARD-969_queue-search-dialog-xmlws-to-run-first

2026-02-26 01:23:58 +00:00 · 2017-03-26 21:34:06 +01:00
parent 52f4cf71c2 9ef0acb3aa
commit dc33e8a938
104 changed files with 9474 additions and 8013 deletions
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -6,6 +6,7 @@ variables:
  DISCID_VERSION: "0.6.1"
  PYTHON_DISCID_VERSION: "1.1.1"
  MUTAGEN_VERSION: "1.36"
+  PY2APP_VERSION: "0.11"

 package win:
  stage: package
--- a/.mailmap
+++ b/.mailmap
@@ -0,0 +1,5 @@
+Frederik “Freso” S. Olesen <freso.dk@gmail.com>
+Lukáš Lalinský <lalinsky@gmail.com>             <lukas@oxygene.sk>
+Sambhav Kothari <sambhavs.email@gmail.com>
+Sophist-UK <github@sodalis.co.uk>
+Suhas <suhas2go@gmail.com>
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,9 +1,33 @@
-sudo: required
-services:
-  - docker
+os: linux
+language: python
+python: "2.7"
+virtualenv:
+  system_site_packages: true
+cache:
+  - apt
+  - pip
+env:
+  global:
+    - PIP_INSTALL="pip install"
+  matrix:
+    - DISCID="" MUTAGEN="$PIP_INSTALL mutagen>=1.23"
+    - DISCID="$PIP_INSTALL discid" MUTAGEN="$PIP_INSTALL mutagen>=1.23"
+    - MUTAGEN="$PIP_INSTALL mutagen==1.34"
+matrix:
+  include:
+    - os: osx
+      osx_image: xcode8.1
+      language: generic
 before_install:
-  - docker build -t picard .
-script: "docker run picard"
+  - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then bash scripts/setup-osx.sh; fi
+  - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then sudo apt-get update -qq && sudo apt-get install -qq python-qt4 libdiscid0 libdiscid0-dev; $MUTAGEN; $DISCID; fi
+install:
+  # Set up Picard
+  - python setup.py build_ext -i
+  - python setup.py build_locales -i
+# Run the tests!
+script: "python setup.py test"
+
 # Tell people that tests were run
 notifications:
  irc: "chat.freenode.net#metabrainz"
--- a/NEWS.txt
+++ b/NEWS.txt
@@ -1,6 +1,158 @@
-Version ? - ?
-  * Picard now requires at least Python 2.7
-  * Task: Update Picard logo/icons. (PICARD-760)
+Version 1.4 - 2017-02-14
+  * Bugfix: AcoustID submission fails with code 299 (PICARD-82)
+  * Bugfix: Ignoring "hip hop rap" folksonomy tags also ignores "rap", "hip hop", etc. (PICARD-335)
+  * Bugfix: Picard downloads multiple 'front' images instead of just first one. (PICARD-350)
+  * Bugfix: Saving hidden file with only an extension drops the extension (PICARD-357)
+  * Bugfix: Add directory opens in "wrong" dir (PICARD-366)
+  * Bugfix: Picard should de-duplicate work lists (PICARD-375)
+  * Bugfix: Tree selector in Options window is partially obscured, pane too narrow (PICARD-408)
+  * Bugfix: tag acoustid_id can not be removed or deleted in script, renaming or plugin (PICARD-419)
+  * Bugfix: Can't remove value from field (PICARD-546)
+  * Bugfix: Can't open Options (PICARD-592)
+  * Bugfix: "Tags from filenames" action stays enabled even if it is unavailable. (PICARD-688)
+  * Bugfix: Using the first image type as filename changes the name of front images (PICARD-701)
+  * Bugfix: Fingerprint Submission Failes if AcoustID tags are present and/or invalid (PICARD-706)
+  * Bugfix: Picard moves into the selected folder (PICARD-726)
+  * Bugfix: Picard does not support (recording) relationship credits (PICARD-730)
+  * Bugfix: Picard repeats/duplicates field data (PICARD-748)
+  * Bugfix: Number of pending web requests is not decremented on exceptions in the handler (PICARD-751)
+  * Bugfix: Divide by zero error in _convert_folksonomy_tags_to_genre when no tag at the release/release group level (  PICARD-753)
+  * Bugfix: Directory tree (file browser) not sorted for non-system drives under Windows (PICARD-754)
+  * Bugfix: Crash when loading release with only zero count tags (PICARD-759)
+  * Bugfix: No name and no window grouping in gnome-shell Alt-Tab app switcher (PICARD-761)
+  * Bugfix: Lookup in Browser does not and can not load HTTPS version of musicbrainz.org (PICARD-764)
+  * Bugfix: Unable to login using oauth via Picard options with Server Port set to 443 (PICARD-766)
+  * Bugfix: "AttributeError: 'MetadataBox' object has no attribute 'resize_columns'" when enabling the cover art box (  PICARD-775)
+  * Bugfix: Pre-gap tracks are not counted in absolutetracknumber (PICARD-778)
+  * Bugfix: CAA cover art provider runs even if cover art has already been loaded (PICARD-780)
+  * Bugfix: Toggling Embed Cover Art in Tags and restarting doesn't have the expected behavior (PICARD-782)
+  * Bugfix: XMLWS redirects incorrectly (PICARD-788)
+  * Bugfix: Handle empty collection-list in web server response (PICARD-798)
+  * Bugfix: Amazon Cover Art provider does not work (and does not have a lot of debug logging enabled) (PICARD-799)
+  * Bugfix: Cover Art from CAA release group is skipped even though it exists (PICARD-801)
+  * Bugfix: Multiple instances of history and log dialogs (PICARD-804)
+  * Bugfix: Empty string lookup (PICARD-805)
+  * Bugfix: Will not load album information on any albums (PICARD-811)
+  * Bugfix: Redirect URL is not encoded which leads to http 400 error. (PICARD-814)
+  * Bugfix: Not compatible with latest Mutagen (PICARD-833)
+  * Bugfix: Can't save any files.  Get: "error: invalid literal for int() with base 10" (PICARD-834)
+  * Bugfix: Picard 1.3.2 shows cleartext username & password on status line when errors occur (PICARD-839)
+  * Bugfix: Cannot fetch cover art from amazon link contains https scheme. (PICARD-848)
+  * Bugfix: media-optical-modified.png icon still displayed after release save when two files match one track (PICARD-851)
+  * Bugfix: Release that Picard will not load (due to disc with just data track?) (PICARD-853)
+  * Bugfix: ValueError in metadata.py (PICARD-855)
+  * Bugfix: Improper detection of Gnome as a desktop environment and no support for gnome 3 (PICARD-857)
+  * Bugfix: Apparent non-functional tagger button (PICARD-858)
+  * Bugfix: Picard does not read Ogg/Opus files with an ".ogg" file exension (PICARD-859)
+  * Bugfix: Setting a large value in in $num function as length causes picard to become unresponsive (PICARD-865)
+  * Bugfix: id3 deletion needs to be improved (PICARD-867)
+  * Bugfix: id3v2.3 does not properly handle TMOO ( mood tag) (PICARD-868)
+  * Bugfix: Coverart providers duplicates on reset (PICARD-870)
+  * Bugfix: Restore defaults broken for plugins page and tagger scripts page (PICARD-873)
+  * Bugfix: Coverart providers erroneous save (PICARD-874)
+  * Bugfix: The metadatabox doesn't correctly show the tag selected  (PICARD-876)
+  * Bugfix: Length tag for ID3 is no longer displayed in the metadata box (PICARD-881)
+  * Bugfix: Removed tags are not removed from the metadatabox after saving the file (PICARD-882)
+  * Bugfix: File Browser pane doesn't check for path type( file or folder) when setting home path/move files here (  PICARD-884)
+  * Bugfix: mov files return a +ve score for mp4 container leading to errors (PICARD-885)
+  * Bugfix: "Restore defaults" doesn't log out the user (PICARD-888)
+  * Bugfix: Broken 'Restore Defaults' (PICARD-907)
+  * Bugfix: Messagebox wraps and displays title inappropriately (PICARD-911)
+  * Bugfix: An “empty” track shouldn’t get an “excellent match” tooltip. (PICARD-914)
+  * Bugfix: In plugins list, some plugins don't show description (PICARD-915)
+  * Bugfix: Plugin restore defaults broken (PICARD-916)
+  * Bugfix: Does not use UI language but locale on Windows (PICARD-917)
+  * Bugfix: Preserve scripting splitter position (PICARD-925)
+  * Bugfix: Having trouble submitting AcoustIDs (PICARD-926)
+  * Bugfix: Cluster double‐click opens the Info… panel (PICARD-931)
+  * Bugfix: Status bar not cleared when selection changed (PICARD-937)
+  * Bugfix: Open containing folder not working for shared files over network  (PICARD-942)
+  * Bugfix: Warning: Plugin directory '…/python2.7/site-packages/contrib/plugins' doesn't exist (PICARD-945)
+  * Bugfix: Additionnal files aren't moved anymore (PICARD-946)
+  * Bugfix: Search window error message does not appear translated (PICARD-947)
+  * Bugfix: Open Containing Folder duplicates (PICARD-950)
+  * Bugfix: Errors when directory / file names contain unicode characters (PICARD-958)
+  * New Feature: AIF support (ID3) (PICARD-42)
+  * New Feature: Test and integrate support for "local" cover art into Picard (PICARD-137)
+  * New Feature: Display infos (album, artist, tracklist) for clusters without release match (PICARD-680)
+  * New Feature: Add download plugin functionality to existing UI (PICARD-691)
+  * New Feature: Fallback on album artist's tags if no tags are found for album (PICARD-738)
+  * New Feature: Add m2a as a supported extension (PICARD-743)
+  * New Feature: MusicBrainz/AcoustID entities should be hyperlinked in Picard (PICARD-756)
+  * New Feature: Support key tag (PICARD-769)
+  * New Feature: Export / import settings (PICARD-901)
+  * New Feature: Search releases from within a Picard dialog (PICARD-927)
+  * New Feature: Searching tracks and displaying similar tracks in a dialog box (PICARD-928)
+  * New Feature: Search for artists from dialog (PICARD-929)
+  * Task: Picard default name files script refinement (PICARD-717)
+  * Task: Update Picard logo/icons (PICARD-760)
+  * Task: Link to the Scripting documentation on the Scripting options page (PICARD-779)
+  * Task: Remove contrib/plugins from the repository (PICARD-835)
+  * Task: Raise the required mutagen version to 1.22 (PICARD-841)
+  * Task: Renaming save_only_front_images_to_tags option to something more appropriate  (PICARD-861)
+  * Task: Allow translators to finalize translations before releasing Picard 1.4 (PICARD-895)
+  * Task: Raise the required Python version to 2.7. (PICARD-904)
+  * Task: Bump Picard’s copyright date (PICARD-912)
+  * Task: Add Norwegian to UI languages (PICARD-982)
+  * Task: Provide ~video variable for video tracks (PICARD-652)
+  * Task: Improve error logging on AcoustId submission (PICARD-708)
+  * Improvement: Link to Picard Scripting page under 'File Naming' (PICARD-22)
+  * Improvement: Restore default settings button/s (PICARD-116)
+  * Improvement: Speed of Ogg tag writing/updating (PICARD-133)
+  * Improvement: Allow adding/removing tags to be preserved from context menu in the tag diff pane (PICARD-207)
+  * Improvement: Make it easier to remove everything currently loaded in Picard (PICARD-210)
+  * Improvement: Bring back keyboard shortcuts for editing tags (PICARD-222)
+  * Improvement: Case sensitivity for "Move additional files" option (PICARD-229)
+  * Improvement: Metadata comparison box shows that it intends to write (and has written) tags unsupported by   underlyingfile format (PICARD-253)
+  * Improvement: Add more descriptive tooltips to buttons (PICARD-267)
+  * Improvement: Allow musicip_puid and acoustid_id to be cleared from tags (PICARD-268)
+  * Improvement: Make it possible to remove existing tags without clearing all tags (PICARD-287)
+  * Improvement: Disable recurse subdirectories should be added (PICARD-291)
+  * Improvement: display how many "pending files" left on lookup (PICARD-305)
+  * Improvement: Handle MP3 TSST/TIT3 (subtitle) tags better with ID3v2.3 (PICARD-307)
+  * Improvement: Customisable toolbars (PICARD-353)
+  * Improvement: Ignore file extension and try to read anyway (PICARD-359)
+  * Improvement: Make it possible to unset all performer (etc) tags (PICARD-384)
+  * Improvement: Progress tracking (PICARD-388)
+  * Improvement: Add ability to handle multiple tagger scripts (PICARD-404)
+  * Improvement: the option "select all" to save (PICARD-476)
+  * Improvement: Option to load only audio tracks, i.e. not DVD-Video, CD-ROM tracks (PICARD-514)
+  * Improvement: Picard should use OAuth for authentication (PICARD-615)
+  * Improvement: Improvements to WMA tags (PICARD-648)
+  * Improvement: Only ask to "log in now" once per session (PICARD-678)
+  * Improvement: Show codec info for MP4 files (PICARD-683)
+  * Improvement: "Play File" button should be renamed to "Open in Player" (PICARD-692)
+  * Improvement: ID3 padding not reduced can result in large files (PICARD-695)
+  * Improvement: Set option 'caa_approved_only' disabled by default (PICARD-705)
+  * Improvement: Validate fpcalc executable in options (PICARD-707)
+  * Improvement: Improve File Naming options (PICARD-733)
+  * Improvement: Add --long-version/-V option, outputting third parties libs versions as well as Picard version PICARD-734)
+  * Improvement: missing info in the help file (PICARD-740)
+  * Improvement: Pass command-line arguments to QtApplication (PICARD-773)
+  * Improvement: Use the more detailed icons in more places on windows (PICARD-777)
+  * Improvement: Use .ini configuration file on all platforms (PICARD-794)
+  * Improvement: Use python2 shebang as of PEP 0394 (PICARD-806)
+  * Improvement: Display existing covers in File Info dialog (PICARD-808)
+  * Improvement: Use HTTPS for external links (PICARD-818)
+  * Improvement: Install a scalable icon (PICARD-838)
+  * Improvement: Use HTTPS for requests to the plugins API on picard.musicbrainz.org (PICARD-852)
+  * Improvement: Use magic numbers to determine the audio file types instead of relying on extensions (PICARD-864)
+  * Improvement: Multi-scripting UI is very basic (PICARD-883)
+  * Improvement: Allow scripting functions to have arbitrary number of arguments (PICARD-887)
+  * Improvement: The "Restore defaults" confirmation buttons should follow the quit confirmation dialog in style PICARD-890)
+  * Improvement: Replace submit icon with AcoustID logo (PICARD-896)
+  * Improvement: Rename "Submit" button to "Submit AcoustIDs" (PICARD-897)
+  * Improvement: Use UTF-8 for ID3v2.4 by default instead of UTF-16 (PICARD-898)
+  * Improvement: Restore defaults is slightly broken for tags option page (PICARD-902)
+  * Improvement: Rearrange the action toolbar icons from left to right according to the expected user-flow (PICARD-908)
+  * Improvement: Add tooltips to “Restore all Defaults” and “Restore Defaults” (PICARD-913)
+  * Improvement: Make PICARD-883 UI have adjustable widths for list of scripts and script content (PICARD-918)
+  * Improvement: Move Options/Advanced/Scripting to Options/Scripting (PICARD-919)
+  * Improvement: Move UI options page up the options tree (PICARD-921)
+  * Improvement: Add $startswith and $endswith string functions (PICARD-923)
+  * Improvement: Make list of scripts smaller than script text by default (PICARD-924)
+  * Improvement: Wait for save thread pool to be finished before exit  (PICARD-944)
+  * Improvement: New guess format functionality should use explicit buffer size (PICARD-970)

 Version 1.3.2 - 2015-01-07
  * Bugfix: Fixed tags from filename dialog not opening on new installations
--- a/README.md
+++ b/README.md
@@ -7,7 +7,7 @@ MusicBrainz Picard

 Picard supports the majority of audio file formats, is capable of using audio fingerprints ([AcoustIDs](http://musicbrainz.org/doc/AcoustID)), performing CD lookups and [disc ID](http://musicbrainz.org/doc/Disc_ID) submissions, and it has excellent Unicode support. Additionally, there are several plugins available that extend Picard's features.

-When tagging files, Picard uses an album-oriented approach. This approach allows it to utilize the MusicBrainz data as effectively as possible and correctly tag your music. For more information, [see the illustrated quick start guide to tagging](http://picard.musicbrainz.org/docs/guide/).
+When tagging files, Picard uses an album-oriented approach. This approach allows it to utilize the MusicBrainz data as effectively as possible and correctly tag your music. For more information, [see the illustrated quick start guide to tagging](https://picard.musicbrainz.org/quick-start/).

 Picard is named after Captain Jean-Luc Picard from the TV series Star Trek: The Next Generation.

--- a/picard/init.py
+++ b/picard/init.py
@@ -22,7 +22,7 @@ import re

 PICARD_APP_NAME = "Picard"
 PICARD_ORG_NAME = "MusicBrainz"
-PICARD_VERSION = (1, 4, 0, 'dev', 7)
+PICARD_VERSION = (1, 4, 1, 'dev', 1)

 # optional build version
 # it should be in the form '<platform>_<YYMMDDHHMMSS>'
@@ -58,7 +58,7 @@ def version_to_string(version, short=False):
    return version_str


-_version_re = re.compile("(\d+)[._](\d+)(?:[._](\d+)[._]?(?:(dev|final)[._]?(\d+))?)?$")
+_version_re = re.compile(r"(\d+)[._](\d+)(?:[._](\d+)[._]?(?:(dev|final)[._]?(\d+))?)?$")


 def version_from_string(version_str):
--- a/picard/album.py
+++ b/picard/album.py
@@ -32,6 +32,7 @@ from picard.track import Track
 from picard.script import ScriptParser
 from picard.ui.item import Item
 from picard.util import format_time, mbid_validate
+from picard.util.imagelist import ImageList, update_metadata_images
 from picard.util.textencoding import asciipunct
 from picard.cluster import Cluster
 from picard.collection import add_release_to_user_collections
@@ -58,6 +59,7 @@ class Album(DataObject, Item):
    def __init__(self, id, discid=None):
        DataObject.__init__(self, id)
        self.metadata = Metadata()
+        self.orig_metadata = Metadata()
        self.tracks = []
        self.loaded = False
        self.load_task = None
@@ -71,6 +73,7 @@ class Album(DataObject, Item):
        self.errors = []
        self.status = None
        self._album_artists = []
+        self.update_metadata_images_enabled = True

    def __repr__(self):
        return '<Album %s %r>' % (self.id, self.metadata[u"album"])
@@ -83,6 +86,9 @@ class Album(DataObject, Item):
            for file in self.unmatched_files.iterfiles():
                yield file

+    def enable_update_metadata_images(self, enabled):
+        self.update_metadata_images_enabled = enabled
+
    def append_album_artist(self, id):
        """Append artist id to the list of album artists
        and return an AlbumArtist instance"""
@@ -254,6 +260,7 @@ class Album(DataObject, Item):
            self._tracks_loaded = True

        if not self._requests:
+            self.enable_update_metadata_images(False)
            # Prepare parser for user's script
            if config.setting["enable_tagger_scripts"]:
                for s_pos, s_name, s_enabled, s_text in config.setting["list_of_scripts"]:
@@ -275,6 +282,7 @@ class Album(DataObject, Item):
                        self._new_metadata.strip_whitespace()

            for track in self.tracks:
+                track.metadata_images_changed.connect(self.update_metadata_images)
                for file in list(track.linked_files):
                    file.move(self.unmatched_files)
            self.metadata = self._new_metadata
@@ -284,6 +292,7 @@ class Album(DataObject, Item):
            self.loaded = True
            self.status = None
            self.match_files(self.unmatched_files.files)
+            self.enable_update_metadata_images(True)
            self.update()
            self.tagger.window.set_statusbar_message(
                N_('Album %(id)s loaded: %(artist)s - %(album)s'),
@@ -382,10 +391,14 @@ class Album(DataObject, Item):
    def _add_file(self, track, file):
        self._files += 1
        self.update(update_tracks=False)
+        file.metadata_images_changed.connect(self.update_metadata_images)
+        self.update_metadata_images()

    def _remove_file(self, track, file):
        self._files -= 1
        self.update(update_tracks=False)
+        file.metadata_images_changed.disconnect(self.update_metadata_images)
+        self.update_metadata_images()

    def match_files(self, files, use_recordingid=True):
        """Match files to tracks on this album, based on metadata similarity or recordingid."""
@@ -455,7 +468,7 @@ class Album(DataObject, Item):
        return True

    def can_view_info(self):
-        return (self.loaded and self.metadata and self.metadata.images) or self.errors
+        return (self.loaded and (self.metadata.images or self.orig_metadata.images)) or self.errors

    def is_album_like(self):
        return True
@@ -479,6 +492,8 @@ class Album(DataObject, Item):
        for track in self.tracks:
            if not track.is_complete():
                return False
+        if self.get_num_unmatched_files():
+            return False
        else:
            return True

@@ -517,8 +532,21 @@ class Album(DataObject, Item):
                unsaved = self.get_num_unsaved_files()
                if unsaved:
                    text += '; %d*' % (unsaved,)
-                text += ungettext("; %i image", "; %i images",
-                                  len(self.metadata.images)) % len(self.metadata.images)
+                # CoverArt.set_metadata uses the orig_metadata.images if metadata.images is empty
+                # in order to show existing cover art if there's no cover art for a release. So
+                # we do the same here in order to show the number of images consistently.
+                if self.metadata.images:
+                    metadata = self.metadata
+                else:
+                    metadata = self.orig_metadata
+
+                number_of_images = len(metadata.images)
+                if getattr(metadata, 'has_common_images', True):
+                    text += ungettext("; %i image", "; %i images",
+                                      number_of_images) % number_of_images
+                else:
+                    text += ungettext("; %i image not in all tracks", "; %i different images among tracks",
+                                      number_of_images) % number_of_images
                return text + ')'
            else:
                return title
@@ -550,6 +578,23 @@ class Album(DataObject, Item):
            self.tagger.albums[mbid] = self
            self.load(priority=True, refresh=True)

+    def update_metadata_images(self):
+        if not self.update_metadata_images_enabled:
+            return
+
+        update_metadata_images(self)
+
+        self.update(False)
+
+    def keep_original_images(self):
+        self.enable_update_metadata_images(False)
+        for track in self.tracks:
+            track.keep_original_images()
+        for file in list(self.unmatched_files.files):
+            file.keep_original_images()
+        self.enable_update_metadata_images(True)
+        self.update_metadata_images()
+

 class NatAlbum(Album):

--- a/picard/cluster.py
+++ b/picard/cluster.py
@@ -31,6 +31,7 @@ from picard.metadata import Metadata
 from picard.similarity import similarity
 from picard.ui.item import Item
 from picard.util import format_time, album_artist_from_path
+from picard.util.imagelist import ImageList, update_metadata_images
 from picard.const import QUERY_LIMIT


@@ -64,14 +65,23 @@ class Cluster(QtCore.QObject, Item):
    def __len__(self):
        return len(self.files)

+    def _update_related_album(self):
+        if self.related_album:
+            self.related_album.update_metadata_images()
+            self.related_album.update()
+
    def add_files(self, files):
        for file in files:
            self.metadata.length += file.metadata.length
            file._move(self)
            file.update(signal=False)
+            cover = file.metadata.get_single_front_image()
+            if cover and cover[0] not in self.metadata.images:
+                self.metadata.append_image(cover[0])
        self.files.extend(files)
        self.metadata['totaltracks'] = len(self.files)
        self.item.add_files(files)
+        self._update_related_album()

    def add_file(self, file):
        self.metadata.length += file.metadata.length
@@ -79,7 +89,11 @@ class Cluster(QtCore.QObject, Item):
        self.metadata['totaltracks'] = len(self.files)
        file._move(self)
        file.update(signal=False)
+        cover = file.metadata.get_single_front_image()
+        if cover and cover[0] not in self.metadata.images:
+            self.metadata.append_image(cover[0])
        self.item.add_file(file)
+        self._update_related_album()

    def remove_file(self, file):
        self.metadata.length -= file.metadata.length
@@ -88,6 +102,8 @@ class Cluster(QtCore.QObject, Item):
        self.item.remove_file(file)
        if not self.special and self.get_num_files() == 0:
            self.tagger.remove_cluster(self)
+        self.update_metadata_images()
+        self._update_related_album()

    def update(self):
        if self.item:
@@ -263,6 +279,9 @@ class Cluster(QtCore.QObject, Item):

            yield album_name, artist_name, (files[i] for i in album)

+    def update_metadata_images(self):
+        update_metadata_images(self)
+

 class UnmatchedFiles(Cluster):

@@ -295,6 +314,9 @@ class UnmatchedFiles(Cluster):
    def can_view_info(self):
        return False

+    def can_remove(self):
+        return True
+

 class ClusterList(list, Item):

--- a/picard/config.py
+++ b/picard/config.py
@@ -18,8 +18,6 @@
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.

 from __future__ import print_function
-import re
-import sys
 from operator import itemgetter
 from PyQt4 import QtCore
 from picard import (PICARD_APP_NAME, PICARD_ORG_NAME, PICARD_VERSION,
@@ -92,11 +90,13 @@ class Config(QtCore.QSettings):

    """Configuration."""

-    def __init__(self, app):
-        """Initializes the configuration."""
+    def __init__(self):
+        pass
+
+    def __initialize(self):
+        """Common initializer method for :meth:`from_app` and
+        :meth:`from_file`."""

-        QtCore.QSettings.__init__(self, QtCore.QSettings.IniFormat,
-                                  QtCore.QSettings.UserScope, PICARD_ORG_NAME, PICARD_APP_NAME, app)
        # If there are no settings, copy existing settings from old format
        # (registry on windows systems)
        if not self.allKeys():
@@ -115,6 +115,27 @@ class Config(QtCore.QSettings):
        self._version = version_from_string(self.application["version"])
        self._upgrade_hooks = dict()

+    @classmethod
+    def from_app(cls, parent):
+        """Build a Config object using the default configuration file
+        location."""
+        this = cls()
+        QtCore.QSettings.__init__(this, QtCore.QSettings.IniFormat,
+                                  QtCore.QSettings.UserScope, PICARD_ORG_NAME,
+                                  PICARD_APP_NAME, parent)
+        this.__initialize()
+        return this
+
+    @classmethod
+    def from_file(cls, parent, filename):
+        """Build a Config object using a user-provided configuration file
+        path."""
+        this = cls()
+        QtCore.QSettings.__init__(this, filename, QtCore.QSettings.IniFormat,
+                                  parent)
+        this.__initialize()
+        return this
+
    def switchProfile(self, profilename):
        """Sets the current profile."""
        key = u"profile/%s" % (profilename,)
@@ -245,8 +266,12 @@ config = None
 setting = None
 persist = None

-def _setup(app):
+
+def _setup(app, filename=None):
    global config, setting, persist
-    config = Config(app)
+    if filename is None:
+        config = Config.from_app(app)
+    else:
+        config = Config.from_file(app, filename)
    setting = config.setting
    persist = config.persist
--- a/picard/const/init.py
+++ b/picard/const/init.py
@@ -48,7 +48,7 @@ MUSICBRAINZ_OAUTH_CLIENT_SECRET = 'xIsvXbIuntaLuRRhzuazOA'

 # Cover art archive URL and port
 CAA_HOST = "coverartarchive.org"
-CAA_PORT = 80
+CAA_PORT = 443

 # URLs
 PICARD_URLS = {
@@ -113,3 +113,6 @@ PLUGINS_API = {

 # Default query limit
 QUERY_LIMIT = 25
+
+# Maximum number of covers to draw in a stack in CoverArtThumbnail
+MAX_COVERS_TO_STACK = 4
--- a/picard/const/languages.py
+++ b/picard/const/languages.py
@@ -54,7 +54,7 @@ UI_LANGUAGES = [
    #(u'kn', u'ಕನ್ನಡ', N_(u'Kannada')),
    #(u'ko', u'한국어', N_(u'Korean')),
    #(u'lt', u'Lietuvių', N_(u'Lithuanian')),
-    #(u'nb', u'Norsk bokmål', N_(u'Norwegian Bokmal')),
+    (u'nb', u'Norsk bokmål', N_(u'Norwegian Bokmal')),
    #(u'nds', u'Plattdüütsch', N_(u'Low German')),
    (u'nl', u'Nederlands', N_(u'Dutch')),
    #(u'oc', u'Occitan', N_(u'Occitan')),
--- a/picard/coverart/image.py
+++ b/picard/coverart/image.py
@@ -67,6 +67,12 @@ class DataHash:
        finally:
            _datafile_mutex.unlock()

+    def __eq__(self, other):
+        return self._hash == other._hash
+
+    def hash(self):
+        return self._hash
+
    def delete_file(self):
        if self._filename:
            try:
@@ -200,6 +206,22 @@ class CoverArtImage:
    def __str__(self):
        return unicode(self).encode('utf-8')

+    def __eq__(self, other):
+        if self and other:
+            if self.types and other.types:
+                return (self.datahash, self.types) == (other.datahash, other.types)
+            else:
+                return self.datahash == other.datahash
+        elif not self and not other:
+            return True
+        else:
+            return False
+
+    def __hash__(self):
+        if self.datahash is None:
+            return 0
+        return hash(self.datahash.hash())
+
    def set_data(self, data):
        """Store image data in a file, if data already exists in such file
           it will be re-used and no file write occurs
--- a/picard/coverart/providers/local.py
+++ b/picard/coverart/providers/local.py
@@ -33,7 +33,7 @@ class ProviderOptionsLocal(ProviderOptions):
        Options for Local Files cover art provider
    """

-    _DEFAULT_LOCAL_COVER_ART_REGEX = '^(?:cover|folder|albumart)(.*)\.(?:jpe?g|png|gif|tiff?)$'
+    _DEFAULT_LOCAL_COVER_ART_REGEX = r'^(?:cover|folder|albumart)(.*)\.(?:jpe?g|png|gif|tiff?)$'

    options = [
        config.TextOption("setting", "local_cover_regex",
--- a/picard/file.py
+++ b/picard/file.py
@@ -54,6 +54,8 @@ from picard.const import QUERY_LIMIT

 class File(QtCore.QObject, Item):

+    metadata_images_changed = QtCore.pyqtSignal()
+
    UNDEFINED = -1
    PENDING = 0
    NORMAL = 1
@@ -98,12 +100,27 @@ class File(QtCore.QObject, Item):

    def load(self, callback):
        thread.run_task(
-            partial(self._load, self.filename),
+            partial(self._load_check, self.filename),
            partial(self._loading_finished, callback),
            priority=1)

+    def _load_check(self, filename):
+        # Check that file has not been removed since thread was queued
+        # Don't load if we are stopping.
+        if self.state != File.PENDING:
+            log.debug("File not loaded because it was removed: %r", self.filename)
+            return None
+        if self.tagger.stopping:
+            log.debug("File not loaded because %s is stopping: %r", PICARD_APP_NAME, self.filename)
+            return None
+        return self._load(filename)
+
+    def _load(self, filename):
+        """Load metadata from the file."""
+        raise NotImplementedError
+
    def _loading_finished(self, callback, result=None, error=None):
-        if self.state != self.PENDING:
+        if self.state != File.PENDING or self.tagger.stopping:
            return
        if error is not None:
            self.error = str(error)
@@ -156,14 +173,16 @@ class File(QtCore.QObject, Item):

        if acoustid:
            self.metadata["acoustid_id"] = acoustid
+        self.metadata_images_changed.emit()
+
+    def keep_original_images(self):
+        self.metadata.images = self.orig_metadata.images[:]
+        self.update()
+        self.metadata_images_changed.emit()

    def has_error(self):
        return self.state == File.ERROR

-    def _load(self, filename):
-        """Load metadata from the file."""
-        raise NotImplementedError
-
    def save(self):
        self.set_pending()
        metadata = Metadata()
@@ -176,6 +195,14 @@ class File(QtCore.QObject, Item):

    def _save_and_rename(self, old_filename, metadata):
        """Save the metadata."""
+        # Check that file has not been removed since thread was queued
+        # Also don't save if we are stopping.
+        if self.state == File.REMOVED:
+            log.debug("File not saved because it was removed: %r", self.filename)
+            return None
+        if self.tagger.stopping:
+            log.debug("File not saved because %s is stopping: %r", PICARD_APP_NAME, self.filename)
+            return None
        new_filename = old_filename
        if not config.setting["dont_write_tags"]:
            encoded_old_filename = encode_filename(old_filename)
@@ -222,6 +249,11 @@ class File(QtCore.QObject, Item):
            raise OSError

    def _saving_finished(self, result=None, error=None):
+        # Handle file removed before save
+        # Result is None if save was skipped
+        if ((self.state == File.REMOVED or self.tagger.stopping)
+            and result is None):
+            return
        old_filename = new_filename = self.filename
        if error is not None:
            self.error = str(error)
@@ -244,11 +276,17 @@ class File(QtCore.QObject, Item):
            for k, v in temp_info.items():
                self.orig_metadata[k] = v
            self.error = None
-            self.clear_pending()
+            # Force update to ensure file status icon changes immediately after save
+            self.clear_pending(force_update=True)
            self._add_path_to_metadata(self.orig_metadata)
+            self.metadata_images_changed.emit()

-        del self.tagger.files[old_filename]
-        self.tagger.files[new_filename] = self
+        if self.state != File.REMOVED:
+            del self.tagger.files[old_filename]
+            self.tagger.files[new_filename] = self
+
+        if self.tagger.stopping:
+            log.debug("Save of %r completed before stopping Picard", self.filename)

    def _save(self, filename, metadata):
        """Save the metadata."""
@@ -445,9 +483,13 @@ class File(QtCore.QObject, Item):
                        self.state = File.CHANGED
                    break
        else:
-            self.similarity = 1.0
-            if self.state in (File.CHANGED, File.NORMAL):
-                self.state = File.NORMAL
+            if (self.metadata.images and
+               self.orig_metadata.images != self.metadata.images):
+                self.state = File.CHANGED
+            else:
+                self.similarity = 1.0
+                if self.state in (File.CHANGED, File.NORMAL):
+                    self.state = File.NORMAL
        if signal:
            log.debug("Updating file %r", self)
            if self.item:
@@ -611,10 +653,12 @@ class File(QtCore.QObject, Item):
            self.state = File.PENDING
            self.update()

-    def clear_pending(self):
+    def clear_pending(self, force_update=False):
        if self.state == File.PENDING:
            self.state = File.NORMAL
            self.update()
+        elif force_update:
+            self.update()

    def iterfiles(self, save=False):
        yield self
--- a/picard/formats/init.py
+++ b/picard/formats/init.py
@@ -86,107 +86,6 @@ def open(filename):
        return None


-def _insert_bytes_no_mmap(fobj, size, offset, BUFFER_SIZE=2**16):
-    """Insert size bytes of empty space starting at offset.
-
-    fobj must be an open file object, open rb+ or
-    equivalent. Mutagen tries to use mmap to resize the file, but
-    falls back to a significantly slower method if mmap fails.
-    """
-    assert 0 < size
-    assert 0 <= offset
-    locked = False
-    fobj.seek(0, 2)
-    filesize = fobj.tell()
-    movesize = filesize - offset
-    fobj.write('\x00' * size)
-    fobj.flush()
-    try:
-        locked = _win32_locking(fobj, filesize, msvcrt.LK_LOCK)
-        fobj.truncate(filesize)
-
-        fobj.seek(0, 2)
-        padsize = size
-        # Don't generate an enormous string if we need to pad
-        # the file out several megs.
-        while padsize:
-            addsize = min(BUFFER_SIZE, padsize)
-            fobj.write("\x00" * addsize)
-            padsize -= addsize
-
-        fobj.seek(filesize, 0)
-        while movesize:
-            # At the start of this loop, fobj is pointing at the end
-            # of the data we need to move, which is of movesize length.
-            thismove = min(BUFFER_SIZE, movesize)
-            # Seek back however much we're going to read this frame.
-            fobj.seek(-thismove, 1)
-            nextpos = fobj.tell()
-            # Read it, so we're back at the end.
-            data = fobj.read(thismove)
-            # Seek back to where we need to write it.
-            fobj.seek(-thismove + size, 1)
-            # Write it.
-            fobj.write(data)
-            # And seek back to the end of the unmoved data.
-            fobj.seek(nextpos)
-            movesize -= thismove
-
-        fobj.flush()
-    finally:
-        if locked:
-            _win32_locking(fobj, filesize, msvcrt.LK_UNLCK)
-
-
-def _delete_bytes_no_mmap(fobj, size, offset, BUFFER_SIZE=2**16):
-    """Delete size bytes of empty space starting at offset.
-
-    fobj must be an open file object, open rb+ or
-    equivalent. Mutagen tries to use mmap to resize the file, but
-    falls back to a significantly slower method if mmap fails.
-    """
-    locked = False
-    assert 0 < size
-    assert 0 <= offset
-    fobj.seek(0, 2)
-    filesize = fobj.tell()
-    movesize = filesize - offset - size
-    assert 0 <= movesize
-    try:
-        if movesize > 0:
-            fobj.flush()
-            locked = _win32_locking(fobj, filesize, msvcrt.LK_LOCK)
-            fobj.seek(offset + size)
-            buf = fobj.read(BUFFER_SIZE)
-            while buf:
-                fobj.seek(offset)
-                fobj.write(buf)
-                offset += len(buf)
-                fobj.seek(offset + size)
-                buf = fobj.read(BUFFER_SIZE)
-        fobj.truncate(filesize - size)
-        fobj.flush()
-    finally:
-        if locked:
-            _win32_locking(fobj, filesize, msvcrt.LK_UNLCK)
-
-
-def _win32_locking(fobj, nbytes, mode):
-    try:
-        fobj.seek(0)
-        msvcrt.locking(fobj.fileno(), mode, nbytes)
-    except IOError:
-        return False
-    else:
-        return True
-
-
-if sys.platform == 'win32':
-    import msvcrt
-    _util.insert_bytes = _insert_bytes_no_mmap
-    _util.delete_bytes = _delete_bytes_no_mmap
-
-
 from picard.formats.id3 import (
    AiffFile,
    MP3File,
--- a/picard/formats/apev2.py
+++ b/picard/formats/apev2.py
@@ -175,7 +175,7 @@ class APEv2File(File):
        for tag in metadata.deleted_tags:
            real_name = str(self._get_tag_name(tag))
            if real_name in ('Lyrics', 'Comment', 'Performer'):
-                tag_type = "\(%s\)" % tag.split(':', 1)[1]
+                tag_type = r"\(%s\)" % tag.split(':', 1)[1]
                for item in tags.get(real_name):
                    if re.search(tag_type, item):
                        tags.get(real_name).remove(item)
--- a/picard/formats/id3.py
+++ b/picard/formats/id3.py
@@ -175,6 +175,16 @@ class ID3File(File):
        'TPOS': re.compile(r'^(?P<discnumber>\d+)(?:/(?P<totaldiscs>\d+))?$')
    }

+    def build_TXXX(self, encoding, desc, values):
+        """Construct and return a TXXX frame."""
+        # This is here so that plugins can customize the behavior of TXXX
+        # frames in particular via subclassing.
+        # discussion: https://github.com/metabrainz/picard/pull/634
+        # discussion: https://github.com/metabrainz/picard/pull/635
+        # Used in the plugin "Compatible TXXX frames"
+        # PR: https://github.com/metabrainz/picard-plugins/pull/83
+        return id3.TXXX(encoding=encoding, desc=desc, text=values)
+
    def _load(self, filename):
        log.debug("Loading file %r", filename)
        file = self._get_file(encode_filename(filename))
@@ -365,7 +375,7 @@ class ID3File(File):
                    if frameid == 'WCOP':
                        # Only add WCOP if there is only one license URL, otherwise use TXXX:LICENSE
                        if len(values) > 1 or not valid_urls:
-                            tags.add(id3.TXXX(encoding=encoding, desc=self.__rtranslate_freetext[name], text=values))
+                            tags.add(self.build_TXXX(encoding, self.__rtranslate_freetext[name], values))
                        else:
                            tags.add(id3.WCOP(url=values[0]))
                    elif frameid == 'WOAR' and valid_urls:
@@ -374,7 +384,7 @@ class ID3File(File):
                elif frameid.startswith('T'):
                    if config.setting['write_id3v23']:
                        if frameid == 'TMOO':
-                            tags.add(id3.TXXX(encoding=encoding, desc='mood', text=values))
+                            tags.add(self.build_TXXX(encoding, 'mood', values))
                    # No need to care about the TMOO tag being added again as it is
                    # automatically deleted by Mutagen if id2v23 is selected
                    tags.add(getattr(id3, frameid)(encoding=encoding, text=values))
@@ -385,18 +395,18 @@ class ID3File(File):
                    elif frameid == 'TSO2':
                        tags.delall('TXXX:ALBUMARTISTSORT')
            elif name in self.__rtranslate_freetext:
-                tags.add(id3.TXXX(encoding=encoding, desc=self.__rtranslate_freetext[name], text=values))
+                tags.add(self.build_TXXX(encoding, self.__rtranslate_freetext[name], values))
            elif name.startswith('~id3:'):
                name = name[5:]
                if name.startswith('TXXX:'):
-                    tags.add(id3.TXXX(encoding=encoding, desc=name[5:], text=values))
+                    tags.add(self.build_TXXX(encoding, name[5:], values))
                else:
                    frameclass = getattr(id3, name[:4], None)
                    if frameclass:
                        tags.add(frameclass(encoding=encoding, text=values))
            # don't save private / already stored tags
            elif not name.startswith("~") and name not in self.__other_supported_tags:
-                tags.add(id3.TXXX(encoding=encoding, desc=name, text=values))
+                tags.add(self.build_TXXX(encoding, name, values))

        tags.add(tmcl)
        tags.add(tipl)
--- a/picard/formats/vorbis.py
+++ b/picard/formats/vorbis.py
@@ -227,7 +227,7 @@ class VCommentFile(File):
            real_name = self._get_tag_name(tag)
            if real_name and real_name in tags:
                if real_name in ('performer', 'comment'):
-                    tag_type = "\(%s\)" % tag.split(':', 1)[1]
+                    tag_type = r"\(%s\)" % tag.split(':', 1)[1]
                    for item in tags.get(real_name):
                        if re.search(tag_type, item):
                            tags.get(real_name).remove(item)
--- a/picard/mbxml.py
+++ b/picard/mbxml.py
@@ -202,7 +202,7 @@ def artist_credit_to_metadata(node, m, release=False):
        m["artist"] = artist
        m["artistsort"] = artistsort
        m["artists"] = artists
-        m["~artists_sort"] = artistsort
+        m["~artists_sort"] = artistssort


 def country_list_from_node(node):
--- a/picard/metadata.py
+++ b/picard/metadata.py
@@ -25,6 +25,7 @@ from picard.util import (
    linear_combination_of_weights,
 )
 from picard.mbxml import artist_credit_from_node
+from picard.util.imagelist import ImageList

 MULTI_VALUED_JOINER = '; '

@@ -45,13 +46,21 @@ class Metadata(dict):

    def __init__(self):
        super(Metadata, self).__init__()
-        self.images = []
+        self.images = ImageList()
        self.deleted_tags = set()
        self.length = 0

+    def __nonzero__(self):
+        return len(self) or len(self.images)
+
    def append_image(self, coverartimage):
        self.images.append(coverartimage)

+    def set_front_image(self, coverartimage):
+        # First remove all front images
+        self.images[:] = [img for img in self.images if not img.is_front_image()]
+        self.images.append(coverartimage)
+
    @property
    def images_to_be_saved_to_tags(self):
        if not config.setting["save_images_to_tags"]:
@@ -233,7 +242,7 @@ class Metadata(dict):

    def clear(self):
        dict.clear(self)
-        self.images = []
+        self.images = ImageList()
        self.length = 0
        self.deleted_tags = set()

--- a/picard/oauth.py
+++ b/picard/oauth.py
@@ -74,7 +74,7 @@ class OAuthManager(object):
                  MUSICBRAINZ_OAUTH_CLIENT_ID, "redirect_uri":
                  "urn:ietf:wg:oauth:2.0:oob", "scope": scopes}
        url = build_qurl(host, port, path="/oauth2/authorize",
-                         queryargs=params, mblogin=True)
+                         queryargs=params)
        return str(url.toEncoded())

    def set_refresh_token(self, refresh_token, scopes):
--- a/picard/script.py
+++ b/picard/script.py
@@ -127,7 +127,7 @@ def isidentif(ch):

 class ScriptParser(object):

-    """Tagger script parser.
+    r"""Tagger script parser.

 Grammar:
  text       ::= [^$%] | '\$' | '\%' | '\(' | '\)' | '\,'
@@ -373,7 +373,7 @@ def func_pad(parser, text, length, char):


 def func_strip(parser, text):
-    return re.sub("\s+", " ", text).strip()
+    return re.sub(r"\s+", " ", text).strip()


 def func_replace(parser, text, old, new):
--- a/picard/similarity.py
+++ b/picard/similarity.py
@@ -40,7 +40,7 @@ def similarity(a1, b1):
    return astrcmp(a2, b2)


-_split_words_re = re.compile('\W+', re.UNICODE)
+_split_words_re = re.compile(r'\W+', re.UNICODE)


 def similarity2(a, b):
--- a/picard/tagger.py
+++ b/picard/tagger.py
@@ -49,11 +49,9 @@ _orig_shutil_copystat = shutil.copystat
 shutil.copystat = _patched_shutil_copystat

 import picard.resources
-import picard.plugins
 from picard.i18n import setup_gettext

-from picard import (PICARD_APP_NAME, PICARD_ORG_NAME,
-                    PICARD_FANCY_VERSION_STR, __version__,
+from picard import (PICARD_APP_NAME, PICARD_ORG_NAME, PICARD_FANCY_VERSION_STR,
                    log, acoustid, config)
 from picard.album import Album, NatAlbum
 from picard.browser.browser import BrowserIntegration
@@ -107,7 +105,7 @@ class Tagger(QtGui.QApplication):
        QtGui.QApplication.__init__(self, ['MusicBrainz-Picard'] + unparsed_args)
        self.__class__.__instance = self

-        config._setup(self)
+        config._setup(self, picard_args.config_file)

        self._cmdline_files = picard_args.FILE
        self._autoupdate = autoupdate
@@ -214,6 +212,7 @@ class Tagger(QtGui.QApplication):
        self.nats = None
        self.window = MainWindow()
        self.exit_cleanup = []
+        self.stopping = False

    def register_cleanup(self, func):
        self.exit_cleanup.append(func)
@@ -269,15 +268,15 @@ class Tagger(QtGui.QApplication):
            self.nats.update()

    def exit(self):
-        log.debug("exit")
+        log.debug("Picard stopping")
        self.stopping = True
        self._acoustid.done()
        self.thread_pool.waitForDone()
        self.save_thread_pool.waitForDone()
        self.browser_integration.stop()
        self.xmlws.stop()
-        for f in self.exit_cleanup:
-            f()
+        self.run_cleanup()
+        QtCore.QCoreApplication.processEvents()

    def _run_init(self):
        if self._cmdline_files:
@@ -334,6 +333,9 @@ class Tagger(QtGui.QApplication):
                self.analyze([file])

    def move_files(self, files, target):
+        if target is None:
+            log.debug("Aborting move since target is invalid")
+            return
        if isinstance(target, (Track, Cluster)):
            for file in files:
                file.move(target)
@@ -602,6 +604,8 @@ class Tagger(QtGui.QApplication):
                    }
                )
                self.remove_album(obj)
+            elif isinstance(obj, UnmatchedFiles):
+                files.extend(list(obj.files))
            elif isinstance(obj, Cluster):
                self.remove_cluster(obj)
        if files:
@@ -735,6 +739,9 @@ def process_picard_args():
    parser = argparse.ArgumentParser(
        epilog="If one of the filenames begins with a hyphen, use -- to separate the options from the filenames."
    )
+    parser.add_argument("-c", "--config-file", action='store',
+                        default=None,
+                        help="location of the configuration file")
    parser.add_argument("-d", "--debug", action='store_true',
                        help="enable debug-level logging")
    parser.add_argument('-v', '--version', action='store_true',
--- a/picard/track.py
+++ b/picard/track.py
@@ -19,6 +19,7 @@
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.

 from functools import partial
+from PyQt4 import QtCore
 from picard import config, log
 from picard.metadata import Metadata, run_track_metadata_processors
 from picard.dataobj import DataObject
@@ -27,6 +28,7 @@ from picard.mbxml import recording_to_metadata
 from picard.script import ScriptParser
 from picard.const import VARIOUS_ARTISTS_ID, SILENCE_TRACK_TITLE, DATA_TRACK_TITLE
 from picard.ui.item import Item
+from picard.util.imagelist import ImageList, update_metadata_images
 import traceback


@@ -44,12 +46,15 @@ class TrackArtist(DataObject):

 class Track(DataObject, Item):

+    metadata_images_changed = QtCore.pyqtSignal()
+
    def __init__(self, id, album=None):
        DataObject.__init__(self, id)
        self.album = album
        self.linked_files = []
        self.num_linked_files = 0
        self.metadata = Metadata()
+        self.orig_metadata = Metadata()
        self._track_artists = []

    def __repr__(self):
@@ -61,6 +66,7 @@ class Track(DataObject, Item):
            self.num_linked_files += 1
        self.album._add_file(self, file)
        self.update_file_metadata(file)
+        file.metadata_images_changed.connect(self.update_orig_metadata_images)

    def update_file_metadata(self, file):
        if file not in self.linked_files:
@@ -78,11 +84,13 @@ class Track(DataObject, Item):
        self.num_linked_files -= 1
        file.copy_metadata(file.orig_metadata)
        self.album._remove_file(self, file)
+        file.metadata_images_changed.disconnect(self.update_orig_metadata_images)
        self.update()

    def update(self):
        if self.item:
            self.item.update()
+        self.update_orig_metadata_images()

    def iterfiles(self, save=False):
        for file in self.linked_files:
@@ -110,7 +118,7 @@ class Track(DataObject, Item):
        return True

    def can_view_info(self):
-        return self.num_linked_files == 1
+        return self.num_linked_files == 1 or self.metadata.images

    def column(self, column):
        m = self.metadata
@@ -217,6 +225,19 @@ class Track(DataObject, Item):
            tags = [s.strip().lower() for s in ignore_tags.split(',')]
        return tags

+    def update_orig_metadata_images(self):
+        update_metadata_images(self)
+
+    def keep_original_images(self):
+        for file in self.linked_files:
+            file.keep_original_images()
+        if self.linked_files:
+            self.update_orig_metadata_images()
+            self.metadata.images = self.orig_metadata.images[:]
+        else:
+            self.metadata.images = []
+        self.update()
+

 class NonAlbumTrack(Track):

--- a/picard/ui/coverartbox.py
+++ b/picard/ui/coverartbox.py
@@ -18,6 +18,7 @@
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.

 import os
+import sys
 from functools import partial
 from PyQt4 import QtCore, QtGui, QtNetwork
 from picard import config, log
@@ -25,21 +26,30 @@ from picard.album import Album
 from picard.coverart.image import CoverArtImage, CoverArtImageError
 from picard.track import Track
 from picard.file import File
-from picard.util import encode_filename
+from picard.util import imageinfo
+from picard.util.lrucache import LRUCache
+from picard.const import MAX_COVERS_TO_STACK
+
+if sys.platform == 'darwin':
+    try:
+        from Foundation import NSURL
+        NSURL_IMPORTED = True
+    except ImportError:
+        NSURL_IMPORTED = False
+        log.warning("Unable to import NSURL, file drag'n'drop might not work correctly")


 class ActiveLabel(QtGui.QLabel):
-
    """Clickable QLabel."""

    clicked = QtCore.pyqtSignal()
-    imageDropped = QtCore.pyqtSignal(QtCore.QUrl)
+    image_dropped = QtCore.pyqtSignal(QtCore.QUrl, QtCore.QByteArray)

-    def __init__(self, active=True, *args):
+    def __init__(self, active=True, drops=False, *args):
        QtGui.QLabel.__init__(self, *args)
        self.setMargin(0)
        self.setActive(active)
-        self.setAcceptDrops(False)
+        self.setAcceptDrops(drops)

    def setActive(self, active):
        self.active = active
@@ -54,96 +64,174 @@ class ActiveLabel(QtGui.QLabel):

    def dragEnterEvent(self, event):
        for url in event.mimeData().urls():
-            if url.scheme() in ('http', 'file'):
+            if url.scheme() in ('https', 'http', 'file'):
                event.acceptProposedAction()
                break

    def dropEvent(self, event):
        accepted = False
+        # Chromium includes the actual data of the dragged image in the drop event. This
+        # is useful for Google Images, where the url links to the page that contains the image
+        # so we use it if the downloaded url is not an image.
+        dropped_data = event.mimeData().data('application/octet-stream')
        for url in event.mimeData().urls():
-            if url.scheme() in ('http', 'file'):
+            if url.scheme() in ('https', 'http', 'file'):
                accepted = True
-                self.imageDropped.emit(url)
+                self.image_dropped.emit(url, dropped_data)
        if accepted:
            event.acceptProposedAction()


-class CoverArtBox(QtGui.QGroupBox):
+class CoverArtThumbnail(ActiveLabel):

-    def __init__(self, parent):
-        QtGui.QGroupBox.__init__(self, "")
-        self.layout = QtGui.QVBoxLayout()
-        self.layout.setSpacing(0)
-        # Kills off any borders
-        self.setStyleSheet('''QGroupBox{background-color:none;border:1px;}''')
-        self.setFlat(True)
-        self.release = None
+    def __init__(self, active=False, drops=False, pixmap_cache=None, *args, **kwargs):
+        super(CoverArtThumbnail, self).__init__(active, drops, *args, **kwargs)
        self.data = None
-        self.item = None
+        self.has_common_images = None
        self.shadow = QtGui.QPixmap(":/images/CoverArtShadow.png")
-        self.coverArt = ActiveLabel(False, parent)
-        self.coverArt.setPixmap(self.shadow)
-        self.coverArt.setAlignment(QtCore.Qt.AlignTop | QtCore.Qt.AlignHCenter)
-        self.coverArt.clicked.connect(self.open_release_page)
-        self.coverArt.imageDropped.connect(self.fetch_remote_image)
-        self.layout.addWidget(self.coverArt, 0)
-        self.setLayout(self.layout)
+        self.release = None
+        self.setPixmap(self.shadow)
+        self.setAlignment(QtCore.Qt.AlignTop | QtCore.Qt.AlignHCenter)
+        self.clicked.connect(self.open_release_page)
+        self.image_dropped.connect(self.fetch_remote_image)
+        self.related_images = []
+        self._pixmap_cache = pixmap_cache
+        self.current_pixmap_key = None
+
+    def __eq__(self, other):
+        if len(self.data) or len(other.data):
+            return self.current_pixmap_key == other.current_pixmap_key
+        else:
+            return True

    def show(self):
-        self.__set_data(self.data, True)
-        QtGui.QGroupBox.show(self)
+        self.set_data(self.data, True)

-    def __set_data(self, data, force=False, pixmap=None):
-        if not force and self.data == data:
+    def decorate_cover(self, pixmap):
+        offx, offy, w, h = (1, 1, 121, 121)
+        cover = QtGui.QPixmap(self.shadow)
+        pixmap = pixmap.scaled(w, h, QtCore.Qt.KeepAspectRatio, QtCore.Qt.SmoothTransformation)
+        painter = QtGui.QPainter(cover)
+        bgcolor = QtGui.QColor.fromRgb(0, 0, 0, 128)
+        painter.fillRect(QtCore.QRectF(offx, offy, w, h), bgcolor)
+        x = offx + (w - pixmap.width()) / 2
+        y = offy + (h - pixmap.height()) / 2
+        painter.drawPixmap(x, y, pixmap)
+        painter.end()
+        return cover
+
+    def set_data(self, data, force=False, has_common_images=True):
+        if not force and self.data == data and self.has_common_images == has_common_images:
            return

        self.data = data
-        if not force and self.isHidden():
+        self.has_common_images = has_common_images
+
+        if not force and self.parent().isHidden():
            return

-        cover = self.shadow
-        if self.data:
-            if pixmap is None:
-                pixmap = QtGui.QPixmap()
-                pixmap.loadFromData(self.data.data)
-            if not pixmap.isNull():
-                offx, offy, w, h = (1, 1, 121, 121)
-                cover = QtGui.QPixmap(self.shadow)
-                pixmap = pixmap.scaled(w, h, QtCore.Qt.KeepAspectRatio, QtCore.Qt.SmoothTransformation)
-                painter = QtGui.QPainter(cover)
-                bgcolor = QtGui.QColor.fromRgb(0, 0, 0, 128)
-                painter.fillRect(QtCore.QRectF(offx, offy, w, h), bgcolor)
-                x = offx + (w - pixmap.width()) / 2
-                y = offy + (h - pixmap.height()) / 2
-                painter.drawPixmap(x, y, pixmap)
-                painter.end()
-        self.coverArt.setPixmap(cover)
+        if not self.data:
+            self.setPixmap(self.shadow)
+            self.current_pixmap_key = None
+            return

-    def set_metadata(self, metadata, item):
-        self.item = item
-        data = None
-        if metadata and metadata.images:
-            for image in metadata.images:
-                if image.is_front_image():
-                    data = image
-                    break
+        if len(self.data) == 1:
+            has_common_images = True
+
+        w, h, displacements = (128, 128, 20)
+        key = hash(tuple(sorted(self.data)) + (has_common_images,))
+        try:
+            pixmap = self._pixmap_cache[key]
+        except KeyError:
+            if len(self.data) == 1:
+                pixmap = QtGui.QPixmap()
+                pixmap.loadFromData(self.data[0].data)
+                pixmap = self.decorate_cover(pixmap)
            else:
+                limited = len(self.data) > MAX_COVERS_TO_STACK
+                if limited:
+                    data_to_paint = data[:MAX_COVERS_TO_STACK - 1]
+                    offset = displacements * len(data_to_paint)
+                else:
+                    data_to_paint = data
+                    offset = displacements * (len(data_to_paint) - 1)
+                stack_width, stack_height = (w + offset, h + offset)
+                pixmap = QtGui.QPixmap(stack_width, stack_height)
+                bgcolor = self.palette().color(QtGui.QPalette.Window)
+                painter = QtGui.QPainter(pixmap)
+                painter.fillRect(QtCore.QRectF(0, 0, stack_width, stack_height), bgcolor)
+                cx = stack_width - w / 2
+                cy = h / 2
+                if limited:
+                    x, y = (cx - self.shadow.width() / 2, cy - self.shadow.height() / 2)
+                    for i in range(3):
+                        painter.drawPixmap(x, y, self.shadow)
+                        x -= displacements / 3
+                        y += displacements / 3
+                    cx -= displacements
+                    cy += displacements
+                else:
+                    cx = stack_width - w / 2
+                    cy = h / 2
+                for image in reversed(data_to_paint):
+                    if isinstance(image, QtGui.QPixmap):
+                        thumb = image
+                    else:
+                        thumb = QtGui.QPixmap()
+                        thumb.loadFromData(image.data)
+                    thumb = self.decorate_cover(thumb)
+                    x, y = (cx - thumb.width() / 2, cy - thumb.height() / 2)
+                    painter.drawPixmap(x, y, thumb)
+                    cx -= displacements
+                    cy += displacements
+                if not has_common_images:
+                    color = QtGui.QColor("darkgoldenrod")
+                    border_length = 10
+                    for k in range(border_length):
+                        color.setAlpha(255 - k * 255 / border_length)
+                        painter.setPen(color)
+                        painter.drawLine(x, y - k - 1, x + 121 + k + 1, y - k - 1)
+                        painter.drawLine(x + 121 + k + 2, y - 1 - k, x + 121 + k + 2, y + 121 + 4)
+                    for k in range(5):
+                        bgcolor.setAlpha(80 + k * 255 / 7)
+                        painter.setPen(bgcolor)
+                        painter.drawLine(x + 121 + 2, y + 121 + 2 + k, x + 121 + border_length + 2, y + 121 + 2 + k)
+                painter.end()
+                pixmap = pixmap.scaled(w, h, QtCore.Qt.KeepAspectRatio, QtCore.Qt.SmoothTransformation)
+            self._pixmap_cache[key] = pixmap
+
+        self.setPixmap(pixmap)
+        self.current_pixmap_key = key
+
+    def set_metadata(self, metadata):
+        data = None
+        self.related_images = []
+        if metadata and metadata.images:
+            self.related_images = metadata.images
+            data = [image for image in metadata.images if image.is_front_image()]
+            if not data:
                # There's no front image, choose the first one available
-                data = metadata.images[0]
-        self.__set_data(data)
-        if item and metadata:
-            self.coverArt.setAcceptDrops(True)
-        else:
-            self.coverArt.setAcceptDrops(False)
+                data = [metadata.images[0]]
+        has_common_images = getattr(metadata, 'has_common_images', True)
+        self.set_data(data, has_common_images=has_common_images)
        release = None
        if metadata:
            release = metadata.get("musicbrainz_albumid", None)
        if release:
-            self.coverArt.setActive(True)
-            self.coverArt.setToolTip(_(u"View release on MusicBrainz"))
+            self.setActive(True)
+            text = _(u"View release on MusicBrainz")
        else:
-            self.coverArt.setActive(False)
-            self.coverArt.setToolTip("")
+            self.setActive(False)
+            text = ""
+        if hasattr(metadata, 'has_common_images'):
+            if has_common_images:
+                note = _(u'Common images on all tracks')
+            else:
+                note = _(u'Tracks contain different images')
+            if text:
+                text += '<br />'
+            text += '<i>%s</i>' % note
+        self.setToolTip(text)
        self.release = release

    def open_release_page(self):
@@ -151,59 +239,224 @@ class CoverArtBox(QtGui.QGroupBox):
        lookup.albumLookup(self.release)

    def fetch_remote_image(self, url):
+        return self.parent().fetch_remote_image(url)
+
+
+def set_image_replace(obj, coverartimage):
+    obj.metadata.set_front_image(coverartimage)
+
+
+def set_image_append(obj, coverartimage):
+    obj.metadata.append_image(coverartimage)
+
+
+class CoverArtBox(QtGui.QGroupBox):
+
+    def __init__(self, parent):
+        QtGui.QGroupBox.__init__(self, "")
+        self.layout = QtGui.QVBoxLayout()
+        self.layout.setSpacing(6)
+        self.parent = parent
+        # Kills off any borders
+        self.setStyleSheet('''QGroupBox{background-color:none;border:1px;}''')
+        self.setFlat(True)
+        self.item = None
+        self.pixmap_cache = LRUCache(40)
+        self.cover_art_label = QtGui.QLabel('')
+        self.cover_art_label.setAlignment(QtCore.Qt.AlignTop | QtCore.Qt.AlignHCenter)
+        self.cover_art = CoverArtThumbnail(False, True, self.pixmap_cache, parent)
+        spacerItem = QtGui.QSpacerItem(40, 20, QtGui.QSizePolicy.Minimum, QtGui.QSizePolicy.Expanding)
+        self.orig_cover_art_label = QtGui.QLabel('')
+        self.orig_cover_art = CoverArtThumbnail(False, False, self.pixmap_cache, parent)
+        self.orig_cover_art_label.setAlignment(QtCore.Qt.AlignTop | QtCore.Qt.AlignHCenter)
+        self.show_details_button = QtGui.QPushButton(_(u'Show more details'), self)
+        self.layout.addWidget(self.cover_art_label)
+        self.layout.addWidget(self.cover_art)
+        self.layout.addWidget(self.orig_cover_art_label)
+        self.layout.addWidget(self.orig_cover_art)
+        self.layout.addWidget(self.show_details_button)
+        self.layout.addSpacerItem(spacerItem)
+        self.setLayout(self.layout)
+        self.orig_cover_art.setHidden(True)
+        self.show_details_button.setHidden(True)
+        self.show_details_button.clicked.connect(self.show_cover_art_info)
+
+    def show_cover_art_info(self):
+        self.parent.view_info(default_tab=1)
+
+    def update_display(self, force=False):
+        if self.isHidden():
+            if not force:
+                # If the Cover art box is hidden and selection is updated
+                # we should not update the display of child widgets
+                return
+            else:
+                # Coverart box display was toggled.
+                # Update the pixmaps and display them
+                self.cover_art.show()
+                self.orig_cover_art.show()
+
+        # We want to show the 2 coverarts only if they are different
+        # and orig_cover_art data is set and not the default cd shadow
+        if self.orig_cover_art.data is None or self.cover_art == self.orig_cover_art:
+            self.show_details_button.setVisible(bool(self.item and self.item.can_view_info()))
+            self.orig_cover_art.setVisible(False)
+            self.cover_art_label.setText('')
+            self.orig_cover_art_label.setText('')
+        else:
+            self.show_details_button.setVisible(True)
+            self.orig_cover_art.setVisible(True)
+            self.cover_art_label.setText(_(u'New Cover Art'))
+            self.orig_cover_art_label.setText(_(u'Original Cover Art'))
+
+    def show(self):
+        self.update_display(True)
+        super(CoverArtBox, self).show()
+
+    def set_metadata(self, metadata, orig_metadata, item):
+        if not metadata or not metadata.images:
+            self.cover_art.set_metadata(orig_metadata)
+        else:
+            self.cover_art.set_metadata(metadata)
+        self.orig_cover_art.set_metadata(orig_metadata)
+        self.item = item
+        self.update_display()
+
+    def fetch_remote_image(self, url, fallback_data=None):
        if self.item is None:
            return
-        if url.scheme() == 'http':
+        if url.scheme() in ('https', 'http'):
            path = url.encodedPath()
            if url.hasQuery():
                path += '?' + url.encodedQuery()
-            self.tagger.xmlws.get(url.encodedHost(), url.port(80), path,
-                                  partial(self.on_remote_image_fetched, url),
+            if url.scheme() == 'https':
+                port = 443
+            else:
+                port = 80
+            self.tagger.xmlws.get(str(url.encodedHost()), url.port(port), str(path),
+                                  partial(self.on_remote_image_fetched, url, fallback_data=fallback_data),
                                  xml=False,
                                  priority=True, important=True)
        elif url.scheme() == 'file':
-            path = encode_filename(unicode(url.toLocalFile()))
-            if os.path.exists(path):
+            log.debug("Dropped the URL: %r", url.toString(QtCore.QUrl.RemoveUserInfo))
+            if sys.platform == 'darwin' and unicode(url.path()).startswith('/.file/id='):
+                # Workaround for https://bugreports.qt.io/browse/QTBUG-40449
+                # OSX Urls follow the NSURL scheme and need to be converted
+                if NSURL_IMPORTED:
+                    path = os.path.normpath(os.path.realpath(unicode(NSURL.URLWithString_(str(url.toString())).filePathURL().path()).rstrip("\0")))
+                    log.debug('OSX NSURL path detected. Dropped File is: %r', path)
+                else:
+                    log.error("Unable to get appropriate file path for %r", url.toString(QtCore.QUrl.RemoveUserInfo))
+            else:
+                # Dropping a file from iTunes gives a path with a NULL terminator
+                path = os.path.normpath(os.path.realpath(unicode(url.toLocalFile()).rstrip("\0")))
+            if path and os.path.exists(path):
                mime = 'image/png' if path.lower().endswith('.png') else 'image/jpeg'
                with open(path, 'rb') as f:
                    data = f.read()
                self.load_remote_image(url, mime, data)

-    def on_remote_image_fetched(self, url, data, reply, error):
+    def on_remote_image_fetched(self, url, data, reply, error, fallback_data=None):
        mime = reply.header(QtNetwork.QNetworkRequest.ContentTypeHeader)
        if mime in ('image/jpeg', 'image/png'):
            self.load_remote_image(url, mime, data)
-        elif reply.url().hasQueryItem("imgurl"):
+        elif url.hasQueryItem("imgurl"):
            # This may be a google images result, try to get the URL which is encoded in the query
-            url = QtCore.QUrl(reply.url().queryItemValue("imgurl"))
+            url = QtCore.QUrl(url.queryItemValue("imgurl"))
            self.fetch_remote_image(url)
        else:
-            log.warning("Can't load image with MIME-Type %s", mime)
+            log.warning("Can't load remote image with MIME-Type %s", mime)
+            if fallback_data:
+                # Tests for image format obtained from file-magic
+                try:
+                    mime = imageinfo.identify(fallback_data)[2]
+                except imageinfo.IdentificationError as e:
+                    log.error("Unable to identify dropped data format: %s" % e)
+                else:
+                    log.debug("Trying the dropped %s data", mime)
+                    self.load_remote_image(url, mime, fallback_data)

    def load_remote_image(self, url, mime, data):
        try:
            coverartimage = CoverArtImage(
                url=url.toString(),
+                types=[u'front'],
                data=data
            )
        except CoverArtImageError as e:
            log.warning("Can't load image: %s" % unicode(e))
            return
-        pixmap = QtGui.QPixmap()
-        pixmap.loadFromData(data)
-        self.__set_data([mime, data], pixmap=pixmap)
+
+        if config.setting["load_image_behavior"] == 'replace':
+            set_image = set_image_replace
+        else:
+            set_image = set_image_append
+
        if isinstance(self.item, Album):
            album = self.item
-            album.metadata.append_image(coverartimage)
+            album.enable_update_metadata_images(False)
+            set_image(album, coverartimage)
            for track in album.tracks:
-                track.metadata.append_image(coverartimage)
+                set_image(track, coverartimage)
+                track.metadata_images_changed.emit()
            for file in album.iterfiles():
-                file.metadata.append_image(coverartimage)
+                set_image(file, coverartimage)
+                file.metadata_images_changed.emit()
+                file.update()
+            album.enable_update_metadata_images(True)
+            album.update_metadata_images()
+            album.update(False)
        elif isinstance(self.item, Track):
            track = self.item
-            track.metadata.append_image(coverartimage)
+            track.album.enable_update_metadata_images(False)
+            set_image(track, coverartimage)
+            track.metadata_images_changed.emit()
            for file in track.iterfiles():
-                file.metadata.append_image(coverartimage)
+                set_image(file, coverartimage)
+                file.metadata_images_changed.emit()
+                file.update()
+            track.album.enable_update_metadata_images(True)
+            track.album.update_metadata_images()
+            track.album.update(False)
        elif isinstance(self.item, File):
            file = self.item
-            file.metadata.append_image(coverartimage)
+            set_image(file, coverartimage)
+            file.metadata_images_changed.emit()
+            file.update()
+        self.cover_art.set_metadata(self.item.metadata)
+        self.show()
+
+    def set_load_image_behavior(self, behavior):
+        config.setting["load_image_behavior"] = behavior
+
+    def contextMenuEvent(self, event):
+        menu = QtGui.QMenu(self)
+        if self.show_details_button.isVisible():
+            name = _(u'Show more details...')
+            show_more_details_action = QtGui.QAction(name, self.parent)
+            show_more_details_action.triggered.connect(self.show_cover_art_info)
+            menu.addAction(show_more_details_action)
+
+        if self.orig_cover_art.isVisible():
+            name = _(u'Keep original cover art')
+            use_orig_value_action = QtGui.QAction(name, self.parent)
+            use_orig_value_action.triggered.connect(self.item.keep_original_images)
+            menu.addAction(use_orig_value_action)
+
+        if not menu.isEmpty():
+            menu.addSeparator()
+
+        load_image_behavior_group = QtGui.QActionGroup(self.parent, exclusive=True)
+        action = load_image_behavior_group.addAction(QtGui.QAction(_(u'Replace front cover art on drop'), self.parent, checkable=True))
+        action.triggered.connect(partial(self.set_load_image_behavior, behavior='replace'))
+        if config.setting["load_image_behavior"] == 'replace':
+            action.setChecked(True)
+        menu.addAction(action)
+        action = load_image_behavior_group.addAction(QtGui.QAction(_(u'Append front cover art on drop'), self.parent, checkable=True))
+        action.triggered.connect(partial(self.set_load_image_behavior, behavior='append'))
+        if config.setting["load_image_behavior"] == 'append':
+            action.setChecked(True)
+        menu.addAction(action)
+
+        menu.exec_(event.globalPos())
+        event.accept()
--- a/picard/ui/infodialog.py
+++ b/picard/ui/infodialog.py
@@ -24,6 +24,7 @@ from PyQt4 import QtGui, QtCore
 from picard import log
 from picard.file import File
 from picard.track import Track
+from picard.album import Album
 from picard.coverart.image import CoverArtImageIOError
 from picard.util import format_time, encode_filename, bytes2human, webbrowser2, union_sorted_lists
 from picard.ui import PicardDialog
@@ -58,7 +59,7 @@ class ArtworkTable(QtGui.QTableWidget):
        image_label = QtGui.QLabel()
        text_label = QtGui.QLabel()
        layout = QtGui.QVBoxLayout()
-        image_label.setPixmap(pixmap.scaled(170,170,QtCore.Qt.KeepAspectRatio,
+        image_label.setPixmap(pixmap.scaled(170, 170, QtCore.Qt.KeepAspectRatio,
                                            QtCore.Qt.SmoothTransformation))
        image_label.setAlignment(QtCore.Qt.AlignCenter)
        text_label.setText(text)
@@ -98,14 +99,29 @@ class InfoDialog(PicardDialog):
    def __init__(self, obj, parent=None):
        PicardDialog.__init__(self, parent)
        self.obj = obj
+        self.images = []
+        self.existing_images = []
        self.ui = Ui_InfoDialog()
        self.display_existing_artwork = False
-        if isinstance(obj, File) and isinstance(obj.parent, Track) or \
-                isinstance(obj, Track):
-            # Display existing artwork only if selected object is track object
-            # or linked to a track object
-            self.display_existing_artwork = True

+        if (isinstance(obj, File) and
+                isinstance(obj.parent, Track) or
+                isinstance(obj, Track) or
+                (isinstance(obj, Album) and obj.get_num_total_files() > 0)):
+            # Display existing artwork only if selected object is track object
+            # or linked to a track object or it's an album with files
+            if (getattr(obj, 'orig_metadata', None) is not None and
+                    obj.orig_metadata.images and
+                    obj.orig_metadata.images != obj.metadata.images):
+                self.display_existing_artwork = True
+                self.existing_images = obj.orig_metadata.images
+
+        if obj.metadata.images:
+            self.images = obj.metadata.images
+        if not self.images and self.existing_images:
+            self.images = self.existing_images
+            self.existing_images = []
+            self.display_existing_artwork = False
        self.ui.setupUi(self)
        self.ui.buttonBox.accepted.connect(self.accept)
        self.ui.buttonBox.rejected.connect(self.reject)
@@ -185,9 +201,9 @@ class InfoDialog(PicardDialog):
        """Display image type in Type column.
        If both existing covers and new covers are to be displayed, take union of both cover types list.
        """
-        types = [image.types_as_string() for image in self.obj.metadata.images]
+        types = [image.types_as_string() for image in self.images]
        if self.display_existing_artwork:
-            existing_types = [image.types_as_string() for image in self.obj.orig_metadata.images]
+            existing_types = [image.types_as_string() for image in self.existing_images]
            # Merge both types and existing types list in sorted order.
            types = union_sorted_lists(types, existing_types)
        for row, type in enumerate(types):
@@ -198,21 +214,13 @@ class InfoDialog(PicardDialog):
            self.artwork_table.setCellWidget(row, self.artwork_table._type_col, type_wgt)
            self.artwork_table.setItem(row, self.artwork_table._type_col, item)

-    def arrange_images(self):
-        def get_image_type(image):
-            return image.types_as_string()
-        self.obj.metadata.images.sort(key=get_image_type)
-        if self.display_existing_artwork:
-            self.obj.orig_metadata.images.sort(key=get_image_type)
-
    def _display_artwork_tab(self):
-        if not self.obj.metadata.images:
+        if not self.images:
            self.tab_hide(self.ui.artwork_tab)
-        self.arrange_images()
        self._display_artwork_type()
-        self._display_artwork(self.obj.metadata.images, self.artwork_table._new_cover_col)
-        if self.display_existing_artwork:
-            self._display_artwork(self.obj.orig_metadata.images, self.artwork_table._existing_cover_col)
+        self._display_artwork(self.images, self.artwork_table._new_cover_col)
+        if self.existing_images:
+            self._display_artwork(self.existing_images, self.artwork_table._existing_cover_col)
        self.artwork_table.itemDoubleClicked.connect(self.show_item)

    def tab_hide(self, widget):
@@ -236,8 +244,8 @@ class FileInfoDialog(InfoDialog):
        InfoDialog.__init__(self, file, parent)
        self.setWindowTitle(_("Info") + " - " + file.base_filename)

-    def _display_info_tab(self):
-        file = self.obj
+    @staticmethod
+    def format_file_info(file):
        info = []
        info.append((_('Filename:'), file.filename))
        if '~format' in file.orig_metadata:
@@ -265,9 +273,13 @@ class FileInfoDialog(InfoDialog):
            else:
                ch = str(ch)
            info.append((_('Channels:'), ch))
-        text = '<br/>'.join(map(lambda i: '<b>%s</b><br/>%s' %
+        return '<br/>'.join(map(lambda i: '<b>%s</b><br/>%s' %
                                (cgi.escape(i[0]),
                                 cgi.escape(i[1])), info))
+
+    def _display_info_tab(self):
+        file = self.obj
+        text = FileInfoDialog.format_file_info(file)
        self.ui.info.setText(text)


@@ -297,6 +309,30 @@ class AlbumInfoDialog(InfoDialog):
            self.tab_hide(tab)


+class TrackInfoDialog(FileInfoDialog):
+
+    def __init__(self, track, parent=None):
+        InfoDialog.__init__(self, track, parent)
+        self.setWindowTitle(_("Track Info"))
+
+    def _display_info_tab(self):
+        track = self.obj
+        tab = self.ui.info_tab
+        tabWidget = self.ui.tabWidget
+        tab_index = tabWidget.indexOf(tab)
+        if track.num_linked_files == 0:
+            tabWidget.setTabText(tab_index, _("&Info"))
+            self.tab_hide(tab)
+            return
+
+        tabWidget.setTabText(tab_index, _("&Info"))
+        text = ungettext("%i file in this track", "%i files in this track",
+                         track.num_linked_files) % track.num_linked_files
+        info_files = [FileInfoDialog.format_file_info(file) for file in track.linked_files]
+        text += '<hr />' + '<hr />'.join(info_files)
+        self.ui.info.setText(text)
+
+
 class ClusterInfoDialog(InfoDialog):

    def __init__(self, cluster, parent=None):
--- a/picard/ui/itemviews.py
+++ b/picard/ui/itemviews.py
@@ -19,6 +19,7 @@

 import os
 import re
+import sys
 from functools import partial
 from PyQt4 import QtCore, QtGui
 from picard import config, log
@@ -31,6 +32,14 @@ from picard.plugin import ExtensionPoint
 from picard.ui.ratingwidget import RatingWidget
 from picard.ui.collectionmenu import CollectionMenu

+if sys.platform == 'darwin':
+    try:
+        from Foundation import NSURL
+        NSURL_IMPORTED = True
+    except ImportError:
+        NSURL_IMPORTED = False
+        log.warning("Unable to import NSURL, file drag'n'drop might not work correctly")
+

 class BaseAction(QtGui.QAction):
    NAME = "Unknown"
@@ -467,9 +476,20 @@ class BaseTreeView(QtGui.QTreeWidget):
        files = []
        new_files = []
        for url in urls:
+            log.debug("Dropped the URL: %r", url.toString(QtCore.QUrl.RemoveUserInfo))
            if url.scheme() == "file" or not url.scheme():
-                # Dropping a file from iTunes gives a filename with a NULL terminator
-                filename = os.path.normpath(os.path.realpath(unicode(url.toLocalFile()).rstrip("\0")))
+                if sys.platform == 'darwin' and unicode(url.path()).startswith('/.file/id='):
+                    # Workaround for https://bugreports.qt.io/browse/QTBUG-40449
+                    # OSX Urls follow the NSURL scheme and need to be converted
+                    if NSURL_IMPORTED:
+                        filename = os.path.normpath(os.path.realpath(unicode(NSURL.URLWithString_(str(url.toString())).filePathURL().path()).rstrip("\0")))
+                        log.debug('OSX NSURL path detected. Dropped File is: %r', filename)
+                    else:
+                        log.error("Unable to get appropriate file path for %r", url.toString(QtCore.QUrl.RemoveUserInfo))
+                        continue
+                else:
+                    # Dropping a file from iTunes gives a filename with a NULL terminator
+                    filename = os.path.normpath(os.path.realpath(unicode(url.toLocalFile()).rstrip("\0")))
                file = BaseTreeView.tagger.files.get(filename)
                if file:
                    files.append(file)
@@ -509,8 +529,6 @@ class BaseTreeView(QtGui.QTreeWidget):
        # text/uri-list
        urls = data.urls()
        if urls:
-            if target is None:
-                target = self.tagger.unmatched_files
            self.drop_urls(urls, target)
            handled = True
        # application/picard.album-list
--- a/picard/ui/mainwindow.py
+++ b/picard/ui/mainwindow.py
@@ -33,7 +33,7 @@ from picard.ui.metadatabox import MetadataBox
 from picard.ui.filebrowser import FileBrowser
 from picard.ui.tagsfromfilenames import TagsFromFileNamesDialog
 from picard.ui.options.dialog import OptionsDialog
-from picard.ui.infodialog import FileInfoDialog, AlbumInfoDialog, ClusterInfoDialog
+from picard.ui.infodialog import FileInfoDialog, AlbumInfoDialog, TrackInfoDialog, ClusterInfoDialog
 from picard.ui.infostatus import InfoStatus
 from picard.ui.passworddialog import PasswordDialog, ProxyDialog
 from picard.ui.logview import LogView, HistoryView
@@ -68,6 +68,7 @@ class MainWindow(QtGui.QMainWindow):
        config.Option("persist", "bottom_splitter_state", QtCore.QByteArray()),
        config.BoolOption("persist", "window_maximized", False),
        config.BoolOption("persist", "view_cover_art", True),
+        config.BoolOption("persist", "view_toolbar", True),
        config.BoolOption("persist", "view_file_browser", False),
        config.TextOption("persist", "current_directory", ""),
    ]
@@ -192,6 +193,7 @@ class MainWindow(QtGui.QMainWindow):
            config.persist["window_size"] = self.size()
        config.persist["window_maximized"] = isMaximized
        config.persist["view_cover_art"] = self.show_cover_art_action.isChecked()
+        config.persist["view_toolbar"] = self.show_toolbar_action.isChecked()
        config.persist["view_file_browser"] = self.show_file_browser_action.isChecked()
        config.persist["bottom_splitter_state"] = self.centralWidget().saveState()
        self.file_browser.save_state()
@@ -404,6 +406,12 @@ class MainWindow(QtGui.QMainWindow):
            self.show_cover_art_action.setChecked(True)
        self.show_cover_art_action.triggered.connect(self.show_cover_art)

+        self.show_toolbar_action = QtGui.QAction(_(u"&Actions"), self)
+        self.show_toolbar_action.setCheckable(True)
+        if config.persist["view_toolbar"]:
+            self.show_toolbar_action.setChecked(True)
+        self.show_toolbar_action.triggered.connect(self.show_toolbar)
+
        self.search_action = QtGui.QAction(icontheme.lookup('system-search'), _(u"Search"), self)
        self.search_action.setEnabled(False)
        self.search_action.triggered.connect(self.search)
@@ -417,6 +425,7 @@ class MainWindow(QtGui.QMainWindow):
        self.analyze_action = QtGui.QAction(icontheme.lookup('picard-analyze'), _(u"&Scan"), self)
        self.analyze_action.setStatusTip(_(u"Use AcoustID audio fingerprint to identify the files by the actual music, even if they have no metadata"))
        self.analyze_action.setEnabled(False)
+        self.analyze_action.setToolTip(_(u'Identify the file using its AcoustID audio fingerprint'))
        # TR: Keyboard shortcut for "Analyze"
        self.analyze_action.setShortcut(QtGui.QKeySequence(_(u"Ctrl+Y")))
        self.analyze_action.triggered.connect(self.analyze)
@@ -536,7 +545,7 @@ class MainWindow(QtGui.QMainWindow):
        menu.addAction(self.show_file_browser_action)
        menu.addAction(self.show_cover_art_action)
        menu.addSeparator()
-        menu.addAction(self.toolbar_toggle_action)
+        menu.addAction(self.show_toolbar_action)
        menu.addAction(self.search_toolbar_toggle_action)
        menu = self.menuBar().addMenu(_(u"&Options"))
        menu.addAction(self.enable_renaming_action)
@@ -585,7 +594,6 @@ class MainWindow(QtGui.QMainWindow):
            self.removeToolBar(self.toolbar)
        self.toolbar = toolbar = QtGui.QToolBar(_(u"Actions"))
        self.insertToolBar(self.search_toolbar, self.toolbar)
-        self.toolbar_toggle_action = self.toolbar.toggleViewAction()
        self.update_toolbar_style()
        toolbar.setObjectName("main_toolbar")

@@ -614,6 +622,7 @@ class MainWindow(QtGui.QMainWindow):
                    button.setMenu(self.cd_lookup_menu)
            elif action == 'separator':
                toolbar.addSeparator()
+        self.show_toolbar()

    def create_search_toolbar(self):
        self.search_toolbar = toolbar = self.addToolBar(_(u"Search"))
@@ -638,27 +647,30 @@ class MainWindow(QtGui.QMainWindow):
        hbox.addWidget(self.search_button)
        toolbar.addWidget(search_panel)

-
    def set_tab_order(self):
        tab_order = self.setTabOrder
        tw = self.toolbar.widgetForAction
+        prev_action = None
+        current_action = None
+        # Setting toolbar widget tab-orders for accessibility
+        for action in config.setting['toolbar_layout']:
+            if action != 'separator':
+                try:
+                    current_action = tw(getattr(self, action))
+                except AttributeError:
+                    # No need to log warnings since we have already
+                    # done it once in create_toolbar
+                    pass

-        # toolbar
-        tab_order(tw(self.add_directory_action), tw(self.add_files_action))
-        tab_order(tw(self.add_files_action), tw(self.play_file_action))
-        tab_order(tw(self.play_file_action), tw(self.save_action))
-        tab_order(tw(self.save_action), tw(self.submit_acoustid_action))
-        tab_order(tw(self.submit_acoustid_action), tw(self.cd_lookup_action))
-        tab_order(tw(self.cd_lookup_action), tw(self.cluster_action))
-        tab_order(tw(self.cluster_action), tw(self.autotag_action))
-        tab_order(tw(self.autotag_action), tw(self.analyze_action))
-        tab_order(tw(self.analyze_action), tw(self.view_info_action))
-        tab_order(tw(self.view_info_action), tw(self.remove_action))
-        tab_order(tw(self.remove_action), tw(self.browser_lookup_action))
-        tab_order(tw(self.browser_lookup_action), self.search_combo)
+            if prev_action is not None and prev_action != current_action:
+                tab_order(prev_action, current_action)
+
+            prev_action = current_action
+
+        tab_order(prev_action, self.search_combo)
        tab_order(self.search_combo, self.search_edit)
        tab_order(self.search_edit, self.search_button)
-        # panels
+        # Panels
        tab_order(self.search_button, self.file_browser)
        tab_order(self.file_browser, self.panel.views[0])
        tab_order(self.panel.views[0], self.panel.views[1])
@@ -723,7 +735,7 @@ class MainWindow(QtGui.QMainWindow):

        dir_count = len(dir_list)
        if dir_count:
-            parent = os.path.dirname(dir_list[0])
+            parent = os.path.dirname(dir_list[0]) if dir_count > 1 else dir_list[0]
            config.persist["current_directory"] = parent
            if dir_count > 1:
                self.set_statusbar_message(
@@ -825,16 +837,20 @@ class MainWindow(QtGui.QMainWindow):
        dialog.show_similar_albums(obj)
        dialog.exec_()

-    def view_info(self):
+    def view_info(self, default_tab=0):
        if isinstance(self.selected_objects[0], Album):
            album = self.selected_objects[0]
            dialog = AlbumInfoDialog(album, self)
        elif isinstance(self.selected_objects[0], Cluster):
            cluster = self.selected_objects[0]
            dialog = ClusterInfoDialog(cluster, self)
+        elif isinstance(self.selected_objects[0], Track):
+            track = self.selected_objects[0]
+            dialog = TrackInfoDialog(track, self)
        else:
            file = self.tagger.get_files_from_objects(self.selected_objects)[0]
            dialog = FileInfoDialog(file, self)
+        dialog.ui.tabWidget.setCurrentIndex(default_tab)
        dialog.exec_()

    def cluster(self):
@@ -899,6 +915,7 @@ class MainWindow(QtGui.QMainWindow):
        self.update_actions()

        metadata = None
+        orig_metadata = None
        obj = None

        # Clear any existing status bar messages
@@ -908,6 +925,7 @@ class MainWindow(QtGui.QMainWindow):
            obj = list(objects)[0]
            if isinstance(obj, File):
                metadata = obj.metadata
+                orig_metadata = obj.orig_metadata
                if obj.state == obj.ERROR:
                    msg = N_("%(filename)s (error: %(error)s)")
                    mparms = {
@@ -924,6 +942,7 @@ class MainWindow(QtGui.QMainWindow):
                metadata = obj.metadata
                if obj.num_linked_files == 1:
                    file = obj.linked_files[0]
+                    orig_metadata = file.orig_metadata
                    if file.state == File.ERROR:
                        msg = N_("%(filename)s (%(similarity)d%%) (error: %(error)s)")
                        mparms = {
@@ -939,12 +958,15 @@ class MainWindow(QtGui.QMainWindow):
                        }
                    self.set_statusbar_message(msg, mparms, echo=None,
                                               history=None)
+            elif isinstance(obj, Album):
+                metadata = obj.metadata
+                orig_metadata = obj.orig_metadata
            elif obj.can_edit_tags():
                metadata = obj.metadata

        self.metadata_box.selection_dirty = True
        self.metadata_box.update()
-        self.cover_art_box.set_metadata(metadata, obj)
+        self.cover_art_box.set_metadata(metadata, orig_metadata, obj)
        self.selection_updated.emit(objects)

    def show_cover_art(self):
@@ -954,6 +976,13 @@ class MainWindow(QtGui.QMainWindow):
        else:
            self.cover_art_box.hide()

+    def show_toolbar(self):
+        """Show/hide the Action toolbar."""
+        if self.show_toolbar_action.isChecked():
+            self.toolbar.show()
+        else:
+            self.toolbar.hide()
+
    def show_file_browser(self):
        """Show/hide the file browser."""
        if self.show_file_browser_action.isChecked():
--- a/picard/ui/options/general.py
+++ b/picard/ui/options/general.py
@@ -37,7 +37,7 @@ class GeneralOptionsPage(OptionsPage):

    options = [
        config.TextOption("setting", "server_host", MUSICBRAINZ_SERVERS[0]),
-        config.IntOption("setting", "server_port", 80),
+        config.IntOption("setting", "server_port", 443),
        config.TextOption("persist", "oauth_refresh_token", ""),
        config.BoolOption("setting", "analyze_new_files", False),
        config.BoolOption("setting", "ignore_file_mbids", False),
--- a/picard/ui/options/interface.py
+++ b/picard/ui/options/interface.py
@@ -98,6 +98,7 @@ class InterfaceOptionsPage(OptionsPage):
        config.TextOption("setting", "ui_language", u""),
        config.BoolOption("setting", "starting_directory", False),
        config.TextOption("setting", "starting_directory_path", ""),
+        config.TextOption("setting", "load_image_behavior", "append"),
        config.ListOption("setting", "toolbar_layout", [
            'add_directory_action',
            'add_files_action',
@@ -274,6 +275,7 @@ class InterfaceOptionsPage(OptionsPage):
            widget = widget.parent()
        # Call the main window's create toolbar method
        widget.create_action_toolbar()
+        widget.set_tab_order()


 class ToolbarListItem(QtGui.QListWidgetItem):
--- a/picard/ui/searchdialog.py
+++ b/picard/ui/searchdialog.py
@@ -281,11 +281,11 @@ class SearchDialog(PicardDialog):

    def network_error(self, reply, error):
        error_msg = _("<strong>Following error occurred while fetching results:<br><br></strong>"
-                      "Network request error for %s:<br>%s (QT code %d, HTTP code %s)<br>" % (
+                      "Network request error for %s:<br>%s (QT code %d, HTTP code %s)<br>") % (
                          reply.request().url().toString(QtCore.QUrl.RemoveUserInfo),
                          reply.errorString(),
                          error,
-                          repr(reply.attribute(QtNetwork.QNetworkRequest.HttpStatusCodeAttribute)))
+                          repr(reply.attribute(QtNetwork.QNetworkRequest.HttpStatusCodeAttribute))
                      )
        self.show_error(error_msg, show_retry_button=True)

--- a/picard/ui/tagsfromfilenames.py
+++ b/picard/ui/tagsfromfilenames.py
@@ -70,7 +70,7 @@ class TagsFromFileNamesDialog(PicardDialog):
            item = QtGui.QTreeWidgetItem(self.ui.files)
            item.setText(0, os.path.basename(file.filename))
            self.items.append(item)
-        self._tag_re = re.compile("(%\w+%)")
+        self._tag_re = re.compile(r"(%\w+%)")
        self.numeric_tags = ('tracknumber', 'totaltracks', 'discnumber', 'totaldiscs')

    def parse_format(self):
@@ -82,9 +82,9 @@ class TagsFromFileNamesDialog(PicardDialog):
                name = part[1:-1]
                columns.append(name)
                if name in self.numeric_tags:
-                    format_re.append('(?P<' + name + '>\d+)')
+                    format_re.append('(?P<' + name + r'>\d+)')
                elif name in ('date'):
-                    format_re.append('(?P<' + name + '>\d+(?:-\d+(?:-\d+)?)?)')
+                    format_re.append('(?P<' + name + r'>\d+(?:-\d+(?:-\d+)?)?)')
                else:
                    format_re.append('(?P<' + name + '>[^/]*?)')
            else:
--- a/picard/ui/ui_options_interface.py
+++ b/picard/ui/ui_options_interface.py
@@ -93,13 +93,13 @@ class Ui_InterfaceOptionsPage(object):
        self.edit_box_layout = QtGui.QHBoxLayout(self.edit_button_box)
        self.edit_box_layout.setMargin(0)
        self.edit_box_layout.setObjectName(_fromUtf8("edit_box_layout"))
-        self.add_button = QtGui.QToolButton(self.edit_button_box)
+        self.add_button = QtGui.QPushButton(self.edit_button_box)
        self.add_button.setObjectName(_fromUtf8("add_button"))
        self.edit_box_layout.addWidget(self.add_button)
-        self.insert_separator_button = QtGui.QToolButton(self.edit_button_box)
+        self.insert_separator_button = QtGui.QPushButton(self.edit_button_box)
        self.insert_separator_button.setObjectName(_fromUtf8("insert_separator_button"))
        self.edit_box_layout.addWidget(self.insert_separator_button)
-        spacerItem1 = QtGui.QSpacerItem(60, 20, QtGui.QSizePolicy.MinimumExpanding, QtGui.QSizePolicy.Minimum)
+        spacerItem1 = QtGui.QSpacerItem(50, 20, QtGui.QSizePolicy.MinimumExpanding, QtGui.QSizePolicy.Minimum)
        self.edit_box_layout.addItem(spacerItem1)
        self.up_button = QtGui.QToolButton(self.edit_button_box)
        self.up_button.setArrowType(QtCore.Qt.UpArrow)
@@ -109,7 +109,7 @@ class Ui_InterfaceOptionsPage(object):
        self.down_button.setArrowType(QtCore.Qt.DownArrow)
        self.down_button.setObjectName(_fromUtf8("down_button"))
        self.edit_box_layout.addWidget(self.down_button)
-        self.remove_button = QtGui.QToolButton(self.edit_button_box)
+        self.remove_button = QtGui.QPushButton(self.edit_button_box)
        self.remove_button.setObjectName(_fromUtf8("remove_button"))
        self.edit_box_layout.addWidget(self.remove_button)
        self.verticalLayout.addWidget(self.edit_button_box)
--- a/picard/ui/ui_options_script.py
+++ b/picard/ui/ui_options_script.py
@@ -44,11 +44,14 @@ class Ui_ScriptingOptionsPage(object):
        self.verticalLayout_3.setMargin(0)
        self.verticalLayout_3.setSpacing(6)
        self.verticalLayout_3.setObjectName(_fromUtf8("verticalLayout_3"))
-        self.add_script = QtGui.QToolButton(self.groupBox)
-        self.add_script.setToolButtonStyle(QtCore.Qt.ToolButtonTextOnly)
-        self.add_script.setAutoRaise(False)
+        self.horizontalLayout = QtGui.QHBoxLayout()
+        self.horizontalLayout.setObjectName(_fromUtf8("horizontalLayout"))
+        self.add_script = QtGui.QPushButton(self.groupBox)
        self.add_script.setObjectName(_fromUtf8("add_script"))
-        self.verticalLayout_3.addWidget(self.add_script)
+        self.horizontalLayout.addWidget(self.add_script)
+        spacerItem = QtGui.QSpacerItem(40, 20, QtGui.QSizePolicy.Expanding, QtGui.QSizePolicy.Minimum)
+        self.horizontalLayout.addItem(spacerItem)
+        self.verticalLayout_3.addLayout(self.horizontalLayout)
        self.splitter = QtGui.QSplitter(self.groupBox)
        self.splitter.setOrientation(QtCore.Qt.Horizontal)
        self.splitter.setChildrenCollapsible(False)
--- a/picard/util/init.py
+++ b/picard/util/init.py
@@ -383,25 +383,21 @@ def album_artist_from_path(filename, album, artist):
    return album, artist


-def build_qurl(host, port=80, path=None, mblogin=False, queryargs=None):
+def build_qurl(host, port=80, path=None, queryargs=None):
    """
    Builds and returns a QUrl object from `host`, `port` and `path` and
    automatically enables HTTPS if necessary.

-    Setting `mblogin` to True forces HTTPS on MusicBrainz' servers.
-
    Encoded query arguments can be provided in `queryargs`, a
    dictionary mapping field names to values.
    """
    url = QtCore.QUrl()
    url.setHost(host)
    url.setPort(port)
-    if (# Login is required and we're contacting an MB server
-        (mblogin and host in MUSICBRAINZ_SERVERS and port == 80) or
-        # Or we're contacting some other server via HTTPS.
-         port == 443):
-            url.setScheme("https")
-            url.setPort(443)
+
+    if (host in MUSICBRAINZ_SERVERS or port == 443):
+        url.setScheme("https")
+        url.setPort(443)
    else:
        url.setScheme("http")

--- a/picard/util/filenaming.py
+++ b/picard/util/filenaming.py
@@ -155,7 +155,7 @@ def _shorten_to_utf16_ratio(text, ratio):


 def _make_win_short_filename(relpath, reserved=0):
-    """Shorten a relative file path according to WinAPI quirks.
+    r"""Shorten a relative file path according to WinAPI quirks.

    relpath: The file's path.
    reserved: Number of characters reserved for the parent path to be joined with,
--- a/picard/util/imagelist.py
+++ b/picard/util/imagelist.py
@@ -0,0 +1,106 @@
+# -*- coding: utf-8 -*-
+#
+# Picard, the next-generation MusicBrainz tagger
+# Copyright (C) 2017 Antonio Larrosa <alarrosa@suse.com>
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; either version 2
+# of the License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+
+
+def get_image_type(image):
+    return image.types_as_string()
+
+
+class ImageList(list):
+
+    def __eq__(self, other):
+        return sorted(self, key=get_image_type) == sorted(other, key=get_image_type)
+
+    def __getslice__(self, i, j):
+        length = len(self)
+        i = max(0, min(i, length))
+        j = max(0, min(j, length))
+        return ImageList([self[it] for it in range(i, j)])
+
+
+def _process_images(state, src_obj):
+    from picard.track import Track
+
+    # Check new images
+    if state.update_new_metadata:
+        if state.first_new_obj:
+            state.new_images = src_obj.metadata.images[:]
+            state.first_new_obj = False
+        else:
+            if state.new_images != src_obj.metadata.images:
+                state.has_common_new_images = False
+                state.new_images.extend([image for image in src_obj.metadata.images if image not in state.new_images])
+
+    if state.update_orig_metadata and not isinstance(src_obj, Track):
+        # Check orig images, but not for Tracks (which don't have a useful orig_metadata)
+        if state.first_orig_obj:
+            state.orig_images = src_obj.orig_metadata.images[:]
+            state.first_orig_obj = False
+        else:
+            if state.orig_images != src_obj.orig_metadata.images:
+                state.has_common_orig_images = False
+                state.orig_images.extend([image for image in src_obj.orig_metadata.images if image not in state.orig_images])
+
+
+class State:
+    def __init__(self):
+        self.new_images = ImageList()
+        self.orig_images = ImageList()
+        self.has_common_new_images = True
+        self.has_common_orig_images = True
+        self.first_new_obj = True
+        self.first_orig_obj = True
+        # The next variables specify what will be updated
+        self.update_new_metadata = False
+        self.update_orig_metadata = False
+
+
+# TODO: use functools.singledispatch when py3 is supported
+def update_metadata_images(obj):
+    from picard.track import Track
+    from picard.cluster import Cluster
+    from picard.album import Album
+
+    state = State()
+
+    if isinstance(obj, Album):
+        sources = []
+        for track in obj.tracks:
+            sources.append(track)
+            sources += track.linked_files
+        sources += obj.unmatched_files.files
+        state.update_new_metadata = True
+        state.update_orig_metadata = True
+    elif isinstance(obj, Track):
+        sources = obj.linked_files
+        state.update_orig_metadata = True
+    elif isinstance(obj, Cluster):
+        sources = obj.files
+        state.update_new_metadata = True
+
+    for src_obj in sources:
+        _process_images(state, src_obj)
+
+    if state.update_new_metadata:
+        obj.metadata.images = state.new_images
+        obj.metadata.has_common_images = state.has_common_new_images
+
+    if state.update_orig_metadata:
+        obj.orig_metadata.images = state.orig_images
+        obj.orig_metadata.has_common_images = state.has_common_orig_images
--- a/picard/util/lrucache.py
+++ b/picard/util/lrucache.py
@@ -0,0 +1,79 @@
+# -*- coding: utf-8 -*-
+#
+# Picard, the next-generation MusicBrainz tagger
+# Copyright (C) 2017 Antonio Larrosa <alarrosa@suse.com>
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; either version 2
+# of the License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+
+
+class LRUCache(dict):
+    """
+    Helper class to cache items using a Least Recently Used policy.
+
+    It's originally used to cache generated pixmaps in the CoverArtBox object
+    but it's generic enough to be used for other purposes if necessary.
+    The cache will never hold more than max_size items and the item least
+    recently used will be discarded.
+
+    >>> cache = LRUCache(3)
+    >>> cache['item1'] = 'some value'
+    >>> cache['item2'] = 'some other value'
+    >>> cache['item3'] = 'yet another value'
+    >>> cache['item1']
+    'some value'
+    >>> cache['item4'] = 'This will push item 2 out of the cache'
+    >>> cache['item2']
+    Traceback (most recent call last):
+      File "<stdin>", line 1, in <module>
+      File "lrucache.py", line 48, in __getitem__
+        return super(LRUCache, self).__getitem__(key)
+    KeyError: 'item2'
+    >>> cache['item5'] = 'This will push item3 out of the cache'
+    >>> cache['item3']
+    Traceback (most recent call last):
+      File "<stdin>", line 1, in <module>
+      File "lrucache.py", line 48, in __getitem__
+        return super(LRUCache, self).__getitem__(key)
+    KeyError: 'item3'
+    >>> cache['item1']
+    'some value'
+    """
+
+    def __init__(self, max_size):
+        self._ordered_keys = []
+        self._max_size = max_size
+
+    def __getitem__(self, key):
+        if key in self:
+            self._ordered_keys.remove(key)
+            self._ordered_keys.insert(0, key)
+        return super(LRUCache, self).__getitem__(key)
+
+    def __setitem__(self, key, value):
+        if key in self:
+            self._ordered_keys.remove(key)
+        self._ordered_keys.insert(0, key)
+
+        r = super(LRUCache, self).__setitem__(key, value)
+
+        if len(self) > self._max_size:
+            item = self._ordered_keys.pop()
+            super(LRUCache, self).__delitem__(item)
+
+        return r
+
+    def __delitem__(self, key):
+        self._ordered_keys.remove(key)
+        super(LRUCache, self).__delitem__(key)
--- a/picard/webservice.py
+++ b/picard/webservice.py
@@ -189,8 +189,7 @@ class XmlWebService(QtCore.QObject):
    def _start_request_continue(self, method, host, port, path, data, handler, xml,
                                mblogin=False, cacheloadcontrol=None, refresh=None,
                                access_token=None, queryargs=None):
-        url = build_qurl(host, port, path=path, mblogin=mblogin,
-                         queryargs=queryargs)
+        url = build_qurl(host, port, path=path, queryargs=queryargs)
        request = QtNetwork.QNetworkRequest(url)
        if mblogin and access_token:
            request.setRawHeader("Authorization", "Bearer %s" % access_token)
--- a/po/attributes/da.po
+++ b/po/attributes/da.po
@@ -1,7 +1,7 @@
 # Translators:
 # Translators:
-# Freso <transifex.net@freso.dk>, 2012
-# Freso <transifex.net@freso.dk>, 2014-2015
+# Frederik “Freso” S. Olesen <transifex.net@freso.dk>, 2012
+# Frederik “Freso” S. Olesen <transifex.net@freso.dk>, 2014-2015
 msgid ""
 msgstr ""
 "Project-Id-Version: MusicBrainz\n"
--- a/po/attributes/es.po
+++ b/po/attributes/es.po
@@ -27,8 +27,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: MusicBrainz\n"
-"PO-Revision-Date: 2017-01-16 20:46+0000\n"
-"Last-Translator: Laurent Monin <i18n@norz.org>\n"
+"PO-Revision-Date: 2017-03-08 06:20+0000\n"
+"Last-Translator: Abby Zla <abby230492@gmail.com>\n"
 "Language-Team: Spanish (http://www.transifex.com/musicbrainz/musicbrainz/language/es/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -230,7 +230,7 @@ msgid ""
 "A place whose main purpose is to host outdoor sport events, typically "
 "consisting of a pitch surrounded by a structure for spectators with no roof,"
 " or a roof which can be retracted."
-msgstr ""
+msgstr "Un lugar cuyo principal propósito es acoger eventos deportivos al aire libre, consiste típicamente en un campo rodeado por una estructura para los espectadores sin techo, o un techo que puede ser replegado."

 #: DB:work_type/description:28
 msgctxt "work_type"
@@ -513,7 +513,7 @@ msgctxt "event_type"
 msgid ""
 "An individual concert by a single artist or collaboration, often with "
 "supporting artists who perform before the main act."
-msgstr ""
+msgstr "Un concierto individual por un solo artista o en colaboración, frecuentemente con artistas de apoyo que se presentan antes del acto principal."

 #: DB:work_type/description:10
 msgctxt "work_type"
@@ -546,7 +546,7 @@ msgid ""
 "An unofficial/underground release that was not sanctioned by the artist "
 "and/or the record company. This includes unofficial live recordings and "
 "pirated releases."
-msgstr ""
+msgstr "Una edición no oficial/ oculta que no fue autorizada por el artista y/o la compañía discográfica. Esto incluye grabaciones no oficiales o ediciones piratas."

 #: DB:work_type/description:20
 msgctxt "work_type"
--- a/po/attributes/nb.po
+++ b/po/attributes/nb.po
@@ -1,14 +1,14 @@
 # Translators:
 # Translators:
-# CatQuest, The Endeavouring Cat, 2015
+# CatQuest, The Endeavouring Cat, 2015,2017
 # Kurt-Håkon Eilertsen <kurt@kheds.com>, 2014
 # CatQuest, The Endeavouring Cat, 2012
 # CatQuest, The Endeavouring Cat, 2014
 msgid ""
 msgstr ""
 "Project-Id-Version: MusicBrainz\n"
-"PO-Revision-Date: 2017-01-16 20:46+0000\n"
-"Last-Translator: Laurent Monin <i18n@norz.org>\n"
+"PO-Revision-Date: 2017-02-14 11:49+0000\n"
+"Last-Translator: CatQuest, The Endeavouring Cat\n"
 "Language-Team: Norwegian Bokmål (http://www.transifex.com/musicbrainz/musicbrainz/language/nb/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -54,12 +54,12 @@ msgstr "12\" Vinyl"
 #: DB:medium_format/name:49
 msgctxt "medium_format"
 msgid "3.5\" Floppy Disk"
-msgstr ""
+msgstr "3.5\" Diskett"

 #: DB:medium_format/name:52
 msgctxt "medium_format"
 msgid "7\" Flexi-disc"
-msgstr ""
+msgstr "7\" Flexidisk"

 #: DB:medium_format/name:56
 msgctxt "medium_format"
@@ -251,7 +251,7 @@ msgstr ""
 #: DB:series_type/description:3
 msgctxt "series_type"
 msgid "A series of recordings."
-msgstr ""
+msgstr "En serie av innspillinger"

 #: DB:series_type/description:7
 msgctxt "series_type"
@@ -816,7 +816,7 @@ msgstr "Behāg"
 #: DB:work_type/name:26
 msgctxt "work_type"
 msgid "Beijing opera"
-msgstr "Beijing opera"
+msgstr "Beijing operaen"

 #: DB:work_type/description:26
 msgctxt "work_type"
@@ -973,7 +973,7 @@ msgstr "Blu-ray"
 #: DB:medium_format/name:35
 msgctxt "medium_format"
 msgid "Blu-spec CD"
-msgstr ""
+msgstr "Blu-spec CD"

 #: DB:release_packaging/name:9
 msgctxt "release_packaging"
@@ -988,12 +988,12 @@ msgstr "Hefte"
 #: DB:release_status/name:3
 msgctxt "release_status"
 msgid "Bootleg"
-msgstr "Ulovlig"
+msgstr ""

 #: DB:label_type/name:5
 msgctxt "label_type"
 msgid "Bootleg Production"
-msgstr "Ulovlig produksjon"
+msgstr ""

 #: DB:work_attribute_type_allowed_value/value:607
 msgctxt "work_attribute_type_allowed_value"
@@ -1003,7 +1003,7 @@ msgstr "Bozlak"
 #: DB:release_group_primary_type/name:12
 msgctxt "release_group_primary_type"
 msgid "Broadcast"
-msgstr "Kringkaste"
+msgstr "Kringkasting"

 #: DB:work_attribute_type_allowed_value/value:62
 msgctxt "work_attribute_type_allowed_value"
@@ -1118,7 +1118,7 @@ msgstr "CDV"
 #: DB:medium_format/name:60
 msgctxt "medium_format"
 msgid "CED"
-msgstr ""
+msgstr "CED"

 #: DB:work_attribute_type_allowed_value/value:63
 msgctxt "work_attribute_type_allowed_value"
@@ -1148,12 +1148,12 @@ msgstr "Kantate"
 #: DB:release_packaging/name:4
 msgctxt "release_packaging"
 msgid "Cardboard/Paper Sleeve"
-msgstr "Kortbord/Papirarm"
+msgstr ""

 #: DB:medium_format/name:9
 msgctxt "medium_format"
 msgid "Cartridge"
-msgstr "Patron"
+msgstr "Kassett (generell)"

 #: DB:work_attribute_type_allowed_value/value:66
 msgctxt "work_attribute_type_allowed_value"
@@ -1163,12 +1163,12 @@ msgstr "Carturdaśa rāgamālika"
 #: DB:medium_format/name:8
 msgctxt "medium_format"
 msgid "Cassette"
-msgstr "Kassett"
+msgstr "Musikkassett"

 #: DB:release_packaging/name:8
 msgctxt "release_packaging"
 msgid "Cassette Case"
-msgstr "Kassett etui"
+msgstr "Kassettetui"

 #: DB:series_type/name:5
 msgctxt "series_type"
@@ -1193,7 +1193,7 @@ msgstr "Cevher"
 #: DB:artist_type/name:4
 msgctxt "artist_type"
 msgid "Character"
-msgstr "Karakter"
+msgstr "Rolle"

 #: DB:artist_type/name:6
 msgctxt "artist_type"
@@ -1244,7 +1244,7 @@ msgstr ""
 #: DB:medium_format/name:61
 msgctxt "medium_format"
 msgid "Copy Control CD"
-msgstr ""
+msgstr "Copy Control CD"

 #: DB:medium_format/description:61
 msgctxt "medium_format"
@@ -1359,7 +1359,7 @@ msgstr "DJ-miks"
 #: DB:medium_format/name:44
 msgctxt "medium_format"
 msgid "DTS CD"
-msgstr ""
+msgstr "DTS CD"

 #: DB:medium_format/name:2
 msgctxt "medium_format"
@@ -1379,22 +1379,22 @@ msgstr "DVD-Video"
 #: DB:medium_format/name:47
 msgctxt "medium_format"
 msgid "DVDplus"
-msgstr ""
+msgstr "DVDplus"

 #: DB:medium_format/name:70
 msgctxt "medium_format"
 msgid "DVDplus (CD side)"
-msgstr ""
+msgstr "DVDplus (CD side)"

 #: DB:medium_format/name:68
 msgctxt "medium_format"
 msgid "DVDplus (DVD-Audio side)"
-msgstr ""
+msgstr "DVDplus (DVD-Audio side)"

 #: DB:medium_format/name:69
 msgctxt "medium_format"
 msgid "DVDplus (DVD-Video side)"
-msgstr ""
+msgstr "DVDplus (DVD-Video side)"

 #: DB:work_attribute_type_allowed_value/value:343
 msgctxt "work_attribute_type_allowed_value"
@@ -1444,7 +1444,7 @@ msgstr "Darbārī kānaḍa"
 #: DB:medium_format/name:43
 msgctxt "medium_format"
 msgid "Data CD"
-msgstr ""
+msgstr "Data CD"

 #: DB:release_group_secondary_type/name:10
 msgctxt "release_group_secondary_type"
@@ -1599,7 +1599,7 @@ msgstr "Distributør"
 #: DB:area_type/name:5
 msgctxt "area_type"
 msgid "District"
-msgstr "Område"
+msgstr "Distrikt"

 #: DB:area_type/description:5
 msgctxt "area_type"
@@ -1624,17 +1624,17 @@ msgstr "DualDisc"
 #: DB:medium_format/name:67
 msgctxt "medium_format"
 msgid "DualDisc (CD side)"
-msgstr ""
+msgstr "DualDisc (CD side)"

 #: DB:medium_format/name:65
 msgctxt "medium_format"
 msgid "DualDisc (DVD-Audio side)"
-msgstr ""
+msgstr "DualDisc (DVD-Audio side)"

 #: DB:medium_format/name:66
 msgctxt "medium_format"
 msgid "DualDisc (DVD-Video side)"
-msgstr ""
+msgstr "DualDisc (DVD-Video side)"

 #: DB:work_attribute_type_allowed_value/value:612
 msgctxt "work_attribute_type_allowed_value"
@@ -1769,7 +1769,7 @@ msgstr ""
 #: DB:instrument_type/name:4
 msgctxt "instrument_type"
 msgid "Electronic instrument"
-msgstr "elektronisk instrument"
+msgstr "Elektronisk instrument"

 #: DB:medium_format/name:42
 msgctxt "medium_format"
@@ -1794,17 +1794,17 @@ msgstr "Evcara"
 #: DB:editor_collection_type/name:4
 msgctxt "collection_type"
 msgid "Event"
-msgstr ""
+msgstr "Arrangement"

 #: DB:series_type/name:6
 msgctxt "series_type"
 msgid "Event"
-msgstr ""
+msgstr "Arrangement"

 #: DB:event_alias_type/name:1
 msgctxt "alias_type"
 msgid "Event name"
-msgstr ""
+msgstr "Arrangementnavn"

 #: DB:work_attribute_type_allowed_value/value:729
 msgctxt "work_attribute_type_allowed_value"
@@ -1994,7 +1994,7 @@ msgstr "Fireng-i Fer"
 #: DB:medium_format/name:51
 msgctxt "medium_format"
 msgid "Flexi-disc"
-msgstr ""
+msgstr "Flexidisk"

 #: DB:medium_format/description:51
 msgctxt "medium_format"
@@ -2012,7 +2012,7 @@ msgstr ""
 #: DB:area_alias_type/name:2
 msgctxt "alias_type"
 msgid "Formal name"
-msgstr "Formelt navn"
+msgstr ""

 #: DB:work_attribute_type_allowed_value/value:735
 msgctxt "work_attribute_type_allowed_value"
@@ -2082,7 +2082,7 @@ msgstr "Garuḍadhvani"
 #: DB:release_packaging/name:12
 msgctxt "release_packaging"
 msgid "Gatefold Cover"
-msgstr "Sammenbrettet forside"
+msgstr "Digipak"

 #: DB:work_attribute_type_allowed_value/value:99
 msgctxt "work_attribute_type_allowed_value"
@@ -2467,17 +2467,17 @@ msgstr "Huzi"
 #: DB:medium_format/name:38
 msgctxt "medium_format"
 msgid "Hybrid SACD"
-msgstr ""
+msgstr "Hybrid SACD"

 #: DB:medium_format/name:63
 msgctxt "medium_format"
 msgid "Hybrid SACD (CD layer)"
-msgstr ""
+msgstr "Hybrid SACD (CD lag)"

 #: DB:medium_format/name:64
 msgctxt "medium_format"
 msgid "Hybrid SACD (SACD layer)"
-msgstr ""
+msgstr "Hybrid SACD (SACD lag)"

 #: DB:work_attribute_type_allowed_value/value:418
 msgctxt "work_attribute_type_allowed_value"
@@ -2564,7 +2564,7 @@ msgstr "Instrument"
 #: DB:instrument_alias_type/name:1
 msgctxt "alias_type"
 msgid "Instrument name"
-msgstr "Instrument navn"
+msgstr "Instrumentnavn"

 #: DB:release_group_secondary_type/name:4
 msgctxt "release_group_secondary_type"
@@ -3167,7 +3167,7 @@ msgstr "Mandāri"
 #: DB:series_ordering_type/name:2
 msgctxt "series_ordering_type"
 msgid "Manual"
-msgstr "Håndbok"
+msgstr "Manual"

 #: DB:work_attribute_type_allowed_value/value:172
 msgctxt "work_attribute_type_allowed_value"
@@ -3862,7 +3862,7 @@ msgstr "Annet"
 #: DB:place_type/name:3
 msgctxt "place_type"
 msgid "Other"
-msgstr "Andre"
+msgstr "Annet"

 #: DB:release_group_primary_type/name:11
 msgctxt "release_group_primary_type"
@@ -3877,7 +3877,7 @@ msgstr "Annet"
 #: DB:instrument_type/name:5
 msgctxt "instrument_type"
 msgid "Other instrument"
-msgstr "Andre instrument"
+msgstr "Annet instrument"

 #: DB:work_type/name:12
 msgctxt "work_type"
@@ -4017,7 +4017,7 @@ msgstr "Produksjon"
 #: DB:release_status/name:2
 msgctxt "release_status"
 msgid "Promotion"
-msgstr "Reklame"
+msgstr "Promoplate"

 #: DB:work_type/name:23
 msgctxt "work_type"
@@ -4382,7 +4382,7 @@ msgstr ""
 #: DB:medium_format/name:62
 msgctxt "medium_format"
 msgid "SD Card"
-msgstr ""
+msgstr "SDkort"

 #: DB:work_attribute_type/name:8
 msgctxt "work_attribute_type"
@@ -4681,12 +4681,12 @@ msgstr "Lydspor"
 #: DB:cover_art_archive.art_type/name:6
 msgctxt "cover_art_type"
 msgid "Spine"
-msgstr ""
+msgstr "Rygg"

 #: DB:release_group_secondary_type/name:3
 msgctxt "release_group_secondary_type"
 msgid "Spokenword"
-msgstr "Uttalt ord"
+msgstr "Taleplate"

 #: DB:place_type/name:4
 msgctxt "place_type"
@@ -5075,7 +5075,7 @@ msgstr "Spor"
 #: DB:cover_art_archive.art_type/name:9
 msgctxt "cover_art_type"
 msgid "Tray"
-msgstr ""
+msgstr "Innlegg"

 #: DB:work_attribute_type_allowed_value/value:775
 msgctxt "work_attribute_type_allowed_value"
@@ -5170,7 +5170,7 @@ msgstr "VCD"
 #: DB:medium_format/name:59
 msgctxt "medium_format"
 msgid "VHD"
-msgstr ""
+msgstr "Videokassett"

 #: DB:medium_format/name:21
 msgctxt "medium_format"
--- a/po/attributes/nl.po
+++ b/po/attributes/nl.po
@@ -1,5 +1,6 @@
 # Translators:
 # Translators:
+# reneweesp <bmom43@hotmail.com>, 2017
 # Maurits Meulenbelt <email address hidden>, 2012
 # Maurits Meulenbelt <mfmeulenbelt@gmail.com>, 2012
 # Maurits Meulenbelt <mfmeulenbelt@gmail.com>, 2013-2017
@@ -8,7 +9,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: MusicBrainz\n"
-"PO-Revision-Date: 2017-01-18 16:52+0000\n"
+"PO-Revision-Date: 2017-02-19 11:15+0000\n"
 "Last-Translator: Maurits Meulenbelt <mfmeulenbelt@gmail.com>\n"
 "Language-Team: Dutch (http://www.transifex.com/musicbrainz/musicbrainz/language/nl/)\n"
 "MIME-Version: 1.0\n"
@@ -1355,7 +1356,7 @@ msgstr "DCC"
 #: DB:release_group_secondary_type/name:8
 msgctxt "release_group_secondary_type"
 msgid "DJ-mix"
-msgstr "DJ-mix"
+msgstr "dj-mix"

 #: DB:medium_format/name:44
 msgctxt "medium_format"
--- a/po/attributes/pl.po
+++ b/po/attributes/pl.po
@@ -19,7 +19,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: pl\n"
-"Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
+"Plural-Forms: nplurals=4; plural=(n==1 ? 0 : (n%10>=2 && n%10<=4) && (n%100<12 || n%100>=14) ? 1 : n!=1 && (n%10>=0 && n%10<=1) || (n%10>=5 && n%10<=9) || (n%100>=12 && n%100<=14) ? 2 : 3);\n"

 #: DB:work_type/description:9
 msgctxt "work_type"
--- a/po/attributes/pt_BR.po
+++ b/po/attributes/pt_BR.po
@@ -1,23 +1,24 @@
 # Translators:
 # Translators:
 # Alex Luís Silva <alex.mooca@hotmail.com>, 2015
+# Daniel Biasotto <biasotto@tuta.io>, 2017
 # Eduardo Bastos <eduardorochacg@gmail.com>, 2012
 # Jefferson Gomes <jefferson.mg2@hotmail.com>, 2016
 # João Miguel Soares <joaomiguel32@live.com>, 2016
 # lampih <lampih@gmail.com>, 2012
 # Lucas de Jesus <lucasdj98@gmail.com>, 2016
 # Lucas Gomes <x8lucas8x@gmail.com>, 2012
-# Marco Tulio Costa <mmarcottulio@gmail.com>, 2012
+# Marco Costa <mmarcottulio@gmail.com>, 2012
 # Marcus Vinícius Marques, 2014
-# Marco Tulio Costa <mmarcottulio@gmail.com>, 2012
+# Marco Costa <mmarcottulio@gmail.com>, 2012
 # rafaelbrandao <rblcin@gmail.com>, 2012
 # davitf <transifex@davitf.com>, 2012
 # Lucas Gomes <x8lucas8x@gmail.com>, 2012
 msgid ""
 msgstr ""
 "Project-Id-Version: MusicBrainz\n"
-"PO-Revision-Date: 2017-01-16 20:46+0000\n"
-"Last-Translator: Laurent Monin <i18n@norz.org>\n"
+"PO-Revision-Date: 2017-02-11 04:56+0000\n"
+"Last-Translator: Marco Costa <mmarcottulio@gmail.com>\n"
 "Language-Team: Portuguese (Brazil) (http://www.transifex.com/musicbrainz/musicbrainz/language/pt_BR/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -31,19 +32,19 @@ msgid ""
 "\"Motet\" is a term that applies to different types of (usually "
 "unaccompanied) choral works. What exactly is a motet depends quite a bit on "
 "the period."
-msgstr "\"Moteto\" é um termo que se aplica a diferentes tipos de (geralmente desacompanhadas) palavras de coral. O que é exatamente um moteto depende um pouco do período."
+msgstr "\"Moteto\" é um termo que se aplica a diferentes tipos de obras de coral (geralmente não-acompanhadas). O que é exatamente um moteto depende um pouco do período."

 #: DB:work_type/description:5
 msgctxt "work_type"
 msgid ""
 "\"Sonata\" is a general term used to describe small scale (very often solo "
 "or solo + keyboard) instrumental works, initially in baroque music."
-msgstr "\"Sonata\" é geralmente um termo usado para descrever trabalhos instrumentais em pequena escala (frequentemente solo ou solo + teclados), inicialmente na musica barroca."
+msgstr "\"Sonata\" é um termo geral usado para descrever trabalhos instrumentais em pequena escala (frequentemente solo ou solo + teclados), inicialmente na musica barroca."

 #: DB:medium_format/name:54
 msgctxt "medium_format"
 msgid "10\" Shellac"
-msgstr ""
+msgstr "Goma-laca 10\""

 #: DB:medium_format/name:30
 msgctxt "medium_format"
@@ -53,7 +54,7 @@ msgstr "Vinil de 10 polegadas"
 #: DB:medium_format/name:55
 msgctxt "medium_format"
 msgid "12\" Shellac"
-msgstr ""
+msgstr "Goma-laca 12\""

 #: DB:medium_format/name:31
 msgctxt "medium_format"
@@ -73,7 +74,7 @@ msgstr "Vinil flexível de 7 polegadas"
 #: DB:medium_format/name:56
 msgctxt "medium_format"
 msgid "7\" Shellac"
-msgstr ""
+msgstr "Goma-laca 7\""

 #: DB:medium_format/name:29
 msgctxt "medium_format"
@@ -95,17 +96,17 @@ msgctxt "medium_format"
 msgid ""
 "90 rpm, vertical-cut shellac discs, produced by the Pathé label from 1906 to"
 " 1932."
-msgstr ""
+msgstr "Discos de goma-laca verticalmente cortados, de 90 rpm, produzidos pela gravadora Pathé de 1906 à 1932."

 #: DB:work_attribute_type_allowed_value/value:794
 msgctxt "work_attribute_type_allowed_value"
 msgid "A Dorian"
-msgstr ""
+msgstr "Lá Dórico"

 #: DB:work_attribute_type_allowed_value/value:806
 msgctxt "work_attribute_type_allowed_value"
 msgid "A Mixolydian"
-msgstr ""
+msgstr "Lá Mixolídio"

 #: DB:work_type/description:2
 msgctxt "work_type"
@@ -146,7 +147,7 @@ msgstr ""
 #: DB:work_attribute_type_allowed_value/value:28
 msgctxt "work_attribute_type_allowed_value"
 msgid "A major"
-msgstr "Uma maioria"
+msgstr "Lá maior"

 #: DB:work_type/description:8
 msgctxt "work_type"
@@ -167,7 +168,7 @@ msgstr ""
 #: DB:work_attribute_type_allowed_value/value:29
 msgctxt "work_attribute_type_allowed_value"
 msgid "A minor"
-msgstr "Uma minoria"
+msgstr "Lá menor"

 #: DB:work_type/description:13
 msgctxt "work_type"
@@ -350,17 +351,17 @@ msgstr ""
 #: DB:work_attribute_type_allowed_value/value:26
 msgctxt "work_attribute_type_allowed_value"
 msgid "A-flat major"
-msgstr ""
+msgstr "Lá bemol maior"

 #: DB:work_attribute_type_allowed_value/value:27
 msgctxt "work_attribute_type_allowed_value"
 msgid "A-flat minor"
-msgstr ""
+msgstr "Lá bemol menor"

 #: DB:work_attribute_type_allowed_value/value:30
 msgctxt "work_attribute_type_allowed_value"
 msgid "A-sharp minor"
-msgstr ""
+msgstr "Lá sustenido menor"

 #: DB:work_attribute_type/name:23
 msgctxt "work_attribute_type"
@@ -755,32 +756,32 @@ msgstr ""
 #: DB:work_attribute_type_allowed_value/value:795
 msgctxt "work_attribute_type_allowed_value"
 msgid "B Dorian"
-msgstr ""
+msgstr "Si Dórico"

 #: DB:work_attribute_type_allowed_value/value:807
 msgctxt "work_attribute_type_allowed_value"
 msgid "B Mixolydian"
-msgstr ""
+msgstr "Si Mixolídio"

 #: DB:work_attribute_type_allowed_value/value:33
 msgctxt "work_attribute_type_allowed_value"
 msgid "B major"
-msgstr ""
+msgstr "Si maior"

 #: DB:work_attribute_type_allowed_value/value:34
 msgctxt "work_attribute_type_allowed_value"
 msgid "B minor"
-msgstr ""
+msgstr "Si menor"

 #: DB:work_attribute_type_allowed_value/value:31
 msgctxt "work_attribute_type_allowed_value"
 msgid "B-flat major"
-msgstr ""
+msgstr "Si bemol maior"

 #: DB:work_attribute_type_allowed_value/value:32
 msgctxt "work_attribute_type_allowed_value"
 msgid "B-flat minor"
-msgstr ""
+msgstr "Si bemol menor"

 #: DB:work_attribute_type/name:7
 msgctxt "work_attribute_type"
@@ -1062,37 +1063,37 @@ msgstr ""
 #: DB:work_attribute_type_allowed_value/value:789
 msgctxt "work_attribute_type_allowed_value"
 msgid "C Dorian"
-msgstr ""
+msgstr "Dó Dórico"

 #: DB:work_attribute_type_allowed_value/value:801
 msgctxt "work_attribute_type_allowed_value"
 msgid "C Mixolydian"
-msgstr ""
+msgstr "Dó MIxolídio"

 #: DB:work_attribute_type_allowed_value/value:2
 msgctxt "work_attribute_type_allowed_value"
 msgid "C major"
-msgstr ""
+msgstr "Dó maior"

 #: DB:work_attribute_type_allowed_value/value:3
 msgctxt "work_attribute_type_allowed_value"
 msgid "C minor"
-msgstr ""
+msgstr "Dó menor"

 #: DB:work_attribute_type_allowed_value/value:1
 msgctxt "work_attribute_type_allowed_value"
 msgid "C-flat major"
-msgstr ""
+msgstr "Dó bemol maior"

 #: DB:work_attribute_type_allowed_value/value:4
 msgctxt "work_attribute_type_allowed_value"
 msgid "C-sharp major"
-msgstr ""
+msgstr "Dó sustenido maior"

 #: DB:work_attribute_type_allowed_value/value:5
 msgctxt "work_attribute_type_allowed_value"
 msgid "C-sharp minor"
-msgstr ""
+msgstr "Dó sustenido menor"

 #: DB:work_attribute_type/name:19
 msgctxt "work_attribute_type"
@@ -1318,37 +1319,37 @@ msgstr ""
 #: DB:work_attribute_type_allowed_value/value:790
 msgctxt "work_attribute_type_allowed_value"
 msgid "D Dorian"
-msgstr ""
+msgstr "Ré Dórico"

 #: DB:work_attribute_type_allowed_value/value:802
 msgctxt "work_attribute_type_allowed_value"
 msgid "D Mixolydian"
-msgstr ""
+msgstr "Ré Mixolídio"

 #: DB:work_attribute_type_allowed_value/value:8
 msgctxt "work_attribute_type_allowed_value"
 msgid "D major"
-msgstr ""
+msgstr "Ré maior"

 #: DB:work_attribute_type_allowed_value/value:9
 msgctxt "work_attribute_type_allowed_value"
 msgid "D minor"
-msgstr ""
+msgstr "Ré menor"

 #: DB:work_attribute_type_allowed_value/value:6
 msgctxt "work_attribute_type_allowed_value"
 msgid "D-flat major"
-msgstr ""
+msgstr "Ré bemol maior"

 #: DB:work_attribute_type_allowed_value/value:7
 msgctxt "work_attribute_type_allowed_value"
 msgid "D-flat minor"
-msgstr ""
+msgstr "Ré bemol menor"

 #: DB:work_attribute_type_allowed_value/value:10
 msgctxt "work_attribute_type_allowed_value"
 msgid "D-sharp minor"
-msgstr ""
+msgstr "Ré sustenido menor"

 #: DB:medium_format/name:11
 msgctxt "medium_format"
@@ -1553,7 +1554,7 @@ msgstr "Digipak"
 #: DB:medium_format/name:12
 msgctxt "medium_format"
 msgid "Digital Media"
-msgstr "Mídia Digitalk"
+msgstr "Mídia Digital"

 #: DB:work_attribute_type_allowed_value/value:345
 msgctxt "work_attribute_type_allowed_value"
@@ -1633,17 +1634,17 @@ msgstr "DualDisc"
 #: DB:medium_format/name:67
 msgctxt "medium_format"
 msgid "DualDisc (CD side)"
-msgstr ""
+msgstr "DualDisc (lado do CD)"

 #: DB:medium_format/name:65
 msgctxt "medium_format"
 msgid "DualDisc (DVD-Audio side)"
-msgstr ""
+msgstr "DualDisc (lado do DVD de Áudio)"

 #: DB:medium_format/name:66
 msgctxt "medium_format"
 msgid "DualDisc (DVD-Video side)"
-msgstr ""
+msgstr "DualDisc (lado do DVD de Vídeo)"

 #: DB:work_attribute_type_allowed_value/value:612
 msgctxt "work_attribute_type_allowed_value"
@@ -1733,37 +1734,37 @@ msgstr ""
 #: DB:work_attribute_type_allowed_value/value:791
 msgctxt "work_attribute_type_allowed_value"
 msgid "E Dorian"
-msgstr ""
+msgstr "Mi Dórico"

 #: DB:work_attribute_type_allowed_value/value:803
 msgctxt "work_attribute_type_allowed_value"
 msgid "E Mixolydian"
-msgstr ""
+msgstr "Mi Mixolídio"

 #: DB:work_attribute_type_allowed_value/value:13
 msgctxt "work_attribute_type_allowed_value"
 msgid "E major"
-msgstr ""
+msgstr "Mi maior"

 #: DB:work_attribute_type_allowed_value/value:14
 msgctxt "work_attribute_type_allowed_value"
 msgid "E minor"
-msgstr ""
+msgstr "Mi menor"

 #: DB:work_attribute_type_allowed_value/value:11
 msgctxt "work_attribute_type_allowed_value"
 msgid "E-flat major"
-msgstr ""
+msgstr "Mi bemol maior"

 #: DB:work_attribute_type_allowed_value/value:12
 msgctxt "work_attribute_type_allowed_value"
 msgid "E-flat minor"
-msgstr ""
+msgstr "Mi bemol menor"

 #: DB:work_attribute_type_allowed_value/value:15
 msgctxt "work_attribute_type_allowed_value"
 msgid "E-sharp minor"
-msgstr ""
+msgstr "Mi sustenido menor"

 #: DB:release_group_primary_type/name:3
 msgctxt "release_group_primary_type"
@@ -1878,37 +1879,37 @@ msgstr ""
 #: DB:work_attribute_type_allowed_value/value:792
 msgctxt "work_attribute_type_allowed_value"
 msgid "F Dorian"
-msgstr ""
+msgstr "Fá Dórico"

 #: DB:work_attribute_type_allowed_value/value:804
 msgctxt "work_attribute_type_allowed_value"
 msgid "F Mixolydian"
-msgstr ""
+msgstr "Fá MIxolídio"

 #: DB:work_attribute_type_allowed_value/value:17
 msgctxt "work_attribute_type_allowed_value"
 msgid "F major"
-msgstr ""
+msgstr "Fá maior"

 #: DB:work_attribute_type_allowed_value/value:18
 msgctxt "work_attribute_type_allowed_value"
 msgid "F minor"
-msgstr ""
+msgstr "Fá menor"

 #: DB:work_attribute_type_allowed_value/value:16
 msgctxt "work_attribute_type_allowed_value"
 msgid "F-flat major"
-msgstr ""
+msgstr "Fá bemol maior"

 #: DB:work_attribute_type_allowed_value/value:19
 msgctxt "work_attribute_type_allowed_value"
 msgid "F-sharp major"
-msgstr ""
+msgstr "Fá sustenido maior"

 #: DB:work_attribute_type_allowed_value/value:20
 msgctxt "work_attribute_type_allowed_value"
 msgid "F-sharp minor"
-msgstr ""
+msgstr "Fá sustenido menor"

 #: DB:work_attribute_type_allowed_value/value:731
 msgctxt "work_attribute_type_allowed_value"
@@ -2036,37 +2037,37 @@ msgstr ""
 #: DB:work_attribute_type_allowed_value/value:793
 msgctxt "work_attribute_type_allowed_value"
 msgid "G Dorian"
-msgstr ""
+msgstr "Sol Dórico"

 #: DB:work_attribute_type_allowed_value/value:805
 msgctxt "work_attribute_type_allowed_value"
 msgid "G Mixolydian"
-msgstr ""
+msgstr "Sol Mixolídio"

 #: DB:work_attribute_type_allowed_value/value:22
 msgctxt "work_attribute_type_allowed_value"
 msgid "G major"
-msgstr ""
+msgstr "Sol maior"

 #: DB:work_attribute_type_allowed_value/value:23
 msgctxt "work_attribute_type_allowed_value"
 msgid "G minor"
-msgstr ""
+msgstr "Sol menor"

 #: DB:work_attribute_type_allowed_value/value:21
 msgctxt "work_attribute_type_allowed_value"
 msgid "G-flat major"
-msgstr ""
+msgstr "Sol bemol maior"

 #: DB:work_attribute_type_allowed_value/value:24
 msgctxt "work_attribute_type_allowed_value"
 msgid "G-sharp major"
-msgstr ""
+msgstr "Sol sustenido maior"

 #: DB:work_attribute_type_allowed_value/value:25
 msgctxt "work_attribute_type_allowed_value"
 msgid "G-sharp minor"
-msgstr ""
+msgstr "Sol sustenido menor"

 #: DB:work_attribute_type/name:9
 msgctxt "work_attribute_type"
@@ -2633,7 +2634,7 @@ msgstr ""
 #: DB:area_type/name:6
 msgctxt "area_type"
 msgid "Island"
-msgstr ""
+msgstr "Ilha"

 #: DB:area_type/description:6
 msgctxt "area_type"
@@ -2641,7 +2642,7 @@ msgid ""
 "Island is used for islands and atolls which don't form subdivisions of their"
 " own, e.g. Skye. These are not considered when displaying the parent areas "
 "for a given area."
-msgstr ""
+msgstr "Ilha é usado para ilhas e atóis que não formam subdivisões de si mesmas, e.g. Ilhabela. Essas não são consideradas ao exibir as áreas pai para uma determinada área."

 #: DB:work_attribute_type/name:3
 msgctxt "work_attribute_type"
@@ -3026,7 +3027,7 @@ msgstr ""
 #: DB:editor_collection_type/name:10
 msgctxt "collection_type"
 msgid "Label"
-msgstr "Rótulo"
+msgstr "Gravadora"

 #: DB:label_alias_type/name:1
 msgctxt "alias_type"
@@ -3251,7 +3252,7 @@ msgstr ""
 #: DB:cover_art_archive.art_type/name:4
 msgctxt "cover_art_type"
 msgid "Medium"
-msgstr "Médio"
+msgstr "Mídia"

 #: DB:work_attribute_type_allowed_value/value:176
 msgctxt "work_attribute_type_allowed_value"
@@ -3404,7 +3405,7 @@ msgid ""
 "Municipality is used for small administrative divisions which, for urban "
 "municipalities, often contain a single city and a few surrounding villages. "
 "Rural municipalities typically group several villages together."
-msgstr ""
+msgstr "Municipalidade é usado para pequenas divisões administrativas que, para municipalidades urbanas, frequentemente contêm uma única cidade e algumas vilas ao redor. Municipalidades rurais tipicamente agrupam várias vilas."

 #: DB:work_attribute_type_allowed_value/value:645
 msgctxt "work_attribute_type_allowed_value"
@@ -3419,7 +3420,7 @@ msgstr ""
 #: DB:work_type/name:29
 msgctxt "work_type"
 msgid "Musical"
-msgstr ""
+msgstr "Musical"

 #: DB:work_type/description:29
 msgctxt "work_type"
@@ -3871,7 +3872,7 @@ msgstr "Outro"
 #: DB:place_type/name:3
 msgctxt "place_type"
 msgid "Other"
-msgstr ""
+msgstr "Outro"

 #: DB:release_group_primary_type/name:11
 msgctxt "release_group_primary_type"
@@ -3886,7 +3887,7 @@ msgstr "Outro"
 #: DB:instrument_type/name:5
 msgctxt "instrument_type"
 msgid "Other instrument"
-msgstr ""
+msgstr "Outro instrumento"

 #: DB:work_type/name:12
 msgctxt "work_type"
@@ -3986,12 +3987,12 @@ msgstr ""
 #: DB:editor_collection_type/name:11
 msgctxt "collection_type"
 msgid "Place"
-msgstr ""
+msgstr "Local"

 #: DB:place_alias_type/name:1
 msgctxt "alias_type"
 msgid "Place name"
-msgstr ""
+msgstr "Nome do local"

 #: DB:work_type/name:28
 msgctxt "work_type"
@@ -4226,12 +4227,12 @@ msgstr ""
 #: DB:editor_collection_type/name:1
 msgctxt "collection_type"
 msgid "Release"
-msgstr "Lançamento"
+msgstr "Álbum"

 #: DB:series_type/name:2
 msgctxt "series_type"
 msgid "Release"
-msgstr "Lançamento"
+msgstr "Álbum"

 #: DB:editor_collection_type/name:13
 msgctxt "collection_type"
@@ -4251,7 +4252,7 @@ msgstr ""
 #: DB:release_alias_type/name:1
 msgctxt "alias_type"
 msgid "Release name"
-msgstr ""
+msgstr "Nome do álbum"

 #: DB:place_type/name:6
 msgctxt "place_type"
@@ -4596,14 +4597,14 @@ msgstr ""
 #: DB:medium_format/name:53
 msgctxt "medium_format"
 msgid "Shellac"
-msgstr ""
+msgstr "Goma-laca"

 #: DB:medium_format/description:53
 msgctxt "medium_format"
 msgid ""
 "Shellac records were the most predominant type of gramophone record during "
 "the first half of the 20th century."
-msgstr ""
+msgstr "Discos de goma-laca foram o tipo mais predominante de discos de gramofone durante a primeira metade do século XX."

 #: DB:work_attribute_type_allowed_value/value:236
 msgctxt "work_attribute_type_allowed_value"
@@ -4720,7 +4721,7 @@ msgstr ""
 #: DB:area_type/name:2
 msgctxt "area_type"
 msgid "Subdivision"
-msgstr ""
+msgstr "Subdivisão"

 #: DB:area_type/description:2
 msgctxt "area_type"
@@ -4728,7 +4729,7 @@ msgid ""
 "Subdivision is used for the main administrative divisions of a country, e.g."
 " California, Ontario, Okinawa. These are considered when displaying the "
 "parent areas for a given area."
-msgstr ""
+msgstr "Subdivisão é usado para a principal divisão administrativa de um país, e.g. São Paulo, Texas, Okinawa. Essas são consideradas ao exibir as áreas pai para uma determinada área."

 #: DB:work_attribute_type_allowed_value/value:244
 msgctxt "work_attribute_type_allowed_value"
--- a/po/attributes/sv.po
+++ b/po/attributes/sv.po
@@ -1,5 +1,7 @@
 # Translators:
 # Translators:
+# A. Regnander <anton_r_3@hotmail.com>, 2017
+# Jonatan Nyberg <jonatan@autistici.org>, 2017
 # Kristoffer Grundström <kristoffer.grundstrom1983@gmail.com>, 2016
 # Killinstinct <myaku@msn.com>, 2015
 # Robin Björnsvik <robin@bjornsvik.se>, 2013
@@ -7,8 +9,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: MusicBrainz\n"
-"PO-Revision-Date: 2017-01-16 20:46+0000\n"
-"Last-Translator: Laurent Monin <i18n@norz.org>\n"
+"PO-Revision-Date: 2017-02-09 17:58+0000\n"
+"Last-Translator: A. Regnander <anton_r_3@hotmail.com>\n"
 "Language-Team: Swedish (http://www.transifex.com/musicbrainz/musicbrainz/language/sv/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -246,7 +248,7 @@ msgstr "En serie händelser."
 #: DB:series_type/description:9
 msgctxt "series_type"
 msgid "A series of performances of the same show at the same venue."
-msgstr ""
+msgstr "En serie uppträdanden av samma föreställning på samma plats."

 #: DB:series_type/description:3
 msgctxt "series_type"
@@ -256,27 +258,27 @@ msgstr "En serie inspelningar."
 #: DB:series_type/description:7
 msgctxt "series_type"
 msgid "A series of related concerts by an artist in different locations."
-msgstr ""
+msgstr "En serie relaterade konserter av en artist på olika platser."

 #: DB:series_type/description:1
 msgctxt "series_type"
 msgid "A series of release groups."
-msgstr ""
+msgstr "En serie utgivningsgrupper."

 #: DB:series_type/description:2
 msgctxt "series_type"
 msgid "A series of releases."
-msgstr ""
+msgstr "En serie utgivningar."

 #: DB:series_type/description:5
 msgctxt "series_type"
 msgid "A series of works which form a catalogue of classical compositions."
-msgstr ""
+msgstr "En ser verk som bildar en katalog över klassiska kompositioner."

 #: DB:series_type/description:4
 msgctxt "series_type"
 msgid "A series of works."
-msgstr ""
+msgstr "En serie verk."

 #: DB:work_type/description:15
 msgctxt "work_type"
@@ -3877,7 +3879,7 @@ msgstr "Annan"
 #: DB:instrument_type/name:5
 msgctxt "instrument_type"
 msgid "Other instrument"
-msgstr ""
+msgstr "Andra instrument"

 #: DB:work_type/name:12
 msgctxt "work_type"
@@ -3887,7 +3889,7 @@ msgstr "Ouvertyr"
 #: DB:editor_collection_type/name:2
 msgctxt "collection_type"
 msgid "Owned music"
-msgstr ""
+msgstr "Ägd musik"

 #: DB:work_attribute_type_allowed_value/value:762
 msgctxt "work_attribute_type_allowed_value"
@@ -3982,12 +3984,12 @@ msgstr ""
 #: DB:place_alias_type/name:1
 msgctxt "alias_type"
 msgid "Place name"
-msgstr ""
+msgstr "Platsnamn"

 #: DB:work_type/name:28
 msgctxt "work_type"
 msgid "Play"
-msgstr ""
+msgstr "Pjäs"

 #: DB:medium_format/name:45
 msgctxt "medium_format"
@@ -4182,7 +4184,7 @@ msgstr ""
 #: DB:editor_collection_type/name:12
 msgctxt "collection_type"
 msgid "Recording"
-msgstr ""
+msgstr "Inspelning"

 #: DB:series_type/name:3
 msgctxt "series_type"
@@ -4192,7 +4194,7 @@ msgstr "Inspelning"
 #: DB:recording_alias_type/name:1
 msgctxt "alias_type"
 msgid "Recording name"
-msgstr ""
+msgstr "Inspelningsnamn"

 #: DB:medium_format/name:10
 msgctxt "medium_format"
@@ -4217,37 +4219,37 @@ msgstr ""
 #: DB:editor_collection_type/name:1
 msgctxt "collection_type"
 msgid "Release"
-msgstr ""
+msgstr "Utgivning"

 #: DB:series_type/name:2
 msgctxt "series_type"
 msgid "Release"
-msgstr ""
+msgstr "Utgivning"

 #: DB:editor_collection_type/name:13
 msgctxt "collection_type"
 msgid "Release group"
-msgstr ""
+msgstr "Utgivningsgrupp"

 #: DB:series_type/name:1
 msgctxt "series_type"
 msgid "Release group"
-msgstr ""
+msgstr "Utgivningsgrupp"

 #: DB:release_group_alias_type/name:1
 msgctxt "alias_type"
 msgid "Release group name"
-msgstr ""
+msgstr "Utgivningsgruppnamn"

 #: DB:release_alias_type/name:1
 msgctxt "alias_type"
 msgid "Release name"
-msgstr ""
+msgstr "Utgivningsnamn"

 #: DB:place_type/name:6
 msgctxt "place_type"
 msgid "Religious building"
-msgstr ""
+msgstr "Religiös byggnad"

 #: DB:work_attribute_type_allowed_value/value:765
 msgctxt "work_attribute_type_allowed_value"
@@ -4297,7 +4299,7 @@ msgstr ""
 #: DB:series_type/name:9
 msgctxt "series_type"
 msgid "Run"
-msgstr ""
+msgstr "Kör"

 #: DB:work_attribute_type_allowed_value/value:521
 msgctxt "work_attribute_type_allowed_value"
@@ -4382,7 +4384,7 @@ msgstr ""
 #: DB:medium_format/name:62
 msgctxt "medium_format"
 msgid "SD Card"
-msgstr ""
+msgstr "SD-kort"

 #: DB:work_attribute_type/name:8
 msgctxt "work_attribute_type"
@@ -4572,12 +4574,12 @@ msgstr ""
 #: DB:editor_collection_type/name:14
 msgctxt "collection_type"
 msgid "Series"
-msgstr ""
+msgstr "Serier"

 #: DB:series_alias_type/name:1
 msgctxt "alias_type"
 msgid "Series name"
-msgstr ""
+msgstr "Serienamn"

 #: DB:work_attribute_type_allowed_value/value:663
 msgctxt "work_attribute_type_allowed_value"
@@ -4666,7 +4668,7 @@ msgctxt "series_ordering_type"
 msgid ""
 "Sorts the items in the series automatically by their number attributes, "
 "using a natural sort order."
-msgstr ""
+msgstr "Sorterar objekten i serien automatiskt efter dess nummerattributer, med en naturlig sorteringsordning."

 #: DB:release_group_secondary_type/name:2
 msgctxt "release_group_secondary_type"
@@ -4701,12 +4703,12 @@ msgstr "Klistermärke"
 #: DB:instrument_type/name:2
 msgctxt "instrument_type"
 msgid "String instrument"
-msgstr ""
+msgstr "Sträng instrument"

 #: DB:place_type/name:1
 msgctxt "place_type"
 msgid "Studio"
-msgstr ""
+msgstr "Studio"

 #: DB:area_type/name:2
 msgctxt "area_type"
@@ -4894,7 +4896,7 @@ msgstr ""
 #: DB:work_attribute_type_allowed_value/value:668
 msgctxt "work_attribute_type_allowed_value"
 msgid "Tango"
-msgstr ""
+msgstr "Tango"

 #: DB:work_attribute_type_allowed_value/value:575
 msgctxt "work_attribute_type_allowed_value"
@@ -5170,7 +5172,7 @@ msgstr "VCD"
 #: DB:medium_format/name:59
 msgctxt "medium_format"
 msgid "VHD"
-msgstr ""
+msgstr "VHD"

 #: DB:medium_format/name:21
 msgctxt "medium_format"
@@ -5312,7 +5314,7 @@ msgstr ""
 #: DB:cover_art_archive.art_type/name:13
 msgctxt "cover_art_type"
 msgid "Watermark"
-msgstr ""
+msgstr "Vattenmärke"

 #: DB:medium_format/name:14
 msgctxt "medium_format"
@@ -5322,22 +5324,22 @@ msgstr "Fonografcylinder"
 #: DB:instrument_type/name:1
 msgctxt "instrument_type"
 msgid "Wind instrument"
-msgstr ""
+msgstr "Blåsinstrument"

 #: DB:editor_collection_type/name:3
 msgctxt "collection_type"
 msgid "Wishlist"
-msgstr ""
+msgstr "Önskelista"

 #: DB:editor_collection_type/name:15
 msgctxt "collection_type"
 msgid "Work"
-msgstr ""
+msgstr "Verk"

 #: DB:series_type/name:4
 msgctxt "series_type"
 msgid "Work"
-msgstr ""
+msgstr "Verk"

 #: DB:work_alias_type/name:1
 msgctxt "alias_type"
@@ -5450,7 +5452,7 @@ msgstr ""
 #: DB:work_attribute_type_allowed_value/value:681
 msgctxt "work_attribute_type_allowed_value"
 msgid "ambiguous"
-msgstr ""
+msgstr "tvetydligt"

 #: DB:medium_format/name:27
 msgctxt "medium_format"
--- a/po/attributes/zh_CN.po
+++ b/po/attributes/zh_CN.po
@@ -4,14 +4,15 @@
 #   Alastair McKinstry <mckinstry@computer.org>, 2002
 # Alastair McKinstry <mckinstry@computer.org>, 2001
 # Clay Cheng <clay1994@mail.hfut.edu.cn>, 2016
+# Erwin Synth <kingdzy1996@gmail.com>, 2017
 #   Free Software Foundation, Inc., 2002, 2003, 2007, 2008
 # RedHotHeat <gbonner@iol.ie>, 2012
 # RedHotHeat <gbonner@iol.ie>, 2012
 #   LI Daobing <lidaobing@gmail.com>, 2007, 2008, 2009, 2010, 2011
 # LI Daobing <lidaobing@gmail.com>, 2007, 2008, 2009, 2010
-# Lin Xueyuan <767763591@qq.com>, 2016
+# LXY <767763591@qq.com>, 2016
 # 毛瑞盈 <mry_33@163.com>, 2014
-# niklasb <niklas.berglund@gmail.com>, 2016
+# Niklas Berglund <niklas.berglund@gmail.com>, 2016
 #   Tobias Toedter <t.toedter@gmx.net>, 2007
 #   - Wang Jian <lark@linux.net.cn>, 2000
 # YunQiang Su <wzssyqa@gmail.com>, 2011
@@ -19,8 +20,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: MusicBrainz\n"
-"PO-Revision-Date: 2017-01-16 20:46+0000\n"
-"Last-Translator: Laurent Monin <i18n@norz.org>\n"
+"PO-Revision-Date: 2017-03-06 17:43+0000\n"
+"Last-Translator: Erwin Synth <kingdzy1996@gmail.com>\n"
 "Language-Team: Chinese (China) (http://www.transifex.com/musicbrainz/musicbrainz/language/zh_CN/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -128,7 +129,7 @@ msgstr ""
 msgctxt "work_type"
 msgid ""
 "A concerto is a musical work for soloist(s) accompanied by an orchestra."
-msgstr ""
+msgstr "“协奏曲”是伴有交响的独奏音乐作品。"

 #: DB:event_type/description:4
 msgctxt "event_type"
@@ -253,7 +254,7 @@ msgstr ""
 #: DB:series_type/description:6
 msgctxt "series_type"
 msgid "A series of events."
-msgstr ""
+msgstr "一系列事件"

 #: DB:series_type/description:9
 msgctxt "series_type"
@@ -312,7 +313,7 @@ msgctxt "work_type"
 msgid ""
 "A soundtrack is the music that accompanies a film, TV program, videogame, or"
 " even book."
-msgstr ""
+msgstr "原声是指电影、电视节目、游戏或书籍所伴有的音乐。"

 #: DB:work_type/description:6
 msgctxt "work_type"
@@ -1781,7 +1782,7 @@ msgstr ""
 #: DB:instrument_type/name:4
 msgctxt "instrument_type"
 msgid "Electronic instrument"
-msgstr ""
+msgstr "电子乐器"

 #: DB:medium_format/name:42
 msgctxt "medium_format"
@@ -1811,12 +1812,12 @@ msgstr ""
 #: DB:series_type/name:6
 msgctxt "series_type"
 msgid "Event"
-msgstr ""
+msgstr "事件"

 #: DB:event_alias_type/name:1
 msgctxt "alias_type"
 msgid "Event name"
-msgstr ""
+msgstr "事件名称"

 #: DB:work_attribute_type_allowed_value/value:729
 msgctxt "work_attribute_type_allowed_value"
@@ -1891,27 +1892,27 @@ msgstr ""
 #: DB:work_attribute_type_allowed_value/value:17
 msgctxt "work_attribute_type_allowed_value"
 msgid "F major"
-msgstr ""
+msgstr "F 大调"

 #: DB:work_attribute_type_allowed_value/value:18
 msgctxt "work_attribute_type_allowed_value"
 msgid "F minor"
-msgstr ""
+msgstr "F 小调"

 #: DB:work_attribute_type_allowed_value/value:16
 msgctxt "work_attribute_type_allowed_value"
 msgid "F-flat major"
-msgstr ""
+msgstr "降 F 大调"

 #: DB:work_attribute_type_allowed_value/value:19
 msgctxt "work_attribute_type_allowed_value"
 msgid "F-sharp major"
-msgstr ""
+msgstr "升 F 大调"

 #: DB:work_attribute_type_allowed_value/value:20
 msgctxt "work_attribute_type_allowed_value"
 msgid "F-sharp minor"
-msgstr ""
+msgstr "升 F 小调"

 #: DB:work_attribute_type_allowed_value/value:731
 msgctxt "work_attribute_type_allowed_value"
@@ -2049,27 +2050,27 @@ msgstr ""
 #: DB:work_attribute_type_allowed_value/value:22
 msgctxt "work_attribute_type_allowed_value"
 msgid "G major"
-msgstr ""
+msgstr "G 大调"

 #: DB:work_attribute_type_allowed_value/value:23
 msgctxt "work_attribute_type_allowed_value"
 msgid "G minor"
-msgstr ""
+msgstr "G 小调"

 #: DB:work_attribute_type_allowed_value/value:21
 msgctxt "work_attribute_type_allowed_value"
 msgid "G-flat major"
-msgstr ""
+msgstr "降 G 大调"

 #: DB:work_attribute_type_allowed_value/value:24
 msgctxt "work_attribute_type_allowed_value"
 msgid "G-sharp major"
-msgstr ""
+msgstr "升 G 大调"

 #: DB:work_attribute_type_allowed_value/value:25
 msgctxt "work_attribute_type_allowed_value"
 msgid "G-sharp minor"
-msgstr ""
+msgstr "升 G 小调"

 #: DB:work_attribute_type/name:9
 msgctxt "work_attribute_type"
@@ -2566,12 +2567,12 @@ msgstr ""
 #: DB:place_type/name:5
 msgctxt "place_type"
 msgid "Indoor arena"
-msgstr ""
+msgstr "室内竞技场"

 #: DB:editor_collection_type/name:9
 msgctxt "collection_type"
 msgid "Instrument"
-msgstr ""
+msgstr "乐器"

 #: DB:instrument_alias_type/name:1
 msgctxt "alias_type"
@@ -2586,7 +2587,7 @@ msgstr "采访"
 #: DB:work_attribute_type_allowed_value/value:427
 msgctxt "work_attribute_type_allowed_value"
 msgid "Irak"
-msgstr ""
+msgstr "伊拉克"

 #: DB:work_attribute_type_allowed_value/value:428
 msgctxt "work_attribute_type_allowed_value"
@@ -2601,7 +2602,7 @@ msgstr ""
 #: DB:work_attribute_type_allowed_value/value:429
 msgctxt "work_attribute_type_allowed_value"
 msgid "Isfahan"
-msgstr ""
+msgstr "伊斯法罕"

 #: DB:work_attribute_type_allowed_value/value:430
 msgctxt "work_attribute_type_allowed_value"
@@ -3029,7 +3030,7 @@ msgstr ""
 #: DB:editor_collection_type/name:10
 msgctxt "collection_type"
 msgid "Label"
-msgstr ""
+msgstr "标签"

 #: DB:label_alias_type/name:1
 msgctxt "alias_type"
@@ -3084,7 +3085,7 @@ msgstr ""
 #: DB:cover_art_archive.art_type/name:12
 msgctxt "cover_art_type"
 msgid "Liner"
-msgstr ""
+msgstr "线性"

 #: DB:release_group_secondary_type/name:6
 msgctxt "release_group_secondary_type"
@@ -3844,7 +3845,7 @@ msgstr "清唱剧"
 #: DB:artist_type/name:5
 msgctxt "artist_type"
 msgid "Orchestra"
-msgstr ""
+msgstr "交响乐"

 #: DB:label_type/name:4
 msgctxt "label_type"
@@ -3999,12 +4000,12 @@ msgstr ""
 #: DB:work_type/name:28
 msgctxt "work_type"
 msgid "Play"
-msgstr ""
+msgstr "播放"

 #: DB:medium_format/name:45
 msgctxt "medium_format"
 msgid "Playbutton"
-msgstr ""
+msgstr "播放键"

 #: DB:work_type/name:21
 msgctxt "work_type"
@@ -4309,7 +4310,7 @@ msgstr ""
 #: DB:series_type/name:9
 msgctxt "series_type"
 msgid "Run"
-msgstr ""
+msgstr "运行"

 #: DB:work_attribute_type_allowed_value/value:521
 msgctxt "work_attribute_type_allowed_value"
@@ -4394,7 +4395,7 @@ msgstr ""
 #: DB:medium_format/name:62
 msgctxt "medium_format"
 msgid "SD Card"
-msgstr ""
+msgstr "SD 卡"

 #: DB:work_attribute_type/name:8
 msgctxt "work_attribute_type"
@@ -4584,7 +4585,7 @@ msgstr ""
 #: DB:editor_collection_type/name:14
 msgctxt "collection_type"
 msgid "Series"
-msgstr ""
+msgstr "系列"

 #: DB:series_alias_type/name:1
 msgctxt "alias_type"
@@ -4703,22 +4704,22 @@ msgstr "演讲"
 #: DB:place_type/name:4
 msgctxt "place_type"
 msgid "Stadium"
-msgstr ""
+msgstr "体育场"

 #: DB:cover_art_archive.art_type/name:10
 msgctxt "cover_art_type"
 msgid "Sticker"
-msgstr ""
+msgstr "表情贴纸"

 #: DB:instrument_type/name:2
 msgctxt "instrument_type"
 msgid "String instrument"
-msgstr ""
+msgstr "弦乐器"

 #: DB:place_type/name:1
 msgctxt "place_type"
 msgid "Studio"
-msgstr ""
+msgstr "工作室"

 #: DB:area_type/name:2
 msgctxt "area_type"
@@ -4906,7 +4907,7 @@ msgstr ""
 #: DB:work_attribute_type_allowed_value/value:668
 msgctxt "work_attribute_type_allowed_value"
 msgid "Tango"
-msgstr ""
+msgstr "探戈"

 #: DB:work_attribute_type_allowed_value/value:575
 msgctxt "work_attribute_type_allowed_value"
@@ -5049,7 +5050,7 @@ msgstr ""
 #: DB:release_packaging/description:1
 msgctxt "release_packaging"
 msgid "The traditional CD case, made of hard, brittle plastic."
-msgstr ""
+msgstr "传统 CD 盒由硬脆塑料制成。"

 #: DB:work_type/description:23
 msgctxt "work_type"
@@ -5082,12 +5083,12 @@ msgstr ""
 #: DB:cover_art_archive.art_type/name:7
 msgctxt "cover_art_type"
 msgid "Track"
-msgstr ""
+msgstr "音轨"

 #: DB:cover_art_archive.art_type/name:9
 msgctxt "cover_art_type"
 msgid "Tray"
-msgstr ""
+msgstr "托盘"

 #: DB:work_attribute_type_allowed_value/value:775
 msgctxt "work_attribute_type_allowed_value"
@@ -5324,7 +5325,7 @@ msgstr ""
 #: DB:cover_art_archive.art_type/name:13
 msgctxt "cover_art_type"
 msgid "Watermark"
-msgstr ""
+msgstr "水印"

 #: DB:medium_format/name:14
 msgctxt "medium_format"
@@ -5339,7 +5340,7 @@ msgstr ""
 #: DB:editor_collection_type/name:3
 msgctxt "collection_type"
 msgid "Wishlist"
-msgstr ""
+msgstr "愿望单"

 #: DB:editor_collection_type/name:15
 msgctxt "collection_type"
--- a/po/bg.po
+++ b/po/bg.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: MusicBrainz\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2017-01-18 12:51+0100\n"
-"PO-Revision-Date: 2017-01-19 09:17+0000\n"
+"POT-Creation-Date: 2017-03-05 09:58+0100\n"
+"PO-Revision-Date: 2017-03-05 10:00+0000\n"
 "Last-Translator: nikki\n"
 "Language-Team: Bulgarian (http://www.transifex.com/musicbrainz/musicbrainz/language/bg/)\n"
 "MIME-Version: 1.0\n"
@@ -56,26 +56,26 @@ msgstr ""
 msgid "Unmatched Files"
 msgstr ""

-#: picard/album.py:206
+#: picard/album.py:200
 #, python-format
 msgid "[could not load album %s]"
 msgstr "[неуспешно зареждане на албума %s]"

-#: picard/album.py:295
+#: picard/album.py:289
 #, python-format
 msgid "Album %(id)s loaded: %(artist)s - %(album)s"
 msgstr ""

-#: picard/album.py:338
+#: picard/album.py:332
 #, python-format
 msgid "Loading album %(id)s ..."
 msgstr ""

-#: picard/album.py:342
+#: picard/album.py:336
 msgid "[loading album information]"
 msgstr "[зареждане на информация за албума]"

-#: picard/album.py:527
+#: picard/album.py:523
 #, python-format
 msgid "; %i image"
 msgid_plural "; %i images"
@@ -97,72 +97,72 @@ msgstr ""
 msgid "Looking up the metadata for cluster %(album)s..."
 msgstr ""

-#: picard/collection.py:64
+#: picard/collection.py:67
 #, python-format
 msgid "Added %(count)i release to collection \"%(name)s\""
 msgid_plural "Added %(count)i releases to collection \"%(name)s\""
 msgstr[0] ""
 msgstr[1] ""

-#: picard/collection.py:86
+#: picard/collection.py:89
 #, python-format
 msgid "Removed %(count)i release from collection \"%(name)s\""
 msgid_plural "Removed %(count)i releases from collection \"%(name)s\""
 msgstr[0] ""
 msgstr[1] ""

-#: picard/collection.py:100
+#: picard/collection.py:104
 #, python-format
 msgid "Error loading collections: %(error)s"
 msgstr ""

-#: picard/config_upgrade.py:58 picard/config_upgrade.py:71
+#: picard/config_upgrade.py:57 picard/config_upgrade.py:70
 msgid "Various Artists file naming scheme removal"
 msgstr ""

-#: picard/config_upgrade.py:59
+#: picard/config_upgrade.py:58
 msgid ""
 "The separate file naming scheme for various artists albums has been removed in this version of Picard.\n"
 "Your file naming scheme has automatically been merged with that of single artist albums."
 msgstr ""

-#: picard/config_upgrade.py:72
+#: picard/config_upgrade.py:71
 msgid ""
 "The separate file naming scheme for various artists albums has been removed in this version of Picard.\n"
 "You currently do not use this option, but have a separate file naming scheme defined.\n"
 "Do you want to remove it or merge it with your file naming scheme for single artist albums?"
 msgstr ""

-#: picard/config_upgrade.py:78
+#: picard/config_upgrade.py:77
 msgid "Merge"
 msgstr ""

-#: picard/config_upgrade.py:78 picard/ui/metadatabox.py:314
+#: picard/config_upgrade.py:77 picard/ui/metadatabox.py:314
 #: picard/ui/options/interface.py:75 picard/ui/ui_options_interface.py:141
 msgid "Remove"
 msgstr ""

-#: picard/config_upgrade.py:193 picard/ui/options/scripting.py:28
+#: picard/config_upgrade.py:200 picard/ui/options/scripting.py:28
 #, python-format
 msgid "My script %d"
 msgstr ""

-#: picard/file.py:541
+#: picard/file.py:565
 #, python-format
 msgid "No matching tracks for file '%(filename)s'"
 msgstr ""

-#: picard/file.py:557
+#: picard/file.py:581
 #, python-format
 msgid "No matching tracks above the threshold for file '%(filename)s'"
 msgstr ""

-#: picard/file.py:564
+#: picard/file.py:588
 #, python-format
 msgid "File '%(filename)s' identified!"
 msgstr ""

-#: picard/file.py:584
+#: picard/file.py:608
 #, python-format
 msgid "Looking up the metadata for file %(filename)s ..."
 msgstr ""
@@ -205,23 +205,23 @@ msgstr ""
 msgid "[no release info]"
 msgstr ""

-#: picard/tagger.py:405 picard/tagger.py:438
+#: picard/tagger.py:407 picard/tagger.py:440
 #, python-format
 msgid "Adding %(count)d file from '%(directory)s' ..."
 msgid_plural "Adding %(count)d files from '%(directory)s' ..."
 msgstr[0] ""
 msgstr[1] ""

-#: picard/tagger.py:597
+#: picard/tagger.py:599
 #, python-format
 msgid "Removing album %(id)s: %(artist)s - %(album)s"
 msgstr ""

-#: picard/tagger.py:613
+#: picard/tagger.py:615
 msgid "CD Lookup Error"
 msgstr ""

-#: picard/tagger.py:614
+#: picard/tagger.py:616
 #, python-format
 msgid ""
 "Error while reading CD:\n"
@@ -269,6 +269,10 @@ msgstr "Френски"
 msgid "Italian"
 msgstr "Италиански"

+#: picard/const/languages.py:57
+msgid "Norwegian Bokmal"
+msgstr ""
+
 #: picard/const/languages.py:59
 msgid "Dutch"
 msgstr "Холандски"
@@ -332,12 +336,12 @@ msgstr ""
 msgid "Whitelist"
 msgstr ""

-#: picard/ui/cdlookup.py:35 picard/ui/mainwindow.py:625 picard/util/tags.py:21
+#: picard/ui/cdlookup.py:35 picard/ui/mainwindow.py:626 picard/util/tags.py:21
 msgid "Album"
 msgstr "Албум"

-#: picard/ui/cdlookup.py:35 picard/ui/itemviews.py:96
-#: picard/ui/mainwindow.py:626 picard/ui/searchdialog.py:326
+#: picard/ui/cdlookup.py:35 picard/ui/itemviews.py:105
+#: picard/ui/mainwindow.py:627 picard/ui/searchdialog.py:326
 #: picard/ui/searchdialog.py:513 picard/util/tags.py:22
 msgid "Artist"
 msgstr "Изпълнител"
@@ -371,10 +375,22 @@ msgid_plural "%s (%i releases)"
 msgstr[0] ""
 msgstr[1] ""

-#: picard/ui/coverartbox.py:143
+#: picard/ui/coverartbox.py:141
 msgid "View release on MusicBrainz"
 msgstr ""

+#: picard/ui/coverartbox.py:174
+msgid "Show more details"
+msgstr ""
+
+#: picard/ui/coverartbox.py:199
+msgid "New Cover Art"
+msgstr ""
+
+#: picard/ui/coverartbox.py:200
+msgid "Original Cover Art"
+msgstr ""
+
 #: picard/ui/filebrowser.py:40
 msgid "&Move Tagged Files Here"
 msgstr ""
@@ -503,116 +519,116 @@ msgstr ""
 msgid "Pending requests"
 msgstr ""

-#: picard/ui/itemviews.py:94 picard/util/tags.py:23
+#: picard/ui/itemviews.py:103 picard/util/tags.py:23
 msgid "Title"
 msgstr "Заглавие"

-#: picard/ui/itemviews.py:95 picard/ui/searchdialog.py:325
+#: picard/ui/itemviews.py:104 picard/ui/searchdialog.py:325
 #: picard/util/tags.py:87
 msgid "Length"
 msgstr "Времетраене"

-#: picard/ui/itemviews.py:162
+#: picard/ui/itemviews.py:171
 msgid "Bad match"
 msgstr ""

-#: picard/ui/itemviews.py:163
+#: picard/ui/itemviews.py:172
 msgid "Poor match"
 msgstr ""

-#: picard/ui/itemviews.py:164
+#: picard/ui/itemviews.py:173
 msgid "Ok match"
 msgstr ""

-#: picard/ui/itemviews.py:165
+#: picard/ui/itemviews.py:174
 msgid "Good match"
 msgstr ""

-#: picard/ui/itemviews.py:166
+#: picard/ui/itemviews.py:175
 msgid "Great match"
 msgstr ""

-#: picard/ui/itemviews.py:167
+#: picard/ui/itemviews.py:176
 msgid "Excellent match"
 msgstr ""

-#: picard/ui/itemviews.py:243
+#: picard/ui/itemviews.py:252
 msgid "&Expand all"
 msgstr ""

-#: picard/ui/itemviews.py:245
+#: picard/ui/itemviews.py:254
 msgid "&Collapse all"
 msgstr ""

-#: picard/ui/itemviews.py:247
+#: picard/ui/itemviews.py:256
 msgid "Select &all"
 msgstr ""

-#: picard/ui/itemviews.py:249
+#: picard/ui/itemviews.py:258
 msgid "Ctrl+A"
 msgstr ""

-#: picard/ui/itemviews.py:315
+#: picard/ui/itemviews.py:324
 msgid "&Other versions"
 msgstr ""

-#: picard/ui/itemviews.py:318
+#: picard/ui/itemviews.py:327
 msgid "Loading..."
 msgstr ""

-#: picard/ui/itemviews.py:383
+#: picard/ui/itemviews.py:392
 msgid "Collections"
 msgstr ""

-#: picard/ui/itemviews.py:386
+#: picard/ui/itemviews.py:395
 msgid "P&lugins"
 msgstr ""

-#: picard/ui/itemviews.py:557
+#: picard/ui/itemviews.py:577
 msgid "file view"
 msgstr ""

-#: picard/ui/itemviews.py:558
+#: picard/ui/itemviews.py:578
 msgid "Contains unmatched files and clusters"
 msgstr ""

-#: picard/ui/itemviews.py:578
+#: picard/ui/itemviews.py:598
 msgid "Clusters"
 msgstr ""

-#: picard/ui/itemviews.py:587
+#: picard/ui/itemviews.py:607
 msgid "album view"
 msgstr ""

-#: picard/ui/itemviews.py:588
+#: picard/ui/itemviews.py:608
 msgid "Contains albums and matched files"
 msgstr ""

-#: picard/ui/itemviews.py:694 picard/ui/options/renaming.py:188
+#: picard/ui/itemviews.py:714 picard/ui/options/renaming.py:188
 msgid "Error"
 msgstr "Грешка"

-#: picard/ui/itemviews.py:698
+#: picard/ui/itemviews.py:718
 msgid "Album modified and complete"
 msgstr ""

-#: picard/ui/itemviews.py:701
+#: picard/ui/itemviews.py:721
 msgid "Album unchanged and complete"
 msgstr ""

-#: picard/ui/itemviews.py:705
+#: picard/ui/itemviews.py:725
 msgid "Album modified"
 msgstr ""

-#: picard/ui/itemviews.py:708
+#: picard/ui/itemviews.py:728
 msgid "Album unchanged"
 msgstr ""

-#: picard/ui/itemviews.py:811
+#: picard/ui/itemviews.py:831
 msgid "Track saved"
 msgstr ""

-#: picard/ui/itemviews.py:813 picard/ui/itemviews.py:817
+#: picard/ui/itemviews.py:833 picard/ui/itemviews.py:837
 msgid "Pending"
 msgstr ""

@@ -803,7 +819,7 @@ msgstr "Ctrl+B"
 msgid "&Cover Art"
 msgstr ""

-#: picard/ui/mainwindow.py:407 picard/ui/mainwindow.py:619
+#: picard/ui/mainwindow.py:407 picard/ui/mainwindow.py:620
 #: picard/ui/searchdialog.py:71
 msgid "Search"
 msgstr "Търсене"
@@ -830,175 +846,179 @@ msgid ""
 "even if they have no metadata"
 msgstr ""

-#: picard/ui/mainwindow.py:421
+#: picard/ui/mainwindow.py:420
+msgid "Identify the file using its AcoustID audio fingerprint"
+msgstr ""
+
+#: picard/ui/mainwindow.py:422
 msgid "Ctrl+Y"
 msgstr "Ctrl+Y"

-#: picard/ui/mainwindow.py:424
+#: picard/ui/mainwindow.py:425
 msgid "Cl&uster"
 msgstr ""

-#: picard/ui/mainwindow.py:425
+#: picard/ui/mainwindow.py:426
 msgid "Cluster files into album clusters"
 msgstr ""

-#: picard/ui/mainwindow.py:428
+#: picard/ui/mainwindow.py:429
 msgid "Ctrl+U"
 msgstr "Ctrl+U"

-#: picard/ui/mainwindow.py:431
+#: picard/ui/mainwindow.py:432
 msgid "&Lookup"
 msgstr "&Търсене"

-#: picard/ui/mainwindow.py:432
+#: picard/ui/mainwindow.py:433
 msgid "Lookup selected items in MusicBrainz"
 msgstr ""

-#: picard/ui/mainwindow.py:437
+#: picard/ui/mainwindow.py:438
 msgid "Ctrl+L"
 msgstr "Ctrl+L"

-#: picard/ui/mainwindow.py:440
+#: picard/ui/mainwindow.py:441
 msgid "&Info..."
 msgstr ""

-#: picard/ui/mainwindow.py:443
+#: picard/ui/mainwindow.py:444
 msgid "Ctrl+I"
 msgstr ""

-#: picard/ui/mainwindow.py:446
+#: picard/ui/mainwindow.py:447
 msgid "&Refresh"
 msgstr "&Опресняване"

-#: picard/ui/mainwindow.py:447
+#: picard/ui/mainwindow.py:448
 msgid "Ctrl+R"
 msgstr ""

-#: picard/ui/mainwindow.py:450
+#: picard/ui/mainwindow.py:451
 msgid "&Rename Files"
 msgstr ""

-#: picard/ui/mainwindow.py:455
+#: picard/ui/mainwindow.py:456
 msgid "&Move Files"
 msgstr ""

-#: picard/ui/mainwindow.py:460
+#: picard/ui/mainwindow.py:461
 msgid "Save &Tags"
 msgstr ""

-#: picard/ui/mainwindow.py:465
+#: picard/ui/mainwindow.py:466
 msgid "Tags From &File Names..."
 msgstr ""

-#: picard/ui/mainwindow.py:469
+#: picard/ui/mainwindow.py:470
 msgid "&Open My Collections in Browser"
 msgstr ""

-#: picard/ui/mainwindow.py:473
+#: picard/ui/mainwindow.py:474
 msgid "View Error/Debug &Log"
 msgstr ""

-#: picard/ui/mainwindow.py:476
+#: picard/ui/mainwindow.py:477
 msgid "View Activity &History"
 msgstr ""

-#: picard/ui/mainwindow.py:483
+#: picard/ui/mainwindow.py:484
 msgid "Open in &Player"
 msgstr ""

-#: picard/ui/mainwindow.py:484
+#: picard/ui/mainwindow.py:485
 msgid "Play the file in your default media player"
 msgstr ""

-#: picard/ui/mainwindow.py:488
+#: picard/ui/mainwindow.py:489
 msgid "Open Containing &Folder"
 msgstr ""

-#: picard/ui/mainwindow.py:489
+#: picard/ui/mainwindow.py:490
 msgid "Open the containing folder in your file explorer"
 msgstr ""

-#: picard/ui/mainwindow.py:518
+#: picard/ui/mainwindow.py:519
 msgid "&File"
 msgstr "&Файл"

-#: picard/ui/mainwindow.py:529
+#: picard/ui/mainwindow.py:530
 msgid "&Edit"
 msgstr "&Редакция"

-#: picard/ui/mainwindow.py:535
+#: picard/ui/mainwindow.py:536
 msgid "&View"
 msgstr ""

-#: picard/ui/mainwindow.py:541
+#: picard/ui/mainwindow.py:542
 msgid "&Options"
 msgstr "&Настройки"

-#: picard/ui/mainwindow.py:547
+#: picard/ui/mainwindow.py:548
 msgid "&Tools"
 msgstr "&Инструменти"

-#: picard/ui/mainwindow.py:558 picard/ui/util.py:35
+#: picard/ui/mainwindow.py:559 picard/ui/util.py:35
 msgid "&Help"
 msgstr "Помо&щ"

-#: picard/ui/mainwindow.py:586
+#: picard/ui/mainwindow.py:587
 msgid "Actions"
 msgstr ""

-#: picard/ui/mainwindow.py:627
+#: picard/ui/mainwindow.py:628
 msgid "Track"
 msgstr "Песен"

-#: picard/ui/mainwindow.py:703
+#: picard/ui/mainwindow.py:704
 msgid "All Supported Formats"
 msgstr "Всички поддържани формати"

-#: picard/ui/mainwindow.py:730
+#: picard/ui/mainwindow.py:731
 #, python-format
 msgid "Adding multiple directories from '%(directory)s' ..."
 msgstr ""

-#: picard/ui/mainwindow.py:735
+#: picard/ui/mainwindow.py:736
 #, python-format
 msgid "Adding directory: '%(directory)s' ..."
 msgstr ""

-#: picard/ui/mainwindow.py:801
+#: picard/ui/mainwindow.py:809
 msgid "Configuration Required"
 msgstr ""

-#: picard/ui/mainwindow.py:802
+#: picard/ui/mainwindow.py:810
 msgid ""
 "Audio fingerprinting is not yet configured. Would you like to configure it "
 "now?"
 msgstr ""

-#: picard/ui/mainwindow.py:902
+#: picard/ui/mainwindow.py:916
 #, python-format
 msgid "%(filename)s (error: %(error)s)"
 msgstr ""

-#: picard/ui/mainwindow.py:908
+#: picard/ui/mainwindow.py:922
 #, python-format
 msgid "%(filename)s"
 msgstr ""

-#: picard/ui/mainwindow.py:918
+#: picard/ui/mainwindow.py:933
 #, python-format
 msgid "%(filename)s (%(similarity)d%%) (error: %(error)s)"
 msgstr ""

-#: picard/ui/mainwindow.py:925
+#: picard/ui/mainwindow.py:940
 #, python-format
 msgid "%(filename)s (%(similarity)d%%)"
 msgstr ""

-#: picard/ui/mainwindow.py:961
+#: picard/ui/mainwindow.py:976
 msgid "Authentication Required"
 msgstr ""

-#: picard/ui/mainwindow.py:962
+#: picard/ui/mainwindow.py:977
 msgid ""
 "Picard needs authorization to access your personal data on the MusicBrainz "
 "server. Would you like to log in now?"
@@ -1107,7 +1127,7 @@ msgstr ""
 msgid "Retry"
 msgstr ""

-#: picard/ui/searchdialog.py:288
+#: picard/ui/searchdialog.py:283
 #, python-format
 msgid ""
 "<strong>Following error occurred while fetching "
@@ -1911,19 +1931,19 @@ msgstr ""
 msgid "Reset all settings for current option page"
 msgstr ""

-#: picard/ui/options/dialog.py:166
+#: picard/ui/options/dialog.py:172
 msgid "You are about to reset your options for this page."
 msgstr ""

-#: picard/ui/options/dialog.py:170
+#: picard/ui/options/dialog.py:176
 msgid "Warning! This will reset all of your settings."
 msgstr ""

-#: picard/ui/options/dialog.py:177
+#: picard/ui/options/dialog.py:183
 msgid "Confirm Reset"
 msgstr ""

-#: picard/ui/options/dialog.py:178
+#: picard/ui/options/dialog.py:184
 msgid "Are you sure?"
 msgstr ""

@@ -2094,7 +2114,7 @@ msgstr ""
 msgid "File Naming"
 msgstr ""

-#: picard/ui/options/renaming.py:175 picard/ui/options/scripting.py:406
+#: picard/ui/options/renaming.py:175 picard/ui/options/scripting.py:410
 msgid ""
 "<a href=\"%(picard-doc-scripting-url)s\">Open Scripting Documentation in "
 "your browser</a>"
@@ -2136,15 +2156,15 @@ msgstr ""
 msgid "Scripting"
 msgstr "Скриптове"

-#: picard/ui/options/scripting.py:292
+#: picard/ui/options/scripting.py:293
 msgid "Are you sure you want to remove this script?"
 msgstr ""

-#: picard/ui/options/scripting.py:293
+#: picard/ui/options/scripting.py:294
 msgid "Confirm Remove"
 msgstr ""

-#: picard/ui/options/scripting.py:376
+#: picard/ui/options/scripting.py:377
 msgid "Script Error"
 msgstr "Грешка в скрипта"

--- a/po/ca.po
+++ b/po/ca.po
@@ -11,8 +11,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: MusicBrainz\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2017-01-18 12:51+0100\n"
-"PO-Revision-Date: 2017-01-19 09:17+0000\n"
+"POT-Creation-Date: 2017-03-05 09:58+0100\n"
+"PO-Revision-Date: 2017-03-05 10:00+0000\n"
 "Last-Translator: nikki\n"
 "Language-Team: Catalan (http://www.transifex.com/musicbrainz/musicbrainz/language/ca/)\n"
 "MIME-Version: 1.0\n"
@@ -59,26 +59,26 @@ msgstr ""
 msgid "Unmatched Files"
 msgstr "Fitxers sense coincidències"

-#: picard/album.py:206
+#: picard/album.py:200
 #, python-format
 msgid "[could not load album %s]"
 msgstr "[no s'ha pogut carregar l'àlbum %s]"

-#: picard/album.py:295
+#: picard/album.py:289
 #, python-format
 msgid "Album %(id)s loaded: %(artist)s - %(album)s"
 msgstr ""

-#: picard/album.py:338
+#: picard/album.py:332
 #, python-format
 msgid "Loading album %(id)s ..."
 msgstr ""

-#: picard/album.py:342
+#: picard/album.py:336
 msgid "[loading album information]"
 msgstr "[carregant informació de l'àlbum]"

-#: picard/album.py:527
+#: picard/album.py:523
 #, python-format
 msgid "; %i image"
 msgid_plural "; %i images"
@@ -100,72 +100,72 @@ msgstr ""
 msgid "Looking up the metadata for cluster %(album)s..."
 msgstr ""

-#: picard/collection.py:64
+#: picard/collection.py:67
 #, python-format
 msgid "Added %(count)i release to collection \"%(name)s\""
 msgid_plural "Added %(count)i releases to collection \"%(name)s\""
 msgstr[0] ""
 msgstr[1] ""

-#: picard/collection.py:86
+#: picard/collection.py:89
 #, python-format
 msgid "Removed %(count)i release from collection \"%(name)s\""
 msgid_plural "Removed %(count)i releases from collection \"%(name)s\""
 msgstr[0] ""
 msgstr[1] ""

-#: picard/collection.py:100
+#: picard/collection.py:104
 #, python-format
 msgid "Error loading collections: %(error)s"
 msgstr "Error al carregar les col·leccions: %(error)s"

-#: picard/config_upgrade.py:58 picard/config_upgrade.py:71
+#: picard/config_upgrade.py:57 picard/config_upgrade.py:70
 msgid "Various Artists file naming scheme removal"
 msgstr ""

-#: picard/config_upgrade.py:59
+#: picard/config_upgrade.py:58
 msgid ""
 "The separate file naming scheme for various artists albums has been removed in this version of Picard.\n"
 "Your file naming scheme has automatically been merged with that of single artist albums."
 msgstr ""

-#: picard/config_upgrade.py:72
+#: picard/config_upgrade.py:71
 msgid ""
 "The separate file naming scheme for various artists albums has been removed in this version of Picard.\n"
 "You currently do not use this option, but have a separate file naming scheme defined.\n"
 "Do you want to remove it or merge it with your file naming scheme for single artist albums?"
 msgstr ""

-#: picard/config_upgrade.py:78
+#: picard/config_upgrade.py:77
 msgid "Merge"
 msgstr "Fusiona"

-#: picard/config_upgrade.py:78 picard/ui/metadatabox.py:314
+#: picard/config_upgrade.py:77 picard/ui/metadatabox.py:314
 #: picard/ui/options/interface.py:75 picard/ui/ui_options_interface.py:141
 msgid "Remove"
 msgstr "Elimina"

-#: picard/config_upgrade.py:193 picard/ui/options/scripting.py:28
+#: picard/config_upgrade.py:200 picard/ui/options/scripting.py:28
 #, python-format
 msgid "My script %d"
 msgstr ""

-#: picard/file.py:541
+#: picard/file.py:565
 #, python-format
 msgid "No matching tracks for file '%(filename)s'"
 msgstr ""

-#: picard/file.py:557
+#: picard/file.py:581
 #, python-format
 msgid "No matching tracks above the threshold for file '%(filename)s'"
 msgstr ""

-#: picard/file.py:564
+#: picard/file.py:588
 #, python-format
 msgid "File '%(filename)s' identified!"
 msgstr ""

-#: picard/file.py:584
+#: picard/file.py:608
 #, python-format
 msgid "Looking up the metadata for file %(filename)s ..."
 msgstr ""
@@ -208,23 +208,23 @@ msgstr ""
 msgid "[no release info]"
 msgstr ""

-#: picard/tagger.py:405 picard/tagger.py:438
+#: picard/tagger.py:407 picard/tagger.py:440
 #, python-format
 msgid "Adding %(count)d file from '%(directory)s' ..."
 msgid_plural "Adding %(count)d files from '%(directory)s' ..."
 msgstr[0] ""
 msgstr[1] ""

-#: picard/tagger.py:597
+#: picard/tagger.py:599
 #, python-format
 msgid "Removing album %(id)s: %(artist)s - %(album)s"
 msgstr ""

-#: picard/tagger.py:613
+#: picard/tagger.py:615
 msgid "CD Lookup Error"
 msgstr "Error al cercar el CD"

-#: picard/tagger.py:614
+#: picard/tagger.py:616
 #, python-format
 msgid ""
 "Error while reading CD:\n"
@@ -272,6 +272,10 @@ msgstr "Francès"
 msgid "Italian"
 msgstr "Italià"

+#: picard/const/languages.py:57
+msgid "Norwegian Bokmal"
+msgstr ""
+
 #: picard/const/languages.py:59
 msgid "Dutch"
 msgstr "Neerlandès"
@@ -335,12 +339,12 @@ msgstr ""
 msgid "Whitelist"
 msgstr ""

-#: picard/ui/cdlookup.py:35 picard/ui/mainwindow.py:625 picard/util/tags.py:21
+#: picard/ui/cdlookup.py:35 picard/ui/mainwindow.py:626 picard/util/tags.py:21
 msgid "Album"
 msgstr "Àlbum"

-#: picard/ui/cdlookup.py:35 picard/ui/itemviews.py:96
-#: picard/ui/mainwindow.py:626 picard/ui/searchdialog.py:326
+#: picard/ui/cdlookup.py:35 picard/ui/itemviews.py:105
+#: picard/ui/mainwindow.py:627 picard/ui/searchdialog.py:326
 #: picard/ui/searchdialog.py:513 picard/util/tags.py:22
 msgid "Artist"
 msgstr "Artista"
@@ -374,10 +378,22 @@ msgid_plural "%s (%i releases)"
 msgstr[0] ""
 msgstr[1] ""

-#: picard/ui/coverartbox.py:143
+#: picard/ui/coverartbox.py:141
 msgid "View release on MusicBrainz"
 msgstr ""

+#: picard/ui/coverartbox.py:174
+msgid "Show more details"
+msgstr ""
+
+#: picard/ui/coverartbox.py:199
+msgid "New Cover Art"
+msgstr ""
+
+#: picard/ui/coverartbox.py:200
+msgid "Original Cover Art"
+msgstr ""
+
 #: picard/ui/filebrowser.py:40
 msgid "&Move Tagged Files Here"
 msgstr "&Mou els fitxers etiquetats aquí"
@@ -506,116 +522,116 @@ msgstr "Fitxers pendents"
 msgid "Pending requests"
 msgstr "Peticions pendents"

-#: picard/ui/itemviews.py:94 picard/util/tags.py:23
+#: picard/ui/itemviews.py:103 picard/util/tags.py:23
 msgid "Title"
 msgstr "Títol"

-#: picard/ui/itemviews.py:95 picard/ui/searchdialog.py:325
+#: picard/ui/itemviews.py:104 picard/ui/searchdialog.py:325
 #: picard/util/tags.py:87
 msgid "Length"
 msgstr "Durada"

-#: picard/ui/itemviews.py:162
+#: picard/ui/itemviews.py:171
 msgid "Bad match"
 msgstr ""

-#: picard/ui/itemviews.py:163
+#: picard/ui/itemviews.py:172
 msgid "Poor match"
 msgstr ""

-#: picard/ui/itemviews.py:164
+#: picard/ui/itemviews.py:173
 msgid "Ok match"
 msgstr ""

-#: picard/ui/itemviews.py:165
+#: picard/ui/itemviews.py:174
 msgid "Good match"
 msgstr ""

-#: picard/ui/itemviews.py:166
+#: picard/ui/itemviews.py:175
 msgid "Great match"
 msgstr ""

-#: picard/ui/itemviews.py:167
+#: picard/ui/itemviews.py:176
 msgid "Excellent match"
 msgstr ""

-#: picard/ui/itemviews.py:243
+#: picard/ui/itemviews.py:252
 msgid "&Expand all"
 msgstr "&Expandeix-ho tot"

-#: picard/ui/itemviews.py:245
+#: picard/ui/itemviews.py:254
 msgid "&Collapse all"
 msgstr "&Redueix-ho tot"

-#: picard/ui/itemviews.py:247
+#: picard/ui/itemviews.py:256
 msgid "Select &all"
 msgstr ""

-#: picard/ui/itemviews.py:249
+#: picard/ui/itemviews.py:258
 msgid "Ctrl+A"
 msgstr ""

-#: picard/ui/itemviews.py:315
+#: picard/ui/itemviews.py:324
 msgid "&Other versions"
 msgstr "&Altres versions"

-#: picard/ui/itemviews.py:318
+#: picard/ui/itemviews.py:327
 msgid "Loading..."
 msgstr "Carregant..."

-#: picard/ui/itemviews.py:383
+#: picard/ui/itemviews.py:392
 msgid "Collections"
 msgstr ""

-#: picard/ui/itemviews.py:386
+#: picard/ui/itemviews.py:395
 msgid "P&lugins"
 msgstr ""

-#: picard/ui/itemviews.py:557
+#: picard/ui/itemviews.py:577
 msgid "file view"
 msgstr ""

-#: picard/ui/itemviews.py:558
+#: picard/ui/itemviews.py:578
 msgid "Contains unmatched files and clusters"
 msgstr ""

-#: picard/ui/itemviews.py:578
+#: picard/ui/itemviews.py:598
 msgid "Clusters"
 msgstr "Clústers"

-#: picard/ui/itemviews.py:587
+#: picard/ui/itemviews.py:607
 msgid "album view"
 msgstr ""

-#: picard/ui/itemviews.py:588
+#: picard/ui/itemviews.py:608
 msgid "Contains albums and matched files"
 msgstr ""

-#: picard/ui/itemviews.py:694 picard/ui/options/renaming.py:188
+#: picard/ui/itemviews.py:714 picard/ui/options/renaming.py:188
 msgid "Error"
 msgstr "Error"

-#: picard/ui/itemviews.py:698
+#: picard/ui/itemviews.py:718
 msgid "Album modified and complete"
 msgstr ""

-#: picard/ui/itemviews.py:701
+#: picard/ui/itemviews.py:721
 msgid "Album unchanged and complete"
 msgstr ""

-#: picard/ui/itemviews.py:705
+#: picard/ui/itemviews.py:725
 msgid "Album modified"
 msgstr ""

-#: picard/ui/itemviews.py:708
+#: picard/ui/itemviews.py:728
 msgid "Album unchanged"
 msgstr ""

-#: picard/ui/itemviews.py:811
+#: picard/ui/itemviews.py:831
 msgid "Track saved"
 msgstr ""

-#: picard/ui/itemviews.py:813 picard/ui/itemviews.py:817
+#: picard/ui/itemviews.py:833 picard/ui/itemviews.py:837
 msgid "Pending"
 msgstr ""

@@ -806,7 +822,7 @@ msgstr "Ctrl+B"
 msgid "&Cover Art"
 msgstr "&Caràtules"

-#: picard/ui/mainwindow.py:407 picard/ui/mainwindow.py:619
+#: picard/ui/mainwindow.py:407 picard/ui/mainwindow.py:620
 #: picard/ui/searchdialog.py:71
 msgid "Search"
 msgstr "Cerca"
@@ -833,175 +849,179 @@ msgid ""
 "even if they have no metadata"
 msgstr ""

-#: picard/ui/mainwindow.py:421
+#: picard/ui/mainwindow.py:420
+msgid "Identify the file using its AcoustID audio fingerprint"
+msgstr ""
+
+#: picard/ui/mainwindow.py:422
 msgid "Ctrl+Y"
 msgstr "Ctrl+Y"

-#: picard/ui/mainwindow.py:424
+#: picard/ui/mainwindow.py:425
 msgid "Cl&uster"
 msgstr "Cl&úster"

-#: picard/ui/mainwindow.py:425
+#: picard/ui/mainwindow.py:426
 msgid "Cluster files into album clusters"
 msgstr ""

-#: picard/ui/mainwindow.py:428
+#: picard/ui/mainwindow.py:429
 msgid "Ctrl+U"
 msgstr "Ctrl+U"

-#: picard/ui/mainwindow.py:431
+#: picard/ui/mainwindow.py:432
 msgid "&Lookup"
 msgstr "&Cerca"

-#: picard/ui/mainwindow.py:432
+#: picard/ui/mainwindow.py:433
 msgid "Lookup selected items in MusicBrainz"
 msgstr ""

-#: picard/ui/mainwindow.py:437
+#: picard/ui/mainwindow.py:438
 msgid "Ctrl+L"
 msgstr "Ctrl+L"

-#: picard/ui/mainwindow.py:440
+#: picard/ui/mainwindow.py:441
 msgid "&Info..."
 msgstr "&Informació..."

-#: picard/ui/mainwindow.py:443
+#: picard/ui/mainwindow.py:444
 msgid "Ctrl+I"
 msgstr "Ctrl+I"

-#: picard/ui/mainwindow.py:446
+#: picard/ui/mainwindow.py:447
 msgid "&Refresh"
 msgstr "&Actualitza"

-#: picard/ui/mainwindow.py:447
+#: picard/ui/mainwindow.py:448
 msgid "Ctrl+R"
 msgstr "Ctrl+R"

-#: picard/ui/mainwindow.py:450
+#: picard/ui/mainwindow.py:451
 msgid "&Rename Files"
 msgstr "&Reanomena fitxers"

-#: picard/ui/mainwindow.py:455
+#: picard/ui/mainwindow.py:456
 msgid "&Move Files"
 msgstr "&Mou fitxers"

-#: picard/ui/mainwindow.py:460
+#: picard/ui/mainwindow.py:461
 msgid "Save &Tags"
 msgstr "Desa &etiquetes"

-#: picard/ui/mainwindow.py:465
+#: picard/ui/mainwindow.py:466
 msgid "Tags From &File Names..."
 msgstr "Etiquetar des dels &noms de fitxer"

-#: picard/ui/mainwindow.py:469
+#: picard/ui/mainwindow.py:470
 msgid "&Open My Collections in Browser"
 msgstr ""

-#: picard/ui/mainwindow.py:473
+#: picard/ui/mainwindow.py:474
 msgid "View Error/Debug &Log"
 msgstr ""

-#: picard/ui/mainwindow.py:476
+#: picard/ui/mainwindow.py:477
 msgid "View Activity &History"
 msgstr ""

-#: picard/ui/mainwindow.py:483
+#: picard/ui/mainwindow.py:484
 msgid "Open in &Player"
 msgstr ""

-#: picard/ui/mainwindow.py:484
+#: picard/ui/mainwindow.py:485
 msgid "Play the file in your default media player"
 msgstr ""

-#: picard/ui/mainwindow.py:488
+#: picard/ui/mainwindow.py:489
 msgid "Open Containing &Folder"
 msgstr ""

-#: picard/ui/mainwindow.py:489
+#: picard/ui/mainwindow.py:490
 msgid "Open the containing folder in your file explorer"
 msgstr ""

-#: picard/ui/mainwindow.py:518
+#: picard/ui/mainwindow.py:519
 msgid "&File"
 msgstr "&Fitxer"

-#: picard/ui/mainwindow.py:529
+#: picard/ui/mainwindow.py:530
 msgid "&Edit"
 msgstr "&Editar"

-#: picard/ui/mainwindow.py:535
+#: picard/ui/mainwindow.py:536
 msgid "&View"
 msgstr "&Veure"

-#: picard/ui/mainwindow.py:541
+#: picard/ui/mainwindow.py:542
 msgid "&Options"
 msgstr "&Opcions"

-#: picard/ui/mainwindow.py:547
+#: picard/ui/mainwindow.py:548
 msgid "&Tools"
 msgstr "&Eines"

-#: picard/ui/mainwindow.py:558 picard/ui/util.py:35
+#: picard/ui/mainwindow.py:559 picard/ui/util.py:35
 msgid "&Help"
 msgstr "&Ajuda"

-#: picard/ui/mainwindow.py:586
+#: picard/ui/mainwindow.py:587
 msgid "Actions"
 msgstr ""

-#: picard/ui/mainwindow.py:627
+#: picard/ui/mainwindow.py:628
 msgid "Track"
 msgstr "Pista"

-#: picard/ui/mainwindow.py:703
+#: picard/ui/mainwindow.py:704
 msgid "All Supported Formats"
 msgstr "Tots els formats suportats"

-#: picard/ui/mainwindow.py:730
+#: picard/ui/mainwindow.py:731
 #, python-format
 msgid "Adding multiple directories from '%(directory)s' ..."
 msgstr ""

-#: picard/ui/mainwindow.py:735
+#: picard/ui/mainwindow.py:736
 #, python-format
 msgid "Adding directory: '%(directory)s' ..."
 msgstr ""

-#: picard/ui/mainwindow.py:801
+#: picard/ui/mainwindow.py:809
 msgid "Configuration Required"
 msgstr "Configuració necessària"

-#: picard/ui/mainwindow.py:802
+#: picard/ui/mainwindow.py:810
 msgid ""
 "Audio fingerprinting is not yet configured. Would you like to configure it "
 "now?"
 msgstr "El sistema d'empremtes d'àudio no està configurat. Voleu fer-ho ara?"

-#: picard/ui/mainwindow.py:902
+#: picard/ui/mainwindow.py:916
 #, python-format
 msgid "%(filename)s (error: %(error)s)"
 msgstr ""

-#: picard/ui/mainwindow.py:908
+#: picard/ui/mainwindow.py:922
 #, python-format
 msgid "%(filename)s"
 msgstr ""

-#: picard/ui/mainwindow.py:918
+#: picard/ui/mainwindow.py:933
 #, python-format
 msgid "%(filename)s (%(similarity)d%%) (error: %(error)s)"
 msgstr ""

-#: picard/ui/mainwindow.py:925
+#: picard/ui/mainwindow.py:940
 #, python-format
 msgid "%(filename)s (%(similarity)d%%)"
 msgstr ""

-#: picard/ui/mainwindow.py:961
+#: picard/ui/mainwindow.py:976
 msgid "Authentication Required"
 msgstr ""

-#: picard/ui/mainwindow.py:962
+#: picard/ui/mainwindow.py:977
 msgid ""
 "Picard needs authorization to access your personal data on the MusicBrainz "
 "server. Would you like to log in now?"
@@ -1110,7 +1130,7 @@ msgstr ""
 msgid "Retry"
 msgstr ""

-#: picard/ui/searchdialog.py:288
+#: picard/ui/searchdialog.py:283
 #, python-format
 msgid ""
 "<strong>Following error occurred while fetching "
@@ -1914,19 +1934,19 @@ msgstr ""
 msgid "Reset all settings for current option page"
 msgstr ""

-#: picard/ui/options/dialog.py:166
+#: picard/ui/options/dialog.py:172
 msgid "You are about to reset your options for this page."
 msgstr ""

-#: picard/ui/options/dialog.py:170
+#: picard/ui/options/dialog.py:176
 msgid "Warning! This will reset all of your settings."
 msgstr ""

-#: picard/ui/options/dialog.py:177
+#: picard/ui/options/dialog.py:183
 msgid "Confirm Reset"
 msgstr ""

-#: picard/ui/options/dialog.py:178
+#: picard/ui/options/dialog.py:184
 msgid "Are you sure?"
 msgstr ""

@@ -2097,7 +2117,7 @@ msgstr "Reinicialitza tot"
 msgid "File Naming"
 msgstr ""

-#: picard/ui/options/renaming.py:175 picard/ui/options/scripting.py:406
+#: picard/ui/options/renaming.py:175 picard/ui/options/scripting.py:410
 msgid ""
 "<a href=\"%(picard-doc-scripting-url)s\">Open Scripting Documentation in "
 "your browser</a>"
@@ -2139,15 +2159,15 @@ msgstr ""
 msgid "Scripting"
 msgstr ""

-#: picard/ui/options/scripting.py:292
+#: picard/ui/options/scripting.py:293
 msgid "Are you sure you want to remove this script?"
 msgstr ""

-#: picard/ui/options/scripting.py:293
+#: picard/ui/options/scripting.py:294
 msgid "Confirm Remove"
 msgstr ""

-#: picard/ui/options/scripting.py:376
+#: picard/ui/options/scripting.py:377
 msgid "Script Error"
 msgstr ""

--- a/po/countries/da.po
+++ b/po/countries/da.po
@@ -1,8 +1,8 @@
 # Translators:
 # Translators:
 # FIRST AUTHOR <EMAIL@ADDRESS>, 2006
-# Freso <transifex.net@freso.dk>, 2013
-# Freso <transifex.net@freso.dk>, 2012
+# Frederik “Freso” S. Olesen <transifex.net@freso.dk>, 2013
+# Frederik “Freso” S. Olesen <transifex.net@freso.dk>, 2012
 msgid ""
 msgstr ""
 "Project-Id-Version: MusicBrainz\n"
--- a/po/countries/pl.po
+++ b/po/countries/pl.po
@@ -21,7 +21,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: pl\n"
-"Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
+"Plural-Forms: nplurals=4; plural=(n==1 ? 0 : (n%10>=2 && n%10<=4) && (n%100<12 || n%100>=14) ? 1 : n!=1 && (n%10>=0 && n%10<=1) || (n%10>=5 && n%10<=9) || (n%100>=12 && n%100<=14) ? 2 : 3);\n"

 #. iso.code:AF
 #: DBarea JOIN iso_3166_1 iso on iso.area = area.id/area.name:1
--- a/po/countries/pt_BR.po
+++ b/po/countries/pt_BR.po
@@ -4,17 +4,17 @@
 # Eduardo Bastos <eduardorochacg@gmail.com>, 2012
 # lampih <lampih@gmail.com>, 2012
 # Lucas Gomes <x8lucas8x@gmail.com>, 2012
-# Marco Tulio Costa <mmarcottulio@gmail.com>, 2012
+# Marco Costa <mmarcottulio@gmail.com>, 2012
 # Marcus Vinícius Marques, 2014
-# Marco Tulio Costa <mmarcottulio@gmail.com>, 2012
+# Marco Costa <mmarcottulio@gmail.com>, 2012
 # rafaelbrandao <rblcin@gmail.com>, 2012
 # davitf <transifex@davitf.com>, 2012
 # Lucas Gomes <x8lucas8x@gmail.com>, 2012
 msgid ""
 msgstr ""
 "Project-Id-Version: MusicBrainz\n"
-"PO-Revision-Date: 2015-11-17 13:14+0000\n"
-"Last-Translator: André Aparecido Caniato <andre_caniato@yahoo.com.br>\n"
+"PO-Revision-Date: 2017-02-11 04:56+0000\n"
+"Last-Translator: Marco Costa <mmarcottulio@gmail.com>\n"
 "Language-Team: Portuguese (Brazil) (http://www.transifex.com/musicbrainz/musicbrainz/language/pt_BR/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
--- a/po/countries/sv.po
+++ b/po/countries/sv.po
@@ -1,13 +1,14 @@
 # Translators:
 # Translators:
-# niklasb <niklas.berglund@gmail.com>, 2016
+# Kebabpizza <alex_elle@hotmail.com>, 2017
+# Niklas Berglund <niklas.berglund@gmail.com>, 2016
 # Robin Björnsvik <robin@bjornsvik.se>, 2013
 # Staffan Vilcans, 2014
 msgid ""
 msgstr ""
 "Project-Id-Version: MusicBrainz\n"
-"PO-Revision-Date: 2016-12-05 06:04+0000\n"
-"Last-Translator: niklasb <niklas.berglund@gmail.com>\n"
+"PO-Revision-Date: 2017-02-02 19:44+0000\n"
+"Last-Translator: Kebabpizza <alex_elle@hotmail.com>\n"
 "Language-Team: Swedish (http://www.transifex.com/musicbrainz/musicbrainz/language/sv/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -1078,7 +1079,7 @@ msgstr "Sydkorea"
 #. iso.code:SS
 #: DBarea JOIN iso_3166_1 iso on iso.area = area.id/area.name:257
 msgid "South Sudan"
-msgstr ""
+msgstr "Sydsudan"

 #. iso.code:SU
 #: DBarea JOIN iso_3166_1 iso on iso.area = area.id/area.name:243
--- a/po/cs.po
+++ b/po/cs.po
@@ -11,8 +11,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: MusicBrainz\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2017-01-18 12:51+0100\n"
-"PO-Revision-Date: 2017-01-19 09:17+0000\n"
+"POT-Creation-Date: 2017-03-05 09:58+0100\n"
+"PO-Revision-Date: 2017-03-05 10:00+0000\n"
 "Last-Translator: nikki\n"
 "Language-Team: Czech (http://www.transifex.com/musicbrainz/musicbrainz/language/cs/)\n"
 "MIME-Version: 1.0\n"
@@ -59,26 +59,26 @@ msgstr ""
 msgid "Unmatched Files"
 msgstr "Nerozpoznané soubory"

-#: picard/album.py:206
+#: picard/album.py:200
 #, python-format
 msgid "[could not load album %s]"
 msgstr "[nemohu načíst album %s]"

-#: picard/album.py:295
+#: picard/album.py:289
 #, python-format
 msgid "Album %(id)s loaded: %(artist)s - %(album)s"
 msgstr ""

-#: picard/album.py:338
+#: picard/album.py:332
 #, python-format
 msgid "Loading album %(id)s ..."
 msgstr ""

-#: picard/album.py:342
+#: picard/album.py:336
 msgid "[loading album information]"
 msgstr "[načítají se informace o albu]"

-#: picard/album.py:527
+#: picard/album.py:523
 #, python-format
 msgid "; %i image"
 msgid_plural "; %i images"
@@ -101,7 +101,7 @@ msgstr ""
 msgid "Looking up the metadata for cluster %(album)s..."
 msgstr ""

-#: picard/collection.py:64
+#: picard/collection.py:67
 #, python-format
 msgid "Added %(count)i release to collection \"%(name)s\""
 msgid_plural "Added %(count)i releases to collection \"%(name)s\""
@@ -109,7 +109,7 @@ msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""

-#: picard/collection.py:86
+#: picard/collection.py:89
 #, python-format
 msgid "Removed %(count)i release from collection \"%(name)s\""
 msgid_plural "Removed %(count)i releases from collection \"%(name)s\""
@@ -117,58 +117,58 @@ msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""

-#: picard/collection.py:100
+#: picard/collection.py:104
 #, python-format
 msgid "Error loading collections: %(error)s"
 msgstr ""

-#: picard/config_upgrade.py:58 picard/config_upgrade.py:71
+#: picard/config_upgrade.py:57 picard/config_upgrade.py:70
 msgid "Various Artists file naming scheme removal"
 msgstr ""

-#: picard/config_upgrade.py:59
+#: picard/config_upgrade.py:58
 msgid ""
 "The separate file naming scheme for various artists albums has been removed in this version of Picard.\n"
 "Your file naming scheme has automatically been merged with that of single artist albums."
 msgstr ""

-#: picard/config_upgrade.py:72
+#: picard/config_upgrade.py:71
 msgid ""
 "The separate file naming scheme for various artists albums has been removed in this version of Picard.\n"
 "You currently do not use this option, but have a separate file naming scheme defined.\n"
 "Do you want to remove it or merge it with your file naming scheme for single artist albums?"
 msgstr ""

-#: picard/config_upgrade.py:78
+#: picard/config_upgrade.py:77
 msgid "Merge"
 msgstr "Sloučit"

-#: picard/config_upgrade.py:78 picard/ui/metadatabox.py:314
+#: picard/config_upgrade.py:77 picard/ui/metadatabox.py:314
 #: picard/ui/options/interface.py:75 picard/ui/ui_options_interface.py:141
 msgid "Remove"
 msgstr "Odstranit"

-#: picard/config_upgrade.py:193 picard/ui/options/scripting.py:28
+#: picard/config_upgrade.py:200 picard/ui/options/scripting.py:28
 #, python-format
 msgid "My script %d"
 msgstr ""

-#: picard/file.py:541
+#: picard/file.py:565
 #, python-format
 msgid "No matching tracks for file '%(filename)s'"
 msgstr ""

-#: picard/file.py:557
+#: picard/file.py:581
 #, python-format
 msgid "No matching tracks above the threshold for file '%(filename)s'"
 msgstr ""

-#: picard/file.py:564
+#: picard/file.py:588
 #, python-format
 msgid "File '%(filename)s' identified!"
 msgstr ""

-#: picard/file.py:584
+#: picard/file.py:608
 #, python-format
 msgid "Looking up the metadata for file %(filename)s ..."
 msgstr ""
@@ -211,7 +211,7 @@ msgstr ""
 msgid "[no release info]"
 msgstr "[žádné informace o vydání]"

-#: picard/tagger.py:405 picard/tagger.py:438
+#: picard/tagger.py:407 picard/tagger.py:440
 #, python-format
 msgid "Adding %(count)d file from '%(directory)s' ..."
 msgid_plural "Adding %(count)d files from '%(directory)s' ..."
@@ -219,16 +219,16 @@ msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""

-#: picard/tagger.py:597
+#: picard/tagger.py:599
 #, python-format
 msgid "Removing album %(id)s: %(artist)s - %(album)s"
 msgstr ""

-#: picard/tagger.py:613
+#: picard/tagger.py:615
 msgid "CD Lookup Error"
 msgstr "Chyba při vyhledávání CD"

-#: picard/tagger.py:614
+#: picard/tagger.py:616
 #, python-format
 msgid ""
 "Error while reading CD:\n"
@@ -276,6 +276,10 @@ msgstr "francouzština"
 msgid "Italian"
 msgstr "italština"

+#: picard/const/languages.py:57
+msgid "Norwegian Bokmal"
+msgstr ""
+
 #: picard/const/languages.py:59
 msgid "Dutch"
 msgstr "holandština"
@@ -339,12 +343,12 @@ msgstr ""
 msgid "Whitelist"
 msgstr ""

-#: picard/ui/cdlookup.py:35 picard/ui/mainwindow.py:625 picard/util/tags.py:21
+#: picard/ui/cdlookup.py:35 picard/ui/mainwindow.py:626 picard/util/tags.py:21
 msgid "Album"
 msgstr "Album"

-#: picard/ui/cdlookup.py:35 picard/ui/itemviews.py:96
-#: picard/ui/mainwindow.py:626 picard/ui/searchdialog.py:326
+#: picard/ui/cdlookup.py:35 picard/ui/itemviews.py:105
+#: picard/ui/mainwindow.py:627 picard/ui/searchdialog.py:326
 #: picard/ui/searchdialog.py:513 picard/util/tags.py:22
 msgid "Artist"
 msgstr "Umělec"
@@ -379,10 +383,22 @@ msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""

-#: picard/ui/coverartbox.py:143
+#: picard/ui/coverartbox.py:141
 msgid "View release on MusicBrainz"
 msgstr "Zobrazit vydání na MusicBrainz serveru"

+#: picard/ui/coverartbox.py:174
+msgid "Show more details"
+msgstr ""
+
+#: picard/ui/coverartbox.py:199
+msgid "New Cover Art"
+msgstr ""
+
+#: picard/ui/coverartbox.py:200
+msgid "Original Cover Art"
+msgstr ""
+
 #: picard/ui/filebrowser.py:40
 msgid "&Move Tagged Files Here"
 msgstr "&Přesunout otagované soubory sem"
@@ -511,116 +527,116 @@ msgstr ""
 msgid "Pending requests"
 msgstr ""

-#: picard/ui/itemviews.py:94 picard/util/tags.py:23
+#: picard/ui/itemviews.py:103 picard/util/tags.py:23
 msgid "Title"
 msgstr "Název"

-#: picard/ui/itemviews.py:95 picard/ui/searchdialog.py:325
+#: picard/ui/itemviews.py:104 picard/ui/searchdialog.py:325
 #: picard/util/tags.py:87
 msgid "Length"
 msgstr "Délka"

-#: picard/ui/itemviews.py:162
+#: picard/ui/itemviews.py:171
 msgid "Bad match"
 msgstr ""

-#: picard/ui/itemviews.py:163
+#: picard/ui/itemviews.py:172
 msgid "Poor match"
 msgstr ""

-#: picard/ui/itemviews.py:164
+#: picard/ui/itemviews.py:173
 msgid "Ok match"
 msgstr ""

-#: picard/ui/itemviews.py:165
+#: picard/ui/itemviews.py:174
 msgid "Good match"
 msgstr ""

-#: picard/ui/itemviews.py:166
+#: picard/ui/itemviews.py:175
 msgid "Great match"
 msgstr ""

-#: picard/ui/itemviews.py:167
+#: picard/ui/itemviews.py:176
 msgid "Excellent match"
 msgstr ""

-#: picard/ui/itemviews.py:243
+#: picard/ui/itemviews.py:252
 msgid "&Expand all"
 msgstr "&Rozbalit vše"

-#: picard/ui/itemviews.py:245
+#: picard/ui/itemviews.py:254
 msgid "&Collapse all"
 msgstr "&Sbalit vše"

-#: picard/ui/itemviews.py:247
+#: picard/ui/itemviews.py:256
 msgid "Select &all"
 msgstr ""

-#: picard/ui/itemviews.py:249
+#: picard/ui/itemviews.py:258
 msgid "Ctrl+A"
 msgstr ""

-#: picard/ui/itemviews.py:315
+#: picard/ui/itemviews.py:324
 msgid "&Other versions"
 msgstr "&Ostatní verze"

-#: picard/ui/itemviews.py:318
+#: picard/ui/itemviews.py:327
 msgid "Loading..."
 msgstr "Načítám..."

-#: picard/ui/itemviews.py:383
+#: picard/ui/itemviews.py:392
 msgid "Collections"
 msgstr ""

-#: picard/ui/itemviews.py:386
+#: picard/ui/itemviews.py:395
 msgid "P&lugins"
 msgstr ""

-#: picard/ui/itemviews.py:557
+#: picard/ui/itemviews.py:577
 msgid "file view"
 msgstr ""

-#: picard/ui/itemviews.py:558
+#: picard/ui/itemviews.py:578
 msgid "Contains unmatched files and clusters"
 msgstr ""

-#: picard/ui/itemviews.py:578
+#: picard/ui/itemviews.py:598
 msgid "Clusters"
 msgstr "Klastry"

-#: picard/ui/itemviews.py:587
+#: picard/ui/itemviews.py:607
 msgid "album view"
 msgstr ""

-#: picard/ui/itemviews.py:588
+#: picard/ui/itemviews.py:608
 msgid "Contains albums and matched files"
 msgstr ""

-#: picard/ui/itemviews.py:694 picard/ui/options/renaming.py:188
+#: picard/ui/itemviews.py:714 picard/ui/options/renaming.py:188
 msgid "Error"
 msgstr "Chyba"

-#: picard/ui/itemviews.py:698
+#: picard/ui/itemviews.py:718
 msgid "Album modified and complete"
 msgstr ""

-#: picard/ui/itemviews.py:701
+#: picard/ui/itemviews.py:721
 msgid "Album unchanged and complete"
 msgstr ""

-#: picard/ui/itemviews.py:705
+#: picard/ui/itemviews.py:725
 msgid "Album modified"
 msgstr ""

-#: picard/ui/itemviews.py:708
+#: picard/ui/itemviews.py:728
 msgid "Album unchanged"
 msgstr ""

-#: picard/ui/itemviews.py:811
+#: picard/ui/itemviews.py:831
 msgid "Track saved"
 msgstr ""

-#: picard/ui/itemviews.py:813 picard/ui/itemviews.py:817
+#: picard/ui/itemviews.py:833 picard/ui/itemviews.py:837
 msgid "Pending"
 msgstr ""

@@ -812,7 +828,7 @@ msgstr "Ctrl+B"
 msgid "&Cover Art"
 msgstr "&Obrázek alba"

-#: picard/ui/mainwindow.py:407 picard/ui/mainwindow.py:619
+#: picard/ui/mainwindow.py:407 picard/ui/mainwindow.py:620
 #: picard/ui/searchdialog.py:71
 msgid "Search"
 msgstr "Hledat"
@@ -839,175 +855,179 @@ msgid ""
 "even if they have no metadata"
 msgstr ""

-#: picard/ui/mainwindow.py:421
+#: picard/ui/mainwindow.py:420
+msgid "Identify the file using its AcoustID audio fingerprint"
+msgstr ""
+
+#: picard/ui/mainwindow.py:422
 msgid "Ctrl+Y"
 msgstr "Ctrl+Y"

-#: picard/ui/mainwindow.py:424
+#: picard/ui/mainwindow.py:425
 msgid "Cl&uster"
 msgstr "Kl&astr"

-#: picard/ui/mainwindow.py:425
+#: picard/ui/mainwindow.py:426
 msgid "Cluster files into album clusters"
 msgstr ""

-#: picard/ui/mainwindow.py:428
+#: picard/ui/mainwindow.py:429
 msgid "Ctrl+U"
 msgstr "Ctrl+U"

-#: picard/ui/mainwindow.py:431
+#: picard/ui/mainwindow.py:432
 msgid "&Lookup"
 msgstr "Vyh&ledat"

-#: picard/ui/mainwindow.py:432
+#: picard/ui/mainwindow.py:433
 msgid "Lookup selected items in MusicBrainz"
 msgstr ""

-#: picard/ui/mainwindow.py:437
+#: picard/ui/mainwindow.py:438
 msgid "Ctrl+L"
 msgstr "Ctrl+L"

-#: picard/ui/mainwindow.py:440
+#: picard/ui/mainwindow.py:441
 msgid "&Info..."
 msgstr "&Info..."

-#: picard/ui/mainwindow.py:443
+#: picard/ui/mainwindow.py:444
 msgid "Ctrl+I"
 msgstr "Ctrl+D"

-#: picard/ui/mainwindow.py:446
+#: picard/ui/mainwindow.py:447
 msgid "&Refresh"
 msgstr "O&bnovit"

-#: picard/ui/mainwindow.py:447
+#: picard/ui/mainwindow.py:448
 msgid "Ctrl+R"
 msgstr "Ctrl+R"

-#: picard/ui/mainwindow.py:450
+#: picard/ui/mainwindow.py:451
 msgid "&Rename Files"
 msgstr "&Přejmenovat soubory"

-#: picard/ui/mainwindow.py:455
+#: picard/ui/mainwindow.py:456
 msgid "&Move Files"
 msgstr "Přesunout otagované soubory"

-#: picard/ui/mainwindow.py:460
+#: picard/ui/mainwindow.py:461
 msgid "Save &Tags"
 msgstr "Uložit &tagy"

-#: picard/ui/mainwindow.py:465
+#: picard/ui/mainwindow.py:466
 msgid "Tags From &File Names..."
 msgstr "Tagy z &názvů souborů"

-#: picard/ui/mainwindow.py:469
+#: picard/ui/mainwindow.py:470
 msgid "&Open My Collections in Browser"
 msgstr ""

-#: picard/ui/mainwindow.py:473
+#: picard/ui/mainwindow.py:474
 msgid "View Error/Debug &Log"
 msgstr ""

-#: picard/ui/mainwindow.py:476
+#: picard/ui/mainwindow.py:477
 msgid "View Activity &History"
 msgstr ""

-#: picard/ui/mainwindow.py:483
+#: picard/ui/mainwindow.py:484
 msgid "Open in &Player"
 msgstr ""

-#: picard/ui/mainwindow.py:484
+#: picard/ui/mainwindow.py:485
 msgid "Play the file in your default media player"
 msgstr "Přehrát soubor ve vašem výchozím přehrávači médií"

-#: picard/ui/mainwindow.py:488
+#: picard/ui/mainwindow.py:489
 msgid "Open Containing &Folder"
 msgstr ""

-#: picard/ui/mainwindow.py:489
+#: picard/ui/mainwindow.py:490
 msgid "Open the containing folder in your file explorer"
 msgstr ""

-#: picard/ui/mainwindow.py:518
+#: picard/ui/mainwindow.py:519
 msgid "&File"
 msgstr "&Soubor"

-#: picard/ui/mainwindow.py:529
+#: picard/ui/mainwindow.py:530
 msgid "&Edit"
 msgstr "Ú&pravy"

-#: picard/ui/mainwindow.py:535
+#: picard/ui/mainwindow.py:536
 msgid "&View"
 msgstr "Zo&brazit"

-#: picard/ui/mainwindow.py:541
+#: picard/ui/mainwindow.py:542
 msgid "&Options"
 msgstr "&Možnosti"

-#: picard/ui/mainwindow.py:547
+#: picard/ui/mainwindow.py:548
 msgid "&Tools"
 msgstr "Nás&troje"

-#: picard/ui/mainwindow.py:558 picard/ui/util.py:35
+#: picard/ui/mainwindow.py:559 picard/ui/util.py:35
 msgid "&Help"
 msgstr "&Nápověda"

-#: picard/ui/mainwindow.py:586
+#: picard/ui/mainwindow.py:587
 msgid "Actions"
 msgstr ""

-#: picard/ui/mainwindow.py:627
+#: picard/ui/mainwindow.py:628
 msgid "Track"
 msgstr "Skladba"

-#: picard/ui/mainwindow.py:703
+#: picard/ui/mainwindow.py:704
 msgid "All Supported Formats"
 msgstr "Všechny podporované formáty"

-#: picard/ui/mainwindow.py:730
+#: picard/ui/mainwindow.py:731
 #, python-format
 msgid "Adding multiple directories from '%(directory)s' ..."
 msgstr ""

-#: picard/ui/mainwindow.py:735
+#: picard/ui/mainwindow.py:736
 #, python-format
 msgid "Adding directory: '%(directory)s' ..."
 msgstr ""

-#: picard/ui/mainwindow.py:801
+#: picard/ui/mainwindow.py:809
 msgid "Configuration Required"
 msgstr "Je nutná konfigurace"

-#: picard/ui/mainwindow.py:802
+#: picard/ui/mainwindow.py:810
 msgid ""
 "Audio fingerprinting is not yet configured. Would you like to configure it "
 "now?"
 msgstr ""

-#: picard/ui/mainwindow.py:902
+#: picard/ui/mainwindow.py:916
 #, python-format
 msgid "%(filename)s (error: %(error)s)"
 msgstr ""

-#: picard/ui/mainwindow.py:908
+#: picard/ui/mainwindow.py:922
 #, python-format
 msgid "%(filename)s"
 msgstr ""

-#: picard/ui/mainwindow.py:918
+#: picard/ui/mainwindow.py:933
 #, python-format
 msgid "%(filename)s (%(similarity)d%%) (error: %(error)s)"
 msgstr ""

-#: picard/ui/mainwindow.py:925
+#: picard/ui/mainwindow.py:940
 #, python-format
 msgid "%(filename)s (%(similarity)d%%)"
 msgstr ""

-#: picard/ui/mainwindow.py:961
+#: picard/ui/mainwindow.py:976
 msgid "Authentication Required"
 msgstr ""

-#: picard/ui/mainwindow.py:962
+#: picard/ui/mainwindow.py:977
 msgid ""
 "Picard needs authorization to access your personal data on the MusicBrainz "
 "server. Would you like to log in now?"
@@ -1119,7 +1139,7 @@ msgstr ""
 msgid "Retry"
 msgstr ""

-#: picard/ui/searchdialog.py:288
+#: picard/ui/searchdialog.py:283
 #, python-format
 msgid ""
 "<strong>Following error occurred while fetching "
@@ -1923,19 +1943,19 @@ msgstr ""
 msgid "Reset all settings for current option page"
 msgstr ""

-#: picard/ui/options/dialog.py:166
+#: picard/ui/options/dialog.py:172
 msgid "You are about to reset your options for this page."
 msgstr ""

-#: picard/ui/options/dialog.py:170
+#: picard/ui/options/dialog.py:176
 msgid "Warning! This will reset all of your settings."
 msgstr ""

-#: picard/ui/options/dialog.py:177
+#: picard/ui/options/dialog.py:183
 msgid "Confirm Reset"
 msgstr ""

-#: picard/ui/options/dialog.py:178
+#: picard/ui/options/dialog.py:184
 msgid "Are you sure?"
 msgstr ""

@@ -2106,7 +2126,7 @@ msgstr "Resetovat vše"
 msgid "File Naming"
 msgstr ""

-#: picard/ui/options/renaming.py:175 picard/ui/options/scripting.py:406
+#: picard/ui/options/renaming.py:175 picard/ui/options/scripting.py:410
 msgid ""
 "<a href=\"%(picard-doc-scripting-url)s\">Open Scripting Documentation in "
 "your browser</a>"
@@ -2148,15 +2168,15 @@ msgstr ""
 msgid "Scripting"
 msgstr "Skriptování"

-#: picard/ui/options/scripting.py:292
+#: picard/ui/options/scripting.py:293
 msgid "Are you sure you want to remove this script?"
 msgstr ""

-#: picard/ui/options/scripting.py:293
+#: picard/ui/options/scripting.py:294
 msgid "Confirm Remove"
 msgstr ""

-#: picard/ui/options/scripting.py:376
+#: picard/ui/options/scripting.py:377
 msgid "Script Error"
 msgstr "Chyba skriptu"

--- a/po/cy.po
+++ b/po/cy.po
@@ -9,8 +9,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: MusicBrainz\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2017-01-18 12:51+0100\n"
-"PO-Revision-Date: 2017-01-19 09:17+0000\n"
+"POT-Creation-Date: 2017-03-05 09:58+0100\n"
+"PO-Revision-Date: 2017-03-05 10:00+0000\n"
 "Last-Translator: nikki\n"
 "Language-Team: Welsh (http://www.transifex.com/musicbrainz/musicbrainz/language/cy/)\n"
 "MIME-Version: 1.0\n"
@@ -57,26 +57,26 @@ msgstr ""
 msgid "Unmatched Files"
 msgstr ""

-#: picard/album.py:206
+#: picard/album.py:200
 #, python-format
 msgid "[could not load album %s]"
 msgstr "[methu llwytho albwm %s]"

-#: picard/album.py:295
+#: picard/album.py:289
 #, python-format
 msgid "Album %(id)s loaded: %(artist)s - %(album)s"
 msgstr ""

-#: picard/album.py:338
+#: picard/album.py:332
 #, python-format
 msgid "Loading album %(id)s ..."
 msgstr "Llwytho albwm %(id)s ..."

-#: picard/album.py:342
+#: picard/album.py:336
 msgid "[loading album information]"
 msgstr "[llwytho gwybodaeth yr albwm]"

-#: picard/album.py:527
+#: picard/album.py:523
 #, python-format
 msgid "; %i image"
 msgid_plural "; %i images"
@@ -100,7 +100,7 @@ msgstr ""
 msgid "Looking up the metadata for cluster %(album)s..."
 msgstr ""

-#: picard/collection.py:64
+#: picard/collection.py:67
 #, python-format
 msgid "Added %(count)i release to collection \"%(name)s\""
 msgid_plural "Added %(count)i releases to collection \"%(name)s\""
@@ -109,7 +109,7 @@ msgstr[1] ""
 msgstr[2] ""
 msgstr[3] ""

-#: picard/collection.py:86
+#: picard/collection.py:89
 #, python-format
 msgid "Removed %(count)i release from collection \"%(name)s\""
 msgid_plural "Removed %(count)i releases from collection \"%(name)s\""
@@ -118,58 +118,58 @@ msgstr[1] ""
 msgstr[2] ""
 msgstr[3] ""

-#: picard/collection.py:100
+#: picard/collection.py:104
 #, python-format
 msgid "Error loading collections: %(error)s"
 msgstr ""

-#: picard/config_upgrade.py:58 picard/config_upgrade.py:71
+#: picard/config_upgrade.py:57 picard/config_upgrade.py:70
 msgid "Various Artists file naming scheme removal"
 msgstr ""

-#: picard/config_upgrade.py:59
+#: picard/config_upgrade.py:58
 msgid ""
 "The separate file naming scheme for various artists albums has been removed in this version of Picard.\n"
 "Your file naming scheme has automatically been merged with that of single artist albums."
 msgstr ""

-#: picard/config_upgrade.py:72
+#: picard/config_upgrade.py:71
 msgid ""
 "The separate file naming scheme for various artists albums has been removed in this version of Picard.\n"
 "You currently do not use this option, but have a separate file naming scheme defined.\n"
 "Do you want to remove it or merge it with your file naming scheme for single artist albums?"
 msgstr ""

-#: picard/config_upgrade.py:78
+#: picard/config_upgrade.py:77
 msgid "Merge"
 msgstr "Cyfuno"

-#: picard/config_upgrade.py:78 picard/ui/metadatabox.py:314
+#: picard/config_upgrade.py:77 picard/ui/metadatabox.py:314
 #: picard/ui/options/interface.py:75 picard/ui/ui_options_interface.py:141
 msgid "Remove"
 msgstr "Tynnu"

-#: picard/config_upgrade.py:193 picard/ui/options/scripting.py:28
+#: picard/config_upgrade.py:200 picard/ui/options/scripting.py:28
 #, python-format
 msgid "My script %d"
 msgstr ""

-#: picard/file.py:541
+#: picard/file.py:565
 #, python-format
 msgid "No matching tracks for file '%(filename)s'"
 msgstr ""

-#: picard/file.py:557
+#: picard/file.py:581
 #, python-format
 msgid "No matching tracks above the threshold for file '%(filename)s'"
 msgstr ""

-#: picard/file.py:564
+#: picard/file.py:588
 #, python-format
 msgid "File '%(filename)s' identified!"
 msgstr ""

-#: picard/file.py:584
+#: picard/file.py:608
 #, python-format
 msgid "Looking up the metadata for file %(filename)s ..."
 msgstr ""
@@ -212,7 +212,7 @@ msgstr "[dim cod bar]"
 msgid "[no release info]"
 msgstr "[dim gwyb rhyddhau]"

-#: picard/tagger.py:405 picard/tagger.py:438
+#: picard/tagger.py:407 picard/tagger.py:440
 #, python-format
 msgid "Adding %(count)d file from '%(directory)s' ..."
 msgid_plural "Adding %(count)d files from '%(directory)s' ..."
@@ -221,16 +221,16 @@ msgstr[1] ""
 msgstr[2] ""
 msgstr[3] ""

-#: picard/tagger.py:597
+#: picard/tagger.py:599
 #, python-format
 msgid "Removing album %(id)s: %(artist)s - %(album)s"
 msgstr ""

-#: picard/tagger.py:613
+#: picard/tagger.py:615
 msgid "CD Lookup Error"
 msgstr "Gwall Edrych Lan CD"

-#: picard/tagger.py:614
+#: picard/tagger.py:616
 #, python-format
 msgid ""
 "Error while reading CD:\n"
@@ -278,6 +278,10 @@ msgstr "Ffrangeg"
 msgid "Italian"
 msgstr "Eidaleg"

+#: picard/const/languages.py:57
+msgid "Norwegian Bokmal"
+msgstr ""
+
 #: picard/const/languages.py:59
 msgid "Dutch"
 msgstr "Iseldireg"
@@ -341,12 +345,12 @@ msgstr ""
 msgid "Whitelist"
 msgstr ""

-#: picard/ui/cdlookup.py:35 picard/ui/mainwindow.py:625 picard/util/tags.py:21
+#: picard/ui/cdlookup.py:35 picard/ui/mainwindow.py:626 picard/util/tags.py:21
 msgid "Album"
 msgstr "Albwm"

-#: picard/ui/cdlookup.py:35 picard/ui/itemviews.py:96
-#: picard/ui/mainwindow.py:626 picard/ui/searchdialog.py:326
+#: picard/ui/cdlookup.py:35 picard/ui/itemviews.py:105
+#: picard/ui/mainwindow.py:627 picard/ui/searchdialog.py:326
 #: picard/ui/searchdialog.py:513 picard/util/tags.py:22
 msgid "Artist"
 msgstr "Artist"
@@ -382,10 +386,22 @@ msgstr[1] ""
 msgstr[2] ""
 msgstr[3] ""

-#: picard/ui/coverartbox.py:143
+#: picard/ui/coverartbox.py:141
 msgid "View release on MusicBrainz"
 msgstr ""

+#: picard/ui/coverartbox.py:174
+msgid "Show more details"
+msgstr ""
+
+#: picard/ui/coverartbox.py:199
+msgid "New Cover Art"
+msgstr ""
+
+#: picard/ui/coverartbox.py:200
+msgid "Original Cover Art"
+msgstr ""
+
 #: picard/ui/filebrowser.py:40
 msgid "&Move Tagged Files Here"
 msgstr ""
@@ -514,116 +530,116 @@ msgstr ""
 msgid "Pending requests"
 msgstr ""

-#: picard/ui/itemviews.py:94 picard/util/tags.py:23
+#: picard/ui/itemviews.py:103 picard/util/tags.py:23
 msgid "Title"
 msgstr "Teitl"

-#: picard/ui/itemviews.py:95 picard/ui/searchdialog.py:325
+#: picard/ui/itemviews.py:104 picard/ui/searchdialog.py:325
 #: picard/util/tags.py:87
 msgid "Length"
 msgstr "Hyd"

-#: picard/ui/itemviews.py:162
+#: picard/ui/itemviews.py:171
 msgid "Bad match"
 msgstr ""

-#: picard/ui/itemviews.py:163
+#: picard/ui/itemviews.py:172
 msgid "Poor match"
 msgstr ""

-#: picard/ui/itemviews.py:164
+#: picard/ui/itemviews.py:173
 msgid "Ok match"
 msgstr ""

-#: picard/ui/itemviews.py:165
+#: picard/ui/itemviews.py:174
 msgid "Good match"
 msgstr ""

-#: picard/ui/itemviews.py:166
+#: picard/ui/itemviews.py:175
 msgid "Great match"
 msgstr ""

-#: picard/ui/itemviews.py:167
+#: picard/ui/itemviews.py:176
 msgid "Excellent match"
 msgstr ""

-#: picard/ui/itemviews.py:243
+#: picard/ui/itemviews.py:252
 msgid "&Expand all"
 msgstr ""

-#: picard/ui/itemviews.py:245
+#: picard/ui/itemviews.py:254
 msgid "&Collapse all"
 msgstr ""

-#: picard/ui/itemviews.py:247
+#: picard/ui/itemviews.py:256
 msgid "Select &all"
 msgstr ""

-#: picard/ui/itemviews.py:249
+#: picard/ui/itemviews.py:258
 msgid "Ctrl+A"
 msgstr ""

-#: picard/ui/itemviews.py:315
+#: picard/ui/itemviews.py:324
 msgid "&Other versions"
 msgstr ""

-#: picard/ui/itemviews.py:318
+#: picard/ui/itemviews.py:327
 msgid "Loading..."
 msgstr "Llwytho..."

-#: picard/ui/itemviews.py:383
+#: picard/ui/itemviews.py:392
 msgid "Collections"
 msgstr "Casgliadau"

-#: picard/ui/itemviews.py:386
+#: picard/ui/itemviews.py:395
 msgid "P&lugins"
 msgstr ""

-#: picard/ui/itemviews.py:557
+#: picard/ui/itemviews.py:577
 msgid "file view"
 msgstr "golwg ffeil"

-#: picard/ui/itemviews.py:558
+#: picard/ui/itemviews.py:578
 msgid "Contains unmatched files and clusters"
 msgstr ""

-#: picard/ui/itemviews.py:578
+#: picard/ui/itemviews.py:598
 msgid "Clusters"
 msgstr "Clystyrau"

-#: picard/ui/itemviews.py:587
+#: picard/ui/itemviews.py:607
 msgid "album view"
 msgstr "golwg albwm"

-#: picard/ui/itemviews.py:588
+#: picard/ui/itemviews.py:608
 msgid "Contains albums and matched files"
 msgstr ""

-#: picard/ui/itemviews.py:694 picard/ui/options/renaming.py:188
+#: picard/ui/itemviews.py:714 picard/ui/options/renaming.py:188
 msgid "Error"
 msgstr "Gwall"

-#: picard/ui/itemviews.py:698
+#: picard/ui/itemviews.py:718
 msgid "Album modified and complete"
 msgstr ""

-#: picard/ui/itemviews.py:701
+#: picard/ui/itemviews.py:721
 msgid "Album unchanged and complete"
 msgstr ""

-#: picard/ui/itemviews.py:705
+#: picard/ui/itemviews.py:725
 msgid "Album modified"
 msgstr ""

-#: picard/ui/itemviews.py:708
+#: picard/ui/itemviews.py:728
 msgid "Album unchanged"
 msgstr ""

-#: picard/ui/itemviews.py:811
+#: picard/ui/itemviews.py:831
 msgid "Track saved"
 msgstr ""

-#: picard/ui/itemviews.py:813 picard/ui/itemviews.py:817
+#: picard/ui/itemviews.py:833 picard/ui/itemviews.py:837
 msgid "Pending"
 msgstr ""

@@ -816,7 +832,7 @@ msgstr "Ctrl+B"
 msgid "&Cover Art"
 msgstr "&Celf Albwm"

-#: picard/ui/mainwindow.py:407 picard/ui/mainwindow.py:619
+#: picard/ui/mainwindow.py:407 picard/ui/mainwindow.py:620
 #: picard/ui/searchdialog.py:71
 msgid "Search"
 msgstr "Chwilio"
@@ -843,175 +859,179 @@ msgid ""
 "even if they have no metadata"
 msgstr ""

-#: picard/ui/mainwindow.py:421
+#: picard/ui/mainwindow.py:420
+msgid "Identify the file using its AcoustID audio fingerprint"
+msgstr ""
+
+#: picard/ui/mainwindow.py:422
 msgid "Ctrl+Y"
 msgstr "Ctrl+Y"

-#: picard/ui/mainwindow.py:424
+#: picard/ui/mainwindow.py:425
 msgid "Cl&uster"
 msgstr ""

-#: picard/ui/mainwindow.py:425
+#: picard/ui/mainwindow.py:426
 msgid "Cluster files into album clusters"
 msgstr ""

-#: picard/ui/mainwindow.py:428
+#: picard/ui/mainwindow.py:429
 msgid "Ctrl+U"
 msgstr "Ctrl+U"

-#: picard/ui/mainwindow.py:431
+#: picard/ui/mainwindow.py:432
 msgid "&Lookup"
 msgstr ""

-#: picard/ui/mainwindow.py:432
+#: picard/ui/mainwindow.py:433
 msgid "Lookup selected items in MusicBrainz"
 msgstr ""

-#: picard/ui/mainwindow.py:437
+#: picard/ui/mainwindow.py:438
 msgid "Ctrl+L"
 msgstr "Ctrl+L"

-#: picard/ui/mainwindow.py:440
+#: picard/ui/mainwindow.py:441
 msgid "&Info..."
 msgstr "&Gwyb..."

-#: picard/ui/mainwindow.py:443
+#: picard/ui/mainwindow.py:444
 msgid "Ctrl+I"
 msgstr "Ctrl+I"

-#: picard/ui/mainwindow.py:446
+#: picard/ui/mainwindow.py:447
 msgid "&Refresh"
 msgstr ""

-#: picard/ui/mainwindow.py:447
+#: picard/ui/mainwindow.py:448
 msgid "Ctrl+R"
 msgstr "Ctrl+R"

-#: picard/ui/mainwindow.py:450
+#: picard/ui/mainwindow.py:451
 msgid "&Rename Files"
 msgstr ""

-#: picard/ui/mainwindow.py:455
+#: picard/ui/mainwindow.py:456
 msgid "&Move Files"
 msgstr ""

-#: picard/ui/mainwindow.py:460
+#: picard/ui/mainwindow.py:461
 msgid "Save &Tags"
 msgstr ""

-#: picard/ui/mainwindow.py:465
+#: picard/ui/mainwindow.py:466
 msgid "Tags From &File Names..."
 msgstr ""

-#: picard/ui/mainwindow.py:469
+#: picard/ui/mainwindow.py:470
 msgid "&Open My Collections in Browser"
 msgstr ""

-#: picard/ui/mainwindow.py:473
+#: picard/ui/mainwindow.py:474
 msgid "View Error/Debug &Log"
 msgstr ""

-#: picard/ui/mainwindow.py:476
+#: picard/ui/mainwindow.py:477
 msgid "View Activity &History"
 msgstr ""

-#: picard/ui/mainwindow.py:483
+#: picard/ui/mainwindow.py:484
 msgid "Open in &Player"
 msgstr ""

-#: picard/ui/mainwindow.py:484
+#: picard/ui/mainwindow.py:485
 msgid "Play the file in your default media player"
 msgstr ""

-#: picard/ui/mainwindow.py:488
+#: picard/ui/mainwindow.py:489
 msgid "Open Containing &Folder"
 msgstr ""

-#: picard/ui/mainwindow.py:489
+#: picard/ui/mainwindow.py:490
 msgid "Open the containing folder in your file explorer"
 msgstr ""

-#: picard/ui/mainwindow.py:518
+#: picard/ui/mainwindow.py:519
 msgid "&File"
 msgstr "&Ffeil"

-#: picard/ui/mainwindow.py:529
+#: picard/ui/mainwindow.py:530
 msgid "&Edit"
 msgstr ""

-#: picard/ui/mainwindow.py:535
+#: picard/ui/mainwindow.py:536
 msgid "&View"
 msgstr ""

-#: picard/ui/mainwindow.py:541
+#: picard/ui/mainwindow.py:542
 msgid "&Options"
 msgstr "&Dewisiadau"

-#: picard/ui/mainwindow.py:547
+#: picard/ui/mainwindow.py:548
 msgid "&Tools"
 msgstr ""

-#: picard/ui/mainwindow.py:558 picard/ui/util.py:35
+#: picard/ui/mainwindow.py:559 picard/ui/util.py:35
 msgid "&Help"
 msgstr "&Cymorth"

-#: picard/ui/mainwindow.py:586
+#: picard/ui/mainwindow.py:587
 msgid "Actions"
 msgstr ""

-#: picard/ui/mainwindow.py:627
+#: picard/ui/mainwindow.py:628
 msgid "Track"
 msgstr "Trac"

-#: picard/ui/mainwindow.py:703
+#: picard/ui/mainwindow.py:704
 msgid "All Supported Formats"
 msgstr ""

-#: picard/ui/mainwindow.py:730
+#: picard/ui/mainwindow.py:731
 #, python-format
 msgid "Adding multiple directories from '%(directory)s' ..."
 msgstr ""

-#: picard/ui/mainwindow.py:735
+#: picard/ui/mainwindow.py:736
 #, python-format
 msgid "Adding directory: '%(directory)s' ..."
 msgstr ""

-#: picard/ui/mainwindow.py:801
+#: picard/ui/mainwindow.py:809
 msgid "Configuration Required"
 msgstr ""

-#: picard/ui/mainwindow.py:802
+#: picard/ui/mainwindow.py:810
 msgid ""
 "Audio fingerprinting is not yet configured. Would you like to configure it "
 "now?"
 msgstr "Nid yw bysbrintio clywedol wedi ffurfweddu. Hoffwch ei ffurfweddu nawr?"

-#: picard/ui/mainwindow.py:902
+#: picard/ui/mainwindow.py:916
 #, python-format
 msgid "%(filename)s (error: %(error)s)"
 msgstr ""

-#: picard/ui/mainwindow.py:908
+#: picard/ui/mainwindow.py:922
 #, python-format
 msgid "%(filename)s"
 msgstr ""

-#: picard/ui/mainwindow.py:918
+#: picard/ui/mainwindow.py:933
 #, python-format
 msgid "%(filename)s (%(similarity)d%%) (error: %(error)s)"
 msgstr ""

-#: picard/ui/mainwindow.py:925
+#: picard/ui/mainwindow.py:940
 #, python-format
 msgid "%(filename)s (%(similarity)d%%)"
 msgstr ""

-#: picard/ui/mainwindow.py:961
+#: picard/ui/mainwindow.py:976
 msgid "Authentication Required"
 msgstr ""

-#: picard/ui/mainwindow.py:962
+#: picard/ui/mainwindow.py:977
 msgid ""
 "Picard needs authorization to access your personal data on the MusicBrainz "
 "server. Would you like to log in now?"
@@ -1126,7 +1146,7 @@ msgstr ""
 msgid "Retry"
 msgstr ""

-#: picard/ui/searchdialog.py:288
+#: picard/ui/searchdialog.py:283
 #, python-format
 msgid ""
 "<strong>Following error occurred while fetching "
@@ -1930,19 +1950,19 @@ msgstr ""
 msgid "Reset all settings for current option page"
 msgstr ""

-#: picard/ui/options/dialog.py:166
+#: picard/ui/options/dialog.py:172
 msgid "You are about to reset your options for this page."
 msgstr ""

-#: picard/ui/options/dialog.py:170
+#: picard/ui/options/dialog.py:176
 msgid "Warning! This will reset all of your settings."
 msgstr ""

-#: picard/ui/options/dialog.py:177
+#: picard/ui/options/dialog.py:183
 msgid "Confirm Reset"
 msgstr ""

-#: picard/ui/options/dialog.py:178
+#: picard/ui/options/dialog.py:184
 msgid "Are you sure?"
 msgstr ""

@@ -2113,7 +2133,7 @@ msgstr ""
 msgid "File Naming"
 msgstr ""

-#: picard/ui/options/renaming.py:175 picard/ui/options/scripting.py:406
+#: picard/ui/options/renaming.py:175 picard/ui/options/scripting.py:410
 msgid ""
 "<a href=\"%(picard-doc-scripting-url)s\">Open Scripting Documentation in "
 "your browser</a>"
@@ -2155,15 +2175,15 @@ msgstr ""
 msgid "Scripting"
 msgstr ""

-#: picard/ui/options/scripting.py:292
+#: picard/ui/options/scripting.py:293
 msgid "Are you sure you want to remove this script?"
 msgstr ""

-#: picard/ui/options/scripting.py:293
+#: picard/ui/options/scripting.py:294
 msgid "Confirm Remove"
 msgstr ""

-#: picard/ui/options/scripting.py:376
+#: picard/ui/options/scripting.py:377
 msgid "Script Error"
 msgstr ""

--- a/po/da.po
+++ b/po/da.po
--- a/po/de.po
+++ b/po/de.po
@@ -10,21 +10,22 @@
 # Ettore Atalan <atalanttore@googlemail.com>, 2014
 # Felix Kugler <relgukxilef@gmail.com>, 2015
 # Frank Matthiae <senax79@gmail.com>, 2017
+# ix5, 2017
 # nikki, 2013
 # Philipp Wolfer <ph.wolfer@gmail.com>, 2014,2017
 # S.Brandt <s.brandt@mixxx.org>, 2014-2015,2017
 # Shepard, 2013-2014
 # Shepard, 2012
 # Wieland Hoffmann <themineo+transifex@googlemail.com>, 2012
-# Wieland Hoffmann <themineo+transifex@googlemail.com>, 2013,2015
+# Wieland Hoffmann <themineo+transifex@googlemail.com>, 2013,2015,2017
 # HumHumXX, 2015
 # HumHumXX, 2012
 msgid ""
 msgstr ""
 "Project-Id-Version: MusicBrainz\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2017-01-18 12:51+0100\n"
-"PO-Revision-Date: 2017-01-20 14:23+0000\n"
+"POT-Creation-Date: 2017-03-05 09:58+0100\n"
+"PO-Revision-Date: 2017-03-05 17:51+0000\n"
 "Last-Translator: S.Brandt <s.brandt@mixxx.org>\n"
 "Language-Team: German (http://www.transifex.com/musicbrainz/musicbrainz/language/de/)\n"
 "MIME-Version: 1.0\n"
@@ -71,26 +72,26 @@ msgstr "AcoustIDs erfolgreich übermittelt."
 msgid "Unmatched Files"
 msgstr "Nicht zugeordnete Dateien"

-#: picard/album.py:206
+#: picard/album.py:200
 #, python-format
 msgid "[could not load album %s]"
 msgstr "[konnte Album %s nicht laden]"

-#: picard/album.py:295
+#: picard/album.py:289
 #, python-format
 msgid "Album %(id)s loaded: %(artist)s - %(album)s"
 msgstr "Album %(id)s geladen: %(artist)s - %(album)s"

-#: picard/album.py:338
+#: picard/album.py:332
 #, python-format
 msgid "Loading album %(id)s ..."
 msgstr "Lade Album %(id)s …"

-#: picard/album.py:342
+#: picard/album.py:336
 msgid "[loading album information]"
 msgstr "[lade Albuminformationen]"

-#: picard/album.py:527
+#: picard/album.py:523
 #, python-format
 msgid "; %i image"
 msgid_plural "; %i images"
@@ -112,72 +113,72 @@ msgstr "Gruppierung %(album)s identifiziert!"
 msgid "Looking up the metadata for cluster %(album)s..."
 msgstr "Frage Metadaten für Gruppierung %(album)s ab …"

-#: picard/collection.py:64
+#: picard/collection.py:67
 #, python-format
 msgid "Added %(count)i release to collection \"%(name)s\""
 msgid_plural "Added %(count)i releases to collection \"%(name)s\""
 msgstr[0] "%(count)i Veröffentlichung zu Sammlung „%(name)s“ hinzugefügt"
 msgstr[1] "%(count)i Veröffentlichungen zu Sammlung „%(name)s“ hinzugefügt"

-#: picard/collection.py:86
+#: picard/collection.py:89
 #, python-format
 msgid "Removed %(count)i release from collection \"%(name)s\""
 msgid_plural "Removed %(count)i releases from collection \"%(name)s\""
 msgstr[0] "%(count)i Veröffentlichung von Sammlung „%(name)s“ entfernt"
 msgstr[1] "%(count)i Veröffentlichungen von Sammlung „%(name)s“ entfernt"

-#: picard/collection.py:100
+#: picard/collection.py:104
 #, python-format
 msgid "Error loading collections: %(error)s"
 msgstr "Fehler beim Laden von Sammlungen: %(error)s"

-#: picard/config_upgrade.py:58 picard/config_upgrade.py:71
+#: picard/config_upgrade.py:57 picard/config_upgrade.py:70
 msgid "Various Artists file naming scheme removal"
 msgstr "Wegfall des Dateibenennungsschemas für Diverse Interpreten"

-#: picard/config_upgrade.py:59
+#: picard/config_upgrade.py:58
 msgid ""
 "The separate file naming scheme for various artists albums has been removed in this version of Picard.\n"
 "Your file naming scheme has automatically been merged with that of single artist albums."
 msgstr "Das separate Dateibenennungsschema für Alben diverser Interpreten wurde mit dieser Version von Picard entfernt.\nDein Dateibenennungsschema wurde automatisch mit demjenigen für Alben einzelner Interpreten zusammengeführt."

-#: picard/config_upgrade.py:72
+#: picard/config_upgrade.py:71
 msgid ""
 "The separate file naming scheme for various artists albums has been removed in this version of Picard.\n"
 "You currently do not use this option, but have a separate file naming scheme defined.\n"
 "Do you want to remove it or merge it with your file naming scheme for single artist albums?"
 msgstr "Das separate Dateibenennungsschema für Alben diverser Interpreten wurde mit dieser Version von Picard entfernt.\nDu nutzt diese Option momentan nicht, hast aber ein separates Schema definiert.\nMöchtest du es entfernen oder mit dem Schema für Alben einzelner Interpreten zusammenführen?"

-#: picard/config_upgrade.py:78
+#: picard/config_upgrade.py:77
 msgid "Merge"
 msgstr "Vereinen"

-#: picard/config_upgrade.py:78 picard/ui/metadatabox.py:314
+#: picard/config_upgrade.py:77 picard/ui/metadatabox.py:314
 #: picard/ui/options/interface.py:75 picard/ui/ui_options_interface.py:141
 msgid "Remove"
 msgstr "Entfernen"

-#: picard/config_upgrade.py:193 picard/ui/options/scripting.py:28
+#: picard/config_upgrade.py:200 picard/ui/options/scripting.py:28
 #, python-format
 msgid "My script %d"
 msgstr "Eigenes script %d"

-#: picard/file.py:541
+#: picard/file.py:565
 #, python-format
 msgid "No matching tracks for file '%(filename)s'"
 msgstr "Keine passenden Titel für Datei „%(filename)s“"

-#: picard/file.py:557
+#: picard/file.py:581
 #, python-format
 msgid "No matching tracks above the threshold for file '%(filename)s'"
 msgstr "Keine passenden Titel oberhalb der Schwellenwerte für Datei „%(filename)s“"

-#: picard/file.py:564
+#: picard/file.py:588
 #, python-format
 msgid "File '%(filename)s' identified!"
 msgstr "Datei „%(filename)s“ identifiziert!"

-#: picard/file.py:584
+#: picard/file.py:608
 #, python-format
 msgid "Looking up the metadata for file %(filename)s ..."
 msgstr "Frage Metadaten für Datei %(filename)s ab …"
@@ -220,23 +221,23 @@ msgstr "[kein Strichcode]"
 msgid "[no release info]"
 msgstr "[keine Informationen zur Veröffentlichung]"

-#: picard/tagger.py:405 picard/tagger.py:438
+#: picard/tagger.py:407 picard/tagger.py:440
 #, python-format
 msgid "Adding %(count)d file from '%(directory)s' ..."
 msgid_plural "Adding %(count)d files from '%(directory)s' ..."
 msgstr[0] "Füge %(count)d Datei von „%(directory)s“ hinzu …"
 msgstr[1] "Füge %(count)d Dateien von „%(directory)s“ hinzu …"

-#: picard/tagger.py:597
+#: picard/tagger.py:599
 #, python-format
 msgid "Removing album %(id)s: %(artist)s - %(album)s"
 msgstr "Entferne Album %(id)s: %(artist)s - %(album)s"

-#: picard/tagger.py:613
+#: picard/tagger.py:615
 msgid "CD Lookup Error"
 msgstr "CD-Abfrage-Fehler"

-#: picard/tagger.py:614
+#: picard/tagger.py:616
 #, python-format
 msgid ""
 "Error while reading CD:\n"
@@ -284,6 +285,10 @@ msgstr "Französisch"
 msgid "Italian"
 msgstr "Italienisch"

+#: picard/const/languages.py:57
+msgid "Norwegian Bokmal"
+msgstr "Norwegisches Bokmål"
+
 #: picard/const/languages.py:59
 msgid "Dutch"
 msgstr "Niederländisch"
@@ -321,7 +326,7 @@ msgstr "Amazon"

 #: picard/coverart/providers/caa.py:51
 msgid "Cover art types"
-msgstr "Cover-Art-Typen"
+msgstr "Cover-Art Typen"

 #: picard/coverart/providers/caa.py:84
 msgid "Chec&k all"
@@ -347,12 +352,12 @@ msgstr "Lokale Dateien"
 msgid "Whitelist"
 msgstr "Positivliste"

-#: picard/ui/cdlookup.py:35 picard/ui/mainwindow.py:625 picard/util/tags.py:21
+#: picard/ui/cdlookup.py:35 picard/ui/mainwindow.py:626 picard/util/tags.py:21
 msgid "Album"
 msgstr "Album"

-#: picard/ui/cdlookup.py:35 picard/ui/itemviews.py:96
-#: picard/ui/mainwindow.py:626 picard/ui/searchdialog.py:326
+#: picard/ui/cdlookup.py:35 picard/ui/itemviews.py:105
+#: picard/ui/mainwindow.py:627 picard/ui/searchdialog.py:326
 #: picard/ui/searchdialog.py:513 picard/util/tags.py:22
 msgid "Artist"
 msgstr "Interpret"
@@ -386,10 +391,22 @@ msgid_plural "%s (%i releases)"
 msgstr[0] "%s (%i Veröffentlichung)"
 msgstr[1] "%s (%i Veröffentlichungen)"

-#: picard/ui/coverartbox.py:143
+#: picard/ui/coverartbox.py:141
 msgid "View release on MusicBrainz"
 msgstr "Veröffentlichung auf MusicBrainz ansehen"

+#: picard/ui/coverartbox.py:174
+msgid "Show more details"
+msgstr "Mehr Details anzeigen"
+
+#: picard/ui/coverartbox.py:199
+msgid "New Cover Art"
+msgstr "Neues Cover-Art"
+
+#: picard/ui/coverartbox.py:200
+msgid "Original Cover Art"
+msgstr "Original Cover-Art"
+
 #: picard/ui/filebrowser.py:40
 msgid "&Move Tagged Files Here"
 msgstr "Getaggte Dateien hierhin &verschieben"
@@ -518,116 +535,116 @@ msgstr "Ausstehende Dateien"
 msgid "Pending requests"
 msgstr "Ausstehende Anfragen"

-#: picard/ui/itemviews.py:94 picard/util/tags.py:23
+#: picard/ui/itemviews.py:103 picard/util/tags.py:23
 msgid "Title"
 msgstr "Titel"

-#: picard/ui/itemviews.py:95 picard/ui/searchdialog.py:325
+#: picard/ui/itemviews.py:104 picard/ui/searchdialog.py:325
 #: picard/util/tags.py:87
 msgid "Length"
 msgstr "Dauer"

-#: picard/ui/itemviews.py:162
+#: picard/ui/itemviews.py:171
 msgid "Bad match"
 msgstr "Schlechte Übereinstimmung"

-#: picard/ui/itemviews.py:163
+#: picard/ui/itemviews.py:172
 msgid "Poor match"
 msgstr "Schwache Übereinstimmung"

-#: picard/ui/itemviews.py:164
+#: picard/ui/itemviews.py:173
 msgid "Ok match"
 msgstr "Ordentliche Übereinstimmung"

-#: picard/ui/itemviews.py:165
+#: picard/ui/itemviews.py:174
 msgid "Good match"
 msgstr "Gute Übereinstimmung"

-#: picard/ui/itemviews.py:166
+#: picard/ui/itemviews.py:175
 msgid "Great match"
 msgstr "Super Übereinstimmung"

-#: picard/ui/itemviews.py:167
+#: picard/ui/itemviews.py:176
 msgid "Excellent match"
 msgstr "Ausgezeichnete Übereinstimmung"

-#: picard/ui/itemviews.py:243
+#: picard/ui/itemviews.py:252
 msgid "&Expand all"
 msgstr "Alles &ausklappen"

-#: picard/ui/itemviews.py:245
+#: picard/ui/itemviews.py:254
 msgid "&Collapse all"
 msgstr "Alles &einklappen"

-#: picard/ui/itemviews.py:247
+#: picard/ui/itemviews.py:256
 msgid "Select &all"
 msgstr "&Alle auswählen"

-#: picard/ui/itemviews.py:249
+#: picard/ui/itemviews.py:258
 msgid "Ctrl+A"
 msgstr "Strg+A"

-#: picard/ui/itemviews.py:315
+#: picard/ui/itemviews.py:324
 msgid "&Other versions"
 msgstr "&Andere Versionen"

-#: picard/ui/itemviews.py:318
+#: picard/ui/itemviews.py:327
 msgid "Loading..."
 msgstr "Lade …"

-#: picard/ui/itemviews.py:383
+#: picard/ui/itemviews.py:392
 msgid "Collections"
 msgstr "Sammlungen"

-#: picard/ui/itemviews.py:386
+#: picard/ui/itemviews.py:395
 msgid "P&lugins"
 msgstr "&Plugins"

-#: picard/ui/itemviews.py:557
+#: picard/ui/itemviews.py:577
 msgid "file view"
 msgstr "Dateiansicht"

-#: picard/ui/itemviews.py:558
+#: picard/ui/itemviews.py:578
 msgid "Contains unmatched files and clusters"
 msgstr "Enthält nicht zugeordnete Dateien und Gruppierungen"

-#: picard/ui/itemviews.py:578
+#: picard/ui/itemviews.py:598
 msgid "Clusters"
 msgstr "Gruppierungen"

-#: picard/ui/itemviews.py:587
+#: picard/ui/itemviews.py:607
 msgid "album view"
 msgstr "Albumsansicht"

-#: picard/ui/itemviews.py:588
+#: picard/ui/itemviews.py:608
 msgid "Contains albums and matched files"
 msgstr "Enthält Alben und zugeordnete Dateien"

-#: picard/ui/itemviews.py:694 picard/ui/options/renaming.py:188
+#: picard/ui/itemviews.py:714 picard/ui/options/renaming.py:188
 msgid "Error"
 msgstr "Fehler"

-#: picard/ui/itemviews.py:698
+#: picard/ui/itemviews.py:718
 msgid "Album modified and complete"
 msgstr "Album verändert und vollständig"

-#: picard/ui/itemviews.py:701
+#: picard/ui/itemviews.py:721
 msgid "Album unchanged and complete"
 msgstr "Album unverändert und vollständig"

-#: picard/ui/itemviews.py:705
+#: picard/ui/itemviews.py:725
 msgid "Album modified"
 msgstr "Album verändert"

-#: picard/ui/itemviews.py:708
+#: picard/ui/itemviews.py:728
 msgid "Album unchanged"
 msgstr "Album unverändert"

-#: picard/ui/itemviews.py:811
+#: picard/ui/itemviews.py:831
 msgid "Track saved"
 msgstr "Titel gespeichert"

-#: picard/ui/itemviews.py:813 picard/ui/itemviews.py:817
+#: picard/ui/itemviews.py:833 picard/ui/itemviews.py:837
 msgid "Pending"
 msgstr "Ausstehend"

@@ -692,7 +709,7 @@ msgstr "Übermittlungsfehler"
 msgid ""
 "You need to configure your AcoustID API key before you can submit "
 "fingerprints."
-msgstr "Du musst deinen AcoustID API-Key angeben, um Fingerabdrücke übermitteln zu können."
+msgstr "Du musst deinen AcoustID API-Schlüssel angeben, um Fingerabdrücke übermitteln zu können."

 #: picard/ui/mainwindow.py:313
 msgid "&Options..."
@@ -816,9 +833,9 @@ msgstr "Ctrl+B"

 #: picard/ui/mainwindow.py:401
 msgid "&Cover Art"
-msgstr "&Cover-Bild"
+msgstr "&Cover-Art"

-#: picard/ui/mainwindow.py:407 picard/ui/mainwindow.py:619
+#: picard/ui/mainwindow.py:407 picard/ui/mainwindow.py:620
 #: picard/ui/searchdialog.py:71
 msgid "Search"
 msgstr "Suchen"
@@ -845,175 +862,179 @@ msgid ""
 "even if they have no metadata"
 msgstr "Verwende AcoustID akustische Fingerabdrücke, um Dateien anhand der Musik zu identifizieren, selbst wenn sie keine Metadaten enthalten"

-#: picard/ui/mainwindow.py:421
+#: picard/ui/mainwindow.py:420
+msgid "Identify the file using its AcoustID audio fingerprint"
+msgstr "Die Datei mit ihrem AcoustID Audio-Fingerabdruck identifizieren"
+
+#: picard/ui/mainwindow.py:422
 msgid "Ctrl+Y"
 msgstr "Ctrl+Y"

-#: picard/ui/mainwindow.py:424
+#: picard/ui/mainwindow.py:425
 msgid "Cl&uster"
 msgstr "Gr&uppieren"

-#: picard/ui/mainwindow.py:425
+#: picard/ui/mainwindow.py:426
 msgid "Cluster files into album clusters"
 msgstr "Dateien nach Album gruppieren"

-#: picard/ui/mainwindow.py:428
+#: picard/ui/mainwindow.py:429
 msgid "Ctrl+U"
 msgstr "Ctrl+U"

-#: picard/ui/mainwindow.py:431
+#: picard/ui/mainwindow.py:432
 msgid "&Lookup"
 msgstr "&Abfragen"

-#: picard/ui/mainwindow.py:432
+#: picard/ui/mainwindow.py:433
 msgid "Lookup selected items in MusicBrainz"
 msgstr "Ausgewählte Elemente in MusicBrainz nachschlagen"

-#: picard/ui/mainwindow.py:437
+#: picard/ui/mainwindow.py:438
 msgid "Ctrl+L"
 msgstr "Ctrl+L"

-#: picard/ui/mainwindow.py:440
+#: picard/ui/mainwindow.py:441
 msgid "&Info..."
 msgstr "&Info …"

-#: picard/ui/mainwindow.py:443
+#: picard/ui/mainwindow.py:444
 msgid "Ctrl+I"
 msgstr "Ctrl+I"

-#: picard/ui/mainwindow.py:446
+#: picard/ui/mainwindow.py:447
 msgid "&Refresh"
 msgstr "&Aktualisieren"

-#: picard/ui/mainwindow.py:447
+#: picard/ui/mainwindow.py:448
 msgid "Ctrl+R"
 msgstr "Ctrl+R"

-#: picard/ui/mainwindow.py:450
+#: picard/ui/mainwindow.py:451
 msgid "&Rename Files"
 msgstr "Dateien &umbenennen"

-#: picard/ui/mainwindow.py:455
+#: picard/ui/mainwindow.py:456
 msgid "&Move Files"
 msgstr "Dateien &verschieben"

-#: picard/ui/mainwindow.py:460
+#: picard/ui/mainwindow.py:461
 msgid "Save &Tags"
 msgstr "&Tags speichern"

-#: picard/ui/mainwindow.py:465
+#: picard/ui/mainwindow.py:466
 msgid "Tags From &File Names..."
 msgstr "Tags aus &Dateinamen …"

-#: picard/ui/mainwindow.py:469
+#: picard/ui/mainwindow.py:470
 msgid "&Open My Collections in Browser"
 msgstr "Meine &Sammlungen im Browser anzeigen"

-#: picard/ui/mainwindow.py:473
+#: picard/ui/mainwindow.py:474
 msgid "View Error/Debug &Log"
 msgstr "Fehler-/Debug-Protokoll anzeigen"

-#: picard/ui/mainwindow.py:476
+#: picard/ui/mainwindow.py:477
 msgid "View Activity &History"
 msgstr "Aktivitäts&historie anzeigen"

-#: picard/ui/mainwindow.py:483
+#: picard/ui/mainwindow.py:484
 msgid "Open in &Player"
 msgstr "Im &Player öffnen"

-#: picard/ui/mainwindow.py:484
+#: picard/ui/mainwindow.py:485
 msgid "Play the file in your default media player"
 msgstr "Datei in Deinem Standard-Medienplayer abspielen"

-#: picard/ui/mainwindow.py:488
+#: picard/ui/mainwindow.py:489
 msgid "Open Containing &Folder"
 msgstr "Beinhaltendes &Verzeichnis anzeigen"

-#: picard/ui/mainwindow.py:489
+#: picard/ui/mainwindow.py:490
 msgid "Open the containing folder in your file explorer"
 msgstr "Das beinhaltende Verzeichnis in Deinem Dateiexplorer öffnen"

-#: picard/ui/mainwindow.py:518
+#: picard/ui/mainwindow.py:519
 msgid "&File"
 msgstr "&Datei"

-#: picard/ui/mainwindow.py:529
+#: picard/ui/mainwindow.py:530
 msgid "&Edit"
 msgstr "&Bearbeiten"

-#: picard/ui/mainwindow.py:535
+#: picard/ui/mainwindow.py:536
 msgid "&View"
 msgstr "&Ansicht"

-#: picard/ui/mainwindow.py:541
+#: picard/ui/mainwindow.py:542
 msgid "&Options"
 msgstr "&Einstellungen"

-#: picard/ui/mainwindow.py:547
+#: picard/ui/mainwindow.py:548
 msgid "&Tools"
 msgstr "&Extras"

-#: picard/ui/mainwindow.py:558 picard/ui/util.py:35
+#: picard/ui/mainwindow.py:559 picard/ui/util.py:35
 msgid "&Help"
 msgstr "&Hilfe"

-#: picard/ui/mainwindow.py:586
+#: picard/ui/mainwindow.py:587
 msgid "Actions"
 msgstr "Aktionen"

-#: picard/ui/mainwindow.py:627
+#: picard/ui/mainwindow.py:628
 msgid "Track"
 msgstr "Titel"

-#: picard/ui/mainwindow.py:703
+#: picard/ui/mainwindow.py:704
 msgid "All Supported Formats"
 msgstr "Alle unterstützten Formate"

-#: picard/ui/mainwindow.py:730
+#: picard/ui/mainwindow.py:731
 #, python-format
 msgid "Adding multiple directories from '%(directory)s' ..."
 msgstr "Füge mehrere Verzeichnisse hinzu: „%(directory)s“ …"

-#: picard/ui/mainwindow.py:735
+#: picard/ui/mainwindow.py:736
 #, python-format
 msgid "Adding directory: '%(directory)s' ..."
 msgstr "Füge Verzeichnis hinzu: „%(directory)s“ …"

-#: picard/ui/mainwindow.py:801
+#: picard/ui/mainwindow.py:809
 msgid "Configuration Required"
 msgstr "Konfiguration erforderlich"

-#: picard/ui/mainwindow.py:802
+#: picard/ui/mainwindow.py:810
 msgid ""
 "Audio fingerprinting is not yet configured. Would you like to configure it "
 "now?"
 msgstr "Das Erzeugen von Audio-Fingerabdrücken wurde noch nicht konfiguriert. Möchtest du das jetzt vornehmen?"

-#: picard/ui/mainwindow.py:902
+#: picard/ui/mainwindow.py:916
 #, python-format
 msgid "%(filename)s (error: %(error)s)"
 msgstr "%(filename)s (Fehler: %(error)s)"

-#: picard/ui/mainwindow.py:908
+#: picard/ui/mainwindow.py:922
 #, python-format
 msgid "%(filename)s"
 msgstr "%(filename)s"

-#: picard/ui/mainwindow.py:918
+#: picard/ui/mainwindow.py:933
 #, python-format
 msgid "%(filename)s (%(similarity)d%%) (error: %(error)s)"
 msgstr "%(filename)s (%(similarity)d%%) (Fehler: %(error)s)"

-#: picard/ui/mainwindow.py:925
+#: picard/ui/mainwindow.py:940
 #, python-format
 msgid "%(filename)s (%(similarity)d%%)"
 msgstr "%(filename)s (%(similarity)d%%)"

-#: picard/ui/mainwindow.py:961
+#: picard/ui/mainwindow.py:976
 msgid "Authentication Required"
 msgstr "Authentifizierung erforderlich"

-#: picard/ui/mainwindow.py:962
+#: picard/ui/mainwindow.py:977
 msgid ""
 "Picard needs authorization to access your personal data on the MusicBrainz "
 "server. Would you like to log in now?"
@@ -1122,13 +1143,13 @@ msgstr "<strong>Lade...</strong>"
 msgid "Retry"
 msgstr "Nochmal versuchen"

-#: picard/ui/searchdialog.py:288
+#: picard/ui/searchdialog.py:283
 #, python-format
 msgid ""
 "<strong>Following error occurred while fetching "
 "results:<br><br></strong>Network request error for %s:<br>%s (QT code %d, "
 "HTTP code %s)<br>"
-msgstr "<strong>Folgender Fehler is beim laden der Ergebnisse aufgetreten:<br><br></strong>Netzwerkanfrage-Fehler für %s:<br>%s (QT code %d, HTTP code %s)<br>"
+msgstr "<strong>Folgender Fehler ist beim Laden der Ergebnisse aufgetreten:<br><br></strong>Netzwerkanfrage-Fehler für %s:<br>%s (QT code %d, HTTP code %s)<br>"

 #: picard/ui/searchdialog.py:293
 msgid ""
@@ -1327,7 +1348,7 @@ msgstr "Überschreibe ggf. existierende Dateien"

 #: picard/ui/ui_options_cover.py:85
 msgid "Cover Art Providers"
-msgstr "Cover-Bild Anbieter"
+msgstr "Cover-Art Anbieter"

 #: picard/ui/ui_options_fingerprinting.py:86
 msgid "Audio Fingerprinting"
@@ -1364,7 +1385,7 @@ msgstr "Herunterladen …"

 #: picard/ui/ui_options_fingerprinting.py:94
 msgid "API key:"
-msgstr "API-Key:"
+msgstr "API-Schlüssel:"

 #: picard/ui/ui_options_fingerprinting.py:95
 msgid "Get API key..."
@@ -1479,7 +1500,7 @@ msgstr "Sprache der Benutzeroberfläche:"

 #: picard/ui/ui_options_interface.py:131
 msgid "Customize Action Toolbar"
-msgstr ""
+msgstr "Werkzeugleiste anpassen"

 #: picard/ui/ui_options_interface.py:132
 msgid "Add a new button to Toolbar"
@@ -1908,7 +1929,7 @@ msgstr "Erweitert"

 #: picard/ui/options/cover.py:34
 msgid "Cover Art"
-msgstr "Cover-Bild"
+msgstr "Cover-Art"

 #: picard/ui/options/dialog.py:82
 msgid "&Restore all Defaults"
@@ -1924,21 +1945,21 @@ msgstr "&Standard wiederherstellen"

 #: picard/ui/options/dialog.py:85
 msgid "Reset all settings for current option page"
-msgstr ""
+msgstr "Alle Einstellungen für die aktuelle Optionsseite zurücksetzen"

-#: picard/ui/options/dialog.py:166
+#: picard/ui/options/dialog.py:172
 msgid "You are about to reset your options for this page."
 msgstr "Du bist dabei, die Einstellungen für diese Seite zurückzusetzen."

-#: picard/ui/options/dialog.py:170
+#: picard/ui/options/dialog.py:176
 msgid "Warning! This will reset all of your settings."
 msgstr "Warnung! Dadurch werden alle deine Einstellungen zurückgesetzt."

-#: picard/ui/options/dialog.py:177
+#: picard/ui/options/dialog.py:183
 msgid "Confirm Reset"
 msgstr "Zurücksetzen bestätigen"

-#: picard/ui/options/dialog.py:178
+#: picard/ui/options/dialog.py:184
 msgid "Are you sure?"
 msgstr "Bist du sicher?"

@@ -1958,7 +1979,7 @@ msgstr "Ungültige fpcalc-Datei"
 #: picard/ui/options/general.py:74
 #, python-format
 msgid "Logged in as <b>%s</b>."
-msgstr "Eingeloggt als <b>%s</b>."
+msgstr "Angemeldet als <b>%s</b>."

 #: picard/ui/options/general.py:88
 msgid "Authorization code:"
@@ -2109,11 +2130,11 @@ msgstr "Alle zurücksetzen"
 msgid "File Naming"
 msgstr "Dateibenennung"

-#: picard/ui/options/renaming.py:175 picard/ui/options/scripting.py:406
+#: picard/ui/options/renaming.py:175 picard/ui/options/scripting.py:410
 msgid ""
 "<a href=\"%(picard-doc-scripting-url)s\">Open Scripting Documentation in "
 "your browser</a>"
-msgstr "<a href=\"%(picard-doc-scripting-url)s\">öffne Skript-Dokumentation im Browser</a>"
+msgstr "<a href=\"%(picard-doc-scripting-url)s\">Öffne Skript-Dokumentation im Browser</a>"

 #: picard/ui/options/renaming.py:188
 msgid "The location to move files to must not be empty."
@@ -2151,15 +2172,15 @@ msgstr "Skript entfernen"
 msgid "Scripting"
 msgstr "Scripting"

-#: picard/ui/options/scripting.py:292
+#: picard/ui/options/scripting.py:293
 msgid "Are you sure you want to remove this script?"
 msgstr "Sind sie sicher, dass sie dieses Skript entfernen wollen?"

-#: picard/ui/options/scripting.py:293
+#: picard/ui/options/scripting.py:294
 msgid "Confirm Remove"
 msgstr "Entfernen bestätigen"

-#: picard/ui/options/scripting.py:376
+#: picard/ui/options/scripting.py:377
 msgid "Script Error"
 msgstr "Script-Fehler"

--- a/po/el.po
+++ b/po/el.po
@@ -13,8 +13,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: MusicBrainz\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2017-01-18 12:51+0100\n"
-"PO-Revision-Date: 2017-01-19 09:17+0000\n"
+"POT-Creation-Date: 2017-03-05 09:58+0100\n"
+"PO-Revision-Date: 2017-03-05 10:00+0000\n"
 "Last-Translator: nikki\n"
 "Language-Team: Greek (http://www.transifex.com/musicbrainz/musicbrainz/language/el/)\n"
 "MIME-Version: 1.0\n"
@@ -61,26 +61,26 @@ msgstr "AcoustIDs υποβλήθηκαν επιτυχώς."
 msgid "Unmatched Files"
 msgstr "Τα αρχεία δεν ταιριάζουν"

-#: picard/album.py:206
+#: picard/album.py:200
 #, python-format
 msgid "[could not load album %s]"
 msgstr "[αδύνατη η φόρτωση του άλμπουμ %s]"

-#: picard/album.py:295
+#: picard/album.py:289
 #, python-format
 msgid "Album %(id)s loaded: %(artist)s - %(album)s"
 msgstr "Δίσκος %(id)s φορτώθηκε: %(artist)s - %(album)s"

-#: picard/album.py:338
+#: picard/album.py:332
 #, python-format
 msgid "Loading album %(id)s ..."
 msgstr "Φόρτωση δίσκου %(id)s ..."

-#: picard/album.py:342
+#: picard/album.py:336
 msgid "[loading album information]"
 msgstr "[φόρτωση πληροφοριών άλμπουμ]"

-#: picard/album.py:527
+#: picard/album.py:523
 #, python-format
 msgid "; %i image"
 msgid_plural "; %i images"
@@ -102,72 +102,72 @@ msgstr "Ομάδα %(album)s αναγνωρίστηκε!"
 msgid "Looking up the metadata for cluster %(album)s..."
 msgstr "Αναζήτηση μεταδεδομένων για την ομάδα %(album)s..."

-#: picard/collection.py:64
+#: picard/collection.py:67
 #, python-format
 msgid "Added %(count)i release to collection \"%(name)s\""
 msgid_plural "Added %(count)i releases to collection \"%(name)s\""
 msgstr[0] "Προστέθηκε %(count)i κυκλοφορία στη συλλογή «%(name)s»"
 msgstr[1] "Προστέθηκαν %(count)i κυκλοφορίες στη συλλογή «%(name)s»"

-#: picard/collection.py:86
+#: picard/collection.py:89
 #, python-format
 msgid "Removed %(count)i release from collection \"%(name)s\""
 msgid_plural "Removed %(count)i releases from collection \"%(name)s\""
 msgstr[0] "Αφαιρέθηκε %(count)i κυκλοφορία από τη συλλογή «%(name)s»"
 msgstr[1] "Αφαιρέθηκαν %(count)i κυκλοφορίες από τη συλλογή «%(name)s»"

-#: picard/collection.py:100
+#: picard/collection.py:104
 #, python-format
 msgid "Error loading collections: %(error)s"
 msgstr "Σφάλμα κατά τη φόρτωση των συλλογών: %(error)s"

-#: picard/config_upgrade.py:58 picard/config_upgrade.py:71
+#: picard/config_upgrade.py:57 picard/config_upgrade.py:70
 msgid "Various Artists file naming scheme removal"
 msgstr "Αφαίρεση συστήματος ονομασίας αρχείων για δίσκους με Διάφορους Καλλιτέχνες"

-#: picard/config_upgrade.py:59
+#: picard/config_upgrade.py:58
 msgid ""
 "The separate file naming scheme for various artists albums has been removed in this version of Picard.\n"
 "Your file naming scheme has automatically been merged with that of single artist albums."
 msgstr "Το ξεχωριστό σύστημα ονομασίας αρχείων για δίσκους με διάφορους καλλιτέχνες έχει αφαιρεθεί από αυτή την έκδοση του Picard.\nΤο σύστημα ονομασίας αρχείων σας έχει συγχωνευτεί με αυτό των δίσκων με έναν καλλιτέχνη."

-#: picard/config_upgrade.py:72
+#: picard/config_upgrade.py:71
 msgid ""
 "The separate file naming scheme for various artists albums has been removed in this version of Picard.\n"
 "You currently do not use this option, but have a separate file naming scheme defined.\n"
 "Do you want to remove it or merge it with your file naming scheme for single artist albums?"
 msgstr "Το ξεχωριστό σύστημα ονομασίας αρχείων για δίσκους με διάφορους καλλιτέχνες έχει αφαιρεθεί από αυτή την έκδοση του Picard.\nΑυτή τη στιγμή δε χρησιμοποιείτε αυτή την επιλογή, αλλά έχετε ορισμένο ένα ξεχωριστό σύστημα ονομασίας αρχείων.\nΘέλετε να το αφαιρέσετε ή να το συγχωνεύσετε με το σύστημα ονομασίας αρχείων για δίσκους με έναν καλλιτέχνη;"

-#: picard/config_upgrade.py:78
+#: picard/config_upgrade.py:77
 msgid "Merge"
 msgstr "Συγχώνευση"

-#: picard/config_upgrade.py:78 picard/ui/metadatabox.py:314
+#: picard/config_upgrade.py:77 picard/ui/metadatabox.py:314
 #: picard/ui/options/interface.py:75 picard/ui/ui_options_interface.py:141
 msgid "Remove"
 msgstr "Αφαίρεση"

-#: picard/config_upgrade.py:193 picard/ui/options/scripting.py:28
+#: picard/config_upgrade.py:200 picard/ui/options/scripting.py:28
 #, python-format
 msgid "My script %d"
 msgstr ""

-#: picard/file.py:541
+#: picard/file.py:565
 #, python-format
 msgid "No matching tracks for file '%(filename)s'"
 msgstr "Δεν υπάρχει κομμάτι που να ταιριάζει με το αρχείο '%(filename)s'"

-#: picard/file.py:557
+#: picard/file.py:581
 #, python-format
 msgid "No matching tracks above the threshold for file '%(filename)s'"
 msgstr "Δε βρέθηκαν κομμάτια που να ξεπερνούν τον κατώφλι ομοιότητας για το αρχείο '%(filename)s' ."

-#: picard/file.py:564
+#: picard/file.py:588
 #, python-format
 msgid "File '%(filename)s' identified!"
 msgstr "Το αρχείο '%(filename)s' αναγνωρίστηκε!"

-#: picard/file.py:584
+#: picard/file.py:608
 #, python-format
 msgid "Looking up the metadata for file %(filename)s ..."
 msgstr "Αναζήτηση των μεταδεδομένων για το αρχείο %(filename)s ..."
@@ -210,23 +210,23 @@ msgstr "[κανένα barcode]"
 msgid "[no release info]"
 msgstr "[καμία πληροφορία κυκλοφορίας]"

-#: picard/tagger.py:405 picard/tagger.py:438
+#: picard/tagger.py:407 picard/tagger.py:440
 #, python-format
 msgid "Adding %(count)d file from '%(directory)s' ..."
 msgid_plural "Adding %(count)d files from '%(directory)s' ..."
 msgstr[0] "Προσθήκη %(count)d αρχείου από '%(directory)s' ..."
 msgstr[1] "Προσθήκη %(count)d αρχείων από '%(directory)s' ..."

-#: picard/tagger.py:597
+#: picard/tagger.py:599
 #, python-format
 msgid "Removing album %(id)s: %(artist)s - %(album)s"
 msgstr "Αφαίρεση δίσκου %(id)s: %(artist)s - %(album)s"

-#: picard/tagger.py:613
+#: picard/tagger.py:615
 msgid "CD Lookup Error"
 msgstr "Σφάλμα αναζήτησης CD"

-#: picard/tagger.py:614
+#: picard/tagger.py:616
 #, python-format
 msgid ""
 "Error while reading CD:\n"
@@ -274,6 +274,10 @@ msgstr "Γαλλικά"
 msgid "Italian"
 msgstr "Ιταλικά"

+#: picard/const/languages.py:57
+msgid "Norwegian Bokmal"
+msgstr ""
+
 #: picard/const/languages.py:59
 msgid "Dutch"
 msgstr "Ολλανδικά"
@@ -337,12 +341,12 @@ msgstr ""
 msgid "Whitelist"
 msgstr ""

-#: picard/ui/cdlookup.py:35 picard/ui/mainwindow.py:625 picard/util/tags.py:21
+#: picard/ui/cdlookup.py:35 picard/ui/mainwindow.py:626 picard/util/tags.py:21
 msgid "Album"
 msgstr "Άλμπουμ"

-#: picard/ui/cdlookup.py:35 picard/ui/itemviews.py:96
-#: picard/ui/mainwindow.py:626 picard/ui/searchdialog.py:326
+#: picard/ui/cdlookup.py:35 picard/ui/itemviews.py:105
+#: picard/ui/mainwindow.py:627 picard/ui/searchdialog.py:326
 #: picard/ui/searchdialog.py:513 picard/util/tags.py:22
 msgid "Artist"
 msgstr "Καλλιτέχνης"
@@ -376,10 +380,22 @@ msgid_plural "%s (%i releases)"
 msgstr[0] "%s (%i κυκλοφορία)"
 msgstr[1] "%s (%i κυκλοφορίες)"

-#: picard/ui/coverartbox.py:143
+#: picard/ui/coverartbox.py:141
 msgid "View release on MusicBrainz"
 msgstr "Προβολή κυκλοφορίας στο MusicBrainz"

+#: picard/ui/coverartbox.py:174
+msgid "Show more details"
+msgstr ""
+
+#: picard/ui/coverartbox.py:199
+msgid "New Cover Art"
+msgstr ""
+
+#: picard/ui/coverartbox.py:200
+msgid "Original Cover Art"
+msgstr ""
+
 #: picard/ui/filebrowser.py:40
 msgid "&Move Tagged Files Here"
 msgstr "&Μετακίνηση ετικετοποιημένων αρχείων εδώ"
@@ -508,116 +524,116 @@ msgstr "Εκκρεμής αρχεία"
 msgid "Pending requests"
 msgstr "Εκκρεμής αιτήματα"

-#: picard/ui/itemviews.py:94 picard/util/tags.py:23
+#: picard/ui/itemviews.py:103 picard/util/tags.py:23
 msgid "Title"
 msgstr "Τίτλος"

-#: picard/ui/itemviews.py:95 picard/ui/searchdialog.py:325
+#: picard/ui/itemviews.py:104 picard/ui/searchdialog.py:325
 #: picard/util/tags.py:87
 msgid "Length"
 msgstr "Διάρκεια"

-#: picard/ui/itemviews.py:162
+#: picard/ui/itemviews.py:171
 msgid "Bad match"
 msgstr ""

-#: picard/ui/itemviews.py:163
+#: picard/ui/itemviews.py:172
 msgid "Poor match"
 msgstr ""

-#: picard/ui/itemviews.py:164
+#: picard/ui/itemviews.py:173
 msgid "Ok match"
 msgstr ""

-#: picard/ui/itemviews.py:165
+#: picard/ui/itemviews.py:174
 msgid "Good match"
 msgstr ""

-#: picard/ui/itemviews.py:166
+#: picard/ui/itemviews.py:175
 msgid "Great match"
 msgstr ""

-#: picard/ui/itemviews.py:167
+#: picard/ui/itemviews.py:176
 msgid "Excellent match"
 msgstr ""

-#: picard/ui/itemviews.py:243
+#: picard/ui/itemviews.py:252
 msgid "&Expand all"
 msgstr "&Ανάπτυξη όλων"

-#: picard/ui/itemviews.py:245
+#: picard/ui/itemviews.py:254
 msgid "&Collapse all"
 msgstr "&Σύμπτυξη όλων"

-#: picard/ui/itemviews.py:247
+#: picard/ui/itemviews.py:256
 msgid "Select &all"
 msgstr ""

-#: picard/ui/itemviews.py:249
+#: picard/ui/itemviews.py:258
 msgid "Ctrl+A"
 msgstr ""

-#: picard/ui/itemviews.py:315
+#: picard/ui/itemviews.py:324
 msgid "&Other versions"
 msgstr "&Άλλες εκδόσεις"

-#: picard/ui/itemviews.py:318
+#: picard/ui/itemviews.py:327
 msgid "Loading..."
 msgstr "Φόρτωση..."

-#: picard/ui/itemviews.py:383
+#: picard/ui/itemviews.py:392
 msgid "Collections"
 msgstr "Συλλογές"

-#: picard/ui/itemviews.py:386
+#: picard/ui/itemviews.py:395
 msgid "P&lugins"
 msgstr "Π&ρόσθετα"

-#: picard/ui/itemviews.py:557
+#: picard/ui/itemviews.py:577
 msgid "file view"
 msgstr "προβολή αρχείου"

-#: picard/ui/itemviews.py:558
+#: picard/ui/itemviews.py:578
 msgid "Contains unmatched files and clusters"
 msgstr "Περιέχει μη ταιριασμένα αρχεία και ομάδες"

-#: picard/ui/itemviews.py:578
+#: picard/ui/itemviews.py:598
 msgid "Clusters"
 msgstr "Ομάδες"

-#: picard/ui/itemviews.py:587
+#: picard/ui/itemviews.py:607
 msgid "album view"
 msgstr "προβολή δίσκου"

-#: picard/ui/itemviews.py:588
+#: picard/ui/itemviews.py:608
 msgid "Contains albums and matched files"
 msgstr "Περιέχει άλμπουμ και ταιριασμένα αρχεία"

-#: picard/ui/itemviews.py:694 picard/ui/options/renaming.py:188
+#: picard/ui/itemviews.py:714 picard/ui/options/renaming.py:188
 msgid "Error"
 msgstr "Σφάλμα"

-#: picard/ui/itemviews.py:698
+#: picard/ui/itemviews.py:718
 msgid "Album modified and complete"
 msgstr ""

-#: picard/ui/itemviews.py:701
+#: picard/ui/itemviews.py:721
 msgid "Album unchanged and complete"
 msgstr ""

-#: picard/ui/itemviews.py:705
+#: picard/ui/itemviews.py:725
 msgid "Album modified"
 msgstr ""

-#: picard/ui/itemviews.py:708
+#: picard/ui/itemviews.py:728
 msgid "Album unchanged"
 msgstr ""

-#: picard/ui/itemviews.py:811
+#: picard/ui/itemviews.py:831
 msgid "Track saved"
 msgstr ""

-#: picard/ui/itemviews.py:813 picard/ui/itemviews.py:817
+#: picard/ui/itemviews.py:833 picard/ui/itemviews.py:837
 msgid "Pending"
 msgstr ""

@@ -808,7 +824,7 @@ msgstr "Ctrl+B"
 msgid "&Cover Art"
 msgstr "&Εξώφυλλο"

-#: picard/ui/mainwindow.py:407 picard/ui/mainwindow.py:619
+#: picard/ui/mainwindow.py:407 picard/ui/mainwindow.py:620
 #: picard/ui/searchdialog.py:71
 msgid "Search"
 msgstr "Αναζήτηση"
@@ -835,175 +851,179 @@ msgid ""
 "even if they have no metadata"
 msgstr ""

-#: picard/ui/mainwindow.py:421
+#: picard/ui/mainwindow.py:420
+msgid "Identify the file using its AcoustID audio fingerprint"
+msgstr ""
+
+#: picard/ui/mainwindow.py:422
 msgid "Ctrl+Y"
 msgstr "Ctrl+Y"

-#: picard/ui/mainwindow.py:424
+#: picard/ui/mainwindow.py:425
 msgid "Cl&uster"
 msgstr "Ομ&άδες"

-#: picard/ui/mainwindow.py:425
+#: picard/ui/mainwindow.py:426
 msgid "Cluster files into album clusters"
 msgstr ""

-#: picard/ui/mainwindow.py:428
+#: picard/ui/mainwindow.py:429
 msgid "Ctrl+U"
 msgstr "Ctrl+U"

-#: picard/ui/mainwindow.py:431
+#: picard/ui/mainwindow.py:432
 msgid "&Lookup"
 msgstr "&Αναζήτηση"

-#: picard/ui/mainwindow.py:432
+#: picard/ui/mainwindow.py:433
 msgid "Lookup selected items in MusicBrainz"
 msgstr "Αναζήτηση των επιλεγμένων αντικειμένων στο MusicBrainz"

-#: picard/ui/mainwindow.py:437
+#: picard/ui/mainwindow.py:438
 msgid "Ctrl+L"
 msgstr "Ctrl+L"

-#: picard/ui/mainwindow.py:440
+#: picard/ui/mainwindow.py:441
 msgid "&Info..."
 msgstr "&Πληροφορίες..."

-#: picard/ui/mainwindow.py:443
+#: picard/ui/mainwindow.py:444
 msgid "Ctrl+I"
 msgstr "Ctrl+I"

-#: picard/ui/mainwindow.py:446
+#: picard/ui/mainwindow.py:447
 msgid "&Refresh"
 msgstr "&Ανανέωση"

-#: picard/ui/mainwindow.py:447
+#: picard/ui/mainwindow.py:448
 msgid "Ctrl+R"
 msgstr "Ctrl+R"

-#: picard/ui/mainwindow.py:450
+#: picard/ui/mainwindow.py:451
 msgid "&Rename Files"
 msgstr "&Μετονομασία αρχείων"

-#: picard/ui/mainwindow.py:455
+#: picard/ui/mainwindow.py:456
 msgid "&Move Files"
 msgstr "&Μετακίνηση αρχείων"

-#: picard/ui/mainwindow.py:460
+#: picard/ui/mainwindow.py:461
 msgid "Save &Tags"
 msgstr "Αποθήκευση &ετικετών"

-#: picard/ui/mainwindow.py:465
+#: picard/ui/mainwindow.py:466
 msgid "Tags From &File Names..."
 msgstr "Ετικέτα από τα &ονόματα αρχείων..."

-#: picard/ui/mainwindow.py:469
+#: picard/ui/mainwindow.py:470
 msgid "&Open My Collections in Browser"
 msgstr "&Άνοιγμα των συλλογών μου στο πρόγραμμα περιήγησης"

-#: picard/ui/mainwindow.py:473
+#: picard/ui/mainwindow.py:474
 msgid "View Error/Debug &Log"
 msgstr "Προβολή αρχείου καταγραφής σφαλμάτων"

-#: picard/ui/mainwindow.py:476
+#: picard/ui/mainwindow.py:477
 msgid "View Activity &History"
 msgstr "Προβολή &ιστορικού δραστηριότητας"

-#: picard/ui/mainwindow.py:483
+#: picard/ui/mainwindow.py:484
 msgid "Open in &Player"
 msgstr ""

-#: picard/ui/mainwindow.py:484
+#: picard/ui/mainwindow.py:485
 msgid "Play the file in your default media player"
 msgstr "Αναπαραγωγή του αρχείου στο προεπιλεγμένο σας πρόγραμμα αναπαραγωγής πολυμέσων "

-#: picard/ui/mainwindow.py:488
+#: picard/ui/mainwindow.py:489
 msgid "Open Containing &Folder"
 msgstr ""

-#: picard/ui/mainwindow.py:489
+#: picard/ui/mainwindow.py:490
 msgid "Open the containing folder in your file explorer"
 msgstr ""

-#: picard/ui/mainwindow.py:518
+#: picard/ui/mainwindow.py:519
 msgid "&File"
 msgstr "&Αρχείο"

-#: picard/ui/mainwindow.py:529
+#: picard/ui/mainwindow.py:530
 msgid "&Edit"
 msgstr "&Επεξεργασία"

-#: picard/ui/mainwindow.py:535
+#: picard/ui/mainwindow.py:536
 msgid "&View"
 msgstr "&Προβολή"

-#: picard/ui/mainwindow.py:541
+#: picard/ui/mainwindow.py:542
 msgid "&Options"
 msgstr "&Επιλογές"

-#: picard/ui/mainwindow.py:547
+#: picard/ui/mainwindow.py:548
 msgid "&Tools"
 msgstr "&Εργαλεία"

-#: picard/ui/mainwindow.py:558 picard/ui/util.py:35
+#: picard/ui/mainwindow.py:559 picard/ui/util.py:35
 msgid "&Help"
 msgstr "&Βοήθεια"

-#: picard/ui/mainwindow.py:586
+#: picard/ui/mainwindow.py:587
 msgid "Actions"
 msgstr "Ενέργειες"

-#: picard/ui/mainwindow.py:627
+#: picard/ui/mainwindow.py:628
 msgid "Track"
 msgstr "Κομμάτι"

-#: picard/ui/mainwindow.py:703
+#: picard/ui/mainwindow.py:704
 msgid "All Supported Formats"
 msgstr "Όλες οι υποστηριζόμενες μορφές"

-#: picard/ui/mainwindow.py:730
+#: picard/ui/mainwindow.py:731
 #, python-format
 msgid "Adding multiple directories from '%(directory)s' ..."
 msgstr "Προσθήκη πολλαπλών καταλόγων από '%(directory)s' ..."

-#: picard/ui/mainwindow.py:735
+#: picard/ui/mainwindow.py:736
 #, python-format
 msgid "Adding directory: '%(directory)s' ..."
 msgstr "Προσθήκη φακέλου: '%(directory)s' ..."

-#: picard/ui/mainwindow.py:801
+#: picard/ui/mainwindow.py:809
 msgid "Configuration Required"
 msgstr "Απαιτείται ρύθμιση"

-#: picard/ui/mainwindow.py:802
+#: picard/ui/mainwindow.py:810
 msgid ""
 "Audio fingerprinting is not yet configured. Would you like to configure it "
 "now?"
 msgstr "Τα αποτυπώματα ήχου δεν έχουν ρυθμιστεί ακόμα. Θέλετε να τα ρυθμίσετε τώρα;"

-#: picard/ui/mainwindow.py:902
+#: picard/ui/mainwindow.py:916
 #, python-format
 msgid "%(filename)s (error: %(error)s)"
 msgstr "%(filename)s (σφάλμα: %(error)s)"

-#: picard/ui/mainwindow.py:908
+#: picard/ui/mainwindow.py:922
 #, python-format
 msgid "%(filename)s"
 msgstr "%(filename)s"

-#: picard/ui/mainwindow.py:918
+#: picard/ui/mainwindow.py:933
 #, python-format
 msgid "%(filename)s (%(similarity)d%%) (error: %(error)s)"
 msgstr "%(filename)s (%(similarity)d%%) (σφάλμα: %(error)s)"

-#: picard/ui/mainwindow.py:925
+#: picard/ui/mainwindow.py:940
 #, python-format
 msgid "%(filename)s (%(similarity)d%%)"
 msgstr "%(filename)s (%(similarity)d%%)"

-#: picard/ui/mainwindow.py:961
+#: picard/ui/mainwindow.py:976
 msgid "Authentication Required"
 msgstr "Απαιτείται έλεγχος ταυτότητας"

-#: picard/ui/mainwindow.py:962
+#: picard/ui/mainwindow.py:977
 msgid ""
 "Picard needs authorization to access your personal data on the MusicBrainz "
 "server. Would you like to log in now?"
@@ -1112,7 +1132,7 @@ msgstr ""
 msgid "Retry"
 msgstr ""

-#: picard/ui/searchdialog.py:288
+#: picard/ui/searchdialog.py:283
 #, python-format
 msgid ""
 "<strong>Following error occurred while fetching "
@@ -1916,19 +1936,19 @@ msgstr ""
 msgid "Reset all settings for current option page"
 msgstr ""

-#: picard/ui/options/dialog.py:166
+#: picard/ui/options/dialog.py:172
 msgid "You are about to reset your options for this page."
 msgstr ""

-#: picard/ui/options/dialog.py:170
+#: picard/ui/options/dialog.py:176
 msgid "Warning! This will reset all of your settings."
 msgstr ""

-#: picard/ui/options/dialog.py:177
+#: picard/ui/options/dialog.py:183
 msgid "Confirm Reset"
 msgstr ""

-#: picard/ui/options/dialog.py:178
+#: picard/ui/options/dialog.py:184
 msgid "Are you sure?"
 msgstr ""

@@ -2099,7 +2119,7 @@ msgstr "Επαναφορά όλων"
 msgid "File Naming"
 msgstr "Ονομασία αρχείων"

-#: picard/ui/options/renaming.py:175 picard/ui/options/scripting.py:406
+#: picard/ui/options/renaming.py:175 picard/ui/options/scripting.py:410
 msgid ""
 "<a href=\"%(picard-doc-scripting-url)s\">Open Scripting Documentation in "
 "your browser</a>"
@@ -2141,15 +2161,15 @@ msgstr ""
 msgid "Scripting"
 msgstr ""

-#: picard/ui/options/scripting.py:292
+#: picard/ui/options/scripting.py:293
 msgid "Are you sure you want to remove this script?"
 msgstr ""

-#: picard/ui/options/scripting.py:293
+#: picard/ui/options/scripting.py:294
 msgid "Confirm Remove"
 msgstr ""

-#: picard/ui/options/scripting.py:376
+#: picard/ui/options/scripting.py:377
 msgid "Script Error"
 msgstr ""

--- a/po/en_CA.po
+++ b/po/en_CA.po
@@ -12,8 +12,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: MusicBrainz\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2017-01-18 12:51+0100\n"
-"PO-Revision-Date: 2017-01-19 09:17+0000\n"
+"POT-Creation-Date: 2017-03-05 09:58+0100\n"
+"PO-Revision-Date: 2017-03-05 10:00+0000\n"
 "Last-Translator: nikki\n"
 "Language-Team: English (Canada) (http://www.transifex.com/musicbrainz/musicbrainz/language/en_CA/)\n"
 "MIME-Version: 1.0\n"
@@ -60,26 +60,26 @@ msgstr "AcoustIDs successfully submitted."
 msgid "Unmatched Files"
 msgstr "Unmatched Files"

-#: picard/album.py:206
+#: picard/album.py:200
 #, python-format
 msgid "[could not load album %s]"
 msgstr "[could not load album %s]"

-#: picard/album.py:295
+#: picard/album.py:289
 #, python-format
 msgid "Album %(id)s loaded: %(artist)s - %(album)s"
 msgstr "Album %(id)s loaded: %(artist)s - %(album)s"

-#: picard/album.py:338
+#: picard/album.py:332
 #, python-format
 msgid "Loading album %(id)s ..."
 msgstr "Loading album %(id)s ..."

-#: picard/album.py:342
+#: picard/album.py:336
 msgid "[loading album information]"
 msgstr "[loading album information]"

-#: picard/album.py:527
+#: picard/album.py:523
 #, python-format
 msgid "; %i image"
 msgid_plural "; %i images"
@@ -101,72 +101,72 @@ msgstr "Cluster %(album)s identified!"
 msgid "Looking up the metadata for cluster %(album)s..."
 msgstr "Looking up the metadata for cluster %(album)s..."

-#: picard/collection.py:64
+#: picard/collection.py:67
 #, python-format
 msgid "Added %(count)i release to collection \"%(name)s\""
 msgid_plural "Added %(count)i releases to collection \"%(name)s\""
 msgstr[0] "Added %(count)i release to collection \"%(name)s\""
 msgstr[1] "Added %(count)i releases to collection \"%(name)s\""

-#: picard/collection.py:86
+#: picard/collection.py:89
 #, python-format
 msgid "Removed %(count)i release from collection \"%(name)s\""
 msgid_plural "Removed %(count)i releases from collection \"%(name)s\""
 msgstr[0] "Removed %(count)i release from collection \"%(name)s\""
 msgstr[1] "Removed %(count)i releases from collection \"%(name)s\""

-#: picard/collection.py:100
+#: picard/collection.py:104
 #, python-format
 msgid "Error loading collections: %(error)s"
 msgstr "Error loading collections: %(error)s"

-#: picard/config_upgrade.py:58 picard/config_upgrade.py:71
+#: picard/config_upgrade.py:57 picard/config_upgrade.py:70
 msgid "Various Artists file naming scheme removal"
 msgstr "Various Artists file naming scheme removal"

-#: picard/config_upgrade.py:59
+#: picard/config_upgrade.py:58
 msgid ""
 "The separate file naming scheme for various artists albums has been removed in this version of Picard.\n"
 "Your file naming scheme has automatically been merged with that of single artist albums."
 msgstr "The separate file naming scheme for various artists albums has been removed in this version of Picard.\nYour file naming scheme has automatically been merged with that of single artist albums."

-#: picard/config_upgrade.py:72
+#: picard/config_upgrade.py:71
 msgid ""
 "The separate file naming scheme for various artists albums has been removed in this version of Picard.\n"
 "You currently do not use this option, but have a separate file naming scheme defined.\n"
 "Do you want to remove it or merge it with your file naming scheme for single artist albums?"
 msgstr "The separate file naming scheme for various artists albums has been removed in this version of Picard.\nYou currently do not use this option, but have a separate file naming scheme defined.\nDo you want to remove it or merge it with your file naming scheme for single artist albums?"

-#: picard/config_upgrade.py:78
+#: picard/config_upgrade.py:77
 msgid "Merge"
 msgstr "Merge"

-#: picard/config_upgrade.py:78 picard/ui/metadatabox.py:314
+#: picard/config_upgrade.py:77 picard/ui/metadatabox.py:314
 #: picard/ui/options/interface.py:75 picard/ui/ui_options_interface.py:141
 msgid "Remove"
 msgstr "Remove"

-#: picard/config_upgrade.py:193 picard/ui/options/scripting.py:28
+#: picard/config_upgrade.py:200 picard/ui/options/scripting.py:28
 #, python-format
 msgid "My script %d"
 msgstr ""

-#: picard/file.py:541
+#: picard/file.py:565
 #, python-format
 msgid "No matching tracks for file '%(filename)s'"
 msgstr "No matching tracks for file '%(filename)s'"

-#: picard/file.py:557
+#: picard/file.py:581
 #, python-format
 msgid "No matching tracks above the threshold for file '%(filename)s'"
 msgstr "No matching tracks above the threshold for file '%(filename)s'"

-#: picard/file.py:564
+#: picard/file.py:588
 #, python-format
 msgid "File '%(filename)s' identified!"
 msgstr "File '%(filename)s' identified!"

-#: picard/file.py:584
+#: picard/file.py:608
 #, python-format
 msgid "Looking up the metadata for file %(filename)s ..."
 msgstr "Looking up the metadata for file %(filename)s ..."
@@ -209,23 +209,23 @@ msgstr "[no barcode]"
 msgid "[no release info]"
 msgstr "[no release info]"

-#: picard/tagger.py:405 picard/tagger.py:438
+#: picard/tagger.py:407 picard/tagger.py:440
 #, python-format
 msgid "Adding %(count)d file from '%(directory)s' ..."
 msgid_plural "Adding %(count)d files from '%(directory)s' ..."
 msgstr[0] "Adding %(count)d file from '%(directory)s' ..."
 msgstr[1] "Adding %(count)d files from '%(directory)s' ..."

-#: picard/tagger.py:597
+#: picard/tagger.py:599
 #, python-format
 msgid "Removing album %(id)s: %(artist)s - %(album)s"
 msgstr "Removing album %(id)s: %(artist)s - %(album)s"

-#: picard/tagger.py:613
+#: picard/tagger.py:615
 msgid "CD Lookup Error"
 msgstr "CD Lookup Error"

-#: picard/tagger.py:614
+#: picard/tagger.py:616
 #, python-format
 msgid ""
 "Error while reading CD:\n"
@@ -273,6 +273,10 @@ msgstr "French"
 msgid "Italian"
 msgstr "Italian"

+#: picard/const/languages.py:57
+msgid "Norwegian Bokmal"
+msgstr ""
+
 #: picard/const/languages.py:59
 msgid "Dutch"
 msgstr "Dutch"
@@ -336,12 +340,12 @@ msgstr ""
 msgid "Whitelist"
 msgstr ""

-#: picard/ui/cdlookup.py:35 picard/ui/mainwindow.py:625 picard/util/tags.py:21
+#: picard/ui/cdlookup.py:35 picard/ui/mainwindow.py:626 picard/util/tags.py:21
 msgid "Album"
 msgstr "Album"

-#: picard/ui/cdlookup.py:35 picard/ui/itemviews.py:96
-#: picard/ui/mainwindow.py:626 picard/ui/searchdialog.py:326
+#: picard/ui/cdlookup.py:35 picard/ui/itemviews.py:105
+#: picard/ui/mainwindow.py:627 picard/ui/searchdialog.py:326
 #: picard/ui/searchdialog.py:513 picard/util/tags.py:22
 msgid "Artist"
 msgstr "Artist"
@@ -375,10 +379,22 @@ msgid_plural "%s (%i releases)"
 msgstr[0] "%s (%i release)"
 msgstr[1] "%s (%i releases)"

-#: picard/ui/coverartbox.py:143
+#: picard/ui/coverartbox.py:141
 msgid "View release on MusicBrainz"
 msgstr "View release on MusicBrainz"

+#: picard/ui/coverartbox.py:174
+msgid "Show more details"
+msgstr ""
+
+#: picard/ui/coverartbox.py:199
+msgid "New Cover Art"
+msgstr ""
+
+#: picard/ui/coverartbox.py:200
+msgid "Original Cover Art"
+msgstr ""
+
 #: picard/ui/filebrowser.py:40
 msgid "&Move Tagged Files Here"
 msgstr "&Move Tagged Files Here"
@@ -507,116 +523,116 @@ msgstr "Pending files"
 msgid "Pending requests"
 msgstr "Pending requests"

-#: picard/ui/itemviews.py:94 picard/util/tags.py:23
+#: picard/ui/itemviews.py:103 picard/util/tags.py:23
 msgid "Title"
 msgstr "Title"

-#: picard/ui/itemviews.py:95 picard/ui/searchdialog.py:325
+#: picard/ui/itemviews.py:104 picard/ui/searchdialog.py:325
 #: picard/util/tags.py:87
 msgid "Length"
 msgstr "Length"

-#: picard/ui/itemviews.py:162
+#: picard/ui/itemviews.py:171
 msgid "Bad match"
 msgstr ""

-#: picard/ui/itemviews.py:163
+#: picard/ui/itemviews.py:172
 msgid "Poor match"
 msgstr ""

-#: picard/ui/itemviews.py:164
+#: picard/ui/itemviews.py:173
 msgid "Ok match"
 msgstr ""

-#: picard/ui/itemviews.py:165
+#: picard/ui/itemviews.py:174
 msgid "Good match"
 msgstr ""

-#: picard/ui/itemviews.py:166
+#: picard/ui/itemviews.py:175
 msgid "Great match"
 msgstr ""

-#: picard/ui/itemviews.py:167
+#: picard/ui/itemviews.py:176
 msgid "Excellent match"
 msgstr ""

-#: picard/ui/itemviews.py:243
+#: picard/ui/itemviews.py:252
 msgid "&Expand all"
 msgstr "&Expand all"

-#: picard/ui/itemviews.py:245
+#: picard/ui/itemviews.py:254
 msgid "&Collapse all"
 msgstr "&Collapse all"

-#: picard/ui/itemviews.py:247
+#: picard/ui/itemviews.py:256
 msgid "Select &all"
 msgstr ""

-#: picard/ui/itemviews.py:249
+#: picard/ui/itemviews.py:258
 msgid "Ctrl+A"
 msgstr ""

-#: picard/ui/itemviews.py:315
+#: picard/ui/itemviews.py:324
 msgid "&Other versions"
 msgstr "&Other versions"

-#: picard/ui/itemviews.py:318
+#: picard/ui/itemviews.py:327
 msgid "Loading..."
 msgstr "Loading..."

-#: picard/ui/itemviews.py:383
+#: picard/ui/itemviews.py:392
 msgid "Collections"
 msgstr "Collections"

-#: picard/ui/itemviews.py:386
+#: picard/ui/itemviews.py:395
 msgid "P&lugins"
 msgstr "P&lugins"

-#: picard/ui/itemviews.py:557
+#: picard/ui/itemviews.py:577
 msgid "file view"
 msgstr "file view"

-#: picard/ui/itemviews.py:558
+#: picard/ui/itemviews.py:578
 msgid "Contains unmatched files and clusters"
 msgstr "Contains unmatched files and clusters"

-#: picard/ui/itemviews.py:578
+#: picard/ui/itemviews.py:598
 msgid "Clusters"
 msgstr "Clusters"

-#: picard/ui/itemviews.py:587
+#: picard/ui/itemviews.py:607
 msgid "album view"
 msgstr "album view"

-#: picard/ui/itemviews.py:588
+#: picard/ui/itemviews.py:608
 msgid "Contains albums and matched files"
 msgstr "Contains albums and matched files"

-#: picard/ui/itemviews.py:694 picard/ui/options/renaming.py:188
+#: picard/ui/itemviews.py:714 picard/ui/options/renaming.py:188
 msgid "Error"
 msgstr "Error"

-#: picard/ui/itemviews.py:698
+#: picard/ui/itemviews.py:718
 msgid "Album modified and complete"
 msgstr ""

-#: picard/ui/itemviews.py:701
+#: picard/ui/itemviews.py:721
 msgid "Album unchanged and complete"
 msgstr ""

-#: picard/ui/itemviews.py:705
+#: picard/ui/itemviews.py:725
 msgid "Album modified"
 msgstr ""

-#: picard/ui/itemviews.py:708
+#: picard/ui/itemviews.py:728
 msgid "Album unchanged"
 msgstr ""

-#: picard/ui/itemviews.py:811
+#: picard/ui/itemviews.py:831
 msgid "Track saved"
 msgstr ""

-#: picard/ui/itemviews.py:813 picard/ui/itemviews.py:817
+#: picard/ui/itemviews.py:833 picard/ui/itemviews.py:837
 msgid "Pending"
 msgstr ""

@@ -807,7 +823,7 @@ msgstr "Ctrl+B"
 msgid "&Cover Art"
 msgstr "&Cover Art"

-#: picard/ui/mainwindow.py:407 picard/ui/mainwindow.py:619
+#: picard/ui/mainwindow.py:407 picard/ui/mainwindow.py:620
 #: picard/ui/searchdialog.py:71
 msgid "Search"
 msgstr "Search"
@@ -834,175 +850,179 @@ msgid ""
 "even if they have no metadata"
 msgstr ""

-#: picard/ui/mainwindow.py:421
+#: picard/ui/mainwindow.py:420
+msgid "Identify the file using its AcoustID audio fingerprint"
+msgstr ""
+
+#: picard/ui/mainwindow.py:422
 msgid "Ctrl+Y"
 msgstr "Ctrl+Y"

-#: picard/ui/mainwindow.py:424
+#: picard/ui/mainwindow.py:425
 msgid "Cl&uster"
 msgstr "Cl&uster"

-#: picard/ui/mainwindow.py:425
+#: picard/ui/mainwindow.py:426
 msgid "Cluster files into album clusters"
 msgstr ""

-#: picard/ui/mainwindow.py:428
+#: picard/ui/mainwindow.py:429
 msgid "Ctrl+U"
 msgstr "Ctrl+U"

-#: picard/ui/mainwindow.py:431
+#: picard/ui/mainwindow.py:432
 msgid "&Lookup"
 msgstr "&Lookup"

-#: picard/ui/mainwindow.py:432
+#: picard/ui/mainwindow.py:433
 msgid "Lookup selected items in MusicBrainz"
 msgstr "Lookup selected items in MusicBrainz"

-#: picard/ui/mainwindow.py:437
+#: picard/ui/mainwindow.py:438
 msgid "Ctrl+L"
 msgstr "Ctrl+L"

-#: picard/ui/mainwindow.py:440
+#: picard/ui/mainwindow.py:441
 msgid "&Info..."
 msgstr "&Info..."

-#: picard/ui/mainwindow.py:443
+#: picard/ui/mainwindow.py:444
 msgid "Ctrl+I"
 msgstr "Ctrl+I"

-#: picard/ui/mainwindow.py:446
+#: picard/ui/mainwindow.py:447
 msgid "&Refresh"
 msgstr "&Refresh"

-#: picard/ui/mainwindow.py:447
+#: picard/ui/mainwindow.py:448
 msgid "Ctrl+R"
 msgstr "Ctrl+R"

-#: picard/ui/mainwindow.py:450
+#: picard/ui/mainwindow.py:451
 msgid "&Rename Files"
 msgstr "&Rename Files"

-#: picard/ui/mainwindow.py:455
+#: picard/ui/mainwindow.py:456
 msgid "&Move Files"
 msgstr "&Move Files"

-#: picard/ui/mainwindow.py:460
+#: picard/ui/mainwindow.py:461
 msgid "Save &Tags"
 msgstr "Save &Tags"

-#: picard/ui/mainwindow.py:465
+#: picard/ui/mainwindow.py:466
 msgid "Tags From &File Names..."
 msgstr "Tags From &File Names..."

-#: picard/ui/mainwindow.py:469
+#: picard/ui/mainwindow.py:470
 msgid "&Open My Collections in Browser"
 msgstr "&Open My Collections in Browser"

-#: picard/ui/mainwindow.py:473
+#: picard/ui/mainwindow.py:474
 msgid "View Error/Debug &Log"
 msgstr "View Error/Debug &Log"

-#: picard/ui/mainwindow.py:476
+#: picard/ui/mainwindow.py:477
 msgid "View Activity &History"
 msgstr "View Activity &History"

-#: picard/ui/mainwindow.py:483
+#: picard/ui/mainwindow.py:484
 msgid "Open in &Player"
 msgstr ""

-#: picard/ui/mainwindow.py:484
+#: picard/ui/mainwindow.py:485
 msgid "Play the file in your default media player"
 msgstr "Play the file in your default media player"

-#: picard/ui/mainwindow.py:488
+#: picard/ui/mainwindow.py:489
 msgid "Open Containing &Folder"
 msgstr "Open Containing &Folder"

-#: picard/ui/mainwindow.py:489
+#: picard/ui/mainwindow.py:490
 msgid "Open the containing folder in your file explorer"
 msgstr "Open the containing folder in your file explorer"

-#: picard/ui/mainwindow.py:518
+#: picard/ui/mainwindow.py:519
 msgid "&File"
 msgstr "&File"

-#: picard/ui/mainwindow.py:529
+#: picard/ui/mainwindow.py:530
 msgid "&Edit"
 msgstr "&Edit"

-#: picard/ui/mainwindow.py:535
+#: picard/ui/mainwindow.py:536
 msgid "&View"
 msgstr "&View"

-#: picard/ui/mainwindow.py:541
+#: picard/ui/mainwindow.py:542
 msgid "&Options"
 msgstr "&Options"

-#: picard/ui/mainwindow.py:547
+#: picard/ui/mainwindow.py:548
 msgid "&Tools"
 msgstr "&Tools"

-#: picard/ui/mainwindow.py:558 picard/ui/util.py:35
+#: picard/ui/mainwindow.py:559 picard/ui/util.py:35
 msgid "&Help"
 msgstr "&Help"

-#: picard/ui/mainwindow.py:586
+#: picard/ui/mainwindow.py:587
 msgid "Actions"
 msgstr "Actions"

-#: picard/ui/mainwindow.py:627
+#: picard/ui/mainwindow.py:628
 msgid "Track"
 msgstr "Track"

-#: picard/ui/mainwindow.py:703
+#: picard/ui/mainwindow.py:704
 msgid "All Supported Formats"
 msgstr "All Supported Formats"

-#: picard/ui/mainwindow.py:730
+#: picard/ui/mainwindow.py:731
 #, python-format
 msgid "Adding multiple directories from '%(directory)s' ..."
 msgstr "Adding multiple directories from '%(directory)s' ..."

-#: picard/ui/mainwindow.py:735
+#: picard/ui/mainwindow.py:736
 #, python-format
 msgid "Adding directory: '%(directory)s' ..."
 msgstr "Adding directory: '%(directory)s' ..."

-#: picard/ui/mainwindow.py:801
+#: picard/ui/mainwindow.py:809
 msgid "Configuration Required"
 msgstr "Configuration Required"

-#: picard/ui/mainwindow.py:802
+#: picard/ui/mainwindow.py:810
 msgid ""
 "Audio fingerprinting is not yet configured. Would you like to configure it "
 "now?"
 msgstr "Audio fingerprinting is not yet configured. Would you like to configure it now?"

-#: picard/ui/mainwindow.py:902
+#: picard/ui/mainwindow.py:916
 #, python-format
 msgid "%(filename)s (error: %(error)s)"
 msgstr "%(filename)s (error: %(error)s)"

-#: picard/ui/mainwindow.py:908
+#: picard/ui/mainwindow.py:922
 #, python-format
 msgid "%(filename)s"
 msgstr "%(filename)s"

-#: picard/ui/mainwindow.py:918
+#: picard/ui/mainwindow.py:933
 #, python-format
 msgid "%(filename)s (%(similarity)d%%) (error: %(error)s)"
 msgstr "%(filename)s (%(similarity)d%%) (error: %(error)s)"

-#: picard/ui/mainwindow.py:925
+#: picard/ui/mainwindow.py:940
 #, python-format
 msgid "%(filename)s (%(similarity)d%%)"
 msgstr "%(filename)s (%(similarity)d%%)"

-#: picard/ui/mainwindow.py:961
+#: picard/ui/mainwindow.py:976
 msgid "Authentication Required"
 msgstr "Authentication Required"

-#: picard/ui/mainwindow.py:962
+#: picard/ui/mainwindow.py:977
 msgid ""
 "Picard needs authorization to access your personal data on the MusicBrainz "
 "server. Would you like to log in now?"
@@ -1111,7 +1131,7 @@ msgstr ""
 msgid "Retry"
 msgstr ""

-#: picard/ui/searchdialog.py:288
+#: picard/ui/searchdialog.py:283
 #, python-format
 msgid ""
 "<strong>Following error occurred while fetching "
@@ -1915,19 +1935,19 @@ msgstr ""
 msgid "Reset all settings for current option page"
 msgstr ""

-#: picard/ui/options/dialog.py:166
+#: picard/ui/options/dialog.py:172
 msgid "You are about to reset your options for this page."
 msgstr ""

-#: picard/ui/options/dialog.py:170
+#: picard/ui/options/dialog.py:176
 msgid "Warning! This will reset all of your settings."
 msgstr ""

-#: picard/ui/options/dialog.py:177
+#: picard/ui/options/dialog.py:183
 msgid "Confirm Reset"
 msgstr ""

-#: picard/ui/options/dialog.py:178
+#: picard/ui/options/dialog.py:184
 msgid "Are you sure?"
 msgstr ""

@@ -2098,7 +2118,7 @@ msgstr "Reset all"
 msgid "File Naming"
 msgstr "File Naming"

-#: picard/ui/options/renaming.py:175 picard/ui/options/scripting.py:406
+#: picard/ui/options/renaming.py:175 picard/ui/options/scripting.py:410
 msgid ""
 "<a href=\"%(picard-doc-scripting-url)s\">Open Scripting Documentation in "
 "your browser</a>"
@@ -2140,15 +2160,15 @@ msgstr ""
 msgid "Scripting"
 msgstr "Scripting"

-#: picard/ui/options/scripting.py:292
+#: picard/ui/options/scripting.py:293
 msgid "Are you sure you want to remove this script?"
 msgstr ""

-#: picard/ui/options/scripting.py:293
+#: picard/ui/options/scripting.py:294
 msgid "Confirm Remove"
 msgstr ""

-#: picard/ui/options/scripting.py:376
+#: picard/ui/options/scripting.py:377
 msgid "Script Error"
 msgstr "Script Error"

--- a/po/en_GB.po
+++ b/po/en_GB.po
@@ -10,8 +10,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: MusicBrainz\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2017-01-18 12:51+0100\n"
-"PO-Revision-Date: 2017-01-19 09:17+0000\n"
+"POT-Creation-Date: 2017-03-05 09:58+0100\n"
+"PO-Revision-Date: 2017-03-05 10:00+0000\n"
 "Last-Translator: nikki\n"
 "Language-Team: English (United Kingdom) (http://www.transifex.com/musicbrainz/musicbrainz/language/en_GB/)\n"
 "MIME-Version: 1.0\n"
@@ -58,26 +58,26 @@ msgstr ""
 msgid "Unmatched Files"
 msgstr "Unmatched Files"

-#: picard/album.py:206
+#: picard/album.py:200
 #, python-format
 msgid "[could not load album %s]"
 msgstr "[could not load album %s]"

-#: picard/album.py:295
+#: picard/album.py:289
 #, python-format
 msgid "Album %(id)s loaded: %(artist)s - %(album)s"
 msgstr ""

-#: picard/album.py:338
+#: picard/album.py:332
 #, python-format
 msgid "Loading album %(id)s ..."
 msgstr ""

-#: picard/album.py:342
+#: picard/album.py:336
 msgid "[loading album information]"
 msgstr "[loading album information]"

-#: picard/album.py:527
+#: picard/album.py:523
 #, python-format
 msgid "; %i image"
 msgid_plural "; %i images"
@@ -99,72 +99,72 @@ msgstr ""
 msgid "Looking up the metadata for cluster %(album)s..."
 msgstr ""

-#: picard/collection.py:64
+#: picard/collection.py:67
 #, python-format
 msgid "Added %(count)i release to collection \"%(name)s\""
 msgid_plural "Added %(count)i releases to collection \"%(name)s\""
 msgstr[0] ""
 msgstr[1] ""

-#: picard/collection.py:86
+#: picard/collection.py:89
 #, python-format
 msgid "Removed %(count)i release from collection \"%(name)s\""
 msgid_plural "Removed %(count)i releases from collection \"%(name)s\""
 msgstr[0] ""
 msgstr[1] ""

-#: picard/collection.py:100
+#: picard/collection.py:104
 #, python-format
 msgid "Error loading collections: %(error)s"
 msgstr ""

-#: picard/config_upgrade.py:58 picard/config_upgrade.py:71
+#: picard/config_upgrade.py:57 picard/config_upgrade.py:70
 msgid "Various Artists file naming scheme removal"
 msgstr "Various Artists file naming scheme removal"

-#: picard/config_upgrade.py:59
+#: picard/config_upgrade.py:58
 msgid ""
 "The separate file naming scheme for various artists albums has been removed in this version of Picard.\n"
 "Your file naming scheme has automatically been merged with that of single artist albums."
 msgstr ""

-#: picard/config_upgrade.py:72
+#: picard/config_upgrade.py:71
 msgid ""
 "The separate file naming scheme for various artists albums has been removed in this version of Picard.\n"
 "You currently do not use this option, but have a separate file naming scheme defined.\n"
 "Do you want to remove it or merge it with your file naming scheme for single artist albums?"
 msgstr ""

-#: picard/config_upgrade.py:78
+#: picard/config_upgrade.py:77
 msgid "Merge"
 msgstr "Merge"

-#: picard/config_upgrade.py:78 picard/ui/metadatabox.py:314
+#: picard/config_upgrade.py:77 picard/ui/metadatabox.py:314
 #: picard/ui/options/interface.py:75 picard/ui/ui_options_interface.py:141
 msgid "Remove"
 msgstr "Remove"

-#: picard/config_upgrade.py:193 picard/ui/options/scripting.py:28
+#: picard/config_upgrade.py:200 picard/ui/options/scripting.py:28
 #, python-format
 msgid "My script %d"
 msgstr ""

-#: picard/file.py:541
+#: picard/file.py:565
 #, python-format
 msgid "No matching tracks for file '%(filename)s'"
 msgstr ""

-#: picard/file.py:557
+#: picard/file.py:581
 #, python-format
 msgid "No matching tracks above the threshold for file '%(filename)s'"
 msgstr ""

-#: picard/file.py:564
+#: picard/file.py:588
 #, python-format
 msgid "File '%(filename)s' identified!"
 msgstr ""

-#: picard/file.py:584
+#: picard/file.py:608
 #, python-format
 msgid "Looking up the metadata for file %(filename)s ..."
 msgstr ""
@@ -207,23 +207,23 @@ msgstr ""
 msgid "[no release info]"
 msgstr "[no release info]"

-#: picard/tagger.py:405 picard/tagger.py:438
+#: picard/tagger.py:407 picard/tagger.py:440
 #, python-format
 msgid "Adding %(count)d file from '%(directory)s' ..."
 msgid_plural "Adding %(count)d files from '%(directory)s' ..."
 msgstr[0] ""
 msgstr[1] ""

-#: picard/tagger.py:597
+#: picard/tagger.py:599
 #, python-format
 msgid "Removing album %(id)s: %(artist)s - %(album)s"
 msgstr ""

-#: picard/tagger.py:613
+#: picard/tagger.py:615
 msgid "CD Lookup Error"
 msgstr "CD Lookup Error"

-#: picard/tagger.py:614
+#: picard/tagger.py:616
 #, python-format
 msgid ""
 "Error while reading CD:\n"
@@ -271,6 +271,10 @@ msgstr "French"
 msgid "Italian"
 msgstr "Italian"

+#: picard/const/languages.py:57
+msgid "Norwegian Bokmal"
+msgstr ""
+
 #: picard/const/languages.py:59
 msgid "Dutch"
 msgstr "Dutch"
@@ -334,12 +338,12 @@ msgstr ""
 msgid "Whitelist"
 msgstr ""

-#: picard/ui/cdlookup.py:35 picard/ui/mainwindow.py:625 picard/util/tags.py:21
+#: picard/ui/cdlookup.py:35 picard/ui/mainwindow.py:626 picard/util/tags.py:21
 msgid "Album"
 msgstr "Album"

-#: picard/ui/cdlookup.py:35 picard/ui/itemviews.py:96
-#: picard/ui/mainwindow.py:626 picard/ui/searchdialog.py:326
+#: picard/ui/cdlookup.py:35 picard/ui/itemviews.py:105
+#: picard/ui/mainwindow.py:627 picard/ui/searchdialog.py:326
 #: picard/ui/searchdialog.py:513 picard/util/tags.py:22
 msgid "Artist"
 msgstr "Artist"
@@ -373,10 +377,22 @@ msgid_plural "%s (%i releases)"
 msgstr[0] ""
 msgstr[1] ""

-#: picard/ui/coverartbox.py:143
+#: picard/ui/coverartbox.py:141
 msgid "View release on MusicBrainz"
 msgstr "View release on MusicBrainz"

+#: picard/ui/coverartbox.py:174
+msgid "Show more details"
+msgstr ""
+
+#: picard/ui/coverartbox.py:199
+msgid "New Cover Art"
+msgstr ""
+
+#: picard/ui/coverartbox.py:200
+msgid "Original Cover Art"
+msgstr ""
+
 #: picard/ui/filebrowser.py:40
 msgid "&Move Tagged Files Here"
 msgstr "&Move Tagged Files Here"
@@ -505,116 +521,116 @@ msgstr ""
 msgid "Pending requests"
 msgstr ""

-#: picard/ui/itemviews.py:94 picard/util/tags.py:23
+#: picard/ui/itemviews.py:103 picard/util/tags.py:23
 msgid "Title"
 msgstr "Title"

-#: picard/ui/itemviews.py:95 picard/ui/searchdialog.py:325
+#: picard/ui/itemviews.py:104 picard/ui/searchdialog.py:325
 #: picard/util/tags.py:87
 msgid "Length"
 msgstr "Length"

-#: picard/ui/itemviews.py:162
+#: picard/ui/itemviews.py:171
 msgid "Bad match"
 msgstr ""

-#: picard/ui/itemviews.py:163
+#: picard/ui/itemviews.py:172
 msgid "Poor match"
 msgstr ""

-#: picard/ui/itemviews.py:164
+#: picard/ui/itemviews.py:173
 msgid "Ok match"
 msgstr ""

-#: picard/ui/itemviews.py:165
+#: picard/ui/itemviews.py:174
 msgid "Good match"
 msgstr ""

-#: picard/ui/itemviews.py:166
+#: picard/ui/itemviews.py:175
 msgid "Great match"
 msgstr ""

-#: picard/ui/itemviews.py:167
+#: picard/ui/itemviews.py:176
 msgid "Excellent match"
 msgstr ""

-#: picard/ui/itemviews.py:243
+#: picard/ui/itemviews.py:252
 msgid "&Expand all"
 msgstr "&Expand all"

-#: picard/ui/itemviews.py:245
+#: picard/ui/itemviews.py:254
 msgid "&Collapse all"
 msgstr "&Collapse all"

-#: picard/ui/itemviews.py:247
+#: picard/ui/itemviews.py:256
 msgid "Select &all"
 msgstr ""

-#: picard/ui/itemviews.py:249
+#: picard/ui/itemviews.py:258
 msgid "Ctrl+A"
 msgstr ""

-#: picard/ui/itemviews.py:315
+#: picard/ui/itemviews.py:324
 msgid "&Other versions"
 msgstr "&Other versions"

-#: picard/ui/itemviews.py:318
+#: picard/ui/itemviews.py:327
 msgid "Loading..."
 msgstr "Loading..."

-#: picard/ui/itemviews.py:383
+#: picard/ui/itemviews.py:392
 msgid "Collections"
 msgstr ""

-#: picard/ui/itemviews.py:386
+#: picard/ui/itemviews.py:395
 msgid "P&lugins"
 msgstr ""

-#: picard/ui/itemviews.py:557
+#: picard/ui/itemviews.py:577
 msgid "file view"
 msgstr ""

-#: picard/ui/itemviews.py:558
+#: picard/ui/itemviews.py:578
 msgid "Contains unmatched files and clusters"
 msgstr ""

-#: picard/ui/itemviews.py:578
+#: picard/ui/itemviews.py:598
 msgid "Clusters"
 msgstr "Clusters"

-#: picard/ui/itemviews.py:587
+#: picard/ui/itemviews.py:607
 msgid "album view"
 msgstr ""

-#: picard/ui/itemviews.py:588
+#: picard/ui/itemviews.py:608
 msgid "Contains albums and matched files"
 msgstr ""

-#: picard/ui/itemviews.py:694 picard/ui/options/renaming.py:188
+#: picard/ui/itemviews.py:714 picard/ui/options/renaming.py:188
 msgid "Error"
 msgstr "Error"

-#: picard/ui/itemviews.py:698
+#: picard/ui/itemviews.py:718
 msgid "Album modified and complete"
 msgstr ""

-#: picard/ui/itemviews.py:701
+#: picard/ui/itemviews.py:721
 msgid "Album unchanged and complete"
 msgstr ""

-#: picard/ui/itemviews.py:705
+#: picard/ui/itemviews.py:725
 msgid "Album modified"
 msgstr ""

-#: picard/ui/itemviews.py:708
+#: picard/ui/itemviews.py:728
 msgid "Album unchanged"
 msgstr ""

-#: picard/ui/itemviews.py:811
+#: picard/ui/itemviews.py:831
 msgid "Track saved"
 msgstr ""

-#: picard/ui/itemviews.py:813 picard/ui/itemviews.py:817
+#: picard/ui/itemviews.py:833 picard/ui/itemviews.py:837
 msgid "Pending"
 msgstr ""

@@ -805,7 +821,7 @@ msgstr "Ctrl+B"
 msgid "&Cover Art"
 msgstr "&Cover Art"

-#: picard/ui/mainwindow.py:407 picard/ui/mainwindow.py:619
+#: picard/ui/mainwindow.py:407 picard/ui/mainwindow.py:620
 #: picard/ui/searchdialog.py:71
 msgid "Search"
 msgstr "Search"
@@ -832,175 +848,179 @@ msgid ""
 "even if they have no metadata"
 msgstr ""

-#: picard/ui/mainwindow.py:421
+#: picard/ui/mainwindow.py:420
+msgid "Identify the file using its AcoustID audio fingerprint"
+msgstr ""
+
+#: picard/ui/mainwindow.py:422
 msgid "Ctrl+Y"
 msgstr "Ctrl+Y"

-#: picard/ui/mainwindow.py:424
+#: picard/ui/mainwindow.py:425
 msgid "Cl&uster"
 msgstr "Cl&uster"

-#: picard/ui/mainwindow.py:425
+#: picard/ui/mainwindow.py:426
 msgid "Cluster files into album clusters"
 msgstr ""

-#: picard/ui/mainwindow.py:428
+#: picard/ui/mainwindow.py:429
 msgid "Ctrl+U"
 msgstr "Ctrl+U"

-#: picard/ui/mainwindow.py:431
+#: picard/ui/mainwindow.py:432
 msgid "&Lookup"
 msgstr "&Lookup"

-#: picard/ui/mainwindow.py:432
+#: picard/ui/mainwindow.py:433
 msgid "Lookup selected items in MusicBrainz"
 msgstr ""

-#: picard/ui/mainwindow.py:437
+#: picard/ui/mainwindow.py:438
 msgid "Ctrl+L"
 msgstr "Ctrl+L"

-#: picard/ui/mainwindow.py:440
+#: picard/ui/mainwindow.py:441
 msgid "&Info..."
 msgstr "&Info..."

-#: picard/ui/mainwindow.py:443
+#: picard/ui/mainwindow.py:444
 msgid "Ctrl+I"
 msgstr "Ctrl+I"

-#: picard/ui/mainwindow.py:446
+#: picard/ui/mainwindow.py:447
 msgid "&Refresh"
 msgstr "&Refresh"

-#: picard/ui/mainwindow.py:447
+#: picard/ui/mainwindow.py:448
 msgid "Ctrl+R"
 msgstr "Ctrl+R"

-#: picard/ui/mainwindow.py:450
+#: picard/ui/mainwindow.py:451
 msgid "&Rename Files"
 msgstr "&Rename Files"

-#: picard/ui/mainwindow.py:455
+#: picard/ui/mainwindow.py:456
 msgid "&Move Files"
 msgstr "&Move Files"

-#: picard/ui/mainwindow.py:460
+#: picard/ui/mainwindow.py:461
 msgid "Save &Tags"
 msgstr "Save &Tags"

-#: picard/ui/mainwindow.py:465
+#: picard/ui/mainwindow.py:466
 msgid "Tags From &File Names..."
 msgstr "Tags From &File Names..."

-#: picard/ui/mainwindow.py:469
+#: picard/ui/mainwindow.py:470
 msgid "&Open My Collections in Browser"
 msgstr ""

-#: picard/ui/mainwindow.py:473
+#: picard/ui/mainwindow.py:474
 msgid "View Error/Debug &Log"
 msgstr ""

-#: picard/ui/mainwindow.py:476
+#: picard/ui/mainwindow.py:477
 msgid "View Activity &History"
 msgstr ""

-#: picard/ui/mainwindow.py:483
+#: picard/ui/mainwindow.py:484
 msgid "Open in &Player"
 msgstr ""

-#: picard/ui/mainwindow.py:484
+#: picard/ui/mainwindow.py:485
 msgid "Play the file in your default media player"
 msgstr ""

-#: picard/ui/mainwindow.py:488
+#: picard/ui/mainwindow.py:489
 msgid "Open Containing &Folder"
 msgstr ""

-#: picard/ui/mainwindow.py:489
+#: picard/ui/mainwindow.py:490
 msgid "Open the containing folder in your file explorer"
 msgstr ""

-#: picard/ui/mainwindow.py:518
+#: picard/ui/mainwindow.py:519
 msgid "&File"
 msgstr "&File"

-#: picard/ui/mainwindow.py:529
+#: picard/ui/mainwindow.py:530
 msgid "&Edit"
 msgstr "&Edit"

-#: picard/ui/mainwindow.py:535
+#: picard/ui/mainwindow.py:536
 msgid "&View"
 msgstr "&View"

-#: picard/ui/mainwindow.py:541
+#: picard/ui/mainwindow.py:542
 msgid "&Options"
 msgstr "&Options"

-#: picard/ui/mainwindow.py:547
+#: picard/ui/mainwindow.py:548
 msgid "&Tools"
 msgstr "&Tools"

-#: picard/ui/mainwindow.py:558 picard/ui/util.py:35
+#: picard/ui/mainwindow.py:559 picard/ui/util.py:35
 msgid "&Help"
 msgstr "&Help"

-#: picard/ui/mainwindow.py:586
+#: picard/ui/mainwindow.py:587
 msgid "Actions"
 msgstr ""

-#: picard/ui/mainwindow.py:627
+#: picard/ui/mainwindow.py:628
 msgid "Track"
 msgstr "Track"

-#: picard/ui/mainwindow.py:703
+#: picard/ui/mainwindow.py:704
 msgid "All Supported Formats"
 msgstr "All Supported Formats"

-#: picard/ui/mainwindow.py:730
+#: picard/ui/mainwindow.py:731
 #, python-format
 msgid "Adding multiple directories from '%(directory)s' ..."
 msgstr ""

-#: picard/ui/mainwindow.py:735
+#: picard/ui/mainwindow.py:736
 #, python-format
 msgid "Adding directory: '%(directory)s' ..."
 msgstr ""

-#: picard/ui/mainwindow.py:801
+#: picard/ui/mainwindow.py:809
 msgid "Configuration Required"
 msgstr "Configuration Required"

-#: picard/ui/mainwindow.py:802
+#: picard/ui/mainwindow.py:810
 msgid ""
 "Audio fingerprinting is not yet configured. Would you like to configure it "
 "now?"
 msgstr "Audio fingerprinting is not yet configured. Would you like to configure it now?"

-#: picard/ui/mainwindow.py:902
+#: picard/ui/mainwindow.py:916
 #, python-format
 msgid "%(filename)s (error: %(error)s)"
 msgstr ""

-#: picard/ui/mainwindow.py:908
+#: picard/ui/mainwindow.py:922
 #, python-format
 msgid "%(filename)s"
 msgstr ""

-#: picard/ui/mainwindow.py:918
+#: picard/ui/mainwindow.py:933
 #, python-format
 msgid "%(filename)s (%(similarity)d%%) (error: %(error)s)"
 msgstr ""

-#: picard/ui/mainwindow.py:925
+#: picard/ui/mainwindow.py:940
 #, python-format
 msgid "%(filename)s (%(similarity)d%%)"
 msgstr ""

-#: picard/ui/mainwindow.py:961
+#: picard/ui/mainwindow.py:976
 msgid "Authentication Required"
 msgstr ""

-#: picard/ui/mainwindow.py:962
+#: picard/ui/mainwindow.py:977
 msgid ""
 "Picard needs authorization to access your personal data on the MusicBrainz "
 "server. Would you like to log in now?"
@@ -1109,7 +1129,7 @@ msgstr ""
 msgid "Retry"
 msgstr ""

-#: picard/ui/searchdialog.py:288
+#: picard/ui/searchdialog.py:283
 #, python-format
 msgid ""
 "<strong>Following error occurred while fetching "
@@ -1913,19 +1933,19 @@ msgstr ""
 msgid "Reset all settings for current option page"
 msgstr ""

-#: picard/ui/options/dialog.py:166
+#: picard/ui/options/dialog.py:172
 msgid "You are about to reset your options for this page."
 msgstr ""

-#: picard/ui/options/dialog.py:170
+#: picard/ui/options/dialog.py:176
 msgid "Warning! This will reset all of your settings."
 msgstr ""

-#: picard/ui/options/dialog.py:177
+#: picard/ui/options/dialog.py:183
 msgid "Confirm Reset"
 msgstr ""

-#: picard/ui/options/dialog.py:178
+#: picard/ui/options/dialog.py:184
 msgid "Are you sure?"
 msgstr ""

@@ -2096,7 +2116,7 @@ msgstr "Reset all"
 msgid "File Naming"
 msgstr ""

-#: picard/ui/options/renaming.py:175 picard/ui/options/scripting.py:406
+#: picard/ui/options/renaming.py:175 picard/ui/options/scripting.py:410
 msgid ""
 "<a href=\"%(picard-doc-scripting-url)s\">Open Scripting Documentation in "
 "your browser</a>"
@@ -2138,15 +2158,15 @@ msgstr ""
 msgid "Scripting"
 msgstr "Scripting"

-#: picard/ui/options/scripting.py:292
+#: picard/ui/options/scripting.py:293
 msgid "Are you sure you want to remove this script?"
 msgstr ""

-#: picard/ui/options/scripting.py:293
+#: picard/ui/options/scripting.py:294
 msgid "Confirm Remove"
 msgstr ""

-#: picard/ui/options/scripting.py:376
+#: picard/ui/options/scripting.py:377
 msgid "Script Error"
 msgstr "Script Error"

--- a/po/eo.po
+++ b/po/eo.po
@@ -9,8 +9,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: MusicBrainz\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2017-01-18 12:51+0100\n"
-"PO-Revision-Date: 2017-01-19 09:17+0000\n"
+"POT-Creation-Date: 2017-03-05 09:58+0100\n"
+"PO-Revision-Date: 2017-03-05 10:00+0000\n"
 "Last-Translator: nikki\n"
 "Language-Team: Esperanto (http://www.transifex.com/musicbrainz/musicbrainz/language/eo/)\n"
 "MIME-Version: 1.0\n"
@@ -57,26 +57,26 @@ msgstr ""
 msgid "Unmatched Files"
 msgstr ""

-#: picard/album.py:206
+#: picard/album.py:200
 #, python-format
 msgid "[could not load album %s]"
 msgstr ""

-#: picard/album.py:295
+#: picard/album.py:289
 #, python-format
 msgid "Album %(id)s loaded: %(artist)s - %(album)s"
 msgstr ""

-#: picard/album.py:338
+#: picard/album.py:332
 #, python-format
 msgid "Loading album %(id)s ..."
 msgstr ""

-#: picard/album.py:342
+#: picard/album.py:336
 msgid "[loading album information]"
 msgstr ""

-#: picard/album.py:527
+#: picard/album.py:523
 #, python-format
 msgid "; %i image"
 msgid_plural "; %i images"
@@ -98,72 +98,72 @@ msgstr ""
 msgid "Looking up the metadata for cluster %(album)s..."
 msgstr ""

-#: picard/collection.py:64
+#: picard/collection.py:67
 #, python-format
 msgid "Added %(count)i release to collection \"%(name)s\""
 msgid_plural "Added %(count)i releases to collection \"%(name)s\""
 msgstr[0] ""
 msgstr[1] ""

-#: picard/collection.py:86
+#: picard/collection.py:89
 #, python-format
 msgid "Removed %(count)i release from collection \"%(name)s\""
 msgid_plural "Removed %(count)i releases from collection \"%(name)s\""
 msgstr[0] ""
 msgstr[1] ""

-#: picard/collection.py:100
+#: picard/collection.py:104
 #, python-format
 msgid "Error loading collections: %(error)s"
 msgstr ""

-#: picard/config_upgrade.py:58 picard/config_upgrade.py:71
+#: picard/config_upgrade.py:57 picard/config_upgrade.py:70
 msgid "Various Artists file naming scheme removal"
 msgstr ""

-#: picard/config_upgrade.py:59
+#: picard/config_upgrade.py:58
 msgid ""
 "The separate file naming scheme for various artists albums has been removed in this version of Picard.\n"
 "Your file naming scheme has automatically been merged with that of single artist albums."
 msgstr ""

-#: picard/config_upgrade.py:72
+#: picard/config_upgrade.py:71
 msgid ""
 "The separate file naming scheme for various artists albums has been removed in this version of Picard.\n"
 "You currently do not use this option, but have a separate file naming scheme defined.\n"
 "Do you want to remove it or merge it with your file naming scheme for single artist albums?"
 msgstr ""

-#: picard/config_upgrade.py:78
+#: picard/config_upgrade.py:77
 msgid "Merge"
 msgstr "Kunfandiĝi"

-#: picard/config_upgrade.py:78 picard/ui/metadatabox.py:314
+#: picard/config_upgrade.py:77 picard/ui/metadatabox.py:314
 #: picard/ui/options/interface.py:75 picard/ui/ui_options_interface.py:141
 msgid "Remove"
 msgstr ""

-#: picard/config_upgrade.py:193 picard/ui/options/scripting.py:28
+#: picard/config_upgrade.py:200 picard/ui/options/scripting.py:28
 #, python-format
 msgid "My script %d"
 msgstr ""

-#: picard/file.py:541
+#: picard/file.py:565
 #, python-format
 msgid "No matching tracks for file '%(filename)s'"
 msgstr ""

-#: picard/file.py:557
+#: picard/file.py:581
 #, python-format
 msgid "No matching tracks above the threshold for file '%(filename)s'"
 msgstr ""

-#: picard/file.py:564
+#: picard/file.py:588
 #, python-format
 msgid "File '%(filename)s' identified!"
 msgstr ""

-#: picard/file.py:584
+#: picard/file.py:608
 #, python-format
 msgid "Looking up the metadata for file %(filename)s ..."
 msgstr ""
@@ -206,23 +206,23 @@ msgstr ""
 msgid "[no release info]"
 msgstr ""

-#: picard/tagger.py:405 picard/tagger.py:438
+#: picard/tagger.py:407 picard/tagger.py:440
 #, python-format
 msgid "Adding %(count)d file from '%(directory)s' ..."
 msgid_plural "Adding %(count)d files from '%(directory)s' ..."
 msgstr[0] ""
 msgstr[1] ""

-#: picard/tagger.py:597
+#: picard/tagger.py:599
 #, python-format
 msgid "Removing album %(id)s: %(artist)s - %(album)s"
 msgstr ""

-#: picard/tagger.py:613
+#: picard/tagger.py:615
 msgid "CD Lookup Error"
 msgstr ""

-#: picard/tagger.py:614
+#: picard/tagger.py:616
 #, python-format
 msgid ""
 "Error while reading CD:\n"
@@ -270,6 +270,10 @@ msgstr "Franca"
 msgid "Italian"
 msgstr "Itala"

+#: picard/const/languages.py:57
+msgid "Norwegian Bokmal"
+msgstr ""
+
 #: picard/const/languages.py:59
 msgid "Dutch"
 msgstr "Nederlanda"
@@ -333,12 +337,12 @@ msgstr ""
 msgid "Whitelist"
 msgstr ""

-#: picard/ui/cdlookup.py:35 picard/ui/mainwindow.py:625 picard/util/tags.py:21
+#: picard/ui/cdlookup.py:35 picard/ui/mainwindow.py:626 picard/util/tags.py:21
 msgid "Album"
 msgstr ""

-#: picard/ui/cdlookup.py:35 picard/ui/itemviews.py:96
-#: picard/ui/mainwindow.py:626 picard/ui/searchdialog.py:326
+#: picard/ui/cdlookup.py:35 picard/ui/itemviews.py:105
+#: picard/ui/mainwindow.py:627 picard/ui/searchdialog.py:326
 #: picard/ui/searchdialog.py:513 picard/util/tags.py:22
 msgid "Artist"
 msgstr ""
@@ -372,10 +376,22 @@ msgid_plural "%s (%i releases)"
 msgstr[0] ""
 msgstr[1] ""

-#: picard/ui/coverartbox.py:143
+#: picard/ui/coverartbox.py:141
 msgid "View release on MusicBrainz"
 msgstr ""

+#: picard/ui/coverartbox.py:174
+msgid "Show more details"
+msgstr ""
+
+#: picard/ui/coverartbox.py:199
+msgid "New Cover Art"
+msgstr ""
+
+#: picard/ui/coverartbox.py:200
+msgid "Original Cover Art"
+msgstr ""
+
 #: picard/ui/filebrowser.py:40
 msgid "&Move Tagged Files Here"
 msgstr ""
@@ -504,116 +520,116 @@ msgstr ""
 msgid "Pending requests"
 msgstr ""

-#: picard/ui/itemviews.py:94 picard/util/tags.py:23
+#: picard/ui/itemviews.py:103 picard/util/tags.py:23
 msgid "Title"
 msgstr ""

-#: picard/ui/itemviews.py:95 picard/ui/searchdialog.py:325
+#: picard/ui/itemviews.py:104 picard/ui/searchdialog.py:325
 #: picard/util/tags.py:87
 msgid "Length"
 msgstr ""

-#: picard/ui/itemviews.py:162
+#: picard/ui/itemviews.py:171
 msgid "Bad match"
 msgstr ""

-#: picard/ui/itemviews.py:163
+#: picard/ui/itemviews.py:172
 msgid "Poor match"
 msgstr ""

-#: picard/ui/itemviews.py:164
+#: picard/ui/itemviews.py:173
 msgid "Ok match"
 msgstr ""

-#: picard/ui/itemviews.py:165
+#: picard/ui/itemviews.py:174
 msgid "Good match"
 msgstr ""

-#: picard/ui/itemviews.py:166
+#: picard/ui/itemviews.py:175
 msgid "Great match"
 msgstr ""

-#: picard/ui/itemviews.py:167
+#: picard/ui/itemviews.py:176
 msgid "Excellent match"
 msgstr ""

-#: picard/ui/itemviews.py:243
+#: picard/ui/itemviews.py:252
 msgid "&Expand all"
 msgstr ""

-#: picard/ui/itemviews.py:245
+#: picard/ui/itemviews.py:254
 msgid "&Collapse all"
 msgstr ""

-#: picard/ui/itemviews.py:247
+#: picard/ui/itemviews.py:256
 msgid "Select &all"
 msgstr ""

-#: picard/ui/itemviews.py:249
+#: picard/ui/itemviews.py:258
 msgid "Ctrl+A"
 msgstr ""

-#: picard/ui/itemviews.py:315
+#: picard/ui/itemviews.py:324
 msgid "&Other versions"
 msgstr ""

-#: picard/ui/itemviews.py:318
+#: picard/ui/itemviews.py:327
 msgid "Loading..."
 msgstr "Ŝargante..."

-#: picard/ui/itemviews.py:383
+#: picard/ui/itemviews.py:392
 msgid "Collections"
 msgstr ""

-#: picard/ui/itemviews.py:386
+#: picard/ui/itemviews.py:395
 msgid "P&lugins"
 msgstr ""

-#: picard/ui/itemviews.py:557
+#: picard/ui/itemviews.py:577
 msgid "file view"
 msgstr ""

-#: picard/ui/itemviews.py:558
+#: picard/ui/itemviews.py:578
 msgid "Contains unmatched files and clusters"
 msgstr ""

-#: picard/ui/itemviews.py:578
+#: picard/ui/itemviews.py:598
 msgid "Clusters"
 msgstr ""

-#: picard/ui/itemviews.py:587
+#: picard/ui/itemviews.py:607
 msgid "album view"
 msgstr ""

-#: picard/ui/itemviews.py:588
+#: picard/ui/itemviews.py:608
 msgid "Contains albums and matched files"
 msgstr ""

-#: picard/ui/itemviews.py:694 picard/ui/options/renaming.py:188
+#: picard/ui/itemviews.py:714 picard/ui/options/renaming.py:188
 msgid "Error"
 msgstr "Eraro"

-#: picard/ui/itemviews.py:698
+#: picard/ui/itemviews.py:718
 msgid "Album modified and complete"
 msgstr ""

-#: picard/ui/itemviews.py:701
+#: picard/ui/itemviews.py:721
 msgid "Album unchanged and complete"
 msgstr ""

-#: picard/ui/itemviews.py:705
+#: picard/ui/itemviews.py:725
 msgid "Album modified"
 msgstr ""

-#: picard/ui/itemviews.py:708
+#: picard/ui/itemviews.py:728
 msgid "Album unchanged"
 msgstr ""

-#: picard/ui/itemviews.py:811
+#: picard/ui/itemviews.py:831
 msgid "Track saved"
 msgstr ""

-#: picard/ui/itemviews.py:813 picard/ui/itemviews.py:817
+#: picard/ui/itemviews.py:833 picard/ui/itemviews.py:837
 msgid "Pending"
 msgstr ""

@@ -804,7 +820,7 @@ msgstr ""
 msgid "&Cover Art"
 msgstr ""

-#: picard/ui/mainwindow.py:407 picard/ui/mainwindow.py:619
+#: picard/ui/mainwindow.py:407 picard/ui/mainwindow.py:620
 #: picard/ui/searchdialog.py:71
 msgid "Search"
 msgstr ""
@@ -831,175 +847,179 @@ msgid ""
 "even if they have no metadata"
 msgstr ""

-#: picard/ui/mainwindow.py:421
+#: picard/ui/mainwindow.py:420
+msgid "Identify the file using its AcoustID audio fingerprint"
+msgstr ""
+
+#: picard/ui/mainwindow.py:422
 msgid "Ctrl+Y"
 msgstr ""

-#: picard/ui/mainwindow.py:424
+#: picard/ui/mainwindow.py:425
 msgid "Cl&uster"
 msgstr ""

-#: picard/ui/mainwindow.py:425
+#: picard/ui/mainwindow.py:426
 msgid "Cluster files into album clusters"
 msgstr ""

-#: picard/ui/mainwindow.py:428
+#: picard/ui/mainwindow.py:429
 msgid "Ctrl+U"
 msgstr ""

-#: picard/ui/mainwindow.py:431
+#: picard/ui/mainwindow.py:432
 msgid "&Lookup"
 msgstr ""

-#: picard/ui/mainwindow.py:432
+#: picard/ui/mainwindow.py:433
 msgid "Lookup selected items in MusicBrainz"
 msgstr ""

-#: picard/ui/mainwindow.py:437
+#: picard/ui/mainwindow.py:438
 msgid "Ctrl+L"
 msgstr ""

-#: picard/ui/mainwindow.py:440
+#: picard/ui/mainwindow.py:441
 msgid "&Info..."
 msgstr ""

-#: picard/ui/mainwindow.py:443
+#: picard/ui/mainwindow.py:444
 msgid "Ctrl+I"
 msgstr ""

-#: picard/ui/mainwindow.py:446
+#: picard/ui/mainwindow.py:447
 msgid "&Refresh"
 msgstr ""

-#: picard/ui/mainwindow.py:447
+#: picard/ui/mainwindow.py:448
 msgid "Ctrl+R"
 msgstr ""

-#: picard/ui/mainwindow.py:450
+#: picard/ui/mainwindow.py:451
 msgid "&Rename Files"
 msgstr ""

-#: picard/ui/mainwindow.py:455
+#: picard/ui/mainwindow.py:456
 msgid "&Move Files"
 msgstr ""

-#: picard/ui/mainwindow.py:460
+#: picard/ui/mainwindow.py:461
 msgid "Save &Tags"
 msgstr ""

-#: picard/ui/mainwindow.py:465
+#: picard/ui/mainwindow.py:466
 msgid "Tags From &File Names..."
 msgstr ""

-#: picard/ui/mainwindow.py:469
+#: picard/ui/mainwindow.py:470
 msgid "&Open My Collections in Browser"
 msgstr ""

-#: picard/ui/mainwindow.py:473
+#: picard/ui/mainwindow.py:474
 msgid "View Error/Debug &Log"
 msgstr ""

-#: picard/ui/mainwindow.py:476
+#: picard/ui/mainwindow.py:477
 msgid "View Activity &History"
 msgstr ""

-#: picard/ui/mainwindow.py:483
+#: picard/ui/mainwindow.py:484
 msgid "Open in &Player"
 msgstr ""

-#: picard/ui/mainwindow.py:484
+#: picard/ui/mainwindow.py:485
 msgid "Play the file in your default media player"
 msgstr ""

-#: picard/ui/mainwindow.py:488
+#: picard/ui/mainwindow.py:489
 msgid "Open Containing &Folder"
 msgstr ""

-#: picard/ui/mainwindow.py:489
+#: picard/ui/mainwindow.py:490
 msgid "Open the containing folder in your file explorer"
 msgstr ""

-#: picard/ui/mainwindow.py:518
+#: picard/ui/mainwindow.py:519
 msgid "&File"
 msgstr ""

-#: picard/ui/mainwindow.py:529
+#: picard/ui/mainwindow.py:530
 msgid "&Edit"
 msgstr ""

-#: picard/ui/mainwindow.py:535
+#: picard/ui/mainwindow.py:536
 msgid "&View"
 msgstr ""

-#: picard/ui/mainwindow.py:541
+#: picard/ui/mainwindow.py:542
 msgid "&Options"
 msgstr ""

-#: picard/ui/mainwindow.py:547
+#: picard/ui/mainwindow.py:548
 msgid "&Tools"
 msgstr ""

-#: picard/ui/mainwindow.py:558 picard/ui/util.py:35
+#: picard/ui/mainwindow.py:559 picard/ui/util.py:35
 msgid "&Help"
 msgstr ""

-#: picard/ui/mainwindow.py:586
+#: picard/ui/mainwindow.py:587
 msgid "Actions"
 msgstr ""

-#: picard/ui/mainwindow.py:627
+#: picard/ui/mainwindow.py:628
 msgid "Track"
 msgstr ""

-#: picard/ui/mainwindow.py:703
+#: picard/ui/mainwindow.py:704
 msgid "All Supported Formats"
 msgstr ""

-#: picard/ui/mainwindow.py:730
+#: picard/ui/mainwindow.py:731
 #, python-format
 msgid "Adding multiple directories from '%(directory)s' ..."
 msgstr ""

-#: picard/ui/mainwindow.py:735
+#: picard/ui/mainwindow.py:736
 #, python-format
 msgid "Adding directory: '%(directory)s' ..."
 msgstr ""

-#: picard/ui/mainwindow.py:801
+#: picard/ui/mainwindow.py:809
 msgid "Configuration Required"
 msgstr ""

-#: picard/ui/mainwindow.py:802
+#: picard/ui/mainwindow.py:810
 msgid ""
 "Audio fingerprinting is not yet configured. Would you like to configure it "
 "now?"
 msgstr ""

-#: picard/ui/mainwindow.py:902
+#: picard/ui/mainwindow.py:916
 #, python-format
 msgid "%(filename)s (error: %(error)s)"
 msgstr ""

-#: picard/ui/mainwindow.py:908
+#: picard/ui/mainwindow.py:922
 #, python-format
 msgid "%(filename)s"
 msgstr ""

-#: picard/ui/mainwindow.py:918
+#: picard/ui/mainwindow.py:933
 #, python-format
 msgid "%(filename)s (%(similarity)d%%) (error: %(error)s)"
 msgstr ""

-#: picard/ui/mainwindow.py:925
+#: picard/ui/mainwindow.py:940
 #, python-format
 msgid "%(filename)s (%(similarity)d%%)"
 msgstr ""

-#: picard/ui/mainwindow.py:961
+#: picard/ui/mainwindow.py:976
 msgid "Authentication Required"
 msgstr ""

-#: picard/ui/mainwindow.py:962
+#: picard/ui/mainwindow.py:977
 msgid ""
 "Picard needs authorization to access your personal data on the MusicBrainz "
 "server. Would you like to log in now?"
@@ -1108,7 +1128,7 @@ msgstr ""
 msgid "Retry"
 msgstr ""

-#: picard/ui/searchdialog.py:288
+#: picard/ui/searchdialog.py:283
 #, python-format
 msgid ""
 "<strong>Following error occurred while fetching "
@@ -1912,19 +1932,19 @@ msgstr ""
 msgid "Reset all settings for current option page"
 msgstr ""

-#: picard/ui/options/dialog.py:166
+#: picard/ui/options/dialog.py:172
 msgid "You are about to reset your options for this page."
 msgstr ""

-#: picard/ui/options/dialog.py:170
+#: picard/ui/options/dialog.py:176
 msgid "Warning! This will reset all of your settings."
 msgstr ""

-#: picard/ui/options/dialog.py:177
+#: picard/ui/options/dialog.py:183
 msgid "Confirm Reset"
 msgstr ""

-#: picard/ui/options/dialog.py:178
+#: picard/ui/options/dialog.py:184
 msgid "Are you sure?"
 msgstr ""

@@ -2095,7 +2115,7 @@ msgstr ""
 msgid "File Naming"
 msgstr ""

-#: picard/ui/options/renaming.py:175 picard/ui/options/scripting.py:406
+#: picard/ui/options/renaming.py:175 picard/ui/options/scripting.py:410
 msgid ""
 "<a href=\"%(picard-doc-scripting-url)s\">Open Scripting Documentation in "
 "your browser</a>"
@@ -2137,15 +2157,15 @@ msgstr ""
 msgid "Scripting"
 msgstr "Skriptado"

-#: picard/ui/options/scripting.py:292
+#: picard/ui/options/scripting.py:293
 msgid "Are you sure you want to remove this script?"
 msgstr ""

-#: picard/ui/options/scripting.py:293
+#: picard/ui/options/scripting.py:294
 msgid "Confirm Remove"
 msgstr ""

-#: picard/ui/options/scripting.py:376
+#: picard/ui/options/scripting.py:377
 msgid "Script Error"
 msgstr "Skript-eraro"

--- a/po/es.po
+++ b/po/es.po
@@ -6,12 +6,13 @@
 # Emerson Posadas <toxickore@toxickore.net>, 2006, 2011
 # Ismael Olea <ismael@olea.org>, 2011-2015
 # Nicolás Tamargo <reosarevok@gmail.com>, 2012
+# Peter Cuevas H <peter.cuevas6@gmail.com>, 2017
 msgid ""
 msgstr ""
 "Project-Id-Version: MusicBrainz\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2017-01-18 12:51+0100\n"
-"PO-Revision-Date: 2017-01-19 09:17+0000\n"
+"POT-Creation-Date: 2017-03-05 09:58+0100\n"
+"PO-Revision-Date: 2017-03-05 10:00+0000\n"
 "Last-Translator: nikki\n"
 "Language-Team: Spanish (http://www.transifex.com/musicbrainz/musicbrainz/language/es/)\n"
 "MIME-Version: 1.0\n"
@@ -58,26 +59,26 @@ msgstr "Se han enviado los códigos AcoustID."
 msgid "Unmatched Files"
 msgstr "Archivos desagrupados"

-#: picard/album.py:206
+#: picard/album.py:200
 #, python-format
 msgid "[could not load album %s]"
 msgstr "[no se pudo cargar el álbum %s]"

-#: picard/album.py:295
+#: picard/album.py:289
 #, python-format
 msgid "Album %(id)s loaded: %(artist)s - %(album)s"
 msgstr "Álbum %(id)s  cargado: %(artist)s - %(album)s"

-#: picard/album.py:338
+#: picard/album.py:332
 #, python-format
 msgid "Loading album %(id)s ..."
 msgstr "Cargando álbum %(id)s ..."

-#: picard/album.py:342
+#: picard/album.py:336
 msgid "[loading album information]"
 msgstr "[cargando información del álbum]"

-#: picard/album.py:527
+#: picard/album.py:523
 #, python-format
 msgid "; %i image"
 msgid_plural "; %i images"
@@ -99,72 +100,72 @@ msgstr "¡Identificado el grupo '%(album)s'!"
 msgid "Looking up the metadata for cluster %(album)s..."
 msgstr "Buscando metadatos para el grupo %(album)s..."

-#: picard/collection.py:64
+#: picard/collection.py:67
 #, python-format
 msgid "Added %(count)i release to collection \"%(name)s\""
 msgid_plural "Added %(count)i releases to collection \"%(name)s\""
 msgstr[0] "Añadida %(count)i publicación a la colección \"%(name)s\""
 msgstr[1] "Añadidas %(count)i publicaciones a la colección \"%(name)s\""

-#: picard/collection.py:86
+#: picard/collection.py:89
 #, python-format
 msgid "Removed %(count)i release from collection \"%(name)s\""
 msgid_plural "Removed %(count)i releases from collection \"%(name)s\""
 msgstr[0] "Eliminada %(count)i publicación de la colección \"%(name)s\""
 msgstr[1] "Eliminadas %(count)i publicaciones de la colección \"%(name)s\""

-#: picard/collection.py:100
+#: picard/collection.py:104
 #, python-format
 msgid "Error loading collections: %(error)s"
 msgstr "Error al cargar las colecciones: %(error)s"

-#: picard/config_upgrade.py:58 picard/config_upgrade.py:71
+#: picard/config_upgrade.py:57 picard/config_upgrade.py:70
 msgid "Various Artists file naming scheme removal"
 msgstr "Borrado del método de nombrado de archivos de múltiples artistas"

-#: picard/config_upgrade.py:59
+#: picard/config_upgrade.py:58
 msgid ""
 "The separate file naming scheme for various artists albums has been removed in this version of Picard.\n"
 "Your file naming scheme has automatically been merged with that of single artist albums."
 msgstr "Esta versión de Picard elimina el método de nombrado específico para álbumes de múltiples artistas. \nSu método de nombrado ha sido combinado automáticamente con el de álbumes de un solo artista."

-#: picard/config_upgrade.py:72
+#: picard/config_upgrade.py:71
 msgid ""
 "The separate file naming scheme for various artists albums has been removed in this version of Picard.\n"
 "You currently do not use this option, but have a separate file naming scheme defined.\n"
 "Do you want to remove it or merge it with your file naming scheme for single artist albums?"
 msgstr "Esta versión de Picard elimina el método de nombrado específico para álbumes de múltiples artistas. \nNo está usando esta opción, pero tiene guardado un método específico para el caso. \n¿Desea eliminarlo o combinarlo con el método para álbumes de un solo artista?"

-#: picard/config_upgrade.py:78
+#: picard/config_upgrade.py:77
 msgid "Merge"
 msgstr "Combinar"

-#: picard/config_upgrade.py:78 picard/ui/metadatabox.py:314
+#: picard/config_upgrade.py:77 picard/ui/metadatabox.py:314
 #: picard/ui/options/interface.py:75 picard/ui/ui_options_interface.py:141
 msgid "Remove"
 msgstr "Eliminar"

-#: picard/config_upgrade.py:193 picard/ui/options/scripting.py:28
+#: picard/config_upgrade.py:200 picard/ui/options/scripting.py:28
 #, python-format
 msgid "My script %d"
-msgstr ""
+msgstr "Mi script %d"

-#: picard/file.py:541
+#: picard/file.py:565
 #, python-format
 msgid "No matching tracks for file '%(filename)s'"
 msgstr "No se han encontrado pistas concordantes para el archivo '%(filename)s'"

-#: picard/file.py:557
+#: picard/file.py:581
 #, python-format
 msgid "No matching tracks above the threshold for file '%(filename)s'"
 msgstr "No concuerdan pistas por encima del umbral para el archivo '%(filename)s'"

-#: picard/file.py:564
+#: picard/file.py:588
 #, python-format
 msgid "File '%(filename)s' identified!"
 msgstr "¡Identificado el archivo '%(filename)s'!"

-#: picard/file.py:584
+#: picard/file.py:608
 #, python-format
 msgid "Looking up the metadata for file %(filename)s ..."
 msgstr "Buscando metadatos en archivo %(filename)s..."
@@ -172,7 +173,7 @@ msgstr "Buscando metadatos en archivo %(filename)s..."
 #: picard/plugin.py:434
 #, python-format
 msgid "Error loading plugins list: %(error)s"
-msgstr ""
+msgstr "Error cargando la lista de plugins: %(error)s"

 #: picard/releasegroup.py:53 picard/ui/searchdialog.py:515
 msgid "Tracks"
@@ -207,23 +208,23 @@ msgstr "[sin código de barras]"
 msgid "[no release info]"
 msgstr "[sin información]"

-#: picard/tagger.py:405 picard/tagger.py:438
+#: picard/tagger.py:407 picard/tagger.py:440
 #, python-format
 msgid "Adding %(count)d file from '%(directory)s' ..."
 msgid_plural "Adding %(count)d files from '%(directory)s' ..."
 msgstr[0] "Añadiendo %(count)d archivo desde '%(directory)s' ..."
 msgstr[1] "Añadiendo %(count)d archivos desde '%(directory)s' ..."

-#: picard/tagger.py:597
+#: picard/tagger.py:599
 #, python-format
 msgid "Removing album %(id)s: %(artist)s - %(album)s"
 msgstr "Eliminando el álbum %(id)s: %(artist)s - %(album)s"

-#: picard/tagger.py:613
+#: picard/tagger.py:615
 msgid "CD Lookup Error"
 msgstr "Error al buscar CD"

-#: picard/tagger.py:614
+#: picard/tagger.py:616
 #, python-format
 msgid ""
 "Error while reading CD:\n"
@@ -271,6 +272,10 @@ msgstr "Francés"
 msgid "Italian"
 msgstr "Italiano"

+#: picard/const/languages.py:57
+msgid "Norwegian Bokmal"
+msgstr ""
+
 #: picard/const/languages.py:59
 msgid "Dutch"
 msgstr "Danés"
@@ -328,18 +333,18 @@ msgstr ""

 #: picard/coverart/providers/local.py:65
 msgid "Local Files"
-msgstr ""
+msgstr "Archivos locales"

 #: picard/coverart/providers/whitelist.py:38
 msgid "Whitelist"
-msgstr ""
+msgstr "Lista blanca"

-#: picard/ui/cdlookup.py:35 picard/ui/mainwindow.py:625 picard/util/tags.py:21
+#: picard/ui/cdlookup.py:35 picard/ui/mainwindow.py:626 picard/util/tags.py:21
 msgid "Album"
 msgstr "Álbum"

-#: picard/ui/cdlookup.py:35 picard/ui/itemviews.py:96
-#: picard/ui/mainwindow.py:626 picard/ui/searchdialog.py:326
+#: picard/ui/cdlookup.py:35 picard/ui/itemviews.py:105
+#: picard/ui/mainwindow.py:627 picard/ui/searchdialog.py:326
 #: picard/ui/searchdialog.py:513 picard/util/tags.py:22
 msgid "Artist"
 msgstr "Artista"
@@ -373,10 +378,22 @@ msgid_plural "%s (%i releases)"
 msgstr[0] "%s (%i publicación)"
 msgstr[1] "%s (%i publicaciones)"

-#: picard/ui/coverartbox.py:143
+#: picard/ui/coverartbox.py:141
 msgid "View release on MusicBrainz"
 msgstr "Ver publicación en MusicBrainz"

+#: picard/ui/coverartbox.py:174
+msgid "Show more details"
+msgstr ""
+
+#: picard/ui/coverartbox.py:199
+msgid "New Cover Art"
+msgstr ""
+
+#: picard/ui/coverartbox.py:200
+msgid "Original Cover Art"
+msgstr ""
+
 #: picard/ui/filebrowser.py:40
 msgid "&Move Tagged Files Here"
 msgstr "&Mover archivos etiquetados aquí"
@@ -391,21 +408,21 @@ msgstr "&Elegir como carpeta inicial"

 #: picard/ui/infodialog.py:46
 msgid "Existing Cover"
-msgstr ""
+msgstr "Carátula existente"

 #: picard/ui/infodialog.py:46 picard/ui/infodialog.py:52
 #: picard/ui/searchdialog.py:330 picard/ui/searchdialog.py:522
 #: picard/ui/searchdialog.py:741
 msgid "Type"
-msgstr ""
+msgstr "Tipo"

 #: picard/ui/infodialog.py:47
 msgid "New Cover"
-msgstr ""
+msgstr "Nueva portada"

 #: picard/ui/infodialog.py:52 picard/ui/searchdialog.py:524
 msgid "Cover"
-msgstr ""
+msgstr "Portada"

 #: picard/ui/infodialog.py:122 picard/ui/infodialog.py:237
 #: picard/ui/options/interface.py:71
@@ -505,118 +522,118 @@ msgstr "Archivos pendientes"
 msgid "Pending requests"
 msgstr "Peticiones pendientes"

-#: picard/ui/itemviews.py:94 picard/util/tags.py:23
+#: picard/ui/itemviews.py:103 picard/util/tags.py:23
 msgid "Title"
 msgstr "Título"

-#: picard/ui/itemviews.py:95 picard/ui/searchdialog.py:325
+#: picard/ui/itemviews.py:104 picard/ui/searchdialog.py:325
 #: picard/util/tags.py:87
 msgid "Length"
 msgstr "Duración"

-#: picard/ui/itemviews.py:162
+#: picard/ui/itemviews.py:171
 msgid "Bad match"
-msgstr ""
+msgstr "Mala coincidencia"

-#: picard/ui/itemviews.py:163
+#: picard/ui/itemviews.py:172
 msgid "Poor match"
-msgstr ""
+msgstr "Coincidencia pésima"

-#: picard/ui/itemviews.py:164
+#: picard/ui/itemviews.py:173
 msgid "Ok match"
-msgstr ""
+msgstr "Coincidencia normal"

-#: picard/ui/itemviews.py:165
+#: picard/ui/itemviews.py:174
 msgid "Good match"
-msgstr ""
+msgstr "Buena coincidencia"

-#: picard/ui/itemviews.py:166
+#: picard/ui/itemviews.py:175
 msgid "Great match"
-msgstr ""
+msgstr "Coincidencia genial"

-#: picard/ui/itemviews.py:167
+#: picard/ui/itemviews.py:176
 msgid "Excellent match"
-msgstr ""
+msgstr "incidencia excelente"

-#: picard/ui/itemviews.py:243
+#: picard/ui/itemviews.py:252
 msgid "&Expand all"
 msgstr "&Expandir todos"

-#: picard/ui/itemviews.py:245
+#: picard/ui/itemviews.py:254
 msgid "&Collapse all"
 msgstr "&Contraer todos"

-#: picard/ui/itemviews.py:247
+#: picard/ui/itemviews.py:256
 msgid "Select &all"
-msgstr ""
+msgstr "Seleccionar &all"

-#: picard/ui/itemviews.py:249
+#: picard/ui/itemviews.py:258
 msgid "Ctrl+A"
-msgstr ""
+msgstr "Ctrl+A"

-#: picard/ui/itemviews.py:315
+#: picard/ui/itemviews.py:324
 msgid "&Other versions"
 msgstr "&Otras versiones"

-#: picard/ui/itemviews.py:318
+#: picard/ui/itemviews.py:327
 msgid "Loading..."
 msgstr "Cargando…"

-#: picard/ui/itemviews.py:383
+#: picard/ui/itemviews.py:392
 msgid "Collections"
 msgstr "Colecciones"

-#: picard/ui/itemviews.py:386
+#: picard/ui/itemviews.py:395
 msgid "P&lugins"
 msgstr "&Complementos"

-#: picard/ui/itemviews.py:557
+#: picard/ui/itemviews.py:577
 msgid "file view"
 msgstr "vista de archivos"

-#: picard/ui/itemviews.py:558
+#: picard/ui/itemviews.py:578
 msgid "Contains unmatched files and clusters"
 msgstr "Contiene ficheros sin agrupar"

-#: picard/ui/itemviews.py:578
+#: picard/ui/itemviews.py:598
 msgid "Clusters"
 msgstr "Grupos"

-#: picard/ui/itemviews.py:587
+#: picard/ui/itemviews.py:607
 msgid "album view"
 msgstr "vista de álbumes"

-#: picard/ui/itemviews.py:588
+#: picard/ui/itemviews.py:608
 msgid "Contains albums and matched files"
 msgstr "Contiene álbumes y archivos agrupados"

-#: picard/ui/itemviews.py:694 picard/ui/options/renaming.py:188
+#: picard/ui/itemviews.py:714 picard/ui/options/renaming.py:188
 msgid "Error"
 msgstr "Error"

-#: picard/ui/itemviews.py:698
+#: picard/ui/itemviews.py:718
 msgid "Album modified and complete"
 msgstr ""

-#: picard/ui/itemviews.py:701
+#: picard/ui/itemviews.py:721
 msgid "Album unchanged and complete"
 msgstr ""

-#: picard/ui/itemviews.py:705
+#: picard/ui/itemviews.py:725
 msgid "Album modified"
 msgstr ""

-#: picard/ui/itemviews.py:708
+#: picard/ui/itemviews.py:728
 msgid "Album unchanged"
 msgstr ""

-#: picard/ui/itemviews.py:811
+#: picard/ui/itemviews.py:831
 msgid "Track saved"
 msgstr ""

-#: picard/ui/itemviews.py:813 picard/ui/itemviews.py:817
+#: picard/ui/itemviews.py:833 picard/ui/itemviews.py:837
 msgid "Pending"
-msgstr ""
+msgstr "Pendiente"

 #: picard/ui/logview.py:109
 msgid "Log"
@@ -775,11 +792,11 @@ msgstr "Buscar el elemento seleccionado en la página de MusicBrainz"

 #: picard/ui/mainwindow.py:383
 msgid "Ctrl+Shift+L"
-msgstr ""
+msgstr "Ctrl+Shift+L"

 #: picard/ui/mainwindow.py:386
 msgid "Search for similar albums..."
-msgstr ""
+msgstr "Buscar álbumes similares..."

 #: picard/ui/mainwindow.py:387
 msgid "View similar releases and optionally choose a different release"
@@ -805,7 +822,7 @@ msgstr "Ctrl+B"
 msgid "&Cover Art"
 msgstr "&Carátulas"

-#: picard/ui/mainwindow.py:407 picard/ui/mainwindow.py:619
+#: picard/ui/mainwindow.py:407 picard/ui/mainwindow.py:620
 #: picard/ui/searchdialog.py:71
 msgid "Search"
 msgstr "Buscar"
@@ -832,175 +849,179 @@ msgid ""
 "even if they have no metadata"
 msgstr ""

-#: picard/ui/mainwindow.py:421
+#: picard/ui/mainwindow.py:420
+msgid "Identify the file using its AcoustID audio fingerprint"
+msgstr ""
+
+#: picard/ui/mainwindow.py:422
 msgid "Ctrl+Y"
 msgstr "Ctrl+Y"

-#: picard/ui/mainwindow.py:424
+#: picard/ui/mainwindow.py:425
 msgid "Cl&uster"
 msgstr "Agr&upar"

-#: picard/ui/mainwindow.py:425
+#: picard/ui/mainwindow.py:426
 msgid "Cluster files into album clusters"
 msgstr ""

-#: picard/ui/mainwindow.py:428
+#: picard/ui/mainwindow.py:429
 msgid "Ctrl+U"
 msgstr "Ctrl+U"

-#: picard/ui/mainwindow.py:431
+#: picard/ui/mainwindow.py:432
 msgid "&Lookup"
 msgstr "&Buscar"

-#: picard/ui/mainwindow.py:432
+#: picard/ui/mainwindow.py:433
 msgid "Lookup selected items in MusicBrainz"
 msgstr "Buscar los términos elegidos en MusicBrainz"

-#: picard/ui/mainwindow.py:437
+#: picard/ui/mainwindow.py:438
 msgid "Ctrl+L"
 msgstr "Ctrl+L"

-#: picard/ui/mainwindow.py:440
+#: picard/ui/mainwindow.py:441
 msgid "&Info..."
 msgstr "&Info..."

-#: picard/ui/mainwindow.py:443
+#: picard/ui/mainwindow.py:444
 msgid "Ctrl+I"
 msgstr "Ctrl+I"

-#: picard/ui/mainwindow.py:446
+#: picard/ui/mainwindow.py:447
 msgid "&Refresh"
 msgstr "&Actualizar"

-#: picard/ui/mainwindow.py:447
+#: picard/ui/mainwindow.py:448
 msgid "Ctrl+R"
 msgstr "Ctrl+R"

-#: picard/ui/mainwindow.py:450
+#: picard/ui/mainwindow.py:451
 msgid "&Rename Files"
 msgstr "&Renombrar archivos"

-#: picard/ui/mainwindow.py:455
+#: picard/ui/mainwindow.py:456
 msgid "&Move Files"
 msgstr "&Mover archivos"

-#: picard/ui/mainwindow.py:460
+#: picard/ui/mainwindow.py:461
 msgid "Save &Tags"
 msgstr "Guardar &Etiquetas"

-#: picard/ui/mainwindow.py:465
+#: picard/ui/mainwindow.py:466
 msgid "Tags From &File Names..."
 msgstr "Etiquetar a partir de nombres de &archivo..."

-#: picard/ui/mainwindow.py:469
+#: picard/ui/mainwindow.py:470
 msgid "&Open My Collections in Browser"
 msgstr "&Abrir mis colecciones en el navegador"

-#: picard/ui/mainwindow.py:473
+#: picard/ui/mainwindow.py:474
 msgid "View Error/Debug &Log"
 msgstr "Examinar error/trazas de &depuración"

-#: picard/ui/mainwindow.py:476
+#: picard/ui/mainwindow.py:477
 msgid "View Activity &History"
 msgstr "Ver &historial de actividad"

-#: picard/ui/mainwindow.py:483
+#: picard/ui/mainwindow.py:484
 msgid "Open in &Player"
 msgstr ""

-#: picard/ui/mainwindow.py:484
+#: picard/ui/mainwindow.py:485
 msgid "Play the file in your default media player"
 msgstr "Reproducir el archivo en su reproductor predeterminado"

-#: picard/ui/mainwindow.py:488
+#: picard/ui/mainwindow.py:489
 msgid "Open Containing &Folder"
 msgstr "Abrir la carpeta &contenedora"

-#: picard/ui/mainwindow.py:489
+#: picard/ui/mainwindow.py:490
 msgid "Open the containing folder in your file explorer"
 msgstr "Abrir la carpeta que contiene el archivo en su explorador"

-#: picard/ui/mainwindow.py:518
+#: picard/ui/mainwindow.py:519
 msgid "&File"
 msgstr "&Archivos"

-#: picard/ui/mainwindow.py:529
+#: picard/ui/mainwindow.py:530
 msgid "&Edit"
 msgstr "&Editar"

-#: picard/ui/mainwindow.py:535
+#: picard/ui/mainwindow.py:536
 msgid "&View"
 msgstr "&Vista"

-#: picard/ui/mainwindow.py:541
+#: picard/ui/mainwindow.py:542
 msgid "&Options"
 msgstr "&Opciones"

-#: picard/ui/mainwindow.py:547
+#: picard/ui/mainwindow.py:548
 msgid "&Tools"
 msgstr "Herramien&tas"

-#: picard/ui/mainwindow.py:558 picard/ui/util.py:35
+#: picard/ui/mainwindow.py:559 picard/ui/util.py:35
 msgid "&Help"
 msgstr "A&yuda"

-#: picard/ui/mainwindow.py:586
+#: picard/ui/mainwindow.py:587
 msgid "Actions"
 msgstr "Acciones"

-#: picard/ui/mainwindow.py:627
+#: picard/ui/mainwindow.py:628
 msgid "Track"
 msgstr "Pista"

-#: picard/ui/mainwindow.py:703
+#: picard/ui/mainwindow.py:704
 msgid "All Supported Formats"
 msgstr "Todos los formatos soportados"

-#: picard/ui/mainwindow.py:730
+#: picard/ui/mainwindow.py:731
 #, python-format
 msgid "Adding multiple directories from '%(directory)s' ..."
 msgstr "Añadiendo múltiples carpetas desde '%(directory)s' ..."

-#: picard/ui/mainwindow.py:735
+#: picard/ui/mainwindow.py:736
 #, python-format
 msgid "Adding directory: '%(directory)s' ..."
 msgstr "Añadiendo carpeta  '%(directory)s'…"

-#: picard/ui/mainwindow.py:801
+#: picard/ui/mainwindow.py:809
 msgid "Configuration Required"
 msgstr "Se necesita configuración"

-#: picard/ui/mainwindow.py:802
+#: picard/ui/mainwindow.py:810
 msgid ""
 "Audio fingerprinting is not yet configured. Would you like to configure it "
 "now?"
 msgstr "El sistema de huellas digitales de audio no está configurado. ¿Quiere configurarlo ahora?"

-#: picard/ui/mainwindow.py:902
+#: picard/ui/mainwindow.py:916
 #, python-format
 msgid "%(filename)s (error: %(error)s)"
 msgstr "%(filename)s (error: %(error)s)"

-#: picard/ui/mainwindow.py:908
+#: picard/ui/mainwindow.py:922
 #, python-format
 msgid "%(filename)s"
 msgstr "%(filename)s"

-#: picard/ui/mainwindow.py:918
+#: picard/ui/mainwindow.py:933
 #, python-format
 msgid "%(filename)s (%(similarity)d%%) (error: %(error)s)"
 msgstr "%(filename)s (%(similarity)d%%) (error: %(error)s)"

-#: picard/ui/mainwindow.py:925
+#: picard/ui/mainwindow.py:940
 #, python-format
 msgid "%(filename)s (%(similarity)d%%)"
 msgstr "%(filename)s (%(similarity)d%%)"

-#: picard/ui/mainwindow.py:961
+#: picard/ui/mainwindow.py:976
 msgid "Authentication Required"
 msgstr "Se precisa autenticación"

-#: picard/ui/mainwindow.py:962
+#: picard/ui/mainwindow.py:977
 msgid ""
 "Picard needs authorization to access your personal data on the MusicBrainz "
 "server. Would you like to log in now?"
@@ -1107,9 +1128,9 @@ msgstr ""

 #: picard/ui/searchdialog.py:259
 msgid "Retry"
-msgstr ""
+msgstr "Reintentar"

-#: picard/ui/searchdialog.py:288
+#: picard/ui/searchdialog.py:283
 #, python-format
 msgid ""
 "<strong>Following error occurred while fetching "
@@ -1166,11 +1187,11 @@ msgstr ""

 #: picard/ui/searchdialog.py:742
 msgid "Gender"
-msgstr ""
+msgstr "Género"

 #: picard/ui/searchdialog.py:743
 msgid "Area"
-msgstr ""
+msgstr "Área"

 #: picard/ui/searchdialog.py:744
 msgid "Begin"
@@ -1913,19 +1934,19 @@ msgstr ""
 msgid "Reset all settings for current option page"
 msgstr ""

-#: picard/ui/options/dialog.py:166
+#: picard/ui/options/dialog.py:172
 msgid "You are about to reset your options for this page."
 msgstr ""

-#: picard/ui/options/dialog.py:170
+#: picard/ui/options/dialog.py:176
 msgid "Warning! This will reset all of your settings."
 msgstr ""

-#: picard/ui/options/dialog.py:177
+#: picard/ui/options/dialog.py:183
 msgid "Confirm Reset"
 msgstr ""

-#: picard/ui/options/dialog.py:178
+#: picard/ui/options/dialog.py:184
 msgid "Are you sure?"
 msgstr ""

@@ -2096,7 +2117,7 @@ msgstr "Reiniciar todo"
 msgid "File Naming"
 msgstr "Nombrado de archivos"

-#: picard/ui/options/renaming.py:175 picard/ui/options/scripting.py:406
+#: picard/ui/options/renaming.py:175 picard/ui/options/scripting.py:410
 msgid ""
 "<a href=\"%(picard-doc-scripting-url)s\">Open Scripting Documentation in "
 "your browser</a>"
@@ -2138,15 +2159,15 @@ msgstr ""
 msgid "Scripting"
 msgstr "Escritura de scripts"

-#: picard/ui/options/scripting.py:292
+#: picard/ui/options/scripting.py:293
 msgid "Are you sure you want to remove this script?"
 msgstr ""

-#: picard/ui/options/scripting.py:293
+#: picard/ui/options/scripting.py:294
 msgid "Confirm Remove"
 msgstr ""

-#: picard/ui/options/scripting.py:376
+#: picard/ui/options/scripting.py:377
 msgid "Script Error"
 msgstr "Error de script"

--- a/po/et.po
+++ b/po/et.po
@@ -12,8 +12,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: MusicBrainz\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2017-01-18 12:51+0100\n"
-"PO-Revision-Date: 2017-01-19 09:17+0000\n"
+"POT-Creation-Date: 2017-03-05 09:58+0100\n"
+"PO-Revision-Date: 2017-03-05 10:00+0000\n"
 "Last-Translator: nikki\n"
 "Language-Team: Estonian (http://www.transifex.com/musicbrainz/musicbrainz/language/et/)\n"
 "MIME-Version: 1.0\n"
@@ -60,26 +60,26 @@ msgstr "AcoustID-d edastatud."
 msgid "Unmatched Files"
 msgstr "Vasteta failid"

-#: picard/album.py:206
+#: picard/album.py:200
 #, python-format
 msgid "[could not load album %s]"
 msgstr "[albumi \"%s\" laadimine polnud võimalik]"

-#: picard/album.py:295
+#: picard/album.py:289
 #, python-format
 msgid "Album %(id)s loaded: %(artist)s - %(album)s"
 msgstr "Album \"%(id)s\" laaditud: %(artist)s - %(album)s"

-#: picard/album.py:338
+#: picard/album.py:332
 #, python-format
 msgid "Loading album %(id)s ..."
 msgstr "Albumi \"%(id)s\" laadimine..."

-#: picard/album.py:342
+#: picard/album.py:336
 msgid "[loading album information]"
 msgstr "[albumi teabe laadimine...]"

-#: picard/album.py:527
+#: picard/album.py:523
 #, python-format
 msgid "; %i image"
 msgid_plural "; %i images"
@@ -101,72 +101,72 @@ msgstr "Rühm \"%(album)s\" tuvastatud!"
 msgid "Looking up the metadata for cluster %(album)s..."
 msgstr "Metaandmete otsimine rühmale \"%(album)s\"..."

-#: picard/collection.py:64
+#: picard/collection.py:67
 #, python-format
 msgid "Added %(count)i release to collection \"%(name)s\""
 msgid_plural "Added %(count)i releases to collection \"%(name)s\""
 msgstr[0] "Kogusse \"%(name)s\" lisati %(count)i väljalase"
 msgstr[1] "Kogusse \"%(name)s\" lisati %(count)i väljalaset"

-#: picard/collection.py:86
+#: picard/collection.py:89
 #, python-format
 msgid "Removed %(count)i release from collection \"%(name)s\""
 msgid_plural "Removed %(count)i releases from collection \"%(name)s\""
 msgstr[0] "Kogust \"%(name)s\" eemaldati %(count)i väljalase"
 msgstr[1] "Kogust \"%(name)s\" eemaldati %(count)i väljalaset"

-#: picard/collection.py:100
+#: picard/collection.py:104
 #, python-format
 msgid "Error loading collections: %(error)s"
 msgstr "Viga kogude laadimisel: %(error)s"

-#: picard/config_upgrade.py:58 picard/config_upgrade.py:71
+#: picard/config_upgrade.py:57 picard/config_upgrade.py:70
 msgid "Various Artists file naming scheme removal"
 msgstr "Mitme esitaja failinimeskeemi eemaldamine"

-#: picard/config_upgrade.py:59
+#: picard/config_upgrade.py:58
 msgid ""
 "The separate file naming scheme for various artists albums has been removed in this version of Picard.\n"
 "Your file naming scheme has automatically been merged with that of single artist albums."
 msgstr "Eraldi failinimeskeem mitme esitajaga albumite jaoks on selles Picardi versioonis eemaldatud.\nSee ühendati automaatselt tavalise failinimeskeemiga."

-#: picard/config_upgrade.py:72
+#: picard/config_upgrade.py:71
 msgid ""
 "The separate file naming scheme for various artists albums has been removed in this version of Picard.\n"
 "You currently do not use this option, but have a separate file naming scheme defined.\n"
 "Do you want to remove it or merge it with your file naming scheme for single artist albums?"
 msgstr "Eraldi failinimeskeem mitme esitajaga albumite jaoks on selles Picardi versioonis eemaldatud.\nSee võimalus polnud viimati sisse lülitatud, kuid skeem oli määratud.\nKas soovid selle eemaldada või ühendada tavalise failinimeskeemiga?"

-#: picard/config_upgrade.py:78
+#: picard/config_upgrade.py:77
 msgid "Merge"
 msgstr "Ühenda"

-#: picard/config_upgrade.py:78 picard/ui/metadatabox.py:314
+#: picard/config_upgrade.py:77 picard/ui/metadatabox.py:314
 #: picard/ui/options/interface.py:75 picard/ui/ui_options_interface.py:141
 msgid "Remove"
 msgstr "Eemalda"

-#: picard/config_upgrade.py:193 picard/ui/options/scripting.py:28
+#: picard/config_upgrade.py:200 picard/ui/options/scripting.py:28
 #, python-format
 msgid "My script %d"
 msgstr ""

-#: picard/file.py:541
+#: picard/file.py:565
 #, python-format
 msgid "No matching tracks for file '%(filename)s'"
 msgstr "Failile \"%(filename)s\" vastavaid lugusid pole"

-#: picard/file.py:557
+#: picard/file.py:581
 #, python-format
 msgid "No matching tracks above the threshold for file '%(filename)s'"
 msgstr "Failile \"%(filename)s\" üle seatud läve vastavaid lugusid pole"

-#: picard/file.py:564
+#: picard/file.py:588
 #, python-format
 msgid "File '%(filename)s' identified!"
 msgstr "Fail \"%(filename)s\" tuvastatud!"

-#: picard/file.py:584
+#: picard/file.py:608
 #, python-format
 msgid "Looking up the metadata for file %(filename)s ..."
 msgstr "Metaandmete otsimine failile \"%(filename)s\"..."
@@ -209,23 +209,23 @@ msgstr "[vöötkood puudub]"
 msgid "[no release info]"
 msgstr "[väljalaskeinfo puudub]"

-#: picard/tagger.py:405 picard/tagger.py:438
+#: picard/tagger.py:407 picard/tagger.py:440
 #, python-format
 msgid "Adding %(count)d file from '%(directory)s' ..."
 msgid_plural "Adding %(count)d files from '%(directory)s' ..."
 msgstr[0] "%(count)d faili lisamine kataloogist \"%(directory)s\"..."
 msgstr[1] "%(count)d faili lisamine kataloogist \"%(directory)s\"..."

-#: picard/tagger.py:597
+#: picard/tagger.py:599
 #, python-format
 msgid "Removing album %(id)s: %(artist)s - %(album)s"
 msgstr "Albumi \"%(id)s\" (%(artist)s - %(album)s) eemaldamine"

-#: picard/tagger.py:613
+#: picard/tagger.py:615
 msgid "CD Lookup Error"
 msgstr "Viga CD päringul"

-#: picard/tagger.py:614
+#: picard/tagger.py:616
 #, python-format
 msgid ""
 "Error while reading CD:\n"
@@ -273,6 +273,10 @@ msgstr "Prantsuse"
 msgid "Italian"
 msgstr "Itaalia"

+#: picard/const/languages.py:57
+msgid "Norwegian Bokmal"
+msgstr ""
+
 #: picard/const/languages.py:59
 msgid "Dutch"
 msgstr "Hollandi"
@@ -336,12 +340,12 @@ msgstr ""
 msgid "Whitelist"
 msgstr ""

-#: picard/ui/cdlookup.py:35 picard/ui/mainwindow.py:625 picard/util/tags.py:21
+#: picard/ui/cdlookup.py:35 picard/ui/mainwindow.py:626 picard/util/tags.py:21
 msgid "Album"
 msgstr "Album"

-#: picard/ui/cdlookup.py:35 picard/ui/itemviews.py:96
-#: picard/ui/mainwindow.py:626 picard/ui/searchdialog.py:326
+#: picard/ui/cdlookup.py:35 picard/ui/itemviews.py:105
+#: picard/ui/mainwindow.py:627 picard/ui/searchdialog.py:326
 #: picard/ui/searchdialog.py:513 picard/util/tags.py:22
 msgid "Artist"
 msgstr "Esitaja"
@@ -375,10 +379,22 @@ msgid_plural "%s (%i releases)"
 msgstr[0] "%s (%i väljalase)"
 msgstr[1] "%s (%i väljalaset)"

-#: picard/ui/coverartbox.py:143
+#: picard/ui/coverartbox.py:141
 msgid "View release on MusicBrainz"
 msgstr "Vaata väljalaset MusicBrainzis"

+#: picard/ui/coverartbox.py:174
+msgid "Show more details"
+msgstr ""
+
+#: picard/ui/coverartbox.py:199
+msgid "New Cover Art"
+msgstr ""
+
+#: picard/ui/coverartbox.py:200
+msgid "Original Cover Art"
+msgstr ""
+
 #: picard/ui/filebrowser.py:40
 msgid "&Move Tagged Files Here"
 msgstr "&Liiguta sildistatud failid siia"
@@ -507,116 +523,116 @@ msgstr "Ootel failid"
 msgid "Pending requests"
 msgstr "Ootel päringud"

-#: picard/ui/itemviews.py:94 picard/util/tags.py:23
+#: picard/ui/itemviews.py:103 picard/util/tags.py:23
 msgid "Title"
 msgstr "Pealkiri"

-#: picard/ui/itemviews.py:95 picard/ui/searchdialog.py:325
+#: picard/ui/itemviews.py:104 picard/ui/searchdialog.py:325
 #: picard/util/tags.py:87
 msgid "Length"
 msgstr "Pikkus"

-#: picard/ui/itemviews.py:162
+#: picard/ui/itemviews.py:171
 msgid "Bad match"
 msgstr ""

-#: picard/ui/itemviews.py:163
+#: picard/ui/itemviews.py:172
 msgid "Poor match"
 msgstr ""

-#: picard/ui/itemviews.py:164
+#: picard/ui/itemviews.py:173
 msgid "Ok match"
 msgstr ""

-#: picard/ui/itemviews.py:165
+#: picard/ui/itemviews.py:174
 msgid "Good match"
 msgstr ""

-#: picard/ui/itemviews.py:166
+#: picard/ui/itemviews.py:175
 msgid "Great match"
 msgstr ""

-#: picard/ui/itemviews.py:167
+#: picard/ui/itemviews.py:176
 msgid "Excellent match"
 msgstr ""

-#: picard/ui/itemviews.py:243
+#: picard/ui/itemviews.py:252
 msgid "&Expand all"
 msgstr "Lai&enda kõik"

-#: picard/ui/itemviews.py:245
+#: picard/ui/itemviews.py:254
 msgid "&Collapse all"
 msgstr "A&henda kõik"

-#: picard/ui/itemviews.py:247
+#: picard/ui/itemviews.py:256
 msgid "Select &all"
 msgstr ""

-#: picard/ui/itemviews.py:249
+#: picard/ui/itemviews.py:258
 msgid "Ctrl+A"
 msgstr ""

-#: picard/ui/itemviews.py:315
+#: picard/ui/itemviews.py:324
 msgid "&Other versions"
 msgstr "&Teised versioonid"

-#: picard/ui/itemviews.py:318
+#: picard/ui/itemviews.py:327
 msgid "Loading..."
 msgstr "Laadimine..."

-#: picard/ui/itemviews.py:383
+#: picard/ui/itemviews.py:392
 msgid "Collections"
 msgstr "Kogud"

-#: picard/ui/itemviews.py:386
+#: picard/ui/itemviews.py:395
 msgid "P&lugins"
 msgstr "Pluginad"

-#: picard/ui/itemviews.py:557
+#: picard/ui/itemviews.py:577
 msgid "file view"
 msgstr "failivaade"

-#: picard/ui/itemviews.py:558
+#: picard/ui/itemviews.py:578
 msgid "Contains unmatched files and clusters"
 msgstr "Sisaldab vasteteta faile ja rühmi"

-#: picard/ui/itemviews.py:578
+#: picard/ui/itemviews.py:598
 msgid "Clusters"
 msgstr "Rühmad"

-#: picard/ui/itemviews.py:587
+#: picard/ui/itemviews.py:607
 msgid "album view"
 msgstr "albumivaade"

-#: picard/ui/itemviews.py:588
+#: picard/ui/itemviews.py:608
 msgid "Contains albums and matched files"
 msgstr "Sisaldab albumeid ja vastetega faile"

-#: picard/ui/itemviews.py:694 picard/ui/options/renaming.py:188
+#: picard/ui/itemviews.py:714 picard/ui/options/renaming.py:188
 msgid "Error"
 msgstr "Viga"

-#: picard/ui/itemviews.py:698
+#: picard/ui/itemviews.py:718
 msgid "Album modified and complete"
 msgstr ""

-#: picard/ui/itemviews.py:701
+#: picard/ui/itemviews.py:721
 msgid "Album unchanged and complete"
 msgstr ""

-#: picard/ui/itemviews.py:705
+#: picard/ui/itemviews.py:725
 msgid "Album modified"
 msgstr ""

-#: picard/ui/itemviews.py:708
+#: picard/ui/itemviews.py:728
 msgid "Album unchanged"
 msgstr ""

-#: picard/ui/itemviews.py:811
+#: picard/ui/itemviews.py:831
 msgid "Track saved"
 msgstr ""

-#: picard/ui/itemviews.py:813 picard/ui/itemviews.py:817
+#: picard/ui/itemviews.py:833 picard/ui/itemviews.py:837
 msgid "Pending"
 msgstr ""

@@ -807,7 +823,7 @@ msgstr "Ctrl+B"
 msgid "&Cover Art"
 msgstr "&Kaanepilt"

-#: picard/ui/mainwindow.py:407 picard/ui/mainwindow.py:619
+#: picard/ui/mainwindow.py:407 picard/ui/mainwindow.py:620
 #: picard/ui/searchdialog.py:71
 msgid "Search"
 msgstr "Otsi"
@@ -834,175 +850,179 @@ msgid ""
 "even if they have no metadata"
 msgstr ""

-#: picard/ui/mainwindow.py:421
+#: picard/ui/mainwindow.py:420
+msgid "Identify the file using its AcoustID audio fingerprint"
+msgstr ""
+
+#: picard/ui/mainwindow.py:422
 msgid "Ctrl+Y"
 msgstr "Ctrl+Y"

-#: picard/ui/mainwindow.py:424
+#: picard/ui/mainwindow.py:425
 msgid "Cl&uster"
 msgstr "&Rühmita"

-#: picard/ui/mainwindow.py:425
+#: picard/ui/mainwindow.py:426
 msgid "Cluster files into album clusters"
 msgstr ""

-#: picard/ui/mainwindow.py:428
+#: picard/ui/mainwindow.py:429
 msgid "Ctrl+U"
 msgstr "Ctrl+U"

-#: picard/ui/mainwindow.py:431
+#: picard/ui/mainwindow.py:432
 msgid "&Lookup"
 msgstr "&Päring"

-#: picard/ui/mainwindow.py:432
+#: picard/ui/mainwindow.py:433
 msgid "Lookup selected items in MusicBrainz"
 msgstr "Valiku otsimine MusicBrainzist"

-#: picard/ui/mainwindow.py:437
+#: picard/ui/mainwindow.py:438
 msgid "Ctrl+L"
 msgstr "Ctrl+L"

-#: picard/ui/mainwindow.py:440
+#: picard/ui/mainwindow.py:441
 msgid "&Info..."
 msgstr "&Info"

-#: picard/ui/mainwindow.py:443
+#: picard/ui/mainwindow.py:444
 msgid "Ctrl+I"
 msgstr "Ctrl+I"

-#: picard/ui/mainwindow.py:446
+#: picard/ui/mainwindow.py:447
 msgid "&Refresh"
 msgstr "Vä&rskenda"

-#: picard/ui/mainwindow.py:447
+#: picard/ui/mainwindow.py:448
 msgid "Ctrl+R"
 msgstr "Ctrl+R"

-#: picard/ui/mainwindow.py:450
+#: picard/ui/mainwindow.py:451
 msgid "&Rename Files"
 msgstr "Failid &nimetatakse ümber"

-#: picard/ui/mainwindow.py:455
+#: picard/ui/mainwindow.py:456
 msgid "&Move Files"
 msgstr "Failid &teisaldatakse"

-#: picard/ui/mainwindow.py:460
+#: picard/ui/mainwindow.py:461
 msgid "Save &Tags"
 msgstr "S&ildid salvestatakse"

-#: picard/ui/mainwindow.py:465
+#: picard/ui/mainwindow.py:466
 msgid "Tags From &File Names..."
 msgstr "Sildid &failinime põhjal..."

-#: picard/ui/mainwindow.py:469
+#: picard/ui/mainwindow.py:470
 msgid "&Open My Collections in Browser"
 msgstr "Ava minu kogud"

-#: picard/ui/mainwindow.py:473
+#: picard/ui/mainwindow.py:474
 msgid "View Error/Debug &Log"
 msgstr "Ava vigade/silumisteabe logi"

-#: picard/ui/mainwindow.py:476
+#: picard/ui/mainwindow.py:477
 msgid "View Activity &History"
 msgstr "Vaata toiminguajalugu"

-#: picard/ui/mainwindow.py:483
+#: picard/ui/mainwindow.py:484
 msgid "Open in &Player"
 msgstr ""

-#: picard/ui/mainwindow.py:484
+#: picard/ui/mainwindow.py:485
 msgid "Play the file in your default media player"
 msgstr "Faili esitamine vaikimisi meediamängijas"

-#: picard/ui/mainwindow.py:488
+#: picard/ui/mainwindow.py:489
 msgid "Open Containing &Folder"
 msgstr "Ava faili sisaldav kataloog"

-#: picard/ui/mainwindow.py:489
+#: picard/ui/mainwindow.py:490
 msgid "Open the containing folder in your file explorer"
 msgstr "Faili sisaldava kataloogi avamine failihalduris"

-#: picard/ui/mainwindow.py:518
+#: picard/ui/mainwindow.py:519
 msgid "&File"
 msgstr "&Fail"

-#: picard/ui/mainwindow.py:529
+#: picard/ui/mainwindow.py:530
 msgid "&Edit"
 msgstr "&Redigeerimine"

-#: picard/ui/mainwindow.py:535
+#: picard/ui/mainwindow.py:536
 msgid "&View"
 msgstr "&Vaade"

-#: picard/ui/mainwindow.py:541
+#: picard/ui/mainwindow.py:542
 msgid "&Options"
 msgstr "&Seadistused"

-#: picard/ui/mainwindow.py:547
+#: picard/ui/mainwindow.py:548
 msgid "&Tools"
 msgstr "&Tööriistad"

-#: picard/ui/mainwindow.py:558 picard/ui/util.py:35
+#: picard/ui/mainwindow.py:559 picard/ui/util.py:35
 msgid "&Help"
 msgstr "&Abi"

-#: picard/ui/mainwindow.py:586
+#: picard/ui/mainwindow.py:587
 msgid "Actions"
 msgstr "Toimingud"

-#: picard/ui/mainwindow.py:627
+#: picard/ui/mainwindow.py:628
 msgid "Track"
 msgstr "Lugu"

-#: picard/ui/mainwindow.py:703
+#: picard/ui/mainwindow.py:704
 msgid "All Supported Formats"
 msgstr "Kõik toetatud vormingud"

-#: picard/ui/mainwindow.py:730
+#: picard/ui/mainwindow.py:731
 #, python-format
 msgid "Adding multiple directories from '%(directory)s' ..."
 msgstr "Mitme kataloogi lisamine asukohast \"%(directory)s\"..."

-#: picard/ui/mainwindow.py:735
+#: picard/ui/mainwindow.py:736
 #, python-format
 msgid "Adding directory: '%(directory)s' ..."
 msgstr "Kataloogi \"%(directory)s\" lisamine..."

-#: picard/ui/mainwindow.py:801
+#: picard/ui/mainwindow.py:809
 msgid "Configuration Required"
 msgstr "Vaja on seadistamist"

-#: picard/ui/mainwindow.py:802
+#: picard/ui/mainwindow.py:810
 msgid ""
 "Audio fingerprinting is not yet configured. Would you like to configure it "
 "now?"
 msgstr "Audiosõrmejälgede süsteem pole veel seadistatud. Kas soovid seda kohe teha?"

-#: picard/ui/mainwindow.py:902
+#: picard/ui/mainwindow.py:916
 #, python-format
 msgid "%(filename)s (error: %(error)s)"
 msgstr "%(filename)s (viga: %(error)s)"

-#: picard/ui/mainwindow.py:908
+#: picard/ui/mainwindow.py:922
 #, python-format
 msgid "%(filename)s"
 msgstr "%(filename)s"

-#: picard/ui/mainwindow.py:918
+#: picard/ui/mainwindow.py:933
 #, python-format
 msgid "%(filename)s (%(similarity)d%%) (error: %(error)s)"
 msgstr "%(filename)s (%(similarity)d%%) (viga: %(error)s)"

-#: picard/ui/mainwindow.py:925
+#: picard/ui/mainwindow.py:940
 #, python-format
 msgid "%(filename)s (%(similarity)d%%)"
 msgstr "%(filename)s (%(similarity)d%%)"

-#: picard/ui/mainwindow.py:961
+#: picard/ui/mainwindow.py:976
 msgid "Authentication Required"
 msgstr "Nõutakse autentimist"

-#: picard/ui/mainwindow.py:962
+#: picard/ui/mainwindow.py:977
 msgid ""
 "Picard needs authorization to access your personal data on the MusicBrainz "
 "server. Would you like to log in now?"
@@ -1111,7 +1131,7 @@ msgstr ""
 msgid "Retry"
 msgstr ""

-#: picard/ui/searchdialog.py:288
+#: picard/ui/searchdialog.py:283
 #, python-format
 msgid ""
 "<strong>Following error occurred while fetching "
@@ -1915,19 +1935,19 @@ msgstr ""
 msgid "Reset all settings for current option page"
 msgstr ""

-#: picard/ui/options/dialog.py:166
+#: picard/ui/options/dialog.py:172
 msgid "You are about to reset your options for this page."
 msgstr ""

-#: picard/ui/options/dialog.py:170
+#: picard/ui/options/dialog.py:176
 msgid "Warning! This will reset all of your settings."
 msgstr ""

-#: picard/ui/options/dialog.py:177
+#: picard/ui/options/dialog.py:183
 msgid "Confirm Reset"
 msgstr ""

-#: picard/ui/options/dialog.py:178
+#: picard/ui/options/dialog.py:184
 msgid "Are you sure?"
 msgstr ""

@@ -2098,7 +2118,7 @@ msgstr "Lähtesta kõik"
 msgid "File Naming"
 msgstr "Failinimed"

-#: picard/ui/options/renaming.py:175 picard/ui/options/scripting.py:406
+#: picard/ui/options/renaming.py:175 picard/ui/options/scripting.py:410
 msgid ""
 "<a href=\"%(picard-doc-scripting-url)s\">Open Scripting Documentation in "
 "your browser</a>"
@@ -2140,15 +2160,15 @@ msgstr ""
 msgid "Scripting"
 msgstr "Skriptimine"

-#: picard/ui/options/scripting.py:292
+#: picard/ui/options/scripting.py:293
 msgid "Are you sure you want to remove this script?"
 msgstr ""

-#: picard/ui/options/scripting.py:293
+#: picard/ui/options/scripting.py:294
 msgid "Confirm Remove"
 msgstr ""

-#: picard/ui/options/scripting.py:376
+#: picard/ui/options/scripting.py:377
 msgid "Script Error"
 msgstr "Skripti viga"

--- a/po/fa.po
+++ b/po/fa.po
@@ -9,8 +9,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: MusicBrainz\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2017-01-18 12:51+0100\n"
-"PO-Revision-Date: 2017-01-19 09:17+0000\n"
+"POT-Creation-Date: 2017-03-05 09:58+0100\n"
+"PO-Revision-Date: 2017-03-05 10:00+0000\n"
 "Last-Translator: nikki\n"
 "Language-Team: Persian (http://www.transifex.com/musicbrainz/musicbrainz/language/fa/)\n"
 "MIME-Version: 1.0\n"
@@ -57,26 +57,26 @@ msgstr ""
 msgid "Unmatched Files"
 msgstr ""

-#: picard/album.py:206
+#: picard/album.py:200
 #, python-format
 msgid "[could not load album %s]"
 msgstr ""

-#: picard/album.py:295
+#: picard/album.py:289
 #, python-format
 msgid "Album %(id)s loaded: %(artist)s - %(album)s"
 msgstr ""

-#: picard/album.py:338
+#: picard/album.py:332
 #, python-format
 msgid "Loading album %(id)s ..."
 msgstr ""

-#: picard/album.py:342
+#: picard/album.py:336
 msgid "[loading album information]"
 msgstr ""

-#: picard/album.py:527
+#: picard/album.py:523
 #, python-format
 msgid "; %i image"
 msgid_plural "; %i images"
@@ -97,70 +97,70 @@ msgstr ""
 msgid "Looking up the metadata for cluster %(album)s..."
 msgstr ""

-#: picard/collection.py:64
+#: picard/collection.py:67
 #, python-format
 msgid "Added %(count)i release to collection \"%(name)s\""
 msgid_plural "Added %(count)i releases to collection \"%(name)s\""
 msgstr[0] ""

-#: picard/collection.py:86
+#: picard/collection.py:89
 #, python-format
 msgid "Removed %(count)i release from collection \"%(name)s\""
 msgid_plural "Removed %(count)i releases from collection \"%(name)s\""
 msgstr[0] ""

-#: picard/collection.py:100
+#: picard/collection.py:104
 #, python-format
 msgid "Error loading collections: %(error)s"
 msgstr ""

-#: picard/config_upgrade.py:58 picard/config_upgrade.py:71
+#: picard/config_upgrade.py:57 picard/config_upgrade.py:70
 msgid "Various Artists file naming scheme removal"
 msgstr ""

-#: picard/config_upgrade.py:59
+#: picard/config_upgrade.py:58
 msgid ""
 "The separate file naming scheme for various artists albums has been removed in this version of Picard.\n"
 "Your file naming scheme has automatically been merged with that of single artist albums."
 msgstr ""

-#: picard/config_upgrade.py:72
+#: picard/config_upgrade.py:71
 msgid ""
 "The separate file naming scheme for various artists albums has been removed in this version of Picard.\n"
 "You currently do not use this option, but have a separate file naming scheme defined.\n"
 "Do you want to remove it or merge it with your file naming scheme for single artist albums?"
 msgstr ""

-#: picard/config_upgrade.py:78
+#: picard/config_upgrade.py:77
 msgid "Merge"
 msgstr "ادغام"

-#: picard/config_upgrade.py:78 picard/ui/metadatabox.py:314
+#: picard/config_upgrade.py:77 picard/ui/metadatabox.py:314
 #: picard/ui/options/interface.py:75 picard/ui/ui_options_interface.py:141
 msgid "Remove"
 msgstr "حذف"

-#: picard/config_upgrade.py:193 picard/ui/options/scripting.py:28
+#: picard/config_upgrade.py:200 picard/ui/options/scripting.py:28
 #, python-format
 msgid "My script %d"
 msgstr ""

-#: picard/file.py:541
+#: picard/file.py:565
 #, python-format
 msgid "No matching tracks for file '%(filename)s'"
 msgstr "عنوان مناسب برای پرونده „%(filename)s“ یافت نشد."

-#: picard/file.py:557
+#: picard/file.py:581
 #, python-format
 msgid "No matching tracks above the threshold for file '%(filename)s'"
 msgstr "عنوان مناسب بالاتر از آستانه  برای پرونده „%(filename)s“ یافت نشد."

-#: picard/file.py:564
+#: picard/file.py:588
 #, python-format
 msgid "File '%(filename)s' identified!"
 msgstr "پرونده „%(filename)s“ شناسایی شد!"

-#: picard/file.py:584
+#: picard/file.py:608
 #, python-format
 msgid "Looking up the metadata for file %(filename)s ..."
 msgstr ""
@@ -203,22 +203,22 @@ msgstr "بدون بارکد"
 msgid "[no release info]"
 msgstr "بدون اطلاعات انتشار"

-#: picard/tagger.py:405 picard/tagger.py:438
+#: picard/tagger.py:407 picard/tagger.py:440
 #, python-format
 msgid "Adding %(count)d file from '%(directory)s' ..."
 msgid_plural "Adding %(count)d files from '%(directory)s' ..."
 msgstr[0] ""

-#: picard/tagger.py:597
+#: picard/tagger.py:599
 #, python-format
 msgid "Removing album %(id)s: %(artist)s - %(album)s"
 msgstr ""

-#: picard/tagger.py:613
+#: picard/tagger.py:615
 msgid "CD Lookup Error"
 msgstr ""

-#: picard/tagger.py:614
+#: picard/tagger.py:616
 #, python-format
 msgid ""
 "Error while reading CD:\n"
@@ -266,6 +266,10 @@ msgstr "فرانسوی"
 msgid "Italian"
 msgstr "ایتالیایی"

+#: picard/const/languages.py:57
+msgid "Norwegian Bokmal"
+msgstr ""
+
 #: picard/const/languages.py:59
 msgid "Dutch"
 msgstr "هلندی"
@@ -329,12 +333,12 @@ msgstr ""
 msgid "Whitelist"
 msgstr ""

-#: picard/ui/cdlookup.py:35 picard/ui/mainwindow.py:625 picard/util/tags.py:21
+#: picard/ui/cdlookup.py:35 picard/ui/mainwindow.py:626 picard/util/tags.py:21
 msgid "Album"
 msgstr "آلبوم"

-#: picard/ui/cdlookup.py:35 picard/ui/itemviews.py:96
-#: picard/ui/mainwindow.py:626 picard/ui/searchdialog.py:326
+#: picard/ui/cdlookup.py:35 picard/ui/itemviews.py:105
+#: picard/ui/mainwindow.py:627 picard/ui/searchdialog.py:326
 #: picard/ui/searchdialog.py:513 picard/util/tags.py:22
 msgid "Artist"
 msgstr "هنرمند"
@@ -367,10 +371,22 @@ msgid "%s (%i release)"
 msgid_plural "%s (%i releases)"
 msgstr[0] ""

-#: picard/ui/coverartbox.py:143
+#: picard/ui/coverartbox.py:141
 msgid "View release on MusicBrainz"
 msgstr ""

+#: picard/ui/coverartbox.py:174
+msgid "Show more details"
+msgstr ""
+
+#: picard/ui/coverartbox.py:199
+msgid "New Cover Art"
+msgstr ""
+
+#: picard/ui/coverartbox.py:200
+msgid "Original Cover Art"
+msgstr ""
+
 #: picard/ui/filebrowser.py:40
 msgid "&Move Tagged Files Here"
 msgstr ""
@@ -499,116 +515,116 @@ msgstr "پرونده های در انتظار"
 msgid "Pending requests"
 msgstr "ذرخواست های در انتظار"

-#: picard/ui/itemviews.py:94 picard/util/tags.py:23
+#: picard/ui/itemviews.py:103 picard/util/tags.py:23
 msgid "Title"
 msgstr "عنوان"

-#: picard/ui/itemviews.py:95 picard/ui/searchdialog.py:325
+#: picard/ui/itemviews.py:104 picard/ui/searchdialog.py:325
 #: picard/util/tags.py:87
 msgid "Length"
 msgstr "مدت:"

-#: picard/ui/itemviews.py:162
+#: picard/ui/itemviews.py:171
 msgid "Bad match"
 msgstr ""

-#: picard/ui/itemviews.py:163
+#: picard/ui/itemviews.py:172
 msgid "Poor match"
 msgstr ""

-#: picard/ui/itemviews.py:164
+#: picard/ui/itemviews.py:173
 msgid "Ok match"
 msgstr ""

-#: picard/ui/itemviews.py:165
+#: picard/ui/itemviews.py:174
 msgid "Good match"
 msgstr ""

-#: picard/ui/itemviews.py:166
+#: picard/ui/itemviews.py:175
 msgid "Great match"
 msgstr ""

-#: picard/ui/itemviews.py:167
+#: picard/ui/itemviews.py:176
 msgid "Excellent match"
 msgstr ""

-#: picard/ui/itemviews.py:243
+#: picard/ui/itemviews.py:252
 msgid "&Expand all"
 msgstr ""

-#: picard/ui/itemviews.py:245
+#: picard/ui/itemviews.py:254
 msgid "&Collapse all"
 msgstr ""

-#: picard/ui/itemviews.py:247
+#: picard/ui/itemviews.py:256
 msgid "Select &all"
 msgstr ""

-#: picard/ui/itemviews.py:249
+#: picard/ui/itemviews.py:258
 msgid "Ctrl+A"
 msgstr ""

-#: picard/ui/itemviews.py:315
+#: picard/ui/itemviews.py:324
 msgid "&Other versions"
 msgstr ""

-#: picard/ui/itemviews.py:318
+#: picard/ui/itemviews.py:327
 msgid "Loading..."
 msgstr "بارگذاری..."

-#: picard/ui/itemviews.py:383
+#: picard/ui/itemviews.py:392
 msgid "Collections"
 msgstr "مجموعه ها"

-#: picard/ui/itemviews.py:386
+#: picard/ui/itemviews.py:395
 msgid "P&lugins"
 msgstr "&افزونه ها"

-#: picard/ui/itemviews.py:557
+#: picard/ui/itemviews.py:577
 msgid "file view"
 msgstr "نمای پرونده "

-#: picard/ui/itemviews.py:558
+#: picard/ui/itemviews.py:578
 msgid "Contains unmatched files and clusters"
 msgstr "شامل پرونده ها و گروه بندی های در انتظار"

-#: picard/ui/itemviews.py:578
+#: picard/ui/itemviews.py:598
 msgid "Clusters"
 msgstr "گروه بندی ها"

-#: picard/ui/itemviews.py:587
+#: picard/ui/itemviews.py:607
 msgid "album view"
 msgstr "نمای آلبوم"

-#: picard/ui/itemviews.py:588
+#: picard/ui/itemviews.py:608
 msgid "Contains albums and matched files"
 msgstr "شامل آلبوم ها و پرونده های مربوطه"

-#: picard/ui/itemviews.py:694 picard/ui/options/renaming.py:188
+#: picard/ui/itemviews.py:714 picard/ui/options/renaming.py:188
 msgid "Error"
 msgstr ""

-#: picard/ui/itemviews.py:698
+#: picard/ui/itemviews.py:718
 msgid "Album modified and complete"
 msgstr ""

-#: picard/ui/itemviews.py:701
+#: picard/ui/itemviews.py:721
 msgid "Album unchanged and complete"
 msgstr ""

-#: picard/ui/itemviews.py:705
+#: picard/ui/itemviews.py:725
 msgid "Album modified"
 msgstr ""

-#: picard/ui/itemviews.py:708
+#: picard/ui/itemviews.py:728
 msgid "Album unchanged"
 msgstr ""

-#: picard/ui/itemviews.py:811
+#: picard/ui/itemviews.py:831
 msgid "Track saved"
 msgstr ""

-#: picard/ui/itemviews.py:813 picard/ui/itemviews.py:817
+#: picard/ui/itemviews.py:833 picard/ui/itemviews.py:837
 msgid "Pending"
 msgstr ""

@@ -798,7 +814,7 @@ msgstr ""
 msgid "&Cover Art"
 msgstr ""

-#: picard/ui/mainwindow.py:407 picard/ui/mainwindow.py:619
+#: picard/ui/mainwindow.py:407 picard/ui/mainwindow.py:620
 #: picard/ui/searchdialog.py:71
 msgid "Search"
 msgstr "جستجو"
@@ -825,175 +841,179 @@ msgid ""
 "even if they have no metadata"
 msgstr ""

-#: picard/ui/mainwindow.py:421
+#: picard/ui/mainwindow.py:420
+msgid "Identify the file using its AcoustID audio fingerprint"
+msgstr ""
+
+#: picard/ui/mainwindow.py:422
 msgid "Ctrl+Y"
 msgstr ""

-#: picard/ui/mainwindow.py:424
+#: picard/ui/mainwindow.py:425
 msgid "Cl&uster"
 msgstr ""

-#: picard/ui/mainwindow.py:425
+#: picard/ui/mainwindow.py:426
 msgid "Cluster files into album clusters"
 msgstr ""

-#: picard/ui/mainwindow.py:428
+#: picard/ui/mainwindow.py:429
 msgid "Ctrl+U"
 msgstr ""

-#: picard/ui/mainwindow.py:431
+#: picard/ui/mainwindow.py:432
 msgid "&Lookup"
 msgstr ""

-#: picard/ui/mainwindow.py:432
+#: picard/ui/mainwindow.py:433
 msgid "Lookup selected items in MusicBrainz"
 msgstr ""

-#: picard/ui/mainwindow.py:437
+#: picard/ui/mainwindow.py:438
 msgid "Ctrl+L"
 msgstr ""

-#: picard/ui/mainwindow.py:440
+#: picard/ui/mainwindow.py:441
 msgid "&Info..."
 msgstr ""

-#: picard/ui/mainwindow.py:443
+#: picard/ui/mainwindow.py:444
 msgid "Ctrl+I"
 msgstr ""

-#: picard/ui/mainwindow.py:446
+#: picard/ui/mainwindow.py:447
 msgid "&Refresh"
 msgstr "&بازآوری‌"

-#: picard/ui/mainwindow.py:447
+#: picard/ui/mainwindow.py:448
 msgid "Ctrl+R"
 msgstr ""

-#: picard/ui/mainwindow.py:450
+#: picard/ui/mainwindow.py:451
 msgid "&Rename Files"
 msgstr ""

-#: picard/ui/mainwindow.py:455
+#: picard/ui/mainwindow.py:456
 msgid "&Move Files"
 msgstr ""

-#: picard/ui/mainwindow.py:460
+#: picard/ui/mainwindow.py:461
 msgid "Save &Tags"
 msgstr ""

-#: picard/ui/mainwindow.py:465
+#: picard/ui/mainwindow.py:466
 msgid "Tags From &File Names..."
 msgstr ""

-#: picard/ui/mainwindow.py:469
+#: picard/ui/mainwindow.py:470
 msgid "&Open My Collections in Browser"
 msgstr ""

-#: picard/ui/mainwindow.py:473
+#: picard/ui/mainwindow.py:474
 msgid "View Error/Debug &Log"
 msgstr ""

-#: picard/ui/mainwindow.py:476
+#: picard/ui/mainwindow.py:477
 msgid "View Activity &History"
 msgstr ""

-#: picard/ui/mainwindow.py:483
+#: picard/ui/mainwindow.py:484
 msgid "Open in &Player"
 msgstr ""

-#: picard/ui/mainwindow.py:484
+#: picard/ui/mainwindow.py:485
 msgid "Play the file in your default media player"
 msgstr ""

-#: picard/ui/mainwindow.py:488
+#: picard/ui/mainwindow.py:489
 msgid "Open Containing &Folder"
 msgstr ""

-#: picard/ui/mainwindow.py:489
+#: picard/ui/mainwindow.py:490
 msgid "Open the containing folder in your file explorer"
 msgstr ""

-#: picard/ui/mainwindow.py:518
+#: picard/ui/mainwindow.py:519
 msgid "&File"
 msgstr ""

-#: picard/ui/mainwindow.py:529
+#: picard/ui/mainwindow.py:530
 msgid "&Edit"
 msgstr "&ویرایش‌"

-#: picard/ui/mainwindow.py:535
+#: picard/ui/mainwindow.py:536
 msgid "&View"
 msgstr "&نما‌"

-#: picard/ui/mainwindow.py:541
+#: picard/ui/mainwindow.py:542
 msgid "&Options"
 msgstr "&گزینه‌ها‌"

-#: picard/ui/mainwindow.py:547
+#: picard/ui/mainwindow.py:548
 msgid "&Tools"
 msgstr "&ابزارها‌"

-#: picard/ui/mainwindow.py:558 picard/ui/util.py:35
+#: picard/ui/mainwindow.py:559 picard/ui/util.py:35
 msgid "&Help"
 msgstr "&کمک‌"

-#: picard/ui/mainwindow.py:586
+#: picard/ui/mainwindow.py:587
 msgid "Actions"
 msgstr ""

-#: picard/ui/mainwindow.py:627
+#: picard/ui/mainwindow.py:628
 msgid "Track"
 msgstr "شیار"

-#: picard/ui/mainwindow.py:703
+#: picard/ui/mainwindow.py:704
 msgid "All Supported Formats"
 msgstr ""

-#: picard/ui/mainwindow.py:730
+#: picard/ui/mainwindow.py:731
 #, python-format
 msgid "Adding multiple directories from '%(directory)s' ..."
 msgstr ""

-#: picard/ui/mainwindow.py:735
+#: picard/ui/mainwindow.py:736
 #, python-format
 msgid "Adding directory: '%(directory)s' ..."
 msgstr ""

-#: picard/ui/mainwindow.py:801
+#: picard/ui/mainwindow.py:809
 msgid "Configuration Required"
 msgstr ""

-#: picard/ui/mainwindow.py:802
+#: picard/ui/mainwindow.py:810
 msgid ""
 "Audio fingerprinting is not yet configured. Would you like to configure it "
 "now?"
 msgstr ""

-#: picard/ui/mainwindow.py:902
+#: picard/ui/mainwindow.py:916
 #, python-format
 msgid "%(filename)s (error: %(error)s)"
 msgstr ""

-#: picard/ui/mainwindow.py:908
+#: picard/ui/mainwindow.py:922
 #, python-format
 msgid "%(filename)s"
 msgstr ""

-#: picard/ui/mainwindow.py:918
+#: picard/ui/mainwindow.py:933
 #, python-format
 msgid "%(filename)s (%(similarity)d%%) (error: %(error)s)"
 msgstr ""

-#: picard/ui/mainwindow.py:925
+#: picard/ui/mainwindow.py:940
 #, python-format
 msgid "%(filename)s (%(similarity)d%%)"
 msgstr ""

-#: picard/ui/mainwindow.py:961
+#: picard/ui/mainwindow.py:976
 msgid "Authentication Required"
 msgstr ""

-#: picard/ui/mainwindow.py:962
+#: picard/ui/mainwindow.py:977
 msgid ""
 "Picard needs authorization to access your personal data on the MusicBrainz "
 "server. Would you like to log in now?"
@@ -1099,7 +1119,7 @@ msgstr ""
 msgid "Retry"
 msgstr ""

-#: picard/ui/searchdialog.py:288
+#: picard/ui/searchdialog.py:283
 #, python-format
 msgid ""
 "<strong>Following error occurred while fetching "
@@ -1903,19 +1923,19 @@ msgstr ""
 msgid "Reset all settings for current option page"
 msgstr ""

-#: picard/ui/options/dialog.py:166
+#: picard/ui/options/dialog.py:172
 msgid "You are about to reset your options for this page."
 msgstr ""

-#: picard/ui/options/dialog.py:170
+#: picard/ui/options/dialog.py:176
 msgid "Warning! This will reset all of your settings."
 msgstr ""

-#: picard/ui/options/dialog.py:177
+#: picard/ui/options/dialog.py:183
 msgid "Confirm Reset"
 msgstr ""

-#: picard/ui/options/dialog.py:178
+#: picard/ui/options/dialog.py:184
 msgid "Are you sure?"
 msgstr ""

@@ -2086,7 +2106,7 @@ msgstr ""
 msgid "File Naming"
 msgstr ""

-#: picard/ui/options/renaming.py:175 picard/ui/options/scripting.py:406
+#: picard/ui/options/renaming.py:175 picard/ui/options/scripting.py:410
 msgid ""
 "<a href=\"%(picard-doc-scripting-url)s\">Open Scripting Documentation in "
 "your browser</a>"
@@ -2128,15 +2148,15 @@ msgstr ""
 msgid "Scripting"
 msgstr ""

-#: picard/ui/options/scripting.py:292
+#: picard/ui/options/scripting.py:293
 msgid "Are you sure you want to remove this script?"
 msgstr ""

-#: picard/ui/options/scripting.py:293
+#: picard/ui/options/scripting.py:294
 msgid "Confirm Remove"
 msgstr ""

-#: picard/ui/options/scripting.py:376
+#: picard/ui/options/scripting.py:377
 msgid "Script Error"
 msgstr ""

--- a/po/fi.po
+++ b/po/fi.po
@@ -12,8 +12,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: MusicBrainz\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2017-01-18 12:51+0100\n"
-"PO-Revision-Date: 2017-01-19 09:17+0000\n"
+"POT-Creation-Date: 2017-03-05 09:58+0100\n"
+"PO-Revision-Date: 2017-03-05 10:00+0000\n"
 "Last-Translator: nikki\n"
 "Language-Team: Finnish (http://www.transifex.com/musicbrainz/musicbrainz/language/fi/)\n"
 "MIME-Version: 1.0\n"
@@ -60,26 +60,26 @@ msgstr "AcoustID-lähetys onnistui."
 msgid "Unmatched Files"
 msgstr "Täsmäämättömät tiedostot"

-#: picard/album.py:206
+#: picard/album.py:200
 #, python-format
 msgid "[could not load album %s]"
 msgstr "[julkaisua %s ei voitu ladata]"

-#: picard/album.py:295
+#: picard/album.py:289
 #, python-format
 msgid "Album %(id)s loaded: %(artist)s - %(album)s"
 msgstr "Julkaisu %(id)s ladattu: %(artist)s - %(album)s"

-#: picard/album.py:338
+#: picard/album.py:332
 #, python-format
 msgid "Loading album %(id)s ..."
 msgstr "Ladataan julkaisua %(id)s ..."

-#: picard/album.py:342
+#: picard/album.py:336
 msgid "[loading album information]"
 msgstr "[ladataan julkaisun tietoja]"

-#: picard/album.py:527
+#: picard/album.py:523
 #, python-format
 msgid "; %i image"
 msgid_plural "; %i images"
@@ -101,72 +101,72 @@ msgstr "Ryhmä %(album)s tunnistettu!"
 msgid "Looking up the metadata for cluster %(album)s..."
 msgstr "Haetaan metatietoja ryhmälle %(album)s..."

-#: picard/collection.py:64
+#: picard/collection.py:67
 #, python-format
 msgid "Added %(count)i release to collection \"%(name)s\""
 msgid_plural "Added %(count)i releases to collection \"%(name)s\""
 msgstr[0] "Lisättiin %(count)i julkaisu kokoelmaan \"%(name)s\""
 msgstr[1] "Lisättiin %(count)i julkaisua kokoelmaan \"%(name)s\""

-#: picard/collection.py:86
+#: picard/collection.py:89
 #, python-format
 msgid "Removed %(count)i release from collection \"%(name)s\""
 msgid_plural "Removed %(count)i releases from collection \"%(name)s\""
 msgstr[0] "Poistettiin %(count)i julkaisu kokoelmasta \"%(name)s\""
 msgstr[1] "Poistettiin %(count)i julkaisua kokoelmasta \"%(name)s\""

-#: picard/collection.py:100
+#: picard/collection.py:104
 #, python-format
 msgid "Error loading collections: %(error)s"
 msgstr "Virhe ladattaessa kokoelmia: %(error)s"

-#: picard/config_upgrade.py:58 picard/config_upgrade.py:71
+#: picard/config_upgrade.py:57 picard/config_upgrade.py:70
 msgid "Various Artists file naming scheme removal"
 msgstr "Tiedostojen nimeämissäännön poisto useiden artistien julkaisuille"

-#: picard/config_upgrade.py:59
+#: picard/config_upgrade.py:58
 msgid ""
 "The separate file naming scheme for various artists albums has been removed in this version of Picard.\n"
 "Your file naming scheme has automatically been merged with that of single artist albums."
 msgstr "Erillistä tiedostojen nimeämissääntöä useiden artistien julkaisuille ei ole enää Picardin tässä versiossa.\nNykyinen nimeämissääntö on yhdistetty automaattisesti yksittäisten artistien julkaisujen sääntöön."

-#: picard/config_upgrade.py:72
+#: picard/config_upgrade.py:71
 msgid ""
 "The separate file naming scheme for various artists albums has been removed in this version of Picard.\n"
 "You currently do not use this option, but have a separate file naming scheme defined.\n"
 "Do you want to remove it or merge it with your file naming scheme for single artist albums?"
 msgstr "Erillistä tiedostojen nimeämissääntöä useiden artistien julkaisuille ei ole enää Picardin tässä versiossa.\nTämä sääntö ei ole juuri nyt käytössä, mutta se on määritelty.\nPoistetaanko se, vai yhdistetäänkö yksittäisten artistien julkaisujen sääntöön?"

-#: picard/config_upgrade.py:78
+#: picard/config_upgrade.py:77
 msgid "Merge"
 msgstr "Yhdistä"

-#: picard/config_upgrade.py:78 picard/ui/metadatabox.py:314
+#: picard/config_upgrade.py:77 picard/ui/metadatabox.py:314
 #: picard/ui/options/interface.py:75 picard/ui/ui_options_interface.py:141
 msgid "Remove"
 msgstr "Poista"

-#: picard/config_upgrade.py:193 picard/ui/options/scripting.py:28
+#: picard/config_upgrade.py:200 picard/ui/options/scripting.py:28
 #, python-format
 msgid "My script %d"
 msgstr ""

-#: picard/file.py:541
+#: picard/file.py:565
 #, python-format
 msgid "No matching tracks for file '%(filename)s'"
 msgstr "Tiedostolle '%(filename)s' ei löytynyt vastaavia kappaleita"

-#: picard/file.py:557
+#: picard/file.py:581
 #, python-format
 msgid "No matching tracks above the threshold for file '%(filename)s'"
 msgstr "Tiedostolle '%(filename)s' ei löytynyt vastaavia kappaleita kynnysarvon yläpuolella"

-#: picard/file.py:564
+#: picard/file.py:588
 #, python-format
 msgid "File '%(filename)s' identified!"
 msgstr "Tiedosto '%(filename)s' tunnistettu!"

-#: picard/file.py:584
+#: picard/file.py:608
 #, python-format
 msgid "Looking up the metadata for file %(filename)s ..."
 msgstr "Haetaan metatietoja tiedostolle %(filename)s ..."
@@ -209,23 +209,23 @@ msgstr "[ei viivakoodia]"
 msgid "[no release info]"
 msgstr "[ei julkaisutietoja]"

-#: picard/tagger.py:405 picard/tagger.py:438
+#: picard/tagger.py:407 picard/tagger.py:440
 #, python-format
 msgid "Adding %(count)d file from '%(directory)s' ..."
 msgid_plural "Adding %(count)d files from '%(directory)s' ..."
 msgstr[0] "Lisätään %(count)d tiedosto hakemistosta '%(directory)s' ..."
 msgstr[1] "Lisätään %(count)d tiedostoa hakemistosta '%(directory)s' ..."

-#: picard/tagger.py:597
+#: picard/tagger.py:599
 #, python-format
 msgid "Removing album %(id)s: %(artist)s - %(album)s"
 msgstr "Poistetaan julkaisu %(id)s: %(artist)s - %(album)s"

-#: picard/tagger.py:613
+#: picard/tagger.py:615
 msgid "CD Lookup Error"
 msgstr "Virhe CD-haussa"

-#: picard/tagger.py:614
+#: picard/tagger.py:616
 #, python-format
 msgid ""
 "Error while reading CD:\n"
@@ -273,6 +273,10 @@ msgstr "Ranska"
 msgid "Italian"
 msgstr "Italia"

+#: picard/const/languages.py:57
+msgid "Norwegian Bokmal"
+msgstr ""
+
 #: picard/const/languages.py:59
 msgid "Dutch"
 msgstr "Hollanti"
@@ -336,12 +340,12 @@ msgstr ""
 msgid "Whitelist"
 msgstr ""

-#: picard/ui/cdlookup.py:35 picard/ui/mainwindow.py:625 picard/util/tags.py:21
+#: picard/ui/cdlookup.py:35 picard/ui/mainwindow.py:626 picard/util/tags.py:21
 msgid "Album"
 msgstr "Julkaisu"

-#: picard/ui/cdlookup.py:35 picard/ui/itemviews.py:96
-#: picard/ui/mainwindow.py:626 picard/ui/searchdialog.py:326
+#: picard/ui/cdlookup.py:35 picard/ui/itemviews.py:105
+#: picard/ui/mainwindow.py:627 picard/ui/searchdialog.py:326
 #: picard/ui/searchdialog.py:513 picard/util/tags.py:22
 msgid "Artist"
 msgstr "Artisti"
@@ -375,10 +379,22 @@ msgid_plural "%s (%i releases)"
 msgstr[0] "%s (%i julkaisu)"
 msgstr[1] "%s (%i julkaisua)"

-#: picard/ui/coverartbox.py:143
+#: picard/ui/coverartbox.py:141
 msgid "View release on MusicBrainz"
 msgstr "Näytä julkaisu MusicBrainzin verkkosivuilla"

+#: picard/ui/coverartbox.py:174
+msgid "Show more details"
+msgstr ""
+
+#: picard/ui/coverartbox.py:199
+msgid "New Cover Art"
+msgstr ""
+
+#: picard/ui/coverartbox.py:200
+msgid "Original Cover Art"
+msgstr ""
+
 #: picard/ui/filebrowser.py:40
 msgid "&Move Tagged Files Here"
 msgstr "&Siirrä tiedostot tallennettaessa tähän hakemistoon"
@@ -507,116 +523,116 @@ msgstr "Odottavat tiedostot"
 msgid "Pending requests"
 msgstr "Odottavat pyynnöt"

-#: picard/ui/itemviews.py:94 picard/util/tags.py:23
+#: picard/ui/itemviews.py:103 picard/util/tags.py:23
 msgid "Title"
 msgstr "Nimi"

-#: picard/ui/itemviews.py:95 picard/ui/searchdialog.py:325
+#: picard/ui/itemviews.py:104 picard/ui/searchdialog.py:325
 #: picard/util/tags.py:87
 msgid "Length"
 msgstr "Kesto"

-#: picard/ui/itemviews.py:162
+#: picard/ui/itemviews.py:171
 msgid "Bad match"
 msgstr ""

-#: picard/ui/itemviews.py:163
+#: picard/ui/itemviews.py:172
 msgid "Poor match"
 msgstr ""

-#: picard/ui/itemviews.py:164
+#: picard/ui/itemviews.py:173
 msgid "Ok match"
 msgstr ""

-#: picard/ui/itemviews.py:165
+#: picard/ui/itemviews.py:174
 msgid "Good match"
 msgstr ""

-#: picard/ui/itemviews.py:166
+#: picard/ui/itemviews.py:175
 msgid "Great match"
 msgstr ""

-#: picard/ui/itemviews.py:167
+#: picard/ui/itemviews.py:176
 msgid "Excellent match"
 msgstr ""

-#: picard/ui/itemviews.py:243
+#: picard/ui/itemviews.py:252
 msgid "&Expand all"
 msgstr "&Laajenna kaikki"

-#: picard/ui/itemviews.py:245
+#: picard/ui/itemviews.py:254
 msgid "&Collapse all"
 msgstr "&Kokoa kaikki"

-#: picard/ui/itemviews.py:247
+#: picard/ui/itemviews.py:256
 msgid "Select &all"
 msgstr ""

-#: picard/ui/itemviews.py:249
+#: picard/ui/itemviews.py:258
 msgid "Ctrl+A"
 msgstr ""

-#: picard/ui/itemviews.py:315
+#: picard/ui/itemviews.py:324
 msgid "&Other versions"
 msgstr "&Muut versiot"

-#: picard/ui/itemviews.py:318
+#: picard/ui/itemviews.py:327
 msgid "Loading..."
 msgstr "Ladataan…"

-#: picard/ui/itemviews.py:383
+#: picard/ui/itemviews.py:392
 msgid "Collections"
 msgstr "Kokoelmat"

-#: picard/ui/itemviews.py:386
+#: picard/ui/itemviews.py:395
 msgid "P&lugins"
 msgstr "L&iitännäiset"

-#: picard/ui/itemviews.py:557
+#: picard/ui/itemviews.py:577
 msgid "file view"
 msgstr "tiedostonäkymä"

-#: picard/ui/itemviews.py:558
+#: picard/ui/itemviews.py:578
 msgid "Contains unmatched files and clusters"
 msgstr "Sisältää täsmäämättömiä tiedostoja sekä ryhmiä"

-#: picard/ui/itemviews.py:578
+#: picard/ui/itemviews.py:598
 msgid "Clusters"
 msgstr "Ryhmät"

-#: picard/ui/itemviews.py:587
+#: picard/ui/itemviews.py:607
 msgid "album view"
 msgstr "julkaisunäkymä"

-#: picard/ui/itemviews.py:588
+#: picard/ui/itemviews.py:608
 msgid "Contains albums and matched files"
 msgstr "Sisältää julkaisuja ja täsmääviä tiedostoja"

-#: picard/ui/itemviews.py:694 picard/ui/options/renaming.py:188
+#: picard/ui/itemviews.py:714 picard/ui/options/renaming.py:188
 msgid "Error"
 msgstr "Virhe"

-#: picard/ui/itemviews.py:698
+#: picard/ui/itemviews.py:718
 msgid "Album modified and complete"
 msgstr ""

-#: picard/ui/itemviews.py:701
+#: picard/ui/itemviews.py:721
 msgid "Album unchanged and complete"
 msgstr ""

-#: picard/ui/itemviews.py:705
+#: picard/ui/itemviews.py:725
 msgid "Album modified"
 msgstr ""

-#: picard/ui/itemviews.py:708
+#: picard/ui/itemviews.py:728
 msgid "Album unchanged"
 msgstr ""

-#: picard/ui/itemviews.py:811
+#: picard/ui/itemviews.py:831
 msgid "Track saved"
 msgstr ""

-#: picard/ui/itemviews.py:813 picard/ui/itemviews.py:817
+#: picard/ui/itemviews.py:833 picard/ui/itemviews.py:837
 msgid "Pending"
 msgstr ""

@@ -807,7 +823,7 @@ msgstr "Ctrl+B"
 msgid "&Cover Art"
 msgstr "&Kansikuva"

-#: picard/ui/mainwindow.py:407 picard/ui/mainwindow.py:619
+#: picard/ui/mainwindow.py:407 picard/ui/mainwindow.py:620
 #: picard/ui/searchdialog.py:71
 msgid "Search"
 msgstr "Hae"
@@ -834,175 +850,179 @@ msgid ""
 "even if they have no metadata"
 msgstr ""

-#: picard/ui/mainwindow.py:421
+#: picard/ui/mainwindow.py:420
+msgid "Identify the file using its AcoustID audio fingerprint"
+msgstr ""
+
+#: picard/ui/mainwindow.py:422
 msgid "Ctrl+Y"
 msgstr "Ctrl+Y"

-#: picard/ui/mainwindow.py:424
+#: picard/ui/mainwindow.py:425
 msgid "Cl&uster"
 msgstr "&Ryhmitä"

-#: picard/ui/mainwindow.py:425
+#: picard/ui/mainwindow.py:426
 msgid "Cluster files into album clusters"
 msgstr ""

-#: picard/ui/mainwindow.py:428
+#: picard/ui/mainwindow.py:429
 msgid "Ctrl+U"
 msgstr "Ctrl+U"

-#: picard/ui/mainwindow.py:431
+#: picard/ui/mainwindow.py:432
 msgid "&Lookup"
 msgstr "&Hae"

-#: picard/ui/mainwindow.py:432
+#: picard/ui/mainwindow.py:433
 msgid "Lookup selected items in MusicBrainz"
 msgstr "Etsi valittua kohdetta MusicBrainzista"

-#: picard/ui/mainwindow.py:437
+#: picard/ui/mainwindow.py:438
 msgid "Ctrl+L"
 msgstr "Ctrl+L"

-#: picard/ui/mainwindow.py:440
+#: picard/ui/mainwindow.py:441
 msgid "&Info..."
 msgstr "T&iedot..."

-#: picard/ui/mainwindow.py:443
+#: picard/ui/mainwindow.py:444
 msgid "Ctrl+I"
 msgstr "Ctrl+I"

-#: picard/ui/mainwindow.py:446
+#: picard/ui/mainwindow.py:447
 msgid "&Refresh"
 msgstr "P&äivitä"

-#: picard/ui/mainwindow.py:447
+#: picard/ui/mainwindow.py:448
 msgid "Ctrl+R"
 msgstr "Ctrl+R"

-#: picard/ui/mainwindow.py:450
+#: picard/ui/mainwindow.py:451
 msgid "&Rename Files"
 msgstr "&Nimeä tiedostot"

-#: picard/ui/mainwindow.py:455
+#: picard/ui/mainwindow.py:456
 msgid "&Move Files"
 msgstr "&Siirrä tiedostot"

-#: picard/ui/mainwindow.py:460
+#: picard/ui/mainwindow.py:461
 msgid "Save &Tags"
 msgstr "&Tallenna tunnisteet"

-#: picard/ui/mainwindow.py:465
+#: picard/ui/mainwindow.py:466
 msgid "Tags From &File Names..."
 msgstr "&Luo tunnisteet tiedostonimistä..."

-#: picard/ui/mainwindow.py:469
+#: picard/ui/mainwindow.py:470
 msgid "&Open My Collections in Browser"
 msgstr "&Avaa kokoelmani selaimeen"

-#: picard/ui/mainwindow.py:473
+#: picard/ui/mainwindow.py:474
 msgid "View Error/Debug &Log"
 msgstr "&Näytä virhe/testi-loki"

-#: picard/ui/mainwindow.py:476
+#: picard/ui/mainwindow.py:477
 msgid "View Activity &History"
 msgstr "&Näytä aktiviteettihistoria"

-#: picard/ui/mainwindow.py:483
+#: picard/ui/mainwindow.py:484
 msgid "Open in &Player"
 msgstr ""

-#: picard/ui/mainwindow.py:484
+#: picard/ui/mainwindow.py:485
 msgid "Play the file in your default media player"
 msgstr "Toista tiedosto oletussoittimellasi"

-#: picard/ui/mainwindow.py:488
+#: picard/ui/mainwindow.py:489
 msgid "Open Containing &Folder"
 msgstr "&Avaa tiedoston kansio"

-#: picard/ui/mainwindow.py:489
+#: picard/ui/mainwindow.py:490
 msgid "Open the containing folder in your file explorer"
 msgstr "Avaa tiedoston kansio tiedostojen selaimessa"

-#: picard/ui/mainwindow.py:518
+#: picard/ui/mainwindow.py:519
 msgid "&File"
 msgstr "&Tiedosto"

-#: picard/ui/mainwindow.py:529
+#: picard/ui/mainwindow.py:530
 msgid "&Edit"
 msgstr "&Muokkaa"

-#: picard/ui/mainwindow.py:535
+#: picard/ui/mainwindow.py:536
 msgid "&View"
 msgstr "&Näytä"

-#: picard/ui/mainwindow.py:541
+#: picard/ui/mainwindow.py:542
 msgid "&Options"
 msgstr "&Asetukset"

-#: picard/ui/mainwindow.py:547
+#: picard/ui/mainwindow.py:548
 msgid "&Tools"
 msgstr "Ty&ökalut"

-#: picard/ui/mainwindow.py:558 picard/ui/util.py:35
+#: picard/ui/mainwindow.py:559 picard/ui/util.py:35
 msgid "&Help"
 msgstr "&Ohje"

-#: picard/ui/mainwindow.py:586
+#: picard/ui/mainwindow.py:587
 msgid "Actions"
 msgstr "Toiminnot"

-#: picard/ui/mainwindow.py:627
+#: picard/ui/mainwindow.py:628
 msgid "Track"
 msgstr "Kappale"

-#: picard/ui/mainwindow.py:703
+#: picard/ui/mainwindow.py:704
 msgid "All Supported Formats"
 msgstr "Kaikki tuetut tiedostomuodot"

-#: picard/ui/mainwindow.py:730
+#: picard/ui/mainwindow.py:731
 #, python-format
 msgid "Adding multiple directories from '%(directory)s' ..."
 msgstr "Lisätään useita hakemistoja hakemistosta '%(directory)s' ..."

-#: picard/ui/mainwindow.py:735
+#: picard/ui/mainwindow.py:736
 #, python-format
 msgid "Adding directory: '%(directory)s' ..."
 msgstr "Lisätään hakemisto: '%(directory)s' ..."

-#: picard/ui/mainwindow.py:801
+#: picard/ui/mainwindow.py:809
 msgid "Configuration Required"
 msgstr "Asetukset puuttuvat"

-#: picard/ui/mainwindow.py:802
+#: picard/ui/mainwindow.py:810
 msgid ""
 "Audio fingerprinting is not yet configured. Would you like to configure it "
 "now?"
 msgstr "Äänitunnistamisen asetuksia ei ole vielä määritetty. Määritetäänkö asetukset nyt?"

-#: picard/ui/mainwindow.py:902
+#: picard/ui/mainwindow.py:916
 #, python-format
 msgid "%(filename)s (error: %(error)s)"
 msgstr "%(filename)s (virhe: %(error)s)"

-#: picard/ui/mainwindow.py:908
+#: picard/ui/mainwindow.py:922
 #, python-format
 msgid "%(filename)s"
 msgstr "%(filename)s"

-#: picard/ui/mainwindow.py:918
+#: picard/ui/mainwindow.py:933
 #, python-format
 msgid "%(filename)s (%(similarity)d%%) (error: %(error)s)"
 msgstr "%(filename)s (%(similarity)d%%) (virhe: %(error)s)"

-#: picard/ui/mainwindow.py:925
+#: picard/ui/mainwindow.py:940
 #, python-format
 msgid "%(filename)s (%(similarity)d%%)"
 msgstr "%(filename)s (%(similarity)d%%)"

-#: picard/ui/mainwindow.py:961
+#: picard/ui/mainwindow.py:976
 msgid "Authentication Required"
 msgstr "Tunnistautuminen vaaditaan"

-#: picard/ui/mainwindow.py:962
+#: picard/ui/mainwindow.py:977
 msgid ""
 "Picard needs authorization to access your personal data on the MusicBrainz "
 "server. Would you like to log in now?"
@@ -1111,7 +1131,7 @@ msgstr ""
 msgid "Retry"
 msgstr ""

-#: picard/ui/searchdialog.py:288
+#: picard/ui/searchdialog.py:283
 #, python-format
 msgid ""
 "<strong>Following error occurred while fetching "
@@ -1915,19 +1935,19 @@ msgstr ""
 msgid "Reset all settings for current option page"
 msgstr ""

-#: picard/ui/options/dialog.py:166
+#: picard/ui/options/dialog.py:172
 msgid "You are about to reset your options for this page."
 msgstr ""

-#: picard/ui/options/dialog.py:170
+#: picard/ui/options/dialog.py:176
 msgid "Warning! This will reset all of your settings."
 msgstr ""

-#: picard/ui/options/dialog.py:177
+#: picard/ui/options/dialog.py:183
 msgid "Confirm Reset"
 msgstr ""

-#: picard/ui/options/dialog.py:178
+#: picard/ui/options/dialog.py:184
 msgid "Are you sure?"
 msgstr ""

@@ -2098,7 +2118,7 @@ msgstr "Oletusasetukset"
 msgid "File Naming"
 msgstr "Nimeämisasetukset"

-#: picard/ui/options/renaming.py:175 picard/ui/options/scripting.py:406
+#: picard/ui/options/renaming.py:175 picard/ui/options/scripting.py:410
 msgid ""
 "<a href=\"%(picard-doc-scripting-url)s\">Open Scripting Documentation in "
 "your browser</a>"
@@ -2140,15 +2160,15 @@ msgstr ""
 msgid "Scripting"
 msgstr "Komentosarjat"

-#: picard/ui/options/scripting.py:292
+#: picard/ui/options/scripting.py:293
 msgid "Are you sure you want to remove this script?"
 msgstr ""

-#: picard/ui/options/scripting.py:293
+#: picard/ui/options/scripting.py:294
 msgid "Confirm Remove"
 msgstr ""

-#: picard/ui/options/scripting.py:376
+#: picard/ui/options/scripting.py:377
 msgid "Script Error"
 msgstr "Virhe komentosarjassa"

--- a/po/fr.po
+++ b/po/fr.po
--- a/po/gl.po
+++ b/po/gl.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: MusicBrainz\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2017-01-18 12:51+0100\n"
-"PO-Revision-Date: 2017-01-19 09:17+0000\n"
+"POT-Creation-Date: 2017-03-05 09:58+0100\n"
+"PO-Revision-Date: 2017-03-05 10:00+0000\n"
 "Last-Translator: nikki\n"
 "Language-Team: Galician (http://www.transifex.com/musicbrainz/musicbrainz/language/gl/)\n"
 "MIME-Version: 1.0\n"
@@ -56,26 +56,26 @@ msgstr ""
 msgid "Unmatched Files"
 msgstr "Ficheiros sen coincidencias"

-#: picard/album.py:206
+#: picard/album.py:200
 #, python-format
 msgid "[could not load album %s]"
 msgstr "[non foi posíbel cargar o álbum %s]"

-#: picard/album.py:295
+#: picard/album.py:289
 #, python-format
 msgid "Album %(id)s loaded: %(artist)s - %(album)s"
 msgstr ""

-#: picard/album.py:338
+#: picard/album.py:332
 #, python-format
 msgid "Loading album %(id)s ..."
 msgstr ""

-#: picard/album.py:342
+#: picard/album.py:336
 msgid "[loading album information]"
 msgstr "[cargando a información do álbum]"

-#: picard/album.py:527
+#: picard/album.py:523
 #, python-format
 msgid "; %i image"
 msgid_plural "; %i images"
@@ -97,72 +97,72 @@ msgstr ""
 msgid "Looking up the metadata for cluster %(album)s..."
 msgstr ""

-#: picard/collection.py:64
+#: picard/collection.py:67
 #, python-format
 msgid "Added %(count)i release to collection \"%(name)s\""
 msgid_plural "Added %(count)i releases to collection \"%(name)s\""
 msgstr[0] ""
 msgstr[1] ""

-#: picard/collection.py:86
+#: picard/collection.py:89
 #, python-format
 msgid "Removed %(count)i release from collection \"%(name)s\""
 msgid_plural "Removed %(count)i releases from collection \"%(name)s\""
 msgstr[0] ""
 msgstr[1] ""

-#: picard/collection.py:100
+#: picard/collection.py:104
 #, python-format
 msgid "Error loading collections: %(error)s"
 msgstr ""

-#: picard/config_upgrade.py:58 picard/config_upgrade.py:71
+#: picard/config_upgrade.py:57 picard/config_upgrade.py:70
 msgid "Various Artists file naming scheme removal"
 msgstr ""

-#: picard/config_upgrade.py:59
+#: picard/config_upgrade.py:58
 msgid ""
 "The separate file naming scheme for various artists albums has been removed in this version of Picard.\n"
 "Your file naming scheme has automatically been merged with that of single artist albums."
 msgstr ""

-#: picard/config_upgrade.py:72
+#: picard/config_upgrade.py:71
 msgid ""
 "The separate file naming scheme for various artists albums has been removed in this version of Picard.\n"
 "You currently do not use this option, but have a separate file naming scheme defined.\n"
 "Do you want to remove it or merge it with your file naming scheme for single artist albums?"
 msgstr ""

-#: picard/config_upgrade.py:78
+#: picard/config_upgrade.py:77
 msgid "Merge"
 msgstr ""

-#: picard/config_upgrade.py:78 picard/ui/metadatabox.py:314
+#: picard/config_upgrade.py:77 picard/ui/metadatabox.py:314
 #: picard/ui/options/interface.py:75 picard/ui/ui_options_interface.py:141
 msgid "Remove"
 msgstr ""

-#: picard/config_upgrade.py:193 picard/ui/options/scripting.py:28
+#: picard/config_upgrade.py:200 picard/ui/options/scripting.py:28
 #, python-format
 msgid "My script %d"
 msgstr ""

-#: picard/file.py:541
+#: picard/file.py:565
 #, python-format
 msgid "No matching tracks for file '%(filename)s'"
 msgstr ""

-#: picard/file.py:557
+#: picard/file.py:581
 #, python-format
 msgid "No matching tracks above the threshold for file '%(filename)s'"
 msgstr ""

-#: picard/file.py:564
+#: picard/file.py:588
 #, python-format
 msgid "File '%(filename)s' identified!"
 msgstr ""

-#: picard/file.py:584
+#: picard/file.py:608
 #, python-format
 msgid "Looking up the metadata for file %(filename)s ..."
 msgstr ""
@@ -205,23 +205,23 @@ msgstr ""
 msgid "[no release info]"
 msgstr ""

-#: picard/tagger.py:405 picard/tagger.py:438
+#: picard/tagger.py:407 picard/tagger.py:440
 #, python-format
 msgid "Adding %(count)d file from '%(directory)s' ..."
 msgid_plural "Adding %(count)d files from '%(directory)s' ..."
 msgstr[0] ""
 msgstr[1] ""

-#: picard/tagger.py:597
+#: picard/tagger.py:599
 #, python-format
 msgid "Removing album %(id)s: %(artist)s - %(album)s"
 msgstr ""

-#: picard/tagger.py:613
+#: picard/tagger.py:615
 msgid "CD Lookup Error"
 msgstr "Produciuse un erro na busca do CD"

-#: picard/tagger.py:614
+#: picard/tagger.py:616
 #, python-format
 msgid ""
 "Error while reading CD:\n"
@@ -269,6 +269,10 @@ msgstr "Francés"
 msgid "Italian"
 msgstr "Italiano"

+#: picard/const/languages.py:57
+msgid "Norwegian Bokmal"
+msgstr ""
+
 #: picard/const/languages.py:59
 msgid "Dutch"
 msgstr "Neerlandés"
@@ -332,12 +336,12 @@ msgstr ""
 msgid "Whitelist"
 msgstr ""

-#: picard/ui/cdlookup.py:35 picard/ui/mainwindow.py:625 picard/util/tags.py:21
+#: picard/ui/cdlookup.py:35 picard/ui/mainwindow.py:626 picard/util/tags.py:21
 msgid "Album"
 msgstr "Álbum"

-#: picard/ui/cdlookup.py:35 picard/ui/itemviews.py:96
-#: picard/ui/mainwindow.py:626 picard/ui/searchdialog.py:326
+#: picard/ui/cdlookup.py:35 picard/ui/itemviews.py:105
+#: picard/ui/mainwindow.py:627 picard/ui/searchdialog.py:326
 #: picard/ui/searchdialog.py:513 picard/util/tags.py:22
 msgid "Artist"
 msgstr "Artista"
@@ -371,10 +375,22 @@ msgid_plural "%s (%i releases)"
 msgstr[0] ""
 msgstr[1] ""

-#: picard/ui/coverartbox.py:143
+#: picard/ui/coverartbox.py:141
 msgid "View release on MusicBrainz"
 msgstr ""

+#: picard/ui/coverartbox.py:174
+msgid "Show more details"
+msgstr ""
+
+#: picard/ui/coverartbox.py:199
+msgid "New Cover Art"
+msgstr ""
+
+#: picard/ui/coverartbox.py:200
+msgid "Original Cover Art"
+msgstr ""
+
 #: picard/ui/filebrowser.py:40
 msgid "&Move Tagged Files Here"
 msgstr "&Mover os ficheiros etiquetados aquí"
@@ -503,116 +519,116 @@ msgstr ""
 msgid "Pending requests"
 msgstr ""

-#: picard/ui/itemviews.py:94 picard/util/tags.py:23
+#: picard/ui/itemviews.py:103 picard/util/tags.py:23
 msgid "Title"
 msgstr "Título"

-#: picard/ui/itemviews.py:95 picard/ui/searchdialog.py:325
+#: picard/ui/itemviews.py:104 picard/ui/searchdialog.py:325
 #: picard/util/tags.py:87
 msgid "Length"
 msgstr "Duración"

-#: picard/ui/itemviews.py:162
+#: picard/ui/itemviews.py:171
 msgid "Bad match"
 msgstr ""

-#: picard/ui/itemviews.py:163
+#: picard/ui/itemviews.py:172
 msgid "Poor match"
 msgstr ""

-#: picard/ui/itemviews.py:164
+#: picard/ui/itemviews.py:173
 msgid "Ok match"
 msgstr ""

-#: picard/ui/itemviews.py:165
+#: picard/ui/itemviews.py:174
 msgid "Good match"
 msgstr ""

-#: picard/ui/itemviews.py:166
+#: picard/ui/itemviews.py:175
 msgid "Great match"
 msgstr ""

-#: picard/ui/itemviews.py:167
+#: picard/ui/itemviews.py:176
 msgid "Excellent match"
 msgstr ""

-#: picard/ui/itemviews.py:243
+#: picard/ui/itemviews.py:252
 msgid "&Expand all"
 msgstr "&Expandir todos"

-#: picard/ui/itemviews.py:245
+#: picard/ui/itemviews.py:254
 msgid "&Collapse all"
 msgstr "&Contraer todos"

-#: picard/ui/itemviews.py:247
+#: picard/ui/itemviews.py:256
 msgid "Select &all"
 msgstr ""

-#: picard/ui/itemviews.py:249
+#: picard/ui/itemviews.py:258
 msgid "Ctrl+A"
 msgstr ""

-#: picard/ui/itemviews.py:315
+#: picard/ui/itemviews.py:324
 msgid "&Other versions"
 msgstr ""

-#: picard/ui/itemviews.py:318
+#: picard/ui/itemviews.py:327
 msgid "Loading..."
 msgstr ""

-#: picard/ui/itemviews.py:383
+#: picard/ui/itemviews.py:392
 msgid "Collections"
 msgstr ""

-#: picard/ui/itemviews.py:386
+#: picard/ui/itemviews.py:395
 msgid "P&lugins"
 msgstr ""

-#: picard/ui/itemviews.py:557
+#: picard/ui/itemviews.py:577
 msgid "file view"
 msgstr ""

-#: picard/ui/itemviews.py:558
+#: picard/ui/itemviews.py:578
 msgid "Contains unmatched files and clusters"
 msgstr ""

-#: picard/ui/itemviews.py:578
+#: picard/ui/itemviews.py:598
 msgid "Clusters"
 msgstr "Clústers"

-#: picard/ui/itemviews.py:587
+#: picard/ui/itemviews.py:607
 msgid "album view"
 msgstr ""

-#: picard/ui/itemviews.py:588
+#: picard/ui/itemviews.py:608
 msgid "Contains albums and matched files"
 msgstr ""

-#: picard/ui/itemviews.py:694 picard/ui/options/renaming.py:188
+#: picard/ui/itemviews.py:714 picard/ui/options/renaming.py:188
 msgid "Error"
 msgstr "Erro"

-#: picard/ui/itemviews.py:698
+#: picard/ui/itemviews.py:718
 msgid "Album modified and complete"
 msgstr ""

-#: picard/ui/itemviews.py:701
+#: picard/ui/itemviews.py:721
 msgid "Album unchanged and complete"
 msgstr ""

-#: picard/ui/itemviews.py:705
+#: picard/ui/itemviews.py:725
 msgid "Album modified"
 msgstr ""

-#: picard/ui/itemviews.py:708
+#: picard/ui/itemviews.py:728
 msgid "Album unchanged"
 msgstr ""

-#: picard/ui/itemviews.py:811
+#: picard/ui/itemviews.py:831
 msgid "Track saved"
 msgstr ""

-#: picard/ui/itemviews.py:813 picard/ui/itemviews.py:817
+#: picard/ui/itemviews.py:833 picard/ui/itemviews.py:837
 msgid "Pending"
 msgstr ""

@@ -803,7 +819,7 @@ msgstr "Ctrl+B"
 msgid "&Cover Art"
 msgstr "&Imaxe da portada"

-#: picard/ui/mainwindow.py:407 picard/ui/mainwindow.py:619
+#: picard/ui/mainwindow.py:407 picard/ui/mainwindow.py:620
 #: picard/ui/searchdialog.py:71
 msgid "Search"
 msgstr "Buscar"
@@ -830,175 +846,179 @@ msgid ""
 "even if they have no metadata"
 msgstr ""

-#: picard/ui/mainwindow.py:421
+#: picard/ui/mainwindow.py:420
+msgid "Identify the file using its AcoustID audio fingerprint"
+msgstr ""
+
+#: picard/ui/mainwindow.py:422
 msgid "Ctrl+Y"
 msgstr "Ctrl+Y"

-#: picard/ui/mainwindow.py:424
+#: picard/ui/mainwindow.py:425
 msgid "Cl&uster"
 msgstr "Cl&uster"

-#: picard/ui/mainwindow.py:425
+#: picard/ui/mainwindow.py:426
 msgid "Cluster files into album clusters"
 msgstr ""

-#: picard/ui/mainwindow.py:428
+#: picard/ui/mainwindow.py:429
 msgid "Ctrl+U"
 msgstr "Ctrl+U"

-#: picard/ui/mainwindow.py:431
+#: picard/ui/mainwindow.py:432
 msgid "&Lookup"
 msgstr "&Buscar"

-#: picard/ui/mainwindow.py:432
+#: picard/ui/mainwindow.py:433
 msgid "Lookup selected items in MusicBrainz"
 msgstr ""

-#: picard/ui/mainwindow.py:437
+#: picard/ui/mainwindow.py:438
 msgid "Ctrl+L"
 msgstr "Ctrl+B"

-#: picard/ui/mainwindow.py:440
+#: picard/ui/mainwindow.py:441
 msgid "&Info..."
 msgstr ""

-#: picard/ui/mainwindow.py:443
+#: picard/ui/mainwindow.py:444
 msgid "Ctrl+I"
 msgstr ""

-#: picard/ui/mainwindow.py:446
+#: picard/ui/mainwindow.py:447
 msgid "&Refresh"
 msgstr "Actualiza&r"

-#: picard/ui/mainwindow.py:447
+#: picard/ui/mainwindow.py:448
 msgid "Ctrl+R"
 msgstr ""

-#: picard/ui/mainwindow.py:450
+#: picard/ui/mainwindow.py:451
 msgid "&Rename Files"
 msgstr "&Renomear ficheiros"

-#: picard/ui/mainwindow.py:455
+#: picard/ui/mainwindow.py:456
 msgid "&Move Files"
 msgstr "&Mover ficheiros"

-#: picard/ui/mainwindow.py:460
+#: picard/ui/mainwindow.py:461
 msgid "Save &Tags"
 msgstr "Gardar e&tiquetas"

-#: picard/ui/mainwindow.py:465
+#: picard/ui/mainwindow.py:466
 msgid "Tags From &File Names..."
 msgstr "Etiquetas a partir de nomes de &ficheiro"

-#: picard/ui/mainwindow.py:469
+#: picard/ui/mainwindow.py:470
 msgid "&Open My Collections in Browser"
 msgstr ""

-#: picard/ui/mainwindow.py:473
+#: picard/ui/mainwindow.py:474
 msgid "View Error/Debug &Log"
 msgstr ""

-#: picard/ui/mainwindow.py:476
+#: picard/ui/mainwindow.py:477
 msgid "View Activity &History"
 msgstr ""

-#: picard/ui/mainwindow.py:483
+#: picard/ui/mainwindow.py:484
 msgid "Open in &Player"
 msgstr ""

-#: picard/ui/mainwindow.py:484
+#: picard/ui/mainwindow.py:485
 msgid "Play the file in your default media player"
 msgstr ""

-#: picard/ui/mainwindow.py:488
+#: picard/ui/mainwindow.py:489
 msgid "Open Containing &Folder"
 msgstr ""

-#: picard/ui/mainwindow.py:489
+#: picard/ui/mainwindow.py:490
 msgid "Open the containing folder in your file explorer"
 msgstr ""

-#: picard/ui/mainwindow.py:518
+#: picard/ui/mainwindow.py:519
 msgid "&File"
 msgstr "&Ficheiro"

-#: picard/ui/mainwindow.py:529
+#: picard/ui/mainwindow.py:530
 msgid "&Edit"
 msgstr "&Editar"

-#: picard/ui/mainwindow.py:535
+#: picard/ui/mainwindow.py:536
 msgid "&View"
 msgstr "&Ver"

-#: picard/ui/mainwindow.py:541
+#: picard/ui/mainwindow.py:542
 msgid "&Options"
 msgstr "&Opcións"

-#: picard/ui/mainwindow.py:547
+#: picard/ui/mainwindow.py:548
 msgid "&Tools"
 msgstr "Ferramen&tas"

-#: picard/ui/mainwindow.py:558 picard/ui/util.py:35
+#: picard/ui/mainwindow.py:559 picard/ui/util.py:35
 msgid "&Help"
 msgstr "&Axuda"

-#: picard/ui/mainwindow.py:586
+#: picard/ui/mainwindow.py:587
 msgid "Actions"
 msgstr ""

-#: picard/ui/mainwindow.py:627
+#: picard/ui/mainwindow.py:628
 msgid "Track"
 msgstr "Pista"

-#: picard/ui/mainwindow.py:703
+#: picard/ui/mainwindow.py:704
 msgid "All Supported Formats"
 msgstr "Todos os formatos compatíbeis"

-#: picard/ui/mainwindow.py:730
+#: picard/ui/mainwindow.py:731
 #, python-format
 msgid "Adding multiple directories from '%(directory)s' ..."
 msgstr ""

-#: picard/ui/mainwindow.py:735
+#: picard/ui/mainwindow.py:736
 #, python-format
 msgid "Adding directory: '%(directory)s' ..."
 msgstr ""

-#: picard/ui/mainwindow.py:801
+#: picard/ui/mainwindow.py:809
 msgid "Configuration Required"
 msgstr ""

-#: picard/ui/mainwindow.py:802
+#: picard/ui/mainwindow.py:810
 msgid ""
 "Audio fingerprinting is not yet configured. Would you like to configure it "
 "now?"
 msgstr ""

-#: picard/ui/mainwindow.py:902
+#: picard/ui/mainwindow.py:916
 #, python-format
 msgid "%(filename)s (error: %(error)s)"
 msgstr ""

-#: picard/ui/mainwindow.py:908
+#: picard/ui/mainwindow.py:922
 #, python-format
 msgid "%(filename)s"
 msgstr ""

-#: picard/ui/mainwindow.py:918
+#: picard/ui/mainwindow.py:933
 #, python-format
 msgid "%(filename)s (%(similarity)d%%) (error: %(error)s)"
 msgstr ""

-#: picard/ui/mainwindow.py:925
+#: picard/ui/mainwindow.py:940
 #, python-format
 msgid "%(filename)s (%(similarity)d%%)"
 msgstr ""

-#: picard/ui/mainwindow.py:961
+#: picard/ui/mainwindow.py:976
 msgid "Authentication Required"
 msgstr ""

-#: picard/ui/mainwindow.py:962
+#: picard/ui/mainwindow.py:977
 msgid ""
 "Picard needs authorization to access your personal data on the MusicBrainz "
 "server. Would you like to log in now?"
@@ -1107,7 +1127,7 @@ msgstr ""
 msgid "Retry"
 msgstr ""

-#: picard/ui/searchdialog.py:288
+#: picard/ui/searchdialog.py:283
 #, python-format
 msgid ""
 "<strong>Following error occurred while fetching "
@@ -1911,19 +1931,19 @@ msgstr ""
 msgid "Reset all settings for current option page"
 msgstr ""

-#: picard/ui/options/dialog.py:166
+#: picard/ui/options/dialog.py:172
 msgid "You are about to reset your options for this page."
 msgstr ""

-#: picard/ui/options/dialog.py:170
+#: picard/ui/options/dialog.py:176
 msgid "Warning! This will reset all of your settings."
 msgstr ""

-#: picard/ui/options/dialog.py:177
+#: picard/ui/options/dialog.py:183
 msgid "Confirm Reset"
 msgstr ""

-#: picard/ui/options/dialog.py:178
+#: picard/ui/options/dialog.py:184
 msgid "Are you sure?"
 msgstr ""

@@ -2094,7 +2114,7 @@ msgstr ""
 msgid "File Naming"
 msgstr ""

-#: picard/ui/options/renaming.py:175 picard/ui/options/scripting.py:406
+#: picard/ui/options/renaming.py:175 picard/ui/options/scripting.py:410
 msgid ""
 "<a href=\"%(picard-doc-scripting-url)s\">Open Scripting Documentation in "
 "your browser</a>"
@@ -2136,15 +2156,15 @@ msgstr ""
 msgid "Scripting"
 msgstr "Scripting"

-#: picard/ui/options/scripting.py:292
+#: picard/ui/options/scripting.py:293
 msgid "Are you sure you want to remove this script?"
 msgstr ""

-#: picard/ui/options/scripting.py:293
+#: picard/ui/options/scripting.py:294
 msgid "Confirm Remove"
 msgstr ""

-#: picard/ui/options/scripting.py:376
+#: picard/ui/options/scripting.py:377
 msgid "Script Error"
 msgstr "Produciuse un erro no script"

--- a/po/he.po
+++ b/po/he.po
@@ -10,8 +10,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: MusicBrainz\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2017-01-18 12:51+0100\n"
-"PO-Revision-Date: 2017-01-19 09:17+0000\n"
+"POT-Creation-Date: 2017-03-05 09:58+0100\n"
+"PO-Revision-Date: 2017-03-05 10:00+0000\n"
 "Last-Translator: nikki\n"
 "Language-Team: Hebrew (http://www.transifex.com/musicbrainz/musicbrainz/language/he/)\n"
 "MIME-Version: 1.0\n"
@@ -58,26 +58,26 @@ msgstr ""
 msgid "Unmatched Files"
 msgstr "קבצים לא תואמים"

-#: picard/album.py:206
+#: picard/album.py:200
 #, python-format
 msgid "[could not load album %s]"
 msgstr "[לא ניתן לטעון את האלבום %s]"

-#: picard/album.py:295
+#: picard/album.py:289
 #, python-format
 msgid "Album %(id)s loaded: %(artist)s - %(album)s"
 msgstr ""

-#: picard/album.py:338
+#: picard/album.py:332
 #, python-format
 msgid "Loading album %(id)s ..."
 msgstr "טוען אלבום '%(id)s' ..."

-#: picard/album.py:342
+#: picard/album.py:336
 msgid "[loading album information]"
 msgstr "[טוען את נתוני האלבום]"

-#: picard/album.py:527
+#: picard/album.py:523
 #, python-format
 msgid "; %i image"
 msgid_plural "; %i images"
@@ -99,72 +99,72 @@ msgstr ""
 msgid "Looking up the metadata for cluster %(album)s..."
 msgstr ""

-#: picard/collection.py:64
+#: picard/collection.py:67
 #, python-format
 msgid "Added %(count)i release to collection \"%(name)s\""
 msgid_plural "Added %(count)i releases to collection \"%(name)s\""
 msgstr[0] ""
 msgstr[1] ""

-#: picard/collection.py:86
+#: picard/collection.py:89
 #, python-format
 msgid "Removed %(count)i release from collection \"%(name)s\""
 msgid_plural "Removed %(count)i releases from collection \"%(name)s\""
 msgstr[0] ""
 msgstr[1] ""

-#: picard/collection.py:100
+#: picard/collection.py:104
 #, python-format
 msgid "Error loading collections: %(error)s"
 msgstr ""

-#: picard/config_upgrade.py:58 picard/config_upgrade.py:71
+#: picard/config_upgrade.py:57 picard/config_upgrade.py:70
 msgid "Various Artists file naming scheme removal"
 msgstr ""

-#: picard/config_upgrade.py:59
+#: picard/config_upgrade.py:58
 msgid ""
 "The separate file naming scheme for various artists albums has been removed in this version of Picard.\n"
 "Your file naming scheme has automatically been merged with that of single artist albums."
 msgstr ""

-#: picard/config_upgrade.py:72
+#: picard/config_upgrade.py:71
 msgid ""
 "The separate file naming scheme for various artists albums has been removed in this version of Picard.\n"
 "You currently do not use this option, but have a separate file naming scheme defined.\n"
 "Do you want to remove it or merge it with your file naming scheme for single artist albums?"
 msgstr ""

-#: picard/config_upgrade.py:78
+#: picard/config_upgrade.py:77
 msgid "Merge"
 msgstr ""

-#: picard/config_upgrade.py:78 picard/ui/metadatabox.py:314
+#: picard/config_upgrade.py:77 picard/ui/metadatabox.py:314
 #: picard/ui/options/interface.py:75 picard/ui/ui_options_interface.py:141
 msgid "Remove"
 msgstr "הסר"

-#: picard/config_upgrade.py:193 picard/ui/options/scripting.py:28
+#: picard/config_upgrade.py:200 picard/ui/options/scripting.py:28
 #, python-format
 msgid "My script %d"
 msgstr ""

-#: picard/file.py:541
+#: picard/file.py:565
 #, python-format
 msgid "No matching tracks for file '%(filename)s'"
 msgstr ""

-#: picard/file.py:557
+#: picard/file.py:581
 #, python-format
 msgid "No matching tracks above the threshold for file '%(filename)s'"
 msgstr ""

-#: picard/file.py:564
+#: picard/file.py:588
 #, python-format
 msgid "File '%(filename)s' identified!"
 msgstr ""

-#: picard/file.py:584
+#: picard/file.py:608
 #, python-format
 msgid "Looking up the metadata for file %(filename)s ..."
 msgstr ""
@@ -207,23 +207,23 @@ msgstr ""
 msgid "[no release info]"
 msgstr ""

-#: picard/tagger.py:405 picard/tagger.py:438
+#: picard/tagger.py:407 picard/tagger.py:440
 #, python-format
 msgid "Adding %(count)d file from '%(directory)s' ..."
 msgid_plural "Adding %(count)d files from '%(directory)s' ..."
 msgstr[0] ""
 msgstr[1] ""

-#: picard/tagger.py:597
+#: picard/tagger.py:599
 #, python-format
 msgid "Removing album %(id)s: %(artist)s - %(album)s"
 msgstr ""

-#: picard/tagger.py:613
+#: picard/tagger.py:615
 msgid "CD Lookup Error"
 msgstr "שגיאת חיפוש תקליטור"

-#: picard/tagger.py:614
+#: picard/tagger.py:616
 #, python-format
 msgid ""
 "Error while reading CD:\n"
@@ -271,6 +271,10 @@ msgstr "צרפתית"
 msgid "Italian"
 msgstr "איטלקית"

+#: picard/const/languages.py:57
+msgid "Norwegian Bokmal"
+msgstr ""
+
 #: picard/const/languages.py:59
 msgid "Dutch"
 msgstr "הולנדית"
@@ -334,12 +338,12 @@ msgstr ""
 msgid "Whitelist"
 msgstr ""

-#: picard/ui/cdlookup.py:35 picard/ui/mainwindow.py:625 picard/util/tags.py:21
+#: picard/ui/cdlookup.py:35 picard/ui/mainwindow.py:626 picard/util/tags.py:21
 msgid "Album"
 msgstr "אלבום"

-#: picard/ui/cdlookup.py:35 picard/ui/itemviews.py:96
-#: picard/ui/mainwindow.py:626 picard/ui/searchdialog.py:326
+#: picard/ui/cdlookup.py:35 picard/ui/itemviews.py:105
+#: picard/ui/mainwindow.py:627 picard/ui/searchdialog.py:326
 #: picard/ui/searchdialog.py:513 picard/util/tags.py:22
 msgid "Artist"
 msgstr "אמן"
@@ -373,10 +377,22 @@ msgid_plural "%s (%i releases)"
 msgstr[0] ""
 msgstr[1] ""

-#: picard/ui/coverartbox.py:143
+#: picard/ui/coverartbox.py:141
 msgid "View release on MusicBrainz"
 msgstr ""

+#: picard/ui/coverartbox.py:174
+msgid "Show more details"
+msgstr ""
+
+#: picard/ui/coverartbox.py:199
+msgid "New Cover Art"
+msgstr ""
+
+#: picard/ui/coverartbox.py:200
+msgid "Original Cover Art"
+msgstr ""
+
 #: picard/ui/filebrowser.py:40
 msgid "&Move Tagged Files Here"
 msgstr "&העבר קבצים מתוייגים לכאן"
@@ -505,116 +521,116 @@ msgstr "קבצים ממתינים"
 msgid "Pending requests"
 msgstr "בקשות ממתינות"

-#: picard/ui/itemviews.py:94 picard/util/tags.py:23
+#: picard/ui/itemviews.py:103 picard/util/tags.py:23
 msgid "Title"
 msgstr "כותרת"

-#: picard/ui/itemviews.py:95 picard/ui/searchdialog.py:325
+#: picard/ui/itemviews.py:104 picard/ui/searchdialog.py:325
 #: picard/util/tags.py:87
 msgid "Length"
 msgstr "משך"

-#: picard/ui/itemviews.py:162
+#: picard/ui/itemviews.py:171
 msgid "Bad match"
 msgstr ""

-#: picard/ui/itemviews.py:163
+#: picard/ui/itemviews.py:172
 msgid "Poor match"
 msgstr ""

-#: picard/ui/itemviews.py:164
+#: picard/ui/itemviews.py:173
 msgid "Ok match"
 msgstr ""

-#: picard/ui/itemviews.py:165
+#: picard/ui/itemviews.py:174
 msgid "Good match"
 msgstr ""

-#: picard/ui/itemviews.py:166
+#: picard/ui/itemviews.py:175
 msgid "Great match"
 msgstr ""

-#: picard/ui/itemviews.py:167
+#: picard/ui/itemviews.py:176
 msgid "Excellent match"
 msgstr ""

-#: picard/ui/itemviews.py:243
+#: picard/ui/itemviews.py:252
 msgid "&Expand all"
 msgstr "&הרחב הכל"

-#: picard/ui/itemviews.py:245
+#: picard/ui/itemviews.py:254
 msgid "&Collapse all"
 msgstr "&מזער הכל"

-#: picard/ui/itemviews.py:247
+#: picard/ui/itemviews.py:256
 msgid "Select &all"
 msgstr ""

-#: picard/ui/itemviews.py:249
+#: picard/ui/itemviews.py:258
 msgid "Ctrl+A"
 msgstr ""

-#: picard/ui/itemviews.py:315
+#: picard/ui/itemviews.py:324
 msgid "&Other versions"
 msgstr "גירסאות אחרות&"

-#: picard/ui/itemviews.py:318
+#: picard/ui/itemviews.py:327
 msgid "Loading..."
 msgstr "טוען"

-#: picard/ui/itemviews.py:383
+#: picard/ui/itemviews.py:392
 msgid "Collections"
 msgstr ""

-#: picard/ui/itemviews.py:386
+#: picard/ui/itemviews.py:395
 msgid "P&lugins"
 msgstr ""

-#: picard/ui/itemviews.py:557
+#: picard/ui/itemviews.py:577
 msgid "file view"
 msgstr ""

-#: picard/ui/itemviews.py:558
+#: picard/ui/itemviews.py:578
 msgid "Contains unmatched files and clusters"
 msgstr ""

-#: picard/ui/itemviews.py:578
+#: picard/ui/itemviews.py:598
 msgid "Clusters"
 msgstr "אשכולות"

-#: picard/ui/itemviews.py:587
+#: picard/ui/itemviews.py:607
 msgid "album view"
 msgstr ""

-#: picard/ui/itemviews.py:588
+#: picard/ui/itemviews.py:608
 msgid "Contains albums and matched files"
 msgstr ""

-#: picard/ui/itemviews.py:694 picard/ui/options/renaming.py:188
+#: picard/ui/itemviews.py:714 picard/ui/options/renaming.py:188
 msgid "Error"
 msgstr "שגיאה"

-#: picard/ui/itemviews.py:698
+#: picard/ui/itemviews.py:718
 msgid "Album modified and complete"
 msgstr ""

-#: picard/ui/itemviews.py:701
+#: picard/ui/itemviews.py:721
 msgid "Album unchanged and complete"
 msgstr ""

-#: picard/ui/itemviews.py:705
+#: picard/ui/itemviews.py:725
 msgid "Album modified"
 msgstr ""

-#: picard/ui/itemviews.py:708
+#: picard/ui/itemviews.py:728
 msgid "Album unchanged"
 msgstr ""

-#: picard/ui/itemviews.py:811
+#: picard/ui/itemviews.py:831
 msgid "Track saved"
 msgstr ""

-#: picard/ui/itemviews.py:813 picard/ui/itemviews.py:817
+#: picard/ui/itemviews.py:833 picard/ui/itemviews.py:837
 msgid "Pending"
 msgstr ""

@@ -805,7 +821,7 @@ msgstr "Ctrl+B"
 msgid "&Cover Art"
 msgstr "אומנות ה&עטיפה"

-#: picard/ui/mainwindow.py:407 picard/ui/mainwindow.py:619
+#: picard/ui/mainwindow.py:407 picard/ui/mainwindow.py:620
 #: picard/ui/searchdialog.py:71
 msgid "Search"
 msgstr "חיפוש"
@@ -832,175 +848,179 @@ msgid ""
 "even if they have no metadata"
 msgstr ""

-#: picard/ui/mainwindow.py:421
+#: picard/ui/mainwindow.py:420
+msgid "Identify the file using its AcoustID audio fingerprint"
+msgstr ""
+
+#: picard/ui/mainwindow.py:422
 msgid "Ctrl+Y"
 msgstr "Ctrl+Y"

-#: picard/ui/mainwindow.py:424
+#: picard/ui/mainwindow.py:425
 msgid "Cl&uster"
 msgstr "א&שכול"

-#: picard/ui/mainwindow.py:425
+#: picard/ui/mainwindow.py:426
 msgid "Cluster files into album clusters"
 msgstr ""

-#: picard/ui/mainwindow.py:428
+#: picard/ui/mainwindow.py:429
 msgid "Ctrl+U"
 msgstr "Ctrl+U"

-#: picard/ui/mainwindow.py:431
+#: picard/ui/mainwindow.py:432
 msgid "&Lookup"
 msgstr "&חיפוש"

-#: picard/ui/mainwindow.py:432
+#: picard/ui/mainwindow.py:433
 msgid "Lookup selected items in MusicBrainz"
 msgstr ""

-#: picard/ui/mainwindow.py:437
+#: picard/ui/mainwindow.py:438
 msgid "Ctrl+L"
 msgstr "Ctrl+L"

-#: picard/ui/mainwindow.py:440
+#: picard/ui/mainwindow.py:441
 msgid "&Info..."
 msgstr ""

-#: picard/ui/mainwindow.py:443
+#: picard/ui/mainwindow.py:444
 msgid "Ctrl+I"
 msgstr ""

-#: picard/ui/mainwindow.py:446
+#: picard/ui/mainwindow.py:447
 msgid "&Refresh"
 msgstr "רע&נן"

-#: picard/ui/mainwindow.py:447
+#: picard/ui/mainwindow.py:448
 msgid "Ctrl+R"
 msgstr ""

-#: picard/ui/mainwindow.py:450
+#: picard/ui/mainwindow.py:451
 msgid "&Rename Files"
 msgstr "&שנה את שמות הקבצים"

-#: picard/ui/mainwindow.py:455
+#: picard/ui/mainwindow.py:456
 msgid "&Move Files"
 msgstr "ה&עבר קבצים"

-#: picard/ui/mainwindow.py:460
+#: picard/ui/mainwindow.py:461
 msgid "Save &Tags"
 msgstr "שמור &תגיות"

-#: picard/ui/mainwindow.py:465
+#: picard/ui/mainwindow.py:466
 msgid "Tags From &File Names..."
 msgstr "תגיות מ&שמות הקבצים..."

-#: picard/ui/mainwindow.py:469
+#: picard/ui/mainwindow.py:470
 msgid "&Open My Collections in Browser"
 msgstr ""

-#: picard/ui/mainwindow.py:473
+#: picard/ui/mainwindow.py:474
 msgid "View Error/Debug &Log"
 msgstr ""

-#: picard/ui/mainwindow.py:476
+#: picard/ui/mainwindow.py:477
 msgid "View Activity &History"
 msgstr ""

-#: picard/ui/mainwindow.py:483
+#: picard/ui/mainwindow.py:484
 msgid "Open in &Player"
 msgstr ""

-#: picard/ui/mainwindow.py:484
+#: picard/ui/mainwindow.py:485
 msgid "Play the file in your default media player"
 msgstr ""

-#: picard/ui/mainwindow.py:488
+#: picard/ui/mainwindow.py:489
 msgid "Open Containing &Folder"
 msgstr ""

-#: picard/ui/mainwindow.py:489
+#: picard/ui/mainwindow.py:490
 msgid "Open the containing folder in your file explorer"
 msgstr ""

-#: picard/ui/mainwindow.py:518
+#: picard/ui/mainwindow.py:519
 msgid "&File"
 msgstr "&קובץ"

-#: picard/ui/mainwindow.py:529
+#: picard/ui/mainwindow.py:530
 msgid "&Edit"
 msgstr "ע&ריכה"

-#: picard/ui/mainwindow.py:535
+#: picard/ui/mainwindow.py:536
 msgid "&View"
 msgstr "&תצוגה"

-#: picard/ui/mainwindow.py:541
+#: picard/ui/mainwindow.py:542
 msgid "&Options"
 msgstr "&אפשרויות"

-#: picard/ui/mainwindow.py:547
+#: picard/ui/mainwindow.py:548
 msgid "&Tools"
 msgstr "&כלים"

-#: picard/ui/mainwindow.py:558 picard/ui/util.py:35
+#: picard/ui/mainwindow.py:559 picard/ui/util.py:35
 msgid "&Help"
 msgstr "&עזרה"

-#: picard/ui/mainwindow.py:586
+#: picard/ui/mainwindow.py:587
 msgid "Actions"
 msgstr ""

-#: picard/ui/mainwindow.py:627
+#: picard/ui/mainwindow.py:628
 msgid "Track"
 msgstr "רצועה"

-#: picard/ui/mainwindow.py:703
+#: picard/ui/mainwindow.py:704
 msgid "All Supported Formats"
 msgstr "כל סוגי הקבצים הנתמכים"

-#: picard/ui/mainwindow.py:730
+#: picard/ui/mainwindow.py:731
 #, python-format
 msgid "Adding multiple directories from '%(directory)s' ..."
 msgstr ""

-#: picard/ui/mainwindow.py:735
+#: picard/ui/mainwindow.py:736
 #, python-format
 msgid "Adding directory: '%(directory)s' ..."
 msgstr ""

-#: picard/ui/mainwindow.py:801
+#: picard/ui/mainwindow.py:809
 msgid "Configuration Required"
 msgstr ""

-#: picard/ui/mainwindow.py:802
+#: picard/ui/mainwindow.py:810
 msgid ""
 "Audio fingerprinting is not yet configured. Would you like to configure it "
 "now?"
 msgstr ""

-#: picard/ui/mainwindow.py:902
+#: picard/ui/mainwindow.py:916
 #, python-format
 msgid "%(filename)s (error: %(error)s)"
 msgstr ""

-#: picard/ui/mainwindow.py:908
+#: picard/ui/mainwindow.py:922
 #, python-format
 msgid "%(filename)s"
 msgstr ""

-#: picard/ui/mainwindow.py:918
+#: picard/ui/mainwindow.py:933
 #, python-format
 msgid "%(filename)s (%(similarity)d%%) (error: %(error)s)"
 msgstr ""

-#: picard/ui/mainwindow.py:925
+#: picard/ui/mainwindow.py:940
 #, python-format
 msgid "%(filename)s (%(similarity)d%%)"
 msgstr ""

-#: picard/ui/mainwindow.py:961
+#: picard/ui/mainwindow.py:976
 msgid "Authentication Required"
 msgstr ""

-#: picard/ui/mainwindow.py:962
+#: picard/ui/mainwindow.py:977
 msgid ""
 "Picard needs authorization to access your personal data on the MusicBrainz "
 "server. Would you like to log in now?"
@@ -1109,7 +1129,7 @@ msgstr ""
 msgid "Retry"
 msgstr ""

-#: picard/ui/searchdialog.py:288
+#: picard/ui/searchdialog.py:283
 #, python-format
 msgid ""
 "<strong>Following error occurred while fetching "
@@ -1913,19 +1933,19 @@ msgstr ""
 msgid "Reset all settings for current option page"
 msgstr ""

-#: picard/ui/options/dialog.py:166
+#: picard/ui/options/dialog.py:172
 msgid "You are about to reset your options for this page."
 msgstr ""

-#: picard/ui/options/dialog.py:170
+#: picard/ui/options/dialog.py:176
 msgid "Warning! This will reset all of your settings."
 msgstr ""

-#: picard/ui/options/dialog.py:177
+#: picard/ui/options/dialog.py:183
 msgid "Confirm Reset"
 msgstr ""

-#: picard/ui/options/dialog.py:178
+#: picard/ui/options/dialog.py:184
 msgid "Are you sure?"
 msgstr ""

@@ -2096,7 +2116,7 @@ msgstr "אפס הכל"
 msgid "File Naming"
 msgstr "קביעת שמות קבצים"

-#: picard/ui/options/renaming.py:175 picard/ui/options/scripting.py:406
+#: picard/ui/options/renaming.py:175 picard/ui/options/scripting.py:410
 msgid ""
 "<a href=\"%(picard-doc-scripting-url)s\">Open Scripting Documentation in "
 "your browser</a>"
@@ -2138,15 +2158,15 @@ msgstr ""
 msgid "Scripting"
 msgstr "יצירת סקריפט"

-#: picard/ui/options/scripting.py:292
+#: picard/ui/options/scripting.py:293
 msgid "Are you sure you want to remove this script?"
 msgstr ""

-#: picard/ui/options/scripting.py:293
+#: picard/ui/options/scripting.py:294
 msgid "Confirm Remove"
 msgstr ""

-#: picard/ui/options/scripting.py:376
+#: picard/ui/options/scripting.py:377
 msgid "Script Error"
 msgstr "שגיאת סקריפט"

--- a/po/hu.po
+++ b/po/hu.po
@@ -9,8 +9,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: MusicBrainz\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2017-01-18 12:51+0100\n"
-"PO-Revision-Date: 2017-01-19 09:17+0000\n"
+"POT-Creation-Date: 2017-03-05 09:58+0100\n"
+"PO-Revision-Date: 2017-03-05 10:00+0000\n"
 "Last-Translator: nikki\n"
 "Language-Team: Hungarian (http://www.transifex.com/musicbrainz/musicbrainz/language/hu/)\n"
 "MIME-Version: 1.0\n"
@@ -57,26 +57,26 @@ msgstr ""
 msgid "Unmatched Files"
 msgstr "Nem egyező fájlok"

-#: picard/album.py:206
+#: picard/album.py:200
 #, python-format
 msgid "[could not load album %s]"
 msgstr "[nem tölthető be %s album]"

-#: picard/album.py:295
+#: picard/album.py:289
 #, python-format
 msgid "Album %(id)s loaded: %(artist)s - %(album)s"
 msgstr ""

-#: picard/album.py:338
+#: picard/album.py:332
 #, python-format
 msgid "Loading album %(id)s ..."
 msgstr ""

-#: picard/album.py:342
+#: picard/album.py:336
 msgid "[loading album information]"
 msgstr "[albuminformáció betöltése]"

-#: picard/album.py:527
+#: picard/album.py:523
 #, python-format
 msgid "; %i image"
 msgid_plural "; %i images"
@@ -98,72 +98,72 @@ msgstr ""
 msgid "Looking up the metadata for cluster %(album)s..."
 msgstr ""

-#: picard/collection.py:64
+#: picard/collection.py:67
 #, python-format
 msgid "Added %(count)i release to collection \"%(name)s\""
 msgid_plural "Added %(count)i releases to collection \"%(name)s\""
 msgstr[0] ""
 msgstr[1] ""

-#: picard/collection.py:86
+#: picard/collection.py:89
 #, python-format
 msgid "Removed %(count)i release from collection \"%(name)s\""
 msgid_plural "Removed %(count)i releases from collection \"%(name)s\""
 msgstr[0] ""
 msgstr[1] ""

-#: picard/collection.py:100
+#: picard/collection.py:104
 #, python-format
 msgid "Error loading collections: %(error)s"
 msgstr ""

-#: picard/config_upgrade.py:58 picard/config_upgrade.py:71
+#: picard/config_upgrade.py:57 picard/config_upgrade.py:70
 msgid "Various Artists file naming scheme removal"
 msgstr ""

-#: picard/config_upgrade.py:59
+#: picard/config_upgrade.py:58
 msgid ""
 "The separate file naming scheme for various artists albums has been removed in this version of Picard.\n"
 "Your file naming scheme has automatically been merged with that of single artist albums."
 msgstr ""

-#: picard/config_upgrade.py:72
+#: picard/config_upgrade.py:71
 msgid ""
 "The separate file naming scheme for various artists albums has been removed in this version of Picard.\n"
 "You currently do not use this option, but have a separate file naming scheme defined.\n"
 "Do you want to remove it or merge it with your file naming scheme for single artist albums?"
 msgstr ""

-#: picard/config_upgrade.py:78
+#: picard/config_upgrade.py:77
 msgid "Merge"
 msgstr ""

-#: picard/config_upgrade.py:78 picard/ui/metadatabox.py:314
+#: picard/config_upgrade.py:77 picard/ui/metadatabox.py:314
 #: picard/ui/options/interface.py:75 picard/ui/ui_options_interface.py:141
 msgid "Remove"
 msgstr ""

-#: picard/config_upgrade.py:193 picard/ui/options/scripting.py:28
+#: picard/config_upgrade.py:200 picard/ui/options/scripting.py:28
 #, python-format
 msgid "My script %d"
 msgstr ""

-#: picard/file.py:541
+#: picard/file.py:565
 #, python-format
 msgid "No matching tracks for file '%(filename)s'"
 msgstr ""

-#: picard/file.py:557
+#: picard/file.py:581
 #, python-format
 msgid "No matching tracks above the threshold for file '%(filename)s'"
 msgstr ""

-#: picard/file.py:564
+#: picard/file.py:588
 #, python-format
 msgid "File '%(filename)s' identified!"
 msgstr ""

-#: picard/file.py:584
+#: picard/file.py:608
 #, python-format
 msgid "Looking up the metadata for file %(filename)s ..."
 msgstr ""
@@ -206,23 +206,23 @@ msgstr ""
 msgid "[no release info]"
 msgstr ""

-#: picard/tagger.py:405 picard/tagger.py:438
+#: picard/tagger.py:407 picard/tagger.py:440
 #, python-format
 msgid "Adding %(count)d file from '%(directory)s' ..."
 msgid_plural "Adding %(count)d files from '%(directory)s' ..."
 msgstr[0] ""
 msgstr[1] ""

-#: picard/tagger.py:597
+#: picard/tagger.py:599
 #, python-format
 msgid "Removing album %(id)s: %(artist)s - %(album)s"
 msgstr ""

-#: picard/tagger.py:613
+#: picard/tagger.py:615
 msgid "CD Lookup Error"
 msgstr "CD lekérdezési hiba"

-#: picard/tagger.py:614
+#: picard/tagger.py:616
 #, python-format
 msgid ""
 "Error while reading CD:\n"
@@ -270,6 +270,10 @@ msgstr "Francia"
 msgid "Italian"
 msgstr "Olasz"

+#: picard/const/languages.py:57
+msgid "Norwegian Bokmal"
+msgstr ""
+
 #: picard/const/languages.py:59
 msgid "Dutch"
 msgstr "Holland"
@@ -333,12 +337,12 @@ msgstr ""
 msgid "Whitelist"
 msgstr ""

-#: picard/ui/cdlookup.py:35 picard/ui/mainwindow.py:625 picard/util/tags.py:21
+#: picard/ui/cdlookup.py:35 picard/ui/mainwindow.py:626 picard/util/tags.py:21
 msgid "Album"
 msgstr "Album"

-#: picard/ui/cdlookup.py:35 picard/ui/itemviews.py:96
-#: picard/ui/mainwindow.py:626 picard/ui/searchdialog.py:326
+#: picard/ui/cdlookup.py:35 picard/ui/itemviews.py:105
+#: picard/ui/mainwindow.py:627 picard/ui/searchdialog.py:326
 #: picard/ui/searchdialog.py:513 picard/util/tags.py:22
 msgid "Artist"
 msgstr "Előadó"
@@ -372,10 +376,22 @@ msgid_plural "%s (%i releases)"
 msgstr[0] ""
 msgstr[1] ""

-#: picard/ui/coverartbox.py:143
+#: picard/ui/coverartbox.py:141
 msgid "View release on MusicBrainz"
 msgstr ""

+#: picard/ui/coverartbox.py:174
+msgid "Show more details"
+msgstr ""
+
+#: picard/ui/coverartbox.py:199
+msgid "New Cover Art"
+msgstr ""
+
+#: picard/ui/coverartbox.py:200
+msgid "Original Cover Art"
+msgstr ""
+
 #: picard/ui/filebrowser.py:40
 msgid "&Move Tagged Files Here"
 msgstr "&Cimkézett fájlok mozgatása ide"
@@ -504,116 +520,116 @@ msgstr ""
 msgid "Pending requests"
 msgstr ""

-#: picard/ui/itemviews.py:94 picard/util/tags.py:23
+#: picard/ui/itemviews.py:103 picard/util/tags.py:23
 msgid "Title"
 msgstr "Cím"

-#: picard/ui/itemviews.py:95 picard/ui/searchdialog.py:325
+#: picard/ui/itemviews.py:104 picard/ui/searchdialog.py:325
 #: picard/util/tags.py:87
 msgid "Length"
 msgstr "Hossz"

-#: picard/ui/itemviews.py:162
+#: picard/ui/itemviews.py:171
 msgid "Bad match"
 msgstr ""

-#: picard/ui/itemviews.py:163
+#: picard/ui/itemviews.py:172
 msgid "Poor match"
 msgstr ""

-#: picard/ui/itemviews.py:164
+#: picard/ui/itemviews.py:173
 msgid "Ok match"
 msgstr ""

-#: picard/ui/itemviews.py:165
+#: picard/ui/itemviews.py:174
 msgid "Good match"
 msgstr ""

-#: picard/ui/itemviews.py:166
+#: picard/ui/itemviews.py:175
 msgid "Great match"
 msgstr ""

-#: picard/ui/itemviews.py:167
+#: picard/ui/itemviews.py:176
 msgid "Excellent match"
 msgstr ""

-#: picard/ui/itemviews.py:243
+#: picard/ui/itemviews.py:252
 msgid "&Expand all"
 msgstr "&Mindet kibont"

-#: picard/ui/itemviews.py:245
+#: picard/ui/itemviews.py:254
 msgid "&Collapse all"
 msgstr "&Mindet összecsukja"

-#: picard/ui/itemviews.py:247
+#: picard/ui/itemviews.py:256
 msgid "Select &all"
 msgstr ""

-#: picard/ui/itemviews.py:249
+#: picard/ui/itemviews.py:258
 msgid "Ctrl+A"
 msgstr ""

-#: picard/ui/itemviews.py:315
+#: picard/ui/itemviews.py:324
 msgid "&Other versions"
 msgstr ""

-#: picard/ui/itemviews.py:318
+#: picard/ui/itemviews.py:327
 msgid "Loading..."
 msgstr ""

-#: picard/ui/itemviews.py:383
+#: picard/ui/itemviews.py:392
 msgid "Collections"
 msgstr ""

-#: picard/ui/itemviews.py:386
+#: picard/ui/itemviews.py:395
 msgid "P&lugins"
 msgstr ""

-#: picard/ui/itemviews.py:557
+#: picard/ui/itemviews.py:577
 msgid "file view"
 msgstr ""

-#: picard/ui/itemviews.py:558
+#: picard/ui/itemviews.py:578
 msgid "Contains unmatched files and clusters"
 msgstr ""

-#: picard/ui/itemviews.py:578
+#: picard/ui/itemviews.py:598
 msgid "Clusters"
 msgstr "Csoportok"

-#: picard/ui/itemviews.py:587
+#: picard/ui/itemviews.py:607
 msgid "album view"
 msgstr ""

-#: picard/ui/itemviews.py:588
+#: picard/ui/itemviews.py:608
 msgid "Contains albums and matched files"
 msgstr ""

-#: picard/ui/itemviews.py:694 picard/ui/options/renaming.py:188
+#: picard/ui/itemviews.py:714 picard/ui/options/renaming.py:188
 msgid "Error"
 msgstr "Hiba"

-#: picard/ui/itemviews.py:698
+#: picard/ui/itemviews.py:718
 msgid "Album modified and complete"
 msgstr ""

-#: picard/ui/itemviews.py:701
+#: picard/ui/itemviews.py:721
 msgid "Album unchanged and complete"
 msgstr ""

-#: picard/ui/itemviews.py:705
+#: picard/ui/itemviews.py:725
 msgid "Album modified"
 msgstr ""

-#: picard/ui/itemviews.py:708
+#: picard/ui/itemviews.py:728
 msgid "Album unchanged"
 msgstr ""

-#: picard/ui/itemviews.py:811
+#: picard/ui/itemviews.py:831
 msgid "Track saved"
 msgstr ""

-#: picard/ui/itemviews.py:813 picard/ui/itemviews.py:817
+#: picard/ui/itemviews.py:833 picard/ui/itemviews.py:837
 msgid "Pending"
 msgstr ""

@@ -804,7 +820,7 @@ msgstr "Ctrl+B"
 msgid "&Cover Art"
 msgstr "&Borítókép"

-#: picard/ui/mainwindow.py:407 picard/ui/mainwindow.py:619
+#: picard/ui/mainwindow.py:407 picard/ui/mainwindow.py:620
 #: picard/ui/searchdialog.py:71
 msgid "Search"
 msgstr "Keresés"
@@ -831,175 +847,179 @@ msgid ""
 "even if they have no metadata"
 msgstr ""

-#: picard/ui/mainwindow.py:421
+#: picard/ui/mainwindow.py:420
+msgid "Identify the file using its AcoustID audio fingerprint"
+msgstr ""
+
+#: picard/ui/mainwindow.py:422
 msgid "Ctrl+Y"
 msgstr "Ctrl+Y"

-#: picard/ui/mainwindow.py:424
+#: picard/ui/mainwindow.py:425
 msgid "Cl&uster"
 msgstr "&Csoport"

-#: picard/ui/mainwindow.py:425
+#: picard/ui/mainwindow.py:426
 msgid "Cluster files into album clusters"
 msgstr ""

-#: picard/ui/mainwindow.py:428
+#: picard/ui/mainwindow.py:429
 msgid "Ctrl+U"
 msgstr "Ctrl+U"

-#: picard/ui/mainwindow.py:431
+#: picard/ui/mainwindow.py:432
 msgid "&Lookup"
 msgstr "&Lekérdezés"

-#: picard/ui/mainwindow.py:432
+#: picard/ui/mainwindow.py:433
 msgid "Lookup selected items in MusicBrainz"
 msgstr ""

-#: picard/ui/mainwindow.py:437
+#: picard/ui/mainwindow.py:438
 msgid "Ctrl+L"
 msgstr "Ctrl+L"

-#: picard/ui/mainwindow.py:440
+#: picard/ui/mainwindow.py:441
 msgid "&Info..."
 msgstr ""

-#: picard/ui/mainwindow.py:443
+#: picard/ui/mainwindow.py:444
 msgid "Ctrl+I"
 msgstr ""

-#: picard/ui/mainwindow.py:446
+#: picard/ui/mainwindow.py:447
 msgid "&Refresh"
 msgstr "&Frissítés"

-#: picard/ui/mainwindow.py:447
+#: picard/ui/mainwindow.py:448
 msgid "Ctrl+R"
 msgstr ""

-#: picard/ui/mainwindow.py:450
+#: picard/ui/mainwindow.py:451
 msgid "&Rename Files"
 msgstr "&Fájlok átnevezése"

-#: picard/ui/mainwindow.py:455
+#: picard/ui/mainwindow.py:456
 msgid "&Move Files"
 msgstr "&Fájlok mozgatása"

-#: picard/ui/mainwindow.py:460
+#: picard/ui/mainwindow.py:461
 msgid "Save &Tags"
 msgstr "&Cimkék mentése"

-#: picard/ui/mainwindow.py:465
+#: picard/ui/mainwindow.py:466
 msgid "Tags From &File Names..."
 msgstr ""

-#: picard/ui/mainwindow.py:469
+#: picard/ui/mainwindow.py:470
 msgid "&Open My Collections in Browser"
 msgstr ""

-#: picard/ui/mainwindow.py:473
+#: picard/ui/mainwindow.py:474
 msgid "View Error/Debug &Log"
 msgstr ""

-#: picard/ui/mainwindow.py:476
+#: picard/ui/mainwindow.py:477
 msgid "View Activity &History"
 msgstr ""

-#: picard/ui/mainwindow.py:483
+#: picard/ui/mainwindow.py:484
 msgid "Open in &Player"
 msgstr ""

-#: picard/ui/mainwindow.py:484
+#: picard/ui/mainwindow.py:485
 msgid "Play the file in your default media player"
 msgstr ""

-#: picard/ui/mainwindow.py:488
+#: picard/ui/mainwindow.py:489
 msgid "Open Containing &Folder"
 msgstr ""

-#: picard/ui/mainwindow.py:489
+#: picard/ui/mainwindow.py:490
 msgid "Open the containing folder in your file explorer"
 msgstr ""

-#: picard/ui/mainwindow.py:518
+#: picard/ui/mainwindow.py:519
 msgid "&File"
 msgstr "&Fájl"

-#: picard/ui/mainwindow.py:529
+#: picard/ui/mainwindow.py:530
 msgid "&Edit"
 msgstr "&Szerkesztés"

-#: picard/ui/mainwindow.py:535
+#: picard/ui/mainwindow.py:536
 msgid "&View"
 msgstr "&Nézet"

-#: picard/ui/mainwindow.py:541
+#: picard/ui/mainwindow.py:542
 msgid "&Options"
 msgstr "&Beállítások"

-#: picard/ui/mainwindow.py:547
+#: picard/ui/mainwindow.py:548
 msgid "&Tools"
 msgstr "&Eszközök"

-#: picard/ui/mainwindow.py:558 picard/ui/util.py:35
+#: picard/ui/mainwindow.py:559 picard/ui/util.py:35
 msgid "&Help"
 msgstr "Segítség"

-#: picard/ui/mainwindow.py:586
+#: picard/ui/mainwindow.py:587
 msgid "Actions"
 msgstr ""

-#: picard/ui/mainwindow.py:627
+#: picard/ui/mainwindow.py:628
 msgid "Track"
 msgstr "Szám"

-#: picard/ui/mainwindow.py:703
+#: picard/ui/mainwindow.py:704
 msgid "All Supported Formats"
 msgstr "Minden támogatott formátum"

-#: picard/ui/mainwindow.py:730
+#: picard/ui/mainwindow.py:731
 #, python-format
 msgid "Adding multiple directories from '%(directory)s' ..."
 msgstr ""

-#: picard/ui/mainwindow.py:735
+#: picard/ui/mainwindow.py:736
 #, python-format
 msgid "Adding directory: '%(directory)s' ..."
 msgstr ""

-#: picard/ui/mainwindow.py:801
+#: picard/ui/mainwindow.py:809
 msgid "Configuration Required"
 msgstr ""

-#: picard/ui/mainwindow.py:802
+#: picard/ui/mainwindow.py:810
 msgid ""
 "Audio fingerprinting is not yet configured. Would you like to configure it "
 "now?"
 msgstr ""

-#: picard/ui/mainwindow.py:902
+#: picard/ui/mainwindow.py:916
 #, python-format
 msgid "%(filename)s (error: %(error)s)"
 msgstr ""

-#: picard/ui/mainwindow.py:908
+#: picard/ui/mainwindow.py:922
 #, python-format
 msgid "%(filename)s"
 msgstr ""

-#: picard/ui/mainwindow.py:918
+#: picard/ui/mainwindow.py:933
 #, python-format
 msgid "%(filename)s (%(similarity)d%%) (error: %(error)s)"
 msgstr ""

-#: picard/ui/mainwindow.py:925
+#: picard/ui/mainwindow.py:940
 #, python-format
 msgid "%(filename)s (%(similarity)d%%)"
 msgstr ""

-#: picard/ui/mainwindow.py:961
+#: picard/ui/mainwindow.py:976
 msgid "Authentication Required"
 msgstr ""

-#: picard/ui/mainwindow.py:962
+#: picard/ui/mainwindow.py:977
 msgid ""
 "Picard needs authorization to access your personal data on the MusicBrainz "
 "server. Would you like to log in now?"
@@ -1108,7 +1128,7 @@ msgstr ""
 msgid "Retry"
 msgstr ""

-#: picard/ui/searchdialog.py:288
+#: picard/ui/searchdialog.py:283
 #, python-format
 msgid ""
 "<strong>Following error occurred while fetching "
@@ -1912,19 +1932,19 @@ msgstr ""
 msgid "Reset all settings for current option page"
 msgstr ""

-#: picard/ui/options/dialog.py:166
+#: picard/ui/options/dialog.py:172
 msgid "You are about to reset your options for this page."
 msgstr ""

-#: picard/ui/options/dialog.py:170
+#: picard/ui/options/dialog.py:176
 msgid "Warning! This will reset all of your settings."
 msgstr ""

-#: picard/ui/options/dialog.py:177
+#: picard/ui/options/dialog.py:183
 msgid "Confirm Reset"
 msgstr ""

-#: picard/ui/options/dialog.py:178
+#: picard/ui/options/dialog.py:184
 msgid "Are you sure?"
 msgstr ""

@@ -2095,7 +2115,7 @@ msgstr ""
 msgid "File Naming"
 msgstr ""

-#: picard/ui/options/renaming.py:175 picard/ui/options/scripting.py:406
+#: picard/ui/options/renaming.py:175 picard/ui/options/scripting.py:410
 msgid ""
 "<a href=\"%(picard-doc-scripting-url)s\">Open Scripting Documentation in "
 "your browser</a>"
@@ -2137,15 +2157,15 @@ msgstr ""
 msgid "Scripting"
 msgstr "Parancsfájlok"

-#: picard/ui/options/scripting.py:292
+#: picard/ui/options/scripting.py:293
 msgid "Are you sure you want to remove this script?"
 msgstr ""

-#: picard/ui/options/scripting.py:293
+#: picard/ui/options/scripting.py:294
 msgid "Confirm Remove"
 msgstr ""

-#: picard/ui/options/scripting.py:376
+#: picard/ui/options/scripting.py:377
 msgid "Script Error"
 msgstr "Huba a parancsfájlban"

--- a/po/id.po
+++ b/po/id.po
@@ -10,8 +10,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: MusicBrainz\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2017-01-18 12:51+0100\n"
-"PO-Revision-Date: 2017-01-19 09:17+0000\n"
+"POT-Creation-Date: 2017-03-05 09:58+0100\n"
+"PO-Revision-Date: 2017-03-05 10:00+0000\n"
 "Last-Translator: nikki\n"
 "Language-Team: Indonesian (http://www.transifex.com/musicbrainz/musicbrainz/language/id/)\n"
 "MIME-Version: 1.0\n"
@@ -58,26 +58,26 @@ msgstr ""
 msgid "Unmatched Files"
 msgstr "Berkas Tidak Cocok"

-#: picard/album.py:206
+#: picard/album.py:200
 #, python-format
 msgid "[could not load album %s]"
 msgstr "[tidak dapat memuat album %s]"

-#: picard/album.py:295
+#: picard/album.py:289
 #, python-format
 msgid "Album %(id)s loaded: %(artist)s - %(album)s"
 msgstr ""

-#: picard/album.py:338
+#: picard/album.py:332
 #, python-format
 msgid "Loading album %(id)s ..."
 msgstr ""

-#: picard/album.py:342
+#: picard/album.py:336
 msgid "[loading album information]"
 msgstr "[memuat informasi album]"

-#: picard/album.py:527
+#: picard/album.py:523
 #, python-format
 msgid "; %i image"
 msgid_plural "; %i images"
@@ -98,70 +98,70 @@ msgstr ""
 msgid "Looking up the metadata for cluster %(album)s..."
 msgstr ""

-#: picard/collection.py:64
+#: picard/collection.py:67
 #, python-format
 msgid "Added %(count)i release to collection \"%(name)s\""
 msgid_plural "Added %(count)i releases to collection \"%(name)s\""
 msgstr[0] ""

-#: picard/collection.py:86
+#: picard/collection.py:89
 #, python-format
 msgid "Removed %(count)i release from collection \"%(name)s\""
 msgid_plural "Removed %(count)i releases from collection \"%(name)s\""
 msgstr[0] ""

-#: picard/collection.py:100
+#: picard/collection.py:104
 #, python-format
 msgid "Error loading collections: %(error)s"
 msgstr ""

-#: picard/config_upgrade.py:58 picard/config_upgrade.py:71
+#: picard/config_upgrade.py:57 picard/config_upgrade.py:70
 msgid "Various Artists file naming scheme removal"
 msgstr ""

-#: picard/config_upgrade.py:59
+#: picard/config_upgrade.py:58
 msgid ""
 "The separate file naming scheme for various artists albums has been removed in this version of Picard.\n"
 "Your file naming scheme has automatically been merged with that of single artist albums."
 msgstr ""

-#: picard/config_upgrade.py:72
+#: picard/config_upgrade.py:71
 msgid ""
 "The separate file naming scheme for various artists albums has been removed in this version of Picard.\n"
 "You currently do not use this option, but have a separate file naming scheme defined.\n"
 "Do you want to remove it or merge it with your file naming scheme for single artist albums?"
 msgstr ""

-#: picard/config_upgrade.py:78
+#: picard/config_upgrade.py:77
 msgid "Merge"
 msgstr "Gabung"

-#: picard/config_upgrade.py:78 picard/ui/metadatabox.py:314
+#: picard/config_upgrade.py:77 picard/ui/metadatabox.py:314
 #: picard/ui/options/interface.py:75 picard/ui/ui_options_interface.py:141
 msgid "Remove"
 msgstr "Hilangkan"

-#: picard/config_upgrade.py:193 picard/ui/options/scripting.py:28
+#: picard/config_upgrade.py:200 picard/ui/options/scripting.py:28
 #, python-format
 msgid "My script %d"
 msgstr ""

-#: picard/file.py:541
+#: picard/file.py:565
 #, python-format
 msgid "No matching tracks for file '%(filename)s'"
 msgstr ""

-#: picard/file.py:557
+#: picard/file.py:581
 #, python-format
 msgid "No matching tracks above the threshold for file '%(filename)s'"
 msgstr ""

-#: picard/file.py:564
+#: picard/file.py:588
 #, python-format
 msgid "File '%(filename)s' identified!"
 msgstr ""

-#: picard/file.py:584
+#: picard/file.py:608
 #, python-format
 msgid "Looking up the metadata for file %(filename)s ..."
 msgstr ""
@@ -204,22 +204,22 @@ msgstr "[tidak ada barcode]"
 msgid "[no release info]"
 msgstr "[tidak ada release info]"

-#: picard/tagger.py:405 picard/tagger.py:438
+#: picard/tagger.py:407 picard/tagger.py:440
 #, python-format
 msgid "Adding %(count)d file from '%(directory)s' ..."
 msgid_plural "Adding %(count)d files from '%(directory)s' ..."
 msgstr[0] ""

-#: picard/tagger.py:597
+#: picard/tagger.py:599
 #, python-format
 msgid "Removing album %(id)s: %(artist)s - %(album)s"
 msgstr ""

-#: picard/tagger.py:613
+#: picard/tagger.py:615
 msgid "CD Lookup Error"
 msgstr ""

-#: picard/tagger.py:614
+#: picard/tagger.py:616
 #, python-format
 msgid ""
 "Error while reading CD:\n"
@@ -267,6 +267,10 @@ msgstr "Bahasa Prancis"
 msgid "Italian"
 msgstr "Bahasa Italia"

+#: picard/const/languages.py:57
+msgid "Norwegian Bokmal"
+msgstr ""
+
 #: picard/const/languages.py:59
 msgid "Dutch"
 msgstr "Bahasa Belanda"
@@ -330,12 +334,12 @@ msgstr ""
 msgid "Whitelist"
 msgstr ""

-#: picard/ui/cdlookup.py:35 picard/ui/mainwindow.py:625 picard/util/tags.py:21
+#: picard/ui/cdlookup.py:35 picard/ui/mainwindow.py:626 picard/util/tags.py:21
 msgid "Album"
 msgstr "Album"

-#: picard/ui/cdlookup.py:35 picard/ui/itemviews.py:96
-#: picard/ui/mainwindow.py:626 picard/ui/searchdialog.py:326
+#: picard/ui/cdlookup.py:35 picard/ui/itemviews.py:105
+#: picard/ui/mainwindow.py:627 picard/ui/searchdialog.py:326
 #: picard/ui/searchdialog.py:513 picard/util/tags.py:22
 msgid "Artist"
 msgstr "Artis"
@@ -368,10 +372,22 @@ msgid "%s (%i release)"
 msgid_plural "%s (%i releases)"
 msgstr[0] ""

-#: picard/ui/coverartbox.py:143
+#: picard/ui/coverartbox.py:141
 msgid "View release on MusicBrainz"
 msgstr ""

+#: picard/ui/coverartbox.py:174
+msgid "Show more details"
+msgstr ""
+
+#: picard/ui/coverartbox.py:199
+msgid "New Cover Art"
+msgstr ""
+
+#: picard/ui/coverartbox.py:200
+msgid "Original Cover Art"
+msgstr ""
+
 #: picard/ui/filebrowser.py:40
 msgid "&Move Tagged Files Here"
 msgstr ""
@@ -500,116 +516,116 @@ msgstr ""
 msgid "Pending requests"
 msgstr ""

-#: picard/ui/itemviews.py:94 picard/util/tags.py:23
+#: picard/ui/itemviews.py:103 picard/util/tags.py:23
 msgid "Title"
 msgstr "Judul"

-#: picard/ui/itemviews.py:95 picard/ui/searchdialog.py:325
+#: picard/ui/itemviews.py:104 picard/ui/searchdialog.py:325
 #: picard/util/tags.py:87
 msgid "Length"
 msgstr "Panjangnya"

-#: picard/ui/itemviews.py:162
+#: picard/ui/itemviews.py:171
 msgid "Bad match"
 msgstr ""

-#: picard/ui/itemviews.py:163
+#: picard/ui/itemviews.py:172
 msgid "Poor match"
 msgstr ""

-#: picard/ui/itemviews.py:164
+#: picard/ui/itemviews.py:173
 msgid "Ok match"
 msgstr ""

-#: picard/ui/itemviews.py:165
+#: picard/ui/itemviews.py:174
 msgid "Good match"
 msgstr ""

-#: picard/ui/itemviews.py:166
+#: picard/ui/itemviews.py:175
 msgid "Great match"
 msgstr ""

-#: picard/ui/itemviews.py:167
+#: picard/ui/itemviews.py:176
 msgid "Excellent match"
 msgstr ""

-#: picard/ui/itemviews.py:243
+#: picard/ui/itemviews.py:252
 msgid "&Expand all"
 msgstr "&Expand semua"

-#: picard/ui/itemviews.py:245
+#: picard/ui/itemviews.py:254
 msgid "&Collapse all"
 msgstr "&Collapse semua"

-#: picard/ui/itemviews.py:247
+#: picard/ui/itemviews.py:256
 msgid "Select &all"
 msgstr ""

-#: picard/ui/itemviews.py:249
+#: picard/ui/itemviews.py:258
 msgid "Ctrl+A"
 msgstr ""

-#: picard/ui/itemviews.py:315
+#: picard/ui/itemviews.py:324
 msgid "&Other versions"
 msgstr ""

-#: picard/ui/itemviews.py:318
+#: picard/ui/itemviews.py:327
 msgid "Loading..."
 msgstr ""

-#: picard/ui/itemviews.py:383
+#: picard/ui/itemviews.py:392
 msgid "Collections"
 msgstr ""

-#: picard/ui/itemviews.py:386
+#: picard/ui/itemviews.py:395
 msgid "P&lugins"
 msgstr ""

-#: picard/ui/itemviews.py:557
+#: picard/ui/itemviews.py:577
 msgid "file view"
 msgstr ""

-#: picard/ui/itemviews.py:558
+#: picard/ui/itemviews.py:578
 msgid "Contains unmatched files and clusters"
 msgstr ""

-#: picard/ui/itemviews.py:578
+#: picard/ui/itemviews.py:598
 msgid "Clusters"
 msgstr "Clusters"

-#: picard/ui/itemviews.py:587
+#: picard/ui/itemviews.py:607
 msgid "album view"
 msgstr ""

-#: picard/ui/itemviews.py:588
+#: picard/ui/itemviews.py:608
 msgid "Contains albums and matched files"
 msgstr ""

-#: picard/ui/itemviews.py:694 picard/ui/options/renaming.py:188
+#: picard/ui/itemviews.py:714 picard/ui/options/renaming.py:188
 msgid "Error"
 msgstr ""

-#: picard/ui/itemviews.py:698
+#: picard/ui/itemviews.py:718
 msgid "Album modified and complete"
 msgstr ""

-#: picard/ui/itemviews.py:701
+#: picard/ui/itemviews.py:721
 msgid "Album unchanged and complete"
 msgstr ""

-#: picard/ui/itemviews.py:705
+#: picard/ui/itemviews.py:725
 msgid "Album modified"
 msgstr ""

-#: picard/ui/itemviews.py:708
+#: picard/ui/itemviews.py:728
 msgid "Album unchanged"
 msgstr ""

-#: picard/ui/itemviews.py:811
+#: picard/ui/itemviews.py:831
 msgid "Track saved"
 msgstr ""

-#: picard/ui/itemviews.py:813 picard/ui/itemviews.py:817
+#: picard/ui/itemviews.py:833 picard/ui/itemviews.py:837
 msgid "Pending"
 msgstr ""

@@ -799,7 +815,7 @@ msgstr "Ctrl+B"
 msgid "&Cover Art"
 msgstr ""

-#: picard/ui/mainwindow.py:407 picard/ui/mainwindow.py:619
+#: picard/ui/mainwindow.py:407 picard/ui/mainwindow.py:620
 #: picard/ui/searchdialog.py:71
 msgid "Search"
 msgstr "Pencarian"
@@ -826,175 +842,179 @@ msgid ""
 "even if they have no metadata"
 msgstr ""

-#: picard/ui/mainwindow.py:421
+#: picard/ui/mainwindow.py:420
+msgid "Identify the file using its AcoustID audio fingerprint"
+msgstr ""
+
+#: picard/ui/mainwindow.py:422
 msgid "Ctrl+Y"
 msgstr ""

-#: picard/ui/mainwindow.py:424
+#: picard/ui/mainwindow.py:425
 msgid "Cl&uster"
 msgstr ""

-#: picard/ui/mainwindow.py:425
+#: picard/ui/mainwindow.py:426
 msgid "Cluster files into album clusters"
 msgstr ""

-#: picard/ui/mainwindow.py:428
+#: picard/ui/mainwindow.py:429
 msgid "Ctrl+U"
 msgstr "Ctrl+U"

-#: picard/ui/mainwindow.py:431
+#: picard/ui/mainwindow.py:432
 msgid "&Lookup"
 msgstr ""

-#: picard/ui/mainwindow.py:432
+#: picard/ui/mainwindow.py:433
 msgid "Lookup selected items in MusicBrainz"
 msgstr ""

-#: picard/ui/mainwindow.py:437
+#: picard/ui/mainwindow.py:438
 msgid "Ctrl+L"
 msgstr "Ctrl+L"

-#: picard/ui/mainwindow.py:440
+#: picard/ui/mainwindow.py:441
 msgid "&Info..."
 msgstr ""

-#: picard/ui/mainwindow.py:443
+#: picard/ui/mainwindow.py:444
 msgid "Ctrl+I"
 msgstr ""

-#: picard/ui/mainwindow.py:446
+#: picard/ui/mainwindow.py:447
 msgid "&Refresh"
 msgstr "&Refresh"

-#: picard/ui/mainwindow.py:447
+#: picard/ui/mainwindow.py:448
 msgid "Ctrl+R"
 msgstr ""

-#: picard/ui/mainwindow.py:450
+#: picard/ui/mainwindow.py:451
 msgid "&Rename Files"
 msgstr ""

-#: picard/ui/mainwindow.py:455
+#: picard/ui/mainwindow.py:456
 msgid "&Move Files"
 msgstr ""

-#: picard/ui/mainwindow.py:460
+#: picard/ui/mainwindow.py:461
 msgid "Save &Tags"
 msgstr ""

-#: picard/ui/mainwindow.py:465
+#: picard/ui/mainwindow.py:466
 msgid "Tags From &File Names..."
 msgstr ""

-#: picard/ui/mainwindow.py:469
+#: picard/ui/mainwindow.py:470
 msgid "&Open My Collections in Browser"
 msgstr ""

-#: picard/ui/mainwindow.py:473
+#: picard/ui/mainwindow.py:474
 msgid "View Error/Debug &Log"
 msgstr ""

-#: picard/ui/mainwindow.py:476
+#: picard/ui/mainwindow.py:477
 msgid "View Activity &History"
 msgstr ""

-#: picard/ui/mainwindow.py:483
+#: picard/ui/mainwindow.py:484
 msgid "Open in &Player"
 msgstr ""

-#: picard/ui/mainwindow.py:484
+#: picard/ui/mainwindow.py:485
 msgid "Play the file in your default media player"
 msgstr ""

-#: picard/ui/mainwindow.py:488
+#: picard/ui/mainwindow.py:489
 msgid "Open Containing &Folder"
 msgstr ""

-#: picard/ui/mainwindow.py:489
+#: picard/ui/mainwindow.py:490
 msgid "Open the containing folder in your file explorer"
 msgstr ""

-#: picard/ui/mainwindow.py:518
+#: picard/ui/mainwindow.py:519
 msgid "&File"
 msgstr ""

-#: picard/ui/mainwindow.py:529
+#: picard/ui/mainwindow.py:530
 msgid "&Edit"
 msgstr ""

-#: picard/ui/mainwindow.py:535
+#: picard/ui/mainwindow.py:536
 msgid "&View"
 msgstr ""

-#: picard/ui/mainwindow.py:541
+#: picard/ui/mainwindow.py:542
 msgid "&Options"
 msgstr ""

-#: picard/ui/mainwindow.py:547
+#: picard/ui/mainwindow.py:548
 msgid "&Tools"
 msgstr ""

-#: picard/ui/mainwindow.py:558 picard/ui/util.py:35
+#: picard/ui/mainwindow.py:559 picard/ui/util.py:35
 msgid "&Help"
 msgstr ""

-#: picard/ui/mainwindow.py:586
+#: picard/ui/mainwindow.py:587
 msgid "Actions"
 msgstr ""

-#: picard/ui/mainwindow.py:627
+#: picard/ui/mainwindow.py:628
 msgid "Track"
 msgstr "Trek"

-#: picard/ui/mainwindow.py:703
+#: picard/ui/mainwindow.py:704
 msgid "All Supported Formats"
 msgstr ""

-#: picard/ui/mainwindow.py:730
+#: picard/ui/mainwindow.py:731
 #, python-format
 msgid "Adding multiple directories from '%(directory)s' ..."
 msgstr ""

-#: picard/ui/mainwindow.py:735
+#: picard/ui/mainwindow.py:736
 #, python-format
 msgid "Adding directory: '%(directory)s' ..."
 msgstr ""

-#: picard/ui/mainwindow.py:801
+#: picard/ui/mainwindow.py:809
 msgid "Configuration Required"
 msgstr ""

-#: picard/ui/mainwindow.py:802
+#: picard/ui/mainwindow.py:810
 msgid ""
 "Audio fingerprinting is not yet configured. Would you like to configure it "
 "now?"
 msgstr ""

-#: picard/ui/mainwindow.py:902
+#: picard/ui/mainwindow.py:916
 #, python-format
 msgid "%(filename)s (error: %(error)s)"
 msgstr ""

-#: picard/ui/mainwindow.py:908
+#: picard/ui/mainwindow.py:922
 #, python-format
 msgid "%(filename)s"
 msgstr ""

-#: picard/ui/mainwindow.py:918
+#: picard/ui/mainwindow.py:933
 #, python-format
 msgid "%(filename)s (%(similarity)d%%) (error: %(error)s)"
 msgstr ""

-#: picard/ui/mainwindow.py:925
+#: picard/ui/mainwindow.py:940
 #, python-format
 msgid "%(filename)s (%(similarity)d%%)"
 msgstr ""

-#: picard/ui/mainwindow.py:961
+#: picard/ui/mainwindow.py:976
 msgid "Authentication Required"
 msgstr ""

-#: picard/ui/mainwindow.py:962
+#: picard/ui/mainwindow.py:977
 msgid ""
 "Picard needs authorization to access your personal data on the MusicBrainz "
 "server. Would you like to log in now?"
@@ -1100,7 +1120,7 @@ msgstr ""
 msgid "Retry"
 msgstr ""

-#: picard/ui/searchdialog.py:288
+#: picard/ui/searchdialog.py:283
 #, python-format
 msgid ""
 "<strong>Following error occurred while fetching "
@@ -1904,19 +1924,19 @@ msgstr ""
 msgid "Reset all settings for current option page"
 msgstr ""

-#: picard/ui/options/dialog.py:166
+#: picard/ui/options/dialog.py:172
 msgid "You are about to reset your options for this page."
 msgstr ""

-#: picard/ui/options/dialog.py:170
+#: picard/ui/options/dialog.py:176
 msgid "Warning! This will reset all of your settings."
 msgstr ""

-#: picard/ui/options/dialog.py:177
+#: picard/ui/options/dialog.py:183
 msgid "Confirm Reset"
 msgstr ""

-#: picard/ui/options/dialog.py:178
+#: picard/ui/options/dialog.py:184
 msgid "Are you sure?"
 msgstr ""

@@ -2087,7 +2107,7 @@ msgstr ""
 msgid "File Naming"
 msgstr ""

-#: picard/ui/options/renaming.py:175 picard/ui/options/scripting.py:406
+#: picard/ui/options/renaming.py:175 picard/ui/options/scripting.py:410
 msgid ""
 "<a href=\"%(picard-doc-scripting-url)s\">Open Scripting Documentation in "
 "your browser</a>"
@@ -2129,15 +2149,15 @@ msgstr ""
 msgid "Scripting"
 msgstr ""

-#: picard/ui/options/scripting.py:292
+#: picard/ui/options/scripting.py:293
 msgid "Are you sure you want to remove this script?"
 msgstr ""

-#: picard/ui/options/scripting.py:293
+#: picard/ui/options/scripting.py:294
 msgid "Confirm Remove"
 msgstr ""

-#: picard/ui/options/scripting.py:376
+#: picard/ui/options/scripting.py:377
 msgid "Script Error"
 msgstr ""

--- a/po/is.po
+++ b/po/is.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: MusicBrainz\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2017-01-18 12:51+0100\n"
-"PO-Revision-Date: 2017-01-19 09:17+0000\n"
+"POT-Creation-Date: 2017-03-05 09:58+0100\n"
+"PO-Revision-Date: 2017-03-05 10:00+0000\n"
 "Last-Translator: nikki\n"
 "Language-Team: Icelandic (http://www.transifex.com/musicbrainz/musicbrainz/language/is/)\n"
 "MIME-Version: 1.0\n"
@@ -56,26 +56,26 @@ msgstr ""
 msgid "Unmatched Files"
 msgstr "Óflokkaðar skrár"

-#: picard/album.py:206
+#: picard/album.py:200
 #, python-format
 msgid "[could not load album %s]"
 msgstr "[Gat ekki sótt upplýsingar um plötu %s]"

-#: picard/album.py:295
+#: picard/album.py:289
 #, python-format
 msgid "Album %(id)s loaded: %(artist)s - %(album)s"
 msgstr ""

-#: picard/album.py:338
+#: picard/album.py:332
 #, python-format
 msgid "Loading album %(id)s ..."
 msgstr ""

-#: picard/album.py:342
+#: picard/album.py:336
 msgid "[loading album information]"
 msgstr "[Sæki upplýsingar um plötu]"

-#: picard/album.py:527
+#: picard/album.py:523
 #, python-format
 msgid "; %i image"
 msgid_plural "; %i images"
@@ -97,72 +97,72 @@ msgstr ""
 msgid "Looking up the metadata for cluster %(album)s..."
 msgstr ""

-#: picard/collection.py:64
+#: picard/collection.py:67
 #, python-format
 msgid "Added %(count)i release to collection \"%(name)s\""
 msgid_plural "Added %(count)i releases to collection \"%(name)s\""
 msgstr[0] ""
 msgstr[1] ""

-#: picard/collection.py:86
+#: picard/collection.py:89
 #, python-format
 msgid "Removed %(count)i release from collection \"%(name)s\""
 msgid_plural "Removed %(count)i releases from collection \"%(name)s\""
 msgstr[0] ""
 msgstr[1] ""

-#: picard/collection.py:100
+#: picard/collection.py:104
 #, python-format
 msgid "Error loading collections: %(error)s"
 msgstr ""

-#: picard/config_upgrade.py:58 picard/config_upgrade.py:71
+#: picard/config_upgrade.py:57 picard/config_upgrade.py:70
 msgid "Various Artists file naming scheme removal"
 msgstr ""

-#: picard/config_upgrade.py:59
+#: picard/config_upgrade.py:58
 msgid ""
 "The separate file naming scheme for various artists albums has been removed in this version of Picard.\n"
 "Your file naming scheme has automatically been merged with that of single artist albums."
 msgstr ""

-#: picard/config_upgrade.py:72
+#: picard/config_upgrade.py:71
 msgid ""
 "The separate file naming scheme for various artists albums has been removed in this version of Picard.\n"
 "You currently do not use this option, but have a separate file naming scheme defined.\n"
 "Do you want to remove it or merge it with your file naming scheme for single artist albums?"
 msgstr ""

-#: picard/config_upgrade.py:78
+#: picard/config_upgrade.py:77
 msgid "Merge"
 msgstr ""

-#: picard/config_upgrade.py:78 picard/ui/metadatabox.py:314
+#: picard/config_upgrade.py:77 picard/ui/metadatabox.py:314
 #: picard/ui/options/interface.py:75 picard/ui/ui_options_interface.py:141
 msgid "Remove"
 msgstr ""

-#: picard/config_upgrade.py:193 picard/ui/options/scripting.py:28
+#: picard/config_upgrade.py:200 picard/ui/options/scripting.py:28
 #, python-format
 msgid "My script %d"
 msgstr ""

-#: picard/file.py:541
+#: picard/file.py:565
 #, python-format
 msgid "No matching tracks for file '%(filename)s'"
 msgstr ""

-#: picard/file.py:557
+#: picard/file.py:581
 #, python-format
 msgid "No matching tracks above the threshold for file '%(filename)s'"
 msgstr ""

-#: picard/file.py:564
+#: picard/file.py:588
 #, python-format
 msgid "File '%(filename)s' identified!"
 msgstr ""

-#: picard/file.py:584
+#: picard/file.py:608
 #, python-format
 msgid "Looking up the metadata for file %(filename)s ..."
 msgstr ""
@@ -205,23 +205,23 @@ msgstr ""
 msgid "[no release info]"
 msgstr ""

-#: picard/tagger.py:405 picard/tagger.py:438
+#: picard/tagger.py:407 picard/tagger.py:440
 #, python-format
 msgid "Adding %(count)d file from '%(directory)s' ..."
 msgid_plural "Adding %(count)d files from '%(directory)s' ..."
 msgstr[0] ""
 msgstr[1] ""

-#: picard/tagger.py:597
+#: picard/tagger.py:599
 #, python-format
 msgid "Removing album %(id)s: %(artist)s - %(album)s"
 msgstr ""

-#: picard/tagger.py:613
+#: picard/tagger.py:615
 msgid "CD Lookup Error"
 msgstr "Villa við geisladiskaleit"

-#: picard/tagger.py:614
+#: picard/tagger.py:616
 #, python-format
 msgid ""
 "Error while reading CD:\n"
@@ -269,6 +269,10 @@ msgstr "Franska"
 msgid "Italian"
 msgstr "Ítalska"

+#: picard/const/languages.py:57
+msgid "Norwegian Bokmal"
+msgstr ""
+
 #: picard/const/languages.py:59
 msgid "Dutch"
 msgstr "Hollenska"
@@ -332,12 +336,12 @@ msgstr ""
 msgid "Whitelist"
 msgstr ""

-#: picard/ui/cdlookup.py:35 picard/ui/mainwindow.py:625 picard/util/tags.py:21
+#: picard/ui/cdlookup.py:35 picard/ui/mainwindow.py:626 picard/util/tags.py:21
 msgid "Album"
 msgstr "Plata"

-#: picard/ui/cdlookup.py:35 picard/ui/itemviews.py:96
-#: picard/ui/mainwindow.py:626 picard/ui/searchdialog.py:326
+#: picard/ui/cdlookup.py:35 picard/ui/itemviews.py:105
+#: picard/ui/mainwindow.py:627 picard/ui/searchdialog.py:326
 #: picard/ui/searchdialog.py:513 picard/util/tags.py:22
 msgid "Artist"
 msgstr "Listamaður"
@@ -371,10 +375,22 @@ msgid_plural "%s (%i releases)"
 msgstr[0] ""
 msgstr[1] ""

-#: picard/ui/coverartbox.py:143
+#: picard/ui/coverartbox.py:141
 msgid "View release on MusicBrainz"
 msgstr ""

+#: picard/ui/coverartbox.py:174
+msgid "Show more details"
+msgstr ""
+
+#: picard/ui/coverartbox.py:199
+msgid "New Cover Art"
+msgstr ""
+
+#: picard/ui/coverartbox.py:200
+msgid "Original Cover Art"
+msgstr ""
+
 #: picard/ui/filebrowser.py:40
 msgid "&Move Tagged Files Here"
 msgstr "&Færa tagaðar skrár hingað"
@@ -503,116 +519,116 @@ msgstr ""
 msgid "Pending requests"
 msgstr ""

-#: picard/ui/itemviews.py:94 picard/util/tags.py:23
+#: picard/ui/itemviews.py:103 picard/util/tags.py:23
 msgid "Title"
 msgstr "Titill"

-#: picard/ui/itemviews.py:95 picard/ui/searchdialog.py:325
+#: picard/ui/itemviews.py:104 picard/ui/searchdialog.py:325
 #: picard/util/tags.py:87
 msgid "Length"
 msgstr "Lengd"

-#: picard/ui/itemviews.py:162
+#: picard/ui/itemviews.py:171
 msgid "Bad match"
 msgstr ""

-#: picard/ui/itemviews.py:163
+#: picard/ui/itemviews.py:172
 msgid "Poor match"
 msgstr ""

-#: picard/ui/itemviews.py:164
+#: picard/ui/itemviews.py:173
 msgid "Ok match"
 msgstr ""

-#: picard/ui/itemviews.py:165
+#: picard/ui/itemviews.py:174
 msgid "Good match"
 msgstr ""

-#: picard/ui/itemviews.py:166
+#: picard/ui/itemviews.py:175
 msgid "Great match"
 msgstr ""

-#: picard/ui/itemviews.py:167
+#: picard/ui/itemviews.py:176
 msgid "Excellent match"
 msgstr ""

-#: picard/ui/itemviews.py:243
+#: picard/ui/itemviews.py:252
 msgid "&Expand all"
 msgstr "&Opna allt"

-#: picard/ui/itemviews.py:245
+#: picard/ui/itemviews.py:254
 msgid "&Collapse all"
 msgstr "&Fella allt saman"

-#: picard/ui/itemviews.py:247
+#: picard/ui/itemviews.py:256
 msgid "Select &all"
 msgstr ""

-#: picard/ui/itemviews.py:249
+#: picard/ui/itemviews.py:258
 msgid "Ctrl+A"
 msgstr ""

-#: picard/ui/itemviews.py:315
+#: picard/ui/itemviews.py:324
 msgid "&Other versions"
 msgstr ""

-#: picard/ui/itemviews.py:318
+#: picard/ui/itemviews.py:327
 msgid "Loading..."
 msgstr ""

-#: picard/ui/itemviews.py:383
+#: picard/ui/itemviews.py:392
 msgid "Collections"
 msgstr ""

-#: picard/ui/itemviews.py:386
+#: picard/ui/itemviews.py:395
 msgid "P&lugins"
 msgstr ""

-#: picard/ui/itemviews.py:557
+#: picard/ui/itemviews.py:577
 msgid "file view"
 msgstr ""

-#: picard/ui/itemviews.py:558
+#: picard/ui/itemviews.py:578
 msgid "Contains unmatched files and clusters"
 msgstr ""

-#: picard/ui/itemviews.py:578
+#: picard/ui/itemviews.py:598
 msgid "Clusters"
 msgstr "Klasar"

-#: picard/ui/itemviews.py:587
+#: picard/ui/itemviews.py:607
 msgid "album view"
 msgstr ""

-#: picard/ui/itemviews.py:588
+#: picard/ui/itemviews.py:608
 msgid "Contains albums and matched files"
 msgstr ""

-#: picard/ui/itemviews.py:694 picard/ui/options/renaming.py:188
+#: picard/ui/itemviews.py:714 picard/ui/options/renaming.py:188
 msgid "Error"
 msgstr "Villa"

-#: picard/ui/itemviews.py:698
+#: picard/ui/itemviews.py:718
 msgid "Album modified and complete"
 msgstr ""

-#: picard/ui/itemviews.py:701
+#: picard/ui/itemviews.py:721
 msgid "Album unchanged and complete"
 msgstr ""

-#: picard/ui/itemviews.py:705
+#: picard/ui/itemviews.py:725
 msgid "Album modified"
 msgstr ""

-#: picard/ui/itemviews.py:708
+#: picard/ui/itemviews.py:728
 msgid "Album unchanged"
 msgstr ""

-#: picard/ui/itemviews.py:811
+#: picard/ui/itemviews.py:831
 msgid "Track saved"
 msgstr ""

-#: picard/ui/itemviews.py:813 picard/ui/itemviews.py:817
+#: picard/ui/itemviews.py:833 picard/ui/itemviews.py:837
 msgid "Pending"
 msgstr ""

@@ -803,7 +819,7 @@ msgstr "Ctrl+B"
 msgid "&Cover Art"
 msgstr "U&mslag"

-#: picard/ui/mainwindow.py:407 picard/ui/mainwindow.py:619
+#: picard/ui/mainwindow.py:407 picard/ui/mainwindow.py:620
 #: picard/ui/searchdialog.py:71
 msgid "Search"
 msgstr "Leit"
@@ -830,175 +846,179 @@ msgid ""
 "even if they have no metadata"
 msgstr ""

-#: picard/ui/mainwindow.py:421
+#: picard/ui/mainwindow.py:420
+msgid "Identify the file using its AcoustID audio fingerprint"
+msgstr ""
+
+#: picard/ui/mainwindow.py:422
 msgid "Ctrl+Y"
 msgstr "Ctrl+Y"

-#: picard/ui/mainwindow.py:424
+#: picard/ui/mainwindow.py:425
 msgid "Cl&uster"
 msgstr "Hó&pa saman"

-#: picard/ui/mainwindow.py:425
+#: picard/ui/mainwindow.py:426
 msgid "Cluster files into album clusters"
 msgstr ""

-#: picard/ui/mainwindow.py:428
+#: picard/ui/mainwindow.py:429
 msgid "Ctrl+U"
 msgstr "Ctrl+P"

-#: picard/ui/mainwindow.py:431
+#: picard/ui/mainwindow.py:432
 msgid "&Lookup"
 msgstr "F&letta upp"

-#: picard/ui/mainwindow.py:432
+#: picard/ui/mainwindow.py:433
 msgid "Lookup selected items in MusicBrainz"
 msgstr ""

-#: picard/ui/mainwindow.py:437
+#: picard/ui/mainwindow.py:438
 msgid "Ctrl+L"
 msgstr "Ctrl+L"

-#: picard/ui/mainwindow.py:440
+#: picard/ui/mainwindow.py:441
 msgid "&Info..."
 msgstr ""

-#: picard/ui/mainwindow.py:443
+#: picard/ui/mainwindow.py:444
 msgid "Ctrl+I"
 msgstr ""

-#: picard/ui/mainwindow.py:446
+#: picard/ui/mainwindow.py:447
 msgid "&Refresh"
 msgstr "Endu&rlesa"

-#: picard/ui/mainwindow.py:447
+#: picard/ui/mainwindow.py:448
 msgid "Ctrl+R"
 msgstr ""

-#: picard/ui/mainwindow.py:450
+#: picard/ui/mainwindow.py:451
 msgid "&Rename Files"
 msgstr "Endu&rnefna skrár"

-#: picard/ui/mainwindow.py:455
+#: picard/ui/mainwindow.py:456
 msgid "&Move Files"
 msgstr "&Færa skrár"

-#: picard/ui/mainwindow.py:460
+#: picard/ui/mainwindow.py:461
 msgid "Save &Tags"
 msgstr "Vista &Tög"

-#: picard/ui/mainwindow.py:465
+#: picard/ui/mainwindow.py:466
 msgid "Tags From &File Names..."
 msgstr "Tög &frá skráanöfnum..."

-#: picard/ui/mainwindow.py:469
+#: picard/ui/mainwindow.py:470
 msgid "&Open My Collections in Browser"
 msgstr ""

-#: picard/ui/mainwindow.py:473
+#: picard/ui/mainwindow.py:474
 msgid "View Error/Debug &Log"
 msgstr ""

-#: picard/ui/mainwindow.py:476
+#: picard/ui/mainwindow.py:477
 msgid "View Activity &History"
 msgstr ""

-#: picard/ui/mainwindow.py:483
+#: picard/ui/mainwindow.py:484
 msgid "Open in &Player"
 msgstr ""

-#: picard/ui/mainwindow.py:484
+#: picard/ui/mainwindow.py:485
 msgid "Play the file in your default media player"
 msgstr ""

-#: picard/ui/mainwindow.py:488
+#: picard/ui/mainwindow.py:489
 msgid "Open Containing &Folder"
 msgstr ""

-#: picard/ui/mainwindow.py:489
+#: picard/ui/mainwindow.py:490
 msgid "Open the containing folder in your file explorer"
 msgstr ""

-#: picard/ui/mainwindow.py:518
+#: picard/ui/mainwindow.py:519
 msgid "&File"
 msgstr "&Skrá"

-#: picard/ui/mainwindow.py:529
+#: picard/ui/mainwindow.py:530
 msgid "&Edit"
 msgstr "Sýs&l"

-#: picard/ui/mainwindow.py:535
+#: picard/ui/mainwindow.py:536
 msgid "&View"
 msgstr "&Sýna"

-#: picard/ui/mainwindow.py:541
+#: picard/ui/mainwindow.py:542
 msgid "&Options"
 msgstr "&Valkostir"

-#: picard/ui/mainwindow.py:547
+#: picard/ui/mainwindow.py:548
 msgid "&Tools"
 msgstr "&Tól"

-#: picard/ui/mainwindow.py:558 picard/ui/util.py:35
+#: picard/ui/mainwindow.py:559 picard/ui/util.py:35
 msgid "&Help"
 msgstr "&Hjálp"

-#: picard/ui/mainwindow.py:586
+#: picard/ui/mainwindow.py:587
 msgid "Actions"
 msgstr ""

-#: picard/ui/mainwindow.py:627
+#: picard/ui/mainwindow.py:628
 msgid "Track"
 msgstr "Lag"

-#: picard/ui/mainwindow.py:703
+#: picard/ui/mainwindow.py:704
 msgid "All Supported Formats"
 msgstr "Öll studd snið"

-#: picard/ui/mainwindow.py:730
+#: picard/ui/mainwindow.py:731
 #, python-format
 msgid "Adding multiple directories from '%(directory)s' ..."
 msgstr ""

-#: picard/ui/mainwindow.py:735
+#: picard/ui/mainwindow.py:736
 #, python-format
 msgid "Adding directory: '%(directory)s' ..."
 msgstr ""

-#: picard/ui/mainwindow.py:801
+#: picard/ui/mainwindow.py:809
 msgid "Configuration Required"
 msgstr ""

-#: picard/ui/mainwindow.py:802
+#: picard/ui/mainwindow.py:810
 msgid ""
 "Audio fingerprinting is not yet configured. Would you like to configure it "
 "now?"
 msgstr ""

-#: picard/ui/mainwindow.py:902
+#: picard/ui/mainwindow.py:916
 #, python-format
 msgid "%(filename)s (error: %(error)s)"
 msgstr ""

-#: picard/ui/mainwindow.py:908
+#: picard/ui/mainwindow.py:922
 #, python-format
 msgid "%(filename)s"
 msgstr ""

-#: picard/ui/mainwindow.py:918
+#: picard/ui/mainwindow.py:933
 #, python-format
 msgid "%(filename)s (%(similarity)d%%) (error: %(error)s)"
 msgstr ""

-#: picard/ui/mainwindow.py:925
+#: picard/ui/mainwindow.py:940
 #, python-format
 msgid "%(filename)s (%(similarity)d%%)"
 msgstr ""

-#: picard/ui/mainwindow.py:961
+#: picard/ui/mainwindow.py:976
 msgid "Authentication Required"
 msgstr ""

-#: picard/ui/mainwindow.py:962
+#: picard/ui/mainwindow.py:977
 msgid ""
 "Picard needs authorization to access your personal data on the MusicBrainz "
 "server. Would you like to log in now?"
@@ -1107,7 +1127,7 @@ msgstr ""
 msgid "Retry"
 msgstr ""

-#: picard/ui/searchdialog.py:288
+#: picard/ui/searchdialog.py:283
 #, python-format
 msgid ""
 "<strong>Following error occurred while fetching "
@@ -1911,19 +1931,19 @@ msgstr ""
 msgid "Reset all settings for current option page"
 msgstr ""

-#: picard/ui/options/dialog.py:166
+#: picard/ui/options/dialog.py:172
 msgid "You are about to reset your options for this page."
 msgstr ""

-#: picard/ui/options/dialog.py:170
+#: picard/ui/options/dialog.py:176
 msgid "Warning! This will reset all of your settings."
 msgstr ""

-#: picard/ui/options/dialog.py:177
+#: picard/ui/options/dialog.py:183
 msgid "Confirm Reset"
 msgstr ""

-#: picard/ui/options/dialog.py:178
+#: picard/ui/options/dialog.py:184
 msgid "Are you sure?"
 msgstr ""

@@ -2094,7 +2114,7 @@ msgstr ""
 msgid "File Naming"
 msgstr ""

-#: picard/ui/options/renaming.py:175 picard/ui/options/scripting.py:406
+#: picard/ui/options/renaming.py:175 picard/ui/options/scripting.py:410
 msgid ""
 "<a href=\"%(picard-doc-scripting-url)s\">Open Scripting Documentation in "
 "your browser</a>"
@@ -2136,15 +2156,15 @@ msgstr ""
 msgid "Scripting"
 msgstr "Skriftun"

-#: picard/ui/options/scripting.py:292
+#: picard/ui/options/scripting.py:293
 msgid "Are you sure you want to remove this script?"
 msgstr ""

-#: picard/ui/options/scripting.py:293
+#: picard/ui/options/scripting.py:294
 msgid "Confirm Remove"
 msgstr ""

-#: picard/ui/options/scripting.py:376
+#: picard/ui/options/scripting.py:377
 msgid "Script Error"
 msgstr "Skriftuvilla"

--- a/po/it.po
+++ b/po/it.po
@@ -12,8 +12,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: MusicBrainz\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2017-01-18 12:51+0100\n"
-"PO-Revision-Date: 2017-01-21 14:38+0000\n"
+"POT-Creation-Date: 2017-03-05 09:58+0100\n"
+"PO-Revision-Date: 2017-03-10 00:18+0000\n"
 "Last-Translator: Luca Salini <salo.rock@gmail.com>\n"
 "Language-Team: Italian (http://www.transifex.com/musicbrainz/musicbrainz/language/it/)\n"
 "MIME-Version: 1.0\n"
@@ -60,26 +60,26 @@ msgstr "AcoustID inviati con successo."
 msgid "Unmatched Files"
 msgstr "File non riconosciuti"

-#: picard/album.py:206
+#: picard/album.py:200
 #, python-format
 msgid "[could not load album %s]"
 msgstr "[non è stato possibile caricare l'album %s]"

-#: picard/album.py:295
+#: picard/album.py:289
 #, python-format
 msgid "Album %(id)s loaded: %(artist)s - %(album)s"
 msgstr "Album %(id)s caricato: %(artist)s - %(album)s"

-#: picard/album.py:338
+#: picard/album.py:332
 #, python-format
 msgid "Loading album %(id)s ..."
 msgstr "Caricamento album %(id)s in corso..."

-#: picard/album.py:342
+#: picard/album.py:336
 msgid "[loading album information]"
 msgstr "[caricamento informazioni album in corso]"

-#: picard/album.py:527
+#: picard/album.py:523
 #, python-format
 msgid "; %i image"
 msgid_plural "; %i images"
@@ -101,72 +101,72 @@ msgstr "Il gruppo %(album)s è stato identificato!"
 msgid "Looking up the metadata for cluster %(album)s..."
 msgstr "Ricerca dei metadati del gruppo %(album)s in corso..."

-#: picard/collection.py:64
+#: picard/collection.py:67
 #, python-format
 msgid "Added %(count)i release to collection \"%(name)s\""
 msgid_plural "Added %(count)i releases to collection \"%(name)s\""
 msgstr[0] "%(count)i pubblicazione aggiunta alla collezione \"%(name)s\""
 msgstr[1] "%(count)i pubblicazioni aggiunte alla collezione \"%(name)s\""

-#: picard/collection.py:86
+#: picard/collection.py:89
 #, python-format
 msgid "Removed %(count)i release from collection \"%(name)s\""
 msgid_plural "Removed %(count)i releases from collection \"%(name)s\""
 msgstr[0] "%(count)i pubblicazione rimossa dalla collezione \"%(name)s\""
 msgstr[1] "%(count)i pubblicazioni rimosse dalla collezione \"%(name)s\""

-#: picard/collection.py:100
+#: picard/collection.py:104
 #, python-format
 msgid "Error loading collections: %(error)s"
 msgstr "Errore nel caricamento delle collezioni: %(error)s"

-#: picard/config_upgrade.py:58 picard/config_upgrade.py:71
+#: picard/config_upgrade.py:57 picard/config_upgrade.py:70
 msgid "Various Artists file naming scheme removal"
 msgstr "Rimozione schema di rinominazione file di Artisti vari"

-#: picard/config_upgrade.py:59
+#: picard/config_upgrade.py:58
 msgid ""
 "The separate file naming scheme for various artists albums has been removed in this version of Picard.\n"
 "Your file naming scheme has automatically been merged with that of single artist albums."
 msgstr "Lo schema di rinominazione file per album di artisti vari è stato rimosso in questa versione di Picard.\nIl tuo schema di rinominazione file è stato unito automaticamente a quello per album di artisti singoli."

-#: picard/config_upgrade.py:72
+#: picard/config_upgrade.py:71
 msgid ""
 "The separate file naming scheme for various artists albums has been removed in this version of Picard.\n"
 "You currently do not use this option, but have a separate file naming scheme defined.\n"
 "Do you want to remove it or merge it with your file naming scheme for single artist albums?"
 msgstr "Lo schema di rinominazione file separato per album di artisti vari è stato rimosso in questa versione di Picard.\nAl momento non stai usando questa opzione, ma hai definito uno schema di rinominazione file separato.\nVuoi eliminarlo o unirlo al tuo schema di rinominazione file per album di artisti singoli?"

-#: picard/config_upgrade.py:78
+#: picard/config_upgrade.py:77
 msgid "Merge"
 msgstr "Unisci"

-#: picard/config_upgrade.py:78 picard/ui/metadatabox.py:314
+#: picard/config_upgrade.py:77 picard/ui/metadatabox.py:314
 #: picard/ui/options/interface.py:75 picard/ui/ui_options_interface.py:141
 msgid "Remove"
 msgstr "Elimina"

-#: picard/config_upgrade.py:193 picard/ui/options/scripting.py:28
+#: picard/config_upgrade.py:200 picard/ui/options/scripting.py:28
 #, python-format
 msgid "My script %d"
 msgstr "Il mio script %d"

-#: picard/file.py:541
+#: picard/file.py:565
 #, python-format
 msgid "No matching tracks for file '%(filename)s'"
 msgstr "Nessuna traccia corrispondente al file '%(filename)s'"

-#: picard/file.py:557
+#: picard/file.py:581
 #, python-format
 msgid "No matching tracks above the threshold for file '%(filename)s'"
 msgstr "Nessuna traccia corrispondente sopra la soglia al file '%(filename)s'"

-#: picard/file.py:564
+#: picard/file.py:588
 #, python-format
 msgid "File '%(filename)s' identified!"
 msgstr "Il file '%(filename)s' è stato identificato!"

-#: picard/file.py:584
+#: picard/file.py:608
 #, python-format
 msgid "Looking up the metadata for file %(filename)s ..."
 msgstr "Ricerca dei metadati del file %(filename)s in corso..."
@@ -209,23 +209,23 @@ msgstr "[nessun codice a barre]"
 msgid "[no release info]"
 msgstr "[nessuna informazione sulla pubblicazione]"

-#: picard/tagger.py:405 picard/tagger.py:438
+#: picard/tagger.py:407 picard/tagger.py:440
 #, python-format
 msgid "Adding %(count)d file from '%(directory)s' ..."
 msgid_plural "Adding %(count)d files from '%(directory)s' ..."
 msgstr[0] "Aggiunta di %(count)d file da '%(directory)s' in corso..."
 msgstr[1] "Aggiunta di %(count)d file da '%(directory)s' in corso..."

-#: picard/tagger.py:597
+#: picard/tagger.py:599
 #, python-format
 msgid "Removing album %(id)s: %(artist)s - %(album)s"
 msgstr "Rimozione album %(id)s: %(artist)s - %(album)s in corso"

-#: picard/tagger.py:613
+#: picard/tagger.py:615
 msgid "CD Lookup Error"
 msgstr "Errore di ricerca del CD"

-#: picard/tagger.py:614
+#: picard/tagger.py:616
 #, python-format
 msgid ""
 "Error while reading CD:\n"
@@ -273,6 +273,10 @@ msgstr "Francese"
 msgid "Italian"
 msgstr "Italiano"

+#: picard/const/languages.py:57
+msgid "Norwegian Bokmal"
+msgstr "Norvegese bokmål"
+
 #: picard/const/languages.py:59
 msgid "Dutch"
 msgstr "Olandese"
@@ -336,12 +340,12 @@ msgstr "File locali"
 msgid "Whitelist"
 msgstr "Whitelist"

-#: picard/ui/cdlookup.py:35 picard/ui/mainwindow.py:625 picard/util/tags.py:21
+#: picard/ui/cdlookup.py:35 picard/ui/mainwindow.py:626 picard/util/tags.py:21
 msgid "Album"
 msgstr "Album"

-#: picard/ui/cdlookup.py:35 picard/ui/itemviews.py:96
-#: picard/ui/mainwindow.py:626 picard/ui/searchdialog.py:326
+#: picard/ui/cdlookup.py:35 picard/ui/itemviews.py:105
+#: picard/ui/mainwindow.py:627 picard/ui/searchdialog.py:326
 #: picard/ui/searchdialog.py:513 picard/util/tags.py:22
 msgid "Artist"
 msgstr "Artista"
@@ -375,10 +379,22 @@ msgid_plural "%s (%i releases)"
 msgstr[0] "%s (%i pubblicazione)"
 msgstr[1] "%s (%i pubblicazioni)"

-#: picard/ui/coverartbox.py:143
+#: picard/ui/coverartbox.py:141
 msgid "View release on MusicBrainz"
 msgstr "Visualizza pubblicazione su MusicBrainz"

+#: picard/ui/coverartbox.py:174
+msgid "Show more details"
+msgstr "Mostra più dettagli"
+
+#: picard/ui/coverartbox.py:199
+msgid "New Cover Art"
+msgstr "Nuova copertina"
+
+#: picard/ui/coverartbox.py:200
+msgid "Original Cover Art"
+msgstr "Copertina originale"
+
 #: picard/ui/filebrowser.py:40
 msgid "&Move Tagged Files Here"
 msgstr "&Sposta qui i file taggati"
@@ -507,116 +523,116 @@ msgstr "File in attesa"
 msgid "Pending requests"
 msgstr "Richieste in corso"

-#: picard/ui/itemviews.py:94 picard/util/tags.py:23
+#: picard/ui/itemviews.py:103 picard/util/tags.py:23
 msgid "Title"
 msgstr "Titolo"

-#: picard/ui/itemviews.py:95 picard/ui/searchdialog.py:325
+#: picard/ui/itemviews.py:104 picard/ui/searchdialog.py:325
 #: picard/util/tags.py:87
 msgid "Length"
 msgstr "Durata"

-#: picard/ui/itemviews.py:162
+#: picard/ui/itemviews.py:171
 msgid "Bad match"
 msgstr "Corrispondenza scadente"

-#: picard/ui/itemviews.py:163
+#: picard/ui/itemviews.py:172
 msgid "Poor match"
 msgstr "Corrispondenza mediocre"

-#: picard/ui/itemviews.py:164
+#: picard/ui/itemviews.py:173
 msgid "Ok match"
 msgstr "Corrispondenza sufficiente"

-#: picard/ui/itemviews.py:165
+#: picard/ui/itemviews.py:174
 msgid "Good match"
 msgstr "Corrispondenza buona"

-#: picard/ui/itemviews.py:166
+#: picard/ui/itemviews.py:175
 msgid "Great match"
 msgstr "Corrispondenza ottima"

-#: picard/ui/itemviews.py:167
+#: picard/ui/itemviews.py:176
 msgid "Excellent match"
 msgstr "Corrispondenza eccellente"

-#: picard/ui/itemviews.py:243
+#: picard/ui/itemviews.py:252
 msgid "&Expand all"
 msgstr "&Espandi tutto"

-#: picard/ui/itemviews.py:245
+#: picard/ui/itemviews.py:254
 msgid "&Collapse all"
 msgstr "&Comprimi tutto"

-#: picard/ui/itemviews.py:247
+#: picard/ui/itemviews.py:256
 msgid "Select &all"
 msgstr "Seleziona &tutto"

-#: picard/ui/itemviews.py:249
+#: picard/ui/itemviews.py:258
 msgid "Ctrl+A"
 msgstr "Ctrl+A"

-#: picard/ui/itemviews.py:315
+#: picard/ui/itemviews.py:324
 msgid "&Other versions"
 msgstr "&Altre versioni"

-#: picard/ui/itemviews.py:318
+#: picard/ui/itemviews.py:327
 msgid "Loading..."
 msgstr "Caricamento in corso..."

-#: picard/ui/itemviews.py:383
+#: picard/ui/itemviews.py:392
 msgid "Collections"
 msgstr "Collezioni"

-#: picard/ui/itemviews.py:386
+#: picard/ui/itemviews.py:395
 msgid "P&lugins"
 msgstr "P&lugin"

-#: picard/ui/itemviews.py:557
+#: picard/ui/itemviews.py:577
 msgid "file view"
 msgstr "visualizzazione file"

-#: picard/ui/itemviews.py:558
+#: picard/ui/itemviews.py:578
 msgid "Contains unmatched files and clusters"
 msgstr "Contiene i file e i gruppi non riconosciuti"

-#: picard/ui/itemviews.py:578
+#: picard/ui/itemviews.py:598
 msgid "Clusters"
 msgstr "Gruppi"

-#: picard/ui/itemviews.py:587
+#: picard/ui/itemviews.py:607
 msgid "album view"
 msgstr "visualizzazione album"

-#: picard/ui/itemviews.py:588
+#: picard/ui/itemviews.py:608
 msgid "Contains albums and matched files"
 msgstr "Contiene gli album e i file riconosciuti"

-#: picard/ui/itemviews.py:694 picard/ui/options/renaming.py:188
+#: picard/ui/itemviews.py:714 picard/ui/options/renaming.py:188
 msgid "Error"
 msgstr "Errore"

-#: picard/ui/itemviews.py:698
+#: picard/ui/itemviews.py:718
 msgid "Album modified and complete"
 msgstr "Album modificato e completo"

-#: picard/ui/itemviews.py:701
+#: picard/ui/itemviews.py:721
 msgid "Album unchanged and complete"
 msgstr "Album non modificato e completo"

-#: picard/ui/itemviews.py:705
+#: picard/ui/itemviews.py:725
 msgid "Album modified"
 msgstr "Album modificato"

-#: picard/ui/itemviews.py:708
+#: picard/ui/itemviews.py:728
 msgid "Album unchanged"
 msgstr "Album non modificato"

-#: picard/ui/itemviews.py:811
+#: picard/ui/itemviews.py:831
 msgid "Track saved"
 msgstr "Traccia salvata"

-#: picard/ui/itemviews.py:813 picard/ui/itemviews.py:817
+#: picard/ui/itemviews.py:833 picard/ui/itemviews.py:837
 msgid "Pending"
 msgstr "In corso"

@@ -807,7 +823,7 @@ msgstr "Ctrl+B"
 msgid "&Cover Art"
 msgstr "&Copertina"

-#: picard/ui/mainwindow.py:407 picard/ui/mainwindow.py:619
+#: picard/ui/mainwindow.py:407 picard/ui/mainwindow.py:620
 #: picard/ui/searchdialog.py:71
 msgid "Search"
 msgstr "Cerca"
@@ -834,175 +850,179 @@ msgid ""
 "even if they have no metadata"
 msgstr "Usa l'impronta digitale audio AcoustID per identificare i file attraverso il loro contenuto musicale effettivo, anche se non hanno metadati"

-#: picard/ui/mainwindow.py:421
+#: picard/ui/mainwindow.py:420
+msgid "Identify the file using its AcoustID audio fingerprint"
+msgstr "Identifica il file utilizzando la sua impronta digitale audio AcoustID"
+
+#: picard/ui/mainwindow.py:422
 msgid "Ctrl+Y"
 msgstr "Ctrl+Y"

-#: picard/ui/mainwindow.py:424
+#: picard/ui/mainwindow.py:425
 msgid "Cl&uster"
 msgstr "Ra&ggruppa"

-#: picard/ui/mainwindow.py:425
+#: picard/ui/mainwindow.py:426
 msgid "Cluster files into album clusters"
 msgstr "Raggruppa file in gruppi per album"

-#: picard/ui/mainwindow.py:428
+#: picard/ui/mainwindow.py:429
 msgid "Ctrl+U"
 msgstr "Ctrl+U"

-#: picard/ui/mainwindow.py:431
+#: picard/ui/mainwindow.py:432
 msgid "&Lookup"
 msgstr "&Cerca"

-#: picard/ui/mainwindow.py:432
+#: picard/ui/mainwindow.py:433
 msgid "Lookup selected items in MusicBrainz"
 msgstr "Cerca gli elementi selezionati sul sito di MusicBrainz"

-#: picard/ui/mainwindow.py:437
+#: picard/ui/mainwindow.py:438
 msgid "Ctrl+L"
 msgstr "Ctrl+L"

-#: picard/ui/mainwindow.py:440
+#: picard/ui/mainwindow.py:441
 msgid "&Info..."
 msgstr "&Info..."

-#: picard/ui/mainwindow.py:443
+#: picard/ui/mainwindow.py:444
 msgid "Ctrl+I"
 msgstr "Ctrl+I"

-#: picard/ui/mainwindow.py:446
+#: picard/ui/mainwindow.py:447
 msgid "&Refresh"
 msgstr "&Aggiorna"

-#: picard/ui/mainwindow.py:447
+#: picard/ui/mainwindow.py:448
 msgid "Ctrl+R"
 msgstr "Ctrl+R"

-#: picard/ui/mainwindow.py:450
+#: picard/ui/mainwindow.py:451
 msgid "&Rename Files"
 msgstr "&Rinomina file"

-#: picard/ui/mainwindow.py:455
+#: picard/ui/mainwindow.py:456
 msgid "&Move Files"
 msgstr "&Sposta file"

-#: picard/ui/mainwindow.py:460
+#: picard/ui/mainwindow.py:461
 msgid "Save &Tags"
 msgstr "Salva &tag"

-#: picard/ui/mainwindow.py:465
+#: picard/ui/mainwindow.py:466
 msgid "Tags From &File Names..."
 msgstr "Genera tag da nome &file..."

-#: picard/ui/mainwindow.py:469
+#: picard/ui/mainwindow.py:470
 msgid "&Open My Collections in Browser"
 msgstr "&Apri le mie collezioni nel browser"

-#: picard/ui/mainwindow.py:473
+#: picard/ui/mainwindow.py:474
 msgid "View Error/Debug &Log"
 msgstr "Visualizza &log errori/debug"

-#: picard/ui/mainwindow.py:476
+#: picard/ui/mainwindow.py:477
 msgid "View Activity &History"
 msgstr "Visualizza &cronologia dell'attività"

-#: picard/ui/mainwindow.py:483
+#: picard/ui/mainwindow.py:484
 msgid "Open in &Player"
 msgstr "Apri nel &lettore multimediale"

-#: picard/ui/mainwindow.py:484
+#: picard/ui/mainwindow.py:485
 msgid "Play the file in your default media player"
 msgstr "Riproduci il file nel tuo lettore multimediale predefinito"

-#: picard/ui/mainwindow.py:488
+#: picard/ui/mainwindow.py:489
 msgid "Open Containing &Folder"
 msgstr "Apri &cartella superiore"

-#: picard/ui/mainwindow.py:489
+#: picard/ui/mainwindow.py:490
 msgid "Open the containing folder in your file explorer"
 msgstr "Apri la cartella superiore in Esplora risorse"

-#: picard/ui/mainwindow.py:518
+#: picard/ui/mainwindow.py:519
 msgid "&File"
 msgstr "&File"

-#: picard/ui/mainwindow.py:529
+#: picard/ui/mainwindow.py:530
 msgid "&Edit"
 msgstr "&Modifica"

-#: picard/ui/mainwindow.py:535
+#: picard/ui/mainwindow.py:536
 msgid "&View"
 msgstr "&Visualizza"

-#: picard/ui/mainwindow.py:541
+#: picard/ui/mainwindow.py:542
 msgid "&Options"
 msgstr "&Opzioni"

-#: picard/ui/mainwindow.py:547
+#: picard/ui/mainwindow.py:548
 msgid "&Tools"
 msgstr "&Strumenti"

-#: picard/ui/mainwindow.py:558 picard/ui/util.py:35
+#: picard/ui/mainwindow.py:559 picard/ui/util.py:35
 msgid "&Help"
 msgstr "&Aiuto"

-#: picard/ui/mainwindow.py:586
+#: picard/ui/mainwindow.py:587
 msgid "Actions"
 msgstr "Azioni"

-#: picard/ui/mainwindow.py:627
+#: picard/ui/mainwindow.py:628
 msgid "Track"
 msgstr "Traccia"

-#: picard/ui/mainwindow.py:703
+#: picard/ui/mainwindow.py:704
 msgid "All Supported Formats"
 msgstr "Tutti i formati supportati"

-#: picard/ui/mainwindow.py:730
+#: picard/ui/mainwindow.py:731
 #, python-format
 msgid "Adding multiple directories from '%(directory)s' ..."
 msgstr "Aggiunta cartelle da '%(directory)s' in corso..."

-#: picard/ui/mainwindow.py:735
+#: picard/ui/mainwindow.py:736
 #, python-format
 msgid "Adding directory: '%(directory)s' ..."
 msgstr "Aggiunta cartella '%(directory)s' in corso..."

-#: picard/ui/mainwindow.py:801
+#: picard/ui/mainwindow.py:809
 msgid "Configuration Required"
 msgstr "Configurazione richiesta"

-#: picard/ui/mainwindow.py:802
+#: picard/ui/mainwindow.py:810
 msgid ""
 "Audio fingerprinting is not yet configured. Would you like to configure it "
 "now?"
 msgstr "Il sistema di impronte digitali audio non è ancora configurato. Vuoi configurarlo adesso?"

-#: picard/ui/mainwindow.py:902
+#: picard/ui/mainwindow.py:916
 #, python-format
 msgid "%(filename)s (error: %(error)s)"
 msgstr "%(filename)s (errore: %(error)s)"

-#: picard/ui/mainwindow.py:908
+#: picard/ui/mainwindow.py:922
 #, python-format
 msgid "%(filename)s"
 msgstr "%(filename)s"

-#: picard/ui/mainwindow.py:918
+#: picard/ui/mainwindow.py:933
 #, python-format
 msgid "%(filename)s (%(similarity)d%%) (error: %(error)s)"
 msgstr "%(filename)s (%(similarity)d%%) (errore: %(error)s)"

-#: picard/ui/mainwindow.py:925
+#: picard/ui/mainwindow.py:940
 #, python-format
 msgid "%(filename)s (%(similarity)d%%)"
 msgstr "%(filename)s (%(similarity)d%%)"

-#: picard/ui/mainwindow.py:961
+#: picard/ui/mainwindow.py:976
 msgid "Authentication Required"
 msgstr "Autenticazione necessaria"

-#: picard/ui/mainwindow.py:962
+#: picard/ui/mainwindow.py:977
 msgid ""
 "Picard needs authorization to access your personal data on the MusicBrainz "
 "server. Would you like to log in now?"
@@ -1111,7 +1131,7 @@ msgstr "<strong>Caricamento in corso...</strong>"
 msgid "Retry"
 msgstr "Riprova"

-#: picard/ui/searchdialog.py:288
+#: picard/ui/searchdialog.py:283
 #, python-format
 msgid ""
 "<strong>Following error occurred while fetching "
@@ -1915,19 +1935,19 @@ msgstr "Ripristina &default"
 msgid "Reset all settings for current option page"
 msgstr "Reimposta tutte le impostazioni di questa pagina"

-#: picard/ui/options/dialog.py:166
+#: picard/ui/options/dialog.py:172
 msgid "You are about to reset your options for this page."
 msgstr "Stai per reimpostare le tue opzioni per questa pagina."

-#: picard/ui/options/dialog.py:170
+#: picard/ui/options/dialog.py:176
 msgid "Warning! This will reset all of your settings."
 msgstr "Attenzione! Questo reimposterà tutte le tue impostazioni."

-#: picard/ui/options/dialog.py:177
+#: picard/ui/options/dialog.py:183
 msgid "Confirm Reset"
 msgstr "Conferma reimpostazione"

-#: picard/ui/options/dialog.py:178
+#: picard/ui/options/dialog.py:184
 msgid "Are you sure?"
 msgstr "Sei sicuro?"

@@ -2098,7 +2118,7 @@ msgstr "Reimposta tutto"
 msgid "File Naming"
 msgstr "Rinominazione file"

-#: picard/ui/options/renaming.py:175 picard/ui/options/scripting.py:406
+#: picard/ui/options/renaming.py:175 picard/ui/options/scripting.py:410
 msgid ""
 "<a href=\"%(picard-doc-scripting-url)s\">Open Scripting Documentation in "
 "your browser</a>"
@@ -2140,15 +2160,15 @@ msgstr "Rimuovi script"
 msgid "Scripting"
 msgstr "Scripting"

-#: picard/ui/options/scripting.py:292
+#: picard/ui/options/scripting.py:293
 msgid "Are you sure you want to remove this script?"
 msgstr "Sei sicuro di voler rimuovere questo script?"

-#: picard/ui/options/scripting.py:293
+#: picard/ui/options/scripting.py:294
 msgid "Confirm Remove"
 msgstr "Conferma rimozione"

-#: picard/ui/options/scripting.py:376
+#: picard/ui/options/scripting.py:377
 msgid "Script Error"
 msgstr "Errore causato dallo script"

--- a/po/ja.po
+++ b/po/ja.po
@@ -14,8 +14,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: MusicBrainz\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2017-01-18 12:51+0100\n"
-"PO-Revision-Date: 2017-01-19 09:17+0000\n"
+"POT-Creation-Date: 2017-03-05 09:58+0100\n"
+"PO-Revision-Date: 2017-03-05 10:00+0000\n"
 "Last-Translator: nikki\n"
 "Language-Team: Japanese (http://www.transifex.com/musicbrainz/musicbrainz/language/ja/)\n"
 "MIME-Version: 1.0\n"
@@ -62,26 +62,26 @@ msgstr "AcoustIDを送信しました。"
 msgid "Unmatched Files"
 msgstr "マッチしていないファイル"

-#: picard/album.py:206
+#: picard/album.py:200
 #, python-format
 msgid "[could not load album %s]"
 msgstr "［アルバム %s を読み込めません］"

-#: picard/album.py:295
+#: picard/album.py:289
 #, python-format
 msgid "Album %(id)s loaded: %(artist)s - %(album)s"
 msgstr "アルバム%(id)sを読み込みました: %(artist)s - %(album)s"

-#: picard/album.py:338
+#: picard/album.py:332
 #, python-format
 msgid "Loading album %(id)s ..."
 msgstr "アルバム%(id)sを読み込み中です..."

-#: picard/album.py:342
+#: picard/album.py:336
 msgid "[loading album information]"
 msgstr "［アルバムの情報を読み込んでいます］"

-#: picard/album.py:527
+#: picard/album.py:523
 #, python-format
 msgid "; %i image"
 msgid_plural "; %i images"
@@ -102,70 +102,70 @@ msgstr "クラスタ%(album)sを同定しました！"
 msgid "Looking up the metadata for cluster %(album)s..."
 msgstr "クラスタ%(album)sのメタデータを検索しています..."

-#: picard/collection.py:64
+#: picard/collection.py:67
 #, python-format
 msgid "Added %(count)i release to collection \"%(name)s\""
 msgid_plural "Added %(count)i releases to collection \"%(name)s\""
 msgstr[0] "コレクション「%(name)s」に%(count)iリリースを追加しました。"

-#: picard/collection.py:86
+#: picard/collection.py:89
 #, python-format
 msgid "Removed %(count)i release from collection \"%(name)s\""
 msgid_plural "Removed %(count)i releases from collection \"%(name)s\""
 msgstr[0] "コレクション「%(name)s」から%(count)iリリースを削除しました。"

-#: picard/collection.py:100
+#: picard/collection.py:104
 #, python-format
 msgid "Error loading collections: %(error)s"
 msgstr "コレクションのロード中にエラーが発生しました: %(error)s"

-#: picard/config_upgrade.py:58 picard/config_upgrade.py:71
+#: picard/config_upgrade.py:57 picard/config_upgrade.py:70
 msgid "Various Artists file naming scheme removal"
 msgstr "複数のアーティストの場合のファイル名ルールを設定する機能は削除されました"

-#: picard/config_upgrade.py:59
+#: picard/config_upgrade.py:58
 msgid ""
 "The separate file naming scheme for various artists albums has been removed in this version of Picard.\n"
 "Your file naming scheme has automatically been merged with that of single artist albums."
 msgstr "複数アーティストのアルバムの場合だけで用いるファイル名ルールの設定は、このバージョンのPicardではできません。\nファイル名ルールの設定は、単独アーティストの場合の設定を含めて自動的にマージされました。"

-#: picard/config_upgrade.py:72
+#: picard/config_upgrade.py:71
 msgid ""
 "The separate file naming scheme for various artists albums has been removed in this version of Picard.\n"
 "You currently do not use this option, but have a separate file naming scheme defined.\n"
 "Do you want to remove it or merge it with your file naming scheme for single artist albums?"
 msgstr "複数アーティストのアルバムの場合だけで用いるファイル名ルールの設定は、このバージョンのPicardではできません。\n現在このオプションは無効になっていますが、別のファイル名ルールが定義されています。\nこのルールを削除しますか？または単独アーティストのアルバムに用いるファイル名ルールとマージしますか？"

-#: picard/config_upgrade.py:78
+#: picard/config_upgrade.py:77
 msgid "Merge"
 msgstr "マージ"

-#: picard/config_upgrade.py:78 picard/ui/metadatabox.py:314
+#: picard/config_upgrade.py:77 picard/ui/metadatabox.py:314
 #: picard/ui/options/interface.py:75 picard/ui/ui_options_interface.py:141
 msgid "Remove"
 msgstr "削除"

-#: picard/config_upgrade.py:193 picard/ui/options/scripting.py:28
+#: picard/config_upgrade.py:200 picard/ui/options/scripting.py:28
 #, python-format
 msgid "My script %d"
 msgstr ""

-#: picard/file.py:541
+#: picard/file.py:565
 #, python-format
 msgid "No matching tracks for file '%(filename)s'"
 msgstr "ファイル「%(filename)s」にマッチするトラックはありません"

-#: picard/file.py:557
+#: picard/file.py:581
 #, python-format
 msgid "No matching tracks above the threshold for file '%(filename)s'"
 msgstr "ファイル「%(filename)s」にしきい値を超えてマッチするトラックはありません"

-#: picard/file.py:564
+#: picard/file.py:588
 #, python-format
 msgid "File '%(filename)s' identified!"
 msgstr "ファイル「%(filename)s」を同定しました！"

-#: picard/file.py:584
+#: picard/file.py:608
 #, python-format
 msgid "Looking up the metadata for file %(filename)s ..."
 msgstr "ファイル「%(filename)s」のメタデータを検索しています..."
@@ -208,22 +208,22 @@ msgstr "[バーコードなし]"
 msgid "[no release info]"
 msgstr "[リリース情報なし]"

-#: picard/tagger.py:405 picard/tagger.py:438
+#: picard/tagger.py:407 picard/tagger.py:440
 #, python-format
 msgid "Adding %(count)d file from '%(directory)s' ..."
 msgid_plural "Adding %(count)d files from '%(directory)s' ..."
 msgstr[0] "%(count)dファイルを「%(directory)s」から追加しています..."

-#: picard/tagger.py:597
+#: picard/tagger.py:599
 #, python-format
 msgid "Removing album %(id)s: %(artist)s - %(album)s"
 msgstr "アルバム%(id)sを削除しています: %(artist)s - %(album)s"

-#: picard/tagger.py:613
+#: picard/tagger.py:615
 msgid "CD Lookup Error"
 msgstr "CD読み込みのエラー"

-#: picard/tagger.py:614
+#: picard/tagger.py:616
 #, python-format
 msgid ""
 "Error while reading CD:\n"
@@ -271,6 +271,10 @@ msgstr "フランス語"
 msgid "Italian"
 msgstr "イタリア語"

+#: picard/const/languages.py:57
+msgid "Norwegian Bokmal"
+msgstr ""
+
 #: picard/const/languages.py:59
 msgid "Dutch"
 msgstr "オランダ語"
@@ -334,12 +338,12 @@ msgstr ""
 msgid "Whitelist"
 msgstr ""

-#: picard/ui/cdlookup.py:35 picard/ui/mainwindow.py:625 picard/util/tags.py:21
+#: picard/ui/cdlookup.py:35 picard/ui/mainwindow.py:626 picard/util/tags.py:21
 msgid "Album"
 msgstr "アルバム"

-#: picard/ui/cdlookup.py:35 picard/ui/itemviews.py:96
-#: picard/ui/mainwindow.py:626 picard/ui/searchdialog.py:326
+#: picard/ui/cdlookup.py:35 picard/ui/itemviews.py:105
+#: picard/ui/mainwindow.py:627 picard/ui/searchdialog.py:326
 #: picard/ui/searchdialog.py:513 picard/util/tags.py:22
 msgid "Artist"
 msgstr "アーティスト"
@@ -372,10 +376,22 @@ msgid "%s (%i release)"
 msgid_plural "%s (%i releases)"
 msgstr[0] "%s (%i リリース)"

-#: picard/ui/coverartbox.py:143
+#: picard/ui/coverartbox.py:141
 msgid "View release on MusicBrainz"
 msgstr "MusicBrainzでリリースを表示する"

+#: picard/ui/coverartbox.py:174
+msgid "Show more details"
+msgstr ""
+
+#: picard/ui/coverartbox.py:199
+msgid "New Cover Art"
+msgstr ""
+
+#: picard/ui/coverartbox.py:200
+msgid "Original Cover Art"
+msgstr ""
+
 #: picard/ui/filebrowser.py:40
 msgid "&Move Tagged Files Here"
 msgstr "タグ付けしたファイルをここに移動(&M)"
@@ -504,116 +520,116 @@ msgstr "未処理ファイル"
 msgid "Pending requests"
 msgstr "未処理リクエスト"

-#: picard/ui/itemviews.py:94 picard/util/tags.py:23
+#: picard/ui/itemviews.py:103 picard/util/tags.py:23
 msgid "Title"
 msgstr "タイトル"

-#: picard/ui/itemviews.py:95 picard/ui/searchdialog.py:325
+#: picard/ui/itemviews.py:104 picard/ui/searchdialog.py:325
 #: picard/util/tags.py:87
 msgid "Length"
 msgstr "演奏時間"

-#: picard/ui/itemviews.py:162
+#: picard/ui/itemviews.py:171
 msgid "Bad match"
 msgstr ""

-#: picard/ui/itemviews.py:163
+#: picard/ui/itemviews.py:172
 msgid "Poor match"
 msgstr ""

-#: picard/ui/itemviews.py:164
+#: picard/ui/itemviews.py:173
 msgid "Ok match"
 msgstr ""

-#: picard/ui/itemviews.py:165
+#: picard/ui/itemviews.py:174
 msgid "Good match"
 msgstr ""

-#: picard/ui/itemviews.py:166
+#: picard/ui/itemviews.py:175
 msgid "Great match"
 msgstr ""

-#: picard/ui/itemviews.py:167
+#: picard/ui/itemviews.py:176
 msgid "Excellent match"
 msgstr ""

-#: picard/ui/itemviews.py:243
+#: picard/ui/itemviews.py:252
 msgid "&Expand all"
 msgstr "すべて展開(&E)"

-#: picard/ui/itemviews.py:245
+#: picard/ui/itemviews.py:254
 msgid "&Collapse all"
 msgstr "すべて折りたたむ(&C)"

-#: picard/ui/itemviews.py:247
+#: picard/ui/itemviews.py:256
 msgid "Select &all"
 msgstr ""

-#: picard/ui/itemviews.py:249
+#: picard/ui/itemviews.py:258
 msgid "Ctrl+A"
 msgstr ""

-#: picard/ui/itemviews.py:315
+#: picard/ui/itemviews.py:324
 msgid "&Other versions"
 msgstr "他バージョン(&O)"

-#: picard/ui/itemviews.py:318
+#: picard/ui/itemviews.py:327
 msgid "Loading..."
 msgstr "ロード中..."

-#: picard/ui/itemviews.py:383
+#: picard/ui/itemviews.py:392
 msgid "Collections"
 msgstr "コレクション"

-#: picard/ui/itemviews.py:386
+#: picard/ui/itemviews.py:395
 msgid "P&lugins"
 msgstr "プラグイン(&L)"

-#: picard/ui/itemviews.py:557
+#: picard/ui/itemviews.py:577
 msgid "file view"
 msgstr "ファイル表示"

-#: picard/ui/itemviews.py:558
+#: picard/ui/itemviews.py:578
 msgid "Contains unmatched files and clusters"
 msgstr "マッチしていないファイル・クラスタを含む"

-#: picard/ui/itemviews.py:578
+#: picard/ui/itemviews.py:598
 msgid "Clusters"
 msgstr "クラスタ"

-#: picard/ui/itemviews.py:587
+#: picard/ui/itemviews.py:607
 msgid "album view"
 msgstr "アルバム表示"

-#: picard/ui/itemviews.py:588
+#: picard/ui/itemviews.py:608
 msgid "Contains albums and matched files"
 msgstr "アルバムとマッチされたファイル含み"

-#: picard/ui/itemviews.py:694 picard/ui/options/renaming.py:188
+#: picard/ui/itemviews.py:714 picard/ui/options/renaming.py:188
 msgid "Error"
 msgstr "エラー"

-#: picard/ui/itemviews.py:698
+#: picard/ui/itemviews.py:718
 msgid "Album modified and complete"
 msgstr ""

-#: picard/ui/itemviews.py:701
+#: picard/ui/itemviews.py:721
 msgid "Album unchanged and complete"
 msgstr ""

-#: picard/ui/itemviews.py:705
+#: picard/ui/itemviews.py:725
 msgid "Album modified"
 msgstr ""

-#: picard/ui/itemviews.py:708
+#: picard/ui/itemviews.py:728
 msgid "Album unchanged"
 msgstr ""

-#: picard/ui/itemviews.py:811
+#: picard/ui/itemviews.py:831
 msgid "Track saved"
 msgstr ""

-#: picard/ui/itemviews.py:813 picard/ui/itemviews.py:817
+#: picard/ui/itemviews.py:833 picard/ui/itemviews.py:837
 msgid "Pending"
 msgstr ""

@@ -803,7 +819,7 @@ msgstr "Ctrl+B"
 msgid "&Cover Art"
 msgstr "カバーアート(&C)"

-#: picard/ui/mainwindow.py:407 picard/ui/mainwindow.py:619
+#: picard/ui/mainwindow.py:407 picard/ui/mainwindow.py:620
 #: picard/ui/searchdialog.py:71
 msgid "Search"
 msgstr "検索"
@@ -830,175 +846,179 @@ msgid ""
 "even if they have no metadata"
 msgstr ""

-#: picard/ui/mainwindow.py:421
+#: picard/ui/mainwindow.py:420
+msgid "Identify the file using its AcoustID audio fingerprint"
+msgstr ""
+
+#: picard/ui/mainwindow.py:422
 msgid "Ctrl+Y"
 msgstr "Ctrl+Y"

-#: picard/ui/mainwindow.py:424
+#: picard/ui/mainwindow.py:425
 msgid "Cl&uster"
 msgstr "クラスタ(&U)"

-#: picard/ui/mainwindow.py:425
+#: picard/ui/mainwindow.py:426
 msgid "Cluster files into album clusters"
 msgstr ""

-#: picard/ui/mainwindow.py:428
+#: picard/ui/mainwindow.py:429
 msgid "Ctrl+U"
 msgstr "Ctrl+U"

-#: picard/ui/mainwindow.py:431
+#: picard/ui/mainwindow.py:432
 msgid "&Lookup"
 msgstr "検索(&L)"

-#: picard/ui/mainwindow.py:432
+#: picard/ui/mainwindow.py:433
 msgid "Lookup selected items in MusicBrainz"
 msgstr "選択したアイテムをMusicBrainzで検索"

-#: picard/ui/mainwindow.py:437
+#: picard/ui/mainwindow.py:438
 msgid "Ctrl+L"
 msgstr "Ctrl+L"

-#: picard/ui/mainwindow.py:440
+#: picard/ui/mainwindow.py:441
 msgid "&Info..."
 msgstr "情報(&I)"

-#: picard/ui/mainwindow.py:443
+#: picard/ui/mainwindow.py:444
 msgid "Ctrl+I"
 msgstr "Ctrl+I"

-#: picard/ui/mainwindow.py:446
+#: picard/ui/mainwindow.py:447
 msgid "&Refresh"
 msgstr "更新(&R)"

-#: picard/ui/mainwindow.py:447
+#: picard/ui/mainwindow.py:448
 msgid "Ctrl+R"
 msgstr "Ctrl+R"

-#: picard/ui/mainwindow.py:450
+#: picard/ui/mainwindow.py:451
 msgid "&Rename Files"
 msgstr "ファイル名を変更(&R)"

-#: picard/ui/mainwindow.py:455
+#: picard/ui/mainwindow.py:456
 msgid "&Move Files"
 msgstr "ファイルを移動(&M)"

-#: picard/ui/mainwindow.py:460
+#: picard/ui/mainwindow.py:461
 msgid "Save &Tags"
 msgstr "タグを保存(&T)"

-#: picard/ui/mainwindow.py:465
+#: picard/ui/mainwindow.py:466
 msgid "Tags From &File Names..."
 msgstr "ファイル名からタグ付け(&F)..."

-#: picard/ui/mainwindow.py:469
+#: picard/ui/mainwindow.py:470
 msgid "&Open My Collections in Browser"
 msgstr ""

-#: picard/ui/mainwindow.py:473
+#: picard/ui/mainwindow.py:474
 msgid "View Error/Debug &Log"
 msgstr "エラーログ・デバッグログを表示(&L)"

-#: picard/ui/mainwindow.py:476
+#: picard/ui/mainwindow.py:477
 msgid "View Activity &History"
 msgstr "動作履歴を表示(&H)"

-#: picard/ui/mainwindow.py:483
+#: picard/ui/mainwindow.py:484
 msgid "Open in &Player"
 msgstr ""

-#: picard/ui/mainwindow.py:484
+#: picard/ui/mainwindow.py:485
 msgid "Play the file in your default media player"
 msgstr "ファイルを既定のメディアプレイヤーで再生"

-#: picard/ui/mainwindow.py:488
+#: picard/ui/mainwindow.py:489
 msgid "Open Containing &Folder"
 msgstr "フォルダを開く(&F)"

-#: picard/ui/mainwindow.py:489
+#: picard/ui/mainwindow.py:490
 msgid "Open the containing folder in your file explorer"
 msgstr "含んでいるフォルダをエクスプローラで開く"

-#: picard/ui/mainwindow.py:518
+#: picard/ui/mainwindow.py:519
 msgid "&File"
 msgstr "ファイル(&F)"

-#: picard/ui/mainwindow.py:529
+#: picard/ui/mainwindow.py:530
 msgid "&Edit"
 msgstr "編集(&E)"

-#: picard/ui/mainwindow.py:535
+#: picard/ui/mainwindow.py:536
 msgid "&View"
 msgstr "表示(&V)"

-#: picard/ui/mainwindow.py:541
+#: picard/ui/mainwindow.py:542
 msgid "&Options"
 msgstr "オプション(&O)"

-#: picard/ui/mainwindow.py:547
+#: picard/ui/mainwindow.py:548
 msgid "&Tools"
 msgstr "ツール(&T)"

-#: picard/ui/mainwindow.py:558 picard/ui/util.py:35
+#: picard/ui/mainwindow.py:559 picard/ui/util.py:35
 msgid "&Help"
 msgstr "ヘルプ(&H)"

-#: picard/ui/mainwindow.py:586
+#: picard/ui/mainwindow.py:587
 msgid "Actions"
 msgstr "アクション"

-#: picard/ui/mainwindow.py:627
+#: picard/ui/mainwindow.py:628
 msgid "Track"
 msgstr "トラック"

-#: picard/ui/mainwindow.py:703
+#: picard/ui/mainwindow.py:704
 msgid "All Supported Formats"
 msgstr "サポートされているすべてのフォーマット"

-#: picard/ui/mainwindow.py:730
+#: picard/ui/mainwindow.py:731
 #, python-format
 msgid "Adding multiple directories from '%(directory)s' ..."
 msgstr "「%(directory)s」の中の複数のディレクトリを追加中..."

-#: picard/ui/mainwindow.py:735
+#: picard/ui/mainwindow.py:736
 #, python-format
 msgid "Adding directory: '%(directory)s' ..."
 msgstr "ディレクトリ「%(directory)s」を追加中..."

-#: picard/ui/mainwindow.py:801
+#: picard/ui/mainwindow.py:809
 msgid "Configuration Required"
 msgstr "設定必須"

-#: picard/ui/mainwindow.py:802
+#: picard/ui/mainwindow.py:810
 msgid ""
 "Audio fingerprinting is not yet configured. Would you like to configure it "
 "now?"
 msgstr "音声フィンガープリント計算はまだ設定していません。今設定しますか？"

-#: picard/ui/mainwindow.py:902
+#: picard/ui/mainwindow.py:916
 #, python-format
 msgid "%(filename)s (error: %(error)s)"
 msgstr "%(filename)s (エラー: %(error)s)"

-#: picard/ui/mainwindow.py:908
+#: picard/ui/mainwindow.py:922
 #, python-format
 msgid "%(filename)s"
 msgstr "%(filename)s"

-#: picard/ui/mainwindow.py:918
+#: picard/ui/mainwindow.py:933
 #, python-format
 msgid "%(filename)s (%(similarity)d%%) (error: %(error)s)"
 msgstr "%(filename)s (%(similarity)d%%) (エラー: %(error)s)"

-#: picard/ui/mainwindow.py:925
+#: picard/ui/mainwindow.py:940
 #, python-format
 msgid "%(filename)s (%(similarity)d%%)"
 msgstr "%(filename)s (%(similarity)d%%)"

-#: picard/ui/mainwindow.py:961
+#: picard/ui/mainwindow.py:976
 msgid "Authentication Required"
 msgstr "認証が必要です"

-#: picard/ui/mainwindow.py:962
+#: picard/ui/mainwindow.py:977
 msgid ""
 "Picard needs authorization to access your personal data on the MusicBrainz "
 "server. Would you like to log in now?"
@@ -1104,7 +1124,7 @@ msgstr ""
 msgid "Retry"
 msgstr ""

-#: picard/ui/searchdialog.py:288
+#: picard/ui/searchdialog.py:283
 #, python-format
 msgid ""
 "<strong>Following error occurred while fetching "
@@ -1908,19 +1928,19 @@ msgstr ""
 msgid "Reset all settings for current option page"
 msgstr ""

-#: picard/ui/options/dialog.py:166
+#: picard/ui/options/dialog.py:172
 msgid "You are about to reset your options for this page."
 msgstr ""

-#: picard/ui/options/dialog.py:170
+#: picard/ui/options/dialog.py:176
 msgid "Warning! This will reset all of your settings."
 msgstr ""

-#: picard/ui/options/dialog.py:177
+#: picard/ui/options/dialog.py:183
 msgid "Confirm Reset"
 msgstr ""

-#: picard/ui/options/dialog.py:178
+#: picard/ui/options/dialog.py:184
 msgid "Are you sure?"
 msgstr ""

@@ -2091,7 +2111,7 @@ msgstr "全てリセット"
 msgid "File Naming"
 msgstr "ファイル名"

-#: picard/ui/options/renaming.py:175 picard/ui/options/scripting.py:406
+#: picard/ui/options/renaming.py:175 picard/ui/options/scripting.py:410
 msgid ""
 "<a href=\"%(picard-doc-scripting-url)s\">Open Scripting Documentation in "
 "your browser</a>"
@@ -2133,15 +2153,15 @@ msgstr ""
 msgid "Scripting"
 msgstr "スクリプト"

-#: picard/ui/options/scripting.py:292
+#: picard/ui/options/scripting.py:293
 msgid "Are you sure you want to remove this script?"
 msgstr ""

-#: picard/ui/options/scripting.py:293
+#: picard/ui/options/scripting.py:294
 msgid "Confirm Remove"
 msgstr ""

-#: picard/ui/options/scripting.py:376
+#: picard/ui/options/scripting.py:377
 msgid "Script Error"
 msgstr "スクリプトのエラー"

--- a/po/ko.po
+++ b/po/ko.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: MusicBrainz\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2017-01-18 12:51+0100\n"
-"PO-Revision-Date: 2017-01-19 09:17+0000\n"
+"POT-Creation-Date: 2017-03-05 09:58+0100\n"
+"PO-Revision-Date: 2017-03-05 10:00+0000\n"
 "Last-Translator: nikki\n"
 "Language-Team: Korean (http://www.transifex.com/musicbrainz/musicbrainz/language/ko/)\n"
 "MIME-Version: 1.0\n"
@@ -56,26 +56,26 @@ msgstr ""
 msgid "Unmatched Files"
 msgstr ""

-#: picard/album.py:206
+#: picard/album.py:200
 #, python-format
 msgid "[could not load album %s]"
 msgstr ""

-#: picard/album.py:295
+#: picard/album.py:289
 #, python-format
 msgid "Album %(id)s loaded: %(artist)s - %(album)s"
 msgstr ""

-#: picard/album.py:338
+#: picard/album.py:332
 #, python-format
 msgid "Loading album %(id)s ..."
 msgstr ""

-#: picard/album.py:342
+#: picard/album.py:336
 msgid "[loading album information]"
 msgstr ""

-#: picard/album.py:527
+#: picard/album.py:523
 #, python-format
 msgid "; %i image"
 msgid_plural "; %i images"
@@ -96,70 +96,70 @@ msgstr ""
 msgid "Looking up the metadata for cluster %(album)s..."
 msgstr ""

-#: picard/collection.py:64
+#: picard/collection.py:67
 #, python-format
 msgid "Added %(count)i release to collection \"%(name)s\""
 msgid_plural "Added %(count)i releases to collection \"%(name)s\""
 msgstr[0] ""

-#: picard/collection.py:86
+#: picard/collection.py:89
 #, python-format
 msgid "Removed %(count)i release from collection \"%(name)s\""
 msgid_plural "Removed %(count)i releases from collection \"%(name)s\""
 msgstr[0] ""

-#: picard/collection.py:100
+#: picard/collection.py:104
 #, python-format
 msgid "Error loading collections: %(error)s"
 msgstr ""

-#: picard/config_upgrade.py:58 picard/config_upgrade.py:71
+#: picard/config_upgrade.py:57 picard/config_upgrade.py:70
 msgid "Various Artists file naming scheme removal"
 msgstr ""

-#: picard/config_upgrade.py:59
+#: picard/config_upgrade.py:58
 msgid ""
 "The separate file naming scheme for various artists albums has been removed in this version of Picard.\n"
 "Your file naming scheme has automatically been merged with that of single artist albums."
 msgstr ""

-#: picard/config_upgrade.py:72
+#: picard/config_upgrade.py:71
 msgid ""
 "The separate file naming scheme for various artists albums has been removed in this version of Picard.\n"
 "You currently do not use this option, but have a separate file naming scheme defined.\n"
 "Do you want to remove it or merge it with your file naming scheme for single artist albums?"
 msgstr ""

-#: picard/config_upgrade.py:78
+#: picard/config_upgrade.py:77
 msgid "Merge"
 msgstr ""

-#: picard/config_upgrade.py:78 picard/ui/metadatabox.py:314
+#: picard/config_upgrade.py:77 picard/ui/metadatabox.py:314
 #: picard/ui/options/interface.py:75 picard/ui/ui_options_interface.py:141
 msgid "Remove"
 msgstr ""

-#: picard/config_upgrade.py:193 picard/ui/options/scripting.py:28
+#: picard/config_upgrade.py:200 picard/ui/options/scripting.py:28
 #, python-format
 msgid "My script %d"
 msgstr ""

-#: picard/file.py:541
+#: picard/file.py:565
 #, python-format
 msgid "No matching tracks for file '%(filename)s'"
 msgstr ""

-#: picard/file.py:557
+#: picard/file.py:581
 #, python-format
 msgid "No matching tracks above the threshold for file '%(filename)s'"
 msgstr ""

-#: picard/file.py:564
+#: picard/file.py:588
 #, python-format
 msgid "File '%(filename)s' identified!"
 msgstr ""

-#: picard/file.py:584
+#: picard/file.py:608
 #, python-format
 msgid "Looking up the metadata for file %(filename)s ..."
 msgstr ""
@@ -202,22 +202,22 @@ msgstr ""
 msgid "[no release info]"
 msgstr ""

-#: picard/tagger.py:405 picard/tagger.py:438
+#: picard/tagger.py:407 picard/tagger.py:440
 #, python-format
 msgid "Adding %(count)d file from '%(directory)s' ..."
 msgid_plural "Adding %(count)d files from '%(directory)s' ..."
 msgstr[0] ""

-#: picard/tagger.py:597
+#: picard/tagger.py:599
 #, python-format
 msgid "Removing album %(id)s: %(artist)s - %(album)s"
 msgstr ""

-#: picard/tagger.py:613
+#: picard/tagger.py:615
 msgid "CD Lookup Error"
 msgstr "CD 검색 실패"

-#: picard/tagger.py:614
+#: picard/tagger.py:616
 #, python-format
 msgid ""
 "Error while reading CD:\n"
@@ -265,6 +265,10 @@ msgstr "프랑스어"
 msgid "Italian"
 msgstr "이탈리아어"

+#: picard/const/languages.py:57
+msgid "Norwegian Bokmal"
+msgstr ""
+
 #: picard/const/languages.py:59
 msgid "Dutch"
 msgstr "네덜란드어"
@@ -328,12 +332,12 @@ msgstr ""
 msgid "Whitelist"
 msgstr ""

-#: picard/ui/cdlookup.py:35 picard/ui/mainwindow.py:625 picard/util/tags.py:21
+#: picard/ui/cdlookup.py:35 picard/ui/mainwindow.py:626 picard/util/tags.py:21
 msgid "Album"
 msgstr "앨범"

-#: picard/ui/cdlookup.py:35 picard/ui/itemviews.py:96
-#: picard/ui/mainwindow.py:626 picard/ui/searchdialog.py:326
+#: picard/ui/cdlookup.py:35 picard/ui/itemviews.py:105
+#: picard/ui/mainwindow.py:627 picard/ui/searchdialog.py:326
 #: picard/ui/searchdialog.py:513 picard/util/tags.py:22
 msgid "Artist"
 msgstr "음악가"
@@ -366,10 +370,22 @@ msgid "%s (%i release)"
 msgid_plural "%s (%i releases)"
 msgstr[0] ""

-#: picard/ui/coverartbox.py:143
+#: picard/ui/coverartbox.py:141
 msgid "View release on MusicBrainz"
 msgstr ""

+#: picard/ui/coverartbox.py:174
+msgid "Show more details"
+msgstr ""
+
+#: picard/ui/coverartbox.py:199
+msgid "New Cover Art"
+msgstr ""
+
+#: picard/ui/coverartbox.py:200
+msgid "Original Cover Art"
+msgstr ""
+
 #: picard/ui/filebrowser.py:40
 msgid "&Move Tagged Files Here"
 msgstr ""
@@ -498,116 +514,116 @@ msgstr ""
 msgid "Pending requests"
 msgstr ""

-#: picard/ui/itemviews.py:94 picard/util/tags.py:23
+#: picard/ui/itemviews.py:103 picard/util/tags.py:23
 msgid "Title"
 msgstr "제목"

-#: picard/ui/itemviews.py:95 picard/ui/searchdialog.py:325
+#: picard/ui/itemviews.py:104 picard/ui/searchdialog.py:325
 #: picard/util/tags.py:87
 msgid "Length"
 msgstr "길이"

-#: picard/ui/itemviews.py:162
+#: picard/ui/itemviews.py:171
 msgid "Bad match"
 msgstr ""

-#: picard/ui/itemviews.py:163
+#: picard/ui/itemviews.py:172
 msgid "Poor match"
 msgstr ""

-#: picard/ui/itemviews.py:164
+#: picard/ui/itemviews.py:173
 msgid "Ok match"
 msgstr ""

-#: picard/ui/itemviews.py:165
+#: picard/ui/itemviews.py:174
 msgid "Good match"
 msgstr ""

-#: picard/ui/itemviews.py:166
+#: picard/ui/itemviews.py:175
 msgid "Great match"
 msgstr ""

-#: picard/ui/itemviews.py:167
+#: picard/ui/itemviews.py:176
 msgid "Excellent match"
 msgstr ""

-#: picard/ui/itemviews.py:243
+#: picard/ui/itemviews.py:252
 msgid "&Expand all"
 msgstr ""

-#: picard/ui/itemviews.py:245
+#: picard/ui/itemviews.py:254
 msgid "&Collapse all"
 msgstr ""

-#: picard/ui/itemviews.py:247
+#: picard/ui/itemviews.py:256
 msgid "Select &all"
 msgstr ""

-#: picard/ui/itemviews.py:249
+#: picard/ui/itemviews.py:258
 msgid "Ctrl+A"
 msgstr ""

-#: picard/ui/itemviews.py:315
+#: picard/ui/itemviews.py:324
 msgid "&Other versions"
 msgstr ""

-#: picard/ui/itemviews.py:318
+#: picard/ui/itemviews.py:327
 msgid "Loading..."
 msgstr ""

-#: picard/ui/itemviews.py:383
+#: picard/ui/itemviews.py:392
 msgid "Collections"
 msgstr ""

-#: picard/ui/itemviews.py:386
+#: picard/ui/itemviews.py:395
 msgid "P&lugins"
 msgstr ""

-#: picard/ui/itemviews.py:557
+#: picard/ui/itemviews.py:577
 msgid "file view"
 msgstr ""

-#: picard/ui/itemviews.py:558
+#: picard/ui/itemviews.py:578
 msgid "Contains unmatched files and clusters"
 msgstr ""

-#: picard/ui/itemviews.py:578
+#: picard/ui/itemviews.py:598
 msgid "Clusters"
 msgstr ""

-#: picard/ui/itemviews.py:587
+#: picard/ui/itemviews.py:607
 msgid "album view"
 msgstr ""

-#: picard/ui/itemviews.py:588
+#: picard/ui/itemviews.py:608
 msgid "Contains albums and matched files"
 msgstr ""

-#: picard/ui/itemviews.py:694 picard/ui/options/renaming.py:188
+#: picard/ui/itemviews.py:714 picard/ui/options/renaming.py:188
 msgid "Error"
 msgstr ""

-#: picard/ui/itemviews.py:698
+#: picard/ui/itemviews.py:718
 msgid "Album modified and complete"
 msgstr ""

-#: picard/ui/itemviews.py:701
+#: picard/ui/itemviews.py:721
 msgid "Album unchanged and complete"
 msgstr ""

-#: picard/ui/itemviews.py:705
+#: picard/ui/itemviews.py:725
 msgid "Album modified"
 msgstr ""

-#: picard/ui/itemviews.py:708
+#: picard/ui/itemviews.py:728
 msgid "Album unchanged"
 msgstr ""

-#: picard/ui/itemviews.py:811
+#: picard/ui/itemviews.py:831
 msgid "Track saved"
 msgstr ""

-#: picard/ui/itemviews.py:813 picard/ui/itemviews.py:817
+#: picard/ui/itemviews.py:833 picard/ui/itemviews.py:837
 msgid "Pending"
 msgstr ""

@@ -797,7 +813,7 @@ msgstr ""
 msgid "&Cover Art"
 msgstr "&앨범 ㅑ켓"

-#: picard/ui/mainwindow.py:407 picard/ui/mainwindow.py:619
+#: picard/ui/mainwindow.py:407 picard/ui/mainwindow.py:620
 #: picard/ui/searchdialog.py:71
 msgid "Search"
 msgstr "찾기"
@@ -824,175 +840,179 @@ msgid ""
 "even if they have no metadata"
 msgstr ""

-#: picard/ui/mainwindow.py:421
+#: picard/ui/mainwindow.py:420
+msgid "Identify the file using its AcoustID audio fingerprint"
+msgstr ""
+
+#: picard/ui/mainwindow.py:422
 msgid "Ctrl+Y"
 msgstr "Ctrl+Y"

-#: picard/ui/mainwindow.py:424
+#: picard/ui/mainwindow.py:425
 msgid "Cl&uster"
 msgstr ""

-#: picard/ui/mainwindow.py:425
+#: picard/ui/mainwindow.py:426
 msgid "Cluster files into album clusters"
 msgstr ""

-#: picard/ui/mainwindow.py:428
+#: picard/ui/mainwindow.py:429
 msgid "Ctrl+U"
 msgstr "Ctrl+U"

-#: picard/ui/mainwindow.py:431
+#: picard/ui/mainwindow.py:432
 msgid "&Lookup"
 msgstr ""

-#: picard/ui/mainwindow.py:432
+#: picard/ui/mainwindow.py:433
 msgid "Lookup selected items in MusicBrainz"
 msgstr ""

-#: picard/ui/mainwindow.py:437
+#: picard/ui/mainwindow.py:438
 msgid "Ctrl+L"
 msgstr "Ctrl+L"

-#: picard/ui/mainwindow.py:440
+#: picard/ui/mainwindow.py:441
 msgid "&Info..."
 msgstr ""

-#: picard/ui/mainwindow.py:443
+#: picard/ui/mainwindow.py:444
 msgid "Ctrl+I"
 msgstr ""

-#: picard/ui/mainwindow.py:446
+#: picard/ui/mainwindow.py:447
 msgid "&Refresh"
 msgstr "&새로고침"

-#: picard/ui/mainwindow.py:447
+#: picard/ui/mainwindow.py:448
 msgid "Ctrl+R"
 msgstr ""

-#: picard/ui/mainwindow.py:450
+#: picard/ui/mainwindow.py:451
 msgid "&Rename Files"
 msgstr "이름 변경"

-#: picard/ui/mainwindow.py:455
+#: picard/ui/mainwindow.py:456
 msgid "&Move Files"
 msgstr "&파일 이동"

-#: picard/ui/mainwindow.py:460
+#: picard/ui/mainwindow.py:461
 msgid "Save &Tags"
 msgstr ""

-#: picard/ui/mainwindow.py:465
+#: picard/ui/mainwindow.py:466
 msgid "Tags From &File Names..."
 msgstr ""

-#: picard/ui/mainwindow.py:469
+#: picard/ui/mainwindow.py:470
 msgid "&Open My Collections in Browser"
 msgstr ""

-#: picard/ui/mainwindow.py:473
+#: picard/ui/mainwindow.py:474
 msgid "View Error/Debug &Log"
 msgstr ""

-#: picard/ui/mainwindow.py:476
+#: picard/ui/mainwindow.py:477
 msgid "View Activity &History"
 msgstr ""

-#: picard/ui/mainwindow.py:483
+#: picard/ui/mainwindow.py:484
 msgid "Open in &Player"
 msgstr ""

-#: picard/ui/mainwindow.py:484
+#: picard/ui/mainwindow.py:485
 msgid "Play the file in your default media player"
 msgstr ""

-#: picard/ui/mainwindow.py:488
+#: picard/ui/mainwindow.py:489
 msgid "Open Containing &Folder"
 msgstr ""

-#: picard/ui/mainwindow.py:489
+#: picard/ui/mainwindow.py:490
 msgid "Open the containing folder in your file explorer"
 msgstr ""

-#: picard/ui/mainwindow.py:518
+#: picard/ui/mainwindow.py:519
 msgid "&File"
 msgstr "파일 (&F)"

-#: picard/ui/mainwindow.py:529
+#: picard/ui/mainwindow.py:530
 msgid "&Edit"
 msgstr "편집 (&E)"

-#: picard/ui/mainwindow.py:535
+#: picard/ui/mainwindow.py:536
 msgid "&View"
 msgstr "&보기"

-#: picard/ui/mainwindow.py:541
+#: picard/ui/mainwindow.py:542
 msgid "&Options"
 msgstr "&옵션"

-#: picard/ui/mainwindow.py:547
+#: picard/ui/mainwindow.py:548
 msgid "&Tools"
 msgstr "도구"

-#: picard/ui/mainwindow.py:558 picard/ui/util.py:35
+#: picard/ui/mainwindow.py:559 picard/ui/util.py:35
 msgid "&Help"
 msgstr "도움말 (&H)"

-#: picard/ui/mainwindow.py:586
+#: picard/ui/mainwindow.py:587
 msgid "Actions"
 msgstr ""

-#: picard/ui/mainwindow.py:627
+#: picard/ui/mainwindow.py:628
 msgid "Track"
 msgstr "트랙"

-#: picard/ui/mainwindow.py:703
+#: picard/ui/mainwindow.py:704
 msgid "All Supported Formats"
 msgstr "모든 지원 되는 형식"

-#: picard/ui/mainwindow.py:730
+#: picard/ui/mainwindow.py:731
 #, python-format
 msgid "Adding multiple directories from '%(directory)s' ..."
 msgstr ""

-#: picard/ui/mainwindow.py:735
+#: picard/ui/mainwindow.py:736
 #, python-format
 msgid "Adding directory: '%(directory)s' ..."
 msgstr ""

-#: picard/ui/mainwindow.py:801
+#: picard/ui/mainwindow.py:809
 msgid "Configuration Required"
 msgstr ""

-#: picard/ui/mainwindow.py:802
+#: picard/ui/mainwindow.py:810
 msgid ""
 "Audio fingerprinting is not yet configured. Would you like to configure it "
 "now?"
 msgstr ""

-#: picard/ui/mainwindow.py:902
+#: picard/ui/mainwindow.py:916
 #, python-format
 msgid "%(filename)s (error: %(error)s)"
 msgstr ""

-#: picard/ui/mainwindow.py:908
+#: picard/ui/mainwindow.py:922
 #, python-format
 msgid "%(filename)s"
 msgstr ""

-#: picard/ui/mainwindow.py:918
+#: picard/ui/mainwindow.py:933
 #, python-format
 msgid "%(filename)s (%(similarity)d%%) (error: %(error)s)"
 msgstr ""

-#: picard/ui/mainwindow.py:925
+#: picard/ui/mainwindow.py:940
 #, python-format
 msgid "%(filename)s (%(similarity)d%%)"
 msgstr ""

-#: picard/ui/mainwindow.py:961
+#: picard/ui/mainwindow.py:976
 msgid "Authentication Required"
 msgstr ""

-#: picard/ui/mainwindow.py:962
+#: picard/ui/mainwindow.py:977
 msgid ""
 "Picard needs authorization to access your personal data on the MusicBrainz "
 "server. Would you like to log in now?"
@@ -1098,7 +1118,7 @@ msgstr ""
 msgid "Retry"
 msgstr ""

-#: picard/ui/searchdialog.py:288
+#: picard/ui/searchdialog.py:283
 #, python-format
 msgid ""
 "<strong>Following error occurred while fetching "
@@ -1902,19 +1922,19 @@ msgstr ""
 msgid "Reset all settings for current option page"
 msgstr ""

-#: picard/ui/options/dialog.py:166
+#: picard/ui/options/dialog.py:172
 msgid "You are about to reset your options for this page."
 msgstr ""

-#: picard/ui/options/dialog.py:170
+#: picard/ui/options/dialog.py:176
 msgid "Warning! This will reset all of your settings."
 msgstr ""

-#: picard/ui/options/dialog.py:177
+#: picard/ui/options/dialog.py:183
 msgid "Confirm Reset"
 msgstr ""

-#: picard/ui/options/dialog.py:178
+#: picard/ui/options/dialog.py:184
 msgid "Are you sure?"
 msgstr ""

@@ -2085,7 +2105,7 @@ msgstr ""
 msgid "File Naming"
 msgstr ""

-#: picard/ui/options/renaming.py:175 picard/ui/options/scripting.py:406
+#: picard/ui/options/renaming.py:175 picard/ui/options/scripting.py:410
 msgid ""
 "<a href=\"%(picard-doc-scripting-url)s\">Open Scripting Documentation in "
 "your browser</a>"
@@ -2127,15 +2147,15 @@ msgstr ""
 msgid "Scripting"
 msgstr ""

-#: picard/ui/options/scripting.py:292
+#: picard/ui/options/scripting.py:293
 msgid "Are you sure you want to remove this script?"
 msgstr ""

-#: picard/ui/options/scripting.py:293
+#: picard/ui/options/scripting.py:294
 msgid "Confirm Remove"
 msgstr ""

-#: picard/ui/options/scripting.py:376
+#: picard/ui/options/scripting.py:377
 msgid "Script Error"
 msgstr ""

--- a/po/lt.po
+++ b/po/lt.po
--- a/po/mr.po
+++ b/po/mr.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: MusicBrainz\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2017-01-18 12:51+0100\n"
-"PO-Revision-Date: 2017-01-19 09:17+0000\n"
+"POT-Creation-Date: 2017-03-05 09:58+0100\n"
+"PO-Revision-Date: 2017-03-05 10:00+0000\n"
 "Last-Translator: nikki\n"
 "Language-Team: Marathi (http://www.transifex.com/musicbrainz/musicbrainz/language/mr/)\n"
 "MIME-Version: 1.0\n"
@@ -56,26 +56,26 @@ msgstr ""
 msgid "Unmatched Files"
 msgstr ""

-#: picard/album.py:206
+#: picard/album.py:200
 #, python-format
 msgid "[could not load album %s]"
 msgstr ""

-#: picard/album.py:295
+#: picard/album.py:289
 #, python-format
 msgid "Album %(id)s loaded: %(artist)s - %(album)s"
 msgstr ""

-#: picard/album.py:338
+#: picard/album.py:332
 #, python-format
 msgid "Loading album %(id)s ..."
 msgstr ""

-#: picard/album.py:342
+#: picard/album.py:336
 msgid "[loading album information]"
 msgstr ""

-#: picard/album.py:527
+#: picard/album.py:523
 #, python-format
 msgid "; %i image"
 msgid_plural "; %i images"
@@ -97,72 +97,72 @@ msgstr ""
 msgid "Looking up the metadata for cluster %(album)s..."
 msgstr ""

-#: picard/collection.py:64
+#: picard/collection.py:67
 #, python-format
 msgid "Added %(count)i release to collection \"%(name)s\""
 msgid_plural "Added %(count)i releases to collection \"%(name)s\""
 msgstr[0] ""
 msgstr[1] ""

-#: picard/collection.py:86
+#: picard/collection.py:89
 #, python-format
 msgid "Removed %(count)i release from collection \"%(name)s\""
 msgid_plural "Removed %(count)i releases from collection \"%(name)s\""
 msgstr[0] ""
 msgstr[1] ""

-#: picard/collection.py:100
+#: picard/collection.py:104
 #, python-format
 msgid "Error loading collections: %(error)s"
 msgstr ""

-#: picard/config_upgrade.py:58 picard/config_upgrade.py:71
+#: picard/config_upgrade.py:57 picard/config_upgrade.py:70
 msgid "Various Artists file naming scheme removal"
 msgstr ""

-#: picard/config_upgrade.py:59
+#: picard/config_upgrade.py:58
 msgid ""
 "The separate file naming scheme for various artists albums has been removed in this version of Picard.\n"
 "Your file naming scheme has automatically been merged with that of single artist albums."
 msgstr ""

-#: picard/config_upgrade.py:72
+#: picard/config_upgrade.py:71
 msgid ""
 "The separate file naming scheme for various artists albums has been removed in this version of Picard.\n"
 "You currently do not use this option, but have a separate file naming scheme defined.\n"
 "Do you want to remove it or merge it with your file naming scheme for single artist albums?"
 msgstr ""

-#: picard/config_upgrade.py:78
+#: picard/config_upgrade.py:77
 msgid "Merge"
 msgstr ""

-#: picard/config_upgrade.py:78 picard/ui/metadatabox.py:314
+#: picard/config_upgrade.py:77 picard/ui/metadatabox.py:314
 #: picard/ui/options/interface.py:75 picard/ui/ui_options_interface.py:141
 msgid "Remove"
 msgstr "काढून टाका"

-#: picard/config_upgrade.py:193 picard/ui/options/scripting.py:28
+#: picard/config_upgrade.py:200 picard/ui/options/scripting.py:28
 #, python-format
 msgid "My script %d"
 msgstr ""

-#: picard/file.py:541
+#: picard/file.py:565
 #, python-format
 msgid "No matching tracks for file '%(filename)s'"
 msgstr ""

-#: picard/file.py:557
+#: picard/file.py:581
 #, python-format
 msgid "No matching tracks above the threshold for file '%(filename)s'"
 msgstr ""

-#: picard/file.py:564
+#: picard/file.py:588
 #, python-format
 msgid "File '%(filename)s' identified!"
 msgstr ""

-#: picard/file.py:584
+#: picard/file.py:608
 #, python-format
 msgid "Looking up the metadata for file %(filename)s ..."
 msgstr ""
@@ -205,23 +205,23 @@ msgstr ""
 msgid "[no release info]"
 msgstr ""

-#: picard/tagger.py:405 picard/tagger.py:438
+#: picard/tagger.py:407 picard/tagger.py:440
 #, python-format
 msgid "Adding %(count)d file from '%(directory)s' ..."
 msgid_plural "Adding %(count)d files from '%(directory)s' ..."
 msgstr[0] ""
 msgstr[1] ""

-#: picard/tagger.py:597
+#: picard/tagger.py:599
 #, python-format
 msgid "Removing album %(id)s: %(artist)s - %(album)s"
 msgstr ""

-#: picard/tagger.py:613
+#: picard/tagger.py:615
 msgid "CD Lookup Error"
 msgstr ""

-#: picard/tagger.py:614
+#: picard/tagger.py:616
 #, python-format
 msgid ""
 "Error while reading CD:\n"
@@ -269,6 +269,10 @@ msgstr "फ्रेंच"
 msgid "Italian"
 msgstr "इटालियन"

+#: picard/const/languages.py:57
+msgid "Norwegian Bokmal"
+msgstr ""
+
 #: picard/const/languages.py:59
 msgid "Dutch"
 msgstr "डच"
@@ -332,12 +336,12 @@ msgstr ""
 msgid "Whitelist"
 msgstr ""

-#: picard/ui/cdlookup.py:35 picard/ui/mainwindow.py:625 picard/util/tags.py:21
+#: picard/ui/cdlookup.py:35 picard/ui/mainwindow.py:626 picard/util/tags.py:21
 msgid "Album"
 msgstr ""

-#: picard/ui/cdlookup.py:35 picard/ui/itemviews.py:96
-#: picard/ui/mainwindow.py:626 picard/ui/searchdialog.py:326
+#: picard/ui/cdlookup.py:35 picard/ui/itemviews.py:105
+#: picard/ui/mainwindow.py:627 picard/ui/searchdialog.py:326
 #: picard/ui/searchdialog.py:513 picard/util/tags.py:22
 msgid "Artist"
 msgstr "कलाकार"
@@ -371,10 +375,22 @@ msgid_plural "%s (%i releases)"
 msgstr[0] ""
 msgstr[1] ""

-#: picard/ui/coverartbox.py:143
+#: picard/ui/coverartbox.py:141
 msgid "View release on MusicBrainz"
 msgstr ""

+#: picard/ui/coverartbox.py:174
+msgid "Show more details"
+msgstr ""
+
+#: picard/ui/coverartbox.py:199
+msgid "New Cover Art"
+msgstr ""
+
+#: picard/ui/coverartbox.py:200
+msgid "Original Cover Art"
+msgstr ""
+
 #: picard/ui/filebrowser.py:40
 msgid "&Move Tagged Files Here"
 msgstr ""
@@ -503,116 +519,116 @@ msgstr ""
 msgid "Pending requests"
 msgstr ""

-#: picard/ui/itemviews.py:94 picard/util/tags.py:23
+#: picard/ui/itemviews.py:103 picard/util/tags.py:23
 msgid "Title"
 msgstr "शीर्षक"

-#: picard/ui/itemviews.py:95 picard/ui/searchdialog.py:325
+#: picard/ui/itemviews.py:104 picard/ui/searchdialog.py:325
 #: picard/util/tags.py:87
 msgid "Length"
 msgstr "लांबी"

-#: picard/ui/itemviews.py:162
+#: picard/ui/itemviews.py:171
 msgid "Bad match"
 msgstr ""

-#: picard/ui/itemviews.py:163
+#: picard/ui/itemviews.py:172
 msgid "Poor match"
 msgstr ""

-#: picard/ui/itemviews.py:164
+#: picard/ui/itemviews.py:173
 msgid "Ok match"
 msgstr ""

-#: picard/ui/itemviews.py:165
+#: picard/ui/itemviews.py:174
 msgid "Good match"
 msgstr ""

-#: picard/ui/itemviews.py:166
+#: picard/ui/itemviews.py:175
 msgid "Great match"
 msgstr ""

-#: picard/ui/itemviews.py:167
+#: picard/ui/itemviews.py:176
 msgid "Excellent match"
 msgstr ""

-#: picard/ui/itemviews.py:243
+#: picard/ui/itemviews.py:252
 msgid "&Expand all"
 msgstr ""

-#: picard/ui/itemviews.py:245
+#: picard/ui/itemviews.py:254
 msgid "&Collapse all"
 msgstr ""

-#: picard/ui/itemviews.py:247
+#: picard/ui/itemviews.py:256
 msgid "Select &all"
 msgstr ""

-#: picard/ui/itemviews.py:249
+#: picard/ui/itemviews.py:258
 msgid "Ctrl+A"
 msgstr ""

-#: picard/ui/itemviews.py:315
+#: picard/ui/itemviews.py:324
 msgid "&Other versions"
 msgstr ""

-#: picard/ui/itemviews.py:318
+#: picard/ui/itemviews.py:327
 msgid "Loading..."
 msgstr "लोड होत आहे..."

-#: picard/ui/itemviews.py:383
+#: picard/ui/itemviews.py:392
 msgid "Collections"
 msgstr ""

-#: picard/ui/itemviews.py:386
+#: picard/ui/itemviews.py:395
 msgid "P&lugins"
 msgstr ""

-#: picard/ui/itemviews.py:557
+#: picard/ui/itemviews.py:577
 msgid "file view"
 msgstr ""

-#: picard/ui/itemviews.py:558
+#: picard/ui/itemviews.py:578
 msgid "Contains unmatched files and clusters"
 msgstr ""

-#: picard/ui/itemviews.py:578
+#: picard/ui/itemviews.py:598
 msgid "Clusters"
 msgstr ""

-#: picard/ui/itemviews.py:587
+#: picard/ui/itemviews.py:607
 msgid "album view"
 msgstr ""

-#: picard/ui/itemviews.py:588
+#: picard/ui/itemviews.py:608
 msgid "Contains albums and matched files"
 msgstr ""

-#: picard/ui/itemviews.py:694 picard/ui/options/renaming.py:188
+#: picard/ui/itemviews.py:714 picard/ui/options/renaming.py:188
 msgid "Error"
 msgstr ""

-#: picard/ui/itemviews.py:698
+#: picard/ui/itemviews.py:718
 msgid "Album modified and complete"
 msgstr ""

-#: picard/ui/itemviews.py:701
+#: picard/ui/itemviews.py:721
 msgid "Album unchanged and complete"
 msgstr ""

-#: picard/ui/itemviews.py:705
+#: picard/ui/itemviews.py:725
 msgid "Album modified"
 msgstr ""

-#: picard/ui/itemviews.py:708
+#: picard/ui/itemviews.py:728
 msgid "Album unchanged"
 msgstr ""

-#: picard/ui/itemviews.py:811
+#: picard/ui/itemviews.py:831
 msgid "Track saved"
 msgstr ""

-#: picard/ui/itemviews.py:813 picard/ui/itemviews.py:817
+#: picard/ui/itemviews.py:833 picard/ui/itemviews.py:837
 msgid "Pending"
 msgstr ""

@@ -803,7 +819,7 @@ msgstr "Ctrl+B"
 msgid "&Cover Art"
 msgstr ""

-#: picard/ui/mainwindow.py:407 picard/ui/mainwindow.py:619
+#: picard/ui/mainwindow.py:407 picard/ui/mainwindow.py:620
 #: picard/ui/searchdialog.py:71
 msgid "Search"
 msgstr ""
@@ -830,175 +846,179 @@ msgid ""
 "even if they have no metadata"
 msgstr ""

-#: picard/ui/mainwindow.py:421
+#: picard/ui/mainwindow.py:420
+msgid "Identify the file using its AcoustID audio fingerprint"
+msgstr ""
+
+#: picard/ui/mainwindow.py:422
 msgid "Ctrl+Y"
 msgstr "Ctrl+Y"

-#: picard/ui/mainwindow.py:424
+#: picard/ui/mainwindow.py:425
 msgid "Cl&uster"
 msgstr ""

-#: picard/ui/mainwindow.py:425
+#: picard/ui/mainwindow.py:426
 msgid "Cluster files into album clusters"
 msgstr ""

-#: picard/ui/mainwindow.py:428
+#: picard/ui/mainwindow.py:429
 msgid "Ctrl+U"
 msgstr "Ctrl+U"

-#: picard/ui/mainwindow.py:431
+#: picard/ui/mainwindow.py:432
 msgid "&Lookup"
 msgstr ""

-#: picard/ui/mainwindow.py:432
+#: picard/ui/mainwindow.py:433
 msgid "Lookup selected items in MusicBrainz"
 msgstr ""

-#: picard/ui/mainwindow.py:437
+#: picard/ui/mainwindow.py:438
 msgid "Ctrl+L"
 msgstr "Ctrl+L"

-#: picard/ui/mainwindow.py:440
+#: picard/ui/mainwindow.py:441
 msgid "&Info..."
 msgstr ""

-#: picard/ui/mainwindow.py:443
+#: picard/ui/mainwindow.py:444
 msgid "Ctrl+I"
 msgstr "Ctrl+I"

-#: picard/ui/mainwindow.py:446
+#: picard/ui/mainwindow.py:447
 msgid "&Refresh"
 msgstr ""

-#: picard/ui/mainwindow.py:447
+#: picard/ui/mainwindow.py:448
 msgid "Ctrl+R"
 msgstr "Ctrl+R"

-#: picard/ui/mainwindow.py:450
+#: picard/ui/mainwindow.py:451
 msgid "&Rename Files"
 msgstr ""

-#: picard/ui/mainwindow.py:455
+#: picard/ui/mainwindow.py:456
 msgid "&Move Files"
 msgstr ""

-#: picard/ui/mainwindow.py:460
+#: picard/ui/mainwindow.py:461
 msgid "Save &Tags"
 msgstr ""

-#: picard/ui/mainwindow.py:465
+#: picard/ui/mainwindow.py:466
 msgid "Tags From &File Names..."
 msgstr ""

-#: picard/ui/mainwindow.py:469
+#: picard/ui/mainwindow.py:470
 msgid "&Open My Collections in Browser"
 msgstr ""

-#: picard/ui/mainwindow.py:473
+#: picard/ui/mainwindow.py:474
 msgid "View Error/Debug &Log"
 msgstr ""

-#: picard/ui/mainwindow.py:476
+#: picard/ui/mainwindow.py:477
 msgid "View Activity &History"
 msgstr ""

-#: picard/ui/mainwindow.py:483
+#: picard/ui/mainwindow.py:484
 msgid "Open in &Player"
 msgstr ""

-#: picard/ui/mainwindow.py:484
+#: picard/ui/mainwindow.py:485
 msgid "Play the file in your default media player"
 msgstr ""

-#: picard/ui/mainwindow.py:488
+#: picard/ui/mainwindow.py:489
 msgid "Open Containing &Folder"
 msgstr ""

-#: picard/ui/mainwindow.py:489
+#: picard/ui/mainwindow.py:490
 msgid "Open the containing folder in your file explorer"
 msgstr ""

-#: picard/ui/mainwindow.py:518
+#: picard/ui/mainwindow.py:519
 msgid "&File"
 msgstr ""

-#: picard/ui/mainwindow.py:529
+#: picard/ui/mainwindow.py:530
 msgid "&Edit"
 msgstr ""

-#: picard/ui/mainwindow.py:535
+#: picard/ui/mainwindow.py:536
 msgid "&View"
 msgstr ""

-#: picard/ui/mainwindow.py:541
+#: picard/ui/mainwindow.py:542
 msgid "&Options"
 msgstr ""

-#: picard/ui/mainwindow.py:547
+#: picard/ui/mainwindow.py:548
 msgid "&Tools"
 msgstr ""

-#: picard/ui/mainwindow.py:558 picard/ui/util.py:35
+#: picard/ui/mainwindow.py:559 picard/ui/util.py:35
 msgid "&Help"
 msgstr ""

-#: picard/ui/mainwindow.py:586
+#: picard/ui/mainwindow.py:587
 msgid "Actions"
 msgstr ""

-#: picard/ui/mainwindow.py:627
+#: picard/ui/mainwindow.py:628
 msgid "Track"
 msgstr ""

-#: picard/ui/mainwindow.py:703
+#: picard/ui/mainwindow.py:704
 msgid "All Supported Formats"
 msgstr ""

-#: picard/ui/mainwindow.py:730
+#: picard/ui/mainwindow.py:731
 #, python-format
 msgid "Adding multiple directories from '%(directory)s' ..."
 msgstr ""

-#: picard/ui/mainwindow.py:735
+#: picard/ui/mainwindow.py:736
 #, python-format
 msgid "Adding directory: '%(directory)s' ..."
 msgstr ""

-#: picard/ui/mainwindow.py:801
+#: picard/ui/mainwindow.py:809
 msgid "Configuration Required"
 msgstr ""

-#: picard/ui/mainwindow.py:802
+#: picard/ui/mainwindow.py:810
 msgid ""
 "Audio fingerprinting is not yet configured. Would you like to configure it "
 "now?"
 msgstr ""

-#: picard/ui/mainwindow.py:902
+#: picard/ui/mainwindow.py:916
 #, python-format
 msgid "%(filename)s (error: %(error)s)"
 msgstr ""

-#: picard/ui/mainwindow.py:908
+#: picard/ui/mainwindow.py:922
 #, python-format
 msgid "%(filename)s"
 msgstr ""

-#: picard/ui/mainwindow.py:918
+#: picard/ui/mainwindow.py:933
 #, python-format
 msgid "%(filename)s (%(similarity)d%%) (error: %(error)s)"
 msgstr ""

-#: picard/ui/mainwindow.py:925
+#: picard/ui/mainwindow.py:940
 #, python-format
 msgid "%(filename)s (%(similarity)d%%)"
 msgstr ""

-#: picard/ui/mainwindow.py:961
+#: picard/ui/mainwindow.py:976
 msgid "Authentication Required"
 msgstr ""

-#: picard/ui/mainwindow.py:962
+#: picard/ui/mainwindow.py:977
 msgid ""
 "Picard needs authorization to access your personal data on the MusicBrainz "
 "server. Would you like to log in now?"
@@ -1107,7 +1127,7 @@ msgstr ""
 msgid "Retry"
 msgstr ""

-#: picard/ui/searchdialog.py:288
+#: picard/ui/searchdialog.py:283
 #, python-format
 msgid ""
 "<strong>Following error occurred while fetching "
@@ -1911,19 +1931,19 @@ msgstr ""
 msgid "Reset all settings for current option page"
 msgstr ""

-#: picard/ui/options/dialog.py:166
+#: picard/ui/options/dialog.py:172
 msgid "You are about to reset your options for this page."
 msgstr ""

-#: picard/ui/options/dialog.py:170
+#: picard/ui/options/dialog.py:176
 msgid "Warning! This will reset all of your settings."
 msgstr ""

-#: picard/ui/options/dialog.py:177
+#: picard/ui/options/dialog.py:183
 msgid "Confirm Reset"
 msgstr ""

-#: picard/ui/options/dialog.py:178
+#: picard/ui/options/dialog.py:184
 msgid "Are you sure?"
 msgstr ""

@@ -2094,7 +2114,7 @@ msgstr ""
 msgid "File Naming"
 msgstr ""

-#: picard/ui/options/renaming.py:175 picard/ui/options/scripting.py:406
+#: picard/ui/options/renaming.py:175 picard/ui/options/scripting.py:410
 msgid ""
 "<a href=\"%(picard-doc-scripting-url)s\">Open Scripting Documentation in "
 "your browser</a>"
@@ -2136,15 +2156,15 @@ msgstr ""
 msgid "Scripting"
 msgstr ""

-#: picard/ui/options/scripting.py:292
+#: picard/ui/options/scripting.py:293
 msgid "Are you sure you want to remove this script?"
 msgstr ""

-#: picard/ui/options/scripting.py:293
+#: picard/ui/options/scripting.py:294
 msgid "Confirm Remove"
 msgstr ""

-#: picard/ui/options/scripting.py:376
+#: picard/ui/options/scripting.py:377
 msgid "Script Error"
 msgstr ""

--- a/po/nb.po
+++ b/po/nb.po
--- a/po/nl.po
+++ b/po/nl.po
@@ -3,6 +3,7 @@
 # This file is distributed under the same license as the picard project.
 # 
 # Translators:
+# reneweesp <bmom43@hotmail.com>, 2017
 # Dogmatica <jeroendoggen@hotmail.com>, 2006
 # Jan van Thiel <zout@gewis.nl>, 2006
 # Maurits Meulenbelt <mfmeulenbelt@gmail.com>, 2012
@@ -11,8 +12,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: MusicBrainz\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2017-01-18 12:51+0100\n"
-"PO-Revision-Date: 2017-01-19 09:58+0000\n"
+"POT-Creation-Date: 2017-03-05 09:58+0100\n"
+"PO-Revision-Date: 2017-03-11 19:41+0000\n"
 "Last-Translator: Maurits Meulenbelt <mfmeulenbelt@gmail.com>\n"
 "Language-Team: Dutch (http://www.transifex.com/musicbrainz/musicbrainz/language/nl/)\n"
 "MIME-Version: 1.0\n"
@@ -59,26 +60,26 @@ msgstr "AcoustID’s met succes ingediend."
 msgid "Unmatched Files"
 msgstr "Niet-overeenkomende bestanden"

-#: picard/album.py:206
+#: picard/album.py:200
 #, python-format
 msgid "[could not load album %s]"
 msgstr "[kan album %s niet laden]"

-#: picard/album.py:295
+#: picard/album.py:289
 #, python-format
 msgid "Album %(id)s loaded: %(artist)s - %(album)s"
 msgstr "Album %(id)s geladen: %(artist)s - %(album)s"

-#: picard/album.py:338
+#: picard/album.py:332
 #, python-format
 msgid "Loading album %(id)s ..."
 msgstr "Album %(id)s wordt geladen …"

-#: picard/album.py:342
+#: picard/album.py:336
 msgid "[loading album information]"
 msgstr "[albuminformatie laden]"

-#: picard/album.py:527
+#: picard/album.py:523
 #, python-format
 msgid "; %i image"
 msgid_plural "; %i images"
@@ -100,72 +101,72 @@ msgstr "Cluster %(album)s geïdentificeerd!"
 msgid "Looking up the metadata for cluster %(album)s..."
 msgstr "Metadata voor cluster %(album)s wordt opgezocht …"

-#: picard/collection.py:64
+#: picard/collection.py:67
 #, python-format
 msgid "Added %(count)i release to collection \"%(name)s\""
 msgid_plural "Added %(count)i releases to collection \"%(name)s\""
 msgstr[0] "%(count)i uitgave aan collectie ‘%(name)s’ toegevoegd"
 msgstr[1] "%(count)i uitgaves aan collectie ‘%(name)s’ toegevoegd"

-#: picard/collection.py:86
+#: picard/collection.py:89
 #, python-format
 msgid "Removed %(count)i release from collection \"%(name)s\""
 msgid_plural "Removed %(count)i releases from collection \"%(name)s\""
 msgstr[0] "%(count)i uitgave uit collectie ‘%(name)s’ verwijderd"
 msgstr[1] "%(count)i uitgaves uit collectie ‘%(name)s’ verwijderd"

-#: picard/collection.py:100
+#: picard/collection.py:104
 #, python-format
 msgid "Error loading collections: %(error)s"
 msgstr "Fout bij het laden van collecties: %(error)s"

-#: picard/config_upgrade.py:58 picard/config_upgrade.py:71
+#: picard/config_upgrade.py:57 picard/config_upgrade.py:70
 msgid "Various Artists file naming scheme removal"
 msgstr "Het verwijderen van het benoemingsstelsel voor diverse artiesten"

-#: picard/config_upgrade.py:59
+#: picard/config_upgrade.py:58
 msgid ""
 "The separate file naming scheme for various artists albums has been removed in this version of Picard.\n"
 "Your file naming scheme has automatically been merged with that of single artist albums."
 msgstr "Het aparte stelsel om albums van diverse artiesten te hernoemen, is in deze versie van Picard verwijderd.\nJe stelsel is automatisch samengevoegd met het stelsel voor albums van één artiest."

-#: picard/config_upgrade.py:72
+#: picard/config_upgrade.py:71
 msgid ""
 "The separate file naming scheme for various artists albums has been removed in this version of Picard.\n"
 "You currently do not use this option, but have a separate file naming scheme defined.\n"
 "Do you want to remove it or merge it with your file naming scheme for single artist albums?"
 msgstr "Het aparte stelsel om albums van diverse artiesten te hernoemen, is in deze versie van Picard verwijderd.\nJe gebruikt deze optie nu niet, maar je hebt wel een apart stelsel gedefinieerd. Wil je deze verwijderen of samenvoegen met je stelsel voor het hernoemen van albums van één artiest?"

-#: picard/config_upgrade.py:78
+#: picard/config_upgrade.py:77
 msgid "Merge"
 msgstr "Samenvoegen"

-#: picard/config_upgrade.py:78 picard/ui/metadatabox.py:314
+#: picard/config_upgrade.py:77 picard/ui/metadatabox.py:314
 #: picard/ui/options/interface.py:75 picard/ui/ui_options_interface.py:141
 msgid "Remove"
 msgstr "&Verwijderen"

-#: picard/config_upgrade.py:193 picard/ui/options/scripting.py:28
+#: picard/config_upgrade.py:200 picard/ui/options/scripting.py:28
 #, python-format
 msgid "My script %d"
 msgstr "Mijn script %d"

-#: picard/file.py:541
+#: picard/file.py:565
 #, python-format
 msgid "No matching tracks for file '%(filename)s'"
 msgstr "Geen overeenkomende nummers voor bestand ‘%(filename)s’"

-#: picard/file.py:557
+#: picard/file.py:581
 #, python-format
 msgid "No matching tracks above the threshold for file '%(filename)s'"
 msgstr "Geen bijpassende tracks boven de limiet voor bestand ‘%(filename)s’"

-#: picard/file.py:564
+#: picard/file.py:588
 #, python-format
 msgid "File '%(filename)s' identified!"
 msgstr "Bestand ‘%(filename)s’ geïdentificeerd!"

-#: picard/file.py:584
+#: picard/file.py:608
 #, python-format
 msgid "Looking up the metadata for file %(filename)s ..."
 msgstr "Metadata voor het bestand %(filename)s wordt opgezocht …"
@@ -208,23 +209,23 @@ msgstr "[geen streepjescode]"
 msgid "[no release info]"
 msgstr "[geen uitgave-informatie]"

-#: picard/tagger.py:405 picard/tagger.py:438
+#: picard/tagger.py:407 picard/tagger.py:440
 #, python-format
 msgid "Adding %(count)d file from '%(directory)s' ..."
 msgid_plural "Adding %(count)d files from '%(directory)s' ..."
 msgstr[0] "%(count)d bestand uit ‘%(directory)s’ wordt toegevoegd …"
 msgstr[1] "%(count)d bestanden uit ‘%(directory)s’ worden toegevoegd …"

-#: picard/tagger.py:597
+#: picard/tagger.py:599
 #, python-format
 msgid "Removing album %(id)s: %(artist)s - %(album)s"
 msgstr "Verwijdert album %(id)s: %(artist)s - %(album)s"

-#: picard/tagger.py:613
+#: picard/tagger.py:615
 msgid "CD Lookup Error"
 msgstr "Fout bij opzoeken van de cd"

-#: picard/tagger.py:614
+#: picard/tagger.py:616
 #, python-format
 msgid ""
 "Error while reading CD:\n"
@@ -272,6 +273,10 @@ msgstr "Frans"
 msgid "Italian"
 msgstr "Italiaans"

+#: picard/const/languages.py:57
+msgid "Norwegian Bokmal"
+msgstr "Bokmål"
+
 #: picard/const/languages.py:59
 msgid "Dutch"
 msgstr "Nederlands"
@@ -335,12 +340,12 @@ msgstr "Lokale bestanden"
 msgid "Whitelist"
 msgstr "Witte lijst"

-#: picard/ui/cdlookup.py:35 picard/ui/mainwindow.py:625 picard/util/tags.py:21
+#: picard/ui/cdlookup.py:35 picard/ui/mainwindow.py:626 picard/util/tags.py:21
 msgid "Album"
 msgstr "Album"

-#: picard/ui/cdlookup.py:35 picard/ui/itemviews.py:96
-#: picard/ui/mainwindow.py:626 picard/ui/searchdialog.py:326
+#: picard/ui/cdlookup.py:35 picard/ui/itemviews.py:105
+#: picard/ui/mainwindow.py:627 picard/ui/searchdialog.py:326
 #: picard/ui/searchdialog.py:513 picard/util/tags.py:22
 msgid "Artist"
 msgstr "Artiest"
@@ -365,7 +370,7 @@ msgstr "Streepjescode"

 #: picard/ui/collectionmenu.py:42
 msgid "Refresh List"
-msgstr "Lijst verversen"
+msgstr "Lijst herladen"

 #: picard/ui/collectionmenu.py:86
 #, python-format
@@ -374,10 +379,22 @@ msgid_plural "%s (%i releases)"
 msgstr[0] "%s (%i uitgave)"
 msgstr[1] "%s (%i uitgaves)"

-#: picard/ui/coverartbox.py:143
+#: picard/ui/coverartbox.py:141
 msgid "View release on MusicBrainz"
 msgstr "Uitgave op MusicBrainz bekijken"

+#: picard/ui/coverartbox.py:174
+msgid "Show more details"
+msgstr "Meer details"
+
+#: picard/ui/coverartbox.py:199
+msgid "New Cover Art"
+msgstr "Nieuwe afbeelding"
+
+#: picard/ui/coverartbox.py:200
+msgid "Original Cover Art"
+msgstr "Huidige afbeelding"
+
 #: picard/ui/filebrowser.py:40
 msgid "&Move Tagged Files Here"
 msgstr "Getagde bestanden hierheen &verplaatsen"
@@ -506,116 +523,116 @@ msgstr "Bestanden in behandeling"
 msgid "Pending requests"
 msgstr "Verzoeken in behandeling"

-#: picard/ui/itemviews.py:94 picard/util/tags.py:23
+#: picard/ui/itemviews.py:103 picard/util/tags.py:23
 msgid "Title"
 msgstr "Titel"

-#: picard/ui/itemviews.py:95 picard/ui/searchdialog.py:325
+#: picard/ui/itemviews.py:104 picard/ui/searchdialog.py:325
 #: picard/util/tags.py:87
 msgid "Length"
 msgstr "Lengte"

-#: picard/ui/itemviews.py:162
+#: picard/ui/itemviews.py:171
 msgid "Bad match"
 msgstr "Bijna geen overeenkomsten"

-#: picard/ui/itemviews.py:163
+#: picard/ui/itemviews.py:172
 msgid "Poor match"
 msgstr "Weinig overeenkomsten"

-#: picard/ui/itemviews.py:164
+#: picard/ui/itemviews.py:173
 msgid "Ok match"
 msgstr "Redelijk veel overeenkomsten"

-#: picard/ui/itemviews.py:165
+#: picard/ui/itemviews.py:174
 msgid "Good match"
 msgstr "Veel overeenkomsten"

-#: picard/ui/itemviews.py:166
+#: picard/ui/itemviews.py:175
 msgid "Great match"
 msgstr "Heel veel overeenkomsten"

-#: picard/ui/itemviews.py:167
+#: picard/ui/itemviews.py:176
 msgid "Excellent match"
 msgstr "Bijna compleet hetzelfde"

-#: picard/ui/itemviews.py:243
+#: picard/ui/itemviews.py:252
 msgid "&Expand all"
 msgstr "&Alles uitklappen"

-#: picard/ui/itemviews.py:245
+#: picard/ui/itemviews.py:254
 msgid "&Collapse all"
 msgstr "Alles &Inklappen"

-#: picard/ui/itemviews.py:247
+#: picard/ui/itemviews.py:256
 msgid "Select &all"
 msgstr "Alles selecteren"

-#: picard/ui/itemviews.py:249
+#: picard/ui/itemviews.py:258
 msgid "Ctrl+A"
 msgstr "Ctrl+A"

-#: picard/ui/itemviews.py:315
+#: picard/ui/itemviews.py:324
 msgid "&Other versions"
 msgstr "&Andere versies"

-#: picard/ui/itemviews.py:318
+#: picard/ui/itemviews.py:327
 msgid "Loading..."
 msgstr "Laden …"

-#: picard/ui/itemviews.py:383
+#: picard/ui/itemviews.py:392
 msgid "Collections"
 msgstr "Collecties"

-#: picard/ui/itemviews.py:386
+#: picard/ui/itemviews.py:395
 msgid "P&lugins"
 msgstr "P&lugins"

-#: picard/ui/itemviews.py:557
+#: picard/ui/itemviews.py:577
 msgid "file view"
 msgstr "bestandsoverzicht"

-#: picard/ui/itemviews.py:558
+#: picard/ui/itemviews.py:578
 msgid "Contains unmatched files and clusters"
 msgstr "Bevat niet-overeenkomende bestanden en clusters"

-#: picard/ui/itemviews.py:578
+#: picard/ui/itemviews.py:598
 msgid "Clusters"
 msgstr "Clusters"

-#: picard/ui/itemviews.py:587
+#: picard/ui/itemviews.py:607
 msgid "album view"
 msgstr "uitgave-overzicht"

-#: picard/ui/itemviews.py:588
+#: picard/ui/itemviews.py:608
 msgid "Contains albums and matched files"
 msgstr "Bevat albums en overeenkomende bestanden"

-#: picard/ui/itemviews.py:694 picard/ui/options/renaming.py:188
+#: picard/ui/itemviews.py:714 picard/ui/options/renaming.py:188
 msgid "Error"
 msgstr "Fout"

-#: picard/ui/itemviews.py:698
+#: picard/ui/itemviews.py:718
 msgid "Album modified and complete"
 msgstr "De uitgave is compleet en heeft wijzigingen."

-#: picard/ui/itemviews.py:701
+#: picard/ui/itemviews.py:721
 msgid "Album unchanged and complete"
 msgstr "De uitgave is compleet en heeft geen wijzigingen."

-#: picard/ui/itemviews.py:705
+#: picard/ui/itemviews.py:725
 msgid "Album modified"
 msgstr "De uitgave heeft wijzigingen."

-#: picard/ui/itemviews.py:708
+#: picard/ui/itemviews.py:728
 msgid "Album unchanged"
 msgstr "De uitgave heeft geen wijzigingen."

-#: picard/ui/itemviews.py:811
+#: picard/ui/itemviews.py:831
 msgid "Track saved"
 msgstr "Nummer opgeslagen"

-#: picard/ui/itemviews.py:813 picard/ui/itemviews.py:817
+#: picard/ui/itemviews.py:833 picard/ui/itemviews.py:837
 msgid "Pending"
 msgstr "In de wacht"

@@ -806,7 +823,7 @@ msgstr "Ctrl+B"
 msgid "&Cover Art"
 msgstr "&Hoesafbeelding"

-#: picard/ui/mainwindow.py:407 picard/ui/mainwindow.py:619
+#: picard/ui/mainwindow.py:407 picard/ui/mainwindow.py:620
 #: picard/ui/searchdialog.py:71
 msgid "Search"
 msgstr "&Zoeken"
@@ -833,175 +850,179 @@ msgid ""
 "even if they have no metadata"
 msgstr "AcoustID-vingerafdrukken gebruiken om muziek aan de hand van het geluid te identificeren, zelfs als ze geen tags hebben."

-#: picard/ui/mainwindow.py:421
+#: picard/ui/mainwindow.py:420
+msgid "Identify the file using its AcoustID audio fingerprint"
+msgstr "Het bestand aan de hand van zijn vingerafdruk identificeren"
+
+#: picard/ui/mainwindow.py:422
 msgid "Ctrl+Y"
 msgstr "Ctrl+Y"

-#: picard/ui/mainwindow.py:424
+#: picard/ui/mainwindow.py:425
 msgid "Cl&uster"
 msgstr "&Clusteren"

-#: picard/ui/mainwindow.py:425
+#: picard/ui/mainwindow.py:426
 msgid "Cluster files into album clusters"
 msgstr "Bestanden naar uitgave clusteren"

-#: picard/ui/mainwindow.py:428
+#: picard/ui/mainwindow.py:429
 msgid "Ctrl+U"
 msgstr "Ctrl+U"

-#: picard/ui/mainwindow.py:431
+#: picard/ui/mainwindow.py:432
 msgid "&Lookup"
 msgstr "&Opzoeken"

-#: picard/ui/mainwindow.py:432
+#: picard/ui/mainwindow.py:433
 msgid "Lookup selected items in MusicBrainz"
 msgstr "Geselecteerde object in MusicBrainz opzoeken"

-#: picard/ui/mainwindow.py:437
+#: picard/ui/mainwindow.py:438
 msgid "Ctrl+L"
 msgstr "Ctrl+L"

-#: picard/ui/mainwindow.py:440
+#: picard/ui/mainwindow.py:441
 msgid "&Info..."
 msgstr "&Info"

-#: picard/ui/mainwindow.py:443
+#: picard/ui/mainwindow.py:444
 msgid "Ctrl+I"
 msgstr "Ctrl+I"

-#: picard/ui/mainwindow.py:446
-msgid "&Refresh"
-msgstr "&Verversen"
-
 #: picard/ui/mainwindow.py:447
+msgid "&Refresh"
+msgstr "&Herladen"
+
+#: picard/ui/mainwindow.py:448
 msgid "Ctrl+R"
 msgstr "Ctrl+R"

-#: picard/ui/mainwindow.py:450
+#: picard/ui/mainwindow.py:451
 msgid "&Rename Files"
 msgstr "Bestanden &hernoemen"

-#: picard/ui/mainwindow.py:455
+#: picard/ui/mainwindow.py:456
 msgid "&Move Files"
 msgstr "Bestanden &verplaatsen"

-#: picard/ui/mainwindow.py:460
+#: picard/ui/mainwindow.py:461
 msgid "Save &Tags"
 msgstr "&Tags opslaan"

-#: picard/ui/mainwindow.py:465
+#: picard/ui/mainwindow.py:466
 msgid "Tags From &File Names..."
 msgstr "&Tags uit bestandsnamen halen"

-#: picard/ui/mainwindow.py:469
+#: picard/ui/mainwindow.py:470
 msgid "&Open My Collections in Browser"
 msgstr "Mijn Collecties in de browser &openen"

-#: picard/ui/mainwindow.py:473
+#: picard/ui/mainwindow.py:474
 msgid "View Error/Debug &Log"
 msgstr "Fout- en debug&logboek bekijken"

-#: picard/ui/mainwindow.py:476
+#: picard/ui/mainwindow.py:477
 msgid "View Activity &History"
 msgstr "&Activiteitengeschiedenis bekijken"

-#: picard/ui/mainwindow.py:483
+#: picard/ui/mainwindow.py:484
 msgid "Open in &Player"
 msgstr "&Nummer luisteren"

-#: picard/ui/mainwindow.py:484
+#: picard/ui/mainwindow.py:485
 msgid "Play the file in your default media player"
 msgstr "Bestand in de standaard mediaspeler afspelen"

-#: picard/ui/mainwindow.py:488
+#: picard/ui/mainwindow.py:489
 msgid "Open Containing &Folder"
 msgstr "De bijbehorende &map openen"

-#: picard/ui/mainwindow.py:489
+#: picard/ui/mainwindow.py:490
 msgid "Open the containing folder in your file explorer"
 msgstr "De bijbehorende map in je verkenner openen"

-#: picard/ui/mainwindow.py:518
+#: picard/ui/mainwindow.py:519
 msgid "&File"
 msgstr "&Bestand"

-#: picard/ui/mainwindow.py:529
+#: picard/ui/mainwindow.py:530
 msgid "&Edit"
 msgstr "B&ewerken"

-#: picard/ui/mainwindow.py:535
+#: picard/ui/mainwindow.py:536
 msgid "&View"
 msgstr "Bee&ld"

-#: picard/ui/mainwindow.py:541
+#: picard/ui/mainwindow.py:542
 msgid "&Options"
 msgstr "&Opties"

-#: picard/ui/mainwindow.py:547
+#: picard/ui/mainwindow.py:548
 msgid "&Tools"
 msgstr "&Hulpmiddelen"

-#: picard/ui/mainwindow.py:558 picard/ui/util.py:35
+#: picard/ui/mainwindow.py:559 picard/ui/util.py:35
 msgid "&Help"
 msgstr "&Help"

-#: picard/ui/mainwindow.py:586
+#: picard/ui/mainwindow.py:587
 msgid "Actions"
 msgstr "&Acties"

-#: picard/ui/mainwindow.py:627
+#: picard/ui/mainwindow.py:628
 msgid "Track"
 msgstr "Nummer"

-#: picard/ui/mainwindow.py:703
+#: picard/ui/mainwindow.py:704
 msgid "All Supported Formats"
 msgstr "Alle ondersteunde bestandsformaten"

-#: picard/ui/mainwindow.py:730
+#: picard/ui/mainwindow.py:731
 #, python-format
 msgid "Adding multiple directories from '%(directory)s' ..."
 msgstr "Meerdere mappen uit ‘%(directory)s’ worden toegevoegd …"

-#: picard/ui/mainwindow.py:735
+#: picard/ui/mainwindow.py:736
 #, python-format
 msgid "Adding directory: '%(directory)s' ..."
 msgstr "De map ‘%(directory)s’ wordt toegevoegd …"

-#: picard/ui/mainwindow.py:801
+#: picard/ui/mainwindow.py:809
 msgid "Configuration Required"
 msgstr "Configuratie vereist"

-#: picard/ui/mainwindow.py:802
+#: picard/ui/mainwindow.py:810
 msgid ""
 "Audio fingerprinting is not yet configured. Would you like to configure it "
 "now?"
 msgstr "Het gebruik van audiovingerafdrukken is nog niet ingesteld. Wil je het nu instellen?"

-#: picard/ui/mainwindow.py:902
+#: picard/ui/mainwindow.py:916
 #, python-format
 msgid "%(filename)s (error: %(error)s)"
 msgstr "%(filename)s (fout: %(error)s)"

-#: picard/ui/mainwindow.py:908
+#: picard/ui/mainwindow.py:922
 #, python-format
 msgid "%(filename)s"
 msgstr "%(filename)s"

-#: picard/ui/mainwindow.py:918
+#: picard/ui/mainwindow.py:933
 #, python-format
 msgid "%(filename)s (%(similarity)d%%) (error: %(error)s)"
 msgstr "%(filename)s (%(similarity)d%%) (fout: %(error)s)"

-#: picard/ui/mainwindow.py:925
+#: picard/ui/mainwindow.py:940
 #, python-format
 msgid "%(filename)s (%(similarity)d%%)"
 msgstr "%(filename)s (%(similarity)d%%)"

-#: picard/ui/mainwindow.py:961
+#: picard/ui/mainwindow.py:976
 msgid "Authentication Required"
 msgstr "Machtiging vereist"

-#: picard/ui/mainwindow.py:962
+#: picard/ui/mainwindow.py:977
 msgid ""
 "Picard needs authorization to access your personal data on the MusicBrainz "
 "server. Would you like to log in now?"
@@ -1011,15 +1032,15 @@ msgstr "Picard heeft een machtiging nodig om toegang tot je persoonlijke gegeven
 #, python-format
 msgid "(different across %d item)"
 msgid_plural "(different across %d items)"
-msgstr[0] "(verschillend tussen %d object)"
-msgstr[1] "(verschillend tussen %d objecten)"
+msgstr[0] "(verschilt bij %d nummer)"
+msgstr[1] "(verschilt bij %d nummers)"

 #: picard/ui/metadatabox.py:92
 #, python-format
 msgid "(missing from %d item)"
 msgid_plural "(missing from %d items)"
-msgstr[0] "(ontbrekend bij %d object)"
-msgstr[1] "(ontbrekend bij %d objecten)"
+msgstr[0] "(ontbreekt bij bij %d nummer)"
+msgstr[1] "(ontbreekt bij %d nummers)"

 #: picard/ui/metadatabox.py:155
 msgid "metadata view"
@@ -1110,7 +1131,7 @@ msgstr "<strong>Aan het laden …</strong>"
 msgid "Retry"
 msgstr "Opnieuw proberen"

-#: picard/ui/searchdialog.py:288
+#: picard/ui/searchdialog.py:283
 #, python-format
 msgid ""
 "<strong>Following error occurred while fetching "
@@ -1431,7 +1452,7 @@ msgstr "Algemeen"

 #: picard/ui/ui_options_general.py:99
 msgid "Automatically scan all new files"
-msgstr "Automatisch alle nieuwe bestanden analyseren"
+msgstr "Alle nieuwe bestanden automatisch analyseren"

 #: picard/ui/ui_options_general.py:100
 msgid "Ignore MBIDs when loading new files"
@@ -1669,7 +1690,7 @@ msgstr "Lege mappen verwijderen"

 #: picard/ui/ui_options_renaming.py:168
 msgid "Rename files when saving"
-msgstr "bestanden een andere naam geven bij het opslaan"
+msgstr "Bestanden bij het opslaan een andere naam geven"

 #: picard/ui/ui_options_renaming.py:169
 msgid "Replace non-ASCII characters"
@@ -1809,17 +1830,17 @@ msgstr "Grootste formaat"

 #: picard/ui/ui_provider_options_caa.py:92
 msgid "Save only one front image as separate file"
-msgstr "Maar één afbeelding van de voorkant als los bestand opslaan."
+msgstr "Maar één afbeelding van de voorkant als los bestand opslaan"

 #: picard/ui/ui_provider_options_caa.py:93
 msgid "Download only approved images"
-msgstr "Alleen goedgekeurde afbeeldingen downloaden."
+msgstr "Alleen goedgekeurde afbeeldingen downloaden"

 #: picard/ui/ui_provider_options_caa.py:94
 msgid ""
 "Use the first image type as the filename. This will not change the filename "
 "of front images."
-msgstr "Gebruik het eerste afbeeldingstype als bestandsnaam. Dit verandert de bestandsnaam van afbeeldingen van de voorkant niet."
+msgstr "Gebruik het eerste afbeeldingstype als bestandsnaam. Dit verandert de bestandsnaam van afbeeldingen van de voorkant niet"

 #: picard/ui/ui_provider_options_local.py:64
 msgid "Local cover art files match the following regular expression:"
@@ -1838,7 +1859,7 @@ msgstr "Bestandsnamen naar tags converteren"

 #: picard/ui/ui_tagsfromfilenames.py:51
 msgid "Replace underscores with spaces"
-msgstr "Lage streepjes vervangen door spaties"
+msgstr "Lage streepjes door spaties vervangen"

 #: picard/ui/ui_tagsfromfilenames.py:52
 msgid "&Preview"
@@ -1896,7 +1917,7 @@ msgstr "Geavanceerd"

 #: picard/ui/options/cover.py:34
 msgid "Cover Art"
-msgstr "Hoesafbeelding"
+msgstr "Hoesafbeeldingen"

 #: picard/ui/options/dialog.py:82
 msgid "&Restore all Defaults"
@@ -1914,19 +1935,19 @@ msgstr "Instellingen herstellen"
 msgid "Reset all settings for current option page"
 msgstr "Zet de instellingen van deze pagina terug naar de standaard"

-#: picard/ui/options/dialog.py:166
+#: picard/ui/options/dialog.py:172
 msgid "You are about to reset your options for this page."
 msgstr "Je staat op het punt de instellingen op deze pagina naar de standaardwaardes te herstellen."

-#: picard/ui/options/dialog.py:170
+#: picard/ui/options/dialog.py:176
 msgid "Warning! This will reset all of your settings."
 msgstr "Waarschuwing! Dit zet al je instellingen terug naar de standaardwaardes."

-#: picard/ui/options/dialog.py:177
+#: picard/ui/options/dialog.py:183
 msgid "Confirm Reset"
 msgstr "Terugzetten bevestigen"

-#: picard/ui/options/dialog.py:178
+#: picard/ui/options/dialog.py:184
 msgid "Are you sure?"
 msgstr "Weet je het zeker?"

@@ -2016,7 +2037,7 @@ msgstr "Je kan elementen slepen om de volgorde te veranderen"

 #: picard/ui/options/interface.py:209 picard/ui/options/interface.py:291
 msgid "label"
-msgstr ""
+msgstr "label"

 #: picard/ui/options/matching.py:28
 msgid "Matching"
@@ -2097,7 +2118,7 @@ msgstr "Alles terugzetten"
 msgid "File Naming"
 msgstr "Bestandsnamen"

-#: picard/ui/options/renaming.py:175 picard/ui/options/scripting.py:406
+#: picard/ui/options/renaming.py:175 picard/ui/options/scripting.py:410
 msgid ""
 "<a href=\"%(picard-doc-scripting-url)s\">Open Scripting Documentation in "
 "your browser</a>"
@@ -2139,15 +2160,15 @@ msgstr "Script verwijderen"
 msgid "Scripting"
 msgstr "Scripting"

-#: picard/ui/options/scripting.py:292
+#: picard/ui/options/scripting.py:293
 msgid "Are you sure you want to remove this script?"
 msgstr "Weet je zeker dat je dit script wil verwijderen?"

-#: picard/ui/options/scripting.py:293
+#: picard/ui/options/scripting.py:294
 msgid "Confirm Remove"
 msgstr "Verwijderen bevestigen"

-#: picard/ui/options/scripting.py:376
+#: picard/ui/options/scripting.py:377
 msgid "Script Error"
 msgstr "Scriptfout"

@@ -2433,7 +2454,7 @@ msgstr "Catalogusnummer"

 #: picard/util/tags.py:81
 msgid "DJ-Mixer"
-msgstr "DJ-Mixer"
+msgstr "Dj-mixer"

 #: picard/util/tags.py:82
 msgid "Media"
--- a/po/oc.po
+++ b/po/oc.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: MusicBrainz\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2017-01-18 12:51+0100\n"
-"PO-Revision-Date: 2017-01-19 09:17+0000\n"
+"POT-Creation-Date: 2017-03-05 09:58+0100\n"
+"PO-Revision-Date: 2017-03-05 10:00+0000\n"
 "Last-Translator: nikki\n"
 "Language-Team: Occitan (post 1500) (http://www.transifex.com/musicbrainz/musicbrainz/language/oc/)\n"
 "MIME-Version: 1.0\n"
@@ -56,26 +56,26 @@ msgstr ""
 msgid "Unmatched Files"
 msgstr "Fichièrs sens gropament"

-#: picard/album.py:206
+#: picard/album.py:200
 #, python-format
 msgid "[could not load album %s]"
 msgstr "[cargament de l'album %s impossible]"

-#: picard/album.py:295
+#: picard/album.py:289
 #, python-format
 msgid "Album %(id)s loaded: %(artist)s - %(album)s"
 msgstr ""

-#: picard/album.py:338
+#: picard/album.py:332
 #, python-format
 msgid "Loading album %(id)s ..."
 msgstr ""

-#: picard/album.py:342
+#: picard/album.py:336
 msgid "[loading album information]"
 msgstr "[cargament de las informacions de l'album]"

-#: picard/album.py:527
+#: picard/album.py:523
 #, python-format
 msgid "; %i image"
 msgid_plural "; %i images"
@@ -97,72 +97,72 @@ msgstr ""
 msgid "Looking up the metadata for cluster %(album)s..."
 msgstr ""

-#: picard/collection.py:64
+#: picard/collection.py:67
 #, python-format
 msgid "Added %(count)i release to collection \"%(name)s\""
 msgid_plural "Added %(count)i releases to collection \"%(name)s\""
 msgstr[0] ""
 msgstr[1] ""

-#: picard/collection.py:86
+#: picard/collection.py:89
 #, python-format
 msgid "Removed %(count)i release from collection \"%(name)s\""
 msgid_plural "Removed %(count)i releases from collection \"%(name)s\""
 msgstr[0] ""
 msgstr[1] ""

-#: picard/collection.py:100
+#: picard/collection.py:104
 #, python-format
 msgid "Error loading collections: %(error)s"
 msgstr ""

-#: picard/config_upgrade.py:58 picard/config_upgrade.py:71
+#: picard/config_upgrade.py:57 picard/config_upgrade.py:70
 msgid "Various Artists file naming scheme removal"
 msgstr ""

-#: picard/config_upgrade.py:59
+#: picard/config_upgrade.py:58
 msgid ""
 "The separate file naming scheme for various artists albums has been removed in this version of Picard.\n"
 "Your file naming scheme has automatically been merged with that of single artist albums."
 msgstr ""

-#: picard/config_upgrade.py:72
+#: picard/config_upgrade.py:71
 msgid ""
 "The separate file naming scheme for various artists albums has been removed in this version of Picard.\n"
 "You currently do not use this option, but have a separate file naming scheme defined.\n"
 "Do you want to remove it or merge it with your file naming scheme for single artist albums?"
 msgstr ""

-#: picard/config_upgrade.py:78
+#: picard/config_upgrade.py:77
 msgid "Merge"
 msgstr ""

-#: picard/config_upgrade.py:78 picard/ui/metadatabox.py:314
+#: picard/config_upgrade.py:77 picard/ui/metadatabox.py:314
 #: picard/ui/options/interface.py:75 picard/ui/ui_options_interface.py:141
 msgid "Remove"
 msgstr ""

-#: picard/config_upgrade.py:193 picard/ui/options/scripting.py:28
+#: picard/config_upgrade.py:200 picard/ui/options/scripting.py:28
 #, python-format
 msgid "My script %d"
 msgstr ""

-#: picard/file.py:541
+#: picard/file.py:565
 #, python-format
 msgid "No matching tracks for file '%(filename)s'"
 msgstr ""

-#: picard/file.py:557
+#: picard/file.py:581
 #, python-format
 msgid "No matching tracks above the threshold for file '%(filename)s'"
 msgstr ""

-#: picard/file.py:564
+#: picard/file.py:588
 #, python-format
 msgid "File '%(filename)s' identified!"
 msgstr ""

-#: picard/file.py:584
+#: picard/file.py:608
 #, python-format
 msgid "Looking up the metadata for file %(filename)s ..."
 msgstr ""
@@ -205,23 +205,23 @@ msgstr ""
 msgid "[no release info]"
 msgstr ""

-#: picard/tagger.py:405 picard/tagger.py:438
+#: picard/tagger.py:407 picard/tagger.py:440
 #, python-format
 msgid "Adding %(count)d file from '%(directory)s' ..."
 msgid_plural "Adding %(count)d files from '%(directory)s' ..."
 msgstr[0] ""
 msgstr[1] ""

-#: picard/tagger.py:597
+#: picard/tagger.py:599
 #, python-format
 msgid "Removing album %(id)s: %(artist)s - %(album)s"
 msgstr ""

-#: picard/tagger.py:613
+#: picard/tagger.py:615
 msgid "CD Lookup Error"
 msgstr "Error de recèrca del CD"

-#: picard/tagger.py:614
+#: picard/tagger.py:616
 #, python-format
 msgid ""
 "Error while reading CD:\n"
@@ -269,6 +269,10 @@ msgstr "Francés"
 msgid "Italian"
 msgstr "Italian"

+#: picard/const/languages.py:57
+msgid "Norwegian Bokmal"
+msgstr ""
+
 #: picard/const/languages.py:59
 msgid "Dutch"
 msgstr "Neerlandés"
@@ -332,12 +336,12 @@ msgstr ""
 msgid "Whitelist"
 msgstr ""

-#: picard/ui/cdlookup.py:35 picard/ui/mainwindow.py:625 picard/util/tags.py:21
+#: picard/ui/cdlookup.py:35 picard/ui/mainwindow.py:626 picard/util/tags.py:21
 msgid "Album"
 msgstr "Album"

-#: picard/ui/cdlookup.py:35 picard/ui/itemviews.py:96
-#: picard/ui/mainwindow.py:626 picard/ui/searchdialog.py:326
+#: picard/ui/cdlookup.py:35 picard/ui/itemviews.py:105
+#: picard/ui/mainwindow.py:627 picard/ui/searchdialog.py:326
 #: picard/ui/searchdialog.py:513 picard/util/tags.py:22
 msgid "Artist"
 msgstr "Artista"
@@ -371,10 +375,22 @@ msgid_plural "%s (%i releases)"
 msgstr[0] ""
 msgstr[1] ""

-#: picard/ui/coverartbox.py:143
+#: picard/ui/coverartbox.py:141
 msgid "View release on MusicBrainz"
 msgstr ""

+#: picard/ui/coverartbox.py:174
+msgid "Show more details"
+msgstr ""
+
+#: picard/ui/coverartbox.py:199
+msgid "New Cover Art"
+msgstr ""
+
+#: picard/ui/coverartbox.py:200
+msgid "Original Cover Art"
+msgstr ""
+
 #: picard/ui/filebrowser.py:40
 msgid "&Move Tagged Files Here"
 msgstr "&Desplaça los fichièrs etiquetats aicí"
@@ -503,116 +519,116 @@ msgstr ""
 msgid "Pending requests"
 msgstr ""

-#: picard/ui/itemviews.py:94 picard/util/tags.py:23
+#: picard/ui/itemviews.py:103 picard/util/tags.py:23
 msgid "Title"
 msgstr "Títol"

-#: picard/ui/itemviews.py:95 picard/ui/searchdialog.py:325
+#: picard/ui/itemviews.py:104 picard/ui/searchdialog.py:325
 #: picard/util/tags.py:87
 msgid "Length"
 msgstr "Durada"

-#: picard/ui/itemviews.py:162
+#: picard/ui/itemviews.py:171
 msgid "Bad match"
 msgstr ""

-#: picard/ui/itemviews.py:163
+#: picard/ui/itemviews.py:172
 msgid "Poor match"
 msgstr ""

-#: picard/ui/itemviews.py:164
+#: picard/ui/itemviews.py:173
 msgid "Ok match"
 msgstr ""

-#: picard/ui/itemviews.py:165
+#: picard/ui/itemviews.py:174
 msgid "Good match"
 msgstr ""

-#: picard/ui/itemviews.py:166
+#: picard/ui/itemviews.py:175
 msgid "Great match"
 msgstr ""

-#: picard/ui/itemviews.py:167
+#: picard/ui/itemviews.py:176
 msgid "Excellent match"
 msgstr ""

-#: picard/ui/itemviews.py:243
+#: picard/ui/itemviews.py:252
 msgid "&Expand all"
 msgstr "&Tot desvolopar"

-#: picard/ui/itemviews.py:245
+#: picard/ui/itemviews.py:254
 msgid "&Collapse all"
 msgstr "&Tot reduire"

-#: picard/ui/itemviews.py:247
+#: picard/ui/itemviews.py:256
 msgid "Select &all"
 msgstr ""

-#: picard/ui/itemviews.py:249
+#: picard/ui/itemviews.py:258
 msgid "Ctrl+A"
 msgstr ""

-#: picard/ui/itemviews.py:315
+#: picard/ui/itemviews.py:324
 msgid "&Other versions"
 msgstr ""

-#: picard/ui/itemviews.py:318
+#: picard/ui/itemviews.py:327
 msgid "Loading..."
 msgstr ""

-#: picard/ui/itemviews.py:383
+#: picard/ui/itemviews.py:392
 msgid "Collections"
 msgstr ""

-#: picard/ui/itemviews.py:386
+#: picard/ui/itemviews.py:395
 msgid "P&lugins"
 msgstr ""

-#: picard/ui/itemviews.py:557
+#: picard/ui/itemviews.py:577
 msgid "file view"
 msgstr ""

-#: picard/ui/itemviews.py:558
+#: picard/ui/itemviews.py:578
 msgid "Contains unmatched files and clusters"
 msgstr ""

-#: picard/ui/itemviews.py:578
+#: picard/ui/itemviews.py:598
 msgid "Clusters"
 msgstr "Gropaments"

-#: picard/ui/itemviews.py:587
+#: picard/ui/itemviews.py:607
 msgid "album view"
 msgstr ""

-#: picard/ui/itemviews.py:588
+#: picard/ui/itemviews.py:608
 msgid "Contains albums and matched files"
 msgstr ""

-#: picard/ui/itemviews.py:694 picard/ui/options/renaming.py:188
+#: picard/ui/itemviews.py:714 picard/ui/options/renaming.py:188
 msgid "Error"
 msgstr "Error"

-#: picard/ui/itemviews.py:698
+#: picard/ui/itemviews.py:718
 msgid "Album modified and complete"
 msgstr ""

-#: picard/ui/itemviews.py:701
+#: picard/ui/itemviews.py:721
 msgid "Album unchanged and complete"
 msgstr ""

-#: picard/ui/itemviews.py:705
+#: picard/ui/itemviews.py:725
 msgid "Album modified"
 msgstr ""

-#: picard/ui/itemviews.py:708
+#: picard/ui/itemviews.py:728
 msgid "Album unchanged"
 msgstr ""

-#: picard/ui/itemviews.py:811
+#: picard/ui/itemviews.py:831
 msgid "Track saved"
 msgstr ""

-#: picard/ui/itemviews.py:813 picard/ui/itemviews.py:817
+#: picard/ui/itemviews.py:833 picard/ui/itemviews.py:837
 msgid "Pending"
 msgstr ""

@@ -803,7 +819,7 @@ msgstr "Ctrl+B"
 msgid "&Cover Art"
 msgstr "&Pocheta"

-#: picard/ui/mainwindow.py:407 picard/ui/mainwindow.py:619
+#: picard/ui/mainwindow.py:407 picard/ui/mainwindow.py:620
 #: picard/ui/searchdialog.py:71
 msgid "Search"
 msgstr "Recercar"
@@ -830,175 +846,179 @@ msgid ""
 "even if they have no metadata"
 msgstr ""

-#: picard/ui/mainwindow.py:421
+#: picard/ui/mainwindow.py:420
+msgid "Identify the file using its AcoustID audio fingerprint"
+msgstr ""
+
+#: picard/ui/mainwindow.py:422
 msgid "Ctrl+Y"
 msgstr "Ctrl+Y"

-#: picard/ui/mainwindow.py:424
+#: picard/ui/mainwindow.py:425
 msgid "Cl&uster"
 msgstr "Gro&patge"

-#: picard/ui/mainwindow.py:425
+#: picard/ui/mainwindow.py:426
 msgid "Cluster files into album clusters"
 msgstr ""

-#: picard/ui/mainwindow.py:428
+#: picard/ui/mainwindow.py:429
 msgid "Ctrl+U"
 msgstr "Ctrl+U"

-#: picard/ui/mainwindow.py:431
+#: picard/ui/mainwindow.py:432
 msgid "&Lookup"
 msgstr "&Recercar"

-#: picard/ui/mainwindow.py:432
+#: picard/ui/mainwindow.py:433
 msgid "Lookup selected items in MusicBrainz"
 msgstr ""

-#: picard/ui/mainwindow.py:437
+#: picard/ui/mainwindow.py:438
 msgid "Ctrl+L"
 msgstr "Ctrl+L"

-#: picard/ui/mainwindow.py:440
+#: picard/ui/mainwindow.py:441
 msgid "&Info..."
 msgstr ""

-#: picard/ui/mainwindow.py:443
+#: picard/ui/mainwindow.py:444
 msgid "Ctrl+I"
 msgstr ""

-#: picard/ui/mainwindow.py:446
+#: picard/ui/mainwindow.py:447
 msgid "&Refresh"
 msgstr "&Refrescar"

-#: picard/ui/mainwindow.py:447
+#: picard/ui/mainwindow.py:448
 msgid "Ctrl+R"
 msgstr ""

-#: picard/ui/mainwindow.py:450
+#: picard/ui/mainwindow.py:451
 msgid "&Rename Files"
 msgstr "To&rnat nomenar los fichièrs"

-#: picard/ui/mainwindow.py:455
+#: picard/ui/mainwindow.py:456
 msgid "&Move Files"
 msgstr "Desplaçar los fichièrs"

-#: picard/ui/mainwindow.py:460
+#: picard/ui/mainwindow.py:461
 msgid "Save &Tags"
 msgstr "Salvar las me&tadonadas"

-#: picard/ui/mainwindow.py:465
+#: picard/ui/mainwindow.py:466
 msgid "Tags From &File Names..."
 msgstr "Metadonadas dels noms de &fichièr..."

-#: picard/ui/mainwindow.py:469
+#: picard/ui/mainwindow.py:470
 msgid "&Open My Collections in Browser"
 msgstr ""

-#: picard/ui/mainwindow.py:473
+#: picard/ui/mainwindow.py:474
 msgid "View Error/Debug &Log"
 msgstr ""

-#: picard/ui/mainwindow.py:476
+#: picard/ui/mainwindow.py:477
 msgid "View Activity &History"
 msgstr ""

-#: picard/ui/mainwindow.py:483
+#: picard/ui/mainwindow.py:484
 msgid "Open in &Player"
 msgstr ""

-#: picard/ui/mainwindow.py:484
+#: picard/ui/mainwindow.py:485
 msgid "Play the file in your default media player"
 msgstr ""

-#: picard/ui/mainwindow.py:488
+#: picard/ui/mainwindow.py:489
 msgid "Open Containing &Folder"
 msgstr ""

-#: picard/ui/mainwindow.py:489
+#: picard/ui/mainwindow.py:490
 msgid "Open the containing folder in your file explorer"
 msgstr ""

-#: picard/ui/mainwindow.py:518
+#: picard/ui/mainwindow.py:519
 msgid "&File"
 msgstr "&Fichièr"

-#: picard/ui/mainwindow.py:529
+#: picard/ui/mainwindow.py:530
 msgid "&Edit"
 msgstr "&Editar"

-#: picard/ui/mainwindow.py:535
+#: picard/ui/mainwindow.py:536
 msgid "&View"
 msgstr "&Vista"

-#: picard/ui/mainwindow.py:541
+#: picard/ui/mainwindow.py:542
 msgid "&Options"
 msgstr "&Opcions"

-#: picard/ui/mainwindow.py:547
+#: picard/ui/mainwindow.py:548
 msgid "&Tools"
 msgstr "&Espleches"

-#: picard/ui/mainwindow.py:558 picard/ui/util.py:35
+#: picard/ui/mainwindow.py:559 picard/ui/util.py:35
 msgid "&Help"
 msgstr "&Ajuda"

-#: picard/ui/mainwindow.py:586
+#: picard/ui/mainwindow.py:587
 msgid "Actions"
 msgstr "Accions"

-#: picard/ui/mainwindow.py:627
+#: picard/ui/mainwindow.py:628
 msgid "Track"
 msgstr "Pista"

-#: picard/ui/mainwindow.py:703
+#: picard/ui/mainwindow.py:704
 msgid "All Supported Formats"
 msgstr "Totes los formats preses en carga"

-#: picard/ui/mainwindow.py:730
+#: picard/ui/mainwindow.py:731
 #, python-format
 msgid "Adding multiple directories from '%(directory)s' ..."
 msgstr ""

-#: picard/ui/mainwindow.py:735
+#: picard/ui/mainwindow.py:736
 #, python-format
 msgid "Adding directory: '%(directory)s' ..."
 msgstr ""

-#: picard/ui/mainwindow.py:801
+#: picard/ui/mainwindow.py:809
 msgid "Configuration Required"
 msgstr ""

-#: picard/ui/mainwindow.py:802
+#: picard/ui/mainwindow.py:810
 msgid ""
 "Audio fingerprinting is not yet configured. Would you like to configure it "
 "now?"
 msgstr ""

-#: picard/ui/mainwindow.py:902
+#: picard/ui/mainwindow.py:916
 #, python-format
 msgid "%(filename)s (error: %(error)s)"
 msgstr ""

-#: picard/ui/mainwindow.py:908
+#: picard/ui/mainwindow.py:922
 #, python-format
 msgid "%(filename)s"
 msgstr ""

-#: picard/ui/mainwindow.py:918
+#: picard/ui/mainwindow.py:933
 #, python-format
 msgid "%(filename)s (%(similarity)d%%) (error: %(error)s)"
 msgstr ""

-#: picard/ui/mainwindow.py:925
+#: picard/ui/mainwindow.py:940
 #, python-format
 msgid "%(filename)s (%(similarity)d%%)"
 msgstr ""

-#: picard/ui/mainwindow.py:961
+#: picard/ui/mainwindow.py:976
 msgid "Authentication Required"
 msgstr ""

-#: picard/ui/mainwindow.py:962
+#: picard/ui/mainwindow.py:977
 msgid ""
 "Picard needs authorization to access your personal data on the MusicBrainz "
 "server. Would you like to log in now?"
@@ -1107,7 +1127,7 @@ msgstr ""
 msgid "Retry"
 msgstr ""

-#: picard/ui/searchdialog.py:288
+#: picard/ui/searchdialog.py:283
 #, python-format
 msgid ""
 "<strong>Following error occurred while fetching "
@@ -1911,19 +1931,19 @@ msgstr ""
 msgid "Reset all settings for current option page"
 msgstr ""

-#: picard/ui/options/dialog.py:166
+#: picard/ui/options/dialog.py:172
 msgid "You are about to reset your options for this page."
 msgstr ""

-#: picard/ui/options/dialog.py:170
+#: picard/ui/options/dialog.py:176
 msgid "Warning! This will reset all of your settings."
 msgstr ""

-#: picard/ui/options/dialog.py:177
+#: picard/ui/options/dialog.py:183
 msgid "Confirm Reset"
 msgstr ""

-#: picard/ui/options/dialog.py:178
+#: picard/ui/options/dialog.py:184
 msgid "Are you sure?"
 msgstr ""

@@ -2094,7 +2114,7 @@ msgstr ""
 msgid "File Naming"
 msgstr ""

-#: picard/ui/options/renaming.py:175 picard/ui/options/scripting.py:406
+#: picard/ui/options/renaming.py:175 picard/ui/options/scripting.py:410
 msgid ""
 "<a href=\"%(picard-doc-scripting-url)s\">Open Scripting Documentation in "
 "your browser</a>"
@@ -2136,15 +2156,15 @@ msgstr ""
 msgid "Scripting"
 msgstr "Escripts"

-#: picard/ui/options/scripting.py:292
+#: picard/ui/options/scripting.py:293
 msgid "Are you sure you want to remove this script?"
 msgstr ""

-#: picard/ui/options/scripting.py:293
+#: picard/ui/options/scripting.py:294
 msgid "Confirm Remove"
 msgstr ""

-#: picard/ui/options/scripting.py:376
+#: picard/ui/options/scripting.py:377
 msgid "Script Error"
 msgstr "Error d'escript"

--- a/po/picard.pot
+++ b/po/picard.pot
--- a/po/pl.po
+++ b/po/pl.po
@@ -12,8 +12,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: MusicBrainz\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2017-01-18 12:51+0100\n"
-"PO-Revision-Date: 2017-01-19 09:17+0000\n"
+"POT-Creation-Date: 2017-03-05 09:58+0100\n"
+"PO-Revision-Date: 2017-03-05 10:00+0000\n"
 "Last-Translator: nikki\n"
 "Language-Team: Polish (http://www.transifex.com/musicbrainz/musicbrainz/language/pl/)\n"
 "MIME-Version: 1.0\n"
@@ -21,7 +21,7 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Generated-By: Babel 2.3.4\n"
 "Language: pl\n"
-"Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
+"Plural-Forms: nplurals=4; plural=(n==1 ? 0 : (n%10>=2 && n%10<=4) && (n%100<12 || n%100>=14) ? 1 : n!=1 && (n%10>=0 && n%10<=1) || (n%10>=5 && n%10<=9) || (n%100>=12 && n%100<=14) ? 2 : 3);\n"

 #: picard/acoustid.py:111
 #, python-format
@@ -60,32 +60,33 @@ msgstr "Wysyłanie AcoustIDs zakończone sukcesem."
 msgid "Unmatched Files"
 msgstr "Pliki niedopasowane"

-#: picard/album.py:206
+#: picard/album.py:200
 #, python-format
 msgid "[could not load album %s]"
 msgstr "[nie można wczytać albumu %s]"

-#: picard/album.py:295
+#: picard/album.py:289
 #, python-format
 msgid "Album %(id)s loaded: %(artist)s - %(album)s"
 msgstr "Wczytany %(id)s album: %(artist)s - %(album)s"

-#: picard/album.py:338
+#: picard/album.py:332
 #, python-format
 msgid "Loading album %(id)s ..."
 msgstr "Wczytywanie albumu %(id)s ..."

-#: picard/album.py:342
+#: picard/album.py:336
 msgid "[loading album information]"
 msgstr "[wczytywanie informacji o albumie]"

-#: picard/album.py:527
+#: picard/album.py:523
 #, python-format
 msgid "; %i image"
 msgid_plural "; %i images"
 msgstr[0] "%i grafika"
 msgstr[1] "%i grafiki"
 msgstr[2] "%i grafik"
+msgstr[3] "%i grafik"

 #: picard/cluster.py:166 picard/cluster.py:179
 #, python-format
@@ -102,74 +103,76 @@ msgstr "Grupa %(album)s zidentyfikowana!"
 msgid "Looking up the metadata for cluster %(album)s..."
 msgstr "Sprawdzanie metadanych dla grupy %(album)s..."

-#: picard/collection.py:64
+#: picard/collection.py:67
 #, python-format
 msgid "Added %(count)i release to collection \"%(name)s\""
 msgid_plural "Added %(count)i releases to collection \"%(name)s\""
 msgstr[0] "Dodano %(count)i wydanie do kolekcji \"%(name)s\""
 msgstr[1] "Dodano %(count)i wydania do kolekcji \"%(name)s\""
 msgstr[2] "Dodano %(count)i wydań do kolekcji \"%(name)s\""
+msgstr[3] "Dodano %(count)i wydań do kolekcji \"%(name)s\""

-#: picard/collection.py:86
+#: picard/collection.py:89
 #, python-format
 msgid "Removed %(count)i release from collection \"%(name)s\""
 msgid_plural "Removed %(count)i releases from collection \"%(name)s\""
 msgstr[0] "Usunięto %(count)i wydanie z kolekcji \"%(name)s\""
 msgstr[1] "Usunięto %(count)i wydania z kolekcji \"%(name)s\""
 msgstr[2] "Usunięto %(count)i wydań z kolekcji \"%(name)s\""
+msgstr[3] "Usunięto %(count)i wydań z kolekcji \"%(name)s\""

-#: picard/collection.py:100
+#: picard/collection.py:104
 #, python-format
 msgid "Error loading collections: %(error)s"
 msgstr "Błąd podczas ładowania kolekcji: %(error)s"

-#: picard/config_upgrade.py:58 picard/config_upgrade.py:71
+#: picard/config_upgrade.py:57 picard/config_upgrade.py:70
 msgid "Various Artists file naming scheme removal"
 msgstr "Usuwanie schematu nazewnictwa dla Różnych Wykonawców"

-#: picard/config_upgrade.py:59
+#: picard/config_upgrade.py:58
 msgid ""
 "The separate file naming scheme for various artists albums has been removed in this version of Picard.\n"
 "Your file naming scheme has automatically been merged with that of single artist albums."
 msgstr "W tej wersji programu usunięto oddzielny schemat nazewniczy dla wydań autorstwa różnych wykonawców. \nTwój stary schemat został scalony ze schematem dla wydań pojedynczych wykonawców."

-#: picard/config_upgrade.py:72
+#: picard/config_upgrade.py:71
 msgid ""
 "The separate file naming scheme for various artists albums has been removed in this version of Picard.\n"
 "You currently do not use this option, but have a separate file naming scheme defined.\n"
 "Do you want to remove it or merge it with your file naming scheme for single artist albums?"
 msgstr "W tej wersji programu usunięto oddzielny schemat nazewniczy dla wydań autorstwa różnych wykonawców.\nObecnie nie używasz tej funkcji, ale posiadasz definicję takiego schematu.\nChcesz ją usunąć czy też wolisz scalić ze schematem dla wydań pojedynczych wykonawców?"

-#: picard/config_upgrade.py:78
+#: picard/config_upgrade.py:77
 msgid "Merge"
 msgstr "Scal"

-#: picard/config_upgrade.py:78 picard/ui/metadatabox.py:314
+#: picard/config_upgrade.py:77 picard/ui/metadatabox.py:314
 #: picard/ui/options/interface.py:75 picard/ui/ui_options_interface.py:141
 msgid "Remove"
 msgstr "Usuń"

-#: picard/config_upgrade.py:193 picard/ui/options/scripting.py:28
+#: picard/config_upgrade.py:200 picard/ui/options/scripting.py:28
 #, python-format
 msgid "My script %d"
 msgstr ""

-#: picard/file.py:541
+#: picard/file.py:565
 #, python-format
 msgid "No matching tracks for file '%(filename)s'"
 msgstr "Brak pasujących utworów dla pliku '%(filename)s'"

-#: picard/file.py:557
+#: picard/file.py:581
 #, python-format
 msgid "No matching tracks above the threshold for file '%(filename)s'"
 msgstr "Nie znaleziono pasujących ścieżek powyżej progu dla pliku '%(filename)s'"

-#: picard/file.py:564
+#: picard/file.py:588
 #, python-format
 msgid "File '%(filename)s' identified!"
 msgstr "Plik '%(filename)s' zidentyfikowany!"

-#: picard/file.py:584
+#: picard/file.py:608
 #, python-format
 msgid "Looking up the metadata for file %(filename)s ..."
 msgstr "Sprawdzanie metadanych dla pliku %(filename)s ..."
@@ -212,24 +215,25 @@ msgstr "[brak kodu kreskowego]"
 msgid "[no release info]"
 msgstr "[brak informacji o wydaniu]"

-#: picard/tagger.py:405 picard/tagger.py:438
+#: picard/tagger.py:407 picard/tagger.py:440
 #, python-format
 msgid "Adding %(count)d file from '%(directory)s' ..."
 msgid_plural "Adding %(count)d files from '%(directory)s' ..."
 msgstr[0] "Dodawanie %(count)d pliku z '%(directory)s' ..."
 msgstr[1] "Dodawanie %(count)d plików z '%(directory)s' ..."
 msgstr[2] "Dodawanie %(count)d plików z '%(directory)s' ..."
+msgstr[3] "Dodawanie %(count)d plików z '%(directory)s' ..."

-#: picard/tagger.py:597
+#: picard/tagger.py:599
 #, python-format
 msgid "Removing album %(id)s: %(artist)s - %(album)s"
 msgstr "Usuwanie albumu %(id)s: %(artist)s - %(album)s"

-#: picard/tagger.py:613
+#: picard/tagger.py:615
 msgid "CD Lookup Error"
 msgstr "Błąd sprawdzania CD"

-#: picard/tagger.py:614
+#: picard/tagger.py:616
 #, python-format
 msgid ""
 "Error while reading CD:\n"
@@ -277,6 +281,10 @@ msgstr "francuski"
 msgid "Italian"
 msgstr "włoski"

+#: picard/const/languages.py:57
+msgid "Norwegian Bokmal"
+msgstr ""
+
 #: picard/const/languages.py:59
 msgid "Dutch"
 msgstr "holenderski"
@@ -340,12 +348,12 @@ msgstr ""
 msgid "Whitelist"
 msgstr ""

-#: picard/ui/cdlookup.py:35 picard/ui/mainwindow.py:625 picard/util/tags.py:21
+#: picard/ui/cdlookup.py:35 picard/ui/mainwindow.py:626 picard/util/tags.py:21
 msgid "Album"
 msgstr "Album"

-#: picard/ui/cdlookup.py:35 picard/ui/itemviews.py:96
-#: picard/ui/mainwindow.py:626 picard/ui/searchdialog.py:326
+#: picard/ui/cdlookup.py:35 picard/ui/itemviews.py:105
+#: picard/ui/mainwindow.py:627 picard/ui/searchdialog.py:326
 #: picard/ui/searchdialog.py:513 picard/util/tags.py:22
 msgid "Artist"
 msgstr "Wykonawca"
@@ -379,11 +387,24 @@ msgid_plural "%s (%i releases)"
 msgstr[0] "%s (%i wydanie)"
 msgstr[1] "%s (%i wydania)"
 msgstr[2] "%s (%i wydań)"
+msgstr[3] "%s (%i wydań)"

-#: picard/ui/coverartbox.py:143
+#: picard/ui/coverartbox.py:141
 msgid "View release on MusicBrainz"
 msgstr "Zobacz wydanie w MusicBrainz"

+#: picard/ui/coverartbox.py:174
+msgid "Show more details"
+msgstr ""
+
+#: picard/ui/coverartbox.py:199
+msgid "New Cover Art"
+msgstr ""
+
+#: picard/ui/coverartbox.py:200
+msgid "Original Cover Art"
+msgstr ""
+
 #: picard/ui/filebrowser.py:40
 msgid "&Move Tagged Files Here"
 msgstr "&Przenieś otagowane pliki tutaj"
@@ -512,116 +533,116 @@ msgstr "Oczekujące pliki"
 msgid "Pending requests"
 msgstr "Oczekujące zapytania"

-#: picard/ui/itemviews.py:94 picard/util/tags.py:23
+#: picard/ui/itemviews.py:103 picard/util/tags.py:23
 msgid "Title"
 msgstr "Tytuł"

-#: picard/ui/itemviews.py:95 picard/ui/searchdialog.py:325
+#: picard/ui/itemviews.py:104 picard/ui/searchdialog.py:325
 #: picard/util/tags.py:87
 msgid "Length"
 msgstr "Długość"

-#: picard/ui/itemviews.py:162
+#: picard/ui/itemviews.py:171
 msgid "Bad match"
 msgstr ""

-#: picard/ui/itemviews.py:163
+#: picard/ui/itemviews.py:172
 msgid "Poor match"
 msgstr ""

-#: picard/ui/itemviews.py:164
+#: picard/ui/itemviews.py:173
 msgid "Ok match"
 msgstr ""

-#: picard/ui/itemviews.py:165
+#: picard/ui/itemviews.py:174
 msgid "Good match"
 msgstr ""

-#: picard/ui/itemviews.py:166
+#: picard/ui/itemviews.py:175
 msgid "Great match"
 msgstr ""

-#: picard/ui/itemviews.py:167
+#: picard/ui/itemviews.py:176
 msgid "Excellent match"
 msgstr ""

-#: picard/ui/itemviews.py:243
+#: picard/ui/itemviews.py:252
 msgid "&Expand all"
 msgstr "&Rozwiń wszystkie"

-#: picard/ui/itemviews.py:245
+#: picard/ui/itemviews.py:254
 msgid "&Collapse all"
 msgstr "&Zwiń wszystkie"

-#: picard/ui/itemviews.py:247
+#: picard/ui/itemviews.py:256
 msgid "Select &all"
 msgstr ""

-#: picard/ui/itemviews.py:249
+#: picard/ui/itemviews.py:258
 msgid "Ctrl+A"
 msgstr ""

-#: picard/ui/itemviews.py:315
+#: picard/ui/itemviews.py:324
 msgid "&Other versions"
 msgstr "&Inne wersje"

-#: picard/ui/itemviews.py:318
+#: picard/ui/itemviews.py:327
 msgid "Loading..."
 msgstr "Wczytywanie..."

-#: picard/ui/itemviews.py:383
+#: picard/ui/itemviews.py:392
 msgid "Collections"
 msgstr "Kolekcje"

-#: picard/ui/itemviews.py:386
+#: picard/ui/itemviews.py:395
 msgid "P&lugins"
 msgstr "W&tyczki"

-#: picard/ui/itemviews.py:557
+#: picard/ui/itemviews.py:577
 msgid "file view"
 msgstr "widok plików"

-#: picard/ui/itemviews.py:558
+#: picard/ui/itemviews.py:578
 msgid "Contains unmatched files and clusters"
 msgstr "Zawiera niedopasowane pliki i grupy"

-#: picard/ui/itemviews.py:578
+#: picard/ui/itemviews.py:598
 msgid "Clusters"
 msgstr "Zbiór"

-#: picard/ui/itemviews.py:587
+#: picard/ui/itemviews.py:607
 msgid "album view"
 msgstr "widok albumów"

-#: picard/ui/itemviews.py:588
+#: picard/ui/itemviews.py:608
 msgid "Contains albums and matched files"
 msgstr "Zawiera albumy i niedopasowane pliki"

-#: picard/ui/itemviews.py:694 picard/ui/options/renaming.py:188
+#: picard/ui/itemviews.py:714 picard/ui/options/renaming.py:188
 msgid "Error"
 msgstr "Błąd"

-#: picard/ui/itemviews.py:698
+#: picard/ui/itemviews.py:718
 msgid "Album modified and complete"
 msgstr ""

-#: picard/ui/itemviews.py:701
+#: picard/ui/itemviews.py:721
 msgid "Album unchanged and complete"
 msgstr ""

-#: picard/ui/itemviews.py:705
+#: picard/ui/itemviews.py:725
 msgid "Album modified"
 msgstr ""

-#: picard/ui/itemviews.py:708
+#: picard/ui/itemviews.py:728
 msgid "Album unchanged"
 msgstr ""

-#: picard/ui/itemviews.py:811
+#: picard/ui/itemviews.py:831
 msgid "Track saved"
 msgstr ""

-#: picard/ui/itemviews.py:813 picard/ui/itemviews.py:817
+#: picard/ui/itemviews.py:833 picard/ui/itemviews.py:837
 msgid "Pending"
 msgstr ""

@@ -658,6 +679,7 @@ msgid_plural ""
 msgstr[0] "%d plik posiada niezapisane zmiany. Zamykając program Picard  utracisz zmiany dokonane na tym pliku."
 msgstr[1] "%d pliki posiadają niezapisane zmiany. Zamykając program Picard utracisz zmiany dokonane na tych plikach."
 msgstr[2] "%d plików posiada niezapisane zmiany. Zamykając program Picard utracisz zmiany dokonane na tych plikach."
+msgstr[3] "%d plików posiada niezapisane zmiany. Zamykając program Picard utracisz zmiany dokonane na tych plikach."

 #: picard/ui/mainwindow.py:172
 msgid "&Quit Picard"
@@ -813,7 +835,7 @@ msgstr "Ctrl+B"
 msgid "&Cover Art"
 msgstr "&Okładka"

-#: picard/ui/mainwindow.py:407 picard/ui/mainwindow.py:619
+#: picard/ui/mainwindow.py:407 picard/ui/mainwindow.py:620
 #: picard/ui/searchdialog.py:71
 msgid "Search"
 msgstr "Znajdź"
@@ -840,175 +862,179 @@ msgid ""
 "even if they have no metadata"
 msgstr ""

-#: picard/ui/mainwindow.py:421
+#: picard/ui/mainwindow.py:420
+msgid "Identify the file using its AcoustID audio fingerprint"
+msgstr ""
+
+#: picard/ui/mainwindow.py:422
 msgid "Ctrl+Y"
 msgstr "Ctrl+Y"

-#: picard/ui/mainwindow.py:424
+#: picard/ui/mainwindow.py:425
 msgid "Cl&uster"
 msgstr "&Grupa"

-#: picard/ui/mainwindow.py:425
+#: picard/ui/mainwindow.py:426
 msgid "Cluster files into album clusters"
 msgstr ""

-#: picard/ui/mainwindow.py:428
+#: picard/ui/mainwindow.py:429
 msgid "Ctrl+U"
 msgstr "Ctrl+U"

-#: picard/ui/mainwindow.py:431
+#: picard/ui/mainwindow.py:432
 msgid "&Lookup"
 msgstr "&Sprawdź"

-#: picard/ui/mainwindow.py:432
+#: picard/ui/mainwindow.py:433
 msgid "Lookup selected items in MusicBrainz"
 msgstr "Wyszukaj zaznaczenie w MusicBrainz"

-#: picard/ui/mainwindow.py:437
+#: picard/ui/mainwindow.py:438
 msgid "Ctrl+L"
 msgstr "Ctrl+L"

-#: picard/ui/mainwindow.py:440
+#: picard/ui/mainwindow.py:441
 msgid "&Info..."
 msgstr "&Info..."

-#: picard/ui/mainwindow.py:443
+#: picard/ui/mainwindow.py:444
 msgid "Ctrl+I"
 msgstr "Ctrl+I"

-#: picard/ui/mainwindow.py:446
+#: picard/ui/mainwindow.py:447
 msgid "&Refresh"
 msgstr "Odśwież"

-#: picard/ui/mainwindow.py:447
+#: picard/ui/mainwindow.py:448
 msgid "Ctrl+R"
 msgstr "Ctrl+R"

-#: picard/ui/mainwindow.py:450
+#: picard/ui/mainwindow.py:451
 msgid "&Rename Files"
 msgstr "Zmień nazwy"

-#: picard/ui/mainwindow.py:455
+#: picard/ui/mainwindow.py:456
 msgid "&Move Files"
 msgstr "P&rzenieś pliki"

-#: picard/ui/mainwindow.py:460
+#: picard/ui/mainwindow.py:461
 msgid "Save &Tags"
 msgstr "Zapisz &tagi"

-#: picard/ui/mainwindow.py:465
+#: picard/ui/mainwindow.py:466
 msgid "Tags From &File Names..."
 msgstr "Tagi z nazwy &pliku"

-#: picard/ui/mainwindow.py:469
+#: picard/ui/mainwindow.py:470
 msgid "&Open My Collections in Browser"
 msgstr "&Otwórz Moje Kolekcje w przeglądarce"

-#: picard/ui/mainwindow.py:473
+#: picard/ui/mainwindow.py:474
 msgid "View Error/Debug &Log"
 msgstr "Wyświet&l dziennik błędów/zdarzeń"

-#: picard/ui/mainwindow.py:476
+#: picard/ui/mainwindow.py:477
 msgid "View Activity &History"
 msgstr "Wyświetl &historię aktywności"

-#: picard/ui/mainwindow.py:483
+#: picard/ui/mainwindow.py:484
 msgid "Open in &Player"
 msgstr ""

-#: picard/ui/mainwindow.py:484
+#: picard/ui/mainwindow.py:485
 msgid "Play the file in your default media player"
 msgstr "Odtwórz plik w domyślnym odtwarzaczu"

-#: picard/ui/mainwindow.py:488
+#: picard/ui/mainwindow.py:489
 msgid "Open Containing &Folder"
 msgstr "Otwórz folder zawierający"

-#: picard/ui/mainwindow.py:489
+#: picard/ui/mainwindow.py:490
 msgid "Open the containing folder in your file explorer"
 msgstr "Otwórz folder zawierający plik w eksploratorze plików"

-#: picard/ui/mainwindow.py:518
+#: picard/ui/mainwindow.py:519
 msgid "&File"
 msgstr "&Plik"

-#: picard/ui/mainwindow.py:529
+#: picard/ui/mainwindow.py:530
 msgid "&Edit"
 msgstr "&Edycja"

-#: picard/ui/mainwindow.py:535
+#: picard/ui/mainwindow.py:536
 msgid "&View"
 msgstr "&Widok"

-#: picard/ui/mainwindow.py:541
+#: picard/ui/mainwindow.py:542
 msgid "&Options"
 msgstr "&Opcje"

-#: picard/ui/mainwindow.py:547
+#: picard/ui/mainwindow.py:548
 msgid "&Tools"
 msgstr "&Narzędzia"

-#: picard/ui/mainwindow.py:558 picard/ui/util.py:35
+#: picard/ui/mainwindow.py:559 picard/ui/util.py:35
 msgid "&Help"
 msgstr "&Pomoc"

-#: picard/ui/mainwindow.py:586
+#: picard/ui/mainwindow.py:587
 msgid "Actions"
 msgstr "Akcje"

-#: picard/ui/mainwindow.py:627
+#: picard/ui/mainwindow.py:628
 msgid "Track"
 msgstr "Utwór"

-#: picard/ui/mainwindow.py:703
+#: picard/ui/mainwindow.py:704
 msgid "All Supported Formats"
 msgstr "Wszystkie wspierane formaty"

-#: picard/ui/mainwindow.py:730
+#: picard/ui/mainwindow.py:731
 #, python-format
 msgid "Adding multiple directories from '%(directory)s' ..."
 msgstr "Dodawanie wielu katalogów z '%(directory)s' ..."

-#: picard/ui/mainwindow.py:735
+#: picard/ui/mainwindow.py:736
 #, python-format
 msgid "Adding directory: '%(directory)s' ..."
 msgstr "Dodawanie katalogu: '%(directory)s' ..."

-#: picard/ui/mainwindow.py:801
+#: picard/ui/mainwindow.py:809
 msgid "Configuration Required"
 msgstr "Wymaga konfiguracji"

-#: picard/ui/mainwindow.py:802
+#: picard/ui/mainwindow.py:810
 msgid ""
 "Audio fingerprinting is not yet configured. Would you like to configure it "
 "now?"
 msgstr "Funkcja odcisków audio nie została jeszcze skonfigurowana. Czy chcesz to zrobić teraz?"

-#: picard/ui/mainwindow.py:902
+#: picard/ui/mainwindow.py:916
 #, python-format
 msgid "%(filename)s (error: %(error)s)"
 msgstr "%(filename)s (błąd: %(error)s)"

-#: picard/ui/mainwindow.py:908
+#: picard/ui/mainwindow.py:922
 #, python-format
 msgid "%(filename)s"
 msgstr "%(filename)s"

-#: picard/ui/mainwindow.py:918
+#: picard/ui/mainwindow.py:933
 #, python-format
 msgid "%(filename)s (%(similarity)d%%) (error: %(error)s)"
 msgstr "%(filename)s (%(similarity)d%%) (błąd: %(error)s)"

-#: picard/ui/mainwindow.py:925
+#: picard/ui/mainwindow.py:940
 #, python-format
 msgid "%(filename)s (%(similarity)d%%)"
 msgstr "%(filename)s (%(similarity)d%%)"

-#: picard/ui/mainwindow.py:961
+#: picard/ui/mainwindow.py:976
 msgid "Authentication Required"
 msgstr "Wymagane uwierzytelnienie"

-#: picard/ui/mainwindow.py:962
+#: picard/ui/mainwindow.py:977
 msgid ""
 "Picard needs authorization to access your personal data on the MusicBrainz "
 "server. Would you like to log in now?"
@@ -1021,6 +1047,7 @@ msgid_plural "(different across %d items)"
 msgstr[0] "(różne pośród %d pozycji)"
 msgstr[1] "(różne pośród %d pozycji)"
 msgstr[2] "(różne pośród %d pozycji)"
+msgstr[3] "(różne pośród %d pozycji)"

 #: picard/ui/metadatabox.py:92
 #, python-format
@@ -1029,6 +1056,7 @@ msgid_plural "(missing from %d items)"
 msgstr[0] "(brak w %d elemencie)"
 msgstr[1] "(brak w %d elementach)"
 msgstr[2] "(brak w %d elementach)"
+msgstr[3] "(brak w %d elementach)"

 #: picard/ui/metadatabox.py:155
 msgid "metadata view"
@@ -1088,6 +1116,7 @@ msgid_plural "Use Original Values"
 msgstr[0] "Użyj oryginalnej wartości"
 msgstr[1] "Użyj oryginalnych wartości"
 msgstr[2] "Użyj oryginalnych wartości"
+msgstr[3] "Użyj oryginalnych wartości"

 #: picard/ui/passworddialog.py:35
 #, python-format
@@ -1120,7 +1149,7 @@ msgstr ""
 msgid "Retry"
 msgstr ""

-#: picard/ui/searchdialog.py:288
+#: picard/ui/searchdialog.py:283
 #, python-format
 msgid ""
 "<strong>Following error occurred while fetching "
@@ -1924,19 +1953,19 @@ msgstr ""
 msgid "Reset all settings for current option page"
 msgstr ""

-#: picard/ui/options/dialog.py:166
+#: picard/ui/options/dialog.py:172
 msgid "You are about to reset your options for this page."
 msgstr ""

-#: picard/ui/options/dialog.py:170
+#: picard/ui/options/dialog.py:176
 msgid "Warning! This will reset all of your settings."
 msgstr ""

-#: picard/ui/options/dialog.py:177
+#: picard/ui/options/dialog.py:183
 msgid "Confirm Reset"
 msgstr ""

-#: picard/ui/options/dialog.py:178
+#: picard/ui/options/dialog.py:184
 msgid "Are you sure?"
 msgstr ""

@@ -2107,7 +2136,7 @@ msgstr "Resetuj wszystko"
 msgid "File Naming"
 msgstr "Nazwy plików"

-#: picard/ui/options/renaming.py:175 picard/ui/options/scripting.py:406
+#: picard/ui/options/renaming.py:175 picard/ui/options/scripting.py:410
 msgid ""
 "<a href=\"%(picard-doc-scripting-url)s\">Open Scripting Documentation in "
 "your browser</a>"
@@ -2149,15 +2178,15 @@ msgstr ""
 msgid "Scripting"
 msgstr "Skrypty"

-#: picard/ui/options/scripting.py:292
+#: picard/ui/options/scripting.py:293
 msgid "Are you sure you want to remove this script?"
 msgstr ""

-#: picard/ui/options/scripting.py:293
+#: picard/ui/options/scripting.py:294
 msgid "Confirm Remove"
 msgstr ""

-#: picard/ui/options/scripting.py:376
+#: picard/ui/options/scripting.py:377
 msgid "Script Error"
 msgstr "Błąd skryptu"

--- a/po/pt.po
+++ b/po/pt.po
@@ -10,8 +10,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: MusicBrainz\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2017-01-18 12:51+0100\n"
-"PO-Revision-Date: 2017-01-19 09:17+0000\n"
+"POT-Creation-Date: 2017-03-05 09:58+0100\n"
+"PO-Revision-Date: 2017-03-05 10:00+0000\n"
 "Last-Translator: nikki\n"
 "Language-Team: Portuguese (http://www.transifex.com/musicbrainz/musicbrainz/language/pt/)\n"
 "MIME-Version: 1.0\n"
@@ -58,26 +58,26 @@ msgstr ""
 msgid "Unmatched Files"
 msgstr "Os ficheiros não correspondem"

-#: picard/album.py:206
+#: picard/album.py:200
 #, python-format
 msgid "[could not load album %s]"
 msgstr "[não foi possivel carregar o álbum %s]"

-#: picard/album.py:295
+#: picard/album.py:289
 #, python-format
 msgid "Album %(id)s loaded: %(artist)s - %(album)s"
 msgstr ""

-#: picard/album.py:338
+#: picard/album.py:332
 #, python-format
 msgid "Loading album %(id)s ..."
 msgstr ""

-#: picard/album.py:342
+#: picard/album.py:336
 msgid "[loading album information]"
 msgstr "[a carregar a informação do álbum]"

-#: picard/album.py:527
+#: picard/album.py:523
 #, python-format
 msgid "; %i image"
 msgid_plural "; %i images"
@@ -99,72 +99,72 @@ msgstr ""
 msgid "Looking up the metadata for cluster %(album)s..."
 msgstr ""

-#: picard/collection.py:64
+#: picard/collection.py:67
 #, python-format
 msgid "Added %(count)i release to collection \"%(name)s\""
 msgid_plural "Added %(count)i releases to collection \"%(name)s\""
 msgstr[0] ""
 msgstr[1] ""

-#: picard/collection.py:86
+#: picard/collection.py:89
 #, python-format
 msgid "Removed %(count)i release from collection \"%(name)s\""
 msgid_plural "Removed %(count)i releases from collection \"%(name)s\""
 msgstr[0] ""
 msgstr[1] ""

-#: picard/collection.py:100
+#: picard/collection.py:104
 #, python-format
 msgid "Error loading collections: %(error)s"
 msgstr ""

-#: picard/config_upgrade.py:58 picard/config_upgrade.py:71
+#: picard/config_upgrade.py:57 picard/config_upgrade.py:70
 msgid "Various Artists file naming scheme removal"
 msgstr ""

-#: picard/config_upgrade.py:59
+#: picard/config_upgrade.py:58
 msgid ""
 "The separate file naming scheme for various artists albums has been removed in this version of Picard.\n"
 "Your file naming scheme has automatically been merged with that of single artist albums."
 msgstr ""

-#: picard/config_upgrade.py:72
+#: picard/config_upgrade.py:71
 msgid ""
 "The separate file naming scheme for various artists albums has been removed in this version of Picard.\n"
 "You currently do not use this option, but have a separate file naming scheme defined.\n"
 "Do you want to remove it or merge it with your file naming scheme for single artist albums?"
 msgstr ""

-#: picard/config_upgrade.py:78
+#: picard/config_upgrade.py:77
 msgid "Merge"
 msgstr ""

-#: picard/config_upgrade.py:78 picard/ui/metadatabox.py:314
+#: picard/config_upgrade.py:77 picard/ui/metadatabox.py:314
 #: picard/ui/options/interface.py:75 picard/ui/ui_options_interface.py:141
 msgid "Remove"
 msgstr "Remover"

-#: picard/config_upgrade.py:193 picard/ui/options/scripting.py:28
+#: picard/config_upgrade.py:200 picard/ui/options/scripting.py:28
 #, python-format
 msgid "My script %d"
 msgstr ""

-#: picard/file.py:541
+#: picard/file.py:565
 #, python-format
 msgid "No matching tracks for file '%(filename)s'"
 msgstr ""

-#: picard/file.py:557
+#: picard/file.py:581
 #, python-format
 msgid "No matching tracks above the threshold for file '%(filename)s'"
 msgstr ""

-#: picard/file.py:564
+#: picard/file.py:588
 #, python-format
 msgid "File '%(filename)s' identified!"
 msgstr ""

-#: picard/file.py:584
+#: picard/file.py:608
 #, python-format
 msgid "Looking up the metadata for file %(filename)s ..."
 msgstr ""
@@ -207,23 +207,23 @@ msgstr ""
 msgid "[no release info]"
 msgstr "[sem info de lançamento]"

-#: picard/tagger.py:405 picard/tagger.py:438
+#: picard/tagger.py:407 picard/tagger.py:440
 #, python-format
 msgid "Adding %(count)d file from '%(directory)s' ..."
 msgid_plural "Adding %(count)d files from '%(directory)s' ..."
 msgstr[0] ""
 msgstr[1] ""

-#: picard/tagger.py:597
+#: picard/tagger.py:599
 #, python-format
 msgid "Removing album %(id)s: %(artist)s - %(album)s"
 msgstr ""

-#: picard/tagger.py:613
+#: picard/tagger.py:615
 msgid "CD Lookup Error"
 msgstr "Erro ao Procurar CD"

-#: picard/tagger.py:614
+#: picard/tagger.py:616
 #, python-format
 msgid ""
 "Error while reading CD:\n"
@@ -271,6 +271,10 @@ msgstr "Francês"
 msgid "Italian"
 msgstr "Italiano"

+#: picard/const/languages.py:57
+msgid "Norwegian Bokmal"
+msgstr ""
+
 #: picard/const/languages.py:59
 msgid "Dutch"
 msgstr "Holandês"
@@ -334,12 +338,12 @@ msgstr ""
 msgid "Whitelist"
 msgstr ""

-#: picard/ui/cdlookup.py:35 picard/ui/mainwindow.py:625 picard/util/tags.py:21
+#: picard/ui/cdlookup.py:35 picard/ui/mainwindow.py:626 picard/util/tags.py:21
 msgid "Album"
 msgstr "Álbum"

-#: picard/ui/cdlookup.py:35 picard/ui/itemviews.py:96
-#: picard/ui/mainwindow.py:626 picard/ui/searchdialog.py:326
+#: picard/ui/cdlookup.py:35 picard/ui/itemviews.py:105
+#: picard/ui/mainwindow.py:627 picard/ui/searchdialog.py:326
 #: picard/ui/searchdialog.py:513 picard/util/tags.py:22
 msgid "Artist"
 msgstr "Artista"
@@ -373,10 +377,22 @@ msgid_plural "%s (%i releases)"
 msgstr[0] ""
 msgstr[1] ""

-#: picard/ui/coverartbox.py:143
+#: picard/ui/coverartbox.py:141
 msgid "View release on MusicBrainz"
 msgstr "Ver lançamento no MusicBrainz"

+#: picard/ui/coverartbox.py:174
+msgid "Show more details"
+msgstr ""
+
+#: picard/ui/coverartbox.py:199
+msgid "New Cover Art"
+msgstr ""
+
+#: picard/ui/coverartbox.py:200
+msgid "Original Cover Art"
+msgstr ""
+
 #: picard/ui/filebrowser.py:40
 msgid "&Move Tagged Files Here"
 msgstr "&Mover Ficheiros Marcados para Aqui"
@@ -505,116 +521,116 @@ msgstr ""
 msgid "Pending requests"
 msgstr ""

-#: picard/ui/itemviews.py:94 picard/util/tags.py:23
+#: picard/ui/itemviews.py:103 picard/util/tags.py:23
 msgid "Title"
 msgstr "Título"

-#: picard/ui/itemviews.py:95 picard/ui/searchdialog.py:325
+#: picard/ui/itemviews.py:104 picard/ui/searchdialog.py:325
 #: picard/util/tags.py:87
 msgid "Length"
 msgstr "Duração"

-#: picard/ui/itemviews.py:162
+#: picard/ui/itemviews.py:171
 msgid "Bad match"
 msgstr ""

-#: picard/ui/itemviews.py:163
+#: picard/ui/itemviews.py:172
 msgid "Poor match"
 msgstr ""

-#: picard/ui/itemviews.py:164
+#: picard/ui/itemviews.py:173
 msgid "Ok match"
 msgstr ""

-#: picard/ui/itemviews.py:165
+#: picard/ui/itemviews.py:174
 msgid "Good match"
 msgstr ""

-#: picard/ui/itemviews.py:166
+#: picard/ui/itemviews.py:175
 msgid "Great match"
 msgstr ""

-#: picard/ui/itemviews.py:167
+#: picard/ui/itemviews.py:176
 msgid "Excellent match"
 msgstr ""

-#: picard/ui/itemviews.py:243
+#: picard/ui/itemviews.py:252
 msgid "&Expand all"
 msgstr "&Expandir tudo"

-#: picard/ui/itemviews.py:245
+#: picard/ui/itemviews.py:254
 msgid "&Collapse all"
 msgstr "&Contrair tudo"

-#: picard/ui/itemviews.py:247
+#: picard/ui/itemviews.py:256
 msgid "Select &all"
 msgstr ""

-#: picard/ui/itemviews.py:249
+#: picard/ui/itemviews.py:258
 msgid "Ctrl+A"
 msgstr ""

-#: picard/ui/itemviews.py:315
+#: picard/ui/itemviews.py:324
 msgid "&Other versions"
 msgstr "&Outras versões"

-#: picard/ui/itemviews.py:318
+#: picard/ui/itemviews.py:327
 msgid "Loading..."
 msgstr "Carregando..."

-#: picard/ui/itemviews.py:383
+#: picard/ui/itemviews.py:392
 msgid "Collections"
 msgstr ""

-#: picard/ui/itemviews.py:386
+#: picard/ui/itemviews.py:395
 msgid "P&lugins"
 msgstr ""

-#: picard/ui/itemviews.py:557
+#: picard/ui/itemviews.py:577
 msgid "file view"
 msgstr ""

-#: picard/ui/itemviews.py:558
+#: picard/ui/itemviews.py:578
 msgid "Contains unmatched files and clusters"
 msgstr ""

-#: picard/ui/itemviews.py:578
+#: picard/ui/itemviews.py:598
 msgid "Clusters"
 msgstr "Clusters"

-#: picard/ui/itemviews.py:587
+#: picard/ui/itemviews.py:607
 msgid "album view"
 msgstr "vista de álbum"

-#: picard/ui/itemviews.py:588
+#: picard/ui/itemviews.py:608
 msgid "Contains albums and matched files"
 msgstr "Contém álbuns e ficheiros correspondentes"

-#: picard/ui/itemviews.py:694 picard/ui/options/renaming.py:188
+#: picard/ui/itemviews.py:714 picard/ui/options/renaming.py:188
 msgid "Error"
 msgstr "Erro"

-#: picard/ui/itemviews.py:698
+#: picard/ui/itemviews.py:718
 msgid "Album modified and complete"
 msgstr ""

-#: picard/ui/itemviews.py:701
+#: picard/ui/itemviews.py:721
 msgid "Album unchanged and complete"
 msgstr ""

-#: picard/ui/itemviews.py:705
+#: picard/ui/itemviews.py:725
 msgid "Album modified"
 msgstr ""

-#: picard/ui/itemviews.py:708
+#: picard/ui/itemviews.py:728
 msgid "Album unchanged"
 msgstr ""

-#: picard/ui/itemviews.py:811
+#: picard/ui/itemviews.py:831
 msgid "Track saved"
 msgstr ""

-#: picard/ui/itemviews.py:813 picard/ui/itemviews.py:817
+#: picard/ui/itemviews.py:833 picard/ui/itemviews.py:837
 msgid "Pending"
 msgstr ""

@@ -805,7 +821,7 @@ msgstr "Ctrl+B"
 msgid "&Cover Art"
 msgstr "&Capa do Álbum"

-#: picard/ui/mainwindow.py:407 picard/ui/mainwindow.py:619
+#: picard/ui/mainwindow.py:407 picard/ui/mainwindow.py:620
 #: picard/ui/searchdialog.py:71
 msgid "Search"
 msgstr "Procurar"
@@ -832,175 +848,179 @@ msgid ""
 "even if they have no metadata"
 msgstr ""

-#: picard/ui/mainwindow.py:421
+#: picard/ui/mainwindow.py:420
+msgid "Identify the file using its AcoustID audio fingerprint"
+msgstr ""
+
+#: picard/ui/mainwindow.py:422
 msgid "Ctrl+Y"
 msgstr "Ctrl+Y"

-#: picard/ui/mainwindow.py:424
+#: picard/ui/mainwindow.py:425
 msgid "Cl&uster"
 msgstr "Cl&uster"

-#: picard/ui/mainwindow.py:425
+#: picard/ui/mainwindow.py:426
 msgid "Cluster files into album clusters"
 msgstr ""

-#: picard/ui/mainwindow.py:428
+#: picard/ui/mainwindow.py:429
 msgid "Ctrl+U"
 msgstr "Ctrl+U"

-#: picard/ui/mainwindow.py:431
+#: picard/ui/mainwindow.py:432
 msgid "&Lookup"
 msgstr "&Procurar"

-#: picard/ui/mainwindow.py:432
+#: picard/ui/mainwindow.py:433
 msgid "Lookup selected items in MusicBrainz"
 msgstr ""

-#: picard/ui/mainwindow.py:437
+#: picard/ui/mainwindow.py:438
 msgid "Ctrl+L"
 msgstr "Ctrl+L"

-#: picard/ui/mainwindow.py:440
+#: picard/ui/mainwindow.py:441
 msgid "&Info..."
 msgstr "&Info..."

-#: picard/ui/mainwindow.py:443
+#: picard/ui/mainwindow.py:444
 msgid "Ctrl+I"
 msgstr "Ctrl+I"

-#: picard/ui/mainwindow.py:446
+#: picard/ui/mainwindow.py:447
 msgid "&Refresh"
 msgstr "Actualiza&r"

-#: picard/ui/mainwindow.py:447
+#: picard/ui/mainwindow.py:448
 msgid "Ctrl+R"
 msgstr "Ctrl+R"

-#: picard/ui/mainwindow.py:450
+#: picard/ui/mainwindow.py:451
 msgid "&Rename Files"
 msgstr "&Renomear Ficheiros"

-#: picard/ui/mainwindow.py:455
+#: picard/ui/mainwindow.py:456
 msgid "&Move Files"
 msgstr "&Mover Ficheiros"

-#: picard/ui/mainwindow.py:460
+#: picard/ui/mainwindow.py:461
 msgid "Save &Tags"
 msgstr "&Guardar Marcas"

-#: picard/ui/mainwindow.py:465
+#: picard/ui/mainwindow.py:466
 msgid "Tags From &File Names..."
 msgstr "Marcas Do Nome de &Ficheiro..."

-#: picard/ui/mainwindow.py:469
+#: picard/ui/mainwindow.py:470
 msgid "&Open My Collections in Browser"
 msgstr ""

-#: picard/ui/mainwindow.py:473
+#: picard/ui/mainwindow.py:474
 msgid "View Error/Debug &Log"
 msgstr ""

-#: picard/ui/mainwindow.py:476
+#: picard/ui/mainwindow.py:477
 msgid "View Activity &History"
 msgstr ""

-#: picard/ui/mainwindow.py:483
+#: picard/ui/mainwindow.py:484
 msgid "Open in &Player"
 msgstr ""

-#: picard/ui/mainwindow.py:484
+#: picard/ui/mainwindow.py:485
 msgid "Play the file in your default media player"
 msgstr ""

-#: picard/ui/mainwindow.py:488
+#: picard/ui/mainwindow.py:489
 msgid "Open Containing &Folder"
 msgstr ""

-#: picard/ui/mainwindow.py:489
+#: picard/ui/mainwindow.py:490
 msgid "Open the containing folder in your file explorer"
 msgstr ""

-#: picard/ui/mainwindow.py:518
+#: picard/ui/mainwindow.py:519
 msgid "&File"
 msgstr "&Ficheiro"

-#: picard/ui/mainwindow.py:529
+#: picard/ui/mainwindow.py:530
 msgid "&Edit"
 msgstr "&Editar"

-#: picard/ui/mainwindow.py:535
+#: picard/ui/mainwindow.py:536
 msgid "&View"
 msgstr "&Ver"

-#: picard/ui/mainwindow.py:541
+#: picard/ui/mainwindow.py:542
 msgid "&Options"
 msgstr "&Opções"

-#: picard/ui/mainwindow.py:547
+#: picard/ui/mainwindow.py:548
 msgid "&Tools"
 msgstr "Ferramen&tas"

-#: picard/ui/mainwindow.py:558 picard/ui/util.py:35
+#: picard/ui/mainwindow.py:559 picard/ui/util.py:35
 msgid "&Help"
 msgstr "&Ajuda"

-#: picard/ui/mainwindow.py:586
+#: picard/ui/mainwindow.py:587
 msgid "Actions"
 msgstr ""

-#: picard/ui/mainwindow.py:627
+#: picard/ui/mainwindow.py:628
 msgid "Track"
 msgstr "Faixa"

-#: picard/ui/mainwindow.py:703
+#: picard/ui/mainwindow.py:704
 msgid "All Supported Formats"
 msgstr "Todos os Formatos Suportados"

-#: picard/ui/mainwindow.py:730
+#: picard/ui/mainwindow.py:731
 #, python-format
 msgid "Adding multiple directories from '%(directory)s' ..."
 msgstr ""

-#: picard/ui/mainwindow.py:735
+#: picard/ui/mainwindow.py:736
 #, python-format
 msgid "Adding directory: '%(directory)s' ..."
 msgstr ""

-#: picard/ui/mainwindow.py:801
+#: picard/ui/mainwindow.py:809
 msgid "Configuration Required"
 msgstr "Configuração Requerida"

-#: picard/ui/mainwindow.py:802
+#: picard/ui/mainwindow.py:810
 msgid ""
 "Audio fingerprinting is not yet configured. Would you like to configure it "
 "now?"
 msgstr ""

-#: picard/ui/mainwindow.py:902
+#: picard/ui/mainwindow.py:916
 #, python-format
 msgid "%(filename)s (error: %(error)s)"
 msgstr ""

-#: picard/ui/mainwindow.py:908
+#: picard/ui/mainwindow.py:922
 #, python-format
 msgid "%(filename)s"
 msgstr ""

-#: picard/ui/mainwindow.py:918
+#: picard/ui/mainwindow.py:933
 #, python-format
 msgid "%(filename)s (%(similarity)d%%) (error: %(error)s)"
 msgstr ""

-#: picard/ui/mainwindow.py:925
+#: picard/ui/mainwindow.py:940
 #, python-format
 msgid "%(filename)s (%(similarity)d%%)"
 msgstr ""

-#: picard/ui/mainwindow.py:961
+#: picard/ui/mainwindow.py:976
 msgid "Authentication Required"
 msgstr ""

-#: picard/ui/mainwindow.py:962
+#: picard/ui/mainwindow.py:977
 msgid ""
 "Picard needs authorization to access your personal data on the MusicBrainz "
 "server. Would you like to log in now?"
@@ -1109,7 +1129,7 @@ msgstr ""
 msgid "Retry"
 msgstr ""

-#: picard/ui/searchdialog.py:288
+#: picard/ui/searchdialog.py:283
 #, python-format
 msgid ""
 "<strong>Following error occurred while fetching "
@@ -1913,19 +1933,19 @@ msgstr ""
 msgid "Reset all settings for current option page"
 msgstr ""

-#: picard/ui/options/dialog.py:166
+#: picard/ui/options/dialog.py:172
 msgid "You are about to reset your options for this page."
 msgstr ""

-#: picard/ui/options/dialog.py:170
+#: picard/ui/options/dialog.py:176
 msgid "Warning! This will reset all of your settings."
 msgstr ""

-#: picard/ui/options/dialog.py:177
+#: picard/ui/options/dialog.py:183
 msgid "Confirm Reset"
 msgstr ""

-#: picard/ui/options/dialog.py:178
+#: picard/ui/options/dialog.py:184
 msgid "Are you sure?"
 msgstr ""

@@ -2096,7 +2116,7 @@ msgstr "Reiniciar todos"
 msgid "File Naming"
 msgstr ""

-#: picard/ui/options/renaming.py:175 picard/ui/options/scripting.py:406
+#: picard/ui/options/renaming.py:175 picard/ui/options/scripting.py:410
 msgid ""
 "<a href=\"%(picard-doc-scripting-url)s\">Open Scripting Documentation in "
 "your browser</a>"
@@ -2138,15 +2158,15 @@ msgstr ""
 msgid "Scripting"
 msgstr "Programação"

-#: picard/ui/options/scripting.py:292
+#: picard/ui/options/scripting.py:293
 msgid "Are you sure you want to remove this script?"
 msgstr ""

-#: picard/ui/options/scripting.py:293
+#: picard/ui/options/scripting.py:294
 msgid "Confirm Remove"
 msgstr ""

-#: picard/ui/options/scripting.py:376
+#: picard/ui/options/scripting.py:377
 msgid "Script Error"
 msgstr "Erro de Programação"

--- a/po/pt_BR.po
+++ b/po/pt_BR.po
--- a/po/ro.po
+++ b/po/ro.po
@@ -9,8 +9,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: MusicBrainz\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2017-01-18 12:51+0100\n"
-"PO-Revision-Date: 2017-01-19 09:17+0000\n"
+"POT-Creation-Date: 2017-03-05 09:58+0100\n"
+"PO-Revision-Date: 2017-03-05 10:00+0000\n"
 "Last-Translator: nikki\n"
 "Language-Team: Romanian (http://www.transifex.com/musicbrainz/musicbrainz/language/ro/)\n"
 "MIME-Version: 1.0\n"
@@ -57,26 +57,26 @@ msgstr ""
 msgid "Unmatched Files"
 msgstr "Fișiere neașezate"

-#: picard/album.py:206
+#: picard/album.py:200
 #, python-format
 msgid "[could not load album %s]"
 msgstr "[nu s-a putut încărca albumul %s]"

-#: picard/album.py:295
+#: picard/album.py:289
 #, python-format
 msgid "Album %(id)s loaded: %(artist)s - %(album)s"
 msgstr ""

-#: picard/album.py:338
+#: picard/album.py:332
 #, python-format
 msgid "Loading album %(id)s ..."
 msgstr ""

-#: picard/album.py:342
+#: picard/album.py:336
 msgid "[loading album information]"
 msgstr "[se încarcă informațiile albumului]"

-#: picard/album.py:527
+#: picard/album.py:523
 #, python-format
 msgid "; %i image"
 msgid_plural "; %i images"
@@ -99,7 +99,7 @@ msgstr ""
 msgid "Looking up the metadata for cluster %(album)s..."
 msgstr ""

-#: picard/collection.py:64
+#: picard/collection.py:67
 #, python-format
 msgid "Added %(count)i release to collection \"%(name)s\""
 msgid_plural "Added %(count)i releases to collection \"%(name)s\""
@@ -107,7 +107,7 @@ msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""

-#: picard/collection.py:86
+#: picard/collection.py:89
 #, python-format
 msgid "Removed %(count)i release from collection \"%(name)s\""
 msgid_plural "Removed %(count)i releases from collection \"%(name)s\""
@@ -115,58 +115,58 @@ msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""

-#: picard/collection.py:100
+#: picard/collection.py:104
 #, python-format
 msgid "Error loading collections: %(error)s"
 msgstr ""

-#: picard/config_upgrade.py:58 picard/config_upgrade.py:71
+#: picard/config_upgrade.py:57 picard/config_upgrade.py:70
 msgid "Various Artists file naming scheme removal"
 msgstr ""

-#: picard/config_upgrade.py:59
+#: picard/config_upgrade.py:58
 msgid ""
 "The separate file naming scheme for various artists albums has been removed in this version of Picard.\n"
 "Your file naming scheme has automatically been merged with that of single artist albums."
 msgstr ""

-#: picard/config_upgrade.py:72
+#: picard/config_upgrade.py:71
 msgid ""
 "The separate file naming scheme for various artists albums has been removed in this version of Picard.\n"
 "You currently do not use this option, but have a separate file naming scheme defined.\n"
 "Do you want to remove it or merge it with your file naming scheme for single artist albums?"
 msgstr ""

-#: picard/config_upgrade.py:78
+#: picard/config_upgrade.py:77
 msgid "Merge"
 msgstr "Combină"

-#: picard/config_upgrade.py:78 picard/ui/metadatabox.py:314
+#: picard/config_upgrade.py:77 picard/ui/metadatabox.py:314
 #: picard/ui/options/interface.py:75 picard/ui/ui_options_interface.py:141
 msgid "Remove"
 msgstr "Înlătu&ră"

-#: picard/config_upgrade.py:193 picard/ui/options/scripting.py:28
+#: picard/config_upgrade.py:200 picard/ui/options/scripting.py:28
 #, python-format
 msgid "My script %d"
 msgstr ""

-#: picard/file.py:541
+#: picard/file.py:565
 #, python-format
 msgid "No matching tracks for file '%(filename)s'"
 msgstr ""

-#: picard/file.py:557
+#: picard/file.py:581
 #, python-format
 msgid "No matching tracks above the threshold for file '%(filename)s'"
 msgstr ""

-#: picard/file.py:564
+#: picard/file.py:588
 #, python-format
 msgid "File '%(filename)s' identified!"
 msgstr ""

-#: picard/file.py:584
+#: picard/file.py:608
 #, python-format
 msgid "Looking up the metadata for file %(filename)s ..."
 msgstr ""
@@ -209,7 +209,7 @@ msgstr ""
 msgid "[no release info]"
 msgstr ""

-#: picard/tagger.py:405 picard/tagger.py:438
+#: picard/tagger.py:407 picard/tagger.py:440
 #, python-format
 msgid "Adding %(count)d file from '%(directory)s' ..."
 msgid_plural "Adding %(count)d files from '%(directory)s' ..."
@@ -217,16 +217,16 @@ msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""

-#: picard/tagger.py:597
+#: picard/tagger.py:599
 #, python-format
 msgid "Removing album %(id)s: %(artist)s - %(album)s"
 msgstr ""

-#: picard/tagger.py:613
+#: picard/tagger.py:615
 msgid "CD Lookup Error"
 msgstr "Eroare la căutarea discului"

-#: picard/tagger.py:614
+#: picard/tagger.py:616
 #, python-format
 msgid ""
 "Error while reading CD:\n"
@@ -274,6 +274,10 @@ msgstr "Franceză"
 msgid "Italian"
 msgstr "Italiană"

+#: picard/const/languages.py:57
+msgid "Norwegian Bokmal"
+msgstr ""
+
 #: picard/const/languages.py:59
 msgid "Dutch"
 msgstr "Olandeză"
@@ -337,12 +341,12 @@ msgstr ""
 msgid "Whitelist"
 msgstr ""

-#: picard/ui/cdlookup.py:35 picard/ui/mainwindow.py:625 picard/util/tags.py:21
+#: picard/ui/cdlookup.py:35 picard/ui/mainwindow.py:626 picard/util/tags.py:21
 msgid "Album"
 msgstr "Album"

-#: picard/ui/cdlookup.py:35 picard/ui/itemviews.py:96
-#: picard/ui/mainwindow.py:626 picard/ui/searchdialog.py:326
+#: picard/ui/cdlookup.py:35 picard/ui/itemviews.py:105
+#: picard/ui/mainwindow.py:627 picard/ui/searchdialog.py:326
 #: picard/ui/searchdialog.py:513 picard/util/tags.py:22
 msgid "Artist"
 msgstr "Artist"
@@ -377,10 +381,22 @@ msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""

-#: picard/ui/coverartbox.py:143
+#: picard/ui/coverartbox.py:141
 msgid "View release on MusicBrainz"
 msgstr ""

+#: picard/ui/coverartbox.py:174
+msgid "Show more details"
+msgstr ""
+
+#: picard/ui/coverartbox.py:199
+msgid "New Cover Art"
+msgstr ""
+
+#: picard/ui/coverartbox.py:200
+msgid "Original Cover Art"
+msgstr ""
+
 #: picard/ui/filebrowser.py:40
 msgid "&Move Tagged Files Here"
 msgstr "&Mută fișierele etichetate aici"
@@ -509,116 +525,116 @@ msgstr ""
 msgid "Pending requests"
 msgstr ""

-#: picard/ui/itemviews.py:94 picard/util/tags.py:23
+#: picard/ui/itemviews.py:103 picard/util/tags.py:23
 msgid "Title"
 msgstr "Titlu"

-#: picard/ui/itemviews.py:95 picard/ui/searchdialog.py:325
+#: picard/ui/itemviews.py:104 picard/ui/searchdialog.py:325
 #: picard/util/tags.py:87
 msgid "Length"
 msgstr "Durată:"

-#: picard/ui/itemviews.py:162
+#: picard/ui/itemviews.py:171
 msgid "Bad match"
 msgstr ""

-#: picard/ui/itemviews.py:163
+#: picard/ui/itemviews.py:172
 msgid "Poor match"
 msgstr ""

-#: picard/ui/itemviews.py:164
+#: picard/ui/itemviews.py:173
 msgid "Ok match"
 msgstr ""

-#: picard/ui/itemviews.py:165
+#: picard/ui/itemviews.py:174
 msgid "Good match"
 msgstr ""

-#: picard/ui/itemviews.py:166
+#: picard/ui/itemviews.py:175
 msgid "Great match"
 msgstr ""

-#: picard/ui/itemviews.py:167
+#: picard/ui/itemviews.py:176
 msgid "Excellent match"
 msgstr ""

-#: picard/ui/itemviews.py:243
+#: picard/ui/itemviews.py:252
 msgid "&Expand all"
 msgstr "&Extinde tot"

-#: picard/ui/itemviews.py:245
+#: picard/ui/itemviews.py:254
 msgid "&Collapse all"
 msgstr "&Restrânge totul"

-#: picard/ui/itemviews.py:247
+#: picard/ui/itemviews.py:256
 msgid "Select &all"
 msgstr ""

-#: picard/ui/itemviews.py:249
+#: picard/ui/itemviews.py:258
 msgid "Ctrl+A"
 msgstr ""

-#: picard/ui/itemviews.py:315
+#: picard/ui/itemviews.py:324
 msgid "&Other versions"
 msgstr "&Alte versiuni"

-#: picard/ui/itemviews.py:318
+#: picard/ui/itemviews.py:327
 msgid "Loading..."
 msgstr ""

-#: picard/ui/itemviews.py:383
+#: picard/ui/itemviews.py:392
 msgid "Collections"
 msgstr ""

-#: picard/ui/itemviews.py:386
+#: picard/ui/itemviews.py:395
 msgid "P&lugins"
 msgstr ""

-#: picard/ui/itemviews.py:557
+#: picard/ui/itemviews.py:577
 msgid "file view"
 msgstr ""

-#: picard/ui/itemviews.py:558
+#: picard/ui/itemviews.py:578
 msgid "Contains unmatched files and clusters"
 msgstr ""

-#: picard/ui/itemviews.py:578
+#: picard/ui/itemviews.py:598
 msgid "Clusters"
 msgstr "Grupaje"

-#: picard/ui/itemviews.py:587
+#: picard/ui/itemviews.py:607
 msgid "album view"
 msgstr ""

-#: picard/ui/itemviews.py:588
+#: picard/ui/itemviews.py:608
 msgid "Contains albums and matched files"
 msgstr ""

-#: picard/ui/itemviews.py:694 picard/ui/options/renaming.py:188
+#: picard/ui/itemviews.py:714 picard/ui/options/renaming.py:188
 msgid "Error"
 msgstr "Eroare"

-#: picard/ui/itemviews.py:698
+#: picard/ui/itemviews.py:718
 msgid "Album modified and complete"
 msgstr ""

-#: picard/ui/itemviews.py:701
+#: picard/ui/itemviews.py:721
 msgid "Album unchanged and complete"
 msgstr ""

-#: picard/ui/itemviews.py:705
+#: picard/ui/itemviews.py:725
 msgid "Album modified"
 msgstr ""

-#: picard/ui/itemviews.py:708
+#: picard/ui/itemviews.py:728
 msgid "Album unchanged"
 msgstr ""

-#: picard/ui/itemviews.py:811
+#: picard/ui/itemviews.py:831
 msgid "Track saved"
 msgstr ""

-#: picard/ui/itemviews.py:813 picard/ui/itemviews.py:817
+#: picard/ui/itemviews.py:833 picard/ui/itemviews.py:837
 msgid "Pending"
 msgstr ""

@@ -810,7 +826,7 @@ msgstr "Ctrl+B"
 msgid "&Cover Art"
 msgstr "&Coperți"

-#: picard/ui/mainwindow.py:407 picard/ui/mainwindow.py:619
+#: picard/ui/mainwindow.py:407 picard/ui/mainwindow.py:620
 #: picard/ui/searchdialog.py:71
 msgid "Search"
 msgstr "Caută"
@@ -837,175 +853,179 @@ msgid ""
 "even if they have no metadata"
 msgstr ""

-#: picard/ui/mainwindow.py:421
+#: picard/ui/mainwindow.py:420
+msgid "Identify the file using its AcoustID audio fingerprint"
+msgstr ""
+
+#: picard/ui/mainwindow.py:422
 msgid "Ctrl+Y"
 msgstr "Ctrl+Y"

-#: picard/ui/mainwindow.py:424
+#: picard/ui/mainwindow.py:425
 msgid "Cl&uster"
 msgstr "Gr&upează"

-#: picard/ui/mainwindow.py:425
+#: picard/ui/mainwindow.py:426
 msgid "Cluster files into album clusters"
 msgstr ""

-#: picard/ui/mainwindow.py:428
+#: picard/ui/mainwindow.py:429
 msgid "Ctrl+U"
 msgstr "Ctrl+U"

-#: picard/ui/mainwindow.py:431
+#: picard/ui/mainwindow.py:432
 msgid "&Lookup"
 msgstr "&Căutare"

-#: picard/ui/mainwindow.py:432
+#: picard/ui/mainwindow.py:433
 msgid "Lookup selected items in MusicBrainz"
 msgstr ""

-#: picard/ui/mainwindow.py:437
+#: picard/ui/mainwindow.py:438
 msgid "Ctrl+L"
 msgstr "Ctrl+L"

-#: picard/ui/mainwindow.py:440
+#: picard/ui/mainwindow.py:441
 msgid "&Info..."
 msgstr ""

-#: picard/ui/mainwindow.py:443
+#: picard/ui/mainwindow.py:444
 msgid "Ctrl+I"
 msgstr "Ctrl+I"

-#: picard/ui/mainwindow.py:446
+#: picard/ui/mainwindow.py:447
 msgid "&Refresh"
 msgstr "Actualiza&re"

-#: picard/ui/mainwindow.py:447
+#: picard/ui/mainwindow.py:448
 msgid "Ctrl+R"
 msgstr "Ctrl+R"

-#: picard/ui/mainwindow.py:450
+#: picard/ui/mainwindow.py:451
 msgid "&Rename Files"
 msgstr "&Redenumește fișierele"

-#: picard/ui/mainwindow.py:455
+#: picard/ui/mainwindow.py:456
 msgid "&Move Files"
 msgstr "&Mută fișierele"

-#: picard/ui/mainwindow.py:460
+#: picard/ui/mainwindow.py:461
 msgid "Save &Tags"
 msgstr "Înregistrează tag-urile"

-#: picard/ui/mainwindow.py:465
+#: picard/ui/mainwindow.py:466
 msgid "Tags From &File Names..."
 msgstr "Generare taguri din numele fișierelor"

-#: picard/ui/mainwindow.py:469
+#: picard/ui/mainwindow.py:470
 msgid "&Open My Collections in Browser"
 msgstr ""

-#: picard/ui/mainwindow.py:473
+#: picard/ui/mainwindow.py:474
 msgid "View Error/Debug &Log"
 msgstr ""

-#: picard/ui/mainwindow.py:476
+#: picard/ui/mainwindow.py:477
 msgid "View Activity &History"
 msgstr ""

-#: picard/ui/mainwindow.py:483
+#: picard/ui/mainwindow.py:484
 msgid "Open in &Player"
 msgstr ""

-#: picard/ui/mainwindow.py:484
+#: picard/ui/mainwindow.py:485
 msgid "Play the file in your default media player"
 msgstr ""

-#: picard/ui/mainwindow.py:488
+#: picard/ui/mainwindow.py:489
 msgid "Open Containing &Folder"
 msgstr ""

-#: picard/ui/mainwindow.py:489
+#: picard/ui/mainwindow.py:490
 msgid "Open the containing folder in your file explorer"
 msgstr ""

-#: picard/ui/mainwindow.py:518
+#: picard/ui/mainwindow.py:519
 msgid "&File"
 msgstr "&Fișier"

-#: picard/ui/mainwindow.py:529
+#: picard/ui/mainwindow.py:530
 msgid "&Edit"
 msgstr "&Editare"

-#: picard/ui/mainwindow.py:535
+#: picard/ui/mainwindow.py:536
 msgid "&View"
 msgstr "Afișa&re"

-#: picard/ui/mainwindow.py:541
+#: picard/ui/mainwindow.py:542
 msgid "&Options"
 msgstr "&Opțiuni"

-#: picard/ui/mainwindow.py:547
+#: picard/ui/mainwindow.py:548
 msgid "&Tools"
 msgstr "Unel&te"

-#: picard/ui/mainwindow.py:558 picard/ui/util.py:35
+#: picard/ui/mainwindow.py:559 picard/ui/util.py:35
 msgid "&Help"
 msgstr "&Ajutor"

-#: picard/ui/mainwindow.py:586
+#: picard/ui/mainwindow.py:587
 msgid "Actions"
 msgstr ""

-#: picard/ui/mainwindow.py:627
+#: picard/ui/mainwindow.py:628
 msgid "Track"
 msgstr "Piesă"

-#: picard/ui/mainwindow.py:703
+#: picard/ui/mainwindow.py:704
 msgid "All Supported Formats"
 msgstr "Toate formatele cunoscute"

-#: picard/ui/mainwindow.py:730
+#: picard/ui/mainwindow.py:731
 #, python-format
 msgid "Adding multiple directories from '%(directory)s' ..."
 msgstr ""

-#: picard/ui/mainwindow.py:735
+#: picard/ui/mainwindow.py:736
 #, python-format
 msgid "Adding directory: '%(directory)s' ..."
 msgstr ""

-#: picard/ui/mainwindow.py:801
+#: picard/ui/mainwindow.py:809
 msgid "Configuration Required"
 msgstr "Configurare necesară"

-#: picard/ui/mainwindow.py:802
+#: picard/ui/mainwindow.py:810
 msgid ""
 "Audio fingerprinting is not yet configured. Would you like to configure it "
 "now?"
 msgstr ""

-#: picard/ui/mainwindow.py:902
+#: picard/ui/mainwindow.py:916
 #, python-format
 msgid "%(filename)s (error: %(error)s)"
 msgstr ""

-#: picard/ui/mainwindow.py:908
+#: picard/ui/mainwindow.py:922
 #, python-format
 msgid "%(filename)s"
 msgstr ""

-#: picard/ui/mainwindow.py:918
+#: picard/ui/mainwindow.py:933
 #, python-format
 msgid "%(filename)s (%(similarity)d%%) (error: %(error)s)"
 msgstr ""

-#: picard/ui/mainwindow.py:925
+#: picard/ui/mainwindow.py:940
 #, python-format
 msgid "%(filename)s (%(similarity)d%%)"
 msgstr ""

-#: picard/ui/mainwindow.py:961
+#: picard/ui/mainwindow.py:976
 msgid "Authentication Required"
 msgstr ""

-#: picard/ui/mainwindow.py:962
+#: picard/ui/mainwindow.py:977
 msgid ""
 "Picard needs authorization to access your personal data on the MusicBrainz "
 "server. Would you like to log in now?"
@@ -1117,7 +1137,7 @@ msgstr ""
 msgid "Retry"
 msgstr ""

-#: picard/ui/searchdialog.py:288
+#: picard/ui/searchdialog.py:283
 #, python-format
 msgid ""
 "<strong>Following error occurred while fetching "
@@ -1921,19 +1941,19 @@ msgstr ""
 msgid "Reset all settings for current option page"
 msgstr ""

-#: picard/ui/options/dialog.py:166
+#: picard/ui/options/dialog.py:172
 msgid "You are about to reset your options for this page."
 msgstr ""

-#: picard/ui/options/dialog.py:170
+#: picard/ui/options/dialog.py:176
 msgid "Warning! This will reset all of your settings."
 msgstr ""

-#: picard/ui/options/dialog.py:177
+#: picard/ui/options/dialog.py:183
 msgid "Confirm Reset"
 msgstr ""

-#: picard/ui/options/dialog.py:178
+#: picard/ui/options/dialog.py:184
 msgid "Are you sure?"
 msgstr ""

@@ -2104,7 +2124,7 @@ msgstr "Resetare totală"
 msgid "File Naming"
 msgstr ""

-#: picard/ui/options/renaming.py:175 picard/ui/options/scripting.py:406
+#: picard/ui/options/renaming.py:175 picard/ui/options/scripting.py:410
 msgid ""
 "<a href=\"%(picard-doc-scripting-url)s\">Open Scripting Documentation in "
 "your browser</a>"
@@ -2146,15 +2166,15 @@ msgstr ""
 msgid "Scripting"
 msgstr ""

-#: picard/ui/options/scripting.py:292
+#: picard/ui/options/scripting.py:293
 msgid "Are you sure you want to remove this script?"
 msgstr ""

-#: picard/ui/options/scripting.py:293
+#: picard/ui/options/scripting.py:294
 msgid "Confirm Remove"
 msgstr ""

-#: picard/ui/options/scripting.py:376
+#: picard/ui/options/scripting.py:377
 msgid "Script Error"
 msgstr "Eroare în script"

--- a/po/ru.po
+++ b/po/ru.po
@@ -16,8 +16,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: MusicBrainz\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2017-01-18 12:51+0100\n"
-"PO-Revision-Date: 2017-01-19 09:17+0000\n"
+"POT-Creation-Date: 2017-03-05 09:58+0100\n"
+"PO-Revision-Date: 2017-03-05 10:00+0000\n"
 "Last-Translator: nikki\n"
 "Language-Team: Russian (http://www.transifex.com/musicbrainz/musicbrainz/language/ru/)\n"
 "MIME-Version: 1.0\n"
@@ -64,26 +64,26 @@ msgstr "AcoustIDs успешно отправлен."
 msgid "Unmatched Files"
 msgstr "Неопознанные файлы"

-#: picard/album.py:206
+#: picard/album.py:200
 #, python-format
 msgid "[could not load album %s]"
 msgstr "[не удается загрузить альбом %s]"

-#: picard/album.py:295
+#: picard/album.py:289
 #, python-format
 msgid "Album %(id)s loaded: %(artist)s - %(album)s"
 msgstr "Альбом %(id)s загружен: %(artist)s - %(album)s"

-#: picard/album.py:338
+#: picard/album.py:332
 #, python-format
 msgid "Loading album %(id)s ..."
 msgstr "Загрузка альбома %(id)s ..."

-#: picard/album.py:342
+#: picard/album.py:336
 msgid "[loading album information]"
 msgstr "[загружается информация об альбоме]"

-#: picard/album.py:527
+#: picard/album.py:523
 #, python-format
 msgid "; %i image"
 msgid_plural "; %i images"
@@ -107,7 +107,7 @@ msgstr "Кластер %(album)s идентифицирован!"
 msgid "Looking up the metadata for cluster %(album)s..."
 msgstr "Поиск метаданных для кластера %(album)s..."

-#: picard/collection.py:64
+#: picard/collection.py:67
 #, python-format
 msgid "Added %(count)i release to collection \"%(name)s\""
 msgid_plural "Added %(count)i releases to collection \"%(name)s\""
@@ -116,7 +116,7 @@ msgstr[1] "Добавлены %(count)i релизы в коллекцию \"%(n
 msgstr[2] "Добавлен %(count)i релиза в коллекцию \"%(name)s\""
 msgstr[3] "Добавлен %(count)i релиза в коллекцию \"%(name)s\""

-#: picard/collection.py:86
+#: picard/collection.py:89
 #, python-format
 msgid "Removed %(count)i release from collection \"%(name)s\""
 msgid_plural "Removed %(count)i releases from collection \"%(name)s\""
@@ -125,58 +125,58 @@ msgstr[1] "Удалены %(count)i релизы из коллекции \"%(nam
 msgstr[2] "Удален %(count)i релиз из коллекции \"%(name)s\""
 msgstr[3] "Удален %(count)i релиз из коллекции \"%(name)s\""

-#: picard/collection.py:100
+#: picard/collection.py:104
 #, python-format
 msgid "Error loading collections: %(error)s"
 msgstr "Ошибка при загрузке коллекции: %(error)s"

-#: picard/config_upgrade.py:58 picard/config_upgrade.py:71
+#: picard/config_upgrade.py:57 picard/config_upgrade.py:70
 msgid "Various Artists file naming scheme removal"
 msgstr "Various Artists схема именования файлов для удаления"

-#: picard/config_upgrade.py:59
+#: picard/config_upgrade.py:58
 msgid ""
 "The separate file naming scheme for various artists albums has been removed in this version of Picard.\n"
 "Your file naming scheme has automatically been merged with that of single artist albums."
 msgstr "Отдельная схема обозначения файлов различных альбомов исполнителя была удалена в этой версии Picard.\nВаша схема обозначения файлов была автоматически объединена с единственным исполнителем альбома"

-#: picard/config_upgrade.py:72
+#: picard/config_upgrade.py:71
 msgid ""
 "The separate file naming scheme for various artists albums has been removed in this version of Picard.\n"
 "You currently do not use this option, but have a separate file naming scheme defined.\n"
 "Do you want to remove it or merge it with your file naming scheme for single artist albums?"
 msgstr "Отдельная схема именования файлов для различных художников, альбомы, был удален в этой версии Picard.\nВ настоящее время Вы не используете этот параметр, но есть отдельная схема именования файлов определены.\nВы действительно хотите удалить или объединить его с вашей схема именования файлов для одного художника альбомы?"

-#: picard/config_upgrade.py:78
+#: picard/config_upgrade.py:77
 msgid "Merge"
 msgstr "Объединить"

-#: picard/config_upgrade.py:78 picard/ui/metadatabox.py:314
+#: picard/config_upgrade.py:77 picard/ui/metadatabox.py:314
 #: picard/ui/options/interface.py:75 picard/ui/ui_options_interface.py:141
 msgid "Remove"
 msgstr "Удалить"

-#: picard/config_upgrade.py:193 picard/ui/options/scripting.py:28
+#: picard/config_upgrade.py:200 picard/ui/options/scripting.py:28
 #, python-format
 msgid "My script %d"
 msgstr ""

-#: picard/file.py:541
+#: picard/file.py:565
 #, python-format
 msgid "No matching tracks for file '%(filename)s'"
 msgstr "Нет соответствующих треков для файла '%(filename)s'"

-#: picard/file.py:557
+#: picard/file.py:581
 #, python-format
 msgid "No matching tracks above the threshold for file '%(filename)s'"
 msgstr "Нет совпадения треков для файла '%(filename)s'"

-#: picard/file.py:564
+#: picard/file.py:588
 #, python-format
 msgid "File '%(filename)s' identified!"
 msgstr "Файл '%(filename)s' идентифицирован!"

-#: picard/file.py:584
+#: picard/file.py:608
 #, python-format
 msgid "Looking up the metadata for file %(filename)s ..."
 msgstr "Просмотр метаданных для файла %(filename)s..."
@@ -219,7 +219,7 @@ msgstr "[штрих-код отсутствует]"
 msgid "[no release info]"
 msgstr "[нет информации о альбоме]"

-#: picard/tagger.py:405 picard/tagger.py:438
+#: picard/tagger.py:407 picard/tagger.py:440
 #, python-format
 msgid "Adding %(count)d file from '%(directory)s' ..."
 msgid_plural "Adding %(count)d files from '%(directory)s' ..."
@@ -228,16 +228,16 @@ msgstr[1] "Добавление %(count)d файлов из '%(directory)s' ..."
 msgstr[2] "Добавление %(count)d файлов из '%(directory)s' ..."
 msgstr[3] "Добавление %(count)d файлов из '%(directory)s' ..."

-#: picard/tagger.py:597
+#: picard/tagger.py:599
 #, python-format
 msgid "Removing album %(id)s: %(artist)s - %(album)s"
 msgstr "Удаление альбома %(id)s: %(artist)s - %(album)s"

-#: picard/tagger.py:613
+#: picard/tagger.py:615
 msgid "CD Lookup Error"
 msgstr "Ошибка опознавания CD"

-#: picard/tagger.py:614
+#: picard/tagger.py:616
 #, python-format
 msgid ""
 "Error while reading CD:\n"
@@ -285,6 +285,10 @@ msgstr "Французский"
 msgid "Italian"
 msgstr "Итальянский"

+#: picard/const/languages.py:57
+msgid "Norwegian Bokmal"
+msgstr ""
+
 #: picard/const/languages.py:59
 msgid "Dutch"
 msgstr "Голландский"
@@ -348,12 +352,12 @@ msgstr "Локальные файлы"
 msgid "Whitelist"
 msgstr "Белый список"

-#: picard/ui/cdlookup.py:35 picard/ui/mainwindow.py:625 picard/util/tags.py:21
+#: picard/ui/cdlookup.py:35 picard/ui/mainwindow.py:626 picard/util/tags.py:21
 msgid "Album"
 msgstr "Альбом"

-#: picard/ui/cdlookup.py:35 picard/ui/itemviews.py:96
-#: picard/ui/mainwindow.py:626 picard/ui/searchdialog.py:326
+#: picard/ui/cdlookup.py:35 picard/ui/itemviews.py:105
+#: picard/ui/mainwindow.py:627 picard/ui/searchdialog.py:326
 #: picard/ui/searchdialog.py:513 picard/util/tags.py:22
 msgid "Artist"
 msgstr "Исполнитель"
@@ -389,10 +393,22 @@ msgstr[1] "%s (%i альбома)"
 msgstr[2] "%s (%i альбомов)"
 msgstr[3] "%s (%i альбомов)"

-#: picard/ui/coverartbox.py:143
+#: picard/ui/coverartbox.py:141
 msgid "View release on MusicBrainz"
 msgstr "Открыть альбом на MusicBrainz"

+#: picard/ui/coverartbox.py:174
+msgid "Show more details"
+msgstr ""
+
+#: picard/ui/coverartbox.py:199
+msgid "New Cover Art"
+msgstr ""
+
+#: picard/ui/coverartbox.py:200
+msgid "Original Cover Art"
+msgstr ""
+
 #: picard/ui/filebrowser.py:40
 msgid "&Move Tagged Files Here"
 msgstr "&Переместить помеченные файлы сюда"
@@ -521,116 +537,116 @@ msgstr "Отложенные файлы"
 msgid "Pending requests"
 msgstr "Запросы, ожидающие обработки"

-#: picard/ui/itemviews.py:94 picard/util/tags.py:23
+#: picard/ui/itemviews.py:103 picard/util/tags.py:23
 msgid "Title"
 msgstr "Название"

-#: picard/ui/itemviews.py:95 picard/ui/searchdialog.py:325
+#: picard/ui/itemviews.py:104 picard/ui/searchdialog.py:325
 #: picard/util/tags.py:87
 msgid "Length"
 msgstr "Длина"

-#: picard/ui/itemviews.py:162
+#: picard/ui/itemviews.py:171
 msgid "Bad match"
 msgstr "Плохое совпадение"

-#: picard/ui/itemviews.py:163
+#: picard/ui/itemviews.py:172
 msgid "Poor match"
 msgstr "Недостаточное совпадение"

-#: picard/ui/itemviews.py:164
+#: picard/ui/itemviews.py:173
 msgid "Ok match"
 msgstr "Нормальное совпадение"

-#: picard/ui/itemviews.py:165
+#: picard/ui/itemviews.py:174
 msgid "Good match"
 msgstr "Хорошее совпадение"

-#: picard/ui/itemviews.py:166
+#: picard/ui/itemviews.py:175
 msgid "Great match"
 msgstr "Отличное совпадение"

-#: picard/ui/itemviews.py:167
+#: picard/ui/itemviews.py:176
 msgid "Excellent match"
 msgstr "Прекрасное совпадение"

-#: picard/ui/itemviews.py:243
+#: picard/ui/itemviews.py:252
 msgid "&Expand all"
 msgstr "&Развернуть все"

-#: picard/ui/itemviews.py:245
+#: picard/ui/itemviews.py:254
 msgid "&Collapse all"
 msgstr "&Свернуть все"

-#: picard/ui/itemviews.py:247
+#: picard/ui/itemviews.py:256
 msgid "Select &all"
 msgstr ""

-#: picard/ui/itemviews.py:249
+#: picard/ui/itemviews.py:258
 msgid "Ctrl+A"
 msgstr "Ctrl+A"

-#: picard/ui/itemviews.py:315
+#: picard/ui/itemviews.py:324
 msgid "&Other versions"
 msgstr "&Другии версии"

-#: picard/ui/itemviews.py:318
+#: picard/ui/itemviews.py:327
 msgid "Loading..."
 msgstr "Идёт загрузка..."

-#: picard/ui/itemviews.py:383
+#: picard/ui/itemviews.py:392
 msgid "Collections"
 msgstr "Коллекции"

-#: picard/ui/itemviews.py:386
+#: picard/ui/itemviews.py:395
 msgid "P&lugins"
 msgstr "Плагины"

-#: picard/ui/itemviews.py:557
+#: picard/ui/itemviews.py:577
 msgid "file view"
 msgstr "вид на файлы"

-#: picard/ui/itemviews.py:558
+#: picard/ui/itemviews.py:578
 msgid "Contains unmatched files and clusters"
 msgstr "Содержит несовпадающие файлы и кластеры"

-#: picard/ui/itemviews.py:578
+#: picard/ui/itemviews.py:598
 msgid "Clusters"
 msgstr "Кластеры"

-#: picard/ui/itemviews.py:587
+#: picard/ui/itemviews.py:607
 msgid "album view"
 msgstr "вид на альбом"

-#: picard/ui/itemviews.py:588
+#: picard/ui/itemviews.py:608
 msgid "Contains albums and matched files"
 msgstr "Содержит альбомы с соответствующими файлами"

-#: picard/ui/itemviews.py:694 picard/ui/options/renaming.py:188
+#: picard/ui/itemviews.py:714 picard/ui/options/renaming.py:188
 msgid "Error"
 msgstr "Ошибка"

-#: picard/ui/itemviews.py:698
+#: picard/ui/itemviews.py:718
 msgid "Album modified and complete"
 msgstr ""

-#: picard/ui/itemviews.py:701
+#: picard/ui/itemviews.py:721
 msgid "Album unchanged and complete"
 msgstr ""

-#: picard/ui/itemviews.py:705
+#: picard/ui/itemviews.py:725
 msgid "Album modified"
 msgstr ""

-#: picard/ui/itemviews.py:708
+#: picard/ui/itemviews.py:728
 msgid "Album unchanged"
 msgstr ""

-#: picard/ui/itemviews.py:811
+#: picard/ui/itemviews.py:831
 msgid "Track saved"
 msgstr ""

-#: picard/ui/itemviews.py:813 picard/ui/itemviews.py:817
+#: picard/ui/itemviews.py:833 picard/ui/itemviews.py:837
 msgid "Pending"
 msgstr ""

@@ -823,7 +839,7 @@ msgstr "Ctrl+B"
 msgid "&Cover Art"
 msgstr "&Обложка"

-#: picard/ui/mainwindow.py:407 picard/ui/mainwindow.py:619
+#: picard/ui/mainwindow.py:407 picard/ui/mainwindow.py:620
 #: picard/ui/searchdialog.py:71
 msgid "Search"
 msgstr "Поиск"
@@ -850,175 +866,179 @@ msgid ""
 "even if they have no metadata"
 msgstr ""

-#: picard/ui/mainwindow.py:421
+#: picard/ui/mainwindow.py:420
+msgid "Identify the file using its AcoustID audio fingerprint"
+msgstr ""
+
+#: picard/ui/mainwindow.py:422
 msgid "Ctrl+Y"
 msgstr "Ctrl+Y"

-#: picard/ui/mainwindow.py:424
+#: picard/ui/mainwindow.py:425
 msgid "Cl&uster"
 msgstr "&Разбить на кластеры"

-#: picard/ui/mainwindow.py:425
+#: picard/ui/mainwindow.py:426
 msgid "Cluster files into album clusters"
 msgstr ""

-#: picard/ui/mainwindow.py:428
+#: picard/ui/mainwindow.py:429
 msgid "Ctrl+U"
 msgstr "Ctrl+U"

-#: picard/ui/mainwindow.py:431
+#: picard/ui/mainwindow.py:432
 msgid "&Lookup"
 msgstr "&Опознать"

-#: picard/ui/mainwindow.py:432
+#: picard/ui/mainwindow.py:433
 msgid "Lookup selected items in MusicBrainz"
 msgstr "Поиск выбранных элементов в MusicBrainz"

-#: picard/ui/mainwindow.py:437
+#: picard/ui/mainwindow.py:438
 msgid "Ctrl+L"
 msgstr "Ctrl+L"

-#: picard/ui/mainwindow.py:440
+#: picard/ui/mainwindow.py:441
 msgid "&Info..."
 msgstr "&Информация..."

-#: picard/ui/mainwindow.py:443
+#: picard/ui/mainwindow.py:444
 msgid "Ctrl+I"
 msgstr "Ctrl+I"

-#: picard/ui/mainwindow.py:446
+#: picard/ui/mainwindow.py:447
 msgid "&Refresh"
 msgstr "&Обновить"

-#: picard/ui/mainwindow.py:447
+#: picard/ui/mainwindow.py:448
 msgid "Ctrl+R"
 msgstr "Ctrl+R"

-#: picard/ui/mainwindow.py:450
+#: picard/ui/mainwindow.py:451
 msgid "&Rename Files"
 msgstr "&Переименовывать файлы"

-#: picard/ui/mainwindow.py:455
+#: picard/ui/mainwindow.py:456
 msgid "&Move Files"
 msgstr "П&ереносить файлы"

-#: picard/ui/mainwindow.py:460
+#: picard/ui/mainwindow.py:461
 msgid "Save &Tags"
 msgstr "Сохранять &теги"

-#: picard/ui/mainwindow.py:465
+#: picard/ui/mainwindow.py:466
 msgid "Tags From &File Names..."
 msgstr "Теги из имён &файлов…"

-#: picard/ui/mainwindow.py:469
+#: picard/ui/mainwindow.py:470
 msgid "&Open My Collections in Browser"
 msgstr "&Открыть Коллекцию в Браузере"

-#: picard/ui/mainwindow.py:473
+#: picard/ui/mainwindow.py:474
 msgid "View Error/Debug &Log"
 msgstr "Просмотр &Журнала ошибок"

-#: picard/ui/mainwindow.py:476
+#: picard/ui/mainwindow.py:477
 msgid "View Activity &History"
 msgstr "&Просмотр Истории активности"

-#: picard/ui/mainwindow.py:483
+#: picard/ui/mainwindow.py:484
 msgid "Open in &Player"
 msgstr ""

-#: picard/ui/mainwindow.py:484
+#: picard/ui/mainwindow.py:485
 msgid "Play the file in your default media player"
 msgstr "Воспроизвести этот файл в проигрывателе по умолчанию"

-#: picard/ui/mainwindow.py:488
+#: picard/ui/mainwindow.py:489
 msgid "Open Containing &Folder"
 msgstr "&Открыть содержащую папку"

-#: picard/ui/mainwindow.py:489
+#: picard/ui/mainwindow.py:490
 msgid "Open the containing folder in your file explorer"
 msgstr "Откройте папку, содержащую файл в вашем обозревателе"

-#: picard/ui/mainwindow.py:518
+#: picard/ui/mainwindow.py:519
 msgid "&File"
 msgstr "&Файл"

-#: picard/ui/mainwindow.py:529
+#: picard/ui/mainwindow.py:530
 msgid "&Edit"
 msgstr "&Правка"

-#: picard/ui/mainwindow.py:535
+#: picard/ui/mainwindow.py:536
 msgid "&View"
 msgstr "&Вид"

-#: picard/ui/mainwindow.py:541
+#: picard/ui/mainwindow.py:542
 msgid "&Options"
 msgstr "&Настройки"

-#: picard/ui/mainwindow.py:547
+#: picard/ui/mainwindow.py:548
 msgid "&Tools"
 msgstr "&Инструменты"

-#: picard/ui/mainwindow.py:558 picard/ui/util.py:35
+#: picard/ui/mainwindow.py:559 picard/ui/util.py:35
 msgid "&Help"
 msgstr "&Справка"

-#: picard/ui/mainwindow.py:586
+#: picard/ui/mainwindow.py:587
 msgid "Actions"
 msgstr "Действия"

-#: picard/ui/mainwindow.py:627
+#: picard/ui/mainwindow.py:628
 msgid "Track"
 msgstr "Произведение"

-#: picard/ui/mainwindow.py:703
+#: picard/ui/mainwindow.py:704
 msgid "All Supported Formats"
 msgstr "Все поддерживаемые форматы"

-#: picard/ui/mainwindow.py:730
+#: picard/ui/mainwindow.py:731
 #, python-format
 msgid "Adding multiple directories from '%(directory)s' ..."
 msgstr "Добавление нескольких папок из '%(directory)s' ..."

-#: picard/ui/mainwindow.py:735
+#: picard/ui/mainwindow.py:736
 #, python-format
 msgid "Adding directory: '%(directory)s' ..."
 msgstr "Добавление папки:'%(directory)s' ..."

-#: picard/ui/mainwindow.py:801
+#: picard/ui/mainwindow.py:809
 msgid "Configuration Required"
 msgstr "Требуется настройка"

-#: picard/ui/mainwindow.py:802
+#: picard/ui/mainwindow.py:810
 msgid ""
 "Audio fingerprinting is not yet configured. Would you like to configure it "
 "now?"
 msgstr "Поддержка звуковых отпечатков не настроена. Хотите настроить её сейчас?"

-#: picard/ui/mainwindow.py:902
+#: picard/ui/mainwindow.py:916
 #, python-format
 msgid "%(filename)s (error: %(error)s)"
 msgstr "%(filename)s (error: %(error)s)"

-#: picard/ui/mainwindow.py:908
+#: picard/ui/mainwindow.py:922
 #, python-format
 msgid "%(filename)s"
 msgstr "%(filename)s"

-#: picard/ui/mainwindow.py:918
+#: picard/ui/mainwindow.py:933
 #, python-format
 msgid "%(filename)s (%(similarity)d%%) (error: %(error)s)"
 msgstr "%(filename)s (%(similarity)d%%) (error: %(error)s)"

-#: picard/ui/mainwindow.py:925
+#: picard/ui/mainwindow.py:940
 #, python-format
 msgid "%(filename)s (%(similarity)d%%)"
 msgstr "%(filename)s (%(similarity)d%%)"

-#: picard/ui/mainwindow.py:961
+#: picard/ui/mainwindow.py:976
 msgid "Authentication Required"
 msgstr "Требуется аутентификация"

-#: picard/ui/mainwindow.py:962
+#: picard/ui/mainwindow.py:977
 msgid ""
 "Picard needs authorization to access your personal data on the MusicBrainz "
 "server. Would you like to log in now?"
@@ -1133,7 +1153,7 @@ msgstr ""
 msgid "Retry"
 msgstr ""

-#: picard/ui/searchdialog.py:288
+#: picard/ui/searchdialog.py:283
 #, python-format
 msgid ""
 "<strong>Following error occurred while fetching "
@@ -1937,19 +1957,19 @@ msgstr ""
 msgid "Reset all settings for current option page"
 msgstr ""

-#: picard/ui/options/dialog.py:166
+#: picard/ui/options/dialog.py:172
 msgid "You are about to reset your options for this page."
 msgstr ""

-#: picard/ui/options/dialog.py:170
+#: picard/ui/options/dialog.py:176
 msgid "Warning! This will reset all of your settings."
 msgstr ""

-#: picard/ui/options/dialog.py:177
+#: picard/ui/options/dialog.py:183
 msgid "Confirm Reset"
 msgstr ""

-#: picard/ui/options/dialog.py:178
+#: picard/ui/options/dialog.py:184
 msgid "Are you sure?"
 msgstr ""

@@ -2120,7 +2140,7 @@ msgstr "Сбросить всё"
 msgid "File Naming"
 msgstr "Имя файла"

-#: picard/ui/options/renaming.py:175 picard/ui/options/scripting.py:406
+#: picard/ui/options/renaming.py:175 picard/ui/options/scripting.py:410
 msgid ""
 "<a href=\"%(picard-doc-scripting-url)s\">Open Scripting Documentation in "
 "your browser</a>"
@@ -2162,15 +2182,15 @@ msgstr ""
 msgid "Scripting"
 msgstr "Скрипты"

-#: picard/ui/options/scripting.py:292
+#: picard/ui/options/scripting.py:293
 msgid "Are you sure you want to remove this script?"
 msgstr ""

-#: picard/ui/options/scripting.py:293
+#: picard/ui/options/scripting.py:294
 msgid "Confirm Remove"
 msgstr ""

-#: picard/ui/options/scripting.py:376
+#: picard/ui/options/scripting.py:377
 msgid "Script Error"
 msgstr "Ошибка скрипта"

--- a/po/sk.po
+++ b/po/sk.po
@@ -9,8 +9,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: MusicBrainz\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2017-01-18 12:51+0100\n"
-"PO-Revision-Date: 2017-01-19 09:17+0000\n"
+"POT-Creation-Date: 2017-03-05 09:58+0100\n"
+"PO-Revision-Date: 2017-03-05 10:00+0000\n"
 "Last-Translator: nikki\n"
 "Language-Team: Slovak (http://www.transifex.com/musicbrainz/musicbrainz/language/sk/)\n"
 "MIME-Version: 1.0\n"
@@ -57,26 +57,26 @@ msgstr ""
 msgid "Unmatched Files"
 msgstr "Nerozpoznané súbory"

-#: picard/album.py:206
+#: picard/album.py:200
 #, python-format
 msgid "[could not load album %s]"
 msgstr "[nemožem nahrať album %s]"

-#: picard/album.py:295
+#: picard/album.py:289
 #, python-format
 msgid "Album %(id)s loaded: %(artist)s - %(album)s"
 msgstr ""

-#: picard/album.py:338
+#: picard/album.py:332
 #, python-format
 msgid "Loading album %(id)s ..."
 msgstr ""

-#: picard/album.py:342
+#: picard/album.py:336
 msgid "[loading album information]"
 msgstr "[nahrávam informácie o albume]"

-#: picard/album.py:527
+#: picard/album.py:523
 #, python-format
 msgid "; %i image"
 msgid_plural "; %i images"
@@ -99,7 +99,7 @@ msgstr ""
 msgid "Looking up the metadata for cluster %(album)s..."
 msgstr ""

-#: picard/collection.py:64
+#: picard/collection.py:67
 #, python-format
 msgid "Added %(count)i release to collection \"%(name)s\""
 msgid_plural "Added %(count)i releases to collection \"%(name)s\""
@@ -107,7 +107,7 @@ msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""

-#: picard/collection.py:86
+#: picard/collection.py:89
 #, python-format
 msgid "Removed %(count)i release from collection \"%(name)s\""
 msgid_plural "Removed %(count)i releases from collection \"%(name)s\""
@@ -115,58 +115,58 @@ msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""

-#: picard/collection.py:100
+#: picard/collection.py:104
 #, python-format
 msgid "Error loading collections: %(error)s"
 msgstr ""

-#: picard/config_upgrade.py:58 picard/config_upgrade.py:71
+#: picard/config_upgrade.py:57 picard/config_upgrade.py:70
 msgid "Various Artists file naming scheme removal"
 msgstr "Odstránenie pravidiel pre pomenovanie rôznych umelcov"

-#: picard/config_upgrade.py:59
+#: picard/config_upgrade.py:58
 msgid ""
 "The separate file naming scheme for various artists albums has been removed in this version of Picard.\n"
 "Your file naming scheme has automatically been merged with that of single artist albums."
 msgstr ""

-#: picard/config_upgrade.py:72
+#: picard/config_upgrade.py:71
 msgid ""
 "The separate file naming scheme for various artists albums has been removed in this version of Picard.\n"
 "You currently do not use this option, but have a separate file naming scheme defined.\n"
 "Do you want to remove it or merge it with your file naming scheme for single artist albums?"
 msgstr ""

-#: picard/config_upgrade.py:78
+#: picard/config_upgrade.py:77
 msgid "Merge"
 msgstr "Zlúčiť"

-#: picard/config_upgrade.py:78 picard/ui/metadatabox.py:314
+#: picard/config_upgrade.py:77 picard/ui/metadatabox.py:314
 #: picard/ui/options/interface.py:75 picard/ui/ui_options_interface.py:141
 msgid "Remove"
 msgstr "Odstrániť"

-#: picard/config_upgrade.py:193 picard/ui/options/scripting.py:28
+#: picard/config_upgrade.py:200 picard/ui/options/scripting.py:28
 #, python-format
 msgid "My script %d"
 msgstr ""

-#: picard/file.py:541
+#: picard/file.py:565
 #, python-format
 msgid "No matching tracks for file '%(filename)s'"
 msgstr ""

-#: picard/file.py:557
+#: picard/file.py:581
 #, python-format
 msgid "No matching tracks above the threshold for file '%(filename)s'"
 msgstr ""

-#: picard/file.py:564
+#: picard/file.py:588
 #, python-format
 msgid "File '%(filename)s' identified!"
 msgstr ""

-#: picard/file.py:584
+#: picard/file.py:608
 #, python-format
 msgid "Looking up the metadata for file %(filename)s ..."
 msgstr ""
@@ -209,7 +209,7 @@ msgstr ""
 msgid "[no release info]"
 msgstr "[bez informácií o vydaní]"

-#: picard/tagger.py:405 picard/tagger.py:438
+#: picard/tagger.py:407 picard/tagger.py:440
 #, python-format
 msgid "Adding %(count)d file from '%(directory)s' ..."
 msgid_plural "Adding %(count)d files from '%(directory)s' ..."
@@ -217,16 +217,16 @@ msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""

-#: picard/tagger.py:597
+#: picard/tagger.py:599
 #, python-format
 msgid "Removing album %(id)s: %(artist)s - %(album)s"
 msgstr ""

-#: picard/tagger.py:613
+#: picard/tagger.py:615
 msgid "CD Lookup Error"
 msgstr "Chyba pri prehľadávaní CD"

-#: picard/tagger.py:614
+#: picard/tagger.py:616
 #, python-format
 msgid ""
 "Error while reading CD:\n"
@@ -274,6 +274,10 @@ msgstr "Francúzština"
 msgid "Italian"
 msgstr "Taliančina"

+#: picard/const/languages.py:57
+msgid "Norwegian Bokmal"
+msgstr ""
+
 #: picard/const/languages.py:59
 msgid "Dutch"
 msgstr "Holandština"
@@ -337,12 +341,12 @@ msgstr ""
 msgid "Whitelist"
 msgstr ""

-#: picard/ui/cdlookup.py:35 picard/ui/mainwindow.py:625 picard/util/tags.py:21
+#: picard/ui/cdlookup.py:35 picard/ui/mainwindow.py:626 picard/util/tags.py:21
 msgid "Album"
 msgstr "Album"

-#: picard/ui/cdlookup.py:35 picard/ui/itemviews.py:96
-#: picard/ui/mainwindow.py:626 picard/ui/searchdialog.py:326
+#: picard/ui/cdlookup.py:35 picard/ui/itemviews.py:105
+#: picard/ui/mainwindow.py:627 picard/ui/searchdialog.py:326
 #: picard/ui/searchdialog.py:513 picard/util/tags.py:22
 msgid "Artist"
 msgstr "Umelec"
@@ -377,10 +381,22 @@ msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""

-#: picard/ui/coverartbox.py:143
+#: picard/ui/coverartbox.py:141
 msgid "View release on MusicBrainz"
 msgstr "Zobraziť vydanie v MusicBrainz"

+#: picard/ui/coverartbox.py:174
+msgid "Show more details"
+msgstr ""
+
+#: picard/ui/coverartbox.py:199
+msgid "New Cover Art"
+msgstr ""
+
+#: picard/ui/coverartbox.py:200
+msgid "Original Cover Art"
+msgstr ""
+
 #: picard/ui/filebrowser.py:40
 msgid "&Move Tagged Files Here"
 msgstr "&Presunúť otagované súbory sem"
@@ -509,116 +525,116 @@ msgstr ""
 msgid "Pending requests"
 msgstr ""

-#: picard/ui/itemviews.py:94 picard/util/tags.py:23
+#: picard/ui/itemviews.py:103 picard/util/tags.py:23
 msgid "Title"
 msgstr "Názov"

-#: picard/ui/itemviews.py:95 picard/ui/searchdialog.py:325
+#: picard/ui/itemviews.py:104 picard/ui/searchdialog.py:325
 #: picard/util/tags.py:87
 msgid "Length"
 msgstr "Dĺžka"

-#: picard/ui/itemviews.py:162
+#: picard/ui/itemviews.py:171
 msgid "Bad match"
 msgstr ""

-#: picard/ui/itemviews.py:163
+#: picard/ui/itemviews.py:172
 msgid "Poor match"
 msgstr ""

-#: picard/ui/itemviews.py:164
+#: picard/ui/itemviews.py:173
 msgid "Ok match"
 msgstr ""

-#: picard/ui/itemviews.py:165
+#: picard/ui/itemviews.py:174
 msgid "Good match"
 msgstr ""

-#: picard/ui/itemviews.py:166
+#: picard/ui/itemviews.py:175
 msgid "Great match"
 msgstr ""

-#: picard/ui/itemviews.py:167
+#: picard/ui/itemviews.py:176
 msgid "Excellent match"
 msgstr ""

-#: picard/ui/itemviews.py:243
+#: picard/ui/itemviews.py:252
 msgid "&Expand all"
 msgstr "&Rozbaľ všetko"

-#: picard/ui/itemviews.py:245
+#: picard/ui/itemviews.py:254
 msgid "&Collapse all"
 msgstr "&Zbaĺ všetko"

-#: picard/ui/itemviews.py:247
+#: picard/ui/itemviews.py:256
 msgid "Select &all"
 msgstr ""

-#: picard/ui/itemviews.py:249
+#: picard/ui/itemviews.py:258
 msgid "Ctrl+A"
 msgstr ""

-#: picard/ui/itemviews.py:315
+#: picard/ui/itemviews.py:324
 msgid "&Other versions"
 msgstr "&Iné verzie"

-#: picard/ui/itemviews.py:318
+#: picard/ui/itemviews.py:327
 msgid "Loading..."
 msgstr "Načítavanie..."

-#: picard/ui/itemviews.py:383
+#: picard/ui/itemviews.py:392
 msgid "Collections"
 msgstr ""

-#: picard/ui/itemviews.py:386
+#: picard/ui/itemviews.py:395
 msgid "P&lugins"
 msgstr ""

-#: picard/ui/itemviews.py:557
+#: picard/ui/itemviews.py:577
 msgid "file view"
 msgstr ""

-#: picard/ui/itemviews.py:558
+#: picard/ui/itemviews.py:578
 msgid "Contains unmatched files and clusters"
 msgstr ""

-#: picard/ui/itemviews.py:578
+#: picard/ui/itemviews.py:598
 msgid "Clusters"
 msgstr "Klastre"

-#: picard/ui/itemviews.py:587
+#: picard/ui/itemviews.py:607
 msgid "album view"
 msgstr ""

-#: picard/ui/itemviews.py:588
+#: picard/ui/itemviews.py:608
 msgid "Contains albums and matched files"
 msgstr ""

-#: picard/ui/itemviews.py:694 picard/ui/options/renaming.py:188
+#: picard/ui/itemviews.py:714 picard/ui/options/renaming.py:188
 msgid "Error"
 msgstr "Chyba"

-#: picard/ui/itemviews.py:698
+#: picard/ui/itemviews.py:718
 msgid "Album modified and complete"
 msgstr ""

-#: picard/ui/itemviews.py:701
+#: picard/ui/itemviews.py:721
 msgid "Album unchanged and complete"
 msgstr ""

-#: picard/ui/itemviews.py:705
+#: picard/ui/itemviews.py:725
 msgid "Album modified"
 msgstr ""

-#: picard/ui/itemviews.py:708
+#: picard/ui/itemviews.py:728
 msgid "Album unchanged"
 msgstr ""

-#: picard/ui/itemviews.py:811
+#: picard/ui/itemviews.py:831
 msgid "Track saved"
 msgstr ""

-#: picard/ui/itemviews.py:813 picard/ui/itemviews.py:817
+#: picard/ui/itemviews.py:833 picard/ui/itemviews.py:837
 msgid "Pending"
 msgstr ""

@@ -810,7 +826,7 @@ msgstr "Ctrl+B"
 msgid "&Cover Art"
 msgstr "&Obrázok Albumu"

-#: picard/ui/mainwindow.py:407 picard/ui/mainwindow.py:619
+#: picard/ui/mainwindow.py:407 picard/ui/mainwindow.py:620
 #: picard/ui/searchdialog.py:71
 msgid "Search"
 msgstr "Hľadaj"
@@ -837,175 +853,179 @@ msgid ""
 "even if they have no metadata"
 msgstr ""

-#: picard/ui/mainwindow.py:421
+#: picard/ui/mainwindow.py:420
+msgid "Identify the file using its AcoustID audio fingerprint"
+msgstr ""
+
+#: picard/ui/mainwindow.py:422
 msgid "Ctrl+Y"
 msgstr "Ctrl+Y"

-#: picard/ui/mainwindow.py:424
+#: picard/ui/mainwindow.py:425
 msgid "Cl&uster"
 msgstr "Kl&aster"

-#: picard/ui/mainwindow.py:425
+#: picard/ui/mainwindow.py:426
 msgid "Cluster files into album clusters"
 msgstr ""

-#: picard/ui/mainwindow.py:428
+#: picard/ui/mainwindow.py:429
 msgid "Ctrl+U"
 msgstr "Ctrl+U"

-#: picard/ui/mainwindow.py:431
+#: picard/ui/mainwindow.py:432
 msgid "&Lookup"
 msgstr "&Vyhľadať"

-#: picard/ui/mainwindow.py:432
+#: picard/ui/mainwindow.py:433
 msgid "Lookup selected items in MusicBrainz"
 msgstr ""

-#: picard/ui/mainwindow.py:437
+#: picard/ui/mainwindow.py:438
 msgid "Ctrl+L"
 msgstr "Ctrl+L"

-#: picard/ui/mainwindow.py:440
+#: picard/ui/mainwindow.py:441
 msgid "&Info..."
 msgstr "&Informácie"

-#: picard/ui/mainwindow.py:443
+#: picard/ui/mainwindow.py:444
 msgid "Ctrl+I"
 msgstr "Ctrl+I"

-#: picard/ui/mainwindow.py:446
+#: picard/ui/mainwindow.py:447
 msgid "&Refresh"
 msgstr "&Obnov"

-#: picard/ui/mainwindow.py:447
+#: picard/ui/mainwindow.py:448
 msgid "Ctrl+R"
 msgstr "Ctrl+R"

-#: picard/ui/mainwindow.py:450
+#: picard/ui/mainwindow.py:451
 msgid "&Rename Files"
 msgstr "&Premenovať Súbory"

-#: picard/ui/mainwindow.py:455
+#: picard/ui/mainwindow.py:456
 msgid "&Move Files"
 msgstr "&Premiestniť súbory"

-#: picard/ui/mainwindow.py:460
+#: picard/ui/mainwindow.py:461
 msgid "Save &Tags"
 msgstr "Uložiť &Tagy"

-#: picard/ui/mainwindow.py:465
+#: picard/ui/mainwindow.py:466
 msgid "Tags From &File Names..."
 msgstr "Tagy z &Nazov Súboru..."

-#: picard/ui/mainwindow.py:469
+#: picard/ui/mainwindow.py:470
 msgid "&Open My Collections in Browser"
 msgstr ""

-#: picard/ui/mainwindow.py:473
+#: picard/ui/mainwindow.py:474
 msgid "View Error/Debug &Log"
 msgstr ""

-#: picard/ui/mainwindow.py:476
+#: picard/ui/mainwindow.py:477
 msgid "View Activity &History"
 msgstr ""

-#: picard/ui/mainwindow.py:483
+#: picard/ui/mainwindow.py:484
 msgid "Open in &Player"
 msgstr ""

-#: picard/ui/mainwindow.py:484
+#: picard/ui/mainwindow.py:485
 msgid "Play the file in your default media player"
 msgstr ""

-#: picard/ui/mainwindow.py:488
+#: picard/ui/mainwindow.py:489
 msgid "Open Containing &Folder"
 msgstr ""

-#: picard/ui/mainwindow.py:489
+#: picard/ui/mainwindow.py:490
 msgid "Open the containing folder in your file explorer"
 msgstr ""

-#: picard/ui/mainwindow.py:518
+#: picard/ui/mainwindow.py:519
 msgid "&File"
 msgstr "&Súbor"

-#: picard/ui/mainwindow.py:529
+#: picard/ui/mainwindow.py:530
 msgid "&Edit"
 msgstr "&Úpravy"

-#: picard/ui/mainwindow.py:535
+#: picard/ui/mainwindow.py:536
 msgid "&View"
 msgstr "&Zobraziť"

-#: picard/ui/mainwindow.py:541
+#: picard/ui/mainwindow.py:542
 msgid "&Options"
 msgstr "&Nastavenia"

-#: picard/ui/mainwindow.py:547
+#: picard/ui/mainwindow.py:548
 msgid "&Tools"
 msgstr "&Možnosti"

-#: picard/ui/mainwindow.py:558 picard/ui/util.py:35
+#: picard/ui/mainwindow.py:559 picard/ui/util.py:35
 msgid "&Help"
 msgstr "&Pomocník"

-#: picard/ui/mainwindow.py:586
+#: picard/ui/mainwindow.py:587
 msgid "Actions"
 msgstr ""

-#: picard/ui/mainwindow.py:627
+#: picard/ui/mainwindow.py:628
 msgid "Track"
 msgstr "Skladba"

-#: picard/ui/mainwindow.py:703
+#: picard/ui/mainwindow.py:704
 msgid "All Supported Formats"
 msgstr "Všetky Podporované Formáty"

-#: picard/ui/mainwindow.py:730
+#: picard/ui/mainwindow.py:731
 #, python-format
 msgid "Adding multiple directories from '%(directory)s' ..."
 msgstr ""

-#: picard/ui/mainwindow.py:735
+#: picard/ui/mainwindow.py:736
 #, python-format
 msgid "Adding directory: '%(directory)s' ..."
 msgstr ""

-#: picard/ui/mainwindow.py:801
+#: picard/ui/mainwindow.py:809
 msgid "Configuration Required"
 msgstr "Je potrebné nastavenie"

-#: picard/ui/mainwindow.py:802
+#: picard/ui/mainwindow.py:810
 msgid ""
 "Audio fingerprinting is not yet configured. Would you like to configure it "
 "now?"
 msgstr "Tvorba odtlačkov audia nie je zatiaľ nastavená. Chcete ju nastaviť teraz?"

-#: picard/ui/mainwindow.py:902
+#: picard/ui/mainwindow.py:916
 #, python-format
 msgid "%(filename)s (error: %(error)s)"
 msgstr ""

-#: picard/ui/mainwindow.py:908
+#: picard/ui/mainwindow.py:922
 #, python-format
 msgid "%(filename)s"
 msgstr ""

-#: picard/ui/mainwindow.py:918
+#: picard/ui/mainwindow.py:933
 #, python-format
 msgid "%(filename)s (%(similarity)d%%) (error: %(error)s)"
 msgstr ""

-#: picard/ui/mainwindow.py:925
+#: picard/ui/mainwindow.py:940
 #, python-format
 msgid "%(filename)s (%(similarity)d%%)"
 msgstr ""

-#: picard/ui/mainwindow.py:961
+#: picard/ui/mainwindow.py:976
 msgid "Authentication Required"
 msgstr ""

-#: picard/ui/mainwindow.py:962
+#: picard/ui/mainwindow.py:977
 msgid ""
 "Picard needs authorization to access your personal data on the MusicBrainz "
 "server. Would you like to log in now?"
@@ -1117,7 +1137,7 @@ msgstr ""
 msgid "Retry"
 msgstr ""

-#: picard/ui/searchdialog.py:288
+#: picard/ui/searchdialog.py:283
 #, python-format
 msgid ""
 "<strong>Following error occurred while fetching "
@@ -1921,19 +1941,19 @@ msgstr ""
 msgid "Reset all settings for current option page"
 msgstr ""

-#: picard/ui/options/dialog.py:166
+#: picard/ui/options/dialog.py:172
 msgid "You are about to reset your options for this page."
 msgstr ""

-#: picard/ui/options/dialog.py:170
+#: picard/ui/options/dialog.py:176
 msgid "Warning! This will reset all of your settings."
 msgstr ""

-#: picard/ui/options/dialog.py:177
+#: picard/ui/options/dialog.py:183
 msgid "Confirm Reset"
 msgstr ""

-#: picard/ui/options/dialog.py:178
+#: picard/ui/options/dialog.py:184
 msgid "Are you sure?"
 msgstr ""

@@ -2104,7 +2124,7 @@ msgstr ""
 msgid "File Naming"
 msgstr ""

-#: picard/ui/options/renaming.py:175 picard/ui/options/scripting.py:406
+#: picard/ui/options/renaming.py:175 picard/ui/options/scripting.py:410
 msgid ""
 "<a href=\"%(picard-doc-scripting-url)s\">Open Scripting Documentation in "
 "your browser</a>"
@@ -2146,15 +2166,15 @@ msgstr ""
 msgid "Scripting"
 msgstr "Skriptovanie"

-#: picard/ui/options/scripting.py:292
+#: picard/ui/options/scripting.py:293
 msgid "Are you sure you want to remove this script?"
 msgstr ""

-#: picard/ui/options/scripting.py:293
+#: picard/ui/options/scripting.py:294
 msgid "Confirm Remove"
 msgstr ""

-#: picard/ui/options/scripting.py:376
+#: picard/ui/options/scripting.py:377
 msgid "Script Error"
 msgstr "Chyba skriptu"

--- a/po/sl.po
+++ b/po/sl.po
@@ -10,8 +10,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: MusicBrainz\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2017-01-18 12:51+0100\n"
-"PO-Revision-Date: 2017-01-19 09:17+0000\n"
+"POT-Creation-Date: 2017-03-05 09:58+0100\n"
+"PO-Revision-Date: 2017-03-05 10:00+0000\n"
 "Last-Translator: nikki\n"
 "Language-Team: Slovenian (http://www.transifex.com/musicbrainz/musicbrainz/language/sl/)\n"
 "MIME-Version: 1.0\n"
@@ -58,26 +58,26 @@ msgstr ""
 msgid "Unmatched Files"
 msgstr "Neujemajoče se datoteke"

-#: picard/album.py:206
+#: picard/album.py:200
 #, python-format
 msgid "[could not load album %s]"
 msgstr "[ni mogoče naložiti albuma %s]"

-#: picard/album.py:295
+#: picard/album.py:289
 #, python-format
 msgid "Album %(id)s loaded: %(artist)s - %(album)s"
 msgstr ""

-#: picard/album.py:338
+#: picard/album.py:332
 #, python-format
 msgid "Loading album %(id)s ..."
 msgstr ""

-#: picard/album.py:342
+#: picard/album.py:336
 msgid "[loading album information]"
 msgstr "[nalaganje informacij o albumu]"

-#: picard/album.py:527
+#: picard/album.py:523
 #, python-format
 msgid "; %i image"
 msgid_plural "; %i images"
@@ -101,7 +101,7 @@ msgstr ""
 msgid "Looking up the metadata for cluster %(album)s..."
 msgstr ""

-#: picard/collection.py:64
+#: picard/collection.py:67
 #, python-format
 msgid "Added %(count)i release to collection \"%(name)s\""
 msgid_plural "Added %(count)i releases to collection \"%(name)s\""
@@ -110,7 +110,7 @@ msgstr[1] ""
 msgstr[2] ""
 msgstr[3] ""

-#: picard/collection.py:86
+#: picard/collection.py:89
 #, python-format
 msgid "Removed %(count)i release from collection \"%(name)s\""
 msgid_plural "Removed %(count)i releases from collection \"%(name)s\""
@@ -119,58 +119,58 @@ msgstr[1] ""
 msgstr[2] ""
 msgstr[3] ""

-#: picard/collection.py:100
+#: picard/collection.py:104
 #, python-format
 msgid "Error loading collections: %(error)s"
 msgstr ""

-#: picard/config_upgrade.py:58 picard/config_upgrade.py:71
+#: picard/config_upgrade.py:57 picard/config_upgrade.py:70
 msgid "Various Artists file naming scheme removal"
 msgstr ""

-#: picard/config_upgrade.py:59
+#: picard/config_upgrade.py:58
 msgid ""
 "The separate file naming scheme for various artists albums has been removed in this version of Picard.\n"
 "Your file naming scheme has automatically been merged with that of single artist albums."
 msgstr ""

-#: picard/config_upgrade.py:72
+#: picard/config_upgrade.py:71
 msgid ""
 "The separate file naming scheme for various artists albums has been removed in this version of Picard.\n"
 "You currently do not use this option, but have a separate file naming scheme defined.\n"
 "Do you want to remove it or merge it with your file naming scheme for single artist albums?"
 msgstr ""

-#: picard/config_upgrade.py:78
+#: picard/config_upgrade.py:77
 msgid "Merge"
 msgstr "Združi"

-#: picard/config_upgrade.py:78 picard/ui/metadatabox.py:314
+#: picard/config_upgrade.py:77 picard/ui/metadatabox.py:314
 #: picard/ui/options/interface.py:75 picard/ui/ui_options_interface.py:141
 msgid "Remove"
 msgstr "Odstrani"

-#: picard/config_upgrade.py:193 picard/ui/options/scripting.py:28
+#: picard/config_upgrade.py:200 picard/ui/options/scripting.py:28
 #, python-format
 msgid "My script %d"
 msgstr ""

-#: picard/file.py:541
+#: picard/file.py:565
 #, python-format
 msgid "No matching tracks for file '%(filename)s'"
 msgstr ""

-#: picard/file.py:557
+#: picard/file.py:581
 #, python-format
 msgid "No matching tracks above the threshold for file '%(filename)s'"
 msgstr ""

-#: picard/file.py:564
+#: picard/file.py:588
 #, python-format
 msgid "File '%(filename)s' identified!"
 msgstr ""

-#: picard/file.py:584
+#: picard/file.py:608
 #, python-format
 msgid "Looking up the metadata for file %(filename)s ..."
 msgstr ""
@@ -213,7 +213,7 @@ msgstr "[brez črtne kode]"
 msgid "[no release info]"
 msgstr "[ni podatkov o izdaji]"

-#: picard/tagger.py:405 picard/tagger.py:438
+#: picard/tagger.py:407 picard/tagger.py:440
 #, python-format
 msgid "Adding %(count)d file from '%(directory)s' ..."
 msgid_plural "Adding %(count)d files from '%(directory)s' ..."
@@ -222,16 +222,16 @@ msgstr[1] ""
 msgstr[2] ""
 msgstr[3] ""

-#: picard/tagger.py:597
+#: picard/tagger.py:599
 #, python-format
 msgid "Removing album %(id)s: %(artist)s - %(album)s"
 msgstr ""

-#: picard/tagger.py:613
+#: picard/tagger.py:615
 msgid "CD Lookup Error"
 msgstr "Napaka pri pregledu CD-ja"

-#: picard/tagger.py:614
+#: picard/tagger.py:616
 #, python-format
 msgid ""
 "Error while reading CD:\n"
@@ -279,6 +279,10 @@ msgstr "francoščina"
 msgid "Italian"
 msgstr "italijanščina"

+#: picard/const/languages.py:57
+msgid "Norwegian Bokmal"
+msgstr ""
+
 #: picard/const/languages.py:59
 msgid "Dutch"
 msgstr "nizozemščina"
@@ -342,12 +346,12 @@ msgstr ""
 msgid "Whitelist"
 msgstr ""

-#: picard/ui/cdlookup.py:35 picard/ui/mainwindow.py:625 picard/util/tags.py:21
+#: picard/ui/cdlookup.py:35 picard/ui/mainwindow.py:626 picard/util/tags.py:21
 msgid "Album"
 msgstr "Album"

-#: picard/ui/cdlookup.py:35 picard/ui/itemviews.py:96
-#: picard/ui/mainwindow.py:626 picard/ui/searchdialog.py:326
+#: picard/ui/cdlookup.py:35 picard/ui/itemviews.py:105
+#: picard/ui/mainwindow.py:627 picard/ui/searchdialog.py:326
 #: picard/ui/searchdialog.py:513 picard/util/tags.py:22
 msgid "Artist"
 msgstr "Izvajalec"
@@ -383,10 +387,22 @@ msgstr[1] ""
 msgstr[2] ""
 msgstr[3] ""

-#: picard/ui/coverartbox.py:143
+#: picard/ui/coverartbox.py:141
 msgid "View release on MusicBrainz"
 msgstr ""

+#: picard/ui/coverartbox.py:174
+msgid "Show more details"
+msgstr ""
+
+#: picard/ui/coverartbox.py:199
+msgid "New Cover Art"
+msgstr ""
+
+#: picard/ui/coverartbox.py:200
+msgid "Original Cover Art"
+msgstr ""
+
 #: picard/ui/filebrowser.py:40
 msgid "&Move Tagged Files Here"
 msgstr "&Premakni sem datoteke z oznakami"
@@ -515,116 +531,116 @@ msgstr ""
 msgid "Pending requests"
 msgstr ""

-#: picard/ui/itemviews.py:94 picard/util/tags.py:23
+#: picard/ui/itemviews.py:103 picard/util/tags.py:23
 msgid "Title"
 msgstr "Naslov"

-#: picard/ui/itemviews.py:95 picard/ui/searchdialog.py:325
+#: picard/ui/itemviews.py:104 picard/ui/searchdialog.py:325
 #: picard/util/tags.py:87
 msgid "Length"
 msgstr "Dolžina"

-#: picard/ui/itemviews.py:162
+#: picard/ui/itemviews.py:171
 msgid "Bad match"
 msgstr ""

-#: picard/ui/itemviews.py:163
+#: picard/ui/itemviews.py:172
 msgid "Poor match"
 msgstr ""

-#: picard/ui/itemviews.py:164
+#: picard/ui/itemviews.py:173
 msgid "Ok match"
 msgstr ""

-#: picard/ui/itemviews.py:165
+#: picard/ui/itemviews.py:174
 msgid "Good match"
 msgstr ""

-#: picard/ui/itemviews.py:166
+#: picard/ui/itemviews.py:175
 msgid "Great match"
 msgstr ""

-#: picard/ui/itemviews.py:167
+#: picard/ui/itemviews.py:176
 msgid "Excellent match"
 msgstr ""

-#: picard/ui/itemviews.py:243
+#: picard/ui/itemviews.py:252
 msgid "&Expand all"
 msgstr "Razširi vs&e"

-#: picard/ui/itemviews.py:245
+#: picard/ui/itemviews.py:254
 msgid "&Collapse all"
 msgstr "Razširi vse"

-#: picard/ui/itemviews.py:247
+#: picard/ui/itemviews.py:256
 msgid "Select &all"
 msgstr ""

-#: picard/ui/itemviews.py:249
+#: picard/ui/itemviews.py:258
 msgid "Ctrl+A"
 msgstr ""

-#: picard/ui/itemviews.py:315
+#: picard/ui/itemviews.py:324
 msgid "&Other versions"
 msgstr "Druge različice"

-#: picard/ui/itemviews.py:318
+#: picard/ui/itemviews.py:327
 msgid "Loading..."
 msgstr "Nalaganje ..."

-#: picard/ui/itemviews.py:383
+#: picard/ui/itemviews.py:392
 msgid "Collections"
 msgstr ""

-#: picard/ui/itemviews.py:386
+#: picard/ui/itemviews.py:395
 msgid "P&lugins"
 msgstr ""

-#: picard/ui/itemviews.py:557
+#: picard/ui/itemviews.py:577
 msgid "file view"
 msgstr ""

-#: picard/ui/itemviews.py:558
+#: picard/ui/itemviews.py:578
 msgid "Contains unmatched files and clusters"
 msgstr ""

-#: picard/ui/itemviews.py:578
+#: picard/ui/itemviews.py:598
 msgid "Clusters"
 msgstr "Skupki"

-#: picard/ui/itemviews.py:587
+#: picard/ui/itemviews.py:607
 msgid "album view"
 msgstr ""

-#: picard/ui/itemviews.py:588
+#: picard/ui/itemviews.py:608
 msgid "Contains albums and matched files"
 msgstr ""

-#: picard/ui/itemviews.py:694 picard/ui/options/renaming.py:188
+#: picard/ui/itemviews.py:714 picard/ui/options/renaming.py:188
 msgid "Error"
 msgstr "Napaka"

-#: picard/ui/itemviews.py:698
+#: picard/ui/itemviews.py:718
 msgid "Album modified and complete"
 msgstr ""

-#: picard/ui/itemviews.py:701
+#: picard/ui/itemviews.py:721
 msgid "Album unchanged and complete"
 msgstr ""

-#: picard/ui/itemviews.py:705
+#: picard/ui/itemviews.py:725
 msgid "Album modified"
 msgstr ""

-#: picard/ui/itemviews.py:708
+#: picard/ui/itemviews.py:728
 msgid "Album unchanged"
 msgstr ""

-#: picard/ui/itemviews.py:811
+#: picard/ui/itemviews.py:831
 msgid "Track saved"
 msgstr ""

-#: picard/ui/itemviews.py:813 picard/ui/itemviews.py:817
+#: picard/ui/itemviews.py:833 picard/ui/itemviews.py:837
 msgid "Pending"
 msgstr ""

@@ -817,7 +833,7 @@ msgstr "Ctrl+B"
 msgid "&Cover Art"
 msgstr "Naslovni&ca"

-#: picard/ui/mainwindow.py:407 picard/ui/mainwindow.py:619
+#: picard/ui/mainwindow.py:407 picard/ui/mainwindow.py:620
 #: picard/ui/searchdialog.py:71
 msgid "Search"
 msgstr "Išči"
@@ -844,175 +860,179 @@ msgid ""
 "even if they have no metadata"
 msgstr ""

-#: picard/ui/mainwindow.py:421
+#: picard/ui/mainwindow.py:420
+msgid "Identify the file using its AcoustID audio fingerprint"
+msgstr ""
+
+#: picard/ui/mainwindow.py:422
 msgid "Ctrl+Y"
 msgstr "Ctrl+Y"

-#: picard/ui/mainwindow.py:424
+#: picard/ui/mainwindow.py:425
 msgid "Cl&uster"
 msgstr "Zdr&uži v skupke"

-#: picard/ui/mainwindow.py:425
+#: picard/ui/mainwindow.py:426
 msgid "Cluster files into album clusters"
 msgstr ""

-#: picard/ui/mainwindow.py:428
+#: picard/ui/mainwindow.py:429
 msgid "Ctrl+U"
 msgstr "Ctrl+U"

-#: picard/ui/mainwindow.py:431
+#: picard/ui/mainwindow.py:432
 msgid "&Lookup"
 msgstr "&Pregled"

-#: picard/ui/mainwindow.py:432
+#: picard/ui/mainwindow.py:433
 msgid "Lookup selected items in MusicBrainz"
 msgstr ""

-#: picard/ui/mainwindow.py:437
+#: picard/ui/mainwindow.py:438
 msgid "Ctrl+L"
 msgstr "Ctrl+L"

-#: picard/ui/mainwindow.py:440
+#: picard/ui/mainwindow.py:441
 msgid "&Info..."
 msgstr ""

-#: picard/ui/mainwindow.py:443
+#: picard/ui/mainwindow.py:444
 msgid "Ctrl+I"
 msgstr "Ctrl+I"

-#: picard/ui/mainwindow.py:446
+#: picard/ui/mainwindow.py:447
 msgid "&Refresh"
 msgstr "&Osveži"

-#: picard/ui/mainwindow.py:447
+#: picard/ui/mainwindow.py:448
 msgid "Ctrl+R"
 msgstr "Ctrl+R"

-#: picard/ui/mainwindow.py:450
+#: picard/ui/mainwindow.py:451
 msgid "&Rename Files"
 msgstr "P&reimenuj datoteke"

-#: picard/ui/mainwindow.py:455
+#: picard/ui/mainwindow.py:456
 msgid "&Move Files"
 msgstr "Pre&makni datoteke"

-#: picard/ui/mainwindow.py:460
+#: picard/ui/mainwindow.py:461
 msgid "Save &Tags"
 msgstr "Shrani &oznake"

-#: picard/ui/mainwindow.py:465
+#: picard/ui/mainwindow.py:466
 msgid "Tags From &File Names..."
 msgstr "&Oznake iz imen datotek"

-#: picard/ui/mainwindow.py:469
+#: picard/ui/mainwindow.py:470
 msgid "&Open My Collections in Browser"
 msgstr ""

-#: picard/ui/mainwindow.py:473
+#: picard/ui/mainwindow.py:474
 msgid "View Error/Debug &Log"
 msgstr ""

-#: picard/ui/mainwindow.py:476
+#: picard/ui/mainwindow.py:477
 msgid "View Activity &History"
 msgstr ""

-#: picard/ui/mainwindow.py:483
+#: picard/ui/mainwindow.py:484
 msgid "Open in &Player"
 msgstr ""

-#: picard/ui/mainwindow.py:484
+#: picard/ui/mainwindow.py:485
 msgid "Play the file in your default media player"
 msgstr ""

-#: picard/ui/mainwindow.py:488
+#: picard/ui/mainwindow.py:489
 msgid "Open Containing &Folder"
 msgstr ""

-#: picard/ui/mainwindow.py:489
+#: picard/ui/mainwindow.py:490
 msgid "Open the containing folder in your file explorer"
 msgstr ""

-#: picard/ui/mainwindow.py:518
+#: picard/ui/mainwindow.py:519
 msgid "&File"
 msgstr "&Datoteka"

-#: picard/ui/mainwindow.py:529
+#: picard/ui/mainwindow.py:530
 msgid "&Edit"
 msgstr "&Urejanje"

-#: picard/ui/mainwindow.py:535
+#: picard/ui/mainwindow.py:536
 msgid "&View"
 msgstr "&Pogled"

-#: picard/ui/mainwindow.py:541
+#: picard/ui/mainwindow.py:542
 msgid "&Options"
 msgstr "&Nastavitve"

-#: picard/ui/mainwindow.py:547
+#: picard/ui/mainwindow.py:548
 msgid "&Tools"
 msgstr "&Orodja"

-#: picard/ui/mainwindow.py:558 picard/ui/util.py:35
+#: picard/ui/mainwindow.py:559 picard/ui/util.py:35
 msgid "&Help"
 msgstr "&Pomoč"

-#: picard/ui/mainwindow.py:586
+#: picard/ui/mainwindow.py:587
 msgid "Actions"
 msgstr ""

-#: picard/ui/mainwindow.py:627
+#: picard/ui/mainwindow.py:628
 msgid "Track"
 msgstr "Skladba"

-#: picard/ui/mainwindow.py:703
+#: picard/ui/mainwindow.py:704
 msgid "All Supported Formats"
 msgstr "Vse podprte oblike"

-#: picard/ui/mainwindow.py:730
+#: picard/ui/mainwindow.py:731
 #, python-format
 msgid "Adding multiple directories from '%(directory)s' ..."
 msgstr ""

-#: picard/ui/mainwindow.py:735
+#: picard/ui/mainwindow.py:736
 #, python-format
 msgid "Adding directory: '%(directory)s' ..."
 msgstr ""

-#: picard/ui/mainwindow.py:801
+#: picard/ui/mainwindow.py:809
 msgid "Configuration Required"
 msgstr ""

-#: picard/ui/mainwindow.py:802
+#: picard/ui/mainwindow.py:810
 msgid ""
 "Audio fingerprinting is not yet configured. Would you like to configure it "
 "now?"
 msgstr ""

-#: picard/ui/mainwindow.py:902
+#: picard/ui/mainwindow.py:916
 #, python-format
 msgid "%(filename)s (error: %(error)s)"
 msgstr ""

-#: picard/ui/mainwindow.py:908
+#: picard/ui/mainwindow.py:922
 #, python-format
 msgid "%(filename)s"
 msgstr ""

-#: picard/ui/mainwindow.py:918
+#: picard/ui/mainwindow.py:933
 #, python-format
 msgid "%(filename)s (%(similarity)d%%) (error: %(error)s)"
 msgstr ""

-#: picard/ui/mainwindow.py:925
+#: picard/ui/mainwindow.py:940
 #, python-format
 msgid "%(filename)s (%(similarity)d%%)"
 msgstr ""

-#: picard/ui/mainwindow.py:961
+#: picard/ui/mainwindow.py:976
 msgid "Authentication Required"
 msgstr ""

-#: picard/ui/mainwindow.py:962
+#: picard/ui/mainwindow.py:977
 msgid ""
 "Picard needs authorization to access your personal data on the MusicBrainz "
 "server. Would you like to log in now?"
@@ -1127,7 +1147,7 @@ msgstr ""
 msgid "Retry"
 msgstr ""

-#: picard/ui/searchdialog.py:288
+#: picard/ui/searchdialog.py:283
 #, python-format
 msgid ""
 "<strong>Following error occurred while fetching "
@@ -1931,19 +1951,19 @@ msgstr ""
 msgid "Reset all settings for current option page"
 msgstr ""

-#: picard/ui/options/dialog.py:166
+#: picard/ui/options/dialog.py:172
 msgid "You are about to reset your options for this page."
 msgstr ""

-#: picard/ui/options/dialog.py:170
+#: picard/ui/options/dialog.py:176
 msgid "Warning! This will reset all of your settings."
 msgstr ""

-#: picard/ui/options/dialog.py:177
+#: picard/ui/options/dialog.py:183
 msgid "Confirm Reset"
 msgstr ""

-#: picard/ui/options/dialog.py:178
+#: picard/ui/options/dialog.py:184
 msgid "Are you sure?"
 msgstr ""

@@ -2114,7 +2134,7 @@ msgstr ""
 msgid "File Naming"
 msgstr ""

-#: picard/ui/options/renaming.py:175 picard/ui/options/scripting.py:406
+#: picard/ui/options/renaming.py:175 picard/ui/options/scripting.py:410
 msgid ""
 "<a href=\"%(picard-doc-scripting-url)s\">Open Scripting Documentation in "
 "your browser</a>"
@@ -2156,15 +2176,15 @@ msgstr ""
 msgid "Scripting"
 msgstr ""

-#: picard/ui/options/scripting.py:292
+#: picard/ui/options/scripting.py:293
 msgid "Are you sure you want to remove this script?"
 msgstr ""

-#: picard/ui/options/scripting.py:293
+#: picard/ui/options/scripting.py:294
 msgid "Confirm Remove"
 msgstr ""

-#: picard/ui/options/scripting.py:376
+#: picard/ui/options/scripting.py:377
 msgid "Script Error"
 msgstr "Napaka skript"

--- a/po/sr.po
+++ b/po/sr.po
@@ -10,8 +10,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: MusicBrainz\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2017-01-18 12:51+0100\n"
-"PO-Revision-Date: 2017-01-19 09:17+0000\n"
+"POT-Creation-Date: 2017-03-05 09:58+0100\n"
+"PO-Revision-Date: 2017-03-05 10:00+0000\n"
 "Last-Translator: nikki\n"
 "Language-Team: Serbian (http://www.transifex.com/musicbrainz/musicbrainz/language/sr/)\n"
 "MIME-Version: 1.0\n"
@@ -58,26 +58,26 @@ msgstr ""
 msgid "Unmatched Files"
 msgstr ""

-#: picard/album.py:206
+#: picard/album.py:200
 #, python-format
 msgid "[could not load album %s]"
 msgstr ""

-#: picard/album.py:295
+#: picard/album.py:289
 #, python-format
 msgid "Album %(id)s loaded: %(artist)s - %(album)s"
 msgstr ""

-#: picard/album.py:338
+#: picard/album.py:332
 #, python-format
 msgid "Loading album %(id)s ..."
 msgstr ""

-#: picard/album.py:342
+#: picard/album.py:336
 msgid "[loading album information]"
 msgstr ""

-#: picard/album.py:527
+#: picard/album.py:523
 #, python-format
 msgid "; %i image"
 msgid_plural "; %i images"
@@ -100,7 +100,7 @@ msgstr ""
 msgid "Looking up the metadata for cluster %(album)s..."
 msgstr ""

-#: picard/collection.py:64
+#: picard/collection.py:67
 #, python-format
 msgid "Added %(count)i release to collection \"%(name)s\""
 msgid_plural "Added %(count)i releases to collection \"%(name)s\""
@@ -108,7 +108,7 @@ msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""

-#: picard/collection.py:86
+#: picard/collection.py:89
 #, python-format
 msgid "Removed %(count)i release from collection \"%(name)s\""
 msgid_plural "Removed %(count)i releases from collection \"%(name)s\""
@@ -116,58 +116,58 @@ msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""

-#: picard/collection.py:100
+#: picard/collection.py:104
 #, python-format
 msgid "Error loading collections: %(error)s"
 msgstr ""

-#: picard/config_upgrade.py:58 picard/config_upgrade.py:71
+#: picard/config_upgrade.py:57 picard/config_upgrade.py:70
 msgid "Various Artists file naming scheme removal"
 msgstr ""

-#: picard/config_upgrade.py:59
+#: picard/config_upgrade.py:58
 msgid ""
 "The separate file naming scheme for various artists albums has been removed in this version of Picard.\n"
 "Your file naming scheme has automatically been merged with that of single artist albums."
 msgstr ""

-#: picard/config_upgrade.py:72
+#: picard/config_upgrade.py:71
 msgid ""
 "The separate file naming scheme for various artists albums has been removed in this version of Picard.\n"
 "You currently do not use this option, but have a separate file naming scheme defined.\n"
 "Do you want to remove it or merge it with your file naming scheme for single artist albums?"
 msgstr ""

-#: picard/config_upgrade.py:78
+#: picard/config_upgrade.py:77
 msgid "Merge"
 msgstr ""

-#: picard/config_upgrade.py:78 picard/ui/metadatabox.py:314
+#: picard/config_upgrade.py:77 picard/ui/metadatabox.py:314
 #: picard/ui/options/interface.py:75 picard/ui/ui_options_interface.py:141
 msgid "Remove"
 msgstr ""

-#: picard/config_upgrade.py:193 picard/ui/options/scripting.py:28
+#: picard/config_upgrade.py:200 picard/ui/options/scripting.py:28
 #, python-format
 msgid "My script %d"
 msgstr ""

-#: picard/file.py:541
+#: picard/file.py:565
 #, python-format
 msgid "No matching tracks for file '%(filename)s'"
 msgstr ""

-#: picard/file.py:557
+#: picard/file.py:581
 #, python-format
 msgid "No matching tracks above the threshold for file '%(filename)s'"
 msgstr ""

-#: picard/file.py:564
+#: picard/file.py:588
 #, python-format
 msgid "File '%(filename)s' identified!"
 msgstr ""

-#: picard/file.py:584
+#: picard/file.py:608
 #, python-format
 msgid "Looking up the metadata for file %(filename)s ..."
 msgstr ""
@@ -210,7 +210,7 @@ msgstr "[нема баркода]"
 msgid "[no release info]"
 msgstr "[нема информације о дистрибуцији]"

-#: picard/tagger.py:405 picard/tagger.py:438
+#: picard/tagger.py:407 picard/tagger.py:440
 #, python-format
 msgid "Adding %(count)d file from '%(directory)s' ..."
 msgid_plural "Adding %(count)d files from '%(directory)s' ..."
@@ -218,16 +218,16 @@ msgstr[0] "Додавање %(count)d датотека из '%(directory)s' ..."
 msgstr[1] "Додавање %(count)d датотека из '%(directory)s' ..."
 msgstr[2] "Додавање %(count)d датотека из '%(directory)s' ..."

-#: picard/tagger.py:597
+#: picard/tagger.py:599
 #, python-format
 msgid "Removing album %(id)s: %(artist)s - %(album)s"
 msgstr "Уклањање албума %(id)s: %(artist)s - %(album)s"

-#: picard/tagger.py:613
+#: picard/tagger.py:615
 msgid "CD Lookup Error"
 msgstr "Грешка при налажењу CD-а"

-#: picard/tagger.py:614
+#: picard/tagger.py:616
 #, python-format
 msgid ""
 "Error while reading CD:\n"
@@ -275,6 +275,10 @@ msgstr "Француски"
 msgid "Italian"
 msgstr "Италијански"

+#: picard/const/languages.py:57
+msgid "Norwegian Bokmal"
+msgstr ""
+
 #: picard/const/languages.py:59
 msgid "Dutch"
 msgstr "Холандски"
@@ -338,12 +342,12 @@ msgstr ""
 msgid "Whitelist"
 msgstr ""

-#: picard/ui/cdlookup.py:35 picard/ui/mainwindow.py:625 picard/util/tags.py:21
+#: picard/ui/cdlookup.py:35 picard/ui/mainwindow.py:626 picard/util/tags.py:21
 msgid "Album"
 msgstr ""

-#: picard/ui/cdlookup.py:35 picard/ui/itemviews.py:96
-#: picard/ui/mainwindow.py:626 picard/ui/searchdialog.py:326
+#: picard/ui/cdlookup.py:35 picard/ui/itemviews.py:105
+#: picard/ui/mainwindow.py:627 picard/ui/searchdialog.py:326
 #: picard/ui/searchdialog.py:513 picard/util/tags.py:22
 msgid "Artist"
 msgstr ""
@@ -378,10 +382,22 @@ msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""

-#: picard/ui/coverartbox.py:143
+#: picard/ui/coverartbox.py:141
 msgid "View release on MusicBrainz"
 msgstr ""

+#: picard/ui/coverartbox.py:174
+msgid "Show more details"
+msgstr ""
+
+#: picard/ui/coverartbox.py:199
+msgid "New Cover Art"
+msgstr ""
+
+#: picard/ui/coverartbox.py:200
+msgid "Original Cover Art"
+msgstr ""
+
 #: picard/ui/filebrowser.py:40
 msgid "&Move Tagged Files Here"
 msgstr ""
@@ -510,116 +526,116 @@ msgstr ""
 msgid "Pending requests"
 msgstr ""

-#: picard/ui/itemviews.py:94 picard/util/tags.py:23
+#: picard/ui/itemviews.py:103 picard/util/tags.py:23
 msgid "Title"
 msgstr ""

-#: picard/ui/itemviews.py:95 picard/ui/searchdialog.py:325
+#: picard/ui/itemviews.py:104 picard/ui/searchdialog.py:325
 #: picard/util/tags.py:87
 msgid "Length"
 msgstr ""

-#: picard/ui/itemviews.py:162
+#: picard/ui/itemviews.py:171
 msgid "Bad match"
 msgstr ""

-#: picard/ui/itemviews.py:163
+#: picard/ui/itemviews.py:172
 msgid "Poor match"
 msgstr ""

-#: picard/ui/itemviews.py:164
+#: picard/ui/itemviews.py:173
 msgid "Ok match"
 msgstr ""

-#: picard/ui/itemviews.py:165
+#: picard/ui/itemviews.py:174
 msgid "Good match"
 msgstr ""

-#: picard/ui/itemviews.py:166
+#: picard/ui/itemviews.py:175
 msgid "Great match"
 msgstr ""

-#: picard/ui/itemviews.py:167
+#: picard/ui/itemviews.py:176
 msgid "Excellent match"
 msgstr ""

-#: picard/ui/itemviews.py:243
+#: picard/ui/itemviews.py:252
 msgid "&Expand all"
 msgstr ""

-#: picard/ui/itemviews.py:245
+#: picard/ui/itemviews.py:254
 msgid "&Collapse all"
 msgstr ""

-#: picard/ui/itemviews.py:247
+#: picard/ui/itemviews.py:256
 msgid "Select &all"
 msgstr ""

-#: picard/ui/itemviews.py:249
+#: picard/ui/itemviews.py:258
 msgid "Ctrl+A"
 msgstr ""

-#: picard/ui/itemviews.py:315
+#: picard/ui/itemviews.py:324
 msgid "&Other versions"
 msgstr ""

-#: picard/ui/itemviews.py:318
+#: picard/ui/itemviews.py:327
 msgid "Loading..."
 msgstr ""

-#: picard/ui/itemviews.py:383
+#: picard/ui/itemviews.py:392
 msgid "Collections"
 msgstr ""

-#: picard/ui/itemviews.py:386
+#: picard/ui/itemviews.py:395
 msgid "P&lugins"
 msgstr ""

-#: picard/ui/itemviews.py:557
+#: picard/ui/itemviews.py:577
 msgid "file view"
 msgstr ""

-#: picard/ui/itemviews.py:558
+#: picard/ui/itemviews.py:578
 msgid "Contains unmatched files and clusters"
 msgstr ""

-#: picard/ui/itemviews.py:578
+#: picard/ui/itemviews.py:598
 msgid "Clusters"
 msgstr ""

-#: picard/ui/itemviews.py:587
+#: picard/ui/itemviews.py:607
 msgid "album view"
 msgstr ""

-#: picard/ui/itemviews.py:588
+#: picard/ui/itemviews.py:608
 msgid "Contains albums and matched files"
 msgstr ""

-#: picard/ui/itemviews.py:694 picard/ui/options/renaming.py:188
+#: picard/ui/itemviews.py:714 picard/ui/options/renaming.py:188
 msgid "Error"
 msgstr ""

-#: picard/ui/itemviews.py:698
+#: picard/ui/itemviews.py:718
 msgid "Album modified and complete"
 msgstr ""

-#: picard/ui/itemviews.py:701
+#: picard/ui/itemviews.py:721
 msgid "Album unchanged and complete"
 msgstr ""

-#: picard/ui/itemviews.py:705
+#: picard/ui/itemviews.py:725
 msgid "Album modified"
 msgstr ""

-#: picard/ui/itemviews.py:708
+#: picard/ui/itemviews.py:728
 msgid "Album unchanged"
 msgstr ""

-#: picard/ui/itemviews.py:811
+#: picard/ui/itemviews.py:831
 msgid "Track saved"
 msgstr ""

-#: picard/ui/itemviews.py:813 picard/ui/itemviews.py:817
+#: picard/ui/itemviews.py:833 picard/ui/itemviews.py:837
 msgid "Pending"
 msgstr ""

@@ -811,7 +827,7 @@ msgstr ""
 msgid "&Cover Art"
 msgstr ""

-#: picard/ui/mainwindow.py:407 picard/ui/mainwindow.py:619
+#: picard/ui/mainwindow.py:407 picard/ui/mainwindow.py:620
 #: picard/ui/searchdialog.py:71
 msgid "Search"
 msgstr ""
@@ -838,175 +854,179 @@ msgid ""
 "even if they have no metadata"
 msgstr ""

-#: picard/ui/mainwindow.py:421
+#: picard/ui/mainwindow.py:420
+msgid "Identify the file using its AcoustID audio fingerprint"
+msgstr ""
+
+#: picard/ui/mainwindow.py:422
 msgid "Ctrl+Y"
 msgstr ""

-#: picard/ui/mainwindow.py:424
+#: picard/ui/mainwindow.py:425
 msgid "Cl&uster"
 msgstr ""

-#: picard/ui/mainwindow.py:425
+#: picard/ui/mainwindow.py:426
 msgid "Cluster files into album clusters"
 msgstr ""

-#: picard/ui/mainwindow.py:428
+#: picard/ui/mainwindow.py:429
 msgid "Ctrl+U"
 msgstr ""

-#: picard/ui/mainwindow.py:431
+#: picard/ui/mainwindow.py:432
 msgid "&Lookup"
 msgstr ""

-#: picard/ui/mainwindow.py:432
+#: picard/ui/mainwindow.py:433
 msgid "Lookup selected items in MusicBrainz"
 msgstr ""

-#: picard/ui/mainwindow.py:437
+#: picard/ui/mainwindow.py:438
 msgid "Ctrl+L"
 msgstr ""

-#: picard/ui/mainwindow.py:440
+#: picard/ui/mainwindow.py:441
 msgid "&Info..."
 msgstr ""

-#: picard/ui/mainwindow.py:443
+#: picard/ui/mainwindow.py:444
 msgid "Ctrl+I"
 msgstr ""

-#: picard/ui/mainwindow.py:446
+#: picard/ui/mainwindow.py:447
 msgid "&Refresh"
 msgstr ""

-#: picard/ui/mainwindow.py:447
+#: picard/ui/mainwindow.py:448
 msgid "Ctrl+R"
 msgstr ""

-#: picard/ui/mainwindow.py:450
+#: picard/ui/mainwindow.py:451
 msgid "&Rename Files"
 msgstr ""

-#: picard/ui/mainwindow.py:455
+#: picard/ui/mainwindow.py:456
 msgid "&Move Files"
 msgstr ""

-#: picard/ui/mainwindow.py:460
+#: picard/ui/mainwindow.py:461
 msgid "Save &Tags"
 msgstr ""

-#: picard/ui/mainwindow.py:465
+#: picard/ui/mainwindow.py:466
 msgid "Tags From &File Names..."
 msgstr ""

-#: picard/ui/mainwindow.py:469
+#: picard/ui/mainwindow.py:470
 msgid "&Open My Collections in Browser"
 msgstr ""

-#: picard/ui/mainwindow.py:473
+#: picard/ui/mainwindow.py:474
 msgid "View Error/Debug &Log"
 msgstr ""

-#: picard/ui/mainwindow.py:476
+#: picard/ui/mainwindow.py:477
 msgid "View Activity &History"
 msgstr ""

-#: picard/ui/mainwindow.py:483
+#: picard/ui/mainwindow.py:484
 msgid "Open in &Player"
 msgstr ""

-#: picard/ui/mainwindow.py:484
+#: picard/ui/mainwindow.py:485
 msgid "Play the file in your default media player"
 msgstr ""

-#: picard/ui/mainwindow.py:488
+#: picard/ui/mainwindow.py:489
 msgid "Open Containing &Folder"
 msgstr ""

-#: picard/ui/mainwindow.py:489
+#: picard/ui/mainwindow.py:490
 msgid "Open the containing folder in your file explorer"
 msgstr ""

-#: picard/ui/mainwindow.py:518
+#: picard/ui/mainwindow.py:519
 msgid "&File"
 msgstr ""

-#: picard/ui/mainwindow.py:529
+#: picard/ui/mainwindow.py:530
 msgid "&Edit"
 msgstr ""

-#: picard/ui/mainwindow.py:535
+#: picard/ui/mainwindow.py:536
 msgid "&View"
 msgstr ""

-#: picard/ui/mainwindow.py:541
+#: picard/ui/mainwindow.py:542
 msgid "&Options"
 msgstr ""

-#: picard/ui/mainwindow.py:547
+#: picard/ui/mainwindow.py:548
 msgid "&Tools"
 msgstr ""

-#: picard/ui/mainwindow.py:558 picard/ui/util.py:35
+#: picard/ui/mainwindow.py:559 picard/ui/util.py:35
 msgid "&Help"
 msgstr ""

-#: picard/ui/mainwindow.py:586
+#: picard/ui/mainwindow.py:587
 msgid "Actions"
 msgstr "Акције"

-#: picard/ui/mainwindow.py:627
+#: picard/ui/mainwindow.py:628
 msgid "Track"
 msgstr ""

-#: picard/ui/mainwindow.py:703
+#: picard/ui/mainwindow.py:704
 msgid "All Supported Formats"
 msgstr ""

-#: picard/ui/mainwindow.py:730
+#: picard/ui/mainwindow.py:731
 #, python-format
 msgid "Adding multiple directories from '%(directory)s' ..."
 msgstr ""

-#: picard/ui/mainwindow.py:735
+#: picard/ui/mainwindow.py:736
 #, python-format
 msgid "Adding directory: '%(directory)s' ..."
 msgstr ""

-#: picard/ui/mainwindow.py:801
+#: picard/ui/mainwindow.py:809
 msgid "Configuration Required"
 msgstr ""

-#: picard/ui/mainwindow.py:802
+#: picard/ui/mainwindow.py:810
 msgid ""
 "Audio fingerprinting is not yet configured. Would you like to configure it "
 "now?"
 msgstr ""

-#: picard/ui/mainwindow.py:902
+#: picard/ui/mainwindow.py:916
 #, python-format
 msgid "%(filename)s (error: %(error)s)"
 msgstr ""

-#: picard/ui/mainwindow.py:908
+#: picard/ui/mainwindow.py:922
 #, python-format
 msgid "%(filename)s"
 msgstr ""

-#: picard/ui/mainwindow.py:918
+#: picard/ui/mainwindow.py:933
 #, python-format
 msgid "%(filename)s (%(similarity)d%%) (error: %(error)s)"
 msgstr ""

-#: picard/ui/mainwindow.py:925
+#: picard/ui/mainwindow.py:940
 #, python-format
 msgid "%(filename)s (%(similarity)d%%)"
 msgstr ""

-#: picard/ui/mainwindow.py:961
+#: picard/ui/mainwindow.py:976
 msgid "Authentication Required"
 msgstr ""

-#: picard/ui/mainwindow.py:962
+#: picard/ui/mainwindow.py:977
 msgid ""
 "Picard needs authorization to access your personal data on the MusicBrainz "
 "server. Would you like to log in now?"
@@ -1118,7 +1138,7 @@ msgstr ""
 msgid "Retry"
 msgstr ""

-#: picard/ui/searchdialog.py:288
+#: picard/ui/searchdialog.py:283
 #, python-format
 msgid ""
 "<strong>Following error occurred while fetching "
@@ -1922,19 +1942,19 @@ msgstr ""
 msgid "Reset all settings for current option page"
 msgstr ""

-#: picard/ui/options/dialog.py:166
+#: picard/ui/options/dialog.py:172
 msgid "You are about to reset your options for this page."
 msgstr ""

-#: picard/ui/options/dialog.py:170
+#: picard/ui/options/dialog.py:176
 msgid "Warning! This will reset all of your settings."
 msgstr ""

-#: picard/ui/options/dialog.py:177
+#: picard/ui/options/dialog.py:183
 msgid "Confirm Reset"
 msgstr ""

-#: picard/ui/options/dialog.py:178
+#: picard/ui/options/dialog.py:184
 msgid "Are you sure?"
 msgstr ""

@@ -2105,7 +2125,7 @@ msgstr ""
 msgid "File Naming"
 msgstr ""

-#: picard/ui/options/renaming.py:175 picard/ui/options/scripting.py:406
+#: picard/ui/options/renaming.py:175 picard/ui/options/scripting.py:410
 msgid ""
 "<a href=\"%(picard-doc-scripting-url)s\">Open Scripting Documentation in "
 "your browser</a>"
@@ -2147,15 +2167,15 @@ msgstr ""
 msgid "Scripting"
 msgstr ""

-#: picard/ui/options/scripting.py:292
+#: picard/ui/options/scripting.py:293
 msgid "Are you sure you want to remove this script?"
 msgstr ""

-#: picard/ui/options/scripting.py:293
+#: picard/ui/options/scripting.py:294
 msgid "Confirm Remove"
 msgstr ""

-#: picard/ui/options/scripting.py:376
+#: picard/ui/options/scripting.py:377
 msgid "Script Error"
 msgstr ""

--- a/po/sv.po
+++ b/po/sv.po
--- a/po/te.po
+++ b/po/te.po
@@ -9,8 +9,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: MusicBrainz\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2017-01-18 12:51+0100\n"
-"PO-Revision-Date: 2017-01-19 09:17+0000\n"
+"POT-Creation-Date: 2017-03-05 09:58+0100\n"
+"PO-Revision-Date: 2017-03-05 10:00+0000\n"
 "Last-Translator: nikki\n"
 "Language-Team: Telugu (http://www.transifex.com/musicbrainz/musicbrainz/language/te/)\n"
 "MIME-Version: 1.0\n"
@@ -57,26 +57,26 @@ msgstr ""
 msgid "Unmatched Files"
 msgstr "పొంతన లేని దస్త్రాలు"

-#: picard/album.py:206
+#: picard/album.py:200
 #, python-format
 msgid "[could not load album %s]"
 msgstr ""

-#: picard/album.py:295
+#: picard/album.py:289
 #, python-format
 msgid "Album %(id)s loaded: %(artist)s - %(album)s"
 msgstr ""

-#: picard/album.py:338
+#: picard/album.py:332
 #, python-format
 msgid "Loading album %(id)s ..."
 msgstr ""

-#: picard/album.py:342
+#: picard/album.py:336
 msgid "[loading album information]"
 msgstr ""

-#: picard/album.py:527
+#: picard/album.py:523
 #, python-format
 msgid "; %i image"
 msgid_plural "; %i images"
@@ -98,72 +98,72 @@ msgstr ""
 msgid "Looking up the metadata for cluster %(album)s..."
 msgstr ""

-#: picard/collection.py:64
+#: picard/collection.py:67
 #, python-format
 msgid "Added %(count)i release to collection \"%(name)s\""
 msgid_plural "Added %(count)i releases to collection \"%(name)s\""
 msgstr[0] ""
 msgstr[1] ""

-#: picard/collection.py:86
+#: picard/collection.py:89
 #, python-format
 msgid "Removed %(count)i release from collection \"%(name)s\""
 msgid_plural "Removed %(count)i releases from collection \"%(name)s\""
 msgstr[0] ""
 msgstr[1] ""

-#: picard/collection.py:100
+#: picard/collection.py:104
 #, python-format
 msgid "Error loading collections: %(error)s"
 msgstr ""

-#: picard/config_upgrade.py:58 picard/config_upgrade.py:71
+#: picard/config_upgrade.py:57 picard/config_upgrade.py:70
 msgid "Various Artists file naming scheme removal"
 msgstr ""

-#: picard/config_upgrade.py:59
+#: picard/config_upgrade.py:58
 msgid ""
 "The separate file naming scheme for various artists albums has been removed in this version of Picard.\n"
 "Your file naming scheme has automatically been merged with that of single artist albums."
 msgstr ""

-#: picard/config_upgrade.py:72
+#: picard/config_upgrade.py:71
 msgid ""
 "The separate file naming scheme for various artists albums has been removed in this version of Picard.\n"
 "You currently do not use this option, but have a separate file naming scheme defined.\n"
 "Do you want to remove it or merge it with your file naming scheme for single artist albums?"
 msgstr ""

-#: picard/config_upgrade.py:78
+#: picard/config_upgrade.py:77
 msgid "Merge"
 msgstr ""

-#: picard/config_upgrade.py:78 picard/ui/metadatabox.py:314
+#: picard/config_upgrade.py:77 picard/ui/metadatabox.py:314
 #: picard/ui/options/interface.py:75 picard/ui/ui_options_interface.py:141
 msgid "Remove"
 msgstr "తీసివేయి"

-#: picard/config_upgrade.py:193 picard/ui/options/scripting.py:28
+#: picard/config_upgrade.py:200 picard/ui/options/scripting.py:28
 #, python-format
 msgid "My script %d"
 msgstr ""

-#: picard/file.py:541
+#: picard/file.py:565
 #, python-format
 msgid "No matching tracks for file '%(filename)s'"
 msgstr ""

-#: picard/file.py:557
+#: picard/file.py:581
 #, python-format
 msgid "No matching tracks above the threshold for file '%(filename)s'"
 msgstr ""

-#: picard/file.py:564
+#: picard/file.py:588
 #, python-format
 msgid "File '%(filename)s' identified!"
 msgstr ""

-#: picard/file.py:584
+#: picard/file.py:608
 #, python-format
 msgid "Looking up the metadata for file %(filename)s ..."
 msgstr ""
@@ -206,23 +206,23 @@ msgstr ""
 msgid "[no release info]"
 msgstr "[విదుదల సమాచారం లేదు]"

-#: picard/tagger.py:405 picard/tagger.py:438
+#: picard/tagger.py:407 picard/tagger.py:440
 #, python-format
 msgid "Adding %(count)d file from '%(directory)s' ..."
 msgid_plural "Adding %(count)d files from '%(directory)s' ..."
 msgstr[0] ""
 msgstr[1] ""

-#: picard/tagger.py:597
+#: picard/tagger.py:599
 #, python-format
 msgid "Removing album %(id)s: %(artist)s - %(album)s"
 msgstr ""

-#: picard/tagger.py:613
+#: picard/tagger.py:615
 msgid "CD Lookup Error"
 msgstr ""

-#: picard/tagger.py:614
+#: picard/tagger.py:616
 #, python-format
 msgid ""
 "Error while reading CD:\n"
@@ -270,6 +270,10 @@ msgstr "ఫ్రెంచ్"
 msgid "Italian"
 msgstr "ఇటాలియన్"

+#: picard/const/languages.py:57
+msgid "Norwegian Bokmal"
+msgstr ""
+
 #: picard/const/languages.py:59
 msgid "Dutch"
 msgstr "డచ్"
@@ -333,12 +337,12 @@ msgstr ""
 msgid "Whitelist"
 msgstr ""

-#: picard/ui/cdlookup.py:35 picard/ui/mainwindow.py:625 picard/util/tags.py:21
+#: picard/ui/cdlookup.py:35 picard/ui/mainwindow.py:626 picard/util/tags.py:21
 msgid "Album"
 msgstr ""

-#: picard/ui/cdlookup.py:35 picard/ui/itemviews.py:96
-#: picard/ui/mainwindow.py:626 picard/ui/searchdialog.py:326
+#: picard/ui/cdlookup.py:35 picard/ui/itemviews.py:105
+#: picard/ui/mainwindow.py:627 picard/ui/searchdialog.py:326
 #: picard/ui/searchdialog.py:513 picard/util/tags.py:22
 msgid "Artist"
 msgstr ""
@@ -372,10 +376,22 @@ msgid_plural "%s (%i releases)"
 msgstr[0] ""
 msgstr[1] ""

-#: picard/ui/coverartbox.py:143
+#: picard/ui/coverartbox.py:141
 msgid "View release on MusicBrainz"
 msgstr ""

+#: picard/ui/coverartbox.py:174
+msgid "Show more details"
+msgstr ""
+
+#: picard/ui/coverartbox.py:199
+msgid "New Cover Art"
+msgstr ""
+
+#: picard/ui/coverartbox.py:200
+msgid "Original Cover Art"
+msgstr ""
+
 #: picard/ui/filebrowser.py:40
 msgid "&Move Tagged Files Here"
 msgstr ""
@@ -504,116 +520,116 @@ msgstr ""
 msgid "Pending requests"
 msgstr ""

-#: picard/ui/itemviews.py:94 picard/util/tags.py:23
+#: picard/ui/itemviews.py:103 picard/util/tags.py:23
 msgid "Title"
 msgstr "శీర్షిక"

-#: picard/ui/itemviews.py:95 picard/ui/searchdialog.py:325
+#: picard/ui/itemviews.py:104 picard/ui/searchdialog.py:325
 #: picard/util/tags.py:87
 msgid "Length"
 msgstr "నిడివి"

-#: picard/ui/itemviews.py:162
+#: picard/ui/itemviews.py:171
 msgid "Bad match"
 msgstr ""

-#: picard/ui/itemviews.py:163
+#: picard/ui/itemviews.py:172
 msgid "Poor match"
 msgstr ""

-#: picard/ui/itemviews.py:164
+#: picard/ui/itemviews.py:173
 msgid "Ok match"
 msgstr ""

-#: picard/ui/itemviews.py:165
+#: picard/ui/itemviews.py:174
 msgid "Good match"
 msgstr ""

-#: picard/ui/itemviews.py:166
+#: picard/ui/itemviews.py:175
 msgid "Great match"
 msgstr ""

-#: picard/ui/itemviews.py:167
+#: picard/ui/itemviews.py:176
 msgid "Excellent match"
 msgstr ""

-#: picard/ui/itemviews.py:243
+#: picard/ui/itemviews.py:252
 msgid "&Expand all"
 msgstr ""

-#: picard/ui/itemviews.py:245
+#: picard/ui/itemviews.py:254
 msgid "&Collapse all"
 msgstr ""

-#: picard/ui/itemviews.py:247
+#: picard/ui/itemviews.py:256
 msgid "Select &all"
 msgstr ""

-#: picard/ui/itemviews.py:249
+#: picard/ui/itemviews.py:258
 msgid "Ctrl+A"
 msgstr ""

-#: picard/ui/itemviews.py:315
+#: picard/ui/itemviews.py:324
 msgid "&Other versions"
 msgstr ""

-#: picard/ui/itemviews.py:318
+#: picard/ui/itemviews.py:327
 msgid "Loading..."
 msgstr "లోడ్ అవుతోంది..."

-#: picard/ui/itemviews.py:383
+#: picard/ui/itemviews.py:392
 msgid "Collections"
 msgstr ""

-#: picard/ui/itemviews.py:386
+#: picard/ui/itemviews.py:395
 msgid "P&lugins"
 msgstr ""

-#: picard/ui/itemviews.py:557
+#: picard/ui/itemviews.py:577
 msgid "file view"
 msgstr ""

-#: picard/ui/itemviews.py:558
+#: picard/ui/itemviews.py:578
 msgid "Contains unmatched files and clusters"
 msgstr ""

-#: picard/ui/itemviews.py:578
+#: picard/ui/itemviews.py:598
 msgid "Clusters"
 msgstr ""

-#: picard/ui/itemviews.py:587
+#: picard/ui/itemviews.py:607
 msgid "album view"
 msgstr ""

-#: picard/ui/itemviews.py:588
+#: picard/ui/itemviews.py:608
 msgid "Contains albums and matched files"
 msgstr ""

-#: picard/ui/itemviews.py:694 picard/ui/options/renaming.py:188
+#: picard/ui/itemviews.py:714 picard/ui/options/renaming.py:188
 msgid "Error"
 msgstr ""

-#: picard/ui/itemviews.py:698
+#: picard/ui/itemviews.py:718
 msgid "Album modified and complete"
 msgstr ""

-#: picard/ui/itemviews.py:701
+#: picard/ui/itemviews.py:721
 msgid "Album unchanged and complete"
 msgstr ""

-#: picard/ui/itemviews.py:705
+#: picard/ui/itemviews.py:725
 msgid "Album modified"
 msgstr ""

-#: picard/ui/itemviews.py:708
+#: picard/ui/itemviews.py:728
 msgid "Album unchanged"
 msgstr ""

-#: picard/ui/itemviews.py:811
+#: picard/ui/itemviews.py:831
 msgid "Track saved"
 msgstr ""

-#: picard/ui/itemviews.py:813 picard/ui/itemviews.py:817
+#: picard/ui/itemviews.py:833 picard/ui/itemviews.py:837
 msgid "Pending"
 msgstr ""

@@ -804,7 +820,7 @@ msgstr ""
 msgid "&Cover Art"
 msgstr ""

-#: picard/ui/mainwindow.py:407 picard/ui/mainwindow.py:619
+#: picard/ui/mainwindow.py:407 picard/ui/mainwindow.py:620
 #: picard/ui/searchdialog.py:71
 msgid "Search"
 msgstr "వెతుకు"
@@ -831,175 +847,179 @@ msgid ""
 "even if they have no metadata"
 msgstr ""

-#: picard/ui/mainwindow.py:421
+#: picard/ui/mainwindow.py:420
+msgid "Identify the file using its AcoustID audio fingerprint"
+msgstr ""
+
+#: picard/ui/mainwindow.py:422
 msgid "Ctrl+Y"
 msgstr ""

-#: picard/ui/mainwindow.py:424
+#: picard/ui/mainwindow.py:425
 msgid "Cl&uster"
 msgstr ""

-#: picard/ui/mainwindow.py:425
+#: picard/ui/mainwindow.py:426
 msgid "Cluster files into album clusters"
 msgstr ""

-#: picard/ui/mainwindow.py:428
+#: picard/ui/mainwindow.py:429
 msgid "Ctrl+U"
 msgstr ""

-#: picard/ui/mainwindow.py:431
+#: picard/ui/mainwindow.py:432
 msgid "&Lookup"
 msgstr ""

-#: picard/ui/mainwindow.py:432
+#: picard/ui/mainwindow.py:433
 msgid "Lookup selected items in MusicBrainz"
 msgstr ""

-#: picard/ui/mainwindow.py:437
+#: picard/ui/mainwindow.py:438
 msgid "Ctrl+L"
 msgstr ""

-#: picard/ui/mainwindow.py:440
+#: picard/ui/mainwindow.py:441
 msgid "&Info..."
 msgstr ""

-#: picard/ui/mainwindow.py:443
+#: picard/ui/mainwindow.py:444
 msgid "Ctrl+I"
 msgstr ""

-#: picard/ui/mainwindow.py:446
+#: picard/ui/mainwindow.py:447
 msgid "&Refresh"
 msgstr ""

-#: picard/ui/mainwindow.py:447
+#: picard/ui/mainwindow.py:448
 msgid "Ctrl+R"
 msgstr ""

-#: picard/ui/mainwindow.py:450
+#: picard/ui/mainwindow.py:451
 msgid "&Rename Files"
 msgstr ""

-#: picard/ui/mainwindow.py:455
+#: picard/ui/mainwindow.py:456
 msgid "&Move Files"
 msgstr ""

-#: picard/ui/mainwindow.py:460
+#: picard/ui/mainwindow.py:461
 msgid "Save &Tags"
 msgstr ""

-#: picard/ui/mainwindow.py:465
+#: picard/ui/mainwindow.py:466
 msgid "Tags From &File Names..."
 msgstr ""

-#: picard/ui/mainwindow.py:469
+#: picard/ui/mainwindow.py:470
 msgid "&Open My Collections in Browser"
 msgstr ""

-#: picard/ui/mainwindow.py:473
+#: picard/ui/mainwindow.py:474
 msgid "View Error/Debug &Log"
 msgstr ""

-#: picard/ui/mainwindow.py:476
+#: picard/ui/mainwindow.py:477
 msgid "View Activity &History"
 msgstr ""

-#: picard/ui/mainwindow.py:483
+#: picard/ui/mainwindow.py:484
 msgid "Open in &Player"
 msgstr ""

-#: picard/ui/mainwindow.py:484
+#: picard/ui/mainwindow.py:485
 msgid "Play the file in your default media player"
 msgstr ""

-#: picard/ui/mainwindow.py:488
+#: picard/ui/mainwindow.py:489
 msgid "Open Containing &Folder"
 msgstr ""

-#: picard/ui/mainwindow.py:489
+#: picard/ui/mainwindow.py:490
 msgid "Open the containing folder in your file explorer"
 msgstr ""

-#: picard/ui/mainwindow.py:518
+#: picard/ui/mainwindow.py:519
 msgid "&File"
 msgstr ""

-#: picard/ui/mainwindow.py:529
+#: picard/ui/mainwindow.py:530
 msgid "&Edit"
 msgstr ""

-#: picard/ui/mainwindow.py:535
+#: picard/ui/mainwindow.py:536
 msgid "&View"
 msgstr ""

-#: picard/ui/mainwindow.py:541
+#: picard/ui/mainwindow.py:542
 msgid "&Options"
 msgstr ""

-#: picard/ui/mainwindow.py:547
+#: picard/ui/mainwindow.py:548
 msgid "&Tools"
 msgstr ""

-#: picard/ui/mainwindow.py:558 picard/ui/util.py:35
+#: picard/ui/mainwindow.py:559 picard/ui/util.py:35
 msgid "&Help"
 msgstr ""

-#: picard/ui/mainwindow.py:586
+#: picard/ui/mainwindow.py:587
 msgid "Actions"
 msgstr ""

-#: picard/ui/mainwindow.py:627
+#: picard/ui/mainwindow.py:628
 msgid "Track"
 msgstr ""

-#: picard/ui/mainwindow.py:703
+#: picard/ui/mainwindow.py:704
 msgid "All Supported Formats"
 msgstr ""

-#: picard/ui/mainwindow.py:730
+#: picard/ui/mainwindow.py:731
 #, python-format
 msgid "Adding multiple directories from '%(directory)s' ..."
 msgstr ""

-#: picard/ui/mainwindow.py:735
+#: picard/ui/mainwindow.py:736
 #, python-format
 msgid "Adding directory: '%(directory)s' ..."
 msgstr ""

-#: picard/ui/mainwindow.py:801
+#: picard/ui/mainwindow.py:809
 msgid "Configuration Required"
 msgstr ""

-#: picard/ui/mainwindow.py:802
+#: picard/ui/mainwindow.py:810
 msgid ""
 "Audio fingerprinting is not yet configured. Would you like to configure it "
 "now?"
 msgstr ""

-#: picard/ui/mainwindow.py:902
+#: picard/ui/mainwindow.py:916
 #, python-format
 msgid "%(filename)s (error: %(error)s)"
 msgstr ""

-#: picard/ui/mainwindow.py:908
+#: picard/ui/mainwindow.py:922
 #, python-format
 msgid "%(filename)s"
 msgstr ""

-#: picard/ui/mainwindow.py:918
+#: picard/ui/mainwindow.py:933
 #, python-format
 msgid "%(filename)s (%(similarity)d%%) (error: %(error)s)"
 msgstr ""

-#: picard/ui/mainwindow.py:925
+#: picard/ui/mainwindow.py:940
 #, python-format
 msgid "%(filename)s (%(similarity)d%%)"
 msgstr ""

-#: picard/ui/mainwindow.py:961
+#: picard/ui/mainwindow.py:976
 msgid "Authentication Required"
 msgstr ""

-#: picard/ui/mainwindow.py:962
+#: picard/ui/mainwindow.py:977
 msgid ""
 "Picard needs authorization to access your personal data on the MusicBrainz "
 "server. Would you like to log in now?"
@@ -1108,7 +1128,7 @@ msgstr ""
 msgid "Retry"
 msgstr ""

-#: picard/ui/searchdialog.py:288
+#: picard/ui/searchdialog.py:283
 #, python-format
 msgid ""
 "<strong>Following error occurred while fetching "
@@ -1912,19 +1932,19 @@ msgstr ""
 msgid "Reset all settings for current option page"
 msgstr ""

-#: picard/ui/options/dialog.py:166
+#: picard/ui/options/dialog.py:172
 msgid "You are about to reset your options for this page."
 msgstr ""

-#: picard/ui/options/dialog.py:170
+#: picard/ui/options/dialog.py:176
 msgid "Warning! This will reset all of your settings."
 msgstr ""

-#: picard/ui/options/dialog.py:177
+#: picard/ui/options/dialog.py:183
 msgid "Confirm Reset"
 msgstr ""

-#: picard/ui/options/dialog.py:178
+#: picard/ui/options/dialog.py:184
 msgid "Are you sure?"
 msgstr ""

@@ -2095,7 +2115,7 @@ msgstr ""
 msgid "File Naming"
 msgstr ""

-#: picard/ui/options/renaming.py:175 picard/ui/options/scripting.py:406
+#: picard/ui/options/renaming.py:175 picard/ui/options/scripting.py:410
 msgid ""
 "<a href=\"%(picard-doc-scripting-url)s\">Open Scripting Documentation in "
 "your browser</a>"
@@ -2137,15 +2157,15 @@ msgstr ""
 msgid "Scripting"
 msgstr ""

-#: picard/ui/options/scripting.py:292
+#: picard/ui/options/scripting.py:293
 msgid "Are you sure you want to remove this script?"
 msgstr ""

-#: picard/ui/options/scripting.py:293
+#: picard/ui/options/scripting.py:294
 msgid "Confirm Remove"
 msgstr ""

-#: picard/ui/options/scripting.py:376
+#: picard/ui/options/scripting.py:377
 msgid "Script Error"
 msgstr ""

--- a/po/tr.po
+++ b/po/tr.po
@@ -13,8 +13,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: MusicBrainz\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2017-01-18 12:51+0100\n"
-"PO-Revision-Date: 2017-01-19 09:17+0000\n"
+"POT-Creation-Date: 2017-03-05 09:58+0100\n"
+"PO-Revision-Date: 2017-03-05 10:00+0000\n"
 "Last-Translator: nikki\n"
 "Language-Team: Turkish (http://www.transifex.com/musicbrainz/musicbrainz/language/tr/)\n"
 "MIME-Version: 1.0\n"
@@ -61,26 +61,26 @@ msgstr "AcoustID'ler başarıyla gönderildi."
 msgid "Unmatched Files"
 msgstr "Eşlenmeyen Dosyalar"

-#: picard/album.py:206
+#: picard/album.py:200
 #, python-format
 msgid "[could not load album %s]"
 msgstr "[albüm bilgisi yüklenemedi: %s]"

-#: picard/album.py:295
+#: picard/album.py:289
 #, python-format
 msgid "Album %(id)s loaded: %(artist)s - %(album)s"
 msgstr ""

-#: picard/album.py:338
+#: picard/album.py:332
 #, python-format
 msgid "Loading album %(id)s ..."
 msgstr ""

-#: picard/album.py:342
+#: picard/album.py:336
 msgid "[loading album information]"
 msgstr "[albüm bilgisi yükleniyor]"

-#: picard/album.py:527
+#: picard/album.py:523
 #, python-format
 msgid "; %i image"
 msgid_plural "; %i images"
@@ -102,72 +102,72 @@ msgstr ""
 msgid "Looking up the metadata for cluster %(album)s..."
 msgstr ""

-#: picard/collection.py:64
+#: picard/collection.py:67
 #, python-format
 msgid "Added %(count)i release to collection \"%(name)s\""
 msgid_plural "Added %(count)i releases to collection \"%(name)s\""
 msgstr[0] ""
 msgstr[1] ""

-#: picard/collection.py:86
+#: picard/collection.py:89
 #, python-format
 msgid "Removed %(count)i release from collection \"%(name)s\""
 msgid_plural "Removed %(count)i releases from collection \"%(name)s\""
 msgstr[0] ""
 msgstr[1] ""

-#: picard/collection.py:100
+#: picard/collection.py:104
 #, python-format
 msgid "Error loading collections: %(error)s"
 msgstr "Koleksiyonları yüklerken hata: %(error)s"

-#: picard/config_upgrade.py:58 picard/config_upgrade.py:71
+#: picard/config_upgrade.py:57 picard/config_upgrade.py:70
 msgid "Various Artists file naming scheme removal"
 msgstr ""

-#: picard/config_upgrade.py:59
+#: picard/config_upgrade.py:58
 msgid ""
 "The separate file naming scheme for various artists albums has been removed in this version of Picard.\n"
 "Your file naming scheme has automatically been merged with that of single artist albums."
 msgstr ""

-#: picard/config_upgrade.py:72
+#: picard/config_upgrade.py:71
 msgid ""
 "The separate file naming scheme for various artists albums has been removed in this version of Picard.\n"
 "You currently do not use this option, but have a separate file naming scheme defined.\n"
 "Do you want to remove it or merge it with your file naming scheme for single artist albums?"
 msgstr ""

-#: picard/config_upgrade.py:78
+#: picard/config_upgrade.py:77
 msgid "Merge"
 msgstr "Birleştir"

-#: picard/config_upgrade.py:78 picard/ui/metadatabox.py:314
+#: picard/config_upgrade.py:77 picard/ui/metadatabox.py:314
 #: picard/ui/options/interface.py:75 picard/ui/ui_options_interface.py:141
 msgid "Remove"
 msgstr "Sil"

-#: picard/config_upgrade.py:193 picard/ui/options/scripting.py:28
+#: picard/config_upgrade.py:200 picard/ui/options/scripting.py:28
 #, python-format
 msgid "My script %d"
 msgstr ""

-#: picard/file.py:541
+#: picard/file.py:565
 #, python-format
 msgid "No matching tracks for file '%(filename)s'"
 msgstr ""

-#: picard/file.py:557
+#: picard/file.py:581
 #, python-format
 msgid "No matching tracks above the threshold for file '%(filename)s'"
 msgstr ""

-#: picard/file.py:564
+#: picard/file.py:588
 #, python-format
 msgid "File '%(filename)s' identified!"
 msgstr ""

-#: picard/file.py:584
+#: picard/file.py:608
 #, python-format
 msgid "Looking up the metadata for file %(filename)s ..."
 msgstr ""
@@ -210,23 +210,23 @@ msgstr "[barkod yok]"
 msgid "[no release info]"
 msgstr "[sürüm bilgisi yok]"

-#: picard/tagger.py:405 picard/tagger.py:438
+#: picard/tagger.py:407 picard/tagger.py:440
 #, python-format
 msgid "Adding %(count)d file from '%(directory)s' ..."
 msgid_plural "Adding %(count)d files from '%(directory)s' ..."
 msgstr[0] ""
 msgstr[1] ""

-#: picard/tagger.py:597
+#: picard/tagger.py:599
 #, python-format
 msgid "Removing album %(id)s: %(artist)s - %(album)s"
 msgstr ""

-#: picard/tagger.py:613
+#: picard/tagger.py:615
 msgid "CD Lookup Error"
 msgstr "CD Arama Hatası"

-#: picard/tagger.py:614
+#: picard/tagger.py:616
 #, python-format
 msgid ""
 "Error while reading CD:\n"
@@ -274,6 +274,10 @@ msgstr "Fransızca"
 msgid "Italian"
 msgstr "İtalyanca"

+#: picard/const/languages.py:57
+msgid "Norwegian Bokmal"
+msgstr ""
+
 #: picard/const/languages.py:59
 msgid "Dutch"
 msgstr "Hollandaca"
@@ -337,12 +341,12 @@ msgstr ""
 msgid "Whitelist"
 msgstr ""

-#: picard/ui/cdlookup.py:35 picard/ui/mainwindow.py:625 picard/util/tags.py:21
+#: picard/ui/cdlookup.py:35 picard/ui/mainwindow.py:626 picard/util/tags.py:21
 msgid "Album"
 msgstr "Albüm"

-#: picard/ui/cdlookup.py:35 picard/ui/itemviews.py:96
-#: picard/ui/mainwindow.py:626 picard/ui/searchdialog.py:326
+#: picard/ui/cdlookup.py:35 picard/ui/itemviews.py:105
+#: picard/ui/mainwindow.py:627 picard/ui/searchdialog.py:326
 #: picard/ui/searchdialog.py:513 picard/util/tags.py:22
 msgid "Artist"
 msgstr "Sanatçı"
@@ -376,10 +380,22 @@ msgid_plural "%s (%i releases)"
 msgstr[0] ""
 msgstr[1] ""

-#: picard/ui/coverartbox.py:143
+#: picard/ui/coverartbox.py:141
 msgid "View release on MusicBrainz"
 msgstr ""

+#: picard/ui/coverartbox.py:174
+msgid "Show more details"
+msgstr ""
+
+#: picard/ui/coverartbox.py:199
+msgid "New Cover Art"
+msgstr ""
+
+#: picard/ui/coverartbox.py:200
+msgid "Original Cover Art"
+msgstr ""
+
 #: picard/ui/filebrowser.py:40
 msgid "&Move Tagged Files Here"
 msgstr "Etiketlenen Dosyaları Buraya &Taşı"
@@ -508,116 +524,116 @@ msgstr "Bekleyen dosyalar"
 msgid "Pending requests"
 msgstr "Bekleyen istekler"

-#: picard/ui/itemviews.py:94 picard/util/tags.py:23
+#: picard/ui/itemviews.py:103 picard/util/tags.py:23
 msgid "Title"
 msgstr "Parça Adı"

-#: picard/ui/itemviews.py:95 picard/ui/searchdialog.py:325
+#: picard/ui/itemviews.py:104 picard/ui/searchdialog.py:325
 #: picard/util/tags.py:87
 msgid "Length"
 msgstr "Süre"

-#: picard/ui/itemviews.py:162
+#: picard/ui/itemviews.py:171
 msgid "Bad match"
 msgstr ""

-#: picard/ui/itemviews.py:163
+#: picard/ui/itemviews.py:172
 msgid "Poor match"
 msgstr ""

-#: picard/ui/itemviews.py:164
+#: picard/ui/itemviews.py:173
 msgid "Ok match"
 msgstr ""

-#: picard/ui/itemviews.py:165
+#: picard/ui/itemviews.py:174
 msgid "Good match"
 msgstr ""

-#: picard/ui/itemviews.py:166
+#: picard/ui/itemviews.py:175
 msgid "Great match"
 msgstr ""

-#: picard/ui/itemviews.py:167
+#: picard/ui/itemviews.py:176
 msgid "Excellent match"
 msgstr ""

-#: picard/ui/itemviews.py:243
+#: picard/ui/itemviews.py:252
 msgid "&Expand all"
 msgstr "Tümünü &Genişlet"

-#: picard/ui/itemviews.py:245
+#: picard/ui/itemviews.py:254
 msgid "&Collapse all"
 msgstr "Tümünü &Daralt"

-#: picard/ui/itemviews.py:247
+#: picard/ui/itemviews.py:256
 msgid "Select &all"
 msgstr ""

-#: picard/ui/itemviews.py:249
+#: picard/ui/itemviews.py:258
 msgid "Ctrl+A"
 msgstr ""

-#: picard/ui/itemviews.py:315
+#: picard/ui/itemviews.py:324
 msgid "&Other versions"
 msgstr "&Diğer versiyonlar"

-#: picard/ui/itemviews.py:318
+#: picard/ui/itemviews.py:327
 msgid "Loading..."
 msgstr "Yükleniyor..."

-#: picard/ui/itemviews.py:383
+#: picard/ui/itemviews.py:392
 msgid "Collections"
 msgstr "Koleksiyonlar"

-#: picard/ui/itemviews.py:386
+#: picard/ui/itemviews.py:395
 msgid "P&lugins"
 msgstr ""

-#: picard/ui/itemviews.py:557
+#: picard/ui/itemviews.py:577
 msgid "file view"
 msgstr "dosya görünümü"

-#: picard/ui/itemviews.py:558
+#: picard/ui/itemviews.py:578
 msgid "Contains unmatched files and clusters"
 msgstr ""

-#: picard/ui/itemviews.py:578
+#: picard/ui/itemviews.py:598
 msgid "Clusters"
 msgstr "Kümeler"

-#: picard/ui/itemviews.py:587
+#: picard/ui/itemviews.py:607
 msgid "album view"
 msgstr "albüm görünümü"

-#: picard/ui/itemviews.py:588
+#: picard/ui/itemviews.py:608
 msgid "Contains albums and matched files"
 msgstr ""

-#: picard/ui/itemviews.py:694 picard/ui/options/renaming.py:188
+#: picard/ui/itemviews.py:714 picard/ui/options/renaming.py:188
 msgid "Error"
 msgstr "Hata"

-#: picard/ui/itemviews.py:698
+#: picard/ui/itemviews.py:718
 msgid "Album modified and complete"
 msgstr ""

-#: picard/ui/itemviews.py:701
+#: picard/ui/itemviews.py:721
 msgid "Album unchanged and complete"
 msgstr ""

-#: picard/ui/itemviews.py:705
+#: picard/ui/itemviews.py:725
 msgid "Album modified"
 msgstr ""

-#: picard/ui/itemviews.py:708
+#: picard/ui/itemviews.py:728
 msgid "Album unchanged"
 msgstr ""

-#: picard/ui/itemviews.py:811
+#: picard/ui/itemviews.py:831
 msgid "Track saved"
 msgstr ""

-#: picard/ui/itemviews.py:813 picard/ui/itemviews.py:817
+#: picard/ui/itemviews.py:833 picard/ui/itemviews.py:837
 msgid "Pending"
 msgstr ""

@@ -808,7 +824,7 @@ msgstr "Ctrl+B"
 msgid "&Cover Art"
 msgstr "&Kapak Resmi"

-#: picard/ui/mainwindow.py:407 picard/ui/mainwindow.py:619
+#: picard/ui/mainwindow.py:407 picard/ui/mainwindow.py:620
 #: picard/ui/searchdialog.py:71
 msgid "Search"
 msgstr "Arama"
@@ -835,175 +851,179 @@ msgid ""
 "even if they have no metadata"
 msgstr ""

-#: picard/ui/mainwindow.py:421
+#: picard/ui/mainwindow.py:420
+msgid "Identify the file using its AcoustID audio fingerprint"
+msgstr ""
+
+#: picard/ui/mainwindow.py:422
 msgid "Ctrl+Y"
 msgstr "Ctrl+Y"

-#: picard/ui/mainwindow.py:424
+#: picard/ui/mainwindow.py:425
 msgid "Cl&uster"
 msgstr "&Kümele"

-#: picard/ui/mainwindow.py:425
+#: picard/ui/mainwindow.py:426
 msgid "Cluster files into album clusters"
 msgstr ""

-#: picard/ui/mainwindow.py:428
+#: picard/ui/mainwindow.py:429
 msgid "Ctrl+U"
 msgstr "Ctrl+U"

-#: picard/ui/mainwindow.py:431
+#: picard/ui/mainwindow.py:432
 msgid "&Lookup"
 msgstr "&Arama"

-#: picard/ui/mainwindow.py:432
+#: picard/ui/mainwindow.py:433
 msgid "Lookup selected items in MusicBrainz"
 msgstr ""

-#: picard/ui/mainwindow.py:437
+#: picard/ui/mainwindow.py:438
 msgid "Ctrl+L"
 msgstr "Ctrl+L"

-#: picard/ui/mainwindow.py:440
+#: picard/ui/mainwindow.py:441
 msgid "&Info..."
 msgstr "&Bilgi..."

-#: picard/ui/mainwindow.py:443
+#: picard/ui/mainwindow.py:444
 msgid "Ctrl+I"
 msgstr "Ctrl+I"

-#: picard/ui/mainwindow.py:446
+#: picard/ui/mainwindow.py:447
 msgid "&Refresh"
 msgstr "&Yenile"

-#: picard/ui/mainwindow.py:447
+#: picard/ui/mainwindow.py:448
 msgid "Ctrl+R"
 msgstr "Ctrl+R"

-#: picard/ui/mainwindow.py:450
+#: picard/ui/mainwindow.py:451
 msgid "&Rename Files"
 msgstr "Dosyaları &Adlandır"

-#: picard/ui/mainwindow.py:455
+#: picard/ui/mainwindow.py:456
 msgid "&Move Files"
 msgstr "Dosyaları &Taşı"

-#: picard/ui/mainwindow.py:460
+#: picard/ui/mainwindow.py:461
 msgid "Save &Tags"
 msgstr "&Etiketleri Kaydet"

-#: picard/ui/mainwindow.py:465
+#: picard/ui/mainwindow.py:466
 msgid "Tags From &File Names..."
 msgstr "Dosya Adlarından &Etiketlendir..."

-#: picard/ui/mainwindow.py:469
+#: picard/ui/mainwindow.py:470
 msgid "&Open My Collections in Browser"
 msgstr ""

-#: picard/ui/mainwindow.py:473
+#: picard/ui/mainwindow.py:474
 msgid "View Error/Debug &Log"
 msgstr ""

-#: picard/ui/mainwindow.py:476
+#: picard/ui/mainwindow.py:477
 msgid "View Activity &History"
 msgstr ""

-#: picard/ui/mainwindow.py:483
+#: picard/ui/mainwindow.py:484
 msgid "Open in &Player"
 msgstr ""

-#: picard/ui/mainwindow.py:484
+#: picard/ui/mainwindow.py:485
 msgid "Play the file in your default media player"
 msgstr "Dosyayı varsayılan medya oynatıcısında çal"

-#: picard/ui/mainwindow.py:488
+#: picard/ui/mainwindow.py:489
 msgid "Open Containing &Folder"
 msgstr ""

-#: picard/ui/mainwindow.py:489
+#: picard/ui/mainwindow.py:490
 msgid "Open the containing folder in your file explorer"
 msgstr ""

-#: picard/ui/mainwindow.py:518
+#: picard/ui/mainwindow.py:519
 msgid "&File"
 msgstr "&Dosya"

-#: picard/ui/mainwindow.py:529
+#: picard/ui/mainwindow.py:530
 msgid "&Edit"
 msgstr "Dü&zenle"

-#: picard/ui/mainwindow.py:535
+#: picard/ui/mainwindow.py:536
 msgid "&View"
 msgstr "&Görünüm"

-#: picard/ui/mainwindow.py:541
+#: picard/ui/mainwindow.py:542
 msgid "&Options"
 msgstr "&Seçenekler"

-#: picard/ui/mainwindow.py:547
+#: picard/ui/mainwindow.py:548
 msgid "&Tools"
 msgstr "&Araçlar"

-#: picard/ui/mainwindow.py:558 picard/ui/util.py:35
+#: picard/ui/mainwindow.py:559 picard/ui/util.py:35
 msgid "&Help"
 msgstr "&Yardım"

-#: picard/ui/mainwindow.py:586
+#: picard/ui/mainwindow.py:587
 msgid "Actions"
 msgstr "Eylemler"

-#: picard/ui/mainwindow.py:627
+#: picard/ui/mainwindow.py:628
 msgid "Track"
 msgstr "Parça"

-#: picard/ui/mainwindow.py:703
+#: picard/ui/mainwindow.py:704
 msgid "All Supported Formats"
 msgstr "Desteklenen Tüm Formatlar"

-#: picard/ui/mainwindow.py:730
+#: picard/ui/mainwindow.py:731
 #, python-format
 msgid "Adding multiple directories from '%(directory)s' ..."
 msgstr ""

-#: picard/ui/mainwindow.py:735
+#: picard/ui/mainwindow.py:736
 #, python-format
 msgid "Adding directory: '%(directory)s' ..."
 msgstr "Klasör ekliyor: '%(directory)s' ..."

-#: picard/ui/mainwindow.py:801
+#: picard/ui/mainwindow.py:809
 msgid "Configuration Required"
 msgstr ""

-#: picard/ui/mainwindow.py:802
+#: picard/ui/mainwindow.py:810
 msgid ""
 "Audio fingerprinting is not yet configured. Would you like to configure it "
 "now?"
 msgstr "Ses parmakizi yapılandırılmamış. Şimdi yapılandırmak ister misiniz?"

-#: picard/ui/mainwindow.py:902
+#: picard/ui/mainwindow.py:916
 #, python-format
 msgid "%(filename)s (error: %(error)s)"
 msgstr ""

-#: picard/ui/mainwindow.py:908
+#: picard/ui/mainwindow.py:922
 #, python-format
 msgid "%(filename)s"
 msgstr ""

-#: picard/ui/mainwindow.py:918
+#: picard/ui/mainwindow.py:933
 #, python-format
 msgid "%(filename)s (%(similarity)d%%) (error: %(error)s)"
 msgstr ""

-#: picard/ui/mainwindow.py:925
+#: picard/ui/mainwindow.py:940
 #, python-format
 msgid "%(filename)s (%(similarity)d%%)"
 msgstr ""

-#: picard/ui/mainwindow.py:961
+#: picard/ui/mainwindow.py:976
 msgid "Authentication Required"
 msgstr ""

-#: picard/ui/mainwindow.py:962
+#: picard/ui/mainwindow.py:977
 msgid ""
 "Picard needs authorization to access your personal data on the MusicBrainz "
 "server. Would you like to log in now?"
@@ -1112,7 +1132,7 @@ msgstr ""
 msgid "Retry"
 msgstr ""

-#: picard/ui/searchdialog.py:288
+#: picard/ui/searchdialog.py:283
 #, python-format
 msgid ""
 "<strong>Following error occurred while fetching "
@@ -1916,19 +1936,19 @@ msgstr ""
 msgid "Reset all settings for current option page"
 msgstr ""

-#: picard/ui/options/dialog.py:166
+#: picard/ui/options/dialog.py:172
 msgid "You are about to reset your options for this page."
 msgstr ""

-#: picard/ui/options/dialog.py:170
+#: picard/ui/options/dialog.py:176
 msgid "Warning! This will reset all of your settings."
 msgstr ""

-#: picard/ui/options/dialog.py:177
+#: picard/ui/options/dialog.py:183
 msgid "Confirm Reset"
 msgstr ""

-#: picard/ui/options/dialog.py:178
+#: picard/ui/options/dialog.py:184
 msgid "Are you sure?"
 msgstr ""

@@ -2099,7 +2119,7 @@ msgstr "Tümünü sıfırla"
 msgid "File Naming"
 msgstr "Dosya İsimlendirme"

-#: picard/ui/options/renaming.py:175 picard/ui/options/scripting.py:406
+#: picard/ui/options/renaming.py:175 picard/ui/options/scripting.py:410
 msgid ""
 "<a href=\"%(picard-doc-scripting-url)s\">Open Scripting Documentation in "
 "your browser</a>"
@@ -2141,15 +2161,15 @@ msgstr ""
 msgid "Scripting"
 msgstr "Betikleme"

-#: picard/ui/options/scripting.py:292
+#: picard/ui/options/scripting.py:293
 msgid "Are you sure you want to remove this script?"
 msgstr ""

-#: picard/ui/options/scripting.py:293
+#: picard/ui/options/scripting.py:294
 msgid "Confirm Remove"
 msgstr ""

-#: picard/ui/options/scripting.py:376
+#: picard/ui/options/scripting.py:377
 msgid "Script Error"
 msgstr "Betik Hatası"

--- a/po/uk.po
+++ b/po/uk.po
@@ -9,8 +9,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: MusicBrainz\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2017-01-18 12:51+0100\n"
-"PO-Revision-Date: 2017-01-19 09:17+0000\n"
+"POT-Creation-Date: 2017-03-05 09:58+0100\n"
+"PO-Revision-Date: 2017-03-05 10:00+0000\n"
 "Last-Translator: nikki\n"
 "Language-Team: Ukrainian (http://www.transifex.com/musicbrainz/musicbrainz/language/uk/)\n"
 "MIME-Version: 1.0\n"
@@ -57,26 +57,26 @@ msgstr ""
 msgid "Unmatched Files"
 msgstr "Неузгоджені файли"

-#: picard/album.py:206
+#: picard/album.py:200
 #, python-format
 msgid "[could not load album %s]"
 msgstr "[не вдалось завантажити альбом %s]"

-#: picard/album.py:295
+#: picard/album.py:289
 #, python-format
 msgid "Album %(id)s loaded: %(artist)s - %(album)s"
 msgstr ""

-#: picard/album.py:338
+#: picard/album.py:332
 #, python-format
 msgid "Loading album %(id)s ..."
 msgstr ""

-#: picard/album.py:342
+#: picard/album.py:336
 msgid "[loading album information]"
 msgstr "[завантаження даних альбому]"

-#: picard/album.py:527
+#: picard/album.py:523
 #, python-format
 msgid "; %i image"
 msgid_plural "; %i images"
@@ -99,7 +99,7 @@ msgstr ""
 msgid "Looking up the metadata for cluster %(album)s..."
 msgstr ""

-#: picard/collection.py:64
+#: picard/collection.py:67
 #, python-format
 msgid "Added %(count)i release to collection \"%(name)s\""
 msgid_plural "Added %(count)i releases to collection \"%(name)s\""
@@ -107,7 +107,7 @@ msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""

-#: picard/collection.py:86
+#: picard/collection.py:89
 #, python-format
 msgid "Removed %(count)i release from collection \"%(name)s\""
 msgid_plural "Removed %(count)i releases from collection \"%(name)s\""
@@ -115,58 +115,58 @@ msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""

-#: picard/collection.py:100
+#: picard/collection.py:104
 #, python-format
 msgid "Error loading collections: %(error)s"
 msgstr ""

-#: picard/config_upgrade.py:58 picard/config_upgrade.py:71
+#: picard/config_upgrade.py:57 picard/config_upgrade.py:70
 msgid "Various Artists file naming scheme removal"
 msgstr ""

-#: picard/config_upgrade.py:59
+#: picard/config_upgrade.py:58
 msgid ""
 "The separate file naming scheme for various artists albums has been removed in this version of Picard.\n"
 "Your file naming scheme has automatically been merged with that of single artist albums."
 msgstr ""

-#: picard/config_upgrade.py:72
+#: picard/config_upgrade.py:71
 msgid ""
 "The separate file naming scheme for various artists albums has been removed in this version of Picard.\n"
 "You currently do not use this option, but have a separate file naming scheme defined.\n"
 "Do you want to remove it or merge it with your file naming scheme for single artist albums?"
 msgstr ""

-#: picard/config_upgrade.py:78
+#: picard/config_upgrade.py:77
 msgid "Merge"
 msgstr ""

-#: picard/config_upgrade.py:78 picard/ui/metadatabox.py:314
+#: picard/config_upgrade.py:77 picard/ui/metadatabox.py:314
 #: picard/ui/options/interface.py:75 picard/ui/ui_options_interface.py:141
 msgid "Remove"
 msgstr ""

-#: picard/config_upgrade.py:193 picard/ui/options/scripting.py:28
+#: picard/config_upgrade.py:200 picard/ui/options/scripting.py:28
 #, python-format
 msgid "My script %d"
 msgstr ""

-#: picard/file.py:541
+#: picard/file.py:565
 #, python-format
 msgid "No matching tracks for file '%(filename)s'"
 msgstr ""

-#: picard/file.py:557
+#: picard/file.py:581
 #, python-format
 msgid "No matching tracks above the threshold for file '%(filename)s'"
 msgstr ""

-#: picard/file.py:564
+#: picard/file.py:588
 #, python-format
 msgid "File '%(filename)s' identified!"
 msgstr ""

-#: picard/file.py:584
+#: picard/file.py:608
 #, python-format
 msgid "Looking up the metadata for file %(filename)s ..."
 msgstr ""
@@ -209,7 +209,7 @@ msgstr ""
 msgid "[no release info]"
 msgstr ""

-#: picard/tagger.py:405 picard/tagger.py:438
+#: picard/tagger.py:407 picard/tagger.py:440
 #, python-format
 msgid "Adding %(count)d file from '%(directory)s' ..."
 msgid_plural "Adding %(count)d files from '%(directory)s' ..."
@@ -217,16 +217,16 @@ msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""

-#: picard/tagger.py:597
+#: picard/tagger.py:599
 #, python-format
 msgid "Removing album %(id)s: %(artist)s - %(album)s"
 msgstr ""

-#: picard/tagger.py:613
+#: picard/tagger.py:615
 msgid "CD Lookup Error"
 msgstr "Помика пошуку CD"

-#: picard/tagger.py:614
+#: picard/tagger.py:616
 #, python-format
 msgid ""
 "Error while reading CD:\n"
@@ -274,6 +274,10 @@ msgstr "Французька"
 msgid "Italian"
 msgstr "Італійська"

+#: picard/const/languages.py:57
+msgid "Norwegian Bokmal"
+msgstr ""
+
 #: picard/const/languages.py:59
 msgid "Dutch"
 msgstr "Голандська"
@@ -337,12 +341,12 @@ msgstr ""
 msgid "Whitelist"
 msgstr ""

-#: picard/ui/cdlookup.py:35 picard/ui/mainwindow.py:625 picard/util/tags.py:21
+#: picard/ui/cdlookup.py:35 picard/ui/mainwindow.py:626 picard/util/tags.py:21
 msgid "Album"
 msgstr "Альбом"

-#: picard/ui/cdlookup.py:35 picard/ui/itemviews.py:96
-#: picard/ui/mainwindow.py:626 picard/ui/searchdialog.py:326
+#: picard/ui/cdlookup.py:35 picard/ui/itemviews.py:105
+#: picard/ui/mainwindow.py:627 picard/ui/searchdialog.py:326
 #: picard/ui/searchdialog.py:513 picard/util/tags.py:22
 msgid "Artist"
 msgstr "Виконавець"
@@ -377,10 +381,22 @@ msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""

-#: picard/ui/coverartbox.py:143
+#: picard/ui/coverartbox.py:141
 msgid "View release on MusicBrainz"
 msgstr ""

+#: picard/ui/coverartbox.py:174
+msgid "Show more details"
+msgstr ""
+
+#: picard/ui/coverartbox.py:199
+msgid "New Cover Art"
+msgstr ""
+
+#: picard/ui/coverartbox.py:200
+msgid "Original Cover Art"
+msgstr ""
+
 #: picard/ui/filebrowser.py:40
 msgid "&Move Tagged Files Here"
 msgstr "&Перемістити позначені файли сюди"
@@ -509,116 +525,116 @@ msgstr ""
 msgid "Pending requests"
 msgstr ""

-#: picard/ui/itemviews.py:94 picard/util/tags.py:23
+#: picard/ui/itemviews.py:103 picard/util/tags.py:23
 msgid "Title"
 msgstr "Назва"

-#: picard/ui/itemviews.py:95 picard/ui/searchdialog.py:325
+#: picard/ui/itemviews.py:104 picard/ui/searchdialog.py:325
 #: picard/util/tags.py:87
 msgid "Length"
 msgstr "Тривалість"

-#: picard/ui/itemviews.py:162
+#: picard/ui/itemviews.py:171
 msgid "Bad match"
 msgstr ""

-#: picard/ui/itemviews.py:163
+#: picard/ui/itemviews.py:172
 msgid "Poor match"
 msgstr ""

-#: picard/ui/itemviews.py:164
+#: picard/ui/itemviews.py:173
 msgid "Ok match"
 msgstr ""

-#: picard/ui/itemviews.py:165
+#: picard/ui/itemviews.py:174
 msgid "Good match"
 msgstr ""

-#: picard/ui/itemviews.py:166
+#: picard/ui/itemviews.py:175
 msgid "Great match"
 msgstr ""

-#: picard/ui/itemviews.py:167
+#: picard/ui/itemviews.py:176
 msgid "Excellent match"
 msgstr ""

-#: picard/ui/itemviews.py:243
+#: picard/ui/itemviews.py:252
 msgid "&Expand all"
 msgstr "&Розгорнути все"

-#: picard/ui/itemviews.py:245
+#: picard/ui/itemviews.py:254
 msgid "&Collapse all"
 msgstr "&Згорнути все"

-#: picard/ui/itemviews.py:247
+#: picard/ui/itemviews.py:256
 msgid "Select &all"
 msgstr ""

-#: picard/ui/itemviews.py:249
+#: picard/ui/itemviews.py:258
 msgid "Ctrl+A"
 msgstr ""

-#: picard/ui/itemviews.py:315
+#: picard/ui/itemviews.py:324
 msgid "&Other versions"
 msgstr ""

-#: picard/ui/itemviews.py:318
+#: picard/ui/itemviews.py:327
 msgid "Loading..."
 msgstr ""

-#: picard/ui/itemviews.py:383
+#: picard/ui/itemviews.py:392
 msgid "Collections"
 msgstr ""

-#: picard/ui/itemviews.py:386
+#: picard/ui/itemviews.py:395
 msgid "P&lugins"
 msgstr ""

-#: picard/ui/itemviews.py:557
+#: picard/ui/itemviews.py:577
 msgid "file view"
 msgstr ""

-#: picard/ui/itemviews.py:558
+#: picard/ui/itemviews.py:578
 msgid "Contains unmatched files and clusters"
 msgstr ""

-#: picard/ui/itemviews.py:578
+#: picard/ui/itemviews.py:598
 msgid "Clusters"
 msgstr "Кластери"

-#: picard/ui/itemviews.py:587
+#: picard/ui/itemviews.py:607
 msgid "album view"
 msgstr ""

-#: picard/ui/itemviews.py:588
+#: picard/ui/itemviews.py:608
 msgid "Contains albums and matched files"
 msgstr ""

-#: picard/ui/itemviews.py:694 picard/ui/options/renaming.py:188
+#: picard/ui/itemviews.py:714 picard/ui/options/renaming.py:188
 msgid "Error"
 msgstr "Помилка"

-#: picard/ui/itemviews.py:698
+#: picard/ui/itemviews.py:718
 msgid "Album modified and complete"
 msgstr ""

-#: picard/ui/itemviews.py:701
+#: picard/ui/itemviews.py:721
 msgid "Album unchanged and complete"
 msgstr ""

-#: picard/ui/itemviews.py:705
+#: picard/ui/itemviews.py:725
 msgid "Album modified"
 msgstr ""

-#: picard/ui/itemviews.py:708
+#: picard/ui/itemviews.py:728
 msgid "Album unchanged"
 msgstr ""

-#: picard/ui/itemviews.py:811
+#: picard/ui/itemviews.py:831
 msgid "Track saved"
 msgstr ""

-#: picard/ui/itemviews.py:813 picard/ui/itemviews.py:817
+#: picard/ui/itemviews.py:833 picard/ui/itemviews.py:837
 msgid "Pending"
 msgstr ""

@@ -810,7 +826,7 @@ msgstr "Ctrl+B"
 msgid "&Cover Art"
 msgstr "&Обкладинки"

-#: picard/ui/mainwindow.py:407 picard/ui/mainwindow.py:619
+#: picard/ui/mainwindow.py:407 picard/ui/mainwindow.py:620
 #: picard/ui/searchdialog.py:71
 msgid "Search"
 msgstr "Пошук"
@@ -837,175 +853,179 @@ msgid ""
 "even if they have no metadata"
 msgstr ""

-#: picard/ui/mainwindow.py:421
+#: picard/ui/mainwindow.py:420
+msgid "Identify the file using its AcoustID audio fingerprint"
+msgstr ""
+
+#: picard/ui/mainwindow.py:422
 msgid "Ctrl+Y"
 msgstr "Ctrl+Y"

-#: picard/ui/mainwindow.py:424
+#: picard/ui/mainwindow.py:425
 msgid "Cl&uster"
 msgstr "&Разбити на кластери"

-#: picard/ui/mainwindow.py:425
+#: picard/ui/mainwindow.py:426
 msgid "Cluster files into album clusters"
 msgstr ""

-#: picard/ui/mainwindow.py:428
+#: picard/ui/mainwindow.py:429
 msgid "Ctrl+U"
 msgstr "Ctrl+U"

-#: picard/ui/mainwindow.py:431
+#: picard/ui/mainwindow.py:432
 msgid "&Lookup"
 msgstr "&Пошук"

-#: picard/ui/mainwindow.py:432
+#: picard/ui/mainwindow.py:433
 msgid "Lookup selected items in MusicBrainz"
 msgstr ""

-#: picard/ui/mainwindow.py:437
+#: picard/ui/mainwindow.py:438
 msgid "Ctrl+L"
 msgstr "Ctrl+L"

-#: picard/ui/mainwindow.py:440
+#: picard/ui/mainwindow.py:441
 msgid "&Info..."
 msgstr ""

-#: picard/ui/mainwindow.py:443
+#: picard/ui/mainwindow.py:444
 msgid "Ctrl+I"
 msgstr ""

-#: picard/ui/mainwindow.py:446
+#: picard/ui/mainwindow.py:447
 msgid "&Refresh"
 msgstr "&Оновити"

-#: picard/ui/mainwindow.py:447
+#: picard/ui/mainwindow.py:448
 msgid "Ctrl+R"
 msgstr ""

-#: picard/ui/mainwindow.py:450
+#: picard/ui/mainwindow.py:451
 msgid "&Rename Files"
 msgstr "П&ерейменувати файли"

-#: picard/ui/mainwindow.py:455
+#: picard/ui/mainwindow.py:456
 msgid "&Move Files"
 msgstr "Пе&ремістити файли"

-#: picard/ui/mainwindow.py:460
+#: picard/ui/mainwindow.py:461
 msgid "Save &Tags"
 msgstr "&Зберегти позначки"

-#: picard/ui/mainwindow.py:465
+#: picard/ui/mainwindow.py:466
 msgid "Tags From &File Names..."
 msgstr "Позначки з н&азв файлів..."

-#: picard/ui/mainwindow.py:469
+#: picard/ui/mainwindow.py:470
 msgid "&Open My Collections in Browser"
 msgstr ""

-#: picard/ui/mainwindow.py:473
+#: picard/ui/mainwindow.py:474
 msgid "View Error/Debug &Log"
 msgstr ""

-#: picard/ui/mainwindow.py:476
+#: picard/ui/mainwindow.py:477
 msgid "View Activity &History"
 msgstr ""

-#: picard/ui/mainwindow.py:483
+#: picard/ui/mainwindow.py:484
 msgid "Open in &Player"
 msgstr ""

-#: picard/ui/mainwindow.py:484
+#: picard/ui/mainwindow.py:485
 msgid "Play the file in your default media player"
 msgstr ""

-#: picard/ui/mainwindow.py:488
+#: picard/ui/mainwindow.py:489
 msgid "Open Containing &Folder"
 msgstr ""

-#: picard/ui/mainwindow.py:489
+#: picard/ui/mainwindow.py:490
 msgid "Open the containing folder in your file explorer"
 msgstr ""

-#: picard/ui/mainwindow.py:518
+#: picard/ui/mainwindow.py:519
 msgid "&File"
 msgstr "&Файл"

-#: picard/ui/mainwindow.py:529
+#: picard/ui/mainwindow.py:530
 msgid "&Edit"
 msgstr "&Правка"

-#: picard/ui/mainwindow.py:535
+#: picard/ui/mainwindow.py:536
 msgid "&View"
 msgstr "&Вигляд"

-#: picard/ui/mainwindow.py:541
+#: picard/ui/mainwindow.py:542
 msgid "&Options"
 msgstr "&Налаштування"

-#: picard/ui/mainwindow.py:547
+#: picard/ui/mainwindow.py:548
 msgid "&Tools"
 msgstr "&Інструменти"

-#: picard/ui/mainwindow.py:558 picard/ui/util.py:35
+#: picard/ui/mainwindow.py:559 picard/ui/util.py:35
 msgid "&Help"
 msgstr "&Довідка"

-#: picard/ui/mainwindow.py:586
+#: picard/ui/mainwindow.py:587
 msgid "Actions"
 msgstr ""

-#: picard/ui/mainwindow.py:627
+#: picard/ui/mainwindow.py:628
 msgid "Track"
 msgstr "Доріжка"

-#: picard/ui/mainwindow.py:703
+#: picard/ui/mainwindow.py:704
 msgid "All Supported Formats"
 msgstr "Всі підтримувані формати"

-#: picard/ui/mainwindow.py:730
+#: picard/ui/mainwindow.py:731
 #, python-format
 msgid "Adding multiple directories from '%(directory)s' ..."
 msgstr ""

-#: picard/ui/mainwindow.py:735
+#: picard/ui/mainwindow.py:736
 #, python-format
 msgid "Adding directory: '%(directory)s' ..."
 msgstr ""

-#: picard/ui/mainwindow.py:801
+#: picard/ui/mainwindow.py:809
 msgid "Configuration Required"
 msgstr ""

-#: picard/ui/mainwindow.py:802
+#: picard/ui/mainwindow.py:810
 msgid ""
 "Audio fingerprinting is not yet configured. Would you like to configure it "
 "now?"
 msgstr ""

-#: picard/ui/mainwindow.py:902
+#: picard/ui/mainwindow.py:916
 #, python-format
 msgid "%(filename)s (error: %(error)s)"
 msgstr ""

-#: picard/ui/mainwindow.py:908
+#: picard/ui/mainwindow.py:922
 #, python-format
 msgid "%(filename)s"
 msgstr ""

-#: picard/ui/mainwindow.py:918
+#: picard/ui/mainwindow.py:933
 #, python-format
 msgid "%(filename)s (%(similarity)d%%) (error: %(error)s)"
 msgstr ""

-#: picard/ui/mainwindow.py:925
+#: picard/ui/mainwindow.py:940
 #, python-format
 msgid "%(filename)s (%(similarity)d%%)"
 msgstr ""

-#: picard/ui/mainwindow.py:961
+#: picard/ui/mainwindow.py:976
 msgid "Authentication Required"
 msgstr ""

-#: picard/ui/mainwindow.py:962
+#: picard/ui/mainwindow.py:977
 msgid ""
 "Picard needs authorization to access your personal data on the MusicBrainz "
 "server. Would you like to log in now?"
@@ -1117,7 +1137,7 @@ msgstr ""
 msgid "Retry"
 msgstr ""

-#: picard/ui/searchdialog.py:288
+#: picard/ui/searchdialog.py:283
 #, python-format
 msgid ""
 "<strong>Following error occurred while fetching "
@@ -1921,19 +1941,19 @@ msgstr ""
 msgid "Reset all settings for current option page"
 msgstr ""

-#: picard/ui/options/dialog.py:166
+#: picard/ui/options/dialog.py:172
 msgid "You are about to reset your options for this page."
 msgstr ""

-#: picard/ui/options/dialog.py:170
+#: picard/ui/options/dialog.py:176
 msgid "Warning! This will reset all of your settings."
 msgstr ""

-#: picard/ui/options/dialog.py:177
+#: picard/ui/options/dialog.py:183
 msgid "Confirm Reset"
 msgstr ""

-#: picard/ui/options/dialog.py:178
+#: picard/ui/options/dialog.py:184
 msgid "Are you sure?"
 msgstr ""

@@ -2104,7 +2124,7 @@ msgstr ""
 msgid "File Naming"
 msgstr ""

-#: picard/ui/options/renaming.py:175 picard/ui/options/scripting.py:406
+#: picard/ui/options/renaming.py:175 picard/ui/options/scripting.py:410
 msgid ""
 "<a href=\"%(picard-doc-scripting-url)s\">Open Scripting Documentation in "
 "your browser</a>"
@@ -2146,15 +2166,15 @@ msgstr ""
 msgid "Scripting"
 msgstr "Сценарії"

-#: picard/ui/options/scripting.py:292
+#: picard/ui/options/scripting.py:293
 msgid "Are you sure you want to remove this script?"
 msgstr ""

-#: picard/ui/options/scripting.py:293
+#: picard/ui/options/scripting.py:294
 msgid "Confirm Remove"
 msgstr ""

-#: picard/ui/options/scripting.py:376
+#: picard/ui/options/scripting.py:377
 msgid "Script Error"
 msgstr "Помилка сценарію"

--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -9,8 +9,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: MusicBrainz\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2017-01-18 12:51+0100\n"
-"PO-Revision-Date: 2017-01-19 09:17+0000\n"
+"POT-Creation-Date: 2017-03-05 09:58+0100\n"
+"PO-Revision-Date: 2017-03-05 10:00+0000\n"
 "Last-Translator: nikki\n"
 "Language-Team: Chinese (China) (http://www.transifex.com/musicbrainz/musicbrainz/language/zh_CN/)\n"
 "MIME-Version: 1.0\n"
@@ -57,26 +57,26 @@ msgstr ""
 msgid "Unmatched Files"
 msgstr ""

-#: picard/album.py:206
+#: picard/album.py:200
 #, python-format
 msgid "[could not load album %s]"
 msgstr "[无法载入专辑%s]"

-#: picard/album.py:295
+#: picard/album.py:289
 #, python-format
 msgid "Album %(id)s loaded: %(artist)s - %(album)s"
 msgstr ""

-#: picard/album.py:338
+#: picard/album.py:332
 #, python-format
 msgid "Loading album %(id)s ..."
 msgstr ""

-#: picard/album.py:342
+#: picard/album.py:336
 msgid "[loading album information]"
 msgstr "[载入专辑信息]"

-#: picard/album.py:527
+#: picard/album.py:523
 #, python-format
 msgid "; %i image"
 msgid_plural "; %i images"
@@ -97,70 +97,70 @@ msgstr ""
 msgid "Looking up the metadata for cluster %(album)s..."
 msgstr ""

-#: picard/collection.py:64
+#: picard/collection.py:67
 #, python-format
 msgid "Added %(count)i release to collection \"%(name)s\""
 msgid_plural "Added %(count)i releases to collection \"%(name)s\""
 msgstr[0] ""

-#: picard/collection.py:86
+#: picard/collection.py:89
 #, python-format
 msgid "Removed %(count)i release from collection \"%(name)s\""
 msgid_plural "Removed %(count)i releases from collection \"%(name)s\""
 msgstr[0] ""

-#: picard/collection.py:100
+#: picard/collection.py:104
 #, python-format
 msgid "Error loading collections: %(error)s"
 msgstr ""

-#: picard/config_upgrade.py:58 picard/config_upgrade.py:71
+#: picard/config_upgrade.py:57 picard/config_upgrade.py:70
 msgid "Various Artists file naming scheme removal"
 msgstr ""

-#: picard/config_upgrade.py:59
+#: picard/config_upgrade.py:58
 msgid ""
 "The separate file naming scheme for various artists albums has been removed in this version of Picard.\n"
 "Your file naming scheme has automatically been merged with that of single artist albums."
 msgstr ""

-#: picard/config_upgrade.py:72
+#: picard/config_upgrade.py:71
 msgid ""
 "The separate file naming scheme for various artists albums has been removed in this version of Picard.\n"
 "You currently do not use this option, but have a separate file naming scheme defined.\n"
 "Do you want to remove it or merge it with your file naming scheme for single artist albums?"
 msgstr ""

-#: picard/config_upgrade.py:78
+#: picard/config_upgrade.py:77
 msgid "Merge"
 msgstr ""

-#: picard/config_upgrade.py:78 picard/ui/metadatabox.py:314
+#: picard/config_upgrade.py:77 picard/ui/metadatabox.py:314
 #: picard/ui/options/interface.py:75 picard/ui/ui_options_interface.py:141
 msgid "Remove"
 msgstr ""

-#: picard/config_upgrade.py:193 picard/ui/options/scripting.py:28
+#: picard/config_upgrade.py:200 picard/ui/options/scripting.py:28
 #, python-format
 msgid "My script %d"
 msgstr ""

-#: picard/file.py:541
+#: picard/file.py:565
 #, python-format
 msgid "No matching tracks for file '%(filename)s'"
 msgstr ""

-#: picard/file.py:557
+#: picard/file.py:581
 #, python-format
 msgid "No matching tracks above the threshold for file '%(filename)s'"
 msgstr ""

-#: picard/file.py:564
+#: picard/file.py:588
 #, python-format
 msgid "File '%(filename)s' identified!"
 msgstr ""

-#: picard/file.py:584
+#: picard/file.py:608
 #, python-format
 msgid "Looking up the metadata for file %(filename)s ..."
 msgstr ""
@@ -203,22 +203,22 @@ msgstr ""
 msgid "[no release info]"
 msgstr ""

-#: picard/tagger.py:405 picard/tagger.py:438
+#: picard/tagger.py:407 picard/tagger.py:440
 #, python-format
 msgid "Adding %(count)d file from '%(directory)s' ..."
 msgid_plural "Adding %(count)d files from '%(directory)s' ..."
 msgstr[0] ""

-#: picard/tagger.py:597
+#: picard/tagger.py:599
 #, python-format
 msgid "Removing album %(id)s: %(artist)s - %(album)s"
 msgstr ""

-#: picard/tagger.py:613
+#: picard/tagger.py:615
 msgid "CD Lookup Error"
 msgstr ""

-#: picard/tagger.py:614
+#: picard/tagger.py:616
 #, python-format
 msgid ""
 "Error while reading CD:\n"
@@ -266,6 +266,10 @@ msgstr "法语"
 msgid "Italian"
 msgstr "意大利语"

+#: picard/const/languages.py:57
+msgid "Norwegian Bokmal"
+msgstr ""
+
 #: picard/const/languages.py:59
 msgid "Dutch"
 msgstr "荷兰语"
@@ -329,12 +333,12 @@ msgstr ""
 msgid "Whitelist"
 msgstr ""

-#: picard/ui/cdlookup.py:35 picard/ui/mainwindow.py:625 picard/util/tags.py:21
+#: picard/ui/cdlookup.py:35 picard/ui/mainwindow.py:626 picard/util/tags.py:21
 msgid "Album"
 msgstr "专辑"

-#: picard/ui/cdlookup.py:35 picard/ui/itemviews.py:96
-#: picard/ui/mainwindow.py:626 picard/ui/searchdialog.py:326
+#: picard/ui/cdlookup.py:35 picard/ui/itemviews.py:105
+#: picard/ui/mainwindow.py:627 picard/ui/searchdialog.py:326
 #: picard/ui/searchdialog.py:513 picard/util/tags.py:22
 msgid "Artist"
 msgstr "艺人"
@@ -367,10 +371,22 @@ msgid "%s (%i release)"
 msgid_plural "%s (%i releases)"
 msgstr[0] ""

-#: picard/ui/coverartbox.py:143
+#: picard/ui/coverartbox.py:141
 msgid "View release on MusicBrainz"
 msgstr ""

+#: picard/ui/coverartbox.py:174
+msgid "Show more details"
+msgstr ""
+
+#: picard/ui/coverartbox.py:199
+msgid "New Cover Art"
+msgstr ""
+
+#: picard/ui/coverartbox.py:200
+msgid "Original Cover Art"
+msgstr ""
+
 #: picard/ui/filebrowser.py:40
 msgid "&Move Tagged Files Here"
 msgstr ""
@@ -499,116 +515,116 @@ msgstr ""
 msgid "Pending requests"
 msgstr ""

-#: picard/ui/itemviews.py:94 picard/util/tags.py:23
+#: picard/ui/itemviews.py:103 picard/util/tags.py:23
 msgid "Title"
 msgstr "标题"

-#: picard/ui/itemviews.py:95 picard/ui/searchdialog.py:325
+#: picard/ui/itemviews.py:104 picard/ui/searchdialog.py:325
 #: picard/util/tags.py:87
 msgid "Length"
 msgstr "时长"

-#: picard/ui/itemviews.py:162
+#: picard/ui/itemviews.py:171
 msgid "Bad match"
 msgstr ""

-#: picard/ui/itemviews.py:163
+#: picard/ui/itemviews.py:172
 msgid "Poor match"
 msgstr ""

-#: picard/ui/itemviews.py:164
+#: picard/ui/itemviews.py:173
 msgid "Ok match"
 msgstr ""

-#: picard/ui/itemviews.py:165
+#: picard/ui/itemviews.py:174
 msgid "Good match"
 msgstr ""

-#: picard/ui/itemviews.py:166
+#: picard/ui/itemviews.py:175
 msgid "Great match"
 msgstr ""

-#: picard/ui/itemviews.py:167
+#: picard/ui/itemviews.py:176
 msgid "Excellent match"
 msgstr ""

-#: picard/ui/itemviews.py:243
+#: picard/ui/itemviews.py:252
 msgid "&Expand all"
 msgstr ""

-#: picard/ui/itemviews.py:245
+#: picard/ui/itemviews.py:254
 msgid "&Collapse all"
 msgstr ""

-#: picard/ui/itemviews.py:247
+#: picard/ui/itemviews.py:256
 msgid "Select &all"
 msgstr ""

-#: picard/ui/itemviews.py:249
+#: picard/ui/itemviews.py:258
 msgid "Ctrl+A"
 msgstr ""

-#: picard/ui/itemviews.py:315
+#: picard/ui/itemviews.py:324
 msgid "&Other versions"
 msgstr ""

-#: picard/ui/itemviews.py:318
+#: picard/ui/itemviews.py:327
 msgid "Loading..."
 msgstr "加载中..."

-#: picard/ui/itemviews.py:383
+#: picard/ui/itemviews.py:392
 msgid "Collections"
 msgstr ""

-#: picard/ui/itemviews.py:386
+#: picard/ui/itemviews.py:395
 msgid "P&lugins"
 msgstr ""

-#: picard/ui/itemviews.py:557
+#: picard/ui/itemviews.py:577
 msgid "file view"
 msgstr ""

-#: picard/ui/itemviews.py:558
+#: picard/ui/itemviews.py:578
 msgid "Contains unmatched files and clusters"
 msgstr ""

-#: picard/ui/itemviews.py:578
+#: picard/ui/itemviews.py:598
 msgid "Clusters"
 msgstr ""

-#: picard/ui/itemviews.py:587
+#: picard/ui/itemviews.py:607
 msgid "album view"
 msgstr ""

-#: picard/ui/itemviews.py:588
+#: picard/ui/itemviews.py:608
 msgid "Contains albums and matched files"
 msgstr ""

-#: picard/ui/itemviews.py:694 picard/ui/options/renaming.py:188
+#: picard/ui/itemviews.py:714 picard/ui/options/renaming.py:188
 msgid "Error"
 msgstr "错误"

-#: picard/ui/itemviews.py:698
+#: picard/ui/itemviews.py:718
 msgid "Album modified and complete"
 msgstr ""

-#: picard/ui/itemviews.py:701
+#: picard/ui/itemviews.py:721
 msgid "Album unchanged and complete"
 msgstr ""

-#: picard/ui/itemviews.py:705
+#: picard/ui/itemviews.py:725
 msgid "Album modified"
 msgstr ""

-#: picard/ui/itemviews.py:708
+#: picard/ui/itemviews.py:728
 msgid "Album unchanged"
 msgstr ""

-#: picard/ui/itemviews.py:811
+#: picard/ui/itemviews.py:831
 msgid "Track saved"
 msgstr ""

-#: picard/ui/itemviews.py:813 picard/ui/itemviews.py:817
+#: picard/ui/itemviews.py:833 picard/ui/itemviews.py:837
 msgid "Pending"
 msgstr ""

@@ -798,7 +814,7 @@ msgstr "Ctrl+B"
 msgid "&Cover Art"
 msgstr "封面图像(&A)"

-#: picard/ui/mainwindow.py:407 picard/ui/mainwindow.py:619
+#: picard/ui/mainwindow.py:407 picard/ui/mainwindow.py:620
 #: picard/ui/searchdialog.py:71
 msgid "Search"
 msgstr "搜索"
@@ -825,175 +841,179 @@ msgid ""
 "even if they have no metadata"
 msgstr ""

-#: picard/ui/mainwindow.py:421
+#: picard/ui/mainwindow.py:420
+msgid "Identify the file using its AcoustID audio fingerprint"
+msgstr ""
+
+#: picard/ui/mainwindow.py:422
 msgid "Ctrl+Y"
 msgstr "Ctrl+Y"

-#: picard/ui/mainwindow.py:424
+#: picard/ui/mainwindow.py:425
 msgid "Cl&uster"
 msgstr ""

-#: picard/ui/mainwindow.py:425
+#: picard/ui/mainwindow.py:426
 msgid "Cluster files into album clusters"
 msgstr ""

-#: picard/ui/mainwindow.py:428
+#: picard/ui/mainwindow.py:429
 msgid "Ctrl+U"
 msgstr "Ctrl+U"

-#: picard/ui/mainwindow.py:431
+#: picard/ui/mainwindow.py:432
 msgid "&Lookup"
 msgstr ""

-#: picard/ui/mainwindow.py:432
+#: picard/ui/mainwindow.py:433
 msgid "Lookup selected items in MusicBrainz"
 msgstr ""

-#: picard/ui/mainwindow.py:437
+#: picard/ui/mainwindow.py:438
 msgid "Ctrl+L"
 msgstr "Ctrl+L"

-#: picard/ui/mainwindow.py:440
+#: picard/ui/mainwindow.py:441
 msgid "&Info..."
 msgstr ""

-#: picard/ui/mainwindow.py:443
+#: picard/ui/mainwindow.py:444
 msgid "Ctrl+I"
 msgstr ""

-#: picard/ui/mainwindow.py:446
+#: picard/ui/mainwindow.py:447
 msgid "&Refresh"
 msgstr "刷新(&R)"

-#: picard/ui/mainwindow.py:447
+#: picard/ui/mainwindow.py:448
 msgid "Ctrl+R"
 msgstr ""

-#: picard/ui/mainwindow.py:450
+#: picard/ui/mainwindow.py:451
 msgid "&Rename Files"
 msgstr "重命名(&R)"

-#: picard/ui/mainwindow.py:455
+#: picard/ui/mainwindow.py:456
 msgid "&Move Files"
 msgstr ""

-#: picard/ui/mainwindow.py:460
+#: picard/ui/mainwindow.py:461
 msgid "Save &Tags"
 msgstr ""

-#: picard/ui/mainwindow.py:465
+#: picard/ui/mainwindow.py:466
 msgid "Tags From &File Names..."
 msgstr "将文件名转变标签(&F)..."

-#: picard/ui/mainwindow.py:469
+#: picard/ui/mainwindow.py:470
 msgid "&Open My Collections in Browser"
 msgstr ""

-#: picard/ui/mainwindow.py:473
+#: picard/ui/mainwindow.py:474
 msgid "View Error/Debug &Log"
 msgstr ""

-#: picard/ui/mainwindow.py:476
+#: picard/ui/mainwindow.py:477
 msgid "View Activity &History"
 msgstr ""

-#: picard/ui/mainwindow.py:483
+#: picard/ui/mainwindow.py:484
 msgid "Open in &Player"
 msgstr ""

-#: picard/ui/mainwindow.py:484
+#: picard/ui/mainwindow.py:485
 msgid "Play the file in your default media player"
 msgstr ""

-#: picard/ui/mainwindow.py:488
+#: picard/ui/mainwindow.py:489
 msgid "Open Containing &Folder"
 msgstr ""

-#: picard/ui/mainwindow.py:489
+#: picard/ui/mainwindow.py:490
 msgid "Open the containing folder in your file explorer"
 msgstr ""

-#: picard/ui/mainwindow.py:518
+#: picard/ui/mainwindow.py:519
 msgid "&File"
 msgstr "文件(&F)"

-#: picard/ui/mainwindow.py:529
+#: picard/ui/mainwindow.py:530
 msgid "&Edit"
 msgstr "编辑(&E)"

-#: picard/ui/mainwindow.py:535
+#: picard/ui/mainwindow.py:536
 msgid "&View"
 msgstr "查看 (&V)"

-#: picard/ui/mainwindow.py:541
+#: picard/ui/mainwindow.py:542
 msgid "&Options"
 msgstr "选项(&O)"

-#: picard/ui/mainwindow.py:547
+#: picard/ui/mainwindow.py:548
 msgid "&Tools"
 msgstr "工具(&T)"

-#: picard/ui/mainwindow.py:558 picard/ui/util.py:35
+#: picard/ui/mainwindow.py:559 picard/ui/util.py:35
 msgid "&Help"
 msgstr "帮助(&H)"

-#: picard/ui/mainwindow.py:586
+#: picard/ui/mainwindow.py:587
 msgid "Actions"
 msgstr ""

-#: picard/ui/mainwindow.py:627
+#: picard/ui/mainwindow.py:628
 msgid "Track"
 msgstr "音轨"

-#: picard/ui/mainwindow.py:703
+#: picard/ui/mainwindow.py:704
 msgid "All Supported Formats"
 msgstr "全部支持的格式"

-#: picard/ui/mainwindow.py:730
+#: picard/ui/mainwindow.py:731
 #, python-format
 msgid "Adding multiple directories from '%(directory)s' ..."
 msgstr ""

-#: picard/ui/mainwindow.py:735
+#: picard/ui/mainwindow.py:736
 #, python-format
 msgid "Adding directory: '%(directory)s' ..."
 msgstr ""

-#: picard/ui/mainwindow.py:801
+#: picard/ui/mainwindow.py:809
 msgid "Configuration Required"
 msgstr ""

-#: picard/ui/mainwindow.py:802
+#: picard/ui/mainwindow.py:810
 msgid ""
 "Audio fingerprinting is not yet configured. Would you like to configure it "
 "now?"
 msgstr ""

-#: picard/ui/mainwindow.py:902
+#: picard/ui/mainwindow.py:916
 #, python-format
 msgid "%(filename)s (error: %(error)s)"
 msgstr ""

-#: picard/ui/mainwindow.py:908
+#: picard/ui/mainwindow.py:922
 #, python-format
 msgid "%(filename)s"
 msgstr ""

-#: picard/ui/mainwindow.py:918
+#: picard/ui/mainwindow.py:933
 #, python-format
 msgid "%(filename)s (%(similarity)d%%) (error: %(error)s)"
 msgstr ""

-#: picard/ui/mainwindow.py:925
+#: picard/ui/mainwindow.py:940
 #, python-format
 msgid "%(filename)s (%(similarity)d%%)"
 msgstr ""

-#: picard/ui/mainwindow.py:961
+#: picard/ui/mainwindow.py:976
 msgid "Authentication Required"
 msgstr ""

-#: picard/ui/mainwindow.py:962
+#: picard/ui/mainwindow.py:977
 msgid ""
 "Picard needs authorization to access your personal data on the MusicBrainz "
 "server. Would you like to log in now?"
@@ -1099,7 +1119,7 @@ msgstr ""
 msgid "Retry"
 msgstr ""

-#: picard/ui/searchdialog.py:288
+#: picard/ui/searchdialog.py:283
 #, python-format
 msgid ""
 "<strong>Following error occurred while fetching "
@@ -1903,19 +1923,19 @@ msgstr ""
 msgid "Reset all settings for current option page"
 msgstr ""

-#: picard/ui/options/dialog.py:166
+#: picard/ui/options/dialog.py:172
 msgid "You are about to reset your options for this page."
 msgstr ""

-#: picard/ui/options/dialog.py:170
+#: picard/ui/options/dialog.py:176
 msgid "Warning! This will reset all of your settings."
 msgstr ""

-#: picard/ui/options/dialog.py:177
+#: picard/ui/options/dialog.py:183
 msgid "Confirm Reset"
 msgstr ""

-#: picard/ui/options/dialog.py:178
+#: picard/ui/options/dialog.py:184
 msgid "Are you sure?"
 msgstr ""

@@ -2086,7 +2106,7 @@ msgstr ""
 msgid "File Naming"
 msgstr ""

-#: picard/ui/options/renaming.py:175 picard/ui/options/scripting.py:406
+#: picard/ui/options/renaming.py:175 picard/ui/options/scripting.py:410
 msgid ""
 "<a href=\"%(picard-doc-scripting-url)s\">Open Scripting Documentation in "
 "your browser</a>"
@@ -2128,15 +2148,15 @@ msgstr ""
 msgid "Scripting"
 msgstr ""

-#: picard/ui/options/scripting.py:292
+#: picard/ui/options/scripting.py:293
 msgid "Are you sure you want to remove this script?"
 msgstr ""

-#: picard/ui/options/scripting.py:293
+#: picard/ui/options/scripting.py:294
 msgid "Confirm Remove"
 msgstr ""

-#: picard/ui/options/scripting.py:376
+#: picard/ui/options/scripting.py:377
 msgid "Script Error"
 msgstr ""

--- a/po/zh_TW.po
+++ b/po/zh_TW.po
--- a/resources/makeqrc.py
+++ b/resources/makeqrc.py
@@ -18,7 +18,7 @@ def tryint(s):


 def natsort_key(s):
-    return [ tryint(c) for c in re.split('(\d+)', s) ]
+    return [ tryint(c) for c in re.split(r'(\d+)', s) ]


 def find_files(topdir, directory, patterns):
--- a/scripts/package-osx.md
+++ b/scripts/package-osx.md
@@ -11,6 +11,10 @@ Download the required packages:

 Open the Qt DMG image, click on `Qt.mpkg` and proceed with the install using the defaults for everything.

+Build PyObjC:
+
+    pip install pyobjc-framework-Cocoa
+
 Build SIP:

    tar -C /tmp -xf ~/Downloads/sip-4.19.tar.gz
--- a/scripts/package-osx.sh
+++ b/scripts/package-osx.sh
@@ -16,7 +16,7 @@ virtualenv -p python2.7 --system-site-packages e

 pip install mutagen==$MUTAGEN_VERSION
 pip install discid==$PYTHON_DISCID_VERSION
-pip install py2app
+pip install py2app==$PY2APP_VERSION

 perl -pi -e 's{plugin_dir = (.*)$}{plugin_dir = "/Developer/Applications/Qt/plugins"}' e/lib/python2.7/site-packages/py2app/recipes/sip.py

--- a/scripts/package-win.bat
+++ b/scripts/package-win.bat
@@ -26,7 +26,7 @@ set PATH=%CI_PROJECT_DIR%\e\scripts;%PATH%
 pip install mutagen==%MUTAGEN_VERSION%
 pip install discid==%PYTHON_DISCID_VERSION%

-if NOT "%CI_BUILD_TAG%" == "" python setup.py patch_version --platform=win
+if "%CI_BUILD_TAG%" == "" python setup.py patch_version --platform=win

 rmdir /S /Q dist build locale
 python setup.py clean
--- a/scripts/setup-osx.sh
+++ b/scripts/setup-osx.sh
@@ -0,0 +1,11 @@
+brew tap cartr/qt4
+brew tap-pin cartr/qt4
+brew install gettext
+brew link gettext --force
+brew install qt
+brew install pyqt
+brew install libdiscid 
+pip install mutagen
+pip install discid
+pip install py2app
+pip install pyobjc-framework-Cocoa
--- a/Show More
+++ b/Show More