diff --git a/picard/coverart.py b/picard/coverart.py
index fef104838..fbbf45bd2 100644
--- a/picard/coverart.py
+++ b/picard/coverart.py
@@ -26,7 +26,7 @@ import re
 import traceback
 from functools import partial
 from picard import config, log
-from picard.metadata import Image, is_front_image
+from picard.metadata import is_front_image
 from picard.util import mimetype, parse_amazon_url
 from picard.const import CAA_HOST, CAA_PORT
 from PyQt4.QtCore import QUrl, QObject
@@ -101,21 +101,9 @@ def _coverart_downloaded(album, metadata, release, try_list, coverinfos, data, h
         filename = None
         if not is_front_image(coverinfos) and config.setting["caa_image_type_as_filename"]:
             filename = coverinfos['type']
-
-        try:
-            metadata.make_and_add_image(mime, data,
-                                        imagetype=coverinfos['type'],
-                                        comment=coverinfos['desc'])
-            for track in album._new_tracks:
-                track.metadata.make_and_add_image(mime, data,
-                                                  imagetype=coverinfos['type'],
-                                                  comment=coverinfos['desc'])
-        except (IOError, OSError), e:
-            album.error_append(e.message)
-            album._finalize_loading(error=True)
-            # It doesn't make sense to store/download more images if we can't
-            # save them in the temporary folder, abort.
-            return
+        metadata.add_image(mime, data, filename, coverinfos)
+        for track in album._new_tracks:
+            track.metadata.add_image(mime, data, filename, coverinfos)
 
     # If the image already was a front image, there might still be some
     # other front images in the try_list - remove them.
diff --git a/picard/file.py b/picard/file.py
index 6bc55dc04..fb225b612 100644
--- a/picard/file.py
+++ b/picard/file.py
@@ -314,13 +314,60 @@ class File(QtCore.QObject, Item):
         shutil.move(encode_filename(old_filename), encode_filename(new_filename))
         return new_filename
 
+    def _make_image_filename(self, image_filename, dirname, metadata):
+        image_filename = self._script_to_filename(image_filename, metadata)
+        if not image_filename:
+            image_filename = "cover"
+        if os.path.isabs(image_filename):
+            filename = image_filename
+        else:
+            filename = os.path.join(dirname, image_filename)
+        if config.setting['windows_compatibility'] or sys.platform == 'win32':
+            filename = filename.replace('./', '_/').replace('.\\', '_\\')
+        return encode_filename(filename)
+
     def _save_images(self, dirname, metadata):
         """Save the cover images to disk."""
         if not metadata.images:
             return
+        default_filename = self._make_image_filename(
+            config.setting["cover_image_filename"], dirname, metadata)
+        overwrite = config.setting["save_images_overwrite"]
         counters = defaultdict(lambda: 0)
         for image in metadata.images:
-            image.save(dirname, metadata, counters)
+            filename = image["filename"]
+            data = image["data"]
+            mime = image["mime"]
+            if filename is None:
+                filename = default_filename
+            else:
+                filename = self._make_image_filename(filename, dirname, metadata)
+            image_filename = filename
+            ext = mimetype.get_extension(mime, ".jpg")
+            if counters[filename] > 0:
+                image_filename = "%s (%d)" % (filename, counters[filename])
+            counters[filename] = counters[filename] + 1
+            while os.path.exists(image_filename + ext) and not overwrite:
+                if os.path.getsize(image_filename + ext) == len(data):
+                    log.debug("Identical file size, not saving %r", image_filename)
+                    break
+                image_filename = "%s (%d)" % (filename, counters[filename])
+                counters[filename] = counters[filename] + 1
+            else:
+                new_filename = image_filename + ext
+                # Even if overwrite is enabled we don't need to write the same
+                # image multiple times
+                if (os.path.exists(new_filename) and
+                    os.path.getsize(new_filename) == len(data)):
+                    log.debug("Identical file size, not saving %r", image_filename)
+                    continue
+                log.debug("Saving cover images to %r", image_filename)
+                new_dirname = os.path.dirname(image_filename)
+                if not os.path.isdir(new_dirname):
+                    os.makedirs(new_dirname)
+                f = open(image_filename + ext, "wb")
+                f.write(data)
+                f.close()
 
     def _move_additional_files(self, old_filename, new_filename):
         """Move extra files, like playlists..."""
diff --git a/picard/formats/apev2.py b/picard/formats/apev2.py
index e358e5a1c..eadcce5de 100644
--- a/picard/formats/apev2.py
+++ b/picard/formats/apev2.py
@@ -63,7 +63,7 @@ class APEv2File(File):
                     if '\0' in values.value:
                         descr, data = values.value.split('\0', 1)
                         mime = mimetype.get_from_data(data, descr, 'image/jpeg')
-                        metadata.make_and_add_image(mime, data)
+                        metadata.add_image(mime, data)
                 # skip EXTERNAL and BINARY values
                 if values.kind != mutagen.apev2.TEXT:
                     continue
@@ -150,8 +150,8 @@ class APEv2File(File):
                 if not save_this_image_to_tags(image):
                     continue
                 cover_filename = 'Cover Art (Front)'
-                cover_filename += mimetype.get_extension(image.mimetype, '.jpg')
-                tags['Cover Art (Front)'] = mutagen.apev2.APEValue(cover_filename + '\0' + image.data, mutagen.apev2.BINARY)
+                cover_filename += mimetype.get_extension(image["mime"], '.jpg')
+                tags['Cover Art (Front)'] = mutagen.apev2.APEValue(cover_filename + '\0' + image["data"], mutagen.apev2.BINARY)
                 break  # can't save more than one item with the same name
                        # (mp3tags does this, but it's against the specs)
         tags.save(encode_filename(filename))
diff --git a/picard/formats/asf.py b/picard/formats/asf.py
index e5357531b..f78ff782c 100644
--- a/picard/formats/asf.py
+++ b/picard/formats/asf.py
@@ -140,8 +140,11 @@ class ASFFile(File):
             if name == 'WM/Picture':
                 for image in values:
                     (mime, data, type, description) = unpack_image(image.value)
-                    metadata.make_and_add_image(mime, data, comment=description,
-                                       imagetype=image_type_from_id3_num(type))
+                    extras = {
+                        'desc': description,
+                        'type': image_type_from_id3_num(type)
+                    }
+                    metadata.add_image(mime, data, extras=extras)
                 continue
             elif name not in self.__RTRANS:
                 continue
@@ -166,9 +169,9 @@ class ASFFile(File):
             for image in metadata.images:
                 if not save_this_image_to_tags(image):
                     continue
-                tag_data = pack_image(image.mimetype, image.data,
-                                      image_type_as_id3_num(image.imagetype),
-                                      image.description)
+                tag_data = pack_image(image["mime"], image["data"],
+                                      image_type_as_id3_num(image['type']),
+                                      image['desc'])
                 cover.append(ASFByteArrayAttribute(tag_data))
             if cover:
                 file.tags['WM/Picture'] = cover
diff --git a/picard/formats/id3.py b/picard/formats/id3.py
index 3d0158fdb..a1acf327b 100644
--- a/picard/formats/id3.py
+++ b/picard/formats/id3.py
@@ -249,8 +249,11 @@ class ID3File(File):
                 else:
                     metadata['discnumber'] = value[0]
             elif frameid == 'APIC':
-                metadata.make_and_add_image(frame.mime, frame.data, comment=frame.desc,
-                                   imagetype=image_type_from_id3_num(frame.type))
+                extras = {
+                    'desc': frame.desc,
+                    'type': image_type_from_id3_num(frame.type)
+                }
+                metadata.add_image(frame.mime, frame.data, extras=extras)
             elif frameid == 'POPM':
                 # Rating in ID3 ranges from 0 to 255, normalize this to the range 0 to 5
                 if frame.email == config.setting['rating_user_email']:
@@ -305,7 +308,7 @@ class ID3File(File):
             # any description.
             counters = defaultdict(lambda: 0)
             for image in metadata.images:
-                desc = desctag = image.description
+                desc = desctag = image['desc']
                 if not save_this_image_to_tags(image):
                     continue
                 if counters[desc] > 0:
@@ -315,10 +318,10 @@ class ID3File(File):
                         desctag = "(%i)" % counters[desc]
                 counters[desc] += 1
                 tags.add(id3.APIC(encoding=0,
-                                  mime=image.mimetype,
-                                  type=image_type_as_id3_num(image.imagetype),
+                                  mime=image["mime"],
+                                  type=image_type_as_id3_num(image['type']),
                                   desc=desctag,
-                                  data=image.data))
+                                  data=image["data"]))
 
         tmcl = mutagen.id3.TMCL(encoding=encoding, people=[])
         tipl = mutagen.id3.TIPL(encoding=encoding, people=[])
diff --git a/picard/formats/mp4.py b/picard/formats/mp4.py
index 576f92cf4..91df4fed4 100644
--- a/picard/formats/mp4.py
+++ b/picard/formats/mp4.py
@@ -141,9 +141,9 @@ class MP4File(File):
             elif name == "covr":
                 for value in values:
                     if value.imageformat == value.FORMAT_JPEG:
-                        metadata.make_and_add_image("image/jpeg", value)
+                        metadata.add_image("image/jpeg", value)
                     elif value.imageformat == value.FORMAT_PNG:
-                        metadata.make_and_add_image("image/png", value)
+                        metadata.add_image("image/png", value)
 
         self._info(metadata, file)
         return metadata
@@ -194,11 +194,11 @@ class MP4File(File):
             for image in metadata.images:
                 if not save_this_image_to_tags(image):
                     continue
-                mime = image.mimetype
+                mime = image["mime"]
                 if mime == "image/jpeg":
-                    covr.append(MP4Cover(image.data, MP4Cover.FORMAT_JPEG))
+                    covr.append(MP4Cover(image["data"], MP4Cover.FORMAT_JPEG))
                 elif mime == "image/png":
-                    covr.append(MP4Cover(image.data, MP4Cover.FORMAT_PNG))
+                    covr.append(MP4Cover(image["data"], MP4Cover.FORMAT_PNG))
             if covr:
                 file.tags["covr"] = covr
 
diff --git a/picard/formats/vorbis.py b/picard/formats/vorbis.py
index 7635997ec..538005ec3 100644
--- a/picard/formats/vorbis.py
+++ b/picard/formats/vorbis.py
@@ -96,22 +96,27 @@ class VCommentFile(File):
                     name = "totaldiscs"
                 elif name == "metadata_block_picture":
                     image = mutagen.flac.Picture(base64.standard_b64decode(value))
-                    metadata.make_and_add_image(image.mime, image.data,
-                                       comment=image.desc,
-                                       imagetype=image_type_from_id3_num(image.type))
+                    extras = {
+                        'desc': image.desc,
+                        'type': image_type_from_id3_num(image.type)
+                    }
+                    metadata.add_image(image.mime, image.data, extras=extras)
                     continue
                 elif name in self.__translate:
                     name = self.__translate[name]
                 metadata.add(name, value)
         if self._File == mutagen.flac.FLAC:
             for image in file.pictures:
-                metadata.make_and_add_image(image.mime, image.data, comment=image.desc,
-                                   imagetype=image_type_from_id3_num(image.type))
+                extras = {
+                    'desc': image.desc,
+                    'type': image_type_from_id3_num(image.type)
+                }
+                metadata.add_image(image.mime, image.data, extras=extras)
         # Read the unofficial COVERART tags, for backward compatibillity only
         if not "metadata_block_picture" in file.tags:
             try:
                 for index, data in enumerate(file["COVERART"]):
-                    metadata.make_and_add_image(file["COVERARTMIME"][index],
+                    metadata.add_image(file["COVERARTMIME"][index],
                                        base64.standard_b64decode(data)
                                        )
             except KeyError:
@@ -170,10 +175,10 @@ class VCommentFile(File):
                 if not save_this_image_to_tags(image):
                     continue
                 picture = mutagen.flac.Picture()
-                picture.data = image.data
-                picture.mime = image.mimetype
-                picture.desc = image.description
-                picture.type = image_type_as_id3_num(image.imagetype)
+                picture.data = image["data"]
+                picture.mime = image["mime"]
+                picture.desc = image['desc']
+                picture.type = image_type_as_id3_num(image['type'])
                 if self._File == mutagen.flac.FLAC:
                     file.add_picture(picture)
                 else:
diff --git a/picard/metadata.py b/picard/metadata.py
index 1c5293e59..a70b79b49 100644
--- a/picard/metadata.py
+++ b/picard/metadata.py
@@ -15,29 +15,13 @@
 #
 # 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.
-import os.path
-import shutil
-import sys
-import tempfile
-import traceback
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 
-
-from hashlib import md5
-from os import fdopen, unlink
 from PyQt4.QtCore import QObject
-from picard import config, log
+from picard import config
 from picard.plugin import ExtensionPoint
 from picard.similarity import similarity2
-from picard.util import (
-    encode_filename,
-    load_release_type_scores,
-    mimetype as mime,
-    replace_non_ascii,
-    replace_win32_incompat,
-    unaccent,
-)
+from picard.util import load_release_type_scores
 from picard.mbxml import artist_credit_from_node
 
 MULTI_VALUED_JOINER = '; '
@@ -55,99 +39,9 @@ def is_front_image(image):
 def save_this_image_to_tags(image):
     if not config.setting["save_only_front_images_to_tags"]:
         return True
-    return image.is_front_image
-
-
-class Image(object):
-    """Wrapper around images. Instantiating an object of this class can raise
-    an IOError or OSError due to the usage of tempfiles underneath.
-    """
-
-    def __init__(self, data, mimetype="image/jpeg", imagetype="front",
-                 comment=""):
-        self.description = comment
-        (fd, self._filename) = tempfile.mkstemp(prefix="picard")
-        with fdopen(fd, "wb") as imagefile:
-            imagefile.write(data)
-        self.datalength = len(data)
-        self.imagetype = imagetype
-        self.is_front_image = imagetype == "front"
-        self.mimetype = mimetype
-        self.extension = mime.get_extension(mime, ".jpg")
-
-    def _make_image_filename(self, filename, dirname, metadata):
-        if config.setting["ascii_filenames"]:
-            if isinstance(filename, unicode):
-                filename = unaccent(filename)
-            filename = replace_non_ascii(filename)
-        if not filename:
-            filename = "cover"
-        if not os.path.isabs(filename):
-            filename = os.path.join(dirname, filename)
-        # replace incompatible characters
-        if config.setting["windows_compatibility"] or sys.platform == "win32":
-            filename = replace_win32_incompat(filename)
-        # remove null characters
-        filename = filename.replace("\x00", "")
-        return encode_filename(filename)
-
-    def save(self, dirname, metadata, counters):
-        """Saves this image.
-
-        :dirname: The name of the directory that contains the audio file
-        :metadata: A metadata object
-        :counters: A dictionary mapping filenames to the amount of how many
-                    images with that filename were already saved in `dirname`.
-        """
-        if config.setting["caa_image_type_as_filename"]:
-            log.debug("Using image type %s", self.imagetype)
-            filename = self._make_image_filename(self.imagetype, dirname, metadata)
-        else:
-            log.debug("Using default file name %s",
-                      config.setting["cover_image_filename"])
-            filename = self._make_image_filename(
-                config.setting["cover_image_filename"], dirname, metadata)
-
-        overwrite = config.setting["save_images_overwrite"]
-        ext = self.extension
-        image_filename = filename
-        if counters[filename] > 0:
-            image_filename = "%s (%d)" % (filename, counters[filename])
-        counters[filename] = counters[filename] + 1
-        while os.path.exists(image_filename + ext) and not overwrite:
-            if os.path.getsize(image_filename + ext) == self.datalength:
-                log.debug("Identical file size, not saving %r", image_filename)
-                break
-            image_filename = "%s (%d)" % (filename, counters[filename])
-            counters[filename] = counters[filename] + 1
-        else:
-            new_filename = image_filename + ext
-            # Even if overwrite is enabled we don't need to write the same
-            # image multiple times
-            if (os.path.exists(new_filename) and
-                os.path.getsize(new_filename) == self.datalength):
-                    log.debug("Identical file size, not saving %r", image_filename)
-                    return
-            log.debug("Saving cover images to %r", image_filename)
-            new_dirname = os.path.dirname(image_filename)
-            if not os.path.isdir(new_dirname):
-                os.makedirs(new_dirname)
-            shutil.copyfile(self._filename, image_filename)
-
-    @property
-    def data(self):
-        """Reads the data from the temporary file created for this image. May
-        raise IOErrors or OSErrors.
-        """
-        with open(self._filename, "rb") as imagefile:
-            return imagefile.read()
-
-    def _delete(self):
-        log.debug("Unlinking %s", self._filename)
-        try:
-            unlink(self._filename)
-        except OSError, e:
-            log.error(traceback.format_exc())
+    if is_front_image(image):
+        return True
+    return False
 
 
 class Metadata(dict):
@@ -167,27 +61,26 @@ class Metadata(dict):
         self.images = []
         self.length = 0
 
-    def make_and_add_image(self, mime, data, filename=None, comment="",
-                           imagetype="front"):
-        """Build a new image object from ``data`` and adds it to this Metadata
-        object. If an image with the same MD5 hash has already been added to
-        any Metadata object, that file will be reused.
+    def add_image(self, mime, data, filename=None, extras=None):
+        """Adds the image ``data`` to this Metadata object.
 
         Arguments:
         mime -- The mimetype of the image
         data -- The image data
         filename -- The image filename, without an extension
-        comment -- image description or comment, default to ''
-        imagetype -- main type as a string, default to 'front'
+        extras -- extra informations about image as dict
+            'desc' : image description or comment, default to ''
+            'type' : main type as a string, default to 'front'
+            'front': if set, CAA front flag is true for this image
         """
-        m = md5()
-        m.update(data)
-        datahash = m.hexdigest()
-        image = QObject.tagger.images[datahash]
-        if image is None:
-            image = Image(data, mime, imagetype, comment)
-        QObject.tagger.images[datahash] = image
-        self.images.append(image)
+        imagedict = {'mime': mime,
+                     'data': data,
+                     'filename': filename,
+                     'type': 'front',
+                     'desc': ''}
+        if extras is not None:
+            imagedict.update(extras)
+        self.images.append(imagedict)
 
     def remove_image(self, index):
         self.images.pop(index)
diff --git a/picard/tagger.py b/picard/tagger.py
index 78790e926..1180ce853 100644
--- a/picard/tagger.py
+++ b/picard/tagger.py
@@ -30,9 +30,7 @@ import os.path
 import re
 import shutil
 import signal
-import socket
 import sys
-from collections import defaultdict
 from functools import partial
 from itertools import chain
 
@@ -109,18 +107,6 @@ class Tagger(QtGui.QApplication):
         self.save_thread_pool = QtCore.QThreadPool(self)
         self.save_thread_pool.setMaxThreadCount(1)
 
-        if not sys.platform == "win32":
-            # Set up signal handling
-            self.signalfd = socket.socketpair(socket.AF_UNIX, socket.SOCK_STREAM, 0)
-
-            self.signalnotifier = QtCore.QSocketNotifier(self.signalfd[1].fileno(),
-                                                         QtCore.QSocketNotifier.Read, self)
-            self.signalnotifier.activated.connect(self.sighandler)
-
-            signal.signal(signal.SIGHUP, self.signal)
-            signal.signal(signal.SIGINT, self.signal)
-            signal.signal(signal.SIGTERM, self.signal)
-
         # Setup logging
         if debug or "PICARD_DEBUG" in os.environ:
             log.log_levels = log.log_levels | log.LOG_DEBUG
@@ -179,7 +165,6 @@ class Tagger(QtGui.QApplication):
         self.albums = {}
         self.release_groups = {}
         self.mbid_redirects = {}
-        self.images = defaultdict(lambda: None)
         self.unmatched_files = UnmatchedFiles()
         self.nats = None
         self.window = MainWindow()
@@ -220,8 +205,6 @@ class Tagger(QtGui.QApplication):
             self.nats.update()
 
     def exit(self):
-        log.debug("exit")
-        map(lambda i: i._delete(), self.images.itervalues())
         self.stopping = True
         self._acoustid.done()
         self.thread_pool.waitForDone()
@@ -560,16 +543,6 @@ class Tagger(QtGui.QApplication):
     def instance(cls):
         return cls.__instance
 
-    def signal(self, signum, frame):
-        log.debug("signal %i received", signum)
-        self.signalfd[0].sendall("a")
-
-    def sighandler(self):
-        self.signalnotifier.setEnabled(False)
-        self.exit()
-        self.quit()
-        self.signalnotifier.setEnabled(True)
-
 
 def help():
     print """Usage: %s [OPTIONS] [FILE] [FILE] ...
diff --git a/picard/ui/coverartbox.py b/picard/ui/coverartbox.py
index 1e2c6cc37..475fbb905 100644
--- a/picard/ui/coverartbox.py
+++ b/picard/ui/coverartbox.py
@@ -23,6 +23,7 @@ from picard import config, log
 from picard.album import Album
 from picard.track import Track
 from picard.file import File
+from picard.metadata import is_front_image
 from picard.util import webbrowser2, encode_filename
 
 
@@ -103,7 +104,7 @@ class CoverArtBox(QtGui.QGroupBox):
         if self.data:
             if pixmap is None:
                 pixmap = QtGui.QPixmap()
-                pixmap.loadFromData(self.data.data)
+                pixmap.loadFromData(self.data["data"])
             if not pixmap.isNull():
                 offx, offy, w, h = (1, 1, 121, 121)
                 cover = QtGui.QPixmap(self.shadow)
@@ -122,7 +123,7 @@ class CoverArtBox(QtGui.QGroupBox):
         data = None
         if metadata and metadata.images:
             for image in metadata.images:
-                if image.is_front_image:
+                if is_front_image(image):
                     data = image
                     break
             else:
@@ -184,16 +185,16 @@ class CoverArtBox(QtGui.QGroupBox):
         self.__set_data([mime, data], pixmap=pixmap)
         if isinstance(self.item, Album):
             album = self.item
-            album.metadata.make_and_add_image(mime, data)
+            album.metadata.add_image(mime, data)
             for track in album.tracks:
-                track.metadata.make_and_add_image(mime, data)
+                track.metadata.add_image(mime, data)
             for file in album.iterfiles():
-                file.metadata.make_and_add_image(mime, data)
+                file.metadata.add_image(mime, data)
         elif isinstance(self.item, Track):
             track = self.item
-            track.metadata.make_and_add_image(mime, data)
+            track.metadata.add_image(mime, data)
             for file in track.iterfiles():
-                file.metadata.make_and_add_image(mime, data)
+                file.metadata.add_image(mime, data)
         elif isinstance(self.item, File):
             file = self.item
-            file.metadata.make_and_add_image(mime, data)
+            file.metadata.add_image(mime, data)
diff --git a/picard/ui/infodialog.py b/picard/ui/infodialog.py
index 6e151afe9..b45f98f3c 100644
--- a/picard/ui/infodialog.py
+++ b/picard/ui/infodialog.py
@@ -18,9 +18,7 @@
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 
 import os.path
-import traceback
 from PyQt4 import QtGui, QtCore
-from picard import log
 from picard.util import format_time, encode_filename, bytes2human
 from picard.ui.ui_infodialog import Ui_InfoDialog
 
@@ -49,11 +47,7 @@ class InfoDialog(QtGui.QDialog):
             return
 
         for image in images:
-            try:
-                data = image.data
-            except (OSError, IOError), e:
-                log.error(traceback.format_exc())
-                continue
+            data = image["data"]
             size = len(data)
             item = QtGui.QListWidgetItem()
             pixmap = QtGui.QPixmap()
diff --git a/po/countries/et.po b/po/countries/et.po
index 8c5fd26cd..86ee7ec23 100644
--- a/po/countries/et.po
+++ b/po/countries/et.po
@@ -306,11 +306,7 @@ msgstr "Tšehhi"
 #. iso.code:XC
 #: DBarea JOIN iso_3166_1 iso on iso.area = area.id/area.name:245
 msgid "Czechoslovakia"
-<<<<<<< HEAD
 msgstr "Tšehhoslovakkia"
-=======
-msgstr "Tšehhoslovakkia (ajalooline, 1918–1992)"
->>>>>>> image-class
 
 #. iso.code:CI
 #: DBarea JOIN iso_3166_1 iso on iso.area = area.id/area.name:52
@@ -345,11 +341,7 @@ msgstr "Dominikaani Vabariik"
 #. iso.code:XG
 #: DBarea JOIN iso_3166_1 iso on iso.area = area.id/area.name:244
 msgid "East Germany"
-<<<<<<< HEAD
 msgstr "Ida-Saksamaa"
-=======
-msgstr "Ida-Saksamaa (ajalooline, 1949–1990)"
->>>>>>> image-class
 
 #. iso.code:EC
 #: DBarea JOIN iso_3166_1 iso on iso.area = area.id/area.name:62
@@ -814,11 +806,7 @@ msgstr "Holland"
 #. iso.code:AN
 #: DBarea JOIN iso_3166_1 iso on iso.area = area.id/area.name:151
 msgid "Netherlands Antilles"
-<<<<<<< HEAD
 msgstr "Hollandi Antillid"
-=======
-msgstr "Hollandi Antillid (ajalooline, 1954–2010)"
->>>>>>> image-class
 
 #. iso.code:NC
 #: DBarea JOIN iso_3166_1 iso on iso.area = area.id/area.name:152
@@ -1028,11 +1016,7 @@ msgstr "Serbia"
 #. iso.code:CS
 #: DBarea JOIN iso_3166_1 iso on iso.area = area.id/area.name:242
 msgid "Serbia and Montenegro"
-<<<<<<< HEAD
 msgstr "Serbia ja Montenegro"
-=======
-msgstr "Serbia ja Montenegro (ajalooline, 2003–2006)"
->>>>>>> image-class
 
 #. iso.code:SC
 #: DBarea JOIN iso_3166_1 iso on iso.area = area.id/area.name:186
@@ -1097,11 +1081,7 @@ msgstr "Lõuna-Sudaan"
 #. iso.code:SU
 #: DBarea JOIN iso_3166_1 iso on iso.area = area.id/area.name:243
 msgid "Soviet Union"
-<<<<<<< HEAD
 msgstr "Nõukogude Liit"
-=======
-msgstr "Nõukogude Liit (ajalooline, 1922–1991)"
->>>>>>> image-class
 
 #. iso.code:ES
 #: DBarea JOIN iso_3166_1 iso on iso.area = area.id/area.name:194
@@ -1301,11 +1281,7 @@ msgstr "Jeemen"
 #. iso.code:YU
 #: DBarea JOIN iso_3166_1 iso on iso.area = area.id/area.name:235
 msgid "Yugoslavia"
-<<<<<<< HEAD
 msgstr "Jugoslaavia"
-=======
-msgstr "Jugoslaavia (ajalooline, 1918–2003)"
->>>>>>> image-class
 
 #. iso.code:ZM
 #: DBarea JOIN iso_3166_1 iso on iso.area = area.id/area.name:237
diff --git a/po/countries/pt_BR.po b/po/countries/pt_BR.po
index 5b8d8d077..1d9f9b103 100644
--- a/po/countries/pt_BR.po
+++ b/po/countries/pt_BR.po
@@ -12,13 +12,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: MusicBrainz\n"
-<<<<<<< HEAD
 "PO-Revision-Date: 2014-02-19 17:27+0000\n"
 "Last-Translator: Pygmalion\n"
-=======
-"PO-Revision-Date: 2014-01-12 12:58+0000\n"
-"Last-Translator: Ian McEwen <ianmcorvidae@ianmcorvidae.net>\n"
->>>>>>> image-class
 "Language-Team: Portuguese (Brazil) (http://www.transifex.com/projects/p/musicbrainz/language/pt_BR/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -39,29 +34,17 @@ msgstr "Albânia"
 #. iso.code:DZ
 #: DBarea JOIN iso_3166_1 iso on iso.area = area.id/area.name:3
 msgid "Algeria"
-<<<<<<< HEAD
 msgstr "Argélia"
-=======
-msgstr ""
->>>>>>> image-class
 
 #. iso.code:AS
 #: DBarea JOIN iso_3166_1 iso on iso.area = area.id/area.name:4
 msgid "American Samoa"
-<<<<<<< HEAD
 msgstr "Samoa Americana"
-=======
-msgstr ""
->>>>>>> image-class
 
 #. iso.code:AD
 #: DBarea JOIN iso_3166_1 iso on iso.area = area.id/area.name:5
 msgid "Andorra"
-<<<<<<< HEAD
 msgstr "Andorra"
-=======
-msgstr ""
->>>>>>> image-class
 
 #. iso.code:AO
 #: DBarea JOIN iso_3166_1 iso on iso.area = area.id/area.name:6
@@ -71,29 +54,17 @@ msgstr "Angola"
 #. iso.code:AI
 #: DBarea JOIN iso_3166_1 iso on iso.area = area.id/area.name:7
 msgid "Anguilla"
-<<<<<<< HEAD
 msgstr "Anguila"
-=======
-msgstr ""
->>>>>>> image-class
 
 #. iso.code:AQ
 #: DBarea JOIN iso_3166_1 iso on iso.area = area.id/area.name:8
 msgid "Antarctica"
-<<<<<<< HEAD
 msgstr "Antártica"
-=======
-msgstr "Antartica"
->>>>>>> image-class
 
 #. iso.code:AG
 #: DBarea JOIN iso_3166_1 iso on iso.area = area.id/area.name:9
 msgid "Antigua and Barbuda"
-<<<<<<< HEAD
 msgstr "Antígua e Barbuda"
-=======
-msgstr "Album"
->>>>>>> image-class
 
 #. iso.code:AR
 #: DBarea JOIN iso_3166_1 iso on iso.area = area.id/area.name:10
@@ -133,11 +104,7 @@ msgstr "Bahamas"
 #. iso.code:BH
 #: DBarea JOIN iso_3166_1 iso on iso.area = area.id/area.name:17
 msgid "Bahrain"
-<<<<<<< HEAD
 msgstr "Bahrein"
-=======
-msgstr ""
->>>>>>> image-class
 
 #. iso.code:BD
 #: DBarea JOIN iso_3166_1 iso on iso.area = area.id/area.name:18
@@ -147,20 +114,12 @@ msgstr "Bangladesh"
 #. iso.code:BB
 #: DBarea JOIN iso_3166_1 iso on iso.area = area.id/area.name:19
 msgid "Barbados"
-<<<<<<< HEAD
 msgstr "Barbados"
-=======
-msgstr ""
->>>>>>> image-class
 
 #. iso.code:BY
 #: DBarea JOIN iso_3166_1 iso on iso.area = area.id/area.name:20
 msgid "Belarus"
-<<<<<<< HEAD
 msgstr "Bielorrússia"
-=======
-msgstr ""
->>>>>>> image-class
 
 #. iso.code:BE
 #: DBarea JOIN iso_3166_1 iso on iso.area = area.id/area.name:21
@@ -170,83 +129,47 @@ msgstr "Bélgica"
 #. iso.code:BZ
 #: DBarea JOIN iso_3166_1 iso on iso.area = area.id/area.name:22
 msgid "Belize"
-<<<<<<< HEAD
 msgstr "Belize"
-=======
-msgstr ""
->>>>>>> image-class
 
 #. iso.code:BJ
 #: DBarea JOIN iso_3166_1 iso on iso.area = area.id/area.name:23
 msgid "Benin"
-<<<<<<< HEAD
 msgstr "Benim"
-=======
-msgstr ""
->>>>>>> image-class
 
 #. iso.code:BM
 #: DBarea JOIN iso_3166_1 iso on iso.area = area.id/area.name:24
 msgid "Bermuda"
-<<<<<<< HEAD
 msgstr "Bermudas"
-=======
-msgstr ""
->>>>>>> image-class
 
 #. iso.code:BT
 #: DBarea JOIN iso_3166_1 iso on iso.area = area.id/area.name:25
 msgid "Bhutan"
-<<<<<<< HEAD
 msgstr "Butão"
-=======
-msgstr ""
->>>>>>> image-class
 
 #. iso.code:BO
 #: DBarea JOIN iso_3166_1 iso on iso.area = area.id/area.name:26
 msgid "Bolivia"
-<<<<<<< HEAD
 msgstr "Bolívia"
-=======
-msgstr ""
->>>>>>> image-class
 
 #. iso.code:BQ
 #: DBarea JOIN iso_3166_1 iso on iso.area = area.id/area.name:258
 msgid "Bonaire, Sint Eustatius and Saba"
-<<<<<<< HEAD
 msgstr "Bonaire, Santo Eustáquio e Saba"
-=======
-msgstr ""
->>>>>>> image-class
 
 #. iso.code:BA
 #: DBarea JOIN iso_3166_1 iso on iso.area = area.id/area.name:27
 msgid "Bosnia and Herzegovina"
-<<<<<<< HEAD
 msgstr "Bósnia e Herzegovina"
-=======
-msgstr ""
->>>>>>> image-class
 
 #. iso.code:BW
 #: DBarea JOIN iso_3166_1 iso on iso.area = area.id/area.name:28
 msgid "Botswana"
-<<<<<<< HEAD
 msgstr "Botswana"
-=======
-msgstr ""
->>>>>>> image-class
 
 #. iso.code:BV
 #: DBarea JOIN iso_3166_1 iso on iso.area = area.id/area.name:29
 msgid "Bouvet Island"
-<<<<<<< HEAD
 msgstr "Ilha Bouvet"
-=======
-msgstr ""
->>>>>>> image-class
 
 #. iso.code:BR
 #: DBarea JOIN iso_3166_1 iso on iso.area = area.id/area.name:30
@@ -256,20 +179,12 @@ msgstr "Brasil"
 #. iso.code:IO
 #: DBarea JOIN iso_3166_1 iso on iso.area = area.id/area.name:31
 msgid "British Indian Ocean Territory"
-<<<<<<< HEAD
 msgstr "Território Britânico do Oceano Índico"
-=======
-msgstr ""
->>>>>>> image-class
 
 #. iso.code:VG
 #: DBarea JOIN iso_3166_1 iso on iso.area = area.id/area.name:230
 msgid "British Virgin Islands"
-<<<<<<< HEAD
 msgstr "Ilhas Virgens Britânicas"
-=======
-msgstr ""
->>>>>>> image-class
 
 #. iso.code:BN
 #: DBarea JOIN iso_3166_1 iso on iso.area = area.id/area.name:32
@@ -284,29 +199,17 @@ msgstr "Bulgaria"
 #. iso.code:BF
 #: DBarea JOIN iso_3166_1 iso on iso.area = area.id/area.name:34
 msgid "Burkina Faso"
-<<<<<<< HEAD
 msgstr "Burkina Faso"
-=======
-msgstr ""
->>>>>>> image-class
 
 #. iso.code:BI
 #: DBarea JOIN iso_3166_1 iso on iso.area = area.id/area.name:35
 msgid "Burundi"
-<<<<<<< HEAD
 msgstr "Burundi"
-=======
-msgstr ""
->>>>>>> image-class
 
 #. iso.code:KH
 #: DBarea JOIN iso_3166_1 iso on iso.area = area.id/area.name:36
 msgid "Cambodia"
-<<<<<<< HEAD
 msgstr "Camboja"
-=======
-msgstr ""
->>>>>>> image-class
 
 #. iso.code:CM
 #: DBarea JOIN iso_3166_1 iso on iso.area = area.id/area.name:37
@@ -321,11 +224,7 @@ msgstr "Canadá"
 #. iso.code:CV
 #: DBarea JOIN iso_3166_1 iso on iso.area = area.id/area.name:39
 msgid "Cape Verde"
-<<<<<<< HEAD
 msgstr "Cabo Verde"
-=======
-msgstr ""
->>>>>>> image-class
 
 #. iso.code:KY
 #: DBarea JOIN iso_3166_1 iso on iso.area = area.id/area.name:40
@@ -335,20 +234,12 @@ msgstr "Ilhas Cayman"
 #. iso.code:CF
 #: DBarea JOIN iso_3166_1 iso on iso.area = area.id/area.name:41
 msgid "Central African Republic"
-<<<<<<< HEAD
 msgstr "República Centroafricana"
-=======
-msgstr ""
->>>>>>> image-class
 
 #. iso.code:TD
 #: DBarea JOIN iso_3166_1 iso on iso.area = area.id/area.name:42
 msgid "Chad"
-<<<<<<< HEAD
 msgstr "Chade"
-=======
-msgstr ""
->>>>>>> image-class
 
 #. iso.code:CL
 #: DBarea JOIN iso_3166_1 iso on iso.area = area.id/area.name:43
@@ -363,11 +254,7 @@ msgstr "China"
 #. iso.code:CX
 #: DBarea JOIN iso_3166_1 iso on iso.area = area.id/area.name:45
 msgid "Christmas Island"
-<<<<<<< HEAD
 msgstr "Ilha Christmas"
-=======
-msgstr ""
->>>>>>> image-class
 
 #. iso.code:CC
 #: DBarea JOIN iso_3166_1 iso on iso.area = area.id/area.name:46
@@ -382,11 +269,7 @@ msgstr "Colômbia"
 #. iso.code:KM
 #: DBarea JOIN iso_3166_1 iso on iso.area = area.id/area.name:48
 msgid "Comoros"
-<<<<<<< HEAD
 msgstr "Comores"
-=======
-msgstr ""
->>>>>>> image-class
 
 #. iso.code:CG
 #: DBarea JOIN iso_3166_1 iso on iso.area = area.id/area.name:49
@@ -406,11 +289,7 @@ msgstr "Costa Rica"
 #. iso.code:HR
 #: DBarea JOIN iso_3166_1 iso on iso.area = area.id/area.name:53
 msgid "Croatia"
-<<<<<<< HEAD
 msgstr "Croácia"
-=======
-msgstr ""
->>>>>>> image-class
 
 #. iso.code:CU
 #: DBarea JOIN iso_3166_1 iso on iso.area = area.id/area.name:54
@@ -420,20 +299,12 @@ msgstr "Cuba"
 #. iso.code:CW
 #: DBarea JOIN iso_3166_1 iso on iso.area = area.id/area.name:259
 msgid "Curaçao"
-<<<<<<< HEAD
 msgstr "Curaçao"
-=======
-msgstr ""
->>>>>>> image-class
 
 #. iso.code:CY
 #: DBarea JOIN iso_3166_1 iso on iso.area = area.id/area.name:55
 msgid "Cyprus"
-<<<<<<< HEAD
 msgstr "Chipre"
-=======
-msgstr ""
->>>>>>> image-class
 
 #. iso.code:CZ
 #: DBarea JOIN iso_3166_1 iso on iso.area = area.id/area.name:56
@@ -443,29 +314,17 @@ msgstr "República Checa"
 #. iso.code:XC
 #: DBarea JOIN iso_3166_1 iso on iso.area = area.id/area.name:245
 msgid "Czechoslovakia"
-<<<<<<< HEAD
 msgstr "Checoslováquia"
-=======
-msgstr ""
->>>>>>> image-class
 
 #. iso.code:CI
 #: DBarea JOIN iso_3166_1 iso on iso.area = area.id/area.name:52
 msgid "Côte d'Ivoire"
-<<<<<<< HEAD
 msgstr "Costa do Marfim"
-=======
-msgstr ""
->>>>>>> image-class
 
 #. iso.code:CD
 #: DBarea JOIN iso_3166_1 iso on iso.area = area.id/area.name:236
 msgid "Democratic Republic of the Congo"
-<<<<<<< HEAD
 msgstr "República Democrática do Congo"
-=======
-msgstr ""
->>>>>>> image-class
 
 #. iso.code:DK
 #: DBarea JOIN iso_3166_1 iso on iso.area = area.id/area.name:57
@@ -475,29 +334,17 @@ msgstr "Dinamarca"
 #. iso.code:DJ
 #: DBarea JOIN iso_3166_1 iso on iso.area = area.id/area.name:58
 msgid "Djibouti"
-<<<<<<< HEAD
 msgstr "Jibuti"
-=======
-msgstr ""
->>>>>>> image-class
 
 #. iso.code:DM
 #: DBarea JOIN iso_3166_1 iso on iso.area = area.id/area.name:59
 msgid "Dominica"
-<<<<<<< HEAD
 msgstr "Dominica"
-=======
-msgstr ""
->>>>>>> image-class
 
 #. iso.code:DO
 #: DBarea JOIN iso_3166_1 iso on iso.area = area.id/area.name:60
 msgid "Dominican Republic"
-<<<<<<< HEAD
 msgstr "República Dominicana"
-=======
-msgstr ""
->>>>>>> image-class
 
 #. iso.code:XG
 #: DBarea JOIN iso_3166_1 iso on iso.area = area.id/area.name:244
@@ -517,56 +364,32 @@ msgstr "Egito"
 #. iso.code:SV
 #: DBarea JOIN iso_3166_1 iso on iso.area = area.id/area.name:64
 msgid "El Salvador"
-<<<<<<< HEAD
 msgstr "El Salvador"
-=======
-msgstr ""
->>>>>>> image-class
 
 #. iso.code:GQ
 #: DBarea JOIN iso_3166_1 iso on iso.area = area.id/area.name:65
 msgid "Equatorial Guinea"
-<<<<<<< HEAD
 msgstr "Guiné Equatorial"
-=======
-msgstr ""
->>>>>>> image-class
 
 #. iso.code:ER
 #: DBarea JOIN iso_3166_1 iso on iso.area = area.id/area.name:66
 msgid "Eritrea"
-<<<<<<< HEAD
 msgstr "Eritreia"
-=======
-msgstr ""
->>>>>>> image-class
 
 #. iso.code:EE
 #: DBarea JOIN iso_3166_1 iso on iso.area = area.id/area.name:67
 msgid "Estonia"
-<<<<<<< HEAD
 msgstr "Estônia"
-=======
-msgstr ""
->>>>>>> image-class
 
 #. iso.code:ET
 #: DBarea JOIN iso_3166_1 iso on iso.area = area.id/area.name:68
 msgid "Ethiopia"
-<<<<<<< HEAD
 msgstr "Etiópia"
-=======
-msgstr ""
->>>>>>> image-class
 
 #. iso.code:XE
 #: DBarea JOIN iso_3166_1 iso on iso.area = area.id/area.name:241
 msgid "Europe"
-<<<<<<< HEAD
 msgstr "Europa"
-=======
-msgstr ""
->>>>>>> image-class
 
 #. iso.code:FK
 #: DBarea JOIN iso_3166_1 iso on iso.area = area.id/area.name:69
@@ -576,29 +399,17 @@ msgstr ""
 #. iso.code:FO
 #: DBarea JOIN iso_3166_1 iso on iso.area = area.id/area.name:70
 msgid "Faroe Islands"
-<<<<<<< HEAD
 msgstr "Ilhas Feroe"
-=======
-msgstr ""
->>>>>>> image-class
 
 #. iso.code:FJ
 #: DBarea JOIN iso_3166_1 iso on iso.area = area.id/area.name:71
 msgid "Fiji"
-<<<<<<< HEAD
 msgstr "Fiji"
-=======
-msgstr ""
->>>>>>> image-class
 
 #. iso.code:FI
 #: DBarea JOIN iso_3166_1 iso on iso.area = area.id/area.name:72
 msgid "Finland"
-<<<<<<< HEAD
 msgstr "Finlândia"
-=======
-msgstr ""
->>>>>>> image-class
 
 #. iso.code:FR
 #: DBarea JOIN iso_3166_1 iso on iso.area = area.id/area.name:73
@@ -608,56 +419,32 @@ msgstr "França"
 #. iso.code:GF
 #: DBarea JOIN iso_3166_1 iso on iso.area = area.id/area.name:75
 msgid "French Guiana"
-<<<<<<< HEAD
 msgstr "Guiana Francesa"
-=======
-msgstr ""
->>>>>>> image-class
 
 #. iso.code:PF
 #: DBarea JOIN iso_3166_1 iso on iso.area = area.id/area.name:76
 msgid "French Polynesia"
-<<<<<<< HEAD
 msgstr "Polinésia Francesa"
-=======
-msgstr ""
->>>>>>> image-class
 
 #. iso.code:TF
 #: DBarea JOIN iso_3166_1 iso on iso.area = area.id/area.name:77
 msgid "French Southern Territories"
-<<<<<<< HEAD
 msgstr "Territórios Franceses do Sul"
-=======
-msgstr ""
->>>>>>> image-class
 
 #. iso.code:GA
 #: DBarea JOIN iso_3166_1 iso on iso.area = area.id/area.name:78
 msgid "Gabon"
-<<<<<<< HEAD
 msgstr "Gabão"
-=======
-msgstr ""
->>>>>>> image-class
 
 #. iso.code:GM
 #: DBarea JOIN iso_3166_1 iso on iso.area = area.id/area.name:79
 msgid "Gambia"
-<<<<<<< HEAD
 msgstr "Gâmbia"
-=======
-msgstr ""
->>>>>>> image-class
 
 #. iso.code:GE
 #: DBarea JOIN iso_3166_1 iso on iso.area = area.id/area.name:80
 msgid "Georgia"
-<<<<<<< HEAD
 msgstr "Geórgia"
-=======
-msgstr ""
->>>>>>> image-class
 
 #. iso.code:DE
 #: DBarea JOIN iso_3166_1 iso on iso.area = area.id/area.name:81
@@ -667,20 +454,12 @@ msgstr "Alemanha"
 #. iso.code:GH
 #: DBarea JOIN iso_3166_1 iso on iso.area = area.id/area.name:82
 msgid "Ghana"
-<<<<<<< HEAD
 msgstr "Gana"
-=======
-msgstr ""
->>>>>>> image-class
 
 #. iso.code:GI
 #: DBarea JOIN iso_3166_1 iso on iso.area = area.id/area.name:83
 msgid "Gibraltar"
-<<<<<<< HEAD
 msgstr "Gibraltar"
-=======
-msgstr ""
->>>>>>> image-class
 
 #. iso.code:GR
 #: DBarea JOIN iso_3166_1 iso on iso.area = area.id/area.name:84
@@ -690,38 +469,22 @@ msgstr "Grécia"
 #. iso.code:GL
 #: DBarea JOIN iso_3166_1 iso on iso.area = area.id/area.name:85
 msgid "Greenland"
-<<<<<<< HEAD
 msgstr "Groenlândia"
-=======
-msgstr ""
->>>>>>> image-class
 
 #. iso.code:GD
 #: DBarea JOIN iso_3166_1 iso on iso.area = area.id/area.name:86
 msgid "Grenada"
-<<<<<<< HEAD
 msgstr "Granada"
-=======
-msgstr ""
->>>>>>> image-class
 
 #. iso.code:GP
 #: DBarea JOIN iso_3166_1 iso on iso.area = area.id/area.name:87
 msgid "Guadeloupe"
-<<<<<<< HEAD
 msgstr "Guadalupe"
-=======
-msgstr ""
->>>>>>> image-class
 
 #. iso.code:GU
 #: DBarea JOIN iso_3166_1 iso on iso.area = area.id/area.name:88
 msgid "Guam"
-<<<<<<< HEAD
 msgstr "Guam"
-=======
-msgstr ""
->>>>>>> image-class
 
 #. iso.code:GT
 #: DBarea JOIN iso_3166_1 iso on iso.area = area.id/area.name:89
@@ -731,38 +494,22 @@ msgstr "Guatemala"
 #. iso.code:GG
 #: DBarea JOIN iso_3166_1 iso on iso.area = area.id/area.name:251
 msgid "Guernsey"
-<<<<<<< HEAD
 msgstr "Guernsey"
-=======
-msgstr ""
->>>>>>> image-class
 
 #. iso.code:GN
 #: DBarea JOIN iso_3166_1 iso on iso.area = area.id/area.name:90
 msgid "Guinea"
-<<<<<<< HEAD
 msgstr "Guiné"
-=======
-msgstr ""
->>>>>>> image-class
 
 #. iso.code:GW
 #: DBarea JOIN iso_3166_1 iso on iso.area = area.id/area.name:91
 msgid "Guinea-Bissau"
-<<<<<<< HEAD
 msgstr "Guiné-Bissau"
-=======
-msgstr ""
->>>>>>> image-class
 
 #. iso.code:GY
 #: DBarea JOIN iso_3166_1 iso on iso.area = area.id/area.name:92
 msgid "Guyana"
-<<<<<<< HEAD
 msgstr "Guiana"
-=======
-msgstr ""
->>>>>>> image-class
 
 #. iso.code:HT
 #: DBarea JOIN iso_3166_1 iso on iso.area = area.id/area.name:93
@@ -772,11 +519,7 @@ msgstr "Haiti"
 #. iso.code:HM
 #: DBarea JOIN iso_3166_1 iso on iso.area = area.id/area.name:94
 msgid "Heard Island and McDonald Islands"
-<<<<<<< HEAD
 msgstr "Ilha Heard e Ilhas McDonald"
-=======
-msgstr ""
->>>>>>> image-class
 
 #. iso.code:HN
 #: DBarea JOIN iso_3166_1 iso on iso.area = area.id/area.name:95
@@ -796,11 +539,7 @@ msgstr "Hungria"
 #. iso.code:IS
 #: DBarea JOIN iso_3166_1 iso on iso.area = area.id/area.name:98
 msgid "Iceland"
-<<<<<<< HEAD
 msgstr "Islândia"
-=======
-msgstr ""
->>>>>>> image-class
 
 #. iso.code:IN
 #: DBarea JOIN iso_3166_1 iso on iso.area = area.id/area.name:99
@@ -810,20 +549,12 @@ msgstr "Índia"
 #. iso.code:ID
 #: DBarea JOIN iso_3166_1 iso on iso.area = area.id/area.name:100
 msgid "Indonesia"
-<<<<<<< HEAD
 msgstr "Indonésia"
-=======
-msgstr "Indonesia"
->>>>>>> image-class
 
 #. iso.code:IR
 #: DBarea JOIN iso_3166_1 iso on iso.area = area.id/area.name:101
 msgid "Iran"
-<<<<<<< HEAD
 msgstr "Irã"
-=======
-msgstr ""
->>>>>>> image-class
 
 #. iso.code:IQ
 #: DBarea JOIN iso_3166_1 iso on iso.area = area.id/area.name:102
@@ -833,20 +564,12 @@ msgstr "Iraque"
 #. iso.code:IE
 #: DBarea JOIN iso_3166_1 iso on iso.area = area.id/area.name:103
 msgid "Ireland"
-<<<<<<< HEAD
 msgstr "Irlanda"
-=======
-msgstr ""
->>>>>>> image-class
 
 #. iso.code:IM
 #: DBarea JOIN iso_3166_1 iso on iso.area = area.id/area.name:252
 msgid "Isle of Man"
-<<<<<<< HEAD
 msgstr "Ilha de Man"
-=======
-msgstr ""
->>>>>>> image-class
 
 #. iso.code:IL
 #: DBarea JOIN iso_3166_1 iso on iso.area = area.id/area.name:104
@@ -871,47 +594,27 @@ msgstr "Japão"
 #. iso.code:JE
 #: DBarea JOIN iso_3166_1 iso on iso.area = area.id/area.name:253
 msgid "Jersey"
-<<<<<<< HEAD
 msgstr "Jersey"
-=======
-msgstr ""
->>>>>>> image-class
 
 #. iso.code:JO
 #: DBarea JOIN iso_3166_1 iso on iso.area = area.id/area.name:108
 msgid "Jordan"
-<<<<<<< HEAD
 msgstr "Jordânia"
-=======
-msgstr ""
->>>>>>> image-class
 
 #. iso.code:KZ
 #: DBarea JOIN iso_3166_1 iso on iso.area = area.id/area.name:109
 msgid "Kazakhstan"
-<<<<<<< HEAD
 msgstr "Cazaquistão"
-=======
-msgstr ""
->>>>>>> image-class
 
 #. iso.code:KE
 #: DBarea JOIN iso_3166_1 iso on iso.area = area.id/area.name:110
 msgid "Kenya"
-<<<<<<< HEAD
 msgstr "Quênia"
-=======
-msgstr ""
->>>>>>> image-class
 
 #. iso.code:KI
 #: DBarea JOIN iso_3166_1 iso on iso.area = area.id/area.name:111
 msgid "Kiribati"
-<<<<<<< HEAD
 msgstr "Kiribati"
-=======
-msgstr ""
->>>>>>> image-class
 
 #. iso.code:XK
 #: DBarea JOIN iso_3166_1 iso on iso.area = area.id/area.name:2358
@@ -926,209 +629,117 @@ msgstr "Kuwait"
 #. iso.code:KG
 #: DBarea JOIN iso_3166_1 iso on iso.area = area.id/area.name:115
 msgid "Kyrgyzstan"
-<<<<<<< HEAD
 msgstr "Quirguistão"
-=======
-msgstr ""
->>>>>>> image-class
 
 #. iso.code:LA
 #: DBarea JOIN iso_3166_1 iso on iso.area = area.id/area.name:116
 msgid "Laos"
-<<<<<<< HEAD
 msgstr "Laos"
-=======
-msgstr ""
->>>>>>> image-class
 
 #. iso.code:LV
 #: DBarea JOIN iso_3166_1 iso on iso.area = area.id/area.name:117
 msgid "Latvia"
-<<<<<<< HEAD
 msgstr "Letônia"
-=======
-msgstr ""
->>>>>>> image-class
 
 #. iso.code:LB
 #: DBarea JOIN iso_3166_1 iso on iso.area = area.id/area.name:118
 msgid "Lebanon"
-<<<<<<< HEAD
 msgstr "Líbano"
-=======
-msgstr ""
->>>>>>> image-class
 
 #. iso.code:LS
 #: DBarea JOIN iso_3166_1 iso on iso.area = area.id/area.name:119
 msgid "Lesotho"
-<<<<<<< HEAD
 msgstr "Lesoto"
-=======
-msgstr ""
->>>>>>> image-class
 
 #. iso.code:LR
 #: DBarea JOIN iso_3166_1 iso on iso.area = area.id/area.name:120
 msgid "Liberia"
-<<<<<<< HEAD
 msgstr "Libéria"
-=======
-msgstr "Linguagens e Scripts"
->>>>>>> image-class
 
 #. iso.code:LY
 #: DBarea JOIN iso_3166_1 iso on iso.area = area.id/area.name:121
 msgid "Libya"
-<<<<<<< HEAD
 msgstr "Líbia"
-=======
-msgstr ""
->>>>>>> image-class
 
 #. iso.code:LI
 #: DBarea JOIN iso_3166_1 iso on iso.area = area.id/area.name:122
 msgid "Liechtenstein"
-<<<<<<< HEAD
 msgstr "Liechtenstein"
-=======
-msgstr ""
->>>>>>> image-class
 
 #. iso.code:LT
 #: DBarea JOIN iso_3166_1 iso on iso.area = area.id/area.name:123
 msgid "Lithuania"
-<<<<<<< HEAD
 msgstr "Lituânia"
-=======
-msgstr ""
->>>>>>> image-class
 
 #. iso.code:LU
 #: DBarea JOIN iso_3166_1 iso on iso.area = area.id/area.name:124
 msgid "Luxembourg"
-<<<<<<< HEAD
 msgstr "Luxemburgo"
-=======
-msgstr ""
->>>>>>> image-class
 
 #. iso.code:MO
 #: DBarea JOIN iso_3166_1 iso on iso.area = area.id/area.name:125
 msgid "Macao"
-<<<<<<< HEAD
 msgstr "Macau"
-=======
-msgstr ""
->>>>>>> image-class
 
 #. iso.code:MK
 #: DBarea JOIN iso_3166_1 iso on iso.area = area.id/area.name:126
 msgid "Macedonia"
-<<<<<<< HEAD
 msgstr "Macedônia"
-=======
-msgstr ""
->>>>>>> image-class
 
 #. iso.code:MG
 #: DBarea JOIN iso_3166_1 iso on iso.area = area.id/area.name:127
 msgid "Madagascar"
-<<<<<<< HEAD
 msgstr "Madagáscar"
-=======
-msgstr "Madagascar"
->>>>>>> image-class
 
 #. iso.code:MW
 #: DBarea JOIN iso_3166_1 iso on iso.area = area.id/area.name:128
 msgid "Malawi"
-<<<<<<< HEAD
 msgstr "Malawi"
-=======
-msgstr ""
->>>>>>> image-class
 
 #. iso.code:MY
 #: DBarea JOIN iso_3166_1 iso on iso.area = area.id/area.name:129
 msgid "Malaysia"
-<<<<<<< HEAD
 msgstr "Malásia"
-=======
-msgstr ""
->>>>>>> image-class
 
 #. iso.code:MV
 #: DBarea JOIN iso_3166_1 iso on iso.area = area.id/area.name:130
 msgid "Maldives"
-<<<<<<< HEAD
 msgstr "Maldivas"
-=======
-msgstr ""
->>>>>>> image-class
 
 #. iso.code:ML
 #: DBarea JOIN iso_3166_1 iso on iso.area = area.id/area.name:131
 msgid "Mali"
-<<<<<<< HEAD
 msgstr "Mali"
-=======
-msgstr ""
->>>>>>> image-class
 
 #. iso.code:MT
 #: DBarea JOIN iso_3166_1 iso on iso.area = area.id/area.name:132
 msgid "Malta"
-<<<<<<< HEAD
 msgstr "Malta"
-=======
-msgstr ""
->>>>>>> image-class
 
 #. iso.code:MH
 #: DBarea JOIN iso_3166_1 iso on iso.area = area.id/area.name:133
 msgid "Marshall Islands"
-<<<<<<< HEAD
 msgstr "Ilhas Marshall"
-=======
-msgstr ""
->>>>>>> image-class
 
 #. iso.code:MQ
 #: DBarea JOIN iso_3166_1 iso on iso.area = area.id/area.name:134
 msgid "Martinique"
-<<<<<<< HEAD
 msgstr "Martinica"
-=======
-msgstr ""
->>>>>>> image-class
 
 #. iso.code:MR
 #: DBarea JOIN iso_3166_1 iso on iso.area = area.id/area.name:135
 msgid "Mauritania"
-<<<<<<< HEAD
 msgstr "Mauritânia"
-=======
-msgstr ""
->>>>>>> image-class
 
 #. iso.code:MU
 #: DBarea JOIN iso_3166_1 iso on iso.area = area.id/area.name:136
 msgid "Mauritius"
-<<<<<<< HEAD
 msgstr "Maurício"
-=======
-msgstr ""
->>>>>>> image-class
 
 #. iso.code:YT
 #: DBarea JOIN iso_3166_1 iso on iso.area = area.id/area.name:137
 msgid "Mayotte"
-<<<<<<< HEAD
 msgstr "Mayotte"
-=======
-msgstr ""
->>>>>>> image-class
 
 #. iso.code:MX
 #: DBarea JOIN iso_3166_1 iso on iso.area = area.id/area.name:138
@@ -1138,11 +749,7 @@ msgstr "México"
 #. iso.code:FM
 #: DBarea JOIN iso_3166_1 iso on iso.area = area.id/area.name:139
 msgid "Micronesia, Federated States of"
-<<<<<<< HEAD
 msgstr "Micronésia, Estados Federados da"
-=======
-msgstr ""
->>>>>>> image-class
 
 #. iso.code:MD
 #: DBarea JOIN iso_3166_1 iso on iso.area = area.id/area.name:140
@@ -1157,110 +764,62 @@ msgstr "Monaco"
 #. iso.code:MN
 #: DBarea JOIN iso_3166_1 iso on iso.area = area.id/area.name:142
 msgid "Mongolia"
-<<<<<<< HEAD
 msgstr "Mongólia"
-=======
-msgstr ""
->>>>>>> image-class
 
 #. iso.code:ME
 #: DBarea JOIN iso_3166_1 iso on iso.area = area.id/area.name:247
 msgid "Montenegro"
-<<<<<<< HEAD
 msgstr "Montenegro"
-=======
-msgstr ""
->>>>>>> image-class
 
 #. iso.code:MS
 #: DBarea JOIN iso_3166_1 iso on iso.area = area.id/area.name:143
 msgid "Montserrat"
-<<<<<<< HEAD
 msgstr "Montserrat"
-=======
-msgstr ""
->>>>>>> image-class
 
 #. iso.code:MA
 #: DBarea JOIN iso_3166_1 iso on iso.area = area.id/area.name:144
 msgid "Morocco"
-<<<<<<< HEAD
 msgstr "Marrocos"
-=======
-msgstr ""
->>>>>>> image-class
 
 #. iso.code:MZ
 #: DBarea JOIN iso_3166_1 iso on iso.area = area.id/area.name:145
 msgid "Mozambique"
-<<<<<<< HEAD
 msgstr "Moçambique"
-=======
-msgstr ""
->>>>>>> image-class
 
 #. iso.code:MM
 #: DBarea JOIN iso_3166_1 iso on iso.area = area.id/area.name:146
 msgid "Myanmar"
-<<<<<<< HEAD
 msgstr "Myanmar"
-=======
-msgstr ""
->>>>>>> image-class
 
 #. iso.code:NA
 #: DBarea JOIN iso_3166_1 iso on iso.area = area.id/area.name:147
 msgid "Namibia"
-<<<<<<< HEAD
 msgstr "Namíbia"
-=======
-msgstr ""
->>>>>>> image-class
 
 #. iso.code:NR
 #: DBarea JOIN iso_3166_1 iso on iso.area = area.id/area.name:148
 msgid "Nauru"
-<<<<<<< HEAD
 msgstr "Nauru"
-=======
-msgstr ""
->>>>>>> image-class
 
 #. iso.code:NP
 #: DBarea JOIN iso_3166_1 iso on iso.area = area.id/area.name:149
 msgid "Nepal"
-<<<<<<< HEAD
 msgstr "Nepal"
-=======
-msgstr ""
->>>>>>> image-class
 
 #. iso.code:NL
 #: DBarea JOIN iso_3166_1 iso on iso.area = area.id/area.name:150
 msgid "Netherlands"
-<<<<<<< HEAD
 msgstr "Países Baixos"
-=======
-msgstr ""
->>>>>>> image-class
 
 #. iso.code:AN
 #: DBarea JOIN iso_3166_1 iso on iso.area = area.id/area.name:151
 msgid "Netherlands Antilles"
-<<<<<<< HEAD
 msgstr "Antilhas Holandesas"
-=======
-msgstr ""
->>>>>>> image-class
 
 #. iso.code:NC
 #: DBarea JOIN iso_3166_1 iso on iso.area = area.id/area.name:152
 msgid "New Caledonia"
-<<<<<<< HEAD
 msgstr "Nova Caledônia"
-=======
-msgstr ""
->>>>>>> image-class
 
 #. iso.code:NZ
 #: DBarea JOIN iso_3166_1 iso on iso.area = area.id/area.name:153
@@ -1270,164 +829,92 @@ msgstr "Nova Zelândia"
 #. iso.code:NI
 #: DBarea JOIN iso_3166_1 iso on iso.area = area.id/area.name:154
 msgid "Nicaragua"
-<<<<<<< HEAD
 msgstr "Nicarágua"
-=======
-msgstr ""
->>>>>>> image-class
 
 #. iso.code:NE
 #: DBarea JOIN iso_3166_1 iso on iso.area = area.id/area.name:155
 msgid "Niger"
-<<<<<<< HEAD
 msgstr "Níger"
-=======
-msgstr ""
->>>>>>> image-class
 
 #. iso.code:NG
 #: DBarea JOIN iso_3166_1 iso on iso.area = area.id/area.name:156
 msgid "Nigeria"
-<<<<<<< HEAD
 msgstr "Nigéria"
-=======
-msgstr ""
->>>>>>> image-class
 
 #. iso.code:NU
 #: DBarea JOIN iso_3166_1 iso on iso.area = area.id/area.name:157
 msgid "Niue"
-<<<<<<< HEAD
 msgstr "Niue"
-=======
-msgstr ""
->>>>>>> image-class
 
 #. iso.code:NF
 #: DBarea JOIN iso_3166_1 iso on iso.area = area.id/area.name:158
 msgid "Norfolk Island"
-<<<<<<< HEAD
 msgstr "Ilha Norfolk"
-=======
-msgstr ""
->>>>>>> image-class
 
 #. iso.code:KP
 #: DBarea JOIN iso_3166_1 iso on iso.area = area.id/area.name:112
 msgid "North Korea"
-<<<<<<< HEAD
 msgstr "Coreia do Norte"
-=======
-msgstr ""
->>>>>>> image-class
 
 #. iso.code:MP
 #: DBarea JOIN iso_3166_1 iso on iso.area = area.id/area.name:159
 msgid "Northern Mariana Islands"
-<<<<<<< HEAD
 msgstr "Ilhas Marianas do Norte"
-=======
-msgstr ""
->>>>>>> image-class
 
 #. iso.code:NO
 #: DBarea JOIN iso_3166_1 iso on iso.area = area.id/area.name:160
 msgid "Norway"
-<<<<<<< HEAD
 msgstr "Noruega"
-=======
-msgstr ""
->>>>>>> image-class
 
 #. iso.code:OM
 #: DBarea JOIN iso_3166_1 iso on iso.area = area.id/area.name:161
 msgid "Oman"
-<<<<<<< HEAD
 msgstr "Omã"
-=======
-msgstr ""
->>>>>>> image-class
 
 #. iso.code:PK
 #: DBarea JOIN iso_3166_1 iso on iso.area = area.id/area.name:162
 msgid "Pakistan"
-<<<<<<< HEAD
 msgstr "Paquistão"
-=======
-msgstr ""
->>>>>>> image-class
 
 #. iso.code:PW
 #: DBarea JOIN iso_3166_1 iso on iso.area = area.id/area.name:163
 msgid "Palau"
-<<<<<<< HEAD
 msgstr "Palau"
-=======
-msgstr ""
->>>>>>> image-class
 
 #. iso.code:PS
 #: DBarea JOIN iso_3166_1 iso on iso.area = area.id/area.name:249
 msgid "Palestine"
-<<<<<<< HEAD
 msgstr "Palestina"
-=======
-msgstr ""
->>>>>>> image-class
 
 #. iso.code:PA
 #: DBarea JOIN iso_3166_1 iso on iso.area = area.id/area.name:164
 msgid "Panama"
-<<<<<<< HEAD
 msgstr "Panamá"
-=======
-msgstr ""
->>>>>>> image-class
 
 #. iso.code:PG
 #: DBarea JOIN iso_3166_1 iso on iso.area = area.id/area.name:165
 msgid "Papua New Guinea"
-<<<<<<< HEAD
 msgstr "Papua-Nova Guiné"
-=======
-msgstr ""
->>>>>>> image-class
 
 #. iso.code:PY
 #: DBarea JOIN iso_3166_1 iso on iso.area = area.id/area.name:166
 msgid "Paraguay"
-<<<<<<< HEAD
 msgstr "Paraguai"
-=======
-msgstr ""
->>>>>>> image-class
 
 #. iso.code:PE
 #: DBarea JOIN iso_3166_1 iso on iso.area = area.id/area.name:167
 msgid "Peru"
-<<<<<<< HEAD
 msgstr "Peru"
-=======
-msgstr ""
->>>>>>> image-class
 
 #. iso.code:PH
 #: DBarea JOIN iso_3166_1 iso on iso.area = area.id/area.name:168
 msgid "Philippines"
-<<<<<<< HEAD
 msgstr "Filipinas"
-=======
-msgstr ""
->>>>>>> image-class
 
 #. iso.code:PN
 #: DBarea JOIN iso_3166_1 iso on iso.area = area.id/area.name:169
 msgid "Pitcairn"
-<<<<<<< HEAD
 msgstr "Ilhas Pitcairn"
-=======
-msgstr ""
->>>>>>> image-class
 
 #. iso.code:PL
 #: DBarea JOIN iso_3166_1 iso on iso.area = area.id/area.name:170
@@ -1447,11 +934,7 @@ msgstr "Porto Rico"
 #. iso.code:QA
 #: DBarea JOIN iso_3166_1 iso on iso.area = area.id/area.name:173
 msgid "Qatar"
-<<<<<<< HEAD
 msgstr "Catar"
-=======
-msgstr ""
->>>>>>> image-class
 
 #. iso.code:RO
 #: DBarea JOIN iso_3166_1 iso on iso.area = area.id/area.name:175
@@ -1461,128 +944,72 @@ msgstr "Romênia"
 #. iso.code:RU
 #: DBarea JOIN iso_3166_1 iso on iso.area = area.id/area.name:176
 msgid "Russian Federation"
-<<<<<<< HEAD
 msgstr "Federação Russa"
-=======
-msgstr ""
->>>>>>> image-class
 
 #. iso.code:RW
 #: DBarea JOIN iso_3166_1 iso on iso.area = area.id/area.name:177
 msgid "Rwanda"
-<<<<<<< HEAD
 msgstr "Ruanda"
-=======
-msgstr ""
->>>>>>> image-class
 
 #. iso.code:RE
 #: DBarea JOIN iso_3166_1 iso on iso.area = area.id/area.name:174
 msgid "Réunion"
-<<<<<<< HEAD
 msgstr "Reunião"
-=======
-msgstr ""
->>>>>>> image-class
 
 #. iso.code:BL
 #: DBarea JOIN iso_3166_1 iso on iso.area = area.id/area.name:255
 msgid "Saint Barthélemy"
-<<<<<<< HEAD
 msgstr "São Bartolomeu"
-=======
-msgstr ""
->>>>>>> image-class
 
 #. iso.code:SH
 #: DBarea JOIN iso_3166_1 iso on iso.area = area.id/area.name:196
 msgid "Saint Helena, Ascension and Tristan da Cunha"
-<<<<<<< HEAD
 msgstr "Santa Helena, Ascenção e Tristão da Cunha"
-=======
-msgstr ""
->>>>>>> image-class
 
 #. iso.code:KN
 #: DBarea JOIN iso_3166_1 iso on iso.area = area.id/area.name:178
 msgid "Saint Kitts and Nevis"
-<<<<<<< HEAD
 msgstr "São Cristóvão e Neves"
-=======
-msgstr ""
->>>>>>> image-class
 
 #. iso.code:LC
 #: DBarea JOIN iso_3166_1 iso on iso.area = area.id/area.name:179
 msgid "Saint Lucia"
-<<<<<<< HEAD
 msgstr "Santa Lúcia"
-=======
-msgstr ""
->>>>>>> image-class
 
 #. iso.code:MF
 #: DBarea JOIN iso_3166_1 iso on iso.area = area.id/area.name:256
 msgid "Saint Martin (French part)"
-<<<<<<< HEAD
 msgstr "São Martinho (Parte francesa)"
-=======
-msgstr ""
->>>>>>> image-class
 
 #. iso.code:PM
 #: DBarea JOIN iso_3166_1 iso on iso.area = area.id/area.name:197
 msgid "Saint Pierre and Miquelon"
-<<<<<<< HEAD
 msgstr "Saint-Pierre e Miquelon"
-=======
-msgstr ""
->>>>>>> image-class
 
 #. iso.code:VC
 #: DBarea JOIN iso_3166_1 iso on iso.area = area.id/area.name:180
 msgid "Saint Vincent and The Grenadines"
-<<<<<<< HEAD
 msgstr "São Vicente e Granadinas"
-=======
-msgstr ""
->>>>>>> image-class
 
 #. iso.code:WS
 #: DBarea JOIN iso_3166_1 iso on iso.area = area.id/area.name:181
 msgid "Samoa"
-<<<<<<< HEAD
 msgstr "Samoa"
-=======
-msgstr ""
->>>>>>> image-class
 
 #. iso.code:SM
 #: DBarea JOIN iso_3166_1 iso on iso.area = area.id/area.name:182
 msgid "San Marino"
-<<<<<<< HEAD
 msgstr "San Marino"
-=======
-msgstr ""
->>>>>>> image-class
 
 #. iso.code:ST
 #: DBarea JOIN iso_3166_1 iso on iso.area = area.id/area.name:183
 msgid "Sao Tome and Principe"
-<<<<<<< HEAD
 msgstr "São Tomé e Príncipe"
-=======
-msgstr ""
->>>>>>> image-class
 
 #. iso.code:SA
 #: DBarea JOIN iso_3166_1 iso on iso.area = area.id/area.name:184
 msgid "Saudi Arabia"
-<<<<<<< HEAD
 msgstr "Arábia Saudita"
-=======
-msgstr ""
->>>>>>> image-class
 
 #. iso.code:SN
 #: DBarea JOIN iso_3166_1 iso on iso.area = area.id/area.name:185
@@ -1592,83 +1019,47 @@ msgstr "Senegal"
 #. iso.code:RS
 #: DBarea JOIN iso_3166_1 iso on iso.area = area.id/area.name:254
 msgid "Serbia"
-<<<<<<< HEAD
 msgstr "Sérvia"
-=======
-msgstr ""
->>>>>>> image-class
 
 #. iso.code:CS
 #: DBarea JOIN iso_3166_1 iso on iso.area = area.id/area.name:242
 msgid "Serbia and Montenegro"
-<<<<<<< HEAD
 msgstr "Sérvia e Montenegro"
-=======
-msgstr ""
->>>>>>> image-class
 
 #. iso.code:SC
 #: DBarea JOIN iso_3166_1 iso on iso.area = area.id/area.name:186
 msgid "Seychelles"
-<<<<<<< HEAD
 msgstr "Seychelles"
-=======
-msgstr ""
->>>>>>> image-class
 
 #. iso.code:SL
 #: DBarea JOIN iso_3166_1 iso on iso.area = area.id/area.name:187
 msgid "Sierra Leone"
-<<<<<<< HEAD
 msgstr "Serra Leoa"
-=======
-msgstr ""
->>>>>>> image-class
 
 #. iso.code:SG
 #: DBarea JOIN iso_3166_1 iso on iso.area = area.id/area.name:188
 msgid "Singapore"
-<<<<<<< HEAD
 msgstr "Singapura"
-=======
-msgstr ""
->>>>>>> image-class
 
 #. iso.code:SX
 #: DBarea JOIN iso_3166_1 iso on iso.area = area.id/area.name:260
 msgid "Sint Maarten (Dutch part)"
-<<<<<<< HEAD
 msgstr "São Martinho (Parte holandesa)"
-=======
-msgstr ""
->>>>>>> image-class
 
 #. iso.code:SK
 #: DBarea JOIN iso_3166_1 iso on iso.area = area.id/area.name:189
 msgid "Slovakia"
-<<<<<<< HEAD
 msgstr "Eslováquia"
-=======
-msgstr ""
->>>>>>> image-class
 
 #. iso.code:SI
 #: DBarea JOIN iso_3166_1 iso on iso.area = area.id/area.name:190
 msgid "Slovenia"
-<<<<<<< HEAD
 msgstr "Eslovênia"
-=======
-msgstr ""
->>>>>>> image-class
 
 #. iso.code:SB
 #: DBarea JOIN iso_3166_1 iso on iso.area = area.id/area.name:191
 msgid "Solomon Islands"
-<<<<<<< HEAD
 msgstr "Ilhas Salomão"
-=======
-msgstr ""
->>>>>>> image-class
 
 #. iso.code:SO
 #: DBarea JOIN iso_3166_1 iso on iso.area = area.id/area.name:192
@@ -1688,29 +1079,17 @@ msgstr ""
 #. iso.code:KR
 #: DBarea JOIN iso_3166_1 iso on iso.area = area.id/area.name:113
 msgid "South Korea"
-<<<<<<< HEAD
 msgstr "Coreia do Sul"
-=======
-msgstr ""
->>>>>>> image-class
 
 #. iso.code:SS
 #: DBarea JOIN iso_3166_1 iso on iso.area = area.id/area.name:257
 msgid "South Sudan"
-<<<<<<< HEAD
 msgstr "Sudão do Sul"
-=======
-msgstr ""
->>>>>>> image-class
 
 #. iso.code:SU
 #: DBarea JOIN iso_3166_1 iso on iso.area = area.id/area.name:243
 msgid "Soviet Union"
-<<<<<<< HEAD
 msgstr "União Soviética"
-=======
-msgstr ""
->>>>>>> image-class
 
 #. iso.code:ES
 #: DBarea JOIN iso_3166_1 iso on iso.area = area.id/area.name:194
@@ -1720,29 +1099,17 @@ msgstr "Espanha"
 #. iso.code:LK
 #: DBarea JOIN iso_3166_1 iso on iso.area = area.id/area.name:195
 msgid "Sri Lanka"
-<<<<<<< HEAD
 msgstr "Sri Lanka"
-=======
-msgstr ""
->>>>>>> image-class
 
 #. iso.code:SD
 #: DBarea JOIN iso_3166_1 iso on iso.area = area.id/area.name:198
 msgid "Sudan"
-<<<<<<< HEAD
 msgstr "Sudão"
-=======
-msgstr ""
->>>>>>> image-class
 
 #. iso.code:SR
 #: DBarea JOIN iso_3166_1 iso on iso.area = area.id/area.name:199
 msgid "Suriname"
-<<<<<<< HEAD
 msgstr "Suriname"
-=======
-msgstr ""
->>>>>>> image-class
 
 #. iso.code:SJ
 #: DBarea JOIN iso_3166_1 iso on iso.area = area.id/area.name:200
@@ -1752,11 +1119,7 @@ msgstr ""
 #. iso.code:SZ
 #: DBarea JOIN iso_3166_1 iso on iso.area = area.id/area.name:201
 msgid "Swaziland"
-<<<<<<< HEAD
 msgstr "Suazilândia"
-=======
-msgstr ""
->>>>>>> image-class
 
 #. iso.code:SE
 #: DBarea JOIN iso_3166_1 iso on iso.area = area.id/area.name:202
@@ -1771,101 +1134,57 @@ msgstr "Suiça"
 #. iso.code:SY
 #: DBarea JOIN iso_3166_1 iso on iso.area = area.id/area.name:204
 msgid "Syria"
-<<<<<<< HEAD
 msgstr "Síria"
-=======
-msgstr ""
->>>>>>> image-class
 
 #. iso.code:TW
 #: DBarea JOIN iso_3166_1 iso on iso.area = area.id/area.name:205
 msgid "Taiwan"
-<<<<<<< HEAD
 msgstr "Taiwan"
-=======
-msgstr ""
->>>>>>> image-class
 
 #. iso.code:TJ
 #: DBarea JOIN iso_3166_1 iso on iso.area = area.id/area.name:206
 msgid "Tajikistan"
-<<<<<<< HEAD
 msgstr "Tajiquistão"
-=======
-msgstr ""
->>>>>>> image-class
 
 #. iso.code:TZ
 #: DBarea JOIN iso_3166_1 iso on iso.area = area.id/area.name:207
 msgid "Tanzania"
-<<<<<<< HEAD
 msgstr "Tanzânia"
-=======
-msgstr ""
->>>>>>> image-class
 
 #. iso.code:TH
 #: DBarea JOIN iso_3166_1 iso on iso.area = area.id/area.name:208
 msgid "Thailand"
-<<<<<<< HEAD
 msgstr "Tailândia"
-=======
-msgstr ""
->>>>>>> image-class
 
 #. iso.code:TL
 #: DBarea JOIN iso_3166_1 iso on iso.area = area.id/area.name:61
 msgid "Timor-Leste"
-<<<<<<< HEAD
 msgstr "Timor-Leste"
-=======
-msgstr ""
->>>>>>> image-class
 
 #. iso.code:TG
 #: DBarea JOIN iso_3166_1 iso on iso.area = area.id/area.name:209
 msgid "Togo"
-<<<<<<< HEAD
 msgstr "Togo"
-=======
-msgstr ""
->>>>>>> image-class
 
 #. iso.code:TK
 #: DBarea JOIN iso_3166_1 iso on iso.area = area.id/area.name:210
 msgid "Tokelau"
-<<<<<<< HEAD
 msgstr "Tokelau"
-=======
-msgstr ""
->>>>>>> image-class
 
 #. iso.code:TO
 #: DBarea JOIN iso_3166_1 iso on iso.area = area.id/area.name:211
 msgid "Tonga"
-<<<<<<< HEAD
 msgstr "Tonga"
-=======
-msgstr ""
->>>>>>> image-class
 
 #. iso.code:TT
 #: DBarea JOIN iso_3166_1 iso on iso.area = area.id/area.name:212
 msgid "Trinidad and Tobago"
-<<<<<<< HEAD
 msgstr "Trindade e Tobago"
-=======
-msgstr ""
->>>>>>> image-class
 
 #. iso.code:TN
 #: DBarea JOIN iso_3166_1 iso on iso.area = area.id/area.name:213
 msgid "Tunisia"
-<<<<<<< HEAD
 msgstr "Tunísia"
-=======
-msgstr ""
->>>>>>> image-class
 
 #. iso.code:TR
 #: DBarea JOIN iso_3166_1 iso on iso.area = area.id/area.name:214
@@ -1875,11 +1194,7 @@ msgstr "Turquia"
 #. iso.code:TM
 #: DBarea JOIN iso_3166_1 iso on iso.area = area.id/area.name:215
 msgid "Turkmenistan"
-<<<<<<< HEAD
 msgstr "Turquemenistão"
-=======
-msgstr ""
->>>>>>> image-class
 
 #. iso.code:TC
 #: DBarea JOIN iso_3166_1 iso on iso.area = area.id/area.name:216
@@ -1949,20 +1264,12 @@ msgstr ""
 #. iso.code:VE
 #: DBarea JOIN iso_3166_1 iso on iso.area = area.id/area.name:228
 msgid "Venezuela"
-<<<<<<< HEAD
 msgstr "Venezuela"
-=======
-msgstr ""
->>>>>>> image-class
 
 #. iso.code:VN
 #: DBarea JOIN iso_3166_1 iso on iso.area = area.id/area.name:229
 msgid "Vietnam"
-<<<<<<< HEAD
 msgstr "Vietnã"
-=======
-msgstr ""
->>>>>>> image-class
 
 #. iso.code:WF
 #: DBarea JOIN iso_3166_1 iso on iso.area = area.id/area.name:232
@@ -1977,38 +1284,22 @@ msgstr ""
 #. iso.code:YE
 #: DBarea JOIN iso_3166_1 iso on iso.area = area.id/area.name:234
 msgid "Yemen"
-<<<<<<< HEAD
 msgstr "Iêmen"
-=======
-msgstr ""
->>>>>>> image-class
 
 #. iso.code:YU
 #: DBarea JOIN iso_3166_1 iso on iso.area = area.id/area.name:235
 msgid "Yugoslavia"
-<<<<<<< HEAD
 msgstr "Iugoslávia"
-=======
-msgstr ""
->>>>>>> image-class
 
 #. iso.code:ZM
 #: DBarea JOIN iso_3166_1 iso on iso.area = area.id/area.name:237
 msgid "Zambia"
-<<<<<<< HEAD
 msgstr "Zâmbia"
-=======
-msgstr ""
->>>>>>> image-class
 
 #. iso.code:ZW
 #: DBarea JOIN iso_3166_1 iso on iso.area = area.id/area.name:238
 msgid "Zimbabwe"
-<<<<<<< HEAD
 msgstr "Zimbabwe"
-=======
-msgstr ""
->>>>>>> image-class
 
 #. iso.code:XW
 #: DBarea JOIN iso_3166_1 iso on iso.area = area.id/area.name:240
diff --git a/po/countries/zh_CN.po b/po/countries/zh_CN.po
index e19a689f8..8f15a1a7c 100644
--- a/po/countries/zh_CN.po
+++ b/po/countries/zh_CN.po
@@ -15,13 +15,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: MusicBrainz\n"
-<<<<<<< HEAD
 "PO-Revision-Date: 2014-02-05 13:23+0000\n"
 "Last-Translator: mry_33 <mry_33@163.com>\n"
-=======
-"PO-Revision-Date: 2014-01-12 12:58+0000\n"
-"Last-Translator: Ian McEwen <ianmcorvidae@ianmcorvidae.net>\n"
->>>>>>> image-class
 "Language-Team: Chinese (China) (http://www.transifex.com/projects/p/musicbrainz/language/zh_CN/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -157,11 +152,7 @@ msgstr "不丹"
 #. iso.code:BO
 #: DBarea JOIN iso_3166_1 iso on iso.area = area.id/area.name:26
 msgid "Bolivia"
-<<<<<<< HEAD
 msgstr "玻利维亚"
-=======
-msgstr ""
->>>>>>> image-class
 
 #. iso.code:BQ
 #: DBarea JOIN iso_3166_1 iso on iso.area = area.id/area.name:258
@@ -196,20 +187,12 @@ msgstr "英属印度洋领地"
 #. iso.code:VG
 #: DBarea JOIN iso_3166_1 iso on iso.area = area.id/area.name:230
 msgid "British Virgin Islands"
-<<<<<<< HEAD
 msgstr "英属维京群岛"
-=======
-msgstr ""
->>>>>>> image-class
 
 #. iso.code:BN
 #: DBarea JOIN iso_3166_1 iso on iso.area = area.id/area.name:32
 msgid "Brunei"
-<<<<<<< HEAD
 msgstr "文莱"
-=======
-msgstr ""
->>>>>>> image-class
 
 #. iso.code:BG
 #: DBarea JOIN iso_3166_1 iso on iso.area = area.id/area.name:33
@@ -334,11 +317,7 @@ msgstr "捷克"
 #. iso.code:XC
 #: DBarea JOIN iso_3166_1 iso on iso.area = area.id/area.name:245
 msgid "Czechoslovakia"
-<<<<<<< HEAD
 msgstr "捷克斯洛伐克"
-=======
-msgstr ""
->>>>>>> image-class
 
 #. iso.code:CI
 #: DBarea JOIN iso_3166_1 iso on iso.area = area.id/area.name:52
@@ -348,11 +327,7 @@ msgstr "科特迪瓦"
 #. iso.code:CD
 #: DBarea JOIN iso_3166_1 iso on iso.area = area.id/area.name:236
 msgid "Democratic Republic of the Congo"
-<<<<<<< HEAD
 msgstr "刚果民主共和国"
-=======
-msgstr ""
->>>>>>> image-class
 
 #. iso.code:DK
 #: DBarea JOIN iso_3166_1 iso on iso.area = area.id/area.name:57
@@ -377,11 +352,7 @@ msgstr "多米尼加共和国"
 #. iso.code:XG
 #: DBarea JOIN iso_3166_1 iso on iso.area = area.id/area.name:244
 msgid "East Germany"
-<<<<<<< HEAD
 msgstr "东德"
-=======
-msgstr ""
->>>>>>> image-class
 
 #. iso.code:EC
 #: DBarea JOIN iso_3166_1 iso on iso.area = area.id/area.name:62
@@ -426,11 +397,7 @@ msgstr "欧洲"
 #. iso.code:FK
 #: DBarea JOIN iso_3166_1 iso on iso.area = area.id/area.name:69
 msgid "Falkland Islands"
-<<<<<<< HEAD
 msgstr "福克兰群岛"
-=======
-msgstr ""
->>>>>>> image-class
 
 #. iso.code:FO
 #: DBarea JOIN iso_3166_1 iso on iso.area = area.id/area.name:70
@@ -590,11 +557,7 @@ msgstr "印度尼西亚"
 #. iso.code:IR
 #: DBarea JOIN iso_3166_1 iso on iso.area = area.id/area.name:101
 msgid "Iran"
-<<<<<<< HEAD
 msgstr "伊朗"
-=======
-msgstr ""
->>>>>>> image-class
 
 #. iso.code:IQ
 #: DBarea JOIN iso_3166_1 iso on iso.area = area.id/area.name:102
@@ -659,11 +622,7 @@ msgstr "基里巴斯"
 #. iso.code:XK
 #: DBarea JOIN iso_3166_1 iso on iso.area = area.id/area.name:2358
 msgid "Kosovo"
-<<<<<<< HEAD
 msgstr "科索沃"
-=======
-msgstr ""
->>>>>>> image-class
 
 #. iso.code:KW
 #: DBarea JOIN iso_3166_1 iso on iso.area = area.id/area.name:114
@@ -678,11 +637,7 @@ msgstr "吉尔吉斯坦"
 #. iso.code:LA
 #: DBarea JOIN iso_3166_1 iso on iso.area = area.id/area.name:116
 msgid "Laos"
-<<<<<<< HEAD
 msgstr "老挝"
-=======
-msgstr ""
->>>>>>> image-class
 
 #. iso.code:LV
 #: DBarea JOIN iso_3166_1 iso on iso.area = area.id/area.name:117
@@ -732,11 +687,7 @@ msgstr "澳门"
 #. iso.code:MK
 #: DBarea JOIN iso_3166_1 iso on iso.area = area.id/area.name:126
 msgid "Macedonia"
-<<<<<<< HEAD
 msgstr "马其顿"
-=======
-msgstr ""
->>>>>>> image-class
 
 #. iso.code:MG
 #: DBarea JOIN iso_3166_1 iso on iso.area = area.id/area.name:127
@@ -806,11 +757,7 @@ msgstr "密克罗尼西亚"
 #. iso.code:MD
 #: DBarea JOIN iso_3166_1 iso on iso.area = area.id/area.name:140
 msgid "Moldova"
-<<<<<<< HEAD
 msgstr "摩尔多瓦"
-=======
-msgstr ""
->>>>>>> image-class
 
 #. iso.code:MC
 #: DBarea JOIN iso_3166_1 iso on iso.area = area.id/area.name:141
@@ -870,11 +817,7 @@ msgstr "荷兰"
 #. iso.code:AN
 #: DBarea JOIN iso_3166_1 iso on iso.area = area.id/area.name:151
 msgid "Netherlands Antilles"
-<<<<<<< HEAD
 msgstr "荷属安的列斯群岛"
-=======
-msgstr ""
->>>>>>> image-class
 
 #. iso.code:NC
 #: DBarea JOIN iso_3166_1 iso on iso.area = area.id/area.name:152
@@ -914,11 +857,7 @@ msgstr "诺福克岛"
 #. iso.code:KP
 #: DBarea JOIN iso_3166_1 iso on iso.area = area.id/area.name:112
 msgid "North Korea"
-<<<<<<< HEAD
 msgstr "朝鲜"
-=======
-msgstr ""
->>>>>>> image-class
 
 #. iso.code:MP
 #: DBarea JOIN iso_3166_1 iso on iso.area = area.id/area.name:159
@@ -948,11 +887,7 @@ msgstr "帕劳"
 #. iso.code:PS
 #: DBarea JOIN iso_3166_1 iso on iso.area = area.id/area.name:249
 msgid "Palestine"
-<<<<<<< HEAD
 msgstr "巴勒斯坦"
-=======
-msgstr ""
->>>>>>> image-class
 
 #. iso.code:PA
 #: DBarea JOIN iso_3166_1 iso on iso.area = area.id/area.name:164
@@ -1092,11 +1027,7 @@ msgstr "塞尔维亚"
 #. iso.code:CS
 #: DBarea JOIN iso_3166_1 iso on iso.area = area.id/area.name:242
 msgid "Serbia and Montenegro"
-<<<<<<< HEAD
 msgstr "塞尔维亚和黑山"
-=======
-msgstr ""
->>>>>>> image-class
 
 #. iso.code:SC
 #: DBarea JOIN iso_3166_1 iso on iso.area = area.id/area.name:186
@@ -1151,11 +1082,7 @@ msgstr "南乔治亚岛和南桑德韦奇岛"
 #. iso.code:KR
 #: DBarea JOIN iso_3166_1 iso on iso.area = area.id/area.name:113
 msgid "South Korea"
-<<<<<<< HEAD
 msgstr "韩国"
-=======
-msgstr ""
->>>>>>> image-class
 
 #. iso.code:SS
 #: DBarea JOIN iso_3166_1 iso on iso.area = area.id/area.name:257
@@ -1165,11 +1092,7 @@ msgstr "南苏丹"
 #. iso.code:SU
 #: DBarea JOIN iso_3166_1 iso on iso.area = area.id/area.name:243
 msgid "Soviet Union"
-<<<<<<< HEAD
 msgstr "前苏联"
-=======
-msgstr ""
->>>>>>> image-class
 
 #. iso.code:ES
 #: DBarea JOIN iso_3166_1 iso on iso.area = area.id/area.name:194
@@ -1214,11 +1137,7 @@ msgstr "瑞士"
 #. iso.code:SY
 #: DBarea JOIN iso_3166_1 iso on iso.area = area.id/area.name:204
 msgid "Syria"
-<<<<<<< HEAD
 msgstr "叙利亚"
-=======
-msgstr ""
->>>>>>> image-class
 
 #. iso.code:TW
 #: DBarea JOIN iso_3166_1 iso on iso.area = area.id/area.name:205
@@ -1233,11 +1152,7 @@ msgstr "塔吉克斯坦"
 #. iso.code:TZ
 #: DBarea JOIN iso_3166_1 iso on iso.area = area.id/area.name:207
 msgid "Tanzania"
-<<<<<<< HEAD
 msgstr "坦桑尼亚"
-=======
-msgstr ""
->>>>>>> image-class
 
 #. iso.code:TH
 #: DBarea JOIN iso_3166_1 iso on iso.area = area.id/area.name:208
@@ -1297,11 +1212,7 @@ msgstr "图瓦卢语"
 #. iso.code:VI
 #: DBarea JOIN iso_3166_1 iso on iso.area = area.id/area.name:231
 msgid "U.S. Virgin Islands"
-<<<<<<< HEAD
 msgstr "美属维京群岛"
-=======
-msgstr ""
->>>>>>> image-class
 
 #. iso.code:UG
 #: DBarea JOIN iso_3166_1 iso on iso.area = area.id/area.name:218
@@ -1356,20 +1267,12 @@ msgstr "梵蒂冈城国 (教廷)"
 #. iso.code:VE
 #: DBarea JOIN iso_3166_1 iso on iso.area = area.id/area.name:228
 msgid "Venezuela"
-<<<<<<< HEAD
 msgstr "委内瑞拉"
-=======
-msgstr ""
->>>>>>> image-class
 
 #. iso.code:VN
 #: DBarea JOIN iso_3166_1 iso on iso.area = area.id/area.name:229
 msgid "Vietnam"
-<<<<<<< HEAD
 msgstr "越南"
-=======
-msgstr ""
->>>>>>> image-class
 
 #. iso.code:WF
 #: DBarea JOIN iso_3166_1 iso on iso.area = area.id/area.name:232
@@ -1389,11 +1292,7 @@ msgstr "也门"
 #. iso.code:YU
 #: DBarea JOIN iso_3166_1 iso on iso.area = area.id/area.name:235
 msgid "Yugoslavia"
-<<<<<<< HEAD
 msgstr "南斯拉夫"
-=======
-msgstr ""
->>>>>>> image-class
 
 #. iso.code:ZM
 #: DBarea JOIN iso_3166_1 iso on iso.area = area.id/area.name:237
diff --git a/test/test_formats.py b/test/test_formats.py
index 093aecd4b..2c0cfa052 100644
--- a/test/test_formats.py
+++ b/test/test_formats.py
@@ -1,14 +1,11 @@
 import os.path
-import picard.formats
 import unittest
 import shutil
-
-
-from PyQt4 import QtCore
-from collections import defaultdict
+from tempfile import mkstemp
 from picard import config, log
 from picard.metadata import Metadata
-from tempfile import mkstemp
+import picard.formats
+from PyQt4 import QtCore
 
 
 settings = {
@@ -36,7 +33,6 @@ class FakeTagger(QtCore.QObject):
         QtCore.QObject.config = config
         QtCore.QObject.log = log
         self.tagger_stats_changed.connect(self.emit)
-        self.images = defaultdict(lambda: None)
 
     def emit(self, *args):
         pass
@@ -508,7 +504,6 @@ class TestCoverArt(unittest.TestCase):
         QtCore.QObject.tagger = FakeTagger()
 
     def _tear_down(self):
-        map(lambda i: i._delete(), QtCore.QObject.tagger.images.itervalues())
         os.unlink(self.filename)
 
     def test_asf(self):
@@ -549,13 +544,13 @@ class TestCoverArt(unittest.TestCase):
                 f = picard.formats.open(self.filename)
                 metadata = Metadata()
                 imgdata = tests[t]['head'] + dummyload
-                metadata.make_and_add_image(tests[t]['mime'], imgdata)
+                metadata.add_image(tests[t]['mime'], imgdata)
                 f._save(self.filename, metadata)
 
                 f = picard.formats.open(self.filename)
                 loaded_metadata = f._load(self.filename)
                 image = loaded_metadata.images[0]
-                self.assertEqual(image.mimetype, tests[t]['mime'])
-                self.assertEqual(image.data, imgdata)
+                self.assertEqual(image["mime"], tests[t]['mime'])
+                self.assertEqual(image["data"], imgdata)
         finally:
             self._tear_down()