diff --git a/contrib/plugins/titlecase.py b/contrib/plugins/titlecase.py
new file mode 100644
index 000000000..7d5da394c
--- /dev/null
+++ b/contrib/plugins/titlecase.py
@@ -0,0 +1,57 @@
+# Copyright 2007 Javier Kohen
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License version 2 as
+# published by the Free Software Foundation
+
+import unicodedata
+
+def iswbound(char):
+    """Returns whether the given character is a word boundary."""
+    category = unicodedata.category(char)
+    # If it's a space separator or punctuation
+    return 'Zs' == category or 'Sk' == category or 'P' == category[0]
+
+def utitle(string):
+    """Title-case a string using a less destructive method than str.title."""
+    new_string = string[0].capitalize()
+    cap = False
+    for i in xrange(1, len(string)):
+        s = string[i]
+        # Special case apostrophe in the middle of a word.
+        if u"'" == s and string[i-1].isalpha(): cap = False
+        elif iswbound(s): cap = True
+        elif cap and s.isalpha():
+            cap = False
+            s = s.capitalize()
+        else: cap = False
+        new_string += s
+    return new_string
+
+def title(string, locale="utf-8"):
+    """Title-case a string using a less destructive method than str.title."""
+    if not string: return u""
+    # if the string is all uppercase, lowercase it - Erich/Javier
+    #   Lots of Japanese songs use entirely upper-case English titles,
+    #   so I don't like this change... - JoeW
+    #if string == string.upper(): string = string.lower()
+    if not isinstance(string, unicode):
+        string = string.decode(locale)
+    return utitle(string)
+
+
+PLUGIN_NAME = "Title Case"
+PLUGIN_API_VERSIONS = ["0.9", "0.10", "0.11"]
+PLUGIN_DESCRIPTION = "Capitalize First Character In Every Word Of A Title"
+from picard.metadata import (
+    register_track_metadata_processor,
+    register_album_metadata_processor,
+    )
+
+def title_case(tagger, metadata, release, track=None):
+    for name, value in metadata.rawitems():
+        if name in ["title", "album", "artist"]:
+            metadata[name] = [title(x) for x in value]
+
+register_track_metadata_processor(title_case)
+register_album_metadata_processor(title_case)
diff --git a/picard/const.py b/picard/const.py
index 4f0759272..f233d101a 100644
--- a/picard/const.py
+++ b/picard/const.py
@@ -301,3 +301,39 @@ RELEASE_COUNTRIES = {
     u'XW': N_('[Worldwide]'),
     u'YU': N_('Yugoslavia (historical, 1918-1992)'),
 }
+
+# List of available user interface languages
+UI_LANGUAGES = [
+    (u'ca', u'Català', N_(u'Catalan')),
+    (u'cs', u'Čeština', N_(u'Czech')),
+    (u'cy', u'Cymraeg', N_(u'Welsh')),
+    (u'da', u'Dansk', N_(u'Danish')),
+    (u'de', u'Deutsch', N_(u'German')),
+    (u'en', u'English', N_(u'English')),
+    (u'en_CA', u'English (Canada)', N_(u'English (Canada)')),
+    (u'en_GB', u'English (UK)', N_(u'English (UK)')),
+    (u'es', u'Español', N_(u'Spanish')),
+    (u'fa', u'فارسی', N_(u'Persian')),
+    (u'fi', u'Suomi', N_(u'Finnish')),
+    (u'fr', u'Français', N_(u'French')),
+    (u'fy', u'Frysk', N_(u'Frisian')),
+    (u'he', u'עברית', N_(u'Hebrew')),
+    (u'hu', u'Magyar', N_(u'Hungarian')),
+    (u'is', u'Íslenska', N_(u'Islandic')),
+    (u'it', u'Italiano', N_(u'Italian')),
+    (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'nl', u'Nederlands', N_(u'Dutch')),
+    (u'pl', u'Polski', N_(u'Polish')),
+    (u'pt', u'Português', N_(u'Portuguese')),
+    (u'pt_BR', u'Português do Brasil', N_(u'Brazilian Portuguese')),
+    (u'ro', u'Română', N_(u'Romanian')),
+    (u'ru', u'Pyccĸий', N_(u'Russian')),
+    (u'sco', u'Scots leid', N_(u'Scots')),
+    (u'sk', u'Slovenčina', N_(u'Slovak')),
+    (u'sl', u'Slovenščina', N_(u'Slovenian')),
+    (u'sv', u'Svenska', N_(u'Swedish')),
+    (u'zh_CN', u'中文', N_(u'Chinese')),
+]
diff --git a/picard/formats/apev2.py b/picard/formats/apev2.py
index e1532ab43..af80bb67f 100644
--- a/picard/formats/apev2.py
+++ b/picard/formats/apev2.py
@@ -52,6 +52,14 @@ class APEv2File(File):
         metadata = Metadata()
         if file.tags:
             for origname, values in file.tags.items():
+                if origname.lower().startswith("cover art") and values.kind == mutagen.apev2.BINARY:
+                    if '\0' in values.value:
+                        descr, data = values.value.split('\0', 1)
+                        if data.startswith('\xff\xd8\xff\xe0'):
+                            mime = 'image/jpeg'
+                        else:
+                            mime = 'image/png'
+                        metadata.add_image(mime, data)
                 # skip EXTERNAL and BINARY values
                 if values.kind != mutagen.apev2.TEXT:
                     continue
@@ -89,6 +97,10 @@ class APEv2File(File):
             tags = mutagen.apev2.APEv2()
         if settings["clear_existing_tags"]:
             tags.clear()
+        elif settings['save_images_to_tags']:
+            for name, value in tags.items():
+                if name.lower().startswith('cover art') and value.kind == mutagen.apev2.BINARY:
+                    del tags[name]
         temp = {}
         for name, value in metadata.items():
             if name.startswith("~"):
@@ -122,6 +134,16 @@ class APEv2File(File):
             temp.setdefault(name, []).append(value)
         for name, values in temp.items():
             tags[str(name)] = values
+        if settings['save_images_to_tags']:
+            for mime, data in metadata.images:
+                cover_filename = 'Cover Art (Front).'
+                if mime == 'image/jpeg':
+                    cover_filename += 'jpg'
+                else:
+                    cover_filename += 'png'
+                tags['Cover Art (Front)'] = cover_filename + '\0' + data
+                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))
 
 class MusepackFile(APEv2File):
diff --git a/picard/mbxml.py b/picard/mbxml.py
index 2ba685a27..8af731fe5 100644
--- a/picard/mbxml.py
+++ b/picard/mbxml.py
@@ -49,9 +49,10 @@ def _decamelcase(text):
     return re.sub(r'([A-Z])', r' \1', text).strip()
 
 
+_REPLACE_MAP = {'TurntableS': 'Turntable(s)'}
 _EXTRA_ATTRS = ['Guest', 'Additional', 'Minor']
 def _parse_attributes(attrs):
-    attrs = map(_decamelcase, attrs)
+    attrs = [_decamelcase(_REPLACE_MAP.get(a, a)) for a in attrs]
     prefix = ' '.join([a for a in attrs if a in _EXTRA_ATTRS])
     attrs = [a for a in attrs if a not in _EXTRA_ATTRS]
     if len(attrs) > 1:
diff --git a/picard/tagger.py b/picard/tagger.py
index 5ed269ef2..a8c9bbb9c 100644
--- a/picard/tagger.py
+++ b/picard/tagger.py
@@ -204,6 +204,9 @@ class Tagger(QtGui.QApplication):
 
     def setup_gettext(self, localedir):
         """Setup locales, load translations, install gettext functions."""
+        if self.config.setting["ui_language"]:
+            os.environ['LANGUAGE'] = ''
+            os.environ['LANG'] = self.config.setting["ui_language"]
         if sys.platform == "win32":
             try:
                 locale.setlocale(locale.LC_ALL, os.environ["LANG"])
diff --git a/picard/ui/options/interface.py b/picard/ui/options/interface.py
index 68dd939f3..401a74183 100644
--- a/picard/ui/options/interface.py
+++ b/picard/ui/options/interface.py
@@ -17,9 +17,12 @@
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 
-from picard.config import BoolOption
+from PyQt4 import QtCore, QtGui
+from picard.config import BoolOption, TextOption
 from picard.ui.options import OptionsPage, register_options_page
 from picard.ui.ui_options_interface import Ui_InterfaceOptionsPage
+from picard.const import UI_LANGUAGES
+import operator
 
 
 class InterfaceOptionsPage(OptionsPage):
@@ -34,23 +37,39 @@ class InterfaceOptionsPage(OptionsPage):
         BoolOption("setting", "toolbar_show_labels", True),
         BoolOption("setting", "toolbar_multiselect", False),
         BoolOption("setting", "use_adv_search_syntax", False),
+        TextOption("setting", "ui_language", u""),
     ]
 
     def __init__(self, parent=None):
         super(InterfaceOptionsPage, self).__init__(parent)
         self.ui = Ui_InterfaceOptionsPage()
         self.ui.setupUi(self)
+        self.ui.ui_language.addItem(_('System default'), QtCore.QVariant(''))
+        language_list = [(l[0], l[1], _(l[2])) for l in UI_LANGUAGES]
+        for lang_code, native, translation in sorted(language_list, key=operator.itemgetter(2)):
+            if native and native != translation:
+                name = u'%s (%s)' % (translation, native)
+            else:
+                name = translation
+            self.ui.ui_language.addItem(name, QtCore.QVariant(lang_code))
 
     def load(self):
         self.ui.toolbar_show_labels.setChecked(self.config.setting["toolbar_show_labels"])
         self.ui.toolbar_multiselect.setChecked(self.config.setting["toolbar_multiselect"])
         self.ui.use_adv_search_syntax.setChecked(self.config.setting["use_adv_search_syntax"])
+        current_ui_language = QtCore.QVariant(self.config.setting["ui_language"])
+        self.ui.ui_language.setCurrentIndex(self.ui.ui_language.findData(current_ui_language))
 
     def save(self):
         self.config.setting["toolbar_show_labels"] = self.ui.toolbar_show_labels.isChecked()
         self.config.setting["toolbar_multiselect"] = self.ui.toolbar_multiselect.isChecked()
         self.config.setting["use_adv_search_syntax"] = self.ui.use_adv_search_syntax.isChecked()
         self.tagger.window.update_toolbar_style()
+        new_language = self.ui.ui_language.itemData(self.ui.ui_language.currentIndex()).toString()
+        if new_language != self.config.setting["ui_language"]:
+            self.config.setting["ui_language"] = self.ui.ui_language.itemData(self.ui.ui_language.currentIndex()).toString()
+            dialog = QtGui.QMessageBox(QtGui.QMessageBox.Information, _('Language changed'), _('You have changed the interface language. You have to restart Picard in order for the change to take effect.'), QtGui.QMessageBox.Ok, self)
+            dialog.exec_()
 
 
 register_options_page(InterfaceOptionsPage)
diff --git a/picard/ui/options/metadata.py b/picard/ui/options/metadata.py
index 24038a04e..fc706aeb3 100644
--- a/picard/ui/options/metadata.py
+++ b/picard/ui/options/metadata.py
@@ -49,8 +49,9 @@ class MetadataOptionsPage(OptionsPage):
         self.ui.setupUi(self)
         self.connect(self.ui.va_name_default, QtCore.SIGNAL("clicked()"), self.set_va_name_default)
         self.connect(self.ui.nat_name_default, QtCore.SIGNAL("clicked()"), self.set_nat_name_default)
-        self.ui.preferred_release_country.addItem(N_("None"), QtCore.QVariant(""))
-        for country, name in sorted(RELEASE_COUNTRIES.items(), key=operator.itemgetter(1)):
+        self.ui.preferred_release_country.addItem(_("None"), QtCore.QVariant(""))
+        country_list = [(c[0], _(c[1])) for c in RELEASE_COUNTRIES.items()]
+        for country, name in sorted(country_list, key=operator.itemgetter(1)):
             self.ui.preferred_release_country.addItem(name, QtCore.QVariant(country))
 
     def load(self):
diff --git a/picard/ui/ui_options_interface.py b/picard/ui/ui_options_interface.py
index 4867a17ef..e504c661f 100644
--- a/picard/ui/ui_options_interface.py
+++ b/picard/ui/ui_options_interface.py
@@ -2,8 +2,8 @@
 
 # Form implementation generated from reading ui file 'ui/options_interface.ui'
 #
-# Created: Fri Mar 28 08:55:16 2008
-#      by: PyQt4 UI code generator 4.3
+# Created: Sat Jan 24 18:12:02 2009
+#      by: PyQt4 UI code generator 4.4.3
 #
 # WARNING! All changes made in this file will be lost!
 
@@ -12,32 +12,36 @@ from PyQt4 import QtCore, QtGui
 class Ui_InterfaceOptionsPage(object):
     def setupUi(self, InterfaceOptionsPage):
         InterfaceOptionsPage.setObjectName("InterfaceOptionsPage")
-        InterfaceOptionsPage.resize(QtCore.QSize(QtCore.QRect(0,0,276,196).size()).expandedTo(InterfaceOptionsPage.minimumSizeHint()))
-
+        InterfaceOptionsPage.resize(287, 200)
         self.vboxlayout = QtGui.QVBoxLayout(InterfaceOptionsPage)
         self.vboxlayout.setObjectName("vboxlayout")
-
         self.groupBox_2 = QtGui.QGroupBox(InterfaceOptionsPage)
         self.groupBox_2.setObjectName("groupBox_2")
-
         self.vboxlayout1 = QtGui.QVBoxLayout(self.groupBox_2)
         self.vboxlayout1.setObjectName("vboxlayout1")
-
         self.toolbar_show_labels = QtGui.QCheckBox(self.groupBox_2)
         self.toolbar_show_labels.setObjectName("toolbar_show_labels")
         self.vboxlayout1.addWidget(self.toolbar_show_labels)
-
         self.toolbar_multiselect = QtGui.QCheckBox(self.groupBox_2)
         self.toolbar_multiselect.setObjectName("toolbar_multiselect")
         self.vboxlayout1.addWidget(self.toolbar_multiselect)
-
         self.use_adv_search_syntax = QtGui.QCheckBox(self.groupBox_2)
         self.use_adv_search_syntax.setObjectName("use_adv_search_syntax")
         self.vboxlayout1.addWidget(self.use_adv_search_syntax)
+        self.label = QtGui.QLabel(self.groupBox_2)
+        self.label.setObjectName("label")
+        self.vboxlayout1.addWidget(self.label)
+        self.horizontalLayout = QtGui.QHBoxLayout()
+        self.horizontalLayout.setObjectName("horizontalLayout")
+        self.ui_language = QtGui.QComboBox(self.groupBox_2)
+        self.ui_language.setObjectName("ui_language")
+        self.horizontalLayout.addWidget(self.ui_language)
+        spacerItem = QtGui.QSpacerItem(40, 20, QtGui.QSizePolicy.Expanding, QtGui.QSizePolicy.Minimum)
+        self.horizontalLayout.addItem(spacerItem)
+        self.vboxlayout1.addLayout(self.horizontalLayout)
         self.vboxlayout.addWidget(self.groupBox_2)
-
-        spacerItem = QtGui.QSpacerItem(220,61,QtGui.QSizePolicy.Minimum,QtGui.QSizePolicy.Expanding)
-        self.vboxlayout.addItem(spacerItem)
+        spacerItem1 = QtGui.QSpacerItem(220, 61, QtGui.QSizePolicy.Minimum, QtGui.QSizePolicy.Expanding)
+        self.vboxlayout.addItem(spacerItem1)
 
         self.retranslateUi(InterfaceOptionsPage)
         QtCore.QMetaObject.connectSlotsByName(InterfaceOptionsPage)
@@ -47,4 +51,5 @@ class Ui_InterfaceOptionsPage(object):
         self.toolbar_show_labels.setText(_("Show text labels under icons"))
         self.toolbar_multiselect.setText(_("Allow selection of multiple directories"))
         self.use_adv_search_syntax.setText(_("Use advanced query syntax"))
+        self.label.setText(_("User interface language:"))
 
diff --git a/po/ca.po b/po/ca.po
index 5d2da458a..3320b1a35 100644
--- a/po/ca.po
+++ b/po/ca.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: picard\n"
 "Report-Msgid-Bugs-To: http://bugs.musicbrainz.org/\n"
-"POT-Creation-Date: 2008-12-01 18:20+0100\n"
+"POT-Creation-Date: 2009-01-25 12:23+0100\n"
 "PO-Revision-Date: 2008-10-29 20:15+0000\n"
 "Last-Translator: Pere Cordonet <Unknown>\n"
 "Language-Team: Catalan <ca@li.org>\n"
@@ -15,27 +15,1258 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2008-12-01 17:02+0000\n"
+"X-Launchpad-Export-Date: 2009-01-24 23:28+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #: ../picard/album.py:108 ../picard/cluster.py:248
 msgid "Unmatched Files"
 msgstr "Arxius de inigualable"
 
-#: ../picard/album.py:269
+#: ../picard/album.py:281
 #, python-format
 msgid "[couldn't load album %s]"
 msgstr ""
 
-#: ../picard/album.py:305
+#: ../picard/album.py:317
 msgid "[loading album information]"
 msgstr "carregant informació del album"
 
-#: ../picard/tagger.py:472
+#: ../picard/cluster.py:164 ../picard/cluster.py:175
+#, python-format
+msgid "No matching releases for cluster %s"
+msgstr ""
+
+#: ../picard/cluster.py:177
+#, python-format
+msgid "Cluster %s identified!"
+msgstr ""
+
+#: ../picard/cluster.py:182
+#, python-format
+msgid "Looking up the metadata for cluster %s..."
+msgstr ""
+
+#: ../picard/const.py:40
+msgid "CD"
+msgstr ""
+
+#: ../picard/const.py:41
+msgid "DVD"
+msgstr ""
+
+#: ../picard/const.py:42
+msgid "SACD"
+msgstr ""
+
+#: ../picard/const.py:43
+msgid "LaserDisc"
+msgstr ""
+
+#: ../picard/const.py:44
+msgid "MiniDisc"
+msgstr ""
+
+#: ../picard/const.py:45
+msgid "Vinyl"
+msgstr ""
+
+#: ../picard/const.py:46
+msgid "Cassette"
+msgstr ""
+
+#: ../picard/const.py:47
+msgid "Cartridge (4/8-tracks)"
+msgstr ""
+
+#: ../picard/const.py:48
+msgid "Reel-to-Reel"
+msgstr ""
+
+#: ../picard/const.py:49
+msgid "DAT"
+msgstr ""
+
+#: ../picard/const.py:50
+msgid "Digital Media"
+msgstr ""
+
+#: ../picard/const.py:51
+msgid "Wax Cylinder"
+msgstr ""
+
+#: ../picard/const.py:52
+msgid "Piano Roll"
+msgstr ""
+
+#: ../picard/const.py:53
+msgid "Other"
+msgstr ""
+
+#: ../picard/const.py:58
+msgid "Bangladesh"
+msgstr ""
+
+#: ../picard/const.py:59
+msgid "Belgium"
+msgstr ""
+
+#: ../picard/const.py:60
+msgid "Burkina Faso"
+msgstr ""
+
+#: ../picard/const.py:61
+msgid "Bulgaria"
+msgstr ""
+
+#: ../picard/const.py:62
+msgid "Barbados"
+msgstr ""
+
+#: ../picard/const.py:63
+msgid "Wallis and Futuna Islands"
+msgstr ""
+
+#: ../picard/const.py:64
+msgid "Bermuda"
+msgstr ""
+
+#: ../picard/const.py:65
+msgid "Brunei Darussalam"
+msgstr ""
+
+#: ../picard/const.py:66
+msgid "Bolivia"
+msgstr ""
+
+#: ../picard/const.py:67
+msgid "Bahrain"
+msgstr ""
+
+#: ../picard/const.py:68
+msgid "Burundi"
+msgstr ""
+
+#: ../picard/const.py:69
+msgid "Benin"
+msgstr ""
+
+#: ../picard/const.py:70
+msgid "Bhutan"
+msgstr ""
+
+#: ../picard/const.py:71
+msgid "Jamaica"
+msgstr ""
+
+#: ../picard/const.py:72
+msgid "Bouvet Island"
+msgstr ""
+
+#: ../picard/const.py:73
+msgid "Botswana"
+msgstr ""
+
+#: ../picard/const.py:74
+msgid "Samoa"
+msgstr ""
+
+#: ../picard/const.py:75
+msgid "Brazil"
+msgstr ""
+
+#: ../picard/const.py:76
+msgid "Bahamas"
+msgstr ""
+
+#: ../picard/const.py:77
+msgid "Belarus"
+msgstr ""
+
+#: ../picard/const.py:78
+msgid "Belize"
+msgstr ""
+
+#: ../picard/const.py:79
+msgid "Russian Federation"
+msgstr ""
+
+#: ../picard/const.py:80
+msgid "Rwanda"
+msgstr ""
+
+#: ../picard/const.py:81
+msgid "Reunion"
+msgstr ""
+
+#: ../picard/const.py:82
+msgid "Turkmenistan"
+msgstr ""
+
+#: ../picard/const.py:83
+msgid "Tajikistan"
+msgstr ""
+
+#: ../picard/const.py:84
+msgid "Romania"
+msgstr ""
+
+#: ../picard/const.py:85
+msgid "Tokela"
+msgstr ""
+
+#: ../picard/const.py:86
+msgid "Guinea-Bissa"
+msgstr ""
+
+#: ../picard/const.py:87
+msgid "Guam"
+msgstr ""
+
+#: ../picard/const.py:88
+msgid "Guatemala"
+msgstr ""
+
+#: ../picard/const.py:89
+msgid "Greece"
+msgstr ""
+
+#: ../picard/const.py:90
+msgid "Equatorial Guinea"
+msgstr ""
+
+#: ../picard/const.py:91
+msgid "Guadeloupe"
+msgstr ""
+
+#: ../picard/const.py:92
+msgid "Japan"
+msgstr ""
+
+#: ../picard/const.py:93
+msgid "Guyana"
+msgstr ""
+
+#: ../picard/const.py:94
+msgid "French Guiana"
+msgstr ""
+
+#: ../picard/const.py:95
+msgid "Georgia"
+msgstr ""
+
+#: ../picard/const.py:96
+msgid "Grenada"
+msgstr ""
+
+#: ../picard/const.py:97
+msgid "United Kingdom"
+msgstr ""
+
+#: ../picard/const.py:98
+msgid "Gabon"
+msgstr ""
+
+#: ../picard/const.py:99
+msgid "El Salvador"
+msgstr ""
+
+#: ../picard/const.py:100
+msgid "Guinea"
+msgstr ""
+
+#: ../picard/const.py:101
+msgid "Gambia"
+msgstr ""
+
+#: ../picard/const.py:102
+msgid "Greenland"
+msgstr ""
+
+#: ../picard/const.py:103
+msgid "Gibraltar"
+msgstr ""
+
+#: ../picard/const.py:104
+msgid "Ghana"
+msgstr ""
+
+#: ../picard/const.py:105
+msgid "Oman"
+msgstr ""
+
+#: ../picard/const.py:106
+msgid "Tunisia"
+msgstr ""
+
+#: ../picard/const.py:107
+msgid "Jordan"
+msgstr ""
+
+#: ../picard/const.py:108
+msgid "Haiti"
+msgstr ""
+
+#: ../picard/const.py:109
+msgid "Hungary"
+msgstr ""
+
+#: ../picard/const.py:110
+msgid "Hong Kong"
+msgstr ""
+
+#: ../picard/const.py:111
+msgid "Honduras"
+msgstr ""
+
+#: ../picard/const.py:112
+msgid "Heard and Mc Donald Islands"
+msgstr ""
+
+#: ../picard/const.py:113
+msgid "Venezuela"
+msgstr ""
+
+#: ../picard/const.py:114
+msgid "Puerto Rico"
+msgstr ""
+
+#: ../picard/const.py:115
+msgid "Pala"
+msgstr ""
+
+#: ../picard/const.py:116
+msgid "Portugal"
+msgstr ""
+
+#: ../picard/const.py:117
+msgid "Svalbard and Jan Mayen Islands"
+msgstr ""
+
+#: ../picard/const.py:118
+msgid "Paraguay"
+msgstr ""
+
+#: ../picard/const.py:119
+msgid "Iraq"
+msgstr ""
+
+#: ../picard/const.py:120
+msgid "Panama"
+msgstr ""
+
+#: ../picard/const.py:121
+msgid "French Polynesia"
+msgstr ""
+
+#: ../picard/const.py:122
+msgid "Papua New Guinea"
+msgstr ""
+
+#: ../picard/const.py:123
+msgid "Per"
+msgstr ""
+
+#: ../picard/const.py:124
+msgid "Pakistan"
+msgstr ""
+
+#: ../picard/const.py:125
+msgid "Philippines"
+msgstr ""
+
+#: ../picard/const.py:126
+msgid "Pitcairn"
+msgstr ""
+
+#: ../picard/const.py:127
+msgid "Poland"
+msgstr ""
+
+#: ../picard/const.py:128
+msgid "St. Pierre and Miquelon"
+msgstr ""
+
+#: ../picard/const.py:129
+msgid "Zambia"
+msgstr ""
+
+#: ../picard/const.py:130
+msgid "Western Sahara"
+msgstr ""
+
+#: ../picard/const.py:131
+msgid "Estonia"
+msgstr ""
+
+#: ../picard/const.py:132
+msgid "Egypt"
+msgstr ""
+
+#: ../picard/const.py:133
+msgid "South Africa"
+msgstr ""
+
+#: ../picard/const.py:134
+msgid "Ecuador"
+msgstr ""
+
+#: ../picard/const.py:135
+msgid "Italy"
+msgstr ""
+
+#: ../picard/const.py:136
+msgid "Viet Nam"
+msgstr ""
+
+#: ../picard/const.py:137
+msgid "Solomon Islands"
+msgstr ""
+
+#: ../picard/const.py:138
+msgid "Ethiopia"
+msgstr ""
+
+#: ../picard/const.py:139
+msgid "Somalia"
+msgstr ""
+
+#: ../picard/const.py:140
+msgid "Zimbabwe"
+msgstr ""
+
+#: ../picard/const.py:141
+msgid "Saudi Arabia"
+msgstr ""
+
+#: ../picard/const.py:142
+msgid "Spain"
+msgstr ""
+
+#: ../picard/const.py:143
+msgid "Eritrea"
+msgstr ""
+
+#: ../picard/const.py:144
+msgid "Moldova, Republic of"
+msgstr ""
+
+#: ../picard/const.py:145
+msgid "Madagascar"
+msgstr ""
+
+#: ../picard/const.py:146
+msgid "Morocco"
+msgstr ""
+
+#: ../picard/const.py:147
+msgid "Monaco"
+msgstr ""
+
+#: ../picard/const.py:148
+msgid "Uzbekistan"
+msgstr ""
+
+#: ../picard/const.py:149
+msgid "Myanmar"
+msgstr ""
+
+#: ../picard/const.py:150
+msgid "Mali"
+msgstr ""
+
+#: ../picard/const.py:151
+msgid "Maca"
+msgstr ""
+
+#: ../picard/const.py:152
+msgid "Mongolia"
+msgstr ""
+
+#: ../picard/const.py:153
+msgid "Marshall Islands"
+msgstr ""
+
+#: ../picard/const.py:154
+msgid "Macedonia, The Former Yugoslav Republic of"
+msgstr ""
+
+#: ../picard/const.py:155
+msgid "Mauritius"
+msgstr ""
+
+#: ../picard/const.py:156
+msgid "Malta"
+msgstr ""
+
+#: ../picard/const.py:157
+msgid "Malawi"
+msgstr ""
+
+#: ../picard/const.py:158
+msgid "Maldives"
+msgstr ""
+
+#: ../picard/const.py:159
+msgid "Martinique"
+msgstr ""
+
+#: ../picard/const.py:160
+msgid "Northern Mariana Islands"
+msgstr ""
+
+#: ../picard/const.py:161
+msgid "Montserrat"
+msgstr ""
+
+#: ../picard/const.py:162
+msgid "Mauritania"
+msgstr ""
+
+#: ../picard/const.py:163
+msgid "Uganda"
+msgstr ""
+
+#: ../picard/const.py:164
+msgid "Malaysia"
+msgstr ""
+
+#: ../picard/const.py:165
+msgid "Mexico"
+msgstr ""
+
+#: ../picard/const.py:166
+msgid "Israel"
+msgstr ""
+
+#: ../picard/const.py:167
+msgid "France"
+msgstr ""
+
+#: ../picard/const.py:168
+msgid "British Indian Ocean Territory"
+msgstr ""
+
+#: ../picard/const.py:169
+msgid "St. Helena"
+msgstr ""
+
+#: ../picard/const.py:170
+msgid "Finland"
+msgstr ""
+
+#: ../picard/const.py:171
+msgid "Fiji"
+msgstr ""
+
+#: ../picard/const.py:172
+msgid "Falkland Islands (Malvinas)"
+msgstr ""
+
+#: ../picard/const.py:173
+msgid "Micronesia, Federated States of"
+msgstr ""
+
+#: ../picard/const.py:174
+msgid "Faroe Islands"
+msgstr ""
+
+#: ../picard/const.py:175
+msgid "Nicaragua"
+msgstr ""
+
+#: ../picard/const.py:176
+msgid "Netherlands"
+msgstr ""
+
+#: ../picard/const.py:177
+msgid "Norway"
+msgstr ""
+
+#: ../picard/const.py:178
+msgid "Namibia"
+msgstr ""
+
+#: ../picard/const.py:179
+msgid "Vanuat"
+msgstr ""
+
+#: ../picard/const.py:180
+msgid "New Caledonia"
+msgstr ""
+
+#: ../picard/const.py:181
+msgid "Niger"
+msgstr ""
+
+#: ../picard/const.py:182
+msgid "Norfolk Island"
+msgstr ""
+
+#: ../picard/const.py:183
+msgid "Nigeria"
+msgstr ""
+
+#: ../picard/const.py:184
+msgid "New Zealand"
+msgstr ""
+
+#: ../picard/const.py:185
+msgid "Zaire"
+msgstr ""
+
+#: ../picard/const.py:186
+msgid "Nepal"
+msgstr ""
+
+#: ../picard/const.py:187
+msgid "Naur"
+msgstr ""
+
+#: ../picard/const.py:188
+msgid "Niue"
+msgstr ""
+
+#: ../picard/const.py:189
+msgid "Cook Islands"
+msgstr ""
+
+#: ../picard/const.py:190
+msgid "Cote d'Ivoire"
+msgstr ""
+
+#: ../picard/const.py:191
+msgid "Switzerland"
+msgstr ""
+
+#: ../picard/const.py:192
+msgid "Colombia"
+msgstr ""
+
+#: ../picard/const.py:193
+msgid "China"
+msgstr ""
+
+#: ../picard/const.py:194
+msgid "Cameroon"
+msgstr ""
+
+#: ../picard/const.py:195
+#, fuzzy
+msgid "Chile"
+msgstr "Titol"
+
+#: ../picard/const.py:196
+msgid "Cocos (Keeling) Islands"
+msgstr ""
+
+#: ../picard/const.py:197
+msgid "Canada"
+msgstr ""
+
+#: ../picard/const.py:198
+msgid "Congo"
+msgstr ""
+
+#: ../picard/const.py:199
+msgid "Central African Republic"
+msgstr ""
+
+#: ../picard/const.py:200
+msgid "Czech Republic"
+msgstr ""
+
+#: ../picard/const.py:201
+msgid "Cyprus"
+msgstr ""
+
+#: ../picard/const.py:202
+msgid "Christmas Island"
+msgstr ""
+
+#: ../picard/const.py:203
+msgid "Costa Rica"
+msgstr ""
+
+#: ../picard/const.py:204
+msgid "Cape Verde"
+msgstr ""
+
+#: ../picard/const.py:205
+msgid "Cuba"
+msgstr ""
+
+#: ../picard/const.py:206
+msgid "Swaziland"
+msgstr ""
+
+#: ../picard/const.py:207
+msgid "Syrian Arab Republic"
+msgstr ""
+
+#: ../picard/const.py:208
+msgid "Kyrgyzstan"
+msgstr ""
+
+#: ../picard/const.py:209
+msgid "Kenya"
+msgstr ""
+
+#: ../picard/const.py:210
+msgid "Suriname"
+msgstr ""
+
+#: ../picard/const.py:211
+msgid "Kiribati"
+msgstr ""
+
+#: ../picard/const.py:212
+msgid "Cambodia"
+msgstr ""
+
+#: ../picard/const.py:213
+msgid "Saint Kitts and Nevis"
+msgstr ""
+
+#: ../picard/const.py:214
+msgid "Comoros"
+msgstr ""
+
+#: ../picard/const.py:215
+msgid "Sao Tome and Principe"
+msgstr ""
+
+#: ../picard/const.py:216
+msgid "Slovenia"
+msgstr ""
+
+#: ../picard/const.py:217
+msgid "Kuwait"
+msgstr ""
+
+#: ../picard/const.py:218
+msgid "Senegal"
+msgstr ""
+
+#: ../picard/const.py:219
+msgid "San Marino"
+msgstr ""
+
+#: ../picard/const.py:220
+msgid "Sierra Leone"
+msgstr ""
+
+#: ../picard/const.py:221
+msgid "Seychelles"
+msgstr ""
+
+#: ../picard/const.py:222
+msgid "Kazakhstan"
+msgstr ""
+
+#: ../picard/const.py:223
+msgid "Cayman Islands"
+msgstr ""
+
+#: ../picard/const.py:224
+msgid "Singapore"
+msgstr ""
+
+#: ../picard/const.py:225
+msgid "Sweden"
+msgstr ""
+
+#: ../picard/const.py:226
+msgid "Sudan"
+msgstr ""
+
+#: ../picard/const.py:227
+msgid "Dominican Republic"
+msgstr ""
+
+#: ../picard/const.py:228
+msgid "Dominica"
+msgstr ""
+
+#: ../picard/const.py:229
+msgid "Djibouti"
+msgstr ""
+
+#: ../picard/const.py:230
+msgid "Denmark"
+msgstr ""
+
+#: ../picard/const.py:231
+msgid "Virgin Islands (British)"
+msgstr ""
+
+#: ../picard/const.py:232
+msgid "Germany"
+msgstr ""
+
+#: ../picard/const.py:233
+msgid "Yemen"
+msgstr ""
+
+#: ../picard/const.py:234
+msgid "Algeria"
+msgstr ""
+
+#: ../picard/const.py:235
+msgid "United States"
+msgstr ""
+
+#: ../picard/const.py:236
+msgid "Uruguay"
+msgstr ""
+
+#: ../picard/const.py:237
+msgid "Mayotte"
+msgstr ""
+
+#: ../picard/const.py:238
+msgid "United States Minor Outlying Islands"
+msgstr ""
+
+#: ../picard/const.py:239
+msgid "Lebanon"
+msgstr ""
+
+#: ../picard/const.py:240
+msgid "Saint Lucia"
+msgstr ""
+
+#: ../picard/const.py:241
+msgid "Lao People's Democratic Republic"
+msgstr ""
+
+#: ../picard/const.py:242
+msgid "Tuval"
+msgstr ""
+
+#: ../picard/const.py:243
+msgid "Taiwan"
+msgstr ""
+
+#: ../picard/const.py:244
+msgid "Trinidad and Tobago"
+msgstr ""
+
+#: ../picard/const.py:245
+msgid "Turkey"
+msgstr ""
+
+#: ../picard/const.py:246
+msgid "Sri Lanka"
+msgstr ""
+
+#: ../picard/const.py:247
+msgid "Liechtenstein"
+msgstr ""
+
+#: ../picard/const.py:248
+msgid "Latvia"
+msgstr ""
+
+#: ../picard/const.py:249
+msgid "Tonga"
+msgstr ""
+
+#: ../picard/const.py:250
+msgid "Lithuania"
+msgstr ""
+
+#: ../picard/const.py:251
+msgid "Luxembourg"
+msgstr ""
+
+#: ../picard/const.py:252
+msgid "Liberia"
+msgstr ""
+
+#: ../picard/const.py:253
+msgid "Lesotho"
+msgstr ""
+
+#: ../picard/const.py:254
+msgid "Thailand"
+msgstr ""
+
+#: ../picard/const.py:255
+msgid "French Southern Territories"
+msgstr ""
+
+#: ../picard/const.py:256
+msgid "Togo"
+msgstr ""
+
+#: ../picard/const.py:257
+msgid "Chad"
+msgstr ""
+
+#: ../picard/const.py:258
+msgid "Turks and Caicos Islands"
+msgstr ""
+
+#: ../picard/const.py:259
+msgid "Libyan Arab Jamahiriya"
+msgstr ""
+
+#: ../picard/const.py:260
+msgid "Vatican City State (Holy See)"
+msgstr ""
+
+#: ../picard/const.py:261
+msgid "Saint Vincent and The Grenadines"
+msgstr ""
+
+#: ../picard/const.py:262
+msgid "United Arab Emirates"
+msgstr ""
+
+#: ../picard/const.py:263
+msgid "Andorra"
+msgstr ""
+
+#: ../picard/const.py:264
+msgid "Antigua and Barbuda"
+msgstr ""
+
+#: ../picard/const.py:265
+msgid "Afghanistan"
+msgstr ""
+
+#: ../picard/const.py:266
+msgid "Anguilla"
+msgstr ""
+
+#: ../picard/const.py:267
+msgid "Virgin Islands (U.S.)"
+msgstr ""
+
+#: ../picard/const.py:268
+msgid "Iceland"
+msgstr ""
+
+#: ../picard/const.py:269
+msgid "Iran (Islamic Republic of)"
+msgstr ""
+
+#: ../picard/const.py:270
+msgid "Armenia"
+msgstr ""
+
+#: ../picard/const.py:271
+msgid "Albania"
+msgstr ""
+
+#: ../picard/const.py:272
+msgid "Angola"
+msgstr ""
+
+#: ../picard/const.py:273
+msgid "Netherlands Antilles"
+msgstr ""
+
+#: ../picard/const.py:274
+msgid "Antarctica"
+msgstr ""
+
+#: ../picard/const.py:275
+msgid "American Samoa"
+msgstr ""
+
+#: ../picard/const.py:276
+msgid "Argentina"
+msgstr ""
+
+#: ../picard/const.py:277
+msgid "Australia"
+msgstr ""
+
+#: ../picard/const.py:278
+msgid "Austria"
+msgstr ""
+
+#: ../picard/const.py:279
+msgid "Aruba"
+msgstr ""
+
+#: ../picard/const.py:280
+msgid "India"
+msgstr ""
+
+#: ../picard/const.py:281
+msgid "Tanzania, United Republic of"
+msgstr ""
+
+#: ../picard/const.py:282
+msgid "Azerbaijan"
+msgstr ""
+
+#: ../picard/const.py:283
+msgid "Ireland"
+msgstr ""
+
+#: ../picard/const.py:284
+msgid "Indonesia"
+msgstr ""
+
+#: ../picard/const.py:285
+msgid "Ukraine"
+msgstr ""
+
+#: ../picard/const.py:286
+msgid "Qatar"
+msgstr ""
+
+#: ../picard/const.py:287
+msgid "Mozambique"
+msgstr ""
+
+#: ../picard/const.py:288
+msgid "Bosnia and Herzegovina"
+msgstr ""
+
+#: ../picard/const.py:289
+msgid "Congo, The Democratic Republic of the"
+msgstr ""
+
+#: ../picard/const.py:290
+msgid "Serbia and Montenegro"
+msgstr ""
+
+#: ../picard/const.py:291
+msgid "Croatia"
+msgstr ""
+
+#: ../picard/const.py:292
+msgid "Korea (North), Democratic People's Republic of"
+msgstr ""
+
+#: ../picard/const.py:293
+msgid "Korea (South), Republic of"
+msgstr ""
+
+#: ../picard/const.py:294
+msgid "Slovakia"
+msgstr ""
+
+#: ../picard/const.py:295
+msgid "Soviet Union (historical, 1922-1991)"
+msgstr ""
+
+#: ../picard/const.py:296
+msgid "East Timor"
+msgstr ""
+
+#: ../picard/const.py:297
+msgid "Czechoslovakia (historical, 1918-1992)"
+msgstr ""
+
+#: ../picard/const.py:298
+msgid "Europe"
+msgstr ""
+
+#: ../picard/const.py:299
+msgid "East Germany (historical, 1949-1990)"
+msgstr ""
+
+#: ../picard/const.py:300
+msgid "[Unknown Country]"
+msgstr ""
+
+#: ../picard/const.py:301
+msgid "[Worldwide]"
+msgstr ""
+
+#: ../picard/const.py:302
+msgid "Yugoslavia (historical, 1918-1992)"
+msgstr ""
+
+#: ../picard/const.py:307
+msgid "Catalan"
+msgstr ""
+
+#: ../picard/const.py:308
+msgid "Czech"
+msgstr ""
+
+#: ../picard/const.py:309
+msgid "Welsh"
+msgstr ""
+
+#: ../picard/const.py:310
+msgid "Danish"
+msgstr ""
+
+#: ../picard/const.py:311
+msgid "German"
+msgstr ""
+
+#: ../picard/const.py:312
+msgid "English"
+msgstr ""
+
+#: ../picard/const.py:313
+msgid "English (Canada)"
+msgstr ""
+
+#: ../picard/const.py:314
+msgid "English (UK)"
+msgstr ""
+
+#: ../picard/const.py:315
+msgid "Spanish"
+msgstr ""
+
+#: ../picard/const.py:316
+msgid "Persian"
+msgstr ""
+
+#: ../picard/const.py:317
+msgid "Finnish"
+msgstr ""
+
+#: ../picard/const.py:318
+msgid "French"
+msgstr ""
+
+#: ../picard/const.py:319
+msgid "Frisian"
+msgstr ""
+
+#: ../picard/const.py:320
+msgid "Hebrew"
+msgstr ""
+
+#: ../picard/const.py:321
+msgid "Hungarian"
+msgstr ""
+
+#: ../picard/const.py:322
+msgid "Islandic"
+msgstr ""
+
+#: ../picard/const.py:323
+msgid "Italian"
+msgstr ""
+
+#: ../picard/const.py:324
+msgid "Kannada"
+msgstr ""
+
+#: ../picard/const.py:325
+msgid "Korean"
+msgstr ""
+
+#: ../picard/const.py:326
+msgid "Lithuanian"
+msgstr ""
+
+#: ../picard/const.py:327
+msgid "Norwegian Bokmal"
+msgstr ""
+
+#: ../picard/const.py:328
+msgid "Dutch"
+msgstr ""
+
+#: ../picard/const.py:329
+msgid "Polish"
+msgstr ""
+
+#: ../picard/const.py:330
+msgid "Portuguese"
+msgstr ""
+
+#: ../picard/const.py:331
+msgid "Brazilian Portuguese"
+msgstr ""
+
+#: ../picard/const.py:332
+msgid "Romanian"
+msgstr ""
+
+#: ../picard/const.py:333
+msgid "Russian"
+msgstr ""
+
+#: ../picard/const.py:334
+#, fuzzy
+msgid "Scots"
+msgstr "Puntuació"
+
+#: ../picard/const.py:335
+msgid "Slovak"
+msgstr ""
+
+#: ../picard/const.py:336
+msgid "Slovenian"
+msgstr ""
+
+#: ../picard/const.py:337
+msgid "Swedish"
+msgstr ""
+
+#: ../picard/const.py:338
+msgid "Chinese"
+msgstr ""
+
+#: ../picard/file.py:475
+#, python-format
+msgid "No matching tracks for file %s"
+msgstr ""
+
+#: ../picard/file.py:492
+#, python-format
+msgid "No matching tracks above the threshold for file %s"
+msgstr ""
+
+#: ../picard/file.py:495
+#, python-format
+msgid "File %s identified!"
+msgstr ""
+
+#: ../picard/file.py:506
+#, python-format
+msgid "Looking up the PUID for file %s..."
+msgstr ""
+
+#: ../picard/file.py:511
+#, python-format
+msgid "Looking up the metadata for file %s..."
+msgstr ""
+
+#: ../picard/puidmanager.py:58
+msgid "Submitting PUIDs..."
+msgstr ""
+
+#: ../picard/puidmanager.py:64
+#, python-format
+msgid "PUIDs submission failed: %s"
+msgstr ""
+
+#: ../picard/puidmanager.py:66
+msgid "PUIDs successfully submitted!"
+msgstr ""
+
+#: ../picard/playlist.py:31
+msgid "M3U Playlist (*.m3u)"
+msgstr ""
+
+#: ../picard/playlist.py:32
+msgid "PLS Playlist (*.pls)"
+msgstr ""
+
+#: ../picard/playlist.py:33
+msgid "XSPF Playlist (*.xspf)"
+msgstr ""
+
+#: ../picard/tagger.py:476
 msgid "CD Lookup Error"
 msgstr "Error al buscar el CD"
 
-#: ../picard/tagger.py:473
+#: ../picard/tagger.py:477
 #, python-format
 msgid ""
 "Error while reading CD:\n"
@@ -46,124 +1277,162 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../picard/ui/passworddialog.py:38
+#: ../picard/tagger.py:503
 #, python-format
-msgid ""
-"The server %s requires you to login. Please enter your username and password."
+msgid "Couldn't find PUID for file %s"
 msgstr ""
 
-#: ../picard/ui/ui_options_script.py:52
-msgid "Tagger Script"
+#: ../picard/musicdns/__init__.py:98
+#, python-format
+msgid "Looking up the fingerprint for file %s..."
+msgstr ""
+
+#: ../picard/musicdns/__init__.py:117
+#, python-format
+msgid "Creating fingerprint for file %s..."
 msgstr ""
 
 #: ../picard/ui/cdlookup.py:31
 msgid "Score"
 msgstr "Puntuació"
 
-#: ../picard/ui/cdlookup.py:31
+#: ../picard/ui/cdlookup.py:31 ../picard/ui/itemviews.py:82
+#: ../picard/util/tags.py:23
 msgid "Title"
 msgstr "Titol"
 
-#: ../picard/ui/cdlookup.py:31 ../picard/ui/mainwindow.py:436
+#: ../picard/ui/cdlookup.py:31 ../picard/ui/itemviews.py:84
+#: ../picard/ui/mainwindow.py:436 ../picard/util/tags.py:22
 msgid "Artist"
 msgstr "Artista"
 
-#: ../picard/ui/ui_metadata.py:121
-msgid "Lookup"
+#: ../picard/ui/coverartbox.py:47 ../picard/ui/options/cover.py:29
+msgid "Cover Art"
+msgstr "Portada d'Art"
+
+#: ../picard/ui/coverartbox.py:95
+msgid "Buy the album on Amazon"
+msgstr "Comprar el disc a l'Amazon"
+
+#: ../picard/ui/filebrowser.py:38 ../picard/ui/mainwindow.py:302
+msgid "&Refresh"
+msgstr "&Actualitza"
+
+#: ../picard/ui/filebrowser.py:41
+msgid "&Move Tagged Files Here"
 msgstr ""
 
-#: ../picard/ui/ui_metadata.py:122
-msgid "Title:"
+#: ../picard/ui/filebrowser.py:44
+msgid "Show &Hidden Files"
 msgstr ""
 
-#: ../picard/ui/ui_metadata.py:123
-msgid "Date:"
+#: ../picard/ui/itemviews.py:83
+msgid "Length"
 msgstr ""
 
-#: ../picard/ui/ui_metadata.py:124
-msgid "Artist:"
+#: ../picard/ui/itemviews.py:327
+msgid "&Releases"
 msgstr ""
 
-#: ../picard/ui/ui_metadata.py:125
-msgid "Track:"
+#: ../picard/ui/itemviews.py:353
+msgid "&Plugins"
+msgstr "&Extensions"
+
+#: ../picard/ui/itemviews.py:523
+msgid "Clusters"
 msgstr ""
 
-#: ../picard/ui/ui_metadata.py:126
-msgid "0000-00-00; "
+#: ../picard/ui/logview.py:29
+msgid "Log"
 msgstr ""
 
-#: ../picard/ui/ui_metadata.py:127 ../picard/ui/tageditor.py:225
-#: ../picard/ui/multitageditor.py:181
+#: ../picard/ui/puidsubmit.py:31 ../picard/ui/options/plugins.py:80
+msgid "File"
+msgstr ""
+
+#: ../picard/ui/puidsubmit.py:31
+msgid "PUID"
+msgstr ""
+
+#: ../picard/ui/puidsubmit.py:31 ../picard/ui/mainwindow.py:437
+msgid "Track"
+msgstr ""
+
+#: ../picard/ui/puidsubmit.py:31
+msgid "Release"
+msgstr ""
+
+#: ../picard/ui/puidsubmit.py:31
+msgid "Release ID"
+msgstr ""
+
+#: ../picard/ui/tageditor.py:65 ../picard/ui/ui_options_plugins.py:62
+msgid "Details"
+msgstr ""
+
+#: ../picard/ui/tageditor.py:70 ../picard/ui/tageditor.py:241
+#, python-format
+msgid "%d file"
+msgid_plural "%d files"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../picard/ui/tageditor.py:124
+#, python-format
+msgid "(different across %d file)"
+msgid_plural "(different across %d files)"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../picard/ui/tageditor.py:127
+#, python-format
+msgid "(missing from %d file)"
+msgid_plural "(missing from %d files)"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../picard/ui/tageditor.py:210
+msgid "Filename:"
+msgstr ""
+
+#: ../picard/ui/tageditor.py:212
+msgid "Format:"
+msgstr ""
+
+#: ../picard/ui/tageditor.py:221
+msgid "Size:"
+msgstr ""
+
+#: ../picard/ui/tageditor.py:225 ../picard/ui/ui_metadata.py:127
 msgid "Length:"
 msgstr ""
 
-#: ../picard/ui/ui_metadata.py:128
-msgid "Album:"
+#: ../picard/ui/tageditor.py:227
+msgid "Bitrate:"
 msgstr ""
 
-#: ../picard/ui/ui_passworddialog.py:78
-msgid "Authentication required"
+#: ../picard/ui/tageditor.py:229
+msgid "Sample rate:"
 msgstr ""
 
-#: ../picard/ui/ui_passworddialog.py:79 ../picard/ui/ui_options_proxy.py:83
-#: ../picard/ui/ui_options_general.py:113
-msgid "Username:"
+#: ../picard/ui/tageditor.py:231
+msgid "Bits per sample:"
 msgstr ""
 
-#: ../picard/ui/ui_passworddialog.py:80 ../picard/ui/ui_options_proxy.py:82
-#: ../picard/ui/ui_options_general.py:112
-msgid "Password:"
+#: ../picard/ui/tageditor.py:234
+msgid "Mono"
 msgstr ""
 
-#: ../picard/ui/ui_passworddialog.py:81
-msgid "Save username and password"
+#: ../picard/ui/tageditor.py:235
+msgid "Stereo"
 msgstr ""
 
-#: ../picard/ui/ui_options_folksonomy.py:114
-#: ../picard/ui/ui_options_folksonomy_tags.py:114
-msgid "Folksonomy Tags"
+#: ../picard/ui/tageditor.py:237
+msgid "Channels:"
 msgstr ""
 
-#: ../picard/ui/ui_options_folksonomy.py:115
-#: ../picard/ui/ui_options_folksonomy_tags.py:115
-msgid "Ignore tags:"
-msgstr ""
-
-#: ../picard/ui/ui_options_folksonomy.py:116
-#: ../picard/ui/ui_options_folksonomy_tags.py:116
-msgid "Minimal tag usage:"
-msgstr ""
-
-#: ../picard/ui/ui_options_folksonomy.py:117
-#: ../picard/ui/ui_options_folksonomy_tags.py:117
-#: ../picard/ui/ui_options_matching.py:107
-#: ../picard/ui/ui_options_matching.py:108
-#: ../picard/ui/ui_options_matching.py:109
-#: ../picard/ui/ui_options_matching.py:113
-msgid " %"
-msgstr ""
-
-#: ../picard/ui/ui_options_folksonomy.py:118
-msgid "Maximum number of tags:"
-msgstr ""
-
-#: ../picard/ui/ui_options_folksonomy.py:119
-#: ../picard/ui/ui_options_folksonomy_tags.py:119
-msgid "Join multiple tags with:"
-msgstr ""
-
-#: ../picard/ui/ui_options_folksonomy.py:120
-#: ../picard/ui/ui_options_folksonomy_tags.py:120
-msgid " / "
-msgstr ""
-
-#: ../picard/ui/ui_options_folksonomy.py:121
-#: ../picard/ui/ui_options_folksonomy_tags.py:121
-msgid ", "
-msgstr ""
-
-#: ../picard/ui/ui_options_folksonomy_tags.py:118
-msgid "Maximal number of tags:"
+#: ../picard/ui/tagsfromfilenames.py:52 ../picard/ui/tagsfromfilenames.py:96
+msgid "File Name"
 msgstr ""
 
 #: ../picard/ui/mainwindow.py:64
@@ -342,10 +1611,6 @@ msgstr ""
 msgid "&Details..."
 msgstr ""
 
-#: ../picard/ui/mainwindow.py:302 ../picard/ui/filebrowser.py:38
-msgid "&Refresh"
-msgstr "&Actualitza"
-
 #: ../picard/ui/mainwindow.py:305
 msgid "Generate &Playlist..."
 msgstr ""
@@ -390,7 +1655,7 @@ msgstr ""
 msgid "&Tools"
 msgstr ""
 
-#: ../picard/ui/mainwindow.py:384
+#: ../picard/ui/mainwindow.py:384 ../picard/ui/util.py:33
 msgid "&Help"
 msgstr ""
 
@@ -402,14 +1667,10 @@ msgstr ""
 msgid "&Search Bar"
 msgstr ""
 
-#: ../picard/ui/mainwindow.py:435
+#: ../picard/ui/mainwindow.py:435 ../picard/util/tags.py:21
 msgid "Album"
 msgstr ""
 
-#: ../picard/ui/mainwindow.py:437 ../picard/ui/puidsubmit.py:31
-msgid "Track"
-msgstr ""
-
 #: ../picard/ui/mainwindow.py:476
 msgid "All Supported Formats"
 msgstr ""
@@ -429,32 +1690,274 @@ msgstr ""
 msgid " (Error: %s)"
 msgstr ""
 
+#: ../picard/ui/ui_tageditor.py:115 ../picard/ui/ui_options_plugins.py:59
+#: ../picard/ui/options/plugins.py:76
+msgid "Name"
+msgstr ""
+
+#: ../picard/ui/ui_tageditor.py:116
+msgid "Value"
+msgstr ""
+
+#: ../picard/ui/ui_tageditor.py:117
+msgid "&Add..."
+msgstr ""
+
+#: ../picard/ui/ui_tageditor.py:118
+msgid "&Edit..."
+msgstr ""
+
+#: ../picard/ui/ui_tageditor.py:119
+msgid "&Delete"
+msgstr ""
+
+#: ../picard/ui/ui_tageditor.py:120
+msgid "&Metadata"
+msgstr ""
+
+#: ../picard/ui/ui_tageditor.py:121
+msgid "A&rtwork"
+msgstr ""
+
+#: ../picard/ui/ui_tageditor.py:122
+msgid "&Info"
+msgstr ""
+
+#: ../picard/ui/passworddialog.py:38
+#, python-format
+msgid ""
+"The server %s requires you to login. Please enter your username and password."
+msgstr ""
+
+#: ../picard/ui/ui_cdlookup.py:60 ../picard/ui/ui_options_cdlookup.py:47
+#: ../picard/ui/ui_options_cdlookup_win32.py:56
+#: ../picard/ui/options/cdlookup.py:35
+msgid "CD Lookup"
+msgstr ""
+
+#: ../picard/ui/ui_cdlookup.py:61
+msgid "The following releases on MusicBrainz match the CD:"
+msgstr ""
+
+#: ../picard/ui/ui_cdlookup.py:62 ../picard/ui/ui_puidsubmit.py:53
+msgid "OK"
+msgstr ""
+
+#: ../picard/ui/ui_cdlookup.py:63
+msgid "    Lookup manually    "
+msgstr ""
+
+#: ../picard/ui/ui_cdlookup.py:64 ../picard/ui/ui_puidsubmit.py:54
+msgid "Cancel"
+msgstr ""
+
+#: ../picard/ui/ui_passworddialog.py:78
+msgid "Authentication required"
+msgstr ""
+
+#: ../picard/ui/ui_passworddialog.py:79 ../picard/ui/ui_options_general.py:113
+#: ../picard/ui/ui_options_proxy.py:83
+msgid "Username:"
+msgstr ""
+
+#: ../picard/ui/ui_passworddialog.py:80 ../picard/ui/ui_options_general.py:112
+#: ../picard/ui/ui_options_proxy.py:82
+msgid "Password:"
+msgstr ""
+
+#: ../picard/ui/ui_passworddialog.py:81
+msgid "Save username and password"
+msgstr ""
+
 #: ../picard/ui/ui_edittagdialog.py:44
 msgid "Edit Tag"
 msgstr ""
 
-#: ../picard/ui/ui_options_proxy.py:81
-msgid "Web Proxy"
+#: ../picard/ui/ui_metadata.py:121
+msgid "Lookup"
 msgstr ""
 
-#: ../picard/ui/ui_options_proxy.py:84 ../picard/ui/ui_options_general.py:109
-msgid "Port:"
+#: ../picard/ui/ui_metadata.py:122
+msgid "Title:"
 msgstr ""
 
-#: ../picard/ui/ui_options_proxy.py:85 ../picard/ui/ui_options_general.py:110
-msgid "Server address:"
+#: ../picard/ui/ui_metadata.py:123
+msgid "Date:"
 msgstr ""
 
-#: ../picard/ui/ui_tagsfromfilenames.py:56
-msgid "Convert File Names to Tags"
+#: ../picard/ui/ui_metadata.py:124
+msgid "Artist:"
 msgstr ""
 
-#: ../picard/ui/ui_tagsfromfilenames.py:57
-msgid "Replace underscores with spaces"
+#: ../picard/ui/ui_metadata.py:125
+msgid "Track:"
+msgstr ""
+
+#: ../picard/ui/ui_metadata.py:126
+msgid "0000-00-00; "
+msgstr ""
+
+#: ../picard/ui/ui_metadata.py:128
+msgid "Album:"
+msgstr ""
+
+#: ../picard/ui/ui_options.py:42
+msgid "Options"
+msgstr ""
+
+#: ../picard/ui/ui_options_cdlookup.py:48
+msgid "CD-ROM device to use for lookups:"
+msgstr ""
+
+#: ../picard/ui/ui_options_cdlookup_win32.py:57
+msgid "Default CD-ROM drive to use for lookups:"
+msgstr ""
+
+#: ../picard/ui/ui_options_cover.py:56
+msgid "Location"
+msgstr ""
+
+#: ../picard/ui/ui_options_cover.py:57
+msgid "Embed cover images into tags"
+msgstr ""
+
+#: ../picard/ui/ui_options_cover.py:58
+msgid "Save cover images as separate files"
+msgstr ""
+
+#: ../picard/ui/ui_options_cover.py:59
+msgid "Overwrite the file if it already exists"
+msgstr ""
+
+#: ../picard/ui/util.py:31
+msgid "&Ok"
+msgstr ""
+
+#: ../picard/ui/util.py:32
+msgid "&Cancel"
+msgstr ""
+
+#: ../picard/ui/ui_puidsubmit.py:52
+msgid "Submit PUIDs"
+msgstr ""
+
+#: ../picard/ui/ui_options_folksonomy.py:114
+#: ../picard/ui/options/folksonomy.py:29
+msgid "Folksonomy Tags"
+msgstr ""
+
+#: ../picard/ui/ui_options_folksonomy.py:115
+msgid "Ignore tags:"
+msgstr ""
+
+#: ../picard/ui/ui_options_folksonomy.py:116
+msgid "Minimal tag usage:"
+msgstr ""
+
+#: ../picard/ui/ui_options_folksonomy.py:117
+#: ../picard/ui/ui_options_matching.py:107
+#: ../picard/ui/ui_options_matching.py:108
+#: ../picard/ui/ui_options_matching.py:109
+#: ../picard/ui/ui_options_matching.py:113
+msgid " %"
+msgstr ""
+
+#: ../picard/ui/ui_options_folksonomy.py:118
+msgid "Maximum number of tags:"
+msgstr ""
+
+#: ../picard/ui/ui_options_folksonomy.py:119
+msgid "Join multiple tags with:"
+msgstr ""
+
+#: ../picard/ui/ui_options_folksonomy.py:120
+msgid " / "
+msgstr ""
+
+#: ../picard/ui/ui_options_folksonomy.py:121
+msgid ", "
+msgstr ""
+
+#: ../picard/ui/ui_options_interface.py:50
+msgid "Miscellaneous"
+msgstr ""
+
+#: ../picard/ui/ui_options_interface.py:51
+msgid "Show text labels under icons"
+msgstr ""
+
+#: ../picard/ui/ui_options_interface.py:52
+msgid "Allow selection of multiple directories"
+msgstr ""
+
+#: ../picard/ui/ui_options_interface.py:53
+msgid "Use advanced query syntax"
+msgstr ""
+
+#: ../picard/ui/ui_options_interface.py:54
+msgid "User interface language:"
+msgstr ""
+
+#: ../picard/ui/ui_options_naming.py:165
+msgid "Rename Files"
+msgstr ""
+
+#: ../picard/ui/ui_options_naming.py:166
+msgid "Replace Windows-incompatible characters"
+msgstr ""
+
+#: ../picard/ui/ui_options_naming.py:167
+msgid "Replace non-ASCII characters"
+msgstr ""
+
+#: ../picard/ui/ui_options_naming.py:168 ../picard/ui/ui_options_naming.py:169
+#: ../picard/ui/ui_options_metadata.py:109
+#: ../picard/ui/ui_options_metadata.py:110
+msgid "Default"
+msgstr ""
+
+#: ../picard/ui/ui_options_naming.py:170 ../picard/ui/options/naming.py:90
+msgid "Multiple artist file naming format:"
+msgstr ""
+
+#: ../picard/ui/ui_options_naming.py:171 ../picard/ui/options/naming.py:86
+msgid "File naming format:"
+msgstr ""
+
+#: ../picard/ui/ui_options_naming.py:172
+msgid "Move Files"
+msgstr ""
+
+#: ../picard/ui/ui_options_naming.py:173
+msgid "Move tagged files to this directory:"
+msgstr ""
+
+#: ../picard/ui/ui_options_naming.py:174
+msgid "Browse..."
+msgstr ""
+
+#: ../picard/ui/ui_options_naming.py:175
+msgid "Move additional files:"
+msgstr ""
+
+#: ../picard/ui/ui_options_naming.py:176
+msgid "Delete empty directories"
+msgstr ""
+
+#: ../picard/ui/ui_options_naming.py:177
+msgid "Example"
+msgstr ""
+
+#: ../picard/ui/ui_options_naming.py:178
+msgid "File name:"
+msgstr ""
+
+#: ../picard/ui/ui_options_naming.py:179
+msgid "Multiple artist file name:"
 msgstr ""
 
-#: ../picard/ui/ui_tagsfromfilenames.py:58
 #: ../picard/ui/ui_options_naming.py:180
+#: ../picard/ui/ui_tagsfromfilenames.py:58
 msgid "&Preview"
 msgstr ""
 
@@ -462,11 +1965,19 @@ msgstr ""
 msgid "MusicBrainz Server"
 msgstr ""
 
+#: ../picard/ui/ui_options_general.py:109 ../picard/ui/ui_options_proxy.py:84
+msgid "Port:"
+msgstr ""
+
+#: ../picard/ui/ui_options_general.py:110 ../picard/ui/ui_options_proxy.py:85
+msgid "Server address:"
+msgstr ""
+
 #: ../picard/ui/ui_options_general.py:111
 msgid "Account Information"
 msgstr ""
 
-#: ../picard/ui/ui_options_general.py:114
+#: ../picard/ui/ui_options_general.py:114 ../picard/ui/options/general.py:29
 msgid "General"
 msgstr ""
 
@@ -474,34 +1985,6 @@ msgstr ""
 msgid "Automatically scan all new files"
 msgstr ""
 
-#: ../picard/ui/ui_options_interface.py:46
-msgid "Miscellaneous"
-msgstr ""
-
-#: ../picard/ui/ui_options_interface.py:47
-msgid "Show text labels under icons"
-msgstr ""
-
-#: ../picard/ui/ui_options_interface.py:48
-msgid "Allow selection of multiple directories"
-msgstr ""
-
-#: ../picard/ui/ui_options_interface.py:49
-msgid "Use advanced query syntax"
-msgstr ""
-
-#: ../picard/ui/itemviews.py:327
-msgid "&Releases"
-msgstr ""
-
-#: ../picard/ui/itemviews.py:353
-msgid "&Plugins"
-msgstr "&Extensions"
-
-#: ../picard/ui/itemviews.py:523
-msgid "Clusters"
-msgstr ""
-
 #: ../picard/ui/ui_options_matching.py:105
 msgid "Thresholds"
 msgstr ""
@@ -522,6 +2005,62 @@ msgstr ""
 msgid "Minimal similarity for PUID lookups:"
 msgstr ""
 
+#: ../picard/ui/ui_options_metadata.py:100 ../picard/ui/options/metadata.py:31
+msgid "Metadata"
+msgstr ""
+
+#: ../picard/ui/ui_options_metadata.py:101
+msgid "Translate foreign artist names to English where possible"
+msgstr ""
+
+#: ../picard/ui/ui_options_metadata.py:102
+msgid "Use release relationships"
+msgstr ""
+
+#: ../picard/ui/ui_options_metadata.py:103
+msgid "Use track relationships"
+msgstr ""
+
+#: ../picard/ui/ui_options_metadata.py:104
+msgid "Use folksonomy tags as genre"
+msgstr ""
+
+#: ../picard/ui/ui_options_metadata.py:105
+msgid "Preferred release country:"
+msgstr ""
+
+#: ../picard/ui/ui_options_metadata.py:106
+msgid "Custom Fields"
+msgstr ""
+
+#: ../picard/ui/ui_options_metadata.py:107
+msgid "Various artists:"
+msgstr ""
+
+#: ../picard/ui/ui_options_metadata.py:108
+msgid "Non-album tracks:"
+msgstr ""
+
+#: ../picard/ui/ui_options_plugins.py:58 ../picard/ui/options/plugins.py:30
+msgid "Plugins"
+msgstr ""
+
+#: ../picard/ui/ui_options_plugins.py:60 ../picard/ui/options/plugins.py:79
+msgid "Author"
+msgstr ""
+
+#: ../picard/ui/ui_options_plugins.py:61 ../picard/util/tags.py:36
+msgid "Version"
+msgstr ""
+
+#: ../picard/ui/ui_options_proxy.py:81 ../picard/ui/options/proxy.py:28
+msgid "Web Proxy"
+msgstr ""
+
+#: ../picard/ui/ui_options_script.py:52
+msgid "Tagger Script"
+msgstr ""
+
 #: ../picard/ui/ui_options_tags.py:105
 msgid "Common"
 msgstr ""
@@ -574,309 +2113,16 @@ msgstr ""
 msgid "Remove APEv2 tags from MP3 files"
 msgstr ""
 
-#: ../picard/ui/ui_options_cdlookup_win32.py:56 ../picard/ui/ui_cdlookup.py:60
-#: ../picard/ui/ui_options_cdlookup.py:47
-msgid "CD Lookup"
+#: ../picard/ui/ui_tagsfromfilenames.py:56
+msgid "Convert File Names to Tags"
 msgstr ""
 
-#: ../picard/ui/ui_options_cdlookup_win32.py:57
-msgid "Default CD-ROM drive to use for lookups:"
+#: ../picard/ui/ui_tagsfromfilenames.py:57
+msgid "Replace underscores with spaces"
 msgstr ""
 
-#: ../picard/ui/tageditor.py:65 ../picard/ui/ui_options_plugins.py:62
-#: ../picard/ui/multitageditor.py:37
-msgid "Details"
-msgstr ""
-
-#: ../picard/ui/tageditor.py:70 ../picard/ui/tageditor.py:241
-#: ../picard/ui/multitageditor.py:42 ../picard/ui/multitageditor.py:197
-#, python-format
-msgid "%d file"
-msgid_plural "%d files"
-msgstr[0] ""
-msgstr[1] ""
-
-#: ../picard/ui/tageditor.py:124 ../picard/ui/multitageditor.py:95
-#, python-format
-msgid "(different across %d file)"
-msgid_plural "(different across %d files)"
-msgstr[0] ""
-msgstr[1] ""
-
-#: ../picard/ui/tageditor.py:127 ../picard/ui/multitageditor.py:98
-#, python-format
-msgid "(missing from %d file)"
-msgid_plural "(missing from %d files)"
-msgstr[0] ""
-msgstr[1] ""
-
-#: ../picard/ui/tageditor.py:210 ../picard/ui/multitageditor.py:166
-msgid "Filename:"
-msgstr ""
-
-#: ../picard/ui/tageditor.py:212 ../picard/ui/multitageditor.py:168
-msgid "Format:"
-msgstr ""
-
-#: ../picard/ui/tageditor.py:221 ../picard/ui/multitageditor.py:177
-msgid "Size:"
-msgstr ""
-
-#: ../picard/ui/tageditor.py:227 ../picard/ui/multitageditor.py:183
-msgid "Bitrate:"
-msgstr ""
-
-#: ../picard/ui/tageditor.py:229 ../picard/ui/multitageditor.py:185
-msgid "Sample rate:"
-msgstr ""
-
-#: ../picard/ui/tageditor.py:231 ../picard/ui/multitageditor.py:187
-msgid "Bits per sample:"
-msgstr ""
-
-#: ../picard/ui/tageditor.py:234 ../picard/ui/multitageditor.py:190
-msgid "Mono"
-msgstr ""
-
-#: ../picard/ui/tageditor.py:235 ../picard/ui/multitageditor.py:191
-msgid "Stereo"
-msgstr ""
-
-#: ../picard/ui/tageditor.py:237 ../picard/ui/multitageditor.py:193
-msgid "Channels:"
-msgstr ""
-
-#: ../picard/ui/ui_tageditor.py:115 ../picard/ui/ui_multitageditor.py:55
-#: ../picard/ui/ui_options_plugins.py:59 ../picard/ui/options/plugins.py:76
-msgid "Name"
-msgstr ""
-
-#: ../picard/ui/ui_tageditor.py:116 ../picard/ui/ui_multitageditor.py:56
-msgid "Value"
-msgstr ""
-
-#: ../picard/ui/ui_tageditor.py:117 ../picard/ui/ui_multitageditor.py:57
-msgid "&Add..."
-msgstr ""
-
-#: ../picard/ui/ui_tageditor.py:118
-msgid "&Edit..."
-msgstr ""
-
-#: ../picard/ui/ui_tageditor.py:119
-msgid "&Delete"
-msgstr ""
-
-#: ../picard/ui/ui_tageditor.py:120
-msgid "&Metadata"
-msgstr ""
-
-#: ../picard/ui/ui_tageditor.py:121
-msgid "A&rtwork"
-msgstr ""
-
-#: ../picard/ui/ui_tageditor.py:122
-msgid "&Info"
-msgstr ""
-
-#: ../picard/ui/coverartbox.py:47
-msgid "Cover Art"
-msgstr "Portada d'Art"
-
-#: ../picard/ui/coverartbox.py:95
-msgid "Buy the album on Amazon"
-msgstr "Comprar el disc a l'Amazon"
-
-#: ../picard/ui/ui_puidsubmit.py:52
-msgid "Submit PUIDs"
-msgstr ""
-
-#: ../picard/ui/ui_puidsubmit.py:53 ../picard/ui/ui_cdlookup.py:62
-msgid "OK"
-msgstr ""
-
-#: ../picard/ui/ui_puidsubmit.py:54 ../picard/ui/ui_cdlookup.py:64
-msgid "Cancel"
-msgstr ""
-
-#: ../picard/ui/puidsubmit.py:31 ../picard/ui/options/plugins.py:80
-msgid "File"
-msgstr ""
-
-#: ../picard/ui/puidsubmit.py:31
-msgid "PUID"
-msgstr ""
-
-#: ../picard/ui/puidsubmit.py:31
-msgid "Release"
-msgstr ""
-
-#: ../picard/ui/puidsubmit.py:31
-msgid "Release ID"
-msgstr ""
-
-#: ../picard/ui/filebrowser.py:41
-msgid "&Move Tagged Files Here"
-msgstr ""
-
-#: ../picard/ui/filebrowser.py:44
-msgid "Show &Hidden Files"
-msgstr ""
-
-#: ../picard/ui/ui_cdlookup.py:61
-msgid "The following releases on MusicBrainz match the CD:"
-msgstr ""
-
-#: ../picard/ui/ui_cdlookup.py:63
-msgid "    Lookup manually    "
-msgstr ""
-
-#: ../picard/ui/ui_options.py:42
-msgid "Options"
-msgstr ""
-
-#: ../picard/ui/tagsfromfilenames.py:52 ../picard/ui/tagsfromfilenames.py:96
-msgid "File Name"
-msgstr ""
-
-#: ../picard/ui/ui_options_cover.py:56
-msgid "Location"
-msgstr ""
-
-#: ../picard/ui/ui_options_cover.py:57
-msgid "Embed cover images into tags"
-msgstr ""
-
-#: ../picard/ui/ui_options_cover.py:58
-msgid "Save cover images as separate files"
-msgstr ""
-
-#: ../picard/ui/ui_options_cover.py:59
-msgid "Overwrite the file if it already exists"
-msgstr ""
-
-#: ../picard/ui/ui_options_metadata.py:100
-msgid "Metadata"
-msgstr ""
-
-#: ../picard/ui/ui_options_metadata.py:101
-msgid "Translate foreign artist names to English where possible"
-msgstr ""
-
-#: ../picard/ui/ui_options_metadata.py:102
-msgid "Use release relationships"
-msgstr ""
-
-#: ../picard/ui/ui_options_metadata.py:103
-msgid "Use track relationships"
-msgstr ""
-
-#: ../picard/ui/ui_options_metadata.py:104
-msgid "Use folksonomy tags as genre"
-msgstr ""
-
-#: ../picard/ui/ui_options_metadata.py:105
-msgid "Preferred release country:"
-msgstr ""
-
-#: ../picard/ui/ui_options_metadata.py:106
-msgid "Custom Fields"
-msgstr ""
-
-#: ../picard/ui/ui_options_metadata.py:107
-msgid "Various artists:"
-msgstr ""
-
-#: ../picard/ui/ui_options_metadata.py:108
-msgid "Non-album tracks:"
-msgstr ""
-
-#: ../picard/ui/ui_options_metadata.py:109
-#: ../picard/ui/ui_options_metadata.py:110
-#: ../picard/ui/ui_options_naming.py:168 ../picard/ui/ui_options_naming.py:169
-msgid "Default"
-msgstr ""
-
-#: ../picard/ui/ui_multitageditor.py:58
-msgid "Delete"
-msgstr ""
-
-#: ../picard/ui/logview.py:29
-msgid "Log"
-msgstr ""
-
-#: ../picard/ui/ui_options_plugins.py:58
-msgid "Plugins"
-msgstr ""
-
-#: ../picard/ui/ui_options_plugins.py:60 ../picard/ui/options/plugins.py:79
-msgid "Author"
-msgstr ""
-
-#: ../picard/ui/ui_options_plugins.py:61
-msgid "Version"
-msgstr ""
-
-#: ../picard/ui/ui_options_naming.py:165
-msgid "Rename Files"
-msgstr ""
-
-#: ../picard/ui/ui_options_naming.py:166
-msgid "Replace Windows-incompatible characters"
-msgstr ""
-
-#: ../picard/ui/ui_options_naming.py:167
-msgid "Replace non-ASCII characters"
-msgstr ""
-
-#: ../picard/ui/ui_options_naming.py:170 ../picard/ui/options/naming.py:90
-msgid "Multiple artist file naming format:"
-msgstr ""
-
-#: ../picard/ui/ui_options_naming.py:171 ../picard/ui/options/naming.py:86
-msgid "File naming format:"
-msgstr ""
-
-#: ../picard/ui/ui_options_naming.py:172
-msgid "Move Files"
-msgstr ""
-
-#: ../picard/ui/ui_options_naming.py:173
-msgid "Move tagged files to this directory:"
-msgstr ""
-
-#: ../picard/ui/ui_options_naming.py:174
-msgid "Browse..."
-msgstr ""
-
-#: ../picard/ui/ui_options_naming.py:175
-msgid "Move additional files:"
-msgstr ""
-
-#: ../picard/ui/ui_options_naming.py:176
-msgid "Delete empty directories"
-msgstr ""
-
-#: ../picard/ui/ui_options_naming.py:177
-msgid "Example"
-msgstr ""
-
-#: ../picard/ui/ui_options_naming.py:178
-msgid "File name:"
-msgstr ""
-
-#: ../picard/ui/ui_options_naming.py:179
-msgid "Multiple artist file name:"
-msgstr ""
-
-#: ../picard/ui/ui_options_cdlookup.py:48
-msgid "CD-ROM device to use for lookups:"
-msgstr ""
-
-#: ../picard/ui/options/scripting.py:84 ../picard/ui/options/naming.py:86
-#: ../picard/ui/options/naming.py:90 ../picard/ui/options/naming.py:93
-#: ../picard/ui/options/naming.py:95
-msgid "Script Error"
+#: ../picard/ui/options/about.py:29
+msgid "About"
 msgstr ""
 
 #. Replace this with your name to have it appear in the "About" dialog.
@@ -913,6 +2159,46 @@ msgid ""
 "\">http://musicbrainz.org/doc/PicardTagger</a></p>\n"
 msgstr ""
 
+#: ../picard/ui/options/advanced.py:26
+msgid "Advanced"
+msgstr ""
+
+#: ../picard/ui/options/interface.py:31
+msgid "User Interface"
+msgstr ""
+
+#: ../picard/ui/options/interface.py:47
+msgid "System default"
+msgstr ""
+
+#: ../picard/ui/options/interface.py:71
+msgid "Language changed"
+msgstr ""
+
+#: ../picard/ui/options/interface.py:71
+msgid ""
+"You have changed the interface language. You have to restart Picard in order "
+"for the change to take effect."
+msgstr ""
+
+#: ../picard/ui/options/matching.py:29
+msgid "Matching"
+msgstr ""
+
+#: ../picard/ui/options/metadata.py:52
+msgid "None"
+msgstr ""
+
+#: ../picard/ui/options/naming.py:33
+msgid "File Naming"
+msgstr ""
+
+#: ../picard/ui/options/naming.py:86 ../picard/ui/options/naming.py:90
+#: ../picard/ui/options/naming.py:93 ../picard/ui/options/naming.py:95
+#: ../picard/ui/options/scripting.py:84
+msgid "Script Error"
+msgstr ""
+
 #: ../picard/ui/options/naming.py:93
 msgid "The file naming format must not be empty."
 msgstr ""
@@ -929,6 +2215,233 @@ msgstr ""
 msgid "The location to move files to must not be empty."
 msgstr ""
 
+#: ../picard/ui/options/scripting.py:63
+msgid "Scripting"
+msgstr ""
+
+#: ../picard/ui/options/tags.py:29
+msgid "Tags"
+msgstr ""
+
+#: ../picard/util/tags.py:24
+#, fuzzy
+msgid "Date"
+msgstr "&Enganxa"
+
+#: ../picard/util/tags.py:25
+#, fuzzy
+msgid "Album Artist"
+msgstr "Artista"
+
+#: ../picard/util/tags.py:26
+msgid "Track Number"
+msgstr ""
+
+#: ../picard/util/tags.py:27
+msgid "Total Tracks"
+msgstr ""
+
+#: ../picard/util/tags.py:28
+msgid "Disc Number"
+msgstr ""
+
+#: ../picard/util/tags.py:29
+msgid "Total Discs"
+msgstr ""
+
+#: ../picard/util/tags.py:30
+msgid "Album Artist Sort Order"
+msgstr ""
+
+#: ../picard/util/tags.py:31
+msgid "Artist Sort Order"
+msgstr ""
+
+#: ../picard/util/tags.py:32
+msgid "Title Sort Order"
+msgstr ""
+
+#: ../picard/util/tags.py:33
+msgid "Album Sort Order"
+msgstr ""
+
+#: ../picard/util/tags.py:34
+msgid "ASIN"
+msgstr ""
+
+#: ../picard/util/tags.py:35
+msgid "Grouping"
+msgstr ""
+
+#: ../picard/util/tags.py:37
+msgid "ISRC"
+msgstr ""
+
+#: ../picard/util/tags.py:38
+msgid "Mood"
+msgstr ""
+
+#: ../picard/util/tags.py:39
+msgid "BPM"
+msgstr ""
+
+#: ../picard/util/tags.py:40
+msgid "Copyright"
+msgstr ""
+
+#: ../picard/util/tags.py:41
+msgid "Composer"
+msgstr ""
+
+#: ../picard/util/tags.py:42
+msgid "Conductor"
+msgstr ""
+
+#: ../picard/util/tags.py:43
+msgid "Lyricist"
+msgstr ""
+
+#: ../picard/util/tags.py:44
+msgid "Arranger"
+msgstr ""
+
+#: ../picard/util/tags.py:45
+msgid "Producer"
+msgstr ""
+
+#: ../picard/util/tags.py:46
+msgid "Engineer"
+msgstr ""
+
+#: ../picard/util/tags.py:47
+#, fuzzy
+msgid "Subtitle"
+msgstr "Titol"
+
+#: ../picard/util/tags.py:48
+msgid "Disc Subtitle"
+msgstr ""
+
+#: ../picard/util/tags.py:49
+msgid "Remixer"
+msgstr ""
+
+#: ../picard/util/tags.py:50
+msgid "MusicBrainz Track Id"
+msgstr ""
+
+#: ../picard/util/tags.py:51
+msgid "MusicBrainz Release Id"
+msgstr ""
+
+#: ../picard/util/tags.py:52
+msgid "MusicBrainz Artist Id"
+msgstr ""
+
+#: ../picard/util/tags.py:53
+msgid "MusicBrainz Release Artist Id"
+msgstr ""
+
+#: ../picard/util/tags.py:54
+msgid "MusicBrainz TRM Id"
+msgstr ""
+
+#: ../picard/util/tags.py:55
+msgid "MusicBrainz Disc Id"
+msgstr ""
+
+#: ../picard/util/tags.py:56
+msgid "MusicBrainz Sort Name"
+msgstr ""
+
+#: ../picard/util/tags.py:57
+msgid "MusicIP PUID"
+msgstr ""
+
+#: ../picard/util/tags.py:58
+msgid "MusicIP Fingerprint"
+msgstr ""
+
+#: ../picard/util/tags.py:59
+msgid "Disc Id"
+msgstr ""
+
+#: ../picard/util/tags.py:60
+msgid "Website"
+msgstr ""
+
+#: ../picard/util/tags.py:61
+msgid "Compilation"
+msgstr ""
+
+#: ../picard/util/tags.py:62
+msgid "Comment"
+msgstr ""
+
+#: ../picard/util/tags.py:63
+msgid "Genre"
+msgstr ""
+
+#: ../picard/util/tags.py:64
+msgid "Encoded By"
+msgstr ""
+
+#: ../picard/util/tags.py:65
+msgid "Performer"
+msgstr ""
+
+#: ../picard/util/tags.py:66
+msgid "Release Type"
+msgstr ""
+
+#: ../picard/util/tags.py:67
+msgid "Release Status"
+msgstr ""
+
+#: ../picard/util/tags.py:68
+msgid "Release Country"
+msgstr ""
+
+#: ../picard/util/tags.py:69
+msgid "Record Label"
+msgstr ""
+
+#: ../picard/util/tags.py:70
+msgid "Barcode"
+msgstr ""
+
+#: ../picard/util/tags.py:71
+msgid "Catalog Number"
+msgstr ""
+
+#: ../picard/util/tags.py:72
+msgid "Format"
+msgstr ""
+
+#: ../picard/util/tags.py:73
+msgid "DJ-Mixer"
+msgstr ""
+
+#: ../picard/util/tags.py:74
+msgid "Media"
+msgstr ""
+
+#: ../picard/util/tags.py:75
+msgid "Lyrics"
+msgstr ""
+
+#: ../picard/util/tags.py:76
+msgid "Mixer"
+msgstr ""
+
+#: ../picard/util/tags.py:77
+msgid "Language"
+msgstr ""
+
+#: ../picard/util/tags.py:78
+msgid "Script"
+msgstr ""
+
 #: ../picard/util/webbrowser2.py:84
 msgid "Web Browser Error"
 msgstr ""
@@ -940,45 +2453,3 @@ msgid ""
 "\n"
 "%s"
 msgstr ""
-
-#~ msgid "No matching tracks for file %s"
-#~ msgstr "No s'han trobat pistes per el fitxer %s"
-
-#~ msgid "File %s identified!"
-#~ msgstr "Arxiu %s identificat!"
-
-#~ msgid "Looking up the PUID for file %s..."
-#~ msgstr "Buscant el PUID per arxiu %s"
-
-#~ msgid "M3U Playlist (*.m3u)"
-#~ msgstr "M3U Llista de reproducció(*.m3u)"
-
-#~ msgid "PLS Playlist (*.pls)"
-#~ msgstr "PLS Llista de reproducció (*.pls)"
-
-#~ msgid "XSPF Playlist (*.xspf)"
-#~ msgstr "XSPF Llista de reproducció (*.xspf)"
-
-#~ msgid "PUIDs successfully submitted!"
-#~ msgstr "PUIDs correctament presentat"
-
-#~ msgid "New Version"
-#~ msgstr "Nova Versió"
-
-#~ msgid ""
-#~ "New version of Picard is available (%s). Would you like to download it "
-#~ "now?"
-#~ msgstr ""
-#~ "Nova versió de Picard està disponible (%s). Vols descarregar-la ara?"
-
-#~ msgid "Couldn't find PUID for file %s"
-#~ msgstr "No es troba PUID per el arxiu %s"
-
-#~ msgid "Looking up the fingerprint for file %s..."
-#~ msgstr "Buscant el 'fingerprint' per arxiu %s"
-
-#~ msgid "Creating fingerprint for file %s..."
-#~ msgstr "Creant 'fingerprint' per l'arxiu %s"
-
-#~ msgid "Length"
-#~ msgstr "Longitud"
diff --git a/po/cs.po b/po/cs.po
index 956d8e0cb..2e535b155 100644
--- a/po/cs.po
+++ b/po/cs.po
@@ -6,35 +6,1293 @@ msgid ""
 msgstr ""
 "Project-Id-Version: picard\n"
 "Report-Msgid-Bugs-To: http://bugs.musicbrainz.org/\n"
-"POT-Creation-Date: 2008-12-01 18:20+0100\n"
-"PO-Revision-Date: 2008-11-20 19:18+0000\n"
-"Last-Translator: fatbozz <Unknown>\n"
+"POT-Creation-Date: 2009-01-25 12:23+0100\n"
+"PO-Revision-Date: 2009-01-25 12:58+0100\n"
+"Last-Translator: Philipp Wolfer <phw@rubyforge.org>\n"
 "Language-Team: Czech <cs@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
-"X-Launchpad-Export-Date: 2008-12-01 17:01+0000\n"
+"X-Launchpad-Export-Date: 2009-01-24 23:28+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
-#: ../picard/album.py:108 ../picard/cluster.py:248
+#: ../picard/album.py:108
+#: ../picard/cluster.py:248
 msgid "Unmatched Files"
 msgstr "Nerozpoznané Soubory"
 
-#: ../picard/album.py:269
+#: ../picard/album.py:281
 #, python-format
 msgid "[couldn't load album %s]"
 msgstr "[nemohu nahrát album %s]"
 
-#: ../picard/album.py:305
+#: ../picard/album.py:317
 msgid "[loading album information]"
 msgstr "[Nahrávám informace o albu]"
 
-#: ../picard/tagger.py:472
+#: ../picard/cluster.py:164
+#: ../picard/cluster.py:175
+#, python-format
+msgid "No matching releases for cluster %s"
+msgstr "Žádné odpovídající album pro klastr %s"
+
+#: ../picard/cluster.py:177
+#, python-format
+msgid "Cluster %s identified!"
+msgstr "Klastr %s identifikován!"
+
+#: ../picard/cluster.py:182
+#, python-format
+msgid "Looking up the metadata for cluster %s..."
+msgstr "Vyhledávám metadata pro klastr %s"
+
+#: ../picard/const.py:40
+msgid "CD"
+msgstr ""
+
+#: ../picard/const.py:41
+msgid "DVD"
+msgstr ""
+
+#: ../picard/const.py:42
+msgid "SACD"
+msgstr ""
+
+#: ../picard/const.py:43
+msgid "LaserDisc"
+msgstr ""
+
+#: ../picard/const.py:44
+msgid "MiniDisc"
+msgstr ""
+
+#: ../picard/const.py:45
+msgid "Vinyl"
+msgstr ""
+
+#: ../picard/const.py:46
+msgid "Cassette"
+msgstr ""
+
+#: ../picard/const.py:47
+msgid "Cartridge (4/8-tracks)"
+msgstr ""
+
+#: ../picard/const.py:48
+msgid "Reel-to-Reel"
+msgstr ""
+
+#: ../picard/const.py:49
+msgid "DAT"
+msgstr ""
+
+#: ../picard/const.py:50
+#, fuzzy
+msgid "Digital Media"
+msgstr "Původní Metadata"
+
+#: ../picard/const.py:51
+msgid "Wax Cylinder"
+msgstr ""
+
+#: ../picard/const.py:52
+msgid "Piano Roll"
+msgstr ""
+
+#: ../picard/const.py:53
+msgid "Other"
+msgstr ""
+
+#: ../picard/const.py:58
+msgid "Bangladesh"
+msgstr ""
+
+#: ../picard/const.py:59
+msgid "Belgium"
+msgstr ""
+
+#: ../picard/const.py:60
+msgid "Burkina Faso"
+msgstr ""
+
+#: ../picard/const.py:61
+msgid "Bulgaria"
+msgstr ""
+
+#: ../picard/const.py:62
+msgid "Barbados"
+msgstr ""
+
+#: ../picard/const.py:63
+msgid "Wallis and Futuna Islands"
+msgstr ""
+
+#: ../picard/const.py:64
+msgid "Bermuda"
+msgstr ""
+
+#: ../picard/const.py:65
+msgid "Brunei Darussalam"
+msgstr ""
+
+#: ../picard/const.py:66
+msgid "Bolivia"
+msgstr ""
+
+#: ../picard/const.py:67
+msgid "Bahrain"
+msgstr ""
+
+#: ../picard/const.py:68
+msgid "Burundi"
+msgstr ""
+
+#: ../picard/const.py:69
+msgid "Benin"
+msgstr ""
+
+#: ../picard/const.py:70
+msgid "Bhutan"
+msgstr ""
+
+#: ../picard/const.py:71
+msgid "Jamaica"
+msgstr ""
+
+#: ../picard/const.py:72
+msgid "Bouvet Island"
+msgstr ""
+
+#: ../picard/const.py:73
+msgid "Botswana"
+msgstr ""
+
+#: ../picard/const.py:74
+msgid "Samoa"
+msgstr ""
+
+#: ../picard/const.py:75
+msgid "Brazil"
+msgstr ""
+
+#: ../picard/const.py:76
+msgid "Bahamas"
+msgstr ""
+
+#: ../picard/const.py:77
+msgid "Belarus"
+msgstr ""
+
+#: ../picard/const.py:78
+msgid "Belize"
+msgstr ""
+
+#: ../picard/const.py:79
+msgid "Russian Federation"
+msgstr ""
+
+#: ../picard/const.py:80
+msgid "Rwanda"
+msgstr ""
+
+#: ../picard/const.py:81
+msgid "Reunion"
+msgstr ""
+
+#: ../picard/const.py:82
+msgid "Turkmenistan"
+msgstr ""
+
+#: ../picard/const.py:83
+msgid "Tajikistan"
+msgstr ""
+
+#: ../picard/const.py:84
+msgid "Romania"
+msgstr ""
+
+#: ../picard/const.py:85
+msgid "Tokela"
+msgstr ""
+
+#: ../picard/const.py:86
+msgid "Guinea-Bissa"
+msgstr ""
+
+#: ../picard/const.py:87
+msgid "Guam"
+msgstr ""
+
+#: ../picard/const.py:88
+msgid "Guatemala"
+msgstr ""
+
+#: ../picard/const.py:89
+msgid "Greece"
+msgstr ""
+
+#: ../picard/const.py:90
+msgid "Equatorial Guinea"
+msgstr ""
+
+#: ../picard/const.py:91
+msgid "Guadeloupe"
+msgstr ""
+
+#: ../picard/const.py:92
+msgid "Japan"
+msgstr ""
+
+#: ../picard/const.py:93
+msgid "Guyana"
+msgstr ""
+
+#: ../picard/const.py:94
+msgid "French Guiana"
+msgstr ""
+
+#: ../picard/const.py:95
+msgid "Georgia"
+msgstr ""
+
+#: ../picard/const.py:96
+msgid "Grenada"
+msgstr ""
+
+#: ../picard/const.py:97
+msgid "United Kingdom"
+msgstr ""
+
+#: ../picard/const.py:98
+msgid "Gabon"
+msgstr ""
+
+#: ../picard/const.py:99
+msgid "El Salvador"
+msgstr ""
+
+#: ../picard/const.py:100
+#, fuzzy
+msgid "Guinea"
+msgstr "Obecné"
+
+#: ../picard/const.py:101
+msgid "Gambia"
+msgstr ""
+
+#: ../picard/const.py:102
+msgid "Greenland"
+msgstr ""
+
+#: ../picard/const.py:103
+msgid "Gibraltar"
+msgstr ""
+
+#: ../picard/const.py:104
+msgid "Ghana"
+msgstr ""
+
+#: ../picard/const.py:105
+msgid "Oman"
+msgstr ""
+
+#: ../picard/const.py:106
+msgid "Tunisia"
+msgstr ""
+
+#: ../picard/const.py:107
+msgid "Jordan"
+msgstr ""
+
+#: ../picard/const.py:108
+msgid "Haiti"
+msgstr ""
+
+#: ../picard/const.py:109
+msgid "Hungary"
+msgstr ""
+
+#: ../picard/const.py:110
+msgid "Hong Kong"
+msgstr ""
+
+#: ../picard/const.py:111
+msgid "Honduras"
+msgstr ""
+
+#: ../picard/const.py:112
+msgid "Heard and Mc Donald Islands"
+msgstr ""
+
+#: ../picard/const.py:113
+msgid "Venezuela"
+msgstr ""
+
+#: ../picard/const.py:114
+msgid "Puerto Rico"
+msgstr ""
+
+#: ../picard/const.py:115
+msgid "Pala"
+msgstr ""
+
+#: ../picard/const.py:116
+#, fuzzy
+msgid "Portugal"
+msgstr "Port:"
+
+#: ../picard/const.py:117
+msgid "Svalbard and Jan Mayen Islands"
+msgstr ""
+
+#: ../picard/const.py:118
+msgid "Paraguay"
+msgstr ""
+
+#: ../picard/const.py:119
+msgid "Iraq"
+msgstr ""
+
+#: ../picard/const.py:120
+msgid "Panama"
+msgstr ""
+
+#: ../picard/const.py:121
+msgid "French Polynesia"
+msgstr ""
+
+#: ../picard/const.py:122
+msgid "Papua New Guinea"
+msgstr ""
+
+#: ../picard/const.py:123
+msgid "Per"
+msgstr ""
+
+#: ../picard/const.py:124
+msgid "Pakistan"
+msgstr ""
+
+#: ../picard/const.py:125
+msgid "Philippines"
+msgstr ""
+
+#: ../picard/const.py:126
+msgid "Pitcairn"
+msgstr ""
+
+#: ../picard/const.py:127
+msgid "Poland"
+msgstr ""
+
+#: ../picard/const.py:128
+msgid "St. Pierre and Miquelon"
+msgstr ""
+
+#: ../picard/const.py:129
+msgid "Zambia"
+msgstr ""
+
+#: ../picard/const.py:130
+msgid "Western Sahara"
+msgstr ""
+
+#: ../picard/const.py:131
+msgid "Estonia"
+msgstr ""
+
+#: ../picard/const.py:132
+msgid "Egypt"
+msgstr ""
+
+#: ../picard/const.py:133
+msgid "South Africa"
+msgstr ""
+
+#: ../picard/const.py:134
+msgid "Ecuador"
+msgstr ""
+
+#: ../picard/const.py:135
+msgid "Italy"
+msgstr ""
+
+#: ../picard/const.py:136
+#, fuzzy
+msgid "Viet Nam"
+msgstr "Název souboru"
+
+#: ../picard/const.py:137
+msgid "Solomon Islands"
+msgstr ""
+
+#: ../picard/const.py:138
+msgid "Ethiopia"
+msgstr ""
+
+#: ../picard/const.py:139
+msgid "Somalia"
+msgstr ""
+
+#: ../picard/const.py:140
+msgid "Zimbabwe"
+msgstr ""
+
+#: ../picard/const.py:141
+msgid "Saudi Arabia"
+msgstr ""
+
+#: ../picard/const.py:142
+#, fuzzy
+msgid "Spain"
+msgstr "Pro&hledat"
+
+#: ../picard/const.py:143
+msgid "Eritrea"
+msgstr ""
+
+#: ../picard/const.py:144
+msgid "Moldova, Republic of"
+msgstr ""
+
+#: ../picard/const.py:145
+msgid "Madagascar"
+msgstr ""
+
+#: ../picard/const.py:146
+msgid "Morocco"
+msgstr ""
+
+#: ../picard/const.py:147
+#, fuzzy
+msgid "Monaco"
+msgstr "Mono"
+
+#: ../picard/const.py:148
+msgid "Uzbekistan"
+msgstr ""
+
+#: ../picard/const.py:149
+msgid "Myanmar"
+msgstr ""
+
+#: ../picard/const.py:150
+msgid "Mali"
+msgstr ""
+
+#: ../picard/const.py:151
+msgid "Maca"
+msgstr ""
+
+#: ../picard/const.py:152
+#, fuzzy
+msgid "Mongolia"
+msgstr "Mono"
+
+#: ../picard/const.py:153
+msgid "Marshall Islands"
+msgstr ""
+
+#: ../picard/const.py:154
+msgid "Macedonia, The Former Yugoslav Republic of"
+msgstr ""
+
+#: ../picard/const.py:155
+msgid "Mauritius"
+msgstr ""
+
+#: ../picard/const.py:156
+#, fuzzy
+msgid "Malta"
+msgstr "Metadata"
+
+#: ../picard/const.py:157
+msgid "Malawi"
+msgstr ""
+
+#: ../picard/const.py:158
+msgid "Maldives"
+msgstr ""
+
+#: ../picard/const.py:159
+msgid "Martinique"
+msgstr ""
+
+#: ../picard/const.py:160
+msgid "Northern Mariana Islands"
+msgstr ""
+
+#: ../picard/const.py:161
+msgid "Montserrat"
+msgstr ""
+
+#: ../picard/const.py:162
+msgid "Mauritania"
+msgstr ""
+
+#: ../picard/const.py:163
+msgid "Uganda"
+msgstr ""
+
+#: ../picard/const.py:164
+msgid "Malaysia"
+msgstr ""
+
+#: ../picard/const.py:165
+msgid "Mexico"
+msgstr ""
+
+#: ../picard/const.py:166
+msgid "Israel"
+msgstr ""
+
+#: ../picard/const.py:167
+#, fuzzy
+msgid "France"
+msgstr "Zrušit"
+
+#: ../picard/const.py:168
+msgid "British Indian Ocean Territory"
+msgstr ""
+
+#: ../picard/const.py:169
+msgid "St. Helena"
+msgstr ""
+
+#: ../picard/const.py:170
+msgid "Finland"
+msgstr ""
+
+#: ../picard/const.py:171
+msgid "Fiji"
+msgstr ""
+
+#: ../picard/const.py:172
+msgid "Falkland Islands (Malvinas)"
+msgstr ""
+
+#: ../picard/const.py:173
+msgid "Micronesia, Federated States of"
+msgstr ""
+
+#: ../picard/const.py:174
+msgid "Faroe Islands"
+msgstr ""
+
+#: ../picard/const.py:175
+msgid "Nicaragua"
+msgstr ""
+
+#: ../picard/const.py:176
+msgid "Netherlands"
+msgstr ""
+
+#: ../picard/const.py:177
+msgid "Norway"
+msgstr ""
+
+#: ../picard/const.py:178
+msgid "Namibia"
+msgstr ""
+
+#: ../picard/const.py:179
+msgid "Vanuat"
+msgstr ""
+
+#: ../picard/const.py:180
+msgid "New Caledonia"
+msgstr ""
+
+#: ../picard/const.py:181
+#, fuzzy
+msgid "Niger"
+msgstr "Mixér"
+
+#: ../picard/const.py:182
+msgid "Norfolk Island"
+msgstr ""
+
+#: ../picard/const.py:183
+msgid "Nigeria"
+msgstr ""
+
+#: ../picard/const.py:184
+#, fuzzy
+msgid "New Zealand"
+msgstr "Nová Metadata"
+
+#: ../picard/const.py:185
+msgid "Zaire"
+msgstr ""
+
+#: ../picard/const.py:186
+msgid "Nepal"
+msgstr ""
+
+#: ../picard/const.py:187
+msgid "Naur"
+msgstr ""
+
+#: ../picard/const.py:188
+msgid "Niue"
+msgstr ""
+
+#: ../picard/const.py:189
+msgid "Cook Islands"
+msgstr ""
+
+#: ../picard/const.py:190
+msgid "Cote d'Ivoire"
+msgstr ""
+
+#: ../picard/const.py:191
+msgid "Switzerland"
+msgstr ""
+
+#: ../picard/const.py:192
+msgid "Colombia"
+msgstr ""
+
+#: ../picard/const.py:193
+msgid "China"
+msgstr ""
+
+#: ../picard/const.py:194
+msgid "Cameroon"
+msgstr ""
+
+#: ../picard/const.py:195
+#, fuzzy
+msgid "Chile"
+msgstr "Soubor"
+
+#: ../picard/const.py:196
+msgid "Cocos (Keeling) Islands"
+msgstr ""
+
+#: ../picard/const.py:197
+msgid "Canada"
+msgstr ""
+
+#: ../picard/const.py:198
+#, fuzzy
+msgid "Congo"
+msgstr "Mono"
+
+#: ../picard/const.py:199
+msgid "Central African Republic"
+msgstr ""
+
+#: ../picard/const.py:200
+msgid "Czech Republic"
+msgstr ""
+
+#: ../picard/const.py:201
+msgid "Cyprus"
+msgstr ""
+
+#: ../picard/const.py:202
+msgid "Christmas Island"
+msgstr ""
+
+#: ../picard/const.py:203
+msgid "Costa Rica"
+msgstr ""
+
+#: ../picard/const.py:204
+msgid "Cape Verde"
+msgstr ""
+
+#: ../picard/const.py:205
+msgid "Cuba"
+msgstr ""
+
+#: ../picard/const.py:206
+msgid "Swaziland"
+msgstr ""
+
+#: ../picard/const.py:207
+msgid "Syrian Arab Republic"
+msgstr ""
+
+#: ../picard/const.py:208
+msgid "Kyrgyzstan"
+msgstr ""
+
+#: ../picard/const.py:209
+msgid "Kenya"
+msgstr ""
+
+#: ../picard/const.py:210
+msgid "Suriname"
+msgstr ""
+
+#: ../picard/const.py:211
+msgid "Kiribati"
+msgstr ""
+
+#: ../picard/const.py:212
+msgid "Cambodia"
+msgstr ""
+
+#: ../picard/const.py:213
+msgid "Saint Kitts and Nevis"
+msgstr ""
+
+#: ../picard/const.py:214
+#, fuzzy
+msgid "Comoros"
+msgstr "Barvy"
+
+#: ../picard/const.py:215
+msgid "Sao Tome and Principe"
+msgstr ""
+
+#: ../picard/const.py:216
+msgid "Slovenia"
+msgstr ""
+
+#: ../picard/const.py:217
+msgid "Kuwait"
+msgstr ""
+
+#: ../picard/const.py:218
+#, fuzzy
+msgid "Senegal"
+msgstr "Obecné"
+
+#: ../picard/const.py:219
+msgid "San Marino"
+msgstr ""
+
+#: ../picard/const.py:220
+msgid "Sierra Leone"
+msgstr ""
+
+#: ../picard/const.py:221
+msgid "Seychelles"
+msgstr ""
+
+#: ../picard/const.py:222
+msgid "Kazakhstan"
+msgstr ""
+
+#: ../picard/const.py:223
+msgid "Cayman Islands"
+msgstr ""
+
+#: ../picard/const.py:224
+msgid "Singapore"
+msgstr ""
+
+#: ../picard/const.py:225
+msgid "Sweden"
+msgstr ""
+
+#: ../picard/const.py:226
+#, fuzzy
+msgid "Sudan"
+msgstr "Pro&hledat"
+
+#: ../picard/const.py:227
+msgid "Dominican Republic"
+msgstr ""
+
+#: ../picard/const.py:228
+msgid "Dominica"
+msgstr ""
+
+#: ../picard/const.py:229
+#, fuzzy
+msgid "Djibouti"
+msgstr "O programu"
+
+#: ../picard/const.py:230
+msgid "Denmark"
+msgstr ""
+
+#: ../picard/const.py:231
+msgid "Virgin Islands (British)"
+msgstr ""
+
+#: ../picard/const.py:232
+msgid "Germany"
+msgstr ""
+
+#: ../picard/const.py:233
+msgid "Yemen"
+msgstr ""
+
+#: ../picard/const.py:234
+msgid "Algeria"
+msgstr ""
+
+#: ../picard/const.py:235
+msgid "United States"
+msgstr ""
+
+#: ../picard/const.py:236
+msgid "Uruguay"
+msgstr ""
+
+#: ../picard/const.py:237
+msgid "Mayotte"
+msgstr ""
+
+#: ../picard/const.py:238
+msgid "United States Minor Outlying Islands"
+msgstr ""
+
+#: ../picard/const.py:239
+msgid "Lebanon"
+msgstr ""
+
+#: ../picard/const.py:240
+msgid "Saint Lucia"
+msgstr ""
+
+#: ../picard/const.py:241
+msgid "Lao People's Democratic Republic"
+msgstr ""
+
+#: ../picard/const.py:242
+msgid "Tuval"
+msgstr ""
+
+#: ../picard/const.py:243
+msgid "Taiwan"
+msgstr ""
+
+#: ../picard/const.py:244
+msgid "Trinidad and Tobago"
+msgstr ""
+
+#: ../picard/const.py:245
+msgid "Turkey"
+msgstr ""
+
+#: ../picard/const.py:246
+msgid "Sri Lanka"
+msgstr ""
+
+#: ../picard/const.py:247
+msgid "Liechtenstein"
+msgstr ""
+
+#: ../picard/const.py:248
+msgid "Latvia"
+msgstr ""
+
+#: ../picard/const.py:249
+msgid "Tonga"
+msgstr ""
+
+#: ../picard/const.py:250
+msgid "Lithuania"
+msgstr ""
+
+#: ../picard/const.py:251
+msgid "Luxembourg"
+msgstr ""
+
+#: ../picard/const.py:252
+msgid "Liberia"
+msgstr ""
+
+#: ../picard/const.py:253
+#, fuzzy
+msgid "Lesotho"
+msgstr "Délka"
+
+#: ../picard/const.py:254
+msgid "Thailand"
+msgstr ""
+
+#: ../picard/const.py:255
+msgid "French Southern Territories"
+msgstr ""
+
+#: ../picard/const.py:256
+#, fuzzy
+msgid "Togo"
+msgstr "&Nástroje"
+
+#: ../picard/const.py:257
+msgid "Chad"
+msgstr ""
+
+#: ../picard/const.py:258
+msgid "Turks and Caicos Islands"
+msgstr ""
+
+#: ../picard/const.py:259
+msgid "Libyan Arab Jamahiriya"
+msgstr ""
+
+#: ../picard/const.py:260
+msgid "Vatican City State (Holy See)"
+msgstr ""
+
+#: ../picard/const.py:261
+msgid "Saint Vincent and The Grenadines"
+msgstr ""
+
+#: ../picard/const.py:262
+msgid "United Arab Emirates"
+msgstr ""
+
+#: ../picard/const.py:263
+msgid "Andorra"
+msgstr ""
+
+#: ../picard/const.py:264
+msgid "Antigua and Barbuda"
+msgstr ""
+
+#: ../picard/const.py:265
+msgid "Afghanistan"
+msgstr ""
+
+#: ../picard/const.py:266
+msgid "Anguilla"
+msgstr ""
+
+#: ../picard/const.py:267
+msgid "Virgin Islands (U.S.)"
+msgstr ""
+
+#: ../picard/const.py:268
+msgid "Iceland"
+msgstr ""
+
+#: ../picard/const.py:269
+msgid "Iran (Islamic Republic of)"
+msgstr ""
+
+#: ../picard/const.py:270
+msgid "Armenia"
+msgstr ""
+
+#: ../picard/const.py:271
+msgid "Albania"
+msgstr ""
+
+#: ../picard/const.py:272
+msgid "Angola"
+msgstr ""
+
+#: ../picard/const.py:273
+msgid "Netherlands Antilles"
+msgstr ""
+
+#: ../picard/const.py:274
+msgid "Antarctica"
+msgstr ""
+
+#: ../picard/const.py:275
+msgid "American Samoa"
+msgstr ""
+
+#: ../picard/const.py:276
+msgid "Argentina"
+msgstr ""
+
+#: ../picard/const.py:277
+msgid "Australia"
+msgstr ""
+
+#: ../picard/const.py:278
+#, fuzzy
+msgid "Austria"
+msgstr "Autor"
+
+#: ../picard/const.py:279
+msgid "Aruba"
+msgstr ""
+
+#: ../picard/const.py:280
+#, fuzzy
+msgid "India"
+msgstr "Metadata"
+
+#: ../picard/const.py:281
+msgid "Tanzania, United Republic of"
+msgstr ""
+
+#: ../picard/const.py:282
+msgid "Azerbaijan"
+msgstr ""
+
+#: ../picard/const.py:283
+msgid "Ireland"
+msgstr ""
+
+#: ../picard/const.py:284
+msgid "Indonesia"
+msgstr ""
+
+#: ../picard/const.py:285
+msgid "Ukraine"
+msgstr ""
+
+#: ../picard/const.py:286
+msgid "Qatar"
+msgstr ""
+
+#: ../picard/const.py:287
+msgid "Mozambique"
+msgstr ""
+
+#: ../picard/const.py:288
+msgid "Bosnia and Herzegovina"
+msgstr ""
+
+#: ../picard/const.py:289
+msgid "Congo, The Democratic Republic of the"
+msgstr ""
+
+#: ../picard/const.py:290
+msgid "Serbia and Montenegro"
+msgstr ""
+
+#: ../picard/const.py:291
+msgid "Croatia"
+msgstr ""
+
+#: ../picard/const.py:292
+msgid "Korea (North), Democratic People's Republic of"
+msgstr ""
+
+#: ../picard/const.py:293
+msgid "Korea (South), Republic of"
+msgstr ""
+
+#: ../picard/const.py:294
+msgid "Slovakia"
+msgstr ""
+
+#: ../picard/const.py:295
+msgid "Soviet Union (historical, 1922-1991)"
+msgstr ""
+
+#: ../picard/const.py:296
+msgid "East Timor"
+msgstr ""
+
+#: ../picard/const.py:297
+msgid "Czechoslovakia (historical, 1918-1992)"
+msgstr ""
+
+#: ../picard/const.py:298
+msgid "Europe"
+msgstr ""
+
+#: ../picard/const.py:299
+msgid "East Germany (historical, 1949-1990)"
+msgstr ""
+
+#: ../picard/const.py:300
+msgid "[Unknown Country]"
+msgstr ""
+
+#: ../picard/const.py:301
+msgid "[Worldwide]"
+msgstr ""
+
+#: ../picard/const.py:302
+msgid "Yugoslavia (historical, 1918-1992)"
+msgstr ""
+
+#: ../picard/const.py:307
+msgid "Catalan"
+msgstr ""
+
+#: ../picard/const.py:308
+msgid "Czech"
+msgstr ""
+
+#: ../picard/const.py:309
+msgid "Welsh"
+msgstr ""
+
+#: ../picard/const.py:310
+#, fuzzy
+msgid "Danish"
+msgstr "Podrobnosti"
+
+#: ../picard/const.py:311
+#, fuzzy
+msgid "German"
+msgstr "Obecné"
+
+#: ../picard/const.py:312
+msgid "English"
+msgstr ""
+
+#: ../picard/const.py:313
+msgid "English (Canada)"
+msgstr ""
+
+#: ../picard/const.py:314
+msgid "English (UK)"
+msgstr ""
+
+#: ../picard/const.py:315
+msgid "Spanish"
+msgstr ""
+
+#: ../picard/const.py:316
+#, fuzzy
+msgid "Persian"
+msgstr "Verze"
+
+#: ../picard/const.py:317
+msgid "Finnish"
+msgstr ""
+
+#: ../picard/const.py:318
+msgid "French"
+msgstr ""
+
+#: ../picard/const.py:319
+msgid "Frisian"
+msgstr ""
+
+#: ../picard/const.py:320
+msgid "Hebrew"
+msgstr ""
+
+#: ../picard/const.py:321
+msgid "Hungarian"
+msgstr ""
+
+#: ../picard/const.py:322
+msgid "Islandic"
+msgstr ""
+
+#: ../picard/const.py:323
+msgid "Italian"
+msgstr ""
+
+#: ../picard/const.py:324
+msgid "Kannada"
+msgstr ""
+
+#: ../picard/const.py:325
+msgid "Korean"
+msgstr ""
+
+#: ../picard/const.py:326
+msgid "Lithuanian"
+msgstr ""
+
+#: ../picard/const.py:327
+msgid "Norwegian Bokmal"
+msgstr ""
+
+#: ../picard/const.py:328
+msgid "Dutch"
+msgstr ""
+
+#: ../picard/const.py:329
+#, fuzzy
+msgid "Polish"
+msgstr "Zásuvné moduly"
+
+#: ../picard/const.py:330
+msgid "Portuguese"
+msgstr ""
+
+#: ../picard/const.py:331
+msgid "Brazilian Portuguese"
+msgstr ""
+
+#: ../picard/const.py:332
+msgid "Romanian"
+msgstr ""
+
+#: ../picard/const.py:333
+msgid "Russian"
+msgstr ""
+
+#: ../picard/const.py:334
+#, fuzzy
+msgid "Scots"
+msgstr "Skóre"
+
+#: ../picard/const.py:335
+msgid "Slovak"
+msgstr ""
+
+#: ../picard/const.py:336
+msgid "Slovenian"
+msgstr ""
+
+#: ../picard/const.py:337
+msgid "Swedish"
+msgstr ""
+
+#: ../picard/const.py:338
+#, fuzzy
+msgid "Chinese"
+msgstr "Kanály:"
+
+#: ../picard/file.py:475
+#, python-format
+msgid "No matching tracks for file %s"
+msgstr "Žádné odpovídající výsledky pro soubor %s"
+
+#: ../picard/file.py:492
+#, fuzzy, python-format
+msgid "No matching tracks above the threshold for file %s"
+msgstr "Žádné odpovídající výsledky pro soubor %s"
+
+#: ../picard/file.py:495
+#, python-format
+msgid "File %s identified!"
+msgstr "Soubor %s identifikován!"
+
+#: ../picard/file.py:506
+#, python-format
+msgid "Looking up the PUID for file %s..."
+msgstr "Vyhledávám PUID pro soubor %s"
+
+#: ../picard/file.py:511
+#, python-format
+msgid "Looking up the metadata for file %s..."
+msgstr "Vyhledávám metadata pro soubor %s"
+
+#: ../picard/puidmanager.py:58
+msgid "Submitting PUIDs..."
+msgstr "Posílám PUIDs"
+
+#: ../picard/puidmanager.py:64
+#, python-format
+msgid "PUIDs submission failed: %s"
+msgstr "Odeslání PUID %s selhalo"
+
+#: ../picard/puidmanager.py:66
+msgid "PUIDs successfully submitted!"
+msgstr "PUIDs úspěšně nahrány"
+
+#: ../picard/playlist.py:31
+msgid "M3U Playlist (*.m3u)"
+msgstr "M3U Playlist (*.m3u)"
+
+#: ../picard/playlist.py:32
+msgid "PLS Playlist (*.pls)"
+msgstr "PLS Playlist (*.pls)"
+
+#: ../picard/playlist.py:33
+msgid "XSPF Playlist (*.xspf)"
+msgstr "XSPF Playlist (*.xspf)"
+
+#: ../picard/tagger.py:476
 msgid "CD Lookup Error"
 msgstr "Chyba při prohledávání CD/DVD"
 
-#: ../picard/tagger.py:473
+#: ../picard/tagger.py:477
 #, python-format
 msgid ""
 "Error while reading CD:\n"
@@ -45,125 +1303,178 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../picard/ui/passworddialog.py:38
+#: ../picard/tagger.py:503
 #, python-format
-msgid ""
-"The server %s requires you to login. Please enter your username and password."
-msgstr ""
+msgid "Couldn't find PUID for file %s"
+msgstr "Nemohu najít PUID pro soubor %s"
 
-#: ../picard/ui/ui_options_script.py:52
-msgid "Tagger Script"
-msgstr "Skripty pro tagger"
+#: ../picard/musicdns/__init__.py:98
+#, python-format
+msgid "Looking up the fingerprint for file %s..."
+msgstr "Hledám otisky pro soubor %s"
+
+#: ../picard/musicdns/__init__.py:117
+#, python-format
+msgid "Creating fingerprint for file %s..."
+msgstr "Vytvářím otisky pro soubor %s"
 
 #: ../picard/ui/cdlookup.py:31
 msgid "Score"
 msgstr "Skóre"
 
 #: ../picard/ui/cdlookup.py:31
+#: ../picard/ui/itemviews.py:82
+#: ../picard/util/tags.py:23
 msgid "Title"
 msgstr ""
 
-#: ../picard/ui/cdlookup.py:31 ../picard/ui/mainwindow.py:436
+#: ../picard/ui/cdlookup.py:31
+#: ../picard/ui/itemviews.py:84
+#: ../picard/ui/mainwindow.py:436
+#: ../picard/util/tags.py:22
 msgid "Artist"
 msgstr "Umělec"
 
-#: ../picard/ui/ui_metadata.py:121
-msgid "Lookup"
-msgstr "Vyhledat"
+#: ../picard/ui/coverartbox.py:47
+#: ../picard/ui/options/cover.py:29
+msgid "Cover Art"
+msgstr "Obrázek alba"
 
-#: ../picard/ui/ui_metadata.py:122
-msgid "Title:"
-msgstr "Název:"
+#: ../picard/ui/coverartbox.py:95
+msgid "Buy the album on Amazon"
+msgstr "Koupit album na Amazonu"
 
-#: ../picard/ui/ui_metadata.py:123
-msgid "Date:"
-msgstr "Datum:"
+#: ../picard/ui/filebrowser.py:38
+#: ../picard/ui/mainwindow.py:302
+msgid "&Refresh"
+msgstr ""
 
-#: ../picard/ui/ui_metadata.py:124
-msgid "Artist:"
-msgstr "Umělec:"
+#: ../picard/ui/filebrowser.py:41
+#, fuzzy
+msgid "&Move Tagged Files Here"
+msgstr "Přesunout otagované soubory"
 
-#: ../picard/ui/ui_metadata.py:125
-msgid "Track:"
+#: ../picard/ui/filebrowser.py:44
+msgid "Show &Hidden Files"
+msgstr ""
+
+#: ../picard/ui/itemviews.py:83
+msgid "Length"
+msgstr "Délka"
+
+#: ../picard/ui/itemviews.py:327
+msgid "&Releases"
+msgstr "&Vydání"
+
+#: ../picard/ui/itemviews.py:353
+msgid "&Plugins"
+msgstr "&Pluginy"
+
+#: ../picard/ui/itemviews.py:523
+msgid "Clusters"
+msgstr "Klastry"
+
+#: ../picard/ui/logview.py:29
+msgid "Log"
+msgstr "Log"
+
+#: ../picard/ui/puidsubmit.py:31
+#: ../picard/ui/options/plugins.py:80
+msgid "File"
+msgstr "Soubor"
+
+#: ../picard/ui/puidsubmit.py:31
+msgid "PUID"
+msgstr "PUID"
+
+#: ../picard/ui/puidsubmit.py:31
+#: ../picard/ui/mainwindow.py:437
+msgid "Track"
 msgstr "Skladba"
 
-#: ../picard/ui/ui_metadata.py:126
-msgid "0000-00-00; "
-msgstr "0000-00-00; "
+#: ../picard/ui/puidsubmit.py:31
+msgid "Release"
+msgstr "Vydání"
 
-#: ../picard/ui/ui_metadata.py:127 ../picard/ui/tageditor.py:225
-#: ../picard/ui/multitageditor.py:181
+#: ../picard/ui/puidsubmit.py:31
+msgid "Release ID"
+msgstr "ID vydání"
+
+#: ../picard/ui/tageditor.py:65
+#: ../picard/ui/ui_options_plugins.py:62
+msgid "Details"
+msgstr "Podrobnosti"
+
+#: ../picard/ui/tageditor.py:70
+#: ../picard/ui/tageditor.py:241
+#, python-format
+msgid "%d file"
+msgid_plural "%d files"
+msgstr[0] "%d soubor"
+msgstr[1] "%d soubory"
+msgstr[2] "%d soubory"
+
+#: ../picard/ui/tageditor.py:124
+#, python-format
+msgid "(different across %d file)"
+msgid_plural "(different across %d files)"
+msgstr[0] "(rozdílný soubor skrze %d)"
+msgstr[1] "(rozdílné soubory skrze %d)"
+msgstr[2] "(rozdílné soubory skrze %d)"
+
+#: ../picard/ui/tageditor.py:127
+#, python-format
+msgid "(missing from %d file)"
+msgid_plural "(missing from %d files)"
+msgstr[0] "(chybí z %d souboru)"
+msgstr[1] "(chybí z %d souborů)"
+msgstr[2] "(chybí z %d souborů)"
+
+#: ../picard/ui/tageditor.py:210
+msgid "Filename:"
+msgstr "Název souboru:"
+
+#: ../picard/ui/tageditor.py:212
+msgid "Format:"
+msgstr "Formát:"
+
+#: ../picard/ui/tageditor.py:221
+msgid "Size:"
+msgstr "Velikost:"
+
+#: ../picard/ui/tageditor.py:225
+#: ../picard/ui/ui_metadata.py:127
 msgid "Length:"
 msgstr "Délka:"
 
-#: ../picard/ui/ui_metadata.py:128
-msgid "Album:"
-msgstr "Album:"
+#: ../picard/ui/tageditor.py:227
+msgid "Bitrate:"
+msgstr "Bitový tok:"
 
-#: ../picard/ui/ui_passworddialog.py:78
-msgid "Authentication required"
-msgstr ""
+#: ../picard/ui/tageditor.py:229
+msgid "Sample rate:"
+msgstr "Vzorkovací frekvence:"
 
-#: ../picard/ui/ui_passworddialog.py:79 ../picard/ui/ui_options_proxy.py:83
-#: ../picard/ui/ui_options_general.py:113
-msgid "Username:"
-msgstr "Uživatelské jméno:"
+#: ../picard/ui/tageditor.py:231
+msgid "Bits per sample:"
+msgstr "Bitů na vzorek"
 
-#: ../picard/ui/ui_passworddialog.py:80 ../picard/ui/ui_options_proxy.py:82
-#: ../picard/ui/ui_options_general.py:112
-msgid "Password:"
-msgstr "Heslo:"
+#: ../picard/ui/tageditor.py:234
+msgid "Mono"
+msgstr "Mono"
 
-#: ../picard/ui/ui_passworddialog.py:81
-msgid "Save username and password"
-msgstr ""
+#: ../picard/ui/tageditor.py:235
+msgid "Stereo"
+msgstr "Stereo"
 
-#: ../picard/ui/ui_options_folksonomy.py:114
-#: ../picard/ui/ui_options_folksonomy_tags.py:114
-msgid "Folksonomy Tags"
-msgstr ""
+#: ../picard/ui/tageditor.py:237
+msgid "Channels:"
+msgstr "Kanály:"
 
-#: ../picard/ui/ui_options_folksonomy.py:115
-#: ../picard/ui/ui_options_folksonomy_tags.py:115
-msgid "Ignore tags:"
-msgstr "Ignorovat tagy:"
-
-#: ../picard/ui/ui_options_folksonomy.py:116
-#: ../picard/ui/ui_options_folksonomy_tags.py:116
-msgid "Minimal tag usage:"
-msgstr ""
-
-#: ../picard/ui/ui_options_folksonomy.py:117
-#: ../picard/ui/ui_options_folksonomy_tags.py:117
-#: ../picard/ui/ui_options_matching.py:107
-#: ../picard/ui/ui_options_matching.py:108
-#: ../picard/ui/ui_options_matching.py:109
-#: ../picard/ui/ui_options_matching.py:113
-msgid " %"
-msgstr " %"
-
-#: ../picard/ui/ui_options_folksonomy.py:118
-msgid "Maximum number of tags:"
-msgstr ""
-
-#: ../picard/ui/ui_options_folksonomy.py:119
-#: ../picard/ui/ui_options_folksonomy_tags.py:119
-msgid "Join multiple tags with:"
-msgstr "Spojit více tagu s:"
-
-#: ../picard/ui/ui_options_folksonomy.py:120
-#: ../picard/ui/ui_options_folksonomy_tags.py:120
-msgid " / "
-msgstr " / "
-
-#: ../picard/ui/ui_options_folksonomy.py:121
-#: ../picard/ui/ui_options_folksonomy_tags.py:121
-msgid ", "
-msgstr ", "
-
-#: ../picard/ui/ui_options_folksonomy_tags.py:118
-msgid "Maximal number of tags:"
-msgstr ""
+#: ../picard/ui/tagsfromfilenames.py:52
+#: ../picard/ui/tagsfromfilenames.py:96
+msgid "File Name"
+msgstr "Název souboru"
 
 #: ../picard/ui/mainwindow.py:64
 msgid "MusicBrainz Picard"
@@ -298,7 +1609,8 @@ msgstr "Hledat"
 msgid "&CD Lookup..."
 msgstr "Vyhledání CD"
 
-#: ../picard/ui/mainwindow.py:272 ../picard/ui/mainwindow.py:273
+#: ../picard/ui/mainwindow.py:272
+#: ../picard/ui/mainwindow.py:273
 msgid "Lookup CD"
 msgstr "Vyhledat CD"
 
@@ -329,7 +1641,8 @@ msgstr "Ctrl+U"
 msgid "&Lookup"
 msgstr "Vyh&ledat"
 
-#: ../picard/ui/mainwindow.py:291 ../picard/ui/mainwindow.py:292
+#: ../picard/ui/mainwindow.py:291
+#: ../picard/ui/mainwindow.py:292
 msgid "Lookup metadata"
 msgstr "Vyhledat Metadata"
 
@@ -342,10 +1655,6 @@ msgstr "Ctrl+L"
 msgid "&Details..."
 msgstr "&Detaily..."
 
-#: ../picard/ui/mainwindow.py:302 ../picard/ui/filebrowser.py:38
-msgid "&Refresh"
-msgstr ""
-
 #: ../picard/ui/mainwindow.py:305
 msgid "Generate &Playlist..."
 msgstr "Vygenerovat playlist"
@@ -391,6 +1700,7 @@ msgid "&Tools"
 msgstr "&Nástroje"
 
 #: ../picard/ui/mainwindow.py:384
+#: ../picard/ui/util.py:33
 msgid "&Help"
 msgstr "&Nápověda"
 
@@ -403,13 +1713,10 @@ msgid "&Search Bar"
 msgstr "&Vyhledávácí pole"
 
 #: ../picard/ui/mainwindow.py:435
+#: ../picard/util/tags.py:21
 msgid "Album"
 msgstr "Album"
 
-#: ../picard/ui/mainwindow.py:437 ../picard/ui/puidsubmit.py:31
-msgid "Track"
-msgstr "Skladba"
-
 #: ../picard/ui/mainwindow.py:476
 msgid "All Supported Formats"
 msgstr "Všechny podporované formáty"
@@ -424,37 +1731,290 @@ msgstr "Ukládám playlist %s"
 msgid "Playlist %s saved"
 msgstr "Playlist %s uložen."
 
-#: ../picard/ui/mainwindow.py:638 ../picard/ui/mainwindow.py:647
+#: ../picard/ui/mainwindow.py:638
+#: ../picard/ui/mainwindow.py:647
 #, python-format
 msgid " (Error: %s)"
 msgstr " (Chyba: %s)"
 
+#: ../picard/ui/ui_tageditor.py:115
+#: ../picard/ui/ui_options_plugins.py:59
+#: ../picard/ui/options/plugins.py:76
+msgid "Name"
+msgstr ""
+
+#: ../picard/ui/ui_tageditor.py:116
+msgid "Value"
+msgstr "Hodnota"
+
+#: ../picard/ui/ui_tageditor.py:117
+msgid "&Add..."
+msgstr ""
+
+#: ../picard/ui/ui_tageditor.py:118
+msgid "&Edit..."
+msgstr ""
+
+#: ../picard/ui/ui_tageditor.py:119
+msgid "&Delete"
+msgstr ""
+
+#: ../picard/ui/ui_tageditor.py:120
+msgid "&Metadata"
+msgstr ""
+
+#: ../picard/ui/ui_tageditor.py:121
+msgid "A&rtwork"
+msgstr ""
+
+#: ../picard/ui/ui_tageditor.py:122
+msgid "&Info"
+msgstr ""
+
+#: ../picard/ui/passworddialog.py:38
+#, python-format
+msgid "The server %s requires you to login. Please enter your username and password."
+msgstr ""
+
+#: ../picard/ui/ui_cdlookup.py:60
+#: ../picard/ui/ui_options_cdlookup.py:47
+#: ../picard/ui/ui_options_cdlookup_win32.py:56
+#: ../picard/ui/options/cdlookup.py:35
+msgid "CD Lookup"
+msgstr "Vyhledání CD"
+
+#: ../picard/ui/ui_cdlookup.py:61
+msgid "The following releases on MusicBrainz match the CD:"
+msgstr "Vydání obsažená v MusicBrainz a shodná s tímto CD:"
+
+#: ../picard/ui/ui_cdlookup.py:62
+#: ../picard/ui/ui_puidsubmit.py:53
+msgid "OK"
+msgstr "OK"
+
+#: ../picard/ui/ui_cdlookup.py:63
+msgid "    Lookup manually    "
+msgstr "    Vyhledat Ručně    "
+
+#: ../picard/ui/ui_cdlookup.py:64
+#: ../picard/ui/ui_puidsubmit.py:54
+msgid "Cancel"
+msgstr "Zrušit"
+
+#: ../picard/ui/ui_passworddialog.py:78
+msgid "Authentication required"
+msgstr ""
+
+#: ../picard/ui/ui_passworddialog.py:79
+#: ../picard/ui/ui_options_general.py:113
+#: ../picard/ui/ui_options_proxy.py:83
+msgid "Username:"
+msgstr "Uživatelské jméno:"
+
+#: ../picard/ui/ui_passworddialog.py:80
+#: ../picard/ui/ui_options_general.py:112
+#: ../picard/ui/ui_options_proxy.py:82
+msgid "Password:"
+msgstr "Heslo:"
+
+#: ../picard/ui/ui_passworddialog.py:81
+msgid "Save username and password"
+msgstr ""
+
 #: ../picard/ui/ui_edittagdialog.py:44
 msgid "Edit Tag"
 msgstr "Upravit tag"
 
-#: ../picard/ui/ui_options_proxy.py:81
-msgid "Web Proxy"
-msgstr "Proxy"
+#: ../picard/ui/ui_metadata.py:121
+msgid "Lookup"
+msgstr "Vyhledat"
 
-#: ../picard/ui/ui_options_proxy.py:84 ../picard/ui/ui_options_general.py:109
-msgid "Port:"
-msgstr "Port:"
+#: ../picard/ui/ui_metadata.py:122
+msgid "Title:"
+msgstr "Název:"
 
-#: ../picard/ui/ui_options_proxy.py:85 ../picard/ui/ui_options_general.py:110
-msgid "Server address:"
-msgstr "Adresa serveru:"
+#: ../picard/ui/ui_metadata.py:123
+msgid "Date:"
+msgstr "Datum:"
 
-#: ../picard/ui/ui_tagsfromfilenames.py:56
-msgid "Convert File Names to Tags"
-msgstr "Převédst názvy souborů do tagů"
+#: ../picard/ui/ui_metadata.py:124
+msgid "Artist:"
+msgstr "Umělec:"
 
-#: ../picard/ui/ui_tagsfromfilenames.py:57
-msgid "Replace underscores with spaces"
+#: ../picard/ui/ui_metadata.py:125
+msgid "Track:"
+msgstr "Skladba"
+
+#: ../picard/ui/ui_metadata.py:126
+msgid "0000-00-00; "
+msgstr "0000-00-00; "
+
+#: ../picard/ui/ui_metadata.py:128
+msgid "Album:"
+msgstr "Album:"
+
+#: ../picard/ui/ui_options.py:42
+msgid "Options"
+msgstr "Nastavení:"
+
+#: ../picard/ui/ui_options_cdlookup.py:48
+msgid "CD-ROM device to use for lookups:"
+msgstr "CD/DVD zařízení pro identifikaci"
+
+#: ../picard/ui/ui_options_cdlookup_win32.py:57
+msgid "Default CD-ROM drive to use for lookups:"
+msgstr "Výchozí CD/DVD mechanika"
+
+#: ../picard/ui/ui_options_cover.py:56
+msgid "Location"
+msgstr "Umístění"
+
+#: ../picard/ui/ui_options_cover.py:57
+msgid "Embed cover images into tags"
+msgstr "Vkládat obrázky alb dotagů"
+
+#: ../picard/ui/ui_options_cover.py:58
+msgid "Save cover images as separate files"
+msgstr "Uložit obrázky alb jako samostatné soubory"
+
+#: ../picard/ui/ui_options_cover.py:59
+msgid "Overwrite the file if it already exists"
+msgstr "Přepsat soubor, pokud existuje"
+
+#: ../picard/ui/util.py:31
+msgid "&Ok"
+msgstr "&Ok"
+
+#: ../picard/ui/util.py:32
+#, fuzzy
+msgid "&Cancel"
+msgstr "Zrušit"
+
+#: ../picard/ui/ui_puidsubmit.py:52
+msgid "Submit PUIDs"
+msgstr "Odeslat PUIDs"
+
+#: ../picard/ui/ui_options_folksonomy.py:114
+#: ../picard/ui/options/folksonomy.py:29
+msgid "Folksonomy Tags"
 msgstr ""
 
-#: ../picard/ui/ui_tagsfromfilenames.py:58
+#: ../picard/ui/ui_options_folksonomy.py:115
+msgid "Ignore tags:"
+msgstr "Ignorovat tagy:"
+
+#: ../picard/ui/ui_options_folksonomy.py:116
+msgid "Minimal tag usage:"
+msgstr ""
+
+#: ../picard/ui/ui_options_folksonomy.py:117
+#: ../picard/ui/ui_options_matching.py:107
+#: ../picard/ui/ui_options_matching.py:108
+#: ../picard/ui/ui_options_matching.py:109
+#: ../picard/ui/ui_options_matching.py:113
+msgid " %"
+msgstr " %"
+
+#: ../picard/ui/ui_options_folksonomy.py:118
+msgid "Maximum number of tags:"
+msgstr ""
+
+#: ../picard/ui/ui_options_folksonomy.py:119
+msgid "Join multiple tags with:"
+msgstr "Spojit více tagu s:"
+
+#: ../picard/ui/ui_options_folksonomy.py:120
+msgid " / "
+msgstr " / "
+
+#: ../picard/ui/ui_options_folksonomy.py:121
+msgid ", "
+msgstr ", "
+
+#: ../picard/ui/ui_options_interface.py:50
+msgid "Miscellaneous"
+msgstr "Různé"
+
+#: ../picard/ui/ui_options_interface.py:51
+msgid "Show text labels under icons"
+msgstr "Ukazovat popisky pod ikonami"
+
+#: ../picard/ui/ui_options_interface.py:52
+msgid "Allow selection of multiple directories"
+msgstr ""
+
+#: ../picard/ui/ui_options_interface.py:53
+msgid "Use advanced query syntax"
+msgstr ""
+
+#: ../picard/ui/ui_options_interface.py:54
+#, fuzzy
+msgid "User interface language:"
+msgstr "Uživatelské jméno:"
+
+#: ../picard/ui/ui_options_naming.py:165
+msgid "Rename Files"
+msgstr "Přejmenovat soubory"
+
+#: ../picard/ui/ui_options_naming.py:166
+msgid "Replace Windows-incompatible characters"
+msgstr "Nahradit nekompatibilní znaky ve Windows"
+
+#: ../picard/ui/ui_options_naming.py:167
+msgid "Replace non-ASCII characters"
+msgstr "Nahradit neASCII znaky"
+
+#: ../picard/ui/ui_options_naming.py:168
+#: ../picard/ui/ui_options_naming.py:169
+#: ../picard/ui/ui_options_metadata.py:109
+#: ../picard/ui/ui_options_metadata.py:110
+msgid "Default"
+msgstr "Výchozí"
+
+#: ../picard/ui/ui_options_naming.py:170
+#: ../picard/ui/options/naming.py:90
+msgid "Multiple artist file naming format:"
+msgstr ""
+
+#: ../picard/ui/ui_options_naming.py:171
+#: ../picard/ui/options/naming.py:86
+msgid "File naming format:"
+msgstr "Schéma pojmenování souborů"
+
+#: ../picard/ui/ui_options_naming.py:172
+msgid "Move Files"
+msgstr ""
+
+#: ../picard/ui/ui_options_naming.py:173
+msgid "Move tagged files to this directory:"
+msgstr ""
+
+#: ../picard/ui/ui_options_naming.py:174
+msgid "Browse..."
+msgstr ""
+
+#: ../picard/ui/ui_options_naming.py:175
+msgid "Move additional files:"
+msgstr ""
+
+#: ../picard/ui/ui_options_naming.py:176
+msgid "Delete empty directories"
+msgstr ""
+
+#: ../picard/ui/ui_options_naming.py:177
+msgid "Example"
+msgstr "Příklad"
+
+#: ../picard/ui/ui_options_naming.py:178
+msgid "File name:"
+msgstr ""
+
+#: ../picard/ui/ui_options_naming.py:179
+msgid "Multiple artist file name:"
+msgstr "Název souboru pro více umělců"
+
 #: ../picard/ui/ui_options_naming.py:180
+#: ../picard/ui/ui_tagsfromfilenames.py:58
 msgid "&Preview"
 msgstr "Ná&hled"
 
@@ -462,11 +2022,22 @@ msgstr "Ná&hled"
 msgid "MusicBrainz Server"
 msgstr "MusicBrainz Server"
 
+#: ../picard/ui/ui_options_general.py:109
+#: ../picard/ui/ui_options_proxy.py:84
+msgid "Port:"
+msgstr "Port:"
+
+#: ../picard/ui/ui_options_general.py:110
+#: ../picard/ui/ui_options_proxy.py:85
+msgid "Server address:"
+msgstr "Adresa serveru:"
+
 #: ../picard/ui/ui_options_general.py:111
 msgid "Account Information"
 msgstr "Informace o účtu"
 
 #: ../picard/ui/ui_options_general.py:114
+#: ../picard/ui/options/general.py:29
 msgid "General"
 msgstr "Obecné"
 
@@ -474,34 +2045,6 @@ msgstr "Obecné"
 msgid "Automatically scan all new files"
 msgstr "Automaticky skenovat nové soubory"
 
-#: ../picard/ui/ui_options_interface.py:46
-msgid "Miscellaneous"
-msgstr "Různé"
-
-#: ../picard/ui/ui_options_interface.py:47
-msgid "Show text labels under icons"
-msgstr "Ukazovat popisky pod ikonami"
-
-#: ../picard/ui/ui_options_interface.py:48
-msgid "Allow selection of multiple directories"
-msgstr ""
-
-#: ../picard/ui/ui_options_interface.py:49
-msgid "Use advanced query syntax"
-msgstr ""
-
-#: ../picard/ui/itemviews.py:327
-msgid "&Releases"
-msgstr "&Vydání"
-
-#: ../picard/ui/itemviews.py:353
-msgid "&Plugins"
-msgstr "&Pluginy"
-
-#: ../picard/ui/itemviews.py:523
-msgid "Clusters"
-msgstr "Klastry"
-
 #: ../picard/ui/ui_options_matching.py:105
 msgid "Thresholds"
 msgstr "Úrovně"
@@ -522,6 +2065,68 @@ msgstr "Minimální podobnost pro vyhledávní v klastrech"
 msgid "Minimal similarity for PUID lookups:"
 msgstr "Minimální podobnost pro vyhledávní v PUID"
 
+#: ../picard/ui/ui_options_metadata.py:100
+#: ../picard/ui/options/metadata.py:31
+msgid "Metadata"
+msgstr "Metadata"
+
+#: ../picard/ui/ui_options_metadata.py:101
+msgid "Translate foreign artist names to English where possible"
+msgstr "Překládat názvy udmělců do anglických jmen, pokud je to možné"
+
+#: ../picard/ui/ui_options_metadata.py:102
+msgid "Use release relationships"
+msgstr ""
+
+#: ../picard/ui/ui_options_metadata.py:103
+msgid "Use track relationships"
+msgstr "Používat vztahy mezi skladbami"
+
+#: ../picard/ui/ui_options_metadata.py:104
+msgid "Use folksonomy tags as genre"
+msgstr "Používat sousedské tagy jako žánr"
+
+#: ../picard/ui/ui_options_metadata.py:105
+#, fuzzy
+msgid "Preferred release country:"
+msgstr "ID vydání"
+
+#: ../picard/ui/ui_options_metadata.py:106
+msgid "Custom Fields"
+msgstr "Vlastní pole"
+
+#: ../picard/ui/ui_options_metadata.py:107
+msgid "Various artists:"
+msgstr "Various artists:"
+
+#: ../picard/ui/ui_options_metadata.py:108
+msgid "Non-album tracks:"
+msgstr "Skladby neobažené v albech"
+
+#: ../picard/ui/ui_options_plugins.py:58
+#: ../picard/ui/options/plugins.py:30
+msgid "Plugins"
+msgstr "Zásuvné moduly"
+
+#: ../picard/ui/ui_options_plugins.py:60
+#: ../picard/ui/options/plugins.py:79
+msgid "Author"
+msgstr "Autor"
+
+#: ../picard/ui/ui_options_plugins.py:61
+#: ../picard/util/tags.py:36
+msgid "Version"
+msgstr "Verze"
+
+#: ../picard/ui/ui_options_proxy.py:81
+#: ../picard/ui/options/proxy.py:28
+msgid "Web Proxy"
+msgstr "Proxy"
+
+#: ../picard/ui/ui_options_script.py:52
+msgid "Tagger Script"
+msgstr "Skripty pro tagger"
+
 #: ../picard/ui/ui_options_tags.py:105
 msgid "Common"
 msgstr "Obecné"
@@ -574,314 +2179,17 @@ msgstr "APE"
 msgid "Remove APEv2 tags from MP3 files"
 msgstr "Odebrat APEv2 tagy z MP3 souborů"
 
-#: ../picard/ui/ui_options_cdlookup_win32.py:56 ../picard/ui/ui_cdlookup.py:60
-#: ../picard/ui/ui_options_cdlookup.py:47
-msgid "CD Lookup"
-msgstr "Vyhledání CD"
+#: ../picard/ui/ui_tagsfromfilenames.py:56
+msgid "Convert File Names to Tags"
+msgstr "Převédst názvy souborů do tagů"
 
-#: ../picard/ui/ui_options_cdlookup_win32.py:57
-msgid "Default CD-ROM drive to use for lookups:"
-msgstr "Výchozí CD/DVD mechanika"
-
-#: ../picard/ui/tageditor.py:65 ../picard/ui/ui_options_plugins.py:62
-#: ../picard/ui/multitageditor.py:37
-msgid "Details"
-msgstr "Podrobnosti"
-
-#: ../picard/ui/tageditor.py:70 ../picard/ui/tageditor.py:241
-#: ../picard/ui/multitageditor.py:42 ../picard/ui/multitageditor.py:197
-#, python-format
-msgid "%d file"
-msgid_plural "%d files"
-msgstr[0] "%d soubor"
-msgstr[1] "%d soubory"
-msgstr[2] "%d soubory"
-
-#: ../picard/ui/tageditor.py:124 ../picard/ui/multitageditor.py:95
-#, python-format
-msgid "(different across %d file)"
-msgid_plural "(different across %d files)"
-msgstr[0] "(rozdílný soubor skrze %d)"
-msgstr[1] "(rozdílné soubory skrze %d)"
-msgstr[2] "(rozdílné soubory skrze %d)"
-
-#: ../picard/ui/tageditor.py:127 ../picard/ui/multitageditor.py:98
-#, python-format
-msgid "(missing from %d file)"
-msgid_plural "(missing from %d files)"
-msgstr[0] "(chybí z %d souboru)"
-msgstr[1] "(chybí z %d souborů)"
-msgstr[2] "(chybí z %d souborů)"
-
-#: ../picard/ui/tageditor.py:210 ../picard/ui/multitageditor.py:166
-msgid "Filename:"
-msgstr "Název souboru:"
-
-#: ../picard/ui/tageditor.py:212 ../picard/ui/multitageditor.py:168
-msgid "Format:"
-msgstr "Formát:"
-
-#: ../picard/ui/tageditor.py:221 ../picard/ui/multitageditor.py:177
-msgid "Size:"
-msgstr "Velikost:"
-
-#: ../picard/ui/tageditor.py:227 ../picard/ui/multitageditor.py:183
-msgid "Bitrate:"
-msgstr "Bitový tok:"
-
-#: ../picard/ui/tageditor.py:229 ../picard/ui/multitageditor.py:185
-msgid "Sample rate:"
-msgstr "Vzorkovací frekvence:"
-
-#: ../picard/ui/tageditor.py:231 ../picard/ui/multitageditor.py:187
-msgid "Bits per sample:"
-msgstr "Bitů na vzorek"
-
-#: ../picard/ui/tageditor.py:234 ../picard/ui/multitageditor.py:190
-msgid "Mono"
-msgstr "Mono"
-
-#: ../picard/ui/tageditor.py:235 ../picard/ui/multitageditor.py:191
-msgid "Stereo"
-msgstr "Stereo"
-
-#: ../picard/ui/tageditor.py:237 ../picard/ui/multitageditor.py:193
-msgid "Channels:"
-msgstr "Kanály:"
-
-#: ../picard/ui/ui_tageditor.py:115 ../picard/ui/ui_multitageditor.py:55
-#: ../picard/ui/ui_options_plugins.py:59 ../picard/ui/options/plugins.py:76
-msgid "Name"
+#: ../picard/ui/ui_tagsfromfilenames.py:57
+msgid "Replace underscores with spaces"
 msgstr ""
 
-#: ../picard/ui/ui_tageditor.py:116 ../picard/ui/ui_multitageditor.py:56
-msgid "Value"
-msgstr "Hodnota"
-
-#: ../picard/ui/ui_tageditor.py:117 ../picard/ui/ui_multitageditor.py:57
-msgid "&Add..."
-msgstr ""
-
-#: ../picard/ui/ui_tageditor.py:118
-msgid "&Edit..."
-msgstr ""
-
-#: ../picard/ui/ui_tageditor.py:119
-msgid "&Delete"
-msgstr ""
-
-#: ../picard/ui/ui_tageditor.py:120
-msgid "&Metadata"
-msgstr ""
-
-#: ../picard/ui/ui_tageditor.py:121
-msgid "A&rtwork"
-msgstr ""
-
-#: ../picard/ui/ui_tageditor.py:122
-msgid "&Info"
-msgstr ""
-
-#: ../picard/ui/coverartbox.py:47
-msgid "Cover Art"
-msgstr "Obrázek alba"
-
-#: ../picard/ui/coverartbox.py:95
-msgid "Buy the album on Amazon"
-msgstr "Koupit album na Amazonu"
-
-#: ../picard/ui/ui_puidsubmit.py:52
-msgid "Submit PUIDs"
-msgstr "Odeslat PUIDs"
-
-#: ../picard/ui/ui_puidsubmit.py:53 ../picard/ui/ui_cdlookup.py:62
-msgid "OK"
-msgstr "OK"
-
-#: ../picard/ui/ui_puidsubmit.py:54 ../picard/ui/ui_cdlookup.py:64
-msgid "Cancel"
-msgstr "Zrušit"
-
-#: ../picard/ui/puidsubmit.py:31 ../picard/ui/options/plugins.py:80
-msgid "File"
-msgstr "Soubor"
-
-#: ../picard/ui/puidsubmit.py:31
-msgid "PUID"
-msgstr "PUID"
-
-#: ../picard/ui/puidsubmit.py:31
-msgid "Release"
-msgstr "Vydání"
-
-#: ../picard/ui/puidsubmit.py:31
-msgid "Release ID"
-msgstr "ID vydání"
-
-#: ../picard/ui/filebrowser.py:41
-#, fuzzy
-msgid "&Move Tagged Files Here"
-msgstr "Přesunout otagované soubory"
-
-#: ../picard/ui/filebrowser.py:44
-msgid "Show &Hidden Files"
-msgstr ""
-
-#: ../picard/ui/ui_cdlookup.py:61
-msgid "The following releases on MusicBrainz match the CD:"
-msgstr "Vydání obsažená v MusicBrainz a shodná s tímto CD:"
-
-#: ../picard/ui/ui_cdlookup.py:63
-msgid "    Lookup manually    "
-msgstr "    Vyhledat Ručně    "
-
-#: ../picard/ui/ui_options.py:42
-msgid "Options"
-msgstr "Nastavení:"
-
-#: ../picard/ui/tagsfromfilenames.py:52 ../picard/ui/tagsfromfilenames.py:96
-msgid "File Name"
-msgstr "Název souboru"
-
-#: ../picard/ui/ui_options_cover.py:56
-msgid "Location"
-msgstr "Umístění"
-
-#: ../picard/ui/ui_options_cover.py:57
-msgid "Embed cover images into tags"
-msgstr "Vkládat obrázky alb dotagů"
-
-#: ../picard/ui/ui_options_cover.py:58
-msgid "Save cover images as separate files"
-msgstr "Uložit obrázky alb jako samostatné soubory"
-
-#: ../picard/ui/ui_options_cover.py:59
-msgid "Overwrite the file if it already exists"
-msgstr "Přepsat soubor, pokud existuje"
-
-#: ../picard/ui/ui_options_metadata.py:100
-msgid "Metadata"
-msgstr "Metadata"
-
-#: ../picard/ui/ui_options_metadata.py:101
-msgid "Translate foreign artist names to English where possible"
-msgstr "Překládat názvy udmělců do anglických jmen, pokud je to možné"
-
-#: ../picard/ui/ui_options_metadata.py:102
-msgid "Use release relationships"
-msgstr ""
-
-#: ../picard/ui/ui_options_metadata.py:103
-msgid "Use track relationships"
-msgstr "Používat vztahy mezi skladbami"
-
-#: ../picard/ui/ui_options_metadata.py:104
-msgid "Use folksonomy tags as genre"
-msgstr "Používat sousedské tagy jako žánr"
-
-#: ../picard/ui/ui_options_metadata.py:105
-msgid "Preferred release country:"
-msgstr ""
-
-#: ../picard/ui/ui_options_metadata.py:106
-msgid "Custom Fields"
-msgstr "Vlastní pole"
-
-#: ../picard/ui/ui_options_metadata.py:107
-msgid "Various artists:"
-msgstr "Various artists:"
-
-#: ../picard/ui/ui_options_metadata.py:108
-msgid "Non-album tracks:"
-msgstr "Skladby neobažené v albech"
-
-#: ../picard/ui/ui_options_metadata.py:109
-#: ../picard/ui/ui_options_metadata.py:110
-#: ../picard/ui/ui_options_naming.py:168 ../picard/ui/ui_options_naming.py:169
-msgid "Default"
-msgstr "Výchozí"
-
-#: ../picard/ui/ui_multitageditor.py:58
-msgid "Delete"
-msgstr ""
-
-#: ../picard/ui/logview.py:29
-msgid "Log"
-msgstr "Log"
-
-#: ../picard/ui/ui_options_plugins.py:58
-msgid "Plugins"
-msgstr "Zásuvné moduly"
-
-#: ../picard/ui/ui_options_plugins.py:60 ../picard/ui/options/plugins.py:79
-msgid "Author"
-msgstr "Autor"
-
-#: ../picard/ui/ui_options_plugins.py:61
-msgid "Version"
-msgstr "Verze"
-
-#: ../picard/ui/ui_options_naming.py:165
-msgid "Rename Files"
-msgstr "Přejmenovat soubory"
-
-#: ../picard/ui/ui_options_naming.py:166
-msgid "Replace Windows-incompatible characters"
-msgstr "Nahradit nekompatibilní znaky ve Windows"
-
-#: ../picard/ui/ui_options_naming.py:167
-msgid "Replace non-ASCII characters"
-msgstr "Nahradit neASCII znaky"
-
-#: ../picard/ui/ui_options_naming.py:170 ../picard/ui/options/naming.py:90
-msgid "Multiple artist file naming format:"
-msgstr ""
-
-#: ../picard/ui/ui_options_naming.py:171 ../picard/ui/options/naming.py:86
-msgid "File naming format:"
-msgstr "Schéma pojmenování souborů"
-
-#: ../picard/ui/ui_options_naming.py:172
-msgid "Move Files"
-msgstr ""
-
-#: ../picard/ui/ui_options_naming.py:173
-msgid "Move tagged files to this directory:"
-msgstr ""
-
-#: ../picard/ui/ui_options_naming.py:174
-msgid "Browse..."
-msgstr ""
-
-#: ../picard/ui/ui_options_naming.py:175
-msgid "Move additional files:"
-msgstr ""
-
-#: ../picard/ui/ui_options_naming.py:176
-msgid "Delete empty directories"
-msgstr ""
-
-#: ../picard/ui/ui_options_naming.py:177
-msgid "Example"
-msgstr "Příklad"
-
-#: ../picard/ui/ui_options_naming.py:178
-msgid "File name:"
-msgstr ""
-
-#: ../picard/ui/ui_options_naming.py:179
-msgid "Multiple artist file name:"
-msgstr "Název souboru pro více umělců"
-
-#: ../picard/ui/ui_options_cdlookup.py:48
-msgid "CD-ROM device to use for lookups:"
-msgstr "CD/DVD zařízení pro identifikaci"
-
-#: ../picard/ui/options/scripting.py:84 ../picard/ui/options/naming.py:86
-#: ../picard/ui/options/naming.py:90 ../picard/ui/options/naming.py:93
-#: ../picard/ui/options/naming.py:95
-msgid "Script Error"
-msgstr ""
+#: ../picard/ui/options/about.py:29
+msgid "About"
+msgstr "O programu"
 
 #. Replace this with your name to have it appear in the "About" dialog.
 #: ../picard/ui/options/about.py:48
@@ -889,18 +2197,6 @@ msgid "translator-credits"
 msgstr ""
 "Launchpad Contributions:\n"
 "  Lukáš Lalinský <https://launchpad.net/~luks>\n"
-"\n"
-"Launchpad Contributions:\n"
-"  Lukáš Lalinský https://launchpad.net/~luks\n"
-"\n"
-"Launchpad Contributions:\n"
-"  Lukáš Lalinský https://launchpad.net/~luks\n"
-"\n"
-"Launchpad Contributions:\n"
-"  Lukáš Lalinský https://launchpad.net/~luks\n"
-"\n"
-"Launchpad Contributions:\n"
-"  Lukáš Lalinský https://launchpad.net/~luks\n"
 "  fatbozz https://launchpad.net/~fatbozz"
 
 #. Replace LANG with language you are translatig to.
@@ -912,22 +2208,57 @@ msgstr "<br/>Přeložen do do Češtiny od %s"
 #: ../picard/ui/options/about.py:55
 #, python-format
 msgid ""
-"<p align=\"center\"><span style=\"font-size:15px;font-weight:bold;"
-"\">MusicBrainz Picard</span><br/>\n"
+"<p align=\"center\"><span style=\"font-size:15px;font-weight:bold;\">MusicBrainz Picard</span><br/>\n"
 "Version %(version)s</p>\n"
 "<p align=\"center\"><strong>Supported formats</strong><br/>%(formats)s</p>\n"
 "<p align=\"center\"><strong>Please donate</strong><br/>\n"
-"Thank you for using Picard. Picard relies on the MusicBrainz database, which "
-"is operated by the MetaBrainz Foundation with the help of thousands of "
-"volunteers. If you like this application please consider donating to the "
-"MetaBrainz Foundation to keep the service running.</p>\n"
-"<p align=\"center\"><a href=\"http://metabrainz.org/donate/index.html"
-"\">Donate now!</a></p>\n"
+"Thank you for using Picard. Picard relies on the MusicBrainz database, which is operated by the MetaBrainz Foundation with the help of thousands of volunteers. If you like this application please consider donating to the MetaBrainz Foundation to keep the service running.</p>\n"
+"<p align=\"center\"><a href=\"http://metabrainz.org/donate/index.html\">Donate now!</a></p>\n"
 "<p align=\"center\"><strong>Credits</strong><br/>\n"
-"<small>Copyright © 2004-2008 Robert Kaye, Lukáš Lalinský and others%"
-"(translator-credits)s</small></p>\n"
-"<p align=\"center\"><a href=\"http://musicbrainz.org/doc/PicardTagger"
-"\">http://musicbrainz.org/doc/PicardTagger</a></p>\n"
+"<small>Copyright © 2004-2008 Robert Kaye, Lukáš Lalinský and others%(translator-credits)s</small></p>\n"
+"<p align=\"center\"><a href=\"http://musicbrainz.org/doc/PicardTagger\">http://musicbrainz.org/doc/PicardTagger</a></p>\n"
+msgstr ""
+
+#: ../picard/ui/options/advanced.py:26
+msgid "Advanced"
+msgstr "Pokročilé"
+
+#: ../picard/ui/options/interface.py:31
+#, fuzzy
+msgid "User Interface"
+msgstr "Uživatelské jméno:"
+
+#: ../picard/ui/options/interface.py:47
+msgid "System default"
+msgstr "Výchozí jazyk systému"
+
+#: ../picard/ui/options/interface.py:71
+#, fuzzy
+msgid "Language changed"
+msgstr "Jazyk"
+
+#: ../picard/ui/options/interface.py:71
+msgid "You have changed the interface language. You have to restart Picard in order for the change to take effect."
+msgstr ""
+
+#: ../picard/ui/options/matching.py:29
+msgid "Matching"
+msgstr "Porovnávání"
+
+#: ../picard/ui/options/metadata.py:52
+msgid "None"
+msgstr ""
+
+#: ../picard/ui/options/naming.py:33
+msgid "File Naming"
+msgstr "Pojmenování souborů"
+
+#: ../picard/ui/options/naming.py:86
+#: ../picard/ui/options/naming.py:90
+#: ../picard/ui/options/naming.py:93
+#: ../picard/ui/options/naming.py:95
+#: ../picard/ui/options/scripting.py:84
+msgid "Script Error"
 msgstr ""
 
 #: ../picard/ui/options/naming.py:93
@@ -946,6 +2277,253 @@ msgstr ""
 msgid "The location to move files to must not be empty."
 msgstr ""
 
+#: ../picard/ui/options/scripting.py:63
+msgid "Scripting"
+msgstr "Skriptování"
+
+#: ../picard/ui/options/tags.py:29
+msgid "Tags"
+msgstr "Tagy"
+
+#: ../picard/util/tags.py:24
+#, fuzzy
+msgid "Date"
+msgstr "Datum:"
+
+#: ../picard/util/tags.py:25
+#, fuzzy
+msgid "Album Artist"
+msgstr "Seřazování podle umělce alba"
+
+#: ../picard/util/tags.py:26
+#, fuzzy
+msgid "Track Number"
+msgstr "Číslo skladby"
+
+#: ../picard/util/tags.py:27
+#, fuzzy
+msgid "Total Tracks"
+msgstr "Počet disků"
+
+#: ../picard/util/tags.py:28
+#, fuzzy
+msgid "Disc Number"
+msgstr "Číslo skladby"
+
+#: ../picard/util/tags.py:29
+msgid "Total Discs"
+msgstr "Počet disků"
+
+#: ../picard/util/tags.py:30
+msgid "Album Artist Sort Order"
+msgstr "Seřazování podle umělce alba"
+
+#: ../picard/util/tags.py:31
+msgid "Artist Sort Order"
+msgstr "Seřazování podle Umělce"
+
+#: ../picard/util/tags.py:32
+msgid "Title Sort Order"
+msgstr "Seřazování podle názvu skladby"
+
+#: ../picard/util/tags.py:33
+msgid "Album Sort Order"
+msgstr "Seřazování podle Alba"
+
+#: ../picard/util/tags.py:34
+msgid "ASIN"
+msgstr "ASIN"
+
+#: ../picard/util/tags.py:35
+msgid "Grouping"
+msgstr "Seskupování"
+
+#: ../picard/util/tags.py:37
+msgid "ISRC"
+msgstr "ISRC"
+
+#: ../picard/util/tags.py:38
+msgid "Mood"
+msgstr "Nálada"
+
+#: ../picard/util/tags.py:39
+msgid "BPM"
+msgstr "BPM"
+
+#: ../picard/util/tags.py:40
+#, fuzzy
+msgid "Copyright"
+msgstr "Kopírovat"
+
+#: ../picard/util/tags.py:41
+#, fuzzy
+msgid "Composer"
+msgstr "Zavřít"
+
+#: ../picard/util/tags.py:42
+msgid "Conductor"
+msgstr "Dirigent"
+
+#: ../picard/util/tags.py:43
+msgid "Lyricist"
+msgstr "Textař"
+
+#: ../picard/util/tags.py:44
+msgid "Arranger"
+msgstr "Aranžér"
+
+#: ../picard/util/tags.py:45
+msgid "Producer"
+msgstr "Producent"
+
+#: ../picard/util/tags.py:46
+msgid "Engineer"
+msgstr "Zvukový inženýr"
+
+#: ../picard/util/tags.py:47
+msgid "Subtitle"
+msgstr "Podtitul"
+
+#: ../picard/util/tags.py:48
+#, fuzzy
+msgid "Disc Subtitle"
+msgstr "Podtitul"
+
+#: ../picard/util/tags.py:49
+msgid "Remixer"
+msgstr "Remixér"
+
+#: ../picard/util/tags.py:50
+#, fuzzy
+msgid "MusicBrainz Track Id"
+msgstr "MusicBrainz Picard"
+
+#: ../picard/util/tags.py:51
+#, fuzzy
+msgid "MusicBrainz Release Id"
+msgstr "MusicBrainz Picard"
+
+#: ../picard/util/tags.py:52
+#, fuzzy
+msgid "MusicBrainz Artist Id"
+msgstr "MusicBrainz Picard"
+
+#: ../picard/util/tags.py:53
+#, fuzzy
+msgid "MusicBrainz Release Artist Id"
+msgstr "MusicBrainz Picard"
+
+#: ../picard/util/tags.py:54
+#, fuzzy
+msgid "MusicBrainz TRM Id"
+msgstr "MusicBrainz Picard"
+
+#: ../picard/util/tags.py:55
+#, fuzzy
+msgid "MusicBrainz Disc Id"
+msgstr "MusicBrainz Picard"
+
+#: ../picard/util/tags.py:56
+#, fuzzy
+msgid "MusicBrainz Sort Name"
+msgstr "MusicBrainz Server"
+
+#: ../picard/util/tags.py:57
+msgid "MusicIP PUID"
+msgstr "MusicIP PUID"
+
+#: ../picard/util/tags.py:58
+msgid "MusicIP Fingerprint"
+msgstr "Otisk MusicIP"
+
+#: ../picard/util/tags.py:59
+msgid "Disc Id"
+msgstr ""
+
+#: ../picard/util/tags.py:60
+msgid "Website"
+msgstr "Webová stránka"
+
+#: ../picard/util/tags.py:61
+msgid "Compilation"
+msgstr "Kompilace"
+
+#: ../picard/util/tags.py:62
+msgid "Comment"
+msgstr "Komentář"
+
+#: ../picard/util/tags.py:63
+#, fuzzy
+msgid "Genre"
+msgstr "Obecné"
+
+#: ../picard/util/tags.py:64
+msgid "Encoded By"
+msgstr "Enkódováno"
+
+#: ../picard/util/tags.py:65
+msgid "Performer"
+msgstr "Interpret"
+
+#: ../picard/util/tags.py:66
+#, fuzzy
+msgid "Release Type"
+msgstr "Vydání"
+
+#: ../picard/util/tags.py:67
+#, fuzzy
+msgid "Release Status"
+msgstr "&Vydání"
+
+#: ../picard/util/tags.py:68
+#, fuzzy
+msgid "Release Country"
+msgstr "ID vydání"
+
+#: ../picard/util/tags.py:69
+msgid "Record Label"
+msgstr "Nahrávací společnost"
+
+#: ../picard/util/tags.py:70
+msgid "Barcode"
+msgstr "Čárový kód"
+
+#: ../picard/util/tags.py:71
+#, fuzzy
+msgid "Catalog Number"
+msgstr "Číslo skladby"
+
+#: ../picard/util/tags.py:72
+#, fuzzy
+msgid "Format"
+msgstr "Formát:"
+
+#: ../picard/util/tags.py:73
+msgid "DJ-Mixer"
+msgstr "Mixoval DJ"
+
+#: ../picard/util/tags.py:74
+#, fuzzy
+msgid "Media"
+msgstr "Metadata"
+
+#: ../picard/util/tags.py:75
+msgid "Lyrics"
+msgstr "Text písně"
+
+#: ../picard/util/tags.py:76
+msgid "Mixer"
+msgstr "Mixér"
+
+#: ../picard/util/tags.py:77
+msgid "Language"
+msgstr "Jazyk"
+
+#: ../picard/util/tags.py:78
+#, fuzzy
+msgid "Script"
+msgstr "Skriptování"
+
 #: ../picard/util/webbrowser2.py:84
 msgid "Web Browser Error"
 msgstr ""
@@ -958,224 +2536,62 @@ msgid ""
 "%s"
 msgstr ""
 
-#~ msgid "No matching tracks for file %s"
-#~ msgstr "Žádné odpovídající výsledky pro soubor %s"
-
-#~ msgid "File %s identified!"
-#~ msgstr "Soubor %s identifikován!"
-
-#~ msgid "Looking up the PUID for file %s..."
-#~ msgstr "Vyhledávám PUID pro soubor %s"
-
-#~ msgid "Looking up the metadata for file %s..."
-#~ msgstr "Vyhledávám metadata pro soubor %s"
-
-#~ msgid "No matching releases for cluster %s"
-#~ msgstr "Žádné odpovídající album pro klastr %s"
-
-#~ msgid "Cluster %s identified!"
-#~ msgstr "Klastr %s identifikován!"
-
-#~ msgid "Looking up the metadata for cluster %s..."
-#~ msgstr "Vyhledávám metadata pro klastr %s"
-
-#~ msgid "M3U Playlist (*.m3u)"
-#~ msgstr "M3U Playlist (*.m3u)"
-
-#~ msgid "PLS Playlist (*.pls)"
-#~ msgstr "PLS Playlist (*.pls)"
-
-#~ msgid "XSPF Playlist (*.xspf)"
-#~ msgstr "XSPF Playlist (*.xspf)"
-
-#~ msgid "Submitting PUIDs..."
-#~ msgstr "Posílám PUIDs"
-
-#~ msgid "PUIDs submission failed: %s"
-#~ msgstr "Odeslání PUID %s selhalo"
-
-#~ msgid "PUIDs successfully submitted!"
-#~ msgstr "PUIDs úspěšně nahrány"
-
 #~ msgid "New Version"
 #~ msgstr "Nová verze"
-
 #~ msgid ""
 #~ "New version of Picard is available (%s). Would you like to download it "
 #~ "now?"
 #~ msgstr "Nová verze Picardu (%s) je dostupná. Přejete si ji stáhnout ?"
 
-#~ msgid "Couldn't find PUID for file %s"
-#~ msgstr "Nemohu najít PUID pro soubor %s"
-
-#~ msgid "Looking up the fingerprint for file %s..."
-#~ msgstr "Hledám otisky pro soubor %s"
-
-#~ msgid "Creating fingerprint for file %s..."
-#~ msgstr "Vytvářím otisky pro soubor %s"
-
-#~ msgid "Length"
-#~ msgstr "Délka"
-
-#~ msgid "&Ok"
-#~ msgstr "&Ok"
-
-#~ msgid "About"
-#~ msgstr "O programu"
-
-#~ msgid "Advanced"
-#~ msgstr "Pokročilé"
-
-#~ msgid "Matching"
-#~ msgstr "Porovnávání"
-
-#~ msgid "File Naming"
-#~ msgstr "Pojmenování souborů"
-
-#~ msgid "Scripting"
-#~ msgstr "Skriptování"
-
-#~ msgid "Tags"
-#~ msgstr "Tagy"
-
-#~ msgid "Total Discs"
-#~ msgstr "Počet disků"
-
-#~ msgid "Album Artist Sort Order"
-#~ msgstr "Seřazování podle umělce alba"
-
-#~ msgid "Artist Sort Order"
-#~ msgstr "Seřazování podle Umělce"
-
-#~ msgid "Title Sort Order"
-#~ msgstr "Seřazování podle názvu skladby"
-
-#~ msgid "Album Sort Order"
-#~ msgstr "Seřazování podle Alba"
-
-#~ msgid "ASIN"
-#~ msgstr "ASIN"
-
-#~ msgid "Grouping"
-#~ msgstr "Seskupování"
-
-#~ msgid "ISRC"
-#~ msgstr "ISRC"
-
-#~ msgid "Mood"
-#~ msgstr "Nálada"
-
-#~ msgid "BPM"
-#~ msgstr "BPM"
-
-#~ msgid "Conductor"
-#~ msgstr "Dirigent"
-
-#~ msgid "Lyricist"
-#~ msgstr "Textař"
-
-#~ msgid "Arranger"
-#~ msgstr "Aranžér"
-
-#~ msgid "Producer"
-#~ msgstr "Producent"
-
-#~ msgid "Engineer"
-#~ msgstr "Zvukový inženýr"
-
-#~ msgid "Subtitle"
-#~ msgstr "Podtitul"
-
-#~ msgid "Remixer"
-#~ msgstr "Remixér"
-
-#~ msgid "MusicIP PUID"
-#~ msgstr "MusicIP PUID"
-
-#~ msgid "MusicIP Fingerprint"
-#~ msgstr "Otisk MusicIP"
-
-#~ msgid "Website"
-#~ msgstr "Webová stránka"
-
-#~ msgid "Compilation"
-#~ msgstr "Kompilace"
-
-#~ msgid "Comment"
-#~ msgstr "Komentář"
-
-#~ msgid "Encoded By"
-#~ msgstr "Enkódováno"
-
-#~ msgid "Performer"
-#~ msgstr "Interpret"
-
-#~ msgid "Record Label"
-#~ msgstr "Nahrávací společnost"
-
-#~ msgid "Barcode"
-#~ msgstr "Čárový kód"
-
-#~ msgid "DJ-Mixer"
-#~ msgstr "Mixoval DJ"
-
-#~ msgid "Lyrics"
-#~ msgstr "Text písně"
-
-#~ msgid "Mixer"
-#~ msgstr "Mixér"
+#, fuzzy
+#~ msgid "Anal&yze"
+#~ msgstr "Analyzovat"
 
+#, fuzzy
+#~ msgid "Generate &Cuesheet..."
+#~ msgstr "Vygenerovat playlist"
 #~ msgid "Automatically analyze all new files"
 #~ msgstr "Automaticky analyzovat nové soubory"
 
+#, fuzzy
+#~ msgid "Album artist:"
+#~ msgstr "Umělec:"
+
+#, fuzzy
+#~ msgid "A&dd Directory..."
+#~ msgstr "Přidat a&dresář...\tCtrl+D"
 #~ msgid "Are You Sure?"
 #~ msgstr "Jste si jisti?"
-
 #~ msgid "Add &Files...\tCtrl+O"
 #~ msgstr "Přidat s&oubory...\tCtrl+O"
-
 #~ msgid "Add &Directory...\tCtrl+D"
 #~ msgstr "Přidat a&dresář...\tCtrl+D"
-
 #~ msgid "&Save Files\tCtrl+S"
 #~ msgstr "Uložit &soubory\tCtrl+S"
-
 #~ msgid "C&opy\tCtrl+C"
 #~ msgstr "K&opírovat\tCtrl+C"
-
 #~ msgid "Help"
 #~ msgstr "Nápověda"
-
 #~ msgid "Preferences"
 #~ msgstr "Nastavení..."
-
 #~ msgid "Error while saving cuesheet %s."
 #~ msgstr "Chyba při ukládaní cuesheetu %s."
-
 #~ msgid "Cuesheet %s saved."
 #~ msgstr "Cuesheet %s uložen."
-
 #~ msgid "Time"
 #~ msgstr "Délka"
-
 #~ msgid "Albums"
 #~ msgstr "Alba"
-
 #~ msgid "Force Save"
 #~ msgstr "Vynutit uložení"
-
 #~ msgid "Buy"
 #~ msgstr "Koupit"
-
 #~ msgid "Welcome to Picard!"
 #~ msgstr "Vítejte v Picard-e!"
-
 #~ msgid "Track Num"
 #~ msgstr "Číslo skladby"
-
 #~ msgid "PUID Collision"
 #~ msgstr "PUID kolize"
-
 #~ msgid ""
 #~ "Version %s\n"
 #~ "\n"
@@ -1202,90 +2618,56 @@ msgstr ""
 #~ "by a Helix Community grant.\n"
 #~ "\n"
 #~ "Podporované formáty: %s"
-
-#~ msgid "Colors"
-#~ msgstr "Barvy"
-
 #~ msgid "Font color"
 #~ msgstr "Barva písma"
-
 #~ msgid "Directories"
 #~ msgstr "Adresáře"
-
 #~ msgid "Watch for new files"
 #~ msgstr "Sledovat nové soubory"
-
 #~ msgid "Watch this directory for new audio files"
 #~ msgstr "Sledovat tento adresář pro nové soubory"
-
 #~ msgid "Encodings"
 #~ msgstr "Kódování"
-
 #~ msgid "all languages"
 #~ msgstr "všechny jazyky"
-
 #~ msgid "percent similar."
 #~ msgstr "procent podobné."
-
 #~ msgid "Load recently used albums on startup"
 #~ msgstr "Načíst naposledy použité albumy při startu"
-
-#~ msgid "Language"
-#~ msgstr "Jazyk"
-
-#~ msgid "System default"
-#~ msgstr "Výchozí jazyk systému"
-
 #~ msgid "Allowed filename characters"
 #~ msgstr "Povolené znaky v názvech souborů"
-
 #~ msgid "Use Windows-safe file names"
 #~ msgstr "Použít názvy souborů kompatibilné s Windows"
-
 #~ msgid "Number of tracks on the album"
 #~ msgstr "Počet skladeb na albume"
-
 #~ msgid "Track name"
 #~ msgstr "Název skladby"
-
 #~ msgid "Zero padded track number"
 #~ msgstr "Číslo skladby s nulou na začátku"
-
 #~ msgid "File format (e.g. mp3, ogg, wav)"
 #~ msgstr "Formát souboru (např. mp3, ogg, wav)"
-
 #~ msgid "Album type (album, single, EP, etc.)"
 #~ msgstr "Typ albumu (album, single, EP, atd.)"
-
 #~ msgid "Album Status (official, promo, etc.)"
 #~ msgstr "Status albumu (official, promo, atd.)"
-
 #~ msgid "Album release month"
 #~ msgstr "Měsíc vydání albumu"
-
 #~ msgid "Album release day"
 #~ msgstr "Den vydání albumu"
-
 #~ msgid "Album release year"
 #~ msgstr "Rok vydání albumu"
-
 #~ msgid "Make it so!"
 #~ msgstr "OK"
-
 #~ msgid "Use proxy server to access the Internet"
 #~ msgstr "Použít proxy server na připojení do Internetu"
-
 #~ msgid "Proxy server to use"
 #~ msgstr "Proxy server"
-
 #~ msgid "Proxy port"
 #~ msgstr "Proxy port"
-
 #~ msgid "ID3v2.4 only"
 #~ msgstr "jen pro ID3v2.4"
-
 #~ msgid "Save track/album"
 #~ msgstr "Uložit skladbu/album"
-
 #~ msgid "Artists"
 #~ msgstr "Umělci"
+
diff --git a/po/cy.po b/po/cy.po
index 096d1eee2..0d38b0d92 100644
--- a/po/cy.po
+++ b/po/cy.po
@@ -7,36 +7,1268 @@ msgid ""
 msgstr ""
 "Project-Id-Version: picard\n"
 "Report-Msgid-Bugs-To: http://bugs.musicbrainz.org/\n"
-"POT-Creation-Date: 2008-12-01 18:20+0100\n"
-"PO-Revision-Date: 2008-08-24 23:18+0000\n"
-"Last-Translator: tom.higgy <Unknown>\n"
+"POT-Creation-Date: 2009-01-25 12:23+0100\n"
+"PO-Revision-Date: 2009-01-25 13:00+0100\n"
+"Last-Translator: Philipp Wolfer <phw@rubyforge.org>\n"
 "Language-Team: Welsh <cy@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=4; plural=n==1 ? 0 : n==2 ? 1 : (n != 8 || n != 11) ? "
-"2 : 3;\n"
-"X-Launchpad-Export-Date: 2008-12-01 17:01+0000\n"
+"Plural-Forms: nplurals=4; plural=n==1 ? 0 : n==2 ? 1 : (n != 8 || n != 11) ? 2 : 3;\n"
+"X-Launchpad-Export-Date: 2009-01-24 23:28+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
-#: ../picard/album.py:108 ../picard/cluster.py:248
+#: ../picard/album.py:108
+#: ../picard/cluster.py:248
 msgid "Unmatched Files"
 msgstr ""
 
-#: ../picard/album.py:269
+#: ../picard/album.py:281
 #, python-format
 msgid "[couldn't load album %s]"
 msgstr ""
 
-#: ../picard/album.py:305
+#: ../picard/album.py:317
 msgid "[loading album information]"
 msgstr ""
 
-#: ../picard/tagger.py:472
+#: ../picard/cluster.py:164
+#: ../picard/cluster.py:175
+#, python-format
+msgid "No matching releases for cluster %s"
+msgstr ""
+
+#: ../picard/cluster.py:177
+#, python-format
+msgid "Cluster %s identified!"
+msgstr ""
+
+#: ../picard/cluster.py:182
+#, python-format
+msgid "Looking up the metadata for cluster %s..."
+msgstr ""
+
+#: ../picard/const.py:40
+msgid "CD"
+msgstr ""
+
+#: ../picard/const.py:41
+msgid "DVD"
+msgstr ""
+
+#: ../picard/const.py:42
+msgid "SACD"
+msgstr ""
+
+#: ../picard/const.py:43
+msgid "LaserDisc"
+msgstr ""
+
+#: ../picard/const.py:44
+msgid "MiniDisc"
+msgstr ""
+
+#: ../picard/const.py:45
+msgid "Vinyl"
+msgstr ""
+
+#: ../picard/const.py:46
+msgid "Cassette"
+msgstr ""
+
+#: ../picard/const.py:47
+msgid "Cartridge (4/8-tracks)"
+msgstr ""
+
+#: ../picard/const.py:48
+msgid "Reel-to-Reel"
+msgstr ""
+
+#: ../picard/const.py:49
+msgid "DAT"
+msgstr ""
+
+#: ../picard/const.py:50
+msgid "Digital Media"
+msgstr ""
+
+#: ../picard/const.py:51
+msgid "Wax Cylinder"
+msgstr ""
+
+#: ../picard/const.py:52
+msgid "Piano Roll"
+msgstr ""
+
+#: ../picard/const.py:53
+msgid "Other"
+msgstr ""
+
+#: ../picard/const.py:58
+msgid "Bangladesh"
+msgstr ""
+
+#: ../picard/const.py:59
+msgid "Belgium"
+msgstr ""
+
+#: ../picard/const.py:60
+msgid "Burkina Faso"
+msgstr ""
+
+#: ../picard/const.py:61
+msgid "Bulgaria"
+msgstr ""
+
+#: ../picard/const.py:62
+msgid "Barbados"
+msgstr ""
+
+#: ../picard/const.py:63
+msgid "Wallis and Futuna Islands"
+msgstr ""
+
+#: ../picard/const.py:64
+msgid "Bermuda"
+msgstr ""
+
+#: ../picard/const.py:65
+msgid "Brunei Darussalam"
+msgstr ""
+
+#: ../picard/const.py:66
+msgid "Bolivia"
+msgstr ""
+
+#: ../picard/const.py:67
+msgid "Bahrain"
+msgstr ""
+
+#: ../picard/const.py:68
+msgid "Burundi"
+msgstr ""
+
+#: ../picard/const.py:69
+msgid "Benin"
+msgstr ""
+
+#: ../picard/const.py:70
+msgid "Bhutan"
+msgstr ""
+
+#: ../picard/const.py:71
+msgid "Jamaica"
+msgstr ""
+
+#: ../picard/const.py:72
+msgid "Bouvet Island"
+msgstr ""
+
+#: ../picard/const.py:73
+msgid "Botswana"
+msgstr ""
+
+#: ../picard/const.py:74
+msgid "Samoa"
+msgstr ""
+
+#: ../picard/const.py:75
+msgid "Brazil"
+msgstr ""
+
+#: ../picard/const.py:76
+msgid "Bahamas"
+msgstr ""
+
+#: ../picard/const.py:77
+msgid "Belarus"
+msgstr ""
+
+#: ../picard/const.py:78
+msgid "Belize"
+msgstr ""
+
+#: ../picard/const.py:79
+msgid "Russian Federation"
+msgstr ""
+
+#: ../picard/const.py:80
+msgid "Rwanda"
+msgstr ""
+
+#: ../picard/const.py:81
+msgid "Reunion"
+msgstr ""
+
+#: ../picard/const.py:82
+msgid "Turkmenistan"
+msgstr ""
+
+#: ../picard/const.py:83
+msgid "Tajikistan"
+msgstr ""
+
+#: ../picard/const.py:84
+msgid "Romania"
+msgstr ""
+
+#: ../picard/const.py:85
+msgid "Tokela"
+msgstr ""
+
+#: ../picard/const.py:86
+msgid "Guinea-Bissa"
+msgstr ""
+
+#: ../picard/const.py:87
+msgid "Guam"
+msgstr ""
+
+#: ../picard/const.py:88
+msgid "Guatemala"
+msgstr ""
+
+#: ../picard/const.py:89
+msgid "Greece"
+msgstr ""
+
+#: ../picard/const.py:90
+msgid "Equatorial Guinea"
+msgstr ""
+
+#: ../picard/const.py:91
+msgid "Guadeloupe"
+msgstr ""
+
+#: ../picard/const.py:92
+msgid "Japan"
+msgstr ""
+
+#: ../picard/const.py:93
+msgid "Guyana"
+msgstr ""
+
+#: ../picard/const.py:94
+msgid "French Guiana"
+msgstr ""
+
+#: ../picard/const.py:95
+msgid "Georgia"
+msgstr ""
+
+#: ../picard/const.py:96
+msgid "Grenada"
+msgstr ""
+
+#: ../picard/const.py:97
+msgid "United Kingdom"
+msgstr ""
+
+#: ../picard/const.py:98
+msgid "Gabon"
+msgstr ""
+
+#: ../picard/const.py:99
+msgid "El Salvador"
+msgstr ""
+
+#: ../picard/const.py:100
+msgid "Guinea"
+msgstr ""
+
+#: ../picard/const.py:101
+msgid "Gambia"
+msgstr ""
+
+#: ../picard/const.py:102
+msgid "Greenland"
+msgstr ""
+
+#: ../picard/const.py:103
+msgid "Gibraltar"
+msgstr ""
+
+#: ../picard/const.py:104
+msgid "Ghana"
+msgstr ""
+
+#: ../picard/const.py:105
+msgid "Oman"
+msgstr ""
+
+#: ../picard/const.py:106
+msgid "Tunisia"
+msgstr ""
+
+#: ../picard/const.py:107
+msgid "Jordan"
+msgstr ""
+
+#: ../picard/const.py:108
+msgid "Haiti"
+msgstr ""
+
+#: ../picard/const.py:109
+msgid "Hungary"
+msgstr ""
+
+#: ../picard/const.py:110
+msgid "Hong Kong"
+msgstr ""
+
+#: ../picard/const.py:111
+msgid "Honduras"
+msgstr ""
+
+#: ../picard/const.py:112
+msgid "Heard and Mc Donald Islands"
+msgstr ""
+
+#: ../picard/const.py:113
+msgid "Venezuela"
+msgstr ""
+
+#: ../picard/const.py:114
+msgid "Puerto Rico"
+msgstr ""
+
+#: ../picard/const.py:115
+msgid "Pala"
+msgstr ""
+
+#: ../picard/const.py:116
+msgid "Portugal"
+msgstr ""
+
+#: ../picard/const.py:117
+msgid "Svalbard and Jan Mayen Islands"
+msgstr ""
+
+#: ../picard/const.py:118
+msgid "Paraguay"
+msgstr ""
+
+#: ../picard/const.py:119
+msgid "Iraq"
+msgstr ""
+
+#: ../picard/const.py:120
+msgid "Panama"
+msgstr ""
+
+#: ../picard/const.py:121
+msgid "French Polynesia"
+msgstr ""
+
+#: ../picard/const.py:122
+msgid "Papua New Guinea"
+msgstr ""
+
+#: ../picard/const.py:123
+msgid "Per"
+msgstr ""
+
+#: ../picard/const.py:124
+msgid "Pakistan"
+msgstr ""
+
+#: ../picard/const.py:125
+msgid "Philippines"
+msgstr ""
+
+#: ../picard/const.py:126
+msgid "Pitcairn"
+msgstr ""
+
+#: ../picard/const.py:127
+msgid "Poland"
+msgstr ""
+
+#: ../picard/const.py:128
+msgid "St. Pierre and Miquelon"
+msgstr ""
+
+#: ../picard/const.py:129
+msgid "Zambia"
+msgstr ""
+
+#: ../picard/const.py:130
+msgid "Western Sahara"
+msgstr ""
+
+#: ../picard/const.py:131
+msgid "Estonia"
+msgstr ""
+
+#: ../picard/const.py:132
+msgid "Egypt"
+msgstr ""
+
+#: ../picard/const.py:133
+msgid "South Africa"
+msgstr ""
+
+#: ../picard/const.py:134
+msgid "Ecuador"
+msgstr ""
+
+#: ../picard/const.py:135
+msgid "Italy"
+msgstr ""
+
+#: ../picard/const.py:136
+#, fuzzy
+msgid "Viet Nam"
+msgstr "Enw Ffeil"
+
+#: ../picard/const.py:137
+msgid "Solomon Islands"
+msgstr ""
+
+#: ../picard/const.py:138
+msgid "Ethiopia"
+msgstr ""
+
+#: ../picard/const.py:139
+msgid "Somalia"
+msgstr ""
+
+#: ../picard/const.py:140
+msgid "Zimbabwe"
+msgstr ""
+
+#: ../picard/const.py:141
+msgid "Saudi Arabia"
+msgstr ""
+
+#: ../picard/const.py:142
+msgid "Spain"
+msgstr ""
+
+#: ../picard/const.py:143
+msgid "Eritrea"
+msgstr ""
+
+#: ../picard/const.py:144
+msgid "Moldova, Republic of"
+msgstr ""
+
+#: ../picard/const.py:145
+msgid "Madagascar"
+msgstr ""
+
+#: ../picard/const.py:146
+msgid "Morocco"
+msgstr ""
+
+#: ../picard/const.py:147
+msgid "Monaco"
+msgstr ""
+
+#: ../picard/const.py:148
+msgid "Uzbekistan"
+msgstr ""
+
+#: ../picard/const.py:149
+msgid "Myanmar"
+msgstr ""
+
+#: ../picard/const.py:150
+msgid "Mali"
+msgstr ""
+
+#: ../picard/const.py:151
+msgid "Maca"
+msgstr ""
+
+#: ../picard/const.py:152
+msgid "Mongolia"
+msgstr ""
+
+#: ../picard/const.py:153
+msgid "Marshall Islands"
+msgstr ""
+
+#: ../picard/const.py:154
+msgid "Macedonia, The Former Yugoslav Republic of"
+msgstr ""
+
+#: ../picard/const.py:155
+msgid "Mauritius"
+msgstr ""
+
+#: ../picard/const.py:156
+msgid "Malta"
+msgstr ""
+
+#: ../picard/const.py:157
+msgid "Malawi"
+msgstr ""
+
+#: ../picard/const.py:158
+msgid "Maldives"
+msgstr ""
+
+#: ../picard/const.py:159
+msgid "Martinique"
+msgstr ""
+
+#: ../picard/const.py:160
+msgid "Northern Mariana Islands"
+msgstr ""
+
+#: ../picard/const.py:161
+msgid "Montserrat"
+msgstr ""
+
+#: ../picard/const.py:162
+msgid "Mauritania"
+msgstr ""
+
+#: ../picard/const.py:163
+msgid "Uganda"
+msgstr ""
+
+#: ../picard/const.py:164
+msgid "Malaysia"
+msgstr ""
+
+#: ../picard/const.py:165
+msgid "Mexico"
+msgstr ""
+
+#: ../picard/const.py:166
+msgid "Israel"
+msgstr ""
+
+#: ../picard/const.py:167
+msgid "France"
+msgstr ""
+
+#: ../picard/const.py:168
+msgid "British Indian Ocean Territory"
+msgstr ""
+
+#: ../picard/const.py:169
+msgid "St. Helena"
+msgstr ""
+
+#: ../picard/const.py:170
+msgid "Finland"
+msgstr ""
+
+#: ../picard/const.py:171
+msgid "Fiji"
+msgstr ""
+
+#: ../picard/const.py:172
+msgid "Falkland Islands (Malvinas)"
+msgstr ""
+
+#: ../picard/const.py:173
+msgid "Micronesia, Federated States of"
+msgstr ""
+
+#: ../picard/const.py:174
+msgid "Faroe Islands"
+msgstr ""
+
+#: ../picard/const.py:175
+msgid "Nicaragua"
+msgstr ""
+
+#: ../picard/const.py:176
+msgid "Netherlands"
+msgstr ""
+
+#: ../picard/const.py:177
+msgid "Norway"
+msgstr ""
+
+#: ../picard/const.py:178
+msgid "Namibia"
+msgstr ""
+
+#: ../picard/const.py:179
+msgid "Vanuat"
+msgstr ""
+
+#: ../picard/const.py:180
+msgid "New Caledonia"
+msgstr ""
+
+#: ../picard/const.py:181
+msgid "Niger"
+msgstr ""
+
+#: ../picard/const.py:182
+msgid "Norfolk Island"
+msgstr ""
+
+#: ../picard/const.py:183
+msgid "Nigeria"
+msgstr ""
+
+#: ../picard/const.py:184
+msgid "New Zealand"
+msgstr ""
+
+#: ../picard/const.py:185
+msgid "Zaire"
+msgstr ""
+
+#: ../picard/const.py:186
+msgid "Nepal"
+msgstr ""
+
+#: ../picard/const.py:187
+msgid "Naur"
+msgstr ""
+
+#: ../picard/const.py:188
+msgid "Niue"
+msgstr ""
+
+#: ../picard/const.py:189
+msgid "Cook Islands"
+msgstr ""
+
+#: ../picard/const.py:190
+msgid "Cote d'Ivoire"
+msgstr ""
+
+#: ../picard/const.py:191
+msgid "Switzerland"
+msgstr ""
+
+#: ../picard/const.py:192
+msgid "Colombia"
+msgstr ""
+
+#: ../picard/const.py:193
+msgid "China"
+msgstr ""
+
+#: ../picard/const.py:194
+msgid "Cameroon"
+msgstr ""
+
+#: ../picard/const.py:195
+msgid "Chile"
+msgstr ""
+
+#: ../picard/const.py:196
+msgid "Cocos (Keeling) Islands"
+msgstr ""
+
+#: ../picard/const.py:197
+msgid "Canada"
+msgstr ""
+
+#: ../picard/const.py:198
+msgid "Congo"
+msgstr ""
+
+#: ../picard/const.py:199
+msgid "Central African Republic"
+msgstr ""
+
+#: ../picard/const.py:200
+msgid "Czech Republic"
+msgstr ""
+
+#: ../picard/const.py:201
+msgid "Cyprus"
+msgstr ""
+
+#: ../picard/const.py:202
+msgid "Christmas Island"
+msgstr ""
+
+#: ../picard/const.py:203
+msgid "Costa Rica"
+msgstr ""
+
+#: ../picard/const.py:204
+msgid "Cape Verde"
+msgstr ""
+
+#: ../picard/const.py:205
+msgid "Cuba"
+msgstr ""
+
+#: ../picard/const.py:206
+msgid "Swaziland"
+msgstr ""
+
+#: ../picard/const.py:207
+msgid "Syrian Arab Republic"
+msgstr ""
+
+#: ../picard/const.py:208
+msgid "Kyrgyzstan"
+msgstr ""
+
+#: ../picard/const.py:209
+msgid "Kenya"
+msgstr ""
+
+#: ../picard/const.py:210
+msgid "Suriname"
+msgstr ""
+
+#: ../picard/const.py:211
+msgid "Kiribati"
+msgstr ""
+
+#: ../picard/const.py:212
+msgid "Cambodia"
+msgstr ""
+
+#: ../picard/const.py:213
+msgid "Saint Kitts and Nevis"
+msgstr ""
+
+#: ../picard/const.py:214
+msgid "Comoros"
+msgstr ""
+
+#: ../picard/const.py:215
+msgid "Sao Tome and Principe"
+msgstr ""
+
+#: ../picard/const.py:216
+msgid "Slovenia"
+msgstr ""
+
+#: ../picard/const.py:217
+msgid "Kuwait"
+msgstr ""
+
+#: ../picard/const.py:218
+msgid "Senegal"
+msgstr ""
+
+#: ../picard/const.py:219
+msgid "San Marino"
+msgstr ""
+
+#: ../picard/const.py:220
+msgid "Sierra Leone"
+msgstr ""
+
+#: ../picard/const.py:221
+msgid "Seychelles"
+msgstr ""
+
+#: ../picard/const.py:222
+msgid "Kazakhstan"
+msgstr ""
+
+#: ../picard/const.py:223
+msgid "Cayman Islands"
+msgstr ""
+
+#: ../picard/const.py:224
+msgid "Singapore"
+msgstr ""
+
+#: ../picard/const.py:225
+msgid "Sweden"
+msgstr ""
+
+#: ../picard/const.py:226
+msgid "Sudan"
+msgstr ""
+
+#: ../picard/const.py:227
+msgid "Dominican Republic"
+msgstr ""
+
+#: ../picard/const.py:228
+msgid "Dominica"
+msgstr ""
+
+#: ../picard/const.py:229
+msgid "Djibouti"
+msgstr ""
+
+#: ../picard/const.py:230
+msgid "Denmark"
+msgstr ""
+
+#: ../picard/const.py:231
+msgid "Virgin Islands (British)"
+msgstr ""
+
+#: ../picard/const.py:232
+msgid "Germany"
+msgstr ""
+
+#: ../picard/const.py:233
+msgid "Yemen"
+msgstr ""
+
+#: ../picard/const.py:234
+msgid "Algeria"
+msgstr ""
+
+#: ../picard/const.py:235
+msgid "United States"
+msgstr ""
+
+#: ../picard/const.py:236
+msgid "Uruguay"
+msgstr ""
+
+#: ../picard/const.py:237
+msgid "Mayotte"
+msgstr ""
+
+#: ../picard/const.py:238
+msgid "United States Minor Outlying Islands"
+msgstr ""
+
+#: ../picard/const.py:239
+msgid "Lebanon"
+msgstr ""
+
+#: ../picard/const.py:240
+msgid "Saint Lucia"
+msgstr ""
+
+#: ../picard/const.py:241
+msgid "Lao People's Democratic Republic"
+msgstr ""
+
+#: ../picard/const.py:242
+msgid "Tuval"
+msgstr ""
+
+#: ../picard/const.py:243
+msgid "Taiwan"
+msgstr ""
+
+#: ../picard/const.py:244
+msgid "Trinidad and Tobago"
+msgstr ""
+
+#: ../picard/const.py:245
+msgid "Turkey"
+msgstr ""
+
+#: ../picard/const.py:246
+msgid "Sri Lanka"
+msgstr ""
+
+#: ../picard/const.py:247
+msgid "Liechtenstein"
+msgstr ""
+
+#: ../picard/const.py:248
+msgid "Latvia"
+msgstr ""
+
+#: ../picard/const.py:249
+msgid "Tonga"
+msgstr ""
+
+#: ../picard/const.py:250
+msgid "Lithuania"
+msgstr ""
+
+#: ../picard/const.py:251
+msgid "Luxembourg"
+msgstr ""
+
+#: ../picard/const.py:252
+msgid "Liberia"
+msgstr ""
+
+#: ../picard/const.py:253
+msgid "Lesotho"
+msgstr ""
+
+#: ../picard/const.py:254
+msgid "Thailand"
+msgstr ""
+
+#: ../picard/const.py:255
+msgid "French Southern Territories"
+msgstr ""
+
+#: ../picard/const.py:256
+msgid "Togo"
+msgstr ""
+
+#: ../picard/const.py:257
+msgid "Chad"
+msgstr ""
+
+#: ../picard/const.py:258
+msgid "Turks and Caicos Islands"
+msgstr ""
+
+#: ../picard/const.py:259
+msgid "Libyan Arab Jamahiriya"
+msgstr ""
+
+#: ../picard/const.py:260
+msgid "Vatican City State (Holy See)"
+msgstr ""
+
+#: ../picard/const.py:261
+msgid "Saint Vincent and The Grenadines"
+msgstr ""
+
+#: ../picard/const.py:262
+msgid "United Arab Emirates"
+msgstr ""
+
+#: ../picard/const.py:263
+msgid "Andorra"
+msgstr ""
+
+#: ../picard/const.py:264
+msgid "Antigua and Barbuda"
+msgstr ""
+
+#: ../picard/const.py:265
+msgid "Afghanistan"
+msgstr ""
+
+#: ../picard/const.py:266
+msgid "Anguilla"
+msgstr ""
+
+#: ../picard/const.py:267
+msgid "Virgin Islands (U.S.)"
+msgstr ""
+
+#: ../picard/const.py:268
+msgid "Iceland"
+msgstr ""
+
+#: ../picard/const.py:269
+msgid "Iran (Islamic Republic of)"
+msgstr ""
+
+#: ../picard/const.py:270
+msgid "Armenia"
+msgstr ""
+
+#: ../picard/const.py:271
+msgid "Albania"
+msgstr ""
+
+#: ../picard/const.py:272
+msgid "Angola"
+msgstr ""
+
+#: ../picard/const.py:273
+msgid "Netherlands Antilles"
+msgstr ""
+
+#: ../picard/const.py:274
+msgid "Antarctica"
+msgstr ""
+
+#: ../picard/const.py:275
+msgid "American Samoa"
+msgstr ""
+
+#: ../picard/const.py:276
+msgid "Argentina"
+msgstr ""
+
+#: ../picard/const.py:277
+msgid "Australia"
+msgstr ""
+
+#: ../picard/const.py:278
+msgid "Austria"
+msgstr ""
+
+#: ../picard/const.py:279
+msgid "Aruba"
+msgstr ""
+
+#: ../picard/const.py:280
+msgid "India"
+msgstr ""
+
+#: ../picard/const.py:281
+msgid "Tanzania, United Republic of"
+msgstr ""
+
+#: ../picard/const.py:282
+msgid "Azerbaijan"
+msgstr ""
+
+#: ../picard/const.py:283
+msgid "Ireland"
+msgstr ""
+
+#: ../picard/const.py:284
+msgid "Indonesia"
+msgstr ""
+
+#: ../picard/const.py:285
+msgid "Ukraine"
+msgstr ""
+
+#: ../picard/const.py:286
+msgid "Qatar"
+msgstr ""
+
+#: ../picard/const.py:287
+msgid "Mozambique"
+msgstr ""
+
+#: ../picard/const.py:288
+msgid "Bosnia and Herzegovina"
+msgstr ""
+
+#: ../picard/const.py:289
+msgid "Congo, The Democratic Republic of the"
+msgstr ""
+
+#: ../picard/const.py:290
+msgid "Serbia and Montenegro"
+msgstr ""
+
+#: ../picard/const.py:291
+msgid "Croatia"
+msgstr ""
+
+#: ../picard/const.py:292
+msgid "Korea (North), Democratic People's Republic of"
+msgstr ""
+
+#: ../picard/const.py:293
+msgid "Korea (South), Republic of"
+msgstr ""
+
+#: ../picard/const.py:294
+msgid "Slovakia"
+msgstr ""
+
+#: ../picard/const.py:295
+msgid "Soviet Union (historical, 1922-1991)"
+msgstr ""
+
+#: ../picard/const.py:296
+msgid "East Timor"
+msgstr ""
+
+#: ../picard/const.py:297
+msgid "Czechoslovakia (historical, 1918-1992)"
+msgstr ""
+
+#: ../picard/const.py:298
+msgid "Europe"
+msgstr ""
+
+#: ../picard/const.py:299
+msgid "East Germany (historical, 1949-1990)"
+msgstr ""
+
+#: ../picard/const.py:300
+msgid "[Unknown Country]"
+msgstr ""
+
+#: ../picard/const.py:301
+msgid "[Worldwide]"
+msgstr ""
+
+#: ../picard/const.py:302
+msgid "Yugoslavia (historical, 1918-1992)"
+msgstr ""
+
+#: ../picard/const.py:307
+msgid "Catalan"
+msgstr ""
+
+#: ../picard/const.py:308
+msgid "Czech"
+msgstr ""
+
+#: ../picard/const.py:309
+msgid "Welsh"
+msgstr ""
+
+#: ../picard/const.py:310
+#, fuzzy
+msgid "Danish"
+msgstr "Manylion"
+
+#: ../picard/const.py:311
+msgid "German"
+msgstr ""
+
+#: ../picard/const.py:312
+msgid "English"
+msgstr ""
+
+#: ../picard/const.py:313
+msgid "English (Canada)"
+msgstr ""
+
+#: ../picard/const.py:314
+msgid "English (UK)"
+msgstr ""
+
+#: ../picard/const.py:315
+msgid "Spanish"
+msgstr ""
+
+#: ../picard/const.py:316
+msgid "Persian"
+msgstr ""
+
+#: ../picard/const.py:317
+msgid "Finnish"
+msgstr ""
+
+#: ../picard/const.py:318
+msgid "French"
+msgstr ""
+
+#: ../picard/const.py:319
+msgid "Frisian"
+msgstr ""
+
+#: ../picard/const.py:320
+msgid "Hebrew"
+msgstr ""
+
+#: ../picard/const.py:321
+msgid "Hungarian"
+msgstr ""
+
+#: ../picard/const.py:322
+msgid "Islandic"
+msgstr ""
+
+#: ../picard/const.py:323
+msgid "Italian"
+msgstr ""
+
+#: ../picard/const.py:324
+msgid "Kannada"
+msgstr ""
+
+#: ../picard/const.py:325
+msgid "Korean"
+msgstr ""
+
+#: ../picard/const.py:326
+msgid "Lithuanian"
+msgstr ""
+
+#: ../picard/const.py:327
+msgid "Norwegian Bokmal"
+msgstr ""
+
+#: ../picard/const.py:328
+msgid "Dutch"
+msgstr ""
+
+#: ../picard/const.py:329
+msgid "Polish"
+msgstr ""
+
+#: ../picard/const.py:330
+msgid "Portuguese"
+msgstr ""
+
+#: ../picard/const.py:331
+msgid "Brazilian Portuguese"
+msgstr ""
+
+#: ../picard/const.py:332
+msgid "Romanian"
+msgstr ""
+
+#: ../picard/const.py:333
+msgid "Russian"
+msgstr ""
+
+#: ../picard/const.py:334
+msgid "Scots"
+msgstr ""
+
+#: ../picard/const.py:335
+msgid "Slovak"
+msgstr ""
+
+#: ../picard/const.py:336
+msgid "Slovenian"
+msgstr ""
+
+#: ../picard/const.py:337
+msgid "Swedish"
+msgstr ""
+
+#: ../picard/const.py:338
+msgid "Chinese"
+msgstr ""
+
+#: ../picard/file.py:475
+#, python-format
+msgid "No matching tracks for file %s"
+msgstr ""
+
+#: ../picard/file.py:492
+#, python-format
+msgid "No matching tracks above the threshold for file %s"
+msgstr ""
+
+#: ../picard/file.py:495
+#, python-format
+msgid "File %s identified!"
+msgstr ""
+
+#: ../picard/file.py:506
+#, python-format
+msgid "Looking up the PUID for file %s..."
+msgstr ""
+
+#: ../picard/file.py:511
+#, python-format
+msgid "Looking up the metadata for file %s..."
+msgstr ""
+
+#: ../picard/puidmanager.py:58
+msgid "Submitting PUIDs..."
+msgstr ""
+
+#: ../picard/puidmanager.py:64
+#, python-format
+msgid "PUIDs submission failed: %s"
+msgstr ""
+
+#: ../picard/puidmanager.py:66
+msgid "PUIDs successfully submitted!"
+msgstr ""
+
+#: ../picard/playlist.py:31
+msgid "M3U Playlist (*.m3u)"
+msgstr ""
+
+#: ../picard/playlist.py:32
+msgid "PLS Playlist (*.pls)"
+msgstr ""
+
+#: ../picard/playlist.py:33
+msgid "XSPF Playlist (*.xspf)"
+msgstr ""
+
+#: ../picard/tagger.py:476
 msgid "CD Lookup Error"
 msgstr ""
 
-#: ../picard/tagger.py:473
+#: ../picard/tagger.py:477
 #, python-format
 msgid ""
 "Error while reading CD:\n"
@@ -44,14 +1276,19 @@ msgid ""
 "%s"
 msgstr ""
 
-#: ../picard/ui/passworddialog.py:38
+#: ../picard/tagger.py:503
 #, python-format
-msgid ""
-"The server %s requires you to login. Please enter your username and password."
+msgid "Couldn't find PUID for file %s"
 msgstr ""
 
-#: ../picard/ui/ui_options_script.py:52
-msgid "Tagger Script"
+#: ../picard/musicdns/__init__.py:98
+#, python-format
+msgid "Looking up the fingerprint for file %s..."
+msgstr ""
+
+#: ../picard/musicdns/__init__.py:117
+#, python-format
+msgid "Creating fingerprint for file %s..."
 msgstr ""
 
 #: ../picard/ui/cdlookup.py:31
@@ -59,110 +1296,154 @@ msgid "Score"
 msgstr ""
 
 #: ../picard/ui/cdlookup.py:31
+#: ../picard/ui/itemviews.py:82
+#: ../picard/util/tags.py:23
 msgid "Title"
 msgstr ""
 
-#: ../picard/ui/cdlookup.py:31 ../picard/ui/mainwindow.py:436
+#: ../picard/ui/cdlookup.py:31
+#: ../picard/ui/itemviews.py:84
+#: ../picard/ui/mainwindow.py:436
+#: ../picard/util/tags.py:22
 msgid "Artist"
 msgstr ""
 
-#: ../picard/ui/ui_metadata.py:121
-msgid "Lookup"
+#: ../picard/ui/coverartbox.py:47
+#: ../picard/ui/options/cover.py:29
+msgid "Cover Art"
 msgstr ""
 
-#: ../picard/ui/ui_metadata.py:122
-msgid "Title:"
+#: ../picard/ui/coverartbox.py:95
+msgid "Buy the album on Amazon"
 msgstr ""
 
-#: ../picard/ui/ui_metadata.py:123
-msgid "Date:"
+#: ../picard/ui/filebrowser.py:38
+#: ../picard/ui/mainwindow.py:302
+msgid "&Refresh"
 msgstr ""
 
-#: ../picard/ui/ui_metadata.py:124
-msgid "Artist:"
+#: ../picard/ui/filebrowser.py:41
+msgid "&Move Tagged Files Here"
 msgstr ""
 
-#: ../picard/ui/ui_metadata.py:125
-msgid "Track:"
+#: ../picard/ui/filebrowser.py:44
+msgid "Show &Hidden Files"
 msgstr ""
 
-#: ../picard/ui/ui_metadata.py:126
-msgid "0000-00-00; "
+#: ../picard/ui/itemviews.py:83
+msgid "Length"
 msgstr ""
 
-#: ../picard/ui/ui_metadata.py:127 ../picard/ui/tageditor.py:225
-#: ../picard/ui/multitageditor.py:181
+#: ../picard/ui/itemviews.py:327
+msgid "&Releases"
+msgstr ""
+
+#: ../picard/ui/itemviews.py:353
+msgid "&Plugins"
+msgstr ""
+
+#: ../picard/ui/itemviews.py:523
+msgid "Clusters"
+msgstr ""
+
+#: ../picard/ui/logview.py:29
+msgid "Log"
+msgstr ""
+
+#: ../picard/ui/puidsubmit.py:31
+#: ../picard/ui/options/plugins.py:80
+msgid "File"
+msgstr ""
+
+#: ../picard/ui/puidsubmit.py:31
+msgid "PUID"
+msgstr ""
+
+#: ../picard/ui/puidsubmit.py:31
+#: ../picard/ui/mainwindow.py:437
+msgid "Track"
+msgstr ""
+
+#: ../picard/ui/puidsubmit.py:31
+msgid "Release"
+msgstr ""
+
+#: ../picard/ui/puidsubmit.py:31
+msgid "Release ID"
+msgstr ""
+
+#: ../picard/ui/tageditor.py:65
+#: ../picard/ui/ui_options_plugins.py:62
+msgid "Details"
+msgstr "Manylion"
+
+#: ../picard/ui/tageditor.py:70
+#: ../picard/ui/tageditor.py:241
+#, python-format
+msgid "%d file"
+msgid_plural "%d files"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../picard/ui/tageditor.py:124
+#, python-format
+msgid "(different across %d file)"
+msgid_plural "(different across %d files)"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../picard/ui/tageditor.py:127
+#, python-format
+msgid "(missing from %d file)"
+msgid_plural "(missing from %d files)"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../picard/ui/tageditor.py:210
+msgid "Filename:"
+msgstr "Enw ffeil:"
+
+#: ../picard/ui/tageditor.py:212
+msgid "Format:"
+msgstr ""
+
+#: ../picard/ui/tageditor.py:221
+msgid "Size:"
+msgstr ""
+
+#: ../picard/ui/tageditor.py:225
+#: ../picard/ui/ui_metadata.py:127
 msgid "Length:"
 msgstr ""
 
-#: ../picard/ui/ui_metadata.py:128
-msgid "Album:"
+#: ../picard/ui/tageditor.py:227
+msgid "Bitrate:"
 msgstr ""
 
-#: ../picard/ui/ui_passworddialog.py:78
-msgid "Authentication required"
+#: ../picard/ui/tageditor.py:229
+msgid "Sample rate:"
 msgstr ""
 
-#: ../picard/ui/ui_passworddialog.py:79 ../picard/ui/ui_options_proxy.py:83
-#: ../picard/ui/ui_options_general.py:113
-msgid "Username:"
+#: ../picard/ui/tageditor.py:231
+msgid "Bits per sample:"
 msgstr ""
 
-#: ../picard/ui/ui_passworddialog.py:80 ../picard/ui/ui_options_proxy.py:82
-#: ../picard/ui/ui_options_general.py:112
-msgid "Password:"
+#: ../picard/ui/tageditor.py:234
+msgid "Mono"
 msgstr ""
 
-#: ../picard/ui/ui_passworddialog.py:81
-msgid "Save username and password"
+#: ../picard/ui/tageditor.py:235
+msgid "Stereo"
 msgstr ""
 
-#: ../picard/ui/ui_options_folksonomy.py:114
-#: ../picard/ui/ui_options_folksonomy_tags.py:114
-msgid "Folksonomy Tags"
+#: ../picard/ui/tageditor.py:237
+msgid "Channels:"
 msgstr ""
 
-#: ../picard/ui/ui_options_folksonomy.py:115
-#: ../picard/ui/ui_options_folksonomy_tags.py:115
-msgid "Ignore tags:"
-msgstr ""
-
-#: ../picard/ui/ui_options_folksonomy.py:116
-#: ../picard/ui/ui_options_folksonomy_tags.py:116
-msgid "Minimal tag usage:"
-msgstr ""
-
-#: ../picard/ui/ui_options_folksonomy.py:117
-#: ../picard/ui/ui_options_folksonomy_tags.py:117
-#: ../picard/ui/ui_options_matching.py:107
-#: ../picard/ui/ui_options_matching.py:108
-#: ../picard/ui/ui_options_matching.py:109
-#: ../picard/ui/ui_options_matching.py:113
-msgid " %"
-msgstr ""
-
-#: ../picard/ui/ui_options_folksonomy.py:118
-msgid "Maximum number of tags:"
-msgstr ""
-
-#: ../picard/ui/ui_options_folksonomy.py:119
-#: ../picard/ui/ui_options_folksonomy_tags.py:119
-msgid "Join multiple tags with:"
-msgstr ""
-
-#: ../picard/ui/ui_options_folksonomy.py:120
-#: ../picard/ui/ui_options_folksonomy_tags.py:120
-msgid " / "
-msgstr ""
-
-#: ../picard/ui/ui_options_folksonomy.py:121
-#: ../picard/ui/ui_options_folksonomy_tags.py:121
-msgid ", "
-msgstr ""
-
-#: ../picard/ui/ui_options_folksonomy_tags.py:118
-msgid "Maximal number of tags:"
-msgstr ""
+#: ../picard/ui/tagsfromfilenames.py:52
+#: ../picard/ui/tagsfromfilenames.py:96
+msgid "File Name"
+msgstr "Enw Ffeil"
 
 #: ../picard/ui/mainwindow.py:64
 msgid "MusicBrainz Picard"
@@ -296,7 +1577,8 @@ msgstr ""
 msgid "&CD Lookup..."
 msgstr ""
 
-#: ../picard/ui/mainwindow.py:272 ../picard/ui/mainwindow.py:273
+#: ../picard/ui/mainwindow.py:272
+#: ../picard/ui/mainwindow.py:273
 msgid "Lookup CD"
 msgstr ""
 
@@ -327,7 +1609,8 @@ msgstr "Ctrl+U"
 msgid "&Lookup"
 msgstr ""
 
-#: ../picard/ui/mainwindow.py:291 ../picard/ui/mainwindow.py:292
+#: ../picard/ui/mainwindow.py:291
+#: ../picard/ui/mainwindow.py:292
 msgid "Lookup metadata"
 msgstr ""
 
@@ -340,10 +1623,6 @@ msgstr "Ctrl+L"
 msgid "&Details..."
 msgstr "&Manylion..."
 
-#: ../picard/ui/mainwindow.py:302 ../picard/ui/filebrowser.py:38
-msgid "&Refresh"
-msgstr ""
-
 #: ../picard/ui/mainwindow.py:305
 msgid "Generate &Playlist..."
 msgstr ""
@@ -389,6 +1668,7 @@ msgid "&Tools"
 msgstr ""
 
 #: ../picard/ui/mainwindow.py:384
+#: ../picard/ui/util.py:33
 msgid "&Help"
 msgstr "&Cymorth"
 
@@ -401,13 +1681,10 @@ msgid "&Search Bar"
 msgstr ""
 
 #: ../picard/ui/mainwindow.py:435
+#: ../picard/util/tags.py:21
 msgid "Album"
 msgstr ""
 
-#: ../picard/ui/mainwindow.py:437 ../picard/ui/puidsubmit.py:31
-msgid "Track"
-msgstr ""
-
 #: ../picard/ui/mainwindow.py:476
 msgid "All Supported Formats"
 msgstr ""
@@ -422,37 +1699,288 @@ msgstr ""
 msgid "Playlist %s saved"
 msgstr ""
 
-#: ../picard/ui/mainwindow.py:638 ../picard/ui/mainwindow.py:647
+#: ../picard/ui/mainwindow.py:638
+#: ../picard/ui/mainwindow.py:647
 #, python-format
 msgid " (Error: %s)"
 msgstr ""
 
+#: ../picard/ui/ui_tageditor.py:115
+#: ../picard/ui/ui_options_plugins.py:59
+#: ../picard/ui/options/plugins.py:76
+msgid "Name"
+msgstr ""
+
+#: ../picard/ui/ui_tageditor.py:116
+msgid "Value"
+msgstr ""
+
+#: ../picard/ui/ui_tageditor.py:117
+msgid "&Add..."
+msgstr ""
+
+#: ../picard/ui/ui_tageditor.py:118
+msgid "&Edit..."
+msgstr ""
+
+#: ../picard/ui/ui_tageditor.py:119
+msgid "&Delete"
+msgstr ""
+
+#: ../picard/ui/ui_tageditor.py:120
+msgid "&Metadata"
+msgstr ""
+
+#: ../picard/ui/ui_tageditor.py:121
+msgid "A&rtwork"
+msgstr ""
+
+#: ../picard/ui/ui_tageditor.py:122
+msgid "&Info"
+msgstr ""
+
+#: ../picard/ui/passworddialog.py:38
+#, python-format
+msgid "The server %s requires you to login. Please enter your username and password."
+msgstr ""
+
+#: ../picard/ui/ui_cdlookup.py:60
+#: ../picard/ui/ui_options_cdlookup.py:47
+#: ../picard/ui/ui_options_cdlookup_win32.py:56
+#: ../picard/ui/options/cdlookup.py:35
+msgid "CD Lookup"
+msgstr ""
+
+#: ../picard/ui/ui_cdlookup.py:61
+msgid "The following releases on MusicBrainz match the CD:"
+msgstr ""
+
+#: ../picard/ui/ui_cdlookup.py:62
+#: ../picard/ui/ui_puidsubmit.py:53
+msgid "OK"
+msgstr ""
+
+#: ../picard/ui/ui_cdlookup.py:63
+msgid "    Lookup manually    "
+msgstr ""
+
+#: ../picard/ui/ui_cdlookup.py:64
+#: ../picard/ui/ui_puidsubmit.py:54
+msgid "Cancel"
+msgstr ""
+
+#: ../picard/ui/ui_passworddialog.py:78
+msgid "Authentication required"
+msgstr ""
+
+#: ../picard/ui/ui_passworddialog.py:79
+#: ../picard/ui/ui_options_general.py:113
+#: ../picard/ui/ui_options_proxy.py:83
+msgid "Username:"
+msgstr ""
+
+#: ../picard/ui/ui_passworddialog.py:80
+#: ../picard/ui/ui_options_general.py:112
+#: ../picard/ui/ui_options_proxy.py:82
+msgid "Password:"
+msgstr ""
+
+#: ../picard/ui/ui_passworddialog.py:81
+msgid "Save username and password"
+msgstr ""
+
 #: ../picard/ui/ui_edittagdialog.py:44
 msgid "Edit Tag"
 msgstr ""
 
-#: ../picard/ui/ui_options_proxy.py:81
-msgid "Web Proxy"
+#: ../picard/ui/ui_metadata.py:121
+msgid "Lookup"
 msgstr ""
 
-#: ../picard/ui/ui_options_proxy.py:84 ../picard/ui/ui_options_general.py:109
-msgid "Port:"
+#: ../picard/ui/ui_metadata.py:122
+msgid "Title:"
 msgstr ""
 
-#: ../picard/ui/ui_options_proxy.py:85 ../picard/ui/ui_options_general.py:110
-msgid "Server address:"
+#: ../picard/ui/ui_metadata.py:123
+msgid "Date:"
 msgstr ""
 
-#: ../picard/ui/ui_tagsfromfilenames.py:56
-msgid "Convert File Names to Tags"
+#: ../picard/ui/ui_metadata.py:124
+msgid "Artist:"
 msgstr ""
 
-#: ../picard/ui/ui_tagsfromfilenames.py:57
-msgid "Replace underscores with spaces"
+#: ../picard/ui/ui_metadata.py:125
+msgid "Track:"
+msgstr ""
+
+#: ../picard/ui/ui_metadata.py:126
+msgid "0000-00-00; "
+msgstr ""
+
+#: ../picard/ui/ui_metadata.py:128
+msgid "Album:"
+msgstr ""
+
+#: ../picard/ui/ui_options.py:42
+msgid "Options"
+msgstr ""
+
+#: ../picard/ui/ui_options_cdlookup.py:48
+msgid "CD-ROM device to use for lookups:"
+msgstr ""
+
+#: ../picard/ui/ui_options_cdlookup_win32.py:57
+msgid "Default CD-ROM drive to use for lookups:"
+msgstr ""
+
+#: ../picard/ui/ui_options_cover.py:56
+msgid "Location"
+msgstr ""
+
+#: ../picard/ui/ui_options_cover.py:57
+msgid "Embed cover images into tags"
+msgstr ""
+
+#: ../picard/ui/ui_options_cover.py:58
+msgid "Save cover images as separate files"
+msgstr ""
+
+#: ../picard/ui/ui_options_cover.py:59
+msgid "Overwrite the file if it already exists"
+msgstr ""
+
+#: ../picard/ui/util.py:31
+msgid "&Ok"
+msgstr ""
+
+#: ../picard/ui/util.py:32
+msgid "&Cancel"
+msgstr ""
+
+#: ../picard/ui/ui_puidsubmit.py:52
+msgid "Submit PUIDs"
+msgstr ""
+
+#: ../picard/ui/ui_options_folksonomy.py:114
+#: ../picard/ui/options/folksonomy.py:29
+msgid "Folksonomy Tags"
+msgstr ""
+
+#: ../picard/ui/ui_options_folksonomy.py:115
+msgid "Ignore tags:"
+msgstr ""
+
+#: ../picard/ui/ui_options_folksonomy.py:116
+msgid "Minimal tag usage:"
+msgstr ""
+
+#: ../picard/ui/ui_options_folksonomy.py:117
+#: ../picard/ui/ui_options_matching.py:107
+#: ../picard/ui/ui_options_matching.py:108
+#: ../picard/ui/ui_options_matching.py:109
+#: ../picard/ui/ui_options_matching.py:113
+msgid " %"
+msgstr ""
+
+#: ../picard/ui/ui_options_folksonomy.py:118
+msgid "Maximum number of tags:"
+msgstr ""
+
+#: ../picard/ui/ui_options_folksonomy.py:119
+msgid "Join multiple tags with:"
+msgstr ""
+
+#: ../picard/ui/ui_options_folksonomy.py:120
+msgid " / "
+msgstr ""
+
+#: ../picard/ui/ui_options_folksonomy.py:121
+msgid ", "
+msgstr ""
+
+#: ../picard/ui/ui_options_interface.py:50
+msgid "Miscellaneous"
+msgstr ""
+
+#: ../picard/ui/ui_options_interface.py:51
+msgid "Show text labels under icons"
+msgstr ""
+
+#: ../picard/ui/ui_options_interface.py:52
+msgid "Allow selection of multiple directories"
+msgstr ""
+
+#: ../picard/ui/ui_options_interface.py:53
+msgid "Use advanced query syntax"
+msgstr ""
+
+#: ../picard/ui/ui_options_interface.py:54
+msgid "User interface language:"
+msgstr ""
+
+#: ../picard/ui/ui_options_naming.py:165
+msgid "Rename Files"
+msgstr ""
+
+#: ../picard/ui/ui_options_naming.py:166
+msgid "Replace Windows-incompatible characters"
+msgstr ""
+
+#: ../picard/ui/ui_options_naming.py:167
+msgid "Replace non-ASCII characters"
+msgstr ""
+
+#: ../picard/ui/ui_options_naming.py:168
+#: ../picard/ui/ui_options_naming.py:169
+#: ../picard/ui/ui_options_metadata.py:109
+#: ../picard/ui/ui_options_metadata.py:110
+msgid "Default"
+msgstr ""
+
+#: ../picard/ui/ui_options_naming.py:170
+#: ../picard/ui/options/naming.py:90
+msgid "Multiple artist file naming format:"
+msgstr ""
+
+#: ../picard/ui/ui_options_naming.py:171
+#: ../picard/ui/options/naming.py:86
+msgid "File naming format:"
+msgstr ""
+
+#: ../picard/ui/ui_options_naming.py:172
+msgid "Move Files"
+msgstr ""
+
+#: ../picard/ui/ui_options_naming.py:173
+msgid "Move tagged files to this directory:"
+msgstr ""
+
+#: ../picard/ui/ui_options_naming.py:174
+msgid "Browse..."
+msgstr ""
+
+#: ../picard/ui/ui_options_naming.py:175
+msgid "Move additional files:"
+msgstr ""
+
+#: ../picard/ui/ui_options_naming.py:176
+msgid "Delete empty directories"
+msgstr ""
+
+#: ../picard/ui/ui_options_naming.py:177
+msgid "Example"
+msgstr ""
+
+#: ../picard/ui/ui_options_naming.py:178
+msgid "File name:"
+msgstr ""
+
+#: ../picard/ui/ui_options_naming.py:179
+msgid "Multiple artist file name:"
 msgstr ""
 
-#: ../picard/ui/ui_tagsfromfilenames.py:58
 #: ../picard/ui/ui_options_naming.py:180
+#: ../picard/ui/ui_tagsfromfilenames.py:58
 msgid "&Preview"
 msgstr ""
 
@@ -460,11 +1988,22 @@ msgstr ""
 msgid "MusicBrainz Server"
 msgstr ""
 
+#: ../picard/ui/ui_options_general.py:109
+#: ../picard/ui/ui_options_proxy.py:84
+msgid "Port:"
+msgstr ""
+
+#: ../picard/ui/ui_options_general.py:110
+#: ../picard/ui/ui_options_proxy.py:85
+msgid "Server address:"
+msgstr ""
+
 #: ../picard/ui/ui_options_general.py:111
 msgid "Account Information"
 msgstr ""
 
 #: ../picard/ui/ui_options_general.py:114
+#: ../picard/ui/options/general.py:29
 msgid "General"
 msgstr ""
 
@@ -472,34 +2011,6 @@ msgstr ""
 msgid "Automatically scan all new files"
 msgstr ""
 
-#: ../picard/ui/ui_options_interface.py:46
-msgid "Miscellaneous"
-msgstr ""
-
-#: ../picard/ui/ui_options_interface.py:47
-msgid "Show text labels under icons"
-msgstr ""
-
-#: ../picard/ui/ui_options_interface.py:48
-msgid "Allow selection of multiple directories"
-msgstr ""
-
-#: ../picard/ui/ui_options_interface.py:49
-msgid "Use advanced query syntax"
-msgstr ""
-
-#: ../picard/ui/itemviews.py:327
-msgid "&Releases"
-msgstr ""
-
-#: ../picard/ui/itemviews.py:353
-msgid "&Plugins"
-msgstr ""
-
-#: ../picard/ui/itemviews.py:523
-msgid "Clusters"
-msgstr ""
-
 #: ../picard/ui/ui_options_matching.py:105
 msgid "Thresholds"
 msgstr ""
@@ -520,6 +2031,67 @@ msgstr ""
 msgid "Minimal similarity for PUID lookups:"
 msgstr ""
 
+#: ../picard/ui/ui_options_metadata.py:100
+#: ../picard/ui/options/metadata.py:31
+msgid "Metadata"
+msgstr ""
+
+#: ../picard/ui/ui_options_metadata.py:101
+msgid "Translate foreign artist names to English where possible"
+msgstr ""
+
+#: ../picard/ui/ui_options_metadata.py:102
+msgid "Use release relationships"
+msgstr ""
+
+#: ../picard/ui/ui_options_metadata.py:103
+msgid "Use track relationships"
+msgstr ""
+
+#: ../picard/ui/ui_options_metadata.py:104
+msgid "Use folksonomy tags as genre"
+msgstr ""
+
+#: ../picard/ui/ui_options_metadata.py:105
+msgid "Preferred release country:"
+msgstr ""
+
+#: ../picard/ui/ui_options_metadata.py:106
+msgid "Custom Fields"
+msgstr ""
+
+#: ../picard/ui/ui_options_metadata.py:107
+msgid "Various artists:"
+msgstr ""
+
+#: ../picard/ui/ui_options_metadata.py:108
+msgid "Non-album tracks:"
+msgstr ""
+
+#: ../picard/ui/ui_options_plugins.py:58
+#: ../picard/ui/options/plugins.py:30
+msgid "Plugins"
+msgstr ""
+
+#: ../picard/ui/ui_options_plugins.py:60
+#: ../picard/ui/options/plugins.py:79
+msgid "Author"
+msgstr ""
+
+#: ../picard/ui/ui_options_plugins.py:61
+#: ../picard/util/tags.py:36
+msgid "Version"
+msgstr ""
+
+#: ../picard/ui/ui_options_proxy.py:81
+#: ../picard/ui/options/proxy.py:28
+msgid "Web Proxy"
+msgstr ""
+
+#: ../picard/ui/ui_options_script.py:52
+msgid "Tagger Script"
+msgstr ""
+
 #: ../picard/ui/ui_options_tags.py:105
 msgid "Common"
 msgstr ""
@@ -572,309 +2144,16 @@ msgstr ""
 msgid "Remove APEv2 tags from MP3 files"
 msgstr ""
 
-#: ../picard/ui/ui_options_cdlookup_win32.py:56 ../picard/ui/ui_cdlookup.py:60
-#: ../picard/ui/ui_options_cdlookup.py:47
-msgid "CD Lookup"
+#: ../picard/ui/ui_tagsfromfilenames.py:56
+msgid "Convert File Names to Tags"
 msgstr ""
 
-#: ../picard/ui/ui_options_cdlookup_win32.py:57
-msgid "Default CD-ROM drive to use for lookups:"
+#: ../picard/ui/ui_tagsfromfilenames.py:57
+msgid "Replace underscores with spaces"
 msgstr ""
 
-#: ../picard/ui/tageditor.py:65 ../picard/ui/ui_options_plugins.py:62
-#: ../picard/ui/multitageditor.py:37
-msgid "Details"
-msgstr "Manylion"
-
-#: ../picard/ui/tageditor.py:70 ../picard/ui/tageditor.py:241
-#: ../picard/ui/multitageditor.py:42 ../picard/ui/multitageditor.py:197
-#, python-format
-msgid "%d file"
-msgid_plural "%d files"
-msgstr[0] ""
-msgstr[1] ""
-
-#: ../picard/ui/tageditor.py:124 ../picard/ui/multitageditor.py:95
-#, python-format
-msgid "(different across %d file)"
-msgid_plural "(different across %d files)"
-msgstr[0] ""
-msgstr[1] ""
-
-#: ../picard/ui/tageditor.py:127 ../picard/ui/multitageditor.py:98
-#, python-format
-msgid "(missing from %d file)"
-msgid_plural "(missing from %d files)"
-msgstr[0] ""
-msgstr[1] ""
-
-#: ../picard/ui/tageditor.py:210 ../picard/ui/multitageditor.py:166
-msgid "Filename:"
-msgstr "Enw ffeil:"
-
-#: ../picard/ui/tageditor.py:212 ../picard/ui/multitageditor.py:168
-msgid "Format:"
-msgstr ""
-
-#: ../picard/ui/tageditor.py:221 ../picard/ui/multitageditor.py:177
-msgid "Size:"
-msgstr ""
-
-#: ../picard/ui/tageditor.py:227 ../picard/ui/multitageditor.py:183
-msgid "Bitrate:"
-msgstr ""
-
-#: ../picard/ui/tageditor.py:229 ../picard/ui/multitageditor.py:185
-msgid "Sample rate:"
-msgstr ""
-
-#: ../picard/ui/tageditor.py:231 ../picard/ui/multitageditor.py:187
-msgid "Bits per sample:"
-msgstr ""
-
-#: ../picard/ui/tageditor.py:234 ../picard/ui/multitageditor.py:190
-msgid "Mono"
-msgstr ""
-
-#: ../picard/ui/tageditor.py:235 ../picard/ui/multitageditor.py:191
-msgid "Stereo"
-msgstr ""
-
-#: ../picard/ui/tageditor.py:237 ../picard/ui/multitageditor.py:193
-msgid "Channels:"
-msgstr ""
-
-#: ../picard/ui/ui_tageditor.py:115 ../picard/ui/ui_multitageditor.py:55
-#: ../picard/ui/ui_options_plugins.py:59 ../picard/ui/options/plugins.py:76
-msgid "Name"
-msgstr ""
-
-#: ../picard/ui/ui_tageditor.py:116 ../picard/ui/ui_multitageditor.py:56
-msgid "Value"
-msgstr ""
-
-#: ../picard/ui/ui_tageditor.py:117 ../picard/ui/ui_multitageditor.py:57
-msgid "&Add..."
-msgstr ""
-
-#: ../picard/ui/ui_tageditor.py:118
-msgid "&Edit..."
-msgstr ""
-
-#: ../picard/ui/ui_tageditor.py:119
-msgid "&Delete"
-msgstr ""
-
-#: ../picard/ui/ui_tageditor.py:120
-msgid "&Metadata"
-msgstr ""
-
-#: ../picard/ui/ui_tageditor.py:121
-msgid "A&rtwork"
-msgstr ""
-
-#: ../picard/ui/ui_tageditor.py:122
-msgid "&Info"
-msgstr ""
-
-#: ../picard/ui/coverartbox.py:47
-msgid "Cover Art"
-msgstr ""
-
-#: ../picard/ui/coverartbox.py:95
-msgid "Buy the album on Amazon"
-msgstr ""
-
-#: ../picard/ui/ui_puidsubmit.py:52
-msgid "Submit PUIDs"
-msgstr ""
-
-#: ../picard/ui/ui_puidsubmit.py:53 ../picard/ui/ui_cdlookup.py:62
-msgid "OK"
-msgstr ""
-
-#: ../picard/ui/ui_puidsubmit.py:54 ../picard/ui/ui_cdlookup.py:64
-msgid "Cancel"
-msgstr ""
-
-#: ../picard/ui/puidsubmit.py:31 ../picard/ui/options/plugins.py:80
-msgid "File"
-msgstr ""
-
-#: ../picard/ui/puidsubmit.py:31
-msgid "PUID"
-msgstr ""
-
-#: ../picard/ui/puidsubmit.py:31
-msgid "Release"
-msgstr ""
-
-#: ../picard/ui/puidsubmit.py:31
-msgid "Release ID"
-msgstr ""
-
-#: ../picard/ui/filebrowser.py:41
-msgid "&Move Tagged Files Here"
-msgstr ""
-
-#: ../picard/ui/filebrowser.py:44
-msgid "Show &Hidden Files"
-msgstr ""
-
-#: ../picard/ui/ui_cdlookup.py:61
-msgid "The following releases on MusicBrainz match the CD:"
-msgstr ""
-
-#: ../picard/ui/ui_cdlookup.py:63
-msgid "    Lookup manually    "
-msgstr ""
-
-#: ../picard/ui/ui_options.py:42
-msgid "Options"
-msgstr ""
-
-#: ../picard/ui/tagsfromfilenames.py:52 ../picard/ui/tagsfromfilenames.py:96
-msgid "File Name"
-msgstr "Enw Ffeil"
-
-#: ../picard/ui/ui_options_cover.py:56
-msgid "Location"
-msgstr ""
-
-#: ../picard/ui/ui_options_cover.py:57
-msgid "Embed cover images into tags"
-msgstr ""
-
-#: ../picard/ui/ui_options_cover.py:58
-msgid "Save cover images as separate files"
-msgstr ""
-
-#: ../picard/ui/ui_options_cover.py:59
-msgid "Overwrite the file if it already exists"
-msgstr ""
-
-#: ../picard/ui/ui_options_metadata.py:100
-msgid "Metadata"
-msgstr ""
-
-#: ../picard/ui/ui_options_metadata.py:101
-msgid "Translate foreign artist names to English where possible"
-msgstr ""
-
-#: ../picard/ui/ui_options_metadata.py:102
-msgid "Use release relationships"
-msgstr ""
-
-#: ../picard/ui/ui_options_metadata.py:103
-msgid "Use track relationships"
-msgstr ""
-
-#: ../picard/ui/ui_options_metadata.py:104
-msgid "Use folksonomy tags as genre"
-msgstr ""
-
-#: ../picard/ui/ui_options_metadata.py:105
-msgid "Preferred release country:"
-msgstr ""
-
-#: ../picard/ui/ui_options_metadata.py:106
-msgid "Custom Fields"
-msgstr ""
-
-#: ../picard/ui/ui_options_metadata.py:107
-msgid "Various artists:"
-msgstr ""
-
-#: ../picard/ui/ui_options_metadata.py:108
-msgid "Non-album tracks:"
-msgstr ""
-
-#: ../picard/ui/ui_options_metadata.py:109
-#: ../picard/ui/ui_options_metadata.py:110
-#: ../picard/ui/ui_options_naming.py:168 ../picard/ui/ui_options_naming.py:169
-msgid "Default"
-msgstr ""
-
-#: ../picard/ui/ui_multitageditor.py:58
-msgid "Delete"
-msgstr ""
-
-#: ../picard/ui/logview.py:29
-msgid "Log"
-msgstr ""
-
-#: ../picard/ui/ui_options_plugins.py:58
-msgid "Plugins"
-msgstr ""
-
-#: ../picard/ui/ui_options_plugins.py:60 ../picard/ui/options/plugins.py:79
-msgid "Author"
-msgstr ""
-
-#: ../picard/ui/ui_options_plugins.py:61
-msgid "Version"
-msgstr ""
-
-#: ../picard/ui/ui_options_naming.py:165
-msgid "Rename Files"
-msgstr ""
-
-#: ../picard/ui/ui_options_naming.py:166
-msgid "Replace Windows-incompatible characters"
-msgstr ""
-
-#: ../picard/ui/ui_options_naming.py:167
-msgid "Replace non-ASCII characters"
-msgstr ""
-
-#: ../picard/ui/ui_options_naming.py:170 ../picard/ui/options/naming.py:90
-msgid "Multiple artist file naming format:"
-msgstr ""
-
-#: ../picard/ui/ui_options_naming.py:171 ../picard/ui/options/naming.py:86
-msgid "File naming format:"
-msgstr ""
-
-#: ../picard/ui/ui_options_naming.py:172
-msgid "Move Files"
-msgstr ""
-
-#: ../picard/ui/ui_options_naming.py:173
-msgid "Move tagged files to this directory:"
-msgstr ""
-
-#: ../picard/ui/ui_options_naming.py:174
-msgid "Browse..."
-msgstr ""
-
-#: ../picard/ui/ui_options_naming.py:175
-msgid "Move additional files:"
-msgstr ""
-
-#: ../picard/ui/ui_options_naming.py:176
-msgid "Delete empty directories"
-msgstr ""
-
-#: ../picard/ui/ui_options_naming.py:177
-msgid "Example"
-msgstr ""
-
-#: ../picard/ui/ui_options_naming.py:178
-msgid "File name:"
-msgstr ""
-
-#: ../picard/ui/ui_options_naming.py:179
-msgid "Multiple artist file name:"
-msgstr ""
-
-#: ../picard/ui/ui_options_cdlookup.py:48
-msgid "CD-ROM device to use for lookups:"
-msgstr ""
-
-#: ../picard/ui/options/scripting.py:84 ../picard/ui/options/naming.py:86
-#: ../picard/ui/options/naming.py:90 ../picard/ui/options/naming.py:93
-#: ../picard/ui/options/naming.py:95
-msgid "Script Error"
+#: ../picard/ui/options/about.py:29
+msgid "About"
 msgstr ""
 
 #. Replace this with your name to have it appear in the "About" dialog.
@@ -882,7 +2161,8 @@ msgstr ""
 msgid "translator-credits"
 msgstr ""
 "Launchpad Contributions:\n"
-"  tom.higgy https://launchpad.net/~higgy"
+"  tom.higgy https://launchpad.net/~higgy\n"
+"  Lukáš Lalinský https://launchpad.net/~luks"
 
 #. Replace LANG with language you are translatig to.
 #: ../picard/ui/options/about.py:51
@@ -893,22 +2173,56 @@ msgstr ""
 #: ../picard/ui/options/about.py:55
 #, python-format
 msgid ""
-"<p align=\"center\"><span style=\"font-size:15px;font-weight:bold;"
-"\">MusicBrainz Picard</span><br/>\n"
+"<p align=\"center\"><span style=\"font-size:15px;font-weight:bold;\">MusicBrainz Picard</span><br/>\n"
 "Version %(version)s</p>\n"
 "<p align=\"center\"><strong>Supported formats</strong><br/>%(formats)s</p>\n"
 "<p align=\"center\"><strong>Please donate</strong><br/>\n"
-"Thank you for using Picard. Picard relies on the MusicBrainz database, which "
-"is operated by the MetaBrainz Foundation with the help of thousands of "
-"volunteers. If you like this application please consider donating to the "
-"MetaBrainz Foundation to keep the service running.</p>\n"
-"<p align=\"center\"><a href=\"http://metabrainz.org/donate/index.html"
-"\">Donate now!</a></p>\n"
+"Thank you for using Picard. Picard relies on the MusicBrainz database, which is operated by the MetaBrainz Foundation with the help of thousands of volunteers. If you like this application please consider donating to the MetaBrainz Foundation to keep the service running.</p>\n"
+"<p align=\"center\"><a href=\"http://metabrainz.org/donate/index.html\">Donate now!</a></p>\n"
 "<p align=\"center\"><strong>Credits</strong><br/>\n"
-"<small>Copyright © 2004-2008 Robert Kaye, Lukáš Lalinský and others%"
-"(translator-credits)s</small></p>\n"
-"<p align=\"center\"><a href=\"http://musicbrainz.org/doc/PicardTagger"
-"\">http://musicbrainz.org/doc/PicardTagger</a></p>\n"
+"<small>Copyright © 2004-2008 Robert Kaye, Lukáš Lalinský and others%(translator-credits)s</small></p>\n"
+"<p align=\"center\"><a href=\"http://musicbrainz.org/doc/PicardTagger\">http://musicbrainz.org/doc/PicardTagger</a></p>\n"
+msgstr ""
+
+#: ../picard/ui/options/advanced.py:26
+msgid "Advanced"
+msgstr ""
+
+#: ../picard/ui/options/interface.py:31
+msgid "User Interface"
+msgstr ""
+
+#: ../picard/ui/options/interface.py:47
+msgid "System default"
+msgstr ""
+
+#: ../picard/ui/options/interface.py:71
+msgid "Language changed"
+msgstr ""
+
+#: ../picard/ui/options/interface.py:71
+msgid "You have changed the interface language. You have to restart Picard in order for the change to take effect."
+msgstr ""
+
+#: ../picard/ui/options/matching.py:29
+msgid "Matching"
+msgstr ""
+
+#: ../picard/ui/options/metadata.py:52
+msgid "None"
+msgstr ""
+
+#: ../picard/ui/options/naming.py:33
+#, fuzzy
+msgid "File Naming"
+msgstr "Enw Ffeil"
+
+#: ../picard/ui/options/naming.py:86
+#: ../picard/ui/options/naming.py:90
+#: ../picard/ui/options/naming.py:93
+#: ../picard/ui/options/naming.py:95
+#: ../picard/ui/options/scripting.py:84
+msgid "Script Error"
 msgstr ""
 
 #: ../picard/ui/options/naming.py:93
@@ -927,6 +2241,230 @@ msgstr ""
 msgid "The location to move files to must not be empty."
 msgstr ""
 
+#: ../picard/ui/options/scripting.py:63
+msgid "Scripting"
+msgstr ""
+
+#: ../picard/ui/options/tags.py:29
+msgid "Tags"
+msgstr ""
+
+#: ../picard/util/tags.py:24
+msgid "Date"
+msgstr ""
+
+#: ../picard/util/tags.py:25
+msgid "Album Artist"
+msgstr ""
+
+#: ../picard/util/tags.py:26
+msgid "Track Number"
+msgstr ""
+
+#: ../picard/util/tags.py:27
+msgid "Total Tracks"
+msgstr ""
+
+#: ../picard/util/tags.py:28
+msgid "Disc Number"
+msgstr ""
+
+#: ../picard/util/tags.py:29
+msgid "Total Discs"
+msgstr ""
+
+#: ../picard/util/tags.py:30
+msgid "Album Artist Sort Order"
+msgstr ""
+
+#: ../picard/util/tags.py:31
+msgid "Artist Sort Order"
+msgstr ""
+
+#: ../picard/util/tags.py:32
+msgid "Title Sort Order"
+msgstr ""
+
+#: ../picard/util/tags.py:33
+msgid "Album Sort Order"
+msgstr ""
+
+#: ../picard/util/tags.py:34
+msgid "ASIN"
+msgstr ""
+
+#: ../picard/util/tags.py:35
+msgid "Grouping"
+msgstr ""
+
+#: ../picard/util/tags.py:37
+msgid "ISRC"
+msgstr ""
+
+#: ../picard/util/tags.py:38
+msgid "Mood"
+msgstr ""
+
+#: ../picard/util/tags.py:39
+msgid "BPM"
+msgstr ""
+
+#: ../picard/util/tags.py:40
+msgid "Copyright"
+msgstr ""
+
+#: ../picard/util/tags.py:41
+msgid "Composer"
+msgstr ""
+
+#: ../picard/util/tags.py:42
+msgid "Conductor"
+msgstr ""
+
+#: ../picard/util/tags.py:43
+msgid "Lyricist"
+msgstr ""
+
+#: ../picard/util/tags.py:44
+msgid "Arranger"
+msgstr ""
+
+#: ../picard/util/tags.py:45
+msgid "Producer"
+msgstr ""
+
+#: ../picard/util/tags.py:46
+msgid "Engineer"
+msgstr ""
+
+#: ../picard/util/tags.py:47
+msgid "Subtitle"
+msgstr ""
+
+#: ../picard/util/tags.py:48
+msgid "Disc Subtitle"
+msgstr ""
+
+#: ../picard/util/tags.py:49
+msgid "Remixer"
+msgstr ""
+
+#: ../picard/util/tags.py:50
+msgid "MusicBrainz Track Id"
+msgstr ""
+
+#: ../picard/util/tags.py:51
+msgid "MusicBrainz Release Id"
+msgstr ""
+
+#: ../picard/util/tags.py:52
+msgid "MusicBrainz Artist Id"
+msgstr ""
+
+#: ../picard/util/tags.py:53
+msgid "MusicBrainz Release Artist Id"
+msgstr ""
+
+#: ../picard/util/tags.py:54
+msgid "MusicBrainz TRM Id"
+msgstr ""
+
+#: ../picard/util/tags.py:55
+msgid "MusicBrainz Disc Id"
+msgstr ""
+
+#: ../picard/util/tags.py:56
+msgid "MusicBrainz Sort Name"
+msgstr ""
+
+#: ../picard/util/tags.py:57
+msgid "MusicIP PUID"
+msgstr ""
+
+#: ../picard/util/tags.py:58
+msgid "MusicIP Fingerprint"
+msgstr ""
+
+#: ../picard/util/tags.py:59
+msgid "Disc Id"
+msgstr ""
+
+#: ../picard/util/tags.py:60
+msgid "Website"
+msgstr ""
+
+#: ../picard/util/tags.py:61
+msgid "Compilation"
+msgstr ""
+
+#: ../picard/util/tags.py:62
+msgid "Comment"
+msgstr ""
+
+#: ../picard/util/tags.py:63
+msgid "Genre"
+msgstr ""
+
+#: ../picard/util/tags.py:64
+msgid "Encoded By"
+msgstr ""
+
+#: ../picard/util/tags.py:65
+msgid "Performer"
+msgstr ""
+
+#: ../picard/util/tags.py:66
+msgid "Release Type"
+msgstr ""
+
+#: ../picard/util/tags.py:67
+msgid "Release Status"
+msgstr ""
+
+#: ../picard/util/tags.py:68
+msgid "Release Country"
+msgstr ""
+
+#: ../picard/util/tags.py:69
+msgid "Record Label"
+msgstr ""
+
+#: ../picard/util/tags.py:70
+msgid "Barcode"
+msgstr ""
+
+#: ../picard/util/tags.py:71
+msgid "Catalog Number"
+msgstr ""
+
+#: ../picard/util/tags.py:72
+msgid "Format"
+msgstr ""
+
+#: ../picard/util/tags.py:73
+msgid "DJ-Mixer"
+msgstr ""
+
+#: ../picard/util/tags.py:74
+msgid "Media"
+msgstr ""
+
+#: ../picard/util/tags.py:75
+msgid "Lyrics"
+msgstr ""
+
+#: ../picard/util/tags.py:76
+msgid "Mixer"
+msgstr ""
+
+#: ../picard/util/tags.py:77
+msgid "Language"
+msgstr ""
+
+#: ../picard/util/tags.py:78
+msgid "Script"
+msgstr ""
+
 #: ../picard/util/webbrowser2.py:84
 msgid "Web Browser Error"
 msgstr ""
@@ -938,3 +2476,4 @@ msgid ""
 "\n"
 "%s"
 msgstr ""
+
diff --git a/po/da.po b/po/da.po
index 6f941bce3..171f08615 100644
--- a/po/da.po
+++ b/po/da.po
@@ -7,35 +7,1327 @@ msgid ""
 msgstr ""
 "Project-Id-Version: picard\n"
 "Report-Msgid-Bugs-To: http://bugs.musicbrainz.org/\n"
-"POT-Creation-Date: 2008-12-01 18:20+0100\n"
-"PO-Revision-Date: 2008-08-07 13:42+0000\n"
-"Last-Translator: Frederik 'Freso' S. Olesen <Unknown>\n"
+"POT-Creation-Date: 2009-01-25 12:23+0100\n"
+"PO-Revision-Date: 2009-01-25 13:01+0100\n"
+"Last-Translator: Philipp Wolfer <phw@rubyforge.org>\n"
 "Language-Team: Danish <da@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2008-12-01 17:01+0000\n"
+"X-Launchpad-Export-Date: 2009-01-24 23:28+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
-#: ../picard/album.py:108 ../picard/cluster.py:248
+#: ../picard/album.py:108
+#: ../picard/cluster.py:248
 msgid "Unmatched Files"
 msgstr "ikke-matchede filer"
 
-#: ../picard/album.py:269
+#: ../picard/album.py:281
 #, python-format
 msgid "[couldn't load album %s]"
 msgstr "[kunne ikke hente albummet %s]"
 
-#: ../picard/album.py:305
+#: ../picard/album.py:317
 msgid "[loading album information]"
 msgstr "[henter albuminformation]"
 
-#: ../picard/tagger.py:472
+#: ../picard/cluster.py:164
+#: ../picard/cluster.py:175
+#, python-format
+msgid "No matching releases for cluster %s"
+msgstr "Ingen passende udgivelser for klyngen \"%s\""
+
+#: ../picard/cluster.py:177
+#, python-format
+msgid "Cluster %s identified!"
+msgstr "Klyngen %s identificeret!"
+
+#: ../picard/cluster.py:182
+#, python-format
+msgid "Looking up the metadata for cluster %s..."
+msgstr "Slår metadata for klyngen %s op..."
+
+#: ../picard/const.py:40
+msgid "CD"
+msgstr ""
+
+#: ../picard/const.py:41
+msgid "DVD"
+msgstr ""
+
+#: ../picard/const.py:42
+msgid "SACD"
+msgstr ""
+
+#: ../picard/const.py:43
+msgid "LaserDisc"
+msgstr ""
+
+#: ../picard/const.py:44
+msgid "MiniDisc"
+msgstr ""
+
+#: ../picard/const.py:45
+msgid "Vinyl"
+msgstr ""
+
+#: ../picard/const.py:46
+msgid "Cassette"
+msgstr ""
+
+#: ../picard/const.py:47
+msgid "Cartridge (4/8-tracks)"
+msgstr ""
+
+#: ../picard/const.py:48
+msgid "Reel-to-Reel"
+msgstr ""
+
+#: ../picard/const.py:49
+msgid "DAT"
+msgstr ""
+
+#: ../picard/const.py:50
+#, fuzzy
+msgid "Digital Media"
+msgstr "Oprindelig metadata"
+
+#: ../picard/const.py:51
+msgid "Wax Cylinder"
+msgstr ""
+
+#: ../picard/const.py:52
+msgid "Piano Roll"
+msgstr ""
+
+#: ../picard/const.py:53
+#, fuzzy
+msgid "Other"
+msgstr "Senere"
+
+#: ../picard/const.py:58
+msgid "Bangladesh"
+msgstr ""
+
+#: ../picard/const.py:59
+msgid "Belgium"
+msgstr ""
+
+#: ../picard/const.py:60
+msgid "Burkina Faso"
+msgstr ""
+
+#: ../picard/const.py:61
+#, fuzzy
+msgid "Bulgaria"
+msgstr "Ungarsk"
+
+#: ../picard/const.py:62
+msgid "Barbados"
+msgstr ""
+
+#: ../picard/const.py:63
+msgid "Wallis and Futuna Islands"
+msgstr ""
+
+#: ../picard/const.py:64
+#, fuzzy
+msgid "Bermuda"
+msgstr "Tysk"
+
+#: ../picard/const.py:65
+msgid "Brunei Darussalam"
+msgstr ""
+
+#: ../picard/const.py:66
+msgid "Bolivia"
+msgstr ""
+
+#: ../picard/const.py:67
+msgid "Bahrain"
+msgstr ""
+
+#: ../picard/const.py:68
+msgid "Burundi"
+msgstr ""
+
+#: ../picard/const.py:69
+msgid "Benin"
+msgstr ""
+
+#: ../picard/const.py:70
+msgid "Bhutan"
+msgstr ""
+
+#: ../picard/const.py:71
+msgid "Jamaica"
+msgstr ""
+
+#: ../picard/const.py:72
+msgid "Bouvet Island"
+msgstr ""
+
+#: ../picard/const.py:73
+msgid "Botswana"
+msgstr ""
+
+#: ../picard/const.py:74
+msgid "Samoa"
+msgstr ""
+
+#: ../picard/const.py:75
+msgid "Brazil"
+msgstr ""
+
+#: ../picard/const.py:76
+msgid "Bahamas"
+msgstr ""
+
+#: ../picard/const.py:77
+msgid "Belarus"
+msgstr ""
+
+#: ../picard/const.py:78
+msgid "Belize"
+msgstr ""
+
+#: ../picard/const.py:79
+msgid "Russian Federation"
+msgstr ""
+
+#: ../picard/const.py:80
+msgid "Rwanda"
+msgstr ""
+
+#: ../picard/const.py:81
+msgid "Reunion"
+msgstr ""
+
+#: ../picard/const.py:82
+msgid "Turkmenistan"
+msgstr ""
+
+#: ../picard/const.py:83
+msgid "Tajikistan"
+msgstr ""
+
+#: ../picard/const.py:84
+#, fuzzy
+msgid "Romania"
+msgstr "Rumænsk"
+
+#: ../picard/const.py:85
+#, fuzzy
+msgid "Tokela"
+msgstr "Funk&tioner"
+
+#: ../picard/const.py:86
+msgid "Guinea-Bissa"
+msgstr ""
+
+#: ../picard/const.py:87
+msgid "Guam"
+msgstr ""
+
+#: ../picard/const.py:88
+msgid "Guatemala"
+msgstr ""
+
+#: ../picard/const.py:89
+msgid "Greece"
+msgstr ""
+
+#: ../picard/const.py:90
+msgid "Equatorial Guinea"
+msgstr ""
+
+#: ../picard/const.py:91
+msgid "Guadeloupe"
+msgstr ""
+
+#: ../picard/const.py:92
+msgid "Japan"
+msgstr ""
+
+#: ../picard/const.py:93
+msgid "Guyana"
+msgstr ""
+
+#: ../picard/const.py:94
+#, fuzzy
+msgid "French Guiana"
+msgstr "Fransk"
+
+#: ../picard/const.py:95
+#, fuzzy
+msgid "Georgia"
+msgstr "Tysk"
+
+#: ../picard/const.py:96
+msgid "Grenada"
+msgstr ""
+
+#: ../picard/const.py:97
+msgid "United Kingdom"
+msgstr ""
+
+#: ../picard/const.py:98
+msgid "Gabon"
+msgstr ""
+
+#: ../picard/const.py:99
+msgid "El Salvador"
+msgstr ""
+
+#: ../picard/const.py:100
+#, fuzzy
+msgid "Guinea"
+msgstr "Generelt"
+
+#: ../picard/const.py:101
+msgid "Gambia"
+msgstr ""
+
+#: ../picard/const.py:102
+msgid "Greenland"
+msgstr ""
+
+#: ../picard/const.py:103
+msgid "Gibraltar"
+msgstr ""
+
+#: ../picard/const.py:104
+msgid "Ghana"
+msgstr ""
+
+#: ../picard/const.py:105
+#, fuzzy
+msgid "Oman"
+msgstr "Tysk"
+
+#: ../picard/const.py:106
+msgid "Tunisia"
+msgstr ""
+
+#: ../picard/const.py:107
+#, fuzzy
+msgid "Jordan"
+msgstr "Koreansk"
+
+#: ../picard/const.py:108
+msgid "Haiti"
+msgstr ""
+
+#: ../picard/const.py:109
+#, fuzzy
+msgid "Hungary"
+msgstr "Ungarsk"
+
+#: ../picard/const.py:110
+msgid "Hong Kong"
+msgstr ""
+
+#: ../picard/const.py:111
+msgid "Honduras"
+msgstr ""
+
+#: ../picard/const.py:112
+msgid "Heard and Mc Donald Islands"
+msgstr ""
+
+#: ../picard/const.py:113
+msgid "Venezuela"
+msgstr ""
+
+#: ../picard/const.py:114
+msgid "Puerto Rico"
+msgstr ""
+
+#: ../picard/const.py:115
+msgid "Pala"
+msgstr ""
+
+#: ../picard/const.py:116
+#, fuzzy
+msgid "Portugal"
+msgstr "Portugisisk"
+
+#: ../picard/const.py:117
+msgid "Svalbard and Jan Mayen Islands"
+msgstr ""
+
+#: ../picard/const.py:118
+msgid "Paraguay"
+msgstr ""
+
+#: ../picard/const.py:119
+msgid "Iraq"
+msgstr ""
+
+#: ../picard/const.py:120
+msgid "Panama"
+msgstr ""
+
+#: ../picard/const.py:121
+msgid "French Polynesia"
+msgstr ""
+
+#: ../picard/const.py:122
+msgid "Papua New Guinea"
+msgstr ""
+
+#: ../picard/const.py:123
+msgid "Per"
+msgstr ""
+
+#: ../picard/const.py:124
+msgid "Pakistan"
+msgstr ""
+
+#: ../picard/const.py:125
+msgid "Philippines"
+msgstr ""
+
+#: ../picard/const.py:126
+msgid "Pitcairn"
+msgstr ""
+
+#: ../picard/const.py:127
+msgid "Poland"
+msgstr ""
+
+#: ../picard/const.py:128
+msgid "St. Pierre and Miquelon"
+msgstr ""
+
+#: ../picard/const.py:129
+msgid "Zambia"
+msgstr ""
+
+#: ../picard/const.py:130
+msgid "Western Sahara"
+msgstr ""
+
+#: ../picard/const.py:131
+msgid "Estonia"
+msgstr ""
+
+#: ../picard/const.py:132
+msgid "Egypt"
+msgstr ""
+
+#: ../picard/const.py:133
+msgid "South Africa"
+msgstr ""
+
+#: ../picard/const.py:134
+msgid "Ecuador"
+msgstr ""
+
+#: ../picard/const.py:135
+#, fuzzy
+msgid "Italy"
+msgstr "Italiensk"
+
+#: ../picard/const.py:136
+#, fuzzy
+msgid "Viet Nam"
+msgstr "Filnavn"
+
+#: ../picard/const.py:137
+msgid "Solomon Islands"
+msgstr ""
+
+#: ../picard/const.py:138
+msgid "Ethiopia"
+msgstr ""
+
+#: ../picard/const.py:139
+#, fuzzy
+msgid "Somalia"
+msgstr "Rumænsk"
+
+#: ../picard/const.py:140
+msgid "Zimbabwe"
+msgstr ""
+
+#: ../picard/const.py:141
+msgid "Saudi Arabia"
+msgstr ""
+
+#: ../picard/const.py:142
+#, fuzzy
+msgid "Spain"
+msgstr "Spansk"
+
+#: ../picard/const.py:143
+msgid "Eritrea"
+msgstr ""
+
+#: ../picard/const.py:144
+msgid "Moldova, Republic of"
+msgstr ""
+
+#: ../picard/const.py:145
+msgid "Madagascar"
+msgstr ""
+
+#: ../picard/const.py:146
+msgid "Morocco"
+msgstr ""
+
+#: ../picard/const.py:147
+#, fuzzy
+msgid "Monaco"
+msgstr "Mono"
+
+#: ../picard/const.py:148
+msgid "Uzbekistan"
+msgstr ""
+
+#: ../picard/const.py:149
+msgid "Myanmar"
+msgstr ""
+
+#: ../picard/const.py:150
+msgid "Mali"
+msgstr ""
+
+#: ../picard/const.py:151
+msgid "Maca"
+msgstr ""
+
+#: ../picard/const.py:152
+#, fuzzy
+msgid "Mongolia"
+msgstr "Mono"
+
+#: ../picard/const.py:153
+msgid "Marshall Islands"
+msgstr ""
+
+#: ../picard/const.py:154
+msgid "Macedonia, The Former Yugoslav Republic of"
+msgstr ""
+
+#: ../picard/const.py:155
+msgid "Mauritius"
+msgstr ""
+
+#: ../picard/const.py:156
+#, fuzzy
+msgid "Malta"
+msgstr "Metadata"
+
+#: ../picard/const.py:157
+msgid "Malawi"
+msgstr ""
+
+#: ../picard/const.py:158
+msgid "Maldives"
+msgstr ""
+
+#: ../picard/const.py:159
+msgid "Martinique"
+msgstr ""
+
+#: ../picard/const.py:160
+msgid "Northern Mariana Islands"
+msgstr ""
+
+#: ../picard/const.py:161
+msgid "Montserrat"
+msgstr ""
+
+#: ../picard/const.py:162
+#, fuzzy
+msgid "Mauritania"
+msgstr "Litausk"
+
+#: ../picard/const.py:163
+msgid "Uganda"
+msgstr ""
+
+#: ../picard/const.py:164
+msgid "Malaysia"
+msgstr ""
+
+#: ../picard/const.py:165
+msgid "Mexico"
+msgstr ""
+
+#: ../picard/const.py:166
+msgid "Israel"
+msgstr ""
+
+#: ../picard/const.py:167
+#, fuzzy
+msgid "France"
+msgstr "Annuller"
+
+#: ../picard/const.py:168
+msgid "British Indian Ocean Territory"
+msgstr ""
+
+#: ../picard/const.py:169
+msgid "St. Helena"
+msgstr ""
+
+#: ../picard/const.py:170
+msgid "Finland"
+msgstr ""
+
+#: ../picard/const.py:171
+msgid "Fiji"
+msgstr ""
+
+#: ../picard/const.py:172
+msgid "Falkland Islands (Malvinas)"
+msgstr ""
+
+#: ../picard/const.py:173
+msgid "Micronesia, Federated States of"
+msgstr ""
+
+#: ../picard/const.py:174
+msgid "Faroe Islands"
+msgstr ""
+
+#: ../picard/const.py:175
+msgid "Nicaragua"
+msgstr ""
+
+#: ../picard/const.py:176
+msgid "Netherlands"
+msgstr ""
+
+#: ../picard/const.py:177
+msgid "Norway"
+msgstr ""
+
+#: ../picard/const.py:178
+msgid "Namibia"
+msgstr ""
+
+#: ../picard/const.py:179
+msgid "Vanuat"
+msgstr ""
+
+#: ../picard/const.py:180
+msgid "New Caledonia"
+msgstr ""
+
+#: ../picard/const.py:181
+#, fuzzy
+msgid "Niger"
+msgstr "Mixer"
+
+#: ../picard/const.py:182
+msgid "Norfolk Island"
+msgstr ""
+
+#: ../picard/const.py:183
+msgid "Nigeria"
+msgstr ""
+
+#: ../picard/const.py:184
+#, fuzzy
+msgid "New Zealand"
+msgstr "Ny metadata"
+
+#: ../picard/const.py:185
+msgid "Zaire"
+msgstr ""
+
+#: ../picard/const.py:186
+msgid "Nepal"
+msgstr ""
+
+#: ../picard/const.py:187
+msgid "Naur"
+msgstr ""
+
+#: ../picard/const.py:188
+msgid "Niue"
+msgstr ""
+
+#: ../picard/const.py:189
+msgid "Cook Islands"
+msgstr ""
+
+#: ../picard/const.py:190
+msgid "Cote d'Ivoire"
+msgstr ""
+
+#: ../picard/const.py:191
+msgid "Switzerland"
+msgstr ""
+
+#: ../picard/const.py:192
+msgid "Colombia"
+msgstr ""
+
+#: ../picard/const.py:193
+msgid "China"
+msgstr ""
+
+#: ../picard/const.py:194
+msgid "Cameroon"
+msgstr ""
+
+#: ../picard/const.py:195
+#, fuzzy
+msgid "Chile"
+msgstr "Fil"
+
+#: ../picard/const.py:196
+msgid "Cocos (Keeling) Islands"
+msgstr ""
+
+#: ../picard/const.py:197
+msgid "Canada"
+msgstr ""
+
+#: ../picard/const.py:198
+#, fuzzy
+msgid "Congo"
+msgstr "Mono"
+
+#: ../picard/const.py:199
+msgid "Central African Republic"
+msgstr ""
+
+#: ../picard/const.py:200
+msgid "Czech Republic"
+msgstr ""
+
+#: ../picard/const.py:201
+msgid "Cyprus"
+msgstr ""
+
+#: ../picard/const.py:202
+msgid "Christmas Island"
+msgstr ""
+
+#: ../picard/const.py:203
+msgid "Costa Rica"
+msgstr ""
+
+#: ../picard/const.py:204
+msgid "Cape Verde"
+msgstr ""
+
+#: ../picard/const.py:205
+msgid "Cuba"
+msgstr ""
+
+#: ../picard/const.py:206
+msgid "Swaziland"
+msgstr ""
+
+#: ../picard/const.py:207
+msgid "Syrian Arab Republic"
+msgstr ""
+
+#: ../picard/const.py:208
+msgid "Kyrgyzstan"
+msgstr ""
+
+#: ../picard/const.py:209
+msgid "Kenya"
+msgstr ""
+
+#: ../picard/const.py:210
+msgid "Suriname"
+msgstr ""
+
+#: ../picard/const.py:211
+msgid "Kiribati"
+msgstr ""
+
+#: ../picard/const.py:212
+msgid "Cambodia"
+msgstr ""
+
+#: ../picard/const.py:213
+msgid "Saint Kitts and Nevis"
+msgstr ""
+
+#: ../picard/const.py:214
+#, fuzzy
+msgid "Comoros"
+msgstr "Farver"
+
+#: ../picard/const.py:215
+msgid "Sao Tome and Principe"
+msgstr ""
+
+#: ../picard/const.py:216
+#, fuzzy
+msgid "Slovenia"
+msgstr "Slovensk"
+
+#: ../picard/const.py:217
+msgid "Kuwait"
+msgstr ""
+
+#: ../picard/const.py:218
+#, fuzzy
+msgid "Senegal"
+msgstr "Generelt"
+
+#: ../picard/const.py:219
+msgid "San Marino"
+msgstr ""
+
+#: ../picard/const.py:220
+msgid "Sierra Leone"
+msgstr ""
+
+#: ../picard/const.py:221
+msgid "Seychelles"
+msgstr ""
+
+#: ../picard/const.py:222
+msgid "Kazakhstan"
+msgstr ""
+
+#: ../picard/const.py:223
+msgid "Cayman Islands"
+msgstr ""
+
+#: ../picard/const.py:224
+msgid "Singapore"
+msgstr ""
+
+#: ../picard/const.py:225
+#, fuzzy
+msgid "Sweden"
+msgstr "Svensk"
+
+#: ../picard/const.py:226
+#, fuzzy
+msgid "Sudan"
+msgstr "&Skan"
+
+#: ../picard/const.py:227
+msgid "Dominican Republic"
+msgstr ""
+
+#: ../picard/const.py:228
+#, fuzzy
+msgid "Dominica"
+msgstr "Rumænsk"
+
+#: ../picard/const.py:229
+#, fuzzy
+msgid "Djibouti"
+msgstr "Om"
+
+#: ../picard/const.py:230
+msgid "Denmark"
+msgstr ""
+
+#: ../picard/const.py:231
+msgid "Virgin Islands (British)"
+msgstr ""
+
+#: ../picard/const.py:232
+#, fuzzy
+msgid "Germany"
+msgstr "Tysk"
+
+#: ../picard/const.py:233
+msgid "Yemen"
+msgstr ""
+
+#: ../picard/const.py:234
+msgid "Algeria"
+msgstr ""
+
+#: ../picard/const.py:235
+msgid "United States"
+msgstr ""
+
+#: ../picard/const.py:236
+msgid "Uruguay"
+msgstr ""
+
+#: ../picard/const.py:237
+msgid "Mayotte"
+msgstr ""
+
+#: ../picard/const.py:238
+msgid "United States Minor Outlying Islands"
+msgstr ""
+
+#: ../picard/const.py:239
+msgid "Lebanon"
+msgstr ""
+
+#: ../picard/const.py:240
+msgid "Saint Lucia"
+msgstr ""
+
+#: ../picard/const.py:241
+msgid "Lao People's Democratic Republic"
+msgstr ""
+
+#: ../picard/const.py:242
+msgid "Tuval"
+msgstr ""
+
+#: ../picard/const.py:243
+#, fuzzy
+msgid "Taiwan"
+msgstr "Italiensk"
+
+#: ../picard/const.py:244
+msgid "Trinidad and Tobago"
+msgstr ""
+
+#: ../picard/const.py:245
+msgid "Turkey"
+msgstr ""
+
+#: ../picard/const.py:246
+msgid "Sri Lanka"
+msgstr ""
+
+#: ../picard/const.py:247
+msgid "Liechtenstein"
+msgstr ""
+
+#: ../picard/const.py:248
+msgid "Latvia"
+msgstr ""
+
+#: ../picard/const.py:249
+msgid "Tonga"
+msgstr ""
+
+#: ../picard/const.py:250
+#, fuzzy
+msgid "Lithuania"
+msgstr "Litausk"
+
+#: ../picard/const.py:251
+msgid "Luxembourg"
+msgstr ""
+
+#: ../picard/const.py:252
+msgid "Liberia"
+msgstr ""
+
+#: ../picard/const.py:253
+#, fuzzy
+msgid "Lesotho"
+msgstr "Længde"
+
+#: ../picard/const.py:254
+msgid "Thailand"
+msgstr ""
+
+#: ../picard/const.py:255
+msgid "French Southern Territories"
+msgstr ""
+
+#: ../picard/const.py:256
+#, fuzzy
+msgid "Togo"
+msgstr "Funk&tioner"
+
+#: ../picard/const.py:257
+msgid "Chad"
+msgstr ""
+
+#: ../picard/const.py:258
+msgid "Turks and Caicos Islands"
+msgstr ""
+
+#: ../picard/const.py:259
+msgid "Libyan Arab Jamahiriya"
+msgstr ""
+
+#: ../picard/const.py:260
+msgid "Vatican City State (Holy See)"
+msgstr ""
+
+#: ../picard/const.py:261
+msgid "Saint Vincent and The Grenadines"
+msgstr ""
+
+#: ../picard/const.py:262
+msgid "United Arab Emirates"
+msgstr ""
+
+#: ../picard/const.py:263
+msgid "Andorra"
+msgstr ""
+
+#: ../picard/const.py:264
+msgid "Antigua and Barbuda"
+msgstr ""
+
+#: ../picard/const.py:265
+msgid "Afghanistan"
+msgstr ""
+
+#: ../picard/const.py:266
+msgid "Anguilla"
+msgstr ""
+
+#: ../picard/const.py:267
+msgid "Virgin Islands (U.S.)"
+msgstr ""
+
+#: ../picard/const.py:268
+#, fuzzy
+msgid "Iceland"
+msgstr "Islandsk"
+
+#: ../picard/const.py:269
+msgid "Iran (Islamic Republic of)"
+msgstr ""
+
+#: ../picard/const.py:270
+msgid "Armenia"
+msgstr ""
+
+#: ../picard/const.py:271
+msgid "Albania"
+msgstr ""
+
+#: ../picard/const.py:272
+msgid "Angola"
+msgstr ""
+
+#: ../picard/const.py:273
+msgid "Netherlands Antilles"
+msgstr ""
+
+#: ../picard/const.py:274
+msgid "Antarctica"
+msgstr ""
+
+#: ../picard/const.py:275
+msgid "American Samoa"
+msgstr ""
+
+#: ../picard/const.py:276
+msgid "Argentina"
+msgstr ""
+
+#: ../picard/const.py:277
+#, fuzzy
+msgid "Australia"
+msgstr "Italiensk"
+
+#: ../picard/const.py:278
+#, fuzzy
+msgid "Austria"
+msgstr "Forfatter"
+
+#: ../picard/const.py:279
+msgid "Aruba"
+msgstr ""
+
+#: ../picard/const.py:280
+#, fuzzy
+msgid "India"
+msgstr "Medie"
+
+#: ../picard/const.py:281
+msgid "Tanzania, United Republic of"
+msgstr ""
+
+#: ../picard/const.py:282
+msgid "Azerbaijan"
+msgstr ""
+
+#: ../picard/const.py:283
+#, fuzzy
+msgid "Ireland"
+msgstr "Islandsk"
+
+#: ../picard/const.py:284
+msgid "Indonesia"
+msgstr ""
+
+#: ../picard/const.py:285
+msgid "Ukraine"
+msgstr ""
+
+#: ../picard/const.py:286
+#, fuzzy
+msgid "Qatar"
+msgstr "Senere"
+
+#: ../picard/const.py:287
+msgid "Mozambique"
+msgstr ""
+
+#: ../picard/const.py:288
+msgid "Bosnia and Herzegovina"
+msgstr ""
+
+#: ../picard/const.py:289
+msgid "Congo, The Democratic Republic of the"
+msgstr ""
+
+#: ../picard/const.py:290
+msgid "Serbia and Montenegro"
+msgstr ""
+
+#: ../picard/const.py:291
+msgid "Croatia"
+msgstr ""
+
+#: ../picard/const.py:292
+msgid "Korea (North), Democratic People's Republic of"
+msgstr ""
+
+#: ../picard/const.py:293
+msgid "Korea (South), Republic of"
+msgstr ""
+
+#: ../picard/const.py:294
+#, fuzzy
+msgid "Slovakia"
+msgstr "Slovensk"
+
+#: ../picard/const.py:295
+msgid "Soviet Union (historical, 1922-1991)"
+msgstr ""
+
+#: ../picard/const.py:296
+msgid "East Timor"
+msgstr ""
+
+#: ../picard/const.py:297
+msgid "Czechoslovakia (historical, 1918-1992)"
+msgstr ""
+
+#: ../picard/const.py:298
+msgid "Europe"
+msgstr ""
+
+#: ../picard/const.py:299
+msgid "East Germany (historical, 1949-1990)"
+msgstr ""
+
+#: ../picard/const.py:300
+msgid "[Unknown Country]"
+msgstr ""
+
+#: ../picard/const.py:301
+msgid "[Worldwide]"
+msgstr ""
+
+#: ../picard/const.py:302
+msgid "Yugoslavia (historical, 1918-1992)"
+msgstr ""
+
+#: ../picard/const.py:307
+#, fuzzy
+msgid "Catalan"
+msgstr "Italiensk"
+
+#: ../picard/const.py:308
+msgid "Czech"
+msgstr "Tjekkisk"
+
+#: ../picard/const.py:309
+msgid "Welsh"
+msgstr ""
+
+#: ../picard/const.py:310
+#, fuzzy
+msgid "Danish"
+msgstr "Spansk"
+
+#: ../picard/const.py:311
+msgid "German"
+msgstr "Tysk"
+
+#: ../picard/const.py:312
+msgid "English"
+msgstr "Engelsk"
+
+#: ../picard/const.py:313
+#, fuzzy
+msgid "English (Canada)"
+msgstr "Engelsk"
+
+#: ../picard/const.py:314
+#, fuzzy
+msgid "English (UK)"
+msgstr "Engelsk"
+
+#: ../picard/const.py:315
+msgid "Spanish"
+msgstr "Spansk"
+
+#: ../picard/const.py:316
+#, fuzzy
+msgid "Persian"
+msgstr "Version"
+
+#: ../picard/const.py:317
+msgid "Finnish"
+msgstr "Finsk"
+
+#: ../picard/const.py:318
+msgid "French"
+msgstr "Fransk"
+
+#: ../picard/const.py:319
+msgid "Frisian"
+msgstr ""
+
+#: ../picard/const.py:320
+msgid "Hebrew"
+msgstr ""
+
+#: ../picard/const.py:321
+msgid "Hungarian"
+msgstr "Ungarsk"
+
+#: ../picard/const.py:322
+#, fuzzy
+msgid "Islandic"
+msgstr "Islandsk"
+
+#: ../picard/const.py:323
+msgid "Italian"
+msgstr "Italiensk"
+
+#: ../picard/const.py:324
+msgid "Kannada"
+msgstr ""
+
+#: ../picard/const.py:325
+#, fuzzy
+msgid "Korean"
+msgstr "Koreansk"
+
+#: ../picard/const.py:326
+#, fuzzy
+msgid "Lithuanian"
+msgstr "Litausk"
+
+#: ../picard/const.py:327
+#, fuzzy
+msgid "Norwegian Bokmal"
+msgstr "Norsk Bokmål"
+
+#: ../picard/const.py:328
+msgid "Dutch"
+msgstr "Hollandsk"
+
+#: ../picard/const.py:329
+#, fuzzy
+msgid "Polish"
+msgstr "Udvidelsesmoduler"
+
+#: ../picard/const.py:330
+msgid "Portuguese"
+msgstr "Portugisisk"
+
+#: ../picard/const.py:331
+#, fuzzy
+msgid "Brazilian Portuguese"
+msgstr "Portugisisk"
+
+#: ../picard/const.py:332
+#, fuzzy
+msgid "Romanian"
+msgstr "Rumænsk"
+
+#: ../picard/const.py:333
+msgid "Russian"
+msgstr "Russisk"
+
+#: ../picard/const.py:334
+#, fuzzy
+msgid "Scots"
+msgstr "Point"
+
+#: ../picard/const.py:335
+#, fuzzy
+msgid "Slovak"
+msgstr "Slovensk"
+
+#: ../picard/const.py:336
+#, fuzzy
+msgid "Slovenian"
+msgstr "Slovensk"
+
+#: ../picard/const.py:337
+msgid "Swedish"
+msgstr "Svensk"
+
+#: ../picard/const.py:338
+#, fuzzy
+msgid "Chinese"
+msgstr "Kanaler:"
+
+#: ../picard/file.py:475
+#, python-format
+msgid "No matching tracks for file %s"
+msgstr "Ingen matchende skæringer for fil %s"
+
+#: ../picard/file.py:492
+#, fuzzy, python-format
+msgid "No matching tracks above the threshold for file %s"
+msgstr "Ingen matchende skæringer for fil %s"
+
+#: ../picard/file.py:495
+#, python-format
+msgid "File %s identified!"
+msgstr "Filen %s identificeret!"
+
+#: ../picard/file.py:506
+#, python-format
+msgid "Looking up the PUID for file %s..."
+msgstr "Slår PUID til filen %s op..."
+
+#: ../picard/file.py:511
+#, python-format
+msgid "Looking up the metadata for file %s..."
+msgstr "Slår metadata for filen %s op..."
+
+#: ../picard/puidmanager.py:58
+msgid "Submitting PUIDs..."
+msgstr "Sender PUID'er..."
+
+#: ../picard/puidmanager.py:64
+#, python-format
+msgid "PUIDs submission failed: %s"
+msgstr "Fejl ved sending af PUID'er: %s"
+
+#: ../picard/puidmanager.py:66
+msgid "PUIDs successfully submitted!"
+msgstr "PUID'er blev sendt!"
+
+#: ../picard/playlist.py:31
+msgid "M3U Playlist (*.m3u)"
+msgstr "M3U-spilleliste (*.m3u)"
+
+#: ../picard/playlist.py:32
+msgid "PLS Playlist (*.pls)"
+msgstr "PLS-spilleliste (*.pls)"
+
+#: ../picard/playlist.py:33
+msgid "XSPF Playlist (*.xspf)"
+msgstr "XSPF-spilleliste (*.xspf)"
+
+#: ../picard/tagger.py:476
 msgid "CD Lookup Error"
 msgstr "Fejl under cd-opslag"
 
-#: ../picard/tagger.py:473
+#: ../picard/tagger.py:477
 #, python-format
 msgid ""
 "Error while reading CD:\n"
@@ -46,126 +1338,175 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../picard/ui/passworddialog.py:38
+#: ../picard/tagger.py:503
 #, python-format
-msgid ""
-"The server %s requires you to login. Please enter your username and password."
-msgstr ""
+msgid "Couldn't find PUID for file %s"
+msgstr "Kunne ikke finde PUID for filen %s"
 
-#: ../picard/ui/ui_options_script.py:52
-msgid "Tagger Script"
-msgstr "Taggerscript"
+#: ../picard/musicdns/__init__.py:98
+#, python-format
+msgid "Looking up the fingerprint for file %s..."
+msgstr "Slår fingeraftrykket for filen %s op..."
+
+#: ../picard/musicdns/__init__.py:117
+#, python-format
+msgid "Creating fingerprint for file %s..."
+msgstr "Opretter fingeraftrik for filen %s..."
 
 #: ../picard/ui/cdlookup.py:31
 msgid "Score"
 msgstr "Point"
 
 #: ../picard/ui/cdlookup.py:31
+#: ../picard/ui/itemviews.py:82
+#: ../picard/util/tags.py:23
 msgid "Title"
 msgstr "Titel"
 
-#: ../picard/ui/cdlookup.py:31 ../picard/ui/mainwindow.py:436
+#: ../picard/ui/cdlookup.py:31
+#: ../picard/ui/itemviews.py:84
+#: ../picard/ui/mainwindow.py:436
+#: ../picard/util/tags.py:22
 msgid "Artist"
 msgstr "Kunstner"
 
-#: ../picard/ui/ui_metadata.py:121
-msgid "Lookup"
-msgstr "Slå op"
+#: ../picard/ui/coverartbox.py:47
+#: ../picard/ui/options/cover.py:29
+msgid "Cover Art"
+msgstr "Omslag"
 
-#: ../picard/ui/ui_metadata.py:122
-msgid "Title:"
-msgstr "Titel:"
+#: ../picard/ui/coverartbox.py:95
+msgid "Buy the album on Amazon"
+msgstr "Køb albummet på Amazon"
 
-#: ../picard/ui/ui_metadata.py:123
-msgid "Date:"
-msgstr "Dato:"
+#: ../picard/ui/filebrowser.py:38
+#: ../picard/ui/mainwindow.py:302
+msgid "&Refresh"
+msgstr ""
 
-#: ../picard/ui/ui_metadata.py:124
-msgid "Artist:"
-msgstr "Kunstner:"
+#: ../picard/ui/filebrowser.py:41
+#, fuzzy
+msgid "&Move Tagged Files Here"
+msgstr "Flyt taggede filer til denne mappe:"
 
-#: ../picard/ui/ui_metadata.py:125
-msgid "Track:"
-msgstr "Skæring:"
+#: ../picard/ui/filebrowser.py:44
+msgid "Show &Hidden Files"
+msgstr ""
 
-#: ../picard/ui/ui_metadata.py:126
-msgid "0000-00-00; "
-msgstr "0000-00-00; "
+#: ../picard/ui/itemviews.py:83
+msgid "Length"
+msgstr "Længde"
 
-#: ../picard/ui/ui_metadata.py:127 ../picard/ui/tageditor.py:225
-#: ../picard/ui/multitageditor.py:181
+#: ../picard/ui/itemviews.py:327
+msgid "&Releases"
+msgstr ""
+
+#: ../picard/ui/itemviews.py:353
+msgid "&Plugins"
+msgstr ""
+
+#: ../picard/ui/itemviews.py:523
+msgid "Clusters"
+msgstr "Klynger"
+
+#: ../picard/ui/logview.py:29
+msgid "Log"
+msgstr "Log"
+
+#: ../picard/ui/puidsubmit.py:31
+#: ../picard/ui/options/plugins.py:80
+msgid "File"
+msgstr "Fil"
+
+#: ../picard/ui/puidsubmit.py:31
+msgid "PUID"
+msgstr "PUID"
+
+#: ../picard/ui/puidsubmit.py:31
+#: ../picard/ui/mainwindow.py:437
+msgid "Track"
+msgstr "Skæring"
+
+#: ../picard/ui/puidsubmit.py:31
+msgid "Release"
+msgstr "Udgivelse"
+
+#: ../picard/ui/puidsubmit.py:31
+msgid "Release ID"
+msgstr "Udgivelses-id"
+
+#: ../picard/ui/tageditor.py:65
+#: ../picard/ui/ui_options_plugins.py:62
+msgid "Details"
+msgstr "Detaljer"
+
+#: ../picard/ui/tageditor.py:70
+#: ../picard/ui/tageditor.py:241
+#, python-format
+msgid "%d file"
+msgid_plural "%d files"
+msgstr[0] "%d fil"
+msgstr[1] "%d filer"
+
+#: ../picard/ui/tageditor.py:124
+#, python-format
+msgid "(different across %d file)"
+msgid_plural "(different across %d files)"
+msgstr[0] "(forskellig på tværs af %d fil)"
+msgstr[1] "(forskellige på tværs af %d filer)"
+
+#: ../picard/ui/tageditor.py:127
+#, python-format
+msgid "(missing from %d file)"
+msgid_plural "(missing from %d files)"
+msgstr[0] "(mangler fra %d fil)"
+msgstr[1] "(mangler fra %d filer)"
+
+#: ../picard/ui/tageditor.py:210
+msgid "Filename:"
+msgstr "Filnavn:"
+
+#: ../picard/ui/tageditor.py:212
+msgid "Format:"
+msgstr "Format:"
+
+#: ../picard/ui/tageditor.py:221
+msgid "Size:"
+msgstr "Størrelse:"
+
+#: ../picard/ui/tageditor.py:225
+#: ../picard/ui/ui_metadata.py:127
 msgid "Length:"
 msgstr "Længde:"
 
-#: ../picard/ui/ui_metadata.py:128
-msgid "Album:"
-msgstr "Album:"
+#: ../picard/ui/tageditor.py:227
+msgid "Bitrate:"
+msgstr "Bitfrekvens:"
 
-#: ../picard/ui/ui_passworddialog.py:78
-#, fuzzy
-msgid "Authentication required"
-msgstr "Unicode krævet"
+#: ../picard/ui/tageditor.py:229
+msgid "Sample rate:"
+msgstr "Samplefrekvens:"
 
-#: ../picard/ui/ui_passworddialog.py:79 ../picard/ui/ui_options_proxy.py:83
-#: ../picard/ui/ui_options_general.py:113
-msgid "Username:"
-msgstr "Brugernavn:"
-
-#: ../picard/ui/ui_passworddialog.py:80 ../picard/ui/ui_options_proxy.py:82
-#: ../picard/ui/ui_options_general.py:112
-msgid "Password:"
-msgstr "Adgangskode:"
-
-#: ../picard/ui/ui_passworddialog.py:81
-msgid "Save username and password"
+#: ../picard/ui/tageditor.py:231
+msgid "Bits per sample:"
 msgstr ""
 
-#: ../picard/ui/ui_options_folksonomy.py:114
-#: ../picard/ui/ui_options_folksonomy_tags.py:114
-msgid "Folksonomy Tags"
-msgstr "Folksonomitags"
+#: ../picard/ui/tageditor.py:234
+msgid "Mono"
+msgstr "Mono"
 
-#: ../picard/ui/ui_options_folksonomy.py:115
-#: ../picard/ui/ui_options_folksonomy_tags.py:115
-msgid "Ignore tags:"
-msgstr "Ignorer tags:"
+#: ../picard/ui/tageditor.py:235
+msgid "Stereo"
+msgstr "Stereo"
 
-#: ../picard/ui/ui_options_folksonomy.py:116
-#: ../picard/ui/ui_options_folksonomy_tags.py:116
-msgid "Minimal tag usage:"
-msgstr ""
+#: ../picard/ui/tageditor.py:237
+msgid "Channels:"
+msgstr "Kanaler:"
 
-#: ../picard/ui/ui_options_folksonomy.py:117
-#: ../picard/ui/ui_options_folksonomy_tags.py:117
-#: ../picard/ui/ui_options_matching.py:107
-#: ../picard/ui/ui_options_matching.py:108
-#: ../picard/ui/ui_options_matching.py:109
-#: ../picard/ui/ui_options_matching.py:113
-msgid " %"
-msgstr " %"
-
-#: ../picard/ui/ui_options_folksonomy.py:118
-msgid "Maximum number of tags:"
-msgstr ""
-
-#: ../picard/ui/ui_options_folksonomy.py:119
-#: ../picard/ui/ui_options_folksonomy_tags.py:119
-msgid "Join multiple tags with:"
-msgstr ""
-
-#: ../picard/ui/ui_options_folksonomy.py:120
-#: ../picard/ui/ui_options_folksonomy_tags.py:120
-msgid " / "
-msgstr " / "
-
-#: ../picard/ui/ui_options_folksonomy.py:121
-#: ../picard/ui/ui_options_folksonomy_tags.py:121
-msgid ", "
-msgstr ""
-
-#: ../picard/ui/ui_options_folksonomy_tags.py:118
-msgid "Maximal number of tags:"
-msgstr ""
+#: ../picard/ui/tagsfromfilenames.py:52
+#: ../picard/ui/tagsfromfilenames.py:96
+msgid "File Name"
+msgstr "Filnavn"
 
 #: ../picard/ui/mainwindow.py:64
 msgid "MusicBrainz Picard"
@@ -300,7 +1641,8 @@ msgstr "Søg"
 msgid "&CD Lookup..."
 msgstr "&CD-opslag..."
 
-#: ../picard/ui/mainwindow.py:272 ../picard/ui/mainwindow.py:273
+#: ../picard/ui/mainwindow.py:272
+#: ../picard/ui/mainwindow.py:273
 msgid "Lookup CD"
 msgstr "Slå cd op"
 
@@ -331,7 +1673,8 @@ msgstr "Ctrl+Y"
 msgid "&Lookup"
 msgstr ""
 
-#: ../picard/ui/mainwindow.py:291 ../picard/ui/mainwindow.py:292
+#: ../picard/ui/mainwindow.py:291
+#: ../picard/ui/mainwindow.py:292
 msgid "Lookup metadata"
 msgstr "Slå metadata op"
 
@@ -344,10 +1687,6 @@ msgstr "Ctrl+O"
 msgid "&Details..."
 msgstr "&Detaljer..."
 
-#: ../picard/ui/mainwindow.py:302 ../picard/ui/filebrowser.py:38
-msgid "&Refresh"
-msgstr ""
-
 #: ../picard/ui/mainwindow.py:305
 msgid "Generate &Playlist..."
 msgstr "Generér s&pilleliste..."
@@ -393,6 +1732,7 @@ msgid "&Tools"
 msgstr "Funk&tioner"
 
 #: ../picard/ui/mainwindow.py:384
+#: ../picard/ui/util.py:33
 msgid "&Help"
 msgstr "&Hjælp"
 
@@ -405,13 +1745,10 @@ msgid "&Search Bar"
 msgstr "&Søgelinje"
 
 #: ../picard/ui/mainwindow.py:435
+#: ../picard/util/tags.py:21
 msgid "Album"
 msgstr "Album"
 
-#: ../picard/ui/mainwindow.py:437 ../picard/ui/puidsubmit.py:31
-msgid "Track"
-msgstr "Skæring"
-
 #: ../picard/ui/mainwindow.py:476
 msgid "All Supported Formats"
 msgstr "Alle understøttede formater"
@@ -426,37 +1763,291 @@ msgstr "Gemmer spilleliste %s..."
 msgid "Playlist %s saved"
 msgstr "Spilleliste %s gemt"
 
-#: ../picard/ui/mainwindow.py:638 ../picard/ui/mainwindow.py:647
+#: ../picard/ui/mainwindow.py:638
+#: ../picard/ui/mainwindow.py:647
 #, python-format
 msgid " (Error: %s)"
 msgstr " (Fejl: %s)"
 
+#: ../picard/ui/ui_tageditor.py:115
+#: ../picard/ui/ui_options_plugins.py:59
+#: ../picard/ui/options/plugins.py:76
+msgid "Name"
+msgstr "Navn"
+
+#: ../picard/ui/ui_tageditor.py:116
+msgid "Value"
+msgstr "Værdi"
+
+#: ../picard/ui/ui_tageditor.py:117
+msgid "&Add..."
+msgstr ""
+
+#: ../picard/ui/ui_tageditor.py:118
+msgid "&Edit..."
+msgstr ""
+
+#: ../picard/ui/ui_tageditor.py:119
+msgid "&Delete"
+msgstr ""
+
+#: ../picard/ui/ui_tageditor.py:120
+msgid "&Metadata"
+msgstr "&Metadata"
+
+#: ../picard/ui/ui_tageditor.py:121
+msgid "A&rtwork"
+msgstr "&Omslag"
+
+#: ../picard/ui/ui_tageditor.py:122
+msgid "&Info"
+msgstr "&Info"
+
+#: ../picard/ui/passworddialog.py:38
+#, python-format
+msgid "The server %s requires you to login. Please enter your username and password."
+msgstr ""
+
+#: ../picard/ui/ui_cdlookup.py:60
+#: ../picard/ui/ui_options_cdlookup.py:47
+#: ../picard/ui/ui_options_cdlookup_win32.py:56
+#: ../picard/ui/options/cdlookup.py:35
+msgid "CD Lookup"
+msgstr "Cd-opslag"
+
+#: ../picard/ui/ui_cdlookup.py:61
+msgid "The following releases on MusicBrainz match the CD:"
+msgstr "Følgende udgivelser fra MusicBrainz matcher cd'en:"
+
+#: ../picard/ui/ui_cdlookup.py:62
+#: ../picard/ui/ui_puidsubmit.py:53
+msgid "OK"
+msgstr "OK"
+
+#: ../picard/ui/ui_cdlookup.py:63
+msgid "    Lookup manually    "
+msgstr "    Slå op manuelt    "
+
+#: ../picard/ui/ui_cdlookup.py:64
+#: ../picard/ui/ui_puidsubmit.py:54
+msgid "Cancel"
+msgstr "Annuller"
+
+#: ../picard/ui/ui_passworddialog.py:78
+#, fuzzy
+msgid "Authentication required"
+msgstr "Unicode krævet"
+
+#: ../picard/ui/ui_passworddialog.py:79
+#: ../picard/ui/ui_options_general.py:113
+#: ../picard/ui/ui_options_proxy.py:83
+msgid "Username:"
+msgstr "Brugernavn:"
+
+#: ../picard/ui/ui_passworddialog.py:80
+#: ../picard/ui/ui_options_general.py:112
+#: ../picard/ui/ui_options_proxy.py:82
+msgid "Password:"
+msgstr "Adgangskode:"
+
+#: ../picard/ui/ui_passworddialog.py:81
+msgid "Save username and password"
+msgstr ""
+
 #: ../picard/ui/ui_edittagdialog.py:44
 msgid "Edit Tag"
 msgstr "Rediger tag"
 
-#: ../picard/ui/ui_options_proxy.py:81
-msgid "Web Proxy"
-msgstr "Internetproxy"
+#: ../picard/ui/ui_metadata.py:121
+msgid "Lookup"
+msgstr "Slå op"
 
-#: ../picard/ui/ui_options_proxy.py:84 ../picard/ui/ui_options_general.py:109
-msgid "Port:"
-msgstr "Port:"
+#: ../picard/ui/ui_metadata.py:122
+msgid "Title:"
+msgstr "Titel:"
 
-#: ../picard/ui/ui_options_proxy.py:85 ../picard/ui/ui_options_general.py:110
-msgid "Server address:"
-msgstr "Serveradresse:"
+#: ../picard/ui/ui_metadata.py:123
+msgid "Date:"
+msgstr "Dato:"
 
-#: ../picard/ui/ui_tagsfromfilenames.py:56
-msgid "Convert File Names to Tags"
-msgstr "Omskriv filnavne til tags"
+#: ../picard/ui/ui_metadata.py:124
+msgid "Artist:"
+msgstr "Kunstner:"
 
-#: ../picard/ui/ui_tagsfromfilenames.py:57
-msgid "Replace underscores with spaces"
-msgstr "Erstat understreger med mellemrum"
+#: ../picard/ui/ui_metadata.py:125
+msgid "Track:"
+msgstr "Skæring:"
+
+#: ../picard/ui/ui_metadata.py:126
+msgid "0000-00-00; "
+msgstr "0000-00-00; "
+
+#: ../picard/ui/ui_metadata.py:128
+msgid "Album:"
+msgstr "Album:"
+
+#: ../picard/ui/ui_options.py:42
+msgid "Options"
+msgstr "Indstillinger"
+
+#: ../picard/ui/ui_options_cdlookup.py:48
+msgid "CD-ROM device to use for lookups:"
+msgstr "CD-ROM-drev der skal bruges til opslag:"
+
+#: ../picard/ui/ui_options_cdlookup_win32.py:57
+msgid "Default CD-ROM drive to use for lookups:"
+msgstr "CD-ROM-drev der som standard skal bruges til opslag:"
+
+#: ../picard/ui/ui_options_cover.py:56
+msgid "Location"
+msgstr "Placering"
+
+#: ../picard/ui/ui_options_cover.py:57
+msgid "Embed cover images into tags"
+msgstr "Indsæt omslag i tags"
+
+#: ../picard/ui/ui_options_cover.py:58
+msgid "Save cover images as separate files"
+msgstr "Gem omslag som separate filer"
+
+#: ../picard/ui/ui_options_cover.py:59
+msgid "Overwrite the file if it already exists"
+msgstr "Overskriv filen hvis den allerede eksisterer"
+
+#: ../picard/ui/util.py:31
+msgid "&Ok"
+msgstr "&OK"
+
+#: ../picard/ui/util.py:32
+#, fuzzy
+msgid "&Cancel"
+msgstr "Annuller"
+
+#: ../picard/ui/ui_puidsubmit.py:52
+msgid "Submit PUIDs"
+msgstr "Send PUID'er"
+
+#: ../picard/ui/ui_options_folksonomy.py:114
+#: ../picard/ui/options/folksonomy.py:29
+msgid "Folksonomy Tags"
+msgstr "Folksonomitags"
+
+#: ../picard/ui/ui_options_folksonomy.py:115
+msgid "Ignore tags:"
+msgstr "Ignorer tags:"
+
+#: ../picard/ui/ui_options_folksonomy.py:116
+msgid "Minimal tag usage:"
+msgstr ""
+
+#: ../picard/ui/ui_options_folksonomy.py:117
+#: ../picard/ui/ui_options_matching.py:107
+#: ../picard/ui/ui_options_matching.py:108
+#: ../picard/ui/ui_options_matching.py:109
+#: ../picard/ui/ui_options_matching.py:113
+msgid " %"
+msgstr " %"
+
+#: ../picard/ui/ui_options_folksonomy.py:118
+msgid "Maximum number of tags:"
+msgstr ""
+
+#: ../picard/ui/ui_options_folksonomy.py:119
+msgid "Join multiple tags with:"
+msgstr ""
+
+#: ../picard/ui/ui_options_folksonomy.py:120
+msgid " / "
+msgstr " / "
+
+#: ../picard/ui/ui_options_folksonomy.py:121
+msgid ", "
+msgstr ""
+
+#: ../picard/ui/ui_options_interface.py:50
+msgid "Miscellaneous"
+msgstr "Diverse"
+
+#: ../picard/ui/ui_options_interface.py:51
+msgid "Show text labels under icons"
+msgstr "Vis tekstmærkater under ikoner"
+
+#: ../picard/ui/ui_options_interface.py:52
+msgid "Allow selection of multiple directories"
+msgstr "Tillad markering af flere mapper"
+
+#: ../picard/ui/ui_options_interface.py:53
+msgid "Use advanced query syntax"
+msgstr "Brug avanceret forespørgselssyntaks"
+
+#: ../picard/ui/ui_options_interface.py:54
+#, fuzzy
+msgid "User interface language:"
+msgstr "Brugergrænseflade"
+
+#: ../picard/ui/ui_options_naming.py:165
+msgid "Rename Files"
+msgstr "Omdøb filer"
+
+#: ../picard/ui/ui_options_naming.py:166
+msgid "Replace Windows-incompatible characters"
+msgstr "Erstat tegn der ikke er kompatible med Windows"
+
+#: ../picard/ui/ui_options_naming.py:167
+msgid "Replace non-ASCII characters"
+msgstr "Erstat tegn der ikke er ASCII-tegn"
+
+#: ../picard/ui/ui_options_naming.py:168
+#: ../picard/ui/ui_options_naming.py:169
+#: ../picard/ui/ui_options_metadata.py:109
+#: ../picard/ui/ui_options_metadata.py:110
+msgid "Default"
+msgstr "Standard"
+
+#: ../picard/ui/ui_options_naming.py:170
+#: ../picard/ui/options/naming.py:90
+msgid "Multiple artist file naming format:"
+msgstr "Format for filnavngivning ved flere kunstnere:"
+
+#: ../picard/ui/ui_options_naming.py:171
+#: ../picard/ui/options/naming.py:86
+msgid "File naming format:"
+msgstr "Filnavngivningsformat:"
+
+#: ../picard/ui/ui_options_naming.py:172
+msgid "Move Files"
+msgstr "Flyt filer"
+
+#: ../picard/ui/ui_options_naming.py:173
+msgid "Move tagged files to this directory:"
+msgstr "Flyt taggede filer til denne mappe:"
+
+#: ../picard/ui/ui_options_naming.py:174
+msgid "Browse..."
+msgstr "Gennemse..."
+
+#: ../picard/ui/ui_options_naming.py:175
+msgid "Move additional files:"
+msgstr ""
+
+#: ../picard/ui/ui_options_naming.py:176
+msgid "Delete empty directories"
+msgstr "Slet tomme mapper"
+
+#: ../picard/ui/ui_options_naming.py:177
+msgid "Example"
+msgstr "Eksempel"
+
+#: ../picard/ui/ui_options_naming.py:178
+msgid "File name:"
+msgstr "Filnavn:"
+
+#: ../picard/ui/ui_options_naming.py:179
+msgid "Multiple artist file name:"
+msgstr "Filnavn ved flere kunstnere:"
 
-#: ../picard/ui/ui_tagsfromfilenames.py:58
 #: ../picard/ui/ui_options_naming.py:180
+#: ../picard/ui/ui_tagsfromfilenames.py:58
 msgid "&Preview"
 msgstr "&Forhåndsvisning"
 
@@ -464,11 +2055,22 @@ msgstr "&Forhåndsvisning"
 msgid "MusicBrainz Server"
 msgstr "MusicBrainz-server"
 
+#: ../picard/ui/ui_options_general.py:109
+#: ../picard/ui/ui_options_proxy.py:84
+msgid "Port:"
+msgstr "Port:"
+
+#: ../picard/ui/ui_options_general.py:110
+#: ../picard/ui/ui_options_proxy.py:85
+msgid "Server address:"
+msgstr "Serveradresse:"
+
 #: ../picard/ui/ui_options_general.py:111
 msgid "Account Information"
 msgstr "Kontoinformation"
 
 #: ../picard/ui/ui_options_general.py:114
+#: ../picard/ui/options/general.py:29
 msgid "General"
 msgstr "Generelt"
 
@@ -476,34 +2078,6 @@ msgstr "Generelt"
 msgid "Automatically scan all new files"
 msgstr "Skan automatisk alle nye filer"
 
-#: ../picard/ui/ui_options_interface.py:46
-msgid "Miscellaneous"
-msgstr "Diverse"
-
-#: ../picard/ui/ui_options_interface.py:47
-msgid "Show text labels under icons"
-msgstr "Vis tekstmærkater under ikoner"
-
-#: ../picard/ui/ui_options_interface.py:48
-msgid "Allow selection of multiple directories"
-msgstr "Tillad markering af flere mapper"
-
-#: ../picard/ui/ui_options_interface.py:49
-msgid "Use advanced query syntax"
-msgstr "Brug avanceret forespørgselssyntaks"
-
-#: ../picard/ui/itemviews.py:327
-msgid "&Releases"
-msgstr ""
-
-#: ../picard/ui/itemviews.py:353
-msgid "&Plugins"
-msgstr ""
-
-#: ../picard/ui/itemviews.py:523
-msgid "Clusters"
-msgstr "Klynger"
-
 #: ../picard/ui/ui_options_matching.py:105
 msgid "Thresholds"
 msgstr "Grænser"
@@ -524,6 +2098,68 @@ msgstr "Mindste lighed for klyngeopslag:"
 msgid "Minimal similarity for PUID lookups:"
 msgstr "Mindste lighed for PUID-opslag:"
 
+#: ../picard/ui/ui_options_metadata.py:100
+#: ../picard/ui/options/metadata.py:31
+msgid "Metadata"
+msgstr "Metadata"
+
+#: ../picard/ui/ui_options_metadata.py:101
+msgid "Translate foreign artist names to English where possible"
+msgstr "Oversæt fremmede kunstnernavne til engelsk hvor det er muligt"
+
+#: ../picard/ui/ui_options_metadata.py:102
+msgid "Use release relationships"
+msgstr "Brug udgivelsessammenhænge"
+
+#: ../picard/ui/ui_options_metadata.py:103
+msgid "Use track relationships"
+msgstr "Brug skæringsforbindelser"
+
+#: ../picard/ui/ui_options_metadata.py:104
+msgid "Use folksonomy tags as genre"
+msgstr "Brug folksonomitags som genre"
+
+#: ../picard/ui/ui_options_metadata.py:105
+#, fuzzy
+msgid "Preferred release country:"
+msgstr "Udgivelsestype"
+
+#: ../picard/ui/ui_options_metadata.py:106
+msgid "Custom Fields"
+msgstr "Brugerdefinerede felter"
+
+#: ../picard/ui/ui_options_metadata.py:107
+msgid "Various artists:"
+msgstr "Diverse kunstnere:"
+
+#: ../picard/ui/ui_options_metadata.py:108
+msgid "Non-album tracks:"
+msgstr "Skæringer uden album:"
+
+#: ../picard/ui/ui_options_plugins.py:58
+#: ../picard/ui/options/plugins.py:30
+msgid "Plugins"
+msgstr "Udvidelsesmoduler"
+
+#: ../picard/ui/ui_options_plugins.py:60
+#: ../picard/ui/options/plugins.py:79
+msgid "Author"
+msgstr "Forfatter"
+
+#: ../picard/ui/ui_options_plugins.py:61
+#: ../picard/util/tags.py:36
+msgid "Version"
+msgstr "Version"
+
+#: ../picard/ui/ui_options_proxy.py:81
+#: ../picard/ui/options/proxy.py:28
+msgid "Web Proxy"
+msgstr "Internetproxy"
+
+#: ../picard/ui/ui_options_script.py:52
+msgid "Tagger Script"
+msgstr "Taggerscript"
+
 #: ../picard/ui/ui_options_tags.py:105
 msgid "Common"
 msgstr "Generelt"
@@ -576,334 +2212,25 @@ msgstr "APE"
 msgid "Remove APEv2 tags from MP3 files"
 msgstr "Fjern APEv2-tags fra MP3-filer"
 
-#: ../picard/ui/ui_options_cdlookup_win32.py:56 ../picard/ui/ui_cdlookup.py:60
-#: ../picard/ui/ui_options_cdlookup.py:47
-msgid "CD Lookup"
-msgstr "Cd-opslag"
+#: ../picard/ui/ui_tagsfromfilenames.py:56
+msgid "Convert File Names to Tags"
+msgstr "Omskriv filnavne til tags"
 
-#: ../picard/ui/ui_options_cdlookup_win32.py:57
-msgid "Default CD-ROM drive to use for lookups:"
-msgstr "CD-ROM-drev der som standard skal bruges til opslag:"
+#: ../picard/ui/ui_tagsfromfilenames.py:57
+msgid "Replace underscores with spaces"
+msgstr "Erstat understreger med mellemrum"
 
-#: ../picard/ui/tageditor.py:65 ../picard/ui/ui_options_plugins.py:62
-#: ../picard/ui/multitageditor.py:37
-msgid "Details"
-msgstr "Detaljer"
-
-#: ../picard/ui/tageditor.py:70 ../picard/ui/tageditor.py:241
-#: ../picard/ui/multitageditor.py:42 ../picard/ui/multitageditor.py:197
-#, python-format
-msgid "%d file"
-msgid_plural "%d files"
-msgstr[0] "%d fil"
-msgstr[1] "%d filer"
-
-#: ../picard/ui/tageditor.py:124 ../picard/ui/multitageditor.py:95
-#, python-format
-msgid "(different across %d file)"
-msgid_plural "(different across %d files)"
-msgstr[0] "(forskellig på tværs af %d fil)"
-msgstr[1] "(forskellige på tværs af %d filer)"
-
-#: ../picard/ui/tageditor.py:127 ../picard/ui/multitageditor.py:98
-#, python-format
-msgid "(missing from %d file)"
-msgid_plural "(missing from %d files)"
-msgstr[0] "(mangler fra %d fil)"
-msgstr[1] "(mangler fra %d filer)"
-
-#: ../picard/ui/tageditor.py:210 ../picard/ui/multitageditor.py:166
-msgid "Filename:"
-msgstr "Filnavn:"
-
-#: ../picard/ui/tageditor.py:212 ../picard/ui/multitageditor.py:168
-msgid "Format:"
-msgstr "Format:"
-
-#: ../picard/ui/tageditor.py:221 ../picard/ui/multitageditor.py:177
-msgid "Size:"
-msgstr "Størrelse:"
-
-#: ../picard/ui/tageditor.py:227 ../picard/ui/multitageditor.py:183
-msgid "Bitrate:"
-msgstr "Bitfrekvens:"
-
-#: ../picard/ui/tageditor.py:229 ../picard/ui/multitageditor.py:185
-msgid "Sample rate:"
-msgstr "Samplefrekvens:"
-
-#: ../picard/ui/tageditor.py:231 ../picard/ui/multitageditor.py:187
-msgid "Bits per sample:"
-msgstr ""
-
-#: ../picard/ui/tageditor.py:234 ../picard/ui/multitageditor.py:190
-msgid "Mono"
-msgstr "Mono"
-
-#: ../picard/ui/tageditor.py:235 ../picard/ui/multitageditor.py:191
-msgid "Stereo"
-msgstr "Stereo"
-
-#: ../picard/ui/tageditor.py:237 ../picard/ui/multitageditor.py:193
-msgid "Channels:"
-msgstr "Kanaler:"
-
-#: ../picard/ui/ui_tageditor.py:115 ../picard/ui/ui_multitageditor.py:55
-#: ../picard/ui/ui_options_plugins.py:59 ../picard/ui/options/plugins.py:76
-msgid "Name"
-msgstr "Navn"
-
-#: ../picard/ui/ui_tageditor.py:116 ../picard/ui/ui_multitageditor.py:56
-msgid "Value"
-msgstr "Værdi"
-
-#: ../picard/ui/ui_tageditor.py:117 ../picard/ui/ui_multitageditor.py:57
-msgid "&Add..."
-msgstr ""
-
-#: ../picard/ui/ui_tageditor.py:118
-msgid "&Edit..."
-msgstr ""
-
-#: ../picard/ui/ui_tageditor.py:119
-msgid "&Delete"
-msgstr ""
-
-#: ../picard/ui/ui_tageditor.py:120
-msgid "&Metadata"
-msgstr "&Metadata"
-
-#: ../picard/ui/ui_tageditor.py:121
-msgid "A&rtwork"
-msgstr "&Omslag"
-
-#: ../picard/ui/ui_tageditor.py:122
-msgid "&Info"
-msgstr "&Info"
-
-#: ../picard/ui/coverartbox.py:47
-msgid "Cover Art"
-msgstr "Omslag"
-
-#: ../picard/ui/coverartbox.py:95
-msgid "Buy the album on Amazon"
-msgstr "Køb albummet på Amazon"
-
-#: ../picard/ui/ui_puidsubmit.py:52
-msgid "Submit PUIDs"
-msgstr "Send PUID'er"
-
-#: ../picard/ui/ui_puidsubmit.py:53 ../picard/ui/ui_cdlookup.py:62
-msgid "OK"
-msgstr "OK"
-
-#: ../picard/ui/ui_puidsubmit.py:54 ../picard/ui/ui_cdlookup.py:64
-msgid "Cancel"
-msgstr "Annuller"
-
-#: ../picard/ui/puidsubmit.py:31 ../picard/ui/options/plugins.py:80
-msgid "File"
-msgstr "Fil"
-
-#: ../picard/ui/puidsubmit.py:31
-msgid "PUID"
-msgstr "PUID"
-
-#: ../picard/ui/puidsubmit.py:31
-msgid "Release"
-msgstr "Udgivelse"
-
-#: ../picard/ui/puidsubmit.py:31
-msgid "Release ID"
-msgstr "Udgivelses-id"
-
-#: ../picard/ui/filebrowser.py:41
-#, fuzzy
-msgid "&Move Tagged Files Here"
-msgstr "Flyt taggede filer til denne mappe:"
-
-#: ../picard/ui/filebrowser.py:44
-msgid "Show &Hidden Files"
-msgstr ""
-
-#: ../picard/ui/ui_cdlookup.py:61
-msgid "The following releases on MusicBrainz match the CD:"
-msgstr "Følgende udgivelser fra MusicBrainz matcher cd'en:"
-
-#: ../picard/ui/ui_cdlookup.py:63
-msgid "    Lookup manually    "
-msgstr "    Slå op manuelt    "
-
-#: ../picard/ui/ui_options.py:42
-msgid "Options"
-msgstr "Indstillinger"
-
-#: ../picard/ui/tagsfromfilenames.py:52 ../picard/ui/tagsfromfilenames.py:96
-msgid "File Name"
-msgstr "Filnavn"
-
-#: ../picard/ui/ui_options_cover.py:56
-msgid "Location"
-msgstr "Placering"
-
-#: ../picard/ui/ui_options_cover.py:57
-msgid "Embed cover images into tags"
-msgstr "Indsæt omslag i tags"
-
-#: ../picard/ui/ui_options_cover.py:58
-msgid "Save cover images as separate files"
-msgstr "Gem omslag som separate filer"
-
-#: ../picard/ui/ui_options_cover.py:59
-msgid "Overwrite the file if it already exists"
-msgstr "Overskriv filen hvis den allerede eksisterer"
-
-#: ../picard/ui/ui_options_metadata.py:100
-msgid "Metadata"
-msgstr "Metadata"
-
-#: ../picard/ui/ui_options_metadata.py:101
-msgid "Translate foreign artist names to English where possible"
-msgstr "Oversæt fremmede kunstnernavne til engelsk hvor det er muligt"
-
-#: ../picard/ui/ui_options_metadata.py:102
-msgid "Use release relationships"
-msgstr "Brug udgivelsessammenhænge"
-
-#: ../picard/ui/ui_options_metadata.py:103
-msgid "Use track relationships"
-msgstr "Brug skæringsforbindelser"
-
-#: ../picard/ui/ui_options_metadata.py:104
-msgid "Use folksonomy tags as genre"
-msgstr "Brug folksonomitags som genre"
-
-#: ../picard/ui/ui_options_metadata.py:105
-#, fuzzy
-msgid "Preferred release country:"
-msgstr "Udgivelsesland"
-
-#: ../picard/ui/ui_options_metadata.py:106
-msgid "Custom Fields"
-msgstr "Brugerdefinerede felter"
-
-#: ../picard/ui/ui_options_metadata.py:107
-msgid "Various artists:"
-msgstr "Diverse kunstnere:"
-
-#: ../picard/ui/ui_options_metadata.py:108
-msgid "Non-album tracks:"
-msgstr "Skæringer uden album:"
-
-#: ../picard/ui/ui_options_metadata.py:109
-#: ../picard/ui/ui_options_metadata.py:110
-#: ../picard/ui/ui_options_naming.py:168 ../picard/ui/ui_options_naming.py:169
-msgid "Default"
-msgstr "Standard"
-
-#: ../picard/ui/ui_multitageditor.py:58
-msgid "Delete"
-msgstr "Slet"
-
-#: ../picard/ui/logview.py:29
-msgid "Log"
-msgstr "Log"
-
-#: ../picard/ui/ui_options_plugins.py:58
-msgid "Plugins"
-msgstr "Udvidelsesmoduler"
-
-#: ../picard/ui/ui_options_plugins.py:60 ../picard/ui/options/plugins.py:79
-msgid "Author"
-msgstr "Forfatter"
-
-#: ../picard/ui/ui_options_plugins.py:61
-msgid "Version"
-msgstr "Version"
-
-#: ../picard/ui/ui_options_naming.py:165
-msgid "Rename Files"
-msgstr "Omdøb filer"
-
-#: ../picard/ui/ui_options_naming.py:166
-msgid "Replace Windows-incompatible characters"
-msgstr "Erstat tegn der ikke er kompatible med Windows"
-
-#: ../picard/ui/ui_options_naming.py:167
-msgid "Replace non-ASCII characters"
-msgstr "Erstat tegn der ikke er ASCII-tegn"
-
-#: ../picard/ui/ui_options_naming.py:170 ../picard/ui/options/naming.py:90
-msgid "Multiple artist file naming format:"
-msgstr "Format for filnavngivning ved flere kunstnere:"
-
-#: ../picard/ui/ui_options_naming.py:171 ../picard/ui/options/naming.py:86
-msgid "File naming format:"
-msgstr "Filnavngivningsformat:"
-
-#: ../picard/ui/ui_options_naming.py:172
-msgid "Move Files"
-msgstr "Flyt filer"
-
-#: ../picard/ui/ui_options_naming.py:173
-msgid "Move tagged files to this directory:"
-msgstr "Flyt taggede filer til denne mappe:"
-
-#: ../picard/ui/ui_options_naming.py:174
-msgid "Browse..."
-msgstr "Gennemse..."
-
-#: ../picard/ui/ui_options_naming.py:175
-msgid "Move additional files:"
-msgstr ""
-
-#: ../picard/ui/ui_options_naming.py:176
-msgid "Delete empty directories"
-msgstr "Slet tomme mapper"
-
-#: ../picard/ui/ui_options_naming.py:177
-msgid "Example"
-msgstr "Eksempel"
-
-#: ../picard/ui/ui_options_naming.py:178
-msgid "File name:"
-msgstr "Filnavn:"
-
-#: ../picard/ui/ui_options_naming.py:179
-msgid "Multiple artist file name:"
-msgstr "Filnavn ved flere kunstnere:"
-
-#: ../picard/ui/ui_options_cdlookup.py:48
-msgid "CD-ROM device to use for lookups:"
-msgstr "CD-ROM-drev der skal bruges til opslag:"
-
-#: ../picard/ui/options/scripting.py:84 ../picard/ui/options/naming.py:86
-#: ../picard/ui/options/naming.py:90 ../picard/ui/options/naming.py:93
-#: ../picard/ui/options/naming.py:95
-msgid "Script Error"
-msgstr "Scriptfejl"
+#: ../picard/ui/options/about.py:29
+msgid "About"
+msgstr "Om"
 
 #. Replace this with your name to have it appear in the "About" dialog.
 #: ../picard/ui/options/about.py:48
 msgid "translator-credits"
 msgstr ""
 "Launchpad Contributions:\n"
-"  Frederik 'Freso' S. Olesen <https://launchpad.net/~freso>\n"
-"\n"
-"Launchpad Contributions:\n"
 "  Frederik 'Freso' S. Olesen https://launchpad.net/~freso\n"
-"\n"
-"Launchpad Contributions:\n"
-"  Frederik 'Freso' S. Olesen https://launchpad.net/~freso\n"
-"\n"
-"Launchpad Contributions:\n"
 "  Christian Funder Sommerlund https://launchpad.net/~zero3\n"
-"  Frederik 'Freso' S. Olesen https://launchpad.net/~freso\n"
-"  Lukáš Lalinský https://launchpad.net/~luks\n"
-"\n"
-"Launchpad Contributions:\n"
-"  Christian Funder Sommerlund https://launchpad.net/~zero3\n"
-"  Frederik 'Freso' S. Olesen https://launchpad.net/~freso\n"
 "  Lukáš Lalinský https://launchpad.net/~luks"
 
 #. Replace LANG with language you are translatig to.
@@ -915,32 +2242,62 @@ msgstr "<br/>Oversat til dansk af %s"
 #: ../picard/ui/options/about.py:55
 #, fuzzy, python-format
 msgid ""
-"<p align=\"center\"><span style=\"font-size:15px;font-weight:bold;"
-"\">MusicBrainz Picard</span><br/>\n"
+"<p align=\"center\"><span style=\"font-size:15px;font-weight:bold;\">MusicBrainz Picard</span><br/>\n"
 "Version %(version)s</p>\n"
 "<p align=\"center\"><strong>Supported formats</strong><br/>%(formats)s</p>\n"
 "<p align=\"center\"><strong>Please donate</strong><br/>\n"
-"Thank you for using Picard. Picard relies on the MusicBrainz database, which "
-"is operated by the MetaBrainz Foundation with the help of thousands of "
-"volunteers. If you like this application please consider donating to the "
-"MetaBrainz Foundation to keep the service running.</p>\n"
-"<p align=\"center\"><a href=\"http://metabrainz.org/donate/index.html"
-"\">Donate now!</a></p>\n"
+"Thank you for using Picard. Picard relies on the MusicBrainz database, which is operated by the MetaBrainz Foundation with the help of thousands of volunteers. If you like this application please consider donating to the MetaBrainz Foundation to keep the service running.</p>\n"
+"<p align=\"center\"><a href=\"http://metabrainz.org/donate/index.html\">Donate now!</a></p>\n"
 "<p align=\"center\"><strong>Credits</strong><br/>\n"
-"<small>Copyright © 2004-2008 Robert Kaye, Lukáš Lalinský and others%"
-"(translator-credits)s</small></p>\n"
-"<p align=\"center\"><a href=\"http://musicbrainz.org/doc/PicardTagger"
-"\">http://musicbrainz.org/doc/PicardTagger</a></p>\n"
+"<small>Copyright © 2004-2008 Robert Kaye, Lukáš Lalinský and others%(translator-credits)s</small></p>\n"
+"<p align=\"center\"><a href=\"http://musicbrainz.org/doc/PicardTagger\">http://musicbrainz.org/doc/PicardTagger</a></p>\n"
 msgstr ""
-"<p align=\"center\"><span style=\"font-size:15px;font-weight:bold;"
-"\">MusicBrainz Picard</span><br/>\n"
+"<p align=\"center\"><span style=\"font-size:15px;font-weight:bold;\">MusicBrainz Picard</span><br/>\n"
 "Version %(version)s</p>\n"
-"<p align=\"center\"><strong>Understøttede formater:</strong> %(formats)s</"
-"p>\n"
-"<p align=\"center\"><small>Ophavsret © 2004-2007 Robert Kaye, Lukáš Lalinský "
-"m.fl.%(translator-credits)s</small></p>\n"
-"<p align=\"center\"><a href=\"http://musicbrainz.org/doc/PicardTagger"
-"\">http://musicbrainz.org/doc/PicardTagger</a></p>\n"
+"<p align=\"center\"><strong>Understøttede formater:</strong> %(formats)s</p>\n"
+"<p align=\"center\"><small>Ophavsret © 2004-2007 Robert Kaye, Lukáš Lalinský m.fl.%(translator-credits)s</small></p>\n"
+"<p align=\"center\"><a href=\"http://musicbrainz.org/doc/PicardTagger\">http://musicbrainz.org/doc/PicardTagger</a></p>\n"
+
+#: ../picard/ui/options/advanced.py:26
+msgid "Advanced"
+msgstr "Avanceret"
+
+#: ../picard/ui/options/interface.py:31
+msgid "User Interface"
+msgstr "Brugergrænseflade"
+
+#: ../picard/ui/options/interface.py:47
+msgid "System default"
+msgstr "Systemstandard"
+
+#: ../picard/ui/options/interface.py:71
+#, fuzzy
+msgid "Language changed"
+msgstr "Sprog"
+
+#: ../picard/ui/options/interface.py:71
+msgid "You have changed the interface language. You have to restart Picard in order for the change to take effect."
+msgstr ""
+
+#: ../picard/ui/options/matching.py:29
+msgid "Matching"
+msgstr "Matchning"
+
+#: ../picard/ui/options/metadata.py:52
+msgid "None"
+msgstr ""
+
+#: ../picard/ui/options/naming.py:33
+msgid "File Naming"
+msgstr "Filnavngivning"
+
+#: ../picard/ui/options/naming.py:86
+#: ../picard/ui/options/naming.py:90
+#: ../picard/ui/options/naming.py:93
+#: ../picard/ui/options/naming.py:95
+#: ../picard/ui/options/scripting.py:84
+msgid "Script Error"
+msgstr "Scriptfejl"
 
 #: ../picard/ui/options/naming.py:93
 msgid "The file naming format must not be empty."
@@ -959,6 +2316,235 @@ msgstr ""
 msgid "The location to move files to must not be empty."
 msgstr ""
 
+#: ../picard/ui/options/scripting.py:63
+msgid "Scripting"
+msgstr "Scripting"
+
+#: ../picard/ui/options/tags.py:29
+msgid "Tags"
+msgstr "Tags"
+
+#: ../picard/util/tags.py:24
+msgid "Date"
+msgstr "Dato"
+
+#: ../picard/util/tags.py:25
+msgid "Album Artist"
+msgstr "Albumkunstner"
+
+#: ../picard/util/tags.py:26
+msgid "Track Number"
+msgstr "Skæringsnummer"
+
+#: ../picard/util/tags.py:27
+msgid "Total Tracks"
+msgstr "Skæringer i alt"
+
+#: ../picard/util/tags.py:28
+msgid "Disc Number"
+msgstr "Disknummer"
+
+#: ../picard/util/tags.py:29
+msgid "Total Discs"
+msgstr "Diske i alt"
+
+#: ../picard/util/tags.py:30
+msgid "Album Artist Sort Order"
+msgstr "Sorteringsrækkefølge for albumkunstnere"
+
+#: ../picard/util/tags.py:31
+msgid "Artist Sort Order"
+msgstr "Sorteringsrækkefølge for kunstnere"
+
+#: ../picard/util/tags.py:32
+msgid "Title Sort Order"
+msgstr "Sorteringsrækkefølge for titler"
+
+#: ../picard/util/tags.py:33
+msgid "Album Sort Order"
+msgstr "Sorteringsrækkefølge for album"
+
+#: ../picard/util/tags.py:34
+msgid "ASIN"
+msgstr "ASIN"
+
+#: ../picard/util/tags.py:35
+msgid "Grouping"
+msgstr "Gruppering"
+
+#: ../picard/util/tags.py:37
+msgid "ISRC"
+msgstr "ISRC"
+
+#: ../picard/util/tags.py:38
+msgid "Mood"
+msgstr "Stemning"
+
+#: ../picard/util/tags.py:39
+msgid "BPM"
+msgstr "BPM"
+
+#: ../picard/util/tags.py:40
+msgid "Copyright"
+msgstr "Ophavsret"
+
+#: ../picard/util/tags.py:41
+msgid "Composer"
+msgstr "Komponist"
+
+#: ../picard/util/tags.py:42
+msgid "Conductor"
+msgstr "Dirigent"
+
+#: ../picard/util/tags.py:43
+msgid "Lyricist"
+msgstr "Tekstforfatter"
+
+#: ../picard/util/tags.py:44
+msgid "Arranger"
+msgstr "Arrangør"
+
+#: ../picard/util/tags.py:45
+msgid "Producer"
+msgstr "Producer"
+
+#: ../picard/util/tags.py:46
+msgid "Engineer"
+msgstr "Tekniker"
+
+#: ../picard/util/tags.py:47
+msgid "Subtitle"
+msgstr "Undertitel"
+
+#: ../picard/util/tags.py:48
+msgid "Disc Subtitle"
+msgstr "Diskundertitel"
+
+#: ../picard/util/tags.py:49
+msgid "Remixer"
+msgstr "Remixer"
+
+#: ../picard/util/tags.py:50
+msgid "MusicBrainz Track Id"
+msgstr "MusicBrainz skærings-id"
+
+#: ../picard/util/tags.py:51
+msgid "MusicBrainz Release Id"
+msgstr "MusicBrainz udgivelses-id"
+
+#: ../picard/util/tags.py:52
+msgid "MusicBrainz Artist Id"
+msgstr "MusicBrainz kunstner-id"
+
+#: ../picard/util/tags.py:53
+msgid "MusicBrainz Release Artist Id"
+msgstr "MusicBrainz udgivelseskunster-id"
+
+#: ../picard/util/tags.py:54
+msgid "MusicBrainz TRM Id"
+msgstr "MusicBrainz TRM-id"
+
+#: ../picard/util/tags.py:55
+#, fuzzy
+msgid "MusicBrainz Disc Id"
+msgstr "MusicBrainz kunstner-id"
+
+#: ../picard/util/tags.py:56
+#, fuzzy
+msgid "MusicBrainz Sort Name"
+msgstr "MusicBrainz-server"
+
+#: ../picard/util/tags.py:57
+msgid "MusicIP PUID"
+msgstr "MusicIP PUID"
+
+#: ../picard/util/tags.py:58
+msgid "MusicIP Fingerprint"
+msgstr "MusicIP-fingeraftryk"
+
+#: ../picard/util/tags.py:59
+msgid "Disc Id"
+msgstr ""
+
+#: ../picard/util/tags.py:60
+msgid "Website"
+msgstr "Websted"
+
+#: ../picard/util/tags.py:61
+msgid "Compilation"
+msgstr "Opsamling"
+
+#: ../picard/util/tags.py:62
+msgid "Comment"
+msgstr "Kommentar"
+
+#: ../picard/util/tags.py:63
+msgid "Genre"
+msgstr "Genre"
+
+#: ../picard/util/tags.py:64
+msgid "Encoded By"
+msgstr "Kodet af"
+
+#: ../picard/util/tags.py:65
+msgid "Performer"
+msgstr "Optræder"
+
+#: ../picard/util/tags.py:66
+msgid "Release Type"
+msgstr "Udgivelsestype"
+
+#: ../picard/util/tags.py:67
+msgid "Release Status"
+msgstr "Udgivelsesstatus"
+
+#: ../picard/util/tags.py:68
+#, fuzzy
+msgid "Release Country"
+msgstr "Udgivelsestype"
+
+#: ../picard/util/tags.py:69
+msgid "Record Label"
+msgstr "Pladeselskab"
+
+#: ../picard/util/tags.py:70
+msgid "Barcode"
+msgstr "Stregkode"
+
+#: ../picard/util/tags.py:71
+msgid "Catalog Number"
+msgstr "Katalognummer"
+
+#: ../picard/util/tags.py:72
+#, fuzzy
+msgid "Format"
+msgstr "Format:"
+
+#: ../picard/util/tags.py:73
+msgid "DJ-Mixer"
+msgstr "DJ-Mixer"
+
+#: ../picard/util/tags.py:74
+msgid "Media"
+msgstr "Medie"
+
+#: ../picard/util/tags.py:75
+msgid "Lyrics"
+msgstr "Sangtekst"
+
+#: ../picard/util/tags.py:76
+msgid "Mixer"
+msgstr "Mixer"
+
+#: ../picard/util/tags.py:77
+msgid "Language"
+msgstr "Sprog"
+
+#: ../picard/util/tags.py:78
+#, fuzzy
+msgid "Script"
+msgstr "Scripting"
+
 #: ../picard/util/webbrowser2.py:84
 msgid "Web Browser Error"
 msgstr "Internetbrowserfejl"
@@ -974,450 +2560,293 @@ msgstr ""
 "\n"
 "%s"
 
-#~ msgid "No matching tracks for file %s"
-#~ msgstr "Ingen matchende skæringer for fil %s"
-
-#~ msgid "File %s identified!"
-#~ msgstr "Filen %s identificeret!"
-
-#~ msgid "Looking up the PUID for file %s..."
-#~ msgstr "Slår PUID til filen %s op..."
-
-#~ msgid "Looking up the metadata for file %s..."
-#~ msgstr "Slår metadata for filen %s op..."
-
-#~ msgid "No matching releases for cluster %s"
-#~ msgstr "Ingen passende udgivelser for klyngen \"%s\""
-
-#~ msgid "Cluster %s identified!"
-#~ msgstr "Klyngen %s identificeret!"
-
-#~ msgid "Looking up the metadata for cluster %s..."
-#~ msgstr "Slår metadata for klyngen %s op..."
-
-#~ msgid "M3U Playlist (*.m3u)"
-#~ msgstr "M3U-spilleliste (*.m3u)"
-
-#~ msgid "PLS Playlist (*.pls)"
-#~ msgstr "PLS-spilleliste (*.pls)"
-
-#~ msgid "XSPF Playlist (*.xspf)"
-#~ msgstr "XSPF-spilleliste (*.xspf)"
-
-#~ msgid "Submitting PUIDs..."
-#~ msgstr "Sender PUID'er..."
-
-#~ msgid "PUIDs submission failed: %s"
-#~ msgstr "Fejl ved sending af PUID'er: %s"
-
-#~ msgid "PUIDs successfully submitted!"
-#~ msgstr "PUID'er blev sendt!"
-
 #~ msgid "New Version"
 #~ msgstr "Ny version"
-
 #~ msgid ""
 #~ "New version of Picard is available (%s). Would you like to download it "
 #~ "now?"
 #~ msgstr ""
 #~ "Der er en ny version af Picard tilgængelig (%s). Vil du hente den nu?"
+#~ msgid "Delete"
+#~ msgstr "Slet"
 
-#~ msgid "Couldn't find PUID for file %s"
-#~ msgstr "Kunne ikke finde PUID for filen %s"
+#, fuzzy
+#~ msgid "Anal&yze"
+#~ msgstr "Analysér"
 
-#~ msgid "Looking up the fingerprint for file %s..."
-#~ msgstr "Slår fingeraftrykket for filen %s op..."
+#, fuzzy
+#~ msgid "Force Save"
+#~ msgstr "Tving gemning"
 
-#~ msgid "Creating fingerprint for file %s..."
-#~ msgstr "Opretter fingeraftrik for filen %s..."
+#, fuzzy
+#~ msgid ""
+#~ "Version %s\n"
+#~ "\n"
+#~ "(c) 2004 Robert Kaye and others\n"
+#~ "http://musicbrainz.org/\n"
+#~ "\n"
+#~ "(c) 2004 Real Networks Helix Community\n"
+#~ "http://helixcommunity.org/\n"
+#~ "\n"
+#~ "This application was made possible\n"
+#~ "by a Helix Community grant.\n"
+#~ "\n"
+#~ "Supported formats: %s"
+#~ msgstr ""
+#~ "Version %s\n"
+#~ "\n"
+#~ "(c) 2004 Robert Kaye m.fl.\n"
+#~ "http://musicbrainz.org/\n"
+#~ "\n"
+#~ "(c) 2004 Real Networks Helix Community\n"
+#~ "http://helixcommunity.org/\n"
+#~ "\n"
+#~ "Dette program er gjort muligt\n"
+#~ "af et Helix Community-stipendium.\n"
+#~ "\n"
+#~ "Understøttede formater: %s"
 
-#~ msgid "Length"
-#~ msgstr "Længde"
+#, fuzzy
+#~ msgid "Load recently used albums on startup"
+#~ msgstr "Hent senest brugte album ved opstart"
 
-#~ msgid "&Ok"
-#~ msgstr "&OK"
+#, fuzzy
+#~ msgid "New files (drag files to tag here)"
+#~ msgstr "Nye filer (træk filer der skal mærkes hertil)"
 
-#~ msgid "About"
-#~ msgstr "Om"
+#, fuzzy
+#~ msgid "CD Lookup error -- is there a CD in the CD-ROM drive?"
+#~ msgstr "Cd-opslagsfejl -- er der en cd i cd-rom-drevet?"
 
-#~ msgid "Advanced"
-#~ msgstr "Avanceret"
+#, fuzzy
+#~ msgid "&Quick Start Guide"
+#~ msgstr "Kort &introduktion"
 
-#~ msgid "Matching"
-#~ msgstr "Matchning"
+#, fuzzy
+#~ msgid "Quick Start Guide"
+#~ msgstr "Kort introduktion"
 
-#~ msgid "File Naming"
-#~ msgstr "Filnavngivning"
+#, fuzzy
+#~ msgid ""
+#~ "You have not specified an username and password. In order to contribute "
+#~ "data to MusicBrainz, you must have a MusicBrainz account.\n"
+#~ "Do you want to create a new account now? If you already have a "
+#~ "MusicBrainz account, please enter your user information in the options "
+#~ "dialog. "
+#~ msgstr ""
+#~ "Du har ikke angivet et brugernavn og kodeord. For at bidrage med data til "
+#~ "MusicBrainz skal du have en MusicBrainz-bruger.\n"
+#~ "Vil du oprette en ny bruger nu? Hvis du allerede har en MusicBrainz-"
+#~ "bruger bedes du venligst indtaste dine brugerinformationer i "
+#~ "indstillingsvinduet. "
 
-#~ msgid "Scripting"
-#~ msgstr "Scripting"
+#, fuzzy
+#~ msgid ""
+#~ "MusicBrainz Picard requires wxPython with UNICODE support.\n"
+#~ "Please download the appropriate toolkit from http://www.wxpython.org/"
+#~ msgstr ""
+#~ "MusicBrainz Picard kræver wxPython med Unicode-understøttelse.\n"
+#~ "Hent venligst det rigtige ¿toolkit? fra http://www.wxpython.org/"
 
-#~ msgid "Tags"
-#~ msgstr "Tags"
+#, fuzzy
+#~ msgid "Save error"
+#~ msgstr "Gemningsfejl"
 
-#~ msgid "User Interface"
-#~ msgstr "Brugergrænseflade"
+#, fuzzy
+#~ msgid ""
+#~ "The move files option is enabled, but the destination directory is not "
+#~ "specified or invalid.\n"
+#~ "Please fix the move option or the destination directory option and try "
+#~ "again."
+#~ msgstr ""
+#~ "'Flyt filer'-indstillingen er slået til, men målmappen er ikke angivet "
+#~ "eller er ugyldig.\n"
+#~ "Ret venligst flytte-indstillingen eller målmappe-indstillingen og prøv "
+#~ "igen."
 
-#~ msgid "Date"
-#~ msgstr "Dato"
+#, fuzzy
+#~ msgid ""
+#~ "Not all files could be saved. Please check for and examine tracks that "
+#~ "have an error icon in front of them. To retry saving the track, right "
+#~ "click the track and select 'Clear Error'"
+#~ msgstr ""
+#~ "Ikke alle filer kunne gemmes. Kig venligst efter og undersøg skæringer "
+#~ "der har et fejlikon udfor dem. For at prøve at gemme skæringen igen skal "
+#~ "du højreklikke på skæringen og vælge \"Ryd fejl\""
 
-#~ msgid "Album Artist"
-#~ msgstr "Albumkunstner"
+#, fuzzy
+#~ msgid "Select or drag a folder from below"
+#~ msgstr "Vælg eller træk en mappe nedenfra"
 
-#~ msgid "Track Number"
-#~ msgstr "Skæringsnummer"
+#, fuzzy
+#~ msgid "Drag files from below"
+#~ msgstr "Træk filer nedenfra"
 
-#~ msgid "Total Tracks"
-#~ msgstr "Skæringer i alt"
+#, fuzzy
+#~ msgid "Rename files when writing metadata tags"
+#~ msgstr "Omdøb filer ved skrivning af metadatamærker"
 
-#~ msgid "Disc Number"
-#~ msgstr "Disknummer"
+#, fuzzy
+#~ msgid ""
+#~ "You may use the following variables in the filenaming\n"
+#~ "specifications in the options dialog:"
+#~ msgstr ""
+#~ "Du kan bruge følgende variabler i filnavngivnings-\n"
+#~ "specifikationen i indstillingsvinduet:"
 
-#~ msgid "Total Discs"
-#~ msgstr "Diske i alt"
-
-#~ msgid "Album Artist Sort Order"
-#~ msgstr "Sorteringsrækkefølge for albumkunstnere"
-
-#~ msgid "Artist Sort Order"
-#~ msgstr "Sorteringsrækkefølge for kunstnere"
-
-#~ msgid "Title Sort Order"
-#~ msgstr "Sorteringsrækkefølge for titler"
-
-#~ msgid "Album Sort Order"
-#~ msgstr "Sorteringsrækkefølge for album"
-
-#~ msgid "ASIN"
-#~ msgstr "ASIN"
-
-#~ msgid "Grouping"
-#~ msgstr "Gruppering"
-
-#~ msgid "ISRC"
-#~ msgstr "ISRC"
-
-#~ msgid "Mood"
-#~ msgstr "Stemning"
-
-#~ msgid "BPM"
-#~ msgstr "BPM"
-
-#~ msgid "Copyright"
-#~ msgstr "Ophavsret"
-
-#~ msgid "Composer"
-#~ msgstr "Komponist"
-
-#~ msgid "Conductor"
-#~ msgstr "Dirigent"
-
-#~ msgid "Lyricist"
-#~ msgstr "Tekstforfatter"
-
-#~ msgid "Arranger"
-#~ msgstr "Arrangør"
-
-#~ msgid "Producer"
-#~ msgstr "Producer"
-
-#~ msgid "Engineer"
-#~ msgstr "Tekniker"
-
-#~ msgid "Subtitle"
-#~ msgstr "Undertitel"
-
-#~ msgid "Disc Subtitle"
-#~ msgstr "Diskundertitel"
-
-#~ msgid "Remixer"
-#~ msgstr "Remixer"
-
-#~ msgid "MusicBrainz Track Id"
-#~ msgstr "MusicBrainz skærings-id"
-
-#~ msgid "MusicBrainz Release Id"
-#~ msgstr "MusicBrainz udgivelses-id"
-
-#~ msgid "MusicBrainz Artist Id"
-#~ msgstr "MusicBrainz kunstner-id"
-
-#~ msgid "MusicBrainz Release Artist Id"
-#~ msgstr "MusicBrainz udgivelseskunster-id"
-
-#~ msgid "MusicBrainz TRM Id"
-#~ msgstr "MusicBrainz TRM-id"
-
-#~ msgid "MusicIP PUID"
-#~ msgstr "MusicIP PUID"
-
-#~ msgid "MusicIP Fingerprint"
-#~ msgstr "MusicIP-fingeraftryk"
-
-#~ msgid "Website"
-#~ msgstr "Websted"
-
-#~ msgid "Compilation"
-#~ msgstr "Opsamling"
-
-#~ msgid "Comment"
-#~ msgstr "Kommentar"
-
-#~ msgid "Genre"
-#~ msgstr "Genre"
-
-#~ msgid "Encoded By"
-#~ msgstr "Kodet af"
-
-#~ msgid "Performer"
-#~ msgstr "Optræder"
-
-#~ msgid "Release Type"
-#~ msgstr "Udgivelsestype"
-
-#~ msgid "Release Status"
-#~ msgstr "Udgivelsesstatus"
-
-#~ msgid "Record Label"
-#~ msgstr "Pladeselskab"
-
-#~ msgid "Barcode"
-#~ msgstr "Stregkode"
-
-#~ msgid "Catalog Number"
-#~ msgstr "Katalognummer"
-
-#~ msgid "DJ-Mixer"
-#~ msgstr "DJ-Mixer"
-
-#~ msgid "Media"
-#~ msgstr "Medie"
-
-#~ msgid "Lyrics"
-#~ msgstr "Sangtekst"
-
-#~ msgid "Mixer"
-#~ msgstr "Mixer"
+#, fuzzy
+#~ msgid "A %s in the naming specification will create a new subfolder."
+#~ msgstr "En %s i navngivningsspecifikationen vil oprette en ny undermappe."
 
+#, fuzzy
+#~ msgid "Generate &Cuesheet..."
+#~ msgstr "Generér s&pilleliste..."
 #~ msgid "Automatically analyze all new files"
 #~ msgstr "Analysér automatisk alle nye filer"
 
+#, fuzzy
+#~ msgid "Album artist:"
+#~ msgstr "Albumkunstner"
+
+#, fuzzy
+#~ msgid "A&dd Directory..."
+#~ msgstr "Tilføj &mappe...\tCtrl+D"
 #~ msgid "Are You Sure?"
 #~ msgstr "Er du sikker?"
-
 #~ msgid "Add &Files...\tCtrl+O"
 #~ msgstr "Tilføj &filer...\tCtrl+O"
-
 #~ msgid "Add &Directory...\tCtrl+D"
 #~ msgstr "Tilføj &mappe...\tCtrl+D"
-
 #~ msgid "&Save Files\tCtrl+S"
 #~ msgstr "&Gem filer\tCtrl+S"
-
 #~ msgid "C&opy\tCtrl+C"
 #~ msgstr "K&opiér\tCtrl+C"
-
 #~ msgid "Help"
 #~ msgstr "Hjælp"
-
 #~ msgid "Preferences"
 #~ msgstr "Indstillinger"
 
+#, fuzzy
+#~ msgid "Error while saving cuesheet %s."
+#~ msgstr ""
+#~ "Fejl under læsning af CD:\n"
+#~ "\n"
+#~ "%s"
+
+#, fuzzy
+#~ msgid "Cuesheet %s saved."
+#~ msgstr "Spilleliste %s gemt"
 #~ msgid "Time"
 #~ msgstr "Tid"
-
 #~ msgid "Albums"
 #~ msgstr "Album"
-
 #~ msgid "Buy"
 #~ msgstr "Køb"
-
 #~ msgid "Welcome to Picard!"
 #~ msgstr "Velkommen til Picard!"
-
 #~ msgid "PUID Collision"
 #~ msgstr "PUID-sammenstød"
-
-#~ msgid "Colors"
-#~ msgstr "Farver"
-
 #~ msgid "Font color"
 #~ msgstr "Tekstfarve"
-
 #~ msgid "Directories"
 #~ msgstr "Mapper"
-
 #~ msgid "Watch for new files"
 #~ msgstr "Overvåg for nye filer"
-
 #~ msgid "Watch this directory for new audio files"
 #~ msgstr "Overvåg mappe for nye lydfiler"
-
 #~ msgid "Encodings"
 #~ msgstr "Kodninger"
-
 #~ msgid "all languages"
 #~ msgstr "alle sprog"
-
 #~ msgid "percent similar."
 #~ msgstr "procent ens."
-
-#~ msgid "Language"
-#~ msgstr "Sprog"
-
-#~ msgid "System default"
-#~ msgstr "Systemstandard"
-
 #~ msgid "Allowed filename characters"
 #~ msgstr "Tilladte tegn i filnavnet"
-
 #~ msgid "Use Windows-safe file names"
 #~ msgstr "Brug Windows-sikre filnavne"
-
 #~ msgid "Number of tracks on the album"
 #~ msgstr "Antal skæringer på albummet"
-
 #~ msgid "File format (e.g. mp3, ogg, wav)"
 #~ msgstr "Filformat (f.eks. mp3, ogg, wav)"
-
 #~ msgid "Album type (album, single, EP, etc.)"
 #~ msgstr "Albumtype (album, single, EP, osv.)"
-
 #~ msgid "Use proxy server to access the Internet"
 #~ msgstr "Brug mellemværtsserver til at tilgå Internettet"
-
 #~ msgid "Proxy server to use"
 #~ msgstr "Brug mellemværtsserveren"
-
 #~ msgid "Proxy port"
 #~ msgstr "Mellemværtsport"
-
 #~ msgid "ID3v2.4 only"
 #~ msgstr "Kun ID3v2.4"
-
 #~ msgid "Save track/album"
 #~ msgstr "Gem skæring/album"
-
 #~ msgid "Artists"
 #~ msgstr "Kunstnere"
 
+#, fuzzy
+#~ msgid "Auto Tag"
+#~ msgstr "Rediger tag"
+
+#, fuzzy
+#~ msgid "Edit &Tags..."
+#~ msgstr "Rediger tag"
 #~ msgid "updating album information"
 #~ msgstr "opdaterer albuminformation"
-
 #~ msgid "Submitting PUID information to MusicBrainz server ..."
 #~ msgstr "Sender PUID-information til MusicBrainz-server..."
-
 #~ msgid "Performing a PUID lookup on file %s ..."
 #~ msgstr "Udfører PUID-opslag på filen %s..."
-
 #~ msgid "Are you sure you want to exit the application?"
 #~ msgstr "Er du sikker på du vil lukke programmet?"
 
+#, fuzzy
+#~ msgid "CD Lookup Failed"
+#~ msgstr "Cd-opslag"
 #~ msgid "Couldn't connect to the MusicBrainz server."
 #~ msgstr "Kunne ikke forbinde til MusicBrainz-serveren."
-
 #~ msgid "Connection error"
 #~ msgstr "Forbindelsesfejl"
-
 #~ msgid "PUID collision on file %s!"
 #~ msgstr "PUID-sammenstød for filen %s!"
-
 #~ msgid "Select directory that contains music files"
 #~ msgstr "Vælg mappe der indeholder musikfiler"
-
 #~ msgid "Reload album from main server"
 #~ msgstr "Genindlæs album fra hovedserver"
-
 #~ msgid "Release date"
 #~ msgstr "Udgivelsesdato"
-
 #~ msgid "%d%% similar"
 #~ msgstr "%d%% ens"
-
 #~ msgid "Please donate to MusicBrainz!"
 #~ msgstr "Donér venligst til MusicBrainz!"
-
-#~ msgid "Later"
-#~ msgstr "Senere"
-
 #~ msgid ""
 #~ "The destination directory %s does not exist. Please pick a valid "
 #~ "directory."
 #~ msgstr "Målmappen %s findes ikke. Vælg venligst en gyldig mappe."
-
 #~ msgid "Select the encoding to use when reading and writing filenames"
 #~ msgstr ""
 #~ "Vælg den kodning der skal bruges til læsning og skrivning af filnavne"
-
 #~ msgid "Automatically move clusters to albums that are at least"
 #~ msgstr "Flyt automatisk klynger til album der er mindst"
-
 #~ msgid "Automatically save recognized tracks that are at least"
 #~ msgstr "Gem automatisk genkendte skæringer der er mindst"
-
-#~ msgid "Czech"
-#~ msgstr "Tjekkisk"
-
-#~ msgid "German"
-#~ msgstr "Tysk"
-
-#~ msgid "English"
-#~ msgstr "Engelsk"
-
-#~ msgid "Spanish"
-#~ msgstr "Spansk"
-
-#~ msgid "Finnish"
-#~ msgstr "Finsk"
-
-#~ msgid "French"
-#~ msgstr "Fransk"
-
-#~ msgid "Hungarian"
-#~ msgstr "Ungarsk"
-
-#~ msgid "Icelandic"
-#~ msgstr "Islandsk"
-
-#~ msgid "Italian"
-#~ msgstr "Italiensk"
-
-#~ msgid "Dutch"
-#~ msgstr "Hollandsk"
-
-#~ msgid "Portuguese"
-#~ msgstr "Portugisisk"
-
-#~ msgid "Russian"
-#~ msgstr "Russisk"
-
-#~ msgid "Swedish"
-#~ msgstr "Svensk"
-
 #~ msgid ""
 #~ "Note: This setting will take effect after you restart the application."
 #~ msgstr ""
 #~ "Bemærk: Denne indstilling vil få effekt efter du har genstartet "
 #~ "programmet."
-
 #~ msgid "Artist translation"
 #~ msgstr "Kunstneroversættelse"
-
 #~ msgid "Naming Help"
 #~ msgstr "Navngivningshjælp"
-
 #~ msgid "Audio fingerprinting options"
 #~ msgstr "Lydaftryksindstillinger"
-
 #~ msgid "Automatically select PUID collision tracks that are at least"
 #~ msgstr "Vælg automatisk skæringer med PUID-sammenstød der er mindst"
-
 #~ msgid "Write ID3v1 tags to MP3 files (ID3v2 tags will always be written)"
 #~ msgstr ""
 #~ "Skriv ID3v1-mærker i MP3-filer (ID3v2-mærker vil altid blive skrevet)"
-
 #~ msgid "Remove track/album"
 #~ msgstr "Fjern skæring/album"
-
 #~ msgid "Listen to track"
 #~ msgstr "Hør skæring"
+
diff --git a/po/de.po b/po/de.po
index 3bc868ab6..c26a160f1 100644
--- a/po/de.po
+++ b/po/de.po
@@ -7,36 +7,1300 @@ msgid ""
 msgstr ""
 "Project-Id-Version: picard\n"
 "Report-Msgid-Bugs-To: http://bugs.musicbrainz.org/\n"
-"POT-Creation-Date: 2008-12-01 18:20+0100\n"
-"PO-Revision-Date: 2008-11-18 12:06+0000\n"
-"Last-Translator: Philipp Wolfer <Unknown>\n"
+"POT-Creation-Date: 2009-01-25 12:23+0100\n"
+"PO-Revision-Date: 2009-01-25 12:53+0100\n"
+"Last-Translator: Philipp Wolfer <phw@rubyforge.org>\n"
 "Language-Team: German <de@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2008-12-01 17:02+0000\n"
+"X-Launchpad-Export-Date: 2009-01-24 23:28+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 "Generated-By: pygettext.py 1.5\n"
 
-#: ../picard/album.py:108 ../picard/cluster.py:248
+#: ../picard/album.py:108
+#: ../picard/cluster.py:248
 msgid "Unmatched Files"
 msgstr "nicht zugeordnete Dateien"
 
-#: ../picard/album.py:269
+#: ../picard/album.py:281
 #, python-format
 msgid "[couldn't load album %s]"
 msgstr "[konnte Album %s nicht laden]"
 
-#: ../picard/album.py:305
+#: ../picard/album.py:317
 msgid "[loading album information]"
 msgstr "[lade Albuminformationen]"
 
-#: ../picard/tagger.py:472
+#: ../picard/cluster.py:164
+#: ../picard/cluster.py:175
+#, python-format
+msgid "No matching releases for cluster %s"
+msgstr "Keine passenden Alben für Gruppe %s"
+
+#: ../picard/cluster.py:177
+#, python-format
+msgid "Cluster %s identified!"
+msgstr "Gruppe %s identifiziert!"
+
+#: ../picard/cluster.py:182
+#, python-format
+msgid "Looking up the metadata for cluster %s..."
+msgstr "Frage Metadaten für Gruppe %s ab..."
+
+#: ../picard/const.py:40
+msgid "CD"
+msgstr "CD"
+
+#: ../picard/const.py:41
+msgid "DVD"
+msgstr "DVD"
+
+#: ../picard/const.py:42
+msgid "SACD"
+msgstr "SACD"
+
+#: ../picard/const.py:43
+msgid "LaserDisc"
+msgstr "LaserDisc"
+
+#: ../picard/const.py:44
+msgid "MiniDisc"
+msgstr "MiniDisc"
+
+#: ../picard/const.py:45
+msgid "Vinyl"
+msgstr ""
+
+#: ../picard/const.py:46
+msgid "Cassette"
+msgstr "Kassete"
+
+#: ../picard/const.py:47
+msgid "Cartridge (4/8-tracks)"
+msgstr ""
+
+#: ../picard/const.py:48
+msgid "Reel-to-Reel"
+msgstr ""
+
+#: ../picard/const.py:49
+msgid "DAT"
+msgstr "DAT"
+
+#: ../picard/const.py:50
+#, fuzzy
+msgid "Digital Media"
+msgstr "Original-Metadaten"
+
+#: ../picard/const.py:51
+msgid "Wax Cylinder"
+msgstr "Wachszylinder"
+
+#: ../picard/const.py:52
+msgid "Piano Roll"
+msgstr ""
+
+#: ../picard/const.py:53
+#, fuzzy
+msgid "Other"
+msgstr "Datum"
+
+#: ../picard/const.py:58
+msgid "Bangladesh"
+msgstr ""
+
+#: ../picard/const.py:59
+msgid "Belgium"
+msgstr ""
+
+#: ../picard/const.py:60
+msgid "Burkina Faso"
+msgstr ""
+
+#: ../picard/const.py:61
+msgid "Bulgaria"
+msgstr "Bulgarien"
+
+#: ../picard/const.py:62
+msgid "Barbados"
+msgstr ""
+
+#: ../picard/const.py:63
+msgid "Wallis and Futuna Islands"
+msgstr ""
+
+#: ../picard/const.py:64
+#, fuzzy
+msgid "Bermuda"
+msgstr "Allgemein"
+
+#: ../picard/const.py:65
+msgid "Brunei Darussalam"
+msgstr ""
+
+#: ../picard/const.py:66
+msgid "Bolivia"
+msgstr "Bolivien"
+
+#: ../picard/const.py:67
+msgid "Bahrain"
+msgstr ""
+
+#: ../picard/const.py:68
+msgid "Burundi"
+msgstr ""
+
+#: ../picard/const.py:69
+msgid "Benin"
+msgstr ""
+
+#: ../picard/const.py:70
+msgid "Bhutan"
+msgstr ""
+
+#: ../picard/const.py:71
+msgid "Jamaica"
+msgstr ""
+
+#: ../picard/const.py:72
+msgid "Bouvet Island"
+msgstr ""
+
+#: ../picard/const.py:73
+msgid "Botswana"
+msgstr ""
+
+#: ../picard/const.py:74
+msgid "Samoa"
+msgstr ""
+
+#: ../picard/const.py:75
+msgid "Brazil"
+msgstr "Brasilien"
+
+#: ../picard/const.py:76
+msgid "Bahamas"
+msgstr ""
+
+#: ../picard/const.py:77
+msgid "Belarus"
+msgstr ""
+
+#: ../picard/const.py:78
+msgid "Belize"
+msgstr ""
+
+#: ../picard/const.py:79
+msgid "Russian Federation"
+msgstr ""
+
+#: ../picard/const.py:80
+msgid "Rwanda"
+msgstr ""
+
+#: ../picard/const.py:81
+msgid "Reunion"
+msgstr ""
+
+#: ../picard/const.py:82
+msgid "Turkmenistan"
+msgstr ""
+
+#: ../picard/const.py:83
+msgid "Tajikistan"
+msgstr ""
+
+#: ../picard/const.py:84
+#, fuzzy
+msgid "Romania"
+msgstr "Rumänisch"
+
+#: ../picard/const.py:85
+#, fuzzy
+msgid "Tokela"
+msgstr "&Werkzeugleiste"
+
+#: ../picard/const.py:86
+msgid "Guinea-Bissa"
+msgstr ""
+
+#: ../picard/const.py:87
+msgid "Guam"
+msgstr ""
+
+#: ../picard/const.py:88
+msgid "Guatemala"
+msgstr ""
+
+#: ../picard/const.py:89
+msgid "Greece"
+msgstr "Griechenland"
+
+#: ../picard/const.py:90
+msgid "Equatorial Guinea"
+msgstr ""
+
+#: ../picard/const.py:91
+msgid "Guadeloupe"
+msgstr ""
+
+#: ../picard/const.py:92
+msgid "Japan"
+msgstr "Japan"
+
+#: ../picard/const.py:93
+msgid "Guyana"
+msgstr ""
+
+#: ../picard/const.py:94
+#, fuzzy
+msgid "French Guiana"
+msgstr "Französisch"
+
+#: ../picard/const.py:95
+msgid "Georgia"
+msgstr "Georgien"
+
+#: ../picard/const.py:96
+msgid "Grenada"
+msgstr ""
+
+#: ../picard/const.py:97
+msgid "United Kingdom"
+msgstr "Vereinigtes Königreich"
+
+#: ../picard/const.py:98
+msgid "Gabon"
+msgstr ""
+
+#: ../picard/const.py:99
+msgid "El Salvador"
+msgstr ""
+
+#: ../picard/const.py:100
+#, fuzzy
+msgid "Guinea"
+msgstr "Allgemein"
+
+#: ../picard/const.py:101
+msgid "Gambia"
+msgstr ""
+
+#: ../picard/const.py:102
+msgid "Greenland"
+msgstr "Grönland"
+
+#: ../picard/const.py:103
+msgid "Gibraltar"
+msgstr ""
+
+#: ../picard/const.py:104
+msgid "Ghana"
+msgstr ""
+
+#: ../picard/const.py:105
+#, fuzzy
+msgid "Oman"
+msgstr "Allgemein"
+
+#: ../picard/const.py:106
+msgid "Tunisia"
+msgstr ""
+
+#: ../picard/const.py:107
+msgid "Jordan"
+msgstr "Jordanien"
+
+#: ../picard/const.py:108
+msgid "Haiti"
+msgstr ""
+
+#: ../picard/const.py:109
+msgid "Hungary"
+msgstr "Ungarn"
+
+#: ../picard/const.py:110
+msgid "Hong Kong"
+msgstr "Hong Kong"
+
+#: ../picard/const.py:111
+msgid "Honduras"
+msgstr ""
+
+#: ../picard/const.py:112
+msgid "Heard and Mc Donald Islands"
+msgstr ""
+
+#: ../picard/const.py:113
+msgid "Venezuela"
+msgstr ""
+
+#: ../picard/const.py:114
+msgid "Puerto Rico"
+msgstr ""
+
+#: ../picard/const.py:115
+msgid "Pala"
+msgstr ""
+
+#: ../picard/const.py:116
+msgid "Portugal"
+msgstr "Portugal"
+
+#: ../picard/const.py:117
+msgid "Svalbard and Jan Mayen Islands"
+msgstr ""
+
+#: ../picard/const.py:118
+msgid "Paraguay"
+msgstr ""
+
+#: ../picard/const.py:119
+msgid "Iraq"
+msgstr "Irak"
+
+#: ../picard/const.py:120
+msgid "Panama"
+msgstr ""
+
+#: ../picard/const.py:121
+msgid "French Polynesia"
+msgstr ""
+
+#: ../picard/const.py:122
+msgid "Papua New Guinea"
+msgstr ""
+
+#: ../picard/const.py:123
+msgid "Per"
+msgstr ""
+
+#: ../picard/const.py:124
+msgid "Pakistan"
+msgstr "Pakistan"
+
+#: ../picard/const.py:125
+msgid "Philippines"
+msgstr ""
+
+#: ../picard/const.py:126
+msgid "Pitcairn"
+msgstr ""
+
+#: ../picard/const.py:127
+msgid "Poland"
+msgstr "Polen"
+
+#: ../picard/const.py:128
+msgid "St. Pierre and Miquelon"
+msgstr ""
+
+#: ../picard/const.py:129
+msgid "Zambia"
+msgstr ""
+
+#: ../picard/const.py:130
+msgid "Western Sahara"
+msgstr ""
+
+#: ../picard/const.py:131
+msgid "Estonia"
+msgstr ""
+
+#: ../picard/const.py:132
+msgid "Egypt"
+msgstr "Ägypten"
+
+#: ../picard/const.py:133
+msgid "South Africa"
+msgstr "Südafrika"
+
+#: ../picard/const.py:134
+msgid "Ecuador"
+msgstr "Ecuador"
+
+#: ../picard/const.py:135
+msgid "Italy"
+msgstr "Italien"
+
+#: ../picard/const.py:136
+#, fuzzy
+msgid "Viet Nam"
+msgstr "Dateiname"
+
+#: ../picard/const.py:137
+msgid "Solomon Islands"
+msgstr ""
+
+#: ../picard/const.py:138
+msgid "Ethiopia"
+msgstr "Äthiopien"
+
+#: ../picard/const.py:139
+#, fuzzy
+msgid "Somalia"
+msgstr "Rumänisch"
+
+#: ../picard/const.py:140
+msgid "Zimbabwe"
+msgstr "Zimbabwe"
+
+#: ../picard/const.py:141
+msgid "Saudi Arabia"
+msgstr ""
+
+#: ../picard/const.py:142
+msgid "Spain"
+msgstr "Spanien"
+
+#: ../picard/const.py:143
+msgid "Eritrea"
+msgstr ""
+
+#: ../picard/const.py:144
+msgid "Moldova, Republic of"
+msgstr ""
+
+#: ../picard/const.py:145
+msgid "Madagascar"
+msgstr ""
+
+#: ../picard/const.py:146
+msgid "Morocco"
+msgstr "Marokko"
+
+#: ../picard/const.py:147
+#, fuzzy
+msgid "Monaco"
+msgstr "Mono"
+
+#: ../picard/const.py:148
+msgid "Uzbekistan"
+msgstr ""
+
+#: ../picard/const.py:149
+msgid "Myanmar"
+msgstr ""
+
+#: ../picard/const.py:150
+msgid "Mali"
+msgstr ""
+
+#: ../picard/const.py:151
+msgid "Maca"
+msgstr ""
+
+#: ../picard/const.py:152
+#, fuzzy
+msgid "Mongolia"
+msgstr "Mono"
+
+#: ../picard/const.py:153
+msgid "Marshall Islands"
+msgstr ""
+
+#: ../picard/const.py:154
+msgid "Macedonia, The Former Yugoslav Republic of"
+msgstr ""
+
+#: ../picard/const.py:155
+msgid "Mauritius"
+msgstr ""
+
+#: ../picard/const.py:156
+#, fuzzy
+msgid "Malta"
+msgstr "Metadaten"
+
+#: ../picard/const.py:157
+msgid "Malawi"
+msgstr ""
+
+#: ../picard/const.py:158
+msgid "Maldives"
+msgstr ""
+
+#: ../picard/const.py:159
+msgid "Martinique"
+msgstr ""
+
+#: ../picard/const.py:160
+msgid "Northern Mariana Islands"
+msgstr ""
+
+#: ../picard/const.py:161
+msgid "Montserrat"
+msgstr ""
+
+#: ../picard/const.py:162
+#, fuzzy
+msgid "Mauritania"
+msgstr "Litauisch"
+
+#: ../picard/const.py:163
+msgid "Uganda"
+msgstr ""
+
+#: ../picard/const.py:164
+msgid "Malaysia"
+msgstr ""
+
+#: ../picard/const.py:165
+msgid "Mexico"
+msgstr ""
+
+#: ../picard/const.py:166
+msgid "Israel"
+msgstr "Israel"
+
+#: ../picard/const.py:167
+msgid "France"
+msgstr "Frankreich"
+
+#: ../picard/const.py:168
+msgid "British Indian Ocean Territory"
+msgstr ""
+
+#: ../picard/const.py:169
+msgid "St. Helena"
+msgstr ""
+
+#: ../picard/const.py:170
+msgid "Finland"
+msgstr "Finnland"
+
+#: ../picard/const.py:171
+msgid "Fiji"
+msgstr ""
+
+#: ../picard/const.py:172
+msgid "Falkland Islands (Malvinas)"
+msgstr ""
+
+#: ../picard/const.py:173
+msgid "Micronesia, Federated States of"
+msgstr ""
+
+#: ../picard/const.py:174
+msgid "Faroe Islands"
+msgstr ""
+
+#: ../picard/const.py:175
+msgid "Nicaragua"
+msgstr ""
+
+#: ../picard/const.py:176
+msgid "Netherlands"
+msgstr ""
+
+#: ../picard/const.py:177
+msgid "Norway"
+msgstr "Norwegen"
+
+#: ../picard/const.py:178
+msgid "Namibia"
+msgstr "Namibia"
+
+#: ../picard/const.py:179
+msgid "Vanuat"
+msgstr ""
+
+#: ../picard/const.py:180
+msgid "New Caledonia"
+msgstr ""
+
+#: ../picard/const.py:181
+#, fuzzy
+msgid "Niger"
+msgstr "Mixer"
+
+#: ../picard/const.py:182
+msgid "Norfolk Island"
+msgstr ""
+
+#: ../picard/const.py:183
+msgid "Nigeria"
+msgstr ""
+
+#: ../picard/const.py:184
+#, fuzzy
+msgid "New Zealand"
+msgstr "Neue Metadaten"
+
+#: ../picard/const.py:185
+msgid "Zaire"
+msgstr ""
+
+#: ../picard/const.py:186
+msgid "Nepal"
+msgstr "Nepal"
+
+#: ../picard/const.py:187
+msgid "Naur"
+msgstr ""
+
+#: ../picard/const.py:188
+msgid "Niue"
+msgstr ""
+
+#: ../picard/const.py:189
+msgid "Cook Islands"
+msgstr ""
+
+#: ../picard/const.py:190
+msgid "Cote d'Ivoire"
+msgstr ""
+
+#: ../picard/const.py:191
+msgid "Switzerland"
+msgstr "Schweiz"
+
+#: ../picard/const.py:192
+msgid "Colombia"
+msgstr "Kolumbien"
+
+#: ../picard/const.py:193
+msgid "China"
+msgstr "China"
+
+#: ../picard/const.py:194
+msgid "Cameroon"
+msgstr ""
+
+#: ../picard/const.py:195
+#, fuzzy
+msgid "Chile"
+msgstr "Datei"
+
+#: ../picard/const.py:196
+msgid "Cocos (Keeling) Islands"
+msgstr "Kanada"
+
+#: ../picard/const.py:197
+msgid "Canada"
+msgstr ""
+
+#: ../picard/const.py:198
+#, fuzzy
+msgid "Congo"
+msgstr "Mono"
+
+#: ../picard/const.py:199
+msgid "Central African Republic"
+msgstr ""
+
+#: ../picard/const.py:200
+msgid "Czech Republic"
+msgstr ""
+
+#: ../picard/const.py:201
+msgid "Cyprus"
+msgstr ""
+
+#: ../picard/const.py:202
+msgid "Christmas Island"
+msgstr ""
+
+#: ../picard/const.py:203
+msgid "Costa Rica"
+msgstr ""
+
+#: ../picard/const.py:204
+msgid "Cape Verde"
+msgstr ""
+
+#: ../picard/const.py:205
+msgid "Cuba"
+msgstr "Kuba"
+
+#: ../picard/const.py:206
+msgid "Swaziland"
+msgstr "Swasiland"
+
+#: ../picard/const.py:207
+msgid "Syrian Arab Republic"
+msgstr ""
+
+#: ../picard/const.py:208
+msgid "Kyrgyzstan"
+msgstr ""
+
+#: ../picard/const.py:209
+msgid "Kenya"
+msgstr ""
+
+#: ../picard/const.py:210
+msgid "Suriname"
+msgstr ""
+
+#: ../picard/const.py:211
+msgid "Kiribati"
+msgstr ""
+
+#: ../picard/const.py:212
+msgid "Cambodia"
+msgstr ""
+
+#: ../picard/const.py:213
+msgid "Saint Kitts and Nevis"
+msgstr ""
+
+#: ../picard/const.py:214
+#, fuzzy
+msgid "Comoros"
+msgstr "Farben"
+
+#: ../picard/const.py:215
+msgid "Sao Tome and Principe"
+msgstr ""
+
+#: ../picard/const.py:216
+#, fuzzy
+msgid "Slovenia"
+msgstr "Slowakisch"
+
+#: ../picard/const.py:217
+msgid "Kuwait"
+msgstr ""
+
+#: ../picard/const.py:218
+#, fuzzy
+msgid "Senegal"
+msgstr "Allgemein"
+
+#: ../picard/const.py:219
+msgid "San Marino"
+msgstr ""
+
+#: ../picard/const.py:220
+msgid "Sierra Leone"
+msgstr ""
+
+#: ../picard/const.py:221
+msgid "Seychelles"
+msgstr ""
+
+#: ../picard/const.py:222
+msgid "Kazakhstan"
+msgstr ""
+
+#: ../picard/const.py:223
+msgid "Cayman Islands"
+msgstr ""
+
+#: ../picard/const.py:224
+msgid "Singapore"
+msgstr ""
+
+#: ../picard/const.py:225
+msgid "Sweden"
+msgstr "Schweden"
+
+#: ../picard/const.py:226
+#, fuzzy
+msgid "Sudan"
+msgstr "&Prüfen"
+
+#: ../picard/const.py:227
+msgid "Dominican Republic"
+msgstr ""
+
+#: ../picard/const.py:228
+#, fuzzy
+msgid "Dominica"
+msgstr "Rumänisch"
+
+#: ../picard/const.py:229
+#, fuzzy
+msgid "Djibouti"
+msgstr "Über"
+
+#: ../picard/const.py:230
+msgid "Denmark"
+msgstr "Dänemark"
+
+#: ../picard/const.py:231
+msgid "Virgin Islands (British)"
+msgstr ""
+
+#: ../picard/const.py:232
+msgid "Germany"
+msgstr "Deutschland"
+
+#: ../picard/const.py:233
+msgid "Yemen"
+msgstr ""
+
+#: ../picard/const.py:234
+msgid "Algeria"
+msgstr ""
+
+#: ../picard/const.py:235
+msgid "United States"
+msgstr ""
+
+#: ../picard/const.py:236
+msgid "Uruguay"
+msgstr ""
+
+#: ../picard/const.py:237
+msgid "Mayotte"
+msgstr ""
+
+#: ../picard/const.py:238
+msgid "United States Minor Outlying Islands"
+msgstr ""
+
+#: ../picard/const.py:239
+msgid "Lebanon"
+msgstr ""
+
+#: ../picard/const.py:240
+msgid "Saint Lucia"
+msgstr ""
+
+#: ../picard/const.py:241
+msgid "Lao People's Democratic Republic"
+msgstr ""
+
+#: ../picard/const.py:242
+msgid "Tuval"
+msgstr ""
+
+#: ../picard/const.py:243
+msgid "Taiwan"
+msgstr "Taiwan"
+
+#: ../picard/const.py:244
+msgid "Trinidad and Tobago"
+msgstr ""
+
+#: ../picard/const.py:245
+msgid "Turkey"
+msgstr "Türkei"
+
+#: ../picard/const.py:246
+msgid "Sri Lanka"
+msgstr ""
+
+#: ../picard/const.py:247
+msgid "Liechtenstein"
+msgstr ""
+
+#: ../picard/const.py:248
+msgid "Latvia"
+msgstr ""
+
+#: ../picard/const.py:249
+msgid "Tonga"
+msgstr ""
+
+#: ../picard/const.py:250
+#, fuzzy
+msgid "Lithuania"
+msgstr "Litauisch"
+
+#: ../picard/const.py:251
+msgid "Luxembourg"
+msgstr ""
+
+#: ../picard/const.py:252
+msgid "Liberia"
+msgstr ""
+
+#: ../picard/const.py:253
+#, fuzzy
+msgid "Lesotho"
+msgstr "Dauer"
+
+#: ../picard/const.py:254
+msgid "Thailand"
+msgstr ""
+
+#: ../picard/const.py:255
+msgid "French Southern Territories"
+msgstr ""
+
+#: ../picard/const.py:256
+#, fuzzy
+msgid "Togo"
+msgstr "&Extras"
+
+#: ../picard/const.py:257
+msgid "Chad"
+msgstr ""
+
+#: ../picard/const.py:258
+msgid "Turks and Caicos Islands"
+msgstr ""
+
+#: ../picard/const.py:259
+msgid "Libyan Arab Jamahiriya"
+msgstr ""
+
+#: ../picard/const.py:260
+msgid "Vatican City State (Holy See)"
+msgstr ""
+
+#: ../picard/const.py:261
+msgid "Saint Vincent and The Grenadines"
+msgstr ""
+
+#: ../picard/const.py:262
+msgid "United Arab Emirates"
+msgstr ""
+
+#: ../picard/const.py:263
+msgid "Andorra"
+msgstr ""
+
+#: ../picard/const.py:264
+msgid "Antigua and Barbuda"
+msgstr ""
+
+#: ../picard/const.py:265
+msgid "Afghanistan"
+msgstr ""
+
+#: ../picard/const.py:266
+msgid "Anguilla"
+msgstr ""
+
+#: ../picard/const.py:267
+msgid "Virgin Islands (U.S.)"
+msgstr ""
+
+#: ../picard/const.py:268
+msgid "Iceland"
+msgstr "Island"
+
+#: ../picard/const.py:269
+msgid "Iran (Islamic Republic of)"
+msgstr ""
+
+#: ../picard/const.py:270
+msgid "Armenia"
+msgstr ""
+
+#: ../picard/const.py:271
+msgid "Albania"
+msgstr ""
+
+#: ../picard/const.py:272
+msgid "Angola"
+msgstr ""
+
+#: ../picard/const.py:273
+msgid "Netherlands Antilles"
+msgstr ""
+
+#: ../picard/const.py:274
+msgid "Antarctica"
+msgstr ""
+
+#: ../picard/const.py:275
+msgid "American Samoa"
+msgstr ""
+
+#: ../picard/const.py:276
+msgid "Argentina"
+msgstr ""
+
+#: ../picard/const.py:277
+msgid "Australia"
+msgstr "Australien"
+
+#: ../picard/const.py:278
+msgid "Austria"
+msgstr "Österreich"
+
+#: ../picard/const.py:279
+msgid "Aruba"
+msgstr ""
+
+#: ../picard/const.py:280
+msgid "India"
+msgstr "Indien"
+
+#: ../picard/const.py:281
+msgid "Tanzania, United Republic of"
+msgstr ""
+
+#: ../picard/const.py:282
+msgid "Azerbaijan"
+msgstr ""
+
+#: ../picard/const.py:283
+msgid "Ireland"
+msgstr "Irland"
+
+#: ../picard/const.py:284
+msgid "Indonesia"
+msgstr "Indonesien"
+
+#: ../picard/const.py:285
+msgid "Ukraine"
+msgstr "Ukraine"
+
+#: ../picard/const.py:286
+#, fuzzy
+msgid "Qatar"
+msgstr "Datum"
+
+#: ../picard/const.py:287
+msgid "Mozambique"
+msgstr ""
+
+#: ../picard/const.py:288
+msgid "Bosnia and Herzegovina"
+msgstr ""
+
+#: ../picard/const.py:289
+msgid "Congo, The Democratic Republic of the"
+msgstr ""
+
+#: ../picard/const.py:290
+msgid "Serbia and Montenegro"
+msgstr ""
+
+#: ../picard/const.py:291
+msgid "Croatia"
+msgstr ""
+
+#: ../picard/const.py:292
+msgid "Korea (North), Democratic People's Republic of"
+msgstr ""
+
+#: ../picard/const.py:293
+msgid "Korea (South), Republic of"
+msgstr ""
+
+#: ../picard/const.py:294
+#, fuzzy
+msgid "Slovakia"
+msgstr "Slowakisch"
+
+#: ../picard/const.py:295
+msgid "Soviet Union (historical, 1922-1991)"
+msgstr ""
+
+#: ../picard/const.py:296
+msgid "East Timor"
+msgstr ""
+
+#: ../picard/const.py:297
+msgid "Czechoslovakia (historical, 1918-1992)"
+msgstr ""
+
+#: ../picard/const.py:298
+msgid "Europe"
+msgstr "Europa"
+
+#: ../picard/const.py:299
+msgid "East Germany (historical, 1949-1990)"
+msgstr ""
+
+#: ../picard/const.py:300
+msgid "[Unknown Country]"
+msgstr "[Unbekanntes Land]"
+
+#: ../picard/const.py:301
+msgid "[Worldwide]"
+msgstr "[Weltweit]"
+
+#: ../picard/const.py:302
+msgid "Yugoslavia (historical, 1918-1992)"
+msgstr ""
+
+#: ../picard/const.py:307
+#, fuzzy
+msgid "Catalan"
+msgstr "Italienisch"
+
+#: ../picard/const.py:308
+msgid "Czech"
+msgstr "Tschechisch"
+
+#: ../picard/const.py:309
+msgid "Welsh"
+msgstr ""
+
+#: ../picard/const.py:310
+msgid "Danish"
+msgstr "Dänisch"
+
+#: ../picard/const.py:311
+msgid "German"
+msgstr "Deutsch"
+
+#: ../picard/const.py:312
+msgid "English"
+msgstr "Englisch"
+
+#: ../picard/const.py:313
+#, fuzzy
+msgid "English (Canada)"
+msgstr "Englisch (UK)"
+
+#: ../picard/const.py:314
+msgid "English (UK)"
+msgstr "Englisch (UK)"
+
+#: ../picard/const.py:315
+msgid "Spanish"
+msgstr "Spanisch"
+
+#: ../picard/const.py:316
+msgid "Persian"
+msgstr "Persisch"
+
+#: ../picard/const.py:317
+msgid "Finnish"
+msgstr "Finnisch"
+
+#: ../picard/const.py:318
+msgid "French"
+msgstr "Französisch"
+
+#: ../picard/const.py:319
+msgid "Frisian"
+msgstr ""
+
+#: ../picard/const.py:320
+msgid "Hebrew"
+msgstr "Hebräisch"
+
+#: ../picard/const.py:321
+msgid "Hungarian"
+msgstr "Ungarisch"
+
+#: ../picard/const.py:322
+msgid "Islandic"
+msgstr "Isländisch"
+
+#: ../picard/const.py:323
+msgid "Italian"
+msgstr "Italienisch"
+
+#: ../picard/const.py:324
+msgid "Kannada"
+msgstr ""
+
+#: ../picard/const.py:325
+msgid "Korean"
+msgstr "Koreanisch"
+
+#: ../picard/const.py:326
+msgid "Lithuanian"
+msgstr "Litauisch"
+
+#: ../picard/const.py:327
+msgid "Norwegian Bokmal"
+msgstr "Norwegisches Bokmål"
+
+#: ../picard/const.py:328
+msgid "Dutch"
+msgstr "Niederländisch"
+
+#: ../picard/const.py:329
+msgid "Polish"
+msgstr "Polnisch"
+
+#: ../picard/const.py:330
+msgid "Portuguese"
+msgstr "Portugiesisch"
+
+#: ../picard/const.py:331
+#, fuzzy
+msgid "Brazilian Portuguese"
+msgstr "Portugiesisch"
+
+#: ../picard/const.py:332
+msgid "Romanian"
+msgstr "Rumänisch"
+
+#: ../picard/const.py:333
+msgid "Russian"
+msgstr "Russisch"
+
+#: ../picard/const.py:334
+#, fuzzy
+msgid "Scots"
+msgstr "Relevanz"
+
+#: ../picard/const.py:335
+msgid "Slovak"
+msgstr "Slowakisch"
+
+#: ../picard/const.py:336
+msgid "Slovenian"
+msgstr "Slowakisch"
+
+#: ../picard/const.py:337
+msgid "Swedish"
+msgstr "Schwedisch"
+
+#: ../picard/const.py:338
+msgid "Chinese"
+msgstr "Chinesisch"
+
+#: ../picard/file.py:475
+#, python-format
+msgid "No matching tracks for file %s"
+msgstr "Keine passenden Titel für Datei %s"
+
+#: ../picard/file.py:492
+#, fuzzy, python-format
+msgid "No matching tracks above the threshold for file %s"
+msgstr "Keine passenden Titel für Datei %s"
+
+#: ../picard/file.py:495
+#, python-format
+msgid "File %s identified!"
+msgstr "Datei %s identifiziert!"
+
+#: ../picard/file.py:506
+#, python-format
+msgid "Looking up the PUID for file %s..."
+msgstr "Frage PUID für Datei %s ab..."
+
+#: ../picard/file.py:511
+#, python-format
+msgid "Looking up the metadata for file %s..."
+msgstr "Frage Metadaten für Datei %s ab..."
+
+#: ../picard/puidmanager.py:58
+msgid "Submitting PUIDs..."
+msgstr "Übertrage PUIDs …"
+
+#: ../picard/puidmanager.py:64
+#, python-format
+msgid "PUIDs submission failed: %s"
+msgstr "Übertragung der PUIDs fehlgeschlagen: %s"
+
+#: ../picard/puidmanager.py:66
+msgid "PUIDs successfully submitted!"
+msgstr "PUIDs erfolgreich versandt."
+
+#: ../picard/playlist.py:31
+msgid "M3U Playlist (*.m3u)"
+msgstr "M3U-Wiedergabeliste (*.m3u)"
+
+#: ../picard/playlist.py:32
+msgid "PLS Playlist (*.pls)"
+msgstr "PLS-Wiedergabeliste (*.pls)"
+
+#: ../picard/playlist.py:33
+msgid "XSPF Playlist (*.xspf)"
+msgstr "XSPF-Wiedergabeliste (*.xspf)"
+
+#: ../picard/tagger.py:476
 msgid "CD Lookup Error"
 msgstr "CD-Lookup-Fehler"
 
-#: ../picard/tagger.py:473
+#: ../picard/tagger.py:477
 #, python-format
 msgid ""
 "Error while reading CD:\n"
@@ -46,126 +1310,174 @@ msgstr ""
 "Fehler beim Lesen der CD:\n"
 "%s"
 
-#: ../picard/ui/passworddialog.py:38
+#: ../picard/tagger.py:503
 #, python-format
-msgid ""
-"The server %s requires you to login. Please enter your username and password."
-msgstr ""
+msgid "Couldn't find PUID for file %s"
+msgstr "Konnnte PUID für Datei %s nicht laden."
 
-#: ../picard/ui/ui_options_script.py:52
-msgid "Tagger Script"
-msgstr "Tagger-Skript"
+#: ../picard/musicdns/__init__.py:98
+#, python-format
+msgid "Looking up the fingerprint for file %s..."
+msgstr "Frage akustischen Fingerabdruck der Datei %s ab …"
+
+#: ../picard/musicdns/__init__.py:117
+#, python-format
+msgid "Creating fingerprint for file %s..."
+msgstr "Erzeuge akustischen Fingerabdruck der Datei %s …"
 
 #: ../picard/ui/cdlookup.py:31
 msgid "Score"
 msgstr "Relevanz"
 
 #: ../picard/ui/cdlookup.py:31
+#: ../picard/ui/itemviews.py:82
+#: ../picard/util/tags.py:23
 msgid "Title"
 msgstr "Titel"
 
-#: ../picard/ui/cdlookup.py:31 ../picard/ui/mainwindow.py:436
+#: ../picard/ui/cdlookup.py:31
+#: ../picard/ui/itemviews.py:84
+#: ../picard/ui/mainwindow.py:436
+#: ../picard/util/tags.py:22
 msgid "Artist"
 msgstr "Interpret"
 
-#: ../picard/ui/ui_metadata.py:121
-msgid "Lookup"
-msgstr "Lookup"
+#: ../picard/ui/coverartbox.py:47
+#: ../picard/ui/options/cover.py:29
+msgid "Cover Art"
+msgstr "Cover-Bild"
 
-#: ../picard/ui/ui_metadata.py:122
-msgid "Title:"
-msgstr "TItel:"
+#: ../picard/ui/coverartbox.py:95
+msgid "Buy the album on Amazon"
+msgstr "Dieses Album bei Amazon bestellen"
 
-#: ../picard/ui/ui_metadata.py:123
-msgid "Date:"
-msgstr "Datum:"
+#: ../picard/ui/filebrowser.py:38
+#: ../picard/ui/mainwindow.py:302
+msgid "&Refresh"
+msgstr "&Aktualisieren"
 
-#: ../picard/ui/ui_metadata.py:124
-msgid "Artist:"
-msgstr "Interpret:"
+#: ../picard/ui/filebrowser.py:41
+msgid "&Move Tagged Files Here"
+msgstr "Getaggte Dateien hierhin &verschieben"
 
-#: ../picard/ui/ui_metadata.py:125
-msgid "Track:"
-msgstr "Titel:"
+#: ../picard/ui/filebrowser.py:44
+msgid "Show &Hidden Files"
+msgstr "&Versteckte Dateien anzeigen"
 
-#: ../picard/ui/ui_metadata.py:126
-msgid "0000-00-00; "
-msgstr "0000-00-00; "
+#: ../picard/ui/itemviews.py:83
+msgid "Length"
+msgstr "Dauer"
 
-#: ../picard/ui/ui_metadata.py:127 ../picard/ui/tageditor.py:225
-#: ../picard/ui/multitageditor.py:181
+#: ../picard/ui/itemviews.py:327
+msgid "&Releases"
+msgstr "&Veröffentlichungen"
+
+#: ../picard/ui/itemviews.py:353
+msgid "&Plugins"
+msgstr "&Plugins"
+
+#: ../picard/ui/itemviews.py:523
+msgid "Clusters"
+msgstr "Gruppen"
+
+#: ../picard/ui/logview.py:29
+msgid "Log"
+msgstr "Protokoll"
+
+#: ../picard/ui/puidsubmit.py:31
+#: ../picard/ui/options/plugins.py:80
+msgid "File"
+msgstr "Datei"
+
+#: ../picard/ui/puidsubmit.py:31
+msgid "PUID"
+msgstr "PUID"
+
+#: ../picard/ui/puidsubmit.py:31
+#: ../picard/ui/mainwindow.py:437
+msgid "Track"
+msgstr "Titel"
+
+#: ../picard/ui/puidsubmit.py:31
+msgid "Release"
+msgstr "Album"
+
+#: ../picard/ui/puidsubmit.py:31
+msgid "Release ID"
+msgstr "Album-ID"
+
+#: ../picard/ui/tageditor.py:65
+#: ../picard/ui/ui_options_plugins.py:62
+msgid "Details"
+msgstr "Details"
+
+#: ../picard/ui/tageditor.py:70
+#: ../picard/ui/tageditor.py:241
+#, python-format
+msgid "%d file"
+msgid_plural "%d files"
+msgstr[0] "%d Datei"
+msgstr[1] "%d Dateien"
+
+#: ../picard/ui/tageditor.py:124
+#, python-format
+msgid "(different across %d file)"
+msgid_plural "(different across %d files)"
+msgstr[0] "(verschieden über %d Datei)"
+msgstr[1] "(verschieden über %d Dateien)"
+
+#: ../picard/ui/tageditor.py:127
+#, python-format
+msgid "(missing from %d file)"
+msgid_plural "(missing from %d files)"
+msgstr[0] "(fehlt in %d Datei)"
+msgstr[1] "(fehlt in %d Dateien)"
+
+#: ../picard/ui/tageditor.py:210
+msgid "Filename:"
+msgstr "Dateiname:"
+
+#: ../picard/ui/tageditor.py:212
+msgid "Format:"
+msgstr "Format:"
+
+#: ../picard/ui/tageditor.py:221
+msgid "Size:"
+msgstr "Dateigröße:"
+
+#: ../picard/ui/tageditor.py:225
+#: ../picard/ui/ui_metadata.py:127
 msgid "Length:"
 msgstr "Dauer:"
 
-#: ../picard/ui/ui_metadata.py:128
-msgid "Album:"
-msgstr "Album:"
+#: ../picard/ui/tageditor.py:227
+msgid "Bitrate:"
+msgstr "Bitrate:"
 
-#: ../picard/ui/ui_passworddialog.py:78
-#, fuzzy
-msgid "Authentication required"
-msgstr "Unicode benötigt"
+#: ../picard/ui/tageditor.py:229
+msgid "Sample rate:"
+msgstr "Abtastrate:"
 
-#: ../picard/ui/ui_passworddialog.py:79 ../picard/ui/ui_options_proxy.py:83
-#: ../picard/ui/ui_options_general.py:113
-msgid "Username:"
-msgstr "Benutzername:"
+#: ../picard/ui/tageditor.py:231
+msgid "Bits per sample:"
+msgstr "Bits pro Sample:"
 
-#: ../picard/ui/ui_passworddialog.py:80 ../picard/ui/ui_options_proxy.py:82
-#: ../picard/ui/ui_options_general.py:112
-msgid "Password:"
-msgstr "Passwort:"
+#: ../picard/ui/tageditor.py:234
+msgid "Mono"
+msgstr "Mono"
 
-#: ../picard/ui/ui_passworddialog.py:81
-msgid "Save username and password"
-msgstr ""
+#: ../picard/ui/tageditor.py:235
+msgid "Stereo"
+msgstr "Stereo"
 
-#: ../picard/ui/ui_options_folksonomy.py:114
-#: ../picard/ui/ui_options_folksonomy_tags.py:114
-msgid "Folksonomy Tags"
-msgstr "Folksonomy Tags"
+#: ../picard/ui/tageditor.py:237
+msgid "Channels:"
+msgstr "Kanäle:"
 
-#: ../picard/ui/ui_options_folksonomy.py:115
-#: ../picard/ui/ui_options_folksonomy_tags.py:115
-msgid "Ignore tags:"
-msgstr "Zu ignorierende Tags:"
-
-#: ../picard/ui/ui_options_folksonomy.py:116
-#: ../picard/ui/ui_options_folksonomy_tags.py:116
-msgid "Minimal tag usage:"
-msgstr "Mindestens zu verwendende Tags:"
-
-#: ../picard/ui/ui_options_folksonomy.py:117
-#: ../picard/ui/ui_options_folksonomy_tags.py:117
-#: ../picard/ui/ui_options_matching.py:107
-#: ../picard/ui/ui_options_matching.py:108
-#: ../picard/ui/ui_options_matching.py:109
-#: ../picard/ui/ui_options_matching.py:113
-msgid " %"
-msgstr " %"
-
-#: ../picard/ui/ui_options_folksonomy.py:118
-msgid "Maximum number of tags:"
-msgstr "Maximale Anzahl Tags"
-
-#: ../picard/ui/ui_options_folksonomy.py:119
-#: ../picard/ui/ui_options_folksonomy_tags.py:119
-msgid "Join multiple tags with:"
-msgstr "Mehrere Tags verbinden mit:"
-
-#: ../picard/ui/ui_options_folksonomy.py:120
-#: ../picard/ui/ui_options_folksonomy_tags.py:120
-msgid " / "
-msgstr " / "
-
-#: ../picard/ui/ui_options_folksonomy.py:121
-#: ../picard/ui/ui_options_folksonomy_tags.py:121
-msgid ", "
-msgstr ", "
-
-#: ../picard/ui/ui_options_folksonomy_tags.py:118
-msgid "Maximal number of tags:"
-msgstr "Maximale Anzahl Tags"
+#: ../picard/ui/tagsfromfilenames.py:52
+#: ../picard/ui/tagsfromfilenames.py:96
+msgid "File Name"
+msgstr "Dateiname"
 
 #: ../picard/ui/mainwindow.py:64
 msgid "MusicBrainz Picard"
@@ -208,9 +1520,8 @@ msgid "&About..."
 msgstr "&Über …"
 
 #: ../picard/ui/mainwindow.py:210
-#, fuzzy
 msgid "&Donate..."
-msgstr "&Über …"
+msgstr "&Spenden ..."
 
 #: ../picard/ui/mainwindow.py:213
 msgid "&Report a Bug..."
@@ -300,7 +1611,8 @@ msgstr "Suchen"
 msgid "&CD Lookup..."
 msgstr "&CD-Lookup ..."
 
-#: ../picard/ui/mainwindow.py:272 ../picard/ui/mainwindow.py:273
+#: ../picard/ui/mainwindow.py:272
+#: ../picard/ui/mainwindow.py:273
 msgid "Lookup CD"
 msgstr "CD-Lookup"
 
@@ -331,7 +1643,8 @@ msgstr "Strg+U"
 msgid "&Lookup"
 msgstr "&Lookup"
 
-#: ../picard/ui/mainwindow.py:291 ../picard/ui/mainwindow.py:292
+#: ../picard/ui/mainwindow.py:291
+#: ../picard/ui/mainwindow.py:292
 msgid "Lookup metadata"
 msgstr "Metadaten nachschlagen"
 
@@ -344,10 +1657,6 @@ msgstr "Strg+L"
 msgid "&Details..."
 msgstr "&Details …"
 
-#: ../picard/ui/mainwindow.py:302 ../picard/ui/filebrowser.py:38
-msgid "&Refresh"
-msgstr "&Aktualisieren"
-
 #: ../picard/ui/mainwindow.py:305
 msgid "Generate &Playlist..."
 msgstr "&Wiedergabeliste erzeugen …"
@@ -393,6 +1702,7 @@ msgid "&Tools"
 msgstr "&Extras"
 
 #: ../picard/ui/mainwindow.py:384
+#: ../picard/ui/util.py:33
 msgid "&Help"
 msgstr "&Hilfe"
 
@@ -405,13 +1715,10 @@ msgid "&Search Bar"
 msgstr "&Suchleiste"
 
 #: ../picard/ui/mainwindow.py:435
+#: ../picard/util/tags.py:21
 msgid "Album"
 msgstr "Album"
 
-#: ../picard/ui/mainwindow.py:437 ../picard/ui/puidsubmit.py:31
-msgid "Track"
-msgstr "Titel"
-
 #: ../picard/ui/mainwindow.py:476
 msgid "All Supported Formats"
 msgstr "Alle unterstützten Formate"
@@ -426,37 +1733,288 @@ msgstr "Speichere Wiedergabeliste %s …"
 msgid "Playlist %s saved"
 msgstr "Wiedergabeliste %s gespeichert."
 
-#: ../picard/ui/mainwindow.py:638 ../picard/ui/mainwindow.py:647
+#: ../picard/ui/mainwindow.py:638
+#: ../picard/ui/mainwindow.py:647
 #, python-format
 msgid " (Error: %s)"
 msgstr " (Fehler: %s)"
 
+#: ../picard/ui/ui_tageditor.py:115
+#: ../picard/ui/ui_options_plugins.py:59
+#: ../picard/ui/options/plugins.py:76
+msgid "Name"
+msgstr "Name"
+
+#: ../picard/ui/ui_tageditor.py:116
+msgid "Value"
+msgstr "Wert"
+
+#: ../picard/ui/ui_tageditor.py:117
+msgid "&Add..."
+msgstr "&Hinzufügen …"
+
+#: ../picard/ui/ui_tageditor.py:118
+msgid "&Edit..."
+msgstr "&Bearbeiten …"
+
+#: ../picard/ui/ui_tageditor.py:119
+msgid "&Delete"
+msgstr "&Löschen"
+
+#: ../picard/ui/ui_tageditor.py:120
+msgid "&Metadata"
+msgstr "Lokale &Metadaten"
+
+#: ../picard/ui/ui_tageditor.py:121
+msgid "A&rtwork"
+msgstr "Cover-Bild"
+
+#: ../picard/ui/ui_tageditor.py:122
+msgid "&Info"
+msgstr "&Info"
+
+#: ../picard/ui/passworddialog.py:38
+#, python-format
+msgid "The server %s requires you to login. Please enter your username and password."
+msgstr "Der Server %s erfordert eine Authentifizierung. Bitte geben Sie ihren Benutzernamen und ihr Passwort ein."
+
+#: ../picard/ui/ui_cdlookup.py:60
+#: ../picard/ui/ui_options_cdlookup.py:47
+#: ../picard/ui/ui_options_cdlookup_win32.py:56
+#: ../picard/ui/options/cdlookup.py:35
+msgid "CD Lookup"
+msgstr "CD-Lookup"
+
+#: ../picard/ui/ui_cdlookup.py:61
+msgid "The following releases on MusicBrainz match the CD:"
+msgstr "Die folgenden Alben von MusicBrainz stimmen mit der CD überein:"
+
+#: ../picard/ui/ui_cdlookup.py:62
+#: ../picard/ui/ui_puidsubmit.py:53
+msgid "OK"
+msgstr "OK"
+
+#: ../picard/ui/ui_cdlookup.py:63
+msgid "    Lookup manually    "
+msgstr "    Manuell abfragen    "
+
+#: ../picard/ui/ui_cdlookup.py:64
+#: ../picard/ui/ui_puidsubmit.py:54
+msgid "Cancel"
+msgstr "Abbrechen"
+
+#: ../picard/ui/ui_passworddialog.py:78
+msgid "Authentication required"
+msgstr "Authentifizierung erforderlich"
+
+#: ../picard/ui/ui_passworddialog.py:79
+#: ../picard/ui/ui_options_general.py:113
+#: ../picard/ui/ui_options_proxy.py:83
+msgid "Username:"
+msgstr "Benutzername:"
+
+#: ../picard/ui/ui_passworddialog.py:80
+#: ../picard/ui/ui_options_general.py:112
+#: ../picard/ui/ui_options_proxy.py:82
+msgid "Password:"
+msgstr "Passwort:"
+
+#: ../picard/ui/ui_passworddialog.py:81
+msgid "Save username and password"
+msgstr "Benutzername und Passwort speichern"
+
 #: ../picard/ui/ui_edittagdialog.py:44
 msgid "Edit Tag"
 msgstr "Tag bearbeiten"
 
-#: ../picard/ui/ui_options_proxy.py:81
-msgid "Web Proxy"
-msgstr "Web-Proxy"
+#: ../picard/ui/ui_metadata.py:121
+msgid "Lookup"
+msgstr "Lookup"
 
-#: ../picard/ui/ui_options_proxy.py:84 ../picard/ui/ui_options_general.py:109
-msgid "Port:"
-msgstr "Port:"
+#: ../picard/ui/ui_metadata.py:122
+msgid "Title:"
+msgstr "TItel:"
 
-#: ../picard/ui/ui_options_proxy.py:85 ../picard/ui/ui_options_general.py:110
-msgid "Server address:"
-msgstr "Serveradresse:"
+#: ../picard/ui/ui_metadata.py:123
+msgid "Date:"
+msgstr "Datum:"
 
-#: ../picard/ui/ui_tagsfromfilenames.py:56
-msgid "Convert File Names to Tags"
-msgstr "Tags aus Dateinamen ermitteln"
+#: ../picard/ui/ui_metadata.py:124
+msgid "Artist:"
+msgstr "Interpret:"
 
-#: ../picard/ui/ui_tagsfromfilenames.py:57
-msgid "Replace underscores with spaces"
-msgstr "Unterstriche durch Leerzeichen ersetzen"
+#: ../picard/ui/ui_metadata.py:125
+msgid "Track:"
+msgstr "Titel:"
+
+#: ../picard/ui/ui_metadata.py:126
+msgid "0000-00-00; "
+msgstr "0000-00-00; "
+
+#: ../picard/ui/ui_metadata.py:128
+msgid "Album:"
+msgstr "Album:"
+
+#: ../picard/ui/ui_options.py:42
+msgid "Options"
+msgstr "Einstellungen"
+
+#: ../picard/ui/ui_options_cdlookup.py:48
+msgid "CD-ROM device to use for lookups:"
+msgstr "Für Lookups zu benutzendes CD-Laufwerk:"
+
+#: ../picard/ui/ui_options_cdlookup_win32.py:57
+msgid "Default CD-ROM drive to use for lookups:"
+msgstr "Für Lookups zu benutzendes CD-Laufwerk:"
+
+#: ../picard/ui/ui_options_cover.py:56
+msgid "Location"
+msgstr "Speicherort"
+
+#: ../picard/ui/ui_options_cover.py:57
+msgid "Embed cover images into tags"
+msgstr "Cover-Bilder in Tags einbetten"
+
+#: ../picard/ui/ui_options_cover.py:58
+msgid "Save cover images as separate files"
+msgstr "Cover-Bilder als separate Dateien speichern"
+
+#: ../picard/ui/ui_options_cover.py:59
+msgid "Overwrite the file if it already exists"
+msgstr "Überschreibe existierende Dateien"
+
+#: ../picard/ui/util.py:31
+msgid "&Ok"
+msgstr "&OK"
+
+#: ../picard/ui/util.py:32
+msgid "&Cancel"
+msgstr "&Abbrechen"
+
+#: ../picard/ui/ui_puidsubmit.py:52
+msgid "Submit PUIDs"
+msgstr "PUIDs senden"
+
+#: ../picard/ui/ui_options_folksonomy.py:114
+#: ../picard/ui/options/folksonomy.py:29
+msgid "Folksonomy Tags"
+msgstr "Folksonomy Tags"
+
+#: ../picard/ui/ui_options_folksonomy.py:115
+msgid "Ignore tags:"
+msgstr "Zu ignorierende Tags:"
+
+#: ../picard/ui/ui_options_folksonomy.py:116
+msgid "Minimal tag usage:"
+msgstr "Mindestens zu verwendende Tags:"
+
+#: ../picard/ui/ui_options_folksonomy.py:117
+#: ../picard/ui/ui_options_matching.py:107
+#: ../picard/ui/ui_options_matching.py:108
+#: ../picard/ui/ui_options_matching.py:109
+#: ../picard/ui/ui_options_matching.py:113
+msgid " %"
+msgstr " %"
+
+#: ../picard/ui/ui_options_folksonomy.py:118
+msgid "Maximum number of tags:"
+msgstr "Maximale Anzahl Tags"
+
+#: ../picard/ui/ui_options_folksonomy.py:119
+msgid "Join multiple tags with:"
+msgstr "Mehrere Tags verbinden mit:"
+
+#: ../picard/ui/ui_options_folksonomy.py:120
+msgid " / "
+msgstr " / "
+
+#: ../picard/ui/ui_options_folksonomy.py:121
+msgid ", "
+msgstr ", "
+
+#: ../picard/ui/ui_options_interface.py:50
+msgid "Miscellaneous"
+msgstr "Verschiedenes"
+
+#: ../picard/ui/ui_options_interface.py:51
+msgid "Show text labels under icons"
+msgstr "Text unter Symbolen anzeigen"
+
+#: ../picard/ui/ui_options_interface.py:52
+msgid "Allow selection of multiple directories"
+msgstr "Auswahl mehrerer Verzeichnisse zulassen"
+
+#: ../picard/ui/ui_options_interface.py:53
+msgid "Use advanced query syntax"
+msgstr "Erweiterte Syntax für Suchanfragen verwenden"
+
+#: ../picard/ui/ui_options_interface.py:54
+msgid "User interface language:"
+msgstr "Sprache der Benutzeroberfläche:"
+
+#: ../picard/ui/ui_options_naming.py:165
+msgid "Rename Files"
+msgstr "Dateien umbenennen"
+
+#: ../picard/ui/ui_options_naming.py:166
+msgid "Replace Windows-incompatible characters"
+msgstr "Mit Windows inkompatible Zeichen ersetzen"
+
+#: ../picard/ui/ui_options_naming.py:167
+msgid "Replace non-ASCII characters"
+msgstr "Nicht-ASCII-Zeichen ersetzen"
+
+#: ../picard/ui/ui_options_naming.py:168
+#: ../picard/ui/ui_options_naming.py:169
+#: ../picard/ui/ui_options_metadata.py:109
+#: ../picard/ui/ui_options_metadata.py:110
+msgid "Default"
+msgstr "Standard"
+
+#: ../picard/ui/ui_options_naming.py:170
+#: ../picard/ui/options/naming.py:90
+msgid "Multiple artist file naming format:"
+msgstr "Format des Dateinamens für diverse Interpreten:"
+
+#: ../picard/ui/ui_options_naming.py:171
+#: ../picard/ui/options/naming.py:86
+msgid "File naming format:"
+msgstr "Format des Dateinamens:"
+
+#: ../picard/ui/ui_options_naming.py:172
+msgid "Move Files"
+msgstr "Dateien verschieben"
+
+#: ../picard/ui/ui_options_naming.py:173
+msgid "Move tagged files to this directory:"
+msgstr "Getaggte Dateien in dieses Verzeichnis verschieben:"
+
+#: ../picard/ui/ui_options_naming.py:174
+msgid "Browse..."
+msgstr "Durchsuchen …"
+
+#: ../picard/ui/ui_options_naming.py:175
+msgid "Move additional files:"
+msgstr "Zusätzliche Dateien verschieben:"
+
+#: ../picard/ui/ui_options_naming.py:176
+msgid "Delete empty directories"
+msgstr "Leere Verzeichnisse löschen"
+
+#: ../picard/ui/ui_options_naming.py:177
+msgid "Example"
+msgstr "Beispiel"
+
+#: ../picard/ui/ui_options_naming.py:178
+msgid "File name:"
+msgstr "Dateiname:"
+
+#: ../picard/ui/ui_options_naming.py:179
+msgid "Multiple artist file name:"
+msgstr "Dateiname für diverse Interpreten:"
 
-#: ../picard/ui/ui_tagsfromfilenames.py:58
 #: ../picard/ui/ui_options_naming.py:180
+#: ../picard/ui/ui_tagsfromfilenames.py:58
 msgid "&Preview"
 msgstr "&Vorschau"
 
@@ -464,11 +2022,22 @@ msgstr "&Vorschau"
 msgid "MusicBrainz Server"
 msgstr "MusicBrainz-Server"
 
+#: ../picard/ui/ui_options_general.py:109
+#: ../picard/ui/ui_options_proxy.py:84
+msgid "Port:"
+msgstr "Port:"
+
+#: ../picard/ui/ui_options_general.py:110
+#: ../picard/ui/ui_options_proxy.py:85
+msgid "Server address:"
+msgstr "Serveradresse:"
+
 #: ../picard/ui/ui_options_general.py:111
 msgid "Account Information"
 msgstr "Anmeldedaten"
 
 #: ../picard/ui/ui_options_general.py:114
+#: ../picard/ui/options/general.py:29
 msgid "General"
 msgstr "Allgemein"
 
@@ -476,34 +2045,6 @@ msgstr "Allgemein"
 msgid "Automatically scan all new files"
 msgstr "Analysiere alle neuen Dateien automatisch"
 
-#: ../picard/ui/ui_options_interface.py:46
-msgid "Miscellaneous"
-msgstr "Verschiedenes"
-
-#: ../picard/ui/ui_options_interface.py:47
-msgid "Show text labels under icons"
-msgstr "Text unter Symbolen anzeigen"
-
-#: ../picard/ui/ui_options_interface.py:48
-msgid "Allow selection of multiple directories"
-msgstr "Auswahl mehrerer Verzeichnisse zulassen"
-
-#: ../picard/ui/ui_options_interface.py:49
-msgid "Use advanced query syntax"
-msgstr "Erweiterte Syntax für Suchanfragen verwenden"
-
-#: ../picard/ui/itemviews.py:327
-msgid "&Releases"
-msgstr "&Veröffentlichungen"
-
-#: ../picard/ui/itemviews.py:353
-msgid "&Plugins"
-msgstr "&Plugins"
-
-#: ../picard/ui/itemviews.py:523
-msgid "Clusters"
-msgstr "Gruppen"
-
 #: ../picard/ui/ui_options_matching.py:105
 msgid "Thresholds"
 msgstr "Grenzwerte"
@@ -524,6 +2065,67 @@ msgstr "Minimale Ähnlichkeit für Gruppen-Lookups:"
 msgid "Minimal similarity for PUID lookups:"
 msgstr "Minimale Ähnlichkeit für PUID-Lookups:"
 
+#: ../picard/ui/ui_options_metadata.py:100
+#: ../picard/ui/options/metadata.py:31
+msgid "Metadata"
+msgstr "Metadaten"
+
+#: ../picard/ui/ui_options_metadata.py:101
+msgid "Translate foreign artist names to English where possible"
+msgstr "Benutze Interpretennamen in lateinischer Schreibweise, wenn möglich."
+
+#: ../picard/ui/ui_options_metadata.py:102
+msgid "Use release relationships"
+msgstr "Verwende Albumsbeziehungen"
+
+#: ../picard/ui/ui_options_metadata.py:103
+msgid "Use track relationships"
+msgstr "Verwende Titelbeziehungen"
+
+#: ../picard/ui/ui_options_metadata.py:104
+msgid "Use folksonomy tags as genre"
+msgstr "Folksonomy Tags als Genre verwenden"
+
+#: ../picard/ui/ui_options_metadata.py:105
+msgid "Preferred release country:"
+msgstr "Bevorzugtes Veröffentlichungsland:"
+
+#: ../picard/ui/ui_options_metadata.py:106
+msgid "Custom Fields"
+msgstr "Benutzerdefinierte Felder"
+
+#: ../picard/ui/ui_options_metadata.py:107
+msgid "Various artists:"
+msgstr "Diverse Interpreten:"
+
+#: ../picard/ui/ui_options_metadata.py:108
+msgid "Non-album tracks:"
+msgstr "Titel ohne Album:"
+
+#: ../picard/ui/ui_options_plugins.py:58
+#: ../picard/ui/options/plugins.py:30
+msgid "Plugins"
+msgstr "Plugins"
+
+#: ../picard/ui/ui_options_plugins.py:60
+#: ../picard/ui/options/plugins.py:79
+msgid "Author"
+msgstr "Autor"
+
+#: ../picard/ui/ui_options_plugins.py:61
+#: ../picard/util/tags.py:36
+msgid "Version"
+msgstr "Version"
+
+#: ../picard/ui/ui_options_proxy.py:81
+#: ../picard/ui/options/proxy.py:28
+msgid "Web Proxy"
+msgstr "Web-Proxy"
+
+#: ../picard/ui/ui_options_script.py:52
+msgid "Tagger Script"
+msgstr "Tagger-Skript"
+
 #: ../picard/ui/ui_options_tags.py:105
 msgid "Common"
 msgstr "Allgemein"
@@ -576,343 +2178,29 @@ msgstr "APE"
 msgid "Remove APEv2 tags from MP3 files"
 msgstr "APEv2-Tags aus MP3-Dateien entfernen"
 
-#: ../picard/ui/ui_options_cdlookup_win32.py:56 ../picard/ui/ui_cdlookup.py:60
-#: ../picard/ui/ui_options_cdlookup.py:47
-msgid "CD Lookup"
-msgstr "CD-Lookup"
+#: ../picard/ui/ui_tagsfromfilenames.py:56
+msgid "Convert File Names to Tags"
+msgstr "Tags aus Dateinamen ermitteln"
 
-#: ../picard/ui/ui_options_cdlookup_win32.py:57
-msgid "Default CD-ROM drive to use for lookups:"
-msgstr "Für Lookups zu benutzendes CD-Laufwerk:"
+#: ../picard/ui/ui_tagsfromfilenames.py:57
+msgid "Replace underscores with spaces"
+msgstr "Unterstriche durch Leerzeichen ersetzen"
 
-#: ../picard/ui/tageditor.py:65 ../picard/ui/ui_options_plugins.py:62
-#: ../picard/ui/multitageditor.py:37
-msgid "Details"
-msgstr "Details"
-
-#: ../picard/ui/tageditor.py:70 ../picard/ui/tageditor.py:241
-#: ../picard/ui/multitageditor.py:42 ../picard/ui/multitageditor.py:197
-#, python-format
-msgid "%d file"
-msgid_plural "%d files"
-msgstr[0] "%d Datei"
-msgstr[1] "%d Dateien"
-
-#: ../picard/ui/tageditor.py:124 ../picard/ui/multitageditor.py:95
-#, python-format
-msgid "(different across %d file)"
-msgid_plural "(different across %d files)"
-msgstr[0] "(verschieden über %d Datei)"
-msgstr[1] "(verschieden über %d Dateien)"
-
-#: ../picard/ui/tageditor.py:127 ../picard/ui/multitageditor.py:98
-#, python-format
-msgid "(missing from %d file)"
-msgid_plural "(missing from %d files)"
-msgstr[0] "(fehlt in %d Datei)"
-msgstr[1] "(fehlt in %d Dateien)"
-
-#: ../picard/ui/tageditor.py:210 ../picard/ui/multitageditor.py:166
-msgid "Filename:"
-msgstr "Dateiname:"
-
-#: ../picard/ui/tageditor.py:212 ../picard/ui/multitageditor.py:168
-msgid "Format:"
-msgstr "Format:"
-
-#: ../picard/ui/tageditor.py:221 ../picard/ui/multitageditor.py:177
-msgid "Size:"
-msgstr "Dateigröße:"
-
-#: ../picard/ui/tageditor.py:227 ../picard/ui/multitageditor.py:183
-msgid "Bitrate:"
-msgstr "Bitrate:"
-
-#: ../picard/ui/tageditor.py:229 ../picard/ui/multitageditor.py:185
-msgid "Sample rate:"
-msgstr "Abtastrate:"
-
-#: ../picard/ui/tageditor.py:231 ../picard/ui/multitageditor.py:187
-msgid "Bits per sample:"
-msgstr "Bits pro Sample:"
-
-#: ../picard/ui/tageditor.py:234 ../picard/ui/multitageditor.py:190
-msgid "Mono"
-msgstr "Mono"
-
-#: ../picard/ui/tageditor.py:235 ../picard/ui/multitageditor.py:191
-msgid "Stereo"
-msgstr "Stereo"
-
-#: ../picard/ui/tageditor.py:237 ../picard/ui/multitageditor.py:193
-msgid "Channels:"
-msgstr "Kanäle:"
-
-#: ../picard/ui/ui_tageditor.py:115 ../picard/ui/ui_multitageditor.py:55
-#: ../picard/ui/ui_options_plugins.py:59 ../picard/ui/options/plugins.py:76
-msgid "Name"
-msgstr "Name"
-
-#: ../picard/ui/ui_tageditor.py:116 ../picard/ui/ui_multitageditor.py:56
-msgid "Value"
-msgstr "Wert"
-
-#: ../picard/ui/ui_tageditor.py:117 ../picard/ui/ui_multitageditor.py:57
-msgid "&Add..."
-msgstr "&Hinzufügen …"
-
-#: ../picard/ui/ui_tageditor.py:118
-msgid "&Edit..."
-msgstr "&Bearbeiten …"
-
-#: ../picard/ui/ui_tageditor.py:119
-msgid "&Delete"
-msgstr "&Löschen"
-
-#: ../picard/ui/ui_tageditor.py:120
-msgid "&Metadata"
-msgstr "Lokale &Metadaten"
-
-#: ../picard/ui/ui_tageditor.py:121
-msgid "A&rtwork"
-msgstr "Cover-Bild"
-
-#: ../picard/ui/ui_tageditor.py:122
-msgid "&Info"
-msgstr "&Info"
-
-#: ../picard/ui/coverartbox.py:47
-msgid "Cover Art"
-msgstr "Cover-Bild"
-
-#: ../picard/ui/coverartbox.py:95
-msgid "Buy the album on Amazon"
-msgstr "Dieses Album bei Amazon bestellen"
-
-#: ../picard/ui/ui_puidsubmit.py:52
-msgid "Submit PUIDs"
-msgstr "PUIDs senden"
-
-#: ../picard/ui/ui_puidsubmit.py:53 ../picard/ui/ui_cdlookup.py:62
-msgid "OK"
-msgstr "OK"
-
-#: ../picard/ui/ui_puidsubmit.py:54 ../picard/ui/ui_cdlookup.py:64
-msgid "Cancel"
-msgstr "Abbrechen"
-
-#: ../picard/ui/puidsubmit.py:31 ../picard/ui/options/plugins.py:80
-msgid "File"
-msgstr "Datei"
-
-#: ../picard/ui/puidsubmit.py:31
-msgid "PUID"
-msgstr "PUID"
-
-#: ../picard/ui/puidsubmit.py:31
-msgid "Release"
-msgstr "Album"
-
-#: ../picard/ui/puidsubmit.py:31
-msgid "Release ID"
-msgstr "Album-ID"
-
-#: ../picard/ui/filebrowser.py:41
-#, fuzzy
-msgid "&Move Tagged Files Here"
-msgstr "Dateien &verschieben"
-
-#: ../picard/ui/filebrowser.py:44
-msgid "Show &Hidden Files"
-msgstr ""
-
-#: ../picard/ui/ui_cdlookup.py:61
-msgid "The following releases on MusicBrainz match the CD:"
-msgstr "Die folgenden Alben von MusicBrainz stimmen mit der CD überein:"
-
-#: ../picard/ui/ui_cdlookup.py:63
-msgid "    Lookup manually    "
-msgstr "    Manuell abfragen    "
-
-#: ../picard/ui/ui_options.py:42
-msgid "Options"
-msgstr "Einstellungen"
-
-#: ../picard/ui/tagsfromfilenames.py:52 ../picard/ui/tagsfromfilenames.py:96
-msgid "File Name"
-msgstr "Dateiname"
-
-#: ../picard/ui/ui_options_cover.py:56
-msgid "Location"
-msgstr "Speicherort"
-
-#: ../picard/ui/ui_options_cover.py:57
-msgid "Embed cover images into tags"
-msgstr "Cover-Bilder in Tags einbetten"
-
-#: ../picard/ui/ui_options_cover.py:58
-msgid "Save cover images as separate files"
-msgstr "Cover-Bilder als separate Dateien speichern"
-
-#: ../picard/ui/ui_options_cover.py:59
-msgid "Overwrite the file if it already exists"
-msgstr "Überschreibe existierende Dateien"
-
-#: ../picard/ui/ui_options_metadata.py:100
-msgid "Metadata"
-msgstr "Metadaten"
-
-#: ../picard/ui/ui_options_metadata.py:101
-msgid "Translate foreign artist names to English where possible"
-msgstr "Benutze Interpretennamen in lateinischer Schreibweise, wenn möglich."
-
-#: ../picard/ui/ui_options_metadata.py:102
-msgid "Use release relationships"
-msgstr "Verwende Albumsbeziehungen"
-
-#: ../picard/ui/ui_options_metadata.py:103
-msgid "Use track relationships"
-msgstr "Verwende Titelbeziehungen"
-
-#: ../picard/ui/ui_options_metadata.py:104
-msgid "Use folksonomy tags as genre"
-msgstr "Folksonomy Tags als Genre verwenden"
-
-#: ../picard/ui/ui_options_metadata.py:105
-#, fuzzy
-msgid "Preferred release country:"
-msgstr "Land der Veröffentlichung"
-
-#: ../picard/ui/ui_options_metadata.py:106
-msgid "Custom Fields"
-msgstr "Benutzerdefinierte Felder"
-
-#: ../picard/ui/ui_options_metadata.py:107
-msgid "Various artists:"
-msgstr "Diverse Interpreten:"
-
-#: ../picard/ui/ui_options_metadata.py:108
-msgid "Non-album tracks:"
-msgstr "Titel ohne Album:"
-
-#: ../picard/ui/ui_options_metadata.py:109
-#: ../picard/ui/ui_options_metadata.py:110
-#: ../picard/ui/ui_options_naming.py:168 ../picard/ui/ui_options_naming.py:169
-msgid "Default"
-msgstr "Standard"
-
-#: ../picard/ui/ui_multitageditor.py:58
-msgid "Delete"
-msgstr "&Löschen"
-
-#: ../picard/ui/logview.py:29
-msgid "Log"
-msgstr "Protokoll"
-
-#: ../picard/ui/ui_options_plugins.py:58
-msgid "Plugins"
-msgstr "Plugins"
-
-#: ../picard/ui/ui_options_plugins.py:60 ../picard/ui/options/plugins.py:79
-msgid "Author"
-msgstr "Autor"
-
-#: ../picard/ui/ui_options_plugins.py:61
-msgid "Version"
-msgstr "Version"
-
-#: ../picard/ui/ui_options_naming.py:165
-msgid "Rename Files"
-msgstr "Dateien umbenennen"
-
-#: ../picard/ui/ui_options_naming.py:166
-msgid "Replace Windows-incompatible characters"
-msgstr "Mit Windows inkompatible Zeichen ersetzen"
-
-#: ../picard/ui/ui_options_naming.py:167
-msgid "Replace non-ASCII characters"
-msgstr "Nicht-ASCII-Zeichen ersetzen"
-
-#: ../picard/ui/ui_options_naming.py:170 ../picard/ui/options/naming.py:90
-msgid "Multiple artist file naming format:"
-msgstr "Format des Dateinamens für diverse Interpreten:"
-
-#: ../picard/ui/ui_options_naming.py:171 ../picard/ui/options/naming.py:86
-msgid "File naming format:"
-msgstr "Format des Dateinamens:"
-
-#: ../picard/ui/ui_options_naming.py:172
-msgid "Move Files"
-msgstr "Dateien verschieben"
-
-#: ../picard/ui/ui_options_naming.py:173
-msgid "Move tagged files to this directory:"
-msgstr "Getaggte Dateien in dieses Verzeichnis verschieben:"
-
-#: ../picard/ui/ui_options_naming.py:174
-msgid "Browse..."
-msgstr "Durchsuchen …"
-
-#: ../picard/ui/ui_options_naming.py:175
-msgid "Move additional files:"
-msgstr "Zusätzliche Dateien verschieben:"
-
-#: ../picard/ui/ui_options_naming.py:176
-msgid "Delete empty directories"
-msgstr "Leere Verzeichnisse löschen"
-
-#: ../picard/ui/ui_options_naming.py:177
-msgid "Example"
-msgstr "Beispiel"
-
-#: ../picard/ui/ui_options_naming.py:178
-msgid "File name:"
-msgstr "Dateiname:"
-
-#: ../picard/ui/ui_options_naming.py:179
-msgid "Multiple artist file name:"
-msgstr "Dateiname für diverse Interpreten:"
-
-#: ../picard/ui/ui_options_cdlookup.py:48
-msgid "CD-ROM device to use for lookups:"
-msgstr "Für Lookups zu benutzendes CD-Laufwerk:"
-
-#: ../picard/ui/options/scripting.py:84 ../picard/ui/options/naming.py:86
-#: ../picard/ui/options/naming.py:90 ../picard/ui/options/naming.py:93
-#: ../picard/ui/options/naming.py:95
-msgid "Script Error"
-msgstr "Skript-Fehler"
+#: ../picard/ui/options/about.py:29
+msgid "About"
+msgstr "Über"
 
 #. Replace this with your name to have it appear in the "About" dialog.
 #: ../picard/ui/options/about.py:48
 msgid "translator-credits"
 msgstr ""
 "Launchpad Contributions:\n"
-"  Simon Reinhardt <https://launchpad.net/~simon-reinhardt>\n"
-"\n"
-"Launchpad Contributions:\n"
-"  Philipp Wolfer https://launchpad.net/~phw\n"
 "  Simon Reinhardt https://launchpad.net/~simon-reinhardt\n"
-"  hangy https://launchpad.net/~hangy-\n"
-"\n"
-"Launchpad Contributions:\n"
-"  Johannes Athmer https://launchpad.net/~hangy-\n"
 "  Philipp Wolfer https://launchpad.net/~phw\n"
-"  Simon Reinhardt https://launchpad.net/~simon-reinhardt\n"
-"\n"
-"Launchpad Contributions:\n"
 "  Johannes Athmer https://launchpad.net/~hangy-\n"
 "  Lukáš Lalinský https://launchpad.net/~luks\n"
-"  Philipp Wolfer https://launchpad.net/~phw\n"
-"  Simon Reinhardt https://launchpad.net/~simon-reinhardt\n"
-"\n"
-"Launchpad Contributions:\n"
 "  Achim Zien https://launchpad.net/~achimzien\n"
-"  Johannes Athmer https://launchpad.net/~hangy-\n"
-"  Lukáš Lalinský https://launchpad.net/~luks\n"
-"  Maximilian Reininghaus https://launchpad.net/~max-reininghaus\n"
-"  Philipp Wolfer https://launchpad.net/~phw\n"
-"  Simon Reinhardt https://launchpad.net/~simon-reinhardt"
+"  Maximilian Reininghaus https://launchpad.net/~max-reininghaus"
 
 #. Replace LANG with language you are translatig to.
 #: ../picard/ui/options/about.py:51
@@ -921,52 +2209,311 @@ msgid "<br/>Translated to LANG by %s"
 msgstr "<br/>Ins Deutsche übersetzt von %s"
 
 #: ../picard/ui/options/about.py:55
-#, fuzzy, python-format
+#, python-format
 msgid ""
-"<p align=\"center\"><span style=\"font-size:15px;font-weight:bold;"
-"\">MusicBrainz Picard</span><br/>\n"
+"<p align=\"center\"><span style=\"font-size:15px;font-weight:bold;\">MusicBrainz Picard</span><br/>\n"
 "Version %(version)s</p>\n"
 "<p align=\"center\"><strong>Supported formats</strong><br/>%(formats)s</p>\n"
 "<p align=\"center\"><strong>Please donate</strong><br/>\n"
-"Thank you for using Picard. Picard relies on the MusicBrainz database, which "
-"is operated by the MetaBrainz Foundation with the help of thousands of "
-"volunteers. If you like this application please consider donating to the "
-"MetaBrainz Foundation to keep the service running.</p>\n"
-"<p align=\"center\"><a href=\"http://metabrainz.org/donate/index.html"
-"\">Donate now!</a></p>\n"
+"Thank you for using Picard. Picard relies on the MusicBrainz database, which is operated by the MetaBrainz Foundation with the help of thousands of volunteers. If you like this application please consider donating to the MetaBrainz Foundation to keep the service running.</p>\n"
+"<p align=\"center\"><a href=\"http://metabrainz.org/donate/index.html\">Donate now!</a></p>\n"
 "<p align=\"center\"><strong>Credits</strong><br/>\n"
-"<small>Copyright © 2004-2008 Robert Kaye, Lukáš Lalinský and others%"
-"(translator-credits)s</small></p>\n"
-"<p align=\"center\"><a href=\"http://musicbrainz.org/doc/PicardTagger"
-"\">http://musicbrainz.org/doc/PicardTagger</a></p>\n"
+"<small>Copyright © 2004-2008 Robert Kaye, Lukáš Lalinský and others%(translator-credits)s</small></p>\n"
+"<p align=\"center\"><a href=\"http://musicbrainz.org/doc/PicardTagger\">http://musicbrainz.org/doc/PicardTagger</a></p>\n"
 msgstr ""
-"<p align=\"center\"><span style=\"font-size:15px;font-weight:bold;"
-"\">MusicBrainz Picard</span><br/>\n"
+"<p align=\"center\"><span style=\"font-size:15px;font-weight:bold;\">MusicBrainz Picard</span><br/>\n"
 "Version %(version)s</p>\n"
-"<p align=\"center\"><strong>Unterstützte Dateiformate:</strong> %(formats)s</"
-"p>\n"
-"<p align=\"center\"><small>Copyright © 2004-2007 Robert Kaye, Lukáš Lalinský "
-"und andere%(translator-credits)s</small></p>\n"
-"<p align=\"center\"><a href=\"http://musicbrainz.org/doc/PicardTagger"
-"\">http://musicbrainz.org/doc/PicardTagger</a></p>\n"
+"<p align=\"center\"><strong>Unterstützte Dateiformate</strong><br/>%(formats)s</p>\n"
+"<p align=\"center\"><strong>Bitte spenden Sie</strong><br/>\n"
+"Vielen Dank, dass Sie Picard verwenden. Picard basiert auf der MusicBrainz Datenbank, die von der MetaBrainz Foundation mit der Hilfe tausender Freiwilliger betrieben wird. Bitte helfen Sie diese Dienstleistung durch eine Spende an die MetaBrainz Foundation zu unterstützen.</p>\n"
+"<p align=\"center\"><a href=\"http://metabrainz.org/donate/index.html\">Jetzt spenden!</a></p>\n"
+"<p align=\"center\"><strong>Mitwirkende</strong><br/>\n"
+"<small>Copyright © 2004-2008 Robert Kaye, Lukáš Lalinský and others%(translator-credits)s</small></p>\n"
+"<p align=\"center\"><a href=\"http://musicbrainz.org/doc/PicardTagger\">http://musicbrainz.org/doc/PicardTagger</a></p>\n"
+
+#: ../picard/ui/options/advanced.py:26
+msgid "Advanced"
+msgstr "Erweitert"
+
+#: ../picard/ui/options/interface.py:31
+msgid "User Interface"
+msgstr "Benutzeroberfläche"
+
+#: ../picard/ui/options/interface.py:47
+msgid "System default"
+msgstr "Systemvoreinstellung"
+
+#: ../picard/ui/options/interface.py:71
+msgid "Language changed"
+msgstr "Sprache geändert"
+
+#: ../picard/ui/options/interface.py:71
+msgid "You have changed the interface language. You have to restart Picard in order for the change to take effect."
+msgstr "Sie haben der Sprache der Benutzeroberfläche geändert. Damit diese Änderung wirksam wird, müssen Sie Picard neu starten."
+
+#: ../picard/ui/options/matching.py:29
+msgid "Matching"
+msgstr "Abgleich"
+
+#: ../picard/ui/options/metadata.py:52
+msgid "None"
+msgstr ""
+
+#: ../picard/ui/options/naming.py:33
+msgid "File Naming"
+msgstr "Dateibenennung"
+
+#: ../picard/ui/options/naming.py:86
+#: ../picard/ui/options/naming.py:90
+#: ../picard/ui/options/naming.py:93
+#: ../picard/ui/options/naming.py:95
+#: ../picard/ui/options/scripting.py:84
+msgid "Script Error"
+msgstr "Skript-Fehler"
 
 #: ../picard/ui/options/naming.py:93
 msgid "The file naming format must not be empty."
-msgstr ""
+msgstr "Das Format des Dateinamens darf nicht leer sein."
 
 #: ../picard/ui/options/naming.py:95
-#, fuzzy
 msgid "The multiple artist file naming format must not be empty."
-msgstr "Format des Dateinamens für diverse Interpreten:"
+msgstr "Das Format des Dateinamens für diverse Interpreten darf nicht leer sein."
 
 #: ../picard/ui/options/naming.py:97
 msgid "Error"
-msgstr ""
+msgstr "Fehler"
 
 #: ../picard/ui/options/naming.py:97
 msgid "The location to move files to must not be empty."
+msgstr "Das Zielverzeichnis für verschobene Dateien darf nicht leer sein."
+
+#: ../picard/ui/options/scripting.py:63
+msgid "Scripting"
+msgstr "Skripting"
+
+#: ../picard/ui/options/tags.py:29
+msgid "Tags"
+msgstr "Tags"
+
+#: ../picard/util/tags.py:24
+msgid "Date"
+msgstr "Datum"
+
+#: ../picard/util/tags.py:25
+msgid "Album Artist"
+msgstr "Albeninterpret"
+
+#: ../picard/util/tags.py:26
+msgid "Track Number"
+msgstr "Titelnummer"
+
+#: ../picard/util/tags.py:27
+msgid "Total Tracks"
+msgstr "Anzahl Titel"
+
+#: ../picard/util/tags.py:28
+msgid "Disc Number"
+msgstr "Tonträger-Nummer"
+
+#: ../picard/util/tags.py:29
+msgid "Total Discs"
+msgstr "Anzahl Tonträger"
+
+#: ../picard/util/tags.py:30
+msgid "Album Artist Sort Order"
+msgstr "Sortiername des Albuminterpreten"
+
+#: ../picard/util/tags.py:31
+msgid "Artist Sort Order"
+msgstr "Sortiername des Interpreten"
+
+#: ../picard/util/tags.py:32
+msgid "Title Sort Order"
+msgstr "Sortiername des Titels"
+
+#: ../picard/util/tags.py:33
+msgid "Album Sort Order"
+msgstr "Sortiername des Albums"
+
+#: ../picard/util/tags.py:34
+msgid "ASIN"
+msgstr "ASIN"
+
+#: ../picard/util/tags.py:35
+msgid "Grouping"
+msgstr "Gruppierung"
+
+#: ../picard/util/tags.py:37
+msgid "ISRC"
+msgstr "ISRC"
+
+#: ../picard/util/tags.py:38
+msgid "Mood"
+msgstr "Stimmung"
+
+#: ../picard/util/tags.py:39
+msgid "BPM"
+msgstr "BPM"
+
+#: ../picard/util/tags.py:40
+msgid "Copyright"
+msgstr "Copyright"
+
+#: ../picard/util/tags.py:41
+msgid "Composer"
+msgstr "Komponist"
+
+#: ../picard/util/tags.py:42
+msgid "Conductor"
+msgstr "Dirigent"
+
+#: ../picard/util/tags.py:43
+msgid "Lyricist"
+msgstr "Texter"
+
+#: ../picard/util/tags.py:44
+msgid "Arranger"
+msgstr "Arrangeur"
+
+#: ../picard/util/tags.py:45
+msgid "Producer"
+msgstr "Produzent"
+
+#: ../picard/util/tags.py:46
+msgid "Engineer"
+msgstr "Tontechniker"
+
+#: ../picard/util/tags.py:47
+msgid "Subtitle"
+msgstr "Untertitel"
+
+#: ../picard/util/tags.py:48
+msgid "Disc Subtitle"
+msgstr "Tonträger-Untertitel"
+
+#: ../picard/util/tags.py:49
+msgid "Remixer"
+msgstr "Remixer"
+
+#: ../picard/util/tags.py:50
+msgid "MusicBrainz Track Id"
+msgstr "MusicBrainz-Titel-ID"
+
+#: ../picard/util/tags.py:51
+msgid "MusicBrainz Release Id"
+msgstr "MusicBrainz-Album-ID"
+
+#: ../picard/util/tags.py:52
+msgid "MusicBrainz Artist Id"
+msgstr "MusicBrainz-Interpreten-ID"
+
+#: ../picard/util/tags.py:53
+msgid "MusicBrainz Release Artist Id"
+msgstr "MusicBrainz-Albuminterpreten-ID"
+
+#: ../picard/util/tags.py:54
+msgid "MusicBrainz TRM Id"
+msgstr "MusicBrainz-TRM-ID"
+
+#: ../picard/util/tags.py:55
+#, fuzzy
+msgid "MusicBrainz Disc Id"
+msgstr "MusicBrainz-Interpreten-ID"
+
+#: ../picard/util/tags.py:56
+#, fuzzy
+msgid "MusicBrainz Sort Name"
+msgstr "MusicBrainz-Server"
+
+#: ../picard/util/tags.py:57
+msgid "MusicIP PUID"
+msgstr "MusicIP-PUID"
+
+#: ../picard/util/tags.py:58
+msgid "MusicIP Fingerprint"
+msgstr "MusicIP Fingerabdruck"
+
+#: ../picard/util/tags.py:59
+msgid "Disc Id"
 msgstr ""
 
+#: ../picard/util/tags.py:60
+msgid "Website"
+msgstr "Webseite"
+
+#: ../picard/util/tags.py:61
+msgid "Compilation"
+msgstr "Kompilation"
+
+#: ../picard/util/tags.py:62
+msgid "Comment"
+msgstr "Kommentar"
+
+#: ../picard/util/tags.py:63
+msgid "Genre"
+msgstr "Genre"
+
+#: ../picard/util/tags.py:64
+msgid "Encoded By"
+msgstr "Kodierer"
+
+#: ../picard/util/tags.py:65
+msgid "Performer"
+msgstr "Interpret"
+
+#: ../picard/util/tags.py:66
+msgid "Release Type"
+msgstr "Veröffentlichungstyp"
+
+#: ../picard/util/tags.py:67
+msgid "Release Status"
+msgstr "Veröffentlichungsstatus"
+
+#: ../picard/util/tags.py:68
+msgid "Release Country"
+msgstr "Veröffentlichungsland"
+
+#: ../picard/util/tags.py:69
+msgid "Record Label"
+msgstr "Plattenlabel"
+
+#: ../picard/util/tags.py:70
+msgid "Barcode"
+msgstr "Strichcode"
+
+#: ../picard/util/tags.py:71
+msgid "Catalog Number"
+msgstr "Katalognummer"
+
+#: ../picard/util/tags.py:72
+msgid "Format"
+msgstr "Format"
+
+#: ../picard/util/tags.py:73
+msgid "DJ-Mixer"
+msgstr "DJ-Mixer"
+
+#: ../picard/util/tags.py:74
+msgid "Media"
+msgstr "Medien"
+
+#: ../picard/util/tags.py:75
+msgid "Lyrics"
+msgstr "Liedtext"
+
+#: ../picard/util/tags.py:76
+msgid "Mixer"
+msgstr "Mixer"
+
+#: ../picard/util/tags.py:77
+msgid "Language"
+msgstr "Sprache"
+
+#: ../picard/util/tags.py:78
+#, fuzzy
+msgid "Script"
+msgstr "Skripting"
+
 #: ../picard/util/webbrowser2.py:84
 msgid "Web Browser Error"
 msgstr "Webbrowser-Fehler"
@@ -982,292 +2529,62 @@ msgstr ""
 "\n"
 "%s"
 
-#~ msgid "No matching tracks for file %s"
-#~ msgstr "Keine passenden Titel für Datei %s"
-
-#~ msgid "File %s identified!"
-#~ msgstr "Datei %s identifiziert!"
-
-#~ msgid "Looking up the PUID for file %s..."
-#~ msgstr "Frage PUID für Datei %s ab..."
-
-#~ msgid "Looking up the metadata for file %s..."
-#~ msgstr "Frage Metadaten für Datei %s ab..."
-
-#~ msgid "No matching releases for cluster %s"
-#~ msgstr "Keine passenden Alben für Gruppe %s"
-
-#~ msgid "Cluster %s identified!"
-#~ msgstr "Gruppe %s identifiziert!"
-
-#~ msgid "Looking up the metadata for cluster %s..."
-#~ msgstr "Frage Metadaten für Gruppe %s ab..."
-
-#~ msgid "M3U Playlist (*.m3u)"
-#~ msgstr "M3U-Wiedergabeliste (*.m3u)"
-
-#~ msgid "PLS Playlist (*.pls)"
-#~ msgstr "PLS-Wiedergabeliste (*.pls)"
-
-#~ msgid "XSPF Playlist (*.xspf)"
-#~ msgstr "XSPF-Wiedergabeliste (*.xspf)"
-
-#~ msgid "Submitting PUIDs..."
-#~ msgstr "Übertrage PUIDs …"
-
-#~ msgid "PUIDs submission failed: %s"
-#~ msgstr "Übertragung der PUIDs fehlgeschlagen: %s"
-
-#~ msgid "PUIDs successfully submitted!"
-#~ msgstr "PUIDs erfolgreich versandt."
-
 #~ msgid "New Version"
 #~ msgstr "Neue Version"
-
 #~ msgid ""
 #~ "New version of Picard is available (%s). Would you like to download it "
 #~ "now?"
 #~ msgstr ""
 #~ "Eine neue Version von Picard ist verfügbar (%s). Wollen Sie die neue "
 #~ "Datei herunterladen?"
-
-#~ msgid "Couldn't find PUID for file %s"
-#~ msgstr "Konnnte PUID für Datei %s nicht laden."
-
-#~ msgid "Looking up the fingerprint for file %s..."
-#~ msgstr "Frage akustischen Fingerabdruck der Datei %s ab …"
-
-#~ msgid "Creating fingerprint for file %s..."
-#~ msgstr "Erzeuge akustischen Fingerabdruck der Datei %s …"
-
-#~ msgid "Length"
-#~ msgstr "Dauer"
-
-#~ msgid "&Ok"
-#~ msgstr "&OK"
-
-#~ msgid "&Cancel"
-#~ msgstr "&Abbrechen"
-
-#~ msgid "About"
-#~ msgstr "Über"
-
-#~ msgid "Advanced"
-#~ msgstr "Erweitert"
-
-#~ msgid "Matching"
-#~ msgstr "Abgleich"
-
-#~ msgid "File Naming"
-#~ msgstr "Dateibenennung"
-
-#~ msgid "Scripting"
-#~ msgstr "Skripting"
-
-#~ msgid "Tags"
-#~ msgstr "Tags"
-
-#~ msgid "User Interface"
-#~ msgstr "Benutzeroberfläche"
-
-#~ msgid "Date"
-#~ msgstr "Datum"
-
-#~ msgid "Album Artist"
-#~ msgstr "Albeninterpret"
-
-#~ msgid "Track Number"
-#~ msgstr "Titelnummer"
-
-#~ msgid "Total Tracks"
-#~ msgstr "Anzahl Titel"
-
-#~ msgid "Disc Number"
-#~ msgstr "Tonträger-Nummer"
-
-#~ msgid "Total Discs"
-#~ msgstr "Anzahl Tonträger"
-
-#~ msgid "Album Artist Sort Order"
-#~ msgstr "Sortiername des Albuminterpreten"
-
-#~ msgid "Artist Sort Order"
-#~ msgstr "Sortiername des Interpreten"
-
-#~ msgid "Title Sort Order"
-#~ msgstr "Sortiername des Titels"
-
-#~ msgid "Album Sort Order"
-#~ msgstr "Sortiername des Albums"
-
-#~ msgid "ASIN"
-#~ msgstr "ASIN"
-
-#~ msgid "Grouping"
-#~ msgstr "Gruppierung"
-
-#~ msgid "ISRC"
-#~ msgstr "ISRC"
-
-#~ msgid "Mood"
-#~ msgstr "Stimmung"
-
-#~ msgid "BPM"
-#~ msgstr "BPM"
-
-#~ msgid "Copyright"
-#~ msgstr "Copyright"
-
-#~ msgid "Composer"
-#~ msgstr "Komponist"
-
-#~ msgid "Conductor"
-#~ msgstr "Dirigent"
-
-#~ msgid "Lyricist"
-#~ msgstr "Texter"
-
-#~ msgid "Arranger"
-#~ msgstr "Arrangeur"
-
-#~ msgid "Producer"
-#~ msgstr "Produzent"
-
-#~ msgid "Engineer"
-#~ msgstr "Tontechniker"
-
-#~ msgid "Subtitle"
-#~ msgstr "Untertitel"
-
-#~ msgid "Disc Subtitle"
-#~ msgstr "Tonträger-Untertitel"
-
-#~ msgid "Remixer"
-#~ msgstr "Remixer"
-
-#~ msgid "MusicBrainz Track Id"
-#~ msgstr "MusicBrainz-Titel-ID"
-
-#~ msgid "MusicBrainz Release Id"
-#~ msgstr "MusicBrainz-Album-ID"
-
-#~ msgid "MusicBrainz Artist Id"
-#~ msgstr "MusicBrainz-Interpreten-ID"
-
-#~ msgid "MusicBrainz Release Artist Id"
-#~ msgstr "MusicBrainz-Albuminterpreten-ID"
-
-#~ msgid "MusicBrainz TRM Id"
-#~ msgstr "MusicBrainz-TRM-ID"
-
-#~ msgid "MusicIP PUID"
-#~ msgstr "MusicIP-PUID"
-
-#~ msgid "MusicIP Fingerprint"
-#~ msgstr "MusicIP Fingerabdruck"
-
-#~ msgid "Website"
-#~ msgstr "Webseite"
-
-#~ msgid "Compilation"
-#~ msgstr "Kompilation"
-
-#~ msgid "Comment"
-#~ msgstr "Kommentar"
-
-#~ msgid "Genre"
-#~ msgstr "Genre"
-
-#~ msgid "Encoded By"
-#~ msgstr "Kodierer"
-
-#~ msgid "Performer"
-#~ msgstr "Interpret"
-
-#~ msgid "Release Type"
-#~ msgstr "Veröffentlichungstyp"
-
-#~ msgid "Release Status"
-#~ msgstr "Veröffentlichungsstatus"
-
-#~ msgid "Record Label"
-#~ msgstr "Plattenlabel"
-
-#~ msgid "Barcode"
-#~ msgstr "Strichcode"
-
-#~ msgid "Catalog Number"
-#~ msgstr "Katalognummer"
-
-#~ msgid "DJ-Mixer"
-#~ msgstr "DJ-Mixer"
-
-#~ msgid "Media"
-#~ msgstr "Medien"
-
-#~ msgid "Lyrics"
-#~ msgstr "Liedtext"
-
-#~ msgid "Mixer"
-#~ msgstr "Mixer"
-
+#~ msgid "Delete"
+#~ msgstr "&Löschen"
+#~ msgid "Maximal number of tags:"
+#~ msgstr "Maximale Anzahl Tags"
 #~ msgid "Ctrl+T"
 #~ msgstr "Strg+T"
-
 #~ msgid "Automatically analyze all new files"
 #~ msgstr "Analysiere alle neuen Dateien automatisch"
 
-#~ msgid "Toolbar"
-#~ msgstr "Werkzeugleiste"
+#, fuzzy
+#~ msgid "&Advanced"
+#~ msgstr "Erweitert"
 
+#, fuzzy
+#~ msgid "A&dd Directory..."
+#~ msgstr "&Verzeichnis hinzufügen...\tCtrl+D"
 #~ msgid "Are You Sure?"
 #~ msgstr "Sind Sie sicher?"
-
 #~ msgid "Add &Files...\tCtrl+O"
 #~ msgstr "&Dateien hinzufügen...\tCtrl+O"
-
 #~ msgid "Add &Directory...\tCtrl+D"
 #~ msgstr "&Verzeichnis hinzufügen...\tCtrl+D"
-
 #~ msgid "&Save Files\tCtrl+S"
 #~ msgstr "Dateien &speichern\tCtrl+S"
-
 #~ msgid "C&opy\tCtrl+C"
 #~ msgstr "&Kopieren\tCtrl+C"
-
 #~ msgid "Help"
 #~ msgstr "Hilfe"
-
 #~ msgid "Preferences"
 #~ msgstr "Einstellungen"
-
 #~ msgid "Error while saving cuesheet %s."
 #~ msgstr "Fehler beim Speichern von Cuesheet %s."
-
 #~ msgid "Cuesheet %s saved."
 #~ msgstr "Cuesheet %s gespeichert."
-
 #~ msgid "Time"
 #~ msgstr "Zeit"
-
 #~ msgid "Albums"
 #~ msgstr "Alben"
-
 #~ msgid "Force Save"
 #~ msgstr "Speichern erzwingen"
-
 #~ msgid "Buy"
 #~ msgstr "Kaufen"
-
 #~ msgid "Welcome to Picard!"
 #~ msgstr "Willkommen bei Picard!"
-
 #~ msgid "Track Num"
 #~ msgstr "Titelnr."
-
 #~ msgid "PUID Collision"
 #~ msgstr "PUID Kollision"
-
 #~ msgid ""
 #~ "Version %s\n"
 #~ "\n"
@@ -1294,121 +2611,84 @@ msgstr ""
 #~ "durch eine Spende der Helix Community.\n"
 #~ "\n"
 #~ "Unterstützte Formate: %s"
-
-#~ msgid "Colors"
-#~ msgstr "Farben"
-
 #~ msgid "Font color"
 #~ msgstr "Schriftfarbe"
-
 #~ msgid "Directories"
 #~ msgstr "Verzeichnisse"
-
 #~ msgid "Watch for new files"
 #~ msgstr "Überwachen auf neuen Dateien"
-
 #~ msgid "Watch this directory for new audio files"
 #~ msgstr "Dieses Verzeichnis auf neue Audiodateien überwachen"
-
 #~ msgid "Encodings"
 #~ msgstr "Kodierungen"
-
 #~ msgid "all languages"
 #~ msgstr "alle Sprachen"
-
 #~ msgid "percent similar."
 #~ msgstr "Prozent Übereinstimmung."
-
 #~ msgid "Load recently used albums on startup"
 #~ msgstr "Lade zuletzt benutzte Alben beim Start"
-
-#~ msgid "Language"
-#~ msgstr "Sprache"
-
-#~ msgid "System default"
-#~ msgstr "Systemvoreinstellung"
-
 #~ msgid "Allowed filename characters"
 #~ msgstr "In Dateinamen erlaubte Zeichen"
-
 #~ msgid "Use Windows-safe file names"
 #~ msgstr "Benutze Windows-sichere Dateinamen"
-
 #~ msgid "Number of tracks on the album"
 #~ msgstr "Anzahl Titel auf dem Album"
-
 #~ msgid "Track name"
 #~ msgstr "Titelname"
-
 #~ msgid "Zero padded track number"
 #~ msgstr "Titelnummer mit führender Null"
-
 #~ msgid "File format (e.g. mp3, ogg, wav)"
 #~ msgstr "Dateiformat (z.B. mp3, ogg, wav)"
-
 #~ msgid "Album type (album, single, EP, etc.)"
 #~ msgstr "Albumtyp (Album, Single, EP usw.)"
-
 #~ msgid "Album Status (official, promo, etc.)"
 #~ msgstr "Albumstatus (Offiziell, Promo usw.)"
-
 #~ msgid "Album release month"
 #~ msgstr "Monat der Veröffentlichung des Albums"
-
 #~ msgid "Album release day"
 #~ msgstr "Tag der Veröffentlichung des Albums"
-
 #~ msgid "Album release year"
 #~ msgstr "Jahr der Veröffentlichung des Albums"
-
 #~ msgid "Make it so!"
 #~ msgstr "Energie!"
-
 #~ msgid "Use proxy server to access the Internet"
 #~ msgstr "Benutze Proxy-Server zum Verbinden ins Internet"
-
 #~ msgid "Proxy server to use"
 #~ msgstr "Zu benutzender Proxyserver"
-
 #~ msgid "Proxy port"
 #~ msgstr "Proxy-Port"
-
 #~ msgid "ID3v2.4 only"
 #~ msgstr "Nur ID3v2.4"
-
 #~ msgid "Save track/album"
 #~ msgstr "Titel/Album speichern"
-
 #~ msgid "Artists"
 #~ msgstr "Interpreten"
 
+#, fuzzy
+#~ msgid "Auto Tag"
+#~ msgstr "Tag bearbeiten"
+
+#, fuzzy
+#~ msgid "Edit &Tags..."
+#~ msgstr "Tag bearbeiten"
 #~ msgid "New files (drag files to tag here)"
 #~ msgstr "Neue Dateien (zu taggende Dateien hierherziehen)"
-
 #~ msgid "updating album information"
 #~ msgstr "Albuminformationen werden aktualisiert"
-
 #~ msgid "Submitting PUID information to MusicBrainz server ..."
 #~ msgstr "Sende PUID-Informationen zum MusicBrainz-Server ..."
-
 #~ msgid "Performing a PUID lookup on file %s ..."
 #~ msgstr "Führe einen PUID-Lookup für Datei %s durch ..."
-
 #~ msgid "Are you sure you want to exit the application?"
 #~ msgstr "Wollen Sie die Anwendung wirklich beenden?"
-
 #~ msgid "CD Lookup error -- is there a CD in the CD-ROM drive?"
 #~ msgstr "CD Lookup Fehler -- ist eine CD im CD-Laufwerk?"
-
 #~ msgid "CD Lookup Failed"
 #~ msgstr "CD Lookup fehlgeschlagen"
-
 #~ msgid "&Quick Start Guide"
 #~ msgstr "&Schnellanleitung"
-
 #~ msgid "Quick Start Guide"
 #~ msgstr "Schnellanleitung"
-
 #~ msgid ""
 #~ "You have not specified an username and password. In order to contribute "
 #~ "data to MusicBrainz, you must have a MusicBrainz account.\n"
@@ -1421,29 +2701,22 @@ msgstr ""
 #~ "Wollen Sie jetzt einen Account erstellen? Wenn Sie schon einen "
 #~ "MusicBrainz Account haben, geben Sie bitte Ihre Zugangsdaten in den "
 #~ "Optionen an. "
-
 #~ msgid "Couldn't connect to the MusicBrainz server."
 #~ msgstr "Verbinden zum MusicBrainz-Server fehlgeschlagen."
-
 #~ msgid "Connection error"
 #~ msgstr "Verbindungsfehler"
-
 #~ msgid ""
 #~ "MusicBrainz Picard requires wxPython with UNICODE support.\n"
 #~ "Please download the appropriate toolkit from http://www.wxpython.org/"
 #~ msgstr ""
 #~ "MusicBrainz Picard benötigt wxPython mit Unicode-Unterstützung.\n"
 #~ "Bitte laden Sie das entsprechende Toolkit von http://www.wxpython.org/"
-
 #~ msgid "Unicode Required"
 #~ msgstr "Unicode benötigt"
-
 #~ msgid "PUID collision on file %s!"
 #~ msgstr "PUID Kollision bei Datei %s!"
-
 #~ msgid "Save error"
 #~ msgstr "Fehler beim Speichern"
-
 #~ msgid ""
 #~ "The move files option is enabled, but the destination directory is not "
 #~ "specified or invalid.\n"
@@ -1454,7 +2727,6 @@ msgstr ""
 #~ "Zielverzeichnis wurde nicht angegeben oder ist ungültig.\n"
 #~ "Bitte korrigieren Sie die Verschieben-Option oder die Zielverzeichnis-"
 #~ "Option und versuchen Sie es erneut."
-
 #~ msgid ""
 #~ "Not all files could be saved. Please check for and examine tracks that "
 #~ "have an error icon in front of them. To retry saving the track, right "
@@ -1464,155 +2736,69 @@ msgstr ""
 #~ "untersuchen Sie Dateien mit einem Fehler-Icon davor. Um das Speichern "
 #~ "erneut zu versuchen, klicken Sie mit rechts auf den Track und wählen Sie "
 #~ "\"Fehler zurücksetzen\"."
-
 #~ msgid "Select directory that contains music files"
 #~ msgstr "Wählen Sie Ihr Musikverzeichnis"
-
 #~ msgid "Reload album from main server"
 #~ msgstr "Album erneut vom Server laden"
-
 #~ msgid "Select or drag a folder from below"
 #~ msgstr "Wählen oder ziehen Sie ein Verzeichnis von hier"
-
 #~ msgid "Drag files from below"
 #~ msgstr "Ziehen Sie Dateien von hier"
-
 #~ msgid "Release date"
 #~ msgstr "VÖ-Datum"
-
 #~ msgid "%d%% similar"
 #~ msgstr "%d%% Übereinstimmung"
-
 #~ msgid "Please donate to MusicBrainz!"
 #~ msgstr "Bitte spenden Sie and MusicBrainz!"
-
-#~ msgid "Later"
-#~ msgstr "Später"
-
 #~ msgid ""
 #~ "The destination directory %s does not exist. Please pick a valid "
 #~ "directory."
 #~ msgstr ""
 #~ "Das Zielverzeichnis %s existiert nicht. Bitte ein gültiges Verzeichnis "
 #~ "auswählen."
-
 #~ msgid "Select the encoding to use when reading and writing filenames"
 #~ msgstr ""
 #~ "Wähle für das Lesen und Schreiben von Dateinamen zu benutzende Kodierung"
-
 #~ msgid "Automatically move clusters to albums that are at least"
 #~ msgstr "Automatisches Verschieben von Gruppen zu Alben bei mindestens"
-
 #~ msgid "Automatically save recognized tracks that are at least"
 #~ msgstr "Automatisches Speichern von Titeln mit mindestens"
-
-#~ msgid "Czech"
-#~ msgstr "Tschechisch"
-
-#~ msgid "German"
-#~ msgstr "Deutsch"
-
-#~ msgid "English"
-#~ msgstr "Englisch"
-
-#~ msgid "English (UK)"
-#~ msgstr "Englisch (UK)"
-
-#~ msgid "Spanish"
-#~ msgstr "Spanisch"
-
-#~ msgid "Finnish"
-#~ msgstr "Finnisch"
-
-#~ msgid "French"
-#~ msgstr "Französisch"
-
-#~ msgid "Hungarian"
-#~ msgstr "Ungarisch"
-
-#~ msgid "Icelandic"
-#~ msgstr "Isländisch"
-
-#~ msgid "Italian"
-#~ msgstr "Italienisch"
-
-#~ msgid "Korean"
-#~ msgstr "Koreanisch"
-
-#~ msgid "Lithuanian"
-#~ msgstr "Litauisch"
-
-#~ msgid "Dutch"
-#~ msgstr "Niederländisch"
-
-#~ msgid "Norwegian Bokmal"
-#~ msgstr "Norwegisches Bokmål"
-
-#~ msgid "Portuguese"
-#~ msgstr "Portugiesisch"
-
-#~ msgid "Romanian"
-#~ msgstr "Rumänisch"
-
-#~ msgid "Russian"
-#~ msgstr "Russisch"
-
-#~ msgid "Slovak"
-#~ msgstr "Slowakisch"
-
-#~ msgid "Swedish"
-#~ msgstr "Schwedisch"
-
 #~ msgid ""
 #~ "Note: This setting will take effect after you restart the application."
 #~ msgstr "Diese Einstellung wird erst nach Neustart des Programmes gültig."
-
 #~ msgid "Artist translation"
 #~ msgstr "Interpretennamensübersetzung"
-
 #~ msgid "Rename files when writing metadata tags"
 #~ msgstr "Dateien beim Schreiben der Tags umbenennen"
-
 #~ msgid "Naming Help"
 #~ msgstr "Formathilfe"
-
 #~ msgid ""
 #~ "You may use the following variables in the filenaming\n"
 #~ "specifications in the options dialog:"
 #~ msgstr ""
 #~ "Folgende Variablen können für Dateinamen im\n"
 #~ "Optionsdialog verwendet werden:"
-
 #~ msgid "A %s in the naming specification will create a new subfolder."
 #~ msgstr ""
 #~ "Ein %s im Eingabefeld für den Dateinamen erzeugt ein neues "
 #~ "Unterverzeichnis."
-
 #~ msgid "Audio fingerprinting options"
 #~ msgstr "Audio-Fingerprinting Optionen"
-
 #~ msgid "Automatically select PUID collision tracks that are at least"
 #~ msgstr "Bei PUID-Kollisionen wähle Tracks mit mindestens"
-
 #~ msgid "Write ID3v1 tags to MP3 files (ID3v2 tags will always be written)"
 #~ msgstr ""
 #~ "Schreibe ID3v1-Tag in MP3 Dateien (ID3v2-Tag wird immer geschrieben)"
-
 #~ msgid "Remove track/album"
 #~ msgstr "Titel/Album entfernen"
-
 #~ msgid "Listen to track"
 #~ msgstr "Titel anhören"
-
 #~ msgid "Album clusters"
 #~ msgstr "Albumgruppen"
-
 #~ msgid "Unmatched files for this album"
 #~ msgstr "Nicht zugeordnete Dateien für dieses Album"
-
 #~ msgid "%d of %d tracks linked"
 #~ msgstr "%d von %d Titel zugewiesen"
-
 #~ msgid ""
 #~ "The Picard Tagger is a free application and you may\n"
 #~ "use it as long as you wish. However, providing\n"
@@ -1631,83 +2817,58 @@ msgstr ""
 #~ "die das MusicBrainz-Projekt leitet. Alle Spenden sind für US-Bürger von\n"
 #~ "der Steuer absetzbar und helfen, diesen Service weiter zu betreiben und "
 #~ "zu entwickeln."
-
 #~ msgid "Matched track highlighting"
 #~ msgstr "Hervorheben übereinstimmender Titel"
-
 #~ msgid "Good match background color"
 #~ msgstr "Hintergrundfarbe für gute Übereinstimmung"
-
 #~ msgid "Bad match background color"
 #~ msgstr "Hintergrundfarbe für schlechte Übereinstimmung"
-
 #~ msgid "Move files option"
 #~ msgstr "\"Dateien verschieben\" Option"
-
 #~ msgid "When matching tracks to albums, accept tracks that are at least"
 #~ msgstr "Automatisches Zuweisen von Titeln zu Alben bei mindestens"
-
 #~ msgid "CD-ROM drive path to use for lookups"
 #~ msgstr "Für Lookups zu benutzender CD-Laufwerkspfad"
-
 #~ msgid "Launch MB Tagger automatically for inserted Audio CDs"
 #~ msgstr "MB Tagger automatisch ausführen beim Einlegen von Audio-CDs"
-
 #~ msgid ""
 #~ "Failed to set the proper registy values to enable launching the tagger "
 #~ "after CD insertion. "
 #~ msgstr ""
 #~ "Setzen der geeigneten Registry-Werte, die das automatische Starten des "
 #~ "Taggers beim Einlegen einer CD ermöglichen, ist fehlgeschlagen. "
-
 #~ msgid "Default CD setting failed"
 #~ msgstr "Voreingestellte CD Einstellung fehlgeschlagen"
-
 #~ msgid "File format naming specification"
 #~ msgstr "Format für Dateinamen"
-
 #~ msgid "Various artist file format naming specification"
 #~ msgstr "Format für Dateinamen bei \"Diverse Interpreten\"-Alben"
-
 #~ msgid "Note: Leave blank to allow all possible characters"
 #~ msgstr "Leer lassen um alle möglichen Zeichen zu erlauben"
-
 #~ msgid "Track artist name"
 #~ msgstr "Name des Titelinterpreten"
-
 #~ msgid "Track artist sortname"
 #~ msgstr "Sortiername des Titelinterpreten"
-
 #~ msgid "The first character of the artist sortname"
 #~ msgstr "Erstes Zeichen des Sortiernamens"
-
 #~ msgid "The first two characters of the artist sortname"
 #~ msgstr "Die ersten zwei Zeichen des Sortiernamens"
-
 #~ msgid "The first three characters of the artist sortname"
 #~ msgstr "Die ersten drei Zeichen des Sortiernamens"
-
 #~ msgid "Naming specification help"
 #~ msgstr "Hilfe für Dateibenennung"
-
 #~ msgid "Accept PUID matches that are at least"
 #~ msgstr "Akzeptiere PUID Treffer mit mindestens"
-
 #~ msgid "Various artist name"
 #~ msgstr "Name für \"Diverse Interpreten\""
-
 #~ msgid "Open file"
 #~ msgstr "Datei öffnen"
-
 #~ msgid "Open directory"
 #~ msgstr "Verzeichnis öffnen"
-
 #~ msgid "Edit options"
 #~ msgstr "Einstellungen"
-
 #~ msgid "Exit"
 #~ msgstr "Beenden"
-
 #~ msgid ""
 #~ "The MusicBrainz Tagger requires wx.Widgets with UNICODE support.\n"
 #~ "Please download the appropriate toolkit from  http://www.wxwidgets.com"
@@ -1716,12 +2877,13 @@ msgstr ""
 #~ "Bitte downloaden Sie das entsprechende Toolkit von http://www.wxwidgets."
 #~ "com"
 
+#, fuzzy
+#~ msgid "Unicode required"
+#~ msgstr "Unicode benötigt"
 #~ msgid "Sorry, there is no help file yet."
 #~ msgstr "Derzeit ist leider noch keine Hilfedatei vorhanden."
-
 #~ msgid "Use Internet Explorer settings for proxy support."
 #~ msgstr "Benutze Internet Explorer Einstellungen für Proxyunterstützung."
-
 #~ msgid ""
 #~ "If you use an automatic proxy configuration in Internet\n"
 #~ "Explorer, uncheck the box above and enter your\n"
@@ -1730,10 +2892,8 @@ msgstr ""
 #~ "Wenn die automatische Proxykonfiguration im Internet\n"
 #~ "Explorer verwendet wird, deselektieren Sie die Checkbox oben und\n"
 #~ "geben Sie Ihren Proxyserver und Proxyport hier an:"
-
 #~ msgid "TRM analyzer thread priority"
 #~ msgstr "TRM Analysierer-Thread Priorität"
-
 #~ msgid ""
 #~ "NOTE: This application can automatically authenticate the\n"
 #~ "MusicBrainz user, but the user name and password will be\n"
@@ -1742,3 +2902,4 @@ msgstr ""
 #~ "Beachten Sie: Diese Anwendung kann MusicBrainz-Benutzer automatisch\n"
 #~ "authentifizieren, aber Benutzername und Passwort werden\n"
 #~ "im Klartext an MusicBrainz bertragen!"
+
diff --git a/po/en.po b/po/en.po
index d6b1ff802..f3aec330c 100644
--- a/po/en.po
+++ b/po/en.po
@@ -7,937 +7,2475 @@ msgid ""
 msgstr ""
 "Project-Id-Version: picard\n"
 "Report-Msgid-Bugs-To: http://bugs.musicbrainz.org/\n"
-"POT-Creation-Date: 2008-12-01 18:20+0100\n"
-"PO-Revision-Date: 2008-07-27 19:59+0000\n"
-"Last-Translator: Lukáš Lalinský <lalinsky@gmail.com>\n"
+"POT-Creation-Date: 2009-01-25 12:23+0100\n"
+"PO-Revision-Date: 2009-01-25 13:07+0100\n"
+"Last-Translator: Philipp Wolfer <phw@rubyforge.org>\n"
 "Language-Team: English <en@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2008-12-01 17:02+0000\n"
+"X-Launchpad-Export-Date: 2009-01-24 23:28+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
-#: ../picard/album.py:108 ../picard/cluster.py:248
+#: ../picard/album.py:108
+#: ../picard/cluster.py:248
 msgid "Unmatched Files"
-msgstr ""
+msgstr "Unmatched Files"
 
-#: ../picard/album.py:269
+#: ../picard/album.py:281
 #, python-format
 msgid "[couldn't load album %s]"
-msgstr ""
+msgstr "[couldn't load album %s]"
 
-#: ../picard/album.py:305
+#: ../picard/album.py:317
 msgid "[loading album information]"
-msgstr ""
+msgstr "[loading album information]"
 
-#: ../picard/tagger.py:472
+#: ../picard/cluster.py:164
+#: ../picard/cluster.py:175
+#, python-format
+msgid "No matching releases for cluster %s"
+msgstr "No matching releases for cluster %s"
+
+#: ../picard/cluster.py:177
+#, python-format
+msgid "Cluster %s identified!"
+msgstr "Cluster %s identified!"
+
+#: ../picard/cluster.py:182
+#, python-format
+msgid "Looking up the metadata for cluster %s..."
+msgstr "Looking up the metadata for cluster %s..."
+
+#: ../picard/const.py:40
+msgid "CD"
+msgstr "CD"
+
+#: ../picard/const.py:41
+msgid "DVD"
+msgstr "DVD"
+
+#: ../picard/const.py:42
+msgid "SACD"
+msgstr "SACD"
+
+#: ../picard/const.py:43
+msgid "LaserDisc"
+msgstr "LaserDisc"
+
+#: ../picard/const.py:44
+msgid "MiniDisc"
+msgstr "MiniDisc"
+
+#: ../picard/const.py:45
+msgid "Vinyl"
+msgstr "Vinyl"
+
+#: ../picard/const.py:46
+msgid "Cassette"
+msgstr "Cassette"
+
+#: ../picard/const.py:47
+msgid "Cartridge (4/8-tracks)"
+msgstr "Cartridge (4/8-tracks)"
+
+#: ../picard/const.py:48
+msgid "Reel-to-Reel"
+msgstr "Reel-to-Reel"
+
+#: ../picard/const.py:49
+msgid "DAT"
+msgstr "DAT"
+
+#: ../picard/const.py:50
+msgid "Digital Media"
+msgstr "Digital Media"
+
+#: ../picard/const.py:51
+msgid "Wax Cylinder"
+msgstr "Wax Cylinder"
+
+#: ../picard/const.py:52
+msgid "Piano Roll"
+msgstr "Piano Roll"
+
+#: ../picard/const.py:53
+msgid "Other"
+msgstr "Other"
+
+#: ../picard/const.py:58
+msgid "Bangladesh"
+msgstr "Bangladesh"
+
+#: ../picard/const.py:59
+msgid "Belgium"
+msgstr "Belgium"
+
+#: ../picard/const.py:60
+msgid "Burkina Faso"
+msgstr "Burkina Faso"
+
+#: ../picard/const.py:61
+msgid "Bulgaria"
+msgstr "Bulgaria"
+
+#: ../picard/const.py:62
+msgid "Barbados"
+msgstr "Barbados"
+
+#: ../picard/const.py:63
+msgid "Wallis and Futuna Islands"
+msgstr "Wallis and Futuna Islands"
+
+#: ../picard/const.py:64
+msgid "Bermuda"
+msgstr "Bermuda"
+
+#: ../picard/const.py:65
+msgid "Brunei Darussalam"
+msgstr "Brunei Darussalam"
+
+#: ../picard/const.py:66
+msgid "Bolivia"
+msgstr "Bolivia"
+
+#: ../picard/const.py:67
+msgid "Bahrain"
+msgstr "Bahrain"
+
+#: ../picard/const.py:68
+msgid "Burundi"
+msgstr "Burundi"
+
+#: ../picard/const.py:69
+msgid "Benin"
+msgstr "Benin"
+
+#: ../picard/const.py:70
+msgid "Bhutan"
+msgstr "Bhutan"
+
+#: ../picard/const.py:71
+msgid "Jamaica"
+msgstr "Jamaica"
+
+#: ../picard/const.py:72
+msgid "Bouvet Island"
+msgstr "Bouvet Island"
+
+#: ../picard/const.py:73
+msgid "Botswana"
+msgstr "Botswana"
+
+#: ../picard/const.py:74
+msgid "Samoa"
+msgstr "Samoa"
+
+#: ../picard/const.py:75
+msgid "Brazil"
+msgstr "Brazil"
+
+#: ../picard/const.py:76
+msgid "Bahamas"
+msgstr "Bahamas"
+
+#: ../picard/const.py:77
+msgid "Belarus"
+msgstr "Belarus"
+
+#: ../picard/const.py:78
+msgid "Belize"
+msgstr "Belize"
+
+#: ../picard/const.py:79
+msgid "Russian Federation"
+msgstr "Russian Federation"
+
+#: ../picard/const.py:80
+msgid "Rwanda"
+msgstr "Rwanda"
+
+#: ../picard/const.py:81
+msgid "Reunion"
+msgstr "Reunion"
+
+#: ../picard/const.py:82
+msgid "Turkmenistan"
+msgstr "Turkmenistan"
+
+#: ../picard/const.py:83
+msgid "Tajikistan"
+msgstr "Tajikistan"
+
+#: ../picard/const.py:84
+msgid "Romania"
+msgstr "Romania"
+
+#: ../picard/const.py:85
+msgid "Tokela"
+msgstr "Tokela"
+
+#: ../picard/const.py:86
+msgid "Guinea-Bissa"
+msgstr "Guinea-Bissa"
+
+#: ../picard/const.py:87
+msgid "Guam"
+msgstr "Guam"
+
+#: ../picard/const.py:88
+msgid "Guatemala"
+msgstr "Guatemala"
+
+#: ../picard/const.py:89
+msgid "Greece"
+msgstr "Greece"
+
+#: ../picard/const.py:90
+msgid "Equatorial Guinea"
+msgstr "Equatorial Guinea"
+
+#: ../picard/const.py:91
+msgid "Guadeloupe"
+msgstr "Guadeloupe"
+
+#: ../picard/const.py:92
+msgid "Japan"
+msgstr "Japan"
+
+#: ../picard/const.py:93
+msgid "Guyana"
+msgstr "Guyana"
+
+#: ../picard/const.py:94
+msgid "French Guiana"
+msgstr "French Guiana"
+
+#: ../picard/const.py:95
+msgid "Georgia"
+msgstr "Georgia"
+
+#: ../picard/const.py:96
+msgid "Grenada"
+msgstr "Grenada"
+
+#: ../picard/const.py:97
+msgid "United Kingdom"
+msgstr "United Kingdom"
+
+#: ../picard/const.py:98
+msgid "Gabon"
+msgstr "Gabon"
+
+#: ../picard/const.py:99
+msgid "El Salvador"
+msgstr "El Salvador"
+
+#: ../picard/const.py:100
+msgid "Guinea"
+msgstr "Guinea"
+
+#: ../picard/const.py:101
+msgid "Gambia"
+msgstr "Gambia"
+
+#: ../picard/const.py:102
+msgid "Greenland"
+msgstr "Greenland"
+
+#: ../picard/const.py:103
+msgid "Gibraltar"
+msgstr "Gibraltar"
+
+#: ../picard/const.py:104
+msgid "Ghana"
+msgstr "Ghana"
+
+#: ../picard/const.py:105
+msgid "Oman"
+msgstr "Oman"
+
+#: ../picard/const.py:106
+msgid "Tunisia"
+msgstr "Tunisia"
+
+#: ../picard/const.py:107
+msgid "Jordan"
+msgstr "Jordan"
+
+#: ../picard/const.py:108
+msgid "Haiti"
+msgstr "Haiti"
+
+#: ../picard/const.py:109
+msgid "Hungary"
+msgstr "Hungary"
+
+#: ../picard/const.py:110
+msgid "Hong Kong"
+msgstr "Hong Kong"
+
+#: ../picard/const.py:111
+msgid "Honduras"
+msgstr "Honduras"
+
+#: ../picard/const.py:112
+msgid "Heard and Mc Donald Islands"
+msgstr "Heard and Mc Donald Islands"
+
+#: ../picard/const.py:113
+msgid "Venezuela"
+msgstr "Venezuela"
+
+#: ../picard/const.py:114
+msgid "Puerto Rico"
+msgstr "Puerto Rico"
+
+#: ../picard/const.py:115
+msgid "Pala"
+msgstr "Pala"
+
+#: ../picard/const.py:116
+msgid "Portugal"
+msgstr "Portugal"
+
+#: ../picard/const.py:117
+msgid "Svalbard and Jan Mayen Islands"
+msgstr "Svalbard and Jan Mayen Islands"
+
+#: ../picard/const.py:118
+msgid "Paraguay"
+msgstr "Paraguay"
+
+#: ../picard/const.py:119
+msgid "Iraq"
+msgstr "Iraq"
+
+#: ../picard/const.py:120
+msgid "Panama"
+msgstr "Panama"
+
+#: ../picard/const.py:121
+msgid "French Polynesia"
+msgstr "French Polynesia"
+
+#: ../picard/const.py:122
+msgid "Papua New Guinea"
+msgstr "Papua New Guinea"
+
+#: ../picard/const.py:123
+msgid "Per"
+msgstr "Per"
+
+#: ../picard/const.py:124
+msgid "Pakistan"
+msgstr "Pakistan"
+
+#: ../picard/const.py:125
+msgid "Philippines"
+msgstr "Philippines"
+
+#: ../picard/const.py:126
+msgid "Pitcairn"
+msgstr "Pitcairn"
+
+#: ../picard/const.py:127
+msgid "Poland"
+msgstr "Poland"
+
+#: ../picard/const.py:128
+msgid "St. Pierre and Miquelon"
+msgstr "St. Pierre and Miquelon"
+
+#: ../picard/const.py:129
+msgid "Zambia"
+msgstr "Zambia"
+
+#: ../picard/const.py:130
+msgid "Western Sahara"
+msgstr "Western Sahara"
+
+#: ../picard/const.py:131
+msgid "Estonia"
+msgstr "Estonia"
+
+#: ../picard/const.py:132
+msgid "Egypt"
+msgstr "Egypt"
+
+#: ../picard/const.py:133
+msgid "South Africa"
+msgstr "South Africa"
+
+#: ../picard/const.py:134
+msgid "Ecuador"
+msgstr "Ecuador"
+
+#: ../picard/const.py:135
+msgid "Italy"
+msgstr "Italy"
+
+#: ../picard/const.py:136
+msgid "Viet Nam"
+msgstr "Viet Nam"
+
+#: ../picard/const.py:137
+msgid "Solomon Islands"
+msgstr "Solomon Islands"
+
+#: ../picard/const.py:138
+msgid "Ethiopia"
+msgstr "Ethiopia"
+
+#: ../picard/const.py:139
+msgid "Somalia"
+msgstr "Somalia"
+
+#: ../picard/const.py:140
+msgid "Zimbabwe"
+msgstr "Zimbabwe"
+
+#: ../picard/const.py:141
+msgid "Saudi Arabia"
+msgstr "Saudi Arabia"
+
+#: ../picard/const.py:142
+msgid "Spain"
+msgstr "Spain"
+
+#: ../picard/const.py:143
+msgid "Eritrea"
+msgstr "Eritrea"
+
+#: ../picard/const.py:144
+msgid "Moldova, Republic of"
+msgstr "Moldova, Republic of"
+
+#: ../picard/const.py:145
+msgid "Madagascar"
+msgstr "Madagascar"
+
+#: ../picard/const.py:146
+msgid "Morocco"
+msgstr "Morocco"
+
+#: ../picard/const.py:147
+msgid "Monaco"
+msgstr "Monaco"
+
+#: ../picard/const.py:148
+msgid "Uzbekistan"
+msgstr "Uzbekistan"
+
+#: ../picard/const.py:149
+msgid "Myanmar"
+msgstr "Myanmar"
+
+#: ../picard/const.py:150
+msgid "Mali"
+msgstr "Mali"
+
+#: ../picard/const.py:151
+msgid "Maca"
+msgstr "Maca"
+
+#: ../picard/const.py:152
+msgid "Mongolia"
+msgstr "Mongolia"
+
+#: ../picard/const.py:153
+msgid "Marshall Islands"
+msgstr "Marshall Islands"
+
+#: ../picard/const.py:154
+msgid "Macedonia, The Former Yugoslav Republic of"
+msgstr "Macedonia, The Former Yugoslav Republic of"
+
+#: ../picard/const.py:155
+msgid "Mauritius"
+msgstr "Mauritius"
+
+#: ../picard/const.py:156
+msgid "Malta"
+msgstr "Malta"
+
+#: ../picard/const.py:157
+msgid "Malawi"
+msgstr "Malawi"
+
+#: ../picard/const.py:158
+msgid "Maldives"
+msgstr "Maldives"
+
+#: ../picard/const.py:159
+msgid "Martinique"
+msgstr "Martinique"
+
+#: ../picard/const.py:160
+msgid "Northern Mariana Islands"
+msgstr "Northern Mariana Islands"
+
+#: ../picard/const.py:161
+msgid "Montserrat"
+msgstr "Montserrat"
+
+#: ../picard/const.py:162
+msgid "Mauritania"
+msgstr "Mauritania"
+
+#: ../picard/const.py:163
+msgid "Uganda"
+msgstr "Uganda"
+
+#: ../picard/const.py:164
+msgid "Malaysia"
+msgstr "Malaysia"
+
+#: ../picard/const.py:165
+msgid "Mexico"
+msgstr "Mexico"
+
+#: ../picard/const.py:166
+msgid "Israel"
+msgstr "Israel"
+
+#: ../picard/const.py:167
+msgid "France"
+msgstr "France"
+
+#: ../picard/const.py:168
+msgid "British Indian Ocean Territory"
+msgstr "British Indian Ocean Territory"
+
+#: ../picard/const.py:169
+msgid "St. Helena"
+msgstr "St. Helena"
+
+#: ../picard/const.py:170
+msgid "Finland"
+msgstr "Finland"
+
+#: ../picard/const.py:171
+msgid "Fiji"
+msgstr "Fiji"
+
+#: ../picard/const.py:172
+msgid "Falkland Islands (Malvinas)"
+msgstr "Falkland Islands (Malvinas)"
+
+#: ../picard/const.py:173
+msgid "Micronesia, Federated States of"
+msgstr "Micronesia, Federated States of"
+
+#: ../picard/const.py:174
+msgid "Faroe Islands"
+msgstr "Faroe Islands"
+
+#: ../picard/const.py:175
+msgid "Nicaragua"
+msgstr "Nicaragua"
+
+#: ../picard/const.py:176
+msgid "Netherlands"
+msgstr "Netherlands"
+
+#: ../picard/const.py:177
+msgid "Norway"
+msgstr "Norway"
+
+#: ../picard/const.py:178
+msgid "Namibia"
+msgstr "Namibia"
+
+#: ../picard/const.py:179
+msgid "Vanuat"
+msgstr "Vanuat"
+
+#: ../picard/const.py:180
+msgid "New Caledonia"
+msgstr "New Caledonia"
+
+#: ../picard/const.py:181
+msgid "Niger"
+msgstr "Niger"
+
+#: ../picard/const.py:182
+msgid "Norfolk Island"
+msgstr "Norfolk Island"
+
+#: ../picard/const.py:183
+msgid "Nigeria"
+msgstr "Nigeria"
+
+#: ../picard/const.py:184
+msgid "New Zealand"
+msgstr "New Zealand"
+
+#: ../picard/const.py:185
+msgid "Zaire"
+msgstr "Zaire"
+
+#: ../picard/const.py:186
+msgid "Nepal"
+msgstr "Nepal"
+
+#: ../picard/const.py:187
+msgid "Naur"
+msgstr "Naur"
+
+#: ../picard/const.py:188
+msgid "Niue"
+msgstr "Niue"
+
+#: ../picard/const.py:189
+msgid "Cook Islands"
+msgstr "Cook Islands"
+
+#: ../picard/const.py:190
+msgid "Cote d'Ivoire"
+msgstr "Cote d'Ivoire"
+
+#: ../picard/const.py:191
+msgid "Switzerland"
+msgstr "Switzerland"
+
+#: ../picard/const.py:192
+msgid "Colombia"
+msgstr "Colombia"
+
+#: ../picard/const.py:193
+msgid "China"
+msgstr "China"
+
+#: ../picard/const.py:194
+msgid "Cameroon"
+msgstr "Cameroon"
+
+#: ../picard/const.py:195
+msgid "Chile"
+msgstr "Chile"
+
+#: ../picard/const.py:196
+msgid "Cocos (Keeling) Islands"
+msgstr "Cocos (Keeling) Islands"
+
+#: ../picard/const.py:197
+msgid "Canada"
+msgstr "Canada"
+
+#: ../picard/const.py:198
+msgid "Congo"
+msgstr "Congo"
+
+#: ../picard/const.py:199
+msgid "Central African Republic"
+msgstr "Central African Republic"
+
+#: ../picard/const.py:200
+msgid "Czech Republic"
+msgstr "Czech Republic"
+
+#: ../picard/const.py:201
+msgid "Cyprus"
+msgstr "Cyprus"
+
+#: ../picard/const.py:202
+msgid "Christmas Island"
+msgstr "Christmas Island"
+
+#: ../picard/const.py:203
+msgid "Costa Rica"
+msgstr "Costa Rica"
+
+#: ../picard/const.py:204
+msgid "Cape Verde"
+msgstr "Cape Verde"
+
+#: ../picard/const.py:205
+msgid "Cuba"
+msgstr "Cuba"
+
+#: ../picard/const.py:206
+msgid "Swaziland"
+msgstr "Swaziland"
+
+#: ../picard/const.py:207
+msgid "Syrian Arab Republic"
+msgstr "Syrian Arab Republic"
+
+#: ../picard/const.py:208
+msgid "Kyrgyzstan"
+msgstr "Kyrgyzstan"
+
+#: ../picard/const.py:209
+msgid "Kenya"
+msgstr "Kenya"
+
+#: ../picard/const.py:210
+msgid "Suriname"
+msgstr "Suriname"
+
+#: ../picard/const.py:211
+msgid "Kiribati"
+msgstr "Kiribati"
+
+#: ../picard/const.py:212
+msgid "Cambodia"
+msgstr "Cambodia"
+
+#: ../picard/const.py:213
+msgid "Saint Kitts and Nevis"
+msgstr "Saint Kitts and Nevis"
+
+#: ../picard/const.py:214
+msgid "Comoros"
+msgstr "Comoros"
+
+#: ../picard/const.py:215
+msgid "Sao Tome and Principe"
+msgstr "Sao Tome and Principe"
+
+#: ../picard/const.py:216
+msgid "Slovenia"
+msgstr "Slovenia"
+
+#: ../picard/const.py:217
+msgid "Kuwait"
+msgstr "Kuwait"
+
+#: ../picard/const.py:218
+msgid "Senegal"
+msgstr "Senegal"
+
+#: ../picard/const.py:219
+msgid "San Marino"
+msgstr "San Marino"
+
+#: ../picard/const.py:220
+msgid "Sierra Leone"
+msgstr "Sierra Leone"
+
+#: ../picard/const.py:221
+msgid "Seychelles"
+msgstr "Seychelles"
+
+#: ../picard/const.py:222
+msgid "Kazakhstan"
+msgstr "Kazakhstan"
+
+#: ../picard/const.py:223
+msgid "Cayman Islands"
+msgstr "Cayman Islands"
+
+#: ../picard/const.py:224
+msgid "Singapore"
+msgstr "Singapore"
+
+#: ../picard/const.py:225
+msgid "Sweden"
+msgstr "Sweden"
+
+#: ../picard/const.py:226
+msgid "Sudan"
+msgstr "Sudan"
+
+#: ../picard/const.py:227
+msgid "Dominican Republic"
+msgstr "Dominican Republic"
+
+#: ../picard/const.py:228
+msgid "Dominica"
+msgstr "Dominica"
+
+#: ../picard/const.py:229
+msgid "Djibouti"
+msgstr "Djibouti"
+
+#: ../picard/const.py:230
+msgid "Denmark"
+msgstr "Denmark"
+
+#: ../picard/const.py:231
+msgid "Virgin Islands (British)"
+msgstr "Virgin Islands (British)"
+
+#: ../picard/const.py:232
+msgid "Germany"
+msgstr "Germany"
+
+#: ../picard/const.py:233
+msgid "Yemen"
+msgstr "Yemen"
+
+#: ../picard/const.py:234
+msgid "Algeria"
+msgstr "Algeria"
+
+#: ../picard/const.py:235
+msgid "United States"
+msgstr "United States"
+
+#: ../picard/const.py:236
+msgid "Uruguay"
+msgstr "Uruguay"
+
+#: ../picard/const.py:237
+msgid "Mayotte"
+msgstr "Mayotte"
+
+#: ../picard/const.py:238
+msgid "United States Minor Outlying Islands"
+msgstr "United States Minor Outlying Islands"
+
+#: ../picard/const.py:239
+msgid "Lebanon"
+msgstr "Lebanon"
+
+#: ../picard/const.py:240
+msgid "Saint Lucia"
+msgstr "Saint Lucia"
+
+#: ../picard/const.py:241
+msgid "Lao People's Democratic Republic"
+msgstr "Lao People's Democratic Republic"
+
+#: ../picard/const.py:242
+msgid "Tuval"
+msgstr "Tuval"
+
+#: ../picard/const.py:243
+msgid "Taiwan"
+msgstr "Taiwan"
+
+#: ../picard/const.py:244
+msgid "Trinidad and Tobago"
+msgstr "Trinidad and Tobago"
+
+#: ../picard/const.py:245
+msgid "Turkey"
+msgstr "Turkey"
+
+#: ../picard/const.py:246
+msgid "Sri Lanka"
+msgstr "Sri Lanka"
+
+#: ../picard/const.py:247
+msgid "Liechtenstein"
+msgstr "Liechtenstein"
+
+#: ../picard/const.py:248
+msgid "Latvia"
+msgstr "Latvia"
+
+#: ../picard/const.py:249
+msgid "Tonga"
+msgstr "Tonga"
+
+#: ../picard/const.py:250
+msgid "Lithuania"
+msgstr "Lithuania"
+
+#: ../picard/const.py:251
+msgid "Luxembourg"
+msgstr "Luxembourg"
+
+#: ../picard/const.py:252
+msgid "Liberia"
+msgstr "Liberia"
+
+#: ../picard/const.py:253
+msgid "Lesotho"
+msgstr "Lesotho"
+
+#: ../picard/const.py:254
+msgid "Thailand"
+msgstr "Thailand"
+
+#: ../picard/const.py:255
+msgid "French Southern Territories"
+msgstr "French Southern Territories"
+
+#: ../picard/const.py:256
+msgid "Togo"
+msgstr "Togo"
+
+#: ../picard/const.py:257
+msgid "Chad"
+msgstr "Chad"
+
+#: ../picard/const.py:258
+msgid "Turks and Caicos Islands"
+msgstr "Turks and Caicos Islands"
+
+#: ../picard/const.py:259
+msgid "Libyan Arab Jamahiriya"
+msgstr "Libyan Arab Jamahiriya"
+
+#: ../picard/const.py:260
+msgid "Vatican City State (Holy See)"
+msgstr "Vatican City State (Holy See)"
+
+#: ../picard/const.py:261
+msgid "Saint Vincent and The Grenadines"
+msgstr "Saint Vincent and The Grenadines"
+
+#: ../picard/const.py:262
+msgid "United Arab Emirates"
+msgstr "United Arab Emirates"
+
+#: ../picard/const.py:263
+msgid "Andorra"
+msgstr "Andorra"
+
+#: ../picard/const.py:264
+msgid "Antigua and Barbuda"
+msgstr "Antigua and Barbuda"
+
+#: ../picard/const.py:265
+msgid "Afghanistan"
+msgstr "Afghanistan"
+
+#: ../picard/const.py:266
+msgid "Anguilla"
+msgstr "Anguilla"
+
+#: ../picard/const.py:267
+msgid "Virgin Islands (U.S.)"
+msgstr "Virgin Islands (U.S.)"
+
+#: ../picard/const.py:268
+msgid "Iceland"
+msgstr "Iceland"
+
+#: ../picard/const.py:269
+msgid "Iran (Islamic Republic of)"
+msgstr "Iran (Islamic Republic of)"
+
+#: ../picard/const.py:270
+msgid "Armenia"
+msgstr "Armenia"
+
+#: ../picard/const.py:271
+msgid "Albania"
+msgstr "Albania"
+
+#: ../picard/const.py:272
+msgid "Angola"
+msgstr "Angola"
+
+#: ../picard/const.py:273
+msgid "Netherlands Antilles"
+msgstr "Netherlands Antilles"
+
+#: ../picard/const.py:274
+msgid "Antarctica"
+msgstr "Antarctica"
+
+#: ../picard/const.py:275
+msgid "American Samoa"
+msgstr "American Samoa"
+
+#: ../picard/const.py:276
+msgid "Argentina"
+msgstr "Argentina"
+
+#: ../picard/const.py:277
+msgid "Australia"
+msgstr "Australia"
+
+#: ../picard/const.py:278
+msgid "Austria"
+msgstr "Austria"
+
+#: ../picard/const.py:279
+msgid "Aruba"
+msgstr "Aruba"
+
+#: ../picard/const.py:280
+msgid "India"
+msgstr "India"
+
+#: ../picard/const.py:281
+msgid "Tanzania, United Republic of"
+msgstr "Tanzania, United Republic of"
+
+#: ../picard/const.py:282
+msgid "Azerbaijan"
+msgstr "Azerbaijan"
+
+#: ../picard/const.py:283
+msgid "Ireland"
+msgstr "Ireland"
+
+#: ../picard/const.py:284
+msgid "Indonesia"
+msgstr "Indonesia"
+
+#: ../picard/const.py:285
+msgid "Ukraine"
+msgstr "Ukraine"
+
+#: ../picard/const.py:286
+msgid "Qatar"
+msgstr "Qatar"
+
+#: ../picard/const.py:287
+msgid "Mozambique"
+msgstr "Mozambique"
+
+#: ../picard/const.py:288
+msgid "Bosnia and Herzegovina"
+msgstr "Bosnia and Herzegovina"
+
+#: ../picard/const.py:289
+msgid "Congo, The Democratic Republic of the"
+msgstr "Congo, The Democratic Republic of the"
+
+#: ../picard/const.py:290
+msgid "Serbia and Montenegro"
+msgstr "Serbia and Montenegro"
+
+#: ../picard/const.py:291
+msgid "Croatia"
+msgstr "Croatia"
+
+#: ../picard/const.py:292
+msgid "Korea (North), Democratic People's Republic of"
+msgstr "Korea (North), Democratic People's Republic of"
+
+#: ../picard/const.py:293
+msgid "Korea (South), Republic of"
+msgstr "Korea (South), Republic of"
+
+#: ../picard/const.py:294
+msgid "Slovakia"
+msgstr "Slovakia"
+
+#: ../picard/const.py:295
+msgid "Soviet Union (historical, 1922-1991)"
+msgstr "Soviet Union (historical, 1922-1991)"
+
+#: ../picard/const.py:296
+msgid "East Timor"
+msgstr "East Timor"
+
+#: ../picard/const.py:297
+msgid "Czechoslovakia (historical, 1918-1992)"
+msgstr "Czechoslovakia (historical, 1918-1992)"
+
+#: ../picard/const.py:298
+msgid "Europe"
+msgstr "Europe"
+
+#: ../picard/const.py:299
+msgid "East Germany (historical, 1949-1990)"
+msgstr "East Germany (historical, 1949-1990)"
+
+#: ../picard/const.py:300
+msgid "[Unknown Country]"
+msgstr "[Unknown Country]"
+
+#: ../picard/const.py:301
+msgid "[Worldwide]"
+msgstr "[Worldwide]"
+
+#: ../picard/const.py:302
+msgid "Yugoslavia (historical, 1918-1992)"
+msgstr "Yugoslavia (historical, 1918-1992)"
+
+#: ../picard/const.py:307
+msgid "Catalan"
+msgstr "Catalan"
+
+#: ../picard/const.py:308
+msgid "Czech"
+msgstr "Czech"
+
+#: ../picard/const.py:309
+msgid "Welsh"
+msgstr "Welsh"
+
+#: ../picard/const.py:310
+msgid "Danish"
+msgstr "Danish"
+
+#: ../picard/const.py:311
+msgid "German"
+msgstr "German"
+
+#: ../picard/const.py:312
+msgid "English"
+msgstr "English"
+
+#: ../picard/const.py:313
+msgid "English (Canada)"
+msgstr "English (Canada)"
+
+#: ../picard/const.py:314
+msgid "English (UK)"
+msgstr "English (UK)"
+
+#: ../picard/const.py:315
+msgid "Spanish"
+msgstr "Spanish"
+
+#: ../picard/const.py:316
+msgid "Persian"
+msgstr "Persian"
+
+#: ../picard/const.py:317
+msgid "Finnish"
+msgstr "Finnish"
+
+#: ../picard/const.py:318
+msgid "French"
+msgstr "French"
+
+#: ../picard/const.py:319
+msgid "Frisian"
+msgstr "Frisian"
+
+#: ../picard/const.py:320
+msgid "Hebrew"
+msgstr "Hebrew"
+
+#: ../picard/const.py:321
+msgid "Hungarian"
+msgstr "Hungarian"
+
+#: ../picard/const.py:322
+msgid "Islandic"
+msgstr "Islandic"
+
+#: ../picard/const.py:323
+msgid "Italian"
+msgstr "Italian"
+
+#: ../picard/const.py:324
+msgid "Kannada"
+msgstr "Kannada"
+
+#: ../picard/const.py:325
+msgid "Korean"
+msgstr "Korean"
+
+#: ../picard/const.py:326
+msgid "Lithuanian"
+msgstr "Lithuanian"
+
+#: ../picard/const.py:327
+msgid "Norwegian Bokmal"
+msgstr "Norwegian Bokmal"
+
+#: ../picard/const.py:328
+msgid "Dutch"
+msgstr "Dutch"
+
+#: ../picard/const.py:329
+msgid "Polish"
+msgstr "Polish"
+
+#: ../picard/const.py:330
+msgid "Portuguese"
+msgstr "Portuguese"
+
+#: ../picard/const.py:331
+msgid "Brazilian Portuguese"
+msgstr "Brazilian Portuguese"
+
+#: ../picard/const.py:332
+msgid "Romanian"
+msgstr "Romanian"
+
+#: ../picard/const.py:333
+msgid "Russian"
+msgstr "Russian"
+
+#: ../picard/const.py:334
+msgid "Scots"
+msgstr "Scots"
+
+#: ../picard/const.py:335
+msgid "Slovak"
+msgstr "Slovak"
+
+#: ../picard/const.py:336
+msgid "Slovenian"
+msgstr "Slovenian"
+
+#: ../picard/const.py:337
+msgid "Swedish"
+msgstr "Swedish"
+
+#: ../picard/const.py:338
+msgid "Chinese"
+msgstr "Chinese"
+
+#: ../picard/file.py:475
+#, python-format
+msgid "No matching tracks for file %s"
+msgstr "No matching tracks for file %s"
+
+#: ../picard/file.py:492
+#, python-format
+msgid "No matching tracks above the threshold for file %s"
+msgstr "No matching tracks above the threshold for file %s"
+
+#: ../picard/file.py:495
+#, python-format
+msgid "File %s identified!"
+msgstr "File %s identified!"
+
+#: ../picard/file.py:506
+#, python-format
+msgid "Looking up the PUID for file %s..."
+msgstr "Looking up the PUID for file %s..."
+
+#: ../picard/file.py:511
+#, python-format
+msgid "Looking up the metadata for file %s..."
+msgstr "Looking up the metadata for file %s..."
+
+#: ../picard/puidmanager.py:58
+msgid "Submitting PUIDs..."
+msgstr "Submitting PUIDs..."
+
+#: ../picard/puidmanager.py:64
+#, python-format
+msgid "PUIDs submission failed: %s"
+msgstr "PUIDs submission failed: %s"
+
+#: ../picard/puidmanager.py:66
+msgid "PUIDs successfully submitted!"
+msgstr "PUIDs successfully submitted!"
+
+#: ../picard/playlist.py:31
+msgid "M3U Playlist (*.m3u)"
+msgstr "M3U Playlist (*.m3u)"
+
+#: ../picard/playlist.py:32
+msgid "PLS Playlist (*.pls)"
+msgstr "PLS Playlist (*.pls)"
+
+#: ../picard/playlist.py:33
+msgid "XSPF Playlist (*.xspf)"
+msgstr "XSPF Playlist (*.xspf)"
+
+#: ../picard/tagger.py:476
 msgid "CD Lookup Error"
-msgstr ""
+msgstr "CD Lookup Error"
 
-#: ../picard/tagger.py:473
+#: ../picard/tagger.py:477
 #, python-format
 msgid ""
 "Error while reading CD:\n"
 "\n"
 "%s"
 msgstr ""
+"Error while reading CD:\n"
+"\n"
+"%s"
 
-#: ../picard/ui/passworddialog.py:38
+#: ../picard/tagger.py:503
 #, python-format
-msgid ""
-"The server %s requires you to login. Please enter your username and password."
-msgstr ""
+msgid "Couldn't find PUID for file %s"
+msgstr "Couldn't find PUID for file %s"
 
-#: ../picard/ui/ui_options_script.py:52
-msgid "Tagger Script"
-msgstr ""
+#: ../picard/musicdns/__init__.py:98
+#, python-format
+msgid "Looking up the fingerprint for file %s..."
+msgstr "Looking up the fingerprint for file %s..."
+
+#: ../picard/musicdns/__init__.py:117
+#, python-format
+msgid "Creating fingerprint for file %s..."
+msgstr "Creating fingerprint for file %s..."
 
 #: ../picard/ui/cdlookup.py:31
 msgid "Score"
-msgstr ""
+msgstr "Score"
 
 #: ../picard/ui/cdlookup.py:31
+#: ../picard/ui/itemviews.py:82
+#: ../picard/util/tags.py:23
 msgid "Title"
-msgstr ""
+msgstr "Title"
 
-#: ../picard/ui/cdlookup.py:31 ../picard/ui/mainwindow.py:436
+#: ../picard/ui/cdlookup.py:31
+#: ../picard/ui/itemviews.py:84
+#: ../picard/ui/mainwindow.py:436
+#: ../picard/util/tags.py:22
 msgid "Artist"
-msgstr ""
+msgstr "Artist"
 
-#: ../picard/ui/ui_metadata.py:121
-msgid "Lookup"
-msgstr ""
+#: ../picard/ui/coverartbox.py:47
+#: ../picard/ui/options/cover.py:29
+msgid "Cover Art"
+msgstr "Cover Art"
 
-#: ../picard/ui/ui_metadata.py:122
-msgid "Title:"
-msgstr ""
+#: ../picard/ui/coverartbox.py:95
+msgid "Buy the album on Amazon"
+msgstr "Buy the album on Amazon"
 
-#: ../picard/ui/ui_metadata.py:123
-msgid "Date:"
-msgstr ""
+#: ../picard/ui/filebrowser.py:38
+#: ../picard/ui/mainwindow.py:302
+msgid "&Refresh"
+msgstr "&Refresh"
 
-#: ../picard/ui/ui_metadata.py:124
-msgid "Artist:"
-msgstr ""
+#: ../picard/ui/filebrowser.py:41
+msgid "&Move Tagged Files Here"
+msgstr "&Move Tagged Files Here"
 
-#: ../picard/ui/ui_metadata.py:125
-msgid "Track:"
-msgstr ""
+#: ../picard/ui/filebrowser.py:44
+msgid "Show &Hidden Files"
+msgstr "Show &Hidden Files"
 
-#: ../picard/ui/ui_metadata.py:126
-msgid "0000-00-00; "
-msgstr ""
+#: ../picard/ui/itemviews.py:83
+msgid "Length"
+msgstr "Length"
 
-#: ../picard/ui/ui_metadata.py:127 ../picard/ui/tageditor.py:225
-#: ../picard/ui/multitageditor.py:181
+#: ../picard/ui/itemviews.py:327
+msgid "&Releases"
+msgstr "&Releases"
+
+#: ../picard/ui/itemviews.py:353
+msgid "&Plugins"
+msgstr "&Plugins"
+
+#: ../picard/ui/itemviews.py:523
+msgid "Clusters"
+msgstr "Clusters"
+
+#: ../picard/ui/logview.py:29
+msgid "Log"
+msgstr "Log"
+
+#: ../picard/ui/puidsubmit.py:31
+#: ../picard/ui/options/plugins.py:80
+msgid "File"
+msgstr "File"
+
+#: ../picard/ui/puidsubmit.py:31
+msgid "PUID"
+msgstr "PUID"
+
+#: ../picard/ui/puidsubmit.py:31
+#: ../picard/ui/mainwindow.py:437
+msgid "Track"
+msgstr "Track"
+
+#: ../picard/ui/puidsubmit.py:31
+msgid "Release"
+msgstr "Release"
+
+#: ../picard/ui/puidsubmit.py:31
+msgid "Release ID"
+msgstr "Release ID"
+
+#: ../picard/ui/tageditor.py:65
+#: ../picard/ui/ui_options_plugins.py:62
+msgid "Details"
+msgstr "Details"
+
+#: ../picard/ui/tageditor.py:70
+#: ../picard/ui/tageditor.py:241
+#, python-format
+msgid "%d file"
+msgid_plural "%d files"
+msgstr[0] "%d file"
+msgstr[1] "%d files"
+
+#: ../picard/ui/tageditor.py:124
+#, python-format
+msgid "(different across %d file)"
+msgid_plural "(different across %d files)"
+msgstr[0] "(different across %d file)"
+msgstr[1] "(different across %d files)"
+
+#: ../picard/ui/tageditor.py:127
+#, python-format
+msgid "(missing from %d file)"
+msgid_plural "(missing from %d files)"
+msgstr[0] "(missing from %d file)"
+msgstr[1] "(missing from %d files)"
+
+#: ../picard/ui/tageditor.py:210
+msgid "Filename:"
+msgstr "Filename:"
+
+#: ../picard/ui/tageditor.py:212
+msgid "Format:"
+msgstr "Format:"
+
+#: ../picard/ui/tageditor.py:221
+msgid "Size:"
+msgstr "Size:"
+
+#: ../picard/ui/tageditor.py:225
+#: ../picard/ui/ui_metadata.py:127
 msgid "Length:"
-msgstr ""
+msgstr "Length:"
 
-#: ../picard/ui/ui_metadata.py:128
-msgid "Album:"
-msgstr ""
+#: ../picard/ui/tageditor.py:227
+msgid "Bitrate:"
+msgstr "Bitrate:"
+
+#: ../picard/ui/tageditor.py:229
+msgid "Sample rate:"
+msgstr "Sample rate:"
+
+#: ../picard/ui/tageditor.py:231
+msgid "Bits per sample:"
+msgstr "Bits per sample:"
+
+#: ../picard/ui/tageditor.py:234
+msgid "Mono"
+msgstr "Mono"
+
+#: ../picard/ui/tageditor.py:235
+msgid "Stereo"
+msgstr "Stereo"
+
+#: ../picard/ui/tageditor.py:237
+msgid "Channels:"
+msgstr "Channels:"
+
+#: ../picard/ui/tagsfromfilenames.py:52
+#: ../picard/ui/tagsfromfilenames.py:96
+msgid "File Name"
+msgstr "File Name"
+
+#: ../picard/ui/mainwindow.py:64
+msgid "MusicBrainz Picard"
+msgstr "MusicBrainz Picard"
+
+#: ../picard/ui/mainwindow.py:85
+msgid "Original Metadata"
+msgstr "Original Metadata"
+
+#: ../picard/ui/mainwindow.py:87
+msgid "New Metadata"
+msgstr "New Metadata"
+
+#: ../picard/ui/mainwindow.py:183
+msgid "&Options..."
+msgstr "&Options..."
+
+#: ../picard/ui/mainwindow.py:186
+msgid "&Cut"
+msgstr "&Cut"
+
+#: ../picard/ui/mainwindow.py:187
+msgid "Ctrl+X"
+msgstr "Ctrl+X"
+
+#: ../picard/ui/mainwindow.py:191
+msgid "&Paste"
+msgstr "&Paste"
+
+#: ../picard/ui/mainwindow.py:192
+msgid "Ctrl+V"
+msgstr "Ctrl+V"
+
+#: ../picard/ui/mainwindow.py:196
+msgid "&Help..."
+msgstr "&Help..."
+
+#: ../picard/ui/mainwindow.py:207
+msgid "&About..."
+msgstr "&About..."
+
+#: ../picard/ui/mainwindow.py:210
+msgid "&Donate..."
+msgstr "&Donate..."
+
+#: ../picard/ui/mainwindow.py:213
+msgid "&Report a Bug..."
+msgstr "&Report a Bug..."
+
+#: ../picard/ui/mainwindow.py:216
+msgid "&Support Forum..."
+msgstr "&Support Forum..."
+
+#: ../picard/ui/mainwindow.py:219
+msgid "&Add Files..."
+msgstr "&Add Files..."
+
+#: ../picard/ui/mainwindow.py:220
+msgid "Add files to the tagger"
+msgstr "Add files to the tagger"
+
+#. Keyboard shortcut for "Add Files..."
+#: ../picard/ui/mainwindow.py:222
+msgid "Ctrl+O"
+msgstr "Ctrl+O"
+
+#: ../picard/ui/mainwindow.py:225
+msgid "A&dd Folder..."
+msgstr "A&dd Folder..."
+
+#: ../picard/ui/mainwindow.py:226
+msgid "Add a folder to the tagger"
+msgstr "Add a folder to the tagger"
+
+#. Keyboard shortcut for "Add Directory..."
+#: ../picard/ui/mainwindow.py:228
+msgid "Ctrl+D"
+msgstr "Ctrl+D"
+
+#: ../picard/ui/mainwindow.py:232
+msgid "&Save"
+msgstr "&Save"
+
+#: ../picard/ui/mainwindow.py:233
+msgid "Save selected files"
+msgstr "Save selected files"
+
+#. Keyboard shortcut for "Save"
+#: ../picard/ui/mainwindow.py:235
+msgid "Ctrl+S"
+msgstr "Ctrl+S"
+
+#: ../picard/ui/mainwindow.py:239
+msgid "S&ubmit PUIDs"
+msgstr "S&ubmit PUIDs"
+
+#: ../picard/ui/mainwindow.py:240
+msgid "Submit PUIDs to MusicBrainz"
+msgstr "Submit PUIDs to MusicBrainz"
+
+#: ../picard/ui/mainwindow.py:244
+msgid "E&xit"
+msgstr "E&xit"
+
+#. Keyboard shortcut for "Exit"
+#: ../picard/ui/mainwindow.py:246
+msgid "Ctrl+Q"
+msgstr "Ctrl+Q"
+
+#: ../picard/ui/mainwindow.py:250
+msgid "&Remove"
+msgstr "&Remove"
+
+#: ../picard/ui/mainwindow.py:251
+msgid "Remove selected files/albums"
+msgstr "Remove selected files/albums"
+
+#: ../picard/ui/mainwindow.py:256
+msgid "File &Browser"
+msgstr "File &Browser"
+
+#: ../picard/ui/mainwindow.py:262
+msgid "&Cover Art"
+msgstr "&Cover Art"
+
+#: ../picard/ui/mainwindow.py:268
+msgid "Search"
+msgstr "Search"
+
+#: ../picard/ui/mainwindow.py:271
+msgid "&CD Lookup..."
+msgstr "&CD Lookup..."
+
+#: ../picard/ui/mainwindow.py:272
+#: ../picard/ui/mainwindow.py:273
+msgid "Lookup CD"
+msgstr "Lookup CD"
+
+#. Keyboard shortcut for "Lookup CD"
+#: ../picard/ui/mainwindow.py:275
+msgid "Ctrl+K"
+msgstr "Ctrl+K"
+
+#: ../picard/ui/mainwindow.py:278
+msgid "&Scan"
+msgstr "&Scan"
+
+#. Keyboard shortcut for "Analyze"
+#: ../picard/ui/mainwindow.py:281
+msgid "Ctrl+Y"
+msgstr "Ctrl+Y"
+
+#: ../picard/ui/mainwindow.py:284
+msgid "Cl&uster"
+msgstr "Cl&uster"
+
+#. Keyboard shortcut for "Cluster"
+#: ../picard/ui/mainwindow.py:287
+msgid "Ctrl+U"
+msgstr "Ctrl+U"
+
+#: ../picard/ui/mainwindow.py:290
+msgid "&Lookup"
+msgstr "&Lookup"
+
+#: ../picard/ui/mainwindow.py:291
+#: ../picard/ui/mainwindow.py:292
+msgid "Lookup metadata"
+msgstr "Lookup metadata"
+
+#. Keyboard shortcut for "Lookup"
+#: ../picard/ui/mainwindow.py:295
+msgid "Ctrl+L"
+msgstr "Ctrl+L"
+
+#: ../picard/ui/mainwindow.py:298
+msgid "&Details..."
+msgstr "&Details..."
+
+#: ../picard/ui/mainwindow.py:305
+msgid "Generate &Playlist..."
+msgstr "Generate &Playlist..."
+
+#: ../picard/ui/mainwindow.py:308
+msgid "&Rename Files"
+msgstr "&Rename Files"
+
+#: ../picard/ui/mainwindow.py:313
+msgid "&Move Files"
+msgstr "&Move Files"
+
+#: ../picard/ui/mainwindow.py:318
+msgid "Save &Tags"
+msgstr "Save &Tags"
+
+#: ../picard/ui/mainwindow.py:323
+msgid "Tags From &File Names..."
+msgstr "Tags From &File Names..."
+
+#: ../picard/ui/mainwindow.py:326
+msgid "View &Log..."
+msgstr "View &Log..."
+
+#: ../picard/ui/mainwindow.py:349
+msgid "&File"
+msgstr "&File"
+
+#: ../picard/ui/mainwindow.py:357
+msgid "&Edit"
+msgstr "&Edit"
+
+#: ../picard/ui/mainwindow.py:363
+msgid "&View"
+msgstr "&View"
+
+#: ../picard/ui/mainwindow.py:369
+msgid "&Options"
+msgstr "&Options"
+
+#: ../picard/ui/mainwindow.py:375
+msgid "&Tools"
+msgstr "&Tools"
+
+#: ../picard/ui/mainwindow.py:384
+#: ../picard/ui/util.py:33
+msgid "&Help"
+msgstr "&Help"
+
+#: ../picard/ui/mainwindow.py:404
+msgid "&Toolbar"
+msgstr "&Toolbar"
+
+#: ../picard/ui/mainwindow.py:430
+msgid "&Search Bar"
+msgstr "&Search Bar"
+
+#: ../picard/ui/mainwindow.py:435
+#: ../picard/util/tags.py:21
+msgid "Album"
+msgstr "Album"
+
+#: ../picard/ui/mainwindow.py:476
+msgid "All Supported Formats"
+msgstr "All Supported Formats"
+
+#: ../picard/ui/mainwindow.py:525
+#, python-format
+msgid "Saving playlist %s..."
+msgstr "Saving playlist %s..."
+
+#: ../picard/ui/mainwindow.py:528
+#, python-format
+msgid "Playlist %s saved"
+msgstr "Playlist %s saved"
+
+#: ../picard/ui/mainwindow.py:638
+#: ../picard/ui/mainwindow.py:647
+#, python-format
+msgid " (Error: %s)"
+msgstr " (Error: %s)"
+
+#: ../picard/ui/ui_tageditor.py:115
+#: ../picard/ui/ui_options_plugins.py:59
+#: ../picard/ui/options/plugins.py:76
+msgid "Name"
+msgstr "Name"
+
+#: ../picard/ui/ui_tageditor.py:116
+msgid "Value"
+msgstr "Value"
+
+#: ../picard/ui/ui_tageditor.py:117
+msgid "&Add..."
+msgstr "&Add..."
+
+#: ../picard/ui/ui_tageditor.py:118
+msgid "&Edit..."
+msgstr "&Edit..."
+
+#: ../picard/ui/ui_tageditor.py:119
+msgid "&Delete"
+msgstr "&Delete"
+
+#: ../picard/ui/ui_tageditor.py:120
+msgid "&Metadata"
+msgstr "&Metadata"
+
+#: ../picard/ui/ui_tageditor.py:121
+msgid "A&rtwork"
+msgstr "A&rtwork"
+
+#: ../picard/ui/ui_tageditor.py:122
+msgid "&Info"
+msgstr "&Info"
+
+#: ../picard/ui/passworddialog.py:38
+#, python-format
+msgid "The server %s requires you to login. Please enter your username and password."
+msgstr "The server %s requires you to login. Please enter your username and password."
+
+#: ../picard/ui/ui_cdlookup.py:60
+#: ../picard/ui/ui_options_cdlookup.py:47
+#: ../picard/ui/ui_options_cdlookup_win32.py:56
+#: ../picard/ui/options/cdlookup.py:35
+msgid "CD Lookup"
+msgstr "CD Lookup"
+
+#: ../picard/ui/ui_cdlookup.py:61
+msgid "The following releases on MusicBrainz match the CD:"
+msgstr "The following releases on MusicBrainz match the CD:"
+
+#: ../picard/ui/ui_cdlookup.py:62
+#: ../picard/ui/ui_puidsubmit.py:53
+msgid "OK"
+msgstr "OK"
+
+#: ../picard/ui/ui_cdlookup.py:63
+msgid "    Lookup manually    "
+msgstr "    Lookup manually    "
+
+#: ../picard/ui/ui_cdlookup.py:64
+#: ../picard/ui/ui_puidsubmit.py:54
+msgid "Cancel"
+msgstr "Cancel"
 
 #: ../picard/ui/ui_passworddialog.py:78
 msgid "Authentication required"
-msgstr ""
+msgstr "Authentication required"
 
-#: ../picard/ui/ui_passworddialog.py:79 ../picard/ui/ui_options_proxy.py:83
+#: ../picard/ui/ui_passworddialog.py:79
 #: ../picard/ui/ui_options_general.py:113
+#: ../picard/ui/ui_options_proxy.py:83
 msgid "Username:"
-msgstr ""
+msgstr "Username:"
 
-#: ../picard/ui/ui_passworddialog.py:80 ../picard/ui/ui_options_proxy.py:82
+#: ../picard/ui/ui_passworddialog.py:80
 #: ../picard/ui/ui_options_general.py:112
+#: ../picard/ui/ui_options_proxy.py:82
 msgid "Password:"
-msgstr ""
+msgstr "Password:"
 
 #: ../picard/ui/ui_passworddialog.py:81
 msgid "Save username and password"
-msgstr ""
+msgstr "Save username and password"
+
+#: ../picard/ui/ui_edittagdialog.py:44
+msgid "Edit Tag"
+msgstr "Edit Tag"
+
+#: ../picard/ui/ui_metadata.py:121
+msgid "Lookup"
+msgstr "Lookup"
+
+#: ../picard/ui/ui_metadata.py:122
+msgid "Title:"
+msgstr "Title:"
+
+#: ../picard/ui/ui_metadata.py:123
+msgid "Date:"
+msgstr "Date:"
+
+#: ../picard/ui/ui_metadata.py:124
+msgid "Artist:"
+msgstr "Artist:"
+
+#: ../picard/ui/ui_metadata.py:125
+msgid "Track:"
+msgstr "Track:"
+
+#: ../picard/ui/ui_metadata.py:126
+msgid "0000-00-00; "
+msgstr "0000-00-00; "
+
+#: ../picard/ui/ui_metadata.py:128
+msgid "Album:"
+msgstr "Album:"
+
+#: ../picard/ui/ui_options.py:42
+msgid "Options"
+msgstr "Options"
+
+#: ../picard/ui/ui_options_cdlookup.py:48
+msgid "CD-ROM device to use for lookups:"
+msgstr "CD-ROM device to use for lookups:"
+
+#: ../picard/ui/ui_options_cdlookup_win32.py:57
+msgid "Default CD-ROM drive to use for lookups:"
+msgstr "Default CD-ROM drive to use for lookups:"
+
+#: ../picard/ui/ui_options_cover.py:56
+msgid "Location"
+msgstr "Location"
+
+#: ../picard/ui/ui_options_cover.py:57
+msgid "Embed cover images into tags"
+msgstr "Embed cover images into tags"
+
+#: ../picard/ui/ui_options_cover.py:58
+msgid "Save cover images as separate files"
+msgstr "Save cover images as separate files"
+
+#: ../picard/ui/ui_options_cover.py:59
+msgid "Overwrite the file if it already exists"
+msgstr "Overwrite the file if it already exists"
+
+#: ../picard/ui/util.py:31
+msgid "&Ok"
+msgstr "&Ok"
+
+#: ../picard/ui/util.py:32
+msgid "&Cancel"
+msgstr "&Cancel"
+
+#: ../picard/ui/ui_puidsubmit.py:52
+msgid "Submit PUIDs"
+msgstr "Submit PUIDs"
 
 #: ../picard/ui/ui_options_folksonomy.py:114
-#: ../picard/ui/ui_options_folksonomy_tags.py:114
+#: ../picard/ui/options/folksonomy.py:29
 msgid "Folksonomy Tags"
-msgstr ""
+msgstr "Folksonomy Tags"
 
 #: ../picard/ui/ui_options_folksonomy.py:115
-#: ../picard/ui/ui_options_folksonomy_tags.py:115
 msgid "Ignore tags:"
-msgstr ""
+msgstr "Ignore tags:"
 
 #: ../picard/ui/ui_options_folksonomy.py:116
-#: ../picard/ui/ui_options_folksonomy_tags.py:116
 msgid "Minimal tag usage:"
-msgstr ""
+msgstr "Minimal tag usage:"
 
 #: ../picard/ui/ui_options_folksonomy.py:117
-#: ../picard/ui/ui_options_folksonomy_tags.py:117
 #: ../picard/ui/ui_options_matching.py:107
 #: ../picard/ui/ui_options_matching.py:108
 #: ../picard/ui/ui_options_matching.py:109
 #: ../picard/ui/ui_options_matching.py:113
 msgid " %"
-msgstr ""
+msgstr " %"
 
 #: ../picard/ui/ui_options_folksonomy.py:118
 msgid "Maximum number of tags:"
-msgstr ""
+msgstr "Maximum number of tags:"
 
 #: ../picard/ui/ui_options_folksonomy.py:119
-#: ../picard/ui/ui_options_folksonomy_tags.py:119
 msgid "Join multiple tags with:"
-msgstr ""
+msgstr "Join multiple tags with:"
 
 #: ../picard/ui/ui_options_folksonomy.py:120
-#: ../picard/ui/ui_options_folksonomy_tags.py:120
 msgid " / "
-msgstr ""
+msgstr " / "
 
 #: ../picard/ui/ui_options_folksonomy.py:121
-#: ../picard/ui/ui_options_folksonomy_tags.py:121
 msgid ", "
-msgstr ""
+msgstr ", "
 
-#: ../picard/ui/ui_options_folksonomy_tags.py:118
-msgid "Maximal number of tags:"
-msgstr ""
-
-#: ../picard/ui/mainwindow.py:64
-msgid "MusicBrainz Picard"
-msgstr ""
-
-#: ../picard/ui/mainwindow.py:85
-msgid "Original Metadata"
-msgstr ""
-
-#: ../picard/ui/mainwindow.py:87
-msgid "New Metadata"
-msgstr ""
-
-#: ../picard/ui/mainwindow.py:183
-msgid "&Options..."
-msgstr ""
-
-#: ../picard/ui/mainwindow.py:186
-msgid "&Cut"
-msgstr ""
-
-#: ../picard/ui/mainwindow.py:187
-msgid "Ctrl+X"
-msgstr ""
-
-#: ../picard/ui/mainwindow.py:191
-msgid "&Paste"
-msgstr ""
-
-#: ../picard/ui/mainwindow.py:192
-msgid "Ctrl+V"
-msgstr ""
-
-#: ../picard/ui/mainwindow.py:196
-msgid "&Help..."
-msgstr ""
-
-#: ../picard/ui/mainwindow.py:207
-msgid "&About..."
-msgstr ""
-
-#: ../picard/ui/mainwindow.py:210
-msgid "&Donate..."
-msgstr ""
-
-#: ../picard/ui/mainwindow.py:213
-msgid "&Report a Bug..."
-msgstr ""
-
-#: ../picard/ui/mainwindow.py:216
-msgid "&Support Forum..."
-msgstr ""
-
-#: ../picard/ui/mainwindow.py:219
-msgid "&Add Files..."
-msgstr ""
-
-#: ../picard/ui/mainwindow.py:220
-msgid "Add files to the tagger"
-msgstr ""
-
-#. Keyboard shortcut for "Add Files..."
-#: ../picard/ui/mainwindow.py:222
-msgid "Ctrl+O"
-msgstr ""
-
-#: ../picard/ui/mainwindow.py:225
-msgid "A&dd Folder..."
-msgstr ""
-
-#: ../picard/ui/mainwindow.py:226
-msgid "Add a folder to the tagger"
-msgstr ""
-
-#. Keyboard shortcut for "Add Directory..."
-#: ../picard/ui/mainwindow.py:228
-msgid "Ctrl+D"
-msgstr ""
-
-#: ../picard/ui/mainwindow.py:232
-msgid "&Save"
-msgstr ""
-
-#: ../picard/ui/mainwindow.py:233
-msgid "Save selected files"
-msgstr ""
-
-#. Keyboard shortcut for "Save"
-#: ../picard/ui/mainwindow.py:235
-msgid "Ctrl+S"
-msgstr ""
-
-#: ../picard/ui/mainwindow.py:239
-msgid "S&ubmit PUIDs"
-msgstr ""
-
-#: ../picard/ui/mainwindow.py:240
-msgid "Submit PUIDs to MusicBrainz"
-msgstr ""
-
-#: ../picard/ui/mainwindow.py:244
-msgid "E&xit"
-msgstr ""
-
-#. Keyboard shortcut for "Exit"
-#: ../picard/ui/mainwindow.py:246
-msgid "Ctrl+Q"
-msgstr ""
-
-#: ../picard/ui/mainwindow.py:250
-msgid "&Remove"
-msgstr ""
-
-#: ../picard/ui/mainwindow.py:251
-msgid "Remove selected files/albums"
-msgstr ""
-
-#: ../picard/ui/mainwindow.py:256
-msgid "File &Browser"
-msgstr ""
-
-#: ../picard/ui/mainwindow.py:262
-msgid "&Cover Art"
-msgstr ""
-
-#: ../picard/ui/mainwindow.py:268
-msgid "Search"
-msgstr ""
-
-#: ../picard/ui/mainwindow.py:271
-msgid "&CD Lookup..."
-msgstr ""
-
-#: ../picard/ui/mainwindow.py:272 ../picard/ui/mainwindow.py:273
-msgid "Lookup CD"
-msgstr ""
-
-#. Keyboard shortcut for "Lookup CD"
-#: ../picard/ui/mainwindow.py:275
-msgid "Ctrl+K"
-msgstr ""
-
-#: ../picard/ui/mainwindow.py:278
-msgid "&Scan"
-msgstr ""
-
-#. Keyboard shortcut for "Analyze"
-#: ../picard/ui/mainwindow.py:281
-msgid "Ctrl+Y"
-msgstr ""
-
-#: ../picard/ui/mainwindow.py:284
-msgid "Cl&uster"
-msgstr ""
-
-#. Keyboard shortcut for "Cluster"
-#: ../picard/ui/mainwindow.py:287
-msgid "Ctrl+U"
-msgstr ""
-
-#: ../picard/ui/mainwindow.py:290
-msgid "&Lookup"
-msgstr ""
-
-#: ../picard/ui/mainwindow.py:291 ../picard/ui/mainwindow.py:292
-msgid "Lookup metadata"
-msgstr ""
-
-#. Keyboard shortcut for "Lookup"
-#: ../picard/ui/mainwindow.py:295
-msgid "Ctrl+L"
-msgstr ""
-
-#: ../picard/ui/mainwindow.py:298
-msgid "&Details..."
-msgstr ""
-
-#: ../picard/ui/mainwindow.py:302 ../picard/ui/filebrowser.py:38
-msgid "&Refresh"
-msgstr ""
-
-#: ../picard/ui/mainwindow.py:305
-msgid "Generate &Playlist..."
-msgstr ""
-
-#: ../picard/ui/mainwindow.py:308
-msgid "&Rename Files"
-msgstr ""
-
-#: ../picard/ui/mainwindow.py:313
-msgid "&Move Files"
-msgstr ""
-
-#: ../picard/ui/mainwindow.py:318
-msgid "Save &Tags"
-msgstr ""
-
-#: ../picard/ui/mainwindow.py:323
-msgid "Tags From &File Names..."
-msgstr ""
-
-#: ../picard/ui/mainwindow.py:326
-msgid "View &Log..."
-msgstr ""
-
-#: ../picard/ui/mainwindow.py:349
-msgid "&File"
-msgstr ""
-
-#: ../picard/ui/mainwindow.py:357
-msgid "&Edit"
-msgstr ""
-
-#: ../picard/ui/mainwindow.py:363
-msgid "&View"
-msgstr ""
-
-#: ../picard/ui/mainwindow.py:369
-msgid "&Options"
-msgstr ""
-
-#: ../picard/ui/mainwindow.py:375
-msgid "&Tools"
-msgstr ""
-
-#: ../picard/ui/mainwindow.py:384
-msgid "&Help"
-msgstr ""
-
-#: ../picard/ui/mainwindow.py:404
-msgid "&Toolbar"
-msgstr ""
-
-#: ../picard/ui/mainwindow.py:430
-msgid "&Search Bar"
-msgstr ""
-
-#: ../picard/ui/mainwindow.py:435
-msgid "Album"
-msgstr ""
-
-#: ../picard/ui/mainwindow.py:437 ../picard/ui/puidsubmit.py:31
-msgid "Track"
-msgstr ""
-
-#: ../picard/ui/mainwindow.py:476
-msgid "All Supported Formats"
-msgstr ""
-
-#: ../picard/ui/mainwindow.py:525
-#, python-format
-msgid "Saving playlist %s..."
-msgstr ""
-
-#: ../picard/ui/mainwindow.py:528
-#, python-format
-msgid "Playlist %s saved"
-msgstr ""
-
-#: ../picard/ui/mainwindow.py:638 ../picard/ui/mainwindow.py:647
-#, python-format
-msgid " (Error: %s)"
-msgstr ""
-
-#: ../picard/ui/ui_edittagdialog.py:44
-msgid "Edit Tag"
-msgstr ""
-
-#: ../picard/ui/ui_options_proxy.py:81
-msgid "Web Proxy"
-msgstr ""
-
-#: ../picard/ui/ui_options_proxy.py:84 ../picard/ui/ui_options_general.py:109
-msgid "Port:"
-msgstr ""
-
-#: ../picard/ui/ui_options_proxy.py:85 ../picard/ui/ui_options_general.py:110
-msgid "Server address:"
-msgstr ""
-
-#: ../picard/ui/ui_tagsfromfilenames.py:56
-msgid "Convert File Names to Tags"
-msgstr ""
-
-#: ../picard/ui/ui_tagsfromfilenames.py:57
-msgid "Replace underscores with spaces"
-msgstr ""
-
-#: ../picard/ui/ui_tagsfromfilenames.py:58
-#: ../picard/ui/ui_options_naming.py:180
-msgid "&Preview"
-msgstr ""
-
-#: ../picard/ui/ui_options_general.py:108
-msgid "MusicBrainz Server"
-msgstr ""
-
-#: ../picard/ui/ui_options_general.py:111
-msgid "Account Information"
-msgstr ""
-
-#: ../picard/ui/ui_options_general.py:114
-msgid "General"
-msgstr ""
-
-#: ../picard/ui/ui_options_general.py:115
-msgid "Automatically scan all new files"
-msgstr ""
-
-#: ../picard/ui/ui_options_interface.py:46
+#: ../picard/ui/ui_options_interface.py:50
 msgid "Miscellaneous"
-msgstr ""
+msgstr "Miscellaneous"
 
-#: ../picard/ui/ui_options_interface.py:47
+#: ../picard/ui/ui_options_interface.py:51
 msgid "Show text labels under icons"
-msgstr ""
+msgstr "Show text labels under icons"
 
-#: ../picard/ui/ui_options_interface.py:48
+#: ../picard/ui/ui_options_interface.py:52
 msgid "Allow selection of multiple directories"
-msgstr ""
+msgstr "Allow selection of multiple directories"
 
-#: ../picard/ui/ui_options_interface.py:49
+#: ../picard/ui/ui_options_interface.py:53
 msgid "Use advanced query syntax"
-msgstr ""
+msgstr "Use advanced query syntax"
 
-#: ../picard/ui/itemviews.py:327
-msgid "&Releases"
-msgstr ""
-
-#: ../picard/ui/itemviews.py:353
-msgid "&Plugins"
-msgstr ""
-
-#: ../picard/ui/itemviews.py:523
-msgid "Clusters"
-msgstr ""
-
-#: ../picard/ui/ui_options_matching.py:105
-msgid "Thresholds"
-msgstr ""
-
-#: ../picard/ui/ui_options_matching.py:106
-msgid "Minimal similarity for matching files to tracks:"
-msgstr ""
-
-#: ../picard/ui/ui_options_matching.py:110
-msgid "Minimal similarity for file lookups:"
-msgstr ""
-
-#: ../picard/ui/ui_options_matching.py:111
-msgid "Minimal similarity for cluster lookups:"
-msgstr ""
-
-#: ../picard/ui/ui_options_matching.py:112
-msgid "Minimal similarity for PUID lookups:"
-msgstr ""
-
-#: ../picard/ui/ui_options_tags.py:105
-msgid "Common"
-msgstr ""
-
-#: ../picard/ui/ui_options_tags.py:106
-msgid "Clear existing tags before writing new tags"
-msgstr ""
-
-#: ../picard/ui/ui_options_tags.py:107
-msgid "Don't write tags to files"
-msgstr ""
-
-#: ../picard/ui/ui_options_tags.py:108
-msgid "ID3"
-msgstr ""
-
-#: ../picard/ui/ui_options_tags.py:109
-msgid "Write ID3v1 tags to the files"
-msgstr ""
-
-#: ../picard/ui/ui_options_tags.py:110
-msgid "Write ID3v2 version 2.3 tags (2.4 is default)"
-msgstr ""
-
-#: ../picard/ui/ui_options_tags.py:111
-msgid "Text encoding to use while writing ID3v2 tags:"
-msgstr ""
-
-#: ../picard/ui/ui_options_tags.py:112
-msgid "ISO-8859-1"
-msgstr ""
-
-#: ../picard/ui/ui_options_tags.py:113
-msgid "UTF-16"
-msgstr ""
-
-#: ../picard/ui/ui_options_tags.py:114
-msgid "UTF-8"
-msgstr ""
-
-#: ../picard/ui/ui_options_tags.py:115
-msgid "Remove ID3 tags from FLAC files"
-msgstr ""
-
-#: ../picard/ui/ui_options_tags.py:116
-msgid "APE"
-msgstr ""
-
-#: ../picard/ui/ui_options_tags.py:117
-msgid "Remove APEv2 tags from MP3 files"
-msgstr ""
-
-#: ../picard/ui/ui_options_cdlookup_win32.py:56 ../picard/ui/ui_cdlookup.py:60
-#: ../picard/ui/ui_options_cdlookup.py:47
-msgid "CD Lookup"
-msgstr ""
-
-#: ../picard/ui/ui_options_cdlookup_win32.py:57
-msgid "Default CD-ROM drive to use for lookups:"
-msgstr ""
-
-#: ../picard/ui/tageditor.py:65 ../picard/ui/ui_options_plugins.py:62
-#: ../picard/ui/multitageditor.py:37
-msgid "Details"
-msgstr ""
-
-#: ../picard/ui/tageditor.py:70 ../picard/ui/tageditor.py:241
-#: ../picard/ui/multitageditor.py:42 ../picard/ui/multitageditor.py:197
-#, python-format
-msgid "%d file"
-msgid_plural "%d files"
-msgstr[0] ""
-msgstr[1] ""
-
-#: ../picard/ui/tageditor.py:124 ../picard/ui/multitageditor.py:95
-#, python-format
-msgid "(different across %d file)"
-msgid_plural "(different across %d files)"
-msgstr[0] ""
-msgstr[1] ""
-
-#: ../picard/ui/tageditor.py:127 ../picard/ui/multitageditor.py:98
-#, python-format
-msgid "(missing from %d file)"
-msgid_plural "(missing from %d files)"
-msgstr[0] ""
-msgstr[1] ""
-
-#: ../picard/ui/tageditor.py:210 ../picard/ui/multitageditor.py:166
-msgid "Filename:"
-msgstr ""
-
-#: ../picard/ui/tageditor.py:212 ../picard/ui/multitageditor.py:168
-msgid "Format:"
-msgstr ""
-
-#: ../picard/ui/tageditor.py:221 ../picard/ui/multitageditor.py:177
-msgid "Size:"
-msgstr ""
-
-#: ../picard/ui/tageditor.py:227 ../picard/ui/multitageditor.py:183
-msgid "Bitrate:"
-msgstr ""
-
-#: ../picard/ui/tageditor.py:229 ../picard/ui/multitageditor.py:185
-msgid "Sample rate:"
-msgstr ""
-
-#: ../picard/ui/tageditor.py:231 ../picard/ui/multitageditor.py:187
-msgid "Bits per sample:"
-msgstr ""
-
-#: ../picard/ui/tageditor.py:234 ../picard/ui/multitageditor.py:190
-msgid "Mono"
-msgstr ""
-
-#: ../picard/ui/tageditor.py:235 ../picard/ui/multitageditor.py:191
-msgid "Stereo"
-msgstr ""
-
-#: ../picard/ui/tageditor.py:237 ../picard/ui/multitageditor.py:193
-msgid "Channels:"
-msgstr ""
-
-#: ../picard/ui/ui_tageditor.py:115 ../picard/ui/ui_multitageditor.py:55
-#: ../picard/ui/ui_options_plugins.py:59 ../picard/ui/options/plugins.py:76
-msgid "Name"
-msgstr ""
-
-#: ../picard/ui/ui_tageditor.py:116 ../picard/ui/ui_multitageditor.py:56
-msgid "Value"
-msgstr ""
-
-#: ../picard/ui/ui_tageditor.py:117 ../picard/ui/ui_multitageditor.py:57
-msgid "&Add..."
-msgstr ""
-
-#: ../picard/ui/ui_tageditor.py:118
-msgid "&Edit..."
-msgstr ""
-
-#: ../picard/ui/ui_tageditor.py:119
-msgid "&Delete"
-msgstr ""
-
-#: ../picard/ui/ui_tageditor.py:120
-msgid "&Metadata"
-msgstr ""
-
-#: ../picard/ui/ui_tageditor.py:121
-msgid "A&rtwork"
-msgstr ""
-
-#: ../picard/ui/ui_tageditor.py:122
-msgid "&Info"
-msgstr ""
-
-#: ../picard/ui/coverartbox.py:47
-msgid "Cover Art"
-msgstr ""
-
-#: ../picard/ui/coverartbox.py:95
-msgid "Buy the album on Amazon"
-msgstr ""
-
-#: ../picard/ui/ui_puidsubmit.py:52
-msgid "Submit PUIDs"
-msgstr ""
-
-#: ../picard/ui/ui_puidsubmit.py:53 ../picard/ui/ui_cdlookup.py:62
-msgid "OK"
-msgstr ""
-
-#: ../picard/ui/ui_puidsubmit.py:54 ../picard/ui/ui_cdlookup.py:64
-msgid "Cancel"
-msgstr ""
-
-#: ../picard/ui/puidsubmit.py:31 ../picard/ui/options/plugins.py:80
-msgid "File"
-msgstr ""
-
-#: ../picard/ui/puidsubmit.py:31
-msgid "PUID"
-msgstr ""
-
-#: ../picard/ui/puidsubmit.py:31
-msgid "Release"
-msgstr ""
-
-#: ../picard/ui/puidsubmit.py:31
-msgid "Release ID"
-msgstr ""
-
-#: ../picard/ui/filebrowser.py:41
-msgid "&Move Tagged Files Here"
-msgstr ""
-
-#: ../picard/ui/filebrowser.py:44
-msgid "Show &Hidden Files"
-msgstr ""
-
-#: ../picard/ui/ui_cdlookup.py:61
-msgid "The following releases on MusicBrainz match the CD:"
-msgstr ""
-
-#: ../picard/ui/ui_cdlookup.py:63
-msgid "    Lookup manually    "
-msgstr ""
-
-#: ../picard/ui/ui_options.py:42
-msgid "Options"
-msgstr ""
-
-#: ../picard/ui/tagsfromfilenames.py:52 ../picard/ui/tagsfromfilenames.py:96
-msgid "File Name"
-msgstr ""
-
-#: ../picard/ui/ui_options_cover.py:56
-msgid "Location"
-msgstr ""
-
-#: ../picard/ui/ui_options_cover.py:57
-msgid "Embed cover images into tags"
-msgstr ""
-
-#: ../picard/ui/ui_options_cover.py:58
-msgid "Save cover images as separate files"
-msgstr ""
-
-#: ../picard/ui/ui_options_cover.py:59
-msgid "Overwrite the file if it already exists"
-msgstr ""
-
-#: ../picard/ui/ui_options_metadata.py:100
-msgid "Metadata"
-msgstr ""
-
-#: ../picard/ui/ui_options_metadata.py:101
-msgid "Translate foreign artist names to English where possible"
-msgstr ""
-
-#: ../picard/ui/ui_options_metadata.py:102
-msgid "Use release relationships"
-msgstr ""
-
-#: ../picard/ui/ui_options_metadata.py:103
-msgid "Use track relationships"
-msgstr ""
-
-#: ../picard/ui/ui_options_metadata.py:104
-msgid "Use folksonomy tags as genre"
-msgstr ""
-
-#: ../picard/ui/ui_options_metadata.py:105
-msgid "Preferred release country:"
-msgstr ""
-
-#: ../picard/ui/ui_options_metadata.py:106
-msgid "Custom Fields"
-msgstr ""
-
-#: ../picard/ui/ui_options_metadata.py:107
-msgid "Various artists:"
-msgstr ""
-
-#: ../picard/ui/ui_options_metadata.py:108
-msgid "Non-album tracks:"
-msgstr ""
-
-#: ../picard/ui/ui_options_metadata.py:109
-#: ../picard/ui/ui_options_metadata.py:110
-#: ../picard/ui/ui_options_naming.py:168 ../picard/ui/ui_options_naming.py:169
-msgid "Default"
-msgstr ""
-
-#: ../picard/ui/ui_multitageditor.py:58
-msgid "Delete"
-msgstr ""
-
-#: ../picard/ui/logview.py:29
-msgid "Log"
-msgstr ""
-
-#: ../picard/ui/ui_options_plugins.py:58
-msgid "Plugins"
-msgstr ""
-
-#: ../picard/ui/ui_options_plugins.py:60 ../picard/ui/options/plugins.py:79
-msgid "Author"
-msgstr ""
-
-#: ../picard/ui/ui_options_plugins.py:61
-msgid "Version"
-msgstr ""
+#: ../picard/ui/ui_options_interface.py:54
+msgid "User interface language:"
+msgstr "User interface language:"
 
 #: ../picard/ui/ui_options_naming.py:165
 msgid "Rename Files"
-msgstr ""
+msgstr "Rename Files"
 
 #: ../picard/ui/ui_options_naming.py:166
 msgid "Replace Windows-incompatible characters"
-msgstr ""
+msgstr "Replace Windows-incompatible characters"
 
 #: ../picard/ui/ui_options_naming.py:167
 msgid "Replace non-ASCII characters"
-msgstr ""
+msgstr "Replace non-ASCII characters"
 
-#: ../picard/ui/ui_options_naming.py:170 ../picard/ui/options/naming.py:90
+#: ../picard/ui/ui_options_naming.py:168
+#: ../picard/ui/ui_options_naming.py:169
+#: ../picard/ui/ui_options_metadata.py:109
+#: ../picard/ui/ui_options_metadata.py:110
+msgid "Default"
+msgstr "Default"
+
+#: ../picard/ui/ui_options_naming.py:170
+#: ../picard/ui/options/naming.py:90
 msgid "Multiple artist file naming format:"
-msgstr ""
+msgstr "Multiple artist file naming format:"
 
-#: ../picard/ui/ui_options_naming.py:171 ../picard/ui/options/naming.py:86
+#: ../picard/ui/ui_options_naming.py:171
+#: ../picard/ui/options/naming.py:86
 msgid "File naming format:"
-msgstr ""
+msgstr "File naming format:"
 
 #: ../picard/ui/ui_options_naming.py:172
 msgid "Move Files"
-msgstr ""
+msgstr "Move Files"
 
 #: ../picard/ui/ui_options_naming.py:173
 msgid "Move tagged files to this directory:"
-msgstr ""
+msgstr "Move tagged files to this directory:"
 
 #: ../picard/ui/ui_options_naming.py:174
 msgid "Browse..."
-msgstr ""
+msgstr "Browse..."
 
 #: ../picard/ui/ui_options_naming.py:175
 msgid "Move additional files:"
-msgstr ""
+msgstr "Move additional files:"
 
 #: ../picard/ui/ui_options_naming.py:176
 msgid "Delete empty directories"
-msgstr ""
+msgstr "Delete empty directories"
 
 #: ../picard/ui/ui_options_naming.py:177
 msgid "Example"
-msgstr ""
+msgstr "Example"
 
 #: ../picard/ui/ui_options_naming.py:178
 msgid "File name:"
-msgstr ""
+msgstr "File name:"
 
 #: ../picard/ui/ui_options_naming.py:179
 msgid "Multiple artist file name:"
-msgstr ""
+msgstr "Multiple artist file name:"
 
-#: ../picard/ui/ui_options_cdlookup.py:48
-msgid "CD-ROM device to use for lookups:"
-msgstr ""
+#: ../picard/ui/ui_options_naming.py:180
+#: ../picard/ui/ui_tagsfromfilenames.py:58
+msgid "&Preview"
+msgstr "&Preview"
 
-#: ../picard/ui/options/scripting.py:84 ../picard/ui/options/naming.py:86
-#: ../picard/ui/options/naming.py:90 ../picard/ui/options/naming.py:93
-#: ../picard/ui/options/naming.py:95
-msgid "Script Error"
-msgstr ""
+#: ../picard/ui/ui_options_general.py:108
+msgid "MusicBrainz Server"
+msgstr "MusicBrainz Server"
+
+#: ../picard/ui/ui_options_general.py:109
+#: ../picard/ui/ui_options_proxy.py:84
+msgid "Port:"
+msgstr "Port:"
+
+#: ../picard/ui/ui_options_general.py:110
+#: ../picard/ui/ui_options_proxy.py:85
+msgid "Server address:"
+msgstr "Server address:"
+
+#: ../picard/ui/ui_options_general.py:111
+msgid "Account Information"
+msgstr "Account Information"
+
+#: ../picard/ui/ui_options_general.py:114
+#: ../picard/ui/options/general.py:29
+msgid "General"
+msgstr "General"
+
+#: ../picard/ui/ui_options_general.py:115
+msgid "Automatically scan all new files"
+msgstr "Automatically scan all new files"
+
+#: ../picard/ui/ui_options_matching.py:105
+msgid "Thresholds"
+msgstr "Thresholds"
+
+#: ../picard/ui/ui_options_matching.py:106
+msgid "Minimal similarity for matching files to tracks:"
+msgstr "Minimal similarity for matching files to tracks:"
+
+#: ../picard/ui/ui_options_matching.py:110
+msgid "Minimal similarity for file lookups:"
+msgstr "Minimal similarity for file lookups:"
+
+#: ../picard/ui/ui_options_matching.py:111
+msgid "Minimal similarity for cluster lookups:"
+msgstr "Minimal similarity for cluster lookups:"
+
+#: ../picard/ui/ui_options_matching.py:112
+msgid "Minimal similarity for PUID lookups:"
+msgstr "Minimal similarity for PUID lookups:"
+
+#: ../picard/ui/ui_options_metadata.py:100
+#: ../picard/ui/options/metadata.py:31
+msgid "Metadata"
+msgstr "Metadata"
+
+#: ../picard/ui/ui_options_metadata.py:101
+msgid "Translate foreign artist names to English where possible"
+msgstr "Translate foreign artist names to English where possible"
+
+#: ../picard/ui/ui_options_metadata.py:102
+msgid "Use release relationships"
+msgstr "Use release relationships"
+
+#: ../picard/ui/ui_options_metadata.py:103
+msgid "Use track relationships"
+msgstr "Use track relationships"
+
+#: ../picard/ui/ui_options_metadata.py:104
+msgid "Use folksonomy tags as genre"
+msgstr "Use folksonomy tags as genre"
+
+#: ../picard/ui/ui_options_metadata.py:105
+msgid "Preferred release country:"
+msgstr "Preferred release country:"
+
+#: ../picard/ui/ui_options_metadata.py:106
+msgid "Custom Fields"
+msgstr "Custom Fields"
+
+#: ../picard/ui/ui_options_metadata.py:107
+msgid "Various artists:"
+msgstr "Various artists:"
+
+#: ../picard/ui/ui_options_metadata.py:108
+msgid "Non-album tracks:"
+msgstr "Non-album tracks:"
+
+#: ../picard/ui/ui_options_plugins.py:58
+#: ../picard/ui/options/plugins.py:30
+msgid "Plugins"
+msgstr "Plugins"
+
+#: ../picard/ui/ui_options_plugins.py:60
+#: ../picard/ui/options/plugins.py:79
+msgid "Author"
+msgstr "Author"
+
+#: ../picard/ui/ui_options_plugins.py:61
+#: ../picard/util/tags.py:36
+msgid "Version"
+msgstr "Version"
+
+#: ../picard/ui/ui_options_proxy.py:81
+#: ../picard/ui/options/proxy.py:28
+msgid "Web Proxy"
+msgstr "Web Proxy"
+
+#: ../picard/ui/ui_options_script.py:52
+msgid "Tagger Script"
+msgstr "Tagger Script"
+
+#: ../picard/ui/ui_options_tags.py:105
+msgid "Common"
+msgstr "Common"
+
+#: ../picard/ui/ui_options_tags.py:106
+msgid "Clear existing tags before writing new tags"
+msgstr "Clear existing tags before writing new tags"
+
+#: ../picard/ui/ui_options_tags.py:107
+msgid "Don't write tags to files"
+msgstr "Don't write tags to files"
+
+#: ../picard/ui/ui_options_tags.py:108
+msgid "ID3"
+msgstr "ID3"
+
+#: ../picard/ui/ui_options_tags.py:109
+msgid "Write ID3v1 tags to the files"
+msgstr "Write ID3v1 tags to the files"
+
+#: ../picard/ui/ui_options_tags.py:110
+msgid "Write ID3v2 version 2.3 tags (2.4 is default)"
+msgstr "Write ID3v2 version 2.3 tags (2.4 is default)"
+
+#: ../picard/ui/ui_options_tags.py:111
+msgid "Text encoding to use while writing ID3v2 tags:"
+msgstr "Text encoding to use while writing ID3v2 tags:"
+
+#: ../picard/ui/ui_options_tags.py:112
+msgid "ISO-8859-1"
+msgstr "ISO-8859-1"
+
+#: ../picard/ui/ui_options_tags.py:113
+msgid "UTF-16"
+msgstr "UTF-16"
+
+#: ../picard/ui/ui_options_tags.py:114
+msgid "UTF-8"
+msgstr "UTF-8"
+
+#: ../picard/ui/ui_options_tags.py:115
+msgid "Remove ID3 tags from FLAC files"
+msgstr "Remove ID3 tags from FLAC files"
+
+#: ../picard/ui/ui_options_tags.py:116
+msgid "APE"
+msgstr "APE"
+
+#: ../picard/ui/ui_options_tags.py:117
+msgid "Remove APEv2 tags from MP3 files"
+msgstr "Remove APEv2 tags from MP3 files"
+
+#: ../picard/ui/ui_tagsfromfilenames.py:56
+msgid "Convert File Names to Tags"
+msgstr "Convert File Names to Tags"
+
+#: ../picard/ui/ui_tagsfromfilenames.py:57
+msgid "Replace underscores with spaces"
+msgstr "Replace underscores with spaces"
+
+#: ../picard/ui/options/about.py:29
+msgid "About"
+msgstr "About"
 
 #. Replace this with your name to have it appear in the "About" dialog.
 #: ../picard/ui/options/about.py:48
 msgid "translator-credits"
 msgstr ""
 "Launchpad Contributions:\n"
-"  Lukáš Lalinský https://launchpad.net/~luks\n"
-"\n"
-"Launchpad Contributions:\n"
-"  Lukáš Lalinský https://launchpad.net/~luks\n"
-"\n"
-"Launchpad Contributions:\n"
-"  Lukáš Lalinský https://launchpad.net/~luks\n"
-"\n"
-"Launchpad Contributions:\n"
 "  Lukáš Lalinský https://launchpad.net/~luks"
 
 #. Replace LANG with language you are translatig to.
 #: ../picard/ui/options/about.py:51
 #, python-format
 msgid "<br/>Translated to LANG by %s"
-msgstr ""
+msgstr "<br/>Translated to LANG by %s"
 
 #: ../picard/ui/options/about.py:55
 #, python-format
 msgid ""
-"<p align=\"center\"><span style=\"font-size:15px;font-weight:bold;"
-"\">MusicBrainz Picard</span><br/>\n"
+"<p align=\"center\"><span style=\"font-size:15px;font-weight:bold;\">MusicBrainz Picard</span><br/>\n"
 "Version %(version)s</p>\n"
 "<p align=\"center\"><strong>Supported formats</strong><br/>%(formats)s</p>\n"
 "<p align=\"center\"><strong>Please donate</strong><br/>\n"
-"Thank you for using Picard. Picard relies on the MusicBrainz database, which "
-"is operated by the MetaBrainz Foundation with the help of thousands of "
-"volunteers. If you like this application please consider donating to the "
-"MetaBrainz Foundation to keep the service running.</p>\n"
-"<p align=\"center\"><a href=\"http://metabrainz.org/donate/index.html"
-"\">Donate now!</a></p>\n"
+"Thank you for using Picard. Picard relies on the MusicBrainz database, which is operated by the MetaBrainz Foundation with the help of thousands of volunteers. If you like this application please consider donating to the MetaBrainz Foundation to keep the service running.</p>\n"
+"<p align=\"center\"><a href=\"http://metabrainz.org/donate/index.html\">Donate now!</a></p>\n"
 "<p align=\"center\"><strong>Credits</strong><br/>\n"
-"<small>Copyright © 2004-2008 Robert Kaye, Lukáš Lalinský and others%"
-"(translator-credits)s</small></p>\n"
-"<p align=\"center\"><a href=\"http://musicbrainz.org/doc/PicardTagger"
-"\">http://musicbrainz.org/doc/PicardTagger</a></p>\n"
+"<small>Copyright © 2004-2008 Robert Kaye, Lukáš Lalinský and others%(translator-credits)s</small></p>\n"
+"<p align=\"center\"><a href=\"http://musicbrainz.org/doc/PicardTagger\">http://musicbrainz.org/doc/PicardTagger</a></p>\n"
 msgstr ""
+"<p align=\"center\"><span style=\"font-size:15px;font-weight:bold;\">MusicBrainz Picard</span><br/>\n"
+"Version %(version)s</p>\n"
+"<p align=\"center\"><strong>Supported formats</strong><br/>%(formats)s</p>\n"
+"<p align=\"center\"><strong>Please donate</strong><br/>\n"
+"Thank you for using Picard. Picard relies on the MusicBrainz database, which is operated by the MetaBrainz Foundation with the help of thousands of volunteers. If you like this application please consider donating to the MetaBrainz Foundation to keep the service running.</p>\n"
+"<p align=\"center\"><a href=\"http://metabrainz.org/donate/index.html\">Donate now!</a></p>\n"
+"<p align=\"center\"><strong>Credits</strong><br/>\n"
+"<small>Copyright © 2004-2008 Robert Kaye, Lukáš Lalinský and others%(translator-credits)s</small></p>\n"
+"<p align=\"center\"><a href=\"http://musicbrainz.org/doc/PicardTagger\">http://musicbrainz.org/doc/PicardTagger</a></p>\n"
+
+#: ../picard/ui/options/advanced.py:26
+msgid "Advanced"
+msgstr "Advanced"
+
+#: ../picard/ui/options/interface.py:31
+msgid "User Interface"
+msgstr "User Interface"
+
+#: ../picard/ui/options/interface.py:47
+msgid "System default"
+msgstr "System default"
+
+#: ../picard/ui/options/interface.py:71
+msgid "Language changed"
+msgstr "Language changed"
+
+#: ../picard/ui/options/interface.py:71
+msgid "You have changed the interface language. You have to restart Picard in order for the change to take effect."
+msgstr "You have changed the interface language. You have to restart Picard in order for the change to take effect."
+
+#: ../picard/ui/options/matching.py:29
+msgid "Matching"
+msgstr "Matching"
+
+#: ../picard/ui/options/metadata.py:52
+msgid "None"
+msgstr "None"
+
+#: ../picard/ui/options/naming.py:33
+msgid "File Naming"
+msgstr "File Naming"
+
+#: ../picard/ui/options/naming.py:86
+#: ../picard/ui/options/naming.py:90
+#: ../picard/ui/options/naming.py:93
+#: ../picard/ui/options/naming.py:95
+#: ../picard/ui/options/scripting.py:84
+msgid "Script Error"
+msgstr "Script Error"
 
 #: ../picard/ui/options/naming.py:93
 msgid "The file naming format must not be empty."
-msgstr ""
+msgstr "The file naming format must not be empty."
 
 #: ../picard/ui/options/naming.py:95
 msgid "The multiple artist file naming format must not be empty."
-msgstr ""
+msgstr "The multiple artist file naming format must not be empty."
 
 #: ../picard/ui/options/naming.py:97
 msgid "Error"
-msgstr ""
+msgstr "Error"
 
 #: ../picard/ui/options/naming.py:97
 msgid "The location to move files to must not be empty."
-msgstr ""
+msgstr "The location to move files to must not be empty."
+
+#: ../picard/ui/options/scripting.py:63
+msgid "Scripting"
+msgstr "Scripting"
+
+#: ../picard/ui/options/tags.py:29
+msgid "Tags"
+msgstr "Tags"
+
+#: ../picard/util/tags.py:24
+msgid "Date"
+msgstr "Date"
+
+#: ../picard/util/tags.py:25
+msgid "Album Artist"
+msgstr "Album Artist"
+
+#: ../picard/util/tags.py:26
+msgid "Track Number"
+msgstr "Track Number"
+
+#: ../picard/util/tags.py:27
+msgid "Total Tracks"
+msgstr "Total Tracks"
+
+#: ../picard/util/tags.py:28
+msgid "Disc Number"
+msgstr "Disc Number"
+
+#: ../picard/util/tags.py:29
+msgid "Total Discs"
+msgstr "Total Discs"
+
+#: ../picard/util/tags.py:30
+msgid "Album Artist Sort Order"
+msgstr "Album Artist Sort Order"
+
+#: ../picard/util/tags.py:31
+msgid "Artist Sort Order"
+msgstr "Artist Sort Order"
+
+#: ../picard/util/tags.py:32
+msgid "Title Sort Order"
+msgstr "Title Sort Order"
+
+#: ../picard/util/tags.py:33
+msgid "Album Sort Order"
+msgstr "Album Sort Order"
+
+#: ../picard/util/tags.py:34
+msgid "ASIN"
+msgstr "ASIN"
+
+#: ../picard/util/tags.py:35
+msgid "Grouping"
+msgstr "Grouping"
+
+#: ../picard/util/tags.py:37
+msgid "ISRC"
+msgstr "ISRC"
+
+#: ../picard/util/tags.py:38
+msgid "Mood"
+msgstr "Mood"
+
+#: ../picard/util/tags.py:39
+msgid "BPM"
+msgstr "BPM"
+
+#: ../picard/util/tags.py:40
+msgid "Copyright"
+msgstr "Copyright"
+
+#: ../picard/util/tags.py:41
+msgid "Composer"
+msgstr "Composer"
+
+#: ../picard/util/tags.py:42
+msgid "Conductor"
+msgstr "Conductor"
+
+#: ../picard/util/tags.py:43
+msgid "Lyricist"
+msgstr "Lyricist"
+
+#: ../picard/util/tags.py:44
+msgid "Arranger"
+msgstr "Arranger"
+
+#: ../picard/util/tags.py:45
+msgid "Producer"
+msgstr "Producer"
+
+#: ../picard/util/tags.py:46
+msgid "Engineer"
+msgstr "Engineer"
+
+#: ../picard/util/tags.py:47
+msgid "Subtitle"
+msgstr "Subtitle"
+
+#: ../picard/util/tags.py:48
+msgid "Disc Subtitle"
+msgstr "Disc Subtitle"
+
+#: ../picard/util/tags.py:49
+msgid "Remixer"
+msgstr "Remixer"
+
+#: ../picard/util/tags.py:50
+msgid "MusicBrainz Track Id"
+msgstr "MusicBrainz Track Id"
+
+#: ../picard/util/tags.py:51
+msgid "MusicBrainz Release Id"
+msgstr "MusicBrainz Release Id"
+
+#: ../picard/util/tags.py:52
+msgid "MusicBrainz Artist Id"
+msgstr "MusicBrainz Artist Id"
+
+#: ../picard/util/tags.py:53
+msgid "MusicBrainz Release Artist Id"
+msgstr "MusicBrainz Release Artist Id"
+
+#: ../picard/util/tags.py:54
+msgid "MusicBrainz TRM Id"
+msgstr "MusicBrainz TRM Id"
+
+#: ../picard/util/tags.py:55
+msgid "MusicBrainz Disc Id"
+msgstr "MusicBrainz Disc Id"
+
+#: ../picard/util/tags.py:56
+msgid "MusicBrainz Sort Name"
+msgstr "MusicBrainz Sort Name"
+
+#: ../picard/util/tags.py:57
+msgid "MusicIP PUID"
+msgstr "MusicIP PUID"
+
+#: ../picard/util/tags.py:58
+msgid "MusicIP Fingerprint"
+msgstr "MusicIP Fingerprint"
+
+#: ../picard/util/tags.py:59
+msgid "Disc Id"
+msgstr "Disc Id"
+
+#: ../picard/util/tags.py:60
+msgid "Website"
+msgstr "Website"
+
+#: ../picard/util/tags.py:61
+msgid "Compilation"
+msgstr "Compilation"
+
+#: ../picard/util/tags.py:62
+msgid "Comment"
+msgstr "Comment"
+
+#: ../picard/util/tags.py:63
+msgid "Genre"
+msgstr "Genre"
+
+#: ../picard/util/tags.py:64
+msgid "Encoded By"
+msgstr "Encoded By"
+
+#: ../picard/util/tags.py:65
+msgid "Performer"
+msgstr "Performer"
+
+#: ../picard/util/tags.py:66
+msgid "Release Type"
+msgstr "Release Type"
+
+#: ../picard/util/tags.py:67
+msgid "Release Status"
+msgstr "Release Status"
+
+#: ../picard/util/tags.py:68
+msgid "Release Country"
+msgstr "Release Country"
+
+#: ../picard/util/tags.py:69
+msgid "Record Label"
+msgstr "Record Label"
+
+#: ../picard/util/tags.py:70
+msgid "Barcode"
+msgstr "Barcode"
+
+#: ../picard/util/tags.py:71
+msgid "Catalog Number"
+msgstr "Catalog Number"
+
+#: ../picard/util/tags.py:72
+msgid "Format"
+msgstr "Format"
+
+#: ../picard/util/tags.py:73
+msgid "DJ-Mixer"
+msgstr "DJ-Mixer"
+
+#: ../picard/util/tags.py:74
+msgid "Media"
+msgstr "Media"
+
+#: ../picard/util/tags.py:75
+msgid "Lyrics"
+msgstr "Lyrics"
+
+#: ../picard/util/tags.py:76
+msgid "Mixer"
+msgstr "Mixer"
+
+#: ../picard/util/tags.py:77
+msgid "Language"
+msgstr "Language"
+
+#: ../picard/util/tags.py:78
+msgid "Script"
+msgstr "Script"
 
 #: ../picard/util/webbrowser2.py:84
 msgid "Web Browser Error"
-msgstr ""
+msgstr "Web Browser Error"
 
 #: ../picard/util/webbrowser2.py:84
 #, python-format
@@ -946,30 +2484,7 @@ msgid ""
 "\n"
 "%s"
 msgstr ""
+"Error while launching a web browser:\n"
+"\n"
+"%s"
 
-#~ msgid ""
-#~ "Version %s\n"
-#~ "\n"
-#~ "(c) 2004 Robert Kaye and others\n"
-#~ "http://musicbrainz.org/\n"
-#~ "\n"
-#~ "(c) 2004 Real Networks Helix Community\n"
-#~ "http://helixcommunity.org/\n"
-#~ "\n"
-#~ "This application was made possible\n"
-#~ "by a Helix Community grant.\n"
-#~ "\n"
-#~ "Supported formats: %s"
-#~ msgstr ""
-#~ "Version %s\n"
-#~ "\n"
-#~ "© 2004 Robert Kaye and others\n"
-#~ "http://musicbrainz.org/\n"
-#~ "\n"
-#~ "© 2004 Real Networks Helix Community\n"
-#~ "http://helixcommunity.org/\n"
-#~ "\n"
-#~ "This application was made possible\n"
-#~ "by a Helix Community grant.\n"
-#~ "\n"
-#~ "Supported formats: %s"
diff --git a/po/en_CA.po b/po/en_CA.po
index afc13231a..95769864c 100644
--- a/po/en_CA.po
+++ b/po/en_CA.po
@@ -7,35 +7,1294 @@ msgid ""
 msgstr ""
 "Project-Id-Version: picard\n"
 "Report-Msgid-Bugs-To: http://bugs.musicbrainz.org/\n"
-"POT-Creation-Date: 2008-12-01 18:20+0100\n"
-"PO-Revision-Date: 2008-07-27 19:45+0000\n"
-"Last-Translator: Nick Ellery <nick.ellery@ubuntu.com>\n"
+"POT-Creation-Date: 2009-01-25 12:23+0100\n"
+"PO-Revision-Date: 2009-01-25 13:07+0100\n"
+"Last-Translator: Philipp Wolfer <phw@rubyforge.org>\n"
 "Language-Team: English (Canada) <en_CA@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2008-12-01 17:02+0000\n"
+"X-Launchpad-Export-Date: 2009-01-24 23:28+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
-#: ../picard/album.py:108 ../picard/cluster.py:248
+#: ../picard/album.py:108
+#: ../picard/cluster.py:248
 msgid "Unmatched Files"
 msgstr "Unmatched Files"
 
-#: ../picard/album.py:269
+#: ../picard/album.py:281
 #, python-format
 msgid "[couldn't load album %s]"
 msgstr "[couldn't load album %s]"
 
-#: ../picard/album.py:305
+#: ../picard/album.py:317
 msgid "[loading album information]"
 msgstr "[loading album information]"
 
-#: ../picard/tagger.py:472
+#: ../picard/cluster.py:164
+#: ../picard/cluster.py:175
+#, python-format
+msgid "No matching releases for cluster %s"
+msgstr "No matching releases for cluster %s"
+
+#: ../picard/cluster.py:177
+#, python-format
+msgid "Cluster %s identified!"
+msgstr "Cluster %s identified!"
+
+#: ../picard/cluster.py:182
+#, python-format
+msgid "Looking up the metadata for cluster %s..."
+msgstr "Looking up the metadata for cluster %s..."
+
+#: ../picard/const.py:40
+msgid "CD"
+msgstr ""
+
+#: ../picard/const.py:41
+msgid "DVD"
+msgstr ""
+
+#: ../picard/const.py:42
+msgid "SACD"
+msgstr ""
+
+#: ../picard/const.py:43
+msgid "LaserDisc"
+msgstr ""
+
+#: ../picard/const.py:44
+msgid "MiniDisc"
+msgstr ""
+
+#: ../picard/const.py:45
+msgid "Vinyl"
+msgstr ""
+
+#: ../picard/const.py:46
+msgid "Cassette"
+msgstr ""
+
+#: ../picard/const.py:47
+msgid "Cartridge (4/8-tracks)"
+msgstr ""
+
+#: ../picard/const.py:48
+msgid "Reel-to-Reel"
+msgstr ""
+
+#: ../picard/const.py:49
+msgid "DAT"
+msgstr ""
+
+#: ../picard/const.py:50
+#, fuzzy
+msgid "Digital Media"
+msgstr "Original Metadata"
+
+#: ../picard/const.py:51
+msgid "Wax Cylinder"
+msgstr ""
+
+#: ../picard/const.py:52
+msgid "Piano Roll"
+msgstr ""
+
+#: ../picard/const.py:53
+msgid "Other"
+msgstr ""
+
+#: ../picard/const.py:58
+msgid "Bangladesh"
+msgstr ""
+
+#: ../picard/const.py:59
+msgid "Belgium"
+msgstr ""
+
+#: ../picard/const.py:60
+msgid "Burkina Faso"
+msgstr ""
+
+#: ../picard/const.py:61
+msgid "Bulgaria"
+msgstr ""
+
+#: ../picard/const.py:62
+msgid "Barbados"
+msgstr ""
+
+#: ../picard/const.py:63
+msgid "Wallis and Futuna Islands"
+msgstr ""
+
+#: ../picard/const.py:64
+msgid "Bermuda"
+msgstr ""
+
+#: ../picard/const.py:65
+msgid "Brunei Darussalam"
+msgstr ""
+
+#: ../picard/const.py:66
+msgid "Bolivia"
+msgstr ""
+
+#: ../picard/const.py:67
+msgid "Bahrain"
+msgstr ""
+
+#: ../picard/const.py:68
+msgid "Burundi"
+msgstr ""
+
+#: ../picard/const.py:69
+msgid "Benin"
+msgstr ""
+
+#: ../picard/const.py:70
+msgid "Bhutan"
+msgstr ""
+
+#: ../picard/const.py:71
+msgid "Jamaica"
+msgstr ""
+
+#: ../picard/const.py:72
+msgid "Bouvet Island"
+msgstr ""
+
+#: ../picard/const.py:73
+msgid "Botswana"
+msgstr ""
+
+#: ../picard/const.py:74
+msgid "Samoa"
+msgstr ""
+
+#: ../picard/const.py:75
+msgid "Brazil"
+msgstr ""
+
+#: ../picard/const.py:76
+msgid "Bahamas"
+msgstr ""
+
+#: ../picard/const.py:77
+msgid "Belarus"
+msgstr ""
+
+#: ../picard/const.py:78
+msgid "Belize"
+msgstr ""
+
+#: ../picard/const.py:79
+msgid "Russian Federation"
+msgstr ""
+
+#: ../picard/const.py:80
+msgid "Rwanda"
+msgstr ""
+
+#: ../picard/const.py:81
+msgid "Reunion"
+msgstr ""
+
+#: ../picard/const.py:82
+msgid "Turkmenistan"
+msgstr ""
+
+#: ../picard/const.py:83
+msgid "Tajikistan"
+msgstr ""
+
+#: ../picard/const.py:84
+msgid "Romania"
+msgstr ""
+
+#: ../picard/const.py:85
+#, fuzzy
+msgid "Tokela"
+msgstr "Toolbar"
+
+#: ../picard/const.py:86
+msgid "Guinea-Bissa"
+msgstr ""
+
+#: ../picard/const.py:87
+msgid "Guam"
+msgstr ""
+
+#: ../picard/const.py:88
+msgid "Guatemala"
+msgstr ""
+
+#: ../picard/const.py:89
+msgid "Greece"
+msgstr ""
+
+#: ../picard/const.py:90
+msgid "Equatorial Guinea"
+msgstr ""
+
+#: ../picard/const.py:91
+msgid "Guadeloupe"
+msgstr ""
+
+#: ../picard/const.py:92
+msgid "Japan"
+msgstr ""
+
+#: ../picard/const.py:93
+msgid "Guyana"
+msgstr ""
+
+#: ../picard/const.py:94
+msgid "French Guiana"
+msgstr ""
+
+#: ../picard/const.py:95
+msgid "Georgia"
+msgstr ""
+
+#: ../picard/const.py:96
+msgid "Grenada"
+msgstr ""
+
+#: ../picard/const.py:97
+msgid "United Kingdom"
+msgstr ""
+
+#: ../picard/const.py:98
+msgid "Gabon"
+msgstr ""
+
+#: ../picard/const.py:99
+msgid "El Salvador"
+msgstr ""
+
+#: ../picard/const.py:100
+#, fuzzy
+msgid "Guinea"
+msgstr "General"
+
+#: ../picard/const.py:101
+msgid "Gambia"
+msgstr ""
+
+#: ../picard/const.py:102
+msgid "Greenland"
+msgstr ""
+
+#: ../picard/const.py:103
+msgid "Gibraltar"
+msgstr ""
+
+#: ../picard/const.py:104
+msgid "Ghana"
+msgstr ""
+
+#: ../picard/const.py:105
+msgid "Oman"
+msgstr ""
+
+#: ../picard/const.py:106
+msgid "Tunisia"
+msgstr ""
+
+#: ../picard/const.py:107
+msgid "Jordan"
+msgstr ""
+
+#: ../picard/const.py:108
+msgid "Haiti"
+msgstr ""
+
+#: ../picard/const.py:109
+msgid "Hungary"
+msgstr ""
+
+#: ../picard/const.py:110
+msgid "Hong Kong"
+msgstr ""
+
+#: ../picard/const.py:111
+msgid "Honduras"
+msgstr ""
+
+#: ../picard/const.py:112
+msgid "Heard and Mc Donald Islands"
+msgstr ""
+
+#: ../picard/const.py:113
+msgid "Venezuela"
+msgstr ""
+
+#: ../picard/const.py:114
+msgid "Puerto Rico"
+msgstr ""
+
+#: ../picard/const.py:115
+msgid "Pala"
+msgstr ""
+
+#: ../picard/const.py:116
+#, fuzzy
+msgid "Portugal"
+msgstr "Port:"
+
+#: ../picard/const.py:117
+msgid "Svalbard and Jan Mayen Islands"
+msgstr ""
+
+#: ../picard/const.py:118
+msgid "Paraguay"
+msgstr ""
+
+#: ../picard/const.py:119
+msgid "Iraq"
+msgstr ""
+
+#: ../picard/const.py:120
+msgid "Panama"
+msgstr ""
+
+#: ../picard/const.py:121
+msgid "French Polynesia"
+msgstr ""
+
+#: ../picard/const.py:122
+msgid "Papua New Guinea"
+msgstr ""
+
+#: ../picard/const.py:123
+msgid "Per"
+msgstr ""
+
+#: ../picard/const.py:124
+msgid "Pakistan"
+msgstr ""
+
+#: ../picard/const.py:125
+msgid "Philippines"
+msgstr ""
+
+#: ../picard/const.py:126
+msgid "Pitcairn"
+msgstr ""
+
+#: ../picard/const.py:127
+msgid "Poland"
+msgstr ""
+
+#: ../picard/const.py:128
+msgid "St. Pierre and Miquelon"
+msgstr ""
+
+#: ../picard/const.py:129
+msgid "Zambia"
+msgstr ""
+
+#: ../picard/const.py:130
+msgid "Western Sahara"
+msgstr ""
+
+#: ../picard/const.py:131
+msgid "Estonia"
+msgstr ""
+
+#: ../picard/const.py:132
+msgid "Egypt"
+msgstr ""
+
+#: ../picard/const.py:133
+msgid "South Africa"
+msgstr ""
+
+#: ../picard/const.py:134
+msgid "Ecuador"
+msgstr ""
+
+#: ../picard/const.py:135
+msgid "Italy"
+msgstr ""
+
+#: ../picard/const.py:136
+#, fuzzy
+msgid "Viet Nam"
+msgstr "File Name"
+
+#: ../picard/const.py:137
+msgid "Solomon Islands"
+msgstr ""
+
+#: ../picard/const.py:138
+msgid "Ethiopia"
+msgstr ""
+
+#: ../picard/const.py:139
+msgid "Somalia"
+msgstr ""
+
+#: ../picard/const.py:140
+msgid "Zimbabwe"
+msgstr ""
+
+#: ../picard/const.py:141
+msgid "Saudi Arabia"
+msgstr ""
+
+#: ../picard/const.py:142
+#, fuzzy
+msgid "Spain"
+msgstr "&Scan"
+
+#: ../picard/const.py:143
+msgid "Eritrea"
+msgstr ""
+
+#: ../picard/const.py:144
+msgid "Moldova, Republic of"
+msgstr ""
+
+#: ../picard/const.py:145
+msgid "Madagascar"
+msgstr ""
+
+#: ../picard/const.py:146
+msgid "Morocco"
+msgstr ""
+
+#: ../picard/const.py:147
+#, fuzzy
+msgid "Monaco"
+msgstr "Mono"
+
+#: ../picard/const.py:148
+msgid "Uzbekistan"
+msgstr ""
+
+#: ../picard/const.py:149
+msgid "Myanmar"
+msgstr ""
+
+#: ../picard/const.py:150
+msgid "Mali"
+msgstr ""
+
+#: ../picard/const.py:151
+msgid "Maca"
+msgstr ""
+
+#: ../picard/const.py:152
+#, fuzzy
+msgid "Mongolia"
+msgstr "Mono"
+
+#: ../picard/const.py:153
+msgid "Marshall Islands"
+msgstr ""
+
+#: ../picard/const.py:154
+msgid "Macedonia, The Former Yugoslav Republic of"
+msgstr ""
+
+#: ../picard/const.py:155
+msgid "Mauritius"
+msgstr ""
+
+#: ../picard/const.py:156
+#, fuzzy
+msgid "Malta"
+msgstr "Metadata"
+
+#: ../picard/const.py:157
+msgid "Malawi"
+msgstr ""
+
+#: ../picard/const.py:158
+msgid "Maldives"
+msgstr ""
+
+#: ../picard/const.py:159
+msgid "Martinique"
+msgstr ""
+
+#: ../picard/const.py:160
+msgid "Northern Mariana Islands"
+msgstr ""
+
+#: ../picard/const.py:161
+msgid "Montserrat"
+msgstr ""
+
+#: ../picard/const.py:162
+msgid "Mauritania"
+msgstr ""
+
+#: ../picard/const.py:163
+msgid "Uganda"
+msgstr ""
+
+#: ../picard/const.py:164
+msgid "Malaysia"
+msgstr ""
+
+#: ../picard/const.py:165
+msgid "Mexico"
+msgstr ""
+
+#: ../picard/const.py:166
+msgid "Israel"
+msgstr ""
+
+#: ../picard/const.py:167
+#, fuzzy
+msgid "France"
+msgstr "Cancel"
+
+#: ../picard/const.py:168
+msgid "British Indian Ocean Territory"
+msgstr ""
+
+#: ../picard/const.py:169
+msgid "St. Helena"
+msgstr ""
+
+#: ../picard/const.py:170
+msgid "Finland"
+msgstr ""
+
+#: ../picard/const.py:171
+msgid "Fiji"
+msgstr ""
+
+#: ../picard/const.py:172
+msgid "Falkland Islands (Malvinas)"
+msgstr ""
+
+#: ../picard/const.py:173
+msgid "Micronesia, Federated States of"
+msgstr ""
+
+#: ../picard/const.py:174
+msgid "Faroe Islands"
+msgstr ""
+
+#: ../picard/const.py:175
+msgid "Nicaragua"
+msgstr ""
+
+#: ../picard/const.py:176
+msgid "Netherlands"
+msgstr ""
+
+#: ../picard/const.py:177
+msgid "Norway"
+msgstr ""
+
+#: ../picard/const.py:178
+msgid "Namibia"
+msgstr ""
+
+#: ../picard/const.py:179
+msgid "Vanuat"
+msgstr ""
+
+#: ../picard/const.py:180
+msgid "New Caledonia"
+msgstr ""
+
+#: ../picard/const.py:181
+#, fuzzy
+msgid "Niger"
+msgstr "Mixer"
+
+#: ../picard/const.py:182
+msgid "Norfolk Island"
+msgstr ""
+
+#: ../picard/const.py:183
+msgid "Nigeria"
+msgstr ""
+
+#: ../picard/const.py:184
+#, fuzzy
+msgid "New Zealand"
+msgstr "New Metadata"
+
+#: ../picard/const.py:185
+msgid "Zaire"
+msgstr ""
+
+#: ../picard/const.py:186
+msgid "Nepal"
+msgstr ""
+
+#: ../picard/const.py:187
+msgid "Naur"
+msgstr ""
+
+#: ../picard/const.py:188
+msgid "Niue"
+msgstr ""
+
+#: ../picard/const.py:189
+msgid "Cook Islands"
+msgstr ""
+
+#: ../picard/const.py:190
+msgid "Cote d'Ivoire"
+msgstr ""
+
+#: ../picard/const.py:191
+msgid "Switzerland"
+msgstr ""
+
+#: ../picard/const.py:192
+msgid "Colombia"
+msgstr ""
+
+#: ../picard/const.py:193
+msgid "China"
+msgstr ""
+
+#: ../picard/const.py:194
+msgid "Cameroon"
+msgstr ""
+
+#: ../picard/const.py:195
+#, fuzzy
+msgid "Chile"
+msgstr "File"
+
+#: ../picard/const.py:196
+msgid "Cocos (Keeling) Islands"
+msgstr ""
+
+#: ../picard/const.py:197
+msgid "Canada"
+msgstr ""
+
+#: ../picard/const.py:198
+#, fuzzy
+msgid "Congo"
+msgstr "Mono"
+
+#: ../picard/const.py:199
+msgid "Central African Republic"
+msgstr ""
+
+#: ../picard/const.py:200
+msgid "Czech Republic"
+msgstr ""
+
+#: ../picard/const.py:201
+msgid "Cyprus"
+msgstr ""
+
+#: ../picard/const.py:202
+msgid "Christmas Island"
+msgstr ""
+
+#: ../picard/const.py:203
+msgid "Costa Rica"
+msgstr ""
+
+#: ../picard/const.py:204
+msgid "Cape Verde"
+msgstr ""
+
+#: ../picard/const.py:205
+msgid "Cuba"
+msgstr ""
+
+#: ../picard/const.py:206
+msgid "Swaziland"
+msgstr ""
+
+#: ../picard/const.py:207
+msgid "Syrian Arab Republic"
+msgstr ""
+
+#: ../picard/const.py:208
+msgid "Kyrgyzstan"
+msgstr ""
+
+#: ../picard/const.py:209
+msgid "Kenya"
+msgstr ""
+
+#: ../picard/const.py:210
+msgid "Suriname"
+msgstr ""
+
+#: ../picard/const.py:211
+msgid "Kiribati"
+msgstr ""
+
+#: ../picard/const.py:212
+msgid "Cambodia"
+msgstr ""
+
+#: ../picard/const.py:213
+msgid "Saint Kitts and Nevis"
+msgstr ""
+
+#: ../picard/const.py:214
+#, fuzzy
+msgid "Comoros"
+msgstr "Composer"
+
+#: ../picard/const.py:215
+msgid "Sao Tome and Principe"
+msgstr ""
+
+#: ../picard/const.py:216
+msgid "Slovenia"
+msgstr ""
+
+#: ../picard/const.py:217
+msgid "Kuwait"
+msgstr ""
+
+#: ../picard/const.py:218
+#, fuzzy
+msgid "Senegal"
+msgstr "General"
+
+#: ../picard/const.py:219
+msgid "San Marino"
+msgstr ""
+
+#: ../picard/const.py:220
+msgid "Sierra Leone"
+msgstr ""
+
+#: ../picard/const.py:221
+msgid "Seychelles"
+msgstr ""
+
+#: ../picard/const.py:222
+msgid "Kazakhstan"
+msgstr ""
+
+#: ../picard/const.py:223
+msgid "Cayman Islands"
+msgstr ""
+
+#: ../picard/const.py:224
+msgid "Singapore"
+msgstr ""
+
+#: ../picard/const.py:225
+msgid "Sweden"
+msgstr ""
+
+#: ../picard/const.py:226
+#, fuzzy
+msgid "Sudan"
+msgstr "&Scan"
+
+#: ../picard/const.py:227
+msgid "Dominican Republic"
+msgstr ""
+
+#: ../picard/const.py:228
+msgid "Dominica"
+msgstr ""
+
+#: ../picard/const.py:229
+#, fuzzy
+msgid "Djibouti"
+msgstr "About"
+
+#: ../picard/const.py:230
+msgid "Denmark"
+msgstr ""
+
+#: ../picard/const.py:231
+msgid "Virgin Islands (British)"
+msgstr ""
+
+#: ../picard/const.py:232
+msgid "Germany"
+msgstr ""
+
+#: ../picard/const.py:233
+msgid "Yemen"
+msgstr ""
+
+#: ../picard/const.py:234
+msgid "Algeria"
+msgstr ""
+
+#: ../picard/const.py:235
+msgid "United States"
+msgstr ""
+
+#: ../picard/const.py:236
+msgid "Uruguay"
+msgstr ""
+
+#: ../picard/const.py:237
+msgid "Mayotte"
+msgstr ""
+
+#: ../picard/const.py:238
+msgid "United States Minor Outlying Islands"
+msgstr ""
+
+#: ../picard/const.py:239
+msgid "Lebanon"
+msgstr ""
+
+#: ../picard/const.py:240
+msgid "Saint Lucia"
+msgstr ""
+
+#: ../picard/const.py:241
+msgid "Lao People's Democratic Republic"
+msgstr ""
+
+#: ../picard/const.py:242
+msgid "Tuval"
+msgstr ""
+
+#: ../picard/const.py:243
+msgid "Taiwan"
+msgstr ""
+
+#: ../picard/const.py:244
+msgid "Trinidad and Tobago"
+msgstr ""
+
+#: ../picard/const.py:245
+msgid "Turkey"
+msgstr ""
+
+#: ../picard/const.py:246
+msgid "Sri Lanka"
+msgstr ""
+
+#: ../picard/const.py:247
+msgid "Liechtenstein"
+msgstr ""
+
+#: ../picard/const.py:248
+msgid "Latvia"
+msgstr ""
+
+#: ../picard/const.py:249
+msgid "Tonga"
+msgstr ""
+
+#: ../picard/const.py:250
+msgid "Lithuania"
+msgstr ""
+
+#: ../picard/const.py:251
+msgid "Luxembourg"
+msgstr ""
+
+#: ../picard/const.py:252
+msgid "Liberia"
+msgstr ""
+
+#: ../picard/const.py:253
+#, fuzzy
+msgid "Lesotho"
+msgstr "Length"
+
+#: ../picard/const.py:254
+msgid "Thailand"
+msgstr ""
+
+#: ../picard/const.py:255
+msgid "French Southern Territories"
+msgstr ""
+
+#: ../picard/const.py:256
+#, fuzzy
+msgid "Togo"
+msgstr "&Tools"
+
+#: ../picard/const.py:257
+msgid "Chad"
+msgstr ""
+
+#: ../picard/const.py:258
+msgid "Turks and Caicos Islands"
+msgstr ""
+
+#: ../picard/const.py:259
+msgid "Libyan Arab Jamahiriya"
+msgstr ""
+
+#: ../picard/const.py:260
+msgid "Vatican City State (Holy See)"
+msgstr ""
+
+#: ../picard/const.py:261
+msgid "Saint Vincent and The Grenadines"
+msgstr ""
+
+#: ../picard/const.py:262
+msgid "United Arab Emirates"
+msgstr ""
+
+#: ../picard/const.py:263
+msgid "Andorra"
+msgstr ""
+
+#: ../picard/const.py:264
+msgid "Antigua and Barbuda"
+msgstr ""
+
+#: ../picard/const.py:265
+msgid "Afghanistan"
+msgstr ""
+
+#: ../picard/const.py:266
+msgid "Anguilla"
+msgstr ""
+
+#: ../picard/const.py:267
+msgid "Virgin Islands (U.S.)"
+msgstr ""
+
+#: ../picard/const.py:268
+msgid "Iceland"
+msgstr ""
+
+#: ../picard/const.py:269
+msgid "Iran (Islamic Republic of)"
+msgstr ""
+
+#: ../picard/const.py:270
+msgid "Armenia"
+msgstr ""
+
+#: ../picard/const.py:271
+msgid "Albania"
+msgstr ""
+
+#: ../picard/const.py:272
+msgid "Angola"
+msgstr ""
+
+#: ../picard/const.py:273
+msgid "Netherlands Antilles"
+msgstr ""
+
+#: ../picard/const.py:274
+msgid "Antarctica"
+msgstr ""
+
+#: ../picard/const.py:275
+msgid "American Samoa"
+msgstr ""
+
+#: ../picard/const.py:276
+msgid "Argentina"
+msgstr ""
+
+#: ../picard/const.py:277
+msgid "Australia"
+msgstr ""
+
+#: ../picard/const.py:278
+#, fuzzy
+msgid "Austria"
+msgstr "Author"
+
+#: ../picard/const.py:279
+msgid "Aruba"
+msgstr ""
+
+#: ../picard/const.py:280
+#, fuzzy
+msgid "India"
+msgstr "Media"
+
+#: ../picard/const.py:281
+msgid "Tanzania, United Republic of"
+msgstr ""
+
+#: ../picard/const.py:282
+msgid "Azerbaijan"
+msgstr ""
+
+#: ../picard/const.py:283
+msgid "Ireland"
+msgstr ""
+
+#: ../picard/const.py:284
+msgid "Indonesia"
+msgstr ""
+
+#: ../picard/const.py:285
+msgid "Ukraine"
+msgstr ""
+
+#: ../picard/const.py:286
+msgid "Qatar"
+msgstr ""
+
+#: ../picard/const.py:287
+msgid "Mozambique"
+msgstr ""
+
+#: ../picard/const.py:288
+msgid "Bosnia and Herzegovina"
+msgstr ""
+
+#: ../picard/const.py:289
+msgid "Congo, The Democratic Republic of the"
+msgstr ""
+
+#: ../picard/const.py:290
+msgid "Serbia and Montenegro"
+msgstr ""
+
+#: ../picard/const.py:291
+msgid "Croatia"
+msgstr ""
+
+#: ../picard/const.py:292
+msgid "Korea (North), Democratic People's Republic of"
+msgstr ""
+
+#: ../picard/const.py:293
+msgid "Korea (South), Republic of"
+msgstr ""
+
+#: ../picard/const.py:294
+msgid "Slovakia"
+msgstr ""
+
+#: ../picard/const.py:295
+msgid "Soviet Union (historical, 1922-1991)"
+msgstr ""
+
+#: ../picard/const.py:296
+msgid "East Timor"
+msgstr ""
+
+#: ../picard/const.py:297
+msgid "Czechoslovakia (historical, 1918-1992)"
+msgstr ""
+
+#: ../picard/const.py:298
+msgid "Europe"
+msgstr ""
+
+#: ../picard/const.py:299
+msgid "East Germany (historical, 1949-1990)"
+msgstr ""
+
+#: ../picard/const.py:300
+msgid "[Unknown Country]"
+msgstr ""
+
+#: ../picard/const.py:301
+msgid "[Worldwide]"
+msgstr ""
+
+#: ../picard/const.py:302
+msgid "Yugoslavia (historical, 1918-1992)"
+msgstr ""
+
+#: ../picard/const.py:307
+msgid "Catalan"
+msgstr ""
+
+#: ../picard/const.py:308
+msgid "Czech"
+msgstr ""
+
+#: ../picard/const.py:309
+msgid "Welsh"
+msgstr ""
+
+#: ../picard/const.py:310
+#, fuzzy
+msgid "Danish"
+msgstr "Details"
+
+#: ../picard/const.py:311
+#, fuzzy
+msgid "German"
+msgstr "General"
+
+#: ../picard/const.py:312
+msgid "English"
+msgstr ""
+
+#: ../picard/const.py:313
+msgid "English (Canada)"
+msgstr ""
+
+#: ../picard/const.py:314
+msgid "English (UK)"
+msgstr ""
+
+#: ../picard/const.py:315
+msgid "Spanish"
+msgstr ""
+
+#: ../picard/const.py:316
+#, fuzzy
+msgid "Persian"
+msgstr "Version"
+
+#: ../picard/const.py:317
+msgid "Finnish"
+msgstr ""
+
+#: ../picard/const.py:318
+msgid "French"
+msgstr ""
+
+#: ../picard/const.py:319
+msgid "Frisian"
+msgstr ""
+
+#: ../picard/const.py:320
+msgid "Hebrew"
+msgstr ""
+
+#: ../picard/const.py:321
+msgid "Hungarian"
+msgstr ""
+
+#: ../picard/const.py:322
+msgid "Islandic"
+msgstr ""
+
+#: ../picard/const.py:323
+msgid "Italian"
+msgstr ""
+
+#: ../picard/const.py:324
+msgid "Kannada"
+msgstr ""
+
+#: ../picard/const.py:325
+msgid "Korean"
+msgstr ""
+
+#: ../picard/const.py:326
+msgid "Lithuanian"
+msgstr ""
+
+#: ../picard/const.py:327
+msgid "Norwegian Bokmal"
+msgstr ""
+
+#: ../picard/const.py:328
+msgid "Dutch"
+msgstr ""
+
+#: ../picard/const.py:329
+#, fuzzy
+msgid "Polish"
+msgstr "Plugins"
+
+#: ../picard/const.py:330
+msgid "Portuguese"
+msgstr ""
+
+#: ../picard/const.py:331
+msgid "Brazilian Portuguese"
+msgstr ""
+
+#: ../picard/const.py:332
+msgid "Romanian"
+msgstr ""
+
+#: ../picard/const.py:333
+msgid "Russian"
+msgstr ""
+
+#: ../picard/const.py:334
+#, fuzzy
+msgid "Scots"
+msgstr "Score"
+
+#: ../picard/const.py:335
+msgid "Slovak"
+msgstr ""
+
+#: ../picard/const.py:336
+msgid "Slovenian"
+msgstr ""
+
+#: ../picard/const.py:337
+msgid "Swedish"
+msgstr ""
+
+#: ../picard/const.py:338
+#, fuzzy
+msgid "Chinese"
+msgstr "Channels:"
+
+#: ../picard/file.py:475
+#, python-format
+msgid "No matching tracks for file %s"
+msgstr "No matching tracks for file %s"
+
+#: ../picard/file.py:492
+#, fuzzy, python-format
+msgid "No matching tracks above the threshold for file %s"
+msgstr "No matching tracks for file %s"
+
+#: ../picard/file.py:495
+#, python-format
+msgid "File %s identified!"
+msgstr "File %s identified!"
+
+#: ../picard/file.py:506
+#, python-format
+msgid "Looking up the PUID for file %s..."
+msgstr "Looking up the PUID for file %s..."
+
+#: ../picard/file.py:511
+#, python-format
+msgid "Looking up the metadata for file %s..."
+msgstr "Looking up the metadata for file %s..."
+
+#: ../picard/puidmanager.py:58
+msgid "Submitting PUIDs..."
+msgstr "Submitting PUIDs..."
+
+#: ../picard/puidmanager.py:64
+#, python-format
+msgid "PUIDs submission failed: %s"
+msgstr "PUIDs submission failed: %s"
+
+#: ../picard/puidmanager.py:66
+msgid "PUIDs successfully submitted!"
+msgstr "PUIDs successfully submitted!"
+
+#: ../picard/playlist.py:31
+msgid "M3U Playlist (*.m3u)"
+msgstr "M3U Playlist (*.m3u)"
+
+#: ../picard/playlist.py:32
+msgid "PLS Playlist (*.pls)"
+msgstr "PLS Playlist (*.pls)"
+
+#: ../picard/playlist.py:33
+msgid "XSPF Playlist (*.xspf)"
+msgstr "XSPF Playlist (*.xspf)"
+
+#: ../picard/tagger.py:476
 msgid "CD Lookup Error"
 msgstr "CD Lookup Error"
 
-#: ../picard/tagger.py:473
+#: ../picard/tagger.py:477
 #, python-format
 msgid ""
 "Error while reading CD:\n"
@@ -46,125 +1305,175 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../picard/ui/passworddialog.py:38
+#: ../picard/tagger.py:503
 #, python-format
-msgid ""
-"The server %s requires you to login. Please enter your username and password."
-msgstr ""
+msgid "Couldn't find PUID for file %s"
+msgstr "Couldn't find PUID for file %s"
 
-#: ../picard/ui/ui_options_script.py:52
-msgid "Tagger Script"
-msgstr "Tagger Script"
+#: ../picard/musicdns/__init__.py:98
+#, python-format
+msgid "Looking up the fingerprint for file %s..."
+msgstr "Looking up the fingerprint for file %s..."
+
+#: ../picard/musicdns/__init__.py:117
+#, python-format
+msgid "Creating fingerprint for file %s..."
+msgstr "Creating fingerprint for file %s..."
 
 #: ../picard/ui/cdlookup.py:31
 msgid "Score"
 msgstr "Score"
 
 #: ../picard/ui/cdlookup.py:31
+#: ../picard/ui/itemviews.py:82
+#: ../picard/util/tags.py:23
 msgid "Title"
 msgstr "Title"
 
-#: ../picard/ui/cdlookup.py:31 ../picard/ui/mainwindow.py:436
+#: ../picard/ui/cdlookup.py:31
+#: ../picard/ui/itemviews.py:84
+#: ../picard/ui/mainwindow.py:436
+#: ../picard/util/tags.py:22
 msgid "Artist"
 msgstr "Artist"
 
-#: ../picard/ui/ui_metadata.py:121
-msgid "Lookup"
-msgstr "Lookup"
+#: ../picard/ui/coverartbox.py:47
+#: ../picard/ui/options/cover.py:29
+msgid "Cover Art"
+msgstr "Cover Art"
 
-#: ../picard/ui/ui_metadata.py:122
-msgid "Title:"
-msgstr "Title:"
+#: ../picard/ui/coverartbox.py:95
+msgid "Buy the album on Amazon"
+msgstr "Buy the album on Amazon"
 
-#: ../picard/ui/ui_metadata.py:123
-msgid "Date:"
-msgstr "Date:"
+#: ../picard/ui/filebrowser.py:38
+#: ../picard/ui/mainwindow.py:302
+msgid "&Refresh"
+msgstr "&Refresh"
 
-#: ../picard/ui/ui_metadata.py:124
-msgid "Artist:"
-msgstr "Artist:"
+#: ../picard/ui/filebrowser.py:41
+#, fuzzy
+msgid "&Move Tagged Files Here"
+msgstr "&Move Files"
 
-#: ../picard/ui/ui_metadata.py:125
-msgid "Track:"
-msgstr "Track:"
+#: ../picard/ui/filebrowser.py:44
+msgid "Show &Hidden Files"
+msgstr ""
 
-#: ../picard/ui/ui_metadata.py:126
-msgid "0000-00-00; "
-msgstr "0000-00-00; "
+#: ../picard/ui/itemviews.py:83
+msgid "Length"
+msgstr "Length"
 
-#: ../picard/ui/ui_metadata.py:127 ../picard/ui/tageditor.py:225
-#: ../picard/ui/multitageditor.py:181
+#: ../picard/ui/itemviews.py:327
+msgid "&Releases"
+msgstr "&Releases"
+
+#: ../picard/ui/itemviews.py:353
+msgid "&Plugins"
+msgstr "&Plugins"
+
+#: ../picard/ui/itemviews.py:523
+msgid "Clusters"
+msgstr "Clusters"
+
+#: ../picard/ui/logview.py:29
+msgid "Log"
+msgstr "Log"
+
+#: ../picard/ui/puidsubmit.py:31
+#: ../picard/ui/options/plugins.py:80
+msgid "File"
+msgstr "File"
+
+#: ../picard/ui/puidsubmit.py:31
+msgid "PUID"
+msgstr "PUID"
+
+#: ../picard/ui/puidsubmit.py:31
+#: ../picard/ui/mainwindow.py:437
+msgid "Track"
+msgstr "Track"
+
+#: ../picard/ui/puidsubmit.py:31
+msgid "Release"
+msgstr "Release"
+
+#: ../picard/ui/puidsubmit.py:31
+msgid "Release ID"
+msgstr "Release ID"
+
+#: ../picard/ui/tageditor.py:65
+#: ../picard/ui/ui_options_plugins.py:62
+msgid "Details"
+msgstr "Details"
+
+#: ../picard/ui/tageditor.py:70
+#: ../picard/ui/tageditor.py:241
+#, python-format
+msgid "%d file"
+msgid_plural "%d files"
+msgstr[0] "%d file"
+msgstr[1] "%d files"
+
+#: ../picard/ui/tageditor.py:124
+#, python-format
+msgid "(different across %d file)"
+msgid_plural "(different across %d files)"
+msgstr[0] "(different across %d file)"
+msgstr[1] "(different across %d files)"
+
+#: ../picard/ui/tageditor.py:127
+#, python-format
+msgid "(missing from %d file)"
+msgid_plural "(missing from %d files)"
+msgstr[0] "(missing from %d file)"
+msgstr[1] "(missing from %d files)"
+
+#: ../picard/ui/tageditor.py:210
+msgid "Filename:"
+msgstr "Filename:"
+
+#: ../picard/ui/tageditor.py:212
+msgid "Format:"
+msgstr "Format:"
+
+#: ../picard/ui/tageditor.py:221
+msgid "Size:"
+msgstr "Size:"
+
+#: ../picard/ui/tageditor.py:225
+#: ../picard/ui/ui_metadata.py:127
 msgid "Length:"
 msgstr "Length:"
 
-#: ../picard/ui/ui_metadata.py:128
-msgid "Album:"
-msgstr "Album:"
+#: ../picard/ui/tageditor.py:227
+msgid "Bitrate:"
+msgstr "Bitrate:"
 
-#: ../picard/ui/ui_passworddialog.py:78
-msgid "Authentication required"
-msgstr ""
+#: ../picard/ui/tageditor.py:229
+msgid "Sample rate:"
+msgstr "Sample rate:"
 
-#: ../picard/ui/ui_passworddialog.py:79 ../picard/ui/ui_options_proxy.py:83
-#: ../picard/ui/ui_options_general.py:113
-msgid "Username:"
-msgstr "Username:"
+#: ../picard/ui/tageditor.py:231
+msgid "Bits per sample:"
+msgstr "Bits per sample:"
 
-#: ../picard/ui/ui_passworddialog.py:80 ../picard/ui/ui_options_proxy.py:82
-#: ../picard/ui/ui_options_general.py:112
-msgid "Password:"
-msgstr "Password:"
+#: ../picard/ui/tageditor.py:234
+msgid "Mono"
+msgstr "Mono"
 
-#: ../picard/ui/ui_passworddialog.py:81
-msgid "Save username and password"
-msgstr ""
+#: ../picard/ui/tageditor.py:235
+msgid "Stereo"
+msgstr "Stereo"
 
-#: ../picard/ui/ui_options_folksonomy.py:114
-#: ../picard/ui/ui_options_folksonomy_tags.py:114
-msgid "Folksonomy Tags"
-msgstr ""
+#: ../picard/ui/tageditor.py:237
+msgid "Channels:"
+msgstr "Channels:"
 
-#: ../picard/ui/ui_options_folksonomy.py:115
-#: ../picard/ui/ui_options_folksonomy_tags.py:115
-msgid "Ignore tags:"
-msgstr ""
-
-#: ../picard/ui/ui_options_folksonomy.py:116
-#: ../picard/ui/ui_options_folksonomy_tags.py:116
-msgid "Minimal tag usage:"
-msgstr ""
-
-#: ../picard/ui/ui_options_folksonomy.py:117
-#: ../picard/ui/ui_options_folksonomy_tags.py:117
-#: ../picard/ui/ui_options_matching.py:107
-#: ../picard/ui/ui_options_matching.py:108
-#: ../picard/ui/ui_options_matching.py:109
-#: ../picard/ui/ui_options_matching.py:113
-msgid " %"
-msgstr " %"
-
-#: ../picard/ui/ui_options_folksonomy.py:118
-msgid "Maximum number of tags:"
-msgstr ""
-
-#: ../picard/ui/ui_options_folksonomy.py:119
-#: ../picard/ui/ui_options_folksonomy_tags.py:119
-msgid "Join multiple tags with:"
-msgstr ""
-
-#: ../picard/ui/ui_options_folksonomy.py:120
-#: ../picard/ui/ui_options_folksonomy_tags.py:120
-msgid " / "
-msgstr ""
-
-#: ../picard/ui/ui_options_folksonomy.py:121
-#: ../picard/ui/ui_options_folksonomy_tags.py:121
-msgid ", "
-msgstr ""
-
-#: ../picard/ui/ui_options_folksonomy_tags.py:118
-msgid "Maximal number of tags:"
-msgstr ""
+#: ../picard/ui/tagsfromfilenames.py:52
+#: ../picard/ui/tagsfromfilenames.py:96
+msgid "File Name"
+msgstr "File Name"
 
 #: ../picard/ui/mainwindow.py:64
 msgid "MusicBrainz Picard"
@@ -299,7 +1608,8 @@ msgstr "Search"
 msgid "&CD Lookup..."
 msgstr ""
 
-#: ../picard/ui/mainwindow.py:272 ../picard/ui/mainwindow.py:273
+#: ../picard/ui/mainwindow.py:272
+#: ../picard/ui/mainwindow.py:273
 msgid "Lookup CD"
 msgstr "Lookup CD"
 
@@ -330,7 +1640,8 @@ msgstr "Ctrl+U"
 msgid "&Lookup"
 msgstr ""
 
-#: ../picard/ui/mainwindow.py:291 ../picard/ui/mainwindow.py:292
+#: ../picard/ui/mainwindow.py:291
+#: ../picard/ui/mainwindow.py:292
 msgid "Lookup metadata"
 msgstr "Lookup metadata"
 
@@ -343,10 +1654,6 @@ msgstr "Ctrl+L"
 msgid "&Details..."
 msgstr "&Details..."
 
-#: ../picard/ui/mainwindow.py:302 ../picard/ui/filebrowser.py:38
-msgid "&Refresh"
-msgstr "&Refresh"
-
 #: ../picard/ui/mainwindow.py:305
 msgid "Generate &Playlist..."
 msgstr "Generate &Playlist..."
@@ -392,6 +1699,7 @@ msgid "&Tools"
 msgstr "&Tools"
 
 #: ../picard/ui/mainwindow.py:384
+#: ../picard/ui/util.py:33
 msgid "&Help"
 msgstr "&Help"
 
@@ -404,13 +1712,10 @@ msgid "&Search Bar"
 msgstr "&Search Bar"
 
 #: ../picard/ui/mainwindow.py:435
+#: ../picard/util/tags.py:21
 msgid "Album"
 msgstr "Album"
 
-#: ../picard/ui/mainwindow.py:437 ../picard/ui/puidsubmit.py:31
-msgid "Track"
-msgstr "Track"
-
 #: ../picard/ui/mainwindow.py:476
 msgid "All Supported Formats"
 msgstr "All Supported Formats"
@@ -425,37 +1730,289 @@ msgstr "Saving playlist %s..."
 msgid "Playlist %s saved"
 msgstr "Playlist %s saved"
 
-#: ../picard/ui/mainwindow.py:638 ../picard/ui/mainwindow.py:647
+#: ../picard/ui/mainwindow.py:638
+#: ../picard/ui/mainwindow.py:647
 #, python-format
 msgid " (Error: %s)"
 msgstr " (Error: %s)"
 
+#: ../picard/ui/ui_tageditor.py:115
+#: ../picard/ui/ui_options_plugins.py:59
+#: ../picard/ui/options/plugins.py:76
+msgid "Name"
+msgstr "Name"
+
+#: ../picard/ui/ui_tageditor.py:116
+msgid "Value"
+msgstr "Value"
+
+#: ../picard/ui/ui_tageditor.py:117
+msgid "&Add..."
+msgstr "&Add..."
+
+#: ../picard/ui/ui_tageditor.py:118
+msgid "&Edit..."
+msgstr "&Edit..."
+
+#: ../picard/ui/ui_tageditor.py:119
+msgid "&Delete"
+msgstr "&Delete"
+
+#: ../picard/ui/ui_tageditor.py:120
+msgid "&Metadata"
+msgstr "&Metadata"
+
+#: ../picard/ui/ui_tageditor.py:121
+msgid "A&rtwork"
+msgstr "A&rtwork"
+
+#: ../picard/ui/ui_tageditor.py:122
+msgid "&Info"
+msgstr "&Info"
+
+#: ../picard/ui/passworddialog.py:38
+#, python-format
+msgid "The server %s requires you to login. Please enter your username and password."
+msgstr ""
+
+#: ../picard/ui/ui_cdlookup.py:60
+#: ../picard/ui/ui_options_cdlookup.py:47
+#: ../picard/ui/ui_options_cdlookup_win32.py:56
+#: ../picard/ui/options/cdlookup.py:35
+msgid "CD Lookup"
+msgstr "CD Lookup"
+
+#: ../picard/ui/ui_cdlookup.py:61
+msgid "The following releases on MusicBrainz match the CD:"
+msgstr "The following releases on MusicBrainz match the CD:"
+
+#: ../picard/ui/ui_cdlookup.py:62
+#: ../picard/ui/ui_puidsubmit.py:53
+msgid "OK"
+msgstr "OK"
+
+#: ../picard/ui/ui_cdlookup.py:63
+msgid "    Lookup manually    "
+msgstr "    Lookup manually    "
+
+#: ../picard/ui/ui_cdlookup.py:64
+#: ../picard/ui/ui_puidsubmit.py:54
+msgid "Cancel"
+msgstr "Cancel"
+
+#: ../picard/ui/ui_passworddialog.py:78
+msgid "Authentication required"
+msgstr ""
+
+#: ../picard/ui/ui_passworddialog.py:79
+#: ../picard/ui/ui_options_general.py:113
+#: ../picard/ui/ui_options_proxy.py:83
+msgid "Username:"
+msgstr "Username:"
+
+#: ../picard/ui/ui_passworddialog.py:80
+#: ../picard/ui/ui_options_general.py:112
+#: ../picard/ui/ui_options_proxy.py:82
+msgid "Password:"
+msgstr "Password:"
+
+#: ../picard/ui/ui_passworddialog.py:81
+msgid "Save username and password"
+msgstr ""
+
 #: ../picard/ui/ui_edittagdialog.py:44
 msgid "Edit Tag"
 msgstr "Edit Tag"
 
-#: ../picard/ui/ui_options_proxy.py:81
-msgid "Web Proxy"
-msgstr "Web Proxy"
+#: ../picard/ui/ui_metadata.py:121
+msgid "Lookup"
+msgstr "Lookup"
 
-#: ../picard/ui/ui_options_proxy.py:84 ../picard/ui/ui_options_general.py:109
-msgid "Port:"
-msgstr "Port:"
+#: ../picard/ui/ui_metadata.py:122
+msgid "Title:"
+msgstr "Title:"
 
-#: ../picard/ui/ui_options_proxy.py:85 ../picard/ui/ui_options_general.py:110
-msgid "Server address:"
-msgstr "Server address:"
+#: ../picard/ui/ui_metadata.py:123
+msgid "Date:"
+msgstr "Date:"
 
-#: ../picard/ui/ui_tagsfromfilenames.py:56
-msgid "Convert File Names to Tags"
-msgstr "Convert File Names to Tags"
+#: ../picard/ui/ui_metadata.py:124
+msgid "Artist:"
+msgstr "Artist:"
 
-#: ../picard/ui/ui_tagsfromfilenames.py:57
-msgid "Replace underscores with spaces"
-msgstr "Replace underscores with spaces"
+#: ../picard/ui/ui_metadata.py:125
+msgid "Track:"
+msgstr "Track:"
+
+#: ../picard/ui/ui_metadata.py:126
+msgid "0000-00-00; "
+msgstr "0000-00-00; "
+
+#: ../picard/ui/ui_metadata.py:128
+msgid "Album:"
+msgstr "Album:"
+
+#: ../picard/ui/ui_options.py:42
+msgid "Options"
+msgstr "Options"
+
+#: ../picard/ui/ui_options_cdlookup.py:48
+msgid "CD-ROM device to use for lookups:"
+msgstr "CD-ROM device to use for lookups:"
+
+#: ../picard/ui/ui_options_cdlookup_win32.py:57
+msgid "Default CD-ROM drive to use for lookups:"
+msgstr "Default CD-ROM drive to use for lookups:"
+
+#: ../picard/ui/ui_options_cover.py:56
+msgid "Location"
+msgstr "Location"
+
+#: ../picard/ui/ui_options_cover.py:57
+msgid "Embed cover images into tags"
+msgstr "Embed cover images into tags"
+
+#: ../picard/ui/ui_options_cover.py:58
+msgid "Save cover images as separate files"
+msgstr "Save cover images as separate files"
+
+#: ../picard/ui/ui_options_cover.py:59
+msgid "Overwrite the file if it already exists"
+msgstr "Overwrite the file if it already exists"
+
+#: ../picard/ui/util.py:31
+msgid "&Ok"
+msgstr "&Ok"
+
+#: ../picard/ui/util.py:32
+msgid "&Cancel"
+msgstr "&Cancel"
+
+#: ../picard/ui/ui_puidsubmit.py:52
+msgid "Submit PUIDs"
+msgstr "Submit PUIDs"
+
+#: ../picard/ui/ui_options_folksonomy.py:114
+#: ../picard/ui/options/folksonomy.py:29
+msgid "Folksonomy Tags"
+msgstr ""
+
+#: ../picard/ui/ui_options_folksonomy.py:115
+msgid "Ignore tags:"
+msgstr ""
+
+#: ../picard/ui/ui_options_folksonomy.py:116
+msgid "Minimal tag usage:"
+msgstr ""
+
+#: ../picard/ui/ui_options_folksonomy.py:117
+#: ../picard/ui/ui_options_matching.py:107
+#: ../picard/ui/ui_options_matching.py:108
+#: ../picard/ui/ui_options_matching.py:109
+#: ../picard/ui/ui_options_matching.py:113
+msgid " %"
+msgstr " %"
+
+#: ../picard/ui/ui_options_folksonomy.py:118
+msgid "Maximum number of tags:"
+msgstr ""
+
+#: ../picard/ui/ui_options_folksonomy.py:119
+msgid "Join multiple tags with:"
+msgstr ""
+
+#: ../picard/ui/ui_options_folksonomy.py:120
+msgid " / "
+msgstr ""
+
+#: ../picard/ui/ui_options_folksonomy.py:121
+msgid ", "
+msgstr ""
+
+#: ../picard/ui/ui_options_interface.py:50
+msgid "Miscellaneous"
+msgstr ""
+
+#: ../picard/ui/ui_options_interface.py:51
+msgid "Show text labels under icons"
+msgstr "Show text labels under icons"
+
+#: ../picard/ui/ui_options_interface.py:52
+msgid "Allow selection of multiple directories"
+msgstr ""
+
+#: ../picard/ui/ui_options_interface.py:53
+msgid "Use advanced query syntax"
+msgstr ""
+
+#: ../picard/ui/ui_options_interface.py:54
+#, fuzzy
+msgid "User interface language:"
+msgstr "User Interface"
+
+#: ../picard/ui/ui_options_naming.py:165
+msgid "Rename Files"
+msgstr "Rename Files"
+
+#: ../picard/ui/ui_options_naming.py:166
+msgid "Replace Windows-incompatible characters"
+msgstr "Replace Windows-incompatible characters"
+
+#: ../picard/ui/ui_options_naming.py:167
+msgid "Replace non-ASCII characters"
+msgstr "Replace non-ASCII characters"
+
+#: ../picard/ui/ui_options_naming.py:168
+#: ../picard/ui/ui_options_naming.py:169
+#: ../picard/ui/ui_options_metadata.py:109
+#: ../picard/ui/ui_options_metadata.py:110
+msgid "Default"
+msgstr "Default"
+
+#: ../picard/ui/ui_options_naming.py:170
+#: ../picard/ui/options/naming.py:90
+msgid "Multiple artist file naming format:"
+msgstr "Multiple artist file naming format:"
+
+#: ../picard/ui/ui_options_naming.py:171
+#: ../picard/ui/options/naming.py:86
+msgid "File naming format:"
+msgstr "File naming format:"
+
+#: ../picard/ui/ui_options_naming.py:172
+msgid "Move Files"
+msgstr "Move Files"
+
+#: ../picard/ui/ui_options_naming.py:173
+msgid "Move tagged files to this directory:"
+msgstr "Move tagged files to this directory:"
+
+#: ../picard/ui/ui_options_naming.py:174
+msgid "Browse..."
+msgstr "Browse..."
+
+#: ../picard/ui/ui_options_naming.py:175
+msgid "Move additional files:"
+msgstr "Move additional files:"
+
+#: ../picard/ui/ui_options_naming.py:176
+msgid "Delete empty directories"
+msgstr "Delete empty directories"
+
+#: ../picard/ui/ui_options_naming.py:177
+msgid "Example"
+msgstr "Example"
+
+#: ../picard/ui/ui_options_naming.py:178
+msgid "File name:"
+msgstr "File name:"
+
+#: ../picard/ui/ui_options_naming.py:179
+msgid "Multiple artist file name:"
+msgstr "Multiple artist file name:"
 
-#: ../picard/ui/ui_tagsfromfilenames.py:58
 #: ../picard/ui/ui_options_naming.py:180
+#: ../picard/ui/ui_tagsfromfilenames.py:58
 msgid "&Preview"
 msgstr "&Preview"
 
@@ -463,11 +2020,22 @@ msgstr "&Preview"
 msgid "MusicBrainz Server"
 msgstr "MusicBrainz Server"
 
+#: ../picard/ui/ui_options_general.py:109
+#: ../picard/ui/ui_options_proxy.py:84
+msgid "Port:"
+msgstr "Port:"
+
+#: ../picard/ui/ui_options_general.py:110
+#: ../picard/ui/ui_options_proxy.py:85
+msgid "Server address:"
+msgstr "Server address:"
+
 #: ../picard/ui/ui_options_general.py:111
 msgid "Account Information"
 msgstr "Account Information"
 
 #: ../picard/ui/ui_options_general.py:114
+#: ../picard/ui/options/general.py:29
 msgid "General"
 msgstr "General"
 
@@ -475,34 +2043,6 @@ msgstr "General"
 msgid "Automatically scan all new files"
 msgstr "Automatically scan all new files"
 
-#: ../picard/ui/ui_options_interface.py:46
-msgid "Miscellaneous"
-msgstr ""
-
-#: ../picard/ui/ui_options_interface.py:47
-msgid "Show text labels under icons"
-msgstr "Show text labels under icons"
-
-#: ../picard/ui/ui_options_interface.py:48
-msgid "Allow selection of multiple directories"
-msgstr ""
-
-#: ../picard/ui/ui_options_interface.py:49
-msgid "Use advanced query syntax"
-msgstr ""
-
-#: ../picard/ui/itemviews.py:327
-msgid "&Releases"
-msgstr "&Releases"
-
-#: ../picard/ui/itemviews.py:353
-msgid "&Plugins"
-msgstr "&Plugins"
-
-#: ../picard/ui/itemviews.py:523
-msgid "Clusters"
-msgstr "Clusters"
-
 #: ../picard/ui/ui_options_matching.py:105
 msgid "Thresholds"
 msgstr "Thresholds"
@@ -523,6 +2063,68 @@ msgstr "Minimal similarity for cluster lookups:"
 msgid "Minimal similarity for PUID lookups:"
 msgstr "Minimal similarity for PUID lookups:"
 
+#: ../picard/ui/ui_options_metadata.py:100
+#: ../picard/ui/options/metadata.py:31
+msgid "Metadata"
+msgstr "Metadata"
+
+#: ../picard/ui/ui_options_metadata.py:101
+msgid "Translate foreign artist names to English where possible"
+msgstr "Translate foreign artist names to English where possible"
+
+#: ../picard/ui/ui_options_metadata.py:102
+msgid "Use release relationships"
+msgstr "Use release relationships"
+
+#: ../picard/ui/ui_options_metadata.py:103
+msgid "Use track relationships"
+msgstr "Use track relationships"
+
+#: ../picard/ui/ui_options_metadata.py:104
+msgid "Use folksonomy tags as genre"
+msgstr ""
+
+#: ../picard/ui/ui_options_metadata.py:105
+#, fuzzy
+msgid "Preferred release country:"
+msgstr "Release Type"
+
+#: ../picard/ui/ui_options_metadata.py:106
+msgid "Custom Fields"
+msgstr "Custom Fields"
+
+#: ../picard/ui/ui_options_metadata.py:107
+msgid "Various artists:"
+msgstr "Various artists:"
+
+#: ../picard/ui/ui_options_metadata.py:108
+msgid "Non-album tracks:"
+msgstr "Non-album tracks:"
+
+#: ../picard/ui/ui_options_plugins.py:58
+#: ../picard/ui/options/plugins.py:30
+msgid "Plugins"
+msgstr "Plugins"
+
+#: ../picard/ui/ui_options_plugins.py:60
+#: ../picard/ui/options/plugins.py:79
+msgid "Author"
+msgstr "Author"
+
+#: ../picard/ui/ui_options_plugins.py:61
+#: ../picard/util/tags.py:36
+msgid "Version"
+msgstr "Version"
+
+#: ../picard/ui/ui_options_proxy.py:81
+#: ../picard/ui/options/proxy.py:28
+msgid "Web Proxy"
+msgstr "Web Proxy"
+
+#: ../picard/ui/ui_options_script.py:52
+msgid "Tagger Script"
+msgstr "Tagger Script"
+
 #: ../picard/ui/ui_options_tags.py:105
 msgid "Common"
 msgstr "Common"
@@ -575,324 +2177,23 @@ msgstr "APE"
 msgid "Remove APEv2 tags from MP3 files"
 msgstr "Remove APEv2 tags from MP3 files"
 
-#: ../picard/ui/ui_options_cdlookup_win32.py:56 ../picard/ui/ui_cdlookup.py:60
-#: ../picard/ui/ui_options_cdlookup.py:47
-msgid "CD Lookup"
-msgstr "CD Lookup"
+#: ../picard/ui/ui_tagsfromfilenames.py:56
+msgid "Convert File Names to Tags"
+msgstr "Convert File Names to Tags"
 
-#: ../picard/ui/ui_options_cdlookup_win32.py:57
-msgid "Default CD-ROM drive to use for lookups:"
-msgstr "Default CD-ROM drive to use for lookups:"
+#: ../picard/ui/ui_tagsfromfilenames.py:57
+msgid "Replace underscores with spaces"
+msgstr "Replace underscores with spaces"
 
-#: ../picard/ui/tageditor.py:65 ../picard/ui/ui_options_plugins.py:62
-#: ../picard/ui/multitageditor.py:37
-msgid "Details"
-msgstr "Details"
-
-#: ../picard/ui/tageditor.py:70 ../picard/ui/tageditor.py:241
-#: ../picard/ui/multitageditor.py:42 ../picard/ui/multitageditor.py:197
-#, python-format
-msgid "%d file"
-msgid_plural "%d files"
-msgstr[0] "%d file"
-msgstr[1] "%d files"
-
-#: ../picard/ui/tageditor.py:124 ../picard/ui/multitageditor.py:95
-#, python-format
-msgid "(different across %d file)"
-msgid_plural "(different across %d files)"
-msgstr[0] "(different across %d file)"
-msgstr[1] "(different across %d files)"
-
-#: ../picard/ui/tageditor.py:127 ../picard/ui/multitageditor.py:98
-#, python-format
-msgid "(missing from %d file)"
-msgid_plural "(missing from %d files)"
-msgstr[0] "(missing from %d file)"
-msgstr[1] "(missing from %d files)"
-
-#: ../picard/ui/tageditor.py:210 ../picard/ui/multitageditor.py:166
-msgid "Filename:"
-msgstr "Filename:"
-
-#: ../picard/ui/tageditor.py:212 ../picard/ui/multitageditor.py:168
-msgid "Format:"
-msgstr "Format:"
-
-#: ../picard/ui/tageditor.py:221 ../picard/ui/multitageditor.py:177
-msgid "Size:"
-msgstr "Size:"
-
-#: ../picard/ui/tageditor.py:227 ../picard/ui/multitageditor.py:183
-msgid "Bitrate:"
-msgstr "Bitrate:"
-
-#: ../picard/ui/tageditor.py:229 ../picard/ui/multitageditor.py:185
-msgid "Sample rate:"
-msgstr "Sample rate:"
-
-#: ../picard/ui/tageditor.py:231 ../picard/ui/multitageditor.py:187
-msgid "Bits per sample:"
-msgstr "Bits per sample:"
-
-#: ../picard/ui/tageditor.py:234 ../picard/ui/multitageditor.py:190
-msgid "Mono"
-msgstr "Mono"
-
-#: ../picard/ui/tageditor.py:235 ../picard/ui/multitageditor.py:191
-msgid "Stereo"
-msgstr "Stereo"
-
-#: ../picard/ui/tageditor.py:237 ../picard/ui/multitageditor.py:193
-msgid "Channels:"
-msgstr "Channels:"
-
-#: ../picard/ui/ui_tageditor.py:115 ../picard/ui/ui_multitageditor.py:55
-#: ../picard/ui/ui_options_plugins.py:59 ../picard/ui/options/plugins.py:76
-msgid "Name"
-msgstr "Name"
-
-#: ../picard/ui/ui_tageditor.py:116 ../picard/ui/ui_multitageditor.py:56
-msgid "Value"
-msgstr "Value"
-
-#: ../picard/ui/ui_tageditor.py:117 ../picard/ui/ui_multitageditor.py:57
-msgid "&Add..."
-msgstr "&Add..."
-
-#: ../picard/ui/ui_tageditor.py:118
-msgid "&Edit..."
-msgstr "&Edit..."
-
-#: ../picard/ui/ui_tageditor.py:119
-msgid "&Delete"
-msgstr "&Delete"
-
-#: ../picard/ui/ui_tageditor.py:120
-msgid "&Metadata"
-msgstr "&Metadata"
-
-#: ../picard/ui/ui_tageditor.py:121
-msgid "A&rtwork"
-msgstr "A&rtwork"
-
-#: ../picard/ui/ui_tageditor.py:122
-msgid "&Info"
-msgstr "&Info"
-
-#: ../picard/ui/coverartbox.py:47
-msgid "Cover Art"
-msgstr "Cover Art"
-
-#: ../picard/ui/coverartbox.py:95
-msgid "Buy the album on Amazon"
-msgstr "Buy the album on Amazon"
-
-#: ../picard/ui/ui_puidsubmit.py:52
-msgid "Submit PUIDs"
-msgstr "Submit PUIDs"
-
-#: ../picard/ui/ui_puidsubmit.py:53 ../picard/ui/ui_cdlookup.py:62
-msgid "OK"
-msgstr "OK"
-
-#: ../picard/ui/ui_puidsubmit.py:54 ../picard/ui/ui_cdlookup.py:64
-msgid "Cancel"
-msgstr "Cancel"
-
-#: ../picard/ui/puidsubmit.py:31 ../picard/ui/options/plugins.py:80
-msgid "File"
-msgstr "File"
-
-#: ../picard/ui/puidsubmit.py:31
-msgid "PUID"
-msgstr "PUID"
-
-#: ../picard/ui/puidsubmit.py:31
-msgid "Release"
-msgstr "Release"
-
-#: ../picard/ui/puidsubmit.py:31
-msgid "Release ID"
-msgstr "Release ID"
-
-#: ../picard/ui/filebrowser.py:41
-#, fuzzy
-msgid "&Move Tagged Files Here"
-msgstr "&Move Files"
-
-#: ../picard/ui/filebrowser.py:44
-msgid "Show &Hidden Files"
-msgstr ""
-
-#: ../picard/ui/ui_cdlookup.py:61
-msgid "The following releases on MusicBrainz match the CD:"
-msgstr "The following releases on MusicBrainz match the CD:"
-
-#: ../picard/ui/ui_cdlookup.py:63
-msgid "    Lookup manually    "
-msgstr "    Lookup manually    "
-
-#: ../picard/ui/ui_options.py:42
-msgid "Options"
-msgstr "Options"
-
-#: ../picard/ui/tagsfromfilenames.py:52 ../picard/ui/tagsfromfilenames.py:96
-msgid "File Name"
-msgstr "File Name"
-
-#: ../picard/ui/ui_options_cover.py:56
-msgid "Location"
-msgstr "Location"
-
-#: ../picard/ui/ui_options_cover.py:57
-msgid "Embed cover images into tags"
-msgstr "Embed cover images into tags"
-
-#: ../picard/ui/ui_options_cover.py:58
-msgid "Save cover images as separate files"
-msgstr "Save cover images as separate files"
-
-#: ../picard/ui/ui_options_cover.py:59
-msgid "Overwrite the file if it already exists"
-msgstr "Overwrite the file if it already exists"
-
-#: ../picard/ui/ui_options_metadata.py:100
-msgid "Metadata"
-msgstr "Metadata"
-
-#: ../picard/ui/ui_options_metadata.py:101
-msgid "Translate foreign artist names to English where possible"
-msgstr "Translate foreign artist names to English where possible"
-
-#: ../picard/ui/ui_options_metadata.py:102
-msgid "Use release relationships"
-msgstr "Use release relationships"
-
-#: ../picard/ui/ui_options_metadata.py:103
-msgid "Use track relationships"
-msgstr "Use track relationships"
-
-#: ../picard/ui/ui_options_metadata.py:104
-msgid "Use folksonomy tags as genre"
-msgstr ""
-
-#: ../picard/ui/ui_options_metadata.py:105
-#, fuzzy
-msgid "Preferred release country:"
-msgstr "Release Country"
-
-#: ../picard/ui/ui_options_metadata.py:106
-msgid "Custom Fields"
-msgstr "Custom Fields"
-
-#: ../picard/ui/ui_options_metadata.py:107
-msgid "Various artists:"
-msgstr "Various artists:"
-
-#: ../picard/ui/ui_options_metadata.py:108
-msgid "Non-album tracks:"
-msgstr "Non-album tracks:"
-
-#: ../picard/ui/ui_options_metadata.py:109
-#: ../picard/ui/ui_options_metadata.py:110
-#: ../picard/ui/ui_options_naming.py:168 ../picard/ui/ui_options_naming.py:169
-msgid "Default"
-msgstr "Default"
-
-#: ../picard/ui/ui_multitageditor.py:58
-msgid "Delete"
-msgstr "Delete"
-
-#: ../picard/ui/logview.py:29
-msgid "Log"
-msgstr "Log"
-
-#: ../picard/ui/ui_options_plugins.py:58
-msgid "Plugins"
-msgstr "Plugins"
-
-#: ../picard/ui/ui_options_plugins.py:60 ../picard/ui/options/plugins.py:79
-msgid "Author"
-msgstr "Author"
-
-#: ../picard/ui/ui_options_plugins.py:61
-msgid "Version"
-msgstr "Version"
-
-#: ../picard/ui/ui_options_naming.py:165
-msgid "Rename Files"
-msgstr "Rename Files"
-
-#: ../picard/ui/ui_options_naming.py:166
-msgid "Replace Windows-incompatible characters"
-msgstr "Replace Windows-incompatible characters"
-
-#: ../picard/ui/ui_options_naming.py:167
-msgid "Replace non-ASCII characters"
-msgstr "Replace non-ASCII characters"
-
-#: ../picard/ui/ui_options_naming.py:170 ../picard/ui/options/naming.py:90
-msgid "Multiple artist file naming format:"
-msgstr "Multiple artist file naming format:"
-
-#: ../picard/ui/ui_options_naming.py:171 ../picard/ui/options/naming.py:86
-msgid "File naming format:"
-msgstr "File naming format:"
-
-#: ../picard/ui/ui_options_naming.py:172
-msgid "Move Files"
-msgstr "Move Files"
-
-#: ../picard/ui/ui_options_naming.py:173
-msgid "Move tagged files to this directory:"
-msgstr "Move tagged files to this directory:"
-
-#: ../picard/ui/ui_options_naming.py:174
-msgid "Browse..."
-msgstr "Browse..."
-
-#: ../picard/ui/ui_options_naming.py:175
-msgid "Move additional files:"
-msgstr "Move additional files:"
-
-#: ../picard/ui/ui_options_naming.py:176
-msgid "Delete empty directories"
-msgstr "Delete empty directories"
-
-#: ../picard/ui/ui_options_naming.py:177
-msgid "Example"
-msgstr "Example"
-
-#: ../picard/ui/ui_options_naming.py:178
-msgid "File name:"
-msgstr "File name:"
-
-#: ../picard/ui/ui_options_naming.py:179
-msgid "Multiple artist file name:"
-msgstr "Multiple artist file name:"
-
-#: ../picard/ui/ui_options_cdlookup.py:48
-msgid "CD-ROM device to use for lookups:"
-msgstr "CD-ROM device to use for lookups:"
-
-#: ../picard/ui/options/scripting.py:84 ../picard/ui/options/naming.py:86
-#: ../picard/ui/options/naming.py:90 ../picard/ui/options/naming.py:93
-#: ../picard/ui/options/naming.py:95
-msgid "Script Error"
-msgstr "Script Error"
+#: ../picard/ui/options/about.py:29
+msgid "About"
+msgstr "About"
 
 #. Replace this with your name to have it appear in the "About" dialog.
 #: ../picard/ui/options/about.py:48
 msgid "translator-credits"
 msgstr ""
 "Launchpad Contributions:\n"
-"  CloudFX https://launchpad.net/~nick.ellery\n"
-"\n"
-"Launchpad Contributions:\n"
-"  Nick Ellery https://launchpad.net/~nick.ellery\n"
-"\n"
-"Launchpad Contributions:\n"
 "  Nick Ellery https://launchpad.net/~nick.ellery"
 
 #. Replace LANG with language you are translatig to.
@@ -904,31 +2205,61 @@ msgstr ""
 #: ../picard/ui/options/about.py:55
 #, fuzzy, python-format
 msgid ""
-"<p align=\"center\"><span style=\"font-size:15px;font-weight:bold;"
-"\">MusicBrainz Picard</span><br/>\n"
+"<p align=\"center\"><span style=\"font-size:15px;font-weight:bold;\">MusicBrainz Picard</span><br/>\n"
 "Version %(version)s</p>\n"
 "<p align=\"center\"><strong>Supported formats</strong><br/>%(formats)s</p>\n"
 "<p align=\"center\"><strong>Please donate</strong><br/>\n"
-"Thank you for using Picard. Picard relies on the MusicBrainz database, which "
-"is operated by the MetaBrainz Foundation with the help of thousands of "
-"volunteers. If you like this application please consider donating to the "
-"MetaBrainz Foundation to keep the service running.</p>\n"
-"<p align=\"center\"><a href=\"http://metabrainz.org/donate/index.html"
-"\">Donate now!</a></p>\n"
+"Thank you for using Picard. Picard relies on the MusicBrainz database, which is operated by the MetaBrainz Foundation with the help of thousands of volunteers. If you like this application please consider donating to the MetaBrainz Foundation to keep the service running.</p>\n"
+"<p align=\"center\"><a href=\"http://metabrainz.org/donate/index.html\">Donate now!</a></p>\n"
 "<p align=\"center\"><strong>Credits</strong><br/>\n"
-"<small>Copyright © 2004-2008 Robert Kaye, Lukáš Lalinský and others%"
-"(translator-credits)s</small></p>\n"
-"<p align=\"center\"><a href=\"http://musicbrainz.org/doc/PicardTagger"
-"\">http://musicbrainz.org/doc/PicardTagger</a></p>\n"
+"<small>Copyright © 2004-2008 Robert Kaye, Lukáš Lalinský and others%(translator-credits)s</small></p>\n"
+"<p align=\"center\"><a href=\"http://musicbrainz.org/doc/PicardTagger\">http://musicbrainz.org/doc/PicardTagger</a></p>\n"
 msgstr ""
-"<p align=\"center\"><span style=\"font-size:15px;font-weight:bold;"
-"\">MusicBrainz Picard</span><br/>\n"
+"<p align=\"center\"><span style=\"font-size:15px;font-weight:bold;\">MusicBrainz Picard</span><br/>\n"
 "Version %(version)s</p>\n"
 "<p align=\"center\"><strong>Supported formats:</strong> %(formats)s</p>\n"
-"<p align=\"center\"><small>Copyright © 2004-2007 Robert Kaye, Lukáš Lalinský "
-"and others%(translator-credits)s</small></p>\n"
-"<p align=\"center\"><a href=\"http://musicbrainz.org/doc/PicardTagger"
-"\">http://musicbrainz.org/doc/PicardTagger</a></p>\n"
+"<p align=\"center\"><small>Copyright © 2004-2007 Robert Kaye, Lukáš Lalinský and others%(translator-credits)s</small></p>\n"
+"<p align=\"center\"><a href=\"http://musicbrainz.org/doc/PicardTagger\">http://musicbrainz.org/doc/PicardTagger</a></p>\n"
+
+#: ../picard/ui/options/advanced.py:26
+msgid "Advanced"
+msgstr "Advanced"
+
+#: ../picard/ui/options/interface.py:31
+msgid "User Interface"
+msgstr "User Interface"
+
+#: ../picard/ui/options/interface.py:47
+msgid "System default"
+msgstr ""
+
+#: ../picard/ui/options/interface.py:71
+msgid "Language changed"
+msgstr ""
+
+#: ../picard/ui/options/interface.py:71
+msgid "You have changed the interface language. You have to restart Picard in order for the change to take effect."
+msgstr ""
+
+#: ../picard/ui/options/matching.py:29
+msgid "Matching"
+msgstr "Matching"
+
+#: ../picard/ui/options/metadata.py:52
+msgid "None"
+msgstr ""
+
+#: ../picard/ui/options/naming.py:33
+msgid "File Naming"
+msgstr "File Naming"
+
+#: ../picard/ui/options/naming.py:86
+#: ../picard/ui/options/naming.py:90
+#: ../picard/ui/options/naming.py:93
+#: ../picard/ui/options/naming.py:95
+#: ../picard/ui/options/scripting.py:84
+msgid "Script Error"
+msgstr "Script Error"
 
 #: ../picard/ui/options/naming.py:93
 msgid "The file naming format must not be empty."
@@ -947,6 +2278,235 @@ msgstr ""
 msgid "The location to move files to must not be empty."
 msgstr ""
 
+#: ../picard/ui/options/scripting.py:63
+msgid "Scripting"
+msgstr "Scripting"
+
+#: ../picard/ui/options/tags.py:29
+msgid "Tags"
+msgstr "Tags"
+
+#: ../picard/util/tags.py:24
+msgid "Date"
+msgstr "Date"
+
+#: ../picard/util/tags.py:25
+msgid "Album Artist"
+msgstr "Album Artist"
+
+#: ../picard/util/tags.py:26
+msgid "Track Number"
+msgstr "Track Number"
+
+#: ../picard/util/tags.py:27
+msgid "Total Tracks"
+msgstr "Total Tracks"
+
+#: ../picard/util/tags.py:28
+msgid "Disc Number"
+msgstr "Disc Number"
+
+#: ../picard/util/tags.py:29
+msgid "Total Discs"
+msgstr "Total Discs"
+
+#: ../picard/util/tags.py:30
+msgid "Album Artist Sort Order"
+msgstr "Album Artist Sort Order"
+
+#: ../picard/util/tags.py:31
+msgid "Artist Sort Order"
+msgstr "Artist Sort Order"
+
+#: ../picard/util/tags.py:32
+msgid "Title Sort Order"
+msgstr "Title Sort Order"
+
+#: ../picard/util/tags.py:33
+msgid "Album Sort Order"
+msgstr "Album Sort Order"
+
+#: ../picard/util/tags.py:34
+msgid "ASIN"
+msgstr "ASIN"
+
+#: ../picard/util/tags.py:35
+msgid "Grouping"
+msgstr "Grouping"
+
+#: ../picard/util/tags.py:37
+msgid "ISRC"
+msgstr "ISRC"
+
+#: ../picard/util/tags.py:38
+msgid "Mood"
+msgstr "Mood"
+
+#: ../picard/util/tags.py:39
+msgid "BPM"
+msgstr "BPM"
+
+#: ../picard/util/tags.py:40
+msgid "Copyright"
+msgstr "Copyright"
+
+#: ../picard/util/tags.py:41
+msgid "Composer"
+msgstr "Composer"
+
+#: ../picard/util/tags.py:42
+msgid "Conductor"
+msgstr "Conductor"
+
+#: ../picard/util/tags.py:43
+msgid "Lyricist"
+msgstr "Lyricist"
+
+#: ../picard/util/tags.py:44
+msgid "Arranger"
+msgstr "Arranger"
+
+#: ../picard/util/tags.py:45
+msgid "Producer"
+msgstr "Producer"
+
+#: ../picard/util/tags.py:46
+msgid "Engineer"
+msgstr "Engineer"
+
+#: ../picard/util/tags.py:47
+msgid "Subtitle"
+msgstr "Subtitle"
+
+#: ../picard/util/tags.py:48
+msgid "Disc Subtitle"
+msgstr "Disc Subtitle"
+
+#: ../picard/util/tags.py:49
+msgid "Remixer"
+msgstr "Remixer"
+
+#: ../picard/util/tags.py:50
+msgid "MusicBrainz Track Id"
+msgstr "MusicBrainz Track Id"
+
+#: ../picard/util/tags.py:51
+msgid "MusicBrainz Release Id"
+msgstr "MusicBrainz Release Id"
+
+#: ../picard/util/tags.py:52
+msgid "MusicBrainz Artist Id"
+msgstr "MusicBrainz Artist Id"
+
+#: ../picard/util/tags.py:53
+msgid "MusicBrainz Release Artist Id"
+msgstr "MusicBrainz Release Artist Id"
+
+#: ../picard/util/tags.py:54
+msgid "MusicBrainz TRM Id"
+msgstr "MusicBrainz TRM Id"
+
+#: ../picard/util/tags.py:55
+#, fuzzy
+msgid "MusicBrainz Disc Id"
+msgstr "MusicBrainz Artist Id"
+
+#: ../picard/util/tags.py:56
+#, fuzzy
+msgid "MusicBrainz Sort Name"
+msgstr "MusicBrainz Server"
+
+#: ../picard/util/tags.py:57
+msgid "MusicIP PUID"
+msgstr "MusicIP PUID"
+
+#: ../picard/util/tags.py:58
+msgid "MusicIP Fingerprint"
+msgstr ""
+
+#: ../picard/util/tags.py:59
+msgid "Disc Id"
+msgstr ""
+
+#: ../picard/util/tags.py:60
+msgid "Website"
+msgstr "Website"
+
+#: ../picard/util/tags.py:61
+msgid "Compilation"
+msgstr "Compilation"
+
+#: ../picard/util/tags.py:62
+msgid "Comment"
+msgstr "Comment"
+
+#: ../picard/util/tags.py:63
+msgid "Genre"
+msgstr "Genre"
+
+#: ../picard/util/tags.py:64
+msgid "Encoded By"
+msgstr "Encoded By"
+
+#: ../picard/util/tags.py:65
+msgid "Performer"
+msgstr "Performer"
+
+#: ../picard/util/tags.py:66
+msgid "Release Type"
+msgstr "Release Type"
+
+#: ../picard/util/tags.py:67
+msgid "Release Status"
+msgstr "Release Status"
+
+#: ../picard/util/tags.py:68
+#, fuzzy
+msgid "Release Country"
+msgstr "Release Type"
+
+#: ../picard/util/tags.py:69
+msgid "Record Label"
+msgstr "Record Label"
+
+#: ../picard/util/tags.py:70
+msgid "Barcode"
+msgstr "Barcode"
+
+#: ../picard/util/tags.py:71
+msgid "Catalog Number"
+msgstr "Catalog Number"
+
+#: ../picard/util/tags.py:72
+#, fuzzy
+msgid "Format"
+msgstr "Format:"
+
+#: ../picard/util/tags.py:73
+msgid "DJ-Mixer"
+msgstr "DJ-Mixer"
+
+#: ../picard/util/tags.py:74
+msgid "Media"
+msgstr "Media"
+
+#: ../picard/util/tags.py:75
+msgid "Lyrics"
+msgstr "Lyrics"
+
+#: ../picard/util/tags.py:76
+msgid "Mixer"
+msgstr "Mixer"
+
+#: ../picard/util/tags.py:77
+msgid "Language"
+msgstr ""
+
+#: ../picard/util/tags.py:78
+#, fuzzy
+msgid "Script"
+msgstr "Scripting"
+
 #: ../picard/util/webbrowser2.py:84
 msgid "Web Browser Error"
 msgstr "Web Browser Error"
@@ -962,234 +2522,16 @@ msgstr ""
 "\n"
 "%s"
 
-#~ msgid "No matching tracks for file %s"
-#~ msgstr "No matching tracks for file %s"
-
-#~ msgid "File %s identified!"
-#~ msgstr "File %s identified!"
-
-#~ msgid "Looking up the PUID for file %s..."
-#~ msgstr "Looking up the PUID for file %s..."
-
-#~ msgid "Looking up the metadata for file %s..."
-#~ msgstr "Looking up the metadata for file %s..."
-
-#~ msgid "No matching releases for cluster %s"
-#~ msgstr "No matching releases for cluster %s"
-
-#~ msgid "Cluster %s identified!"
-#~ msgstr "Cluster %s identified!"
-
-#~ msgid "Looking up the metadata for cluster %s..."
-#~ msgstr "Looking up the metadata for cluster %s..."
-
-#~ msgid "M3U Playlist (*.m3u)"
-#~ msgstr "M3U Playlist (*.m3u)"
-
-#~ msgid "PLS Playlist (*.pls)"
-#~ msgstr "PLS Playlist (*.pls)"
-
-#~ msgid "XSPF Playlist (*.xspf)"
-#~ msgstr "XSPF Playlist (*.xspf)"
-
-#~ msgid "Submitting PUIDs..."
-#~ msgstr "Submitting PUIDs..."
-
-#~ msgid "PUIDs submission failed: %s"
-#~ msgstr "PUIDs submission failed: %s"
-
-#~ msgid "PUIDs successfully submitted!"
-#~ msgstr "PUIDs successfully submitted!"
-
 #~ msgid "New Version"
 #~ msgstr "New Version"
-
 #~ msgid ""
 #~ "New version of Picard is available (%s). Would you like to download it "
 #~ "now?"
 #~ msgstr ""
 #~ "New version of Picard is available (%s). Would you like to download it "
 #~ "now?"
-
-#~ msgid "Couldn't find PUID for file %s"
-#~ msgstr "Couldn't find PUID for file %s"
-
-#~ msgid "Looking up the fingerprint for file %s..."
-#~ msgstr "Looking up the fingerprint for file %s..."
-
-#~ msgid "Creating fingerprint for file %s..."
-#~ msgstr "Creating fingerprint for file %s..."
-
-#~ msgid "Length"
-#~ msgstr "Length"
-
-#~ msgid "&Ok"
-#~ msgstr "&Ok"
-
-#~ msgid "&Cancel"
-#~ msgstr "&Cancel"
-
-#~ msgid "About"
-#~ msgstr "About"
-
-#~ msgid "Advanced"
-#~ msgstr "Advanced"
-
-#~ msgid "Matching"
-#~ msgstr "Matching"
-
-#~ msgid "File Naming"
-#~ msgstr "File Naming"
-
-#~ msgid "Scripting"
-#~ msgstr "Scripting"
-
-#~ msgid "Tags"
-#~ msgstr "Tags"
-
-#~ msgid "User Interface"
-#~ msgstr "User Interface"
-
-#~ msgid "Date"
-#~ msgstr "Date"
-
-#~ msgid "Album Artist"
-#~ msgstr "Album Artist"
-
-#~ msgid "Track Number"
-#~ msgstr "Track Number"
-
-#~ msgid "Total Tracks"
-#~ msgstr "Total Tracks"
-
-#~ msgid "Disc Number"
-#~ msgstr "Disc Number"
-
-#~ msgid "Total Discs"
-#~ msgstr "Total Discs"
-
-#~ msgid "Album Artist Sort Order"
-#~ msgstr "Album Artist Sort Order"
-
-#~ msgid "Artist Sort Order"
-#~ msgstr "Artist Sort Order"
-
-#~ msgid "Title Sort Order"
-#~ msgstr "Title Sort Order"
-
-#~ msgid "Album Sort Order"
-#~ msgstr "Album Sort Order"
-
-#~ msgid "ASIN"
-#~ msgstr "ASIN"
-
-#~ msgid "Grouping"
-#~ msgstr "Grouping"
-
-#~ msgid "ISRC"
-#~ msgstr "ISRC"
-
-#~ msgid "Mood"
-#~ msgstr "Mood"
-
-#~ msgid "BPM"
-#~ msgstr "BPM"
-
-#~ msgid "Copyright"
-#~ msgstr "Copyright"
-
-#~ msgid "Composer"
-#~ msgstr "Composer"
-
-#~ msgid "Conductor"
-#~ msgstr "Conductor"
-
-#~ msgid "Lyricist"
-#~ msgstr "Lyricist"
-
-#~ msgid "Arranger"
-#~ msgstr "Arranger"
-
-#~ msgid "Producer"
-#~ msgstr "Producer"
-
-#~ msgid "Engineer"
-#~ msgstr "Engineer"
-
-#~ msgid "Subtitle"
-#~ msgstr "Subtitle"
-
-#~ msgid "Disc Subtitle"
-#~ msgstr "Disc Subtitle"
-
-#~ msgid "Remixer"
-#~ msgstr "Remixer"
-
-#~ msgid "MusicBrainz Track Id"
-#~ msgstr "MusicBrainz Track Id"
-
-#~ msgid "MusicBrainz Release Id"
-#~ msgstr "MusicBrainz Release Id"
-
-#~ msgid "MusicBrainz Artist Id"
-#~ msgstr "MusicBrainz Artist Id"
-
-#~ msgid "MusicBrainz Release Artist Id"
-#~ msgstr "MusicBrainz Release Artist Id"
-
-#~ msgid "MusicBrainz TRM Id"
-#~ msgstr "MusicBrainz TRM Id"
-
-#~ msgid "MusicIP PUID"
-#~ msgstr "MusicIP PUID"
-
-#~ msgid "Website"
-#~ msgstr "Website"
-
-#~ msgid "Compilation"
-#~ msgstr "Compilation"
-
-#~ msgid "Comment"
-#~ msgstr "Comment"
-
-#~ msgid "Genre"
-#~ msgstr "Genre"
-
-#~ msgid "Encoded By"
-#~ msgstr "Encoded By"
-
-#~ msgid "Performer"
-#~ msgstr "Performer"
-
-#~ msgid "Release Type"
-#~ msgstr "Release Type"
-
-#~ msgid "Release Status"
-#~ msgstr "Release Status"
-
-#~ msgid "Record Label"
-#~ msgstr "Record Label"
-
-#~ msgid "Barcode"
-#~ msgstr "Barcode"
-
-#~ msgid "Catalog Number"
-#~ msgstr "Catalog Number"
-
-#~ msgid "DJ-Mixer"
-#~ msgstr "DJ-Mixer"
-
-#~ msgid "Media"
-#~ msgstr "Media"
-
-#~ msgid "Lyrics"
-#~ msgstr "Lyrics"
-
-#~ msgid "Mixer"
-#~ msgstr "Mixer"
-
+#~ msgid "Delete"
+#~ msgstr "Delete"
 #~ msgid "Ctrl+T"
 #~ msgstr "Ctrl+T"
 
-#~ msgid "Toolbar"
-#~ msgstr "Toolbar"
diff --git a/po/en_GB.po b/po/en_GB.po
index 33f23234e..2e5d10ba2 100644
--- a/po/en_GB.po
+++ b/po/en_GB.po
@@ -6,36 +6,1319 @@ msgid ""
 msgstr ""
 "Project-Id-Version: 0.5.2\n"
 "Report-Msgid-Bugs-To: http://bugs.musicbrainz.org/\n"
-"POT-Creation-Date: 2008-12-01 18:20+0100\n"
-"PO-Revision-Date: 2008-07-27 19:53+0000\n"
-"Last-Translator: Jen Ockwell <jenfraggleubuntu@googlemail.com>\n"
+"POT-Creation-Date: 2009-01-25 12:23+0100\n"
+"PO-Revision-Date: 2009-01-25 13:09+0100\n"
+"Last-Translator: Philipp Wolfer <phw@rubyforge.org>\n"
 "Language-Team: British English <en_GB@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2008-12-01 17:01+0000\n"
+"X-Launchpad-Export-Date: 2009-01-24 23:28+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 "Generated-By: pygettext.py 1.5\n"
 
-#: ../picard/album.py:108 ../picard/cluster.py:248
+#: ../picard/album.py:108
+#: ../picard/cluster.py:248
 msgid "Unmatched Files"
 msgstr ""
 
-#: ../picard/album.py:269
+#: ../picard/album.py:281
 #, python-format
 msgid "[couldn't load album %s]"
 msgstr "Could not load album (%s)"
 
-#: ../picard/album.py:305
+#: ../picard/album.py:317
 msgid "[loading album information]"
 msgstr ""
 
-#: ../picard/tagger.py:472
+#: ../picard/cluster.py:164
+#: ../picard/cluster.py:175
+#, python-format
+msgid "No matching releases for cluster %s"
+msgstr "No matching releases for cluster %s"
+
+#: ../picard/cluster.py:177
+#, fuzzy, python-format
+msgid "Cluster %s identified!"
+msgstr "File %s identified!"
+
+#: ../picard/cluster.py:182
+#, fuzzy, python-format
+msgid "Looking up the metadata for cluster %s..."
+msgstr "No matching releases for cluster %s"
+
+#: ../picard/const.py:40
+msgid "CD"
+msgstr ""
+
+#: ../picard/const.py:41
+msgid "DVD"
+msgstr ""
+
+#: ../picard/const.py:42
+msgid "SACD"
+msgstr ""
+
+#: ../picard/const.py:43
+msgid "LaserDisc"
+msgstr ""
+
+#: ../picard/const.py:44
+msgid "MiniDisc"
+msgstr ""
+
+#: ../picard/const.py:45
+msgid "Vinyl"
+msgstr ""
+
+#: ../picard/const.py:46
+msgid "Cassette"
+msgstr ""
+
+#: ../picard/const.py:47
+msgid "Cartridge (4/8-tracks)"
+msgstr ""
+
+#: ../picard/const.py:48
+msgid "Reel-to-Reel"
+msgstr ""
+
+#: ../picard/const.py:49
+msgid "DAT"
+msgstr ""
+
+#: ../picard/const.py:50
+msgid "Digital Media"
+msgstr ""
+
+#: ../picard/const.py:51
+msgid "Wax Cylinder"
+msgstr ""
+
+#: ../picard/const.py:52
+msgid "Piano Roll"
+msgstr ""
+
+#: ../picard/const.py:53
+#, fuzzy
+msgid "Other"
+msgstr "Later"
+
+#: ../picard/const.py:58
+msgid "Bangladesh"
+msgstr ""
+
+#: ../picard/const.py:59
+msgid "Belgium"
+msgstr ""
+
+#: ../picard/const.py:60
+msgid "Burkina Faso"
+msgstr ""
+
+#: ../picard/const.py:61
+#, fuzzy
+msgid "Bulgaria"
+msgstr "Hungarian"
+
+#: ../picard/const.py:62
+msgid "Barbados"
+msgstr ""
+
+#: ../picard/const.py:63
+msgid "Wallis and Futuna Islands"
+msgstr ""
+
+#: ../picard/const.py:64
+#, fuzzy
+msgid "Bermuda"
+msgstr "German"
+
+#: ../picard/const.py:65
+msgid "Brunei Darussalam"
+msgstr ""
+
+#: ../picard/const.py:66
+msgid "Bolivia"
+msgstr ""
+
+#: ../picard/const.py:67
+msgid "Bahrain"
+msgstr ""
+
+#: ../picard/const.py:68
+msgid "Burundi"
+msgstr ""
+
+#: ../picard/const.py:69
+msgid "Benin"
+msgstr ""
+
+#: ../picard/const.py:70
+msgid "Bhutan"
+msgstr ""
+
+#: ../picard/const.py:71
+msgid "Jamaica"
+msgstr ""
+
+#: ../picard/const.py:72
+msgid "Bouvet Island"
+msgstr ""
+
+#: ../picard/const.py:73
+msgid "Botswana"
+msgstr ""
+
+#: ../picard/const.py:74
+msgid "Samoa"
+msgstr ""
+
+#: ../picard/const.py:75
+msgid "Brazil"
+msgstr ""
+
+#: ../picard/const.py:76
+msgid "Bahamas"
+msgstr ""
+
+#: ../picard/const.py:77
+msgid "Belarus"
+msgstr ""
+
+#: ../picard/const.py:78
+msgid "Belize"
+msgstr ""
+
+#: ../picard/const.py:79
+msgid "Russian Federation"
+msgstr ""
+
+#: ../picard/const.py:80
+msgid "Rwanda"
+msgstr ""
+
+#: ../picard/const.py:81
+msgid "Reunion"
+msgstr ""
+
+#: ../picard/const.py:82
+msgid "Turkmenistan"
+msgstr ""
+
+#: ../picard/const.py:83
+msgid "Tajikistan"
+msgstr ""
+
+#: ../picard/const.py:84
+#, fuzzy
+msgid "Romania"
+msgstr "Romanian"
+
+#: ../picard/const.py:85
+msgid "Tokela"
+msgstr ""
+
+#: ../picard/const.py:86
+msgid "Guinea-Bissa"
+msgstr ""
+
+#: ../picard/const.py:87
+msgid "Guam"
+msgstr ""
+
+#: ../picard/const.py:88
+msgid "Guatemala"
+msgstr ""
+
+#: ../picard/const.py:89
+msgid "Greece"
+msgstr ""
+
+#: ../picard/const.py:90
+msgid "Equatorial Guinea"
+msgstr ""
+
+#: ../picard/const.py:91
+msgid "Guadeloupe"
+msgstr ""
+
+#: ../picard/const.py:92
+msgid "Japan"
+msgstr ""
+
+#: ../picard/const.py:93
+msgid "Guyana"
+msgstr ""
+
+#: ../picard/const.py:94
+#, fuzzy
+msgid "French Guiana"
+msgstr "French"
+
+#: ../picard/const.py:95
+#, fuzzy
+msgid "Georgia"
+msgstr "German"
+
+#: ../picard/const.py:96
+msgid "Grenada"
+msgstr ""
+
+#: ../picard/const.py:97
+msgid "United Kingdom"
+msgstr ""
+
+#: ../picard/const.py:98
+msgid "Gabon"
+msgstr ""
+
+#: ../picard/const.py:99
+msgid "El Salvador"
+msgstr ""
+
+#: ../picard/const.py:100
+#, fuzzy
+msgid "Guinea"
+msgstr "General"
+
+#: ../picard/const.py:101
+msgid "Gambia"
+msgstr ""
+
+#: ../picard/const.py:102
+msgid "Greenland"
+msgstr ""
+
+#: ../picard/const.py:103
+msgid "Gibraltar"
+msgstr ""
+
+#: ../picard/const.py:104
+msgid "Ghana"
+msgstr ""
+
+#: ../picard/const.py:105
+#, fuzzy
+msgid "Oman"
+msgstr "German"
+
+#: ../picard/const.py:106
+msgid "Tunisia"
+msgstr ""
+
+#: ../picard/const.py:107
+#, fuzzy
+msgid "Jordan"
+msgstr "Korean"
+
+#: ../picard/const.py:108
+msgid "Haiti"
+msgstr ""
+
+#: ../picard/const.py:109
+#, fuzzy
+msgid "Hungary"
+msgstr "Hungarian"
+
+#: ../picard/const.py:110
+msgid "Hong Kong"
+msgstr ""
+
+#: ../picard/const.py:111
+msgid "Honduras"
+msgstr ""
+
+#: ../picard/const.py:112
+msgid "Heard and Mc Donald Islands"
+msgstr ""
+
+#: ../picard/const.py:113
+msgid "Venezuela"
+msgstr ""
+
+#: ../picard/const.py:114
+msgid "Puerto Rico"
+msgstr ""
+
+#: ../picard/const.py:115
+msgid "Pala"
+msgstr ""
+
+#: ../picard/const.py:116
+#, fuzzy
+msgid "Portugal"
+msgstr "Portuguese"
+
+#: ../picard/const.py:117
+msgid "Svalbard and Jan Mayen Islands"
+msgstr ""
+
+#: ../picard/const.py:118
+msgid "Paraguay"
+msgstr ""
+
+#: ../picard/const.py:119
+msgid "Iraq"
+msgstr ""
+
+#: ../picard/const.py:120
+msgid "Panama"
+msgstr ""
+
+#: ../picard/const.py:121
+msgid "French Polynesia"
+msgstr ""
+
+#: ../picard/const.py:122
+msgid "Papua New Guinea"
+msgstr ""
+
+#: ../picard/const.py:123
+msgid "Per"
+msgstr ""
+
+#: ../picard/const.py:124
+msgid "Pakistan"
+msgstr ""
+
+#: ../picard/const.py:125
+msgid "Philippines"
+msgstr ""
+
+#: ../picard/const.py:126
+msgid "Pitcairn"
+msgstr ""
+
+#: ../picard/const.py:127
+msgid "Poland"
+msgstr ""
+
+#: ../picard/const.py:128
+msgid "St. Pierre and Miquelon"
+msgstr ""
+
+#: ../picard/const.py:129
+msgid "Zambia"
+msgstr ""
+
+#: ../picard/const.py:130
+msgid "Western Sahara"
+msgstr ""
+
+#: ../picard/const.py:131
+msgid "Estonia"
+msgstr ""
+
+#: ../picard/const.py:132
+msgid "Egypt"
+msgstr ""
+
+#: ../picard/const.py:133
+msgid "South Africa"
+msgstr ""
+
+#: ../picard/const.py:134
+msgid "Ecuador"
+msgstr ""
+
+#: ../picard/const.py:135
+#, fuzzy
+msgid "Italy"
+msgstr "Italian"
+
+#: ../picard/const.py:136
+#, fuzzy
+msgid "Viet Nam"
+msgstr "File naming format:"
+
+#: ../picard/const.py:137
+msgid "Solomon Islands"
+msgstr ""
+
+#: ../picard/const.py:138
+msgid "Ethiopia"
+msgstr ""
+
+#: ../picard/const.py:139
+#, fuzzy
+msgid "Somalia"
+msgstr "Romanian"
+
+#: ../picard/const.py:140
+msgid "Zimbabwe"
+msgstr ""
+
+#: ../picard/const.py:141
+msgid "Saudi Arabia"
+msgstr ""
+
+#: ../picard/const.py:142
+#, fuzzy
+msgid "Spain"
+msgstr "Spanish"
+
+#: ../picard/const.py:143
+msgid "Eritrea"
+msgstr ""
+
+#: ../picard/const.py:144
+msgid "Moldova, Republic of"
+msgstr ""
+
+#: ../picard/const.py:145
+msgid "Madagascar"
+msgstr ""
+
+#: ../picard/const.py:146
+msgid "Morocco"
+msgstr ""
+
+#: ../picard/const.py:147
+#, fuzzy
+msgid "Monaco"
+msgstr "Mono"
+
+#: ../picard/const.py:148
+msgid "Uzbekistan"
+msgstr ""
+
+#: ../picard/const.py:149
+msgid "Myanmar"
+msgstr ""
+
+#: ../picard/const.py:150
+msgid "Mali"
+msgstr ""
+
+#: ../picard/const.py:151
+msgid "Maca"
+msgstr ""
+
+#: ../picard/const.py:152
+#, fuzzy
+msgid "Mongolia"
+msgstr "Mono"
+
+#: ../picard/const.py:153
+msgid "Marshall Islands"
+msgstr ""
+
+#: ../picard/const.py:154
+msgid "Macedonia, The Former Yugoslav Republic of"
+msgstr ""
+
+#: ../picard/const.py:155
+msgid "Mauritius"
+msgstr ""
+
+#: ../picard/const.py:156
+msgid "Malta"
+msgstr ""
+
+#: ../picard/const.py:157
+msgid "Malawi"
+msgstr ""
+
+#: ../picard/const.py:158
+msgid "Maldives"
+msgstr ""
+
+#: ../picard/const.py:159
+msgid "Martinique"
+msgstr ""
+
+#: ../picard/const.py:160
+msgid "Northern Mariana Islands"
+msgstr ""
+
+#: ../picard/const.py:161
+msgid "Montserrat"
+msgstr ""
+
+#: ../picard/const.py:162
+#, fuzzy
+msgid "Mauritania"
+msgstr "Lithuanian"
+
+#: ../picard/const.py:163
+msgid "Uganda"
+msgstr ""
+
+#: ../picard/const.py:164
+msgid "Malaysia"
+msgstr ""
+
+#: ../picard/const.py:165
+msgid "Mexico"
+msgstr ""
+
+#: ../picard/const.py:166
+msgid "Israel"
+msgstr ""
+
+#: ../picard/const.py:167
+#, fuzzy
+msgid "France"
+msgstr "Cancel"
+
+#: ../picard/const.py:168
+msgid "British Indian Ocean Territory"
+msgstr ""
+
+#: ../picard/const.py:169
+msgid "St. Helena"
+msgstr ""
+
+#: ../picard/const.py:170
+msgid "Finland"
+msgstr ""
+
+#: ../picard/const.py:171
+msgid "Fiji"
+msgstr ""
+
+#: ../picard/const.py:172
+msgid "Falkland Islands (Malvinas)"
+msgstr ""
+
+#: ../picard/const.py:173
+msgid "Micronesia, Federated States of"
+msgstr ""
+
+#: ../picard/const.py:174
+msgid "Faroe Islands"
+msgstr ""
+
+#: ../picard/const.py:175
+msgid "Nicaragua"
+msgstr ""
+
+#: ../picard/const.py:176
+msgid "Netherlands"
+msgstr ""
+
+#: ../picard/const.py:177
+msgid "Norway"
+msgstr ""
+
+#: ../picard/const.py:178
+msgid "Namibia"
+msgstr ""
+
+#: ../picard/const.py:179
+msgid "Vanuat"
+msgstr ""
+
+#: ../picard/const.py:180
+msgid "New Caledonia"
+msgstr ""
+
+#: ../picard/const.py:181
+#, fuzzy
+msgid "Niger"
+msgstr "Mixer"
+
+#: ../picard/const.py:182
+msgid "Norfolk Island"
+msgstr ""
+
+#: ../picard/const.py:183
+msgid "Nigeria"
+msgstr ""
+
+#: ../picard/const.py:184
+msgid "New Zealand"
+msgstr ""
+
+#: ../picard/const.py:185
+msgid "Zaire"
+msgstr ""
+
+#: ../picard/const.py:186
+msgid "Nepal"
+msgstr ""
+
+#: ../picard/const.py:187
+msgid "Naur"
+msgstr ""
+
+#: ../picard/const.py:188
+msgid "Niue"
+msgstr ""
+
+#: ../picard/const.py:189
+msgid "Cook Islands"
+msgstr ""
+
+#: ../picard/const.py:190
+msgid "Cote d'Ivoire"
+msgstr ""
+
+#: ../picard/const.py:191
+msgid "Switzerland"
+msgstr ""
+
+#: ../picard/const.py:192
+msgid "Colombia"
+msgstr ""
+
+#: ../picard/const.py:193
+msgid "China"
+msgstr ""
+
+#: ../picard/const.py:194
+msgid "Cameroon"
+msgstr ""
+
+#: ../picard/const.py:195
+#, fuzzy
+msgid "Chile"
+msgstr "File"
+
+#: ../picard/const.py:196
+msgid "Cocos (Keeling) Islands"
+msgstr ""
+
+#: ../picard/const.py:197
+msgid "Canada"
+msgstr ""
+
+#: ../picard/const.py:198
+#, fuzzy
+msgid "Congo"
+msgstr "Mono"
+
+#: ../picard/const.py:199
+msgid "Central African Republic"
+msgstr ""
+
+#: ../picard/const.py:200
+msgid "Czech Republic"
+msgstr ""
+
+#: ../picard/const.py:201
+msgid "Cyprus"
+msgstr ""
+
+#: ../picard/const.py:202
+msgid "Christmas Island"
+msgstr ""
+
+#: ../picard/const.py:203
+msgid "Costa Rica"
+msgstr ""
+
+#: ../picard/const.py:204
+msgid "Cape Verde"
+msgstr ""
+
+#: ../picard/const.py:205
+msgid "Cuba"
+msgstr ""
+
+#: ../picard/const.py:206
+msgid "Swaziland"
+msgstr ""
+
+#: ../picard/const.py:207
+msgid "Syrian Arab Republic"
+msgstr ""
+
+#: ../picard/const.py:208
+msgid "Kyrgyzstan"
+msgstr ""
+
+#: ../picard/const.py:209
+msgid "Kenya"
+msgstr ""
+
+#: ../picard/const.py:210
+msgid "Suriname"
+msgstr ""
+
+#: ../picard/const.py:211
+msgid "Kiribati"
+msgstr ""
+
+#: ../picard/const.py:212
+msgid "Cambodia"
+msgstr ""
+
+#: ../picard/const.py:213
+msgid "Saint Kitts and Nevis"
+msgstr ""
+
+#: ../picard/const.py:214
+#, fuzzy
+msgid "Comoros"
+msgstr "Colours"
+
+#: ../picard/const.py:215
+msgid "Sao Tome and Principe"
+msgstr ""
+
+#: ../picard/const.py:216
+#, fuzzy
+msgid "Slovenia"
+msgstr "Slovak"
+
+#: ../picard/const.py:217
+msgid "Kuwait"
+msgstr ""
+
+#: ../picard/const.py:218
+#, fuzzy
+msgid "Senegal"
+msgstr "General"
+
+#: ../picard/const.py:219
+msgid "San Marino"
+msgstr ""
+
+#: ../picard/const.py:220
+msgid "Sierra Leone"
+msgstr ""
+
+#: ../picard/const.py:221
+msgid "Seychelles"
+msgstr ""
+
+#: ../picard/const.py:222
+msgid "Kazakhstan"
+msgstr ""
+
+#: ../picard/const.py:223
+msgid "Cayman Islands"
+msgstr ""
+
+#: ../picard/const.py:224
+msgid "Singapore"
+msgstr ""
+
+#: ../picard/const.py:225
+#, fuzzy
+msgid "Sweden"
+msgstr "Swedish"
+
+#: ../picard/const.py:226
+#, fuzzy
+msgid "Sudan"
+msgstr "&Scan"
+
+#: ../picard/const.py:227
+msgid "Dominican Republic"
+msgstr ""
+
+#: ../picard/const.py:228
+#, fuzzy
+msgid "Dominica"
+msgstr "Romanian"
+
+#: ../picard/const.py:229
+#, fuzzy
+msgid "Djibouti"
+msgstr "About"
+
+#: ../picard/const.py:230
+msgid "Denmark"
+msgstr ""
+
+#: ../picard/const.py:231
+msgid "Virgin Islands (British)"
+msgstr ""
+
+#: ../picard/const.py:232
+#, fuzzy
+msgid "Germany"
+msgstr "German"
+
+#: ../picard/const.py:233
+msgid "Yemen"
+msgstr ""
+
+#: ../picard/const.py:234
+msgid "Algeria"
+msgstr ""
+
+#: ../picard/const.py:235
+msgid "United States"
+msgstr ""
+
+#: ../picard/const.py:236
+msgid "Uruguay"
+msgstr ""
+
+#: ../picard/const.py:237
+msgid "Mayotte"
+msgstr ""
+
+#: ../picard/const.py:238
+msgid "United States Minor Outlying Islands"
+msgstr ""
+
+#: ../picard/const.py:239
+msgid "Lebanon"
+msgstr ""
+
+#: ../picard/const.py:240
+msgid "Saint Lucia"
+msgstr ""
+
+#: ../picard/const.py:241
+msgid "Lao People's Democratic Republic"
+msgstr ""
+
+#: ../picard/const.py:242
+msgid "Tuval"
+msgstr ""
+
+#: ../picard/const.py:243
+#, fuzzy
+msgid "Taiwan"
+msgstr "Italian"
+
+#: ../picard/const.py:244
+msgid "Trinidad and Tobago"
+msgstr ""
+
+#: ../picard/const.py:245
+msgid "Turkey"
+msgstr ""
+
+#: ../picard/const.py:246
+msgid "Sri Lanka"
+msgstr ""
+
+#: ../picard/const.py:247
+msgid "Liechtenstein"
+msgstr ""
+
+#: ../picard/const.py:248
+msgid "Latvia"
+msgstr ""
+
+#: ../picard/const.py:249
+msgid "Tonga"
+msgstr ""
+
+#: ../picard/const.py:250
+#, fuzzy
+msgid "Lithuania"
+msgstr "Lithuanian"
+
+#: ../picard/const.py:251
+msgid "Luxembourg"
+msgstr ""
+
+#: ../picard/const.py:252
+msgid "Liberia"
+msgstr ""
+
+#: ../picard/const.py:253
+#, fuzzy
+msgid "Lesotho"
+msgstr "Length"
+
+#: ../picard/const.py:254
+msgid "Thailand"
+msgstr ""
+
+#: ../picard/const.py:255
+msgid "French Southern Territories"
+msgstr ""
+
+#: ../picard/const.py:256
+#, fuzzy
+msgid "Togo"
+msgstr "&Tools"
+
+#: ../picard/const.py:257
+msgid "Chad"
+msgstr ""
+
+#: ../picard/const.py:258
+msgid "Turks and Caicos Islands"
+msgstr ""
+
+#: ../picard/const.py:259
+msgid "Libyan Arab Jamahiriya"
+msgstr ""
+
+#: ../picard/const.py:260
+msgid "Vatican City State (Holy See)"
+msgstr ""
+
+#: ../picard/const.py:261
+msgid "Saint Vincent and The Grenadines"
+msgstr ""
+
+#: ../picard/const.py:262
+msgid "United Arab Emirates"
+msgstr ""
+
+#: ../picard/const.py:263
+msgid "Andorra"
+msgstr ""
+
+#: ../picard/const.py:264
+msgid "Antigua and Barbuda"
+msgstr ""
+
+#: ../picard/const.py:265
+msgid "Afghanistan"
+msgstr ""
+
+#: ../picard/const.py:266
+msgid "Anguilla"
+msgstr ""
+
+#: ../picard/const.py:267
+msgid "Virgin Islands (U.S.)"
+msgstr ""
+
+#: ../picard/const.py:268
+#, fuzzy
+msgid "Iceland"
+msgstr "Icelandic"
+
+#: ../picard/const.py:269
+msgid "Iran (Islamic Republic of)"
+msgstr ""
+
+#: ../picard/const.py:270
+msgid "Armenia"
+msgstr ""
+
+#: ../picard/const.py:271
+msgid "Albania"
+msgstr ""
+
+#: ../picard/const.py:272
+msgid "Angola"
+msgstr ""
+
+#: ../picard/const.py:273
+msgid "Netherlands Antilles"
+msgstr ""
+
+#: ../picard/const.py:274
+msgid "Antarctica"
+msgstr ""
+
+#: ../picard/const.py:275
+msgid "American Samoa"
+msgstr ""
+
+#: ../picard/const.py:276
+msgid "Argentina"
+msgstr ""
+
+#: ../picard/const.py:277
+#, fuzzy
+msgid "Australia"
+msgstr "Italian"
+
+#: ../picard/const.py:278
+#, fuzzy
+msgid "Austria"
+msgstr "Author"
+
+#: ../picard/const.py:279
+msgid "Aruba"
+msgstr ""
+
+#: ../picard/const.py:280
+#, fuzzy
+msgid "India"
+msgstr "Local Metadata"
+
+#: ../picard/const.py:281
+msgid "Tanzania, United Republic of"
+msgstr ""
+
+#: ../picard/const.py:282
+msgid "Azerbaijan"
+msgstr ""
+
+#: ../picard/const.py:283
+#, fuzzy
+msgid "Ireland"
+msgstr "Icelandic"
+
+#: ../picard/const.py:284
+msgid "Indonesia"
+msgstr ""
+
+#: ../picard/const.py:285
+msgid "Ukraine"
+msgstr ""
+
+#: ../picard/const.py:286
+#, fuzzy
+msgid "Qatar"
+msgstr "Later"
+
+#: ../picard/const.py:287
+msgid "Mozambique"
+msgstr ""
+
+#: ../picard/const.py:288
+msgid "Bosnia and Herzegovina"
+msgstr ""
+
+#: ../picard/const.py:289
+msgid "Congo, The Democratic Republic of the"
+msgstr ""
+
+#: ../picard/const.py:290
+msgid "Serbia and Montenegro"
+msgstr ""
+
+#: ../picard/const.py:291
+msgid "Croatia"
+msgstr ""
+
+#: ../picard/const.py:292
+msgid "Korea (North), Democratic People's Republic of"
+msgstr ""
+
+#: ../picard/const.py:293
+msgid "Korea (South), Republic of"
+msgstr ""
+
+#: ../picard/const.py:294
+#, fuzzy
+msgid "Slovakia"
+msgstr "Slovak"
+
+#: ../picard/const.py:295
+msgid "Soviet Union (historical, 1922-1991)"
+msgstr ""
+
+#: ../picard/const.py:296
+msgid "East Timor"
+msgstr ""
+
+#: ../picard/const.py:297
+msgid "Czechoslovakia (historical, 1918-1992)"
+msgstr ""
+
+#: ../picard/const.py:298
+msgid "Europe"
+msgstr ""
+
+#: ../picard/const.py:299
+msgid "East Germany (historical, 1949-1990)"
+msgstr ""
+
+#: ../picard/const.py:300
+msgid "[Unknown Country]"
+msgstr ""
+
+#: ../picard/const.py:301
+msgid "[Worldwide]"
+msgstr ""
+
+#: ../picard/const.py:302
+msgid "Yugoslavia (historical, 1918-1992)"
+msgstr ""
+
+#: ../picard/const.py:307
+#, fuzzy
+msgid "Catalan"
+msgstr "Italian"
+
+#: ../picard/const.py:308
+msgid "Czech"
+msgstr "Czech"
+
+#: ../picard/const.py:309
+msgid "Welsh"
+msgstr ""
+
+#: ../picard/const.py:310
+#, fuzzy
+msgid "Danish"
+msgstr "Spanish"
+
+#: ../picard/const.py:311
+msgid "German"
+msgstr "German"
+
+#: ../picard/const.py:312
+msgid "English"
+msgstr "English"
+
+#: ../picard/const.py:313
+#, fuzzy
+msgid "English (Canada)"
+msgstr "English (UK)"
+
+#: ../picard/const.py:314
+msgid "English (UK)"
+msgstr "English (UK)"
+
+#: ../picard/const.py:315
+msgid "Spanish"
+msgstr "Spanish"
+
+#: ../picard/const.py:316
+#, fuzzy
+msgid "Persian"
+msgstr "Version"
+
+#: ../picard/const.py:317
+msgid "Finnish"
+msgstr "Finnish"
+
+#: ../picard/const.py:318
+msgid "French"
+msgstr "French"
+
+#: ../picard/const.py:319
+msgid "Frisian"
+msgstr ""
+
+#: ../picard/const.py:320
+msgid "Hebrew"
+msgstr ""
+
+#: ../picard/const.py:321
+msgid "Hungarian"
+msgstr "Hungarian"
+
+#: ../picard/const.py:322
+#, fuzzy
+msgid "Islandic"
+msgstr "Icelandic"
+
+#: ../picard/const.py:323
+msgid "Italian"
+msgstr "Italian"
+
+#: ../picard/const.py:324
+msgid "Kannada"
+msgstr ""
+
+#: ../picard/const.py:325
+msgid "Korean"
+msgstr "Korean"
+
+#: ../picard/const.py:326
+msgid "Lithuanian"
+msgstr "Lithuanian"
+
+#: ../picard/const.py:327
+msgid "Norwegian Bokmal"
+msgstr "Norwegian Bokmal"
+
+#: ../picard/const.py:328
+msgid "Dutch"
+msgstr "Dutch"
+
+#: ../picard/const.py:329
+#, fuzzy
+msgid "Polish"
+msgstr "English"
+
+#: ../picard/const.py:330
+msgid "Portuguese"
+msgstr "Portuguese"
+
+#: ../picard/const.py:331
+#, fuzzy
+msgid "Brazilian Portuguese"
+msgstr "Portuguese"
+
+#: ../picard/const.py:332
+msgid "Romanian"
+msgstr "Romanian"
+
+#: ../picard/const.py:333
+msgid "Russian"
+msgstr "Russian"
+
+#: ../picard/const.py:334
+#, fuzzy
+msgid "Scots"
+msgstr "Score"
+
+#: ../picard/const.py:335
+msgid "Slovak"
+msgstr "Slovak"
+
+#: ../picard/const.py:336
+#, fuzzy
+msgid "Slovenian"
+msgstr "Slovak"
+
+#: ../picard/const.py:337
+msgid "Swedish"
+msgstr "Swedish"
+
+#: ../picard/const.py:338
+msgid "Chinese"
+msgstr ""
+
+#: ../picard/file.py:475
+#, python-format
+msgid "No matching tracks for file %s"
+msgstr "No matching tracks for file %s"
+
+#: ../picard/file.py:492
+#, fuzzy, python-format
+msgid "No matching tracks above the threshold for file %s"
+msgstr "No matching tracks for file %s"
+
+#: ../picard/file.py:495
+#, python-format
+msgid "File %s identified!"
+msgstr "File %s identified!"
+
+#: ../picard/file.py:506
+#, fuzzy, python-format
+msgid "Looking up the PUID for file %s..."
+msgstr "Performing a PUID lookup on file %s..."
+
+#: ../picard/file.py:511
+#, fuzzy, python-format
+msgid "Looking up the metadata for file %s..."
+msgstr "Looking up metadata on file %s..."
+
+#: ../picard/puidmanager.py:58
+#, fuzzy
+msgid "Submitting PUIDs..."
+msgstr "Submit PUIDs"
+
+#: ../picard/puidmanager.py:64
+#, python-format
+msgid "PUIDs submission failed: %s"
+msgstr "PUIDs submission failed: %s"
+
+#: ../picard/puidmanager.py:66
+#, fuzzy
+msgid "PUIDs successfully submitted!"
+msgstr "PUIDs successfully submitted."
+
+#: ../picard/playlist.py:31
+msgid "M3U Playlist (*.m3u)"
+msgstr "M3U Playlist (*.m3u)"
+
+#: ../picard/playlist.py:32
+msgid "PLS Playlist (*.pls)"
+msgstr "PLS Playlist (*.pls)"
+
+#: ../picard/playlist.py:33
+msgid "XSPF Playlist (*.xspf)"
+msgstr "XSPF Playlist (*.xspf)"
+
+#: ../picard/tagger.py:476
 msgid "CD Lookup Error"
 msgstr ""
 
-#: ../picard/tagger.py:473
+#: ../picard/tagger.py:477
 #, python-format
 msgid ""
 "Error while reading CD:\n"
@@ -43,125 +1326,173 @@ msgid ""
 "%s"
 msgstr ""
 
-#: ../picard/ui/passworddialog.py:38
+#: ../picard/tagger.py:503
 #, python-format
-msgid ""
-"The server %s requires you to login. Please enter your username and password."
-msgstr ""
+msgid "Couldn't find PUID for file %s"
+msgstr "Couldn't find PUID for file %s"
 
-#: ../picard/ui/ui_options_script.py:52
-msgid "Tagger Script"
-msgstr "Tagger Script"
+#: ../picard/musicdns/__init__.py:98
+#, fuzzy, python-format
+msgid "Looking up the fingerprint for file %s..."
+msgstr "Creating fingerprint for file %s..."
+
+#: ../picard/musicdns/__init__.py:117
+#, python-format
+msgid "Creating fingerprint for file %s..."
+msgstr "Creating fingerprint for file %s..."
 
 #: ../picard/ui/cdlookup.py:31
 msgid "Score"
 msgstr "Score"
 
 #: ../picard/ui/cdlookup.py:31
+#: ../picard/ui/itemviews.py:82
+#: ../picard/util/tags.py:23
 msgid "Title"
 msgstr ""
 
-#: ../picard/ui/cdlookup.py:31 ../picard/ui/mainwindow.py:436
+#: ../picard/ui/cdlookup.py:31
+#: ../picard/ui/itemviews.py:84
+#: ../picard/ui/mainwindow.py:436
+#: ../picard/util/tags.py:22
 msgid "Artist"
 msgstr "Artist"
 
-#: ../picard/ui/ui_metadata.py:121
-msgid "Lookup"
-msgstr "Lookup"
+#: ../picard/ui/coverartbox.py:47
+#: ../picard/ui/options/cover.py:29
+msgid "Cover Art"
+msgstr "Cover Art"
 
-#: ../picard/ui/ui_metadata.py:122
-msgid "Title:"
+#: ../picard/ui/coverartbox.py:95
+msgid "Buy the album on Amazon"
+msgstr "Buy the album on Amazon"
+
+#: ../picard/ui/filebrowser.py:38
+#: ../picard/ui/mainwindow.py:302
+msgid "&Refresh"
 msgstr ""
 
-#: ../picard/ui/ui_metadata.py:123
-msgid "Date:"
+#: ../picard/ui/filebrowser.py:41
+msgid "&Move Tagged Files Here"
 msgstr ""
 
-#: ../picard/ui/ui_metadata.py:124
-msgid "Artist:"
+#: ../picard/ui/filebrowser.py:44
+msgid "Show &Hidden Files"
 msgstr ""
 
-#: ../picard/ui/ui_metadata.py:125
-msgid "Track:"
+#: ../picard/ui/itemviews.py:83
+msgid "Length"
+msgstr "Length"
+
+#: ../picard/ui/itemviews.py:327
+msgid "&Releases"
 msgstr ""
 
-#: ../picard/ui/ui_metadata.py:126
-msgid "0000-00-00; "
-msgstr "0000-00-00; "
+#: ../picard/ui/itemviews.py:353
+msgid "&Plugins"
+msgstr ""
 
-#: ../picard/ui/ui_metadata.py:127 ../picard/ui/tageditor.py:225
-#: ../picard/ui/multitageditor.py:181
+#: ../picard/ui/itemviews.py:523
+msgid "Clusters"
+msgstr ""
+
+#: ../picard/ui/logview.py:29
+msgid "Log"
+msgstr "Log"
+
+#: ../picard/ui/puidsubmit.py:31
+#: ../picard/ui/options/plugins.py:80
+msgid "File"
+msgstr "File"
+
+#: ../picard/ui/puidsubmit.py:31
+msgid "PUID"
+msgstr ""
+
+#: ../picard/ui/puidsubmit.py:31
+#: ../picard/ui/mainwindow.py:437
+msgid "Track"
+msgstr "Track"
+
+#: ../picard/ui/puidsubmit.py:31
+msgid "Release"
+msgstr ""
+
+#: ../picard/ui/puidsubmit.py:31
+msgid "Release ID"
+msgstr ""
+
+#: ../picard/ui/tageditor.py:65
+#: ../picard/ui/ui_options_plugins.py:62
+msgid "Details"
+msgstr ""
+
+#: ../picard/ui/tageditor.py:70
+#: ../picard/ui/tageditor.py:241
+#, python-format
+msgid "%d file"
+msgid_plural "%d files"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../picard/ui/tageditor.py:124
+#, python-format
+msgid "(different across %d file)"
+msgid_plural "(different across %d files)"
+msgstr[0] "(different across %d file)"
+msgstr[1] "(different across %d files)"
+
+#: ../picard/ui/tageditor.py:127
+#, python-format
+msgid "(missing from %d file)"
+msgid_plural "(missing from %d files)"
+msgstr[0] "(missing from %d file)"
+msgstr[1] "(missing from %d files)"
+
+#: ../picard/ui/tageditor.py:210
+msgid "Filename:"
+msgstr ""
+
+#: ../picard/ui/tageditor.py:212
+msgid "Format:"
+msgstr "Format:"
+
+#: ../picard/ui/tageditor.py:221
+msgid "Size:"
+msgstr "Size:"
+
+#: ../picard/ui/tageditor.py:225
+#: ../picard/ui/ui_metadata.py:127
 msgid "Length:"
 msgstr "Length:"
 
-#: ../picard/ui/ui_metadata.py:128
-msgid "Album:"
+#: ../picard/ui/tageditor.py:227
+msgid "Bitrate:"
+msgstr "Bitrate:"
+
+#: ../picard/ui/tageditor.py:229
+msgid "Sample rate:"
+msgstr "Sample rate:"
+
+#: ../picard/ui/tageditor.py:231
+msgid "Bits per sample:"
+msgstr "Bits per sample:"
+
+#: ../picard/ui/tageditor.py:234
+msgid "Mono"
+msgstr "Mono"
+
+#: ../picard/ui/tageditor.py:235
+msgid "Stereo"
+msgstr "Stereo"
+
+#: ../picard/ui/tageditor.py:237
+msgid "Channels:"
 msgstr ""
 
-#: ../picard/ui/ui_passworddialog.py:78
-#, fuzzy
-msgid "Authentication required"
-msgstr "Unicode required"
-
-#: ../picard/ui/ui_passworddialog.py:79 ../picard/ui/ui_options_proxy.py:83
-#: ../picard/ui/ui_options_general.py:113
-msgid "Username:"
-msgstr ""
-
-#: ../picard/ui/ui_passworddialog.py:80 ../picard/ui/ui_options_proxy.py:82
-#: ../picard/ui/ui_options_general.py:112
-msgid "Password:"
-msgstr ""
-
-#: ../picard/ui/ui_passworddialog.py:81
-msgid "Save username and password"
-msgstr ""
-
-#: ../picard/ui/ui_options_folksonomy.py:114
-#: ../picard/ui/ui_options_folksonomy_tags.py:114
-msgid "Folksonomy Tags"
-msgstr "Folksonomy Tags"
-
-#: ../picard/ui/ui_options_folksonomy.py:115
-#: ../picard/ui/ui_options_folksonomy_tags.py:115
-msgid "Ignore tags:"
-msgstr "Ignore tags:"
-
-#: ../picard/ui/ui_options_folksonomy.py:116
-#: ../picard/ui/ui_options_folksonomy_tags.py:116
-msgid "Minimal tag usage:"
-msgstr "Minimal tag usage:"
-
-#: ../picard/ui/ui_options_folksonomy.py:117
-#: ../picard/ui/ui_options_folksonomy_tags.py:117
-#: ../picard/ui/ui_options_matching.py:107
-#: ../picard/ui/ui_options_matching.py:108
-#: ../picard/ui/ui_options_matching.py:109
-#: ../picard/ui/ui_options_matching.py:113
-msgid " %"
-msgstr " %"
-
-#: ../picard/ui/ui_options_folksonomy.py:118
-msgid "Maximum number of tags:"
-msgstr ""
-
-#: ../picard/ui/ui_options_folksonomy.py:119
-#: ../picard/ui/ui_options_folksonomy_tags.py:119
-msgid "Join multiple tags with:"
-msgstr "Join multiple tags with:"
-
-#: ../picard/ui/ui_options_folksonomy.py:120
-#: ../picard/ui/ui_options_folksonomy_tags.py:120
-msgid " / "
-msgstr " / "
-
-#: ../picard/ui/ui_options_folksonomy.py:121
-#: ../picard/ui/ui_options_folksonomy_tags.py:121
-msgid ", "
-msgstr ", "
-
-#: ../picard/ui/ui_options_folksonomy_tags.py:118
-msgid "Maximal number of tags:"
+#: ../picard/ui/tagsfromfilenames.py:52
+#: ../picard/ui/tagsfromfilenames.py:96
+msgid "File Name"
 msgstr ""
 
 #: ../picard/ui/mainwindow.py:64
@@ -297,7 +1628,8 @@ msgstr "Search"
 msgid "&CD Lookup..."
 msgstr ""
 
-#: ../picard/ui/mainwindow.py:272 ../picard/ui/mainwindow.py:273
+#: ../picard/ui/mainwindow.py:272
+#: ../picard/ui/mainwindow.py:273
 msgid "Lookup CD"
 msgstr ""
 
@@ -328,7 +1660,8 @@ msgstr "Ctrl+U"
 msgid "&Lookup"
 msgstr ""
 
-#: ../picard/ui/mainwindow.py:291 ../picard/ui/mainwindow.py:292
+#: ../picard/ui/mainwindow.py:291
+#: ../picard/ui/mainwindow.py:292
 msgid "Lookup metadata"
 msgstr ""
 
@@ -341,10 +1674,6 @@ msgstr "Ctrl+L"
 msgid "&Details..."
 msgstr ""
 
-#: ../picard/ui/mainwindow.py:302 ../picard/ui/filebrowser.py:38
-msgid "&Refresh"
-msgstr ""
-
 #: ../picard/ui/mainwindow.py:305
 msgid "Generate &Playlist..."
 msgstr ""
@@ -390,6 +1719,7 @@ msgid "&Tools"
 msgstr "&Tools"
 
 #: ../picard/ui/mainwindow.py:384
+#: ../picard/ui/util.py:33
 msgid "&Help"
 msgstr "&Help"
 
@@ -402,13 +1732,10 @@ msgid "&Search Bar"
 msgstr ""
 
 #: ../picard/ui/mainwindow.py:435
+#: ../picard/util/tags.py:21
 msgid "Album"
 msgstr "Album"
 
-#: ../picard/ui/mainwindow.py:437 ../picard/ui/puidsubmit.py:31
-msgid "Track"
-msgstr "Track"
-
 #: ../picard/ui/mainwindow.py:476
 msgid "All Supported Formats"
 msgstr "All Supported Formats"
@@ -423,37 +1750,291 @@ msgstr "Saving playlist %s..."
 msgid "Playlist %s saved"
 msgstr ""
 
-#: ../picard/ui/mainwindow.py:638 ../picard/ui/mainwindow.py:647
+#: ../picard/ui/mainwindow.py:638
+#: ../picard/ui/mainwindow.py:647
 #, python-format
 msgid " (Error: %s)"
 msgstr " (Error: %s)"
 
+#: ../picard/ui/ui_tageditor.py:115
+#: ../picard/ui/ui_options_plugins.py:59
+#: ../picard/ui/options/plugins.py:76
+msgid "Name"
+msgstr ""
+
+#: ../picard/ui/ui_tageditor.py:116
+msgid "Value"
+msgstr "Value"
+
+#: ../picard/ui/ui_tageditor.py:117
+msgid "&Add..."
+msgstr ""
+
+#: ../picard/ui/ui_tageditor.py:118
+msgid "&Edit..."
+msgstr ""
+
+#: ../picard/ui/ui_tageditor.py:119
+msgid "&Delete"
+msgstr ""
+
+#: ../picard/ui/ui_tageditor.py:120
+msgid "&Metadata"
+msgstr ""
+
+#: ../picard/ui/ui_tageditor.py:121
+msgid "A&rtwork"
+msgstr "A&rtwork"
+
+#: ../picard/ui/ui_tageditor.py:122
+msgid "&Info"
+msgstr ""
+
+#: ../picard/ui/passworddialog.py:38
+#, python-format
+msgid "The server %s requires you to login. Please enter your username and password."
+msgstr ""
+
+#: ../picard/ui/ui_cdlookup.py:60
+#: ../picard/ui/ui_options_cdlookup.py:47
+#: ../picard/ui/ui_options_cdlookup_win32.py:56
+#: ../picard/ui/options/cdlookup.py:35
+msgid "CD Lookup"
+msgstr "CD Lookup"
+
+#: ../picard/ui/ui_cdlookup.py:61
+msgid "The following releases on MusicBrainz match the CD:"
+msgstr "The following releases on MusicBrainz match the CD:"
+
+#: ../picard/ui/ui_cdlookup.py:62
+#: ../picard/ui/ui_puidsubmit.py:53
+msgid "OK"
+msgstr "OK"
+
+#: ../picard/ui/ui_cdlookup.py:63
+msgid "    Lookup manually    "
+msgstr "    Lookup manually    "
+
+#: ../picard/ui/ui_cdlookup.py:64
+#: ../picard/ui/ui_puidsubmit.py:54
+msgid "Cancel"
+msgstr "Cancel"
+
+#: ../picard/ui/ui_passworddialog.py:78
+#, fuzzy
+msgid "Authentication required"
+msgstr "Unicode Required"
+
+#: ../picard/ui/ui_passworddialog.py:79
+#: ../picard/ui/ui_options_general.py:113
+#: ../picard/ui/ui_options_proxy.py:83
+msgid "Username:"
+msgstr ""
+
+#: ../picard/ui/ui_passworddialog.py:80
+#: ../picard/ui/ui_options_general.py:112
+#: ../picard/ui/ui_options_proxy.py:82
+msgid "Password:"
+msgstr ""
+
+#: ../picard/ui/ui_passworddialog.py:81
+msgid "Save username and password"
+msgstr ""
+
 #: ../picard/ui/ui_edittagdialog.py:44
 msgid "Edit Tag"
 msgstr ""
 
-#: ../picard/ui/ui_options_proxy.py:81
-msgid "Web Proxy"
-msgstr "Web Proxy"
+#: ../picard/ui/ui_metadata.py:121
+msgid "Lookup"
+msgstr "Lookup"
 
-#: ../picard/ui/ui_options_proxy.py:84 ../picard/ui/ui_options_general.py:109
-msgid "Port:"
+#: ../picard/ui/ui_metadata.py:122
+msgid "Title:"
 msgstr ""
 
-#: ../picard/ui/ui_options_proxy.py:85 ../picard/ui/ui_options_general.py:110
-msgid "Server address:"
-msgstr "Server address:"
+#: ../picard/ui/ui_metadata.py:123
+msgid "Date:"
+msgstr ""
 
-#: ../picard/ui/ui_tagsfromfilenames.py:56
-msgid "Convert File Names to Tags"
-msgstr "Convert File Names to Tags"
+#: ../picard/ui/ui_metadata.py:124
+msgid "Artist:"
+msgstr ""
 
-#: ../picard/ui/ui_tagsfromfilenames.py:57
-msgid "Replace underscores with spaces"
-msgstr "Replace underscores with spaces"
+#: ../picard/ui/ui_metadata.py:125
+msgid "Track:"
+msgstr ""
+
+#: ../picard/ui/ui_metadata.py:126
+msgid "0000-00-00; "
+msgstr "0000-00-00; "
+
+#: ../picard/ui/ui_metadata.py:128
+msgid "Album:"
+msgstr ""
+
+#: ../picard/ui/ui_options.py:42
+msgid "Options"
+msgstr ""
+
+#: ../picard/ui/ui_options_cdlookup.py:48
+msgid "CD-ROM device to use for lookups:"
+msgstr ""
+
+#: ../picard/ui/ui_options_cdlookup_win32.py:57
+msgid "Default CD-ROM drive to use for lookups:"
+msgstr ""
+
+#: ../picard/ui/ui_options_cover.py:56
+msgid "Location"
+msgstr ""
+
+#: ../picard/ui/ui_options_cover.py:57
+msgid "Embed cover images into tags"
+msgstr "Embed cover images into tags"
+
+#: ../picard/ui/ui_options_cover.py:58
+msgid "Save cover images as separate files"
+msgstr "Save cover images as separate files"
+
+#: ../picard/ui/ui_options_cover.py:59
+msgid "Overwrite the file if it already exists"
+msgstr "Overwrite the file if it already exists"
+
+#: ../picard/ui/util.py:31
+msgid "&Ok"
+msgstr "&Ok"
+
+#: ../picard/ui/util.py:32
+#, fuzzy
+msgid "&Cancel"
+msgstr "Cancel"
+
+#: ../picard/ui/ui_puidsubmit.py:52
+msgid "Submit PUIDs"
+msgstr "Submit PUIDs"
+
+#: ../picard/ui/ui_options_folksonomy.py:114
+#: ../picard/ui/options/folksonomy.py:29
+msgid "Folksonomy Tags"
+msgstr "Folksonomy Tags"
+
+#: ../picard/ui/ui_options_folksonomy.py:115
+msgid "Ignore tags:"
+msgstr "Ignore tags:"
+
+#: ../picard/ui/ui_options_folksonomy.py:116
+msgid "Minimal tag usage:"
+msgstr "Minimal tag usage:"
+
+#: ../picard/ui/ui_options_folksonomy.py:117
+#: ../picard/ui/ui_options_matching.py:107
+#: ../picard/ui/ui_options_matching.py:108
+#: ../picard/ui/ui_options_matching.py:109
+#: ../picard/ui/ui_options_matching.py:113
+msgid " %"
+msgstr " %"
+
+#: ../picard/ui/ui_options_folksonomy.py:118
+msgid "Maximum number of tags:"
+msgstr ""
+
+#: ../picard/ui/ui_options_folksonomy.py:119
+msgid "Join multiple tags with:"
+msgstr "Join multiple tags with:"
+
+#: ../picard/ui/ui_options_folksonomy.py:120
+msgid " / "
+msgstr " / "
+
+#: ../picard/ui/ui_options_folksonomy.py:121
+msgid ", "
+msgstr ", "
+
+#: ../picard/ui/ui_options_interface.py:50
+msgid "Miscellaneous"
+msgstr "Miscellaneous"
+
+#: ../picard/ui/ui_options_interface.py:51
+msgid "Show text labels under icons"
+msgstr "Show text labels under icons"
+
+#: ../picard/ui/ui_options_interface.py:52
+msgid "Allow selection of multiple directories"
+msgstr ""
+
+#: ../picard/ui/ui_options_interface.py:53
+msgid "Use advanced query syntax"
+msgstr "Use advanced query syntax"
+
+#: ../picard/ui/ui_options_interface.py:54
+#, fuzzy
+msgid "User interface language:"
+msgstr "User interface language"
+
+#: ../picard/ui/ui_options_naming.py:165
+msgid "Rename Files"
+msgstr "Rename Files"
+
+#: ../picard/ui/ui_options_naming.py:166
+msgid "Replace Windows-incompatible characters"
+msgstr "Replace Windows-incompatible characters"
+
+#: ../picard/ui/ui_options_naming.py:167
+msgid "Replace non-ASCII characters"
+msgstr "Replace non-ASCII characters"
+
+#: ../picard/ui/ui_options_naming.py:168
+#: ../picard/ui/ui_options_naming.py:169
+#: ../picard/ui/ui_options_metadata.py:109
+#: ../picard/ui/ui_options_metadata.py:110
+msgid "Default"
+msgstr "Default"
+
+#: ../picard/ui/ui_options_naming.py:170
+#: ../picard/ui/options/naming.py:90
+msgid "Multiple artist file naming format:"
+msgstr "Multiple artist file naming format:"
+
+#: ../picard/ui/ui_options_naming.py:171
+#: ../picard/ui/options/naming.py:86
+msgid "File naming format:"
+msgstr "File naming format:"
+
+#: ../picard/ui/ui_options_naming.py:172
+msgid "Move Files"
+msgstr ""
+
+#: ../picard/ui/ui_options_naming.py:173
+msgid "Move tagged files to this directory:"
+msgstr ""
+
+#: ../picard/ui/ui_options_naming.py:174
+msgid "Browse..."
+msgstr ""
+
+#: ../picard/ui/ui_options_naming.py:175
+msgid "Move additional files:"
+msgstr ""
+
+#: ../picard/ui/ui_options_naming.py:176
+msgid "Delete empty directories"
+msgstr ""
+
+#: ../picard/ui/ui_options_naming.py:177
+msgid "Example"
+msgstr "Example"
+
+#: ../picard/ui/ui_options_naming.py:178
+msgid "File name:"
+msgstr ""
+
+#: ../picard/ui/ui_options_naming.py:179
+msgid "Multiple artist file name:"
+msgstr ""
 
-#: ../picard/ui/ui_tagsfromfilenames.py:58
 #: ../picard/ui/ui_options_naming.py:180
+#: ../picard/ui/ui_tagsfromfilenames.py:58
 msgid "&Preview"
 msgstr "&Preview"
 
@@ -461,11 +2042,22 @@ msgstr "&Preview"
 msgid "MusicBrainz Server"
 msgstr ""
 
+#: ../picard/ui/ui_options_general.py:109
+#: ../picard/ui/ui_options_proxy.py:84
+msgid "Port:"
+msgstr ""
+
+#: ../picard/ui/ui_options_general.py:110
+#: ../picard/ui/ui_options_proxy.py:85
+msgid "Server address:"
+msgstr "Server address:"
+
 #: ../picard/ui/ui_options_general.py:111
 msgid "Account Information"
 msgstr "Account Information"
 
 #: ../picard/ui/ui_options_general.py:114
+#: ../picard/ui/options/general.py:29
 msgid "General"
 msgstr "General"
 
@@ -473,34 +2065,6 @@ msgstr "General"
 msgid "Automatically scan all new files"
 msgstr ""
 
-#: ../picard/ui/ui_options_interface.py:46
-msgid "Miscellaneous"
-msgstr "Miscellaneous"
-
-#: ../picard/ui/ui_options_interface.py:47
-msgid "Show text labels under icons"
-msgstr "Show text labels under icons"
-
-#: ../picard/ui/ui_options_interface.py:48
-msgid "Allow selection of multiple directories"
-msgstr ""
-
-#: ../picard/ui/ui_options_interface.py:49
-msgid "Use advanced query syntax"
-msgstr "Use advanced query syntax"
-
-#: ../picard/ui/itemviews.py:327
-msgid "&Releases"
-msgstr ""
-
-#: ../picard/ui/itemviews.py:353
-msgid "&Plugins"
-msgstr ""
-
-#: ../picard/ui/itemviews.py:523
-msgid "Clusters"
-msgstr ""
-
 #: ../picard/ui/ui_options_matching.py:105
 msgid "Thresholds"
 msgstr "Thresholds"
@@ -521,6 +2085,68 @@ msgstr "Minimal similarity for cluster lookups:"
 msgid "Minimal similarity for PUID lookups:"
 msgstr "Minimal similarity for PUID lookups:"
 
+#: ../picard/ui/ui_options_metadata.py:100
+#: ../picard/ui/options/metadata.py:31
+msgid "Metadata"
+msgstr ""
+
+#: ../picard/ui/ui_options_metadata.py:101
+msgid "Translate foreign artist names to English where possible"
+msgstr ""
+
+#: ../picard/ui/ui_options_metadata.py:102
+msgid "Use release relationships"
+msgstr "Use release relationships"
+
+#: ../picard/ui/ui_options_metadata.py:103
+msgid "Use track relationships"
+msgstr "Use track relationships"
+
+#: ../picard/ui/ui_options_metadata.py:104
+msgid "Use folksonomy tags as genre"
+msgstr "Use folksonomy tags as genre"
+
+#: ../picard/ui/ui_options_metadata.py:105
+#, fuzzy
+msgid "Preferred release country:"
+msgstr "Release date"
+
+#: ../picard/ui/ui_options_metadata.py:106
+msgid "Custom Fields"
+msgstr ""
+
+#: ../picard/ui/ui_options_metadata.py:107
+msgid "Various artists:"
+msgstr "Various artists:"
+
+#: ../picard/ui/ui_options_metadata.py:108
+msgid "Non-album tracks:"
+msgstr "Non-album tracks:"
+
+#: ../picard/ui/ui_options_plugins.py:58
+#: ../picard/ui/options/plugins.py:30
+msgid "Plugins"
+msgstr ""
+
+#: ../picard/ui/ui_options_plugins.py:60
+#: ../picard/ui/options/plugins.py:79
+msgid "Author"
+msgstr "Author"
+
+#: ../picard/ui/ui_options_plugins.py:61
+#: ../picard/util/tags.py:36
+msgid "Version"
+msgstr "Version"
+
+#: ../picard/ui/ui_options_proxy.py:81
+#: ../picard/ui/options/proxy.py:28
+msgid "Web Proxy"
+msgstr "Web Proxy"
+
+#: ../picard/ui/ui_options_script.py:52
+msgid "Tagger Script"
+msgstr "Tagger Script"
+
 #: ../picard/ui/ui_options_tags.py:105
 msgid "Common"
 msgstr "Common"
@@ -573,333 +2199,26 @@ msgstr "APE"
 msgid "Remove APEv2 tags from MP3 files"
 msgstr "Remove APEv2 tags from MP3 files"
 
-#: ../picard/ui/ui_options_cdlookup_win32.py:56 ../picard/ui/ui_cdlookup.py:60
-#: ../picard/ui/ui_options_cdlookup.py:47
-msgid "CD Lookup"
-msgstr "CD Lookup"
+#: ../picard/ui/ui_tagsfromfilenames.py:56
+msgid "Convert File Names to Tags"
+msgstr "Convert File Names to Tags"
 
-#: ../picard/ui/ui_options_cdlookup_win32.py:57
-msgid "Default CD-ROM drive to use for lookups:"
-msgstr ""
+#: ../picard/ui/ui_tagsfromfilenames.py:57
+msgid "Replace underscores with spaces"
+msgstr "Replace underscores with spaces"
 
-#: ../picard/ui/tageditor.py:65 ../picard/ui/ui_options_plugins.py:62
-#: ../picard/ui/multitageditor.py:37
-msgid "Details"
-msgstr ""
-
-#: ../picard/ui/tageditor.py:70 ../picard/ui/tageditor.py:241
-#: ../picard/ui/multitageditor.py:42 ../picard/ui/multitageditor.py:197
-#, python-format
-msgid "%d file"
-msgid_plural "%d files"
-msgstr[0] ""
-msgstr[1] ""
-
-#: ../picard/ui/tageditor.py:124 ../picard/ui/multitageditor.py:95
-#, python-format
-msgid "(different across %d file)"
-msgid_plural "(different across %d files)"
-msgstr[0] "(different across %d file)"
-msgstr[1] "(different across %d files)"
-
-#: ../picard/ui/tageditor.py:127 ../picard/ui/multitageditor.py:98
-#, python-format
-msgid "(missing from %d file)"
-msgid_plural "(missing from %d files)"
-msgstr[0] "(missing from %d file)"
-msgstr[1] "(missing from %d files)"
-
-#: ../picard/ui/tageditor.py:210 ../picard/ui/multitageditor.py:166
-msgid "Filename:"
-msgstr ""
-
-#: ../picard/ui/tageditor.py:212 ../picard/ui/multitageditor.py:168
-msgid "Format:"
-msgstr "Format:"
-
-#: ../picard/ui/tageditor.py:221 ../picard/ui/multitageditor.py:177
-msgid "Size:"
-msgstr "Size:"
-
-#: ../picard/ui/tageditor.py:227 ../picard/ui/multitageditor.py:183
-msgid "Bitrate:"
-msgstr "Bitrate:"
-
-#: ../picard/ui/tageditor.py:229 ../picard/ui/multitageditor.py:185
-msgid "Sample rate:"
-msgstr "Sample rate:"
-
-#: ../picard/ui/tageditor.py:231 ../picard/ui/multitageditor.py:187
-msgid "Bits per sample:"
-msgstr "Bits per sample:"
-
-#: ../picard/ui/tageditor.py:234 ../picard/ui/multitageditor.py:190
-msgid "Mono"
-msgstr "Mono"
-
-#: ../picard/ui/tageditor.py:235 ../picard/ui/multitageditor.py:191
-msgid "Stereo"
-msgstr "Stereo"
-
-#: ../picard/ui/tageditor.py:237 ../picard/ui/multitageditor.py:193
-msgid "Channels:"
-msgstr ""
-
-#: ../picard/ui/ui_tageditor.py:115 ../picard/ui/ui_multitageditor.py:55
-#: ../picard/ui/ui_options_plugins.py:59 ../picard/ui/options/plugins.py:76
-msgid "Name"
-msgstr ""
-
-#: ../picard/ui/ui_tageditor.py:116 ../picard/ui/ui_multitageditor.py:56
-msgid "Value"
-msgstr "Value"
-
-#: ../picard/ui/ui_tageditor.py:117 ../picard/ui/ui_multitageditor.py:57
-msgid "&Add..."
-msgstr ""
-
-#: ../picard/ui/ui_tageditor.py:118
-msgid "&Edit..."
-msgstr ""
-
-#: ../picard/ui/ui_tageditor.py:119
-msgid "&Delete"
-msgstr ""
-
-#: ../picard/ui/ui_tageditor.py:120
-msgid "&Metadata"
-msgstr ""
-
-#: ../picard/ui/ui_tageditor.py:121
-msgid "A&rtwork"
-msgstr "A&rtwork"
-
-#: ../picard/ui/ui_tageditor.py:122
-msgid "&Info"
-msgstr ""
-
-#: ../picard/ui/coverartbox.py:47
-msgid "Cover Art"
-msgstr "Cover Art"
-
-#: ../picard/ui/coverartbox.py:95
-msgid "Buy the album on Amazon"
-msgstr "Buy the album on Amazon"
-
-#: ../picard/ui/ui_puidsubmit.py:52
-msgid "Submit PUIDs"
-msgstr "Submit PUIDs"
-
-#: ../picard/ui/ui_puidsubmit.py:53 ../picard/ui/ui_cdlookup.py:62
-msgid "OK"
-msgstr "OK"
-
-#: ../picard/ui/ui_puidsubmit.py:54 ../picard/ui/ui_cdlookup.py:64
-msgid "Cancel"
-msgstr "Cancel"
-
-#: ../picard/ui/puidsubmit.py:31 ../picard/ui/options/plugins.py:80
-msgid "File"
-msgstr "File"
-
-#: ../picard/ui/puidsubmit.py:31
-msgid "PUID"
-msgstr ""
-
-#: ../picard/ui/puidsubmit.py:31
-msgid "Release"
-msgstr ""
-
-#: ../picard/ui/puidsubmit.py:31
-msgid "Release ID"
-msgstr ""
-
-#: ../picard/ui/filebrowser.py:41
-msgid "&Move Tagged Files Here"
-msgstr ""
-
-#: ../picard/ui/filebrowser.py:44
-msgid "Show &Hidden Files"
-msgstr ""
-
-#: ../picard/ui/ui_cdlookup.py:61
-msgid "The following releases on MusicBrainz match the CD:"
-msgstr "The following releases on MusicBrainz match the CD:"
-
-#: ../picard/ui/ui_cdlookup.py:63
-msgid "    Lookup manually    "
-msgstr "    Lookup manually    "
-
-#: ../picard/ui/ui_options.py:42
-msgid "Options"
-msgstr ""
-
-#: ../picard/ui/tagsfromfilenames.py:52 ../picard/ui/tagsfromfilenames.py:96
-msgid "File Name"
-msgstr ""
-
-#: ../picard/ui/ui_options_cover.py:56
-msgid "Location"
-msgstr ""
-
-#: ../picard/ui/ui_options_cover.py:57
-msgid "Embed cover images into tags"
-msgstr "Embed cover images into tags"
-
-#: ../picard/ui/ui_options_cover.py:58
-msgid "Save cover images as separate files"
-msgstr "Save cover images as separate files"
-
-#: ../picard/ui/ui_options_cover.py:59
-msgid "Overwrite the file if it already exists"
-msgstr "Overwrite the file if it already exists"
-
-#: ../picard/ui/ui_options_metadata.py:100
-msgid "Metadata"
-msgstr ""
-
-#: ../picard/ui/ui_options_metadata.py:101
-msgid "Translate foreign artist names to English where possible"
-msgstr ""
-
-#: ../picard/ui/ui_options_metadata.py:102
-msgid "Use release relationships"
-msgstr "Use release relationships"
-
-#: ../picard/ui/ui_options_metadata.py:103
-msgid "Use track relationships"
-msgstr "Use track relationships"
-
-#: ../picard/ui/ui_options_metadata.py:104
-msgid "Use folksonomy tags as genre"
-msgstr "Use folksonomy tags as genre"
-
-#: ../picard/ui/ui_options_metadata.py:105
-msgid "Preferred release country:"
-msgstr ""
-
-#: ../picard/ui/ui_options_metadata.py:106
-msgid "Custom Fields"
-msgstr ""
-
-#: ../picard/ui/ui_options_metadata.py:107
-msgid "Various artists:"
-msgstr "Various artists:"
-
-#: ../picard/ui/ui_options_metadata.py:108
-msgid "Non-album tracks:"
-msgstr "Non-album tracks:"
-
-#: ../picard/ui/ui_options_metadata.py:109
-#: ../picard/ui/ui_options_metadata.py:110
-#: ../picard/ui/ui_options_naming.py:168 ../picard/ui/ui_options_naming.py:169
-msgid "Default"
-msgstr "Default"
-
-#: ../picard/ui/ui_multitageditor.py:58
-msgid "Delete"
-msgstr ""
-
-#: ../picard/ui/logview.py:29
-msgid "Log"
-msgstr "Log"
-
-#: ../picard/ui/ui_options_plugins.py:58
-msgid "Plugins"
-msgstr ""
-
-#: ../picard/ui/ui_options_plugins.py:60 ../picard/ui/options/plugins.py:79
-msgid "Author"
-msgstr "Author"
-
-#: ../picard/ui/ui_options_plugins.py:61
-msgid "Version"
-msgstr "Version"
-
-#: ../picard/ui/ui_options_naming.py:165
-msgid "Rename Files"
-msgstr "Rename Files"
-
-#: ../picard/ui/ui_options_naming.py:166
-msgid "Replace Windows-incompatible characters"
-msgstr "Replace Windows-incompatible characters"
-
-#: ../picard/ui/ui_options_naming.py:167
-msgid "Replace non-ASCII characters"
-msgstr "Replace non-ASCII characters"
-
-#: ../picard/ui/ui_options_naming.py:170 ../picard/ui/options/naming.py:90
-msgid "Multiple artist file naming format:"
-msgstr "Multiple artist file naming format:"
-
-#: ../picard/ui/ui_options_naming.py:171 ../picard/ui/options/naming.py:86
-msgid "File naming format:"
-msgstr "File naming format:"
-
-#: ../picard/ui/ui_options_naming.py:172
-msgid "Move Files"
-msgstr ""
-
-#: ../picard/ui/ui_options_naming.py:173
-msgid "Move tagged files to this directory:"
-msgstr ""
-
-#: ../picard/ui/ui_options_naming.py:174
-msgid "Browse..."
-msgstr ""
-
-#: ../picard/ui/ui_options_naming.py:175
-msgid "Move additional files:"
-msgstr ""
-
-#: ../picard/ui/ui_options_naming.py:176
-msgid "Delete empty directories"
-msgstr ""
-
-#: ../picard/ui/ui_options_naming.py:177
-msgid "Example"
-msgstr "Example"
-
-#: ../picard/ui/ui_options_naming.py:178
-msgid "File name:"
-msgstr ""
-
-#: ../picard/ui/ui_options_naming.py:179
-msgid "Multiple artist file name:"
-msgstr ""
-
-#: ../picard/ui/ui_options_cdlookup.py:48
-msgid "CD-ROM device to use for lookups:"
-msgstr ""
-
-#: ../picard/ui/options/scripting.py:84 ../picard/ui/options/naming.py:86
-#: ../picard/ui/options/naming.py:90 ../picard/ui/options/naming.py:93
-#: ../picard/ui/options/naming.py:95
-msgid "Script Error"
-msgstr ""
+#: ../picard/ui/options/about.py:29
+msgid "About"
+msgstr "About"
 
 #. Replace this with your name to have it appear in the "About" dialog.
 #: ../picard/ui/options/about.py:48
 msgid "translator-credits"
 msgstr ""
 "Launchpad Contributions:\n"
-"  for4saken <https://launchpad.net/~for4saken>\n"
-"\n"
-"Launchpad Contributions:\n"
 "  for4saken https://launchpad.net/~for4saken\n"
-"\n"
-"Launchpad Contributions:\n"
-"  for4saken https://launchpad.net/~for4saken\n"
-"\n"
-"Launchpad Contributions:\n"
 "  Jen Ockwell https://launchpad.net/~rj-ockwell\n"
-"  Lukáš Lalinský https://launchpad.net/~luks\n"
-"  for4saken https://launchpad.net/~for4saken\n"
-"\n"
-"Launchpad Contributions:\n"
-"  Jen Ockwell https://launchpad.net/~rj-ockwell\n"
-"  Lukáš Lalinský https://launchpad.net/~luks\n"
-"  for4saken https://launchpad.net/~for4saken"
+"  Lukáš Lalinský https://launchpad.net/~luks"
 
 #. Replace LANG with language you are translatig to.
 #: ../picard/ui/options/about.py:51
@@ -910,31 +2229,64 @@ msgstr "<br/>Translated to British English by %s"
 #: ../picard/ui/options/about.py:55
 #, fuzzy, python-format
 msgid ""
-"<p align=\"center\"><span style=\"font-size:15px;font-weight:bold;"
-"\">MusicBrainz Picard</span><br/>\n"
+"<p align=\"center\"><span style=\"font-size:15px;font-weight:bold;\">MusicBrainz Picard</span><br/>\n"
 "Version %(version)s</p>\n"
 "<p align=\"center\"><strong>Supported formats</strong><br/>%(formats)s</p>\n"
 "<p align=\"center\"><strong>Please donate</strong><br/>\n"
-"Thank you for using Picard. Picard relies on the MusicBrainz database, which "
-"is operated by the MetaBrainz Foundation with the help of thousands of "
-"volunteers. If you like this application please consider donating to the "
-"MetaBrainz Foundation to keep the service running.</p>\n"
-"<p align=\"center\"><a href=\"http://metabrainz.org/donate/index.html"
-"\">Donate now!</a></p>\n"
+"Thank you for using Picard. Picard relies on the MusicBrainz database, which is operated by the MetaBrainz Foundation with the help of thousands of volunteers. If you like this application please consider donating to the MetaBrainz Foundation to keep the service running.</p>\n"
+"<p align=\"center\"><a href=\"http://metabrainz.org/donate/index.html\">Donate now!</a></p>\n"
 "<p align=\"center\"><strong>Credits</strong><br/>\n"
-"<small>Copyright © 2004-2008 Robert Kaye, Lukáš Lalinský and others%"
-"(translator-credits)s</small></p>\n"
-"<p align=\"center\"><a href=\"http://musicbrainz.org/doc/PicardTagger"
-"\">http://musicbrainz.org/doc/PicardTagger</a></p>\n"
+"<small>Copyright © 2004-2008 Robert Kaye, Lukáš Lalinský and others%(translator-credits)s</small></p>\n"
+"<p align=\"center\"><a href=\"http://musicbrainz.org/doc/PicardTagger\">http://musicbrainz.org/doc/PicardTagger</a></p>\n"
 msgstr ""
-"<p align=\"center\"><span style=\"font-size:15px;font-weight:bold;"
-"\">MusicBrainz Picard</span><br/>\n"
+"<p align=\"center\"><span style=\"font-size:15px;font-weight:bold;\">MusicBrainz Picard</span><br/>\n"
 "Version %(version)s</p>\n"
 "<p align=\"center\"><strong>Supported formats:</strong> %(formats)s</p>\n"
-"<p align=\"center\"><small>Copyright © 2004-2007 Robert Kaye, Lukáš Lalinský "
-"and others%(translator-credits)s</small></p>\n"
-"<p align=\"center\"><a href=\"http://musicbrainz.org/doc/PicardTagger"
-"\">http://musicbrainz.org/doc/PicardTagger</a></p>\n"
+"<p align=\"center\"><small>Copyright © 2004-2007 Robert Kaye, Lukáš Lalinský and others%(translator-credits)s</small></p>\n"
+"<p align=\"center\"><a href=\"http://musicbrainz.org/doc/PicardTagger\">http://musicbrainz.org/doc/PicardTagger</a></p>\n"
+
+#: ../picard/ui/options/advanced.py:26
+msgid "Advanced"
+msgstr "Advanced"
+
+#: ../picard/ui/options/interface.py:31
+#, fuzzy
+msgid "User Interface"
+msgstr "User interface language"
+
+#: ../picard/ui/options/interface.py:47
+msgid "System default"
+msgstr "System default"
+
+#: ../picard/ui/options/interface.py:71
+#, fuzzy
+msgid "Language changed"
+msgstr "Language"
+
+#: ../picard/ui/options/interface.py:71
+msgid "You have changed the interface language. You have to restart Picard in order for the change to take effect."
+msgstr ""
+
+#: ../picard/ui/options/matching.py:29
+msgid "Matching"
+msgstr "Matching"
+
+#: ../picard/ui/options/metadata.py:52
+msgid "None"
+msgstr ""
+
+#: ../picard/ui/options/naming.py:33
+#, fuzzy
+msgid "File Naming"
+msgstr "File naming format:"
+
+#: ../picard/ui/options/naming.py:86
+#: ../picard/ui/options/naming.py:90
+#: ../picard/ui/options/naming.py:93
+#: ../picard/ui/options/naming.py:95
+#: ../picard/ui/options/scripting.py:84
+msgid "Script Error"
+msgstr ""
 
 #: ../picard/ui/options/naming.py:93
 msgid "The file naming format must not be empty."
@@ -953,6 +2305,256 @@ msgstr ""
 msgid "The location to move files to must not be empty."
 msgstr ""
 
+#: ../picard/ui/options/scripting.py:63
+msgid "Scripting"
+msgstr "Scripting"
+
+#: ../picard/ui/options/tags.py:29
+msgid "Tags"
+msgstr "Tags"
+
+#: ../picard/util/tags.py:24
+#, fuzzy
+msgid "Date"
+msgstr "Later"
+
+#: ../picard/util/tags.py:25
+#, fuzzy
+msgid "Album Artist"
+msgstr "Artist"
+
+#: ../picard/util/tags.py:26
+#, fuzzy
+msgid "Track Number"
+msgstr "Track Num"
+
+#: ../picard/util/tags.py:27
+#, fuzzy
+msgid "Total Tracks"
+msgstr "Total Discs"
+
+#: ../picard/util/tags.py:28
+#, fuzzy
+msgid "Disc Number"
+msgstr "Track number"
+
+#: ../picard/util/tags.py:29
+msgid "Total Discs"
+msgstr "Total Discs"
+
+#: ../picard/util/tags.py:30
+#, fuzzy
+msgid "Album Artist Sort Order"
+msgstr "Artist Sort Order"
+
+#: ../picard/util/tags.py:31
+msgid "Artist Sort Order"
+msgstr "Artist Sort Order"
+
+#: ../picard/util/tags.py:32
+msgid "Title Sort Order"
+msgstr "Title Sort Order"
+
+#: ../picard/util/tags.py:33
+#, fuzzy
+msgid "Album Sort Order"
+msgstr "Title Sort Order"
+
+#: ../picard/util/tags.py:34
+msgid "ASIN"
+msgstr "ASIN"
+
+#: ../picard/util/tags.py:35
+msgid "Grouping"
+msgstr "Grouping"
+
+#: ../picard/util/tags.py:37
+msgid "ISRC"
+msgstr "ISRC"
+
+#: ../picard/util/tags.py:38
+msgid "Mood"
+msgstr "Mood"
+
+#: ../picard/util/tags.py:39
+msgid "BPM"
+msgstr "BPM"
+
+#: ../picard/util/tags.py:40
+#, fuzzy
+msgid "Copyright"
+msgstr "Copy"
+
+#: ../picard/util/tags.py:41
+#, fuzzy
+msgid "Composer"
+msgstr "Close"
+
+#: ../picard/util/tags.py:42
+msgid "Conductor"
+msgstr "Conductor"
+
+#: ../picard/util/tags.py:43
+msgid "Lyricist"
+msgstr "Lyricist"
+
+#: ../picard/util/tags.py:44
+msgid "Arranger"
+msgstr "Arranger"
+
+#: ../picard/util/tags.py:45
+msgid "Producer"
+msgstr "Producer"
+
+#: ../picard/util/tags.py:46
+msgid "Engineer"
+msgstr "Engineer"
+
+#: ../picard/util/tags.py:47
+msgid "Subtitle"
+msgstr "Subtitle"
+
+#: ../picard/util/tags.py:48
+#, fuzzy
+msgid "Disc Subtitle"
+msgstr "Subtitle"
+
+#: ../picard/util/tags.py:49
+msgid "Remixer"
+msgstr "Remixer"
+
+#: ../picard/util/tags.py:50
+#, fuzzy
+msgid "MusicBrainz Track Id"
+msgstr "MusicBrainz account"
+
+#: ../picard/util/tags.py:51
+#, fuzzy
+msgid "MusicBrainz Release Id"
+msgstr "MusicBrainz Metadata"
+
+#: ../picard/util/tags.py:52
+#, fuzzy
+msgid "MusicBrainz Artist Id"
+msgstr "MusicBrainz Metadata"
+
+#: ../picard/util/tags.py:53
+#, fuzzy
+msgid "MusicBrainz Release Artist Id"
+msgstr "MusicBrainz server to use"
+
+#: ../picard/util/tags.py:54
+#, fuzzy
+msgid "MusicBrainz TRM Id"
+msgstr "MusicBrainz Metadata"
+
+#: ../picard/util/tags.py:55
+#, fuzzy
+msgid "MusicBrainz Disc Id"
+msgstr "MusicBrainz Metadata"
+
+#: ../picard/util/tags.py:56
+#, fuzzy
+msgid "MusicBrainz Sort Name"
+msgstr "MusicBrainz Metadata"
+
+#: ../picard/util/tags.py:57
+msgid "MusicIP PUID"
+msgstr "MusicIP PUID"
+
+#: ../picard/util/tags.py:58
+#, fuzzy
+msgid "MusicIP Fingerprint"
+msgstr "Audio Fingerprinting"
+
+#: ../picard/util/tags.py:59
+msgid "Disc Id"
+msgstr ""
+
+#: ../picard/util/tags.py:60
+msgid "Website"
+msgstr "Website"
+
+#: ../picard/util/tags.py:61
+msgid "Compilation"
+msgstr "Compilation"
+
+#: ../picard/util/tags.py:62
+msgid "Comment"
+msgstr "Comment"
+
+#: ../picard/util/tags.py:63
+#, fuzzy
+msgid "Genre"
+msgstr "General"
+
+#: ../picard/util/tags.py:64
+msgid "Encoded By"
+msgstr "Encoded By"
+
+#: ../picard/util/tags.py:65
+msgid "Performer"
+msgstr "Performer"
+
+#: ../picard/util/tags.py:66
+#, fuzzy
+msgid "Release Type"
+msgstr "Release date"
+
+#: ../picard/util/tags.py:67
+#, fuzzy
+msgid "Release Status"
+msgstr "Release date"
+
+#: ../picard/util/tags.py:68
+#, fuzzy
+msgid "Release Country"
+msgstr "Release date"
+
+#: ../picard/util/tags.py:69
+msgid "Record Label"
+msgstr "Record Label"
+
+#: ../picard/util/tags.py:70
+msgid "Barcode"
+msgstr "Barcode"
+
+#: ../picard/util/tags.py:71
+#, fuzzy
+msgid "Catalog Number"
+msgstr "Track number"
+
+#: ../picard/util/tags.py:72
+#, fuzzy
+msgid "Format"
+msgstr "Format:"
+
+#: ../picard/util/tags.py:73
+msgid "DJ-Mixer"
+msgstr "DJ-Mixer"
+
+#: ../picard/util/tags.py:74
+#, fuzzy
+msgid "Media"
+msgstr "Local Metadata"
+
+#: ../picard/util/tags.py:75
+msgid "Lyrics"
+msgstr "Lyrics"
+
+#: ../picard/util/tags.py:76
+msgid "Mixer"
+msgstr "Mixer"
+
+#: ../picard/util/tags.py:77
+msgid "Language"
+msgstr "Language"
+
+#: ../picard/util/tags.py:78
+#, fuzzy
+msgid "Script"
+msgstr "Scripting"
+
 #: ../picard/util/webbrowser2.py:84
 msgid "Web Browser Error"
 msgstr ""
@@ -965,30 +2567,8 @@ msgid ""
 "%s"
 msgstr ""
 
-#~ msgid "No matching tracks for file %s"
-#~ msgstr "No matching tracks for file %s"
-
-#~ msgid "File %s identified!"
-#~ msgstr "File %s identified!"
-
-#~ msgid "No matching releases for cluster %s"
-#~ msgstr "No matching releases for cluster %s"
-
-#~ msgid "M3U Playlist (*.m3u)"
-#~ msgstr "M3U Playlist (*.m3u)"
-
-#~ msgid "PLS Playlist (*.pls)"
-#~ msgstr "PLS Playlist (*.pls)"
-
-#~ msgid "XSPF Playlist (*.xspf)"
-#~ msgstr "XSPF Playlist (*.xspf)"
-
-#~ msgid "PUIDs submission failed: %s"
-#~ msgstr "PUIDs submission failed: %s"
-
 #~ msgid "New Version"
 #~ msgstr "New Version"
-
 #~ msgid ""
 #~ "New version of Picard is available (%s). Would you like to download it "
 #~ "now?"
@@ -996,162 +2576,63 @@ msgstr ""
 #~ "New version of Picard is available (%s). Would you like to download it "
 #~ "now?"
 
-#~ msgid "Couldn't find PUID for file %s"
-#~ msgstr "Couldn't find PUID for file %s"
+#, fuzzy
+#~ msgid "Anal&yze"
+#~ msgstr "Analyse"
 
-#~ msgid "Creating fingerprint for file %s..."
-#~ msgstr "Creating fingerprint for file %s..."
+#, fuzzy
+#~ msgid "Generate &Cuesheet..."
+#~ msgstr "Generate cuesheet"
 
-#~ msgid "Length"
-#~ msgstr "Length"
-
-#~ msgid "&Ok"
-#~ msgstr "&Ok"
-
-#~ msgid "About"
-#~ msgstr "About"
-
-#~ msgid "Advanced"
-#~ msgstr "Advanced"
-
-#~ msgid "Matching"
-#~ msgstr "Matching"
-
-#~ msgid "Scripting"
-#~ msgstr "Scripting"
-
-#~ msgid "Tags"
-#~ msgstr "Tags"
-
-#~ msgid "Total Discs"
-#~ msgstr "Total Discs"
-
-#~ msgid "Artist Sort Order"
-#~ msgstr "Artist Sort Order"
-
-#~ msgid "Title Sort Order"
-#~ msgstr "Title Sort Order"
-
-#~ msgid "ASIN"
-#~ msgstr "ASIN"
-
-#~ msgid "Grouping"
-#~ msgstr "Grouping"
-
-#~ msgid "ISRC"
-#~ msgstr "ISRC"
-
-#~ msgid "Mood"
-#~ msgstr "Mood"
-
-#~ msgid "BPM"
-#~ msgstr "BPM"
-
-#~ msgid "Conductor"
-#~ msgstr "Conductor"
-
-#~ msgid "Lyricist"
-#~ msgstr "Lyricist"
-
-#~ msgid "Arranger"
-#~ msgstr "Arranger"
-
-#~ msgid "Producer"
-#~ msgstr "Producer"
-
-#~ msgid "Engineer"
-#~ msgstr "Engineer"
-
-#~ msgid "Subtitle"
-#~ msgstr "Subtitle"
-
-#~ msgid "Remixer"
-#~ msgstr "Remixer"
-
-#~ msgid "MusicIP PUID"
-#~ msgstr "MusicIP PUID"
-
-#~ msgid "Website"
-#~ msgstr "Website"
-
-#~ msgid "Compilation"
-#~ msgstr "Compilation"
-
-#~ msgid "Comment"
-#~ msgstr "Comment"
-
-#~ msgid "Encoded By"
-#~ msgstr "Encoded By"
-
-#~ msgid "Performer"
-#~ msgstr "Performer"
-
-#~ msgid "Record Label"
-#~ msgstr "Record Label"
-
-#~ msgid "Barcode"
-#~ msgstr "Barcode"
-
-#~ msgid "DJ-Mixer"
-#~ msgstr "DJ-Mixer"
-
-#~ msgid "Lyrics"
-#~ msgstr "Lyrics"
-
-#~ msgid "Mixer"
-#~ msgstr "Mixer"
+#, fuzzy
+#~ msgid "Auto Tag"
+#~ msgstr "About Tagger"
 
+#, fuzzy
+#~ msgid "Edit &Tags..."
+#~ msgstr "Edit options..."
 #~ msgid "Automatically analyze all new files"
 #~ msgstr "Autiomatically analyse all new files"
 
+#, fuzzy
+#~ msgid "Album artist:"
+#~ msgstr "Artist"
+
+#, fuzzy
+#~ msgid "A&dd Directory..."
+#~ msgstr "Add &Directory...\tCtrl+D"
 #~ msgid "Are You Sure?"
 #~ msgstr "Are You Sure?"
-
 #~ msgid "Add &Files...\tCtrl+O"
 #~ msgstr "Add &Files...\tCtrl+O"
-
 #~ msgid "Add &Directory...\tCtrl+D"
 #~ msgstr "Add &Directory...\tCtrl+D"
-
 #~ msgid "&Save Files\tCtrl+S"
 #~ msgstr "&Save Files\tCtrl+S"
-
 #~ msgid "C&opy\tCtrl+C"
 #~ msgstr "C&opy\tCtrl+C"
-
 #~ msgid "Help"
 #~ msgstr "Help"
-
 #~ msgid "Preferences"
 #~ msgstr "Preferences"
-
 #~ msgid "Error while saving cuesheet %s."
 #~ msgstr "Error while saving cuesheet %s."
-
 #~ msgid "Cuesheet %s saved."
 #~ msgstr "Cuesheet %s saved."
-
 #~ msgid "Time"
 #~ msgstr "Time"
-
 #~ msgid "Albums"
 #~ msgstr "Albums"
-
 #~ msgid "Force Save"
 #~ msgstr "Force Save"
-
 #~ msgid "Buy"
 #~ msgstr "Buy"
-
 #~ msgid "Welcome to Picard!"
 #~ msgstr "Welcome to Picard!"
-
 #~ msgid "Track Num"
 #~ msgstr "Track Num"
-
 #~ msgid "PUID Collision"
 #~ msgstr "PUID Collision"
-
 #~ msgid ""
 #~ "Version %s\n"
 #~ "\n"
@@ -1178,121 +2659,76 @@ msgstr ""
 #~ "by a Helix Community grant.\n"
 #~ "\n"
 #~ "Supported formats: %s"
-
-#~ msgid "Colors"
-#~ msgstr "Colours"
-
 #~ msgid "Font color"
 #~ msgstr "Font colour"
-
 #~ msgid "Directories"
 #~ msgstr "Directories"
-
 #~ msgid "Watch for new files"
 #~ msgstr "Watch for new files"
-
 #~ msgid "Watch this directory for new audio files"
 #~ msgstr "Watch this directory for new audio files"
-
 #~ msgid "Encodings"
 #~ msgstr "Encodings"
-
 #~ msgid "all languages"
 #~ msgstr "all languages"
-
 #~ msgid "percent similar."
 #~ msgstr "percent similar."
-
 #~ msgid "Load recently used albums on startup"
 #~ msgstr "Load recently used albums on startup"
-
-#~ msgid "Language"
-#~ msgstr "Language"
-
-#~ msgid "System default"
-#~ msgstr "System default"
-
 #~ msgid "Allowed filename characters"
 #~ msgstr "Allowed filename characters"
-
 #~ msgid "Use Windows-safe file names"
 #~ msgstr "Use Windows-safe file names"
-
 #~ msgid "Number of tracks on the album"
 #~ msgstr "Number of tracks"
-
 #~ msgid "Track name"
 #~ msgstr "Track name"
-
 #~ msgid "Zero padded track number"
 #~ msgstr "Zero padded track number"
-
 #~ msgid "File format (e.g. mp3, ogg, wav)"
 #~ msgstr "File format (e.g. mp3, ogg, wav)"
-
 #~ msgid "Album type (album, single, EP, etc.)"
 #~ msgstr "Album type (album, single, EP, etc.)"
-
 #~ msgid "Album Status (official, promo, etc.)"
 #~ msgstr "Album Status (official, promo, etc.)"
-
 #~ msgid "Album release month"
 #~ msgstr "Album release month"
-
 #~ msgid "Album release day"
 #~ msgstr "Album release day"
-
 #~ msgid "Album release year"
 #~ msgstr "Album release year"
-
 #~ msgid "Make it so!"
 #~ msgstr "Make it so!"
-
 #~ msgid "Use proxy server to access the Internet"
 #~ msgstr "Use proxy server to access the Internet"
-
 #~ msgid "Proxy server to use"
 #~ msgstr "Proxy server to use"
-
 #~ msgid "Proxy port"
 #~ msgstr "Proxy port"
-
 #~ msgid "ID3v2.4 only"
 #~ msgstr "ID3v2.4 only"
-
 #~ msgid "Save track/album"
 #~ msgstr "Save track/album"
-
 #~ msgid "Artists"
 #~ msgstr "Artists"
-
 #~ msgid "New files (drag files to tag here)"
 #~ msgstr "New files (drag files to tag here)"
-
 #~ msgid "updating album information"
 #~ msgstr "updating album information"
-
 #~ msgid "Submitting PUID information to MusicBrainz server ..."
 #~ msgstr "Submitting PUID information to MusicBrainz server..."
-
 #~ msgid "Performing a PUID lookup on file %s ..."
 #~ msgstr "Performing a PUID lookup on file %s..."
-
 #~ msgid "Are you sure you want to exit the application?"
 #~ msgstr "Are you sure you want to exit the application?"
-
 #~ msgid "CD Lookup error -- is there a CD in the CD-ROM drive?"
 #~ msgstr "CD Lookup error -- is there a CD in the CD-ROM drive?"
-
 #~ msgid "CD Lookup Failed"
 #~ msgstr "CD Lookup Failed"
-
 #~ msgid "&Quick Start Guide"
 #~ msgstr "&Quick Start Guide"
-
 #~ msgid "Quick Start Guide"
 #~ msgstr "Quick Start Guide"
-
 #~ msgid ""
 #~ "You have not specified an username and password. In order to contribute "
 #~ "data to MusicBrainz, you must have a MusicBrainz account.\n"
@@ -1305,29 +2741,22 @@ msgstr ""
 #~ "Do you want to create a new account now? If you already have a "
 #~ "MusicBrainz account, please enter your user information in the options "
 #~ "dialogue. "
-
 #~ msgid "Couldn't connect to the MusicBrainz server."
 #~ msgstr "Couldn't connect to the MusicBrainz server."
-
 #~ msgid "Connection error"
 #~ msgstr "Connection error"
-
 #~ msgid ""
 #~ "MusicBrainz Picard requires wxPython with UNICODE support.\n"
 #~ "Please download the appropriate toolkit from http://www.wxpython.org/"
 #~ msgstr ""
 #~ "MusicBrainz Picard requires wxPython with UNICODE support.\n"
 #~ "Please download the appropriate toolkit from http://www.wxpython.org/"
-
 #~ msgid "Unicode Required"
 #~ msgstr "Unicode Required"
-
 #~ msgid "PUID collision on file %s!"
 #~ msgstr "PUID collision on file %s!"
-
 #~ msgid "Save error"
 #~ msgstr "Save error"
-
 #~ msgid ""
 #~ "The move files option is enabled, but the destination directory is not "
 #~ "specified or invalid.\n"
@@ -1338,7 +2767,6 @@ msgstr ""
 #~ "specified or invalid.\n"
 #~ "Please fix the move option or the destination directory option and try "
 #~ "again."
-
 #~ msgid ""
 #~ "Not all files could be saved. Please check for and examine tracks that "
 #~ "have an error icon in front of them. To retry saving the track, right "
@@ -1347,152 +2775,66 @@ msgstr ""
 #~ "Not all files could be saved. Please check for and examine tracks that "
 #~ "have an error icon in front of them. To retry saving the track, right "
 #~ "click the track and select 'Clear Error'"
-
 #~ msgid "Select directory that contains music files"
 #~ msgstr "Select directory that contains music files"
-
 #~ msgid "Reload album from main server"
 #~ msgstr "Reload album from main server"
-
 #~ msgid "Select or drag a folder from below"
 #~ msgstr "Select or drag a folder from below"
-
 #~ msgid "Drag files from below"
 #~ msgstr "Drag files from below"
-
 #~ msgid "Release date"
 #~ msgstr "Release date"
-
 #~ msgid "%d%% similar"
 #~ msgstr "%d%% similar"
-
 #~ msgid "Please donate to MusicBrainz!"
 #~ msgstr "Please donate to MusicBrainz!"
-
-#~ msgid "Later"
-#~ msgstr "Later"
-
 #~ msgid ""
 #~ "The destination directory %s does not exist. Please pick a valid "
 #~ "directory."
 #~ msgstr ""
 #~ "The destination directory %s does not exist. Please pick a valid "
 #~ "directory."
-
 #~ msgid "Select the encoding to use when reading and writing filenames"
 #~ msgstr "Select the encoding to use when reading and writing filenames"
-
 #~ msgid "Automatically move clusters to albums that are at least"
 #~ msgstr "Automatically move clusters to albums that are at least"
-
 #~ msgid "Automatically save recognized tracks that are at least"
 #~ msgstr "Automatically save recognised tracks that are at least"
-
-#~ msgid "Czech"
-#~ msgstr "Czech"
-
-#~ msgid "German"
-#~ msgstr "German"
-
-#~ msgid "English"
-#~ msgstr "English"
-
-#~ msgid "English (UK)"
-#~ msgstr "English (UK)"
-
-#~ msgid "Spanish"
-#~ msgstr "Spanish"
-
-#~ msgid "Finnish"
-#~ msgstr "Finnish"
-
-#~ msgid "French"
-#~ msgstr "French"
-
-#~ msgid "Hungarian"
-#~ msgstr "Hungarian"
-
-#~ msgid "Icelandic"
-#~ msgstr "Icelandic"
-
-#~ msgid "Italian"
-#~ msgstr "Italian"
-
-#~ msgid "Korean"
-#~ msgstr "Korean"
-
-#~ msgid "Lithuanian"
-#~ msgstr "Lithuanian"
-
-#~ msgid "Dutch"
-#~ msgstr "Dutch"
-
-#~ msgid "Norwegian Bokmal"
-#~ msgstr "Norwegian Bokmal"
-
-#~ msgid "Portuguese"
-#~ msgstr "Portuguese"
-
-#~ msgid "Romanian"
-#~ msgstr "Romanian"
-
-#~ msgid "Russian"
-#~ msgstr "Russian"
-
-#~ msgid "Slovak"
-#~ msgstr "Slovak"
-
-#~ msgid "Swedish"
-#~ msgstr "Swedish"
-
 #~ msgid ""
 #~ "Note: This setting will take effect after you restart the application."
 #~ msgstr ""
 #~ "Note: This setting will take effect after you restart the application."
-
 #~ msgid "Artist translation"
 #~ msgstr "Artist translation"
-
 #~ msgid "Rename files when writing metadata tags"
 #~ msgstr "Rename files when writing metadata tags"
-
 #~ msgid "Naming Help"
 #~ msgstr "Naming Help"
-
 #~ msgid ""
 #~ "You may use the following variables in the filenaming\n"
 #~ "specifications in the options dialog:"
 #~ msgstr ""
 #~ "You may use the following variables in the filenaming\n"
 #~ "specifications in the options dialog:"
-
 #~ msgid "A %s in the naming specification will create a new subfolder."
 #~ msgstr "A %s in the naming specification will create a new subfolder."
-
 #~ msgid "Audio fingerprinting options"
 #~ msgstr "Audio fingerprinting options"
-
 #~ msgid "Automatically select PUID collision tracks that are at least"
 #~ msgstr "Automatically select PUID collision tracks that are at least"
-
 #~ msgid "Write ID3v1 tags to MP3 files (ID3v2 tags will always be written)"
 #~ msgstr "Write ID3v1 tags to MP3 files (ID3v2 tags will always be written)"
-
 #~ msgid "Remove track/album"
 #~ msgstr "Remove track/album"
-
 #~ msgid "Listen to track"
 #~ msgstr "Listen to track"
-
 #~ msgid "Album clusters"
 #~ msgstr "Album clusters"
-
 #~ msgid "Unmatched files for this album"
 #~ msgstr "Unmatched files for this album"
-
 #~ msgid "%d of %d tracks linked"
 #~ msgstr "%d of %d tracks linked"
-
 #~ msgid ""
 #~ "The Picard Tagger is a free application and you may\n"
 #~ "use it as long as you wish. However, providing\n"
@@ -1511,96 +2853,68 @@ msgstr ""
 #~ "which operates the MusicBrainz project. All donations\n"
 #~ "are tax deductible for US residents and will keep this\n"
 #~ "service alive and moving forward."
-
 #~ msgid "Matched track highlighting"
 #~ msgstr "Matched track highlighting"
-
 #~ msgid "Good match background color"
 #~ msgstr "Good match background colour"
-
 #~ msgid "Bad match background color"
 #~ msgstr "Bad match background colour"
-
 #~ msgid "Move files option"
 #~ msgstr "Move files option"
-
 #~ msgid "When matching tracks to albums, accept tracks that are at least"
 #~ msgstr "When matching tracks to albums, accept tracks that are at least"
-
 #~ msgid "CD-ROM drive path to use for lookups"
 #~ msgstr "CD-ROM drive path to use for lookups"
-
 #~ msgid "Launch MB Tagger automatically for inserted Audio CDs"
 #~ msgstr "Launch MB Tagger automatically for inserted Audio CDs"
-
 #~ msgid ""
 #~ "Failed to set the proper registy values to enable launching the tagger "
 #~ "after CD insertion. "
 #~ msgstr ""
 #~ "Failed to set the proper registry values to enable launching the tagger "
 #~ "after CD insertion. "
-
 #~ msgid "Default CD setting failed"
 #~ msgstr "Default CD setting failed"
-
 #~ msgid "File format naming specification"
 #~ msgstr "File format naming specification"
-
 #~ msgid "Various artist file format naming specification"
 #~ msgstr "Various artist file format naming specification"
-
 #~ msgid "Note: Leave blank to allow all possible characters"
 #~ msgstr "Note: Leave blank to allow all possible characters"
-
 #~ msgid "Track artist name"
 #~ msgstr "Track artist name"
-
 #~ msgid "Track artist sortname"
 #~ msgstr "Track artist sortname"
-
 #~ msgid "The first character of the artist sortname"
 #~ msgstr "The first character of the artist sortname"
-
 #~ msgid "The first two characters of the artist sortname"
 #~ msgstr "The first two characters of the artist sortname"
-
 #~ msgid "The first three characters of the artist sortname"
 #~ msgstr "The first three characters of the artist sortname"
-
 #~ msgid "Naming specification help"
 #~ msgstr "Naming specification help"
-
 #~ msgid "Accept PUID matches that are at least"
 #~ msgstr "Accept PUID matches that are at least"
-
 #~ msgid "Various artist name"
 #~ msgstr "Various artist name"
-
 #~ msgid "Open file"
 #~ msgstr "Open file"
-
 #~ msgid "Open directory"
 #~ msgstr "Open directory"
-
 #~ msgid "Edit options"
 #~ msgstr "Edit options"
-
 #~ msgid "Exit"
 #~ msgstr "Exit"
-
 #~ msgid ""
 #~ "The MusicBrainz Tagger requires wx.Widgets with UNICODE support.\n"
 #~ "Please download the appropriate toolkit from  http://www.wxwidgets.com"
 #~ msgstr ""
 #~ "The MusicBrainz Tagger requires wx.Widgets with UNICODE support.\n"
 #~ "Please download the appropriate toolkit from  http://www.wxwidgets.com"
-
 #~ msgid "Sorry, there is no help file yet."
 #~ msgstr "Sorry, there is no help file yet."
-
 #~ msgid "Use Internet Explorer settings for proxy support."
 #~ msgstr "Use Internet Explorer settings for proxy support."
-
 #~ msgid ""
 #~ "If you use an automatic proxy configuration in Internet\n"
 #~ "Explorer, uncheck the box above and enter your\n"
@@ -1609,3 +2923,4 @@ msgstr ""
 #~ "If you use an automatic proxy configuration in Internet\n"
 #~ "Explorer, uncheck the box above and enter your\n"
 #~ "proxy server and proxy port below:"
+
diff --git a/po/es.po b/po/es.po
index 738190f49..f4ed96646 100644
--- a/po/es.po
+++ b/po/es.po
@@ -6,36 +6,1322 @@ msgid ""
 msgstr ""
 "Project-Id-Version: picard\n"
 "Report-Msgid-Bugs-To: http://bugs.musicbrainz.org/\n"
-"POT-Creation-Date: 2008-12-01 18:20+0100\n"
-"PO-Revision-Date: 2008-08-29 17:44+0000\n"
-"Last-Translator: Steven De Winter <Unknown>\n"
+"POT-Creation-Date: 2009-01-25 12:23+0100\n"
+"PO-Revision-Date: 2009-01-25 13:11+0100\n"
+"Last-Translator: Philipp Wolfer <phw@rubyforge.org>\n"
 "Language-Team: Spanish <sp@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2008-12-01 17:01+0000\n"
+"X-Launchpad-Export-Date: 2009-01-24 23:28+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 "Generated-By: pygettext.py 1.5\n"
 
-#: ../picard/album.py:108 ../picard/cluster.py:248
+#: ../picard/album.py:108
+#: ../picard/cluster.py:248
 msgid "Unmatched Files"
 msgstr "Archivos desagrupados"
 
-#: ../picard/album.py:269
+#: ../picard/album.py:281
 #, python-format
 msgid "[couldn't load album %s]"
 msgstr "[no se pudo cargar el álbum (%s)]"
 
-#: ../picard/album.py:305
+#: ../picard/album.py:317
 msgid "[loading album information]"
 msgstr "[cargando información del álbum]"
 
-#: ../picard/tagger.py:472
+#: ../picard/cluster.py:164
+#: ../picard/cluster.py:175
+#, python-format
+msgid "No matching releases for cluster %s"
+msgstr "No se han encontrado álbums concordantes para el grupo %s"
+
+#: ../picard/cluster.py:177
+#, python-format
+msgid "Cluster %s identified!"
+msgstr "¡Grupo %s identificado!"
+
+#: ../picard/cluster.py:182
+#, python-format
+msgid "Looking up the metadata for cluster %s..."
+msgstr "Buscando los metadatos para el grupo %s..."
+
+#: ../picard/const.py:40
+msgid "CD"
+msgstr ""
+
+#: ../picard/const.py:41
+msgid "DVD"
+msgstr ""
+
+#: ../picard/const.py:42
+msgid "SACD"
+msgstr ""
+
+#: ../picard/const.py:43
+msgid "LaserDisc"
+msgstr ""
+
+#: ../picard/const.py:44
+msgid "MiniDisc"
+msgstr ""
+
+#: ../picard/const.py:45
+msgid "Vinyl"
+msgstr ""
+
+#: ../picard/const.py:46
+msgid "Cassette"
+msgstr ""
+
+#: ../picard/const.py:47
+msgid "Cartridge (4/8-tracks)"
+msgstr ""
+
+#: ../picard/const.py:48
+msgid "Reel-to-Reel"
+msgstr ""
+
+#: ../picard/const.py:49
+msgid "DAT"
+msgstr ""
+
+#: ../picard/const.py:50
+#, fuzzy
+msgid "Digital Media"
+msgstr "Metadatos Originales"
+
+#: ../picard/const.py:51
+msgid "Wax Cylinder"
+msgstr ""
+
+#: ../picard/const.py:52
+msgid "Piano Roll"
+msgstr ""
+
+#: ../picard/const.py:53
+#, fuzzy
+msgid "Other"
+msgstr "Más tarde"
+
+#: ../picard/const.py:58
+msgid "Bangladesh"
+msgstr ""
+
+#: ../picard/const.py:59
+msgid "Belgium"
+msgstr ""
+
+#: ../picard/const.py:60
+msgid "Burkina Faso"
+msgstr ""
+
+#: ../picard/const.py:61
+#, fuzzy
+msgid "Bulgaria"
+msgstr "Húngaro"
+
+#: ../picard/const.py:62
+msgid "Barbados"
+msgstr ""
+
+#: ../picard/const.py:63
+msgid "Wallis and Futuna Islands"
+msgstr ""
+
+#: ../picard/const.py:64
+#, fuzzy
+msgid "Bermuda"
+msgstr "Alemán"
+
+#: ../picard/const.py:65
+msgid "Brunei Darussalam"
+msgstr ""
+
+#: ../picard/const.py:66
+msgid "Bolivia"
+msgstr ""
+
+#: ../picard/const.py:67
+msgid "Bahrain"
+msgstr ""
+
+#: ../picard/const.py:68
+msgid "Burundi"
+msgstr ""
+
+#: ../picard/const.py:69
+msgid "Benin"
+msgstr ""
+
+#: ../picard/const.py:70
+msgid "Bhutan"
+msgstr ""
+
+#: ../picard/const.py:71
+msgid "Jamaica"
+msgstr ""
+
+#: ../picard/const.py:72
+msgid "Bouvet Island"
+msgstr ""
+
+#: ../picard/const.py:73
+msgid "Botswana"
+msgstr ""
+
+#: ../picard/const.py:74
+msgid "Samoa"
+msgstr ""
+
+#: ../picard/const.py:75
+msgid "Brazil"
+msgstr ""
+
+#: ../picard/const.py:76
+msgid "Bahamas"
+msgstr ""
+
+#: ../picard/const.py:77
+msgid "Belarus"
+msgstr ""
+
+#: ../picard/const.py:78
+msgid "Belize"
+msgstr ""
+
+#: ../picard/const.py:79
+msgid "Russian Federation"
+msgstr ""
+
+#: ../picard/const.py:80
+msgid "Rwanda"
+msgstr ""
+
+#: ../picard/const.py:81
+msgid "Reunion"
+msgstr ""
+
+#: ../picard/const.py:82
+msgid "Turkmenistan"
+msgstr ""
+
+#: ../picard/const.py:83
+msgid "Tajikistan"
+msgstr ""
+
+#: ../picard/const.py:84
+#, fuzzy
+msgid "Romania"
+msgstr "Rumano"
+
+#: ../picard/const.py:85
+#, fuzzy
+msgid "Tokela"
+msgstr "Barra de herramientas"
+
+#: ../picard/const.py:86
+msgid "Guinea-Bissa"
+msgstr ""
+
+#: ../picard/const.py:87
+msgid "Guam"
+msgstr ""
+
+#: ../picard/const.py:88
+msgid "Guatemala"
+msgstr ""
+
+#: ../picard/const.py:89
+msgid "Greece"
+msgstr ""
+
+#: ../picard/const.py:90
+msgid "Equatorial Guinea"
+msgstr ""
+
+#: ../picard/const.py:91
+msgid "Guadeloupe"
+msgstr ""
+
+#: ../picard/const.py:92
+msgid "Japan"
+msgstr ""
+
+#: ../picard/const.py:93
+msgid "Guyana"
+msgstr ""
+
+#: ../picard/const.py:94
+#, fuzzy
+msgid "French Guiana"
+msgstr "Francés"
+
+#: ../picard/const.py:95
+#, fuzzy
+msgid "Georgia"
+msgstr "Alemán"
+
+#: ../picard/const.py:96
+msgid "Grenada"
+msgstr ""
+
+#: ../picard/const.py:97
+msgid "United Kingdom"
+msgstr ""
+
+#: ../picard/const.py:98
+msgid "Gabon"
+msgstr ""
+
+#: ../picard/const.py:99
+msgid "El Salvador"
+msgstr ""
+
+#: ../picard/const.py:100
+#, fuzzy
+msgid "Guinea"
+msgstr "General"
+
+#: ../picard/const.py:101
+msgid "Gambia"
+msgstr ""
+
+#: ../picard/const.py:102
+msgid "Greenland"
+msgstr ""
+
+#: ../picard/const.py:103
+msgid "Gibraltar"
+msgstr ""
+
+#: ../picard/const.py:104
+msgid "Ghana"
+msgstr ""
+
+#: ../picard/const.py:105
+#, fuzzy
+msgid "Oman"
+msgstr "Alemán"
+
+#: ../picard/const.py:106
+msgid "Tunisia"
+msgstr ""
+
+#: ../picard/const.py:107
+#, fuzzy
+msgid "Jordan"
+msgstr "Coreano"
+
+#: ../picard/const.py:108
+msgid "Haiti"
+msgstr ""
+
+#: ../picard/const.py:109
+#, fuzzy
+msgid "Hungary"
+msgstr "Húngaro"
+
+#: ../picard/const.py:110
+msgid "Hong Kong"
+msgstr ""
+
+#: ../picard/const.py:111
+msgid "Honduras"
+msgstr ""
+
+#: ../picard/const.py:112
+msgid "Heard and Mc Donald Islands"
+msgstr ""
+
+#: ../picard/const.py:113
+msgid "Venezuela"
+msgstr ""
+
+#: ../picard/const.py:114
+msgid "Puerto Rico"
+msgstr ""
+
+#: ../picard/const.py:115
+msgid "Pala"
+msgstr ""
+
+#: ../picard/const.py:116
+#, fuzzy
+msgid "Portugal"
+msgstr "Portugués"
+
+#: ../picard/const.py:117
+msgid "Svalbard and Jan Mayen Islands"
+msgstr ""
+
+#: ../picard/const.py:118
+msgid "Paraguay"
+msgstr ""
+
+#: ../picard/const.py:119
+msgid "Iraq"
+msgstr ""
+
+#: ../picard/const.py:120
+msgid "Panama"
+msgstr ""
+
+#: ../picard/const.py:121
+msgid "French Polynesia"
+msgstr ""
+
+#: ../picard/const.py:122
+msgid "Papua New Guinea"
+msgstr ""
+
+#: ../picard/const.py:123
+msgid "Per"
+msgstr ""
+
+#: ../picard/const.py:124
+msgid "Pakistan"
+msgstr ""
+
+#: ../picard/const.py:125
+msgid "Philippines"
+msgstr ""
+
+#: ../picard/const.py:126
+msgid "Pitcairn"
+msgstr ""
+
+#: ../picard/const.py:127
+msgid "Poland"
+msgstr ""
+
+#: ../picard/const.py:128
+msgid "St. Pierre and Miquelon"
+msgstr ""
+
+#: ../picard/const.py:129
+msgid "Zambia"
+msgstr ""
+
+#: ../picard/const.py:130
+msgid "Western Sahara"
+msgstr ""
+
+#: ../picard/const.py:131
+msgid "Estonia"
+msgstr ""
+
+#: ../picard/const.py:132
+msgid "Egypt"
+msgstr ""
+
+#: ../picard/const.py:133
+msgid "South Africa"
+msgstr ""
+
+#: ../picard/const.py:134
+msgid "Ecuador"
+msgstr ""
+
+#: ../picard/const.py:135
+#, fuzzy
+msgid "Italy"
+msgstr "Italiano"
+
+#: ../picard/const.py:136
+#, fuzzy
+msgid "Viet Nam"
+msgstr "Nombre de fichero"
+
+#: ../picard/const.py:137
+msgid "Solomon Islands"
+msgstr ""
+
+#: ../picard/const.py:138
+msgid "Ethiopia"
+msgstr ""
+
+#: ../picard/const.py:139
+#, fuzzy
+msgid "Somalia"
+msgstr "Rumano"
+
+#: ../picard/const.py:140
+msgid "Zimbabwe"
+msgstr ""
+
+#: ../picard/const.py:141
+msgid "Saudi Arabia"
+msgstr ""
+
+#: ../picard/const.py:142
+#, fuzzy
+msgid "Spain"
+msgstr "Español"
+
+#: ../picard/const.py:143
+msgid "Eritrea"
+msgstr ""
+
+#: ../picard/const.py:144
+msgid "Moldova, Republic of"
+msgstr ""
+
+#: ../picard/const.py:145
+msgid "Madagascar"
+msgstr ""
+
+#: ../picard/const.py:146
+msgid "Morocco"
+msgstr ""
+
+#: ../picard/const.py:147
+#, fuzzy
+msgid "Monaco"
+msgstr "Mono"
+
+#: ../picard/const.py:148
+msgid "Uzbekistan"
+msgstr ""
+
+#: ../picard/const.py:149
+msgid "Myanmar"
+msgstr ""
+
+#: ../picard/const.py:150
+msgid "Mali"
+msgstr ""
+
+#: ../picard/const.py:151
+msgid "Maca"
+msgstr ""
+
+#: ../picard/const.py:152
+#, fuzzy
+msgid "Mongolia"
+msgstr "Mono"
+
+#: ../picard/const.py:153
+msgid "Marshall Islands"
+msgstr ""
+
+#: ../picard/const.py:154
+msgid "Macedonia, The Former Yugoslav Republic of"
+msgstr ""
+
+#: ../picard/const.py:155
+msgid "Mauritius"
+msgstr ""
+
+#: ../picard/const.py:156
+#, fuzzy
+msgid "Malta"
+msgstr "Metadatos"
+
+#: ../picard/const.py:157
+msgid "Malawi"
+msgstr ""
+
+#: ../picard/const.py:158
+msgid "Maldives"
+msgstr ""
+
+#: ../picard/const.py:159
+msgid "Martinique"
+msgstr ""
+
+#: ../picard/const.py:160
+msgid "Northern Mariana Islands"
+msgstr ""
+
+#: ../picard/const.py:161
+msgid "Montserrat"
+msgstr ""
+
+#: ../picard/const.py:162
+#, fuzzy
+msgid "Mauritania"
+msgstr "Lituano"
+
+#: ../picard/const.py:163
+msgid "Uganda"
+msgstr ""
+
+#: ../picard/const.py:164
+msgid "Malaysia"
+msgstr ""
+
+#: ../picard/const.py:165
+msgid "Mexico"
+msgstr ""
+
+#: ../picard/const.py:166
+msgid "Israel"
+msgstr ""
+
+#: ../picard/const.py:167
+#, fuzzy
+msgid "France"
+msgstr "Cancelar"
+
+#: ../picard/const.py:168
+msgid "British Indian Ocean Territory"
+msgstr ""
+
+#: ../picard/const.py:169
+msgid "St. Helena"
+msgstr ""
+
+#: ../picard/const.py:170
+msgid "Finland"
+msgstr ""
+
+#: ../picard/const.py:171
+msgid "Fiji"
+msgstr ""
+
+#: ../picard/const.py:172
+msgid "Falkland Islands (Malvinas)"
+msgstr ""
+
+#: ../picard/const.py:173
+msgid "Micronesia, Federated States of"
+msgstr ""
+
+#: ../picard/const.py:174
+msgid "Faroe Islands"
+msgstr ""
+
+#: ../picard/const.py:175
+msgid "Nicaragua"
+msgstr ""
+
+#: ../picard/const.py:176
+msgid "Netherlands"
+msgstr ""
+
+#: ../picard/const.py:177
+msgid "Norway"
+msgstr ""
+
+#: ../picard/const.py:178
+msgid "Namibia"
+msgstr ""
+
+#: ../picard/const.py:179
+msgid "Vanuat"
+msgstr ""
+
+#: ../picard/const.py:180
+msgid "New Caledonia"
+msgstr ""
+
+#: ../picard/const.py:181
+#, fuzzy
+msgid "Niger"
+msgstr "Mezclador"
+
+#: ../picard/const.py:182
+msgid "Norfolk Island"
+msgstr ""
+
+#: ../picard/const.py:183
+msgid "Nigeria"
+msgstr ""
+
+#: ../picard/const.py:184
+#, fuzzy
+msgid "New Zealand"
+msgstr "Metadatos Nuevos"
+
+#: ../picard/const.py:185
+msgid "Zaire"
+msgstr ""
+
+#: ../picard/const.py:186
+msgid "Nepal"
+msgstr ""
+
+#: ../picard/const.py:187
+msgid "Naur"
+msgstr ""
+
+#: ../picard/const.py:188
+msgid "Niue"
+msgstr ""
+
+#: ../picard/const.py:189
+msgid "Cook Islands"
+msgstr ""
+
+#: ../picard/const.py:190
+msgid "Cote d'Ivoire"
+msgstr ""
+
+#: ../picard/const.py:191
+msgid "Switzerland"
+msgstr ""
+
+#: ../picard/const.py:192
+msgid "Colombia"
+msgstr ""
+
+#: ../picard/const.py:193
+msgid "China"
+msgstr ""
+
+#: ../picard/const.py:194
+msgid "Cameroon"
+msgstr ""
+
+#: ../picard/const.py:195
+#, fuzzy
+msgid "Chile"
+msgstr "Fichero"
+
+#: ../picard/const.py:196
+msgid "Cocos (Keeling) Islands"
+msgstr ""
+
+#: ../picard/const.py:197
+msgid "Canada"
+msgstr ""
+
+#: ../picard/const.py:198
+#, fuzzy
+msgid "Congo"
+msgstr "Mono"
+
+#: ../picard/const.py:199
+msgid "Central African Republic"
+msgstr ""
+
+#: ../picard/const.py:200
+msgid "Czech Republic"
+msgstr ""
+
+#: ../picard/const.py:201
+msgid "Cyprus"
+msgstr ""
+
+#: ../picard/const.py:202
+msgid "Christmas Island"
+msgstr ""
+
+#: ../picard/const.py:203
+msgid "Costa Rica"
+msgstr ""
+
+#: ../picard/const.py:204
+msgid "Cape Verde"
+msgstr ""
+
+#: ../picard/const.py:205
+msgid "Cuba"
+msgstr ""
+
+#: ../picard/const.py:206
+msgid "Swaziland"
+msgstr ""
+
+#: ../picard/const.py:207
+msgid "Syrian Arab Republic"
+msgstr ""
+
+#: ../picard/const.py:208
+msgid "Kyrgyzstan"
+msgstr ""
+
+#: ../picard/const.py:209
+msgid "Kenya"
+msgstr ""
+
+#: ../picard/const.py:210
+msgid "Suriname"
+msgstr ""
+
+#: ../picard/const.py:211
+msgid "Kiribati"
+msgstr ""
+
+#: ../picard/const.py:212
+msgid "Cambodia"
+msgstr ""
+
+#: ../picard/const.py:213
+msgid "Saint Kitts and Nevis"
+msgstr ""
+
+#: ../picard/const.py:214
+#, fuzzy
+msgid "Comoros"
+msgstr "Colores"
+
+#: ../picard/const.py:215
+msgid "Sao Tome and Principe"
+msgstr ""
+
+#: ../picard/const.py:216
+#, fuzzy
+msgid "Slovenia"
+msgstr "Eslovako"
+
+#: ../picard/const.py:217
+msgid "Kuwait"
+msgstr ""
+
+#: ../picard/const.py:218
+#, fuzzy
+msgid "Senegal"
+msgstr "General"
+
+#: ../picard/const.py:219
+msgid "San Marino"
+msgstr ""
+
+#: ../picard/const.py:220
+msgid "Sierra Leone"
+msgstr ""
+
+#: ../picard/const.py:221
+msgid "Seychelles"
+msgstr ""
+
+#: ../picard/const.py:222
+msgid "Kazakhstan"
+msgstr ""
+
+#: ../picard/const.py:223
+msgid "Cayman Islands"
+msgstr ""
+
+#: ../picard/const.py:224
+msgid "Singapore"
+msgstr ""
+
+#: ../picard/const.py:225
+#, fuzzy
+msgid "Sweden"
+msgstr "Sueco"
+
+#: ../picard/const.py:226
+#, fuzzy
+msgid "Sudan"
+msgstr "&Analizar"
+
+#: ../picard/const.py:227
+msgid "Dominican Republic"
+msgstr ""
+
+#: ../picard/const.py:228
+#, fuzzy
+msgid "Dominica"
+msgstr "Rumano"
+
+#: ../picard/const.py:229
+#, fuzzy
+msgid "Djibouti"
+msgstr "Acerca de"
+
+#: ../picard/const.py:230
+msgid "Denmark"
+msgstr ""
+
+#: ../picard/const.py:231
+msgid "Virgin Islands (British)"
+msgstr ""
+
+#: ../picard/const.py:232
+#, fuzzy
+msgid "Germany"
+msgstr "Alemán"
+
+#: ../picard/const.py:233
+msgid "Yemen"
+msgstr ""
+
+#: ../picard/const.py:234
+msgid "Algeria"
+msgstr ""
+
+#: ../picard/const.py:235
+msgid "United States"
+msgstr ""
+
+#: ../picard/const.py:236
+msgid "Uruguay"
+msgstr ""
+
+#: ../picard/const.py:237
+msgid "Mayotte"
+msgstr ""
+
+#: ../picard/const.py:238
+msgid "United States Minor Outlying Islands"
+msgstr ""
+
+#: ../picard/const.py:239
+msgid "Lebanon"
+msgstr ""
+
+#: ../picard/const.py:240
+msgid "Saint Lucia"
+msgstr ""
+
+#: ../picard/const.py:241
+msgid "Lao People's Democratic Republic"
+msgstr ""
+
+#: ../picard/const.py:242
+msgid "Tuval"
+msgstr ""
+
+#: ../picard/const.py:243
+#, fuzzy
+msgid "Taiwan"
+msgstr "Italiano"
+
+#: ../picard/const.py:244
+msgid "Trinidad and Tobago"
+msgstr ""
+
+#: ../picard/const.py:245
+msgid "Turkey"
+msgstr ""
+
+#: ../picard/const.py:246
+msgid "Sri Lanka"
+msgstr ""
+
+#: ../picard/const.py:247
+msgid "Liechtenstein"
+msgstr ""
+
+#: ../picard/const.py:248
+msgid "Latvia"
+msgstr ""
+
+#: ../picard/const.py:249
+msgid "Tonga"
+msgstr ""
+
+#: ../picard/const.py:250
+#, fuzzy
+msgid "Lithuania"
+msgstr "Lituano"
+
+#: ../picard/const.py:251
+msgid "Luxembourg"
+msgstr ""
+
+#: ../picard/const.py:252
+msgid "Liberia"
+msgstr ""
+
+#: ../picard/const.py:253
+#, fuzzy
+msgid "Lesotho"
+msgstr "Duración"
+
+#: ../picard/const.py:254
+msgid "Thailand"
+msgstr ""
+
+#: ../picard/const.py:255
+msgid "French Southern Territories"
+msgstr ""
+
+#: ../picard/const.py:256
+#, fuzzy
+msgid "Togo"
+msgstr "Herramien&tas"
+
+#: ../picard/const.py:257
+msgid "Chad"
+msgstr ""
+
+#: ../picard/const.py:258
+msgid "Turks and Caicos Islands"
+msgstr ""
+
+#: ../picard/const.py:259
+msgid "Libyan Arab Jamahiriya"
+msgstr ""
+
+#: ../picard/const.py:260
+msgid "Vatican City State (Holy See)"
+msgstr ""
+
+#: ../picard/const.py:261
+msgid "Saint Vincent and The Grenadines"
+msgstr ""
+
+#: ../picard/const.py:262
+msgid "United Arab Emirates"
+msgstr ""
+
+#: ../picard/const.py:263
+msgid "Andorra"
+msgstr ""
+
+#: ../picard/const.py:264
+msgid "Antigua and Barbuda"
+msgstr ""
+
+#: ../picard/const.py:265
+msgid "Afghanistan"
+msgstr ""
+
+#: ../picard/const.py:266
+msgid "Anguilla"
+msgstr ""
+
+#: ../picard/const.py:267
+msgid "Virgin Islands (U.S.)"
+msgstr ""
+
+#: ../picard/const.py:268
+#, fuzzy
+msgid "Iceland"
+msgstr "Islandés"
+
+#: ../picard/const.py:269
+msgid "Iran (Islamic Republic of)"
+msgstr ""
+
+#: ../picard/const.py:270
+msgid "Armenia"
+msgstr ""
+
+#: ../picard/const.py:271
+msgid "Albania"
+msgstr ""
+
+#: ../picard/const.py:272
+msgid "Angola"
+msgstr ""
+
+#: ../picard/const.py:273
+msgid "Netherlands Antilles"
+msgstr ""
+
+#: ../picard/const.py:274
+msgid "Antarctica"
+msgstr ""
+
+#: ../picard/const.py:275
+msgid "American Samoa"
+msgstr ""
+
+#: ../picard/const.py:276
+msgid "Argentina"
+msgstr ""
+
+#: ../picard/const.py:277
+#, fuzzy
+msgid "Australia"
+msgstr "Italiano"
+
+#: ../picard/const.py:278
+#, fuzzy
+msgid "Austria"
+msgstr "Autor"
+
+#: ../picard/const.py:279
+msgid "Aruba"
+msgstr ""
+
+#: ../picard/const.py:280
+#, fuzzy
+msgid "India"
+msgstr "Metadatos"
+
+#: ../picard/const.py:281
+msgid "Tanzania, United Republic of"
+msgstr ""
+
+#: ../picard/const.py:282
+msgid "Azerbaijan"
+msgstr ""
+
+#: ../picard/const.py:283
+#, fuzzy
+msgid "Ireland"
+msgstr "Islandés"
+
+#: ../picard/const.py:284
+msgid "Indonesia"
+msgstr ""
+
+#: ../picard/const.py:285
+msgid "Ukraine"
+msgstr ""
+
+#: ../picard/const.py:286
+#, fuzzy
+msgid "Qatar"
+msgstr "Más tarde"
+
+#: ../picard/const.py:287
+msgid "Mozambique"
+msgstr ""
+
+#: ../picard/const.py:288
+msgid "Bosnia and Herzegovina"
+msgstr ""
+
+#: ../picard/const.py:289
+msgid "Congo, The Democratic Republic of the"
+msgstr ""
+
+#: ../picard/const.py:290
+msgid "Serbia and Montenegro"
+msgstr ""
+
+#: ../picard/const.py:291
+msgid "Croatia"
+msgstr ""
+
+#: ../picard/const.py:292
+msgid "Korea (North), Democratic People's Republic of"
+msgstr ""
+
+#: ../picard/const.py:293
+msgid "Korea (South), Republic of"
+msgstr ""
+
+#: ../picard/const.py:294
+#, fuzzy
+msgid "Slovakia"
+msgstr "Eslovako"
+
+#: ../picard/const.py:295
+msgid "Soviet Union (historical, 1922-1991)"
+msgstr ""
+
+#: ../picard/const.py:296
+msgid "East Timor"
+msgstr ""
+
+#: ../picard/const.py:297
+msgid "Czechoslovakia (historical, 1918-1992)"
+msgstr ""
+
+#: ../picard/const.py:298
+msgid "Europe"
+msgstr ""
+
+#: ../picard/const.py:299
+msgid "East Germany (historical, 1949-1990)"
+msgstr ""
+
+#: ../picard/const.py:300
+msgid "[Unknown Country]"
+msgstr ""
+
+#: ../picard/const.py:301
+msgid "[Worldwide]"
+msgstr ""
+
+#: ../picard/const.py:302
+msgid "Yugoslavia (historical, 1918-1992)"
+msgstr ""
+
+#: ../picard/const.py:307
+#, fuzzy
+msgid "Catalan"
+msgstr "Italiano"
+
+#: ../picard/const.py:308
+msgid "Czech"
+msgstr "Checo"
+
+#: ../picard/const.py:309
+msgid "Welsh"
+msgstr ""
+
+#: ../picard/const.py:310
+#, fuzzy
+msgid "Danish"
+msgstr "Español"
+
+#: ../picard/const.py:311
+msgid "German"
+msgstr "Alemán"
+
+#: ../picard/const.py:312
+msgid "English"
+msgstr "Inglés"
+
+#: ../picard/const.py:313
+#, fuzzy
+msgid "English (Canada)"
+msgstr "Inglés (Reino Unido)"
+
+#: ../picard/const.py:314
+msgid "English (UK)"
+msgstr "Inglés (Reino Unido)"
+
+#: ../picard/const.py:315
+msgid "Spanish"
+msgstr "Español"
+
+#: ../picard/const.py:316
+#, fuzzy
+msgid "Persian"
+msgstr "Versión"
+
+#: ../picard/const.py:317
+msgid "Finnish"
+msgstr "Finlandés"
+
+#: ../picard/const.py:318
+msgid "French"
+msgstr "Francés"
+
+#: ../picard/const.py:319
+msgid "Frisian"
+msgstr ""
+
+#: ../picard/const.py:320
+msgid "Hebrew"
+msgstr ""
+
+#: ../picard/const.py:321
+msgid "Hungarian"
+msgstr "Húngaro"
+
+#: ../picard/const.py:322
+#, fuzzy
+msgid "Islandic"
+msgstr "Islandés"
+
+#: ../picard/const.py:323
+msgid "Italian"
+msgstr "Italiano"
+
+#: ../picard/const.py:324
+msgid "Kannada"
+msgstr ""
+
+#: ../picard/const.py:325
+msgid "Korean"
+msgstr "Coreano"
+
+#: ../picard/const.py:326
+msgid "Lithuanian"
+msgstr "Lituano"
+
+#: ../picard/const.py:327
+msgid "Norwegian Bokmal"
+msgstr "Bokmal noruego"
+
+#: ../picard/const.py:328
+msgid "Dutch"
+msgstr "Danés"
+
+#: ../picard/const.py:329
+#, fuzzy
+msgid "Polish"
+msgstr "Complementos"
+
+#: ../picard/const.py:330
+msgid "Portuguese"
+msgstr "Portugués"
+
+#: ../picard/const.py:331
+#, fuzzy
+msgid "Brazilian Portuguese"
+msgstr "Portugués"
+
+#: ../picard/const.py:332
+msgid "Romanian"
+msgstr "Rumano"
+
+#: ../picard/const.py:333
+msgid "Russian"
+msgstr "Ruso"
+
+#: ../picard/const.py:334
+#, fuzzy
+msgid "Scots"
+msgstr "Puntuación"
+
+#: ../picard/const.py:335
+msgid "Slovak"
+msgstr "Eslovako"
+
+#: ../picard/const.py:336
+#, fuzzy
+msgid "Slovenian"
+msgstr "Eslovako"
+
+#: ../picard/const.py:337
+msgid "Swedish"
+msgstr "Sueco"
+
+#: ../picard/const.py:338
+#, fuzzy
+msgid "Chinese"
+msgstr "Canales:"
+
+#: ../picard/file.py:475
+#, python-format
+msgid "No matching tracks for file %s"
+msgstr "No se han encontrado pistas concordantes para el archivo %s"
+
+#: ../picard/file.py:492
+#, fuzzy, python-format
+msgid "No matching tracks above the threshold for file %s"
+msgstr "No se han encontrado pistas concordantes para el archivo %s"
+
+#: ../picard/file.py:495
+#, python-format
+msgid "File %s identified!"
+msgstr "¡Archivo %s identificado!"
+
+#: ../picard/file.py:506
+#, python-format
+msgid "Looking up the PUID for file %s..."
+msgstr "Buscando PUID para el archivo %s..."
+
+#: ../picard/file.py:511
+#, python-format
+msgid "Looking up the metadata for file %s..."
+msgstr "Buscando metadatos en archivo %s..."
+
+#: ../picard/puidmanager.py:58
+msgid "Submitting PUIDs..."
+msgstr "Enviando PUIDs..."
+
+#: ../picard/puidmanager.py:64
+#, python-format
+msgid "PUIDs submission failed: %s"
+msgstr "Envío de PUIDs fallido: %s"
+
+#: ../picard/puidmanager.py:66
+msgid "PUIDs successfully submitted!"
+msgstr "¡Los PUIDs han sido enviados con éxito!"
+
+#: ../picard/playlist.py:31
+msgid "M3U Playlist (*.m3u)"
+msgstr "Lista de Reproducción M3U (*.m3u)"
+
+#: ../picard/playlist.py:32
+msgid "PLS Playlist (*.pls)"
+msgstr "Lista de Reproducción PLS (*.pls)"
+
+#: ../picard/playlist.py:33
+msgid "XSPF Playlist (*.xspf)"
+msgstr "Lista de Reproducción XSPF (*.xspf)"
+
+#: ../picard/tagger.py:476
 msgid "CD Lookup Error"
 msgstr "Error buscando CD"
 
-#: ../picard/tagger.py:473
+#: ../picard/tagger.py:477
 #, python-format
 msgid ""
 "Error while reading CD:\n"
@@ -46,126 +1332,175 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../picard/ui/passworddialog.py:38
+#: ../picard/tagger.py:503
 #, python-format
-msgid ""
-"The server %s requires you to login. Please enter your username and password."
-msgstr ""
+msgid "Couldn't find PUID for file %s"
+msgstr "No se ha podido encontrar el PUID para el fichero %s"
 
-#: ../picard/ui/ui_options_script.py:52
-msgid "Tagger Script"
-msgstr "Script de etiquetador"
+#: ../picard/musicdns/__init__.py:98
+#, python-format
+msgid "Looking up the fingerprint for file %s..."
+msgstr "Buscando huella digital para el fichero %s..."
+
+#: ../picard/musicdns/__init__.py:117
+#, python-format
+msgid "Creating fingerprint for file %s..."
+msgstr "Creando huella para el fichero %s..."
 
 #: ../picard/ui/cdlookup.py:31
 msgid "Score"
 msgstr "Puntuación"
 
 #: ../picard/ui/cdlookup.py:31
+#: ../picard/ui/itemviews.py:82
+#: ../picard/util/tags.py:23
 msgid "Title"
 msgstr "Título"
 
-#: ../picard/ui/cdlookup.py:31 ../picard/ui/mainwindow.py:436
+#: ../picard/ui/cdlookup.py:31
+#: ../picard/ui/itemviews.py:84
+#: ../picard/ui/mainwindow.py:436
+#: ../picard/util/tags.py:22
 msgid "Artist"
 msgstr "Artista"
 
-#: ../picard/ui/ui_metadata.py:121
-msgid "Lookup"
-msgstr "Buscar"
+#: ../picard/ui/coverartbox.py:47
+#: ../picard/ui/options/cover.py:29
+msgid "Cover Art"
+msgstr "Portada"
 
-#: ../picard/ui/ui_metadata.py:122
-msgid "Title:"
-msgstr "Título:"
+#: ../picard/ui/coverartbox.py:95
+msgid "Buy the album on Amazon"
+msgstr "Comprar el album en Amazon"
 
-#: ../picard/ui/ui_metadata.py:123
-msgid "Date:"
-msgstr "Fecha:"
+#: ../picard/ui/filebrowser.py:38
+#: ../picard/ui/mainwindow.py:302
+msgid "&Refresh"
+msgstr "Actualiza&r"
 
-#: ../picard/ui/ui_metadata.py:124
-msgid "Artist:"
-msgstr "Artista:"
+#: ../picard/ui/filebrowser.py:41
+#, fuzzy
+msgid "&Move Tagged Files Here"
+msgstr "&Mover ficheros"
 
-#: ../picard/ui/ui_metadata.py:125
-msgid "Track:"
-msgstr "Pista:"
+#: ../picard/ui/filebrowser.py:44
+msgid "Show &Hidden Files"
+msgstr ""
 
-#: ../picard/ui/ui_metadata.py:126
-msgid "0000-00-00; "
-msgstr "0000-00-00; "
+#: ../picard/ui/itemviews.py:83
+msgid "Length"
+msgstr "Duración"
 
-#: ../picard/ui/ui_metadata.py:127 ../picard/ui/tageditor.py:225
-#: ../picard/ui/multitageditor.py:181
+#: ../picard/ui/itemviews.py:327
+msgid "&Releases"
+msgstr "&Lanzamientos"
+
+#: ../picard/ui/itemviews.py:353
+msgid "&Plugins"
+msgstr "Com&plementos"
+
+#: ../picard/ui/itemviews.py:523
+msgid "Clusters"
+msgstr "Grupos"
+
+#: ../picard/ui/logview.py:29
+msgid "Log"
+msgstr "Bitácora"
+
+#: ../picard/ui/puidsubmit.py:31
+#: ../picard/ui/options/plugins.py:80
+msgid "File"
+msgstr "Fichero"
+
+#: ../picard/ui/puidsubmit.py:31
+msgid "PUID"
+msgstr "PUID"
+
+#: ../picard/ui/puidsubmit.py:31
+#: ../picard/ui/mainwindow.py:437
+msgid "Track"
+msgstr "Pista"
+
+#: ../picard/ui/puidsubmit.py:31
+msgid "Release"
+msgstr "Lanzamiento"
+
+#: ../picard/ui/puidsubmit.py:31
+msgid "Release ID"
+msgstr "Código de lanzamiento"
+
+#: ../picard/ui/tageditor.py:65
+#: ../picard/ui/ui_options_plugins.py:62
+msgid "Details"
+msgstr "Detalles"
+
+#: ../picard/ui/tageditor.py:70
+#: ../picard/ui/tageditor.py:241
+#, python-format
+msgid "%d file"
+msgid_plural "%d files"
+msgstr[0] "%d fichero"
+msgstr[1] "%d ficheros"
+
+#: ../picard/ui/tageditor.py:124
+#, python-format
+msgid "(different across %d file)"
+msgid_plural "(different across %d files)"
+msgstr[0] "(distinto entre %d fichero)"
+msgstr[1] "(distinto entre %d ficheros)"
+
+#: ../picard/ui/tageditor.py:127
+#, python-format
+msgid "(missing from %d file)"
+msgid_plural "(missing from %d files)"
+msgstr[0] "(ausente de %d fichero)"
+msgstr[1] "(ausente de %d ficheros)"
+
+#: ../picard/ui/tageditor.py:210
+msgid "Filename:"
+msgstr "Nombre de fichero:"
+
+#: ../picard/ui/tageditor.py:212
+msgid "Format:"
+msgstr "Formato:"
+
+#: ../picard/ui/tageditor.py:221
+msgid "Size:"
+msgstr "Tamaño:"
+
+#: ../picard/ui/tageditor.py:225
+#: ../picard/ui/ui_metadata.py:127
 msgid "Length:"
 msgstr "Duración:"
 
-#: ../picard/ui/ui_metadata.py:128
-msgid "Album:"
-msgstr "Álbum:"
+#: ../picard/ui/tageditor.py:227
+msgid "Bitrate:"
+msgstr "Tasa de bits:"
 
-#: ../picard/ui/ui_passworddialog.py:78
-#, fuzzy
-msgid "Authentication required"
-msgstr "Unicode requerido"
+#: ../picard/ui/tageditor.py:229
+msgid "Sample rate:"
+msgstr "Tasa de muestreo:"
 
-#: ../picard/ui/ui_passworddialog.py:79 ../picard/ui/ui_options_proxy.py:83
-#: ../picard/ui/ui_options_general.py:113
-msgid "Username:"
-msgstr "Nombre de usuario"
+#: ../picard/ui/tageditor.py:231
+msgid "Bits per sample:"
+msgstr "Bits por muestra:"
 
-#: ../picard/ui/ui_passworddialog.py:80 ../picard/ui/ui_options_proxy.py:82
-#: ../picard/ui/ui_options_general.py:112
-msgid "Password:"
-msgstr "Contraseña:"
+#: ../picard/ui/tageditor.py:234
+msgid "Mono"
+msgstr "Mono"
 
-#: ../picard/ui/ui_passworddialog.py:81
-msgid "Save username and password"
-msgstr ""
+#: ../picard/ui/tageditor.py:235
+msgid "Stereo"
+msgstr "Estéreo"
 
-#: ../picard/ui/ui_options_folksonomy.py:114
-#: ../picard/ui/ui_options_folksonomy_tags.py:114
-msgid "Folksonomy Tags"
-msgstr "Etiquetas de Folksonomía"
+#: ../picard/ui/tageditor.py:237
+msgid "Channels:"
+msgstr "Canales:"
 
-#: ../picard/ui/ui_options_folksonomy.py:115
-#: ../picard/ui/ui_options_folksonomy_tags.py:115
-msgid "Ignore tags:"
-msgstr "Ignorar etiquetas"
-
-#: ../picard/ui/ui_options_folksonomy.py:116
-#: ../picard/ui/ui_options_folksonomy_tags.py:116
-msgid "Minimal tag usage:"
-msgstr ""
-
-#: ../picard/ui/ui_options_folksonomy.py:117
-#: ../picard/ui/ui_options_folksonomy_tags.py:117
-#: ../picard/ui/ui_options_matching.py:107
-#: ../picard/ui/ui_options_matching.py:108
-#: ../picard/ui/ui_options_matching.py:109
-#: ../picard/ui/ui_options_matching.py:113
-msgid " %"
-msgstr " %"
-
-#: ../picard/ui/ui_options_folksonomy.py:118
-msgid "Maximum number of tags:"
-msgstr ""
-
-#: ../picard/ui/ui_options_folksonomy.py:119
-#: ../picard/ui/ui_options_folksonomy_tags.py:119
-msgid "Join multiple tags with:"
-msgstr ""
-
-#: ../picard/ui/ui_options_folksonomy.py:120
-#: ../picard/ui/ui_options_folksonomy_tags.py:120
-msgid " / "
-msgstr " / "
-
-#: ../picard/ui/ui_options_folksonomy.py:121
-#: ../picard/ui/ui_options_folksonomy_tags.py:121
-msgid ", "
-msgstr ", "
-
-#: ../picard/ui/ui_options_folksonomy_tags.py:118
-msgid "Maximal number of tags:"
-msgstr ""
+#: ../picard/ui/tagsfromfilenames.py:52
+#: ../picard/ui/tagsfromfilenames.py:96
+msgid "File Name"
+msgstr "Nombre de fichero"
 
 #: ../picard/ui/mainwindow.py:64
 msgid "MusicBrainz Picard"
@@ -300,7 +1635,8 @@ msgstr "Buscar"
 msgid "&CD Lookup..."
 msgstr ""
 
-#: ../picard/ui/mainwindow.py:272 ../picard/ui/mainwindow.py:273
+#: ../picard/ui/mainwindow.py:272
+#: ../picard/ui/mainwindow.py:273
 msgid "Lookup CD"
 msgstr "Buscar CD"
 
@@ -331,7 +1667,8 @@ msgstr "Ctrl+U"
 msgid "&Lookup"
 msgstr ""
 
-#: ../picard/ui/mainwindow.py:291 ../picard/ui/mainwindow.py:292
+#: ../picard/ui/mainwindow.py:291
+#: ../picard/ui/mainwindow.py:292
 msgid "Lookup metadata"
 msgstr "Buscar metadatos"
 
@@ -344,10 +1681,6 @@ msgstr "Ctrl+L"
 msgid "&Details..."
 msgstr "&Detalles..."
 
-#: ../picard/ui/mainwindow.py:302 ../picard/ui/filebrowser.py:38
-msgid "&Refresh"
-msgstr "Actualiza&r"
-
 #: ../picard/ui/mainwindow.py:305
 msgid "Generate &Playlist..."
 msgstr "Generar lista de re&producción"
@@ -393,6 +1726,7 @@ msgid "&Tools"
 msgstr "Herramien&tas"
 
 #: ../picard/ui/mainwindow.py:384
+#: ../picard/ui/util.py:33
 msgid "&Help"
 msgstr "A&yuda"
 
@@ -405,13 +1739,10 @@ msgid "&Search Bar"
 msgstr "Barra de bú&squeda"
 
 #: ../picard/ui/mainwindow.py:435
+#: ../picard/util/tags.py:21
 msgid "Album"
 msgstr "Álbum"
 
-#: ../picard/ui/mainwindow.py:437 ../picard/ui/puidsubmit.py:31
-msgid "Track"
-msgstr "Pista"
-
 #: ../picard/ui/mainwindow.py:476
 msgid "All Supported Formats"
 msgstr "Todos los formatos soportados"
@@ -426,37 +1757,290 @@ msgstr "Guardando lista de reproducción %s..."
 msgid "Playlist %s saved"
 msgstr "Lista de reproducción %s guardada"
 
-#: ../picard/ui/mainwindow.py:638 ../picard/ui/mainwindow.py:647
+#: ../picard/ui/mainwindow.py:638
+#: ../picard/ui/mainwindow.py:647
 #, python-format
 msgid " (Error: %s)"
 msgstr " (Error: %s)"
 
+#: ../picard/ui/ui_tageditor.py:115
+#: ../picard/ui/ui_options_plugins.py:59
+#: ../picard/ui/options/plugins.py:76
+msgid "Name"
+msgstr ""
+
+#: ../picard/ui/ui_tageditor.py:116
+msgid "Value"
+msgstr "Valor"
+
+#: ../picard/ui/ui_tageditor.py:117
+msgid "&Add..."
+msgstr "&Agregar..."
+
+#: ../picard/ui/ui_tageditor.py:118
+msgid "&Edit..."
+msgstr ""
+
+#: ../picard/ui/ui_tageditor.py:119
+msgid "&Delete"
+msgstr "&Borrar"
+
+#: ../picard/ui/ui_tageditor.py:120
+msgid "&Metadata"
+msgstr "&Metadatos"
+
+#: ../picard/ui/ui_tageditor.py:121
+msgid "A&rtwork"
+msgstr ""
+
+#: ../picard/ui/ui_tageditor.py:122
+msgid "&Info"
+msgstr "&Información"
+
+#: ../picard/ui/passworddialog.py:38
+#, python-format
+msgid "The server %s requires you to login. Please enter your username and password."
+msgstr ""
+
+#: ../picard/ui/ui_cdlookup.py:60
+#: ../picard/ui/ui_options_cdlookup.py:47
+#: ../picard/ui/ui_options_cdlookup_win32.py:56
+#: ../picard/ui/options/cdlookup.py:35
+msgid "CD Lookup"
+msgstr "Búsqueda de CD"
+
+#: ../picard/ui/ui_cdlookup.py:61
+msgid "The following releases on MusicBrainz match the CD:"
+msgstr "Los siguientes lanzamientos en MusicBrainz concuerdan con el CD:"
+
+#: ../picard/ui/ui_cdlookup.py:62
+#: ../picard/ui/ui_puidsubmit.py:53
+msgid "OK"
+msgstr "Aceptar"
+
+#: ../picard/ui/ui_cdlookup.py:63
+msgid "    Lookup manually    "
+msgstr "    Buscar manualmente    "
+
+#: ../picard/ui/ui_cdlookup.py:64
+#: ../picard/ui/ui_puidsubmit.py:54
+msgid "Cancel"
+msgstr "Cancelar"
+
+#: ../picard/ui/ui_passworddialog.py:78
+#, fuzzy
+msgid "Authentication required"
+msgstr "Unicode Requerido"
+
+#: ../picard/ui/ui_passworddialog.py:79
+#: ../picard/ui/ui_options_general.py:113
+#: ../picard/ui/ui_options_proxy.py:83
+msgid "Username:"
+msgstr "Nombre de usuario"
+
+#: ../picard/ui/ui_passworddialog.py:80
+#: ../picard/ui/ui_options_general.py:112
+#: ../picard/ui/ui_options_proxy.py:82
+msgid "Password:"
+msgstr "Contraseña:"
+
+#: ../picard/ui/ui_passworddialog.py:81
+msgid "Save username and password"
+msgstr ""
+
 #: ../picard/ui/ui_edittagdialog.py:44
 msgid "Edit Tag"
 msgstr "Editar etiqueta"
 
-#: ../picard/ui/ui_options_proxy.py:81
-msgid "Web Proxy"
-msgstr "Web Proxy"
+#: ../picard/ui/ui_metadata.py:121
+msgid "Lookup"
+msgstr "Buscar"
 
-#: ../picard/ui/ui_options_proxy.py:84 ../picard/ui/ui_options_general.py:109
-msgid "Port:"
-msgstr "Puerto:"
+#: ../picard/ui/ui_metadata.py:122
+msgid "Title:"
+msgstr "Título:"
 
-#: ../picard/ui/ui_options_proxy.py:85 ../picard/ui/ui_options_general.py:110
-msgid "Server address:"
-msgstr "Dirección del servidor:"
+#: ../picard/ui/ui_metadata.py:123
+msgid "Date:"
+msgstr "Fecha:"
 
-#: ../picard/ui/ui_tagsfromfilenames.py:56
-msgid "Convert File Names to Tags"
-msgstr "Convertir nombres de ficheros a etiquetas"
+#: ../picard/ui/ui_metadata.py:124
+msgid "Artist:"
+msgstr "Artista:"
 
-#: ../picard/ui/ui_tagsfromfilenames.py:57
-msgid "Replace underscores with spaces"
-msgstr "Sustituir guiones bajos con espacios en blanco"
+#: ../picard/ui/ui_metadata.py:125
+msgid "Track:"
+msgstr "Pista:"
+
+#: ../picard/ui/ui_metadata.py:126
+msgid "0000-00-00; "
+msgstr "0000-00-00; "
+
+#: ../picard/ui/ui_metadata.py:128
+msgid "Album:"
+msgstr "Álbum:"
+
+#: ../picard/ui/ui_options.py:42
+msgid "Options"
+msgstr "Opciones"
+
+#: ../picard/ui/ui_options_cdlookup.py:48
+msgid "CD-ROM device to use for lookups:"
+msgstr "Unidad de CD-ROM que se utilizará para las búsquedas:"
+
+#: ../picard/ui/ui_options_cdlookup_win32.py:57
+msgid "Default CD-ROM drive to use for lookups:"
+msgstr "Unidad de CD-ROM que se utilizará por defecto para las búsquedas"
+
+#: ../picard/ui/ui_options_cover.py:56
+msgid "Location"
+msgstr "Ubicación"
+
+#: ../picard/ui/ui_options_cover.py:57
+msgid "Embed cover images into tags"
+msgstr "Guardar carátulas de los álbums en los ficheros"
+
+#: ../picard/ui/ui_options_cover.py:58
+msgid "Save cover images as separate files"
+msgstr "Guardar carátulas de los álbums en ficheros separados"
+
+#: ../picard/ui/ui_options_cover.py:59
+msgid "Overwrite the file if it already exists"
+msgstr "Sobrescribir el fichero si ya existe"
+
+#: ../picard/ui/util.py:31
+msgid "&Ok"
+msgstr "&Ok"
+
+#: ../picard/ui/util.py:32
+msgid "&Cancel"
+msgstr "&Cancelar"
+
+#: ../picard/ui/ui_puidsubmit.py:52
+msgid "Submit PUIDs"
+msgstr "Enviar PUIDs"
+
+#: ../picard/ui/ui_options_folksonomy.py:114
+#: ../picard/ui/options/folksonomy.py:29
+msgid "Folksonomy Tags"
+msgstr "Etiquetas de Folksonomía"
+
+#: ../picard/ui/ui_options_folksonomy.py:115
+msgid "Ignore tags:"
+msgstr "Ignorar etiquetas"
+
+#: ../picard/ui/ui_options_folksonomy.py:116
+msgid "Minimal tag usage:"
+msgstr ""
+
+#: ../picard/ui/ui_options_folksonomy.py:117
+#: ../picard/ui/ui_options_matching.py:107
+#: ../picard/ui/ui_options_matching.py:108
+#: ../picard/ui/ui_options_matching.py:109
+#: ../picard/ui/ui_options_matching.py:113
+msgid " %"
+msgstr " %"
+
+#: ../picard/ui/ui_options_folksonomy.py:118
+msgid "Maximum number of tags:"
+msgstr ""
+
+#: ../picard/ui/ui_options_folksonomy.py:119
+msgid "Join multiple tags with:"
+msgstr ""
+
+#: ../picard/ui/ui_options_folksonomy.py:120
+msgid " / "
+msgstr " / "
+
+#: ../picard/ui/ui_options_folksonomy.py:121
+msgid ", "
+msgstr ", "
+
+#: ../picard/ui/ui_options_interface.py:50
+msgid "Miscellaneous"
+msgstr "Miscelaneo"
+
+#: ../picard/ui/ui_options_interface.py:51
+msgid "Show text labels under icons"
+msgstr "Mostrar textos debajo de los iconos"
+
+#: ../picard/ui/ui_options_interface.py:52
+msgid "Allow selection of multiple directories"
+msgstr ""
+
+#: ../picard/ui/ui_options_interface.py:53
+msgid "Use advanced query syntax"
+msgstr ""
+
+#: ../picard/ui/ui_options_interface.py:54
+#, fuzzy
+msgid "User interface language:"
+msgstr "Nombre de usuario"
+
+#: ../picard/ui/ui_options_naming.py:165
+msgid "Rename Files"
+msgstr "Renombrar ficheros"
+
+#: ../picard/ui/ui_options_naming.py:166
+msgid "Replace Windows-incompatible characters"
+msgstr "Sustituir carácteres incompatibles con Windows"
+
+#: ../picard/ui/ui_options_naming.py:167
+msgid "Replace non-ASCII characters"
+msgstr "Reemplazar carácteres que no sean ASCII"
+
+#: ../picard/ui/ui_options_naming.py:168
+#: ../picard/ui/ui_options_naming.py:169
+#: ../picard/ui/ui_options_metadata.py:109
+#: ../picard/ui/ui_options_metadata.py:110
+msgid "Default"
+msgstr "Por defecto"
+
+#: ../picard/ui/ui_options_naming.py:170
+#: ../picard/ui/options/naming.py:90
+msgid "Multiple artist file naming format:"
+msgstr "Patrón para nombrar ficheros con artistas múltiples:"
+
+#: ../picard/ui/ui_options_naming.py:171
+#: ../picard/ui/options/naming.py:86
+msgid "File naming format:"
+msgstr "Patrón para nombrar ficheros:"
+
+#: ../picard/ui/ui_options_naming.py:172
+msgid "Move Files"
+msgstr "Mover ficheros"
+
+#: ../picard/ui/ui_options_naming.py:173
+msgid "Move tagged files to this directory:"
+msgstr "Mover ficheros etiquetados a ésta carpeta:"
+
+#: ../picard/ui/ui_options_naming.py:174
+msgid "Browse..."
+msgstr "Explorar..."
+
+#: ../picard/ui/ui_options_naming.py:175
+msgid "Move additional files:"
+msgstr "Mover ficheros adicionales:"
+
+#: ../picard/ui/ui_options_naming.py:176
+msgid "Delete empty directories"
+msgstr "Eliminar carpetas vacías"
+
+#: ../picard/ui/ui_options_naming.py:177
+msgid "Example"
+msgstr "Ejemplo"
+
+#: ../picard/ui/ui_options_naming.py:178
+msgid "File name:"
+msgstr "Nombre de fichero:"
+
+#: ../picard/ui/ui_options_naming.py:179
+msgid "Multiple artist file name:"
+msgstr ""
 
-#: ../picard/ui/ui_tagsfromfilenames.py:58
 #: ../picard/ui/ui_options_naming.py:180
+#: ../picard/ui/ui_tagsfromfilenames.py:58
 msgid "&Preview"
 msgstr "&Previsualización"
 
@@ -464,11 +2048,22 @@ msgstr "&Previsualización"
 msgid "MusicBrainz Server"
 msgstr "Servidor de MusicBrainz"
 
+#: ../picard/ui/ui_options_general.py:109
+#: ../picard/ui/ui_options_proxy.py:84
+msgid "Port:"
+msgstr "Puerto:"
+
+#: ../picard/ui/ui_options_general.py:110
+#: ../picard/ui/ui_options_proxy.py:85
+msgid "Server address:"
+msgstr "Dirección del servidor:"
+
 #: ../picard/ui/ui_options_general.py:111
 msgid "Account Information"
 msgstr "Información de cuenta"
 
 #: ../picard/ui/ui_options_general.py:114
+#: ../picard/ui/options/general.py:29
 msgid "General"
 msgstr "General"
 
@@ -476,34 +2071,6 @@ msgstr "General"
 msgid "Automatically scan all new files"
 msgstr "Analizar automáticamente los ficheros nuevos"
 
-#: ../picard/ui/ui_options_interface.py:46
-msgid "Miscellaneous"
-msgstr "Miscelaneo"
-
-#: ../picard/ui/ui_options_interface.py:47
-msgid "Show text labels under icons"
-msgstr "Mostrar textos debajo de los iconos"
-
-#: ../picard/ui/ui_options_interface.py:48
-msgid "Allow selection of multiple directories"
-msgstr ""
-
-#: ../picard/ui/ui_options_interface.py:49
-msgid "Use advanced query syntax"
-msgstr ""
-
-#: ../picard/ui/itemviews.py:327
-msgid "&Releases"
-msgstr "&Lanzamientos"
-
-#: ../picard/ui/itemviews.py:353
-msgid "&Plugins"
-msgstr "Com&plementos"
-
-#: ../picard/ui/itemviews.py:523
-msgid "Clusters"
-msgstr "Grupos"
-
 #: ../picard/ui/ui_options_matching.py:105
 msgid "Thresholds"
 msgstr "Umbrales"
@@ -524,6 +2091,68 @@ msgstr "Similitud mínima para las búsquedas de grupos:"
 msgid "Minimal similarity for PUID lookups:"
 msgstr "Similitud mínima para las búsquedas de PUID:"
 
+#: ../picard/ui/ui_options_metadata.py:100
+#: ../picard/ui/options/metadata.py:31
+msgid "Metadata"
+msgstr "Metadatos"
+
+#: ../picard/ui/ui_options_metadata.py:101
+msgid "Translate foreign artist names to English where possible"
+msgstr "Traducir los nombres foráneos de artistas al inglés cuando sea posible"
+
+#: ../picard/ui/ui_options_metadata.py:102
+msgid "Use release relationships"
+msgstr "Usar las relaciones de lanzamientos"
+
+#: ../picard/ui/ui_options_metadata.py:103
+msgid "Use track relationships"
+msgstr "Usar las relaciones de pistas"
+
+#: ../picard/ui/ui_options_metadata.py:104
+msgid "Use folksonomy tags as genre"
+msgstr ""
+
+#: ../picard/ui/ui_options_metadata.py:105
+#, fuzzy
+msgid "Preferred release country:"
+msgstr "Tipo de lanzamiento"
+
+#: ../picard/ui/ui_options_metadata.py:106
+msgid "Custom Fields"
+msgstr "Campos personalizados"
+
+#: ../picard/ui/ui_options_metadata.py:107
+msgid "Various artists:"
+msgstr "Artistas varios:"
+
+#: ../picard/ui/ui_options_metadata.py:108
+msgid "Non-album tracks:"
+msgstr "Pistas sin álbum:"
+
+#: ../picard/ui/ui_options_plugins.py:58
+#: ../picard/ui/options/plugins.py:30
+msgid "Plugins"
+msgstr "Complementos"
+
+#: ../picard/ui/ui_options_plugins.py:60
+#: ../picard/ui/options/plugins.py:79
+msgid "Author"
+msgstr "Autor"
+
+#: ../picard/ui/ui_options_plugins.py:61
+#: ../picard/util/tags.py:36
+msgid "Version"
+msgstr "Versión"
+
+#: ../picard/ui/ui_options_proxy.py:81
+#: ../picard/ui/options/proxy.py:28
+msgid "Web Proxy"
+msgstr "Web Proxy"
+
+#: ../picard/ui/ui_options_script.py:52
+msgid "Tagger Script"
+msgstr "Script de etiquetador"
+
 #: ../picard/ui/ui_options_tags.py:105
 msgid "Common"
 msgstr "Común"
@@ -576,354 +2205,36 @@ msgstr "APE"
 msgid "Remove APEv2 tags from MP3 files"
 msgstr "Eliminar etiquetas APEv2 de los ficheros MP3"
 
-#: ../picard/ui/ui_options_cdlookup_win32.py:56 ../picard/ui/ui_cdlookup.py:60
-#: ../picard/ui/ui_options_cdlookup.py:47
-msgid "CD Lookup"
-msgstr "Búsqueda de CD"
+#: ../picard/ui/ui_tagsfromfilenames.py:56
+msgid "Convert File Names to Tags"
+msgstr "Convertir nombres de ficheros a etiquetas"
 
-#: ../picard/ui/ui_options_cdlookup_win32.py:57
-msgid "Default CD-ROM drive to use for lookups:"
-msgstr "Unidad de CD-ROM que se utilizará por defecto para las búsquedas"
+#: ../picard/ui/ui_tagsfromfilenames.py:57
+msgid "Replace underscores with spaces"
+msgstr "Sustituir guiones bajos con espacios en blanco"
 
-#: ../picard/ui/tageditor.py:65 ../picard/ui/ui_options_plugins.py:62
-#: ../picard/ui/multitageditor.py:37
-msgid "Details"
-msgstr "Detalles"
-
-#: ../picard/ui/tageditor.py:70 ../picard/ui/tageditor.py:241
-#: ../picard/ui/multitageditor.py:42 ../picard/ui/multitageditor.py:197
-#, python-format
-msgid "%d file"
-msgid_plural "%d files"
-msgstr[0] "%d fichero"
-msgstr[1] "%d ficheros"
-
-#: ../picard/ui/tageditor.py:124 ../picard/ui/multitageditor.py:95
-#, python-format
-msgid "(different across %d file)"
-msgid_plural "(different across %d files)"
-msgstr[0] "(distinto entre %d fichero)"
-msgstr[1] "(distinto entre %d ficheros)"
-
-#: ../picard/ui/tageditor.py:127 ../picard/ui/multitageditor.py:98
-#, python-format
-msgid "(missing from %d file)"
-msgid_plural "(missing from %d files)"
-msgstr[0] "(ausente de %d fichero)"
-msgstr[1] "(ausente de %d ficheros)"
-
-#: ../picard/ui/tageditor.py:210 ../picard/ui/multitageditor.py:166
-msgid "Filename:"
-msgstr "Nombre de fichero:"
-
-#: ../picard/ui/tageditor.py:212 ../picard/ui/multitageditor.py:168
-msgid "Format:"
-msgstr "Formato:"
-
-#: ../picard/ui/tageditor.py:221 ../picard/ui/multitageditor.py:177
-msgid "Size:"
-msgstr "Tamaño:"
-
-#: ../picard/ui/tageditor.py:227 ../picard/ui/multitageditor.py:183
-msgid "Bitrate:"
-msgstr "Tasa de bits:"
-
-#: ../picard/ui/tageditor.py:229 ../picard/ui/multitageditor.py:185
-msgid "Sample rate:"
-msgstr "Tasa de muestreo:"
-
-#: ../picard/ui/tageditor.py:231 ../picard/ui/multitageditor.py:187
-msgid "Bits per sample:"
-msgstr "Bits por muestra:"
-
-#: ../picard/ui/tageditor.py:234 ../picard/ui/multitageditor.py:190
-msgid "Mono"
-msgstr "Mono"
-
-#: ../picard/ui/tageditor.py:235 ../picard/ui/multitageditor.py:191
-msgid "Stereo"
-msgstr "Estéreo"
-
-#: ../picard/ui/tageditor.py:237 ../picard/ui/multitageditor.py:193
-msgid "Channels:"
-msgstr "Canales:"
-
-#: ../picard/ui/ui_tageditor.py:115 ../picard/ui/ui_multitageditor.py:55
-#: ../picard/ui/ui_options_plugins.py:59 ../picard/ui/options/plugins.py:76
-msgid "Name"
-msgstr ""
-
-#: ../picard/ui/ui_tageditor.py:116 ../picard/ui/ui_multitageditor.py:56
-msgid "Value"
-msgstr "Valor"
-
-#: ../picard/ui/ui_tageditor.py:117 ../picard/ui/ui_multitageditor.py:57
-msgid "&Add..."
-msgstr "&Agregar..."
-
-#: ../picard/ui/ui_tageditor.py:118
-msgid "&Edit..."
-msgstr ""
-
-#: ../picard/ui/ui_tageditor.py:119
-msgid "&Delete"
-msgstr "&Borrar"
-
-#: ../picard/ui/ui_tageditor.py:120
-msgid "&Metadata"
-msgstr "&Metadatos"
-
-#: ../picard/ui/ui_tageditor.py:121
-msgid "A&rtwork"
-msgstr ""
-
-#: ../picard/ui/ui_tageditor.py:122
-msgid "&Info"
-msgstr "&Información"
-
-#: ../picard/ui/coverartbox.py:47
-msgid "Cover Art"
-msgstr "Portada"
-
-#: ../picard/ui/coverartbox.py:95
-msgid "Buy the album on Amazon"
-msgstr "Comprar el album en Amazon"
-
-#: ../picard/ui/ui_puidsubmit.py:52
-msgid "Submit PUIDs"
-msgstr "Enviar PUIDs"
-
-#: ../picard/ui/ui_puidsubmit.py:53 ../picard/ui/ui_cdlookup.py:62
-msgid "OK"
-msgstr "Aceptar"
-
-#: ../picard/ui/ui_puidsubmit.py:54 ../picard/ui/ui_cdlookup.py:64
-msgid "Cancel"
-msgstr "Cancelar"
-
-#: ../picard/ui/puidsubmit.py:31 ../picard/ui/options/plugins.py:80
-msgid "File"
-msgstr "Fichero"
-
-#: ../picard/ui/puidsubmit.py:31
-msgid "PUID"
-msgstr "PUID"
-
-#: ../picard/ui/puidsubmit.py:31
-msgid "Release"
-msgstr "Lanzamiento"
-
-#: ../picard/ui/puidsubmit.py:31
-msgid "Release ID"
-msgstr "Código de lanzamiento"
-
-#: ../picard/ui/filebrowser.py:41
-#, fuzzy
-msgid "&Move Tagged Files Here"
-msgstr "&Mover ficheros"
-
-#: ../picard/ui/filebrowser.py:44
-msgid "Show &Hidden Files"
-msgstr ""
-
-#: ../picard/ui/ui_cdlookup.py:61
-msgid "The following releases on MusicBrainz match the CD:"
-msgstr "Los siguientes lanzamientos en MusicBrainz concuerdan con el CD:"
-
-#: ../picard/ui/ui_cdlookup.py:63
-msgid "    Lookup manually    "
-msgstr "    Buscar manualmente    "
-
-#: ../picard/ui/ui_options.py:42
-msgid "Options"
-msgstr "Opciones"
-
-#: ../picard/ui/tagsfromfilenames.py:52 ../picard/ui/tagsfromfilenames.py:96
-msgid "File Name"
-msgstr "Nombre de fichero"
-
-#: ../picard/ui/ui_options_cover.py:56
-msgid "Location"
-msgstr "Ubicación"
-
-#: ../picard/ui/ui_options_cover.py:57
-msgid "Embed cover images into tags"
-msgstr "Guardar carátulas de los álbums en los ficheros"
-
-#: ../picard/ui/ui_options_cover.py:58
-msgid "Save cover images as separate files"
-msgstr "Guardar carátulas de los álbums en ficheros separados"
-
-#: ../picard/ui/ui_options_cover.py:59
-msgid "Overwrite the file if it already exists"
-msgstr "Sobrescribir el fichero si ya existe"
-
-#: ../picard/ui/ui_options_metadata.py:100
-msgid "Metadata"
-msgstr "Metadatos"
-
-#: ../picard/ui/ui_options_metadata.py:101
-msgid "Translate foreign artist names to English where possible"
-msgstr "Traducir los nombres foráneos de artistas al inglés cuando sea posible"
-
-#: ../picard/ui/ui_options_metadata.py:102
-msgid "Use release relationships"
-msgstr "Usar las relaciones de lanzamientos"
-
-#: ../picard/ui/ui_options_metadata.py:103
-msgid "Use track relationships"
-msgstr "Usar las relaciones de pistas"
-
-#: ../picard/ui/ui_options_metadata.py:104
-msgid "Use folksonomy tags as genre"
-msgstr ""
-
-#: ../picard/ui/ui_options_metadata.py:105
-#, fuzzy
-msgid "Preferred release country:"
-msgstr "País de lanzamiento"
-
-#: ../picard/ui/ui_options_metadata.py:106
-msgid "Custom Fields"
-msgstr "Campos personalizados"
-
-#: ../picard/ui/ui_options_metadata.py:107
-msgid "Various artists:"
-msgstr "Artistas varios:"
-
-#: ../picard/ui/ui_options_metadata.py:108
-msgid "Non-album tracks:"
-msgstr "Pistas sin álbum:"
-
-#: ../picard/ui/ui_options_metadata.py:109
-#: ../picard/ui/ui_options_metadata.py:110
-#: ../picard/ui/ui_options_naming.py:168 ../picard/ui/ui_options_naming.py:169
-msgid "Default"
-msgstr "Por defecto"
-
-#: ../picard/ui/ui_multitageditor.py:58
-msgid "Delete"
-msgstr "Borrar"
-
-#: ../picard/ui/logview.py:29
-msgid "Log"
-msgstr "Bitácora"
-
-#: ../picard/ui/ui_options_plugins.py:58
-msgid "Plugins"
-msgstr "Complementos"
-
-#: ../picard/ui/ui_options_plugins.py:60 ../picard/ui/options/plugins.py:79
-msgid "Author"
-msgstr "Autor"
-
-#: ../picard/ui/ui_options_plugins.py:61
-msgid "Version"
-msgstr "Versión"
-
-#: ../picard/ui/ui_options_naming.py:165
-msgid "Rename Files"
-msgstr "Renombrar ficheros"
-
-#: ../picard/ui/ui_options_naming.py:166
-msgid "Replace Windows-incompatible characters"
-msgstr "Sustituir carácteres incompatibles con Windows"
-
-#: ../picard/ui/ui_options_naming.py:167
-msgid "Replace non-ASCII characters"
-msgstr "Reemplazar carácteres que no sean ASCII"
-
-#: ../picard/ui/ui_options_naming.py:170 ../picard/ui/options/naming.py:90
-msgid "Multiple artist file naming format:"
-msgstr "Patrón para nombrar ficheros con artistas múltiples:"
-
-#: ../picard/ui/ui_options_naming.py:171 ../picard/ui/options/naming.py:86
-msgid "File naming format:"
-msgstr "Patrón para nombrar ficheros:"
-
-#: ../picard/ui/ui_options_naming.py:172
-msgid "Move Files"
-msgstr "Mover ficheros"
-
-#: ../picard/ui/ui_options_naming.py:173
-msgid "Move tagged files to this directory:"
-msgstr "Mover ficheros etiquetados a ésta carpeta:"
-
-#: ../picard/ui/ui_options_naming.py:174
-msgid "Browse..."
-msgstr "Explorar..."
-
-#: ../picard/ui/ui_options_naming.py:175
-msgid "Move additional files:"
-msgstr "Mover ficheros adicionales:"
-
-#: ../picard/ui/ui_options_naming.py:176
-msgid "Delete empty directories"
-msgstr "Eliminar carpetas vacías"
-
-#: ../picard/ui/ui_options_naming.py:177
-msgid "Example"
-msgstr "Ejemplo"
-
-#: ../picard/ui/ui_options_naming.py:178
-msgid "File name:"
-msgstr "Nombre de fichero:"
-
-#: ../picard/ui/ui_options_naming.py:179
-msgid "Multiple artist file name:"
-msgstr ""
-
-#: ../picard/ui/ui_options_cdlookup.py:48
-msgid "CD-ROM device to use for lookups:"
-msgstr "Unidad de CD-ROM que se utilizará para las búsquedas:"
-
-#: ../picard/ui/options/scripting.py:84 ../picard/ui/options/naming.py:86
-#: ../picard/ui/options/naming.py:90 ../picard/ui/options/naming.py:93
-#: ../picard/ui/options/naming.py:95
-msgid "Script Error"
-msgstr "Error de guión"
+#: ../picard/ui/options/about.py:29
+msgid "About"
+msgstr "Acerca de"
 
 #. Replace this with your name to have it appear in the "About" dialog.
 #: ../picard/ui/options/about.py:48
 msgid "translator-credits"
 msgstr ""
 "Launchpad Contributions:\n"
-"  Emerson Posadas <https://launchpad.net/~toxickore>\n"
-"\n"
-"Launchpad Contributions:\n"
-"  Carlos Sánchez Mateo https://launchpad.net/~chukysoria\n"
 "  Emerson Posadas https://launchpad.net/~toxickore\n"
+"  Carlos Sánchez Mateo https://launchpad.net/~chukysoria\n"
 "  enebro https://launchpad.net/~enebro\n"
-"\n"
-"Launchpad Contributions:\n"
 "  Alejandro Mas Chiotakis https://launchpad.net/~alejandro-maschiotakis\n"
 "  Alexander Dupuy https://launchpad.net/~dupuy\n"
-"  Carlos Sánchez Mateo https://launchpad.net/~chukysoria\n"
-"  Emerson Posadas https://launchpad.net/~toxickore\n"
 "  Pablo https://launchpad.net/~pdvalentini\n"
-"  enebro https://launchpad.net/~enebro\n"
-"\n"
-"Launchpad Contributions:\n"
-"  Alejandro Mas Chiotakis https://launchpad.net/~alejandro-maschiotakis\n"
-"  Alexander Dupuy https://launchpad.net/~dupuy\n"
-"  Carlos Sánchez Mateo https://launchpad.net/~chukysoria\n"
-"  Emerson Posadas https://launchpad.net/~toxickore\n"
 "  Julián Alarcón https://launchpad.net/~alarconj\n"
 "  Kito https://launchpad.net/~ejpastorino\n"
-"  Pablo https://launchpad.net/~pdvalentini\n"
-"  enebro https://launchpad.net/~enebro\n"
-"\n"
-"Launchpad Contributions:\n"
-"  Alejandro Mas Chiotakis https://launchpad.net/~alejandro-maschiotakis\n"
-"  Alexander Dupuy https://launchpad.net/~dupuy\n"
 "  Brie A. Gordon https://launchpad.net/~brie.aleida\n"
-"  Carlos Sánchez Mateo https://launchpad.net/~chukysoria\n"
-"  Emerson Posadas https://launchpad.net/~toxickore\n"
-"  Julián Alarcón https://launchpad.net/~alarconj\n"
-"  Kito https://launchpad.net/~ejpastorino\n"
 "  Paul21 https://launchpad.net/~pdvalentini\n"
 "  Steven De Winter https://launchpad.net/~info-estudiodos\n"
-"  enebro https://launchpad.net/~enebro"
+"  Lukáš Lalinský https://launchpad.net/~luks\n"
+"  Paul21 https://launchpad.net/~pdvalentini"
 
 #. Replace LANG with language you are translatig to.
 #: ../picard/ui/options/about.py:51
@@ -934,31 +2245,65 @@ msgstr "<br/>Traducido al castellano por %s"
 #: ../picard/ui/options/about.py:55
 #, fuzzy, python-format
 msgid ""
-"<p align=\"center\"><span style=\"font-size:15px;font-weight:bold;"
-"\">MusicBrainz Picard</span><br/>\n"
+"<p align=\"center\"><span style=\"font-size:15px;font-weight:bold;\">MusicBrainz Picard</span><br/>\n"
 "Version %(version)s</p>\n"
 "<p align=\"center\"><strong>Supported formats</strong><br/>%(formats)s</p>\n"
 "<p align=\"center\"><strong>Please donate</strong><br/>\n"
-"Thank you for using Picard. Picard relies on the MusicBrainz database, which "
-"is operated by the MetaBrainz Foundation with the help of thousands of "
-"volunteers. If you like this application please consider donating to the "
-"MetaBrainz Foundation to keep the service running.</p>\n"
-"<p align=\"center\"><a href=\"http://metabrainz.org/donate/index.html"
-"\">Donate now!</a></p>\n"
+"Thank you for using Picard. Picard relies on the MusicBrainz database, which is operated by the MetaBrainz Foundation with the help of thousands of volunteers. If you like this application please consider donating to the MetaBrainz Foundation to keep the service running.</p>\n"
+"<p align=\"center\"><a href=\"http://metabrainz.org/donate/index.html\">Donate now!</a></p>\n"
 "<p align=\"center\"><strong>Credits</strong><br/>\n"
-"<small>Copyright © 2004-2008 Robert Kaye, Lukáš Lalinský and others%"
-"(translator-credits)s</small></p>\n"
-"<p align=\"center\"><a href=\"http://musicbrainz.org/doc/PicardTagger"
-"\">http://musicbrainz.org/doc/PicardTagger</a></p>\n"
+"<small>Copyright © 2004-2008 Robert Kaye, Lukáš Lalinský and others%(translator-credits)s</small></p>\n"
+"<p align=\"center\"><a href=\"http://musicbrainz.org/doc/PicardTagger\">http://musicbrainz.org/doc/PicardTagger</a></p>\n"
 msgstr ""
-"<p align=\"center\"><span style=\"font-size:15px;font-weight:bold;"
-"\">MusicBrainz Picard</span><br/>\n"
+"<p align=\"center\"><span style=\"font-size:15px;font-weight:bold;\">MusicBrainz Picard</span><br/>\n"
 "Versión %(version)s</p>\n"
 "<p align=\"center\"><strong>Formatos soportados:</strong> %(formats)s</p>\n"
-"<p align=\"center\"><small>Derechos de Autor (Copyright) © 2004-2007 Robert "
-"Kaye, Lukáš Lalinský y otros%(translator-credits)s</small></p>\n"
-"<p align=\"center\"><a href=\"http://musicbrainz.org/doc/PicardTagger"
-"\">http://musicbrainz.org/doc/PicardTagger</a></p>\n"
+"<p align=\"center\"><small>Derechos de Autor (Copyright) © 2004-2007 Robert Kaye, Lukáš Lalinský y otros%(translator-credits)s</small></p>\n"
+"<p align=\"center\"><a href=\"http://musicbrainz.org/doc/PicardTagger\">http://musicbrainz.org/doc/PicardTagger</a></p>\n"
+
+#: ../picard/ui/options/advanced.py:26
+msgid "Advanced"
+msgstr "Avanzado"
+
+#: ../picard/ui/options/interface.py:31
+#, fuzzy
+msgid "User Interface"
+msgstr "Nombre de usuario"
+
+#: ../picard/ui/options/interface.py:47
+msgid "System default"
+msgstr "Omisión del sistema"
+
+#: ../picard/ui/options/interface.py:71
+#, fuzzy
+msgid "Language changed"
+msgstr "Idioma"
+
+#: ../picard/ui/options/interface.py:71
+msgid "You have changed the interface language. You have to restart Picard in order for the change to take effect."
+msgstr ""
+
+#: ../picard/ui/options/matching.py:29
+#, fuzzy
+msgid "Matching"
+msgstr "Similitudes"
+
+#: ../picard/ui/options/metadata.py:52
+msgid "None"
+msgstr ""
+
+#: ../picard/ui/options/naming.py:33
+#, fuzzy
+msgid "File Naming"
+msgstr "Nombre de fichero"
+
+#: ../picard/ui/options/naming.py:86
+#: ../picard/ui/options/naming.py:90
+#: ../picard/ui/options/naming.py:93
+#: ../picard/ui/options/naming.py:95
+#: ../picard/ui/options/scripting.py:84
+msgid "Script Error"
+msgstr "Error de guión"
 
 #: ../picard/ui/options/naming.py:93
 msgid "The file naming format must not be empty."
@@ -977,6 +2322,246 @@ msgstr ""
 msgid "The location to move files to must not be empty."
 msgstr ""
 
+#: ../picard/ui/options/scripting.py:63
+msgid "Scripting"
+msgstr "Escritura de guiones"
+
+#: ../picard/ui/options/tags.py:29
+msgid "Tags"
+msgstr "Etiquetas"
+
+#: ../picard/util/tags.py:24
+msgid "Date"
+msgstr "Fecha"
+
+#: ../picard/util/tags.py:25
+#, fuzzy
+msgid "Album Artist"
+msgstr "Artista"
+
+#: ../picard/util/tags.py:26
+msgid "Track Number"
+msgstr "Número de pista"
+
+#: ../picard/util/tags.py:27
+msgid "Total Tracks"
+msgstr "Total de pistas"
+
+#: ../picard/util/tags.py:28
+msgid "Disc Number"
+msgstr "Número de disco"
+
+#: ../picard/util/tags.py:29
+msgid "Total Discs"
+msgstr "Total de discos"
+
+#: ../picard/util/tags.py:30
+#, fuzzy
+msgid "Album Artist Sort Order"
+msgstr "Ordenar por artista"
+
+#: ../picard/util/tags.py:31
+msgid "Artist Sort Order"
+msgstr "Ordenar por artista"
+
+#: ../picard/util/tags.py:32
+msgid "Title Sort Order"
+msgstr "Ordenar por título"
+
+#: ../picard/util/tags.py:33
+#, fuzzy
+msgid "Album Sort Order"
+msgstr "Ordenar por título"
+
+#: ../picard/util/tags.py:34
+msgid "ASIN"
+msgstr "ASIN"
+
+#: ../picard/util/tags.py:35
+msgid "Grouping"
+msgstr "Agrupación"
+
+#: ../picard/util/tags.py:37
+msgid "ISRC"
+msgstr "ISRC"
+
+#: ../picard/util/tags.py:38
+msgid "Mood"
+msgstr "Estado de ánimo"
+
+#: ../picard/util/tags.py:39
+msgid "BPM"
+msgstr "BPM"
+
+#: ../picard/util/tags.py:40
+msgid "Copyright"
+msgstr "Derechos de autor"
+
+#: ../picard/util/tags.py:41
+#, fuzzy
+msgid "Composer"
+msgstr "Compositor"
+
+#: ../picard/util/tags.py:42
+msgid "Conductor"
+msgstr "Conductor"
+
+#: ../picard/util/tags.py:43
+msgid "Lyricist"
+msgstr "Letrista"
+
+#: ../picard/util/tags.py:44
+msgid "Arranger"
+msgstr "Arreglista"
+
+#: ../picard/util/tags.py:45
+msgid "Producer"
+msgstr "Productor"
+
+#: ../picard/util/tags.py:46
+msgid "Engineer"
+msgstr "Ingeniero"
+
+#: ../picard/util/tags.py:47
+msgid "Subtitle"
+msgstr "Subtítulo"
+
+#: ../picard/util/tags.py:48
+msgid "Disc Subtitle"
+msgstr "Subtítulo de disco"
+
+#: ../picard/util/tags.py:49
+msgid "Remixer"
+msgstr "Mezclador"
+
+#: ../picard/util/tags.py:50
+#, fuzzy
+msgid "MusicBrainz Track Id"
+msgstr "MusicBrainz Picard"
+
+#: ../picard/util/tags.py:51
+#, fuzzy
+msgid "MusicBrainz Release Id"
+msgstr "MusicBrainz Picard"
+
+#: ../picard/util/tags.py:52
+#, fuzzy
+msgid "MusicBrainz Artist Id"
+msgstr "MusicBrainz Picard"
+
+#: ../picard/util/tags.py:53
+#, fuzzy
+msgid "MusicBrainz Release Artist Id"
+msgstr "MusicBrainz Picard"
+
+#: ../picard/util/tags.py:54
+#, fuzzy
+msgid "MusicBrainz TRM Id"
+msgstr "MusicBrainz Picard"
+
+#: ../picard/util/tags.py:55
+#, fuzzy
+msgid "MusicBrainz Disc Id"
+msgstr "MusicBrainz Picard"
+
+#: ../picard/util/tags.py:56
+#, fuzzy
+msgid "MusicBrainz Sort Name"
+msgstr "Servidor de MusicBrainz"
+
+#: ../picard/util/tags.py:57
+msgid "MusicIP PUID"
+msgstr "MusicIP PUID"
+
+#: ../picard/util/tags.py:58
+#, fuzzy
+msgid "MusicIP Fingerprint"
+msgstr "Huella digital de audio"
+
+#: ../picard/util/tags.py:59
+msgid "Disc Id"
+msgstr ""
+
+#: ../picard/util/tags.py:60
+msgid "Website"
+msgstr "Sitio web"
+
+#: ../picard/util/tags.py:61
+msgid "Compilation"
+msgstr "Compilación"
+
+#: ../picard/util/tags.py:62
+msgid "Comment"
+msgstr "Comentario"
+
+#: ../picard/util/tags.py:63
+msgid "Genre"
+msgstr "Género"
+
+#: ../picard/util/tags.py:64
+msgid "Encoded By"
+msgstr "Codificado por"
+
+#: ../picard/util/tags.py:65
+msgid "Performer"
+msgstr "Realizador"
+
+#: ../picard/util/tags.py:66
+msgid "Release Type"
+msgstr "Tipo de lanzamiento"
+
+#: ../picard/util/tags.py:67
+msgid "Release Status"
+msgstr "Estado de lanzamiento"
+
+#: ../picard/util/tags.py:68
+#, fuzzy
+msgid "Release Country"
+msgstr "Tipo de lanzamiento"
+
+#: ../picard/util/tags.py:69
+msgid "Record Label"
+msgstr "Disquera"
+
+#: ../picard/util/tags.py:70
+msgid "Barcode"
+msgstr "Código de barras"
+
+#: ../picard/util/tags.py:71
+msgid "Catalog Number"
+msgstr "Número de catálogo"
+
+#: ../picard/util/tags.py:72
+#, fuzzy
+msgid "Format"
+msgstr "Formato:"
+
+#: ../picard/util/tags.py:73
+msgid "DJ-Mixer"
+msgstr "DJ-Mezclador"
+
+#: ../picard/util/tags.py:74
+#, fuzzy
+msgid "Media"
+msgstr "Metadatos"
+
+#: ../picard/util/tags.py:75
+msgid "Lyrics"
+msgstr "Letras"
+
+#: ../picard/util/tags.py:76
+msgid "Mixer"
+msgstr "Mezclador"
+
+#: ../picard/util/tags.py:77
+msgid "Language"
+msgstr "Idioma"
+
+#: ../picard/util/tags.py:78
+#, fuzzy
+msgid "Script"
+msgstr "Escritura de guiones"
+
 #: ../picard/util/webbrowser2.py:84
 msgid "Web Browser Error"
 msgstr "Error de navegador"
@@ -992,250 +2577,68 @@ msgstr ""
 "\n"
 "%s"
 
-#~ msgid "No matching tracks for file %s"
-#~ msgstr "No se han encontrado pistas concordantes para el archivo %s"
-
-#~ msgid "File %s identified!"
-#~ msgstr "¡Archivo %s identificado!"
-
-#~ msgid "Looking up the PUID for file %s..."
-#~ msgstr "Buscando PUID para el archivo %s..."
-
-#~ msgid "Looking up the metadata for file %s..."
-#~ msgstr "Buscando metadatos en archivo %s..."
-
-#~ msgid "No matching releases for cluster %s"
-#~ msgstr "No se han encontrado álbums concordantes para el grupo %s"
-
-#~ msgid "Cluster %s identified!"
-#~ msgstr "¡Grupo %s identificado!"
-
-#~ msgid "Looking up the metadata for cluster %s..."
-#~ msgstr "Buscando los metadatos para el grupo %s..."
-
-#~ msgid "M3U Playlist (*.m3u)"
-#~ msgstr "Lista de Reproducción M3U (*.m3u)"
-
-#~ msgid "PLS Playlist (*.pls)"
-#~ msgstr "Lista de Reproducción PLS (*.pls)"
-
-#~ msgid "XSPF Playlist (*.xspf)"
-#~ msgstr "Lista de Reproducción XSPF (*.xspf)"
-
-#~ msgid "Submitting PUIDs..."
-#~ msgstr "Enviando PUIDs..."
-
-#~ msgid "PUIDs submission failed: %s"
-#~ msgstr "Envío de PUIDs fallido: %s"
-
-#~ msgid "PUIDs successfully submitted!"
-#~ msgstr "¡Los PUIDs han sido enviados con éxito!"
-
 #~ msgid "New Version"
 #~ msgstr "Nueva Versión"
-
 #~ msgid ""
 #~ "New version of Picard is available (%s). Would you like to download it "
 #~ "now?"
 #~ msgstr ""
 #~ "Una nueva versión de Picard está disponible (%s). ¿Desea descargarla "
 #~ "ahora?"
+#~ msgid "Delete"
+#~ msgstr "Borrar"
 
-#~ msgid "Couldn't find PUID for file %s"
-#~ msgstr "No se ha podido encontrar el PUID para el fichero %s"
-
-#~ msgid "Looking up the fingerprint for file %s..."
-#~ msgstr "Buscando huella digital para el fichero %s..."
-
-#~ msgid "Creating fingerprint for file %s..."
-#~ msgstr "Creando huella para el fichero %s..."
-
-#~ msgid "Length"
-#~ msgstr "Duración"
-
-#~ msgid "&Ok"
-#~ msgstr "&Ok"
-
-#~ msgid "&Cancel"
-#~ msgstr "&Cancelar"
-
-#~ msgid "About"
-#~ msgstr "Acerca de"
-
-#~ msgid "Advanced"
-#~ msgstr "Avanzado"
-
-#~ msgid "Scripting"
-#~ msgstr "Escritura de guiones"
-
-#~ msgid "Tags"
-#~ msgstr "Etiquetas"
-
-#~ msgid "Date"
-#~ msgstr "Fecha"
-
-#~ msgid "Track Number"
-#~ msgstr "Número de pista"
-
-#~ msgid "Total Tracks"
-#~ msgstr "Total de pistas"
-
-#~ msgid "Disc Number"
-#~ msgstr "Número de disco"
-
-#~ msgid "Total Discs"
-#~ msgstr "Total de discos"
-
-#~ msgid "Artist Sort Order"
-#~ msgstr "Ordenar por artista"
-
-#~ msgid "Title Sort Order"
-#~ msgstr "Ordenar por título"
-
-#~ msgid "ASIN"
-#~ msgstr "ASIN"
-
-#~ msgid "Grouping"
-#~ msgstr "Agrupación"
-
-#~ msgid "ISRC"
-#~ msgstr "ISRC"
-
-#~ msgid "Mood"
-#~ msgstr "Estado de ánimo"
-
-#~ msgid "BPM"
-#~ msgstr "BPM"
-
-#~ msgid "Copyright"
-#~ msgstr "Derechos de autor"
-
-#~ msgid "Conductor"
-#~ msgstr "Conductor"
-
-#~ msgid "Lyricist"
-#~ msgstr "Letrista"
-
-#~ msgid "Arranger"
-#~ msgstr "Arreglista"
-
-#~ msgid "Producer"
-#~ msgstr "Productor"
-
-#~ msgid "Engineer"
-#~ msgstr "Ingeniero"
-
-#~ msgid "Subtitle"
-#~ msgstr "Subtítulo"
-
-#~ msgid "Disc Subtitle"
-#~ msgstr "Subtítulo de disco"
-
-#~ msgid "Remixer"
-#~ msgstr "Mezclador"
-
-#~ msgid "MusicIP PUID"
-#~ msgstr "MusicIP PUID"
-
-#~ msgid "Website"
-#~ msgstr "Sitio web"
-
-#~ msgid "Compilation"
-#~ msgstr "Compilación"
-
-#~ msgid "Comment"
-#~ msgstr "Comentario"
-
-#~ msgid "Genre"
-#~ msgstr "Género"
-
-#~ msgid "Encoded By"
-#~ msgstr "Codificado por"
-
-#~ msgid "Performer"
-#~ msgstr "Realizador"
-
-#~ msgid "Release Type"
-#~ msgstr "Tipo de lanzamiento"
-
-#~ msgid "Release Status"
-#~ msgstr "Estado de lanzamiento"
-
-#~ msgid "Record Label"
-#~ msgstr "Disquera"
-
-#~ msgid "Barcode"
-#~ msgstr "Código de barras"
-
-#~ msgid "Catalog Number"
-#~ msgstr "Número de catálogo"
-
-#~ msgid "DJ-Mixer"
-#~ msgstr "DJ-Mezclador"
-
-#~ msgid "Lyrics"
-#~ msgstr "Letras"
-
-#~ msgid "Mixer"
-#~ msgstr "Mezclador"
-
+#, fuzzy
+#~ msgid "Anal&yze"
+#~ msgstr "Analizar"
 #~ msgid "Ctrl+T"
 #~ msgstr "Ctrl+T"
 
+#, fuzzy
+#~ msgid "Generate &Cuesheet..."
+#~ msgstr "Generar lista de re&producción"
 #~ msgid "Automatically analyze all new files"
 #~ msgstr "Analizar automáticamente los nuevos ficheros"
 
-#~ msgid "Toolbar"
-#~ msgstr "Barra de herramientas"
+#, fuzzy
+#~ msgid "Album artist:"
+#~ msgstr "Artista:"
 
+#, fuzzy
+#~ msgid "A&dd Directory..."
+#~ msgstr "Agregar &Directorio...\tCtrl+D"
 #~ msgid "Are You Sure?"
 #~ msgstr "¿Está usted seguro?"
-
 #~ msgid "Add &Files...\tCtrl+O"
 #~ msgstr "Agregar &Archivos...\tCtrl+O"
-
 #~ msgid "Add &Directory...\tCtrl+D"
 #~ msgstr "Agregar &Directorio...\tCtrl+D"
-
 #~ msgid "&Save Files\tCtrl+S"
 #~ msgstr "&Guardar Archivos\tCtrl+S"
-
 #~ msgid "C&opy\tCtrl+C"
 #~ msgstr "C&opiar\tCtrl+C"
-
 #~ msgid "Help"
 #~ msgstr "Ayuda"
-
 #~ msgid "Preferences"
 #~ msgstr "Preferencias"
-
 #~ msgid "Error while saving cuesheet %s."
 #~ msgstr "Error al intentar guardar el listado de cola %s"
-
 #~ msgid "Cuesheet %s saved."
 #~ msgstr "Listado de cola %s guardado"
-
 #~ msgid "Time"
 #~ msgstr "Hora"
-
 #~ msgid "Albums"
 #~ msgstr "Álbumes"
-
 #~ msgid "Force Save"
 #~ msgstr "Forzar guardado"
-
 #~ msgid "Buy"
 #~ msgstr "Comprar"
-
 #~ msgid "Welcome to Picard!"
 #~ msgstr "¡Bienvenido a Picard!"
-
 #~ msgid "Track Num"
 #~ msgstr "Número de Pista"
-
 #~ msgid "PUID Collision"
 #~ msgstr "Colisión PUID"
-
 #~ msgid ""
 #~ "Version %s\n"
 #~ "\n"
@@ -1261,122 +2664,85 @@ msgstr ""
 #~ "Esta aplicación es posible gracias\n"
 #~ "a la concesión de la Comunidad Helix\n"
 #~ "Formatos soportados: %s"
-
-#~ msgid "Colors"
-#~ msgstr "Colores"
-
 #~ msgid "Font color"
 #~ msgstr "Color de Fuente"
-
 #~ msgid "Directories"
 #~ msgstr "Directorios"
-
 #~ msgid "Watch for new files"
 #~ msgstr "Vigilar nuevos ficheros"
-
 #~ msgid "Watch this directory for new audio files"
 #~ msgstr "Vigilar este directorio en busca de nuevos ficheros de audio"
-
 #~ msgid "Encodings"
 #~ msgstr "Codificaciones"
-
 #~ msgid "all languages"
 #~ msgstr "todos los idiomas"
-
 #~ msgid "percent similar."
 #~ msgstr "porciento similar."
-
 #~ msgid "Load recently used albums on startup"
 #~ msgstr "Cargar los álbums usados recientemente al inicio"
-
-#~ msgid "Language"
-#~ msgstr "Idioma"
-
-#~ msgid "System default"
-#~ msgstr "Omisión del sistema"
-
 #~ msgid "Allowed filename characters"
 #~ msgstr "Caracteres permitidos en nombre de fichero"
-
 #~ msgid "Use Windows-safe file names"
 #~ msgstr "Usar nombres de archivos legibles para windows"
-
 #~ msgid "Number of tracks on the album"
 #~ msgstr "Número de pistas en el álbum"
-
 #~ msgid "Track name"
 #~ msgstr "Nombre de la pista"
-
 #~ msgid "Zero padded track number"
 #~ msgstr "Numeración de pistas rellenado con ceros"
-
 #~ msgid "File format (e.g. mp3, ogg, wav)"
 #~ msgstr "Formato de archivo (p.e. mp3, ogg, wav)"
-
 #~ msgid "Album type (album, single, EP, etc.)"
 #~ msgstr "Tipo de álbum (álbum, single, EP, etc.)"
-
 #~ msgid "Album Status (official, promo, etc.)"
 #~ msgstr "Estatus del Album (oficial, promo, etc.)"
-
 #~ msgid "Album release month"
 #~ msgstr "Mes de liberación del álbum"
-
 #~ msgid "Album release day"
 #~ msgstr "Día de liberación del álbum"
-
 #~ msgid "Album release year"
 #~ msgstr "Año de liberación del álbum"
-
 #~ msgid "Make it so!"
 #~ msgstr "Hacerlo!"
-
 #~ msgid "Use proxy server to access the Internet"
 #~ msgstr "Utilizar servidor proxy para accesar Internet"
-
 #~ msgid "Proxy server to use"
 #~ msgstr "Servidor proxy a usar"
-
 #~ msgid "Proxy port"
 #~ msgstr "Puerto del proxy"
-
 #~ msgid "ID3v2.4 only"
 #~ msgstr "solamente ID3v2.4"
-
 #~ msgid "Save track/album"
 #~ msgstr "Guardar pista/álbum"
-
 #~ msgid "Artists"
 #~ msgstr "Artistas"
 
+#, fuzzy
+#~ msgid "Auto Tag"
+#~ msgstr "Editar etiqueta"
+
+#, fuzzy
+#~ msgid "Edit &Tags..."
+#~ msgstr "Editar etiqueta"
 #~ msgid "New files (drag files to tag here)"
 #~ msgstr "Ficheros nuevos (arrastra aqui los ficheros a etiquetar)"
-
 #~ msgid "updating album information"
 #~ msgstr "actualizando información del álbum"
-
 #~ msgid "Submitting PUID information to MusicBrainz server ..."
 #~ msgstr "Enviando información de PUIDs al servidor de MusicBrainz ..."
-
 #~ msgid "Performing a PUID lookup on file %s ..."
 #~ msgstr "Realizando búsqueda de PUID del fichero %s ..."
-
 #~ msgid "Are you sure you want to exit the application?"
 #~ msgstr "¿Está seguro que desea salir de la aplicación?"
-
 #~ msgid "CD Lookup error -- is there a CD in the CD-ROM drive?"
 #~ msgstr ""
 #~ "Búsqueda de CD errónea -- hay un CD colocado en la unidad de CD-ROM?"
-
 #~ msgid "CD Lookup Failed"
 #~ msgstr "Ha fallado la búsqueda del CD"
-
 #~ msgid "&Quick Start Guide"
 #~ msgstr "&Guía rápida de inicio"
-
 #~ msgid "Quick Start Guide"
 #~ msgstr "Guía Rápida de Uso"
-
 #~ msgid ""
 #~ "You have not specified an username and password. In order to contribute "
 #~ "data to MusicBrainz, you must have a MusicBrainz account.\n"
@@ -1389,29 +2755,22 @@ msgstr ""
 #~ "¿Desea crear una cuenta en este momento? En caso de que usted ya posea "
 #~ "una cuenta de MusicBrainz, introduzca su información de usuario en el "
 #~ "diálogo de ocpiones. "
-
 #~ msgid "Couldn't connect to the MusicBrainz server."
 #~ msgstr "No se ha podido conectar al servidor de MusicBrainz."
-
 #~ msgid "Connection error"
 #~ msgstr "Error de conexión"
-
 #~ msgid ""
 #~ "MusicBrainz Picard requires wxPython with UNICODE support.\n"
 #~ "Please download the appropriate toolkit from http://www.wxpython.org/"
 #~ msgstr ""
 #~ "MusicBrainz Picard necesita soporte para UNICODE en wxPython.\n"
 #~ "Por favor descarge el kit apropiado de http://www.wxpython.org/"
-
 #~ msgid "Unicode Required"
 #~ msgstr "Unicode Requerido"
-
 #~ msgid "PUID collision on file %s!"
 #~ msgstr "¡Colisión de PUID en el fichero %s!"
-
 #~ msgid "Save error"
 #~ msgstr "Error al guardar"
-
 #~ msgid ""
 #~ "The move files option is enabled, but the destination directory is not "
 #~ "specified or invalid.\n"
@@ -1421,7 +2780,6 @@ msgstr ""
 #~ "La opción de mover los archivos está habilitada, pero el directorio "
 #~ "destino no se ha especificado ó es inválido.\n"
 #~ "Por favor modifique la opción ó el directorio destino e inténtelo de nuevo"
-
 #~ msgid ""
 #~ "Not all files could be saved. Please check for and examine tracks that "
 #~ "have an error icon in front of them. To retry saving the track, right "
@@ -1431,158 +2789,72 @@ msgstr ""
 #~ "las pistas en las que aparece un icono de error frente a ellos. Para "
 #~ "reintentar guardar la pista, haga click derecho en la pista y seleccione "
 #~ "'Limpiar error'"
-
 #~ msgid "Select directory that contains music files"
 #~ msgstr "Seleccione un directorio que contenga ficheros de música"
-
 #~ msgid "Reload album from main server"
 #~ msgstr "Recargar álbum del servidor principal"
-
 #~ msgid "Select or drag a folder from below"
 #~ msgstr "Seleccione ó arrastre un folder de abajo"
-
 #~ msgid "Drag files from below"
 #~ msgstr "Arrastre ficheros desde abajo"
-
 #~ msgid "Release date"
 #~ msgstr "Fecha de liberación"
-
 #~ msgid "%d%% similar"
 #~ msgstr "%d%% similar"
-
 #~ msgid "Please donate to MusicBrainz!"
 #~ msgstr "¡Por favor done a MusicBrainz!"
-
-#~ msgid "Later"
-#~ msgstr "Más tarde"
-
 #~ msgid ""
 #~ "The destination directory %s does not exist. Please pick a valid "
 #~ "directory."
 #~ msgstr ""
 #~ "El directorio destino %s no existe, Por favor seleccione un directorio "
 #~ "válido"
-
 #~ msgid "Select the encoding to use when reading and writing filenames"
 #~ msgstr ""
 #~ "Seleccione la codificación a utilizar al leer y escribir nombres de "
 #~ "archivos"
-
 #~ msgid "Automatically move clusters to albums that are at least"
 #~ msgstr "Mover automáticamente los grupos de álbums que sean al menos"
-
 #~ msgid "Automatically save recognized tracks that are at least"
 #~ msgstr "Guardar automáticamente las pistas reconocidas que tengan al menos"
-
-#~ msgid "Czech"
-#~ msgstr "Checo"
-
-#~ msgid "German"
-#~ msgstr "Alemán"
-
-#~ msgid "English"
-#~ msgstr "Inglés"
-
-#~ msgid "English (UK)"
-#~ msgstr "Inglés (Reino Unido)"
-
-#~ msgid "Spanish"
-#~ msgstr "Español"
-
-#~ msgid "Finnish"
-#~ msgstr "Finlandés"
-
-#~ msgid "French"
-#~ msgstr "Francés"
-
-#~ msgid "Hungarian"
-#~ msgstr "Húngaro"
-
-#~ msgid "Icelandic"
-#~ msgstr "Islandés"
-
-#~ msgid "Italian"
-#~ msgstr "Italiano"
-
-#~ msgid "Korean"
-#~ msgstr "Coreano"
-
-#~ msgid "Lithuanian"
-#~ msgstr "Lituano"
-
-#~ msgid "Dutch"
-#~ msgstr "Danés"
-
-#~ msgid "Norwegian Bokmal"
-#~ msgstr "Bokmal noruego"
-
-#~ msgid "Portuguese"
-#~ msgstr "Portugués"
-
-#~ msgid "Romanian"
-#~ msgstr "Rumano"
-
-#~ msgid "Russian"
-#~ msgstr "Ruso"
-
-#~ msgid "Slovak"
-#~ msgstr "Eslovako"
-
-#~ msgid "Swedish"
-#~ msgstr "Sueco"
-
 #~ msgid ""
 #~ "Note: This setting will take effect after you restart the application."
 #~ msgstr ""
 #~ "Nota: Este ajuste tomará efecto después de que sea reiniciada la "
 #~ "aplicación"
-
 #~ msgid "Artist translation"
 #~ msgstr "Traducción de artista"
-
 #~ msgid "Rename files when writing metadata tags"
 #~ msgstr "Renombrar ficheros al escribir las etiquetas"
-
 #~ msgid "Naming Help"
 #~ msgstr "Ayuda de Nombrado"
-
 #~ msgid ""
 #~ "You may use the following variables in the filenaming\n"
 #~ "specifications in the options dialog:"
 #~ msgstr ""
 #~ "Es recomendable utilizar las siguientes variables en la\n"
 #~ "especificación de nombrado dentro del diálogo de opciones"
-
 #~ msgid "A %s in the naming specification will create a new subfolder."
 #~ msgstr "Un %s en la especificación de nombrado creará un nuevo subfolder"
-
 #~ msgid "Audio fingerprinting options"
 #~ msgstr "Opciones de huellas digitales de audio"
-
 #~ msgid "Automatically select PUID collision tracks that are at least"
 #~ msgstr ""
 #~ "Seleccionar automáticamente las pistas de colisión PUID que sean al menos"
-
 #~ msgid "Write ID3v1 tags to MP3 files (ID3v2 tags will always be written)"
 #~ msgstr ""
 #~ "Escribir etiquetas ID3v1 a ficheros MP3 (las etiquetas ID3v2 siempre se "
 #~ "escriben)"
-
 #~ msgid "Remove track/album"
 #~ msgstr "Borrar pista/álbum"
-
 #~ msgid "Listen to track"
 #~ msgstr "Escuchar pista"
-
 #~ msgid "Album clusters"
 #~ msgstr "Grupos de álbums"
-
 #~ msgid "Unmatched files for this album"
 #~ msgstr "Ficheros que no coinciden con este álbum"
-
 #~ msgid "%d of %d tracks linked"
 #~ msgstr "%d de %d pistas enlazadas"
-
 #~ msgid ""
 #~ "The Picard Tagger is a free application and you may\n"
 #~ "use it as long as you wish. However, providing\n"
@@ -1601,85 +2873,60 @@ msgstr ""
 #~ "la cual opera el proyecto MusicBrainz. Todas las donaciones\n"
 #~ "son deducibles de impuestos para los residentes de los E.U.A.\n"
 #~ "y mantienen el servicio vivo y avanzando."
-
 #~ msgid "Matched track highlighting"
 #~ msgstr "Resaltado de pistas coincidentes"
-
 #~ msgid "Good match background color"
 #~ msgstr "Color del fondo de buenas coincidencias"
-
 #~ msgid "Bad match background color"
 #~ msgstr "Color de fondo de no coincidencias"
-
 #~ msgid "Move files option"
 #~ msgstr "Opciones al mover ficheros"
-
 #~ msgid "When matching tracks to albums, accept tracks that are at least"
 #~ msgstr ""
 #~ "Cuando se encuentren coincidencias de álbums, aceptar pistas que sean al "
 #~ "menos"
-
 #~ msgid "CD-ROM drive path to use for lookups"
 #~ msgstr "Ruta de la unidad de CD-ROM que se utilizará para las búsquedas"
-
 #~ msgid "Launch MB Tagger automatically for inserted Audio CDs"
 #~ msgstr "Lanzar automáticamente el MB Tagger cuando se inserten CDs de Audio"
-
 #~ msgid ""
 #~ "Failed to set the proper registy values to enable launching the tagger "
 #~ "after CD insertion. "
 #~ msgstr ""
 #~ "No se pudieron introducir los valores al registro que permiten lanzar el "
 #~ "tagger después de insertar un CD "
-
 #~ msgid "Default CD setting failed"
 #~ msgstr "Falló ajuste de CD por omisión"
-
 #~ msgid "File format naming specification"
 #~ msgstr "Especificación del formato de nombrado de ficheros"
-
 #~ msgid "Various artist file format naming specification"
 #~ msgstr "Especificación de nombrado de ficheros para varios artistas"
-
 #~ msgid "Note: Leave blank to allow all possible characters"
 #~ msgstr "Nota: Dejese vacío para permitir todos los caracteres posibles"
-
 #~ msgid "Track artist name"
 #~ msgstr "Nombre de la pista"
-
 #~ msgid "Track artist sortname"
 #~ msgstr "Ordenar por pista del artista"
-
 #~ msgid "The first character of the artist sortname"
 #~ msgstr "Ordenar por el primer caracter del artista"
-
 #~ msgid "The first two characters of the artist sortname"
 #~ msgstr "Ordenar por los dos primeros caracteres del artista"
-
 #~ msgid "The first three characters of the artist sortname"
 #~ msgstr "Ordenar por los primeros tres caracteres del artista"
-
 #~ msgid "Naming specification help"
 #~ msgstr "Ayuda con la especificación de Nombrado"
-
 #~ msgid "Accept PUID matches that are at least"
 #~ msgstr "Aceptar coincidencias de PUID que sean al menos"
-
 #~ msgid "Various artist name"
 #~ msgstr "Nombre para artistas varios"
-
 #~ msgid "Open file"
 #~ msgstr "Abrir fichero"
-
 #~ msgid "Open directory"
 #~ msgstr "Abrir directorio"
-
 #~ msgid "Edit options"
 #~ msgstr "Editar Opciones"
-
 #~ msgid "Exit"
 #~ msgstr "Salir"
-
 #~ msgid ""
 #~ "The MusicBrainz Tagger requires wx.Widgets with UNICODE support.\n"
 #~ "Please download the appropriate toolkit from  http://www.wxwidgets.com"
@@ -1688,13 +2935,10 @@ msgstr ""
 #~ "UNICODE.\n"
 #~ "Por favor descarge el set de herramientas apropiado desde http://www."
 #~ "wxwidgets.com"
-
 #~ msgid "Sorry, there is no help file yet."
 #~ msgstr "Lo sentimos, aún no hay fichero de ayuda"
-
 #~ msgid "Use Internet Explorer settings for proxy support."
 #~ msgstr "Utilizar los ajustes de Internet Explorer para el proxy"
-
 #~ msgid ""
 #~ "If you use an automatic proxy configuration in Internet\n"
 #~ "Explorer, uncheck the box above and enter your\n"
@@ -1703,3 +2947,4 @@ msgstr ""
 #~ "En caso de utilizar la configuración automática en\n"
 #~ "Internet Explorer, desactive la caja e introduzca su\n"
 #~ "servidor proxy y el puerto:"
+
diff --git a/po/fa.po b/po/fa.po
index 23b6198b8..d385eca8e 100644
--- a/po/fa.po
+++ b/po/fa.po
@@ -7,35 +7,1270 @@ msgid ""
 msgstr ""
 "Project-Id-Version: picard\n"
 "Report-Msgid-Bugs-To: http://bugs.musicbrainz.org/\n"
-"POT-Creation-Date: 2008-12-01 18:20+0100\n"
-"PO-Revision-Date: 2008-07-27 20:07+0000\n"
-"Last-Translator: Lukáš Lalinský <lalinsky@gmail.com>\n"
+"POT-Creation-Date: 2009-01-25 12:23+0100\n"
+"PO-Revision-Date: 2009-01-25 13:12+0100\n"
+"Last-Translator: Philipp Wolfer <phw@rubyforge.org>\n"
 "Language-Team: Persian <fa@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
-"X-Launchpad-Export-Date: 2008-12-01 17:02+0000\n"
+"X-Launchpad-Export-Date: 2009-01-24 23:28+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
-#: ../picard/album.py:108 ../picard/cluster.py:248
+#: ../picard/album.py:108
+#: ../picard/cluster.py:248
 msgid "Unmatched Files"
 msgstr ""
 
-#: ../picard/album.py:269
+#: ../picard/album.py:281
 #, python-format
 msgid "[couldn't load album %s]"
 msgstr ""
 
-#: ../picard/album.py:305
+#: ../picard/album.py:317
 msgid "[loading album information]"
 msgstr ""
 
-#: ../picard/tagger.py:472
+#: ../picard/cluster.py:164
+#: ../picard/cluster.py:175
+#, python-format
+msgid "No matching releases for cluster %s"
+msgstr ""
+
+#: ../picard/cluster.py:177
+#, python-format
+msgid "Cluster %s identified!"
+msgstr ""
+
+#: ../picard/cluster.py:182
+#, python-format
+msgid "Looking up the metadata for cluster %s..."
+msgstr ""
+
+#: ../picard/const.py:40
+msgid "CD"
+msgstr ""
+
+#: ../picard/const.py:41
+msgid "DVD"
+msgstr ""
+
+#: ../picard/const.py:42
+msgid "SACD"
+msgstr ""
+
+#: ../picard/const.py:43
+msgid "LaserDisc"
+msgstr ""
+
+#: ../picard/const.py:44
+msgid "MiniDisc"
+msgstr ""
+
+#: ../picard/const.py:45
+msgid "Vinyl"
+msgstr ""
+
+#: ../picard/const.py:46
+msgid "Cassette"
+msgstr ""
+
+#: ../picard/const.py:47
+msgid "Cartridge (4/8-tracks)"
+msgstr ""
+
+#: ../picard/const.py:48
+msgid "Reel-to-Reel"
+msgstr ""
+
+#: ../picard/const.py:49
+msgid "DAT"
+msgstr ""
+
+#: ../picard/const.py:50
+msgid "Digital Media"
+msgstr ""
+
+#: ../picard/const.py:51
+msgid "Wax Cylinder"
+msgstr ""
+
+#: ../picard/const.py:52
+msgid "Piano Roll"
+msgstr ""
+
+#: ../picard/const.py:53
+msgid "Other"
+msgstr ""
+
+#: ../picard/const.py:58
+msgid "Bangladesh"
+msgstr ""
+
+#: ../picard/const.py:59
+msgid "Belgium"
+msgstr ""
+
+#: ../picard/const.py:60
+msgid "Burkina Faso"
+msgstr ""
+
+#: ../picard/const.py:61
+msgid "Bulgaria"
+msgstr ""
+
+#: ../picard/const.py:62
+msgid "Barbados"
+msgstr ""
+
+#: ../picard/const.py:63
+msgid "Wallis and Futuna Islands"
+msgstr ""
+
+#: ../picard/const.py:64
+msgid "Bermuda"
+msgstr ""
+
+#: ../picard/const.py:65
+msgid "Brunei Darussalam"
+msgstr ""
+
+#: ../picard/const.py:66
+msgid "Bolivia"
+msgstr ""
+
+#: ../picard/const.py:67
+msgid "Bahrain"
+msgstr ""
+
+#: ../picard/const.py:68
+msgid "Burundi"
+msgstr ""
+
+#: ../picard/const.py:69
+msgid "Benin"
+msgstr ""
+
+#: ../picard/const.py:70
+msgid "Bhutan"
+msgstr ""
+
+#: ../picard/const.py:71
+msgid "Jamaica"
+msgstr ""
+
+#: ../picard/const.py:72
+msgid "Bouvet Island"
+msgstr ""
+
+#: ../picard/const.py:73
+msgid "Botswana"
+msgstr ""
+
+#: ../picard/const.py:74
+msgid "Samoa"
+msgstr ""
+
+#: ../picard/const.py:75
+msgid "Brazil"
+msgstr ""
+
+#: ../picard/const.py:76
+msgid "Bahamas"
+msgstr ""
+
+#: ../picard/const.py:77
+msgid "Belarus"
+msgstr ""
+
+#: ../picard/const.py:78
+msgid "Belize"
+msgstr ""
+
+#: ../picard/const.py:79
+msgid "Russian Federation"
+msgstr ""
+
+#: ../picard/const.py:80
+msgid "Rwanda"
+msgstr ""
+
+#: ../picard/const.py:81
+msgid "Reunion"
+msgstr ""
+
+#: ../picard/const.py:82
+msgid "Turkmenistan"
+msgstr ""
+
+#: ../picard/const.py:83
+msgid "Tajikistan"
+msgstr ""
+
+#: ../picard/const.py:84
+msgid "Romania"
+msgstr ""
+
+#: ../picard/const.py:85
+msgid "Tokela"
+msgstr ""
+
+#: ../picard/const.py:86
+msgid "Guinea-Bissa"
+msgstr ""
+
+#: ../picard/const.py:87
+msgid "Guam"
+msgstr ""
+
+#: ../picard/const.py:88
+msgid "Guatemala"
+msgstr ""
+
+#: ../picard/const.py:89
+msgid "Greece"
+msgstr ""
+
+#: ../picard/const.py:90
+msgid "Equatorial Guinea"
+msgstr ""
+
+#: ../picard/const.py:91
+msgid "Guadeloupe"
+msgstr ""
+
+#: ../picard/const.py:92
+msgid "Japan"
+msgstr ""
+
+#: ../picard/const.py:93
+msgid "Guyana"
+msgstr ""
+
+#: ../picard/const.py:94
+msgid "French Guiana"
+msgstr ""
+
+#: ../picard/const.py:95
+msgid "Georgia"
+msgstr ""
+
+#: ../picard/const.py:96
+msgid "Grenada"
+msgstr ""
+
+#: ../picard/const.py:97
+msgid "United Kingdom"
+msgstr ""
+
+#: ../picard/const.py:98
+msgid "Gabon"
+msgstr ""
+
+#: ../picard/const.py:99
+msgid "El Salvador"
+msgstr ""
+
+#: ../picard/const.py:100
+msgid "Guinea"
+msgstr ""
+
+#: ../picard/const.py:101
+msgid "Gambia"
+msgstr ""
+
+#: ../picard/const.py:102
+msgid "Greenland"
+msgstr ""
+
+#: ../picard/const.py:103
+msgid "Gibraltar"
+msgstr ""
+
+#: ../picard/const.py:104
+msgid "Ghana"
+msgstr ""
+
+#: ../picard/const.py:105
+msgid "Oman"
+msgstr ""
+
+#: ../picard/const.py:106
+msgid "Tunisia"
+msgstr ""
+
+#: ../picard/const.py:107
+msgid "Jordan"
+msgstr ""
+
+#: ../picard/const.py:108
+msgid "Haiti"
+msgstr ""
+
+#: ../picard/const.py:109
+msgid "Hungary"
+msgstr ""
+
+#: ../picard/const.py:110
+msgid "Hong Kong"
+msgstr ""
+
+#: ../picard/const.py:111
+msgid "Honduras"
+msgstr ""
+
+#: ../picard/const.py:112
+msgid "Heard and Mc Donald Islands"
+msgstr ""
+
+#: ../picard/const.py:113
+msgid "Venezuela"
+msgstr ""
+
+#: ../picard/const.py:114
+msgid "Puerto Rico"
+msgstr ""
+
+#: ../picard/const.py:115
+msgid "Pala"
+msgstr ""
+
+#: ../picard/const.py:116
+msgid "Portugal"
+msgstr ""
+
+#: ../picard/const.py:117
+msgid "Svalbard and Jan Mayen Islands"
+msgstr ""
+
+#: ../picard/const.py:118
+msgid "Paraguay"
+msgstr ""
+
+#: ../picard/const.py:119
+msgid "Iraq"
+msgstr ""
+
+#: ../picard/const.py:120
+msgid "Panama"
+msgstr ""
+
+#: ../picard/const.py:121
+msgid "French Polynesia"
+msgstr ""
+
+#: ../picard/const.py:122
+msgid "Papua New Guinea"
+msgstr ""
+
+#: ../picard/const.py:123
+msgid "Per"
+msgstr ""
+
+#: ../picard/const.py:124
+msgid "Pakistan"
+msgstr ""
+
+#: ../picard/const.py:125
+msgid "Philippines"
+msgstr ""
+
+#: ../picard/const.py:126
+msgid "Pitcairn"
+msgstr ""
+
+#: ../picard/const.py:127
+msgid "Poland"
+msgstr ""
+
+#: ../picard/const.py:128
+msgid "St. Pierre and Miquelon"
+msgstr ""
+
+#: ../picard/const.py:129
+msgid "Zambia"
+msgstr ""
+
+#: ../picard/const.py:130
+msgid "Western Sahara"
+msgstr ""
+
+#: ../picard/const.py:131
+msgid "Estonia"
+msgstr ""
+
+#: ../picard/const.py:132
+msgid "Egypt"
+msgstr ""
+
+#: ../picard/const.py:133
+msgid "South Africa"
+msgstr ""
+
+#: ../picard/const.py:134
+msgid "Ecuador"
+msgstr ""
+
+#: ../picard/const.py:135
+msgid "Italy"
+msgstr ""
+
+#: ../picard/const.py:136
+msgid "Viet Nam"
+msgstr ""
+
+#: ../picard/const.py:137
+msgid "Solomon Islands"
+msgstr ""
+
+#: ../picard/const.py:138
+msgid "Ethiopia"
+msgstr ""
+
+#: ../picard/const.py:139
+msgid "Somalia"
+msgstr ""
+
+#: ../picard/const.py:140
+msgid "Zimbabwe"
+msgstr ""
+
+#: ../picard/const.py:141
+msgid "Saudi Arabia"
+msgstr ""
+
+#: ../picard/const.py:142
+msgid "Spain"
+msgstr ""
+
+#: ../picard/const.py:143
+msgid "Eritrea"
+msgstr ""
+
+#: ../picard/const.py:144
+msgid "Moldova, Republic of"
+msgstr ""
+
+#: ../picard/const.py:145
+msgid "Madagascar"
+msgstr ""
+
+#: ../picard/const.py:146
+msgid "Morocco"
+msgstr ""
+
+#: ../picard/const.py:147
+msgid "Monaco"
+msgstr ""
+
+#: ../picard/const.py:148
+msgid "Uzbekistan"
+msgstr ""
+
+#: ../picard/const.py:149
+msgid "Myanmar"
+msgstr ""
+
+#: ../picard/const.py:150
+msgid "Mali"
+msgstr ""
+
+#: ../picard/const.py:151
+msgid "Maca"
+msgstr ""
+
+#: ../picard/const.py:152
+msgid "Mongolia"
+msgstr ""
+
+#: ../picard/const.py:153
+msgid "Marshall Islands"
+msgstr ""
+
+#: ../picard/const.py:154
+msgid "Macedonia, The Former Yugoslav Republic of"
+msgstr ""
+
+#: ../picard/const.py:155
+msgid "Mauritius"
+msgstr ""
+
+#: ../picard/const.py:156
+msgid "Malta"
+msgstr ""
+
+#: ../picard/const.py:157
+msgid "Malawi"
+msgstr ""
+
+#: ../picard/const.py:158
+msgid "Maldives"
+msgstr ""
+
+#: ../picard/const.py:159
+msgid "Martinique"
+msgstr ""
+
+#: ../picard/const.py:160
+msgid "Northern Mariana Islands"
+msgstr ""
+
+#: ../picard/const.py:161
+msgid "Montserrat"
+msgstr ""
+
+#: ../picard/const.py:162
+msgid "Mauritania"
+msgstr ""
+
+#: ../picard/const.py:163
+msgid "Uganda"
+msgstr ""
+
+#: ../picard/const.py:164
+msgid "Malaysia"
+msgstr ""
+
+#: ../picard/const.py:165
+msgid "Mexico"
+msgstr ""
+
+#: ../picard/const.py:166
+msgid "Israel"
+msgstr ""
+
+#: ../picard/const.py:167
+msgid "France"
+msgstr ""
+
+#: ../picard/const.py:168
+msgid "British Indian Ocean Territory"
+msgstr ""
+
+#: ../picard/const.py:169
+msgid "St. Helena"
+msgstr ""
+
+#: ../picard/const.py:170
+msgid "Finland"
+msgstr ""
+
+#: ../picard/const.py:171
+msgid "Fiji"
+msgstr ""
+
+#: ../picard/const.py:172
+msgid "Falkland Islands (Malvinas)"
+msgstr ""
+
+#: ../picard/const.py:173
+msgid "Micronesia, Federated States of"
+msgstr ""
+
+#: ../picard/const.py:174
+msgid "Faroe Islands"
+msgstr ""
+
+#: ../picard/const.py:175
+msgid "Nicaragua"
+msgstr ""
+
+#: ../picard/const.py:176
+msgid "Netherlands"
+msgstr ""
+
+#: ../picard/const.py:177
+msgid "Norway"
+msgstr ""
+
+#: ../picard/const.py:178
+msgid "Namibia"
+msgstr ""
+
+#: ../picard/const.py:179
+msgid "Vanuat"
+msgstr ""
+
+#: ../picard/const.py:180
+msgid "New Caledonia"
+msgstr ""
+
+#: ../picard/const.py:181
+msgid "Niger"
+msgstr ""
+
+#: ../picard/const.py:182
+msgid "Norfolk Island"
+msgstr ""
+
+#: ../picard/const.py:183
+msgid "Nigeria"
+msgstr ""
+
+#: ../picard/const.py:184
+msgid "New Zealand"
+msgstr ""
+
+#: ../picard/const.py:185
+msgid "Zaire"
+msgstr ""
+
+#: ../picard/const.py:186
+msgid "Nepal"
+msgstr ""
+
+#: ../picard/const.py:187
+msgid "Naur"
+msgstr ""
+
+#: ../picard/const.py:188
+msgid "Niue"
+msgstr ""
+
+#: ../picard/const.py:189
+msgid "Cook Islands"
+msgstr ""
+
+#: ../picard/const.py:190
+msgid "Cote d'Ivoire"
+msgstr ""
+
+#: ../picard/const.py:191
+msgid "Switzerland"
+msgstr ""
+
+#: ../picard/const.py:192
+msgid "Colombia"
+msgstr ""
+
+#: ../picard/const.py:193
+msgid "China"
+msgstr ""
+
+#: ../picard/const.py:194
+msgid "Cameroon"
+msgstr ""
+
+#: ../picard/const.py:195
+#, fuzzy
+msgid "Chile"
+msgstr "عنوان"
+
+#: ../picard/const.py:196
+msgid "Cocos (Keeling) Islands"
+msgstr ""
+
+#: ../picard/const.py:197
+msgid "Canada"
+msgstr ""
+
+#: ../picard/const.py:198
+msgid "Congo"
+msgstr ""
+
+#: ../picard/const.py:199
+msgid "Central African Republic"
+msgstr ""
+
+#: ../picard/const.py:200
+msgid "Czech Republic"
+msgstr ""
+
+#: ../picard/const.py:201
+msgid "Cyprus"
+msgstr ""
+
+#: ../picard/const.py:202
+msgid "Christmas Island"
+msgstr ""
+
+#: ../picard/const.py:203
+msgid "Costa Rica"
+msgstr ""
+
+#: ../picard/const.py:204
+msgid "Cape Verde"
+msgstr ""
+
+#: ../picard/const.py:205
+msgid "Cuba"
+msgstr ""
+
+#: ../picard/const.py:206
+msgid "Swaziland"
+msgstr ""
+
+#: ../picard/const.py:207
+msgid "Syrian Arab Republic"
+msgstr ""
+
+#: ../picard/const.py:208
+msgid "Kyrgyzstan"
+msgstr ""
+
+#: ../picard/const.py:209
+msgid "Kenya"
+msgstr ""
+
+#: ../picard/const.py:210
+msgid "Suriname"
+msgstr ""
+
+#: ../picard/const.py:211
+msgid "Kiribati"
+msgstr ""
+
+#: ../picard/const.py:212
+msgid "Cambodia"
+msgstr ""
+
+#: ../picard/const.py:213
+msgid "Saint Kitts and Nevis"
+msgstr ""
+
+#: ../picard/const.py:214
+msgid "Comoros"
+msgstr ""
+
+#: ../picard/const.py:215
+msgid "Sao Tome and Principe"
+msgstr ""
+
+#: ../picard/const.py:216
+msgid "Slovenia"
+msgstr ""
+
+#: ../picard/const.py:217
+msgid "Kuwait"
+msgstr ""
+
+#: ../picard/const.py:218
+msgid "Senegal"
+msgstr ""
+
+#: ../picard/const.py:219
+msgid "San Marino"
+msgstr ""
+
+#: ../picard/const.py:220
+msgid "Sierra Leone"
+msgstr ""
+
+#: ../picard/const.py:221
+msgid "Seychelles"
+msgstr ""
+
+#: ../picard/const.py:222
+msgid "Kazakhstan"
+msgstr ""
+
+#: ../picard/const.py:223
+msgid "Cayman Islands"
+msgstr ""
+
+#: ../picard/const.py:224
+msgid "Singapore"
+msgstr ""
+
+#: ../picard/const.py:225
+msgid "Sweden"
+msgstr ""
+
+#: ../picard/const.py:226
+msgid "Sudan"
+msgstr ""
+
+#: ../picard/const.py:227
+msgid "Dominican Republic"
+msgstr ""
+
+#: ../picard/const.py:228
+msgid "Dominica"
+msgstr ""
+
+#: ../picard/const.py:229
+#, fuzzy
+msgid "Djibouti"
+msgstr "&درباره..."
+
+#: ../picard/const.py:230
+msgid "Denmark"
+msgstr ""
+
+#: ../picard/const.py:231
+msgid "Virgin Islands (British)"
+msgstr ""
+
+#: ../picard/const.py:232
+msgid "Germany"
+msgstr ""
+
+#: ../picard/const.py:233
+msgid "Yemen"
+msgstr ""
+
+#: ../picard/const.py:234
+msgid "Algeria"
+msgstr ""
+
+#: ../picard/const.py:235
+msgid "United States"
+msgstr ""
+
+#: ../picard/const.py:236
+msgid "Uruguay"
+msgstr ""
+
+#: ../picard/const.py:237
+msgid "Mayotte"
+msgstr ""
+
+#: ../picard/const.py:238
+msgid "United States Minor Outlying Islands"
+msgstr ""
+
+#: ../picard/const.py:239
+msgid "Lebanon"
+msgstr ""
+
+#: ../picard/const.py:240
+msgid "Saint Lucia"
+msgstr ""
+
+#: ../picard/const.py:241
+msgid "Lao People's Democratic Republic"
+msgstr ""
+
+#: ../picard/const.py:242
+msgid "Tuval"
+msgstr ""
+
+#: ../picard/const.py:243
+msgid "Taiwan"
+msgstr ""
+
+#: ../picard/const.py:244
+msgid "Trinidad and Tobago"
+msgstr ""
+
+#: ../picard/const.py:245
+msgid "Turkey"
+msgstr ""
+
+#: ../picard/const.py:246
+msgid "Sri Lanka"
+msgstr ""
+
+#: ../picard/const.py:247
+msgid "Liechtenstein"
+msgstr ""
+
+#: ../picard/const.py:248
+msgid "Latvia"
+msgstr ""
+
+#: ../picard/const.py:249
+msgid "Tonga"
+msgstr ""
+
+#: ../picard/const.py:250
+msgid "Lithuania"
+msgstr ""
+
+#: ../picard/const.py:251
+msgid "Luxembourg"
+msgstr ""
+
+#: ../picard/const.py:252
+msgid "Liberia"
+msgstr ""
+
+#: ../picard/const.py:253
+#, fuzzy
+msgid "Lesotho"
+msgstr "طول‌"
+
+#: ../picard/const.py:254
+msgid "Thailand"
+msgstr ""
+
+#: ../picard/const.py:255
+msgid "French Southern Territories"
+msgstr ""
+
+#: ../picard/const.py:256
+#, fuzzy
+msgid "Togo"
+msgstr "&ابزارها‌"
+
+#: ../picard/const.py:257
+msgid "Chad"
+msgstr ""
+
+#: ../picard/const.py:258
+msgid "Turks and Caicos Islands"
+msgstr ""
+
+#: ../picard/const.py:259
+msgid "Libyan Arab Jamahiriya"
+msgstr ""
+
+#: ../picard/const.py:260
+msgid "Vatican City State (Holy See)"
+msgstr ""
+
+#: ../picard/const.py:261
+msgid "Saint Vincent and The Grenadines"
+msgstr ""
+
+#: ../picard/const.py:262
+msgid "United Arab Emirates"
+msgstr ""
+
+#: ../picard/const.py:263
+msgid "Andorra"
+msgstr ""
+
+#: ../picard/const.py:264
+msgid "Antigua and Barbuda"
+msgstr ""
+
+#: ../picard/const.py:265
+msgid "Afghanistan"
+msgstr ""
+
+#: ../picard/const.py:266
+msgid "Anguilla"
+msgstr ""
+
+#: ../picard/const.py:267
+msgid "Virgin Islands (U.S.)"
+msgstr ""
+
+#: ../picard/const.py:268
+msgid "Iceland"
+msgstr ""
+
+#: ../picard/const.py:269
+msgid "Iran (Islamic Republic of)"
+msgstr ""
+
+#: ../picard/const.py:270
+msgid "Armenia"
+msgstr ""
+
+#: ../picard/const.py:271
+msgid "Albania"
+msgstr ""
+
+#: ../picard/const.py:272
+msgid "Angola"
+msgstr ""
+
+#: ../picard/const.py:273
+msgid "Netherlands Antilles"
+msgstr ""
+
+#: ../picard/const.py:274
+msgid "Antarctica"
+msgstr ""
+
+#: ../picard/const.py:275
+msgid "American Samoa"
+msgstr ""
+
+#: ../picard/const.py:276
+msgid "Argentina"
+msgstr ""
+
+#: ../picard/const.py:277
+msgid "Australia"
+msgstr ""
+
+#: ../picard/const.py:278
+msgid "Austria"
+msgstr ""
+
+#: ../picard/const.py:279
+msgid "Aruba"
+msgstr ""
+
+#: ../picard/const.py:280
+msgid "India"
+msgstr ""
+
+#: ../picard/const.py:281
+msgid "Tanzania, United Republic of"
+msgstr ""
+
+#: ../picard/const.py:282
+msgid "Azerbaijan"
+msgstr ""
+
+#: ../picard/const.py:283
+msgid "Ireland"
+msgstr ""
+
+#: ../picard/const.py:284
+msgid "Indonesia"
+msgstr ""
+
+#: ../picard/const.py:285
+msgid "Ukraine"
+msgstr ""
+
+#: ../picard/const.py:286
+msgid "Qatar"
+msgstr ""
+
+#: ../picard/const.py:287
+msgid "Mozambique"
+msgstr ""
+
+#: ../picard/const.py:288
+msgid "Bosnia and Herzegovina"
+msgstr ""
+
+#: ../picard/const.py:289
+msgid "Congo, The Democratic Republic of the"
+msgstr ""
+
+#: ../picard/const.py:290
+msgid "Serbia and Montenegro"
+msgstr ""
+
+#: ../picard/const.py:291
+msgid "Croatia"
+msgstr ""
+
+#: ../picard/const.py:292
+msgid "Korea (North), Democratic People's Republic of"
+msgstr ""
+
+#: ../picard/const.py:293
+msgid "Korea (South), Republic of"
+msgstr ""
+
+#: ../picard/const.py:294
+msgid "Slovakia"
+msgstr ""
+
+#: ../picard/const.py:295
+msgid "Soviet Union (historical, 1922-1991)"
+msgstr ""
+
+#: ../picard/const.py:296
+msgid "East Timor"
+msgstr ""
+
+#: ../picard/const.py:297
+msgid "Czechoslovakia (historical, 1918-1992)"
+msgstr ""
+
+#: ../picard/const.py:298
+msgid "Europe"
+msgstr ""
+
+#: ../picard/const.py:299
+msgid "East Germany (historical, 1949-1990)"
+msgstr ""
+
+#: ../picard/const.py:300
+msgid "[Unknown Country]"
+msgstr ""
+
+#: ../picard/const.py:301
+msgid "[Worldwide]"
+msgstr ""
+
+#: ../picard/const.py:302
+msgid "Yugoslavia (historical, 1918-1992)"
+msgstr ""
+
+#: ../picard/const.py:307
+msgid "Catalan"
+msgstr ""
+
+#: ../picard/const.py:308
+msgid "Czech"
+msgstr ""
+
+#: ../picard/const.py:309
+msgid "Welsh"
+msgstr ""
+
+#: ../picard/const.py:310
+msgid "Danish"
+msgstr ""
+
+#: ../picard/const.py:311
+msgid "German"
+msgstr ""
+
+#: ../picard/const.py:312
+msgid "English"
+msgstr ""
+
+#: ../picard/const.py:313
+msgid "English (Canada)"
+msgstr ""
+
+#: ../picard/const.py:314
+msgid "English (UK)"
+msgstr ""
+
+#: ../picard/const.py:315
+msgid "Spanish"
+msgstr ""
+
+#: ../picard/const.py:316
+msgid "Persian"
+msgstr ""
+
+#: ../picard/const.py:317
+msgid "Finnish"
+msgstr ""
+
+#: ../picard/const.py:318
+msgid "French"
+msgstr ""
+
+#: ../picard/const.py:319
+msgid "Frisian"
+msgstr ""
+
+#: ../picard/const.py:320
+msgid "Hebrew"
+msgstr ""
+
+#: ../picard/const.py:321
+msgid "Hungarian"
+msgstr ""
+
+#: ../picard/const.py:322
+msgid "Islandic"
+msgstr ""
+
+#: ../picard/const.py:323
+msgid "Italian"
+msgstr ""
+
+#: ../picard/const.py:324
+msgid "Kannada"
+msgstr ""
+
+#: ../picard/const.py:325
+msgid "Korean"
+msgstr ""
+
+#: ../picard/const.py:326
+msgid "Lithuanian"
+msgstr ""
+
+#: ../picard/const.py:327
+msgid "Norwegian Bokmal"
+msgstr ""
+
+#: ../picard/const.py:328
+msgid "Dutch"
+msgstr ""
+
+#: ../picard/const.py:329
+msgid "Polish"
+msgstr ""
+
+#: ../picard/const.py:330
+msgid "Portuguese"
+msgstr ""
+
+#: ../picard/const.py:331
+msgid "Brazilian Portuguese"
+msgstr ""
+
+#: ../picard/const.py:332
+msgid "Romanian"
+msgstr ""
+
+#: ../picard/const.py:333
+msgid "Russian"
+msgstr ""
+
+#: ../picard/const.py:334
+msgid "Scots"
+msgstr ""
+
+#: ../picard/const.py:335
+msgid "Slovak"
+msgstr ""
+
+#: ../picard/const.py:336
+msgid "Slovenian"
+msgstr ""
+
+#: ../picard/const.py:337
+msgid "Swedish"
+msgstr ""
+
+#: ../picard/const.py:338
+msgid "Chinese"
+msgstr ""
+
+#: ../picard/file.py:475
+#, python-format
+msgid "No matching tracks for file %s"
+msgstr ""
+
+#: ../picard/file.py:492
+#, python-format
+msgid "No matching tracks above the threshold for file %s"
+msgstr ""
+
+#: ../picard/file.py:495
+#, python-format
+msgid "File %s identified!"
+msgstr ""
+
+#: ../picard/file.py:506
+#, python-format
+msgid "Looking up the PUID for file %s..."
+msgstr ""
+
+#: ../picard/file.py:511
+#, python-format
+msgid "Looking up the metadata for file %s..."
+msgstr ""
+
+#: ../picard/puidmanager.py:58
+msgid "Submitting PUIDs..."
+msgstr ""
+
+#: ../picard/puidmanager.py:64
+#, python-format
+msgid "PUIDs submission failed: %s"
+msgstr ""
+
+#: ../picard/puidmanager.py:66
+msgid "PUIDs successfully submitted!"
+msgstr ""
+
+#: ../picard/playlist.py:31
+msgid "M3U Playlist (*.m3u)"
+msgstr ""
+
+#: ../picard/playlist.py:32
+msgid "PLS Playlist (*.pls)"
+msgstr ""
+
+#: ../picard/playlist.py:33
+msgid "XSPF Playlist (*.xspf)"
+msgstr ""
+
+#: ../picard/tagger.py:476
 msgid "CD Lookup Error"
 msgstr ""
 
-#: ../picard/tagger.py:473
+#: ../picard/tagger.py:477
 #, python-format
 msgid ""
 "Error while reading CD:\n"
@@ -43,14 +1278,19 @@ msgid ""
 "%s"
 msgstr ""
 
-#: ../picard/ui/passworddialog.py:38
+#: ../picard/tagger.py:503
 #, python-format
-msgid ""
-"The server %s requires you to login. Please enter your username and password."
+msgid "Couldn't find PUID for file %s"
 msgstr ""
 
-#: ../picard/ui/ui_options_script.py:52
-msgid "Tagger Script"
+#: ../picard/musicdns/__init__.py:98
+#, python-format
+msgid "Looking up the fingerprint for file %s..."
+msgstr ""
+
+#: ../picard/musicdns/__init__.py:117
+#, python-format
+msgid "Creating fingerprint for file %s..."
 msgstr ""
 
 #: ../picard/ui/cdlookup.py:31
@@ -58,109 +1298,153 @@ msgid "Score"
 msgstr ""
 
 #: ../picard/ui/cdlookup.py:31
+#: ../picard/ui/itemviews.py:82
+#: ../picard/util/tags.py:23
 msgid "Title"
 msgstr "عنوان"
 
-#: ../picard/ui/cdlookup.py:31 ../picard/ui/mainwindow.py:436
+#: ../picard/ui/cdlookup.py:31
+#: ../picard/ui/itemviews.py:84
+#: ../picard/ui/mainwindow.py:436
+#: ../picard/util/tags.py:22
 msgid "Artist"
 msgstr "هنرمند"
 
-#: ../picard/ui/ui_metadata.py:121
-msgid "Lookup"
-msgstr "جستجو"
-
-#: ../picard/ui/ui_metadata.py:122
-msgid "Title:"
+#: ../picard/ui/coverartbox.py:47
+#: ../picard/ui/options/cover.py:29
+msgid "Cover Art"
 msgstr ""
 
-#: ../picard/ui/ui_metadata.py:123
-msgid "Date:"
+#: ../picard/ui/coverartbox.py:95
+msgid "Buy the album on Amazon"
 msgstr ""
 
-#: ../picard/ui/ui_metadata.py:124
-msgid "Artist:"
+#: ../picard/ui/filebrowser.py:38
+#: ../picard/ui/mainwindow.py:302
+msgid "&Refresh"
+msgstr "&بازآوری‌"
+
+#: ../picard/ui/filebrowser.py:41
+msgid "&Move Tagged Files Here"
 msgstr ""
 
-#: ../picard/ui/ui_metadata.py:125
-msgid "Track:"
+#: ../picard/ui/filebrowser.py:44
+msgid "Show &Hidden Files"
 msgstr ""
 
-#: ../picard/ui/ui_metadata.py:126
-msgid "0000-00-00; "
+#: ../picard/ui/itemviews.py:83
+msgid "Length"
+msgstr "طول‌"
+
+#: ../picard/ui/itemviews.py:327
+msgid "&Releases"
 msgstr ""
 
-#: ../picard/ui/ui_metadata.py:127 ../picard/ui/tageditor.py:225
-#: ../picard/ui/multitageditor.py:181
+#: ../picard/ui/itemviews.py:353
+msgid "&Plugins"
+msgstr "&افزونه‌ها"
+
+#: ../picard/ui/itemviews.py:523
+msgid "Clusters"
+msgstr ""
+
+#: ../picard/ui/logview.py:29
+msgid "Log"
+msgstr ""
+
+#: ../picard/ui/puidsubmit.py:31
+#: ../picard/ui/options/plugins.py:80
+msgid "File"
+msgstr ""
+
+#: ../picard/ui/puidsubmit.py:31
+msgid "PUID"
+msgstr ""
+
+#: ../picard/ui/puidsubmit.py:31
+#: ../picard/ui/mainwindow.py:437
+msgid "Track"
+msgstr "شیار"
+
+#: ../picard/ui/puidsubmit.py:31
+msgid "Release"
+msgstr ""
+
+#: ../picard/ui/puidsubmit.py:31
+msgid "Release ID"
+msgstr ""
+
+#: ../picard/ui/tageditor.py:65
+#: ../picard/ui/ui_options_plugins.py:62
+msgid "Details"
+msgstr ""
+
+#: ../picard/ui/tageditor.py:70
+#: ../picard/ui/tageditor.py:241
+#, python-format
+msgid "%d file"
+msgid_plural "%d files"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../picard/ui/tageditor.py:124
+#, python-format
+msgid "(different across %d file)"
+msgid_plural "(different across %d files)"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../picard/ui/tageditor.py:127
+#, python-format
+msgid "(missing from %d file)"
+msgid_plural "(missing from %d files)"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../picard/ui/tageditor.py:210
+msgid "Filename:"
+msgstr ""
+
+#: ../picard/ui/tageditor.py:212
+msgid "Format:"
+msgstr ""
+
+#: ../picard/ui/tageditor.py:221
+msgid "Size:"
+msgstr ""
+
+#: ../picard/ui/tageditor.py:225
+#: ../picard/ui/ui_metadata.py:127
 msgid "Length:"
 msgstr ""
 
-#: ../picard/ui/ui_metadata.py:128
-msgid "Album:"
+#: ../picard/ui/tageditor.py:227
+msgid "Bitrate:"
 msgstr ""
 
-#: ../picard/ui/ui_passworddialog.py:78
-msgid "Authentication required"
+#: ../picard/ui/tageditor.py:229
+msgid "Sample rate:"
 msgstr ""
 
-#: ../picard/ui/ui_passworddialog.py:79 ../picard/ui/ui_options_proxy.py:83
-#: ../picard/ui/ui_options_general.py:113
-msgid "Username:"
+#: ../picard/ui/tageditor.py:231
+msgid "Bits per sample:"
 msgstr ""
 
-#: ../picard/ui/ui_passworddialog.py:80 ../picard/ui/ui_options_proxy.py:82
-#: ../picard/ui/ui_options_general.py:112
-msgid "Password:"
+#: ../picard/ui/tageditor.py:234
+msgid "Mono"
 msgstr ""
 
-#: ../picard/ui/ui_passworddialog.py:81
-msgid "Save username and password"
+#: ../picard/ui/tageditor.py:235
+msgid "Stereo"
 msgstr ""
 
-#: ../picard/ui/ui_options_folksonomy.py:114
-#: ../picard/ui/ui_options_folksonomy_tags.py:114
-msgid "Folksonomy Tags"
+#: ../picard/ui/tageditor.py:237
+msgid "Channels:"
 msgstr ""
 
-#: ../picard/ui/ui_options_folksonomy.py:115
-#: ../picard/ui/ui_options_folksonomy_tags.py:115
-msgid "Ignore tags:"
-msgstr ""
-
-#: ../picard/ui/ui_options_folksonomy.py:116
-#: ../picard/ui/ui_options_folksonomy_tags.py:116
-msgid "Minimal tag usage:"
-msgstr ""
-
-#: ../picard/ui/ui_options_folksonomy.py:117
-#: ../picard/ui/ui_options_folksonomy_tags.py:117
-#: ../picard/ui/ui_options_matching.py:107
-#: ../picard/ui/ui_options_matching.py:108
-#: ../picard/ui/ui_options_matching.py:109
-#: ../picard/ui/ui_options_matching.py:113
-msgid " %"
-msgstr ""
-
-#: ../picard/ui/ui_options_folksonomy.py:118
-msgid "Maximum number of tags:"
-msgstr ""
-
-#: ../picard/ui/ui_options_folksonomy.py:119
-#: ../picard/ui/ui_options_folksonomy_tags.py:119
-msgid "Join multiple tags with:"
-msgstr ""
-
-#: ../picard/ui/ui_options_folksonomy.py:120
-#: ../picard/ui/ui_options_folksonomy_tags.py:120
-msgid " / "
-msgstr ""
-
-#: ../picard/ui/ui_options_folksonomy.py:121
-#: ../picard/ui/ui_options_folksonomy_tags.py:121
-msgid ", "
-msgstr ""
-
-#: ../picard/ui/ui_options_folksonomy_tags.py:118
-msgid "Maximal number of tags:"
+#: ../picard/ui/tagsfromfilenames.py:52
+#: ../picard/ui/tagsfromfilenames.py:96
+msgid "File Name"
 msgstr ""
 
 #: ../picard/ui/mainwindow.py:64
@@ -296,7 +1580,8 @@ msgstr "جستجو"
 msgid "&CD Lookup..."
 msgstr ""
 
-#: ../picard/ui/mainwindow.py:272 ../picard/ui/mainwindow.py:273
+#: ../picard/ui/mainwindow.py:272
+#: ../picard/ui/mainwindow.py:273
 msgid "Lookup CD"
 msgstr ""
 
@@ -327,7 +1612,8 @@ msgstr ""
 msgid "&Lookup"
 msgstr ""
 
-#: ../picard/ui/mainwindow.py:291 ../picard/ui/mainwindow.py:292
+#: ../picard/ui/mainwindow.py:291
+#: ../picard/ui/mainwindow.py:292
 msgid "Lookup metadata"
 msgstr ""
 
@@ -340,10 +1626,6 @@ msgstr ""
 msgid "&Details..."
 msgstr ""
 
-#: ../picard/ui/mainwindow.py:302 ../picard/ui/filebrowser.py:38
-msgid "&Refresh"
-msgstr "&بازآوری‌"
-
 #: ../picard/ui/mainwindow.py:305
 msgid "Generate &Playlist..."
 msgstr ""
@@ -389,6 +1671,7 @@ msgid "&Tools"
 msgstr "&ابزارها‌"
 
 #: ../picard/ui/mainwindow.py:384
+#: ../picard/ui/util.py:33
 msgid "&Help"
 msgstr "&کمک‌"
 
@@ -401,13 +1684,10 @@ msgid "&Search Bar"
 msgstr ""
 
 #: ../picard/ui/mainwindow.py:435
+#: ../picard/util/tags.py:21
 msgid "Album"
 msgstr "آلبوم"
 
-#: ../picard/ui/mainwindow.py:437 ../picard/ui/puidsubmit.py:31
-msgid "Track"
-msgstr "شیار"
-
 #: ../picard/ui/mainwindow.py:476
 msgid "All Supported Formats"
 msgstr ""
@@ -422,37 +1702,288 @@ msgstr ""
 msgid "Playlist %s saved"
 msgstr ""
 
-#: ../picard/ui/mainwindow.py:638 ../picard/ui/mainwindow.py:647
+#: ../picard/ui/mainwindow.py:638
+#: ../picard/ui/mainwindow.py:647
 #, python-format
 msgid " (Error: %s)"
 msgstr ""
 
+#: ../picard/ui/ui_tageditor.py:115
+#: ../picard/ui/ui_options_plugins.py:59
+#: ../picard/ui/options/plugins.py:76
+msgid "Name"
+msgstr ""
+
+#: ../picard/ui/ui_tageditor.py:116
+msgid "Value"
+msgstr ""
+
+#: ../picard/ui/ui_tageditor.py:117
+msgid "&Add..."
+msgstr ""
+
+#: ../picard/ui/ui_tageditor.py:118
+msgid "&Edit..."
+msgstr ""
+
+#: ../picard/ui/ui_tageditor.py:119
+msgid "&Delete"
+msgstr ""
+
+#: ../picard/ui/ui_tageditor.py:120
+msgid "&Metadata"
+msgstr ""
+
+#: ../picard/ui/ui_tageditor.py:121
+msgid "A&rtwork"
+msgstr ""
+
+#: ../picard/ui/ui_tageditor.py:122
+msgid "&Info"
+msgstr ""
+
+#: ../picard/ui/passworddialog.py:38
+#, python-format
+msgid "The server %s requires you to login. Please enter your username and password."
+msgstr ""
+
+#: ../picard/ui/ui_cdlookup.py:60
+#: ../picard/ui/ui_options_cdlookup.py:47
+#: ../picard/ui/ui_options_cdlookup_win32.py:56
+#: ../picard/ui/options/cdlookup.py:35
+msgid "CD Lookup"
+msgstr ""
+
+#: ../picard/ui/ui_cdlookup.py:61
+msgid "The following releases on MusicBrainz match the CD:"
+msgstr ""
+
+#: ../picard/ui/ui_cdlookup.py:62
+#: ../picard/ui/ui_puidsubmit.py:53
+msgid "OK"
+msgstr ""
+
+#: ../picard/ui/ui_cdlookup.py:63
+msgid "    Lookup manually    "
+msgstr ""
+
+#: ../picard/ui/ui_cdlookup.py:64
+#: ../picard/ui/ui_puidsubmit.py:54
+msgid "Cancel"
+msgstr ""
+
+#: ../picard/ui/ui_passworddialog.py:78
+msgid "Authentication required"
+msgstr ""
+
+#: ../picard/ui/ui_passworddialog.py:79
+#: ../picard/ui/ui_options_general.py:113
+#: ../picard/ui/ui_options_proxy.py:83
+msgid "Username:"
+msgstr ""
+
+#: ../picard/ui/ui_passworddialog.py:80
+#: ../picard/ui/ui_options_general.py:112
+#: ../picard/ui/ui_options_proxy.py:82
+msgid "Password:"
+msgstr ""
+
+#: ../picard/ui/ui_passworddialog.py:81
+msgid "Save username and password"
+msgstr ""
+
 #: ../picard/ui/ui_edittagdialog.py:44
 msgid "Edit Tag"
 msgstr ""
 
-#: ../picard/ui/ui_options_proxy.py:81
-msgid "Web Proxy"
+#: ../picard/ui/ui_metadata.py:121
+msgid "Lookup"
+msgstr "جستجو"
+
+#: ../picard/ui/ui_metadata.py:122
+msgid "Title:"
 msgstr ""
 
-#: ../picard/ui/ui_options_proxy.py:84 ../picard/ui/ui_options_general.py:109
-msgid "Port:"
+#: ../picard/ui/ui_metadata.py:123
+msgid "Date:"
 msgstr ""
 
-#: ../picard/ui/ui_options_proxy.py:85 ../picard/ui/ui_options_general.py:110
-msgid "Server address:"
+#: ../picard/ui/ui_metadata.py:124
+msgid "Artist:"
 msgstr ""
 
-#: ../picard/ui/ui_tagsfromfilenames.py:56
-msgid "Convert File Names to Tags"
+#: ../picard/ui/ui_metadata.py:125
+msgid "Track:"
 msgstr ""
 
-#: ../picard/ui/ui_tagsfromfilenames.py:57
-msgid "Replace underscores with spaces"
+#: ../picard/ui/ui_metadata.py:126
+msgid "0000-00-00; "
+msgstr ""
+
+#: ../picard/ui/ui_metadata.py:128
+msgid "Album:"
+msgstr ""
+
+#: ../picard/ui/ui_options.py:42
+msgid "Options"
+msgstr ""
+
+#: ../picard/ui/ui_options_cdlookup.py:48
+msgid "CD-ROM device to use for lookups:"
+msgstr ""
+
+#: ../picard/ui/ui_options_cdlookup_win32.py:57
+msgid "Default CD-ROM drive to use for lookups:"
+msgstr ""
+
+#: ../picard/ui/ui_options_cover.py:56
+msgid "Location"
+msgstr ""
+
+#: ../picard/ui/ui_options_cover.py:57
+msgid "Embed cover images into tags"
+msgstr ""
+
+#: ../picard/ui/ui_options_cover.py:58
+msgid "Save cover images as separate files"
+msgstr ""
+
+#: ../picard/ui/ui_options_cover.py:59
+msgid "Overwrite the file if it already exists"
+msgstr ""
+
+#: ../picard/ui/util.py:31
+msgid "&Ok"
+msgstr ""
+
+#: ../picard/ui/util.py:32
+msgid "&Cancel"
+msgstr ""
+
+#: ../picard/ui/ui_puidsubmit.py:52
+msgid "Submit PUIDs"
+msgstr ""
+
+#: ../picard/ui/ui_options_folksonomy.py:114
+#: ../picard/ui/options/folksonomy.py:29
+msgid "Folksonomy Tags"
+msgstr ""
+
+#: ../picard/ui/ui_options_folksonomy.py:115
+msgid "Ignore tags:"
+msgstr ""
+
+#: ../picard/ui/ui_options_folksonomy.py:116
+msgid "Minimal tag usage:"
+msgstr ""
+
+#: ../picard/ui/ui_options_folksonomy.py:117
+#: ../picard/ui/ui_options_matching.py:107
+#: ../picard/ui/ui_options_matching.py:108
+#: ../picard/ui/ui_options_matching.py:109
+#: ../picard/ui/ui_options_matching.py:113
+msgid " %"
+msgstr ""
+
+#: ../picard/ui/ui_options_folksonomy.py:118
+msgid "Maximum number of tags:"
+msgstr ""
+
+#: ../picard/ui/ui_options_folksonomy.py:119
+msgid "Join multiple tags with:"
+msgstr ""
+
+#: ../picard/ui/ui_options_folksonomy.py:120
+msgid " / "
+msgstr ""
+
+#: ../picard/ui/ui_options_folksonomy.py:121
+msgid ", "
+msgstr ""
+
+#: ../picard/ui/ui_options_interface.py:50
+msgid "Miscellaneous"
+msgstr ""
+
+#: ../picard/ui/ui_options_interface.py:51
+msgid "Show text labels under icons"
+msgstr ""
+
+#: ../picard/ui/ui_options_interface.py:52
+msgid "Allow selection of multiple directories"
+msgstr ""
+
+#: ../picard/ui/ui_options_interface.py:53
+msgid "Use advanced query syntax"
+msgstr ""
+
+#: ../picard/ui/ui_options_interface.py:54
+msgid "User interface language:"
+msgstr ""
+
+#: ../picard/ui/ui_options_naming.py:165
+msgid "Rename Files"
+msgstr ""
+
+#: ../picard/ui/ui_options_naming.py:166
+msgid "Replace Windows-incompatible characters"
+msgstr ""
+
+#: ../picard/ui/ui_options_naming.py:167
+msgid "Replace non-ASCII characters"
+msgstr ""
+
+#: ../picard/ui/ui_options_naming.py:168
+#: ../picard/ui/ui_options_naming.py:169
+#: ../picard/ui/ui_options_metadata.py:109
+#: ../picard/ui/ui_options_metadata.py:110
+msgid "Default"
+msgstr ""
+
+#: ../picard/ui/ui_options_naming.py:170
+#: ../picard/ui/options/naming.py:90
+msgid "Multiple artist file naming format:"
+msgstr ""
+
+#: ../picard/ui/ui_options_naming.py:171
+#: ../picard/ui/options/naming.py:86
+msgid "File naming format:"
+msgstr ""
+
+#: ../picard/ui/ui_options_naming.py:172
+msgid "Move Files"
+msgstr ""
+
+#: ../picard/ui/ui_options_naming.py:173
+msgid "Move tagged files to this directory:"
+msgstr ""
+
+#: ../picard/ui/ui_options_naming.py:174
+msgid "Browse..."
+msgstr ""
+
+#: ../picard/ui/ui_options_naming.py:175
+msgid "Move additional files:"
+msgstr ""
+
+#: ../picard/ui/ui_options_naming.py:176
+msgid "Delete empty directories"
+msgstr ""
+
+#: ../picard/ui/ui_options_naming.py:177
+msgid "Example"
+msgstr ""
+
+#: ../picard/ui/ui_options_naming.py:178
+msgid "File name:"
+msgstr ""
+
+#: ../picard/ui/ui_options_naming.py:179
+msgid "Multiple artist file name:"
 msgstr ""
 
-#: ../picard/ui/ui_tagsfromfilenames.py:58
 #: ../picard/ui/ui_options_naming.py:180
+#: ../picard/ui/ui_tagsfromfilenames.py:58
 msgid "&Preview"
 msgstr ""
 
@@ -460,11 +1991,22 @@ msgstr ""
 msgid "MusicBrainz Server"
 msgstr ""
 
+#: ../picard/ui/ui_options_general.py:109
+#: ../picard/ui/ui_options_proxy.py:84
+msgid "Port:"
+msgstr ""
+
+#: ../picard/ui/ui_options_general.py:110
+#: ../picard/ui/ui_options_proxy.py:85
+msgid "Server address:"
+msgstr ""
+
 #: ../picard/ui/ui_options_general.py:111
 msgid "Account Information"
 msgstr ""
 
 #: ../picard/ui/ui_options_general.py:114
+#: ../picard/ui/options/general.py:29
 msgid "General"
 msgstr ""
 
@@ -472,34 +2014,6 @@ msgstr ""
 msgid "Automatically scan all new files"
 msgstr ""
 
-#: ../picard/ui/ui_options_interface.py:46
-msgid "Miscellaneous"
-msgstr ""
-
-#: ../picard/ui/ui_options_interface.py:47
-msgid "Show text labels under icons"
-msgstr ""
-
-#: ../picard/ui/ui_options_interface.py:48
-msgid "Allow selection of multiple directories"
-msgstr ""
-
-#: ../picard/ui/ui_options_interface.py:49
-msgid "Use advanced query syntax"
-msgstr ""
-
-#: ../picard/ui/itemviews.py:327
-msgid "&Releases"
-msgstr ""
-
-#: ../picard/ui/itemviews.py:353
-msgid "&Plugins"
-msgstr "&افزونه‌ها"
-
-#: ../picard/ui/itemviews.py:523
-msgid "Clusters"
-msgstr ""
-
 #: ../picard/ui/ui_options_matching.py:105
 msgid "Thresholds"
 msgstr ""
@@ -520,6 +2034,67 @@ msgstr ""
 msgid "Minimal similarity for PUID lookups:"
 msgstr ""
 
+#: ../picard/ui/ui_options_metadata.py:100
+#: ../picard/ui/options/metadata.py:31
+msgid "Metadata"
+msgstr ""
+
+#: ../picard/ui/ui_options_metadata.py:101
+msgid "Translate foreign artist names to English where possible"
+msgstr ""
+
+#: ../picard/ui/ui_options_metadata.py:102
+msgid "Use release relationships"
+msgstr ""
+
+#: ../picard/ui/ui_options_metadata.py:103
+msgid "Use track relationships"
+msgstr ""
+
+#: ../picard/ui/ui_options_metadata.py:104
+msgid "Use folksonomy tags as genre"
+msgstr ""
+
+#: ../picard/ui/ui_options_metadata.py:105
+msgid "Preferred release country:"
+msgstr ""
+
+#: ../picard/ui/ui_options_metadata.py:106
+msgid "Custom Fields"
+msgstr ""
+
+#: ../picard/ui/ui_options_metadata.py:107
+msgid "Various artists:"
+msgstr ""
+
+#: ../picard/ui/ui_options_metadata.py:108
+msgid "Non-album tracks:"
+msgstr ""
+
+#: ../picard/ui/ui_options_plugins.py:58
+#: ../picard/ui/options/plugins.py:30
+msgid "Plugins"
+msgstr ""
+
+#: ../picard/ui/ui_options_plugins.py:60
+#: ../picard/ui/options/plugins.py:79
+msgid "Author"
+msgstr ""
+
+#: ../picard/ui/ui_options_plugins.py:61
+#: ../picard/util/tags.py:36
+msgid "Version"
+msgstr ""
+
+#: ../picard/ui/ui_options_proxy.py:81
+#: ../picard/ui/options/proxy.py:28
+msgid "Web Proxy"
+msgstr ""
+
+#: ../picard/ui/ui_options_script.py:52
+msgid "Tagger Script"
+msgstr ""
+
 #: ../picard/ui/ui_options_tags.py:105
 msgid "Common"
 msgstr ""
@@ -572,325 +2147,25 @@ msgstr ""
 msgid "Remove APEv2 tags from MP3 files"
 msgstr ""
 
-#: ../picard/ui/ui_options_cdlookup_win32.py:56 ../picard/ui/ui_cdlookup.py:60
-#: ../picard/ui/ui_options_cdlookup.py:47
-msgid "CD Lookup"
+#: ../picard/ui/ui_tagsfromfilenames.py:56
+msgid "Convert File Names to Tags"
 msgstr ""
 
-#: ../picard/ui/ui_options_cdlookup_win32.py:57
-msgid "Default CD-ROM drive to use for lookups:"
+#: ../picard/ui/ui_tagsfromfilenames.py:57
+msgid "Replace underscores with spaces"
 msgstr ""
 
-#: ../picard/ui/tageditor.py:65 ../picard/ui/ui_options_plugins.py:62
-#: ../picard/ui/multitageditor.py:37
-msgid "Details"
-msgstr ""
-
-#: ../picard/ui/tageditor.py:70 ../picard/ui/tageditor.py:241
-#: ../picard/ui/multitageditor.py:42 ../picard/ui/multitageditor.py:197
-#, python-format
-msgid "%d file"
-msgid_plural "%d files"
-msgstr[0] ""
-msgstr[1] ""
-
-#: ../picard/ui/tageditor.py:124 ../picard/ui/multitageditor.py:95
-#, python-format
-msgid "(different across %d file)"
-msgid_plural "(different across %d files)"
-msgstr[0] ""
-msgstr[1] ""
-
-#: ../picard/ui/tageditor.py:127 ../picard/ui/multitageditor.py:98
-#, python-format
-msgid "(missing from %d file)"
-msgid_plural "(missing from %d files)"
-msgstr[0] ""
-msgstr[1] ""
-
-#: ../picard/ui/tageditor.py:210 ../picard/ui/multitageditor.py:166
-msgid "Filename:"
-msgstr ""
-
-#: ../picard/ui/tageditor.py:212 ../picard/ui/multitageditor.py:168
-msgid "Format:"
-msgstr ""
-
-#: ../picard/ui/tageditor.py:221 ../picard/ui/multitageditor.py:177
-msgid "Size:"
-msgstr ""
-
-#: ../picard/ui/tageditor.py:227 ../picard/ui/multitageditor.py:183
-msgid "Bitrate:"
-msgstr ""
-
-#: ../picard/ui/tageditor.py:229 ../picard/ui/multitageditor.py:185
-msgid "Sample rate:"
-msgstr ""
-
-#: ../picard/ui/tageditor.py:231 ../picard/ui/multitageditor.py:187
-msgid "Bits per sample:"
-msgstr ""
-
-#: ../picard/ui/tageditor.py:234 ../picard/ui/multitageditor.py:190
-msgid "Mono"
-msgstr ""
-
-#: ../picard/ui/tageditor.py:235 ../picard/ui/multitageditor.py:191
-msgid "Stereo"
-msgstr ""
-
-#: ../picard/ui/tageditor.py:237 ../picard/ui/multitageditor.py:193
-msgid "Channels:"
-msgstr ""
-
-#: ../picard/ui/ui_tageditor.py:115 ../picard/ui/ui_multitageditor.py:55
-#: ../picard/ui/ui_options_plugins.py:59 ../picard/ui/options/plugins.py:76
-msgid "Name"
-msgstr ""
-
-#: ../picard/ui/ui_tageditor.py:116 ../picard/ui/ui_multitageditor.py:56
-msgid "Value"
-msgstr ""
-
-#: ../picard/ui/ui_tageditor.py:117 ../picard/ui/ui_multitageditor.py:57
-msgid "&Add..."
-msgstr ""
-
-#: ../picard/ui/ui_tageditor.py:118
-msgid "&Edit..."
-msgstr ""
-
-#: ../picard/ui/ui_tageditor.py:119
-msgid "&Delete"
-msgstr ""
-
-#: ../picard/ui/ui_tageditor.py:120
-msgid "&Metadata"
-msgstr ""
-
-#: ../picard/ui/ui_tageditor.py:121
-msgid "A&rtwork"
-msgstr ""
-
-#: ../picard/ui/ui_tageditor.py:122
-msgid "&Info"
-msgstr ""
-
-#: ../picard/ui/coverartbox.py:47
-msgid "Cover Art"
-msgstr ""
-
-#: ../picard/ui/coverartbox.py:95
-msgid "Buy the album on Amazon"
-msgstr ""
-
-#: ../picard/ui/ui_puidsubmit.py:52
-msgid "Submit PUIDs"
-msgstr ""
-
-#: ../picard/ui/ui_puidsubmit.py:53 ../picard/ui/ui_cdlookup.py:62
-msgid "OK"
-msgstr ""
-
-#: ../picard/ui/ui_puidsubmit.py:54 ../picard/ui/ui_cdlookup.py:64
-msgid "Cancel"
-msgstr ""
-
-#: ../picard/ui/puidsubmit.py:31 ../picard/ui/options/plugins.py:80
-msgid "File"
-msgstr ""
-
-#: ../picard/ui/puidsubmit.py:31
-msgid "PUID"
-msgstr ""
-
-#: ../picard/ui/puidsubmit.py:31
-msgid "Release"
-msgstr ""
-
-#: ../picard/ui/puidsubmit.py:31
-msgid "Release ID"
-msgstr ""
-
-#: ../picard/ui/filebrowser.py:41
-msgid "&Move Tagged Files Here"
-msgstr ""
-
-#: ../picard/ui/filebrowser.py:44
-msgid "Show &Hidden Files"
-msgstr ""
-
-#: ../picard/ui/ui_cdlookup.py:61
-msgid "The following releases on MusicBrainz match the CD:"
-msgstr ""
-
-#: ../picard/ui/ui_cdlookup.py:63
-msgid "    Lookup manually    "
-msgstr ""
-
-#: ../picard/ui/ui_options.py:42
-msgid "Options"
-msgstr ""
-
-#: ../picard/ui/tagsfromfilenames.py:52 ../picard/ui/tagsfromfilenames.py:96
-msgid "File Name"
-msgstr ""
-
-#: ../picard/ui/ui_options_cover.py:56
-msgid "Location"
-msgstr ""
-
-#: ../picard/ui/ui_options_cover.py:57
-msgid "Embed cover images into tags"
-msgstr ""
-
-#: ../picard/ui/ui_options_cover.py:58
-msgid "Save cover images as separate files"
-msgstr ""
-
-#: ../picard/ui/ui_options_cover.py:59
-msgid "Overwrite the file if it already exists"
-msgstr ""
-
-#: ../picard/ui/ui_options_metadata.py:100
-msgid "Metadata"
-msgstr ""
-
-#: ../picard/ui/ui_options_metadata.py:101
-msgid "Translate foreign artist names to English where possible"
-msgstr ""
-
-#: ../picard/ui/ui_options_metadata.py:102
-msgid "Use release relationships"
-msgstr ""
-
-#: ../picard/ui/ui_options_metadata.py:103
-msgid "Use track relationships"
-msgstr ""
-
-#: ../picard/ui/ui_options_metadata.py:104
-msgid "Use folksonomy tags as genre"
-msgstr ""
-
-#: ../picard/ui/ui_options_metadata.py:105
-msgid "Preferred release country:"
-msgstr ""
-
-#: ../picard/ui/ui_options_metadata.py:106
-msgid "Custom Fields"
-msgstr ""
-
-#: ../picard/ui/ui_options_metadata.py:107
-msgid "Various artists:"
-msgstr ""
-
-#: ../picard/ui/ui_options_metadata.py:108
-msgid "Non-album tracks:"
-msgstr ""
-
-#: ../picard/ui/ui_options_metadata.py:109
-#: ../picard/ui/ui_options_metadata.py:110
-#: ../picard/ui/ui_options_naming.py:168 ../picard/ui/ui_options_naming.py:169
-msgid "Default"
-msgstr ""
-
-#: ../picard/ui/ui_multitageditor.py:58
-msgid "Delete"
-msgstr ""
-
-#: ../picard/ui/logview.py:29
-msgid "Log"
-msgstr ""
-
-#: ../picard/ui/ui_options_plugins.py:58
-msgid "Plugins"
-msgstr ""
-
-#: ../picard/ui/ui_options_plugins.py:60 ../picard/ui/options/plugins.py:79
-msgid "Author"
-msgstr ""
-
-#: ../picard/ui/ui_options_plugins.py:61
-msgid "Version"
-msgstr ""
-
-#: ../picard/ui/ui_options_naming.py:165
-msgid "Rename Files"
-msgstr ""
-
-#: ../picard/ui/ui_options_naming.py:166
-msgid "Replace Windows-incompatible characters"
-msgstr ""
-
-#: ../picard/ui/ui_options_naming.py:167
-msgid "Replace non-ASCII characters"
-msgstr ""
-
-#: ../picard/ui/ui_options_naming.py:170 ../picard/ui/options/naming.py:90
-msgid "Multiple artist file naming format:"
-msgstr ""
-
-#: ../picard/ui/ui_options_naming.py:171 ../picard/ui/options/naming.py:86
-msgid "File naming format:"
-msgstr ""
-
-#: ../picard/ui/ui_options_naming.py:172
-msgid "Move Files"
-msgstr ""
-
-#: ../picard/ui/ui_options_naming.py:173
-msgid "Move tagged files to this directory:"
-msgstr ""
-
-#: ../picard/ui/ui_options_naming.py:174
-msgid "Browse..."
-msgstr ""
-
-#: ../picard/ui/ui_options_naming.py:175
-msgid "Move additional files:"
-msgstr ""
-
-#: ../picard/ui/ui_options_naming.py:176
-msgid "Delete empty directories"
-msgstr ""
-
-#: ../picard/ui/ui_options_naming.py:177
-msgid "Example"
-msgstr ""
-
-#: ../picard/ui/ui_options_naming.py:178
-msgid "File name:"
-msgstr ""
-
-#: ../picard/ui/ui_options_naming.py:179
-msgid "Multiple artist file name:"
-msgstr ""
-
-#: ../picard/ui/ui_options_cdlookup.py:48
-msgid "CD-ROM device to use for lookups:"
-msgstr ""
-
-#: ../picard/ui/options/scripting.py:84 ../picard/ui/options/naming.py:86
-#: ../picard/ui/options/naming.py:90 ../picard/ui/options/naming.py:93
-#: ../picard/ui/options/naming.py:95
-msgid "Script Error"
-msgstr ""
+#: ../picard/ui/options/about.py:29
+#, fuzzy
+msgid "About"
+msgstr "&درباره..."
 
 #. Replace this with your name to have it appear in the "About" dialog.
 #: ../picard/ui/options/about.py:48
 msgid "translator-credits"
 msgstr ""
 "Launchpad Contributions:\n"
-"  Artin https://launchpad.net/~artin\n"
-"\n"
-"Launchpad Contributions:\n"
-"  Artin https://launchpad.net/~artin\n"
-"  Lukáš Lalinský https://launchpad.net/~luks\n"
-"\n"
-"Launchpad Contributions:\n"
-"  Artin https://launchpad.net/~artin\n"
-"  Lukáš Lalinský https://launchpad.net/~luks"
+"  Artin https://launchpad.net/~artin"
 
 #. Replace LANG with language you are translatig to.
 #: ../picard/ui/options/about.py:51
@@ -901,22 +2176,55 @@ msgstr ""
 #: ../picard/ui/options/about.py:55
 #, python-format
 msgid ""
-"<p align=\"center\"><span style=\"font-size:15px;font-weight:bold;"
-"\">MusicBrainz Picard</span><br/>\n"
+"<p align=\"center\"><span style=\"font-size:15px;font-weight:bold;\">MusicBrainz Picard</span><br/>\n"
 "Version %(version)s</p>\n"
 "<p align=\"center\"><strong>Supported formats</strong><br/>%(formats)s</p>\n"
 "<p align=\"center\"><strong>Please donate</strong><br/>\n"
-"Thank you for using Picard. Picard relies on the MusicBrainz database, which "
-"is operated by the MetaBrainz Foundation with the help of thousands of "
-"volunteers. If you like this application please consider donating to the "
-"MetaBrainz Foundation to keep the service running.</p>\n"
-"<p align=\"center\"><a href=\"http://metabrainz.org/donate/index.html"
-"\">Donate now!</a></p>\n"
+"Thank you for using Picard. Picard relies on the MusicBrainz database, which is operated by the MetaBrainz Foundation with the help of thousands of volunteers. If you like this application please consider donating to the MetaBrainz Foundation to keep the service running.</p>\n"
+"<p align=\"center\"><a href=\"http://metabrainz.org/donate/index.html\">Donate now!</a></p>\n"
 "<p align=\"center\"><strong>Credits</strong><br/>\n"
-"<small>Copyright © 2004-2008 Robert Kaye, Lukáš Lalinský and others%"
-"(translator-credits)s</small></p>\n"
-"<p align=\"center\"><a href=\"http://musicbrainz.org/doc/PicardTagger"
-"\">http://musicbrainz.org/doc/PicardTagger</a></p>\n"
+"<small>Copyright © 2004-2008 Robert Kaye, Lukáš Lalinský and others%(translator-credits)s</small></p>\n"
+"<p align=\"center\"><a href=\"http://musicbrainz.org/doc/PicardTagger\">http://musicbrainz.org/doc/PicardTagger</a></p>\n"
+msgstr ""
+
+#: ../picard/ui/options/advanced.py:26
+msgid "Advanced"
+msgstr ""
+
+#: ../picard/ui/options/interface.py:31
+msgid "User Interface"
+msgstr ""
+
+#: ../picard/ui/options/interface.py:47
+msgid "System default"
+msgstr ""
+
+#: ../picard/ui/options/interface.py:71
+msgid "Language changed"
+msgstr ""
+
+#: ../picard/ui/options/interface.py:71
+msgid "You have changed the interface language. You have to restart Picard in order for the change to take effect."
+msgstr ""
+
+#: ../picard/ui/options/matching.py:29
+msgid "Matching"
+msgstr ""
+
+#: ../picard/ui/options/metadata.py:52
+msgid "None"
+msgstr ""
+
+#: ../picard/ui/options/naming.py:33
+msgid "File Naming"
+msgstr ""
+
+#: ../picard/ui/options/naming.py:86
+#: ../picard/ui/options/naming.py:90
+#: ../picard/ui/options/naming.py:93
+#: ../picard/ui/options/naming.py:95
+#: ../picard/ui/options/scripting.py:84
+msgid "Script Error"
 msgstr ""
 
 #: ../picard/ui/options/naming.py:93
@@ -935,6 +2243,233 @@ msgstr ""
 msgid "The location to move files to must not be empty."
 msgstr ""
 
+#: ../picard/ui/options/scripting.py:63
+msgid "Scripting"
+msgstr ""
+
+#: ../picard/ui/options/tags.py:29
+msgid "Tags"
+msgstr ""
+
+#: ../picard/util/tags.py:24
+#, fuzzy
+msgid "Date"
+msgstr "&چسباندن‌"
+
+#: ../picard/util/tags.py:25
+#, fuzzy
+msgid "Album Artist"
+msgstr "هنرمند"
+
+#: ../picard/util/tags.py:26
+msgid "Track Number"
+msgstr ""
+
+#: ../picard/util/tags.py:27
+msgid "Total Tracks"
+msgstr ""
+
+#: ../picard/util/tags.py:28
+msgid "Disc Number"
+msgstr ""
+
+#: ../picard/util/tags.py:29
+msgid "Total Discs"
+msgstr ""
+
+#: ../picard/util/tags.py:30
+msgid "Album Artist Sort Order"
+msgstr ""
+
+#: ../picard/util/tags.py:31
+msgid "Artist Sort Order"
+msgstr ""
+
+#: ../picard/util/tags.py:32
+msgid "Title Sort Order"
+msgstr ""
+
+#: ../picard/util/tags.py:33
+msgid "Album Sort Order"
+msgstr ""
+
+#: ../picard/util/tags.py:34
+msgid "ASIN"
+msgstr ""
+
+#: ../picard/util/tags.py:35
+msgid "Grouping"
+msgstr ""
+
+#: ../picard/util/tags.py:37
+msgid "ISRC"
+msgstr ""
+
+#: ../picard/util/tags.py:38
+msgid "Mood"
+msgstr ""
+
+#: ../picard/util/tags.py:39
+msgid "BPM"
+msgstr ""
+
+#: ../picard/util/tags.py:40
+msgid "Copyright"
+msgstr ""
+
+#: ../picard/util/tags.py:41
+msgid "Composer"
+msgstr ""
+
+#: ../picard/util/tags.py:42
+msgid "Conductor"
+msgstr ""
+
+#: ../picard/util/tags.py:43
+msgid "Lyricist"
+msgstr ""
+
+#: ../picard/util/tags.py:44
+msgid "Arranger"
+msgstr ""
+
+#: ../picard/util/tags.py:45
+msgid "Producer"
+msgstr ""
+
+#: ../picard/util/tags.py:46
+msgid "Engineer"
+msgstr ""
+
+#: ../picard/util/tags.py:47
+#, fuzzy
+msgid "Subtitle"
+msgstr "عنوان"
+
+#: ../picard/util/tags.py:48
+msgid "Disc Subtitle"
+msgstr ""
+
+#: ../picard/util/tags.py:49
+msgid "Remixer"
+msgstr ""
+
+#: ../picard/util/tags.py:50
+msgid "MusicBrainz Track Id"
+msgstr ""
+
+#: ../picard/util/tags.py:51
+msgid "MusicBrainz Release Id"
+msgstr ""
+
+#: ../picard/util/tags.py:52
+msgid "MusicBrainz Artist Id"
+msgstr ""
+
+#: ../picard/util/tags.py:53
+msgid "MusicBrainz Release Artist Id"
+msgstr ""
+
+#: ../picard/util/tags.py:54
+msgid "MusicBrainz TRM Id"
+msgstr ""
+
+#: ../picard/util/tags.py:55
+msgid "MusicBrainz Disc Id"
+msgstr ""
+
+#: ../picard/util/tags.py:56
+msgid "MusicBrainz Sort Name"
+msgstr ""
+
+#: ../picard/util/tags.py:57
+msgid "MusicIP PUID"
+msgstr ""
+
+#: ../picard/util/tags.py:58
+msgid "MusicIP Fingerprint"
+msgstr ""
+
+#: ../picard/util/tags.py:59
+msgid "Disc Id"
+msgstr ""
+
+#: ../picard/util/tags.py:60
+msgid "Website"
+msgstr ""
+
+#: ../picard/util/tags.py:61
+msgid "Compilation"
+msgstr ""
+
+#: ../picard/util/tags.py:62
+msgid "Comment"
+msgstr ""
+
+#: ../picard/util/tags.py:63
+msgid "Genre"
+msgstr ""
+
+#: ../picard/util/tags.py:64
+msgid "Encoded By"
+msgstr ""
+
+#: ../picard/util/tags.py:65
+msgid "Performer"
+msgstr ""
+
+#: ../picard/util/tags.py:66
+msgid "Release Type"
+msgstr ""
+
+#: ../picard/util/tags.py:67
+msgid "Release Status"
+msgstr ""
+
+#: ../picard/util/tags.py:68
+msgid "Release Country"
+msgstr ""
+
+#: ../picard/util/tags.py:69
+msgid "Record Label"
+msgstr ""
+
+#: ../picard/util/tags.py:70
+msgid "Barcode"
+msgstr ""
+
+#: ../picard/util/tags.py:71
+msgid "Catalog Number"
+msgstr ""
+
+#: ../picard/util/tags.py:72
+msgid "Format"
+msgstr ""
+
+#: ../picard/util/tags.py:73
+msgid "DJ-Mixer"
+msgstr ""
+
+#: ../picard/util/tags.py:74
+msgid "Media"
+msgstr ""
+
+#: ../picard/util/tags.py:75
+msgid "Lyrics"
+msgstr ""
+
+#: ../picard/util/tags.py:76
+msgid "Mixer"
+msgstr ""
+
+#: ../picard/util/tags.py:77
+msgid "Language"
+msgstr ""
+
+#: ../picard/util/tags.py:78
+msgid "Script"
+msgstr ""
+
 #: ../picard/util/webbrowser2.py:84
 msgid "Web Browser Error"
 msgstr ""
@@ -947,5 +2482,3 @@ msgid ""
 "%s"
 msgstr ""
 
-#~ msgid "Length"
-#~ msgstr "طول‌"
diff --git a/po/fi.po b/po/fi.po
index 6563ad9df..73eaaefdb 100644
--- a/po/fi.po
+++ b/po/fi.po
@@ -6,166 +6,1499 @@ msgid ""
 msgstr ""
 "Project-Id-Version: picard\n"
 "Report-Msgid-Bugs-To: http://bugs.musicbrainz.org/\n"
-"POT-Creation-Date: 2008-12-01 18:20+0100\n"
-"PO-Revision-Date: 2008-09-03 16:08+0000\n"
-"Last-Translator: Juhana Uuttu <Unknown>\n"
+"POT-Creation-Date: 2009-01-25 12:23+0100\n"
+"PO-Revision-Date: 2009-01-25 13:14+0100\n"
+"Last-Translator: Philipp Wolfer <phw@rubyforge.org>\n"
 "Language-Team: Finnish <fi@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2008-12-01 17:02+0000\n"
+"X-Launchpad-Export-Date: 2009-01-24 23:28+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 "Generated-By: pygettext.py 1.5\n"
 
-#: ../picard/album.py:108 ../picard/cluster.py:248
+#: ../picard/album.py:108
+#: ../picard/cluster.py:248
 msgid "Unmatched Files"
-msgstr "Ryhmittämättömät tiedostot"
+msgstr "Ryhmättömät tiedostot"
 
-#: ../picard/album.py:269
+#: ../picard/album.py:281
 #, python-format
 msgid "[couldn't load album %s]"
-msgstr "[albumin %s lataaminen epäonnistui]"
+msgstr "[julkaisun %s lataaminen epäonnistui]"
 
-#: ../picard/album.py:305
+#: ../picard/album.py:317
 msgid "[loading album information]"
-msgstr "[lataa albumin tietoja]"
+msgstr "[lataa julkaisun tietoja]"
 
-#: ../picard/tagger.py:472
+#: ../picard/cluster.py:164
+#: ../picard/cluster.py:175
+#, python-format
+msgid "No matching releases for cluster %s"
+msgstr "Ryhmälle %s ei löydy levyjulkaisua"
+
+#: ../picard/cluster.py:177
+#, python-format
+msgid "Cluster %s identified!"
+msgstr "Ryhmä %s tunnistettu!"
+
+#: ../picard/cluster.py:182
+#, python-format
+msgid "Looking up the metadata for cluster %s..."
+msgstr "Etsii metatietoa ryhmälle %s..."
+
+#: ../picard/const.py:40
+msgid "CD"
+msgstr ""
+
+#: ../picard/const.py:41
+msgid "DVD"
+msgstr ""
+
+#: ../picard/const.py:42
+msgid "SACD"
+msgstr ""
+
+#: ../picard/const.py:43
+msgid "LaserDisc"
+msgstr ""
+
+#: ../picard/const.py:44
+msgid "MiniDisc"
+msgstr ""
+
+#: ../picard/const.py:45
+msgid "Vinyl"
+msgstr ""
+
+#: ../picard/const.py:46
+msgid "Cassette"
+msgstr ""
+
+#: ../picard/const.py:47
+msgid "Cartridge (4/8-tracks)"
+msgstr ""
+
+#: ../picard/const.py:48
+msgid "Reel-to-Reel"
+msgstr ""
+
+#: ../picard/const.py:49
+msgid "DAT"
+msgstr ""
+
+#: ../picard/const.py:50
+#, fuzzy
+msgid "Digital Media"
+msgstr "Alkuperäinen metadata"
+
+#: ../picard/const.py:51
+msgid "Wax Cylinder"
+msgstr ""
+
+#: ../picard/const.py:52
+msgid "Piano Roll"
+msgstr ""
+
+#: ../picard/const.py:53
+#, fuzzy
+msgid "Other"
+msgstr "Myöhemmin"
+
+#: ../picard/const.py:58
+msgid "Bangladesh"
+msgstr ""
+
+#: ../picard/const.py:59
+msgid "Belgium"
+msgstr ""
+
+#: ../picard/const.py:60
+msgid "Burkina Faso"
+msgstr ""
+
+#: ../picard/const.py:61
+#, fuzzy
+msgid "Bulgaria"
+msgstr "Unkari"
+
+#: ../picard/const.py:62
+msgid "Barbados"
+msgstr ""
+
+#: ../picard/const.py:63
+msgid "Wallis and Futuna Islands"
+msgstr ""
+
+#: ../picard/const.py:64
+#, fuzzy
+msgid "Bermuda"
+msgstr "Saksa"
+
+#: ../picard/const.py:65
+msgid "Brunei Darussalam"
+msgstr ""
+
+#: ../picard/const.py:66
+msgid "Bolivia"
+msgstr ""
+
+#: ../picard/const.py:67
+msgid "Bahrain"
+msgstr ""
+
+#: ../picard/const.py:68
+msgid "Burundi"
+msgstr ""
+
+#: ../picard/const.py:69
+msgid "Benin"
+msgstr ""
+
+#: ../picard/const.py:70
+msgid "Bhutan"
+msgstr ""
+
+#: ../picard/const.py:71
+msgid "Jamaica"
+msgstr ""
+
+#: ../picard/const.py:72
+msgid "Bouvet Island"
+msgstr ""
+
+#: ../picard/const.py:73
+msgid "Botswana"
+msgstr ""
+
+#: ../picard/const.py:74
+msgid "Samoa"
+msgstr ""
+
+#: ../picard/const.py:75
+msgid "Brazil"
+msgstr ""
+
+#: ../picard/const.py:76
+msgid "Bahamas"
+msgstr ""
+
+#: ../picard/const.py:77
+msgid "Belarus"
+msgstr ""
+
+#: ../picard/const.py:78
+msgid "Belize"
+msgstr ""
+
+#: ../picard/const.py:79
+msgid "Russian Federation"
+msgstr ""
+
+#: ../picard/const.py:80
+msgid "Rwanda"
+msgstr ""
+
+#: ../picard/const.py:81
+msgid "Reunion"
+msgstr ""
+
+#: ../picard/const.py:82
+msgid "Turkmenistan"
+msgstr ""
+
+#: ../picard/const.py:83
+msgid "Tajikistan"
+msgstr ""
+
+#: ../picard/const.py:84
+#, fuzzy
+msgid "Romania"
+msgstr "Romania"
+
+#: ../picard/const.py:85
+msgid "Tokela"
+msgstr ""
+
+#: ../picard/const.py:86
+msgid "Guinea-Bissa"
+msgstr ""
+
+#: ../picard/const.py:87
+msgid "Guam"
+msgstr ""
+
+#: ../picard/const.py:88
+msgid "Guatemala"
+msgstr ""
+
+#: ../picard/const.py:89
+msgid "Greece"
+msgstr ""
+
+#: ../picard/const.py:90
+msgid "Equatorial Guinea"
+msgstr ""
+
+#: ../picard/const.py:91
+msgid "Guadeloupe"
+msgstr ""
+
+#: ../picard/const.py:92
+msgid "Japan"
+msgstr ""
+
+#: ../picard/const.py:93
+msgid "Guyana"
+msgstr ""
+
+#: ../picard/const.py:94
+#, fuzzy
+msgid "French Guiana"
+msgstr "Ranska"
+
+#: ../picard/const.py:95
+#, fuzzy
+msgid "Georgia"
+msgstr "Saksa"
+
+#: ../picard/const.py:96
+msgid "Grenada"
+msgstr ""
+
+#: ../picard/const.py:97
+msgid "United Kingdom"
+msgstr ""
+
+#: ../picard/const.py:98
+msgid "Gabon"
+msgstr ""
+
+#: ../picard/const.py:99
+msgid "El Salvador"
+msgstr ""
+
+#: ../picard/const.py:100
+#, fuzzy
+msgid "Guinea"
+msgstr "Yleiset"
+
+#: ../picard/const.py:101
+msgid "Gambia"
+msgstr ""
+
+#: ../picard/const.py:102
+msgid "Greenland"
+msgstr ""
+
+#: ../picard/const.py:103
+msgid "Gibraltar"
+msgstr ""
+
+#: ../picard/const.py:104
+msgid "Ghana"
+msgstr ""
+
+#: ../picard/const.py:105
+#, fuzzy
+msgid "Oman"
+msgstr "Saksa"
+
+#: ../picard/const.py:106
+msgid "Tunisia"
+msgstr ""
+
+#: ../picard/const.py:107
+#, fuzzy
+msgid "Jordan"
+msgstr "Korea"
+
+#: ../picard/const.py:108
+msgid "Haiti"
+msgstr ""
+
+#: ../picard/const.py:109
+#, fuzzy
+msgid "Hungary"
+msgstr "Unkari"
+
+#: ../picard/const.py:110
+msgid "Hong Kong"
+msgstr ""
+
+#: ../picard/const.py:111
+msgid "Honduras"
+msgstr ""
+
+#: ../picard/const.py:112
+msgid "Heard and Mc Donald Islands"
+msgstr ""
+
+#: ../picard/const.py:113
+msgid "Venezuela"
+msgstr ""
+
+#: ../picard/const.py:114
+msgid "Puerto Rico"
+msgstr ""
+
+#: ../picard/const.py:115
+msgid "Pala"
+msgstr ""
+
+#: ../picard/const.py:116
+#, fuzzy
+msgid "Portugal"
+msgstr "Portugali"
+
+#: ../picard/const.py:117
+msgid "Svalbard and Jan Mayen Islands"
+msgstr ""
+
+#: ../picard/const.py:118
+msgid "Paraguay"
+msgstr ""
+
+#: ../picard/const.py:119
+msgid "Iraq"
+msgstr ""
+
+#: ../picard/const.py:120
+msgid "Panama"
+msgstr ""
+
+#: ../picard/const.py:121
+msgid "French Polynesia"
+msgstr ""
+
+#: ../picard/const.py:122
+msgid "Papua New Guinea"
+msgstr ""
+
+#: ../picard/const.py:123
+msgid "Per"
+msgstr ""
+
+#: ../picard/const.py:124
+msgid "Pakistan"
+msgstr ""
+
+#: ../picard/const.py:125
+msgid "Philippines"
+msgstr ""
+
+#: ../picard/const.py:126
+msgid "Pitcairn"
+msgstr ""
+
+#: ../picard/const.py:127
+msgid "Poland"
+msgstr ""
+
+#: ../picard/const.py:128
+msgid "St. Pierre and Miquelon"
+msgstr ""
+
+#: ../picard/const.py:129
+msgid "Zambia"
+msgstr ""
+
+#: ../picard/const.py:130
+msgid "Western Sahara"
+msgstr ""
+
+#: ../picard/const.py:131
+msgid "Estonia"
+msgstr ""
+
+#: ../picard/const.py:132
+msgid "Egypt"
+msgstr ""
+
+#: ../picard/const.py:133
+msgid "South Africa"
+msgstr ""
+
+#: ../picard/const.py:134
+msgid "Ecuador"
+msgstr ""
+
+#: ../picard/const.py:135
+#, fuzzy
+msgid "Italy"
+msgstr "Italia"
+
+#: ../picard/const.py:136
+#, fuzzy
+msgid "Viet Nam"
+msgstr "Tiedostonimi"
+
+#: ../picard/const.py:137
+msgid "Solomon Islands"
+msgstr ""
+
+#: ../picard/const.py:138
+msgid "Ethiopia"
+msgstr ""
+
+#: ../picard/const.py:139
+#, fuzzy
+msgid "Somalia"
+msgstr "Romania"
+
+#: ../picard/const.py:140
+msgid "Zimbabwe"
+msgstr ""
+
+#: ../picard/const.py:141
+msgid "Saudi Arabia"
+msgstr ""
+
+#: ../picard/const.py:142
+#, fuzzy
+msgid "Spain"
+msgstr "Espanja"
+
+#: ../picard/const.py:143
+msgid "Eritrea"
+msgstr ""
+
+#: ../picard/const.py:144
+msgid "Moldova, Republic of"
+msgstr ""
+
+#: ../picard/const.py:145
+msgid "Madagascar"
+msgstr ""
+
+#: ../picard/const.py:146
+msgid "Morocco"
+msgstr ""
+
+#: ../picard/const.py:147
+#, fuzzy
+msgid "Monaco"
+msgstr "Mono"
+
+#: ../picard/const.py:148
+msgid "Uzbekistan"
+msgstr ""
+
+#: ../picard/const.py:149
+msgid "Myanmar"
+msgstr ""
+
+#: ../picard/const.py:150
+msgid "Mali"
+msgstr ""
+
+#: ../picard/const.py:151
+msgid "Maca"
+msgstr ""
+
+#: ../picard/const.py:152
+#, fuzzy
+msgid "Mongolia"
+msgstr "Mono"
+
+#: ../picard/const.py:153
+msgid "Marshall Islands"
+msgstr ""
+
+#: ../picard/const.py:154
+msgid "Macedonia, The Former Yugoslav Republic of"
+msgstr ""
+
+#: ../picard/const.py:155
+msgid "Mauritius"
+msgstr ""
+
+#: ../picard/const.py:156
+#, fuzzy
+msgid "Malta"
+msgstr "Metadata"
+
+#: ../picard/const.py:157
+msgid "Malawi"
+msgstr ""
+
+#: ../picard/const.py:158
+msgid "Maldives"
+msgstr ""
+
+#: ../picard/const.py:159
+msgid "Martinique"
+msgstr ""
+
+#: ../picard/const.py:160
+msgid "Northern Mariana Islands"
+msgstr ""
+
+#: ../picard/const.py:161
+msgid "Montserrat"
+msgstr ""
+
+#: ../picard/const.py:162
+#, fuzzy
+msgid "Mauritania"
+msgstr "Liettua"
+
+#: ../picard/const.py:163
+msgid "Uganda"
+msgstr ""
+
+#: ../picard/const.py:164
+msgid "Malaysia"
+msgstr ""
+
+#: ../picard/const.py:165
+msgid "Mexico"
+msgstr ""
+
+#: ../picard/const.py:166
+msgid "Israel"
+msgstr ""
+
+#: ../picard/const.py:167
+#, fuzzy
+msgid "France"
+msgstr "Peruuta"
+
+#: ../picard/const.py:168
+msgid "British Indian Ocean Territory"
+msgstr ""
+
+#: ../picard/const.py:169
+msgid "St. Helena"
+msgstr ""
+
+#: ../picard/const.py:170
+msgid "Finland"
+msgstr ""
+
+#: ../picard/const.py:171
+msgid "Fiji"
+msgstr ""
+
+#: ../picard/const.py:172
+msgid "Falkland Islands (Malvinas)"
+msgstr ""
+
+#: ../picard/const.py:173
+msgid "Micronesia, Federated States of"
+msgstr ""
+
+#: ../picard/const.py:174
+msgid "Faroe Islands"
+msgstr ""
+
+#: ../picard/const.py:175
+msgid "Nicaragua"
+msgstr ""
+
+#: ../picard/const.py:176
+msgid "Netherlands"
+msgstr ""
+
+#: ../picard/const.py:177
+msgid "Norway"
+msgstr ""
+
+#: ../picard/const.py:178
+msgid "Namibia"
+msgstr ""
+
+#: ../picard/const.py:179
+msgid "Vanuat"
+msgstr ""
+
+#: ../picard/const.py:180
+msgid "New Caledonia"
+msgstr ""
+
+#: ../picard/const.py:181
+#, fuzzy
+msgid "Niger"
+msgstr "Miksaaja"
+
+#: ../picard/const.py:182
+msgid "Norfolk Island"
+msgstr ""
+
+#: ../picard/const.py:183
+msgid "Nigeria"
+msgstr ""
+
+#: ../picard/const.py:184
+#, fuzzy
+msgid "New Zealand"
+msgstr "Uusi metadata"
+
+#: ../picard/const.py:185
+msgid "Zaire"
+msgstr ""
+
+#: ../picard/const.py:186
+msgid "Nepal"
+msgstr ""
+
+#: ../picard/const.py:187
+msgid "Naur"
+msgstr ""
+
+#: ../picard/const.py:188
+msgid "Niue"
+msgstr ""
+
+#: ../picard/const.py:189
+msgid "Cook Islands"
+msgstr ""
+
+#: ../picard/const.py:190
+msgid "Cote d'Ivoire"
+msgstr ""
+
+#: ../picard/const.py:191
+msgid "Switzerland"
+msgstr ""
+
+#: ../picard/const.py:192
+msgid "Colombia"
+msgstr ""
+
+#: ../picard/const.py:193
+msgid "China"
+msgstr ""
+
+#: ../picard/const.py:194
+msgid "Cameroon"
+msgstr ""
+
+#: ../picard/const.py:195
+#, fuzzy
+msgid "Chile"
+msgstr "Tiedosto"
+
+#: ../picard/const.py:196
+msgid "Cocos (Keeling) Islands"
+msgstr ""
+
+#: ../picard/const.py:197
+msgid "Canada"
+msgstr ""
+
+#: ../picard/const.py:198
+#, fuzzy
+msgid "Congo"
+msgstr "Mono"
+
+#: ../picard/const.py:199
+msgid "Central African Republic"
+msgstr ""
+
+#: ../picard/const.py:200
+msgid "Czech Republic"
+msgstr ""
+
+#: ../picard/const.py:201
+msgid "Cyprus"
+msgstr ""
+
+#: ../picard/const.py:202
+msgid "Christmas Island"
+msgstr ""
+
+#: ../picard/const.py:203
+msgid "Costa Rica"
+msgstr ""
+
+#: ../picard/const.py:204
+msgid "Cape Verde"
+msgstr ""
+
+#: ../picard/const.py:205
+msgid "Cuba"
+msgstr ""
+
+#: ../picard/const.py:206
+msgid "Swaziland"
+msgstr ""
+
+#: ../picard/const.py:207
+msgid "Syrian Arab Republic"
+msgstr ""
+
+#: ../picard/const.py:208
+msgid "Kyrgyzstan"
+msgstr ""
+
+#: ../picard/const.py:209
+msgid "Kenya"
+msgstr ""
+
+#: ../picard/const.py:210
+msgid "Suriname"
+msgstr ""
+
+#: ../picard/const.py:211
+msgid "Kiribati"
+msgstr ""
+
+#: ../picard/const.py:212
+msgid "Cambodia"
+msgstr ""
+
+#: ../picard/const.py:213
+msgid "Saint Kitts and Nevis"
+msgstr ""
+
+#: ../picard/const.py:214
+#, fuzzy
+msgid "Comoros"
+msgstr "Värit"
+
+#: ../picard/const.py:215
+msgid "Sao Tome and Principe"
+msgstr ""
+
+#: ../picard/const.py:216
+#, fuzzy
+msgid "Slovenia"
+msgstr "Slovakia"
+
+#: ../picard/const.py:217
+msgid "Kuwait"
+msgstr ""
+
+#: ../picard/const.py:218
+#, fuzzy
+msgid "Senegal"
+msgstr "Yleiset"
+
+#: ../picard/const.py:219
+msgid "San Marino"
+msgstr ""
+
+#: ../picard/const.py:220
+msgid "Sierra Leone"
+msgstr ""
+
+#: ../picard/const.py:221
+msgid "Seychelles"
+msgstr ""
+
+#: ../picard/const.py:222
+msgid "Kazakhstan"
+msgstr ""
+
+#: ../picard/const.py:223
+msgid "Cayman Islands"
+msgstr ""
+
+#: ../picard/const.py:224
+msgid "Singapore"
+msgstr ""
+
+#: ../picard/const.py:225
+#, fuzzy
+msgid "Sweden"
+msgstr "Ruotsi"
+
+#: ../picard/const.py:226
+#, fuzzy
+msgid "Sudan"
+msgstr "&Skannaa"
+
+#: ../picard/const.py:227
+msgid "Dominican Republic"
+msgstr ""
+
+#: ../picard/const.py:228
+#, fuzzy
+msgid "Dominica"
+msgstr "Romania"
+
+#: ../picard/const.py:229
+#, fuzzy
+msgid "Djibouti"
+msgstr "Tietoja"
+
+#: ../picard/const.py:230
+msgid "Denmark"
+msgstr ""
+
+#: ../picard/const.py:231
+msgid "Virgin Islands (British)"
+msgstr ""
+
+#: ../picard/const.py:232
+#, fuzzy
+msgid "Germany"
+msgstr "Saksa"
+
+#: ../picard/const.py:233
+msgid "Yemen"
+msgstr ""
+
+#: ../picard/const.py:234
+msgid "Algeria"
+msgstr ""
+
+#: ../picard/const.py:235
+msgid "United States"
+msgstr ""
+
+#: ../picard/const.py:236
+msgid "Uruguay"
+msgstr ""
+
+#: ../picard/const.py:237
+msgid "Mayotte"
+msgstr ""
+
+#: ../picard/const.py:238
+msgid "United States Minor Outlying Islands"
+msgstr ""
+
+#: ../picard/const.py:239
+msgid "Lebanon"
+msgstr ""
+
+#: ../picard/const.py:240
+msgid "Saint Lucia"
+msgstr ""
+
+#: ../picard/const.py:241
+msgid "Lao People's Democratic Republic"
+msgstr ""
+
+#: ../picard/const.py:242
+msgid "Tuval"
+msgstr ""
+
+#: ../picard/const.py:243
+#, fuzzy
+msgid "Taiwan"
+msgstr "Italia"
+
+#: ../picard/const.py:244
+msgid "Trinidad and Tobago"
+msgstr ""
+
+#: ../picard/const.py:245
+msgid "Turkey"
+msgstr ""
+
+#: ../picard/const.py:246
+msgid "Sri Lanka"
+msgstr ""
+
+#: ../picard/const.py:247
+msgid "Liechtenstein"
+msgstr ""
+
+#: ../picard/const.py:248
+msgid "Latvia"
+msgstr ""
+
+#: ../picard/const.py:249
+msgid "Tonga"
+msgstr ""
+
+#: ../picard/const.py:250
+#, fuzzy
+msgid "Lithuania"
+msgstr "Liettua"
+
+#: ../picard/const.py:251
+msgid "Luxembourg"
+msgstr ""
+
+#: ../picard/const.py:252
+msgid "Liberia"
+msgstr ""
+
+#: ../picard/const.py:253
+#, fuzzy
+msgid "Lesotho"
+msgstr "Kesto"
+
+#: ../picard/const.py:254
+msgid "Thailand"
+msgstr ""
+
+#: ../picard/const.py:255
+msgid "French Southern Territories"
+msgstr ""
+
+#: ../picard/const.py:256
+#, fuzzy
+msgid "Togo"
+msgstr "T&yökalut"
+
+#: ../picard/const.py:257
+msgid "Chad"
+msgstr ""
+
+#: ../picard/const.py:258
+msgid "Turks and Caicos Islands"
+msgstr ""
+
+#: ../picard/const.py:259
+msgid "Libyan Arab Jamahiriya"
+msgstr ""
+
+#: ../picard/const.py:260
+msgid "Vatican City State (Holy See)"
+msgstr ""
+
+#: ../picard/const.py:261
+msgid "Saint Vincent and The Grenadines"
+msgstr ""
+
+#: ../picard/const.py:262
+msgid "United Arab Emirates"
+msgstr ""
+
+#: ../picard/const.py:263
+msgid "Andorra"
+msgstr ""
+
+#: ../picard/const.py:264
+msgid "Antigua and Barbuda"
+msgstr ""
+
+#: ../picard/const.py:265
+msgid "Afghanistan"
+msgstr ""
+
+#: ../picard/const.py:266
+msgid "Anguilla"
+msgstr ""
+
+#: ../picard/const.py:267
+msgid "Virgin Islands (U.S.)"
+msgstr ""
+
+#: ../picard/const.py:268
+#, fuzzy
+msgid "Iceland"
+msgstr "Islanti"
+
+#: ../picard/const.py:269
+msgid "Iran (Islamic Republic of)"
+msgstr ""
+
+#: ../picard/const.py:270
+msgid "Armenia"
+msgstr ""
+
+#: ../picard/const.py:271
+msgid "Albania"
+msgstr ""
+
+#: ../picard/const.py:272
+msgid "Angola"
+msgstr ""
+
+#: ../picard/const.py:273
+msgid "Netherlands Antilles"
+msgstr ""
+
+#: ../picard/const.py:274
+msgid "Antarctica"
+msgstr ""
+
+#: ../picard/const.py:275
+msgid "American Samoa"
+msgstr ""
+
+#: ../picard/const.py:276
+msgid "Argentina"
+msgstr ""
+
+#: ../picard/const.py:277
+#, fuzzy
+msgid "Australia"
+msgstr "Italia"
+
+#: ../picard/const.py:278
+#, fuzzy
+msgid "Austria"
+msgstr "Tekijä"
+
+#: ../picard/const.py:279
+msgid "Aruba"
+msgstr ""
+
+#: ../picard/const.py:280
+#, fuzzy
+msgid "India"
+msgstr "Metadata"
+
+#: ../picard/const.py:281
+msgid "Tanzania, United Republic of"
+msgstr ""
+
+#: ../picard/const.py:282
+msgid "Azerbaijan"
+msgstr ""
+
+#: ../picard/const.py:283
+#, fuzzy
+msgid "Ireland"
+msgstr "Islanti"
+
+#: ../picard/const.py:284
+msgid "Indonesia"
+msgstr ""
+
+#: ../picard/const.py:285
+msgid "Ukraine"
+msgstr ""
+
+#: ../picard/const.py:286
+#, fuzzy
+msgid "Qatar"
+msgstr "Myöhemmin"
+
+#: ../picard/const.py:287
+msgid "Mozambique"
+msgstr ""
+
+#: ../picard/const.py:288
+msgid "Bosnia and Herzegovina"
+msgstr ""
+
+#: ../picard/const.py:289
+msgid "Congo, The Democratic Republic of the"
+msgstr ""
+
+#: ../picard/const.py:290
+msgid "Serbia and Montenegro"
+msgstr ""
+
+#: ../picard/const.py:291
+msgid "Croatia"
+msgstr ""
+
+#: ../picard/const.py:292
+msgid "Korea (North), Democratic People's Republic of"
+msgstr ""
+
+#: ../picard/const.py:293
+msgid "Korea (South), Republic of"
+msgstr ""
+
+#: ../picard/const.py:294
+#, fuzzy
+msgid "Slovakia"
+msgstr "Slovakia"
+
+#: ../picard/const.py:295
+msgid "Soviet Union (historical, 1922-1991)"
+msgstr ""
+
+#: ../picard/const.py:296
+msgid "East Timor"
+msgstr ""
+
+#: ../picard/const.py:297
+msgid "Czechoslovakia (historical, 1918-1992)"
+msgstr ""
+
+#: ../picard/const.py:298
+msgid "Europe"
+msgstr ""
+
+#: ../picard/const.py:299
+msgid "East Germany (historical, 1949-1990)"
+msgstr ""
+
+#: ../picard/const.py:300
+msgid "[Unknown Country]"
+msgstr ""
+
+#: ../picard/const.py:301
+msgid "[Worldwide]"
+msgstr ""
+
+#: ../picard/const.py:302
+msgid "Yugoslavia (historical, 1918-1992)"
+msgstr ""
+
+#: ../picard/const.py:307
+#, fuzzy
+msgid "Catalan"
+msgstr "Italia"
+
+#: ../picard/const.py:308
+msgid "Czech"
+msgstr "Tsekki"
+
+#: ../picard/const.py:309
+msgid "Welsh"
+msgstr ""
+
+#: ../picard/const.py:310
+#, fuzzy
+msgid "Danish"
+msgstr "Espanja"
+
+#: ../picard/const.py:311
+msgid "German"
+msgstr "Saksa"
+
+#: ../picard/const.py:312
+msgid "English"
+msgstr "Englanti"
+
+#: ../picard/const.py:313
+#, fuzzy
+msgid "English (Canada)"
+msgstr "Englanti (UK)"
+
+#: ../picard/const.py:314
+msgid "English (UK)"
+msgstr "Englanti (UK)"
+
+#: ../picard/const.py:315
+msgid "Spanish"
+msgstr "Espanja"
+
+#: ../picard/const.py:316
+#, fuzzy
+msgid "Persian"
+msgstr "Versio"
+
+#: ../picard/const.py:317
+msgid "Finnish"
+msgstr "Suomi"
+
+#: ../picard/const.py:318
+msgid "French"
+msgstr "Ranska"
+
+#: ../picard/const.py:319
+msgid "Frisian"
+msgstr ""
+
+#: ../picard/const.py:320
+msgid "Hebrew"
+msgstr ""
+
+#: ../picard/const.py:321
+msgid "Hungarian"
+msgstr "Unkari"
+
+#: ../picard/const.py:322
+#, fuzzy
+msgid "Islandic"
+msgstr "Islanti"
+
+#: ../picard/const.py:323
+msgid "Italian"
+msgstr "Italia"
+
+#: ../picard/const.py:324
+msgid "Kannada"
+msgstr ""
+
+#: ../picard/const.py:325
+msgid "Korean"
+msgstr "Korea"
+
+#: ../picard/const.py:326
+msgid "Lithuanian"
+msgstr "Liettua"
+
+#: ../picard/const.py:327
+msgid "Norwegian Bokmal"
+msgstr "Norja (bokmål)"
+
+#: ../picard/const.py:328
+msgid "Dutch"
+msgstr "Hollanti"
+
+#: ../picard/const.py:329
+#, fuzzy
+msgid "Polish"
+msgstr "Liitännäiset"
+
+#: ../picard/const.py:330
+msgid "Portuguese"
+msgstr "Portugali"
+
+#: ../picard/const.py:331
+#, fuzzy
+msgid "Brazilian Portuguese"
+msgstr "Portugali"
+
+#: ../picard/const.py:332
+msgid "Romanian"
+msgstr "Romania"
+
+#: ../picard/const.py:333
+msgid "Russian"
+msgstr "Venäjä"
+
+#: ../picard/const.py:334
+#, fuzzy
+msgid "Scots"
+msgstr "Pisteet"
+
+#: ../picard/const.py:335
+msgid "Slovak"
+msgstr "Slovakia"
+
+#: ../picard/const.py:336
+#, fuzzy
+msgid "Slovenian"
+msgstr "Slovakia"
+
+#: ../picard/const.py:337
+msgid "Swedish"
+msgstr "Ruotsi"
+
+#: ../picard/const.py:338
+#, fuzzy
+msgid "Chinese"
+msgstr "Kanavia:"
+
+#: ../picard/file.py:475
+#, python-format
+msgid "No matching tracks for file %s"
+msgstr "Ei kappaletietoja tiedostolle %s"
+
+#: ../picard/file.py:492
+#, fuzzy, python-format
+msgid "No matching tracks above the threshold for file %s"
+msgstr "Ei kappaletietoja tiedostolle %s"
+
+#: ../picard/file.py:495
+#, python-format
+msgid "File %s identified!"
+msgstr "Tiedosto %s tunnistettu!"
+
+#: ../picard/file.py:506
+#, python-format
+msgid "Looking up the PUID for file %s..."
+msgstr "Etsii PUIDia tiedostolle %s..."
+
+#: ../picard/file.py:511
+#, python-format
+msgid "Looking up the metadata for file %s..."
+msgstr "Etsii metatietoa tiedostolle %s..."
+
+#: ../picard/puidmanager.py:58
+msgid "Submitting PUIDs..."
+msgstr "Lähettää PUIDeja..."
+
+#: ../picard/puidmanager.py:64
+#, python-format
+msgid "PUIDs submission failed: %s"
+msgstr "PUIDien lähetys epäonnistui: %s"
+
+#: ../picard/puidmanager.py:66
+msgid "PUIDs successfully submitted!"
+msgstr "PUIDien lähetys onnistui!"
+
+#: ../picard/playlist.py:31
+msgid "M3U Playlist (*.m3u)"
+msgstr "M3U soittolista (*.m3u)"
+
+#: ../picard/playlist.py:32
+msgid "PLS Playlist (*.pls)"
+msgstr "PLS soittolista (*.pls)"
+
+#: ../picard/playlist.py:33
+msgid "XSPF Playlist (*.xspf)"
+msgstr "XSPF soittolista (*.xspf)"
+
+#: ../picard/tagger.py:476
 msgid "CD Lookup Error"
 msgstr "CD haku virhe"
 
-#: ../picard/tagger.py:473
+#: ../picard/tagger.py:477
 #, python-format
 msgid ""
 "Error while reading CD:\n"
 "\n"
 "%s"
 msgstr ""
-"Virhe CD:tä lukiessa\n"
+"Virhe CD:tä lukiessa:\n"
 "\n"
 "%s"
 
-#: ../picard/ui/passworddialog.py:38
+#: ../picard/tagger.py:503
 #, python-format
-msgid ""
-"The server %s requires you to login. Please enter your username and password."
-msgstr ""
+msgid "Couldn't find PUID for file %s"
+msgstr "Tiedostolle %s ei löytynyt PUIDia"
 
-#: ../picard/ui/ui_options_script.py:52
-msgid "Tagger Script"
-msgstr ""
+#: ../picard/musicdns/__init__.py:98
+#, fuzzy, python-format
+msgid "Looking up the fingerprint for file %s..."
+msgstr "Etsii metatietoa tiedostolle %s..."
+
+#: ../picard/musicdns/__init__.py:117
+#, python-format
+msgid "Creating fingerprint for file %s..."
+msgstr "Luodaan sormenjälki tiedostolle %s..."
 
 #: ../picard/ui/cdlookup.py:31
 msgid "Score"
-msgstr ""
+msgstr "Pisteet"
 
 #: ../picard/ui/cdlookup.py:31
+#: ../picard/ui/itemviews.py:82
+#: ../picard/util/tags.py:23
 msgid "Title"
 msgstr "Nimi"
 
-#: ../picard/ui/cdlookup.py:31 ../picard/ui/mainwindow.py:436
+#: ../picard/ui/cdlookup.py:31
+#: ../picard/ui/itemviews.py:84
+#: ../picard/ui/mainwindow.py:436
+#: ../picard/util/tags.py:22
 msgid "Artist"
 msgstr "Artisti"
 
-#: ../picard/ui/ui_metadata.py:121
-msgid "Lookup"
-msgstr "Haku"
+#: ../picard/ui/coverartbox.py:47
+#: ../picard/ui/options/cover.py:29
+msgid "Cover Art"
+msgstr "Kansikuva"
 
-#: ../picard/ui/ui_metadata.py:122
-msgid "Title:"
-msgstr "Nimi:"
+#: ../picard/ui/coverartbox.py:95
+msgid "Buy the album on Amazon"
+msgstr "Osta albumi Amazonista"
 
-#: ../picard/ui/ui_metadata.py:123
-msgid "Date:"
-msgstr "Päiväys:"
+#: ../picard/ui/filebrowser.py:38
+#: ../picard/ui/mainwindow.py:302
+msgid "&Refresh"
+msgstr "&Päivitä"
 
-#: ../picard/ui/ui_metadata.py:124
-msgid "Artist:"
-msgstr "Artisti:"
+#: ../picard/ui/filebrowser.py:41
+msgid "&Move Tagged Files Here"
+msgstr "&Siirrä tagatut tiedostot tänne"
 
-#: ../picard/ui/ui_metadata.py:125
-msgid "Track:"
-msgstr "Kappale:"
+#: ../picard/ui/filebrowser.py:44
+msgid "Show &Hidden Files"
+msgstr "Näytä &piilotetut tiedostot"
 
-#: ../picard/ui/ui_metadata.py:126
-msgid "0000-00-00; "
-msgstr "0000-00-00; "
+#: ../picard/ui/itemviews.py:83
+msgid "Length"
+msgstr "Kesto"
 
-#: ../picard/ui/ui_metadata.py:127 ../picard/ui/tageditor.py:225
-#: ../picard/ui/multitageditor.py:181
+#: ../picard/ui/itemviews.py:327
+msgid "&Releases"
+msgstr "&Julkaisut"
+
+#: ../picard/ui/itemviews.py:353
+msgid "&Plugins"
+msgstr "&Liitännäiset"
+
+#: ../picard/ui/itemviews.py:523
+msgid "Clusters"
+msgstr "Ryhmät"
+
+#: ../picard/ui/logview.py:29
+msgid "Log"
+msgstr "Loki"
+
+#: ../picard/ui/puidsubmit.py:31
+#: ../picard/ui/options/plugins.py:80
+msgid "File"
+msgstr "Tiedosto"
+
+#: ../picard/ui/puidsubmit.py:31
+msgid "PUID"
+msgstr "PUID"
+
+#: ../picard/ui/puidsubmit.py:31
+#: ../picard/ui/mainwindow.py:437
+msgid "Track"
+msgstr "Kappale"
+
+#: ../picard/ui/puidsubmit.py:31
+msgid "Release"
+msgstr "Julkaisu"
+
+#: ../picard/ui/puidsubmit.py:31
+msgid "Release ID"
+msgstr "Julkaisu ID"
+
+#: ../picard/ui/tageditor.py:65
+#: ../picard/ui/ui_options_plugins.py:62
+msgid "Details"
+msgstr "Tiedot"
+
+#: ../picard/ui/tageditor.py:70
+#: ../picard/ui/tageditor.py:241
+#, python-format
+msgid "%d file"
+msgid_plural "%d files"
+msgstr[0] "%d tiedosto"
+msgstr[1] "%d tiedostot"
+
+#: ../picard/ui/tageditor.py:124
+#, python-format
+msgid "(different across %d file)"
+msgid_plural "(different across %d files)"
+msgstr[0] "(%d erilaista)"
+msgstr[1] "(%d erilaista)"
+
+#: ../picard/ui/tageditor.py:127
+#, python-format
+msgid "(missing from %d file)"
+msgid_plural "(missing from %d files)"
+msgstr[0] "(%d puuttuu)"
+msgstr[1] "(%d puuttuu)"
+
+#: ../picard/ui/tageditor.py:210
+msgid "Filename:"
+msgstr "Tiedostonimi:"
+
+#: ../picard/ui/tageditor.py:212
+msgid "Format:"
+msgstr "Tiedostomuoto:"
+
+#: ../picard/ui/tageditor.py:221
+msgid "Size:"
+msgstr "Koko:"
+
+#: ../picard/ui/tageditor.py:225
+#: ../picard/ui/ui_metadata.py:127
 msgid "Length:"
 msgstr "Kesto:"
 
-#: ../picard/ui/ui_metadata.py:128
-msgid "Album:"
-msgstr "Albumi:"
+#: ../picard/ui/tageditor.py:227
+msgid "Bitrate:"
+msgstr "Bittinopeus:"
 
-#: ../picard/ui/ui_passworddialog.py:78
-#, fuzzy
-msgid "Authentication required"
-msgstr "Vaatii Unicoden"
+#: ../picard/ui/tageditor.py:229
+msgid "Sample rate:"
+msgstr "Äänitaajuus:"
 
-#: ../picard/ui/ui_passworddialog.py:79 ../picard/ui/ui_options_proxy.py:83
-#: ../picard/ui/ui_options_general.py:113
-msgid "Username:"
-msgstr "Käyttäjänimi:"
+#: ../picard/ui/tageditor.py:231
+msgid "Bits per sample:"
+msgstr "Bittisyvyys:"
 
-#: ../picard/ui/ui_passworddialog.py:80 ../picard/ui/ui_options_proxy.py:82
-#: ../picard/ui/ui_options_general.py:112
-msgid "Password:"
-msgstr "Salasana:"
+#: ../picard/ui/tageditor.py:234
+msgid "Mono"
+msgstr "Mono"
 
-#: ../picard/ui/ui_passworddialog.py:81
-msgid "Save username and password"
-msgstr ""
+#: ../picard/ui/tageditor.py:235
+msgid "Stereo"
+msgstr "Stereo"
 
-#: ../picard/ui/ui_options_folksonomy.py:114
-#: ../picard/ui/ui_options_folksonomy_tags.py:114
-msgid "Folksonomy Tags"
-msgstr ""
+#: ../picard/ui/tageditor.py:237
+msgid "Channels:"
+msgstr "Kanavia:"
 
-#: ../picard/ui/ui_options_folksonomy.py:115
-#: ../picard/ui/ui_options_folksonomy_tags.py:115
-msgid "Ignore tags:"
-msgstr ""
-
-#: ../picard/ui/ui_options_folksonomy.py:116
-#: ../picard/ui/ui_options_folksonomy_tags.py:116
-msgid "Minimal tag usage:"
-msgstr ""
-
-#: ../picard/ui/ui_options_folksonomy.py:117
-#: ../picard/ui/ui_options_folksonomy_tags.py:117
-#: ../picard/ui/ui_options_matching.py:107
-#: ../picard/ui/ui_options_matching.py:108
-#: ../picard/ui/ui_options_matching.py:109
-#: ../picard/ui/ui_options_matching.py:113
-msgid " %"
-msgstr ""
-
-#: ../picard/ui/ui_options_folksonomy.py:118
-msgid "Maximum number of tags:"
-msgstr ""
-
-#: ../picard/ui/ui_options_folksonomy.py:119
-#: ../picard/ui/ui_options_folksonomy_tags.py:119
-msgid "Join multiple tags with:"
-msgstr ""
-
-#: ../picard/ui/ui_options_folksonomy.py:120
-#: ../picard/ui/ui_options_folksonomy_tags.py:120
-msgid " / "
-msgstr ""
-
-#: ../picard/ui/ui_options_folksonomy.py:121
-#: ../picard/ui/ui_options_folksonomy_tags.py:121
-msgid ", "
-msgstr ""
-
-#: ../picard/ui/ui_options_folksonomy_tags.py:118
-msgid "Maximal number of tags:"
-msgstr ""
+#: ../picard/ui/tagsfromfilenames.py:52
+#: ../picard/ui/tagsfromfilenames.py:96
+msgid "File Name"
+msgstr "Tiedostonimi"
 
 #: ../picard/ui/mainwindow.py:64
 msgid "MusicBrainz Picard"
@@ -173,11 +1506,11 @@ msgstr "MusicBrainz Picard"
 
 #: ../picard/ui/mainwindow.py:85
 msgid "Original Metadata"
-msgstr "Alkuperäinen metatieto"
+msgstr "Alkuperäinen metadata"
 
 #: ../picard/ui/mainwindow.py:87
 msgid "New Metadata"
-msgstr "Uusi metatieto"
+msgstr "Uusi metadata"
 
 #: ../picard/ui/mainwindow.py:183
 msgid "&Options..."
@@ -193,7 +1526,7 @@ msgstr "Ctrl+X"
 
 #: ../picard/ui/mainwindow.py:191
 msgid "&Paste"
-msgstr "L&iitä"
+msgstr "&Liitä"
 
 #: ../picard/ui/mainwindow.py:192
 msgid "Ctrl+V"
@@ -201,24 +1534,23 @@ msgstr "Ctrl+V"
 
 #: ../picard/ui/mainwindow.py:196
 msgid "&Help..."
-msgstr "&Ohje"
+msgstr "&Ohje..."
 
 #: ../picard/ui/mainwindow.py:207
 msgid "&About..."
 msgstr "&Tietoja..."
 
 #: ../picard/ui/mainwindow.py:210
-#, fuzzy
 msgid "&Donate..."
-msgstr "&Tietoja..."
+msgstr "&Lahjoita..."
 
 #: ../picard/ui/mainwindow.py:213
 msgid "&Report a Bug..."
-msgstr "&Ilmoita bugista..."
+msgstr "Ilmoita &bugista..."
 
 #: ../picard/ui/mainwindow.py:216
 msgid "&Support Forum..."
-msgstr "&Tuki foorumi"
+msgstr "&Tukifoorumi..."
 
 #: ../picard/ui/mainwindow.py:219
 msgid "&Add Files..."
@@ -226,7 +1558,7 @@ msgstr "&Lisää tiedostoja..."
 
 #: ../picard/ui/mainwindow.py:220
 msgid "Add files to the tagger"
-msgstr "Lisää tiedostot"
+msgstr "Lisää tiedostoja"
 
 #. Keyboard shortcut for "Add Files..."
 #: ../picard/ui/mainwindow.py:222
@@ -235,7 +1567,7 @@ msgstr "Ctrl+O"
 
 #: ../picard/ui/mainwindow.py:225
 msgid "A&dd Folder..."
-msgstr "Li&sää kansio..."
+msgstr "Lisää &kansio..."
 
 #: ../picard/ui/mainwindow.py:226
 msgid "Add a folder to the tagger"
@@ -269,7 +1601,7 @@ msgstr "Lähetä PUIDit MusicBrainziin"
 
 #: ../picard/ui/mainwindow.py:244
 msgid "E&xit"
-msgstr "P&oistu"
+msgstr "L&opeta"
 
 #. Keyboard shortcut for "Exit"
 #: ../picard/ui/mainwindow.py:246
@@ -282,11 +1614,11 @@ msgstr "&Poista"
 
 #: ../picard/ui/mainwindow.py:251
 msgid "Remove selected files/albums"
-msgstr "Poista valitut tiedostot/albumit"
+msgstr "Poista valitut tiedostot/julkaisut"
 
 #: ../picard/ui/mainwindow.py:256
 msgid "File &Browser"
-msgstr "&Tiedosto selain"
+msgstr "&Tiedostoselain"
 
 #: ../picard/ui/mainwindow.py:262
 msgid "&Cover Art"
@@ -298,16 +1630,17 @@ msgstr "Etsi"
 
 #: ../picard/ui/mainwindow.py:271
 msgid "&CD Lookup..."
-msgstr ""
+msgstr "&CD Haku..."
 
-#: ../picard/ui/mainwindow.py:272 ../picard/ui/mainwindow.py:273
+#: ../picard/ui/mainwindow.py:272
+#: ../picard/ui/mainwindow.py:273
 msgid "Lookup CD"
-msgstr "CD haku"
+msgstr "CD-haku"
 
 #. Keyboard shortcut for "Lookup CD"
 #: ../picard/ui/mainwindow.py:275
 msgid "Ctrl+K"
-msgstr ""
+msgstr "Ctrl+K"
 
 #: ../picard/ui/mainwindow.py:278
 msgid "&Scan"
@@ -320,7 +1653,7 @@ msgstr "Ctrl+Y"
 
 #: ../picard/ui/mainwindow.py:284
 msgid "Cl&uster"
-msgstr ""
+msgstr "&Ryhmitä"
 
 #. Keyboard shortcut for "Cluster"
 #: ../picard/ui/mainwindow.py:287
@@ -329,11 +1662,12 @@ msgstr "Ctrl+U"
 
 #: ../picard/ui/mainwindow.py:290
 msgid "&Lookup"
-msgstr ""
+msgstr "&Haku"
 
-#: ../picard/ui/mainwindow.py:291 ../picard/ui/mainwindow.py:292
+#: ../picard/ui/mainwindow.py:291
+#: ../picard/ui/mainwindow.py:292
 msgid "Lookup metadata"
-msgstr "Hae metatietoja"
+msgstr "Metadata haku"
 
 #. Keyboard shortcut for "Lookup"
 #: ../picard/ui/mainwindow.py:295
@@ -344,10 +1678,6 @@ msgstr "Ctrl+L"
 msgid "&Details..."
 msgstr "&Tiedot..."
 
-#: ../picard/ui/mainwindow.py:302 ../picard/ui/filebrowser.py:38
-msgid "&Refresh"
-msgstr "&Päivitä"
-
 #: ../picard/ui/mainwindow.py:305
 msgid "Generate &Playlist..."
 msgstr "Luo &soittolista..."
@@ -358,19 +1688,19 @@ msgstr "&Nimeä tiedostot"
 
 #: ../picard/ui/mainwindow.py:313
 msgid "&Move Files"
-msgstr "Siirrä tie&dostot"
+msgstr "&Siirrä tiedostot"
 
 #: ../picard/ui/mainwindow.py:318
 msgid "Save &Tags"
-msgstr ""
+msgstr "&Tallenna tagit"
 
 #: ../picard/ui/mainwindow.py:323
 msgid "Tags From &File Names..."
-msgstr "Ta&git tiedostonimestä"
+msgstr "&Tagit tiedostonimestä"
 
 #: ../picard/ui/mainwindow.py:326
 msgid "View &Log..."
-msgstr "Näytä log&i"
+msgstr "&Näytä loki..."
 
 #: ../picard/ui/mainwindow.py:349
 msgid "&File"
@@ -393,28 +1723,26 @@ msgid "&Tools"
 msgstr "T&yökalut"
 
 #: ../picard/ui/mainwindow.py:384
+#: ../picard/ui/util.py:33
 msgid "&Help"
-msgstr "O&hje"
+msgstr "&Ohje"
 
 #: ../picard/ui/mainwindow.py:404
 msgid "&Toolbar"
-msgstr "&Työkalurivi"
+msgstr "T&yökalurivi"
 
 #: ../picard/ui/mainwindow.py:430
 msgid "&Search Bar"
 msgstr "&Hakurivi"
 
 #: ../picard/ui/mainwindow.py:435
+#: ../picard/util/tags.py:21
 msgid "Album"
-msgstr "Albumi"
-
-#: ../picard/ui/mainwindow.py:437 ../picard/ui/puidsubmit.py:31
-msgid "Track"
-msgstr "Kappale"
+msgstr "Julkaisu"
 
 #: ../picard/ui/mainwindow.py:476
 msgid "All Supported Formats"
-msgstr "Kaikki tuetut tiedostotyypit"
+msgstr "Kaikki tuetut tiedostomuodot"
 
 #: ../picard/ui/mainwindow.py:525
 #, python-format
@@ -426,103 +1754,400 @@ msgstr "Tallentaa soittolistaa %s..."
 msgid "Playlist %s saved"
 msgstr "Soittolista %s tallennettu"
 
-#: ../picard/ui/mainwindow.py:638 ../picard/ui/mainwindow.py:647
+#: ../picard/ui/mainwindow.py:638
+#: ../picard/ui/mainwindow.py:647
 #, python-format
 msgid " (Error: %s)"
 msgstr " (Virhe: %s)"
 
+#: ../picard/ui/ui_tageditor.py:115
+#: ../picard/ui/ui_options_plugins.py:59
+#: ../picard/ui/options/plugins.py:76
+msgid "Name"
+msgstr "Nimi"
+
+#: ../picard/ui/ui_tageditor.py:116
+msgid "Value"
+msgstr "Arvo"
+
+#: ../picard/ui/ui_tageditor.py:117
+msgid "&Add..."
+msgstr "&Lisää..."
+
+#: ../picard/ui/ui_tageditor.py:118
+msgid "&Edit..."
+msgstr "&Muokkaa..."
+
+#: ../picard/ui/ui_tageditor.py:119
+msgid "&Delete"
+msgstr "&Poista"
+
+#: ../picard/ui/ui_tageditor.py:120
+msgid "&Metadata"
+msgstr "&Metadata"
+
+#: ../picard/ui/ui_tageditor.py:121
+msgid "A&rtwork"
+msgstr "&Kansikuva"
+
+#: ../picard/ui/ui_tageditor.py:122
+msgid "&Info"
+msgstr "T&iedot"
+
+#: ../picard/ui/passworddialog.py:38
+#, python-format
+msgid "The server %s requires you to login. Please enter your username and password."
+msgstr "Serveri %s edellyttää kirjautumista. Syötä käyttäjätunnuksesi ja salasanasi."
+
+#: ../picard/ui/ui_cdlookup.py:60
+#: ../picard/ui/ui_options_cdlookup.py:47
+#: ../picard/ui/ui_options_cdlookup_win32.py:56
+#: ../picard/ui/options/cdlookup.py:35
+msgid "CD Lookup"
+msgstr "CD-haku"
+
+#: ../picard/ui/ui_cdlookup.py:61
+msgid "The following releases on MusicBrainz match the CD:"
+msgstr "Seuraavat julkaisut MusicBrainzissa vastaavat CD-levyä:"
+
+#: ../picard/ui/ui_cdlookup.py:62
+#: ../picard/ui/ui_puidsubmit.py:53
+msgid "OK"
+msgstr "OK"
+
+#: ../picard/ui/ui_cdlookup.py:63
+msgid "    Lookup manually    "
+msgstr "    Hae manuaalisesti    "
+
+#: ../picard/ui/ui_cdlookup.py:64
+#: ../picard/ui/ui_puidsubmit.py:54
+msgid "Cancel"
+msgstr "Peruuta"
+
+#: ../picard/ui/ui_passworddialog.py:78
+msgid "Authentication required"
+msgstr "Todennus vaaditaan"
+
+#: ../picard/ui/ui_passworddialog.py:79
+#: ../picard/ui/ui_options_general.py:113
+#: ../picard/ui/ui_options_proxy.py:83
+msgid "Username:"
+msgstr "Käyttäjätunnus:"
+
+#: ../picard/ui/ui_passworddialog.py:80
+#: ../picard/ui/ui_options_general.py:112
+#: ../picard/ui/ui_options_proxy.py:82
+msgid "Password:"
+msgstr "Salasana:"
+
+#: ../picard/ui/ui_passworddialog.py:81
+msgid "Save username and password"
+msgstr "Muista käyttäjätunnus ja salasana"
+
 #: ../picard/ui/ui_edittagdialog.py:44
 msgid "Edit Tag"
-msgstr ""
+msgstr "Muokkaa tagia"
 
-#: ../picard/ui/ui_options_proxy.py:81
-msgid "Web Proxy"
-msgstr "Välityspalvelin"
+#: ../picard/ui/ui_metadata.py:121
+msgid "Lookup"
+msgstr "Haku"
 
-#: ../picard/ui/ui_options_proxy.py:84 ../picard/ui/ui_options_general.py:109
-msgid "Port:"
-msgstr "Portti:"
+#: ../picard/ui/ui_metadata.py:122
+msgid "Title:"
+msgstr "Nimi:"
 
-#: ../picard/ui/ui_options_proxy.py:85 ../picard/ui/ui_options_general.py:110
-msgid "Server address:"
-msgstr "Palvelimen osoite:"
+#: ../picard/ui/ui_metadata.py:123
+msgid "Date:"
+msgstr "Päiväys:"
 
-#: ../picard/ui/ui_tagsfromfilenames.py:56
-msgid "Convert File Names to Tags"
-msgstr "Tagit tiedostonimestä"
+#: ../picard/ui/ui_metadata.py:124
+msgid "Artist:"
+msgstr "Artisti:"
 
-#: ../picard/ui/ui_tagsfromfilenames.py:57
-msgid "Replace underscores with spaces"
-msgstr "Korvaa alaviivat väleillä"
+#: ../picard/ui/ui_metadata.py:125
+msgid "Track:"
+msgstr "Kappale:"
+
+#: ../picard/ui/ui_metadata.py:126
+msgid "0000-00-00; "
+msgstr "0000-00-00; "
+
+#: ../picard/ui/ui_metadata.py:128
+msgid "Album:"
+msgstr "Julkaisu:"
+
+#: ../picard/ui/ui_options.py:42
+msgid "Options"
+msgstr "Asetukset"
+
+#: ../picard/ui/ui_options_cdlookup.py:48
+msgid "CD-ROM device to use for lookups:"
+msgstr "Hakuihin käytettävä CD-ROM asema:"
+
+#: ../picard/ui/ui_options_cdlookup_win32.py:57
+msgid "Default CD-ROM drive to use for lookups:"
+msgstr "Hakuihin käytettävä CD-ROM asema:"
+
+#: ../picard/ui/ui_options_cover.py:56
+msgid "Location"
+msgstr "Sijanti"
+
+#: ../picard/ui/ui_options_cover.py:57
+msgid "Embed cover images into tags"
+msgstr "Sijoita kansikuvat tageihin"
+
+#: ../picard/ui/ui_options_cover.py:58
+msgid "Save cover images as separate files"
+msgstr "Tallenna kansikuvat erillisinä tiedostoina"
+
+#: ../picard/ui/ui_options_cover.py:59
+msgid "Overwrite the file if it already exists"
+msgstr "Korvaa jo olemassa oleva tiedosto"
+
+#: ../picard/ui/util.py:31
+msgid "&Ok"
+msgstr "&OK"
+
+#: ../picard/ui/util.py:32
+#, fuzzy
+msgid "&Cancel"
+msgstr "Peruuta"
+
+#: ../picard/ui/ui_puidsubmit.py:52
+msgid "Submit PUIDs"
+msgstr "Lähetä PUIDit"
+
+#: ../picard/ui/ui_options_folksonomy.py:114
+#: ../picard/ui/options/folksonomy.py:29
+msgid "Folksonomy Tags"
+msgstr "Folksonomia tagit"
+
+#: ../picard/ui/ui_options_folksonomy.py:115
+msgid "Ignore tags:"
+msgstr "Sivuutettavat tagit:"
+
+#: ../picard/ui/ui_options_folksonomy.py:116
+msgid "Minimal tag usage:"
+msgstr "Tagien vähimmäismäärä:"
+
+#: ../picard/ui/ui_options_folksonomy.py:117
+#: ../picard/ui/ui_options_matching.py:107
+#: ../picard/ui/ui_options_matching.py:108
+#: ../picard/ui/ui_options_matching.py:109
+#: ../picard/ui/ui_options_matching.py:113
+msgid " %"
+msgstr " %"
+
+#: ../picard/ui/ui_options_folksonomy.py:118
+msgid "Maximum number of tags:"
+msgstr "Tagien enimmäismäärä:"
+
+#: ../picard/ui/ui_options_folksonomy.py:119
+msgid "Join multiple tags with:"
+msgstr "Yhdistä useammat tagit merkillä:"
+
+#: ../picard/ui/ui_options_folksonomy.py:120
+msgid " / "
+msgstr " / "
+
+#: ../picard/ui/ui_options_folksonomy.py:121
+msgid ", "
+msgstr ", "
+
+#: ../picard/ui/ui_options_interface.py:50
+msgid "Miscellaneous"
+msgstr "Sekalaiset"
+
+#: ../picard/ui/ui_options_interface.py:51
+msgid "Show text labels under icons"
+msgstr "Näytä teksti ikonien alla"
+
+#: ../picard/ui/ui_options_interface.py:52
+msgid "Allow selection of multiple directories"
+msgstr "Salli usean kansion valinta"
+
+#: ../picard/ui/ui_options_interface.py:53
+msgid "Use advanced query syntax"
+msgstr "Käytä kehittynyttä syntaksia"
+
+#: ../picard/ui/ui_options_interface.py:54
+#, fuzzy
+msgid "User interface language:"
+msgstr "Käyttäjätunnus:"
+
+#: ../picard/ui/ui_options_naming.py:165
+msgid "Rename Files"
+msgstr "Uudelleennimeä tiedostot"
+
+#: ../picard/ui/ui_options_naming.py:166
+msgid "Replace Windows-incompatible characters"
+msgstr "Korvaa Windows-yhteensopimattomat merkit"
+
+#: ../picard/ui/ui_options_naming.py:167
+msgid "Replace non-ASCII characters"
+msgstr "Korvaa ei-ASCII merkit"
+
+#: ../picard/ui/ui_options_naming.py:168
+#: ../picard/ui/ui_options_naming.py:169
+#: ../picard/ui/ui_options_metadata.py:109
+#: ../picard/ui/ui_options_metadata.py:110
+msgid "Default"
+msgstr "Oletus"
+
+#: ../picard/ui/ui_options_naming.py:170
+#: ../picard/ui/options/naming.py:90
+msgid "Multiple artist file naming format:"
+msgstr "Usean artistin uudelleennimeämis formaatti:"
+
+#: ../picard/ui/ui_options_naming.py:171
+#: ../picard/ui/options/naming.py:86
+msgid "File naming format:"
+msgstr "Uudelleennimeämis formaatti:"
+
+#: ../picard/ui/ui_options_naming.py:172
+msgid "Move Files"
+msgstr "Siirrä tiedostot"
+
+#: ../picard/ui/ui_options_naming.py:173
+msgid "Move tagged files to this directory:"
+msgstr "Siirrä tagatut tiedostot tähän kansioon:"
+
+#: ../picard/ui/ui_options_naming.py:174
+msgid "Browse..."
+msgstr "Selaa..."
+
+#: ../picard/ui/ui_options_naming.py:175
+msgid "Move additional files:"
+msgstr "Siirrä muut tiedostot:"
+
+#: ../picard/ui/ui_options_naming.py:176
+msgid "Delete empty directories"
+msgstr "Poista tyhjät kansiot"
+
+#: ../picard/ui/ui_options_naming.py:177
+msgid "Example"
+msgstr "Esimerkki"
+
+#: ../picard/ui/ui_options_naming.py:178
+msgid "File name:"
+msgstr "Tiedostonimi:"
+
+#: ../picard/ui/ui_options_naming.py:179
+msgid "Multiple artist file name:"
+msgstr "Usean artistin tiedostonimi:"
 
-#: ../picard/ui/ui_tagsfromfilenames.py:58
 #: ../picard/ui/ui_options_naming.py:180
+#: ../picard/ui/ui_tagsfromfilenames.py:58
 msgid "&Preview"
 msgstr "&Esikatselu"
 
 #: ../picard/ui/ui_options_general.py:108
 msgid "MusicBrainz Server"
-msgstr "MusicBrainz palvelin"
+msgstr "MusicBrainz-palvelin"
+
+#: ../picard/ui/ui_options_general.py:109
+#: ../picard/ui/ui_options_proxy.py:84
+msgid "Port:"
+msgstr "Portti:"
+
+#: ../picard/ui/ui_options_general.py:110
+#: ../picard/ui/ui_options_proxy.py:85
+msgid "Server address:"
+msgstr "Palvelimen osoite:"
 
 #: ../picard/ui/ui_options_general.py:111
 msgid "Account Information"
-msgstr "Tilin tiedot"
+msgstr "Tilitiedot"
 
 #: ../picard/ui/ui_options_general.py:114
+#: ../picard/ui/options/general.py:29
 msgid "General"
 msgstr "Yleiset"
 
 #: ../picard/ui/ui_options_general.py:115
 msgid "Automatically scan all new files"
-msgstr "Skannaa kaikki uudet tiedostot"
-
-#: ../picard/ui/ui_options_interface.py:46
-msgid "Miscellaneous"
-msgstr "Sekalaiset"
-
-#: ../picard/ui/ui_options_interface.py:47
-msgid "Show text labels under icons"
-msgstr ""
-
-#: ../picard/ui/ui_options_interface.py:48
-msgid "Allow selection of multiple directories"
-msgstr ""
-
-#: ../picard/ui/ui_options_interface.py:49
-msgid "Use advanced query syntax"
-msgstr ""
-
-#: ../picard/ui/itemviews.py:327
-msgid "&Releases"
-msgstr "&Julkaisut"
-
-#: ../picard/ui/itemviews.py:353
-msgid "&Plugins"
-msgstr "&Laajennukset"
-
-#: ../picard/ui/itemviews.py:523
-msgid "Clusters"
-msgstr "Ryhmät"
+msgstr "Skannaa automaattisesti uudet tiedostot"
 
 #: ../picard/ui/ui_options_matching.py:105
 msgid "Thresholds"
-msgstr ""
+msgstr "Kynnykset"
 
 #: ../picard/ui/ui_options_matching.py:106
 msgid "Minimal similarity for matching files to tracks:"
-msgstr ""
+msgstr "Tiedostojen ja kappaleiden vertauksen minimaalinen samankaltaisuus:"
 
 #: ../picard/ui/ui_options_matching.py:110
 msgid "Minimal similarity for file lookups:"
-msgstr ""
+msgstr "Tiedosto hakujen minimaalinen samankaltaisuus:"
 
 #: ../picard/ui/ui_options_matching.py:111
 msgid "Minimal similarity for cluster lookups:"
-msgstr ""
+msgstr "Ryhmä hakujen minimaalinen samankaltaisuus:"
 
 #: ../picard/ui/ui_options_matching.py:112
 msgid "Minimal similarity for PUID lookups:"
-msgstr ""
+msgstr "PUID hakujen minimaalinen samankaltaisuus:"
+
+#: ../picard/ui/ui_options_metadata.py:100
+#: ../picard/ui/options/metadata.py:31
+msgid "Metadata"
+msgstr "Metadata"
+
+#: ../picard/ui/ui_options_metadata.py:101
+msgid "Translate foreign artist names to English where possible"
+msgstr "Käännä ulkomaiset artistien nimet jos mahdollista"
+
+#: ../picard/ui/ui_options_metadata.py:102
+msgid "Use release relationships"
+msgstr "Käytä julkaisu suhteita"
+
+#: ../picard/ui/ui_options_metadata.py:103
+msgid "Use track relationships"
+msgstr "Käytä kappale suhteita"
+
+#: ../picard/ui/ui_options_metadata.py:104
+msgid "Use folksonomy tags as genre"
+msgstr "Käytä folksonomia tageja genrenä"
+
+#: ../picard/ui/ui_options_metadata.py:105
+msgid "Preferred release country:"
+msgstr "Suositeltu julkaisu maa:"
+
+#: ../picard/ui/ui_options_metadata.py:106
+msgid "Custom Fields"
+msgstr "Mukautetut kentät"
+
+#: ../picard/ui/ui_options_metadata.py:107
+msgid "Various artists:"
+msgstr "Sekalaiset artistit:"
+
+#: ../picard/ui/ui_options_metadata.py:108
+msgid "Non-album tracks:"
+msgstr "Albumittomat kappaleet:"
+
+#: ../picard/ui/ui_options_plugins.py:58
+#: ../picard/ui/options/plugins.py:30
+msgid "Plugins"
+msgstr "Liitännäiset"
+
+#: ../picard/ui/ui_options_plugins.py:60
+#: ../picard/ui/options/plugins.py:79
+msgid "Author"
+msgstr "Tekijä"
+
+#: ../picard/ui/ui_options_plugins.py:61
+#: ../picard/util/tags.py:36
+msgid "Version"
+msgstr "Versio"
+
+#: ../picard/ui/ui_options_proxy.py:81
+#: ../picard/ui/options/proxy.py:28
+msgid "Web Proxy"
+msgstr "Välityspalvelin"
+
+#: ../picard/ui/ui_options_script.py:52
+msgid "Tagger Script"
+msgstr "Tagger-skripti"
 
 #: ../picard/ui/ui_options_tags.py:105
 msgid "Common"
@@ -534,7 +2159,7 @@ msgstr "Poista vanhat tagit ennen uusien kirjoittamista"
 
 #: ../picard/ui/ui_options_tags.py:107
 msgid "Don't write tags to files"
-msgstr ""
+msgstr "Älä kirjoita tageja tiedostoihin"
 
 #: ../picard/ui/ui_options_tags.py:108
 msgid "ID3"
@@ -542,7 +2167,7 @@ msgstr "ID3"
 
 #: ../picard/ui/ui_options_tags.py:109
 msgid "Write ID3v1 tags to the files"
-msgstr ""
+msgstr "Kirjoita ID3v1 tagit tiedostoihin"
 
 #: ../picard/ui/ui_options_tags.py:110
 msgid "Write ID3v2 version 2.3 tags (2.4 is default)"
@@ -550,7 +2175,7 @@ msgstr "Kirjoita ID3v2.3 tagit (ID3v2.4 on oletus)"
 
 #: ../picard/ui/ui_options_tags.py:111
 msgid "Text encoding to use while writing ID3v2 tags:"
-msgstr ""
+msgstr "ID3v2 tageissa käytössä oleva tekstikoodaus:"
 
 #: ../picard/ui/ui_options_tags.py:112
 msgid "ISO-8859-1"
@@ -566,7 +2191,7 @@ msgstr "UTF-8"
 
 #: ../picard/ui/ui_options_tags.py:115
 msgid "Remove ID3 tags from FLAC files"
-msgstr ""
+msgstr "Poista ID3 tagit FLAC tiedostoista"
 
 #: ../picard/ui/ui_options_tags.py:116
 msgid "APE"
@@ -574,386 +2199,371 @@ msgstr "APE"
 
 #: ../picard/ui/ui_options_tags.py:117
 msgid "Remove APEv2 tags from MP3 files"
-msgstr ""
+msgstr "Poista APEv2 tagit MP3 tiedostoista"
 
-#: ../picard/ui/ui_options_cdlookup_win32.py:56 ../picard/ui/ui_cdlookup.py:60
-#: ../picard/ui/ui_options_cdlookup.py:47
-msgid "CD Lookup"
-msgstr "CD haku"
+#: ../picard/ui/ui_tagsfromfilenames.py:56
+msgid "Convert File Names to Tags"
+msgstr "Tagit tiedostonimestä"
 
-#: ../picard/ui/ui_options_cdlookup_win32.py:57
-msgid "Default CD-ROM drive to use for lookups:"
-msgstr "Hakuihin käytettävä CD-ROM asema:"
+#: ../picard/ui/ui_tagsfromfilenames.py:57
+msgid "Replace underscores with spaces"
+msgstr "Korvaa alaviivat välilyönneillä"
 
-#: ../picard/ui/tageditor.py:65 ../picard/ui/ui_options_plugins.py:62
-#: ../picard/ui/multitageditor.py:37
-msgid "Details"
-msgstr "Tiedot"
-
-#: ../picard/ui/tageditor.py:70 ../picard/ui/tageditor.py:241
-#: ../picard/ui/multitageditor.py:42 ../picard/ui/multitageditor.py:197
-#, python-format
-msgid "%d file"
-msgid_plural "%d files"
-msgstr[0] "%d tiedosto"
-msgstr[1] "%d tiedostot"
-
-#: ../picard/ui/tageditor.py:124 ../picard/ui/multitageditor.py:95
-#, python-format
-msgid "(different across %d file)"
-msgid_plural "(different across %d files)"
-msgstr[0] "(%d erilaista)"
-msgstr[1] "(%d erilaista)"
-
-#: ../picard/ui/tageditor.py:127 ../picard/ui/multitageditor.py:98
-#, python-format
-msgid "(missing from %d file)"
-msgid_plural "(missing from %d files)"
-msgstr[0] "(%d puuttuu)"
-msgstr[1] "(%d puuttuu)"
-
-#: ../picard/ui/tageditor.py:210 ../picard/ui/multitageditor.py:166
-msgid "Filename:"
-msgstr "Tiedostonimi:"
-
-#: ../picard/ui/tageditor.py:212 ../picard/ui/multitageditor.py:168
-msgid "Format:"
-msgstr "Formaatti:"
-
-#: ../picard/ui/tageditor.py:221 ../picard/ui/multitageditor.py:177
-msgid "Size:"
-msgstr "Koko:"
-
-#: ../picard/ui/tageditor.py:227 ../picard/ui/multitageditor.py:183
-msgid "Bitrate:"
-msgstr "Bittinopeus:"
-
-#: ../picard/ui/tageditor.py:229 ../picard/ui/multitageditor.py:185
-msgid "Sample rate:"
-msgstr "Äänitaajuus:"
-
-#: ../picard/ui/tageditor.py:231 ../picard/ui/multitageditor.py:187
-msgid "Bits per sample:"
-msgstr "Bittisyvyys:"
-
-#: ../picard/ui/tageditor.py:234 ../picard/ui/multitageditor.py:190
-msgid "Mono"
-msgstr "Mono"
-
-#: ../picard/ui/tageditor.py:235 ../picard/ui/multitageditor.py:191
-msgid "Stereo"
-msgstr "Stereo"
-
-#: ../picard/ui/tageditor.py:237 ../picard/ui/multitageditor.py:193
-msgid "Channels:"
-msgstr "Kanavia:"
-
-#: ../picard/ui/ui_tageditor.py:115 ../picard/ui/ui_multitageditor.py:55
-#: ../picard/ui/ui_options_plugins.py:59 ../picard/ui/options/plugins.py:76
-msgid "Name"
-msgstr "Nimi"
-
-#: ../picard/ui/ui_tageditor.py:116 ../picard/ui/ui_multitageditor.py:56
-msgid "Value"
-msgstr "Arvo"
-
-#: ../picard/ui/ui_tageditor.py:117 ../picard/ui/ui_multitageditor.py:57
-msgid "&Add..."
-msgstr "&Lisää..."
-
-#: ../picard/ui/ui_tageditor.py:118
-msgid "&Edit..."
-msgstr "&Muokkaa..."
-
-#: ../picard/ui/ui_tageditor.py:119
-msgid "&Delete"
-msgstr "&Poista"
-
-#: ../picard/ui/ui_tageditor.py:120
-msgid "&Metadata"
-msgstr "&Metatieto"
-
-#: ../picard/ui/ui_tageditor.py:121
-msgid "A&rtwork"
-msgstr "&Kansikuva"
-
-#: ../picard/ui/ui_tageditor.py:122
-msgid "&Info"
-msgstr "T&iedot"
-
-#: ../picard/ui/coverartbox.py:47
-msgid "Cover Art"
-msgstr "Kansikuva"
-
-#: ../picard/ui/coverartbox.py:95
-msgid "Buy the album on Amazon"
-msgstr "Osta albumi Amazonista"
-
-#: ../picard/ui/ui_puidsubmit.py:52
-msgid "Submit PUIDs"
-msgstr "Lähetä PUID:it"
-
-#: ../picard/ui/ui_puidsubmit.py:53 ../picard/ui/ui_cdlookup.py:62
-msgid "OK"
-msgstr "OK"
-
-#: ../picard/ui/ui_puidsubmit.py:54 ../picard/ui/ui_cdlookup.py:64
-msgid "Cancel"
-msgstr "Peruuta"
-
-#: ../picard/ui/puidsubmit.py:31 ../picard/ui/options/plugins.py:80
-msgid "File"
-msgstr "Tiedosto"
-
-#: ../picard/ui/puidsubmit.py:31
-msgid "PUID"
-msgstr ""
-
-#: ../picard/ui/puidsubmit.py:31
-msgid "Release"
-msgstr ""
-
-#: ../picard/ui/puidsubmit.py:31
-msgid "Release ID"
-msgstr ""
-
-#: ../picard/ui/filebrowser.py:41
-#, fuzzy
-msgid "&Move Tagged Files Here"
-msgstr "Siirrä tie&dostot"
-
-#: ../picard/ui/filebrowser.py:44
-msgid "Show &Hidden Files"
-msgstr ""
-
-#: ../picard/ui/ui_cdlookup.py:61
-msgid "The following releases on MusicBrainz match the CD:"
-msgstr "Seuraavat MusicBrainz julkaisut löytyivät tällä CD:llä"
-
-#: ../picard/ui/ui_cdlookup.py:63
-msgid "    Lookup manually    "
-msgstr "    Hae manuaalisesti    "
-
-#: ../picard/ui/ui_options.py:42
-msgid "Options"
-msgstr "Asetukset"
-
-#: ../picard/ui/tagsfromfilenames.py:52 ../picard/ui/tagsfromfilenames.py:96
-msgid "File Name"
-msgstr ""
-
-#: ../picard/ui/ui_options_cover.py:56
-msgid "Location"
-msgstr "Sijanti"
-
-#: ../picard/ui/ui_options_cover.py:57
-msgid "Embed cover images into tags"
-msgstr "Sijoita kansikuvat sisään tageihin"
-
-#: ../picard/ui/ui_options_cover.py:58
-msgid "Save cover images as separate files"
-msgstr "Tallenna kansikuvat erillisinä tiedostoina"
-
-#: ../picard/ui/ui_options_cover.py:59
-msgid "Overwrite the file if it already exists"
-msgstr "Korvaa jo olemassa oleva tiedosto"
-
-#: ../picard/ui/ui_options_metadata.py:100
-msgid "Metadata"
-msgstr "Metatieto"
-
-#: ../picard/ui/ui_options_metadata.py:101
-msgid "Translate foreign artist names to English where possible"
-msgstr "Käännä ulkomaiset artistien nimet jos mahdollista"
-
-#: ../picard/ui/ui_options_metadata.py:102
-msgid "Use release relationships"
-msgstr "Käytä levyjulkaisu suhteita"
-
-#: ../picard/ui/ui_options_metadata.py:103
-msgid "Use track relationships"
-msgstr "Käytä kappale suhteita"
-
-#: ../picard/ui/ui_options_metadata.py:104
-msgid "Use folksonomy tags as genre"
-msgstr ""
-
-#: ../picard/ui/ui_options_metadata.py:105
-msgid "Preferred release country:"
-msgstr ""
-
-#: ../picard/ui/ui_options_metadata.py:106
-msgid "Custom Fields"
-msgstr "Mukautetut kentät"
-
-#: ../picard/ui/ui_options_metadata.py:107
-msgid "Various artists:"
-msgstr "Sekalaiset artistit:"
-
-#: ../picard/ui/ui_options_metadata.py:108
-msgid "Non-album tracks:"
-msgstr "Albumittomat kappaleet:"
-
-#: ../picard/ui/ui_options_metadata.py:109
-#: ../picard/ui/ui_options_metadata.py:110
-#: ../picard/ui/ui_options_naming.py:168 ../picard/ui/ui_options_naming.py:169
-msgid "Default"
-msgstr "Oletus"
-
-#: ../picard/ui/ui_multitageditor.py:58
-msgid "Delete"
-msgstr ""
-
-#: ../picard/ui/logview.py:29
-msgid "Log"
-msgstr "Loki"
-
-#: ../picard/ui/ui_options_plugins.py:58
-msgid "Plugins"
-msgstr "Laajennukset"
-
-#: ../picard/ui/ui_options_plugins.py:60 ../picard/ui/options/plugins.py:79
-msgid "Author"
-msgstr "Tekijä"
-
-#: ../picard/ui/ui_options_plugins.py:61
-msgid "Version"
-msgstr "Versio"
-
-#: ../picard/ui/ui_options_naming.py:165
-msgid "Rename Files"
-msgstr "Uudelleennimeä tiedostot"
-
-#: ../picard/ui/ui_options_naming.py:166
-msgid "Replace Windows-incompatible characters"
-msgstr "Korvaa Windows-epäyhteensopivat kirjaimet"
-
-#: ../picard/ui/ui_options_naming.py:167
-msgid "Replace non-ASCII characters"
-msgstr ""
-
-#: ../picard/ui/ui_options_naming.py:170 ../picard/ui/options/naming.py:90
-msgid "Multiple artist file naming format:"
-msgstr ""
-
-#: ../picard/ui/ui_options_naming.py:171 ../picard/ui/options/naming.py:86
-msgid "File naming format:"
-msgstr ""
-
-#: ../picard/ui/ui_options_naming.py:172
-msgid "Move Files"
-msgstr ""
-
-#: ../picard/ui/ui_options_naming.py:173
-msgid "Move tagged files to this directory:"
-msgstr ""
-
-#: ../picard/ui/ui_options_naming.py:174
-msgid "Browse..."
-msgstr ""
-
-#: ../picard/ui/ui_options_naming.py:175
-msgid "Move additional files:"
-msgstr ""
-
-#: ../picard/ui/ui_options_naming.py:176
-msgid "Delete empty directories"
-msgstr ""
-
-#: ../picard/ui/ui_options_naming.py:177
-msgid "Example"
-msgstr "Esimerkki"
-
-#: ../picard/ui/ui_options_naming.py:178
-msgid "File name:"
-msgstr ""
-
-#: ../picard/ui/ui_options_naming.py:179
-msgid "Multiple artist file name:"
-msgstr ""
-
-#: ../picard/ui/ui_options_cdlookup.py:48
-msgid "CD-ROM device to use for lookups:"
-msgstr "Hakuihin käytettävä CD-ROM asema:"
-
-#: ../picard/ui/options/scripting.py:84 ../picard/ui/options/naming.py:86
-#: ../picard/ui/options/naming.py:90 ../picard/ui/options/naming.py:93
-#: ../picard/ui/options/naming.py:95
-msgid "Script Error"
-msgstr ""
+#: ../picard/ui/options/about.py:29
+msgid "About"
+msgstr "Tietoja"
 
 #. Replace this with your name to have it appear in the "About" dialog.
 #: ../picard/ui/options/about.py:48
 msgid "translator-credits"
 msgstr ""
 "Launchpad Contributions:\n"
-"  Mika Heiska <https://launchpad.net/~kilu>\n"
-"\n"
-"Launchpad Contributions:\n"
-"  Jukka Kolehmainen https://launchpad.net/~jukka-kolehmainen\n"
 "  Mika Heiska https://launchpad.net/~kilu\n"
-"\n"
-"Launchpad Contributions:\n"
 "  Jukka Kolehmainen https://launchpad.net/~jukka-kolehmainen\n"
-"  Mika Heiska https://launchpad.net/~kilu\n"
-"\n"
-"Launchpad Contributions:\n"
-"  Jukka Kolehmainen https://launchpad.net/~jukka-kolehmainen\n"
-"  Lukáš Lalinský https://launchpad.net/~luks\n"
-"  Mika Heiska https://launchpad.net/~kilu\n"
-"\n"
-"Launchpad Contributions:\n"
 "  Juhana Uuttu https://launchpad.net/~rexroom\n"
-"  Jukka Kolehmainen https://launchpad.net/~jukka-kolehmainen\n"
-"  Lukáš Lalinský https://launchpad.net/~luks\n"
-"  Mika Heiska https://launchpad.net/~kilu"
+"  Juha Ekholm https://launchpad.net/~juhae"
 
 #. Replace LANG with language you are translatig to.
 #: ../picard/ui/options/about.py:51
 #, python-format
 msgid "<br/>Translated to LANG by %s"
-msgstr ""
+msgstr "<br/>Suomenkielisen käännöksen teki %s"
 
 #: ../picard/ui/options/about.py:55
-#, python-format
+#, fuzzy, python-format
 msgid ""
-"<p align=\"center\"><span style=\"font-size:15px;font-weight:bold;"
-"\">MusicBrainz Picard</span><br/>\n"
+"<p align=\"center\"><span style=\"font-size:15px;font-weight:bold;\">MusicBrainz Picard</span><br/>\n"
 "Version %(version)s</p>\n"
 "<p align=\"center\"><strong>Supported formats</strong><br/>%(formats)s</p>\n"
 "<p align=\"center\"><strong>Please donate</strong><br/>\n"
-"Thank you for using Picard. Picard relies on the MusicBrainz database, which "
-"is operated by the MetaBrainz Foundation with the help of thousands of "
-"volunteers. If you like this application please consider donating to the "
-"MetaBrainz Foundation to keep the service running.</p>\n"
-"<p align=\"center\"><a href=\"http://metabrainz.org/donate/index.html"
-"\">Donate now!</a></p>\n"
+"Thank you for using Picard. Picard relies on the MusicBrainz database, which is operated by the MetaBrainz Foundation with the help of thousands of volunteers. If you like this application please consider donating to the MetaBrainz Foundation to keep the service running.</p>\n"
+"<p align=\"center\"><a href=\"http://metabrainz.org/donate/index.html\">Donate now!</a></p>\n"
 "<p align=\"center\"><strong>Credits</strong><br/>\n"
-"<small>Copyright © 2004-2008 Robert Kaye, Lukáš Lalinský and others%"
-"(translator-credits)s</small></p>\n"
-"<p align=\"center\"><a href=\"http://musicbrainz.org/doc/PicardTagger"
-"\">http://musicbrainz.org/doc/PicardTagger</a></p>\n"
+"<small>Copyright © 2004-2008 Robert Kaye, Lukáš Lalinský and others%(translator-credits)s</small></p>\n"
+"<p align=\"center\"><a href=\"http://musicbrainz.org/doc/PicardTagger\">http://musicbrainz.org/doc/PicardTagger</a></p>\n"
 msgstr ""
+"<p align=\"center\"><span style=\"font-size:15px;font-weight:bold;\">MusicBrainz Picard</span><br/>\n"
+"Versio %(version)s</p>\n"
+"<p align=\"center\"><strong>Tuetut tiedostomuodot</strong><br/>%(formats)s</p>\n"
+"<p align=\"center\"><strong>Lahjoita ole hyvä</strong><br/>\n"
+"Kiitos kun käytät Picardia. Picard on riippuvainen MusicBrainzin tietopankista, jota ylläpitää MetaBrainz-säätiö tuhansien vapaaehtoisten avustuksella. Jos pidät tästä ohjelmasta, harkitse lahjoituksen tekemistä MetaBrainz-säätiölle, jotta voimme jatkaa palvelua.</p>\n"
+"<p align=\"center\"><a href=\"http://metabrainz.org/donate/index.html\">Lahjoita nyt!</a></p>\n"
+"<p align=\"center\"><strong>Tekijät</strong><br/>\n"
+"<small>Tekijänoikeus © 2004-2008 Robert Kaye, Lukáš Lalinský ja muut%(translator-credits)s</small></p>\n"
+"<p align=\"center\"><a href=\"http://musicbrainz.org/doc/PicardTagger\">http://musicbrainz.org/doc/PicardTagger</a></p>\n"
+
+#: ../picard/ui/options/advanced.py:26
+msgid "Advanced"
+msgstr "Lisäasetukset"
+
+#: ../picard/ui/options/interface.py:31
+#, fuzzy
+msgid "User Interface"
+msgstr "Käyttäjätunnus:"
+
+#: ../picard/ui/options/interface.py:47
+msgid "System default"
+msgstr "Järjestelmän oletus"
+
+#: ../picard/ui/options/interface.py:71
+#, fuzzy
+msgid "Language changed"
+msgstr "Kieli"
+
+#: ../picard/ui/options/interface.py:71
+msgid "You have changed the interface language. You have to restart Picard in order for the change to take effect."
+msgstr ""
+
+#: ../picard/ui/options/matching.py:29
+msgid "Matching"
+msgstr ""
+
+#: ../picard/ui/options/metadata.py:52
+msgid "None"
+msgstr ""
+
+#: ../picard/ui/options/naming.py:33
+#, fuzzy
+msgid "File Naming"
+msgstr "Tiedostonimi"
+
+#: ../picard/ui/options/naming.py:86
+#: ../picard/ui/options/naming.py:90
+#: ../picard/ui/options/naming.py:93
+#: ../picard/ui/options/naming.py:95
+#: ../picard/ui/options/scripting.py:84
+msgid "Script Error"
+msgstr "Skripti virhe"
 
 #: ../picard/ui/options/naming.py:93
 msgid "The file naming format must not be empty."
-msgstr ""
+msgstr "Uudelleennimeämis formaatti ei saa olla tyhjä."
 
 #: ../picard/ui/options/naming.py:95
 msgid "The multiple artist file naming format must not be empty."
-msgstr ""
+msgstr "Usean artistin uudelleennimeämis formaatti ei saa olla tyhjä."
 
 #: ../picard/ui/options/naming.py:97
 msgid "Error"
-msgstr ""
+msgstr "Virhe"
 
 #: ../picard/ui/options/naming.py:97
 msgid "The location to move files to must not be empty."
+msgstr "Tiedostojen siirto sijainti ei saa olla tyhjä."
+
+#: ../picard/ui/options/scripting.py:63
+msgid "Scripting"
 msgstr ""
 
+#: ../picard/ui/options/tags.py:29
+msgid "Tags"
+msgstr "Tagit"
+
+#: ../picard/util/tags.py:24
+#, fuzzy
+msgid "Date"
+msgstr "Päiväys:"
+
+#: ../picard/util/tags.py:25
+#, fuzzy
+msgid "Album Artist"
+msgstr "Artisti"
+
+#: ../picard/util/tags.py:26
+#, fuzzy
+msgid "Track Number"
+msgstr "Kappale nro"
+
+#: ../picard/util/tags.py:27
+#, fuzzy
+msgid "Total Tracks"
+msgstr "Albumittomat kappaleet:"
+
+#: ../picard/util/tags.py:28
+#, fuzzy
+msgid "Disc Number"
+msgstr "Kappaleen numero"
+
+#: ../picard/util/tags.py:29
+msgid "Total Discs"
+msgstr ""
+
+#: ../picard/util/tags.py:30
+#, fuzzy
+msgid "Album Artist Sort Order"
+msgstr "Albumi artistin lajittelu nimi"
+
+#: ../picard/util/tags.py:31
+msgid "Artist Sort Order"
+msgstr ""
+
+#: ../picard/util/tags.py:32
+msgid "Title Sort Order"
+msgstr ""
+
+#: ../picard/util/tags.py:33
+#, fuzzy
+msgid "Album Sort Order"
+msgstr "Ryhmitetyt albumit"
+
+#: ../picard/util/tags.py:34
+msgid "ASIN"
+msgstr "ASIN"
+
+#: ../picard/util/tags.py:35
+msgid "Grouping"
+msgstr "Ryhmittely"
+
+#: ../picard/util/tags.py:37
+msgid "ISRC"
+msgstr "ISRC"
+
+#: ../picard/util/tags.py:38
+msgid "Mood"
+msgstr "Mieliala"
+
+#: ../picard/util/tags.py:39
+msgid "BPM"
+msgstr ""
+
+#: ../picard/util/tags.py:40
+#, fuzzy
+msgid "Copyright"
+msgstr "Kopioi"
+
+#: ../picard/util/tags.py:41
+#, fuzzy
+msgid "Composer"
+msgstr "Sulje"
+
+#: ../picard/util/tags.py:42
+msgid "Conductor"
+msgstr "Kapellimestari"
+
+#: ../picard/util/tags.py:43
+msgid "Lyricist"
+msgstr "Sanoittaja"
+
+#: ../picard/util/tags.py:44
+msgid "Arranger"
+msgstr "Sovittaja"
+
+#: ../picard/util/tags.py:45
+msgid "Producer"
+msgstr "Tuottaja"
+
+#: ../picard/util/tags.py:46
+msgid "Engineer"
+msgstr "Insinööri"
+
+#: ../picard/util/tags.py:47
+msgid "Subtitle"
+msgstr "Alaotsikko"
+
+#: ../picard/util/tags.py:48
+#, fuzzy
+msgid "Disc Subtitle"
+msgstr "Alaotsikko"
+
+#: ../picard/util/tags.py:49
+msgid "Remixer"
+msgstr "Remiksaaja"
+
+#: ../picard/util/tags.py:50
+#, fuzzy
+msgid "MusicBrainz Track Id"
+msgstr "MusicBrainz Picard"
+
+#: ../picard/util/tags.py:51
+#, fuzzy
+msgid "MusicBrainz Release Id"
+msgstr "MusicBrainz Picard"
+
+#: ../picard/util/tags.py:52
+#, fuzzy
+msgid "MusicBrainz Artist Id"
+msgstr "MusicBrainz Picard"
+
+#: ../picard/util/tags.py:53
+#, fuzzy
+msgid "MusicBrainz Release Artist Id"
+msgstr "MusicBrainz Picard"
+
+#: ../picard/util/tags.py:54
+#, fuzzy
+msgid "MusicBrainz TRM Id"
+msgstr "MusicBrainz Picard"
+
+#: ../picard/util/tags.py:55
+#, fuzzy
+msgid "MusicBrainz Disc Id"
+msgstr "MusicBrainz Picard"
+
+#: ../picard/util/tags.py:56
+#, fuzzy
+msgid "MusicBrainz Sort Name"
+msgstr "MusicBrainz-palvelin"
+
+#: ../picard/util/tags.py:57
+msgid "MusicIP PUID"
+msgstr "MusicIP PUID"
+
+#: ../picard/util/tags.py:58
+#, fuzzy
+msgid "MusicIP Fingerprint"
+msgstr "Audio sormenjälki"
+
+#: ../picard/util/tags.py:59
+msgid "Disc Id"
+msgstr ""
+
+#: ../picard/util/tags.py:60
+msgid "Website"
+msgstr "Verkkosivu"
+
+#: ../picard/util/tags.py:61
+msgid "Compilation"
+msgstr "Kokoelmalevy"
+
+#: ../picard/util/tags.py:62
+msgid "Comment"
+msgstr "Kommentti"
+
+#: ../picard/util/tags.py:63
+#, fuzzy
+msgid "Genre"
+msgstr "Yleiset"
+
+#: ../picard/util/tags.py:64
+msgid "Encoded By"
+msgstr ""
+
+#: ../picard/util/tags.py:65
+msgid "Performer"
+msgstr "Esiintyjä"
+
+#: ../picard/util/tags.py:66
+#, fuzzy
+msgid "Release Type"
+msgstr "Julkaisun päivä"
+
+#: ../picard/util/tags.py:67
+#, fuzzy
+msgid "Release Status"
+msgstr "Julkaisun päivä"
+
+#: ../picard/util/tags.py:68
+#, fuzzy
+msgid "Release Country"
+msgstr "Julkaisun päivä"
+
+#: ../picard/util/tags.py:69
+msgid "Record Label"
+msgstr "Levymerkki"
+
+#: ../picard/util/tags.py:70
+msgid "Barcode"
+msgstr "Viivakoodi"
+
+#: ../picard/util/tags.py:71
+#, fuzzy
+msgid "Catalog Number"
+msgstr "Kappaleen numero"
+
+#: ../picard/util/tags.py:72
+#, fuzzy
+msgid "Format"
+msgstr "Tiedostomuoto:"
+
+#: ../picard/util/tags.py:73
+msgid "DJ-Mixer"
+msgstr "DJ-miksaaja"
+
+#: ../picard/util/tags.py:74
+#, fuzzy
+msgid "Media"
+msgstr "Metadata"
+
+#: ../picard/util/tags.py:75
+msgid "Lyrics"
+msgstr "Sanoitukset"
+
+#: ../picard/util/tags.py:76
+msgid "Mixer"
+msgstr "Miksaaja"
+
+#: ../picard/util/tags.py:77
+msgid "Language"
+msgstr "Kieli"
+
+#: ../picard/util/tags.py:78
+#, fuzzy
+msgid "Script"
+msgstr "Skripti virhe"
+
 #: ../picard/util/webbrowser2.py:84
 msgid "Web Browser Error"
-msgstr ""
+msgstr "Nettiselain virhe"
 
 #: ../picard/util/webbrowser2.py:84
 #, python-format
@@ -962,193 +2572,73 @@ msgid ""
 "\n"
 "%s"
 msgstr ""
-
-#~ msgid "No matching tracks for file %s"
-#~ msgstr "Ei kappaletietoja tiedostolle %s"
-
-#~ msgid "File %s identified!"
-#~ msgstr "Tiedosto %s tunnistettu!"
-
-#~ msgid "Looking up the PUID for file %s..."
-#~ msgstr "Etsii PUIDia tiedostolle %s..."
-
-#~ msgid "Looking up the metadata for file %s..."
-#~ msgstr "Etsii metatietoa tiedostolle %s..."
-
-#~ msgid "No matching releases for cluster %s"
-#~ msgstr "Ryhmälle %s ei löydy levyjulkaisua"
-
-#~ msgid "Cluster %s identified!"
-#~ msgstr "Ryhmä %s tunnistettu!"
-
-#~ msgid "Looking up the metadata for cluster %s..."
-#~ msgstr "Etsii metatietoa ryhmälle %s..."
-
-#~ msgid "M3U Playlist (*.m3u)"
-#~ msgstr "M3U soittolista (*.m3u)"
-
-#~ msgid "PLS Playlist (*.pls)"
-#~ msgstr "PLS soittolista (*.pls)"
-
-#~ msgid "XSPF Playlist (*.xspf)"
-#~ msgstr "XSPF soittolista (*.xspf)"
-
-#~ msgid "Submitting PUIDs..."
-#~ msgstr "Lähettää PUIDeja..."
-
-#~ msgid "PUIDs submission failed: %s"
-#~ msgstr "PUIDien lähetys epäonnistui: %s"
-
-#~ msgid "PUIDs successfully submitted!"
-#~ msgstr "PUIDien lähetys onnistui!"
+"Virhe nettiselainta käynnistäessä:\n"
+"\n"
+"%s"
 
 #~ msgid "New Version"
 #~ msgstr "Uusi versio"
-
 #~ msgid ""
 #~ "New version of Picard is available (%s). Would you like to download it "
 #~ "now?"
 #~ msgstr ""
 #~ "Picardista on uusi, %s versio saatavilla. Haluaisitko ladata sen nyt?"
+#~ msgid "Delete"
+#~ msgstr "Poista"
+#~ msgid "Maximal number of tags:"
+#~ msgstr "Tagien maximi määrä:"
 
-#~ msgid "Couldn't find PUID for file %s"
-#~ msgstr "Tiedostolle %s ei löytynyt PUIDia"
-
-#~ msgid "Creating fingerprint for file %s..."
-#~ msgstr "Luodaan sormenjälki tiedostolle %s..."
-
-#~ msgid "Length"
-#~ msgstr "Kesto"
-
-#~ msgid "&Ok"
-#~ msgstr "&OK"
-
-#~ msgid "About"
-#~ msgstr "Tietoja"
-
-#~ msgid "Advanced"
-#~ msgstr "Lisäasetukset"
-
-#~ msgid "Tags"
-#~ msgstr "Tagit"
-
-#~ msgid "ASIN"
-#~ msgstr "ASIN"
-
-#~ msgid "Grouping"
-#~ msgstr "Ryhmittely"
-
-#~ msgid "ISRC"
-#~ msgstr "ISRC"
-
-#~ msgid "Mood"
-#~ msgstr "Mieliala"
-
-#~ msgid "Conductor"
-#~ msgstr "Kapellimestari"
-
-#~ msgid "Lyricist"
-#~ msgstr "Sanoittaja"
-
-#~ msgid "Arranger"
-#~ msgstr "Sovittaja"
-
-#~ msgid "Producer"
-#~ msgstr "Tuottaja"
-
-#~ msgid "Engineer"
-#~ msgstr "Insinööri"
-
-#~ msgid "Subtitle"
-#~ msgstr "Alaotsikko"
-
-#~ msgid "Remixer"
-#~ msgstr "Remiksaaja"
-
-#~ msgid "MusicIP PUID"
-#~ msgstr "MusicIP PUID"
-
-#~ msgid "Website"
-#~ msgstr "Verkkosivu"
-
-#~ msgid "Compilation"
-#~ msgstr "Kokoelmalevy"
-
-#~ msgid "Comment"
-#~ msgstr "Kommentti"
-
-#~ msgid "Performer"
-#~ msgstr "Esiintyjä"
-
-#~ msgid "Record Label"
-#~ msgstr "Levymerkki"
-
-#~ msgid "Barcode"
-#~ msgstr "Viivakoodi"
-
-#~ msgid "DJ-Mixer"
-#~ msgstr "DJ-miksaaja"
-
-#~ msgid "Lyrics"
-#~ msgstr "Sanoitukset"
-
-#~ msgid "Mixer"
-#~ msgstr "Miksaaja"
-
+#, fuzzy
+#~ msgid "Anal&yze"
+#~ msgstr "Analysoi"
 #~ msgid "Ctrl+T"
 #~ msgstr "Ctrl+T"
 
+#, fuzzy
+#~ msgid "Generate &Cuesheet..."
+#~ msgstr "Luo &soittolista..."
 #~ msgid "Automatically analyze all new files"
 #~ msgstr "Analysoi kaikki uudet tiedostot"
 
+#, fuzzy
+#~ msgid "Album artist:"
+#~ msgstr "Artisti:"
+
+#, fuzzy
+#~ msgid "A&dd Directory..."
+#~ msgstr "Lisää &kansio...\tCtrl+D"
 #~ msgid "Are You Sure?"
 #~ msgstr "Oletko varma?"
-
 #~ msgid "Add &Files...\tCtrl+O"
 #~ msgstr "Lisää &tiedostoja...\tCtrl+O"
-
 #~ msgid "Add &Directory...\tCtrl+D"
 #~ msgstr "Lisää &kansio...\tCtrl+D"
-
 #~ msgid "&Save Files\tCtrl+S"
 #~ msgstr "Ta&llenna tiedostot\tCtrl+S"
-
 #~ msgid "C&opy\tCtrl+C"
 #~ msgstr "K&opioi\tCtrl+C"
-
 #~ msgid "Help"
 #~ msgstr "Ohje"
-
 #~ msgid "Preferences"
 #~ msgstr "Asetukset"
-
 #~ msgid "Error while saving cuesheet %s."
 #~ msgstr "Virhe tallentaessa cuesheetia %s."
-
 #~ msgid "Cuesheet %s saved."
 #~ msgstr "Cuesheet %s tallennettu."
-
 #~ msgid "Time"
 #~ msgstr "Aika"
-
 #~ msgid "Albums"
 #~ msgstr "Albumit"
-
 #~ msgid "Force Save"
 #~ msgstr "Pakko tallennus"
-
 #~ msgid "Buy"
 #~ msgstr "Osta"
-
 #~ msgid "Welcome to Picard!"
 #~ msgstr "Tervetuloa Picardiin!"
-
 #~ msgid "Track Num"
 #~ msgstr "Kappale nro"
-
 #~ msgid "PUID Collision"
 #~ msgstr "PUID törmäys"
-
 #~ msgid ""
 #~ "Version %s\n"
 #~ "\n"
@@ -1175,121 +2665,84 @@ msgstr ""
 #~ "Helix Communityn apuraha.\n"
 #~ "\n"
 #~ "Tuetut tiedostomuodot: %s"
-
-#~ msgid "Colors"
-#~ msgstr "Värit"
-
 #~ msgid "Font color"
 #~ msgstr "Tekstin väri"
-
 #~ msgid "Directories"
 #~ msgstr "Kansiot"
-
 #~ msgid "Watch for new files"
 #~ msgstr "Seuraa uusien tiedostojen varalta"
-
 #~ msgid "Watch this directory for new audio files"
 #~ msgstr "Seuraa tätä kansiota uusien audio tiedostojen varalta"
-
 #~ msgid "Encodings"
 #~ msgstr "Merkistöt"
-
 #~ msgid "all languages"
 #~ msgstr "kaikki kielet"
-
 #~ msgid "percent similar."
 #~ msgstr "prosenttisesti samankaltainen."
-
 #~ msgid "Load recently used albums on startup"
 #~ msgstr "Lataa viimeksi käytetyt albumit käynnistäessä"
-
-#~ msgid "Language"
-#~ msgstr "Kieli"
-
-#~ msgid "System default"
-#~ msgstr "Järjestelmän oletus"
-
 #~ msgid "Allowed filename characters"
 #~ msgstr "Sallitut merkit tiedostonimelle"
-
 #~ msgid "Use Windows-safe file names"
 #~ msgstr "Käytä Windows-varmoja tiedostonimiä"
-
 #~ msgid "Number of tracks on the album"
 #~ msgstr "Albumissa olevien kappaleiden määrä"
-
 #~ msgid "Track name"
 #~ msgstr "Kappaleen nimi"
-
 #~ msgid "Zero padded track number"
 #~ msgstr "Nollalla alkava kappalenumero"
-
 #~ msgid "File format (e.g. mp3, ogg, wav)"
 #~ msgstr "Tiedosto muoto (esim. mp3, ogg, wav)"
-
 #~ msgid "Album type (album, single, EP, etc.)"
 #~ msgstr "Albumin tyyppi (esim. album, single, EP)"
-
 #~ msgid "Album Status (official, promo, etc.)"
 #~ msgstr "Albumin status (esim. official, promo)"
-
 #~ msgid "Album release month"
 #~ msgstr "Albumin julkaisu kuukausi"
-
 #~ msgid "Album release day"
 #~ msgstr "Albumin julkaisu päivä"
-
 #~ msgid "Album release year"
 #~ msgstr "Albumin julkaisu vuosi"
-
 #~ msgid "Make it so!"
 #~ msgstr "Make it so!"
-
 #~ msgid "Use proxy server to access the Internet"
 #~ msgstr "Käytä välityspalvelinta päästäksesi Internettiin"
-
 #~ msgid "Proxy server to use"
 #~ msgstr "Käytettävä välityspalvelin"
-
 #~ msgid "Proxy port"
 #~ msgstr "Välityspalvelimen portti"
-
 #~ msgid "ID3v2.4 only"
 #~ msgstr "Vain ID3v2.4"
-
 #~ msgid "Save track/album"
 #~ msgstr "Tallenna kappale/albumi"
-
 #~ msgid "Artists"
 #~ msgstr "Artistit"
 
+#, fuzzy
+#~ msgid "Auto Tag"
+#~ msgstr "Muokkaa tagia"
+
+#, fuzzy
+#~ msgid "Edit &Tags..."
+#~ msgstr "Muokkaa tagia"
 #~ msgid "New files (drag files to tag here)"
 #~ msgstr "Uudet tiedostot (vedä tiedostot tänne)"
-
 #~ msgid "updating album information"
 #~ msgstr "päivittää albumin tietoja"
-
 #~ msgid "Submitting PUID information to MusicBrainz server ..."
 #~ msgstr "Lähettää PUID tietoja MusicBrainzin palvelimelle..."
-
 #~ msgid "Performing a PUID lookup on file %s ..."
 #~ msgstr "Suorittaa PUID hakua tiedostolle %s..."
-
 #~ msgid "Are you sure you want to exit the application?"
 #~ msgstr "Oletko varma että haluat poistua Picardista?"
-
 #~ msgid "CD Lookup error -- is there a CD in the CD-ROM drive?"
 #~ msgstr "CD haku virhe -- onko asemassa cd:tä?"
-
 #~ msgid "CD Lookup Failed"
 #~ msgstr "CD haku epäonnistui"
-
 #~ msgid "&Quick Start Guide"
 #~ msgstr "&Pikaopas"
-
 #~ msgid "Quick Start Guide"
 #~ msgstr "Pikaopas"
-
 #~ msgid ""
 #~ "You have not specified an username and password. In order to contribute "
 #~ "data to MusicBrainz, you must have a MusicBrainz account.\n"
@@ -1301,13 +2754,10 @@ msgstr ""
 #~ "MusicBrainziin, tarvitset MusicBrainz tilin.\n"
 #~ "Haluatko tehdä tilin nyt? Jos sinulla on jo tili, ole hyvä ja lisää "
 #~ "käyttäjätietosi asetuksiin. "
-
 #~ msgid "Couldn't connect to the MusicBrainz server."
 #~ msgstr "Yhteyttä MusicBrainz palvelimeen ei voitu muodostaa."
-
 #~ msgid "Connection error"
 #~ msgstr "Yhteysvirhe"
-
 #~ msgid ""
 #~ "MusicBrainz Picard requires wxPython with UNICODE support.\n"
 #~ "Please download the appropriate toolkit from http://www.wxpython.org/"
@@ -1315,16 +2765,12 @@ msgstr ""
 #~ "MusicBrainz Picard tarvitsee wxPythonin jossa on UNICODE tuki.\n"
 #~ "Ole hyvä ja lataa kyseinen työkalupakki osoitteesta http://www.wxpython."
 #~ "org"
-
 #~ msgid "Unicode Required"
 #~ msgstr "Vaatii unicoden"
-
 #~ msgid "PUID collision on file %s!"
 #~ msgstr "PUID törmäys tiedostossa %s!"
-
 #~ msgid "Save error"
 #~ msgstr "Tallennusvirhe"
-
 #~ msgid ""
 #~ "The move files option is enabled, but the destination directory is not "
 #~ "specified or invalid.\n"
@@ -1334,7 +2780,6 @@ msgstr ""
 #~ "Tiedostoja ei voitu siirtää koska kohde kansiota ei ole valittu tai sitä "
 #~ "ei ole.\n"
 #~ "Valitse kohde kansio ja yritä uudelleen."
-
 #~ msgid ""
 #~ "Not all files could be saved. Please check for and examine tracks that "
 #~ "have an error icon in front of them. To retry saving the track, right "
@@ -1343,150 +2788,64 @@ msgstr ""
 #~ "Kaikkia tiedostoja ei voitu tallentaa. Tarkista kappaleet joiden edessä "
 #~ "on virhe ikoni. Koittaaksesi uudelleen, näpäytä hiiren oikealla napilla "
 #~ "kappaletta ja valitse 'Poista Virhe'."
-
 #~ msgid "Select directory that contains music files"
 #~ msgstr "Valitse kansio jossa on audio tiedostoja"
-
 #~ msgid "Reload album from main server"
 #~ msgstr "Lataa albumi uudelleen pääpalvelimelta"
-
 #~ msgid "Select or drag a folder from below"
 #~ msgstr "Valitse tai vedä kansio alapuolelta"
-
 #~ msgid "Drag files from below"
 #~ msgstr "Vedä tiedostot alapuolelta"
-
 #~ msgid "Release date"
 #~ msgstr "Julkaisun päivä"
-
 #~ msgid "%d%% similar"
 #~ msgstr "Samankaltaisuus %d%%"
-
 #~ msgid "Please donate to MusicBrainz!"
 #~ msgstr "Ole hyvä ja lahjoita MusicBrainzille!"
-
-#~ msgid "Later"
-#~ msgstr "Myöhemmin"
-
 #~ msgid ""
 #~ "The destination directory %s does not exist. Please pick a valid "
 #~ "directory."
 #~ msgstr "%s kansiota ei ole olemassa. Valitse uusi kansio."
-
 #~ msgid "Select the encoding to use when reading and writing filenames"
 #~ msgstr ""
 #~ "Valitse merkistö jota käytetään tiedostonimiä lukiessa ja kirjoittaessa"
-
 #~ msgid "Automatically move clusters to albums that are at least"
 #~ msgstr "Siirrä ryhmät albumeihin jos osuma on vähintään"
-
 #~ msgid "Automatically save recognized tracks that are at least"
 #~ msgstr "Tallenna tunnistetut kappaleet jos osuma on vähintään"
-
-#~ msgid "Czech"
-#~ msgstr "Tsekki"
-
-#~ msgid "German"
-#~ msgstr "Saksa"
-
-#~ msgid "English"
-#~ msgstr "Englanti"
-
-#~ msgid "English (UK)"
-#~ msgstr "Englanti (UK)"
-
-#~ msgid "Spanish"
-#~ msgstr "Espanja"
-
-#~ msgid "Finnish"
-#~ msgstr "Suomi"
-
-#~ msgid "French"
-#~ msgstr "Ranska"
-
-#~ msgid "Hungarian"
-#~ msgstr "Unkari"
-
-#~ msgid "Icelandic"
-#~ msgstr "Islanti"
-
-#~ msgid "Italian"
-#~ msgstr "Italia"
-
-#~ msgid "Korean"
-#~ msgstr "Korea"
-
-#~ msgid "Lithuanian"
-#~ msgstr "Liettua"
-
-#~ msgid "Dutch"
-#~ msgstr "Hollanti"
-
-#~ msgid "Norwegian Bokmal"
-#~ msgstr "Norja (bokmål)"
-
-#~ msgid "Portuguese"
-#~ msgstr "Portugali"
-
-#~ msgid "Romanian"
-#~ msgstr "Romania"
-
-#~ msgid "Russian"
-#~ msgstr "Venäjä"
-
-#~ msgid "Slovak"
-#~ msgstr "Slovakia"
-
-#~ msgid "Swedish"
-#~ msgstr "Ruotsi"
-
 #~ msgid ""
 #~ "Note: This setting will take effect after you restart the application."
 #~ msgstr ""
 #~ "Huom: Asetus tulee voimaan ohjelman uudelleen käynnistämisen jälkeen."
-
 #~ msgid "Artist translation"
 #~ msgstr "Artistin nimen käännös"
-
 #~ msgid "Rename files when writing metadata tags"
 #~ msgstr "Nimeä tiedostot tageja kirjoitettaessa"
-
 #~ msgid "Naming Help"
 #~ msgstr "Ohje"
-
 #~ msgid ""
 #~ "You may use the following variables in the filenaming\n"
 #~ "specifications in the options dialog:"
 #~ msgstr "Voit käyttää seuraavia muuttujia tiedostojen nimeämiseen:"
-
 #~ msgid "A %s in the naming specification will create a new subfolder."
 #~ msgstr "%s luo uuden alihakemiston."
-
 #~ msgid "Audio fingerprinting options"
 #~ msgstr "Audio sormenjälki asetukset"
-
 #~ msgid "Automatically select PUID collision tracks that are at least"
 #~ msgstr "Valitse PUID törmäys kappaleet jos osuma on vähintään"
-
 #~ msgid "Write ID3v1 tags to MP3 files (ID3v2 tags will always be written)"
 #~ msgstr ""
 #~ "Kirjoita ID3v1 tagit mp3 tiedostoihin (ID3v2 tagit kirjoitetaan aina)"
-
 #~ msgid "Remove track/album"
 #~ msgstr "Poista kappale/albumi"
-
 #~ msgid "Listen to track"
 #~ msgstr "Kuuntele kappale"
-
 #~ msgid "Album clusters"
 #~ msgstr "Ryhmitetyt albumit"
-
 #~ msgid "Unmatched files for this album"
 #~ msgstr "Osumattomat albumin tiedostot"
-
 #~ msgid "%d of %d tracks linked"
 #~ msgstr "%d kappaletta joista %d yhdistetty"
-
 #~ msgid ""
 #~ "The Picard Tagger is a free application and you may\n"
 #~ "use it as long as you wish. However, providing\n"
@@ -1505,82 +2864,57 @@ msgstr ""
 #~ "alla MusicBrainz projekti toimii. Kaikki lahjoitukset ovat\n"
 #~ "vero vähennettäviä USA:n kansalaisille ja tulevat\n"
 #~ "pitämään tämän palvelun elossa ja matkalla eteenpäin."
-
 #~ msgid "Matched track highlighting"
 #~ msgstr "Kappaleiden korostusvärit"
-
 #~ msgid "Good match background color"
 #~ msgstr "Hyvän osuman taustaväri"
-
 #~ msgid "Bad match background color"
 #~ msgstr "Epävarman osuman taustaväri"
-
 #~ msgid "Move files option"
 #~ msgstr "Tiedostojen siirto asetukset"
-
 #~ msgid "When matching tracks to albums, accept tracks that are at least"
 #~ msgstr ""
 #~ "Verrattaessa kappaleita albumeihin, hyväksy osuma jos se on vähintään"
-
 #~ msgid "CD-ROM drive path to use for lookups"
 #~ msgstr "Hakuihin käytettävän CD-ROM aseman polku"
-
 #~ msgid "Launch MB Tagger automatically for inserted Audio CDs"
 #~ msgstr "Käynnistä Picard automaattisesti audio CD:eille"
-
 #~ msgid ""
 #~ "Failed to set the proper registy values to enable launching the tagger "
 #~ "after CD insertion. "
 #~ msgstr "Asetuksen kirjoittaminen rekisteriin epäonnistui. "
-
 #~ msgid "Default CD setting failed"
 #~ msgstr "Oletus CD asetukset pettivät"
-
 #~ msgid "File format naming specification"
 #~ msgstr "Tiedoston nimeämis asetukset"
-
 #~ msgid "Various artist file format naming specification"
 #~ msgstr "Sekalaiset artistit nimeämis asetukset"
-
 #~ msgid "Note: Leave blank to allow all possible characters"
 #~ msgstr "Huom: Jätä tyhjäksi salliaksesi kaikki mahdolliset merkit"
-
 #~ msgid "Track artist name"
 #~ msgstr "Kappale artistin nimi"
-
 #~ msgid "Track artist sortname"
 #~ msgstr "Kappale artistin lajittelu nimi"
-
 #~ msgid "The first character of the artist sortname"
 #~ msgstr "Lajittelu nimen ensimmäinen merkki"
-
 #~ msgid "The first two characters of the artist sortname"
 #~ msgstr "Lajittelu nimen kaksi ensimmäistä merkkiä"
-
 #~ msgid "The first three characters of the artist sortname"
 #~ msgstr "Lajittelu nimen kolme ensimmäistä merkkiä"
-
 #~ msgid "Naming specification help"
 #~ msgstr "Nimeämis asetusten ohje"
-
 #~ msgid "Accept PUID matches that are at least"
 #~ msgstr "Hyväksy PUID osumat jos osuma on vähintään"
-
 #~ msgid "Various artist name"
 #~ msgstr "Sekalaiset artistit nimi"
-
 #~ msgid "Open file"
 #~ msgstr "Lisää tiedosto"
-
 #~ msgid "Open directory"
 #~ msgstr "Lisää kansio"
-
 #~ msgid "Edit options"
 #~ msgstr "Asetukset"
-
 #~ msgid "Exit"
 #~ msgstr "Poistu"
-
 #~ msgid ""
 #~ "The MusicBrainz Tagger requires wx.Widgets with UNICODE support.\n"
 #~ "Please download the appropriate toolkit from  http://www.wxwidgets.com"
@@ -1589,5 +2923,9 @@ msgstr ""
 #~ "Ole hyvä ja lataa kyseinen työkalupakki osoitteesta http://www.wxwidgets."
 #~ "org"
 
+#, fuzzy
+#~ msgid "Unicode required"
+#~ msgstr "Vaatii unicoden"
 #~ msgid "Sorry, there is no help file yet."
 #~ msgstr "Sori, ohje tiedostoa ei vielä ole."
+
diff --git a/po/fr.po b/po/fr.po
index 12294cd58..cf4e101bc 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -9,36 +9,1323 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Picard VERSION\n"
 "Report-Msgid-Bugs-To: http://bugs.musicbrainz.org/\n"
-"POT-Creation-Date: 2008-12-01 18:20+0100\n"
-"PO-Revision-Date: 2008-11-25 12:33+0000\n"
-"Last-Translator: Pierre Rudloff <tael67@gmail.com>\n"
+"POT-Creation-Date: 2009-01-25 12:23+0100\n"
+"PO-Revision-Date: 2009-01-25 13:17+0100\n"
+"Last-Translator: Philipp Wolfer <phw@rubyforge.org>\n"
 "Language-Team: French <fr@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n > 1;\n"
-"X-Launchpad-Export-Date: 2008-12-01 17:01+0000\n"
+"X-Launchpad-Export-Date: 2009-01-24 23:28+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 "Generated-By: pygettext.py 1.5\n"
 
-#: ../picard/album.py:108 ../picard/cluster.py:248
+#: ../picard/album.py:108
+#: ../picard/cluster.py:248
 msgid "Unmatched Files"
 msgstr "Fichiers sans groupement"
 
-#: ../picard/album.py:269
+#: ../picard/album.py:281
 #, python-format
 msgid "[couldn't load album %s]"
 msgstr "Chargement de l'album %s impossible"
 
-#: ../picard/album.py:305
+#: ../picard/album.py:317
 msgid "[loading album information]"
 msgstr "chargement des informations de l'album"
 
-#: ../picard/tagger.py:472
+#: ../picard/cluster.py:164
+#: ../picard/cluster.py:175
+#, python-format
+msgid "No matching releases for cluster %s"
+msgstr "Pas de correspondance pour le groupe %s"
+
+#: ../picard/cluster.py:177
+#, python-format
+msgid "Cluster %s identified!"
+msgstr "Groupement %s identifié !"
+
+#: ../picard/cluster.py:182
+#, python-format
+msgid "Looking up the metadata for cluster %s..."
+msgstr "Recherche des métadonnées du groupement %s ..."
+
+#: ../picard/const.py:40
+msgid "CD"
+msgstr ""
+
+#: ../picard/const.py:41
+msgid "DVD"
+msgstr ""
+
+#: ../picard/const.py:42
+msgid "SACD"
+msgstr ""
+
+#: ../picard/const.py:43
+msgid "LaserDisc"
+msgstr ""
+
+#: ../picard/const.py:44
+msgid "MiniDisc"
+msgstr ""
+
+#: ../picard/const.py:45
+msgid "Vinyl"
+msgstr ""
+
+#: ../picard/const.py:46
+msgid "Cassette"
+msgstr ""
+
+#: ../picard/const.py:47
+msgid "Cartridge (4/8-tracks)"
+msgstr ""
+
+#: ../picard/const.py:48
+msgid "Reel-to-Reel"
+msgstr ""
+
+#: ../picard/const.py:49
+msgid "DAT"
+msgstr ""
+
+#: ../picard/const.py:50
+#, fuzzy
+msgid "Digital Media"
+msgstr "Métadonnées d'origine"
+
+#: ../picard/const.py:51
+msgid "Wax Cylinder"
+msgstr ""
+
+#: ../picard/const.py:52
+msgid "Piano Roll"
+msgstr ""
+
+#: ../picard/const.py:53
+#, fuzzy
+msgid "Other"
+msgstr "Plus tard"
+
+#: ../picard/const.py:58
+msgid "Bangladesh"
+msgstr ""
+
+#: ../picard/const.py:59
+msgid "Belgium"
+msgstr ""
+
+#: ../picard/const.py:60
+msgid "Burkina Faso"
+msgstr ""
+
+#: ../picard/const.py:61
+#, fuzzy
+msgid "Bulgaria"
+msgstr "Hongrois"
+
+#: ../picard/const.py:62
+msgid "Barbados"
+msgstr ""
+
+#: ../picard/const.py:63
+msgid "Wallis and Futuna Islands"
+msgstr ""
+
+#: ../picard/const.py:64
+#, fuzzy
+msgid "Bermuda"
+msgstr "Allemand"
+
+#: ../picard/const.py:65
+msgid "Brunei Darussalam"
+msgstr ""
+
+#: ../picard/const.py:66
+msgid "Bolivia"
+msgstr ""
+
+#: ../picard/const.py:67
+msgid "Bahrain"
+msgstr ""
+
+#: ../picard/const.py:68
+msgid "Burundi"
+msgstr ""
+
+#: ../picard/const.py:69
+msgid "Benin"
+msgstr ""
+
+#: ../picard/const.py:70
+msgid "Bhutan"
+msgstr ""
+
+#: ../picard/const.py:71
+msgid "Jamaica"
+msgstr ""
+
+#: ../picard/const.py:72
+msgid "Bouvet Island"
+msgstr ""
+
+#: ../picard/const.py:73
+msgid "Botswana"
+msgstr ""
+
+#: ../picard/const.py:74
+msgid "Samoa"
+msgstr ""
+
+#: ../picard/const.py:75
+msgid "Brazil"
+msgstr ""
+
+#: ../picard/const.py:76
+msgid "Bahamas"
+msgstr ""
+
+#: ../picard/const.py:77
+msgid "Belarus"
+msgstr ""
+
+#: ../picard/const.py:78
+msgid "Belize"
+msgstr ""
+
+#: ../picard/const.py:79
+msgid "Russian Federation"
+msgstr ""
+
+#: ../picard/const.py:80
+msgid "Rwanda"
+msgstr ""
+
+#: ../picard/const.py:81
+msgid "Reunion"
+msgstr ""
+
+#: ../picard/const.py:82
+msgid "Turkmenistan"
+msgstr ""
+
+#: ../picard/const.py:83
+msgid "Tajikistan"
+msgstr ""
+
+#: ../picard/const.py:84
+#, fuzzy
+msgid "Romania"
+msgstr "roumain"
+
+#: ../picard/const.py:85
+#, fuzzy
+msgid "Tokela"
+msgstr "Barre d'outils"
+
+#: ../picard/const.py:86
+msgid "Guinea-Bissa"
+msgstr ""
+
+#: ../picard/const.py:87
+msgid "Guam"
+msgstr ""
+
+#: ../picard/const.py:88
+msgid "Guatemala"
+msgstr ""
+
+#: ../picard/const.py:89
+msgid "Greece"
+msgstr ""
+
+#: ../picard/const.py:90
+msgid "Equatorial Guinea"
+msgstr ""
+
+#: ../picard/const.py:91
+msgid "Guadeloupe"
+msgstr ""
+
+#: ../picard/const.py:92
+msgid "Japan"
+msgstr ""
+
+#: ../picard/const.py:93
+msgid "Guyana"
+msgstr ""
+
+#: ../picard/const.py:94
+#, fuzzy
+msgid "French Guiana"
+msgstr "Français"
+
+#: ../picard/const.py:95
+#, fuzzy
+msgid "Georgia"
+msgstr "Allemand"
+
+#: ../picard/const.py:96
+msgid "Grenada"
+msgstr ""
+
+#: ../picard/const.py:97
+msgid "United Kingdom"
+msgstr ""
+
+#: ../picard/const.py:98
+msgid "Gabon"
+msgstr ""
+
+#: ../picard/const.py:99
+msgid "El Salvador"
+msgstr ""
+
+#: ../picard/const.py:100
+#, fuzzy
+msgid "Guinea"
+msgstr "Générales"
+
+#: ../picard/const.py:101
+msgid "Gambia"
+msgstr ""
+
+#: ../picard/const.py:102
+msgid "Greenland"
+msgstr ""
+
+#: ../picard/const.py:103
+msgid "Gibraltar"
+msgstr ""
+
+#: ../picard/const.py:104
+msgid "Ghana"
+msgstr ""
+
+#: ../picard/const.py:105
+#, fuzzy
+msgid "Oman"
+msgstr "Allemand"
+
+#: ../picard/const.py:106
+msgid "Tunisia"
+msgstr ""
+
+#: ../picard/const.py:107
+#, fuzzy
+msgid "Jordan"
+msgstr "Coréen"
+
+#: ../picard/const.py:108
+msgid "Haiti"
+msgstr ""
+
+#: ../picard/const.py:109
+#, fuzzy
+msgid "Hungary"
+msgstr "Hongrois"
+
+#: ../picard/const.py:110
+msgid "Hong Kong"
+msgstr ""
+
+#: ../picard/const.py:111
+msgid "Honduras"
+msgstr ""
+
+#: ../picard/const.py:112
+msgid "Heard and Mc Donald Islands"
+msgstr ""
+
+#: ../picard/const.py:113
+msgid "Venezuela"
+msgstr ""
+
+#: ../picard/const.py:114
+msgid "Puerto Rico"
+msgstr ""
+
+#: ../picard/const.py:115
+msgid "Pala"
+msgstr ""
+
+#: ../picard/const.py:116
+#, fuzzy
+msgid "Portugal"
+msgstr "portugais"
+
+#: ../picard/const.py:117
+msgid "Svalbard and Jan Mayen Islands"
+msgstr ""
+
+#: ../picard/const.py:118
+msgid "Paraguay"
+msgstr ""
+
+#: ../picard/const.py:119
+msgid "Iraq"
+msgstr ""
+
+#: ../picard/const.py:120
+msgid "Panama"
+msgstr ""
+
+#: ../picard/const.py:121
+msgid "French Polynesia"
+msgstr ""
+
+#: ../picard/const.py:122
+msgid "Papua New Guinea"
+msgstr ""
+
+#: ../picard/const.py:123
+msgid "Per"
+msgstr ""
+
+#: ../picard/const.py:124
+msgid "Pakistan"
+msgstr ""
+
+#: ../picard/const.py:125
+msgid "Philippines"
+msgstr ""
+
+#: ../picard/const.py:126
+msgid "Pitcairn"
+msgstr ""
+
+#: ../picard/const.py:127
+msgid "Poland"
+msgstr ""
+
+#: ../picard/const.py:128
+msgid "St. Pierre and Miquelon"
+msgstr ""
+
+#: ../picard/const.py:129
+msgid "Zambia"
+msgstr ""
+
+#: ../picard/const.py:130
+msgid "Western Sahara"
+msgstr ""
+
+#: ../picard/const.py:131
+msgid "Estonia"
+msgstr ""
+
+#: ../picard/const.py:132
+msgid "Egypt"
+msgstr ""
+
+#: ../picard/const.py:133
+msgid "South Africa"
+msgstr ""
+
+#: ../picard/const.py:134
+msgid "Ecuador"
+msgstr ""
+
+#: ../picard/const.py:135
+#, fuzzy
+msgid "Italy"
+msgstr "Italien"
+
+#: ../picard/const.py:136
+#, fuzzy
+msgid "Viet Nam"
+msgstr "Nom de fichier"
+
+#: ../picard/const.py:137
+msgid "Solomon Islands"
+msgstr ""
+
+#: ../picard/const.py:138
+msgid "Ethiopia"
+msgstr ""
+
+#: ../picard/const.py:139
+#, fuzzy
+msgid "Somalia"
+msgstr "roumain"
+
+#: ../picard/const.py:140
+msgid "Zimbabwe"
+msgstr ""
+
+#: ../picard/const.py:141
+msgid "Saudi Arabia"
+msgstr ""
+
+#: ../picard/const.py:142
+#, fuzzy
+msgid "Spain"
+msgstr "Espagnol"
+
+#: ../picard/const.py:143
+msgid "Eritrea"
+msgstr ""
+
+#: ../picard/const.py:144
+msgid "Moldova, Republic of"
+msgstr ""
+
+#: ../picard/const.py:145
+msgid "Madagascar"
+msgstr ""
+
+#: ../picard/const.py:146
+msgid "Morocco"
+msgstr ""
+
+#: ../picard/const.py:147
+#, fuzzy
+msgid "Monaco"
+msgstr "Mono"
+
+#: ../picard/const.py:148
+msgid "Uzbekistan"
+msgstr ""
+
+#: ../picard/const.py:149
+msgid "Myanmar"
+msgstr ""
+
+#: ../picard/const.py:150
+msgid "Mali"
+msgstr ""
+
+#: ../picard/const.py:151
+msgid "Maca"
+msgstr ""
+
+#: ../picard/const.py:152
+#, fuzzy
+msgid "Mongolia"
+msgstr "Mono"
+
+#: ../picard/const.py:153
+msgid "Marshall Islands"
+msgstr ""
+
+#: ../picard/const.py:154
+msgid "Macedonia, The Former Yugoslav Republic of"
+msgstr ""
+
+#: ../picard/const.py:155
+msgid "Mauritius"
+msgstr ""
+
+#: ../picard/const.py:156
+#, fuzzy
+msgid "Malta"
+msgstr "Metadonnées"
+
+#: ../picard/const.py:157
+msgid "Malawi"
+msgstr ""
+
+#: ../picard/const.py:158
+msgid "Maldives"
+msgstr ""
+
+#: ../picard/const.py:159
+msgid "Martinique"
+msgstr ""
+
+#: ../picard/const.py:160
+msgid "Northern Mariana Islands"
+msgstr ""
+
+#: ../picard/const.py:161
+msgid "Montserrat"
+msgstr ""
+
+#: ../picard/const.py:162
+#, fuzzy
+msgid "Mauritania"
+msgstr "Lituanien"
+
+#: ../picard/const.py:163
+msgid "Uganda"
+msgstr ""
+
+#: ../picard/const.py:164
+msgid "Malaysia"
+msgstr ""
+
+#: ../picard/const.py:165
+msgid "Mexico"
+msgstr ""
+
+#: ../picard/const.py:166
+msgid "Israel"
+msgstr ""
+
+#: ../picard/const.py:167
+#, fuzzy
+msgid "France"
+msgstr "Annuler"
+
+#: ../picard/const.py:168
+msgid "British Indian Ocean Territory"
+msgstr ""
+
+#: ../picard/const.py:169
+msgid "St. Helena"
+msgstr ""
+
+#: ../picard/const.py:170
+msgid "Finland"
+msgstr ""
+
+#: ../picard/const.py:171
+msgid "Fiji"
+msgstr ""
+
+#: ../picard/const.py:172
+msgid "Falkland Islands (Malvinas)"
+msgstr ""
+
+#: ../picard/const.py:173
+msgid "Micronesia, Federated States of"
+msgstr ""
+
+#: ../picard/const.py:174
+msgid "Faroe Islands"
+msgstr ""
+
+#: ../picard/const.py:175
+msgid "Nicaragua"
+msgstr ""
+
+#: ../picard/const.py:176
+msgid "Netherlands"
+msgstr ""
+
+#: ../picard/const.py:177
+msgid "Norway"
+msgstr ""
+
+#: ../picard/const.py:178
+msgid "Namibia"
+msgstr ""
+
+#: ../picard/const.py:179
+msgid "Vanuat"
+msgstr ""
+
+#: ../picard/const.py:180
+msgid "New Caledonia"
+msgstr ""
+
+#: ../picard/const.py:181
+#, fuzzy
+msgid "Niger"
+msgstr "Mixeur"
+
+#: ../picard/const.py:182
+msgid "Norfolk Island"
+msgstr ""
+
+#: ../picard/const.py:183
+msgid "Nigeria"
+msgstr ""
+
+#: ../picard/const.py:184
+#, fuzzy
+msgid "New Zealand"
+msgstr "Nouvelles métadonnées"
+
+#: ../picard/const.py:185
+msgid "Zaire"
+msgstr ""
+
+#: ../picard/const.py:186
+msgid "Nepal"
+msgstr ""
+
+#: ../picard/const.py:187
+msgid "Naur"
+msgstr ""
+
+#: ../picard/const.py:188
+msgid "Niue"
+msgstr ""
+
+#: ../picard/const.py:189
+msgid "Cook Islands"
+msgstr ""
+
+#: ../picard/const.py:190
+msgid "Cote d'Ivoire"
+msgstr ""
+
+#: ../picard/const.py:191
+msgid "Switzerland"
+msgstr ""
+
+#: ../picard/const.py:192
+msgid "Colombia"
+msgstr ""
+
+#: ../picard/const.py:193
+msgid "China"
+msgstr ""
+
+#: ../picard/const.py:194
+msgid "Cameroon"
+msgstr ""
+
+#: ../picard/const.py:195
+#, fuzzy
+msgid "Chile"
+msgstr "Fichier"
+
+#: ../picard/const.py:196
+msgid "Cocos (Keeling) Islands"
+msgstr ""
+
+#: ../picard/const.py:197
+msgid "Canada"
+msgstr ""
+
+#: ../picard/const.py:198
+#, fuzzy
+msgid "Congo"
+msgstr "Mono"
+
+#: ../picard/const.py:199
+msgid "Central African Republic"
+msgstr ""
+
+#: ../picard/const.py:200
+msgid "Czech Republic"
+msgstr ""
+
+#: ../picard/const.py:201
+msgid "Cyprus"
+msgstr ""
+
+#: ../picard/const.py:202
+msgid "Christmas Island"
+msgstr ""
+
+#: ../picard/const.py:203
+msgid "Costa Rica"
+msgstr ""
+
+#: ../picard/const.py:204
+msgid "Cape Verde"
+msgstr ""
+
+#: ../picard/const.py:205
+msgid "Cuba"
+msgstr ""
+
+#: ../picard/const.py:206
+msgid "Swaziland"
+msgstr ""
+
+#: ../picard/const.py:207
+msgid "Syrian Arab Republic"
+msgstr ""
+
+#: ../picard/const.py:208
+msgid "Kyrgyzstan"
+msgstr ""
+
+#: ../picard/const.py:209
+msgid "Kenya"
+msgstr ""
+
+#: ../picard/const.py:210
+msgid "Suriname"
+msgstr ""
+
+#: ../picard/const.py:211
+msgid "Kiribati"
+msgstr ""
+
+#: ../picard/const.py:212
+msgid "Cambodia"
+msgstr ""
+
+#: ../picard/const.py:213
+msgid "Saint Kitts and Nevis"
+msgstr ""
+
+#: ../picard/const.py:214
+#, fuzzy
+msgid "Comoros"
+msgstr "Couleurs"
+
+#: ../picard/const.py:215
+msgid "Sao Tome and Principe"
+msgstr ""
+
+#: ../picard/const.py:216
+#, fuzzy
+msgid "Slovenia"
+msgstr "slovaque"
+
+#: ../picard/const.py:217
+msgid "Kuwait"
+msgstr ""
+
+#: ../picard/const.py:218
+#, fuzzy
+msgid "Senegal"
+msgstr "Générales"
+
+#: ../picard/const.py:219
+msgid "San Marino"
+msgstr ""
+
+#: ../picard/const.py:220
+msgid "Sierra Leone"
+msgstr ""
+
+#: ../picard/const.py:221
+msgid "Seychelles"
+msgstr ""
+
+#: ../picard/const.py:222
+msgid "Kazakhstan"
+msgstr ""
+
+#: ../picard/const.py:223
+msgid "Cayman Islands"
+msgstr ""
+
+#: ../picard/const.py:224
+msgid "Singapore"
+msgstr ""
+
+#: ../picard/const.py:225
+#, fuzzy
+msgid "Sweden"
+msgstr "suédois"
+
+#: ../picard/const.py:226
+#, fuzzy
+msgid "Sudan"
+msgstr "&Analyser"
+
+#: ../picard/const.py:227
+msgid "Dominican Republic"
+msgstr ""
+
+#: ../picard/const.py:228
+#, fuzzy
+msgid "Dominica"
+msgstr "roumain"
+
+#: ../picard/const.py:229
+#, fuzzy
+msgid "Djibouti"
+msgstr "A Propos"
+
+#: ../picard/const.py:230
+msgid "Denmark"
+msgstr ""
+
+#: ../picard/const.py:231
+msgid "Virgin Islands (British)"
+msgstr ""
+
+#: ../picard/const.py:232
+#, fuzzy
+msgid "Germany"
+msgstr "Allemand"
+
+#: ../picard/const.py:233
+msgid "Yemen"
+msgstr ""
+
+#: ../picard/const.py:234
+msgid "Algeria"
+msgstr ""
+
+#: ../picard/const.py:235
+msgid "United States"
+msgstr ""
+
+#: ../picard/const.py:236
+msgid "Uruguay"
+msgstr ""
+
+#: ../picard/const.py:237
+msgid "Mayotte"
+msgstr ""
+
+#: ../picard/const.py:238
+msgid "United States Minor Outlying Islands"
+msgstr ""
+
+#: ../picard/const.py:239
+msgid "Lebanon"
+msgstr ""
+
+#: ../picard/const.py:240
+msgid "Saint Lucia"
+msgstr ""
+
+#: ../picard/const.py:241
+msgid "Lao People's Democratic Republic"
+msgstr ""
+
+#: ../picard/const.py:242
+msgid "Tuval"
+msgstr ""
+
+#: ../picard/const.py:243
+#, fuzzy
+msgid "Taiwan"
+msgstr "Italien"
+
+#: ../picard/const.py:244
+msgid "Trinidad and Tobago"
+msgstr ""
+
+#: ../picard/const.py:245
+msgid "Turkey"
+msgstr ""
+
+#: ../picard/const.py:246
+msgid "Sri Lanka"
+msgstr ""
+
+#: ../picard/const.py:247
+msgid "Liechtenstein"
+msgstr ""
+
+#: ../picard/const.py:248
+msgid "Latvia"
+msgstr ""
+
+#: ../picard/const.py:249
+msgid "Tonga"
+msgstr ""
+
+#: ../picard/const.py:250
+#, fuzzy
+msgid "Lithuania"
+msgstr "Lituanien"
+
+#: ../picard/const.py:251
+msgid "Luxembourg"
+msgstr ""
+
+#: ../picard/const.py:252
+msgid "Liberia"
+msgstr ""
+
+#: ../picard/const.py:253
+#, fuzzy
+msgid "Lesotho"
+msgstr "Durée"
+
+#: ../picard/const.py:254
+msgid "Thailand"
+msgstr ""
+
+#: ../picard/const.py:255
+msgid "French Southern Territories"
+msgstr ""
+
+#: ../picard/const.py:256
+#, fuzzy
+msgid "Togo"
+msgstr "&Outils"
+
+#: ../picard/const.py:257
+msgid "Chad"
+msgstr ""
+
+#: ../picard/const.py:258
+msgid "Turks and Caicos Islands"
+msgstr ""
+
+#: ../picard/const.py:259
+msgid "Libyan Arab Jamahiriya"
+msgstr ""
+
+#: ../picard/const.py:260
+msgid "Vatican City State (Holy See)"
+msgstr ""
+
+#: ../picard/const.py:261
+msgid "Saint Vincent and The Grenadines"
+msgstr ""
+
+#: ../picard/const.py:262
+msgid "United Arab Emirates"
+msgstr ""
+
+#: ../picard/const.py:263
+msgid "Andorra"
+msgstr ""
+
+#: ../picard/const.py:264
+msgid "Antigua and Barbuda"
+msgstr ""
+
+#: ../picard/const.py:265
+msgid "Afghanistan"
+msgstr ""
+
+#: ../picard/const.py:266
+msgid "Anguilla"
+msgstr ""
+
+#: ../picard/const.py:267
+msgid "Virgin Islands (U.S.)"
+msgstr ""
+
+#: ../picard/const.py:268
+#, fuzzy
+msgid "Iceland"
+msgstr "Islandais"
+
+#: ../picard/const.py:269
+msgid "Iran (Islamic Republic of)"
+msgstr ""
+
+#: ../picard/const.py:270
+msgid "Armenia"
+msgstr ""
+
+#: ../picard/const.py:271
+msgid "Albania"
+msgstr ""
+
+#: ../picard/const.py:272
+msgid "Angola"
+msgstr ""
+
+#: ../picard/const.py:273
+msgid "Netherlands Antilles"
+msgstr ""
+
+#: ../picard/const.py:274
+msgid "Antarctica"
+msgstr ""
+
+#: ../picard/const.py:275
+msgid "American Samoa"
+msgstr ""
+
+#: ../picard/const.py:276
+msgid "Argentina"
+msgstr ""
+
+#: ../picard/const.py:277
+#, fuzzy
+msgid "Australia"
+msgstr "Italien"
+
+#: ../picard/const.py:278
+#, fuzzy
+msgid "Austria"
+msgstr "Auteur"
+
+#: ../picard/const.py:279
+msgid "Aruba"
+msgstr ""
+
+#: ../picard/const.py:280
+#, fuzzy
+msgid "India"
+msgstr "Metadonnées"
+
+#: ../picard/const.py:281
+msgid "Tanzania, United Republic of"
+msgstr ""
+
+#: ../picard/const.py:282
+msgid "Azerbaijan"
+msgstr ""
+
+#: ../picard/const.py:283
+#, fuzzy
+msgid "Ireland"
+msgstr "Islandais"
+
+#: ../picard/const.py:284
+msgid "Indonesia"
+msgstr ""
+
+#: ../picard/const.py:285
+msgid "Ukraine"
+msgstr ""
+
+#: ../picard/const.py:286
+#, fuzzy
+msgid "Qatar"
+msgstr "Plus tard"
+
+#: ../picard/const.py:287
+msgid "Mozambique"
+msgstr ""
+
+#: ../picard/const.py:288
+msgid "Bosnia and Herzegovina"
+msgstr ""
+
+#: ../picard/const.py:289
+msgid "Congo, The Democratic Republic of the"
+msgstr ""
+
+#: ../picard/const.py:290
+msgid "Serbia and Montenegro"
+msgstr ""
+
+#: ../picard/const.py:291
+msgid "Croatia"
+msgstr ""
+
+#: ../picard/const.py:292
+msgid "Korea (North), Democratic People's Republic of"
+msgstr ""
+
+#: ../picard/const.py:293
+msgid "Korea (South), Republic of"
+msgstr ""
+
+#: ../picard/const.py:294
+#, fuzzy
+msgid "Slovakia"
+msgstr "slovaque"
+
+#: ../picard/const.py:295
+msgid "Soviet Union (historical, 1922-1991)"
+msgstr ""
+
+#: ../picard/const.py:296
+msgid "East Timor"
+msgstr ""
+
+#: ../picard/const.py:297
+msgid "Czechoslovakia (historical, 1918-1992)"
+msgstr ""
+
+#: ../picard/const.py:298
+msgid "Europe"
+msgstr ""
+
+#: ../picard/const.py:299
+msgid "East Germany (historical, 1949-1990)"
+msgstr ""
+
+#: ../picard/const.py:300
+msgid "[Unknown Country]"
+msgstr ""
+
+#: ../picard/const.py:301
+msgid "[Worldwide]"
+msgstr ""
+
+#: ../picard/const.py:302
+msgid "Yugoslavia (historical, 1918-1992)"
+msgstr ""
+
+#: ../picard/const.py:307
+#, fuzzy
+msgid "Catalan"
+msgstr "Italien"
+
+#: ../picard/const.py:308
+msgid "Czech"
+msgstr "Tchèque"
+
+#: ../picard/const.py:309
+msgid "Welsh"
+msgstr ""
+
+#: ../picard/const.py:310
+#, fuzzy
+msgid "Danish"
+msgstr "Espagnol"
+
+#: ../picard/const.py:311
+msgid "German"
+msgstr "Allemand"
+
+#: ../picard/const.py:312
+msgid "English"
+msgstr "Anglais"
+
+#: ../picard/const.py:313
+#, fuzzy
+msgid "English (Canada)"
+msgstr "Anglais (Royaume Uni)"
+
+#: ../picard/const.py:314
+msgid "English (UK)"
+msgstr "Anglais (Royaume Uni)"
+
+#: ../picard/const.py:315
+msgid "Spanish"
+msgstr "Espagnol"
+
+#: ../picard/const.py:316
+#, fuzzy
+msgid "Persian"
+msgstr "Version"
+
+#: ../picard/const.py:317
+msgid "Finnish"
+msgstr "Finnois"
+
+#: ../picard/const.py:318
+msgid "French"
+msgstr "Français"
+
+#: ../picard/const.py:319
+msgid "Frisian"
+msgstr ""
+
+#: ../picard/const.py:320
+msgid "Hebrew"
+msgstr ""
+
+#: ../picard/const.py:321
+msgid "Hungarian"
+msgstr "Hongrois"
+
+#: ../picard/const.py:322
+#, fuzzy
+msgid "Islandic"
+msgstr "Islandais"
+
+#: ../picard/const.py:323
+msgid "Italian"
+msgstr "Italien"
+
+#: ../picard/const.py:324
+msgid "Kannada"
+msgstr ""
+
+#: ../picard/const.py:325
+msgid "Korean"
+msgstr "Coréen"
+
+#: ../picard/const.py:326
+msgid "Lithuanian"
+msgstr "Lituanien"
+
+#: ../picard/const.py:327
+#, fuzzy
+msgid "Norwegian Bokmal"
+msgstr "Norvégien « Bokmal »"
+
+#: ../picard/const.py:328
+msgid "Dutch"
+msgstr "Hollandais"
+
+#: ../picard/const.py:329
+#, fuzzy
+msgid "Polish"
+msgstr "Plugins"
+
+#: ../picard/const.py:330
+msgid "Portuguese"
+msgstr "portugais"
+
+#: ../picard/const.py:331
+#, fuzzy
+msgid "Brazilian Portuguese"
+msgstr "portugais"
+
+#: ../picard/const.py:332
+msgid "Romanian"
+msgstr "roumain"
+
+#: ../picard/const.py:333
+msgid "Russian"
+msgstr "russe"
+
+#: ../picard/const.py:334
+#, fuzzy
+msgid "Scots"
+msgstr "Résultats"
+
+#: ../picard/const.py:335
+msgid "Slovak"
+msgstr "slovaque"
+
+#: ../picard/const.py:336
+#, fuzzy
+msgid "Slovenian"
+msgstr "slovaque"
+
+#: ../picard/const.py:337
+msgid "Swedish"
+msgstr "suédois"
+
+#: ../picard/const.py:338
+#, fuzzy
+msgid "Chinese"
+msgstr "Canaux :"
+
+#: ../picard/file.py:475
+#, python-format
+msgid "No matching tracks for file %s"
+msgstr "Pas de piste correspondant au fichier %s"
+
+#: ../picard/file.py:492
+#, fuzzy, python-format
+msgid "No matching tracks above the threshold for file %s"
+msgstr "Pas de piste correspondant au fichier %s"
+
+#: ../picard/file.py:495
+#, python-format
+msgid "File %s identified!"
+msgstr "Fichier %s identifié!"
+
+#: ../picard/file.py:506
+#, fuzzy, python-format
+msgid "Looking up the PUID for file %s..."
+msgstr "Recherche des métadonnées du fichier %s ..."
+
+#: ../picard/file.py:511
+#, python-format
+msgid "Looking up the metadata for file %s..."
+msgstr "Recherche des métadonnées du fichier %s ..."
+
+#: ../picard/puidmanager.py:58
+msgid "Submitting PUIDs..."
+msgstr "Envoie des PUIDs ..."
+
+#: ../picard/puidmanager.py:64
+#, python-format
+msgid "PUIDs submission failed: %s"
+msgstr "Echec d'envoi du PUIDs : %s"
+
+#: ../picard/puidmanager.py:66
+msgid "PUIDs successfully submitted!"
+msgstr "PUID envoyés avec succès."
+
+#: ../picard/playlist.py:31
+msgid "M3U Playlist (*.m3u)"
+msgstr "Liste de lecture M3U (*.m3u)"
+
+#: ../picard/playlist.py:32
+msgid "PLS Playlist (*.pls)"
+msgstr "Liste de lecture PLS (*.pls)"
+
+#: ../picard/playlist.py:33
+msgid "XSPF Playlist (*.xspf)"
+msgstr "Liste de lecture XSPF (*.xspf)"
+
+#: ../picard/tagger.py:476
 msgid "CD Lookup Error"
 msgstr "Erreur de recherche du CD"
 
-#: ../picard/tagger.py:473
+#: ../picard/tagger.py:477
 #, python-format
 msgid ""
 "Error while reading CD:\n"
@@ -49,126 +1336,174 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../picard/ui/passworddialog.py:38
+#: ../picard/tagger.py:503
 #, python-format
-msgid ""
-"The server %s requires you to login. Please enter your username and password."
-msgstr ""
+msgid "Couldn't find PUID for file %s"
+msgstr "PUID du fichier %s introuvable"
 
-#: ../picard/ui/ui_options_script.py:52
-msgid "Tagger Script"
-msgstr ""
+#: ../picard/musicdns/__init__.py:98
+#, fuzzy, python-format
+msgid "Looking up the fingerprint for file %s..."
+msgstr "Recherche des métadonnées du fichier %s ..."
+
+#: ../picard/musicdns/__init__.py:117
+#, python-format
+msgid "Creating fingerprint for file %s..."
+msgstr "Création de l'empreinte pour le fichier %s ..."
 
 #: ../picard/ui/cdlookup.py:31
 msgid "Score"
 msgstr "Résultats"
 
 #: ../picard/ui/cdlookup.py:31
+#: ../picard/ui/itemviews.py:82
+#: ../picard/util/tags.py:23
 msgid "Title"
 msgstr "Titre"
 
-#: ../picard/ui/cdlookup.py:31 ../picard/ui/mainwindow.py:436
+#: ../picard/ui/cdlookup.py:31
+#: ../picard/ui/itemviews.py:84
+#: ../picard/ui/mainwindow.py:436
+#: ../picard/util/tags.py:22
 msgid "Artist"
 msgstr "Artiste"
 
-#: ../picard/ui/ui_metadata.py:121
-msgid "Lookup"
-msgstr "Recherche"
+#: ../picard/ui/coverartbox.py:47
+#: ../picard/ui/options/cover.py:29
+msgid "Cover Art"
+msgstr "Pochette"
 
-#: ../picard/ui/ui_metadata.py:122
-msgid "Title:"
-msgstr "Titre :"
+#: ../picard/ui/coverartbox.py:95
+msgid "Buy the album on Amazon"
+msgstr "Achetter l'album sur Amazon"
 
-#: ../picard/ui/ui_metadata.py:123
-msgid "Date:"
-msgstr "Date :"
+#: ../picard/ui/filebrowser.py:38
+#: ../picard/ui/mainwindow.py:302
+msgid "&Refresh"
+msgstr "&Rafraîchir"
 
-#: ../picard/ui/ui_metadata.py:124
-msgid "Artist:"
-msgstr "Artiste :"
+#: ../picard/ui/filebrowser.py:41
+msgid "&Move Tagged Files Here"
+msgstr "&Déplace les fichiers étiquetés ici"
 
-#: ../picard/ui/ui_metadata.py:125
-msgid "Track:"
-msgstr "Piste :"
+#: ../picard/ui/filebrowser.py:44
+msgid "Show &Hidden Files"
+msgstr "Affiche les fichiers &cachés"
 
-#: ../picard/ui/ui_metadata.py:126
-msgid "0000-00-00; "
-msgstr "0000-00-00; "
+#: ../picard/ui/itemviews.py:83
+msgid "Length"
+msgstr "Durée"
 
-#: ../picard/ui/ui_metadata.py:127 ../picard/ui/tageditor.py:225
-#: ../picard/ui/multitageditor.py:181
+#: ../picard/ui/itemviews.py:327
+msgid "&Releases"
+msgstr "&Sortie"
+
+#: ../picard/ui/itemviews.py:353
+msgid "&Plugins"
+msgstr "&Extensions"
+
+#: ../picard/ui/itemviews.py:523
+msgid "Clusters"
+msgstr "Groupements"
+
+#: ../picard/ui/logview.py:29
+msgid "Log"
+msgstr "Journal"
+
+#: ../picard/ui/puidsubmit.py:31
+#: ../picard/ui/options/plugins.py:80
+msgid "File"
+msgstr "Fichier"
+
+#: ../picard/ui/puidsubmit.py:31
+msgid "PUID"
+msgstr "PUID"
+
+#: ../picard/ui/puidsubmit.py:31
+#: ../picard/ui/mainwindow.py:437
+msgid "Track"
+msgstr "Piste"
+
+#: ../picard/ui/puidsubmit.py:31
+msgid "Release"
+msgstr "Album"
+
+#: ../picard/ui/puidsubmit.py:31
+msgid "Release ID"
+msgstr "ID de l'album"
+
+#: ../picard/ui/tageditor.py:65
+#: ../picard/ui/ui_options_plugins.py:62
+msgid "Details"
+msgstr "Détails"
+
+#: ../picard/ui/tageditor.py:70
+#: ../picard/ui/tageditor.py:241
+#, python-format
+msgid "%d file"
+msgid_plural "%d files"
+msgstr[0] "%d fichier"
+msgstr[1] "%d fichiers"
+
+#: ../picard/ui/tageditor.py:124
+#, python-format
+msgid "(different across %d file)"
+msgid_plural "(different across %d files)"
+msgstr[0] "(different entre %d fichier)"
+msgstr[1] "(different entre %d fichiers)"
+
+#: ../picard/ui/tageditor.py:127
+#, python-format
+msgid "(missing from %d file)"
+msgid_plural "(missing from %d files)"
+msgstr[0] "(absent depuis %d fichier)"
+msgstr[1] "(absent depuis %d fichiers)"
+
+#: ../picard/ui/tageditor.py:210
+msgid "Filename:"
+msgstr "Nom de fichier :"
+
+#: ../picard/ui/tageditor.py:212
+msgid "Format:"
+msgstr "Format :"
+
+#: ../picard/ui/tageditor.py:221
+msgid "Size:"
+msgstr "Taille :"
+
+#: ../picard/ui/tageditor.py:225
+#: ../picard/ui/ui_metadata.py:127
 msgid "Length:"
 msgstr "Durée :"
 
-#: ../picard/ui/ui_metadata.py:128
-msgid "Album:"
-msgstr "Album :"
+#: ../picard/ui/tageditor.py:227
+msgid "Bitrate:"
+msgstr "Débit :"
 
-#: ../picard/ui/ui_passworddialog.py:78
-#, fuzzy
-msgid "Authentication required"
-msgstr "Le support Unicode est nécessaire"
+#: ../picard/ui/tageditor.py:229
+msgid "Sample rate:"
+msgstr "Taux d'échantillonage :"
 
-#: ../picard/ui/ui_passworddialog.py:79 ../picard/ui/ui_options_proxy.py:83
-#: ../picard/ui/ui_options_general.py:113
-msgid "Username:"
-msgstr "Nom d'utilisateur :"
+#: ../picard/ui/tageditor.py:231
+msgid "Bits per sample:"
+msgstr "Bits par échantillon:"
 
-#: ../picard/ui/ui_passworddialog.py:80 ../picard/ui/ui_options_proxy.py:82
-#: ../picard/ui/ui_options_general.py:112
-msgid "Password:"
-msgstr "Mot de passe :"
+#: ../picard/ui/tageditor.py:234
+msgid "Mono"
+msgstr "Mono"
 
-#: ../picard/ui/ui_passworddialog.py:81
-msgid "Save username and password"
-msgstr ""
+#: ../picard/ui/tageditor.py:235
+msgid "Stereo"
+msgstr "Stéréo"
 
-#: ../picard/ui/ui_options_folksonomy.py:114
-#: ../picard/ui/ui_options_folksonomy_tags.py:114
-msgid "Folksonomy Tags"
-msgstr ""
+#: ../picard/ui/tageditor.py:237
+msgid "Channels:"
+msgstr "Canaux :"
 
-#: ../picard/ui/ui_options_folksonomy.py:115
-#: ../picard/ui/ui_options_folksonomy_tags.py:115
-msgid "Ignore tags:"
-msgstr "Ignorer les tags:"
-
-#: ../picard/ui/ui_options_folksonomy.py:116
-#: ../picard/ui/ui_options_folksonomy_tags.py:116
-msgid "Minimal tag usage:"
-msgstr ""
-
-#: ../picard/ui/ui_options_folksonomy.py:117
-#: ../picard/ui/ui_options_folksonomy_tags.py:117
-#: ../picard/ui/ui_options_matching.py:107
-#: ../picard/ui/ui_options_matching.py:108
-#: ../picard/ui/ui_options_matching.py:109
-#: ../picard/ui/ui_options_matching.py:113
-msgid " %"
-msgstr " %"
-
-#: ../picard/ui/ui_options_folksonomy.py:118
-msgid "Maximum number of tags:"
-msgstr ""
-
-#: ../picard/ui/ui_options_folksonomy.py:119
-#: ../picard/ui/ui_options_folksonomy_tags.py:119
-msgid "Join multiple tags with:"
-msgstr ""
-
-#: ../picard/ui/ui_options_folksonomy.py:120
-#: ../picard/ui/ui_options_folksonomy_tags.py:120
-msgid " / "
-msgstr " / "
-
-#: ../picard/ui/ui_options_folksonomy.py:121
-#: ../picard/ui/ui_options_folksonomy_tags.py:121
-msgid ", "
-msgstr ", "
-
-#: ../picard/ui/ui_options_folksonomy_tags.py:118
-msgid "Maximal number of tags:"
-msgstr ""
+#: ../picard/ui/tagsfromfilenames.py:52
+#: ../picard/ui/tagsfromfilenames.py:96
+msgid "File Name"
+msgstr "Nom de fichier"
 
 #: ../picard/ui/mainwindow.py:64
 msgid "MusicBrainz Picard"
@@ -180,7 +1515,7 @@ msgstr "Métadonnées d'origine"
 
 #: ../picard/ui/mainwindow.py:87
 msgid "New Metadata"
-msgstr "Nouvelle métadonnées"
+msgstr "Nouvelles métadonnées"
 
 #: ../picard/ui/mainwindow.py:183
 msgid "&Options..."
@@ -211,9 +1546,8 @@ msgid "&About..."
 msgstr "&À propos..."
 
 #: ../picard/ui/mainwindow.py:210
-#, fuzzy
 msgid "&Donate..."
-msgstr "&À propos..."
+msgstr "&Faire un don..."
 
 #: ../picard/ui/mainwindow.py:213
 msgid "&Report a Bug..."
@@ -289,7 +1623,7 @@ msgstr "Supprimer les fichiers/albums sélectionné"
 
 #: ../picard/ui/mainwindow.py:256
 msgid "File &Browser"
-msgstr ""
+msgstr "Parcourir fichiers"
 
 #: ../picard/ui/mainwindow.py:262
 msgid "&Cover Art"
@@ -301,16 +1635,17 @@ msgstr "Chercher"
 
 #: ../picard/ui/mainwindow.py:271
 msgid "&CD Lookup..."
-msgstr ""
+msgstr "Rechercher &CD..."
 
-#: ../picard/ui/mainwindow.py:272 ../picard/ui/mainwindow.py:273
+#: ../picard/ui/mainwindow.py:272
+#: ../picard/ui/mainwindow.py:273
 msgid "Lookup CD"
-msgstr ""
+msgstr "Recherche de CD"
 
 #. Keyboard shortcut for "Lookup CD"
 #: ../picard/ui/mainwindow.py:275
 msgid "Ctrl+K"
-msgstr ""
+msgstr "Ctrl+K"
 
 #: ../picard/ui/mainwindow.py:278
 msgid "&Scan"
@@ -323,7 +1658,7 @@ msgstr "Ctrl+Y"
 
 #: ../picard/ui/mainwindow.py:284
 msgid "Cl&uster"
-msgstr ""
+msgstr "Gro&upage"
 
 #. Keyboard shortcut for "Cluster"
 #: ../picard/ui/mainwindow.py:287
@@ -332,11 +1667,12 @@ msgstr "Ctrl+U"
 
 #: ../picard/ui/mainwindow.py:290
 msgid "&Lookup"
-msgstr ""
+msgstr "&Rechercher"
 
-#: ../picard/ui/mainwindow.py:291 ../picard/ui/mainwindow.py:292
+#: ../picard/ui/mainwindow.py:291
+#: ../picard/ui/mainwindow.py:292
 msgid "Lookup metadata"
-msgstr ""
+msgstr "Rechercher méta-données"
 
 #. Keyboard shortcut for "Lookup"
 #: ../picard/ui/mainwindow.py:295
@@ -347,10 +1683,6 @@ msgstr "Ctrl+L"
 msgid "&Details..."
 msgstr "&Détails..."
 
-#: ../picard/ui/mainwindow.py:302 ../picard/ui/filebrowser.py:38
-msgid "&Refresh"
-msgstr "&Rafraîchir"
-
 #: ../picard/ui/mainwindow.py:305
 msgid "Generate &Playlist..."
 msgstr "Générer les listes de lecture"
@@ -365,7 +1697,7 @@ msgstr "Déplacer les fichiers"
 
 #: ../picard/ui/mainwindow.py:318
 msgid "Save &Tags"
-msgstr ""
+msgstr "Sauvegarder les e&tiquettes"
 
 #: ../picard/ui/mainwindow.py:323
 msgid "Tags From &File Names..."
@@ -385,7 +1717,7 @@ msgstr "&Editer"
 
 #: ../picard/ui/mainwindow.py:363
 msgid "&View"
-msgstr ""
+msgstr "&Vue"
 
 #: ../picard/ui/mainwindow.py:369
 msgid "&Options"
@@ -396,6 +1728,7 @@ msgid "&Tools"
 msgstr "&Outils"
 
 #: ../picard/ui/mainwindow.py:384
+#: ../picard/ui/util.py:33
 msgid "&Help"
 msgstr "&Aide"
 
@@ -408,13 +1741,10 @@ msgid "&Search Bar"
 msgstr "Barre de &recherche"
 
 #: ../picard/ui/mainwindow.py:435
+#: ../picard/util/tags.py:21
 msgid "Album"
 msgstr "Album"
 
-#: ../picard/ui/mainwindow.py:437 ../picard/ui/puidsubmit.py:31
-msgid "Track"
-msgstr "Piste"
-
 #: ../picard/ui/mainwindow.py:476
 msgid "All Supported Formats"
 msgstr "Tous les formats pris en charge"
@@ -429,253 +1759,37 @@ msgstr "Enregistrement de la liste de lecture %s ..."
 msgid "Playlist %s saved"
 msgstr "Liste de lecture %s sauvegardée."
 
-#: ../picard/ui/mainwindow.py:638 ../picard/ui/mainwindow.py:647
+#: ../picard/ui/mainwindow.py:638
+#: ../picard/ui/mainwindow.py:647
 #, python-format
 msgid " (Error: %s)"
 msgstr " (Erreur : %s)"
 
-#: ../picard/ui/ui_edittagdialog.py:44
-msgid "Edit Tag"
-msgstr "Modifier l'étiquette"
-
-#: ../picard/ui/ui_options_proxy.py:81
-msgid "Web Proxy"
-msgstr "Proxy Web"
-
-#: ../picard/ui/ui_options_proxy.py:84 ../picard/ui/ui_options_general.py:109
-msgid "Port:"
-msgstr "Port :"
-
-#: ../picard/ui/ui_options_proxy.py:85 ../picard/ui/ui_options_general.py:110
-msgid "Server address:"
-msgstr "Adresse du serveur:"
-
-#: ../picard/ui/ui_tagsfromfilenames.py:56
-msgid "Convert File Names to Tags"
-msgstr "Convertissez les noms de fichiers en balises"
-
-#: ../picard/ui/ui_tagsfromfilenames.py:57
-msgid "Replace underscores with spaces"
-msgstr "Remplacer les underscores par des espaces"
-
-#: ../picard/ui/ui_tagsfromfilenames.py:58
-#: ../picard/ui/ui_options_naming.py:180
-msgid "&Preview"
-msgstr "&Prévisualisation"
-
-#: ../picard/ui/ui_options_general.py:108
-msgid "MusicBrainz Server"
-msgstr "Serveur MusicBrainz"
-
-#: ../picard/ui/ui_options_general.py:111
-msgid "Account Information"
-msgstr "Informations sur le compte"
-
-#: ../picard/ui/ui_options_general.py:114
-msgid "General"
-msgstr "Générales"
-
-#: ../picard/ui/ui_options_general.py:115
-msgid "Automatically scan all new files"
-msgstr "Analyser automatiquement tous les nouveaux fichiers"
-
-#: ../picard/ui/ui_options_interface.py:46
-msgid "Miscellaneous"
-msgstr "Divers"
-
-#: ../picard/ui/ui_options_interface.py:47
-msgid "Show text labels under icons"
-msgstr "Afficher les labels en dessous des icônes"
-
-#: ../picard/ui/ui_options_interface.py:48
-msgid "Allow selection of multiple directories"
-msgstr "Autoriser la sélection de plusieurs répertoires"
-
-#: ../picard/ui/ui_options_interface.py:49
-msgid "Use advanced query syntax"
-msgstr ""
-
-#: ../picard/ui/itemviews.py:327
-msgid "&Releases"
-msgstr "&Sortie"
-
-#: ../picard/ui/itemviews.py:353
-msgid "&Plugins"
-msgstr "&Extensions"
-
-#: ../picard/ui/itemviews.py:523
-msgid "Clusters"
-msgstr "Groupements"
-
-#: ../picard/ui/ui_options_matching.py:105
-msgid "Thresholds"
-msgstr "Seuils"
-
-#: ../picard/ui/ui_options_matching.py:106
-msgid "Minimal similarity for matching files to tracks:"
-msgstr "Ressemblance minimale entre les fichiers et la piste :"
-
-#: ../picard/ui/ui_options_matching.py:110
-msgid "Minimal similarity for file lookups:"
-msgstr "Ressemblance minimale pour chercher des fichiers :"
-
-#: ../picard/ui/ui_options_matching.py:111
-msgid "Minimal similarity for cluster lookups:"
-msgstr "Ressemblance minimale pour le regroupement d'album"
-
-#: ../picard/ui/ui_options_matching.py:112
-msgid "Minimal similarity for PUID lookups:"
-msgstr ""
-
-#: ../picard/ui/ui_options_tags.py:105
-msgid "Common"
-msgstr "Commun"
-
-#: ../picard/ui/ui_options_tags.py:106
-msgid "Clear existing tags before writing new tags"
-msgstr "Supprimer les étiquettes existantes avant écriture"
-
-#: ../picard/ui/ui_options_tags.py:107
-msgid "Don't write tags to files"
-msgstr "Ne mettez pas de balises dans les fichiers"
-
-#: ../picard/ui/ui_options_tags.py:108
-msgid "ID3"
-msgstr "ID3"
-
-#: ../picard/ui/ui_options_tags.py:109
-msgid "Write ID3v1 tags to the files"
-msgstr "Ecrire les tags ID3v1 dans les fichiers"
-
-#: ../picard/ui/ui_options_tags.py:110
-msgid "Write ID3v2 version 2.3 tags (2.4 is default)"
-msgstr ""
-"Utiliser la version 2.3 pour les étiquettes ID3v2 (au lieu de 2.4 par défaut)"
-
-#: ../picard/ui/ui_options_tags.py:111
-msgid "Text encoding to use while writing ID3v2 tags:"
-msgstr ""
-
-#: ../picard/ui/ui_options_tags.py:112
-msgid "ISO-8859-1"
-msgstr "ISO-8859-1"
-
-#: ../picard/ui/ui_options_tags.py:113
-msgid "UTF-16"
-msgstr "UTF-16"
-
-#: ../picard/ui/ui_options_tags.py:114
-msgid "UTF-8"
-msgstr "UTF-8"
-
-#: ../picard/ui/ui_options_tags.py:115
-msgid "Remove ID3 tags from FLAC files"
-msgstr "c"
-
-#: ../picard/ui/ui_options_tags.py:116
-msgid "APE"
-msgstr "APE"
-
-#: ../picard/ui/ui_options_tags.py:117
-msgid "Remove APEv2 tags from MP3 files"
-msgstr "Supprimer les tags APEv2 des fichiers MP3"
-
-#: ../picard/ui/ui_options_cdlookup_win32.py:56 ../picard/ui/ui_cdlookup.py:60
-#: ../picard/ui/ui_options_cdlookup.py:47
-msgid "CD Lookup"
-msgstr "Consultation du CD"
-
-#: ../picard/ui/ui_options_cdlookup_win32.py:57
-msgid "Default CD-ROM drive to use for lookups:"
-msgstr "Lecteur de CD-ROM par défaut à utiliser pour les consultations"
-
-#: ../picard/ui/tageditor.py:65 ../picard/ui/ui_options_plugins.py:62
-#: ../picard/ui/multitageditor.py:37
-msgid "Details"
-msgstr "Détails"
-
-#: ../picard/ui/tageditor.py:70 ../picard/ui/tageditor.py:241
-#: ../picard/ui/multitageditor.py:42 ../picard/ui/multitageditor.py:197
-#, python-format
-msgid "%d file"
-msgid_plural "%d files"
-msgstr[0] "%d fichier"
-msgstr[1] "%d fichiers"
-
-#: ../picard/ui/tageditor.py:124 ../picard/ui/multitageditor.py:95
-#, python-format
-msgid "(different across %d file)"
-msgid_plural "(different across %d files)"
-msgstr[0] ""
-msgstr[1] ""
-
-#: ../picard/ui/tageditor.py:127 ../picard/ui/multitageditor.py:98
-#, python-format
-msgid "(missing from %d file)"
-msgid_plural "(missing from %d files)"
-msgstr[0] "(absent depuis %d fichier)"
-msgstr[1] "(absent depuis %d fichiers)"
-
-#: ../picard/ui/tageditor.py:210 ../picard/ui/multitageditor.py:166
-msgid "Filename:"
-msgstr "Nom de fichier :"
-
-#: ../picard/ui/tageditor.py:212 ../picard/ui/multitageditor.py:168
-msgid "Format:"
-msgstr "Format :"
-
-#: ../picard/ui/tageditor.py:221 ../picard/ui/multitageditor.py:177
-msgid "Size:"
-msgstr "Taille :"
-
-#: ../picard/ui/tageditor.py:227 ../picard/ui/multitageditor.py:183
-msgid "Bitrate:"
-msgstr "Débit :"
-
-#: ../picard/ui/tageditor.py:229 ../picard/ui/multitageditor.py:185
-msgid "Sample rate:"
-msgstr "Taux d'échantillonage :"
-
-#: ../picard/ui/tageditor.py:231 ../picard/ui/multitageditor.py:187
-msgid "Bits per sample:"
-msgstr "Bits par échantillon:"
-
-#: ../picard/ui/tageditor.py:234 ../picard/ui/multitageditor.py:190
-msgid "Mono"
-msgstr "Mono"
-
-#: ../picard/ui/tageditor.py:235 ../picard/ui/multitageditor.py:191
-msgid "Stereo"
-msgstr "Stéréo"
-
-#: ../picard/ui/tageditor.py:237 ../picard/ui/multitageditor.py:193
-msgid "Channels:"
-msgstr "Canaux :"
-
-#: ../picard/ui/ui_tageditor.py:115 ../picard/ui/ui_multitageditor.py:55
-#: ../picard/ui/ui_options_plugins.py:59 ../picard/ui/options/plugins.py:76
+#: ../picard/ui/ui_tageditor.py:115
+#: ../picard/ui/ui_options_plugins.py:59
+#: ../picard/ui/options/plugins.py:76
 msgid "Name"
 msgstr "Nom d'utilisateur"
 
-#: ../picard/ui/ui_tageditor.py:116 ../picard/ui/ui_multitageditor.py:56
+#: ../picard/ui/ui_tageditor.py:116
 msgid "Value"
 msgstr "Valeur"
 
-#: ../picard/ui/ui_tageditor.py:117 ../picard/ui/ui_multitageditor.py:57
+#: ../picard/ui/ui_tageditor.py:117
 msgid "&Add..."
-msgstr ""
+msgstr "&Ajouter..."
 
 #: ../picard/ui/ui_tageditor.py:118
 msgid "&Edit..."
-msgstr ""
+msgstr "Modifi&er..."
 
 #: ../picard/ui/ui_tageditor.py:119
 msgid "&Delete"
-msgstr ""
+msgstr "&Supprimer"
 
 #: ../picard/ui/ui_tageditor.py:120
 msgid "&Metadata"
-msgstr ""
+msgstr "&Meta-données"
 
 #: ../picard/ui/ui_tageditor.py:121
 msgid "A&rtwork"
@@ -683,68 +1797,101 @@ msgstr "Pochette d'album"
 
 #: ../picard/ui/ui_tageditor.py:122
 msgid "&Info"
-msgstr ""
+msgstr "&Info"
 
-#: ../picard/ui/coverartbox.py:47
-msgid "Cover Art"
-msgstr "Pochette"
+#: ../picard/ui/passworddialog.py:38
+#, python-format
+msgid "The server %s requires you to login. Please enter your username and password."
+msgstr "Le serveur %s requiert une connexion. Veuillez entrer vos nom d'utilisateur et mot de passe."
 
-#: ../picard/ui/coverartbox.py:95
-msgid "Buy the album on Amazon"
-msgstr "Achetter l'album sur Amazon"
-
-#: ../picard/ui/ui_puidsubmit.py:52
-msgid "Submit PUIDs"
-msgstr ""
-
-#: ../picard/ui/ui_puidsubmit.py:53 ../picard/ui/ui_cdlookup.py:62
-msgid "OK"
-msgstr "OK"
-
-#: ../picard/ui/ui_puidsubmit.py:54 ../picard/ui/ui_cdlookup.py:64
-msgid "Cancel"
-msgstr "Annuler"
-
-#: ../picard/ui/puidsubmit.py:31 ../picard/ui/options/plugins.py:80
-msgid "File"
-msgstr "Fichier"
-
-#: ../picard/ui/puidsubmit.py:31
-msgid "PUID"
-msgstr "PUID"
-
-#: ../picard/ui/puidsubmit.py:31
-msgid "Release"
-msgstr ""
-
-#: ../picard/ui/puidsubmit.py:31
-msgid "Release ID"
-msgstr "ID de l'album"
-
-#: ../picard/ui/filebrowser.py:41
-#, fuzzy
-msgid "&Move Tagged Files Here"
-msgstr "Déplacer les fichiers"
-
-#: ../picard/ui/filebrowser.py:44
-msgid "Show &Hidden Files"
-msgstr ""
+#: ../picard/ui/ui_cdlookup.py:60
+#: ../picard/ui/ui_options_cdlookup.py:47
+#: ../picard/ui/ui_options_cdlookup_win32.py:56
+#: ../picard/ui/options/cdlookup.py:35
+msgid "CD Lookup"
+msgstr "Consultation du CD"
 
 #: ../picard/ui/ui_cdlookup.py:61
 msgid "The following releases on MusicBrainz match the CD:"
-msgstr ""
+msgstr "Les albums suivants de MusicBrainz correspondent à ce CD :"
+
+#: ../picard/ui/ui_cdlookup.py:62
+#: ../picard/ui/ui_puidsubmit.py:53
+msgid "OK"
+msgstr "OK"
 
 #: ../picard/ui/ui_cdlookup.py:63
 msgid "    Lookup manually    "
 msgstr "    Recherche manuelle    "
 
+#: ../picard/ui/ui_cdlookup.py:64
+#: ../picard/ui/ui_puidsubmit.py:54
+msgid "Cancel"
+msgstr "Annuler"
+
+#: ../picard/ui/ui_passworddialog.py:78
+msgid "Authentication required"
+msgstr "Authentification requise"
+
+#: ../picard/ui/ui_passworddialog.py:79
+#: ../picard/ui/ui_options_general.py:113
+#: ../picard/ui/ui_options_proxy.py:83
+msgid "Username:"
+msgstr "Nom d'utilisateur :"
+
+#: ../picard/ui/ui_passworddialog.py:80
+#: ../picard/ui/ui_options_general.py:112
+#: ../picard/ui/ui_options_proxy.py:82
+msgid "Password:"
+msgstr "Mot de passe :"
+
+#: ../picard/ui/ui_passworddialog.py:81
+msgid "Save username and password"
+msgstr "Enregistrer le nom d'utilisateur et le mot de passe"
+
+#: ../picard/ui/ui_edittagdialog.py:44
+msgid "Edit Tag"
+msgstr "Modifier l'étiquette"
+
+#: ../picard/ui/ui_metadata.py:121
+msgid "Lookup"
+msgstr "Recherche"
+
+#: ../picard/ui/ui_metadata.py:122
+msgid "Title:"
+msgstr "Titre :"
+
+#: ../picard/ui/ui_metadata.py:123
+msgid "Date:"
+msgstr "Date :"
+
+#: ../picard/ui/ui_metadata.py:124
+msgid "Artist:"
+msgstr "Artiste :"
+
+#: ../picard/ui/ui_metadata.py:125
+msgid "Track:"
+msgstr "Piste :"
+
+#: ../picard/ui/ui_metadata.py:126
+msgid "0000-00-00; "
+msgstr "0000-00-00; "
+
+#: ../picard/ui/ui_metadata.py:128
+msgid "Album:"
+msgstr "Album :"
+
 #: ../picard/ui/ui_options.py:42
 msgid "Options"
 msgstr "Options"
 
-#: ../picard/ui/tagsfromfilenames.py:52 ../picard/ui/tagsfromfilenames.py:96
-msgid "File Name"
-msgstr "Nom de fichier"
+#: ../picard/ui/ui_options_cdlookup.py:48
+msgid "CD-ROM device to use for lookups:"
+msgstr "Lecteur de CD-ROM à utiliser pour les consultations"
+
+#: ../picard/ui/ui_options_cdlookup_win32.py:57
+msgid "Default CD-ROM drive to use for lookups:"
+msgstr "Lecteur de CD-ROM par défaut à utiliser pour les consultations"
 
 #: ../picard/ui/ui_options_cover.py:56
 msgid "Location"
@@ -762,68 +1909,76 @@ msgstr "Enregistrer les images des pochettes dans des fichiers séparés"
 msgid "Overwrite the file if it already exists"
 msgstr "Écrire sur le fichier s'il existe déjà"
 
-#: ../picard/ui/ui_options_metadata.py:100
-msgid "Metadata"
-msgstr "Metadonnées"
+#: ../picard/ui/util.py:31
+msgid "&Ok"
+msgstr "&Ok"
 
-#: ../picard/ui/ui_options_metadata.py:101
-msgid "Translate foreign artist names to English where possible"
-msgstr ""
-"Traduire les noms des artistes étrangers en anglais lorsque c'est possible"
+#: ../picard/ui/util.py:32
+#, fuzzy
+msgid "&Cancel"
+msgstr "Annuler"
 
-#: ../picard/ui/ui_options_metadata.py:102
-msgid "Use release relationships"
-msgstr ""
+#: ../picard/ui/ui_puidsubmit.py:52
+msgid "Submit PUIDs"
+msgstr "Soumettre les PUID"
 
-#: ../picard/ui/ui_options_metadata.py:103
-msgid "Use track relationships"
-msgstr "Utiliser les relations entre les pistes"
+#: ../picard/ui/ui_options_folksonomy.py:114
+#: ../picard/ui/options/folksonomy.py:29
+msgid "Folksonomy Tags"
+msgstr "Tags de folksonomie"
 
-#: ../picard/ui/ui_options_metadata.py:104
-msgid "Use folksonomy tags as genre"
-msgstr ""
+#: ../picard/ui/ui_options_folksonomy.py:115
+msgid "Ignore tags:"
+msgstr "Ignorer les tags:"
 
-#: ../picard/ui/ui_options_metadata.py:105
-msgid "Preferred release country:"
-msgstr ""
+#: ../picard/ui/ui_options_folksonomy.py:116
+msgid "Minimal tag usage:"
+msgstr "Usage minimal d'étiquettes :"
 
-#: ../picard/ui/ui_options_metadata.py:106
-msgid "Custom Fields"
-msgstr "Champs personnalisés"
+#: ../picard/ui/ui_options_folksonomy.py:117
+#: ../picard/ui/ui_options_matching.py:107
+#: ../picard/ui/ui_options_matching.py:108
+#: ../picard/ui/ui_options_matching.py:109
+#: ../picard/ui/ui_options_matching.py:113
+msgid " %"
+msgstr " %"
 
-#: ../picard/ui/ui_options_metadata.py:107
-msgid "Various artists:"
-msgstr "Artistes divers :"
+#: ../picard/ui/ui_options_folksonomy.py:118
+msgid "Maximum number of tags:"
+msgstr "Nombre maximum de tags :"
 
-#: ../picard/ui/ui_options_metadata.py:108
-msgid "Non-album tracks:"
-msgstr "Morceaux hors album :"
+#: ../picard/ui/ui_options_folksonomy.py:119
+msgid "Join multiple tags with:"
+msgstr "Joindre les tags multiples avec :"
 
-#: ../picard/ui/ui_options_metadata.py:109
-#: ../picard/ui/ui_options_metadata.py:110
-#: ../picard/ui/ui_options_naming.py:168 ../picard/ui/ui_options_naming.py:169
-msgid "Default"
-msgstr "Valeur par default"
+#: ../picard/ui/ui_options_folksonomy.py:120
+msgid " / "
+msgstr " / "
 
-#: ../picard/ui/ui_multitageditor.py:58
-msgid "Delete"
-msgstr "Supprimer"
+#: ../picard/ui/ui_options_folksonomy.py:121
+msgid ", "
+msgstr ", "
 
-#: ../picard/ui/logview.py:29
-msgid "Log"
-msgstr "Journal"
+#: ../picard/ui/ui_options_interface.py:50
+msgid "Miscellaneous"
+msgstr "Divers"
 
-#: ../picard/ui/ui_options_plugins.py:58
-msgid "Plugins"
-msgstr "Plugins"
+#: ../picard/ui/ui_options_interface.py:51
+msgid "Show text labels under icons"
+msgstr "Afficher les labels en dessous des icônes"
 
-#: ../picard/ui/ui_options_plugins.py:60 ../picard/ui/options/plugins.py:79
-msgid "Author"
-msgstr "Auteur"
+#: ../picard/ui/ui_options_interface.py:52
+msgid "Allow selection of multiple directories"
+msgstr "Autoriser la sélection de plusieurs répertoires"
 
-#: ../picard/ui/ui_options_plugins.py:61
-msgid "Version"
-msgstr "Version"
+#: ../picard/ui/ui_options_interface.py:53
+msgid "Use advanced query syntax"
+msgstr "Utilisez la syntaxe de requête avancée"
+
+#: ../picard/ui/ui_options_interface.py:54
+#, fuzzy
+msgid "User interface language:"
+msgstr "Interface utilisateur"
 
 #: ../picard/ui/ui_options_naming.py:165
 msgid "Rename Files"
@@ -837,11 +1992,20 @@ msgstr "Remplacer les caractères Windows non compatibles"
 msgid "Replace non-ASCII characters"
 msgstr "Remplacer les caractères non ASCII"
 
-#: ../picard/ui/ui_options_naming.py:170 ../picard/ui/options/naming.py:90
+#: ../picard/ui/ui_options_naming.py:168
+#: ../picard/ui/ui_options_naming.py:169
+#: ../picard/ui/ui_options_metadata.py:109
+#: ../picard/ui/ui_options_metadata.py:110
+msgid "Default"
+msgstr "Valeur par default"
+
+#: ../picard/ui/ui_options_naming.py:170
+#: ../picard/ui/options/naming.py:90
 msgid "Multiple artist file naming format:"
 msgstr "Format du nom de fichier pour les artistes multiples"
 
-#: ../picard/ui/ui_options_naming.py:171 ../picard/ui/options/naming.py:86
+#: ../picard/ui/ui_options_naming.py:171
+#: ../picard/ui/options/naming.py:86
 msgid "File naming format:"
 msgstr "Format du nom de fichier :"
 
@@ -875,69 +2039,202 @@ msgstr "Nom de fichier :"
 
 #: ../picard/ui/ui_options_naming.py:179
 msgid "Multiple artist file name:"
-msgstr ""
+msgstr "Nom des fichiers aux plusieurs artistes"
 
-#: ../picard/ui/ui_options_cdlookup.py:48
-msgid "CD-ROM device to use for lookups:"
-msgstr "Lecteur de CD-ROM à utiliser pour les consultations"
+#: ../picard/ui/ui_options_naming.py:180
+#: ../picard/ui/ui_tagsfromfilenames.py:58
+msgid "&Preview"
+msgstr "&Prévisualisation"
 
-#: ../picard/ui/options/scripting.py:84 ../picard/ui/options/naming.py:86
-#: ../picard/ui/options/naming.py:90 ../picard/ui/options/naming.py:93
-#: ../picard/ui/options/naming.py:95
-msgid "Script Error"
-msgstr "Erreur de script"
+#: ../picard/ui/ui_options_general.py:108
+msgid "MusicBrainz Server"
+msgstr "Serveur MusicBrainz"
+
+#: ../picard/ui/ui_options_general.py:109
+#: ../picard/ui/ui_options_proxy.py:84
+msgid "Port:"
+msgstr "Port :"
+
+#: ../picard/ui/ui_options_general.py:110
+#: ../picard/ui/ui_options_proxy.py:85
+msgid "Server address:"
+msgstr "Adresse du serveur:"
+
+#: ../picard/ui/ui_options_general.py:111
+msgid "Account Information"
+msgstr "Informations sur le compte"
+
+#: ../picard/ui/ui_options_general.py:114
+#: ../picard/ui/options/general.py:29
+msgid "General"
+msgstr "Générales"
+
+#: ../picard/ui/ui_options_general.py:115
+msgid "Automatically scan all new files"
+msgstr "Analyser automatiquement tous les nouveaux fichiers"
+
+#: ../picard/ui/ui_options_matching.py:105
+msgid "Thresholds"
+msgstr "Seuils"
+
+#: ../picard/ui/ui_options_matching.py:106
+msgid "Minimal similarity for matching files to tracks:"
+msgstr "Ressemblance minimale entre les fichiers et la piste :"
+
+#: ../picard/ui/ui_options_matching.py:110
+msgid "Minimal similarity for file lookups:"
+msgstr "Ressemblance minimale pour chercher des fichiers :"
+
+#: ../picard/ui/ui_options_matching.py:111
+msgid "Minimal similarity for cluster lookups:"
+msgstr "Ressemblance minimale pour le regroupement d'album"
+
+#: ../picard/ui/ui_options_matching.py:112
+msgid "Minimal similarity for PUID lookups:"
+msgstr "Similarité minimale pour les recherches PUID :"
+
+#: ../picard/ui/ui_options_metadata.py:100
+#: ../picard/ui/options/metadata.py:31
+msgid "Metadata"
+msgstr "Metadonnées"
+
+#: ../picard/ui/ui_options_metadata.py:101
+msgid "Translate foreign artist names to English where possible"
+msgstr "Traduire les noms des artistes étrangers en anglais lorsque c'est possible"
+
+#: ../picard/ui/ui_options_metadata.py:102
+msgid "Use release relationships"
+msgstr "Utiliser les associations d'albums"
+
+#: ../picard/ui/ui_options_metadata.py:103
+msgid "Use track relationships"
+msgstr "Utiliser les relations entre les pistes"
+
+#: ../picard/ui/ui_options_metadata.py:104
+msgid "Use folksonomy tags as genre"
+msgstr "Utiliser les étiquettes « folksonomy » comme genre"
+
+#: ../picard/ui/ui_options_metadata.py:105
+msgid "Preferred release country:"
+msgstr "Pays de publication préféré :"
+
+#: ../picard/ui/ui_options_metadata.py:106
+msgid "Custom Fields"
+msgstr "Champs personnalisés"
+
+#: ../picard/ui/ui_options_metadata.py:107
+msgid "Various artists:"
+msgstr "Artistes divers :"
+
+#: ../picard/ui/ui_options_metadata.py:108
+msgid "Non-album tracks:"
+msgstr "Morceaux hors album :"
+
+#: ../picard/ui/ui_options_plugins.py:58
+#: ../picard/ui/options/plugins.py:30
+msgid "Plugins"
+msgstr "Plugins"
+
+#: ../picard/ui/ui_options_plugins.py:60
+#: ../picard/ui/options/plugins.py:79
+msgid "Author"
+msgstr "Auteur"
+
+#: ../picard/ui/ui_options_plugins.py:61
+#: ../picard/util/tags.py:36
+msgid "Version"
+msgstr "Version"
+
+#: ../picard/ui/ui_options_proxy.py:81
+#: ../picard/ui/options/proxy.py:28
+msgid "Web Proxy"
+msgstr "Proxy Web"
+
+#: ../picard/ui/ui_options_script.py:52
+msgid "Tagger Script"
+msgstr "Script d'étiquetage"
+
+#: ../picard/ui/ui_options_tags.py:105
+msgid "Common"
+msgstr "Commun"
+
+#: ../picard/ui/ui_options_tags.py:106
+msgid "Clear existing tags before writing new tags"
+msgstr "Supprimer les étiquettes existantes avant écriture"
+
+#: ../picard/ui/ui_options_tags.py:107
+msgid "Don't write tags to files"
+msgstr "Ne mettez pas de balises dans les fichiers"
+
+#: ../picard/ui/ui_options_tags.py:108
+msgid "ID3"
+msgstr "ID3"
+
+#: ../picard/ui/ui_options_tags.py:109
+msgid "Write ID3v1 tags to the files"
+msgstr "Ecrire les tags ID3v1 dans les fichiers"
+
+#: ../picard/ui/ui_options_tags.py:110
+msgid "Write ID3v2 version 2.3 tags (2.4 is default)"
+msgstr "Utiliser la version 2.3 pour les étiquettes ID3v2 (au lieu de 2.4 par défaut)"
+
+#: ../picard/ui/ui_options_tags.py:111
+msgid "Text encoding to use while writing ID3v2 tags:"
+msgstr "Codage de texte pour écrire les étiquettes ID3v2 :"
+
+#: ../picard/ui/ui_options_tags.py:112
+msgid "ISO-8859-1"
+msgstr "ISO-8859-1"
+
+#: ../picard/ui/ui_options_tags.py:113
+msgid "UTF-16"
+msgstr "UTF-16"
+
+#: ../picard/ui/ui_options_tags.py:114
+msgid "UTF-8"
+msgstr "UTF-8"
+
+#: ../picard/ui/ui_options_tags.py:115
+msgid "Remove ID3 tags from FLAC files"
+msgstr "c"
+
+#: ../picard/ui/ui_options_tags.py:116
+msgid "APE"
+msgstr "APE"
+
+#: ../picard/ui/ui_options_tags.py:117
+msgid "Remove APEv2 tags from MP3 files"
+msgstr "Supprimer les tags APEv2 des fichiers MP3"
+
+#: ../picard/ui/ui_tagsfromfilenames.py:56
+msgid "Convert File Names to Tags"
+msgstr "Convertissez les noms de fichiers en balises"
+
+#: ../picard/ui/ui_tagsfromfilenames.py:57
+msgid "Replace underscores with spaces"
+msgstr "Remplacer les underscores par des espaces"
+
+#: ../picard/ui/options/about.py:29
+msgid "About"
+msgstr "A Propos"
 
 #. Replace this with your name to have it appear in the "About" dialog.
 #: ../picard/ui/options/about.py:48
 msgid "translator-credits"
 msgstr ""
 "Launchpad Contributions:\n"
-"  Nicolas Velin <https://launchpad.net/~nsv>\n"
-"\n"
-"Launchpad Contributions:\n"
-"  Matthieu MORIN https://launchpad.net/~morinmatthieu\n"
 "  Nicolas Velin https://launchpad.net/~nsv\n"
+"  Matthieu MORIN https://launchpad.net/~morinmatthieu\n"
 "  Useless https://launchpad.net/~uselessboy\n"
 "  royto https://launchpad.net/~royto\n"
 "  seun_p4 https://launchpad.net/~seun-landsberg\n"
-"\n"
-"Launchpad Contributions:\n"
-"  Matthieu MORIN https://launchpad.net/~morinmatthieu\n"
 "  Mickael Delahaye https://launchpad.net/~mdelahaye\n"
-"  Nicolas Velin https://launchpad.net/~nsv\n"
-"  Nicolas Velin https://launchpad.net/~nsv-fr\n"
 "  PETIT Aymeric https://launchpad.net/~mulx\n"
 "  Stooophe https://launchpad.net/~stooophe\n"
-"  Useless https://launchpad.net/~uselessboy\n"
 "  X https://launchpad.net/~fakhryfield\n"
-"  royto https://launchpad.net/~royto\n"
-"  seun_p4 https://launchpad.net/~seun-landsberg\n"
-"\n"
-"Launchpad Contributions:\n"
-"  Matthieu MORIN https://launchpad.net/~morinmatthieu\n"
-"  Mickael Delahaye https://launchpad.net/~mdelahaye\n"
-"  Nicolas Velin https://launchpad.net/~nsv\n"
-"  Nicolas Velin https://launchpad.net/~nsv-fr\n"
-"  PETIT Aymeric https://launchpad.net/~mulx\n"
-"  Stooophe https://launchpad.net/~stooophe\n"
-"  Useless https://launchpad.net/~uselessboy\n"
-"  X https://launchpad.net/~fakhryfield\n"
-"  royto https://launchpad.net/~royto\n"
-"  seun_p4 https://launchpad.net/~seun-landsberg\n"
-"\n"
-"Launchpad Contributions:\n"
-"  Matthieu MORIN https://launchpad.net/~morinmatthieu\n"
-"  Mickaël Delahaye https://launchpad.net/~mdelahaye\n"
 "  Nicolas Sabatier https://launchpad.net/~nicolassabatier\n"
-"  Nicolas Velin https://launchpad.net/~nsv\n"
-"  Nicolas Velin https://launchpad.net/~nsv-fr\n"
-"  PETIT Aymeric https://launchpad.net/~mulx\n"
 "  Pierre Rudloff https://launchpad.net/~tael67\n"
-"  Stooophe https://launchpad.net/~stooophe\n"
-"  Useless https://launchpad.net/~uselessboy\n"
-"  X https://launchpad.net/~fakhryfield\n"
-"  royto https://launchpad.net/~royto\n"
-"  seun_p4 https://launchpad.net/~seun-landsberg"
+"  Bogdan Butnaru https://launchpad.net/~bogdanb"
 
 #. Replace LANG with language you are translatig to.
 #: ../picard/ui/options/about.py:51
@@ -948,52 +2245,335 @@ msgstr "<br/>Traduit en Français par %s"
 #: ../picard/ui/options/about.py:55
 #, fuzzy, python-format
 msgid ""
-"<p align=\"center\"><span style=\"font-size:15px;font-weight:bold;"
-"\">MusicBrainz Picard</span><br/>\n"
+"<p align=\"center\"><span style=\"font-size:15px;font-weight:bold;\">MusicBrainz Picard</span><br/>\n"
 "Version %(version)s</p>\n"
 "<p align=\"center\"><strong>Supported formats</strong><br/>%(formats)s</p>\n"
 "<p align=\"center\"><strong>Please donate</strong><br/>\n"
-"Thank you for using Picard. Picard relies on the MusicBrainz database, which "
-"is operated by the MetaBrainz Foundation with the help of thousands of "
-"volunteers. If you like this application please consider donating to the "
-"MetaBrainz Foundation to keep the service running.</p>\n"
-"<p align=\"center\"><a href=\"http://metabrainz.org/donate/index.html"
-"\">Donate now!</a></p>\n"
+"Thank you for using Picard. Picard relies on the MusicBrainz database, which is operated by the MetaBrainz Foundation with the help of thousands of volunteers. If you like this application please consider donating to the MetaBrainz Foundation to keep the service running.</p>\n"
+"<p align=\"center\"><a href=\"http://metabrainz.org/donate/index.html\">Donate now!</a></p>\n"
 "<p align=\"center\"><strong>Credits</strong><br/>\n"
-"<small>Copyright © 2004-2008 Robert Kaye, Lukáš Lalinský and others%"
-"(translator-credits)s</small></p>\n"
-"<p align=\"center\"><a href=\"http://musicbrainz.org/doc/PicardTagger"
-"\">http://musicbrainz.org/doc/PicardTagger</a></p>\n"
+"<small>Copyright © 2004-2008 Robert Kaye, Lukáš Lalinský and others%(translator-credits)s</small></p>\n"
+"<p align=\"center\"><a href=\"http://musicbrainz.org/doc/PicardTagger\">http://musicbrainz.org/doc/PicardTagger</a></p>\n"
 msgstr ""
-"<p align=\"center\"><span style=\"font-size:15px;font-weight:bold;"
-"\">MusicBrainz Picard</span><br/>\n"
+"<p align=\"center\"><span style=\"font-size:15px;font-weight:bold;\">MusicBrainz Picard</span><br/>\n"
 "Version %(version)s</p>\n"
-"<p align=\"center\"><strong>Formats supportés:</strong> %(formats)s</p>\n"
-"<p align=\"center\"><small>Copyright © 2004-2007 Robert Kaye, Lukáš Lalinský "
-"and others%(translator-credits)s</small></p>\n"
-"<p align=\"center\"><a href=\"http://musicbrainz.org/doc/PicardTagger"
-"\">http://musicbrainz.org/doc/PicardTagger</a></p>\n"
+"<p align=\"center\"><strong>Formats supportés</strong><br/>%(formats)s</p>\n"
+"<p align=\"center\"><strong>Veuillez faire un don</strong><br/>\n"
+"Merci d'utiliser Picard. Picard utilise la base de données MusicBrainz, qui est géré par la Fondation MetaBrainz avec l'aide des milliers de volontaires. Si vous aimez ce logiciel pensez à faire un don à la Fondation MetaBrainz Foundation pour assurer l'entretien du service.</p>\n"
+"<p align=\"center\"><a href=\"http://metabrainz.org/donate/index.html\">Faites un don maintenent&nbsp;!</a></p>\n"
+"<p align=\"center\"><strong>Générique</strong><br/>\n"
+"<small>Copyright © 2004-2008 Robert Kaye, Lukáš Lalinský et autres%(translator-credits)s</small></p>\n"
+"<p align=\"center\"><a href=\"http://musicbrainz.org/doc/PicardTagger\">http://musicbrainz.org/doc/PicardTagger</a></p>\n"
+
+#: ../picard/ui/options/advanced.py:26
+msgid "Advanced"
+msgstr "Avancées"
+
+#: ../picard/ui/options/interface.py:31
+msgid "User Interface"
+msgstr "Interface utilisateur"
+
+#: ../picard/ui/options/interface.py:47
+msgid "System default"
+msgstr "Valeur par défaut du système"
+
+#: ../picard/ui/options/interface.py:71
+#, fuzzy
+msgid "Language changed"
+msgstr "Langue"
+
+#: ../picard/ui/options/interface.py:71
+msgid "You have changed the interface language. You have to restart Picard in order for the change to take effect."
+msgstr ""
+
+#: ../picard/ui/options/matching.py:29
+msgid "Matching"
+msgstr "Correspond"
+
+#: ../picard/ui/options/metadata.py:52
+msgid "None"
+msgstr ""
+
+#: ../picard/ui/options/naming.py:33
+#, fuzzy
+msgid "File Naming"
+msgstr "Nom de fichier"
+
+#: ../picard/ui/options/naming.py:86
+#: ../picard/ui/options/naming.py:90
+#: ../picard/ui/options/naming.py:93
+#: ../picard/ui/options/naming.py:95
+#: ../picard/ui/options/scripting.py:84
+msgid "Script Error"
+msgstr "Erreur de script"
 
 #: ../picard/ui/options/naming.py:93
 msgid "The file naming format must not be empty."
-msgstr ""
+msgstr "Le format des noms de fichiers ne doit pas être vide."
 
 #: ../picard/ui/options/naming.py:95
-#, fuzzy
 msgid "The multiple artist file naming format must not be empty."
-msgstr "Format du nom de fichier pour les artistes multiples"
+msgstr "Le format des noms de fichiers aux plusieurs auteurs ne doit pas être vide."
 
 #: ../picard/ui/options/naming.py:97
 msgid "Error"
-msgstr ""
+msgstr "Erreur"
 
 #: ../picard/ui/options/naming.py:97
 msgid "The location to move files to must not be empty."
+msgstr "La destination pour deplacer les fichiers ne doit pas être vide."
+
+#: ../picard/ui/options/scripting.py:63
+msgid "Scripting"
+msgstr "Scripts"
+
+#: ../picard/ui/options/tags.py:29
+msgid "Tags"
+msgstr "Étiquettes"
+
+#: ../picard/util/tags.py:24
+msgid "Date"
+msgstr "Date"
+
+#: ../picard/util/tags.py:25
+msgid "Album Artist"
+msgstr "Artiste de l'album"
+
+#: ../picard/util/tags.py:26
+msgid "Track Number"
+msgstr "Numéro de piste"
+
+#: ../picard/util/tags.py:27
+msgid "Total Tracks"
+msgstr "Nombre total de pistes"
+
+#: ../picard/util/tags.py:28
+msgid "Disc Number"
+msgstr "Numéro du disque"
+
+#: ../picard/util/tags.py:29
+msgid "Total Discs"
+msgstr "Nombres de disques Total"
+
+#: ../picard/util/tags.py:30
+#, fuzzy
+msgid "Album Artist Sort Order"
+msgstr "Artiste de l'album"
+
+#: ../picard/util/tags.py:31
+#, fuzzy
+msgid "Artist Sort Order"
+msgstr "Triés par artiste"
+
+#: ../picard/util/tags.py:32
+#, fuzzy
+msgid "Title Sort Order"
+msgstr "Triés par titre"
+
+#: ../picard/util/tags.py:33
+#, fuzzy
+msgid "Album Sort Order"
+msgstr "Groupements d'albums"
+
+#: ../picard/util/tags.py:34
+msgid "ASIN"
+msgstr "ASIN"
+
+#: ../picard/util/tags.py:35
+msgid "Grouping"
+msgstr "Groupement"
+
+#: ../picard/util/tags.py:37
+msgid "ISRC"
+msgstr "ISRC"
+
+#: ../picard/util/tags.py:38
+msgid "Mood"
+msgstr "Humeur"
+
+#: ../picard/util/tags.py:39
+msgid "BPM"
+msgstr "BPM"
+
+#: ../picard/util/tags.py:40
+#, fuzzy
+msgid "Copyright"
+msgstr "Copier"
+
+#: ../picard/util/tags.py:41
+msgid "Composer"
+msgstr "Compositeur"
+
+#: ../picard/util/tags.py:42
+#, fuzzy
+msgid "Conductor"
+msgstr "Conducteur"
+
+#: ../picard/util/tags.py:43
+msgid "Lyricist"
+msgstr "Parolier"
+
+#: ../picard/util/tags.py:44
+#, fuzzy
+msgid "Arranger"
+msgstr "Arrangeur"
+
+#: ../picard/util/tags.py:45
+msgid "Producer"
+msgstr "Producteur"
+
+#: ../picard/util/tags.py:46
+msgid "Engineer"
+msgstr "Ingénieur"
+
+#: ../picard/util/tags.py:47
+msgid "Subtitle"
+msgstr "Sous-titres"
+
+#: ../picard/util/tags.py:48
+#, fuzzy
+msgid "Disc Subtitle"
+msgstr "Sous-titres"
+
+#: ../picard/util/tags.py:49
+msgid "Remixer"
+msgstr "Remixeur"
+
+#: ../picard/util/tags.py:50
+#, fuzzy
+msgid "MusicBrainz Track Id"
+msgstr "MusicBrainz Picard"
+
+#: ../picard/util/tags.py:51
+#, fuzzy
+msgid "MusicBrainz Release Id"
+msgstr "MusicBrainz Picard"
+
+#: ../picard/util/tags.py:52
+#, fuzzy
+msgid "MusicBrainz Artist Id"
+msgstr "MusicBrainz Picard"
+
+#: ../picard/util/tags.py:53
+#, fuzzy
+msgid "MusicBrainz Release Artist Id"
+msgstr "MusicBrainz Picard"
+
+#: ../picard/util/tags.py:54
+#, fuzzy
+msgid "MusicBrainz TRM Id"
+msgstr "MusicBrainz Picard"
+
+#: ../picard/util/tags.py:55
+#, fuzzy
+msgid "MusicBrainz Disc Id"
+msgstr "MusicBrainz Picard"
+
+#: ../picard/util/tags.py:56
+#, fuzzy
+msgid "MusicBrainz Sort Name"
+msgstr "Serveur MusicBrainz"
+
+#: ../picard/util/tags.py:57
+msgid "MusicIP PUID"
+msgstr "MusicIP PUID"
+
+#: ../picard/util/tags.py:58
+#, fuzzy
+msgid "MusicIP Fingerprint"
+msgstr "Empreinte Sonore"
+
+#: ../picard/util/tags.py:59
+msgid "Disc Id"
 msgstr ""
 
+#: ../picard/util/tags.py:60
+msgid "Website"
+msgstr "Site Web"
+
+#: ../picard/util/tags.py:61
+msgid "Compilation"
+msgstr "Compilation"
+
+#: ../picard/util/tags.py:62
+msgid "Comment"
+msgstr "Commentaire"
+
+#: ../picard/util/tags.py:63
+msgid "Genre"
+msgstr "Genre"
+
+#: ../picard/util/tags.py:64
+msgid "Encoded By"
+msgstr "Encodé par"
+
+#: ../picard/util/tags.py:65
+#, fuzzy
+msgid "Performer"
+msgstr "Interprète"
+
+#: ../picard/util/tags.py:66
+#, fuzzy
+msgid "Release Type"
+msgstr "Date de sortie"
+
+#: ../picard/util/tags.py:67
+#, fuzzy
+msgid "Release Status"
+msgstr "Date de sortie"
+
+#: ../picard/util/tags.py:68
+#, fuzzy
+msgid "Release Country"
+msgstr "Date de sortie"
+
+#: ../picard/util/tags.py:69
+msgid "Record Label"
+msgstr "Label d' enregistrement"
+
+#: ../picard/util/tags.py:70
+msgid "Barcode"
+msgstr "Code-barre"
+
+#: ../picard/util/tags.py:71
+#, fuzzy
+msgid "Catalog Number"
+msgstr "Numéro de piste"
+
+#: ../picard/util/tags.py:72
+#, fuzzy
+msgid "Format"
+msgstr "Format :"
+
+#: ../picard/util/tags.py:73
+msgid "DJ-Mixer"
+msgstr "DJ-Mixer"
+
+#: ../picard/util/tags.py:74
+#, fuzzy
+msgid "Media"
+msgstr "Metadonnées"
+
+#: ../picard/util/tags.py:75
+msgid "Lyrics"
+msgstr "Paroles de chanson"
+
+#: ../picard/util/tags.py:76
+msgid "Mixer"
+msgstr "Mixeur"
+
+#: ../picard/util/tags.py:77
+msgid "Language"
+msgstr "Langue"
+
+#: ../picard/util/tags.py:78
+#, fuzzy
+msgid "Script"
+msgstr "Scripts"
+
 #: ../picard/util/webbrowser2.py:84
 msgid "Web Browser Error"
-msgstr ""
+msgstr "Erreur de navigateur web"
 
 #: ../picard/util/webbrowser2.py:84
 #, python-format
@@ -1002,215 +2582,120 @@ msgid ""
 "\n"
 "%s"
 msgstr ""
-
-#~ msgid "No matching tracks for file %s"
-#~ msgstr "Pas de piste correspondant au fichier %s"
-
-#~ msgid "File %s identified!"
-#~ msgstr "Fichier %s identifié!"
-
-#~ msgid "Looking up the metadata for file %s..."
-#~ msgstr "Recherche des métadonnées du fichier %s ..."
-
-#~ msgid "No matching releases for cluster %s"
-#~ msgstr "Pas de correspondance pour le groupe %s"
-
-#~ msgid "Cluster %s identified!"
-#~ msgstr "Groupement %s identifié !"
-
-#~ msgid "Looking up the metadata for cluster %s..."
-#~ msgstr "Recherche des métadonnées du groupement %s ..."
-
-#~ msgid "M3U Playlist (*.m3u)"
-#~ msgstr "Liste de lecture M3U (*.m3u)"
-
-#~ msgid "PLS Playlist (*.pls)"
-#~ msgstr "Liste de lecture PLS (*.pls)"
-
-#~ msgid "XSPF Playlist (*.xspf)"
-#~ msgstr "Liste de lecture XSPF (*.xspf)"
-
-#~ msgid "Submitting PUIDs..."
-#~ msgstr "Envoie des PUIDs ..."
-
-#~ msgid "PUIDs submission failed: %s"
-#~ msgstr "Echec d'envoi du PUIDs : %s"
-
-#~ msgid "PUIDs successfully submitted!"
-#~ msgstr "PUID envoyés avec succès."
+"Erreur en lançant le navigateur web\n"
+"\n"
+"%s"
 
 #~ msgid "New Version"
 #~ msgstr "Nouvelle Version"
-
 #~ msgid ""
 #~ "New version of Picard is available (%s). Would you like to download it "
 #~ "now?"
 #~ msgstr ""
 #~ "Une nouvelle version de Picard est disponible (%s). Voulez-vous la "
 #~ "télécharger maintenant ?"
+#~ msgid "Delete"
+#~ msgstr "Supprimer"
+#~ msgid "Maximal number of tags:"
+#~ msgstr "Nombre maximum de tags :"
 
-#~ msgid "Couldn't find PUID for file %s"
-#~ msgstr "PUID du fichier %s introuvable"
+#, fuzzy
+#~ msgid "Anal&yze"
+#~ msgstr "Analyser"
 
-#~ msgid "Creating fingerprint for file %s..."
-#~ msgstr "Création de l'empreinte pour le fichier %s ..."
+#, fuzzy
+#~ msgid "Make it so!"
+#~ msgstr "Qu'il en soit ainsi!"
 
-#~ msgid "Length"
-#~ msgstr "Durée"
+#, fuzzy
+#~ msgid "Performing a PUID lookup on file %s ..."
+#~ msgstr "Recherche de PUID en cours pour le fichier %s..."
 
-#~ msgid "&Ok"
-#~ msgstr "&Ok"
+#, fuzzy
+#~ msgid ""
+#~ "The move files option is enabled, but the destination directory is not "
+#~ "specified or invalid.\n"
+#~ "Please fix the move option or the destination directory option and try "
+#~ "again."
+#~ msgstr ""
+#~ "L'option pour déplacer les fichiers est activée, mais le répertoire de "
+#~ "destination n'est pas spécifié ou est invalide.\n"
+#~ "Désactivez l'option ou corrigez le nom du répertoire de destination dans "
+#~ "les préférences et réessayez."
 
-#~ msgid "About"
-#~ msgstr "A Propos"
+#, fuzzy
+#~ msgid "Artist translation"
+#~ msgstr "Traduction du nom de l'artiste"
 
-#~ msgid "Advanced"
-#~ msgstr "Avancées"
-
-#~ msgid "Matching"
-#~ msgstr "Correspond"
-
-#~ msgid "Scripting"
-#~ msgstr "Scripts"
-
-#~ msgid "Tags"
-#~ msgstr "Étiquettes"
-
-#~ msgid "User Interface"
-#~ msgstr "Interface utilisateur"
-
-#~ msgid "Date"
-#~ msgstr "Date"
-
-#~ msgid "Album Artist"
-#~ msgstr "Artiste de l'album"
-
-#~ msgid "Track Number"
-#~ msgstr "Numéro de piste"
-
-#~ msgid "Total Tracks"
-#~ msgstr "Nombre total de pistes"
-
-#~ msgid "Disc Number"
-#~ msgstr "Numéro du disque"
-
-#~ msgid "Total Discs"
-#~ msgstr "Nombres de disques Total"
-
-#~ msgid "ASIN"
-#~ msgstr "ASIN"
-
-#~ msgid "Grouping"
-#~ msgstr "Groupement"
-
-#~ msgid "ISRC"
-#~ msgstr "ISRC"
-
-#~ msgid "Mood"
-#~ msgstr "Humeur"
-
-#~ msgid "BPM"
-#~ msgstr "BPM"
-
-#~ msgid "Composer"
-#~ msgstr "Compositeur"
-
-#~ msgid "Lyricist"
-#~ msgstr "Parolier"
-
-#~ msgid "Producer"
-#~ msgstr "Producteur"
-
-#~ msgid "Engineer"
-#~ msgstr "Ingénieur"
-
-#~ msgid "Subtitle"
-#~ msgstr "Sous-titres"
-
-#~ msgid "Remixer"
-#~ msgstr "Remixeur"
-
-#~ msgid "MusicIP PUID"
-#~ msgstr "MusicIP PUID"
-
-#~ msgid "Website"
-#~ msgstr "Site Web"
-
-#~ msgid "Compilation"
-#~ msgstr "Compilation"
-
-#~ msgid "Comment"
-#~ msgstr "Commentaire"
-
-#~ msgid "Genre"
-#~ msgstr "Genre"
-
-#~ msgid "Encoded By"
-#~ msgstr "Encodé par"
-
-#~ msgid "Record Label"
-#~ msgstr "Label d' enregistrement"
-
-#~ msgid "Barcode"
-#~ msgstr "Code-barre"
-
-#~ msgid "DJ-Mixer"
-#~ msgstr "DJ-Mixer"
-
-#~ msgid "Lyrics"
-#~ msgstr "Paroles de chanson"
-
-#~ msgid "Mixer"
-#~ msgstr "Mixeur"
+#, fuzzy
+#~ msgid ""
+#~ "The Picard Tagger is a free application and you may\n"
+#~ "use it as long as you wish. However, providing\n"
+#~ "the MusicBrainz service does cost money and we rely\n"
+#~ "on donations from the community to keep the service\n"
+#~ "running. Please donate $10 to the MetaBrainz Foundation\n"
+#~ "which operates the MusicBrainz project. All donations\n"
+#~ "are tax deductible for US residents and will keep this\n"
+#~ "service alive and moving forward."
+#~ msgstr ""
+#~ "Picard Tagger est un logiciel libre et vous pouvez\n"
+#~ "l'utiliser autant que vous voulez. Néamoins, les services \n"
+#~ "fournis par MusicBrainz coûtent de l'argent et \n"
+#~ "nous comptons sur les dons de la communauté pour \n"
+#~ "continuer à fournir ces services. Merci de donner $10 à la fondation "
+#~ "MetaBrainz qui gère le projet MusicBrainz. Toutes les donations peuvent "
+#~ "être déduitent des impôts pour les habitants des USA et nous pourrons "
+#~ "continuer à fournir ces services et avancer."
 
+#, fuzzy
+#~ msgid "Accept PUID matches that are at least"
+#~ msgstr "Accepter les PUID au moins similaires de"
 #~ msgid "Ctrl+T"
 #~ msgstr "Ctrl+T"
-
 #~ msgid "Automatically analyze all new files"
 #~ msgstr "Analyser automatiquement les nouveaux fichiers"
 
-#~ msgid "Toolbar"
-#~ msgstr "Barre d'outils"
+#, fuzzy
+#~ msgid "Album artist:"
+#~ msgstr "Artiste de l'album"
 
+#, fuzzy
+#~ msgid "&Advanced"
+#~ msgstr "Avancées"
+
+#, fuzzy
+#~ msgid "A&dd Directory..."
+#~ msgstr "Ajouter &Répertoire...\tCtrl+D"
 #~ msgid "Are You Sure?"
 #~ msgstr "Etes-vous sûr ?"
-
 #~ msgid "Add &Files...\tCtrl+O"
 #~ msgstr "Ajouter &Fichiers...\tCtrl+O"
-
 #~ msgid "Add &Directory...\tCtrl+D"
 #~ msgstr "Ajouter &Répertoire...\tCtrl+D"
-
 #~ msgid "&Save Files\tCtrl+S"
 #~ msgstr "&Enregistrer Fichiers\tCtrl+S"
-
 #~ msgid "C&opy\tCtrl+C"
 #~ msgstr "C&opier\tCtrl+C"
-
 #~ msgid "Help"
 #~ msgstr "Aide"
-
 #~ msgid "Preferences"
 #~ msgstr "Préférences"
-
 #~ msgid "Time"
 #~ msgstr "Durée"
-
 #~ msgid "Albums"
 #~ msgstr "Albums"
-
 #~ msgid "Force Save"
 #~ msgstr "Forcer la sauvegarde"
-
 #~ msgid "Buy"
 #~ msgstr "Acheter"
-
 #~ msgid "Welcome to Picard!"
 #~ msgstr "Bienvenue dans Picard!"
-
 #~ msgid "Track Num"
 #~ msgstr "Numéro de piste"
 
+#, fuzzy
+#~ msgid "PUID Collision"
+#~ msgstr "Collision de PUID sur le fichier %s !"
 #~ msgid ""
 #~ "Version %s\n"
 #~ "\n"
@@ -1237,114 +2722,84 @@ msgstr ""
 #~ "grâce à une bourse de Helix Community.\n"
 #~ "\n"
 #~ "Types de fichiers supportés: %s"
-
-#~ msgid "Colors"
-#~ msgstr "Couleurs"
-
 #~ msgid "Font color"
 #~ msgstr "Couleur de police"
-
 #~ msgid "Directories"
 #~ msgstr "Répertoires"
-
 #~ msgid "Watch for new files"
 #~ msgstr "Détecter l'apparition de nouveaux fichiers dans ce dossier"
-
 #~ msgid "Watch this directory for new audio files"
 #~ msgstr "Détecter l'apparition de nouveaux fichiers dans ce dossier"
-
 #~ msgid "Encodings"
 #~ msgstr "Encodages"
-
 #~ msgid "all languages"
 #~ msgstr "toutes langues"
-
 #~ msgid "percent similar."
 #~ msgstr "% de similarité."
-
 #~ msgid "Load recently used albums on startup"
 #~ msgstr "Charger les albums récents au démarrage"
-
-#~ msgid "Language"
-#~ msgstr "Langue"
-
-#~ msgid "System default"
-#~ msgstr "Valeur par défaut du système"
-
 #~ msgid "Allowed filename characters"
 #~ msgstr "Caractères autorisés pour les noms de fichiers"
-
 #~ msgid "Use Windows-safe file names"
 #~ msgstr "Utiliser des noms de fichier compatibles Windows"
-
 #~ msgid "Number of tracks on the album"
 #~ msgstr "Nombre de morceaux sur l'album"
-
 #~ msgid "Track name"
 #~ msgstr "Titre de la piste"
-
 #~ msgid "Zero padded track number"
 #~ msgstr "Numéro de piste comblé avec des zéros"
-
 #~ msgid "File format (e.g. mp3, ogg, wav)"
 #~ msgstr "Types de fichier (mp3, ogg, wav...)"
-
 #~ msgid "Album type (album, single, EP, etc.)"
 #~ msgstr "Type d'album (album, single, EP, etc...)"
-
 #~ msgid "Album Status (official, promo, etc.)"
 #~ msgstr "Statut de l'album (officiel, promotionnel, etc...)"
-
 #~ msgid "Album release month"
 #~ msgstr "Mois de sortie de l'album"
-
 #~ msgid "Album release day"
 #~ msgstr "Jour de sortie de l'album"
-
 #~ msgid "Album release year"
 #~ msgstr "Année de sortie de l'album"
-
 #~ msgid "Use proxy server to access the Internet"
 #~ msgstr "Utiliser un serveur proxy pour accéder à Internet"
-
 #~ msgid "Proxy server to use"
 #~ msgstr "Serveur proxy à utiliser"
-
 #~ msgid "Proxy port"
 #~ msgstr "Port du Proxy"
-
 #~ msgid "ID3v2.4 only"
 #~ msgstr "ID3v2.4 seulement"
-
 #~ msgid "Save track/album"
 #~ msgstr "Sauver piste/album"
-
 #~ msgid "Artists"
 #~ msgstr "Artistes"
 
+#, fuzzy
+#~ msgid "Auto Tag"
+#~ msgstr "Modifier l'étiquette"
+
+#, fuzzy
+#~ msgid "Edit &Tags..."
+#~ msgstr "Modifier l'étiquette"
 #~ msgid "New files (drag files to tag here)"
 #~ msgstr "Nouveaux fichiers (déposez ici les fichiers à étiquetter)"
 
+#, fuzzy
+#~ msgid "updating album information"
+#~ msgstr "chargement des informations de l'album"
 #~ msgid "Submitting PUID information to MusicBrainz server ..."
 #~ msgstr "Soumission des PUID au serveur MusicBrainz ..."
-
 #~ msgid "Are you sure you want to exit the application?"
 #~ msgstr "Voulez-vous vraiment quitter l'application ?"
-
 #~ msgid "CD Lookup error -- is there a CD in the CD-ROM drive?"
 #~ msgstr ""
 #~ "Erreur lors de la consultation du CD : vérifiez que le lecteur de CD-ROM "
 #~ "contient bien un CD."
-
 #~ msgid "CD Lookup Failed"
 #~ msgstr "Erreur lors de la recherche du CD"
-
 #~ msgid "&Quick Start Guide"
 #~ msgstr "&Guide de démarrage rapide"
-
 #~ msgid "Quick Start Guide"
 #~ msgstr "Guide de démarrage rapide"
-
 #~ msgid ""
 #~ "You have not specified an username and password. In order to contribute "
 #~ "data to MusicBrainz, you must have a MusicBrainz account.\n"
@@ -1357,29 +2812,22 @@ msgstr ""
 #~ "compte MusicBrainz.\n"
 #~ "Voulez-vous créer un compte maintenant? Si vous avez déja un compte "
 #~ "MusicBrainz, entrez vos identifiants dans le menu options. "
-
 #~ msgid "Couldn't connect to the MusicBrainz server."
 #~ msgstr "Incapable de se connecter au serveur MusicBrainz"
-
 #~ msgid "Connection error"
 #~ msgstr "Erreur de connection"
-
 #~ msgid ""
 #~ "MusicBrainz Picard requires wxPython with UNICODE support.\n"
 #~ "Please download the appropriate toolkit from http://www.wxpython.org/"
 #~ msgstr ""
 #~ "MusicBrainz Picard requiert wxPython avec le support UNICODE.\n"
 #~ "Téléchargez SVP le logiciel approprié depuis http://www.wxpython.org/"
-
 #~ msgid "Unicode Required"
 #~ msgstr "Unicode Requis"
-
 #~ msgid "PUID collision on file %s!"
 #~ msgstr "Collision de PUID sur le fichier %s !"
-
 #~ msgid "Save error"
 #~ msgstr "Erreur de sauvegarde"
-
 #~ msgid ""
 #~ "Not all files could be saved. Please check for and examine tracks that "
 #~ "have an error icon in front of them. To retry saving the track, right "
@@ -1388,220 +2836,125 @@ msgstr ""
 #~ "Tous les fichiers n'ont pas put être sauvés. Veuillez examiner les "
 #~ "pistes. Pour réessayer de sauver une piste, cliquer dessus avec le bouton "
 #~ "droit et sélectionnez 'Effacer l'indicateur d'erreur'"
-
 #~ msgid "Select directory that contains music files"
 #~ msgstr "Sélectionnez un répertoire contenant des fichiers de musique"
-
 #~ msgid "Reload album from main server"
 #~ msgstr "Recharger l'album à partir du serveur principal"
-
 #~ msgid "Select or drag a folder from below"
 #~ msgstr "Sélectionnez ou déplacez un répertoire"
-
 #~ msgid "Drag files from below"
 #~ msgstr "Déplacer les fichiers à étiquetter"
-
 #~ msgid "Release date"
 #~ msgstr "Date de sortie"
-
 #~ msgid "%d%% similar"
 #~ msgstr "similaire à %d%%"
-
 #~ msgid "Please donate to MusicBrainz!"
 #~ msgstr "Merci de faire un don à MusicBrainz!"
-
-#~ msgid "Later"
-#~ msgstr "Plus tard"
-
 #~ msgid ""
 #~ "The destination directory %s does not exist. Please pick a valid "
 #~ "directory."
 #~ msgstr ""
 #~ "Le répertoire de destination %s n'existe pas. Veuillez sélectionner un "
 #~ "répertoire valide."
-
 #~ msgid "Select the encoding to use when reading and writing filenames"
 #~ msgstr ""
 #~ "Sélectionnez l'encodage à utiliser pour la lecture et l'écriture des noms "
 #~ "de fichiers"
 
+#, fuzzy
+#~ msgid "Automatically move clusters to albums that are at least"
+#~ msgstr "Sauvegarder automatiquement les pistes reconnues qui ont au moins"
 #~ msgid "Automatically save recognized tracks that are at least"
 #~ msgstr "Sauvegarder automatiquement les pistes reconnues qui ont au moins"
-
-#~ msgid "Czech"
-#~ msgstr "Tchèque"
-
-#~ msgid "German"
-#~ msgstr "Allemand"
-
-#~ msgid "English"
-#~ msgstr "Anglais"
-
-#~ msgid "English (UK)"
-#~ msgstr "Anglais (Royaume Uni)"
-
-#~ msgid "Spanish"
-#~ msgstr "Espagnol"
-
-#~ msgid "Finnish"
-#~ msgstr "Finnois"
-
-#~ msgid "French"
-#~ msgstr "Français"
-
-#~ msgid "Hungarian"
-#~ msgstr "Hongrois"
-
-#~ msgid "Icelandic"
-#~ msgstr "Islandais"
-
-#~ msgid "Italian"
-#~ msgstr "Italien"
-
-#~ msgid "Korean"
-#~ msgstr "Coréen"
-
-#~ msgid "Lithuanian"
-#~ msgstr "Lituanien"
-
-#~ msgid "Dutch"
-#~ msgstr "Hollandais"
-
-#~ msgid "Portuguese"
-#~ msgstr "portugais"
-
-#~ msgid "Romanian"
-#~ msgstr "roumain"
-
-#~ msgid "Russian"
-#~ msgstr "russe"
-
-#~ msgid "Slovak"
-#~ msgstr "slovaque"
-
-#~ msgid "Swedish"
-#~ msgstr "suédois"
-
 #~ msgid ""
 #~ "Note: This setting will take effect after you restart the application."
 #~ msgstr ""
 #~ "Note: vous devez redémarrer l'application pour que tout changement de "
 #~ "cette option soit pris en compte."
-
 #~ msgid "Rename files when writing metadata tags"
 #~ msgstr "Renommer les fichiers lors de l'écriture des étiquettes"
-
 #~ msgid "Naming Help"
 #~ msgstr "Aide"
-
 #~ msgid ""
 #~ "You may use the following variables in the filenaming\n"
 #~ "specifications in the options dialog:"
 #~ msgstr ""
 #~ "Les variables suivantes peuvent être utilisées\n"
 #~ "dans la fenêtre des options des règles de nommage:"
-
 #~ msgid "A %s in the naming specification will create a new subfolder."
 #~ msgstr "Un %s dans les règles de nommage créera un nouveau sous-répertoire."
-
 #~ msgid "Audio fingerprinting options"
 #~ msgstr "Options enpreintes sonore"
 
+#, fuzzy
+#~ msgid "Automatically select PUID collision tracks that are at least"
+#~ msgstr "Sauvegarder automatiquement les pistes reconnues qui ont au moins"
 #~ msgid "Write ID3v1 tags to MP3 files (ID3v2 tags will always be written)"
 #~ msgstr ""
 #~ "Ajouter aussi les étiquettes ID3v1 (les étiquettes ID3v2 sont toujours "
 #~ "écrites)"
-
 #~ msgid "Remove track/album"
 #~ msgstr "Supprimer piste/album"
-
 #~ msgid "Listen to track"
 #~ msgstr "Écouter une piste"
-
 #~ msgid "Album clusters"
 #~ msgstr "Groupements d'albums"
-
 #~ msgid "Unmatched files for this album"
 #~ msgstr "Fichiers sans correspondance pour cet album"
-
 #~ msgid "%d of %d tracks linked"
 #~ msgstr "%d pistes assignées sur %d"
-
 #~ msgid "Matched track highlighting"
 #~ msgstr "Sur-lignage des pistes reconnues"
-
 #~ msgid "Good match background color"
 #~ msgstr "Couleur de fond pour les pistes reconnues"
-
 #~ msgid "Bad match background color"
 #~ msgstr "Couleur de fond pour les pistes non reconnues"
-
 #~ msgid "Move files option"
 #~ msgstr "Option de déplacement des fichiers"
-
 #~ msgid "When matching tracks to albums, accept tracks that are at least"
 #~ msgstr ""
 #~ "Lors de la mise en correspondance entre albums et pistes,accepter les "
 #~ "pistes qui ont au moins"
-
 #~ msgid "CD-ROM drive path to use for lookups"
 #~ msgstr "Chemin du lecteur de cédérom à utiliser pour les consultations"
-
 #~ msgid "Launch MB Tagger automatically for inserted Audio CDs"
 #~ msgstr "Lancer Picard automatiquement à l'insertion d'un CD de musique."
-
 #~ msgid ""
 #~ "Failed to set the proper registy values to enable launching the tagger "
 #~ "after CD insertion. "
 #~ msgstr ""
 #~ "La modification des entrées de la base de registre permettant le "
 #~ "lancement automatique de l'étiquetteur à l'insertion d'un a échouée. "
-
 #~ msgid "Default CD setting failed"
 #~ msgstr "Les options par défaut du CD ont échouées"
-
 #~ msgid "File format naming specification"
 #~ msgstr "Convention pour les noms de fichier"
-
 #~ msgid "Various artist file format naming specification"
 #~ msgstr "Convention pour les noms de fichier avec artistes multiples"
-
 #~ msgid "Note: Leave blank to allow all possible characters"
 #~ msgstr "Note: laissez le champ vide pour autoriser tout caractère"
-
 #~ msgid "Track artist name"
 #~ msgstr "Nom de l'artiste pour la piste"
-
 #~ msgid "Track artist sortname"
 #~ msgstr "Nom de classement de l'artiste pour la piste"
-
 #~ msgid "The first character of the artist sortname"
 #~ msgstr "Le premier caractère du nom de classement de l'artiste"
-
 #~ msgid "The first two characters of the artist sortname"
 #~ msgstr "Les deux premiers caractères du nom de classement de l'artiste"
-
 #~ msgid "The first three characters of the artist sortname"
 #~ msgstr "Les 3 premiers caractères du nom de classement de l'artiste"
-
 #~ msgid "Naming specification help"
 #~ msgstr "Aide sur les règles de nommage"
-
 #~ msgid "Various artist name"
 #~ msgstr "Nom à utliser pour un album avec artistes multiples"
-
 #~ msgid "Open file"
 #~ msgstr "Ajouter un fichier"
-
 #~ msgid "Open directory"
 #~ msgstr "Ajouter un répertoire"
-
 #~ msgid "Edit options"
 #~ msgstr "Editer les préférences"
-
 #~ msgid "Exit"
 #~ msgstr "Quitter"
-
 #~ msgid ""
 #~ "The MusicBrainz Tagger requires wx.Widgets with UNICODE support.\n"
 #~ "Please download the appropriate toolkit from  http://www.wxwidgets.com"
@@ -1609,12 +2962,13 @@ msgstr ""
 #~ "Picard nécessite une librairie wx.Widgets avec support UNICODE.\n"
 #~ "Veuillez télécharger une version apropriée sur http://www.wxwidgets.com"
 
+#, fuzzy
+#~ msgid "Unicode required"
+#~ msgstr "Unicode Requis"
 #~ msgid "Sorry, there is no help file yet."
 #~ msgstr "Désolé, il n'y a pas encore de fichier d'aide disponible."
-
 #~ msgid "Use Internet Explorer settings for proxy support."
 #~ msgstr "Utiliser les réglages de Internet Explorer pour le proxy"
-
 #~ msgid ""
 #~ "If you use an automatic proxy configuration in Internet\n"
 #~ "Explorer, uncheck the box above and enter your\n"
@@ -1623,10 +2977,8 @@ msgstr ""
 #~ "Si vous utilisez les réglages de proxy automatique\n"
 #~ "dans Internet Explorer, décochez l'option ci-dessus\n"
 #~ "et saisissez le nom et le port du proxy ci-dessous:"
-
 #~ msgid "TRM analyzer thread priority"
 #~ msgstr "Priorité de la tache d'analyse des TRM"
-
 #~ msgid ""
 #~ "NOTE: This application can automatically authenticate the\n"
 #~ "MusicBrainz user, but the user name and password will be\n"
@@ -1635,3 +2987,4 @@ msgstr ""
 #~ "Note: cette application peut automatiquement s'authentifier\n"
 #~ "auprès de MusicBrainz, mais l'identifiant et le mot de passe\n"
 #~ "seront transmis à MusicBrainz en clair!"
+
diff --git a/po/fy.po b/po/fy.po
index 2155d7213..c4906a953 100644
--- a/po/fy.po
+++ b/po/fy.po
@@ -7,35 +7,1308 @@ msgid ""
 msgstr ""
 "Project-Id-Version: picard\n"
 "Report-Msgid-Bugs-To: http://bugs.musicbrainz.org/\n"
-"POT-Creation-Date: 2008-12-01 18:20+0100\n"
-"PO-Revision-Date: 2008-07-27 20:32+0000\n"
-"Last-Translator: Lukáš Lalinský <lalinsky@gmail.com>\n"
+"POT-Creation-Date: 2009-01-25 12:23+0100\n"
+"PO-Revision-Date: 2009-01-25 13:18+0100\n"
+"Last-Translator: Philipp Wolfer <phw@rubyforge.org>\n"
 "Language-Team: Frisian <fy@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2008-12-01 17:02+0000\n"
+"X-Launchpad-Export-Date: 2009-01-24 23:28+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
-#: ../picard/album.py:108 ../picard/cluster.py:248
+#: ../picard/album.py:108
+#: ../picard/cluster.py:248
 msgid "Unmatched Files"
 msgstr ""
 
-#: ../picard/album.py:269
+#: ../picard/album.py:281
 #, python-format
 msgid "[couldn't load album %s]"
 msgstr ""
 
-#: ../picard/album.py:305
+#: ../picard/album.py:317
 msgid "[loading album information]"
 msgstr ""
 
-#: ../picard/tagger.py:472
+#: ../picard/cluster.py:164
+#: ../picard/cluster.py:175
+#, python-format
+msgid "No matching releases for cluster %s"
+msgstr ""
+
+#: ../picard/cluster.py:177
+#, python-format
+msgid "Cluster %s identified!"
+msgstr ""
+
+#: ../picard/cluster.py:182
+#, python-format
+msgid "Looking up the metadata for cluster %s..."
+msgstr ""
+
+#: ../picard/const.py:40
+msgid "CD"
+msgstr ""
+
+#: ../picard/const.py:41
+msgid "DVD"
+msgstr ""
+
+#: ../picard/const.py:42
+msgid "SACD"
+msgstr ""
+
+#: ../picard/const.py:43
+msgid "LaserDisc"
+msgstr ""
+
+#: ../picard/const.py:44
+msgid "MiniDisc"
+msgstr ""
+
+#: ../picard/const.py:45
+msgid "Vinyl"
+msgstr ""
+
+#: ../picard/const.py:46
+msgid "Cassette"
+msgstr ""
+
+#: ../picard/const.py:47
+msgid "Cartridge (4/8-tracks)"
+msgstr ""
+
+#: ../picard/const.py:48
+msgid "Reel-to-Reel"
+msgstr ""
+
+#: ../picard/const.py:49
+msgid "DAT"
+msgstr ""
+
+#: ../picard/const.py:50
+msgid "Digital Media"
+msgstr ""
+
+#: ../picard/const.py:51
+msgid "Wax Cylinder"
+msgstr ""
+
+#: ../picard/const.py:52
+msgid "Piano Roll"
+msgstr ""
+
+#: ../picard/const.py:53
+#, fuzzy
+msgid "Other"
+msgstr "Letter"
+
+#: ../picard/const.py:58
+msgid "Bangladesh"
+msgstr ""
+
+#: ../picard/const.py:59
+msgid "Belgium"
+msgstr ""
+
+#: ../picard/const.py:60
+msgid "Burkina Faso"
+msgstr ""
+
+#: ../picard/const.py:61
+#, fuzzy
+msgid "Bulgaria"
+msgstr "Hongaarsk"
+
+#: ../picard/const.py:62
+msgid "Barbados"
+msgstr ""
+
+#: ../picard/const.py:63
+msgid "Wallis and Futuna Islands"
+msgstr ""
+
+#: ../picard/const.py:64
+#, fuzzy
+msgid "Bermuda"
+msgstr "Dútsk"
+
+#: ../picard/const.py:65
+msgid "Brunei Darussalam"
+msgstr ""
+
+#: ../picard/const.py:66
+msgid "Bolivia"
+msgstr ""
+
+#: ../picard/const.py:67
+msgid "Bahrain"
+msgstr ""
+
+#: ../picard/const.py:68
+msgid "Burundi"
+msgstr ""
+
+#: ../picard/const.py:69
+msgid "Benin"
+msgstr ""
+
+#: ../picard/const.py:70
+msgid "Bhutan"
+msgstr ""
+
+#: ../picard/const.py:71
+msgid "Jamaica"
+msgstr ""
+
+#: ../picard/const.py:72
+msgid "Bouvet Island"
+msgstr ""
+
+#: ../picard/const.py:73
+msgid "Botswana"
+msgstr ""
+
+#: ../picard/const.py:74
+msgid "Samoa"
+msgstr ""
+
+#: ../picard/const.py:75
+msgid "Brazil"
+msgstr ""
+
+#: ../picard/const.py:76
+msgid "Bahamas"
+msgstr ""
+
+#: ../picard/const.py:77
+msgid "Belarus"
+msgstr ""
+
+#: ../picard/const.py:78
+msgid "Belize"
+msgstr ""
+
+#: ../picard/const.py:79
+msgid "Russian Federation"
+msgstr ""
+
+#: ../picard/const.py:80
+msgid "Rwanda"
+msgstr ""
+
+#: ../picard/const.py:81
+msgid "Reunion"
+msgstr ""
+
+#: ../picard/const.py:82
+msgid "Turkmenistan"
+msgstr ""
+
+#: ../picard/const.py:83
+msgid "Tajikistan"
+msgstr ""
+
+#: ../picard/const.py:84
+#, fuzzy
+msgid "Romania"
+msgstr "Roemeensk"
+
+#: ../picard/const.py:85
+msgid "Tokela"
+msgstr ""
+
+#: ../picard/const.py:86
+msgid "Guinea-Bissa"
+msgstr ""
+
+#: ../picard/const.py:87
+msgid "Guam"
+msgstr ""
+
+#: ../picard/const.py:88
+msgid "Guatemala"
+msgstr ""
+
+#: ../picard/const.py:89
+msgid "Greece"
+msgstr ""
+
+#: ../picard/const.py:90
+msgid "Equatorial Guinea"
+msgstr ""
+
+#: ../picard/const.py:91
+msgid "Guadeloupe"
+msgstr ""
+
+#: ../picard/const.py:92
+msgid "Japan"
+msgstr ""
+
+#: ../picard/const.py:93
+msgid "Guyana"
+msgstr ""
+
+#: ../picard/const.py:94
+#, fuzzy
+msgid "French Guiana"
+msgstr "Frânsk"
+
+#: ../picard/const.py:95
+#, fuzzy
+msgid "Georgia"
+msgstr "Dútsk"
+
+#: ../picard/const.py:96
+msgid "Grenada"
+msgstr ""
+
+#: ../picard/const.py:97
+msgid "United Kingdom"
+msgstr ""
+
+#: ../picard/const.py:98
+msgid "Gabon"
+msgstr ""
+
+#: ../picard/const.py:99
+msgid "El Salvador"
+msgstr ""
+
+#: ../picard/const.py:100
+#, fuzzy
+msgid "Guinea"
+msgstr "Algemien"
+
+#: ../picard/const.py:101
+msgid "Gambia"
+msgstr ""
+
+#: ../picard/const.py:102
+msgid "Greenland"
+msgstr ""
+
+#: ../picard/const.py:103
+msgid "Gibraltar"
+msgstr ""
+
+#: ../picard/const.py:104
+msgid "Ghana"
+msgstr ""
+
+#: ../picard/const.py:105
+#, fuzzy
+msgid "Oman"
+msgstr "Dútsk"
+
+#: ../picard/const.py:106
+msgid "Tunisia"
+msgstr ""
+
+#: ../picard/const.py:107
+#, fuzzy
+msgid "Jordan"
+msgstr "Koreaansk"
+
+#: ../picard/const.py:108
+msgid "Haiti"
+msgstr ""
+
+#: ../picard/const.py:109
+#, fuzzy
+msgid "Hungary"
+msgstr "Hongaarsk"
+
+#: ../picard/const.py:110
+msgid "Hong Kong"
+msgstr ""
+
+#: ../picard/const.py:111
+msgid "Honduras"
+msgstr ""
+
+#: ../picard/const.py:112
+msgid "Heard and Mc Donald Islands"
+msgstr ""
+
+#: ../picard/const.py:113
+msgid "Venezuela"
+msgstr ""
+
+#: ../picard/const.py:114
+msgid "Puerto Rico"
+msgstr ""
+
+#: ../picard/const.py:115
+msgid "Pala"
+msgstr ""
+
+#: ../picard/const.py:116
+#, fuzzy
+msgid "Portugal"
+msgstr "Portegeesk"
+
+#: ../picard/const.py:117
+msgid "Svalbard and Jan Mayen Islands"
+msgstr ""
+
+#: ../picard/const.py:118
+msgid "Paraguay"
+msgstr ""
+
+#: ../picard/const.py:119
+msgid "Iraq"
+msgstr ""
+
+#: ../picard/const.py:120
+msgid "Panama"
+msgstr ""
+
+#: ../picard/const.py:121
+msgid "French Polynesia"
+msgstr ""
+
+#: ../picard/const.py:122
+msgid "Papua New Guinea"
+msgstr ""
+
+#: ../picard/const.py:123
+msgid "Per"
+msgstr ""
+
+#: ../picard/const.py:124
+msgid "Pakistan"
+msgstr ""
+
+#: ../picard/const.py:125
+msgid "Philippines"
+msgstr ""
+
+#: ../picard/const.py:126
+msgid "Pitcairn"
+msgstr ""
+
+#: ../picard/const.py:127
+msgid "Poland"
+msgstr ""
+
+#: ../picard/const.py:128
+msgid "St. Pierre and Miquelon"
+msgstr ""
+
+#: ../picard/const.py:129
+msgid "Zambia"
+msgstr ""
+
+#: ../picard/const.py:130
+msgid "Western Sahara"
+msgstr ""
+
+#: ../picard/const.py:131
+msgid "Estonia"
+msgstr ""
+
+#: ../picard/const.py:132
+msgid "Egypt"
+msgstr ""
+
+#: ../picard/const.py:133
+msgid "South Africa"
+msgstr ""
+
+#: ../picard/const.py:134
+msgid "Ecuador"
+msgstr ""
+
+#: ../picard/const.py:135
+#, fuzzy
+msgid "Italy"
+msgstr "Italjaansk"
+
+#: ../picard/const.py:136
+msgid "Viet Nam"
+msgstr ""
+
+#: ../picard/const.py:137
+msgid "Solomon Islands"
+msgstr ""
+
+#: ../picard/const.py:138
+msgid "Ethiopia"
+msgstr ""
+
+#: ../picard/const.py:139
+#, fuzzy
+msgid "Somalia"
+msgstr "Roemeensk"
+
+#: ../picard/const.py:140
+msgid "Zimbabwe"
+msgstr ""
+
+#: ../picard/const.py:141
+msgid "Saudi Arabia"
+msgstr ""
+
+#: ../picard/const.py:142
+#, fuzzy
+msgid "Spain"
+msgstr "Spaansk"
+
+#: ../picard/const.py:143
+msgid "Eritrea"
+msgstr ""
+
+#: ../picard/const.py:144
+msgid "Moldova, Republic of"
+msgstr ""
+
+#: ../picard/const.py:145
+msgid "Madagascar"
+msgstr ""
+
+#: ../picard/const.py:146
+msgid "Morocco"
+msgstr ""
+
+#: ../picard/const.py:147
+msgid "Monaco"
+msgstr ""
+
+#: ../picard/const.py:148
+msgid "Uzbekistan"
+msgstr ""
+
+#: ../picard/const.py:149
+msgid "Myanmar"
+msgstr ""
+
+#: ../picard/const.py:150
+msgid "Mali"
+msgstr ""
+
+#: ../picard/const.py:151
+msgid "Maca"
+msgstr ""
+
+#: ../picard/const.py:152
+msgid "Mongolia"
+msgstr ""
+
+#: ../picard/const.py:153
+msgid "Marshall Islands"
+msgstr ""
+
+#: ../picard/const.py:154
+msgid "Macedonia, The Former Yugoslav Republic of"
+msgstr ""
+
+#: ../picard/const.py:155
+msgid "Mauritius"
+msgstr ""
+
+#: ../picard/const.py:156
+msgid "Malta"
+msgstr ""
+
+#: ../picard/const.py:157
+msgid "Malawi"
+msgstr ""
+
+#: ../picard/const.py:158
+msgid "Maldives"
+msgstr ""
+
+#: ../picard/const.py:159
+msgid "Martinique"
+msgstr ""
+
+#: ../picard/const.py:160
+msgid "Northern Mariana Islands"
+msgstr ""
+
+#: ../picard/const.py:161
+msgid "Montserrat"
+msgstr ""
+
+#: ../picard/const.py:162
+#, fuzzy
+msgid "Mauritania"
+msgstr "Litousk"
+
+#: ../picard/const.py:163
+msgid "Uganda"
+msgstr ""
+
+#: ../picard/const.py:164
+msgid "Malaysia"
+msgstr ""
+
+#: ../picard/const.py:165
+msgid "Mexico"
+msgstr ""
+
+#: ../picard/const.py:166
+msgid "Israel"
+msgstr ""
+
+#: ../picard/const.py:167
+#, fuzzy
+msgid "France"
+msgstr "Ofbrekke"
+
+#: ../picard/const.py:168
+msgid "British Indian Ocean Territory"
+msgstr ""
+
+#: ../picard/const.py:169
+msgid "St. Helena"
+msgstr ""
+
+#: ../picard/const.py:170
+msgid "Finland"
+msgstr ""
+
+#: ../picard/const.py:171
+msgid "Fiji"
+msgstr ""
+
+#: ../picard/const.py:172
+msgid "Falkland Islands (Malvinas)"
+msgstr ""
+
+#: ../picard/const.py:173
+msgid "Micronesia, Federated States of"
+msgstr ""
+
+#: ../picard/const.py:174
+msgid "Faroe Islands"
+msgstr ""
+
+#: ../picard/const.py:175
+msgid "Nicaragua"
+msgstr ""
+
+#: ../picard/const.py:176
+msgid "Netherlands"
+msgstr ""
+
+#: ../picard/const.py:177
+msgid "Norway"
+msgstr ""
+
+#: ../picard/const.py:178
+msgid "Namibia"
+msgstr ""
+
+#: ../picard/const.py:179
+msgid "Vanuat"
+msgstr ""
+
+#: ../picard/const.py:180
+msgid "New Caledonia"
+msgstr ""
+
+#: ../picard/const.py:181
+msgid "Niger"
+msgstr ""
+
+#: ../picard/const.py:182
+msgid "Norfolk Island"
+msgstr ""
+
+#: ../picard/const.py:183
+msgid "Nigeria"
+msgstr ""
+
+#: ../picard/const.py:184
+msgid "New Zealand"
+msgstr ""
+
+#: ../picard/const.py:185
+msgid "Zaire"
+msgstr ""
+
+#: ../picard/const.py:186
+msgid "Nepal"
+msgstr ""
+
+#: ../picard/const.py:187
+msgid "Naur"
+msgstr ""
+
+#: ../picard/const.py:188
+msgid "Niue"
+msgstr ""
+
+#: ../picard/const.py:189
+msgid "Cook Islands"
+msgstr ""
+
+#: ../picard/const.py:190
+msgid "Cote d'Ivoire"
+msgstr ""
+
+#: ../picard/const.py:191
+msgid "Switzerland"
+msgstr ""
+
+#: ../picard/const.py:192
+msgid "Colombia"
+msgstr ""
+
+#: ../picard/const.py:193
+msgid "China"
+msgstr ""
+
+#: ../picard/const.py:194
+msgid "Cameroon"
+msgstr ""
+
+#: ../picard/const.py:195
+#, fuzzy
+msgid "Chile"
+msgstr "Triem"
+
+#: ../picard/const.py:196
+msgid "Cocos (Keeling) Islands"
+msgstr ""
+
+#: ../picard/const.py:197
+msgid "Canada"
+msgstr ""
+
+#: ../picard/const.py:198
+msgid "Congo"
+msgstr ""
+
+#: ../picard/const.py:199
+msgid "Central African Republic"
+msgstr ""
+
+#: ../picard/const.py:200
+msgid "Czech Republic"
+msgstr ""
+
+#: ../picard/const.py:201
+msgid "Cyprus"
+msgstr ""
+
+#: ../picard/const.py:202
+msgid "Christmas Island"
+msgstr ""
+
+#: ../picard/const.py:203
+msgid "Costa Rica"
+msgstr ""
+
+#: ../picard/const.py:204
+msgid "Cape Verde"
+msgstr ""
+
+#: ../picard/const.py:205
+msgid "Cuba"
+msgstr ""
+
+#: ../picard/const.py:206
+msgid "Swaziland"
+msgstr ""
+
+#: ../picard/const.py:207
+msgid "Syrian Arab Republic"
+msgstr ""
+
+#: ../picard/const.py:208
+msgid "Kyrgyzstan"
+msgstr ""
+
+#: ../picard/const.py:209
+msgid "Kenya"
+msgstr ""
+
+#: ../picard/const.py:210
+msgid "Suriname"
+msgstr ""
+
+#: ../picard/const.py:211
+msgid "Kiribati"
+msgstr ""
+
+#: ../picard/const.py:212
+msgid "Cambodia"
+msgstr ""
+
+#: ../picard/const.py:213
+msgid "Saint Kitts and Nevis"
+msgstr ""
+
+#: ../picard/const.py:214
+#, fuzzy
+msgid "Comoros"
+msgstr "Kleuren"
+
+#: ../picard/const.py:215
+msgid "Sao Tome and Principe"
+msgstr ""
+
+#: ../picard/const.py:216
+#, fuzzy
+msgid "Slovenia"
+msgstr "Slowaaksk"
+
+#: ../picard/const.py:217
+msgid "Kuwait"
+msgstr ""
+
+#: ../picard/const.py:218
+#, fuzzy
+msgid "Senegal"
+msgstr "Algemien"
+
+#: ../picard/const.py:219
+msgid "San Marino"
+msgstr ""
+
+#: ../picard/const.py:220
+msgid "Sierra Leone"
+msgstr ""
+
+#: ../picard/const.py:221
+msgid "Seychelles"
+msgstr ""
+
+#: ../picard/const.py:222
+msgid "Kazakhstan"
+msgstr ""
+
+#: ../picard/const.py:223
+msgid "Cayman Islands"
+msgstr ""
+
+#: ../picard/const.py:224
+msgid "Singapore"
+msgstr ""
+
+#: ../picard/const.py:225
+#, fuzzy
+msgid "Sweden"
+msgstr "Sweedsk"
+
+#: ../picard/const.py:226
+msgid "Sudan"
+msgstr ""
+
+#: ../picard/const.py:227
+msgid "Dominican Republic"
+msgstr ""
+
+#: ../picard/const.py:228
+#, fuzzy
+msgid "Dominica"
+msgstr "Roemeensk"
+
+#: ../picard/const.py:229
+#, fuzzy
+msgid "Djibouti"
+msgstr "Oer"
+
+#: ../picard/const.py:230
+msgid "Denmark"
+msgstr ""
+
+#: ../picard/const.py:231
+msgid "Virgin Islands (British)"
+msgstr ""
+
+#: ../picard/const.py:232
+#, fuzzy
+msgid "Germany"
+msgstr "Dútsk"
+
+#: ../picard/const.py:233
+msgid "Yemen"
+msgstr ""
+
+#: ../picard/const.py:234
+msgid "Algeria"
+msgstr ""
+
+#: ../picard/const.py:235
+msgid "United States"
+msgstr ""
+
+#: ../picard/const.py:236
+msgid "Uruguay"
+msgstr ""
+
+#: ../picard/const.py:237
+msgid "Mayotte"
+msgstr ""
+
+#: ../picard/const.py:238
+msgid "United States Minor Outlying Islands"
+msgstr ""
+
+#: ../picard/const.py:239
+msgid "Lebanon"
+msgstr ""
+
+#: ../picard/const.py:240
+msgid "Saint Lucia"
+msgstr ""
+
+#: ../picard/const.py:241
+msgid "Lao People's Democratic Republic"
+msgstr ""
+
+#: ../picard/const.py:242
+msgid "Tuval"
+msgstr ""
+
+#: ../picard/const.py:243
+#, fuzzy
+msgid "Taiwan"
+msgstr "Italjaansk"
+
+#: ../picard/const.py:244
+msgid "Trinidad and Tobago"
+msgstr ""
+
+#: ../picard/const.py:245
+msgid "Turkey"
+msgstr ""
+
+#: ../picard/const.py:246
+msgid "Sri Lanka"
+msgstr ""
+
+#: ../picard/const.py:247
+msgid "Liechtenstein"
+msgstr ""
+
+#: ../picard/const.py:248
+msgid "Latvia"
+msgstr ""
+
+#: ../picard/const.py:249
+msgid "Tonga"
+msgstr ""
+
+#: ../picard/const.py:250
+#, fuzzy
+msgid "Lithuania"
+msgstr "Litousk"
+
+#: ../picard/const.py:251
+msgid "Luxembourg"
+msgstr ""
+
+#: ../picard/const.py:252
+msgid "Liberia"
+msgstr ""
+
+#: ../picard/const.py:253
+msgid "Lesotho"
+msgstr ""
+
+#: ../picard/const.py:254
+msgid "Thailand"
+msgstr ""
+
+#: ../picard/const.py:255
+msgid "French Southern Territories"
+msgstr ""
+
+#: ../picard/const.py:256
+msgid "Togo"
+msgstr ""
+
+#: ../picard/const.py:257
+msgid "Chad"
+msgstr ""
+
+#: ../picard/const.py:258
+msgid "Turks and Caicos Islands"
+msgstr ""
+
+#: ../picard/const.py:259
+msgid "Libyan Arab Jamahiriya"
+msgstr ""
+
+#: ../picard/const.py:260
+msgid "Vatican City State (Holy See)"
+msgstr ""
+
+#: ../picard/const.py:261
+msgid "Saint Vincent and The Grenadines"
+msgstr ""
+
+#: ../picard/const.py:262
+msgid "United Arab Emirates"
+msgstr ""
+
+#: ../picard/const.py:263
+msgid "Andorra"
+msgstr ""
+
+#: ../picard/const.py:264
+msgid "Antigua and Barbuda"
+msgstr ""
+
+#: ../picard/const.py:265
+msgid "Afghanistan"
+msgstr ""
+
+#: ../picard/const.py:266
+msgid "Anguilla"
+msgstr ""
+
+#: ../picard/const.py:267
+msgid "Virgin Islands (U.S.)"
+msgstr ""
+
+#: ../picard/const.py:268
+#, fuzzy
+msgid "Iceland"
+msgstr "Yslânsk"
+
+#: ../picard/const.py:269
+msgid "Iran (Islamic Republic of)"
+msgstr ""
+
+#: ../picard/const.py:270
+msgid "Armenia"
+msgstr ""
+
+#: ../picard/const.py:271
+msgid "Albania"
+msgstr ""
+
+#: ../picard/const.py:272
+msgid "Angola"
+msgstr ""
+
+#: ../picard/const.py:273
+msgid "Netherlands Antilles"
+msgstr ""
+
+#: ../picard/const.py:274
+msgid "Antarctica"
+msgstr ""
+
+#: ../picard/const.py:275
+msgid "American Samoa"
+msgstr ""
+
+#: ../picard/const.py:276
+msgid "Argentina"
+msgstr ""
+
+#: ../picard/const.py:277
+#, fuzzy
+msgid "Australia"
+msgstr "Italjaansk"
+
+#: ../picard/const.py:278
+msgid "Austria"
+msgstr ""
+
+#: ../picard/const.py:279
+msgid "Aruba"
+msgstr ""
+
+#: ../picard/const.py:280
+#, fuzzy
+msgid "India"
+msgstr "Pleatslike Metadata"
+
+#: ../picard/const.py:281
+msgid "Tanzania, United Republic of"
+msgstr ""
+
+#: ../picard/const.py:282
+msgid "Azerbaijan"
+msgstr ""
+
+#: ../picard/const.py:283
+#, fuzzy
+msgid "Ireland"
+msgstr "Yslânsk"
+
+#: ../picard/const.py:284
+msgid "Indonesia"
+msgstr ""
+
+#: ../picard/const.py:285
+msgid "Ukraine"
+msgstr ""
+
+#: ../picard/const.py:286
+#, fuzzy
+msgid "Qatar"
+msgstr "Letter"
+
+#: ../picard/const.py:287
+msgid "Mozambique"
+msgstr ""
+
+#: ../picard/const.py:288
+msgid "Bosnia and Herzegovina"
+msgstr ""
+
+#: ../picard/const.py:289
+msgid "Congo, The Democratic Republic of the"
+msgstr ""
+
+#: ../picard/const.py:290
+msgid "Serbia and Montenegro"
+msgstr ""
+
+#: ../picard/const.py:291
+msgid "Croatia"
+msgstr ""
+
+#: ../picard/const.py:292
+msgid "Korea (North), Democratic People's Republic of"
+msgstr ""
+
+#: ../picard/const.py:293
+msgid "Korea (South), Republic of"
+msgstr ""
+
+#: ../picard/const.py:294
+#, fuzzy
+msgid "Slovakia"
+msgstr "Slowaaksk"
+
+#: ../picard/const.py:295
+msgid "Soviet Union (historical, 1922-1991)"
+msgstr ""
+
+#: ../picard/const.py:296
+msgid "East Timor"
+msgstr ""
+
+#: ../picard/const.py:297
+msgid "Czechoslovakia (historical, 1918-1992)"
+msgstr ""
+
+#: ../picard/const.py:298
+msgid "Europe"
+msgstr ""
+
+#: ../picard/const.py:299
+msgid "East Germany (historical, 1949-1990)"
+msgstr ""
+
+#: ../picard/const.py:300
+msgid "[Unknown Country]"
+msgstr ""
+
+#: ../picard/const.py:301
+msgid "[Worldwide]"
+msgstr ""
+
+#: ../picard/const.py:302
+msgid "Yugoslavia (historical, 1918-1992)"
+msgstr ""
+
+#: ../picard/const.py:307
+#, fuzzy
+msgid "Catalan"
+msgstr "Italjaansk"
+
+#: ../picard/const.py:308
+msgid "Czech"
+msgstr "Tsjechysk"
+
+#: ../picard/const.py:309
+msgid "Welsh"
+msgstr ""
+
+#: ../picard/const.py:310
+#, fuzzy
+msgid "Danish"
+msgstr "Spaansk"
+
+#: ../picard/const.py:311
+msgid "German"
+msgstr "Dútsk"
+
+#: ../picard/const.py:312
+msgid "English"
+msgstr "Ingelsk"
+
+#: ../picard/const.py:313
+#, fuzzy
+msgid "English (Canada)"
+msgstr "Ingelsk (GB)"
+
+#: ../picard/const.py:314
+msgid "English (UK)"
+msgstr "Ingelsk (GB)"
+
+#: ../picard/const.py:315
+msgid "Spanish"
+msgstr "Spaansk"
+
+#: ../picard/const.py:316
+#, fuzzy
+msgid "Persian"
+msgstr "Dútsk"
+
+#: ../picard/const.py:317
+msgid "Finnish"
+msgstr "Finsk"
+
+#: ../picard/const.py:318
+msgid "French"
+msgstr "Frânsk"
+
+#: ../picard/const.py:319
+msgid "Frisian"
+msgstr ""
+
+#: ../picard/const.py:320
+msgid "Hebrew"
+msgstr ""
+
+#: ../picard/const.py:321
+msgid "Hungarian"
+msgstr "Hongaarsk"
+
+#: ../picard/const.py:322
+#, fuzzy
+msgid "Islandic"
+msgstr "Yslânsk"
+
+#: ../picard/const.py:323
+msgid "Italian"
+msgstr "Italjaansk"
+
+#: ../picard/const.py:324
+msgid "Kannada"
+msgstr ""
+
+#: ../picard/const.py:325
+msgid "Korean"
+msgstr "Koreaansk"
+
+#: ../picard/const.py:326
+msgid "Lithuanian"
+msgstr "Litousk"
+
+#: ../picard/const.py:327
+msgid "Norwegian Bokmal"
+msgstr ""
+
+#: ../picard/const.py:328
+msgid "Dutch"
+msgstr "Nederlânsk"
+
+#: ../picard/const.py:329
+#, fuzzy
+msgid "Polish"
+msgstr "Ingelsk"
+
+#: ../picard/const.py:330
+msgid "Portuguese"
+msgstr "Portegeesk"
+
+#: ../picard/const.py:331
+#, fuzzy
+msgid "Brazilian Portuguese"
+msgstr "Portegeesk"
+
+#: ../picard/const.py:332
+msgid "Romanian"
+msgstr "Roemeensk"
+
+#: ../picard/const.py:333
+msgid "Russian"
+msgstr "Russysk"
+
+#: ../picard/const.py:334
+msgid "Scots"
+msgstr ""
+
+#: ../picard/const.py:335
+msgid "Slovak"
+msgstr "Slowaaksk"
+
+#: ../picard/const.py:336
+#, fuzzy
+msgid "Slovenian"
+msgstr "Slowaaksk"
+
+#: ../picard/const.py:337
+msgid "Swedish"
+msgstr "Sweedsk"
+
+#: ../picard/const.py:338
+msgid "Chinese"
+msgstr ""
+
+#: ../picard/file.py:475
+#, python-format
+msgid "No matching tracks for file %s"
+msgstr ""
+
+#: ../picard/file.py:492
+#, python-format
+msgid "No matching tracks above the threshold for file %s"
+msgstr ""
+
+#: ../picard/file.py:495
+#, python-format
+msgid "File %s identified!"
+msgstr ""
+
+#: ../picard/file.py:506
+#, python-format
+msgid "Looking up the PUID for file %s..."
+msgstr ""
+
+#: ../picard/file.py:511
+#, python-format
+msgid "Looking up the metadata for file %s..."
+msgstr ""
+
+#: ../picard/puidmanager.py:58
+#, fuzzy
+msgid "Submitting PUIDs..."
+msgstr "PUIDs ferstjoere"
+
+#: ../picard/puidmanager.py:64
+#, python-format
+msgid "PUIDs submission failed: %s"
+msgstr ""
+
+#: ../picard/puidmanager.py:66
+#, fuzzy
+msgid "PUIDs successfully submitted!"
+msgstr "PUIDs suksesfol ferstjoere."
+
+#: ../picard/playlist.py:31
+msgid "M3U Playlist (*.m3u)"
+msgstr ""
+
+#: ../picard/playlist.py:32
+msgid "PLS Playlist (*.pls)"
+msgstr ""
+
+#: ../picard/playlist.py:33
+msgid "XSPF Playlist (*.xspf)"
+msgstr ""
+
+#: ../picard/tagger.py:476
 msgid "CD Lookup Error"
 msgstr ""
 
-#: ../picard/tagger.py:473
+#: ../picard/tagger.py:477
 #, python-format
 msgid ""
 "Error while reading CD:\n"
@@ -43,14 +1316,19 @@ msgid ""
 "%s"
 msgstr ""
 
-#: ../picard/ui/passworddialog.py:38
+#: ../picard/tagger.py:503
 #, python-format
-msgid ""
-"The server %s requires you to login. Please enter your username and password."
+msgid "Couldn't find PUID for file %s"
 msgstr ""
 
-#: ../picard/ui/ui_options_script.py:52
-msgid "Tagger Script"
+#: ../picard/musicdns/__init__.py:98
+#, python-format
+msgid "Looking up the fingerprint for file %s..."
+msgstr ""
+
+#: ../picard/musicdns/__init__.py:117
+#, python-format
+msgid "Creating fingerprint for file %s..."
 msgstr ""
 
 #: ../picard/ui/cdlookup.py:31
@@ -58,109 +1336,153 @@ msgid "Score"
 msgstr ""
 
 #: ../picard/ui/cdlookup.py:31
+#: ../picard/ui/itemviews.py:82
+#: ../picard/util/tags.py:23
 msgid "Title"
 msgstr ""
 
-#: ../picard/ui/cdlookup.py:31 ../picard/ui/mainwindow.py:436
+#: ../picard/ui/cdlookup.py:31
+#: ../picard/ui/itemviews.py:84
+#: ../picard/ui/mainwindow.py:436
+#: ../picard/util/tags.py:22
 msgid "Artist"
 msgstr "Artyst"
 
-#: ../picard/ui/ui_metadata.py:121
-msgid "Lookup"
-msgstr "Sykje"
-
-#: ../picard/ui/ui_metadata.py:122
-msgid "Title:"
+#: ../picard/ui/coverartbox.py:47
+#: ../picard/ui/options/cover.py:29
+msgid "Cover Art"
 msgstr ""
 
-#: ../picard/ui/ui_metadata.py:123
-msgid "Date:"
+#: ../picard/ui/coverartbox.py:95
+msgid "Buy the album on Amazon"
 msgstr ""
 
-#: ../picard/ui/ui_metadata.py:124
-msgid "Artist:"
+#: ../picard/ui/filebrowser.py:38
+#: ../picard/ui/mainwindow.py:302
+msgid "&Refresh"
 msgstr ""
 
-#: ../picard/ui/ui_metadata.py:125
-msgid "Track:"
+#: ../picard/ui/filebrowser.py:41
+msgid "&Move Tagged Files Here"
 msgstr ""
 
-#: ../picard/ui/ui_metadata.py:126
-msgid "0000-00-00; "
+#: ../picard/ui/filebrowser.py:44
+msgid "Show &Hidden Files"
 msgstr ""
 
-#: ../picard/ui/ui_metadata.py:127 ../picard/ui/tageditor.py:225
-#: ../picard/ui/multitageditor.py:181
+#: ../picard/ui/itemviews.py:83
+msgid "Length"
+msgstr ""
+
+#: ../picard/ui/itemviews.py:327
+msgid "&Releases"
+msgstr ""
+
+#: ../picard/ui/itemviews.py:353
+msgid "&Plugins"
+msgstr ""
+
+#: ../picard/ui/itemviews.py:523
+msgid "Clusters"
+msgstr ""
+
+#: ../picard/ui/logview.py:29
+msgid "Log"
+msgstr ""
+
+#: ../picard/ui/puidsubmit.py:31
+#: ../picard/ui/options/plugins.py:80
+msgid "File"
+msgstr "Triem"
+
+#: ../picard/ui/puidsubmit.py:31
+msgid "PUID"
+msgstr ""
+
+#: ../picard/ui/puidsubmit.py:31
+#: ../picard/ui/mainwindow.py:437
+msgid "Track"
+msgstr "Nûmer"
+
+#: ../picard/ui/puidsubmit.py:31
+msgid "Release"
+msgstr ""
+
+#: ../picard/ui/puidsubmit.py:31
+msgid "Release ID"
+msgstr ""
+
+#: ../picard/ui/tageditor.py:65
+#: ../picard/ui/ui_options_plugins.py:62
+msgid "Details"
+msgstr ""
+
+#: ../picard/ui/tageditor.py:70
+#: ../picard/ui/tageditor.py:241
+#, python-format
+msgid "%d file"
+msgid_plural "%d files"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../picard/ui/tageditor.py:124
+#, python-format
+msgid "(different across %d file)"
+msgid_plural "(different across %d files)"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../picard/ui/tageditor.py:127
+#, python-format
+msgid "(missing from %d file)"
+msgid_plural "(missing from %d files)"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../picard/ui/tageditor.py:210
+msgid "Filename:"
+msgstr ""
+
+#: ../picard/ui/tageditor.py:212
+msgid "Format:"
+msgstr ""
+
+#: ../picard/ui/tageditor.py:221
+msgid "Size:"
+msgstr ""
+
+#: ../picard/ui/tageditor.py:225
+#: ../picard/ui/ui_metadata.py:127
 msgid "Length:"
 msgstr ""
 
-#: ../picard/ui/ui_metadata.py:128
-msgid "Album:"
+#: ../picard/ui/tageditor.py:227
+msgid "Bitrate:"
 msgstr ""
 
-#: ../picard/ui/ui_passworddialog.py:78
-msgid "Authentication required"
+#: ../picard/ui/tageditor.py:229
+msgid "Sample rate:"
 msgstr ""
 
-#: ../picard/ui/ui_passworddialog.py:79 ../picard/ui/ui_options_proxy.py:83
-#: ../picard/ui/ui_options_general.py:113
-msgid "Username:"
+#: ../picard/ui/tageditor.py:231
+msgid "Bits per sample:"
 msgstr ""
 
-#: ../picard/ui/ui_passworddialog.py:80 ../picard/ui/ui_options_proxy.py:82
-#: ../picard/ui/ui_options_general.py:112
-msgid "Password:"
+#: ../picard/ui/tageditor.py:234
+msgid "Mono"
 msgstr ""
 
-#: ../picard/ui/ui_passworddialog.py:81
-msgid "Save username and password"
+#: ../picard/ui/tageditor.py:235
+msgid "Stereo"
 msgstr ""
 
-#: ../picard/ui/ui_options_folksonomy.py:114
-#: ../picard/ui/ui_options_folksonomy_tags.py:114
-msgid "Folksonomy Tags"
+#: ../picard/ui/tageditor.py:237
+msgid "Channels:"
 msgstr ""
 
-#: ../picard/ui/ui_options_folksonomy.py:115
-#: ../picard/ui/ui_options_folksonomy_tags.py:115
-msgid "Ignore tags:"
-msgstr ""
-
-#: ../picard/ui/ui_options_folksonomy.py:116
-#: ../picard/ui/ui_options_folksonomy_tags.py:116
-msgid "Minimal tag usage:"
-msgstr ""
-
-#: ../picard/ui/ui_options_folksonomy.py:117
-#: ../picard/ui/ui_options_folksonomy_tags.py:117
-#: ../picard/ui/ui_options_matching.py:107
-#: ../picard/ui/ui_options_matching.py:108
-#: ../picard/ui/ui_options_matching.py:109
-#: ../picard/ui/ui_options_matching.py:113
-msgid " %"
-msgstr ""
-
-#: ../picard/ui/ui_options_folksonomy.py:118
-msgid "Maximum number of tags:"
-msgstr ""
-
-#: ../picard/ui/ui_options_folksonomy.py:119
-#: ../picard/ui/ui_options_folksonomy_tags.py:119
-msgid "Join multiple tags with:"
-msgstr ""
-
-#: ../picard/ui/ui_options_folksonomy.py:120
-#: ../picard/ui/ui_options_folksonomy_tags.py:120
-msgid " / "
-msgstr ""
-
-#: ../picard/ui/ui_options_folksonomy.py:121
-#: ../picard/ui/ui_options_folksonomy_tags.py:121
-msgid ", "
-msgstr ""
-
-#: ../picard/ui/ui_options_folksonomy_tags.py:118
-msgid "Maximal number of tags:"
+#: ../picard/ui/tagsfromfilenames.py:52
+#: ../picard/ui/tagsfromfilenames.py:96
+msgid "File Name"
 msgstr ""
 
 #: ../picard/ui/mainwindow.py:64
@@ -296,7 +1618,8 @@ msgstr "Sykje"
 msgid "&CD Lookup..."
 msgstr ""
 
-#: ../picard/ui/mainwindow.py:272 ../picard/ui/mainwindow.py:273
+#: ../picard/ui/mainwindow.py:272
+#: ../picard/ui/mainwindow.py:273
 msgid "Lookup CD"
 msgstr ""
 
@@ -327,7 +1650,8 @@ msgstr ""
 msgid "&Lookup"
 msgstr ""
 
-#: ../picard/ui/mainwindow.py:291 ../picard/ui/mainwindow.py:292
+#: ../picard/ui/mainwindow.py:291
+#: ../picard/ui/mainwindow.py:292
 msgid "Lookup metadata"
 msgstr ""
 
@@ -340,10 +1664,6 @@ msgstr ""
 msgid "&Details..."
 msgstr ""
 
-#: ../picard/ui/mainwindow.py:302 ../picard/ui/filebrowser.py:38
-msgid "&Refresh"
-msgstr ""
-
 #: ../picard/ui/mainwindow.py:305
 msgid "Generate &Playlist..."
 msgstr ""
@@ -389,6 +1709,7 @@ msgid "&Tools"
 msgstr ""
 
 #: ../picard/ui/mainwindow.py:384
+#: ../picard/ui/util.py:33
 msgid "&Help"
 msgstr "&Help"
 
@@ -401,13 +1722,10 @@ msgid "&Search Bar"
 msgstr ""
 
 #: ../picard/ui/mainwindow.py:435
+#: ../picard/util/tags.py:21
 msgid "Album"
 msgstr "Album"
 
-#: ../picard/ui/mainwindow.py:437 ../picard/ui/puidsubmit.py:31
-msgid "Track"
-msgstr "Nûmer"
-
 #: ../picard/ui/mainwindow.py:476
 msgid "All Supported Formats"
 msgstr ""
@@ -422,37 +1740,290 @@ msgstr ""
 msgid "Playlist %s saved"
 msgstr ""
 
-#: ../picard/ui/mainwindow.py:638 ../picard/ui/mainwindow.py:647
+#: ../picard/ui/mainwindow.py:638
+#: ../picard/ui/mainwindow.py:647
 #, python-format
 msgid " (Error: %s)"
 msgstr ""
 
+#: ../picard/ui/ui_tageditor.py:115
+#: ../picard/ui/ui_options_plugins.py:59
+#: ../picard/ui/options/plugins.py:76
+msgid "Name"
+msgstr ""
+
+#: ../picard/ui/ui_tageditor.py:116
+msgid "Value"
+msgstr ""
+
+#: ../picard/ui/ui_tageditor.py:117
+msgid "&Add..."
+msgstr ""
+
+#: ../picard/ui/ui_tageditor.py:118
+msgid "&Edit..."
+msgstr ""
+
+#: ../picard/ui/ui_tageditor.py:119
+msgid "&Delete"
+msgstr ""
+
+#: ../picard/ui/ui_tageditor.py:120
+msgid "&Metadata"
+msgstr ""
+
+#: ../picard/ui/ui_tageditor.py:121
+msgid "A&rtwork"
+msgstr ""
+
+#: ../picard/ui/ui_tageditor.py:122
+msgid "&Info"
+msgstr ""
+
+#: ../picard/ui/passworddialog.py:38
+#, python-format
+msgid "The server %s requires you to login. Please enter your username and password."
+msgstr ""
+
+#: ../picard/ui/ui_cdlookup.py:60
+#: ../picard/ui/ui_options_cdlookup.py:47
+#: ../picard/ui/ui_options_cdlookup_win32.py:56
+#: ../picard/ui/options/cdlookup.py:35
+msgid "CD Lookup"
+msgstr ""
+
+#: ../picard/ui/ui_cdlookup.py:61
+msgid "The following releases on MusicBrainz match the CD:"
+msgstr ""
+
+#: ../picard/ui/ui_cdlookup.py:62
+#: ../picard/ui/ui_puidsubmit.py:53
+msgid "OK"
+msgstr ""
+
+#: ../picard/ui/ui_cdlookup.py:63
+msgid "    Lookup manually    "
+msgstr ""
+
+#: ../picard/ui/ui_cdlookup.py:64
+#: ../picard/ui/ui_puidsubmit.py:54
+msgid "Cancel"
+msgstr "Ofbrekke"
+
+#: ../picard/ui/ui_passworddialog.py:78
+msgid "Authentication required"
+msgstr ""
+
+#: ../picard/ui/ui_passworddialog.py:79
+#: ../picard/ui/ui_options_general.py:113
+#: ../picard/ui/ui_options_proxy.py:83
+msgid "Username:"
+msgstr ""
+
+#: ../picard/ui/ui_passworddialog.py:80
+#: ../picard/ui/ui_options_general.py:112
+#: ../picard/ui/ui_options_proxy.py:82
+msgid "Password:"
+msgstr ""
+
+#: ../picard/ui/ui_passworddialog.py:81
+msgid "Save username and password"
+msgstr ""
+
 #: ../picard/ui/ui_edittagdialog.py:44
 msgid "Edit Tag"
 msgstr ""
 
-#: ../picard/ui/ui_options_proxy.py:81
-msgid "Web Proxy"
-msgstr "Web Proxy"
+#: ../picard/ui/ui_metadata.py:121
+msgid "Lookup"
+msgstr "Sykje"
 
-#: ../picard/ui/ui_options_proxy.py:84 ../picard/ui/ui_options_general.py:109
-msgid "Port:"
+#: ../picard/ui/ui_metadata.py:122
+msgid "Title:"
 msgstr ""
 
-#: ../picard/ui/ui_options_proxy.py:85 ../picard/ui/ui_options_general.py:110
-msgid "Server address:"
+#: ../picard/ui/ui_metadata.py:123
+msgid "Date:"
 msgstr ""
 
-#: ../picard/ui/ui_tagsfromfilenames.py:56
-msgid "Convert File Names to Tags"
+#: ../picard/ui/ui_metadata.py:124
+msgid "Artist:"
 msgstr ""
 
-#: ../picard/ui/ui_tagsfromfilenames.py:57
-msgid "Replace underscores with spaces"
+#: ../picard/ui/ui_metadata.py:125
+msgid "Track:"
+msgstr ""
+
+#: ../picard/ui/ui_metadata.py:126
+msgid "0000-00-00; "
+msgstr ""
+
+#: ../picard/ui/ui_metadata.py:128
+msgid "Album:"
+msgstr ""
+
+#: ../picard/ui/ui_options.py:42
+msgid "Options"
+msgstr ""
+
+#: ../picard/ui/ui_options_cdlookup.py:48
+msgid "CD-ROM device to use for lookups:"
+msgstr ""
+
+#: ../picard/ui/ui_options_cdlookup_win32.py:57
+msgid "Default CD-ROM drive to use for lookups:"
+msgstr ""
+
+#: ../picard/ui/ui_options_cover.py:56
+msgid "Location"
+msgstr ""
+
+#: ../picard/ui/ui_options_cover.py:57
+msgid "Embed cover images into tags"
+msgstr ""
+
+#: ../picard/ui/ui_options_cover.py:58
+msgid "Save cover images as separate files"
+msgstr ""
+
+#: ../picard/ui/ui_options_cover.py:59
+msgid "Overwrite the file if it already exists"
+msgstr ""
+
+#: ../picard/ui/util.py:31
+msgid "&Ok"
+msgstr ""
+
+#: ../picard/ui/util.py:32
+#, fuzzy
+msgid "&Cancel"
+msgstr "Ofbrekke"
+
+#: ../picard/ui/ui_puidsubmit.py:52
+msgid "Submit PUIDs"
+msgstr "PUIDs ferstjoere"
+
+#: ../picard/ui/ui_options_folksonomy.py:114
+#: ../picard/ui/options/folksonomy.py:29
+msgid "Folksonomy Tags"
+msgstr ""
+
+#: ../picard/ui/ui_options_folksonomy.py:115
+msgid "Ignore tags:"
+msgstr ""
+
+#: ../picard/ui/ui_options_folksonomy.py:116
+msgid "Minimal tag usage:"
+msgstr ""
+
+#: ../picard/ui/ui_options_folksonomy.py:117
+#: ../picard/ui/ui_options_matching.py:107
+#: ../picard/ui/ui_options_matching.py:108
+#: ../picard/ui/ui_options_matching.py:109
+#: ../picard/ui/ui_options_matching.py:113
+msgid " %"
+msgstr ""
+
+#: ../picard/ui/ui_options_folksonomy.py:118
+msgid "Maximum number of tags:"
+msgstr ""
+
+#: ../picard/ui/ui_options_folksonomy.py:119
+msgid "Join multiple tags with:"
+msgstr ""
+
+#: ../picard/ui/ui_options_folksonomy.py:120
+msgid " / "
+msgstr ""
+
+#: ../picard/ui/ui_options_folksonomy.py:121
+msgid ", "
+msgstr ""
+
+#: ../picard/ui/ui_options_interface.py:50
+msgid "Miscellaneous"
+msgstr ""
+
+#: ../picard/ui/ui_options_interface.py:51
+msgid "Show text labels under icons"
+msgstr ""
+
+#: ../picard/ui/ui_options_interface.py:52
+msgid "Allow selection of multiple directories"
+msgstr ""
+
+#: ../picard/ui/ui_options_interface.py:53
+msgid "Use advanced query syntax"
+msgstr ""
+
+#: ../picard/ui/ui_options_interface.py:54
+#, fuzzy
+msgid "User interface language:"
+msgstr "Brûkersnamme"
+
+#: ../picard/ui/ui_options_naming.py:165
+msgid "Rename Files"
+msgstr ""
+
+#: ../picard/ui/ui_options_naming.py:166
+msgid "Replace Windows-incompatible characters"
+msgstr ""
+
+#: ../picard/ui/ui_options_naming.py:167
+msgid "Replace non-ASCII characters"
+msgstr ""
+
+#: ../picard/ui/ui_options_naming.py:168
+#: ../picard/ui/ui_options_naming.py:169
+#: ../picard/ui/ui_options_metadata.py:109
+#: ../picard/ui/ui_options_metadata.py:110
+msgid "Default"
+msgstr "Standert"
+
+#: ../picard/ui/ui_options_naming.py:170
+#: ../picard/ui/options/naming.py:90
+msgid "Multiple artist file naming format:"
+msgstr ""
+
+#: ../picard/ui/ui_options_naming.py:171
+#: ../picard/ui/options/naming.py:86
+msgid "File naming format:"
+msgstr ""
+
+#: ../picard/ui/ui_options_naming.py:172
+msgid "Move Files"
+msgstr ""
+
+#: ../picard/ui/ui_options_naming.py:173
+msgid "Move tagged files to this directory:"
+msgstr ""
+
+#: ../picard/ui/ui_options_naming.py:174
+msgid "Browse..."
+msgstr ""
+
+#: ../picard/ui/ui_options_naming.py:175
+msgid "Move additional files:"
+msgstr ""
+
+#: ../picard/ui/ui_options_naming.py:176
+msgid "Delete empty directories"
+msgstr ""
+
+#: ../picard/ui/ui_options_naming.py:177
+msgid "Example"
+msgstr ""
+
+#: ../picard/ui/ui_options_naming.py:178
+msgid "File name:"
+msgstr ""
+
+#: ../picard/ui/ui_options_naming.py:179
+msgid "Multiple artist file name:"
 msgstr ""
 
-#: ../picard/ui/ui_tagsfromfilenames.py:58
 #: ../picard/ui/ui_options_naming.py:180
+#: ../picard/ui/ui_tagsfromfilenames.py:58
 msgid "&Preview"
 msgstr ""
 
@@ -460,11 +2031,22 @@ msgstr ""
 msgid "MusicBrainz Server"
 msgstr ""
 
+#: ../picard/ui/ui_options_general.py:109
+#: ../picard/ui/ui_options_proxy.py:84
+msgid "Port:"
+msgstr ""
+
+#: ../picard/ui/ui_options_general.py:110
+#: ../picard/ui/ui_options_proxy.py:85
+msgid "Server address:"
+msgstr ""
+
 #: ../picard/ui/ui_options_general.py:111
 msgid "Account Information"
 msgstr ""
 
 #: ../picard/ui/ui_options_general.py:114
+#: ../picard/ui/options/general.py:29
 msgid "General"
 msgstr "Algemien"
 
@@ -472,34 +2054,6 @@ msgstr "Algemien"
 msgid "Automatically scan all new files"
 msgstr ""
 
-#: ../picard/ui/ui_options_interface.py:46
-msgid "Miscellaneous"
-msgstr ""
-
-#: ../picard/ui/ui_options_interface.py:47
-msgid "Show text labels under icons"
-msgstr ""
-
-#: ../picard/ui/ui_options_interface.py:48
-msgid "Allow selection of multiple directories"
-msgstr ""
-
-#: ../picard/ui/ui_options_interface.py:49
-msgid "Use advanced query syntax"
-msgstr ""
-
-#: ../picard/ui/itemviews.py:327
-msgid "&Releases"
-msgstr ""
-
-#: ../picard/ui/itemviews.py:353
-msgid "&Plugins"
-msgstr ""
-
-#: ../picard/ui/itemviews.py:523
-msgid "Clusters"
-msgstr ""
-
 #: ../picard/ui/ui_options_matching.py:105
 msgid "Thresholds"
 msgstr ""
@@ -520,6 +2074,68 @@ msgstr ""
 msgid "Minimal similarity for PUID lookups:"
 msgstr ""
 
+#: ../picard/ui/ui_options_metadata.py:100
+#: ../picard/ui/options/metadata.py:31
+msgid "Metadata"
+msgstr ""
+
+#: ../picard/ui/ui_options_metadata.py:101
+msgid "Translate foreign artist names to English where possible"
+msgstr ""
+
+#: ../picard/ui/ui_options_metadata.py:102
+msgid "Use release relationships"
+msgstr ""
+
+#: ../picard/ui/ui_options_metadata.py:103
+msgid "Use track relationships"
+msgstr ""
+
+#: ../picard/ui/ui_options_metadata.py:104
+msgid "Use folksonomy tags as genre"
+msgstr ""
+
+#: ../picard/ui/ui_options_metadata.py:105
+#, fuzzy
+msgid "Preferred release country:"
+msgstr "Útjefte dei"
+
+#: ../picard/ui/ui_options_metadata.py:106
+msgid "Custom Fields"
+msgstr ""
+
+#: ../picard/ui/ui_options_metadata.py:107
+msgid "Various artists:"
+msgstr ""
+
+#: ../picard/ui/ui_options_metadata.py:108
+msgid "Non-album tracks:"
+msgstr ""
+
+#: ../picard/ui/ui_options_plugins.py:58
+#: ../picard/ui/options/plugins.py:30
+msgid "Plugins"
+msgstr ""
+
+#: ../picard/ui/ui_options_plugins.py:60
+#: ../picard/ui/options/plugins.py:79
+msgid "Author"
+msgstr ""
+
+#: ../picard/ui/ui_options_plugins.py:61
+#: ../picard/util/tags.py:36
+msgid "Version"
+msgstr ""
+
+#: ../picard/ui/ui_options_proxy.py:81
+#: ../picard/ui/options/proxy.py:28
+msgid "Web Proxy"
+msgstr "Web Proxy"
+
+#: ../picard/ui/ui_options_script.py:52
+msgid "Tagger Script"
+msgstr ""
+
 #: ../picard/ui/ui_options_tags.py:105
 msgid "Common"
 msgstr ""
@@ -572,330 +2188,23 @@ msgstr ""
 msgid "Remove APEv2 tags from MP3 files"
 msgstr ""
 
-#: ../picard/ui/ui_options_cdlookup_win32.py:56 ../picard/ui/ui_cdlookup.py:60
-#: ../picard/ui/ui_options_cdlookup.py:47
-msgid "CD Lookup"
+#: ../picard/ui/ui_tagsfromfilenames.py:56
+msgid "Convert File Names to Tags"
 msgstr ""
 
-#: ../picard/ui/ui_options_cdlookup_win32.py:57
-msgid "Default CD-ROM drive to use for lookups:"
+#: ../picard/ui/ui_tagsfromfilenames.py:57
+msgid "Replace underscores with spaces"
 msgstr ""
 
-#: ../picard/ui/tageditor.py:65 ../picard/ui/ui_options_plugins.py:62
-#: ../picard/ui/multitageditor.py:37
-msgid "Details"
-msgstr ""
-
-#: ../picard/ui/tageditor.py:70 ../picard/ui/tageditor.py:241
-#: ../picard/ui/multitageditor.py:42 ../picard/ui/multitageditor.py:197
-#, python-format
-msgid "%d file"
-msgid_plural "%d files"
-msgstr[0] ""
-msgstr[1] ""
-
-#: ../picard/ui/tageditor.py:124 ../picard/ui/multitageditor.py:95
-#, python-format
-msgid "(different across %d file)"
-msgid_plural "(different across %d files)"
-msgstr[0] ""
-msgstr[1] ""
-
-#: ../picard/ui/tageditor.py:127 ../picard/ui/multitageditor.py:98
-#, python-format
-msgid "(missing from %d file)"
-msgid_plural "(missing from %d files)"
-msgstr[0] ""
-msgstr[1] ""
-
-#: ../picard/ui/tageditor.py:210 ../picard/ui/multitageditor.py:166
-msgid "Filename:"
-msgstr ""
-
-#: ../picard/ui/tageditor.py:212 ../picard/ui/multitageditor.py:168
-msgid "Format:"
-msgstr ""
-
-#: ../picard/ui/tageditor.py:221 ../picard/ui/multitageditor.py:177
-msgid "Size:"
-msgstr ""
-
-#: ../picard/ui/tageditor.py:227 ../picard/ui/multitageditor.py:183
-msgid "Bitrate:"
-msgstr ""
-
-#: ../picard/ui/tageditor.py:229 ../picard/ui/multitageditor.py:185
-msgid "Sample rate:"
-msgstr ""
-
-#: ../picard/ui/tageditor.py:231 ../picard/ui/multitageditor.py:187
-msgid "Bits per sample:"
-msgstr ""
-
-#: ../picard/ui/tageditor.py:234 ../picard/ui/multitageditor.py:190
-msgid "Mono"
-msgstr ""
-
-#: ../picard/ui/tageditor.py:235 ../picard/ui/multitageditor.py:191
-msgid "Stereo"
-msgstr ""
-
-#: ../picard/ui/tageditor.py:237 ../picard/ui/multitageditor.py:193
-msgid "Channels:"
-msgstr ""
-
-#: ../picard/ui/ui_tageditor.py:115 ../picard/ui/ui_multitageditor.py:55
-#: ../picard/ui/ui_options_plugins.py:59 ../picard/ui/options/plugins.py:76
-msgid "Name"
-msgstr ""
-
-#: ../picard/ui/ui_tageditor.py:116 ../picard/ui/ui_multitageditor.py:56
-msgid "Value"
-msgstr ""
-
-#: ../picard/ui/ui_tageditor.py:117 ../picard/ui/ui_multitageditor.py:57
-msgid "&Add..."
-msgstr ""
-
-#: ../picard/ui/ui_tageditor.py:118
-msgid "&Edit..."
-msgstr ""
-
-#: ../picard/ui/ui_tageditor.py:119
-msgid "&Delete"
-msgstr ""
-
-#: ../picard/ui/ui_tageditor.py:120
-msgid "&Metadata"
-msgstr ""
-
-#: ../picard/ui/ui_tageditor.py:121
-msgid "A&rtwork"
-msgstr ""
-
-#: ../picard/ui/ui_tageditor.py:122
-msgid "&Info"
-msgstr ""
-
-#: ../picard/ui/coverartbox.py:47
-msgid "Cover Art"
-msgstr ""
-
-#: ../picard/ui/coverartbox.py:95
-msgid "Buy the album on Amazon"
-msgstr ""
-
-#: ../picard/ui/ui_puidsubmit.py:52
-msgid "Submit PUIDs"
-msgstr "PUIDs ferstjoere"
-
-#: ../picard/ui/ui_puidsubmit.py:53 ../picard/ui/ui_cdlookup.py:62
-msgid "OK"
-msgstr ""
-
-#: ../picard/ui/ui_puidsubmit.py:54 ../picard/ui/ui_cdlookup.py:64
-msgid "Cancel"
-msgstr "Ofbrekke"
-
-#: ../picard/ui/puidsubmit.py:31 ../picard/ui/options/plugins.py:80
-msgid "File"
-msgstr "Triem"
-
-#: ../picard/ui/puidsubmit.py:31
-msgid "PUID"
-msgstr ""
-
-#: ../picard/ui/puidsubmit.py:31
-msgid "Release"
-msgstr ""
-
-#: ../picard/ui/puidsubmit.py:31
-msgid "Release ID"
-msgstr ""
-
-#: ../picard/ui/filebrowser.py:41
-msgid "&Move Tagged Files Here"
-msgstr ""
-
-#: ../picard/ui/filebrowser.py:44
-msgid "Show &Hidden Files"
-msgstr ""
-
-#: ../picard/ui/ui_cdlookup.py:61
-msgid "The following releases on MusicBrainz match the CD:"
-msgstr ""
-
-#: ../picard/ui/ui_cdlookup.py:63
-msgid "    Lookup manually    "
-msgstr ""
-
-#: ../picard/ui/ui_options.py:42
-msgid "Options"
-msgstr ""
-
-#: ../picard/ui/tagsfromfilenames.py:52 ../picard/ui/tagsfromfilenames.py:96
-msgid "File Name"
-msgstr ""
-
-#: ../picard/ui/ui_options_cover.py:56
-msgid "Location"
-msgstr ""
-
-#: ../picard/ui/ui_options_cover.py:57
-msgid "Embed cover images into tags"
-msgstr ""
-
-#: ../picard/ui/ui_options_cover.py:58
-msgid "Save cover images as separate files"
-msgstr ""
-
-#: ../picard/ui/ui_options_cover.py:59
-msgid "Overwrite the file if it already exists"
-msgstr ""
-
-#: ../picard/ui/ui_options_metadata.py:100
-msgid "Metadata"
-msgstr ""
-
-#: ../picard/ui/ui_options_metadata.py:101
-msgid "Translate foreign artist names to English where possible"
-msgstr ""
-
-#: ../picard/ui/ui_options_metadata.py:102
-msgid "Use release relationships"
-msgstr ""
-
-#: ../picard/ui/ui_options_metadata.py:103
-msgid "Use track relationships"
-msgstr ""
-
-#: ../picard/ui/ui_options_metadata.py:104
-msgid "Use folksonomy tags as genre"
-msgstr ""
-
-#: ../picard/ui/ui_options_metadata.py:105
-msgid "Preferred release country:"
-msgstr ""
-
-#: ../picard/ui/ui_options_metadata.py:106
-msgid "Custom Fields"
-msgstr ""
-
-#: ../picard/ui/ui_options_metadata.py:107
-msgid "Various artists:"
-msgstr ""
-
-#: ../picard/ui/ui_options_metadata.py:108
-msgid "Non-album tracks:"
-msgstr ""
-
-#: ../picard/ui/ui_options_metadata.py:109
-#: ../picard/ui/ui_options_metadata.py:110
-#: ../picard/ui/ui_options_naming.py:168 ../picard/ui/ui_options_naming.py:169
-msgid "Default"
-msgstr "Standert"
-
-#: ../picard/ui/ui_multitageditor.py:58
-msgid "Delete"
-msgstr ""
-
-#: ../picard/ui/logview.py:29
-msgid "Log"
-msgstr ""
-
-#: ../picard/ui/ui_options_plugins.py:58
-msgid "Plugins"
-msgstr ""
-
-#: ../picard/ui/ui_options_plugins.py:60 ../picard/ui/options/plugins.py:79
-msgid "Author"
-msgstr ""
-
-#: ../picard/ui/ui_options_plugins.py:61
-msgid "Version"
-msgstr ""
-
-#: ../picard/ui/ui_options_naming.py:165
-msgid "Rename Files"
-msgstr ""
-
-#: ../picard/ui/ui_options_naming.py:166
-msgid "Replace Windows-incompatible characters"
-msgstr ""
-
-#: ../picard/ui/ui_options_naming.py:167
-msgid "Replace non-ASCII characters"
-msgstr ""
-
-#: ../picard/ui/ui_options_naming.py:170 ../picard/ui/options/naming.py:90
-msgid "Multiple artist file naming format:"
-msgstr ""
-
-#: ../picard/ui/ui_options_naming.py:171 ../picard/ui/options/naming.py:86
-msgid "File naming format:"
-msgstr ""
-
-#: ../picard/ui/ui_options_naming.py:172
-msgid "Move Files"
-msgstr ""
-
-#: ../picard/ui/ui_options_naming.py:173
-msgid "Move tagged files to this directory:"
-msgstr ""
-
-#: ../picard/ui/ui_options_naming.py:174
-msgid "Browse..."
-msgstr ""
-
-#: ../picard/ui/ui_options_naming.py:175
-msgid "Move additional files:"
-msgstr ""
-
-#: ../picard/ui/ui_options_naming.py:176
-msgid "Delete empty directories"
-msgstr ""
-
-#: ../picard/ui/ui_options_naming.py:177
-msgid "Example"
-msgstr ""
-
-#: ../picard/ui/ui_options_naming.py:178
-msgid "File name:"
-msgstr ""
-
-#: ../picard/ui/ui_options_naming.py:179
-msgid "Multiple artist file name:"
-msgstr ""
-
-#: ../picard/ui/ui_options_cdlookup.py:48
-msgid "CD-ROM device to use for lookups:"
-msgstr ""
-
-#: ../picard/ui/options/scripting.py:84 ../picard/ui/options/naming.py:86
-#: ../picard/ui/options/naming.py:90 ../picard/ui/options/naming.py:93
-#: ../picard/ui/options/naming.py:95
-msgid "Script Error"
-msgstr ""
+#: ../picard/ui/options/about.py:29
+msgid "About"
+msgstr "Oer"
 
 #. Replace this with your name to have it appear in the "About" dialog.
 #: ../picard/ui/options/about.py:48
 msgid "translator-credits"
 msgstr ""
 "Launchpad Contributions:\n"
-"  Prodoc <https://launchpad.net/~age>\n"
-"\n"
-"Launchpad Contributions:\n"
-"  Prodoc https://launchpad.net/~age\n"
-"\n"
-"Launchpad Contributions:\n"
-"  Prodoc https://launchpad.net/~age\n"
-"\n"
-"Launchpad Contributions:\n"
-"  Lukáš Lalinský https://launchpad.net/~luks\n"
-"  Prodoc https://launchpad.net/~age\n"
-"\n"
-"Launchpad Contributions:\n"
-"  Lukáš Lalinský https://launchpad.net/~luks\n"
 "  Prodoc https://launchpad.net/~age"
 
 #. Replace LANG with language you are translatig to.
@@ -907,22 +2216,57 @@ msgstr ""
 #: ../picard/ui/options/about.py:55
 #, python-format
 msgid ""
-"<p align=\"center\"><span style=\"font-size:15px;font-weight:bold;"
-"\">MusicBrainz Picard</span><br/>\n"
+"<p align=\"center\"><span style=\"font-size:15px;font-weight:bold;\">MusicBrainz Picard</span><br/>\n"
 "Version %(version)s</p>\n"
 "<p align=\"center\"><strong>Supported formats</strong><br/>%(formats)s</p>\n"
 "<p align=\"center\"><strong>Please donate</strong><br/>\n"
-"Thank you for using Picard. Picard relies on the MusicBrainz database, which "
-"is operated by the MetaBrainz Foundation with the help of thousands of "
-"volunteers. If you like this application please consider donating to the "
-"MetaBrainz Foundation to keep the service running.</p>\n"
-"<p align=\"center\"><a href=\"http://metabrainz.org/donate/index.html"
-"\">Donate now!</a></p>\n"
+"Thank you for using Picard. Picard relies on the MusicBrainz database, which is operated by the MetaBrainz Foundation with the help of thousands of volunteers. If you like this application please consider donating to the MetaBrainz Foundation to keep the service running.</p>\n"
+"<p align=\"center\"><a href=\"http://metabrainz.org/donate/index.html\">Donate now!</a></p>\n"
 "<p align=\"center\"><strong>Credits</strong><br/>\n"
-"<small>Copyright © 2004-2008 Robert Kaye, Lukáš Lalinský and others%"
-"(translator-credits)s</small></p>\n"
-"<p align=\"center\"><a href=\"http://musicbrainz.org/doc/PicardTagger"
-"\">http://musicbrainz.org/doc/PicardTagger</a></p>\n"
+"<small>Copyright © 2004-2008 Robert Kaye, Lukáš Lalinský and others%(translator-credits)s</small></p>\n"
+"<p align=\"center\"><a href=\"http://musicbrainz.org/doc/PicardTagger\">http://musicbrainz.org/doc/PicardTagger</a></p>\n"
+msgstr ""
+
+#: ../picard/ui/options/advanced.py:26
+msgid "Advanced"
+msgstr ""
+
+#: ../picard/ui/options/interface.py:31
+#, fuzzy
+msgid "User Interface"
+msgstr "Brûkersnamme"
+
+#: ../picard/ui/options/interface.py:47
+msgid "System default"
+msgstr "Systeem standert"
+
+#: ../picard/ui/options/interface.py:71
+#, fuzzy
+msgid "Language changed"
+msgstr "Taal"
+
+#: ../picard/ui/options/interface.py:71
+msgid "You have changed the interface language. You have to restart Picard in order for the change to take effect."
+msgstr ""
+
+#: ../picard/ui/options/matching.py:29
+msgid "Matching"
+msgstr ""
+
+#: ../picard/ui/options/metadata.py:52
+msgid "None"
+msgstr ""
+
+#: ../picard/ui/options/naming.py:33
+msgid "File Naming"
+msgstr ""
+
+#: ../picard/ui/options/naming.py:86
+#: ../picard/ui/options/naming.py:90
+#: ../picard/ui/options/naming.py:93
+#: ../picard/ui/options/naming.py:95
+#: ../picard/ui/options/scripting.py:84
+msgid "Script Error"
 msgstr ""
 
 #: ../picard/ui/options/naming.py:93
@@ -941,6 +2285,253 @@ msgstr ""
 msgid "The location to move files to must not be empty."
 msgstr ""
 
+#: ../picard/ui/options/scripting.py:63
+msgid "Scripting"
+msgstr ""
+
+#: ../picard/ui/options/tags.py:29
+msgid "Tags"
+msgstr ""
+
+#: ../picard/util/tags.py:24
+#, fuzzy
+msgid "Date"
+msgstr "Letter"
+
+#: ../picard/util/tags.py:25
+#, fuzzy
+msgid "Album Artist"
+msgstr "Artyst"
+
+#: ../picard/util/tags.py:26
+#, fuzzy
+msgid "Track Number"
+msgstr "Nûmer Sifer"
+
+#: ../picard/util/tags.py:27
+#, fuzzy
+msgid "Total Tracks"
+msgstr "Nûmers"
+
+#: ../picard/util/tags.py:28
+#, fuzzy
+msgid "Disc Number"
+msgstr "Nûmer sifer"
+
+#: ../picard/util/tags.py:29
+msgid "Total Discs"
+msgstr ""
+
+#: ../picard/util/tags.py:30
+#, fuzzy
+msgid "Album Artist Sort Order"
+msgstr "Albumartyst sortearnamme"
+
+#: ../picard/util/tags.py:31
+msgid "Artist Sort Order"
+msgstr ""
+
+#: ../picard/util/tags.py:32
+msgid "Title Sort Order"
+msgstr ""
+
+#: ../picard/util/tags.py:33
+#, fuzzy
+msgid "Album Sort Order"
+msgstr "Albumartyst namme"
+
+#: ../picard/util/tags.py:34
+msgid "ASIN"
+msgstr ""
+
+#: ../picard/util/tags.py:35
+msgid "Grouping"
+msgstr ""
+
+#: ../picard/util/tags.py:37
+msgid "ISRC"
+msgstr ""
+
+#: ../picard/util/tags.py:38
+msgid "Mood"
+msgstr ""
+
+#: ../picard/util/tags.py:39
+msgid "BPM"
+msgstr ""
+
+#: ../picard/util/tags.py:40
+#, fuzzy
+msgid "Copyright"
+msgstr "Kopiearje"
+
+#: ../picard/util/tags.py:41
+#, fuzzy
+msgid "Composer"
+msgstr "Slute"
+
+#: ../picard/util/tags.py:42
+msgid "Conductor"
+msgstr ""
+
+#: ../picard/util/tags.py:43
+msgid "Lyricist"
+msgstr ""
+
+#: ../picard/util/tags.py:44
+msgid "Arranger"
+msgstr ""
+
+#: ../picard/util/tags.py:45
+msgid "Producer"
+msgstr ""
+
+#: ../picard/util/tags.py:46
+msgid "Engineer"
+msgstr ""
+
+#: ../picard/util/tags.py:47
+msgid "Subtitle"
+msgstr ""
+
+#: ../picard/util/tags.py:48
+#, fuzzy
+msgid "Disc Subtitle"
+msgstr "Nûmer sifer"
+
+#: ../picard/util/tags.py:49
+msgid "Remixer"
+msgstr ""
+
+#: ../picard/util/tags.py:50
+#, fuzzy
+msgid "MusicBrainz Track Id"
+msgstr "MusicBrainz akkount"
+
+#: ../picard/util/tags.py:51
+#, fuzzy
+msgid "MusicBrainz Release Id"
+msgstr "MusicBrainz Metadata"
+
+#: ../picard/util/tags.py:52
+#, fuzzy
+msgid "MusicBrainz Artist Id"
+msgstr "MusicBrainz Metadata"
+
+#: ../picard/util/tags.py:53
+#, fuzzy
+msgid "MusicBrainz Release Artist Id"
+msgstr "MusicBrainz tsjinner om te brûken"
+
+#: ../picard/util/tags.py:54
+#, fuzzy
+msgid "MusicBrainz TRM Id"
+msgstr "MusicBrainz Metadata"
+
+#: ../picard/util/tags.py:55
+#, fuzzy
+msgid "MusicBrainz Disc Id"
+msgstr "MusicBrainz Metadata"
+
+#: ../picard/util/tags.py:56
+#, fuzzy
+msgid "MusicBrainz Sort Name"
+msgstr "MusicBrainz Metadata"
+
+#: ../picard/util/tags.py:57
+msgid "MusicIP PUID"
+msgstr ""
+
+#: ../picard/util/tags.py:58
+msgid "MusicIP Fingerprint"
+msgstr ""
+
+#: ../picard/util/tags.py:59
+msgid "Disc Id"
+msgstr ""
+
+#: ../picard/util/tags.py:60
+msgid "Website"
+msgstr ""
+
+#: ../picard/util/tags.py:61
+msgid "Compilation"
+msgstr ""
+
+#: ../picard/util/tags.py:62
+msgid "Comment"
+msgstr ""
+
+#: ../picard/util/tags.py:63
+#, fuzzy
+msgid "Genre"
+msgstr "Algemien"
+
+#: ../picard/util/tags.py:64
+msgid "Encoded By"
+msgstr ""
+
+#: ../picard/util/tags.py:65
+msgid "Performer"
+msgstr ""
+
+#: ../picard/util/tags.py:66
+#, fuzzy
+msgid "Release Type"
+msgstr "Útjefte dei"
+
+#: ../picard/util/tags.py:67
+#, fuzzy
+msgid "Release Status"
+msgstr "Útjefte dei"
+
+#: ../picard/util/tags.py:68
+#, fuzzy
+msgid "Release Country"
+msgstr "Útjefte dei"
+
+#: ../picard/util/tags.py:69
+msgid "Record Label"
+msgstr ""
+
+#: ../picard/util/tags.py:70
+msgid "Barcode"
+msgstr ""
+
+#: ../picard/util/tags.py:71
+#, fuzzy
+msgid "Catalog Number"
+msgstr "Nûmer sifer"
+
+#: ../picard/util/tags.py:72
+msgid "Format"
+msgstr ""
+
+#: ../picard/util/tags.py:73
+msgid "DJ-Mixer"
+msgstr ""
+
+#: ../picard/util/tags.py:74
+#, fuzzy
+msgid "Media"
+msgstr "Pleatslike Metadata"
+
+#: ../picard/util/tags.py:75
+msgid "Lyrics"
+msgstr ""
+
+#: ../picard/util/tags.py:76
+msgid "Mixer"
+msgstr ""
+
+#: ../picard/util/tags.py:77
+msgid "Language"
+msgstr "Taal"
+
+#: ../picard/util/tags.py:78
+msgid "Script"
+msgstr ""
+
 #: ../picard/util/webbrowser2.py:84
 msgid "Web Browser Error"
 msgstr ""
@@ -953,191 +2544,103 @@ msgid ""
 "%s"
 msgstr ""
 
-#~ msgid "About"
-#~ msgstr "Oer"
+#, fuzzy
+#~ msgid "Anal&yze"
+#~ msgstr "Analisearje"
 
+#, fuzzy
+#~ msgid "Auto Tag"
+#~ msgstr "Oer Tagger"
+
+#, fuzzy
+#~ msgid "Edit &Tags..."
+#~ msgstr "Bewurkje opsjes..."
+
+#, fuzzy
+#~ msgid "Album artist:"
+#~ msgstr "Artyst"
+
+#, fuzzy
+#~ msgid "A&dd Directory..."
+#~ msgstr "Triemtafe&l Tafoegje...\tCtrl+D"
 #~ msgid "Are You Sure?"
 #~ msgstr "Binne jo der wis fan?"
-
 #~ msgid "Add &Files...\tCtrl+O"
 #~ msgstr "&Triemmen Tafoegje...\tCtrl+O"
-
 #~ msgid "Add &Directory...\tCtrl+D"
 #~ msgstr "Triemtafe&l Tafoegje...\tCtrl+D"
-
 #~ msgid "&Save Files\tCtrl+S"
 #~ msgstr "Triemmen &Bewarje\tCtrl+S"
-
 #~ msgid "C&opy\tCtrl+C"
 #~ msgstr "&Kopiearje\tCtrl+C"
-
 #~ msgid "Help"
 #~ msgstr "Help"
-
 #~ msgid "Preferences"
 #~ msgstr "Foarkarren"
-
 #~ msgid "Time"
 #~ msgstr "Tiid"
-
 #~ msgid "Albums"
 #~ msgstr "Albums"
-
 #~ msgid "Force Save"
 #~ msgstr "Bewarje Forseare"
-
 #~ msgid "Buy"
 #~ msgstr "Keapje"
-
 #~ msgid "Welcome to Picard!"
 #~ msgstr "Wolkom by Picard!"
-
 #~ msgid "Track Num"
 #~ msgstr "Nûmer Sifer"
-
-#~ msgid "Colors"
-#~ msgstr "Kleuren"
-
 #~ msgid "Font color"
 #~ msgstr "Lettertype kleur"
-
 #~ msgid "Directories"
 #~ msgstr "Triemtafels"
-
 #~ msgid "Watch for new files"
 #~ msgstr "Útsjen foar nije triemmen"
-
 #~ msgid "Watch this directory for new audio files"
 #~ msgstr "Dizzy triemtafel útsjen foar nije triemmen"
-
 #~ msgid "all languages"
 #~ msgstr "alle talen"
-
-#~ msgid "Language"
-#~ msgstr "Taal"
-
-#~ msgid "System default"
-#~ msgstr "Systeem standert"
-
 #~ msgid "Number of tracks on the album"
 #~ msgstr "Oantal nûmers op de album"
-
 #~ msgid "Track name"
 #~ msgstr "Nûmer namme"
-
 #~ msgid "Album release month"
 #~ msgstr "Album útjefte moanne"
-
 #~ msgid "Album release day"
 #~ msgstr "Album útjefte dei"
-
 #~ msgid "Album release year"
 #~ msgstr "Album útjefte jier"
-
 #~ msgid "Make it so!"
 #~ msgstr "Okee"
-
 #~ msgid "Proxy port"
 #~ msgstr "Proxy-poarte"
-
 #~ msgid "Artists"
 #~ msgstr "Artysten"
-
 #~ msgid "New files (drag files to tag here)"
 #~ msgstr "Nije triemmen (sleep triemmen om te markearje hjirre)"
-
 #~ msgid "updating album information"
 #~ msgstr "album ynformaasje oan it bywurkje"
-
 #~ msgid "Connection error"
 #~ msgstr "Ferbiningsflater"
-
 #~ msgid "Select directory that contains music files"
 #~ msgstr "Selektearje triemtafel dit muzyk triemmen befettet"
-
 #~ msgid "Release date"
 #~ msgstr "Útjefte dei"
-
 #~ msgid "%d%% similar"
 #~ msgstr "%d%% likens"
-
-#~ msgid "Later"
-#~ msgstr "Letter"
-
-#~ msgid "Czech"
-#~ msgstr "Tsjechysk"
-
-#~ msgid "German"
-#~ msgstr "Dútsk"
-
-#~ msgid "English"
-#~ msgstr "Ingelsk"
-
-#~ msgid "English (UK)"
-#~ msgstr "Ingelsk (GB)"
-
-#~ msgid "Spanish"
-#~ msgstr "Spaansk"
-
-#~ msgid "Finnish"
-#~ msgstr "Finsk"
-
-#~ msgid "French"
-#~ msgstr "Frânsk"
-
-#~ msgid "Hungarian"
-#~ msgstr "Hongaarsk"
-
-#~ msgid "Icelandic"
-#~ msgstr "Yslânsk"
-
-#~ msgid "Italian"
-#~ msgstr "Italjaansk"
-
-#~ msgid "Korean"
-#~ msgstr "Koreaansk"
-
-#~ msgid "Lithuanian"
-#~ msgstr "Litousk"
-
-#~ msgid "Dutch"
-#~ msgstr "Nederlânsk"
-
-#~ msgid "Portuguese"
-#~ msgstr "Portegeesk"
-
-#~ msgid "Romanian"
-#~ msgstr "Roemeensk"
-
-#~ msgid "Russian"
-#~ msgstr "Russysk"
-
-#~ msgid "Slovak"
-#~ msgstr "Slowaaksk"
-
-#~ msgid "Swedish"
-#~ msgstr "Sweedsk"
-
 #~ msgid "Artist translation"
 #~ msgstr "Artyst oersetting"
-
 #~ msgid "%d of %d tracks linked"
 #~ msgstr "%d fan de %d nûmers oan inoar skeakele"
-
 #~ msgid "Move files option"
 #~ msgstr "Triemmen fersette opsje"
-
 #~ msgid "Track artist name"
 #~ msgstr "Nûmerartyst namme"
-
 #~ msgid "Track artist sortname"
 #~ msgstr "Nûmerartyst sortearnamme"
-
 #~ msgid "The first character of the artist sortname"
 #~ msgstr "De earste karakter fan de artyst sortearnamme"
-
 #~ msgid "The first two characters of the artist sortname"
 #~ msgstr "De earste twa karakters fan de artyst sortearnamme"
-
 #~ msgid "The first three characters of the artist sortname"
 #~ msgstr "De earste trije karakters fan de artyst sortearnamme"
+
diff --git a/po/he.po b/po/he.po
index 6fbc20b28..644656795 100644
--- a/po/he.po
+++ b/po/he.po
@@ -7,35 +7,1293 @@ msgid ""
 msgstr ""
 "Project-Id-Version: picard\n"
 "Report-Msgid-Bugs-To: http://bugs.musicbrainz.org/\n"
-"POT-Creation-Date: 2008-12-01 18:20+0100\n"
-"PO-Revision-Date: 2008-07-27 20:37+0000\n"
-"Last-Translator: Yaron <sh.yaron@gmail.com>\n"
+"POT-Creation-Date: 2009-01-25 12:23+0100\n"
+"PO-Revision-Date: 2009-01-25 13:18+0100\n"
+"Last-Translator: Philipp Wolfer <phw@rubyforge.org>\n"
 "Language-Team: Hebrew <he@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2008-12-01 17:02+0000\n"
+"X-Launchpad-Export-Date: 2009-01-24 23:28+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
-#: ../picard/album.py:108 ../picard/cluster.py:248
+#: ../picard/album.py:108
+#: ../picard/cluster.py:248
 msgid "Unmatched Files"
 msgstr "קבצים לא תואמים"
 
-#: ../picard/album.py:269
+#: ../picard/album.py:281
 #, python-format
 msgid "[couldn't load album %s]"
 msgstr "[לא ניתן לטעון את האלבום %s]"
 
-#: ../picard/album.py:305
+#: ../picard/album.py:317
 msgid "[loading album information]"
 msgstr "[טוען את נתוני האלבום]"
 
-#: ../picard/tagger.py:472
+#: ../picard/cluster.py:164
+#: ../picard/cluster.py:175
+#, python-format
+msgid "No matching releases for cluster %s"
+msgstr "לא נמצאו הפצות תואמות עבור האשכול %s"
+
+#: ../picard/cluster.py:177
+#, python-format
+msgid "Cluster %s identified!"
+msgstr "האשכול %s זוהה!"
+
+#: ../picard/cluster.py:182
+#, python-format
+msgid "Looking up the metadata for cluster %s..."
+msgstr "מחפש את נתוני המטא עבור האשכול %s..."
+
+#: ../picard/const.py:40
+msgid "CD"
+msgstr ""
+
+#: ../picard/const.py:41
+msgid "DVD"
+msgstr ""
+
+#: ../picard/const.py:42
+msgid "SACD"
+msgstr ""
+
+#: ../picard/const.py:43
+msgid "LaserDisc"
+msgstr ""
+
+#: ../picard/const.py:44
+msgid "MiniDisc"
+msgstr ""
+
+#: ../picard/const.py:45
+msgid "Vinyl"
+msgstr ""
+
+#: ../picard/const.py:46
+msgid "Cassette"
+msgstr ""
+
+#: ../picard/const.py:47
+msgid "Cartridge (4/8-tracks)"
+msgstr ""
+
+#: ../picard/const.py:48
+msgid "Reel-to-Reel"
+msgstr ""
+
+#: ../picard/const.py:49
+msgid "DAT"
+msgstr ""
+
+#: ../picard/const.py:50
+#, fuzzy
+msgid "Digital Media"
+msgstr "נתוני מטא מקוריים"
+
+#: ../picard/const.py:51
+msgid "Wax Cylinder"
+msgstr ""
+
+#: ../picard/const.py:52
+msgid "Piano Roll"
+msgstr ""
+
+#: ../picard/const.py:53
+msgid "Other"
+msgstr ""
+
+#: ../picard/const.py:58
+msgid "Bangladesh"
+msgstr ""
+
+#: ../picard/const.py:59
+msgid "Belgium"
+msgstr ""
+
+#: ../picard/const.py:60
+msgid "Burkina Faso"
+msgstr ""
+
+#: ../picard/const.py:61
+msgid "Bulgaria"
+msgstr ""
+
+#: ../picard/const.py:62
+msgid "Barbados"
+msgstr ""
+
+#: ../picard/const.py:63
+msgid "Wallis and Futuna Islands"
+msgstr ""
+
+#: ../picard/const.py:64
+msgid "Bermuda"
+msgstr ""
+
+#: ../picard/const.py:65
+msgid "Brunei Darussalam"
+msgstr ""
+
+#: ../picard/const.py:66
+msgid "Bolivia"
+msgstr ""
+
+#: ../picard/const.py:67
+msgid "Bahrain"
+msgstr ""
+
+#: ../picard/const.py:68
+msgid "Burundi"
+msgstr ""
+
+#: ../picard/const.py:69
+msgid "Benin"
+msgstr ""
+
+#: ../picard/const.py:70
+msgid "Bhutan"
+msgstr ""
+
+#: ../picard/const.py:71
+msgid "Jamaica"
+msgstr ""
+
+#: ../picard/const.py:72
+msgid "Bouvet Island"
+msgstr ""
+
+#: ../picard/const.py:73
+msgid "Botswana"
+msgstr ""
+
+#: ../picard/const.py:74
+msgid "Samoa"
+msgstr ""
+
+#: ../picard/const.py:75
+msgid "Brazil"
+msgstr ""
+
+#: ../picard/const.py:76
+msgid "Bahamas"
+msgstr ""
+
+#: ../picard/const.py:77
+msgid "Belarus"
+msgstr ""
+
+#: ../picard/const.py:78
+msgid "Belize"
+msgstr ""
+
+#: ../picard/const.py:79
+msgid "Russian Federation"
+msgstr ""
+
+#: ../picard/const.py:80
+msgid "Rwanda"
+msgstr ""
+
+#: ../picard/const.py:81
+msgid "Reunion"
+msgstr ""
+
+#: ../picard/const.py:82
+msgid "Turkmenistan"
+msgstr ""
+
+#: ../picard/const.py:83
+msgid "Tajikistan"
+msgstr ""
+
+#: ../picard/const.py:84
+msgid "Romania"
+msgstr ""
+
+#: ../picard/const.py:85
+msgid "Tokela"
+msgstr ""
+
+#: ../picard/const.py:86
+msgid "Guinea-Bissa"
+msgstr ""
+
+#: ../picard/const.py:87
+msgid "Guam"
+msgstr ""
+
+#: ../picard/const.py:88
+msgid "Guatemala"
+msgstr ""
+
+#: ../picard/const.py:89
+msgid "Greece"
+msgstr ""
+
+#: ../picard/const.py:90
+msgid "Equatorial Guinea"
+msgstr ""
+
+#: ../picard/const.py:91
+msgid "Guadeloupe"
+msgstr ""
+
+#: ../picard/const.py:92
+msgid "Japan"
+msgstr ""
+
+#: ../picard/const.py:93
+msgid "Guyana"
+msgstr ""
+
+#: ../picard/const.py:94
+msgid "French Guiana"
+msgstr ""
+
+#: ../picard/const.py:95
+msgid "Georgia"
+msgstr ""
+
+#: ../picard/const.py:96
+msgid "Grenada"
+msgstr ""
+
+#: ../picard/const.py:97
+msgid "United Kingdom"
+msgstr ""
+
+#: ../picard/const.py:98
+msgid "Gabon"
+msgstr ""
+
+#: ../picard/const.py:99
+msgid "El Salvador"
+msgstr ""
+
+#: ../picard/const.py:100
+#, fuzzy
+msgid "Guinea"
+msgstr "כללי"
+
+#: ../picard/const.py:101
+msgid "Gambia"
+msgstr ""
+
+#: ../picard/const.py:102
+msgid "Greenland"
+msgstr ""
+
+#: ../picard/const.py:103
+msgid "Gibraltar"
+msgstr ""
+
+#: ../picard/const.py:104
+msgid "Ghana"
+msgstr ""
+
+#: ../picard/const.py:105
+msgid "Oman"
+msgstr ""
+
+#: ../picard/const.py:106
+msgid "Tunisia"
+msgstr ""
+
+#: ../picard/const.py:107
+msgid "Jordan"
+msgstr ""
+
+#: ../picard/const.py:108
+msgid "Haiti"
+msgstr ""
+
+#: ../picard/const.py:109
+msgid "Hungary"
+msgstr ""
+
+#: ../picard/const.py:110
+msgid "Hong Kong"
+msgstr ""
+
+#: ../picard/const.py:111
+msgid "Honduras"
+msgstr ""
+
+#: ../picard/const.py:112
+msgid "Heard and Mc Donald Islands"
+msgstr ""
+
+#: ../picard/const.py:113
+msgid "Venezuela"
+msgstr ""
+
+#: ../picard/const.py:114
+msgid "Puerto Rico"
+msgstr ""
+
+#: ../picard/const.py:115
+msgid "Pala"
+msgstr ""
+
+#: ../picard/const.py:116
+#, fuzzy
+msgid "Portugal"
+msgstr "פתחה:"
+
+#: ../picard/const.py:117
+msgid "Svalbard and Jan Mayen Islands"
+msgstr ""
+
+#: ../picard/const.py:118
+msgid "Paraguay"
+msgstr ""
+
+#: ../picard/const.py:119
+msgid "Iraq"
+msgstr ""
+
+#: ../picard/const.py:120
+msgid "Panama"
+msgstr ""
+
+#: ../picard/const.py:121
+msgid "French Polynesia"
+msgstr ""
+
+#: ../picard/const.py:122
+msgid "Papua New Guinea"
+msgstr ""
+
+#: ../picard/const.py:123
+msgid "Per"
+msgstr ""
+
+#: ../picard/const.py:124
+msgid "Pakistan"
+msgstr ""
+
+#: ../picard/const.py:125
+msgid "Philippines"
+msgstr ""
+
+#: ../picard/const.py:126
+msgid "Pitcairn"
+msgstr ""
+
+#: ../picard/const.py:127
+msgid "Poland"
+msgstr ""
+
+#: ../picard/const.py:128
+msgid "St. Pierre and Miquelon"
+msgstr ""
+
+#: ../picard/const.py:129
+msgid "Zambia"
+msgstr ""
+
+#: ../picard/const.py:130
+msgid "Western Sahara"
+msgstr ""
+
+#: ../picard/const.py:131
+msgid "Estonia"
+msgstr ""
+
+#: ../picard/const.py:132
+msgid "Egypt"
+msgstr ""
+
+#: ../picard/const.py:133
+msgid "South Africa"
+msgstr ""
+
+#: ../picard/const.py:134
+msgid "Ecuador"
+msgstr ""
+
+#: ../picard/const.py:135
+msgid "Italy"
+msgstr ""
+
+#: ../picard/const.py:136
+#, fuzzy
+msgid "Viet Nam"
+msgstr "שם הקובץ"
+
+#: ../picard/const.py:137
+msgid "Solomon Islands"
+msgstr ""
+
+#: ../picard/const.py:138
+msgid "Ethiopia"
+msgstr ""
+
+#: ../picard/const.py:139
+msgid "Somalia"
+msgstr ""
+
+#: ../picard/const.py:140
+msgid "Zimbabwe"
+msgstr ""
+
+#: ../picard/const.py:141
+msgid "Saudi Arabia"
+msgstr ""
+
+#: ../picard/const.py:142
+#, fuzzy
+msgid "Spain"
+msgstr "&סרוק"
+
+#: ../picard/const.py:143
+msgid "Eritrea"
+msgstr ""
+
+#: ../picard/const.py:144
+msgid "Moldova, Republic of"
+msgstr ""
+
+#: ../picard/const.py:145
+msgid "Madagascar"
+msgstr ""
+
+#: ../picard/const.py:146
+msgid "Morocco"
+msgstr ""
+
+#: ../picard/const.py:147
+#, fuzzy
+msgid "Monaco"
+msgstr "מונו"
+
+#: ../picard/const.py:148
+msgid "Uzbekistan"
+msgstr ""
+
+#: ../picard/const.py:149
+msgid "Myanmar"
+msgstr ""
+
+#: ../picard/const.py:150
+msgid "Mali"
+msgstr ""
+
+#: ../picard/const.py:151
+msgid "Maca"
+msgstr ""
+
+#: ../picard/const.py:152
+#, fuzzy
+msgid "Mongolia"
+msgstr "מונו"
+
+#: ../picard/const.py:153
+msgid "Marshall Islands"
+msgstr ""
+
+#: ../picard/const.py:154
+msgid "Macedonia, The Former Yugoslav Republic of"
+msgstr ""
+
+#: ../picard/const.py:155
+msgid "Mauritius"
+msgstr ""
+
+#: ../picard/const.py:156
+#, fuzzy
+msgid "Malta"
+msgstr "נתוני מטא"
+
+#: ../picard/const.py:157
+msgid "Malawi"
+msgstr ""
+
+#: ../picard/const.py:158
+msgid "Maldives"
+msgstr ""
+
+#: ../picard/const.py:159
+msgid "Martinique"
+msgstr ""
+
+#: ../picard/const.py:160
+msgid "Northern Mariana Islands"
+msgstr ""
+
+#: ../picard/const.py:161
+msgid "Montserrat"
+msgstr ""
+
+#: ../picard/const.py:162
+msgid "Mauritania"
+msgstr ""
+
+#: ../picard/const.py:163
+msgid "Uganda"
+msgstr ""
+
+#: ../picard/const.py:164
+msgid "Malaysia"
+msgstr ""
+
+#: ../picard/const.py:165
+msgid "Mexico"
+msgstr ""
+
+#: ../picard/const.py:166
+msgid "Israel"
+msgstr ""
+
+#: ../picard/const.py:167
+#, fuzzy
+msgid "France"
+msgstr "ביטול"
+
+#: ../picard/const.py:168
+msgid "British Indian Ocean Territory"
+msgstr ""
+
+#: ../picard/const.py:169
+msgid "St. Helena"
+msgstr ""
+
+#: ../picard/const.py:170
+msgid "Finland"
+msgstr ""
+
+#: ../picard/const.py:171
+msgid "Fiji"
+msgstr ""
+
+#: ../picard/const.py:172
+msgid "Falkland Islands (Malvinas)"
+msgstr ""
+
+#: ../picard/const.py:173
+msgid "Micronesia, Federated States of"
+msgstr ""
+
+#: ../picard/const.py:174
+msgid "Faroe Islands"
+msgstr ""
+
+#: ../picard/const.py:175
+msgid "Nicaragua"
+msgstr ""
+
+#: ../picard/const.py:176
+msgid "Netherlands"
+msgstr ""
+
+#: ../picard/const.py:177
+msgid "Norway"
+msgstr ""
+
+#: ../picard/const.py:178
+msgid "Namibia"
+msgstr ""
+
+#: ../picard/const.py:179
+msgid "Vanuat"
+msgstr ""
+
+#: ../picard/const.py:180
+msgid "New Caledonia"
+msgstr ""
+
+#: ../picard/const.py:181
+#, fuzzy
+msgid "Niger"
+msgstr "מערבל"
+
+#: ../picard/const.py:182
+msgid "Norfolk Island"
+msgstr ""
+
+#: ../picard/const.py:183
+msgid "Nigeria"
+msgstr ""
+
+#: ../picard/const.py:184
+#, fuzzy
+msgid "New Zealand"
+msgstr "נתוני מטא חדשים"
+
+#: ../picard/const.py:185
+msgid "Zaire"
+msgstr ""
+
+#: ../picard/const.py:186
+msgid "Nepal"
+msgstr ""
+
+#: ../picard/const.py:187
+msgid "Naur"
+msgstr ""
+
+#: ../picard/const.py:188
+msgid "Niue"
+msgstr ""
+
+#: ../picard/const.py:189
+msgid "Cook Islands"
+msgstr ""
+
+#: ../picard/const.py:190
+msgid "Cote d'Ivoire"
+msgstr ""
+
+#: ../picard/const.py:191
+msgid "Switzerland"
+msgstr ""
+
+#: ../picard/const.py:192
+msgid "Colombia"
+msgstr ""
+
+#: ../picard/const.py:193
+msgid "China"
+msgstr ""
+
+#: ../picard/const.py:194
+msgid "Cameroon"
+msgstr ""
+
+#: ../picard/const.py:195
+#, fuzzy
+msgid "Chile"
+msgstr "קובץ"
+
+#: ../picard/const.py:196
+msgid "Cocos (Keeling) Islands"
+msgstr ""
+
+#: ../picard/const.py:197
+msgid "Canada"
+msgstr ""
+
+#: ../picard/const.py:198
+#, fuzzy
+msgid "Congo"
+msgstr "מונו"
+
+#: ../picard/const.py:199
+msgid "Central African Republic"
+msgstr ""
+
+#: ../picard/const.py:200
+msgid "Czech Republic"
+msgstr ""
+
+#: ../picard/const.py:201
+msgid "Cyprus"
+msgstr ""
+
+#: ../picard/const.py:202
+msgid "Christmas Island"
+msgstr ""
+
+#: ../picard/const.py:203
+msgid "Costa Rica"
+msgstr ""
+
+#: ../picard/const.py:204
+msgid "Cape Verde"
+msgstr ""
+
+#: ../picard/const.py:205
+msgid "Cuba"
+msgstr ""
+
+#: ../picard/const.py:206
+msgid "Swaziland"
+msgstr ""
+
+#: ../picard/const.py:207
+msgid "Syrian Arab Republic"
+msgstr ""
+
+#: ../picard/const.py:208
+msgid "Kyrgyzstan"
+msgstr ""
+
+#: ../picard/const.py:209
+msgid "Kenya"
+msgstr ""
+
+#: ../picard/const.py:210
+msgid "Suriname"
+msgstr ""
+
+#: ../picard/const.py:211
+msgid "Kiribati"
+msgstr ""
+
+#: ../picard/const.py:212
+msgid "Cambodia"
+msgstr ""
+
+#: ../picard/const.py:213
+msgid "Saint Kitts and Nevis"
+msgstr ""
+
+#: ../picard/const.py:214
+#, fuzzy
+msgid "Comoros"
+msgstr "מלחין"
+
+#: ../picard/const.py:215
+msgid "Sao Tome and Principe"
+msgstr ""
+
+#: ../picard/const.py:216
+msgid "Slovenia"
+msgstr ""
+
+#: ../picard/const.py:217
+msgid "Kuwait"
+msgstr ""
+
+#: ../picard/const.py:218
+#, fuzzy
+msgid "Senegal"
+msgstr "כללי"
+
+#: ../picard/const.py:219
+msgid "San Marino"
+msgstr ""
+
+#: ../picard/const.py:220
+msgid "Sierra Leone"
+msgstr ""
+
+#: ../picard/const.py:221
+msgid "Seychelles"
+msgstr ""
+
+#: ../picard/const.py:222
+msgid "Kazakhstan"
+msgstr ""
+
+#: ../picard/const.py:223
+msgid "Cayman Islands"
+msgstr ""
+
+#: ../picard/const.py:224
+msgid "Singapore"
+msgstr ""
+
+#: ../picard/const.py:225
+msgid "Sweden"
+msgstr ""
+
+#: ../picard/const.py:226
+#, fuzzy
+msgid "Sudan"
+msgstr "&סרוק"
+
+#: ../picard/const.py:227
+msgid "Dominican Republic"
+msgstr ""
+
+#: ../picard/const.py:228
+msgid "Dominica"
+msgstr ""
+
+#: ../picard/const.py:229
+#, fuzzy
+msgid "Djibouti"
+msgstr "אודות"
+
+#: ../picard/const.py:230
+msgid "Denmark"
+msgstr ""
+
+#: ../picard/const.py:231
+msgid "Virgin Islands (British)"
+msgstr ""
+
+#: ../picard/const.py:232
+msgid "Germany"
+msgstr ""
+
+#: ../picard/const.py:233
+msgid "Yemen"
+msgstr ""
+
+#: ../picard/const.py:234
+msgid "Algeria"
+msgstr ""
+
+#: ../picard/const.py:235
+msgid "United States"
+msgstr ""
+
+#: ../picard/const.py:236
+msgid "Uruguay"
+msgstr ""
+
+#: ../picard/const.py:237
+msgid "Mayotte"
+msgstr ""
+
+#: ../picard/const.py:238
+msgid "United States Minor Outlying Islands"
+msgstr ""
+
+#: ../picard/const.py:239
+msgid "Lebanon"
+msgstr ""
+
+#: ../picard/const.py:240
+msgid "Saint Lucia"
+msgstr ""
+
+#: ../picard/const.py:241
+msgid "Lao People's Democratic Republic"
+msgstr ""
+
+#: ../picard/const.py:242
+msgid "Tuval"
+msgstr ""
+
+#: ../picard/const.py:243
+msgid "Taiwan"
+msgstr ""
+
+#: ../picard/const.py:244
+msgid "Trinidad and Tobago"
+msgstr ""
+
+#: ../picard/const.py:245
+msgid "Turkey"
+msgstr ""
+
+#: ../picard/const.py:246
+msgid "Sri Lanka"
+msgstr ""
+
+#: ../picard/const.py:247
+msgid "Liechtenstein"
+msgstr ""
+
+#: ../picard/const.py:248
+msgid "Latvia"
+msgstr ""
+
+#: ../picard/const.py:249
+msgid "Tonga"
+msgstr ""
+
+#: ../picard/const.py:250
+msgid "Lithuania"
+msgstr ""
+
+#: ../picard/const.py:251
+msgid "Luxembourg"
+msgstr ""
+
+#: ../picard/const.py:252
+msgid "Liberia"
+msgstr ""
+
+#: ../picard/const.py:253
+#, fuzzy
+msgid "Lesotho"
+msgstr "משך"
+
+#: ../picard/const.py:254
+msgid "Thailand"
+msgstr ""
+
+#: ../picard/const.py:255
+msgid "French Southern Territories"
+msgstr ""
+
+#: ../picard/const.py:256
+#, fuzzy
+msgid "Togo"
+msgstr "&כלים"
+
+#: ../picard/const.py:257
+msgid "Chad"
+msgstr ""
+
+#: ../picard/const.py:258
+msgid "Turks and Caicos Islands"
+msgstr ""
+
+#: ../picard/const.py:259
+msgid "Libyan Arab Jamahiriya"
+msgstr ""
+
+#: ../picard/const.py:260
+msgid "Vatican City State (Holy See)"
+msgstr ""
+
+#: ../picard/const.py:261
+msgid "Saint Vincent and The Grenadines"
+msgstr ""
+
+#: ../picard/const.py:262
+msgid "United Arab Emirates"
+msgstr ""
+
+#: ../picard/const.py:263
+msgid "Andorra"
+msgstr ""
+
+#: ../picard/const.py:264
+msgid "Antigua and Barbuda"
+msgstr ""
+
+#: ../picard/const.py:265
+msgid "Afghanistan"
+msgstr ""
+
+#: ../picard/const.py:266
+msgid "Anguilla"
+msgstr ""
+
+#: ../picard/const.py:267
+msgid "Virgin Islands (U.S.)"
+msgstr ""
+
+#: ../picard/const.py:268
+msgid "Iceland"
+msgstr ""
+
+#: ../picard/const.py:269
+msgid "Iran (Islamic Republic of)"
+msgstr ""
+
+#: ../picard/const.py:270
+msgid "Armenia"
+msgstr ""
+
+#: ../picard/const.py:271
+msgid "Albania"
+msgstr ""
+
+#: ../picard/const.py:272
+msgid "Angola"
+msgstr ""
+
+#: ../picard/const.py:273
+msgid "Netherlands Antilles"
+msgstr ""
+
+#: ../picard/const.py:274
+msgid "Antarctica"
+msgstr ""
+
+#: ../picard/const.py:275
+msgid "American Samoa"
+msgstr ""
+
+#: ../picard/const.py:276
+msgid "Argentina"
+msgstr ""
+
+#: ../picard/const.py:277
+msgid "Australia"
+msgstr ""
+
+#: ../picard/const.py:278
+#, fuzzy
+msgid "Austria"
+msgstr "מחבר"
+
+#: ../picard/const.py:279
+msgid "Aruba"
+msgstr ""
+
+#: ../picard/const.py:280
+#, fuzzy
+msgid "India"
+msgstr "מדיה"
+
+#: ../picard/const.py:281
+msgid "Tanzania, United Republic of"
+msgstr ""
+
+#: ../picard/const.py:282
+msgid "Azerbaijan"
+msgstr ""
+
+#: ../picard/const.py:283
+msgid "Ireland"
+msgstr ""
+
+#: ../picard/const.py:284
+msgid "Indonesia"
+msgstr ""
+
+#: ../picard/const.py:285
+msgid "Ukraine"
+msgstr ""
+
+#: ../picard/const.py:286
+msgid "Qatar"
+msgstr ""
+
+#: ../picard/const.py:287
+msgid "Mozambique"
+msgstr ""
+
+#: ../picard/const.py:288
+msgid "Bosnia and Herzegovina"
+msgstr ""
+
+#: ../picard/const.py:289
+msgid "Congo, The Democratic Republic of the"
+msgstr ""
+
+#: ../picard/const.py:290
+msgid "Serbia and Montenegro"
+msgstr ""
+
+#: ../picard/const.py:291
+msgid "Croatia"
+msgstr ""
+
+#: ../picard/const.py:292
+msgid "Korea (North), Democratic People's Republic of"
+msgstr ""
+
+#: ../picard/const.py:293
+msgid "Korea (South), Republic of"
+msgstr ""
+
+#: ../picard/const.py:294
+msgid "Slovakia"
+msgstr ""
+
+#: ../picard/const.py:295
+msgid "Soviet Union (historical, 1922-1991)"
+msgstr ""
+
+#: ../picard/const.py:296
+msgid "East Timor"
+msgstr ""
+
+#: ../picard/const.py:297
+msgid "Czechoslovakia (historical, 1918-1992)"
+msgstr ""
+
+#: ../picard/const.py:298
+msgid "Europe"
+msgstr ""
+
+#: ../picard/const.py:299
+msgid "East Germany (historical, 1949-1990)"
+msgstr ""
+
+#: ../picard/const.py:300
+msgid "[Unknown Country]"
+msgstr ""
+
+#: ../picard/const.py:301
+msgid "[Worldwide]"
+msgstr ""
+
+#: ../picard/const.py:302
+msgid "Yugoslavia (historical, 1918-1992)"
+msgstr ""
+
+#: ../picard/const.py:307
+msgid "Catalan"
+msgstr ""
+
+#: ../picard/const.py:308
+msgid "Czech"
+msgstr ""
+
+#: ../picard/const.py:309
+msgid "Welsh"
+msgstr ""
+
+#: ../picard/const.py:310
+#, fuzzy
+msgid "Danish"
+msgstr "פרטים"
+
+#: ../picard/const.py:311
+#, fuzzy
+msgid "German"
+msgstr "כללי"
+
+#: ../picard/const.py:312
+msgid "English"
+msgstr ""
+
+#: ../picard/const.py:313
+msgid "English (Canada)"
+msgstr ""
+
+#: ../picard/const.py:314
+msgid "English (UK)"
+msgstr ""
+
+#: ../picard/const.py:315
+msgid "Spanish"
+msgstr ""
+
+#: ../picard/const.py:316
+#, fuzzy
+msgid "Persian"
+msgstr "גירסה"
+
+#: ../picard/const.py:317
+msgid "Finnish"
+msgstr ""
+
+#: ../picard/const.py:318
+msgid "French"
+msgstr ""
+
+#: ../picard/const.py:319
+msgid "Frisian"
+msgstr ""
+
+#: ../picard/const.py:320
+msgid "Hebrew"
+msgstr ""
+
+#: ../picard/const.py:321
+msgid "Hungarian"
+msgstr ""
+
+#: ../picard/const.py:322
+msgid "Islandic"
+msgstr ""
+
+#: ../picard/const.py:323
+msgid "Italian"
+msgstr ""
+
+#: ../picard/const.py:324
+msgid "Kannada"
+msgstr ""
+
+#: ../picard/const.py:325
+msgid "Korean"
+msgstr ""
+
+#: ../picard/const.py:326
+msgid "Lithuanian"
+msgstr ""
+
+#: ../picard/const.py:327
+msgid "Norwegian Bokmal"
+msgstr ""
+
+#: ../picard/const.py:328
+msgid "Dutch"
+msgstr ""
+
+#: ../picard/const.py:329
+#, fuzzy
+msgid "Polish"
+msgstr "תוספים"
+
+#: ../picard/const.py:330
+msgid "Portuguese"
+msgstr ""
+
+#: ../picard/const.py:331
+msgid "Brazilian Portuguese"
+msgstr ""
+
+#: ../picard/const.py:332
+msgid "Romanian"
+msgstr ""
+
+#: ../picard/const.py:333
+msgid "Russian"
+msgstr ""
+
+#: ../picard/const.py:334
+#, fuzzy
+msgid "Scots"
+msgstr "ניקוד"
+
+#: ../picard/const.py:335
+msgid "Slovak"
+msgstr ""
+
+#: ../picard/const.py:336
+msgid "Slovenian"
+msgstr ""
+
+#: ../picard/const.py:337
+msgid "Swedish"
+msgstr ""
+
+#: ../picard/const.py:338
+#, fuzzy
+msgid "Chinese"
+msgstr "ערוצים:"
+
+#: ../picard/file.py:475
+#, python-format
+msgid "No matching tracks for file %s"
+msgstr "לא נמצאו רצועות תואמות עבור הקובץ %s"
+
+#: ../picard/file.py:492
+#, fuzzy, python-format
+msgid "No matching tracks above the threshold for file %s"
+msgstr "לא נמצאו רצועות תואמות עבור הקובץ %s"
+
+#: ../picard/file.py:495
+#, python-format
+msgid "File %s identified!"
+msgstr "הקובץ %s זוהה!"
+
+#: ../picard/file.py:506
+#, python-format
+msgid "Looking up the PUID for file %s..."
+msgstr "מחפש את ה-PUID עבור הקובץ %s..."
+
+#: ../picard/file.py:511
+#, python-format
+msgid "Looking up the metadata for file %s..."
+msgstr "מחפש את נתוני המטא עבור הקובץ %s..."
+
+#: ../picard/puidmanager.py:58
+msgid "Submitting PUIDs..."
+msgstr "שולח מזהי PUID..."
+
+#: ../picard/puidmanager.py:64
+#, python-format
+msgid "PUIDs submission failed: %s"
+msgstr "שלחית מזהי ה-PUID נכשלה: %s"
+
+#: ../picard/puidmanager.py:66
+msgid "PUIDs successfully submitted!"
+msgstr "מזהי ה-PUID נשלחו בהצלחה!"
+
+#: ../picard/playlist.py:31
+msgid "M3U Playlist (*.m3u)"
+msgstr "רשימת השמעה M3U(*.m3u)"
+
+#: ../picard/playlist.py:32
+msgid "PLS Playlist (*.pls)"
+msgstr "רשימת השמעה PLS (*.pls)"
+
+#: ../picard/playlist.py:33
+msgid "XSPF Playlist (*.xspf)"
+msgstr "רשימת השמעה XSPF (*.xspf)"
+
+#: ../picard/tagger.py:476
 msgid "CD Lookup Error"
 msgstr "שגיאת חיפוש תקליטור"
 
-#: ../picard/tagger.py:473
+#: ../picard/tagger.py:477
 #, python-format
 msgid ""
 "Error while reading CD:\n"
@@ -46,125 +1304,175 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../picard/ui/passworddialog.py:38
+#: ../picard/tagger.py:503
 #, python-format
-msgid ""
-"The server %s requires you to login. Please enter your username and password."
-msgstr ""
+msgid "Couldn't find PUID for file %s"
+msgstr "לא ניתן למצוא את ה-PUID עבור הקובץ %s"
 
-#: ../picard/ui/ui_options_script.py:52
-msgid "Tagger Script"
-msgstr "סקריפט תיוג"
+#: ../picard/musicdns/__init__.py:98
+#, python-format
+msgid "Looking up the fingerprint for file %s..."
+msgstr "מחפש את טביעת האצבע עבור הקובץ %s..."
+
+#: ../picard/musicdns/__init__.py:117
+#, python-format
+msgid "Creating fingerprint for file %s..."
+msgstr "יוצר טביעת אצבע עבור הקובץ %s..."
 
 #: ../picard/ui/cdlookup.py:31
 msgid "Score"
 msgstr "ניקוד"
 
 #: ../picard/ui/cdlookup.py:31
+#: ../picard/ui/itemviews.py:82
+#: ../picard/util/tags.py:23
 msgid "Title"
 msgstr "כותרת"
 
-#: ../picard/ui/cdlookup.py:31 ../picard/ui/mainwindow.py:436
+#: ../picard/ui/cdlookup.py:31
+#: ../picard/ui/itemviews.py:84
+#: ../picard/ui/mainwindow.py:436
+#: ../picard/util/tags.py:22
 msgid "Artist"
 msgstr "אמן"
 
-#: ../picard/ui/ui_metadata.py:121
-msgid "Lookup"
-msgstr "חיפוש"
+#: ../picard/ui/coverartbox.py:47
+#: ../picard/ui/options/cover.py:29
+msgid "Cover Art"
+msgstr "אומנות העטיפה"
 
-#: ../picard/ui/ui_metadata.py:122
-msgid "Title:"
-msgstr "כותרת:"
+#: ../picard/ui/coverartbox.py:95
+msgid "Buy the album on Amazon"
+msgstr "רכוש את האלבום באמאזון"
 
-#: ../picard/ui/ui_metadata.py:123
-msgid "Date:"
-msgstr "תאריך:"
+#: ../picard/ui/filebrowser.py:38
+#: ../picard/ui/mainwindow.py:302
+msgid "&Refresh"
+msgstr "רע&נן"
 
-#: ../picard/ui/ui_metadata.py:124
-msgid "Artist:"
-msgstr "אומן:"
+#: ../picard/ui/filebrowser.py:41
+#, fuzzy
+msgid "&Move Tagged Files Here"
+msgstr "ה&עבר קבצים"
 
-#: ../picard/ui/ui_metadata.py:125
-msgid "Track:"
-msgstr "רצועה:"
+#: ../picard/ui/filebrowser.py:44
+msgid "Show &Hidden Files"
+msgstr ""
 
-#: ../picard/ui/ui_metadata.py:126
-msgid "0000-00-00; "
-msgstr "0000-00-00; "
+#: ../picard/ui/itemviews.py:83
+msgid "Length"
+msgstr "משך"
 
-#: ../picard/ui/ui_metadata.py:127 ../picard/ui/tageditor.py:225
-#: ../picard/ui/multitageditor.py:181
+#: ../picard/ui/itemviews.py:327
+msgid "&Releases"
+msgstr "ה&פצות"
+
+#: ../picard/ui/itemviews.py:353
+msgid "&Plugins"
+msgstr "&תוספים"
+
+#: ../picard/ui/itemviews.py:523
+msgid "Clusters"
+msgstr "אשכולות"
+
+#: ../picard/ui/logview.py:29
+msgid "Log"
+msgstr "רישום"
+
+#: ../picard/ui/puidsubmit.py:31
+#: ../picard/ui/options/plugins.py:80
+msgid "File"
+msgstr "קובץ"
+
+#: ../picard/ui/puidsubmit.py:31
+msgid "PUID"
+msgstr "PUID"
+
+#: ../picard/ui/puidsubmit.py:31
+#: ../picard/ui/mainwindow.py:437
+msgid "Track"
+msgstr "רצועה"
+
+#: ../picard/ui/puidsubmit.py:31
+msgid "Release"
+msgstr "מהדורה"
+
+#: ../picard/ui/puidsubmit.py:31
+msgid "Release ID"
+msgstr "מזהה המהדורה"
+
+#: ../picard/ui/tageditor.py:65
+#: ../picard/ui/ui_options_plugins.py:62
+msgid "Details"
+msgstr "פרטים"
+
+#: ../picard/ui/tageditor.py:70
+#: ../picard/ui/tageditor.py:241
+#, python-format
+msgid "%d file"
+msgid_plural "%d files"
+msgstr[0] "קובץ %d"
+msgstr[1] "%d קבצים"
+
+#: ../picard/ui/tageditor.py:124
+#, python-format
+msgid "(different across %d file)"
+msgid_plural "(different across %d files)"
+msgstr[0] "(משתנה לאורך קובץ %d)"
+msgstr[1] "(משתנה לאורך %d קבצים)"
+
+#: ../picard/ui/tageditor.py:127
+#, python-format
+msgid "(missing from %d file)"
+msgid_plural "(missing from %d files)"
+msgstr[0] "(חסר מקובץ %d)"
+msgstr[1] "(חסר מ-%d קבצים)"
+
+#: ../picard/ui/tageditor.py:210
+msgid "Filename:"
+msgstr "שם הקובץ:"
+
+#: ../picard/ui/tageditor.py:212
+msgid "Format:"
+msgstr "תבנית:"
+
+#: ../picard/ui/tageditor.py:221
+msgid "Size:"
+msgstr "גודל:"
+
+#: ../picard/ui/tageditor.py:225
+#: ../picard/ui/ui_metadata.py:127
 msgid "Length:"
 msgstr "משך:"
 
-#: ../picard/ui/ui_metadata.py:128
-msgid "Album:"
-msgstr "אלבום:"
+#: ../picard/ui/tageditor.py:227
+msgid "Bitrate:"
+msgstr "קצב סיביות:"
 
-#: ../picard/ui/ui_passworddialog.py:78
-msgid "Authentication required"
-msgstr ""
+#: ../picard/ui/tageditor.py:229
+msgid "Sample rate:"
+msgstr "קצב דגימה:"
 
-#: ../picard/ui/ui_passworddialog.py:79 ../picard/ui/ui_options_proxy.py:83
-#: ../picard/ui/ui_options_general.py:113
-msgid "Username:"
-msgstr "שם משתמש:"
+#: ../picard/ui/tageditor.py:231
+msgid "Bits per sample:"
+msgstr "סיביות לדגימה:"
 
-#: ../picard/ui/ui_passworddialog.py:80 ../picard/ui/ui_options_proxy.py:82
-#: ../picard/ui/ui_options_general.py:112
-msgid "Password:"
-msgstr "סיסמה:"
+#: ../picard/ui/tageditor.py:234
+msgid "Mono"
+msgstr "מונו"
 
-#: ../picard/ui/ui_passworddialog.py:81
-msgid "Save username and password"
-msgstr ""
+#: ../picard/ui/tageditor.py:235
+msgid "Stereo"
+msgstr "סטריאו"
 
-#: ../picard/ui/ui_options_folksonomy.py:114
-#: ../picard/ui/ui_options_folksonomy_tags.py:114
-msgid "Folksonomy Tags"
-msgstr "תגיות שיתופיות"
+#: ../picard/ui/tageditor.py:237
+msgid "Channels:"
+msgstr "ערוצים:"
 
-#: ../picard/ui/ui_options_folksonomy.py:115
-#: ../picard/ui/ui_options_folksonomy_tags.py:115
-msgid "Ignore tags:"
-msgstr "התעלם מתגיות:"
-
-#: ../picard/ui/ui_options_folksonomy.py:116
-#: ../picard/ui/ui_options_folksonomy_tags.py:116
-msgid "Minimal tag usage:"
-msgstr "שימוש מזערי בתגיות:"
-
-#: ../picard/ui/ui_options_folksonomy.py:117
-#: ../picard/ui/ui_options_folksonomy_tags.py:117
-#: ../picard/ui/ui_options_matching.py:107
-#: ../picard/ui/ui_options_matching.py:108
-#: ../picard/ui/ui_options_matching.py:109
-#: ../picard/ui/ui_options_matching.py:113
-msgid " %"
-msgstr " %"
-
-#: ../picard/ui/ui_options_folksonomy.py:118
-msgid "Maximum number of tags:"
-msgstr "מספר התגיות המירבי:"
-
-#: ../picard/ui/ui_options_folksonomy.py:119
-#: ../picard/ui/ui_options_folksonomy_tags.py:119
-msgid "Join multiple tags with:"
-msgstr "צרף מספרתגיות עם:"
-
-#: ../picard/ui/ui_options_folksonomy.py:120
-#: ../picard/ui/ui_options_folksonomy_tags.py:120
-msgid " / "
-msgstr " / "
-
-#: ../picard/ui/ui_options_folksonomy.py:121
-#: ../picard/ui/ui_options_folksonomy_tags.py:121
-msgid ", "
-msgstr ", "
-
-#: ../picard/ui/ui_options_folksonomy_tags.py:118
-msgid "Maximal number of tags:"
-msgstr "מספר התגיות המירבי:"
+#: ../picard/ui/tagsfromfilenames.py:52
+#: ../picard/ui/tagsfromfilenames.py:96
+msgid "File Name"
+msgstr "שם הקובץ"
 
 #: ../picard/ui/mainwindow.py:64
 msgid "MusicBrainz Picard"
@@ -299,7 +1607,8 @@ msgstr "חיפוש"
 msgid "&CD Lookup..."
 msgstr "&חיפוש תקליטור..."
 
-#: ../picard/ui/mainwindow.py:272 ../picard/ui/mainwindow.py:273
+#: ../picard/ui/mainwindow.py:272
+#: ../picard/ui/mainwindow.py:273
 msgid "Lookup CD"
 msgstr "חפש תקליטור"
 
@@ -330,7 +1639,8 @@ msgstr "Ctrl+U"
 msgid "&Lookup"
 msgstr "&חיפוש"
 
-#: ../picard/ui/mainwindow.py:291 ../picard/ui/mainwindow.py:292
+#: ../picard/ui/mainwindow.py:291
+#: ../picard/ui/mainwindow.py:292
 msgid "Lookup metadata"
 msgstr "חיפוש נתוני מטא"
 
@@ -343,10 +1653,6 @@ msgstr "Ctrl+L"
 msgid "&Details..."
 msgstr "&פרטים..."
 
-#: ../picard/ui/mainwindow.py:302 ../picard/ui/filebrowser.py:38
-msgid "&Refresh"
-msgstr "רע&נן"
-
 #: ../picard/ui/mainwindow.py:305
 msgid "Generate &Playlist..."
 msgstr "ייצר &רשימת השמעה..."
@@ -392,6 +1698,7 @@ msgid "&Tools"
 msgstr "&כלים"
 
 #: ../picard/ui/mainwindow.py:384
+#: ../picard/ui/util.py:33
 msgid "&Help"
 msgstr "&עזרה"
 
@@ -404,13 +1711,10 @@ msgid "&Search Bar"
 msgstr "סרגל ה&חיפוש"
 
 #: ../picard/ui/mainwindow.py:435
+#: ../picard/util/tags.py:21
 msgid "Album"
 msgstr "אלבום"
 
-#: ../picard/ui/mainwindow.py:437 ../picard/ui/puidsubmit.py:31
-msgid "Track"
-msgstr "רצועה"
-
 #: ../picard/ui/mainwindow.py:476
 msgid "All Supported Formats"
 msgstr "כל סוגי הקבצים הנתמכים"
@@ -425,37 +1729,289 @@ msgstr "שומר את רשימת ההשמעה %s..."
 msgid "Playlist %s saved"
 msgstr "רשימת ההשמעה %s נשמרה"
 
-#: ../picard/ui/mainwindow.py:638 ../picard/ui/mainwindow.py:647
+#: ../picard/ui/mainwindow.py:638
+#: ../picard/ui/mainwindow.py:647
 #, python-format
 msgid " (Error: %s)"
 msgstr " (שגיאה: %s)"
 
+#: ../picard/ui/ui_tageditor.py:115
+#: ../picard/ui/ui_options_plugins.py:59
+#: ../picard/ui/options/plugins.py:76
+msgid "Name"
+msgstr "שם"
+
+#: ../picard/ui/ui_tageditor.py:116
+msgid "Value"
+msgstr "ערך"
+
+#: ../picard/ui/ui_tageditor.py:117
+msgid "&Add..."
+msgstr "הו&ספה..."
+
+#: ../picard/ui/ui_tageditor.py:118
+msgid "&Edit..."
+msgstr "ע&ריכה..."
+
+#: ../picard/ui/ui_tageditor.py:119
+msgid "&Delete"
+msgstr "&מחק"
+
+#: ../picard/ui/ui_tageditor.py:120
+msgid "&Metadata"
+msgstr "&נתוני-מטא"
+
+#: ../picard/ui/ui_tageditor.py:121
+msgid "A&rtwork"
+msgstr "או&מנות"
+
+#: ../picard/ui/ui_tageditor.py:122
+msgid "&Info"
+msgstr "&מידע"
+
+#: ../picard/ui/passworddialog.py:38
+#, python-format
+msgid "The server %s requires you to login. Please enter your username and password."
+msgstr ""
+
+#: ../picard/ui/ui_cdlookup.py:60
+#: ../picard/ui/ui_options_cdlookup.py:47
+#: ../picard/ui/ui_options_cdlookup_win32.py:56
+#: ../picard/ui/options/cdlookup.py:35
+msgid "CD Lookup"
+msgstr "חיפוש תקליטור"
+
+#: ../picard/ui/ui_cdlookup.py:61
+msgid "The following releases on MusicBrainz match the CD:"
+msgstr "המהדורות הבאות ב-MusicBrainz תואמות לתקליטור:"
+
+#: ../picard/ui/ui_cdlookup.py:62
+#: ../picard/ui/ui_puidsubmit.py:53
+msgid "OK"
+msgstr "אישור"
+
+#: ../picard/ui/ui_cdlookup.py:63
+msgid "    Lookup manually    "
+msgstr "    חיפוש ידני    "
+
+#: ../picard/ui/ui_cdlookup.py:64
+#: ../picard/ui/ui_puidsubmit.py:54
+msgid "Cancel"
+msgstr "ביטול"
+
+#: ../picard/ui/ui_passworddialog.py:78
+msgid "Authentication required"
+msgstr ""
+
+#: ../picard/ui/ui_passworddialog.py:79
+#: ../picard/ui/ui_options_general.py:113
+#: ../picard/ui/ui_options_proxy.py:83
+msgid "Username:"
+msgstr "שם משתמש:"
+
+#: ../picard/ui/ui_passworddialog.py:80
+#: ../picard/ui/ui_options_general.py:112
+#: ../picard/ui/ui_options_proxy.py:82
+msgid "Password:"
+msgstr "סיסמה:"
+
+#: ../picard/ui/ui_passworddialog.py:81
+msgid "Save username and password"
+msgstr ""
+
 #: ../picard/ui/ui_edittagdialog.py:44
 msgid "Edit Tag"
 msgstr "ערוך תגית"
 
-#: ../picard/ui/ui_options_proxy.py:81
-msgid "Web Proxy"
-msgstr "מתווך רשת"
+#: ../picard/ui/ui_metadata.py:121
+msgid "Lookup"
+msgstr "חיפוש"
 
-#: ../picard/ui/ui_options_proxy.py:84 ../picard/ui/ui_options_general.py:109
-msgid "Port:"
-msgstr "פתחה:"
+#: ../picard/ui/ui_metadata.py:122
+msgid "Title:"
+msgstr "כותרת:"
 
-#: ../picard/ui/ui_options_proxy.py:85 ../picard/ui/ui_options_general.py:110
-msgid "Server address:"
-msgstr "כתובת השרת:"
+#: ../picard/ui/ui_metadata.py:123
+msgid "Date:"
+msgstr "תאריך:"
 
-#: ../picard/ui/ui_tagsfromfilenames.py:56
-msgid "Convert File Names to Tags"
-msgstr "המר את שמות הקבצים לתגיות"
+#: ../picard/ui/ui_metadata.py:124
+msgid "Artist:"
+msgstr "אומן:"
 
-#: ../picard/ui/ui_tagsfromfilenames.py:57
-msgid "Replace underscores with spaces"
-msgstr "החלף קווים תחתיים ברווחים"
+#: ../picard/ui/ui_metadata.py:125
+msgid "Track:"
+msgstr "רצועה:"
+
+#: ../picard/ui/ui_metadata.py:126
+msgid "0000-00-00; "
+msgstr "0000-00-00; "
+
+#: ../picard/ui/ui_metadata.py:128
+msgid "Album:"
+msgstr "אלבום:"
+
+#: ../picard/ui/ui_options.py:42
+msgid "Options"
+msgstr "אפשרויות"
+
+#: ../picard/ui/ui_options_cdlookup.py:48
+msgid "CD-ROM device to use for lookups:"
+msgstr "התקן התקליטורים המשמש לחיפושים:"
+
+#: ../picard/ui/ui_options_cdlookup_win32.py:57
+msgid "Default CD-ROM drive to use for lookups:"
+msgstr "כונן התקליטורים המשמש כברירת המחדל לחיפושים:"
+
+#: ../picard/ui/ui_options_cover.py:56
+msgid "Location"
+msgstr "מיקום"
+
+#: ../picard/ui/ui_options_cover.py:57
+msgid "Embed cover images into tags"
+msgstr "הטמע את תמונות העטיפה אל תוך התגיות"
+
+#: ../picard/ui/ui_options_cover.py:58
+msgid "Save cover images as separate files"
+msgstr "שמור את תמונות העטיפה כקבצים נפרדים"
+
+#: ../picard/ui/ui_options_cover.py:59
+msgid "Overwrite the file if it already exists"
+msgstr "שכתב על הקובץ במידה והוא כבר קיים"
+
+#: ../picard/ui/util.py:31
+msgid "&Ok"
+msgstr "&אישור"
+
+#: ../picard/ui/util.py:32
+msgid "&Cancel"
+msgstr "&ביטול"
+
+#: ../picard/ui/ui_puidsubmit.py:52
+msgid "Submit PUIDs"
+msgstr "שלח מזהי PUID"
+
+#: ../picard/ui/ui_options_folksonomy.py:114
+#: ../picard/ui/options/folksonomy.py:29
+msgid "Folksonomy Tags"
+msgstr "תגיות שיתופיות"
+
+#: ../picard/ui/ui_options_folksonomy.py:115
+msgid "Ignore tags:"
+msgstr "התעלם מתגיות:"
+
+#: ../picard/ui/ui_options_folksonomy.py:116
+msgid "Minimal tag usage:"
+msgstr "שימוש מזערי בתגיות:"
+
+#: ../picard/ui/ui_options_folksonomy.py:117
+#: ../picard/ui/ui_options_matching.py:107
+#: ../picard/ui/ui_options_matching.py:108
+#: ../picard/ui/ui_options_matching.py:109
+#: ../picard/ui/ui_options_matching.py:113
+msgid " %"
+msgstr " %"
+
+#: ../picard/ui/ui_options_folksonomy.py:118
+msgid "Maximum number of tags:"
+msgstr "מספר התגיות המירבי:"
+
+#: ../picard/ui/ui_options_folksonomy.py:119
+msgid "Join multiple tags with:"
+msgstr "צרף מספרתגיות עם:"
+
+#: ../picard/ui/ui_options_folksonomy.py:120
+msgid " / "
+msgstr " / "
+
+#: ../picard/ui/ui_options_folksonomy.py:121
+msgid ", "
+msgstr ", "
+
+#: ../picard/ui/ui_options_interface.py:50
+msgid "Miscellaneous"
+msgstr "שונות"
+
+#: ../picard/ui/ui_options_interface.py:51
+msgid "Show text labels under icons"
+msgstr "הצג תוויות טקסט מתחת לסמלים"
+
+#: ../picard/ui/ui_options_interface.py:52
+msgid "Allow selection of multiple directories"
+msgstr "אפשר בחירת תיקיות מרובות"
+
+#: ../picard/ui/ui_options_interface.py:53
+msgid "Use advanced query syntax"
+msgstr "השתמש בתחביר שאילתות מתקדם"
+
+#: ../picard/ui/ui_options_interface.py:54
+#, fuzzy
+msgid "User interface language:"
+msgstr "מנשק משתמש"
+
+#: ../picard/ui/ui_options_naming.py:165
+msgid "Rename Files"
+msgstr "שנה את שמות הקבצים"
+
+#: ../picard/ui/ui_options_naming.py:166
+msgid "Replace Windows-incompatible characters"
+msgstr "החלף תווים שאינם נתמכים על ידי Windows"
+
+#: ../picard/ui/ui_options_naming.py:167
+msgid "Replace non-ASCII characters"
+msgstr "החלף תווים שאינם ASCII"
+
+#: ../picard/ui/ui_options_naming.py:168
+#: ../picard/ui/ui_options_naming.py:169
+#: ../picard/ui/ui_options_metadata.py:109
+#: ../picard/ui/ui_options_metadata.py:110
+msgid "Default"
+msgstr "ברירת מחדל"
+
+#: ../picard/ui/ui_options_naming.py:170
+#: ../picard/ui/options/naming.py:90
+msgid "Multiple artist file naming format:"
+msgstr "מבנה שמות הקבצים בעלי מספר אמנים:"
+
+#: ../picard/ui/ui_options_naming.py:171
+#: ../picard/ui/options/naming.py:86
+msgid "File naming format:"
+msgstr "מבנה שם הקובץ:"
+
+#: ../picard/ui/ui_options_naming.py:172
+msgid "Move Files"
+msgstr "העבר קבצים"
+
+#: ../picard/ui/ui_options_naming.py:173
+msgid "Move tagged files to this directory:"
+msgstr "העבר קבצים מתוייגים לתיקייה זו:"
+
+#: ../picard/ui/ui_options_naming.py:174
+msgid "Browse..."
+msgstr "עיון..."
+
+#: ../picard/ui/ui_options_naming.py:175
+msgid "Move additional files:"
+msgstr "העבר קבצים נוספים:"
+
+#: ../picard/ui/ui_options_naming.py:176
+msgid "Delete empty directories"
+msgstr "מחק תיקיות ריקות"
+
+#: ../picard/ui/ui_options_naming.py:177
+msgid "Example"
+msgstr "דוגמה"
+
+#: ../picard/ui/ui_options_naming.py:178
+msgid "File name:"
+msgstr "שם הקובץ:"
+
+#: ../picard/ui/ui_options_naming.py:179
+msgid "Multiple artist file name:"
+msgstr "שם הקובץ בעל כמה אמנים:"
 
-#: ../picard/ui/ui_tagsfromfilenames.py:58
 #: ../picard/ui/ui_options_naming.py:180
+#: ../picard/ui/ui_tagsfromfilenames.py:58
 msgid "&Preview"
 msgstr "&תצוגה מקדימה"
 
@@ -463,11 +2019,22 @@ msgstr "&תצוגה מקדימה"
 msgid "MusicBrainz Server"
 msgstr "שרת MusicBrainz"
 
+#: ../picard/ui/ui_options_general.py:109
+#: ../picard/ui/ui_options_proxy.py:84
+msgid "Port:"
+msgstr "פתחה:"
+
+#: ../picard/ui/ui_options_general.py:110
+#: ../picard/ui/ui_options_proxy.py:85
+msgid "Server address:"
+msgstr "כתובת השרת:"
+
 #: ../picard/ui/ui_options_general.py:111
 msgid "Account Information"
 msgstr "פרטי החשבון"
 
 #: ../picard/ui/ui_options_general.py:114
+#: ../picard/ui/options/general.py:29
 msgid "General"
 msgstr "כללי"
 
@@ -475,34 +2042,6 @@ msgstr "כללי"
 msgid "Automatically scan all new files"
 msgstr "סרוק אוטומטית את כל הקבצים החדשים"
 
-#: ../picard/ui/ui_options_interface.py:46
-msgid "Miscellaneous"
-msgstr "שונות"
-
-#: ../picard/ui/ui_options_interface.py:47
-msgid "Show text labels under icons"
-msgstr "הצג תוויות טקסט מתחת לסמלים"
-
-#: ../picard/ui/ui_options_interface.py:48
-msgid "Allow selection of multiple directories"
-msgstr "אפשר בחירת תיקיות מרובות"
-
-#: ../picard/ui/ui_options_interface.py:49
-msgid "Use advanced query syntax"
-msgstr "השתמש בתחביר שאילתות מתקדם"
-
-#: ../picard/ui/itemviews.py:327
-msgid "&Releases"
-msgstr "ה&פצות"
-
-#: ../picard/ui/itemviews.py:353
-msgid "&Plugins"
-msgstr "&תוספים"
-
-#: ../picard/ui/itemviews.py:523
-msgid "Clusters"
-msgstr "אשכולות"
-
 #: ../picard/ui/ui_options_matching.py:105
 msgid "Thresholds"
 msgstr "ערכי סף"
@@ -523,6 +2062,68 @@ msgstr "דמיון מזערי לחיפושי אשכולות:"
 msgid "Minimal similarity for PUID lookups:"
 msgstr "דמיון מזערי לחיפושי מזהי PUID:"
 
+#: ../picard/ui/ui_options_metadata.py:100
+#: ../picard/ui/options/metadata.py:31
+msgid "Metadata"
+msgstr "נתוני מטא"
+
+#: ../picard/ui/ui_options_metadata.py:101
+msgid "Translate foreign artist names to English where possible"
+msgstr "תרגם שמות אמנים זרים לאנגלית היכן שניתן"
+
+#: ../picard/ui/ui_options_metadata.py:102
+msgid "Use release relationships"
+msgstr "השתמש ביחסי מהדורה"
+
+#: ../picard/ui/ui_options_metadata.py:103
+msgid "Use track relationships"
+msgstr "השתמש ביחסי הרצועות"
+
+#: ../picard/ui/ui_options_metadata.py:104
+msgid "Use folksonomy tags as genre"
+msgstr "השתמש בתיוג שיתופי בתור ז'אנר"
+
+#: ../picard/ui/ui_options_metadata.py:105
+#, fuzzy
+msgid "Preferred release country:"
+msgstr "סוג המהדורה"
+
+#: ../picard/ui/ui_options_metadata.py:106
+msgid "Custom Fields"
+msgstr "שדות מותאמים אישית"
+
+#: ../picard/ui/ui_options_metadata.py:107
+msgid "Various artists:"
+msgstr "מגוון אמנים:"
+
+#: ../picard/ui/ui_options_metadata.py:108
+msgid "Non-album tracks:"
+msgstr "רצועות ללא-אלבום:"
+
+#: ../picard/ui/ui_options_plugins.py:58
+#: ../picard/ui/options/plugins.py:30
+msgid "Plugins"
+msgstr "תוספים"
+
+#: ../picard/ui/ui_options_plugins.py:60
+#: ../picard/ui/options/plugins.py:79
+msgid "Author"
+msgstr "מחבר"
+
+#: ../picard/ui/ui_options_plugins.py:61
+#: ../picard/util/tags.py:36
+msgid "Version"
+msgstr "גירסה"
+
+#: ../picard/ui/ui_options_proxy.py:81
+#: ../picard/ui/options/proxy.py:28
+msgid "Web Proxy"
+msgstr "מתווך רשת"
+
+#: ../picard/ui/ui_options_script.py:52
+msgid "Tagger Script"
+msgstr "סקריפט תיוג"
+
 #: ../picard/ui/ui_options_tags.py:105
 msgid "Common"
 msgstr "משותף"
@@ -575,321 +2176,23 @@ msgstr "APE"
 msgid "Remove APEv2 tags from MP3 files"
 msgstr "הסר תגיות APEv2 מקבצי MP3"
 
-#: ../picard/ui/ui_options_cdlookup_win32.py:56 ../picard/ui/ui_cdlookup.py:60
-#: ../picard/ui/ui_options_cdlookup.py:47
-msgid "CD Lookup"
-msgstr "חיפוש תקליטור"
+#: ../picard/ui/ui_tagsfromfilenames.py:56
+msgid "Convert File Names to Tags"
+msgstr "המר את שמות הקבצים לתגיות"
 
-#: ../picard/ui/ui_options_cdlookup_win32.py:57
-msgid "Default CD-ROM drive to use for lookups:"
-msgstr "כונן התקליטורים המשמש כברירת המחדל לחיפושים:"
+#: ../picard/ui/ui_tagsfromfilenames.py:57
+msgid "Replace underscores with spaces"
+msgstr "החלף קווים תחתיים ברווחים"
 
-#: ../picard/ui/tageditor.py:65 ../picard/ui/ui_options_plugins.py:62
-#: ../picard/ui/multitageditor.py:37
-msgid "Details"
-msgstr "פרטים"
-
-#: ../picard/ui/tageditor.py:70 ../picard/ui/tageditor.py:241
-#: ../picard/ui/multitageditor.py:42 ../picard/ui/multitageditor.py:197
-#, python-format
-msgid "%d file"
-msgid_plural "%d files"
-msgstr[0] "קובץ %d"
-msgstr[1] "%d קבצים"
-
-#: ../picard/ui/tageditor.py:124 ../picard/ui/multitageditor.py:95
-#, python-format
-msgid "(different across %d file)"
-msgid_plural "(different across %d files)"
-msgstr[0] "(משתנה לאורך קובץ %d)"
-msgstr[1] "(משתנה לאורך %d קבצים)"
-
-#: ../picard/ui/tageditor.py:127 ../picard/ui/multitageditor.py:98
-#, python-format
-msgid "(missing from %d file)"
-msgid_plural "(missing from %d files)"
-msgstr[0] "(חסר מקובץ %d)"
-msgstr[1] "(חסר מ-%d קבצים)"
-
-#: ../picard/ui/tageditor.py:210 ../picard/ui/multitageditor.py:166
-msgid "Filename:"
-msgstr "שם הקובץ:"
-
-#: ../picard/ui/tageditor.py:212 ../picard/ui/multitageditor.py:168
-msgid "Format:"
-msgstr "תבנית:"
-
-#: ../picard/ui/tageditor.py:221 ../picard/ui/multitageditor.py:177
-msgid "Size:"
-msgstr "גודל:"
-
-#: ../picard/ui/tageditor.py:227 ../picard/ui/multitageditor.py:183
-msgid "Bitrate:"
-msgstr "קצב סיביות:"
-
-#: ../picard/ui/tageditor.py:229 ../picard/ui/multitageditor.py:185
-msgid "Sample rate:"
-msgstr "קצב דגימה:"
-
-#: ../picard/ui/tageditor.py:231 ../picard/ui/multitageditor.py:187
-msgid "Bits per sample:"
-msgstr "סיביות לדגימה:"
-
-#: ../picard/ui/tageditor.py:234 ../picard/ui/multitageditor.py:190
-msgid "Mono"
-msgstr "מונו"
-
-#: ../picard/ui/tageditor.py:235 ../picard/ui/multitageditor.py:191
-msgid "Stereo"
-msgstr "סטריאו"
-
-#: ../picard/ui/tageditor.py:237 ../picard/ui/multitageditor.py:193
-msgid "Channels:"
-msgstr "ערוצים:"
-
-#: ../picard/ui/ui_tageditor.py:115 ../picard/ui/ui_multitageditor.py:55
-#: ../picard/ui/ui_options_plugins.py:59 ../picard/ui/options/plugins.py:76
-msgid "Name"
-msgstr "שם"
-
-#: ../picard/ui/ui_tageditor.py:116 ../picard/ui/ui_multitageditor.py:56
-msgid "Value"
-msgstr "ערך"
-
-#: ../picard/ui/ui_tageditor.py:117 ../picard/ui/ui_multitageditor.py:57
-msgid "&Add..."
-msgstr "הו&ספה..."
-
-#: ../picard/ui/ui_tageditor.py:118
-msgid "&Edit..."
-msgstr "ע&ריכה..."
-
-#: ../picard/ui/ui_tageditor.py:119
-msgid "&Delete"
-msgstr "&מחק"
-
-#: ../picard/ui/ui_tageditor.py:120
-msgid "&Metadata"
-msgstr "&נתוני-מטא"
-
-#: ../picard/ui/ui_tageditor.py:121
-msgid "A&rtwork"
-msgstr "או&מנות"
-
-#: ../picard/ui/ui_tageditor.py:122
-msgid "&Info"
-msgstr "&מידע"
-
-#: ../picard/ui/coverartbox.py:47
-msgid "Cover Art"
-msgstr "אומנות העטיפה"
-
-#: ../picard/ui/coverartbox.py:95
-msgid "Buy the album on Amazon"
-msgstr "רכוש את האלבום באמאזון"
-
-#: ../picard/ui/ui_puidsubmit.py:52
-msgid "Submit PUIDs"
-msgstr "שלח מזהי PUID"
-
-#: ../picard/ui/ui_puidsubmit.py:53 ../picard/ui/ui_cdlookup.py:62
-msgid "OK"
-msgstr "אישור"
-
-#: ../picard/ui/ui_puidsubmit.py:54 ../picard/ui/ui_cdlookup.py:64
-msgid "Cancel"
-msgstr "ביטול"
-
-#: ../picard/ui/puidsubmit.py:31 ../picard/ui/options/plugins.py:80
-msgid "File"
-msgstr "קובץ"
-
-#: ../picard/ui/puidsubmit.py:31
-msgid "PUID"
-msgstr "PUID"
-
-#: ../picard/ui/puidsubmit.py:31
-msgid "Release"
-msgstr "מהדורה"
-
-#: ../picard/ui/puidsubmit.py:31
-msgid "Release ID"
-msgstr "מזהה המהדורה"
-
-#: ../picard/ui/filebrowser.py:41
-#, fuzzy
-msgid "&Move Tagged Files Here"
-msgstr "ה&עבר קבצים"
-
-#: ../picard/ui/filebrowser.py:44
-msgid "Show &Hidden Files"
-msgstr ""
-
-#: ../picard/ui/ui_cdlookup.py:61
-msgid "The following releases on MusicBrainz match the CD:"
-msgstr "המהדורות הבאות ב-MusicBrainz תואמות לתקליטור:"
-
-#: ../picard/ui/ui_cdlookup.py:63
-msgid "    Lookup manually    "
-msgstr "    חיפוש ידני    "
-
-#: ../picard/ui/ui_options.py:42
-msgid "Options"
-msgstr "אפשרויות"
-
-#: ../picard/ui/tagsfromfilenames.py:52 ../picard/ui/tagsfromfilenames.py:96
-msgid "File Name"
-msgstr "שם הקובץ"
-
-#: ../picard/ui/ui_options_cover.py:56
-msgid "Location"
-msgstr "מיקום"
-
-#: ../picard/ui/ui_options_cover.py:57
-msgid "Embed cover images into tags"
-msgstr "הטמע את תמונות העטיפה אל תוך התגיות"
-
-#: ../picard/ui/ui_options_cover.py:58
-msgid "Save cover images as separate files"
-msgstr "שמור את תמונות העטיפה כקבצים נפרדים"
-
-#: ../picard/ui/ui_options_cover.py:59
-msgid "Overwrite the file if it already exists"
-msgstr "שכתב על הקובץ במידה והוא כבר קיים"
-
-#: ../picard/ui/ui_options_metadata.py:100
-msgid "Metadata"
-msgstr "נתוני מטא"
-
-#: ../picard/ui/ui_options_metadata.py:101
-msgid "Translate foreign artist names to English where possible"
-msgstr "תרגם שמות אמנים זרים לאנגלית היכן שניתן"
-
-#: ../picard/ui/ui_options_metadata.py:102
-msgid "Use release relationships"
-msgstr "השתמש ביחסי מהדורה"
-
-#: ../picard/ui/ui_options_metadata.py:103
-msgid "Use track relationships"
-msgstr "השתמש ביחסי הרצועות"
-
-#: ../picard/ui/ui_options_metadata.py:104
-msgid "Use folksonomy tags as genre"
-msgstr "השתמש בתיוג שיתופי בתור ז'אנר"
-
-#: ../picard/ui/ui_options_metadata.py:105
-#, fuzzy
-msgid "Preferred release country:"
-msgstr "מדינת המהדורה"
-
-#: ../picard/ui/ui_options_metadata.py:106
-msgid "Custom Fields"
-msgstr "שדות מותאמים אישית"
-
-#: ../picard/ui/ui_options_metadata.py:107
-msgid "Various artists:"
-msgstr "מגוון אמנים:"
-
-#: ../picard/ui/ui_options_metadata.py:108
-msgid "Non-album tracks:"
-msgstr "רצועות ללא-אלבום:"
-
-#: ../picard/ui/ui_options_metadata.py:109
-#: ../picard/ui/ui_options_metadata.py:110
-#: ../picard/ui/ui_options_naming.py:168 ../picard/ui/ui_options_naming.py:169
-msgid "Default"
-msgstr "ברירת מחדל"
-
-#: ../picard/ui/ui_multitageditor.py:58
-msgid "Delete"
-msgstr "מחק"
-
-#: ../picard/ui/logview.py:29
-msgid "Log"
-msgstr "רישום"
-
-#: ../picard/ui/ui_options_plugins.py:58
-msgid "Plugins"
-msgstr "תוספים"
-
-#: ../picard/ui/ui_options_plugins.py:60 ../picard/ui/options/plugins.py:79
-msgid "Author"
-msgstr "מחבר"
-
-#: ../picard/ui/ui_options_plugins.py:61
-msgid "Version"
-msgstr "גירסה"
-
-#: ../picard/ui/ui_options_naming.py:165
-msgid "Rename Files"
-msgstr "שנה את שמות הקבצים"
-
-#: ../picard/ui/ui_options_naming.py:166
-msgid "Replace Windows-incompatible characters"
-msgstr "החלף תווים שאינם נתמכים על ידי Windows"
-
-#: ../picard/ui/ui_options_naming.py:167
-msgid "Replace non-ASCII characters"
-msgstr "החלף תווים שאינם ASCII"
-
-#: ../picard/ui/ui_options_naming.py:170 ../picard/ui/options/naming.py:90
-msgid "Multiple artist file naming format:"
-msgstr "מבנה שמות הקבצים בעלי מספר אמנים:"
-
-#: ../picard/ui/ui_options_naming.py:171 ../picard/ui/options/naming.py:86
-msgid "File naming format:"
-msgstr "מבנה שם הקובץ:"
-
-#: ../picard/ui/ui_options_naming.py:172
-msgid "Move Files"
-msgstr "העבר קבצים"
-
-#: ../picard/ui/ui_options_naming.py:173
-msgid "Move tagged files to this directory:"
-msgstr "העבר קבצים מתוייגים לתיקייה זו:"
-
-#: ../picard/ui/ui_options_naming.py:174
-msgid "Browse..."
-msgstr "עיון..."
-
-#: ../picard/ui/ui_options_naming.py:175
-msgid "Move additional files:"
-msgstr "העבר קבצים נוספים:"
-
-#: ../picard/ui/ui_options_naming.py:176
-msgid "Delete empty directories"
-msgstr "מחק תיקיות ריקות"
-
-#: ../picard/ui/ui_options_naming.py:177
-msgid "Example"
-msgstr "דוגמה"
-
-#: ../picard/ui/ui_options_naming.py:178
-msgid "File name:"
-msgstr "שם הקובץ:"
-
-#: ../picard/ui/ui_options_naming.py:179
-msgid "Multiple artist file name:"
-msgstr "שם הקובץ בעל כמה אמנים:"
-
-#: ../picard/ui/ui_options_cdlookup.py:48
-msgid "CD-ROM device to use for lookups:"
-msgstr "התקן התקליטורים המשמש לחיפושים:"
-
-#: ../picard/ui/options/scripting.py:84 ../picard/ui/options/naming.py:86
-#: ../picard/ui/options/naming.py:90 ../picard/ui/options/naming.py:93
-#: ../picard/ui/options/naming.py:95
-msgid "Script Error"
-msgstr "שגיאת סקריפט"
+#: ../picard/ui/options/about.py:29
+msgid "About"
+msgstr "אודות"
 
 #. Replace this with your name to have it appear in the "About" dialog.
 #: ../picard/ui/options/about.py:48
 msgid "translator-credits"
 msgstr ""
 "Launchpad Contributions:\n"
-"  Yaron https://launchpad.net/~sh-yaron\n"
-"\n"
-"Launchpad Contributions:\n"
 "  Yaron https://launchpad.net/~sh-yaron"
 
 #. Replace LANG with language you are translatig to.
@@ -901,31 +2204,61 @@ msgstr "<br/>Translated to Hebrew by %s"
 #: ../picard/ui/options/about.py:55
 #, fuzzy, python-format
 msgid ""
-"<p align=\"center\"><span style=\"font-size:15px;font-weight:bold;"
-"\">MusicBrainz Picard</span><br/>\n"
+"<p align=\"center\"><span style=\"font-size:15px;font-weight:bold;\">MusicBrainz Picard</span><br/>\n"
 "Version %(version)s</p>\n"
 "<p align=\"center\"><strong>Supported formats</strong><br/>%(formats)s</p>\n"
 "<p align=\"center\"><strong>Please donate</strong><br/>\n"
-"Thank you for using Picard. Picard relies on the MusicBrainz database, which "
-"is operated by the MetaBrainz Foundation with the help of thousands of "
-"volunteers. If you like this application please consider donating to the "
-"MetaBrainz Foundation to keep the service running.</p>\n"
-"<p align=\"center\"><a href=\"http://metabrainz.org/donate/index.html"
-"\">Donate now!</a></p>\n"
+"Thank you for using Picard. Picard relies on the MusicBrainz database, which is operated by the MetaBrainz Foundation with the help of thousands of volunteers. If you like this application please consider donating to the MetaBrainz Foundation to keep the service running.</p>\n"
+"<p align=\"center\"><a href=\"http://metabrainz.org/donate/index.html\">Donate now!</a></p>\n"
 "<p align=\"center\"><strong>Credits</strong><br/>\n"
-"<small>Copyright © 2004-2008 Robert Kaye, Lukáš Lalinský and others%"
-"(translator-credits)s</small></p>\n"
-"<p align=\"center\"><a href=\"http://musicbrainz.org/doc/PicardTagger"
-"\">http://musicbrainz.org/doc/PicardTagger</a></p>\n"
+"<small>Copyright © 2004-2008 Robert Kaye, Lukáš Lalinský and others%(translator-credits)s</small></p>\n"
+"<p align=\"center\"><a href=\"http://musicbrainz.org/doc/PicardTagger\">http://musicbrainz.org/doc/PicardTagger</a></p>\n"
 msgstr ""
-"<p align=\"center\"><span style=\"font-size:15px;font-weight:bold;"
-"\">MusicBrainz Picard</span><br/>\n"
+"<p align=\"center\"><span style=\"font-size:15px;font-weight:bold;\">MusicBrainz Picard</span><br/>\n"
 "גירסה %(version)s</p>\n"
 "<p align=\"center\"><strong>סוגי קבצים נתמכים:</strong> %(formats)s</p>\n"
-"<p align=\"center\"><small>כל הזכויות שמורות © 2004-2007 רוברט קאי, לוקאס "
-"ללינסקי ואחרים%(translator-credits)s</small></p>\n"
-"<p align=\"center\"><a href=\"http://musicbrainz.org/doc/PicardTagger"
-"\">http://musicbrainz.org/doc/PicardTagger</a></p>\n"
+"<p align=\"center\"><small>כל הזכויות שמורות © 2004-2007 רוברט קאי, לוקאס ללינסקי ואחרים%(translator-credits)s</small></p>\n"
+"<p align=\"center\"><a href=\"http://musicbrainz.org/doc/PicardTagger\">http://musicbrainz.org/doc/PicardTagger</a></p>\n"
+
+#: ../picard/ui/options/advanced.py:26
+msgid "Advanced"
+msgstr "מתקדם"
+
+#: ../picard/ui/options/interface.py:31
+msgid "User Interface"
+msgstr "מנשק משתמש"
+
+#: ../picard/ui/options/interface.py:47
+msgid "System default"
+msgstr ""
+
+#: ../picard/ui/options/interface.py:71
+msgid "Language changed"
+msgstr ""
+
+#: ../picard/ui/options/interface.py:71
+msgid "You have changed the interface language. You have to restart Picard in order for the change to take effect."
+msgstr ""
+
+#: ../picard/ui/options/matching.py:29
+msgid "Matching"
+msgstr "תואמים"
+
+#: ../picard/ui/options/metadata.py:52
+msgid "None"
+msgstr ""
+
+#: ../picard/ui/options/naming.py:33
+msgid "File Naming"
+msgstr "מתן שמות לקבצים"
+
+#: ../picard/ui/options/naming.py:86
+#: ../picard/ui/options/naming.py:90
+#: ../picard/ui/options/naming.py:93
+#: ../picard/ui/options/naming.py:95
+#: ../picard/ui/options/scripting.py:84
+msgid "Script Error"
+msgstr "שגיאת סקריפט"
 
 #: ../picard/ui/options/naming.py:93
 msgid "The file naming format must not be empty."
@@ -944,6 +2277,235 @@ msgstr ""
 msgid "The location to move files to must not be empty."
 msgstr ""
 
+#: ../picard/ui/options/scripting.py:63
+msgid "Scripting"
+msgstr "יצירת סקריפט"
+
+#: ../picard/ui/options/tags.py:29
+msgid "Tags"
+msgstr "תגיות"
+
+#: ../picard/util/tags.py:24
+msgid "Date"
+msgstr "תאריך"
+
+#: ../picard/util/tags.py:25
+msgid "Album Artist"
+msgstr "יוצר האלבום"
+
+#: ../picard/util/tags.py:26
+msgid "Track Number"
+msgstr "מספר הרצועה"
+
+#: ../picard/util/tags.py:27
+msgid "Total Tracks"
+msgstr "סך כל הרצועות"
+
+#: ../picard/util/tags.py:28
+msgid "Disc Number"
+msgstr "תקליטור מספר"
+
+#: ../picard/util/tags.py:29
+msgid "Total Discs"
+msgstr "סך כל התקליטורים"
+
+#: ../picard/util/tags.py:30
+msgid "Album Artist Sort Order"
+msgstr "צורת סידור אלבומי האומן"
+
+#: ../picard/util/tags.py:31
+msgid "Artist Sort Order"
+msgstr "צורת סידור האומנים"
+
+#: ../picard/util/tags.py:32
+msgid "Title Sort Order"
+msgstr "צורת סידור הכותרות"
+
+#: ../picard/util/tags.py:33
+msgid "Album Sort Order"
+msgstr "צורת סידור האלבומים"
+
+#: ../picard/util/tags.py:34
+msgid "ASIN"
+msgstr "ASIN"
+
+#: ../picard/util/tags.py:35
+msgid "Grouping"
+msgstr "קיבוץ"
+
+#: ../picard/util/tags.py:37
+msgid "ISRC"
+msgstr "ISRC"
+
+#: ../picard/util/tags.py:38
+msgid "Mood"
+msgstr "אווירה"
+
+#: ../picard/util/tags.py:39
+msgid "BPM"
+msgstr "BPM"
+
+#: ../picard/util/tags.py:40
+msgid "Copyright"
+msgstr "זכויות יוצרים"
+
+#: ../picard/util/tags.py:41
+msgid "Composer"
+msgstr "מלחין"
+
+#: ../picard/util/tags.py:42
+msgid "Conductor"
+msgstr "מנצח"
+
+#: ../picard/util/tags.py:43
+msgid "Lyricist"
+msgstr "כותב המילים"
+
+#: ../picard/util/tags.py:44
+msgid "Arranger"
+msgstr "מסדר"
+
+#: ../picard/util/tags.py:45
+msgid "Producer"
+msgstr "מפיק"
+
+#: ../picard/util/tags.py:46
+msgid "Engineer"
+msgstr "מהנדס"
+
+#: ../picard/util/tags.py:47
+msgid "Subtitle"
+msgstr "כתובית"
+
+#: ../picard/util/tags.py:48
+msgid "Disc Subtitle"
+msgstr "כתובית התקליטור"
+
+#: ../picard/util/tags.py:49
+msgid "Remixer"
+msgstr "מערבל"
+
+#: ../picard/util/tags.py:50
+msgid "MusicBrainz Track Id"
+msgstr "מזהה רצועה ב-MusicBrainz"
+
+#: ../picard/util/tags.py:51
+msgid "MusicBrainz Release Id"
+msgstr "מזהה מהדורה של MusicBrainz"
+
+#: ../picard/util/tags.py:52
+msgid "MusicBrainz Artist Id"
+msgstr "מזהה אמן ב-MusicBrainz"
+
+#: ../picard/util/tags.py:53
+msgid "MusicBrainz Release Artist Id"
+msgstr "מזהה מהדורת אמן ב-MusicBrainz"
+
+#: ../picard/util/tags.py:54
+msgid "MusicBrainz TRM Id"
+msgstr "מזהה TRM ב-MusicBrainz"
+
+#: ../picard/util/tags.py:55
+#, fuzzy
+msgid "MusicBrainz Disc Id"
+msgstr "מזהה אמן ב-MusicBrainz"
+
+#: ../picard/util/tags.py:56
+#, fuzzy
+msgid "MusicBrainz Sort Name"
+msgstr "שרת MusicBrainz"
+
+#: ../picard/util/tags.py:57
+msgid "MusicIP PUID"
+msgstr "מזהה PUID של MusicIP"
+
+#: ../picard/util/tags.py:58
+msgid "MusicIP Fingerprint"
+msgstr "טביעת אצבע של MusicIP"
+
+#: ../picard/util/tags.py:59
+msgid "Disc Id"
+msgstr ""
+
+#: ../picard/util/tags.py:60
+msgid "Website"
+msgstr "אתר הבית"
+
+#: ../picard/util/tags.py:61
+msgid "Compilation"
+msgstr "אריזה (הידור)"
+
+#: ../picard/util/tags.py:62
+msgid "Comment"
+msgstr "הערה"
+
+#: ../picard/util/tags.py:63
+msgid "Genre"
+msgstr "סגנון"
+
+#: ../picard/util/tags.py:64
+msgid "Encoded By"
+msgstr "קודד על ידי"
+
+#: ../picard/util/tags.py:65
+msgid "Performer"
+msgstr "מבצע"
+
+#: ../picard/util/tags.py:66
+msgid "Release Type"
+msgstr "סוג המהדורה"
+
+#: ../picard/util/tags.py:67
+msgid "Release Status"
+msgstr "מצב המהדורה"
+
+#: ../picard/util/tags.py:68
+#, fuzzy
+msgid "Release Country"
+msgstr "סוג המהדורה"
+
+#: ../picard/util/tags.py:69
+msgid "Record Label"
+msgstr "מותג ההקלטות"
+
+#: ../picard/util/tags.py:70
+msgid "Barcode"
+msgstr "ברקוד"
+
+#: ../picard/util/tags.py:71
+msgid "Catalog Number"
+msgstr "מספר סידורי"
+
+#: ../picard/util/tags.py:72
+#, fuzzy
+msgid "Format"
+msgstr "תבנית:"
+
+#: ../picard/util/tags.py:73
+msgid "DJ-Mixer"
+msgstr "DJ-Mixer"
+
+#: ../picard/util/tags.py:74
+msgid "Media"
+msgstr "מדיה"
+
+#: ../picard/util/tags.py:75
+msgid "Lyrics"
+msgstr "מילות השיר"
+
+#: ../picard/util/tags.py:76
+msgid "Mixer"
+msgstr "מערבל"
+
+#: ../picard/util/tags.py:77
+msgid "Language"
+msgstr ""
+
+#: ../picard/util/tags.py:78
+#, fuzzy
+msgid "Script"
+msgstr "יצירת סקריפט"
+
 #: ../picard/util/webbrowser2.py:84
 msgid "Web Browser Error"
 msgstr "שגיאה בדפדפן האינטרנט"
@@ -959,229 +2521,14 @@ msgstr ""
 "\n"
 "%s"
 
-#~ msgid "No matching tracks for file %s"
-#~ msgstr "לא נמצאו רצועות תואמות עבור הקובץ %s"
-
-#~ msgid "File %s identified!"
-#~ msgstr "הקובץ %s זוהה!"
-
-#~ msgid "Looking up the PUID for file %s..."
-#~ msgstr "מחפש את ה-PUID עבור הקובץ %s..."
-
-#~ msgid "Looking up the metadata for file %s..."
-#~ msgstr "מחפש את נתוני המטא עבור הקובץ %s..."
-
-#~ msgid "No matching releases for cluster %s"
-#~ msgstr "לא נמצאו הפצות תואמות עבור האשכול %s"
-
-#~ msgid "Cluster %s identified!"
-#~ msgstr "האשכול %s זוהה!"
-
-#~ msgid "Looking up the metadata for cluster %s..."
-#~ msgstr "מחפש את נתוני המטא עבור האשכול %s..."
-
-#~ msgid "M3U Playlist (*.m3u)"
-#~ msgstr "רשימת השמעה M3U(*.m3u)"
-
-#~ msgid "PLS Playlist (*.pls)"
-#~ msgstr "רשימת השמעה PLS (*.pls)"
-
-#~ msgid "XSPF Playlist (*.xspf)"
-#~ msgstr "רשימת השמעה XSPF (*.xspf)"
-
-#~ msgid "Submitting PUIDs..."
-#~ msgstr "שולח מזהי PUID..."
-
-#~ msgid "PUIDs submission failed: %s"
-#~ msgstr "שלחית מזהי ה-PUID נכשלה: %s"
-
-#~ msgid "PUIDs successfully submitted!"
-#~ msgstr "מזהי ה-PUID נשלחו בהצלחה!"
-
 #~ msgid "New Version"
 #~ msgstr "גירסה חדשה"
-
 #~ msgid ""
 #~ "New version of Picard is available (%s). Would you like to download it "
 #~ "now?"
 #~ msgstr "קיימת גירסה חדשה של פיקארד (%s). האם ברצונך להוריד אותה כעת?"
+#~ msgid "Delete"
+#~ msgstr "מחק"
+#~ msgid "Maximal number of tags:"
+#~ msgstr "מספר התגיות המירבי:"
 
-#~ msgid "Couldn't find PUID for file %s"
-#~ msgstr "לא ניתן למצוא את ה-PUID עבור הקובץ %s"
-
-#~ msgid "Looking up the fingerprint for file %s..."
-#~ msgstr "מחפש את טביעת האצבע עבור הקובץ %s..."
-
-#~ msgid "Creating fingerprint for file %s..."
-#~ msgstr "יוצר טביעת אצבע עבור הקובץ %s..."
-
-#~ msgid "Length"
-#~ msgstr "משך"
-
-#~ msgid "&Ok"
-#~ msgstr "&אישור"
-
-#~ msgid "&Cancel"
-#~ msgstr "&ביטול"
-
-#~ msgid "About"
-#~ msgstr "אודות"
-
-#~ msgid "Advanced"
-#~ msgstr "מתקדם"
-
-#~ msgid "Matching"
-#~ msgstr "תואמים"
-
-#~ msgid "File Naming"
-#~ msgstr "מתן שמות לקבצים"
-
-#~ msgid "Scripting"
-#~ msgstr "יצירת סקריפט"
-
-#~ msgid "Tags"
-#~ msgstr "תגיות"
-
-#~ msgid "User Interface"
-#~ msgstr "מנשק משתמש"
-
-#~ msgid "Date"
-#~ msgstr "תאריך"
-
-#~ msgid "Album Artist"
-#~ msgstr "יוצר האלבום"
-
-#~ msgid "Track Number"
-#~ msgstr "מספר הרצועה"
-
-#~ msgid "Total Tracks"
-#~ msgstr "סך כל הרצועות"
-
-#~ msgid "Disc Number"
-#~ msgstr "תקליטור מספר"
-
-#~ msgid "Total Discs"
-#~ msgstr "סך כל התקליטורים"
-
-#~ msgid "Album Artist Sort Order"
-#~ msgstr "צורת סידור אלבומי האומן"
-
-#~ msgid "Artist Sort Order"
-#~ msgstr "צורת סידור האומנים"
-
-#~ msgid "Title Sort Order"
-#~ msgstr "צורת סידור הכותרות"
-
-#~ msgid "Album Sort Order"
-#~ msgstr "צורת סידור האלבומים"
-
-#~ msgid "ASIN"
-#~ msgstr "ASIN"
-
-#~ msgid "Grouping"
-#~ msgstr "קיבוץ"
-
-#~ msgid "ISRC"
-#~ msgstr "ISRC"
-
-#~ msgid "Mood"
-#~ msgstr "אווירה"
-
-#~ msgid "BPM"
-#~ msgstr "BPM"
-
-#~ msgid "Copyright"
-#~ msgstr "זכויות יוצרים"
-
-#~ msgid "Composer"
-#~ msgstr "מלחין"
-
-#~ msgid "Conductor"
-#~ msgstr "מנצח"
-
-#~ msgid "Lyricist"
-#~ msgstr "כותב המילים"
-
-#~ msgid "Arranger"
-#~ msgstr "מסדר"
-
-#~ msgid "Producer"
-#~ msgstr "מפיק"
-
-#~ msgid "Engineer"
-#~ msgstr "מהנדס"
-
-#~ msgid "Subtitle"
-#~ msgstr "כתובית"
-
-#~ msgid "Disc Subtitle"
-#~ msgstr "כתובית התקליטור"
-
-#~ msgid "Remixer"
-#~ msgstr "מערבל"
-
-#~ msgid "MusicBrainz Track Id"
-#~ msgstr "מזהה רצועה ב-MusicBrainz"
-
-#~ msgid "MusicBrainz Release Id"
-#~ msgstr "מזהה מהדורה של MusicBrainz"
-
-#~ msgid "MusicBrainz Artist Id"
-#~ msgstr "מזהה אמן ב-MusicBrainz"
-
-#~ msgid "MusicBrainz Release Artist Id"
-#~ msgstr "מזהה מהדורת אמן ב-MusicBrainz"
-
-#~ msgid "MusicBrainz TRM Id"
-#~ msgstr "מזהה TRM ב-MusicBrainz"
-
-#~ msgid "MusicIP PUID"
-#~ msgstr "מזהה PUID של MusicIP"
-
-#~ msgid "MusicIP Fingerprint"
-#~ msgstr "טביעת אצבע של MusicIP"
-
-#~ msgid "Website"
-#~ msgstr "אתר הבית"
-
-#~ msgid "Compilation"
-#~ msgstr "אריזה (הידור)"
-
-#~ msgid "Comment"
-#~ msgstr "הערה"
-
-#~ msgid "Genre"
-#~ msgstr "סגנון"
-
-#~ msgid "Encoded By"
-#~ msgstr "קודד על ידי"
-
-#~ msgid "Performer"
-#~ msgstr "מבצע"
-
-#~ msgid "Release Type"
-#~ msgstr "סוג המהדורה"
-
-#~ msgid "Release Status"
-#~ msgstr "מצב המהדורה"
-
-#~ msgid "Record Label"
-#~ msgstr "מותג ההקלטות"
-
-#~ msgid "Barcode"
-#~ msgstr "ברקוד"
-
-#~ msgid "Catalog Number"
-#~ msgstr "מספר סידורי"
-
-#~ msgid "DJ-Mixer"
-#~ msgstr "DJ-Mixer"
-
-#~ msgid "Media"
-#~ msgstr "מדיה"
-
-#~ msgid "Lyrics"
-#~ msgstr "מילות השיר"
-
-#~ msgid "Mixer"
-#~ msgstr "מערבל"
diff --git a/po/hu.po b/po/hu.po
index 222374b6b..d12aadf44 100644
--- a/po/hu.po
+++ b/po/hu.po
@@ -6,36 +6,1278 @@ msgid ""
 msgstr ""
 "Project-Id-Version: picard\n"
 "Report-Msgid-Bugs-To: http://bugs.musicbrainz.org/\n"
-"POT-Creation-Date: 2008-12-01 18:20+0100\n"
-"PO-Revision-Date: 2008-07-27 20:40+0000\n"
-"Last-Translator: Lukáš Lalinský <lalinsky@gmail.com>\n"
+"POT-Creation-Date: 2009-01-25 12:23+0100\n"
+"PO-Revision-Date: 2009-01-25 13:19+0100\n"
+"Last-Translator: Philipp Wolfer <phw@rubyforge.org>\n"
 "Language-Team: Hungarian <hu@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2008-12-01 17:02+0000\n"
+"X-Launchpad-Export-Date: 2009-01-24 23:28+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 "Generated-By: pygettext.py 1.5\n"
 
-#: ../picard/album.py:108 ../picard/cluster.py:248
+#: ../picard/album.py:108
+#: ../picard/cluster.py:248
 msgid "Unmatched Files"
 msgstr ""
 
-#: ../picard/album.py:269
+#: ../picard/album.py:281
 #, python-format
 msgid "[couldn't load album %s]"
 msgstr ""
 
-#: ../picard/album.py:305
+#: ../picard/album.py:317
 msgid "[loading album information]"
 msgstr ""
 
-#: ../picard/tagger.py:472
+#: ../picard/cluster.py:164
+#: ../picard/cluster.py:175
+#, python-format
+msgid "No matching releases for cluster %s"
+msgstr ""
+
+#: ../picard/cluster.py:177
+#, python-format
+msgid "Cluster %s identified!"
+msgstr ""
+
+#: ../picard/cluster.py:182
+#, python-format
+msgid "Looking up the metadata for cluster %s..."
+msgstr ""
+
+#: ../picard/const.py:40
+msgid "CD"
+msgstr ""
+
+#: ../picard/const.py:41
+msgid "DVD"
+msgstr ""
+
+#: ../picard/const.py:42
+msgid "SACD"
+msgstr ""
+
+#: ../picard/const.py:43
+msgid "LaserDisc"
+msgstr ""
+
+#: ../picard/const.py:44
+msgid "MiniDisc"
+msgstr ""
+
+#: ../picard/const.py:45
+msgid "Vinyl"
+msgstr ""
+
+#: ../picard/const.py:46
+msgid "Cassette"
+msgstr ""
+
+#: ../picard/const.py:47
+msgid "Cartridge (4/8-tracks)"
+msgstr ""
+
+#: ../picard/const.py:48
+msgid "Reel-to-Reel"
+msgstr ""
+
+#: ../picard/const.py:49
+msgid "DAT"
+msgstr ""
+
+#: ../picard/const.py:50
+msgid "Digital Media"
+msgstr ""
+
+#: ../picard/const.py:51
+msgid "Wax Cylinder"
+msgstr ""
+
+#: ../picard/const.py:52
+msgid "Piano Roll"
+msgstr ""
+
+#: ../picard/const.py:53
+#, fuzzy
+msgid "Other"
+msgstr "Beillesztés"
+
+#: ../picard/const.py:58
+msgid "Bangladesh"
+msgstr ""
+
+#: ../picard/const.py:59
+msgid "Belgium"
+msgstr ""
+
+#: ../picard/const.py:60
+msgid "Burkina Faso"
+msgstr ""
+
+#: ../picard/const.py:61
+msgid "Bulgaria"
+msgstr ""
+
+#: ../picard/const.py:62
+msgid "Barbados"
+msgstr ""
+
+#: ../picard/const.py:63
+msgid "Wallis and Futuna Islands"
+msgstr ""
+
+#: ../picard/const.py:64
+msgid "Bermuda"
+msgstr ""
+
+#: ../picard/const.py:65
+msgid "Brunei Darussalam"
+msgstr ""
+
+#: ../picard/const.py:66
+msgid "Bolivia"
+msgstr ""
+
+#: ../picard/const.py:67
+msgid "Bahrain"
+msgstr ""
+
+#: ../picard/const.py:68
+msgid "Burundi"
+msgstr ""
+
+#: ../picard/const.py:69
+msgid "Benin"
+msgstr ""
+
+#: ../picard/const.py:70
+msgid "Bhutan"
+msgstr ""
+
+#: ../picard/const.py:71
+msgid "Jamaica"
+msgstr ""
+
+#: ../picard/const.py:72
+msgid "Bouvet Island"
+msgstr ""
+
+#: ../picard/const.py:73
+msgid "Botswana"
+msgstr ""
+
+#: ../picard/const.py:74
+msgid "Samoa"
+msgstr ""
+
+#: ../picard/const.py:75
+msgid "Brazil"
+msgstr ""
+
+#: ../picard/const.py:76
+msgid "Bahamas"
+msgstr ""
+
+#: ../picard/const.py:77
+msgid "Belarus"
+msgstr ""
+
+#: ../picard/const.py:78
+msgid "Belize"
+msgstr ""
+
+#: ../picard/const.py:79
+msgid "Russian Federation"
+msgstr ""
+
+#: ../picard/const.py:80
+msgid "Rwanda"
+msgstr ""
+
+#: ../picard/const.py:81
+msgid "Reunion"
+msgstr ""
+
+#: ../picard/const.py:82
+msgid "Turkmenistan"
+msgstr ""
+
+#: ../picard/const.py:83
+msgid "Tajikistan"
+msgstr ""
+
+#: ../picard/const.py:84
+msgid "Romania"
+msgstr ""
+
+#: ../picard/const.py:85
+msgid "Tokela"
+msgstr ""
+
+#: ../picard/const.py:86
+msgid "Guinea-Bissa"
+msgstr ""
+
+#: ../picard/const.py:87
+msgid "Guam"
+msgstr ""
+
+#: ../picard/const.py:88
+msgid "Guatemala"
+msgstr ""
+
+#: ../picard/const.py:89
+msgid "Greece"
+msgstr ""
+
+#: ../picard/const.py:90
+msgid "Equatorial Guinea"
+msgstr ""
+
+#: ../picard/const.py:91
+msgid "Guadeloupe"
+msgstr ""
+
+#: ../picard/const.py:92
+msgid "Japan"
+msgstr ""
+
+#: ../picard/const.py:93
+msgid "Guyana"
+msgstr ""
+
+#: ../picard/const.py:94
+msgid "French Guiana"
+msgstr ""
+
+#: ../picard/const.py:95
+msgid "Georgia"
+msgstr ""
+
+#: ../picard/const.py:96
+msgid "Grenada"
+msgstr ""
+
+#: ../picard/const.py:97
+msgid "United Kingdom"
+msgstr ""
+
+#: ../picard/const.py:98
+msgid "Gabon"
+msgstr ""
+
+#: ../picard/const.py:99
+msgid "El Salvador"
+msgstr ""
+
+#: ../picard/const.py:100
+#, fuzzy
+msgid "Guinea"
+msgstr "Általános"
+
+#: ../picard/const.py:101
+msgid "Gambia"
+msgstr ""
+
+#: ../picard/const.py:102
+msgid "Greenland"
+msgstr ""
+
+#: ../picard/const.py:103
+msgid "Gibraltar"
+msgstr ""
+
+#: ../picard/const.py:104
+msgid "Ghana"
+msgstr ""
+
+#: ../picard/const.py:105
+msgid "Oman"
+msgstr ""
+
+#: ../picard/const.py:106
+msgid "Tunisia"
+msgstr ""
+
+#: ../picard/const.py:107
+msgid "Jordan"
+msgstr ""
+
+#: ../picard/const.py:108
+msgid "Haiti"
+msgstr ""
+
+#: ../picard/const.py:109
+msgid "Hungary"
+msgstr ""
+
+#: ../picard/const.py:110
+msgid "Hong Kong"
+msgstr ""
+
+#: ../picard/const.py:111
+msgid "Honduras"
+msgstr ""
+
+#: ../picard/const.py:112
+msgid "Heard and Mc Donald Islands"
+msgstr ""
+
+#: ../picard/const.py:113
+msgid "Venezuela"
+msgstr ""
+
+#: ../picard/const.py:114
+msgid "Puerto Rico"
+msgstr ""
+
+#: ../picard/const.py:115
+msgid "Pala"
+msgstr ""
+
+#: ../picard/const.py:116
+msgid "Portugal"
+msgstr ""
+
+#: ../picard/const.py:117
+msgid "Svalbard and Jan Mayen Islands"
+msgstr ""
+
+#: ../picard/const.py:118
+msgid "Paraguay"
+msgstr ""
+
+#: ../picard/const.py:119
+msgid "Iraq"
+msgstr ""
+
+#: ../picard/const.py:120
+msgid "Panama"
+msgstr ""
+
+#: ../picard/const.py:121
+msgid "French Polynesia"
+msgstr ""
+
+#: ../picard/const.py:122
+msgid "Papua New Guinea"
+msgstr ""
+
+#: ../picard/const.py:123
+msgid "Per"
+msgstr ""
+
+#: ../picard/const.py:124
+msgid "Pakistan"
+msgstr ""
+
+#: ../picard/const.py:125
+msgid "Philippines"
+msgstr ""
+
+#: ../picard/const.py:126
+msgid "Pitcairn"
+msgstr ""
+
+#: ../picard/const.py:127
+msgid "Poland"
+msgstr ""
+
+#: ../picard/const.py:128
+msgid "St. Pierre and Miquelon"
+msgstr ""
+
+#: ../picard/const.py:129
+msgid "Zambia"
+msgstr ""
+
+#: ../picard/const.py:130
+msgid "Western Sahara"
+msgstr ""
+
+#: ../picard/const.py:131
+msgid "Estonia"
+msgstr ""
+
+#: ../picard/const.py:132
+msgid "Egypt"
+msgstr ""
+
+#: ../picard/const.py:133
+msgid "South Africa"
+msgstr ""
+
+#: ../picard/const.py:134
+msgid "Ecuador"
+msgstr ""
+
+#: ../picard/const.py:135
+msgid "Italy"
+msgstr ""
+
+#: ../picard/const.py:136
+#, fuzzy
+msgid "Viet Nam"
+msgstr "Elnevezés"
+
+#: ../picard/const.py:137
+msgid "Solomon Islands"
+msgstr ""
+
+#: ../picard/const.py:138
+msgid "Ethiopia"
+msgstr ""
+
+#: ../picard/const.py:139
+msgid "Somalia"
+msgstr ""
+
+#: ../picard/const.py:140
+msgid "Zimbabwe"
+msgstr ""
+
+#: ../picard/const.py:141
+msgid "Saudi Arabia"
+msgstr ""
+
+#: ../picard/const.py:142
+msgid "Spain"
+msgstr ""
+
+#: ../picard/const.py:143
+msgid "Eritrea"
+msgstr ""
+
+#: ../picard/const.py:144
+msgid "Moldova, Republic of"
+msgstr ""
+
+#: ../picard/const.py:145
+msgid "Madagascar"
+msgstr ""
+
+#: ../picard/const.py:146
+msgid "Morocco"
+msgstr ""
+
+#: ../picard/const.py:147
+msgid "Monaco"
+msgstr ""
+
+#: ../picard/const.py:148
+msgid "Uzbekistan"
+msgstr ""
+
+#: ../picard/const.py:149
+msgid "Myanmar"
+msgstr ""
+
+#: ../picard/const.py:150
+msgid "Mali"
+msgstr ""
+
+#: ../picard/const.py:151
+msgid "Maca"
+msgstr ""
+
+#: ../picard/const.py:152
+msgid "Mongolia"
+msgstr ""
+
+#: ../picard/const.py:153
+msgid "Marshall Islands"
+msgstr ""
+
+#: ../picard/const.py:154
+msgid "Macedonia, The Former Yugoslav Republic of"
+msgstr ""
+
+#: ../picard/const.py:155
+msgid "Mauritius"
+msgstr ""
+
+#: ../picard/const.py:156
+msgid "Malta"
+msgstr ""
+
+#: ../picard/const.py:157
+msgid "Malawi"
+msgstr ""
+
+#: ../picard/const.py:158
+msgid "Maldives"
+msgstr ""
+
+#: ../picard/const.py:159
+msgid "Martinique"
+msgstr ""
+
+#: ../picard/const.py:160
+msgid "Northern Mariana Islands"
+msgstr ""
+
+#: ../picard/const.py:161
+msgid "Montserrat"
+msgstr ""
+
+#: ../picard/const.py:162
+msgid "Mauritania"
+msgstr ""
+
+#: ../picard/const.py:163
+msgid "Uganda"
+msgstr ""
+
+#: ../picard/const.py:164
+msgid "Malaysia"
+msgstr ""
+
+#: ../picard/const.py:165
+msgid "Mexico"
+msgstr ""
+
+#: ../picard/const.py:166
+msgid "Israel"
+msgstr ""
+
+#: ../picard/const.py:167
+#, fuzzy
+msgid "France"
+msgstr "Mégsem"
+
+#: ../picard/const.py:168
+msgid "British Indian Ocean Territory"
+msgstr ""
+
+#: ../picard/const.py:169
+msgid "St. Helena"
+msgstr ""
+
+#: ../picard/const.py:170
+msgid "Finland"
+msgstr ""
+
+#: ../picard/const.py:171
+msgid "Fiji"
+msgstr ""
+
+#: ../picard/const.py:172
+msgid "Falkland Islands (Malvinas)"
+msgstr ""
+
+#: ../picard/const.py:173
+msgid "Micronesia, Federated States of"
+msgstr ""
+
+#: ../picard/const.py:174
+msgid "Faroe Islands"
+msgstr ""
+
+#: ../picard/const.py:175
+msgid "Nicaragua"
+msgstr ""
+
+#: ../picard/const.py:176
+msgid "Netherlands"
+msgstr ""
+
+#: ../picard/const.py:177
+msgid "Norway"
+msgstr ""
+
+#: ../picard/const.py:178
+msgid "Namibia"
+msgstr ""
+
+#: ../picard/const.py:179
+msgid "Vanuat"
+msgstr ""
+
+#: ../picard/const.py:180
+msgid "New Caledonia"
+msgstr ""
+
+#: ../picard/const.py:181
+msgid "Niger"
+msgstr ""
+
+#: ../picard/const.py:182
+msgid "Norfolk Island"
+msgstr ""
+
+#: ../picard/const.py:183
+msgid "Nigeria"
+msgstr ""
+
+#: ../picard/const.py:184
+msgid "New Zealand"
+msgstr ""
+
+#: ../picard/const.py:185
+msgid "Zaire"
+msgstr ""
+
+#: ../picard/const.py:186
+msgid "Nepal"
+msgstr ""
+
+#: ../picard/const.py:187
+msgid "Naur"
+msgstr ""
+
+#: ../picard/const.py:188
+msgid "Niue"
+msgstr ""
+
+#: ../picard/const.py:189
+msgid "Cook Islands"
+msgstr ""
+
+#: ../picard/const.py:190
+msgid "Cote d'Ivoire"
+msgstr ""
+
+#: ../picard/const.py:191
+msgid "Switzerland"
+msgstr ""
+
+#: ../picard/const.py:192
+msgid "Colombia"
+msgstr ""
+
+#: ../picard/const.py:193
+msgid "China"
+msgstr ""
+
+#: ../picard/const.py:194
+msgid "Cameroon"
+msgstr ""
+
+#: ../picard/const.py:195
+#, fuzzy
+msgid "Chile"
+msgstr "Fájl"
+
+#: ../picard/const.py:196
+msgid "Cocos (Keeling) Islands"
+msgstr ""
+
+#: ../picard/const.py:197
+msgid "Canada"
+msgstr ""
+
+#: ../picard/const.py:198
+msgid "Congo"
+msgstr ""
+
+#: ../picard/const.py:199
+msgid "Central African Republic"
+msgstr ""
+
+#: ../picard/const.py:200
+msgid "Czech Republic"
+msgstr ""
+
+#: ../picard/const.py:201
+msgid "Cyprus"
+msgstr ""
+
+#: ../picard/const.py:202
+msgid "Christmas Island"
+msgstr ""
+
+#: ../picard/const.py:203
+msgid "Costa Rica"
+msgstr ""
+
+#: ../picard/const.py:204
+msgid "Cape Verde"
+msgstr ""
+
+#: ../picard/const.py:205
+msgid "Cuba"
+msgstr ""
+
+#: ../picard/const.py:206
+msgid "Swaziland"
+msgstr ""
+
+#: ../picard/const.py:207
+msgid "Syrian Arab Republic"
+msgstr ""
+
+#: ../picard/const.py:208
+msgid "Kyrgyzstan"
+msgstr ""
+
+#: ../picard/const.py:209
+msgid "Kenya"
+msgstr ""
+
+#: ../picard/const.py:210
+msgid "Suriname"
+msgstr ""
+
+#: ../picard/const.py:211
+msgid "Kiribati"
+msgstr ""
+
+#: ../picard/const.py:212
+msgid "Cambodia"
+msgstr ""
+
+#: ../picard/const.py:213
+msgid "Saint Kitts and Nevis"
+msgstr ""
+
+#: ../picard/const.py:214
+#, fuzzy
+msgid "Comoros"
+msgstr "Színek"
+
+#: ../picard/const.py:215
+msgid "Sao Tome and Principe"
+msgstr ""
+
+#: ../picard/const.py:216
+msgid "Slovenia"
+msgstr ""
+
+#: ../picard/const.py:217
+msgid "Kuwait"
+msgstr ""
+
+#: ../picard/const.py:218
+#, fuzzy
+msgid "Senegal"
+msgstr "Általános"
+
+#: ../picard/const.py:219
+msgid "San Marino"
+msgstr ""
+
+#: ../picard/const.py:220
+msgid "Sierra Leone"
+msgstr ""
+
+#: ../picard/const.py:221
+msgid "Seychelles"
+msgstr ""
+
+#: ../picard/const.py:222
+msgid "Kazakhstan"
+msgstr ""
+
+#: ../picard/const.py:223
+msgid "Cayman Islands"
+msgstr ""
+
+#: ../picard/const.py:224
+msgid "Singapore"
+msgstr ""
+
+#: ../picard/const.py:225
+msgid "Sweden"
+msgstr ""
+
+#: ../picard/const.py:226
+msgid "Sudan"
+msgstr ""
+
+#: ../picard/const.py:227
+msgid "Dominican Republic"
+msgstr ""
+
+#: ../picard/const.py:228
+msgid "Dominica"
+msgstr ""
+
+#: ../picard/const.py:229
+#, fuzzy
+msgid "Djibouti"
+msgstr "Névjegy"
+
+#: ../picard/const.py:230
+msgid "Denmark"
+msgstr ""
+
+#: ../picard/const.py:231
+msgid "Virgin Islands (British)"
+msgstr ""
+
+#: ../picard/const.py:232
+msgid "Germany"
+msgstr ""
+
+#: ../picard/const.py:233
+msgid "Yemen"
+msgstr ""
+
+#: ../picard/const.py:234
+msgid "Algeria"
+msgstr ""
+
+#: ../picard/const.py:235
+msgid "United States"
+msgstr ""
+
+#: ../picard/const.py:236
+msgid "Uruguay"
+msgstr ""
+
+#: ../picard/const.py:237
+msgid "Mayotte"
+msgstr ""
+
+#: ../picard/const.py:238
+msgid "United States Minor Outlying Islands"
+msgstr ""
+
+#: ../picard/const.py:239
+msgid "Lebanon"
+msgstr ""
+
+#: ../picard/const.py:240
+msgid "Saint Lucia"
+msgstr ""
+
+#: ../picard/const.py:241
+msgid "Lao People's Democratic Republic"
+msgstr ""
+
+#: ../picard/const.py:242
+msgid "Tuval"
+msgstr ""
+
+#: ../picard/const.py:243
+msgid "Taiwan"
+msgstr ""
+
+#: ../picard/const.py:244
+msgid "Trinidad and Tobago"
+msgstr ""
+
+#: ../picard/const.py:245
+msgid "Turkey"
+msgstr ""
+
+#: ../picard/const.py:246
+msgid "Sri Lanka"
+msgstr ""
+
+#: ../picard/const.py:247
+msgid "Liechtenstein"
+msgstr ""
+
+#: ../picard/const.py:248
+msgid "Latvia"
+msgstr ""
+
+#: ../picard/const.py:249
+msgid "Tonga"
+msgstr ""
+
+#: ../picard/const.py:250
+msgid "Lithuania"
+msgstr ""
+
+#: ../picard/const.py:251
+msgid "Luxembourg"
+msgstr ""
+
+#: ../picard/const.py:252
+msgid "Liberia"
+msgstr ""
+
+#: ../picard/const.py:253
+msgid "Lesotho"
+msgstr ""
+
+#: ../picard/const.py:254
+msgid "Thailand"
+msgstr ""
+
+#: ../picard/const.py:255
+msgid "French Southern Territories"
+msgstr ""
+
+#: ../picard/const.py:256
+msgid "Togo"
+msgstr ""
+
+#: ../picard/const.py:257
+msgid "Chad"
+msgstr ""
+
+#: ../picard/const.py:258
+msgid "Turks and Caicos Islands"
+msgstr ""
+
+#: ../picard/const.py:259
+msgid "Libyan Arab Jamahiriya"
+msgstr ""
+
+#: ../picard/const.py:260
+msgid "Vatican City State (Holy See)"
+msgstr ""
+
+#: ../picard/const.py:261
+msgid "Saint Vincent and The Grenadines"
+msgstr ""
+
+#: ../picard/const.py:262
+msgid "United Arab Emirates"
+msgstr ""
+
+#: ../picard/const.py:263
+msgid "Andorra"
+msgstr ""
+
+#: ../picard/const.py:264
+msgid "Antigua and Barbuda"
+msgstr ""
+
+#: ../picard/const.py:265
+msgid "Afghanistan"
+msgstr ""
+
+#: ../picard/const.py:266
+msgid "Anguilla"
+msgstr ""
+
+#: ../picard/const.py:267
+msgid "Virgin Islands (U.S.)"
+msgstr ""
+
+#: ../picard/const.py:268
+msgid "Iceland"
+msgstr ""
+
+#: ../picard/const.py:269
+msgid "Iran (Islamic Republic of)"
+msgstr ""
+
+#: ../picard/const.py:270
+msgid "Armenia"
+msgstr ""
+
+#: ../picard/const.py:271
+msgid "Albania"
+msgstr ""
+
+#: ../picard/const.py:272
+msgid "Angola"
+msgstr ""
+
+#: ../picard/const.py:273
+msgid "Netherlands Antilles"
+msgstr ""
+
+#: ../picard/const.py:274
+msgid "Antarctica"
+msgstr ""
+
+#: ../picard/const.py:275
+msgid "American Samoa"
+msgstr ""
+
+#: ../picard/const.py:276
+msgid "Argentina"
+msgstr ""
+
+#: ../picard/const.py:277
+msgid "Australia"
+msgstr ""
+
+#: ../picard/const.py:278
+msgid "Austria"
+msgstr ""
+
+#: ../picard/const.py:279
+msgid "Aruba"
+msgstr ""
+
+#: ../picard/const.py:280
+#, fuzzy
+msgid "India"
+msgstr "Helyi metaadatok"
+
+#: ../picard/const.py:281
+msgid "Tanzania, United Republic of"
+msgstr ""
+
+#: ../picard/const.py:282
+msgid "Azerbaijan"
+msgstr ""
+
+#: ../picard/const.py:283
+msgid "Ireland"
+msgstr ""
+
+#: ../picard/const.py:284
+msgid "Indonesia"
+msgstr ""
+
+#: ../picard/const.py:285
+msgid "Ukraine"
+msgstr ""
+
+#: ../picard/const.py:286
+#, fuzzy
+msgid "Qatar"
+msgstr "Beillesztés"
+
+#: ../picard/const.py:287
+msgid "Mozambique"
+msgstr ""
+
+#: ../picard/const.py:288
+msgid "Bosnia and Herzegovina"
+msgstr ""
+
+#: ../picard/const.py:289
+msgid "Congo, The Democratic Republic of the"
+msgstr ""
+
+#: ../picard/const.py:290
+msgid "Serbia and Montenegro"
+msgstr ""
+
+#: ../picard/const.py:291
+msgid "Croatia"
+msgstr ""
+
+#: ../picard/const.py:292
+msgid "Korea (North), Democratic People's Republic of"
+msgstr ""
+
+#: ../picard/const.py:293
+msgid "Korea (South), Republic of"
+msgstr ""
+
+#: ../picard/const.py:294
+msgid "Slovakia"
+msgstr ""
+
+#: ../picard/const.py:295
+msgid "Soviet Union (historical, 1922-1991)"
+msgstr ""
+
+#: ../picard/const.py:296
+msgid "East Timor"
+msgstr ""
+
+#: ../picard/const.py:297
+msgid "Czechoslovakia (historical, 1918-1992)"
+msgstr ""
+
+#: ../picard/const.py:298
+msgid "Europe"
+msgstr ""
+
+#: ../picard/const.py:299
+msgid "East Germany (historical, 1949-1990)"
+msgstr ""
+
+#: ../picard/const.py:300
+msgid "[Unknown Country]"
+msgstr ""
+
+#: ../picard/const.py:301
+msgid "[Worldwide]"
+msgstr ""
+
+#: ../picard/const.py:302
+msgid "Yugoslavia (historical, 1918-1992)"
+msgstr ""
+
+#: ../picard/const.py:307
+msgid "Catalan"
+msgstr ""
+
+#: ../picard/const.py:308
+msgid "Czech"
+msgstr ""
+
+#: ../picard/const.py:309
+msgid "Welsh"
+msgstr ""
+
+#: ../picard/const.py:310
+msgid "Danish"
+msgstr ""
+
+#: ../picard/const.py:311
+#, fuzzy
+msgid "German"
+msgstr "Általános"
+
+#: ../picard/const.py:312
+msgid "English"
+msgstr ""
+
+#: ../picard/const.py:313
+msgid "English (Canada)"
+msgstr ""
+
+#: ../picard/const.py:314
+msgid "English (UK)"
+msgstr ""
+
+#: ../picard/const.py:315
+msgid "Spanish"
+msgstr ""
+
+#: ../picard/const.py:316
+msgid "Persian"
+msgstr ""
+
+#: ../picard/const.py:317
+msgid "Finnish"
+msgstr ""
+
+#: ../picard/const.py:318
+msgid "French"
+msgstr ""
+
+#: ../picard/const.py:319
+msgid "Frisian"
+msgstr ""
+
+#: ../picard/const.py:320
+msgid "Hebrew"
+msgstr ""
+
+#: ../picard/const.py:321
+msgid "Hungarian"
+msgstr ""
+
+#: ../picard/const.py:322
+msgid "Islandic"
+msgstr ""
+
+#: ../picard/const.py:323
+msgid "Italian"
+msgstr ""
+
+#: ../picard/const.py:324
+msgid "Kannada"
+msgstr ""
+
+#: ../picard/const.py:325
+msgid "Korean"
+msgstr ""
+
+#: ../picard/const.py:326
+msgid "Lithuanian"
+msgstr ""
+
+#: ../picard/const.py:327
+msgid "Norwegian Bokmal"
+msgstr ""
+
+#: ../picard/const.py:328
+msgid "Dutch"
+msgstr ""
+
+#: ../picard/const.py:329
+msgid "Polish"
+msgstr ""
+
+#: ../picard/const.py:330
+msgid "Portuguese"
+msgstr ""
+
+#: ../picard/const.py:331
+msgid "Brazilian Portuguese"
+msgstr ""
+
+#: ../picard/const.py:332
+msgid "Romanian"
+msgstr ""
+
+#: ../picard/const.py:333
+msgid "Russian"
+msgstr ""
+
+#: ../picard/const.py:334
+msgid "Scots"
+msgstr ""
+
+#: ../picard/const.py:335
+msgid "Slovak"
+msgstr ""
+
+#: ../picard/const.py:336
+msgid "Slovenian"
+msgstr ""
+
+#: ../picard/const.py:337
+msgid "Swedish"
+msgstr ""
+
+#: ../picard/const.py:338
+msgid "Chinese"
+msgstr ""
+
+#: ../picard/file.py:475
+#, python-format
+msgid "No matching tracks for file %s"
+msgstr ""
+
+#: ../picard/file.py:492
+#, python-format
+msgid "No matching tracks above the threshold for file %s"
+msgstr ""
+
+#: ../picard/file.py:495
+#, python-format
+msgid "File %s identified!"
+msgstr ""
+
+#: ../picard/file.py:506
+#, python-format
+msgid "Looking up the PUID for file %s..."
+msgstr ""
+
+#: ../picard/file.py:511
+#, python-format
+msgid "Looking up the metadata for file %s..."
+msgstr ""
+
+#: ../picard/puidmanager.py:58
+msgid "Submitting PUIDs..."
+msgstr ""
+
+#: ../picard/puidmanager.py:64
+#, python-format
+msgid "PUIDs submission failed: %s"
+msgstr ""
+
+#: ../picard/puidmanager.py:66
+msgid "PUIDs successfully submitted!"
+msgstr ""
+
+#: ../picard/playlist.py:31
+msgid "M3U Playlist (*.m3u)"
+msgstr ""
+
+#: ../picard/playlist.py:32
+msgid "PLS Playlist (*.pls)"
+msgstr ""
+
+#: ../picard/playlist.py:33
+msgid "XSPF Playlist (*.xspf)"
+msgstr ""
+
+#: ../picard/tagger.py:476
 msgid "CD Lookup Error"
 msgstr ""
 
-#: ../picard/tagger.py:473
+#: ../picard/tagger.py:477
 #, python-format
 msgid ""
 "Error while reading CD:\n"
@@ -43,14 +1285,19 @@ msgid ""
 "%s"
 msgstr ""
 
-#: ../picard/ui/passworddialog.py:38
+#: ../picard/tagger.py:503
 #, python-format
-msgid ""
-"The server %s requires you to login. Please enter your username and password."
+msgid "Couldn't find PUID for file %s"
 msgstr ""
 
-#: ../picard/ui/ui_options_script.py:52
-msgid "Tagger Script"
+#: ../picard/musicdns/__init__.py:98
+#, python-format
+msgid "Looking up the fingerprint for file %s..."
+msgstr ""
+
+#: ../picard/musicdns/__init__.py:117
+#, python-format
+msgid "Creating fingerprint for file %s..."
 msgstr ""
 
 #: ../picard/ui/cdlookup.py:31
@@ -58,110 +1305,153 @@ msgid "Score"
 msgstr ""
 
 #: ../picard/ui/cdlookup.py:31
+#: ../picard/ui/itemviews.py:82
+#: ../picard/util/tags.py:23
 msgid "Title"
 msgstr ""
 
-#: ../picard/ui/cdlookup.py:31 ../picard/ui/mainwindow.py:436
+#: ../picard/ui/cdlookup.py:31
+#: ../picard/ui/itemviews.py:84
+#: ../picard/ui/mainwindow.py:436
+#: ../picard/util/tags.py:22
 msgid "Artist"
 msgstr "Előadó"
 
-#: ../picard/ui/ui_metadata.py:121
-msgid "Lookup"
-msgstr "Keresés"
-
-#: ../picard/ui/ui_metadata.py:122
-msgid "Title:"
+#: ../picard/ui/coverartbox.py:47
+#: ../picard/ui/options/cover.py:29
+msgid "Cover Art"
 msgstr ""
 
-#: ../picard/ui/ui_metadata.py:123
-msgid "Date:"
+#: ../picard/ui/coverartbox.py:95
+msgid "Buy the album on Amazon"
 msgstr ""
 
-#: ../picard/ui/ui_metadata.py:124
-msgid "Artist:"
+#: ../picard/ui/filebrowser.py:38
+#: ../picard/ui/mainwindow.py:302
+msgid "&Refresh"
 msgstr ""
 
-#: ../picard/ui/ui_metadata.py:125
-msgid "Track:"
+#: ../picard/ui/filebrowser.py:41
+msgid "&Move Tagged Files Here"
 msgstr ""
 
-#: ../picard/ui/ui_metadata.py:126
-msgid "0000-00-00; "
+#: ../picard/ui/filebrowser.py:44
+msgid "Show &Hidden Files"
 msgstr ""
 
-#: ../picard/ui/ui_metadata.py:127 ../picard/ui/tageditor.py:225
-#: ../picard/ui/multitageditor.py:181
+#: ../picard/ui/itemviews.py:83
+msgid "Length"
+msgstr ""
+
+#: ../picard/ui/itemviews.py:327
+msgid "&Releases"
+msgstr ""
+
+#: ../picard/ui/itemviews.py:353
+msgid "&Plugins"
+msgstr ""
+
+#: ../picard/ui/itemviews.py:523
+msgid "Clusters"
+msgstr ""
+
+#: ../picard/ui/logview.py:29
+msgid "Log"
+msgstr ""
+
+#: ../picard/ui/puidsubmit.py:31
+#: ../picard/ui/options/plugins.py:80
+msgid "File"
+msgstr "Fájl"
+
+#: ../picard/ui/puidsubmit.py:31
+msgid "PUID"
+msgstr ""
+
+#: ../picard/ui/puidsubmit.py:31
+#: ../picard/ui/mainwindow.py:437
+msgid "Track"
+msgstr "Szám"
+
+#: ../picard/ui/puidsubmit.py:31
+msgid "Release"
+msgstr ""
+
+#: ../picard/ui/puidsubmit.py:31
+msgid "Release ID"
+msgstr ""
+
+#: ../picard/ui/tageditor.py:65
+#: ../picard/ui/ui_options_plugins.py:62
+msgid "Details"
+msgstr ""
+
+#: ../picard/ui/tageditor.py:70
+#: ../picard/ui/tageditor.py:241
+#, python-format
+msgid "%d file"
+msgid_plural "%d files"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../picard/ui/tageditor.py:124
+#, python-format
+msgid "(different across %d file)"
+msgid_plural "(different across %d files)"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../picard/ui/tageditor.py:127
+#, python-format
+msgid "(missing from %d file)"
+msgid_plural "(missing from %d files)"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../picard/ui/tageditor.py:210
+msgid "Filename:"
+msgstr ""
+
+#: ../picard/ui/tageditor.py:212
+msgid "Format:"
+msgstr ""
+
+#: ../picard/ui/tageditor.py:221
+msgid "Size:"
+msgstr ""
+
+#: ../picard/ui/tageditor.py:225
+#: ../picard/ui/ui_metadata.py:127
 msgid "Length:"
 msgstr ""
 
-#: ../picard/ui/ui_metadata.py:128
-msgid "Album:"
+#: ../picard/ui/tageditor.py:227
+msgid "Bitrate:"
 msgstr ""
 
-#: ../picard/ui/ui_passworddialog.py:78
-#, fuzzy
-msgid "Authentication required"
-msgstr "Unicode szükséges"
-
-#: ../picard/ui/ui_passworddialog.py:79 ../picard/ui/ui_options_proxy.py:83
-#: ../picard/ui/ui_options_general.py:113
-msgid "Username:"
+#: ../picard/ui/tageditor.py:229
+msgid "Sample rate:"
 msgstr ""
 
-#: ../picard/ui/ui_passworddialog.py:80 ../picard/ui/ui_options_proxy.py:82
-#: ../picard/ui/ui_options_general.py:112
-msgid "Password:"
+#: ../picard/ui/tageditor.py:231
+msgid "Bits per sample:"
 msgstr ""
 
-#: ../picard/ui/ui_passworddialog.py:81
-msgid "Save username and password"
+#: ../picard/ui/tageditor.py:234
+msgid "Mono"
 msgstr ""
 
-#: ../picard/ui/ui_options_folksonomy.py:114
-#: ../picard/ui/ui_options_folksonomy_tags.py:114
-msgid "Folksonomy Tags"
+#: ../picard/ui/tageditor.py:235
+msgid "Stereo"
 msgstr ""
 
-#: ../picard/ui/ui_options_folksonomy.py:115
-#: ../picard/ui/ui_options_folksonomy_tags.py:115
-msgid "Ignore tags:"
+#: ../picard/ui/tageditor.py:237
+msgid "Channels:"
 msgstr ""
 
-#: ../picard/ui/ui_options_folksonomy.py:116
-#: ../picard/ui/ui_options_folksonomy_tags.py:116
-msgid "Minimal tag usage:"
-msgstr ""
-
-#: ../picard/ui/ui_options_folksonomy.py:117
-#: ../picard/ui/ui_options_folksonomy_tags.py:117
-#: ../picard/ui/ui_options_matching.py:107
-#: ../picard/ui/ui_options_matching.py:108
-#: ../picard/ui/ui_options_matching.py:109
-#: ../picard/ui/ui_options_matching.py:113
-msgid " %"
-msgstr ""
-
-#: ../picard/ui/ui_options_folksonomy.py:118
-msgid "Maximum number of tags:"
-msgstr ""
-
-#: ../picard/ui/ui_options_folksonomy.py:119
-#: ../picard/ui/ui_options_folksonomy_tags.py:119
-msgid "Join multiple tags with:"
-msgstr ""
-
-#: ../picard/ui/ui_options_folksonomy.py:120
-#: ../picard/ui/ui_options_folksonomy_tags.py:120
-msgid " / "
-msgstr ""
-
-#: ../picard/ui/ui_options_folksonomy.py:121
-#: ../picard/ui/ui_options_folksonomy_tags.py:121
-msgid ", "
-msgstr ""
-
-#: ../picard/ui/ui_options_folksonomy_tags.py:118
-msgid "Maximal number of tags:"
+#: ../picard/ui/tagsfromfilenames.py:52
+#: ../picard/ui/tagsfromfilenames.py:96
+msgid "File Name"
 msgstr ""
 
 #: ../picard/ui/mainwindow.py:64
@@ -296,7 +1586,8 @@ msgstr "Keresés"
 msgid "&CD Lookup..."
 msgstr ""
 
-#: ../picard/ui/mainwindow.py:272 ../picard/ui/mainwindow.py:273
+#: ../picard/ui/mainwindow.py:272
+#: ../picard/ui/mainwindow.py:273
 msgid "Lookup CD"
 msgstr ""
 
@@ -327,7 +1618,8 @@ msgstr ""
 msgid "&Lookup"
 msgstr ""
 
-#: ../picard/ui/mainwindow.py:291 ../picard/ui/mainwindow.py:292
+#: ../picard/ui/mainwindow.py:291
+#: ../picard/ui/mainwindow.py:292
 msgid "Lookup metadata"
 msgstr ""
 
@@ -340,10 +1632,6 @@ msgstr ""
 msgid "&Details..."
 msgstr ""
 
-#: ../picard/ui/mainwindow.py:302 ../picard/ui/filebrowser.py:38
-msgid "&Refresh"
-msgstr ""
-
 #: ../picard/ui/mainwindow.py:305
 msgid "Generate &Playlist..."
 msgstr ""
@@ -389,6 +1677,7 @@ msgid "&Tools"
 msgstr ""
 
 #: ../picard/ui/mainwindow.py:384
+#: ../picard/ui/util.py:33
 msgid "&Help"
 msgstr "Segítség"
 
@@ -401,13 +1690,10 @@ msgid "&Search Bar"
 msgstr ""
 
 #: ../picard/ui/mainwindow.py:435
+#: ../picard/util/tags.py:21
 msgid "Album"
 msgstr "Album"
 
-#: ../picard/ui/mainwindow.py:437 ../picard/ui/puidsubmit.py:31
-msgid "Track"
-msgstr "Szám"
-
 #: ../picard/ui/mainwindow.py:476
 msgid "All Supported Formats"
 msgstr ""
@@ -422,37 +1708,291 @@ msgstr ""
 msgid "Playlist %s saved"
 msgstr ""
 
-#: ../picard/ui/mainwindow.py:638 ../picard/ui/mainwindow.py:647
+#: ../picard/ui/mainwindow.py:638
+#: ../picard/ui/mainwindow.py:647
 #, python-format
 msgid " (Error: %s)"
 msgstr ""
 
+#: ../picard/ui/ui_tageditor.py:115
+#: ../picard/ui/ui_options_plugins.py:59
+#: ../picard/ui/options/plugins.py:76
+msgid "Name"
+msgstr ""
+
+#: ../picard/ui/ui_tageditor.py:116
+msgid "Value"
+msgstr ""
+
+#: ../picard/ui/ui_tageditor.py:117
+msgid "&Add..."
+msgstr ""
+
+#: ../picard/ui/ui_tageditor.py:118
+msgid "&Edit..."
+msgstr ""
+
+#: ../picard/ui/ui_tageditor.py:119
+msgid "&Delete"
+msgstr ""
+
+#: ../picard/ui/ui_tageditor.py:120
+msgid "&Metadata"
+msgstr ""
+
+#: ../picard/ui/ui_tageditor.py:121
+msgid "A&rtwork"
+msgstr ""
+
+#: ../picard/ui/ui_tageditor.py:122
+msgid "&Info"
+msgstr ""
+
+#: ../picard/ui/passworddialog.py:38
+#, python-format
+msgid "The server %s requires you to login. Please enter your username and password."
+msgstr ""
+
+#: ../picard/ui/ui_cdlookup.py:60
+#: ../picard/ui/ui_options_cdlookup.py:47
+#: ../picard/ui/ui_options_cdlookup_win32.py:56
+#: ../picard/ui/options/cdlookup.py:35
+msgid "CD Lookup"
+msgstr "CD infó keresése"
+
+#: ../picard/ui/ui_cdlookup.py:61
+msgid "The following releases on MusicBrainz match the CD:"
+msgstr ""
+
+#: ../picard/ui/ui_cdlookup.py:62
+#: ../picard/ui/ui_puidsubmit.py:53
+msgid "OK"
+msgstr "OK"
+
+#: ../picard/ui/ui_cdlookup.py:63
+msgid "    Lookup manually    "
+msgstr ""
+
+#: ../picard/ui/ui_cdlookup.py:64
+#: ../picard/ui/ui_puidsubmit.py:54
+msgid "Cancel"
+msgstr "Mégsem"
+
+#: ../picard/ui/ui_passworddialog.py:78
+#, fuzzy
+msgid "Authentication required"
+msgstr "Unicode szükséges"
+
+#: ../picard/ui/ui_passworddialog.py:79
+#: ../picard/ui/ui_options_general.py:113
+#: ../picard/ui/ui_options_proxy.py:83
+msgid "Username:"
+msgstr ""
+
+#: ../picard/ui/ui_passworddialog.py:80
+#: ../picard/ui/ui_options_general.py:112
+#: ../picard/ui/ui_options_proxy.py:82
+msgid "Password:"
+msgstr ""
+
+#: ../picard/ui/ui_passworddialog.py:81
+msgid "Save username and password"
+msgstr ""
+
 #: ../picard/ui/ui_edittagdialog.py:44
 msgid "Edit Tag"
 msgstr ""
 
-#: ../picard/ui/ui_options_proxy.py:81
-msgid "Web Proxy"
-msgstr "Web Proxy"
+#: ../picard/ui/ui_metadata.py:121
+msgid "Lookup"
+msgstr "Keresés"
 
-#: ../picard/ui/ui_options_proxy.py:84 ../picard/ui/ui_options_general.py:109
-msgid "Port:"
+#: ../picard/ui/ui_metadata.py:122
+msgid "Title:"
 msgstr ""
 
-#: ../picard/ui/ui_options_proxy.py:85 ../picard/ui/ui_options_general.py:110
-msgid "Server address:"
+#: ../picard/ui/ui_metadata.py:123
+msgid "Date:"
 msgstr ""
 
-#: ../picard/ui/ui_tagsfromfilenames.py:56
-msgid "Convert File Names to Tags"
+#: ../picard/ui/ui_metadata.py:124
+msgid "Artist:"
 msgstr ""
 
-#: ../picard/ui/ui_tagsfromfilenames.py:57
-msgid "Replace underscores with spaces"
+#: ../picard/ui/ui_metadata.py:125
+msgid "Track:"
+msgstr ""
+
+#: ../picard/ui/ui_metadata.py:126
+msgid "0000-00-00; "
+msgstr ""
+
+#: ../picard/ui/ui_metadata.py:128
+msgid "Album:"
+msgstr ""
+
+#: ../picard/ui/ui_options.py:42
+msgid "Options"
+msgstr ""
+
+#: ../picard/ui/ui_options_cdlookup.py:48
+msgid "CD-ROM device to use for lookups:"
+msgstr ""
+
+#: ../picard/ui/ui_options_cdlookup_win32.py:57
+msgid "Default CD-ROM drive to use for lookups:"
+msgstr ""
+
+#: ../picard/ui/ui_options_cover.py:56
+msgid "Location"
+msgstr ""
+
+#: ../picard/ui/ui_options_cover.py:57
+msgid "Embed cover images into tags"
+msgstr ""
+
+#: ../picard/ui/ui_options_cover.py:58
+msgid "Save cover images as separate files"
+msgstr ""
+
+#: ../picard/ui/ui_options_cover.py:59
+msgid "Overwrite the file if it already exists"
+msgstr ""
+
+#: ../picard/ui/util.py:31
+msgid "&Ok"
+msgstr ""
+
+#: ../picard/ui/util.py:32
+#, fuzzy
+msgid "&Cancel"
+msgstr "Mégsem"
+
+#: ../picard/ui/ui_puidsubmit.py:52
+msgid "Submit PUIDs"
+msgstr ""
+
+#: ../picard/ui/ui_options_folksonomy.py:114
+#: ../picard/ui/options/folksonomy.py:29
+msgid "Folksonomy Tags"
+msgstr ""
+
+#: ../picard/ui/ui_options_folksonomy.py:115
+msgid "Ignore tags:"
+msgstr ""
+
+#: ../picard/ui/ui_options_folksonomy.py:116
+msgid "Minimal tag usage:"
+msgstr ""
+
+#: ../picard/ui/ui_options_folksonomy.py:117
+#: ../picard/ui/ui_options_matching.py:107
+#: ../picard/ui/ui_options_matching.py:108
+#: ../picard/ui/ui_options_matching.py:109
+#: ../picard/ui/ui_options_matching.py:113
+msgid " %"
+msgstr ""
+
+#: ../picard/ui/ui_options_folksonomy.py:118
+msgid "Maximum number of tags:"
+msgstr ""
+
+#: ../picard/ui/ui_options_folksonomy.py:119
+msgid "Join multiple tags with:"
+msgstr ""
+
+#: ../picard/ui/ui_options_folksonomy.py:120
+msgid " / "
+msgstr ""
+
+#: ../picard/ui/ui_options_folksonomy.py:121
+msgid ", "
+msgstr ""
+
+#: ../picard/ui/ui_options_interface.py:50
+msgid "Miscellaneous"
+msgstr ""
+
+#: ../picard/ui/ui_options_interface.py:51
+msgid "Show text labels under icons"
+msgstr ""
+
+#: ../picard/ui/ui_options_interface.py:52
+msgid "Allow selection of multiple directories"
+msgstr ""
+
+#: ../picard/ui/ui_options_interface.py:53
+msgid "Use advanced query syntax"
+msgstr ""
+
+#: ../picard/ui/ui_options_interface.py:54
+#, fuzzy
+msgid "User interface language:"
+msgstr "Felhasználói felület nyelve"
+
+#: ../picard/ui/ui_options_naming.py:165
+msgid "Rename Files"
+msgstr ""
+
+#: ../picard/ui/ui_options_naming.py:166
+msgid "Replace Windows-incompatible characters"
+msgstr ""
+
+#: ../picard/ui/ui_options_naming.py:167
+msgid "Replace non-ASCII characters"
+msgstr ""
+
+#: ../picard/ui/ui_options_naming.py:168
+#: ../picard/ui/ui_options_naming.py:169
+#: ../picard/ui/ui_options_metadata.py:109
+#: ../picard/ui/ui_options_metadata.py:110
+msgid "Default"
+msgstr "Alapértelmezett"
+
+#: ../picard/ui/ui_options_naming.py:170
+#: ../picard/ui/options/naming.py:90
+msgid "Multiple artist file naming format:"
+msgstr ""
+
+#: ../picard/ui/ui_options_naming.py:171
+#: ../picard/ui/options/naming.py:86
+msgid "File naming format:"
+msgstr ""
+
+#: ../picard/ui/ui_options_naming.py:172
+msgid "Move Files"
+msgstr ""
+
+#: ../picard/ui/ui_options_naming.py:173
+msgid "Move tagged files to this directory:"
+msgstr ""
+
+#: ../picard/ui/ui_options_naming.py:174
+msgid "Browse..."
+msgstr ""
+
+#: ../picard/ui/ui_options_naming.py:175
+msgid "Move additional files:"
+msgstr ""
+
+#: ../picard/ui/ui_options_naming.py:176
+msgid "Delete empty directories"
+msgstr ""
+
+#: ../picard/ui/ui_options_naming.py:177
+msgid "Example"
+msgstr ""
+
+#: ../picard/ui/ui_options_naming.py:178
+msgid "File name:"
+msgstr ""
+
+#: ../picard/ui/ui_options_naming.py:179
+msgid "Multiple artist file name:"
 msgstr ""
 
-#: ../picard/ui/ui_tagsfromfilenames.py:58
 #: ../picard/ui/ui_options_naming.py:180
+#: ../picard/ui/ui_tagsfromfilenames.py:58
 msgid "&Preview"
 msgstr ""
 
@@ -460,11 +2000,22 @@ msgstr ""
 msgid "MusicBrainz Server"
 msgstr ""
 
+#: ../picard/ui/ui_options_general.py:109
+#: ../picard/ui/ui_options_proxy.py:84
+msgid "Port:"
+msgstr ""
+
+#: ../picard/ui/ui_options_general.py:110
+#: ../picard/ui/ui_options_proxy.py:85
+msgid "Server address:"
+msgstr ""
+
 #: ../picard/ui/ui_options_general.py:111
 msgid "Account Information"
 msgstr ""
 
 #: ../picard/ui/ui_options_general.py:114
+#: ../picard/ui/options/general.py:29
 msgid "General"
 msgstr "Általános"
 
@@ -472,34 +2023,6 @@ msgstr "Általános"
 msgid "Automatically scan all new files"
 msgstr ""
 
-#: ../picard/ui/ui_options_interface.py:46
-msgid "Miscellaneous"
-msgstr ""
-
-#: ../picard/ui/ui_options_interface.py:47
-msgid "Show text labels under icons"
-msgstr ""
-
-#: ../picard/ui/ui_options_interface.py:48
-msgid "Allow selection of multiple directories"
-msgstr ""
-
-#: ../picard/ui/ui_options_interface.py:49
-msgid "Use advanced query syntax"
-msgstr ""
-
-#: ../picard/ui/itemviews.py:327
-msgid "&Releases"
-msgstr ""
-
-#: ../picard/ui/itemviews.py:353
-msgid "&Plugins"
-msgstr ""
-
-#: ../picard/ui/itemviews.py:523
-msgid "Clusters"
-msgstr ""
-
 #: ../picard/ui/ui_options_matching.py:105
 msgid "Thresholds"
 msgstr ""
@@ -520,6 +2043,68 @@ msgstr ""
 msgid "Minimal similarity for PUID lookups:"
 msgstr ""
 
+#: ../picard/ui/ui_options_metadata.py:100
+#: ../picard/ui/options/metadata.py:31
+msgid "Metadata"
+msgstr ""
+
+#: ../picard/ui/ui_options_metadata.py:101
+msgid "Translate foreign artist names to English where possible"
+msgstr ""
+
+#: ../picard/ui/ui_options_metadata.py:102
+msgid "Use release relationships"
+msgstr ""
+
+#: ../picard/ui/ui_options_metadata.py:103
+msgid "Use track relationships"
+msgstr ""
+
+#: ../picard/ui/ui_options_metadata.py:104
+msgid "Use folksonomy tags as genre"
+msgstr ""
+
+#: ../picard/ui/ui_options_metadata.py:105
+#, fuzzy
+msgid "Preferred release country:"
+msgstr "Release dátuma"
+
+#: ../picard/ui/ui_options_metadata.py:106
+msgid "Custom Fields"
+msgstr ""
+
+#: ../picard/ui/ui_options_metadata.py:107
+msgid "Various artists:"
+msgstr ""
+
+#: ../picard/ui/ui_options_metadata.py:108
+msgid "Non-album tracks:"
+msgstr ""
+
+#: ../picard/ui/ui_options_plugins.py:58
+#: ../picard/ui/options/plugins.py:30
+msgid "Plugins"
+msgstr ""
+
+#: ../picard/ui/ui_options_plugins.py:60
+#: ../picard/ui/options/plugins.py:79
+msgid "Author"
+msgstr ""
+
+#: ../picard/ui/ui_options_plugins.py:61
+#: ../picard/util/tags.py:36
+msgid "Version"
+msgstr ""
+
+#: ../picard/ui/ui_options_proxy.py:81
+#: ../picard/ui/options/proxy.py:28
+msgid "Web Proxy"
+msgstr "Web Proxy"
+
+#: ../picard/ui/ui_options_script.py:52
+msgid "Tagger Script"
+msgstr ""
+
 #: ../picard/ui/ui_options_tags.py:105
 msgid "Common"
 msgstr ""
@@ -572,328 +2157,23 @@ msgstr ""
 msgid "Remove APEv2 tags from MP3 files"
 msgstr ""
 
-#: ../picard/ui/ui_options_cdlookup_win32.py:56 ../picard/ui/ui_cdlookup.py:60
-#: ../picard/ui/ui_options_cdlookup.py:47
-msgid "CD Lookup"
-msgstr "CD infó keresése"
-
-#: ../picard/ui/ui_options_cdlookup_win32.py:57
-msgid "Default CD-ROM drive to use for lookups:"
+#: ../picard/ui/ui_tagsfromfilenames.py:56
+msgid "Convert File Names to Tags"
 msgstr ""
 
-#: ../picard/ui/tageditor.py:65 ../picard/ui/ui_options_plugins.py:62
-#: ../picard/ui/multitageditor.py:37
-msgid "Details"
+#: ../picard/ui/ui_tagsfromfilenames.py:57
+msgid "Replace underscores with spaces"
 msgstr ""
 
-#: ../picard/ui/tageditor.py:70 ../picard/ui/tageditor.py:241
-#: ../picard/ui/multitageditor.py:42 ../picard/ui/multitageditor.py:197
-#, python-format
-msgid "%d file"
-msgid_plural "%d files"
-msgstr[0] ""
-msgstr[1] ""
-
-#: ../picard/ui/tageditor.py:124 ../picard/ui/multitageditor.py:95
-#, python-format
-msgid "(different across %d file)"
-msgid_plural "(different across %d files)"
-msgstr[0] ""
-msgstr[1] ""
-
-#: ../picard/ui/tageditor.py:127 ../picard/ui/multitageditor.py:98
-#, python-format
-msgid "(missing from %d file)"
-msgid_plural "(missing from %d files)"
-msgstr[0] ""
-msgstr[1] ""
-
-#: ../picard/ui/tageditor.py:210 ../picard/ui/multitageditor.py:166
-msgid "Filename:"
-msgstr ""
-
-#: ../picard/ui/tageditor.py:212 ../picard/ui/multitageditor.py:168
-msgid "Format:"
-msgstr ""
-
-#: ../picard/ui/tageditor.py:221 ../picard/ui/multitageditor.py:177
-msgid "Size:"
-msgstr ""
-
-#: ../picard/ui/tageditor.py:227 ../picard/ui/multitageditor.py:183
-msgid "Bitrate:"
-msgstr ""
-
-#: ../picard/ui/tageditor.py:229 ../picard/ui/multitageditor.py:185
-msgid "Sample rate:"
-msgstr ""
-
-#: ../picard/ui/tageditor.py:231 ../picard/ui/multitageditor.py:187
-msgid "Bits per sample:"
-msgstr ""
-
-#: ../picard/ui/tageditor.py:234 ../picard/ui/multitageditor.py:190
-msgid "Mono"
-msgstr ""
-
-#: ../picard/ui/tageditor.py:235 ../picard/ui/multitageditor.py:191
-msgid "Stereo"
-msgstr ""
-
-#: ../picard/ui/tageditor.py:237 ../picard/ui/multitageditor.py:193
-msgid "Channels:"
-msgstr ""
-
-#: ../picard/ui/ui_tageditor.py:115 ../picard/ui/ui_multitageditor.py:55
-#: ../picard/ui/ui_options_plugins.py:59 ../picard/ui/options/plugins.py:76
-msgid "Name"
-msgstr ""
-
-#: ../picard/ui/ui_tageditor.py:116 ../picard/ui/ui_multitageditor.py:56
-msgid "Value"
-msgstr ""
-
-#: ../picard/ui/ui_tageditor.py:117 ../picard/ui/ui_multitageditor.py:57
-msgid "&Add..."
-msgstr ""
-
-#: ../picard/ui/ui_tageditor.py:118
-msgid "&Edit..."
-msgstr ""
-
-#: ../picard/ui/ui_tageditor.py:119
-msgid "&Delete"
-msgstr ""
-
-#: ../picard/ui/ui_tageditor.py:120
-msgid "&Metadata"
-msgstr ""
-
-#: ../picard/ui/ui_tageditor.py:121
-msgid "A&rtwork"
-msgstr ""
-
-#: ../picard/ui/ui_tageditor.py:122
-msgid "&Info"
-msgstr ""
-
-#: ../picard/ui/coverartbox.py:47
-msgid "Cover Art"
-msgstr ""
-
-#: ../picard/ui/coverartbox.py:95
-msgid "Buy the album on Amazon"
-msgstr ""
-
-#: ../picard/ui/ui_puidsubmit.py:52
-msgid "Submit PUIDs"
-msgstr ""
-
-#: ../picard/ui/ui_puidsubmit.py:53 ../picard/ui/ui_cdlookup.py:62
-msgid "OK"
-msgstr "OK"
-
-#: ../picard/ui/ui_puidsubmit.py:54 ../picard/ui/ui_cdlookup.py:64
-msgid "Cancel"
-msgstr "Mégsem"
-
-#: ../picard/ui/puidsubmit.py:31 ../picard/ui/options/plugins.py:80
-msgid "File"
-msgstr "Fájl"
-
-#: ../picard/ui/puidsubmit.py:31
-msgid "PUID"
-msgstr ""
-
-#: ../picard/ui/puidsubmit.py:31
-msgid "Release"
-msgstr ""
-
-#: ../picard/ui/puidsubmit.py:31
-msgid "Release ID"
-msgstr ""
-
-#: ../picard/ui/filebrowser.py:41
-msgid "&Move Tagged Files Here"
-msgstr ""
-
-#: ../picard/ui/filebrowser.py:44
-msgid "Show &Hidden Files"
-msgstr ""
-
-#: ../picard/ui/ui_cdlookup.py:61
-msgid "The following releases on MusicBrainz match the CD:"
-msgstr ""
-
-#: ../picard/ui/ui_cdlookup.py:63
-msgid "    Lookup manually    "
-msgstr ""
-
-#: ../picard/ui/ui_options.py:42
-msgid "Options"
-msgstr ""
-
-#: ../picard/ui/tagsfromfilenames.py:52 ../picard/ui/tagsfromfilenames.py:96
-msgid "File Name"
-msgstr ""
-
-#: ../picard/ui/ui_options_cover.py:56
-msgid "Location"
-msgstr ""
-
-#: ../picard/ui/ui_options_cover.py:57
-msgid "Embed cover images into tags"
-msgstr ""
-
-#: ../picard/ui/ui_options_cover.py:58
-msgid "Save cover images as separate files"
-msgstr ""
-
-#: ../picard/ui/ui_options_cover.py:59
-msgid "Overwrite the file if it already exists"
-msgstr ""
-
-#: ../picard/ui/ui_options_metadata.py:100
-msgid "Metadata"
-msgstr ""
-
-#: ../picard/ui/ui_options_metadata.py:101
-msgid "Translate foreign artist names to English where possible"
-msgstr ""
-
-#: ../picard/ui/ui_options_metadata.py:102
-msgid "Use release relationships"
-msgstr ""
-
-#: ../picard/ui/ui_options_metadata.py:103
-msgid "Use track relationships"
-msgstr ""
-
-#: ../picard/ui/ui_options_metadata.py:104
-msgid "Use folksonomy tags as genre"
-msgstr ""
-
-#: ../picard/ui/ui_options_metadata.py:105
-msgid "Preferred release country:"
-msgstr ""
-
-#: ../picard/ui/ui_options_metadata.py:106
-msgid "Custom Fields"
-msgstr ""
-
-#: ../picard/ui/ui_options_metadata.py:107
-msgid "Various artists:"
-msgstr ""
-
-#: ../picard/ui/ui_options_metadata.py:108
-msgid "Non-album tracks:"
-msgstr ""
-
-#: ../picard/ui/ui_options_metadata.py:109
-#: ../picard/ui/ui_options_metadata.py:110
-#: ../picard/ui/ui_options_naming.py:168 ../picard/ui/ui_options_naming.py:169
-msgid "Default"
-msgstr "Alapértelmezett"
-
-#: ../picard/ui/ui_multitageditor.py:58
-msgid "Delete"
-msgstr ""
-
-#: ../picard/ui/logview.py:29
-msgid "Log"
-msgstr ""
-
-#: ../picard/ui/ui_options_plugins.py:58
-msgid "Plugins"
-msgstr ""
-
-#: ../picard/ui/ui_options_plugins.py:60 ../picard/ui/options/plugins.py:79
-msgid "Author"
-msgstr ""
-
-#: ../picard/ui/ui_options_plugins.py:61
-msgid "Version"
-msgstr ""
-
-#: ../picard/ui/ui_options_naming.py:165
-msgid "Rename Files"
-msgstr ""
-
-#: ../picard/ui/ui_options_naming.py:166
-msgid "Replace Windows-incompatible characters"
-msgstr ""
-
-#: ../picard/ui/ui_options_naming.py:167
-msgid "Replace non-ASCII characters"
-msgstr ""
-
-#: ../picard/ui/ui_options_naming.py:170 ../picard/ui/options/naming.py:90
-msgid "Multiple artist file naming format:"
-msgstr ""
-
-#: ../picard/ui/ui_options_naming.py:171 ../picard/ui/options/naming.py:86
-msgid "File naming format:"
-msgstr ""
-
-#: ../picard/ui/ui_options_naming.py:172
-msgid "Move Files"
-msgstr ""
-
-#: ../picard/ui/ui_options_naming.py:173
-msgid "Move tagged files to this directory:"
-msgstr ""
-
-#: ../picard/ui/ui_options_naming.py:174
-msgid "Browse..."
-msgstr ""
-
-#: ../picard/ui/ui_options_naming.py:175
-msgid "Move additional files:"
-msgstr ""
-
-#: ../picard/ui/ui_options_naming.py:176
-msgid "Delete empty directories"
-msgstr ""
-
-#: ../picard/ui/ui_options_naming.py:177
-msgid "Example"
-msgstr ""
-
-#: ../picard/ui/ui_options_naming.py:178
-msgid "File name:"
-msgstr ""
-
-#: ../picard/ui/ui_options_naming.py:179
-msgid "Multiple artist file name:"
-msgstr ""
-
-#: ../picard/ui/ui_options_cdlookup.py:48
-msgid "CD-ROM device to use for lookups:"
-msgstr ""
-
-#: ../picard/ui/options/scripting.py:84 ../picard/ui/options/naming.py:86
-#: ../picard/ui/options/naming.py:90 ../picard/ui/options/naming.py:93
-#: ../picard/ui/options/naming.py:95
-msgid "Script Error"
-msgstr ""
+#: ../picard/ui/options/about.py:29
+msgid "About"
+msgstr "Névjegy"
 
 #. Replace this with your name to have it appear in the "About" dialog.
 #: ../picard/ui/options/about.py:48
 msgid "translator-credits"
 msgstr ""
 "Launchpad Contributions:\n"
-"  Lukáš Lalinský <https://launchpad.net/~luks>\n"
-"\n"
-"Launchpad Contributions:\n"
-"  Lukáš Lalinský https://launchpad.net/~luks\n"
-"\n"
-"Launchpad Contributions:\n"
-"  Lukáš Lalinský https://launchpad.net/~luks\n"
-"\n"
-"Launchpad Contributions:\n"
-"  Lukáš Lalinský https://launchpad.net/~luks\n"
-"\n"
-"Launchpad Contributions:\n"
 "  Lukáš Lalinský https://launchpad.net/~luks"
 
 #. Replace LANG with language you are translatig to.
@@ -905,22 +2185,58 @@ msgstr ""
 #: ../picard/ui/options/about.py:55
 #, python-format
 msgid ""
-"<p align=\"center\"><span style=\"font-size:15px;font-weight:bold;"
-"\">MusicBrainz Picard</span><br/>\n"
+"<p align=\"center\"><span style=\"font-size:15px;font-weight:bold;\">MusicBrainz Picard</span><br/>\n"
 "Version %(version)s</p>\n"
 "<p align=\"center\"><strong>Supported formats</strong><br/>%(formats)s</p>\n"
 "<p align=\"center\"><strong>Please donate</strong><br/>\n"
-"Thank you for using Picard. Picard relies on the MusicBrainz database, which "
-"is operated by the MetaBrainz Foundation with the help of thousands of "
-"volunteers. If you like this application please consider donating to the "
-"MetaBrainz Foundation to keep the service running.</p>\n"
-"<p align=\"center\"><a href=\"http://metabrainz.org/donate/index.html"
-"\">Donate now!</a></p>\n"
+"Thank you for using Picard. Picard relies on the MusicBrainz database, which is operated by the MetaBrainz Foundation with the help of thousands of volunteers. If you like this application please consider donating to the MetaBrainz Foundation to keep the service running.</p>\n"
+"<p align=\"center\"><a href=\"http://metabrainz.org/donate/index.html\">Donate now!</a></p>\n"
 "<p align=\"center\"><strong>Credits</strong><br/>\n"
-"<small>Copyright © 2004-2008 Robert Kaye, Lukáš Lalinský and others%"
-"(translator-credits)s</small></p>\n"
-"<p align=\"center\"><a href=\"http://musicbrainz.org/doc/PicardTagger"
-"\">http://musicbrainz.org/doc/PicardTagger</a></p>\n"
+"<small>Copyright © 2004-2008 Robert Kaye, Lukáš Lalinský and others%(translator-credits)s</small></p>\n"
+"<p align=\"center\"><a href=\"http://musicbrainz.org/doc/PicardTagger\">http://musicbrainz.org/doc/PicardTagger</a></p>\n"
+msgstr ""
+
+#: ../picard/ui/options/advanced.py:26
+msgid "Advanced"
+msgstr ""
+
+#: ../picard/ui/options/interface.py:31
+#, fuzzy
+msgid "User Interface"
+msgstr "Felhasználói felület nyelve"
+
+#: ../picard/ui/options/interface.py:47
+msgid "System default"
+msgstr "A rendszerben alapértelmezett"
+
+#: ../picard/ui/options/interface.py:71
+#, fuzzy
+msgid "Language changed"
+msgstr "Nyelv"
+
+#: ../picard/ui/options/interface.py:71
+msgid "You have changed the interface language. You have to restart Picard in order for the change to take effect."
+msgstr ""
+
+#: ../picard/ui/options/matching.py:29
+msgid "Matching"
+msgstr ""
+
+#: ../picard/ui/options/metadata.py:52
+msgid "None"
+msgstr ""
+
+#: ../picard/ui/options/naming.py:33
+#, fuzzy
+msgid "File Naming"
+msgstr "Elnevezés"
+
+#: ../picard/ui/options/naming.py:86
+#: ../picard/ui/options/naming.py:90
+#: ../picard/ui/options/naming.py:93
+#: ../picard/ui/options/naming.py:95
+#: ../picard/ui/options/scripting.py:84
+msgid "Script Error"
 msgstr ""
 
 #: ../picard/ui/options/naming.py:93
@@ -939,6 +2255,253 @@ msgstr ""
 msgid "The location to move files to must not be empty."
 msgstr ""
 
+#: ../picard/ui/options/scripting.py:63
+msgid "Scripting"
+msgstr ""
+
+#: ../picard/ui/options/tags.py:29
+msgid "Tags"
+msgstr "Fájl infók"
+
+#: ../picard/util/tags.py:24
+#, fuzzy
+msgid "Date"
+msgstr "Beillesztés"
+
+#: ../picard/util/tags.py:25
+#, fuzzy
+msgid "Album Artist"
+msgstr "Előadó"
+
+#: ../picard/util/tags.py:26
+#, fuzzy
+msgid "Track Number"
+msgstr "Szám:"
+
+#: ../picard/util/tags.py:27
+#, fuzzy
+msgid "Total Tracks"
+msgstr "Számok"
+
+#: ../picard/util/tags.py:28
+#, fuzzy
+msgid "Disc Number"
+msgstr "Dal sorszáma"
+
+#: ../picard/util/tags.py:29
+msgid "Total Discs"
+msgstr ""
+
+#: ../picard/util/tags.py:30
+#, fuzzy
+msgid "Album Artist Sort Order"
+msgstr "Album előadójának rendezési neve"
+
+#: ../picard/util/tags.py:31
+msgid "Artist Sort Order"
+msgstr ""
+
+#: ../picard/util/tags.py:32
+msgid "Title Sort Order"
+msgstr ""
+
+#: ../picard/util/tags.py:33
+#, fuzzy
+msgid "Album Sort Order"
+msgstr "Albumcsoportok"
+
+#: ../picard/util/tags.py:34
+msgid "ASIN"
+msgstr ""
+
+#: ../picard/util/tags.py:35
+msgid "Grouping"
+msgstr ""
+
+#: ../picard/util/tags.py:37
+msgid "ISRC"
+msgstr ""
+
+#: ../picard/util/tags.py:38
+msgid "Mood"
+msgstr ""
+
+#: ../picard/util/tags.py:39
+msgid "BPM"
+msgstr ""
+
+#: ../picard/util/tags.py:40
+#, fuzzy
+msgid "Copyright"
+msgstr "Másolás"
+
+#: ../picard/util/tags.py:41
+#, fuzzy
+msgid "Composer"
+msgstr "Bezárás"
+
+#: ../picard/util/tags.py:42
+msgid "Conductor"
+msgstr ""
+
+#: ../picard/util/tags.py:43
+msgid "Lyricist"
+msgstr ""
+
+#: ../picard/util/tags.py:44
+msgid "Arranger"
+msgstr ""
+
+#: ../picard/util/tags.py:45
+msgid "Producer"
+msgstr ""
+
+#: ../picard/util/tags.py:46
+msgid "Engineer"
+msgstr ""
+
+#: ../picard/util/tags.py:47
+msgid "Subtitle"
+msgstr ""
+
+#: ../picard/util/tags.py:48
+#, fuzzy
+msgid "Disc Subtitle"
+msgstr "Dal sorszáma"
+
+#: ../picard/util/tags.py:49
+msgid "Remixer"
+msgstr ""
+
+#: ../picard/util/tags.py:50
+#, fuzzy
+msgid "MusicBrainz Track Id"
+msgstr "MusicBrainz metaadatok"
+
+#: ../picard/util/tags.py:51
+#, fuzzy
+msgid "MusicBrainz Release Id"
+msgstr "MusicBrainz metaadatok"
+
+#: ../picard/util/tags.py:52
+#, fuzzy
+msgid "MusicBrainz Artist Id"
+msgstr "MusicBrainz metaadatok"
+
+#: ../picard/util/tags.py:53
+#, fuzzy
+msgid "MusicBrainz Release Artist Id"
+msgstr "Használatos MusicBrainz szerver"
+
+#: ../picard/util/tags.py:54
+#, fuzzy
+msgid "MusicBrainz TRM Id"
+msgstr "MusicBrainz metaadatok"
+
+#: ../picard/util/tags.py:55
+#, fuzzy
+msgid "MusicBrainz Disc Id"
+msgstr "MusicBrainz metaadatok"
+
+#: ../picard/util/tags.py:56
+#, fuzzy
+msgid "MusicBrainz Sort Name"
+msgstr "MusicBrainz metaadatok"
+
+#: ../picard/util/tags.py:57
+msgid "MusicIP PUID"
+msgstr ""
+
+#: ../picard/util/tags.py:58
+msgid "MusicIP Fingerprint"
+msgstr ""
+
+#: ../picard/util/tags.py:59
+msgid "Disc Id"
+msgstr ""
+
+#: ../picard/util/tags.py:60
+msgid "Website"
+msgstr ""
+
+#: ../picard/util/tags.py:61
+msgid "Compilation"
+msgstr ""
+
+#: ../picard/util/tags.py:62
+msgid "Comment"
+msgstr ""
+
+#: ../picard/util/tags.py:63
+#, fuzzy
+msgid "Genre"
+msgstr "Általános"
+
+#: ../picard/util/tags.py:64
+msgid "Encoded By"
+msgstr ""
+
+#: ../picard/util/tags.py:65
+msgid "Performer"
+msgstr ""
+
+#: ../picard/util/tags.py:66
+#, fuzzy
+msgid "Release Type"
+msgstr "Release dátuma"
+
+#: ../picard/util/tags.py:67
+#, fuzzy
+msgid "Release Status"
+msgstr "Release dátuma"
+
+#: ../picard/util/tags.py:68
+#, fuzzy
+msgid "Release Country"
+msgstr "Release dátuma"
+
+#: ../picard/util/tags.py:69
+msgid "Record Label"
+msgstr ""
+
+#: ../picard/util/tags.py:70
+msgid "Barcode"
+msgstr ""
+
+#: ../picard/util/tags.py:71
+#, fuzzy
+msgid "Catalog Number"
+msgstr "Dal sorszáma"
+
+#: ../picard/util/tags.py:72
+msgid "Format"
+msgstr ""
+
+#: ../picard/util/tags.py:73
+msgid "DJ-Mixer"
+msgstr ""
+
+#: ../picard/util/tags.py:74
+#, fuzzy
+msgid "Media"
+msgstr "Helyi metaadatok"
+
+#: ../picard/util/tags.py:75
+msgid "Lyrics"
+msgstr ""
+
+#: ../picard/util/tags.py:76
+msgid "Mixer"
+msgstr ""
+
+#: ../picard/util/tags.py:77
+msgid "Language"
+msgstr "Nyelv"
+
+#: ../picard/util/tags.py:78
+msgid "Script"
+msgstr ""
+
 #: ../picard/util/webbrowser2.py:84
 msgid "Web Browser Error"
 msgstr ""
@@ -951,36 +2514,37 @@ msgid ""
 "%s"
 msgstr ""
 
-#~ msgid "About"
-#~ msgstr "Névjegy"
+#, fuzzy
+#~ msgid "A&dd Directory..."
+#~ msgstr "Könyvtár hozzáadása..."
 
-#~ msgid "Tags"
-#~ msgstr "Fájl infók"
+#, fuzzy
+#~ msgid "Number of tracks on the album"
+#~ msgstr "Számok összesen"
 
+#, fuzzy
+#~ msgid "Auto Tag"
+#~ msgstr "A Tagger névjegye"
+
+#, fuzzy
+#~ msgid "Album artist:"
+#~ msgstr "Előadó"
 #~ msgid "Help"
 #~ msgstr "Segítség"
-
 #~ msgid "Preferences"
 #~ msgstr "Beállítások"
-
 #~ msgid "Time"
 #~ msgstr "Idő"
-
 #~ msgid "Albums"
 #~ msgstr "Albumok"
-
 #~ msgid "Force Save"
 #~ msgstr "Kényszerített mentés"
-
 #~ msgid "Buy"
 #~ msgstr "Vásárlás"
-
 #~ msgid "Welcome to Picard!"
 #~ msgstr "Üdvözli önt a Picard!"
-
 #~ msgid "Track Num"
 #~ msgstr "Szám:"
-
 #~ msgid ""
 #~ "Version %s\n"
 #~ "\n"
@@ -1007,97 +2571,60 @@ msgstr ""
 #~ "a Helix Community segítsége nélkül.\n"
 #~ "\n"
 #~ "Támogatott formátumok: %s"
-
-#~ msgid "Colors"
-#~ msgstr "Színek"
-
 #~ msgid "Font color"
 #~ msgstr "Betűszín"
-
 #~ msgid "Directories"
 #~ msgstr "Könyvtárak"
-
 #~ msgid "Watch for new files"
 #~ msgstr "Új fájlok figyelése"
-
 #~ msgid "Watch this directory for new audio files"
 #~ msgstr "Ennek a könyvtárnak a figyelése új zenei fájlokért"
-
 #~ msgid "Encodings"
 #~ msgstr "Kódkészlet"
-
 #~ msgid "all languages"
 #~ msgstr "összes nyelv"
-
 #~ msgid "percent similar."
 #~ msgstr "százalékban hasonlók"
-
-#~ msgid "Language"
-#~ msgstr "Nyelv"
-
-#~ msgid "System default"
-#~ msgstr "A rendszerben alapértelmezett"
-
 #~ msgid "Allowed filename characters"
 #~ msgstr "Engedélyezett karakterek a fájlnevekben"
-
 #~ msgid "Track name"
 #~ msgstr "Szám címe"
-
 #~ msgid "Zero padded track number"
 #~ msgstr "A dal 0-vel kiegészített sorszáma"
-
 #~ msgid "File format (e.g. mp3, ogg, wav)"
 #~ msgstr "Fájlformátum (pl. MP3, OGG, WAV)"
-
 #~ msgid "Album type (album, single, EP, etc.)"
 #~ msgstr "Albumtípus (album, single, EP stb.)"
-
 #~ msgid "Album Status (official, promo, etc.)"
 #~ msgstr "Az album státusza (hivatalos, promó, stb.)"
-
 #~ msgid "Album release month"
 #~ msgstr "Az album megjelenésének hónapja"
-
 #~ msgid "Album release day"
 #~ msgstr "Az album megjelenésének napja"
-
 #~ msgid "Album release year"
 #~ msgstr "Az album megjelenésének éve"
-
 #~ msgid "Proxy server to use"
 #~ msgstr "Proxy szerver"
-
 #~ msgid "Proxy port"
 #~ msgstr "Proxy port"
-
 #~ msgid "ID3v2.4 only"
 #~ msgstr "Csak ID3v2.4"
-
 #~ msgid "Save track/album"
 #~ msgstr "Szám/album mentése"
-
 #~ msgid "Artists"
 #~ msgstr "Előadók"
-
 #~ msgid "New files (drag files to tag here)"
 #~ msgstr "Új fájlok (húzza ide a taggelendő fájlokat)"
-
 #~ msgid "updating album information"
 #~ msgstr "albuminformáció frissítése"
-
 #~ msgid "CD Lookup error -- is there a CD in the CD-ROM drive?"
 #~ msgstr "CD-keresési hiba -- van lemez a CD olvasóban?"
-
 #~ msgid "CD Lookup Failed"
 #~ msgstr "CD-keresés sikertelen"
-
 #~ msgid "Quick Start Guide"
 #~ msgstr "Gyors segítség"
-
 #~ msgid "Save error"
 #~ msgstr "Mentési hiba"
-
 #~ msgid ""
 #~ "The move files option is enabled, but the destination directory is not "
 #~ "specified or invalid.\n"
@@ -1107,7 +2634,6 @@ msgstr ""
 #~ "A Fájlok mozgatása opció ki lett választva, de a célkönyvtár nincs "
 #~ "megadva vagy érvénytelen.\n"
 #~ "Javítsa ki az opciót vagy a célkönyvtárat, és próbálja meg újból."
-
 #~ msgid ""
 #~ "Not all files could be saved. Please check for and examine tracks that "
 #~ "have an error icon in front of them. To retry saving the track, right "
@@ -1116,157 +2642,113 @@ msgstr ""
 #~ "Nem sikerült minden fájlt menteni. Ellenőrizze azokat a fájlokat, amik "
 #~ "előtt hibajelzés található. A mentés újbóli megpróbálásához kattintson a "
 #~ "számra jobb egérgombbal, és válassza a 'Hiba törlésé'-t."
-
 #~ msgid "Select directory that contains music files"
 #~ msgstr "Válassza ki a zenei fájlokat tartalmazó könyvtárat"
-
 #~ msgid "Reload album from main server"
 #~ msgstr "Album újratöltése a szerverről"
-
 #~ msgid "Select or drag a folder from below"
 #~ msgstr "Válasszon egy mappát vagy húzzon ide egyet lentről"
-
 #~ msgid "Drag files from below"
 #~ msgstr "Húzzon ide fájlokat lentről"
-
 #~ msgid "Release date"
 #~ msgstr "Release dátuma"
-
 #~ msgid "%d%% similar"
 #~ msgstr "%d%%-ban hasonló"
-
 #~ msgid ""
 #~ "The destination directory %s does not exist. Please pick a valid "
 #~ "directory."
 #~ msgstr ""
 #~ "A célkönyvtár - %s - nem létezik. Válasszon egy érvényes könyvtárat!"
-
 #~ msgid "Select the encoding to use when reading and writing filenames"
 #~ msgstr ""
 #~ "Válassza ki a kódkészletet amit fájlnevek írás-olvasásánál használni kíván"
-
 #~ msgid ""
 #~ "Note: This setting will take effect after you restart the application."
 #~ msgstr ""
 #~ "Megjegyzés: ez a beállítás csak az alkalmazás újraindítása után fog "
 #~ "érvényesülni."
-
 #~ msgid "Rename files when writing metadata tags"
 #~ msgstr "Fájlok átnevezése a tag-ek kiírásakor"
-
 #~ msgid "Naming Help"
 #~ msgstr "Elnevezés segítsége"
-
 #~ msgid ""
 #~ "You may use the following variables in the filenaming\n"
 #~ "specifications in the options dialog:"
 #~ msgstr ""
 #~ "A következő változókat használhatja az elnevezési\n"
 #~ "specifikációk beállítási párbeszédablakában:"
-
 #~ msgid "A %s in the naming specification will create a new subfolder."
 #~ msgstr "A %s az elnevezésben új alkönyvtárat fog létrehozni"
-
 #~ msgid "Write ID3v1 tags to MP3 files (ID3v2 tags will always be written)"
 #~ msgstr ""
 #~ "ID3v1 tag-ek írása az MP3 fájlokba (az ID3v2 tagek mindig kiírásra "
 #~ "kerülnek)"
-
 #~ msgid "Remove track/album"
 #~ msgstr "Szám/album mentése eltávolítása"
-
 #~ msgid "Listen to track"
 #~ msgstr "Szám meghallgatása"
-
 #~ msgid "Album clusters"
 #~ msgstr "Albumcsoportok"
-
 #~ msgid "Unmatched files for this album"
 #~ msgstr "Nem passzoló fájlok ehhez az albumhoz"
-
 #~ msgid "%d of %d tracks linked"
 #~ msgstr "%d számból %d összekötve"
-
 #~ msgid "Matched track highlighting"
 #~ msgstr "Megtalált számok színezése"
-
 #~ msgid "Good match background color"
 #~ msgstr "Jó találat háttérszíne"
-
 #~ msgid "Bad match background color"
 #~ msgstr "Gyenge találat háttérszíne"
-
 #~ msgid "Move files option"
 #~ msgstr "Fájlok mozgatása"
-
 #~ msgid "CD-ROM drive path to use for lookups"
 #~ msgstr "A kereséshez használandó CD-ROM meghajtó útvonala"
-
 #~ msgid "Launch MB Tagger automatically for inserted Audio CDs"
 #~ msgstr "Az MB Tagger automatikus indítása zenei CD berakásakor"
-
 #~ msgid ""
 #~ "Failed to set the proper registy values to enable launching the tagger "
 #~ "after CD insertion. "
 #~ msgstr ""
 #~ "Nem sikerült beállítani a registryben, hogy a tagger automatikusan "
 #~ "elinduljon CD berakásakor. "
-
 #~ msgid "Default CD setting failed"
 #~ msgstr "Alapértelmezett CD beállítás sikertelen"
-
 #~ msgid "File format naming specification"
 #~ msgstr "Fájlelnevezési specifikáció"
-
 #~ msgid "Various artist file format naming specification"
 #~ msgstr "Több előadót tartalmazó albumok fájlelnevezési specifikációja"
-
 #~ msgid "Note: Leave blank to allow all possible characters"
 #~ msgstr "Hagyja üresen az összes karakter engedélyezéséhez"
-
 #~ msgid "Track artist name"
 #~ msgstr "Szám előadójának neve"
-
 #~ msgid "Track artist sortname"
 #~ msgstr "Szám előadójának rendezési neve"
-
 #~ msgid "The first character of the artist sortname"
 #~ msgstr "Az előadó rendezési nevének első betűje"
-
 #~ msgid "The first two characters of the artist sortname"
 #~ msgstr "Az előadó rendezési nevének első két betűje"
-
 #~ msgid "The first three characters of the artist sortname"
 #~ msgstr "Az előadó rendezési nevének első három betűje"
-
 #~ msgid "Naming specification help"
 #~ msgstr "Elnevezési beállítások segítsége"
-
 #~ msgid "Various artist name"
 #~ msgstr "Előadó neve"
-
 #~ msgid "Open file"
 #~ msgstr "Fájl megnyitása"
-
 #~ msgid "Edit options"
 #~ msgstr "Szerkesztés beállításai"
-
 #~ msgid "Exit"
 #~ msgstr "Kilépés"
-
 #~ msgid ""
 #~ "The MusicBrainz Tagger requires wx.Widgets with UNICODE support.\n"
 #~ "Please download the appropriate toolkit from  http://www.wxwidgets.com"
 #~ msgstr ""
 #~ "A MusicBrainz Taggernek wx.Widgets-re van szüksége UNICODE támogatással.\n"
 #~ "Kérem töltse le a megfelelő toolkitet innen: http://www.wxwidgets.com"
-
 #~ msgid "Sorry, there is no help file yet."
 #~ msgstr "Sajnálom, még nincs kész a segítség."
-
 #~ msgid "Use Internet Explorer settings for proxy support."
 #~ msgstr "Használja az Internet Explorer proxybeállításait."
-
 #~ msgid ""
 #~ "If you use an automatic proxy configuration in Internet\n"
 #~ "Explorer, uncheck the box above and enter your\n"
@@ -1275,3 +2757,4 @@ msgstr ""
 #~ "Ha az automatikus beállításokat használja az\n"
 #~ "Internet Explorerben, vegye ki a pipát a négyzetből\n"
 #~ "és adja meg a proxy szervert és a portot alul:"
+
diff --git a/po/is.po b/po/is.po
index 127810b96..a9ee533de 100644
--- a/po/is.po
+++ b/po/is.po
@@ -6,35 +6,1279 @@ msgid ""
 msgstr ""
 "Project-Id-Version: picard\n"
 "Report-Msgid-Bugs-To: http://bugs.musicbrainz.org/\n"
-"POT-Creation-Date: 2008-12-01 18:20+0100\n"
-"PO-Revision-Date: 2008-07-27 20:41+0000\n"
-"Last-Translator: Stefán Sigurjónsson <stefans@mmedia.is>\n"
+"POT-Creation-Date: 2009-01-25 12:23+0100\n"
+"PO-Revision-Date: 2009-01-25 13:20+0100\n"
+"Last-Translator: Philipp Wolfer <phw@rubyforge.org>\n"
 "Language-Team: Icelandic <is@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2008-12-01 17:02+0000\n"
+"X-Launchpad-Export-Date: 2009-01-24 23:28+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
-#: ../picard/album.py:108 ../picard/cluster.py:248
+#: ../picard/album.py:108
+#: ../picard/cluster.py:248
 msgid "Unmatched Files"
 msgstr ""
 
-#: ../picard/album.py:269
+#: ../picard/album.py:281
 #, python-format
 msgid "[couldn't load album %s]"
 msgstr ""
 
-#: ../picard/album.py:305
+#: ../picard/album.py:317
 msgid "[loading album information]"
 msgstr ""
 
-#: ../picard/tagger.py:472
+#: ../picard/cluster.py:164
+#: ../picard/cluster.py:175
+#, python-format
+msgid "No matching releases for cluster %s"
+msgstr ""
+
+#: ../picard/cluster.py:177
+#, fuzzy, python-format
+msgid "Cluster %s identified!"
+msgstr "Skráin %s fundin!"
+
+#: ../picard/cluster.py:182
+#, fuzzy, python-format
+msgid "Looking up the metadata for cluster %s..."
+msgstr "Leita upplýsinga um skrána %s ..."
+
+#: ../picard/const.py:40
+msgid "CD"
+msgstr ""
+
+#: ../picard/const.py:41
+msgid "DVD"
+msgstr ""
+
+#: ../picard/const.py:42
+msgid "SACD"
+msgstr ""
+
+#: ../picard/const.py:43
+msgid "LaserDisc"
+msgstr ""
+
+#: ../picard/const.py:44
+msgid "MiniDisc"
+msgstr ""
+
+#: ../picard/const.py:45
+msgid "Vinyl"
+msgstr ""
+
+#: ../picard/const.py:46
+msgid "Cassette"
+msgstr ""
+
+#: ../picard/const.py:47
+msgid "Cartridge (4/8-tracks)"
+msgstr ""
+
+#: ../picard/const.py:48
+msgid "Reel-to-Reel"
+msgstr ""
+
+#: ../picard/const.py:49
+msgid "DAT"
+msgstr ""
+
+#: ../picard/const.py:50
+msgid "Digital Media"
+msgstr ""
+
+#: ../picard/const.py:51
+msgid "Wax Cylinder"
+msgstr ""
+
+#: ../picard/const.py:52
+msgid "Piano Roll"
+msgstr ""
+
+#: ../picard/const.py:53
+#, fuzzy
+msgid "Other"
+msgstr "Síðar"
+
+#: ../picard/const.py:58
+msgid "Bangladesh"
+msgstr ""
+
+#: ../picard/const.py:59
+msgid "Belgium"
+msgstr ""
+
+#: ../picard/const.py:60
+msgid "Burkina Faso"
+msgstr ""
+
+#: ../picard/const.py:61
+msgid "Bulgaria"
+msgstr ""
+
+#: ../picard/const.py:62
+msgid "Barbados"
+msgstr ""
+
+#: ../picard/const.py:63
+msgid "Wallis and Futuna Islands"
+msgstr ""
+
+#: ../picard/const.py:64
+msgid "Bermuda"
+msgstr ""
+
+#: ../picard/const.py:65
+msgid "Brunei Darussalam"
+msgstr ""
+
+#: ../picard/const.py:66
+msgid "Bolivia"
+msgstr ""
+
+#: ../picard/const.py:67
+msgid "Bahrain"
+msgstr ""
+
+#: ../picard/const.py:68
+msgid "Burundi"
+msgstr ""
+
+#: ../picard/const.py:69
+msgid "Benin"
+msgstr ""
+
+#: ../picard/const.py:70
+msgid "Bhutan"
+msgstr ""
+
+#: ../picard/const.py:71
+msgid "Jamaica"
+msgstr ""
+
+#: ../picard/const.py:72
+msgid "Bouvet Island"
+msgstr ""
+
+#: ../picard/const.py:73
+msgid "Botswana"
+msgstr ""
+
+#: ../picard/const.py:74
+msgid "Samoa"
+msgstr ""
+
+#: ../picard/const.py:75
+msgid "Brazil"
+msgstr ""
+
+#: ../picard/const.py:76
+msgid "Bahamas"
+msgstr ""
+
+#: ../picard/const.py:77
+msgid "Belarus"
+msgstr ""
+
+#: ../picard/const.py:78
+msgid "Belize"
+msgstr ""
+
+#: ../picard/const.py:79
+msgid "Russian Federation"
+msgstr ""
+
+#: ../picard/const.py:80
+msgid "Rwanda"
+msgstr ""
+
+#: ../picard/const.py:81
+msgid "Reunion"
+msgstr ""
+
+#: ../picard/const.py:82
+msgid "Turkmenistan"
+msgstr ""
+
+#: ../picard/const.py:83
+msgid "Tajikistan"
+msgstr ""
+
+#: ../picard/const.py:84
+msgid "Romania"
+msgstr ""
+
+#: ../picard/const.py:85
+msgid "Tokela"
+msgstr ""
+
+#: ../picard/const.py:86
+msgid "Guinea-Bissa"
+msgstr ""
+
+#: ../picard/const.py:87
+msgid "Guam"
+msgstr ""
+
+#: ../picard/const.py:88
+msgid "Guatemala"
+msgstr ""
+
+#: ../picard/const.py:89
+msgid "Greece"
+msgstr ""
+
+#: ../picard/const.py:90
+msgid "Equatorial Guinea"
+msgstr ""
+
+#: ../picard/const.py:91
+msgid "Guadeloupe"
+msgstr ""
+
+#: ../picard/const.py:92
+msgid "Japan"
+msgstr ""
+
+#: ../picard/const.py:93
+msgid "Guyana"
+msgstr ""
+
+#: ../picard/const.py:94
+msgid "French Guiana"
+msgstr ""
+
+#: ../picard/const.py:95
+msgid "Georgia"
+msgstr ""
+
+#: ../picard/const.py:96
+msgid "Grenada"
+msgstr ""
+
+#: ../picard/const.py:97
+msgid "United Kingdom"
+msgstr ""
+
+#: ../picard/const.py:98
+msgid "Gabon"
+msgstr ""
+
+#: ../picard/const.py:99
+msgid "El Salvador"
+msgstr ""
+
+#: ../picard/const.py:100
+#, fuzzy
+msgid "Guinea"
+msgstr "Almennt"
+
+#: ../picard/const.py:101
+msgid "Gambia"
+msgstr ""
+
+#: ../picard/const.py:102
+msgid "Greenland"
+msgstr ""
+
+#: ../picard/const.py:103
+msgid "Gibraltar"
+msgstr ""
+
+#: ../picard/const.py:104
+msgid "Ghana"
+msgstr ""
+
+#: ../picard/const.py:105
+msgid "Oman"
+msgstr ""
+
+#: ../picard/const.py:106
+msgid "Tunisia"
+msgstr ""
+
+#: ../picard/const.py:107
+msgid "Jordan"
+msgstr ""
+
+#: ../picard/const.py:108
+msgid "Haiti"
+msgstr ""
+
+#: ../picard/const.py:109
+msgid "Hungary"
+msgstr ""
+
+#: ../picard/const.py:110
+msgid "Hong Kong"
+msgstr ""
+
+#: ../picard/const.py:111
+msgid "Honduras"
+msgstr ""
+
+#: ../picard/const.py:112
+msgid "Heard and Mc Donald Islands"
+msgstr ""
+
+#: ../picard/const.py:113
+msgid "Venezuela"
+msgstr ""
+
+#: ../picard/const.py:114
+msgid "Puerto Rico"
+msgstr ""
+
+#: ../picard/const.py:115
+msgid "Pala"
+msgstr ""
+
+#: ../picard/const.py:116
+msgid "Portugal"
+msgstr ""
+
+#: ../picard/const.py:117
+msgid "Svalbard and Jan Mayen Islands"
+msgstr ""
+
+#: ../picard/const.py:118
+msgid "Paraguay"
+msgstr ""
+
+#: ../picard/const.py:119
+msgid "Iraq"
+msgstr ""
+
+#: ../picard/const.py:120
+msgid "Panama"
+msgstr ""
+
+#: ../picard/const.py:121
+msgid "French Polynesia"
+msgstr ""
+
+#: ../picard/const.py:122
+msgid "Papua New Guinea"
+msgstr ""
+
+#: ../picard/const.py:123
+msgid "Per"
+msgstr ""
+
+#: ../picard/const.py:124
+msgid "Pakistan"
+msgstr ""
+
+#: ../picard/const.py:125
+msgid "Philippines"
+msgstr ""
+
+#: ../picard/const.py:126
+msgid "Pitcairn"
+msgstr ""
+
+#: ../picard/const.py:127
+msgid "Poland"
+msgstr ""
+
+#: ../picard/const.py:128
+msgid "St. Pierre and Miquelon"
+msgstr ""
+
+#: ../picard/const.py:129
+msgid "Zambia"
+msgstr ""
+
+#: ../picard/const.py:130
+msgid "Western Sahara"
+msgstr ""
+
+#: ../picard/const.py:131
+msgid "Estonia"
+msgstr ""
+
+#: ../picard/const.py:132
+msgid "Egypt"
+msgstr ""
+
+#: ../picard/const.py:133
+msgid "South Africa"
+msgstr ""
+
+#: ../picard/const.py:134
+msgid "Ecuador"
+msgstr ""
+
+#: ../picard/const.py:135
+msgid "Italy"
+msgstr ""
+
+#: ../picard/const.py:136
+#, fuzzy
+msgid "Viet Nam"
+msgstr "Endurskíring"
+
+#: ../picard/const.py:137
+msgid "Solomon Islands"
+msgstr ""
+
+#: ../picard/const.py:138
+msgid "Ethiopia"
+msgstr ""
+
+#: ../picard/const.py:139
+msgid "Somalia"
+msgstr ""
+
+#: ../picard/const.py:140
+msgid "Zimbabwe"
+msgstr ""
+
+#: ../picard/const.py:141
+msgid "Saudi Arabia"
+msgstr ""
+
+#: ../picard/const.py:142
+msgid "Spain"
+msgstr ""
+
+#: ../picard/const.py:143
+msgid "Eritrea"
+msgstr ""
+
+#: ../picard/const.py:144
+msgid "Moldova, Republic of"
+msgstr ""
+
+#: ../picard/const.py:145
+msgid "Madagascar"
+msgstr ""
+
+#: ../picard/const.py:146
+msgid "Morocco"
+msgstr ""
+
+#: ../picard/const.py:147
+msgid "Monaco"
+msgstr ""
+
+#: ../picard/const.py:148
+msgid "Uzbekistan"
+msgstr ""
+
+#: ../picard/const.py:149
+msgid "Myanmar"
+msgstr ""
+
+#: ../picard/const.py:150
+msgid "Mali"
+msgstr ""
+
+#: ../picard/const.py:151
+msgid "Maca"
+msgstr ""
+
+#: ../picard/const.py:152
+msgid "Mongolia"
+msgstr ""
+
+#: ../picard/const.py:153
+msgid "Marshall Islands"
+msgstr ""
+
+#: ../picard/const.py:154
+msgid "Macedonia, The Former Yugoslav Republic of"
+msgstr ""
+
+#: ../picard/const.py:155
+msgid "Mauritius"
+msgstr ""
+
+#: ../picard/const.py:156
+msgid "Malta"
+msgstr ""
+
+#: ../picard/const.py:157
+msgid "Malawi"
+msgstr ""
+
+#: ../picard/const.py:158
+msgid "Maldives"
+msgstr ""
+
+#: ../picard/const.py:159
+msgid "Martinique"
+msgstr ""
+
+#: ../picard/const.py:160
+msgid "Northern Mariana Islands"
+msgstr ""
+
+#: ../picard/const.py:161
+msgid "Montserrat"
+msgstr ""
+
+#: ../picard/const.py:162
+msgid "Mauritania"
+msgstr ""
+
+#: ../picard/const.py:163
+msgid "Uganda"
+msgstr ""
+
+#: ../picard/const.py:164
+msgid "Malaysia"
+msgstr ""
+
+#: ../picard/const.py:165
+msgid "Mexico"
+msgstr ""
+
+#: ../picard/const.py:166
+msgid "Israel"
+msgstr ""
+
+#: ../picard/const.py:167
+#, fuzzy
+msgid "France"
+msgstr "Hætta við"
+
+#: ../picard/const.py:168
+msgid "British Indian Ocean Territory"
+msgstr ""
+
+#: ../picard/const.py:169
+msgid "St. Helena"
+msgstr ""
+
+#: ../picard/const.py:170
+msgid "Finland"
+msgstr ""
+
+#: ../picard/const.py:171
+msgid "Fiji"
+msgstr ""
+
+#: ../picard/const.py:172
+msgid "Falkland Islands (Malvinas)"
+msgstr ""
+
+#: ../picard/const.py:173
+msgid "Micronesia, Federated States of"
+msgstr ""
+
+#: ../picard/const.py:174
+msgid "Faroe Islands"
+msgstr ""
+
+#: ../picard/const.py:175
+msgid "Nicaragua"
+msgstr ""
+
+#: ../picard/const.py:176
+msgid "Netherlands"
+msgstr ""
+
+#: ../picard/const.py:177
+msgid "Norway"
+msgstr ""
+
+#: ../picard/const.py:178
+msgid "Namibia"
+msgstr ""
+
+#: ../picard/const.py:179
+msgid "Vanuat"
+msgstr ""
+
+#: ../picard/const.py:180
+msgid "New Caledonia"
+msgstr ""
+
+#: ../picard/const.py:181
+msgid "Niger"
+msgstr ""
+
+#: ../picard/const.py:182
+msgid "Norfolk Island"
+msgstr ""
+
+#: ../picard/const.py:183
+msgid "Nigeria"
+msgstr ""
+
+#: ../picard/const.py:184
+msgid "New Zealand"
+msgstr ""
+
+#: ../picard/const.py:185
+msgid "Zaire"
+msgstr ""
+
+#: ../picard/const.py:186
+msgid "Nepal"
+msgstr ""
+
+#: ../picard/const.py:187
+msgid "Naur"
+msgstr ""
+
+#: ../picard/const.py:188
+msgid "Niue"
+msgstr ""
+
+#: ../picard/const.py:189
+msgid "Cook Islands"
+msgstr ""
+
+#: ../picard/const.py:190
+msgid "Cote d'Ivoire"
+msgstr ""
+
+#: ../picard/const.py:191
+msgid "Switzerland"
+msgstr ""
+
+#: ../picard/const.py:192
+msgid "Colombia"
+msgstr ""
+
+#: ../picard/const.py:193
+msgid "China"
+msgstr ""
+
+#: ../picard/const.py:194
+msgid "Cameroon"
+msgstr ""
+
+#: ../picard/const.py:195
+#, fuzzy
+msgid "Chile"
+msgstr "Skrá"
+
+#: ../picard/const.py:196
+msgid "Cocos (Keeling) Islands"
+msgstr ""
+
+#: ../picard/const.py:197
+msgid "Canada"
+msgstr ""
+
+#: ../picard/const.py:198
+msgid "Congo"
+msgstr ""
+
+#: ../picard/const.py:199
+msgid "Central African Republic"
+msgstr ""
+
+#: ../picard/const.py:200
+msgid "Czech Republic"
+msgstr ""
+
+#: ../picard/const.py:201
+msgid "Cyprus"
+msgstr ""
+
+#: ../picard/const.py:202
+msgid "Christmas Island"
+msgstr ""
+
+#: ../picard/const.py:203
+msgid "Costa Rica"
+msgstr ""
+
+#: ../picard/const.py:204
+msgid "Cape Verde"
+msgstr ""
+
+#: ../picard/const.py:205
+msgid "Cuba"
+msgstr ""
+
+#: ../picard/const.py:206
+msgid "Swaziland"
+msgstr ""
+
+#: ../picard/const.py:207
+msgid "Syrian Arab Republic"
+msgstr ""
+
+#: ../picard/const.py:208
+msgid "Kyrgyzstan"
+msgstr ""
+
+#: ../picard/const.py:209
+msgid "Kenya"
+msgstr ""
+
+#: ../picard/const.py:210
+msgid "Suriname"
+msgstr ""
+
+#: ../picard/const.py:211
+msgid "Kiribati"
+msgstr ""
+
+#: ../picard/const.py:212
+msgid "Cambodia"
+msgstr ""
+
+#: ../picard/const.py:213
+msgid "Saint Kitts and Nevis"
+msgstr ""
+
+#: ../picard/const.py:214
+#, fuzzy
+msgid "Comoros"
+msgstr "Litir"
+
+#: ../picard/const.py:215
+msgid "Sao Tome and Principe"
+msgstr ""
+
+#: ../picard/const.py:216
+msgid "Slovenia"
+msgstr ""
+
+#: ../picard/const.py:217
+msgid "Kuwait"
+msgstr ""
+
+#: ../picard/const.py:218
+#, fuzzy
+msgid "Senegal"
+msgstr "Almennt"
+
+#: ../picard/const.py:219
+msgid "San Marino"
+msgstr ""
+
+#: ../picard/const.py:220
+msgid "Sierra Leone"
+msgstr ""
+
+#: ../picard/const.py:221
+msgid "Seychelles"
+msgstr ""
+
+#: ../picard/const.py:222
+msgid "Kazakhstan"
+msgstr ""
+
+#: ../picard/const.py:223
+msgid "Cayman Islands"
+msgstr ""
+
+#: ../picard/const.py:224
+msgid "Singapore"
+msgstr ""
+
+#: ../picard/const.py:225
+msgid "Sweden"
+msgstr ""
+
+#: ../picard/const.py:226
+msgid "Sudan"
+msgstr ""
+
+#: ../picard/const.py:227
+msgid "Dominican Republic"
+msgstr ""
+
+#: ../picard/const.py:228
+msgid "Dominica"
+msgstr ""
+
+#: ../picard/const.py:229
+#, fuzzy
+msgid "Djibouti"
+msgstr "Um"
+
+#: ../picard/const.py:230
+msgid "Denmark"
+msgstr ""
+
+#: ../picard/const.py:231
+msgid "Virgin Islands (British)"
+msgstr ""
+
+#: ../picard/const.py:232
+msgid "Germany"
+msgstr ""
+
+#: ../picard/const.py:233
+msgid "Yemen"
+msgstr ""
+
+#: ../picard/const.py:234
+msgid "Algeria"
+msgstr ""
+
+#: ../picard/const.py:235
+msgid "United States"
+msgstr ""
+
+#: ../picard/const.py:236
+msgid "Uruguay"
+msgstr ""
+
+#: ../picard/const.py:237
+msgid "Mayotte"
+msgstr ""
+
+#: ../picard/const.py:238
+msgid "United States Minor Outlying Islands"
+msgstr ""
+
+#: ../picard/const.py:239
+msgid "Lebanon"
+msgstr ""
+
+#: ../picard/const.py:240
+msgid "Saint Lucia"
+msgstr ""
+
+#: ../picard/const.py:241
+msgid "Lao People's Democratic Republic"
+msgstr ""
+
+#: ../picard/const.py:242
+msgid "Tuval"
+msgstr ""
+
+#: ../picard/const.py:243
+msgid "Taiwan"
+msgstr ""
+
+#: ../picard/const.py:244
+msgid "Trinidad and Tobago"
+msgstr ""
+
+#: ../picard/const.py:245
+msgid "Turkey"
+msgstr ""
+
+#: ../picard/const.py:246
+msgid "Sri Lanka"
+msgstr ""
+
+#: ../picard/const.py:247
+msgid "Liechtenstein"
+msgstr ""
+
+#: ../picard/const.py:248
+msgid "Latvia"
+msgstr ""
+
+#: ../picard/const.py:249
+msgid "Tonga"
+msgstr ""
+
+#: ../picard/const.py:250
+msgid "Lithuania"
+msgstr ""
+
+#: ../picard/const.py:251
+msgid "Luxembourg"
+msgstr ""
+
+#: ../picard/const.py:252
+msgid "Liberia"
+msgstr ""
+
+#: ../picard/const.py:253
+msgid "Lesotho"
+msgstr ""
+
+#: ../picard/const.py:254
+msgid "Thailand"
+msgstr ""
+
+#: ../picard/const.py:255
+msgid "French Southern Territories"
+msgstr ""
+
+#: ../picard/const.py:256
+msgid "Togo"
+msgstr ""
+
+#: ../picard/const.py:257
+msgid "Chad"
+msgstr ""
+
+#: ../picard/const.py:258
+msgid "Turks and Caicos Islands"
+msgstr ""
+
+#: ../picard/const.py:259
+msgid "Libyan Arab Jamahiriya"
+msgstr ""
+
+#: ../picard/const.py:260
+msgid "Vatican City State (Holy See)"
+msgstr ""
+
+#: ../picard/const.py:261
+msgid "Saint Vincent and The Grenadines"
+msgstr ""
+
+#: ../picard/const.py:262
+msgid "United Arab Emirates"
+msgstr ""
+
+#: ../picard/const.py:263
+msgid "Andorra"
+msgstr ""
+
+#: ../picard/const.py:264
+msgid "Antigua and Barbuda"
+msgstr ""
+
+#: ../picard/const.py:265
+msgid "Afghanistan"
+msgstr ""
+
+#: ../picard/const.py:266
+msgid "Anguilla"
+msgstr ""
+
+#: ../picard/const.py:267
+msgid "Virgin Islands (U.S.)"
+msgstr ""
+
+#: ../picard/const.py:268
+msgid "Iceland"
+msgstr ""
+
+#: ../picard/const.py:269
+msgid "Iran (Islamic Republic of)"
+msgstr ""
+
+#: ../picard/const.py:270
+msgid "Armenia"
+msgstr ""
+
+#: ../picard/const.py:271
+msgid "Albania"
+msgstr ""
+
+#: ../picard/const.py:272
+msgid "Angola"
+msgstr ""
+
+#: ../picard/const.py:273
+msgid "Netherlands Antilles"
+msgstr ""
+
+#: ../picard/const.py:274
+msgid "Antarctica"
+msgstr ""
+
+#: ../picard/const.py:275
+msgid "American Samoa"
+msgstr ""
+
+#: ../picard/const.py:276
+msgid "Argentina"
+msgstr ""
+
+#: ../picard/const.py:277
+msgid "Australia"
+msgstr ""
+
+#: ../picard/const.py:278
+msgid "Austria"
+msgstr ""
+
+#: ../picard/const.py:279
+msgid "Aruba"
+msgstr ""
+
+#: ../picard/const.py:280
+#, fuzzy
+msgid "India"
+msgstr "Þínar Upplýsingar"
+
+#: ../picard/const.py:281
+msgid "Tanzania, United Republic of"
+msgstr ""
+
+#: ../picard/const.py:282
+msgid "Azerbaijan"
+msgstr ""
+
+#: ../picard/const.py:283
+msgid "Ireland"
+msgstr ""
+
+#: ../picard/const.py:284
+msgid "Indonesia"
+msgstr ""
+
+#: ../picard/const.py:285
+msgid "Ukraine"
+msgstr ""
+
+#: ../picard/const.py:286
+#, fuzzy
+msgid "Qatar"
+msgstr "Síðar"
+
+#: ../picard/const.py:287
+msgid "Mozambique"
+msgstr ""
+
+#: ../picard/const.py:288
+msgid "Bosnia and Herzegovina"
+msgstr ""
+
+#: ../picard/const.py:289
+msgid "Congo, The Democratic Republic of the"
+msgstr ""
+
+#: ../picard/const.py:290
+msgid "Serbia and Montenegro"
+msgstr ""
+
+#: ../picard/const.py:291
+msgid "Croatia"
+msgstr ""
+
+#: ../picard/const.py:292
+msgid "Korea (North), Democratic People's Republic of"
+msgstr ""
+
+#: ../picard/const.py:293
+msgid "Korea (South), Republic of"
+msgstr ""
+
+#: ../picard/const.py:294
+msgid "Slovakia"
+msgstr ""
+
+#: ../picard/const.py:295
+msgid "Soviet Union (historical, 1922-1991)"
+msgstr ""
+
+#: ../picard/const.py:296
+msgid "East Timor"
+msgstr ""
+
+#: ../picard/const.py:297
+msgid "Czechoslovakia (historical, 1918-1992)"
+msgstr ""
+
+#: ../picard/const.py:298
+msgid "Europe"
+msgstr ""
+
+#: ../picard/const.py:299
+msgid "East Germany (historical, 1949-1990)"
+msgstr ""
+
+#: ../picard/const.py:300
+msgid "[Unknown Country]"
+msgstr ""
+
+#: ../picard/const.py:301
+msgid "[Worldwide]"
+msgstr ""
+
+#: ../picard/const.py:302
+msgid "Yugoslavia (historical, 1918-1992)"
+msgstr ""
+
+#: ../picard/const.py:307
+msgid "Catalan"
+msgstr ""
+
+#: ../picard/const.py:308
+msgid "Czech"
+msgstr ""
+
+#: ../picard/const.py:309
+msgid "Welsh"
+msgstr ""
+
+#: ../picard/const.py:310
+msgid "Danish"
+msgstr ""
+
+#: ../picard/const.py:311
+#, fuzzy
+msgid "German"
+msgstr "Almennt"
+
+#: ../picard/const.py:312
+msgid "English"
+msgstr ""
+
+#: ../picard/const.py:313
+msgid "English (Canada)"
+msgstr ""
+
+#: ../picard/const.py:314
+msgid "English (UK)"
+msgstr ""
+
+#: ../picard/const.py:315
+msgid "Spanish"
+msgstr ""
+
+#: ../picard/const.py:316
+msgid "Persian"
+msgstr ""
+
+#: ../picard/const.py:317
+msgid "Finnish"
+msgstr ""
+
+#: ../picard/const.py:318
+msgid "French"
+msgstr ""
+
+#: ../picard/const.py:319
+msgid "Frisian"
+msgstr ""
+
+#: ../picard/const.py:320
+msgid "Hebrew"
+msgstr ""
+
+#: ../picard/const.py:321
+msgid "Hungarian"
+msgstr ""
+
+#: ../picard/const.py:322
+msgid "Islandic"
+msgstr ""
+
+#: ../picard/const.py:323
+msgid "Italian"
+msgstr ""
+
+#: ../picard/const.py:324
+msgid "Kannada"
+msgstr ""
+
+#: ../picard/const.py:325
+msgid "Korean"
+msgstr ""
+
+#: ../picard/const.py:326
+msgid "Lithuanian"
+msgstr ""
+
+#: ../picard/const.py:327
+msgid "Norwegian Bokmal"
+msgstr ""
+
+#: ../picard/const.py:328
+msgid "Dutch"
+msgstr ""
+
+#: ../picard/const.py:329
+msgid "Polish"
+msgstr ""
+
+#: ../picard/const.py:330
+msgid "Portuguese"
+msgstr ""
+
+#: ../picard/const.py:331
+msgid "Brazilian Portuguese"
+msgstr ""
+
+#: ../picard/const.py:332
+msgid "Romanian"
+msgstr ""
+
+#: ../picard/const.py:333
+msgid "Russian"
+msgstr ""
+
+#: ../picard/const.py:334
+msgid "Scots"
+msgstr ""
+
+#: ../picard/const.py:335
+msgid "Slovak"
+msgstr ""
+
+#: ../picard/const.py:336
+msgid "Slovenian"
+msgstr ""
+
+#: ../picard/const.py:337
+msgid "Swedish"
+msgstr ""
+
+#: ../picard/const.py:338
+msgid "Chinese"
+msgstr ""
+
+#: ../picard/file.py:475
+#, python-format
+msgid "No matching tracks for file %s"
+msgstr ""
+
+#: ../picard/file.py:492
+#, python-format
+msgid "No matching tracks above the threshold for file %s"
+msgstr ""
+
+#: ../picard/file.py:495
+#, python-format
+msgid "File %s identified!"
+msgstr "Skráin %s fundin!"
+
+#: ../picard/file.py:506
+#, fuzzy, python-format
+msgid "Looking up the PUID for file %s..."
+msgstr "Leita að PUID fyrir skrá %s ..."
+
+#: ../picard/file.py:511
+#, fuzzy, python-format
+msgid "Looking up the metadata for file %s..."
+msgstr "Leita upplýsinga um skrána %s ..."
+
+#: ../picard/puidmanager.py:58
+#, fuzzy
+msgid "Submitting PUIDs..."
+msgstr "Senda inn PUID"
+
+#: ../picard/puidmanager.py:64
+#, fuzzy, python-format
+msgid "PUIDs submission failed: %s"
+msgstr "PUID árekstrar í skránni %s!"
+
+#: ../picard/puidmanager.py:66
+#, fuzzy
+msgid "PUIDs successfully submitted!"
+msgstr "PUID sending tókst."
+
+#: ../picard/playlist.py:31
+msgid "M3U Playlist (*.m3u)"
+msgstr ""
+
+#: ../picard/playlist.py:32
+msgid "PLS Playlist (*.pls)"
+msgstr ""
+
+#: ../picard/playlist.py:33
+msgid "XSPF Playlist (*.xspf)"
+msgstr ""
+
+#: ../picard/tagger.py:476
 msgid "CD Lookup Error"
 msgstr ""
 
-#: ../picard/tagger.py:473
+#: ../picard/tagger.py:477
 #, python-format
 msgid ""
 "Error while reading CD:\n"
@@ -42,14 +1286,19 @@ msgid ""
 "%s"
 msgstr ""
 
-#: ../picard/ui/passworddialog.py:38
+#: ../picard/tagger.py:503
 #, python-format
-msgid ""
-"The server %s requires you to login. Please enter your username and password."
+msgid "Couldn't find PUID for file %s"
 msgstr ""
 
-#: ../picard/ui/ui_options_script.py:52
-msgid "Tagger Script"
+#: ../picard/musicdns/__init__.py:98
+#, fuzzy, python-format
+msgid "Looking up the fingerprint for file %s..."
+msgstr "Leita upplýsinga um skrána %s ..."
+
+#: ../picard/musicdns/__init__.py:117
+#, python-format
+msgid "Creating fingerprint for file %s..."
 msgstr ""
 
 #: ../picard/ui/cdlookup.py:31
@@ -57,110 +1306,153 @@ msgid "Score"
 msgstr ""
 
 #: ../picard/ui/cdlookup.py:31
+#: ../picard/ui/itemviews.py:82
+#: ../picard/util/tags.py:23
 msgid "Title"
 msgstr ""
 
-#: ../picard/ui/cdlookup.py:31 ../picard/ui/mainwindow.py:436
+#: ../picard/ui/cdlookup.py:31
+#: ../picard/ui/itemviews.py:84
+#: ../picard/ui/mainwindow.py:436
+#: ../picard/util/tags.py:22
 msgid "Artist"
 msgstr "Listamaður"
 
-#: ../picard/ui/ui_metadata.py:121
-msgid "Lookup"
-msgstr "Leita"
-
-#: ../picard/ui/ui_metadata.py:122
-msgid "Title:"
+#: ../picard/ui/coverartbox.py:47
+#: ../picard/ui/options/cover.py:29
+msgid "Cover Art"
 msgstr ""
 
-#: ../picard/ui/ui_metadata.py:123
-msgid "Date:"
+#: ../picard/ui/coverartbox.py:95
+msgid "Buy the album on Amazon"
 msgstr ""
 
-#: ../picard/ui/ui_metadata.py:124
-msgid "Artist:"
+#: ../picard/ui/filebrowser.py:38
+#: ../picard/ui/mainwindow.py:302
+msgid "&Refresh"
 msgstr ""
 
-#: ../picard/ui/ui_metadata.py:125
-msgid "Track:"
+#: ../picard/ui/filebrowser.py:41
+msgid "&Move Tagged Files Here"
 msgstr ""
 
-#: ../picard/ui/ui_metadata.py:126
-msgid "0000-00-00; "
+#: ../picard/ui/filebrowser.py:44
+msgid "Show &Hidden Files"
 msgstr ""
 
-#: ../picard/ui/ui_metadata.py:127 ../picard/ui/tageditor.py:225
-#: ../picard/ui/multitageditor.py:181
+#: ../picard/ui/itemviews.py:83
+msgid "Length"
+msgstr ""
+
+#: ../picard/ui/itemviews.py:327
+msgid "&Releases"
+msgstr ""
+
+#: ../picard/ui/itemviews.py:353
+msgid "&Plugins"
+msgstr ""
+
+#: ../picard/ui/itemviews.py:523
+msgid "Clusters"
+msgstr ""
+
+#: ../picard/ui/logview.py:29
+msgid "Log"
+msgstr ""
+
+#: ../picard/ui/puidsubmit.py:31
+#: ../picard/ui/options/plugins.py:80
+msgid "File"
+msgstr "Skrá"
+
+#: ../picard/ui/puidsubmit.py:31
+msgid "PUID"
+msgstr ""
+
+#: ../picard/ui/puidsubmit.py:31
+#: ../picard/ui/mainwindow.py:437
+msgid "Track"
+msgstr "Lag"
+
+#: ../picard/ui/puidsubmit.py:31
+msgid "Release"
+msgstr ""
+
+#: ../picard/ui/puidsubmit.py:31
+msgid "Release ID"
+msgstr ""
+
+#: ../picard/ui/tageditor.py:65
+#: ../picard/ui/ui_options_plugins.py:62
+msgid "Details"
+msgstr ""
+
+#: ../picard/ui/tageditor.py:70
+#: ../picard/ui/tageditor.py:241
+#, python-format
+msgid "%d file"
+msgid_plural "%d files"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../picard/ui/tageditor.py:124
+#, python-format
+msgid "(different across %d file)"
+msgid_plural "(different across %d files)"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../picard/ui/tageditor.py:127
+#, python-format
+msgid "(missing from %d file)"
+msgid_plural "(missing from %d files)"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../picard/ui/tageditor.py:210
+msgid "Filename:"
+msgstr ""
+
+#: ../picard/ui/tageditor.py:212
+msgid "Format:"
+msgstr ""
+
+#: ../picard/ui/tageditor.py:221
+msgid "Size:"
+msgstr ""
+
+#: ../picard/ui/tageditor.py:225
+#: ../picard/ui/ui_metadata.py:127
 msgid "Length:"
 msgstr ""
 
-#: ../picard/ui/ui_metadata.py:128
-msgid "Album:"
+#: ../picard/ui/tageditor.py:227
+msgid "Bitrate:"
 msgstr ""
 
-#: ../picard/ui/ui_passworddialog.py:78
-#, fuzzy
-msgid "Authentication required"
-msgstr "Unicode nauðsynlegt"
-
-#: ../picard/ui/ui_passworddialog.py:79 ../picard/ui/ui_options_proxy.py:83
-#: ../picard/ui/ui_options_general.py:113
-msgid "Username:"
+#: ../picard/ui/tageditor.py:229
+msgid "Sample rate:"
 msgstr ""
 
-#: ../picard/ui/ui_passworddialog.py:80 ../picard/ui/ui_options_proxy.py:82
-#: ../picard/ui/ui_options_general.py:112
-msgid "Password:"
+#: ../picard/ui/tageditor.py:231
+msgid "Bits per sample:"
 msgstr ""
 
-#: ../picard/ui/ui_passworddialog.py:81
-msgid "Save username and password"
+#: ../picard/ui/tageditor.py:234
+msgid "Mono"
 msgstr ""
 
-#: ../picard/ui/ui_options_folksonomy.py:114
-#: ../picard/ui/ui_options_folksonomy_tags.py:114
-msgid "Folksonomy Tags"
+#: ../picard/ui/tageditor.py:235
+msgid "Stereo"
 msgstr ""
 
-#: ../picard/ui/ui_options_folksonomy.py:115
-#: ../picard/ui/ui_options_folksonomy_tags.py:115
-msgid "Ignore tags:"
+#: ../picard/ui/tageditor.py:237
+msgid "Channels:"
 msgstr ""
 
-#: ../picard/ui/ui_options_folksonomy.py:116
-#: ../picard/ui/ui_options_folksonomy_tags.py:116
-msgid "Minimal tag usage:"
-msgstr ""
-
-#: ../picard/ui/ui_options_folksonomy.py:117
-#: ../picard/ui/ui_options_folksonomy_tags.py:117
-#: ../picard/ui/ui_options_matching.py:107
-#: ../picard/ui/ui_options_matching.py:108
-#: ../picard/ui/ui_options_matching.py:109
-#: ../picard/ui/ui_options_matching.py:113
-msgid " %"
-msgstr ""
-
-#: ../picard/ui/ui_options_folksonomy.py:118
-msgid "Maximum number of tags:"
-msgstr ""
-
-#: ../picard/ui/ui_options_folksonomy.py:119
-#: ../picard/ui/ui_options_folksonomy_tags.py:119
-msgid "Join multiple tags with:"
-msgstr ""
-
-#: ../picard/ui/ui_options_folksonomy.py:120
-#: ../picard/ui/ui_options_folksonomy_tags.py:120
-msgid " / "
-msgstr ""
-
-#: ../picard/ui/ui_options_folksonomy.py:121
-#: ../picard/ui/ui_options_folksonomy_tags.py:121
-msgid ", "
-msgstr ""
-
-#: ../picard/ui/ui_options_folksonomy_tags.py:118
-msgid "Maximal number of tags:"
+#: ../picard/ui/tagsfromfilenames.py:52
+#: ../picard/ui/tagsfromfilenames.py:96
+msgid "File Name"
 msgstr ""
 
 #: ../picard/ui/mainwindow.py:64
@@ -296,7 +1588,8 @@ msgstr "Leit"
 msgid "&CD Lookup..."
 msgstr ""
 
-#: ../picard/ui/mainwindow.py:272 ../picard/ui/mainwindow.py:273
+#: ../picard/ui/mainwindow.py:272
+#: ../picard/ui/mainwindow.py:273
 msgid "Lookup CD"
 msgstr ""
 
@@ -327,7 +1620,8 @@ msgstr ""
 msgid "&Lookup"
 msgstr ""
 
-#: ../picard/ui/mainwindow.py:291 ../picard/ui/mainwindow.py:292
+#: ../picard/ui/mainwindow.py:291
+#: ../picard/ui/mainwindow.py:292
 msgid "Lookup metadata"
 msgstr ""
 
@@ -340,10 +1634,6 @@ msgstr ""
 msgid "&Details..."
 msgstr ""
 
-#: ../picard/ui/mainwindow.py:302 ../picard/ui/filebrowser.py:38
-msgid "&Refresh"
-msgstr ""
-
 #: ../picard/ui/mainwindow.py:305
 msgid "Generate &Playlist..."
 msgstr ""
@@ -389,6 +1679,7 @@ msgid "&Tools"
 msgstr ""
 
 #: ../picard/ui/mainwindow.py:384
+#: ../picard/ui/util.py:33
 msgid "&Help"
 msgstr "&Hjálp"
 
@@ -401,13 +1692,10 @@ msgid "&Search Bar"
 msgstr ""
 
 #: ../picard/ui/mainwindow.py:435
+#: ../picard/util/tags.py:21
 msgid "Album"
 msgstr "Plata"
 
-#: ../picard/ui/mainwindow.py:437 ../picard/ui/puidsubmit.py:31
-msgid "Track"
-msgstr "Lag"
-
 #: ../picard/ui/mainwindow.py:476
 msgid "All Supported Formats"
 msgstr ""
@@ -422,37 +1710,291 @@ msgstr ""
 msgid "Playlist %s saved"
 msgstr ""
 
-#: ../picard/ui/mainwindow.py:638 ../picard/ui/mainwindow.py:647
+#: ../picard/ui/mainwindow.py:638
+#: ../picard/ui/mainwindow.py:647
 #, python-format
 msgid " (Error: %s)"
 msgstr ""
 
+#: ../picard/ui/ui_tageditor.py:115
+#: ../picard/ui/ui_options_plugins.py:59
+#: ../picard/ui/options/plugins.py:76
+msgid "Name"
+msgstr ""
+
+#: ../picard/ui/ui_tageditor.py:116
+msgid "Value"
+msgstr ""
+
+#: ../picard/ui/ui_tageditor.py:117
+msgid "&Add..."
+msgstr ""
+
+#: ../picard/ui/ui_tageditor.py:118
+msgid "&Edit..."
+msgstr ""
+
+#: ../picard/ui/ui_tageditor.py:119
+msgid "&Delete"
+msgstr ""
+
+#: ../picard/ui/ui_tageditor.py:120
+msgid "&Metadata"
+msgstr ""
+
+#: ../picard/ui/ui_tageditor.py:121
+msgid "A&rtwork"
+msgstr ""
+
+#: ../picard/ui/ui_tageditor.py:122
+msgid "&Info"
+msgstr ""
+
+#: ../picard/ui/passworddialog.py:38
+#, python-format
+msgid "The server %s requires you to login. Please enter your username and password."
+msgstr ""
+
+#: ../picard/ui/ui_cdlookup.py:60
+#: ../picard/ui/ui_options_cdlookup.py:47
+#: ../picard/ui/ui_options_cdlookup_win32.py:56
+#: ../picard/ui/options/cdlookup.py:35
+msgid "CD Lookup"
+msgstr "Geisladiskaleit"
+
+#: ../picard/ui/ui_cdlookup.py:61
+msgid "The following releases on MusicBrainz match the CD:"
+msgstr ""
+
+#: ../picard/ui/ui_cdlookup.py:62
+#: ../picard/ui/ui_puidsubmit.py:53
+msgid "OK"
+msgstr ""
+
+#: ../picard/ui/ui_cdlookup.py:63
+msgid "    Lookup manually    "
+msgstr ""
+
+#: ../picard/ui/ui_cdlookup.py:64
+#: ../picard/ui/ui_puidsubmit.py:54
+msgid "Cancel"
+msgstr "Hætta við"
+
+#: ../picard/ui/ui_passworddialog.py:78
+#, fuzzy
+msgid "Authentication required"
+msgstr "Unicode nauðsynlegt"
+
+#: ../picard/ui/ui_passworddialog.py:79
+#: ../picard/ui/ui_options_general.py:113
+#: ../picard/ui/ui_options_proxy.py:83
+msgid "Username:"
+msgstr ""
+
+#: ../picard/ui/ui_passworddialog.py:80
+#: ../picard/ui/ui_options_general.py:112
+#: ../picard/ui/ui_options_proxy.py:82
+msgid "Password:"
+msgstr ""
+
+#: ../picard/ui/ui_passworddialog.py:81
+msgid "Save username and password"
+msgstr ""
+
 #: ../picard/ui/ui_edittagdialog.py:44
 msgid "Edit Tag"
 msgstr ""
 
-#: ../picard/ui/ui_options_proxy.py:81
-msgid "Web Proxy"
-msgstr "Vefsel"
+#: ../picard/ui/ui_metadata.py:121
+msgid "Lookup"
+msgstr "Leita"
 
-#: ../picard/ui/ui_options_proxy.py:84 ../picard/ui/ui_options_general.py:109
-msgid "Port:"
+#: ../picard/ui/ui_metadata.py:122
+msgid "Title:"
 msgstr ""
 
-#: ../picard/ui/ui_options_proxy.py:85 ../picard/ui/ui_options_general.py:110
-msgid "Server address:"
+#: ../picard/ui/ui_metadata.py:123
+msgid "Date:"
 msgstr ""
 
-#: ../picard/ui/ui_tagsfromfilenames.py:56
-msgid "Convert File Names to Tags"
+#: ../picard/ui/ui_metadata.py:124
+msgid "Artist:"
 msgstr ""
 
-#: ../picard/ui/ui_tagsfromfilenames.py:57
-msgid "Replace underscores with spaces"
+#: ../picard/ui/ui_metadata.py:125
+msgid "Track:"
+msgstr ""
+
+#: ../picard/ui/ui_metadata.py:126
+msgid "0000-00-00; "
+msgstr ""
+
+#: ../picard/ui/ui_metadata.py:128
+msgid "Album:"
+msgstr ""
+
+#: ../picard/ui/ui_options.py:42
+msgid "Options"
+msgstr ""
+
+#: ../picard/ui/ui_options_cdlookup.py:48
+msgid "CD-ROM device to use for lookups:"
+msgstr ""
+
+#: ../picard/ui/ui_options_cdlookup_win32.py:57
+msgid "Default CD-ROM drive to use for lookups:"
+msgstr ""
+
+#: ../picard/ui/ui_options_cover.py:56
+msgid "Location"
+msgstr ""
+
+#: ../picard/ui/ui_options_cover.py:57
+msgid "Embed cover images into tags"
+msgstr ""
+
+#: ../picard/ui/ui_options_cover.py:58
+msgid "Save cover images as separate files"
+msgstr ""
+
+#: ../picard/ui/ui_options_cover.py:59
+msgid "Overwrite the file if it already exists"
+msgstr ""
+
+#: ../picard/ui/util.py:31
+msgid "&Ok"
+msgstr ""
+
+#: ../picard/ui/util.py:32
+#, fuzzy
+msgid "&Cancel"
+msgstr "Hætta við"
+
+#: ../picard/ui/ui_puidsubmit.py:52
+msgid "Submit PUIDs"
+msgstr "Senda inn PUID"
+
+#: ../picard/ui/ui_options_folksonomy.py:114
+#: ../picard/ui/options/folksonomy.py:29
+msgid "Folksonomy Tags"
+msgstr ""
+
+#: ../picard/ui/ui_options_folksonomy.py:115
+msgid "Ignore tags:"
+msgstr ""
+
+#: ../picard/ui/ui_options_folksonomy.py:116
+msgid "Minimal tag usage:"
+msgstr ""
+
+#: ../picard/ui/ui_options_folksonomy.py:117
+#: ../picard/ui/ui_options_matching.py:107
+#: ../picard/ui/ui_options_matching.py:108
+#: ../picard/ui/ui_options_matching.py:109
+#: ../picard/ui/ui_options_matching.py:113
+msgid " %"
+msgstr ""
+
+#: ../picard/ui/ui_options_folksonomy.py:118
+msgid "Maximum number of tags:"
+msgstr ""
+
+#: ../picard/ui/ui_options_folksonomy.py:119
+msgid "Join multiple tags with:"
+msgstr ""
+
+#: ../picard/ui/ui_options_folksonomy.py:120
+msgid " / "
+msgstr ""
+
+#: ../picard/ui/ui_options_folksonomy.py:121
+msgid ", "
+msgstr ""
+
+#: ../picard/ui/ui_options_interface.py:50
+msgid "Miscellaneous"
+msgstr ""
+
+#: ../picard/ui/ui_options_interface.py:51
+msgid "Show text labels under icons"
+msgstr ""
+
+#: ../picard/ui/ui_options_interface.py:52
+msgid "Allow selection of multiple directories"
+msgstr ""
+
+#: ../picard/ui/ui_options_interface.py:53
+msgid "Use advanced query syntax"
+msgstr ""
+
+#: ../picard/ui/ui_options_interface.py:54
+#, fuzzy
+msgid "User interface language:"
+msgstr "Tungumál viðmóts"
+
+#: ../picard/ui/ui_options_naming.py:165
+msgid "Rename Files"
+msgstr ""
+
+#: ../picard/ui/ui_options_naming.py:166
+msgid "Replace Windows-incompatible characters"
+msgstr ""
+
+#: ../picard/ui/ui_options_naming.py:167
+msgid "Replace non-ASCII characters"
+msgstr ""
+
+#: ../picard/ui/ui_options_naming.py:168
+#: ../picard/ui/ui_options_naming.py:169
+#: ../picard/ui/ui_options_metadata.py:109
+#: ../picard/ui/ui_options_metadata.py:110
+msgid "Default"
+msgstr "Sjálfgefið"
+
+#: ../picard/ui/ui_options_naming.py:170
+#: ../picard/ui/options/naming.py:90
+msgid "Multiple artist file naming format:"
+msgstr ""
+
+#: ../picard/ui/ui_options_naming.py:171
+#: ../picard/ui/options/naming.py:86
+msgid "File naming format:"
+msgstr ""
+
+#: ../picard/ui/ui_options_naming.py:172
+msgid "Move Files"
+msgstr ""
+
+#: ../picard/ui/ui_options_naming.py:173
+msgid "Move tagged files to this directory:"
+msgstr ""
+
+#: ../picard/ui/ui_options_naming.py:174
+msgid "Browse..."
+msgstr ""
+
+#: ../picard/ui/ui_options_naming.py:175
+msgid "Move additional files:"
+msgstr ""
+
+#: ../picard/ui/ui_options_naming.py:176
+msgid "Delete empty directories"
+msgstr ""
+
+#: ../picard/ui/ui_options_naming.py:177
+msgid "Example"
+msgstr ""
+
+#: ../picard/ui/ui_options_naming.py:178
+msgid "File name:"
+msgstr ""
+
+#: ../picard/ui/ui_options_naming.py:179
+msgid "Multiple artist file name:"
 msgstr ""
 
-#: ../picard/ui/ui_tagsfromfilenames.py:58
 #: ../picard/ui/ui_options_naming.py:180
+#: ../picard/ui/ui_tagsfromfilenames.py:58
 msgid "&Preview"
 msgstr ""
 
@@ -460,11 +2002,22 @@ msgstr ""
 msgid "MusicBrainz Server"
 msgstr ""
 
+#: ../picard/ui/ui_options_general.py:109
+#: ../picard/ui/ui_options_proxy.py:84
+msgid "Port:"
+msgstr ""
+
+#: ../picard/ui/ui_options_general.py:110
+#: ../picard/ui/ui_options_proxy.py:85
+msgid "Server address:"
+msgstr ""
+
 #: ../picard/ui/ui_options_general.py:111
 msgid "Account Information"
 msgstr ""
 
 #: ../picard/ui/ui_options_general.py:114
+#: ../picard/ui/options/general.py:29
 msgid "General"
 msgstr "Almennt"
 
@@ -472,34 +2025,6 @@ msgstr "Almennt"
 msgid "Automatically scan all new files"
 msgstr ""
 
-#: ../picard/ui/ui_options_interface.py:46
-msgid "Miscellaneous"
-msgstr ""
-
-#: ../picard/ui/ui_options_interface.py:47
-msgid "Show text labels under icons"
-msgstr ""
-
-#: ../picard/ui/ui_options_interface.py:48
-msgid "Allow selection of multiple directories"
-msgstr ""
-
-#: ../picard/ui/ui_options_interface.py:49
-msgid "Use advanced query syntax"
-msgstr ""
-
-#: ../picard/ui/itemviews.py:327
-msgid "&Releases"
-msgstr ""
-
-#: ../picard/ui/itemviews.py:353
-msgid "&Plugins"
-msgstr ""
-
-#: ../picard/ui/itemviews.py:523
-msgid "Clusters"
-msgstr ""
-
 #: ../picard/ui/ui_options_matching.py:105
 msgid "Thresholds"
 msgstr ""
@@ -520,6 +2045,68 @@ msgstr ""
 msgid "Minimal similarity for PUID lookups:"
 msgstr ""
 
+#: ../picard/ui/ui_options_metadata.py:100
+#: ../picard/ui/options/metadata.py:31
+msgid "Metadata"
+msgstr ""
+
+#: ../picard/ui/ui_options_metadata.py:101
+msgid "Translate foreign artist names to English where possible"
+msgstr ""
+
+#: ../picard/ui/ui_options_metadata.py:102
+msgid "Use release relationships"
+msgstr ""
+
+#: ../picard/ui/ui_options_metadata.py:103
+msgid "Use track relationships"
+msgstr ""
+
+#: ../picard/ui/ui_options_metadata.py:104
+msgid "Use folksonomy tags as genre"
+msgstr ""
+
+#: ../picard/ui/ui_options_metadata.py:105
+#, fuzzy
+msgid "Preferred release country:"
+msgstr "Útgáfudagur"
+
+#: ../picard/ui/ui_options_metadata.py:106
+msgid "Custom Fields"
+msgstr ""
+
+#: ../picard/ui/ui_options_metadata.py:107
+msgid "Various artists:"
+msgstr ""
+
+#: ../picard/ui/ui_options_metadata.py:108
+msgid "Non-album tracks:"
+msgstr ""
+
+#: ../picard/ui/ui_options_plugins.py:58
+#: ../picard/ui/options/plugins.py:30
+msgid "Plugins"
+msgstr ""
+
+#: ../picard/ui/ui_options_plugins.py:60
+#: ../picard/ui/options/plugins.py:79
+msgid "Author"
+msgstr ""
+
+#: ../picard/ui/ui_options_plugins.py:61
+#: ../picard/util/tags.py:36
+msgid "Version"
+msgstr ""
+
+#: ../picard/ui/ui_options_proxy.py:81
+#: ../picard/ui/options/proxy.py:28
+msgid "Web Proxy"
+msgstr "Vefsel"
+
+#: ../picard/ui/ui_options_script.py:52
+msgid "Tagger Script"
+msgstr ""
+
 #: ../picard/ui/ui_options_tags.py:105
 msgid "Common"
 msgstr ""
@@ -572,328 +2159,23 @@ msgstr ""
 msgid "Remove APEv2 tags from MP3 files"
 msgstr ""
 
-#: ../picard/ui/ui_options_cdlookup_win32.py:56 ../picard/ui/ui_cdlookup.py:60
-#: ../picard/ui/ui_options_cdlookup.py:47
-msgid "CD Lookup"
-msgstr "Geisladiskaleit"
-
-#: ../picard/ui/ui_options_cdlookup_win32.py:57
-msgid "Default CD-ROM drive to use for lookups:"
+#: ../picard/ui/ui_tagsfromfilenames.py:56
+msgid "Convert File Names to Tags"
 msgstr ""
 
-#: ../picard/ui/tageditor.py:65 ../picard/ui/ui_options_plugins.py:62
-#: ../picard/ui/multitageditor.py:37
-msgid "Details"
+#: ../picard/ui/ui_tagsfromfilenames.py:57
+msgid "Replace underscores with spaces"
 msgstr ""
 
-#: ../picard/ui/tageditor.py:70 ../picard/ui/tageditor.py:241
-#: ../picard/ui/multitageditor.py:42 ../picard/ui/multitageditor.py:197
-#, python-format
-msgid "%d file"
-msgid_plural "%d files"
-msgstr[0] ""
-msgstr[1] ""
-
-#: ../picard/ui/tageditor.py:124 ../picard/ui/multitageditor.py:95
-#, python-format
-msgid "(different across %d file)"
-msgid_plural "(different across %d files)"
-msgstr[0] ""
-msgstr[1] ""
-
-#: ../picard/ui/tageditor.py:127 ../picard/ui/multitageditor.py:98
-#, python-format
-msgid "(missing from %d file)"
-msgid_plural "(missing from %d files)"
-msgstr[0] ""
-msgstr[1] ""
-
-#: ../picard/ui/tageditor.py:210 ../picard/ui/multitageditor.py:166
-msgid "Filename:"
-msgstr ""
-
-#: ../picard/ui/tageditor.py:212 ../picard/ui/multitageditor.py:168
-msgid "Format:"
-msgstr ""
-
-#: ../picard/ui/tageditor.py:221 ../picard/ui/multitageditor.py:177
-msgid "Size:"
-msgstr ""
-
-#: ../picard/ui/tageditor.py:227 ../picard/ui/multitageditor.py:183
-msgid "Bitrate:"
-msgstr ""
-
-#: ../picard/ui/tageditor.py:229 ../picard/ui/multitageditor.py:185
-msgid "Sample rate:"
-msgstr ""
-
-#: ../picard/ui/tageditor.py:231 ../picard/ui/multitageditor.py:187
-msgid "Bits per sample:"
-msgstr ""
-
-#: ../picard/ui/tageditor.py:234 ../picard/ui/multitageditor.py:190
-msgid "Mono"
-msgstr ""
-
-#: ../picard/ui/tageditor.py:235 ../picard/ui/multitageditor.py:191
-msgid "Stereo"
-msgstr ""
-
-#: ../picard/ui/tageditor.py:237 ../picard/ui/multitageditor.py:193
-msgid "Channels:"
-msgstr ""
-
-#: ../picard/ui/ui_tageditor.py:115 ../picard/ui/ui_multitageditor.py:55
-#: ../picard/ui/ui_options_plugins.py:59 ../picard/ui/options/plugins.py:76
-msgid "Name"
-msgstr ""
-
-#: ../picard/ui/ui_tageditor.py:116 ../picard/ui/ui_multitageditor.py:56
-msgid "Value"
-msgstr ""
-
-#: ../picard/ui/ui_tageditor.py:117 ../picard/ui/ui_multitageditor.py:57
-msgid "&Add..."
-msgstr ""
-
-#: ../picard/ui/ui_tageditor.py:118
-msgid "&Edit..."
-msgstr ""
-
-#: ../picard/ui/ui_tageditor.py:119
-msgid "&Delete"
-msgstr ""
-
-#: ../picard/ui/ui_tageditor.py:120
-msgid "&Metadata"
-msgstr ""
-
-#: ../picard/ui/ui_tageditor.py:121
-msgid "A&rtwork"
-msgstr ""
-
-#: ../picard/ui/ui_tageditor.py:122
-msgid "&Info"
-msgstr ""
-
-#: ../picard/ui/coverartbox.py:47
-msgid "Cover Art"
-msgstr ""
-
-#: ../picard/ui/coverartbox.py:95
-msgid "Buy the album on Amazon"
-msgstr ""
-
-#: ../picard/ui/ui_puidsubmit.py:52
-msgid "Submit PUIDs"
-msgstr "Senda inn PUID"
-
-#: ../picard/ui/ui_puidsubmit.py:53 ../picard/ui/ui_cdlookup.py:62
-msgid "OK"
-msgstr ""
-
-#: ../picard/ui/ui_puidsubmit.py:54 ../picard/ui/ui_cdlookup.py:64
-msgid "Cancel"
-msgstr "Hætta við"
-
-#: ../picard/ui/puidsubmit.py:31 ../picard/ui/options/plugins.py:80
-msgid "File"
-msgstr "Skrá"
-
-#: ../picard/ui/puidsubmit.py:31
-msgid "PUID"
-msgstr ""
-
-#: ../picard/ui/puidsubmit.py:31
-msgid "Release"
-msgstr ""
-
-#: ../picard/ui/puidsubmit.py:31
-msgid "Release ID"
-msgstr ""
-
-#: ../picard/ui/filebrowser.py:41
-msgid "&Move Tagged Files Here"
-msgstr ""
-
-#: ../picard/ui/filebrowser.py:44
-msgid "Show &Hidden Files"
-msgstr ""
-
-#: ../picard/ui/ui_cdlookup.py:61
-msgid "The following releases on MusicBrainz match the CD:"
-msgstr ""
-
-#: ../picard/ui/ui_cdlookup.py:63
-msgid "    Lookup manually    "
-msgstr ""
-
-#: ../picard/ui/ui_options.py:42
-msgid "Options"
-msgstr ""
-
-#: ../picard/ui/tagsfromfilenames.py:52 ../picard/ui/tagsfromfilenames.py:96
-msgid "File Name"
-msgstr ""
-
-#: ../picard/ui/ui_options_cover.py:56
-msgid "Location"
-msgstr ""
-
-#: ../picard/ui/ui_options_cover.py:57
-msgid "Embed cover images into tags"
-msgstr ""
-
-#: ../picard/ui/ui_options_cover.py:58
-msgid "Save cover images as separate files"
-msgstr ""
-
-#: ../picard/ui/ui_options_cover.py:59
-msgid "Overwrite the file if it already exists"
-msgstr ""
-
-#: ../picard/ui/ui_options_metadata.py:100
-msgid "Metadata"
-msgstr ""
-
-#: ../picard/ui/ui_options_metadata.py:101
-msgid "Translate foreign artist names to English where possible"
-msgstr ""
-
-#: ../picard/ui/ui_options_metadata.py:102
-msgid "Use release relationships"
-msgstr ""
-
-#: ../picard/ui/ui_options_metadata.py:103
-msgid "Use track relationships"
-msgstr ""
-
-#: ../picard/ui/ui_options_metadata.py:104
-msgid "Use folksonomy tags as genre"
-msgstr ""
-
-#: ../picard/ui/ui_options_metadata.py:105
-msgid "Preferred release country:"
-msgstr ""
-
-#: ../picard/ui/ui_options_metadata.py:106
-msgid "Custom Fields"
-msgstr ""
-
-#: ../picard/ui/ui_options_metadata.py:107
-msgid "Various artists:"
-msgstr ""
-
-#: ../picard/ui/ui_options_metadata.py:108
-msgid "Non-album tracks:"
-msgstr ""
-
-#: ../picard/ui/ui_options_metadata.py:109
-#: ../picard/ui/ui_options_metadata.py:110
-#: ../picard/ui/ui_options_naming.py:168 ../picard/ui/ui_options_naming.py:169
-msgid "Default"
-msgstr "Sjálfgefið"
-
-#: ../picard/ui/ui_multitageditor.py:58
-msgid "Delete"
-msgstr ""
-
-#: ../picard/ui/logview.py:29
-msgid "Log"
-msgstr ""
-
-#: ../picard/ui/ui_options_plugins.py:58
-msgid "Plugins"
-msgstr ""
-
-#: ../picard/ui/ui_options_plugins.py:60 ../picard/ui/options/plugins.py:79
-msgid "Author"
-msgstr ""
-
-#: ../picard/ui/ui_options_plugins.py:61
-msgid "Version"
-msgstr ""
-
-#: ../picard/ui/ui_options_naming.py:165
-msgid "Rename Files"
-msgstr ""
-
-#: ../picard/ui/ui_options_naming.py:166
-msgid "Replace Windows-incompatible characters"
-msgstr ""
-
-#: ../picard/ui/ui_options_naming.py:167
-msgid "Replace non-ASCII characters"
-msgstr ""
-
-#: ../picard/ui/ui_options_naming.py:170 ../picard/ui/options/naming.py:90
-msgid "Multiple artist file naming format:"
-msgstr ""
-
-#: ../picard/ui/ui_options_naming.py:171 ../picard/ui/options/naming.py:86
-msgid "File naming format:"
-msgstr ""
-
-#: ../picard/ui/ui_options_naming.py:172
-msgid "Move Files"
-msgstr ""
-
-#: ../picard/ui/ui_options_naming.py:173
-msgid "Move tagged files to this directory:"
-msgstr ""
-
-#: ../picard/ui/ui_options_naming.py:174
-msgid "Browse..."
-msgstr ""
-
-#: ../picard/ui/ui_options_naming.py:175
-msgid "Move additional files:"
-msgstr ""
-
-#: ../picard/ui/ui_options_naming.py:176
-msgid "Delete empty directories"
-msgstr ""
-
-#: ../picard/ui/ui_options_naming.py:177
-msgid "Example"
-msgstr ""
-
-#: ../picard/ui/ui_options_naming.py:178
-msgid "File name:"
-msgstr ""
-
-#: ../picard/ui/ui_options_naming.py:179
-msgid "Multiple artist file name:"
-msgstr ""
-
-#: ../picard/ui/ui_options_cdlookup.py:48
-msgid "CD-ROM device to use for lookups:"
-msgstr ""
-
-#: ../picard/ui/options/scripting.py:84 ../picard/ui/options/naming.py:86
-#: ../picard/ui/options/naming.py:90 ../picard/ui/options/naming.py:93
-#: ../picard/ui/options/naming.py:95
-msgid "Script Error"
-msgstr ""
+#: ../picard/ui/options/about.py:29
+msgid "About"
+msgstr "Um"
 
 #. Replace this with your name to have it appear in the "About" dialog.
 #: ../picard/ui/options/about.py:48
 msgid "translator-credits"
 msgstr ""
 "Launchpad Contributions:\n"
-"  Stefán Sigurjónsson <https://launchpad.net/~stefans-mmedia>\n"
-"\n"
-"Launchpad Contributions:\n"
-"  Stefán Sigurjónsson https://launchpad.net/~stefans-mmedia\n"
-"\n"
-"Launchpad Contributions:\n"
-"  Stefán Sigurjónsson https://launchpad.net/~stefans-mmedia\n"
-"\n"
-"Launchpad Contributions:\n"
-"  Stefán Sigurjónsson https://launchpad.net/~stefans-mmedia\n"
-"\n"
-"Launchpad Contributions:\n"
 "  Stefán Sigurjónsson https://launchpad.net/~stefans-mmedia"
 
 #. Replace LANG with language you are translatig to.
@@ -905,22 +2187,58 @@ msgstr ""
 #: ../picard/ui/options/about.py:55
 #, python-format
 msgid ""
-"<p align=\"center\"><span style=\"font-size:15px;font-weight:bold;"
-"\">MusicBrainz Picard</span><br/>\n"
+"<p align=\"center\"><span style=\"font-size:15px;font-weight:bold;\">MusicBrainz Picard</span><br/>\n"
 "Version %(version)s</p>\n"
 "<p align=\"center\"><strong>Supported formats</strong><br/>%(formats)s</p>\n"
 "<p align=\"center\"><strong>Please donate</strong><br/>\n"
-"Thank you for using Picard. Picard relies on the MusicBrainz database, which "
-"is operated by the MetaBrainz Foundation with the help of thousands of "
-"volunteers. If you like this application please consider donating to the "
-"MetaBrainz Foundation to keep the service running.</p>\n"
-"<p align=\"center\"><a href=\"http://metabrainz.org/donate/index.html"
-"\">Donate now!</a></p>\n"
+"Thank you for using Picard. Picard relies on the MusicBrainz database, which is operated by the MetaBrainz Foundation with the help of thousands of volunteers. If you like this application please consider donating to the MetaBrainz Foundation to keep the service running.</p>\n"
+"<p align=\"center\"><a href=\"http://metabrainz.org/donate/index.html\">Donate now!</a></p>\n"
 "<p align=\"center\"><strong>Credits</strong><br/>\n"
-"<small>Copyright © 2004-2008 Robert Kaye, Lukáš Lalinský and others%"
-"(translator-credits)s</small></p>\n"
-"<p align=\"center\"><a href=\"http://musicbrainz.org/doc/PicardTagger"
-"\">http://musicbrainz.org/doc/PicardTagger</a></p>\n"
+"<small>Copyright © 2004-2008 Robert Kaye, Lukáš Lalinský and others%(translator-credits)s</small></p>\n"
+"<p align=\"center\"><a href=\"http://musicbrainz.org/doc/PicardTagger\">http://musicbrainz.org/doc/PicardTagger</a></p>\n"
+msgstr ""
+
+#: ../picard/ui/options/advanced.py:26
+msgid "Advanced"
+msgstr ""
+
+#: ../picard/ui/options/interface.py:31
+#, fuzzy
+msgid "User Interface"
+msgstr "Tungumál viðmóts"
+
+#: ../picard/ui/options/interface.py:47
+msgid "System default"
+msgstr "Sjálfgefnar kerfisstillingar"
+
+#: ../picard/ui/options/interface.py:71
+#, fuzzy
+msgid "Language changed"
+msgstr "Tungumál"
+
+#: ../picard/ui/options/interface.py:71
+msgid "You have changed the interface language. You have to restart Picard in order for the change to take effect."
+msgstr ""
+
+#: ../picard/ui/options/matching.py:29
+msgid "Matching"
+msgstr ""
+
+#: ../picard/ui/options/metadata.py:52
+msgid "None"
+msgstr ""
+
+#: ../picard/ui/options/naming.py:33
+#, fuzzy
+msgid "File Naming"
+msgstr "Endurskíring"
+
+#: ../picard/ui/options/naming.py:86
+#: ../picard/ui/options/naming.py:90
+#: ../picard/ui/options/naming.py:93
+#: ../picard/ui/options/naming.py:95
+#: ../picard/ui/options/scripting.py:84
+msgid "Script Error"
 msgstr ""
 
 #: ../picard/ui/options/naming.py:93
@@ -939,6 +2257,254 @@ msgstr ""
 msgid "The location to move files to must not be empty."
 msgstr ""
 
+#: ../picard/ui/options/scripting.py:63
+msgid "Scripting"
+msgstr ""
+
+#: ../picard/ui/options/tags.py:29
+msgid "Tags"
+msgstr "Tög"
+
+#: ../picard/util/tags.py:24
+#, fuzzy
+msgid "Date"
+msgstr "Síðar"
+
+#: ../picard/util/tags.py:25
+#, fuzzy
+msgid "Album Artist"
+msgstr "Listamaður"
+
+#: ../picard/util/tags.py:26
+#, fuzzy
+msgid "Track Number"
+msgstr "Lag Nr."
+
+#: ../picard/util/tags.py:27
+#, fuzzy
+msgid "Total Tracks"
+msgstr "Lög"
+
+#: ../picard/util/tags.py:28
+#, fuzzy
+msgid "Disc Number"
+msgstr "Númer lags"
+
+#: ../picard/util/tags.py:29
+msgid "Total Discs"
+msgstr ""
+
+#: ../picard/util/tags.py:30
+#, fuzzy
+msgid "Album Artist Sort Order"
+msgstr "Röðunarnafn listamanns plötu"
+
+#: ../picard/util/tags.py:31
+msgid "Artist Sort Order"
+msgstr ""
+
+#: ../picard/util/tags.py:32
+msgid "Title Sort Order"
+msgstr ""
+
+#: ../picard/util/tags.py:33
+#, fuzzy
+msgid "Album Sort Order"
+msgstr "Plötu klasar"
+
+#: ../picard/util/tags.py:34
+msgid "ASIN"
+msgstr ""
+
+#: ../picard/util/tags.py:35
+msgid "Grouping"
+msgstr ""
+
+#: ../picard/util/tags.py:37
+msgid "ISRC"
+msgstr ""
+
+#: ../picard/util/tags.py:38
+msgid "Mood"
+msgstr ""
+
+#: ../picard/util/tags.py:39
+msgid "BPM"
+msgstr ""
+
+#: ../picard/util/tags.py:40
+#, fuzzy
+msgid "Copyright"
+msgstr "Afrita"
+
+#: ../picard/util/tags.py:41
+#, fuzzy
+msgid "Composer"
+msgstr "Loka"
+
+#: ../picard/util/tags.py:42
+msgid "Conductor"
+msgstr ""
+
+#: ../picard/util/tags.py:43
+msgid "Lyricist"
+msgstr ""
+
+#: ../picard/util/tags.py:44
+msgid "Arranger"
+msgstr ""
+
+#: ../picard/util/tags.py:45
+msgid "Producer"
+msgstr ""
+
+#: ../picard/util/tags.py:46
+msgid "Engineer"
+msgstr ""
+
+#: ../picard/util/tags.py:47
+msgid "Subtitle"
+msgstr ""
+
+#: ../picard/util/tags.py:48
+#, fuzzy
+msgid "Disc Subtitle"
+msgstr "Númer lags"
+
+#: ../picard/util/tags.py:49
+msgid "Remixer"
+msgstr ""
+
+#: ../picard/util/tags.py:50
+#, fuzzy
+msgid "MusicBrainz Track Id"
+msgstr "MusicBrainz aðgangur"
+
+#: ../picard/util/tags.py:51
+#, fuzzy
+msgid "MusicBrainz Release Id"
+msgstr "MusicBrainz Upplýsingar"
+
+#: ../picard/util/tags.py:52
+#, fuzzy
+msgid "MusicBrainz Artist Id"
+msgstr "MusicBrainz Upplýsingar"
+
+#: ../picard/util/tags.py:53
+#, fuzzy
+msgid "MusicBrainz Release Artist Id"
+msgstr "MusicBrainz þjónn til að nota"
+
+#: ../picard/util/tags.py:54
+#, fuzzy
+msgid "MusicBrainz TRM Id"
+msgstr "MusicBrainz Upplýsingar"
+
+#: ../picard/util/tags.py:55
+#, fuzzy
+msgid "MusicBrainz Disc Id"
+msgstr "MusicBrainz Upplýsingar"
+
+#: ../picard/util/tags.py:56
+#, fuzzy
+msgid "MusicBrainz Sort Name"
+msgstr "MusicBrainz Upplýsingar"
+
+#: ../picard/util/tags.py:57
+msgid "MusicIP PUID"
+msgstr ""
+
+#: ../picard/util/tags.py:58
+#, fuzzy
+msgid "MusicIP Fingerprint"
+msgstr "Hljóðfingrafar"
+
+#: ../picard/util/tags.py:59
+msgid "Disc Id"
+msgstr ""
+
+#: ../picard/util/tags.py:60
+msgid "Website"
+msgstr ""
+
+#: ../picard/util/tags.py:61
+msgid "Compilation"
+msgstr ""
+
+#: ../picard/util/tags.py:62
+msgid "Comment"
+msgstr ""
+
+#: ../picard/util/tags.py:63
+#, fuzzy
+msgid "Genre"
+msgstr "Almennt"
+
+#: ../picard/util/tags.py:64
+msgid "Encoded By"
+msgstr ""
+
+#: ../picard/util/tags.py:65
+msgid "Performer"
+msgstr ""
+
+#: ../picard/util/tags.py:66
+#, fuzzy
+msgid "Release Type"
+msgstr "Útgáfudagur"
+
+#: ../picard/util/tags.py:67
+#, fuzzy
+msgid "Release Status"
+msgstr "Útgáfudagur"
+
+#: ../picard/util/tags.py:68
+#, fuzzy
+msgid "Release Country"
+msgstr "Útgáfudagur"
+
+#: ../picard/util/tags.py:69
+msgid "Record Label"
+msgstr ""
+
+#: ../picard/util/tags.py:70
+msgid "Barcode"
+msgstr ""
+
+#: ../picard/util/tags.py:71
+#, fuzzy
+msgid "Catalog Number"
+msgstr "Númer lags"
+
+#: ../picard/util/tags.py:72
+msgid "Format"
+msgstr ""
+
+#: ../picard/util/tags.py:73
+msgid "DJ-Mixer"
+msgstr ""
+
+#: ../picard/util/tags.py:74
+#, fuzzy
+msgid "Media"
+msgstr "Þínar Upplýsingar"
+
+#: ../picard/util/tags.py:75
+msgid "Lyrics"
+msgstr ""
+
+#: ../picard/util/tags.py:76
+msgid "Mixer"
+msgstr ""
+
+#: ../picard/util/tags.py:77
+msgid "Language"
+msgstr "Tungumál"
+
+#: ../picard/util/tags.py:78
+msgid "Script"
+msgstr ""
+
 #: ../picard/util/webbrowser2.py:84
 msgid "Web Browser Error"
 msgstr ""
@@ -951,66 +2517,63 @@ msgid ""
 "%s"
 msgstr ""
 
-#~ msgid "File %s identified!"
-#~ msgstr "Skráin %s fundin!"
+#, fuzzy
+#~ msgid "Anal&yze"
+#~ msgstr "Skoða"
 
-#~ msgid "About"
-#~ msgstr "Um"
+#, fuzzy
+#~ msgid "Generate &Cuesheet..."
+#~ msgstr "Búa til bútaskrá"
 
-#~ msgid "Tags"
-#~ msgstr "Tög"
+#, fuzzy
+#~ msgid "Auto Tag"
+#~ msgstr "Um tagarann"
 
+#, fuzzy
+#~ msgid "Edit &Tags..."
+#~ msgstr "Breyta stillingum..."
 #~ msgid "Automatically analyze all new files"
 #~ msgstr "Skoða allar nýjar skrár"
 
+#, fuzzy
+#~ msgid "Album artist:"
+#~ msgstr "Listamaður"
+
+#, fuzzy
+#~ msgid "A&dd Directory..."
+#~ msgstr "Bæta við &möppu...\tCtrl+D"
 #~ msgid "Are You Sure?"
 #~ msgstr "Ertu viss?"
-
 #~ msgid "Add &Files...\tCtrl+O"
 #~ msgstr "Bæta við &skrá...\tCtrl+O"
-
 #~ msgid "Add &Directory...\tCtrl+D"
 #~ msgstr "Bæta við &möppu...\tCtrl+D"
-
 #~ msgid "&Save Files\tCtrl+S"
 #~ msgstr "&Vista skrár\tCtrl+S"
-
 #~ msgid "C&opy\tCtrl+C"
 #~ msgstr "&Afrita\tCtrl+C"
-
 #~ msgid "Help"
 #~ msgstr "Hjálp"
-
 #~ msgid "Preferences"
 #~ msgstr "Stillingar"
-
 #~ msgid "Error while saving cuesheet %s."
 #~ msgstr "Villa við að vista bútaskrá %s"
-
 #~ msgid "Cuesheet %s saved."
 #~ msgstr "Bútaskrá %s vistuð"
-
 #~ msgid "Time"
 #~ msgstr "Tími"
-
 #~ msgid "Albums"
 #~ msgstr "Plötur"
-
 #~ msgid "Force Save"
 #~ msgstr "Þvinga vistun"
-
 #~ msgid "Buy"
 #~ msgstr "Kaupa"
-
 #~ msgid "Welcome to Picard!"
 #~ msgstr "Velkomin í Picard!"
-
 #~ msgid "Track Num"
 #~ msgstr "Lag Nr."
-
 #~ msgid "PUID Collision"
 #~ msgstr "PUID Árekstur"
-
 #~ msgid ""
 #~ "Version %s\n"
 #~ "\n"
@@ -1037,121 +2600,76 @@ msgstr ""
 #~ "stuðnings frá Helix samfélaginu.\n"
 #~ "\n"
 #~ "Studdar skráartegundir: %s"
-
-#~ msgid "Colors"
-#~ msgstr "Litir"
-
 #~ msgid "Font color"
 #~ msgstr "Textalitur"
-
 #~ msgid "Directories"
 #~ msgstr "Möppur"
-
 #~ msgid "Watch for new files"
 #~ msgstr "Líta eftir nýjum skrám"
-
 #~ msgid "Watch this directory for new audio files"
 #~ msgstr "Líta eftir nýjum skrám í þessari möppu"
-
 #~ msgid "Encodings"
 #~ msgstr "Kóðanir"
-
 #~ msgid "all languages"
 #~ msgstr "öll tungumál"
-
 #~ msgid "percent similar."
 #~ msgstr "prósent lík."
-
 #~ msgid "Load recently used albums on startup"
 #~ msgstr "Hlaða inn nýlega notðum plötum við ræsingu"
-
-#~ msgid "Language"
-#~ msgstr "Tungumál"
-
-#~ msgid "System default"
-#~ msgstr "Sjálfgefnar kerfisstillingar"
-
 #~ msgid "Allowed filename characters"
 #~ msgstr "Leyfilegir stafir í skráarnafni"
-
 #~ msgid "Use Windows-safe file names"
 #~ msgstr "Nota Windows-örugg skráarnöfn"
-
 #~ msgid "Number of tracks on the album"
 #~ msgstr "Fjöldi laga á plötunni"
-
 #~ msgid "Track name"
 #~ msgstr "Nafn lags"
-
 #~ msgid "Zero padded track number"
 #~ msgstr "Núllfóðrað númer lags"
-
 #~ msgid "File format (e.g. mp3, ogg, wav)"
 #~ msgstr "Skráartegund (t.d. mp3, ogg eða wav)"
-
 #~ msgid "Album type (album, single, EP, etc.)"
 #~ msgstr "Tegund plötu (breiðskífa, smáskífa, þröngskífa)"
-
 #~ msgid "Album Status (official, promo, etc.)"
 #~ msgstr "Staða plötu (opinber útgáfa, kynniseintak, o.s.frv.)"
-
 #~ msgid "Album release month"
 #~ msgstr "Útgáfumánuður plötu"
-
 #~ msgid "Album release day"
 #~ msgstr "Útgáfudagur plötu"
-
 #~ msgid "Album release year"
 #~ msgstr "Útgáfuár plötu"
-
 #~ msgid "Make it so!"
 #~ msgstr "Verði svo!"
-
 #~ msgid "Use proxy server to access the Internet"
 #~ msgstr "Nota vefsel (proxy) til að tengjast netinu"
-
 #~ msgid "Proxy server to use"
 #~ msgstr "Vefsel til að nota"
-
 #~ msgid "Proxy port"
 #~ msgstr "Gátt vefsels"
-
 #~ msgid "ID3v2.4 only"
 #~ msgstr "ID3v2.4 eingöngu"
-
 #~ msgid "Save track/album"
 #~ msgstr "Vista lag/plötu"
-
 #~ msgid "Artists"
 #~ msgstr "Listamenn"
-
 #~ msgid "New files (drag files to tag here)"
 #~ msgstr "Nýjar skrár (dragið skrár hingað til tögunar)"
-
 #~ msgid "updating album information"
 #~ msgstr "uppfæri plötuupplýsingar"
-
 #~ msgid "Submitting PUID information to MusicBrainz server ..."
 #~ msgstr "Sendi inn PUID upplýsingar til MusicBrainz þjóns..."
-
 #~ msgid "Performing a PUID lookup on file %s ..."
 #~ msgstr "Leita að PUID fyrir skrá %s ..."
-
 #~ msgid "Are you sure you want to exit the application?"
 #~ msgstr "Ertu viss um að þú viljir slökkva á forritinu?"
-
 #~ msgid "CD Lookup error -- is there a CD in the CD-ROM drive?"
 #~ msgstr "Villa við leit á geisladiski -- er diskur í geisladrifinu?"
-
 #~ msgid "CD Lookup Failed"
 #~ msgstr "Leit að geisladiski brást"
-
 #~ msgid "&Quick Start Guide"
 #~ msgstr "S&nöggar leiðbeiningar"
-
 #~ msgid "Quick Start Guide"
 #~ msgstr "Byrjunarhjálp"
-
 #~ msgid ""
 #~ "You have not specified an username and password. In order to contribute "
 #~ "data to MusicBrainz, you must have a MusicBrainz account.\n"
@@ -1163,26 +2681,20 @@ msgstr ""
 #~ "gögn MusicBrainz verður þú að hafa aðgang að MusicBrainz.\n"
 #~ "Viltu skrá þig núna? Ef þú hefur skráð þig áður hjá MusicBrainz, settu "
 #~ "inn notendaupplýsingar þínar í stillingum. "
-
 #~ msgid "Couldn't connect to the MusicBrainz server."
 #~ msgstr "Gat ekki tengst MusicBrainz þjóni."
-
 #~ msgid "Connection error"
 #~ msgstr "Tengivilla"
-
 #~ msgid ""
 #~ "MusicBrainz Picard requires wxPython with UNICODE support.\n"
 #~ "Please download the appropriate toolkit from http://www.wxpython.org/"
 #~ msgstr ""
 #~ "MusicBrainz Picard þarf wxPython með UNICODE stuðningi.\n"
 #~ "Vinsamlegast hlaðið niður viðeigandi skrám frá http://www.wxpython.org/"
-
 #~ msgid "PUID collision on file %s!"
 #~ msgstr "PUID árekstrar í skránni %s!"
-
 #~ msgid "Save error"
 #~ msgstr "Vistunarvilla"
-
 #~ msgid ""
 #~ "The move files option is enabled, but the destination directory is not "
 #~ "specified or invalid.\n"
@@ -1192,7 +2704,6 @@ msgstr ""
 #~ "Skráarfærsla er valin, en áfangastaðurinn er ekki skráður eða ógildur.\n"
 #~ "Vinsamlegast lagið stillingar skráarfærslu eða áfangastaðinn og reynið "
 #~ "aftur."
-
 #~ msgid ""
 #~ "Not all files could be saved. Please check for and examine tracks that "
 #~ "have an error icon in front of them. To retry saving the track, right "
@@ -1202,90 +2713,61 @@ msgstr ""
 #~ "fyrir framan sig.\n"
 #~ "Til að reyna að vista aftur, hægrismellið á lagið og veljið 'Hreinsa "
 #~ "Villu'"
-
 #~ msgid "Select directory that contains music files"
 #~ msgstr "Veldu möppu sem inniheldur tónlistarskrár"
-
 #~ msgid "Reload album from main server"
 #~ msgstr "Ná aftur í plötu af aðalþjóni"
-
 #~ msgid "Select or drag a folder from below"
 #~ msgstr "Veldu eða dragðu möppu að neðan"
-
 #~ msgid "Drag files from below"
 #~ msgstr "Draga skrár að neðan"
-
 #~ msgid "Release date"
 #~ msgstr "Útgáfudagur"
-
 #~ msgid "%d%% similar"
 #~ msgstr "%d%% líkt"
-
 #~ msgid "Please donate to MusicBrainz!"
 #~ msgstr "Vinsamlegast styrkið MusicBrainz!"
-
-#~ msgid "Later"
-#~ msgstr "Síðar"
-
 #~ msgid ""
 #~ "The destination directory %s does not exist. Please pick a valid "
 #~ "directory."
 #~ msgstr "Mappan %s er ekki til. Vinsamlegast veljið gilda möppu."
-
 #~ msgid "Select the encoding to use when reading and writing filenames"
 #~ msgstr "Veldu rétta kóðun til að nota við lestur og skrift skráarnafna"
-
 #~ msgid "Automatically move clusters to albums that are at least"
 #~ msgstr "Sjálfkrafa færa lagahópa í plötur sem eru að minnsta kosti"
-
 #~ msgid "Automatically save recognized tracks that are at least"
 #~ msgstr "Sjálfkrafa vista þekkt lög sem eru að minnsta kosti"
-
 #~ msgid ""
 #~ "Note: This setting will take effect after you restart the application."
 #~ msgstr "Ath.: Þessi stilling tekur gildi eftir að þú endurræsir forritið"
-
 #~ msgid "Artist translation"
 #~ msgstr "Þýðing á listamanni"
-
 #~ msgid "Rename files when writing metadata tags"
 #~ msgstr "Endurskíra skrár þegar upplýsingar eru skrifaðar"
-
 #~ msgid "Naming Help"
 #~ msgstr "Hjálp við endurskíringu"
-
 #~ msgid ""
 #~ "You may use the following variables in the filenaming\n"
 #~ "specifications in the options dialog:"
 #~ msgstr "Þú getur notað eftirfarandi breytur í nafnastillingum."
-
 #~ msgid "A %s in the naming specification will create a new subfolder."
 #~ msgstr "%s í nafnaskilgreiningu býr til undirmöppu."
-
 #~ msgid "Audio fingerprinting options"
 #~ msgstr "Stillingar hljóðfingrafars"
-
 #~ msgid "Automatically select PUID collision tracks that are at least"
 #~ msgstr "Velja sjálfkrafa PUID árekstra lög sem eru að minnsta kosti"
-
 #~ msgid "Write ID3v1 tags to MP3 files (ID3v2 tags will always be written)"
 #~ msgstr "Skrifa ID3v1 tög í MP3 skrár (ID3v2 tög eru alltaf skrifuð)"
-
 #~ msgid "Remove track/album"
 #~ msgstr "Fjarlægja lag/plötu"
-
 #~ msgid "Listen to track"
 #~ msgstr "Hlusta á lag"
-
 #~ msgid "Album clusters"
 #~ msgstr "Plötu klasar"
-
 #~ msgid "Unmatched files for this album"
 #~ msgstr "Óþekktar skrár af þessari plötu"
-
 #~ msgid "%d of %d tracks linked"
 #~ msgstr "%d af %d lögum tengd"
-
 #~ msgid ""
 #~ "The Picard Tagger is a free application and you may\n"
 #~ "use it as long as you wish. However, providing\n"
@@ -1305,67 +2787,48 @@ msgstr ""
 #~ "verkefnið. Allar framlögur gefa skattfrádrátt í \n"
 #~ "Bandaríkjunum og munu halda þjónustunni\n"
 #~ "lifandi og í framsókn."
-
 #~ msgid "Matched track highlighting"
 #~ msgstr "Upplýsing fundins lags"
-
 #~ msgid "Good match background color"
 #~ msgstr "Bakgrunnslitur góðar svörunar"
-
 #~ msgid "Bad match background color"
 #~ msgstr "Bakgrunnslitur slæmrar svörunar"
-
 #~ msgid "Move files option"
 #~ msgstr "Stillingar"
-
 #~ msgid "When matching tracks to albums, accept tracks that are at least"
 #~ msgstr "Þegar lög eru borin við plötur, velja lög sem eru að minnsta kosti"
-
 #~ msgid "CD-ROM drive path to use for lookups"
 #~ msgstr "Slóð á geisladrif notað í leit"
-
 #~ msgid "Launch MB Tagger automatically for inserted Audio CDs"
 #~ msgstr "Keyra MB Tagger sjálfkrafa þegar diskar eru settir í drif"
-
 #~ msgid ""
 #~ "Failed to set the proper registy values to enable launching the tagger "
 #~ "after CD insertion. "
 #~ msgstr ""
 #~ "Tókst ekki að setja registry gildi til að leyfa sjálfkrafa keyrslu "
 #~ "forritsins þegar diskar eru settir í drif. "
-
 #~ msgid "Default CD setting failed"
 #~ msgstr "Sjálfgefnar stillingar geisladrifs brugðust"
-
 #~ msgid "File format naming specification"
 #~ msgstr "Skilgreingar fyrir skráarnafnasnið"
-
 #~ msgid "Various artist file format naming specification"
 #~ msgstr "Skilgreiningar fyrir skráarnafnasnið safndiska"
-
 #~ msgid "Note: Leave blank to allow all possible characters"
 #~ msgstr "Ath: skiljið eftir autt tilað leyfa alla stafi"
-
 #~ msgid "Track artist name"
 #~ msgstr "Nafn á listamanni lags"
-
 #~ msgid "Track artist sortname"
 #~ msgstr "Röðunarnafn listamanns lags"
-
 #~ msgid "The first character of the artist sortname"
 #~ msgstr "Fyrsti stafur röðunarnafns listamanns"
-
 #~ msgid "The first two characters of the artist sortname"
 #~ msgstr "Fyrstu tveir stafir röðunarnafns listamanns"
-
 #~ msgid "The first three characters of the artist sortname"
 #~ msgstr "Fyrstu þrír stafir röðunarnafns listamanns"
-
 #~ msgid "Naming specification help"
 #~ msgstr "Hjálp við nafnaskilgreiningu"
-
 #~ msgid "Accept PUID matches that are at least"
 #~ msgstr "Samþykkja PUID svörum sem eru að minnsta kosti"
-
 #~ msgid "Various artist name"
 #~ msgstr "Nafn \"ýmissa listamanna\""
+
diff --git a/po/it.po b/po/it.po
index 90c672daa..5d1e449da 100644
--- a/po/it.po
+++ b/po/it.po
@@ -6,35 +6,1296 @@ msgid ""
 msgstr ""
 "Project-Id-Version: picard\n"
 "Report-Msgid-Bugs-To: http://bugs.musicbrainz.org/\n"
-"POT-Creation-Date: 2008-12-01 18:20+0100\n"
-"PO-Revision-Date: 2008-09-25 17:26+0000\n"
-"Last-Translator: Alberto Antioco Cogoni <Unknown>\n"
+"POT-Creation-Date: 2009-01-25 12:23+0100\n"
+"PO-Revision-Date: 2009-01-25 13:22+0100\n"
+"Last-Translator: Philipp Wolfer <phw@rubyforge.org>\n"
 "Language-Team: Italian <it@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2008-12-01 17:01+0000\n"
+"X-Launchpad-Export-Date: 2009-01-24 23:28+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
-#: ../picard/album.py:108 ../picard/cluster.py:248
+#: ../picard/album.py:108
+#: ../picard/cluster.py:248
 msgid "Unmatched Files"
 msgstr "File non riconosciuti"
 
-#: ../picard/album.py:269
+#: ../picard/album.py:281
 #, python-format
 msgid "[couldn't load album %s]"
 msgstr "[caricamento album %s fallito]"
 
-#: ../picard/album.py:305
+#: ../picard/album.py:317
 msgid "[loading album information]"
 msgstr "[caricamento informazioni album]"
 
-#: ../picard/tagger.py:472
+#: ../picard/cluster.py:164
+#: ../picard/cluster.py:175
+#, python-format
+msgid "No matching releases for cluster %s"
+msgstr "Nessuna release combacia per il cluster %s"
+
+#: ../picard/cluster.py:177
+#, python-format
+msgid "Cluster %s identified!"
+msgstr "Ho identificato il frammento %s"
+
+#: ../picard/cluster.py:182
+#, python-format
+msgid "Looking up the metadata for cluster %s..."
+msgstr "Sto controllando i metadati del frammento %s..."
+
+#: ../picard/const.py:40
+msgid "CD"
+msgstr ""
+
+#: ../picard/const.py:41
+msgid "DVD"
+msgstr ""
+
+#: ../picard/const.py:42
+msgid "SACD"
+msgstr ""
+
+#: ../picard/const.py:43
+msgid "LaserDisc"
+msgstr ""
+
+#: ../picard/const.py:44
+msgid "MiniDisc"
+msgstr ""
+
+#: ../picard/const.py:45
+msgid "Vinyl"
+msgstr ""
+
+#: ../picard/const.py:46
+msgid "Cassette"
+msgstr ""
+
+#: ../picard/const.py:47
+msgid "Cartridge (4/8-tracks)"
+msgstr ""
+
+#: ../picard/const.py:48
+msgid "Reel-to-Reel"
+msgstr ""
+
+#: ../picard/const.py:49
+msgid "DAT"
+msgstr ""
+
+#: ../picard/const.py:50
+#, fuzzy
+msgid "Digital Media"
+msgstr "Metadata originale"
+
+#: ../picard/const.py:51
+msgid "Wax Cylinder"
+msgstr ""
+
+#: ../picard/const.py:52
+msgid "Piano Roll"
+msgstr ""
+
+#: ../picard/const.py:53
+#, fuzzy
+msgid "Other"
+msgstr "Dopo"
+
+#: ../picard/const.py:58
+msgid "Bangladesh"
+msgstr ""
+
+#: ../picard/const.py:59
+msgid "Belgium"
+msgstr ""
+
+#: ../picard/const.py:60
+msgid "Burkina Faso"
+msgstr ""
+
+#: ../picard/const.py:61
+msgid "Bulgaria"
+msgstr ""
+
+#: ../picard/const.py:62
+msgid "Barbados"
+msgstr ""
+
+#: ../picard/const.py:63
+msgid "Wallis and Futuna Islands"
+msgstr ""
+
+#: ../picard/const.py:64
+msgid "Bermuda"
+msgstr ""
+
+#: ../picard/const.py:65
+msgid "Brunei Darussalam"
+msgstr ""
+
+#: ../picard/const.py:66
+msgid "Bolivia"
+msgstr ""
+
+#: ../picard/const.py:67
+msgid "Bahrain"
+msgstr ""
+
+#: ../picard/const.py:68
+msgid "Burundi"
+msgstr ""
+
+#: ../picard/const.py:69
+msgid "Benin"
+msgstr ""
+
+#: ../picard/const.py:70
+msgid "Bhutan"
+msgstr ""
+
+#: ../picard/const.py:71
+msgid "Jamaica"
+msgstr ""
+
+#: ../picard/const.py:72
+msgid "Bouvet Island"
+msgstr ""
+
+#: ../picard/const.py:73
+msgid "Botswana"
+msgstr ""
+
+#: ../picard/const.py:74
+msgid "Samoa"
+msgstr ""
+
+#: ../picard/const.py:75
+msgid "Brazil"
+msgstr ""
+
+#: ../picard/const.py:76
+msgid "Bahamas"
+msgstr ""
+
+#: ../picard/const.py:77
+msgid "Belarus"
+msgstr ""
+
+#: ../picard/const.py:78
+msgid "Belize"
+msgstr ""
+
+#: ../picard/const.py:79
+msgid "Russian Federation"
+msgstr ""
+
+#: ../picard/const.py:80
+msgid "Rwanda"
+msgstr ""
+
+#: ../picard/const.py:81
+msgid "Reunion"
+msgstr ""
+
+#: ../picard/const.py:82
+msgid "Turkmenistan"
+msgstr ""
+
+#: ../picard/const.py:83
+msgid "Tajikistan"
+msgstr ""
+
+#: ../picard/const.py:84
+msgid "Romania"
+msgstr ""
+
+#: ../picard/const.py:85
+#, fuzzy
+msgid "Tokela"
+msgstr "Barra degli strumenti"
+
+#: ../picard/const.py:86
+msgid "Guinea-Bissa"
+msgstr ""
+
+#: ../picard/const.py:87
+msgid "Guam"
+msgstr ""
+
+#: ../picard/const.py:88
+msgid "Guatemala"
+msgstr ""
+
+#: ../picard/const.py:89
+msgid "Greece"
+msgstr ""
+
+#: ../picard/const.py:90
+msgid "Equatorial Guinea"
+msgstr ""
+
+#: ../picard/const.py:91
+msgid "Guadeloupe"
+msgstr ""
+
+#: ../picard/const.py:92
+msgid "Japan"
+msgstr ""
+
+#: ../picard/const.py:93
+msgid "Guyana"
+msgstr ""
+
+#: ../picard/const.py:94
+msgid "French Guiana"
+msgstr ""
+
+#: ../picard/const.py:95
+msgid "Georgia"
+msgstr ""
+
+#: ../picard/const.py:96
+msgid "Grenada"
+msgstr ""
+
+#: ../picard/const.py:97
+msgid "United Kingdom"
+msgstr ""
+
+#: ../picard/const.py:98
+msgid "Gabon"
+msgstr ""
+
+#: ../picard/const.py:99
+msgid "El Salvador"
+msgstr ""
+
+#: ../picard/const.py:100
+#, fuzzy
+msgid "Guinea"
+msgstr "Generale"
+
+#: ../picard/const.py:101
+msgid "Gambia"
+msgstr ""
+
+#: ../picard/const.py:102
+msgid "Greenland"
+msgstr ""
+
+#: ../picard/const.py:103
+msgid "Gibraltar"
+msgstr ""
+
+#: ../picard/const.py:104
+msgid "Ghana"
+msgstr ""
+
+#: ../picard/const.py:105
+msgid "Oman"
+msgstr ""
+
+#: ../picard/const.py:106
+msgid "Tunisia"
+msgstr ""
+
+#: ../picard/const.py:107
+msgid "Jordan"
+msgstr ""
+
+#: ../picard/const.py:108
+msgid "Haiti"
+msgstr ""
+
+#: ../picard/const.py:109
+msgid "Hungary"
+msgstr ""
+
+#: ../picard/const.py:110
+msgid "Hong Kong"
+msgstr ""
+
+#: ../picard/const.py:111
+msgid "Honduras"
+msgstr ""
+
+#: ../picard/const.py:112
+msgid "Heard and Mc Donald Islands"
+msgstr ""
+
+#: ../picard/const.py:113
+msgid "Venezuela"
+msgstr ""
+
+#: ../picard/const.py:114
+msgid "Puerto Rico"
+msgstr ""
+
+#: ../picard/const.py:115
+msgid "Pala"
+msgstr ""
+
+#: ../picard/const.py:116
+#, fuzzy
+msgid "Portugal"
+msgstr "Porta:"
+
+#: ../picard/const.py:117
+msgid "Svalbard and Jan Mayen Islands"
+msgstr ""
+
+#: ../picard/const.py:118
+msgid "Paraguay"
+msgstr ""
+
+#: ../picard/const.py:119
+msgid "Iraq"
+msgstr ""
+
+#: ../picard/const.py:120
+msgid "Panama"
+msgstr ""
+
+#: ../picard/const.py:121
+msgid "French Polynesia"
+msgstr ""
+
+#: ../picard/const.py:122
+msgid "Papua New Guinea"
+msgstr ""
+
+#: ../picard/const.py:123
+msgid "Per"
+msgstr ""
+
+#: ../picard/const.py:124
+msgid "Pakistan"
+msgstr ""
+
+#: ../picard/const.py:125
+msgid "Philippines"
+msgstr ""
+
+#: ../picard/const.py:126
+msgid "Pitcairn"
+msgstr ""
+
+#: ../picard/const.py:127
+msgid "Poland"
+msgstr ""
+
+#: ../picard/const.py:128
+msgid "St. Pierre and Miquelon"
+msgstr ""
+
+#: ../picard/const.py:129
+msgid "Zambia"
+msgstr ""
+
+#: ../picard/const.py:130
+msgid "Western Sahara"
+msgstr ""
+
+#: ../picard/const.py:131
+msgid "Estonia"
+msgstr ""
+
+#: ../picard/const.py:132
+msgid "Egypt"
+msgstr ""
+
+#: ../picard/const.py:133
+msgid "South Africa"
+msgstr ""
+
+#: ../picard/const.py:134
+msgid "Ecuador"
+msgstr ""
+
+#: ../picard/const.py:135
+msgid "Italy"
+msgstr ""
+
+#: ../picard/const.py:136
+#, fuzzy
+msgid "Viet Nam"
+msgstr "Nome file"
+
+#: ../picard/const.py:137
+msgid "Solomon Islands"
+msgstr ""
+
+#: ../picard/const.py:138
+msgid "Ethiopia"
+msgstr ""
+
+#: ../picard/const.py:139
+msgid "Somalia"
+msgstr ""
+
+#: ../picard/const.py:140
+msgid "Zimbabwe"
+msgstr ""
+
+#: ../picard/const.py:141
+msgid "Saudi Arabia"
+msgstr ""
+
+#: ../picard/const.py:142
+#, fuzzy
+msgid "Spain"
+msgstr "&Scansiona"
+
+#: ../picard/const.py:143
+msgid "Eritrea"
+msgstr ""
+
+#: ../picard/const.py:144
+msgid "Moldova, Republic of"
+msgstr ""
+
+#: ../picard/const.py:145
+msgid "Madagascar"
+msgstr ""
+
+#: ../picard/const.py:146
+msgid "Morocco"
+msgstr ""
+
+#: ../picard/const.py:147
+#, fuzzy
+msgid "Monaco"
+msgstr "Mono"
+
+#: ../picard/const.py:148
+msgid "Uzbekistan"
+msgstr ""
+
+#: ../picard/const.py:149
+msgid "Myanmar"
+msgstr ""
+
+#: ../picard/const.py:150
+msgid "Mali"
+msgstr ""
+
+#: ../picard/const.py:151
+msgid "Maca"
+msgstr ""
+
+#: ../picard/const.py:152
+#, fuzzy
+msgid "Mongolia"
+msgstr "Mono"
+
+#: ../picard/const.py:153
+msgid "Marshall Islands"
+msgstr ""
+
+#: ../picard/const.py:154
+msgid "Macedonia, The Former Yugoslav Republic of"
+msgstr ""
+
+#: ../picard/const.py:155
+msgid "Mauritius"
+msgstr ""
+
+#: ../picard/const.py:156
+#, fuzzy
+msgid "Malta"
+msgstr "Metadata"
+
+#: ../picard/const.py:157
+msgid "Malawi"
+msgstr ""
+
+#: ../picard/const.py:158
+msgid "Maldives"
+msgstr ""
+
+#: ../picard/const.py:159
+msgid "Martinique"
+msgstr ""
+
+#: ../picard/const.py:160
+msgid "Northern Mariana Islands"
+msgstr ""
+
+#: ../picard/const.py:161
+msgid "Montserrat"
+msgstr ""
+
+#: ../picard/const.py:162
+msgid "Mauritania"
+msgstr ""
+
+#: ../picard/const.py:163
+msgid "Uganda"
+msgstr ""
+
+#: ../picard/const.py:164
+msgid "Malaysia"
+msgstr ""
+
+#: ../picard/const.py:165
+msgid "Mexico"
+msgstr ""
+
+#: ../picard/const.py:166
+msgid "Israel"
+msgstr ""
+
+#: ../picard/const.py:167
+#, fuzzy
+msgid "France"
+msgstr "Annulla"
+
+#: ../picard/const.py:168
+msgid "British Indian Ocean Territory"
+msgstr ""
+
+#: ../picard/const.py:169
+msgid "St. Helena"
+msgstr ""
+
+#: ../picard/const.py:170
+msgid "Finland"
+msgstr ""
+
+#: ../picard/const.py:171
+msgid "Fiji"
+msgstr ""
+
+#: ../picard/const.py:172
+msgid "Falkland Islands (Malvinas)"
+msgstr ""
+
+#: ../picard/const.py:173
+msgid "Micronesia, Federated States of"
+msgstr ""
+
+#: ../picard/const.py:174
+msgid "Faroe Islands"
+msgstr ""
+
+#: ../picard/const.py:175
+msgid "Nicaragua"
+msgstr ""
+
+#: ../picard/const.py:176
+msgid "Netherlands"
+msgstr ""
+
+#: ../picard/const.py:177
+msgid "Norway"
+msgstr ""
+
+#: ../picard/const.py:178
+msgid "Namibia"
+msgstr ""
+
+#: ../picard/const.py:179
+msgid "Vanuat"
+msgstr ""
+
+#: ../picard/const.py:180
+msgid "New Caledonia"
+msgstr ""
+
+#: ../picard/const.py:181
+#, fuzzy
+msgid "Niger"
+msgstr "Mixer"
+
+#: ../picard/const.py:182
+msgid "Norfolk Island"
+msgstr ""
+
+#: ../picard/const.py:183
+msgid "Nigeria"
+msgstr ""
+
+#: ../picard/const.py:184
+#, fuzzy
+msgid "New Zealand"
+msgstr "Metadata nuova"
+
+#: ../picard/const.py:185
+msgid "Zaire"
+msgstr ""
+
+#: ../picard/const.py:186
+msgid "Nepal"
+msgstr ""
+
+#: ../picard/const.py:187
+msgid "Naur"
+msgstr ""
+
+#: ../picard/const.py:188
+msgid "Niue"
+msgstr ""
+
+#: ../picard/const.py:189
+msgid "Cook Islands"
+msgstr ""
+
+#: ../picard/const.py:190
+msgid "Cote d'Ivoire"
+msgstr ""
+
+#: ../picard/const.py:191
+msgid "Switzerland"
+msgstr ""
+
+#: ../picard/const.py:192
+msgid "Colombia"
+msgstr ""
+
+#: ../picard/const.py:193
+msgid "China"
+msgstr ""
+
+#: ../picard/const.py:194
+msgid "Cameroon"
+msgstr ""
+
+#: ../picard/const.py:195
+#, fuzzy
+msgid "Chile"
+msgstr "File"
+
+#: ../picard/const.py:196
+msgid "Cocos (Keeling) Islands"
+msgstr ""
+
+#: ../picard/const.py:197
+msgid "Canada"
+msgstr ""
+
+#: ../picard/const.py:198
+#, fuzzy
+msgid "Congo"
+msgstr "Mono"
+
+#: ../picard/const.py:199
+msgid "Central African Republic"
+msgstr ""
+
+#: ../picard/const.py:200
+msgid "Czech Republic"
+msgstr ""
+
+#: ../picard/const.py:201
+msgid "Cyprus"
+msgstr ""
+
+#: ../picard/const.py:202
+msgid "Christmas Island"
+msgstr ""
+
+#: ../picard/const.py:203
+msgid "Costa Rica"
+msgstr ""
+
+#: ../picard/const.py:204
+msgid "Cape Verde"
+msgstr ""
+
+#: ../picard/const.py:205
+msgid "Cuba"
+msgstr ""
+
+#: ../picard/const.py:206
+msgid "Swaziland"
+msgstr ""
+
+#: ../picard/const.py:207
+msgid "Syrian Arab Republic"
+msgstr ""
+
+#: ../picard/const.py:208
+msgid "Kyrgyzstan"
+msgstr ""
+
+#: ../picard/const.py:209
+msgid "Kenya"
+msgstr ""
+
+#: ../picard/const.py:210
+msgid "Suriname"
+msgstr ""
+
+#: ../picard/const.py:211
+msgid "Kiribati"
+msgstr ""
+
+#: ../picard/const.py:212
+msgid "Cambodia"
+msgstr ""
+
+#: ../picard/const.py:213
+msgid "Saint Kitts and Nevis"
+msgstr ""
+
+#: ../picard/const.py:214
+#, fuzzy
+msgid "Comoros"
+msgstr "Colori"
+
+#: ../picard/const.py:215
+msgid "Sao Tome and Principe"
+msgstr ""
+
+#: ../picard/const.py:216
+msgid "Slovenia"
+msgstr ""
+
+#: ../picard/const.py:217
+msgid "Kuwait"
+msgstr ""
+
+#: ../picard/const.py:218
+#, fuzzy
+msgid "Senegal"
+msgstr "Generale"
+
+#: ../picard/const.py:219
+msgid "San Marino"
+msgstr ""
+
+#: ../picard/const.py:220
+msgid "Sierra Leone"
+msgstr ""
+
+#: ../picard/const.py:221
+msgid "Seychelles"
+msgstr ""
+
+#: ../picard/const.py:222
+msgid "Kazakhstan"
+msgstr ""
+
+#: ../picard/const.py:223
+msgid "Cayman Islands"
+msgstr ""
+
+#: ../picard/const.py:224
+msgid "Singapore"
+msgstr ""
+
+#: ../picard/const.py:225
+msgid "Sweden"
+msgstr ""
+
+#: ../picard/const.py:226
+#, fuzzy
+msgid "Sudan"
+msgstr "&Scansiona"
+
+#: ../picard/const.py:227
+msgid "Dominican Republic"
+msgstr ""
+
+#: ../picard/const.py:228
+msgid "Dominica"
+msgstr ""
+
+#: ../picard/const.py:229
+#, fuzzy
+msgid "Djibouti"
+msgstr "Informazioni"
+
+#: ../picard/const.py:230
+msgid "Denmark"
+msgstr ""
+
+#: ../picard/const.py:231
+msgid "Virgin Islands (British)"
+msgstr ""
+
+#: ../picard/const.py:232
+msgid "Germany"
+msgstr ""
+
+#: ../picard/const.py:233
+msgid "Yemen"
+msgstr ""
+
+#: ../picard/const.py:234
+msgid "Algeria"
+msgstr ""
+
+#: ../picard/const.py:235
+msgid "United States"
+msgstr ""
+
+#: ../picard/const.py:236
+msgid "Uruguay"
+msgstr ""
+
+#: ../picard/const.py:237
+msgid "Mayotte"
+msgstr ""
+
+#: ../picard/const.py:238
+msgid "United States Minor Outlying Islands"
+msgstr ""
+
+#: ../picard/const.py:239
+msgid "Lebanon"
+msgstr ""
+
+#: ../picard/const.py:240
+msgid "Saint Lucia"
+msgstr ""
+
+#: ../picard/const.py:241
+msgid "Lao People's Democratic Republic"
+msgstr ""
+
+#: ../picard/const.py:242
+msgid "Tuval"
+msgstr ""
+
+#: ../picard/const.py:243
+msgid "Taiwan"
+msgstr ""
+
+#: ../picard/const.py:244
+msgid "Trinidad and Tobago"
+msgstr ""
+
+#: ../picard/const.py:245
+msgid "Turkey"
+msgstr ""
+
+#: ../picard/const.py:246
+msgid "Sri Lanka"
+msgstr ""
+
+#: ../picard/const.py:247
+msgid "Liechtenstein"
+msgstr ""
+
+#: ../picard/const.py:248
+msgid "Latvia"
+msgstr ""
+
+#: ../picard/const.py:249
+msgid "Tonga"
+msgstr ""
+
+#: ../picard/const.py:250
+msgid "Lithuania"
+msgstr ""
+
+#: ../picard/const.py:251
+msgid "Luxembourg"
+msgstr ""
+
+#: ../picard/const.py:252
+msgid "Liberia"
+msgstr ""
+
+#: ../picard/const.py:253
+#, fuzzy
+msgid "Lesotho"
+msgstr "Durata"
+
+#: ../picard/const.py:254
+msgid "Thailand"
+msgstr ""
+
+#: ../picard/const.py:255
+msgid "French Southern Territories"
+msgstr ""
+
+#: ../picard/const.py:256
+#, fuzzy
+msgid "Togo"
+msgstr "S&trumenti"
+
+#: ../picard/const.py:257
+msgid "Chad"
+msgstr ""
+
+#: ../picard/const.py:258
+msgid "Turks and Caicos Islands"
+msgstr ""
+
+#: ../picard/const.py:259
+msgid "Libyan Arab Jamahiriya"
+msgstr ""
+
+#: ../picard/const.py:260
+msgid "Vatican City State (Holy See)"
+msgstr ""
+
+#: ../picard/const.py:261
+msgid "Saint Vincent and The Grenadines"
+msgstr ""
+
+#: ../picard/const.py:262
+msgid "United Arab Emirates"
+msgstr ""
+
+#: ../picard/const.py:263
+msgid "Andorra"
+msgstr ""
+
+#: ../picard/const.py:264
+msgid "Antigua and Barbuda"
+msgstr ""
+
+#: ../picard/const.py:265
+msgid "Afghanistan"
+msgstr ""
+
+#: ../picard/const.py:266
+msgid "Anguilla"
+msgstr ""
+
+#: ../picard/const.py:267
+msgid "Virgin Islands (U.S.)"
+msgstr ""
+
+#: ../picard/const.py:268
+msgid "Iceland"
+msgstr ""
+
+#: ../picard/const.py:269
+msgid "Iran (Islamic Republic of)"
+msgstr ""
+
+#: ../picard/const.py:270
+msgid "Armenia"
+msgstr ""
+
+#: ../picard/const.py:271
+msgid "Albania"
+msgstr ""
+
+#: ../picard/const.py:272
+msgid "Angola"
+msgstr ""
+
+#: ../picard/const.py:273
+msgid "Netherlands Antilles"
+msgstr ""
+
+#: ../picard/const.py:274
+msgid "Antarctica"
+msgstr ""
+
+#: ../picard/const.py:275
+msgid "American Samoa"
+msgstr ""
+
+#: ../picard/const.py:276
+msgid "Argentina"
+msgstr ""
+
+#: ../picard/const.py:277
+msgid "Australia"
+msgstr ""
+
+#: ../picard/const.py:278
+#, fuzzy
+msgid "Austria"
+msgstr "Autore"
+
+#: ../picard/const.py:279
+msgid "Aruba"
+msgstr ""
+
+#: ../picard/const.py:280
+#, fuzzy
+msgid "India"
+msgstr "Supporti"
+
+#: ../picard/const.py:281
+msgid "Tanzania, United Republic of"
+msgstr ""
+
+#: ../picard/const.py:282
+msgid "Azerbaijan"
+msgstr ""
+
+#: ../picard/const.py:283
+msgid "Ireland"
+msgstr ""
+
+#: ../picard/const.py:284
+msgid "Indonesia"
+msgstr ""
+
+#: ../picard/const.py:285
+msgid "Ukraine"
+msgstr ""
+
+#: ../picard/const.py:286
+#, fuzzy
+msgid "Qatar"
+msgstr "Dopo"
+
+#: ../picard/const.py:287
+msgid "Mozambique"
+msgstr ""
+
+#: ../picard/const.py:288
+msgid "Bosnia and Herzegovina"
+msgstr ""
+
+#: ../picard/const.py:289
+msgid "Congo, The Democratic Republic of the"
+msgstr ""
+
+#: ../picard/const.py:290
+msgid "Serbia and Montenegro"
+msgstr ""
+
+#: ../picard/const.py:291
+msgid "Croatia"
+msgstr ""
+
+#: ../picard/const.py:292
+msgid "Korea (North), Democratic People's Republic of"
+msgstr ""
+
+#: ../picard/const.py:293
+msgid "Korea (South), Republic of"
+msgstr ""
+
+#: ../picard/const.py:294
+msgid "Slovakia"
+msgstr ""
+
+#: ../picard/const.py:295
+msgid "Soviet Union (historical, 1922-1991)"
+msgstr ""
+
+#: ../picard/const.py:296
+msgid "East Timor"
+msgstr ""
+
+#: ../picard/const.py:297
+msgid "Czechoslovakia (historical, 1918-1992)"
+msgstr ""
+
+#: ../picard/const.py:298
+msgid "Europe"
+msgstr ""
+
+#: ../picard/const.py:299
+msgid "East Germany (historical, 1949-1990)"
+msgstr ""
+
+#: ../picard/const.py:300
+msgid "[Unknown Country]"
+msgstr ""
+
+#: ../picard/const.py:301
+msgid "[Worldwide]"
+msgstr ""
+
+#: ../picard/const.py:302
+msgid "Yugoslavia (historical, 1918-1992)"
+msgstr ""
+
+#: ../picard/const.py:307
+msgid "Catalan"
+msgstr ""
+
+#: ../picard/const.py:308
+msgid "Czech"
+msgstr ""
+
+#: ../picard/const.py:309
+msgid "Welsh"
+msgstr ""
+
+#: ../picard/const.py:310
+#, fuzzy
+msgid "Danish"
+msgstr "Dettagli"
+
+#: ../picard/const.py:311
+#, fuzzy
+msgid "German"
+msgstr "Generale"
+
+#: ../picard/const.py:312
+msgid "English"
+msgstr ""
+
+#: ../picard/const.py:313
+msgid "English (Canada)"
+msgstr ""
+
+#: ../picard/const.py:314
+msgid "English (UK)"
+msgstr ""
+
+#: ../picard/const.py:315
+msgid "Spanish"
+msgstr ""
+
+#: ../picard/const.py:316
+#, fuzzy
+msgid "Persian"
+msgstr "Versione"
+
+#: ../picard/const.py:317
+msgid "Finnish"
+msgstr ""
+
+#: ../picard/const.py:318
+msgid "French"
+msgstr ""
+
+#: ../picard/const.py:319
+msgid "Frisian"
+msgstr ""
+
+#: ../picard/const.py:320
+msgid "Hebrew"
+msgstr ""
+
+#: ../picard/const.py:321
+msgid "Hungarian"
+msgstr ""
+
+#: ../picard/const.py:322
+msgid "Islandic"
+msgstr ""
+
+#: ../picard/const.py:323
+msgid "Italian"
+msgstr ""
+
+#: ../picard/const.py:324
+msgid "Kannada"
+msgstr ""
+
+#: ../picard/const.py:325
+msgid "Korean"
+msgstr ""
+
+#: ../picard/const.py:326
+msgid "Lithuanian"
+msgstr ""
+
+#: ../picard/const.py:327
+msgid "Norwegian Bokmal"
+msgstr ""
+
+#: ../picard/const.py:328
+msgid "Dutch"
+msgstr ""
+
+#: ../picard/const.py:329
+#, fuzzy
+msgid "Polish"
+msgstr "Plugin"
+
+#: ../picard/const.py:330
+msgid "Portuguese"
+msgstr ""
+
+#: ../picard/const.py:331
+msgid "Brazilian Portuguese"
+msgstr ""
+
+#: ../picard/const.py:332
+msgid "Romanian"
+msgstr ""
+
+#: ../picard/const.py:333
+msgid "Russian"
+msgstr ""
+
+#: ../picard/const.py:334
+#, fuzzy
+msgid "Scots"
+msgstr "Punteggio"
+
+#: ../picard/const.py:335
+msgid "Slovak"
+msgstr ""
+
+#: ../picard/const.py:336
+msgid "Slovenian"
+msgstr ""
+
+#: ../picard/const.py:337
+msgid "Swedish"
+msgstr ""
+
+#: ../picard/const.py:338
+#, fuzzy
+msgid "Chinese"
+msgstr "Canali:"
+
+#: ../picard/file.py:475
+#, python-format
+msgid "No matching tracks for file %s"
+msgstr "Nessuna traccia trovata per il file %s"
+
+#: ../picard/file.py:492
+#, fuzzy, python-format
+msgid "No matching tracks above the threshold for file %s"
+msgstr "Nessuna traccia trovata per il file %s"
+
+#: ../picard/file.py:495
+#, python-format
+msgid "File %s identified!"
+msgstr "Il file %s è stato identificato!"
+
+#: ../picard/file.py:506
+#, python-format
+msgid "Looking up the PUID for file %s..."
+msgstr "Sto cercando il file %s nel PUID"
+
+#: ../picard/file.py:511
+#, python-format
+msgid "Looking up the metadata for file %s..."
+msgstr "Sto cercando il metadata del file %s..."
+
+#: ../picard/puidmanager.py:58
+msgid "Submitting PUIDs..."
+msgstr "Sto trasmettendo i PUIDS..."
+
+#: ../picard/puidmanager.py:64
+#, python-format
+msgid "PUIDs submission failed: %s"
+msgstr "L'invio dei PUID è fallito: %s"
+
+#: ../picard/puidmanager.py:66
+msgid "PUIDs successfully submitted!"
+msgstr "PUID correttamente inviati."
+
+#: ../picard/playlist.py:31
+msgid "M3U Playlist (*.m3u)"
+msgstr "Lista di ascolto M3U (*.m3u)"
+
+#: ../picard/playlist.py:32
+msgid "PLS Playlist (*.pls)"
+msgstr "Lista di ascolto PLS (*.pls)"
+
+#: ../picard/playlist.py:33
+msgid "XSPF Playlist (*.xspf)"
+msgstr "Lista di ascolto XSPF (*.xspf)"
+
+#: ../picard/tagger.py:476
 msgid "CD Lookup Error"
 msgstr "Errore di controllo del CD"
 
-#: ../picard/tagger.py:473
+#: ../picard/tagger.py:477
 #, python-format
 msgid ""
 "Error while reading CD:\n"
@@ -45,126 +1306,175 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../picard/ui/passworddialog.py:38
+#: ../picard/tagger.py:503
 #, python-format
-msgid ""
-"The server %s requires you to login. Please enter your username and password."
-msgstr ""
+msgid "Couldn't find PUID for file %s"
+msgstr "Non riesco a trovare il PUID per il file %s"
 
-#: ../picard/ui/ui_options_script.py:52
-msgid "Tagger Script"
-msgstr "Script Tagger"
+#: ../picard/musicdns/__init__.py:98
+#, python-format
+msgid "Looking up the fingerprint for file %s..."
+msgstr "Sto controllando il codice identificativo del file %s"
+
+#: ../picard/musicdns/__init__.py:117
+#, python-format
+msgid "Creating fingerprint for file %s..."
+msgstr "Sto creando l'impronta digitale del file %s..."
 
 #: ../picard/ui/cdlookup.py:31
 msgid "Score"
 msgstr "Punteggio"
 
 #: ../picard/ui/cdlookup.py:31
+#: ../picard/ui/itemviews.py:82
+#: ../picard/util/tags.py:23
 msgid "Title"
 msgstr "Titolo"
 
-#: ../picard/ui/cdlookup.py:31 ../picard/ui/mainwindow.py:436
+#: ../picard/ui/cdlookup.py:31
+#: ../picard/ui/itemviews.py:84
+#: ../picard/ui/mainwindow.py:436
+#: ../picard/util/tags.py:22
 msgid "Artist"
 msgstr "Artista"
 
-#: ../picard/ui/ui_metadata.py:121
-msgid "Lookup"
-msgstr "Cerca"
+#: ../picard/ui/coverartbox.py:47
+#: ../picard/ui/options/cover.py:29
+msgid "Cover Art"
+msgstr "Copertina"
 
-#: ../picard/ui/ui_metadata.py:122
-msgid "Title:"
-msgstr "Titolo:"
+#: ../picard/ui/coverartbox.py:95
+msgid "Buy the album on Amazon"
+msgstr "Compra l'album su Amazon"
 
-#: ../picard/ui/ui_metadata.py:123
-msgid "Date:"
-msgstr "Data:"
+#: ../picard/ui/filebrowser.py:38
+#: ../picard/ui/mainwindow.py:302
+msgid "&Refresh"
+msgstr "&Aggiorna"
 
-#: ../picard/ui/ui_metadata.py:124
-msgid "Artist:"
-msgstr "Artista:"
+#: ../picard/ui/filebrowser.py:41
+#, fuzzy
+msgid "&Move Tagged Files Here"
+msgstr "&Sposta files"
 
-#: ../picard/ui/ui_metadata.py:125
-msgid "Track:"
-msgstr "Traccia:"
+#: ../picard/ui/filebrowser.py:44
+msgid "Show &Hidden Files"
+msgstr ""
 
-#: ../picard/ui/ui_metadata.py:126
-msgid "0000-00-00; "
-msgstr "0000-00-00; "
+#: ../picard/ui/itemviews.py:83
+msgid "Length"
+msgstr "Durata"
 
-#: ../picard/ui/ui_metadata.py:127 ../picard/ui/tageditor.py:225
-#: ../picard/ui/multitageditor.py:181
+#: ../picard/ui/itemviews.py:327
+msgid "&Releases"
+msgstr "&Distibuzioni"
+
+#: ../picard/ui/itemviews.py:353
+msgid "&Plugins"
+msgstr "&Plugin"
+
+#: ../picard/ui/itemviews.py:523
+msgid "Clusters"
+msgstr "Frammenti"
+
+#: ../picard/ui/logview.py:29
+msgid "Log"
+msgstr "Registro"
+
+#: ../picard/ui/puidsubmit.py:31
+#: ../picard/ui/options/plugins.py:80
+msgid "File"
+msgstr "File"
+
+#: ../picard/ui/puidsubmit.py:31
+msgid "PUID"
+msgstr "PUID"
+
+#: ../picard/ui/puidsubmit.py:31
+#: ../picard/ui/mainwindow.py:437
+msgid "Track"
+msgstr "Traccia"
+
+#: ../picard/ui/puidsubmit.py:31
+msgid "Release"
+msgstr "Distribuzione"
+
+#: ../picard/ui/puidsubmit.py:31
+msgid "Release ID"
+msgstr "Codice ID della distribuzione"
+
+#: ../picard/ui/tageditor.py:65
+#: ../picard/ui/ui_options_plugins.py:62
+msgid "Details"
+msgstr "Dettagli"
+
+#: ../picard/ui/tageditor.py:70
+#: ../picard/ui/tageditor.py:241
+#, python-format
+msgid "%d file"
+msgid_plural "%d files"
+msgstr[0] "file %d"
+msgstr[1] "file %d"
+
+#: ../picard/ui/tageditor.py:124
+#, python-format
+msgid "(different across %d file)"
+msgid_plural "(different across %d files)"
+msgstr[0] "(diversi su %d file)"
+msgstr[1] "(diversi su %d files)"
+
+#: ../picard/ui/tageditor.py:127
+#, python-format
+msgid "(missing from %d file)"
+msgid_plural "(missing from %d files)"
+msgstr[0] "(mancamento di %d file)"
+msgstr[1] "(mancamento di %d files)"
+
+#: ../picard/ui/tageditor.py:210
+msgid "Filename:"
+msgstr "Nome file:"
+
+#: ../picard/ui/tageditor.py:212
+msgid "Format:"
+msgstr "Formato:"
+
+#: ../picard/ui/tageditor.py:221
+msgid "Size:"
+msgstr "Dimesione:"
+
+#: ../picard/ui/tageditor.py:225
+#: ../picard/ui/ui_metadata.py:127
 msgid "Length:"
 msgstr "Durata:"
 
-#: ../picard/ui/ui_metadata.py:128
-msgid "Album:"
-msgstr "Album:"
+#: ../picard/ui/tageditor.py:227
+msgid "Bitrate:"
+msgstr "Bitrate:"
 
-#: ../picard/ui/ui_passworddialog.py:78
-#, fuzzy
-msgid "Authentication required"
-msgstr "Unicode richiesto"
+#: ../picard/ui/tageditor.py:229
+msgid "Sample rate:"
+msgstr "Tasso di campionamento:"
 
-#: ../picard/ui/ui_passworddialog.py:79 ../picard/ui/ui_options_proxy.py:83
-#: ../picard/ui/ui_options_general.py:113
-msgid "Username:"
-msgstr "Nome utente:"
+#: ../picard/ui/tageditor.py:231
+msgid "Bits per sample:"
+msgstr "Bits per sample:"
 
-#: ../picard/ui/ui_passworddialog.py:80 ../picard/ui/ui_options_proxy.py:82
-#: ../picard/ui/ui_options_general.py:112
-msgid "Password:"
-msgstr "Parola d'accesso:"
+#: ../picard/ui/tageditor.py:234
+msgid "Mono"
+msgstr "Mono"
 
-#: ../picard/ui/ui_passworddialog.py:81
-msgid "Save username and password"
-msgstr ""
+#: ../picard/ui/tageditor.py:235
+msgid "Stereo"
+msgstr "Stereo"
 
-#: ../picard/ui/ui_options_folksonomy.py:114
-#: ../picard/ui/ui_options_folksonomy_tags.py:114
-msgid "Folksonomy Tags"
-msgstr "Folksonomy Tags"
+#: ../picard/ui/tageditor.py:237
+msgid "Channels:"
+msgstr "Canali:"
 
-#: ../picard/ui/ui_options_folksonomy.py:115
-#: ../picard/ui/ui_options_folksonomy_tags.py:115
-msgid "Ignore tags:"
-msgstr "Ignora tag:"
-
-#: ../picard/ui/ui_options_folksonomy.py:116
-#: ../picard/ui/ui_options_folksonomy_tags.py:116
-msgid "Minimal tag usage:"
-msgstr "Utilizzo minimo del tag:"
-
-#: ../picard/ui/ui_options_folksonomy.py:117
-#: ../picard/ui/ui_options_folksonomy_tags.py:117
-#: ../picard/ui/ui_options_matching.py:107
-#: ../picard/ui/ui_options_matching.py:108
-#: ../picard/ui/ui_options_matching.py:109
-#: ../picard/ui/ui_options_matching.py:113
-msgid " %"
-msgstr " %"
-
-#: ../picard/ui/ui_options_folksonomy.py:118
-msgid "Maximum number of tags:"
-msgstr "Numero totale di tag:"
-
-#: ../picard/ui/ui_options_folksonomy.py:119
-#: ../picard/ui/ui_options_folksonomy_tags.py:119
-msgid "Join multiple tags with:"
-msgstr "Abbina tag multipli con:"
-
-#: ../picard/ui/ui_options_folksonomy.py:120
-#: ../picard/ui/ui_options_folksonomy_tags.py:120
-msgid " / "
-msgstr " / "
-
-#: ../picard/ui/ui_options_folksonomy.py:121
-#: ../picard/ui/ui_options_folksonomy_tags.py:121
-msgid ", "
-msgstr ". "
-
-#: ../picard/ui/ui_options_folksonomy_tags.py:118
-msgid "Maximal number of tags:"
-msgstr "Numero massimo di tag:"
+#: ../picard/ui/tagsfromfilenames.py:52
+#: ../picard/ui/tagsfromfilenames.py:96
+msgid "File Name"
+msgstr "Nome file"
 
 #: ../picard/ui/mainwindow.py:64
 msgid "MusicBrainz Picard"
@@ -299,7 +1609,8 @@ msgstr "Cerca"
 msgid "&CD Lookup..."
 msgstr "&Controllo del CD..."
 
-#: ../picard/ui/mainwindow.py:272 ../picard/ui/mainwindow.py:273
+#: ../picard/ui/mainwindow.py:272
+#: ../picard/ui/mainwindow.py:273
 msgid "Lookup CD"
 msgstr "Controlla CD"
 
@@ -330,7 +1641,8 @@ msgstr "Ctrl+U"
 msgid "&Lookup"
 msgstr "&Cerca"
 
-#: ../picard/ui/mainwindow.py:291 ../picard/ui/mainwindow.py:292
+#: ../picard/ui/mainwindow.py:291
+#: ../picard/ui/mainwindow.py:292
 msgid "Lookup metadata"
 msgstr "Sfoglia Metadata"
 
@@ -343,10 +1655,6 @@ msgstr "Ctrl+L"
 msgid "&Details..."
 msgstr "&Dettagli..."
 
-#: ../picard/ui/mainwindow.py:302 ../picard/ui/filebrowser.py:38
-msgid "&Refresh"
-msgstr "&Aggiorna"
-
 #: ../picard/ui/mainwindow.py:305
 msgid "Generate &Playlist..."
 msgstr "Genera &playlist..."
@@ -392,6 +1700,7 @@ msgid "&Tools"
 msgstr "S&trumenti"
 
 #: ../picard/ui/mainwindow.py:384
+#: ../picard/ui/util.py:33
 msgid "&Help"
 msgstr "&Guida"
 
@@ -404,13 +1713,10 @@ msgid "&Search Bar"
 msgstr "&Barra di ricerca"
 
 #: ../picard/ui/mainwindow.py:435
+#: ../picard/util/tags.py:21
 msgid "Album"
 msgstr "Album"
 
-#: ../picard/ui/mainwindow.py:437 ../picard/ui/puidsubmit.py:31
-msgid "Track"
-msgstr "Traccia"
-
 #: ../picard/ui/mainwindow.py:476
 msgid "All Supported Formats"
 msgstr "Tutti i formati supportati"
@@ -425,37 +1731,290 @@ msgstr "Sto salvando la playlist %s..."
 msgid "Playlist %s saved"
 msgstr "La playlist %s è stata salvata."
 
-#: ../picard/ui/mainwindow.py:638 ../picard/ui/mainwindow.py:647
+#: ../picard/ui/mainwindow.py:638
+#: ../picard/ui/mainwindow.py:647
 #, python-format
 msgid " (Error: %s)"
 msgstr " (Errore %s)"
 
+#: ../picard/ui/ui_tageditor.py:115
+#: ../picard/ui/ui_options_plugins.py:59
+#: ../picard/ui/options/plugins.py:76
+msgid "Name"
+msgstr "Nome"
+
+#: ../picard/ui/ui_tageditor.py:116
+msgid "Value"
+msgstr "Valore"
+
+#: ../picard/ui/ui_tageditor.py:117
+msgid "&Add..."
+msgstr "&Aggiungi..."
+
+#: ../picard/ui/ui_tageditor.py:118
+msgid "&Edit..."
+msgstr "&Modifica..."
+
+#: ../picard/ui/ui_tageditor.py:119
+msgid "&Delete"
+msgstr "&Cancella"
+
+#: ../picard/ui/ui_tageditor.py:120
+msgid "&Metadata"
+msgstr "&Metadati"
+
+#: ../picard/ui/ui_tageditor.py:121
+msgid "A&rtwork"
+msgstr "A&rtwork"
+
+#: ../picard/ui/ui_tageditor.py:122
+msgid "&Info"
+msgstr "&Info"
+
+#: ../picard/ui/passworddialog.py:38
+#, python-format
+msgid "The server %s requires you to login. Please enter your username and password."
+msgstr ""
+
+#: ../picard/ui/ui_cdlookup.py:60
+#: ../picard/ui/ui_options_cdlookup.py:47
+#: ../picard/ui/ui_options_cdlookup_win32.py:56
+#: ../picard/ui/options/cdlookup.py:35
+msgid "CD Lookup"
+msgstr "Controlla CD"
+
+#: ../picard/ui/ui_cdlookup.py:61
+msgid "The following releases on MusicBrainz match the CD:"
+msgstr "Le seguenti release su MusicBrainz combaciono con il CD:"
+
+#: ../picard/ui/ui_cdlookup.py:62
+#: ../picard/ui/ui_puidsubmit.py:53
+msgid "OK"
+msgstr "Ok"
+
+#: ../picard/ui/ui_cdlookup.py:63
+msgid "    Lookup manually    "
+msgstr "    Cerca manualmente    "
+
+#: ../picard/ui/ui_cdlookup.py:64
+#: ../picard/ui/ui_puidsubmit.py:54
+msgid "Cancel"
+msgstr "Annulla"
+
+#: ../picard/ui/ui_passworddialog.py:78
+#, fuzzy
+msgid "Authentication required"
+msgstr "Unicode richiesto"
+
+#: ../picard/ui/ui_passworddialog.py:79
+#: ../picard/ui/ui_options_general.py:113
+#: ../picard/ui/ui_options_proxy.py:83
+msgid "Username:"
+msgstr "Nome utente:"
+
+#: ../picard/ui/ui_passworddialog.py:80
+#: ../picard/ui/ui_options_general.py:112
+#: ../picard/ui/ui_options_proxy.py:82
+msgid "Password:"
+msgstr "Parola d'accesso:"
+
+#: ../picard/ui/ui_passworddialog.py:81
+msgid "Save username and password"
+msgstr ""
+
 #: ../picard/ui/ui_edittagdialog.py:44
 msgid "Edit Tag"
 msgstr "Modifica tag"
 
-#: ../picard/ui/ui_options_proxy.py:81
-msgid "Web Proxy"
-msgstr "Proxy Web"
+#: ../picard/ui/ui_metadata.py:121
+msgid "Lookup"
+msgstr "Cerca"
 
-#: ../picard/ui/ui_options_proxy.py:84 ../picard/ui/ui_options_general.py:109
-msgid "Port:"
-msgstr "Porta:"
+#: ../picard/ui/ui_metadata.py:122
+msgid "Title:"
+msgstr "Titolo:"
 
-#: ../picard/ui/ui_options_proxy.py:85 ../picard/ui/ui_options_general.py:110
-msgid "Server address:"
-msgstr "Indirizzo server:"
+#: ../picard/ui/ui_metadata.py:123
+msgid "Date:"
+msgstr "Data:"
 
-#: ../picard/ui/ui_tagsfromfilenames.py:56
-msgid "Convert File Names to Tags"
-msgstr "Converti i nomi dei file in tag"
+#: ../picard/ui/ui_metadata.py:124
+msgid "Artist:"
+msgstr "Artista:"
 
-#: ../picard/ui/ui_tagsfromfilenames.py:57
-msgid "Replace underscores with spaces"
-msgstr "Sostituisci gli underscore con degli spazi"
+#: ../picard/ui/ui_metadata.py:125
+msgid "Track:"
+msgstr "Traccia:"
+
+#: ../picard/ui/ui_metadata.py:126
+msgid "0000-00-00; "
+msgstr "0000-00-00; "
+
+#: ../picard/ui/ui_metadata.py:128
+msgid "Album:"
+msgstr "Album:"
+
+#: ../picard/ui/ui_options.py:42
+msgid "Options"
+msgstr "Opzioni"
+
+#: ../picard/ui/ui_options_cdlookup.py:48
+msgid "CD-ROM device to use for lookups:"
+msgstr "Unità CD da usare per i controlli:"
+
+#: ../picard/ui/ui_options_cdlookup_win32.py:57
+msgid "Default CD-ROM drive to use for lookups:"
+msgstr "Unità CD predefinita da usare per i controlli:"
+
+#: ../picard/ui/ui_options_cover.py:56
+msgid "Location"
+msgstr "Località"
+
+#: ../picard/ui/ui_options_cover.py:57
+msgid "Embed cover images into tags"
+msgstr "Includi l'immagine della copertina nei tag"
+
+#: ../picard/ui/ui_options_cover.py:58
+msgid "Save cover images as separate files"
+msgstr "Salva l'immagine della copertina come file separato"
+
+#: ../picard/ui/ui_options_cover.py:59
+msgid "Overwrite the file if it already exists"
+msgstr "Sovrascrivi il file se è già presente"
+
+#: ../picard/ui/util.py:31
+msgid "&Ok"
+msgstr "&Ok"
+
+#: ../picard/ui/util.py:32
+msgid "&Cancel"
+msgstr "A&nnulla"
+
+#: ../picard/ui/ui_puidsubmit.py:52
+msgid "Submit PUIDs"
+msgstr "Sto inviando i PUID"
+
+#: ../picard/ui/ui_options_folksonomy.py:114
+#: ../picard/ui/options/folksonomy.py:29
+msgid "Folksonomy Tags"
+msgstr "Folksonomy Tags"
+
+#: ../picard/ui/ui_options_folksonomy.py:115
+msgid "Ignore tags:"
+msgstr "Ignora tag:"
+
+#: ../picard/ui/ui_options_folksonomy.py:116
+msgid "Minimal tag usage:"
+msgstr "Utilizzo minimo del tag:"
+
+#: ../picard/ui/ui_options_folksonomy.py:117
+#: ../picard/ui/ui_options_matching.py:107
+#: ../picard/ui/ui_options_matching.py:108
+#: ../picard/ui/ui_options_matching.py:109
+#: ../picard/ui/ui_options_matching.py:113
+msgid " %"
+msgstr " %"
+
+#: ../picard/ui/ui_options_folksonomy.py:118
+msgid "Maximum number of tags:"
+msgstr "Numero totale di tag:"
+
+#: ../picard/ui/ui_options_folksonomy.py:119
+msgid "Join multiple tags with:"
+msgstr "Abbina tag multipli con:"
+
+#: ../picard/ui/ui_options_folksonomy.py:120
+msgid " / "
+msgstr " / "
+
+#: ../picard/ui/ui_options_folksonomy.py:121
+msgid ", "
+msgstr ". "
+
+#: ../picard/ui/ui_options_interface.py:50
+msgid "Miscellaneous"
+msgstr "Varie"
+
+#: ../picard/ui/ui_options_interface.py:51
+msgid "Show text labels under icons"
+msgstr "Mostra il testo dell'etichetta sotto le icone"
+
+#: ../picard/ui/ui_options_interface.py:52
+msgid "Allow selection of multiple directories"
+msgstr "Consenti la selezione di più cartelle"
+
+#: ../picard/ui/ui_options_interface.py:53
+msgid "Use advanced query syntax"
+msgstr "Usa sintassi di richiesta avanzata"
+
+#: ../picard/ui/ui_options_interface.py:54
+#, fuzzy
+msgid "User interface language:"
+msgstr "Interfaccia utente"
+
+#: ../picard/ui/ui_options_naming.py:165
+msgid "Rename Files"
+msgstr "Rinomina file"
+
+#: ../picard/ui/ui_options_naming.py:166
+msgid "Replace Windows-incompatible characters"
+msgstr "Sostituisci i caratteri non compatibili con Windows"
+
+#: ../picard/ui/ui_options_naming.py:167
+msgid "Replace non-ASCII characters"
+msgstr "Sostituisci i caratteri non ASCII"
+
+#: ../picard/ui/ui_options_naming.py:168
+#: ../picard/ui/ui_options_naming.py:169
+#: ../picard/ui/ui_options_metadata.py:109
+#: ../picard/ui/ui_options_metadata.py:110
+msgid "Default"
+msgstr "Default"
+
+#: ../picard/ui/ui_options_naming.py:170
+#: ../picard/ui/options/naming.py:90
+msgid "Multiple artist file naming format:"
+msgstr "Formato-file per interpreti diversi:"
+
+#: ../picard/ui/ui_options_naming.py:171
+#: ../picard/ui/options/naming.py:86
+msgid "File naming format:"
+msgstr "Formato del nome del file:"
+
+#: ../picard/ui/ui_options_naming.py:172
+msgid "Move Files"
+msgstr "Sposta files"
+
+#: ../picard/ui/ui_options_naming.py:173
+msgid "Move tagged files to this directory:"
+msgstr "Sposta i files che hanno il tag in questa cartella:"
+
+#: ../picard/ui/ui_options_naming.py:174
+msgid "Browse..."
+msgstr "Sfoglia..."
+
+#: ../picard/ui/ui_options_naming.py:175
+msgid "Move additional files:"
+msgstr "Sposta files aggiuntivi:"
+
+#: ../picard/ui/ui_options_naming.py:176
+msgid "Delete empty directories"
+msgstr "Cancella cartelle vuote"
+
+#: ../picard/ui/ui_options_naming.py:177
+msgid "Example"
+msgstr "Esempio"
+
+#: ../picard/ui/ui_options_naming.py:178
+msgid "File name:"
+msgstr "Nome file:"
+
+#: ../picard/ui/ui_options_naming.py:179
+msgid "Multiple artist file name:"
+msgstr "Nome del file di Artisti vari"
 
-#: ../picard/ui/ui_tagsfromfilenames.py:58
 #: ../picard/ui/ui_options_naming.py:180
+#: ../picard/ui/ui_tagsfromfilenames.py:58
 msgid "&Preview"
 msgstr "Ante&prima"
 
@@ -463,11 +2022,22 @@ msgstr "Ante&prima"
 msgid "MusicBrainz Server"
 msgstr "Server MusicBrainz"
 
+#: ../picard/ui/ui_options_general.py:109
+#: ../picard/ui/ui_options_proxy.py:84
+msgid "Port:"
+msgstr "Porta:"
+
+#: ../picard/ui/ui_options_general.py:110
+#: ../picard/ui/ui_options_proxy.py:85
+msgid "Server address:"
+msgstr "Indirizzo server:"
+
 #: ../picard/ui/ui_options_general.py:111
 msgid "Account Information"
 msgstr "Informazioni account"
 
 #: ../picard/ui/ui_options_general.py:114
+#: ../picard/ui/options/general.py:29
 msgid "General"
 msgstr "Generale"
 
@@ -475,34 +2045,6 @@ msgstr "Generale"
 msgid "Automatically scan all new files"
 msgstr "Analizza automaticamente tutti i file nuovi"
 
-#: ../picard/ui/ui_options_interface.py:46
-msgid "Miscellaneous"
-msgstr "Varie"
-
-#: ../picard/ui/ui_options_interface.py:47
-msgid "Show text labels under icons"
-msgstr "Mostra il testo dell'etichetta sotto le icone"
-
-#: ../picard/ui/ui_options_interface.py:48
-msgid "Allow selection of multiple directories"
-msgstr "Consenti la selezione di più cartelle"
-
-#: ../picard/ui/ui_options_interface.py:49
-msgid "Use advanced query syntax"
-msgstr "Usa sintassi di richiesta avanzata"
-
-#: ../picard/ui/itemviews.py:327
-msgid "&Releases"
-msgstr "&Distibuzioni"
-
-#: ../picard/ui/itemviews.py:353
-msgid "&Plugins"
-msgstr "&Plugin"
-
-#: ../picard/ui/itemviews.py:523
-msgid "Clusters"
-msgstr "Frammenti"
-
 #: ../picard/ui/ui_options_matching.py:105
 msgid "Thresholds"
 msgstr "Limiti"
@@ -523,6 +2065,68 @@ msgstr "Ricerca per minima somiglianza fra cluster:"
 msgid "Minimal similarity for PUID lookups:"
 msgstr "Somiglianza minima per le ricerche PUID:"
 
+#: ../picard/ui/ui_options_metadata.py:100
+#: ../picard/ui/options/metadata.py:31
+msgid "Metadata"
+msgstr "Metadata"
+
+#: ../picard/ui/ui_options_metadata.py:101
+msgid "Translate foreign artist names to English where possible"
+msgstr "Traduci i nomi degli artisti stranieri in inglese quando è possibile"
+
+#: ../picard/ui/ui_options_metadata.py:102
+msgid "Use release relationships"
+msgstr "Usa rapporti del rilascio"
+
+#: ../picard/ui/ui_options_metadata.py:103
+msgid "Use track relationships"
+msgstr "Usa le relazioni delle tracce"
+
+#: ../picard/ui/ui_options_metadata.py:104
+msgid "Use folksonomy tags as genre"
+msgstr "Usa Folksonomy Tags come genere"
+
+#: ../picard/ui/ui_options_metadata.py:105
+#, fuzzy
+msgid "Preferred release country:"
+msgstr "Tipo di Distribuzione"
+
+#: ../picard/ui/ui_options_metadata.py:106
+msgid "Custom Fields"
+msgstr "Campi Personalizzati"
+
+#: ../picard/ui/ui_options_metadata.py:107
+msgid "Various artists:"
+msgstr "Artisti vari:"
+
+#: ../picard/ui/ui_options_metadata.py:108
+msgid "Non-album tracks:"
+msgstr "Tracce senza album:"
+
+#: ../picard/ui/ui_options_plugins.py:58
+#: ../picard/ui/options/plugins.py:30
+msgid "Plugins"
+msgstr "Plugin"
+
+#: ../picard/ui/ui_options_plugins.py:60
+#: ../picard/ui/options/plugins.py:79
+msgid "Author"
+msgstr "Autore"
+
+#: ../picard/ui/ui_options_plugins.py:61
+#: ../picard/util/tags.py:36
+msgid "Version"
+msgstr "Versione"
+
+#: ../picard/ui/ui_options_proxy.py:81
+#: ../picard/ui/options/proxy.py:28
+msgid "Web Proxy"
+msgstr "Proxy Web"
+
+#: ../picard/ui/ui_options_script.py:52
+msgid "Tagger Script"
+msgstr "Script Tagger"
+
 #: ../picard/ui/ui_options_tags.py:105
 msgid "Common"
 msgstr "Comune"
@@ -575,343 +2179,29 @@ msgstr "APE"
 msgid "Remove APEv2 tags from MP3 files"
 msgstr "Rimuovi i tag APEv2 dai file MP3"
 
-#: ../picard/ui/ui_options_cdlookup_win32.py:56 ../picard/ui/ui_cdlookup.py:60
-#: ../picard/ui/ui_options_cdlookup.py:47
-msgid "CD Lookup"
-msgstr "Controlla CD"
+#: ../picard/ui/ui_tagsfromfilenames.py:56
+msgid "Convert File Names to Tags"
+msgstr "Converti i nomi dei file in tag"
 
-#: ../picard/ui/ui_options_cdlookup_win32.py:57
-msgid "Default CD-ROM drive to use for lookups:"
-msgstr "Unità CD predefinita da usare per i controlli:"
+#: ../picard/ui/ui_tagsfromfilenames.py:57
+msgid "Replace underscores with spaces"
+msgstr "Sostituisci gli underscore con degli spazi"
 
-#: ../picard/ui/tageditor.py:65 ../picard/ui/ui_options_plugins.py:62
-#: ../picard/ui/multitageditor.py:37
-msgid "Details"
-msgstr "Dettagli"
-
-#: ../picard/ui/tageditor.py:70 ../picard/ui/tageditor.py:241
-#: ../picard/ui/multitageditor.py:42 ../picard/ui/multitageditor.py:197
-#, python-format
-msgid "%d file"
-msgid_plural "%d files"
-msgstr[0] "file %d"
-msgstr[1] "file %d"
-
-#: ../picard/ui/tageditor.py:124 ../picard/ui/multitageditor.py:95
-#, python-format
-msgid "(different across %d file)"
-msgid_plural "(different across %d files)"
-msgstr[0] "(diversi su %d file)"
-msgstr[1] "(diversi su %d files)"
-
-#: ../picard/ui/tageditor.py:127 ../picard/ui/multitageditor.py:98
-#, python-format
-msgid "(missing from %d file)"
-msgid_plural "(missing from %d files)"
-msgstr[0] "(mancamento di %d file)"
-msgstr[1] "(mancamento di %d files)"
-
-#: ../picard/ui/tageditor.py:210 ../picard/ui/multitageditor.py:166
-msgid "Filename:"
-msgstr "Nome file:"
-
-#: ../picard/ui/tageditor.py:212 ../picard/ui/multitageditor.py:168
-msgid "Format:"
-msgstr "Formato:"
-
-#: ../picard/ui/tageditor.py:221 ../picard/ui/multitageditor.py:177
-msgid "Size:"
-msgstr "Dimesione:"
-
-#: ../picard/ui/tageditor.py:227 ../picard/ui/multitageditor.py:183
-msgid "Bitrate:"
-msgstr "Bitrate:"
-
-#: ../picard/ui/tageditor.py:229 ../picard/ui/multitageditor.py:185
-msgid "Sample rate:"
-msgstr "Tasso di campionamento:"
-
-#: ../picard/ui/tageditor.py:231 ../picard/ui/multitageditor.py:187
-msgid "Bits per sample:"
-msgstr "Bits per sample:"
-
-#: ../picard/ui/tageditor.py:234 ../picard/ui/multitageditor.py:190
-msgid "Mono"
-msgstr "Mono"
-
-#: ../picard/ui/tageditor.py:235 ../picard/ui/multitageditor.py:191
-msgid "Stereo"
-msgstr "Stereo"
-
-#: ../picard/ui/tageditor.py:237 ../picard/ui/multitageditor.py:193
-msgid "Channels:"
-msgstr "Canali:"
-
-#: ../picard/ui/ui_tageditor.py:115 ../picard/ui/ui_multitageditor.py:55
-#: ../picard/ui/ui_options_plugins.py:59 ../picard/ui/options/plugins.py:76
-msgid "Name"
-msgstr "Nome"
-
-#: ../picard/ui/ui_tageditor.py:116 ../picard/ui/ui_multitageditor.py:56
-msgid "Value"
-msgstr "Valore"
-
-#: ../picard/ui/ui_tageditor.py:117 ../picard/ui/ui_multitageditor.py:57
-msgid "&Add..."
-msgstr "&Aggiungi..."
-
-#: ../picard/ui/ui_tageditor.py:118
-msgid "&Edit..."
-msgstr "&Modifica..."
-
-#: ../picard/ui/ui_tageditor.py:119
-msgid "&Delete"
-msgstr "&Cancella"
-
-#: ../picard/ui/ui_tageditor.py:120
-msgid "&Metadata"
-msgstr "&Metadati"
-
-#: ../picard/ui/ui_tageditor.py:121
-msgid "A&rtwork"
-msgstr "A&rtwork"
-
-#: ../picard/ui/ui_tageditor.py:122
-msgid "&Info"
-msgstr "&Info"
-
-#: ../picard/ui/coverartbox.py:47
-msgid "Cover Art"
-msgstr "Copertina"
-
-#: ../picard/ui/coverartbox.py:95
-msgid "Buy the album on Amazon"
-msgstr "Compra l'album su Amazon"
-
-#: ../picard/ui/ui_puidsubmit.py:52
-msgid "Submit PUIDs"
-msgstr "Sto inviando i PUID"
-
-#: ../picard/ui/ui_puidsubmit.py:53 ../picard/ui/ui_cdlookup.py:62
-msgid "OK"
-msgstr "Ok"
-
-#: ../picard/ui/ui_puidsubmit.py:54 ../picard/ui/ui_cdlookup.py:64
-msgid "Cancel"
-msgstr "Annulla"
-
-#: ../picard/ui/puidsubmit.py:31 ../picard/ui/options/plugins.py:80
-msgid "File"
-msgstr "File"
-
-#: ../picard/ui/puidsubmit.py:31
-msgid "PUID"
-msgstr "PUID"
-
-#: ../picard/ui/puidsubmit.py:31
-msgid "Release"
-msgstr "Distribuzione"
-
-#: ../picard/ui/puidsubmit.py:31
-msgid "Release ID"
-msgstr "Codice ID della distribuzione"
-
-#: ../picard/ui/filebrowser.py:41
-#, fuzzy
-msgid "&Move Tagged Files Here"
-msgstr "&Sposta files"
-
-#: ../picard/ui/filebrowser.py:44
-msgid "Show &Hidden Files"
-msgstr ""
-
-#: ../picard/ui/ui_cdlookup.py:61
-msgid "The following releases on MusicBrainz match the CD:"
-msgstr "Le seguenti release su MusicBrainz combaciono con il CD:"
-
-#: ../picard/ui/ui_cdlookup.py:63
-msgid "    Lookup manually    "
-msgstr "    Cerca manualmente    "
-
-#: ../picard/ui/ui_options.py:42
-msgid "Options"
-msgstr "Opzioni"
-
-#: ../picard/ui/tagsfromfilenames.py:52 ../picard/ui/tagsfromfilenames.py:96
-msgid "File Name"
-msgstr "Nome file"
-
-#: ../picard/ui/ui_options_cover.py:56
-msgid "Location"
-msgstr "Località"
-
-#: ../picard/ui/ui_options_cover.py:57
-msgid "Embed cover images into tags"
-msgstr "Includi l'immagine della copertina nei tag"
-
-#: ../picard/ui/ui_options_cover.py:58
-msgid "Save cover images as separate files"
-msgstr "Salva l'immagine della copertina come file separato"
-
-#: ../picard/ui/ui_options_cover.py:59
-msgid "Overwrite the file if it already exists"
-msgstr "Sovrascrivi il file se è già presente"
-
-#: ../picard/ui/ui_options_metadata.py:100
-msgid "Metadata"
-msgstr "Metadata"
-
-#: ../picard/ui/ui_options_metadata.py:101
-msgid "Translate foreign artist names to English where possible"
-msgstr "Traduci i nomi degli artisti stranieri in inglese quando è possibile"
-
-#: ../picard/ui/ui_options_metadata.py:102
-msgid "Use release relationships"
-msgstr "Usa rapporti del rilascio"
-
-#: ../picard/ui/ui_options_metadata.py:103
-msgid "Use track relationships"
-msgstr "Usa le relazioni delle tracce"
-
-#: ../picard/ui/ui_options_metadata.py:104
-msgid "Use folksonomy tags as genre"
-msgstr "Usa Folksonomy Tags come genere"
-
-#: ../picard/ui/ui_options_metadata.py:105
-#, fuzzy
-msgid "Preferred release country:"
-msgstr "Paese della Distribuzione"
-
-#: ../picard/ui/ui_options_metadata.py:106
-msgid "Custom Fields"
-msgstr "Campi Personalizzati"
-
-#: ../picard/ui/ui_options_metadata.py:107
-msgid "Various artists:"
-msgstr "Artisti vari:"
-
-#: ../picard/ui/ui_options_metadata.py:108
-msgid "Non-album tracks:"
-msgstr "Tracce senza album:"
-
-#: ../picard/ui/ui_options_metadata.py:109
-#: ../picard/ui/ui_options_metadata.py:110
-#: ../picard/ui/ui_options_naming.py:168 ../picard/ui/ui_options_naming.py:169
-msgid "Default"
-msgstr "Default"
-
-#: ../picard/ui/ui_multitageditor.py:58
-msgid "Delete"
-msgstr "Cancella"
-
-#: ../picard/ui/logview.py:29
-msgid "Log"
-msgstr "Registro"
-
-#: ../picard/ui/ui_options_plugins.py:58
-msgid "Plugins"
-msgstr "Plugin"
-
-#: ../picard/ui/ui_options_plugins.py:60 ../picard/ui/options/plugins.py:79
-msgid "Author"
-msgstr "Autore"
-
-#: ../picard/ui/ui_options_plugins.py:61
-msgid "Version"
-msgstr "Versione"
-
-#: ../picard/ui/ui_options_naming.py:165
-msgid "Rename Files"
-msgstr "Rinomina file"
-
-#: ../picard/ui/ui_options_naming.py:166
-msgid "Replace Windows-incompatible characters"
-msgstr "Sostituisci i caratteri non compatibili con Windows"
-
-#: ../picard/ui/ui_options_naming.py:167
-msgid "Replace non-ASCII characters"
-msgstr "Sostituisci i caratteri non ASCII"
-
-#: ../picard/ui/ui_options_naming.py:170 ../picard/ui/options/naming.py:90
-msgid "Multiple artist file naming format:"
-msgstr "Formato-file per interpreti diversi:"
-
-#: ../picard/ui/ui_options_naming.py:171 ../picard/ui/options/naming.py:86
-msgid "File naming format:"
-msgstr "Formato del nome del file:"
-
-#: ../picard/ui/ui_options_naming.py:172
-msgid "Move Files"
-msgstr "Sposta files"
-
-#: ../picard/ui/ui_options_naming.py:173
-msgid "Move tagged files to this directory:"
-msgstr "Sposta i files che hanno il tag in questa cartella:"
-
-#: ../picard/ui/ui_options_naming.py:174
-msgid "Browse..."
-msgstr "Sfoglia..."
-
-#: ../picard/ui/ui_options_naming.py:175
-msgid "Move additional files:"
-msgstr "Sposta files aggiuntivi:"
-
-#: ../picard/ui/ui_options_naming.py:176
-msgid "Delete empty directories"
-msgstr "Cancella cartelle vuote"
-
-#: ../picard/ui/ui_options_naming.py:177
-msgid "Example"
-msgstr "Esempio"
-
-#: ../picard/ui/ui_options_naming.py:178
-msgid "File name:"
-msgstr "Nome file:"
-
-#: ../picard/ui/ui_options_naming.py:179
-msgid "Multiple artist file name:"
-msgstr "Nome del file di Artisti vari"
-
-#: ../picard/ui/ui_options_cdlookup.py:48
-msgid "CD-ROM device to use for lookups:"
-msgstr "Unità CD da usare per i controlli:"
-
-#: ../picard/ui/options/scripting.py:84 ../picard/ui/options/naming.py:86
-#: ../picard/ui/options/naming.py:90 ../picard/ui/options/naming.py:93
-#: ../picard/ui/options/naming.py:95
-msgid "Script Error"
-msgstr "Errore causato dallo script"
+#: ../picard/ui/options/about.py:29
+msgid "About"
+msgstr "Informazioni"
 
 #. Replace this with your name to have it appear in the "About" dialog.
 #: ../picard/ui/options/about.py:48
 msgid "translator-credits"
 msgstr ""
 "Launchpad Contributions:\n"
-"  Matteo Piotto <https://launchpad.net/~piotto>\n"
-"\n"
-"Launchpad Contributions:\n"
 "  Matteo Piotto https://launchpad.net/~piotto\n"
 "  Nicola Piovesan https://launchpad.net/~piovesannicola\n"
-"\n"
-"Launchpad Contributions:\n"
-"  Matteo Piotto https://launchpad.net/~piotto\n"
-"  Nicola Piovesan https://launchpad.net/~piovesannicola\n"
-"\n"
-"Launchpad Contributions:\n"
 "  Alberto https://launchpad.net/~albertotomaduz\n"
 "  Daniele de Virgilio https://launchpad.net/~erunamo\n"
-"  Matteo Piotto https://launchpad.net/~piotto\n"
-"  Nicola Piovesan https://launchpad.net/~piovesannicola\n"
 "  StanD_AlOnE https://launchpad.net/~jacxs-lj\n"
-"\n"
-"Launchpad Contributions:\n"
-"  Alberto Antioco Cogoni https://launchpad.net/~neurino\n"
-"  Daniele de Virgilio https://launchpad.net/~erunamo\n"
-"  Lukáš Lalinský https://launchpad.net/~luks\n"
-"  Matteo Piotto https://launchpad.net/~piotto\n"
-"  Nicola Piovesan https://launchpad.net/~piovesannicola\n"
-"  StanD_AlOnE https://launchpad.net/~jacxs-lj\n"
-"  albertotomaduz https://launchpad.net/~albertotomaduz"
+"  Alberto Antioco Cogoni https://launchpad.net/~neurino"
 
 #. Replace LANG with language you are translatig to.
 #: ../picard/ui/options/about.py:51
@@ -922,31 +2212,62 @@ msgstr "<br/>Tradotto in Italiano da %s"
 #: ../picard/ui/options/about.py:55
 #, fuzzy, python-format
 msgid ""
-"<p align=\"center\"><span style=\"font-size:15px;font-weight:bold;"
-"\">MusicBrainz Picard</span><br/>\n"
+"<p align=\"center\"><span style=\"font-size:15px;font-weight:bold;\">MusicBrainz Picard</span><br/>\n"
 "Version %(version)s</p>\n"
 "<p align=\"center\"><strong>Supported formats</strong><br/>%(formats)s</p>\n"
 "<p align=\"center\"><strong>Please donate</strong><br/>\n"
-"Thank you for using Picard. Picard relies on the MusicBrainz database, which "
-"is operated by the MetaBrainz Foundation with the help of thousands of "
-"volunteers. If you like this application please consider donating to the "
-"MetaBrainz Foundation to keep the service running.</p>\n"
-"<p align=\"center\"><a href=\"http://metabrainz.org/donate/index.html"
-"\">Donate now!</a></p>\n"
+"Thank you for using Picard. Picard relies on the MusicBrainz database, which is operated by the MetaBrainz Foundation with the help of thousands of volunteers. If you like this application please consider donating to the MetaBrainz Foundation to keep the service running.</p>\n"
+"<p align=\"center\"><a href=\"http://metabrainz.org/donate/index.html\">Donate now!</a></p>\n"
 "<p align=\"center\"><strong>Credits</strong><br/>\n"
-"<small>Copyright © 2004-2008 Robert Kaye, Lukáš Lalinský and others%"
-"(translator-credits)s</small></p>\n"
-"<p align=\"center\"><a href=\"http://musicbrainz.org/doc/PicardTagger"
-"\">http://musicbrainz.org/doc/PicardTagger</a></p>\n"
+"<small>Copyright © 2004-2008 Robert Kaye, Lukáš Lalinský and others%(translator-credits)s</small></p>\n"
+"<p align=\"center\"><a href=\"http://musicbrainz.org/doc/PicardTagger\">http://musicbrainz.org/doc/PicardTagger</a></p>\n"
 msgstr ""
-"p align=\"center\"><span style=\"font-size:15px;font-weight:bold;"
-"\">MusicBrainz Picard</span><br/>\n"
+"p align=\"center\"><span style=\"font-size:15px;font-weight:bold;\">MusicBrainz Picard</span><br/>\n"
 "Versione %(version)s</p>\n"
 "<p align=\"center\"><strong>Formati supportati:</strong> %(formats)s</p>\n"
-"<p align=\"center\"><small>Copyright © 2004-2007 Robert Kaye, Lukáš Lalinský "
-"e altri%(translator-credits)s</small></p>\n"
-"<p align=\"center\"><a href=\"http://musicbrainz.org/doc/PicardTagger"
-"\">http://musicbrainz.org/doc/PicardTagger</a></p>\n"
+"<p align=\"center\"><small>Copyright © 2004-2007 Robert Kaye, Lukáš Lalinský e altri%(translator-credits)s</small></p>\n"
+"<p align=\"center\"><a href=\"http://musicbrainz.org/doc/PicardTagger\">http://musicbrainz.org/doc/PicardTagger</a></p>\n"
+
+#: ../picard/ui/options/advanced.py:26
+msgid "Advanced"
+msgstr "Avanzate"
+
+#: ../picard/ui/options/interface.py:31
+msgid "User Interface"
+msgstr "Interfaccia utente"
+
+#: ../picard/ui/options/interface.py:47
+msgid "System default"
+msgstr "Predefinito di sistema"
+
+#: ../picard/ui/options/interface.py:71
+#, fuzzy
+msgid "Language changed"
+msgstr "Lingua"
+
+#: ../picard/ui/options/interface.py:71
+msgid "You have changed the interface language. You have to restart Picard in order for the change to take effect."
+msgstr ""
+
+#: ../picard/ui/options/matching.py:29
+msgid "Matching"
+msgstr "Sto Accoppiando"
+
+#: ../picard/ui/options/metadata.py:52
+msgid "None"
+msgstr ""
+
+#: ../picard/ui/options/naming.py:33
+msgid "File Naming"
+msgstr "Assegnazione di nome al file"
+
+#: ../picard/ui/options/naming.py:86
+#: ../picard/ui/options/naming.py:90
+#: ../picard/ui/options/naming.py:93
+#: ../picard/ui/options/naming.py:95
+#: ../picard/ui/options/scripting.py:84
+msgid "Script Error"
+msgstr "Errore causato dallo script"
 
 #: ../picard/ui/options/naming.py:93
 msgid "The file naming format must not be empty."
@@ -965,6 +2286,235 @@ msgstr ""
 msgid "The location to move files to must not be empty."
 msgstr ""
 
+#: ../picard/ui/options/scripting.py:63
+msgid "Scripting"
+msgstr "Scripting"
+
+#: ../picard/ui/options/tags.py:29
+msgid "Tags"
+msgstr "Tag"
+
+#: ../picard/util/tags.py:24
+msgid "Date"
+msgstr "Data"
+
+#: ../picard/util/tags.py:25
+msgid "Album Artist"
+msgstr "Artista"
+
+#: ../picard/util/tags.py:26
+msgid "Track Number"
+msgstr "Brano numero"
+
+#: ../picard/util/tags.py:27
+msgid "Total Tracks"
+msgstr "Tracce totali"
+
+#: ../picard/util/tags.py:28
+msgid "Disc Number"
+msgstr "Disco numero"
+
+#: ../picard/util/tags.py:29
+msgid "Total Discs"
+msgstr "Totale dischi"
+
+#: ../picard/util/tags.py:30
+msgid "Album Artist Sort Order"
+msgstr "Ordina per Artista"
+
+#: ../picard/util/tags.py:31
+msgid "Artist Sort Order"
+msgstr "Ordinamento artisti"
+
+#: ../picard/util/tags.py:32
+msgid "Title Sort Order"
+msgstr "Ordinamento titoli"
+
+#: ../picard/util/tags.py:33
+msgid "Album Sort Order"
+msgstr "Ordina per Album"
+
+#: ../picard/util/tags.py:34
+msgid "ASIN"
+msgstr "ASIN"
+
+#: ../picard/util/tags.py:35
+msgid "Grouping"
+msgstr "Raggruppamento"
+
+#: ../picard/util/tags.py:37
+msgid "ISRC"
+msgstr "ISRC"
+
+#: ../picard/util/tags.py:38
+msgid "Mood"
+msgstr "Modo"
+
+#: ../picard/util/tags.py:39
+msgid "BPM"
+msgstr "BPM"
+
+#: ../picard/util/tags.py:40
+msgid "Copyright"
+msgstr "Copyright"
+
+#: ../picard/util/tags.py:41
+msgid "Composer"
+msgstr "Compositore"
+
+#: ../picard/util/tags.py:42
+msgid "Conductor"
+msgstr "Conduttore"
+
+#: ../picard/util/tags.py:43
+msgid "Lyricist"
+msgstr "Autore testo"
+
+#: ../picard/util/tags.py:44
+msgid "Arranger"
+msgstr "Arrangiatore"
+
+#: ../picard/util/tags.py:45
+msgid "Producer"
+msgstr "Produttore"
+
+#: ../picard/util/tags.py:46
+msgid "Engineer"
+msgstr "Ingegnere"
+
+#: ../picard/util/tags.py:47
+msgid "Subtitle"
+msgstr "Sottotitolo"
+
+#: ../picard/util/tags.py:48
+msgid "Disc Subtitle"
+msgstr "Sottotitolo del Disco"
+
+#: ../picard/util/tags.py:49
+msgid "Remixer"
+msgstr "Remixer"
+
+#: ../picard/util/tags.py:50
+msgid "MusicBrainz Track Id"
+msgstr "Codice Id del Brano in Music Brainz"
+
+#: ../picard/util/tags.py:51
+msgid "MusicBrainz Release Id"
+msgstr "Codice Id della Distribuzione di MusicBrainz"
+
+#: ../picard/util/tags.py:52
+msgid "MusicBrainz Artist Id"
+msgstr "Codice Id dell'Artista in MusicBrainz"
+
+#: ../picard/util/tags.py:53
+msgid "MusicBrainz Release Artist Id"
+msgstr "Codice Id dell'Artista nella Distribuzione di MusicBrainz"
+
+#: ../picard/util/tags.py:54
+msgid "MusicBrainz TRM Id"
+msgstr "Codice Id del TRM in MusicBrainz"
+
+#: ../picard/util/tags.py:55
+#, fuzzy
+msgid "MusicBrainz Disc Id"
+msgstr "Codice Id dell'Artista in MusicBrainz"
+
+#: ../picard/util/tags.py:56
+#, fuzzy
+msgid "MusicBrainz Sort Name"
+msgstr "Server MusicBrainz"
+
+#: ../picard/util/tags.py:57
+msgid "MusicIP PUID"
+msgstr "PUID MusicIP"
+
+#: ../picard/util/tags.py:58
+msgid "MusicIP Fingerprint"
+msgstr "Codice Identificativo MusicIP"
+
+#: ../picard/util/tags.py:59
+msgid "Disc Id"
+msgstr ""
+
+#: ../picard/util/tags.py:60
+msgid "Website"
+msgstr "Sito web"
+
+#: ../picard/util/tags.py:61
+msgid "Compilation"
+msgstr "Compilation"
+
+#: ../picard/util/tags.py:62
+msgid "Comment"
+msgstr "Commento"
+
+#: ../picard/util/tags.py:63
+msgid "Genre"
+msgstr "Genere"
+
+#: ../picard/util/tags.py:64
+msgid "Encoded By"
+msgstr "Codificato da"
+
+#: ../picard/util/tags.py:65
+msgid "Performer"
+msgstr "Esecutore"
+
+#: ../picard/util/tags.py:66
+msgid "Release Type"
+msgstr "Tipo di Distribuzione"
+
+#: ../picard/util/tags.py:67
+msgid "Release Status"
+msgstr "Stato della Distribuzione"
+
+#: ../picard/util/tags.py:68
+#, fuzzy
+msgid "Release Country"
+msgstr "Tipo di Distribuzione"
+
+#: ../picard/util/tags.py:69
+msgid "Record Label"
+msgstr "Etichetta discografica"
+
+#: ../picard/util/tags.py:70
+msgid "Barcode"
+msgstr "Codice a barre"
+
+#: ../picard/util/tags.py:71
+msgid "Catalog Number"
+msgstr "Numero di Catalogo"
+
+#: ../picard/util/tags.py:72
+#, fuzzy
+msgid "Format"
+msgstr "Formato:"
+
+#: ../picard/util/tags.py:73
+msgid "DJ-Mixer"
+msgstr "DJ_Mixer"
+
+#: ../picard/util/tags.py:74
+msgid "Media"
+msgstr "Supporti"
+
+#: ../picard/util/tags.py:75
+msgid "Lyrics"
+msgstr "Testi"
+
+#: ../picard/util/tags.py:76
+msgid "Mixer"
+msgstr "Mixer"
+
+#: ../picard/util/tags.py:77
+msgid "Language"
+msgstr "Lingua"
+
+#: ../picard/util/tags.py:78
+#, fuzzy
+msgid "Script"
+msgstr "Scripting"
+
 #: ../picard/util/webbrowser2.py:84
 msgid "Web Browser Error"
 msgstr "Errore del Navigatore"
@@ -980,291 +2530,69 @@ msgstr ""
 "\n"
 "%s"
 
-#~ msgid "No matching tracks for file %s"
-#~ msgstr "Nessuna traccia trovata per il file %s"
-
-#~ msgid "File %s identified!"
-#~ msgstr "Il file %s è stato identificato!"
-
-#~ msgid "Looking up the PUID for file %s..."
-#~ msgstr "Sto cercando il file %s nel PUID"
-
-#~ msgid "Looking up the metadata for file %s..."
-#~ msgstr "Sto cercando il metadata del file %s..."
-
-#~ msgid "No matching releases for cluster %s"
-#~ msgstr "Nessuna release combacia per il cluster %s"
-
-#~ msgid "Cluster %s identified!"
-#~ msgstr "Ho identificato il frammento %s"
-
-#~ msgid "Looking up the metadata for cluster %s..."
-#~ msgstr "Sto controllando i metadati del frammento %s..."
-
-#~ msgid "M3U Playlist (*.m3u)"
-#~ msgstr "Lista di ascolto M3U (*.m3u)"
-
-#~ msgid "PLS Playlist (*.pls)"
-#~ msgstr "Lista di ascolto PLS (*.pls)"
-
-#~ msgid "XSPF Playlist (*.xspf)"
-#~ msgstr "Lista di ascolto XSPF (*.xspf)"
-
-#~ msgid "Submitting PUIDs..."
-#~ msgstr "Sto trasmettendo i PUIDS..."
-
-#~ msgid "PUIDs submission failed: %s"
-#~ msgstr "L'invio dei PUID è fallito: %s"
-
-#~ msgid "PUIDs successfully submitted!"
-#~ msgstr "PUID correttamente inviati."
-
 #~ msgid "New Version"
 #~ msgstr "Nuova versione"
-
 #~ msgid ""
 #~ "New version of Picard is available (%s). Would you like to download it "
 #~ "now?"
 #~ msgstr ""
 #~ "Una nuova versione di Picard (%s) è disponibile. La vuoi scaricare ora?"
+#~ msgid "Delete"
+#~ msgstr "Cancella"
+#~ msgid "Maximal number of tags:"
+#~ msgstr "Numero massimo di tag:"
 
-#~ msgid "Couldn't find PUID for file %s"
-#~ msgstr "Non riesco a trovare il PUID per il file %s"
-
-#~ msgid "Looking up the fingerprint for file %s..."
-#~ msgstr "Sto controllando il codice identificativo del file %s"
-
-#~ msgid "Creating fingerprint for file %s..."
-#~ msgstr "Sto creando l'impronta digitale del file %s..."
-
-#~ msgid "Length"
-#~ msgstr "Durata"
-
-#~ msgid "&Ok"
-#~ msgstr "&Ok"
-
-#~ msgid "&Cancel"
-#~ msgstr "A&nnulla"
-
-#~ msgid "About"
-#~ msgstr "Informazioni"
-
-#~ msgid "Advanced"
-#~ msgstr "Avanzate"
-
-#~ msgid "Matching"
-#~ msgstr "Sto Accoppiando"
-
-#~ msgid "File Naming"
-#~ msgstr "Assegnazione di nome al file"
-
-#~ msgid "Scripting"
-#~ msgstr "Scripting"
-
-#~ msgid "Tags"
-#~ msgstr "Tag"
-
-#~ msgid "User Interface"
-#~ msgstr "Interfaccia utente"
-
-#~ msgid "Date"
-#~ msgstr "Data"
-
-#~ msgid "Album Artist"
-#~ msgstr "Artista"
-
-#~ msgid "Track Number"
-#~ msgstr "Brano numero"
-
-#~ msgid "Total Tracks"
-#~ msgstr "Tracce totali"
-
-#~ msgid "Disc Number"
-#~ msgstr "Disco numero"
-
-#~ msgid "Total Discs"
-#~ msgstr "Totale dischi"
-
-#~ msgid "Album Artist Sort Order"
-#~ msgstr "Ordina per Artista"
-
-#~ msgid "Artist Sort Order"
-#~ msgstr "Ordinamento artisti"
-
-#~ msgid "Title Sort Order"
-#~ msgstr "Ordinamento titoli"
-
-#~ msgid "Album Sort Order"
-#~ msgstr "Ordina per Album"
-
-#~ msgid "ASIN"
-#~ msgstr "ASIN"
-
-#~ msgid "Grouping"
-#~ msgstr "Raggruppamento"
-
-#~ msgid "ISRC"
-#~ msgstr "ISRC"
-
-#~ msgid "Mood"
-#~ msgstr "Modo"
-
-#~ msgid "BPM"
-#~ msgstr "BPM"
-
-#~ msgid "Copyright"
-#~ msgstr "Copyright"
-
-#~ msgid "Composer"
-#~ msgstr "Compositore"
-
-#~ msgid "Conductor"
-#~ msgstr "Conduttore"
-
-#~ msgid "Lyricist"
-#~ msgstr "Autore testo"
-
-#~ msgid "Arranger"
-#~ msgstr "Arrangiatore"
-
-#~ msgid "Producer"
-#~ msgstr "Produttore"
-
-#~ msgid "Engineer"
-#~ msgstr "Ingegnere"
-
-#~ msgid "Subtitle"
-#~ msgstr "Sottotitolo"
-
-#~ msgid "Disc Subtitle"
-#~ msgstr "Sottotitolo del Disco"
-
-#~ msgid "Remixer"
-#~ msgstr "Remixer"
-
-#~ msgid "MusicBrainz Track Id"
-#~ msgstr "Codice Id del Brano in Music Brainz"
-
-#~ msgid "MusicBrainz Release Id"
-#~ msgstr "Codice Id della Distribuzione di MusicBrainz"
-
-#~ msgid "MusicBrainz Artist Id"
-#~ msgstr "Codice Id dell'Artista in MusicBrainz"
-
-#~ msgid "MusicBrainz Release Artist Id"
-#~ msgstr "Codice Id dell'Artista nella Distribuzione di MusicBrainz"
-
-#~ msgid "MusicBrainz TRM Id"
-#~ msgstr "Codice Id del TRM in MusicBrainz"
-
-#~ msgid "MusicIP PUID"
-#~ msgstr "PUID MusicIP"
-
-#~ msgid "MusicIP Fingerprint"
-#~ msgstr "Codice Identificativo MusicIP"
-
-#~ msgid "Website"
-#~ msgstr "Sito web"
-
-#~ msgid "Compilation"
-#~ msgstr "Compilation"
-
-#~ msgid "Comment"
-#~ msgstr "Commento"
-
-#~ msgid "Genre"
-#~ msgstr "Genere"
-
-#~ msgid "Encoded By"
-#~ msgstr "Codificato da"
-
-#~ msgid "Performer"
-#~ msgstr "Esecutore"
-
-#~ msgid "Release Type"
-#~ msgstr "Tipo di Distribuzione"
-
-#~ msgid "Release Status"
-#~ msgstr "Stato della Distribuzione"
-
-#~ msgid "Record Label"
-#~ msgstr "Etichetta discografica"
-
-#~ msgid "Barcode"
-#~ msgstr "Codice a barre"
-
-#~ msgid "Catalog Number"
-#~ msgstr "Numero di Catalogo"
-
-#~ msgid "DJ-Mixer"
-#~ msgstr "DJ_Mixer"
-
-#~ msgid "Media"
-#~ msgstr "Supporti"
-
-#~ msgid "Lyrics"
-#~ msgstr "Testi"
-
-#~ msgid "Mixer"
-#~ msgstr "Mixer"
-
+#, fuzzy
+#~ msgid "Anal&yze"
+#~ msgstr "Analizza"
 #~ msgid "Ctrl+T"
 #~ msgstr "Ctrl+T"
 
+#, fuzzy
+#~ msgid "Generate &Cuesheet..."
+#~ msgstr "Genera &playlist..."
 #~ msgid "Automatically analyze all new files"
 #~ msgstr "Analizza automaticamente tutti i nuovi file"
 
-#~ msgid "Toolbar"
-#~ msgstr "Barra degli strumenti"
+#, fuzzy
+#~ msgid "Album artist:"
+#~ msgstr "Artista"
 
+#, fuzzy
+#~ msgid "A&dd Directory..."
+#~ msgstr "Aggiungi &Cartella...\tCtrl+D"
 #~ msgid "Are You Sure?"
 #~ msgstr "Sei sicuro?"
-
 #~ msgid "Add &Files...\tCtrl+O"
 #~ msgstr "Aggiungi &File...\tCtrl+O"
-
 #~ msgid "Add &Directory...\tCtrl+D"
 #~ msgstr "Aggiungi &Cartella...\tCtrl+D"
-
 #~ msgid "&Save Files\tCtrl+S"
 #~ msgstr "&Salva File\tCtrl+S"
-
 #~ msgid "C&opy\tCtrl+C"
 #~ msgstr "C&opia\tCtrl+C"
-
 #~ msgid "Help"
 #~ msgstr "Guida"
-
 #~ msgid "Preferences"
 #~ msgstr "Preferenze"
-
 #~ msgid "Error while saving cuesheet %s."
 #~ msgstr "Errore durante il salvataggio del cuesheet %s."
-
 #~ msgid "Cuesheet %s saved."
 #~ msgstr "Il cuesheet %s è stato salvato."
-
 #~ msgid "Time"
 #~ msgstr "Durata"
-
 #~ msgid "Albums"
 #~ msgstr "Album"
-
 #~ msgid "Force Save"
 #~ msgstr "Obbliga salvataggio"
-
 #~ msgid "Buy"
 #~ msgstr "Compra"
-
 #~ msgid "Welcome to Picard!"
 #~ msgstr "Benvenuto in Picard!"
-
 #~ msgid "Track Num"
 #~ msgstr "Traccia Num"
-
 #~ msgid "PUID Collision"
 #~ msgstr "Incongruenza PUID"
-
 #~ msgid ""
 #~ "Version %s\n"
 #~ "\n"
@@ -1291,121 +2619,84 @@ msgstr ""
 #~ "al supporto della comunità Helix.↵\n"
 #~ "↵\n"
 #~ "Formati supportati: %s"
-
-#~ msgid "Colors"
-#~ msgstr "Colori"
-
 #~ msgid "Font color"
 #~ msgstr "Colore carattere"
-
 #~ msgid "Directories"
 #~ msgstr "Cartelle"
-
 #~ msgid "Watch for new files"
 #~ msgstr "Controlla per nuovi file"
-
 #~ msgid "Watch this directory for new audio files"
 #~ msgstr "Controlla questa cartella per la presenza di nuovi file"
-
 #~ msgid "Encodings"
 #~ msgstr "Codifiche"
-
 #~ msgid "all languages"
 #~ msgstr "tutte le lingue"
-
 #~ msgid "percent similar."
 #~ msgstr "percentuale simile"
-
 #~ msgid "Load recently used albums on startup"
 #~ msgstr "Apri gli ultimi album usati all'avvio"
-
-#~ msgid "Language"
-#~ msgstr "Lingua"
-
-#~ msgid "System default"
-#~ msgstr "Predefinito di sistema"
-
 #~ msgid "Allowed filename characters"
 #~ msgstr "Caratteri permessi nel nome del file"
-
 #~ msgid "Use Windows-safe file names"
 #~ msgstr "Usa nomi file consentiti da Windows"
-
 #~ msgid "Number of tracks on the album"
 #~ msgstr "Numero di tracce presenti nell'album"
-
 #~ msgid "Track name"
 #~ msgstr "Titolo della traccia"
-
 #~ msgid "Zero padded track number"
 #~ msgstr "Numero della traccia con lo zero"
-
 #~ msgid "File format (e.g. mp3, ogg, wav)"
 #~ msgstr "Formato file (es. mp3, ogg, wav)"
-
 #~ msgid "Album type (album, single, EP, etc.)"
 #~ msgstr "Tipo album (album, single, EP, ecc.)"
-
 #~ msgid "Album Status (official, promo, etc.)"
 #~ msgstr "Stato dell'album (ufficiale, promo, etc.)"
-
 #~ msgid "Album release month"
 #~ msgstr "Mese di uscita dell'album"
-
 #~ msgid "Album release day"
 #~ msgstr "Giorno di uscita dell'album"
-
 #~ msgid "Album release year"
 #~ msgstr "Anno di uscita dell'album"
-
 #~ msgid "Make it so!"
 #~ msgstr "Salva"
-
 #~ msgid "Use proxy server to access the Internet"
 #~ msgstr "Usa un server proxy per accedere a Internet"
-
 #~ msgid "Proxy server to use"
 #~ msgstr "Server proxy da usare"
-
 #~ msgid "Proxy port"
 #~ msgstr "Porta proxy"
-
 #~ msgid "ID3v2.4 only"
 #~ msgstr "Solo ID3v2.4"
-
 #~ msgid "Save track/album"
 #~ msgstr "Salva traccia/album"
-
 #~ msgid "Artists"
 #~ msgstr "Artisti"
 
+#, fuzzy
+#~ msgid "Auto Tag"
+#~ msgstr "Modifica tag"
+
+#, fuzzy
+#~ msgid "Edit &Tags..."
+#~ msgstr "Modifica tag"
 #~ msgid "New files (drag files to tag here)"
 #~ msgstr "Nuovi file (trascina i file da catalogare qui)"
-
 #~ msgid "updating album information"
 #~ msgstr "sto aggiornando le informazioni sull'album"
-
 #~ msgid "Submitting PUID information to MusicBrainz server ..."
 #~ msgstr "Sto inviando le informazioni PUID al server di MusicBrainz"
-
 #~ msgid "Performing a PUID lookup on file %s ..."
 #~ msgstr "Sto cercando il PUID del file %s..."
-
 #~ msgid "Are you sure you want to exit the application?"
 #~ msgstr "Sei veramente sicuro di chiudere l'applicazione?"
-
 #~ msgid "CD Lookup error -- is there a CD in the CD-ROM drive?"
 #~ msgstr "Errore nel controllo del cd -- c'è un CD nel lettore CD-ROM?"
-
 #~ msgid "CD Lookup Failed"
 #~ msgstr "Controllo CD fallito"
-
 #~ msgid "&Quick Start Guide"
 #~ msgstr "&Guida iniziale"
-
 #~ msgid "Quick Start Guide"
 #~ msgstr "Guida iniziale"
-
 #~ msgid ""
 #~ "You have not specified an username and password. In order to contribute "
 #~ "data to MusicBrainz, you must have a MusicBrainz account.\n"
@@ -1417,26 +2708,20 @@ msgstr ""
 #~ "contribuire a MusicBrainz, devi avere un account MusicBrainz.\n"
 #~ "Vuoi creare un account adesso? Se invece hai già un account MusicBrainz, "
 #~ "si prega di inserirlo tra le tue informazioni nella finestra Opzioni. "
-
 #~ msgid "Couldn't connect to the MusicBrainz server."
 #~ msgstr "Non riesco a connetermi al server di MusicBrainz"
-
 #~ msgid "Connection error"
 #~ msgstr "Errore di connessione"
-
 #~ msgid ""
 #~ "MusicBrainz Picard requires wxPython with UNICODE support.\n"
 #~ "Please download the appropriate toolkit from http://www.wxpython.org/"
 #~ msgstr ""
 #~ "MusicBrainz Picard richiede wxPython con il supporto UNICODE.\n"
 #~ "Si prega di scaricare l'apposito pacchetto da http://www.wxpython.org/"
-
 #~ msgid "PUID collision on file %s!"
 #~ msgstr "Incongruenza PUID sul file %s!"
-
 #~ msgid "Save error"
 #~ msgstr "Errore durante il salvataggio"
-
 #~ msgid ""
 #~ "The move files option is enabled, but the destination directory is not "
 #~ "specified or invalid.\n"
@@ -1447,7 +2732,6 @@ msgstr ""
 #~ "non è stata inserita oppure non è valida.\n"
 #~ "Si prega di correggere l'opzione oppure la cartella di destinazione e di "
 #~ "riprovare"
-
 #~ msgid ""
 #~ "Not all files could be saved. Please check for and examine tracks that "
 #~ "have an error icon in front of them. To retry saving the track, right "
@@ -1456,96 +2740,68 @@ msgstr ""
 #~ "Non tutti i file sono stati salvati. Si prega di verificare e di "
 #~ "esaminare le tracce che hanno una icona di errore a fianco. Per riprovare "
 #~ "a salvarle, clicca con il tasto destro e seleziona \"Cancella errore\""
-
 #~ msgid "Select directory that contains music files"
 #~ msgstr "Selezionare una cartella che contiene della musica"
-
 #~ msgid "Reload album from main server"
 #~ msgstr "Ricarica l'album dal server principale"
-
 #~ msgid "Select or drag a folder from below"
 #~ msgstr "Seleziona o trasina una cartella da qui"
-
 #~ msgid "Drag files from below"
 #~ msgstr "Trascina i file da qui"
-
 #~ msgid "Release date"
 #~ msgstr "Data di rilascio"
-
 #~ msgid "%d%% similar"
 #~ msgstr "%d%% simile"
-
 #~ msgid "Please donate to MusicBrainz!"
 #~ msgstr "Dona a MusicBrainz!"
-
-#~ msgid "Later"
-#~ msgstr "Dopo"
-
 #~ msgid ""
 #~ "The destination directory %s does not exist. Please pick a valid "
 #~ "directory."
 #~ msgstr ""
 #~ "La cartella di destinazione %s non esiste. Si prega di inserire una "
 #~ "cartella valida"
-
 #~ msgid "Select the encoding to use when reading and writing filenames"
 #~ msgstr "Seleziona la codifica da usare per leggere e scrivere i file"
-
 #~ msgid "Automatically save recognized tracks that are at least"
 #~ msgstr "Salva automaticamente le tracce che sono almeno"
-
 #~ msgid ""
 #~ "Note: This setting will take effect after you restart the application."
 #~ msgstr ""
 #~ "Attenzione: Queste impostazioni avranno effetto solo dopo aver riavviato "
 #~ "l'applicazione"
-
 #~ msgid "Artist translation"
 #~ msgstr "Traduzione Artista"
-
 #~ msgid "Rename files when writing metadata tags"
 #~ msgstr "Rinonima i file mentre etichetti con i metadata tag"
-
 #~ msgid "Naming Help"
 #~ msgstr "Guida Rinominazione"
-
 #~ msgid ""
 #~ "You may use the following variables in the filenaming\n"
 #~ "specifications in the options dialog:"
 #~ msgstr ""
 #~ "Puoi usare le seguenti variabili nelle specifiche\n"
 #~ "dei nomi dei file nella finestra delle opzioni"
-
 #~ msgid "A %s in the naming specification will create a new subfolder."
 #~ msgstr ""
 #~ "Un %s nella specifica della rinomina creerà una nuova sotto-cartella"
-
 #~ msgid "Audio fingerprinting options"
 #~ msgstr "Opzioni audio fingerprinting"
-
 #~ msgid "Automatically select PUID collision tracks that are at least"
 #~ msgstr ""
 #~ "Seleziona automaticamente le incongruenze PUID nell tracce che sono almeno"
-
 #~ msgid "Write ID3v1 tags to MP3 files (ID3v2 tags will always be written)"
 #~ msgstr ""
 #~ "Scrivi i tag ID3v1 nei file MP3 (i tag ID3v2 saranno sempre scritti)"
-
 #~ msgid "Remove track/album"
 #~ msgstr "Rimuovi traccia/album"
-
 #~ msgid "Listen to track"
 #~ msgstr "Ascolta traccia"
-
 #~ msgid "Album clusters"
 #~ msgstr "Album riconosciuti"
-
 #~ msgid "Unmatched files for this album"
 #~ msgstr "File che non corrispondono per questo album"
-
 #~ msgid "%d of %d tracks linked"
 #~ msgstr "%d di %d tracce collegate"
-
 #~ msgid ""
 #~ "The Picard Tagger is a free application and you may\n"
 #~ "use it as long as you wish. However, providing\n"
@@ -1565,65 +2821,47 @@ msgstr ""
 #~ "detratte dalle tasse dai residenti americani e potranno\n"
 #~ "mantenere questo servizio sempre più funzionante e\n"
 #~ "veloce."
-
 #~ msgid "Matched track highlighting"
 #~ msgstr "Evidenza le tracce corrispondenti"
-
 #~ msgid "Good match background color"
 #~ msgstr "Colore sfondo della corrispondenza corretta"
-
 #~ msgid "Bad match background color"
 #~ msgstr "Colore sfondo della corrispondenza errata"
-
 #~ msgid "Move files option"
 #~ msgstr "Opzione muovi i file"
-
 #~ msgid "When matching tracks to albums, accept tracks that are at least"
 #~ msgstr ""
 #~ "Quando le tracce combaciano all'album, accetta le tracce che sono almeno"
-
 #~ msgid "CD-ROM drive path to use for lookups"
 #~ msgstr "Percorso del drive CD da usare per i controlli"
-
 #~ msgid "Launch MB Tagger automatically for inserted Audio CDs"
 #~ msgstr "Lancia MB Tagger automaticamente quando si inserisce un CD Audio"
-
 #~ msgid ""
 #~ "Failed to set the proper registy values to enable launching the tagger "
 #~ "after CD insertion. "
 #~ msgstr ""
 #~ "Non sono riuscito ad impostare il registro di sistema per abilitare "
 #~ "l'avvio del tagger dopo l'inserimento del CD "
-
 #~ msgid "Default CD setting failed"
 #~ msgstr "Impostazioni di CD di default errate"
-
 #~ msgid "File format naming specification"
 #~ msgstr "Specifiche della rinonima dei file"
-
 #~ msgid "Various artist file format naming specification"
 #~ msgstr "Specifiche per la rinonima in presenza di vari artisti"
-
 #~ msgid "Note: Leave blank to allow all possible characters"
 #~ msgstr "Nota: Lasciare vuoto per permettere tutti i possibili caratteri"
-
 #~ msgid "Track artist name"
 #~ msgstr "Nome dell'artista della traccia"
-
 #~ msgid "The first character of the artist sortname"
 #~ msgstr "Il primo carattere del nome dell'artista"
-
 #~ msgid "The first two characters of the artist sortname"
 #~ msgstr "I primi due caratteri del nome dell'artista"
-
 #~ msgid "The first three characters of the artist sortname"
 #~ msgstr "I primi tre caratteri del nome dell'artista"
-
 #~ msgid "Naming specification help"
 #~ msgstr "Guida sulle specifiche di rinominazione"
-
 #~ msgid "Accept PUID matches that are at least"
 #~ msgstr "Accetta le corrispondenze PUID che sono almeno"
-
 #~ msgid "Various artist name"
 #~ msgstr "Nome vari artisti"
+
diff --git a/po/kn.po b/po/kn.po
index c013f3d9f..352b21a99 100644
--- a/po/kn.po
+++ b/po/kn.po
@@ -7,35 +7,1271 @@ msgid ""
 msgstr ""
 "Project-Id-Version: picard\n"
 "Report-Msgid-Bugs-To: http://bugs.musicbrainz.org/\n"
-"POT-Creation-Date: 2008-12-01 18:20+0100\n"
-"PO-Revision-Date: 2008-07-31 18:44+0000\n"
-"Last-Translator: Jayasimha (ಜಯಸಿಂಹ) <jayasimha.p@netapp.com>\n"
+"POT-Creation-Date: 2009-01-25 12:23+0100\n"
+"PO-Revision-Date: 2009-01-25 13:23+0100\n"
+"Last-Translator: Philipp Wolfer <phw@rubyforge.org>\n"
 "Language-Team: Kannada <kn@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2008-12-01 17:01+0000\n"
+"X-Launchpad-Export-Date: 2009-01-24 23:28+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
-#: ../picard/album.py:108 ../picard/cluster.py:248
+#: ../picard/album.py:108
+#: ../picard/cluster.py:248
 msgid "Unmatched Files"
 msgstr "ಸರಿ ಹೊಂದದ ಕಡತ"
 
-#: ../picard/album.py:269
+#: ../picard/album.py:281
 #, python-format
 msgid "[couldn't load album %s]"
 msgstr ""
 
-#: ../picard/album.py:305
+#: ../picard/album.py:317
 msgid "[loading album information]"
 msgstr ""
 
-#: ../picard/tagger.py:472
+#: ../picard/cluster.py:164
+#: ../picard/cluster.py:175
+#, fuzzy, python-format
+msgid "No matching releases for cluster %s"
+msgstr "%s ಕಡತವು ಯಾವುದೇ ಸಂಗೀತ ಕೃತಿಯನ್ನು ಹೊಲುತ್ತಿಲ್ಲ"
+
+#: ../picard/cluster.py:177
+#, fuzzy, python-format
+msgid "Cluster %s identified!"
+msgstr "%s ಕಡತವನ್ನು ಗುರುತಿಸಲಾಗಿದೆ"
+
+#: ../picard/cluster.py:182
+#, fuzzy, python-format
+msgid "Looking up the metadata for cluster %s..."
+msgstr "%s ಕಡತದ ಮೆಟಾಡಾಟಾವನ್ನು ಹುಡುಕಲಾಗುತ್ತಿದೆ"
+
+#: ../picard/const.py:40
+msgid "CD"
+msgstr ""
+
+#: ../picard/const.py:41
+msgid "DVD"
+msgstr ""
+
+#: ../picard/const.py:42
+msgid "SACD"
+msgstr ""
+
+#: ../picard/const.py:43
+msgid "LaserDisc"
+msgstr ""
+
+#: ../picard/const.py:44
+msgid "MiniDisc"
+msgstr ""
+
+#: ../picard/const.py:45
+msgid "Vinyl"
+msgstr ""
+
+#: ../picard/const.py:46
+msgid "Cassette"
+msgstr ""
+
+#: ../picard/const.py:47
+msgid "Cartridge (4/8-tracks)"
+msgstr ""
+
+#: ../picard/const.py:48
+msgid "Reel-to-Reel"
+msgstr ""
+
+#: ../picard/const.py:49
+msgid "DAT"
+msgstr ""
+
+#: ../picard/const.py:50
+#, fuzzy
+msgid "Digital Media"
+msgstr "ಮೊದಲಿನ ಮೆಟಾಡಾಟಾ"
+
+#: ../picard/const.py:51
+msgid "Wax Cylinder"
+msgstr ""
+
+#: ../picard/const.py:52
+msgid "Piano Roll"
+msgstr ""
+
+#: ../picard/const.py:53
+msgid "Other"
+msgstr ""
+
+#: ../picard/const.py:58
+msgid "Bangladesh"
+msgstr ""
+
+#: ../picard/const.py:59
+msgid "Belgium"
+msgstr ""
+
+#: ../picard/const.py:60
+msgid "Burkina Faso"
+msgstr ""
+
+#: ../picard/const.py:61
+msgid "Bulgaria"
+msgstr ""
+
+#: ../picard/const.py:62
+msgid "Barbados"
+msgstr ""
+
+#: ../picard/const.py:63
+msgid "Wallis and Futuna Islands"
+msgstr ""
+
+#: ../picard/const.py:64
+msgid "Bermuda"
+msgstr ""
+
+#: ../picard/const.py:65
+msgid "Brunei Darussalam"
+msgstr ""
+
+#: ../picard/const.py:66
+msgid "Bolivia"
+msgstr ""
+
+#: ../picard/const.py:67
+msgid "Bahrain"
+msgstr ""
+
+#: ../picard/const.py:68
+msgid "Burundi"
+msgstr ""
+
+#: ../picard/const.py:69
+msgid "Benin"
+msgstr ""
+
+#: ../picard/const.py:70
+msgid "Bhutan"
+msgstr ""
+
+#: ../picard/const.py:71
+msgid "Jamaica"
+msgstr ""
+
+#: ../picard/const.py:72
+msgid "Bouvet Island"
+msgstr ""
+
+#: ../picard/const.py:73
+msgid "Botswana"
+msgstr ""
+
+#: ../picard/const.py:74
+msgid "Samoa"
+msgstr ""
+
+#: ../picard/const.py:75
+msgid "Brazil"
+msgstr ""
+
+#: ../picard/const.py:76
+msgid "Bahamas"
+msgstr ""
+
+#: ../picard/const.py:77
+msgid "Belarus"
+msgstr ""
+
+#: ../picard/const.py:78
+msgid "Belize"
+msgstr ""
+
+#: ../picard/const.py:79
+msgid "Russian Federation"
+msgstr ""
+
+#: ../picard/const.py:80
+msgid "Rwanda"
+msgstr ""
+
+#: ../picard/const.py:81
+msgid "Reunion"
+msgstr ""
+
+#: ../picard/const.py:82
+msgid "Turkmenistan"
+msgstr ""
+
+#: ../picard/const.py:83
+msgid "Tajikistan"
+msgstr ""
+
+#: ../picard/const.py:84
+msgid "Romania"
+msgstr ""
+
+#: ../picard/const.py:85
+msgid "Tokela"
+msgstr ""
+
+#: ../picard/const.py:86
+msgid "Guinea-Bissa"
+msgstr ""
+
+#: ../picard/const.py:87
+msgid "Guam"
+msgstr ""
+
+#: ../picard/const.py:88
+msgid "Guatemala"
+msgstr ""
+
+#: ../picard/const.py:89
+msgid "Greece"
+msgstr ""
+
+#: ../picard/const.py:90
+msgid "Equatorial Guinea"
+msgstr ""
+
+#: ../picard/const.py:91
+msgid "Guadeloupe"
+msgstr ""
+
+#: ../picard/const.py:92
+msgid "Japan"
+msgstr ""
+
+#: ../picard/const.py:93
+msgid "Guyana"
+msgstr ""
+
+#: ../picard/const.py:94
+msgid "French Guiana"
+msgstr ""
+
+#: ../picard/const.py:95
+msgid "Georgia"
+msgstr ""
+
+#: ../picard/const.py:96
+msgid "Grenada"
+msgstr ""
+
+#: ../picard/const.py:97
+msgid "United Kingdom"
+msgstr ""
+
+#: ../picard/const.py:98
+msgid "Gabon"
+msgstr ""
+
+#: ../picard/const.py:99
+msgid "El Salvador"
+msgstr ""
+
+#: ../picard/const.py:100
+msgid "Guinea"
+msgstr ""
+
+#: ../picard/const.py:101
+msgid "Gambia"
+msgstr ""
+
+#: ../picard/const.py:102
+msgid "Greenland"
+msgstr ""
+
+#: ../picard/const.py:103
+msgid "Gibraltar"
+msgstr ""
+
+#: ../picard/const.py:104
+msgid "Ghana"
+msgstr ""
+
+#: ../picard/const.py:105
+msgid "Oman"
+msgstr ""
+
+#: ../picard/const.py:106
+msgid "Tunisia"
+msgstr ""
+
+#: ../picard/const.py:107
+msgid "Jordan"
+msgstr ""
+
+#: ../picard/const.py:108
+msgid "Haiti"
+msgstr ""
+
+#: ../picard/const.py:109
+msgid "Hungary"
+msgstr ""
+
+#: ../picard/const.py:110
+msgid "Hong Kong"
+msgstr ""
+
+#: ../picard/const.py:111
+msgid "Honduras"
+msgstr ""
+
+#: ../picard/const.py:112
+msgid "Heard and Mc Donald Islands"
+msgstr ""
+
+#: ../picard/const.py:113
+msgid "Venezuela"
+msgstr ""
+
+#: ../picard/const.py:114
+msgid "Puerto Rico"
+msgstr ""
+
+#: ../picard/const.py:115
+msgid "Pala"
+msgstr ""
+
+#: ../picard/const.py:116
+msgid "Portugal"
+msgstr ""
+
+#: ../picard/const.py:117
+msgid "Svalbard and Jan Mayen Islands"
+msgstr ""
+
+#: ../picard/const.py:118
+msgid "Paraguay"
+msgstr ""
+
+#: ../picard/const.py:119
+msgid "Iraq"
+msgstr ""
+
+#: ../picard/const.py:120
+msgid "Panama"
+msgstr ""
+
+#: ../picard/const.py:121
+msgid "French Polynesia"
+msgstr ""
+
+#: ../picard/const.py:122
+msgid "Papua New Guinea"
+msgstr ""
+
+#: ../picard/const.py:123
+msgid "Per"
+msgstr ""
+
+#: ../picard/const.py:124
+msgid "Pakistan"
+msgstr ""
+
+#: ../picard/const.py:125
+msgid "Philippines"
+msgstr ""
+
+#: ../picard/const.py:126
+msgid "Pitcairn"
+msgstr ""
+
+#: ../picard/const.py:127
+msgid "Poland"
+msgstr ""
+
+#: ../picard/const.py:128
+msgid "St. Pierre and Miquelon"
+msgstr ""
+
+#: ../picard/const.py:129
+msgid "Zambia"
+msgstr ""
+
+#: ../picard/const.py:130
+msgid "Western Sahara"
+msgstr ""
+
+#: ../picard/const.py:131
+msgid "Estonia"
+msgstr ""
+
+#: ../picard/const.py:132
+msgid "Egypt"
+msgstr ""
+
+#: ../picard/const.py:133
+msgid "South Africa"
+msgstr ""
+
+#: ../picard/const.py:134
+msgid "Ecuador"
+msgstr ""
+
+#: ../picard/const.py:135
+msgid "Italy"
+msgstr ""
+
+#: ../picard/const.py:136
+msgid "Viet Nam"
+msgstr ""
+
+#: ../picard/const.py:137
+msgid "Solomon Islands"
+msgstr ""
+
+#: ../picard/const.py:138
+msgid "Ethiopia"
+msgstr ""
+
+#: ../picard/const.py:139
+msgid "Somalia"
+msgstr ""
+
+#: ../picard/const.py:140
+msgid "Zimbabwe"
+msgstr ""
+
+#: ../picard/const.py:141
+msgid "Saudi Arabia"
+msgstr ""
+
+#: ../picard/const.py:142
+msgid "Spain"
+msgstr ""
+
+#: ../picard/const.py:143
+msgid "Eritrea"
+msgstr ""
+
+#: ../picard/const.py:144
+msgid "Moldova, Republic of"
+msgstr ""
+
+#: ../picard/const.py:145
+msgid "Madagascar"
+msgstr ""
+
+#: ../picard/const.py:146
+msgid "Morocco"
+msgstr ""
+
+#: ../picard/const.py:147
+msgid "Monaco"
+msgstr ""
+
+#: ../picard/const.py:148
+msgid "Uzbekistan"
+msgstr ""
+
+#: ../picard/const.py:149
+msgid "Myanmar"
+msgstr ""
+
+#: ../picard/const.py:150
+msgid "Mali"
+msgstr ""
+
+#: ../picard/const.py:151
+msgid "Maca"
+msgstr ""
+
+#: ../picard/const.py:152
+msgid "Mongolia"
+msgstr ""
+
+#: ../picard/const.py:153
+msgid "Marshall Islands"
+msgstr ""
+
+#: ../picard/const.py:154
+msgid "Macedonia, The Former Yugoslav Republic of"
+msgstr ""
+
+#: ../picard/const.py:155
+msgid "Mauritius"
+msgstr ""
+
+#: ../picard/const.py:156
+msgid "Malta"
+msgstr ""
+
+#: ../picard/const.py:157
+msgid "Malawi"
+msgstr ""
+
+#: ../picard/const.py:158
+msgid "Maldives"
+msgstr ""
+
+#: ../picard/const.py:159
+msgid "Martinique"
+msgstr ""
+
+#: ../picard/const.py:160
+msgid "Northern Mariana Islands"
+msgstr ""
+
+#: ../picard/const.py:161
+msgid "Montserrat"
+msgstr ""
+
+#: ../picard/const.py:162
+msgid "Mauritania"
+msgstr ""
+
+#: ../picard/const.py:163
+msgid "Uganda"
+msgstr ""
+
+#: ../picard/const.py:164
+msgid "Malaysia"
+msgstr ""
+
+#: ../picard/const.py:165
+msgid "Mexico"
+msgstr ""
+
+#: ../picard/const.py:166
+msgid "Israel"
+msgstr ""
+
+#: ../picard/const.py:167
+msgid "France"
+msgstr ""
+
+#: ../picard/const.py:168
+msgid "British Indian Ocean Territory"
+msgstr ""
+
+#: ../picard/const.py:169
+msgid "St. Helena"
+msgstr ""
+
+#: ../picard/const.py:170
+msgid "Finland"
+msgstr ""
+
+#: ../picard/const.py:171
+msgid "Fiji"
+msgstr ""
+
+#: ../picard/const.py:172
+msgid "Falkland Islands (Malvinas)"
+msgstr ""
+
+#: ../picard/const.py:173
+msgid "Micronesia, Federated States of"
+msgstr ""
+
+#: ../picard/const.py:174
+msgid "Faroe Islands"
+msgstr ""
+
+#: ../picard/const.py:175
+msgid "Nicaragua"
+msgstr ""
+
+#: ../picard/const.py:176
+msgid "Netherlands"
+msgstr ""
+
+#: ../picard/const.py:177
+msgid "Norway"
+msgstr ""
+
+#: ../picard/const.py:178
+msgid "Namibia"
+msgstr ""
+
+#: ../picard/const.py:179
+msgid "Vanuat"
+msgstr ""
+
+#: ../picard/const.py:180
+msgid "New Caledonia"
+msgstr ""
+
+#: ../picard/const.py:181
+msgid "Niger"
+msgstr ""
+
+#: ../picard/const.py:182
+msgid "Norfolk Island"
+msgstr ""
+
+#: ../picard/const.py:183
+msgid "Nigeria"
+msgstr ""
+
+#: ../picard/const.py:184
+#, fuzzy
+msgid "New Zealand"
+msgstr "ಹೊಸ ಮೆಟಾಡಾಟಾ"
+
+#: ../picard/const.py:185
+msgid "Zaire"
+msgstr ""
+
+#: ../picard/const.py:186
+msgid "Nepal"
+msgstr ""
+
+#: ../picard/const.py:187
+msgid "Naur"
+msgstr ""
+
+#: ../picard/const.py:188
+msgid "Niue"
+msgstr ""
+
+#: ../picard/const.py:189
+msgid "Cook Islands"
+msgstr ""
+
+#: ../picard/const.py:190
+msgid "Cote d'Ivoire"
+msgstr ""
+
+#: ../picard/const.py:191
+msgid "Switzerland"
+msgstr ""
+
+#: ../picard/const.py:192
+msgid "Colombia"
+msgstr ""
+
+#: ../picard/const.py:193
+msgid "China"
+msgstr ""
+
+#: ../picard/const.py:194
+msgid "Cameroon"
+msgstr ""
+
+#: ../picard/const.py:195
+#, fuzzy
+msgid "Chile"
+msgstr "ಶೀರ್ಷಿಕೆ"
+
+#: ../picard/const.py:196
+msgid "Cocos (Keeling) Islands"
+msgstr ""
+
+#: ../picard/const.py:197
+msgid "Canada"
+msgstr ""
+
+#: ../picard/const.py:198
+msgid "Congo"
+msgstr ""
+
+#: ../picard/const.py:199
+msgid "Central African Republic"
+msgstr ""
+
+#: ../picard/const.py:200
+msgid "Czech Republic"
+msgstr ""
+
+#: ../picard/const.py:201
+msgid "Cyprus"
+msgstr ""
+
+#: ../picard/const.py:202
+msgid "Christmas Island"
+msgstr ""
+
+#: ../picard/const.py:203
+msgid "Costa Rica"
+msgstr ""
+
+#: ../picard/const.py:204
+msgid "Cape Verde"
+msgstr ""
+
+#: ../picard/const.py:205
+msgid "Cuba"
+msgstr ""
+
+#: ../picard/const.py:206
+msgid "Swaziland"
+msgstr ""
+
+#: ../picard/const.py:207
+msgid "Syrian Arab Republic"
+msgstr ""
+
+#: ../picard/const.py:208
+msgid "Kyrgyzstan"
+msgstr ""
+
+#: ../picard/const.py:209
+msgid "Kenya"
+msgstr ""
+
+#: ../picard/const.py:210
+msgid "Suriname"
+msgstr ""
+
+#: ../picard/const.py:211
+msgid "Kiribati"
+msgstr ""
+
+#: ../picard/const.py:212
+msgid "Cambodia"
+msgstr ""
+
+#: ../picard/const.py:213
+msgid "Saint Kitts and Nevis"
+msgstr ""
+
+#: ../picard/const.py:214
+msgid "Comoros"
+msgstr ""
+
+#: ../picard/const.py:215
+msgid "Sao Tome and Principe"
+msgstr ""
+
+#: ../picard/const.py:216
+msgid "Slovenia"
+msgstr ""
+
+#: ../picard/const.py:217
+msgid "Kuwait"
+msgstr ""
+
+#: ../picard/const.py:218
+msgid "Senegal"
+msgstr ""
+
+#: ../picard/const.py:219
+msgid "San Marino"
+msgstr ""
+
+#: ../picard/const.py:220
+msgid "Sierra Leone"
+msgstr ""
+
+#: ../picard/const.py:221
+msgid "Seychelles"
+msgstr ""
+
+#: ../picard/const.py:222
+msgid "Kazakhstan"
+msgstr ""
+
+#: ../picard/const.py:223
+msgid "Cayman Islands"
+msgstr ""
+
+#: ../picard/const.py:224
+msgid "Singapore"
+msgstr ""
+
+#: ../picard/const.py:225
+msgid "Sweden"
+msgstr ""
+
+#: ../picard/const.py:226
+msgid "Sudan"
+msgstr ""
+
+#: ../picard/const.py:227
+msgid "Dominican Republic"
+msgstr ""
+
+#: ../picard/const.py:228
+msgid "Dominica"
+msgstr ""
+
+#: ../picard/const.py:229
+msgid "Djibouti"
+msgstr ""
+
+#: ../picard/const.py:230
+msgid "Denmark"
+msgstr ""
+
+#: ../picard/const.py:231
+msgid "Virgin Islands (British)"
+msgstr ""
+
+#: ../picard/const.py:232
+msgid "Germany"
+msgstr ""
+
+#: ../picard/const.py:233
+msgid "Yemen"
+msgstr ""
+
+#: ../picard/const.py:234
+msgid "Algeria"
+msgstr ""
+
+#: ../picard/const.py:235
+msgid "United States"
+msgstr ""
+
+#: ../picard/const.py:236
+msgid "Uruguay"
+msgstr ""
+
+#: ../picard/const.py:237
+msgid "Mayotte"
+msgstr ""
+
+#: ../picard/const.py:238
+msgid "United States Minor Outlying Islands"
+msgstr ""
+
+#: ../picard/const.py:239
+msgid "Lebanon"
+msgstr ""
+
+#: ../picard/const.py:240
+msgid "Saint Lucia"
+msgstr ""
+
+#: ../picard/const.py:241
+msgid "Lao People's Democratic Republic"
+msgstr ""
+
+#: ../picard/const.py:242
+msgid "Tuval"
+msgstr ""
+
+#: ../picard/const.py:243
+msgid "Taiwan"
+msgstr ""
+
+#: ../picard/const.py:244
+msgid "Trinidad and Tobago"
+msgstr ""
+
+#: ../picard/const.py:245
+msgid "Turkey"
+msgstr ""
+
+#: ../picard/const.py:246
+msgid "Sri Lanka"
+msgstr ""
+
+#: ../picard/const.py:247
+msgid "Liechtenstein"
+msgstr ""
+
+#: ../picard/const.py:248
+msgid "Latvia"
+msgstr ""
+
+#: ../picard/const.py:249
+msgid "Tonga"
+msgstr ""
+
+#: ../picard/const.py:250
+msgid "Lithuania"
+msgstr ""
+
+#: ../picard/const.py:251
+msgid "Luxembourg"
+msgstr ""
+
+#: ../picard/const.py:252
+msgid "Liberia"
+msgstr ""
+
+#: ../picard/const.py:253
+#, fuzzy
+msgid "Lesotho"
+msgstr "ಕಾಲಾವಧಿ"
+
+#: ../picard/const.py:254
+msgid "Thailand"
+msgstr ""
+
+#: ../picard/const.py:255
+msgid "French Southern Territories"
+msgstr ""
+
+#: ../picard/const.py:256
+msgid "Togo"
+msgstr ""
+
+#: ../picard/const.py:257
+msgid "Chad"
+msgstr ""
+
+#: ../picard/const.py:258
+msgid "Turks and Caicos Islands"
+msgstr ""
+
+#: ../picard/const.py:259
+msgid "Libyan Arab Jamahiriya"
+msgstr ""
+
+#: ../picard/const.py:260
+msgid "Vatican City State (Holy See)"
+msgstr ""
+
+#: ../picard/const.py:261
+msgid "Saint Vincent and The Grenadines"
+msgstr ""
+
+#: ../picard/const.py:262
+msgid "United Arab Emirates"
+msgstr ""
+
+#: ../picard/const.py:263
+msgid "Andorra"
+msgstr ""
+
+#: ../picard/const.py:264
+msgid "Antigua and Barbuda"
+msgstr ""
+
+#: ../picard/const.py:265
+msgid "Afghanistan"
+msgstr ""
+
+#: ../picard/const.py:266
+msgid "Anguilla"
+msgstr ""
+
+#: ../picard/const.py:267
+msgid "Virgin Islands (U.S.)"
+msgstr ""
+
+#: ../picard/const.py:268
+msgid "Iceland"
+msgstr ""
+
+#: ../picard/const.py:269
+msgid "Iran (Islamic Republic of)"
+msgstr ""
+
+#: ../picard/const.py:270
+msgid "Armenia"
+msgstr ""
+
+#: ../picard/const.py:271
+msgid "Albania"
+msgstr ""
+
+#: ../picard/const.py:272
+msgid "Angola"
+msgstr ""
+
+#: ../picard/const.py:273
+msgid "Netherlands Antilles"
+msgstr ""
+
+#: ../picard/const.py:274
+msgid "Antarctica"
+msgstr ""
+
+#: ../picard/const.py:275
+msgid "American Samoa"
+msgstr ""
+
+#: ../picard/const.py:276
+msgid "Argentina"
+msgstr ""
+
+#: ../picard/const.py:277
+msgid "Australia"
+msgstr ""
+
+#: ../picard/const.py:278
+msgid "Austria"
+msgstr ""
+
+#: ../picard/const.py:279
+msgid "Aruba"
+msgstr ""
+
+#: ../picard/const.py:280
+msgid "India"
+msgstr ""
+
+#: ../picard/const.py:281
+msgid "Tanzania, United Republic of"
+msgstr ""
+
+#: ../picard/const.py:282
+msgid "Azerbaijan"
+msgstr ""
+
+#: ../picard/const.py:283
+msgid "Ireland"
+msgstr ""
+
+#: ../picard/const.py:284
+msgid "Indonesia"
+msgstr ""
+
+#: ../picard/const.py:285
+msgid "Ukraine"
+msgstr ""
+
+#: ../picard/const.py:286
+msgid "Qatar"
+msgstr ""
+
+#: ../picard/const.py:287
+msgid "Mozambique"
+msgstr ""
+
+#: ../picard/const.py:288
+msgid "Bosnia and Herzegovina"
+msgstr ""
+
+#: ../picard/const.py:289
+msgid "Congo, The Democratic Republic of the"
+msgstr ""
+
+#: ../picard/const.py:290
+msgid "Serbia and Montenegro"
+msgstr ""
+
+#: ../picard/const.py:291
+msgid "Croatia"
+msgstr ""
+
+#: ../picard/const.py:292
+msgid "Korea (North), Democratic People's Republic of"
+msgstr ""
+
+#: ../picard/const.py:293
+msgid "Korea (South), Republic of"
+msgstr ""
+
+#: ../picard/const.py:294
+msgid "Slovakia"
+msgstr ""
+
+#: ../picard/const.py:295
+msgid "Soviet Union (historical, 1922-1991)"
+msgstr ""
+
+#: ../picard/const.py:296
+msgid "East Timor"
+msgstr ""
+
+#: ../picard/const.py:297
+msgid "Czechoslovakia (historical, 1918-1992)"
+msgstr ""
+
+#: ../picard/const.py:298
+msgid "Europe"
+msgstr ""
+
+#: ../picard/const.py:299
+msgid "East Germany (historical, 1949-1990)"
+msgstr ""
+
+#: ../picard/const.py:300
+msgid "[Unknown Country]"
+msgstr ""
+
+#: ../picard/const.py:301
+msgid "[Worldwide]"
+msgstr ""
+
+#: ../picard/const.py:302
+msgid "Yugoslavia (historical, 1918-1992)"
+msgstr ""
+
+#: ../picard/const.py:307
+msgid "Catalan"
+msgstr ""
+
+#: ../picard/const.py:308
+msgid "Czech"
+msgstr ""
+
+#: ../picard/const.py:309
+msgid "Welsh"
+msgstr ""
+
+#: ../picard/const.py:310
+msgid "Danish"
+msgstr ""
+
+#: ../picard/const.py:311
+msgid "German"
+msgstr ""
+
+#: ../picard/const.py:312
+msgid "English"
+msgstr ""
+
+#: ../picard/const.py:313
+msgid "English (Canada)"
+msgstr ""
+
+#: ../picard/const.py:314
+msgid "English (UK)"
+msgstr ""
+
+#: ../picard/const.py:315
+msgid "Spanish"
+msgstr ""
+
+#: ../picard/const.py:316
+msgid "Persian"
+msgstr ""
+
+#: ../picard/const.py:317
+msgid "Finnish"
+msgstr ""
+
+#: ../picard/const.py:318
+msgid "French"
+msgstr ""
+
+#: ../picard/const.py:319
+msgid "Frisian"
+msgstr ""
+
+#: ../picard/const.py:320
+msgid "Hebrew"
+msgstr ""
+
+#: ../picard/const.py:321
+msgid "Hungarian"
+msgstr ""
+
+#: ../picard/const.py:322
+msgid "Islandic"
+msgstr ""
+
+#: ../picard/const.py:323
+msgid "Italian"
+msgstr ""
+
+#: ../picard/const.py:324
+msgid "Kannada"
+msgstr ""
+
+#: ../picard/const.py:325
+msgid "Korean"
+msgstr ""
+
+#: ../picard/const.py:326
+msgid "Lithuanian"
+msgstr ""
+
+#: ../picard/const.py:327
+msgid "Norwegian Bokmal"
+msgstr ""
+
+#: ../picard/const.py:328
+msgid "Dutch"
+msgstr ""
+
+#: ../picard/const.py:329
+msgid "Polish"
+msgstr ""
+
+#: ../picard/const.py:330
+msgid "Portuguese"
+msgstr ""
+
+#: ../picard/const.py:331
+msgid "Brazilian Portuguese"
+msgstr ""
+
+#: ../picard/const.py:332
+msgid "Romanian"
+msgstr ""
+
+#: ../picard/const.py:333
+msgid "Russian"
+msgstr ""
+
+#: ../picard/const.py:334
+#, fuzzy
+msgid "Scots"
+msgstr "ಅಂಕ"
+
+#: ../picard/const.py:335
+msgid "Slovak"
+msgstr ""
+
+#: ../picard/const.py:336
+msgid "Slovenian"
+msgstr ""
+
+#: ../picard/const.py:337
+msgid "Swedish"
+msgstr ""
+
+#: ../picard/const.py:338
+msgid "Chinese"
+msgstr ""
+
+#: ../picard/file.py:475
+#, python-format
+msgid "No matching tracks for file %s"
+msgstr "%s ಕಡತವು ಯಾವುದೇ ಸಂಗೀತ ಕೃತಿಯನ್ನು ಹೊಲುತ್ತಿಲ್ಲ"
+
+#: ../picard/file.py:492
+#, fuzzy, python-format
+msgid "No matching tracks above the threshold for file %s"
+msgstr "%s ಕಡತವು ಯಾವುದೇ ಸಂಗೀತ ಕೃತಿಯನ್ನು ಹೊಲುತ್ತಿಲ್ಲ"
+
+#: ../picard/file.py:495
+#, python-format
+msgid "File %s identified!"
+msgstr "%s ಕಡತವನ್ನು ಗುರುತಿಸಲಾಗಿದೆ"
+
+#: ../picard/file.py:506
+#, python-format
+msgid "Looking up the PUID for file %s..."
+msgstr "%s ಕಡತದ ಪಿಯುಐಡಿ ಅನ್ನು ಹುಡುಕಲಾಗುತ್ತಿದೆ"
+
+#: ../picard/file.py:511
+#, python-format
+msgid "Looking up the metadata for file %s..."
+msgstr "%s ಕಡತದ ಮೆಟಾಡಾಟಾವನ್ನು ಹುಡುಕಲಾಗುತ್ತಿದೆ"
+
+#: ../picard/puidmanager.py:58
+msgid "Submitting PUIDs..."
+msgstr "ಪಿಯುಐಡಿಗಳನ್ನು ಸಲ್ಲಿಸಲಾಗುತ್ತಿದೆ..."
+
+#: ../picard/puidmanager.py:64
+#, python-format
+msgid "PUIDs submission failed: %s"
+msgstr "ಪಿಯುಐಡಿಗಳ ಸಲ್ಲಿಸುವಿಕೆಯಲ್ಲಿ ತೊಂದರೆಯಾಗಿದೆ: %s"
+
+#: ../picard/puidmanager.py:66
+msgid "PUIDs successfully submitted!"
+msgstr "ಪಿಯುಐಡಿಗಳನ್ನು ಯಶಸ್ವಿಯಾಗಿ ಸಲ್ಲಿಸಲಾಗಿದೆ!"
+
+#: ../picard/playlist.py:31
+msgid "M3U Playlist (*.m3u)"
+msgstr ""
+
+#: ../picard/playlist.py:32
+msgid "PLS Playlist (*.pls)"
+msgstr ""
+
+#: ../picard/playlist.py:33
+msgid "XSPF Playlist (*.xspf)"
+msgstr ""
+
+#: ../picard/tagger.py:476
 msgid "CD Lookup Error"
 msgstr ""
 
-#: ../picard/tagger.py:473
+#: ../picard/tagger.py:477
 #, python-format
 msgid ""
 "Error while reading CD:\n"
@@ -43,124 +1279,173 @@ msgid ""
 "%s"
 msgstr ""
 
-#: ../picard/ui/passworddialog.py:38
-#, python-format
-msgid ""
-"The server %s requires you to login. Please enter your username and password."
-msgstr ""
+#: ../picard/tagger.py:503
+#, fuzzy, python-format
+msgid "Couldn't find PUID for file %s"
+msgstr "%s ಕಡತದ ಪಿಯುಐಡಿ ಅನ್ನು ಹುಡುಕಲಾಗುತ್ತಿದೆ"
 
-#: ../picard/ui/ui_options_script.py:52
-msgid "Tagger Script"
-msgstr ""
+#: ../picard/musicdns/__init__.py:98
+#, fuzzy, python-format
+msgid "Looking up the fingerprint for file %s..."
+msgstr "%s ಕಡತದ ಮೆಟಾಡಾಟಾವನ್ನು ಹುಡುಕಲಾಗುತ್ತಿದೆ"
+
+#: ../picard/musicdns/__init__.py:117
+#, python-format
+msgid "Creating fingerprint for file %s..."
+msgstr "%s ಕಡತದ ಫಿಂಗರ್ ಪ್ರಿಂಟ್ ಅನ್ನು ನಿರ್ಮಿಸಲಾಗುತ್ತಿದೆ..."
 
 #: ../picard/ui/cdlookup.py:31
 msgid "Score"
 msgstr "ಅಂಕ"
 
 #: ../picard/ui/cdlookup.py:31
+#: ../picard/ui/itemviews.py:82
+#: ../picard/util/tags.py:23
 msgid "Title"
 msgstr "ಶೀರ್ಷಿಕೆ"
 
-#: ../picard/ui/cdlookup.py:31 ../picard/ui/mainwindow.py:436
+#: ../picard/ui/cdlookup.py:31
+#: ../picard/ui/itemviews.py:84
+#: ../picard/ui/mainwindow.py:436
+#: ../picard/util/tags.py:22
 msgid "Artist"
 msgstr "ಕಲಾವಿದ"
 
-#: ../picard/ui/ui_metadata.py:121
-msgid "Lookup"
+#: ../picard/ui/coverartbox.py:47
+#: ../picard/ui/options/cover.py:29
+msgid "Cover Art"
+msgstr "ಹೊರ ಚಿತ್ರ"
+
+#: ../picard/ui/coverartbox.py:95
+msgid "Buy the album on Amazon"
+msgstr "ಈ ಕೃತಿಯನ್ನು ಅಮೆಜಾನ್ ಇಂದ ಖರೀದಿಸು"
+
+#: ../picard/ui/filebrowser.py:38
+#: ../picard/ui/mainwindow.py:302
+msgid "&Refresh"
 msgstr ""
 
-#: ../picard/ui/ui_metadata.py:122
-msgid "Title:"
+#: ../picard/ui/filebrowser.py:41
+msgid "&Move Tagged Files Here"
 msgstr ""
 
-#: ../picard/ui/ui_metadata.py:123
-msgid "Date:"
+#: ../picard/ui/filebrowser.py:44
+msgid "Show &Hidden Files"
 msgstr ""
 
-#: ../picard/ui/ui_metadata.py:124
-msgid "Artist:"
+#: ../picard/ui/itemviews.py:83
+msgid "Length"
+msgstr "ಕಾಲಾವಧಿ"
+
+#: ../picard/ui/itemviews.py:327
+msgid "&Releases"
 msgstr ""
 
-#: ../picard/ui/ui_metadata.py:125
-msgid "Track:"
+#: ../picard/ui/itemviews.py:353
+msgid "&Plugins"
 msgstr ""
 
-#: ../picard/ui/ui_metadata.py:126
-msgid "0000-00-00; "
+#: ../picard/ui/itemviews.py:523
+msgid "Clusters"
 msgstr ""
 
-#: ../picard/ui/ui_metadata.py:127 ../picard/ui/tageditor.py:225
-#: ../picard/ui/multitageditor.py:181
+#: ../picard/ui/logview.py:29
+msgid "Log"
+msgstr ""
+
+#: ../picard/ui/puidsubmit.py:31
+#: ../picard/ui/options/plugins.py:80
+msgid "File"
+msgstr ""
+
+#: ../picard/ui/puidsubmit.py:31
+msgid "PUID"
+msgstr ""
+
+#: ../picard/ui/puidsubmit.py:31
+#: ../picard/ui/mainwindow.py:437
+msgid "Track"
+msgstr ""
+
+#: ../picard/ui/puidsubmit.py:31
+msgid "Release"
+msgstr ""
+
+#: ../picard/ui/puidsubmit.py:31
+msgid "Release ID"
+msgstr ""
+
+#: ../picard/ui/tageditor.py:65
+#: ../picard/ui/ui_options_plugins.py:62
+msgid "Details"
+msgstr ""
+
+#: ../picard/ui/tageditor.py:70
+#: ../picard/ui/tageditor.py:241
+#, python-format
+msgid "%d file"
+msgid_plural "%d files"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../picard/ui/tageditor.py:124
+#, python-format
+msgid "(different across %d file)"
+msgid_plural "(different across %d files)"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../picard/ui/tageditor.py:127
+#, python-format
+msgid "(missing from %d file)"
+msgid_plural "(missing from %d files)"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../picard/ui/tageditor.py:210
+msgid "Filename:"
+msgstr ""
+
+#: ../picard/ui/tageditor.py:212
+msgid "Format:"
+msgstr ""
+
+#: ../picard/ui/tageditor.py:221
+msgid "Size:"
+msgstr ""
+
+#: ../picard/ui/tageditor.py:225
+#: ../picard/ui/ui_metadata.py:127
 msgid "Length:"
 msgstr ""
 
-#: ../picard/ui/ui_metadata.py:128
-msgid "Album:"
+#: ../picard/ui/tageditor.py:227
+msgid "Bitrate:"
 msgstr ""
 
-#: ../picard/ui/ui_passworddialog.py:78
-msgid "Authentication required"
+#: ../picard/ui/tageditor.py:229
+msgid "Sample rate:"
 msgstr ""
 
-#: ../picard/ui/ui_passworddialog.py:79 ../picard/ui/ui_options_proxy.py:83
-#: ../picard/ui/ui_options_general.py:113
-msgid "Username:"
+#: ../picard/ui/tageditor.py:231
+msgid "Bits per sample:"
 msgstr ""
 
-#: ../picard/ui/ui_passworddialog.py:80 ../picard/ui/ui_options_proxy.py:82
-#: ../picard/ui/ui_options_general.py:112
-msgid "Password:"
+#: ../picard/ui/tageditor.py:234
+msgid "Mono"
 msgstr ""
 
-#: ../picard/ui/ui_passworddialog.py:81
-msgid "Save username and password"
+#: ../picard/ui/tageditor.py:235
+msgid "Stereo"
 msgstr ""
 
-#: ../picard/ui/ui_options_folksonomy.py:114
-#: ../picard/ui/ui_options_folksonomy_tags.py:114
-msgid "Folksonomy Tags"
+#: ../picard/ui/tageditor.py:237
+msgid "Channels:"
 msgstr ""
 
-#: ../picard/ui/ui_options_folksonomy.py:115
-#: ../picard/ui/ui_options_folksonomy_tags.py:115
-msgid "Ignore tags:"
-msgstr ""
-
-#: ../picard/ui/ui_options_folksonomy.py:116
-#: ../picard/ui/ui_options_folksonomy_tags.py:116
-msgid "Minimal tag usage:"
-msgstr ""
-
-#: ../picard/ui/ui_options_folksonomy.py:117
-#: ../picard/ui/ui_options_folksonomy_tags.py:117
-#: ../picard/ui/ui_options_matching.py:107
-#: ../picard/ui/ui_options_matching.py:108
-#: ../picard/ui/ui_options_matching.py:109
-#: ../picard/ui/ui_options_matching.py:113
-msgid " %"
-msgstr ""
-
-#: ../picard/ui/ui_options_folksonomy.py:118
-msgid "Maximum number of tags:"
-msgstr ""
-
-#: ../picard/ui/ui_options_folksonomy.py:119
-#: ../picard/ui/ui_options_folksonomy_tags.py:119
-msgid "Join multiple tags with:"
-msgstr ""
-
-#: ../picard/ui/ui_options_folksonomy.py:120
-#: ../picard/ui/ui_options_folksonomy_tags.py:120
-msgid " / "
-msgstr ""
-
-#: ../picard/ui/ui_options_folksonomy.py:121
-#: ../picard/ui/ui_options_folksonomy_tags.py:121
-msgid ", "
-msgstr ""
-
-#: ../picard/ui/ui_options_folksonomy_tags.py:118
-msgid "Maximal number of tags:"
+#: ../picard/ui/tagsfromfilenames.py:52
+#: ../picard/ui/tagsfromfilenames.py:96
+msgid "File Name"
 msgstr ""
 
 #: ../picard/ui/mainwindow.py:64
@@ -295,7 +1580,8 @@ msgstr ""
 msgid "&CD Lookup..."
 msgstr ""
 
-#: ../picard/ui/mainwindow.py:272 ../picard/ui/mainwindow.py:273
+#: ../picard/ui/mainwindow.py:272
+#: ../picard/ui/mainwindow.py:273
 msgid "Lookup CD"
 msgstr ""
 
@@ -326,7 +1612,8 @@ msgstr ""
 msgid "&Lookup"
 msgstr ""
 
-#: ../picard/ui/mainwindow.py:291 ../picard/ui/mainwindow.py:292
+#: ../picard/ui/mainwindow.py:291
+#: ../picard/ui/mainwindow.py:292
 msgid "Lookup metadata"
 msgstr ""
 
@@ -339,10 +1626,6 @@ msgstr ""
 msgid "&Details..."
 msgstr ""
 
-#: ../picard/ui/mainwindow.py:302 ../picard/ui/filebrowser.py:38
-msgid "&Refresh"
-msgstr ""
-
 #: ../picard/ui/mainwindow.py:305
 msgid "Generate &Playlist..."
 msgstr ""
@@ -388,6 +1671,7 @@ msgid "&Tools"
 msgstr ""
 
 #: ../picard/ui/mainwindow.py:384
+#: ../picard/ui/util.py:33
 msgid "&Help"
 msgstr ""
 
@@ -400,13 +1684,10 @@ msgid "&Search Bar"
 msgstr ""
 
 #: ../picard/ui/mainwindow.py:435
+#: ../picard/util/tags.py:21
 msgid "Album"
 msgstr ""
 
-#: ../picard/ui/mainwindow.py:437 ../picard/ui/puidsubmit.py:31
-msgid "Track"
-msgstr ""
-
 #: ../picard/ui/mainwindow.py:476
 msgid "All Supported Formats"
 msgstr ""
@@ -421,37 +1702,288 @@ msgstr ""
 msgid "Playlist %s saved"
 msgstr ""
 
-#: ../picard/ui/mainwindow.py:638 ../picard/ui/mainwindow.py:647
+#: ../picard/ui/mainwindow.py:638
+#: ../picard/ui/mainwindow.py:647
 #, python-format
 msgid " (Error: %s)"
 msgstr ""
 
+#: ../picard/ui/ui_tageditor.py:115
+#: ../picard/ui/ui_options_plugins.py:59
+#: ../picard/ui/options/plugins.py:76
+msgid "Name"
+msgstr ""
+
+#: ../picard/ui/ui_tageditor.py:116
+msgid "Value"
+msgstr ""
+
+#: ../picard/ui/ui_tageditor.py:117
+msgid "&Add..."
+msgstr ""
+
+#: ../picard/ui/ui_tageditor.py:118
+msgid "&Edit..."
+msgstr ""
+
+#: ../picard/ui/ui_tageditor.py:119
+msgid "&Delete"
+msgstr ""
+
+#: ../picard/ui/ui_tageditor.py:120
+msgid "&Metadata"
+msgstr ""
+
+#: ../picard/ui/ui_tageditor.py:121
+msgid "A&rtwork"
+msgstr ""
+
+#: ../picard/ui/ui_tageditor.py:122
+msgid "&Info"
+msgstr ""
+
+#: ../picard/ui/passworddialog.py:38
+#, python-format
+msgid "The server %s requires you to login. Please enter your username and password."
+msgstr ""
+
+#: ../picard/ui/ui_cdlookup.py:60
+#: ../picard/ui/ui_options_cdlookup.py:47
+#: ../picard/ui/ui_options_cdlookup_win32.py:56
+#: ../picard/ui/options/cdlookup.py:35
+msgid "CD Lookup"
+msgstr ""
+
+#: ../picard/ui/ui_cdlookup.py:61
+msgid "The following releases on MusicBrainz match the CD:"
+msgstr ""
+
+#: ../picard/ui/ui_cdlookup.py:62
+#: ../picard/ui/ui_puidsubmit.py:53
+msgid "OK"
+msgstr ""
+
+#: ../picard/ui/ui_cdlookup.py:63
+msgid "    Lookup manually    "
+msgstr ""
+
+#: ../picard/ui/ui_cdlookup.py:64
+#: ../picard/ui/ui_puidsubmit.py:54
+msgid "Cancel"
+msgstr ""
+
+#: ../picard/ui/ui_passworddialog.py:78
+msgid "Authentication required"
+msgstr ""
+
+#: ../picard/ui/ui_passworddialog.py:79
+#: ../picard/ui/ui_options_general.py:113
+#: ../picard/ui/ui_options_proxy.py:83
+msgid "Username:"
+msgstr ""
+
+#: ../picard/ui/ui_passworddialog.py:80
+#: ../picard/ui/ui_options_general.py:112
+#: ../picard/ui/ui_options_proxy.py:82
+msgid "Password:"
+msgstr ""
+
+#: ../picard/ui/ui_passworddialog.py:81
+msgid "Save username and password"
+msgstr ""
+
 #: ../picard/ui/ui_edittagdialog.py:44
 msgid "Edit Tag"
 msgstr ""
 
-#: ../picard/ui/ui_options_proxy.py:81
-msgid "Web Proxy"
+#: ../picard/ui/ui_metadata.py:121
+msgid "Lookup"
 msgstr ""
 
-#: ../picard/ui/ui_options_proxy.py:84 ../picard/ui/ui_options_general.py:109
-msgid "Port:"
+#: ../picard/ui/ui_metadata.py:122
+msgid "Title:"
 msgstr ""
 
-#: ../picard/ui/ui_options_proxy.py:85 ../picard/ui/ui_options_general.py:110
-msgid "Server address:"
+#: ../picard/ui/ui_metadata.py:123
+msgid "Date:"
 msgstr ""
 
-#: ../picard/ui/ui_tagsfromfilenames.py:56
-msgid "Convert File Names to Tags"
+#: ../picard/ui/ui_metadata.py:124
+msgid "Artist:"
 msgstr ""
 
-#: ../picard/ui/ui_tagsfromfilenames.py:57
-msgid "Replace underscores with spaces"
+#: ../picard/ui/ui_metadata.py:125
+msgid "Track:"
+msgstr ""
+
+#: ../picard/ui/ui_metadata.py:126
+msgid "0000-00-00; "
+msgstr ""
+
+#: ../picard/ui/ui_metadata.py:128
+msgid "Album:"
+msgstr ""
+
+#: ../picard/ui/ui_options.py:42
+msgid "Options"
+msgstr ""
+
+#: ../picard/ui/ui_options_cdlookup.py:48
+msgid "CD-ROM device to use for lookups:"
+msgstr ""
+
+#: ../picard/ui/ui_options_cdlookup_win32.py:57
+msgid "Default CD-ROM drive to use for lookups:"
+msgstr ""
+
+#: ../picard/ui/ui_options_cover.py:56
+msgid "Location"
+msgstr ""
+
+#: ../picard/ui/ui_options_cover.py:57
+msgid "Embed cover images into tags"
+msgstr ""
+
+#: ../picard/ui/ui_options_cover.py:58
+msgid "Save cover images as separate files"
+msgstr ""
+
+#: ../picard/ui/ui_options_cover.py:59
+msgid "Overwrite the file if it already exists"
+msgstr ""
+
+#: ../picard/ui/util.py:31
+msgid "&Ok"
+msgstr ""
+
+#: ../picard/ui/util.py:32
+msgid "&Cancel"
+msgstr ""
+
+#: ../picard/ui/ui_puidsubmit.py:52
+msgid "Submit PUIDs"
+msgstr ""
+
+#: ../picard/ui/ui_options_folksonomy.py:114
+#: ../picard/ui/options/folksonomy.py:29
+msgid "Folksonomy Tags"
+msgstr ""
+
+#: ../picard/ui/ui_options_folksonomy.py:115
+msgid "Ignore tags:"
+msgstr ""
+
+#: ../picard/ui/ui_options_folksonomy.py:116
+msgid "Minimal tag usage:"
+msgstr ""
+
+#: ../picard/ui/ui_options_folksonomy.py:117
+#: ../picard/ui/ui_options_matching.py:107
+#: ../picard/ui/ui_options_matching.py:108
+#: ../picard/ui/ui_options_matching.py:109
+#: ../picard/ui/ui_options_matching.py:113
+msgid " %"
+msgstr ""
+
+#: ../picard/ui/ui_options_folksonomy.py:118
+msgid "Maximum number of tags:"
+msgstr ""
+
+#: ../picard/ui/ui_options_folksonomy.py:119
+msgid "Join multiple tags with:"
+msgstr ""
+
+#: ../picard/ui/ui_options_folksonomy.py:120
+msgid " / "
+msgstr ""
+
+#: ../picard/ui/ui_options_folksonomy.py:121
+msgid ", "
+msgstr ""
+
+#: ../picard/ui/ui_options_interface.py:50
+msgid "Miscellaneous"
+msgstr ""
+
+#: ../picard/ui/ui_options_interface.py:51
+msgid "Show text labels under icons"
+msgstr ""
+
+#: ../picard/ui/ui_options_interface.py:52
+msgid "Allow selection of multiple directories"
+msgstr ""
+
+#: ../picard/ui/ui_options_interface.py:53
+msgid "Use advanced query syntax"
+msgstr ""
+
+#: ../picard/ui/ui_options_interface.py:54
+msgid "User interface language:"
+msgstr ""
+
+#: ../picard/ui/ui_options_naming.py:165
+msgid "Rename Files"
+msgstr ""
+
+#: ../picard/ui/ui_options_naming.py:166
+msgid "Replace Windows-incompatible characters"
+msgstr ""
+
+#: ../picard/ui/ui_options_naming.py:167
+msgid "Replace non-ASCII characters"
+msgstr ""
+
+#: ../picard/ui/ui_options_naming.py:168
+#: ../picard/ui/ui_options_naming.py:169
+#: ../picard/ui/ui_options_metadata.py:109
+#: ../picard/ui/ui_options_metadata.py:110
+msgid "Default"
+msgstr ""
+
+#: ../picard/ui/ui_options_naming.py:170
+#: ../picard/ui/options/naming.py:90
+msgid "Multiple artist file naming format:"
+msgstr ""
+
+#: ../picard/ui/ui_options_naming.py:171
+#: ../picard/ui/options/naming.py:86
+msgid "File naming format:"
+msgstr ""
+
+#: ../picard/ui/ui_options_naming.py:172
+msgid "Move Files"
+msgstr ""
+
+#: ../picard/ui/ui_options_naming.py:173
+msgid "Move tagged files to this directory:"
+msgstr ""
+
+#: ../picard/ui/ui_options_naming.py:174
+msgid "Browse..."
+msgstr ""
+
+#: ../picard/ui/ui_options_naming.py:175
+msgid "Move additional files:"
+msgstr ""
+
+#: ../picard/ui/ui_options_naming.py:176
+msgid "Delete empty directories"
+msgstr ""
+
+#: ../picard/ui/ui_options_naming.py:177
+msgid "Example"
+msgstr ""
+
+#: ../picard/ui/ui_options_naming.py:178
+msgid "File name:"
+msgstr ""
+
+#: ../picard/ui/ui_options_naming.py:179
+msgid "Multiple artist file name:"
 msgstr ""
 
-#: ../picard/ui/ui_tagsfromfilenames.py:58
 #: ../picard/ui/ui_options_naming.py:180
+#: ../picard/ui/ui_tagsfromfilenames.py:58
 msgid "&Preview"
 msgstr ""
 
@@ -459,11 +1991,22 @@ msgstr ""
 msgid "MusicBrainz Server"
 msgstr ""
 
+#: ../picard/ui/ui_options_general.py:109
+#: ../picard/ui/ui_options_proxy.py:84
+msgid "Port:"
+msgstr ""
+
+#: ../picard/ui/ui_options_general.py:110
+#: ../picard/ui/ui_options_proxy.py:85
+msgid "Server address:"
+msgstr ""
+
 #: ../picard/ui/ui_options_general.py:111
 msgid "Account Information"
 msgstr ""
 
 #: ../picard/ui/ui_options_general.py:114
+#: ../picard/ui/options/general.py:29
 msgid "General"
 msgstr ""
 
@@ -471,34 +2014,6 @@ msgstr ""
 msgid "Automatically scan all new files"
 msgstr ""
 
-#: ../picard/ui/ui_options_interface.py:46
-msgid "Miscellaneous"
-msgstr ""
-
-#: ../picard/ui/ui_options_interface.py:47
-msgid "Show text labels under icons"
-msgstr ""
-
-#: ../picard/ui/ui_options_interface.py:48
-msgid "Allow selection of multiple directories"
-msgstr ""
-
-#: ../picard/ui/ui_options_interface.py:49
-msgid "Use advanced query syntax"
-msgstr ""
-
-#: ../picard/ui/itemviews.py:327
-msgid "&Releases"
-msgstr ""
-
-#: ../picard/ui/itemviews.py:353
-msgid "&Plugins"
-msgstr ""
-
-#: ../picard/ui/itemviews.py:523
-msgid "Clusters"
-msgstr ""
-
 #: ../picard/ui/ui_options_matching.py:105
 msgid "Thresholds"
 msgstr ""
@@ -519,6 +2034,67 @@ msgstr ""
 msgid "Minimal similarity for PUID lookups:"
 msgstr ""
 
+#: ../picard/ui/ui_options_metadata.py:100
+#: ../picard/ui/options/metadata.py:31
+msgid "Metadata"
+msgstr ""
+
+#: ../picard/ui/ui_options_metadata.py:101
+msgid "Translate foreign artist names to English where possible"
+msgstr ""
+
+#: ../picard/ui/ui_options_metadata.py:102
+msgid "Use release relationships"
+msgstr ""
+
+#: ../picard/ui/ui_options_metadata.py:103
+msgid "Use track relationships"
+msgstr ""
+
+#: ../picard/ui/ui_options_metadata.py:104
+msgid "Use folksonomy tags as genre"
+msgstr ""
+
+#: ../picard/ui/ui_options_metadata.py:105
+msgid "Preferred release country:"
+msgstr ""
+
+#: ../picard/ui/ui_options_metadata.py:106
+msgid "Custom Fields"
+msgstr ""
+
+#: ../picard/ui/ui_options_metadata.py:107
+msgid "Various artists:"
+msgstr ""
+
+#: ../picard/ui/ui_options_metadata.py:108
+msgid "Non-album tracks:"
+msgstr ""
+
+#: ../picard/ui/ui_options_plugins.py:58
+#: ../picard/ui/options/plugins.py:30
+msgid "Plugins"
+msgstr ""
+
+#: ../picard/ui/ui_options_plugins.py:60
+#: ../picard/ui/options/plugins.py:79
+msgid "Author"
+msgstr ""
+
+#: ../picard/ui/ui_options_plugins.py:61
+#: ../picard/util/tags.py:36
+msgid "Version"
+msgstr ""
+
+#: ../picard/ui/ui_options_proxy.py:81
+#: ../picard/ui/options/proxy.py:28
+msgid "Web Proxy"
+msgstr ""
+
+#: ../picard/ui/ui_options_script.py:52
+msgid "Tagger Script"
+msgstr ""
+
 #: ../picard/ui/ui_options_tags.py:105
 msgid "Common"
 msgstr ""
@@ -571,309 +2147,16 @@ msgstr ""
 msgid "Remove APEv2 tags from MP3 files"
 msgstr ""
 
-#: ../picard/ui/ui_options_cdlookup_win32.py:56 ../picard/ui/ui_cdlookup.py:60
-#: ../picard/ui/ui_options_cdlookup.py:47
-msgid "CD Lookup"
+#: ../picard/ui/ui_tagsfromfilenames.py:56
+msgid "Convert File Names to Tags"
 msgstr ""
 
-#: ../picard/ui/ui_options_cdlookup_win32.py:57
-msgid "Default CD-ROM drive to use for lookups:"
+#: ../picard/ui/ui_tagsfromfilenames.py:57
+msgid "Replace underscores with spaces"
 msgstr ""
 
-#: ../picard/ui/tageditor.py:65 ../picard/ui/ui_options_plugins.py:62
-#: ../picard/ui/multitageditor.py:37
-msgid "Details"
-msgstr ""
-
-#: ../picard/ui/tageditor.py:70 ../picard/ui/tageditor.py:241
-#: ../picard/ui/multitageditor.py:42 ../picard/ui/multitageditor.py:197
-#, python-format
-msgid "%d file"
-msgid_plural "%d files"
-msgstr[0] ""
-msgstr[1] ""
-
-#: ../picard/ui/tageditor.py:124 ../picard/ui/multitageditor.py:95
-#, python-format
-msgid "(different across %d file)"
-msgid_plural "(different across %d files)"
-msgstr[0] ""
-msgstr[1] ""
-
-#: ../picard/ui/tageditor.py:127 ../picard/ui/multitageditor.py:98
-#, python-format
-msgid "(missing from %d file)"
-msgid_plural "(missing from %d files)"
-msgstr[0] ""
-msgstr[1] ""
-
-#: ../picard/ui/tageditor.py:210 ../picard/ui/multitageditor.py:166
-msgid "Filename:"
-msgstr ""
-
-#: ../picard/ui/tageditor.py:212 ../picard/ui/multitageditor.py:168
-msgid "Format:"
-msgstr ""
-
-#: ../picard/ui/tageditor.py:221 ../picard/ui/multitageditor.py:177
-msgid "Size:"
-msgstr ""
-
-#: ../picard/ui/tageditor.py:227 ../picard/ui/multitageditor.py:183
-msgid "Bitrate:"
-msgstr ""
-
-#: ../picard/ui/tageditor.py:229 ../picard/ui/multitageditor.py:185
-msgid "Sample rate:"
-msgstr ""
-
-#: ../picard/ui/tageditor.py:231 ../picard/ui/multitageditor.py:187
-msgid "Bits per sample:"
-msgstr ""
-
-#: ../picard/ui/tageditor.py:234 ../picard/ui/multitageditor.py:190
-msgid "Mono"
-msgstr ""
-
-#: ../picard/ui/tageditor.py:235 ../picard/ui/multitageditor.py:191
-msgid "Stereo"
-msgstr ""
-
-#: ../picard/ui/tageditor.py:237 ../picard/ui/multitageditor.py:193
-msgid "Channels:"
-msgstr ""
-
-#: ../picard/ui/ui_tageditor.py:115 ../picard/ui/ui_multitageditor.py:55
-#: ../picard/ui/ui_options_plugins.py:59 ../picard/ui/options/plugins.py:76
-msgid "Name"
-msgstr ""
-
-#: ../picard/ui/ui_tageditor.py:116 ../picard/ui/ui_multitageditor.py:56
-msgid "Value"
-msgstr ""
-
-#: ../picard/ui/ui_tageditor.py:117 ../picard/ui/ui_multitageditor.py:57
-msgid "&Add..."
-msgstr ""
-
-#: ../picard/ui/ui_tageditor.py:118
-msgid "&Edit..."
-msgstr ""
-
-#: ../picard/ui/ui_tageditor.py:119
-msgid "&Delete"
-msgstr ""
-
-#: ../picard/ui/ui_tageditor.py:120
-msgid "&Metadata"
-msgstr ""
-
-#: ../picard/ui/ui_tageditor.py:121
-msgid "A&rtwork"
-msgstr ""
-
-#: ../picard/ui/ui_tageditor.py:122
-msgid "&Info"
-msgstr ""
-
-#: ../picard/ui/coverartbox.py:47
-msgid "Cover Art"
-msgstr "ಹೊರ ಚಿತ್ರ"
-
-#: ../picard/ui/coverartbox.py:95
-msgid "Buy the album on Amazon"
-msgstr "ಈ ಕೃತಿಯನ್ನು ಅಮೆಜಾನ್ ಇಂದ ಖರೀದಿಸು"
-
-#: ../picard/ui/ui_puidsubmit.py:52
-msgid "Submit PUIDs"
-msgstr ""
-
-#: ../picard/ui/ui_puidsubmit.py:53 ../picard/ui/ui_cdlookup.py:62
-msgid "OK"
-msgstr ""
-
-#: ../picard/ui/ui_puidsubmit.py:54 ../picard/ui/ui_cdlookup.py:64
-msgid "Cancel"
-msgstr ""
-
-#: ../picard/ui/puidsubmit.py:31 ../picard/ui/options/plugins.py:80
-msgid "File"
-msgstr ""
-
-#: ../picard/ui/puidsubmit.py:31
-msgid "PUID"
-msgstr ""
-
-#: ../picard/ui/puidsubmit.py:31
-msgid "Release"
-msgstr ""
-
-#: ../picard/ui/puidsubmit.py:31
-msgid "Release ID"
-msgstr ""
-
-#: ../picard/ui/filebrowser.py:41
-msgid "&Move Tagged Files Here"
-msgstr ""
-
-#: ../picard/ui/filebrowser.py:44
-msgid "Show &Hidden Files"
-msgstr ""
-
-#: ../picard/ui/ui_cdlookup.py:61
-msgid "The following releases on MusicBrainz match the CD:"
-msgstr ""
-
-#: ../picard/ui/ui_cdlookup.py:63
-msgid "    Lookup manually    "
-msgstr ""
-
-#: ../picard/ui/ui_options.py:42
-msgid "Options"
-msgstr ""
-
-#: ../picard/ui/tagsfromfilenames.py:52 ../picard/ui/tagsfromfilenames.py:96
-msgid "File Name"
-msgstr ""
-
-#: ../picard/ui/ui_options_cover.py:56
-msgid "Location"
-msgstr ""
-
-#: ../picard/ui/ui_options_cover.py:57
-msgid "Embed cover images into tags"
-msgstr ""
-
-#: ../picard/ui/ui_options_cover.py:58
-msgid "Save cover images as separate files"
-msgstr ""
-
-#: ../picard/ui/ui_options_cover.py:59
-msgid "Overwrite the file if it already exists"
-msgstr ""
-
-#: ../picard/ui/ui_options_metadata.py:100
-msgid "Metadata"
-msgstr ""
-
-#: ../picard/ui/ui_options_metadata.py:101
-msgid "Translate foreign artist names to English where possible"
-msgstr ""
-
-#: ../picard/ui/ui_options_metadata.py:102
-msgid "Use release relationships"
-msgstr ""
-
-#: ../picard/ui/ui_options_metadata.py:103
-msgid "Use track relationships"
-msgstr ""
-
-#: ../picard/ui/ui_options_metadata.py:104
-msgid "Use folksonomy tags as genre"
-msgstr ""
-
-#: ../picard/ui/ui_options_metadata.py:105
-msgid "Preferred release country:"
-msgstr ""
-
-#: ../picard/ui/ui_options_metadata.py:106
-msgid "Custom Fields"
-msgstr ""
-
-#: ../picard/ui/ui_options_metadata.py:107
-msgid "Various artists:"
-msgstr ""
-
-#: ../picard/ui/ui_options_metadata.py:108
-msgid "Non-album tracks:"
-msgstr ""
-
-#: ../picard/ui/ui_options_metadata.py:109
-#: ../picard/ui/ui_options_metadata.py:110
-#: ../picard/ui/ui_options_naming.py:168 ../picard/ui/ui_options_naming.py:169
-msgid "Default"
-msgstr ""
-
-#: ../picard/ui/ui_multitageditor.py:58
-msgid "Delete"
-msgstr ""
-
-#: ../picard/ui/logview.py:29
-msgid "Log"
-msgstr ""
-
-#: ../picard/ui/ui_options_plugins.py:58
-msgid "Plugins"
-msgstr ""
-
-#: ../picard/ui/ui_options_plugins.py:60 ../picard/ui/options/plugins.py:79
-msgid "Author"
-msgstr ""
-
-#: ../picard/ui/ui_options_plugins.py:61
-msgid "Version"
-msgstr ""
-
-#: ../picard/ui/ui_options_naming.py:165
-msgid "Rename Files"
-msgstr ""
-
-#: ../picard/ui/ui_options_naming.py:166
-msgid "Replace Windows-incompatible characters"
-msgstr ""
-
-#: ../picard/ui/ui_options_naming.py:167
-msgid "Replace non-ASCII characters"
-msgstr ""
-
-#: ../picard/ui/ui_options_naming.py:170 ../picard/ui/options/naming.py:90
-msgid "Multiple artist file naming format:"
-msgstr ""
-
-#: ../picard/ui/ui_options_naming.py:171 ../picard/ui/options/naming.py:86
-msgid "File naming format:"
-msgstr ""
-
-#: ../picard/ui/ui_options_naming.py:172
-msgid "Move Files"
-msgstr ""
-
-#: ../picard/ui/ui_options_naming.py:173
-msgid "Move tagged files to this directory:"
-msgstr ""
-
-#: ../picard/ui/ui_options_naming.py:174
-msgid "Browse..."
-msgstr ""
-
-#: ../picard/ui/ui_options_naming.py:175
-msgid "Move additional files:"
-msgstr ""
-
-#: ../picard/ui/ui_options_naming.py:176
-msgid "Delete empty directories"
-msgstr ""
-
-#: ../picard/ui/ui_options_naming.py:177
-msgid "Example"
-msgstr ""
-
-#: ../picard/ui/ui_options_naming.py:178
-msgid "File name:"
-msgstr ""
-
-#: ../picard/ui/ui_options_naming.py:179
-msgid "Multiple artist file name:"
-msgstr ""
-
-#: ../picard/ui/ui_options_cdlookup.py:48
-msgid "CD-ROM device to use for lookups:"
-msgstr ""
-
-#: ../picard/ui/options/scripting.py:84 ../picard/ui/options/naming.py:86
-#: ../picard/ui/options/naming.py:90 ../picard/ui/options/naming.py:93
-#: ../picard/ui/options/naming.py:95
-msgid "Script Error"
+#: ../picard/ui/options/about.py:29
+msgid "About"
 msgstr ""
 
 #. Replace this with your name to have it appear in the "About" dialog.
@@ -892,22 +2175,55 @@ msgstr ""
 #: ../picard/ui/options/about.py:55
 #, python-format
 msgid ""
-"<p align=\"center\"><span style=\"font-size:15px;font-weight:bold;"
-"\">MusicBrainz Picard</span><br/>\n"
+"<p align=\"center\"><span style=\"font-size:15px;font-weight:bold;\">MusicBrainz Picard</span><br/>\n"
 "Version %(version)s</p>\n"
 "<p align=\"center\"><strong>Supported formats</strong><br/>%(formats)s</p>\n"
 "<p align=\"center\"><strong>Please donate</strong><br/>\n"
-"Thank you for using Picard. Picard relies on the MusicBrainz database, which "
-"is operated by the MetaBrainz Foundation with the help of thousands of "
-"volunteers. If you like this application please consider donating to the "
-"MetaBrainz Foundation to keep the service running.</p>\n"
-"<p align=\"center\"><a href=\"http://metabrainz.org/donate/index.html"
-"\">Donate now!</a></p>\n"
+"Thank you for using Picard. Picard relies on the MusicBrainz database, which is operated by the MetaBrainz Foundation with the help of thousands of volunteers. If you like this application please consider donating to the MetaBrainz Foundation to keep the service running.</p>\n"
+"<p align=\"center\"><a href=\"http://metabrainz.org/donate/index.html\">Donate now!</a></p>\n"
 "<p align=\"center\"><strong>Credits</strong><br/>\n"
-"<small>Copyright © 2004-2008 Robert Kaye, Lukáš Lalinský and others%"
-"(translator-credits)s</small></p>\n"
-"<p align=\"center\"><a href=\"http://musicbrainz.org/doc/PicardTagger"
-"\">http://musicbrainz.org/doc/PicardTagger</a></p>\n"
+"<small>Copyright © 2004-2008 Robert Kaye, Lukáš Lalinský and others%(translator-credits)s</small></p>\n"
+"<p align=\"center\"><a href=\"http://musicbrainz.org/doc/PicardTagger\">http://musicbrainz.org/doc/PicardTagger</a></p>\n"
+msgstr ""
+
+#: ../picard/ui/options/advanced.py:26
+msgid "Advanced"
+msgstr ""
+
+#: ../picard/ui/options/interface.py:31
+msgid "User Interface"
+msgstr ""
+
+#: ../picard/ui/options/interface.py:47
+msgid "System default"
+msgstr ""
+
+#: ../picard/ui/options/interface.py:71
+msgid "Language changed"
+msgstr ""
+
+#: ../picard/ui/options/interface.py:71
+msgid "You have changed the interface language. You have to restart Picard in order for the change to take effect."
+msgstr ""
+
+#: ../picard/ui/options/matching.py:29
+msgid "Matching"
+msgstr ""
+
+#: ../picard/ui/options/metadata.py:52
+msgid "None"
+msgstr ""
+
+#: ../picard/ui/options/naming.py:33
+msgid "File Naming"
+msgstr ""
+
+#: ../picard/ui/options/naming.py:86
+#: ../picard/ui/options/naming.py:90
+#: ../picard/ui/options/naming.py:93
+#: ../picard/ui/options/naming.py:95
+#: ../picard/ui/options/scripting.py:84
+msgid "Script Error"
 msgstr ""
 
 #: ../picard/ui/options/naming.py:93
@@ -926,6 +2242,233 @@ msgstr ""
 msgid "The location to move files to must not be empty."
 msgstr ""
 
+#: ../picard/ui/options/scripting.py:63
+msgid "Scripting"
+msgstr ""
+
+#: ../picard/ui/options/tags.py:29
+msgid "Tags"
+msgstr ""
+
+#: ../picard/util/tags.py:24
+#, fuzzy
+msgid "Date"
+msgstr "&ಅಂಟಿಸು"
+
+#: ../picard/util/tags.py:25
+#, fuzzy
+msgid "Album Artist"
+msgstr "ಕಲಾವಿದ"
+
+#: ../picard/util/tags.py:26
+msgid "Track Number"
+msgstr ""
+
+#: ../picard/util/tags.py:27
+msgid "Total Tracks"
+msgstr ""
+
+#: ../picard/util/tags.py:28
+msgid "Disc Number"
+msgstr ""
+
+#: ../picard/util/tags.py:29
+msgid "Total Discs"
+msgstr ""
+
+#: ../picard/util/tags.py:30
+msgid "Album Artist Sort Order"
+msgstr ""
+
+#: ../picard/util/tags.py:31
+msgid "Artist Sort Order"
+msgstr ""
+
+#: ../picard/util/tags.py:32
+msgid "Title Sort Order"
+msgstr ""
+
+#: ../picard/util/tags.py:33
+msgid "Album Sort Order"
+msgstr ""
+
+#: ../picard/util/tags.py:34
+msgid "ASIN"
+msgstr ""
+
+#: ../picard/util/tags.py:35
+msgid "Grouping"
+msgstr ""
+
+#: ../picard/util/tags.py:37
+msgid "ISRC"
+msgstr ""
+
+#: ../picard/util/tags.py:38
+msgid "Mood"
+msgstr ""
+
+#: ../picard/util/tags.py:39
+msgid "BPM"
+msgstr ""
+
+#: ../picard/util/tags.py:40
+msgid "Copyright"
+msgstr ""
+
+#: ../picard/util/tags.py:41
+msgid "Composer"
+msgstr ""
+
+#: ../picard/util/tags.py:42
+msgid "Conductor"
+msgstr ""
+
+#: ../picard/util/tags.py:43
+msgid "Lyricist"
+msgstr ""
+
+#: ../picard/util/tags.py:44
+msgid "Arranger"
+msgstr ""
+
+#: ../picard/util/tags.py:45
+msgid "Producer"
+msgstr ""
+
+#: ../picard/util/tags.py:46
+msgid "Engineer"
+msgstr ""
+
+#: ../picard/util/tags.py:47
+#, fuzzy
+msgid "Subtitle"
+msgstr "ಶೀರ್ಷಿಕೆ"
+
+#: ../picard/util/tags.py:48
+msgid "Disc Subtitle"
+msgstr ""
+
+#: ../picard/util/tags.py:49
+msgid "Remixer"
+msgstr ""
+
+#: ../picard/util/tags.py:50
+msgid "MusicBrainz Track Id"
+msgstr ""
+
+#: ../picard/util/tags.py:51
+msgid "MusicBrainz Release Id"
+msgstr ""
+
+#: ../picard/util/tags.py:52
+msgid "MusicBrainz Artist Id"
+msgstr ""
+
+#: ../picard/util/tags.py:53
+msgid "MusicBrainz Release Artist Id"
+msgstr ""
+
+#: ../picard/util/tags.py:54
+msgid "MusicBrainz TRM Id"
+msgstr ""
+
+#: ../picard/util/tags.py:55
+msgid "MusicBrainz Disc Id"
+msgstr ""
+
+#: ../picard/util/tags.py:56
+msgid "MusicBrainz Sort Name"
+msgstr ""
+
+#: ../picard/util/tags.py:57
+msgid "MusicIP PUID"
+msgstr ""
+
+#: ../picard/util/tags.py:58
+msgid "MusicIP Fingerprint"
+msgstr ""
+
+#: ../picard/util/tags.py:59
+msgid "Disc Id"
+msgstr ""
+
+#: ../picard/util/tags.py:60
+msgid "Website"
+msgstr ""
+
+#: ../picard/util/tags.py:61
+msgid "Compilation"
+msgstr ""
+
+#: ../picard/util/tags.py:62
+msgid "Comment"
+msgstr ""
+
+#: ../picard/util/tags.py:63
+msgid "Genre"
+msgstr ""
+
+#: ../picard/util/tags.py:64
+msgid "Encoded By"
+msgstr ""
+
+#: ../picard/util/tags.py:65
+msgid "Performer"
+msgstr ""
+
+#: ../picard/util/tags.py:66
+msgid "Release Type"
+msgstr ""
+
+#: ../picard/util/tags.py:67
+msgid "Release Status"
+msgstr ""
+
+#: ../picard/util/tags.py:68
+msgid "Release Country"
+msgstr ""
+
+#: ../picard/util/tags.py:69
+msgid "Record Label"
+msgstr ""
+
+#: ../picard/util/tags.py:70
+msgid "Barcode"
+msgstr ""
+
+#: ../picard/util/tags.py:71
+msgid "Catalog Number"
+msgstr ""
+
+#: ../picard/util/tags.py:72
+msgid "Format"
+msgstr ""
+
+#: ../picard/util/tags.py:73
+msgid "DJ-Mixer"
+msgstr ""
+
+#: ../picard/util/tags.py:74
+msgid "Media"
+msgstr ""
+
+#: ../picard/util/tags.py:75
+msgid "Lyrics"
+msgstr ""
+
+#: ../picard/util/tags.py:76
+msgid "Mixer"
+msgstr ""
+
+#: ../picard/util/tags.py:77
+msgid "Language"
+msgstr ""
+
+#: ../picard/util/tags.py:78
+msgid "Script"
+msgstr ""
+
 #: ../picard/util/webbrowser2.py:84
 msgid "Web Browser Error"
 msgstr ""
@@ -938,37 +2481,10 @@ msgid ""
 "%s"
 msgstr ""
 
-#~ msgid "No matching tracks for file %s"
-#~ msgstr "%s ಕಡತವು ಯಾವುದೇ ಸಂಗೀತ ಕೃತಿಯನ್ನು ಹೊಲುತ್ತಿಲ್ಲ"
-
-#~ msgid "File %s identified!"
-#~ msgstr "%s ಕಡತವನ್ನು ಗುರುತಿಸಲಾಗಿದೆ"
-
-#~ msgid "Looking up the PUID for file %s..."
-#~ msgstr "%s ಕಡತದ ಪಿಯುಐಡಿ ಅನ್ನು ಹುಡುಕಲಾಗುತ್ತಿದೆ"
-
-#~ msgid "Looking up the metadata for file %s..."
-#~ msgstr "%s ಕಡತದ ಮೆಟಾಡಾಟಾವನ್ನು ಹುಡುಕಲಾಗುತ್ತಿದೆ"
-
-#~ msgid "Submitting PUIDs..."
-#~ msgstr "ಪಿಯುಐಡಿಗಳನ್ನು ಸಲ್ಲಿಸಲಾಗುತ್ತಿದೆ..."
-
-#~ msgid "PUIDs submission failed: %s"
-#~ msgstr "ಪಿಯುಐಡಿಗಳ ಸಲ್ಲಿಸುವಿಕೆಯಲ್ಲಿ ತೊಂದರೆಯಾಗಿದೆ: %s"
-
-#~ msgid "PUIDs successfully submitted!"
-#~ msgstr "ಪಿಯುಐಡಿಗಳನ್ನು ಯಶಸ್ವಿಯಾಗಿ ಸಲ್ಲಿಸಲಾಗಿದೆ!"
-
 #~ msgid "New Version"
 #~ msgstr "ಹೊಸ ಆವೃತ್ತಿ"
-
 #~ msgid ""
 #~ "New version of Picard is available (%s). Would you like to download it "
 #~ "now?"
 #~ msgstr "ಪಿಕಾರ್ಡನ  ಹೊಸ ಆವೃತ್ತಿ ಲಭ್ಯವಿದೆ (%s). ಡೌನ್ಲೋಡ್ ಮಾಡಲು ಇಚ್ಚಿಸುವಿರಾ?"
 
-#~ msgid "Creating fingerprint for file %s..."
-#~ msgstr "%s ಕಡತದ ಫಿಂಗರ್ ಪ್ರಿಂಟ್ ಅನ್ನು ನಿರ್ಮಿಸಲಾಗುತ್ತಿದೆ..."
-
-#~ msgid "Length"
-#~ msgstr "ಕಾಲಾವಧಿ"
diff --git a/po/ko.po b/po/ko.po
index 285708ff5..ff20a6107 100644
--- a/po/ko.po
+++ b/po/ko.po
@@ -6,36 +6,1291 @@ msgid ""
 msgstr ""
 "Project-Id-Version: 0.5.2\n"
 "Report-Msgid-Bugs-To: http://bugs.musicbrainz.org/\n"
-"POT-Creation-Date: 2008-12-01 18:20+0100\n"
-"PO-Revision-Date: 2008-07-27 21:02+0000\n"
-"Last-Translator: Afeleia <Afeleia.CE@gmail.com>\n"
+"POT-Creation-Date: 2009-01-25 12:23+0100\n"
+"PO-Revision-Date: 2009-01-25 13:24+0100\n"
+"Last-Translator: Philipp Wolfer <phw@rubyforge.org>\n"
 "Language-Team: British English <en_GB@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
-"X-Launchpad-Export-Date: 2008-12-01 17:02+0000\n"
+"X-Launchpad-Export-Date: 2009-01-24 23:28+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 "Generated-By: pygettext.py 1.5\n"
 
-#: ../picard/album.py:108 ../picard/cluster.py:248
+#: ../picard/album.py:108
+#: ../picard/cluster.py:248
 msgid "Unmatched Files"
 msgstr ""
 
-#: ../picard/album.py:269
+#: ../picard/album.py:281
 #, python-format
 msgid "[couldn't load album %s]"
 msgstr ""
 
-#: ../picard/album.py:305
+#: ../picard/album.py:317
 msgid "[loading album information]"
 msgstr ""
 
-#: ../picard/tagger.py:472
+#: ../picard/cluster.py:164
+#: ../picard/cluster.py:175
+#, python-format
+msgid "No matching releases for cluster %s"
+msgstr "일치하는 cluster %s이 없습니다."
+
+#: ../picard/cluster.py:177
+#, fuzzy, python-format
+msgid "Cluster %s identified!"
+msgstr "File %s identified!"
+
+#: ../picard/cluster.py:182
+#, fuzzy, python-format
+msgid "Looking up the metadata for cluster %s..."
+msgstr "일치하는 cluster %s이 없습니다."
+
+#: ../picard/const.py:40
+msgid "CD"
+msgstr ""
+
+#: ../picard/const.py:41
+msgid "DVD"
+msgstr ""
+
+#: ../picard/const.py:42
+msgid "SACD"
+msgstr ""
+
+#: ../picard/const.py:43
+msgid "LaserDisc"
+msgstr ""
+
+#: ../picard/const.py:44
+msgid "MiniDisc"
+msgstr ""
+
+#: ../picard/const.py:45
+msgid "Vinyl"
+msgstr ""
+
+#: ../picard/const.py:46
+msgid "Cassette"
+msgstr ""
+
+#: ../picard/const.py:47
+msgid "Cartridge (4/8-tracks)"
+msgstr ""
+
+#: ../picard/const.py:48
+msgid "Reel-to-Reel"
+msgstr ""
+
+#: ../picard/const.py:49
+msgid "DAT"
+msgstr ""
+
+#: ../picard/const.py:50
+#, fuzzy
+msgid "Digital Media"
+msgstr "원래 제목"
+
+#: ../picard/const.py:51
+msgid "Wax Cylinder"
+msgstr ""
+
+#: ../picard/const.py:52
+msgid "Piano Roll"
+msgstr ""
+
+#: ../picard/const.py:53
+msgid "Other"
+msgstr ""
+
+#: ../picard/const.py:58
+msgid "Bangladesh"
+msgstr ""
+
+#: ../picard/const.py:59
+msgid "Belgium"
+msgstr ""
+
+#: ../picard/const.py:60
+msgid "Burkina Faso"
+msgstr ""
+
+#: ../picard/const.py:61
+msgid "Bulgaria"
+msgstr ""
+
+#: ../picard/const.py:62
+msgid "Barbados"
+msgstr ""
+
+#: ../picard/const.py:63
+msgid "Wallis and Futuna Islands"
+msgstr ""
+
+#: ../picard/const.py:64
+msgid "Bermuda"
+msgstr ""
+
+#: ../picard/const.py:65
+msgid "Brunei Darussalam"
+msgstr ""
+
+#: ../picard/const.py:66
+msgid "Bolivia"
+msgstr ""
+
+#: ../picard/const.py:67
+msgid "Bahrain"
+msgstr ""
+
+#: ../picard/const.py:68
+msgid "Burundi"
+msgstr ""
+
+#: ../picard/const.py:69
+msgid "Benin"
+msgstr ""
+
+#: ../picard/const.py:70
+msgid "Bhutan"
+msgstr ""
+
+#: ../picard/const.py:71
+msgid "Jamaica"
+msgstr ""
+
+#: ../picard/const.py:72
+msgid "Bouvet Island"
+msgstr ""
+
+#: ../picard/const.py:73
+msgid "Botswana"
+msgstr ""
+
+#: ../picard/const.py:74
+msgid "Samoa"
+msgstr ""
+
+#: ../picard/const.py:75
+msgid "Brazil"
+msgstr ""
+
+#: ../picard/const.py:76
+msgid "Bahamas"
+msgstr ""
+
+#: ../picard/const.py:77
+msgid "Belarus"
+msgstr ""
+
+#: ../picard/const.py:78
+msgid "Belize"
+msgstr ""
+
+#: ../picard/const.py:79
+msgid "Russian Federation"
+msgstr ""
+
+#: ../picard/const.py:80
+msgid "Rwanda"
+msgstr ""
+
+#: ../picard/const.py:81
+msgid "Reunion"
+msgstr ""
+
+#: ../picard/const.py:82
+msgid "Turkmenistan"
+msgstr ""
+
+#: ../picard/const.py:83
+msgid "Tajikistan"
+msgstr ""
+
+#: ../picard/const.py:84
+msgid "Romania"
+msgstr ""
+
+#: ../picard/const.py:85
+#, fuzzy
+msgid "Tokela"
+msgstr "툴바"
+
+#: ../picard/const.py:86
+msgid "Guinea-Bissa"
+msgstr ""
+
+#: ../picard/const.py:87
+msgid "Guam"
+msgstr ""
+
+#: ../picard/const.py:88
+msgid "Guatemala"
+msgstr ""
+
+#: ../picard/const.py:89
+msgid "Greece"
+msgstr ""
+
+#: ../picard/const.py:90
+msgid "Equatorial Guinea"
+msgstr ""
+
+#: ../picard/const.py:91
+msgid "Guadeloupe"
+msgstr ""
+
+#: ../picard/const.py:92
+msgid "Japan"
+msgstr ""
+
+#: ../picard/const.py:93
+msgid "Guyana"
+msgstr ""
+
+#: ../picard/const.py:94
+msgid "French Guiana"
+msgstr ""
+
+#: ../picard/const.py:95
+msgid "Georgia"
+msgstr ""
+
+#: ../picard/const.py:96
+msgid "Grenada"
+msgstr ""
+
+#: ../picard/const.py:97
+msgid "United Kingdom"
+msgstr ""
+
+#: ../picard/const.py:98
+msgid "Gabon"
+msgstr ""
+
+#: ../picard/const.py:99
+msgid "El Salvador"
+msgstr ""
+
+#: ../picard/const.py:100
+#, fuzzy
+msgid "Guinea"
+msgstr "General"
+
+#: ../picard/const.py:101
+msgid "Gambia"
+msgstr ""
+
+#: ../picard/const.py:102
+msgid "Greenland"
+msgstr ""
+
+#: ../picard/const.py:103
+msgid "Gibraltar"
+msgstr ""
+
+#: ../picard/const.py:104
+msgid "Ghana"
+msgstr ""
+
+#: ../picard/const.py:105
+msgid "Oman"
+msgstr ""
+
+#: ../picard/const.py:106
+msgid "Tunisia"
+msgstr ""
+
+#: ../picard/const.py:107
+msgid "Jordan"
+msgstr ""
+
+#: ../picard/const.py:108
+msgid "Haiti"
+msgstr ""
+
+#: ../picard/const.py:109
+msgid "Hungary"
+msgstr ""
+
+#: ../picard/const.py:110
+msgid "Hong Kong"
+msgstr ""
+
+#: ../picard/const.py:111
+msgid "Honduras"
+msgstr ""
+
+#: ../picard/const.py:112
+msgid "Heard and Mc Donald Islands"
+msgstr ""
+
+#: ../picard/const.py:113
+msgid "Venezuela"
+msgstr ""
+
+#: ../picard/const.py:114
+msgid "Puerto Rico"
+msgstr ""
+
+#: ../picard/const.py:115
+msgid "Pala"
+msgstr ""
+
+#: ../picard/const.py:116
+msgid "Portugal"
+msgstr ""
+
+#: ../picard/const.py:117
+msgid "Svalbard and Jan Mayen Islands"
+msgstr ""
+
+#: ../picard/const.py:118
+msgid "Paraguay"
+msgstr ""
+
+#: ../picard/const.py:119
+msgid "Iraq"
+msgstr ""
+
+#: ../picard/const.py:120
+msgid "Panama"
+msgstr ""
+
+#: ../picard/const.py:121
+msgid "French Polynesia"
+msgstr ""
+
+#: ../picard/const.py:122
+msgid "Papua New Guinea"
+msgstr ""
+
+#: ../picard/const.py:123
+msgid "Per"
+msgstr ""
+
+#: ../picard/const.py:124
+msgid "Pakistan"
+msgstr ""
+
+#: ../picard/const.py:125
+msgid "Philippines"
+msgstr ""
+
+#: ../picard/const.py:126
+msgid "Pitcairn"
+msgstr ""
+
+#: ../picard/const.py:127
+msgid "Poland"
+msgstr ""
+
+#: ../picard/const.py:128
+msgid "St. Pierre and Miquelon"
+msgstr ""
+
+#: ../picard/const.py:129
+msgid "Zambia"
+msgstr ""
+
+#: ../picard/const.py:130
+msgid "Western Sahara"
+msgstr ""
+
+#: ../picard/const.py:131
+msgid "Estonia"
+msgstr ""
+
+#: ../picard/const.py:132
+msgid "Egypt"
+msgstr ""
+
+#: ../picard/const.py:133
+msgid "South Africa"
+msgstr ""
+
+#: ../picard/const.py:134
+msgid "Ecuador"
+msgstr ""
+
+#: ../picard/const.py:135
+msgid "Italy"
+msgstr ""
+
+#: ../picard/const.py:136
+#, fuzzy
+msgid "Viet Nam"
+msgstr "파일 이름"
+
+#: ../picard/const.py:137
+msgid "Solomon Islands"
+msgstr ""
+
+#: ../picard/const.py:138
+msgid "Ethiopia"
+msgstr ""
+
+#: ../picard/const.py:139
+msgid "Somalia"
+msgstr ""
+
+#: ../picard/const.py:140
+msgid "Zimbabwe"
+msgstr ""
+
+#: ../picard/const.py:141
+msgid "Saudi Arabia"
+msgstr ""
+
+#: ../picard/const.py:142
+msgid "Spain"
+msgstr ""
+
+#: ../picard/const.py:143
+msgid "Eritrea"
+msgstr ""
+
+#: ../picard/const.py:144
+msgid "Moldova, Republic of"
+msgstr ""
+
+#: ../picard/const.py:145
+msgid "Madagascar"
+msgstr ""
+
+#: ../picard/const.py:146
+msgid "Morocco"
+msgstr ""
+
+#: ../picard/const.py:147
+#, fuzzy
+msgid "Monaco"
+msgstr "모노"
+
+#: ../picard/const.py:148
+msgid "Uzbekistan"
+msgstr ""
+
+#: ../picard/const.py:149
+msgid "Myanmar"
+msgstr ""
+
+#: ../picard/const.py:150
+msgid "Mali"
+msgstr ""
+
+#: ../picard/const.py:151
+msgid "Maca"
+msgstr ""
+
+#: ../picard/const.py:152
+#, fuzzy
+msgid "Mongolia"
+msgstr "모노"
+
+#: ../picard/const.py:153
+msgid "Marshall Islands"
+msgstr ""
+
+#: ../picard/const.py:154
+msgid "Macedonia, The Former Yugoslav Republic of"
+msgstr ""
+
+#: ../picard/const.py:155
+msgid "Mauritius"
+msgstr ""
+
+#: ../picard/const.py:156
+#, fuzzy
+msgid "Malta"
+msgstr "지역 파일 정보"
+
+#: ../picard/const.py:157
+msgid "Malawi"
+msgstr ""
+
+#: ../picard/const.py:158
+msgid "Maldives"
+msgstr ""
+
+#: ../picard/const.py:159
+msgid "Martinique"
+msgstr ""
+
+#: ../picard/const.py:160
+msgid "Northern Mariana Islands"
+msgstr ""
+
+#: ../picard/const.py:161
+msgid "Montserrat"
+msgstr ""
+
+#: ../picard/const.py:162
+msgid "Mauritania"
+msgstr ""
+
+#: ../picard/const.py:163
+msgid "Uganda"
+msgstr ""
+
+#: ../picard/const.py:164
+msgid "Malaysia"
+msgstr ""
+
+#: ../picard/const.py:165
+msgid "Mexico"
+msgstr ""
+
+#: ../picard/const.py:166
+msgid "Israel"
+msgstr ""
+
+#: ../picard/const.py:167
+#, fuzzy
+msgid "France"
+msgstr "취소"
+
+#: ../picard/const.py:168
+msgid "British Indian Ocean Territory"
+msgstr ""
+
+#: ../picard/const.py:169
+msgid "St. Helena"
+msgstr ""
+
+#: ../picard/const.py:170
+msgid "Finland"
+msgstr ""
+
+#: ../picard/const.py:171
+msgid "Fiji"
+msgstr ""
+
+#: ../picard/const.py:172
+msgid "Falkland Islands (Malvinas)"
+msgstr ""
+
+#: ../picard/const.py:173
+msgid "Micronesia, Federated States of"
+msgstr ""
+
+#: ../picard/const.py:174
+msgid "Faroe Islands"
+msgstr ""
+
+#: ../picard/const.py:175
+msgid "Nicaragua"
+msgstr ""
+
+#: ../picard/const.py:176
+msgid "Netherlands"
+msgstr ""
+
+#: ../picard/const.py:177
+msgid "Norway"
+msgstr ""
+
+#: ../picard/const.py:178
+msgid "Namibia"
+msgstr ""
+
+#: ../picard/const.py:179
+msgid "Vanuat"
+msgstr ""
+
+#: ../picard/const.py:180
+msgid "New Caledonia"
+msgstr ""
+
+#: ../picard/const.py:181
+msgid "Niger"
+msgstr ""
+
+#: ../picard/const.py:182
+msgid "Norfolk Island"
+msgstr ""
+
+#: ../picard/const.py:183
+msgid "Nigeria"
+msgstr ""
+
+#: ../picard/const.py:184
+#, fuzzy
+msgid "New Zealand"
+msgstr "새로운 정보"
+
+#: ../picard/const.py:185
+msgid "Zaire"
+msgstr ""
+
+#: ../picard/const.py:186
+msgid "Nepal"
+msgstr ""
+
+#: ../picard/const.py:187
+msgid "Naur"
+msgstr ""
+
+#: ../picard/const.py:188
+msgid "Niue"
+msgstr ""
+
+#: ../picard/const.py:189
+msgid "Cook Islands"
+msgstr ""
+
+#: ../picard/const.py:190
+msgid "Cote d'Ivoire"
+msgstr ""
+
+#: ../picard/const.py:191
+msgid "Switzerland"
+msgstr ""
+
+#: ../picard/const.py:192
+msgid "Colombia"
+msgstr ""
+
+#: ../picard/const.py:193
+msgid "China"
+msgstr ""
+
+#: ../picard/const.py:194
+msgid "Cameroon"
+msgstr ""
+
+#: ../picard/const.py:195
+#, fuzzy
+msgid "Chile"
+msgstr "File"
+
+#: ../picard/const.py:196
+msgid "Cocos (Keeling) Islands"
+msgstr ""
+
+#: ../picard/const.py:197
+msgid "Canada"
+msgstr ""
+
+#: ../picard/const.py:198
+#, fuzzy
+msgid "Congo"
+msgstr "모노"
+
+#: ../picard/const.py:199
+msgid "Central African Republic"
+msgstr ""
+
+#: ../picard/const.py:200
+msgid "Czech Republic"
+msgstr ""
+
+#: ../picard/const.py:201
+msgid "Cyprus"
+msgstr ""
+
+#: ../picard/const.py:202
+msgid "Christmas Island"
+msgstr ""
+
+#: ../picard/const.py:203
+msgid "Costa Rica"
+msgstr ""
+
+#: ../picard/const.py:204
+msgid "Cape Verde"
+msgstr ""
+
+#: ../picard/const.py:205
+msgid "Cuba"
+msgstr ""
+
+#: ../picard/const.py:206
+msgid "Swaziland"
+msgstr ""
+
+#: ../picard/const.py:207
+msgid "Syrian Arab Republic"
+msgstr ""
+
+#: ../picard/const.py:208
+msgid "Kyrgyzstan"
+msgstr ""
+
+#: ../picard/const.py:209
+msgid "Kenya"
+msgstr ""
+
+#: ../picard/const.py:210
+msgid "Suriname"
+msgstr ""
+
+#: ../picard/const.py:211
+msgid "Kiribati"
+msgstr ""
+
+#: ../picard/const.py:212
+msgid "Cambodia"
+msgstr ""
+
+#: ../picard/const.py:213
+msgid "Saint Kitts and Nevis"
+msgstr ""
+
+#: ../picard/const.py:214
+#, fuzzy
+msgid "Comoros"
+msgstr "Close"
+
+#: ../picard/const.py:215
+msgid "Sao Tome and Principe"
+msgstr ""
+
+#: ../picard/const.py:216
+msgid "Slovenia"
+msgstr ""
+
+#: ../picard/const.py:217
+msgid "Kuwait"
+msgstr ""
+
+#: ../picard/const.py:218
+#, fuzzy
+msgid "Senegal"
+msgstr "General"
+
+#: ../picard/const.py:219
+msgid "San Marino"
+msgstr ""
+
+#: ../picard/const.py:220
+msgid "Sierra Leone"
+msgstr ""
+
+#: ../picard/const.py:221
+msgid "Seychelles"
+msgstr ""
+
+#: ../picard/const.py:222
+msgid "Kazakhstan"
+msgstr ""
+
+#: ../picard/const.py:223
+msgid "Cayman Islands"
+msgstr ""
+
+#: ../picard/const.py:224
+msgid "Singapore"
+msgstr ""
+
+#: ../picard/const.py:225
+msgid "Sweden"
+msgstr ""
+
+#: ../picard/const.py:226
+msgid "Sudan"
+msgstr ""
+
+#: ../picard/const.py:227
+msgid "Dominican Republic"
+msgstr ""
+
+#: ../picard/const.py:228
+msgid "Dominica"
+msgstr ""
+
+#: ../picard/const.py:229
+#, fuzzy
+msgid "Djibouti"
+msgstr "...에 대하여"
+
+#: ../picard/const.py:230
+msgid "Denmark"
+msgstr ""
+
+#: ../picard/const.py:231
+msgid "Virgin Islands (British)"
+msgstr ""
+
+#: ../picard/const.py:232
+msgid "Germany"
+msgstr ""
+
+#: ../picard/const.py:233
+msgid "Yemen"
+msgstr ""
+
+#: ../picard/const.py:234
+msgid "Algeria"
+msgstr ""
+
+#: ../picard/const.py:235
+msgid "United States"
+msgstr ""
+
+#: ../picard/const.py:236
+msgid "Uruguay"
+msgstr ""
+
+#: ../picard/const.py:237
+msgid "Mayotte"
+msgstr ""
+
+#: ../picard/const.py:238
+msgid "United States Minor Outlying Islands"
+msgstr ""
+
+#: ../picard/const.py:239
+msgid "Lebanon"
+msgstr ""
+
+#: ../picard/const.py:240
+msgid "Saint Lucia"
+msgstr ""
+
+#: ../picard/const.py:241
+msgid "Lao People's Democratic Republic"
+msgstr ""
+
+#: ../picard/const.py:242
+msgid "Tuval"
+msgstr ""
+
+#: ../picard/const.py:243
+msgid "Taiwan"
+msgstr ""
+
+#: ../picard/const.py:244
+msgid "Trinidad and Tobago"
+msgstr ""
+
+#: ../picard/const.py:245
+msgid "Turkey"
+msgstr ""
+
+#: ../picard/const.py:246
+msgid "Sri Lanka"
+msgstr ""
+
+#: ../picard/const.py:247
+msgid "Liechtenstein"
+msgstr ""
+
+#: ../picard/const.py:248
+msgid "Latvia"
+msgstr ""
+
+#: ../picard/const.py:249
+msgid "Tonga"
+msgstr ""
+
+#: ../picard/const.py:250
+msgid "Lithuania"
+msgstr ""
+
+#: ../picard/const.py:251
+msgid "Luxembourg"
+msgstr ""
+
+#: ../picard/const.py:252
+msgid "Liberia"
+msgstr ""
+
+#: ../picard/const.py:253
+#, fuzzy
+msgid "Lesotho"
+msgstr "길이"
+
+#: ../picard/const.py:254
+msgid "Thailand"
+msgstr ""
+
+#: ../picard/const.py:255
+msgid "French Southern Territories"
+msgstr ""
+
+#: ../picard/const.py:256
+#, fuzzy
+msgid "Togo"
+msgstr "도구"
+
+#: ../picard/const.py:257
+msgid "Chad"
+msgstr ""
+
+#: ../picard/const.py:258
+msgid "Turks and Caicos Islands"
+msgstr ""
+
+#: ../picard/const.py:259
+msgid "Libyan Arab Jamahiriya"
+msgstr ""
+
+#: ../picard/const.py:260
+msgid "Vatican City State (Holy See)"
+msgstr ""
+
+#: ../picard/const.py:261
+msgid "Saint Vincent and The Grenadines"
+msgstr ""
+
+#: ../picard/const.py:262
+msgid "United Arab Emirates"
+msgstr ""
+
+#: ../picard/const.py:263
+msgid "Andorra"
+msgstr ""
+
+#: ../picard/const.py:264
+msgid "Antigua and Barbuda"
+msgstr ""
+
+#: ../picard/const.py:265
+msgid "Afghanistan"
+msgstr ""
+
+#: ../picard/const.py:266
+msgid "Anguilla"
+msgstr ""
+
+#: ../picard/const.py:267
+msgid "Virgin Islands (U.S.)"
+msgstr ""
+
+#: ../picard/const.py:268
+msgid "Iceland"
+msgstr ""
+
+#: ../picard/const.py:269
+msgid "Iran (Islamic Republic of)"
+msgstr ""
+
+#: ../picard/const.py:270
+msgid "Armenia"
+msgstr ""
+
+#: ../picard/const.py:271
+msgid "Albania"
+msgstr ""
+
+#: ../picard/const.py:272
+msgid "Angola"
+msgstr ""
+
+#: ../picard/const.py:273
+msgid "Netherlands Antilles"
+msgstr ""
+
+#: ../picard/const.py:274
+msgid "Antarctica"
+msgstr ""
+
+#: ../picard/const.py:275
+msgid "American Samoa"
+msgstr ""
+
+#: ../picard/const.py:276
+msgid "Argentina"
+msgstr ""
+
+#: ../picard/const.py:277
+msgid "Australia"
+msgstr ""
+
+#: ../picard/const.py:278
+#, fuzzy
+msgid "Austria"
+msgstr "작가"
+
+#: ../picard/const.py:279
+msgid "Aruba"
+msgstr ""
+
+#: ../picard/const.py:280
+#, fuzzy
+msgid "India"
+msgstr "지역 파일 정보"
+
+#: ../picard/const.py:281
+msgid "Tanzania, United Republic of"
+msgstr ""
+
+#: ../picard/const.py:282
+msgid "Azerbaijan"
+msgstr ""
+
+#: ../picard/const.py:283
+msgid "Ireland"
+msgstr ""
+
+#: ../picard/const.py:284
+msgid "Indonesia"
+msgstr ""
+
+#: ../picard/const.py:285
+msgid "Ukraine"
+msgstr ""
+
+#: ../picard/const.py:286
+msgid "Qatar"
+msgstr ""
+
+#: ../picard/const.py:287
+msgid "Mozambique"
+msgstr ""
+
+#: ../picard/const.py:288
+msgid "Bosnia and Herzegovina"
+msgstr ""
+
+#: ../picard/const.py:289
+msgid "Congo, The Democratic Republic of the"
+msgstr ""
+
+#: ../picard/const.py:290
+msgid "Serbia and Montenegro"
+msgstr ""
+
+#: ../picard/const.py:291
+msgid "Croatia"
+msgstr ""
+
+#: ../picard/const.py:292
+msgid "Korea (North), Democratic People's Republic of"
+msgstr ""
+
+#: ../picard/const.py:293
+msgid "Korea (South), Republic of"
+msgstr ""
+
+#: ../picard/const.py:294
+msgid "Slovakia"
+msgstr ""
+
+#: ../picard/const.py:295
+msgid "Soviet Union (historical, 1922-1991)"
+msgstr ""
+
+#: ../picard/const.py:296
+msgid "East Timor"
+msgstr ""
+
+#: ../picard/const.py:297
+msgid "Czechoslovakia (historical, 1918-1992)"
+msgstr ""
+
+#: ../picard/const.py:298
+msgid "Europe"
+msgstr ""
+
+#: ../picard/const.py:299
+msgid "East Germany (historical, 1949-1990)"
+msgstr ""
+
+#: ../picard/const.py:300
+msgid "[Unknown Country]"
+msgstr ""
+
+#: ../picard/const.py:301
+msgid "[Worldwide]"
+msgstr ""
+
+#: ../picard/const.py:302
+msgid "Yugoslavia (historical, 1918-1992)"
+msgstr ""
+
+#: ../picard/const.py:307
+msgid "Catalan"
+msgstr ""
+
+#: ../picard/const.py:308
+msgid "Czech"
+msgstr ""
+
+#: ../picard/const.py:309
+msgid "Welsh"
+msgstr ""
+
+#: ../picard/const.py:310
+msgid "Danish"
+msgstr ""
+
+#: ../picard/const.py:311
+#, fuzzy
+msgid "German"
+msgstr "General"
+
+#: ../picard/const.py:312
+msgid "English"
+msgstr ""
+
+#: ../picard/const.py:313
+msgid "English (Canada)"
+msgstr ""
+
+#: ../picard/const.py:314
+msgid "English (UK)"
+msgstr ""
+
+#: ../picard/const.py:315
+msgid "Spanish"
+msgstr ""
+
+#: ../picard/const.py:316
+#, fuzzy
+msgid "Persian"
+msgstr "버전"
+
+#: ../picard/const.py:317
+msgid "Finnish"
+msgstr ""
+
+#: ../picard/const.py:318
+msgid "French"
+msgstr ""
+
+#: ../picard/const.py:319
+msgid "Frisian"
+msgstr ""
+
+#: ../picard/const.py:320
+msgid "Hebrew"
+msgstr ""
+
+#: ../picard/const.py:321
+msgid "Hungarian"
+msgstr ""
+
+#: ../picard/const.py:322
+msgid "Islandic"
+msgstr ""
+
+#: ../picard/const.py:323
+msgid "Italian"
+msgstr ""
+
+#: ../picard/const.py:324
+msgid "Kannada"
+msgstr ""
+
+#: ../picard/const.py:325
+msgid "Korean"
+msgstr ""
+
+#: ../picard/const.py:326
+msgid "Lithuanian"
+msgstr ""
+
+#: ../picard/const.py:327
+msgid "Norwegian Bokmal"
+msgstr ""
+
+#: ../picard/const.py:328
+msgid "Dutch"
+msgstr ""
+
+#: ../picard/const.py:329
+msgid "Polish"
+msgstr ""
+
+#: ../picard/const.py:330
+msgid "Portuguese"
+msgstr ""
+
+#: ../picard/const.py:331
+msgid "Brazilian Portuguese"
+msgstr ""
+
+#: ../picard/const.py:332
+msgid "Romanian"
+msgstr ""
+
+#: ../picard/const.py:333
+msgid "Russian"
+msgstr ""
+
+#: ../picard/const.py:334
+#, fuzzy
+msgid "Scots"
+msgstr "점수"
+
+#: ../picard/const.py:335
+msgid "Slovak"
+msgstr ""
+
+#: ../picard/const.py:336
+msgid "Slovenian"
+msgstr ""
+
+#: ../picard/const.py:337
+msgid "Swedish"
+msgstr ""
+
+#: ../picard/const.py:338
+#, fuzzy
+msgid "Chinese"
+msgstr "채널:"
+
+#: ../picard/file.py:475
+#, python-format
+msgid "No matching tracks for file %s"
+msgstr "일치하는 트랙의 파일 %s이 없습니다."
+
+#: ../picard/file.py:492
+#, fuzzy, python-format
+msgid "No matching tracks above the threshold for file %s"
+msgstr "일치하는 트랙의 파일 %s이 없습니다."
+
+#: ../picard/file.py:495
+#, python-format
+msgid "File %s identified!"
+msgstr "File %s identified!"
+
+#: ../picard/file.py:506
+#, fuzzy, python-format
+msgid "Looking up the PUID for file %s..."
+msgstr "PUID %s 파일을 찾을 수 없습니다."
+
+#: ../picard/file.py:511
+#, fuzzy, python-format
+msgid "Looking up the metadata for file %s..."
+msgstr "Looking up metadata on file %s..."
+
+#: ../picard/puidmanager.py:58
+#, fuzzy
+msgid "Submitting PUIDs..."
+msgstr "Submit PUIDs"
+
+#: ../picard/puidmanager.py:64
+#, python-format
+msgid "PUIDs submission failed: %s"
+msgstr ""
+
+#: ../picard/puidmanager.py:66
+#, fuzzy
+msgid "PUIDs successfully submitted!"
+msgstr "PUIDs successfully submitted."
+
+#: ../picard/playlist.py:31
+msgid "M3U Playlist (*.m3u)"
+msgstr "M3U 재생목록(*.m3u)"
+
+#: ../picard/playlist.py:32
+msgid "PLS Playlist (*.pls)"
+msgstr "PLS 재생목록(*.pls)"
+
+#: ../picard/playlist.py:33
+msgid "XSPF Playlist (*.xspf)"
+msgstr "XSPF 재생목록(*.XSPF)"
+
+#: ../picard/tagger.py:476
 msgid "CD Lookup Error"
 msgstr "CD 검색 실패"
 
-#: ../picard/tagger.py:473
+#: ../picard/tagger.py:477
 #, python-format
 msgid ""
 "Error while reading CD:\n"
@@ -46,14 +1301,19 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../picard/ui/passworddialog.py:38
+#: ../picard/tagger.py:503
 #, python-format
-msgid ""
-"The server %s requires you to login. Please enter your username and password."
-msgstr ""
+msgid "Couldn't find PUID for file %s"
+msgstr "PUID %s 파일을 찾을 수 없습니다."
 
-#: ../picard/ui/ui_options_script.py:52
-msgid "Tagger Script"
+#: ../picard/musicdns/__init__.py:98
+#, fuzzy, python-format
+msgid "Looking up the fingerprint for file %s..."
+msgstr "Looking up metadata on file %s..."
+
+#: ../picard/musicdns/__init__.py:117
+#, python-format
+msgid "Creating fingerprint for file %s..."
 msgstr ""
 
 #: ../picard/ui/cdlookup.py:31
@@ -61,110 +1321,155 @@ msgid "Score"
 msgstr "점수"
 
 #: ../picard/ui/cdlookup.py:31
+#: ../picard/ui/itemviews.py:82
+#: ../picard/util/tags.py:23
 msgid "Title"
 msgstr "제목"
 
-#: ../picard/ui/cdlookup.py:31 ../picard/ui/mainwindow.py:436
+#: ../picard/ui/cdlookup.py:31
+#: ../picard/ui/itemviews.py:84
+#: ../picard/ui/mainwindow.py:436
+#: ../picard/util/tags.py:22
 msgid "Artist"
 msgstr "Artist"
 
-#: ../picard/ui/ui_metadata.py:121
-msgid "Lookup"
-msgstr "검사"
+#: ../picard/ui/coverartbox.py:47
+#: ../picard/ui/options/cover.py:29
+msgid "Cover Art"
+msgstr "앨범 쟈켓"
 
-#: ../picard/ui/ui_metadata.py:122
-msgid "Title:"
-msgstr "제목:"
+#: ../picard/ui/coverartbox.py:95
+msgid "Buy the album on Amazon"
+msgstr "아마존에서 앨범 사기"
 
-#: ../picard/ui/ui_metadata.py:123
-msgid "Date:"
-msgstr "날짜:"
+#: ../picard/ui/filebrowser.py:38
+#: ../picard/ui/mainwindow.py:302
+msgid "&Refresh"
+msgstr "&새로고침"
 
-#: ../picard/ui/ui_metadata.py:124
-msgid "Artist:"
-msgstr "가수"
+#: ../picard/ui/filebrowser.py:41
+#, fuzzy
+msgid "&Move Tagged Files Here"
+msgstr "&파일 이동"
 
-#: ../picard/ui/ui_metadata.py:125
-msgid "Track:"
+#: ../picard/ui/filebrowser.py:44
+msgid "Show &Hidden Files"
+msgstr ""
+
+#: ../picard/ui/itemviews.py:83
+msgid "Length"
+msgstr "길이"
+
+#: ../picard/ui/itemviews.py:327
+msgid "&Releases"
+msgstr ""
+
+#: ../picard/ui/itemviews.py:353
+msgid "&Plugins"
+msgstr ""
+
+#: ../picard/ui/itemviews.py:523
+msgid "Clusters"
+msgstr ""
+
+#: ../picard/ui/logview.py:29
+msgid "Log"
+msgstr ""
+
+#: ../picard/ui/puidsubmit.py:31
+#: ../picard/ui/options/plugins.py:80
+msgid "File"
+msgstr "File"
+
+#: ../picard/ui/puidsubmit.py:31
+msgid "PUID"
+msgstr "PUID"
+
+#: ../picard/ui/puidsubmit.py:31
+#: ../picard/ui/mainwindow.py:437
+msgid "Track"
 msgstr "트랙"
 
-#: ../picard/ui/ui_metadata.py:126
-msgid "0000-00-00; "
-msgstr "0000-00-00; "
+#: ../picard/ui/puidsubmit.py:31
+msgid "Release"
+msgstr ""
 
-#: ../picard/ui/ui_metadata.py:127 ../picard/ui/tageditor.py:225
-#: ../picard/ui/multitageditor.py:181
+#: ../picard/ui/puidsubmit.py:31
+msgid "Release ID"
+msgstr ""
+
+#: ../picard/ui/tageditor.py:65
+#: ../picard/ui/ui_options_plugins.py:62
+msgid "Details"
+msgstr ""
+
+#: ../picard/ui/tageditor.py:70
+#: ../picard/ui/tageditor.py:241
+#, python-format
+msgid "%d file"
+msgid_plural "%d files"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../picard/ui/tageditor.py:124
+#, python-format
+msgid "(different across %d file)"
+msgid_plural "(different across %d files)"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../picard/ui/tageditor.py:127
+#, python-format
+msgid "(missing from %d file)"
+msgid_plural "(missing from %d files)"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../picard/ui/tageditor.py:210
+msgid "Filename:"
+msgstr "파일이름:"
+
+#: ../picard/ui/tageditor.py:212
+msgid "Format:"
+msgstr "형식:"
+
+#: ../picard/ui/tageditor.py:221
+msgid "Size:"
+msgstr "크기:"
+
+#: ../picard/ui/tageditor.py:225
+#: ../picard/ui/ui_metadata.py:127
 msgid "Length:"
 msgstr "길이:"
 
-#: ../picard/ui/ui_metadata.py:128
-msgid "Album:"
-msgstr "앨범"
+#: ../picard/ui/tageditor.py:227
+msgid "Bitrate:"
+msgstr "비트전송율"
 
-#: ../picard/ui/ui_passworddialog.py:78
-msgid "Authentication required"
+#: ../picard/ui/tageditor.py:229
+msgid "Sample rate:"
 msgstr ""
 
-#: ../picard/ui/ui_passworddialog.py:79 ../picard/ui/ui_options_proxy.py:83
-#: ../picard/ui/ui_options_general.py:113
-msgid "Username:"
-msgstr "사용자이름:"
-
-#: ../picard/ui/ui_passworddialog.py:80 ../picard/ui/ui_options_proxy.py:82
-#: ../picard/ui/ui_options_general.py:112
-msgid "Password:"
-msgstr "비밀번호:"
-
-#: ../picard/ui/ui_passworddialog.py:81
-msgid "Save username and password"
+#: ../picard/ui/tageditor.py:231
+msgid "Bits per sample:"
 msgstr ""
 
-#: ../picard/ui/ui_options_folksonomy.py:114
-#: ../picard/ui/ui_options_folksonomy_tags.py:114
-msgid "Folksonomy Tags"
-msgstr ""
+#: ../picard/ui/tageditor.py:234
+msgid "Mono"
+msgstr "모노"
 
-#: ../picard/ui/ui_options_folksonomy.py:115
-#: ../picard/ui/ui_options_folksonomy_tags.py:115
-msgid "Ignore tags:"
-msgstr ""
+#: ../picard/ui/tageditor.py:235
+msgid "Stereo"
+msgstr "스테레오"
 
-#: ../picard/ui/ui_options_folksonomy.py:116
-#: ../picard/ui/ui_options_folksonomy_tags.py:116
-msgid "Minimal tag usage:"
-msgstr ""
+#: ../picard/ui/tageditor.py:237
+msgid "Channels:"
+msgstr "채널:"
 
-#: ../picard/ui/ui_options_folksonomy.py:117
-#: ../picard/ui/ui_options_folksonomy_tags.py:117
-#: ../picard/ui/ui_options_matching.py:107
-#: ../picard/ui/ui_options_matching.py:108
-#: ../picard/ui/ui_options_matching.py:109
-#: ../picard/ui/ui_options_matching.py:113
-msgid " %"
-msgstr " %"
-
-#: ../picard/ui/ui_options_folksonomy.py:118
-msgid "Maximum number of tags:"
-msgstr ""
-
-#: ../picard/ui/ui_options_folksonomy.py:119
-#: ../picard/ui/ui_options_folksonomy_tags.py:119
-msgid "Join multiple tags with:"
-msgstr ""
-
-#: ../picard/ui/ui_options_folksonomy.py:120
-#: ../picard/ui/ui_options_folksonomy_tags.py:120
-msgid " / "
-msgstr ""
-
-#: ../picard/ui/ui_options_folksonomy.py:121
-#: ../picard/ui/ui_options_folksonomy_tags.py:121
-msgid ", "
-msgstr ""
-
-#: ../picard/ui/ui_options_folksonomy_tags.py:118
-msgid "Maximal number of tags:"
-msgstr ""
+#: ../picard/ui/tagsfromfilenames.py:52
+#: ../picard/ui/tagsfromfilenames.py:96
+msgid "File Name"
+msgstr "파일 이름"
 
 #: ../picard/ui/mainwindow.py:64
 msgid "MusicBrainz Picard"
@@ -299,7 +1604,8 @@ msgstr "검색"
 msgid "&CD Lookup..."
 msgstr ""
 
-#: ../picard/ui/mainwindow.py:272 ../picard/ui/mainwindow.py:273
+#: ../picard/ui/mainwindow.py:272
+#: ../picard/ui/mainwindow.py:273
 msgid "Lookup CD"
 msgstr "CD 검색"
 
@@ -330,7 +1636,8 @@ msgstr "Ctrl+U"
 msgid "&Lookup"
 msgstr ""
 
-#: ../picard/ui/mainwindow.py:291 ../picard/ui/mainwindow.py:292
+#: ../picard/ui/mainwindow.py:291
+#: ../picard/ui/mainwindow.py:292
 msgid "Lookup metadata"
 msgstr "정보 검색"
 
@@ -343,10 +1650,6 @@ msgstr "Ctrl+L"
 msgid "&Details..."
 msgstr ""
 
-#: ../picard/ui/mainwindow.py:302 ../picard/ui/filebrowser.py:38
-msgid "&Refresh"
-msgstr "&새로고침"
-
 #: ../picard/ui/mainwindow.py:305
 msgid "Generate &Playlist..."
 msgstr ""
@@ -392,6 +1695,7 @@ msgid "&Tools"
 msgstr "도구"
 
 #: ../picard/ui/mainwindow.py:384
+#: ../picard/ui/util.py:33
 msgid "&Help"
 msgstr "&도움말"
 
@@ -404,13 +1708,10 @@ msgid "&Search Bar"
 msgstr "&검색 바"
 
 #: ../picard/ui/mainwindow.py:435
+#: ../picard/util/tags.py:21
 msgid "Album"
 msgstr "앨범"
 
-#: ../picard/ui/mainwindow.py:437 ../picard/ui/puidsubmit.py:31
-msgid "Track"
-msgstr "트랙"
-
 #: ../picard/ui/mainwindow.py:476
 msgid "All Supported Formats"
 msgstr "모든 지원 되는 형식"
@@ -425,37 +1726,290 @@ msgstr "재생목록 저장중 %s.."
 msgid "Playlist %s saved"
 msgstr "재생목록 %s 저장했습니다."
 
-#: ../picard/ui/mainwindow.py:638 ../picard/ui/mainwindow.py:647
+#: ../picard/ui/mainwindow.py:638
+#: ../picard/ui/mainwindow.py:647
 #, python-format
 msgid " (Error: %s)"
 msgstr " (오류 : %s)"
 
+#: ../picard/ui/ui_tageditor.py:115
+#: ../picard/ui/ui_options_plugins.py:59
+#: ../picard/ui/options/plugins.py:76
+msgid "Name"
+msgstr "이름"
+
+#: ../picard/ui/ui_tageditor.py:116
+msgid "Value"
+msgstr "값"
+
+#: ../picard/ui/ui_tageditor.py:117
+msgid "&Add..."
+msgstr ""
+
+#: ../picard/ui/ui_tageditor.py:118
+msgid "&Edit..."
+msgstr ""
+
+#: ../picard/ui/ui_tageditor.py:119
+msgid "&Delete"
+msgstr ""
+
+#: ../picard/ui/ui_tageditor.py:120
+msgid "&Metadata"
+msgstr ""
+
+#: ../picard/ui/ui_tageditor.py:121
+msgid "A&rtwork"
+msgstr ""
+
+#: ../picard/ui/ui_tageditor.py:122
+msgid "&Info"
+msgstr ""
+
+#: ../picard/ui/passworddialog.py:38
+#, python-format
+msgid "The server %s requires you to login. Please enter your username and password."
+msgstr ""
+
+#: ../picard/ui/ui_cdlookup.py:60
+#: ../picard/ui/ui_options_cdlookup.py:47
+#: ../picard/ui/ui_options_cdlookup_win32.py:56
+#: ../picard/ui/options/cdlookup.py:35
+msgid "CD Lookup"
+msgstr "CD Lookup"
+
+#: ../picard/ui/ui_cdlookup.py:61
+msgid "The following releases on MusicBrainz match the CD:"
+msgstr ""
+
+#: ../picard/ui/ui_cdlookup.py:62
+#: ../picard/ui/ui_puidsubmit.py:53
+msgid "OK"
+msgstr "확인"
+
+#: ../picard/ui/ui_cdlookup.py:63
+msgid "    Lookup manually    "
+msgstr "    설명서 찾기    "
+
+#: ../picard/ui/ui_cdlookup.py:64
+#: ../picard/ui/ui_puidsubmit.py:54
+msgid "Cancel"
+msgstr "취소"
+
+#: ../picard/ui/ui_passworddialog.py:78
+msgid "Authentication required"
+msgstr ""
+
+#: ../picard/ui/ui_passworddialog.py:79
+#: ../picard/ui/ui_options_general.py:113
+#: ../picard/ui/ui_options_proxy.py:83
+msgid "Username:"
+msgstr "사용자이름:"
+
+#: ../picard/ui/ui_passworddialog.py:80
+#: ../picard/ui/ui_options_general.py:112
+#: ../picard/ui/ui_options_proxy.py:82
+msgid "Password:"
+msgstr "비밀번호:"
+
+#: ../picard/ui/ui_passworddialog.py:81
+msgid "Save username and password"
+msgstr ""
+
 #: ../picard/ui/ui_edittagdialog.py:44
 msgid "Edit Tag"
 msgstr "태그 편집"
 
-#: ../picard/ui/ui_options_proxy.py:81
-msgid "Web Proxy"
-msgstr "Web Proxy"
+#: ../picard/ui/ui_metadata.py:121
+msgid "Lookup"
+msgstr "검사"
 
-#: ../picard/ui/ui_options_proxy.py:84 ../picard/ui/ui_options_general.py:109
-msgid "Port:"
+#: ../picard/ui/ui_metadata.py:122
+msgid "Title:"
+msgstr "제목:"
+
+#: ../picard/ui/ui_metadata.py:123
+msgid "Date:"
+msgstr "날짜:"
+
+#: ../picard/ui/ui_metadata.py:124
+msgid "Artist:"
+msgstr "가수"
+
+#: ../picard/ui/ui_metadata.py:125
+msgid "Track:"
+msgstr "트랙"
+
+#: ../picard/ui/ui_metadata.py:126
+msgid "0000-00-00; "
+msgstr "0000-00-00; "
+
+#: ../picard/ui/ui_metadata.py:128
+msgid "Album:"
+msgstr "앨범"
+
+#: ../picard/ui/ui_options.py:42
+msgid "Options"
+msgstr "옵션"
+
+#: ../picard/ui/ui_options_cdlookup.py:48
+msgid "CD-ROM device to use for lookups:"
 msgstr ""
 
-#: ../picard/ui/ui_options_proxy.py:85 ../picard/ui/ui_options_general.py:110
-msgid "Server address:"
-msgstr "서버 주소:"
-
-#: ../picard/ui/ui_tagsfromfilenames.py:56
-msgid "Convert File Names to Tags"
+#: ../picard/ui/ui_options_cdlookup_win32.py:57
+msgid "Default CD-ROM drive to use for lookups:"
 msgstr ""
 
-#: ../picard/ui/ui_tagsfromfilenames.py:57
-msgid "Replace underscores with spaces"
+#: ../picard/ui/ui_options_cover.py:56
+msgid "Location"
+msgstr ""
+
+#: ../picard/ui/ui_options_cover.py:57
+msgid "Embed cover images into tags"
+msgstr ""
+
+#: ../picard/ui/ui_options_cover.py:58
+msgid "Save cover images as separate files"
+msgstr ""
+
+#: ../picard/ui/ui_options_cover.py:59
+msgid "Overwrite the file if it already exists"
+msgstr ""
+
+#: ../picard/ui/util.py:31
+msgid "&Ok"
+msgstr "&확인"
+
+#: ../picard/ui/util.py:32
+#, fuzzy
+msgid "&Cancel"
+msgstr "취소"
+
+#: ../picard/ui/ui_puidsubmit.py:52
+msgid "Submit PUIDs"
+msgstr "Submit PUIDs"
+
+#: ../picard/ui/ui_options_folksonomy.py:114
+#: ../picard/ui/options/folksonomy.py:29
+msgid "Folksonomy Tags"
+msgstr ""
+
+#: ../picard/ui/ui_options_folksonomy.py:115
+msgid "Ignore tags:"
+msgstr ""
+
+#: ../picard/ui/ui_options_folksonomy.py:116
+msgid "Minimal tag usage:"
+msgstr ""
+
+#: ../picard/ui/ui_options_folksonomy.py:117
+#: ../picard/ui/ui_options_matching.py:107
+#: ../picard/ui/ui_options_matching.py:108
+#: ../picard/ui/ui_options_matching.py:109
+#: ../picard/ui/ui_options_matching.py:113
+msgid " %"
+msgstr " %"
+
+#: ../picard/ui/ui_options_folksonomy.py:118
+msgid "Maximum number of tags:"
+msgstr ""
+
+#: ../picard/ui/ui_options_folksonomy.py:119
+msgid "Join multiple tags with:"
+msgstr ""
+
+#: ../picard/ui/ui_options_folksonomy.py:120
+msgid " / "
+msgstr ""
+
+#: ../picard/ui/ui_options_folksonomy.py:121
+msgid ", "
+msgstr ""
+
+#: ../picard/ui/ui_options_interface.py:50
+msgid "Miscellaneous"
+msgstr ""
+
+#: ../picard/ui/ui_options_interface.py:51
+msgid "Show text labels under icons"
+msgstr ""
+
+#: ../picard/ui/ui_options_interface.py:52
+msgid "Allow selection of multiple directories"
+msgstr ""
+
+#: ../picard/ui/ui_options_interface.py:53
+msgid "Use advanced query syntax"
+msgstr ""
+
+#: ../picard/ui/ui_options_interface.py:54
+#, fuzzy
+msgid "User interface language:"
+msgstr "사용자이름:"
+
+#: ../picard/ui/ui_options_naming.py:165
+msgid "Rename Files"
+msgstr "이름변경"
+
+#: ../picard/ui/ui_options_naming.py:166
+msgid "Replace Windows-incompatible characters"
+msgstr ""
+
+#: ../picard/ui/ui_options_naming.py:167
+msgid "Replace non-ASCII characters"
+msgstr ""
+
+#: ../picard/ui/ui_options_naming.py:168
+#: ../picard/ui/ui_options_naming.py:169
+#: ../picard/ui/ui_options_metadata.py:109
+#: ../picard/ui/ui_options_metadata.py:110
+msgid "Default"
+msgstr "초기화"
+
+#: ../picard/ui/ui_options_naming.py:170
+#: ../picard/ui/options/naming.py:90
+msgid "Multiple artist file naming format:"
+msgstr ""
+
+#: ../picard/ui/ui_options_naming.py:171
+#: ../picard/ui/options/naming.py:86
+msgid "File naming format:"
+msgstr ""
+
+#: ../picard/ui/ui_options_naming.py:172
+msgid "Move Files"
+msgstr "파일 이동"
+
+#: ../picard/ui/ui_options_naming.py:173
+msgid "Move tagged files to this directory:"
+msgstr ""
+
+#: ../picard/ui/ui_options_naming.py:174
+msgid "Browse..."
+msgstr ""
+
+#: ../picard/ui/ui_options_naming.py:175
+msgid "Move additional files:"
+msgstr ""
+
+#: ../picard/ui/ui_options_naming.py:176
+msgid "Delete empty directories"
+msgstr ""
+
+#: ../picard/ui/ui_options_naming.py:177
+msgid "Example"
+msgstr "예제"
+
+#: ../picard/ui/ui_options_naming.py:178
+msgid "File name:"
+msgstr ""
+
+#: ../picard/ui/ui_options_naming.py:179
+msgid "Multiple artist file name:"
 msgstr ""
 
-#: ../picard/ui/ui_tagsfromfilenames.py:58
 #: ../picard/ui/ui_options_naming.py:180
+#: ../picard/ui/ui_tagsfromfilenames.py:58
 msgid "&Preview"
 msgstr "&미리보기"
 
@@ -463,11 +2017,22 @@ msgstr "&미리보기"
 msgid "MusicBrainz Server"
 msgstr ""
 
+#: ../picard/ui/ui_options_general.py:109
+#: ../picard/ui/ui_options_proxy.py:84
+msgid "Port:"
+msgstr ""
+
+#: ../picard/ui/ui_options_general.py:110
+#: ../picard/ui/ui_options_proxy.py:85
+msgid "Server address:"
+msgstr "서버 주소:"
+
 #: ../picard/ui/ui_options_general.py:111
 msgid "Account Information"
 msgstr ""
 
 #: ../picard/ui/ui_options_general.py:114
+#: ../picard/ui/options/general.py:29
 msgid "General"
 msgstr "General"
 
@@ -475,34 +2040,6 @@ msgstr "General"
 msgid "Automatically scan all new files"
 msgstr ""
 
-#: ../picard/ui/ui_options_interface.py:46
-msgid "Miscellaneous"
-msgstr ""
-
-#: ../picard/ui/ui_options_interface.py:47
-msgid "Show text labels under icons"
-msgstr ""
-
-#: ../picard/ui/ui_options_interface.py:48
-msgid "Allow selection of multiple directories"
-msgstr ""
-
-#: ../picard/ui/ui_options_interface.py:49
-msgid "Use advanced query syntax"
-msgstr ""
-
-#: ../picard/ui/itemviews.py:327
-msgid "&Releases"
-msgstr ""
-
-#: ../picard/ui/itemviews.py:353
-msgid "&Plugins"
-msgstr ""
-
-#: ../picard/ui/itemviews.py:523
-msgid "Clusters"
-msgstr ""
-
 #: ../picard/ui/ui_options_matching.py:105
 msgid "Thresholds"
 msgstr ""
@@ -523,6 +2060,68 @@ msgstr ""
 msgid "Minimal similarity for PUID lookups:"
 msgstr ""
 
+#: ../picard/ui/ui_options_metadata.py:100
+#: ../picard/ui/options/metadata.py:31
+msgid "Metadata"
+msgstr "지역 파일 정보"
+
+#: ../picard/ui/ui_options_metadata.py:101
+msgid "Translate foreign artist names to English where possible"
+msgstr ""
+
+#: ../picard/ui/ui_options_metadata.py:102
+msgid "Use release relationships"
+msgstr ""
+
+#: ../picard/ui/ui_options_metadata.py:103
+msgid "Use track relationships"
+msgstr ""
+
+#: ../picard/ui/ui_options_metadata.py:104
+msgid "Use folksonomy tags as genre"
+msgstr ""
+
+#: ../picard/ui/ui_options_metadata.py:105
+#, fuzzy
+msgid "Preferred release country:"
+msgstr "Album release country"
+
+#: ../picard/ui/ui_options_metadata.py:106
+msgid "Custom Fields"
+msgstr ""
+
+#: ../picard/ui/ui_options_metadata.py:107
+msgid "Various artists:"
+msgstr "Various artists:"
+
+#: ../picard/ui/ui_options_metadata.py:108
+msgid "Non-album tracks:"
+msgstr "Non-album tracks:"
+
+#: ../picard/ui/ui_options_plugins.py:58
+#: ../picard/ui/options/plugins.py:30
+msgid "Plugins"
+msgstr ""
+
+#: ../picard/ui/ui_options_plugins.py:60
+#: ../picard/ui/options/plugins.py:79
+msgid "Author"
+msgstr "작가"
+
+#: ../picard/ui/ui_options_plugins.py:61
+#: ../picard/util/tags.py:36
+msgid "Version"
+msgstr "버전"
+
+#: ../picard/ui/ui_options_proxy.py:81
+#: ../picard/ui/options/proxy.py:28
+msgid "Web Proxy"
+msgstr "Web Proxy"
+
+#: ../picard/ui/ui_options_script.py:52
+msgid "Tagger Script"
+msgstr ""
+
 #: ../picard/ui/ui_options_tags.py:105
 msgid "Common"
 msgstr ""
@@ -575,334 +2174,25 @@ msgstr ""
 msgid "Remove APEv2 tags from MP3 files"
 msgstr "MP3 파일로부터 APEv2 태그를 제거합니다."
 
-#: ../picard/ui/ui_options_cdlookup_win32.py:56 ../picard/ui/ui_cdlookup.py:60
-#: ../picard/ui/ui_options_cdlookup.py:47
-msgid "CD Lookup"
-msgstr "CD Lookup"
-
-#: ../picard/ui/ui_options_cdlookup_win32.py:57
-msgid "Default CD-ROM drive to use for lookups:"
+#: ../picard/ui/ui_tagsfromfilenames.py:56
+msgid "Convert File Names to Tags"
 msgstr ""
 
-#: ../picard/ui/tageditor.py:65 ../picard/ui/ui_options_plugins.py:62
-#: ../picard/ui/multitageditor.py:37
-msgid "Details"
+#: ../picard/ui/ui_tagsfromfilenames.py:57
+msgid "Replace underscores with spaces"
 msgstr ""
 
-#: ../picard/ui/tageditor.py:70 ../picard/ui/tageditor.py:241
-#: ../picard/ui/multitageditor.py:42 ../picard/ui/multitageditor.py:197
-#, python-format
-msgid "%d file"
-msgid_plural "%d files"
-msgstr[0] ""
-msgstr[1] ""
-
-#: ../picard/ui/tageditor.py:124 ../picard/ui/multitageditor.py:95
-#, python-format
-msgid "(different across %d file)"
-msgid_plural "(different across %d files)"
-msgstr[0] ""
-msgstr[1] ""
-
-#: ../picard/ui/tageditor.py:127 ../picard/ui/multitageditor.py:98
-#, python-format
-msgid "(missing from %d file)"
-msgid_plural "(missing from %d files)"
-msgstr[0] ""
-msgstr[1] ""
-
-#: ../picard/ui/tageditor.py:210 ../picard/ui/multitageditor.py:166
-msgid "Filename:"
-msgstr "파일이름:"
-
-#: ../picard/ui/tageditor.py:212 ../picard/ui/multitageditor.py:168
-msgid "Format:"
-msgstr "형식:"
-
-#: ../picard/ui/tageditor.py:221 ../picard/ui/multitageditor.py:177
-msgid "Size:"
-msgstr "크기:"
-
-#: ../picard/ui/tageditor.py:227 ../picard/ui/multitageditor.py:183
-msgid "Bitrate:"
-msgstr "비트전송율"
-
-#: ../picard/ui/tageditor.py:229 ../picard/ui/multitageditor.py:185
-msgid "Sample rate:"
-msgstr ""
-
-#: ../picard/ui/tageditor.py:231 ../picard/ui/multitageditor.py:187
-msgid "Bits per sample:"
-msgstr ""
-
-#: ../picard/ui/tageditor.py:234 ../picard/ui/multitageditor.py:190
-msgid "Mono"
-msgstr "모노"
-
-#: ../picard/ui/tageditor.py:235 ../picard/ui/multitageditor.py:191
-msgid "Stereo"
-msgstr "스테레오"
-
-#: ../picard/ui/tageditor.py:237 ../picard/ui/multitageditor.py:193
-msgid "Channels:"
-msgstr "채널:"
-
-#: ../picard/ui/ui_tageditor.py:115 ../picard/ui/ui_multitageditor.py:55
-#: ../picard/ui/ui_options_plugins.py:59 ../picard/ui/options/plugins.py:76
-msgid "Name"
-msgstr "이름"
-
-#: ../picard/ui/ui_tageditor.py:116 ../picard/ui/ui_multitageditor.py:56
-msgid "Value"
-msgstr "값"
-
-#: ../picard/ui/ui_tageditor.py:117 ../picard/ui/ui_multitageditor.py:57
-msgid "&Add..."
-msgstr ""
-
-#: ../picard/ui/ui_tageditor.py:118
-msgid "&Edit..."
-msgstr ""
-
-#: ../picard/ui/ui_tageditor.py:119
-msgid "&Delete"
-msgstr ""
-
-#: ../picard/ui/ui_tageditor.py:120
-msgid "&Metadata"
-msgstr ""
-
-#: ../picard/ui/ui_tageditor.py:121
-msgid "A&rtwork"
-msgstr ""
-
-#: ../picard/ui/ui_tageditor.py:122
-msgid "&Info"
-msgstr ""
-
-#: ../picard/ui/coverartbox.py:47
-msgid "Cover Art"
-msgstr "앨범 쟈켓"
-
-#: ../picard/ui/coverartbox.py:95
-msgid "Buy the album on Amazon"
-msgstr "아마존에서 앨범 사기"
-
-#: ../picard/ui/ui_puidsubmit.py:52
-msgid "Submit PUIDs"
-msgstr "Submit PUIDs"
-
-#: ../picard/ui/ui_puidsubmit.py:53 ../picard/ui/ui_cdlookup.py:62
-msgid "OK"
-msgstr "확인"
-
-#: ../picard/ui/ui_puidsubmit.py:54 ../picard/ui/ui_cdlookup.py:64
-msgid "Cancel"
-msgstr "취소"
-
-#: ../picard/ui/puidsubmit.py:31 ../picard/ui/options/plugins.py:80
-msgid "File"
-msgstr "File"
-
-#: ../picard/ui/puidsubmit.py:31
-msgid "PUID"
-msgstr "PUID"
-
-#: ../picard/ui/puidsubmit.py:31
-msgid "Release"
-msgstr ""
-
-#: ../picard/ui/puidsubmit.py:31
-msgid "Release ID"
-msgstr ""
-
-#: ../picard/ui/filebrowser.py:41
-#, fuzzy
-msgid "&Move Tagged Files Here"
-msgstr "&파일 이동"
-
-#: ../picard/ui/filebrowser.py:44
-msgid "Show &Hidden Files"
-msgstr ""
-
-#: ../picard/ui/ui_cdlookup.py:61
-msgid "The following releases on MusicBrainz match the CD:"
-msgstr ""
-
-#: ../picard/ui/ui_cdlookup.py:63
-msgid "    Lookup manually    "
-msgstr "    설명서 찾기    "
-
-#: ../picard/ui/ui_options.py:42
-msgid "Options"
-msgstr "옵션"
-
-#: ../picard/ui/tagsfromfilenames.py:52 ../picard/ui/tagsfromfilenames.py:96
-msgid "File Name"
-msgstr "파일 이름"
-
-#: ../picard/ui/ui_options_cover.py:56
-msgid "Location"
-msgstr ""
-
-#: ../picard/ui/ui_options_cover.py:57
-msgid "Embed cover images into tags"
-msgstr ""
-
-#: ../picard/ui/ui_options_cover.py:58
-msgid "Save cover images as separate files"
-msgstr ""
-
-#: ../picard/ui/ui_options_cover.py:59
-msgid "Overwrite the file if it already exists"
-msgstr ""
-
-#: ../picard/ui/ui_options_metadata.py:100
-msgid "Metadata"
-msgstr "지역 파일 정보"
-
-#: ../picard/ui/ui_options_metadata.py:101
-msgid "Translate foreign artist names to English where possible"
-msgstr ""
-
-#: ../picard/ui/ui_options_metadata.py:102
-msgid "Use release relationships"
-msgstr ""
-
-#: ../picard/ui/ui_options_metadata.py:103
-msgid "Use track relationships"
-msgstr ""
-
-#: ../picard/ui/ui_options_metadata.py:104
-msgid "Use folksonomy tags as genre"
-msgstr ""
-
-#: ../picard/ui/ui_options_metadata.py:105
-msgid "Preferred release country:"
-msgstr ""
-
-#: ../picard/ui/ui_options_metadata.py:106
-msgid "Custom Fields"
-msgstr ""
-
-#: ../picard/ui/ui_options_metadata.py:107
-msgid "Various artists:"
-msgstr "Various artists:"
-
-#: ../picard/ui/ui_options_metadata.py:108
-msgid "Non-album tracks:"
-msgstr "Non-album tracks:"
-
-#: ../picard/ui/ui_options_metadata.py:109
-#: ../picard/ui/ui_options_metadata.py:110
-#: ../picard/ui/ui_options_naming.py:168 ../picard/ui/ui_options_naming.py:169
-msgid "Default"
-msgstr "초기화"
-
-#: ../picard/ui/ui_multitageditor.py:58
-msgid "Delete"
-msgstr ""
-
-#: ../picard/ui/logview.py:29
-msgid "Log"
-msgstr ""
-
-#: ../picard/ui/ui_options_plugins.py:58
-msgid "Plugins"
-msgstr ""
-
-#: ../picard/ui/ui_options_plugins.py:60 ../picard/ui/options/plugins.py:79
-msgid "Author"
-msgstr "작가"
-
-#: ../picard/ui/ui_options_plugins.py:61
-msgid "Version"
-msgstr "버전"
-
-#: ../picard/ui/ui_options_naming.py:165
-msgid "Rename Files"
-msgstr "이름변경"
-
-#: ../picard/ui/ui_options_naming.py:166
-msgid "Replace Windows-incompatible characters"
-msgstr ""
-
-#: ../picard/ui/ui_options_naming.py:167
-msgid "Replace non-ASCII characters"
-msgstr ""
-
-#: ../picard/ui/ui_options_naming.py:170 ../picard/ui/options/naming.py:90
-msgid "Multiple artist file naming format:"
-msgstr ""
-
-#: ../picard/ui/ui_options_naming.py:171 ../picard/ui/options/naming.py:86
-msgid "File naming format:"
-msgstr ""
-
-#: ../picard/ui/ui_options_naming.py:172
-msgid "Move Files"
-msgstr "파일 이동"
-
-#: ../picard/ui/ui_options_naming.py:173
-msgid "Move tagged files to this directory:"
-msgstr ""
-
-#: ../picard/ui/ui_options_naming.py:174
-msgid "Browse..."
-msgstr ""
-
-#: ../picard/ui/ui_options_naming.py:175
-msgid "Move additional files:"
-msgstr ""
-
-#: ../picard/ui/ui_options_naming.py:176
-msgid "Delete empty directories"
-msgstr ""
-
-#: ../picard/ui/ui_options_naming.py:177
-msgid "Example"
-msgstr "예제"
-
-#: ../picard/ui/ui_options_naming.py:178
-msgid "File name:"
-msgstr ""
-
-#: ../picard/ui/ui_options_naming.py:179
-msgid "Multiple artist file name:"
-msgstr ""
-
-#: ../picard/ui/ui_options_cdlookup.py:48
-msgid "CD-ROM device to use for lookups:"
-msgstr ""
-
-#: ../picard/ui/options/scripting.py:84 ../picard/ui/options/naming.py:86
-#: ../picard/ui/options/naming.py:90 ../picard/ui/options/naming.py:93
-#: ../picard/ui/options/naming.py:95
-msgid "Script Error"
-msgstr ""
+#: ../picard/ui/options/about.py:29
+msgid "About"
+msgstr "...에 대하여"
 
 #. Replace this with your name to have it appear in the "About" dialog.
 #: ../picard/ui/options/about.py:48
 msgid "translator-credits"
 msgstr ""
 "Launchpad Contributions:\n"
-"  Sinjo Park <https://launchpad.net/~peremen>\n"
-"\n"
-"Launchpad Contributions:\n"
-"  Afeleia https://launchpad.net/~afeleia-ce\n"
 "  Park Shinjo https://launchpad.net/~peremen\n"
-"\n"
-"Launchpad Contributions:\n"
-"  Afeleia https://launchpad.net/~afeleia-ce\n"
-"  Park Shinjo https://launchpad.net/~peremen\n"
-"\n"
-"Launchpad Contributions:\n"
-"  Afeleia https://launchpad.net/~afeleia-ce\n"
-"  Park Shinjo https://launchpad.net/~peremen\n"
-"\n"
-"Launchpad Contributions:\n"
-"  Afeleia https://launchpad.net/~afeleia-ce\n"
-"  Park Shinjo https://launchpad.net/~peremen"
+"  Afeleia https://launchpad.net/~afeleia-ce"
 
 #. Replace LANG with language you are translatig to.
 #: ../picard/ui/options/about.py:51
@@ -913,22 +2203,57 @@ msgstr ""
 #: ../picard/ui/options/about.py:55
 #, python-format
 msgid ""
-"<p align=\"center\"><span style=\"font-size:15px;font-weight:bold;"
-"\">MusicBrainz Picard</span><br/>\n"
+"<p align=\"center\"><span style=\"font-size:15px;font-weight:bold;\">MusicBrainz Picard</span><br/>\n"
 "Version %(version)s</p>\n"
 "<p align=\"center\"><strong>Supported formats</strong><br/>%(formats)s</p>\n"
 "<p align=\"center\"><strong>Please donate</strong><br/>\n"
-"Thank you for using Picard. Picard relies on the MusicBrainz database, which "
-"is operated by the MetaBrainz Foundation with the help of thousands of "
-"volunteers. If you like this application please consider donating to the "
-"MetaBrainz Foundation to keep the service running.</p>\n"
-"<p align=\"center\"><a href=\"http://metabrainz.org/donate/index.html"
-"\">Donate now!</a></p>\n"
+"Thank you for using Picard. Picard relies on the MusicBrainz database, which is operated by the MetaBrainz Foundation with the help of thousands of volunteers. If you like this application please consider donating to the MetaBrainz Foundation to keep the service running.</p>\n"
+"<p align=\"center\"><a href=\"http://metabrainz.org/donate/index.html\">Donate now!</a></p>\n"
 "<p align=\"center\"><strong>Credits</strong><br/>\n"
-"<small>Copyright © 2004-2008 Robert Kaye, Lukáš Lalinský and others%"
-"(translator-credits)s</small></p>\n"
-"<p align=\"center\"><a href=\"http://musicbrainz.org/doc/PicardTagger"
-"\">http://musicbrainz.org/doc/PicardTagger</a></p>\n"
+"<small>Copyright © 2004-2008 Robert Kaye, Lukáš Lalinský and others%(translator-credits)s</small></p>\n"
+"<p align=\"center\"><a href=\"http://musicbrainz.org/doc/PicardTagger\">http://musicbrainz.org/doc/PicardTagger</a></p>\n"
+msgstr ""
+
+#: ../picard/ui/options/advanced.py:26
+msgid "Advanced"
+msgstr ""
+
+#: ../picard/ui/options/interface.py:31
+#, fuzzy
+msgid "User Interface"
+msgstr "사용자이름:"
+
+#: ../picard/ui/options/interface.py:47
+msgid "System default"
+msgstr ""
+
+#: ../picard/ui/options/interface.py:71
+msgid "Language changed"
+msgstr ""
+
+#: ../picard/ui/options/interface.py:71
+msgid "You have changed the interface language. You have to restart Picard in order for the change to take effect."
+msgstr ""
+
+#: ../picard/ui/options/matching.py:29
+msgid "Matching"
+msgstr ""
+
+#: ../picard/ui/options/metadata.py:52
+msgid "None"
+msgstr ""
+
+#: ../picard/ui/options/naming.py:33
+#, fuzzy
+msgid "File Naming"
+msgstr "파일 이름"
+
+#: ../picard/ui/options/naming.py:86
+#: ../picard/ui/options/naming.py:90
+#: ../picard/ui/options/naming.py:93
+#: ../picard/ui/options/naming.py:95
+#: ../picard/ui/options/scripting.py:84
+msgid "Script Error"
 msgstr ""
 
 #: ../picard/ui/options/naming.py:93
@@ -947,6 +2272,255 @@ msgstr ""
 msgid "The location to move files to must not be empty."
 msgstr ""
 
+#: ../picard/ui/options/scripting.py:63
+msgid "Scripting"
+msgstr ""
+
+#: ../picard/ui/options/tags.py:29
+msgid "Tags"
+msgstr "Tags"
+
+#: ../picard/util/tags.py:24
+#, fuzzy
+msgid "Date"
+msgstr "날짜:"
+
+#: ../picard/util/tags.py:25
+#, fuzzy
+msgid "Album Artist"
+msgstr "Artist"
+
+#: ../picard/util/tags.py:26
+#, fuzzy
+msgid "Track Number"
+msgstr "Track number"
+
+#: ../picard/util/tags.py:27
+#, fuzzy
+msgid "Total Tracks"
+msgstr "모든 Discs"
+
+#: ../picard/util/tags.py:28
+#, fuzzy
+msgid "Disc Number"
+msgstr "Track number"
+
+#: ../picard/util/tags.py:29
+msgid "Total Discs"
+msgstr "모든 Discs"
+
+#: ../picard/util/tags.py:30
+#, fuzzy
+msgid "Album Artist Sort Order"
+msgstr "가수별 정렬"
+
+#: ../picard/util/tags.py:31
+msgid "Artist Sort Order"
+msgstr "가수별 정렬"
+
+#: ../picard/util/tags.py:32
+msgid "Title Sort Order"
+msgstr "제목별 정렬"
+
+#: ../picard/util/tags.py:33
+#, fuzzy
+msgid "Album Sort Order"
+msgstr "제목별 정렬"
+
+#: ../picard/util/tags.py:34
+msgid "ASIN"
+msgstr ""
+
+#: ../picard/util/tags.py:35
+msgid "Grouping"
+msgstr "그룹화"
+
+#: ../picard/util/tags.py:37
+msgid "ISRC"
+msgstr ""
+
+#: ../picard/util/tags.py:38
+#, fuzzy
+msgid "Mood"
+msgstr "모노"
+
+#: ../picard/util/tags.py:39
+msgid "BPM"
+msgstr ""
+
+#: ../picard/util/tags.py:40
+#, fuzzy
+msgid "Copyright"
+msgstr "Copy"
+
+#: ../picard/util/tags.py:41
+#, fuzzy
+msgid "Composer"
+msgstr "Close"
+
+#: ../picard/util/tags.py:42
+msgid "Conductor"
+msgstr ""
+
+#: ../picard/util/tags.py:43
+msgid "Lyricist"
+msgstr ""
+
+#: ../picard/util/tags.py:44
+msgid "Arranger"
+msgstr ""
+
+#: ../picard/util/tags.py:45
+msgid "Producer"
+msgstr "제작자"
+
+#: ../picard/util/tags.py:46
+msgid "Engineer"
+msgstr "기술자"
+
+#: ../picard/util/tags.py:47
+msgid "Subtitle"
+msgstr "부제"
+
+#: ../picard/util/tags.py:48
+#, fuzzy
+msgid "Disc Subtitle"
+msgstr "부제"
+
+#: ../picard/util/tags.py:49
+msgid "Remixer"
+msgstr ""
+
+#: ../picard/util/tags.py:50
+#, fuzzy
+msgid "MusicBrainz Track Id"
+msgstr "MusicBrainz Picard"
+
+#: ../picard/util/tags.py:51
+#, fuzzy
+msgid "MusicBrainz Release Id"
+msgstr "MusicBrainz Picard"
+
+#: ../picard/util/tags.py:52
+#, fuzzy
+msgid "MusicBrainz Artist Id"
+msgstr "MusicBrainz Picard"
+
+#: ../picard/util/tags.py:53
+#, fuzzy
+msgid "MusicBrainz Release Artist Id"
+msgstr "MusicBrainz Picard"
+
+#: ../picard/util/tags.py:54
+#, fuzzy
+msgid "MusicBrainz TRM Id"
+msgstr "MusicBrainz Picard"
+
+#: ../picard/util/tags.py:55
+#, fuzzy
+msgid "MusicBrainz Disc Id"
+msgstr "MusicBrainz Picard"
+
+#: ../picard/util/tags.py:56
+#, fuzzy
+msgid "MusicBrainz Sort Name"
+msgstr "MusicBrainz Picard"
+
+#: ../picard/util/tags.py:57
+msgid "MusicIP PUID"
+msgstr ""
+
+#: ../picard/util/tags.py:58
+msgid "MusicIP Fingerprint"
+msgstr ""
+
+#: ../picard/util/tags.py:59
+msgid "Disc Id"
+msgstr ""
+
+#: ../picard/util/tags.py:60
+msgid "Website"
+msgstr "웹주소"
+
+#: ../picard/util/tags.py:61
+msgid "Compilation"
+msgstr ""
+
+#: ../picard/util/tags.py:62
+msgid "Comment"
+msgstr "댓글"
+
+#: ../picard/util/tags.py:63
+#, fuzzy
+msgid "Genre"
+msgstr "General"
+
+#: ../picard/util/tags.py:64
+msgid "Encoded By"
+msgstr ""
+
+#: ../picard/util/tags.py:65
+msgid "Performer"
+msgstr ""
+
+#: ../picard/util/tags.py:66
+#, fuzzy
+msgid "Release Type"
+msgstr "Release type"
+
+#: ../picard/util/tags.py:67
+#, fuzzy
+msgid "Release Status"
+msgstr "Release status"
+
+#: ../picard/util/tags.py:68
+#, fuzzy
+msgid "Release Country"
+msgstr "Album release country"
+
+#: ../picard/util/tags.py:69
+msgid "Record Label"
+msgstr "레코드 라벨"
+
+#: ../picard/util/tags.py:70
+msgid "Barcode"
+msgstr "바코드"
+
+#: ../picard/util/tags.py:71
+#, fuzzy
+msgid "Catalog Number"
+msgstr "Track number"
+
+#: ../picard/util/tags.py:72
+#, fuzzy
+msgid "Format"
+msgstr "형식:"
+
+#: ../picard/util/tags.py:73
+msgid "DJ-Mixer"
+msgstr ""
+
+#: ../picard/util/tags.py:74
+#, fuzzy
+msgid "Media"
+msgstr "지역 파일 정보"
+
+#: ../picard/util/tags.py:75
+msgid "Lyrics"
+msgstr ""
+
+#: ../picard/util/tags.py:76
+msgid "Mixer"
+msgstr ""
+
+#: ../picard/util/tags.py:77
+msgid "Language"
+msgstr ""
+
+#: ../picard/util/tags.py:78
+msgid "Script"
+msgstr ""
+
 #: ../picard/util/webbrowser2.py:84
 msgid "Web Browser Error"
 msgstr ""
@@ -959,82 +2533,12 @@ msgid ""
 "%s"
 msgstr ""
 
-#~ msgid "No matching tracks for file %s"
-#~ msgstr "일치하는 트랙의 파일 %s이 없습니다."
-
-#~ msgid "File %s identified!"
-#~ msgstr "File %s identified!"
-
-#~ msgid "No matching releases for cluster %s"
-#~ msgstr "일치하는 cluster %s이 없습니다."
-
-#~ msgid "M3U Playlist (*.m3u)"
-#~ msgstr "M3U 재생목록(*.m3u)"
-
-#~ msgid "PLS Playlist (*.pls)"
-#~ msgstr "PLS 재생목록(*.pls)"
-
-#~ msgid "XSPF Playlist (*.xspf)"
-#~ msgstr "XSPF 재생목록(*.XSPF)"
-
 #~ msgid "New Version"
 #~ msgstr "새로운 버전"
-
 #~ msgid ""
 #~ "New version of Picard is available (%s). Would you like to download it "
 #~ "now?"
 #~ msgstr "새로운 버전 (%s)을 지금 다운로드 하시겠습니까?"
-
-#~ msgid "Couldn't find PUID for file %s"
-#~ msgstr "PUID %s 파일을 찾을 수 없습니다."
-
-#~ msgid "Length"
-#~ msgstr "길이"
-
-#~ msgid "&Ok"
-#~ msgstr "&확인"
-
-#~ msgid "About"
-#~ msgstr "...에 대하여"
-
-#~ msgid "Tags"
-#~ msgstr "Tags"
-
-#~ msgid "Total Discs"
-#~ msgstr "모든 Discs"
-
-#~ msgid "Artist Sort Order"
-#~ msgstr "가수별 정렬"
-
-#~ msgid "Title Sort Order"
-#~ msgstr "제목별 정렬"
-
-#~ msgid "Grouping"
-#~ msgstr "그룹화"
-
-#~ msgid "Producer"
-#~ msgstr "제작자"
-
-#~ msgid "Engineer"
-#~ msgstr "기술자"
-
-#~ msgid "Subtitle"
-#~ msgstr "부제"
-
-#~ msgid "Website"
-#~ msgstr "웹주소"
-
-#~ msgid "Comment"
-#~ msgstr "댓글"
-
-#~ msgid "Record Label"
-#~ msgstr "레코드 라벨"
-
-#~ msgid "Barcode"
-#~ msgstr "바코드"
-
 #~ msgid "Ctrl+T"
 #~ msgstr "Ctrl+T"
 
-#~ msgid "Toolbar"
-#~ msgstr "툴바"
diff --git a/po/lt.po b/po/lt.po
index e86f7fb3e..e79438347 100644
--- a/po/lt.po
+++ b/po/lt.po
@@ -6,36 +6,1271 @@ msgid ""
 msgstr ""
 "Project-Id-Version: picard\n"
 "Report-Msgid-Bugs-To: http://bugs.musicbrainz.org/\n"
-"POT-Creation-Date: 2008-12-01 18:20+0100\n"
-"PO-Revision-Date: 2008-07-27 21:09+0000\n"
-"Last-Translator: Jonas Slivka <jonas.slivka@gmail.com>\n"
+"POT-Creation-Date: 2009-01-25 12:23+0100\n"
+"PO-Revision-Date: 2009-01-25 13:25+0100\n"
+"Last-Translator: Philipp Wolfer <phw@rubyforge.org>\n"
 "Language-Team: Lithuanian <lt@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && (n%"
-"100<10 || n%100>=20) ? 1 : 2;\n"
-"X-Launchpad-Export-Date: 2008-12-01 17:02+0000\n"
+"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
+"X-Launchpad-Export-Date: 2009-01-24 23:28+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
-#: ../picard/album.py:108 ../picard/cluster.py:248
+#: ../picard/album.py:108
+#: ../picard/cluster.py:248
 msgid "Unmatched Files"
 msgstr ""
 
-#: ../picard/album.py:269
+#: ../picard/album.py:281
 #, python-format
 msgid "[couldn't load album %s]"
 msgstr ""
 
-#: ../picard/album.py:305
+#: ../picard/album.py:317
 msgid "[loading album information]"
 msgstr ""
 
-#: ../picard/tagger.py:472
+#: ../picard/cluster.py:164
+#: ../picard/cluster.py:175
+#, python-format
+msgid "No matching releases for cluster %s"
+msgstr ""
+
+#: ../picard/cluster.py:177
+#, python-format
+msgid "Cluster %s identified!"
+msgstr ""
+
+#: ../picard/cluster.py:182
+#, python-format
+msgid "Looking up the metadata for cluster %s..."
+msgstr ""
+
+#: ../picard/const.py:40
+msgid "CD"
+msgstr ""
+
+#: ../picard/const.py:41
+msgid "DVD"
+msgstr ""
+
+#: ../picard/const.py:42
+msgid "SACD"
+msgstr ""
+
+#: ../picard/const.py:43
+msgid "LaserDisc"
+msgstr ""
+
+#: ../picard/const.py:44
+msgid "MiniDisc"
+msgstr ""
+
+#: ../picard/const.py:45
+msgid "Vinyl"
+msgstr ""
+
+#: ../picard/const.py:46
+msgid "Cassette"
+msgstr ""
+
+#: ../picard/const.py:47
+msgid "Cartridge (4/8-tracks)"
+msgstr ""
+
+#: ../picard/const.py:48
+msgid "Reel-to-Reel"
+msgstr ""
+
+#: ../picard/const.py:49
+msgid "DAT"
+msgstr ""
+
+#: ../picard/const.py:50
+msgid "Digital Media"
+msgstr ""
+
+#: ../picard/const.py:51
+msgid "Wax Cylinder"
+msgstr ""
+
+#: ../picard/const.py:52
+msgid "Piano Roll"
+msgstr ""
+
+#: ../picard/const.py:53
+msgid "Other"
+msgstr ""
+
+#: ../picard/const.py:58
+msgid "Bangladesh"
+msgstr ""
+
+#: ../picard/const.py:59
+msgid "Belgium"
+msgstr ""
+
+#: ../picard/const.py:60
+msgid "Burkina Faso"
+msgstr ""
+
+#: ../picard/const.py:61
+msgid "Bulgaria"
+msgstr ""
+
+#: ../picard/const.py:62
+msgid "Barbados"
+msgstr ""
+
+#: ../picard/const.py:63
+msgid "Wallis and Futuna Islands"
+msgstr ""
+
+#: ../picard/const.py:64
+msgid "Bermuda"
+msgstr ""
+
+#: ../picard/const.py:65
+msgid "Brunei Darussalam"
+msgstr ""
+
+#: ../picard/const.py:66
+msgid "Bolivia"
+msgstr ""
+
+#: ../picard/const.py:67
+msgid "Bahrain"
+msgstr ""
+
+#: ../picard/const.py:68
+msgid "Burundi"
+msgstr ""
+
+#: ../picard/const.py:69
+msgid "Benin"
+msgstr ""
+
+#: ../picard/const.py:70
+msgid "Bhutan"
+msgstr ""
+
+#: ../picard/const.py:71
+msgid "Jamaica"
+msgstr ""
+
+#: ../picard/const.py:72
+msgid "Bouvet Island"
+msgstr ""
+
+#: ../picard/const.py:73
+msgid "Botswana"
+msgstr ""
+
+#: ../picard/const.py:74
+msgid "Samoa"
+msgstr ""
+
+#: ../picard/const.py:75
+msgid "Brazil"
+msgstr ""
+
+#: ../picard/const.py:76
+msgid "Bahamas"
+msgstr ""
+
+#: ../picard/const.py:77
+msgid "Belarus"
+msgstr ""
+
+#: ../picard/const.py:78
+msgid "Belize"
+msgstr ""
+
+#: ../picard/const.py:79
+msgid "Russian Federation"
+msgstr ""
+
+#: ../picard/const.py:80
+msgid "Rwanda"
+msgstr ""
+
+#: ../picard/const.py:81
+msgid "Reunion"
+msgstr ""
+
+#: ../picard/const.py:82
+msgid "Turkmenistan"
+msgstr ""
+
+#: ../picard/const.py:83
+msgid "Tajikistan"
+msgstr ""
+
+#: ../picard/const.py:84
+msgid "Romania"
+msgstr ""
+
+#: ../picard/const.py:85
+msgid "Tokela"
+msgstr ""
+
+#: ../picard/const.py:86
+msgid "Guinea-Bissa"
+msgstr ""
+
+#: ../picard/const.py:87
+msgid "Guam"
+msgstr ""
+
+#: ../picard/const.py:88
+msgid "Guatemala"
+msgstr ""
+
+#: ../picard/const.py:89
+msgid "Greece"
+msgstr ""
+
+#: ../picard/const.py:90
+msgid "Equatorial Guinea"
+msgstr ""
+
+#: ../picard/const.py:91
+msgid "Guadeloupe"
+msgstr ""
+
+#: ../picard/const.py:92
+msgid "Japan"
+msgstr ""
+
+#: ../picard/const.py:93
+msgid "Guyana"
+msgstr ""
+
+#: ../picard/const.py:94
+msgid "French Guiana"
+msgstr ""
+
+#: ../picard/const.py:95
+msgid "Georgia"
+msgstr ""
+
+#: ../picard/const.py:96
+msgid "Grenada"
+msgstr ""
+
+#: ../picard/const.py:97
+msgid "United Kingdom"
+msgstr ""
+
+#: ../picard/const.py:98
+msgid "Gabon"
+msgstr ""
+
+#: ../picard/const.py:99
+msgid "El Salvador"
+msgstr ""
+
+#: ../picard/const.py:100
+#, fuzzy
+msgid "Guinea"
+msgstr "Bendra"
+
+#: ../picard/const.py:101
+msgid "Gambia"
+msgstr ""
+
+#: ../picard/const.py:102
+msgid "Greenland"
+msgstr ""
+
+#: ../picard/const.py:103
+msgid "Gibraltar"
+msgstr ""
+
+#: ../picard/const.py:104
+msgid "Ghana"
+msgstr ""
+
+#: ../picard/const.py:105
+msgid "Oman"
+msgstr ""
+
+#: ../picard/const.py:106
+msgid "Tunisia"
+msgstr ""
+
+#: ../picard/const.py:107
+msgid "Jordan"
+msgstr ""
+
+#: ../picard/const.py:108
+msgid "Haiti"
+msgstr ""
+
+#: ../picard/const.py:109
+msgid "Hungary"
+msgstr ""
+
+#: ../picard/const.py:110
+msgid "Hong Kong"
+msgstr ""
+
+#: ../picard/const.py:111
+msgid "Honduras"
+msgstr ""
+
+#: ../picard/const.py:112
+msgid "Heard and Mc Donald Islands"
+msgstr ""
+
+#: ../picard/const.py:113
+msgid "Venezuela"
+msgstr ""
+
+#: ../picard/const.py:114
+msgid "Puerto Rico"
+msgstr ""
+
+#: ../picard/const.py:115
+msgid "Pala"
+msgstr ""
+
+#: ../picard/const.py:116
+msgid "Portugal"
+msgstr ""
+
+#: ../picard/const.py:117
+msgid "Svalbard and Jan Mayen Islands"
+msgstr ""
+
+#: ../picard/const.py:118
+msgid "Paraguay"
+msgstr ""
+
+#: ../picard/const.py:119
+msgid "Iraq"
+msgstr ""
+
+#: ../picard/const.py:120
+msgid "Panama"
+msgstr ""
+
+#: ../picard/const.py:121
+msgid "French Polynesia"
+msgstr ""
+
+#: ../picard/const.py:122
+msgid "Papua New Guinea"
+msgstr ""
+
+#: ../picard/const.py:123
+msgid "Per"
+msgstr ""
+
+#: ../picard/const.py:124
+msgid "Pakistan"
+msgstr ""
+
+#: ../picard/const.py:125
+msgid "Philippines"
+msgstr ""
+
+#: ../picard/const.py:126
+msgid "Pitcairn"
+msgstr ""
+
+#: ../picard/const.py:127
+msgid "Poland"
+msgstr ""
+
+#: ../picard/const.py:128
+msgid "St. Pierre and Miquelon"
+msgstr ""
+
+#: ../picard/const.py:129
+msgid "Zambia"
+msgstr ""
+
+#: ../picard/const.py:130
+msgid "Western Sahara"
+msgstr ""
+
+#: ../picard/const.py:131
+msgid "Estonia"
+msgstr ""
+
+#: ../picard/const.py:132
+msgid "Egypt"
+msgstr ""
+
+#: ../picard/const.py:133
+msgid "South Africa"
+msgstr ""
+
+#: ../picard/const.py:134
+msgid "Ecuador"
+msgstr ""
+
+#: ../picard/const.py:135
+msgid "Italy"
+msgstr ""
+
+#: ../picard/const.py:136
+msgid "Viet Nam"
+msgstr ""
+
+#: ../picard/const.py:137
+msgid "Solomon Islands"
+msgstr ""
+
+#: ../picard/const.py:138
+msgid "Ethiopia"
+msgstr ""
+
+#: ../picard/const.py:139
+msgid "Somalia"
+msgstr ""
+
+#: ../picard/const.py:140
+msgid "Zimbabwe"
+msgstr ""
+
+#: ../picard/const.py:141
+msgid "Saudi Arabia"
+msgstr ""
+
+#: ../picard/const.py:142
+msgid "Spain"
+msgstr ""
+
+#: ../picard/const.py:143
+msgid "Eritrea"
+msgstr ""
+
+#: ../picard/const.py:144
+msgid "Moldova, Republic of"
+msgstr ""
+
+#: ../picard/const.py:145
+msgid "Madagascar"
+msgstr ""
+
+#: ../picard/const.py:146
+msgid "Morocco"
+msgstr ""
+
+#: ../picard/const.py:147
+msgid "Monaco"
+msgstr ""
+
+#: ../picard/const.py:148
+msgid "Uzbekistan"
+msgstr ""
+
+#: ../picard/const.py:149
+msgid "Myanmar"
+msgstr ""
+
+#: ../picard/const.py:150
+msgid "Mali"
+msgstr ""
+
+#: ../picard/const.py:151
+msgid "Maca"
+msgstr ""
+
+#: ../picard/const.py:152
+msgid "Mongolia"
+msgstr ""
+
+#: ../picard/const.py:153
+msgid "Marshall Islands"
+msgstr ""
+
+#: ../picard/const.py:154
+msgid "Macedonia, The Former Yugoslav Republic of"
+msgstr ""
+
+#: ../picard/const.py:155
+msgid "Mauritius"
+msgstr ""
+
+#: ../picard/const.py:156
+msgid "Malta"
+msgstr ""
+
+#: ../picard/const.py:157
+msgid "Malawi"
+msgstr ""
+
+#: ../picard/const.py:158
+msgid "Maldives"
+msgstr ""
+
+#: ../picard/const.py:159
+msgid "Martinique"
+msgstr ""
+
+#: ../picard/const.py:160
+msgid "Northern Mariana Islands"
+msgstr ""
+
+#: ../picard/const.py:161
+msgid "Montserrat"
+msgstr ""
+
+#: ../picard/const.py:162
+msgid "Mauritania"
+msgstr ""
+
+#: ../picard/const.py:163
+msgid "Uganda"
+msgstr ""
+
+#: ../picard/const.py:164
+msgid "Malaysia"
+msgstr ""
+
+#: ../picard/const.py:165
+msgid "Mexico"
+msgstr ""
+
+#: ../picard/const.py:166
+msgid "Israel"
+msgstr ""
+
+#: ../picard/const.py:167
+msgid "France"
+msgstr ""
+
+#: ../picard/const.py:168
+msgid "British Indian Ocean Territory"
+msgstr ""
+
+#: ../picard/const.py:169
+msgid "St. Helena"
+msgstr ""
+
+#: ../picard/const.py:170
+msgid "Finland"
+msgstr ""
+
+#: ../picard/const.py:171
+msgid "Fiji"
+msgstr ""
+
+#: ../picard/const.py:172
+msgid "Falkland Islands (Malvinas)"
+msgstr ""
+
+#: ../picard/const.py:173
+msgid "Micronesia, Federated States of"
+msgstr ""
+
+#: ../picard/const.py:174
+msgid "Faroe Islands"
+msgstr ""
+
+#: ../picard/const.py:175
+msgid "Nicaragua"
+msgstr ""
+
+#: ../picard/const.py:176
+msgid "Netherlands"
+msgstr ""
+
+#: ../picard/const.py:177
+msgid "Norway"
+msgstr ""
+
+#: ../picard/const.py:178
+msgid "Namibia"
+msgstr ""
+
+#: ../picard/const.py:179
+msgid "Vanuat"
+msgstr ""
+
+#: ../picard/const.py:180
+msgid "New Caledonia"
+msgstr ""
+
+#: ../picard/const.py:181
+msgid "Niger"
+msgstr ""
+
+#: ../picard/const.py:182
+msgid "Norfolk Island"
+msgstr ""
+
+#: ../picard/const.py:183
+msgid "Nigeria"
+msgstr ""
+
+#: ../picard/const.py:184
+msgid "New Zealand"
+msgstr ""
+
+#: ../picard/const.py:185
+msgid "Zaire"
+msgstr ""
+
+#: ../picard/const.py:186
+msgid "Nepal"
+msgstr ""
+
+#: ../picard/const.py:187
+msgid "Naur"
+msgstr ""
+
+#: ../picard/const.py:188
+msgid "Niue"
+msgstr ""
+
+#: ../picard/const.py:189
+msgid "Cook Islands"
+msgstr ""
+
+#: ../picard/const.py:190
+msgid "Cote d'Ivoire"
+msgstr ""
+
+#: ../picard/const.py:191
+msgid "Switzerland"
+msgstr ""
+
+#: ../picard/const.py:192
+msgid "Colombia"
+msgstr ""
+
+#: ../picard/const.py:193
+msgid "China"
+msgstr ""
+
+#: ../picard/const.py:194
+msgid "Cameroon"
+msgstr ""
+
+#: ../picard/const.py:195
+msgid "Chile"
+msgstr ""
+
+#: ../picard/const.py:196
+msgid "Cocos (Keeling) Islands"
+msgstr ""
+
+#: ../picard/const.py:197
+msgid "Canada"
+msgstr ""
+
+#: ../picard/const.py:198
+msgid "Congo"
+msgstr ""
+
+#: ../picard/const.py:199
+msgid "Central African Republic"
+msgstr ""
+
+#: ../picard/const.py:200
+msgid "Czech Republic"
+msgstr ""
+
+#: ../picard/const.py:201
+msgid "Cyprus"
+msgstr ""
+
+#: ../picard/const.py:202
+msgid "Christmas Island"
+msgstr ""
+
+#: ../picard/const.py:203
+msgid "Costa Rica"
+msgstr ""
+
+#: ../picard/const.py:204
+msgid "Cape Verde"
+msgstr ""
+
+#: ../picard/const.py:205
+msgid "Cuba"
+msgstr ""
+
+#: ../picard/const.py:206
+msgid "Swaziland"
+msgstr ""
+
+#: ../picard/const.py:207
+msgid "Syrian Arab Republic"
+msgstr ""
+
+#: ../picard/const.py:208
+msgid "Kyrgyzstan"
+msgstr ""
+
+#: ../picard/const.py:209
+msgid "Kenya"
+msgstr ""
+
+#: ../picard/const.py:210
+msgid "Suriname"
+msgstr ""
+
+#: ../picard/const.py:211
+msgid "Kiribati"
+msgstr ""
+
+#: ../picard/const.py:212
+msgid "Cambodia"
+msgstr ""
+
+#: ../picard/const.py:213
+msgid "Saint Kitts and Nevis"
+msgstr ""
+
+#: ../picard/const.py:214
+#, fuzzy
+msgid "Comoros"
+msgstr "Spalvos"
+
+#: ../picard/const.py:215
+msgid "Sao Tome and Principe"
+msgstr ""
+
+#: ../picard/const.py:216
+msgid "Slovenia"
+msgstr ""
+
+#: ../picard/const.py:217
+msgid "Kuwait"
+msgstr ""
+
+#: ../picard/const.py:218
+#, fuzzy
+msgid "Senegal"
+msgstr "Bendra"
+
+#: ../picard/const.py:219
+msgid "San Marino"
+msgstr ""
+
+#: ../picard/const.py:220
+msgid "Sierra Leone"
+msgstr ""
+
+#: ../picard/const.py:221
+msgid "Seychelles"
+msgstr ""
+
+#: ../picard/const.py:222
+msgid "Kazakhstan"
+msgstr ""
+
+#: ../picard/const.py:223
+msgid "Cayman Islands"
+msgstr ""
+
+#: ../picard/const.py:224
+msgid "Singapore"
+msgstr ""
+
+#: ../picard/const.py:225
+msgid "Sweden"
+msgstr ""
+
+#: ../picard/const.py:226
+msgid "Sudan"
+msgstr ""
+
+#: ../picard/const.py:227
+msgid "Dominican Republic"
+msgstr ""
+
+#: ../picard/const.py:228
+msgid "Dominica"
+msgstr ""
+
+#: ../picard/const.py:229
+#, fuzzy
+msgid "Djibouti"
+msgstr "Apie"
+
+#: ../picard/const.py:230
+msgid "Denmark"
+msgstr ""
+
+#: ../picard/const.py:231
+msgid "Virgin Islands (British)"
+msgstr ""
+
+#: ../picard/const.py:232
+msgid "Germany"
+msgstr ""
+
+#: ../picard/const.py:233
+msgid "Yemen"
+msgstr ""
+
+#: ../picard/const.py:234
+msgid "Algeria"
+msgstr ""
+
+#: ../picard/const.py:235
+msgid "United States"
+msgstr ""
+
+#: ../picard/const.py:236
+msgid "Uruguay"
+msgstr ""
+
+#: ../picard/const.py:237
+msgid "Mayotte"
+msgstr ""
+
+#: ../picard/const.py:238
+msgid "United States Minor Outlying Islands"
+msgstr ""
+
+#: ../picard/const.py:239
+msgid "Lebanon"
+msgstr ""
+
+#: ../picard/const.py:240
+msgid "Saint Lucia"
+msgstr ""
+
+#: ../picard/const.py:241
+msgid "Lao People's Democratic Republic"
+msgstr ""
+
+#: ../picard/const.py:242
+msgid "Tuval"
+msgstr ""
+
+#: ../picard/const.py:243
+msgid "Taiwan"
+msgstr ""
+
+#: ../picard/const.py:244
+msgid "Trinidad and Tobago"
+msgstr ""
+
+#: ../picard/const.py:245
+msgid "Turkey"
+msgstr ""
+
+#: ../picard/const.py:246
+msgid "Sri Lanka"
+msgstr ""
+
+#: ../picard/const.py:247
+msgid "Liechtenstein"
+msgstr ""
+
+#: ../picard/const.py:248
+msgid "Latvia"
+msgstr ""
+
+#: ../picard/const.py:249
+msgid "Tonga"
+msgstr ""
+
+#: ../picard/const.py:250
+msgid "Lithuania"
+msgstr ""
+
+#: ../picard/const.py:251
+msgid "Luxembourg"
+msgstr ""
+
+#: ../picard/const.py:252
+msgid "Liberia"
+msgstr ""
+
+#: ../picard/const.py:253
+msgid "Lesotho"
+msgstr ""
+
+#: ../picard/const.py:254
+msgid "Thailand"
+msgstr ""
+
+#: ../picard/const.py:255
+msgid "French Southern Territories"
+msgstr ""
+
+#: ../picard/const.py:256
+msgid "Togo"
+msgstr ""
+
+#: ../picard/const.py:257
+msgid "Chad"
+msgstr ""
+
+#: ../picard/const.py:258
+msgid "Turks and Caicos Islands"
+msgstr ""
+
+#: ../picard/const.py:259
+msgid "Libyan Arab Jamahiriya"
+msgstr ""
+
+#: ../picard/const.py:260
+msgid "Vatican City State (Holy See)"
+msgstr ""
+
+#: ../picard/const.py:261
+msgid "Saint Vincent and The Grenadines"
+msgstr ""
+
+#: ../picard/const.py:262
+msgid "United Arab Emirates"
+msgstr ""
+
+#: ../picard/const.py:263
+msgid "Andorra"
+msgstr ""
+
+#: ../picard/const.py:264
+msgid "Antigua and Barbuda"
+msgstr ""
+
+#: ../picard/const.py:265
+msgid "Afghanistan"
+msgstr ""
+
+#: ../picard/const.py:266
+msgid "Anguilla"
+msgstr ""
+
+#: ../picard/const.py:267
+msgid "Virgin Islands (U.S.)"
+msgstr ""
+
+#: ../picard/const.py:268
+msgid "Iceland"
+msgstr ""
+
+#: ../picard/const.py:269
+msgid "Iran (Islamic Republic of)"
+msgstr ""
+
+#: ../picard/const.py:270
+msgid "Armenia"
+msgstr ""
+
+#: ../picard/const.py:271
+msgid "Albania"
+msgstr ""
+
+#: ../picard/const.py:272
+msgid "Angola"
+msgstr ""
+
+#: ../picard/const.py:273
+msgid "Netherlands Antilles"
+msgstr ""
+
+#: ../picard/const.py:274
+msgid "Antarctica"
+msgstr ""
+
+#: ../picard/const.py:275
+msgid "American Samoa"
+msgstr ""
+
+#: ../picard/const.py:276
+msgid "Argentina"
+msgstr ""
+
+#: ../picard/const.py:277
+msgid "Australia"
+msgstr ""
+
+#: ../picard/const.py:278
+msgid "Austria"
+msgstr ""
+
+#: ../picard/const.py:279
+msgid "Aruba"
+msgstr ""
+
+#: ../picard/const.py:280
+msgid "India"
+msgstr ""
+
+#: ../picard/const.py:281
+msgid "Tanzania, United Republic of"
+msgstr ""
+
+#: ../picard/const.py:282
+msgid "Azerbaijan"
+msgstr ""
+
+#: ../picard/const.py:283
+msgid "Ireland"
+msgstr ""
+
+#: ../picard/const.py:284
+msgid "Indonesia"
+msgstr ""
+
+#: ../picard/const.py:285
+msgid "Ukraine"
+msgstr ""
+
+#: ../picard/const.py:286
+msgid "Qatar"
+msgstr ""
+
+#: ../picard/const.py:287
+msgid "Mozambique"
+msgstr ""
+
+#: ../picard/const.py:288
+msgid "Bosnia and Herzegovina"
+msgstr ""
+
+#: ../picard/const.py:289
+msgid "Congo, The Democratic Republic of the"
+msgstr ""
+
+#: ../picard/const.py:290
+msgid "Serbia and Montenegro"
+msgstr ""
+
+#: ../picard/const.py:291
+msgid "Croatia"
+msgstr ""
+
+#: ../picard/const.py:292
+msgid "Korea (North), Democratic People's Republic of"
+msgstr ""
+
+#: ../picard/const.py:293
+msgid "Korea (South), Republic of"
+msgstr ""
+
+#: ../picard/const.py:294
+msgid "Slovakia"
+msgstr ""
+
+#: ../picard/const.py:295
+msgid "Soviet Union (historical, 1922-1991)"
+msgstr ""
+
+#: ../picard/const.py:296
+msgid "East Timor"
+msgstr ""
+
+#: ../picard/const.py:297
+msgid "Czechoslovakia (historical, 1918-1992)"
+msgstr ""
+
+#: ../picard/const.py:298
+msgid "Europe"
+msgstr ""
+
+#: ../picard/const.py:299
+msgid "East Germany (historical, 1949-1990)"
+msgstr ""
+
+#: ../picard/const.py:300
+msgid "[Unknown Country]"
+msgstr ""
+
+#: ../picard/const.py:301
+msgid "[Worldwide]"
+msgstr ""
+
+#: ../picard/const.py:302
+msgid "Yugoslavia (historical, 1918-1992)"
+msgstr ""
+
+#: ../picard/const.py:307
+msgid "Catalan"
+msgstr ""
+
+#: ../picard/const.py:308
+msgid "Czech"
+msgstr ""
+
+#: ../picard/const.py:309
+msgid "Welsh"
+msgstr ""
+
+#: ../picard/const.py:310
+msgid "Danish"
+msgstr ""
+
+#: ../picard/const.py:311
+#, fuzzy
+msgid "German"
+msgstr "Bendra"
+
+#: ../picard/const.py:312
+msgid "English"
+msgstr ""
+
+#: ../picard/const.py:313
+msgid "English (Canada)"
+msgstr ""
+
+#: ../picard/const.py:314
+msgid "English (UK)"
+msgstr ""
+
+#: ../picard/const.py:315
+msgid "Spanish"
+msgstr ""
+
+#: ../picard/const.py:316
+msgid "Persian"
+msgstr ""
+
+#: ../picard/const.py:317
+msgid "Finnish"
+msgstr ""
+
+#: ../picard/const.py:318
+msgid "French"
+msgstr ""
+
+#: ../picard/const.py:319
+msgid "Frisian"
+msgstr ""
+
+#: ../picard/const.py:320
+msgid "Hebrew"
+msgstr ""
+
+#: ../picard/const.py:321
+msgid "Hungarian"
+msgstr ""
+
+#: ../picard/const.py:322
+msgid "Islandic"
+msgstr ""
+
+#: ../picard/const.py:323
+msgid "Italian"
+msgstr ""
+
+#: ../picard/const.py:324
+msgid "Kannada"
+msgstr ""
+
+#: ../picard/const.py:325
+msgid "Korean"
+msgstr ""
+
+#: ../picard/const.py:326
+msgid "Lithuanian"
+msgstr ""
+
+#: ../picard/const.py:327
+msgid "Norwegian Bokmal"
+msgstr ""
+
+#: ../picard/const.py:328
+msgid "Dutch"
+msgstr ""
+
+#: ../picard/const.py:329
+msgid "Polish"
+msgstr ""
+
+#: ../picard/const.py:330
+msgid "Portuguese"
+msgstr ""
+
+#: ../picard/const.py:331
+msgid "Brazilian Portuguese"
+msgstr ""
+
+#: ../picard/const.py:332
+msgid "Romanian"
+msgstr ""
+
+#: ../picard/const.py:333
+msgid "Russian"
+msgstr ""
+
+#: ../picard/const.py:334
+msgid "Scots"
+msgstr ""
+
+#: ../picard/const.py:335
+msgid "Slovak"
+msgstr ""
+
+#: ../picard/const.py:336
+msgid "Slovenian"
+msgstr ""
+
+#: ../picard/const.py:337
+msgid "Swedish"
+msgstr ""
+
+#: ../picard/const.py:338
+msgid "Chinese"
+msgstr ""
+
+#: ../picard/file.py:475
+#, python-format
+msgid "No matching tracks for file %s"
+msgstr ""
+
+#: ../picard/file.py:492
+#, python-format
+msgid "No matching tracks above the threshold for file %s"
+msgstr ""
+
+#: ../picard/file.py:495
+#, python-format
+msgid "File %s identified!"
+msgstr ""
+
+#: ../picard/file.py:506
+#, python-format
+msgid "Looking up the PUID for file %s..."
+msgstr ""
+
+#: ../picard/file.py:511
+#, python-format
+msgid "Looking up the metadata for file %s..."
+msgstr ""
+
+#: ../picard/puidmanager.py:58
+msgid "Submitting PUIDs..."
+msgstr ""
+
+#: ../picard/puidmanager.py:64
+#, python-format
+msgid "PUIDs submission failed: %s"
+msgstr ""
+
+#: ../picard/puidmanager.py:66
+msgid "PUIDs successfully submitted!"
+msgstr ""
+
+#: ../picard/playlist.py:31
+msgid "M3U Playlist (*.m3u)"
+msgstr ""
+
+#: ../picard/playlist.py:32
+msgid "PLS Playlist (*.pls)"
+msgstr ""
+
+#: ../picard/playlist.py:33
+msgid "XSPF Playlist (*.xspf)"
+msgstr ""
+
+#: ../picard/tagger.py:476
 msgid "CD Lookup Error"
 msgstr ""
 
-#: ../picard/tagger.py:473
+#: ../picard/tagger.py:477
 #, python-format
 msgid ""
 "Error while reading CD:\n"
@@ -43,14 +1278,19 @@ msgid ""
 "%s"
 msgstr ""
 
-#: ../picard/ui/passworddialog.py:38
+#: ../picard/tagger.py:503
 #, python-format
-msgid ""
-"The server %s requires you to login. Please enter your username and password."
+msgid "Couldn't find PUID for file %s"
 msgstr ""
 
-#: ../picard/ui/ui_options_script.py:52
-msgid "Tagger Script"
+#: ../picard/musicdns/__init__.py:98
+#, python-format
+msgid "Looking up the fingerprint for file %s..."
+msgstr ""
+
+#: ../picard/musicdns/__init__.py:117
+#, python-format
+msgid "Creating fingerprint for file %s..."
 msgstr ""
 
 #: ../picard/ui/cdlookup.py:31
@@ -58,109 +1298,153 @@ msgid "Score"
 msgstr ""
 
 #: ../picard/ui/cdlookup.py:31
+#: ../picard/ui/itemviews.py:82
+#: ../picard/util/tags.py:23
 msgid "Title"
 msgstr ""
 
-#: ../picard/ui/cdlookup.py:31 ../picard/ui/mainwindow.py:436
+#: ../picard/ui/cdlookup.py:31
+#: ../picard/ui/itemviews.py:84
+#: ../picard/ui/mainwindow.py:436
+#: ../picard/util/tags.py:22
 msgid "Artist"
 msgstr ""
 
-#: ../picard/ui/ui_metadata.py:121
-msgid "Lookup"
+#: ../picard/ui/coverartbox.py:47
+#: ../picard/ui/options/cover.py:29
+msgid "Cover Art"
 msgstr ""
 
-#: ../picard/ui/ui_metadata.py:122
-msgid "Title:"
+#: ../picard/ui/coverartbox.py:95
+msgid "Buy the album on Amazon"
 msgstr ""
 
-#: ../picard/ui/ui_metadata.py:123
-msgid "Date:"
+#: ../picard/ui/filebrowser.py:38
+#: ../picard/ui/mainwindow.py:302
+msgid "&Refresh"
 msgstr ""
 
-#: ../picard/ui/ui_metadata.py:124
-msgid "Artist:"
+#: ../picard/ui/filebrowser.py:41
+msgid "&Move Tagged Files Here"
 msgstr ""
 
-#: ../picard/ui/ui_metadata.py:125
-msgid "Track:"
+#: ../picard/ui/filebrowser.py:44
+msgid "Show &Hidden Files"
 msgstr ""
 
-#: ../picard/ui/ui_metadata.py:126
-msgid "0000-00-00; "
+#: ../picard/ui/itemviews.py:83
+msgid "Length"
 msgstr ""
 
-#: ../picard/ui/ui_metadata.py:127 ../picard/ui/tageditor.py:225
-#: ../picard/ui/multitageditor.py:181
+#: ../picard/ui/itemviews.py:327
+msgid "&Releases"
+msgstr ""
+
+#: ../picard/ui/itemviews.py:353
+msgid "&Plugins"
+msgstr ""
+
+#: ../picard/ui/itemviews.py:523
+msgid "Clusters"
+msgstr ""
+
+#: ../picard/ui/logview.py:29
+msgid "Log"
+msgstr ""
+
+#: ../picard/ui/puidsubmit.py:31
+#: ../picard/ui/options/plugins.py:80
+msgid "File"
+msgstr ""
+
+#: ../picard/ui/puidsubmit.py:31
+msgid "PUID"
+msgstr ""
+
+#: ../picard/ui/puidsubmit.py:31
+#: ../picard/ui/mainwindow.py:437
+msgid "Track"
+msgstr ""
+
+#: ../picard/ui/puidsubmit.py:31
+msgid "Release"
+msgstr ""
+
+#: ../picard/ui/puidsubmit.py:31
+msgid "Release ID"
+msgstr ""
+
+#: ../picard/ui/tageditor.py:65
+#: ../picard/ui/ui_options_plugins.py:62
+msgid "Details"
+msgstr ""
+
+#: ../picard/ui/tageditor.py:70
+#: ../picard/ui/tageditor.py:241
+#, python-format
+msgid "%d file"
+msgid_plural "%d files"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../picard/ui/tageditor.py:124
+#, python-format
+msgid "(different across %d file)"
+msgid_plural "(different across %d files)"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../picard/ui/tageditor.py:127
+#, python-format
+msgid "(missing from %d file)"
+msgid_plural "(missing from %d files)"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../picard/ui/tageditor.py:210
+msgid "Filename:"
+msgstr ""
+
+#: ../picard/ui/tageditor.py:212
+msgid "Format:"
+msgstr ""
+
+#: ../picard/ui/tageditor.py:221
+msgid "Size:"
+msgstr ""
+
+#: ../picard/ui/tageditor.py:225
+#: ../picard/ui/ui_metadata.py:127
 msgid "Length:"
 msgstr ""
 
-#: ../picard/ui/ui_metadata.py:128
-msgid "Album:"
+#: ../picard/ui/tageditor.py:227
+msgid "Bitrate:"
 msgstr ""
 
-#: ../picard/ui/ui_passworddialog.py:78
-msgid "Authentication required"
+#: ../picard/ui/tageditor.py:229
+msgid "Sample rate:"
 msgstr ""
 
-#: ../picard/ui/ui_passworddialog.py:79 ../picard/ui/ui_options_proxy.py:83
-#: ../picard/ui/ui_options_general.py:113
-msgid "Username:"
+#: ../picard/ui/tageditor.py:231
+msgid "Bits per sample:"
 msgstr ""
 
-#: ../picard/ui/ui_passworddialog.py:80 ../picard/ui/ui_options_proxy.py:82
-#: ../picard/ui/ui_options_general.py:112
-msgid "Password:"
+#: ../picard/ui/tageditor.py:234
+msgid "Mono"
 msgstr ""
 
-#: ../picard/ui/ui_passworddialog.py:81
-msgid "Save username and password"
+#: ../picard/ui/tageditor.py:235
+msgid "Stereo"
 msgstr ""
 
-#: ../picard/ui/ui_options_folksonomy.py:114
-#: ../picard/ui/ui_options_folksonomy_tags.py:114
-msgid "Folksonomy Tags"
+#: ../picard/ui/tageditor.py:237
+msgid "Channels:"
 msgstr ""
 
-#: ../picard/ui/ui_options_folksonomy.py:115
-#: ../picard/ui/ui_options_folksonomy_tags.py:115
-msgid "Ignore tags:"
-msgstr ""
-
-#: ../picard/ui/ui_options_folksonomy.py:116
-#: ../picard/ui/ui_options_folksonomy_tags.py:116
-msgid "Minimal tag usage:"
-msgstr ""
-
-#: ../picard/ui/ui_options_folksonomy.py:117
-#: ../picard/ui/ui_options_folksonomy_tags.py:117
-#: ../picard/ui/ui_options_matching.py:107
-#: ../picard/ui/ui_options_matching.py:108
-#: ../picard/ui/ui_options_matching.py:109
-#: ../picard/ui/ui_options_matching.py:113
-msgid " %"
-msgstr ""
-
-#: ../picard/ui/ui_options_folksonomy.py:118
-msgid "Maximum number of tags:"
-msgstr ""
-
-#: ../picard/ui/ui_options_folksonomy.py:119
-#: ../picard/ui/ui_options_folksonomy_tags.py:119
-msgid "Join multiple tags with:"
-msgstr ""
-
-#: ../picard/ui/ui_options_folksonomy.py:120
-#: ../picard/ui/ui_options_folksonomy_tags.py:120
-msgid " / "
-msgstr ""
-
-#: ../picard/ui/ui_options_folksonomy.py:121
-#: ../picard/ui/ui_options_folksonomy_tags.py:121
-msgid ", "
-msgstr ""
-
-#: ../picard/ui/ui_options_folksonomy_tags.py:118
-msgid "Maximal number of tags:"
+#: ../picard/ui/tagsfromfilenames.py:52
+#: ../picard/ui/tagsfromfilenames.py:96
+msgid "File Name"
 msgstr ""
 
 #: ../picard/ui/mainwindow.py:64
@@ -295,7 +1579,8 @@ msgstr ""
 msgid "&CD Lookup..."
 msgstr ""
 
-#: ../picard/ui/mainwindow.py:272 ../picard/ui/mainwindow.py:273
+#: ../picard/ui/mainwindow.py:272
+#: ../picard/ui/mainwindow.py:273
 msgid "Lookup CD"
 msgstr ""
 
@@ -326,7 +1611,8 @@ msgstr ""
 msgid "&Lookup"
 msgstr ""
 
-#: ../picard/ui/mainwindow.py:291 ../picard/ui/mainwindow.py:292
+#: ../picard/ui/mainwindow.py:291
+#: ../picard/ui/mainwindow.py:292
 msgid "Lookup metadata"
 msgstr ""
 
@@ -339,10 +1625,6 @@ msgstr ""
 msgid "&Details..."
 msgstr ""
 
-#: ../picard/ui/mainwindow.py:302 ../picard/ui/filebrowser.py:38
-msgid "&Refresh"
-msgstr ""
-
 #: ../picard/ui/mainwindow.py:305
 msgid "Generate &Playlist..."
 msgstr ""
@@ -388,6 +1670,7 @@ msgid "&Tools"
 msgstr ""
 
 #: ../picard/ui/mainwindow.py:384
+#: ../picard/ui/util.py:33
 msgid "&Help"
 msgstr ""
 
@@ -400,13 +1683,10 @@ msgid "&Search Bar"
 msgstr ""
 
 #: ../picard/ui/mainwindow.py:435
+#: ../picard/util/tags.py:21
 msgid "Album"
 msgstr ""
 
-#: ../picard/ui/mainwindow.py:437 ../picard/ui/puidsubmit.py:31
-msgid "Track"
-msgstr ""
-
 #: ../picard/ui/mainwindow.py:476
 msgid "All Supported Formats"
 msgstr ""
@@ -421,37 +1701,289 @@ msgstr ""
 msgid "Playlist %s saved"
 msgstr ""
 
-#: ../picard/ui/mainwindow.py:638 ../picard/ui/mainwindow.py:647
+#: ../picard/ui/mainwindow.py:638
+#: ../picard/ui/mainwindow.py:647
 #, python-format
 msgid " (Error: %s)"
 msgstr ""
 
+#: ../picard/ui/ui_tageditor.py:115
+#: ../picard/ui/ui_options_plugins.py:59
+#: ../picard/ui/options/plugins.py:76
+msgid "Name"
+msgstr ""
+
+#: ../picard/ui/ui_tageditor.py:116
+msgid "Value"
+msgstr ""
+
+#: ../picard/ui/ui_tageditor.py:117
+msgid "&Add..."
+msgstr ""
+
+#: ../picard/ui/ui_tageditor.py:118
+msgid "&Edit..."
+msgstr ""
+
+#: ../picard/ui/ui_tageditor.py:119
+msgid "&Delete"
+msgstr ""
+
+#: ../picard/ui/ui_tageditor.py:120
+msgid "&Metadata"
+msgstr ""
+
+#: ../picard/ui/ui_tageditor.py:121
+msgid "A&rtwork"
+msgstr ""
+
+#: ../picard/ui/ui_tageditor.py:122
+msgid "&Info"
+msgstr ""
+
+#: ../picard/ui/passworddialog.py:38
+#, python-format
+msgid "The server %s requires you to login. Please enter your username and password."
+msgstr ""
+
+#: ../picard/ui/ui_cdlookup.py:60
+#: ../picard/ui/ui_options_cdlookup.py:47
+#: ../picard/ui/ui_options_cdlookup_win32.py:56
+#: ../picard/ui/options/cdlookup.py:35
+msgid "CD Lookup"
+msgstr ""
+
+#: ../picard/ui/ui_cdlookup.py:61
+msgid "The following releases on MusicBrainz match the CD:"
+msgstr ""
+
+#: ../picard/ui/ui_cdlookup.py:62
+#: ../picard/ui/ui_puidsubmit.py:53
+msgid "OK"
+msgstr ""
+
+#: ../picard/ui/ui_cdlookup.py:63
+msgid "    Lookup manually    "
+msgstr ""
+
+#: ../picard/ui/ui_cdlookup.py:64
+#: ../picard/ui/ui_puidsubmit.py:54
+msgid "Cancel"
+msgstr ""
+
+#: ../picard/ui/ui_passworddialog.py:78
+msgid "Authentication required"
+msgstr ""
+
+#: ../picard/ui/ui_passworddialog.py:79
+#: ../picard/ui/ui_options_general.py:113
+#: ../picard/ui/ui_options_proxy.py:83
+msgid "Username:"
+msgstr ""
+
+#: ../picard/ui/ui_passworddialog.py:80
+#: ../picard/ui/ui_options_general.py:112
+#: ../picard/ui/ui_options_proxy.py:82
+msgid "Password:"
+msgstr ""
+
+#: ../picard/ui/ui_passworddialog.py:81
+msgid "Save username and password"
+msgstr ""
+
 #: ../picard/ui/ui_edittagdialog.py:44
 msgid "Edit Tag"
 msgstr ""
 
-#: ../picard/ui/ui_options_proxy.py:81
-msgid "Web Proxy"
+#: ../picard/ui/ui_metadata.py:121
+msgid "Lookup"
 msgstr ""
 
-#: ../picard/ui/ui_options_proxy.py:84 ../picard/ui/ui_options_general.py:109
-msgid "Port:"
+#: ../picard/ui/ui_metadata.py:122
+msgid "Title:"
 msgstr ""
 
-#: ../picard/ui/ui_options_proxy.py:85 ../picard/ui/ui_options_general.py:110
-msgid "Server address:"
+#: ../picard/ui/ui_metadata.py:123
+msgid "Date:"
 msgstr ""
 
-#: ../picard/ui/ui_tagsfromfilenames.py:56
-msgid "Convert File Names to Tags"
+#: ../picard/ui/ui_metadata.py:124
+msgid "Artist:"
 msgstr ""
 
-#: ../picard/ui/ui_tagsfromfilenames.py:57
-msgid "Replace underscores with spaces"
+#: ../picard/ui/ui_metadata.py:125
+msgid "Track:"
+msgstr ""
+
+#: ../picard/ui/ui_metadata.py:126
+msgid "0000-00-00; "
+msgstr ""
+
+#: ../picard/ui/ui_metadata.py:128
+msgid "Album:"
+msgstr ""
+
+#: ../picard/ui/ui_options.py:42
+msgid "Options"
+msgstr ""
+
+#: ../picard/ui/ui_options_cdlookup.py:48
+msgid "CD-ROM device to use for lookups:"
+msgstr ""
+
+#: ../picard/ui/ui_options_cdlookup_win32.py:57
+msgid "Default CD-ROM drive to use for lookups:"
+msgstr ""
+
+#: ../picard/ui/ui_options_cover.py:56
+msgid "Location"
+msgstr ""
+
+#: ../picard/ui/ui_options_cover.py:57
+msgid "Embed cover images into tags"
+msgstr ""
+
+#: ../picard/ui/ui_options_cover.py:58
+msgid "Save cover images as separate files"
+msgstr ""
+
+#: ../picard/ui/ui_options_cover.py:59
+msgid "Overwrite the file if it already exists"
+msgstr ""
+
+#: ../picard/ui/util.py:31
+msgid "&Ok"
+msgstr ""
+
+#: ../picard/ui/util.py:32
+msgid "&Cancel"
+msgstr ""
+
+#: ../picard/ui/ui_puidsubmit.py:52
+msgid "Submit PUIDs"
+msgstr ""
+
+#: ../picard/ui/ui_options_folksonomy.py:114
+#: ../picard/ui/options/folksonomy.py:29
+msgid "Folksonomy Tags"
+msgstr ""
+
+#: ../picard/ui/ui_options_folksonomy.py:115
+msgid "Ignore tags:"
+msgstr ""
+
+#: ../picard/ui/ui_options_folksonomy.py:116
+msgid "Minimal tag usage:"
+msgstr ""
+
+#: ../picard/ui/ui_options_folksonomy.py:117
+#: ../picard/ui/ui_options_matching.py:107
+#: ../picard/ui/ui_options_matching.py:108
+#: ../picard/ui/ui_options_matching.py:109
+#: ../picard/ui/ui_options_matching.py:113
+msgid " %"
+msgstr ""
+
+#: ../picard/ui/ui_options_folksonomy.py:118
+msgid "Maximum number of tags:"
+msgstr ""
+
+#: ../picard/ui/ui_options_folksonomy.py:119
+msgid "Join multiple tags with:"
+msgstr ""
+
+#: ../picard/ui/ui_options_folksonomy.py:120
+msgid " / "
+msgstr ""
+
+#: ../picard/ui/ui_options_folksonomy.py:121
+msgid ", "
+msgstr ""
+
+#: ../picard/ui/ui_options_interface.py:50
+msgid "Miscellaneous"
+msgstr ""
+
+#: ../picard/ui/ui_options_interface.py:51
+msgid "Show text labels under icons"
+msgstr ""
+
+#: ../picard/ui/ui_options_interface.py:52
+msgid "Allow selection of multiple directories"
+msgstr ""
+
+#: ../picard/ui/ui_options_interface.py:53
+msgid "Use advanced query syntax"
+msgstr ""
+
+#: ../picard/ui/ui_options_interface.py:54
+#, fuzzy
+msgid "User interface language:"
+msgstr "Vartotojo sąsajos kalba"
+
+#: ../picard/ui/ui_options_naming.py:165
+msgid "Rename Files"
+msgstr ""
+
+#: ../picard/ui/ui_options_naming.py:166
+msgid "Replace Windows-incompatible characters"
+msgstr ""
+
+#: ../picard/ui/ui_options_naming.py:167
+msgid "Replace non-ASCII characters"
+msgstr ""
+
+#: ../picard/ui/ui_options_naming.py:168
+#: ../picard/ui/ui_options_naming.py:169
+#: ../picard/ui/ui_options_metadata.py:109
+#: ../picard/ui/ui_options_metadata.py:110
+msgid "Default"
+msgstr ""
+
+#: ../picard/ui/ui_options_naming.py:170
+#: ../picard/ui/options/naming.py:90
+msgid "Multiple artist file naming format:"
+msgstr ""
+
+#: ../picard/ui/ui_options_naming.py:171
+#: ../picard/ui/options/naming.py:86
+msgid "File naming format:"
+msgstr ""
+
+#: ../picard/ui/ui_options_naming.py:172
+msgid "Move Files"
+msgstr ""
+
+#: ../picard/ui/ui_options_naming.py:173
+msgid "Move tagged files to this directory:"
+msgstr ""
+
+#: ../picard/ui/ui_options_naming.py:174
+msgid "Browse..."
+msgstr ""
+
+#: ../picard/ui/ui_options_naming.py:175
+msgid "Move additional files:"
+msgstr ""
+
+#: ../picard/ui/ui_options_naming.py:176
+msgid "Delete empty directories"
+msgstr ""
+
+#: ../picard/ui/ui_options_naming.py:177
+msgid "Example"
+msgstr ""
+
+#: ../picard/ui/ui_options_naming.py:178
+msgid "File name:"
+msgstr ""
+
+#: ../picard/ui/ui_options_naming.py:179
+msgid "Multiple artist file name:"
 msgstr ""
 
-#: ../picard/ui/ui_tagsfromfilenames.py:58
 #: ../picard/ui/ui_options_naming.py:180
+#: ../picard/ui/ui_tagsfromfilenames.py:58
 msgid "&Preview"
 msgstr ""
 
@@ -459,11 +1991,22 @@ msgstr ""
 msgid "MusicBrainz Server"
 msgstr ""
 
+#: ../picard/ui/ui_options_general.py:109
+#: ../picard/ui/ui_options_proxy.py:84
+msgid "Port:"
+msgstr ""
+
+#: ../picard/ui/ui_options_general.py:110
+#: ../picard/ui/ui_options_proxy.py:85
+msgid "Server address:"
+msgstr ""
+
 #: ../picard/ui/ui_options_general.py:111
 msgid "Account Information"
 msgstr ""
 
 #: ../picard/ui/ui_options_general.py:114
+#: ../picard/ui/options/general.py:29
 msgid "General"
 msgstr "Bendra"
 
@@ -471,34 +2014,6 @@ msgstr "Bendra"
 msgid "Automatically scan all new files"
 msgstr ""
 
-#: ../picard/ui/ui_options_interface.py:46
-msgid "Miscellaneous"
-msgstr ""
-
-#: ../picard/ui/ui_options_interface.py:47
-msgid "Show text labels under icons"
-msgstr ""
-
-#: ../picard/ui/ui_options_interface.py:48
-msgid "Allow selection of multiple directories"
-msgstr ""
-
-#: ../picard/ui/ui_options_interface.py:49
-msgid "Use advanced query syntax"
-msgstr ""
-
-#: ../picard/ui/itemviews.py:327
-msgid "&Releases"
-msgstr ""
-
-#: ../picard/ui/itemviews.py:353
-msgid "&Plugins"
-msgstr ""
-
-#: ../picard/ui/itemviews.py:523
-msgid "Clusters"
-msgstr ""
-
 #: ../picard/ui/ui_options_matching.py:105
 msgid "Thresholds"
 msgstr ""
@@ -519,6 +2034,67 @@ msgstr ""
 msgid "Minimal similarity for PUID lookups:"
 msgstr ""
 
+#: ../picard/ui/ui_options_metadata.py:100
+#: ../picard/ui/options/metadata.py:31
+msgid "Metadata"
+msgstr ""
+
+#: ../picard/ui/ui_options_metadata.py:101
+msgid "Translate foreign artist names to English where possible"
+msgstr ""
+
+#: ../picard/ui/ui_options_metadata.py:102
+msgid "Use release relationships"
+msgstr ""
+
+#: ../picard/ui/ui_options_metadata.py:103
+msgid "Use track relationships"
+msgstr ""
+
+#: ../picard/ui/ui_options_metadata.py:104
+msgid "Use folksonomy tags as genre"
+msgstr ""
+
+#: ../picard/ui/ui_options_metadata.py:105
+msgid "Preferred release country:"
+msgstr ""
+
+#: ../picard/ui/ui_options_metadata.py:106
+msgid "Custom Fields"
+msgstr ""
+
+#: ../picard/ui/ui_options_metadata.py:107
+msgid "Various artists:"
+msgstr ""
+
+#: ../picard/ui/ui_options_metadata.py:108
+msgid "Non-album tracks:"
+msgstr ""
+
+#: ../picard/ui/ui_options_plugins.py:58
+#: ../picard/ui/options/plugins.py:30
+msgid "Plugins"
+msgstr ""
+
+#: ../picard/ui/ui_options_plugins.py:60
+#: ../picard/ui/options/plugins.py:79
+msgid "Author"
+msgstr ""
+
+#: ../picard/ui/ui_options_plugins.py:61
+#: ../picard/util/tags.py:36
+msgid "Version"
+msgstr ""
+
+#: ../picard/ui/ui_options_proxy.py:81
+#: ../picard/ui/options/proxy.py:28
+msgid "Web Proxy"
+msgstr ""
+
+#: ../picard/ui/ui_options_script.py:52
+msgid "Tagger Script"
+msgstr ""
+
 #: ../picard/ui/ui_options_tags.py:105
 msgid "Common"
 msgstr ""
@@ -571,328 +2147,23 @@ msgstr ""
 msgid "Remove APEv2 tags from MP3 files"
 msgstr ""
 
-#: ../picard/ui/ui_options_cdlookup_win32.py:56 ../picard/ui/ui_cdlookup.py:60
-#: ../picard/ui/ui_options_cdlookup.py:47
-msgid "CD Lookup"
+#: ../picard/ui/ui_tagsfromfilenames.py:56
+msgid "Convert File Names to Tags"
 msgstr ""
 
-#: ../picard/ui/ui_options_cdlookup_win32.py:57
-msgid "Default CD-ROM drive to use for lookups:"
+#: ../picard/ui/ui_tagsfromfilenames.py:57
+msgid "Replace underscores with spaces"
 msgstr ""
 
-#: ../picard/ui/tageditor.py:65 ../picard/ui/ui_options_plugins.py:62
-#: ../picard/ui/multitageditor.py:37
-msgid "Details"
-msgstr ""
-
-#: ../picard/ui/tageditor.py:70 ../picard/ui/tageditor.py:241
-#: ../picard/ui/multitageditor.py:42 ../picard/ui/multitageditor.py:197
-#, python-format
-msgid "%d file"
-msgid_plural "%d files"
-msgstr[0] ""
-msgstr[1] ""
-
-#: ../picard/ui/tageditor.py:124 ../picard/ui/multitageditor.py:95
-#, python-format
-msgid "(different across %d file)"
-msgid_plural "(different across %d files)"
-msgstr[0] ""
-msgstr[1] ""
-
-#: ../picard/ui/tageditor.py:127 ../picard/ui/multitageditor.py:98
-#, python-format
-msgid "(missing from %d file)"
-msgid_plural "(missing from %d files)"
-msgstr[0] ""
-msgstr[1] ""
-
-#: ../picard/ui/tageditor.py:210 ../picard/ui/multitageditor.py:166
-msgid "Filename:"
-msgstr ""
-
-#: ../picard/ui/tageditor.py:212 ../picard/ui/multitageditor.py:168
-msgid "Format:"
-msgstr ""
-
-#: ../picard/ui/tageditor.py:221 ../picard/ui/multitageditor.py:177
-msgid "Size:"
-msgstr ""
-
-#: ../picard/ui/tageditor.py:227 ../picard/ui/multitageditor.py:183
-msgid "Bitrate:"
-msgstr ""
-
-#: ../picard/ui/tageditor.py:229 ../picard/ui/multitageditor.py:185
-msgid "Sample rate:"
-msgstr ""
-
-#: ../picard/ui/tageditor.py:231 ../picard/ui/multitageditor.py:187
-msgid "Bits per sample:"
-msgstr ""
-
-#: ../picard/ui/tageditor.py:234 ../picard/ui/multitageditor.py:190
-msgid "Mono"
-msgstr ""
-
-#: ../picard/ui/tageditor.py:235 ../picard/ui/multitageditor.py:191
-msgid "Stereo"
-msgstr ""
-
-#: ../picard/ui/tageditor.py:237 ../picard/ui/multitageditor.py:193
-msgid "Channels:"
-msgstr ""
-
-#: ../picard/ui/ui_tageditor.py:115 ../picard/ui/ui_multitageditor.py:55
-#: ../picard/ui/ui_options_plugins.py:59 ../picard/ui/options/plugins.py:76
-msgid "Name"
-msgstr ""
-
-#: ../picard/ui/ui_tageditor.py:116 ../picard/ui/ui_multitageditor.py:56
-msgid "Value"
-msgstr ""
-
-#: ../picard/ui/ui_tageditor.py:117 ../picard/ui/ui_multitageditor.py:57
-msgid "&Add..."
-msgstr ""
-
-#: ../picard/ui/ui_tageditor.py:118
-msgid "&Edit..."
-msgstr ""
-
-#: ../picard/ui/ui_tageditor.py:119
-msgid "&Delete"
-msgstr ""
-
-#: ../picard/ui/ui_tageditor.py:120
-msgid "&Metadata"
-msgstr ""
-
-#: ../picard/ui/ui_tageditor.py:121
-msgid "A&rtwork"
-msgstr ""
-
-#: ../picard/ui/ui_tageditor.py:122
-msgid "&Info"
-msgstr ""
-
-#: ../picard/ui/coverartbox.py:47
-msgid "Cover Art"
-msgstr ""
-
-#: ../picard/ui/coverartbox.py:95
-msgid "Buy the album on Amazon"
-msgstr ""
-
-#: ../picard/ui/ui_puidsubmit.py:52
-msgid "Submit PUIDs"
-msgstr ""
-
-#: ../picard/ui/ui_puidsubmit.py:53 ../picard/ui/ui_cdlookup.py:62
-msgid "OK"
-msgstr ""
-
-#: ../picard/ui/ui_puidsubmit.py:54 ../picard/ui/ui_cdlookup.py:64
-msgid "Cancel"
-msgstr ""
-
-#: ../picard/ui/puidsubmit.py:31 ../picard/ui/options/plugins.py:80
-msgid "File"
-msgstr ""
-
-#: ../picard/ui/puidsubmit.py:31
-msgid "PUID"
-msgstr ""
-
-#: ../picard/ui/puidsubmit.py:31
-msgid "Release"
-msgstr ""
-
-#: ../picard/ui/puidsubmit.py:31
-msgid "Release ID"
-msgstr ""
-
-#: ../picard/ui/filebrowser.py:41
-msgid "&Move Tagged Files Here"
-msgstr ""
-
-#: ../picard/ui/filebrowser.py:44
-msgid "Show &Hidden Files"
-msgstr ""
-
-#: ../picard/ui/ui_cdlookup.py:61
-msgid "The following releases on MusicBrainz match the CD:"
-msgstr ""
-
-#: ../picard/ui/ui_cdlookup.py:63
-msgid "    Lookup manually    "
-msgstr ""
-
-#: ../picard/ui/ui_options.py:42
-msgid "Options"
-msgstr ""
-
-#: ../picard/ui/tagsfromfilenames.py:52 ../picard/ui/tagsfromfilenames.py:96
-msgid "File Name"
-msgstr ""
-
-#: ../picard/ui/ui_options_cover.py:56
-msgid "Location"
-msgstr ""
-
-#: ../picard/ui/ui_options_cover.py:57
-msgid "Embed cover images into tags"
-msgstr ""
-
-#: ../picard/ui/ui_options_cover.py:58
-msgid "Save cover images as separate files"
-msgstr ""
-
-#: ../picard/ui/ui_options_cover.py:59
-msgid "Overwrite the file if it already exists"
-msgstr ""
-
-#: ../picard/ui/ui_options_metadata.py:100
-msgid "Metadata"
-msgstr ""
-
-#: ../picard/ui/ui_options_metadata.py:101
-msgid "Translate foreign artist names to English where possible"
-msgstr ""
-
-#: ../picard/ui/ui_options_metadata.py:102
-msgid "Use release relationships"
-msgstr ""
-
-#: ../picard/ui/ui_options_metadata.py:103
-msgid "Use track relationships"
-msgstr ""
-
-#: ../picard/ui/ui_options_metadata.py:104
-msgid "Use folksonomy tags as genre"
-msgstr ""
-
-#: ../picard/ui/ui_options_metadata.py:105
-msgid "Preferred release country:"
-msgstr ""
-
-#: ../picard/ui/ui_options_metadata.py:106
-msgid "Custom Fields"
-msgstr ""
-
-#: ../picard/ui/ui_options_metadata.py:107
-msgid "Various artists:"
-msgstr ""
-
-#: ../picard/ui/ui_options_metadata.py:108
-msgid "Non-album tracks:"
-msgstr ""
-
-#: ../picard/ui/ui_options_metadata.py:109
-#: ../picard/ui/ui_options_metadata.py:110
-#: ../picard/ui/ui_options_naming.py:168 ../picard/ui/ui_options_naming.py:169
-msgid "Default"
-msgstr ""
-
-#: ../picard/ui/ui_multitageditor.py:58
-msgid "Delete"
-msgstr ""
-
-#: ../picard/ui/logview.py:29
-msgid "Log"
-msgstr ""
-
-#: ../picard/ui/ui_options_plugins.py:58
-msgid "Plugins"
-msgstr ""
-
-#: ../picard/ui/ui_options_plugins.py:60 ../picard/ui/options/plugins.py:79
-msgid "Author"
-msgstr ""
-
-#: ../picard/ui/ui_options_plugins.py:61
-msgid "Version"
-msgstr ""
-
-#: ../picard/ui/ui_options_naming.py:165
-msgid "Rename Files"
-msgstr ""
-
-#: ../picard/ui/ui_options_naming.py:166
-msgid "Replace Windows-incompatible characters"
-msgstr ""
-
-#: ../picard/ui/ui_options_naming.py:167
-msgid "Replace non-ASCII characters"
-msgstr ""
-
-#: ../picard/ui/ui_options_naming.py:170 ../picard/ui/options/naming.py:90
-msgid "Multiple artist file naming format:"
-msgstr ""
-
-#: ../picard/ui/ui_options_naming.py:171 ../picard/ui/options/naming.py:86
-msgid "File naming format:"
-msgstr ""
-
-#: ../picard/ui/ui_options_naming.py:172
-msgid "Move Files"
-msgstr ""
-
-#: ../picard/ui/ui_options_naming.py:173
-msgid "Move tagged files to this directory:"
-msgstr ""
-
-#: ../picard/ui/ui_options_naming.py:174
-msgid "Browse..."
-msgstr ""
-
-#: ../picard/ui/ui_options_naming.py:175
-msgid "Move additional files:"
-msgstr ""
-
-#: ../picard/ui/ui_options_naming.py:176
-msgid "Delete empty directories"
-msgstr ""
-
-#: ../picard/ui/ui_options_naming.py:177
-msgid "Example"
-msgstr ""
-
-#: ../picard/ui/ui_options_naming.py:178
-msgid "File name:"
-msgstr ""
-
-#: ../picard/ui/ui_options_naming.py:179
-msgid "Multiple artist file name:"
-msgstr ""
-
-#: ../picard/ui/ui_options_cdlookup.py:48
-msgid "CD-ROM device to use for lookups:"
-msgstr ""
-
-#: ../picard/ui/options/scripting.py:84 ../picard/ui/options/naming.py:86
-#: ../picard/ui/options/naming.py:90 ../picard/ui/options/naming.py:93
-#: ../picard/ui/options/naming.py:95
-msgid "Script Error"
-msgstr ""
+#: ../picard/ui/options/about.py:29
+msgid "About"
+msgstr "Apie"
 
 #. Replace this with your name to have it appear in the "About" dialog.
 #: ../picard/ui/options/about.py:48
 msgid "translator-credits"
 msgstr ""
 "Launchpad Contributions:\n"
-"  Jonas Slivka <https://launchpad.net/~jonas-slivka>\n"
-"\n"
-"Launchpad Contributions:\n"
-"  Jonas Slivka https://launchpad.net/~jonas-slivka\n"
-"\n"
-"Launchpad Contributions:\n"
-"  Jonas Slivka https://launchpad.net/~jonas-slivka\n"
-"\n"
-"Launchpad Contributions:\n"
-"  Jonas Slivka https://launchpad.net/~jonas-slivka\n"
-"\n"
-"Launchpad Contributions:\n"
 "  Jonas Slivka https://launchpad.net/~jonas-slivka"
 
 #. Replace LANG with language you are translatig to.
@@ -904,22 +2175,57 @@ msgstr ""
 #: ../picard/ui/options/about.py:55
 #, python-format
 msgid ""
-"<p align=\"center\"><span style=\"font-size:15px;font-weight:bold;"
-"\">MusicBrainz Picard</span><br/>\n"
+"<p align=\"center\"><span style=\"font-size:15px;font-weight:bold;\">MusicBrainz Picard</span><br/>\n"
 "Version %(version)s</p>\n"
 "<p align=\"center\"><strong>Supported formats</strong><br/>%(formats)s</p>\n"
 "<p align=\"center\"><strong>Please donate</strong><br/>\n"
-"Thank you for using Picard. Picard relies on the MusicBrainz database, which "
-"is operated by the MetaBrainz Foundation with the help of thousands of "
-"volunteers. If you like this application please consider donating to the "
-"MetaBrainz Foundation to keep the service running.</p>\n"
-"<p align=\"center\"><a href=\"http://metabrainz.org/donate/index.html"
-"\">Donate now!</a></p>\n"
+"Thank you for using Picard. Picard relies on the MusicBrainz database, which is operated by the MetaBrainz Foundation with the help of thousands of volunteers. If you like this application please consider donating to the MetaBrainz Foundation to keep the service running.</p>\n"
+"<p align=\"center\"><a href=\"http://metabrainz.org/donate/index.html\">Donate now!</a></p>\n"
 "<p align=\"center\"><strong>Credits</strong><br/>\n"
-"<small>Copyright © 2004-2008 Robert Kaye, Lukáš Lalinský and others%"
-"(translator-credits)s</small></p>\n"
-"<p align=\"center\"><a href=\"http://musicbrainz.org/doc/PicardTagger"
-"\">http://musicbrainz.org/doc/PicardTagger</a></p>\n"
+"<small>Copyright © 2004-2008 Robert Kaye, Lukáš Lalinský and others%(translator-credits)s</small></p>\n"
+"<p align=\"center\"><a href=\"http://musicbrainz.org/doc/PicardTagger\">http://musicbrainz.org/doc/PicardTagger</a></p>\n"
+msgstr ""
+
+#: ../picard/ui/options/advanced.py:26
+msgid "Advanced"
+msgstr ""
+
+#: ../picard/ui/options/interface.py:31
+#, fuzzy
+msgid "User Interface"
+msgstr "Vartotojo sąsajos kalba"
+
+#: ../picard/ui/options/interface.py:47
+msgid "System default"
+msgstr "Sistemos numatytoji"
+
+#: ../picard/ui/options/interface.py:71
+#, fuzzy
+msgid "Language changed"
+msgstr "Kalba"
+
+#: ../picard/ui/options/interface.py:71
+msgid "You have changed the interface language. You have to restart Picard in order for the change to take effect."
+msgstr ""
+
+#: ../picard/ui/options/matching.py:29
+msgid "Matching"
+msgstr ""
+
+#: ../picard/ui/options/metadata.py:52
+msgid "None"
+msgstr ""
+
+#: ../picard/ui/options/naming.py:33
+msgid "File Naming"
+msgstr ""
+
+#: ../picard/ui/options/naming.py:86
+#: ../picard/ui/options/naming.py:90
+#: ../picard/ui/options/naming.py:93
+#: ../picard/ui/options/naming.py:95
+#: ../picard/ui/options/scripting.py:84
+msgid "Script Error"
 msgstr ""
 
 #: ../picard/ui/options/naming.py:93
@@ -938,6 +2244,231 @@ msgstr ""
 msgid "The location to move files to must not be empty."
 msgstr ""
 
+#: ../picard/ui/options/scripting.py:63
+msgid "Scripting"
+msgstr ""
+
+#: ../picard/ui/options/tags.py:29
+msgid "Tags"
+msgstr ""
+
+#: ../picard/util/tags.py:24
+msgid "Date"
+msgstr ""
+
+#: ../picard/util/tags.py:25
+msgid "Album Artist"
+msgstr ""
+
+#: ../picard/util/tags.py:26
+msgid "Track Number"
+msgstr ""
+
+#: ../picard/util/tags.py:27
+msgid "Total Tracks"
+msgstr ""
+
+#: ../picard/util/tags.py:28
+msgid "Disc Number"
+msgstr ""
+
+#: ../picard/util/tags.py:29
+msgid "Total Discs"
+msgstr ""
+
+#: ../picard/util/tags.py:30
+msgid "Album Artist Sort Order"
+msgstr ""
+
+#: ../picard/util/tags.py:31
+msgid "Artist Sort Order"
+msgstr ""
+
+#: ../picard/util/tags.py:32
+msgid "Title Sort Order"
+msgstr ""
+
+#: ../picard/util/tags.py:33
+msgid "Album Sort Order"
+msgstr ""
+
+#: ../picard/util/tags.py:34
+msgid "ASIN"
+msgstr ""
+
+#: ../picard/util/tags.py:35
+msgid "Grouping"
+msgstr ""
+
+#: ../picard/util/tags.py:37
+msgid "ISRC"
+msgstr ""
+
+#: ../picard/util/tags.py:38
+msgid "Mood"
+msgstr ""
+
+#: ../picard/util/tags.py:39
+msgid "BPM"
+msgstr ""
+
+#: ../picard/util/tags.py:40
+msgid "Copyright"
+msgstr ""
+
+#: ../picard/util/tags.py:41
+msgid "Composer"
+msgstr ""
+
+#: ../picard/util/tags.py:42
+msgid "Conductor"
+msgstr ""
+
+#: ../picard/util/tags.py:43
+msgid "Lyricist"
+msgstr ""
+
+#: ../picard/util/tags.py:44
+msgid "Arranger"
+msgstr ""
+
+#: ../picard/util/tags.py:45
+msgid "Producer"
+msgstr ""
+
+#: ../picard/util/tags.py:46
+msgid "Engineer"
+msgstr ""
+
+#: ../picard/util/tags.py:47
+msgid "Subtitle"
+msgstr ""
+
+#: ../picard/util/tags.py:48
+msgid "Disc Subtitle"
+msgstr ""
+
+#: ../picard/util/tags.py:49
+msgid "Remixer"
+msgstr ""
+
+#: ../picard/util/tags.py:50
+msgid "MusicBrainz Track Id"
+msgstr ""
+
+#: ../picard/util/tags.py:51
+msgid "MusicBrainz Release Id"
+msgstr ""
+
+#: ../picard/util/tags.py:52
+msgid "MusicBrainz Artist Id"
+msgstr ""
+
+#: ../picard/util/tags.py:53
+msgid "MusicBrainz Release Artist Id"
+msgstr ""
+
+#: ../picard/util/tags.py:54
+msgid "MusicBrainz TRM Id"
+msgstr ""
+
+#: ../picard/util/tags.py:55
+msgid "MusicBrainz Disc Id"
+msgstr ""
+
+#: ../picard/util/tags.py:56
+msgid "MusicBrainz Sort Name"
+msgstr ""
+
+#: ../picard/util/tags.py:57
+msgid "MusicIP PUID"
+msgstr ""
+
+#: ../picard/util/tags.py:58
+msgid "MusicIP Fingerprint"
+msgstr ""
+
+#: ../picard/util/tags.py:59
+msgid "Disc Id"
+msgstr ""
+
+#: ../picard/util/tags.py:60
+msgid "Website"
+msgstr ""
+
+#: ../picard/util/tags.py:61
+msgid "Compilation"
+msgstr ""
+
+#: ../picard/util/tags.py:62
+msgid "Comment"
+msgstr ""
+
+#: ../picard/util/tags.py:63
+#, fuzzy
+msgid "Genre"
+msgstr "Bendra"
+
+#: ../picard/util/tags.py:64
+msgid "Encoded By"
+msgstr ""
+
+#: ../picard/util/tags.py:65
+msgid "Performer"
+msgstr ""
+
+#: ../picard/util/tags.py:66
+msgid "Release Type"
+msgstr ""
+
+#: ../picard/util/tags.py:67
+msgid "Release Status"
+msgstr ""
+
+#: ../picard/util/tags.py:68
+msgid "Release Country"
+msgstr ""
+
+#: ../picard/util/tags.py:69
+msgid "Record Label"
+msgstr ""
+
+#: ../picard/util/tags.py:70
+msgid "Barcode"
+msgstr ""
+
+#: ../picard/util/tags.py:71
+msgid "Catalog Number"
+msgstr ""
+
+#: ../picard/util/tags.py:72
+msgid "Format"
+msgstr ""
+
+#: ../picard/util/tags.py:73
+msgid "DJ-Mixer"
+msgstr ""
+
+#: ../picard/util/tags.py:74
+msgid "Media"
+msgstr ""
+
+#: ../picard/util/tags.py:75
+msgid "Lyrics"
+msgstr ""
+
+#: ../picard/util/tags.py:76
+msgid "Mixer"
+msgstr ""
+
+#: ../picard/util/tags.py:77
+msgid "Language"
+msgstr "Kalba"
+
+#: ../picard/util/tags.py:78
+msgid "Script"
+msgstr ""
+
 #: ../picard/util/webbrowser2.py:84
 msgid "Web Browser Error"
 msgstr ""
@@ -950,9 +2481,6 @@ msgid ""
 "%s"
 msgstr ""
 
-#~ msgid "About"
-#~ msgstr "Apie"
-
 #~ msgid ""
 #~ "Version %s\n"
 #~ "\n"
@@ -979,33 +2507,18 @@ msgstr ""
 #~ "pagal Helix bendruomenės leidimą.\n"
 #~ "\n"
 #~ "Palaikomi formatai: %s"
-
-#~ msgid "Colors"
-#~ msgstr "Spalvos"
-
 #~ msgid "Font color"
 #~ msgstr "Šrifto spalva"
-
 #~ msgid "Directories"
 #~ msgstr "Aplankai"
-
 #~ msgid "Watch for new files"
 #~ msgstr "Stebėti dėl naujų failų"
-
 #~ msgid "Watch this directory for new audio files"
 #~ msgstr "Stebėti šį aplanką dėl naujų garso failų"
-
 #~ msgid "Encodings"
 #~ msgstr "Koduotės"
-
 #~ msgid "all languages"
 #~ msgstr "visos kalbos"
-
 #~ msgid "percent similar."
 #~ msgstr "procentų panašu."
 
-#~ msgid "Language"
-#~ msgstr "Kalba"
-
-#~ msgid "System default"
-#~ msgstr "Sistemos numatytoji"
diff --git a/po/nb.po b/po/nb.po
index 69886c2ab..651f1bf3e 100644
--- a/po/nb.po
+++ b/po/nb.po
@@ -5,36 +5,1318 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: http://bugs.musicbrainz.org/\n"
-"POT-Creation-Date: 2008-12-01 18:20+0100\n"
-"PO-Revision-Date: 2008-08-13 12:25+0000\n"
-"Last-Translator: Anders <Unknown>\n"
+"POT-Creation-Date: 2009-01-25 12:23+0100\n"
+"PO-Revision-Date: 2009-01-25 13:27+0100\n"
+"Last-Translator: Philipp Wolfer <phw@rubyforge.org>\n"
 "Language-Team: Norwegian <no@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2008-12-01 17:02+0000\n"
+"X-Launchpad-Export-Date: 2009-01-24 23:28+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 "Generated-By: pygettext.py 1.5\n"
 
-#: ../picard/album.py:108 ../picard/cluster.py:248
+#: ../picard/album.py:108
+#: ../picard/cluster.py:248
 msgid "Unmatched Files"
 msgstr ""
 
-#: ../picard/album.py:269
+#: ../picard/album.py:281
 #, python-format
 msgid "[couldn't load album %s]"
 msgstr ""
 
-#: ../picard/album.py:305
+#: ../picard/album.py:317
 msgid "[loading album information]"
 msgstr ""
 
-#: ../picard/tagger.py:472
+#: ../picard/cluster.py:164
+#: ../picard/cluster.py:175
+#, python-format
+msgid "No matching releases for cluster %s"
+msgstr "Ingen treff for filgruppen %s"
+
+#: ../picard/cluster.py:177
+#, fuzzy, python-format
+msgid "Cluster %s identified!"
+msgstr "Filen %s er identifisert!"
+
+#: ../picard/cluster.py:182
+#, fuzzy, python-format
+msgid "Looking up the metadata for cluster %s..."
+msgstr "Ingen treff for filgruppen %s"
+
+#: ../picard/const.py:40
+msgid "CD"
+msgstr ""
+
+#: ../picard/const.py:41
+msgid "DVD"
+msgstr ""
+
+#: ../picard/const.py:42
+msgid "SACD"
+msgstr ""
+
+#: ../picard/const.py:43
+msgid "LaserDisc"
+msgstr ""
+
+#: ../picard/const.py:44
+msgid "MiniDisc"
+msgstr ""
+
+#: ../picard/const.py:45
+msgid "Vinyl"
+msgstr ""
+
+#: ../picard/const.py:46
+msgid "Cassette"
+msgstr ""
+
+#: ../picard/const.py:47
+msgid "Cartridge (4/8-tracks)"
+msgstr ""
+
+#: ../picard/const.py:48
+msgid "Reel-to-Reel"
+msgstr ""
+
+#: ../picard/const.py:49
+msgid "DAT"
+msgstr ""
+
+#: ../picard/const.py:50
+msgid "Digital Media"
+msgstr ""
+
+#: ../picard/const.py:51
+msgid "Wax Cylinder"
+msgstr ""
+
+#: ../picard/const.py:52
+msgid "Piano Roll"
+msgstr ""
+
+#: ../picard/const.py:53
+#, fuzzy
+msgid "Other"
+msgstr "Senere"
+
+#: ../picard/const.py:58
+msgid "Bangladesh"
+msgstr ""
+
+#: ../picard/const.py:59
+msgid "Belgium"
+msgstr ""
+
+#: ../picard/const.py:60
+msgid "Burkina Faso"
+msgstr ""
+
+#: ../picard/const.py:61
+#, fuzzy
+msgid "Bulgaria"
+msgstr "Ungarsk"
+
+#: ../picard/const.py:62
+msgid "Barbados"
+msgstr ""
+
+#: ../picard/const.py:63
+msgid "Wallis and Futuna Islands"
+msgstr ""
+
+#: ../picard/const.py:64
+#, fuzzy
+msgid "Bermuda"
+msgstr "Tysk"
+
+#: ../picard/const.py:65
+msgid "Brunei Darussalam"
+msgstr ""
+
+#: ../picard/const.py:66
+msgid "Bolivia"
+msgstr ""
+
+#: ../picard/const.py:67
+msgid "Bahrain"
+msgstr ""
+
+#: ../picard/const.py:68
+msgid "Burundi"
+msgstr ""
+
+#: ../picard/const.py:69
+msgid "Benin"
+msgstr ""
+
+#: ../picard/const.py:70
+msgid "Bhutan"
+msgstr ""
+
+#: ../picard/const.py:71
+msgid "Jamaica"
+msgstr ""
+
+#: ../picard/const.py:72
+msgid "Bouvet Island"
+msgstr ""
+
+#: ../picard/const.py:73
+msgid "Botswana"
+msgstr ""
+
+#: ../picard/const.py:74
+msgid "Samoa"
+msgstr ""
+
+#: ../picard/const.py:75
+msgid "Brazil"
+msgstr ""
+
+#: ../picard/const.py:76
+msgid "Bahamas"
+msgstr ""
+
+#: ../picard/const.py:77
+msgid "Belarus"
+msgstr ""
+
+#: ../picard/const.py:78
+msgid "Belize"
+msgstr ""
+
+#: ../picard/const.py:79
+msgid "Russian Federation"
+msgstr ""
+
+#: ../picard/const.py:80
+msgid "Rwanda"
+msgstr ""
+
+#: ../picard/const.py:81
+msgid "Reunion"
+msgstr ""
+
+#: ../picard/const.py:82
+msgid "Turkmenistan"
+msgstr ""
+
+#: ../picard/const.py:83
+msgid "Tajikistan"
+msgstr ""
+
+#: ../picard/const.py:84
+#, fuzzy
+msgid "Romania"
+msgstr "Romansk"
+
+#: ../picard/const.py:85
+msgid "Tokela"
+msgstr ""
+
+#: ../picard/const.py:86
+msgid "Guinea-Bissa"
+msgstr ""
+
+#: ../picard/const.py:87
+msgid "Guam"
+msgstr ""
+
+#: ../picard/const.py:88
+msgid "Guatemala"
+msgstr ""
+
+#: ../picard/const.py:89
+msgid "Greece"
+msgstr ""
+
+#: ../picard/const.py:90
+msgid "Equatorial Guinea"
+msgstr ""
+
+#: ../picard/const.py:91
+msgid "Guadeloupe"
+msgstr ""
+
+#: ../picard/const.py:92
+msgid "Japan"
+msgstr ""
+
+#: ../picard/const.py:93
+msgid "Guyana"
+msgstr ""
+
+#: ../picard/const.py:94
+#, fuzzy
+msgid "French Guiana"
+msgstr "Fransk"
+
+#: ../picard/const.py:95
+#, fuzzy
+msgid "Georgia"
+msgstr "Tysk"
+
+#: ../picard/const.py:96
+msgid "Grenada"
+msgstr ""
+
+#: ../picard/const.py:97
+msgid "United Kingdom"
+msgstr ""
+
+#: ../picard/const.py:98
+msgid "Gabon"
+msgstr ""
+
+#: ../picard/const.py:99
+msgid "El Salvador"
+msgstr ""
+
+#: ../picard/const.py:100
+#, fuzzy
+msgid "Guinea"
+msgstr "Generelt"
+
+#: ../picard/const.py:101
+msgid "Gambia"
+msgstr ""
+
+#: ../picard/const.py:102
+msgid "Greenland"
+msgstr ""
+
+#: ../picard/const.py:103
+msgid "Gibraltar"
+msgstr ""
+
+#: ../picard/const.py:104
+msgid "Ghana"
+msgstr ""
+
+#: ../picard/const.py:105
+#, fuzzy
+msgid "Oman"
+msgstr "Tysk"
+
+#: ../picard/const.py:106
+msgid "Tunisia"
+msgstr ""
+
+#: ../picard/const.py:107
+#, fuzzy
+msgid "Jordan"
+msgstr "Koreansk"
+
+#: ../picard/const.py:108
+msgid "Haiti"
+msgstr ""
+
+#: ../picard/const.py:109
+#, fuzzy
+msgid "Hungary"
+msgstr "Ungarsk"
+
+#: ../picard/const.py:110
+msgid "Hong Kong"
+msgstr ""
+
+#: ../picard/const.py:111
+msgid "Honduras"
+msgstr ""
+
+#: ../picard/const.py:112
+msgid "Heard and Mc Donald Islands"
+msgstr ""
+
+#: ../picard/const.py:113
+msgid "Venezuela"
+msgstr ""
+
+#: ../picard/const.py:114
+msgid "Puerto Rico"
+msgstr ""
+
+#: ../picard/const.py:115
+msgid "Pala"
+msgstr ""
+
+#: ../picard/const.py:116
+#, fuzzy
+msgid "Portugal"
+msgstr "Portugisisk"
+
+#: ../picard/const.py:117
+msgid "Svalbard and Jan Mayen Islands"
+msgstr ""
+
+#: ../picard/const.py:118
+msgid "Paraguay"
+msgstr ""
+
+#: ../picard/const.py:119
+msgid "Iraq"
+msgstr ""
+
+#: ../picard/const.py:120
+msgid "Panama"
+msgstr ""
+
+#: ../picard/const.py:121
+msgid "French Polynesia"
+msgstr ""
+
+#: ../picard/const.py:122
+msgid "Papua New Guinea"
+msgstr ""
+
+#: ../picard/const.py:123
+msgid "Per"
+msgstr ""
+
+#: ../picard/const.py:124
+msgid "Pakistan"
+msgstr ""
+
+#: ../picard/const.py:125
+msgid "Philippines"
+msgstr ""
+
+#: ../picard/const.py:126
+msgid "Pitcairn"
+msgstr ""
+
+#: ../picard/const.py:127
+msgid "Poland"
+msgstr ""
+
+#: ../picard/const.py:128
+msgid "St. Pierre and Miquelon"
+msgstr ""
+
+#: ../picard/const.py:129
+msgid "Zambia"
+msgstr ""
+
+#: ../picard/const.py:130
+msgid "Western Sahara"
+msgstr ""
+
+#: ../picard/const.py:131
+msgid "Estonia"
+msgstr ""
+
+#: ../picard/const.py:132
+msgid "Egypt"
+msgstr ""
+
+#: ../picard/const.py:133
+msgid "South Africa"
+msgstr ""
+
+#: ../picard/const.py:134
+msgid "Ecuador"
+msgstr ""
+
+#: ../picard/const.py:135
+#, fuzzy
+msgid "Italy"
+msgstr "Italiensk"
+
+#: ../picard/const.py:136
+#, fuzzy
+msgid "Viet Nam"
+msgstr "Filnavnformat:"
+
+#: ../picard/const.py:137
+msgid "Solomon Islands"
+msgstr ""
+
+#: ../picard/const.py:138
+msgid "Ethiopia"
+msgstr ""
+
+#: ../picard/const.py:139
+#, fuzzy
+msgid "Somalia"
+msgstr "Romansk"
+
+#: ../picard/const.py:140
+msgid "Zimbabwe"
+msgstr ""
+
+#: ../picard/const.py:141
+msgid "Saudi Arabia"
+msgstr ""
+
+#: ../picard/const.py:142
+#, fuzzy
+msgid "Spain"
+msgstr "Spansk"
+
+#: ../picard/const.py:143
+msgid "Eritrea"
+msgstr ""
+
+#: ../picard/const.py:144
+msgid "Moldova, Republic of"
+msgstr ""
+
+#: ../picard/const.py:145
+msgid "Madagascar"
+msgstr ""
+
+#: ../picard/const.py:146
+msgid "Morocco"
+msgstr ""
+
+#: ../picard/const.py:147
+#, fuzzy
+msgid "Monaco"
+msgstr "Mono"
+
+#: ../picard/const.py:148
+msgid "Uzbekistan"
+msgstr ""
+
+#: ../picard/const.py:149
+msgid "Myanmar"
+msgstr ""
+
+#: ../picard/const.py:150
+msgid "Mali"
+msgstr ""
+
+#: ../picard/const.py:151
+msgid "Maca"
+msgstr ""
+
+#: ../picard/const.py:152
+#, fuzzy
+msgid "Mongolia"
+msgstr "Mono"
+
+#: ../picard/const.py:153
+msgid "Marshall Islands"
+msgstr ""
+
+#: ../picard/const.py:154
+msgid "Macedonia, The Former Yugoslav Republic of"
+msgstr ""
+
+#: ../picard/const.py:155
+msgid "Mauritius"
+msgstr ""
+
+#: ../picard/const.py:156
+msgid "Malta"
+msgstr ""
+
+#: ../picard/const.py:157
+msgid "Malawi"
+msgstr ""
+
+#: ../picard/const.py:158
+msgid "Maldives"
+msgstr ""
+
+#: ../picard/const.py:159
+msgid "Martinique"
+msgstr ""
+
+#: ../picard/const.py:160
+msgid "Northern Mariana Islands"
+msgstr ""
+
+#: ../picard/const.py:161
+msgid "Montserrat"
+msgstr ""
+
+#: ../picard/const.py:162
+#, fuzzy
+msgid "Mauritania"
+msgstr "Litauisk"
+
+#: ../picard/const.py:163
+msgid "Uganda"
+msgstr ""
+
+#: ../picard/const.py:164
+msgid "Malaysia"
+msgstr ""
+
+#: ../picard/const.py:165
+msgid "Mexico"
+msgstr ""
+
+#: ../picard/const.py:166
+msgid "Israel"
+msgstr ""
+
+#: ../picard/const.py:167
+#, fuzzy
+msgid "France"
+msgstr "Avbryt"
+
+#: ../picard/const.py:168
+msgid "British Indian Ocean Territory"
+msgstr ""
+
+#: ../picard/const.py:169
+msgid "St. Helena"
+msgstr ""
+
+#: ../picard/const.py:170
+msgid "Finland"
+msgstr ""
+
+#: ../picard/const.py:171
+msgid "Fiji"
+msgstr ""
+
+#: ../picard/const.py:172
+msgid "Falkland Islands (Malvinas)"
+msgstr ""
+
+#: ../picard/const.py:173
+msgid "Micronesia, Federated States of"
+msgstr ""
+
+#: ../picard/const.py:174
+msgid "Faroe Islands"
+msgstr ""
+
+#: ../picard/const.py:175
+msgid "Nicaragua"
+msgstr ""
+
+#: ../picard/const.py:176
+msgid "Netherlands"
+msgstr ""
+
+#: ../picard/const.py:177
+msgid "Norway"
+msgstr ""
+
+#: ../picard/const.py:178
+msgid "Namibia"
+msgstr ""
+
+#: ../picard/const.py:179
+msgid "Vanuat"
+msgstr ""
+
+#: ../picard/const.py:180
+msgid "New Caledonia"
+msgstr ""
+
+#: ../picard/const.py:181
+#, fuzzy
+msgid "Niger"
+msgstr "Mikser"
+
+#: ../picard/const.py:182
+msgid "Norfolk Island"
+msgstr ""
+
+#: ../picard/const.py:183
+msgid "Nigeria"
+msgstr ""
+
+#: ../picard/const.py:184
+msgid "New Zealand"
+msgstr ""
+
+#: ../picard/const.py:185
+msgid "Zaire"
+msgstr ""
+
+#: ../picard/const.py:186
+msgid "Nepal"
+msgstr ""
+
+#: ../picard/const.py:187
+msgid "Naur"
+msgstr ""
+
+#: ../picard/const.py:188
+msgid "Niue"
+msgstr ""
+
+#: ../picard/const.py:189
+msgid "Cook Islands"
+msgstr ""
+
+#: ../picard/const.py:190
+msgid "Cote d'Ivoire"
+msgstr ""
+
+#: ../picard/const.py:191
+msgid "Switzerland"
+msgstr ""
+
+#: ../picard/const.py:192
+msgid "Colombia"
+msgstr ""
+
+#: ../picard/const.py:193
+msgid "China"
+msgstr ""
+
+#: ../picard/const.py:194
+msgid "Cameroon"
+msgstr ""
+
+#: ../picard/const.py:195
+#, fuzzy
+msgid "Chile"
+msgstr "Fil"
+
+#: ../picard/const.py:196
+msgid "Cocos (Keeling) Islands"
+msgstr ""
+
+#: ../picard/const.py:197
+msgid "Canada"
+msgstr ""
+
+#: ../picard/const.py:198
+#, fuzzy
+msgid "Congo"
+msgstr "Mono"
+
+#: ../picard/const.py:199
+msgid "Central African Republic"
+msgstr ""
+
+#: ../picard/const.py:200
+msgid "Czech Republic"
+msgstr ""
+
+#: ../picard/const.py:201
+msgid "Cyprus"
+msgstr ""
+
+#: ../picard/const.py:202
+msgid "Christmas Island"
+msgstr ""
+
+#: ../picard/const.py:203
+msgid "Costa Rica"
+msgstr ""
+
+#: ../picard/const.py:204
+msgid "Cape Verde"
+msgstr ""
+
+#: ../picard/const.py:205
+msgid "Cuba"
+msgstr ""
+
+#: ../picard/const.py:206
+msgid "Swaziland"
+msgstr ""
+
+#: ../picard/const.py:207
+msgid "Syrian Arab Republic"
+msgstr ""
+
+#: ../picard/const.py:208
+msgid "Kyrgyzstan"
+msgstr ""
+
+#: ../picard/const.py:209
+msgid "Kenya"
+msgstr ""
+
+#: ../picard/const.py:210
+msgid "Suriname"
+msgstr ""
+
+#: ../picard/const.py:211
+msgid "Kiribati"
+msgstr ""
+
+#: ../picard/const.py:212
+msgid "Cambodia"
+msgstr ""
+
+#: ../picard/const.py:213
+msgid "Saint Kitts and Nevis"
+msgstr ""
+
+#: ../picard/const.py:214
+#, fuzzy
+msgid "Comoros"
+msgstr "Farge"
+
+#: ../picard/const.py:215
+msgid "Sao Tome and Principe"
+msgstr ""
+
+#: ../picard/const.py:216
+#, fuzzy
+msgid "Slovenia"
+msgstr "Slovakisk"
+
+#: ../picard/const.py:217
+msgid "Kuwait"
+msgstr ""
+
+#: ../picard/const.py:218
+#, fuzzy
+msgid "Senegal"
+msgstr "Generelt"
+
+#: ../picard/const.py:219
+msgid "San Marino"
+msgstr ""
+
+#: ../picard/const.py:220
+msgid "Sierra Leone"
+msgstr ""
+
+#: ../picard/const.py:221
+msgid "Seychelles"
+msgstr ""
+
+#: ../picard/const.py:222
+msgid "Kazakhstan"
+msgstr ""
+
+#: ../picard/const.py:223
+msgid "Cayman Islands"
+msgstr ""
+
+#: ../picard/const.py:224
+msgid "Singapore"
+msgstr ""
+
+#: ../picard/const.py:225
+#, fuzzy
+msgid "Sweden"
+msgstr "Svensk"
+
+#: ../picard/const.py:226
+msgid "Sudan"
+msgstr ""
+
+#: ../picard/const.py:227
+msgid "Dominican Republic"
+msgstr ""
+
+#: ../picard/const.py:228
+#, fuzzy
+msgid "Dominica"
+msgstr "Romansk"
+
+#: ../picard/const.py:229
+#, fuzzy
+msgid "Djibouti"
+msgstr "Om..."
+
+#: ../picard/const.py:230
+msgid "Denmark"
+msgstr ""
+
+#: ../picard/const.py:231
+msgid "Virgin Islands (British)"
+msgstr ""
+
+#: ../picard/const.py:232
+#, fuzzy
+msgid "Germany"
+msgstr "Tysk"
+
+#: ../picard/const.py:233
+msgid "Yemen"
+msgstr ""
+
+#: ../picard/const.py:234
+msgid "Algeria"
+msgstr ""
+
+#: ../picard/const.py:235
+msgid "United States"
+msgstr ""
+
+#: ../picard/const.py:236
+msgid "Uruguay"
+msgstr ""
+
+#: ../picard/const.py:237
+msgid "Mayotte"
+msgstr ""
+
+#: ../picard/const.py:238
+msgid "United States Minor Outlying Islands"
+msgstr ""
+
+#: ../picard/const.py:239
+msgid "Lebanon"
+msgstr ""
+
+#: ../picard/const.py:240
+msgid "Saint Lucia"
+msgstr ""
+
+#: ../picard/const.py:241
+msgid "Lao People's Democratic Republic"
+msgstr ""
+
+#: ../picard/const.py:242
+msgid "Tuval"
+msgstr ""
+
+#: ../picard/const.py:243
+#, fuzzy
+msgid "Taiwan"
+msgstr "Italiensk"
+
+#: ../picard/const.py:244
+msgid "Trinidad and Tobago"
+msgstr ""
+
+#: ../picard/const.py:245
+msgid "Turkey"
+msgstr ""
+
+#: ../picard/const.py:246
+msgid "Sri Lanka"
+msgstr ""
+
+#: ../picard/const.py:247
+msgid "Liechtenstein"
+msgstr ""
+
+#: ../picard/const.py:248
+msgid "Latvia"
+msgstr ""
+
+#: ../picard/const.py:249
+msgid "Tonga"
+msgstr ""
+
+#: ../picard/const.py:250
+#, fuzzy
+msgid "Lithuania"
+msgstr "Litauisk"
+
+#: ../picard/const.py:251
+msgid "Luxembourg"
+msgstr ""
+
+#: ../picard/const.py:252
+msgid "Liberia"
+msgstr ""
+
+#: ../picard/const.py:253
+#, fuzzy
+msgid "Lesotho"
+msgstr "Lengde"
+
+#: ../picard/const.py:254
+msgid "Thailand"
+msgstr ""
+
+#: ../picard/const.py:255
+msgid "French Southern Territories"
+msgstr ""
+
+#: ../picard/const.py:256
+#, fuzzy
+msgid "Togo"
+msgstr "&Verktøy"
+
+#: ../picard/const.py:257
+msgid "Chad"
+msgstr ""
+
+#: ../picard/const.py:258
+msgid "Turks and Caicos Islands"
+msgstr ""
+
+#: ../picard/const.py:259
+msgid "Libyan Arab Jamahiriya"
+msgstr ""
+
+#: ../picard/const.py:260
+msgid "Vatican City State (Holy See)"
+msgstr ""
+
+#: ../picard/const.py:261
+msgid "Saint Vincent and The Grenadines"
+msgstr ""
+
+#: ../picard/const.py:262
+msgid "United Arab Emirates"
+msgstr ""
+
+#: ../picard/const.py:263
+msgid "Andorra"
+msgstr ""
+
+#: ../picard/const.py:264
+msgid "Antigua and Barbuda"
+msgstr ""
+
+#: ../picard/const.py:265
+msgid "Afghanistan"
+msgstr ""
+
+#: ../picard/const.py:266
+msgid "Anguilla"
+msgstr ""
+
+#: ../picard/const.py:267
+msgid "Virgin Islands (U.S.)"
+msgstr ""
+
+#: ../picard/const.py:268
+#, fuzzy
+msgid "Iceland"
+msgstr "Islandsk"
+
+#: ../picard/const.py:269
+msgid "Iran (Islamic Republic of)"
+msgstr ""
+
+#: ../picard/const.py:270
+msgid "Armenia"
+msgstr ""
+
+#: ../picard/const.py:271
+msgid "Albania"
+msgstr ""
+
+#: ../picard/const.py:272
+msgid "Angola"
+msgstr ""
+
+#: ../picard/const.py:273
+msgid "Netherlands Antilles"
+msgstr ""
+
+#: ../picard/const.py:274
+msgid "Antarctica"
+msgstr ""
+
+#: ../picard/const.py:275
+msgid "American Samoa"
+msgstr ""
+
+#: ../picard/const.py:276
+msgid "Argentina"
+msgstr ""
+
+#: ../picard/const.py:277
+#, fuzzy
+msgid "Australia"
+msgstr "Italiensk"
+
+#: ../picard/const.py:278
+#, fuzzy
+msgid "Austria"
+msgstr "Forfatter"
+
+#: ../picard/const.py:279
+msgid "Aruba"
+msgstr ""
+
+#: ../picard/const.py:280
+#, fuzzy
+msgid "India"
+msgstr "Lokal Metadata"
+
+#: ../picard/const.py:281
+msgid "Tanzania, United Republic of"
+msgstr ""
+
+#: ../picard/const.py:282
+msgid "Azerbaijan"
+msgstr ""
+
+#: ../picard/const.py:283
+#, fuzzy
+msgid "Ireland"
+msgstr "Islandsk"
+
+#: ../picard/const.py:284
+msgid "Indonesia"
+msgstr ""
+
+#: ../picard/const.py:285
+msgid "Ukraine"
+msgstr ""
+
+#: ../picard/const.py:286
+#, fuzzy
+msgid "Qatar"
+msgstr "Senere"
+
+#: ../picard/const.py:287
+msgid "Mozambique"
+msgstr ""
+
+#: ../picard/const.py:288
+msgid "Bosnia and Herzegovina"
+msgstr ""
+
+#: ../picard/const.py:289
+msgid "Congo, The Democratic Republic of the"
+msgstr ""
+
+#: ../picard/const.py:290
+msgid "Serbia and Montenegro"
+msgstr ""
+
+#: ../picard/const.py:291
+msgid "Croatia"
+msgstr ""
+
+#: ../picard/const.py:292
+msgid "Korea (North), Democratic People's Republic of"
+msgstr ""
+
+#: ../picard/const.py:293
+msgid "Korea (South), Republic of"
+msgstr ""
+
+#: ../picard/const.py:294
+#, fuzzy
+msgid "Slovakia"
+msgstr "Slovakisk"
+
+#: ../picard/const.py:295
+msgid "Soviet Union (historical, 1922-1991)"
+msgstr ""
+
+#: ../picard/const.py:296
+msgid "East Timor"
+msgstr ""
+
+#: ../picard/const.py:297
+msgid "Czechoslovakia (historical, 1918-1992)"
+msgstr ""
+
+#: ../picard/const.py:298
+msgid "Europe"
+msgstr ""
+
+#: ../picard/const.py:299
+msgid "East Germany (historical, 1949-1990)"
+msgstr ""
+
+#: ../picard/const.py:300
+msgid "[Unknown Country]"
+msgstr ""
+
+#: ../picard/const.py:301
+msgid "[Worldwide]"
+msgstr ""
+
+#: ../picard/const.py:302
+msgid "Yugoslavia (historical, 1918-1992)"
+msgstr ""
+
+#: ../picard/const.py:307
+#, fuzzy
+msgid "Catalan"
+msgstr "Italiensk"
+
+#: ../picard/const.py:308
+msgid "Czech"
+msgstr "Tsjekkisk"
+
+#: ../picard/const.py:309
+msgid "Welsh"
+msgstr ""
+
+#: ../picard/const.py:310
+#, fuzzy
+msgid "Danish"
+msgstr "Spansk"
+
+#: ../picard/const.py:311
+msgid "German"
+msgstr "Tysk"
+
+#: ../picard/const.py:312
+msgid "English"
+msgstr "Engelsk"
+
+#: ../picard/const.py:313
+#, fuzzy
+msgid "English (Canada)"
+msgstr "Britisk Engelsk"
+
+#: ../picard/const.py:314
+msgid "English (UK)"
+msgstr "Britisk Engelsk"
+
+#: ../picard/const.py:315
+msgid "Spanish"
+msgstr "Spansk"
+
+#: ../picard/const.py:316
+#, fuzzy
+msgid "Persian"
+msgstr "Versjon"
+
+#: ../picard/const.py:317
+msgid "Finnish"
+msgstr "Finsk"
+
+#: ../picard/const.py:318
+msgid "French"
+msgstr "Fransk"
+
+#: ../picard/const.py:319
+msgid "Frisian"
+msgstr ""
+
+#: ../picard/const.py:320
+msgid "Hebrew"
+msgstr ""
+
+#: ../picard/const.py:321
+msgid "Hungarian"
+msgstr "Ungarsk"
+
+#: ../picard/const.py:322
+#, fuzzy
+msgid "Islandic"
+msgstr "Islandsk"
+
+#: ../picard/const.py:323
+msgid "Italian"
+msgstr "Italiensk"
+
+#: ../picard/const.py:324
+msgid "Kannada"
+msgstr ""
+
+#: ../picard/const.py:325
+msgid "Korean"
+msgstr "Koreansk"
+
+#: ../picard/const.py:326
+msgid "Lithuanian"
+msgstr "Litauisk"
+
+#: ../picard/const.py:327
+msgid "Norwegian Bokmal"
+msgstr "Norsk (bokmål)"
+
+#: ../picard/const.py:328
+msgid "Dutch"
+msgstr "Nederlandsk"
+
+#: ../picard/const.py:329
+#, fuzzy
+msgid "Polish"
+msgstr "Engelsk"
+
+#: ../picard/const.py:330
+msgid "Portuguese"
+msgstr "Portugisisk"
+
+#: ../picard/const.py:331
+#, fuzzy
+msgid "Brazilian Portuguese"
+msgstr "Portugisisk"
+
+#: ../picard/const.py:332
+msgid "Romanian"
+msgstr "Romansk"
+
+#: ../picard/const.py:333
+msgid "Russian"
+msgstr "Russisk"
+
+#: ../picard/const.py:334
+#, fuzzy
+msgid "Scots"
+msgstr "Poeng"
+
+#: ../picard/const.py:335
+msgid "Slovak"
+msgstr "Slovakisk"
+
+#: ../picard/const.py:336
+#, fuzzy
+msgid "Slovenian"
+msgstr "Slovakisk"
+
+#: ../picard/const.py:337
+msgid "Swedish"
+msgstr "Svensk"
+
+#: ../picard/const.py:338
+msgid "Chinese"
+msgstr ""
+
+#: ../picard/file.py:475
+#, python-format
+msgid "No matching tracks for file %s"
+msgstr "Ingen treff for filen %s"
+
+#: ../picard/file.py:492
+#, fuzzy, python-format
+msgid "No matching tracks above the threshold for file %s"
+msgstr "Ingen treff for filen %s"
+
+#: ../picard/file.py:495
+#, python-format
+msgid "File %s identified!"
+msgstr "Filen %s er identifisert!"
+
+#: ../picard/file.py:506
+#, fuzzy, python-format
+msgid "Looking up the PUID for file %s..."
+msgstr "Ser etter PUID merke for fil %s ..."
+
+#: ../picard/file.py:511
+#, fuzzy, python-format
+msgid "Looking up the metadata for file %s..."
+msgstr "Henter metadata for fil %s ..."
+
+#: ../picard/puidmanager.py:58
+#, fuzzy
+msgid "Submitting PUIDs..."
+msgstr "Send PUID merker"
+
+#: ../picard/puidmanager.py:64
+#, python-format
+msgid "PUIDs submission failed: %s"
+msgstr "Innsending av PUID-er feilet: %s"
+
+#: ../picard/puidmanager.py:66
+#, fuzzy
+msgid "PUIDs successfully submitted!"
+msgstr "PUID merker sent."
+
+#: ../picard/playlist.py:31
+msgid "M3U Playlist (*.m3u)"
+msgstr "M3U-spilleliste (*.m3u)"
+
+#: ../picard/playlist.py:32
+msgid "PLS Playlist (*.pls)"
+msgstr "PLS-spilleliste (*.pls)"
+
+#: ../picard/playlist.py:33
+msgid "XSPF Playlist (*.xspf)"
+msgstr "XSPF-spilleliste (*.xspf)"
+
+#: ../picard/tagger.py:476
 msgid "CD Lookup Error"
 msgstr ""
 
-#: ../picard/tagger.py:473
+#: ../picard/tagger.py:477
 #, python-format
 msgid ""
 "Error while reading CD:\n"
@@ -42,125 +1324,173 @@ msgid ""
 "%s"
 msgstr ""
 
-#: ../picard/ui/passworddialog.py:38
+#: ../picard/tagger.py:503
 #, python-format
-msgid ""
-"The server %s requires you to login. Please enter your username and password."
-msgstr ""
+msgid "Couldn't find PUID for file %s"
+msgstr "Kunne ikke funne PUID for filen %s"
 
-#: ../picard/ui/ui_options_script.py:52
-msgid "Tagger Script"
-msgstr ""
+#: ../picard/musicdns/__init__.py:98
+#, fuzzy, python-format
+msgid "Looking up the fingerprint for file %s..."
+msgstr "Lager fingeravtrykk for filen %s..."
+
+#: ../picard/musicdns/__init__.py:117
+#, python-format
+msgid "Creating fingerprint for file %s..."
+msgstr "Lager fingeravtrykk for filen %s..."
 
 #: ../picard/ui/cdlookup.py:31
 msgid "Score"
 msgstr "Poeng"
 
 #: ../picard/ui/cdlookup.py:31
+#: ../picard/ui/itemviews.py:82
+#: ../picard/util/tags.py:23
 msgid "Title"
 msgstr ""
 
-#: ../picard/ui/cdlookup.py:31 ../picard/ui/mainwindow.py:436
+#: ../picard/ui/cdlookup.py:31
+#: ../picard/ui/itemviews.py:84
+#: ../picard/ui/mainwindow.py:436
+#: ../picard/util/tags.py:22
 msgid "Artist"
 msgstr "Artist"
 
-#: ../picard/ui/ui_metadata.py:121
-msgid "Lookup"
-msgstr "Lookup"
+#: ../picard/ui/coverartbox.py:47
+#: ../picard/ui/options/cover.py:29
+msgid "Cover Art"
+msgstr "Plateomslag"
 
-#: ../picard/ui/ui_metadata.py:122
-msgid "Title:"
+#: ../picard/ui/coverartbox.py:95
+msgid "Buy the album on Amazon"
+msgstr "Kjøp albumet på Amazon"
+
+#: ../picard/ui/filebrowser.py:38
+#: ../picard/ui/mainwindow.py:302
+msgid "&Refresh"
 msgstr ""
 
-#: ../picard/ui/ui_metadata.py:123
-msgid "Date:"
+#: ../picard/ui/filebrowser.py:41
+msgid "&Move Tagged Files Here"
 msgstr ""
 
-#: ../picard/ui/ui_metadata.py:124
-msgid "Artist:"
+#: ../picard/ui/filebrowser.py:44
+msgid "Show &Hidden Files"
 msgstr ""
 
-#: ../picard/ui/ui_metadata.py:125
-msgid "Track:"
+#: ../picard/ui/itemviews.py:83
+msgid "Length"
+msgstr "Lengde"
+
+#: ../picard/ui/itemviews.py:327
+msgid "&Releases"
 msgstr ""
 
-#: ../picard/ui/ui_metadata.py:126
-msgid "0000-00-00; "
+#: ../picard/ui/itemviews.py:353
+msgid "&Plugins"
 msgstr ""
 
-#: ../picard/ui/ui_metadata.py:127 ../picard/ui/tageditor.py:225
-#: ../picard/ui/multitageditor.py:181
+#: ../picard/ui/itemviews.py:523
+msgid "Clusters"
+msgstr ""
+
+#: ../picard/ui/logview.py:29
+msgid "Log"
+msgstr "Logg"
+
+#: ../picard/ui/puidsubmit.py:31
+#: ../picard/ui/options/plugins.py:80
+msgid "File"
+msgstr "Fil"
+
+#: ../picard/ui/puidsubmit.py:31
+msgid "PUID"
+msgstr ""
+
+#: ../picard/ui/puidsubmit.py:31
+#: ../picard/ui/mainwindow.py:437
+msgid "Track"
+msgstr "Tittel"
+
+#: ../picard/ui/puidsubmit.py:31
+msgid "Release"
+msgstr ""
+
+#: ../picard/ui/puidsubmit.py:31
+msgid "Release ID"
+msgstr ""
+
+#: ../picard/ui/tageditor.py:65
+#: ../picard/ui/ui_options_plugins.py:62
+msgid "Details"
+msgstr ""
+
+#: ../picard/ui/tageditor.py:70
+#: ../picard/ui/tageditor.py:241
+#, python-format
+msgid "%d file"
+msgid_plural "%d files"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../picard/ui/tageditor.py:124
+#, python-format
+msgid "(different across %d file)"
+msgid_plural "(different across %d files)"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../picard/ui/tageditor.py:127
+#, python-format
+msgid "(missing from %d file)"
+msgid_plural "(missing from %d files)"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../picard/ui/tageditor.py:210
+msgid "Filename:"
+msgstr ""
+
+#: ../picard/ui/tageditor.py:212
+msgid "Format:"
+msgstr "Format:"
+
+#: ../picard/ui/tageditor.py:221
+msgid "Size:"
+msgstr "Størrelse:"
+
+#: ../picard/ui/tageditor.py:225
+#: ../picard/ui/ui_metadata.py:127
 msgid "Length:"
 msgstr "Lengde:"
 
-#: ../picard/ui/ui_metadata.py:128
-msgid "Album:"
+#: ../picard/ui/tageditor.py:227
+msgid "Bitrate:"
+msgstr "Bitrate:"
+
+#: ../picard/ui/tageditor.py:229
+msgid "Sample rate:"
+msgstr "Samplingsrate:"
+
+#: ../picard/ui/tageditor.py:231
+msgid "Bits per sample:"
+msgstr "Bits per sample:"
+
+#: ../picard/ui/tageditor.py:234
+msgid "Mono"
+msgstr "Mono"
+
+#: ../picard/ui/tageditor.py:235
+msgid "Stereo"
+msgstr "Stereo"
+
+#: ../picard/ui/tageditor.py:237
+msgid "Channels:"
 msgstr ""
 
-#: ../picard/ui/ui_passworddialog.py:78
-#, fuzzy
-msgid "Authentication required"
-msgstr "Unicode er nødvendig"
-
-#: ../picard/ui/ui_passworddialog.py:79 ../picard/ui/ui_options_proxy.py:83
-#: ../picard/ui/ui_options_general.py:113
-msgid "Username:"
-msgstr ""
-
-#: ../picard/ui/ui_passworddialog.py:80 ../picard/ui/ui_options_proxy.py:82
-#: ../picard/ui/ui_options_general.py:112
-msgid "Password:"
-msgstr ""
-
-#: ../picard/ui/ui_passworddialog.py:81
-msgid "Save username and password"
-msgstr ""
-
-#: ../picard/ui/ui_options_folksonomy.py:114
-#: ../picard/ui/ui_options_folksonomy_tags.py:114
-msgid "Folksonomy Tags"
-msgstr ""
-
-#: ../picard/ui/ui_options_folksonomy.py:115
-#: ../picard/ui/ui_options_folksonomy_tags.py:115
-msgid "Ignore tags:"
-msgstr ""
-
-#: ../picard/ui/ui_options_folksonomy.py:116
-#: ../picard/ui/ui_options_folksonomy_tags.py:116
-msgid "Minimal tag usage:"
-msgstr ""
-
-#: ../picard/ui/ui_options_folksonomy.py:117
-#: ../picard/ui/ui_options_folksonomy_tags.py:117
-#: ../picard/ui/ui_options_matching.py:107
-#: ../picard/ui/ui_options_matching.py:108
-#: ../picard/ui/ui_options_matching.py:109
-#: ../picard/ui/ui_options_matching.py:113
-msgid " %"
-msgstr " %"
-
-#: ../picard/ui/ui_options_folksonomy.py:118
-msgid "Maximum number of tags:"
-msgstr ""
-
-#: ../picard/ui/ui_options_folksonomy.py:119
-#: ../picard/ui/ui_options_folksonomy_tags.py:119
-msgid "Join multiple tags with:"
-msgstr ""
-
-#: ../picard/ui/ui_options_folksonomy.py:120
-#: ../picard/ui/ui_options_folksonomy_tags.py:120
-msgid " / "
-msgstr " / "
-
-#: ../picard/ui/ui_options_folksonomy.py:121
-#: ../picard/ui/ui_options_folksonomy_tags.py:121
-msgid ", "
-msgstr ", "
-
-#: ../picard/ui/ui_options_folksonomy_tags.py:118
-msgid "Maximal number of tags:"
+#: ../picard/ui/tagsfromfilenames.py:52
+#: ../picard/ui/tagsfromfilenames.py:96
+msgid "File Name"
 msgstr ""
 
 #: ../picard/ui/mainwindow.py:64
@@ -296,7 +1626,8 @@ msgstr "Søk"
 msgid "&CD Lookup..."
 msgstr ""
 
-#: ../picard/ui/mainwindow.py:272 ../picard/ui/mainwindow.py:273
+#: ../picard/ui/mainwindow.py:272
+#: ../picard/ui/mainwindow.py:273
 msgid "Lookup CD"
 msgstr ""
 
@@ -327,7 +1658,8 @@ msgstr "Ctrl+U"
 msgid "&Lookup"
 msgstr ""
 
-#: ../picard/ui/mainwindow.py:291 ../picard/ui/mainwindow.py:292
+#: ../picard/ui/mainwindow.py:291
+#: ../picard/ui/mainwindow.py:292
 msgid "Lookup metadata"
 msgstr ""
 
@@ -340,10 +1672,6 @@ msgstr "Ctrl+L"
 msgid "&Details..."
 msgstr ""
 
-#: ../picard/ui/mainwindow.py:302 ../picard/ui/filebrowser.py:38
-msgid "&Refresh"
-msgstr ""
-
 #: ../picard/ui/mainwindow.py:305
 msgid "Generate &Playlist..."
 msgstr ""
@@ -389,6 +1717,7 @@ msgid "&Tools"
 msgstr "&Verktøy"
 
 #: ../picard/ui/mainwindow.py:384
+#: ../picard/ui/util.py:33
 msgid "&Help"
 msgstr "&Hjelp"
 
@@ -401,13 +1730,10 @@ msgid "&Search Bar"
 msgstr ""
 
 #: ../picard/ui/mainwindow.py:435
+#: ../picard/util/tags.py:21
 msgid "Album"
 msgstr "Album"
 
-#: ../picard/ui/mainwindow.py:437 ../picard/ui/puidsubmit.py:31
-msgid "Track"
-msgstr "Tittel"
-
 #: ../picard/ui/mainwindow.py:476
 msgid "All Supported Formats"
 msgstr "Alle støttede formater"
@@ -422,37 +1748,291 @@ msgstr "Lagrer spilleliste %s..."
 msgid "Playlist %s saved"
 msgstr ""
 
-#: ../picard/ui/mainwindow.py:638 ../picard/ui/mainwindow.py:647
+#: ../picard/ui/mainwindow.py:638
+#: ../picard/ui/mainwindow.py:647
 #, python-format
 msgid " (Error: %s)"
 msgstr " (Feil: %s)"
 
+#: ../picard/ui/ui_tageditor.py:115
+#: ../picard/ui/ui_options_plugins.py:59
+#: ../picard/ui/options/plugins.py:76
+msgid "Name"
+msgstr ""
+
+#: ../picard/ui/ui_tageditor.py:116
+msgid "Value"
+msgstr "Verdi"
+
+#: ../picard/ui/ui_tageditor.py:117
+msgid "&Add..."
+msgstr ""
+
+#: ../picard/ui/ui_tageditor.py:118
+msgid "&Edit..."
+msgstr ""
+
+#: ../picard/ui/ui_tageditor.py:119
+msgid "&Delete"
+msgstr ""
+
+#: ../picard/ui/ui_tageditor.py:120
+msgid "&Metadata"
+msgstr ""
+
+#: ../picard/ui/ui_tageditor.py:121
+msgid "A&rtwork"
+msgstr ""
+
+#: ../picard/ui/ui_tageditor.py:122
+msgid "&Info"
+msgstr ""
+
+#: ../picard/ui/passworddialog.py:38
+#, python-format
+msgid "The server %s requires you to login. Please enter your username and password."
+msgstr ""
+
+#: ../picard/ui/ui_cdlookup.py:60
+#: ../picard/ui/ui_options_cdlookup.py:47
+#: ../picard/ui/ui_options_cdlookup_win32.py:56
+#: ../picard/ui/options/cdlookup.py:35
+msgid "CD Lookup"
+msgstr "CD Lookup"
+
+#: ../picard/ui/ui_cdlookup.py:61
+msgid "The following releases on MusicBrainz match the CD:"
+msgstr "De følgende album på MusicBrainz matcher CDen:"
+
+#: ../picard/ui/ui_cdlookup.py:62
+#: ../picard/ui/ui_puidsubmit.py:53
+msgid "OK"
+msgstr "OK"
+
+#: ../picard/ui/ui_cdlookup.py:63
+msgid "    Lookup manually    "
+msgstr "    Manuelt oppslag    "
+
+#: ../picard/ui/ui_cdlookup.py:64
+#: ../picard/ui/ui_puidsubmit.py:54
+msgid "Cancel"
+msgstr "Avbryt"
+
+#: ../picard/ui/ui_passworddialog.py:78
+#, fuzzy
+msgid "Authentication required"
+msgstr "Unicode er nødvendig"
+
+#: ../picard/ui/ui_passworddialog.py:79
+#: ../picard/ui/ui_options_general.py:113
+#: ../picard/ui/ui_options_proxy.py:83
+msgid "Username:"
+msgstr ""
+
+#: ../picard/ui/ui_passworddialog.py:80
+#: ../picard/ui/ui_options_general.py:112
+#: ../picard/ui/ui_options_proxy.py:82
+msgid "Password:"
+msgstr ""
+
+#: ../picard/ui/ui_passworddialog.py:81
+msgid "Save username and password"
+msgstr ""
+
 #: ../picard/ui/ui_edittagdialog.py:44
 msgid "Edit Tag"
 msgstr ""
 
-#: ../picard/ui/ui_options_proxy.py:81
-msgid "Web Proxy"
-msgstr "Web Proxy"
+#: ../picard/ui/ui_metadata.py:121
+msgid "Lookup"
+msgstr "Lookup"
 
-#: ../picard/ui/ui_options_proxy.py:84 ../picard/ui/ui_options_general.py:109
-msgid "Port:"
+#: ../picard/ui/ui_metadata.py:122
+msgid "Title:"
 msgstr ""
 
-#: ../picard/ui/ui_options_proxy.py:85 ../picard/ui/ui_options_general.py:110
-msgid "Server address:"
-msgstr "Tjeneradresse:"
-
-#: ../picard/ui/ui_tagsfromfilenames.py:56
-msgid "Convert File Names to Tags"
+#: ../picard/ui/ui_metadata.py:123
+msgid "Date:"
 msgstr ""
 
-#: ../picard/ui/ui_tagsfromfilenames.py:57
-msgid "Replace underscores with spaces"
-msgstr "Erstatt understreker med mellomrom"
+#: ../picard/ui/ui_metadata.py:124
+msgid "Artist:"
+msgstr ""
+
+#: ../picard/ui/ui_metadata.py:125
+msgid "Track:"
+msgstr ""
+
+#: ../picard/ui/ui_metadata.py:126
+msgid "0000-00-00; "
+msgstr ""
+
+#: ../picard/ui/ui_metadata.py:128
+msgid "Album:"
+msgstr ""
+
+#: ../picard/ui/ui_options.py:42
+msgid "Options"
+msgstr ""
+
+#: ../picard/ui/ui_options_cdlookup.py:48
+msgid "CD-ROM device to use for lookups:"
+msgstr ""
+
+#: ../picard/ui/ui_options_cdlookup_win32.py:57
+msgid "Default CD-ROM drive to use for lookups:"
+msgstr ""
+
+#: ../picard/ui/ui_options_cover.py:56
+msgid "Location"
+msgstr ""
+
+#: ../picard/ui/ui_options_cover.py:57
+msgid "Embed cover images into tags"
+msgstr "Legg cover til filtaggene"
+
+#: ../picard/ui/ui_options_cover.py:58
+msgid "Save cover images as separate files"
+msgstr "Lagre plateomslag som egne filer"
+
+#: ../picard/ui/ui_options_cover.py:59
+msgid "Overwrite the file if it already exists"
+msgstr "Overskrive filen hvis den eksisterer?"
+
+#: ../picard/ui/util.py:31
+msgid "&Ok"
+msgstr "&Ok"
+
+#: ../picard/ui/util.py:32
+#, fuzzy
+msgid "&Cancel"
+msgstr "Avbryt"
+
+#: ../picard/ui/ui_puidsubmit.py:52
+msgid "Submit PUIDs"
+msgstr "Send PUID merker"
+
+#: ../picard/ui/ui_options_folksonomy.py:114
+#: ../picard/ui/options/folksonomy.py:29
+msgid "Folksonomy Tags"
+msgstr ""
+
+#: ../picard/ui/ui_options_folksonomy.py:115
+msgid "Ignore tags:"
+msgstr ""
+
+#: ../picard/ui/ui_options_folksonomy.py:116
+msgid "Minimal tag usage:"
+msgstr ""
+
+#: ../picard/ui/ui_options_folksonomy.py:117
+#: ../picard/ui/ui_options_matching.py:107
+#: ../picard/ui/ui_options_matching.py:108
+#: ../picard/ui/ui_options_matching.py:109
+#: ../picard/ui/ui_options_matching.py:113
+msgid " %"
+msgstr " %"
+
+#: ../picard/ui/ui_options_folksonomy.py:118
+msgid "Maximum number of tags:"
+msgstr ""
+
+#: ../picard/ui/ui_options_folksonomy.py:119
+msgid "Join multiple tags with:"
+msgstr ""
+
+#: ../picard/ui/ui_options_folksonomy.py:120
+msgid " / "
+msgstr " / "
+
+#: ../picard/ui/ui_options_folksonomy.py:121
+msgid ", "
+msgstr ", "
+
+#: ../picard/ui/ui_options_interface.py:50
+msgid "Miscellaneous"
+msgstr ""
+
+#: ../picard/ui/ui_options_interface.py:51
+msgid "Show text labels under icons"
+msgstr ""
+
+#: ../picard/ui/ui_options_interface.py:52
+msgid "Allow selection of multiple directories"
+msgstr ""
+
+#: ../picard/ui/ui_options_interface.py:53
+msgid "Use advanced query syntax"
+msgstr ""
+
+#: ../picard/ui/ui_options_interface.py:54
+#, fuzzy
+msgid "User interface language:"
+msgstr "Velg språk"
+
+#: ../picard/ui/ui_options_naming.py:165
+msgid "Rename Files"
+msgstr ""
+
+#: ../picard/ui/ui_options_naming.py:166
+msgid "Replace Windows-incompatible characters"
+msgstr "Bytt ut Windows-inkompatible tegn"
+
+#: ../picard/ui/ui_options_naming.py:167
+msgid "Replace non-ASCII characters"
+msgstr "Bytt ut ikke-ASCII tegn"
+
+#: ../picard/ui/ui_options_naming.py:168
+#: ../picard/ui/ui_options_naming.py:169
+#: ../picard/ui/ui_options_metadata.py:109
+#: ../picard/ui/ui_options_metadata.py:110
+msgid "Default"
+msgstr "Standard"
+
+#: ../picard/ui/ui_options_naming.py:170
+#: ../picard/ui/options/naming.py:90
+msgid "Multiple artist file naming format:"
+msgstr "Filnavnformat for multiple artister:"
+
+#: ../picard/ui/ui_options_naming.py:171
+#: ../picard/ui/options/naming.py:86
+msgid "File naming format:"
+msgstr "Filnavnformat:"
+
+#: ../picard/ui/ui_options_naming.py:172
+msgid "Move Files"
+msgstr ""
+
+#: ../picard/ui/ui_options_naming.py:173
+msgid "Move tagged files to this directory:"
+msgstr ""
+
+#: ../picard/ui/ui_options_naming.py:174
+msgid "Browse..."
+msgstr ""
+
+#: ../picard/ui/ui_options_naming.py:175
+msgid "Move additional files:"
+msgstr ""
+
+#: ../picard/ui/ui_options_naming.py:176
+msgid "Delete empty directories"
+msgstr ""
+
+#: ../picard/ui/ui_options_naming.py:177
+msgid "Example"
+msgstr "Eksempel"
+
+#: ../picard/ui/ui_options_naming.py:178
+msgid "File name:"
+msgstr ""
+
+#: ../picard/ui/ui_options_naming.py:179
+msgid "Multiple artist file name:"
+msgstr ""
 
-#: ../picard/ui/ui_tagsfromfilenames.py:58
 #: ../picard/ui/ui_options_naming.py:180
+#: ../picard/ui/ui_tagsfromfilenames.py:58
 msgid "&Preview"
 msgstr "&Forhåndsvis"
 
@@ -460,11 +2040,22 @@ msgstr "&Forhåndsvis"
 msgid "MusicBrainz Server"
 msgstr ""
 
+#: ../picard/ui/ui_options_general.py:109
+#: ../picard/ui/ui_options_proxy.py:84
+msgid "Port:"
+msgstr ""
+
+#: ../picard/ui/ui_options_general.py:110
+#: ../picard/ui/ui_options_proxy.py:85
+msgid "Server address:"
+msgstr "Tjeneradresse:"
+
 #: ../picard/ui/ui_options_general.py:111
 msgid "Account Information"
 msgstr "Kontoinformasjon"
 
 #: ../picard/ui/ui_options_general.py:114
+#: ../picard/ui/options/general.py:29
 msgid "General"
 msgstr "Generelt"
 
@@ -472,34 +2063,6 @@ msgstr "Generelt"
 msgid "Automatically scan all new files"
 msgstr ""
 
-#: ../picard/ui/ui_options_interface.py:46
-msgid "Miscellaneous"
-msgstr ""
-
-#: ../picard/ui/ui_options_interface.py:47
-msgid "Show text labels under icons"
-msgstr ""
-
-#: ../picard/ui/ui_options_interface.py:48
-msgid "Allow selection of multiple directories"
-msgstr ""
-
-#: ../picard/ui/ui_options_interface.py:49
-msgid "Use advanced query syntax"
-msgstr ""
-
-#: ../picard/ui/itemviews.py:327
-msgid "&Releases"
-msgstr ""
-
-#: ../picard/ui/itemviews.py:353
-msgid "&Plugins"
-msgstr ""
-
-#: ../picard/ui/itemviews.py:523
-msgid "Clusters"
-msgstr ""
-
 #: ../picard/ui/ui_options_matching.py:105
 msgid "Thresholds"
 msgstr "Terskler"
@@ -520,6 +2083,68 @@ msgstr "Minste likhet for gruppeoppslag:"
 msgid "Minimal similarity for PUID lookups:"
 msgstr "Minste likhet for PUID oppslag:"
 
+#: ../picard/ui/ui_options_metadata.py:100
+#: ../picard/ui/options/metadata.py:31
+msgid "Metadata"
+msgstr ""
+
+#: ../picard/ui/ui_options_metadata.py:101
+msgid "Translate foreign artist names to English where possible"
+msgstr ""
+
+#: ../picard/ui/ui_options_metadata.py:102
+msgid "Use release relationships"
+msgstr ""
+
+#: ../picard/ui/ui_options_metadata.py:103
+msgid "Use track relationships"
+msgstr ""
+
+#: ../picard/ui/ui_options_metadata.py:104
+msgid "Use folksonomy tags as genre"
+msgstr ""
+
+#: ../picard/ui/ui_options_metadata.py:105
+#, fuzzy
+msgid "Preferred release country:"
+msgstr "Utgivelsesdato"
+
+#: ../picard/ui/ui_options_metadata.py:106
+msgid "Custom Fields"
+msgstr ""
+
+#: ../picard/ui/ui_options_metadata.py:107
+msgid "Various artists:"
+msgstr "Diverse artister:"
+
+#: ../picard/ui/ui_options_metadata.py:108
+msgid "Non-album tracks:"
+msgstr "Albumløse spor:"
+
+#: ../picard/ui/ui_options_plugins.py:58
+#: ../picard/ui/options/plugins.py:30
+msgid "Plugins"
+msgstr ""
+
+#: ../picard/ui/ui_options_plugins.py:60
+#: ../picard/ui/options/plugins.py:79
+msgid "Author"
+msgstr "Forfatter"
+
+#: ../picard/ui/ui_options_plugins.py:61
+#: ../picard/util/tags.py:36
+msgid "Version"
+msgstr "Versjon"
+
+#: ../picard/ui/ui_options_proxy.py:81
+#: ../picard/ui/options/proxy.py:28
+msgid "Web Proxy"
+msgstr "Web Proxy"
+
+#: ../picard/ui/ui_options_script.py:52
+msgid "Tagger Script"
+msgstr ""
+
 #: ../picard/ui/ui_options_tags.py:105
 msgid "Common"
 msgstr "Felles"
@@ -572,333 +2197,27 @@ msgstr "APE"
 msgid "Remove APEv2 tags from MP3 files"
 msgstr ""
 
-#: ../picard/ui/ui_options_cdlookup_win32.py:56 ../picard/ui/ui_cdlookup.py:60
-#: ../picard/ui/ui_options_cdlookup.py:47
-msgid "CD Lookup"
-msgstr "CD Lookup"
-
-#: ../picard/ui/ui_options_cdlookup_win32.py:57
-msgid "Default CD-ROM drive to use for lookups:"
+#: ../picard/ui/ui_tagsfromfilenames.py:56
+msgid "Convert File Names to Tags"
 msgstr ""
 
-#: ../picard/ui/tageditor.py:65 ../picard/ui/ui_options_plugins.py:62
-#: ../picard/ui/multitageditor.py:37
-msgid "Details"
-msgstr ""
+#: ../picard/ui/ui_tagsfromfilenames.py:57
+msgid "Replace underscores with spaces"
+msgstr "Erstatt understreker med mellomrom"
 
-#: ../picard/ui/tageditor.py:70 ../picard/ui/tageditor.py:241
-#: ../picard/ui/multitageditor.py:42 ../picard/ui/multitageditor.py:197
-#, python-format
-msgid "%d file"
-msgid_plural "%d files"
-msgstr[0] ""
-msgstr[1] ""
-
-#: ../picard/ui/tageditor.py:124 ../picard/ui/multitageditor.py:95
-#, python-format
-msgid "(different across %d file)"
-msgid_plural "(different across %d files)"
-msgstr[0] ""
-msgstr[1] ""
-
-#: ../picard/ui/tageditor.py:127 ../picard/ui/multitageditor.py:98
-#, python-format
-msgid "(missing from %d file)"
-msgid_plural "(missing from %d files)"
-msgstr[0] ""
-msgstr[1] ""
-
-#: ../picard/ui/tageditor.py:210 ../picard/ui/multitageditor.py:166
-msgid "Filename:"
-msgstr ""
-
-#: ../picard/ui/tageditor.py:212 ../picard/ui/multitageditor.py:168
-msgid "Format:"
-msgstr "Format:"
-
-#: ../picard/ui/tageditor.py:221 ../picard/ui/multitageditor.py:177
-msgid "Size:"
-msgstr "Størrelse:"
-
-#: ../picard/ui/tageditor.py:227 ../picard/ui/multitageditor.py:183
-msgid "Bitrate:"
-msgstr "Bitrate:"
-
-#: ../picard/ui/tageditor.py:229 ../picard/ui/multitageditor.py:185
-msgid "Sample rate:"
-msgstr "Samplingsrate:"
-
-#: ../picard/ui/tageditor.py:231 ../picard/ui/multitageditor.py:187
-msgid "Bits per sample:"
-msgstr "Bits per sample:"
-
-#: ../picard/ui/tageditor.py:234 ../picard/ui/multitageditor.py:190
-msgid "Mono"
-msgstr "Mono"
-
-#: ../picard/ui/tageditor.py:235 ../picard/ui/multitageditor.py:191
-msgid "Stereo"
-msgstr "Stereo"
-
-#: ../picard/ui/tageditor.py:237 ../picard/ui/multitageditor.py:193
-msgid "Channels:"
-msgstr ""
-
-#: ../picard/ui/ui_tageditor.py:115 ../picard/ui/ui_multitageditor.py:55
-#: ../picard/ui/ui_options_plugins.py:59 ../picard/ui/options/plugins.py:76
-msgid "Name"
-msgstr ""
-
-#: ../picard/ui/ui_tageditor.py:116 ../picard/ui/ui_multitageditor.py:56
-msgid "Value"
-msgstr "Verdi"
-
-#: ../picard/ui/ui_tageditor.py:117 ../picard/ui/ui_multitageditor.py:57
-msgid "&Add..."
-msgstr ""
-
-#: ../picard/ui/ui_tageditor.py:118
-msgid "&Edit..."
-msgstr ""
-
-#: ../picard/ui/ui_tageditor.py:119
-msgid "&Delete"
-msgstr ""
-
-#: ../picard/ui/ui_tageditor.py:120
-msgid "&Metadata"
-msgstr ""
-
-#: ../picard/ui/ui_tageditor.py:121
-msgid "A&rtwork"
-msgstr ""
-
-#: ../picard/ui/ui_tageditor.py:122
-msgid "&Info"
-msgstr ""
-
-#: ../picard/ui/coverartbox.py:47
-msgid "Cover Art"
-msgstr "Plateomslag"
-
-#: ../picard/ui/coverartbox.py:95
-msgid "Buy the album on Amazon"
-msgstr "Kjøp albumet på Amazon"
-
-#: ../picard/ui/ui_puidsubmit.py:52
-msgid "Submit PUIDs"
-msgstr "Send PUID merker"
-
-#: ../picard/ui/ui_puidsubmit.py:53 ../picard/ui/ui_cdlookup.py:62
-msgid "OK"
-msgstr "OK"
-
-#: ../picard/ui/ui_puidsubmit.py:54 ../picard/ui/ui_cdlookup.py:64
-msgid "Cancel"
-msgstr "Avbryt"
-
-#: ../picard/ui/puidsubmit.py:31 ../picard/ui/options/plugins.py:80
-msgid "File"
-msgstr "Fil"
-
-#: ../picard/ui/puidsubmit.py:31
-msgid "PUID"
-msgstr ""
-
-#: ../picard/ui/puidsubmit.py:31
-msgid "Release"
-msgstr ""
-
-#: ../picard/ui/puidsubmit.py:31
-msgid "Release ID"
-msgstr ""
-
-#: ../picard/ui/filebrowser.py:41
-msgid "&Move Tagged Files Here"
-msgstr ""
-
-#: ../picard/ui/filebrowser.py:44
-msgid "Show &Hidden Files"
-msgstr ""
-
-#: ../picard/ui/ui_cdlookup.py:61
-msgid "The following releases on MusicBrainz match the CD:"
-msgstr "De følgende album på MusicBrainz matcher CDen:"
-
-#: ../picard/ui/ui_cdlookup.py:63
-msgid "    Lookup manually    "
-msgstr "    Manuelt oppslag    "
-
-#: ../picard/ui/ui_options.py:42
-msgid "Options"
-msgstr ""
-
-#: ../picard/ui/tagsfromfilenames.py:52 ../picard/ui/tagsfromfilenames.py:96
-msgid "File Name"
-msgstr ""
-
-#: ../picard/ui/ui_options_cover.py:56
-msgid "Location"
-msgstr ""
-
-#: ../picard/ui/ui_options_cover.py:57
-msgid "Embed cover images into tags"
-msgstr "Legg cover til filtaggene"
-
-#: ../picard/ui/ui_options_cover.py:58
-msgid "Save cover images as separate files"
-msgstr "Lagre plateomslag som egne filer"
-
-#: ../picard/ui/ui_options_cover.py:59
-msgid "Overwrite the file if it already exists"
-msgstr "Overskrive filen hvis den eksisterer?"
-
-#: ../picard/ui/ui_options_metadata.py:100
-msgid "Metadata"
-msgstr ""
-
-#: ../picard/ui/ui_options_metadata.py:101
-msgid "Translate foreign artist names to English where possible"
-msgstr ""
-
-#: ../picard/ui/ui_options_metadata.py:102
-msgid "Use release relationships"
-msgstr ""
-
-#: ../picard/ui/ui_options_metadata.py:103
-msgid "Use track relationships"
-msgstr ""
-
-#: ../picard/ui/ui_options_metadata.py:104
-msgid "Use folksonomy tags as genre"
-msgstr ""
-
-#: ../picard/ui/ui_options_metadata.py:105
-msgid "Preferred release country:"
-msgstr ""
-
-#: ../picard/ui/ui_options_metadata.py:106
-msgid "Custom Fields"
-msgstr ""
-
-#: ../picard/ui/ui_options_metadata.py:107
-msgid "Various artists:"
-msgstr "Diverse artister:"
-
-#: ../picard/ui/ui_options_metadata.py:108
-msgid "Non-album tracks:"
-msgstr "Albumløse spor:"
-
-#: ../picard/ui/ui_options_metadata.py:109
-#: ../picard/ui/ui_options_metadata.py:110
-#: ../picard/ui/ui_options_naming.py:168 ../picard/ui/ui_options_naming.py:169
-msgid "Default"
-msgstr "Standard"
-
-#: ../picard/ui/ui_multitageditor.py:58
-msgid "Delete"
-msgstr ""
-
-#: ../picard/ui/logview.py:29
-msgid "Log"
-msgstr "Logg"
-
-#: ../picard/ui/ui_options_plugins.py:58
-msgid "Plugins"
-msgstr ""
-
-#: ../picard/ui/ui_options_plugins.py:60 ../picard/ui/options/plugins.py:79
-msgid "Author"
-msgstr "Forfatter"
-
-#: ../picard/ui/ui_options_plugins.py:61
-msgid "Version"
-msgstr "Versjon"
-
-#: ../picard/ui/ui_options_naming.py:165
-msgid "Rename Files"
-msgstr ""
-
-#: ../picard/ui/ui_options_naming.py:166
-msgid "Replace Windows-incompatible characters"
-msgstr "Bytt ut Windows-inkompatible tegn"
-
-#: ../picard/ui/ui_options_naming.py:167
-msgid "Replace non-ASCII characters"
-msgstr "Bytt ut ikke-ASCII tegn"
-
-#: ../picard/ui/ui_options_naming.py:170 ../picard/ui/options/naming.py:90
-msgid "Multiple artist file naming format:"
-msgstr "Filnavnformat for multiple artister:"
-
-#: ../picard/ui/ui_options_naming.py:171 ../picard/ui/options/naming.py:86
-msgid "File naming format:"
-msgstr "Filnavnformat:"
-
-#: ../picard/ui/ui_options_naming.py:172
-msgid "Move Files"
-msgstr ""
-
-#: ../picard/ui/ui_options_naming.py:173
-msgid "Move tagged files to this directory:"
-msgstr ""
-
-#: ../picard/ui/ui_options_naming.py:174
-msgid "Browse..."
-msgstr ""
-
-#: ../picard/ui/ui_options_naming.py:175
-msgid "Move additional files:"
-msgstr ""
-
-#: ../picard/ui/ui_options_naming.py:176
-msgid "Delete empty directories"
-msgstr ""
-
-#: ../picard/ui/ui_options_naming.py:177
-msgid "Example"
-msgstr "Eksempel"
-
-#: ../picard/ui/ui_options_naming.py:178
-msgid "File name:"
-msgstr ""
-
-#: ../picard/ui/ui_options_naming.py:179
-msgid "Multiple artist file name:"
-msgstr ""
-
-#: ../picard/ui/ui_options_cdlookup.py:48
-msgid "CD-ROM device to use for lookups:"
-msgstr ""
-
-#: ../picard/ui/options/scripting.py:84 ../picard/ui/options/naming.py:86
-#: ../picard/ui/options/naming.py:90 ../picard/ui/options/naming.py:93
-#: ../picard/ui/options/naming.py:95
-msgid "Script Error"
-msgstr ""
+#: ../picard/ui/options/about.py:29
+msgid "About"
+msgstr "Om..."
 
 #. Replace this with your name to have it appear in the "About" dialog.
 #: ../picard/ui/options/about.py:48
 msgid "translator-credits"
 msgstr ""
 "Launchpad Contributions:\n"
-"  Lukáš Lalinský <https://launchpad.net/~luks>\n"
-"\n"
-"Launchpad Contributions:\n"
-"  Lukáš Lalinský https://launchpad.net/~luks\n"
-"\n"
-"Launchpad Contributions:\n"
-"  Lukáš Lalinský https://launchpad.net/~luks\n"
-"\n"
-"Launchpad Contributions:\n"
-"  Lukáš Lalinský https://launchpad.net/~luks\n"
 "  Simen Sandberg https://launchpad.net/~senilix\n"
-"\n"
-"Launchpad Contributions:\n"
 "  Anders https://launchpad.net/~andersja+launchpad-net\n"
 "  Anders Oftedal https://launchpad.net/~anders-oftedal-gmail\n"
-"  Lukáš Lalinský https://launchpad.net/~luks\n"
-"  Simen Sandberg https://launchpad.net/~senilix"
+"  Lukáš Lalinský https://launchpad.net/~luks"
 
 #. Replace LANG with language you are translatig to.
 #: ../picard/ui/options/about.py:51
@@ -909,22 +2228,58 @@ msgstr "<br/>Oversatt til norsk av %s"
 #: ../picard/ui/options/about.py:55
 #, python-format
 msgid ""
-"<p align=\"center\"><span style=\"font-size:15px;font-weight:bold;"
-"\">MusicBrainz Picard</span><br/>\n"
+"<p align=\"center\"><span style=\"font-size:15px;font-weight:bold;\">MusicBrainz Picard</span><br/>\n"
 "Version %(version)s</p>\n"
 "<p align=\"center\"><strong>Supported formats</strong><br/>%(formats)s</p>\n"
 "<p align=\"center\"><strong>Please donate</strong><br/>\n"
-"Thank you for using Picard. Picard relies on the MusicBrainz database, which "
-"is operated by the MetaBrainz Foundation with the help of thousands of "
-"volunteers. If you like this application please consider donating to the "
-"MetaBrainz Foundation to keep the service running.</p>\n"
-"<p align=\"center\"><a href=\"http://metabrainz.org/donate/index.html"
-"\">Donate now!</a></p>\n"
+"Thank you for using Picard. Picard relies on the MusicBrainz database, which is operated by the MetaBrainz Foundation with the help of thousands of volunteers. If you like this application please consider donating to the MetaBrainz Foundation to keep the service running.</p>\n"
+"<p align=\"center\"><a href=\"http://metabrainz.org/donate/index.html\">Donate now!</a></p>\n"
 "<p align=\"center\"><strong>Credits</strong><br/>\n"
-"<small>Copyright © 2004-2008 Robert Kaye, Lukáš Lalinský and others%"
-"(translator-credits)s</small></p>\n"
-"<p align=\"center\"><a href=\"http://musicbrainz.org/doc/PicardTagger"
-"\">http://musicbrainz.org/doc/PicardTagger</a></p>\n"
+"<small>Copyright © 2004-2008 Robert Kaye, Lukáš Lalinský and others%(translator-credits)s</small></p>\n"
+"<p align=\"center\"><a href=\"http://musicbrainz.org/doc/PicardTagger\">http://musicbrainz.org/doc/PicardTagger</a></p>\n"
+msgstr ""
+
+#: ../picard/ui/options/advanced.py:26
+msgid "Advanced"
+msgstr "Avansert"
+
+#: ../picard/ui/options/interface.py:31
+#, fuzzy
+msgid "User Interface"
+msgstr "Velg språk"
+
+#: ../picard/ui/options/interface.py:47
+msgid "System default"
+msgstr "System standard"
+
+#: ../picard/ui/options/interface.py:71
+#, fuzzy
+msgid "Language changed"
+msgstr "Språk"
+
+#: ../picard/ui/options/interface.py:71
+msgid "You have changed the interface language. You have to restart Picard in order for the change to take effect."
+msgstr ""
+
+#: ../picard/ui/options/matching.py:29
+msgid "Matching"
+msgstr ""
+
+#: ../picard/ui/options/metadata.py:52
+msgid "None"
+msgstr ""
+
+#: ../picard/ui/options/naming.py:33
+#, fuzzy
+msgid "File Naming"
+msgstr "Filnavnformat:"
+
+#: ../picard/ui/options/naming.py:86
+#: ../picard/ui/options/naming.py:90
+#: ../picard/ui/options/naming.py:93
+#: ../picard/ui/options/naming.py:95
+#: ../picard/ui/options/scripting.py:84
+msgid "Script Error"
 msgstr ""
 
 #: ../picard/ui/options/naming.py:93
@@ -944,6 +2299,259 @@ msgstr ""
 msgid "The location to move files to must not be empty."
 msgstr ""
 
+#: ../picard/ui/options/scripting.py:63
+msgid "Scripting"
+msgstr "Skripting"
+
+#: ../picard/ui/options/tags.py:29
+msgid "Tags"
+msgstr "Metadata"
+
+#: ../picard/util/tags.py:24
+#, fuzzy
+msgid "Date"
+msgstr "Senere"
+
+#: ../picard/util/tags.py:25
+#, fuzzy
+msgid "Album Artist"
+msgstr "Artist"
+
+#: ../picard/util/tags.py:26
+#, fuzzy
+msgid "Track Number"
+msgstr "Spor Nr"
+
+#: ../picard/util/tags.py:27
+#, fuzzy
+msgid "Total Tracks"
+msgstr "Albumløse spor:"
+
+#: ../picard/util/tags.py:28
+#, fuzzy
+msgid "Disc Number"
+msgstr "Spornummer"
+
+#: ../picard/util/tags.py:29
+msgid "Total Discs"
+msgstr ""
+
+#: ../picard/util/tags.py:30
+#, fuzzy
+msgid "Album Artist Sort Order"
+msgstr "Sorter etter artist"
+
+#: ../picard/util/tags.py:31
+msgid "Artist Sort Order"
+msgstr "Sorter etter artist"
+
+#: ../picard/util/tags.py:32
+msgid "Title Sort Order"
+msgstr "Sorter etter tittel"
+
+#: ../picard/util/tags.py:33
+#, fuzzy
+msgid "Album Sort Order"
+msgstr "Sorter etter tittel"
+
+#: ../picard/util/tags.py:34
+msgid "ASIN"
+msgstr ""
+
+#: ../picard/util/tags.py:35
+msgid "Grouping"
+msgstr "Gruppering"
+
+#: ../picard/util/tags.py:37
+msgid "ISRC"
+msgstr "ISRC"
+
+#: ../picard/util/tags.py:38
+msgid "Mood"
+msgstr "Stemning"
+
+#: ../picard/util/tags.py:39
+msgid "BPM"
+msgstr "BPM"
+
+#: ../picard/util/tags.py:40
+#, fuzzy
+msgid "Copyright"
+msgstr "Kopier"
+
+#: ../picard/util/tags.py:41
+#, fuzzy
+msgid "Composer"
+msgstr "Lukk"
+
+#: ../picard/util/tags.py:42
+msgid "Conductor"
+msgstr ""
+
+#: ../picard/util/tags.py:43
+msgid "Lyricist"
+msgstr "Låtskriver"
+
+#: ../picard/util/tags.py:44
+msgid "Arranger"
+msgstr "Arrangør"
+
+#: ../picard/util/tags.py:45
+msgid "Producer"
+msgstr "Produsent"
+
+#: ../picard/util/tags.py:46
+msgid "Engineer"
+msgstr ""
+
+#: ../picard/util/tags.py:47
+msgid "Subtitle"
+msgstr "Undertekst"
+
+#: ../picard/util/tags.py:48
+#, fuzzy
+msgid "Disc Subtitle"
+msgstr "Undertekst"
+
+#: ../picard/util/tags.py:49
+#, fuzzy
+msgid "Remixer"
+msgstr "Mikser"
+
+#: ../picard/util/tags.py:50
+#, fuzzy
+msgid "MusicBrainz Track Id"
+msgstr "MusicBrainz brukerkonto"
+
+#: ../picard/util/tags.py:51
+#, fuzzy
+msgid "MusicBrainz Release Id"
+msgstr "MusicBrainz Metadata"
+
+#: ../picard/util/tags.py:52
+#, fuzzy
+msgid "MusicBrainz Artist Id"
+msgstr "MusicBrainz Metadata"
+
+#: ../picard/util/tags.py:53
+#, fuzzy
+msgid "MusicBrainz Release Artist Id"
+msgstr "Velg hvilken MusicBrainz server som skal brukes"
+
+#: ../picard/util/tags.py:54
+#, fuzzy
+msgid "MusicBrainz TRM Id"
+msgstr "MusicBrainz Metadata"
+
+#: ../picard/util/tags.py:55
+#, fuzzy
+msgid "MusicBrainz Disc Id"
+msgstr "MusicBrainz Metadata"
+
+#: ../picard/util/tags.py:56
+#, fuzzy
+msgid "MusicBrainz Sort Name"
+msgstr "MusicBrainz Metadata"
+
+#: ../picard/util/tags.py:57
+msgid "MusicIP PUID"
+msgstr ""
+
+#: ../picard/util/tags.py:58
+#, fuzzy
+msgid "MusicIP Fingerprint"
+msgstr "Lydavtrykksmerker"
+
+#: ../picard/util/tags.py:59
+msgid "Disc Id"
+msgstr ""
+
+#: ../picard/util/tags.py:60
+msgid "Website"
+msgstr ""
+
+#: ../picard/util/tags.py:61
+msgid "Compilation"
+msgstr ""
+
+#: ../picard/util/tags.py:62
+#, fuzzy
+msgid "Comment"
+msgstr "Felles"
+
+#: ../picard/util/tags.py:63
+#, fuzzy
+msgid "Genre"
+msgstr "Generelt"
+
+#: ../picard/util/tags.py:64
+msgid "Encoded By"
+msgstr ""
+
+#: ../picard/util/tags.py:65
+msgid "Performer"
+msgstr "Artist"
+
+#: ../picard/util/tags.py:66
+#, fuzzy
+msgid "Release Type"
+msgstr "Utgivelsesdato"
+
+#: ../picard/util/tags.py:67
+#, fuzzy
+msgid "Release Status"
+msgstr "Utgivelsesdato"
+
+#: ../picard/util/tags.py:68
+#, fuzzy
+msgid "Release Country"
+msgstr "Utgivelsesdato"
+
+#: ../picard/util/tags.py:69
+msgid "Record Label"
+msgstr ""
+
+#: ../picard/util/tags.py:70
+msgid "Barcode"
+msgstr "Strekkode"
+
+#: ../picard/util/tags.py:71
+#, fuzzy
+msgid "Catalog Number"
+msgstr "Spornummer"
+
+#: ../picard/util/tags.py:72
+#, fuzzy
+msgid "Format"
+msgstr "Format:"
+
+#: ../picard/util/tags.py:73
+#, fuzzy
+msgid "DJ-Mixer"
+msgstr "Mikser"
+
+#: ../picard/util/tags.py:74
+#, fuzzy
+msgid "Media"
+msgstr "Lokal Metadata"
+
+#: ../picard/util/tags.py:75
+msgid "Lyrics"
+msgstr "Tekster"
+
+#: ../picard/util/tags.py:76
+msgid "Mixer"
+msgstr "Mikser"
+
+#: ../picard/util/tags.py:77
+msgid "Language"
+msgstr "Språk"
+
+#: ../picard/util/tags.py:78
+#, fuzzy
+msgid "Script"
+msgstr "Skripting"
+
 #: ../picard/util/webbrowser2.py:84
 msgid "Web Browser Error"
 msgstr ""
@@ -956,30 +2564,8 @@ msgid ""
 "%s"
 msgstr ""
 
-#~ msgid "No matching tracks for file %s"
-#~ msgstr "Ingen treff for filen %s"
-
-#~ msgid "File %s identified!"
-#~ msgstr "Filen %s er identifisert!"
-
-#~ msgid "No matching releases for cluster %s"
-#~ msgstr "Ingen treff for filgruppen %s"
-
-#~ msgid "M3U Playlist (*.m3u)"
-#~ msgstr "M3U-spilleliste (*.m3u)"
-
-#~ msgid "PLS Playlist (*.pls)"
-#~ msgstr "PLS-spilleliste (*.pls)"
-
-#~ msgid "XSPF Playlist (*.xspf)"
-#~ msgstr "XSPF-spilleliste (*.xspf)"
-
-#~ msgid "PUIDs submission failed: %s"
-#~ msgstr "Innsending av PUID-er feilet: %s"
-
 #~ msgid "New Version"
 #~ msgstr "Ny versjon"
-
 #~ msgid ""
 #~ "New version of Picard is available (%s). Would you like to download it "
 #~ "now?"
@@ -987,123 +2573,67 @@ msgstr ""
 #~ "En ny versjon av Picard er tilgjengelig (%s). Ønsker du å laste ned denne "
 #~ "nå?"
 
-#~ msgid "Couldn't find PUID for file %s"
-#~ msgstr "Kunne ikke funne PUID for filen %s"
+#, fuzzy
+#~ msgid "Anal&yze"
+#~ msgstr "Analyser"
 
-#~ msgid "Creating fingerprint for file %s..."
-#~ msgstr "Lager fingeravtrykk for filen %s..."
+#, fuzzy
+#~ msgid "Generate &Cuesheet..."
+#~ msgstr "Lag cuesheet"
 
-#~ msgid "Length"
-#~ msgstr "Lengde"
-
-#~ msgid "&Ok"
-#~ msgstr "&Ok"
-
-#~ msgid "About"
-#~ msgstr "Om..."
-
-#~ msgid "Advanced"
-#~ msgstr "Avansert"
-
-#~ msgid "Scripting"
-#~ msgstr "Skripting"
-
-#~ msgid "Tags"
-#~ msgstr "Metadata"
-
-#~ msgid "Artist Sort Order"
-#~ msgstr "Sorter etter artist"
-
-#~ msgid "Title Sort Order"
-#~ msgstr "Sorter etter tittel"
-
-#~ msgid "Grouping"
-#~ msgstr "Gruppering"
-
-#~ msgid "ISRC"
-#~ msgstr "ISRC"
-
-#~ msgid "Mood"
-#~ msgstr "Stemning"
-
-#~ msgid "BPM"
-#~ msgstr "BPM"
-
-#~ msgid "Lyricist"
-#~ msgstr "Låtskriver"
-
-#~ msgid "Arranger"
-#~ msgstr "Arrangør"
-
-#~ msgid "Producer"
-#~ msgstr "Produsent"
-
-#~ msgid "Subtitle"
-#~ msgstr "Undertekst"
-
-#~ msgid "Performer"
-#~ msgstr "Artist"
-
-#~ msgid "Barcode"
-#~ msgstr "Strekkode"
-
-#~ msgid "Lyrics"
-#~ msgstr "Tekster"
-
-#~ msgid "Mixer"
-#~ msgstr "Mikser"
+#, fuzzy
+#~ msgid "Auto Tag"
+#~ msgstr "Om Picard Taggeren"
 
+#, fuzzy
+#~ msgid "Edit &Tags..."
+#~ msgstr "Alternativer..."
 #~ msgid "Automatically analyze all new files"
 #~ msgstr "Analysér automatisk alle nye filer"
 
+#, fuzzy
+#~ msgid "Album artist:"
+#~ msgstr "Artist"
+
+#, fuzzy
+#~ msgid "&Advanced"
+#~ msgstr "Avansert"
+
+#, fuzzy
+#~ msgid "A&dd Directory..."
+#~ msgstr "Legg til mappe...\tCtrl+D"
 #~ msgid "Are You Sure?"
 #~ msgstr "Er du sikker?"
-
 #~ msgid "Add &Files...\tCtrl+O"
 #~ msgstr "Legg til filer...\tCtrl+O"
-
 #~ msgid "Add &Directory...\tCtrl+D"
 #~ msgstr "Legg til mappe...\tCtrl+D"
-
 #~ msgid "&Save Files\tCtrl+S"
 #~ msgstr "La&gre Filer\tCtrl+S"
-
 #~ msgid "C&opy\tCtrl+C"
 #~ msgstr "&Kopier\tCtrl+C"
-
 #~ msgid "Help"
 #~ msgstr "Hjelp"
-
 #~ msgid "Preferences"
 #~ msgstr "Alternativer"
-
 #~ msgid "Error while saving cuesheet %s."
 #~ msgstr "Feil: Kunne ikke lagre cuesheet %s."
-
 #~ msgid "Cuesheet %s saved."
 #~ msgstr "Cuesheet %s lagret."
-
 #~ msgid "Time"
 #~ msgstr "Lengde"
-
 #~ msgid "Albums"
 #~ msgstr "Albumer"
-
 #~ msgid "Force Save"
 #~ msgstr "Tving lagring"
-
 #~ msgid "Buy"
 #~ msgstr "Kjøp"
-
 #~ msgid "Welcome to Picard!"
 #~ msgstr "Velkommen til Picard!"
-
 #~ msgid "Track Num"
 #~ msgstr "Spor Nr"
-
 #~ msgid "PUID Collision"
 #~ msgstr "PUID kollisjon"
-
 #~ msgid ""
 #~ "Version %s\n"
 #~ "\n"
@@ -1130,121 +2660,76 @@ msgstr ""
 #~ "subsidier fra the Helix Community.\n"
 #~ "\n"
 #~ "Støttede formater: %s"
-
-#~ msgid "Colors"
-#~ msgstr "Farge"
-
 #~ msgid "Font color"
 #~ msgstr "Skriftfarge"
-
 #~ msgid "Directories"
 #~ msgstr "Mapper"
-
 #~ msgid "Watch for new files"
 #~ msgstr "Vokt denne mappen for nye lydfiler"
-
 #~ msgid "Watch this directory for new audio files"
 #~ msgstr "Vokt denne mappen for nye lydfiler"
-
 #~ msgid "Encodings"
 #~ msgstr "Enkodinger"
-
 #~ msgid "all languages"
 #~ msgstr "alle språk"
-
 #~ msgid "percent similar."
 #~ msgstr "prosent"
-
 #~ msgid "Load recently used albums on startup"
 #~ msgstr "Hent senest brukte albumer ved oppstart"
-
-#~ msgid "Language"
-#~ msgstr "Språk"
-
-#~ msgid "System default"
-#~ msgstr "System standard"
-
 #~ msgid "Allowed filename characters"
 #~ msgstr "Tillatte filtegn"
-
 #~ msgid "Use Windows-safe file names"
 #~ msgstr "Bruk Windows-sikre filnavn"
-
 #~ msgid "Number of tracks on the album"
 #~ msgstr "Antall spor på albumet"
-
 #~ msgid "Track name"
 #~ msgstr "Sportittel"
-
 #~ msgid "Zero padded track number"
 #~ msgstr "Spornummer i formatet 01"
-
 #~ msgid "File format (e.g. mp3, ogg, wav)"
 #~ msgstr "Filformat (i.e. mp3, ogg, wav)"
-
 #~ msgid "Album type (album, single, EP, etc.)"
 #~ msgstr "Albumstype (album, singel, EP, osv.)"
-
 #~ msgid "Album Status (official, promo, etc.)"
 #~ msgstr "Albumsstatus (offisiell, promo, osv.)"
-
 #~ msgid "Album release month"
 #~ msgstr "Utgivelsesmåned"
-
 #~ msgid "Album release day"
 #~ msgstr "Utgivelsesdato"
-
 #~ msgid "Album release year"
 #~ msgstr "Utgivelsesår"
-
 #~ msgid "Make it so!"
 #~ msgstr "Tre igang!"
-
 #~ msgid "Use proxy server to access the Internet"
 #~ msgstr "Bruk proxyserver"
-
 #~ msgid "Proxy server to use"
 #~ msgstr "Proxyserver"
-
 #~ msgid "Proxy port"
 #~ msgstr "Proxyport"
-
 #~ msgid "ID3v2.4 only"
 #~ msgstr "Bare ID3v2.4"
-
 #~ msgid "Save track/album"
 #~ msgstr "Lagre spor/album"
-
 #~ msgid "Artists"
 #~ msgstr "Artister"
-
 #~ msgid "New files (drag files to tag here)"
 #~ msgstr "Nye filer (dra filer som skal tagges hit)"
-
 #~ msgid "updating album information"
 #~ msgstr "oppdaterer albumsinformasjon"
-
 #~ msgid "Submitting PUID information to MusicBrainz server ..."
 #~ msgstr "Sender PUID informasjon til MusicBrainz serveren ..."
-
 #~ msgid "Performing a PUID lookup on file %s ..."
 #~ msgstr "Ser etter PUID merke for fil %s ..."
-
 #~ msgid "Are you sure you want to exit the application?"
 #~ msgstr "Er du sikker på at du vil avslutte programmet?"
-
 #~ msgid "CD Lookup error -- is there a CD in the CD-ROM drive?"
 #~ msgstr "Feil: fant ingen disk -- er det en CD i CD-ROM stasjonen?"
-
 #~ msgid "CD Lookup Failed"
 #~ msgstr "Feil: kunne ikke hente CD"
-
 #~ msgid "&Quick Start Guide"
 #~ msgstr "&Hurtigstartsguide"
-
 #~ msgid "Quick Start Guide"
 #~ msgstr "Hurtigstartsguide"
-
 #~ msgid ""
 #~ "You have not specified an username and password. In order to contribute "
 #~ "data to MusicBrainz, you must have a MusicBrainz account.\n"
@@ -1257,29 +2742,22 @@ msgstr ""
 #~ "Vil du lage en ny brukerkonto nå? Hvis du allerede har en MusicBrainz "
 #~ "brukerkonto, setter du inn brukerinformasjonen i vinduet for "
 #~ "alternativer. "
-
 #~ msgid "Couldn't connect to the MusicBrainz server."
 #~ msgstr "Kunne ikke logge til MusicBrainz serveren."
-
 #~ msgid "Connection error"
 #~ msgstr "Innloggingsfeil"
-
 #~ msgid ""
 #~ "MusicBrainz Picard requires wxPython with UNICODE support.\n"
 #~ "Please download the appropriate toolkit from http://www.wxpython.org/"
 #~ msgstr ""
 #~ "Picard Taggeren trenger wx.Widgets med UNICODE støtte.\n"
 #~ "Last ned den riktige toolkitten fra http://www.wxwidgets.com"
-
 #~ msgid "Unicode Required"
 #~ msgstr "Unicode er nødvendig"
-
 #~ msgid "PUID collision on file %s!"
 #~ msgstr "PUID kollisjon på fil %s!"
-
 #~ msgid "Save error"
 #~ msgstr "Feil ved lagring"
-
 #~ msgid ""
 #~ "The move files option is enabled, but the destination directory is not "
 #~ "specified or invalid.\n"
@@ -1290,7 +2768,6 @@ msgstr ""
 #~ "ugyldig.\n"
 #~ "Fiks alternativene for filflytting eller forandre destinasjons mappen og "
 #~ "prøv igjen."
-
 #~ msgid ""
 #~ "Not all files could be saved. Please check for and examine tracks that "
 #~ "have an error icon in front of them. To retry saving the track, right "
@@ -1299,154 +2776,68 @@ msgstr ""
 #~ "Ikke alle filene ble lagret. Sjekk sporene som har et feilmeldingsikon "
 #~ "foran. Høyreklikk sporet og velg 'Fjern feilmeldinger' for å prøve å "
 #~ "lagre det igjen."
-
 #~ msgid "Select directory that contains music files"
 #~ msgstr "Velg en mappe som inneholder musikkfiler"
-
 #~ msgid "Reload album from main server"
 #~ msgstr "Oppdater album fra hovedserver"
-
 #~ msgid "Select or drag a folder from below"
 #~ msgstr "Merk eller dra mapper herfra"
-
 #~ msgid "Drag files from below"
 #~ msgstr "Dra filer herfra"
-
 #~ msgid "Release date"
 #~ msgstr "Utgivelsesdato"
-
 #~ msgid "%d%% similar"
 #~ msgstr "%d%% lik"
-
 #~ msgid "Please donate to MusicBrainz!"
 #~ msgstr "Donere til MusicBrainz!"
-
-#~ msgid "Later"
-#~ msgstr "Senere"
-
 #~ msgid ""
 #~ "The destination directory %s does not exist. Please pick a valid "
 #~ "directory."
 #~ msgstr "Destinasjonsmappen %s finnes ikke. Vennligst velg en gyldig mappe."
-
 #~ msgid "Select the encoding to use when reading and writing filenames"
 #~ msgstr ""
 #~ "Velg hvilken enkoding som skal brukes til å lese og skrive filnavn og "
 #~ "metadata"
-
 #~ msgid "Automatically move clusters to albums that are at least"
 #~ msgstr "Flytt automatisk grupperte album som passer med ihvertfall"
-
 #~ msgid "Automatically save recognized tracks that are at least"
 #~ msgstr "Lagre automatisk gjenkjente spor som passer med ihvertfall"
-
-#~ msgid "Czech"
-#~ msgstr "Tsjekkisk"
-
-#~ msgid "German"
-#~ msgstr "Tysk"
-
-#~ msgid "English"
-#~ msgstr "Engelsk"
-
-#~ msgid "English (UK)"
-#~ msgstr "Britisk Engelsk"
-
-#~ msgid "Spanish"
-#~ msgstr "Spansk"
-
-#~ msgid "Finnish"
-#~ msgstr "Finsk"
-
-#~ msgid "French"
-#~ msgstr "Fransk"
-
-#~ msgid "Hungarian"
-#~ msgstr "Ungarsk"
-
-#~ msgid "Icelandic"
-#~ msgstr "Islandsk"
-
-#~ msgid "Italian"
-#~ msgstr "Italiensk"
-
-#~ msgid "Korean"
-#~ msgstr "Koreansk"
-
-#~ msgid "Lithuanian"
-#~ msgstr "Litauisk"
-
-#~ msgid "Dutch"
-#~ msgstr "Nederlandsk"
-
-#~ msgid "Norwegian Bokmal"
-#~ msgstr "Norsk (bokmål)"
-
-#~ msgid "Portuguese"
-#~ msgstr "Portugisisk"
-
-#~ msgid "Romanian"
-#~ msgstr "Romansk"
-
-#~ msgid "Russian"
-#~ msgstr "Russisk"
-
-#~ msgid "Slovak"
-#~ msgstr "Slovakisk"
-
-#~ msgid "Swedish"
-#~ msgstr "Svensk"
-
 #~ msgid ""
 #~ "Note: This setting will take effect after you restart the application."
 #~ msgstr ""
 #~ "Bemerk: Denne settingen vil ikke tre i kraft før programmet blir startet "
 #~ "på nytt."
-
 #~ msgid "Artist translation"
 #~ msgstr "Artist oversettelse"
-
 #~ msgid "Rename files when writing metadata tags"
 #~ msgstr "Endre også filnavn under skriving av metadata (tagging)"
-
 #~ msgid "Naming Help"
 #~ msgstr "Hjelp!"
-
 #~ msgid ""
 #~ "You may use the following variables in the filenaming\n"
 #~ "specifications in the options dialog:"
 #~ msgstr ""
 #~ "Du kan bruke følgene variabler i Filnavnsformatfeltet\n"
 #~ "for å kunne formatere det ferdige filnavnet slik du vil:"
-
 #~ msgid "A %s in the naming specification will create a new subfolder."
 #~ msgstr "%s i filnavnsformatfeltet lager undermapper."
-
 #~ msgid "Audio fingerprinting options"
 #~ msgstr "Alternativer for lydavtrykksmerker"
-
 #~ msgid "Automatically select PUID collision tracks that are at least"
 #~ msgstr "Velg automatisk PUID kollisjon hvis sporet passer med ihvertfall"
-
 #~ msgid "Write ID3v1 tags to MP3 files (ID3v2 tags will always be written)"
 #~ msgstr ""
 #~ "Skriv ID3v1 metadata til mp3 filer (ID3v2 data vil alltid bli skrevet)"
-
 #~ msgid "Remove track/album"
 #~ msgstr "Fjern spor/album"
-
 #~ msgid "Listen to track"
 #~ msgstr "Spill av spor"
-
 #~ msgid "Album clusters"
 #~ msgstr "Grupperte album"
-
 #~ msgid "Unmatched files for this album"
 #~ msgstr "Ikke matchede filer for dette albumet"
-
 #~ msgid "%d of %d tracks linked"
 #~ msgstr "%d av %d spor funnet"
-
 #~ msgid ""
 #~ "The Picard Tagger is a free application and you may\n"
 #~ "use it as long as you wish. However, providing\n"
@@ -1464,96 +2855,68 @@ msgstr ""
 #~ "Tenk på å donere $10 til MetaBrainz Foundasjonen\n"
 #~ "som driver MusicBrainz prosjektet. Dessuten er alle\n"
 #~ "donasjoner fradragsberettiget for Amerikanske beboere."
-
 #~ msgid "Matched track highlighting"
 #~ msgstr "Fargealternativer for spormatching"
-
 #~ msgid "Good match background color"
 #~ msgstr "Bra matchet bakgrunnsfarge"
-
 #~ msgid "Bad match background color"
 #~ msgstr "Dårlig matchet bakgrunnsfarge"
-
 #~ msgid "Move files option"
 #~ msgstr "Filflyttningsfeil"
-
 #~ msgid "When matching tracks to albums, accept tracks that are at least"
 #~ msgstr "Under albumspor matching, aksepter spor som passer med ihvertfall"
-
 #~ msgid "CD-ROM drive path to use for lookups"
 #~ msgstr "Velg driverplassering som skal brukes til CD Lookup"
-
 #~ msgid "Launch MB Tagger automatically for inserted Audio CDs"
 #~ msgstr "Start Picard automatisk ved innsetting av Lyddisker"
-
 #~ msgid ""
 #~ "Failed to set the proper registy values to enable launching the tagger "
 #~ "after CD insertion. "
 #~ msgstr ""
 #~ "Feil: Kunne ikke opprette riktig registerinformasjon for automatisk start "
 #~ "av tagger ved innsetting av CD. "
-
 #~ msgid "Default CD setting failed"
 #~ msgstr "Standard-diskinstillingen feilet"
-
 #~ msgid "File format naming specification"
 #~ msgstr "Filnavnsformat"
-
 #~ msgid "Various artist file format naming specification"
 #~ msgstr "Filnavnsformat for album med diverse artister"
-
 #~ msgid "Note: Leave blank to allow all possible characters"
 #~ msgstr "Bemerk: Blankt felt muliggjør alle tillatte tegn"
-
 #~ msgid "Track artist name"
 #~ msgstr "Sportittel"
-
 #~ msgid "Track artist sortname"
 #~ msgstr "Artistens 'sortname'"
-
 #~ msgid "The first character of the artist sortname"
 #~ msgstr "Det første tegnet i artistens sorteringsnavn"
-
 #~ msgid "The first two characters of the artist sortname"
 #~ msgstr "De to første tegnene i artistens sorteringsnavn"
-
 #~ msgid "The first three characters of the artist sortname"
 #~ msgstr "De tre første tegnene i artistens sorteringsnavn"
-
 #~ msgid "Naming specification help"
 #~ msgstr "Filnavnsformatterings hjelp"
-
 #~ msgid "Accept PUID matches that are at least"
 #~ msgstr "Aksepter PUID merker som passer med ihvertfall"
-
 #~ msgid "Various artist name"
 #~ msgstr "Benevning for diverse artister"
-
 #~ msgid "Open file"
 #~ msgstr "Åpne fil"
-
 #~ msgid "Open directory"
 #~ msgstr "Åpne mappe"
-
 #~ msgid "Edit options"
 #~ msgstr "Alternativer"
-
 #~ msgid "Exit"
 #~ msgstr "Avslutt"
-
 #~ msgid ""
 #~ "The MusicBrainz Tagger requires wx.Widgets with UNICODE support.\n"
 #~ "Please download the appropriate toolkit from  http://www.wxwidgets.com"
 #~ msgstr ""
 #~ "MusicBrainz Taggeren trenger wx.Widgets med UNICODE støtte.\n"
 #~ "Last ned den riktige toolkitten fra http://www.wxwidgets.com"
-
 #~ msgid "Sorry, there is no help file yet."
 #~ msgstr "Beklager, ingen hjelpefil ennå."
-
 #~ msgid "Use Internet Explorer settings for proxy support."
 #~ msgstr "Bruk Internet Explorer settingene for proxy støtte."
-
 #~ msgid ""
 #~ "If you use an automatic proxy configuration in Internet\n"
 #~ "Explorer, uncheck the box above and enter your\n"
@@ -1562,10 +2925,8 @@ msgstr ""
 #~ "Hvis du bruker en automatisk proxy konfigurasjon i\n"
 #~ "Internet Explorer, fjern haken i boksen under og\n"
 #~ "skriv inn din proxyserver og proxyport under:"
-
 #~ msgid "TRM analyzer thread priority"
 #~ msgstr "TRM analyseringsprioritet"
-
 #~ msgid ""
 #~ "NOTE: This application can automatically authenticate the\n"
 #~ "MusicBrainz user, but the user name and password will be\n"
@@ -1574,12 +2935,10 @@ msgstr ""
 #~ "OBS: Dette programmet kan automatisk logge inn\n"
 #~ "MusicBrainz brukeren, men brukernavnet og passordet vil bli\n"
 #~ "sendt til MusicBrainz i klartekst!"
-
 #~ msgid "&Save Files\tCTRL+s"
 #~ msgstr "&Lagre Filer\tCTRL+s"
-
 #~ msgid "C&opy\tCTRL+c"
 #~ msgstr "&Kopier\tCTRL+c"
-
 #~ msgid "&Paste\tCTRL+v"
 #~ msgstr "&Lim inn\tCTRL+v"
+
diff --git a/po/nl.po b/po/nl.po
index 1de7b1f2d..465531d21 100644
--- a/po/nl.po
+++ b/po/nl.po
@@ -7,36 +7,1323 @@ msgid ""
 msgstr ""
 "Project-Id-Version: picard\n"
 "Report-Msgid-Bugs-To: http://bugs.musicbrainz.org/\n"
-"POT-Creation-Date: 2008-12-01 18:20+0100\n"
-"PO-Revision-Date: 2008-07-27 21:25+0000\n"
-"Last-Translator: Lukáš Lalinský <lalinsky@gmail.com>\n"
+"POT-Creation-Date: 2009-01-25 12:23+0100\n"
+"PO-Revision-Date: 2009-01-25 13:28+0100\n"
+"Last-Translator: Philipp Wolfer <phw@rubyforge.org>\n"
 "Language-Team: Dutch <nl@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2008-12-01 17:02+0000\n"
+"X-Launchpad-Export-Date: 2009-01-24 23:28+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 "Generated-By: pygettext.py 1.5\n"
 
-#: ../picard/album.py:108 ../picard/cluster.py:248
+#: ../picard/album.py:108
+#: ../picard/cluster.py:248
 msgid "Unmatched Files"
 msgstr "Niet-overeenkomende bestanden"
 
-#: ../picard/album.py:269
+#: ../picard/album.py:281
 #, python-format
 msgid "[couldn't load album %s]"
 msgstr "[kon album %s niet laden]"
 
-#: ../picard/album.py:305
+#: ../picard/album.py:317
 msgid "[loading album information]"
 msgstr "[albuminformatie laden]"
 
-#: ../picard/tagger.py:472
+#: ../picard/cluster.py:164
+#: ../picard/cluster.py:175
+#, python-format
+msgid "No matching releases for cluster %s"
+msgstr "Geen overeenkomende publicaties voor cluster %s"
+
+#: ../picard/cluster.py:177
+#, python-format
+msgid "Cluster %s identified!"
+msgstr "Cluster %s geïdentificeerd!"
+
+#: ../picard/cluster.py:182
+#, python-format
+msgid "Looking up the metadata for cluster %s..."
+msgstr "Opzoeken van metadata voor cluster %s..."
+
+#: ../picard/const.py:40
+msgid "CD"
+msgstr ""
+
+#: ../picard/const.py:41
+msgid "DVD"
+msgstr ""
+
+#: ../picard/const.py:42
+msgid "SACD"
+msgstr ""
+
+#: ../picard/const.py:43
+msgid "LaserDisc"
+msgstr ""
+
+#: ../picard/const.py:44
+#, fuzzy
+msgid "MiniDisc"
+msgstr "Disc:"
+
+#: ../picard/const.py:45
+msgid "Vinyl"
+msgstr ""
+
+#: ../picard/const.py:46
+msgid "Cassette"
+msgstr ""
+
+#: ../picard/const.py:47
+msgid "Cartridge (4/8-tracks)"
+msgstr ""
+
+#: ../picard/const.py:48
+msgid "Reel-to-Reel"
+msgstr ""
+
+#: ../picard/const.py:49
+msgid "DAT"
+msgstr ""
+
+#: ../picard/const.py:50
+#, fuzzy
+msgid "Digital Media"
+msgstr "Oorspronkelijke metadata"
+
+#: ../picard/const.py:51
+msgid "Wax Cylinder"
+msgstr ""
+
+#: ../picard/const.py:52
+msgid "Piano Roll"
+msgstr ""
+
+#: ../picard/const.py:53
+#, fuzzy
+msgid "Other"
+msgstr "Later"
+
+#: ../picard/const.py:58
+msgid "Bangladesh"
+msgstr ""
+
+#: ../picard/const.py:59
+msgid "Belgium"
+msgstr ""
+
+#: ../picard/const.py:60
+msgid "Burkina Faso"
+msgstr ""
+
+#: ../picard/const.py:61
+#, fuzzy
+msgid "Bulgaria"
+msgstr "Hongaars"
+
+#: ../picard/const.py:62
+msgid "Barbados"
+msgstr ""
+
+#: ../picard/const.py:63
+msgid "Wallis and Futuna Islands"
+msgstr ""
+
+#: ../picard/const.py:64
+#, fuzzy
+msgid "Bermuda"
+msgstr "Duits"
+
+#: ../picard/const.py:65
+msgid "Brunei Darussalam"
+msgstr ""
+
+#: ../picard/const.py:66
+msgid "Bolivia"
+msgstr ""
+
+#: ../picard/const.py:67
+msgid "Bahrain"
+msgstr ""
+
+#: ../picard/const.py:68
+msgid "Burundi"
+msgstr ""
+
+#: ../picard/const.py:69
+msgid "Benin"
+msgstr ""
+
+#: ../picard/const.py:70
+msgid "Bhutan"
+msgstr ""
+
+#: ../picard/const.py:71
+msgid "Jamaica"
+msgstr ""
+
+#: ../picard/const.py:72
+msgid "Bouvet Island"
+msgstr ""
+
+#: ../picard/const.py:73
+msgid "Botswana"
+msgstr ""
+
+#: ../picard/const.py:74
+msgid "Samoa"
+msgstr ""
+
+#: ../picard/const.py:75
+msgid "Brazil"
+msgstr ""
+
+#: ../picard/const.py:76
+msgid "Bahamas"
+msgstr ""
+
+#: ../picard/const.py:77
+msgid "Belarus"
+msgstr ""
+
+#: ../picard/const.py:78
+msgid "Belize"
+msgstr ""
+
+#: ../picard/const.py:79
+msgid "Russian Federation"
+msgstr ""
+
+#: ../picard/const.py:80
+msgid "Rwanda"
+msgstr ""
+
+#: ../picard/const.py:81
+msgid "Reunion"
+msgstr ""
+
+#: ../picard/const.py:82
+msgid "Turkmenistan"
+msgstr ""
+
+#: ../picard/const.py:83
+msgid "Tajikistan"
+msgstr ""
+
+#: ../picard/const.py:84
+#, fuzzy
+msgid "Romania"
+msgstr "Roemeens"
+
+#: ../picard/const.py:85
+#, fuzzy
+msgid "Tokela"
+msgstr "Werkbalk"
+
+#: ../picard/const.py:86
+msgid "Guinea-Bissa"
+msgstr ""
+
+#: ../picard/const.py:87
+msgid "Guam"
+msgstr ""
+
+#: ../picard/const.py:88
+msgid "Guatemala"
+msgstr ""
+
+#: ../picard/const.py:89
+msgid "Greece"
+msgstr ""
+
+#: ../picard/const.py:90
+msgid "Equatorial Guinea"
+msgstr ""
+
+#: ../picard/const.py:91
+msgid "Guadeloupe"
+msgstr ""
+
+#: ../picard/const.py:92
+msgid "Japan"
+msgstr ""
+
+#: ../picard/const.py:93
+msgid "Guyana"
+msgstr ""
+
+#: ../picard/const.py:94
+#, fuzzy
+msgid "French Guiana"
+msgstr "Frans"
+
+#: ../picard/const.py:95
+#, fuzzy
+msgid "Georgia"
+msgstr "Duits"
+
+#: ../picard/const.py:96
+msgid "Grenada"
+msgstr ""
+
+#: ../picard/const.py:97
+msgid "United Kingdom"
+msgstr ""
+
+#: ../picard/const.py:98
+msgid "Gabon"
+msgstr ""
+
+#: ../picard/const.py:99
+msgid "El Salvador"
+msgstr ""
+
+#: ../picard/const.py:100
+#, fuzzy
+msgid "Guinea"
+msgstr "Algemeen"
+
+#: ../picard/const.py:101
+msgid "Gambia"
+msgstr ""
+
+#: ../picard/const.py:102
+msgid "Greenland"
+msgstr ""
+
+#: ../picard/const.py:103
+msgid "Gibraltar"
+msgstr ""
+
+#: ../picard/const.py:104
+msgid "Ghana"
+msgstr ""
+
+#: ../picard/const.py:105
+#, fuzzy
+msgid "Oman"
+msgstr "Duits"
+
+#: ../picard/const.py:106
+msgid "Tunisia"
+msgstr ""
+
+#: ../picard/const.py:107
+#, fuzzy
+msgid "Jordan"
+msgstr "Koreaans"
+
+#: ../picard/const.py:108
+msgid "Haiti"
+msgstr ""
+
+#: ../picard/const.py:109
+#, fuzzy
+msgid "Hungary"
+msgstr "Hongaars"
+
+#: ../picard/const.py:110
+msgid "Hong Kong"
+msgstr ""
+
+#: ../picard/const.py:111
+msgid "Honduras"
+msgstr ""
+
+#: ../picard/const.py:112
+msgid "Heard and Mc Donald Islands"
+msgstr ""
+
+#: ../picard/const.py:113
+msgid "Venezuela"
+msgstr ""
+
+#: ../picard/const.py:114
+msgid "Puerto Rico"
+msgstr ""
+
+#: ../picard/const.py:115
+msgid "Pala"
+msgstr ""
+
+#: ../picard/const.py:116
+#, fuzzy
+msgid "Portugal"
+msgstr "Portugees"
+
+#: ../picard/const.py:117
+msgid "Svalbard and Jan Mayen Islands"
+msgstr ""
+
+#: ../picard/const.py:118
+msgid "Paraguay"
+msgstr ""
+
+#: ../picard/const.py:119
+msgid "Iraq"
+msgstr ""
+
+#: ../picard/const.py:120
+msgid "Panama"
+msgstr ""
+
+#: ../picard/const.py:121
+msgid "French Polynesia"
+msgstr ""
+
+#: ../picard/const.py:122
+msgid "Papua New Guinea"
+msgstr ""
+
+#: ../picard/const.py:123
+msgid "Per"
+msgstr ""
+
+#: ../picard/const.py:124
+msgid "Pakistan"
+msgstr ""
+
+#: ../picard/const.py:125
+msgid "Philippines"
+msgstr ""
+
+#: ../picard/const.py:126
+msgid "Pitcairn"
+msgstr ""
+
+#: ../picard/const.py:127
+msgid "Poland"
+msgstr ""
+
+#: ../picard/const.py:128
+msgid "St. Pierre and Miquelon"
+msgstr ""
+
+#: ../picard/const.py:129
+msgid "Zambia"
+msgstr ""
+
+#: ../picard/const.py:130
+msgid "Western Sahara"
+msgstr ""
+
+#: ../picard/const.py:131
+msgid "Estonia"
+msgstr ""
+
+#: ../picard/const.py:132
+msgid "Egypt"
+msgstr ""
+
+#: ../picard/const.py:133
+msgid "South Africa"
+msgstr ""
+
+#: ../picard/const.py:134
+msgid "Ecuador"
+msgstr ""
+
+#: ../picard/const.py:135
+#, fuzzy
+msgid "Italy"
+msgstr "Italiaans"
+
+#: ../picard/const.py:136
+#, fuzzy
+msgid "Viet Nam"
+msgstr "Bestandsnaam"
+
+#: ../picard/const.py:137
+msgid "Solomon Islands"
+msgstr ""
+
+#: ../picard/const.py:138
+msgid "Ethiopia"
+msgstr ""
+
+#: ../picard/const.py:139
+#, fuzzy
+msgid "Somalia"
+msgstr "Roemeens"
+
+#: ../picard/const.py:140
+msgid "Zimbabwe"
+msgstr ""
+
+#: ../picard/const.py:141
+msgid "Saudi Arabia"
+msgstr ""
+
+#: ../picard/const.py:142
+#, fuzzy
+msgid "Spain"
+msgstr "Spaans"
+
+#: ../picard/const.py:143
+msgid "Eritrea"
+msgstr ""
+
+#: ../picard/const.py:144
+msgid "Moldova, Republic of"
+msgstr ""
+
+#: ../picard/const.py:145
+msgid "Madagascar"
+msgstr ""
+
+#: ../picard/const.py:146
+msgid "Morocco"
+msgstr ""
+
+#: ../picard/const.py:147
+#, fuzzy
+msgid "Monaco"
+msgstr "Mono"
+
+#: ../picard/const.py:148
+msgid "Uzbekistan"
+msgstr ""
+
+#: ../picard/const.py:149
+msgid "Myanmar"
+msgstr ""
+
+#: ../picard/const.py:150
+msgid "Mali"
+msgstr ""
+
+#: ../picard/const.py:151
+msgid "Maca"
+msgstr ""
+
+#: ../picard/const.py:152
+#, fuzzy
+msgid "Mongolia"
+msgstr "Mono"
+
+#: ../picard/const.py:153
+msgid "Marshall Islands"
+msgstr ""
+
+#: ../picard/const.py:154
+msgid "Macedonia, The Former Yugoslav Republic of"
+msgstr ""
+
+#: ../picard/const.py:155
+msgid "Mauritius"
+msgstr ""
+
+#: ../picard/const.py:156
+#, fuzzy
+msgid "Malta"
+msgstr "Metadata"
+
+#: ../picard/const.py:157
+msgid "Malawi"
+msgstr ""
+
+#: ../picard/const.py:158
+msgid "Maldives"
+msgstr ""
+
+#: ../picard/const.py:159
+msgid "Martinique"
+msgstr ""
+
+#: ../picard/const.py:160
+msgid "Northern Mariana Islands"
+msgstr ""
+
+#: ../picard/const.py:161
+msgid "Montserrat"
+msgstr ""
+
+#: ../picard/const.py:162
+#, fuzzy
+msgid "Mauritania"
+msgstr "Litouws"
+
+#: ../picard/const.py:163
+msgid "Uganda"
+msgstr ""
+
+#: ../picard/const.py:164
+msgid "Malaysia"
+msgstr ""
+
+#: ../picard/const.py:165
+msgid "Mexico"
+msgstr ""
+
+#: ../picard/const.py:166
+msgid "Israel"
+msgstr ""
+
+#: ../picard/const.py:167
+#, fuzzy
+msgid "France"
+msgstr "Annuleren"
+
+#: ../picard/const.py:168
+msgid "British Indian Ocean Territory"
+msgstr ""
+
+#: ../picard/const.py:169
+msgid "St. Helena"
+msgstr ""
+
+#: ../picard/const.py:170
+msgid "Finland"
+msgstr ""
+
+#: ../picard/const.py:171
+msgid "Fiji"
+msgstr ""
+
+#: ../picard/const.py:172
+msgid "Falkland Islands (Malvinas)"
+msgstr ""
+
+#: ../picard/const.py:173
+msgid "Micronesia, Federated States of"
+msgstr ""
+
+#: ../picard/const.py:174
+msgid "Faroe Islands"
+msgstr ""
+
+#: ../picard/const.py:175
+msgid "Nicaragua"
+msgstr ""
+
+#: ../picard/const.py:176
+msgid "Netherlands"
+msgstr ""
+
+#: ../picard/const.py:177
+msgid "Norway"
+msgstr ""
+
+#: ../picard/const.py:178
+msgid "Namibia"
+msgstr ""
+
+#: ../picard/const.py:179
+msgid "Vanuat"
+msgstr ""
+
+#: ../picard/const.py:180
+msgid "New Caledonia"
+msgstr ""
+
+#: ../picard/const.py:181
+#, fuzzy
+msgid "Niger"
+msgstr "Mixer"
+
+#: ../picard/const.py:182
+msgid "Norfolk Island"
+msgstr ""
+
+#: ../picard/const.py:183
+msgid "Nigeria"
+msgstr ""
+
+#: ../picard/const.py:184
+#, fuzzy
+msgid "New Zealand"
+msgstr "Nieuwe metadata"
+
+#: ../picard/const.py:185
+msgid "Zaire"
+msgstr ""
+
+#: ../picard/const.py:186
+msgid "Nepal"
+msgstr ""
+
+#: ../picard/const.py:187
+msgid "Naur"
+msgstr ""
+
+#: ../picard/const.py:188
+msgid "Niue"
+msgstr ""
+
+#: ../picard/const.py:189
+msgid "Cook Islands"
+msgstr ""
+
+#: ../picard/const.py:190
+msgid "Cote d'Ivoire"
+msgstr ""
+
+#: ../picard/const.py:191
+msgid "Switzerland"
+msgstr ""
+
+#: ../picard/const.py:192
+msgid "Colombia"
+msgstr ""
+
+#: ../picard/const.py:193
+msgid "China"
+msgstr ""
+
+#: ../picard/const.py:194
+msgid "Cameroon"
+msgstr ""
+
+#: ../picard/const.py:195
+#, fuzzy
+msgid "Chile"
+msgstr "Bestand"
+
+#: ../picard/const.py:196
+msgid "Cocos (Keeling) Islands"
+msgstr ""
+
+#: ../picard/const.py:197
+msgid "Canada"
+msgstr ""
+
+#: ../picard/const.py:198
+#, fuzzy
+msgid "Congo"
+msgstr "Mono"
+
+#: ../picard/const.py:199
+msgid "Central African Republic"
+msgstr ""
+
+#: ../picard/const.py:200
+msgid "Czech Republic"
+msgstr ""
+
+#: ../picard/const.py:201
+msgid "Cyprus"
+msgstr ""
+
+#: ../picard/const.py:202
+msgid "Christmas Island"
+msgstr ""
+
+#: ../picard/const.py:203
+msgid "Costa Rica"
+msgstr ""
+
+#: ../picard/const.py:204
+msgid "Cape Verde"
+msgstr ""
+
+#: ../picard/const.py:205
+msgid "Cuba"
+msgstr ""
+
+#: ../picard/const.py:206
+msgid "Swaziland"
+msgstr ""
+
+#: ../picard/const.py:207
+msgid "Syrian Arab Republic"
+msgstr ""
+
+#: ../picard/const.py:208
+msgid "Kyrgyzstan"
+msgstr ""
+
+#: ../picard/const.py:209
+msgid "Kenya"
+msgstr ""
+
+#: ../picard/const.py:210
+msgid "Suriname"
+msgstr ""
+
+#: ../picard/const.py:211
+msgid "Kiribati"
+msgstr ""
+
+#: ../picard/const.py:212
+msgid "Cambodia"
+msgstr ""
+
+#: ../picard/const.py:213
+msgid "Saint Kitts and Nevis"
+msgstr ""
+
+#: ../picard/const.py:214
+#, fuzzy
+msgid "Comoros"
+msgstr "Kleuren"
+
+#: ../picard/const.py:215
+msgid "Sao Tome and Principe"
+msgstr ""
+
+#: ../picard/const.py:216
+#, fuzzy
+msgid "Slovenia"
+msgstr "Slovaaks"
+
+#: ../picard/const.py:217
+msgid "Kuwait"
+msgstr ""
+
+#: ../picard/const.py:218
+#, fuzzy
+msgid "Senegal"
+msgstr "Algemeen"
+
+#: ../picard/const.py:219
+msgid "San Marino"
+msgstr ""
+
+#: ../picard/const.py:220
+msgid "Sierra Leone"
+msgstr ""
+
+#: ../picard/const.py:221
+msgid "Seychelles"
+msgstr ""
+
+#: ../picard/const.py:222
+msgid "Kazakhstan"
+msgstr ""
+
+#: ../picard/const.py:223
+msgid "Cayman Islands"
+msgstr ""
+
+#: ../picard/const.py:224
+msgid "Singapore"
+msgstr ""
+
+#: ../picard/const.py:225
+#, fuzzy
+msgid "Sweden"
+msgstr "Zweeds"
+
+#: ../picard/const.py:226
+#, fuzzy
+msgid "Sudan"
+msgstr "&Scannen"
+
+#: ../picard/const.py:227
+msgid "Dominican Republic"
+msgstr ""
+
+#: ../picard/const.py:228
+#, fuzzy
+msgid "Dominica"
+msgstr "Roemeens"
+
+#: ../picard/const.py:229
+#, fuzzy
+msgid "Djibouti"
+msgstr "Info"
+
+#: ../picard/const.py:230
+msgid "Denmark"
+msgstr ""
+
+#: ../picard/const.py:231
+msgid "Virgin Islands (British)"
+msgstr ""
+
+#: ../picard/const.py:232
+#, fuzzy
+msgid "Germany"
+msgstr "Duits"
+
+#: ../picard/const.py:233
+msgid "Yemen"
+msgstr ""
+
+#: ../picard/const.py:234
+msgid "Algeria"
+msgstr ""
+
+#: ../picard/const.py:235
+msgid "United States"
+msgstr ""
+
+#: ../picard/const.py:236
+msgid "Uruguay"
+msgstr ""
+
+#: ../picard/const.py:237
+msgid "Mayotte"
+msgstr ""
+
+#: ../picard/const.py:238
+msgid "United States Minor Outlying Islands"
+msgstr ""
+
+#: ../picard/const.py:239
+msgid "Lebanon"
+msgstr ""
+
+#: ../picard/const.py:240
+msgid "Saint Lucia"
+msgstr ""
+
+#: ../picard/const.py:241
+msgid "Lao People's Democratic Republic"
+msgstr ""
+
+#: ../picard/const.py:242
+msgid "Tuval"
+msgstr ""
+
+#: ../picard/const.py:243
+#, fuzzy
+msgid "Taiwan"
+msgstr "Italiaans"
+
+#: ../picard/const.py:244
+msgid "Trinidad and Tobago"
+msgstr ""
+
+#: ../picard/const.py:245
+msgid "Turkey"
+msgstr ""
+
+#: ../picard/const.py:246
+msgid "Sri Lanka"
+msgstr ""
+
+#: ../picard/const.py:247
+msgid "Liechtenstein"
+msgstr ""
+
+#: ../picard/const.py:248
+msgid "Latvia"
+msgstr ""
+
+#: ../picard/const.py:249
+msgid "Tonga"
+msgstr ""
+
+#: ../picard/const.py:250
+#, fuzzy
+msgid "Lithuania"
+msgstr "Litouws"
+
+#: ../picard/const.py:251
+msgid "Luxembourg"
+msgstr ""
+
+#: ../picard/const.py:252
+msgid "Liberia"
+msgstr ""
+
+#: ../picard/const.py:253
+#, fuzzy
+msgid "Lesotho"
+msgstr "Lengte"
+
+#: ../picard/const.py:254
+msgid "Thailand"
+msgstr ""
+
+#: ../picard/const.py:255
+msgid "French Southern Territories"
+msgstr ""
+
+#: ../picard/const.py:256
+#, fuzzy
+msgid "Togo"
+msgstr "&Hulpmiddelen"
+
+#: ../picard/const.py:257
+msgid "Chad"
+msgstr ""
+
+#: ../picard/const.py:258
+msgid "Turks and Caicos Islands"
+msgstr ""
+
+#: ../picard/const.py:259
+msgid "Libyan Arab Jamahiriya"
+msgstr ""
+
+#: ../picard/const.py:260
+msgid "Vatican City State (Holy See)"
+msgstr ""
+
+#: ../picard/const.py:261
+msgid "Saint Vincent and The Grenadines"
+msgstr ""
+
+#: ../picard/const.py:262
+msgid "United Arab Emirates"
+msgstr ""
+
+#: ../picard/const.py:263
+msgid "Andorra"
+msgstr ""
+
+#: ../picard/const.py:264
+msgid "Antigua and Barbuda"
+msgstr ""
+
+#: ../picard/const.py:265
+msgid "Afghanistan"
+msgstr ""
+
+#: ../picard/const.py:266
+msgid "Anguilla"
+msgstr ""
+
+#: ../picard/const.py:267
+msgid "Virgin Islands (U.S.)"
+msgstr ""
+
+#: ../picard/const.py:268
+#, fuzzy
+msgid "Iceland"
+msgstr "IJslands"
+
+#: ../picard/const.py:269
+msgid "Iran (Islamic Republic of)"
+msgstr ""
+
+#: ../picard/const.py:270
+msgid "Armenia"
+msgstr ""
+
+#: ../picard/const.py:271
+msgid "Albania"
+msgstr ""
+
+#: ../picard/const.py:272
+msgid "Angola"
+msgstr ""
+
+#: ../picard/const.py:273
+msgid "Netherlands Antilles"
+msgstr ""
+
+#: ../picard/const.py:274
+msgid "Antarctica"
+msgstr ""
+
+#: ../picard/const.py:275
+msgid "American Samoa"
+msgstr ""
+
+#: ../picard/const.py:276
+msgid "Argentina"
+msgstr ""
+
+#: ../picard/const.py:277
+#, fuzzy
+msgid "Australia"
+msgstr "Italiaans"
+
+#: ../picard/const.py:278
+#, fuzzy
+msgid "Austria"
+msgstr "Auteur"
+
+#: ../picard/const.py:279
+msgid "Aruba"
+msgstr ""
+
+#: ../picard/const.py:280
+#, fuzzy
+msgid "India"
+msgstr "Medium"
+
+#: ../picard/const.py:281
+msgid "Tanzania, United Republic of"
+msgstr ""
+
+#: ../picard/const.py:282
+msgid "Azerbaijan"
+msgstr ""
+
+#: ../picard/const.py:283
+#, fuzzy
+msgid "Ireland"
+msgstr "IJslands"
+
+#: ../picard/const.py:284
+msgid "Indonesia"
+msgstr ""
+
+#: ../picard/const.py:285
+msgid "Ukraine"
+msgstr ""
+
+#: ../picard/const.py:286
+#, fuzzy
+msgid "Qatar"
+msgstr "Later"
+
+#: ../picard/const.py:287
+msgid "Mozambique"
+msgstr ""
+
+#: ../picard/const.py:288
+msgid "Bosnia and Herzegovina"
+msgstr ""
+
+#: ../picard/const.py:289
+msgid "Congo, The Democratic Republic of the"
+msgstr ""
+
+#: ../picard/const.py:290
+msgid "Serbia and Montenegro"
+msgstr ""
+
+#: ../picard/const.py:291
+msgid "Croatia"
+msgstr ""
+
+#: ../picard/const.py:292
+msgid "Korea (North), Democratic People's Republic of"
+msgstr ""
+
+#: ../picard/const.py:293
+msgid "Korea (South), Republic of"
+msgstr ""
+
+#: ../picard/const.py:294
+#, fuzzy
+msgid "Slovakia"
+msgstr "Slovaaks"
+
+#: ../picard/const.py:295
+msgid "Soviet Union (historical, 1922-1991)"
+msgstr ""
+
+#: ../picard/const.py:296
+msgid "East Timor"
+msgstr ""
+
+#: ../picard/const.py:297
+msgid "Czechoslovakia (historical, 1918-1992)"
+msgstr ""
+
+#: ../picard/const.py:298
+msgid "Europe"
+msgstr ""
+
+#: ../picard/const.py:299
+msgid "East Germany (historical, 1949-1990)"
+msgstr ""
+
+#: ../picard/const.py:300
+msgid "[Unknown Country]"
+msgstr ""
+
+#: ../picard/const.py:301
+msgid "[Worldwide]"
+msgstr ""
+
+#: ../picard/const.py:302
+msgid "Yugoslavia (historical, 1918-1992)"
+msgstr ""
+
+#: ../picard/const.py:307
+#, fuzzy
+msgid "Catalan"
+msgstr "Italiaans"
+
+#: ../picard/const.py:308
+msgid "Czech"
+msgstr "Tjechisch"
+
+#: ../picard/const.py:309
+msgid "Welsh"
+msgstr ""
+
+#: ../picard/const.py:310
+#, fuzzy
+msgid "Danish"
+msgstr "Spaans"
+
+#: ../picard/const.py:311
+msgid "German"
+msgstr "Duits"
+
+#: ../picard/const.py:312
+msgid "English"
+msgstr "Engels"
+
+#: ../picard/const.py:313
+#, fuzzy
+msgid "English (Canada)"
+msgstr "Engels (UK)"
+
+#: ../picard/const.py:314
+msgid "English (UK)"
+msgstr "Engels (UK)"
+
+#: ../picard/const.py:315
+msgid "Spanish"
+msgstr "Spaans"
+
+#: ../picard/const.py:316
+#, fuzzy
+msgid "Persian"
+msgstr "Versie"
+
+#: ../picard/const.py:317
+msgid "Finnish"
+msgstr "Fins"
+
+#: ../picard/const.py:318
+msgid "French"
+msgstr "Frans"
+
+#: ../picard/const.py:319
+msgid "Frisian"
+msgstr ""
+
+#: ../picard/const.py:320
+msgid "Hebrew"
+msgstr ""
+
+#: ../picard/const.py:321
+msgid "Hungarian"
+msgstr "Hongaars"
+
+#: ../picard/const.py:322
+#, fuzzy
+msgid "Islandic"
+msgstr "IJslands"
+
+#: ../picard/const.py:323
+msgid "Italian"
+msgstr "Italiaans"
+
+#: ../picard/const.py:324
+msgid "Kannada"
+msgstr ""
+
+#: ../picard/const.py:325
+msgid "Korean"
+msgstr "Koreaans"
+
+#: ../picard/const.py:326
+msgid "Lithuanian"
+msgstr "Litouws"
+
+#: ../picard/const.py:327
+msgid "Norwegian Bokmal"
+msgstr "Noors Bokmål"
+
+#: ../picard/const.py:328
+msgid "Dutch"
+msgstr "Nederlands"
+
+#: ../picard/const.py:329
+#, fuzzy
+msgid "Polish"
+msgstr "Plugins"
+
+#: ../picard/const.py:330
+msgid "Portuguese"
+msgstr "Portugees"
+
+#: ../picard/const.py:331
+#, fuzzy
+msgid "Brazilian Portuguese"
+msgstr "Portugees"
+
+#: ../picard/const.py:332
+msgid "Romanian"
+msgstr "Roemeens"
+
+#: ../picard/const.py:333
+msgid "Russian"
+msgstr "Russisch"
+
+#: ../picard/const.py:334
+#, fuzzy
+msgid "Scots"
+msgstr "Score"
+
+#: ../picard/const.py:335
+msgid "Slovak"
+msgstr "Slovaaks"
+
+#: ../picard/const.py:336
+#, fuzzy
+msgid "Slovenian"
+msgstr "Slovaaks"
+
+#: ../picard/const.py:337
+msgid "Swedish"
+msgstr "Zweeds"
+
+#: ../picard/const.py:338
+#, fuzzy
+msgid "Chinese"
+msgstr "Kanalen:"
+
+#: ../picard/file.py:475
+#, python-format
+msgid "No matching tracks for file %s"
+msgstr "Geen overeenkomende nummers voor bestand %s"
+
+#: ../picard/file.py:492
+#, fuzzy, python-format
+msgid "No matching tracks above the threshold for file %s"
+msgstr "Geen overeenkomende nummers voor bestand %s"
+
+#: ../picard/file.py:495
+#, python-format
+msgid "File %s identified!"
+msgstr "Bestand %s geïdentificeerd!"
+
+#: ../picard/file.py:506
+#, python-format
+msgid "Looking up the PUID for file %s..."
+msgstr "Opzoeken van PUID voor bestand %s..."
+
+#: ../picard/file.py:511
+#, python-format
+msgid "Looking up the metadata for file %s..."
+msgstr "Opzoeken van metadata voor bestand %s..."
+
+#: ../picard/puidmanager.py:58
+msgid "Submitting PUIDs..."
+msgstr "PUID's versturen"
+
+#: ../picard/puidmanager.py:64
+#, python-format
+msgid "PUIDs submission failed: %s"
+msgstr "Versturen van PUID's mislukt: %s"
+
+#: ../picard/puidmanager.py:66
+msgid "PUIDs successfully submitted!"
+msgstr "PUID's met succes verstuurd!"
+
+#: ../picard/playlist.py:31
+msgid "M3U Playlist (*.m3u)"
+msgstr "M3U afspeellijst (*.m3u)"
+
+#: ../picard/playlist.py:32
+msgid "PLS Playlist (*.pls)"
+msgstr "PLS afspeellijst (*.pls)"
+
+#: ../picard/playlist.py:33
+msgid "XSPF Playlist (*.xspf)"
+msgstr "XSPF afspeellijst (*.xspf)"
+
+#: ../picard/tagger.py:476
 msgid "CD Lookup Error"
 msgstr "Fout bij opzoeken van CD"
 
-#: ../picard/tagger.py:473
+#: ../picard/tagger.py:477
 #, python-format
 msgid ""
 "Error while reading CD:\n"
@@ -47,126 +1334,174 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../picard/ui/passworddialog.py:38
+#: ../picard/tagger.py:503
 #, python-format
-msgid ""
-"The server %s requires you to login. Please enter your username and password."
-msgstr ""
+msgid "Couldn't find PUID for file %s"
+msgstr "Kon geen PUID vinden voor bestand %s"
 
-#: ../picard/ui/ui_options_script.py:52
-msgid "Tagger Script"
-msgstr "Taggerscript"
+#: ../picard/musicdns/__init__.py:98
+#, python-format
+msgid "Looking up the fingerprint for file %s..."
+msgstr "Opzoeken van vingerafdruk voor bestand %s..."
+
+#: ../picard/musicdns/__init__.py:117
+#, python-format
+msgid "Creating fingerprint for file %s..."
+msgstr "Vingerafdruk nemen van bestand %s..."
 
 #: ../picard/ui/cdlookup.py:31
 msgid "Score"
 msgstr "Score"
 
 #: ../picard/ui/cdlookup.py:31
+#: ../picard/ui/itemviews.py:82
+#: ../picard/util/tags.py:23
 msgid "Title"
 msgstr "Titel"
 
-#: ../picard/ui/cdlookup.py:31 ../picard/ui/mainwindow.py:436
+#: ../picard/ui/cdlookup.py:31
+#: ../picard/ui/itemviews.py:84
+#: ../picard/ui/mainwindow.py:436
+#: ../picard/util/tags.py:22
 msgid "Artist"
 msgstr "Artiest"
 
-#: ../picard/ui/ui_metadata.py:121
-msgid "Lookup"
-msgstr "Opzoeken"
+#: ../picard/ui/coverartbox.py:47
+#: ../picard/ui/options/cover.py:29
+msgid "Cover Art"
+msgstr "Omslagafbeelding"
 
-#: ../picard/ui/ui_metadata.py:122
-msgid "Title:"
-msgstr "Titel:"
+#: ../picard/ui/coverartbox.py:95
+msgid "Buy the album on Amazon"
+msgstr "Album kopen op Amazon"
 
-#: ../picard/ui/ui_metadata.py:123
-msgid "Date:"
-msgstr "Datum:"
+#: ../picard/ui/filebrowser.py:38
+#: ../picard/ui/mainwindow.py:302
+msgid "&Refresh"
+msgstr "Ve&rversen"
 
-#: ../picard/ui/ui_metadata.py:124
-msgid "Artist:"
-msgstr "Artiest:"
+#: ../picard/ui/filebrowser.py:41
+msgid "&Move Tagged Files Here"
+msgstr "&Verplaats getagde bestanden hier naartoe"
 
-#: ../picard/ui/ui_metadata.py:125
-msgid "Track:"
-msgstr "Track:"
+#: ../picard/ui/filebrowser.py:44
+msgid "Show &Hidden Files"
+msgstr "&Verborgen bestanden tonen"
 
-#: ../picard/ui/ui_metadata.py:126
-msgid "0000-00-00; "
-msgstr "0000-00-00; "
+#: ../picard/ui/itemviews.py:83
+msgid "Length"
+msgstr "Lengte"
 
-#: ../picard/ui/ui_metadata.py:127 ../picard/ui/tageditor.py:225
-#: ../picard/ui/multitageditor.py:181
+#: ../picard/ui/itemviews.py:327
+msgid "&Releases"
+msgstr "&Uitgaven"
+
+#: ../picard/ui/itemviews.py:353
+msgid "&Plugins"
+msgstr "&Plugins"
+
+#: ../picard/ui/itemviews.py:523
+msgid "Clusters"
+msgstr "Clusters"
+
+#: ../picard/ui/logview.py:29
+msgid "Log"
+msgstr "Logboek"
+
+#: ../picard/ui/puidsubmit.py:31
+#: ../picard/ui/options/plugins.py:80
+msgid "File"
+msgstr "Bestand"
+
+#: ../picard/ui/puidsubmit.py:31
+msgid "PUID"
+msgstr "PUID"
+
+#: ../picard/ui/puidsubmit.py:31
+#: ../picard/ui/mainwindow.py:437
+msgid "Track"
+msgstr "Track"
+
+#: ../picard/ui/puidsubmit.py:31
+msgid "Release"
+msgstr "Release"
+
+#: ../picard/ui/puidsubmit.py:31
+msgid "Release ID"
+msgstr "Release ID"
+
+#: ../picard/ui/tageditor.py:65
+#: ../picard/ui/ui_options_plugins.py:62
+msgid "Details"
+msgstr "Details"
+
+#: ../picard/ui/tageditor.py:70
+#: ../picard/ui/tageditor.py:241
+#, python-format
+msgid "%d file"
+msgid_plural "%d files"
+msgstr[0] "%d bestand"
+msgstr[1] "%d bestanden"
+
+#: ../picard/ui/tageditor.py:124
+#, python-format
+msgid "(different across %d file)"
+msgid_plural "(different across %d files)"
+msgstr[0] "(verschillend over %d bestand)"
+msgstr[1] "(verschillend over %d bestanden)"
+
+#: ../picard/ui/tageditor.py:127
+#, python-format
+msgid "(missing from %d file)"
+msgid_plural "(missing from %d files)"
+msgstr[0] "(ontbrekend uit %d bestand)"
+msgstr[1] "(ontbrekend uit %d bestanden)"
+
+#: ../picard/ui/tageditor.py:210
+msgid "Filename:"
+msgstr "Bestandsnaam:"
+
+#: ../picard/ui/tageditor.py:212
+msgid "Format:"
+msgstr "Indeling:"
+
+#: ../picard/ui/tageditor.py:221
+msgid "Size:"
+msgstr "Grootte:"
+
+#: ../picard/ui/tageditor.py:225
+#: ../picard/ui/ui_metadata.py:127
 msgid "Length:"
 msgstr "Duur:"
 
-#: ../picard/ui/ui_metadata.py:128
-msgid "Album:"
-msgstr "Album:"
+#: ../picard/ui/tageditor.py:227
+msgid "Bitrate:"
+msgstr "Bitrate:"
 
-#: ../picard/ui/ui_passworddialog.py:78
-#, fuzzy
-msgid "Authentication required"
-msgstr "Unicode is vereist"
+#: ../picard/ui/tageditor.py:229
+msgid "Sample rate:"
+msgstr "Sample rate:"
 
-#: ../picard/ui/ui_passworddialog.py:79 ../picard/ui/ui_options_proxy.py:83
-#: ../picard/ui/ui_options_general.py:113
-msgid "Username:"
-msgstr "Gebruikersnaam:"
+#: ../picard/ui/tageditor.py:231
+msgid "Bits per sample:"
+msgstr "Bits per sample:"
 
-#: ../picard/ui/ui_passworddialog.py:80 ../picard/ui/ui_options_proxy.py:82
-#: ../picard/ui/ui_options_general.py:112
-msgid "Password:"
-msgstr "Wachtwoord:"
+#: ../picard/ui/tageditor.py:234
+msgid "Mono"
+msgstr "Mono"
 
-#: ../picard/ui/ui_passworddialog.py:81
-msgid "Save username and password"
-msgstr ""
+#: ../picard/ui/tageditor.py:235
+msgid "Stereo"
+msgstr "Stereo"
 
-#: ../picard/ui/ui_options_folksonomy.py:114
-#: ../picard/ui/ui_options_folksonomy_tags.py:114
-msgid "Folksonomy Tags"
-msgstr "Folksonomielabels"
+#: ../picard/ui/tageditor.py:237
+msgid "Channels:"
+msgstr "Kanalen:"
 
-#: ../picard/ui/ui_options_folksonomy.py:115
-#: ../picard/ui/ui_options_folksonomy_tags.py:115
-msgid "Ignore tags:"
-msgstr "Negeer labels:"
-
-#: ../picard/ui/ui_options_folksonomy.py:116
-#: ../picard/ui/ui_options_folksonomy_tags.py:116
-msgid "Minimal tag usage:"
-msgstr "Minimaal labelgebruik:"
-
-#: ../picard/ui/ui_options_folksonomy.py:117
-#: ../picard/ui/ui_options_folksonomy_tags.py:117
-#: ../picard/ui/ui_options_matching.py:107
-#: ../picard/ui/ui_options_matching.py:108
-#: ../picard/ui/ui_options_matching.py:109
-#: ../picard/ui/ui_options_matching.py:113
-msgid " %"
-msgstr " %"
-
-#: ../picard/ui/ui_options_folksonomy.py:118
-msgid "Maximum number of tags:"
-msgstr "Maximum aantal labels:"
-
-#: ../picard/ui/ui_options_folksonomy.py:119
-#: ../picard/ui/ui_options_folksonomy_tags.py:119
-msgid "Join multiple tags with:"
-msgstr "Verenig meerdere labels met:"
-
-#: ../picard/ui/ui_options_folksonomy.py:120
-#: ../picard/ui/ui_options_folksonomy_tags.py:120
-msgid " / "
-msgstr " / "
-
-#: ../picard/ui/ui_options_folksonomy.py:121
-#: ../picard/ui/ui_options_folksonomy_tags.py:121
-msgid ", "
-msgstr ", "
-
-#: ../picard/ui/ui_options_folksonomy_tags.py:118
-msgid "Maximal number of tags:"
-msgstr "Maximaal aantal labels:"
+#: ../picard/ui/tagsfromfilenames.py:52
+#: ../picard/ui/tagsfromfilenames.py:96
+msgid "File Name"
+msgstr "Bestandsnaam"
 
 #: ../picard/ui/mainwindow.py:64
 msgid "MusicBrainz Picard"
@@ -209,9 +1544,8 @@ msgid "&About..."
 msgstr "&Info..."
 
 #: ../picard/ui/mainwindow.py:210
-#, fuzzy
 msgid "&Donate..."
-msgstr "&Info..."
+msgstr "&Doneer..."
 
 #: ../picard/ui/mainwindow.py:213
 msgid "&Report a Bug..."
@@ -301,7 +1635,8 @@ msgstr "Zoeken"
 msgid "&CD Lookup..."
 msgstr "&CD Opzoeken..."
 
-#: ../picard/ui/mainwindow.py:272 ../picard/ui/mainwindow.py:273
+#: ../picard/ui/mainwindow.py:272
+#: ../picard/ui/mainwindow.py:273
 msgid "Lookup CD"
 msgstr "CD opzoeken"
 
@@ -332,7 +1667,8 @@ msgstr "Ctrl+U"
 msgid "&Lookup"
 msgstr "&Opzoeken"
 
-#: ../picard/ui/mainwindow.py:291 ../picard/ui/mainwindow.py:292
+#: ../picard/ui/mainwindow.py:291
+#: ../picard/ui/mainwindow.py:292
 msgid "Lookup metadata"
 msgstr "Metadata opzoeken"
 
@@ -345,10 +1681,6 @@ msgstr "Ctrl+L"
 msgid "&Details..."
 msgstr "&Details..."
 
-#: ../picard/ui/mainwindow.py:302 ../picard/ui/filebrowser.py:38
-msgid "&Refresh"
-msgstr "Ve&rversen"
-
 #: ../picard/ui/mainwindow.py:305
 msgid "Generate &Playlist..."
 msgstr "&Playlist genereren"
@@ -394,6 +1726,7 @@ msgid "&Tools"
 msgstr "&Hulpmiddelen"
 
 #: ../picard/ui/mainwindow.py:384
+#: ../picard/ui/util.py:33
 msgid "&Help"
 msgstr "&Help"
 
@@ -406,13 +1739,10 @@ msgid "&Search Bar"
 msgstr "&Zoekbalk"
 
 #: ../picard/ui/mainwindow.py:435
+#: ../picard/util/tags.py:21
 msgid "Album"
 msgstr "Album"
 
-#: ../picard/ui/mainwindow.py:437 ../picard/ui/puidsubmit.py:31
-msgid "Track"
-msgstr "Track"
-
 #: ../picard/ui/mainwindow.py:476
 msgid "All Supported Formats"
 msgstr "Alle ondersteunde formaten"
@@ -427,37 +1757,289 @@ msgstr "Opslaan van afspeellijst %s..."
 msgid "Playlist %s saved"
 msgstr "Afspeellijst %s opgeslagen"
 
-#: ../picard/ui/mainwindow.py:638 ../picard/ui/mainwindow.py:647
+#: ../picard/ui/mainwindow.py:638
+#: ../picard/ui/mainwindow.py:647
 #, python-format
 msgid " (Error: %s)"
 msgstr " (Fout: %s)"
 
+#: ../picard/ui/ui_tageditor.py:115
+#: ../picard/ui/ui_options_plugins.py:59
+#: ../picard/ui/options/plugins.py:76
+msgid "Name"
+msgstr "Naam"
+
+#: ../picard/ui/ui_tageditor.py:116
+msgid "Value"
+msgstr "Waarde"
+
+#: ../picard/ui/ui_tageditor.py:117
+msgid "&Add..."
+msgstr "&Toevoegen..."
+
+#: ../picard/ui/ui_tageditor.py:118
+msgid "&Edit..."
+msgstr "&Bewerken..."
+
+#: ../picard/ui/ui_tageditor.py:119
+msgid "&Delete"
+msgstr "&Verwijderen"
+
+#: ../picard/ui/ui_tageditor.py:120
+msgid "&Metadata"
+msgstr "&Metadata"
+
+#: ../picard/ui/ui_tageditor.py:121
+msgid "A&rtwork"
+msgstr "A&fbeeldingen"
+
+#: ../picard/ui/ui_tageditor.py:122
+msgid "&Info"
+msgstr "&Info"
+
+#: ../picard/ui/passworddialog.py:38
+#, python-format
+msgid "The server %s requires you to login. Please enter your username and password."
+msgstr "Server %s vereist dat je bent ingelogd. Voor a.j.b. je loginnaam en wachtwoord in."
+
+#: ../picard/ui/ui_cdlookup.py:60
+#: ../picard/ui/ui_options_cdlookup.py:47
+#: ../picard/ui/ui_options_cdlookup_win32.py:56
+#: ../picard/ui/options/cdlookup.py:35
+msgid "CD Lookup"
+msgstr "CD opzoeken"
+
+#: ../picard/ui/ui_cdlookup.py:61
+msgid "The following releases on MusicBrainz match the CD:"
+msgstr "De volgende releases op MusicBrainz komen overeen met de CD:"
+
+#: ../picard/ui/ui_cdlookup.py:62
+#: ../picard/ui/ui_puidsubmit.py:53
+msgid "OK"
+msgstr "OK"
+
+#: ../picard/ui/ui_cdlookup.py:63
+msgid "    Lookup manually    "
+msgstr "    Handmatig opzoeken    "
+
+#: ../picard/ui/ui_cdlookup.py:64
+#: ../picard/ui/ui_puidsubmit.py:54
+msgid "Cancel"
+msgstr "Annuleren"
+
+#: ../picard/ui/ui_passworddialog.py:78
+msgid "Authentication required"
+msgstr "Aanmelding vereist"
+
+#: ../picard/ui/ui_passworddialog.py:79
+#: ../picard/ui/ui_options_general.py:113
+#: ../picard/ui/ui_options_proxy.py:83
+msgid "Username:"
+msgstr "Gebruikersnaam:"
+
+#: ../picard/ui/ui_passworddialog.py:80
+#: ../picard/ui/ui_options_general.py:112
+#: ../picard/ui/ui_options_proxy.py:82
+msgid "Password:"
+msgstr "Wachtwoord:"
+
+#: ../picard/ui/ui_passworddialog.py:81
+msgid "Save username and password"
+msgstr "Sla loginnaam en wachtwoord op"
+
 #: ../picard/ui/ui_edittagdialog.py:44
 msgid "Edit Tag"
 msgstr "Tag bewerken"
 
-#: ../picard/ui/ui_options_proxy.py:81
-msgid "Web Proxy"
-msgstr "Webproxy"
+#: ../picard/ui/ui_metadata.py:121
+msgid "Lookup"
+msgstr "Opzoeken"
 
-#: ../picard/ui/ui_options_proxy.py:84 ../picard/ui/ui_options_general.py:109
-msgid "Port:"
-msgstr "Poort:"
+#: ../picard/ui/ui_metadata.py:122
+msgid "Title:"
+msgstr "Titel:"
 
-#: ../picard/ui/ui_options_proxy.py:85 ../picard/ui/ui_options_general.py:110
-msgid "Server address:"
-msgstr "Serveradres:"
+#: ../picard/ui/ui_metadata.py:123
+msgid "Date:"
+msgstr "Datum:"
 
-#: ../picard/ui/ui_tagsfromfilenames.py:56
-msgid "Convert File Names to Tags"
-msgstr "Bestandsnamen naar tags converteren"
+#: ../picard/ui/ui_metadata.py:124
+msgid "Artist:"
+msgstr "Artiest:"
 
-#: ../picard/ui/ui_tagsfromfilenames.py:57
-msgid "Replace underscores with spaces"
-msgstr "Underscores vervangen door spaties"
+#: ../picard/ui/ui_metadata.py:125
+msgid "Track:"
+msgstr "Track:"
+
+#: ../picard/ui/ui_metadata.py:126
+msgid "0000-00-00; "
+msgstr "0000-00-00; "
+
+#: ../picard/ui/ui_metadata.py:128
+msgid "Album:"
+msgstr "Album:"
+
+#: ../picard/ui/ui_options.py:42
+msgid "Options"
+msgstr "Opties"
+
+#: ../picard/ui/ui_options_cdlookup.py:48
+msgid "CD-ROM device to use for lookups:"
+msgstr "CD-ROM-apparaat voor opzoeken van CD's:"
+
+#: ../picard/ui/ui_options_cdlookup_win32.py:57
+msgid "Default CD-ROM drive to use for lookups:"
+msgstr "Standaard CD-ROM-apparaat voor opzoeken van CD's:"
+
+#: ../picard/ui/ui_options_cover.py:56
+msgid "Location"
+msgstr "Locatie"
+
+#: ../picard/ui/ui_options_cover.py:57
+msgid "Embed cover images into tags"
+msgstr "Omslagafbeeldingen in tags opslaan"
+
+#: ../picard/ui/ui_options_cover.py:58
+msgid "Save cover images as separate files"
+msgstr "Omslagafbeeldingen als aparte bestanden opslaan"
+
+#: ../picard/ui/ui_options_cover.py:59
+msgid "Overwrite the file if it already exists"
+msgstr "Overschrijven als het bestand al bestaat"
+
+#: ../picard/ui/util.py:31
+msgid "&Ok"
+msgstr "&Ok"
+
+#: ../picard/ui/util.py:32
+msgid "&Cancel"
+msgstr "A&nnuleren"
+
+#: ../picard/ui/ui_puidsubmit.py:52
+msgid "Submit PUIDs"
+msgstr "PUID's versturen"
+
+#: ../picard/ui/ui_options_folksonomy.py:114
+#: ../picard/ui/options/folksonomy.py:29
+msgid "Folksonomy Tags"
+msgstr "Folksonomielabels"
+
+#: ../picard/ui/ui_options_folksonomy.py:115
+msgid "Ignore tags:"
+msgstr "Negeer labels:"
+
+#: ../picard/ui/ui_options_folksonomy.py:116
+msgid "Minimal tag usage:"
+msgstr "Minimaal labelgebruik:"
+
+#: ../picard/ui/ui_options_folksonomy.py:117
+#: ../picard/ui/ui_options_matching.py:107
+#: ../picard/ui/ui_options_matching.py:108
+#: ../picard/ui/ui_options_matching.py:109
+#: ../picard/ui/ui_options_matching.py:113
+msgid " %"
+msgstr " %"
+
+#: ../picard/ui/ui_options_folksonomy.py:118
+msgid "Maximum number of tags:"
+msgstr "Maximum aantal labels:"
+
+#: ../picard/ui/ui_options_folksonomy.py:119
+msgid "Join multiple tags with:"
+msgstr "Verenig meerdere labels met:"
+
+#: ../picard/ui/ui_options_folksonomy.py:120
+msgid " / "
+msgstr " / "
+
+#: ../picard/ui/ui_options_folksonomy.py:121
+msgid ", "
+msgstr ", "
+
+#: ../picard/ui/ui_options_interface.py:50
+msgid "Miscellaneous"
+msgstr "Diversen"
+
+#: ../picard/ui/ui_options_interface.py:51
+msgid "Show text labels under icons"
+msgstr "Tekstlabels onder pictogrammen"
+
+#: ../picard/ui/ui_options_interface.py:52
+msgid "Allow selection of multiple directories"
+msgstr "Sta het selecteren van meerdere mappen toe"
+
+#: ../picard/ui/ui_options_interface.py:53
+msgid "Use advanced query syntax"
+msgstr "Gebruik geavanceerde query-syntax"
+
+#: ../picard/ui/ui_options_interface.py:54
+#, fuzzy
+msgid "User interface language:"
+msgstr "Gebruikersinterface"
+
+#: ../picard/ui/ui_options_naming.py:165
+msgid "Rename Files"
+msgstr "Bestanden hernoemen"
+
+#: ../picard/ui/ui_options_naming.py:166
+msgid "Replace Windows-incompatible characters"
+msgstr "Windows-incompatible karakters vervangen"
+
+#: ../picard/ui/ui_options_naming.py:167
+msgid "Replace non-ASCII characters"
+msgstr "Niet-ASCII karakters vervangen"
+
+#: ../picard/ui/ui_options_naming.py:168
+#: ../picard/ui/ui_options_naming.py:169
+#: ../picard/ui/ui_options_metadata.py:109
+#: ../picard/ui/ui_options_metadata.py:110
+msgid "Default"
+msgstr "Standaard"
+
+#: ../picard/ui/ui_options_naming.py:170
+#: ../picard/ui/options/naming.py:90
+msgid "Multiple artist file naming format:"
+msgstr "Bestandnaamsopmaak voor meedere artiesten:"
+
+#: ../picard/ui/ui_options_naming.py:171
+#: ../picard/ui/options/naming.py:86
+msgid "File naming format:"
+msgstr "Bestandnaamsopmaak"
+
+#: ../picard/ui/ui_options_naming.py:172
+msgid "Move Files"
+msgstr "Bestanden verplaatsen"
+
+#: ../picard/ui/ui_options_naming.py:173
+msgid "Move tagged files to this directory:"
+msgstr "Getagde bestanden naar deze map verplaatsen"
+
+#: ../picard/ui/ui_options_naming.py:174
+msgid "Browse..."
+msgstr "Bladeren..."
+
+#: ../picard/ui/ui_options_naming.py:175
+msgid "Move additional files:"
+msgstr "Extra bestanden verplaatsen..."
+
+#: ../picard/ui/ui_options_naming.py:176
+msgid "Delete empty directories"
+msgstr "Lege mappen verwijderen"
+
+#: ../picard/ui/ui_options_naming.py:177
+msgid "Example"
+msgstr "Voorbeeld"
+
+#: ../picard/ui/ui_options_naming.py:178
+msgid "File name:"
+msgstr "Bestandsnaam:"
+
+#: ../picard/ui/ui_options_naming.py:179
+msgid "Multiple artist file name:"
+msgstr "Bestandsnaam voor meerdere artiesten:"
 
-#: ../picard/ui/ui_tagsfromfilenames.py:58
 #: ../picard/ui/ui_options_naming.py:180
+#: ../picard/ui/ui_tagsfromfilenames.py:58
 msgid "&Preview"
 msgstr "&Voorbeeldweergave"
 
@@ -465,11 +2047,22 @@ msgstr "&Voorbeeldweergave"
 msgid "MusicBrainz Server"
 msgstr "MusicBrainz server"
 
+#: ../picard/ui/ui_options_general.py:109
+#: ../picard/ui/ui_options_proxy.py:84
+msgid "Port:"
+msgstr "Poort:"
+
+#: ../picard/ui/ui_options_general.py:110
+#: ../picard/ui/ui_options_proxy.py:85
+msgid "Server address:"
+msgstr "Serveradres:"
+
 #: ../picard/ui/ui_options_general.py:111
 msgid "Account Information"
 msgstr "Account-informatie"
 
 #: ../picard/ui/ui_options_general.py:114
+#: ../picard/ui/options/general.py:29
 msgid "General"
 msgstr "Algemeen"
 
@@ -477,34 +2070,6 @@ msgstr "Algemeen"
 msgid "Automatically scan all new files"
 msgstr "Automatisch alle nieuwe bestanden analyseren"
 
-#: ../picard/ui/ui_options_interface.py:46
-msgid "Miscellaneous"
-msgstr "Diversen"
-
-#: ../picard/ui/ui_options_interface.py:47
-msgid "Show text labels under icons"
-msgstr "Tekstlabels onder pictogrammen"
-
-#: ../picard/ui/ui_options_interface.py:48
-msgid "Allow selection of multiple directories"
-msgstr "Sta het selecteren van meerdere mappen toe"
-
-#: ../picard/ui/ui_options_interface.py:49
-msgid "Use advanced query syntax"
-msgstr "Gebruik geavanceerde query-syntax"
-
-#: ../picard/ui/itemviews.py:327
-msgid "&Releases"
-msgstr "&Uitgaven"
-
-#: ../picard/ui/itemviews.py:353
-msgid "&Plugins"
-msgstr "&Plugins"
-
-#: ../picard/ui/itemviews.py:523
-msgid "Clusters"
-msgstr "Clusters"
-
 #: ../picard/ui/ui_options_matching.py:105
 msgid "Thresholds"
 msgstr "Drempels"
@@ -525,6 +2090,68 @@ msgstr "Minimum overeenkomst voor opzoeken van clusters:"
 msgid "Minimal similarity for PUID lookups:"
 msgstr "Minimum overeenkomst voor opzoeken van PUID's:"
 
+#: ../picard/ui/ui_options_metadata.py:100
+#: ../picard/ui/options/metadata.py:31
+msgid "Metadata"
+msgstr "Metadata"
+
+#: ../picard/ui/ui_options_metadata.py:101
+msgid "Translate foreign artist names to English where possible"
+msgstr "Waar mogelijk niet-Westerse artiestennamen naar Engels vertalen."
+
+#: ../picard/ui/ui_options_metadata.py:102
+msgid "Use release relationships"
+msgstr "Gebruik release-verwantschappen"
+
+#: ../picard/ui/ui_options_metadata.py:103
+msgid "Use track relationships"
+msgstr "Gebruik track-verwantschappen"
+
+#: ../picard/ui/ui_options_metadata.py:104
+msgid "Use folksonomy tags as genre"
+msgstr "Gebruik folksonomielabels als genre."
+
+#: ../picard/ui/ui_options_metadata.py:105
+#, fuzzy
+msgid "Preferred release country:"
+msgstr "Releasetype"
+
+#: ../picard/ui/ui_options_metadata.py:106
+msgid "Custom Fields"
+msgstr "Aangepaste velden"
+
+#: ../picard/ui/ui_options_metadata.py:107
+msgid "Various artists:"
+msgstr "Compilatie:"
+
+#: ../picard/ui/ui_options_metadata.py:108
+msgid "Non-album tracks:"
+msgstr "Niet-album tracks:"
+
+#: ../picard/ui/ui_options_plugins.py:58
+#: ../picard/ui/options/plugins.py:30
+msgid "Plugins"
+msgstr "Plugins"
+
+#: ../picard/ui/ui_options_plugins.py:60
+#: ../picard/ui/options/plugins.py:79
+msgid "Author"
+msgstr "Auteur"
+
+#: ../picard/ui/ui_options_plugins.py:61
+#: ../picard/util/tags.py:36
+msgid "Version"
+msgstr "Versie"
+
+#: ../picard/ui/ui_options_proxy.py:81
+#: ../picard/ui/options/proxy.py:28
+msgid "Web Proxy"
+msgstr "Webproxy"
+
+#: ../picard/ui/ui_options_script.py:52
+msgid "Tagger Script"
+msgstr "Taggerscript"
+
 #: ../picard/ui/ui_options_tags.py:105
 msgid "Common"
 msgstr "Gezamelijk"
@@ -577,340 +2204,28 @@ msgstr "APE"
 msgid "Remove APEv2 tags from MP3 files"
 msgstr "APEv2 tags uit MP3-bestanden verwijderen"
 
-#: ../picard/ui/ui_options_cdlookup_win32.py:56 ../picard/ui/ui_cdlookup.py:60
-#: ../picard/ui/ui_options_cdlookup.py:47
-msgid "CD Lookup"
-msgstr "CD opzoeken"
+#: ../picard/ui/ui_tagsfromfilenames.py:56
+msgid "Convert File Names to Tags"
+msgstr "Bestandsnamen naar tags converteren"
 
-#: ../picard/ui/ui_options_cdlookup_win32.py:57
-msgid "Default CD-ROM drive to use for lookups:"
-msgstr "Standaard CD-ROM-apparaat voor opzoeken van CD's:"
+#: ../picard/ui/ui_tagsfromfilenames.py:57
+msgid "Replace underscores with spaces"
+msgstr "Underscores vervangen door spaties"
 
-#: ../picard/ui/tageditor.py:65 ../picard/ui/ui_options_plugins.py:62
-#: ../picard/ui/multitageditor.py:37
-msgid "Details"
-msgstr "Details"
-
-#: ../picard/ui/tageditor.py:70 ../picard/ui/tageditor.py:241
-#: ../picard/ui/multitageditor.py:42 ../picard/ui/multitageditor.py:197
-#, python-format
-msgid "%d file"
-msgid_plural "%d files"
-msgstr[0] "%d bestand"
-msgstr[1] "%d bestanden"
-
-#: ../picard/ui/tageditor.py:124 ../picard/ui/multitageditor.py:95
-#, python-format
-msgid "(different across %d file)"
-msgid_plural "(different across %d files)"
-msgstr[0] "(verschillend over %d bestand)"
-msgstr[1] "(verschillend over %d bestanden)"
-
-#: ../picard/ui/tageditor.py:127 ../picard/ui/multitageditor.py:98
-#, python-format
-msgid "(missing from %d file)"
-msgid_plural "(missing from %d files)"
-msgstr[0] "(ontbrekend uit %d bestand)"
-msgstr[1] "(ontbrekend uit %d bestanden)"
-
-#: ../picard/ui/tageditor.py:210 ../picard/ui/multitageditor.py:166
-msgid "Filename:"
-msgstr "Bestandsnaam:"
-
-#: ../picard/ui/tageditor.py:212 ../picard/ui/multitageditor.py:168
-msgid "Format:"
-msgstr "Indeling:"
-
-#: ../picard/ui/tageditor.py:221 ../picard/ui/multitageditor.py:177
-msgid "Size:"
-msgstr "Grootte:"
-
-#: ../picard/ui/tageditor.py:227 ../picard/ui/multitageditor.py:183
-msgid "Bitrate:"
-msgstr "Bitrate:"
-
-#: ../picard/ui/tageditor.py:229 ../picard/ui/multitageditor.py:185
-msgid "Sample rate:"
-msgstr "Sample rate:"
-
-#: ../picard/ui/tageditor.py:231 ../picard/ui/multitageditor.py:187
-msgid "Bits per sample:"
-msgstr "Bits per sample:"
-
-#: ../picard/ui/tageditor.py:234 ../picard/ui/multitageditor.py:190
-msgid "Mono"
-msgstr "Mono"
-
-#: ../picard/ui/tageditor.py:235 ../picard/ui/multitageditor.py:191
-msgid "Stereo"
-msgstr "Stereo"
-
-#: ../picard/ui/tageditor.py:237 ../picard/ui/multitageditor.py:193
-msgid "Channels:"
-msgstr "Kanalen:"
-
-#: ../picard/ui/ui_tageditor.py:115 ../picard/ui/ui_multitageditor.py:55
-#: ../picard/ui/ui_options_plugins.py:59 ../picard/ui/options/plugins.py:76
-msgid "Name"
-msgstr "Naam"
-
-#: ../picard/ui/ui_tageditor.py:116 ../picard/ui/ui_multitageditor.py:56
-msgid "Value"
-msgstr "Waarde"
-
-#: ../picard/ui/ui_tageditor.py:117 ../picard/ui/ui_multitageditor.py:57
-msgid "&Add..."
-msgstr "&Toevoegen..."
-
-#: ../picard/ui/ui_tageditor.py:118
-msgid "&Edit..."
-msgstr "&Bewerken..."
-
-#: ../picard/ui/ui_tageditor.py:119
-msgid "&Delete"
-msgstr "&Verwijderen"
-
-#: ../picard/ui/ui_tageditor.py:120
-msgid "&Metadata"
-msgstr "&Metadata"
-
-#: ../picard/ui/ui_tageditor.py:121
-msgid "A&rtwork"
-msgstr "A&fbeeldingen"
-
-#: ../picard/ui/ui_tageditor.py:122
-msgid "&Info"
-msgstr "&Info"
-
-#: ../picard/ui/coverartbox.py:47
-msgid "Cover Art"
-msgstr "Omslagafbeelding"
-
-#: ../picard/ui/coverartbox.py:95
-msgid "Buy the album on Amazon"
-msgstr "Album kopen op Amazon"
-
-#: ../picard/ui/ui_puidsubmit.py:52
-msgid "Submit PUIDs"
-msgstr "PUID's versturen"
-
-#: ../picard/ui/ui_puidsubmit.py:53 ../picard/ui/ui_cdlookup.py:62
-msgid "OK"
-msgstr "OK"
-
-#: ../picard/ui/ui_puidsubmit.py:54 ../picard/ui/ui_cdlookup.py:64
-msgid "Cancel"
-msgstr "Annuleren"
-
-#: ../picard/ui/puidsubmit.py:31 ../picard/ui/options/plugins.py:80
-msgid "File"
-msgstr "Bestand"
-
-#: ../picard/ui/puidsubmit.py:31
-msgid "PUID"
-msgstr "PUID"
-
-#: ../picard/ui/puidsubmit.py:31
-msgid "Release"
-msgstr "Release"
-
-#: ../picard/ui/puidsubmit.py:31
-msgid "Release ID"
-msgstr "Release ID"
-
-#: ../picard/ui/filebrowser.py:41
-#, fuzzy
-msgid "&Move Tagged Files Here"
-msgstr "Bestanden &verplaatsen"
-
-#: ../picard/ui/filebrowser.py:44
-msgid "Show &Hidden Files"
-msgstr ""
-
-#: ../picard/ui/ui_cdlookup.py:61
-msgid "The following releases on MusicBrainz match the CD:"
-msgstr "De volgende releases op MusicBrainz komen overeen met de CD:"
-
-#: ../picard/ui/ui_cdlookup.py:63
-msgid "    Lookup manually    "
-msgstr "    Handmatig opzoeken    "
-
-#: ../picard/ui/ui_options.py:42
-msgid "Options"
-msgstr "Opties"
-
-#: ../picard/ui/tagsfromfilenames.py:52 ../picard/ui/tagsfromfilenames.py:96
-msgid "File Name"
-msgstr "Bestandsnaam"
-
-#: ../picard/ui/ui_options_cover.py:56
-msgid "Location"
-msgstr "Locatie"
-
-#: ../picard/ui/ui_options_cover.py:57
-msgid "Embed cover images into tags"
-msgstr "Omslagafbeeldingen in tags opslaan"
-
-#: ../picard/ui/ui_options_cover.py:58
-msgid "Save cover images as separate files"
-msgstr "Omslagafbeeldingen als aparte bestanden opslaan"
-
-#: ../picard/ui/ui_options_cover.py:59
-msgid "Overwrite the file if it already exists"
-msgstr "Overschrijven als het bestand al bestaat"
-
-#: ../picard/ui/ui_options_metadata.py:100
-msgid "Metadata"
-msgstr "Metadata"
-
-#: ../picard/ui/ui_options_metadata.py:101
-msgid "Translate foreign artist names to English where possible"
-msgstr "Waar mogelijk niet-Westerse artiestennamen naar Engels vertalen."
-
-#: ../picard/ui/ui_options_metadata.py:102
-msgid "Use release relationships"
-msgstr "Gebruik release-verwantschappen"
-
-#: ../picard/ui/ui_options_metadata.py:103
-msgid "Use track relationships"
-msgstr "Gebruik track-verwantschappen"
-
-#: ../picard/ui/ui_options_metadata.py:104
-msgid "Use folksonomy tags as genre"
-msgstr "Gebruik folksonomielabels als genre."
-
-#: ../picard/ui/ui_options_metadata.py:105
-#, fuzzy
-msgid "Preferred release country:"
-msgstr "Releaseland"
-
-#: ../picard/ui/ui_options_metadata.py:106
-msgid "Custom Fields"
-msgstr "Aangepaste velden"
-
-#: ../picard/ui/ui_options_metadata.py:107
-msgid "Various artists:"
-msgstr "Compilatie:"
-
-#: ../picard/ui/ui_options_metadata.py:108
-msgid "Non-album tracks:"
-msgstr "Niet-album tracks:"
-
-#: ../picard/ui/ui_options_metadata.py:109
-#: ../picard/ui/ui_options_metadata.py:110
-#: ../picard/ui/ui_options_naming.py:168 ../picard/ui/ui_options_naming.py:169
-msgid "Default"
-msgstr "Standaard"
-
-#: ../picard/ui/ui_multitageditor.py:58
-msgid "Delete"
-msgstr "Verwijderen"
-
-#: ../picard/ui/logview.py:29
-msgid "Log"
-msgstr "Logboek"
-
-#: ../picard/ui/ui_options_plugins.py:58
-msgid "Plugins"
-msgstr "Plugins"
-
-#: ../picard/ui/ui_options_plugins.py:60 ../picard/ui/options/plugins.py:79
-msgid "Author"
-msgstr "Auteur"
-
-#: ../picard/ui/ui_options_plugins.py:61
-msgid "Version"
-msgstr "Versie"
-
-#: ../picard/ui/ui_options_naming.py:165
-msgid "Rename Files"
-msgstr "Bestanden hernoemen"
-
-#: ../picard/ui/ui_options_naming.py:166
-msgid "Replace Windows-incompatible characters"
-msgstr "Windows-incompatible karakters vervangen"
-
-#: ../picard/ui/ui_options_naming.py:167
-msgid "Replace non-ASCII characters"
-msgstr "Niet-ASCII karakters vervangen"
-
-#: ../picard/ui/ui_options_naming.py:170 ../picard/ui/options/naming.py:90
-msgid "Multiple artist file naming format:"
-msgstr "Bestandnaamsopmaak voor meedere artiesten:"
-
-#: ../picard/ui/ui_options_naming.py:171 ../picard/ui/options/naming.py:86
-msgid "File naming format:"
-msgstr "Bestandnaamsopmaak"
-
-#: ../picard/ui/ui_options_naming.py:172
-msgid "Move Files"
-msgstr "Bestanden verplaatsen"
-
-#: ../picard/ui/ui_options_naming.py:173
-msgid "Move tagged files to this directory:"
-msgstr "Getagde bestanden naar deze map verplaatsen"
-
-#: ../picard/ui/ui_options_naming.py:174
-msgid "Browse..."
-msgstr "Bladeren..."
-
-#: ../picard/ui/ui_options_naming.py:175
-msgid "Move additional files:"
-msgstr "Extra bestanden verplaatsen..."
-
-#: ../picard/ui/ui_options_naming.py:176
-msgid "Delete empty directories"
-msgstr "Lege mappen verwijderen"
-
-#: ../picard/ui/ui_options_naming.py:177
-msgid "Example"
-msgstr "Voorbeeld"
-
-#: ../picard/ui/ui_options_naming.py:178
-msgid "File name:"
-msgstr "Bestandsnaam:"
-
-#: ../picard/ui/ui_options_naming.py:179
-msgid "Multiple artist file name:"
-msgstr "Bestandsnaam voor meerdere artiesten:"
-
-#: ../picard/ui/ui_options_cdlookup.py:48
-msgid "CD-ROM device to use for lookups:"
-msgstr "CD-ROM-apparaat voor opzoeken van CD's:"
-
-#: ../picard/ui/options/scripting.py:84 ../picard/ui/options/naming.py:86
-#: ../picard/ui/options/naming.py:90 ../picard/ui/options/naming.py:93
-#: ../picard/ui/options/naming.py:95
-msgid "Script Error"
-msgstr "Scriptfout"
+#: ../picard/ui/options/about.py:29
+msgid "About"
+msgstr "Info"
 
 #. Replace this with your name to have it appear in the "About" dialog.
 #: ../picard/ui/options/about.py:48
 msgid "translator-credits"
 msgstr ""
 "Launchpad Contributions:\n"
-"  Balaam's Miracle <https://launchpad.net/~balaam-balaamsmiracle>\n"
-"  Prodoc <https://launchpad.net/~age>\n"
-"\n"
-"Launchpad Contributions:\n"
 "  Balaam's Miracle https://launchpad.net/~balaam-balaamsmiracle\n"
 "  Prodoc https://launchpad.net/~age\n"
-"\n"
-"Launchpad Contributions:\n"
-"  Balaam's Miracle https://launchpad.net/~balaam-balaamsmiracle\n"
-"  Prodoc https://launchpad.net/~age\n"
-"\n"
-"Launchpad Contributions:\n"
-"  Balaam's Miracle https://launchpad.net/~balaam-balaamsmiracle\n"
 "  Lukáš Lalinský https://launchpad.net/~luks\n"
 "  Mathijs https://launchpad.net/~mathijssch\n"
-"  Prodoc https://launchpad.net/~age\n"
-"\n"
-"Launchpad Contributions:\n"
-"  Balaam's Miracle https://launchpad.net/~balaam-balaamsmiracle\n"
-"  Lukáš Lalinský https://launchpad.net/~luks\n"
-"  Mathijs https://launchpad.net/~mathijssch\n"
-"  Prodoc https://launchpad.net/~age"
+"  Zout https://launchpad.net/~zout"
 
 #. Replace LANG with language you are translatig to.
 #: ../picard/ui/options/about.py:51
@@ -921,48 +2236,309 @@ msgstr "<br/>Nederlandse vertaling door %s"
 #: ../picard/ui/options/about.py:55
 #, fuzzy, python-format
 msgid ""
-"<p align=\"center\"><span style=\"font-size:15px;font-weight:bold;"
-"\">MusicBrainz Picard</span><br/>\n"
+"<p align=\"center\"><span style=\"font-size:15px;font-weight:bold;\">MusicBrainz Picard</span><br/>\n"
 "Version %(version)s</p>\n"
 "<p align=\"center\"><strong>Supported formats</strong><br/>%(formats)s</p>\n"
 "<p align=\"center\"><strong>Please donate</strong><br/>\n"
-"Thank you for using Picard. Picard relies on the MusicBrainz database, which "
-"is operated by the MetaBrainz Foundation with the help of thousands of "
-"volunteers. If you like this application please consider donating to the "
-"MetaBrainz Foundation to keep the service running.</p>\n"
-"<p align=\"center\"><a href=\"http://metabrainz.org/donate/index.html"
-"\">Donate now!</a></p>\n"
+"Thank you for using Picard. Picard relies on the MusicBrainz database, which is operated by the MetaBrainz Foundation with the help of thousands of volunteers. If you like this application please consider donating to the MetaBrainz Foundation to keep the service running.</p>\n"
+"<p align=\"center\"><a href=\"http://metabrainz.org/donate/index.html\">Donate now!</a></p>\n"
 "<p align=\"center\"><strong>Credits</strong><br/>\n"
-"<small>Copyright © 2004-2008 Robert Kaye, Lukáš Lalinský and others%"
-"(translator-credits)s</small></p>\n"
-"<p align=\"center\"><a href=\"http://musicbrainz.org/doc/PicardTagger"
-"\">http://musicbrainz.org/doc/PicardTagger</a></p>\n"
+"<small>Copyright © 2004-2008 Robert Kaye, Lukáš Lalinský and others%(translator-credits)s</small></p>\n"
+"<p align=\"center\"><a href=\"http://musicbrainz.org/doc/PicardTagger\">http://musicbrainz.org/doc/PicardTagger</a></p>\n"
 msgstr ""
-"<p><span style=\"font-size:15px;font-weight:bold;\">MusicBrainz Picard</"
-"span><br/>\n"
+"<p><span style=\"font-size:15px;font-weight:bold;\">MusicBrainz Picard</span><br/>\n"
 "Versie %(version)s</p>\n"
 "<p><strong>Ondersteunde indelingen:</strong> %(formats)s</p>\n"
-"<p><small>Copyright © 2004-2007 Robert Kaye, Lukáš Lalinský en anderen%"
-"(translator-credits)s</small></p>\n"
-"<p><a href=\"http://musicbrainz.org/doc/PicardTagger\">http://musicbrainz."
-"org/doc/PicardTagger</a></p>\n"
+"<p><small>Copyright © 2004-2007 Robert Kaye, Lukáš Lalinský en anderen%(translator-credits)s</small></p>\n"
+"<p><a href=\"http://musicbrainz.org/doc/PicardTagger\">http://musicbrainz.org/doc/PicardTagger</a></p>\n"
+
+#: ../picard/ui/options/advanced.py:26
+msgid "Advanced"
+msgstr "Geavanceerd"
+
+#: ../picard/ui/options/interface.py:31
+msgid "User Interface"
+msgstr "Gebruikersinterface"
+
+#: ../picard/ui/options/interface.py:47
+msgid "System default"
+msgstr "Systeemstandaard"
+
+#: ../picard/ui/options/interface.py:71
+#, fuzzy
+msgid "Language changed"
+msgstr "Taal"
+
+#: ../picard/ui/options/interface.py:71
+msgid "You have changed the interface language. You have to restart Picard in order for the change to take effect."
+msgstr ""
+
+#: ../picard/ui/options/matching.py:29
+msgid "Matching"
+msgstr "Overeenkomend"
+
+#: ../picard/ui/options/metadata.py:52
+msgid "None"
+msgstr ""
+
+#: ../picard/ui/options/naming.py:33
+msgid "File Naming"
+msgstr "Naamgeving"
+
+#: ../picard/ui/options/naming.py:86
+#: ../picard/ui/options/naming.py:90
+#: ../picard/ui/options/naming.py:93
+#: ../picard/ui/options/naming.py:95
+#: ../picard/ui/options/scripting.py:84
+msgid "Script Error"
+msgstr "Scriptfout"
 
 #: ../picard/ui/options/naming.py:93
 msgid "The file naming format must not be empty."
-msgstr ""
+msgstr "De bestandsnaamindeling mag niet leeg zijn."
 
 #: ../picard/ui/options/naming.py:95
 #, fuzzy
 msgid "The multiple artist file naming format must not be empty."
-msgstr "Bestandnaamsopmaak voor meedere artiesten:"
+msgstr "De bestandsnaamindeling mag niet leeg zijn."
 
 #: ../picard/ui/options/naming.py:97
 msgid "Error"
-msgstr ""
+msgstr "Fout"
 
 #: ../picard/ui/options/naming.py:97
 msgid "The location to move files to must not be empty."
-msgstr ""
+msgstr "De lokatie om bestanden naar te verplaatsen mag niet leeg zijn."
+
+#: ../picard/ui/options/scripting.py:63
+msgid "Scripting"
+msgstr "Scripting"
+
+#: ../picard/ui/options/tags.py:29
+msgid "Tags"
+msgstr "Tags"
+
+#: ../picard/util/tags.py:24
+msgid "Date"
+msgstr "Datum"
+
+#: ../picard/util/tags.py:25
+msgid "Album Artist"
+msgstr "Albumartiest"
+
+#: ../picard/util/tags.py:26
+msgid "Track Number"
+msgstr "Tracknummer"
+
+#: ../picard/util/tags.py:27
+msgid "Total Tracks"
+msgstr "Totaal aantal tracks"
+
+#: ../picard/util/tags.py:28
+msgid "Disc Number"
+msgstr "Schijfnummer"
+
+#: ../picard/util/tags.py:29
+msgid "Total Discs"
+msgstr "Totaal aantal schijven"
+
+#: ../picard/util/tags.py:30
+msgid "Album Artist Sort Order"
+msgstr "Sorteervolgorde van albumartiest"
+
+#: ../picard/util/tags.py:31
+msgid "Artist Sort Order"
+msgstr "Sorteervolgorde van artiest"
+
+#: ../picard/util/tags.py:32
+msgid "Title Sort Order"
+msgstr "Sorteervolgorde van titel"
+
+#: ../picard/util/tags.py:33
+msgid "Album Sort Order"
+msgstr "Sorteervolgorde van album"
+
+#: ../picard/util/tags.py:34
+msgid "ASIN"
+msgstr "ASIN"
+
+#: ../picard/util/tags.py:35
+msgid "Grouping"
+msgstr "Groeperen"
+
+#: ../picard/util/tags.py:37
+msgid "ISRC"
+msgstr "ISRC"
+
+#: ../picard/util/tags.py:38
+msgid "Mood"
+msgstr "Stemming"
+
+#: ../picard/util/tags.py:39
+msgid "BPM"
+msgstr "BPM"
+
+#: ../picard/util/tags.py:40
+msgid "Copyright"
+msgstr "Copyright"
+
+#: ../picard/util/tags.py:41
+msgid "Composer"
+msgstr "Componist"
+
+#: ../picard/util/tags.py:42
+msgid "Conductor"
+msgstr "Dirigent"
+
+#: ../picard/util/tags.py:43
+msgid "Lyricist"
+msgstr "Tekstschrijver"
+
+#: ../picard/util/tags.py:44
+msgid "Arranger"
+msgstr "Arrangement door"
+
+#: ../picard/util/tags.py:45
+msgid "Producer"
+msgstr "Producer"
+
+#: ../picard/util/tags.py:46
+msgid "Engineer"
+msgstr "Technicus"
+
+#: ../picard/util/tags.py:47
+msgid "Subtitle"
+msgstr "Bij-titel"
+
+#: ../picard/util/tags.py:48
+msgid "Disc Subtitle"
+msgstr "Schijf bij-titel"
+
+#: ../picard/util/tags.py:49
+msgid "Remixer"
+msgstr "Remixer"
+
+#: ../picard/util/tags.py:50
+msgid "MusicBrainz Track Id"
+msgstr "MusicBrainz track ID"
+
+#: ../picard/util/tags.py:51
+msgid "MusicBrainz Release Id"
+msgstr "MusicBrainz release ID"
+
+#: ../picard/util/tags.py:52
+msgid "MusicBrainz Artist Id"
+msgstr "MusicBrainz artiest ID"
+
+#: ../picard/util/tags.py:53
+msgid "MusicBrainz Release Artist Id"
+msgstr "MusicBrainz releaseartiest ID"
+
+#: ../picard/util/tags.py:54
+msgid "MusicBrainz TRM Id"
+msgstr "MusicBrainz TRM ID"
+
+#: ../picard/util/tags.py:55
+#, fuzzy
+msgid "MusicBrainz Disc Id"
+msgstr "MusicBrainz artiest ID"
+
+#: ../picard/util/tags.py:56
+#, fuzzy
+msgid "MusicBrainz Sort Name"
+msgstr "MusicBrainz server"
+
+#: ../picard/util/tags.py:57
+msgid "MusicIP PUID"
+msgstr "MusicIP PUID"
+
+#: ../picard/util/tags.py:58
+msgid "MusicIP Fingerprint"
+msgstr "MusicIP vingerafdruk"
+
+#: ../picard/util/tags.py:59
+#, fuzzy
+msgid "Disc Id"
+msgstr "Disc:"
+
+#: ../picard/util/tags.py:60
+msgid "Website"
+msgstr "Website"
+
+#: ../picard/util/tags.py:61
+msgid "Compilation"
+msgstr "Compilatie"
+
+#: ../picard/util/tags.py:62
+msgid "Comment"
+msgstr "Opmerking"
+
+#: ../picard/util/tags.py:63
+msgid "Genre"
+msgstr "Genre"
+
+#: ../picard/util/tags.py:64
+msgid "Encoded By"
+msgstr "Geëncodeerd door"
+
+#: ../picard/util/tags.py:65
+msgid "Performer"
+msgstr "Uitvoerend artiest"
+
+#: ../picard/util/tags.py:66
+msgid "Release Type"
+msgstr "Releasetype"
+
+#: ../picard/util/tags.py:67
+msgid "Release Status"
+msgstr "Releasestatus"
+
+#: ../picard/util/tags.py:68
+#, fuzzy
+msgid "Release Country"
+msgstr "Releasetype"
+
+#: ../picard/util/tags.py:69
+msgid "Record Label"
+msgstr "Platenlabel"
+
+#: ../picard/util/tags.py:70
+msgid "Barcode"
+msgstr "Streepjescode"
+
+#: ../picard/util/tags.py:71
+msgid "Catalog Number"
+msgstr "Catalogusnummer"
+
+#: ../picard/util/tags.py:72
+#, fuzzy
+msgid "Format"
+msgstr "Indeling:"
+
+#: ../picard/util/tags.py:73
+msgid "DJ-Mixer"
+msgstr "DJ-Mixer"
+
+#: ../picard/util/tags.py:74
+msgid "Media"
+msgstr "Medium"
+
+#: ../picard/util/tags.py:75
+msgid "Lyrics"
+msgstr "Songteksten"
+
+#: ../picard/util/tags.py:76
+msgid "Mixer"
+msgstr "Mixer"
+
+#: ../picard/util/tags.py:77
+msgid "Language"
+msgstr "Taal"
+
+#: ../picard/util/tags.py:78
+#, fuzzy
+msgid "Script"
+msgstr "Scripting"
 
 #: ../picard/util/webbrowser2.py:84
 msgid "Web Browser Error"
@@ -979,316 +2555,72 @@ msgstr ""
 "\n"
 "%s"
 
-#~ msgid "No matching tracks for file %s"
-#~ msgstr "Geen overeenkomende nummers voor bestand %s"
-
-#~ msgid "File %s identified!"
-#~ msgstr "Bestand %s geïdentificeerd!"
-
-#~ msgid "Looking up the PUID for file %s..."
-#~ msgstr "Opzoeken van PUID voor bestand %s..."
-
-#~ msgid "Looking up the metadata for file %s..."
-#~ msgstr "Opzoeken van metadata voor bestand %s..."
-
-#~ msgid "No matching releases for cluster %s"
-#~ msgstr "Geen overeenkomende publicaties voor cluster %s"
-
-#~ msgid "Cluster %s identified!"
-#~ msgstr "Cluster %s geïdentificeerd!"
-
-#~ msgid "Looking up the metadata for cluster %s..."
-#~ msgstr "Opzoeken van metadata voor cluster %s..."
-
-#~ msgid "M3U Playlist (*.m3u)"
-#~ msgstr "M3U afspeellijst (*.m3u)"
-
-#~ msgid "PLS Playlist (*.pls)"
-#~ msgstr "PLS afspeellijst (*.pls)"
-
-#~ msgid "XSPF Playlist (*.xspf)"
-#~ msgstr "XSPF afspeellijst (*.xspf)"
-
-#~ msgid "Submitting PUIDs..."
-#~ msgstr "PUID's versturen"
-
-#~ msgid "PUIDs submission failed: %s"
-#~ msgstr "Versturen van PUID's mislukt: %s"
-
-#~ msgid "PUIDs successfully submitted!"
-#~ msgstr "PUID's met succes verstuurd!"
-
 #~ msgid "New Version"
 #~ msgstr "Nieuwe versie"
-
 #~ msgid ""
 #~ "New version of Picard is available (%s). Would you like to download it "
 #~ "now?"
 #~ msgstr ""
 #~ "Er is een nieuwe versie van Picard beschikbaar (%s). Wilt u dit nu "
 #~ "downloaden?"
-
-#~ msgid "Couldn't find PUID for file %s"
-#~ msgstr "Kon geen PUID vinden voor bestand %s"
-
-#~ msgid "Looking up the fingerprint for file %s..."
-#~ msgstr "Opzoeken van vingerafdruk voor bestand %s..."
-
-#~ msgid "Creating fingerprint for file %s..."
-#~ msgstr "Vingerafdruk nemen van bestand %s..."
-
-#~ msgid "Length"
-#~ msgstr "Lengte"
-
-#~ msgid "&Ok"
-#~ msgstr "&Ok"
-
-#~ msgid "&Cancel"
-#~ msgstr "A&nnuleren"
-
-#~ msgid "About"
-#~ msgstr "Info"
-
-#~ msgid "Advanced"
-#~ msgstr "Geavanceerd"
-
-#~ msgid "Matching"
-#~ msgstr "Overeenkomend"
-
-#~ msgid "File Naming"
-#~ msgstr "Naamgeving"
-
-#~ msgid "Scripting"
-#~ msgstr "Scripting"
-
-#~ msgid "Tags"
-#~ msgstr "Tags"
-
-#~ msgid "User Interface"
-#~ msgstr "Gebruikersinterface"
-
-#~ msgid "Date"
-#~ msgstr "Datum"
-
-#~ msgid "Album Artist"
-#~ msgstr "Albumartiest"
-
-#~ msgid "Track Number"
-#~ msgstr "Tracknummer"
-
-#~ msgid "Total Tracks"
-#~ msgstr "Totaal aantal tracks"
-
-#~ msgid "Disc Number"
-#~ msgstr "Schijfnummer"
-
-#~ msgid "Total Discs"
-#~ msgstr "Totaal aantal schijven"
-
-#~ msgid "Album Artist Sort Order"
-#~ msgstr "Sorteervolgorde van albumartiest"
-
-#~ msgid "Artist Sort Order"
-#~ msgstr "Sorteervolgorde van artiest"
-
-#~ msgid "Title Sort Order"
-#~ msgstr "Sorteervolgorde van titel"
-
-#~ msgid "Album Sort Order"
-#~ msgstr "Sorteervolgorde van album"
-
-#~ msgid "ASIN"
-#~ msgstr "ASIN"
-
-#~ msgid "Grouping"
-#~ msgstr "Groeperen"
-
-#~ msgid "ISRC"
-#~ msgstr "ISRC"
-
-#~ msgid "Mood"
-#~ msgstr "Stemming"
-
-#~ msgid "BPM"
-#~ msgstr "BPM"
-
-#~ msgid "Copyright"
-#~ msgstr "Copyright"
-
-#~ msgid "Composer"
-#~ msgstr "Componist"
-
-#~ msgid "Conductor"
-#~ msgstr "Dirigent"
-
-#~ msgid "Lyricist"
-#~ msgstr "Tekstschrijver"
-
-#~ msgid "Arranger"
-#~ msgstr "Arrangement door"
-
-#~ msgid "Producer"
-#~ msgstr "Producer"
-
-#~ msgid "Engineer"
-#~ msgstr "Technicus"
-
-#~ msgid "Subtitle"
-#~ msgstr "Bij-titel"
-
-#~ msgid "Disc Subtitle"
-#~ msgstr "Schijf bij-titel"
-
-#~ msgid "Remixer"
-#~ msgstr "Remixer"
-
-#~ msgid "MusicBrainz Track Id"
-#~ msgstr "MusicBrainz track ID"
-
-#~ msgid "MusicBrainz Release Id"
-#~ msgstr "MusicBrainz release ID"
-
-#~ msgid "MusicBrainz Artist Id"
-#~ msgstr "MusicBrainz artiest ID"
-
-#~ msgid "MusicBrainz Release Artist Id"
-#~ msgstr "MusicBrainz releaseartiest ID"
-
-#~ msgid "MusicBrainz TRM Id"
-#~ msgstr "MusicBrainz TRM ID"
-
-#~ msgid "MusicIP PUID"
-#~ msgstr "MusicIP PUID"
-
-#~ msgid "MusicIP Fingerprint"
-#~ msgstr "MusicIP vingerafdruk"
-
-#~ msgid "Website"
-#~ msgstr "Website"
-
-#~ msgid "Compilation"
-#~ msgstr "Compilatie"
-
-#~ msgid "Comment"
-#~ msgstr "Opmerking"
-
-#~ msgid "Genre"
-#~ msgstr "Genre"
-
-#~ msgid "Encoded By"
-#~ msgstr "Geëncodeerd door"
-
-#~ msgid "Performer"
-#~ msgstr "Uitvoerend artiest"
-
-#~ msgid "Release Type"
-#~ msgstr "Releasetype"
-
-#~ msgid "Release Status"
-#~ msgstr "Releasestatus"
-
-#~ msgid "Record Label"
-#~ msgstr "Platenlabel"
-
-#~ msgid "Barcode"
-#~ msgstr "Streepjescode"
-
-#~ msgid "Catalog Number"
-#~ msgstr "Catalogusnummer"
-
-#~ msgid "DJ-Mixer"
-#~ msgstr "DJ-Mixer"
-
-#~ msgid "Media"
-#~ msgstr "Medium"
-
-#~ msgid "Lyrics"
-#~ msgstr "Songteksten"
-
-#~ msgid "Mixer"
-#~ msgstr "Mixer"
-
+#~ msgid "Delete"
+#~ msgstr "Verwijderen"
+#~ msgid "Maximal number of tags:"
+#~ msgstr "Maximaal aantal labels:"
 #~ msgid "Reading directory %s ..."
 #~ msgstr "Lezen van map %s ..."
-
 #~ msgid "Saving file %s ..."
 #~ msgstr "Opslaan van bestand %s ..."
-
 #~ msgid "Anal&yze"
 #~ msgstr "Anal&yseren"
-
 #~ msgid "Ctrl+T"
 #~ msgstr "Ctrl+T"
-
 #~ msgid "Generate &Cuesheet..."
 #~ msgstr "&Cuesheet genereren"
-
 #~ msgid "Details - %s"
 #~ msgstr "Details - %s"
-
-#~ msgid "Disc:"
-#~ msgstr "Disc:"
-
 #~ msgid "000; "
 #~ msgstr "000; "
-
 #~ msgid "of"
 #~ msgstr "van"
-
 #~ msgid "&Advanced"
 #~ msgstr "Ge&avanceerd"
 
-#~ msgid "Toolbar"
-#~ msgstr "Werkbalk"
-
+#, fuzzy
+#~ msgid "A&dd Directory..."
+#~ msgstr "&Map toevoegen...\tCtrl+D"
 #~ msgid "Are You Sure?"
 #~ msgstr "Weet U het zeker?"
-
 #~ msgid "Add &Files...\tCtrl+O"
 #~ msgstr "&Bestanden toevoegen...\tCtrl+O"
-
 #~ msgid "Add &Directory...\tCtrl+D"
 #~ msgstr "&Map toevoegen...\tCtrl+D"
-
 #~ msgid "&Save Files\tCtrl+S"
 #~ msgstr "Bestanden &Opslaan\tCtrl+S"
-
 #~ msgid "C&opy\tCtrl+C"
 #~ msgstr "&Kopiëren\tCtrl+C"
-
 #~ msgid "Help"
 #~ msgstr "Help"
-
 #~ msgid "Preferences"
 #~ msgstr "Voorkeuren"
-
 #~ msgid "Error while saving cuesheet %s."
 #~ msgstr "Fout bij opslaan van cuesheet %s."
-
 #~ msgid "Cuesheet %s saved."
 #~ msgstr "Cuesheet %s opgeslagen."
-
 #~ msgid "Time"
 #~ msgstr "Lengte"
-
 #~ msgid "Albums"
 #~ msgstr "Albums"
-
 #~ msgid "Force Save"
 #~ msgstr "Gedwongen opslaan"
-
 #~ msgid "Buy"
 #~ msgstr "Kopen"
-
 #~ msgid "Welcome to Picard!"
 #~ msgstr "Welkom bij Picard!"
-
 #~ msgid "Track Num"
 #~ msgstr "Tracknummer"
-
 #~ msgid "PUID Collision"
 #~ msgstr "PUID botsing"
-
 #~ msgid ""
 #~ "Version %s\n"
 #~ "\n"
@@ -1315,123 +2647,86 @@ msgstr ""
 #~ "door een financiële bijdrage van Helix Community.\n"
 #~ "\n"
 #~ "Ondersteunde bestandsformaten: %s"
-
-#~ msgid "Colors"
-#~ msgstr "Kleuren"
-
 #~ msgid "Font color"
 #~ msgstr "Tekstkleur"
-
 #~ msgid "Directories"
 #~ msgstr "Mappen"
-
 #~ msgid "Watch for new files"
 #~ msgstr "Controleren op nieuwe bestanden"
-
 #~ msgid "Watch this directory for new audio files"
 #~ msgstr ""
 #~ "Controleer of nieuwe geluidsbestanden worden toegevoegd aan deze map"
-
 #~ msgid "Encodings"
 #~ msgstr "Coderingen"
-
 #~ msgid "all languages"
 #~ msgstr "alle talen"
-
 #~ msgid "percent similar."
 #~ msgstr "procent overeenkomen."
-
 #~ msgid "Load recently used albums on startup"
 #~ msgstr "Recentelijk gebruikte albums laden tijdens opstarten"
-
-#~ msgid "Language"
-#~ msgstr "Taal"
-
-#~ msgid "System default"
-#~ msgstr "Systeemstandaard"
-
 #~ msgid "Allowed filename characters"
 #~ msgstr "Toegestane karakters in bestandsnamen"
-
 #~ msgid "Use Windows-safe file names"
 #~ msgstr "Gebruik Windows-veilige bestandsnamen"
-
 #~ msgid "Number of tracks on the album"
 #~ msgstr "Aantal tracks op het album"
-
 #~ msgid "Track name"
 #~ msgstr "Tracknaam"
-
 #~ msgid "Zero padded track number"
 #~ msgstr "Tracknummer met voorloopnul"
-
 #~ msgid "File format (e.g. mp3, ogg, wav)"
 #~ msgstr "Bestandsformaat (b.v. mp3, ogg, wav)"
-
 #~ msgid "Album type (album, single, EP, etc.)"
 #~ msgstr "Albumtype (album, single, EP, enz.)"
-
 #~ msgid "Album Status (official, promo, etc.)"
 #~ msgstr "Albumstatus (official, promo, enz.)"
-
 #~ msgid "Album release month"
 #~ msgstr "Releasemaand van album"
-
 #~ msgid "Album release day"
 #~ msgstr "Releasedag van album"
-
 #~ msgid "Album release year"
 #~ msgstr "Releasejaar van album"
-
 #~ msgid "Make it so!"
 #~ msgstr "OK"
-
 #~ msgid "Use proxy server to access the Internet"
 #~ msgstr "Gebruik een proxyserver"
-
 #~ msgid "Proxy server to use"
 #~ msgstr "Te gebruiken proxyserver"
-
 #~ msgid "Proxy port"
 #~ msgstr "Proxypoort"
-
 #~ msgid "ID3v2.4 only"
 #~ msgstr "Alleen ID3v2.4"
-
 #~ msgid "Save track/album"
 #~ msgstr "Sla track/album op"
-
 #~ msgid "Artists"
 #~ msgstr "Artiesten"
 
+#, fuzzy
+#~ msgid "Auto Tag"
+#~ msgstr "Tag bewerken"
+
+#, fuzzy
+#~ msgid "Edit &Tags..."
+#~ msgstr "Tag bewerken"
 #~ msgid "New files (drag files to tag here)"
 #~ msgstr "Nieuwe bestanden (sleep bestanden hier naartoe)"
-
 #~ msgid "updating album information"
 #~ msgstr "albuminformatie wordt bijgewerkt"
-
 #~ msgid "Submitting PUID information to MusicBrainz server ..."
 #~ msgstr ""
 #~ "Bezig met versturen van PUID informatie naar de MusicBrainz server..."
-
 #~ msgid "Performing a PUID lookup on file %s ..."
 #~ msgstr "Bezig met het opzoeken van PUID voor het bestand %s..."
-
 #~ msgid "Are you sure you want to exit the application?"
 #~ msgstr "Weet U zeker dat U het programma wilt beëindigen?"
-
 #~ msgid "CD Lookup error -- is there a CD in the CD-ROM drive?"
 #~ msgstr "Fout bij opzoeken van CD. Zit er een CD in het CD-ROM station?"
-
 #~ msgid "CD Lookup Failed"
 #~ msgstr "Opzoeken van CD is mislukt"
-
 #~ msgid "&Quick Start Guide"
 #~ msgstr "&Snel beginnen"
-
 #~ msgid "Quick Start Guide"
 #~ msgstr "Snel beginnen"
-
 #~ msgid ""
 #~ "You have not specified an username and password. In order to contribute "
 #~ "data to MusicBrainz, you must have a MusicBrainz account.\n"
@@ -1444,29 +2739,22 @@ msgstr ""
 #~ "hebben.\n"
 #~ "Wilt u nu een nieuwe account aanmaken? Als u al een account heeft, vul "
 #~ "dan aub uw gegevens in bij Opties. "
-
 #~ msgid "Couldn't connect to the MusicBrainz server."
 #~ msgstr "Kon geen verbinding maken met de MusicBrainz server."
-
 #~ msgid "Connection error"
 #~ msgstr "Verbindingsfout"
-
 #~ msgid ""
 #~ "MusicBrainz Picard requires wxPython with UNICODE support.\n"
 #~ "Please download the appropriate toolkit from http://www.wxpython.org/"
 #~ msgstr ""
 #~ "MusicBrainz Picard vereist wxPython met ondersteuning voor Unicode.\n"
 #~ "Download de correcte toolkit van http://www.wxpython.org/"
-
 #~ msgid "Unicode Required"
 #~ msgstr "Unicode vereist"
-
 #~ msgid "PUID collision on file %s!"
 #~ msgstr "PUID botsing voor bestand %s!"
-
 #~ msgid "Save error"
 #~ msgstr "Fout bij opslaan"
-
 #~ msgid ""
 #~ "The move files option is enabled, but the destination directory is not "
 #~ "specified or invalid.\n"
@@ -1476,7 +2764,6 @@ msgstr ""
 #~ "De verplaats bestanden optie is aangevinkt, maar de doelmap is niet "
 #~ "gespecificeerd of niet geldig.\n"
 #~ "Vink a.u.b. de optie uit of verander de doelmap en probeer het nogmaals."
-
 #~ msgid ""
 #~ "Not all files could be saved. Please check for and examine tracks that "
 #~ "have an error icon in front of them. To retry saving the track, right "
@@ -1485,155 +2772,69 @@ msgstr ""
 #~ "Niet alle bestanden konden worden opgeslagen. Controleer de tracks waar "
 #~ "een foutmeldingspictogram voor staat. Klik met de rechterknop op de track "
 #~ "en selecteer 'Fout wissen' om nogmaals te proberen de track op te slaan."
-
 #~ msgid "Select directory that contains music files"
 #~ msgstr "Selecteer een map die muziekbestanden bevat"
-
 #~ msgid "Reload album from main server"
 #~ msgstr "Herlaad het album van de server"
-
 #~ msgid "Select or drag a folder from below"
 #~ msgstr "Selecteer of sleep een map van beneden"
-
 #~ msgid "Drag files from below"
 #~ msgstr "Sleep bestanden van beneden"
-
 #~ msgid "Release date"
 #~ msgstr "Releasedatum"
-
 #~ msgid "%d%% similar"
 #~ msgstr "%d%% overeenkomend"
-
 #~ msgid "Please donate to MusicBrainz!"
 #~ msgstr "Maak a.u.b. wat geld over naar MusicBrainz!"
-
-#~ msgid "Later"
-#~ msgstr "Later"
-
 #~ msgid ""
 #~ "The destination directory %s does not exist. Please pick a valid "
 #~ "directory."
 #~ msgstr "Doelmap %s bestaat niet. Kies a.u.b. een geldige map."
-
 #~ msgid "Select the encoding to use when reading and writing filenames"
 #~ msgstr ""
 #~ "Selecteer de opmaak om te gebruiken voor het lezen en schrijven van "
 #~ "bestandsnamen"
-
 #~ msgid "Automatically move clusters to albums that are at least"
 #~ msgstr "Groepen automatisch verplaatsen naar albums als ze minimaal"
-
 #~ msgid "Automatically save recognized tracks that are at least"
 #~ msgstr "Herkende tracks automatisch opslaan als ze minimaal"
-
-#~ msgid "Czech"
-#~ msgstr "Tjechisch"
-
-#~ msgid "German"
-#~ msgstr "Duits"
-
-#~ msgid "English"
-#~ msgstr "Engels"
-
-#~ msgid "English (UK)"
-#~ msgstr "Engels (UK)"
-
-#~ msgid "Spanish"
-#~ msgstr "Spaans"
-
-#~ msgid "Finnish"
-#~ msgstr "Fins"
-
-#~ msgid "French"
-#~ msgstr "Frans"
-
-#~ msgid "Hungarian"
-#~ msgstr "Hongaars"
-
-#~ msgid "Icelandic"
-#~ msgstr "IJslands"
-
-#~ msgid "Italian"
-#~ msgstr "Italiaans"
-
-#~ msgid "Korean"
-#~ msgstr "Koreaans"
-
-#~ msgid "Lithuanian"
-#~ msgstr "Litouws"
-
-#~ msgid "Dutch"
-#~ msgstr "Nederlands"
-
-#~ msgid "Norwegian Bokmal"
-#~ msgstr "Noors Bokmål"
-
-#~ msgid "Portuguese"
-#~ msgstr "Portugees"
-
-#~ msgid "Romanian"
-#~ msgstr "Roemeens"
-
-#~ msgid "Russian"
-#~ msgstr "Russisch"
-
-#~ msgid "Slovak"
-#~ msgstr "Slovaaks"
-
-#~ msgid "Swedish"
-#~ msgstr "Zweeds"
-
 #~ msgid ""
 #~ "Note: This setting will take effect after you restart the application."
 #~ msgstr ""
 #~ "Opmerking: Deze instelling zal pas na het herstarten van het programma\n"
 #~ "worden toegepast."
-
 #~ msgid "Artist translation"
 #~ msgstr "Vertaling artiestennamen"
-
 #~ msgid "Rename files when writing metadata tags"
 #~ msgstr "Hernoem bestanden tijdens het schrijven van de metadata tags"
-
 #~ msgid "Naming Help"
 #~ msgstr "Help over naamgeving"
-
 #~ msgid ""
 #~ "You may use the following variables in the filenaming\n"
 #~ "specifications in the options dialog:"
 #~ msgstr ""
 #~ "De volgende variabelen mogen worden gebruikt in de specificatie\n"
 #~ "van de naamgeving van bestanden:"
-
 #~ msgid "A %s in the naming specification will create a new subfolder."
 #~ msgstr "Een %s in de specificatie zal een nieuwe submap aanmaken."
-
 #~ msgid "Audio fingerprinting options"
 #~ msgstr "Akoestische vingerafdruk"
-
 #~ msgid "Automatically select PUID collision tracks that are at least"
 #~ msgstr "Tracks met PUID botsingen automatisch selecteren als ze minimaal"
-
 #~ msgid "Write ID3v1 tags to MP3 files (ID3v2 tags will always be written)"
 #~ msgstr ""
 #~ "Schrijf ook ID3v1 tags naar MP3-bestanden (ID3V2 tags worden altijd "
 #~ "geschreven)"
-
 #~ msgid "Remove track/album"
 #~ msgstr "Verwijder track/album"
-
 #~ msgid "Listen to track"
 #~ msgstr "Luister naar track"
-
 #~ msgid "Album clusters"
 #~ msgstr "Albumgroepen"
-
 #~ msgid "Unmatched files for this album"
 #~ msgstr "Ongematchde bestanden voor dit album"
-
 #~ msgid "%d of %d tracks linked"
 #~ msgstr "%d van %d tracks gekoppeld"
-
 #~ msgid ""
 #~ "The Picard Tagger is a free application and you may\n"
 #~ "use it as long as you wish. However, providing\n"
@@ -1652,84 +2853,59 @@ msgstr ""
 #~ "beheert. Alle donaties zijn aftrekbaar van de belasting\n"
 #~ "voor inwoners van de Verenigde Staten en zorgen ervoor\n"
 #~ "dat deze dienst blijft bestaan en continu wordt verbeterd."
-
 #~ msgid "Matched track highlighting"
 #~ msgstr "Kleuring van gematchde tracks"
-
 #~ msgid "Good match background color"
 #~ msgstr "Achtergrondkleur van goede match"
-
 #~ msgid "Bad match background color"
 #~ msgstr "Achtergrondkleur van slechte match"
-
 #~ msgid "Move files option"
 #~ msgstr "Verplaats bestanden optie"
-
 #~ msgid "When matching tracks to albums, accept tracks that are at least"
 #~ msgstr ""
 #~ "Tijdens het matchen van tracks met albums: accepteer tracks die minimaal"
-
 #~ msgid "CD-ROM drive path to use for lookups"
 #~ msgstr "CD-ROM pad om te gebruiken voor opzoeken van CD"
-
 #~ msgid "Launch MB Tagger automatically for inserted Audio CDs"
 #~ msgstr "Start Picard automatisch voor ingevoerde CD's"
-
 #~ msgid ""
 #~ "Failed to set the proper registy values to enable launching the tagger "
 #~ "after CD insertion. "
 #~ msgstr ""
 #~ "Het schrijven in het register om de tagger te laten starten na het "
 #~ "invoeren van een CD is mislukt. "
-
 #~ msgid "Default CD setting failed"
 #~ msgstr "Standaard CD instelling is mislukt"
-
 #~ msgid "File format naming specification"
 #~ msgstr "Specificatie van naamgeving van bestanden"
-
 #~ msgid "Various artist file format naming specification"
 #~ msgstr "Specificatie van naamgeving van Various Artists bestanden"
-
 #~ msgid "Note: Leave blank to allow all possible characters"
 #~ msgstr "Opmerking: leeg laten om alle mogelijke karakters toe te staan"
-
 #~ msgid "Track artist name"
 #~ msgstr "Naam van trackartiest"
-
 #~ msgid "Track artist sortname"
 #~ msgstr "Sorteernaam van trackartiest"
-
 #~ msgid "The first character of the artist sortname"
 #~ msgstr "Het eerste teken van de sorteernaam van de artiest"
-
 #~ msgid "The first two characters of the artist sortname"
 #~ msgstr "De eerste twee tekens van de sorteernaam van de artiest"
-
 #~ msgid "The first three characters of the artist sortname"
 #~ msgstr "De eerste drie tekens van de sorteernaam van de artiest"
-
 #~ msgid "Naming specification help"
 #~ msgstr "Help over specificatie van naamgeving"
-
 #~ msgid "Accept PUID matches that are at least"
 #~ msgstr "Accepteer PUID matches die minimaal"
-
 #~ msgid "Various artist name"
 #~ msgstr "Various Artists naam"
-
 #~ msgid "Open file"
 #~ msgstr "Open bestand"
-
 #~ msgid "Open directory"
 #~ msgstr "Open map"
-
 #~ msgid "Edit options"
 #~ msgstr "Instellingen wijzigen"
-
 #~ msgid "Exit"
 #~ msgstr "Sluiten"
-
 #~ msgid ""
 #~ "The MusicBrainz Tagger requires wx.Widgets with UNICODE support.\n"
 #~ "Please download the appropriate toolkit from  http://www.wxwidgets.com"
@@ -1737,12 +2913,13 @@ msgstr ""
 #~ "De MusicBrainz Tagger vereist ondersteuning voor wx.Widgets met UNICODE.\n"
 #~ "Download de benodigde toolkit a.u.b. van http://www.wxwidgets.com"
 
+#, fuzzy
+#~ msgid "Unicode required"
+#~ msgstr "Unicode vereist"
 #~ msgid "Sorry, there is no help file yet."
 #~ msgstr "Sorry, er is nog geen helpbestand."
-
 #~ msgid "Use Internet Explorer settings for proxy support."
 #~ msgstr "Gebruik Internet Explorer instellingen voor proxyondersteuning."
-
 #~ msgid ""
 #~ "If you use an automatic proxy configuration in Internet\n"
 #~ "Explorer, uncheck the box above and enter your\n"
@@ -1752,7 +2929,6 @@ msgstr ""
 #~ "vink dan\n"
 #~ "het bovenstaande vakje uit en voer hieronder de proxyserver en proxypoort "
 #~ "in:"
-
 #~ msgid ""
 #~ "NOTE: This application can automatically authenticate the\n"
 #~ "MusicBrainz user, but the user name and password will be\n"
@@ -1761,3 +2937,4 @@ msgstr ""
 #~ "OPMERKING: Deze applicatie kan de MusicBrainz gebruiker\n"
 #~ "automatisch authenticeren, maar de gebruikersnaam en het wachtwoord\n"
 #~ "zullen in platte tekst worden verstuurd naar MusicBrainz!"
+
diff --git a/po/picard.pot b/po/picard.pot
index 61700b718..d00275cbf 100644
--- a/po/picard.pot
+++ b/po/picard.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: http://bugs.musicbrainz.org/\n"
-"POT-Creation-Date: 2008-12-01 18:20+0100\n"
+"POT-Creation-Date: 2009-01-25 12:23+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -21,20 +21,1249 @@ msgstr ""
 msgid "Unmatched Files"
 msgstr ""
 
-#: ../picard/album.py:269
+#: ../picard/album.py:281
 #, python-format
 msgid "[couldn't load album %s]"
 msgstr ""
 
-#: ../picard/album.py:305
+#: ../picard/album.py:317
 msgid "[loading album information]"
 msgstr ""
 
-#: ../picard/tagger.py:472
+#: ../picard/cluster.py:164 ../picard/cluster.py:175
+#, python-format
+msgid "No matching releases for cluster %s"
+msgstr ""
+
+#: ../picard/cluster.py:177
+#, python-format
+msgid "Cluster %s identified!"
+msgstr ""
+
+#: ../picard/cluster.py:182
+#, python-format
+msgid "Looking up the metadata for cluster %s..."
+msgstr ""
+
+#: ../picard/const.py:40
+msgid "CD"
+msgstr ""
+
+#: ../picard/const.py:41
+msgid "DVD"
+msgstr ""
+
+#: ../picard/const.py:42
+msgid "SACD"
+msgstr ""
+
+#: ../picard/const.py:43
+msgid "LaserDisc"
+msgstr ""
+
+#: ../picard/const.py:44
+msgid "MiniDisc"
+msgstr ""
+
+#: ../picard/const.py:45
+msgid "Vinyl"
+msgstr ""
+
+#: ../picard/const.py:46
+msgid "Cassette"
+msgstr ""
+
+#: ../picard/const.py:47
+msgid "Cartridge (4/8-tracks)"
+msgstr ""
+
+#: ../picard/const.py:48
+msgid "Reel-to-Reel"
+msgstr ""
+
+#: ../picard/const.py:49
+msgid "DAT"
+msgstr ""
+
+#: ../picard/const.py:50
+msgid "Digital Media"
+msgstr ""
+
+#: ../picard/const.py:51
+msgid "Wax Cylinder"
+msgstr ""
+
+#: ../picard/const.py:52
+msgid "Piano Roll"
+msgstr ""
+
+#: ../picard/const.py:53
+msgid "Other"
+msgstr ""
+
+#: ../picard/const.py:58
+msgid "Bangladesh"
+msgstr ""
+
+#: ../picard/const.py:59
+msgid "Belgium"
+msgstr ""
+
+#: ../picard/const.py:60
+msgid "Burkina Faso"
+msgstr ""
+
+#: ../picard/const.py:61
+msgid "Bulgaria"
+msgstr ""
+
+#: ../picard/const.py:62
+msgid "Barbados"
+msgstr ""
+
+#: ../picard/const.py:63
+msgid "Wallis and Futuna Islands"
+msgstr ""
+
+#: ../picard/const.py:64
+msgid "Bermuda"
+msgstr ""
+
+#: ../picard/const.py:65
+msgid "Brunei Darussalam"
+msgstr ""
+
+#: ../picard/const.py:66
+msgid "Bolivia"
+msgstr ""
+
+#: ../picard/const.py:67
+msgid "Bahrain"
+msgstr ""
+
+#: ../picard/const.py:68
+msgid "Burundi"
+msgstr ""
+
+#: ../picard/const.py:69
+msgid "Benin"
+msgstr ""
+
+#: ../picard/const.py:70
+msgid "Bhutan"
+msgstr ""
+
+#: ../picard/const.py:71
+msgid "Jamaica"
+msgstr ""
+
+#: ../picard/const.py:72
+msgid "Bouvet Island"
+msgstr ""
+
+#: ../picard/const.py:73
+msgid "Botswana"
+msgstr ""
+
+#: ../picard/const.py:74
+msgid "Samoa"
+msgstr ""
+
+#: ../picard/const.py:75
+msgid "Brazil"
+msgstr ""
+
+#: ../picard/const.py:76
+msgid "Bahamas"
+msgstr ""
+
+#: ../picard/const.py:77
+msgid "Belarus"
+msgstr ""
+
+#: ../picard/const.py:78
+msgid "Belize"
+msgstr ""
+
+#: ../picard/const.py:79
+msgid "Russian Federation"
+msgstr ""
+
+#: ../picard/const.py:80
+msgid "Rwanda"
+msgstr ""
+
+#: ../picard/const.py:81
+msgid "Reunion"
+msgstr ""
+
+#: ../picard/const.py:82
+msgid "Turkmenistan"
+msgstr ""
+
+#: ../picard/const.py:83
+msgid "Tajikistan"
+msgstr ""
+
+#: ../picard/const.py:84
+msgid "Romania"
+msgstr ""
+
+#: ../picard/const.py:85
+msgid "Tokela"
+msgstr ""
+
+#: ../picard/const.py:86
+msgid "Guinea-Bissa"
+msgstr ""
+
+#: ../picard/const.py:87
+msgid "Guam"
+msgstr ""
+
+#: ../picard/const.py:88
+msgid "Guatemala"
+msgstr ""
+
+#: ../picard/const.py:89
+msgid "Greece"
+msgstr ""
+
+#: ../picard/const.py:90
+msgid "Equatorial Guinea"
+msgstr ""
+
+#: ../picard/const.py:91
+msgid "Guadeloupe"
+msgstr ""
+
+#: ../picard/const.py:92
+msgid "Japan"
+msgstr ""
+
+#: ../picard/const.py:93
+msgid "Guyana"
+msgstr ""
+
+#: ../picard/const.py:94
+msgid "French Guiana"
+msgstr ""
+
+#: ../picard/const.py:95
+msgid "Georgia"
+msgstr ""
+
+#: ../picard/const.py:96
+msgid "Grenada"
+msgstr ""
+
+#: ../picard/const.py:97
+msgid "United Kingdom"
+msgstr ""
+
+#: ../picard/const.py:98
+msgid "Gabon"
+msgstr ""
+
+#: ../picard/const.py:99
+msgid "El Salvador"
+msgstr ""
+
+#: ../picard/const.py:100
+msgid "Guinea"
+msgstr ""
+
+#: ../picard/const.py:101
+msgid "Gambia"
+msgstr ""
+
+#: ../picard/const.py:102
+msgid "Greenland"
+msgstr ""
+
+#: ../picard/const.py:103
+msgid "Gibraltar"
+msgstr ""
+
+#: ../picard/const.py:104
+msgid "Ghana"
+msgstr ""
+
+#: ../picard/const.py:105
+msgid "Oman"
+msgstr ""
+
+#: ../picard/const.py:106
+msgid "Tunisia"
+msgstr ""
+
+#: ../picard/const.py:107
+msgid "Jordan"
+msgstr ""
+
+#: ../picard/const.py:108
+msgid "Haiti"
+msgstr ""
+
+#: ../picard/const.py:109
+msgid "Hungary"
+msgstr ""
+
+#: ../picard/const.py:110
+msgid "Hong Kong"
+msgstr ""
+
+#: ../picard/const.py:111
+msgid "Honduras"
+msgstr ""
+
+#: ../picard/const.py:112
+msgid "Heard and Mc Donald Islands"
+msgstr ""
+
+#: ../picard/const.py:113
+msgid "Venezuela"
+msgstr ""
+
+#: ../picard/const.py:114
+msgid "Puerto Rico"
+msgstr ""
+
+#: ../picard/const.py:115
+msgid "Pala"
+msgstr ""
+
+#: ../picard/const.py:116
+msgid "Portugal"
+msgstr ""
+
+#: ../picard/const.py:117
+msgid "Svalbard and Jan Mayen Islands"
+msgstr ""
+
+#: ../picard/const.py:118
+msgid "Paraguay"
+msgstr ""
+
+#: ../picard/const.py:119
+msgid "Iraq"
+msgstr ""
+
+#: ../picard/const.py:120
+msgid "Panama"
+msgstr ""
+
+#: ../picard/const.py:121
+msgid "French Polynesia"
+msgstr ""
+
+#: ../picard/const.py:122
+msgid "Papua New Guinea"
+msgstr ""
+
+#: ../picard/const.py:123
+msgid "Per"
+msgstr ""
+
+#: ../picard/const.py:124
+msgid "Pakistan"
+msgstr ""
+
+#: ../picard/const.py:125
+msgid "Philippines"
+msgstr ""
+
+#: ../picard/const.py:126
+msgid "Pitcairn"
+msgstr ""
+
+#: ../picard/const.py:127
+msgid "Poland"
+msgstr ""
+
+#: ../picard/const.py:128
+msgid "St. Pierre and Miquelon"
+msgstr ""
+
+#: ../picard/const.py:129
+msgid "Zambia"
+msgstr ""
+
+#: ../picard/const.py:130
+msgid "Western Sahara"
+msgstr ""
+
+#: ../picard/const.py:131
+msgid "Estonia"
+msgstr ""
+
+#: ../picard/const.py:132
+msgid "Egypt"
+msgstr ""
+
+#: ../picard/const.py:133
+msgid "South Africa"
+msgstr ""
+
+#: ../picard/const.py:134
+msgid "Ecuador"
+msgstr ""
+
+#: ../picard/const.py:135
+msgid "Italy"
+msgstr ""
+
+#: ../picard/const.py:136
+msgid "Viet Nam"
+msgstr ""
+
+#: ../picard/const.py:137
+msgid "Solomon Islands"
+msgstr ""
+
+#: ../picard/const.py:138
+msgid "Ethiopia"
+msgstr ""
+
+#: ../picard/const.py:139
+msgid "Somalia"
+msgstr ""
+
+#: ../picard/const.py:140
+msgid "Zimbabwe"
+msgstr ""
+
+#: ../picard/const.py:141
+msgid "Saudi Arabia"
+msgstr ""
+
+#: ../picard/const.py:142
+msgid "Spain"
+msgstr ""
+
+#: ../picard/const.py:143
+msgid "Eritrea"
+msgstr ""
+
+#: ../picard/const.py:144
+msgid "Moldova, Republic of"
+msgstr ""
+
+#: ../picard/const.py:145
+msgid "Madagascar"
+msgstr ""
+
+#: ../picard/const.py:146
+msgid "Morocco"
+msgstr ""
+
+#: ../picard/const.py:147
+msgid "Monaco"
+msgstr ""
+
+#: ../picard/const.py:148
+msgid "Uzbekistan"
+msgstr ""
+
+#: ../picard/const.py:149
+msgid "Myanmar"
+msgstr ""
+
+#: ../picard/const.py:150
+msgid "Mali"
+msgstr ""
+
+#: ../picard/const.py:151
+msgid "Maca"
+msgstr ""
+
+#: ../picard/const.py:152
+msgid "Mongolia"
+msgstr ""
+
+#: ../picard/const.py:153
+msgid "Marshall Islands"
+msgstr ""
+
+#: ../picard/const.py:154
+msgid "Macedonia, The Former Yugoslav Republic of"
+msgstr ""
+
+#: ../picard/const.py:155
+msgid "Mauritius"
+msgstr ""
+
+#: ../picard/const.py:156
+msgid "Malta"
+msgstr ""
+
+#: ../picard/const.py:157
+msgid "Malawi"
+msgstr ""
+
+#: ../picard/const.py:158
+msgid "Maldives"
+msgstr ""
+
+#: ../picard/const.py:159
+msgid "Martinique"
+msgstr ""
+
+#: ../picard/const.py:160
+msgid "Northern Mariana Islands"
+msgstr ""
+
+#: ../picard/const.py:161
+msgid "Montserrat"
+msgstr ""
+
+#: ../picard/const.py:162
+msgid "Mauritania"
+msgstr ""
+
+#: ../picard/const.py:163
+msgid "Uganda"
+msgstr ""
+
+#: ../picard/const.py:164
+msgid "Malaysia"
+msgstr ""
+
+#: ../picard/const.py:165
+msgid "Mexico"
+msgstr ""
+
+#: ../picard/const.py:166
+msgid "Israel"
+msgstr ""
+
+#: ../picard/const.py:167
+msgid "France"
+msgstr ""
+
+#: ../picard/const.py:168
+msgid "British Indian Ocean Territory"
+msgstr ""
+
+#: ../picard/const.py:169
+msgid "St. Helena"
+msgstr ""
+
+#: ../picard/const.py:170
+msgid "Finland"
+msgstr ""
+
+#: ../picard/const.py:171
+msgid "Fiji"
+msgstr ""
+
+#: ../picard/const.py:172
+msgid "Falkland Islands (Malvinas)"
+msgstr ""
+
+#: ../picard/const.py:173
+msgid "Micronesia, Federated States of"
+msgstr ""
+
+#: ../picard/const.py:174
+msgid "Faroe Islands"
+msgstr ""
+
+#: ../picard/const.py:175
+msgid "Nicaragua"
+msgstr ""
+
+#: ../picard/const.py:176
+msgid "Netherlands"
+msgstr ""
+
+#: ../picard/const.py:177
+msgid "Norway"
+msgstr ""
+
+#: ../picard/const.py:178
+msgid "Namibia"
+msgstr ""
+
+#: ../picard/const.py:179
+msgid "Vanuat"
+msgstr ""
+
+#: ../picard/const.py:180
+msgid "New Caledonia"
+msgstr ""
+
+#: ../picard/const.py:181
+msgid "Niger"
+msgstr ""
+
+#: ../picard/const.py:182
+msgid "Norfolk Island"
+msgstr ""
+
+#: ../picard/const.py:183
+msgid "Nigeria"
+msgstr ""
+
+#: ../picard/const.py:184
+msgid "New Zealand"
+msgstr ""
+
+#: ../picard/const.py:185
+msgid "Zaire"
+msgstr ""
+
+#: ../picard/const.py:186
+msgid "Nepal"
+msgstr ""
+
+#: ../picard/const.py:187
+msgid "Naur"
+msgstr ""
+
+#: ../picard/const.py:188
+msgid "Niue"
+msgstr ""
+
+#: ../picard/const.py:189
+msgid "Cook Islands"
+msgstr ""
+
+#: ../picard/const.py:190
+msgid "Cote d'Ivoire"
+msgstr ""
+
+#: ../picard/const.py:191
+msgid "Switzerland"
+msgstr ""
+
+#: ../picard/const.py:192
+msgid "Colombia"
+msgstr ""
+
+#: ../picard/const.py:193
+msgid "China"
+msgstr ""
+
+#: ../picard/const.py:194
+msgid "Cameroon"
+msgstr ""
+
+#: ../picard/const.py:195
+msgid "Chile"
+msgstr ""
+
+#: ../picard/const.py:196
+msgid "Cocos (Keeling) Islands"
+msgstr ""
+
+#: ../picard/const.py:197
+msgid "Canada"
+msgstr ""
+
+#: ../picard/const.py:198
+msgid "Congo"
+msgstr ""
+
+#: ../picard/const.py:199
+msgid "Central African Republic"
+msgstr ""
+
+#: ../picard/const.py:200
+msgid "Czech Republic"
+msgstr ""
+
+#: ../picard/const.py:201
+msgid "Cyprus"
+msgstr ""
+
+#: ../picard/const.py:202
+msgid "Christmas Island"
+msgstr ""
+
+#: ../picard/const.py:203
+msgid "Costa Rica"
+msgstr ""
+
+#: ../picard/const.py:204
+msgid "Cape Verde"
+msgstr ""
+
+#: ../picard/const.py:205
+msgid "Cuba"
+msgstr ""
+
+#: ../picard/const.py:206
+msgid "Swaziland"
+msgstr ""
+
+#: ../picard/const.py:207
+msgid "Syrian Arab Republic"
+msgstr ""
+
+#: ../picard/const.py:208
+msgid "Kyrgyzstan"
+msgstr ""
+
+#: ../picard/const.py:209
+msgid "Kenya"
+msgstr ""
+
+#: ../picard/const.py:210
+msgid "Suriname"
+msgstr ""
+
+#: ../picard/const.py:211
+msgid "Kiribati"
+msgstr ""
+
+#: ../picard/const.py:212
+msgid "Cambodia"
+msgstr ""
+
+#: ../picard/const.py:213
+msgid "Saint Kitts and Nevis"
+msgstr ""
+
+#: ../picard/const.py:214
+msgid "Comoros"
+msgstr ""
+
+#: ../picard/const.py:215
+msgid "Sao Tome and Principe"
+msgstr ""
+
+#: ../picard/const.py:216
+msgid "Slovenia"
+msgstr ""
+
+#: ../picard/const.py:217
+msgid "Kuwait"
+msgstr ""
+
+#: ../picard/const.py:218
+msgid "Senegal"
+msgstr ""
+
+#: ../picard/const.py:219
+msgid "San Marino"
+msgstr ""
+
+#: ../picard/const.py:220
+msgid "Sierra Leone"
+msgstr ""
+
+#: ../picard/const.py:221
+msgid "Seychelles"
+msgstr ""
+
+#: ../picard/const.py:222
+msgid "Kazakhstan"
+msgstr ""
+
+#: ../picard/const.py:223
+msgid "Cayman Islands"
+msgstr ""
+
+#: ../picard/const.py:224
+msgid "Singapore"
+msgstr ""
+
+#: ../picard/const.py:225
+msgid "Sweden"
+msgstr ""
+
+#: ../picard/const.py:226
+msgid "Sudan"
+msgstr ""
+
+#: ../picard/const.py:227
+msgid "Dominican Republic"
+msgstr ""
+
+#: ../picard/const.py:228
+msgid "Dominica"
+msgstr ""
+
+#: ../picard/const.py:229
+msgid "Djibouti"
+msgstr ""
+
+#: ../picard/const.py:230
+msgid "Denmark"
+msgstr ""
+
+#: ../picard/const.py:231
+msgid "Virgin Islands (British)"
+msgstr ""
+
+#: ../picard/const.py:232
+msgid "Germany"
+msgstr ""
+
+#: ../picard/const.py:233
+msgid "Yemen"
+msgstr ""
+
+#: ../picard/const.py:234
+msgid "Algeria"
+msgstr ""
+
+#: ../picard/const.py:235
+msgid "United States"
+msgstr ""
+
+#: ../picard/const.py:236
+msgid "Uruguay"
+msgstr ""
+
+#: ../picard/const.py:237
+msgid "Mayotte"
+msgstr ""
+
+#: ../picard/const.py:238
+msgid "United States Minor Outlying Islands"
+msgstr ""
+
+#: ../picard/const.py:239
+msgid "Lebanon"
+msgstr ""
+
+#: ../picard/const.py:240
+msgid "Saint Lucia"
+msgstr ""
+
+#: ../picard/const.py:241
+msgid "Lao People's Democratic Republic"
+msgstr ""
+
+#: ../picard/const.py:242
+msgid "Tuval"
+msgstr ""
+
+#: ../picard/const.py:243
+msgid "Taiwan"
+msgstr ""
+
+#: ../picard/const.py:244
+msgid "Trinidad and Tobago"
+msgstr ""
+
+#: ../picard/const.py:245
+msgid "Turkey"
+msgstr ""
+
+#: ../picard/const.py:246
+msgid "Sri Lanka"
+msgstr ""
+
+#: ../picard/const.py:247
+msgid "Liechtenstein"
+msgstr ""
+
+#: ../picard/const.py:248
+msgid "Latvia"
+msgstr ""
+
+#: ../picard/const.py:249
+msgid "Tonga"
+msgstr ""
+
+#: ../picard/const.py:250
+msgid "Lithuania"
+msgstr ""
+
+#: ../picard/const.py:251
+msgid "Luxembourg"
+msgstr ""
+
+#: ../picard/const.py:252
+msgid "Liberia"
+msgstr ""
+
+#: ../picard/const.py:253
+msgid "Lesotho"
+msgstr ""
+
+#: ../picard/const.py:254
+msgid "Thailand"
+msgstr ""
+
+#: ../picard/const.py:255
+msgid "French Southern Territories"
+msgstr ""
+
+#: ../picard/const.py:256
+msgid "Togo"
+msgstr ""
+
+#: ../picard/const.py:257
+msgid "Chad"
+msgstr ""
+
+#: ../picard/const.py:258
+msgid "Turks and Caicos Islands"
+msgstr ""
+
+#: ../picard/const.py:259
+msgid "Libyan Arab Jamahiriya"
+msgstr ""
+
+#: ../picard/const.py:260
+msgid "Vatican City State (Holy See)"
+msgstr ""
+
+#: ../picard/const.py:261
+msgid "Saint Vincent and The Grenadines"
+msgstr ""
+
+#: ../picard/const.py:262
+msgid "United Arab Emirates"
+msgstr ""
+
+#: ../picard/const.py:263
+msgid "Andorra"
+msgstr ""
+
+#: ../picard/const.py:264
+msgid "Antigua and Barbuda"
+msgstr ""
+
+#: ../picard/const.py:265
+msgid "Afghanistan"
+msgstr ""
+
+#: ../picard/const.py:266
+msgid "Anguilla"
+msgstr ""
+
+#: ../picard/const.py:267
+msgid "Virgin Islands (U.S.)"
+msgstr ""
+
+#: ../picard/const.py:268
+msgid "Iceland"
+msgstr ""
+
+#: ../picard/const.py:269
+msgid "Iran (Islamic Republic of)"
+msgstr ""
+
+#: ../picard/const.py:270
+msgid "Armenia"
+msgstr ""
+
+#: ../picard/const.py:271
+msgid "Albania"
+msgstr ""
+
+#: ../picard/const.py:272
+msgid "Angola"
+msgstr ""
+
+#: ../picard/const.py:273
+msgid "Netherlands Antilles"
+msgstr ""
+
+#: ../picard/const.py:274
+msgid "Antarctica"
+msgstr ""
+
+#: ../picard/const.py:275
+msgid "American Samoa"
+msgstr ""
+
+#: ../picard/const.py:276
+msgid "Argentina"
+msgstr ""
+
+#: ../picard/const.py:277
+msgid "Australia"
+msgstr ""
+
+#: ../picard/const.py:278
+msgid "Austria"
+msgstr ""
+
+#: ../picard/const.py:279
+msgid "Aruba"
+msgstr ""
+
+#: ../picard/const.py:280
+msgid "India"
+msgstr ""
+
+#: ../picard/const.py:281
+msgid "Tanzania, United Republic of"
+msgstr ""
+
+#: ../picard/const.py:282
+msgid "Azerbaijan"
+msgstr ""
+
+#: ../picard/const.py:283
+msgid "Ireland"
+msgstr ""
+
+#: ../picard/const.py:284
+msgid "Indonesia"
+msgstr ""
+
+#: ../picard/const.py:285
+msgid "Ukraine"
+msgstr ""
+
+#: ../picard/const.py:286
+msgid "Qatar"
+msgstr ""
+
+#: ../picard/const.py:287
+msgid "Mozambique"
+msgstr ""
+
+#: ../picard/const.py:288
+msgid "Bosnia and Herzegovina"
+msgstr ""
+
+#: ../picard/const.py:289
+msgid "Congo, The Democratic Republic of the"
+msgstr ""
+
+#: ../picard/const.py:290
+msgid "Serbia and Montenegro"
+msgstr ""
+
+#: ../picard/const.py:291
+msgid "Croatia"
+msgstr ""
+
+#: ../picard/const.py:292
+msgid "Korea (North), Democratic People's Republic of"
+msgstr ""
+
+#: ../picard/const.py:293
+msgid "Korea (South), Republic of"
+msgstr ""
+
+#: ../picard/const.py:294
+msgid "Slovakia"
+msgstr ""
+
+#: ../picard/const.py:295
+msgid "Soviet Union (historical, 1922-1991)"
+msgstr ""
+
+#: ../picard/const.py:296
+msgid "East Timor"
+msgstr ""
+
+#: ../picard/const.py:297
+msgid "Czechoslovakia (historical, 1918-1992)"
+msgstr ""
+
+#: ../picard/const.py:298
+msgid "Europe"
+msgstr ""
+
+#: ../picard/const.py:299
+msgid "East Germany (historical, 1949-1990)"
+msgstr ""
+
+#: ../picard/const.py:300
+msgid "[Unknown Country]"
+msgstr ""
+
+#: ../picard/const.py:301
+msgid "[Worldwide]"
+msgstr ""
+
+#: ../picard/const.py:302
+msgid "Yugoslavia (historical, 1918-1992)"
+msgstr ""
+
+#: ../picard/const.py:307
+msgid "Catalan"
+msgstr ""
+
+#: ../picard/const.py:308
+msgid "Czech"
+msgstr ""
+
+#: ../picard/const.py:309
+msgid "Welsh"
+msgstr ""
+
+#: ../picard/const.py:310
+msgid "Danish"
+msgstr ""
+
+#: ../picard/const.py:311
+msgid "German"
+msgstr ""
+
+#: ../picard/const.py:312
+msgid "English"
+msgstr ""
+
+#: ../picard/const.py:313
+msgid "English (Canada)"
+msgstr ""
+
+#: ../picard/const.py:314
+msgid "English (UK)"
+msgstr ""
+
+#: ../picard/const.py:315
+msgid "Spanish"
+msgstr ""
+
+#: ../picard/const.py:316
+msgid "Persian"
+msgstr ""
+
+#: ../picard/const.py:317
+msgid "Finnish"
+msgstr ""
+
+#: ../picard/const.py:318
+msgid "French"
+msgstr ""
+
+#: ../picard/const.py:319
+msgid "Frisian"
+msgstr ""
+
+#: ../picard/const.py:320
+msgid "Hebrew"
+msgstr ""
+
+#: ../picard/const.py:321
+msgid "Hungarian"
+msgstr ""
+
+#: ../picard/const.py:322
+msgid "Islandic"
+msgstr ""
+
+#: ../picard/const.py:323
+msgid "Italian"
+msgstr ""
+
+#: ../picard/const.py:324
+msgid "Kannada"
+msgstr ""
+
+#: ../picard/const.py:325
+msgid "Korean"
+msgstr ""
+
+#: ../picard/const.py:326
+msgid "Lithuanian"
+msgstr ""
+
+#: ../picard/const.py:327
+msgid "Norwegian Bokmal"
+msgstr ""
+
+#: ../picard/const.py:328
+msgid "Dutch"
+msgstr ""
+
+#: ../picard/const.py:329
+msgid "Polish"
+msgstr ""
+
+#: ../picard/const.py:330
+msgid "Portuguese"
+msgstr ""
+
+#: ../picard/const.py:331
+msgid "Brazilian Portuguese"
+msgstr ""
+
+#: ../picard/const.py:332
+msgid "Romanian"
+msgstr ""
+
+#: ../picard/const.py:333
+msgid "Russian"
+msgstr ""
+
+#: ../picard/const.py:334
+msgid "Scots"
+msgstr ""
+
+#: ../picard/const.py:335
+msgid "Slovak"
+msgstr ""
+
+#: ../picard/const.py:336
+msgid "Slovenian"
+msgstr ""
+
+#: ../picard/const.py:337
+msgid "Swedish"
+msgstr ""
+
+#: ../picard/const.py:338
+msgid "Chinese"
+msgstr ""
+
+#: ../picard/file.py:475
+#, python-format
+msgid "No matching tracks for file %s"
+msgstr ""
+
+#: ../picard/file.py:492
+#, python-format
+msgid "No matching tracks above the threshold for file %s"
+msgstr ""
+
+#: ../picard/file.py:495
+#, python-format
+msgid "File %s identified!"
+msgstr ""
+
+#: ../picard/file.py:506
+#, python-format
+msgid "Looking up the PUID for file %s..."
+msgstr ""
+
+#: ../picard/file.py:511
+#, python-format
+msgid "Looking up the metadata for file %s..."
+msgstr ""
+
+#: ../picard/puidmanager.py:58
+msgid "Submitting PUIDs..."
+msgstr ""
+
+#: ../picard/puidmanager.py:64
+#, python-format
+msgid "PUIDs submission failed: %s"
+msgstr ""
+
+#: ../picard/puidmanager.py:66
+msgid "PUIDs successfully submitted!"
+msgstr ""
+
+#: ../picard/playlist.py:31
+msgid "M3U Playlist (*.m3u)"
+msgstr ""
+
+#: ../picard/playlist.py:32
+msgid "PLS Playlist (*.pls)"
+msgstr ""
+
+#: ../picard/playlist.py:33
+msgid "XSPF Playlist (*.xspf)"
+msgstr ""
+
+#: ../picard/tagger.py:476
 msgid "CD Lookup Error"
 msgstr ""
 
-#: ../picard/tagger.py:473
+#: ../picard/tagger.py:477
 #, python-format
 msgid ""
 "Error while reading CD:\n"
@@ -42,124 +1271,162 @@ msgid ""
 "%s"
 msgstr ""
 
-#: ../picard/ui/passworddialog.py:38
+#: ../picard/tagger.py:503
 #, python-format
-msgid ""
-"The server %s requires you to login. Please enter your username and password."
+msgid "Couldn't find PUID for file %s"
 msgstr ""
 
-#: ../picard/ui/ui_options_script.py:52
-msgid "Tagger Script"
+#: ../picard/musicdns/__init__.py:98
+#, python-format
+msgid "Looking up the fingerprint for file %s..."
+msgstr ""
+
+#: ../picard/musicdns/__init__.py:117
+#, python-format
+msgid "Creating fingerprint for file %s..."
 msgstr ""
 
 #: ../picard/ui/cdlookup.py:31
 msgid "Score"
 msgstr ""
 
-#: ../picard/ui/cdlookup.py:31
+#: ../picard/ui/cdlookup.py:31 ../picard/ui/itemviews.py:82
+#: ../picard/util/tags.py:23
 msgid "Title"
 msgstr ""
 
-#: ../picard/ui/cdlookup.py:31 ../picard/ui/mainwindow.py:436
+#: ../picard/ui/cdlookup.py:31 ../picard/ui/itemviews.py:84
+#: ../picard/ui/mainwindow.py:436 ../picard/util/tags.py:22
 msgid "Artist"
 msgstr ""
 
-#: ../picard/ui/ui_metadata.py:121
-msgid "Lookup"
+#: ../picard/ui/coverartbox.py:47 ../picard/ui/options/cover.py:29
+msgid "Cover Art"
 msgstr ""
 
-#: ../picard/ui/ui_metadata.py:122
-msgid "Title:"
+#: ../picard/ui/coverartbox.py:95
+msgid "Buy the album on Amazon"
 msgstr ""
 
-#: ../picard/ui/ui_metadata.py:123
-msgid "Date:"
+#: ../picard/ui/filebrowser.py:38 ../picard/ui/mainwindow.py:302
+msgid "&Refresh"
 msgstr ""
 
-#: ../picard/ui/ui_metadata.py:124
-msgid "Artist:"
+#: ../picard/ui/filebrowser.py:41
+msgid "&Move Tagged Files Here"
 msgstr ""
 
-#: ../picard/ui/ui_metadata.py:125
-msgid "Track:"
+#: ../picard/ui/filebrowser.py:44
+msgid "Show &Hidden Files"
 msgstr ""
 
-#: ../picard/ui/ui_metadata.py:126
-msgid "0000-00-00; "
+#: ../picard/ui/itemviews.py:83
+msgid "Length"
 msgstr ""
 
-#: ../picard/ui/ui_metadata.py:127 ../picard/ui/tageditor.py:225
-#: ../picard/ui/multitageditor.py:181
+#: ../picard/ui/itemviews.py:327
+msgid "&Releases"
+msgstr ""
+
+#: ../picard/ui/itemviews.py:353
+msgid "&Plugins"
+msgstr ""
+
+#: ../picard/ui/itemviews.py:523
+msgid "Clusters"
+msgstr ""
+
+#: ../picard/ui/logview.py:29
+msgid "Log"
+msgstr ""
+
+#: ../picard/ui/puidsubmit.py:31 ../picard/ui/options/plugins.py:80
+msgid "File"
+msgstr ""
+
+#: ../picard/ui/puidsubmit.py:31
+msgid "PUID"
+msgstr ""
+
+#: ../picard/ui/puidsubmit.py:31 ../picard/ui/mainwindow.py:437
+msgid "Track"
+msgstr ""
+
+#: ../picard/ui/puidsubmit.py:31
+msgid "Release"
+msgstr ""
+
+#: ../picard/ui/puidsubmit.py:31
+msgid "Release ID"
+msgstr ""
+
+#: ../picard/ui/tageditor.py:65 ../picard/ui/ui_options_plugins.py:62
+msgid "Details"
+msgstr ""
+
+#: ../picard/ui/tageditor.py:70 ../picard/ui/tageditor.py:241
+#, python-format
+msgid "%d file"
+msgid_plural "%d files"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../picard/ui/tageditor.py:124
+#, python-format
+msgid "(different across %d file)"
+msgid_plural "(different across %d files)"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../picard/ui/tageditor.py:127
+#, python-format
+msgid "(missing from %d file)"
+msgid_plural "(missing from %d files)"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../picard/ui/tageditor.py:210
+msgid "Filename:"
+msgstr ""
+
+#: ../picard/ui/tageditor.py:212
+msgid "Format:"
+msgstr ""
+
+#: ../picard/ui/tageditor.py:221
+msgid "Size:"
+msgstr ""
+
+#: ../picard/ui/tageditor.py:225 ../picard/ui/ui_metadata.py:127
 msgid "Length:"
 msgstr ""
 
-#: ../picard/ui/ui_metadata.py:128
-msgid "Album:"
+#: ../picard/ui/tageditor.py:227
+msgid "Bitrate:"
 msgstr ""
 
-#: ../picard/ui/ui_passworddialog.py:78
-msgid "Authentication required"
+#: ../picard/ui/tageditor.py:229
+msgid "Sample rate:"
 msgstr ""
 
-#: ../picard/ui/ui_passworddialog.py:79 ../picard/ui/ui_options_proxy.py:83
-#: ../picard/ui/ui_options_general.py:113
-msgid "Username:"
+#: ../picard/ui/tageditor.py:231
+msgid "Bits per sample:"
 msgstr ""
 
-#: ../picard/ui/ui_passworddialog.py:80 ../picard/ui/ui_options_proxy.py:82
-#: ../picard/ui/ui_options_general.py:112
-msgid "Password:"
+#: ../picard/ui/tageditor.py:234
+msgid "Mono"
 msgstr ""
 
-#: ../picard/ui/ui_passworddialog.py:81
-msgid "Save username and password"
+#: ../picard/ui/tageditor.py:235
+msgid "Stereo"
 msgstr ""
 
-#: ../picard/ui/ui_options_folksonomy.py:114
-#: ../picard/ui/ui_options_folksonomy_tags.py:114
-msgid "Folksonomy Tags"
+#: ../picard/ui/tageditor.py:237
+msgid "Channels:"
 msgstr ""
 
-#: ../picard/ui/ui_options_folksonomy.py:115
-#: ../picard/ui/ui_options_folksonomy_tags.py:115
-msgid "Ignore tags:"
-msgstr ""
-
-#: ../picard/ui/ui_options_folksonomy.py:116
-#: ../picard/ui/ui_options_folksonomy_tags.py:116
-msgid "Minimal tag usage:"
-msgstr ""
-
-#: ../picard/ui/ui_options_folksonomy.py:117
-#: ../picard/ui/ui_options_folksonomy_tags.py:117
-#: ../picard/ui/ui_options_matching.py:107
-#: ../picard/ui/ui_options_matching.py:108
-#: ../picard/ui/ui_options_matching.py:109
-#: ../picard/ui/ui_options_matching.py:113
-msgid " %"
-msgstr ""
-
-#: ../picard/ui/ui_options_folksonomy.py:118
-msgid "Maximum number of tags:"
-msgstr ""
-
-#: ../picard/ui/ui_options_folksonomy.py:119
-#: ../picard/ui/ui_options_folksonomy_tags.py:119
-msgid "Join multiple tags with:"
-msgstr ""
-
-#: ../picard/ui/ui_options_folksonomy.py:120
-#: ../picard/ui/ui_options_folksonomy_tags.py:120
-msgid " / "
-msgstr ""
-
-#: ../picard/ui/ui_options_folksonomy.py:121
-#: ../picard/ui/ui_options_folksonomy_tags.py:121
-msgid ", "
-msgstr ""
-
-#: ../picard/ui/ui_options_folksonomy_tags.py:118
-msgid "Maximal number of tags:"
+#: ../picard/ui/tagsfromfilenames.py:52 ../picard/ui/tagsfromfilenames.py:96
+msgid "File Name"
 msgstr ""
 
 #: ../picard/ui/mainwindow.py:64
@@ -338,10 +1605,6 @@ msgstr ""
 msgid "&Details..."
 msgstr ""
 
-#: ../picard/ui/mainwindow.py:302 ../picard/ui/filebrowser.py:38
-msgid "&Refresh"
-msgstr ""
-
 #: ../picard/ui/mainwindow.py:305
 msgid "Generate &Playlist..."
 msgstr ""
@@ -386,7 +1649,7 @@ msgstr ""
 msgid "&Tools"
 msgstr ""
 
-#: ../picard/ui/mainwindow.py:384
+#: ../picard/ui/mainwindow.py:384 ../picard/ui/util.py:33
 msgid "&Help"
 msgstr ""
 
@@ -398,14 +1661,10 @@ msgstr ""
 msgid "&Search Bar"
 msgstr ""
 
-#: ../picard/ui/mainwindow.py:435
+#: ../picard/ui/mainwindow.py:435 ../picard/util/tags.py:21
 msgid "Album"
 msgstr ""
 
-#: ../picard/ui/mainwindow.py:437 ../picard/ui/puidsubmit.py:31
-msgid "Track"
-msgstr ""
-
 #: ../picard/ui/mainwindow.py:476
 msgid "All Supported Formats"
 msgstr ""
@@ -425,32 +1684,274 @@ msgstr ""
 msgid " (Error: %s)"
 msgstr ""
 
+#: ../picard/ui/ui_tageditor.py:115 ../picard/ui/ui_options_plugins.py:59
+#: ../picard/ui/options/plugins.py:76
+msgid "Name"
+msgstr ""
+
+#: ../picard/ui/ui_tageditor.py:116
+msgid "Value"
+msgstr ""
+
+#: ../picard/ui/ui_tageditor.py:117
+msgid "&Add..."
+msgstr ""
+
+#: ../picard/ui/ui_tageditor.py:118
+msgid "&Edit..."
+msgstr ""
+
+#: ../picard/ui/ui_tageditor.py:119
+msgid "&Delete"
+msgstr ""
+
+#: ../picard/ui/ui_tageditor.py:120
+msgid "&Metadata"
+msgstr ""
+
+#: ../picard/ui/ui_tageditor.py:121
+msgid "A&rtwork"
+msgstr ""
+
+#: ../picard/ui/ui_tageditor.py:122
+msgid "&Info"
+msgstr ""
+
+#: ../picard/ui/passworddialog.py:38
+#, python-format
+msgid ""
+"The server %s requires you to login. Please enter your username and password."
+msgstr ""
+
+#: ../picard/ui/ui_cdlookup.py:60 ../picard/ui/ui_options_cdlookup.py:47
+#: ../picard/ui/ui_options_cdlookup_win32.py:56
+#: ../picard/ui/options/cdlookup.py:35
+msgid "CD Lookup"
+msgstr ""
+
+#: ../picard/ui/ui_cdlookup.py:61
+msgid "The following releases on MusicBrainz match the CD:"
+msgstr ""
+
+#: ../picard/ui/ui_cdlookup.py:62 ../picard/ui/ui_puidsubmit.py:53
+msgid "OK"
+msgstr ""
+
+#: ../picard/ui/ui_cdlookup.py:63
+msgid "    Lookup manually    "
+msgstr ""
+
+#: ../picard/ui/ui_cdlookup.py:64 ../picard/ui/ui_puidsubmit.py:54
+msgid "Cancel"
+msgstr ""
+
+#: ../picard/ui/ui_passworddialog.py:78
+msgid "Authentication required"
+msgstr ""
+
+#: ../picard/ui/ui_passworddialog.py:79 ../picard/ui/ui_options_general.py:113
+#: ../picard/ui/ui_options_proxy.py:83
+msgid "Username:"
+msgstr ""
+
+#: ../picard/ui/ui_passworddialog.py:80 ../picard/ui/ui_options_general.py:112
+#: ../picard/ui/ui_options_proxy.py:82
+msgid "Password:"
+msgstr ""
+
+#: ../picard/ui/ui_passworddialog.py:81
+msgid "Save username and password"
+msgstr ""
+
 #: ../picard/ui/ui_edittagdialog.py:44
 msgid "Edit Tag"
 msgstr ""
 
-#: ../picard/ui/ui_options_proxy.py:81
-msgid "Web Proxy"
+#: ../picard/ui/ui_metadata.py:121
+msgid "Lookup"
 msgstr ""
 
-#: ../picard/ui/ui_options_proxy.py:84 ../picard/ui/ui_options_general.py:109
-msgid "Port:"
+#: ../picard/ui/ui_metadata.py:122
+msgid "Title:"
 msgstr ""
 
-#: ../picard/ui/ui_options_proxy.py:85 ../picard/ui/ui_options_general.py:110
-msgid "Server address:"
+#: ../picard/ui/ui_metadata.py:123
+msgid "Date:"
 msgstr ""
 
-#: ../picard/ui/ui_tagsfromfilenames.py:56
-msgid "Convert File Names to Tags"
+#: ../picard/ui/ui_metadata.py:124
+msgid "Artist:"
 msgstr ""
 
-#: ../picard/ui/ui_tagsfromfilenames.py:57
-msgid "Replace underscores with spaces"
+#: ../picard/ui/ui_metadata.py:125
+msgid "Track:"
+msgstr ""
+
+#: ../picard/ui/ui_metadata.py:126
+msgid "0000-00-00; "
+msgstr ""
+
+#: ../picard/ui/ui_metadata.py:128
+msgid "Album:"
+msgstr ""
+
+#: ../picard/ui/ui_options.py:42
+msgid "Options"
+msgstr ""
+
+#: ../picard/ui/ui_options_cdlookup.py:48
+msgid "CD-ROM device to use for lookups:"
+msgstr ""
+
+#: ../picard/ui/ui_options_cdlookup_win32.py:57
+msgid "Default CD-ROM drive to use for lookups:"
+msgstr ""
+
+#: ../picard/ui/ui_options_cover.py:56
+msgid "Location"
+msgstr ""
+
+#: ../picard/ui/ui_options_cover.py:57
+msgid "Embed cover images into tags"
+msgstr ""
+
+#: ../picard/ui/ui_options_cover.py:58
+msgid "Save cover images as separate files"
+msgstr ""
+
+#: ../picard/ui/ui_options_cover.py:59
+msgid "Overwrite the file if it already exists"
+msgstr ""
+
+#: ../picard/ui/util.py:31
+msgid "&Ok"
+msgstr ""
+
+#: ../picard/ui/util.py:32
+msgid "&Cancel"
+msgstr ""
+
+#: ../picard/ui/ui_puidsubmit.py:52
+msgid "Submit PUIDs"
+msgstr ""
+
+#: ../picard/ui/ui_options_folksonomy.py:114
+#: ../picard/ui/options/folksonomy.py:29
+msgid "Folksonomy Tags"
+msgstr ""
+
+#: ../picard/ui/ui_options_folksonomy.py:115
+msgid "Ignore tags:"
+msgstr ""
+
+#: ../picard/ui/ui_options_folksonomy.py:116
+msgid "Minimal tag usage:"
+msgstr ""
+
+#: ../picard/ui/ui_options_folksonomy.py:117
+#: ../picard/ui/ui_options_matching.py:107
+#: ../picard/ui/ui_options_matching.py:108
+#: ../picard/ui/ui_options_matching.py:109
+#: ../picard/ui/ui_options_matching.py:113
+msgid " %"
+msgstr ""
+
+#: ../picard/ui/ui_options_folksonomy.py:118
+msgid "Maximum number of tags:"
+msgstr ""
+
+#: ../picard/ui/ui_options_folksonomy.py:119
+msgid "Join multiple tags with:"
+msgstr ""
+
+#: ../picard/ui/ui_options_folksonomy.py:120
+msgid " / "
+msgstr ""
+
+#: ../picard/ui/ui_options_folksonomy.py:121
+msgid ", "
+msgstr ""
+
+#: ../picard/ui/ui_options_interface.py:50
+msgid "Miscellaneous"
+msgstr ""
+
+#: ../picard/ui/ui_options_interface.py:51
+msgid "Show text labels under icons"
+msgstr ""
+
+#: ../picard/ui/ui_options_interface.py:52
+msgid "Allow selection of multiple directories"
+msgstr ""
+
+#: ../picard/ui/ui_options_interface.py:53
+msgid "Use advanced query syntax"
+msgstr ""
+
+#: ../picard/ui/ui_options_interface.py:54
+msgid "User interface language:"
+msgstr ""
+
+#: ../picard/ui/ui_options_naming.py:165
+msgid "Rename Files"
+msgstr ""
+
+#: ../picard/ui/ui_options_naming.py:166
+msgid "Replace Windows-incompatible characters"
+msgstr ""
+
+#: ../picard/ui/ui_options_naming.py:167
+msgid "Replace non-ASCII characters"
+msgstr ""
+
+#: ../picard/ui/ui_options_naming.py:168 ../picard/ui/ui_options_naming.py:169
+#: ../picard/ui/ui_options_metadata.py:109
+#: ../picard/ui/ui_options_metadata.py:110
+msgid "Default"
+msgstr ""
+
+#: ../picard/ui/ui_options_naming.py:170 ../picard/ui/options/naming.py:90
+msgid "Multiple artist file naming format:"
+msgstr ""
+
+#: ../picard/ui/ui_options_naming.py:171 ../picard/ui/options/naming.py:86
+msgid "File naming format:"
+msgstr ""
+
+#: ../picard/ui/ui_options_naming.py:172
+msgid "Move Files"
+msgstr ""
+
+#: ../picard/ui/ui_options_naming.py:173
+msgid "Move tagged files to this directory:"
+msgstr ""
+
+#: ../picard/ui/ui_options_naming.py:174
+msgid "Browse..."
+msgstr ""
+
+#: ../picard/ui/ui_options_naming.py:175
+msgid "Move additional files:"
+msgstr ""
+
+#: ../picard/ui/ui_options_naming.py:176
+msgid "Delete empty directories"
+msgstr ""
+
+#: ../picard/ui/ui_options_naming.py:177
+msgid "Example"
+msgstr ""
+
+#: ../picard/ui/ui_options_naming.py:178
+msgid "File name:"
+msgstr ""
+
+#: ../picard/ui/ui_options_naming.py:179
+msgid "Multiple artist file name:"
 msgstr ""
 
-#: ../picard/ui/ui_tagsfromfilenames.py:58
 #: ../picard/ui/ui_options_naming.py:180
+#: ../picard/ui/ui_tagsfromfilenames.py:58
 msgid "&Preview"
 msgstr ""
 
@@ -458,11 +1959,19 @@ msgstr ""
 msgid "MusicBrainz Server"
 msgstr ""
 
+#: ../picard/ui/ui_options_general.py:109 ../picard/ui/ui_options_proxy.py:84
+msgid "Port:"
+msgstr ""
+
+#: ../picard/ui/ui_options_general.py:110 ../picard/ui/ui_options_proxy.py:85
+msgid "Server address:"
+msgstr ""
+
 #: ../picard/ui/ui_options_general.py:111
 msgid "Account Information"
 msgstr ""
 
-#: ../picard/ui/ui_options_general.py:114
+#: ../picard/ui/ui_options_general.py:114 ../picard/ui/options/general.py:29
 msgid "General"
 msgstr ""
 
@@ -470,34 +1979,6 @@ msgstr ""
 msgid "Automatically scan all new files"
 msgstr ""
 
-#: ../picard/ui/ui_options_interface.py:46
-msgid "Miscellaneous"
-msgstr ""
-
-#: ../picard/ui/ui_options_interface.py:47
-msgid "Show text labels under icons"
-msgstr ""
-
-#: ../picard/ui/ui_options_interface.py:48
-msgid "Allow selection of multiple directories"
-msgstr ""
-
-#: ../picard/ui/ui_options_interface.py:49
-msgid "Use advanced query syntax"
-msgstr ""
-
-#: ../picard/ui/itemviews.py:327
-msgid "&Releases"
-msgstr ""
-
-#: ../picard/ui/itemviews.py:353
-msgid "&Plugins"
-msgstr ""
-
-#: ../picard/ui/itemviews.py:523
-msgid "Clusters"
-msgstr ""
-
 #: ../picard/ui/ui_options_matching.py:105
 msgid "Thresholds"
 msgstr ""
@@ -518,6 +1999,62 @@ msgstr ""
 msgid "Minimal similarity for PUID lookups:"
 msgstr ""
 
+#: ../picard/ui/ui_options_metadata.py:100 ../picard/ui/options/metadata.py:31
+msgid "Metadata"
+msgstr ""
+
+#: ../picard/ui/ui_options_metadata.py:101
+msgid "Translate foreign artist names to English where possible"
+msgstr ""
+
+#: ../picard/ui/ui_options_metadata.py:102
+msgid "Use release relationships"
+msgstr ""
+
+#: ../picard/ui/ui_options_metadata.py:103
+msgid "Use track relationships"
+msgstr ""
+
+#: ../picard/ui/ui_options_metadata.py:104
+msgid "Use folksonomy tags as genre"
+msgstr ""
+
+#: ../picard/ui/ui_options_metadata.py:105
+msgid "Preferred release country:"
+msgstr ""
+
+#: ../picard/ui/ui_options_metadata.py:106
+msgid "Custom Fields"
+msgstr ""
+
+#: ../picard/ui/ui_options_metadata.py:107
+msgid "Various artists:"
+msgstr ""
+
+#: ../picard/ui/ui_options_metadata.py:108
+msgid "Non-album tracks:"
+msgstr ""
+
+#: ../picard/ui/ui_options_plugins.py:58 ../picard/ui/options/plugins.py:30
+msgid "Plugins"
+msgstr ""
+
+#: ../picard/ui/ui_options_plugins.py:60 ../picard/ui/options/plugins.py:79
+msgid "Author"
+msgstr ""
+
+#: ../picard/ui/ui_options_plugins.py:61 ../picard/util/tags.py:36
+msgid "Version"
+msgstr ""
+
+#: ../picard/ui/ui_options_proxy.py:81 ../picard/ui/options/proxy.py:28
+msgid "Web Proxy"
+msgstr ""
+
+#: ../picard/ui/ui_options_script.py:52
+msgid "Tagger Script"
+msgstr ""
+
 #: ../picard/ui/ui_options_tags.py:105
 msgid "Common"
 msgstr ""
@@ -570,309 +2107,16 @@ msgstr ""
 msgid "Remove APEv2 tags from MP3 files"
 msgstr ""
 
-#: ../picard/ui/ui_options_cdlookup_win32.py:56 ../picard/ui/ui_cdlookup.py:60
-#: ../picard/ui/ui_options_cdlookup.py:47
-msgid "CD Lookup"
+#: ../picard/ui/ui_tagsfromfilenames.py:56
+msgid "Convert File Names to Tags"
 msgstr ""
 
-#: ../picard/ui/ui_options_cdlookup_win32.py:57
-msgid "Default CD-ROM drive to use for lookups:"
+#: ../picard/ui/ui_tagsfromfilenames.py:57
+msgid "Replace underscores with spaces"
 msgstr ""
 
-#: ../picard/ui/tageditor.py:65 ../picard/ui/ui_options_plugins.py:62
-#: ../picard/ui/multitageditor.py:37
-msgid "Details"
-msgstr ""
-
-#: ../picard/ui/tageditor.py:70 ../picard/ui/tageditor.py:241
-#: ../picard/ui/multitageditor.py:42 ../picard/ui/multitageditor.py:197
-#, python-format
-msgid "%d file"
-msgid_plural "%d files"
-msgstr[0] ""
-msgstr[1] ""
-
-#: ../picard/ui/tageditor.py:124 ../picard/ui/multitageditor.py:95
-#, python-format
-msgid "(different across %d file)"
-msgid_plural "(different across %d files)"
-msgstr[0] ""
-msgstr[1] ""
-
-#: ../picard/ui/tageditor.py:127 ../picard/ui/multitageditor.py:98
-#, python-format
-msgid "(missing from %d file)"
-msgid_plural "(missing from %d files)"
-msgstr[0] ""
-msgstr[1] ""
-
-#: ../picard/ui/tageditor.py:210 ../picard/ui/multitageditor.py:166
-msgid "Filename:"
-msgstr ""
-
-#: ../picard/ui/tageditor.py:212 ../picard/ui/multitageditor.py:168
-msgid "Format:"
-msgstr ""
-
-#: ../picard/ui/tageditor.py:221 ../picard/ui/multitageditor.py:177
-msgid "Size:"
-msgstr ""
-
-#: ../picard/ui/tageditor.py:227 ../picard/ui/multitageditor.py:183
-msgid "Bitrate:"
-msgstr ""
-
-#: ../picard/ui/tageditor.py:229 ../picard/ui/multitageditor.py:185
-msgid "Sample rate:"
-msgstr ""
-
-#: ../picard/ui/tageditor.py:231 ../picard/ui/multitageditor.py:187
-msgid "Bits per sample:"
-msgstr ""
-
-#: ../picard/ui/tageditor.py:234 ../picard/ui/multitageditor.py:190
-msgid "Mono"
-msgstr ""
-
-#: ../picard/ui/tageditor.py:235 ../picard/ui/multitageditor.py:191
-msgid "Stereo"
-msgstr ""
-
-#: ../picard/ui/tageditor.py:237 ../picard/ui/multitageditor.py:193
-msgid "Channels:"
-msgstr ""
-
-#: ../picard/ui/ui_tageditor.py:115 ../picard/ui/ui_multitageditor.py:55
-#: ../picard/ui/ui_options_plugins.py:59 ../picard/ui/options/plugins.py:76
-msgid "Name"
-msgstr ""
-
-#: ../picard/ui/ui_tageditor.py:116 ../picard/ui/ui_multitageditor.py:56
-msgid "Value"
-msgstr ""
-
-#: ../picard/ui/ui_tageditor.py:117 ../picard/ui/ui_multitageditor.py:57
-msgid "&Add..."
-msgstr ""
-
-#: ../picard/ui/ui_tageditor.py:118
-msgid "&Edit..."
-msgstr ""
-
-#: ../picard/ui/ui_tageditor.py:119
-msgid "&Delete"
-msgstr ""
-
-#: ../picard/ui/ui_tageditor.py:120
-msgid "&Metadata"
-msgstr ""
-
-#: ../picard/ui/ui_tageditor.py:121
-msgid "A&rtwork"
-msgstr ""
-
-#: ../picard/ui/ui_tageditor.py:122
-msgid "&Info"
-msgstr ""
-
-#: ../picard/ui/coverartbox.py:47
-msgid "Cover Art"
-msgstr ""
-
-#: ../picard/ui/coverartbox.py:95
-msgid "Buy the album on Amazon"
-msgstr ""
-
-#: ../picard/ui/ui_puidsubmit.py:52
-msgid "Submit PUIDs"
-msgstr ""
-
-#: ../picard/ui/ui_puidsubmit.py:53 ../picard/ui/ui_cdlookup.py:62
-msgid "OK"
-msgstr ""
-
-#: ../picard/ui/ui_puidsubmit.py:54 ../picard/ui/ui_cdlookup.py:64
-msgid "Cancel"
-msgstr ""
-
-#: ../picard/ui/puidsubmit.py:31 ../picard/ui/options/plugins.py:80
-msgid "File"
-msgstr ""
-
-#: ../picard/ui/puidsubmit.py:31
-msgid "PUID"
-msgstr ""
-
-#: ../picard/ui/puidsubmit.py:31
-msgid "Release"
-msgstr ""
-
-#: ../picard/ui/puidsubmit.py:31
-msgid "Release ID"
-msgstr ""
-
-#: ../picard/ui/filebrowser.py:41
-msgid "&Move Tagged Files Here"
-msgstr ""
-
-#: ../picard/ui/filebrowser.py:44
-msgid "Show &Hidden Files"
-msgstr ""
-
-#: ../picard/ui/ui_cdlookup.py:61
-msgid "The following releases on MusicBrainz match the CD:"
-msgstr ""
-
-#: ../picard/ui/ui_cdlookup.py:63
-msgid "    Lookup manually    "
-msgstr ""
-
-#: ../picard/ui/ui_options.py:42
-msgid "Options"
-msgstr ""
-
-#: ../picard/ui/tagsfromfilenames.py:52 ../picard/ui/tagsfromfilenames.py:96
-msgid "File Name"
-msgstr ""
-
-#: ../picard/ui/ui_options_cover.py:56
-msgid "Location"
-msgstr ""
-
-#: ../picard/ui/ui_options_cover.py:57
-msgid "Embed cover images into tags"
-msgstr ""
-
-#: ../picard/ui/ui_options_cover.py:58
-msgid "Save cover images as separate files"
-msgstr ""
-
-#: ../picard/ui/ui_options_cover.py:59
-msgid "Overwrite the file if it already exists"
-msgstr ""
-
-#: ../picard/ui/ui_options_metadata.py:100
-msgid "Metadata"
-msgstr ""
-
-#: ../picard/ui/ui_options_metadata.py:101
-msgid "Translate foreign artist names to English where possible"
-msgstr ""
-
-#: ../picard/ui/ui_options_metadata.py:102
-msgid "Use release relationships"
-msgstr ""
-
-#: ../picard/ui/ui_options_metadata.py:103
-msgid "Use track relationships"
-msgstr ""
-
-#: ../picard/ui/ui_options_metadata.py:104
-msgid "Use folksonomy tags as genre"
-msgstr ""
-
-#: ../picard/ui/ui_options_metadata.py:105
-msgid "Preferred release country:"
-msgstr ""
-
-#: ../picard/ui/ui_options_metadata.py:106
-msgid "Custom Fields"
-msgstr ""
-
-#: ../picard/ui/ui_options_metadata.py:107
-msgid "Various artists:"
-msgstr ""
-
-#: ../picard/ui/ui_options_metadata.py:108
-msgid "Non-album tracks:"
-msgstr ""
-
-#: ../picard/ui/ui_options_metadata.py:109
-#: ../picard/ui/ui_options_metadata.py:110
-#: ../picard/ui/ui_options_naming.py:168 ../picard/ui/ui_options_naming.py:169
-msgid "Default"
-msgstr ""
-
-#: ../picard/ui/ui_multitageditor.py:58
-msgid "Delete"
-msgstr ""
-
-#: ../picard/ui/logview.py:29
-msgid "Log"
-msgstr ""
-
-#: ../picard/ui/ui_options_plugins.py:58
-msgid "Plugins"
-msgstr ""
-
-#: ../picard/ui/ui_options_plugins.py:60 ../picard/ui/options/plugins.py:79
-msgid "Author"
-msgstr ""
-
-#: ../picard/ui/ui_options_plugins.py:61
-msgid "Version"
-msgstr ""
-
-#: ../picard/ui/ui_options_naming.py:165
-msgid "Rename Files"
-msgstr ""
-
-#: ../picard/ui/ui_options_naming.py:166
-msgid "Replace Windows-incompatible characters"
-msgstr ""
-
-#: ../picard/ui/ui_options_naming.py:167
-msgid "Replace non-ASCII characters"
-msgstr ""
-
-#: ../picard/ui/ui_options_naming.py:170 ../picard/ui/options/naming.py:90
-msgid "Multiple artist file naming format:"
-msgstr ""
-
-#: ../picard/ui/ui_options_naming.py:171 ../picard/ui/options/naming.py:86
-msgid "File naming format:"
-msgstr ""
-
-#: ../picard/ui/ui_options_naming.py:172
-msgid "Move Files"
-msgstr ""
-
-#: ../picard/ui/ui_options_naming.py:173
-msgid "Move tagged files to this directory:"
-msgstr ""
-
-#: ../picard/ui/ui_options_naming.py:174
-msgid "Browse..."
-msgstr ""
-
-#: ../picard/ui/ui_options_naming.py:175
-msgid "Move additional files:"
-msgstr ""
-
-#: ../picard/ui/ui_options_naming.py:176
-msgid "Delete empty directories"
-msgstr ""
-
-#: ../picard/ui/ui_options_naming.py:177
-msgid "Example"
-msgstr ""
-
-#: ../picard/ui/ui_options_naming.py:178
-msgid "File name:"
-msgstr ""
-
-#: ../picard/ui/ui_options_naming.py:179
-msgid "Multiple artist file name:"
-msgstr ""
-
-#: ../picard/ui/ui_options_cdlookup.py:48
-msgid "CD-ROM device to use for lookups:"
-msgstr ""
-
-#: ../picard/ui/options/scripting.py:84 ../picard/ui/options/naming.py:86
-#: ../picard/ui/options/naming.py:90 ../picard/ui/options/naming.py:93
-#: ../picard/ui/options/naming.py:95
-msgid "Script Error"
+#: ../picard/ui/options/about.py:29
+msgid "About"
 msgstr ""
 
 #. Replace this with your name to have it appear in the "About" dialog.
@@ -907,6 +2151,46 @@ msgid ""
 "\">http://musicbrainz.org/doc/PicardTagger</a></p>\n"
 msgstr ""
 
+#: ../picard/ui/options/advanced.py:26
+msgid "Advanced"
+msgstr ""
+
+#: ../picard/ui/options/interface.py:31
+msgid "User Interface"
+msgstr ""
+
+#: ../picard/ui/options/interface.py:47
+msgid "System default"
+msgstr ""
+
+#: ../picard/ui/options/interface.py:71
+msgid "Language changed"
+msgstr ""
+
+#: ../picard/ui/options/interface.py:71
+msgid ""
+"You have changed the interface language. You have to restart Picard in order "
+"for the change to take effect."
+msgstr ""
+
+#: ../picard/ui/options/matching.py:29
+msgid "Matching"
+msgstr ""
+
+#: ../picard/ui/options/metadata.py:52
+msgid "None"
+msgstr ""
+
+#: ../picard/ui/options/naming.py:33
+msgid "File Naming"
+msgstr ""
+
+#: ../picard/ui/options/naming.py:86 ../picard/ui/options/naming.py:90
+#: ../picard/ui/options/naming.py:93 ../picard/ui/options/naming.py:95
+#: ../picard/ui/options/scripting.py:84
+msgid "Script Error"
+msgstr ""
+
 #: ../picard/ui/options/naming.py:93
 msgid "The file naming format must not be empty."
 msgstr ""
@@ -923,6 +2207,230 @@ msgstr ""
 msgid "The location to move files to must not be empty."
 msgstr ""
 
+#: ../picard/ui/options/scripting.py:63
+msgid "Scripting"
+msgstr ""
+
+#: ../picard/ui/options/tags.py:29
+msgid "Tags"
+msgstr ""
+
+#: ../picard/util/tags.py:24
+msgid "Date"
+msgstr ""
+
+#: ../picard/util/tags.py:25
+msgid "Album Artist"
+msgstr ""
+
+#: ../picard/util/tags.py:26
+msgid "Track Number"
+msgstr ""
+
+#: ../picard/util/tags.py:27
+msgid "Total Tracks"
+msgstr ""
+
+#: ../picard/util/tags.py:28
+msgid "Disc Number"
+msgstr ""
+
+#: ../picard/util/tags.py:29
+msgid "Total Discs"
+msgstr ""
+
+#: ../picard/util/tags.py:30
+msgid "Album Artist Sort Order"
+msgstr ""
+
+#: ../picard/util/tags.py:31
+msgid "Artist Sort Order"
+msgstr ""
+
+#: ../picard/util/tags.py:32
+msgid "Title Sort Order"
+msgstr ""
+
+#: ../picard/util/tags.py:33
+msgid "Album Sort Order"
+msgstr ""
+
+#: ../picard/util/tags.py:34
+msgid "ASIN"
+msgstr ""
+
+#: ../picard/util/tags.py:35
+msgid "Grouping"
+msgstr ""
+
+#: ../picard/util/tags.py:37
+msgid "ISRC"
+msgstr ""
+
+#: ../picard/util/tags.py:38
+msgid "Mood"
+msgstr ""
+
+#: ../picard/util/tags.py:39
+msgid "BPM"
+msgstr ""
+
+#: ../picard/util/tags.py:40
+msgid "Copyright"
+msgstr ""
+
+#: ../picard/util/tags.py:41
+msgid "Composer"
+msgstr ""
+
+#: ../picard/util/tags.py:42
+msgid "Conductor"
+msgstr ""
+
+#: ../picard/util/tags.py:43
+msgid "Lyricist"
+msgstr ""
+
+#: ../picard/util/tags.py:44
+msgid "Arranger"
+msgstr ""
+
+#: ../picard/util/tags.py:45
+msgid "Producer"
+msgstr ""
+
+#: ../picard/util/tags.py:46
+msgid "Engineer"
+msgstr ""
+
+#: ../picard/util/tags.py:47
+msgid "Subtitle"
+msgstr ""
+
+#: ../picard/util/tags.py:48
+msgid "Disc Subtitle"
+msgstr ""
+
+#: ../picard/util/tags.py:49
+msgid "Remixer"
+msgstr ""
+
+#: ../picard/util/tags.py:50
+msgid "MusicBrainz Track Id"
+msgstr ""
+
+#: ../picard/util/tags.py:51
+msgid "MusicBrainz Release Id"
+msgstr ""
+
+#: ../picard/util/tags.py:52
+msgid "MusicBrainz Artist Id"
+msgstr ""
+
+#: ../picard/util/tags.py:53
+msgid "MusicBrainz Release Artist Id"
+msgstr ""
+
+#: ../picard/util/tags.py:54
+msgid "MusicBrainz TRM Id"
+msgstr ""
+
+#: ../picard/util/tags.py:55
+msgid "MusicBrainz Disc Id"
+msgstr ""
+
+#: ../picard/util/tags.py:56
+msgid "MusicBrainz Sort Name"
+msgstr ""
+
+#: ../picard/util/tags.py:57
+msgid "MusicIP PUID"
+msgstr ""
+
+#: ../picard/util/tags.py:58
+msgid "MusicIP Fingerprint"
+msgstr ""
+
+#: ../picard/util/tags.py:59
+msgid "Disc Id"
+msgstr ""
+
+#: ../picard/util/tags.py:60
+msgid "Website"
+msgstr ""
+
+#: ../picard/util/tags.py:61
+msgid "Compilation"
+msgstr ""
+
+#: ../picard/util/tags.py:62
+msgid "Comment"
+msgstr ""
+
+#: ../picard/util/tags.py:63
+msgid "Genre"
+msgstr ""
+
+#: ../picard/util/tags.py:64
+msgid "Encoded By"
+msgstr ""
+
+#: ../picard/util/tags.py:65
+msgid "Performer"
+msgstr ""
+
+#: ../picard/util/tags.py:66
+msgid "Release Type"
+msgstr ""
+
+#: ../picard/util/tags.py:67
+msgid "Release Status"
+msgstr ""
+
+#: ../picard/util/tags.py:68
+msgid "Release Country"
+msgstr ""
+
+#: ../picard/util/tags.py:69
+msgid "Record Label"
+msgstr ""
+
+#: ../picard/util/tags.py:70
+msgid "Barcode"
+msgstr ""
+
+#: ../picard/util/tags.py:71
+msgid "Catalog Number"
+msgstr ""
+
+#: ../picard/util/tags.py:72
+msgid "Format"
+msgstr ""
+
+#: ../picard/util/tags.py:73
+msgid "DJ-Mixer"
+msgstr ""
+
+#: ../picard/util/tags.py:74
+msgid "Media"
+msgstr ""
+
+#: ../picard/util/tags.py:75
+msgid "Lyrics"
+msgstr ""
+
+#: ../picard/util/tags.py:76
+msgid "Mixer"
+msgstr ""
+
+#: ../picard/util/tags.py:77
+msgid "Language"
+msgstr ""
+
+#: ../picard/util/tags.py:78
+msgid "Script"
+msgstr ""
+
 #: ../picard/util/webbrowser2.py:84
 msgid "Web Browser Error"
 msgstr ""
diff --git a/po/pl.po b/po/pl.po
index 93b05c230..8085e7422 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -6,36 +6,1297 @@ msgid ""
 msgstr ""
 "Project-Id-Version: picard\n"
 "Report-Msgid-Bugs-To: http://bugs.musicbrainz.org/\n"
-"POT-Creation-Date: 2008-12-01 18:20+0100\n"
-"PO-Revision-Date: 2008-11-30 08:48+0000\n"
-"Last-Translator: M. Żarczyński <rajcaa@gmail.com>\n"
+"POT-Creation-Date: 2009-01-25 12:23+0100\n"
+"PO-Revision-Date: 2009-01-25 13:30+0100\n"
+"Last-Translator: Philipp Wolfer <phw@rubyforge.org>\n"
 "Language-Team: Polish <pl@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=3; plural=n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 "
-"|| n%100>=20) ? 1 : 2;\n"
-"X-Launchpad-Export-Date: 2008-12-01 17:01+0000\n"
+"Plural-Forms: nplurals=3; plural=n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
+"X-Launchpad-Export-Date: 2009-01-24 23:28+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
-#: ../picard/album.py:108 ../picard/cluster.py:248
+#: ../picard/album.py:108
+#: ../picard/cluster.py:248
 msgid "Unmatched Files"
 msgstr "Niepasujące pliki"
 
-#: ../picard/album.py:269
+#: ../picard/album.py:281
 #, python-format
 msgid "[couldn't load album %s]"
 msgstr "[nie można wczytać albumu %s]"
 
-#: ../picard/album.py:305
+#: ../picard/album.py:317
 msgid "[loading album information]"
 msgstr "[wczytywanie informacji o albumie]"
 
-#: ../picard/tagger.py:472
+#: ../picard/cluster.py:164
+#: ../picard/cluster.py:175
+#, python-format
+msgid "No matching releases for cluster %s"
+msgstr "Brak pasujących wydań dla albumu %s"
+
+#: ../picard/cluster.py:177
+#, python-format
+msgid "Cluster %s identified!"
+msgstr "Grupa %s zidentyfikowana!"
+
+#: ../picard/cluster.py:182
+#, python-format
+msgid "Looking up the metadata for cluster %s..."
+msgstr "Sprawdzanie metadanych dla grupy %s..."
+
+#: ../picard/const.py:40
+msgid "CD"
+msgstr ""
+
+#: ../picard/const.py:41
+msgid "DVD"
+msgstr ""
+
+#: ../picard/const.py:42
+msgid "SACD"
+msgstr ""
+
+#: ../picard/const.py:43
+msgid "LaserDisc"
+msgstr ""
+
+#: ../picard/const.py:44
+#, fuzzy
+msgid "MiniDisc"
+msgstr "Płyta:"
+
+#: ../picard/const.py:45
+msgid "Vinyl"
+msgstr ""
+
+#: ../picard/const.py:46
+msgid "Cassette"
+msgstr ""
+
+#: ../picard/const.py:47
+msgid "Cartridge (4/8-tracks)"
+msgstr ""
+
+#: ../picard/const.py:48
+msgid "Reel-to-Reel"
+msgstr ""
+
+#: ../picard/const.py:49
+msgid "DAT"
+msgstr ""
+
+#: ../picard/const.py:50
+#, fuzzy
+msgid "Digital Media"
+msgstr "Oryginalne Metadane"
+
+#: ../picard/const.py:51
+msgid "Wax Cylinder"
+msgstr ""
+
+#: ../picard/const.py:52
+msgid "Piano Roll"
+msgstr ""
+
+#: ../picard/const.py:53
+#, fuzzy
+msgid "Other"
+msgstr "Później"
+
+#: ../picard/const.py:58
+msgid "Bangladesh"
+msgstr ""
+
+#: ../picard/const.py:59
+msgid "Belgium"
+msgstr ""
+
+#: ../picard/const.py:60
+msgid "Burkina Faso"
+msgstr ""
+
+#: ../picard/const.py:61
+msgid "Bulgaria"
+msgstr ""
+
+#: ../picard/const.py:62
+msgid "Barbados"
+msgstr ""
+
+#: ../picard/const.py:63
+msgid "Wallis and Futuna Islands"
+msgstr ""
+
+#: ../picard/const.py:64
+msgid "Bermuda"
+msgstr ""
+
+#: ../picard/const.py:65
+msgid "Brunei Darussalam"
+msgstr ""
+
+#: ../picard/const.py:66
+msgid "Bolivia"
+msgstr ""
+
+#: ../picard/const.py:67
+msgid "Bahrain"
+msgstr ""
+
+#: ../picard/const.py:68
+msgid "Burundi"
+msgstr ""
+
+#: ../picard/const.py:69
+msgid "Benin"
+msgstr ""
+
+#: ../picard/const.py:70
+msgid "Bhutan"
+msgstr ""
+
+#: ../picard/const.py:71
+msgid "Jamaica"
+msgstr ""
+
+#: ../picard/const.py:72
+msgid "Bouvet Island"
+msgstr ""
+
+#: ../picard/const.py:73
+msgid "Botswana"
+msgstr ""
+
+#: ../picard/const.py:74
+msgid "Samoa"
+msgstr ""
+
+#: ../picard/const.py:75
+msgid "Brazil"
+msgstr ""
+
+#: ../picard/const.py:76
+msgid "Bahamas"
+msgstr ""
+
+#: ../picard/const.py:77
+msgid "Belarus"
+msgstr ""
+
+#: ../picard/const.py:78
+msgid "Belize"
+msgstr ""
+
+#: ../picard/const.py:79
+msgid "Russian Federation"
+msgstr ""
+
+#: ../picard/const.py:80
+msgid "Rwanda"
+msgstr ""
+
+#: ../picard/const.py:81
+msgid "Reunion"
+msgstr ""
+
+#: ../picard/const.py:82
+msgid "Turkmenistan"
+msgstr ""
+
+#: ../picard/const.py:83
+msgid "Tajikistan"
+msgstr ""
+
+#: ../picard/const.py:84
+msgid "Romania"
+msgstr ""
+
+#: ../picard/const.py:85
+#, fuzzy
+msgid "Tokela"
+msgstr "Pasek narzędzi"
+
+#: ../picard/const.py:86
+msgid "Guinea-Bissa"
+msgstr ""
+
+#: ../picard/const.py:87
+msgid "Guam"
+msgstr ""
+
+#: ../picard/const.py:88
+msgid "Guatemala"
+msgstr ""
+
+#: ../picard/const.py:89
+msgid "Greece"
+msgstr ""
+
+#: ../picard/const.py:90
+msgid "Equatorial Guinea"
+msgstr ""
+
+#: ../picard/const.py:91
+msgid "Guadeloupe"
+msgstr ""
+
+#: ../picard/const.py:92
+msgid "Japan"
+msgstr ""
+
+#: ../picard/const.py:93
+msgid "Guyana"
+msgstr ""
+
+#: ../picard/const.py:94
+msgid "French Guiana"
+msgstr ""
+
+#: ../picard/const.py:95
+msgid "Georgia"
+msgstr ""
+
+#: ../picard/const.py:96
+msgid "Grenada"
+msgstr ""
+
+#: ../picard/const.py:97
+msgid "United Kingdom"
+msgstr ""
+
+#: ../picard/const.py:98
+msgid "Gabon"
+msgstr ""
+
+#: ../picard/const.py:99
+msgid "El Salvador"
+msgstr ""
+
+#: ../picard/const.py:100
+#, fuzzy
+msgid "Guinea"
+msgstr "Ogólne"
+
+#: ../picard/const.py:101
+msgid "Gambia"
+msgstr ""
+
+#: ../picard/const.py:102
+msgid "Greenland"
+msgstr ""
+
+#: ../picard/const.py:103
+msgid "Gibraltar"
+msgstr ""
+
+#: ../picard/const.py:104
+msgid "Ghana"
+msgstr ""
+
+#: ../picard/const.py:105
+msgid "Oman"
+msgstr ""
+
+#: ../picard/const.py:106
+msgid "Tunisia"
+msgstr ""
+
+#: ../picard/const.py:107
+msgid "Jordan"
+msgstr ""
+
+#: ../picard/const.py:108
+msgid "Haiti"
+msgstr ""
+
+#: ../picard/const.py:109
+msgid "Hungary"
+msgstr ""
+
+#: ../picard/const.py:110
+msgid "Hong Kong"
+msgstr ""
+
+#: ../picard/const.py:111
+msgid "Honduras"
+msgstr ""
+
+#: ../picard/const.py:112
+msgid "Heard and Mc Donald Islands"
+msgstr ""
+
+#: ../picard/const.py:113
+msgid "Venezuela"
+msgstr ""
+
+#: ../picard/const.py:114
+msgid "Puerto Rico"
+msgstr ""
+
+#: ../picard/const.py:115
+msgid "Pala"
+msgstr ""
+
+#: ../picard/const.py:116
+#, fuzzy
+msgid "Portugal"
+msgstr "Port:"
+
+#: ../picard/const.py:117
+msgid "Svalbard and Jan Mayen Islands"
+msgstr ""
+
+#: ../picard/const.py:118
+msgid "Paraguay"
+msgstr ""
+
+#: ../picard/const.py:119
+msgid "Iraq"
+msgstr ""
+
+#: ../picard/const.py:120
+msgid "Panama"
+msgstr ""
+
+#: ../picard/const.py:121
+msgid "French Polynesia"
+msgstr ""
+
+#: ../picard/const.py:122
+msgid "Papua New Guinea"
+msgstr ""
+
+#: ../picard/const.py:123
+msgid "Per"
+msgstr ""
+
+#: ../picard/const.py:124
+msgid "Pakistan"
+msgstr ""
+
+#: ../picard/const.py:125
+msgid "Philippines"
+msgstr ""
+
+#: ../picard/const.py:126
+msgid "Pitcairn"
+msgstr ""
+
+#: ../picard/const.py:127
+msgid "Poland"
+msgstr ""
+
+#: ../picard/const.py:128
+msgid "St. Pierre and Miquelon"
+msgstr ""
+
+#: ../picard/const.py:129
+msgid "Zambia"
+msgstr ""
+
+#: ../picard/const.py:130
+msgid "Western Sahara"
+msgstr ""
+
+#: ../picard/const.py:131
+msgid "Estonia"
+msgstr ""
+
+#: ../picard/const.py:132
+msgid "Egypt"
+msgstr ""
+
+#: ../picard/const.py:133
+msgid "South Africa"
+msgstr ""
+
+#: ../picard/const.py:134
+msgid "Ecuador"
+msgstr ""
+
+#: ../picard/const.py:135
+msgid "Italy"
+msgstr ""
+
+#: ../picard/const.py:136
+#, fuzzy
+msgid "Viet Nam"
+msgstr "Nazwa pliku"
+
+#: ../picard/const.py:137
+msgid "Solomon Islands"
+msgstr ""
+
+#: ../picard/const.py:138
+msgid "Ethiopia"
+msgstr ""
+
+#: ../picard/const.py:139
+msgid "Somalia"
+msgstr ""
+
+#: ../picard/const.py:140
+msgid "Zimbabwe"
+msgstr ""
+
+#: ../picard/const.py:141
+msgid "Saudi Arabia"
+msgstr ""
+
+#: ../picard/const.py:142
+#, fuzzy
+msgid "Spain"
+msgstr "&Przeszukaj"
+
+#: ../picard/const.py:143
+msgid "Eritrea"
+msgstr ""
+
+#: ../picard/const.py:144
+msgid "Moldova, Republic of"
+msgstr ""
+
+#: ../picard/const.py:145
+msgid "Madagascar"
+msgstr ""
+
+#: ../picard/const.py:146
+msgid "Morocco"
+msgstr ""
+
+#: ../picard/const.py:147
+#, fuzzy
+msgid "Monaco"
+msgstr "Mono"
+
+#: ../picard/const.py:148
+msgid "Uzbekistan"
+msgstr ""
+
+#: ../picard/const.py:149
+msgid "Myanmar"
+msgstr ""
+
+#: ../picard/const.py:150
+msgid "Mali"
+msgstr ""
+
+#: ../picard/const.py:151
+msgid "Maca"
+msgstr ""
+
+#: ../picard/const.py:152
+#, fuzzy
+msgid "Mongolia"
+msgstr "Mono"
+
+#: ../picard/const.py:153
+msgid "Marshall Islands"
+msgstr ""
+
+#: ../picard/const.py:154
+msgid "Macedonia, The Former Yugoslav Republic of"
+msgstr ""
+
+#: ../picard/const.py:155
+msgid "Mauritius"
+msgstr ""
+
+#: ../picard/const.py:156
+#, fuzzy
+msgid "Malta"
+msgstr "Metadane"
+
+#: ../picard/const.py:157
+msgid "Malawi"
+msgstr ""
+
+#: ../picard/const.py:158
+msgid "Maldives"
+msgstr ""
+
+#: ../picard/const.py:159
+msgid "Martinique"
+msgstr ""
+
+#: ../picard/const.py:160
+msgid "Northern Mariana Islands"
+msgstr ""
+
+#: ../picard/const.py:161
+msgid "Montserrat"
+msgstr ""
+
+#: ../picard/const.py:162
+msgid "Mauritania"
+msgstr ""
+
+#: ../picard/const.py:163
+msgid "Uganda"
+msgstr ""
+
+#: ../picard/const.py:164
+msgid "Malaysia"
+msgstr ""
+
+#: ../picard/const.py:165
+msgid "Mexico"
+msgstr ""
+
+#: ../picard/const.py:166
+msgid "Israel"
+msgstr ""
+
+#: ../picard/const.py:167
+#, fuzzy
+msgid "France"
+msgstr "Anuluj"
+
+#: ../picard/const.py:168
+msgid "British Indian Ocean Territory"
+msgstr ""
+
+#: ../picard/const.py:169
+msgid "St. Helena"
+msgstr ""
+
+#: ../picard/const.py:170
+msgid "Finland"
+msgstr ""
+
+#: ../picard/const.py:171
+msgid "Fiji"
+msgstr ""
+
+#: ../picard/const.py:172
+msgid "Falkland Islands (Malvinas)"
+msgstr ""
+
+#: ../picard/const.py:173
+msgid "Micronesia, Federated States of"
+msgstr ""
+
+#: ../picard/const.py:174
+msgid "Faroe Islands"
+msgstr ""
+
+#: ../picard/const.py:175
+msgid "Nicaragua"
+msgstr ""
+
+#: ../picard/const.py:176
+msgid "Netherlands"
+msgstr ""
+
+#: ../picard/const.py:177
+msgid "Norway"
+msgstr ""
+
+#: ../picard/const.py:178
+msgid "Namibia"
+msgstr ""
+
+#: ../picard/const.py:179
+msgid "Vanuat"
+msgstr ""
+
+#: ../picard/const.py:180
+msgid "New Caledonia"
+msgstr ""
+
+#: ../picard/const.py:181
+#, fuzzy
+msgid "Niger"
+msgstr "Mikser"
+
+#: ../picard/const.py:182
+msgid "Norfolk Island"
+msgstr ""
+
+#: ../picard/const.py:183
+msgid "Nigeria"
+msgstr ""
+
+#: ../picard/const.py:184
+#, fuzzy
+msgid "New Zealand"
+msgstr "Nowe Metadane"
+
+#: ../picard/const.py:185
+msgid "Zaire"
+msgstr ""
+
+#: ../picard/const.py:186
+msgid "Nepal"
+msgstr ""
+
+#: ../picard/const.py:187
+msgid "Naur"
+msgstr ""
+
+#: ../picard/const.py:188
+msgid "Niue"
+msgstr ""
+
+#: ../picard/const.py:189
+msgid "Cook Islands"
+msgstr ""
+
+#: ../picard/const.py:190
+msgid "Cote d'Ivoire"
+msgstr ""
+
+#: ../picard/const.py:191
+msgid "Switzerland"
+msgstr ""
+
+#: ../picard/const.py:192
+msgid "Colombia"
+msgstr ""
+
+#: ../picard/const.py:193
+msgid "China"
+msgstr ""
+
+#: ../picard/const.py:194
+msgid "Cameroon"
+msgstr ""
+
+#: ../picard/const.py:195
+#, fuzzy
+msgid "Chile"
+msgstr "Plik"
+
+#: ../picard/const.py:196
+msgid "Cocos (Keeling) Islands"
+msgstr ""
+
+#: ../picard/const.py:197
+msgid "Canada"
+msgstr ""
+
+#: ../picard/const.py:198
+#, fuzzy
+msgid "Congo"
+msgstr "Mono"
+
+#: ../picard/const.py:199
+msgid "Central African Republic"
+msgstr ""
+
+#: ../picard/const.py:200
+msgid "Czech Republic"
+msgstr ""
+
+#: ../picard/const.py:201
+msgid "Cyprus"
+msgstr ""
+
+#: ../picard/const.py:202
+msgid "Christmas Island"
+msgstr ""
+
+#: ../picard/const.py:203
+msgid "Costa Rica"
+msgstr ""
+
+#: ../picard/const.py:204
+msgid "Cape Verde"
+msgstr ""
+
+#: ../picard/const.py:205
+msgid "Cuba"
+msgstr ""
+
+#: ../picard/const.py:206
+msgid "Swaziland"
+msgstr ""
+
+#: ../picard/const.py:207
+msgid "Syrian Arab Republic"
+msgstr ""
+
+#: ../picard/const.py:208
+msgid "Kyrgyzstan"
+msgstr ""
+
+#: ../picard/const.py:209
+msgid "Kenya"
+msgstr ""
+
+#: ../picard/const.py:210
+msgid "Suriname"
+msgstr ""
+
+#: ../picard/const.py:211
+msgid "Kiribati"
+msgstr ""
+
+#: ../picard/const.py:212
+msgid "Cambodia"
+msgstr ""
+
+#: ../picard/const.py:213
+msgid "Saint Kitts and Nevis"
+msgstr ""
+
+#: ../picard/const.py:214
+#, fuzzy
+msgid "Comoros"
+msgstr "Kolory"
+
+#: ../picard/const.py:215
+msgid "Sao Tome and Principe"
+msgstr ""
+
+#: ../picard/const.py:216
+msgid "Slovenia"
+msgstr ""
+
+#: ../picard/const.py:217
+msgid "Kuwait"
+msgstr ""
+
+#: ../picard/const.py:218
+#, fuzzy
+msgid "Senegal"
+msgstr "Ogólne"
+
+#: ../picard/const.py:219
+msgid "San Marino"
+msgstr ""
+
+#: ../picard/const.py:220
+msgid "Sierra Leone"
+msgstr ""
+
+#: ../picard/const.py:221
+msgid "Seychelles"
+msgstr ""
+
+#: ../picard/const.py:222
+msgid "Kazakhstan"
+msgstr ""
+
+#: ../picard/const.py:223
+msgid "Cayman Islands"
+msgstr ""
+
+#: ../picard/const.py:224
+msgid "Singapore"
+msgstr ""
+
+#: ../picard/const.py:225
+msgid "Sweden"
+msgstr ""
+
+#: ../picard/const.py:226
+#, fuzzy
+msgid "Sudan"
+msgstr "&Przeszukaj"
+
+#: ../picard/const.py:227
+msgid "Dominican Republic"
+msgstr ""
+
+#: ../picard/const.py:228
+msgid "Dominica"
+msgstr ""
+
+#: ../picard/const.py:229
+#, fuzzy
+msgid "Djibouti"
+msgstr "O programie"
+
+#: ../picard/const.py:230
+msgid "Denmark"
+msgstr ""
+
+#: ../picard/const.py:231
+msgid "Virgin Islands (British)"
+msgstr ""
+
+#: ../picard/const.py:232
+msgid "Germany"
+msgstr ""
+
+#: ../picard/const.py:233
+msgid "Yemen"
+msgstr ""
+
+#: ../picard/const.py:234
+msgid "Algeria"
+msgstr ""
+
+#: ../picard/const.py:235
+msgid "United States"
+msgstr ""
+
+#: ../picard/const.py:236
+msgid "Uruguay"
+msgstr ""
+
+#: ../picard/const.py:237
+msgid "Mayotte"
+msgstr ""
+
+#: ../picard/const.py:238
+msgid "United States Minor Outlying Islands"
+msgstr ""
+
+#: ../picard/const.py:239
+msgid "Lebanon"
+msgstr ""
+
+#: ../picard/const.py:240
+msgid "Saint Lucia"
+msgstr ""
+
+#: ../picard/const.py:241
+msgid "Lao People's Democratic Republic"
+msgstr ""
+
+#: ../picard/const.py:242
+msgid "Tuval"
+msgstr ""
+
+#: ../picard/const.py:243
+msgid "Taiwan"
+msgstr ""
+
+#: ../picard/const.py:244
+msgid "Trinidad and Tobago"
+msgstr ""
+
+#: ../picard/const.py:245
+msgid "Turkey"
+msgstr ""
+
+#: ../picard/const.py:246
+msgid "Sri Lanka"
+msgstr ""
+
+#: ../picard/const.py:247
+msgid "Liechtenstein"
+msgstr ""
+
+#: ../picard/const.py:248
+msgid "Latvia"
+msgstr ""
+
+#: ../picard/const.py:249
+msgid "Tonga"
+msgstr ""
+
+#: ../picard/const.py:250
+msgid "Lithuania"
+msgstr ""
+
+#: ../picard/const.py:251
+msgid "Luxembourg"
+msgstr ""
+
+#: ../picard/const.py:252
+msgid "Liberia"
+msgstr ""
+
+#: ../picard/const.py:253
+#, fuzzy
+msgid "Lesotho"
+msgstr "Długość"
+
+#: ../picard/const.py:254
+msgid "Thailand"
+msgstr ""
+
+#: ../picard/const.py:255
+msgid "French Southern Territories"
+msgstr ""
+
+#: ../picard/const.py:256
+#, fuzzy
+msgid "Togo"
+msgstr "&Narzędzia"
+
+#: ../picard/const.py:257
+msgid "Chad"
+msgstr ""
+
+#: ../picard/const.py:258
+msgid "Turks and Caicos Islands"
+msgstr ""
+
+#: ../picard/const.py:259
+msgid "Libyan Arab Jamahiriya"
+msgstr ""
+
+#: ../picard/const.py:260
+msgid "Vatican City State (Holy See)"
+msgstr ""
+
+#: ../picard/const.py:261
+msgid "Saint Vincent and The Grenadines"
+msgstr ""
+
+#: ../picard/const.py:262
+msgid "United Arab Emirates"
+msgstr ""
+
+#: ../picard/const.py:263
+msgid "Andorra"
+msgstr ""
+
+#: ../picard/const.py:264
+msgid "Antigua and Barbuda"
+msgstr ""
+
+#: ../picard/const.py:265
+msgid "Afghanistan"
+msgstr ""
+
+#: ../picard/const.py:266
+msgid "Anguilla"
+msgstr ""
+
+#: ../picard/const.py:267
+msgid "Virgin Islands (U.S.)"
+msgstr ""
+
+#: ../picard/const.py:268
+msgid "Iceland"
+msgstr ""
+
+#: ../picard/const.py:269
+msgid "Iran (Islamic Republic of)"
+msgstr ""
+
+#: ../picard/const.py:270
+msgid "Armenia"
+msgstr ""
+
+#: ../picard/const.py:271
+msgid "Albania"
+msgstr ""
+
+#: ../picard/const.py:272
+msgid "Angola"
+msgstr ""
+
+#: ../picard/const.py:273
+msgid "Netherlands Antilles"
+msgstr ""
+
+#: ../picard/const.py:274
+msgid "Antarctica"
+msgstr ""
+
+#: ../picard/const.py:275
+msgid "American Samoa"
+msgstr ""
+
+#: ../picard/const.py:276
+msgid "Argentina"
+msgstr ""
+
+#: ../picard/const.py:277
+msgid "Australia"
+msgstr ""
+
+#: ../picard/const.py:278
+#, fuzzy
+msgid "Austria"
+msgstr "Autor"
+
+#: ../picard/const.py:279
+msgid "Aruba"
+msgstr ""
+
+#: ../picard/const.py:280
+#, fuzzy
+msgid "India"
+msgstr "Multimedia"
+
+#: ../picard/const.py:281
+msgid "Tanzania, United Republic of"
+msgstr ""
+
+#: ../picard/const.py:282
+msgid "Azerbaijan"
+msgstr ""
+
+#: ../picard/const.py:283
+msgid "Ireland"
+msgstr ""
+
+#: ../picard/const.py:284
+msgid "Indonesia"
+msgstr ""
+
+#: ../picard/const.py:285
+msgid "Ukraine"
+msgstr ""
+
+#: ../picard/const.py:286
+#, fuzzy
+msgid "Qatar"
+msgstr "Później"
+
+#: ../picard/const.py:287
+msgid "Mozambique"
+msgstr ""
+
+#: ../picard/const.py:288
+msgid "Bosnia and Herzegovina"
+msgstr ""
+
+#: ../picard/const.py:289
+msgid "Congo, The Democratic Republic of the"
+msgstr ""
+
+#: ../picard/const.py:290
+msgid "Serbia and Montenegro"
+msgstr ""
+
+#: ../picard/const.py:291
+msgid "Croatia"
+msgstr ""
+
+#: ../picard/const.py:292
+msgid "Korea (North), Democratic People's Republic of"
+msgstr ""
+
+#: ../picard/const.py:293
+msgid "Korea (South), Republic of"
+msgstr ""
+
+#: ../picard/const.py:294
+msgid "Slovakia"
+msgstr ""
+
+#: ../picard/const.py:295
+msgid "Soviet Union (historical, 1922-1991)"
+msgstr ""
+
+#: ../picard/const.py:296
+msgid "East Timor"
+msgstr ""
+
+#: ../picard/const.py:297
+msgid "Czechoslovakia (historical, 1918-1992)"
+msgstr ""
+
+#: ../picard/const.py:298
+msgid "Europe"
+msgstr ""
+
+#: ../picard/const.py:299
+msgid "East Germany (historical, 1949-1990)"
+msgstr ""
+
+#: ../picard/const.py:300
+msgid "[Unknown Country]"
+msgstr ""
+
+#: ../picard/const.py:301
+msgid "[Worldwide]"
+msgstr ""
+
+#: ../picard/const.py:302
+msgid "Yugoslavia (historical, 1918-1992)"
+msgstr ""
+
+#: ../picard/const.py:307
+msgid "Catalan"
+msgstr ""
+
+#: ../picard/const.py:308
+msgid "Czech"
+msgstr ""
+
+#: ../picard/const.py:309
+msgid "Welsh"
+msgstr ""
+
+#: ../picard/const.py:310
+#, fuzzy
+msgid "Danish"
+msgstr "Szczegóły"
+
+#: ../picard/const.py:311
+#, fuzzy
+msgid "German"
+msgstr "Ogólne"
+
+#: ../picard/const.py:312
+msgid "English"
+msgstr ""
+
+#: ../picard/const.py:313
+msgid "English (Canada)"
+msgstr ""
+
+#: ../picard/const.py:314
+msgid "English (UK)"
+msgstr ""
+
+#: ../picard/const.py:315
+msgid "Spanish"
+msgstr ""
+
+#: ../picard/const.py:316
+#, fuzzy
+msgid "Persian"
+msgstr "Wersja"
+
+#: ../picard/const.py:317
+msgid "Finnish"
+msgstr ""
+
+#: ../picard/const.py:318
+msgid "French"
+msgstr ""
+
+#: ../picard/const.py:319
+msgid "Frisian"
+msgstr ""
+
+#: ../picard/const.py:320
+msgid "Hebrew"
+msgstr ""
+
+#: ../picard/const.py:321
+msgid "Hungarian"
+msgstr ""
+
+#: ../picard/const.py:322
+msgid "Islandic"
+msgstr ""
+
+#: ../picard/const.py:323
+msgid "Italian"
+msgstr ""
+
+#: ../picard/const.py:324
+msgid "Kannada"
+msgstr ""
+
+#: ../picard/const.py:325
+msgid "Korean"
+msgstr ""
+
+#: ../picard/const.py:326
+msgid "Lithuanian"
+msgstr ""
+
+#: ../picard/const.py:327
+msgid "Norwegian Bokmal"
+msgstr ""
+
+#: ../picard/const.py:328
+msgid "Dutch"
+msgstr ""
+
+#: ../picard/const.py:329
+#, fuzzy
+msgid "Polish"
+msgstr "Wtyczki"
+
+#: ../picard/const.py:330
+msgid "Portuguese"
+msgstr ""
+
+#: ../picard/const.py:331
+msgid "Brazilian Portuguese"
+msgstr ""
+
+#: ../picard/const.py:332
+msgid "Romanian"
+msgstr ""
+
+#: ../picard/const.py:333
+msgid "Russian"
+msgstr ""
+
+#: ../picard/const.py:334
+#, fuzzy
+msgid "Scots"
+msgstr "Wynik"
+
+#: ../picard/const.py:335
+msgid "Slovak"
+msgstr ""
+
+#: ../picard/const.py:336
+msgid "Slovenian"
+msgstr ""
+
+#: ../picard/const.py:337
+msgid "Swedish"
+msgstr ""
+
+#: ../picard/const.py:338
+#, fuzzy
+msgid "Chinese"
+msgstr "Kanały:"
+
+#: ../picard/file.py:475
+#, python-format
+msgid "No matching tracks for file %s"
+msgstr "Brak pasujących utworów dla pliku %s"
+
+#: ../picard/file.py:492
+#, fuzzy, python-format
+msgid "No matching tracks above the threshold for file %s"
+msgstr "Brak pasujących utworów dla pliku %s"
+
+#: ../picard/file.py:495
+#, python-format
+msgid "File %s identified!"
+msgstr "Plik %s zidentyfikowany!"
+
+#: ../picard/file.py:506
+#, python-format
+msgid "Looking up the PUID for file %s..."
+msgstr "Sprawdzanie PUIDu dla pliku %s..."
+
+#: ../picard/file.py:511
+#, python-format
+msgid "Looking up the metadata for file %s..."
+msgstr "Sprawdzanie metadanych pliku %s..."
+
+#: ../picard/puidmanager.py:58
+msgid "Submitting PUIDs..."
+msgstr "Dodawanie PUIDów..."
+
+#: ../picard/puidmanager.py:64
+#, python-format
+msgid "PUIDs submission failed: %s"
+msgstr "Wysłanie PUIDów zakończone niepowodzeniem: %s"
+
+#: ../picard/puidmanager.py:66
+msgid "PUIDs successfully submitted!"
+msgstr "Dodano PUIDy!"
+
+#: ../picard/playlist.py:31
+msgid "M3U Playlist (*.m3u)"
+msgstr "Playlista M3U (*.m3u)"
+
+#: ../picard/playlist.py:32
+msgid "PLS Playlist (*.pls)"
+msgstr "Playlista PLS (*.pls)"
+
+#: ../picard/playlist.py:33
+msgid "XSPF Playlist (*.xspf)"
+msgstr "Playlista XSPF (*.xspf)"
+
+#: ../picard/tagger.py:476
 msgid "CD Lookup Error"
 msgstr "Błąd sprawdzania CD"
 
-#: ../picard/tagger.py:473
+#: ../picard/tagger.py:477
 #, python-format
 msgid ""
 "Error while reading CD:\n"
@@ -46,126 +1307,177 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../picard/ui/passworddialog.py:38
+#: ../picard/tagger.py:503
 #, python-format
-msgid ""
-"The server %s requires you to login. Please enter your username and password."
-msgstr ""
+msgid "Couldn't find PUID for file %s"
+msgstr "Brak PUID dla pliku %s"
 
-#: ../picard/ui/ui_options_script.py:52
-msgid "Tagger Script"
-msgstr ""
+#: ../picard/musicdns/__init__.py:98
+#, fuzzy, python-format
+msgid "Looking up the fingerprint for file %s..."
+msgstr "Sprawdzanie metadanych pliku %s..."
+
+#: ../picard/musicdns/__init__.py:117
+#, fuzzy, python-format
+msgid "Creating fingerprint for file %s..."
+msgstr "Sprawdzanie PUIDu dla pliku %s..."
 
 #: ../picard/ui/cdlookup.py:31
 msgid "Score"
 msgstr "Wynik"
 
 #: ../picard/ui/cdlookup.py:31
+#: ../picard/ui/itemviews.py:82
+#: ../picard/util/tags.py:23
 msgid "Title"
 msgstr "Tytuł"
 
-#: ../picard/ui/cdlookup.py:31 ../picard/ui/mainwindow.py:436
+#: ../picard/ui/cdlookup.py:31
+#: ../picard/ui/itemviews.py:84
+#: ../picard/ui/mainwindow.py:436
+#: ../picard/util/tags.py:22
 msgid "Artist"
 msgstr "Wykonawca"
 
-#: ../picard/ui/ui_metadata.py:121
-msgid "Lookup"
-msgstr "Sprawdź"
+#: ../picard/ui/coverartbox.py:47
+#: ../picard/ui/options/cover.py:29
+msgid "Cover Art"
+msgstr "Okładka"
 
-#: ../picard/ui/ui_metadata.py:122
-msgid "Title:"
-msgstr "Tytuł:"
+#: ../picard/ui/coverartbox.py:95
+msgid "Buy the album on Amazon"
+msgstr "Kup album na Amazon.com"
 
-#: ../picard/ui/ui_metadata.py:123
-msgid "Date:"
-msgstr "Data:"
+#: ../picard/ui/filebrowser.py:38
+#: ../picard/ui/mainwindow.py:302
+msgid "&Refresh"
+msgstr "Odśwież"
 
-#: ../picard/ui/ui_metadata.py:124
-msgid "Artist:"
-msgstr "Wykonawca:"
+#: ../picard/ui/filebrowser.py:41
+msgid "&Move Tagged Files Here"
+msgstr "&Przenieś otagowane pliki tutaj"
 
-#: ../picard/ui/ui_metadata.py:125
-msgid "Track:"
-msgstr "Utwór:"
+#: ../picard/ui/filebrowser.py:44
+msgid "Show &Hidden Files"
+msgstr "Pokaż &ukryte pliki"
 
-#: ../picard/ui/ui_metadata.py:126
-msgid "0000-00-00; "
-msgstr "0000-00-00; "
+#: ../picard/ui/itemviews.py:83
+msgid "Length"
+msgstr "Długość"
 
-#: ../picard/ui/ui_metadata.py:127 ../picard/ui/tageditor.py:225
-#: ../picard/ui/multitageditor.py:181
+#: ../picard/ui/itemviews.py:327
+msgid "&Releases"
+msgstr "&Wydania"
+
+#: ../picard/ui/itemviews.py:353
+msgid "&Plugins"
+msgstr "&Wtyczki"
+
+#: ../picard/ui/itemviews.py:523
+msgid "Clusters"
+msgstr "Zbiór"
+
+#: ../picard/ui/logview.py:29
+msgid "Log"
+msgstr "Log"
+
+#: ../picard/ui/puidsubmit.py:31
+#: ../picard/ui/options/plugins.py:80
+msgid "File"
+msgstr "Plik"
+
+#: ../picard/ui/puidsubmit.py:31
+msgid "PUID"
+msgstr "PUID"
+
+#: ../picard/ui/puidsubmit.py:31
+#: ../picard/ui/mainwindow.py:437
+msgid "Track"
+msgstr "Utwór"
+
+#: ../picard/ui/puidsubmit.py:31
+msgid "Release"
+msgstr "Wydanie"
+
+#: ../picard/ui/puidsubmit.py:31
+msgid "Release ID"
+msgstr "ID Wydania"
+
+#: ../picard/ui/tageditor.py:65
+#: ../picard/ui/ui_options_plugins.py:62
+msgid "Details"
+msgstr "Szczegóły"
+
+#: ../picard/ui/tageditor.py:70
+#: ../picard/ui/tageditor.py:241
+#, python-format
+msgid "%d file"
+msgid_plural "%d files"
+msgstr[0] "%d plik"
+msgstr[1] "%d plików"
+msgstr[2] "%d plików"
+
+#: ../picard/ui/tageditor.py:124
+#, python-format
+msgid "(different across %d file)"
+msgid_plural "(different across %d files)"
+msgstr[0] "różne pośród %d plik"
+msgstr[1] "różne pośród %d plików"
+msgstr[2] "różne pośród %d plików"
+
+#: ../picard/ui/tageditor.py:127
+#, python-format
+msgid "(missing from %d file)"
+msgid_plural "(missing from %d files)"
+msgstr[0] "brakuje z %d pliku"
+msgstr[1] "brakuje z %d plików"
+msgstr[2] "brakuje z %d plików"
+
+#: ../picard/ui/tageditor.py:210
+msgid "Filename:"
+msgstr "Nazwa pliku:"
+
+#: ../picard/ui/tageditor.py:212
+msgid "Format:"
+msgstr "Format:"
+
+#: ../picard/ui/tageditor.py:221
+msgid "Size:"
+msgstr "Rozmiar:"
+
+#: ../picard/ui/tageditor.py:225
+#: ../picard/ui/ui_metadata.py:127
 msgid "Length:"
 msgstr "Długość:"
 
-#: ../picard/ui/ui_metadata.py:128
-msgid "Album:"
-msgstr "Album:"
+#: ../picard/ui/tageditor.py:227
+msgid "Bitrate:"
+msgstr "Szybkość transmisji:"
 
-#: ../picard/ui/ui_passworddialog.py:78
-#, fuzzy
-msgid "Authentication required"
-msgstr "Wymagany Unicode"
+#: ../picard/ui/tageditor.py:229
+msgid "Sample rate:"
+msgstr "Próbkowanie:"
 
-#: ../picard/ui/ui_passworddialog.py:79 ../picard/ui/ui_options_proxy.py:83
-#: ../picard/ui/ui_options_general.py:113
-msgid "Username:"
-msgstr "Użytkownik:"
+#: ../picard/ui/tageditor.py:231
+msgid "Bits per sample:"
+msgstr "Bitów na próbkę:"
 
-#: ../picard/ui/ui_passworddialog.py:80 ../picard/ui/ui_options_proxy.py:82
-#: ../picard/ui/ui_options_general.py:112
-msgid "Password:"
-msgstr ""
+#: ../picard/ui/tageditor.py:234
+msgid "Mono"
+msgstr "Mono"
 
-#: ../picard/ui/ui_passworddialog.py:81
-msgid "Save username and password"
-msgstr ""
+#: ../picard/ui/tageditor.py:235
+msgid "Stereo"
+msgstr "Stereo"
 
-#: ../picard/ui/ui_options_folksonomy.py:114
-#: ../picard/ui/ui_options_folksonomy_tags.py:114
-msgid "Folksonomy Tags"
-msgstr ""
+#: ../picard/ui/tageditor.py:237
+msgid "Channels:"
+msgstr "Kanały:"
 
-#: ../picard/ui/ui_options_folksonomy.py:115
-#: ../picard/ui/ui_options_folksonomy_tags.py:115
-msgid "Ignore tags:"
-msgstr "Ignoruj tagi:"
-
-#: ../picard/ui/ui_options_folksonomy.py:116
-#: ../picard/ui/ui_options_folksonomy_tags.py:116
-msgid "Minimal tag usage:"
-msgstr ""
-
-#: ../picard/ui/ui_options_folksonomy.py:117
-#: ../picard/ui/ui_options_folksonomy_tags.py:117
-#: ../picard/ui/ui_options_matching.py:107
-#: ../picard/ui/ui_options_matching.py:108
-#: ../picard/ui/ui_options_matching.py:109
-#: ../picard/ui/ui_options_matching.py:113
-msgid " %"
-msgstr " %"
-
-#: ../picard/ui/ui_options_folksonomy.py:118
-msgid "Maximum number of tags:"
-msgstr "Maksymalna liczba tagów:"
-
-#: ../picard/ui/ui_options_folksonomy.py:119
-#: ../picard/ui/ui_options_folksonomy_tags.py:119
-msgid "Join multiple tags with:"
-msgstr ""
-
-#: ../picard/ui/ui_options_folksonomy.py:120
-#: ../picard/ui/ui_options_folksonomy_tags.py:120
-msgid " / "
-msgstr " / "
-
-#: ../picard/ui/ui_options_folksonomy.py:121
-#: ../picard/ui/ui_options_folksonomy_tags.py:121
-msgid ", "
-msgstr ", "
-
-#: ../picard/ui/ui_options_folksonomy_tags.py:118
-msgid "Maximal number of tags:"
-msgstr "Maksymalna ilość tagów:"
+#: ../picard/ui/tagsfromfilenames.py:52
+#: ../picard/ui/tagsfromfilenames.py:96
+msgid "File Name"
+msgstr "Nazwa pliku"
 
 #: ../picard/ui/mainwindow.py:64
 msgid "MusicBrainz Picard"
@@ -208,9 +1520,8 @@ msgid "&About..."
 msgstr "&O programie..."
 
 #: ../picard/ui/mainwindow.py:210
-#, fuzzy
 msgid "&Donate..."
-msgstr "&O programie..."
+msgstr "&Wesprzyj projekt"
 
 #: ../picard/ui/mainwindow.py:213
 msgid "&Report a Bug..."
@@ -226,7 +1537,7 @@ msgstr "&Dodaj pliki..."
 
 #: ../picard/ui/mainwindow.py:220
 msgid "Add files to the tagger"
-msgstr ""
+msgstr "Dodaj pliki do taggera"
 
 #. Keyboard shortcut for "Add Files..."
 #: ../picard/ui/mainwindow.py:222
@@ -239,7 +1550,7 @@ msgstr "&Dodaj katalog..."
 
 #: ../picard/ui/mainwindow.py:226
 msgid "Add a folder to the tagger"
-msgstr ""
+msgstr "Dodaj folder do taggera"
 
 #. Keyboard shortcut for "Add Directory..."
 #: ../picard/ui/mainwindow.py:228
@@ -261,7 +1572,7 @@ msgstr "Ctrl+S"
 
 #: ../picard/ui/mainwindow.py:239
 msgid "S&ubmit PUIDs"
-msgstr ""
+msgstr "Wyś&lij PUIDy"
 
 #: ../picard/ui/mainwindow.py:240
 msgid "Submit PUIDs to MusicBrainz"
@@ -300,7 +1611,8 @@ msgstr "Znajdź"
 msgid "&CD Lookup..."
 msgstr "Sprawdzanie &CD..."
 
-#: ../picard/ui/mainwindow.py:272 ../picard/ui/mainwindow.py:273
+#: ../picard/ui/mainwindow.py:272
+#: ../picard/ui/mainwindow.py:273
 msgid "Lookup CD"
 msgstr "Sprawdź CD"
 
@@ -331,7 +1643,8 @@ msgstr "Ctrl+U"
 msgid "&Lookup"
 msgstr "&Sprawdź"
 
-#: ../picard/ui/mainwindow.py:291 ../picard/ui/mainwindow.py:292
+#: ../picard/ui/mainwindow.py:291
+#: ../picard/ui/mainwindow.py:292
 msgid "Lookup metadata"
 msgstr "Sprawdź metadane"
 
@@ -344,10 +1657,6 @@ msgstr "Ctrl+L"
 msgid "&Details..."
 msgstr "&Szczegóły..."
 
-#: ../picard/ui/mainwindow.py:302 ../picard/ui/filebrowser.py:38
-msgid "&Refresh"
-msgstr "Odśwież"
-
 #: ../picard/ui/mainwindow.py:305
 msgid "Generate &Playlist..."
 msgstr "Stwórz &listę odtwarzania"
@@ -370,7 +1679,7 @@ msgstr "Tagi z nazwy &pliku"
 
 #: ../picard/ui/mainwindow.py:326
 msgid "View &Log..."
-msgstr ""
+msgstr "Zobacz &Log"
 
 #: ../picard/ui/mainwindow.py:349
 msgid "&File"
@@ -382,7 +1691,7 @@ msgstr "&Edycja"
 
 #: ../picard/ui/mainwindow.py:363
 msgid "&View"
-msgstr ""
+msgstr "&Widok"
 
 #: ../picard/ui/mainwindow.py:369
 msgid "&Options"
@@ -393,6 +1702,7 @@ msgid "&Tools"
 msgstr "&Narzędzia"
 
 #: ../picard/ui/mainwindow.py:384
+#: ../picard/ui/util.py:33
 msgid "&Help"
 msgstr "&Pomoc"
 
@@ -405,13 +1715,10 @@ msgid "&Search Bar"
 msgstr "Pasek &wyszukiwania"
 
 #: ../picard/ui/mainwindow.py:435
+#: ../picard/util/tags.py:21
 msgid "Album"
 msgstr "Album"
 
-#: ../picard/ui/mainwindow.py:437 ../picard/ui/puidsubmit.py:31
-msgid "Track"
-msgstr "Utwór"
-
 #: ../picard/ui/mainwindow.py:476
 msgid "All Supported Formats"
 msgstr "Wszystkie wspierane formaty"
@@ -426,49 +1733,313 @@ msgstr "Zapisywanie listy %s..."
 msgid "Playlist %s saved"
 msgstr "Lista odtwarzania %s zapisana"
 
-#: ../picard/ui/mainwindow.py:638 ../picard/ui/mainwindow.py:647
+#: ../picard/ui/mainwindow.py:638
+#: ../picard/ui/mainwindow.py:647
 #, python-format
 msgid " (Error: %s)"
 msgstr " (Błąd: %s)"
 
+#: ../picard/ui/ui_tageditor.py:115
+#: ../picard/ui/ui_options_plugins.py:59
+#: ../picard/ui/options/plugins.py:76
+msgid "Name"
+msgstr "Nazwa"
+
+#: ../picard/ui/ui_tageditor.py:116
+msgid "Value"
+msgstr "Wartość"
+
+#: ../picard/ui/ui_tageditor.py:117
+msgid "&Add..."
+msgstr "&Dodaj..."
+
+#: ../picard/ui/ui_tageditor.py:118
+msgid "&Edit..."
+msgstr "&Edycja"
+
+#: ../picard/ui/ui_tageditor.py:119
+msgid "&Delete"
+msgstr "&Usuń"
+
+#: ../picard/ui/ui_tageditor.py:120
+msgid "&Metadata"
+msgstr "&Metadane"
+
+#: ../picard/ui/ui_tageditor.py:121
+msgid "A&rtwork"
+msgstr "G&rafika"
+
+#: ../picard/ui/ui_tageditor.py:122
+msgid "&Info"
+msgstr "&Informacje"
+
+#: ../picard/ui/passworddialog.py:38
+#, python-format
+msgid "The server %s requires you to login. Please enter your username and password."
+msgstr "Serwer %s wymaga logowania. Wprowadź swoją nazwę użytkownika i hasło."
+
+#: ../picard/ui/ui_cdlookup.py:60
+#: ../picard/ui/ui_options_cdlookup.py:47
+#: ../picard/ui/ui_options_cdlookup_win32.py:56
+#: ../picard/ui/options/cdlookup.py:35
+msgid "CD Lookup"
+msgstr "Sprawdzanie CD"
+
+#: ../picard/ui/ui_cdlookup.py:61
+msgid "The following releases on MusicBrainz match the CD:"
+msgstr "Następujące wydania w MusicBrainz pasują do CD:"
+
+#: ../picard/ui/ui_cdlookup.py:62
+#: ../picard/ui/ui_puidsubmit.py:53
+msgid "OK"
+msgstr "OK"
+
+#: ../picard/ui/ui_cdlookup.py:63
+msgid "    Lookup manually    "
+msgstr "    Sprawdź ręcznie    "
+
+#: ../picard/ui/ui_cdlookup.py:64
+#: ../picard/ui/ui_puidsubmit.py:54
+msgid "Cancel"
+msgstr "Anuluj"
+
+#: ../picard/ui/ui_passworddialog.py:78
+#, fuzzy
+msgid "Authentication required"
+msgstr "Wymagane uwierzytelnienie"
+
+#: ../picard/ui/ui_passworddialog.py:79
+#: ../picard/ui/ui_options_general.py:113
+#: ../picard/ui/ui_options_proxy.py:83
+msgid "Username:"
+msgstr "Użytkownik:"
+
+#: ../picard/ui/ui_passworddialog.py:80
+#: ../picard/ui/ui_options_general.py:112
+#: ../picard/ui/ui_options_proxy.py:82
+msgid "Password:"
+msgstr "Hasło:"
+
+#: ../picard/ui/ui_passworddialog.py:81
+msgid "Save username and password"
+msgstr "Zapisz nazwę użytkownika i hasło"
+
 #: ../picard/ui/ui_edittagdialog.py:44
 msgid "Edit Tag"
 msgstr "Edytuj znacznik"
 
-#: ../picard/ui/ui_options_proxy.py:81
-msgid "Web Proxy"
-msgstr "Serwer Proxy"
+#: ../picard/ui/ui_metadata.py:121
+msgid "Lookup"
+msgstr "Sprawdź"
 
-#: ../picard/ui/ui_options_proxy.py:84 ../picard/ui/ui_options_general.py:109
-msgid "Port:"
-msgstr ""
+#: ../picard/ui/ui_metadata.py:122
+msgid "Title:"
+msgstr "Tytuł:"
 
-#: ../picard/ui/ui_options_proxy.py:85 ../picard/ui/ui_options_general.py:110
-msgid "Server address:"
-msgstr "Adres serwera:"
+#: ../picard/ui/ui_metadata.py:123
+msgid "Date:"
+msgstr "Data:"
 
-#: ../picard/ui/ui_tagsfromfilenames.py:56
-msgid "Convert File Names to Tags"
-msgstr "Konwetuj nazwy plików do tagów"
+#: ../picard/ui/ui_metadata.py:124
+msgid "Artist:"
+msgstr "Wykonawca:"
 
-#: ../picard/ui/ui_tagsfromfilenames.py:57
-msgid "Replace underscores with spaces"
-msgstr "Zamień podkreślenia na spacje"
+#: ../picard/ui/ui_metadata.py:125
+msgid "Track:"
+msgstr "Utwór:"
+
+#: ../picard/ui/ui_metadata.py:126
+msgid "0000-00-00; "
+msgstr "0000-00-00; "
+
+#: ../picard/ui/ui_metadata.py:128
+msgid "Album:"
+msgstr "Album:"
+
+#: ../picard/ui/ui_options.py:42
+msgid "Options"
+msgstr "Opcje"
+
+#: ../picard/ui/ui_options_cdlookup.py:48
+msgid "CD-ROM device to use for lookups:"
+msgstr "Urządzenie CD-ROM do sprawdzania:"
+
+#: ../picard/ui/ui_options_cdlookup_win32.py:57
+msgid "Default CD-ROM drive to use for lookups:"
+msgstr "Domyślny napęd CD-ROM do sprawdzania:"
+
+#: ../picard/ui/ui_options_cover.py:56
+msgid "Location"
+msgstr "Lokalizacja"
+
+#: ../picard/ui/ui_options_cover.py:57
+msgid "Embed cover images into tags"
+msgstr "Zapisz okładkę w tagach"
+
+#: ../picard/ui/ui_options_cover.py:58
+msgid "Save cover images as separate files"
+msgstr "Zapisz okładki jako oddzielne pliki"
+
+#: ../picard/ui/ui_options_cover.py:59
+msgid "Overwrite the file if it already exists"
+msgstr "Nadpisz plik jeżeli istnieje"
+
+#: ../picard/ui/util.py:31
+msgid "&Ok"
+msgstr "&OK"
+
+#: ../picard/ui/util.py:32
+msgid "&Cancel"
+msgstr "&Anuluj"
+
+#: ../picard/ui/ui_puidsubmit.py:52
+msgid "Submit PUIDs"
+msgstr "Wyślij PUIDy"
+
+#: ../picard/ui/ui_options_folksonomy.py:114
+#: ../picard/ui/options/folksonomy.py:29
+msgid "Folksonomy Tags"
+msgstr "Tagi Folksonomy"
+
+#: ../picard/ui/ui_options_folksonomy.py:115
+msgid "Ignore tags:"
+msgstr "Ignoruj tagi:"
+
+#: ../picard/ui/ui_options_folksonomy.py:116
+msgid "Minimal tag usage:"
+msgstr "Minimalne użycie tagów."
+
+#: ../picard/ui/ui_options_folksonomy.py:117
+#: ../picard/ui/ui_options_matching.py:107
+#: ../picard/ui/ui_options_matching.py:108
+#: ../picard/ui/ui_options_matching.py:109
+#: ../picard/ui/ui_options_matching.py:113
+msgid " %"
+msgstr " %"
+
+#: ../picard/ui/ui_options_folksonomy.py:118
+msgid "Maximum number of tags:"
+msgstr "Maksymalna liczba tagów:"
+
+#: ../picard/ui/ui_options_folksonomy.py:119
+msgid "Join multiple tags with:"
+msgstr "Połącz wiele tagów z:"
+
+#: ../picard/ui/ui_options_folksonomy.py:120
+msgid " / "
+msgstr " / "
+
+#: ../picard/ui/ui_options_folksonomy.py:121
+msgid ", "
+msgstr ", "
+
+#: ../picard/ui/ui_options_interface.py:50
+msgid "Miscellaneous"
+msgstr "Różne"
+
+#: ../picard/ui/ui_options_interface.py:51
+msgid "Show text labels under icons"
+msgstr "Pokazuj etykiety tekstowe pod ikonami"
+
+#: ../picard/ui/ui_options_interface.py:52
+msgid "Allow selection of multiple directories"
+msgstr "Pozówl na zaznaczanie wielu katalogów"
+
+#: ../picard/ui/ui_options_interface.py:53
+msgid "Use advanced query syntax"
+msgstr "Użyj zaawansowanej składni w wyszukiwaniu"
+
+#: ../picard/ui/ui_options_interface.py:54
+#, fuzzy
+msgid "User interface language:"
+msgstr "Interfejs użytkownika"
+
+#: ../picard/ui/ui_options_naming.py:165
+msgid "Rename Files"
+msgstr "Zmień nazwy plików"
+
+#: ../picard/ui/ui_options_naming.py:166
+msgid "Replace Windows-incompatible characters"
+msgstr "Zamień znaki niekompatybilne z Windowsem"
+
+#: ../picard/ui/ui_options_naming.py:167
+msgid "Replace non-ASCII characters"
+msgstr "Zamień znaki nie-ASCII"
+
+#: ../picard/ui/ui_options_naming.py:168
+#: ../picard/ui/ui_options_naming.py:169
+#: ../picard/ui/ui_options_metadata.py:109
+#: ../picard/ui/ui_options_metadata.py:110
+msgid "Default"
+msgstr "Domyślnie"
+
+#: ../picard/ui/ui_options_naming.py:170
+#: ../picard/ui/options/naming.py:90
+msgid "Multiple artist file naming format:"
+msgstr "Schemat nazywania plików przy wielu wykonawcach:"
+
+#: ../picard/ui/ui_options_naming.py:171
+#: ../picard/ui/options/naming.py:86
+msgid "File naming format:"
+msgstr "Schemat nazywania plików:"
+
+#: ../picard/ui/ui_options_naming.py:172
+msgid "Move Files"
+msgstr "Przenieś pliki"
+
+#: ../picard/ui/ui_options_naming.py:173
+msgid "Move tagged files to this directory:"
+msgstr "Przenieś otagowane pliki do tego folderu"
+
+#: ../picard/ui/ui_options_naming.py:174
+msgid "Browse..."
+msgstr "Przeglądaj..."
+
+#: ../picard/ui/ui_options_naming.py:175
+msgid "Move additional files:"
+msgstr "Przenieś dodatkowe pliki:"
+
+#: ../picard/ui/ui_options_naming.py:176
+msgid "Delete empty directories"
+msgstr "Usuń puste katalogi"
+
+#: ../picard/ui/ui_options_naming.py:177
+msgid "Example"
+msgstr "Przykład"
+
+#: ../picard/ui/ui_options_naming.py:178
+msgid "File name:"
+msgstr "Nazwa pliku:"
+
+#: ../picard/ui/ui_options_naming.py:179
+msgid "Multiple artist file name:"
+msgstr "Wiele nazw wykonawców:"
 
-#: ../picard/ui/ui_tagsfromfilenames.py:58
 #: ../picard/ui/ui_options_naming.py:180
+#: ../picard/ui/ui_tagsfromfilenames.py:58
 msgid "&Preview"
 msgstr "&Podgląd"
 
 #: ../picard/ui/ui_options_general.py:108
 msgid "MusicBrainz Server"
-msgstr ""
+msgstr "Serwer MusicBrainz"
+
+#: ../picard/ui/ui_options_general.py:109
+#: ../picard/ui/ui_options_proxy.py:84
+msgid "Port:"
+msgstr "Port:"
+
+#: ../picard/ui/ui_options_general.py:110
+#: ../picard/ui/ui_options_proxy.py:85
+msgid "Server address:"
+msgstr "Adres serwera:"
 
 #: ../picard/ui/ui_options_general.py:111
 msgid "Account Information"
 msgstr "Informacje o koncie"
 
 #: ../picard/ui/ui_options_general.py:114
+#: ../picard/ui/options/general.py:29
 msgid "General"
 msgstr "Ogólne"
 
@@ -476,34 +2047,6 @@ msgstr "Ogólne"
 msgid "Automatically scan all new files"
 msgstr "Automatycznie analizuj nowe pliki"
 
-#: ../picard/ui/ui_options_interface.py:46
-msgid "Miscellaneous"
-msgstr "Różne"
-
-#: ../picard/ui/ui_options_interface.py:47
-msgid "Show text labels under icons"
-msgstr "Pokazuj etykiety tekstowe pod ikonami"
-
-#: ../picard/ui/ui_options_interface.py:48
-msgid "Allow selection of multiple directories"
-msgstr "Pozówl na zaznaczanie wielu katalogów"
-
-#: ../picard/ui/ui_options_interface.py:49
-msgid "Use advanced query syntax"
-msgstr ""
-
-#: ../picard/ui/itemviews.py:327
-msgid "&Releases"
-msgstr "&Wydania"
-
-#: ../picard/ui/itemviews.py:353
-msgid "&Plugins"
-msgstr "&Wtyczki"
-
-#: ../picard/ui/itemviews.py:523
-msgid "Clusters"
-msgstr "Zbiór"
-
 #: ../picard/ui/ui_options_matching.py:105
 msgid "Thresholds"
 msgstr "Progi"
@@ -522,7 +2065,68 @@ msgstr "Minimalne podobieństwo przy dobieraniu albumów:"
 
 #: ../picard/ui/ui_options_matching.py:112
 msgid "Minimal similarity for PUID lookups:"
-msgstr ""
+msgstr "Minimalne podobieństwo w wyszukiwaniu PUIDa"
+
+#: ../picard/ui/ui_options_metadata.py:100
+#: ../picard/ui/options/metadata.py:31
+msgid "Metadata"
+msgstr "Metadane"
+
+#: ../picard/ui/ui_options_metadata.py:101
+msgid "Translate foreign artist names to English where possible"
+msgstr "Przetłumacz nazwy zagranicznych wykonawców na angielski, jeśli możliwe"
+
+#: ../picard/ui/ui_options_metadata.py:102
+msgid "Use release relationships"
+msgstr "Użyj powiązań wydań"
+
+#: ../picard/ui/ui_options_metadata.py:103
+msgid "Use track relationships"
+msgstr "Użyj powiązań utworów"
+
+#: ../picard/ui/ui_options_metadata.py:104
+msgid "Use folksonomy tags as genre"
+msgstr "Użyj taga folksonomy jako gatunku"
+
+#: ../picard/ui/ui_options_metadata.py:105
+msgid "Preferred release country:"
+msgstr "Preferowany kraj wydania"
+
+#: ../picard/ui/ui_options_metadata.py:106
+msgid "Custom Fields"
+msgstr "Pola użytkownika"
+
+#: ../picard/ui/ui_options_metadata.py:107
+msgid "Various artists:"
+msgstr "Różni wykonawcy:"
+
+#: ../picard/ui/ui_options_metadata.py:108
+msgid "Non-album tracks:"
+msgstr "Utwory spoza albumu:"
+
+#: ../picard/ui/ui_options_plugins.py:58
+#: ../picard/ui/options/plugins.py:30
+msgid "Plugins"
+msgstr "Wtyczki"
+
+#: ../picard/ui/ui_options_plugins.py:60
+#: ../picard/ui/options/plugins.py:79
+msgid "Author"
+msgstr "Autor"
+
+#: ../picard/ui/ui_options_plugins.py:61
+#: ../picard/util/tags.py:36
+msgid "Version"
+msgstr "Wersja"
+
+#: ../picard/ui/ui_options_proxy.py:81
+#: ../picard/ui/options/proxy.py:28
+msgid "Web Proxy"
+msgstr "Serwer Proxy"
+
+#: ../picard/ui/ui_options_script.py:52
+msgid "Tagger Script"
+msgstr "Skrypt taggera"
 
 #: ../picard/ui/ui_options_tags.py:105
 msgid "Common"
@@ -550,7 +2154,7 @@ msgstr "Zapisuj tagi ID3v2 wersja 2.3 (domyślnie 2.4)"
 
 #: ../picard/ui/ui_options_tags.py:111
 msgid "Text encoding to use while writing ID3v2 tags:"
-msgstr ""
+msgstr "Kodowanie tekstu używane przy zapisie do tagów ID3v2:"
 
 #: ../picard/ui/ui_options_tags.py:112
 msgid "ISO-8859-1"
@@ -576,312 +2180,17 @@ msgstr "APE"
 msgid "Remove APEv2 tags from MP3 files"
 msgstr "Usuwaj tagi APEv2 z plików MP3"
 
-#: ../picard/ui/ui_options_cdlookup_win32.py:56 ../picard/ui/ui_cdlookup.py:60
-#: ../picard/ui/ui_options_cdlookup.py:47
-msgid "CD Lookup"
-msgstr "Sprawdzanie CD"
+#: ../picard/ui/ui_tagsfromfilenames.py:56
+msgid "Convert File Names to Tags"
+msgstr "Konwetuj nazwy plików do tagów"
 
-#: ../picard/ui/ui_options_cdlookup_win32.py:57
-msgid "Default CD-ROM drive to use for lookups:"
-msgstr "Domyślny napęd CD-ROM do sprawdzania:"
+#: ../picard/ui/ui_tagsfromfilenames.py:57
+msgid "Replace underscores with spaces"
+msgstr "Zamień podkreślenia na spacje"
 
-#: ../picard/ui/tageditor.py:65 ../picard/ui/ui_options_plugins.py:62
-#: ../picard/ui/multitageditor.py:37
-msgid "Details"
-msgstr "Szczegóły"
-
-#: ../picard/ui/tageditor.py:70 ../picard/ui/tageditor.py:241
-#: ../picard/ui/multitageditor.py:42 ../picard/ui/multitageditor.py:197
-#, python-format
-msgid "%d file"
-msgid_plural "%d files"
-msgstr[0] "%d plik"
-msgstr[1] "%d plików"
-
-#: ../picard/ui/tageditor.py:124 ../picard/ui/multitageditor.py:95
-#, python-format
-msgid "(different across %d file)"
-msgid_plural "(different across %d files)"
-msgstr[0] ""
-msgstr[1] ""
-
-#: ../picard/ui/tageditor.py:127 ../picard/ui/multitageditor.py:98
-#, python-format
-msgid "(missing from %d file)"
-msgid_plural "(missing from %d files)"
-msgstr[0] ""
-msgstr[1] ""
-
-#: ../picard/ui/tageditor.py:210 ../picard/ui/multitageditor.py:166
-msgid "Filename:"
-msgstr "Nazwa pliku:"
-
-#: ../picard/ui/tageditor.py:212 ../picard/ui/multitageditor.py:168
-msgid "Format:"
-msgstr "Format:"
-
-#: ../picard/ui/tageditor.py:221 ../picard/ui/multitageditor.py:177
-msgid "Size:"
-msgstr "Rozmiar:"
-
-#: ../picard/ui/tageditor.py:227 ../picard/ui/multitageditor.py:183
-msgid "Bitrate:"
-msgstr "Szybkość transmisji:"
-
-#: ../picard/ui/tageditor.py:229 ../picard/ui/multitageditor.py:185
-msgid "Sample rate:"
-msgstr "Próbkowanie:"
-
-#: ../picard/ui/tageditor.py:231 ../picard/ui/multitageditor.py:187
-msgid "Bits per sample:"
-msgstr "Bitów na próbkę:"
-
-#: ../picard/ui/tageditor.py:234 ../picard/ui/multitageditor.py:190
-msgid "Mono"
-msgstr "Mono"
-
-#: ../picard/ui/tageditor.py:235 ../picard/ui/multitageditor.py:191
-msgid "Stereo"
-msgstr "Stereo"
-
-#: ../picard/ui/tageditor.py:237 ../picard/ui/multitageditor.py:193
-msgid "Channels:"
-msgstr "Kanały:"
-
-#: ../picard/ui/ui_tageditor.py:115 ../picard/ui/ui_multitageditor.py:55
-#: ../picard/ui/ui_options_plugins.py:59 ../picard/ui/options/plugins.py:76
-msgid "Name"
-msgstr "Nazwa"
-
-#: ../picard/ui/ui_tageditor.py:116 ../picard/ui/ui_multitageditor.py:56
-msgid "Value"
-msgstr "Wartość"
-
-#: ../picard/ui/ui_tageditor.py:117 ../picard/ui/ui_multitageditor.py:57
-msgid "&Add..."
-msgstr "&Dodaj..."
-
-#: ../picard/ui/ui_tageditor.py:118
-msgid "&Edit..."
-msgstr "&Edycja"
-
-#: ../picard/ui/ui_tageditor.py:119
-msgid "&Delete"
-msgstr "&Usuń"
-
-#: ../picard/ui/ui_tageditor.py:120
-msgid "&Metadata"
-msgstr "&Metadane"
-
-#: ../picard/ui/ui_tageditor.py:121
-msgid "A&rtwork"
-msgstr "G&rafika"
-
-#: ../picard/ui/ui_tageditor.py:122
-msgid "&Info"
-msgstr "&Informacje"
-
-#: ../picard/ui/coverartbox.py:47
-msgid "Cover Art"
-msgstr "Okładka"
-
-#: ../picard/ui/coverartbox.py:95
-msgid "Buy the album on Amazon"
-msgstr "Kup album na Amazon.com"
-
-#: ../picard/ui/ui_puidsubmit.py:52
-msgid "Submit PUIDs"
-msgstr "Wyślij PUIDy"
-
-#: ../picard/ui/ui_puidsubmit.py:53 ../picard/ui/ui_cdlookup.py:62
-msgid "OK"
-msgstr "OK"
-
-#: ../picard/ui/ui_puidsubmit.py:54 ../picard/ui/ui_cdlookup.py:64
-msgid "Cancel"
-msgstr "Anuluj"
-
-#: ../picard/ui/puidsubmit.py:31 ../picard/ui/options/plugins.py:80
-msgid "File"
-msgstr "Plik"
-
-#: ../picard/ui/puidsubmit.py:31
-msgid "PUID"
-msgstr "PUID"
-
-#: ../picard/ui/puidsubmit.py:31
-msgid "Release"
-msgstr "Wydanie"
-
-#: ../picard/ui/puidsubmit.py:31
-msgid "Release ID"
-msgstr "ID Wydania"
-
-#: ../picard/ui/filebrowser.py:41
-#, fuzzy
-msgid "&Move Tagged Files Here"
-msgstr "P&rzenieś pliki"
-
-#: ../picard/ui/filebrowser.py:44
-msgid "Show &Hidden Files"
-msgstr ""
-
-#: ../picard/ui/ui_cdlookup.py:61
-msgid "The following releases on MusicBrainz match the CD:"
-msgstr "Następujące wydania w MusicBrainz pasują do CD:"
-
-#: ../picard/ui/ui_cdlookup.py:63
-msgid "    Lookup manually    "
-msgstr "    Sprawdź ręcznie    "
-
-#: ../picard/ui/ui_options.py:42
-msgid "Options"
-msgstr "Opcje"
-
-#: ../picard/ui/tagsfromfilenames.py:52 ../picard/ui/tagsfromfilenames.py:96
-msgid "File Name"
-msgstr "Nazwa pliku"
-
-#: ../picard/ui/ui_options_cover.py:56
-msgid "Location"
-msgstr "Lokalizacja"
-
-#: ../picard/ui/ui_options_cover.py:57
-msgid "Embed cover images into tags"
-msgstr "Zapisz okładkę w tagach"
-
-#: ../picard/ui/ui_options_cover.py:58
-msgid "Save cover images as separate files"
-msgstr "Zapisz okładki jako oddzielne pliki"
-
-#: ../picard/ui/ui_options_cover.py:59
-msgid "Overwrite the file if it already exists"
-msgstr "Nadpisz plik jeżeli istnieje"
-
-#: ../picard/ui/ui_options_metadata.py:100
-msgid "Metadata"
-msgstr "Metadane"
-
-#: ../picard/ui/ui_options_metadata.py:101
-msgid "Translate foreign artist names to English where possible"
-msgstr ""
-
-#: ../picard/ui/ui_options_metadata.py:102
-msgid "Use release relationships"
-msgstr ""
-
-#: ../picard/ui/ui_options_metadata.py:103
-msgid "Use track relationships"
-msgstr ""
-
-#: ../picard/ui/ui_options_metadata.py:104
-msgid "Use folksonomy tags as genre"
-msgstr ""
-
-#: ../picard/ui/ui_options_metadata.py:105
-#, fuzzy
-msgid "Preferred release country:"
-msgstr "Kraj wydania albumu"
-
-#: ../picard/ui/ui_options_metadata.py:106
-msgid "Custom Fields"
-msgstr "Pola użytkownika"
-
-#: ../picard/ui/ui_options_metadata.py:107
-msgid "Various artists:"
-msgstr "Różni wykonawcy:"
-
-#: ../picard/ui/ui_options_metadata.py:108
-msgid "Non-album tracks:"
-msgstr "Utwory spoza albumu:"
-
-#: ../picard/ui/ui_options_metadata.py:109
-#: ../picard/ui/ui_options_metadata.py:110
-#: ../picard/ui/ui_options_naming.py:168 ../picard/ui/ui_options_naming.py:169
-msgid "Default"
-msgstr "Domyślnie"
-
-#: ../picard/ui/ui_multitageditor.py:58
-msgid "Delete"
-msgstr "Usuń"
-
-#: ../picard/ui/logview.py:29
-msgid "Log"
-msgstr "Log"
-
-#: ../picard/ui/ui_options_plugins.py:58
-msgid "Plugins"
-msgstr "Wtyczki"
-
-#: ../picard/ui/ui_options_plugins.py:60 ../picard/ui/options/plugins.py:79
-msgid "Author"
-msgstr "Autor"
-
-#: ../picard/ui/ui_options_plugins.py:61
-msgid "Version"
-msgstr "Wersja"
-
-#: ../picard/ui/ui_options_naming.py:165
-msgid "Rename Files"
-msgstr "Zmień nazwy plików"
-
-#: ../picard/ui/ui_options_naming.py:166
-msgid "Replace Windows-incompatible characters"
-msgstr ""
-
-#: ../picard/ui/ui_options_naming.py:167
-msgid "Replace non-ASCII characters"
-msgstr ""
-
-#: ../picard/ui/ui_options_naming.py:170 ../picard/ui/options/naming.py:90
-msgid "Multiple artist file naming format:"
-msgstr "Schemat nazywania plików przy wielu wykonawcach:"
-
-#: ../picard/ui/ui_options_naming.py:171 ../picard/ui/options/naming.py:86
-msgid "File naming format:"
-msgstr "Schemat nazywania plików:"
-
-#: ../picard/ui/ui_options_naming.py:172
-msgid "Move Files"
-msgstr "Przenieś pliki"
-
-#: ../picard/ui/ui_options_naming.py:173
-msgid "Move tagged files to this directory:"
-msgstr ""
-
-#: ../picard/ui/ui_options_naming.py:174
-msgid "Browse..."
-msgstr "Przeglądaj..."
-
-#: ../picard/ui/ui_options_naming.py:175
-msgid "Move additional files:"
-msgstr "Przenieś dodatkowe pliki:"
-
-#: ../picard/ui/ui_options_naming.py:176
-msgid "Delete empty directories"
-msgstr "Usuń puste katalogi"
-
-#: ../picard/ui/ui_options_naming.py:177
-msgid "Example"
-msgstr "Przykład"
-
-#: ../picard/ui/ui_options_naming.py:178
-msgid "File name:"
-msgstr "Nazwa pliku:"
-
-#: ../picard/ui/ui_options_naming.py:179
-msgid "Multiple artist file name:"
-msgstr ""
-
-#: ../picard/ui/ui_options_cdlookup.py:48
-msgid "CD-ROM device to use for lookups:"
-msgstr "Urządzenie CD-ROM do sprawdzania:"
-
-#: ../picard/ui/options/scripting.py:84 ../picard/ui/options/naming.py:86
-#: ../picard/ui/options/naming.py:90 ../picard/ui/options/naming.py:93
-#: ../picard/ui/options/naming.py:95
-msgid "Script Error"
-msgstr "Błąd skryptu"
+#: ../picard/ui/options/about.py:29
+msgid "About"
+msgstr "O programie"
 
 #. Replace this with your name to have it appear in the "About" dialog.
 #: ../picard/ui/options/about.py:48
@@ -890,28 +2199,11 @@ msgstr ""
 "Launchpad Contributions:\n"
 "  DoomHammer <https://launchpad.net/~deha>\n"
 "  Piotr Strębski <https://launchpad.net/~strebski>\n"
-"\n"
-"Launchpad Contributions:\n"
 "  Piotr Gaczkowski https://launchpad.net/~doomhammer\n"
-"  Piotr Strębski https://launchpad.net/~strebski\n"
-"\n"
-"Launchpad Contributions:\n"
 "  Krzysztof Daszuta https://launchpad.net/~irukard\n"
-"  Piotr Gaczkowski https://launchpad.net/~doomhammer\n"
-"  Piotr Strębski https://launchpad.net/~strebski\n"
-"\n"
-"Launchpad Contributions:\n"
 "  Bartosz Kaszubowski https://launchpad.net/~simek\n"
-"  Krzysztof Daszuta https://launchpad.net/~irukard\n"
-"  Piotr Gaczkowski https://launchpad.net/~doomhammer\n"
-"  Piotr Strębski https://launchpad.net/~strebski\n"
-"\n"
-"Launchpad Contributions:\n"
-"  Bartosz Kaszubowski https://launchpad.net/~simek\n"
-"  Krzysztof Daszuta https://launchpad.net/~irukard\n"
 "  M. Żarczyński https://launchpad.net/~rajcaa\n"
-"  Piotr Gaczkowski https://launchpad.net/~doomhammer\n"
-"  Piotr Strębski https://launchpad.net/~strebski"
+"  spitfire https://launchpad.net/~mieszkoslusarczyk"
 
 #. Replace LANG with language you are translatig to.
 #: ../picard/ui/options/about.py:51
@@ -922,49 +2214,321 @@ msgstr "<br/>Przetłumaczono na język LANG przez %s"
 #: ../picard/ui/options/about.py:55
 #, fuzzy, python-format
 msgid ""
-"<p align=\"center\"><span style=\"font-size:15px;font-weight:bold;"
-"\">MusicBrainz Picard</span><br/>\n"
+"<p align=\"center\"><span style=\"font-size:15px;font-weight:bold;\">MusicBrainz Picard</span><br/>\n"
 "Version %(version)s</p>\n"
 "<p align=\"center\"><strong>Supported formats</strong><br/>%(formats)s</p>\n"
 "<p align=\"center\"><strong>Please donate</strong><br/>\n"
-"Thank you for using Picard. Picard relies on the MusicBrainz database, which "
-"is operated by the MetaBrainz Foundation with the help of thousands of "
-"volunteers. If you like this application please consider donating to the "
-"MetaBrainz Foundation to keep the service running.</p>\n"
-"<p align=\"center\"><a href=\"http://metabrainz.org/donate/index.html"
-"\">Donate now!</a></p>\n"
+"Thank you for using Picard. Picard relies on the MusicBrainz database, which is operated by the MetaBrainz Foundation with the help of thousands of volunteers. If you like this application please consider donating to the MetaBrainz Foundation to keep the service running.</p>\n"
+"<p align=\"center\"><a href=\"http://metabrainz.org/donate/index.html\">Donate now!</a></p>\n"
 "<p align=\"center\"><strong>Credits</strong><br/>\n"
-"<small>Copyright © 2004-2008 Robert Kaye, Lukáš Lalinský and others%"
-"(translator-credits)s</small></p>\n"
-"<p align=\"center\"><a href=\"http://musicbrainz.org/doc/PicardTagger"
-"\">http://musicbrainz.org/doc/PicardTagger</a></p>\n"
+"<small>Copyright © 2004-2008 Robert Kaye, Lukáš Lalinský and others%(translator-credits)s</small></p>\n"
+"<p align=\"center\"><a href=\"http://musicbrainz.org/doc/PicardTagger\">http://musicbrainz.org/doc/PicardTagger</a></p>\n"
 msgstr ""
-"<p align=\"center\"><span style=\"font-size:15px;font-weight:bold;"
-"\">MusicBrainz Picard</span><br/>\n"
-"Wersja %(version)s</p>\n"
-"<p align=\"center\"><strong>Wspierana formaty:</strong> %(formats)s</p>\n"
-"<p align=\"center\"><small>Prawa autorskie © 2004-2007 Robert Kaye, Lukáš "
-"Lalinský and inni%(translator-credits)s</small></p>\n"
-"<p align=\"center\"><a href=\"http://musicbrainz.org/doc/PicardTagger"
-"\">http://musicbrainz.org/doc/PicardTagger</a></p>\n"
+"<p align=\"center\"><span style=\"font-size:15px;font-weight:bold;\">MusicBrainz Picard</span><br/>\n"
+"Version %(version)s</p>\n"
+"<p align=\"center\"><strong>Wspierane formaty</strong><br/>%(formats)s</p>\n"
+"<p align=\"center\"><strong>Wesprzyj projekt</strong><br/>\n"
+"Dziękujemy za używanie Picarda. Picard jest oparty na bazie danych MusicBrainz, która jest zarządzana przez MetaBrainz Foundation z pomocą tysięcy wolontariuszy. Jeśli lubisz ten program, rozważ finansowe wsparcie MetaBrainz Foundation, by usługa mogła działać dalej.</p>\n"
+"<p align=\"center\"><a href=\"http://metabrainz.org/donate/index.html\">Donate now!</a></p>\n"
+"<p align=\"center\"><strong>Credits</strong><br/>\n"
+"<small>Copyright © 2004-2008 Robert Kaye, Lukáš Lalinský and others%(translator-credits)s</small></p>\n"
+"<p align=\"center\"><a href=\"http://musicbrainz.org/doc/PicardTagger\">http://musicbrainz.org/doc/PicardTagger</a></p>\n"
+
+#: ../picard/ui/options/advanced.py:26
+msgid "Advanced"
+msgstr "Zaawansowane"
+
+#: ../picard/ui/options/interface.py:31
+msgid "User Interface"
+msgstr "Interfejs użytkownika"
+
+#: ../picard/ui/options/interface.py:47
+msgid "System default"
+msgstr "Domyślny systemowy"
+
+#: ../picard/ui/options/interface.py:71
+#, fuzzy
+msgid "Language changed"
+msgstr "Język"
+
+#: ../picard/ui/options/interface.py:71
+msgid "You have changed the interface language. You have to restart Picard in order for the change to take effect."
+msgstr ""
+
+#: ../picard/ui/options/matching.py:29
+msgid "Matching"
+msgstr "Zgodność"
+
+#: ../picard/ui/options/metadata.py:52
+msgid "None"
+msgstr ""
+
+#: ../picard/ui/options/naming.py:33
+#, fuzzy
+msgid "File Naming"
+msgstr "Nazwa pliku"
+
+#: ../picard/ui/options/naming.py:86
+#: ../picard/ui/options/naming.py:90
+#: ../picard/ui/options/naming.py:93
+#: ../picard/ui/options/naming.py:95
+#: ../picard/ui/options/scripting.py:84
+msgid "Script Error"
+msgstr "Błąd skryptu"
 
 #: ../picard/ui/options/naming.py:93
 msgid "The file naming format must not be empty."
-msgstr ""
+msgstr "Format nazewnictwa nie może być pusty"
 
 #: ../picard/ui/options/naming.py:95
-#, fuzzy
 msgid "The multiple artist file naming format must not be empty."
-msgstr "Schemat nazywania plików przy wielu wykonawcach:"
+msgstr "Format nazewnictwa dla wielu wykonawców nie może być pusty"
 
 #: ../picard/ui/options/naming.py:97
 msgid "Error"
-msgstr ""
+msgstr "Błąd"
 
 #: ../picard/ui/options/naming.py:97
 msgid "The location to move files to must not be empty."
+msgstr "Lokacja do której chcesz przenieść pliki nie może być pusta."
+
+#: ../picard/ui/options/scripting.py:63
+msgid "Scripting"
+msgstr "Skryptowanie"
+
+#: ../picard/ui/options/tags.py:29
+msgid "Tags"
+msgstr "Tagi"
+
+#: ../picard/util/tags.py:24
+msgid "Date"
+msgstr "Data"
+
+#: ../picard/util/tags.py:25
+msgid "Album Artist"
+msgstr "Wykonawca albumu"
+
+#: ../picard/util/tags.py:26
+msgid "Track Number"
+msgstr "Numer utworu"
+
+#: ../picard/util/tags.py:27
+msgid "Total Tracks"
+msgstr "Łącznie utworów"
+
+#: ../picard/util/tags.py:28
+msgid "Disc Number"
+msgstr "Numer płyty"
+
+#: ../picard/util/tags.py:29
+msgid "Total Discs"
+msgstr "Łącznie płyt"
+
+#: ../picard/util/tags.py:30
+msgid "Album Artist Sort Order"
+msgstr "Nazwa wykonawcy albumu (posortowane)"
+
+#: ../picard/util/tags.py:31
+msgid "Artist Sort Order"
+msgstr "Sortowanie wedlug artystów"
+
+#: ../picard/util/tags.py:32
+msgid "Title Sort Order"
+msgstr "Sortowanie według tytułów"
+
+#: ../picard/util/tags.py:33
+msgid "Album Sort Order"
+msgstr "Sortowanie według albumów"
+
+#: ../picard/util/tags.py:34
+msgid "ASIN"
+msgstr "ASIN"
+
+#: ../picard/util/tags.py:35
+msgid "Grouping"
+msgstr "Grupowanie"
+
+#: ../picard/util/tags.py:37
+msgid "ISRC"
+msgstr "ISRC"
+
+#: ../picard/util/tags.py:38
+msgid "Mood"
+msgstr "Nastrój"
+
+#: ../picard/util/tags.py:39
+msgid "BPM"
+msgstr "Uderzenia na minutę"
+
+#: ../picard/util/tags.py:40
+msgid "Copyright"
+msgstr "Prawa autorskie"
+
+#: ../picard/util/tags.py:41
+msgid "Composer"
+msgstr "Kompozytor"
+
+#: ../picard/util/tags.py:42
+msgid "Conductor"
+msgstr "Dyrygent"
+
+#: ../picard/util/tags.py:43
+msgid "Lyricist"
+msgstr "Autor tekstu"
+
+#: ../picard/util/tags.py:44
+msgid "Arranger"
+msgstr "Aranżer"
+
+#: ../picard/util/tags.py:45
+msgid "Producer"
+msgstr "Producent"
+
+#: ../picard/util/tags.py:46
+msgid "Engineer"
+msgstr "Inżynier"
+
+#: ../picard/util/tags.py:47
+msgid "Subtitle"
+msgstr "Podtytuł"
+
+#: ../picard/util/tags.py:48
+msgid "Disc Subtitle"
+msgstr "Podtytuł płyty"
+
+#: ../picard/util/tags.py:49
+msgid "Remixer"
+msgstr "Remixer"
+
+#: ../picard/util/tags.py:50
+#, fuzzy
+msgid "MusicBrainz Track Id"
+msgstr "MusicBrainz Picard"
+
+#: ../picard/util/tags.py:51
+#, fuzzy
+msgid "MusicBrainz Release Id"
+msgstr "MusicBrainz Picard"
+
+#: ../picard/util/tags.py:52
+#, fuzzy
+msgid "MusicBrainz Artist Id"
+msgstr "MusicBrainz Picard"
+
+#: ../picard/util/tags.py:53
+#, fuzzy
+msgid "MusicBrainz Release Artist Id"
+msgstr "MusicBrainz Picard"
+
+#: ../picard/util/tags.py:54
+#, fuzzy
+msgid "MusicBrainz TRM Id"
+msgstr "MusicBrainz Picard"
+
+#: ../picard/util/tags.py:55
+#, fuzzy
+msgid "MusicBrainz Disc Id"
+msgstr "MusicBrainz Picard"
+
+#: ../picard/util/tags.py:56
+#, fuzzy
+msgid "MusicBrainz Sort Name"
+msgstr "Serwer MusicBrainz"
+
+#: ../picard/util/tags.py:57
+msgid "MusicIP PUID"
 msgstr ""
 
+#: ../picard/util/tags.py:58
+#, fuzzy
+msgid "MusicIP Fingerprint"
+msgstr "Metryka audio"
+
+#: ../picard/util/tags.py:59
+#, fuzzy
+msgid "Disc Id"
+msgstr "Płyta:"
+
+#: ../picard/util/tags.py:60
+msgid "Website"
+msgstr "Strona www"
+
+#: ../picard/util/tags.py:61
+msgid "Compilation"
+msgstr "Składanka"
+
+#: ../picard/util/tags.py:62
+msgid "Comment"
+msgstr "Komentarz"
+
+#: ../picard/util/tags.py:63
+msgid "Genre"
+msgstr "Gatunek"
+
+#: ../picard/util/tags.py:64
+msgid "Encoded By"
+msgstr ""
+
+#: ../picard/util/tags.py:65
+msgid "Performer"
+msgstr "Wykonawca"
+
+#: ../picard/util/tags.py:66
+#, fuzzy
+msgid "Release Type"
+msgstr "Data wydania"
+
+#: ../picard/util/tags.py:67
+msgid "Release Status"
+msgstr "Status wydania"
+
+#: ../picard/util/tags.py:68
+#, fuzzy
+msgid "Release Country"
+msgstr "Data wydania"
+
+#: ../picard/util/tags.py:69
+msgid "Record Label"
+msgstr "Wytwórnia"
+
+#: ../picard/util/tags.py:70
+msgid "Barcode"
+msgstr "Kod kreskowy"
+
+#: ../picard/util/tags.py:71
+msgid "Catalog Number"
+msgstr "Numer katalogowy"
+
+#: ../picard/util/tags.py:72
+#, fuzzy
+msgid "Format"
+msgstr "Format:"
+
+#: ../picard/util/tags.py:73
+msgid "DJ-Mixer"
+msgstr "DJ-Mixer"
+
+#: ../picard/util/tags.py:74
+msgid "Media"
+msgstr "Multimedia"
+
+#: ../picard/util/tags.py:75
+msgid "Lyrics"
+msgstr "Teksty utworów"
+
+#: ../picard/util/tags.py:76
+msgid "Mixer"
+msgstr "Mikser"
+
+#: ../picard/util/tags.py:77
+msgid "Language"
+msgstr "Język"
+
+#: ../picard/util/tags.py:78
+#, fuzzy
+msgid "Script"
+msgstr "Skryptowanie"
+
 #: ../picard/util/webbrowser2.py:84
 msgid "Web Browser Error"
 msgstr "Błąd przeglądarki"
@@ -980,278 +2544,82 @@ msgstr ""
 "\n"
 "%s"
 
-#~ msgid "No matching tracks for file %s"
-#~ msgstr "Brak pasujących utworów dla pliku %s"
-
-#~ msgid "File %s identified!"
-#~ msgstr "Plik %s zidentyfikowany!"
-
-#~ msgid "Looking up the PUID for file %s..."
-#~ msgstr "Sprawdzanie PUIDu dla pliku %s..."
-
-#~ msgid "Looking up the metadata for file %s..."
-#~ msgstr "Sprawdzanie metadanych pliku %s..."
-
-#~ msgid "No matching releases for cluster %s"
-#~ msgstr "Brak pasujących wydań dla albumu %s"
-
-#~ msgid "Cluster %s identified!"
-#~ msgstr "Grupa %s zidentyfikowana!"
-
-#~ msgid "Looking up the metadata for cluster %s..."
-#~ msgstr "Sprawdzanie metadanych dla grupy %s..."
-
-#~ msgid "M3U Playlist (*.m3u)"
-#~ msgstr "Playlista M3U (*.m3u)"
-
-#~ msgid "PLS Playlist (*.pls)"
-#~ msgstr "Playlista PLS (*.pls)"
-
-#~ msgid "XSPF Playlist (*.xspf)"
-#~ msgstr "Playlista XSPF (*.xspf)"
-
-#~ msgid "Submitting PUIDs..."
-#~ msgstr "Dodawanie PUIDów..."
-
-#~ msgid "PUIDs submission failed: %s"
-#~ msgstr "Wysłanie PUIDów zakończone niepowodzeniem: %s"
-
-#~ msgid "PUIDs successfully submitted!"
-#~ msgstr "Dodano PUIDy!"
-
 #~ msgid "New Version"
 #~ msgstr "Nowa wersja"
-
 #~ msgid ""
 #~ "New version of Picard is available (%s). Would you like to download it "
 #~ "now?"
 #~ msgstr "Jest dostępna nowa wersja Picarda (%s). Czy chcesz pobrać ją teraz?"
+#~ msgid "Delete"
+#~ msgstr "Usuń"
+#~ msgid "Maximal number of tags:"
+#~ msgstr "Maksymalna ilość tagów:"
 
-#~ msgid "Couldn't find PUID for file %s"
-#~ msgstr "Brak PUID dla pliku %s"
-
-#~ msgid "Length"
-#~ msgstr "Długość"
-
-#~ msgid "&Ok"
-#~ msgstr "&OK"
-
-#~ msgid "&Cancel"
-#~ msgstr "&Anuluj"
-
-#~ msgid "About"
-#~ msgstr "O programie"
-
-#~ msgid "Advanced"
-#~ msgstr "Zaawansowane"
-
-#~ msgid "Matching"
-#~ msgstr "Zgodność"
-
-#~ msgid "Scripting"
-#~ msgstr "Skryptowanie"
-
-#~ msgid "Tags"
-#~ msgstr "Tagi"
-
-#~ msgid "User Interface"
-#~ msgstr "Interfejs użytkownika"
-
-#~ msgid "Date"
-#~ msgstr "Data"
-
-#~ msgid "Album Artist"
-#~ msgstr "Wykonawca albumu"
-
-#~ msgid "Track Number"
-#~ msgstr "Numer utworu"
-
-#~ msgid "Total Tracks"
-#~ msgstr "Łącznie utworów"
-
-#~ msgid "Disc Number"
-#~ msgstr "Numer płyty"
-
-#~ msgid "Total Discs"
-#~ msgstr "Łącznie płyt"
-
-#~ msgid "Album Artist Sort Order"
-#~ msgstr "Nazwa wykonawcy albumu (posortowane)"
-
-#~ msgid "Artist Sort Order"
-#~ msgstr "Sortowanie wedlug artystów"
-
-#~ msgid "Title Sort Order"
-#~ msgstr "Sortowanie według tytułów"
-
-#~ msgid "Album Sort Order"
-#~ msgstr "Sortowanie według albumów"
-
-#~ msgid "ASIN"
-#~ msgstr "ASIN"
-
-#~ msgid "Grouping"
-#~ msgstr "Grupowanie"
-
-#~ msgid "ISRC"
-#~ msgstr "ISRC"
-
-#~ msgid "Mood"
-#~ msgstr "Nastrój"
-
-#~ msgid "BPM"
-#~ msgstr "Uderzenia na minutę"
-
-#~ msgid "Copyright"
-#~ msgstr "Prawa autorskie"
-
-#~ msgid "Composer"
-#~ msgstr "Kompozytor"
-
-#~ msgid "Conductor"
-#~ msgstr "Dyrygent"
-
-#~ msgid "Lyricist"
-#~ msgstr "Autor tekstu"
-
-#~ msgid "Arranger"
-#~ msgstr "Aranżer"
-
-#~ msgid "Producer"
-#~ msgstr "Producent"
-
-#~ msgid "Engineer"
-#~ msgstr "Inżynier"
-
-#~ msgid "Subtitle"
-#~ msgstr "Podtytuł"
-
-#~ msgid "Disc Subtitle"
-#~ msgstr "Podtytuł płyty"
-
-#~ msgid "Remixer"
-#~ msgstr "Remixer"
-
-#~ msgid "Website"
-#~ msgstr "Strona www"
-
-#~ msgid "Compilation"
-#~ msgstr "Składanka"
-
-#~ msgid "Comment"
-#~ msgstr "Komentarz"
-
-#~ msgid "Genre"
-#~ msgstr "Gatunek"
-
-#~ msgid "Performer"
-#~ msgstr "Wykonawca"
-
-#~ msgid "Release Status"
-#~ msgstr "Status wydania"
-
-#~ msgid "Record Label"
-#~ msgstr "Wytwórnia"
-
-#~ msgid "Barcode"
-#~ msgstr "Kod kreskowy"
-
-#~ msgid "Catalog Number"
-#~ msgstr "Numer katalogowy"
-
-#~ msgid "DJ-Mixer"
-#~ msgstr "DJ-Mixer"
-
-#~ msgid "Media"
-#~ msgstr "Multimedia"
-
-#~ msgid "Lyrics"
-#~ msgstr "Teksty utworów"
-
-#~ msgid "Mixer"
-#~ msgstr "Mikser"
-
+#, fuzzy
+#~ msgid "Anal&yze"
+#~ msgstr "Analizuj"
 #~ msgid "Reading directory %s ..."
 #~ msgstr "Wczytywanie katalogu %s..."
-
 #~ msgid "Saving file %s ..."
 #~ msgstr "Zapisywanie pliku %s..."
-
 #~ msgid "Ctrl+T"
 #~ msgstr "Ctrl+T"
 
+#, fuzzy
+#~ msgid "Generate &Cuesheet..."
+#~ msgstr "Stwórz &listę odtwarzania"
 #~ msgid "Details - %s"
 #~ msgstr "Szczegóły - %s"
-
 #~ msgid "Automatically analyze all new files"
 #~ msgstr "Automatycznie analizuj nowe pliki"
 
-#~ msgid "Disc:"
-#~ msgstr "Płyta:"
-
+#, fuzzy
+#~ msgid "Album artist:"
+#~ msgstr "Wykonawca albumu"
 #~ msgid "000; "
 #~ msgstr "000; "
-
 #~ msgid "of"
 #~ msgstr "z"
-
 #~ msgid "&Basic"
 #~ msgstr "Po&dstawowy"
-
 #~ msgid "&Advanced"
 #~ msgstr "Z&aawansowane"
 
-#~ msgid "Toolbar"
-#~ msgstr "Pasek narzędzi"
-
+#, fuzzy
+#~ msgid "A&dd Directory..."
+#~ msgstr "Dodaj &katalog...\tCtrl+D"
 #~ msgid "Are You Sure?"
 #~ msgstr "Czy aby na pewno?"
-
 #~ msgid "Add &Files...\tCtrl+O"
 #~ msgstr "D&odaj Pliki...\tCtrl+O"
-
 #~ msgid "Add &Directory...\tCtrl+D"
 #~ msgstr "Dodaj &katalog...\tCtrl+D"
-
 #~ msgid "&Save Files\tCtrl+S"
 #~ msgstr "Zapi&sz Pliki\tCtrl+S"
-
 #~ msgid "C&opy\tCtrl+C"
 #~ msgstr "&Kopiuj\tCtrl+C"
-
 #~ msgid "Help"
 #~ msgstr "Pomoc"
-
 #~ msgid "Preferences"
 #~ msgstr "Ustawienia"
-
 #~ msgid "Error while saving cuesheet %s."
 #~ msgstr "Błąd przy zapisie arkusza CUE %s."
-
 #~ msgid "Cuesheet %s saved."
 #~ msgstr "Arkusz CUE %s zapisany."
-
 #~ msgid "Time"
 #~ msgstr "Czas"
-
 #~ msgid "Albums"
 #~ msgstr "Albumy"
-
 #~ msgid "Force Save"
 #~ msgstr "Przymusowy zapis"
-
 #~ msgid "Buy"
 #~ msgstr "Kup"
-
 #~ msgid "Welcome to Picard!"
 #~ msgstr "Witaj w Picard!"
-
 #~ msgid "Track Num"
 #~ msgstr "Numer utworu"
-
 #~ msgid "PUID Collision"
 #~ msgstr "Kolizja PUID"
-
 #~ msgid ""
 #~ "Version %s\n"
 #~ "\n"
@@ -1279,121 +2647,84 @@ msgstr ""
 #~ "Dostępne formaty: %s\n"
 #~ "\n"
 #~ "Tłumaczenie: Piotr \"DoomHammer\" Gaczkowski"
-
-#~ msgid "Colors"
-#~ msgstr "Kolory"
-
 #~ msgid "Font color"
 #~ msgstr "Kolor tekstu"
-
 #~ msgid "Directories"
 #~ msgstr "Katalogi"
-
 #~ msgid "Watch for new files"
 #~ msgstr "Śledź katalogi"
-
 #~ msgid "Watch this directory for new audio files"
 #~ msgstr "Śledź ten katalog"
-
 #~ msgid "Encodings"
 #~ msgstr "Kodowanie"
-
 #~ msgid "all languages"
 #~ msgstr "wszystkie języki"
-
 #~ msgid "percent similar."
 #~ msgstr "procent podobne."
-
 #~ msgid "Load recently used albums on startup"
 #~ msgstr "Załaduj ostatnio używane albumy przy rozpoczęciu"
-
-#~ msgid "Language"
-#~ msgstr "Język"
-
-#~ msgid "System default"
-#~ msgstr "Domyślny systemowy"
-
 #~ msgid "Allowed filename characters"
 #~ msgstr "Dozwolone znaki w nazwach plików"
-
 #~ msgid "Use Windows-safe file names"
 #~ msgstr "Używaj bezpiecznych nazw plików Windows"
-
 #~ msgid "Number of tracks on the album"
 #~ msgstr "Ilość utworów w albumie"
-
 #~ msgid "Track name"
 #~ msgstr "Tytuł utworu"
-
 #~ msgid "Zero padded track number"
 #~ msgstr "Numer utworu poprzedzony zerem"
-
 #~ msgid "File format (e.g. mp3, ogg, wav)"
 #~ msgstr "Format pliku (np. mp3, ogg, wav)"
-
 #~ msgid "Album type (album, single, EP, etc.)"
 #~ msgstr "Typ albumu (album, single, EP, itp.)"
-
 #~ msgid "Album Status (official, promo, etc.)"
 #~ msgstr "STatus albumu (oficjalny, promo, itp.)"
-
 #~ msgid "Album release month"
 #~ msgstr "Miesiąc wydania albumu"
-
 #~ msgid "Album release day"
 #~ msgstr "Dzień wydania albumu"
-
 #~ msgid "Album release year"
 #~ msgstr "Rok wydania albumu"
-
 #~ msgid "Make it so!"
 #~ msgstr "Niech się stanie!"
-
 #~ msgid "Use proxy server to access the Internet"
 #~ msgstr "Używaj serwera proxy do łączenia się z Internetem"
-
 #~ msgid "Proxy server to use"
 #~ msgstr "Używany serwer proxy"
-
 #~ msgid "Proxy port"
 #~ msgstr "Port proxy"
-
 #~ msgid "ID3v2.4 only"
 #~ msgstr "Tylko ID3v2.4"
-
 #~ msgid "Save track/album"
 #~ msgstr "Zapisz utwór/album"
-
 #~ msgid "Artists"
 #~ msgstr "Artyści"
 
+#, fuzzy
+#~ msgid "Auto Tag"
+#~ msgstr "Edytuj znacznik"
+
+#, fuzzy
+#~ msgid "Edit &Tags..."
+#~ msgstr "Edytuj znacznik"
 #~ msgid "New files (drag files to tag here)"
 #~ msgstr "Nowe pliki (przeciągnij tu, by tagować)"
-
 #~ msgid "updating album information"
 #~ msgstr "odświeżanie informacji o albumie"
-
 #~ msgid "Submitting PUID information to MusicBrainz server ..."
 #~ msgstr "Wysyłanie informacji PUID do serwera MusicBrainz"
-
 #~ msgid "Performing a PUID lookup on file %s ..."
 #~ msgstr "Szukanie PUIDu dla pliku %s"
-
 #~ msgid "Are you sure you want to exit the application?"
 #~ msgstr "Czy na pewno zamknąć aplikację?"
-
 #~ msgid "CD Lookup error -- is there a CD in the CD-ROM drive?"
 #~ msgstr "Błąd sprawdzania CD -- czy płyta jest w napędzie?"
-
 #~ msgid "CD Lookup Failed"
 #~ msgstr "Sprawdzanie CD nie powiodło się"
-
 #~ msgid "&Quick Start Guide"
 #~ msgstr "&Szybki kurs"
-
 #~ msgid "Quick Start Guide"
 #~ msgstr "Szybki kurs"
-
 #~ msgid ""
 #~ "You have not specified an username and password. In order to contribute "
 #~ "data to MusicBrainz, you must have a MusicBrainz account.\n"
@@ -1405,26 +2736,20 @@ msgstr ""
 #~ "trzeba mieć konto na serwerze MusicBrainz.\n"
 #~ "Czy utworzyć nowe konto? Jeśli posiada się już konto należy wpisać dane "
 #~ "użytkownika w oknie opcji. "
-
 #~ msgid "Couldn't connect to the MusicBrainz server."
 #~ msgstr "Nie można połączyć się z serwerem MusicBrainz."
-
 #~ msgid "Connection error"
 #~ msgstr "Błąd połączenia"
-
 #~ msgid ""
 #~ "MusicBrainz Picard requires wxPython with UNICODE support.\n"
 #~ "Please download the appropriate toolkit from http://www.wxpython.org/"
 #~ msgstr ""
 #~ "MusicBrainz Picard wymaga biblioteki wxPython z obsługą UNICODE.\n"
 #~ "Proszę pobrać odpowiednią wersję ze strony http://www.wxpython.org/"
-
 #~ msgid "PUID collision on file %s!"
 #~ msgstr "Kolizja PUID dla pliku %s!"
-
 #~ msgid "Save error"
 #~ msgstr "Błąd zapisu"
-
 #~ msgid ""
 #~ "The move files option is enabled, but the destination directory is not "
 #~ "specified or invalid.\n"
@@ -1434,7 +2759,6 @@ msgstr ""
 #~ "Opcja przenoszenia jest włączona, lecz nie wybrano docelowego katalogu "
 #~ "lub jest on błędny.\n"
 #~ "Proszę wybrać odpowiedni katalog i spróbować ponownie."
-
 #~ msgid ""
 #~ "Not all files could be saved. Please check for and examine tracks that "
 #~ "have an error icon in front of them. To retry saving the track, right "
@@ -1443,95 +2767,66 @@ msgstr ""
 #~ "Nie udało się zapisać wszystkich plików. Proszę sprawdzić utwory, które "
 #~ "posiadają ikonę błędu. By ponowić zapisywanie utworu należy kliknąć "
 #~ "prawym klawiszem i wybrać 'Napraw błąd'"
-
 #~ msgid "Select directory that contains music files"
 #~ msgstr "Wybierz katalog zawierający pliki muzyczne."
-
 #~ msgid "Reload album from main server"
 #~ msgstr "Odśwież informacje o albumie"
-
 #~ msgid "Select or drag a folder from below"
 #~ msgstr "Wybierz lub przeciągnij katalog z dołu"
-
 #~ msgid "Drag files from below"
 #~ msgstr "Przeciągnij pliki z dołu"
-
 #~ msgid "Release date"
 #~ msgstr "Data wydania"
-
 #~ msgid "%d%% similar"
 #~ msgstr "%d%% podobne"
-
 #~ msgid "Please donate to MusicBrainz!"
 #~ msgstr "Prosimy o wsparcie MusicBrainz!"
-
-#~ msgid "Later"
-#~ msgstr "Później"
-
 #~ msgid ""
 #~ "The destination directory %s does not exist. Please pick a valid "
 #~ "directory."
 #~ msgstr "Docelowy katalog %s nie istnieje. Należy wybrać poprawny katalog."
-
 #~ msgid "Select the encoding to use when reading and writing filenames"
 #~ msgstr "Wybierz kodowanie używane podczas czytania i zapisywania plików"
-
 #~ msgid "Automatically move clusters to albums that are at least"
 #~ msgstr "Automatycznie przenieś do albumów zbiory, mające co najmniej"
-
 #~ msgid "Automatically save recognized tracks that are at least"
 #~ msgstr "Automatycznie zapisuj rozpoznane utwory, mające co najmniej"
-
 #~ msgid ""
 #~ "Note: This setting will take effect after you restart the application."
 #~ msgstr ""
 #~ "Uwaga: te ustawienia zostaną zastosowane po ponownym uruchomieniu "
 #~ "aplikacji."
-
 #~ msgid "Artist translation"
 #~ msgstr "Tłumaczenie nazwy artysty"
-
 #~ msgid "Rename files when writing metadata tags"
 #~ msgstr "Zmień nazwy plików podczas zapisywania metadanych"
-
 #~ msgid "Naming Help"
 #~ msgstr "Pomoc o nazwach"
-
 #~ msgid ""
 #~ "You may use the following variables in the filenaming\n"
 #~ "specifications in the options dialog:"
 #~ msgstr ""
 #~ "Dozwolone są następujące zmienne\n"
 #~ "w formacie nazwy:"
-
 #~ msgid "A %s in the naming specification will create a new subfolder."
 #~ msgstr "Znak %s w formacie nazwy oznacz podkatalog."
-
 #~ msgid "Audio fingerprinting options"
 #~ msgstr "Opcje metryki audio"
-
 #~ msgid "Automatically select PUID collision tracks that are at least"
 #~ msgstr "Automatycznie ustaw kolizję PUID dla utworów w co najmniej"
-
 #~ msgid "Write ID3v1 tags to MP3 files (ID3v2 tags will always be written)"
 #~ msgstr ""
 #~ "Zapisuj tagi ID3v1 do plików MP# (tagi ID3v2 będą zawsze zapisywane)"
-
 #~ msgid "Remove track/album"
 #~ msgstr "Usuń"
-
 #~ msgid "Listen to track"
 #~ msgstr "Posłuchaj utworu"
-
 #~ msgid "Album clusters"
 #~ msgstr "Zebrane albumy"
-
 #~ msgid "Unmatched files for this album"
 #~ msgstr "Nietrafione pliki dla tego albumu"
-
 #~ msgid "%d of %d tracks linked"
 #~ msgstr "%d z %d utworów dowiązanych"
-
 #~ msgid ""
 #~ "The Picard Tagger is a free application and you may\n"
 #~ "use it as long as you wish. However, providing\n"
@@ -1550,67 +2845,48 @@ msgstr ""
 #~ "która zarządza projektem MusicBrainz. Wszystkie dotacje\n"
 #~ "można odpisać od podatku (dotyczy obywateli USA).\n"
 #~ "Pomogą one utrzymać serwis i rozwinąć go."
-
 #~ msgid "Matched track highlighting"
 #~ msgstr "Podświetlanie wybranego utworu"
-
 #~ msgid "Good match background color"
 #~ msgstr "Kolor tła dobrego wyboru"
-
 #~ msgid "Bad match background color"
 #~ msgstr "Kolor tła złego wyboru"
-
 #~ msgid "Move files option"
 #~ msgstr "Opcje przenoszenia plików"
-
 #~ msgid "When matching tracks to albums, accept tracks that are at least"
 #~ msgstr "Przy wybieranu utworów, akceptuj ścieżki, mające co najmniej"
-
 #~ msgid "CD-ROM drive path to use for lookups"
 #~ msgstr "Ścieżka napędu CD-ROM do sprawdzania"
-
 #~ msgid "Launch MB Tagger automatically for inserted Audio CDs"
 #~ msgstr "Uruchom MB Tagger automatycznie po włożeniu płyty Audio CD"
-
 #~ msgid ""
 #~ "Failed to set the proper registy values to enable launching the tagger "
 #~ "after CD insertion. "
 #~ msgstr ""
 #~ "Nie udało się ustawić odpowiednich wartości rejestru dla automatycznego "
 #~ "uruchamiania tagera. "
-
 #~ msgid "Default CD setting failed"
 #~ msgstr "Domyśle ustawienia CD zawiodły"
-
 #~ msgid "File format naming specification"
 #~ msgstr "Format nazywania plików"
-
 #~ msgid "Various artist file format naming specification"
 #~ msgstr "Format nazywania plików dla różnych wykonawców"
-
 #~ msgid "Note: Leave blank to allow all possible characters"
 #~ msgstr "Uwaga: Pozostaw to pole puste, by umożliwić wszystkie znaki"
-
 #~ msgid "Track artist name"
 #~ msgstr "Nazwa wykonawcy utworu"
-
 #~ msgid "Track artist sortname"
 #~ msgstr "Nazwa wykonawcy utworu (posortowane)"
-
 #~ msgid "The first character of the artist sortname"
 #~ msgstr "Pierwsza litera wykonawcy (posortowane)"
-
 #~ msgid "The first two characters of the artist sortname"
 #~ msgstr "Dwie pierwsze litery wykonawcy (posortowane)"
-
 #~ msgid "The first three characters of the artist sortname"
 #~ msgstr "Trzy pierwsze litery wykonawcy (posortowane)"
-
 #~ msgid "Naming specification help"
 #~ msgstr "Pomoc nazw"
-
 #~ msgid "Accept PUID matches that are at least"
 #~ msgstr "Akceptuj trafienia PUID, mające co najmniej"
-
 #~ msgid "Various artist name"
 #~ msgstr "Nazwa dla różnych wykonawców"
+
diff --git a/po/pt.po b/po/pt.po
index 5b07e05f6..691f160c0 100644
--- a/po/pt.po
+++ b/po/pt.po
@@ -6,35 +6,1308 @@ msgid ""
 msgstr ""
 "Project-Id-Version: picard\n"
 "Report-Msgid-Bugs-To: http://bugs.musicbrainz.org/\n"
-"POT-Creation-Date: 2008-12-01 18:20+0100\n"
-"PO-Revision-Date: 2008-07-27 21:41+0000\n"
-"Last-Translator: Lukáš Lalinský <lalinsky@gmail.com>\n"
+"POT-Creation-Date: 2009-01-25 12:23+0100\n"
+"PO-Revision-Date: 2009-01-25 13:31+0100\n"
+"Last-Translator: Philipp Wolfer <phw@rubyforge.org>\n"
 "Language-Team: Portuguese <pt@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2008-12-01 17:02+0000\n"
+"X-Launchpad-Export-Date: 2009-01-24 23:28+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
-#: ../picard/album.py:108 ../picard/cluster.py:248
+#: ../picard/album.py:108
+#: ../picard/cluster.py:248
 msgid "Unmatched Files"
 msgstr ""
 
-#: ../picard/album.py:269
+#: ../picard/album.py:281
 #, python-format
 msgid "[couldn't load album %s]"
 msgstr ""
 
-#: ../picard/album.py:305
+#: ../picard/album.py:317
 msgid "[loading album information]"
 msgstr ""
 
-#: ../picard/tagger.py:472
+#: ../picard/cluster.py:164
+#: ../picard/cluster.py:175
+#, fuzzy, python-format
+msgid "No matching releases for cluster %s"
+msgstr "Sem lançamentos correspondentes ao agrupamento %s"
+
+#: ../picard/cluster.py:177
+#, fuzzy, python-format
+msgid "Cluster %s identified!"
+msgstr "Ficheiro %s identificado!"
+
+#: ../picard/cluster.py:182
+#, fuzzy, python-format
+msgid "Looking up the metadata for cluster %s..."
+msgstr "A buscar metadados para o agrupamento %s..."
+
+#: ../picard/const.py:40
+msgid "CD"
+msgstr ""
+
+#: ../picard/const.py:41
+msgid "DVD"
+msgstr ""
+
+#: ../picard/const.py:42
+msgid "SACD"
+msgstr ""
+
+#: ../picard/const.py:43
+msgid "LaserDisc"
+msgstr ""
+
+#: ../picard/const.py:44
+msgid "MiniDisc"
+msgstr ""
+
+#: ../picard/const.py:45
+msgid "Vinyl"
+msgstr ""
+
+#: ../picard/const.py:46
+msgid "Cassette"
+msgstr ""
+
+#: ../picard/const.py:47
+msgid "Cartridge (4/8-tracks)"
+msgstr ""
+
+#: ../picard/const.py:48
+msgid "Reel-to-Reel"
+msgstr ""
+
+#: ../picard/const.py:49
+msgid "DAT"
+msgstr ""
+
+#: ../picard/const.py:50
+msgid "Digital Media"
+msgstr ""
+
+#: ../picard/const.py:51
+msgid "Wax Cylinder"
+msgstr ""
+
+#: ../picard/const.py:52
+msgid "Piano Roll"
+msgstr ""
+
+#: ../picard/const.py:53
+#, fuzzy
+msgid "Other"
+msgstr "Mais Tarde"
+
+#: ../picard/const.py:58
+msgid "Bangladesh"
+msgstr ""
+
+#: ../picard/const.py:59
+msgid "Belgium"
+msgstr ""
+
+#: ../picard/const.py:60
+msgid "Burkina Faso"
+msgstr ""
+
+#: ../picard/const.py:61
+#, fuzzy
+msgid "Bulgaria"
+msgstr "Húngaro"
+
+#: ../picard/const.py:62
+msgid "Barbados"
+msgstr ""
+
+#: ../picard/const.py:63
+msgid "Wallis and Futuna Islands"
+msgstr ""
+
+#: ../picard/const.py:64
+#, fuzzy
+msgid "Bermuda"
+msgstr "Alemão"
+
+#: ../picard/const.py:65
+msgid "Brunei Darussalam"
+msgstr ""
+
+#: ../picard/const.py:66
+msgid "Bolivia"
+msgstr ""
+
+#: ../picard/const.py:67
+msgid "Bahrain"
+msgstr ""
+
+#: ../picard/const.py:68
+msgid "Burundi"
+msgstr ""
+
+#: ../picard/const.py:69
+msgid "Benin"
+msgstr ""
+
+#: ../picard/const.py:70
+msgid "Bhutan"
+msgstr ""
+
+#: ../picard/const.py:71
+msgid "Jamaica"
+msgstr ""
+
+#: ../picard/const.py:72
+msgid "Bouvet Island"
+msgstr ""
+
+#: ../picard/const.py:73
+msgid "Botswana"
+msgstr ""
+
+#: ../picard/const.py:74
+msgid "Samoa"
+msgstr ""
+
+#: ../picard/const.py:75
+msgid "Brazil"
+msgstr ""
+
+#: ../picard/const.py:76
+msgid "Bahamas"
+msgstr ""
+
+#: ../picard/const.py:77
+msgid "Belarus"
+msgstr ""
+
+#: ../picard/const.py:78
+msgid "Belize"
+msgstr ""
+
+#: ../picard/const.py:79
+msgid "Russian Federation"
+msgstr ""
+
+#: ../picard/const.py:80
+msgid "Rwanda"
+msgstr ""
+
+#: ../picard/const.py:81
+msgid "Reunion"
+msgstr ""
+
+#: ../picard/const.py:82
+msgid "Turkmenistan"
+msgstr ""
+
+#: ../picard/const.py:83
+msgid "Tajikistan"
+msgstr ""
+
+#: ../picard/const.py:84
+#, fuzzy
+msgid "Romania"
+msgstr "Romeno"
+
+#: ../picard/const.py:85
+msgid "Tokela"
+msgstr ""
+
+#: ../picard/const.py:86
+msgid "Guinea-Bissa"
+msgstr ""
+
+#: ../picard/const.py:87
+msgid "Guam"
+msgstr ""
+
+#: ../picard/const.py:88
+msgid "Guatemala"
+msgstr ""
+
+#: ../picard/const.py:89
+msgid "Greece"
+msgstr ""
+
+#: ../picard/const.py:90
+msgid "Equatorial Guinea"
+msgstr ""
+
+#: ../picard/const.py:91
+msgid "Guadeloupe"
+msgstr ""
+
+#: ../picard/const.py:92
+msgid "Japan"
+msgstr ""
+
+#: ../picard/const.py:93
+msgid "Guyana"
+msgstr ""
+
+#: ../picard/const.py:94
+#, fuzzy
+msgid "French Guiana"
+msgstr "Francês"
+
+#: ../picard/const.py:95
+#, fuzzy
+msgid "Georgia"
+msgstr "Alemão"
+
+#: ../picard/const.py:96
+msgid "Grenada"
+msgstr ""
+
+#: ../picard/const.py:97
+msgid "United Kingdom"
+msgstr ""
+
+#: ../picard/const.py:98
+msgid "Gabon"
+msgstr ""
+
+#: ../picard/const.py:99
+msgid "El Salvador"
+msgstr ""
+
+#: ../picard/const.py:100
+#, fuzzy
+msgid "Guinea"
+msgstr "Geral"
+
+#: ../picard/const.py:101
+msgid "Gambia"
+msgstr ""
+
+#: ../picard/const.py:102
+msgid "Greenland"
+msgstr ""
+
+#: ../picard/const.py:103
+msgid "Gibraltar"
+msgstr ""
+
+#: ../picard/const.py:104
+msgid "Ghana"
+msgstr ""
+
+#: ../picard/const.py:105
+#, fuzzy
+msgid "Oman"
+msgstr "Alemão"
+
+#: ../picard/const.py:106
+msgid "Tunisia"
+msgstr ""
+
+#: ../picard/const.py:107
+#, fuzzy
+msgid "Jordan"
+msgstr "Coreano"
+
+#: ../picard/const.py:108
+msgid "Haiti"
+msgstr ""
+
+#: ../picard/const.py:109
+#, fuzzy
+msgid "Hungary"
+msgstr "Húngaro"
+
+#: ../picard/const.py:110
+msgid "Hong Kong"
+msgstr ""
+
+#: ../picard/const.py:111
+msgid "Honduras"
+msgstr ""
+
+#: ../picard/const.py:112
+msgid "Heard and Mc Donald Islands"
+msgstr ""
+
+#: ../picard/const.py:113
+msgid "Venezuela"
+msgstr ""
+
+#: ../picard/const.py:114
+msgid "Puerto Rico"
+msgstr ""
+
+#: ../picard/const.py:115
+msgid "Pala"
+msgstr ""
+
+#: ../picard/const.py:116
+#, fuzzy
+msgid "Portugal"
+msgstr "Português"
+
+#: ../picard/const.py:117
+msgid "Svalbard and Jan Mayen Islands"
+msgstr ""
+
+#: ../picard/const.py:118
+msgid "Paraguay"
+msgstr ""
+
+#: ../picard/const.py:119
+msgid "Iraq"
+msgstr ""
+
+#: ../picard/const.py:120
+msgid "Panama"
+msgstr ""
+
+#: ../picard/const.py:121
+msgid "French Polynesia"
+msgstr ""
+
+#: ../picard/const.py:122
+msgid "Papua New Guinea"
+msgstr ""
+
+#: ../picard/const.py:123
+msgid "Per"
+msgstr ""
+
+#: ../picard/const.py:124
+msgid "Pakistan"
+msgstr ""
+
+#: ../picard/const.py:125
+msgid "Philippines"
+msgstr ""
+
+#: ../picard/const.py:126
+msgid "Pitcairn"
+msgstr ""
+
+#: ../picard/const.py:127
+msgid "Poland"
+msgstr ""
+
+#: ../picard/const.py:128
+msgid "St. Pierre and Miquelon"
+msgstr ""
+
+#: ../picard/const.py:129
+msgid "Zambia"
+msgstr ""
+
+#: ../picard/const.py:130
+msgid "Western Sahara"
+msgstr ""
+
+#: ../picard/const.py:131
+msgid "Estonia"
+msgstr ""
+
+#: ../picard/const.py:132
+msgid "Egypt"
+msgstr ""
+
+#: ../picard/const.py:133
+msgid "South Africa"
+msgstr ""
+
+#: ../picard/const.py:134
+msgid "Ecuador"
+msgstr ""
+
+#: ../picard/const.py:135
+#, fuzzy
+msgid "Italy"
+msgstr "Italiano"
+
+#: ../picard/const.py:136
+#, fuzzy
+msgid "Viet Nam"
+msgstr "Nomeação"
+
+#: ../picard/const.py:137
+msgid "Solomon Islands"
+msgstr ""
+
+#: ../picard/const.py:138
+msgid "Ethiopia"
+msgstr ""
+
+#: ../picard/const.py:139
+#, fuzzy
+msgid "Somalia"
+msgstr "Romeno"
+
+#: ../picard/const.py:140
+msgid "Zimbabwe"
+msgstr ""
+
+#: ../picard/const.py:141
+msgid "Saudi Arabia"
+msgstr ""
+
+#: ../picard/const.py:142
+#, fuzzy
+msgid "Spain"
+msgstr "Espanhol"
+
+#: ../picard/const.py:143
+msgid "Eritrea"
+msgstr ""
+
+#: ../picard/const.py:144
+msgid "Moldova, Republic of"
+msgstr ""
+
+#: ../picard/const.py:145
+msgid "Madagascar"
+msgstr ""
+
+#: ../picard/const.py:146
+msgid "Morocco"
+msgstr ""
+
+#: ../picard/const.py:147
+msgid "Monaco"
+msgstr ""
+
+#: ../picard/const.py:148
+msgid "Uzbekistan"
+msgstr ""
+
+#: ../picard/const.py:149
+msgid "Myanmar"
+msgstr ""
+
+#: ../picard/const.py:150
+msgid "Mali"
+msgstr ""
+
+#: ../picard/const.py:151
+msgid "Maca"
+msgstr ""
+
+#: ../picard/const.py:152
+msgid "Mongolia"
+msgstr ""
+
+#: ../picard/const.py:153
+msgid "Marshall Islands"
+msgstr ""
+
+#: ../picard/const.py:154
+msgid "Macedonia, The Former Yugoslav Republic of"
+msgstr ""
+
+#: ../picard/const.py:155
+msgid "Mauritius"
+msgstr ""
+
+#: ../picard/const.py:156
+msgid "Malta"
+msgstr ""
+
+#: ../picard/const.py:157
+msgid "Malawi"
+msgstr ""
+
+#: ../picard/const.py:158
+msgid "Maldives"
+msgstr ""
+
+#: ../picard/const.py:159
+msgid "Martinique"
+msgstr ""
+
+#: ../picard/const.py:160
+msgid "Northern Mariana Islands"
+msgstr ""
+
+#: ../picard/const.py:161
+msgid "Montserrat"
+msgstr ""
+
+#: ../picard/const.py:162
+#, fuzzy
+msgid "Mauritania"
+msgstr "Lituano"
+
+#: ../picard/const.py:163
+msgid "Uganda"
+msgstr ""
+
+#: ../picard/const.py:164
+msgid "Malaysia"
+msgstr ""
+
+#: ../picard/const.py:165
+msgid "Mexico"
+msgstr ""
+
+#: ../picard/const.py:166
+msgid "Israel"
+msgstr ""
+
+#: ../picard/const.py:167
+#, fuzzy
+msgid "France"
+msgstr "Cancelar"
+
+#: ../picard/const.py:168
+msgid "British Indian Ocean Territory"
+msgstr ""
+
+#: ../picard/const.py:169
+msgid "St. Helena"
+msgstr ""
+
+#: ../picard/const.py:170
+msgid "Finland"
+msgstr ""
+
+#: ../picard/const.py:171
+msgid "Fiji"
+msgstr ""
+
+#: ../picard/const.py:172
+msgid "Falkland Islands (Malvinas)"
+msgstr ""
+
+#: ../picard/const.py:173
+msgid "Micronesia, Federated States of"
+msgstr ""
+
+#: ../picard/const.py:174
+msgid "Faroe Islands"
+msgstr ""
+
+#: ../picard/const.py:175
+msgid "Nicaragua"
+msgstr ""
+
+#: ../picard/const.py:176
+msgid "Netherlands"
+msgstr ""
+
+#: ../picard/const.py:177
+msgid "Norway"
+msgstr ""
+
+#: ../picard/const.py:178
+msgid "Namibia"
+msgstr ""
+
+#: ../picard/const.py:179
+msgid "Vanuat"
+msgstr ""
+
+#: ../picard/const.py:180
+msgid "New Caledonia"
+msgstr ""
+
+#: ../picard/const.py:181
+msgid "Niger"
+msgstr ""
+
+#: ../picard/const.py:182
+msgid "Norfolk Island"
+msgstr ""
+
+#: ../picard/const.py:183
+msgid "Nigeria"
+msgstr ""
+
+#: ../picard/const.py:184
+msgid "New Zealand"
+msgstr ""
+
+#: ../picard/const.py:185
+msgid "Zaire"
+msgstr ""
+
+#: ../picard/const.py:186
+msgid "Nepal"
+msgstr ""
+
+#: ../picard/const.py:187
+msgid "Naur"
+msgstr ""
+
+#: ../picard/const.py:188
+msgid "Niue"
+msgstr ""
+
+#: ../picard/const.py:189
+msgid "Cook Islands"
+msgstr ""
+
+#: ../picard/const.py:190
+msgid "Cote d'Ivoire"
+msgstr ""
+
+#: ../picard/const.py:191
+msgid "Switzerland"
+msgstr ""
+
+#: ../picard/const.py:192
+msgid "Colombia"
+msgstr ""
+
+#: ../picard/const.py:193
+msgid "China"
+msgstr ""
+
+#: ../picard/const.py:194
+msgid "Cameroon"
+msgstr ""
+
+#: ../picard/const.py:195
+#, fuzzy
+msgid "Chile"
+msgstr "Ficheiro"
+
+#: ../picard/const.py:196
+msgid "Cocos (Keeling) Islands"
+msgstr ""
+
+#: ../picard/const.py:197
+msgid "Canada"
+msgstr ""
+
+#: ../picard/const.py:198
+msgid "Congo"
+msgstr ""
+
+#: ../picard/const.py:199
+msgid "Central African Republic"
+msgstr ""
+
+#: ../picard/const.py:200
+msgid "Czech Republic"
+msgstr ""
+
+#: ../picard/const.py:201
+msgid "Cyprus"
+msgstr ""
+
+#: ../picard/const.py:202
+msgid "Christmas Island"
+msgstr ""
+
+#: ../picard/const.py:203
+msgid "Costa Rica"
+msgstr ""
+
+#: ../picard/const.py:204
+msgid "Cape Verde"
+msgstr ""
+
+#: ../picard/const.py:205
+msgid "Cuba"
+msgstr ""
+
+#: ../picard/const.py:206
+msgid "Swaziland"
+msgstr ""
+
+#: ../picard/const.py:207
+msgid "Syrian Arab Republic"
+msgstr ""
+
+#: ../picard/const.py:208
+msgid "Kyrgyzstan"
+msgstr ""
+
+#: ../picard/const.py:209
+msgid "Kenya"
+msgstr ""
+
+#: ../picard/const.py:210
+msgid "Suriname"
+msgstr ""
+
+#: ../picard/const.py:211
+msgid "Kiribati"
+msgstr ""
+
+#: ../picard/const.py:212
+msgid "Cambodia"
+msgstr ""
+
+#: ../picard/const.py:213
+msgid "Saint Kitts and Nevis"
+msgstr ""
+
+#: ../picard/const.py:214
+#, fuzzy
+msgid "Comoros"
+msgstr "Cores"
+
+#: ../picard/const.py:215
+msgid "Sao Tome and Principe"
+msgstr ""
+
+#: ../picard/const.py:216
+#, fuzzy
+msgid "Slovenia"
+msgstr "Eslovaco"
+
+#: ../picard/const.py:217
+msgid "Kuwait"
+msgstr ""
+
+#: ../picard/const.py:218
+#, fuzzy
+msgid "Senegal"
+msgstr "Geral"
+
+#: ../picard/const.py:219
+msgid "San Marino"
+msgstr ""
+
+#: ../picard/const.py:220
+msgid "Sierra Leone"
+msgstr ""
+
+#: ../picard/const.py:221
+msgid "Seychelles"
+msgstr ""
+
+#: ../picard/const.py:222
+msgid "Kazakhstan"
+msgstr ""
+
+#: ../picard/const.py:223
+msgid "Cayman Islands"
+msgstr ""
+
+#: ../picard/const.py:224
+msgid "Singapore"
+msgstr ""
+
+#: ../picard/const.py:225
+#, fuzzy
+msgid "Sweden"
+msgstr "Sueco"
+
+#: ../picard/const.py:226
+msgid "Sudan"
+msgstr ""
+
+#: ../picard/const.py:227
+msgid "Dominican Republic"
+msgstr ""
+
+#: ../picard/const.py:228
+#, fuzzy
+msgid "Dominica"
+msgstr "Romeno"
+
+#: ../picard/const.py:229
+#, fuzzy
+msgid "Djibouti"
+msgstr "Sobre"
+
+#: ../picard/const.py:230
+msgid "Denmark"
+msgstr ""
+
+#: ../picard/const.py:231
+msgid "Virgin Islands (British)"
+msgstr ""
+
+#: ../picard/const.py:232
+#, fuzzy
+msgid "Germany"
+msgstr "Alemão"
+
+#: ../picard/const.py:233
+msgid "Yemen"
+msgstr ""
+
+#: ../picard/const.py:234
+msgid "Algeria"
+msgstr ""
+
+#: ../picard/const.py:235
+msgid "United States"
+msgstr ""
+
+#: ../picard/const.py:236
+msgid "Uruguay"
+msgstr ""
+
+#: ../picard/const.py:237
+msgid "Mayotte"
+msgstr ""
+
+#: ../picard/const.py:238
+msgid "United States Minor Outlying Islands"
+msgstr ""
+
+#: ../picard/const.py:239
+msgid "Lebanon"
+msgstr ""
+
+#: ../picard/const.py:240
+msgid "Saint Lucia"
+msgstr ""
+
+#: ../picard/const.py:241
+msgid "Lao People's Democratic Republic"
+msgstr ""
+
+#: ../picard/const.py:242
+msgid "Tuval"
+msgstr ""
+
+#: ../picard/const.py:243
+#, fuzzy
+msgid "Taiwan"
+msgstr "Italiano"
+
+#: ../picard/const.py:244
+msgid "Trinidad and Tobago"
+msgstr ""
+
+#: ../picard/const.py:245
+msgid "Turkey"
+msgstr ""
+
+#: ../picard/const.py:246
+msgid "Sri Lanka"
+msgstr ""
+
+#: ../picard/const.py:247
+msgid "Liechtenstein"
+msgstr ""
+
+#: ../picard/const.py:248
+msgid "Latvia"
+msgstr ""
+
+#: ../picard/const.py:249
+msgid "Tonga"
+msgstr ""
+
+#: ../picard/const.py:250
+#, fuzzy
+msgid "Lithuania"
+msgstr "Lituano"
+
+#: ../picard/const.py:251
+msgid "Luxembourg"
+msgstr ""
+
+#: ../picard/const.py:252
+msgid "Liberia"
+msgstr ""
+
+#: ../picard/const.py:253
+msgid "Lesotho"
+msgstr ""
+
+#: ../picard/const.py:254
+msgid "Thailand"
+msgstr ""
+
+#: ../picard/const.py:255
+msgid "French Southern Territories"
+msgstr ""
+
+#: ../picard/const.py:256
+msgid "Togo"
+msgstr ""
+
+#: ../picard/const.py:257
+msgid "Chad"
+msgstr ""
+
+#: ../picard/const.py:258
+msgid "Turks and Caicos Islands"
+msgstr ""
+
+#: ../picard/const.py:259
+msgid "Libyan Arab Jamahiriya"
+msgstr ""
+
+#: ../picard/const.py:260
+msgid "Vatican City State (Holy See)"
+msgstr ""
+
+#: ../picard/const.py:261
+msgid "Saint Vincent and The Grenadines"
+msgstr ""
+
+#: ../picard/const.py:262
+msgid "United Arab Emirates"
+msgstr ""
+
+#: ../picard/const.py:263
+msgid "Andorra"
+msgstr ""
+
+#: ../picard/const.py:264
+msgid "Antigua and Barbuda"
+msgstr ""
+
+#: ../picard/const.py:265
+msgid "Afghanistan"
+msgstr ""
+
+#: ../picard/const.py:266
+msgid "Anguilla"
+msgstr ""
+
+#: ../picard/const.py:267
+msgid "Virgin Islands (U.S.)"
+msgstr ""
+
+#: ../picard/const.py:268
+#, fuzzy
+msgid "Iceland"
+msgstr "Islandês"
+
+#: ../picard/const.py:269
+msgid "Iran (Islamic Republic of)"
+msgstr ""
+
+#: ../picard/const.py:270
+msgid "Armenia"
+msgstr ""
+
+#: ../picard/const.py:271
+msgid "Albania"
+msgstr ""
+
+#: ../picard/const.py:272
+msgid "Angola"
+msgstr ""
+
+#: ../picard/const.py:273
+msgid "Netherlands Antilles"
+msgstr ""
+
+#: ../picard/const.py:274
+msgid "Antarctica"
+msgstr ""
+
+#: ../picard/const.py:275
+msgid "American Samoa"
+msgstr ""
+
+#: ../picard/const.py:276
+msgid "Argentina"
+msgstr ""
+
+#: ../picard/const.py:277
+#, fuzzy
+msgid "Australia"
+msgstr "Italiano"
+
+#: ../picard/const.py:278
+msgid "Austria"
+msgstr ""
+
+#: ../picard/const.py:279
+msgid "Aruba"
+msgstr ""
+
+#: ../picard/const.py:280
+#, fuzzy
+msgid "India"
+msgstr "Metadados locais"
+
+#: ../picard/const.py:281
+msgid "Tanzania, United Republic of"
+msgstr ""
+
+#: ../picard/const.py:282
+msgid "Azerbaijan"
+msgstr ""
+
+#: ../picard/const.py:283
+#, fuzzy
+msgid "Ireland"
+msgstr "Islandês"
+
+#: ../picard/const.py:284
+msgid "Indonesia"
+msgstr ""
+
+#: ../picard/const.py:285
+msgid "Ukraine"
+msgstr ""
+
+#: ../picard/const.py:286
+#, fuzzy
+msgid "Qatar"
+msgstr "Mais Tarde"
+
+#: ../picard/const.py:287
+msgid "Mozambique"
+msgstr ""
+
+#: ../picard/const.py:288
+msgid "Bosnia and Herzegovina"
+msgstr ""
+
+#: ../picard/const.py:289
+msgid "Congo, The Democratic Republic of the"
+msgstr ""
+
+#: ../picard/const.py:290
+msgid "Serbia and Montenegro"
+msgstr ""
+
+#: ../picard/const.py:291
+msgid "Croatia"
+msgstr ""
+
+#: ../picard/const.py:292
+msgid "Korea (North), Democratic People's Republic of"
+msgstr ""
+
+#: ../picard/const.py:293
+msgid "Korea (South), Republic of"
+msgstr ""
+
+#: ../picard/const.py:294
+#, fuzzy
+msgid "Slovakia"
+msgstr "Eslovaco"
+
+#: ../picard/const.py:295
+msgid "Soviet Union (historical, 1922-1991)"
+msgstr ""
+
+#: ../picard/const.py:296
+msgid "East Timor"
+msgstr ""
+
+#: ../picard/const.py:297
+msgid "Czechoslovakia (historical, 1918-1992)"
+msgstr ""
+
+#: ../picard/const.py:298
+msgid "Europe"
+msgstr ""
+
+#: ../picard/const.py:299
+msgid "East Germany (historical, 1949-1990)"
+msgstr ""
+
+#: ../picard/const.py:300
+msgid "[Unknown Country]"
+msgstr ""
+
+#: ../picard/const.py:301
+msgid "[Worldwide]"
+msgstr ""
+
+#: ../picard/const.py:302
+msgid "Yugoslavia (historical, 1918-1992)"
+msgstr ""
+
+#: ../picard/const.py:307
+#, fuzzy
+msgid "Catalan"
+msgstr "Italiano"
+
+#: ../picard/const.py:308
+msgid "Czech"
+msgstr "Checo"
+
+#: ../picard/const.py:309
+msgid "Welsh"
+msgstr ""
+
+#: ../picard/const.py:310
+#, fuzzy
+msgid "Danish"
+msgstr "Espanhol"
+
+#: ../picard/const.py:311
+msgid "German"
+msgstr "Alemão"
+
+#: ../picard/const.py:312
+msgid "English"
+msgstr "Inglês"
+
+#: ../picard/const.py:313
+#, fuzzy
+msgid "English (Canada)"
+msgstr "Inglês (UK)"
+
+#: ../picard/const.py:314
+msgid "English (UK)"
+msgstr "Inglês (UK)"
+
+#: ../picard/const.py:315
+msgid "Spanish"
+msgstr "Espanhol"
+
+#: ../picard/const.py:316
+#, fuzzy
+msgid "Persian"
+msgstr "Alemão"
+
+#: ../picard/const.py:317
+msgid "Finnish"
+msgstr "Finlandês"
+
+#: ../picard/const.py:318
+msgid "French"
+msgstr "Francês"
+
+#: ../picard/const.py:319
+msgid "Frisian"
+msgstr ""
+
+#: ../picard/const.py:320
+msgid "Hebrew"
+msgstr ""
+
+#: ../picard/const.py:321
+msgid "Hungarian"
+msgstr "Húngaro"
+
+#: ../picard/const.py:322
+#, fuzzy
+msgid "Islandic"
+msgstr "Islandês"
+
+#: ../picard/const.py:323
+msgid "Italian"
+msgstr "Italiano"
+
+#: ../picard/const.py:324
+msgid "Kannada"
+msgstr ""
+
+#: ../picard/const.py:325
+msgid "Korean"
+msgstr "Coreano"
+
+#: ../picard/const.py:326
+msgid "Lithuanian"
+msgstr "Lituano"
+
+#: ../picard/const.py:327
+msgid "Norwegian Bokmal"
+msgstr "Norueguês Bokmal"
+
+#: ../picard/const.py:328
+msgid "Dutch"
+msgstr "Holandês"
+
+#: ../picard/const.py:329
+#, fuzzy
+msgid "Polish"
+msgstr "Inglês"
+
+#: ../picard/const.py:330
+msgid "Portuguese"
+msgstr "Português"
+
+#: ../picard/const.py:331
+#, fuzzy
+msgid "Brazilian Portuguese"
+msgstr "Português"
+
+#: ../picard/const.py:332
+msgid "Romanian"
+msgstr "Romeno"
+
+#: ../picard/const.py:333
+msgid "Russian"
+msgstr "Russo"
+
+#: ../picard/const.py:334
+msgid "Scots"
+msgstr ""
+
+#: ../picard/const.py:335
+msgid "Slovak"
+msgstr "Eslovaco"
+
+#: ../picard/const.py:336
+#, fuzzy
+msgid "Slovenian"
+msgstr "Eslovaco"
+
+#: ../picard/const.py:337
+msgid "Swedish"
+msgstr "Sueco"
+
+#: ../picard/const.py:338
+msgid "Chinese"
+msgstr ""
+
+#: ../picard/file.py:475
+#, fuzzy, python-format
+msgid "No matching tracks for file %s"
+msgstr "Sem faixas correspondentes ao ficheiro %s"
+
+#: ../picard/file.py:492
+#, fuzzy, python-format
+msgid "No matching tracks above the threshold for file %s"
+msgstr "Sem faixas correspondentes ao ficheiro %s"
+
+#: ../picard/file.py:495
+#, python-format
+msgid "File %s identified!"
+msgstr "Ficheiro %s identificado!"
+
+#: ../picard/file.py:506
+#, fuzzy, python-format
+msgid "Looking up the PUID for file %s..."
+msgstr "A efectuar uma procura por PUIDs para o ficheiro %s ..."
+
+#: ../picard/file.py:511
+#, fuzzy, python-format
+msgid "Looking up the metadata for file %s..."
+msgstr "A buscar metadados para o ficheiro %s ..."
+
+#: ../picard/puidmanager.py:58
+#, fuzzy
+msgid "Submitting PUIDs..."
+msgstr "Enviar PUIDs"
+
+#: ../picard/puidmanager.py:64
+#, python-format
+msgid "PUIDs submission failed: %s"
+msgstr "O envio de PUIDs falhou: %s"
+
+#: ../picard/puidmanager.py:66
+msgid "PUIDs successfully submitted!"
+msgstr "Os PUIDs foram enviados com sucesso!"
+
+#: ../picard/playlist.py:31
+msgid "M3U Playlist (*.m3u)"
+msgstr "Lista de Reprodução M3U (*.m3u)"
+
+#: ../picard/playlist.py:32
+msgid "PLS Playlist (*.pls)"
+msgstr "Lista de Reprodução PLS (*.pls)"
+
+#: ../picard/playlist.py:33
+msgid "XSPF Playlist (*.xspf)"
+msgstr "Lista de Reprodução XSPF (*.xspf)"
+
+#: ../picard/tagger.py:476
 msgid "CD Lookup Error"
 msgstr "Erro ao Procurar CD"
 
-#: ../picard/tagger.py:473
+#: ../picard/tagger.py:477
 #, python-format
 msgid ""
 "Error while reading CD:\n"
@@ -42,14 +1315,19 @@ msgid ""
 "%s"
 msgstr ""
 
-#: ../picard/ui/passworddialog.py:38
-#, python-format
-msgid ""
-"The server %s requires you to login. Please enter your username and password."
-msgstr ""
+#: ../picard/tagger.py:503
+#, fuzzy, python-format
+msgid "Couldn't find PUID for file %s"
+msgstr "Não foi encontrado um PUID para o ficheiro %s"
 
-#: ../picard/ui/ui_options_script.py:52
-msgid "Tagger Script"
+#: ../picard/musicdns/__init__.py:98
+#, fuzzy, python-format
+msgid "Looking up the fingerprint for file %s..."
+msgstr "A buscar metadados para o ficheiro %s ..."
+
+#: ../picard/musicdns/__init__.py:117
+#, python-format
+msgid "Creating fingerprint for file %s..."
 msgstr ""
 
 #: ../picard/ui/cdlookup.py:31
@@ -57,110 +1335,153 @@ msgid "Score"
 msgstr ""
 
 #: ../picard/ui/cdlookup.py:31
+#: ../picard/ui/itemviews.py:82
+#: ../picard/util/tags.py:23
 msgid "Title"
 msgstr ""
 
-#: ../picard/ui/cdlookup.py:31 ../picard/ui/mainwindow.py:436
+#: ../picard/ui/cdlookup.py:31
+#: ../picard/ui/itemviews.py:84
+#: ../picard/ui/mainwindow.py:436
+#: ../picard/util/tags.py:22
 msgid "Artist"
 msgstr "Artista"
 
-#: ../picard/ui/ui_metadata.py:121
-msgid "Lookup"
-msgstr "Procurar"
-
-#: ../picard/ui/ui_metadata.py:122
-msgid "Title:"
+#: ../picard/ui/coverartbox.py:47
+#: ../picard/ui/options/cover.py:29
+msgid "Cover Art"
 msgstr ""
 
-#: ../picard/ui/ui_metadata.py:123
-msgid "Date:"
+#: ../picard/ui/coverartbox.py:95
+msgid "Buy the album on Amazon"
 msgstr ""
 
-#: ../picard/ui/ui_metadata.py:124
-msgid "Artist:"
+#: ../picard/ui/filebrowser.py:38
+#: ../picard/ui/mainwindow.py:302
+msgid "&Refresh"
 msgstr ""
 
-#: ../picard/ui/ui_metadata.py:125
-msgid "Track:"
+#: ../picard/ui/filebrowser.py:41
+msgid "&Move Tagged Files Here"
 msgstr ""
 
-#: ../picard/ui/ui_metadata.py:126
-msgid "0000-00-00; "
+#: ../picard/ui/filebrowser.py:44
+msgid "Show &Hidden Files"
 msgstr ""
 
-#: ../picard/ui/ui_metadata.py:127 ../picard/ui/tageditor.py:225
-#: ../picard/ui/multitageditor.py:181
+#: ../picard/ui/itemviews.py:83
+msgid "Length"
+msgstr ""
+
+#: ../picard/ui/itemviews.py:327
+msgid "&Releases"
+msgstr ""
+
+#: ../picard/ui/itemviews.py:353
+msgid "&Plugins"
+msgstr ""
+
+#: ../picard/ui/itemviews.py:523
+msgid "Clusters"
+msgstr ""
+
+#: ../picard/ui/logview.py:29
+msgid "Log"
+msgstr ""
+
+#: ../picard/ui/puidsubmit.py:31
+#: ../picard/ui/options/plugins.py:80
+msgid "File"
+msgstr "Ficheiro"
+
+#: ../picard/ui/puidsubmit.py:31
+msgid "PUID"
+msgstr ""
+
+#: ../picard/ui/puidsubmit.py:31
+#: ../picard/ui/mainwindow.py:437
+msgid "Track"
+msgstr "Faixa"
+
+#: ../picard/ui/puidsubmit.py:31
+msgid "Release"
+msgstr ""
+
+#: ../picard/ui/puidsubmit.py:31
+msgid "Release ID"
+msgstr ""
+
+#: ../picard/ui/tageditor.py:65
+#: ../picard/ui/ui_options_plugins.py:62
+msgid "Details"
+msgstr ""
+
+#: ../picard/ui/tageditor.py:70
+#: ../picard/ui/tageditor.py:241
+#, python-format
+msgid "%d file"
+msgid_plural "%d files"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../picard/ui/tageditor.py:124
+#, python-format
+msgid "(different across %d file)"
+msgid_plural "(different across %d files)"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../picard/ui/tageditor.py:127
+#, python-format
+msgid "(missing from %d file)"
+msgid_plural "(missing from %d files)"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../picard/ui/tageditor.py:210
+msgid "Filename:"
+msgstr ""
+
+#: ../picard/ui/tageditor.py:212
+msgid "Format:"
+msgstr ""
+
+#: ../picard/ui/tageditor.py:221
+msgid "Size:"
+msgstr ""
+
+#: ../picard/ui/tageditor.py:225
+#: ../picard/ui/ui_metadata.py:127
 msgid "Length:"
 msgstr ""
 
-#: ../picard/ui/ui_metadata.py:128
-msgid "Album:"
+#: ../picard/ui/tageditor.py:227
+msgid "Bitrate:"
 msgstr ""
 
-#: ../picard/ui/ui_passworddialog.py:78
-#, fuzzy
-msgid "Authentication required"
-msgstr "Necessário Unicode"
-
-#: ../picard/ui/ui_passworddialog.py:79 ../picard/ui/ui_options_proxy.py:83
-#: ../picard/ui/ui_options_general.py:113
-msgid "Username:"
-msgstr "Nome de Utilizador:"
-
-#: ../picard/ui/ui_passworddialog.py:80 ../picard/ui/ui_options_proxy.py:82
-#: ../picard/ui/ui_options_general.py:112
-msgid "Password:"
-msgstr "Senha:"
-
-#: ../picard/ui/ui_passworddialog.py:81
-msgid "Save username and password"
+#: ../picard/ui/tageditor.py:229
+msgid "Sample rate:"
 msgstr ""
 
-#: ../picard/ui/ui_options_folksonomy.py:114
-#: ../picard/ui/ui_options_folksonomy_tags.py:114
-msgid "Folksonomy Tags"
+#: ../picard/ui/tageditor.py:231
+msgid "Bits per sample:"
 msgstr ""
 
-#: ../picard/ui/ui_options_folksonomy.py:115
-#: ../picard/ui/ui_options_folksonomy_tags.py:115
-msgid "Ignore tags:"
+#: ../picard/ui/tageditor.py:234
+msgid "Mono"
 msgstr ""
 
-#: ../picard/ui/ui_options_folksonomy.py:116
-#: ../picard/ui/ui_options_folksonomy_tags.py:116
-msgid "Minimal tag usage:"
+#: ../picard/ui/tageditor.py:235
+msgid "Stereo"
 msgstr ""
 
-#: ../picard/ui/ui_options_folksonomy.py:117
-#: ../picard/ui/ui_options_folksonomy_tags.py:117
-#: ../picard/ui/ui_options_matching.py:107
-#: ../picard/ui/ui_options_matching.py:108
-#: ../picard/ui/ui_options_matching.py:109
-#: ../picard/ui/ui_options_matching.py:113
-msgid " %"
+#: ../picard/ui/tageditor.py:237
+msgid "Channels:"
 msgstr ""
 
-#: ../picard/ui/ui_options_folksonomy.py:118
-msgid "Maximum number of tags:"
-msgstr ""
-
-#: ../picard/ui/ui_options_folksonomy.py:119
-#: ../picard/ui/ui_options_folksonomy_tags.py:119
-msgid "Join multiple tags with:"
-msgstr ""
-
-#: ../picard/ui/ui_options_folksonomy.py:120
-#: ../picard/ui/ui_options_folksonomy_tags.py:120
-msgid " / "
-msgstr ""
-
-#: ../picard/ui/ui_options_folksonomy.py:121
-#: ../picard/ui/ui_options_folksonomy_tags.py:121
-msgid ", "
-msgstr ""
-
-#: ../picard/ui/ui_options_folksonomy_tags.py:118
-msgid "Maximal number of tags:"
+#: ../picard/ui/tagsfromfilenames.py:52
+#: ../picard/ui/tagsfromfilenames.py:96
+msgid "File Name"
 msgstr ""
 
 #: ../picard/ui/mainwindow.py:64
@@ -201,11 +1522,12 @@ msgstr "&Ajuda..."
 
 #: ../picard/ui/mainwindow.py:207
 msgid "&About..."
-msgstr ""
+msgstr "&Acerca..."
 
 #: ../picard/ui/mainwindow.py:210
+#, fuzzy
 msgid "&Donate..."
-msgstr ""
+msgstr "&Acerca..."
 
 #: ../picard/ui/mainwindow.py:213
 msgid "&Report a Bug..."
@@ -295,7 +1617,8 @@ msgstr "Pesquisa"
 msgid "&CD Lookup..."
 msgstr ""
 
-#: ../picard/ui/mainwindow.py:272 ../picard/ui/mainwindow.py:273
+#: ../picard/ui/mainwindow.py:272
+#: ../picard/ui/mainwindow.py:273
 msgid "Lookup CD"
 msgstr ""
 
@@ -326,7 +1649,8 @@ msgstr ""
 msgid "&Lookup"
 msgstr ""
 
-#: ../picard/ui/mainwindow.py:291 ../picard/ui/mainwindow.py:292
+#: ../picard/ui/mainwindow.py:291
+#: ../picard/ui/mainwindow.py:292
 msgid "Lookup metadata"
 msgstr ""
 
@@ -339,10 +1663,6 @@ msgstr ""
 msgid "&Details..."
 msgstr ""
 
-#: ../picard/ui/mainwindow.py:302 ../picard/ui/filebrowser.py:38
-msgid "&Refresh"
-msgstr ""
-
 #: ../picard/ui/mainwindow.py:305
 msgid "Generate &Playlist..."
 msgstr ""
@@ -388,6 +1708,7 @@ msgid "&Tools"
 msgstr ""
 
 #: ../picard/ui/mainwindow.py:384
+#: ../picard/ui/util.py:33
 msgid "&Help"
 msgstr "&Ajuda"
 
@@ -400,13 +1721,10 @@ msgid "&Search Bar"
 msgstr ""
 
 #: ../picard/ui/mainwindow.py:435
+#: ../picard/util/tags.py:21
 msgid "Album"
 msgstr "Álbum"
 
-#: ../picard/ui/mainwindow.py:437 ../picard/ui/puidsubmit.py:31
-msgid "Track"
-msgstr "Faixa"
-
 #: ../picard/ui/mainwindow.py:476
 msgid "All Supported Formats"
 msgstr ""
@@ -421,37 +1739,291 @@ msgstr ""
 msgid "Playlist %s saved"
 msgstr ""
 
-#: ../picard/ui/mainwindow.py:638 ../picard/ui/mainwindow.py:647
+#: ../picard/ui/mainwindow.py:638
+#: ../picard/ui/mainwindow.py:647
 #, python-format
 msgid " (Error: %s)"
+msgstr " (Erro: %s)"
+
+#: ../picard/ui/ui_tageditor.py:115
+#: ../picard/ui/ui_options_plugins.py:59
+#: ../picard/ui/options/plugins.py:76
+msgid "Name"
+msgstr ""
+
+#: ../picard/ui/ui_tageditor.py:116
+msgid "Value"
+msgstr ""
+
+#: ../picard/ui/ui_tageditor.py:117
+msgid "&Add..."
+msgstr ""
+
+#: ../picard/ui/ui_tageditor.py:118
+msgid "&Edit..."
+msgstr ""
+
+#: ../picard/ui/ui_tageditor.py:119
+msgid "&Delete"
+msgstr ""
+
+#: ../picard/ui/ui_tageditor.py:120
+msgid "&Metadata"
+msgstr ""
+
+#: ../picard/ui/ui_tageditor.py:121
+msgid "A&rtwork"
+msgstr ""
+
+#: ../picard/ui/ui_tageditor.py:122
+msgid "&Info"
+msgstr ""
+
+#: ../picard/ui/passworddialog.py:38
+#, python-format
+msgid "The server %s requires you to login. Please enter your username and password."
+msgstr ""
+
+#: ../picard/ui/ui_cdlookup.py:60
+#: ../picard/ui/ui_options_cdlookup.py:47
+#: ../picard/ui/ui_options_cdlookup_win32.py:56
+#: ../picard/ui/options/cdlookup.py:35
+msgid "CD Lookup"
+msgstr "Procurar CD"
+
+#: ../picard/ui/ui_cdlookup.py:61
+msgid "The following releases on MusicBrainz match the CD:"
+msgstr ""
+
+#: ../picard/ui/ui_cdlookup.py:62
+#: ../picard/ui/ui_puidsubmit.py:53
+msgid "OK"
+msgstr ""
+
+#: ../picard/ui/ui_cdlookup.py:63
+msgid "    Lookup manually    "
+msgstr ""
+
+#: ../picard/ui/ui_cdlookup.py:64
+#: ../picard/ui/ui_puidsubmit.py:54
+msgid "Cancel"
+msgstr "Cancelar"
+
+#: ../picard/ui/ui_passworddialog.py:78
+#, fuzzy
+msgid "Authentication required"
+msgstr "Necessário Unicode"
+
+#: ../picard/ui/ui_passworddialog.py:79
+#: ../picard/ui/ui_options_general.py:113
+#: ../picard/ui/ui_options_proxy.py:83
+msgid "Username:"
+msgstr "Nome de Utilizador:"
+
+#: ../picard/ui/ui_passworddialog.py:80
+#: ../picard/ui/ui_options_general.py:112
+#: ../picard/ui/ui_options_proxy.py:82
+msgid "Password:"
+msgstr "Senha:"
+
+#: ../picard/ui/ui_passworddialog.py:81
+msgid "Save username and password"
 msgstr ""
 
 #: ../picard/ui/ui_edittagdialog.py:44
 msgid "Edit Tag"
 msgstr ""
 
-#: ../picard/ui/ui_options_proxy.py:81
-msgid "Web Proxy"
-msgstr "Proxy Web"
+#: ../picard/ui/ui_metadata.py:121
+msgid "Lookup"
+msgstr "Procurar"
 
-#: ../picard/ui/ui_options_proxy.py:84 ../picard/ui/ui_options_general.py:109
-msgid "Port:"
-msgstr "Porto:"
-
-#: ../picard/ui/ui_options_proxy.py:85 ../picard/ui/ui_options_general.py:110
-msgid "Server address:"
-msgstr "Endereço do servidor"
-
-#: ../picard/ui/ui_tagsfromfilenames.py:56
-msgid "Convert File Names to Tags"
+#: ../picard/ui/ui_metadata.py:122
+msgid "Title:"
 msgstr ""
 
-#: ../picard/ui/ui_tagsfromfilenames.py:57
-msgid "Replace underscores with spaces"
+#: ../picard/ui/ui_metadata.py:123
+msgid "Date:"
+msgstr ""
+
+#: ../picard/ui/ui_metadata.py:124
+msgid "Artist:"
+msgstr ""
+
+#: ../picard/ui/ui_metadata.py:125
+msgid "Track:"
+msgstr ""
+
+#: ../picard/ui/ui_metadata.py:126
+msgid "0000-00-00; "
+msgstr ""
+
+#: ../picard/ui/ui_metadata.py:128
+msgid "Album:"
+msgstr ""
+
+#: ../picard/ui/ui_options.py:42
+msgid "Options"
+msgstr "Opções"
+
+#: ../picard/ui/ui_options_cdlookup.py:48
+msgid "CD-ROM device to use for lookups:"
+msgstr ""
+
+#: ../picard/ui/ui_options_cdlookup_win32.py:57
+msgid "Default CD-ROM drive to use for lookups:"
+msgstr ""
+
+#: ../picard/ui/ui_options_cover.py:56
+msgid "Location"
+msgstr ""
+
+#: ../picard/ui/ui_options_cover.py:57
+msgid "Embed cover images into tags"
+msgstr ""
+
+#: ../picard/ui/ui_options_cover.py:58
+msgid "Save cover images as separate files"
+msgstr "Salvar as imagens de capas como ficheiros separados"
+
+#: ../picard/ui/ui_options_cover.py:59
+msgid "Overwrite the file if it already exists"
+msgstr ""
+
+#: ../picard/ui/util.py:31
+msgid "&Ok"
+msgstr ""
+
+#: ../picard/ui/util.py:32
+#, fuzzy
+msgid "&Cancel"
+msgstr "Cancelar"
+
+#: ../picard/ui/ui_puidsubmit.py:52
+msgid "Submit PUIDs"
+msgstr "Enviar PUIDs"
+
+#: ../picard/ui/ui_options_folksonomy.py:114
+#: ../picard/ui/options/folksonomy.py:29
+msgid "Folksonomy Tags"
+msgstr ""
+
+#: ../picard/ui/ui_options_folksonomy.py:115
+msgid "Ignore tags:"
+msgstr ""
+
+#: ../picard/ui/ui_options_folksonomy.py:116
+msgid "Minimal tag usage:"
+msgstr ""
+
+#: ../picard/ui/ui_options_folksonomy.py:117
+#: ../picard/ui/ui_options_matching.py:107
+#: ../picard/ui/ui_options_matching.py:108
+#: ../picard/ui/ui_options_matching.py:109
+#: ../picard/ui/ui_options_matching.py:113
+msgid " %"
+msgstr ""
+
+#: ../picard/ui/ui_options_folksonomy.py:118
+msgid "Maximum number of tags:"
+msgstr ""
+
+#: ../picard/ui/ui_options_folksonomy.py:119
+msgid "Join multiple tags with:"
+msgstr ""
+
+#: ../picard/ui/ui_options_folksonomy.py:120
+msgid " / "
+msgstr ""
+
+#: ../picard/ui/ui_options_folksonomy.py:121
+msgid ", "
+msgstr ""
+
+#: ../picard/ui/ui_options_interface.py:50
+msgid "Miscellaneous"
+msgstr ""
+
+#: ../picard/ui/ui_options_interface.py:51
+msgid "Show text labels under icons"
+msgstr ""
+
+#: ../picard/ui/ui_options_interface.py:52
+msgid "Allow selection of multiple directories"
+msgstr ""
+
+#: ../picard/ui/ui_options_interface.py:53
+msgid "Use advanced query syntax"
+msgstr ""
+
+#: ../picard/ui/ui_options_interface.py:54
+#, fuzzy
+msgid "User interface language:"
+msgstr "Nome de Utilizador:"
+
+#: ../picard/ui/ui_options_naming.py:165
+msgid "Rename Files"
+msgstr ""
+
+#: ../picard/ui/ui_options_naming.py:166
+msgid "Replace Windows-incompatible characters"
+msgstr ""
+
+#: ../picard/ui/ui_options_naming.py:167
+msgid "Replace non-ASCII characters"
+msgstr ""
+
+#: ../picard/ui/ui_options_naming.py:168
+#: ../picard/ui/ui_options_naming.py:169
+#: ../picard/ui/ui_options_metadata.py:109
+#: ../picard/ui/ui_options_metadata.py:110
+msgid "Default"
+msgstr "Por omissão"
+
+#: ../picard/ui/ui_options_naming.py:170
+#: ../picard/ui/options/naming.py:90
+msgid "Multiple artist file naming format:"
+msgstr ""
+
+#: ../picard/ui/ui_options_naming.py:171
+#: ../picard/ui/options/naming.py:86
+msgid "File naming format:"
+msgstr ""
+
+#: ../picard/ui/ui_options_naming.py:172
+msgid "Move Files"
+msgstr ""
+
+#: ../picard/ui/ui_options_naming.py:173
+msgid "Move tagged files to this directory:"
+msgstr ""
+
+#: ../picard/ui/ui_options_naming.py:174
+msgid "Browse..."
+msgstr ""
+
+#: ../picard/ui/ui_options_naming.py:175
+msgid "Move additional files:"
+msgstr ""
+
+#: ../picard/ui/ui_options_naming.py:176
+msgid "Delete empty directories"
+msgstr ""
+
+#: ../picard/ui/ui_options_naming.py:177
+msgid "Example"
+msgstr ""
+
+#: ../picard/ui/ui_options_naming.py:178
+msgid "File name:"
+msgstr ""
+
+#: ../picard/ui/ui_options_naming.py:179
+msgid "Multiple artist file name:"
 msgstr ""
 
-#: ../picard/ui/ui_tagsfromfilenames.py:58
 #: ../picard/ui/ui_options_naming.py:180
+#: ../picard/ui/ui_tagsfromfilenames.py:58
 msgid "&Preview"
 msgstr ""
 
@@ -459,11 +2031,22 @@ msgstr ""
 msgid "MusicBrainz Server"
 msgstr ""
 
+#: ../picard/ui/ui_options_general.py:109
+#: ../picard/ui/ui_options_proxy.py:84
+msgid "Port:"
+msgstr "Porto:"
+
+#: ../picard/ui/ui_options_general.py:110
+#: ../picard/ui/ui_options_proxy.py:85
+msgid "Server address:"
+msgstr "Endereço do servidor"
+
 #: ../picard/ui/ui_options_general.py:111
 msgid "Account Information"
 msgstr ""
 
 #: ../picard/ui/ui_options_general.py:114
+#: ../picard/ui/options/general.py:29
 msgid "General"
 msgstr "Geral"
 
@@ -471,34 +2054,6 @@ msgstr "Geral"
 msgid "Automatically scan all new files"
 msgstr ""
 
-#: ../picard/ui/ui_options_interface.py:46
-msgid "Miscellaneous"
-msgstr ""
-
-#: ../picard/ui/ui_options_interface.py:47
-msgid "Show text labels under icons"
-msgstr ""
-
-#: ../picard/ui/ui_options_interface.py:48
-msgid "Allow selection of multiple directories"
-msgstr ""
-
-#: ../picard/ui/ui_options_interface.py:49
-msgid "Use advanced query syntax"
-msgstr ""
-
-#: ../picard/ui/itemviews.py:327
-msgid "&Releases"
-msgstr ""
-
-#: ../picard/ui/itemviews.py:353
-msgid "&Plugins"
-msgstr ""
-
-#: ../picard/ui/itemviews.py:523
-msgid "Clusters"
-msgstr ""
-
 #: ../picard/ui/ui_options_matching.py:105
 msgid "Thresholds"
 msgstr ""
@@ -519,6 +2074,68 @@ msgstr ""
 msgid "Minimal similarity for PUID lookups:"
 msgstr ""
 
+#: ../picard/ui/ui_options_metadata.py:100
+#: ../picard/ui/options/metadata.py:31
+msgid "Metadata"
+msgstr ""
+
+#: ../picard/ui/ui_options_metadata.py:101
+msgid "Translate foreign artist names to English where possible"
+msgstr ""
+
+#: ../picard/ui/ui_options_metadata.py:102
+msgid "Use release relationships"
+msgstr ""
+
+#: ../picard/ui/ui_options_metadata.py:103
+msgid "Use track relationships"
+msgstr ""
+
+#: ../picard/ui/ui_options_metadata.py:104
+msgid "Use folksonomy tags as genre"
+msgstr ""
+
+#: ../picard/ui/ui_options_metadata.py:105
+#, fuzzy
+msgid "Preferred release country:"
+msgstr "Data de lançamento"
+
+#: ../picard/ui/ui_options_metadata.py:106
+msgid "Custom Fields"
+msgstr ""
+
+#: ../picard/ui/ui_options_metadata.py:107
+msgid "Various artists:"
+msgstr "Vários artistas:"
+
+#: ../picard/ui/ui_options_metadata.py:108
+msgid "Non-album tracks:"
+msgstr "Faixas não pertencentes a nenhum álbum:"
+
+#: ../picard/ui/ui_options_plugins.py:58
+#: ../picard/ui/options/plugins.py:30
+msgid "Plugins"
+msgstr ""
+
+#: ../picard/ui/ui_options_plugins.py:60
+#: ../picard/ui/options/plugins.py:79
+msgid "Author"
+msgstr ""
+
+#: ../picard/ui/ui_options_plugins.py:61
+#: ../picard/util/tags.py:36
+msgid "Version"
+msgstr ""
+
+#: ../picard/ui/ui_options_proxy.py:81
+#: ../picard/ui/options/proxy.py:28
+msgid "Web Proxy"
+msgstr "Proxy Web"
+
+#: ../picard/ui/ui_options_script.py:52
+msgid "Tagger Script"
+msgstr ""
+
 #: ../picard/ui/ui_options_tags.py:105
 msgid "Common"
 msgstr ""
@@ -571,331 +2188,26 @@ msgstr ""
 msgid "Remove APEv2 tags from MP3 files"
 msgstr ""
 
-#: ../picard/ui/ui_options_cdlookup_win32.py:56 ../picard/ui/ui_cdlookup.py:60
-#: ../picard/ui/ui_options_cdlookup.py:47
-msgid "CD Lookup"
-msgstr "Procurar CD"
-
-#: ../picard/ui/ui_options_cdlookup_win32.py:57
-msgid "Default CD-ROM drive to use for lookups:"
+#: ../picard/ui/ui_tagsfromfilenames.py:56
+msgid "Convert File Names to Tags"
 msgstr ""
 
-#: ../picard/ui/tageditor.py:65 ../picard/ui/ui_options_plugins.py:62
-#: ../picard/ui/multitageditor.py:37
-msgid "Details"
+#: ../picard/ui/ui_tagsfromfilenames.py:57
+msgid "Replace underscores with spaces"
 msgstr ""
 
-#: ../picard/ui/tageditor.py:70 ../picard/ui/tageditor.py:241
-#: ../picard/ui/multitageditor.py:42 ../picard/ui/multitageditor.py:197
-#, python-format
-msgid "%d file"
-msgid_plural "%d files"
-msgstr[0] ""
-msgstr[1] ""
-
-#: ../picard/ui/tageditor.py:124 ../picard/ui/multitageditor.py:95
-#, python-format
-msgid "(different across %d file)"
-msgid_plural "(different across %d files)"
-msgstr[0] ""
-msgstr[1] ""
-
-#: ../picard/ui/tageditor.py:127 ../picard/ui/multitageditor.py:98
-#, python-format
-msgid "(missing from %d file)"
-msgid_plural "(missing from %d files)"
-msgstr[0] ""
-msgstr[1] ""
-
-#: ../picard/ui/tageditor.py:210 ../picard/ui/multitageditor.py:166
-msgid "Filename:"
-msgstr ""
-
-#: ../picard/ui/tageditor.py:212 ../picard/ui/multitageditor.py:168
-msgid "Format:"
-msgstr ""
-
-#: ../picard/ui/tageditor.py:221 ../picard/ui/multitageditor.py:177
-msgid "Size:"
-msgstr ""
-
-#: ../picard/ui/tageditor.py:227 ../picard/ui/multitageditor.py:183
-msgid "Bitrate:"
-msgstr ""
-
-#: ../picard/ui/tageditor.py:229 ../picard/ui/multitageditor.py:185
-msgid "Sample rate:"
-msgstr ""
-
-#: ../picard/ui/tageditor.py:231 ../picard/ui/multitageditor.py:187
-msgid "Bits per sample:"
-msgstr ""
-
-#: ../picard/ui/tageditor.py:234 ../picard/ui/multitageditor.py:190
-msgid "Mono"
-msgstr ""
-
-#: ../picard/ui/tageditor.py:235 ../picard/ui/multitageditor.py:191
-msgid "Stereo"
-msgstr ""
-
-#: ../picard/ui/tageditor.py:237 ../picard/ui/multitageditor.py:193
-msgid "Channels:"
-msgstr ""
-
-#: ../picard/ui/ui_tageditor.py:115 ../picard/ui/ui_multitageditor.py:55
-#: ../picard/ui/ui_options_plugins.py:59 ../picard/ui/options/plugins.py:76
-msgid "Name"
-msgstr ""
-
-#: ../picard/ui/ui_tageditor.py:116 ../picard/ui/ui_multitageditor.py:56
-msgid "Value"
-msgstr ""
-
-#: ../picard/ui/ui_tageditor.py:117 ../picard/ui/ui_multitageditor.py:57
-msgid "&Add..."
-msgstr ""
-
-#: ../picard/ui/ui_tageditor.py:118
-msgid "&Edit..."
-msgstr ""
-
-#: ../picard/ui/ui_tageditor.py:119
-msgid "&Delete"
-msgstr ""
-
-#: ../picard/ui/ui_tageditor.py:120
-msgid "&Metadata"
-msgstr ""
-
-#: ../picard/ui/ui_tageditor.py:121
-msgid "A&rtwork"
-msgstr ""
-
-#: ../picard/ui/ui_tageditor.py:122
-msgid "&Info"
-msgstr ""
-
-#: ../picard/ui/coverartbox.py:47
-msgid "Cover Art"
-msgstr ""
-
-#: ../picard/ui/coverartbox.py:95
-msgid "Buy the album on Amazon"
-msgstr ""
-
-#: ../picard/ui/ui_puidsubmit.py:52
-msgid "Submit PUIDs"
-msgstr "Enviar PUIDs"
-
-#: ../picard/ui/ui_puidsubmit.py:53 ../picard/ui/ui_cdlookup.py:62
-msgid "OK"
-msgstr ""
-
-#: ../picard/ui/ui_puidsubmit.py:54 ../picard/ui/ui_cdlookup.py:64
-msgid "Cancel"
-msgstr "Cancelar"
-
-#: ../picard/ui/puidsubmit.py:31 ../picard/ui/options/plugins.py:80
-msgid "File"
-msgstr "Ficheiro"
-
-#: ../picard/ui/puidsubmit.py:31
-msgid "PUID"
-msgstr ""
-
-#: ../picard/ui/puidsubmit.py:31
-msgid "Release"
-msgstr ""
-
-#: ../picard/ui/puidsubmit.py:31
-msgid "Release ID"
-msgstr ""
-
-#: ../picard/ui/filebrowser.py:41
-msgid "&Move Tagged Files Here"
-msgstr ""
-
-#: ../picard/ui/filebrowser.py:44
-msgid "Show &Hidden Files"
-msgstr ""
-
-#: ../picard/ui/ui_cdlookup.py:61
-msgid "The following releases on MusicBrainz match the CD:"
-msgstr ""
-
-#: ../picard/ui/ui_cdlookup.py:63
-msgid "    Lookup manually    "
-msgstr ""
-
-#: ../picard/ui/ui_options.py:42
-msgid "Options"
-msgstr "Opções"
-
-#: ../picard/ui/tagsfromfilenames.py:52 ../picard/ui/tagsfromfilenames.py:96
-msgid "File Name"
-msgstr ""
-
-#: ../picard/ui/ui_options_cover.py:56
-msgid "Location"
-msgstr ""
-
-#: ../picard/ui/ui_options_cover.py:57
-msgid "Embed cover images into tags"
-msgstr ""
-
-#: ../picard/ui/ui_options_cover.py:58
-msgid "Save cover images as separate files"
-msgstr "Salvar as imagens de capas como ficheiros separados"
-
-#: ../picard/ui/ui_options_cover.py:59
-msgid "Overwrite the file if it already exists"
-msgstr ""
-
-#: ../picard/ui/ui_options_metadata.py:100
-msgid "Metadata"
-msgstr ""
-
-#: ../picard/ui/ui_options_metadata.py:101
-msgid "Translate foreign artist names to English where possible"
-msgstr ""
-
-#: ../picard/ui/ui_options_metadata.py:102
-msgid "Use release relationships"
-msgstr ""
-
-#: ../picard/ui/ui_options_metadata.py:103
-msgid "Use track relationships"
-msgstr ""
-
-#: ../picard/ui/ui_options_metadata.py:104
-msgid "Use folksonomy tags as genre"
-msgstr ""
-
-#: ../picard/ui/ui_options_metadata.py:105
-msgid "Preferred release country:"
-msgstr ""
-
-#: ../picard/ui/ui_options_metadata.py:106
-msgid "Custom Fields"
-msgstr ""
-
-#: ../picard/ui/ui_options_metadata.py:107
-msgid "Various artists:"
-msgstr "Vários artistas:"
-
-#: ../picard/ui/ui_options_metadata.py:108
-msgid "Non-album tracks:"
-msgstr "Faixas não pertencentes a nenhum álbum:"
-
-#: ../picard/ui/ui_options_metadata.py:109
-#: ../picard/ui/ui_options_metadata.py:110
-#: ../picard/ui/ui_options_naming.py:168 ../picard/ui/ui_options_naming.py:169
-msgid "Default"
-msgstr "Por omissão"
-
-#: ../picard/ui/ui_multitageditor.py:58
-msgid "Delete"
-msgstr ""
-
-#: ../picard/ui/logview.py:29
-msgid "Log"
-msgstr ""
-
-#: ../picard/ui/ui_options_plugins.py:58
-msgid "Plugins"
-msgstr ""
-
-#: ../picard/ui/ui_options_plugins.py:60 ../picard/ui/options/plugins.py:79
-msgid "Author"
-msgstr ""
-
-#: ../picard/ui/ui_options_plugins.py:61
-msgid "Version"
-msgstr ""
-
-#: ../picard/ui/ui_options_naming.py:165
-msgid "Rename Files"
-msgstr ""
-
-#: ../picard/ui/ui_options_naming.py:166
-msgid "Replace Windows-incompatible characters"
-msgstr ""
-
-#: ../picard/ui/ui_options_naming.py:167
-msgid "Replace non-ASCII characters"
-msgstr ""
-
-#: ../picard/ui/ui_options_naming.py:170 ../picard/ui/options/naming.py:90
-msgid "Multiple artist file naming format:"
-msgstr ""
-
-#: ../picard/ui/ui_options_naming.py:171 ../picard/ui/options/naming.py:86
-msgid "File naming format:"
-msgstr ""
-
-#: ../picard/ui/ui_options_naming.py:172
-msgid "Move Files"
-msgstr ""
-
-#: ../picard/ui/ui_options_naming.py:173
-msgid "Move tagged files to this directory:"
-msgstr ""
-
-#: ../picard/ui/ui_options_naming.py:174
-msgid "Browse..."
-msgstr ""
-
-#: ../picard/ui/ui_options_naming.py:175
-msgid "Move additional files:"
-msgstr ""
-
-#: ../picard/ui/ui_options_naming.py:176
-msgid "Delete empty directories"
-msgstr ""
-
-#: ../picard/ui/ui_options_naming.py:177
-msgid "Example"
-msgstr ""
-
-#: ../picard/ui/ui_options_naming.py:178
-msgid "File name:"
-msgstr ""
-
-#: ../picard/ui/ui_options_naming.py:179
-msgid "Multiple artist file name:"
-msgstr ""
-
-#: ../picard/ui/ui_options_cdlookup.py:48
-msgid "CD-ROM device to use for lookups:"
-msgstr ""
-
-#: ../picard/ui/options/scripting.py:84 ../picard/ui/options/naming.py:86
-#: ../picard/ui/options/naming.py:90 ../picard/ui/options/naming.py:93
-#: ../picard/ui/options/naming.py:95
-msgid "Script Error"
-msgstr ""
+#: ../picard/ui/options/about.py:29
+msgid "About"
+msgstr "Sobre"
 
 #. Replace this with your name to have it appear in the "About" dialog.
 #: ../picard/ui/options/about.py:48
 msgid "translator-credits"
 msgstr ""
 "Launchpad Contributions:\n"
-"  Rui Mesquita <https://launchpad.net/~rpedro78>\n"
-"\n"
-"Launchpad Contributions:\n"
 "  Rui Mesquita https://launchpad.net/~rpedro78\n"
-"\n"
-"Launchpad Contributions:\n"
-"  Rui Mesquita https://launchpad.net/~rpedro78\n"
-"\n"
-"Launchpad Contributions:\n"
 "  Lukáš Lalinský https://launchpad.net/~luks\n"
-"  Rui Mesquita https://launchpad.net/~rpedro78\n"
-"\n"
-"Launchpad Contributions:\n"
-"  Lukáš Lalinský https://launchpad.net/~luks\n"
-"  Rui Mesquita https://launchpad.net/~rpedro78"
+"  for4saken https://launchpad.net/~for4saken"
 
 #. Replace LANG with language you are translatig to.
 #: ../picard/ui/options/about.py:51
@@ -906,22 +2218,58 @@ msgstr ""
 #: ../picard/ui/options/about.py:55
 #, python-format
 msgid ""
-"<p align=\"center\"><span style=\"font-size:15px;font-weight:bold;"
-"\">MusicBrainz Picard</span><br/>\n"
+"<p align=\"center\"><span style=\"font-size:15px;font-weight:bold;\">MusicBrainz Picard</span><br/>\n"
 "Version %(version)s</p>\n"
 "<p align=\"center\"><strong>Supported formats</strong><br/>%(formats)s</p>\n"
 "<p align=\"center\"><strong>Please donate</strong><br/>\n"
-"Thank you for using Picard. Picard relies on the MusicBrainz database, which "
-"is operated by the MetaBrainz Foundation with the help of thousands of "
-"volunteers. If you like this application please consider donating to the "
-"MetaBrainz Foundation to keep the service running.</p>\n"
-"<p align=\"center\"><a href=\"http://metabrainz.org/donate/index.html"
-"\">Donate now!</a></p>\n"
+"Thank you for using Picard. Picard relies on the MusicBrainz database, which is operated by the MetaBrainz Foundation with the help of thousands of volunteers. If you like this application please consider donating to the MetaBrainz Foundation to keep the service running.</p>\n"
+"<p align=\"center\"><a href=\"http://metabrainz.org/donate/index.html\">Donate now!</a></p>\n"
 "<p align=\"center\"><strong>Credits</strong><br/>\n"
-"<small>Copyright © 2004-2008 Robert Kaye, Lukáš Lalinský and others%"
-"(translator-credits)s</small></p>\n"
-"<p align=\"center\"><a href=\"http://musicbrainz.org/doc/PicardTagger"
-"\">http://musicbrainz.org/doc/PicardTagger</a></p>\n"
+"<small>Copyright © 2004-2008 Robert Kaye, Lukáš Lalinský and others%(translator-credits)s</small></p>\n"
+"<p align=\"center\"><a href=\"http://musicbrainz.org/doc/PicardTagger\">http://musicbrainz.org/doc/PicardTagger</a></p>\n"
+msgstr ""
+
+#: ../picard/ui/options/advanced.py:26
+msgid "Advanced"
+msgstr ""
+
+#: ../picard/ui/options/interface.py:31
+#, fuzzy
+msgid "User Interface"
+msgstr "Nome de Utilizador:"
+
+#: ../picard/ui/options/interface.py:47
+msgid "System default"
+msgstr "Por omissão de sistema"
+
+#: ../picard/ui/options/interface.py:71
+#, fuzzy
+msgid "Language changed"
+msgstr "Idioma"
+
+#: ../picard/ui/options/interface.py:71
+msgid "You have changed the interface language. You have to restart Picard in order for the change to take effect."
+msgstr ""
+
+#: ../picard/ui/options/matching.py:29
+msgid "Matching"
+msgstr ""
+
+#: ../picard/ui/options/metadata.py:52
+msgid "None"
+msgstr ""
+
+#: ../picard/ui/options/naming.py:33
+#, fuzzy
+msgid "File Naming"
+msgstr "Nomeação"
+
+#: ../picard/ui/options/naming.py:86
+#: ../picard/ui/options/naming.py:90
+#: ../picard/ui/options/naming.py:93
+#: ../picard/ui/options/naming.py:95
+#: ../picard/ui/options/scripting.py:84
+msgid "Script Error"
 msgstr ""
 
 #: ../picard/ui/options/naming.py:93
@@ -940,6 +2288,254 @@ msgstr ""
 msgid "The location to move files to must not be empty."
 msgstr ""
 
+#: ../picard/ui/options/scripting.py:63
+msgid "Scripting"
+msgstr ""
+
+#: ../picard/ui/options/tags.py:29
+msgid "Tags"
+msgstr "Etiquetas"
+
+#: ../picard/util/tags.py:24
+#, fuzzy
+msgid "Date"
+msgstr "Mais Tarde"
+
+#: ../picard/util/tags.py:25
+#, fuzzy
+msgid "Album Artist"
+msgstr "Artista"
+
+#: ../picard/util/tags.py:26
+#, fuzzy
+msgid "Track Number"
+msgstr "Faixa Núm"
+
+#: ../picard/util/tags.py:27
+#, fuzzy
+msgid "Total Tracks"
+msgstr "Faixas não pertencentes a nenhum álbum:"
+
+#: ../picard/util/tags.py:28
+#, fuzzy
+msgid "Disc Number"
+msgstr "Número da faixa"
+
+#: ../picard/util/tags.py:29
+msgid "Total Discs"
+msgstr ""
+
+#: ../picard/util/tags.py:30
+#, fuzzy
+msgid "Album Artist Sort Order"
+msgstr "Nome de ordenação do artista do álbum"
+
+#: ../picard/util/tags.py:31
+msgid "Artist Sort Order"
+msgstr ""
+
+#: ../picard/util/tags.py:32
+msgid "Title Sort Order"
+msgstr ""
+
+#: ../picard/util/tags.py:33
+#, fuzzy
+msgid "Album Sort Order"
+msgstr "Álbuns agrupados"
+
+#: ../picard/util/tags.py:34
+msgid "ASIN"
+msgstr ""
+
+#: ../picard/util/tags.py:35
+msgid "Grouping"
+msgstr ""
+
+#: ../picard/util/tags.py:37
+msgid "ISRC"
+msgstr ""
+
+#: ../picard/util/tags.py:38
+msgid "Mood"
+msgstr ""
+
+#: ../picard/util/tags.py:39
+msgid "BPM"
+msgstr ""
+
+#: ../picard/util/tags.py:40
+#, fuzzy
+msgid "Copyright"
+msgstr "Copiar"
+
+#: ../picard/util/tags.py:41
+#, fuzzy
+msgid "Composer"
+msgstr "Fechar"
+
+#: ../picard/util/tags.py:42
+msgid "Conductor"
+msgstr ""
+
+#: ../picard/util/tags.py:43
+msgid "Lyricist"
+msgstr ""
+
+#: ../picard/util/tags.py:44
+msgid "Arranger"
+msgstr ""
+
+#: ../picard/util/tags.py:45
+msgid "Producer"
+msgstr ""
+
+#: ../picard/util/tags.py:46
+msgid "Engineer"
+msgstr ""
+
+#: ../picard/util/tags.py:47
+msgid "Subtitle"
+msgstr ""
+
+#: ../picard/util/tags.py:48
+#, fuzzy
+msgid "Disc Subtitle"
+msgstr "Número da faixa"
+
+#: ../picard/util/tags.py:49
+msgid "Remixer"
+msgstr ""
+
+#: ../picard/util/tags.py:50
+#, fuzzy
+msgid "MusicBrainz Track Id"
+msgstr "MusicBrainz Picard"
+
+#: ../picard/util/tags.py:51
+#, fuzzy
+msgid "MusicBrainz Release Id"
+msgstr "MusicBrainz Picard"
+
+#: ../picard/util/tags.py:52
+#, fuzzy
+msgid "MusicBrainz Artist Id"
+msgstr "MusicBrainz Picard"
+
+#: ../picard/util/tags.py:53
+#, fuzzy
+msgid "MusicBrainz Release Artist Id"
+msgstr "MusicBrainz Picard"
+
+#: ../picard/util/tags.py:54
+#, fuzzy
+msgid "MusicBrainz TRM Id"
+msgstr "MusicBrainz Picard"
+
+#: ../picard/util/tags.py:55
+#, fuzzy
+msgid "MusicBrainz Disc Id"
+msgstr "MusicBrainz Picard"
+
+#: ../picard/util/tags.py:56
+#, fuzzy
+msgid "MusicBrainz Sort Name"
+msgstr "MusicBrainz Picard"
+
+#: ../picard/util/tags.py:57
+msgid "MusicIP PUID"
+msgstr ""
+
+#: ../picard/util/tags.py:58
+#, fuzzy
+msgid "MusicIP Fingerprint"
+msgstr "Identificação Digital de Áudio"
+
+#: ../picard/util/tags.py:59
+msgid "Disc Id"
+msgstr ""
+
+#: ../picard/util/tags.py:60
+msgid "Website"
+msgstr ""
+
+#: ../picard/util/tags.py:61
+msgid "Compilation"
+msgstr ""
+
+#: ../picard/util/tags.py:62
+msgid "Comment"
+msgstr ""
+
+#: ../picard/util/tags.py:63
+#, fuzzy
+msgid "Genre"
+msgstr "Geral"
+
+#: ../picard/util/tags.py:64
+msgid "Encoded By"
+msgstr ""
+
+#: ../picard/util/tags.py:65
+msgid "Performer"
+msgstr ""
+
+#: ../picard/util/tags.py:66
+#, fuzzy
+msgid "Release Type"
+msgstr "Data de lançamento"
+
+#: ../picard/util/tags.py:67
+#, fuzzy
+msgid "Release Status"
+msgstr "Data de lançamento"
+
+#: ../picard/util/tags.py:68
+#, fuzzy
+msgid "Release Country"
+msgstr "Data de lançamento"
+
+#: ../picard/util/tags.py:69
+msgid "Record Label"
+msgstr ""
+
+#: ../picard/util/tags.py:70
+msgid "Barcode"
+msgstr ""
+
+#: ../picard/util/tags.py:71
+#, fuzzy
+msgid "Catalog Number"
+msgstr "Número da faixa"
+
+#: ../picard/util/tags.py:72
+msgid "Format"
+msgstr ""
+
+#: ../picard/util/tags.py:73
+msgid "DJ-Mixer"
+msgstr ""
+
+#: ../picard/util/tags.py:74
+#, fuzzy
+msgid "Media"
+msgstr "Metadados locais"
+
+#: ../picard/util/tags.py:75
+msgid "Lyrics"
+msgstr ""
+
+#: ../picard/util/tags.py:76
+msgid "Mixer"
+msgstr ""
+
+#: ../picard/util/tags.py:77
+msgid "Language"
+msgstr "Idioma"
+
+#: ../picard/util/tags.py:78
+msgid "Script"
+msgstr ""
+
 #: ../picard/util/webbrowser2.py:84
 msgid "Web Browser Error"
 msgstr ""
@@ -952,90 +2548,71 @@ msgid ""
 "%s"
 msgstr ""
 
-#~ msgid "File %s identified!"
-#~ msgstr "Ficheiro %s identificado!"
-
-#~ msgid "M3U Playlist (*.m3u)"
-#~ msgstr "Lista de Reprodução M3U (*.m3u)"
-
-#~ msgid "PLS Playlist (*.pls)"
-#~ msgstr "Lista de Reprodução PLS (*.pls)"
-
-#~ msgid "XSPF Playlist (*.xspf)"
-#~ msgstr "Lista de Reprodução XSPF (*.xspf)"
-
-#~ msgid "PUIDs submission failed: %s"
-#~ msgstr "O envio de PUIDs falhou: %s"
-
-#~ msgid "PUIDs successfully submitted!"
-#~ msgstr "Os PUIDs foram enviados com sucesso!"
-
 #~ msgid "New Version"
 #~ msgstr "Nova Versão"
-
 #~ msgid ""
 #~ "New version of Picard is available (%s). Would you like to download it "
 #~ "now?"
 #~ msgstr ""
 #~ "Está disponível uma nova versão do Picard (%s). Deseja obtê-la agora?"
 
-#~ msgid "About"
-#~ msgstr "Sobre"
+#, fuzzy
+#~ msgid "Anal&yze"
+#~ msgstr "Analizar"
 
-#~ msgid "Tags"
-#~ msgstr "Etiquetas"
+#, fuzzy
+#~ msgid "Generate &Cuesheet..."
+#~ msgstr "Criar cuesheet"
 
+#, fuzzy
+#~ msgid "Auto Tag"
+#~ msgstr "Sobre o Tagger"
+
+#, fuzzy
+#~ msgid "Edit &Tags..."
+#~ msgstr "Modificar opções..."
 #~ msgid "Automatically analyze all new files"
 #~ msgstr "Analizar novos ficheiros automaticamente"
 
+#, fuzzy
+#~ msgid "Album artist:"
+#~ msgstr "Artista"
+
+#, fuzzy
+#~ msgid "A&dd Directory..."
+#~ msgstr "Adicionar &Directoria...\tCtrl+D"
 #~ msgid "Are You Sure?"
 #~ msgstr "Tem a Certeza?"
-
 #~ msgid "Add &Files...\tCtrl+O"
 #~ msgstr "Adicionar &Ficheiros...\tCtrl+O"
-
 #~ msgid "Add &Directory...\tCtrl+D"
 #~ msgstr "Adicionar &Directoria...\tCtrl+D"
-
 #~ msgid "&Save Files\tCtrl+S"
 #~ msgstr "&Salvar Ficheiros\tCtrl+S"
-
 #~ msgid "C&opy\tCtrl+C"
 #~ msgstr "C&opiar\tCtrl+C"
-
 #~ msgid "Help"
 #~ msgstr "Ajuda"
-
 #~ msgid "Preferences"
 #~ msgstr "Preferências"
-
 #~ msgid "Error while saving cuesheet %s."
 #~ msgstr "Erro ao salvar a cuesheet %s."
-
 #~ msgid "Cuesheet %s saved."
 #~ msgstr "A cuesheet %s foi salvada."
-
 #~ msgid "Time"
 #~ msgstr "Duração"
-
 #~ msgid "Albums"
 #~ msgstr "Álbuns"
-
 #~ msgid "Force Save"
 #~ msgstr "Forçar Gravação"
-
 #~ msgid "Buy"
 #~ msgstr "Comprar"
-
 #~ msgid "Welcome to Picard!"
 #~ msgstr "Benvindo ao Picard!"
-
 #~ msgid "Track Num"
 #~ msgstr "Faixa Núm"
-
 #~ msgid "PUID Collision"
 #~ msgstr "Colisão PUID"
-
 #~ msgid ""
 #~ "Version %s\n"
 #~ "\n"
@@ -1062,121 +2639,76 @@ msgstr ""
 #~ "uma concessão da Helix Community.\n"
 #~ "\n"
 #~ "Formatos suportados: %s"
-
-#~ msgid "Colors"
-#~ msgstr "Cores"
-
 #~ msgid "Font color"
 #~ msgstr "Cor Fonte"
-
 #~ msgid "Directories"
 #~ msgstr "Directorias"
-
 #~ msgid "Watch for new files"
 #~ msgstr "Monitorizar por novos ficheiros"
-
 #~ msgid "Watch this directory for new audio files"
 #~ msgstr "Monitorizar esta directoria por novos ficheiros áudio"
-
 #~ msgid "Encodings"
 #~ msgstr "Codificações"
-
 #~ msgid "all languages"
 #~ msgstr "todos os idiomas"
-
 #~ msgid "percent similar."
 #~ msgstr "por cento similares."
-
 #~ msgid "Load recently used albums on startup"
 #~ msgstr "Carregar álbuns usados recentemente ao iniciar"
-
-#~ msgid "Language"
-#~ msgstr "Idioma"
-
-#~ msgid "System default"
-#~ msgstr "Por omissão de sistema"
-
 #~ msgid "Allowed filename characters"
 #~ msgstr "Caracteres permitidos em nomes de ficheiros"
-
 #~ msgid "Use Windows-safe file names"
 #~ msgstr "Utilizar nomes de ficheiro seguros para o Windows"
-
 #~ msgid "Number of tracks on the album"
 #~ msgstr "Número de faixas do álbum"
-
 #~ msgid "Track name"
 #~ msgstr "Nome da faixa"
-
 #~ msgid "Zero padded track number"
 #~ msgstr "Número da faixa preenchido com um zero à esquerda"
-
 #~ msgid "File format (e.g. mp3, ogg, wav)"
 #~ msgstr "Formato do ficheiro (p.ex. mp3, ogg, wav)"
-
 #~ msgid "Album type (album, single, EP, etc.)"
 #~ msgstr "Tipo do Álbum (álbum, single, EP, etc.)"
-
 #~ msgid "Album Status (official, promo, etc.)"
 #~ msgstr "Estado do Álbum (oficial, promocional, etc.)"
-
 #~ msgid "Album release month"
 #~ msgstr "Mês de lançamento do álbum"
-
 #~ msgid "Album release day"
 #~ msgstr "Dia de lançamento do álbum"
-
 #~ msgid "Album release year"
 #~ msgstr "Ano de lançamento do álbum"
-
 #~ msgid "Make it so!"
 #~ msgstr "Siga!"
-
 #~ msgid "Use proxy server to access the Internet"
 #~ msgstr "Utilizar um servidor proxy para aceder à Internet"
-
 #~ msgid "Proxy server to use"
 #~ msgstr "Servidor proxy a usar"
-
 #~ msgid "Proxy port"
 #~ msgstr "Porto proxy"
-
 #~ msgid "ID3v2.4 only"
 #~ msgstr "ID3v2.4 apenas"
-
 #~ msgid "Save track/album"
 #~ msgstr "Salvar faixa/álbum"
-
 #~ msgid "Artists"
 #~ msgstr "Artistas"
-
 #~ msgid "New files (drag files to tag here)"
 #~ msgstr "Novos ficheiros (arrastar ficheiros a identificar aqui)"
-
 #~ msgid "updating album information"
 #~ msgstr "a actualizar informação do álbum"
-
 #~ msgid "Submitting PUID information to MusicBrainz server ..."
 #~ msgstr "A enviar informação PUID ao servidor MusicBrainz ..."
-
 #~ msgid "Performing a PUID lookup on file %s ..."
 #~ msgstr "A efectuar uma procura por PUIDs para o ficheiro %s ..."
-
 #~ msgid "Are you sure you want to exit the application?"
 #~ msgstr "Tem a certeza que quer sair da aplicação?"
-
 #~ msgid "CD Lookup error -- is there a CD in the CD-ROM drive?"
 #~ msgstr "Erro ao procurar CD -- estará mesmo um CD na unidade CD-ROM?"
-
 #~ msgid "CD Lookup Failed"
 #~ msgstr "Falhou Procura de CD"
-
 #~ msgid "&Quick Start Guide"
 #~ msgstr "&Guia de Início Rápido"
-
 #~ msgid "Quick Start Guide"
 #~ msgstr "Guía de Início Rápido"
-
 #~ msgid ""
 #~ "You have not specified an username and password. In order to contribute "
 #~ "data to MusicBrainz, you must have a MusicBrainz account.\n"
@@ -1188,26 +2720,20 @@ msgstr ""
 #~ "dados ao MusicBrainz, é necessário ter uma conta MusicBrainz.\n"
 #~ "Quer criar uma conta nova agora? Se já tem uma conta MusicBrainz, por "
 #~ "favor insira os seus dados de utilizador nas opções da aplicação. "
-
 #~ msgid "Couldn't connect to the MusicBrainz server."
 #~ msgstr "Não foi possível ligar ao servidor MusicBrainz."
-
 #~ msgid "Connection error"
 #~ msgstr "Erro de ligação"
-
 #~ msgid ""
 #~ "MusicBrainz Picard requires wxPython with UNICODE support.\n"
 #~ "Please download the appropriate toolkit from http://www.wxpython.org/"
 #~ msgstr ""
 #~ "O MusicBrainz Picard precisa do wxPython com suporte UNICODE.\n"
 #~ "Por favor faça download do toolkit apropriado de http://www.wxpython.org/"
-
 #~ msgid "PUID collision on file %s!"
 #~ msgstr "Colisão PUID no ficheiro %s!"
-
 #~ msgid "Save error"
 #~ msgstr "Erro de gravação"
-
 #~ msgid ""
 #~ "The move files option is enabled, but the destination directory is not "
 #~ "specified or invalid.\n"
@@ -1218,7 +2744,6 @@ msgstr ""
 #~ "foi especificada ou é inválida.\n"
 #~ "Por favor corrija a opção de mover ficheiros ou a directoria de destino e "
 #~ "tente novamente."
-
 #~ msgid ""
 #~ "Not all files could be saved. Please check for and examine tracks that "
 #~ "have an error icon in front of them. To retry saving the track, right "
@@ -1227,156 +2752,70 @@ msgstr ""
 #~ "Alguns ficheiros não puderam ser salvados. Por favor procure e analize "
 #~ "faixas com um ícone de erro á frente delas. Para voltar a tentar salvar a "
 #~ "faixa, faça click com o botão direito e seleccione 'Limpar Erro'"
-
 #~ msgid "Select directory that contains music files"
 #~ msgstr "Seleccione a directoria que contêm ficheiros de música"
-
 #~ msgid "Reload album from main server"
 #~ msgstr "Recarregar álbum do servidor principal"
-
 #~ msgid "Select or drag a folder from below"
 #~ msgstr "Seleccione ou arraste uma pasta debaixo"
-
 #~ msgid "Drag files from below"
 #~ msgstr "Arraste ficheiros debaixo"
-
 #~ msgid "Release date"
 #~ msgstr "Data de lançamento"
-
 #~ msgid "%d%% similar"
 #~ msgstr "%d%% similar"
-
 #~ msgid "Please donate to MusicBrainz!"
 #~ msgstr "Por favor contribua ao MusicBrainz!"
-
-#~ msgid "Later"
-#~ msgstr "Mais Tarde"
-
 #~ msgid ""
 #~ "The destination directory %s does not exist. Please pick a valid "
 #~ "directory."
 #~ msgstr ""
 #~ "A directoria de destino %s não existe. Por favor escolha uma directoria "
 #~ "válida."
-
 #~ msgid "Select the encoding to use when reading and writing filenames"
 #~ msgstr ""
 #~ "Seleccione a codificação a usar ao ler e escrever nomes de ficheiros"
-
 #~ msgid "Automatically move clusters to albums that are at least"
 #~ msgstr "Automáticamente mover conjuntos para álbuns que sejam pelo menos"
-
 #~ msgid "Automatically save recognized tracks that are at least"
 #~ msgstr "Automáticamente salvar faixas reconhecidas que sejam pelo menos"
-
-#~ msgid "Czech"
-#~ msgstr "Checo"
-
-#~ msgid "German"
-#~ msgstr "Alemão"
-
-#~ msgid "English"
-#~ msgstr "Inglês"
-
-#~ msgid "English (UK)"
-#~ msgstr "Inglês (UK)"
-
-#~ msgid "Spanish"
-#~ msgstr "Espanhol"
-
-#~ msgid "Finnish"
-#~ msgstr "Finlandês"
-
-#~ msgid "French"
-#~ msgstr "Francês"
-
-#~ msgid "Hungarian"
-#~ msgstr "Húngaro"
-
-#~ msgid "Icelandic"
-#~ msgstr "Islandês"
-
-#~ msgid "Italian"
-#~ msgstr "Italiano"
-
-#~ msgid "Korean"
-#~ msgstr "Coreano"
-
-#~ msgid "Lithuanian"
-#~ msgstr "Lituano"
-
-#~ msgid "Dutch"
-#~ msgstr "Holandês"
-
-#~ msgid "Norwegian Bokmal"
-#~ msgstr "Norueguês Bokmal"
-
-#~ msgid "Portuguese"
-#~ msgstr "Português"
-
-#~ msgid "Romanian"
-#~ msgstr "Romeno"
-
-#~ msgid "Russian"
-#~ msgstr "Russo"
-
-#~ msgid "Slovak"
-#~ msgstr "Eslovaco"
-
-#~ msgid "Swedish"
-#~ msgstr "Sueco"
-
 #~ msgid ""
 #~ "Note: This setting will take effect after you restart the application."
 #~ msgstr "Nota: Esta definição só terá efeito após reiniciar a aplicação."
-
 #~ msgid "Artist translation"
 #~ msgstr "Tradução de nomes de artistas"
-
 #~ msgid "Rename files when writing metadata tags"
 #~ msgstr "Renomear ficheiros ao escrever as etiquetas de metadados"
-
 #~ msgid "Naming Help"
 #~ msgstr "Ajuda com a Nomeação"
-
 #~ msgid ""
 #~ "You may use the following variables in the filenaming\n"
 #~ "specifications in the options dialog:"
 #~ msgstr ""
 #~ "Poderá utilizar as seguintes variáveis nas especificações\n"
 #~ "de nomeação de ficheiros no diálogo das opções:"
-
 #~ msgid "A %s in the naming specification will create a new subfolder."
 #~ msgstr "Um %s na especificação de nomeação criará uma nova sub-directoria."
-
 #~ msgid "Audio fingerprinting options"
 #~ msgstr "Opções da identificação digital de áudio"
-
 #~ msgid "Automatically select PUID collision tracks that are at least"
 #~ msgstr ""
 #~ "Seleccionar automaticamente faixas com uma colisão PUID que sejam pelo "
 #~ "menos"
-
 #~ msgid "Write ID3v1 tags to MP3 files (ID3v2 tags will always be written)"
 #~ msgstr ""
 #~ "Escrever etiquetas ID3v1 nos ficheiros MP3 (etiquetas ID3v2 serão sempre "
 #~ "escritas)"
-
 #~ msgid "Remove track/album"
 #~ msgstr "Remover faixa/álbum"
-
 #~ msgid "Listen to track"
 #~ msgstr "Ouvir a faixa"
-
 #~ msgid "Album clusters"
 #~ msgstr "Álbuns agrupados"
-
 #~ msgid "Unmatched files for this album"
 #~ msgstr "Ficheiros não identificados para este álbum"
-
 #~ msgid "%d of %d tracks linked"
 #~ msgstr "%d de %d faixas identificadas"
-
 #~ msgid ""
 #~ "The Picard Tagger is a free application and you may\n"
 #~ "use it as long as you wish. However, providing\n"
@@ -1395,68 +2834,49 @@ msgstr ""
 #~ "que gere o projecto MusicBrainz. Todos os donativos são\n"
 #~ "dedutíveis em impostos para residentes dos Estados Unidos\n"
 #~ "e irão garantir o funcionamento e a evolução deste serviço."
-
 #~ msgid "Matched track highlighting"
 #~ msgstr "Cor para faixas identificadas"
-
 #~ msgid "Good match background color"
 #~ msgstr "Cor de fundo para faixas combinadas"
-
 #~ msgid "Bad match background color"
 #~ msgstr "Cor de fundo para faixas mal combinadas"
-
 #~ msgid "Move files option"
 #~ msgstr "Opção mover ficheiros"
-
 #~ msgid "When matching tracks to albums, accept tracks that are at least"
 #~ msgstr "Ao combinar faixas a álbuns, aceitar faixas que sejam pelo menos"
-
 #~ msgid "CD-ROM drive path to use for lookups"
 #~ msgstr "Caminho para a unidade CD-ROM a usar para procuras"
-
 #~ msgid "Launch MB Tagger automatically for inserted Audio CDs"
 #~ msgstr "Lançar o MB Tagger automaticamente ao inserir CDs Áudio"
-
 #~ msgid ""
 #~ "Failed to set the proper registy values to enable launching the tagger "
 #~ "after CD insertion. "
 #~ msgstr ""
 #~ "Falhou ao escrever as opções na registry necessárias para activar o "
 #~ "lançamento deste programa ao inserir CD. "
-
 #~ msgid "Default CD setting failed"
 #~ msgstr "Falhou a opção do CD por omissão"
-
 #~ msgid "File format naming specification"
 #~ msgstr "Especificação do formato de nomeação de ficheiros"
-
 #~ msgid "Various artist file format naming specification"
 #~ msgstr ""
 #~ "Especificação do formato de nomeação para ficheiros de Vários Artistas"
-
 #~ msgid "Note: Leave blank to allow all possible characters"
 #~ msgstr "Nota: Deixar em branco para permitir todos os caracteres possíveis"
-
 #~ msgid "Track artist name"
 #~ msgstr "Nome do artista da faixa"
-
 #~ msgid "Track artist sortname"
 #~ msgstr "Nome de ordenação do artista da faixa"
-
 #~ msgid "The first character of the artist sortname"
 #~ msgstr "O primeiro caracter do nome de ordenação do artista"
-
 #~ msgid "The first two characters of the artist sortname"
 #~ msgstr "Os dois primeiros caracteres do nome de ordenação do artista"
-
 #~ msgid "The first three characters of the artist sortname"
 #~ msgstr "Os três primeiros caracteres do nome de ordenação do artista"
-
 #~ msgid "Naming specification help"
 #~ msgstr "Ajuda com especificação de nomeação de ficheiros"
-
 #~ msgid "Accept PUID matches that are at least"
 #~ msgstr "Aceitar combinações dos PUIDs que sejam pelo menos"
-
 #~ msgid "Various artist name"
 #~ msgstr "Nome para álbuns de Vários Artistas"
+
diff --git a/po/pt_BR.po b/po/pt_BR.po
index 968cf714d..74c3cfb51 100644
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -7,35 +7,1320 @@ msgid ""
 msgstr ""
 "Project-Id-Version: picard\n"
 "Report-Msgid-Bugs-To: http://bugs.musicbrainz.org/\n"
-"POT-Creation-Date: 2008-12-01 18:20+0100\n"
-"PO-Revision-Date: 2008-09-29 14:18+0000\n"
-"Last-Translator: Mario A. C. Silva (Exp4nsion) <marioancelmo@gmail.com>\n"
+"POT-Creation-Date: 2009-01-25 12:23+0100\n"
+"PO-Revision-Date: 2009-01-25 13:32+0100\n"
+"Last-Translator: Philipp Wolfer <phw@rubyforge.org>\n"
 "Language-Team: Portuguese (Brazil) <pt_BR@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n > 1;\n"
-"X-Launchpad-Export-Date: 2008-12-01 17:01+0000\n"
+"X-Launchpad-Export-Date: 2009-01-24 23:28+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
-#: ../picard/album.py:108 ../picard/cluster.py:248
+#: ../picard/album.py:108
+#: ../picard/cluster.py:248
 msgid "Unmatched Files"
-msgstr "Arquivos Não Identificados"
+msgstr "Arquivos não identificados"
 
-#: ../picard/album.py:269
+#: ../picard/album.py:281
 #, python-format
 msgid "[couldn't load album %s]"
 msgstr "[não foi possível carregar o álbum %s]"
 
-#: ../picard/album.py:305
+#: ../picard/album.py:317
 msgid "[loading album information]"
-msgstr "[carregando informação do álbum]"
+msgstr "[carregando informações do álbum]"
 
-#: ../picard/tagger.py:472
+#: ../picard/cluster.py:164
+#: ../picard/cluster.py:175
+#, python-format
+msgid "No matching releases for cluster %s"
+msgstr "Nenhum álbum encontrado para o grupo %s"
+
+#: ../picard/cluster.py:177
+#, python-format
+msgid "Cluster %s identified!"
+msgstr "Grupo %s encontrado!"
+
+#: ../picard/cluster.py:182
+#, python-format
+msgid "Looking up the metadata for cluster %s..."
+msgstr "Procurando por metadados no grupo %s..."
+
+#: ../picard/const.py:40
+msgid "CD"
+msgstr ""
+
+#: ../picard/const.py:41
+msgid "DVD"
+msgstr ""
+
+#: ../picard/const.py:42
+msgid "SACD"
+msgstr ""
+
+#: ../picard/const.py:43
+msgid "LaserDisc"
+msgstr ""
+
+#: ../picard/const.py:44
+msgid "MiniDisc"
+msgstr ""
+
+#: ../picard/const.py:45
+msgid "Vinyl"
+msgstr ""
+
+#: ../picard/const.py:46
+msgid "Cassette"
+msgstr ""
+
+#: ../picard/const.py:47
+msgid "Cartridge (4/8-tracks)"
+msgstr ""
+
+#: ../picard/const.py:48
+msgid "Reel-to-Reel"
+msgstr ""
+
+#: ../picard/const.py:49
+msgid "DAT"
+msgstr ""
+
+#: ../picard/const.py:50
+#, fuzzy
+msgid "Digital Media"
+msgstr "Metadados originais"
+
+#: ../picard/const.py:51
+msgid "Wax Cylinder"
+msgstr ""
+
+#: ../picard/const.py:52
+msgid "Piano Roll"
+msgstr ""
+
+#: ../picard/const.py:53
+#, fuzzy
+msgid "Other"
+msgstr "Mais tarde"
+
+#: ../picard/const.py:58
+msgid "Bangladesh"
+msgstr ""
+
+#: ../picard/const.py:59
+msgid "Belgium"
+msgstr ""
+
+#: ../picard/const.py:60
+msgid "Burkina Faso"
+msgstr ""
+
+#: ../picard/const.py:61
+#, fuzzy
+msgid "Bulgaria"
+msgstr "Húngaro"
+
+#: ../picard/const.py:62
+msgid "Barbados"
+msgstr ""
+
+#: ../picard/const.py:63
+msgid "Wallis and Futuna Islands"
+msgstr ""
+
+#: ../picard/const.py:64
+#, fuzzy
+msgid "Bermuda"
+msgstr "Alemão"
+
+#: ../picard/const.py:65
+msgid "Brunei Darussalam"
+msgstr ""
+
+#: ../picard/const.py:66
+msgid "Bolivia"
+msgstr ""
+
+#: ../picard/const.py:67
+msgid "Bahrain"
+msgstr ""
+
+#: ../picard/const.py:68
+msgid "Burundi"
+msgstr ""
+
+#: ../picard/const.py:69
+msgid "Benin"
+msgstr ""
+
+#: ../picard/const.py:70
+msgid "Bhutan"
+msgstr ""
+
+#: ../picard/const.py:71
+msgid "Jamaica"
+msgstr ""
+
+#: ../picard/const.py:72
+msgid "Bouvet Island"
+msgstr ""
+
+#: ../picard/const.py:73
+msgid "Botswana"
+msgstr ""
+
+#: ../picard/const.py:74
+msgid "Samoa"
+msgstr ""
+
+#: ../picard/const.py:75
+msgid "Brazil"
+msgstr ""
+
+#: ../picard/const.py:76
+msgid "Bahamas"
+msgstr ""
+
+#: ../picard/const.py:77
+msgid "Belarus"
+msgstr ""
+
+#: ../picard/const.py:78
+msgid "Belize"
+msgstr ""
+
+#: ../picard/const.py:79
+msgid "Russian Federation"
+msgstr ""
+
+#: ../picard/const.py:80
+msgid "Rwanda"
+msgstr ""
+
+#: ../picard/const.py:81
+msgid "Reunion"
+msgstr ""
+
+#: ../picard/const.py:82
+msgid "Turkmenistan"
+msgstr ""
+
+#: ../picard/const.py:83
+msgid "Tajikistan"
+msgstr ""
+
+#: ../picard/const.py:84
+#, fuzzy
+msgid "Romania"
+msgstr "Romeno"
+
+#: ../picard/const.py:85
+msgid "Tokela"
+msgstr ""
+
+#: ../picard/const.py:86
+msgid "Guinea-Bissa"
+msgstr ""
+
+#: ../picard/const.py:87
+msgid "Guam"
+msgstr ""
+
+#: ../picard/const.py:88
+msgid "Guatemala"
+msgstr ""
+
+#: ../picard/const.py:89
+msgid "Greece"
+msgstr ""
+
+#: ../picard/const.py:90
+msgid "Equatorial Guinea"
+msgstr ""
+
+#: ../picard/const.py:91
+msgid "Guadeloupe"
+msgstr ""
+
+#: ../picard/const.py:92
+msgid "Japan"
+msgstr ""
+
+#: ../picard/const.py:93
+msgid "Guyana"
+msgstr ""
+
+#: ../picard/const.py:94
+#, fuzzy
+msgid "French Guiana"
+msgstr "Francês"
+
+#: ../picard/const.py:95
+#, fuzzy
+msgid "Georgia"
+msgstr "Alemão"
+
+#: ../picard/const.py:96
+msgid "Grenada"
+msgstr ""
+
+#: ../picard/const.py:97
+msgid "United Kingdom"
+msgstr ""
+
+#: ../picard/const.py:98
+msgid "Gabon"
+msgstr ""
+
+#: ../picard/const.py:99
+msgid "El Salvador"
+msgstr ""
+
+#: ../picard/const.py:100
+#, fuzzy
+msgid "Guinea"
+msgstr "Geral"
+
+#: ../picard/const.py:101
+msgid "Gambia"
+msgstr ""
+
+#: ../picard/const.py:102
+msgid "Greenland"
+msgstr ""
+
+#: ../picard/const.py:103
+msgid "Gibraltar"
+msgstr ""
+
+#: ../picard/const.py:104
+msgid "Ghana"
+msgstr ""
+
+#: ../picard/const.py:105
+#, fuzzy
+msgid "Oman"
+msgstr "Alemão"
+
+#: ../picard/const.py:106
+msgid "Tunisia"
+msgstr ""
+
+#: ../picard/const.py:107
+#, fuzzy
+msgid "Jordan"
+msgstr "Coreano"
+
+#: ../picard/const.py:108
+msgid "Haiti"
+msgstr ""
+
+#: ../picard/const.py:109
+#, fuzzy
+msgid "Hungary"
+msgstr "Húngaro"
+
+#: ../picard/const.py:110
+msgid "Hong Kong"
+msgstr ""
+
+#: ../picard/const.py:111
+msgid "Honduras"
+msgstr ""
+
+#: ../picard/const.py:112
+msgid "Heard and Mc Donald Islands"
+msgstr ""
+
+#: ../picard/const.py:113
+msgid "Venezuela"
+msgstr ""
+
+#: ../picard/const.py:114
+msgid "Puerto Rico"
+msgstr ""
+
+#: ../picard/const.py:115
+msgid "Pala"
+msgstr ""
+
+#: ../picard/const.py:116
+#, fuzzy
+msgid "Portugal"
+msgstr "Português"
+
+#: ../picard/const.py:117
+msgid "Svalbard and Jan Mayen Islands"
+msgstr ""
+
+#: ../picard/const.py:118
+msgid "Paraguay"
+msgstr ""
+
+#: ../picard/const.py:119
+msgid "Iraq"
+msgstr ""
+
+#: ../picard/const.py:120
+msgid "Panama"
+msgstr ""
+
+#: ../picard/const.py:121
+msgid "French Polynesia"
+msgstr ""
+
+#: ../picard/const.py:122
+msgid "Papua New Guinea"
+msgstr ""
+
+#: ../picard/const.py:123
+msgid "Per"
+msgstr ""
+
+#: ../picard/const.py:124
+msgid "Pakistan"
+msgstr ""
+
+#: ../picard/const.py:125
+msgid "Philippines"
+msgstr ""
+
+#: ../picard/const.py:126
+msgid "Pitcairn"
+msgstr ""
+
+#: ../picard/const.py:127
+msgid "Poland"
+msgstr ""
+
+#: ../picard/const.py:128
+msgid "St. Pierre and Miquelon"
+msgstr ""
+
+#: ../picard/const.py:129
+msgid "Zambia"
+msgstr ""
+
+#: ../picard/const.py:130
+msgid "Western Sahara"
+msgstr ""
+
+#: ../picard/const.py:131
+msgid "Estonia"
+msgstr ""
+
+#: ../picard/const.py:132
+msgid "Egypt"
+msgstr ""
+
+#: ../picard/const.py:133
+msgid "South Africa"
+msgstr ""
+
+#: ../picard/const.py:134
+msgid "Ecuador"
+msgstr ""
+
+#: ../picard/const.py:135
+#, fuzzy
+msgid "Italy"
+msgstr "Italiano"
+
+#: ../picard/const.py:136
+#, fuzzy
+msgid "Viet Nam"
+msgstr "Nome do arquivo"
+
+#: ../picard/const.py:137
+msgid "Solomon Islands"
+msgstr ""
+
+#: ../picard/const.py:138
+msgid "Ethiopia"
+msgstr ""
+
+#: ../picard/const.py:139
+#, fuzzy
+msgid "Somalia"
+msgstr "Romeno"
+
+#: ../picard/const.py:140
+msgid "Zimbabwe"
+msgstr ""
+
+#: ../picard/const.py:141
+msgid "Saudi Arabia"
+msgstr ""
+
+#: ../picard/const.py:142
+#, fuzzy
+msgid "Spain"
+msgstr "Espanhol"
+
+#: ../picard/const.py:143
+msgid "Eritrea"
+msgstr ""
+
+#: ../picard/const.py:144
+msgid "Moldova, Republic of"
+msgstr ""
+
+#: ../picard/const.py:145
+msgid "Madagascar"
+msgstr ""
+
+#: ../picard/const.py:146
+msgid "Morocco"
+msgstr ""
+
+#: ../picard/const.py:147
+#, fuzzy
+msgid "Monaco"
+msgstr "Mono"
+
+#: ../picard/const.py:148
+msgid "Uzbekistan"
+msgstr ""
+
+#: ../picard/const.py:149
+msgid "Myanmar"
+msgstr ""
+
+#: ../picard/const.py:150
+msgid "Mali"
+msgstr ""
+
+#: ../picard/const.py:151
+msgid "Maca"
+msgstr ""
+
+#: ../picard/const.py:152
+#, fuzzy
+msgid "Mongolia"
+msgstr "Mono"
+
+#: ../picard/const.py:153
+msgid "Marshall Islands"
+msgstr ""
+
+#: ../picard/const.py:154
+msgid "Macedonia, The Former Yugoslav Republic of"
+msgstr ""
+
+#: ../picard/const.py:155
+msgid "Mauritius"
+msgstr ""
+
+#: ../picard/const.py:156
+#, fuzzy
+msgid "Malta"
+msgstr "Metadados"
+
+#: ../picard/const.py:157
+msgid "Malawi"
+msgstr ""
+
+#: ../picard/const.py:158
+msgid "Maldives"
+msgstr ""
+
+#: ../picard/const.py:159
+msgid "Martinique"
+msgstr ""
+
+#: ../picard/const.py:160
+msgid "Northern Mariana Islands"
+msgstr ""
+
+#: ../picard/const.py:161
+msgid "Montserrat"
+msgstr ""
+
+#: ../picard/const.py:162
+#, fuzzy
+msgid "Mauritania"
+msgstr "Lituano"
+
+#: ../picard/const.py:163
+msgid "Uganda"
+msgstr ""
+
+#: ../picard/const.py:164
+msgid "Malaysia"
+msgstr ""
+
+#: ../picard/const.py:165
+msgid "Mexico"
+msgstr ""
+
+#: ../picard/const.py:166
+msgid "Israel"
+msgstr ""
+
+#: ../picard/const.py:167
+#, fuzzy
+msgid "France"
+msgstr "Cancelar"
+
+#: ../picard/const.py:168
+msgid "British Indian Ocean Territory"
+msgstr ""
+
+#: ../picard/const.py:169
+msgid "St. Helena"
+msgstr ""
+
+#: ../picard/const.py:170
+msgid "Finland"
+msgstr ""
+
+#: ../picard/const.py:171
+msgid "Fiji"
+msgstr ""
+
+#: ../picard/const.py:172
+msgid "Falkland Islands (Malvinas)"
+msgstr ""
+
+#: ../picard/const.py:173
+msgid "Micronesia, Federated States of"
+msgstr ""
+
+#: ../picard/const.py:174
+msgid "Faroe Islands"
+msgstr ""
+
+#: ../picard/const.py:175
+msgid "Nicaragua"
+msgstr ""
+
+#: ../picard/const.py:176
+msgid "Netherlands"
+msgstr ""
+
+#: ../picard/const.py:177
+msgid "Norway"
+msgstr ""
+
+#: ../picard/const.py:178
+msgid "Namibia"
+msgstr ""
+
+#: ../picard/const.py:179
+msgid "Vanuat"
+msgstr ""
+
+#: ../picard/const.py:180
+msgid "New Caledonia"
+msgstr ""
+
+#: ../picard/const.py:181
+#, fuzzy
+msgid "Niger"
+msgstr "Mixer"
+
+#: ../picard/const.py:182
+msgid "Norfolk Island"
+msgstr ""
+
+#: ../picard/const.py:183
+msgid "Nigeria"
+msgstr ""
+
+#: ../picard/const.py:184
+#, fuzzy
+msgid "New Zealand"
+msgstr "Novos metadados"
+
+#: ../picard/const.py:185
+msgid "Zaire"
+msgstr ""
+
+#: ../picard/const.py:186
+msgid "Nepal"
+msgstr ""
+
+#: ../picard/const.py:187
+msgid "Naur"
+msgstr ""
+
+#: ../picard/const.py:188
+msgid "Niue"
+msgstr ""
+
+#: ../picard/const.py:189
+msgid "Cook Islands"
+msgstr ""
+
+#: ../picard/const.py:190
+msgid "Cote d'Ivoire"
+msgstr ""
+
+#: ../picard/const.py:191
+msgid "Switzerland"
+msgstr ""
+
+#: ../picard/const.py:192
+msgid "Colombia"
+msgstr ""
+
+#: ../picard/const.py:193
+msgid "China"
+msgstr ""
+
+#: ../picard/const.py:194
+msgid "Cameroon"
+msgstr ""
+
+#: ../picard/const.py:195
+#, fuzzy
+msgid "Chile"
+msgstr "Arquivo"
+
+#: ../picard/const.py:196
+msgid "Cocos (Keeling) Islands"
+msgstr ""
+
+#: ../picard/const.py:197
+msgid "Canada"
+msgstr ""
+
+#: ../picard/const.py:198
+#, fuzzy
+msgid "Congo"
+msgstr "Mono"
+
+#: ../picard/const.py:199
+msgid "Central African Republic"
+msgstr ""
+
+#: ../picard/const.py:200
+msgid "Czech Republic"
+msgstr ""
+
+#: ../picard/const.py:201
+msgid "Cyprus"
+msgstr ""
+
+#: ../picard/const.py:202
+msgid "Christmas Island"
+msgstr ""
+
+#: ../picard/const.py:203
+msgid "Costa Rica"
+msgstr ""
+
+#: ../picard/const.py:204
+msgid "Cape Verde"
+msgstr ""
+
+#: ../picard/const.py:205
+msgid "Cuba"
+msgstr ""
+
+#: ../picard/const.py:206
+msgid "Swaziland"
+msgstr ""
+
+#: ../picard/const.py:207
+msgid "Syrian Arab Republic"
+msgstr ""
+
+#: ../picard/const.py:208
+msgid "Kyrgyzstan"
+msgstr ""
+
+#: ../picard/const.py:209
+msgid "Kenya"
+msgstr ""
+
+#: ../picard/const.py:210
+msgid "Suriname"
+msgstr ""
+
+#: ../picard/const.py:211
+msgid "Kiribati"
+msgstr ""
+
+#: ../picard/const.py:212
+msgid "Cambodia"
+msgstr ""
+
+#: ../picard/const.py:213
+msgid "Saint Kitts and Nevis"
+msgstr ""
+
+#: ../picard/const.py:214
+#, fuzzy
+msgid "Comoros"
+msgstr "Cores"
+
+#: ../picard/const.py:215
+msgid "Sao Tome and Principe"
+msgstr ""
+
+#: ../picard/const.py:216
+#, fuzzy
+msgid "Slovenia"
+msgstr "Eslovaco"
+
+#: ../picard/const.py:217
+msgid "Kuwait"
+msgstr ""
+
+#: ../picard/const.py:218
+#, fuzzy
+msgid "Senegal"
+msgstr "Geral"
+
+#: ../picard/const.py:219
+msgid "San Marino"
+msgstr ""
+
+#: ../picard/const.py:220
+msgid "Sierra Leone"
+msgstr ""
+
+#: ../picard/const.py:221
+msgid "Seychelles"
+msgstr ""
+
+#: ../picard/const.py:222
+msgid "Kazakhstan"
+msgstr ""
+
+#: ../picard/const.py:223
+msgid "Cayman Islands"
+msgstr ""
+
+#: ../picard/const.py:224
+msgid "Singapore"
+msgstr ""
+
+#: ../picard/const.py:225
+#, fuzzy
+msgid "Sweden"
+msgstr "Sueco"
+
+#: ../picard/const.py:226
+#, fuzzy
+msgid "Sudan"
+msgstr "&Verificar"
+
+#: ../picard/const.py:227
+msgid "Dominican Republic"
+msgstr ""
+
+#: ../picard/const.py:228
+#, fuzzy
+msgid "Dominica"
+msgstr "Romeno"
+
+#: ../picard/const.py:229
+#, fuzzy
+msgid "Djibouti"
+msgstr "Sobre"
+
+#: ../picard/const.py:230
+msgid "Denmark"
+msgstr ""
+
+#: ../picard/const.py:231
+msgid "Virgin Islands (British)"
+msgstr ""
+
+#: ../picard/const.py:232
+#, fuzzy
+msgid "Germany"
+msgstr "Alemão"
+
+#: ../picard/const.py:233
+msgid "Yemen"
+msgstr ""
+
+#: ../picard/const.py:234
+msgid "Algeria"
+msgstr ""
+
+#: ../picard/const.py:235
+msgid "United States"
+msgstr ""
+
+#: ../picard/const.py:236
+msgid "Uruguay"
+msgstr ""
+
+#: ../picard/const.py:237
+msgid "Mayotte"
+msgstr ""
+
+#: ../picard/const.py:238
+msgid "United States Minor Outlying Islands"
+msgstr ""
+
+#: ../picard/const.py:239
+msgid "Lebanon"
+msgstr ""
+
+#: ../picard/const.py:240
+msgid "Saint Lucia"
+msgstr ""
+
+#: ../picard/const.py:241
+msgid "Lao People's Democratic Republic"
+msgstr ""
+
+#: ../picard/const.py:242
+msgid "Tuval"
+msgstr ""
+
+#: ../picard/const.py:243
+#, fuzzy
+msgid "Taiwan"
+msgstr "Italiano"
+
+#: ../picard/const.py:244
+msgid "Trinidad and Tobago"
+msgstr ""
+
+#: ../picard/const.py:245
+msgid "Turkey"
+msgstr ""
+
+#: ../picard/const.py:246
+msgid "Sri Lanka"
+msgstr ""
+
+#: ../picard/const.py:247
+msgid "Liechtenstein"
+msgstr ""
+
+#: ../picard/const.py:248
+msgid "Latvia"
+msgstr ""
+
+#: ../picard/const.py:249
+msgid "Tonga"
+msgstr ""
+
+#: ../picard/const.py:250
+#, fuzzy
+msgid "Lithuania"
+msgstr "Lituano"
+
+#: ../picard/const.py:251
+msgid "Luxembourg"
+msgstr ""
+
+#: ../picard/const.py:252
+msgid "Liberia"
+msgstr ""
+
+#: ../picard/const.py:253
+#, fuzzy
+msgid "Lesotho"
+msgstr "Duração"
+
+#: ../picard/const.py:254
+msgid "Thailand"
+msgstr ""
+
+#: ../picard/const.py:255
+msgid "French Southern Territories"
+msgstr ""
+
+#: ../picard/const.py:256
+#, fuzzy
+msgid "Togo"
+msgstr "&Ferramentas"
+
+#: ../picard/const.py:257
+msgid "Chad"
+msgstr ""
+
+#: ../picard/const.py:258
+msgid "Turks and Caicos Islands"
+msgstr ""
+
+#: ../picard/const.py:259
+msgid "Libyan Arab Jamahiriya"
+msgstr ""
+
+#: ../picard/const.py:260
+msgid "Vatican City State (Holy See)"
+msgstr ""
+
+#: ../picard/const.py:261
+msgid "Saint Vincent and The Grenadines"
+msgstr ""
+
+#: ../picard/const.py:262
+msgid "United Arab Emirates"
+msgstr ""
+
+#: ../picard/const.py:263
+msgid "Andorra"
+msgstr ""
+
+#: ../picard/const.py:264
+msgid "Antigua and Barbuda"
+msgstr ""
+
+#: ../picard/const.py:265
+msgid "Afghanistan"
+msgstr ""
+
+#: ../picard/const.py:266
+msgid "Anguilla"
+msgstr ""
+
+#: ../picard/const.py:267
+msgid "Virgin Islands (U.S.)"
+msgstr ""
+
+#: ../picard/const.py:268
+#, fuzzy
+msgid "Iceland"
+msgstr "Islandês"
+
+#: ../picard/const.py:269
+msgid "Iran (Islamic Republic of)"
+msgstr ""
+
+#: ../picard/const.py:270
+msgid "Armenia"
+msgstr ""
+
+#: ../picard/const.py:271
+msgid "Albania"
+msgstr ""
+
+#: ../picard/const.py:272
+msgid "Angola"
+msgstr ""
+
+#: ../picard/const.py:273
+msgid "Netherlands Antilles"
+msgstr ""
+
+#: ../picard/const.py:274
+msgid "Antarctica"
+msgstr ""
+
+#: ../picard/const.py:275
+msgid "American Samoa"
+msgstr ""
+
+#: ../picard/const.py:276
+msgid "Argentina"
+msgstr ""
+
+#: ../picard/const.py:277
+#, fuzzy
+msgid "Australia"
+msgstr "Italiano"
+
+#: ../picard/const.py:278
+#, fuzzy
+msgid "Austria"
+msgstr "Autor"
+
+#: ../picard/const.py:279
+msgid "Aruba"
+msgstr ""
+
+#: ../picard/const.py:280
+#, fuzzy
+msgid "India"
+msgstr "Mídia"
+
+#: ../picard/const.py:281
+msgid "Tanzania, United Republic of"
+msgstr ""
+
+#: ../picard/const.py:282
+msgid "Azerbaijan"
+msgstr ""
+
+#: ../picard/const.py:283
+#, fuzzy
+msgid "Ireland"
+msgstr "Islandês"
+
+#: ../picard/const.py:284
+msgid "Indonesia"
+msgstr ""
+
+#: ../picard/const.py:285
+msgid "Ukraine"
+msgstr ""
+
+#: ../picard/const.py:286
+#, fuzzy
+msgid "Qatar"
+msgstr "Mais tarde"
+
+#: ../picard/const.py:287
+msgid "Mozambique"
+msgstr ""
+
+#: ../picard/const.py:288
+msgid "Bosnia and Herzegovina"
+msgstr ""
+
+#: ../picard/const.py:289
+msgid "Congo, The Democratic Republic of the"
+msgstr ""
+
+#: ../picard/const.py:290
+msgid "Serbia and Montenegro"
+msgstr ""
+
+#: ../picard/const.py:291
+msgid "Croatia"
+msgstr ""
+
+#: ../picard/const.py:292
+msgid "Korea (North), Democratic People's Republic of"
+msgstr ""
+
+#: ../picard/const.py:293
+msgid "Korea (South), Republic of"
+msgstr ""
+
+#: ../picard/const.py:294
+#, fuzzy
+msgid "Slovakia"
+msgstr "Eslovaco"
+
+#: ../picard/const.py:295
+msgid "Soviet Union (historical, 1922-1991)"
+msgstr ""
+
+#: ../picard/const.py:296
+msgid "East Timor"
+msgstr ""
+
+#: ../picard/const.py:297
+msgid "Czechoslovakia (historical, 1918-1992)"
+msgstr ""
+
+#: ../picard/const.py:298
+msgid "Europe"
+msgstr ""
+
+#: ../picard/const.py:299
+msgid "East Germany (historical, 1949-1990)"
+msgstr ""
+
+#: ../picard/const.py:300
+msgid "[Unknown Country]"
+msgstr ""
+
+#: ../picard/const.py:301
+msgid "[Worldwide]"
+msgstr ""
+
+#: ../picard/const.py:302
+msgid "Yugoslavia (historical, 1918-1992)"
+msgstr ""
+
+#: ../picard/const.py:307
+#, fuzzy
+msgid "Catalan"
+msgstr "Italiano"
+
+#: ../picard/const.py:308
+msgid "Czech"
+msgstr "Tcheco"
+
+#: ../picard/const.py:309
+msgid "Welsh"
+msgstr ""
+
+#: ../picard/const.py:310
+#, fuzzy
+msgid "Danish"
+msgstr "Espanhol"
+
+#: ../picard/const.py:311
+msgid "German"
+msgstr "Alemão"
+
+#: ../picard/const.py:312
+msgid "English"
+msgstr "Inglês"
+
+#: ../picard/const.py:313
+#, fuzzy
+msgid "English (Canada)"
+msgstr "Inglês Britânico"
+
+#: ../picard/const.py:314
+msgid "English (UK)"
+msgstr "Inglês Britânico"
+
+#: ../picard/const.py:315
+msgid "Spanish"
+msgstr "Espanhol"
+
+#: ../picard/const.py:316
+#, fuzzy
+msgid "Persian"
+msgstr "Versão"
+
+#: ../picard/const.py:317
+msgid "Finnish"
+msgstr "Finlandês"
+
+#: ../picard/const.py:318
+msgid "French"
+msgstr "Francês"
+
+#: ../picard/const.py:319
+msgid "Frisian"
+msgstr ""
+
+#: ../picard/const.py:320
+msgid "Hebrew"
+msgstr ""
+
+#: ../picard/const.py:321
+msgid "Hungarian"
+msgstr "Húngaro"
+
+#: ../picard/const.py:322
+#, fuzzy
+msgid "Islandic"
+msgstr "Islandês"
+
+#: ../picard/const.py:323
+msgid "Italian"
+msgstr "Italiano"
+
+#: ../picard/const.py:324
+msgid "Kannada"
+msgstr ""
+
+#: ../picard/const.py:325
+msgid "Korean"
+msgstr "Coreano"
+
+#: ../picard/const.py:326
+msgid "Lithuanian"
+msgstr "Lituano"
+
+#: ../picard/const.py:327
+msgid "Norwegian Bokmal"
+msgstr "Norueguês (Bokmal)"
+
+#: ../picard/const.py:328
+msgid "Dutch"
+msgstr "Holandês"
+
+#: ../picard/const.py:329
+#, fuzzy
+msgid "Polish"
+msgstr "Plugins"
+
+#: ../picard/const.py:330
+msgid "Portuguese"
+msgstr "Português"
+
+#: ../picard/const.py:331
+#, fuzzy
+msgid "Brazilian Portuguese"
+msgstr "Português"
+
+#: ../picard/const.py:332
+msgid "Romanian"
+msgstr "Romeno"
+
+#: ../picard/const.py:333
+msgid "Russian"
+msgstr "Russo"
+
+#: ../picard/const.py:334
+#, fuzzy
+msgid "Scots"
+msgstr "Classificação"
+
+#: ../picard/const.py:335
+msgid "Slovak"
+msgstr "Eslovaco"
+
+#: ../picard/const.py:336
+#, fuzzy
+msgid "Slovenian"
+msgstr "Eslovaco"
+
+#: ../picard/const.py:337
+msgid "Swedish"
+msgstr "Sueco"
+
+#: ../picard/const.py:338
+#, fuzzy
+msgid "Chinese"
+msgstr "Canais:"
+
+#: ../picard/file.py:475
+#, python-format
+msgid "No matching tracks for file %s"
+msgstr "Nenhuma faixa identificada para o arquivo %s"
+
+#: ../picard/file.py:492
+#, fuzzy, python-format
+msgid "No matching tracks above the threshold for file %s"
+msgstr "Nenhuma faixa identificada para o arquivo %s"
+
+#: ../picard/file.py:495
+#, python-format
+msgid "File %s identified!"
+msgstr "Arquivo %s identificado!"
+
+#: ../picard/file.py:506
+#, python-format
+msgid "Looking up the PUID for file %s..."
+msgstr "Procurando o PUID do arquivo %s..."
+
+#: ../picard/file.py:511
+#, python-format
+msgid "Looking up the metadata for file %s..."
+msgstr "Procurando por metadados no arquivo %s..."
+
+#: ../picard/puidmanager.py:58
+msgid "Submitting PUIDs..."
+msgstr "Enviando PUIDs..."
+
+#: ../picard/puidmanager.py:64
+#, python-format
+msgid "PUIDs submission failed: %s"
+msgstr "Falha ao enviar PUIDs: %s"
+
+#: ../picard/puidmanager.py:66
+msgid "PUIDs successfully submitted!"
+msgstr "PUIDs enviados com sucesso!"
+
+#: ../picard/playlist.py:31
+msgid "M3U Playlist (*.m3u)"
+msgstr "Lista de reprodução M3U (*.m3u)"
+
+#: ../picard/playlist.py:32
+msgid "PLS Playlist (*.pls)"
+msgstr "Lista de reprodução PLS (*.pls)"
+
+#: ../picard/playlist.py:33
+msgid "XSPF Playlist (*.xspf)"
+msgstr "Lista de reprodução XSPF (*.xspf)"
+
+#: ../picard/tagger.py:476
 msgid "CD Lookup Error"
 msgstr "Erro ao procurar CD"
 
-#: ../picard/tagger.py:473
+#: ../picard/tagger.py:477
 #, python-format
 msgid ""
 "Error while reading CD:\n"
@@ -46,126 +1331,174 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../picard/ui/passworddialog.py:38
+#: ../picard/tagger.py:503
 #, python-format
-msgid ""
-"The server %s requires you to login. Please enter your username and password."
-msgstr ""
+msgid "Couldn't find PUID for file %s"
+msgstr "Não foi possível encontrar um PUID para o arquivo %s"
 
-#: ../picard/ui/ui_options_script.py:52
-msgid "Tagger Script"
-msgstr "Script de Etiquetas"
+#: ../picard/musicdns/__init__.py:98
+#, python-format
+msgid "Looking up the fingerprint for file %s..."
+msgstr "Procurando pela fingerprint do arquivo %s..."
+
+#: ../picard/musicdns/__init__.py:117
+#, python-format
+msgid "Creating fingerprint for file %s..."
+msgstr "Criando uma fingerprint para o arquivo %s..."
 
 #: ../picard/ui/cdlookup.py:31
 msgid "Score"
 msgstr "Classificação"
 
 #: ../picard/ui/cdlookup.py:31
+#: ../picard/ui/itemviews.py:82
+#: ../picard/util/tags.py:23
 msgid "Title"
 msgstr "Título"
 
-#: ../picard/ui/cdlookup.py:31 ../picard/ui/mainwindow.py:436
+#: ../picard/ui/cdlookup.py:31
+#: ../picard/ui/itemviews.py:84
+#: ../picard/ui/mainwindow.py:436
+#: ../picard/util/tags.py:22
 msgid "Artist"
 msgstr "Artista"
 
-#: ../picard/ui/ui_metadata.py:121
-msgid "Lookup"
-msgstr "Procurar"
+#: ../picard/ui/coverartbox.py:47
+#: ../picard/ui/options/cover.py:29
+msgid "Cover Art"
+msgstr "Capa"
 
-#: ../picard/ui/ui_metadata.py:122
-msgid "Title:"
-msgstr "Título:"
+#: ../picard/ui/coverartbox.py:95
+msgid "Buy the album on Amazon"
+msgstr "Compre este álbum na Amazon"
 
-#: ../picard/ui/ui_metadata.py:123
-msgid "Date:"
-msgstr "Data:"
+#: ../picard/ui/filebrowser.py:38
+#: ../picard/ui/mainwindow.py:302
+msgid "&Refresh"
+msgstr "Atuali&zar"
 
-#: ../picard/ui/ui_metadata.py:124
-msgid "Artist:"
-msgstr "Artista:"
+#: ../picard/ui/filebrowser.py:41
+msgid "&Move Tagged Files Here"
+msgstr "&Mover arquivos ao escrever tags para cá"
 
-#: ../picard/ui/ui_metadata.py:125
-msgid "Track:"
-msgstr "Faixa:"
+#: ../picard/ui/filebrowser.py:44
+msgid "Show &Hidden Files"
+msgstr "Mostrar arquivos &ocultos"
 
-#: ../picard/ui/ui_metadata.py:126
-msgid "0000-00-00; "
-msgstr "00-00-0000; "
+#: ../picard/ui/itemviews.py:83
+msgid "Length"
+msgstr "Duração"
 
-#: ../picard/ui/ui_metadata.py:127 ../picard/ui/tageditor.py:225
-#: ../picard/ui/multitageditor.py:181
+#: ../picard/ui/itemviews.py:327
+msgid "&Releases"
+msgstr "&Lançamentos"
+
+#: ../picard/ui/itemviews.py:353
+msgid "&Plugins"
+msgstr "&Plugins"
+
+#: ../picard/ui/itemviews.py:523
+msgid "Clusters"
+msgstr "Agrupados"
+
+#: ../picard/ui/logview.py:29
+msgid "Log"
+msgstr "Log"
+
+#: ../picard/ui/puidsubmit.py:31
+#: ../picard/ui/options/plugins.py:80
+msgid "File"
+msgstr "Arquivo"
+
+#: ../picard/ui/puidsubmit.py:31
+msgid "PUID"
+msgstr "PUID"
+
+#: ../picard/ui/puidsubmit.py:31
+#: ../picard/ui/mainwindow.py:437
+msgid "Track"
+msgstr "Faixa"
+
+#: ../picard/ui/puidsubmit.py:31
+msgid "Release"
+msgstr "Álbum"
+
+#: ../picard/ui/puidsubmit.py:31
+msgid "Release ID"
+msgstr "ID do álbum"
+
+#: ../picard/ui/tageditor.py:65
+#: ../picard/ui/ui_options_plugins.py:62
+msgid "Details"
+msgstr "Detalhes"
+
+#: ../picard/ui/tageditor.py:70
+#: ../picard/ui/tageditor.py:241
+#, python-format
+msgid "%d file"
+msgid_plural "%d files"
+msgstr[0] "%d arquivo"
+msgstr[1] "%d arquivos"
+
+#: ../picard/ui/tageditor.py:124
+#, python-format
+msgid "(different across %d file)"
+msgid_plural "(different across %d files)"
+msgstr[0] "(diferença entre %d arquivo)"
+msgstr[1] "(diferença entre %d arquivos)"
+
+#: ../picard/ui/tageditor.py:127
+#, python-format
+msgid "(missing from %d file)"
+msgid_plural "(missing from %d files)"
+msgstr[0] "(ausente de %d arquivo)"
+msgstr[1] "(ausente de %d arquivos)"
+
+#: ../picard/ui/tageditor.py:210
+msgid "Filename:"
+msgstr "Nome do arquivo:"
+
+#: ../picard/ui/tageditor.py:212
+msgid "Format:"
+msgstr "Formato:"
+
+#: ../picard/ui/tageditor.py:221
+msgid "Size:"
+msgstr "Tamanho:"
+
+#: ../picard/ui/tageditor.py:225
+#: ../picard/ui/ui_metadata.py:127
 msgid "Length:"
 msgstr "Duração:"
 
-#: ../picard/ui/ui_metadata.py:128
-msgid "Album:"
-msgstr "Álbum:"
+#: ../picard/ui/tageditor.py:227
+msgid "Bitrate:"
+msgstr "Taxa de bits:"
 
-#: ../picard/ui/ui_passworddialog.py:78
-#, fuzzy
-msgid "Authentication required"
-msgstr "Unicode Requerido"
+#: ../picard/ui/tageditor.py:229
+msgid "Sample rate:"
+msgstr "Taxa de amostragem:"
 
-#: ../picard/ui/ui_passworddialog.py:79 ../picard/ui/ui_options_proxy.py:83
-#: ../picard/ui/ui_options_general.py:113
-msgid "Username:"
-msgstr "Nome de usuário:"
+#: ../picard/ui/tageditor.py:231
+msgid "Bits per sample:"
+msgstr "Bits por amostragem:"
 
-#: ../picard/ui/ui_passworddialog.py:80 ../picard/ui/ui_options_proxy.py:82
-#: ../picard/ui/ui_options_general.py:112
-msgid "Password:"
-msgstr "Senha:"
+#: ../picard/ui/tageditor.py:234
+msgid "Mono"
+msgstr "Mono"
 
-#: ../picard/ui/ui_passworddialog.py:81
-msgid "Save username and password"
-msgstr ""
+#: ../picard/ui/tageditor.py:235
+msgid "Stereo"
+msgstr "Estéreo"
 
-#: ../picard/ui/ui_options_folksonomy.py:114
-#: ../picard/ui/ui_options_folksonomy_tags.py:114
-msgid "Folksonomy Tags"
-msgstr "Etiquetas de Folksonomia"
+#: ../picard/ui/tageditor.py:237
+msgid "Channels:"
+msgstr "Canais:"
 
-#: ../picard/ui/ui_options_folksonomy.py:115
-#: ../picard/ui/ui_options_folksonomy_tags.py:115
-msgid "Ignore tags:"
-msgstr "Ignorar etiquetas:"
-
-#: ../picard/ui/ui_options_folksonomy.py:116
-#: ../picard/ui/ui_options_folksonomy_tags.py:116
-msgid "Minimal tag usage:"
-msgstr "Uso mínimo de etiqueta:"
-
-#: ../picard/ui/ui_options_folksonomy.py:117
-#: ../picard/ui/ui_options_folksonomy_tags.py:117
-#: ../picard/ui/ui_options_matching.py:107
-#: ../picard/ui/ui_options_matching.py:108
-#: ../picard/ui/ui_options_matching.py:109
-#: ../picard/ui/ui_options_matching.py:113
-msgid " %"
-msgstr " %"
-
-#: ../picard/ui/ui_options_folksonomy.py:118
-msgid "Maximum number of tags:"
-msgstr "Número máximo de etiquetas:"
-
-#: ../picard/ui/ui_options_folksonomy.py:119
-#: ../picard/ui/ui_options_folksonomy_tags.py:119
-msgid "Join multiple tags with:"
-msgstr "Juntar várias etiquetas com:"
-
-#: ../picard/ui/ui_options_folksonomy.py:120
-#: ../picard/ui/ui_options_folksonomy_tags.py:120
-msgid " / "
-msgstr " / "
-
-#: ../picard/ui/ui_options_folksonomy.py:121
-#: ../picard/ui/ui_options_folksonomy_tags.py:121
-msgid ", "
-msgstr ", "
-
-#: ../picard/ui/ui_options_folksonomy_tags.py:118
-msgid "Maximal number of tags:"
-msgstr "Número máximo de etiquetas:"
+#: ../picard/ui/tagsfromfilenames.py:52
+#: ../picard/ui/tagsfromfilenames.py:96
+msgid "File Name"
+msgstr "Nome do arquivo"
 
 #: ../picard/ui/mainwindow.py:64
 msgid "MusicBrainz Picard"
@@ -173,11 +1506,11 @@ msgstr "MusicBrainz Picard"
 
 #: ../picard/ui/mainwindow.py:85
 msgid "Original Metadata"
-msgstr "Metadado Original"
+msgstr "Metadados originais"
 
 #: ../picard/ui/mainwindow.py:87
 msgid "New Metadata"
-msgstr "Novo Metadado"
+msgstr "Novos metadados"
 
 #: ../picard/ui/mainwindow.py:183
 msgid "&Options..."
@@ -208,21 +1541,20 @@ msgid "&About..."
 msgstr "&Sobre..."
 
 #: ../picard/ui/mainwindow.py:210
-#, fuzzy
 msgid "&Donate..."
-msgstr "&Sobre..."
+msgstr "&Doar..."
 
 #: ../picard/ui/mainwindow.py:213
 msgid "&Report a Bug..."
-msgstr "&Reporte um Bug..."
+msgstr "&Reporte um bug..."
 
 #: ../picard/ui/mainwindow.py:216
 msgid "&Support Forum..."
-msgstr "&Fórum de Suporte..."
+msgstr "&Fórum de suporte..."
 
 #: ../picard/ui/mainwindow.py:219
 msgid "&Add Files..."
-msgstr "&Adicionar Arquivos..."
+msgstr "&Adicionar arquivos..."
 
 #: ../picard/ui/mainwindow.py:220
 msgid "Add files to the tagger"
@@ -235,7 +1567,7 @@ msgstr "Ctrl+O"
 
 #: ../picard/ui/mainwindow.py:225
 msgid "A&dd Folder..."
-msgstr "A&dicionar Pasta..."
+msgstr "A&dicionar pasta..."
 
 #: ../picard/ui/mainwindow.py:226
 msgid "Add a folder to the tagger"
@@ -286,7 +1618,7 @@ msgstr "Remover os arquivos/álbuns selecionados"
 
 #: ../picard/ui/mainwindow.py:256
 msgid "File &Browser"
-msgstr "&Abrir Arquivo"
+msgstr "&Abrir arquivo"
 
 #: ../picard/ui/mainwindow.py:262
 msgid "&Cover Art"
@@ -294,13 +1626,14 @@ msgstr "&Capa"
 
 #: ../picard/ui/mainwindow.py:268
 msgid "Search"
-msgstr "Pesquisar"
+msgstr "Buscar"
 
 #: ../picard/ui/mainwindow.py:271
 msgid "&CD Lookup..."
 msgstr "&Procurar CD..."
 
-#: ../picard/ui/mainwindow.py:272 ../picard/ui/mainwindow.py:273
+#: ../picard/ui/mainwindow.py:272
+#: ../picard/ui/mainwindow.py:273
 msgid "Lookup CD"
 msgstr "Procurar CD"
 
@@ -331,9 +1664,10 @@ msgstr "Ctrl+U"
 msgid "&Lookup"
 msgstr "&Procurar"
 
-#: ../picard/ui/mainwindow.py:291 ../picard/ui/mainwindow.py:292
+#: ../picard/ui/mainwindow.py:291
+#: ../picard/ui/mainwindow.py:292
 msgid "Lookup metadata"
-msgstr "Procurar metadado"
+msgstr "Procurar metadados"
 
 #. Keyboard shortcut for "Lookup"
 #: ../picard/ui/mainwindow.py:295
@@ -344,33 +1678,29 @@ msgstr "Ctrl+L"
 msgid "&Details..."
 msgstr "&Detalhes..."
 
-#: ../picard/ui/mainwindow.py:302 ../picard/ui/filebrowser.py:38
-msgid "&Refresh"
-msgstr "Atuali&zar"
-
 #: ../picard/ui/mainwindow.py:305
 msgid "Generate &Playlist..."
-msgstr "Criar &Lista de Reprodução"
+msgstr "Criar &lista de reprodução"
 
 #: ../picard/ui/mainwindow.py:308
 msgid "&Rename Files"
-msgstr "&Renomear Arquivos"
+msgstr "&Renomear arquivos"
 
 #: ../picard/ui/mainwindow.py:313
 msgid "&Move Files"
-msgstr "&Mover Arquivos"
+msgstr "&Mover arquivos"
 
 #: ../picard/ui/mainwindow.py:318
 msgid "Save &Tags"
-msgstr "Salvar &Tags"
+msgstr "Salvar &tags"
 
 #: ../picard/ui/mainwindow.py:323
 msgid "Tags From &File Names..."
-msgstr "Marcar Tags com os Nomes dos &Arquivos..."
+msgstr "Marcar tags a partir dos nomes dos &arquivos..."
 
 #: ../picard/ui/mainwindow.py:326
 msgid "View &Log..."
-msgstr "Ver &Log..."
+msgstr "Ver &log..."
 
 #: ../picard/ui/mainwindow.py:349
 msgid "&File"
@@ -393,25 +1723,23 @@ msgid "&Tools"
 msgstr "&Ferramentas"
 
 #: ../picard/ui/mainwindow.py:384
+#: ../picard/ui/util.py:33
 msgid "&Help"
 msgstr "&Ajuda"
 
 #: ../picard/ui/mainwindow.py:404
 msgid "&Toolbar"
-msgstr "Barra de &Ferramentas"
+msgstr "Barra de &ferramentas"
 
 #: ../picard/ui/mainwindow.py:430
 msgid "&Search Bar"
-msgstr "Barra de &Pesquisa"
+msgstr "Barra de &pesquisa"
 
 #: ../picard/ui/mainwindow.py:435
+#: ../picard/util/tags.py:21
 msgid "Album"
 msgstr "Álbum"
 
-#: ../picard/ui/mainwindow.py:437 ../picard/ui/puidsubmit.py:31
-msgid "Track"
-msgstr "Faixa"
-
 #: ../picard/ui/mainwindow.py:476
 msgid "All Supported Formats"
 msgstr "Todos os formatos suportados"
@@ -426,238 +1754,23 @@ msgstr "Salvando a lista de reprodução %s..."
 msgid "Playlist %s saved"
 msgstr "Lista de reprodução %s salva"
 
-#: ../picard/ui/mainwindow.py:638 ../picard/ui/mainwindow.py:647
+#: ../picard/ui/mainwindow.py:638
+#: ../picard/ui/mainwindow.py:647
 #, python-format
 msgid " (Error: %s)"
 msgstr " (Erro: %s)"
 
-#: ../picard/ui/ui_edittagdialog.py:44
-msgid "Edit Tag"
-msgstr "Editar Etiqueta"
-
-#: ../picard/ui/ui_options_proxy.py:81
-msgid "Web Proxy"
-msgstr "Proxy Web"
-
-#: ../picard/ui/ui_options_proxy.py:84 ../picard/ui/ui_options_general.py:109
-msgid "Port:"
-msgstr "Porta:"
-
-#: ../picard/ui/ui_options_proxy.py:85 ../picard/ui/ui_options_general.py:110
-msgid "Server address:"
-msgstr "Endereço do servidor:"
-
-#: ../picard/ui/ui_tagsfromfilenames.py:56
-msgid "Convert File Names to Tags"
-msgstr "Converter Nomes de Arquivo para Etiquetas"
-
-#: ../picard/ui/ui_tagsfromfilenames.py:57
-msgid "Replace underscores with spaces"
-msgstr "Substituir _ (underscore) por espaços"
-
-#: ../picard/ui/ui_tagsfromfilenames.py:58
-#: ../picard/ui/ui_options_naming.py:180
-msgid "&Preview"
-msgstr "&Visualizar"
-
-#: ../picard/ui/ui_options_general.py:108
-msgid "MusicBrainz Server"
-msgstr "Servidor MusicBrainz"
-
-#: ../picard/ui/ui_options_general.py:111
-msgid "Account Information"
-msgstr "Informação de Conta"
-
-#: ../picard/ui/ui_options_general.py:114
-msgid "General"
-msgstr "Geral"
-
-#: ../picard/ui/ui_options_general.py:115
-msgid "Automatically scan all new files"
-msgstr "Analisar novos arquivos automaticamente"
-
-#: ../picard/ui/ui_options_interface.py:46
-msgid "Miscellaneous"
-msgstr "Diversos"
-
-#: ../picard/ui/ui_options_interface.py:47
-msgid "Show text labels under icons"
-msgstr "Mostrar nomes embaixo dos ícones"
-
-#: ../picard/ui/ui_options_interface.py:48
-msgid "Allow selection of multiple directories"
-msgstr "Permitir selecionar várias pastas"
-
-#: ../picard/ui/ui_options_interface.py:49
-msgid "Use advanced query syntax"
-msgstr "Usar sintaxe de consulta avançada"
-
-#: ../picard/ui/itemviews.py:327
-msgid "&Releases"
-msgstr "&Lançamentos"
-
-#: ../picard/ui/itemviews.py:353
-msgid "&Plugins"
-msgstr "&Plugins"
-
-#: ../picard/ui/itemviews.py:523
-msgid "Clusters"
-msgstr "Agrupados"
-
-#: ../picard/ui/ui_options_matching.py:105
-msgid "Thresholds"
-msgstr "Preferências"
-
-#: ../picard/ui/ui_options_matching.py:106
-msgid "Minimal similarity for matching files to tracks:"
-msgstr "Similaridade mínima para associar faixas e arquivos:"
-
-#: ../picard/ui/ui_options_matching.py:110
-msgid "Minimal similarity for file lookups:"
-msgstr "Similaridade mínima para pesquisas de arquivo:"
-
-#: ../picard/ui/ui_options_matching.py:111
-msgid "Minimal similarity for cluster lookups:"
-msgstr "Similaridade mínima para pesquisas de grupo:"
-
-#: ../picard/ui/ui_options_matching.py:112
-msgid "Minimal similarity for PUID lookups:"
-msgstr "Similaridade mínima para pesquisas de PUID:"
-
-#: ../picard/ui/ui_options_tags.py:105
-msgid "Common"
-msgstr "Comum"
-
-#: ../picard/ui/ui_options_tags.py:106
-msgid "Clear existing tags before writing new tags"
-msgstr "Limpar etiquetas existentes antes de escrever as novas"
-
-#: ../picard/ui/ui_options_tags.py:107
-msgid "Don't write tags to files"
-msgstr "Não escrever etiquetas em arquivos"
-
-#: ../picard/ui/ui_options_tags.py:108
-msgid "ID3"
-msgstr "ID3"
-
-#: ../picard/ui/ui_options_tags.py:109
-msgid "Write ID3v1 tags to the files"
-msgstr "Escrever etiquetas ID3v1 nos arquivos"
-
-#: ../picard/ui/ui_options_tags.py:110
-msgid "Write ID3v2 version 2.3 tags (2.4 is default)"
-msgstr "Escrever etiquetas ID3v2 versão 2.3 (2.4 é a padrão)"
-
-#: ../picard/ui/ui_options_tags.py:111
-msgid "Text encoding to use while writing ID3v2 tags:"
-msgstr "Codificação de texto a ser usada quando escrever etiquetas ID3v2:"
-
-#: ../picard/ui/ui_options_tags.py:112
-msgid "ISO-8859-1"
-msgstr "ISO-8859-1"
-
-#: ../picard/ui/ui_options_tags.py:113
-msgid "UTF-16"
-msgstr "UTF-16"
-
-#: ../picard/ui/ui_options_tags.py:114
-msgid "UTF-8"
-msgstr "UTF-8"
-
-#: ../picard/ui/ui_options_tags.py:115
-msgid "Remove ID3 tags from FLAC files"
-msgstr "Remover etiquetas ID3 de arquivos FLAC"
-
-#: ../picard/ui/ui_options_tags.py:116
-msgid "APE"
-msgstr "APE"
-
-#: ../picard/ui/ui_options_tags.py:117
-msgid "Remove APEv2 tags from MP3 files"
-msgstr "Remover etiquetas APEv2 de arquivos MP3"
-
-#: ../picard/ui/ui_options_cdlookup_win32.py:56 ../picard/ui/ui_cdlookup.py:60
-#: ../picard/ui/ui_options_cdlookup.py:47
-msgid "CD Lookup"
-msgstr "Procurar CD"
-
-#: ../picard/ui/ui_options_cdlookup_win32.py:57
-msgid "Default CD-ROM drive to use for lookups:"
-msgstr "Unidade de CD-ROM padrão a ser usada para buscas:"
-
-#: ../picard/ui/tageditor.py:65 ../picard/ui/ui_options_plugins.py:62
-#: ../picard/ui/multitageditor.py:37
-msgid "Details"
-msgstr "Detalhes"
-
-#: ../picard/ui/tageditor.py:70 ../picard/ui/tageditor.py:241
-#: ../picard/ui/multitageditor.py:42 ../picard/ui/multitageditor.py:197
-#, python-format
-msgid "%d file"
-msgid_plural "%d files"
-msgstr[0] "%d arquivo"
-msgstr[1] "%d arquivos"
-
-#: ../picard/ui/tageditor.py:124 ../picard/ui/multitageditor.py:95
-#, python-format
-msgid "(different across %d file)"
-msgid_plural "(different across %d files)"
-msgstr[0] "(diferença entre %d arquivo)"
-msgstr[1] "(diferença entre %d arquivos)"
-
-#: ../picard/ui/tageditor.py:127 ../picard/ui/multitageditor.py:98
-#, python-format
-msgid "(missing from %d file)"
-msgid_plural "(missing from %d files)"
-msgstr[0] "(ausente de %d arquivo)"
-msgstr[1] "(ausente de %d arquivos)"
-
-#: ../picard/ui/tageditor.py:210 ../picard/ui/multitageditor.py:166
-msgid "Filename:"
-msgstr "Nome do arquivo:"
-
-#: ../picard/ui/tageditor.py:212 ../picard/ui/multitageditor.py:168
-msgid "Format:"
-msgstr "Formato:"
-
-#: ../picard/ui/tageditor.py:221 ../picard/ui/multitageditor.py:177
-msgid "Size:"
-msgstr "Tamanho:"
-
-#: ../picard/ui/tageditor.py:227 ../picard/ui/multitageditor.py:183
-msgid "Bitrate:"
-msgstr "Taxa de Bits:"
-
-#: ../picard/ui/tageditor.py:229 ../picard/ui/multitageditor.py:185
-msgid "Sample rate:"
-msgstr "Taxa de amostragem:"
-
-#: ../picard/ui/tageditor.py:231 ../picard/ui/multitageditor.py:187
-msgid "Bits per sample:"
-msgstr "Bits por amostragem:"
-
-#: ../picard/ui/tageditor.py:234 ../picard/ui/multitageditor.py:190
-msgid "Mono"
-msgstr "Mono"
-
-#: ../picard/ui/tageditor.py:235 ../picard/ui/multitageditor.py:191
-msgid "Stereo"
-msgstr "Estéreo"
-
-#: ../picard/ui/tageditor.py:237 ../picard/ui/multitageditor.py:193
-msgid "Channels:"
-msgstr "Canais:"
-
-#: ../picard/ui/ui_tageditor.py:115 ../picard/ui/ui_multitageditor.py:55
-#: ../picard/ui/ui_options_plugins.py:59 ../picard/ui/options/plugins.py:76
+#: ../picard/ui/ui_tageditor.py:115
+#: ../picard/ui/ui_options_plugins.py:59
+#: ../picard/ui/options/plugins.py:76
 msgid "Name"
 msgstr "Nome"
 
-#: ../picard/ui/ui_tageditor.py:116 ../picard/ui/ui_multitageditor.py:56
+#: ../picard/ui/ui_tageditor.py:116
 msgid "Value"
 msgstr "Valor"
 
-#: ../picard/ui/ui_tageditor.py:117 ../picard/ui/ui_multitageditor.py:57
+#: ../picard/ui/ui_tageditor.py:117
 msgid "&Add..."
 msgstr "&Adicionar..."
 
@@ -681,66 +1794,100 @@ msgstr "&Capa"
 msgid "&Info"
 msgstr "&Informação"
 
-#: ../picard/ui/coverartbox.py:47
-msgid "Cover Art"
-msgstr "Capa"
+#: ../picard/ui/passworddialog.py:38
+#, python-format
+msgid "The server %s requires you to login. Please enter your username and password."
+msgstr "O servidor %s requer login. Por favor digite seu nome de usuário e senha."
 
-#: ../picard/ui/coverartbox.py:95
-msgid "Buy the album on Amazon"
-msgstr "Compre este álbum na Amazon"
-
-#: ../picard/ui/ui_puidsubmit.py:52
-msgid "Submit PUIDs"
-msgstr "Enviar PUIDs"
-
-#: ../picard/ui/ui_puidsubmit.py:53 ../picard/ui/ui_cdlookup.py:62
-msgid "OK"
-msgstr "OK"
-
-#: ../picard/ui/ui_puidsubmit.py:54 ../picard/ui/ui_cdlookup.py:64
-msgid "Cancel"
-msgstr "Cancelar"
-
-#: ../picard/ui/puidsubmit.py:31 ../picard/ui/options/plugins.py:80
-msgid "File"
-msgstr "Arquivo"
-
-#: ../picard/ui/puidsubmit.py:31
-msgid "PUID"
-msgstr "PUID"
-
-#: ../picard/ui/puidsubmit.py:31
-msgid "Release"
-msgstr "Álbum"
-
-#: ../picard/ui/puidsubmit.py:31
-msgid "Release ID"
-msgstr "ID do Álbum"
-
-#: ../picard/ui/filebrowser.py:41
-#, fuzzy
-msgid "&Move Tagged Files Here"
-msgstr "&Mover Arquivos"
-
-#: ../picard/ui/filebrowser.py:44
-msgid "Show &Hidden Files"
-msgstr ""
+#: ../picard/ui/ui_cdlookup.py:60
+#: ../picard/ui/ui_options_cdlookup.py:47
+#: ../picard/ui/ui_options_cdlookup_win32.py:56
+#: ../picard/ui/options/cdlookup.py:35
+msgid "CD Lookup"
+msgstr "Procurar CD"
 
 #: ../picard/ui/ui_cdlookup.py:61
 msgid "The following releases on MusicBrainz match the CD:"
 msgstr "Álbuns no MusicBrainz compatíveis com o CD:"
 
+#: ../picard/ui/ui_cdlookup.py:62
+#: ../picard/ui/ui_puidsubmit.py:53
+msgid "OK"
+msgstr "OK"
+
 #: ../picard/ui/ui_cdlookup.py:63
 msgid "    Lookup manually    "
 msgstr "    Procurar manualmente    "
 
+#: ../picard/ui/ui_cdlookup.py:64
+#: ../picard/ui/ui_puidsubmit.py:54
+msgid "Cancel"
+msgstr "Cancelar"
+
+#: ../picard/ui/ui_passworddialog.py:78
+#, fuzzy
+msgid "Authentication required"
+msgstr "Autenticação requerida"
+
+#: ../picard/ui/ui_passworddialog.py:79
+#: ../picard/ui/ui_options_general.py:113
+#: ../picard/ui/ui_options_proxy.py:83
+msgid "Username:"
+msgstr "Nome de usuário:"
+
+#: ../picard/ui/ui_passworddialog.py:80
+#: ../picard/ui/ui_options_general.py:112
+#: ../picard/ui/ui_options_proxy.py:82
+msgid "Password:"
+msgstr "Senha:"
+
+#: ../picard/ui/ui_passworddialog.py:81
+msgid "Save username and password"
+msgstr "Salvar nome de usuário e senha"
+
+#: ../picard/ui/ui_edittagdialog.py:44
+msgid "Edit Tag"
+msgstr "Editar tag"
+
+#: ../picard/ui/ui_metadata.py:121
+msgid "Lookup"
+msgstr "Procurar"
+
+#: ../picard/ui/ui_metadata.py:122
+msgid "Title:"
+msgstr "Título:"
+
+#: ../picard/ui/ui_metadata.py:123
+msgid "Date:"
+msgstr "Data:"
+
+#: ../picard/ui/ui_metadata.py:124
+msgid "Artist:"
+msgstr "Artista:"
+
+#: ../picard/ui/ui_metadata.py:125
+msgid "Track:"
+msgstr "Faixa:"
+
+#: ../picard/ui/ui_metadata.py:126
+msgid "0000-00-00; "
+msgstr "0000-00-00; "
+
+#: ../picard/ui/ui_metadata.py:128
+msgid "Album:"
+msgstr "Álbum:"
+
 #: ../picard/ui/ui_options.py:42
 msgid "Options"
 msgstr "Opções"
 
-#: ../picard/ui/tagsfromfilenames.py:52 ../picard/ui/tagsfromfilenames.py:96
-msgid "File Name"
-msgstr "Nome do Arquivo"
+#: ../picard/ui/ui_options_cdlookup.py:48
+msgid "CD-ROM device to use for lookups:"
+msgstr "Unidade de CD-ROM a ser usada para buscas:"
+
+#: ../picard/ui/ui_options_cdlookup_win32.py:57
+msgid "Default CD-ROM drive to use for lookups:"
+msgstr "Unidade de CD-ROM padrão a ser usada para buscas:"
 
 #: ../picard/ui/ui_options_cover.py:56
 msgid "Location"
@@ -748,7 +1895,7 @@ msgstr "Localização"
 
 #: ../picard/ui/ui_options_cover.py:57
 msgid "Embed cover images into tags"
-msgstr "Embutir imagens de capa nas etiquetas"
+msgstr "Embutir imagens de capa nas tags"
 
 #: ../picard/ui/ui_options_cover.py:58
 msgid "Save cover images as separate files"
@@ -758,73 +1905,79 @@ msgstr "Salvar imagens de capa em arquivos separados"
 msgid "Overwrite the file if it already exists"
 msgstr "Substituir o arquivo se já existir"
 
-#: ../picard/ui/ui_options_metadata.py:100
-msgid "Metadata"
-msgstr "Metadados"
+#: ../picard/ui/util.py:31
+msgid "&Ok"
+msgstr "&Ok"
 
-#: ../picard/ui/ui_options_metadata.py:101
-msgid "Translate foreign artist names to English where possible"
-msgstr ""
-"Utilizar traduções de nomes de artistas para inglês sempre que possível"
+#: ../picard/ui/util.py:32
+msgid "&Cancel"
+msgstr "&Cancelar"
 
-#: ../picard/ui/ui_options_metadata.py:102
-msgid "Use release relationships"
-msgstr "Usar relacionamentos de álbuns"
+#: ../picard/ui/ui_puidsubmit.py:52
+msgid "Submit PUIDs"
+msgstr "Enviar PUIDs"
 
-#: ../picard/ui/ui_options_metadata.py:103
-msgid "Use track relationships"
-msgstr "Usar relacionamentos da faixa"
+#: ../picard/ui/ui_options_folksonomy.py:114
+#: ../picard/ui/options/folksonomy.py:29
+msgid "Folksonomy Tags"
+msgstr "Etiquetas de folksonomia"
 
-#: ../picard/ui/ui_options_metadata.py:104
-msgid "Use folksonomy tags as genre"
-msgstr "Usar etiquetas dos usuários(folksonomia) como gênero"
+#: ../picard/ui/ui_options_folksonomy.py:115
+msgid "Ignore tags:"
+msgstr "Ignorar etiquetas:"
 
-#: ../picard/ui/ui_options_metadata.py:105
+#: ../picard/ui/ui_options_folksonomy.py:116
+msgid "Minimal tag usage:"
+msgstr "Uso mínimo de etiqueta:"
+
+#: ../picard/ui/ui_options_folksonomy.py:117
+#: ../picard/ui/ui_options_matching.py:107
+#: ../picard/ui/ui_options_matching.py:108
+#: ../picard/ui/ui_options_matching.py:109
+#: ../picard/ui/ui_options_matching.py:113
+msgid " %"
+msgstr " %"
+
+#: ../picard/ui/ui_options_folksonomy.py:118
+msgid "Maximum number of tags:"
+msgstr "Número máximo de etiquetas:"
+
+#: ../picard/ui/ui_options_folksonomy.py:119
+msgid "Join multiple tags with:"
+msgstr "Juntar várias etiquetas com:"
+
+#: ../picard/ui/ui_options_folksonomy.py:120
+msgid " / "
+msgstr " / "
+
+#: ../picard/ui/ui_options_folksonomy.py:121
+msgid ", "
+msgstr ", "
+
+#: ../picard/ui/ui_options_interface.py:50
+msgid "Miscellaneous"
+msgstr "Diversos"
+
+#: ../picard/ui/ui_options_interface.py:51
+msgid "Show text labels under icons"
+msgstr "Mostrar nomes embaixo dos ícones"
+
+#: ../picard/ui/ui_options_interface.py:52
+msgid "Allow selection of multiple directories"
+msgstr "Permitir a seleção de várias pastas"
+
+#: ../picard/ui/ui_options_interface.py:53
+msgid "Use advanced query syntax"
+msgstr "Usar sintaxe de consulta avançada"
+
+#: ../picard/ui/ui_options_interface.py:54
 #, fuzzy
-msgid "Preferred release country:"
-msgstr "País de Lançamento"
-
-#: ../picard/ui/ui_options_metadata.py:106
-msgid "Custom Fields"
-msgstr "Personalizar Campos"
-
-#: ../picard/ui/ui_options_metadata.py:107
-msgid "Various artists:"
-msgstr "Vários artistas:"
-
-#: ../picard/ui/ui_options_metadata.py:108
-msgid "Non-album tracks:"
-msgstr "Faixas sem álbum:"
-
-#: ../picard/ui/ui_options_metadata.py:109
-#: ../picard/ui/ui_options_metadata.py:110
-#: ../picard/ui/ui_options_naming.py:168 ../picard/ui/ui_options_naming.py:169
-msgid "Default"
-msgstr "Padrão"
-
-#: ../picard/ui/ui_multitageditor.py:58
-msgid "Delete"
-msgstr "Excluir"
-
-#: ../picard/ui/logview.py:29
-msgid "Log"
-msgstr "Arquivo"
-
-#: ../picard/ui/ui_options_plugins.py:58
-msgid "Plugins"
-msgstr "Plugins"
-
-#: ../picard/ui/ui_options_plugins.py:60 ../picard/ui/options/plugins.py:79
-msgid "Author"
-msgstr "Autor"
-
-#: ../picard/ui/ui_options_plugins.py:61
-msgid "Version"
-msgstr "Versão"
+msgid "User interface language:"
+msgstr "Interface de Usuário"
 
 #: ../picard/ui/ui_options_naming.py:165
 msgid "Rename Files"
-msgstr "Renomear Arquivos"
+msgstr "Renomear arquivos"
 
 #: ../picard/ui/ui_options_naming.py:166
 msgid "Replace Windows-incompatible characters"
@@ -832,23 +1985,32 @@ msgstr "Substituir caracteres incompatíveis com o Windows"
 
 #: ../picard/ui/ui_options_naming.py:167
 msgid "Replace non-ASCII characters"
-msgstr "Substituir caracteres não ASCII"
+msgstr "Substituir caracteres não-ASCII"
 
-#: ../picard/ui/ui_options_naming.py:170 ../picard/ui/options/naming.py:90
+#: ../picard/ui/ui_options_naming.py:168
+#: ../picard/ui/ui_options_naming.py:169
+#: ../picard/ui/ui_options_metadata.py:109
+#: ../picard/ui/ui_options_metadata.py:110
+msgid "Default"
+msgstr "Padrão"
+
+#: ../picard/ui/ui_options_naming.py:170
+#: ../picard/ui/options/naming.py:90
 msgid "Multiple artist file naming format:"
 msgstr "Formato para nomear vários artistas:"
 
-#: ../picard/ui/ui_options_naming.py:171 ../picard/ui/options/naming.py:86
+#: ../picard/ui/ui_options_naming.py:171
+#: ../picard/ui/options/naming.py:86
 msgid "File naming format:"
 msgstr "Formato para nomear arquivos:"
 
 #: ../picard/ui/ui_options_naming.py:172
 msgid "Move Files"
-msgstr "Mover Arquivos"
+msgstr "Mover arquivos"
 
 #: ../picard/ui/ui_options_naming.py:173
 msgid "Move tagged files to this directory:"
-msgstr "Mover arquivos para esta pasta ao escrever etiquetas:"
+msgstr "Mover arquivos para esta pasta ao escrever tags:"
 
 #: ../picard/ui/ui_options_naming.py:174
 msgid "Browse..."
@@ -874,39 +2036,192 @@ msgstr "Nome do arquivo:"
 msgid "Multiple artist file name:"
 msgstr "Nome do arquivo para vários artistas:"
 
-#: ../picard/ui/ui_options_cdlookup.py:48
-msgid "CD-ROM device to use for lookups:"
-msgstr "Unidade de CD-ROM a ser usada para buscas:"
+#: ../picard/ui/ui_options_naming.py:180
+#: ../picard/ui/ui_tagsfromfilenames.py:58
+msgid "&Preview"
+msgstr "&Visualizar"
 
-#: ../picard/ui/options/scripting.py:84 ../picard/ui/options/naming.py:86
-#: ../picard/ui/options/naming.py:90 ../picard/ui/options/naming.py:93
-#: ../picard/ui/options/naming.py:95
-msgid "Script Error"
-msgstr "Erro de Script"
+#: ../picard/ui/ui_options_general.py:108
+msgid "MusicBrainz Server"
+msgstr "Servidor MusicBrainz"
+
+#: ../picard/ui/ui_options_general.py:109
+#: ../picard/ui/ui_options_proxy.py:84
+msgid "Port:"
+msgstr "Porta:"
+
+#: ../picard/ui/ui_options_general.py:110
+#: ../picard/ui/ui_options_proxy.py:85
+msgid "Server address:"
+msgstr "Endereço do servidor:"
+
+#: ../picard/ui/ui_options_general.py:111
+msgid "Account Information"
+msgstr "Informações da conta"
+
+#: ../picard/ui/ui_options_general.py:114
+#: ../picard/ui/options/general.py:29
+msgid "General"
+msgstr "Geral"
+
+#: ../picard/ui/ui_options_general.py:115
+msgid "Automatically scan all new files"
+msgstr "Analisar novos arquivos automaticamente"
+
+#: ../picard/ui/ui_options_matching.py:105
+msgid "Thresholds"
+msgstr "Preferências"
+
+#: ../picard/ui/ui_options_matching.py:106
+msgid "Minimal similarity for matching files to tracks:"
+msgstr "Similaridade mínima para associar faixas e arquivos:"
+
+#: ../picard/ui/ui_options_matching.py:110
+msgid "Minimal similarity for file lookups:"
+msgstr "Similaridade mínima para pesquisas de arquivo:"
+
+#: ../picard/ui/ui_options_matching.py:111
+msgid "Minimal similarity for cluster lookups:"
+msgstr "Similaridade mínima para pesquisas de grupo:"
+
+#: ../picard/ui/ui_options_matching.py:112
+msgid "Minimal similarity for PUID lookups:"
+msgstr "Similaridade mínima para pesquisas de PUID:"
+
+#: ../picard/ui/ui_options_metadata.py:100
+#: ../picard/ui/options/metadata.py:31
+msgid "Metadata"
+msgstr "Metadados"
+
+#: ../picard/ui/ui_options_metadata.py:101
+msgid "Translate foreign artist names to English where possible"
+msgstr "Utilizar traduções de nomes de artistas para inglês sempre que possível"
+
+#: ../picard/ui/ui_options_metadata.py:102
+msgid "Use release relationships"
+msgstr "Usar relacionamentos de álbuns"
+
+#: ../picard/ui/ui_options_metadata.py:103
+msgid "Use track relationships"
+msgstr "Usar relacionamentos de faixa"
+
+#: ../picard/ui/ui_options_metadata.py:104
+msgid "Use folksonomy tags as genre"
+msgstr "Usar etiquetas de folksonomia (dos usuários) como gênero"
+
+#: ../picard/ui/ui_options_metadata.py:105
+msgid "Preferred release country:"
+msgstr "País de lançamento preferido:"
+
+#: ../picard/ui/ui_options_metadata.py:106
+msgid "Custom Fields"
+msgstr "Campos personalizados"
+
+#: ../picard/ui/ui_options_metadata.py:107
+msgid "Various artists:"
+msgstr "Vários artistas:"
+
+#: ../picard/ui/ui_options_metadata.py:108
+msgid "Non-album tracks:"
+msgstr "Faixas sem álbum:"
+
+#: ../picard/ui/ui_options_plugins.py:58
+#: ../picard/ui/options/plugins.py:30
+msgid "Plugins"
+msgstr "Plugins"
+
+#: ../picard/ui/ui_options_plugins.py:60
+#: ../picard/ui/options/plugins.py:79
+msgid "Author"
+msgstr "Autor"
+
+#: ../picard/ui/ui_options_plugins.py:61
+#: ../picard/util/tags.py:36
+msgid "Version"
+msgstr "Versão"
+
+#: ../picard/ui/ui_options_proxy.py:81
+#: ../picard/ui/options/proxy.py:28
+msgid "Web Proxy"
+msgstr "Proxy"
+
+#: ../picard/ui/ui_options_script.py:52
+msgid "Tagger Script"
+msgstr "Script de tags"
+
+#: ../picard/ui/ui_options_tags.py:105
+msgid "Common"
+msgstr "Comum"
+
+#: ../picard/ui/ui_options_tags.py:106
+msgid "Clear existing tags before writing new tags"
+msgstr "Limpar tags existentes antes de escrever as novas"
+
+#: ../picard/ui/ui_options_tags.py:107
+msgid "Don't write tags to files"
+msgstr "Não escrever tags em arquivos"
+
+#: ../picard/ui/ui_options_tags.py:108
+msgid "ID3"
+msgstr "ID3"
+
+#: ../picard/ui/ui_options_tags.py:109
+msgid "Write ID3v1 tags to the files"
+msgstr "Escrever tags ID3v1 nos arquivos"
+
+#: ../picard/ui/ui_options_tags.py:110
+msgid "Write ID3v2 version 2.3 tags (2.4 is default)"
+msgstr "Escrever tags ID3v2 versão 2.3 (2.4 é a padrão)"
+
+#: ../picard/ui/ui_options_tags.py:111
+msgid "Text encoding to use while writing ID3v2 tags:"
+msgstr "Codificação de texto a ser usada quando escrever tags ID3v2:"
+
+#: ../picard/ui/ui_options_tags.py:112
+msgid "ISO-8859-1"
+msgstr "ISO-8859-1"
+
+#: ../picard/ui/ui_options_tags.py:113
+msgid "UTF-16"
+msgstr "UTF-16"
+
+#: ../picard/ui/ui_options_tags.py:114
+msgid "UTF-8"
+msgstr "UTF-8"
+
+#: ../picard/ui/ui_options_tags.py:115
+msgid "Remove ID3 tags from FLAC files"
+msgstr "Remover tags ID3 de arquivos FLAC"
+
+#: ../picard/ui/ui_options_tags.py:116
+msgid "APE"
+msgstr "APE"
+
+#: ../picard/ui/ui_options_tags.py:117
+msgid "Remove APEv2 tags from MP3 files"
+msgstr "Remover tags APEv2 de arquivos MP3"
+
+#: ../picard/ui/ui_tagsfromfilenames.py:56
+msgid "Convert File Names to Tags"
+msgstr "Converter nomes de arquivo para tags"
+
+#: ../picard/ui/ui_tagsfromfilenames.py:57
+msgid "Replace underscores with spaces"
+msgstr "Substituir _ (underscore) por espaços"
+
+#: ../picard/ui/options/about.py:29
+msgid "About"
+msgstr "Sobre"
 
 #. Replace this with your name to have it appear in the "About" dialog.
 #: ../picard/ui/options/about.py:48
 msgid "translator-credits"
 msgstr ""
 "Launchpad Contributions:\n"
-"  for4saken <https://launchpad.net/~for4saken>\n"
-"\n"
-"Launchpad Contributions:\n"
 "  for4saken https://launchpad.net/~for4saken\n"
-"\n"
-"Launchpad Contributions:\n"
-"  for4saken https://launchpad.net/~for4saken\n"
-"\n"
-"Launchpad Contributions:\n"
 "  Diogo Gomes https://launchpad.net/~diogomes\n"
 "  Lukáš Lalinský https://launchpad.net/~luks\n"
-"  for4saken https://launchpad.net/~for4saken\n"
-"\n"
-"Launchpad Contributions:\n"
-"  Diogo Gomes https://launchpad.net/~diogomes\n"
-"  Lukáš Lalinský https://launchpad.net/~luks\n"
-"  Mario A. C. Silva (Exp4nsion) https://launchpad.net/~marioancelmo\n"
-"  for4saken https://launchpad.net/~for4saken"
+"  Mario A. C. Silva (Exp4nsion) https://launchpad.net/~marioancelmo"
 
 #. Replace LANG with language you are translatig to.
 #: ../picard/ui/options/about.py:51
@@ -917,52 +2232,315 @@ msgstr "<br/>Traduzido para PT-BR por %s"
 #: ../picard/ui/options/about.py:55
 #, fuzzy, python-format
 msgid ""
-"<p align=\"center\"><span style=\"font-size:15px;font-weight:bold;"
-"\">MusicBrainz Picard</span><br/>\n"
+"<p align=\"center\"><span style=\"font-size:15px;font-weight:bold;\">MusicBrainz Picard</span><br/>\n"
 "Version %(version)s</p>\n"
 "<p align=\"center\"><strong>Supported formats</strong><br/>%(formats)s</p>\n"
 "<p align=\"center\"><strong>Please donate</strong><br/>\n"
-"Thank you for using Picard. Picard relies on the MusicBrainz database, which "
-"is operated by the MetaBrainz Foundation with the help of thousands of "
-"volunteers. If you like this application please consider donating to the "
-"MetaBrainz Foundation to keep the service running.</p>\n"
-"<p align=\"center\"><a href=\"http://metabrainz.org/donate/index.html"
-"\">Donate now!</a></p>\n"
+"Thank you for using Picard. Picard relies on the MusicBrainz database, which is operated by the MetaBrainz Foundation with the help of thousands of volunteers. If you like this application please consider donating to the MetaBrainz Foundation to keep the service running.</p>\n"
+"<p align=\"center\"><a href=\"http://metabrainz.org/donate/index.html\">Donate now!</a></p>\n"
 "<p align=\"center\"><strong>Credits</strong><br/>\n"
-"<small>Copyright © 2004-2008 Robert Kaye, Lukáš Lalinský and others%"
-"(translator-credits)s</small></p>\n"
-"<p align=\"center\"><a href=\"http://musicbrainz.org/doc/PicardTagger"
-"\">http://musicbrainz.org/doc/PicardTagger</a></p>\n"
+"<small>Copyright © 2004-2008 Robert Kaye, Lukáš Lalinský and others%(translator-credits)s</small></p>\n"
+"<p align=\"center\"><a href=\"http://musicbrainz.org/doc/PicardTagger\">http://musicbrainz.org/doc/PicardTagger</a></p>\n"
 msgstr ""
-"<p align=\"center\"><span style=\"font-size:15px;font-weight:bold;"
-"\">MusicBrainz Picard</span><br/>\n"
-"Version %(version)s</p>\n"
-"<p align=\"center\"><strong>Formatos suportados:</strong> %(formats)s</p>\n"
-"<p align=\"center\"><small>Copyright © 2004-2007 Robert Kaye, Lukáš Lalinský "
-"e others%(translator-credits)s</small></p>\n"
-"<p align=\"center\"><a href=\"http://musicbrainz.org/doc/PicardTagger"
-"\">http://musicbrainz.org/doc/PicardTagger</a></p>\n"
+"<p align=\"center\"><span style=\"font-size:15px;font-weight:bold;\">MusicBrainz Picard</span><br/>\n"
+"Versão%(version)s</p>\n"
+"<p align=\"center\"><strong>Formatos suportados</strong><br/>%(formats)s</p>\n"
+"<p align=\"center\"><strong>Doe, por favor</strong><br/>\n"
+"Obrigado por utilizar o Picard. Picard depende da base de dados do MusicBrainz, que é operada pela MetaBrainz Foundation com a ajuda de milhares de voluntários. Se você gosta dessa aplicação considere fazer uma doação para a MetaBrainz Foundation para manter o serviço ativo.</p>\n"
+"<p align=\"center\"><a href=\"http://metabrainz.org/donate/index.html\">Doe agora!</a></p>\n"
+"<p align=\"center\"><strong>Créditos</strong><br/>\n"
+"<small>Copyright © 2004-2008 Robert Kaye, Lukáš Lalinský e outros%(translator-credits)s</small></p>\n"
+"<p align=\"center\"><a href=\"http://musicbrainz.org/doc/PicardTagger\">http://musicbrainz.org/doc/PicardTagger</a></p>\n"
+
+#: ../picard/ui/options/advanced.py:26
+msgid "Advanced"
+msgstr "Avançado"
+
+#: ../picard/ui/options/interface.py:31
+msgid "User Interface"
+msgstr "Interface de Usuário"
+
+#: ../picard/ui/options/interface.py:47
+msgid "System default"
+msgstr "Padrão do sistema"
+
+#: ../picard/ui/options/interface.py:71
+#, fuzzy
+msgid "Language changed"
+msgstr "Linguagem"
+
+#: ../picard/ui/options/interface.py:71
+msgid "You have changed the interface language. You have to restart Picard in order for the change to take effect."
+msgstr ""
+
+#: ../picard/ui/options/matching.py:29
+msgid "Matching"
+msgstr "Compatibilidade"
+
+#: ../picard/ui/options/metadata.py:52
+msgid "None"
+msgstr ""
+
+#: ../picard/ui/options/naming.py:33
+msgid "File Naming"
+msgstr "Nomear Arquivo"
+
+#: ../picard/ui/options/naming.py:86
+#: ../picard/ui/options/naming.py:90
+#: ../picard/ui/options/naming.py:93
+#: ../picard/ui/options/naming.py:95
+#: ../picard/ui/options/scripting.py:84
+msgid "Script Error"
+msgstr "Erro de script"
 
 #: ../picard/ui/options/naming.py:93
 msgid "The file naming format must not be empty."
-msgstr ""
+msgstr "O formato para nomear arquivos não pode estar vazio."
 
 #: ../picard/ui/options/naming.py:95
-#, fuzzy
 msgid "The multiple artist file naming format must not be empty."
-msgstr "Formato para nomear vários artistas:"
+msgstr "O formato para nomear vários artistas não pode estar vazio."
 
 #: ../picard/ui/options/naming.py:97
 msgid "Error"
-msgstr ""
+msgstr "Erro"
 
 #: ../picard/ui/options/naming.py:97
 msgid "The location to move files to must not be empty."
+msgstr "O local para mover os arquivos precisa ser escolhido."
+
+#: ../picard/ui/options/scripting.py:63
+msgid "Scripting"
+msgstr "Scripts"
+
+#: ../picard/ui/options/tags.py:29
+msgid "Tags"
+msgstr "Etiquetas"
+
+#: ../picard/util/tags.py:24
+msgid "Date"
+msgstr "Data"
+
+#: ../picard/util/tags.py:25
+msgid "Album Artist"
+msgstr "Artista do Álbum"
+
+#: ../picard/util/tags.py:26
+msgid "Track Number"
+msgstr "Número da Faixa"
+
+#: ../picard/util/tags.py:27
+msgid "Total Tracks"
+msgstr "Total de Faixas"
+
+#: ../picard/util/tags.py:28
+msgid "Disc Number"
+msgstr "Número do Disco"
+
+#: ../picard/util/tags.py:29
+msgid "Total Discs"
+msgstr "Total de Discos"
+
+#: ../picard/util/tags.py:30
+msgid "Album Artist Sort Order"
+msgstr "Modo de Ordenação do Artista do Álbum"
+
+#: ../picard/util/tags.py:31
+msgid "Artist Sort Order"
+msgstr "Modo de Ordenação do Artista"
+
+#: ../picard/util/tags.py:32
+msgid "Title Sort Order"
+msgstr "Modo de Ordenação do Título"
+
+#: ../picard/util/tags.py:33
+msgid "Album Sort Order"
+msgstr "Modo de Ordenação do Álbum"
+
+#: ../picard/util/tags.py:34
+msgid "ASIN"
+msgstr "ASIN"
+
+#: ../picard/util/tags.py:35
+msgid "Grouping"
+msgstr "Agrupando"
+
+#: ../picard/util/tags.py:37
+msgid "ISRC"
+msgstr "ISRC"
+
+#: ../picard/util/tags.py:38
+msgid "Mood"
+msgstr "Modo"
+
+#: ../picard/util/tags.py:39
+msgid "BPM"
+msgstr "BPM"
+
+#: ../picard/util/tags.py:40
+msgid "Copyright"
+msgstr "Direitos Autorais"
+
+#: ../picard/util/tags.py:41
+msgid "Composer"
+msgstr "Compositor"
+
+#: ../picard/util/tags.py:42
+msgid "Conductor"
+msgstr "Regente"
+
+#: ../picard/util/tags.py:43
+msgid "Lyricist"
+msgstr "Letrista"
+
+#: ../picard/util/tags.py:44
+msgid "Arranger"
+msgstr "Arranjador"
+
+#: ../picard/util/tags.py:45
+msgid "Producer"
+msgstr "Produtor"
+
+#: ../picard/util/tags.py:46
+msgid "Engineer"
+msgstr "Engenheiro"
+
+#: ../picard/util/tags.py:47
+msgid "Subtitle"
+msgstr "Subtítulo"
+
+#: ../picard/util/tags.py:48
+msgid "Disc Subtitle"
+msgstr "Subtitulo do Disco"
+
+#: ../picard/util/tags.py:49
+msgid "Remixer"
+msgstr "Mixagem"
+
+#: ../picard/util/tags.py:50
+msgid "MusicBrainz Track Id"
+msgstr "Id MusicBrainz da Faixa"
+
+#: ../picard/util/tags.py:51
+msgid "MusicBrainz Release Id"
+msgstr "Id MusicBrainz do Álbum"
+
+#: ../picard/util/tags.py:52
+msgid "MusicBrainz Artist Id"
+msgstr "Id MusicBrainz do Artista"
+
+#: ../picard/util/tags.py:53
+msgid "MusicBrainz Release Artist Id"
+msgstr "Id MusicBrainz do Artista"
+
+#: ../picard/util/tags.py:54
+msgid "MusicBrainz TRM Id"
+msgstr "Id MusicBrainz do TRM"
+
+#: ../picard/util/tags.py:55
+#, fuzzy
+msgid "MusicBrainz Disc Id"
+msgstr "Id MusicBrainz do Artista"
+
+#: ../picard/util/tags.py:56
+#, fuzzy
+msgid "MusicBrainz Sort Name"
+msgstr "Servidor MusicBrainz"
+
+#: ../picard/util/tags.py:57
+msgid "MusicIP PUID"
+msgstr "PUID MusicIP"
+
+#: ../picard/util/tags.py:58
+msgid "MusicIP Fingerprint"
+msgstr "MusicIP Fingerprint"
+
+#: ../picard/util/tags.py:59
+msgid "Disc Id"
 msgstr ""
 
+#: ../picard/util/tags.py:60
+msgid "Website"
+msgstr "Página"
+
+#: ../picard/util/tags.py:61
+msgid "Compilation"
+msgstr "Compilação"
+
+#: ../picard/util/tags.py:62
+msgid "Comment"
+msgstr "Comentários"
+
+#: ../picard/util/tags.py:63
+msgid "Genre"
+msgstr "Gênero"
+
+#: ../picard/util/tags.py:64
+msgid "Encoded By"
+msgstr "Codificado por"
+
+#: ../picard/util/tags.py:65
+msgid "Performer"
+msgstr "Intérprete"
+
+#: ../picard/util/tags.py:66
+msgid "Release Type"
+msgstr "Tipo de Lançamento"
+
+#: ../picard/util/tags.py:67
+msgid "Release Status"
+msgstr "Estado do Lançamento"
+
+#: ../picard/util/tags.py:68
+#, fuzzy
+msgid "Release Country"
+msgstr "Tipo de Lançamento"
+
+#: ../picard/util/tags.py:69
+msgid "Record Label"
+msgstr "Gravadora"
+
+#: ../picard/util/tags.py:70
+msgid "Barcode"
+msgstr "Código de barras"
+
+#: ../picard/util/tags.py:71
+msgid "Catalog Number"
+msgstr "Número de Catálogo"
+
+#: ../picard/util/tags.py:72
+#, fuzzy
+msgid "Format"
+msgstr "Formato:"
+
+#: ../picard/util/tags.py:73
+msgid "DJ-Mixer"
+msgstr "DJ-Mixer"
+
+#: ../picard/util/tags.py:74
+msgid "Media"
+msgstr "Mídia"
+
+#: ../picard/util/tags.py:75
+msgid "Lyrics"
+msgstr "Letras"
+
+#: ../picard/util/tags.py:76
+msgid "Mixer"
+msgstr "Mixer"
+
+#: ../picard/util/tags.py:77
+msgid "Language"
+msgstr "Linguagem"
+
+#: ../picard/util/tags.py:78
+#, fuzzy
+msgid "Script"
+msgstr "Scripts"
+
 #: ../picard/util/webbrowser2.py:84
 msgid "Web Browser Error"
-msgstr "Erro no Navegador Web"
+msgstr "Erro no navegador web"
 
 #: ../picard/util/webbrowser2.py:84
 #, python-format
@@ -975,284 +2553,66 @@ msgstr ""
 "\n"
 "%s"
 
-#~ msgid "No matching tracks for file %s"
-#~ msgstr "Nenhuma faixa identificada para o arquivo %s"
-
-#~ msgid "File %s identified!"
-#~ msgstr "Arquivo %s identificado!"
-
-#~ msgid "Looking up the PUID for file %s..."
-#~ msgstr "Procurando o PUID do arquivo %s..."
-
-#~ msgid "Looking up the metadata for file %s..."
-#~ msgstr "Procurando por metadados no arquivo %s..."
-
-#~ msgid "No matching releases for cluster %s"
-#~ msgstr "Nenhum álbum encontrado para o grupo %s"
-
-#~ msgid "Cluster %s identified!"
-#~ msgstr "Grupo %s encontrado!"
-
-#~ msgid "Looking up the metadata for cluster %s..."
-#~ msgstr "Procurando por metadados no grupo %s..."
-
-#~ msgid "M3U Playlist (*.m3u)"
-#~ msgstr "Lista de reprodução M3U (*.m3u)"
-
-#~ msgid "PLS Playlist (*.pls)"
-#~ msgstr "Lista de reprodução PLS (*.pls)"
-
-#~ msgid "XSPF Playlist (*.xspf)"
-#~ msgstr "Lista de reprodução XSPF (*.xspf)"
-
-#~ msgid "Submitting PUIDs..."
-#~ msgstr "Enviando PUIDs..."
-
-#~ msgid "PUIDs submission failed: %s"
-#~ msgstr "Falha ao enviar PUIDs: %s"
-
-#~ msgid "PUIDs successfully submitted!"
-#~ msgstr "PUIDs enviados com sucesso!"
-
 #~ msgid "New Version"
 #~ msgstr "Nova Versão"
-
 #~ msgid ""
 #~ "New version of Picard is available (%s). Would you like to download it "
 #~ "now?"
 #~ msgstr "Nova versão do Picard disponível (%s). Gostaria de baixar agora?"
+#~ msgid "Delete"
+#~ msgstr "Excluir"
+#~ msgid "Maximal number of tags:"
+#~ msgstr "Número máximo de etiquetas:"
 
-#~ msgid "Couldn't find PUID for file %s"
-#~ msgstr "Não foi possível encontrar um PUID para o arquivo %s"
-
-#~ msgid "Looking up the fingerprint for file %s..."
-#~ msgstr "Procurando pela fingerprint do arquivo %s..."
-
-#~ msgid "Creating fingerprint for file %s..."
-#~ msgstr "Criando uma fingerprint para o arquivo %s..."
-
-#~ msgid "Length"
-#~ msgstr "Duração"
-
-#~ msgid "&Ok"
-#~ msgstr "&Ok"
-
-#~ msgid "&Cancel"
-#~ msgstr "&Cancelar"
-
-#~ msgid "About"
-#~ msgstr "Sobre"
-
-#~ msgid "Advanced"
-#~ msgstr "Avançado"
-
-#~ msgid "Matching"
-#~ msgstr "Compatibilidade"
-
-#~ msgid "File Naming"
-#~ msgstr "Nomear Arquivo"
-
-#~ msgid "Scripting"
-#~ msgstr "Scripts"
-
-#~ msgid "Tags"
-#~ msgstr "Etiquetas"
-
-#~ msgid "User Interface"
-#~ msgstr "Interface de Usuário"
-
-#~ msgid "Date"
-#~ msgstr "Data"
-
-#~ msgid "Album Artist"
-#~ msgstr "Artista do Álbum"
-
-#~ msgid "Track Number"
-#~ msgstr "Número da Faixa"
-
-#~ msgid "Total Tracks"
-#~ msgstr "Total de Faixas"
-
-#~ msgid "Disc Number"
-#~ msgstr "Número do Disco"
-
-#~ msgid "Total Discs"
-#~ msgstr "Total de Discos"
-
-#~ msgid "Album Artist Sort Order"
-#~ msgstr "Modo de Ordenação do Artista do Álbum"
-
-#~ msgid "Artist Sort Order"
-#~ msgstr "Modo de Ordenação do Artista"
-
-#~ msgid "Title Sort Order"
-#~ msgstr "Modo de Ordenação do Título"
-
-#~ msgid "Album Sort Order"
-#~ msgstr "Modo de Ordenação do Álbum"
-
-#~ msgid "ASIN"
-#~ msgstr "ASIN"
-
-#~ msgid "Grouping"
-#~ msgstr "Agrupando"
-
-#~ msgid "ISRC"
-#~ msgstr "ISRC"
-
-#~ msgid "Mood"
-#~ msgstr "Modo"
-
-#~ msgid "BPM"
-#~ msgstr "BPM"
-
-#~ msgid "Copyright"
-#~ msgstr "Direitos Autorais"
-
-#~ msgid "Composer"
-#~ msgstr "Compositor"
-
-#~ msgid "Conductor"
-#~ msgstr "Regente"
-
-#~ msgid "Lyricist"
-#~ msgstr "Letrista"
-
-#~ msgid "Arranger"
-#~ msgstr "Arranjador"
-
-#~ msgid "Producer"
-#~ msgstr "Produtor"
-
-#~ msgid "Engineer"
-#~ msgstr "Engenheiro"
-
-#~ msgid "Subtitle"
-#~ msgstr "Subtítulo"
-
-#~ msgid "Disc Subtitle"
-#~ msgstr "Subtitulo do Disco"
-
-#~ msgid "Remixer"
-#~ msgstr "Mixagem"
-
-#~ msgid "MusicBrainz Track Id"
-#~ msgstr "Id MusicBrainz da Faixa"
-
-#~ msgid "MusicBrainz Release Id"
-#~ msgstr "Id MusicBrainz do Álbum"
-
-#~ msgid "MusicBrainz Artist Id"
-#~ msgstr "Id MusicBrainz do Artista"
-
-#~ msgid "MusicBrainz Release Artist Id"
-#~ msgstr "Id MusicBrainz do Artista"
-
-#~ msgid "MusicBrainz TRM Id"
-#~ msgstr "Id MusicBrainz do TRM"
-
-#~ msgid "MusicIP PUID"
-#~ msgstr "PUID MusicIP"
-
-#~ msgid "MusicIP Fingerprint"
-#~ msgstr "MusicIP Fingerprint"
-
-#~ msgid "Website"
-#~ msgstr "Página"
-
-#~ msgid "Compilation"
-#~ msgstr "Compilação"
-
-#~ msgid "Comment"
-#~ msgstr "Comentários"
-
-#~ msgid "Genre"
-#~ msgstr "Gênero"
-
-#~ msgid "Encoded By"
-#~ msgstr "Codificado por"
-
-#~ msgid "Performer"
-#~ msgstr "Intérprete"
-
-#~ msgid "Release Type"
-#~ msgstr "Tipo de Lançamento"
-
-#~ msgid "Release Status"
-#~ msgstr "Estado do Lançamento"
-
-#~ msgid "Record Label"
-#~ msgstr "Gravadora"
-
-#~ msgid "Barcode"
-#~ msgstr "Código de barras"
-
-#~ msgid "Catalog Number"
-#~ msgstr "Número de Catálogo"
-
-#~ msgid "DJ-Mixer"
-#~ msgstr "DJ-Mixer"
-
-#~ msgid "Media"
-#~ msgstr "Mídia"
-
-#~ msgid "Lyrics"
-#~ msgstr "Letras"
-
-#~ msgid "Mixer"
-#~ msgstr "Mixer"
+#, fuzzy
+#~ msgid "Anal&yze"
+#~ msgstr "Analisar"
 
+#, fuzzy
+#~ msgid "Generate &Cuesheet..."
+#~ msgstr "Criar &lista de reprodução"
 #~ msgid "Automatically analyze all new files"
 #~ msgstr "Analisar novos arquivos automaticamente"
 
+#, fuzzy
+#~ msgid "Album artist:"
+#~ msgstr "Artista do Álbum"
+
+#, fuzzy
+#~ msgid "A&dd Directory..."
+#~ msgstr "Adicionar &Pasta...\tCtrl+D"
 #~ msgid "Are You Sure?"
 #~ msgstr "Tem certeza?"
-
 #~ msgid "Add &Files...\tCtrl+O"
 #~ msgstr "Adicio&nar Arquivos...\tCtrl+O"
-
 #~ msgid "Add &Directory...\tCtrl+D"
 #~ msgstr "Adicionar &Pasta...\tCtrl+D"
-
 #~ msgid "&Save Files\tCtrl+S"
 #~ msgstr "&Salvar Arquivos\tCtrl+S"
-
 #~ msgid "C&opy\tCtrl+C"
 #~ msgstr "&Copiar\tCtrl+C"
-
 #~ msgid "Help"
 #~ msgstr "Ajuda"
-
 #~ msgid "Preferences"
 #~ msgstr "Preferências"
-
 #~ msgid "Error while saving cuesheet %s."
 #~ msgstr "Erro ao salvar a cuesheet %s."
-
 #~ msgid "Cuesheet %s saved."
 #~ msgstr "A cuesheet %s foi salvada."
-
 #~ msgid "Time"
 #~ msgstr "Tempo"
-
 #~ msgid "Albums"
 #~ msgstr "Álbuns"
-
 #~ msgid "Force Save"
 #~ msgstr "Forçar Gravação"
-
 #~ msgid "Buy"
 #~ msgstr "Comprar"
-
 #~ msgid "Welcome to Picard!"
 #~ msgstr "Bem-vindo ao Picard!"
-
 #~ msgid "Track Num"
 #~ msgstr "Número da faixa"
-
 #~ msgid "PUID Collision"
 #~ msgstr "Colisão de PUID"
-
 #~ msgid ""
 #~ "Version %s\n"
 #~ "\n"
@@ -1279,121 +2639,84 @@ msgstr ""
 #~ "uma concessão da Helix Community.\n"
 #~ "\n"
 #~ "Formatos suportados: %s"
-
-#~ msgid "Colors"
-#~ msgstr "Cores"
-
 #~ msgid "Font color"
 #~ msgstr "Cor da fonte"
-
 #~ msgid "Directories"
 #~ msgstr "Pastas"
-
 #~ msgid "Watch for new files"
 #~ msgstr "Monitorar pastas por novos arquivos"
-
 #~ msgid "Watch this directory for new audio files"
 #~ msgstr "Monitorar esta pasta por novos arquivos de áudio"
-
 #~ msgid "Encodings"
 #~ msgstr "Codificações"
-
 #~ msgid "all languages"
 #~ msgstr "todos os idiomas"
-
 #~ msgid "percent similar."
 #~ msgstr "por cento similares."
-
 #~ msgid "Load recently used albums on startup"
 #~ msgstr "Carregar álbuns usados recentemente no lançamento"
-
-#~ msgid "Language"
-#~ msgstr "Linguagem"
-
-#~ msgid "System default"
-#~ msgstr "Padrão do sistema"
-
 #~ msgid "Allowed filename characters"
 #~ msgstr "Caracteres permitidos"
-
 #~ msgid "Use Windows-safe file names"
 #~ msgstr "Use nomes de arquivos seguros para Windows"
-
 #~ msgid "Number of tracks on the album"
 #~ msgstr "Número de faixas no álbum"
-
 #~ msgid "Track name"
 #~ msgstr "Nome da faixa"
-
 #~ msgid "Zero padded track number"
 #~ msgstr "Número da faixa precedido por um zero"
-
 #~ msgid "File format (e.g. mp3, ogg, wav)"
 #~ msgstr "Formato do arquivo (ex. mp3, ogg, wav)"
-
 #~ msgid "Album type (album, single, EP, etc.)"
 #~ msgstr "Tipo do álbum (álbum, single, EP, etc.)"
-
 #~ msgid "Album Status (official, promo, etc.)"
 #~ msgstr "Estado do álbum (oficial, promocional, etc.)"
-
 #~ msgid "Album release month"
 #~ msgstr "Mês de lançamento do álbum"
-
 #~ msgid "Album release day"
 #~ msgstr "Dia de lançamento do álbum"
-
 #~ msgid "Album release year"
 #~ msgstr "Ano de lançamento do álbum"
-
 #~ msgid "Make it so!"
 #~ msgstr "Faça!"
-
 #~ msgid "Use proxy server to access the Internet"
 #~ msgstr "Utilizar um servidor proxy para acessar à Internet"
-
 #~ msgid "Proxy server to use"
 #~ msgstr "Servidor proxy a ser usado"
-
 #~ msgid "Proxy port"
 #~ msgstr "Porta proxy"
-
 #~ msgid "ID3v2.4 only"
 #~ msgstr "Somente ID3v2.4"
-
 #~ msgid "Save track/album"
 #~ msgstr "Salvar faixa/álbum"
-
 #~ msgid "Artists"
 #~ msgstr "Artistas"
 
+#, fuzzy
+#~ msgid "Auto Tag"
+#~ msgstr "Editar tag"
+
+#, fuzzy
+#~ msgid "Edit &Tags..."
+#~ msgstr "Editar tag"
 #~ msgid "New files (drag files to tag here)"
 #~ msgstr "Novos arquivos (arrastar arquivos para identificação aqui)"
-
 #~ msgid "updating album information"
 #~ msgstr "atualizando informação do álbum"
-
 #~ msgid "Submitting PUID information to MusicBrainz server ..."
 #~ msgstr "Enviando informação PUID ao servidor MusicBrainz ..."
-
 #~ msgid "Performing a PUID lookup on file %s ..."
 #~ msgstr "Efetuando procura de PUIDs para o arquivo %s ..."
-
 #~ msgid "Are you sure you want to exit the application?"
 #~ msgstr "Tem certeza que quer sair da aplicação?"
-
 #~ msgid "CD Lookup error -- is there a CD in the CD-ROM drive?"
 #~ msgstr "Erro ao procurar CD -- há CD na unidade CD-ROM?"
-
 #~ msgid "CD Lookup Failed"
 #~ msgstr "Falhou Procura de CD"
-
 #~ msgid "&Quick Start Guide"
 #~ msgstr "&Guia de Início Rápido"
-
 #~ msgid "Quick Start Guide"
 #~ msgstr "Guia de início rápido"
-
 #~ msgid ""
 #~ "You have not specified an username and password. In order to contribute "
 #~ "data to MusicBrainz, you must have a MusicBrainz account.\n"
@@ -1406,26 +2729,20 @@ msgstr ""
 #~ "Você quer criar uma nova conta agora? Se você já tiver uma conta do "
 #~ "MusicBrainz, por favor entre com suas informações de usuário nas opções "
 #~ "da aplicação. "
-
 #~ msgid "Couldn't connect to the MusicBrainz server."
 #~ msgstr "Não foi possível conectar ao servidor do MusicBrainz."
-
 #~ msgid "Connection error"
 #~ msgstr "Erro de conexão."
-
 #~ msgid ""
 #~ "MusicBrainz Picard requires wxPython with UNICODE support.\n"
 #~ "Please download the appropriate toolkit from http://www.wxpython.org/"
 #~ msgstr ""
 #~ "MusicBrainz Picard requer wxPython com suporte a UNICODE.\n"
 #~ "Por favor baixe a solução apropriada de http://www.wxpython.org/"
-
 #~ msgid "PUID collision on file %s!"
 #~ msgstr "Colisão de PUID no arquivo %s!"
-
 #~ msgid "Save error"
 #~ msgstr "Erro de gravação"
-
 #~ msgid ""
 #~ "The move files option is enabled, but the destination directory is not "
 #~ "specified or invalid.\n"
@@ -1436,7 +2753,6 @@ msgstr ""
 #~ "especificada ou é inválida.\n"
 #~ "Por favor corrija a opção de mover arquivos ou a pasta de destino e tente "
 #~ "novamente."
-
 #~ msgid ""
 #~ "Not all files could be saved. Please check for and examine tracks that "
 #~ "have an error icon in front of them. To retry saving the track, right "
@@ -1445,157 +2761,71 @@ msgstr ""
 #~ "Alguns arquivos não puderam ser salvos. Por favor procure e analise "
 #~ "faixas com um ícone de erro na frente delas. Para voltar a tentar salvar "
 #~ "a faixa, clique com o botão direito e selecione 'Limpar Erro'"
-
 #~ msgid "Select directory that contains music files"
 #~ msgstr "Selecione pasta que contêm arquivos de música"
-
 #~ msgid "Reload album from main server"
 #~ msgstr "Recarregar álbum do servidor principal"
-
 #~ msgid "Select or drag a folder from below"
 #~ msgstr "Selecione ou arraste uma pasta abaixo"
-
 #~ msgid "Drag files from below"
 #~ msgstr "Arraste arquivos abaixo"
-
 #~ msgid "Release date"
 #~ msgstr "Data de lançamento"
-
 #~ msgid "%d%% similar"
 #~ msgstr "%d%% similar"
-
 #~ msgid "Please donate to MusicBrainz!"
 #~ msgstr "Por favor faça um donativo ao MusicBrainz!"
-
-#~ msgid "Later"
-#~ msgstr "Mais tarde"
-
 #~ msgid ""
 #~ "The destination directory %s does not exist. Please pick a valid "
 #~ "directory."
 #~ msgstr ""
 #~ "A pasta de destino %s não existe. Por favor escolha uma pasta válida."
-
 #~ msgid "Select the encoding to use when reading and writing filenames"
 #~ msgstr ""
 #~ "Selecione a codificação a ser usada ao ler e escrever nomes de arquivos"
-
 #~ msgid "Automatically move clusters to albums that are at least"
 #~ msgstr ""
 #~ "Automaticamente mover faixas agregadas para álbuns que sejam pelo menos"
-
 #~ msgid "Automatically save recognized tracks that are at least"
 #~ msgstr "Automaticamente salvar faixar reconhecidas que sejam pelo menos"
-
-#~ msgid "Czech"
-#~ msgstr "Tcheco"
-
-#~ msgid "German"
-#~ msgstr "Alemão"
-
-#~ msgid "English"
-#~ msgstr "Inglês"
-
-#~ msgid "English (UK)"
-#~ msgstr "Inglês Britânico"
-
-#~ msgid "Spanish"
-#~ msgstr "Espanhol"
-
-#~ msgid "Finnish"
-#~ msgstr "Finlandês"
-
-#~ msgid "French"
-#~ msgstr "Francês"
-
-#~ msgid "Hungarian"
-#~ msgstr "Húngaro"
-
-#~ msgid "Icelandic"
-#~ msgstr "Islandês"
-
-#~ msgid "Italian"
-#~ msgstr "Italiano"
-
-#~ msgid "Korean"
-#~ msgstr "Coreano"
-
-#~ msgid "Lithuanian"
-#~ msgstr "Lituano"
-
-#~ msgid "Dutch"
-#~ msgstr "Holandês"
-
-#~ msgid "Norwegian Bokmal"
-#~ msgstr "Norueguês (Bokmal)"
-
-#~ msgid "Portuguese"
-#~ msgstr "Português"
-
-#~ msgid "Romanian"
-#~ msgstr "Romeno"
-
-#~ msgid "Russian"
-#~ msgstr "Russo"
-
-#~ msgid "Slovak"
-#~ msgstr "Eslovaco"
-
-#~ msgid "Swedish"
-#~ msgstr "Sueco"
-
 #~ msgid ""
 #~ "Note: This setting will take effect after you restart the application."
 #~ msgstr ""
 #~ "Nota: Esta configuração só terá efeito após o reinício da aplicação."
-
 #~ msgid "Artist translation"
 #~ msgstr "Tradução de nomes de artistas"
-
 #~ msgid "Rename files when writing metadata tags"
 #~ msgstr "Renomear arquivos ao escrever as etiquetas de metadados"
-
 #~ msgid "Naming Help"
 #~ msgstr "Ajuda com a nomeação"
-
 #~ msgid ""
 #~ "You may use the following variables in the filenaming\n"
 #~ "specifications in the options dialog:"
 #~ msgstr ""
 #~ "Você pode usar as seguintes variáveis nas especificações\n"
 #~ "de nomeação de arquivos no diálogo de opções:"
-
 #~ msgid "A %s in the naming specification will create a new subfolder."
 #~ msgstr "Um %s na especificação de nomeação criará uma nova sub-pasta"
-
 #~ msgid "Audio fingerprinting options"
 #~ msgstr "Opções da identificação digital de áudio"
-
 #~ msgid "Automatically select PUID collision tracks that are at least"
 #~ msgstr ""
 #~ "Selecionar automaticamente faixas com uma colisão PUID que sejam pelo "
 #~ "menos"
-
 #~ msgid "Write ID3v1 tags to MP3 files (ID3v2 tags will always be written)"
 #~ msgstr ""
 #~ "Escrever etiquetas ID3v1 nos arquivos MP3 (etiquetas ID3v2 sempre serão "
 #~ "escritas)"
-
 #~ msgid "Remove track/album"
 #~ msgstr "Remover faixa/álbum"
-
 #~ msgid "Listen to track"
 #~ msgstr "Ouvir a faixa"
-
 #~ msgid "Album clusters"
 #~ msgstr "Álbuns agrupados"
-
 #~ msgid "Unmatched files for this album"
 #~ msgstr "Arquivos não identificados para este álbum"
-
 #~ msgid "%d of %d tracks linked"
 #~ msgstr "%d de %d faixas ligadas"
-
 #~ msgid ""
 #~ "The Picard Tagger is a free application and you may\n"
 #~ "use it as long as you wish. However, providing\n"
@@ -1614,66 +2844,48 @@ msgstr ""
 #~ "que gerencia o projecto MusicBrainz. Todos os donativos são\n"
 #~ "dedutíveis em impostos para residentes dos Estados Unidos\n"
 #~ "e irão garantir o funcionamento e a evolução deste serviço."
-
 #~ msgid "Matched track highlighting"
 #~ msgstr "Cor para faixas identificadas"
-
 #~ msgid "Good match background color"
 #~ msgstr "Cor de fundo para faixas de alta combinação"
-
 #~ msgid "Bad match background color"
 #~ msgstr "Cor de fundo para faixas de baixa combinação"
-
 #~ msgid "Move files option"
 #~ msgstr "Opção mover arquivos"
-
 #~ msgid "When matching tracks to albums, accept tracks that are at least"
 #~ msgstr ""
 #~ "Quando combinando faixas a álbuns, aceitar faixas que sejam pelo menos"
-
 #~ msgid "CD-ROM drive path to use for lookups"
 #~ msgstr "Caminho para a unidade de CD-ROM a ser usada para buscas"
-
 #~ msgid "Launch MB Tagger automatically for inserted Audio CDs"
 #~ msgstr "Lançar o MB Tagger automaticamente ao inserir CDs de áudio"
-
 #~ msgid ""
 #~ "Failed to set the proper registy values to enable launching the tagger "
 #~ "after CD insertion. "
 #~ msgstr ""
 #~ "O registro dos valores apropriados que habilitariam o lançamento "
 #~ "automático do tagger ao se inserir um CD falhou. "
-
 #~ msgid "Default CD setting failed"
 #~ msgstr "A configuração padrão do CD falhou"
-
 #~ msgid "File format naming specification"
 #~ msgstr "Especificação do formato de nomeação de arquivo"
-
 #~ msgid "Various artist file format naming specification"
 #~ msgstr ""
 #~ "Especificação do formato de nomeação de arquivo para Vários artistas"
-
 #~ msgid "Note: Leave blank to allow all possible characters"
 #~ msgstr "Nota: Deixe em branco para permitir todos os caracteres possíveis"
-
 #~ msgid "Track artist name"
 #~ msgstr "Nome do artista da faixa"
-
 #~ msgid "Track artist sortname"
 #~ msgstr "Nome de ordenação do artista da faixa"
-
 #~ msgid "The first character of the artist sortname"
 #~ msgstr "O primeiro caracter do nome de ordenação do artista"
-
 #~ msgid "The first two characters of the artist sortname"
 #~ msgstr "Os dois primeiros caracteres do nome de ordenação do artista"
-
 #~ msgid "The first three characters of the artist sortname"
 #~ msgstr "Os três primeiros caracteres do nome de ordenação do artista"
-
 #~ msgid "Naming specification help"
 #~ msgstr "Ajuda com especificação de nomeação de arquivos"
-
 #~ msgid "Accept PUID matches that are at least"
 #~ msgstr "Aceitar combinações dos PUIDs que sejam pelo menos"
+
diff --git a/po/ro.po b/po/ro.po
index 3e956b70f..c6b0591ce 100644
--- a/po/ro.po
+++ b/po/ro.po
@@ -6,289 +6,1628 @@ msgid ""
 msgstr ""
 "Project-Id-Version: picard\n"
 "Report-Msgid-Bugs-To: http://bugs.musicbrainz.org/\n"
-"POT-Creation-Date: 2008-12-01 18:20+0100\n"
-"PO-Revision-Date: 2008-07-27 21:53+0000\n"
-"Last-Translator: Lukáš Lalinský <lalinsky@gmail.com>\n"
+"POT-Creation-Date: 2009-01-25 12:23+0100\n"
+"PO-Revision-Date: 2009-01-25 13:33+0100\n"
+"Last-Translator: Philipp Wolfer <phw@rubyforge.org>\n"
 "Language-Team: Romanian <ro@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=3; plural=(n == 1 ? 0: (((n % 100 > 19) || ((n % 100 "
-"== 0) && (n != 0))) ? 2: 1));\n"
-"X-Launchpad-Export-Date: 2008-12-01 17:02+0000\n"
+"Plural-Forms: nplurals=3; plural=(n == 1 ? 0: (((n % 100 > 19) || ((n % 100 == 0) && (n != 0))) ? 2: 1));\n"
+"X-Launchpad-Export-Date: 2009-01-24 23:28+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 "100 > 19) || ((n % 100 == 0) && (n != 0))) ? 2: 1))\n"
 
-#: ../picard/album.py:108 ../picard/cluster.py:248
+#: ../picard/album.py:108
+#: ../picard/cluster.py:248
 msgid "Unmatched Files"
-msgstr ""
+msgstr "Fișiere neașezate"
 
-#: ../picard/album.py:269
+#: ../picard/album.py:281
 #, python-format
 msgid "[couldn't load album %s]"
-msgstr ""
+msgstr "[nu pot încărca albumul %s]"
 
-#: ../picard/album.py:305
+#: ../picard/album.py:317
 msgid "[loading album information]"
+msgstr "[se încarcă informațiile albumului]"
+
+#: ../picard/cluster.py:164
+#: ../picard/cluster.py:175
+#, python-format
+msgid "No matching releases for cluster %s"
 msgstr ""
 
-#: ../picard/tagger.py:472
+#: ../picard/cluster.py:177
+#, fuzzy, python-format
+msgid "Cluster %s identified!"
+msgstr "Fişierul %s a fost identificat!"
+
+#: ../picard/cluster.py:182
+#, fuzzy, python-format
+msgid "Looking up the metadata for cluster %s..."
+msgstr "Se caută metadate pentru fişierul %s..."
+
+#: ../picard/const.py:40
+msgid "CD"
+msgstr ""
+
+#: ../picard/const.py:41
+msgid "DVD"
+msgstr ""
+
+#: ../picard/const.py:42
+msgid "SACD"
+msgstr ""
+
+#: ../picard/const.py:43
+msgid "LaserDisc"
+msgstr ""
+
+#: ../picard/const.py:44
+msgid "MiniDisc"
+msgstr ""
+
+#: ../picard/const.py:45
+msgid "Vinyl"
+msgstr ""
+
+#: ../picard/const.py:46
+msgid "Cassette"
+msgstr ""
+
+#: ../picard/const.py:47
+msgid "Cartridge (4/8-tracks)"
+msgstr ""
+
+#: ../picard/const.py:48
+msgid "Reel-to-Reel"
+msgstr ""
+
+#: ../picard/const.py:49
+msgid "DAT"
+msgstr ""
+
+#: ../picard/const.py:50
+#, fuzzy
+msgid "Digital Media"
+msgstr "Metadate originale"
+
+#: ../picard/const.py:51
+msgid "Wax Cylinder"
+msgstr ""
+
+#: ../picard/const.py:52
+msgid "Piano Roll"
+msgstr ""
+
+#: ../picard/const.py:53
+#, fuzzy
+msgid "Other"
+msgstr "Mai târziu"
+
+#: ../picard/const.py:58
+msgid "Bangladesh"
+msgstr ""
+
+#: ../picard/const.py:59
+msgid "Belgium"
+msgstr ""
+
+#: ../picard/const.py:60
+msgid "Burkina Faso"
+msgstr ""
+
+#: ../picard/const.py:61
+#, fuzzy
+msgid "Bulgaria"
+msgstr "Maghiară"
+
+#: ../picard/const.py:62
+msgid "Barbados"
+msgstr ""
+
+#: ../picard/const.py:63
+msgid "Wallis and Futuna Islands"
+msgstr ""
+
+#: ../picard/const.py:64
+#, fuzzy
+msgid "Bermuda"
+msgstr "Germană"
+
+#: ../picard/const.py:65
+msgid "Brunei Darussalam"
+msgstr ""
+
+#: ../picard/const.py:66
+msgid "Bolivia"
+msgstr ""
+
+#: ../picard/const.py:67
+msgid "Bahrain"
+msgstr ""
+
+#: ../picard/const.py:68
+msgid "Burundi"
+msgstr ""
+
+#: ../picard/const.py:69
+msgid "Benin"
+msgstr ""
+
+#: ../picard/const.py:70
+msgid "Bhutan"
+msgstr ""
+
+#: ../picard/const.py:71
+msgid "Jamaica"
+msgstr ""
+
+#: ../picard/const.py:72
+msgid "Bouvet Island"
+msgstr ""
+
+#: ../picard/const.py:73
+msgid "Botswana"
+msgstr ""
+
+#: ../picard/const.py:74
+msgid "Samoa"
+msgstr ""
+
+#: ../picard/const.py:75
+msgid "Brazil"
+msgstr ""
+
+#: ../picard/const.py:76
+msgid "Bahamas"
+msgstr ""
+
+#: ../picard/const.py:77
+msgid "Belarus"
+msgstr ""
+
+#: ../picard/const.py:78
+msgid "Belize"
+msgstr ""
+
+#: ../picard/const.py:79
+msgid "Russian Federation"
+msgstr ""
+
+#: ../picard/const.py:80
+msgid "Rwanda"
+msgstr ""
+
+#: ../picard/const.py:81
+msgid "Reunion"
+msgstr ""
+
+#: ../picard/const.py:82
+msgid "Turkmenistan"
+msgstr ""
+
+#: ../picard/const.py:83
+msgid "Tajikistan"
+msgstr ""
+
+#: ../picard/const.py:84
+#, fuzzy
+msgid "Romania"
+msgstr "Română"
+
+#: ../picard/const.py:85
+msgid "Tokela"
+msgstr ""
+
+#: ../picard/const.py:86
+msgid "Guinea-Bissa"
+msgstr ""
+
+#: ../picard/const.py:87
+msgid "Guam"
+msgstr ""
+
+#: ../picard/const.py:88
+msgid "Guatemala"
+msgstr ""
+
+#: ../picard/const.py:89
+msgid "Greece"
+msgstr ""
+
+#: ../picard/const.py:90
+msgid "Equatorial Guinea"
+msgstr ""
+
+#: ../picard/const.py:91
+msgid "Guadeloupe"
+msgstr ""
+
+#: ../picard/const.py:92
+msgid "Japan"
+msgstr ""
+
+#: ../picard/const.py:93
+msgid "Guyana"
+msgstr ""
+
+#: ../picard/const.py:94
+#, fuzzy
+msgid "French Guiana"
+msgstr "Franceză"
+
+#: ../picard/const.py:95
+#, fuzzy
+msgid "Georgia"
+msgstr "Germană"
+
+#: ../picard/const.py:96
+msgid "Grenada"
+msgstr ""
+
+#: ../picard/const.py:97
+msgid "United Kingdom"
+msgstr ""
+
+#: ../picard/const.py:98
+msgid "Gabon"
+msgstr ""
+
+#: ../picard/const.py:99
+msgid "El Salvador"
+msgstr ""
+
+#: ../picard/const.py:100
+#, fuzzy
+msgid "Guinea"
+msgstr "Generale"
+
+#: ../picard/const.py:101
+msgid "Gambia"
+msgstr ""
+
+#: ../picard/const.py:102
+msgid "Greenland"
+msgstr ""
+
+#: ../picard/const.py:103
+msgid "Gibraltar"
+msgstr ""
+
+#: ../picard/const.py:104
+msgid "Ghana"
+msgstr ""
+
+#: ../picard/const.py:105
+#, fuzzy
+msgid "Oman"
+msgstr "Germană"
+
+#: ../picard/const.py:106
+msgid "Tunisia"
+msgstr ""
+
+#: ../picard/const.py:107
+#, fuzzy
+msgid "Jordan"
+msgstr "Koreană"
+
+#: ../picard/const.py:108
+msgid "Haiti"
+msgstr ""
+
+#: ../picard/const.py:109
+#, fuzzy
+msgid "Hungary"
+msgstr "Maghiară"
+
+#: ../picard/const.py:110
+msgid "Hong Kong"
+msgstr ""
+
+#: ../picard/const.py:111
+msgid "Honduras"
+msgstr ""
+
+#: ../picard/const.py:112
+msgid "Heard and Mc Donald Islands"
+msgstr ""
+
+#: ../picard/const.py:113
+msgid "Venezuela"
+msgstr ""
+
+#: ../picard/const.py:114
+msgid "Puerto Rico"
+msgstr ""
+
+#: ../picard/const.py:115
+msgid "Pala"
+msgstr ""
+
+#: ../picard/const.py:116
+#, fuzzy
+msgid "Portugal"
+msgstr "Portugheză"
+
+#: ../picard/const.py:117
+msgid "Svalbard and Jan Mayen Islands"
+msgstr ""
+
+#: ../picard/const.py:118
+msgid "Paraguay"
+msgstr ""
+
+#: ../picard/const.py:119
+msgid "Iraq"
+msgstr ""
+
+#: ../picard/const.py:120
+msgid "Panama"
+msgstr ""
+
+#: ../picard/const.py:121
+msgid "French Polynesia"
+msgstr ""
+
+#: ../picard/const.py:122
+msgid "Papua New Guinea"
+msgstr ""
+
+#: ../picard/const.py:123
+msgid "Per"
+msgstr ""
+
+#: ../picard/const.py:124
+msgid "Pakistan"
+msgstr ""
+
+#: ../picard/const.py:125
+msgid "Philippines"
+msgstr ""
+
+#: ../picard/const.py:126
+msgid "Pitcairn"
+msgstr ""
+
+#: ../picard/const.py:127
+msgid "Poland"
+msgstr ""
+
+#: ../picard/const.py:128
+msgid "St. Pierre and Miquelon"
+msgstr ""
+
+#: ../picard/const.py:129
+msgid "Zambia"
+msgstr ""
+
+#: ../picard/const.py:130
+msgid "Western Sahara"
+msgstr ""
+
+#: ../picard/const.py:131
+msgid "Estonia"
+msgstr ""
+
+#: ../picard/const.py:132
+msgid "Egypt"
+msgstr ""
+
+#: ../picard/const.py:133
+msgid "South Africa"
+msgstr ""
+
+#: ../picard/const.py:134
+msgid "Ecuador"
+msgstr ""
+
+#: ../picard/const.py:135
+#, fuzzy
+msgid "Italy"
+msgstr "Italiană"
+
+#: ../picard/const.py:136
+#, fuzzy
+msgid "Viet Nam"
+msgstr "Numele fișierului"
+
+#: ../picard/const.py:137
+msgid "Solomon Islands"
+msgstr ""
+
+#: ../picard/const.py:138
+msgid "Ethiopia"
+msgstr ""
+
+#: ../picard/const.py:139
+#, fuzzy
+msgid "Somalia"
+msgstr "Română"
+
+#: ../picard/const.py:140
+msgid "Zimbabwe"
+msgstr ""
+
+#: ../picard/const.py:141
+msgid "Saudi Arabia"
+msgstr ""
+
+#: ../picard/const.py:142
+#, fuzzy
+msgid "Spain"
+msgstr "Spaniolă"
+
+#: ../picard/const.py:143
+msgid "Eritrea"
+msgstr ""
+
+#: ../picard/const.py:144
+msgid "Moldova, Republic of"
+msgstr ""
+
+#: ../picard/const.py:145
+msgid "Madagascar"
+msgstr ""
+
+#: ../picard/const.py:146
+msgid "Morocco"
+msgstr ""
+
+#: ../picard/const.py:147
+#, fuzzy
+msgid "Monaco"
+msgstr "Mono"
+
+#: ../picard/const.py:148
+msgid "Uzbekistan"
+msgstr ""
+
+#: ../picard/const.py:149
+msgid "Myanmar"
+msgstr ""
+
+#: ../picard/const.py:150
+msgid "Mali"
+msgstr ""
+
+#: ../picard/const.py:151
+msgid "Maca"
+msgstr ""
+
+#: ../picard/const.py:152
+#, fuzzy
+msgid "Mongolia"
+msgstr "Mono"
+
+#: ../picard/const.py:153
+msgid "Marshall Islands"
+msgstr ""
+
+#: ../picard/const.py:154
+msgid "Macedonia, The Former Yugoslav Republic of"
+msgstr ""
+
+#: ../picard/const.py:155
+msgid "Mauritius"
+msgstr ""
+
+#: ../picard/const.py:156
+#, fuzzy
+msgid "Malta"
+msgstr "Metadate"
+
+#: ../picard/const.py:157
+msgid "Malawi"
+msgstr ""
+
+#: ../picard/const.py:158
+msgid "Maldives"
+msgstr ""
+
+#: ../picard/const.py:159
+msgid "Martinique"
+msgstr ""
+
+#: ../picard/const.py:160
+msgid "Northern Mariana Islands"
+msgstr ""
+
+#: ../picard/const.py:161
+msgid "Montserrat"
+msgstr ""
+
+#: ../picard/const.py:162
+#, fuzzy
+msgid "Mauritania"
+msgstr "Lituaniană"
+
+#: ../picard/const.py:163
+msgid "Uganda"
+msgstr ""
+
+#: ../picard/const.py:164
+msgid "Malaysia"
+msgstr ""
+
+#: ../picard/const.py:165
+msgid "Mexico"
+msgstr ""
+
+#: ../picard/const.py:166
+msgid "Israel"
+msgstr ""
+
+#: ../picard/const.py:167
+#, fuzzy
+msgid "France"
+msgstr "Renunță"
+
+#: ../picard/const.py:168
+msgid "British Indian Ocean Territory"
+msgstr ""
+
+#: ../picard/const.py:169
+msgid "St. Helena"
+msgstr ""
+
+#: ../picard/const.py:170
+msgid "Finland"
+msgstr ""
+
+#: ../picard/const.py:171
+msgid "Fiji"
+msgstr ""
+
+#: ../picard/const.py:172
+msgid "Falkland Islands (Malvinas)"
+msgstr ""
+
+#: ../picard/const.py:173
+msgid "Micronesia, Federated States of"
+msgstr ""
+
+#: ../picard/const.py:174
+msgid "Faroe Islands"
+msgstr ""
+
+#: ../picard/const.py:175
+msgid "Nicaragua"
+msgstr ""
+
+#: ../picard/const.py:176
+msgid "Netherlands"
+msgstr ""
+
+#: ../picard/const.py:177
+msgid "Norway"
+msgstr ""
+
+#: ../picard/const.py:178
+msgid "Namibia"
+msgstr ""
+
+#: ../picard/const.py:179
+msgid "Vanuat"
+msgstr ""
+
+#: ../picard/const.py:180
+msgid "New Caledonia"
+msgstr ""
+
+#: ../picard/const.py:181
+msgid "Niger"
+msgstr ""
+
+#: ../picard/const.py:182
+msgid "Norfolk Island"
+msgstr ""
+
+#: ../picard/const.py:183
+msgid "Nigeria"
+msgstr ""
+
+#: ../picard/const.py:184
+#, fuzzy
+msgid "New Zealand"
+msgstr "Metadate noi"
+
+#: ../picard/const.py:185
+msgid "Zaire"
+msgstr ""
+
+#: ../picard/const.py:186
+msgid "Nepal"
+msgstr ""
+
+#: ../picard/const.py:187
+msgid "Naur"
+msgstr ""
+
+#: ../picard/const.py:188
+msgid "Niue"
+msgstr ""
+
+#: ../picard/const.py:189
+msgid "Cook Islands"
+msgstr ""
+
+#: ../picard/const.py:190
+msgid "Cote d'Ivoire"
+msgstr ""
+
+#: ../picard/const.py:191
+msgid "Switzerland"
+msgstr ""
+
+#: ../picard/const.py:192
+msgid "Colombia"
+msgstr ""
+
+#: ../picard/const.py:193
+msgid "China"
+msgstr ""
+
+#: ../picard/const.py:194
+msgid "Cameroon"
+msgstr ""
+
+#: ../picard/const.py:195
+#, fuzzy
+msgid "Chile"
+msgstr "Fișier"
+
+#: ../picard/const.py:196
+msgid "Cocos (Keeling) Islands"
+msgstr ""
+
+#: ../picard/const.py:197
+msgid "Canada"
+msgstr ""
+
+#: ../picard/const.py:198
+#, fuzzy
+msgid "Congo"
+msgstr "Mono"
+
+#: ../picard/const.py:199
+msgid "Central African Republic"
+msgstr ""
+
+#: ../picard/const.py:200
+msgid "Czech Republic"
+msgstr ""
+
+#: ../picard/const.py:201
+msgid "Cyprus"
+msgstr ""
+
+#: ../picard/const.py:202
+msgid "Christmas Island"
+msgstr ""
+
+#: ../picard/const.py:203
+msgid "Costa Rica"
+msgstr ""
+
+#: ../picard/const.py:204
+msgid "Cape Verde"
+msgstr ""
+
+#: ../picard/const.py:205
+msgid "Cuba"
+msgstr ""
+
+#: ../picard/const.py:206
+msgid "Swaziland"
+msgstr ""
+
+#: ../picard/const.py:207
+msgid "Syrian Arab Republic"
+msgstr ""
+
+#: ../picard/const.py:208
+msgid "Kyrgyzstan"
+msgstr ""
+
+#: ../picard/const.py:209
+msgid "Kenya"
+msgstr ""
+
+#: ../picard/const.py:210
+msgid "Suriname"
+msgstr ""
+
+#: ../picard/const.py:211
+msgid "Kiribati"
+msgstr ""
+
+#: ../picard/const.py:212
+msgid "Cambodia"
+msgstr ""
+
+#: ../picard/const.py:213
+msgid "Saint Kitts and Nevis"
+msgstr ""
+
+#: ../picard/const.py:214
+#, fuzzy
+msgid "Comoros"
+msgstr "Culori"
+
+#: ../picard/const.py:215
+msgid "Sao Tome and Principe"
+msgstr ""
+
+#: ../picard/const.py:216
+#, fuzzy
+msgid "Slovenia"
+msgstr "Slovacă"
+
+#: ../picard/const.py:217
+msgid "Kuwait"
+msgstr ""
+
+#: ../picard/const.py:218
+#, fuzzy
+msgid "Senegal"
+msgstr "Generale"
+
+#: ../picard/const.py:219
+msgid "San Marino"
+msgstr ""
+
+#: ../picard/const.py:220
+msgid "Sierra Leone"
+msgstr ""
+
+#: ../picard/const.py:221
+msgid "Seychelles"
+msgstr ""
+
+#: ../picard/const.py:222
+msgid "Kazakhstan"
+msgstr ""
+
+#: ../picard/const.py:223
+msgid "Cayman Islands"
+msgstr ""
+
+#: ../picard/const.py:224
+msgid "Singapore"
+msgstr ""
+
+#: ../picard/const.py:225
+#, fuzzy
+msgid "Sweden"
+msgstr "Suedeză"
+
+#: ../picard/const.py:226
+#, fuzzy
+msgid "Sudan"
+msgstr "Analizea&ză"
+
+#: ../picard/const.py:227
+msgid "Dominican Republic"
+msgstr ""
+
+#: ../picard/const.py:228
+#, fuzzy
+msgid "Dominica"
+msgstr "Română"
+
+#: ../picard/const.py:229
+#, fuzzy
+msgid "Djibouti"
+msgstr "Despre noi"
+
+#: ../picard/const.py:230
+msgid "Denmark"
+msgstr ""
+
+#: ../picard/const.py:231
+msgid "Virgin Islands (British)"
+msgstr ""
+
+#: ../picard/const.py:232
+#, fuzzy
+msgid "Germany"
+msgstr "Germană"
+
+#: ../picard/const.py:233
+msgid "Yemen"
+msgstr ""
+
+#: ../picard/const.py:234
+msgid "Algeria"
+msgstr ""
+
+#: ../picard/const.py:235
+msgid "United States"
+msgstr ""
+
+#: ../picard/const.py:236
+msgid "Uruguay"
+msgstr ""
+
+#: ../picard/const.py:237
+msgid "Mayotte"
+msgstr ""
+
+#: ../picard/const.py:238
+msgid "United States Minor Outlying Islands"
+msgstr ""
+
+#: ../picard/const.py:239
+msgid "Lebanon"
+msgstr ""
+
+#: ../picard/const.py:240
+msgid "Saint Lucia"
+msgstr ""
+
+#: ../picard/const.py:241
+msgid "Lao People's Democratic Republic"
+msgstr ""
+
+#: ../picard/const.py:242
+msgid "Tuval"
+msgstr ""
+
+#: ../picard/const.py:243
+#, fuzzy
+msgid "Taiwan"
+msgstr "Italiană"
+
+#: ../picard/const.py:244
+msgid "Trinidad and Tobago"
+msgstr ""
+
+#: ../picard/const.py:245
+msgid "Turkey"
+msgstr ""
+
+#: ../picard/const.py:246
+msgid "Sri Lanka"
+msgstr ""
+
+#: ../picard/const.py:247
+msgid "Liechtenstein"
+msgstr ""
+
+#: ../picard/const.py:248
+msgid "Latvia"
+msgstr ""
+
+#: ../picard/const.py:249
+msgid "Tonga"
+msgstr ""
+
+#: ../picard/const.py:250
+#, fuzzy
+msgid "Lithuania"
+msgstr "Lituaniană"
+
+#: ../picard/const.py:251
+msgid "Luxembourg"
+msgstr ""
+
+#: ../picard/const.py:252
+msgid "Liberia"
+msgstr ""
+
+#: ../picard/const.py:253
+#, fuzzy
+msgid "Lesotho"
+msgstr "Durată:"
+
+#: ../picard/const.py:254
+msgid "Thailand"
+msgstr ""
+
+#: ../picard/const.py:255
+msgid "French Southern Territories"
+msgstr ""
+
+#: ../picard/const.py:256
+#, fuzzy
+msgid "Togo"
+msgstr "Unel&te"
+
+#: ../picard/const.py:257
+msgid "Chad"
+msgstr ""
+
+#: ../picard/const.py:258
+msgid "Turks and Caicos Islands"
+msgstr ""
+
+#: ../picard/const.py:259
+msgid "Libyan Arab Jamahiriya"
+msgstr ""
+
+#: ../picard/const.py:260
+msgid "Vatican City State (Holy See)"
+msgstr ""
+
+#: ../picard/const.py:261
+msgid "Saint Vincent and The Grenadines"
+msgstr ""
+
+#: ../picard/const.py:262
+msgid "United Arab Emirates"
+msgstr ""
+
+#: ../picard/const.py:263
+msgid "Andorra"
+msgstr ""
+
+#: ../picard/const.py:264
+msgid "Antigua and Barbuda"
+msgstr ""
+
+#: ../picard/const.py:265
+msgid "Afghanistan"
+msgstr ""
+
+#: ../picard/const.py:266
+msgid "Anguilla"
+msgstr ""
+
+#: ../picard/const.py:267
+msgid "Virgin Islands (U.S.)"
+msgstr ""
+
+#: ../picard/const.py:268
+#, fuzzy
+msgid "Iceland"
+msgstr "Islandeză"
+
+#: ../picard/const.py:269
+msgid "Iran (Islamic Republic of)"
+msgstr ""
+
+#: ../picard/const.py:270
+msgid "Armenia"
+msgstr ""
+
+#: ../picard/const.py:271
+msgid "Albania"
+msgstr ""
+
+#: ../picard/const.py:272
+msgid "Angola"
+msgstr ""
+
+#: ../picard/const.py:273
+msgid "Netherlands Antilles"
+msgstr ""
+
+#: ../picard/const.py:274
+msgid "Antarctica"
+msgstr ""
+
+#: ../picard/const.py:275
+msgid "American Samoa"
+msgstr ""
+
+#: ../picard/const.py:276
+msgid "Argentina"
+msgstr ""
+
+#: ../picard/const.py:277
+#, fuzzy
+msgid "Australia"
+msgstr "Italiană"
+
+#: ../picard/const.py:278
+#, fuzzy
+msgid "Austria"
+msgstr "Autor"
+
+#: ../picard/const.py:279
+msgid "Aruba"
+msgstr ""
+
+#: ../picard/const.py:280
+#, fuzzy
+msgid "India"
+msgstr "Metadate"
+
+#: ../picard/const.py:281
+msgid "Tanzania, United Republic of"
+msgstr ""
+
+#: ../picard/const.py:282
+msgid "Azerbaijan"
+msgstr ""
+
+#: ../picard/const.py:283
+#, fuzzy
+msgid "Ireland"
+msgstr "Islandeză"
+
+#: ../picard/const.py:284
+msgid "Indonesia"
+msgstr ""
+
+#: ../picard/const.py:285
+msgid "Ukraine"
+msgstr ""
+
+#: ../picard/const.py:286
+#, fuzzy
+msgid "Qatar"
+msgstr "Mai târziu"
+
+#: ../picard/const.py:287
+msgid "Mozambique"
+msgstr ""
+
+#: ../picard/const.py:288
+msgid "Bosnia and Herzegovina"
+msgstr ""
+
+#: ../picard/const.py:289
+msgid "Congo, The Democratic Republic of the"
+msgstr ""
+
+#: ../picard/const.py:290
+msgid "Serbia and Montenegro"
+msgstr ""
+
+#: ../picard/const.py:291
+msgid "Croatia"
+msgstr ""
+
+#: ../picard/const.py:292
+msgid "Korea (North), Democratic People's Republic of"
+msgstr ""
+
+#: ../picard/const.py:293
+msgid "Korea (South), Republic of"
+msgstr ""
+
+#: ../picard/const.py:294
+#, fuzzy
+msgid "Slovakia"
+msgstr "Slovacă"
+
+#: ../picard/const.py:295
+msgid "Soviet Union (historical, 1922-1991)"
+msgstr ""
+
+#: ../picard/const.py:296
+msgid "East Timor"
+msgstr ""
+
+#: ../picard/const.py:297
+msgid "Czechoslovakia (historical, 1918-1992)"
+msgstr ""
+
+#: ../picard/const.py:298
+msgid "Europe"
+msgstr ""
+
+#: ../picard/const.py:299
+msgid "East Germany (historical, 1949-1990)"
+msgstr ""
+
+#: ../picard/const.py:300
+msgid "[Unknown Country]"
+msgstr ""
+
+#: ../picard/const.py:301
+msgid "[Worldwide]"
+msgstr ""
+
+#: ../picard/const.py:302
+msgid "Yugoslavia (historical, 1918-1992)"
+msgstr ""
+
+#: ../picard/const.py:307
+#, fuzzy
+msgid "Catalan"
+msgstr "Italiană"
+
+#: ../picard/const.py:308
+msgid "Czech"
+msgstr "Cehă"
+
+#: ../picard/const.py:309
+msgid "Welsh"
+msgstr ""
+
+#: ../picard/const.py:310
+#, fuzzy
+msgid "Danish"
+msgstr "Spaniolă"
+
+#: ../picard/const.py:311
+msgid "German"
+msgstr "Germană"
+
+#: ../picard/const.py:312
+msgid "English"
+msgstr "Engleză"
+
+#: ../picard/const.py:313
+#, fuzzy
+msgid "English (Canada)"
+msgstr "Engleză (britanică)"
+
+#: ../picard/const.py:314
+msgid "English (UK)"
+msgstr "Engleză (britanică)"
+
+#: ../picard/const.py:315
+msgid "Spanish"
+msgstr "Spaniolă"
+
+#: ../picard/const.py:316
+#, fuzzy
+msgid "Persian"
+msgstr "Versiune"
+
+#: ../picard/const.py:317
+msgid "Finnish"
+msgstr "Finlandeză"
+
+#: ../picard/const.py:318
+msgid "French"
+msgstr "Franceză"
+
+#: ../picard/const.py:319
+msgid "Frisian"
+msgstr ""
+
+#: ../picard/const.py:320
+msgid "Hebrew"
+msgstr ""
+
+#: ../picard/const.py:321
+msgid "Hungarian"
+msgstr "Maghiară"
+
+#: ../picard/const.py:322
+#, fuzzy
+msgid "Islandic"
+msgstr "Islandeză"
+
+#: ../picard/const.py:323
+msgid "Italian"
+msgstr "Italiană"
+
+#: ../picard/const.py:324
+msgid "Kannada"
+msgstr ""
+
+#: ../picard/const.py:325
+msgid "Korean"
+msgstr "Koreană"
+
+#: ../picard/const.py:326
+msgid "Lithuanian"
+msgstr "Lituaniană"
+
+#: ../picard/const.py:327
+msgid "Norwegian Bokmal"
+msgstr "Norvegiană (Bokmal)"
+
+#: ../picard/const.py:328
+msgid "Dutch"
+msgstr "Olandeză"
+
+#: ../picard/const.py:329
+#, fuzzy
+msgid "Polish"
+msgstr "Module"
+
+#: ../picard/const.py:330
+msgid "Portuguese"
+msgstr "Portugheză"
+
+#: ../picard/const.py:331
+#, fuzzy
+msgid "Brazilian Portuguese"
+msgstr "Portugheză"
+
+#: ../picard/const.py:332
+msgid "Romanian"
+msgstr "Română"
+
+#: ../picard/const.py:333
+msgid "Russian"
+msgstr "Rusă"
+
+#: ../picard/const.py:334
+#, fuzzy
+msgid "Scots"
+msgstr "Punctaj"
+
+#: ../picard/const.py:335
+msgid "Slovak"
+msgstr "Slovacă"
+
+#: ../picard/const.py:336
+#, fuzzy
+msgid "Slovenian"
+msgstr "Slovacă"
+
+#: ../picard/const.py:337
+msgid "Swedish"
+msgstr "Suedeză"
+
+#: ../picard/const.py:338
+#, fuzzy
+msgid "Chinese"
+msgstr "Canale:"
+
+#: ../picard/file.py:475
+#, python-format
+msgid "No matching tracks for file %s"
+msgstr ""
+
+#: ../picard/file.py:492
+#, python-format
+msgid "No matching tracks above the threshold for file %s"
+msgstr ""
+
+#: ../picard/file.py:495
+#, python-format
+msgid "File %s identified!"
+msgstr "Fişierul %s a fost identificat!"
+
+#: ../picard/file.py:506
+#, fuzzy, python-format
+msgid "Looking up the PUID for file %s..."
+msgstr "Se caută după PUID fişierul %s..."
+
+#: ../picard/file.py:511
+#, fuzzy, python-format
+msgid "Looking up the metadata for file %s..."
+msgstr "Se caută metadate pentru fişierul %s..."
+
+#: ../picard/puidmanager.py:58
+#, fuzzy
+msgid "Submitting PUIDs..."
+msgstr "Transmite PUID-urile"
+
+#: ../picard/puidmanager.py:64
+#, fuzzy, python-format
+msgid "PUIDs submission failed: %s"
+msgstr "Coliziune PUID la fişierul %s!"
+
+#: ../picard/puidmanager.py:66
+#, fuzzy
+msgid "PUIDs successfully submitted!"
+msgstr "PUID-urile au fost trimise."
+
+#: ../picard/playlist.py:31
+msgid "M3U Playlist (*.m3u)"
+msgstr ""
+
+#: ../picard/playlist.py:32
+msgid "PLS Playlist (*.pls)"
+msgstr ""
+
+#: ../picard/playlist.py:33
+msgid "XSPF Playlist (*.xspf)"
+msgstr ""
+
+#: ../picard/tagger.py:476
 msgid "CD Lookup Error"
-msgstr ""
+msgstr "Eroare la căutarea discului"
 
-#: ../picard/tagger.py:473
+#: ../picard/tagger.py:477
 #, python-format
 msgid ""
 "Error while reading CD:\n"
 "\n"
 "%s"
 msgstr ""
+"Eroare la citirea discului:\n"
+"\n"
+"%s"
 
-#: ../picard/ui/passworddialog.py:38
+#: ../picard/tagger.py:503
 #, python-format
-msgid ""
-"The server %s requires you to login. Please enter your username and password."
+msgid "Couldn't find PUID for file %s"
 msgstr ""
 
-#: ../picard/ui/ui_options_script.py:52
-msgid "Tagger Script"
+#: ../picard/musicdns/__init__.py:98
+#, fuzzy, python-format
+msgid "Looking up the fingerprint for file %s..."
+msgstr "Se caută metadate pentru fişierul %s..."
+
+#: ../picard/musicdns/__init__.py:117
+#, python-format
+msgid "Creating fingerprint for file %s..."
 msgstr ""
 
 #: ../picard/ui/cdlookup.py:31
 msgid "Score"
-msgstr ""
+msgstr "Punctaj"
 
 #: ../picard/ui/cdlookup.py:31
+#: ../picard/ui/itemviews.py:82
+#: ../picard/util/tags.py:23
 msgid "Title"
-msgstr ""
+msgstr "Titlu"
 
-#: ../picard/ui/cdlookup.py:31 ../picard/ui/mainwindow.py:436
+#: ../picard/ui/cdlookup.py:31
+#: ../picard/ui/itemviews.py:84
+#: ../picard/ui/mainwindow.py:436
+#: ../picard/util/tags.py:22
 msgid "Artist"
 msgstr "Artist"
 
-#: ../picard/ui/ui_metadata.py:121
-msgid "Lookup"
-msgstr "Caută"
+#: ../picard/ui/coverartbox.py:47
+#: ../picard/ui/options/cover.py:29
+msgid "Cover Art"
+msgstr "Coperta"
 
-#: ../picard/ui/ui_metadata.py:122
-msgid "Title:"
-msgstr ""
+#: ../picard/ui/coverartbox.py:95
+msgid "Buy the album on Amazon"
+msgstr "Cumpără albumul de la Amazon"
 
-#: ../picard/ui/ui_metadata.py:123
-msgid "Date:"
-msgstr ""
+#: ../picard/ui/filebrowser.py:38
+#: ../picard/ui/mainwindow.py:302
+msgid "&Refresh"
+msgstr "Actualiza&re"
 
-#: ../picard/ui/ui_metadata.py:124
-msgid "Artist:"
-msgstr ""
+#: ../picard/ui/filebrowser.py:41
+msgid "&Move Tagged Files Here"
+msgstr "&Mută fișierele etichetate aici"
 
-#: ../picard/ui/ui_metadata.py:125
-msgid "Track:"
-msgstr ""
+#: ../picard/ui/filebrowser.py:44
+msgid "Show &Hidden Files"
+msgstr "Afișează fișierele ascunse"
 
-#: ../picard/ui/ui_metadata.py:126
-msgid "0000-00-00; "
-msgstr ""
-
-#: ../picard/ui/ui_metadata.py:127 ../picard/ui/tageditor.py:225
-#: ../picard/ui/multitageditor.py:181
-msgid "Length:"
-msgstr ""
-
-#: ../picard/ui/ui_metadata.py:128
-msgid "Album:"
-msgstr ""
-
-#: ../picard/ui/ui_passworddialog.py:78
+#: ../picard/ui/itemviews.py:83
 #, fuzzy
-msgid "Authentication required"
-msgstr "E nevoie de Unicode"
+msgid "Length"
+msgstr "Durată:"
 
-#: ../picard/ui/ui_passworddialog.py:79 ../picard/ui/ui_options_proxy.py:83
-#: ../picard/ui/ui_options_general.py:113
-msgid "Username:"
-msgstr ""
+#: ../picard/ui/itemviews.py:327
+msgid "&Releases"
+msgstr "Albume"
 
-#: ../picard/ui/ui_passworddialog.py:80 ../picard/ui/ui_options_proxy.py:82
-#: ../picard/ui/ui_options_general.py:112
-msgid "Password:"
-msgstr ""
+#: ../picard/ui/itemviews.py:353
+msgid "&Plugins"
+msgstr "&Module"
 
-#: ../picard/ui/ui_passworddialog.py:81
-msgid "Save username and password"
-msgstr ""
+#: ../picard/ui/itemviews.py:523
+msgid "Clusters"
+msgstr "Grupaje"
 
-#: ../picard/ui/ui_options_folksonomy.py:114
-#: ../picard/ui/ui_options_folksonomy_tags.py:114
-msgid "Folksonomy Tags"
-msgstr ""
+#: ../picard/ui/logview.py:29
+msgid "Log"
+msgstr "Jurnal"
 
-#: ../picard/ui/ui_options_folksonomy.py:115
-#: ../picard/ui/ui_options_folksonomy_tags.py:115
-msgid "Ignore tags:"
-msgstr ""
+#: ../picard/ui/puidsubmit.py:31
+#: ../picard/ui/options/plugins.py:80
+msgid "File"
+msgstr "Fișier"
 
-#: ../picard/ui/ui_options_folksonomy.py:116
-#: ../picard/ui/ui_options_folksonomy_tags.py:116
-msgid "Minimal tag usage:"
-msgstr ""
+#: ../picard/ui/puidsubmit.py:31
+msgid "PUID"
+msgstr "PUID"
 
-#: ../picard/ui/ui_options_folksonomy.py:117
-#: ../picard/ui/ui_options_folksonomy_tags.py:117
-#: ../picard/ui/ui_options_matching.py:107
-#: ../picard/ui/ui_options_matching.py:108
-#: ../picard/ui/ui_options_matching.py:109
-#: ../picard/ui/ui_options_matching.py:113
-msgid " %"
-msgstr ""
+#: ../picard/ui/puidsubmit.py:31
+#: ../picard/ui/mainwindow.py:437
+msgid "Track"
+msgstr "Piesă"
 
-#: ../picard/ui/ui_options_folksonomy.py:118
-msgid "Maximum number of tags:"
-msgstr ""
+#: ../picard/ui/puidsubmit.py:31
+msgid "Release"
+msgstr "Album"
 
-#: ../picard/ui/ui_options_folksonomy.py:119
-#: ../picard/ui/ui_options_folksonomy_tags.py:119
-msgid "Join multiple tags with:"
-msgstr ""
+#: ../picard/ui/puidsubmit.py:31
+msgid "Release ID"
+msgstr "Identificator Album"
 
-#: ../picard/ui/ui_options_folksonomy.py:120
-#: ../picard/ui/ui_options_folksonomy_tags.py:120
-msgid " / "
-msgstr ""
+#: ../picard/ui/tageditor.py:65
+#: ../picard/ui/ui_options_plugins.py:62
+msgid "Details"
+msgstr "Detalii"
 
-#: ../picard/ui/ui_options_folksonomy.py:121
-#: ../picard/ui/ui_options_folksonomy_tags.py:121
-msgid ", "
-msgstr ""
+#: ../picard/ui/tageditor.py:70
+#: ../picard/ui/tageditor.py:241
+#, python-format
+msgid "%d file"
+msgid_plural "%d files"
+msgstr[0] "%d fișier"
+msgstr[1] "%d fișiere"
+msgstr[2] "%d de fișiere"
 
-#: ../picard/ui/ui_options_folksonomy_tags.py:118
-msgid "Maximal number of tags:"
-msgstr ""
+#: ../picard/ui/tageditor.py:124
+#, python-format
+msgid "(different across %d file)"
+msgid_plural "(different across %d files)"
+msgstr[0] "(diferit în %d fișier)"
+msgstr[1] "(diferit între %d fișiere)"
+msgstr[2] "(diferit în %d de fișiere)"
+
+#: ../picard/ui/tageditor.py:127
+#, python-format
+msgid "(missing from %d file)"
+msgid_plural "(missing from %d files)"
+msgstr[0] "(lipsind din %d fișier)"
+msgstr[1] "(lipsind din %d fișiere)"
+msgstr[2] "(lipsind din %d de fișiere)"
+
+#: ../picard/ui/tageditor.py:210
+msgid "Filename:"
+msgstr "Nume fișier:"
+
+#: ../picard/ui/tageditor.py:212
+msgid "Format:"
+msgstr "Format:"
+
+#: ../picard/ui/tageditor.py:221
+msgid "Size:"
+msgstr "Mărime:"
+
+#: ../picard/ui/tageditor.py:225
+#: ../picard/ui/ui_metadata.py:127
+msgid "Length:"
+msgstr "Durată:"
+
+#: ../picard/ui/tageditor.py:227
+msgid "Bitrate:"
+msgstr "Rata de biți:"
+
+#: ../picard/ui/tageditor.py:229
+msgid "Sample rate:"
+msgstr "Rata de eșantionare:"
+
+#: ../picard/ui/tageditor.py:231
+msgid "Bits per sample:"
+msgstr "Biți pe eșantion:"
+
+#: ../picard/ui/tageditor.py:234
+msgid "Mono"
+msgstr "Mono"
+
+#: ../picard/ui/tageditor.py:235
+msgid "Stereo"
+msgstr "Stereo"
+
+#: ../picard/ui/tageditor.py:237
+msgid "Channels:"
+msgstr "Canale:"
+
+#: ../picard/ui/tagsfromfilenames.py:52
+#: ../picard/ui/tagsfromfilenames.py:96
+msgid "File Name"
+msgstr "Numele fișierului"
 
 #: ../picard/ui/mainwindow.py:64
 msgid "MusicBrainz Picard"
-msgstr ""
+msgstr "MusicBrainz Picard"
 
 #: ../picard/ui/mainwindow.py:85
 msgid "Original Metadata"
-msgstr ""
+msgstr "Metadate originale"
 
 #: ../picard/ui/mainwindow.py:87
 msgid "New Metadata"
-msgstr ""
+msgstr "Metadate noi"
 
 #: ../picard/ui/mainwindow.py:183
 msgid "&Options..."
-msgstr "&Opţiuni..."
+msgstr "&Opțiuni"
 
 #: ../picard/ui/mainwindow.py:186
 msgid "&Cut"
-msgstr ""
+msgstr "&Taie"
 
 #: ../picard/ui/mainwindow.py:187
 msgid "Ctrl+X"
-msgstr ""
+msgstr "Ctrl+X"
 
 #: ../picard/ui/mainwindow.py:191
 msgid "&Paste"
-msgstr ""
+msgstr "Li&pește"
 
 #: ../picard/ui/mainwindow.py:192
 msgid "Ctrl+V"
-msgstr ""
+msgstr "Ctrl+V"
 
 #: ../picard/ui/mainwindow.py:196
 msgid "&Help..."
-msgstr ""
+msgstr "&Ajutor"
 
 #: ../picard/ui/mainwindow.py:207
 msgid "&About..."
 msgstr "&Despre..."
 
 #: ../picard/ui/mainwindow.py:210
-#, fuzzy
 msgid "&Donate..."
-msgstr "&Despre..."
+msgstr "Donea&ză..."
 
 #: ../picard/ui/mainwindow.py:213
 msgid "&Report a Bug..."
-msgstr ""
+msgstr "&Raportează o problemă"
 
 #: ../picard/ui/mainwindow.py:216
 msgid "&Support Forum..."
-msgstr ""
+msgstr "Forum a&sistență"
 
 #: ../picard/ui/mainwindow.py:219
 msgid "&Add Files..."
-msgstr ""
+msgstr "&Adaugă fișiere..."
 
 #: ../picard/ui/mainwindow.py:220
 msgid "Add files to the tagger"
-msgstr ""
+msgstr "Adaugă fișiere în program"
 
 #. Keyboard shortcut for "Add Files..."
 #: ../picard/ui/mainwindow.py:222
 msgid "Ctrl+O"
-msgstr ""
+msgstr "Ctrl+O"
 
 #: ../picard/ui/mainwindow.py:225
 msgid "A&dd Folder..."
-msgstr ""
+msgstr "A&daugă dosar..."
 
 #: ../picard/ui/mainwindow.py:226
 msgid "Add a folder to the tagger"
-msgstr ""
+msgstr "Adaugă un dosar în program"
 
 #. Keyboard shortcut for "Add Directory..."
 #: ../picard/ui/mainwindow.py:228
 msgid "Ctrl+D"
-msgstr ""
+msgstr "Ctrl+D"
 
 #: ../picard/ui/mainwindow.py:232
 msgid "&Save"
-msgstr ""
+msgstr "&Înregistrează"
 
 #: ../picard/ui/mainwindow.py:233
 msgid "Save selected files"
-msgstr ""
+msgstr "Înregistrează fișierele selectate"
 
 #. Keyboard shortcut for "Save"
 #: ../picard/ui/mainwindow.py:235
 msgid "Ctrl+S"
-msgstr ""
+msgstr "Ctrl+S"
 
 #: ../picard/ui/mainwindow.py:239
 msgid "S&ubmit PUIDs"
-msgstr ""
+msgstr "Trimite PUID-uri"
 
 #: ../picard/ui/mainwindow.py:240
 msgid "Submit PUIDs to MusicBrainz"
-msgstr ""
+msgstr "Trimite PUID-urile către MusicBrainz"
 
 #: ../picard/ui/mainwindow.py:244
 msgid "E&xit"
-msgstr "&Ieşire"
+msgstr "&Ieșire"
 
 #. Keyboard shortcut for "Exit"
 #: ../picard/ui/mainwindow.py:246
 msgid "Ctrl+Q"
-msgstr ""
+msgstr "Ctrl+Q"
 
 #: ../picard/ui/mainwindow.py:250
 msgid "&Remove"
-msgstr ""
+msgstr "Înlătu&ră"
 
 #: ../picard/ui/mainwindow.py:251
 msgid "Remove selected files/albums"
-msgstr ""
+msgstr "Înlătură fișierele/albumele selectate"
 
 #: ../picard/ui/mainwindow.py:256
 msgid "File &Browser"
-msgstr ""
+msgstr "&Parcurgere fișiere"
 
 #: ../picard/ui/mainwindow.py:262
 msgid "&Cover Art"
-msgstr ""
+msgstr "&Coperți"
 
 #: ../picard/ui/mainwindow.py:268
 msgid "Search"
@@ -296,83 +1635,81 @@ msgstr "Caută"
 
 #: ../picard/ui/mainwindow.py:271
 msgid "&CD Lookup..."
-msgstr ""
+msgstr "&Căutare disc..."
 
-#: ../picard/ui/mainwindow.py:272 ../picard/ui/mainwindow.py:273
+#: ../picard/ui/mainwindow.py:272
+#: ../picard/ui/mainwindow.py:273
 msgid "Lookup CD"
-msgstr ""
+msgstr "Caută discul"
 
 #. Keyboard shortcut for "Lookup CD"
 #: ../picard/ui/mainwindow.py:275
 msgid "Ctrl+K"
-msgstr ""
+msgstr "Ctrl+K"
 
 #: ../picard/ui/mainwindow.py:278
 msgid "&Scan"
-msgstr ""
+msgstr "Analizea&ză"
 
 #. Keyboard shortcut for "Analyze"
 #: ../picard/ui/mainwindow.py:281
 msgid "Ctrl+Y"
-msgstr ""
+msgstr "Ctrl+Y"
 
 #: ../picard/ui/mainwindow.py:284
 msgid "Cl&uster"
-msgstr ""
+msgstr "Gr&upează"
 
 #. Keyboard shortcut for "Cluster"
 #: ../picard/ui/mainwindow.py:287
 msgid "Ctrl+U"
-msgstr ""
+msgstr "Ctrl+U"
 
 #: ../picard/ui/mainwindow.py:290
 msgid "&Lookup"
-msgstr ""
+msgstr "&Căutare"
 
-#: ../picard/ui/mainwindow.py:291 ../picard/ui/mainwindow.py:292
+#: ../picard/ui/mainwindow.py:291
+#: ../picard/ui/mainwindow.py:292
 msgid "Lookup metadata"
-msgstr ""
+msgstr "Caută metadate"
 
 #. Keyboard shortcut for "Lookup"
 #: ../picard/ui/mainwindow.py:295
 msgid "Ctrl+L"
-msgstr ""
+msgstr "Ctrl+L"
 
 #: ../picard/ui/mainwindow.py:298
 msgid "&Details..."
-msgstr ""
-
-#: ../picard/ui/mainwindow.py:302 ../picard/ui/filebrowser.py:38
-msgid "&Refresh"
-msgstr ""
+msgstr "&Detalii..."
 
 #: ../picard/ui/mainwindow.py:305
 msgid "Generate &Playlist..."
-msgstr ""
+msgstr "Generează playlist"
 
 #: ../picard/ui/mainwindow.py:308
 msgid "&Rename Files"
-msgstr ""
+msgstr "&Redenumește fișierele"
 
 #: ../picard/ui/mainwindow.py:313
 msgid "&Move Files"
-msgstr ""
+msgstr "&Mută fișierele"
 
 #: ../picard/ui/mainwindow.py:318
 msgid "Save &Tags"
-msgstr ""
+msgstr "Înregistrează tag-urile"
 
 #: ../picard/ui/mainwindow.py:323
 msgid "Tags From &File Names..."
-msgstr ""
+msgstr "Generare taguri din numele fișierelor"
 
 #: ../picard/ui/mainwindow.py:326
 msgid "View &Log..."
-msgstr ""
+msgstr "Afișează jurnalul"
 
 #: ../picard/ui/mainwindow.py:349
 msgid "&File"
-msgstr "&Fişier"
+msgstr "&Fișier"
 
 #: ../picard/ui/mainwindow.py:357
 msgid "&Edit"
@@ -380,523 +1717,513 @@ msgstr "&Editare"
 
 #: ../picard/ui/mainwindow.py:363
 msgid "&View"
-msgstr ""
+msgstr "Afișa&re"
 
 #: ../picard/ui/mainwindow.py:369
 msgid "&Options"
-msgstr ""
+msgstr "&Opțiuni"
 
 #: ../picard/ui/mainwindow.py:375
 msgid "&Tools"
-msgstr ""
+msgstr "Unel&te"
 
 #: ../picard/ui/mainwindow.py:384
+#: ../picard/ui/util.py:33
 msgid "&Help"
 msgstr "&Ajutor"
 
 #: ../picard/ui/mainwindow.py:404
 msgid "&Toolbar"
-msgstr ""
+msgstr "Bara de unel&te"
 
 #: ../picard/ui/mainwindow.py:430
 msgid "&Search Bar"
-msgstr ""
+msgstr "Bara de &căutare"
 
 #: ../picard/ui/mainwindow.py:435
+#: ../picard/util/tags.py:21
 msgid "Album"
 msgstr "Album"
 
-#: ../picard/ui/mainwindow.py:437 ../picard/ui/puidsubmit.py:31
-msgid "Track"
-msgstr "Piesă"
-
 #: ../picard/ui/mainwindow.py:476
 msgid "All Supported Formats"
-msgstr ""
+msgstr "Toate formatele cunoscute"
 
 #: ../picard/ui/mainwindow.py:525
 #, python-format
 msgid "Saving playlist %s..."
-msgstr ""
+msgstr "Salvez playlist-ul %s..."
 
 #: ../picard/ui/mainwindow.py:528
 #, python-format
 msgid "Playlist %s saved"
-msgstr ""
+msgstr "Am salvat playlistul %s"
 
-#: ../picard/ui/mainwindow.py:638 ../picard/ui/mainwindow.py:647
+#: ../picard/ui/mainwindow.py:638
+#: ../picard/ui/mainwindow.py:647
 #, python-format
 msgid " (Error: %s)"
-msgstr ""
+msgstr " (Eroare: %s)"
 
-#: ../picard/ui/ui_edittagdialog.py:44
-msgid "Edit Tag"
-msgstr ""
-
-#: ../picard/ui/ui_options_proxy.py:81
-msgid "Web Proxy"
-msgstr "Proxy de reţea"
-
-#: ../picard/ui/ui_options_proxy.py:84 ../picard/ui/ui_options_general.py:109
-msgid "Port:"
-msgstr ""
-
-#: ../picard/ui/ui_options_proxy.py:85 ../picard/ui/ui_options_general.py:110
-msgid "Server address:"
-msgstr ""
-
-#: ../picard/ui/ui_tagsfromfilenames.py:56
-msgid "Convert File Names to Tags"
-msgstr ""
-
-#: ../picard/ui/ui_tagsfromfilenames.py:57
-msgid "Replace underscores with spaces"
-msgstr ""
-
-#: ../picard/ui/ui_tagsfromfilenames.py:58
-#: ../picard/ui/ui_options_naming.py:180
-msgid "&Preview"
-msgstr ""
-
-#: ../picard/ui/ui_options_general.py:108
-msgid "MusicBrainz Server"
-msgstr ""
-
-#: ../picard/ui/ui_options_general.py:111
-msgid "Account Information"
-msgstr ""
-
-#: ../picard/ui/ui_options_general.py:114
-msgid "General"
-msgstr "Generale"
-
-#: ../picard/ui/ui_options_general.py:115
-msgid "Automatically scan all new files"
-msgstr ""
-
-#: ../picard/ui/ui_options_interface.py:46
-msgid "Miscellaneous"
-msgstr ""
-
-#: ../picard/ui/ui_options_interface.py:47
-msgid "Show text labels under icons"
-msgstr ""
-
-#: ../picard/ui/ui_options_interface.py:48
-msgid "Allow selection of multiple directories"
-msgstr ""
-
-#: ../picard/ui/ui_options_interface.py:49
-msgid "Use advanced query syntax"
-msgstr ""
-
-#: ../picard/ui/itemviews.py:327
-msgid "&Releases"
-msgstr ""
-
-#: ../picard/ui/itemviews.py:353
-msgid "&Plugins"
-msgstr ""
-
-#: ../picard/ui/itemviews.py:523
-msgid "Clusters"
-msgstr ""
-
-#: ../picard/ui/ui_options_matching.py:105
-msgid "Thresholds"
-msgstr ""
-
-#: ../picard/ui/ui_options_matching.py:106
-msgid "Minimal similarity for matching files to tracks:"
-msgstr ""
-
-#: ../picard/ui/ui_options_matching.py:110
-msgid "Minimal similarity for file lookups:"
-msgstr ""
-
-#: ../picard/ui/ui_options_matching.py:111
-msgid "Minimal similarity for cluster lookups:"
-msgstr ""
-
-#: ../picard/ui/ui_options_matching.py:112
-msgid "Minimal similarity for PUID lookups:"
-msgstr ""
-
-#: ../picard/ui/ui_options_tags.py:105
-msgid "Common"
-msgstr ""
-
-#: ../picard/ui/ui_options_tags.py:106
-msgid "Clear existing tags before writing new tags"
-msgstr "Şterge etichetele existente înainte de rescriere"
-
-#: ../picard/ui/ui_options_tags.py:107
-msgid "Don't write tags to files"
-msgstr ""
-
-#: ../picard/ui/ui_options_tags.py:108
-msgid "ID3"
-msgstr ""
-
-#: ../picard/ui/ui_options_tags.py:109
-msgid "Write ID3v1 tags to the files"
-msgstr ""
-
-#: ../picard/ui/ui_options_tags.py:110
-msgid "Write ID3v2 version 2.3 tags (2.4 is default)"
-msgstr "Scrie etichete ID3v2 versiunea 2.3 (altfel sunt 2.4)"
-
-#: ../picard/ui/ui_options_tags.py:111
-msgid "Text encoding to use while writing ID3v2 tags:"
-msgstr ""
-
-#: ../picard/ui/ui_options_tags.py:112
-msgid "ISO-8859-1"
-msgstr ""
-
-#: ../picard/ui/ui_options_tags.py:113
-msgid "UTF-16"
-msgstr ""
-
-#: ../picard/ui/ui_options_tags.py:114
-msgid "UTF-8"
-msgstr ""
-
-#: ../picard/ui/ui_options_tags.py:115
-msgid "Remove ID3 tags from FLAC files"
-msgstr ""
-
-#: ../picard/ui/ui_options_tags.py:116
-msgid "APE"
-msgstr ""
-
-#: ../picard/ui/ui_options_tags.py:117
-msgid "Remove APEv2 tags from MP3 files"
-msgstr ""
-
-#: ../picard/ui/ui_options_cdlookup_win32.py:56 ../picard/ui/ui_cdlookup.py:60
-#: ../picard/ui/ui_options_cdlookup.py:47
-msgid "CD Lookup"
-msgstr "Căutare CD"
-
-#: ../picard/ui/ui_options_cdlookup_win32.py:57
-msgid "Default CD-ROM drive to use for lookups:"
-msgstr ""
-
-#: ../picard/ui/tageditor.py:65 ../picard/ui/ui_options_plugins.py:62
-#: ../picard/ui/multitageditor.py:37
-msgid "Details"
-msgstr ""
-
-#: ../picard/ui/tageditor.py:70 ../picard/ui/tageditor.py:241
-#: ../picard/ui/multitageditor.py:42 ../picard/ui/multitageditor.py:197
-#, python-format
-msgid "%d file"
-msgid_plural "%d files"
-msgstr[0] ""
-msgstr[1] ""
-
-#: ../picard/ui/tageditor.py:124 ../picard/ui/multitageditor.py:95
-#, python-format
-msgid "(different across %d file)"
-msgid_plural "(different across %d files)"
-msgstr[0] ""
-msgstr[1] ""
-
-#: ../picard/ui/tageditor.py:127 ../picard/ui/multitageditor.py:98
-#, python-format
-msgid "(missing from %d file)"
-msgid_plural "(missing from %d files)"
-msgstr[0] ""
-msgstr[1] ""
-
-#: ../picard/ui/tageditor.py:210 ../picard/ui/multitageditor.py:166
-msgid "Filename:"
-msgstr ""
-
-#: ../picard/ui/tageditor.py:212 ../picard/ui/multitageditor.py:168
-msgid "Format:"
-msgstr ""
-
-#: ../picard/ui/tageditor.py:221 ../picard/ui/multitageditor.py:177
-msgid "Size:"
-msgstr ""
-
-#: ../picard/ui/tageditor.py:227 ../picard/ui/multitageditor.py:183
-msgid "Bitrate:"
-msgstr ""
-
-#: ../picard/ui/tageditor.py:229 ../picard/ui/multitageditor.py:185
-msgid "Sample rate:"
-msgstr ""
-
-#: ../picard/ui/tageditor.py:231 ../picard/ui/multitageditor.py:187
-msgid "Bits per sample:"
-msgstr ""
-
-#: ../picard/ui/tageditor.py:234 ../picard/ui/multitageditor.py:190
-msgid "Mono"
-msgstr ""
-
-#: ../picard/ui/tageditor.py:235 ../picard/ui/multitageditor.py:191
-msgid "Stereo"
-msgstr ""
-
-#: ../picard/ui/tageditor.py:237 ../picard/ui/multitageditor.py:193
-msgid "Channels:"
-msgstr ""
-
-#: ../picard/ui/ui_tageditor.py:115 ../picard/ui/ui_multitageditor.py:55
-#: ../picard/ui/ui_options_plugins.py:59 ../picard/ui/options/plugins.py:76
+#: ../picard/ui/ui_tageditor.py:115
+#: ../picard/ui/ui_options_plugins.py:59
+#: ../picard/ui/options/plugins.py:76
 msgid "Name"
-msgstr ""
+msgstr "Nume"
 
-#: ../picard/ui/ui_tageditor.py:116 ../picard/ui/ui_multitageditor.py:56
+#: ../picard/ui/ui_tageditor.py:116
 msgid "Value"
-msgstr ""
+msgstr "Valoare"
 
-#: ../picard/ui/ui_tageditor.py:117 ../picard/ui/ui_multitageditor.py:57
+#: ../picard/ui/ui_tageditor.py:117
 msgid "&Add..."
-msgstr ""
+msgstr "&Adăugare..."
 
 #: ../picard/ui/ui_tageditor.py:118
 msgid "&Edit..."
-msgstr ""
+msgstr "&Editare..."
 
 #: ../picard/ui/ui_tageditor.py:119
 msgid "&Delete"
-msgstr ""
+msgstr "Ș&terge"
 
 #: ../picard/ui/ui_tageditor.py:120
 msgid "&Metadata"
-msgstr ""
+msgstr "&Metadate"
 
 #: ../picard/ui/ui_tageditor.py:121
 msgid "A&rtwork"
-msgstr ""
+msgstr "Cope&rți"
 
 #: ../picard/ui/ui_tageditor.py:122
 msgid "&Info"
+msgstr "&Informații"
+
+#: ../picard/ui/passworddialog.py:38
+#, python-format
+msgid "The server %s requires you to login. Please enter your username and password."
+msgstr "Serverul %s cere să vă identificați. Introduceți numele și parola."
+
+#: ../picard/ui/ui_cdlookup.py:60
+#: ../picard/ui/ui_options_cdlookup.py:47
+#: ../picard/ui/ui_options_cdlookup_win32.py:56
+#: ../picard/ui/options/cdlookup.py:35
+msgid "CD Lookup"
+msgstr "Căutare CD"
+
+#: ../picard/ui/ui_cdlookup.py:61
+msgid "The following releases on MusicBrainz match the CD:"
+msgstr "Următoarele albume de pe MusicBrainz se potrivesc discului:"
+
+#: ../picard/ui/ui_cdlookup.py:62
+#: ../picard/ui/ui_puidsubmit.py:53
+msgid "OK"
+msgstr "Bine"
+
+#: ../picard/ui/ui_cdlookup.py:63
+msgid "    Lookup manually    "
+msgstr "    Caută manual    "
+
+#: ../picard/ui/ui_cdlookup.py:64
+#: ../picard/ui/ui_puidsubmit.py:54
+msgid "Cancel"
+msgstr "Renunță"
+
+#: ../picard/ui/ui_passworddialog.py:78
+#, fuzzy
+msgid "Authentication required"
+msgstr "Autentificare necesară"
+
+#: ../picard/ui/ui_passworddialog.py:79
+#: ../picard/ui/ui_options_general.py:113
+#: ../picard/ui/ui_options_proxy.py:83
+msgid "Username:"
+msgstr "Utilizator:"
+
+#: ../picard/ui/ui_passworddialog.py:80
+#: ../picard/ui/ui_options_general.py:112
+#: ../picard/ui/ui_options_proxy.py:82
+msgid "Password:"
+msgstr "Parolă:"
+
+#: ../picard/ui/ui_passworddialog.py:81
+msgid "Save username and password"
+msgstr "Păstrează numele și parola"
+
+#: ../picard/ui/ui_edittagdialog.py:44
+msgid "Edit Tag"
+msgstr "Modifică eticheta"
+
+#: ../picard/ui/ui_metadata.py:121
+msgid "Lookup"
+msgstr "Caută"
+
+#: ../picard/ui/ui_metadata.py:122
+msgid "Title:"
+msgstr "Titlu:"
+
+#: ../picard/ui/ui_metadata.py:123
+msgid "Date:"
+msgstr "Data:"
+
+#: ../picard/ui/ui_metadata.py:124
+msgid "Artist:"
+msgstr "Artist:"
+
+#: ../picard/ui/ui_metadata.py:125
+msgid "Track:"
+msgstr "Pistă:"
+
+#: ../picard/ui/ui_metadata.py:126
+msgid "0000-00-00; "
+msgstr "0000-00-00; "
+
+#: ../picard/ui/ui_metadata.py:128
+msgid "Album:"
+msgstr "Album:"
+
+#: ../picard/ui/ui_options.py:42
+msgid "Options"
+msgstr "Opțiuni"
+
+#: ../picard/ui/ui_options_cdlookup.py:48
+msgid "CD-ROM device to use for lookups:"
+msgstr "Unitate de disc de folosit pentru căutări:"
+
+#: ../picard/ui/ui_options_cdlookup_win32.py:57
+msgid "Default CD-ROM drive to use for lookups:"
+msgstr "Unitatea de disc folosită pentru căutări:"
+
+#: ../picard/ui/ui_options_cover.py:56
+msgid "Location"
+msgstr "Locație"
+
+#: ../picard/ui/ui_options_cover.py:57
+msgid "Embed cover images into tags"
+msgstr "Încorporează imaginile coperților în tag-uri"
+
+#: ../picard/ui/ui_options_cover.py:58
+msgid "Save cover images as separate files"
+msgstr "Salvează coperțile ca fișiere separate"
+
+#: ../picard/ui/ui_options_cover.py:59
+msgid "Overwrite the file if it already exists"
+msgstr "Supra-scrie fișierul dacă există deja"
+
+#: ../picard/ui/util.py:31
+msgid "&Ok"
 msgstr ""
 
-#: ../picard/ui/coverartbox.py:47
-msgid "Cover Art"
-msgstr ""
-
-#: ../picard/ui/coverartbox.py:95
-msgid "Buy the album on Amazon"
-msgstr ""
+#: ../picard/ui/util.py:32
+#, fuzzy
+msgid "&Cancel"
+msgstr "Renunță"
 
 #: ../picard/ui/ui_puidsubmit.py:52
 msgid "Submit PUIDs"
 msgstr "Transmite PUID-urile"
 
-#: ../picard/ui/ui_puidsubmit.py:53 ../picard/ui/ui_cdlookup.py:62
-msgid "OK"
-msgstr ""
+#: ../picard/ui/ui_options_folksonomy.py:114
+#: ../picard/ui/options/folksonomy.py:29
+msgid "Folksonomy Tags"
+msgstr "Etichete utilizator"
 
-#: ../picard/ui/ui_puidsubmit.py:54 ../picard/ui/ui_cdlookup.py:64
-msgid "Cancel"
-msgstr "Anulează"
+#: ../picard/ui/ui_options_folksonomy.py:115
+msgid "Ignore tags:"
+msgstr "Ignoră etichetele:"
 
-#: ../picard/ui/puidsubmit.py:31 ../picard/ui/options/plugins.py:80
-msgid "File"
-msgstr "Fişier"
+#: ../picard/ui/ui_options_folksonomy.py:116
+msgid "Minimal tag usage:"
+msgstr "Cât mai puține tag-uri:"
 
-#: ../picard/ui/puidsubmit.py:31
-msgid "PUID"
-msgstr ""
+#: ../picard/ui/ui_options_folksonomy.py:117
+#: ../picard/ui/ui_options_matching.py:107
+#: ../picard/ui/ui_options_matching.py:108
+#: ../picard/ui/ui_options_matching.py:109
+#: ../picard/ui/ui_options_matching.py:113
+msgid " %"
+msgstr " %"
 
-#: ../picard/ui/puidsubmit.py:31
-msgid "Release"
-msgstr ""
+#: ../picard/ui/ui_options_folksonomy.py:118
+msgid "Maximum number of tags:"
+msgstr "Număr maxim de etichete:"
 
-#: ../picard/ui/puidsubmit.py:31
-msgid "Release ID"
-msgstr ""
+#: ../picard/ui/ui_options_folksonomy.py:119
+msgid "Join multiple tags with:"
+msgstr "Unește etichete multiple cu:"
 
-#: ../picard/ui/filebrowser.py:41
-msgid "&Move Tagged Files Here"
-msgstr ""
+#: ../picard/ui/ui_options_folksonomy.py:120
+msgid " / "
+msgstr " / "
 
-#: ../picard/ui/filebrowser.py:44
-msgid "Show &Hidden Files"
-msgstr ""
+#: ../picard/ui/ui_options_folksonomy.py:121
+msgid ", "
+msgstr ", "
 
-#: ../picard/ui/ui_cdlookup.py:61
-msgid "The following releases on MusicBrainz match the CD:"
-msgstr ""
+#: ../picard/ui/ui_options_interface.py:50
+msgid "Miscellaneous"
+msgstr "Diverse"
 
-#: ../picard/ui/ui_cdlookup.py:63
-msgid "    Lookup manually    "
-msgstr ""
+#: ../picard/ui/ui_options_interface.py:51
+msgid "Show text labels under icons"
+msgstr "Afișează etichete sub icoane"
 
-#: ../picard/ui/ui_options.py:42
-msgid "Options"
-msgstr ""
+#: ../picard/ui/ui_options_interface.py:52
+msgid "Allow selection of multiple directories"
+msgstr "Permite a selecta dosare multiple"
 
-#: ../picard/ui/tagsfromfilenames.py:52 ../picard/ui/tagsfromfilenames.py:96
-msgid "File Name"
-msgstr ""
+#: ../picard/ui/ui_options_interface.py:53
+msgid "Use advanced query syntax"
+msgstr "Folosește sintaxa avansată de căutare"
 
-#: ../picard/ui/ui_options_cover.py:56
-msgid "Location"
-msgstr ""
+#: ../picard/ui/ui_options_interface.py:54
+#, fuzzy
+msgid "User interface language:"
+msgstr "Utilizator:"
 
-#: ../picard/ui/ui_options_cover.py:57
-msgid "Embed cover images into tags"
-msgstr ""
+#: ../picard/ui/ui_options_naming.py:165
+msgid "Rename Files"
+msgstr "Redenumește fișiere"
 
-#: ../picard/ui/ui_options_cover.py:58
-msgid "Save cover images as separate files"
-msgstr ""
+#: ../picard/ui/ui_options_naming.py:166
+msgid "Replace Windows-incompatible characters"
+msgstr "Înlocuiește caracterele incompatibile cu Windows"
 
-#: ../picard/ui/ui_options_cover.py:59
-msgid "Overwrite the file if it already exists"
-msgstr ""
+#: ../picard/ui/ui_options_naming.py:167
+msgid "Replace non-ASCII characters"
+msgstr "Înlocuiește caracterele non-ASCII"
+
+#: ../picard/ui/ui_options_naming.py:168
+#: ../picard/ui/ui_options_naming.py:169
+#: ../picard/ui/ui_options_metadata.py:109
+#: ../picard/ui/ui_options_metadata.py:110
+msgid "Default"
+msgstr "Implicit"
+
+#: ../picard/ui/ui_options_naming.py:170
+#: ../picard/ui/options/naming.py:90
+msgid "Multiple artist file naming format:"
+msgstr "Numele fișierelor cu artiști multipli:"
+
+#: ../picard/ui/ui_options_naming.py:171
+#: ../picard/ui/options/naming.py:86
+msgid "File naming format:"
+msgstr "Formatul numelor de fișier:"
+
+#: ../picard/ui/ui_options_naming.py:172
+msgid "Move Files"
+msgstr "Mutare fișiere"
+
+#: ../picard/ui/ui_options_naming.py:173
+msgid "Move tagged files to this directory:"
+msgstr "Mută fișierele etichetate în acest dosar:"
+
+#: ../picard/ui/ui_options_naming.py:174
+msgid "Browse..."
+msgstr "Navigare..."
+
+#: ../picard/ui/ui_options_naming.py:175
+msgid "Move additional files:"
+msgstr "Mută și aceste fișiere:"
+
+#: ../picard/ui/ui_options_naming.py:176
+msgid "Delete empty directories"
+msgstr "Șterge dosarele rămase goale"
+
+#: ../picard/ui/ui_options_naming.py:177
+msgid "Example"
+msgstr "Exemplu"
+
+#: ../picard/ui/ui_options_naming.py:178
+msgid "File name:"
+msgstr "Nume fișier:"
+
+#: ../picard/ui/ui_options_naming.py:179
+msgid "Multiple artist file name:"
+msgstr "Nume de fișier cu artiști multipli:"
+
+#: ../picard/ui/ui_options_naming.py:180
+#: ../picard/ui/ui_tagsfromfilenames.py:58
+msgid "&Preview"
+msgstr "&Previzualizează"
+
+#: ../picard/ui/ui_options_general.py:108
+msgid "MusicBrainz Server"
+msgstr "Serverul MusicBrainz"
+
+#: ../picard/ui/ui_options_general.py:109
+#: ../picard/ui/ui_options_proxy.py:84
+msgid "Port:"
+msgstr "Port:"
+
+#: ../picard/ui/ui_options_general.py:110
+#: ../picard/ui/ui_options_proxy.py:85
+msgid "Server address:"
+msgstr "Adresa serverului:"
+
+#: ../picard/ui/ui_options_general.py:111
+msgid "Account Information"
+msgstr "Informații cont"
+
+#: ../picard/ui/ui_options_general.py:114
+#: ../picard/ui/options/general.py:29
+msgid "General"
+msgstr "Generale"
+
+#: ../picard/ui/ui_options_general.py:115
+msgid "Automatically scan all new files"
+msgstr "Analizează automat fișierele nou adăugate"
+
+#: ../picard/ui/ui_options_matching.py:105
+msgid "Thresholds"
+msgstr "Limite"
+
+#: ../picard/ui/ui_options_matching.py:106
+msgid "Minimal similarity for matching files to tracks:"
+msgstr "Similaritatea minimă de asociere fișiere cu piese"
+
+#: ../picard/ui/ui_options_matching.py:110
+msgid "Minimal similarity for file lookups:"
+msgstr "Similaritate minimă pentru căutare de fișiere"
+
+#: ../picard/ui/ui_options_matching.py:111
+msgid "Minimal similarity for cluster lookups:"
+msgstr "Similaritate minimă pentru căutare de grupaje"
+
+#: ../picard/ui/ui_options_matching.py:112
+msgid "Minimal similarity for PUID lookups:"
+msgstr "Similaritate minimă pentru căutare cu PUID-uri"
 
 #: ../picard/ui/ui_options_metadata.py:100
+#: ../picard/ui/options/metadata.py:31
 msgid "Metadata"
-msgstr ""
+msgstr "Metadate"
 
 #: ../picard/ui/ui_options_metadata.py:101
 msgid "Translate foreign artist names to English where possible"
-msgstr ""
+msgstr "Transliterează numele artiștilor străini în alfabetul latin, când se poate"
 
 #: ../picard/ui/ui_options_metadata.py:102
 msgid "Use release relationships"
-msgstr ""
+msgstr "Folosește asocieri pentru albume"
 
 #: ../picard/ui/ui_options_metadata.py:103
 msgid "Use track relationships"
-msgstr ""
+msgstr "Folosește asocieri pentru piese"
 
 #: ../picard/ui/ui_options_metadata.py:104
 msgid "Use folksonomy tags as genre"
-msgstr ""
+msgstr "Folosește etichetele „folksonomy” ca genuri muzicale"
 
 #: ../picard/ui/ui_options_metadata.py:105
 msgid "Preferred release country:"
-msgstr ""
+msgstr "Țara preferată pentru albume"
 
 #: ../picard/ui/ui_options_metadata.py:106
 msgid "Custom Fields"
-msgstr ""
+msgstr "Câmpuri personalizate"
 
 #: ../picard/ui/ui_options_metadata.py:107
 msgid "Various artists:"
-msgstr "Artişti multipli:"
+msgstr "Artiști multipli:"
 
 #: ../picard/ui/ui_options_metadata.py:108
 msgid "Non-album tracks:"
 msgstr "Piese fără album:"
 
-#: ../picard/ui/ui_options_metadata.py:109
-#: ../picard/ui/ui_options_metadata.py:110
-#: ../picard/ui/ui_options_naming.py:168 ../picard/ui/ui_options_naming.py:169
-msgid "Default"
-msgstr "Implicit"
-
-#: ../picard/ui/ui_multitageditor.py:58
-msgid "Delete"
-msgstr ""
-
-#: ../picard/ui/logview.py:29
-msgid "Log"
-msgstr ""
-
 #: ../picard/ui/ui_options_plugins.py:58
+#: ../picard/ui/options/plugins.py:30
 msgid "Plugins"
-msgstr ""
+msgstr "Module"
 
-#: ../picard/ui/ui_options_plugins.py:60 ../picard/ui/options/plugins.py:79
+#: ../picard/ui/ui_options_plugins.py:60
+#: ../picard/ui/options/plugins.py:79
 msgid "Author"
-msgstr ""
+msgstr "Autor"
 
 #: ../picard/ui/ui_options_plugins.py:61
+#: ../picard/util/tags.py:36
 msgid "Version"
-msgstr ""
+msgstr "Versiune"
 
-#: ../picard/ui/ui_options_naming.py:165
-msgid "Rename Files"
-msgstr ""
+#: ../picard/ui/ui_options_proxy.py:81
+#: ../picard/ui/options/proxy.py:28
+msgid "Web Proxy"
+msgstr "Proxy de rețea"
 
-#: ../picard/ui/ui_options_naming.py:166
-msgid "Replace Windows-incompatible characters"
-msgstr ""
+#: ../picard/ui/ui_options_script.py:52
+msgid "Tagger Script"
+msgstr "Scripturi de etichetare"
 
-#: ../picard/ui/ui_options_naming.py:167
-msgid "Replace non-ASCII characters"
-msgstr ""
+#: ../picard/ui/ui_options_tags.py:105
+msgid "Common"
+msgstr "General"
 
-#: ../picard/ui/ui_options_naming.py:170 ../picard/ui/options/naming.py:90
-msgid "Multiple artist file naming format:"
-msgstr ""
+#: ../picard/ui/ui_options_tags.py:106
+msgid "Clear existing tags before writing new tags"
+msgstr "Șterge tag-urile existente înainte de rescriere"
 
-#: ../picard/ui/ui_options_naming.py:171 ../picard/ui/options/naming.py:86
-msgid "File naming format:"
-msgstr ""
+#: ../picard/ui/ui_options_tags.py:107
+msgid "Don't write tags to files"
+msgstr "Nu scrie tag-urile în fișiere"
 
-#: ../picard/ui/ui_options_naming.py:172
-msgid "Move Files"
-msgstr ""
+#: ../picard/ui/ui_options_tags.py:108
+msgid "ID3"
+msgstr "ID3"
 
-#: ../picard/ui/ui_options_naming.py:173
-msgid "Move tagged files to this directory:"
-msgstr ""
+#: ../picard/ui/ui_options_tags.py:109
+msgid "Write ID3v1 tags to the files"
+msgstr "Scrie tag-uri ID3v1 în fișiere"
 
-#: ../picard/ui/ui_options_naming.py:174
-msgid "Browse..."
-msgstr ""
+#: ../picard/ui/ui_options_tags.py:110
+msgid "Write ID3v2 version 2.3 tags (2.4 is default)"
+msgstr "Scrie tag-uri ID3v2 versiunea 2.3 (altfel sunt 2.4)"
 
-#: ../picard/ui/ui_options_naming.py:175
-msgid "Move additional files:"
-msgstr ""
+#: ../picard/ui/ui_options_tags.py:111
+msgid "Text encoding to use while writing ID3v2 tags:"
+msgstr "Encoding text folosit la scrierea tag-urilor ID3v2"
 
-#: ../picard/ui/ui_options_naming.py:176
-msgid "Delete empty directories"
-msgstr ""
+#: ../picard/ui/ui_options_tags.py:112
+msgid "ISO-8859-1"
+msgstr "ISO-8859-1"
 
-#: ../picard/ui/ui_options_naming.py:177
-msgid "Example"
-msgstr ""
+#: ../picard/ui/ui_options_tags.py:113
+msgid "UTF-16"
+msgstr "UTF-16"
 
-#: ../picard/ui/ui_options_naming.py:178
-msgid "File name:"
-msgstr ""
+#: ../picard/ui/ui_options_tags.py:114
+msgid "UTF-8"
+msgstr "UTF-8"
 
-#: ../picard/ui/ui_options_naming.py:179
-msgid "Multiple artist file name:"
-msgstr ""
+#: ../picard/ui/ui_options_tags.py:115
+msgid "Remove ID3 tags from FLAC files"
+msgstr "Șterge tag-urile ID3 din fișierel FLAC"
 
-#: ../picard/ui/ui_options_cdlookup.py:48
-msgid "CD-ROM device to use for lookups:"
-msgstr ""
+#: ../picard/ui/ui_options_tags.py:116
+msgid "APE"
+msgstr "APE"
 
-#: ../picard/ui/options/scripting.py:84 ../picard/ui/options/naming.py:86
-#: ../picard/ui/options/naming.py:90 ../picard/ui/options/naming.py:93
-#: ../picard/ui/options/naming.py:95
-msgid "Script Error"
-msgstr ""
+#: ../picard/ui/ui_options_tags.py:117
+msgid "Remove APEv2 tags from MP3 files"
+msgstr "Șterge tag-urile APEv2 din fișierele MP3"
+
+#: ../picard/ui/ui_tagsfromfilenames.py:56
+msgid "Convert File Names to Tags"
+msgstr "Transformă numele fișierelor în tag-uri"
+
+#: ../picard/ui/ui_tagsfromfilenames.py:57
+msgid "Replace underscores with spaces"
+msgstr "Înlocuiește liniuța de subliniere cu spațiu"
+
+#: ../picard/ui/options/about.py:29
+msgid "About"
+msgstr "Despre noi"
 
 #. Replace this with your name to have it appear in the "About" dialog.
 #: ../picard/ui/options/about.py:48
 msgid "translator-credits"
 msgstr ""
 "Launchpad Contributions:\n"
-"  Bogdan Butnaru <https://launchpad.net/~bogdanb>\n"
-"\n"
-"Launchpad Contributions:\n"
-"  Bogdan Butnaru https://launchpad.net/~bogdanb\n"
-"\n"
-"Launchpad Contributions:\n"
-"  Bogdan Butnaru https://launchpad.net/~bogdanb\n"
-"\n"
-"Launchpad Contributions:\n"
-"  Bogdan Butnaru https://launchpad.net/~bogdanb\n"
-"  Lukáš Lalinský https://launchpad.net/~luks\n"
-"\n"
-"Launchpad Contributions:\n"
 "  Bogdan Butnaru https://launchpad.net/~bogdanb\n"
 "  Lukáš Lalinský https://launchpad.net/~luks"
 
@@ -904,48 +2231,347 @@ msgstr ""
 #: ../picard/ui/options/about.py:51
 #, python-format
 msgid "<br/>Translated to LANG by %s"
-msgstr ""
+msgstr "<br/>Tradus în românește de %s"
 
 #: ../picard/ui/options/about.py:55
-#, python-format
+#, fuzzy, python-format
 msgid ""
-"<p align=\"center\"><span style=\"font-size:15px;font-weight:bold;"
-"\">MusicBrainz Picard</span><br/>\n"
+"<p align=\"center\"><span style=\"font-size:15px;font-weight:bold;\">MusicBrainz Picard</span><br/>\n"
 "Version %(version)s</p>\n"
 "<p align=\"center\"><strong>Supported formats</strong><br/>%(formats)s</p>\n"
 "<p align=\"center\"><strong>Please donate</strong><br/>\n"
-"Thank you for using Picard. Picard relies on the MusicBrainz database, which "
-"is operated by the MetaBrainz Foundation with the help of thousands of "
-"volunteers. If you like this application please consider donating to the "
-"MetaBrainz Foundation to keep the service running.</p>\n"
-"<p align=\"center\"><a href=\"http://metabrainz.org/donate/index.html"
-"\">Donate now!</a></p>\n"
+"Thank you for using Picard. Picard relies on the MusicBrainz database, which is operated by the MetaBrainz Foundation with the help of thousands of volunteers. If you like this application please consider donating to the MetaBrainz Foundation to keep the service running.</p>\n"
+"<p align=\"center\"><a href=\"http://metabrainz.org/donate/index.html\">Donate now!</a></p>\n"
 "<p align=\"center\"><strong>Credits</strong><br/>\n"
-"<small>Copyright © 2004-2008 Robert Kaye, Lukáš Lalinský and others%"
-"(translator-credits)s</small></p>\n"
-"<p align=\"center\"><a href=\"http://musicbrainz.org/doc/PicardTagger"
-"\">http://musicbrainz.org/doc/PicardTagger</a></p>\n"
+"<small>Copyright © 2004-2008 Robert Kaye, Lukáš Lalinský and others%(translator-credits)s</small></p>\n"
+"<p align=\"center\"><a href=\"http://musicbrainz.org/doc/PicardTagger\">http://musicbrainz.org/doc/PicardTagger</a></p>\n"
 msgstr ""
+"<p align=\"center\"><span style=\"font-size:15px;font-weight:bold;\">MusicBrainz Picard</span><br/>\n"
+"Versiunea %(version)s</p>\n"
+"<p align=\"center\"><strong>Formate cunoscute</strong><br/>%(formats)s</p>\n"
+"<p align=\"center\"><strong>Vă rugăm donați</strong><br/>\n"
+"Mulțumim că folosiți Picard. Picard folosește baza de date MusicBrainz, care este administrată de Fundația MetaBrainz cu ajutorul a mii de voluntari. Dacă vă place această aplicație vă rugăm să vă gândiți la o donație către Fundația MetaBrainz pentru a ține serviciul în funcțiune.</p>\n"
+"<p align=\"center\"><a href=\"http://metabrainz.org/donate/index.html\">Donează acum!</a></p>\n"
+"<p align=\"center\"><strong>Contribuitori</strong><br/>\n"
+"<small>Copyright © 2004-2008 Robert Kaye, Lukáš Lalinský și alții%(translator-credits)s</small></p>\n"
+"<p align=\"center\"><a href=\"http://musicbrainz.org/doc/PicardTagger\">http://musicbrainz.org/doc/PicardTagger</a></p>\n"
+
+#: ../picard/ui/options/advanced.py:26
+msgid "Advanced"
+msgstr ""
+
+#: ../picard/ui/options/interface.py:31
+#, fuzzy
+msgid "User Interface"
+msgstr "Utilizator:"
+
+#: ../picard/ui/options/interface.py:47
+msgid "System default"
+msgstr "Limba implicită"
+
+#: ../picard/ui/options/interface.py:71
+#, fuzzy
+msgid "Language changed"
+msgstr "Limba"
+
+#: ../picard/ui/options/interface.py:71
+msgid "You have changed the interface language. You have to restart Picard in order for the change to take effect."
+msgstr ""
+
+#: ../picard/ui/options/matching.py:29
+msgid "Matching"
+msgstr ""
+
+#: ../picard/ui/options/metadata.py:52
+msgid "None"
+msgstr ""
+
+#: ../picard/ui/options/naming.py:33
+#, fuzzy
+msgid "File Naming"
+msgstr "Numele fișierului"
+
+#: ../picard/ui/options/naming.py:86
+#: ../picard/ui/options/naming.py:90
+#: ../picard/ui/options/naming.py:93
+#: ../picard/ui/options/naming.py:95
+#: ../picard/ui/options/scripting.py:84
+msgid "Script Error"
+msgstr "Eroare în script"
 
 #: ../picard/ui/options/naming.py:93
 msgid "The file naming format must not be empty."
-msgstr ""
+msgstr "Formatul numelor de fișiere nu poate fi gol."
 
 #: ../picard/ui/options/naming.py:95
 msgid "The multiple artist file naming format must not be empty."
-msgstr ""
+msgstr "Formatul numelor de fișiere cu artiști multipli nu poate fi gol."
 
 #: ../picard/ui/options/naming.py:97
 msgid "Error"
-msgstr ""
+msgstr "Eroare"
 
 #: ../picard/ui/options/naming.py:97
 msgid "The location to move files to must not be empty."
+msgstr "Locul de mutat fișierele nu trebuie să fie gol"
+
+#: ../picard/ui/options/scripting.py:63
+msgid "Scripting"
 msgstr ""
 
+#: ../picard/ui/options/tags.py:29
+msgid "Tags"
+msgstr "Etichete"
+
+#: ../picard/util/tags.py:24
+#, fuzzy
+msgid "Date"
+msgstr "Data:"
+
+#: ../picard/util/tags.py:25
+#, fuzzy
+msgid "Album Artist"
+msgstr "Artist"
+
+#: ../picard/util/tags.py:26
+#, fuzzy
+msgid "Track Number"
+msgstr "Nr."
+
+#: ../picard/util/tags.py:27
+#, fuzzy
+msgid "Total Tracks"
+msgstr "Piese fără album:"
+
+#: ../picard/util/tags.py:28
+#, fuzzy
+msgid "Disc Number"
+msgstr "Numărul piesei"
+
+#: ../picard/util/tags.py:29
+msgid "Total Discs"
+msgstr ""
+
+#: ../picard/util/tags.py:30
+#, fuzzy
+msgid "Album Artist Sort Order"
+msgstr "Numele de sortare al artistului albumului"
+
+#: ../picard/util/tags.py:31
+msgid "Artist Sort Order"
+msgstr ""
+
+#: ../picard/util/tags.py:32
+msgid "Title Sort Order"
+msgstr ""
+
+#: ../picard/util/tags.py:33
+#, fuzzy
+msgid "Album Sort Order"
+msgstr "Grupaj pe albume"
+
+#: ../picard/util/tags.py:34
+msgid "ASIN"
+msgstr ""
+
+#: ../picard/util/tags.py:35
+msgid "Grouping"
+msgstr ""
+
+#: ../picard/util/tags.py:37
+msgid "ISRC"
+msgstr ""
+
+#: ../picard/util/tags.py:38
+#, fuzzy
+msgid "Mood"
+msgstr "Mono"
+
+#: ../picard/util/tags.py:39
+msgid "BPM"
+msgstr ""
+
+#: ../picard/util/tags.py:40
+#, fuzzy
+msgid "Copyright"
+msgstr "Copiază"
+
+#: ../picard/util/tags.py:41
+#, fuzzy
+msgid "Composer"
+msgstr "Închide"
+
+#: ../picard/util/tags.py:42
+msgid "Conductor"
+msgstr ""
+
+#: ../picard/util/tags.py:43
+msgid "Lyricist"
+msgstr ""
+
+#: ../picard/util/tags.py:44
+msgid "Arranger"
+msgstr ""
+
+#: ../picard/util/tags.py:45
+msgid "Producer"
+msgstr ""
+
+#: ../picard/util/tags.py:46
+msgid "Engineer"
+msgstr ""
+
+#: ../picard/util/tags.py:47
+#, fuzzy
+msgid "Subtitle"
+msgstr "Titlu"
+
+#: ../picard/util/tags.py:48
+#, fuzzy
+msgid "Disc Subtitle"
+msgstr "Numărul piesei"
+
+#: ../picard/util/tags.py:49
+msgid "Remixer"
+msgstr ""
+
+#: ../picard/util/tags.py:50
+#, fuzzy
+msgid "MusicBrainz Track Id"
+msgstr "MusicBrainz Picard"
+
+#: ../picard/util/tags.py:51
+#, fuzzy
+msgid "MusicBrainz Release Id"
+msgstr "MusicBrainz Picard"
+
+#: ../picard/util/tags.py:52
+#, fuzzy
+msgid "MusicBrainz Artist Id"
+msgstr "MusicBrainz Picard"
+
+#: ../picard/util/tags.py:53
+#, fuzzy
+msgid "MusicBrainz Release Artist Id"
+msgstr "MusicBrainz Picard"
+
+#: ../picard/util/tags.py:54
+#, fuzzy
+msgid "MusicBrainz TRM Id"
+msgstr "MusicBrainz Picard"
+
+#: ../picard/util/tags.py:55
+#, fuzzy
+msgid "MusicBrainz Disc Id"
+msgstr "MusicBrainz Picard"
+
+#: ../picard/util/tags.py:56
+#, fuzzy
+msgid "MusicBrainz Sort Name"
+msgstr "Serverul MusicBrainz"
+
+#: ../picard/util/tags.py:57
+msgid "MusicIP PUID"
+msgstr ""
+
+#: ../picard/util/tags.py:58
+#, fuzzy
+msgid "MusicIP Fingerprint"
+msgstr "Amprente audio"
+
+#: ../picard/util/tags.py:59
+msgid "Disc Id"
+msgstr ""
+
+#: ../picard/util/tags.py:60
+msgid "Website"
+msgstr ""
+
+#: ../picard/util/tags.py:61
+#, fuzzy
+msgid "Compilation"
+msgstr "Locație"
+
+#: ../picard/util/tags.py:62
+#, fuzzy
+msgid "Comment"
+msgstr "General"
+
+#: ../picard/util/tags.py:63
+#, fuzzy
+msgid "Genre"
+msgstr "Generale"
+
+#: ../picard/util/tags.py:64
+msgid "Encoded By"
+msgstr ""
+
+#: ../picard/util/tags.py:65
+msgid "Performer"
+msgstr ""
+
+#: ../picard/util/tags.py:66
+#, fuzzy
+msgid "Release Type"
+msgstr "Data lansării"
+
+#: ../picard/util/tags.py:67
+#, fuzzy
+msgid "Release Status"
+msgstr "Data lansării"
+
+#: ../picard/util/tags.py:68
+#, fuzzy
+msgid "Release Country"
+msgstr "Data lansării"
+
+#: ../picard/util/tags.py:69
+msgid "Record Label"
+msgstr ""
+
+#: ../picard/util/tags.py:70
+msgid "Barcode"
+msgstr ""
+
+#: ../picard/util/tags.py:71
+#, fuzzy
+msgid "Catalog Number"
+msgstr "Numărul piesei"
+
+#: ../picard/util/tags.py:72
+#, fuzzy
+msgid "Format"
+msgstr "Format:"
+
+#: ../picard/util/tags.py:73
+msgid "DJ-Mixer"
+msgstr ""
+
+#: ../picard/util/tags.py:74
+#, fuzzy
+msgid "Media"
+msgstr "Metadate"
+
+#: ../picard/util/tags.py:75
+msgid "Lyrics"
+msgstr ""
+
+#: ../picard/util/tags.py:76
+msgid "Mixer"
+msgstr ""
+
+#: ../picard/util/tags.py:77
+msgid "Language"
+msgstr "Limba"
+
+#: ../picard/util/tags.py:78
+#, fuzzy
+msgid "Script"
+msgstr "Eroare în script"
+
 #: ../picard/util/webbrowser2.py:84
 msgid "Web Browser Error"
-msgstr ""
+msgstr "Eroare legată de navigatorul web"
 
 #: ../picard/util/webbrowser2.py:84
 #, python-format
@@ -954,67 +2580,67 @@ msgid ""
 "\n"
 "%s"
 msgstr ""
+"Eroare la lansarea navigatorului web:\n"
+"\n"
+"%s"
 
-#~ msgid "File %s identified!"
-#~ msgstr "Fişierul %s a fost identificat!"
+#, fuzzy
+#~ msgid "New Version"
+#~ msgstr "Versiune"
+#~ msgid "Delete"
+#~ msgstr "Șterge"
+#~ msgid "Maximal number of tags:"
+#~ msgstr "Număr maxim de etichete:"
 
-#~ msgid "About"
-#~ msgstr "Despre noi"
-
-#~ msgid "Tags"
-#~ msgstr "Etichete"
+#, fuzzy
+#~ msgid "Anal&yze"
+#~ msgstr "Analizează"
 
+#, fuzzy
+#~ msgid "Generate &Cuesheet..."
+#~ msgstr "Generează playlist"
 #~ msgid "Automatically analyze all new files"
 #~ msgstr "Analizează automat toate fişierelor noi"
 
+#, fuzzy
+#~ msgid "Album artist:"
+#~ msgstr "Artist:"
+
+#, fuzzy
+#~ msgid "A&dd Directory..."
+#~ msgstr "Adaugă un &director...\tCtrl+D"
 #~ msgid "Are You Sure?"
 #~ msgstr "Sunteţi sigur(ă)?"
-
 #~ msgid "Add &Files...\tCtrl+O"
 #~ msgstr "Adaugă &fişiere...\tCtrl+O"
-
 #~ msgid "Add &Directory...\tCtrl+D"
 #~ msgstr "Adaugă un &director...\tCtrl+D"
-
 #~ msgid "&Save Files\tCtrl+S"
 #~ msgstr "&Salvează fişierele\tCtrl+S"
-
 #~ msgid "C&opy\tCtrl+C"
 #~ msgstr "C&opiere\tCtrl+C"
-
 #~ msgid "Help"
 #~ msgstr "Ajutor"
-
 #~ msgid "Preferences"
 #~ msgstr "Preferinţe"
-
 #~ msgid "Error while saving cuesheet %s."
 #~ msgstr "Eroare la salvarea cuesheet-ului %s."
-
 #~ msgid "Cuesheet %s saved."
 #~ msgstr "Cuesheet-ul %s a fost salvat."
-
 #~ msgid "Time"
 #~ msgstr "Durată"
-
 #~ msgid "Albums"
 #~ msgstr "Albume"
-
 #~ msgid "Force Save"
 #~ msgstr "Forţează salvarea"
-
 #~ msgid "Buy"
 #~ msgstr "Cumpărare"
-
 #~ msgid "Welcome to Picard!"
 #~ msgstr "Bine aţi venit la Picard!"
-
 #~ msgid "Track Num"
 #~ msgstr "Nr."
-
 #~ msgid "PUID Collision"
 #~ msgstr "Coliziune de PUID-uri"
-
 #~ msgid ""
 #~ "Version %s\n"
 #~ "\n"
@@ -1041,121 +2667,84 @@ msgstr ""
 #~ "de un grant al Helix Community.\n"
 #~ "\n"
 #~ "Formate suportate: %s"
-
-#~ msgid "Colors"
-#~ msgstr "Culori"
-
 #~ msgid "Font color"
 #~ msgstr "Culoarea textului"
-
 #~ msgid "Directories"
 #~ msgstr "Directoare"
-
 #~ msgid "Watch for new files"
 #~ msgstr "Urmărirea noilor fişiere"
-
 #~ msgid "Watch this directory for new audio files"
 #~ msgstr "Urmăreşte acest director pentru apariţia de noi fişiere"
-
 #~ msgid "Encodings"
 #~ msgstr "Codări"
-
 #~ msgid "all languages"
 #~ msgstr "toate limbile"
-
 #~ msgid "percent similar."
 #~ msgstr "la sută asemănătoare."
-
 #~ msgid "Load recently used albums on startup"
 #~ msgstr "Încarcă albumele folosite recent la pornire"
-
-#~ msgid "Language"
-#~ msgstr "Limba"
-
-#~ msgid "System default"
-#~ msgstr "Limba implicită"
-
 #~ msgid "Allowed filename characters"
 #~ msgstr "Caractere permise în numele fişiere"
-
 #~ msgid "Use Windows-safe file names"
 #~ msgstr "Adaptează numele de fişiere pentru Windows"
-
 #~ msgid "Number of tracks on the album"
 #~ msgstr "Numărul de piese de pe album"
-
 #~ msgid "Track name"
 #~ msgstr "Numele piesei"
-
 #~ msgid "Zero padded track number"
 #~ msgstr "Numărul piesei, completat cu 0 iniţial la nevoie"
-
 #~ msgid "File format (e.g. mp3, ogg, wav)"
 #~ msgstr "Formatul fişierului (de ex. mp3, ogg, wav)"
-
 #~ msgid "Album type (album, single, EP, etc.)"
 #~ msgstr "Tipul albumului (album, single, EP, etc.)"
-
 #~ msgid "Album Status (official, promo, etc.)"
 #~ msgstr "Tipul lansării (oficial, promoţie, etc.)"
-
 #~ msgid "Album release month"
 #~ msgstr "Luna de lansare a albumului"
-
 #~ msgid "Album release day"
 #~ msgstr "Ziua de lansare a albumului"
-
 #~ msgid "Album release year"
 #~ msgstr "Anul de lansare a albumului"
-
 #~ msgid "Make it so!"
 #~ msgstr "Aplică!"
-
 #~ msgid "Use proxy server to access the Internet"
 #~ msgstr "Foloseşte un server proxy pentru acces la Internet"
-
 #~ msgid "Proxy server to use"
 #~ msgstr "Serverul proxy de utilizat"
-
 #~ msgid "Proxy port"
 #~ msgstr "Portul proxy-ului"
-
 #~ msgid "ID3v2.4 only"
 #~ msgstr "doar ID3v2.4"
-
 #~ msgid "Save track/album"
 #~ msgstr "Salvează piesa/albumul"
-
 #~ msgid "Artists"
 #~ msgstr "Artişti"
 
+#, fuzzy
+#~ msgid "Auto Tag"
+#~ msgstr "Modifică eticheta"
+
+#, fuzzy
+#~ msgid "Edit &Tags..."
+#~ msgstr "Modifică eticheta"
 #~ msgid "New files (drag files to tag here)"
 #~ msgstr "Fişiere noi (trageţi fişierele de etichetat aici)"
-
 #~ msgid "updating album information"
 #~ msgstr "se modifică informaţiile albumului"
-
 #~ msgid "Submitting PUID information to MusicBrainz server ..."
 #~ msgstr "Se transmit PUID-urile către serverul MusicBrainz..."
-
 #~ msgid "Performing a PUID lookup on file %s ..."
 #~ msgstr "Se caută după PUID fişierul %s..."
-
 #~ msgid "Are you sure you want to exit the application?"
 #~ msgstr "Doriţi să închideţi aplicaţia?"
-
 #~ msgid "CD Lookup error -- is there a CD in the CD-ROM drive?"
 #~ msgstr "Eroare la citirea CD-ului – este vreun CD în unitate?"
-
 #~ msgid "CD Lookup Failed"
 #~ msgstr "Căutarea CD-ului a eşuat"
-
 #~ msgid "&Quick Start Guide"
 #~ msgstr "&Ghid rapid de utilizare"
-
 #~ msgid "Quick Start Guide"
 #~ msgstr "Ghid rapid de utilizare"
-
 #~ msgid ""
 #~ "You have not specified an username and password. In order to contribute "
 #~ "data to MusicBrainz, you must have a MusicBrainz account.\n"
@@ -1167,26 +2756,20 @@ msgstr ""
 #~ "date către MusicBrainz, aveţi nevoie de un cont.\n"
 #~ "Doriţi să creaţi un cont nou acum? Dacă aveţi deja un cont la "
 #~ "MusicBrainz, vă rugăm introduceţi informaţiile în meniul de opţiuni. "
-
 #~ msgid "Couldn't connect to the MusicBrainz server."
 #~ msgstr "Conectarea la serverul MusicBrainz a eşuat."
-
 #~ msgid "Connection error"
 #~ msgstr "Eroare de conectare"
-
 #~ msgid ""
 #~ "MusicBrainz Picard requires wxPython with UNICODE support.\n"
 #~ "Please download the appropriate toolkit from http://www.wxpython.org/"
 #~ msgstr ""
 #~ "MusicBrainz Picard are nevoie de wxPython cu suport UNICODE.\n"
 #~ "Vă rugăm descărcaţi instrumentele necesare de la http://www.wxpython.org/"
-
 #~ msgid "PUID collision on file %s!"
 #~ msgstr "Coliziune PUID la fişierul %s!"
-
 #~ msgid "Save error"
 #~ msgstr "Eroare la salvare"
-
 #~ msgid ""
 #~ "The move files option is enabled, but the destination directory is not "
 #~ "specified or invalid.\n"
@@ -1197,7 +2780,6 @@ msgstr ""
 #~ "e nespecificat sau inexistent.\n"
 #~ "Vă rugăm corectaţi opţiunea de mutare sau directorul destinaţi şi "
 #~ "încercaţi din nou."
-
 #~ msgid ""
 #~ "Not all files could be saved. Please check for and examine tracks that "
 #~ "have an error icon in front of them. To retry saving the track, right "
@@ -1206,153 +2788,67 @@ msgstr ""
 #~ "Nu s-au putut salva toate fişierele. Vă rugăm verificaţi piesele care au "
 #~ "o icoană de eroare în faţa lor. Pentru a reîncerca salvarea fişierului, "
 #~ "apăsaţi cu butonul drept pe piesă şi selectaţi 'Anulare eroare'."
-
 #~ msgid "Select directory that contains music files"
 #~ msgstr "Selectaţi directorul ce conţine melodii"
-
 #~ msgid "Reload album from main server"
 #~ msgstr "Reîncarcă albumul de pe server"
-
 #~ msgid "Select or drag a folder from below"
 #~ msgstr "Alegeţi un director de mai jos"
-
 #~ msgid "Drag files from below"
 #~ msgstr "Trageţi fişire de mai jos"
-
 #~ msgid "Release date"
 #~ msgstr "Data lansării"
-
 #~ msgid "%d%% similar"
 #~ msgstr "similaritate %d%%"
-
 #~ msgid "Please donate to MusicBrainz!"
 #~ msgstr "Vă rugăm să faceţi o donaţie pentru MusicBrainz!"
-
-#~ msgid "Later"
-#~ msgstr "Mai târziu"
-
 #~ msgid ""
 #~ "The destination directory %s does not exist. Please pick a valid "
 #~ "directory."
 #~ msgstr ""
 #~ "Directorul destinaţie %s nu există. Vă rugăm alegeţi un director valid."
-
 #~ msgid "Select the encoding to use when reading and writing filenames"
 #~ msgstr "Alegeţi codarea folosită pentru a citi şi scrie numele fişierelor"
-
 #~ msgid "Automatically move clusters to albums that are at least"
 #~ msgstr "Mută automat grupurile către albume ce sunt cel puţin"
-
 #~ msgid "Automatically save recognized tracks that are at least"
 #~ msgstr "Salvează automat piesele recunoscute care sunt cel puţin"
-
-#~ msgid "Czech"
-#~ msgstr "Cehă"
-
-#~ msgid "German"
-#~ msgstr "Germană"
-
-#~ msgid "English"
-#~ msgstr "Engleză"
-
-#~ msgid "English (UK)"
-#~ msgstr "Engleză (britanică)"
-
-#~ msgid "Spanish"
-#~ msgstr "Spaniolă"
-
-#~ msgid "Finnish"
-#~ msgstr "Finlandeză"
-
-#~ msgid "French"
-#~ msgstr "Franceză"
-
-#~ msgid "Hungarian"
-#~ msgstr "Maghiară"
-
-#~ msgid "Icelandic"
-#~ msgstr "Islandeză"
-
-#~ msgid "Italian"
-#~ msgstr "Italiană"
-
-#~ msgid "Korean"
-#~ msgstr "Koreană"
-
-#~ msgid "Lithuanian"
-#~ msgstr "Lituaniană"
-
-#~ msgid "Dutch"
-#~ msgstr "Olandeză"
-
-#~ msgid "Norwegian Bokmal"
-#~ msgstr "Norvegiană (Bokmal)"
-
-#~ msgid "Portuguese"
-#~ msgstr "Portugheză"
-
-#~ msgid "Romanian"
-#~ msgstr "Română"
-
-#~ msgid "Russian"
-#~ msgstr "Rusă"
-
-#~ msgid "Slovak"
-#~ msgstr "Slovacă"
-
-#~ msgid "Swedish"
-#~ msgstr "Suedeză"
-
 #~ msgid ""
 #~ "Note: This setting will take effect after you restart the application."
 #~ msgstr ""
 #~ "Atenţie: Această opţiune va intra în acţiune după ce reporniţi programul."
-
 #~ msgid "Artist translation"
 #~ msgstr "Traducerea artiştilor"
-
 #~ msgid "Rename files when writing metadata tags"
 #~ msgstr "Redenumeşte fişierele când sunt etichetate cu metadate"
-
 #~ msgid "Naming Help"
 #~ msgstr "Instrucţiuni"
-
 #~ msgid ""
 #~ "You may use the following variables in the filenaming\n"
 #~ "specifications in the options dialog:"
 #~ msgstr ""
 #~ "Puteţi folosi următoarele variabile în specificaţiile\n"
 #~ "de fişiere din meniul cu opţiuni:"
-
 #~ msgid "A %s in the naming specification will create a new subfolder."
 #~ msgstr "Un carater %s în specificaţia numelui va crea un nou subdirector."
-
 #~ msgid "Audio fingerprinting options"
 #~ msgstr "Opţiuni pentru amprentele audio"
-
 #~ msgid "Automatically select PUID collision tracks that are at least"
 #~ msgstr "Selectează automate piesele în coliziune PUID dacă sunt cel puţin"
-
 #~ msgid "Write ID3v1 tags to MP3 files (ID3v2 tags will always be written)"
 #~ msgstr ""
 #~ "Scrie etichete ID3v1 în fişierele MP3 (etichetele ID3v2 sunt scrise "
 #~ "oricum)"
-
 #~ msgid "Remove track/album"
 #~ msgstr "Elimină piesa/albumul"
-
 #~ msgid "Listen to track"
 #~ msgstr "Ascultă piesa"
-
 #~ msgid "Album clusters"
 #~ msgstr "Grupaj pe albume"
-
 #~ msgid "Unmatched files for this album"
 #~ msgstr "Fişiere neidentificate din album"
-
 #~ msgid "%d of %d tracks linked"
 #~ msgstr "%d din %d au fost identificate"
-
 #~ msgid ""
 #~ "The Picard Tagger is a free application and you may\n"
 #~ "use it as long as you wish. However, providing\n"
@@ -1371,69 +2867,50 @@ msgstr ""
 #~ "se ocupă de proiectul MusicBrainz. Toate donaţiile sunt \n"
 #~ "deductibile din taxe pentru rezidenţii SUA şi vor ajuta \n"
 #~ "acest serviciu să continue."
-
 #~ msgid "Matched track highlighting"
 #~ msgstr "Marcarea pieselor identificate"
-
 #~ msgid "Good match background color"
 #~ msgstr "Culoarea potrivirilor bune"
-
 #~ msgid "Bad match background color"
 #~ msgstr "Culoarea potrivirilor proaste"
-
 #~ msgid "Move files option"
 #~ msgstr "Opţiunea de mutare a fişierelor"
-
 #~ msgid "When matching tracks to albums, accept tracks that are at least"
 #~ msgstr ""
 #~ "La potrivirea între fişiere şi albume, acceptă piesele care sunt cel puţin"
-
 #~ msgid "CD-ROM drive path to use for lookups"
 #~ msgstr "Calea CD-ROM de folosit pentru căutări"
-
 #~ msgid "Launch MB Tagger automatically for inserted Audio CDs"
 #~ msgstr "Porneşte programul automat la introducerea CD-urilor audio."
-
 #~ msgid ""
 #~ "Failed to set the proper registy values to enable launching the tagger "
 #~ "after CD insertion. "
 #~ msgstr ""
 #~ "Nu am reuşit să configurăm registrul pentru a activa lansarea automată la "
 #~ "introducea CD-urilor. "
-
 #~ msgid "Default CD setting failed"
 #~ msgstr "Setarea automată a CD-ului a eşuat"
-
 #~ msgid "File format naming specification"
 #~ msgstr "Specificaţia numelor de fişiere"
-
 #~ msgid "Various artist file format naming specification"
 #~ msgstr "Specificaţia numelor de fişiere din albume cu mai mulţi artişti"
-
 #~ msgid "Note: Leave blank to allow all possible characters"
 #~ msgstr ""
 #~ "Notă: Lăsaţi câmpul gol pentru a permite toate caracterele posibile."
-
 #~ msgid "Track artist name"
 #~ msgstr "Numele artistului asociat piesei"
-
 #~ msgid "Track artist sortname"
 #~ msgstr "Numele de sortare al artistului piesei"
-
 #~ msgid "The first character of the artist sortname"
 #~ msgstr "Primul caracter al numelui de sortare al artistului"
-
 #~ msgid "The first two characters of the artist sortname"
 #~ msgstr "Primele două caractere ale numelui de sortare al artistului"
-
 #~ msgid "The first three characters of the artist sortname"
 #~ msgstr "Primele trei caractere ale numelui de sortare al artistului"
-
 #~ msgid "Naming specification help"
 #~ msgstr "Instrucţiuni pentru specificaţiile numelor"
-
 #~ msgid "Accept PUID matches that are at least"
 #~ msgstr "Acceptă potrivirile PUID care sunt cel puţin"
-
 #~ msgid "Various artist name"
 #~ msgstr "Numele artistului pentru \"mai mulţi artişti\""
+
diff --git a/po/ru.po b/po/ru.po
index 8b103364d..adcff6888 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -6,40 +6,1313 @@ msgid ""
 msgstr ""
 "Project-Id-Version: picard\n"
 "Report-Msgid-Bugs-To: http://bugs.musicbrainz.org/\n"
-"POT-Creation-Date: 2008-12-01 18:20+0100\n"
-"PO-Revision-Date: 2008-08-25 13:37+0000\n"
-"Last-Translator: BasicXP <Unknown>\n"
+"POT-Creation-Date: 2009-01-25 12:23+0100\n"
+"PO-Revision-Date: 2009-01-25 13:34+0100\n"
+"Last-Translator: Philipp Wolfer <phw@rubyforge.org>\n"
 "Language-Team: Russian <ru@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%"
-"10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
-"X-Launchpad-Export-Date: 2008-12-01 17:01+0000\n"
+"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
+"X-Launchpad-Export-Date: 2009-01-24 23:28+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 "X-Poedit-Country: RUSSIAN FEDERATION\n"
 "X-Poedit-Bookmarks: -1,-1,-1,-1,-1,-1,-1,41,-1,-1\n"
 "Generated-By: pygettext.py 1.5\n"
 "X-Poedit-Language: Russian\n"
 
-#: ../picard/album.py:108 ../picard/cluster.py:248
+#: ../picard/album.py:108
+#: ../picard/cluster.py:248
 msgid "Unmatched Files"
 msgstr "Неопознанные файлы"
 
-#: ../picard/album.py:269
+#: ../picard/album.py:281
 #, python-format
 msgid "[couldn't load album %s]"
 msgstr "[не удалось загрузить альбом %s]"
 
-#: ../picard/album.py:305
+#: ../picard/album.py:317
 msgid "[loading album information]"
 msgstr "[загружается информация об альбоме]"
 
-#: ../picard/tagger.py:472
+#: ../picard/cluster.py:164
+#: ../picard/cluster.py:175
+#, python-format
+msgid "No matching releases for cluster %s"
+msgstr "Нет подходящих релизов для кластера %s"
+
+#: ../picard/cluster.py:177
+#, python-format
+msgid "Cluster %s identified!"
+msgstr "Кластер %s идентифицирован!"
+
+#: ../picard/cluster.py:182
+#, python-format
+msgid "Looking up the metadata for cluster %s..."
+msgstr "Поиск метаданных для кластера %s…"
+
+#: ../picard/const.py:40
+msgid "CD"
+msgstr ""
+
+#: ../picard/const.py:41
+msgid "DVD"
+msgstr ""
+
+#: ../picard/const.py:42
+msgid "SACD"
+msgstr ""
+
+#: ../picard/const.py:43
+msgid "LaserDisc"
+msgstr ""
+
+#: ../picard/const.py:44
+msgid "MiniDisc"
+msgstr ""
+
+#: ../picard/const.py:45
+msgid "Vinyl"
+msgstr ""
+
+#: ../picard/const.py:46
+msgid "Cassette"
+msgstr ""
+
+#: ../picard/const.py:47
+msgid "Cartridge (4/8-tracks)"
+msgstr ""
+
+#: ../picard/const.py:48
+msgid "Reel-to-Reel"
+msgstr ""
+
+#: ../picard/const.py:49
+msgid "DAT"
+msgstr ""
+
+#: ../picard/const.py:50
+#, fuzzy
+msgid "Digital Media"
+msgstr "Исходные метаданные"
+
+#: ../picard/const.py:51
+msgid "Wax Cylinder"
+msgstr ""
+
+#: ../picard/const.py:52
+msgid "Piano Roll"
+msgstr ""
+
+#: ../picard/const.py:53
+#, fuzzy
+msgid "Other"
+msgstr "Дата"
+
+#: ../picard/const.py:58
+msgid "Bangladesh"
+msgstr ""
+
+#: ../picard/const.py:59
+msgid "Belgium"
+msgstr ""
+
+#: ../picard/const.py:60
+msgid "Burkina Faso"
+msgstr ""
+
+#: ../picard/const.py:61
+msgid "Bulgaria"
+msgstr ""
+
+#: ../picard/const.py:62
+msgid "Barbados"
+msgstr ""
+
+#: ../picard/const.py:63
+msgid "Wallis and Futuna Islands"
+msgstr ""
+
+#: ../picard/const.py:64
+#, fuzzy
+msgid "Bermuda"
+msgstr "Немецкий"
+
+#: ../picard/const.py:65
+msgid "Brunei Darussalam"
+msgstr ""
+
+#: ../picard/const.py:66
+msgid "Bolivia"
+msgstr ""
+
+#: ../picard/const.py:67
+msgid "Bahrain"
+msgstr ""
+
+#: ../picard/const.py:68
+msgid "Burundi"
+msgstr ""
+
+#: ../picard/const.py:69
+msgid "Benin"
+msgstr ""
+
+#: ../picard/const.py:70
+msgid "Bhutan"
+msgstr ""
+
+#: ../picard/const.py:71
+msgid "Jamaica"
+msgstr ""
+
+#: ../picard/const.py:72
+msgid "Bouvet Island"
+msgstr ""
+
+#: ../picard/const.py:73
+msgid "Botswana"
+msgstr ""
+
+#: ../picard/const.py:74
+msgid "Samoa"
+msgstr ""
+
+#: ../picard/const.py:75
+msgid "Brazil"
+msgstr ""
+
+#: ../picard/const.py:76
+msgid "Bahamas"
+msgstr ""
+
+#: ../picard/const.py:77
+msgid "Belarus"
+msgstr ""
+
+#: ../picard/const.py:78
+msgid "Belize"
+msgstr ""
+
+#: ../picard/const.py:79
+msgid "Russian Federation"
+msgstr ""
+
+#: ../picard/const.py:80
+msgid "Rwanda"
+msgstr ""
+
+#: ../picard/const.py:81
+msgid "Reunion"
+msgstr ""
+
+#: ../picard/const.py:82
+msgid "Turkmenistan"
+msgstr ""
+
+#: ../picard/const.py:83
+msgid "Tajikistan"
+msgstr ""
+
+#: ../picard/const.py:84
+#, fuzzy
+msgid "Romania"
+msgstr "Румынский"
+
+#: ../picard/const.py:85
+#, fuzzy
+msgid "Tokela"
+msgstr "Панель инструментов"
+
+#: ../picard/const.py:86
+msgid "Guinea-Bissa"
+msgstr ""
+
+#: ../picard/const.py:87
+msgid "Guam"
+msgstr ""
+
+#: ../picard/const.py:88
+msgid "Guatemala"
+msgstr ""
+
+#: ../picard/const.py:89
+msgid "Greece"
+msgstr ""
+
+#: ../picard/const.py:90
+msgid "Equatorial Guinea"
+msgstr ""
+
+#: ../picard/const.py:91
+msgid "Guadeloupe"
+msgstr ""
+
+#: ../picard/const.py:92
+msgid "Japan"
+msgstr ""
+
+#: ../picard/const.py:93
+msgid "Guyana"
+msgstr ""
+
+#: ../picard/const.py:94
+msgid "French Guiana"
+msgstr ""
+
+#: ../picard/const.py:95
+#, fuzzy
+msgid "Georgia"
+msgstr "Немецкий"
+
+#: ../picard/const.py:96
+msgid "Grenada"
+msgstr ""
+
+#: ../picard/const.py:97
+msgid "United Kingdom"
+msgstr ""
+
+#: ../picard/const.py:98
+msgid "Gabon"
+msgstr ""
+
+#: ../picard/const.py:99
+msgid "El Salvador"
+msgstr ""
+
+#: ../picard/const.py:100
+#, fuzzy
+msgid "Guinea"
+msgstr "Основные"
+
+#: ../picard/const.py:101
+msgid "Gambia"
+msgstr ""
+
+#: ../picard/const.py:102
+msgid "Greenland"
+msgstr ""
+
+#: ../picard/const.py:103
+msgid "Gibraltar"
+msgstr ""
+
+#: ../picard/const.py:104
+msgid "Ghana"
+msgstr ""
+
+#: ../picard/const.py:105
+#, fuzzy
+msgid "Oman"
+msgstr "Немецкий"
+
+#: ../picard/const.py:106
+msgid "Tunisia"
+msgstr ""
+
+#: ../picard/const.py:107
+msgid "Jordan"
+msgstr ""
+
+#: ../picard/const.py:108
+msgid "Haiti"
+msgstr ""
+
+#: ../picard/const.py:109
+msgid "Hungary"
+msgstr ""
+
+#: ../picard/const.py:110
+msgid "Hong Kong"
+msgstr ""
+
+#: ../picard/const.py:111
+msgid "Honduras"
+msgstr ""
+
+#: ../picard/const.py:112
+msgid "Heard and Mc Donald Islands"
+msgstr ""
+
+#: ../picard/const.py:113
+msgid "Venezuela"
+msgstr ""
+
+#: ../picard/const.py:114
+msgid "Puerto Rico"
+msgstr ""
+
+#: ../picard/const.py:115
+msgid "Pala"
+msgstr ""
+
+#: ../picard/const.py:116
+#, fuzzy
+msgid "Portugal"
+msgstr "Португальский"
+
+#: ../picard/const.py:117
+msgid "Svalbard and Jan Mayen Islands"
+msgstr ""
+
+#: ../picard/const.py:118
+msgid "Paraguay"
+msgstr ""
+
+#: ../picard/const.py:119
+msgid "Iraq"
+msgstr ""
+
+#: ../picard/const.py:120
+msgid "Panama"
+msgstr ""
+
+#: ../picard/const.py:121
+msgid "French Polynesia"
+msgstr ""
+
+#: ../picard/const.py:122
+msgid "Papua New Guinea"
+msgstr ""
+
+#: ../picard/const.py:123
+msgid "Per"
+msgstr ""
+
+#: ../picard/const.py:124
+msgid "Pakistan"
+msgstr ""
+
+#: ../picard/const.py:125
+msgid "Philippines"
+msgstr ""
+
+#: ../picard/const.py:126
+msgid "Pitcairn"
+msgstr ""
+
+#: ../picard/const.py:127
+msgid "Poland"
+msgstr ""
+
+#: ../picard/const.py:128
+msgid "St. Pierre and Miquelon"
+msgstr ""
+
+#: ../picard/const.py:129
+msgid "Zambia"
+msgstr ""
+
+#: ../picard/const.py:130
+msgid "Western Sahara"
+msgstr ""
+
+#: ../picard/const.py:131
+msgid "Estonia"
+msgstr ""
+
+#: ../picard/const.py:132
+msgid "Egypt"
+msgstr ""
+
+#: ../picard/const.py:133
+msgid "South Africa"
+msgstr ""
+
+#: ../picard/const.py:134
+msgid "Ecuador"
+msgstr ""
+
+#: ../picard/const.py:135
+msgid "Italy"
+msgstr ""
+
+#: ../picard/const.py:136
+#, fuzzy
+msgid "Viet Nam"
+msgstr "Имя файла"
+
+#: ../picard/const.py:137
+msgid "Solomon Islands"
+msgstr ""
+
+#: ../picard/const.py:138
+msgid "Ethiopia"
+msgstr ""
+
+#: ../picard/const.py:139
+#, fuzzy
+msgid "Somalia"
+msgstr "Румынский"
+
+#: ../picard/const.py:140
+msgid "Zimbabwe"
+msgstr ""
+
+#: ../picard/const.py:141
+msgid "Saudi Arabia"
+msgstr ""
+
+#: ../picard/const.py:142
+#, fuzzy
+msgid "Spain"
+msgstr "Испанский"
+
+#: ../picard/const.py:143
+msgid "Eritrea"
+msgstr ""
+
+#: ../picard/const.py:144
+msgid "Moldova, Republic of"
+msgstr ""
+
+#: ../picard/const.py:145
+msgid "Madagascar"
+msgstr ""
+
+#: ../picard/const.py:146
+msgid "Morocco"
+msgstr ""
+
+#: ../picard/const.py:147
+#, fuzzy
+msgid "Monaco"
+msgstr "Моно"
+
+#: ../picard/const.py:148
+msgid "Uzbekistan"
+msgstr ""
+
+#: ../picard/const.py:149
+msgid "Myanmar"
+msgstr ""
+
+#: ../picard/const.py:150
+msgid "Mali"
+msgstr ""
+
+#: ../picard/const.py:151
+msgid "Maca"
+msgstr ""
+
+#: ../picard/const.py:152
+#, fuzzy
+msgid "Mongolia"
+msgstr "Моно"
+
+#: ../picard/const.py:153
+msgid "Marshall Islands"
+msgstr ""
+
+#: ../picard/const.py:154
+msgid "Macedonia, The Former Yugoslav Republic of"
+msgstr ""
+
+#: ../picard/const.py:155
+msgid "Mauritius"
+msgstr ""
+
+#: ../picard/const.py:156
+#, fuzzy
+msgid "Malta"
+msgstr "Метаданные"
+
+#: ../picard/const.py:157
+msgid "Malawi"
+msgstr ""
+
+#: ../picard/const.py:158
+msgid "Maldives"
+msgstr ""
+
+#: ../picard/const.py:159
+msgid "Martinique"
+msgstr ""
+
+#: ../picard/const.py:160
+msgid "Northern Mariana Islands"
+msgstr ""
+
+#: ../picard/const.py:161
+msgid "Montserrat"
+msgstr ""
+
+#: ../picard/const.py:162
+#, fuzzy
+msgid "Mauritania"
+msgstr "Литовкий"
+
+#: ../picard/const.py:163
+msgid "Uganda"
+msgstr ""
+
+#: ../picard/const.py:164
+msgid "Malaysia"
+msgstr ""
+
+#: ../picard/const.py:165
+msgid "Mexico"
+msgstr ""
+
+#: ../picard/const.py:166
+msgid "Israel"
+msgstr ""
+
+#: ../picard/const.py:167
+#, fuzzy
+msgid "France"
+msgstr "Отмена"
+
+#: ../picard/const.py:168
+msgid "British Indian Ocean Territory"
+msgstr ""
+
+#: ../picard/const.py:169
+msgid "St. Helena"
+msgstr ""
+
+#: ../picard/const.py:170
+msgid "Finland"
+msgstr ""
+
+#: ../picard/const.py:171
+msgid "Fiji"
+msgstr ""
+
+#: ../picard/const.py:172
+msgid "Falkland Islands (Malvinas)"
+msgstr ""
+
+#: ../picard/const.py:173
+msgid "Micronesia, Federated States of"
+msgstr ""
+
+#: ../picard/const.py:174
+msgid "Faroe Islands"
+msgstr ""
+
+#: ../picard/const.py:175
+msgid "Nicaragua"
+msgstr ""
+
+#: ../picard/const.py:176
+msgid "Netherlands"
+msgstr ""
+
+#: ../picard/const.py:177
+msgid "Norway"
+msgstr ""
+
+#: ../picard/const.py:178
+msgid "Namibia"
+msgstr ""
+
+#: ../picard/const.py:179
+msgid "Vanuat"
+msgstr ""
+
+#: ../picard/const.py:180
+msgid "New Caledonia"
+msgstr ""
+
+#: ../picard/const.py:181
+#, fuzzy
+msgid "Niger"
+msgstr "Микшер"
+
+#: ../picard/const.py:182
+msgid "Norfolk Island"
+msgstr ""
+
+#: ../picard/const.py:183
+msgid "Nigeria"
+msgstr ""
+
+#: ../picard/const.py:184
+#, fuzzy
+msgid "New Zealand"
+msgstr "Новые метаданные"
+
+#: ../picard/const.py:185
+msgid "Zaire"
+msgstr ""
+
+#: ../picard/const.py:186
+msgid "Nepal"
+msgstr ""
+
+#: ../picard/const.py:187
+msgid "Naur"
+msgstr ""
+
+#: ../picard/const.py:188
+msgid "Niue"
+msgstr ""
+
+#: ../picard/const.py:189
+msgid "Cook Islands"
+msgstr ""
+
+#: ../picard/const.py:190
+msgid "Cote d'Ivoire"
+msgstr ""
+
+#: ../picard/const.py:191
+msgid "Switzerland"
+msgstr ""
+
+#: ../picard/const.py:192
+msgid "Colombia"
+msgstr ""
+
+#: ../picard/const.py:193
+msgid "China"
+msgstr ""
+
+#: ../picard/const.py:194
+msgid "Cameroon"
+msgstr ""
+
+#: ../picard/const.py:195
+#, fuzzy
+msgid "Chile"
+msgstr "Файл"
+
+#: ../picard/const.py:196
+msgid "Cocos (Keeling) Islands"
+msgstr ""
+
+#: ../picard/const.py:197
+msgid "Canada"
+msgstr ""
+
+#: ../picard/const.py:198
+#, fuzzy
+msgid "Congo"
+msgstr "Моно"
+
+#: ../picard/const.py:199
+msgid "Central African Republic"
+msgstr ""
+
+#: ../picard/const.py:200
+msgid "Czech Republic"
+msgstr ""
+
+#: ../picard/const.py:201
+msgid "Cyprus"
+msgstr ""
+
+#: ../picard/const.py:202
+msgid "Christmas Island"
+msgstr ""
+
+#: ../picard/const.py:203
+msgid "Costa Rica"
+msgstr ""
+
+#: ../picard/const.py:204
+msgid "Cape Verde"
+msgstr ""
+
+#: ../picard/const.py:205
+msgid "Cuba"
+msgstr ""
+
+#: ../picard/const.py:206
+msgid "Swaziland"
+msgstr ""
+
+#: ../picard/const.py:207
+msgid "Syrian Arab Republic"
+msgstr ""
+
+#: ../picard/const.py:208
+msgid "Kyrgyzstan"
+msgstr ""
+
+#: ../picard/const.py:209
+msgid "Kenya"
+msgstr ""
+
+#: ../picard/const.py:210
+msgid "Suriname"
+msgstr ""
+
+#: ../picard/const.py:211
+msgid "Kiribati"
+msgstr ""
+
+#: ../picard/const.py:212
+msgid "Cambodia"
+msgstr ""
+
+#: ../picard/const.py:213
+msgid "Saint Kitts and Nevis"
+msgstr ""
+
+#: ../picard/const.py:214
+#, fuzzy
+msgid "Comoros"
+msgstr "Цвета"
+
+#: ../picard/const.py:215
+msgid "Sao Tome and Principe"
+msgstr ""
+
+#: ../picard/const.py:216
+#, fuzzy
+msgid "Slovenia"
+msgstr "Словацкий"
+
+#: ../picard/const.py:217
+msgid "Kuwait"
+msgstr ""
+
+#: ../picard/const.py:218
+#, fuzzy
+msgid "Senegal"
+msgstr "Основные"
+
+#: ../picard/const.py:219
+msgid "San Marino"
+msgstr ""
+
+#: ../picard/const.py:220
+msgid "Sierra Leone"
+msgstr ""
+
+#: ../picard/const.py:221
+msgid "Seychelles"
+msgstr ""
+
+#: ../picard/const.py:222
+msgid "Kazakhstan"
+msgstr ""
+
+#: ../picard/const.py:223
+msgid "Cayman Islands"
+msgstr ""
+
+#: ../picard/const.py:224
+msgid "Singapore"
+msgstr ""
+
+#: ../picard/const.py:225
+msgid "Sweden"
+msgstr ""
+
+#: ../picard/const.py:226
+#, fuzzy
+msgid "Sudan"
+msgstr "&Сканировать"
+
+#: ../picard/const.py:227
+msgid "Dominican Republic"
+msgstr ""
+
+#: ../picard/const.py:228
+#, fuzzy
+msgid "Dominica"
+msgstr "Румынский"
+
+#: ../picard/const.py:229
+#, fuzzy
+msgid "Djibouti"
+msgstr "О программе"
+
+#: ../picard/const.py:230
+msgid "Denmark"
+msgstr ""
+
+#: ../picard/const.py:231
+msgid "Virgin Islands (British)"
+msgstr ""
+
+#: ../picard/const.py:232
+#, fuzzy
+msgid "Germany"
+msgstr "Немецкий"
+
+#: ../picard/const.py:233
+msgid "Yemen"
+msgstr ""
+
+#: ../picard/const.py:234
+msgid "Algeria"
+msgstr ""
+
+#: ../picard/const.py:235
+msgid "United States"
+msgstr ""
+
+#: ../picard/const.py:236
+msgid "Uruguay"
+msgstr ""
+
+#: ../picard/const.py:237
+msgid "Mayotte"
+msgstr ""
+
+#: ../picard/const.py:238
+msgid "United States Minor Outlying Islands"
+msgstr ""
+
+#: ../picard/const.py:239
+msgid "Lebanon"
+msgstr ""
+
+#: ../picard/const.py:240
+msgid "Saint Lucia"
+msgstr ""
+
+#: ../picard/const.py:241
+msgid "Lao People's Democratic Republic"
+msgstr ""
+
+#: ../picard/const.py:242
+msgid "Tuval"
+msgstr ""
+
+#: ../picard/const.py:243
+msgid "Taiwan"
+msgstr ""
+
+#: ../picard/const.py:244
+msgid "Trinidad and Tobago"
+msgstr ""
+
+#: ../picard/const.py:245
+msgid "Turkey"
+msgstr ""
+
+#: ../picard/const.py:246
+msgid "Sri Lanka"
+msgstr ""
+
+#: ../picard/const.py:247
+msgid "Liechtenstein"
+msgstr ""
+
+#: ../picard/const.py:248
+msgid "Latvia"
+msgstr ""
+
+#: ../picard/const.py:249
+msgid "Tonga"
+msgstr ""
+
+#: ../picard/const.py:250
+#, fuzzy
+msgid "Lithuania"
+msgstr "Литовкий"
+
+#: ../picard/const.py:251
+msgid "Luxembourg"
+msgstr ""
+
+#: ../picard/const.py:252
+msgid "Liberia"
+msgstr ""
+
+#: ../picard/const.py:253
+#, fuzzy
+msgid "Lesotho"
+msgstr "Длина"
+
+#: ../picard/const.py:254
+msgid "Thailand"
+msgstr ""
+
+#: ../picard/const.py:255
+msgid "French Southern Territories"
+msgstr ""
+
+#: ../picard/const.py:256
+#, fuzzy
+msgid "Togo"
+msgstr "&Инструменты"
+
+#: ../picard/const.py:257
+msgid "Chad"
+msgstr ""
+
+#: ../picard/const.py:258
+msgid "Turks and Caicos Islands"
+msgstr ""
+
+#: ../picard/const.py:259
+msgid "Libyan Arab Jamahiriya"
+msgstr ""
+
+#: ../picard/const.py:260
+msgid "Vatican City State (Holy See)"
+msgstr ""
+
+#: ../picard/const.py:261
+msgid "Saint Vincent and The Grenadines"
+msgstr ""
+
+#: ../picard/const.py:262
+msgid "United Arab Emirates"
+msgstr ""
+
+#: ../picard/const.py:263
+msgid "Andorra"
+msgstr ""
+
+#: ../picard/const.py:264
+msgid "Antigua and Barbuda"
+msgstr ""
+
+#: ../picard/const.py:265
+msgid "Afghanistan"
+msgstr ""
+
+#: ../picard/const.py:266
+msgid "Anguilla"
+msgstr ""
+
+#: ../picard/const.py:267
+msgid "Virgin Islands (U.S.)"
+msgstr ""
+
+#: ../picard/const.py:268
+msgid "Iceland"
+msgstr ""
+
+#: ../picard/const.py:269
+msgid "Iran (Islamic Republic of)"
+msgstr ""
+
+#: ../picard/const.py:270
+msgid "Armenia"
+msgstr ""
+
+#: ../picard/const.py:271
+msgid "Albania"
+msgstr ""
+
+#: ../picard/const.py:272
+msgid "Angola"
+msgstr ""
+
+#: ../picard/const.py:273
+msgid "Netherlands Antilles"
+msgstr ""
+
+#: ../picard/const.py:274
+msgid "Antarctica"
+msgstr ""
+
+#: ../picard/const.py:275
+msgid "American Samoa"
+msgstr ""
+
+#: ../picard/const.py:276
+msgid "Argentina"
+msgstr ""
+
+#: ../picard/const.py:277
+msgid "Australia"
+msgstr ""
+
+#: ../picard/const.py:278
+#, fuzzy
+msgid "Austria"
+msgstr "Автор"
+
+#: ../picard/const.py:279
+msgid "Aruba"
+msgstr ""
+
+#: ../picard/const.py:280
+#, fuzzy
+msgid "India"
+msgstr "Медиа"
+
+#: ../picard/const.py:281
+msgid "Tanzania, United Republic of"
+msgstr ""
+
+#: ../picard/const.py:282
+msgid "Azerbaijan"
+msgstr ""
+
+#: ../picard/const.py:283
+msgid "Ireland"
+msgstr ""
+
+#: ../picard/const.py:284
+msgid "Indonesia"
+msgstr ""
+
+#: ../picard/const.py:285
+msgid "Ukraine"
+msgstr ""
+
+#: ../picard/const.py:286
+#, fuzzy
+msgid "Qatar"
+msgstr "Дата"
+
+#: ../picard/const.py:287
+msgid "Mozambique"
+msgstr ""
+
+#: ../picard/const.py:288
+msgid "Bosnia and Herzegovina"
+msgstr ""
+
+#: ../picard/const.py:289
+msgid "Congo, The Democratic Republic of the"
+msgstr ""
+
+#: ../picard/const.py:290
+msgid "Serbia and Montenegro"
+msgstr ""
+
+#: ../picard/const.py:291
+msgid "Croatia"
+msgstr ""
+
+#: ../picard/const.py:292
+msgid "Korea (North), Democratic People's Republic of"
+msgstr ""
+
+#: ../picard/const.py:293
+msgid "Korea (South), Republic of"
+msgstr ""
+
+#: ../picard/const.py:294
+#, fuzzy
+msgid "Slovakia"
+msgstr "Словацкий"
+
+#: ../picard/const.py:295
+msgid "Soviet Union (historical, 1922-1991)"
+msgstr ""
+
+#: ../picard/const.py:296
+msgid "East Timor"
+msgstr ""
+
+#: ../picard/const.py:297
+msgid "Czechoslovakia (historical, 1918-1992)"
+msgstr ""
+
+#: ../picard/const.py:298
+msgid "Europe"
+msgstr ""
+
+#: ../picard/const.py:299
+msgid "East Germany (historical, 1949-1990)"
+msgstr ""
+
+#: ../picard/const.py:300
+msgid "[Unknown Country]"
+msgstr ""
+
+#: ../picard/const.py:301
+msgid "[Worldwide]"
+msgstr ""
+
+#: ../picard/const.py:302
+msgid "Yugoslavia (historical, 1918-1992)"
+msgstr ""
+
+#: ../picard/const.py:307
+msgid "Catalan"
+msgstr ""
+
+#: ../picard/const.py:308
+msgid "Czech"
+msgstr "Чешский"
+
+#: ../picard/const.py:309
+msgid "Welsh"
+msgstr ""
+
+#: ../picard/const.py:310
+#, fuzzy
+msgid "Danish"
+msgstr "Испанский"
+
+#: ../picard/const.py:311
+msgid "German"
+msgstr "Немецкий"
+
+#: ../picard/const.py:312
+msgid "English"
+msgstr "Английский"
+
+#: ../picard/const.py:313
+#, fuzzy
+msgid "English (Canada)"
+msgstr "Английский (Великобритания)"
+
+#: ../picard/const.py:314
+msgid "English (UK)"
+msgstr "Английский (Великобритания)"
+
+#: ../picard/const.py:315
+msgid "Spanish"
+msgstr "Испанский"
+
+#: ../picard/const.py:316
+#, fuzzy
+msgid "Persian"
+msgstr "Версия"
+
+#: ../picard/const.py:317
+msgid "Finnish"
+msgstr ""
+
+#: ../picard/const.py:318
+msgid "French"
+msgstr ""
+
+#: ../picard/const.py:319
+msgid "Frisian"
+msgstr ""
+
+#: ../picard/const.py:320
+msgid "Hebrew"
+msgstr ""
+
+#: ../picard/const.py:321
+msgid "Hungarian"
+msgstr ""
+
+#: ../picard/const.py:322
+msgid "Islandic"
+msgstr ""
+
+#: ../picard/const.py:323
+msgid "Italian"
+msgstr ""
+
+#: ../picard/const.py:324
+msgid "Kannada"
+msgstr ""
+
+#: ../picard/const.py:325
+msgid "Korean"
+msgstr ""
+
+#: ../picard/const.py:326
+msgid "Lithuanian"
+msgstr "Литовкий"
+
+#: ../picard/const.py:327
+msgid "Norwegian Bokmal"
+msgstr ""
+
+#: ../picard/const.py:328
+msgid "Dutch"
+msgstr ""
+
+#: ../picard/const.py:329
+#, fuzzy
+msgid "Polish"
+msgstr "Плагины"
+
+#: ../picard/const.py:330
+msgid "Portuguese"
+msgstr "Португальский"
+
+#: ../picard/const.py:331
+#, fuzzy
+msgid "Brazilian Portuguese"
+msgstr "Португальский"
+
+#: ../picard/const.py:332
+msgid "Romanian"
+msgstr "Румынский"
+
+#: ../picard/const.py:333
+msgid "Russian"
+msgstr "Русский"
+
+#: ../picard/const.py:334
+#, fuzzy
+msgid "Scots"
+msgstr "Счёт"
+
+#: ../picard/const.py:335
+msgid "Slovak"
+msgstr "Словацкий"
+
+#: ../picard/const.py:336
+#, fuzzy
+msgid "Slovenian"
+msgstr "Словацкий"
+
+#: ../picard/const.py:337
+msgid "Swedish"
+msgstr ""
+
+#: ../picard/const.py:338
+#, fuzzy
+msgid "Chinese"
+msgstr "Каналы:"
+
+#: ../picard/file.py:475
+#, python-format
+msgid "No matching tracks for file %s"
+msgstr "Нет подходящих произведений для файла %s"
+
+#: ../picard/file.py:492
+#, fuzzy, python-format
+msgid "No matching tracks above the threshold for file %s"
+msgstr "Нет подходящих произведений для файла %s"
+
+#: ../picard/file.py:495
+#, python-format
+msgid "File %s identified!"
+msgstr "Файл %s идентифицирован!"
+
+#: ../picard/file.py:506
+#, python-format
+msgid "Looking up the PUID for file %s..."
+msgstr "Поиск PUID для файла %s…"
+
+#: ../picard/file.py:511
+#, python-format
+msgid "Looking up the metadata for file %s..."
+msgstr "Поиск метаданных для файла %s…"
+
+#: ../picard/puidmanager.py:58
+msgid "Submitting PUIDs..."
+msgstr "Идёт передача PUID’ов…"
+
+#: ../picard/puidmanager.py:64
+#, python-format
+msgid "PUIDs submission failed: %s"
+msgstr "Передача PUID’ов не удалась: %s"
+
+#: ../picard/puidmanager.py:66
+msgid "PUIDs successfully submitted!"
+msgstr "PUID’ы успешно переданы!"
+
+#: ../picard/playlist.py:31
+msgid "M3U Playlist (*.m3u)"
+msgstr "M3U плейлист (*.m3u)"
+
+#: ../picard/playlist.py:32
+msgid "PLS Playlist (*.pls)"
+msgstr "PLS плейлист (*.pls)"
+
+#: ../picard/playlist.py:33
+msgid "XSPF Playlist (*.xspf)"
+msgstr "XSPF плейлист (*.xspf)"
+
+#: ../picard/tagger.py:476
 msgid "CD Lookup Error"
 msgstr "Ошибка опознавания CD"
 
-#: ../picard/tagger.py:473
+#: ../picard/tagger.py:477
 #, python-format
 msgid ""
 "Error while reading CD:\n"
@@ -50,126 +1323,178 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../picard/ui/passworddialog.py:38
+#: ../picard/tagger.py:503
 #, python-format
-msgid ""
-"The server %s requires you to login. Please enter your username and password."
-msgstr ""
+msgid "Couldn't find PUID for file %s"
+msgstr "Невозможно найти PUID для файла %s"
 
-#: ../picard/ui/ui_options_script.py:52
-msgid "Tagger Script"
-msgstr "Скрипт теггера"
+#: ../picard/musicdns/__init__.py:98
+#, python-format
+msgid "Looking up the fingerprint for file %s..."
+msgstr "Поиск отпечатка для файла %s…"
+
+#: ../picard/musicdns/__init__.py:117
+#, python-format
+msgid "Creating fingerprint for file %s..."
+msgstr "Создание отпечатка для файла %s…"
 
 #: ../picard/ui/cdlookup.py:31
 msgid "Score"
 msgstr "Счёт"
 
 #: ../picard/ui/cdlookup.py:31
+#: ../picard/ui/itemviews.py:82
+#: ../picard/util/tags.py:23
 msgid "Title"
 msgstr "Название"
 
-#: ../picard/ui/cdlookup.py:31 ../picard/ui/mainwindow.py:436
+#: ../picard/ui/cdlookup.py:31
+#: ../picard/ui/itemviews.py:84
+#: ../picard/ui/mainwindow.py:436
+#: ../picard/util/tags.py:22
 msgid "Artist"
 msgstr "Исполнитель"
 
-#: ../picard/ui/ui_metadata.py:121
-msgid "Lookup"
-msgstr "Опознать"
+#: ../picard/ui/coverartbox.py:47
+#: ../picard/ui/options/cover.py:29
+msgid "Cover Art"
+msgstr "Обложка"
 
-#: ../picard/ui/ui_metadata.py:122
-msgid "Title:"
-msgstr "Название:"
+#: ../picard/ui/coverartbox.py:95
+msgid "Buy the album on Amazon"
+msgstr "Купить этот альбом на Amazon"
 
-#: ../picard/ui/ui_metadata.py:123
-msgid "Date:"
-msgstr "Дата:"
+#: ../picard/ui/filebrowser.py:38
+#: ../picard/ui/mainwindow.py:302
+msgid "&Refresh"
+msgstr "&Обновить"
 
-#: ../picard/ui/ui_metadata.py:124
-msgid "Artist:"
-msgstr "Исполнитель:"
+#: ../picard/ui/filebrowser.py:41
+#, fuzzy
+msgid "&Move Tagged Files Here"
+msgstr "П&ереносить файлы"
 
-#: ../picard/ui/ui_metadata.py:125
-msgid "Track:"
-msgstr "Дорожка:"
+#: ../picard/ui/filebrowser.py:44
+msgid "Show &Hidden Files"
+msgstr ""
 
-#: ../picard/ui/ui_metadata.py:126
-msgid "0000-00-00; "
-msgstr "0000-00-00; "
+#: ../picard/ui/itemviews.py:83
+msgid "Length"
+msgstr "Длина"
 
-#: ../picard/ui/ui_metadata.py:127 ../picard/ui/tageditor.py:225
-#: ../picard/ui/multitageditor.py:181
+#: ../picard/ui/itemviews.py:327
+msgid "&Releases"
+msgstr "&Релизы"
+
+#: ../picard/ui/itemviews.py:353
+msgid "&Plugins"
+msgstr "П&лагины"
+
+#: ../picard/ui/itemviews.py:523
+msgid "Clusters"
+msgstr "Кластеры"
+
+#: ../picard/ui/logview.py:29
+msgid "Log"
+msgstr "Отчёт"
+
+#: ../picard/ui/puidsubmit.py:31
+#: ../picard/ui/options/plugins.py:80
+msgid "File"
+msgstr "Файл"
+
+#: ../picard/ui/puidsubmit.py:31
+msgid "PUID"
+msgstr "PUID"
+
+#: ../picard/ui/puidsubmit.py:31
+#: ../picard/ui/mainwindow.py:437
+msgid "Track"
+msgstr "Произведение"
+
+#: ../picard/ui/puidsubmit.py:31
+msgid "Release"
+msgstr "Релиз"
+
+#: ../picard/ui/puidsubmit.py:31
+msgid "Release ID"
+msgstr "ID релиза"
+
+#: ../picard/ui/tageditor.py:65
+#: ../picard/ui/ui_options_plugins.py:62
+msgid "Details"
+msgstr "Подробности"
+
+#: ../picard/ui/tageditor.py:70
+#: ../picard/ui/tageditor.py:241
+#, python-format
+msgid "%d file"
+msgid_plural "%d files"
+msgstr[0] "%d файл"
+msgstr[1] "%d файла"
+msgstr[2] "%d файлов"
+
+#: ../picard/ui/tageditor.py:124
+#, python-format
+msgid "(different across %d file)"
+msgid_plural "(different across %d files)"
+msgstr[0] "(различается среди %d файла)"
+msgstr[1] "(различается среди %d файлов)"
+msgstr[2] "(различается среди %d файлов)"
+
+#: ../picard/ui/tageditor.py:127
+#, python-format
+msgid "(missing from %d file)"
+msgid_plural "(missing from %d files)"
+msgstr[0] "(отсутствует в %d файле)"
+msgstr[1] "(отсутствует в %d файлах)"
+msgstr[2] "(отсутствует в %d файлах)"
+
+#: ../picard/ui/tageditor.py:210
+msgid "Filename:"
+msgstr "Имя файла:"
+
+#: ../picard/ui/tageditor.py:212
+msgid "Format:"
+msgstr "Формат:"
+
+#: ../picard/ui/tageditor.py:221
+msgid "Size:"
+msgstr "Размер:"
+
+#: ../picard/ui/tageditor.py:225
+#: ../picard/ui/ui_metadata.py:127
 msgid "Length:"
 msgstr "Длительность:"
 
-#: ../picard/ui/ui_metadata.py:128
-msgid "Album:"
-msgstr "Альбом:"
+#: ../picard/ui/tageditor.py:227
+msgid "Bitrate:"
+msgstr "Битрейт:"
 
-#: ../picard/ui/ui_passworddialog.py:78
-#, fuzzy
-msgid "Authentication required"
-msgstr "Требуется поддержка Unicode"
+#: ../picard/ui/tageditor.py:229
+msgid "Sample rate:"
+msgstr "Частота дискретизации:"
 
-#: ../picard/ui/ui_passworddialog.py:79 ../picard/ui/ui_options_proxy.py:83
-#: ../picard/ui/ui_options_general.py:113
-msgid "Username:"
-msgstr "Имя пользователя:"
+#: ../picard/ui/tageditor.py:231
+msgid "Bits per sample:"
+msgstr "Битов на семпл:"
 
-#: ../picard/ui/ui_passworddialog.py:80 ../picard/ui/ui_options_proxy.py:82
-#: ../picard/ui/ui_options_general.py:112
-msgid "Password:"
-msgstr "Пароль:"
+#: ../picard/ui/tageditor.py:234
+msgid "Mono"
+msgstr "Моно"
 
-#: ../picard/ui/ui_passworddialog.py:81
-msgid "Save username and password"
-msgstr ""
+#: ../picard/ui/tageditor.py:235
+msgid "Stereo"
+msgstr "Стерео"
 
-#: ../picard/ui/ui_options_folksonomy.py:114
-#: ../picard/ui/ui_options_folksonomy_tags.py:114
-msgid "Folksonomy Tags"
-msgstr "Теги, выбранные сообществом"
+#: ../picard/ui/tageditor.py:237
+msgid "Channels:"
+msgstr "Каналы:"
 
-#: ../picard/ui/ui_options_folksonomy.py:115
-#: ../picard/ui/ui_options_folksonomy_tags.py:115
-msgid "Ignore tags:"
-msgstr "Игнорировать теги:"
-
-#: ../picard/ui/ui_options_folksonomy.py:116
-#: ../picard/ui/ui_options_folksonomy_tags.py:116
-msgid "Minimal tag usage:"
-msgstr "Минимальное использование тегов:"
-
-#: ../picard/ui/ui_options_folksonomy.py:117
-#: ../picard/ui/ui_options_folksonomy_tags.py:117
-#: ../picard/ui/ui_options_matching.py:107
-#: ../picard/ui/ui_options_matching.py:108
-#: ../picard/ui/ui_options_matching.py:109
-#: ../picard/ui/ui_options_matching.py:113
-msgid " %"
-msgstr " %"
-
-#: ../picard/ui/ui_options_folksonomy.py:118
-msgid "Maximum number of tags:"
-msgstr "Максимальное число тегов:"
-
-#: ../picard/ui/ui_options_folksonomy.py:119
-#: ../picard/ui/ui_options_folksonomy_tags.py:119
-msgid "Join multiple tags with:"
-msgstr "Объединять множественные теги с помощью:"
-
-#: ../picard/ui/ui_options_folksonomy.py:120
-#: ../picard/ui/ui_options_folksonomy_tags.py:120
-msgid " / "
-msgstr " / "
-
-#: ../picard/ui/ui_options_folksonomy.py:121
-#: ../picard/ui/ui_options_folksonomy_tags.py:121
-msgid ", "
-msgstr ", "
-
-#: ../picard/ui/ui_options_folksonomy_tags.py:118
-msgid "Maximal number of tags:"
-msgstr "Максимальное число тегов:"
+#: ../picard/ui/tagsfromfilenames.py:52
+#: ../picard/ui/tagsfromfilenames.py:96
+msgid "File Name"
+msgstr "Имя файла"
 
 #: ../picard/ui/mainwindow.py:64
 msgid "MusicBrainz Picard"
@@ -304,7 +1629,8 @@ msgstr "Поиск"
 msgid "&CD Lookup..."
 msgstr "Опознавание &CD…"
 
-#: ../picard/ui/mainwindow.py:272 ../picard/ui/mainwindow.py:273
+#: ../picard/ui/mainwindow.py:272
+#: ../picard/ui/mainwindow.py:273
 msgid "Lookup CD"
 msgstr "Опознать CD"
 
@@ -335,7 +1661,8 @@ msgstr "Ctrl+U"
 msgid "&Lookup"
 msgstr "&Опознать"
 
-#: ../picard/ui/mainwindow.py:291 ../picard/ui/mainwindow.py:292
+#: ../picard/ui/mainwindow.py:291
+#: ../picard/ui/mainwindow.py:292
 msgid "Lookup metadata"
 msgstr "Искать метаданные"
 
@@ -348,10 +1675,6 @@ msgstr "Ctrl+L"
 msgid "&Details..."
 msgstr "П&одробности…"
 
-#: ../picard/ui/mainwindow.py:302 ../picard/ui/filebrowser.py:38
-msgid "&Refresh"
-msgstr "&Обновить"
-
 #: ../picard/ui/mainwindow.py:305
 msgid "Generate &Playlist..."
 msgstr "Создать &плейлист…"
@@ -397,6 +1720,7 @@ msgid "&Tools"
 msgstr "&Инструменты"
 
 #: ../picard/ui/mainwindow.py:384
+#: ../picard/ui/util.py:33
 msgid "&Help"
 msgstr "&Справка"
 
@@ -409,13 +1733,10 @@ msgid "&Search Bar"
 msgstr "&Панель поиска"
 
 #: ../picard/ui/mainwindow.py:435
+#: ../picard/util/tags.py:21
 msgid "Album"
 msgstr "Альбом"
 
-#: ../picard/ui/mainwindow.py:437 ../picard/ui/puidsubmit.py:31
-msgid "Track"
-msgstr "Произведение"
-
 #: ../picard/ui/mainwindow.py:476
 msgid "All Supported Formats"
 msgstr "Все поддерживаемые форматы"
@@ -430,37 +1751,289 @@ msgstr "Сохранение плейлиста %s…"
 msgid "Playlist %s saved"
 msgstr "Плейлист %s сохранен"
 
-#: ../picard/ui/mainwindow.py:638 ../picard/ui/mainwindow.py:647
+#: ../picard/ui/mainwindow.py:638
+#: ../picard/ui/mainwindow.py:647
 #, python-format
 msgid " (Error: %s)"
 msgstr " (Ошибка: %s)"
 
+#: ../picard/ui/ui_tageditor.py:115
+#: ../picard/ui/ui_options_plugins.py:59
+#: ../picard/ui/options/plugins.py:76
+msgid "Name"
+msgstr "Имя"
+
+#: ../picard/ui/ui_tageditor.py:116
+msgid "Value"
+msgstr "Значение"
+
+#: ../picard/ui/ui_tageditor.py:117
+msgid "&Add..."
+msgstr "&Добавить…"
+
+#: ../picard/ui/ui_tageditor.py:118
+msgid "&Edit..."
+msgstr "&Редактировать…"
+
+#: ../picard/ui/ui_tageditor.py:119
+msgid "&Delete"
+msgstr "&Удалить"
+
+#: ../picard/ui/ui_tageditor.py:120
+msgid "&Metadata"
+msgstr "&Метаданные"
+
+#: ../picard/ui/ui_tageditor.py:121
+msgid "A&rtwork"
+msgstr "&Обложка"
+
+#: ../picard/ui/ui_tageditor.py:122
+msgid "&Info"
+msgstr "&Информация"
+
+#: ../picard/ui/passworddialog.py:38
+#, python-format
+msgid "The server %s requires you to login. Please enter your username and password."
+msgstr ""
+
+#: ../picard/ui/ui_cdlookup.py:60
+#: ../picard/ui/ui_options_cdlookup.py:47
+#: ../picard/ui/ui_options_cdlookup_win32.py:56
+#: ../picard/ui/options/cdlookup.py:35
+msgid "CD Lookup"
+msgstr "Поиск CD"
+
+#: ../picard/ui/ui_cdlookup.py:61
+msgid "The following releases on MusicBrainz match the CD:"
+msgstr "Следующие релизы на MusicBrainz соответствуют CD:"
+
+#: ../picard/ui/ui_cdlookup.py:62
+#: ../picard/ui/ui_puidsubmit.py:53
+msgid "OK"
+msgstr "OK"
+
+#: ../picard/ui/ui_cdlookup.py:63
+msgid "    Lookup manually    "
+msgstr "    Опознать вручную    "
+
+#: ../picard/ui/ui_cdlookup.py:64
+#: ../picard/ui/ui_puidsubmit.py:54
+msgid "Cancel"
+msgstr "Отмена"
+
+#: ../picard/ui/ui_passworddialog.py:78
+msgid "Authentication required"
+msgstr "Требуется аутентификация"
+
+#: ../picard/ui/ui_passworddialog.py:79
+#: ../picard/ui/ui_options_general.py:113
+#: ../picard/ui/ui_options_proxy.py:83
+msgid "Username:"
+msgstr "Имя пользователя:"
+
+#: ../picard/ui/ui_passworddialog.py:80
+#: ../picard/ui/ui_options_general.py:112
+#: ../picard/ui/ui_options_proxy.py:82
+msgid "Password:"
+msgstr "Пароль:"
+
+#: ../picard/ui/ui_passworddialog.py:81
+msgid "Save username and password"
+msgstr "Сохранить имя пользователя и пароль"
+
 #: ../picard/ui/ui_edittagdialog.py:44
 msgid "Edit Tag"
 msgstr "Редактирование тега"
 
-#: ../picard/ui/ui_options_proxy.py:81
-msgid "Web Proxy"
-msgstr "Прокси"
+#: ../picard/ui/ui_metadata.py:121
+msgid "Lookup"
+msgstr "Опознать"
 
-#: ../picard/ui/ui_options_proxy.py:84 ../picard/ui/ui_options_general.py:109
-msgid "Port:"
-msgstr "Порт:"
+#: ../picard/ui/ui_metadata.py:122
+msgid "Title:"
+msgstr "Название:"
 
-#: ../picard/ui/ui_options_proxy.py:85 ../picard/ui/ui_options_general.py:110
-msgid "Server address:"
-msgstr "Адрес сервера:"
+#: ../picard/ui/ui_metadata.py:123
+msgid "Date:"
+msgstr "Дата:"
 
-#: ../picard/ui/ui_tagsfromfilenames.py:56
-msgid "Convert File Names to Tags"
-msgstr "Преобразовать имена файлов в теги"
+#: ../picard/ui/ui_metadata.py:124
+msgid "Artist:"
+msgstr "Исполнитель:"
 
-#: ../picard/ui/ui_tagsfromfilenames.py:57
-msgid "Replace underscores with spaces"
-msgstr "Заменять символы подчёркивания на пробелы"
+#: ../picard/ui/ui_metadata.py:125
+msgid "Track:"
+msgstr "Дорожка:"
+
+#: ../picard/ui/ui_metadata.py:126
+msgid "0000-00-00; "
+msgstr "0000-00-00; "
+
+#: ../picard/ui/ui_metadata.py:128
+msgid "Album:"
+msgstr "Альбом:"
+
+#: ../picard/ui/ui_options.py:42
+msgid "Options"
+msgstr "Настройки"
+
+#: ../picard/ui/ui_options_cdlookup.py:48
+msgid "CD-ROM device to use for lookups:"
+msgstr "Привод CD-ROM для опознавания:"
+
+#: ../picard/ui/ui_options_cdlookup_win32.py:57
+msgid "Default CD-ROM drive to use for lookups:"
+msgstr "Привод CD-ROM по умолчанию:"
+
+#: ../picard/ui/ui_options_cover.py:56
+msgid "Location"
+msgstr "Расположение"
+
+#: ../picard/ui/ui_options_cover.py:57
+msgid "Embed cover images into tags"
+msgstr "Добавлять обложки в теги"
+
+#: ../picard/ui/ui_options_cover.py:58
+msgid "Save cover images as separate files"
+msgstr "Сохранять обложки как отдельные файлы"
+
+#: ../picard/ui/ui_options_cover.py:59
+msgid "Overwrite the file if it already exists"
+msgstr "Перезаписывать файл, если он уже есть"
+
+#: ../picard/ui/util.py:31
+msgid "&Ok"
+msgstr "&OK"
+
+#: ../picard/ui/util.py:32
+msgid "&Cancel"
+msgstr "&Отмена"
+
+#: ../picard/ui/ui_puidsubmit.py:52
+msgid "Submit PUIDs"
+msgstr "Передать PUID’ы"
+
+#: ../picard/ui/ui_options_folksonomy.py:114
+#: ../picard/ui/options/folksonomy.py:29
+msgid "Folksonomy Tags"
+msgstr "Теги, выбранные сообществом"
+
+#: ../picard/ui/ui_options_folksonomy.py:115
+msgid "Ignore tags:"
+msgstr "Игнорировать теги:"
+
+#: ../picard/ui/ui_options_folksonomy.py:116
+msgid "Minimal tag usage:"
+msgstr "Минимальное использование тегов:"
+
+#: ../picard/ui/ui_options_folksonomy.py:117
+#: ../picard/ui/ui_options_matching.py:107
+#: ../picard/ui/ui_options_matching.py:108
+#: ../picard/ui/ui_options_matching.py:109
+#: ../picard/ui/ui_options_matching.py:113
+msgid " %"
+msgstr " %"
+
+#: ../picard/ui/ui_options_folksonomy.py:118
+msgid "Maximum number of tags:"
+msgstr "Максимальное число тегов:"
+
+#: ../picard/ui/ui_options_folksonomy.py:119
+msgid "Join multiple tags with:"
+msgstr "Объединять множественные теги с помощью:"
+
+#: ../picard/ui/ui_options_folksonomy.py:120
+msgid " / "
+msgstr " / "
+
+#: ../picard/ui/ui_options_folksonomy.py:121
+msgid ", "
+msgstr ", "
+
+#: ../picard/ui/ui_options_interface.py:50
+msgid "Miscellaneous"
+msgstr "Разное"
+
+#: ../picard/ui/ui_options_interface.py:51
+msgid "Show text labels under icons"
+msgstr "Показывать подписи под значками"
+
+#: ../picard/ui/ui_options_interface.py:52
+msgid "Allow selection of multiple directories"
+msgstr "Разрешить выбор нескольких каталогов"
+
+#: ../picard/ui/ui_options_interface.py:53
+msgid "Use advanced query syntax"
+msgstr "Использовать расширенный синтаксис запросов"
+
+#: ../picard/ui/ui_options_interface.py:54
+#, fuzzy
+msgid "User interface language:"
+msgstr "Интерфейс"
+
+#: ../picard/ui/ui_options_naming.py:165
+msgid "Rename Files"
+msgstr "Переименовывать файлы"
+
+#: ../picard/ui/ui_options_naming.py:166
+msgid "Replace Windows-incompatible characters"
+msgstr "Заменять символы, не совместимые с Windows"
+
+#: ../picard/ui/ui_options_naming.py:167
+msgid "Replace non-ASCII characters"
+msgstr "Заменять не-ASCII символы"
+
+#: ../picard/ui/ui_options_naming.py:168
+#: ../picard/ui/ui_options_naming.py:169
+#: ../picard/ui/ui_options_metadata.py:109
+#: ../picard/ui/ui_options_metadata.py:110
+msgid "Default"
+msgstr "По умолчанию"
+
+#: ../picard/ui/ui_options_naming.py:170
+#: ../picard/ui/options/naming.py:90
+msgid "Multiple artist file naming format:"
+msgstr "Формат именования файлов сборников:"
+
+#: ../picard/ui/ui_options_naming.py:171
+#: ../picard/ui/options/naming.py:86
+msgid "File naming format:"
+msgstr "Формат имён файлов:"
+
+#: ../picard/ui/ui_options_naming.py:172
+msgid "Move Files"
+msgstr "Переносить файлы"
+
+#: ../picard/ui/ui_options_naming.py:173
+msgid "Move tagged files to this directory:"
+msgstr "Переносить обработанные файлы в следующую директорию:"
+
+#: ../picard/ui/ui_options_naming.py:174
+msgid "Browse..."
+msgstr "Обзор…"
+
+#: ../picard/ui/ui_options_naming.py:175
+msgid "Move additional files:"
+msgstr "Переносить дополнительные файлы:"
+
+#: ../picard/ui/ui_options_naming.py:176
+msgid "Delete empty directories"
+msgstr "Удалять пустые каталоги"
+
+#: ../picard/ui/ui_options_naming.py:177
+msgid "Example"
+msgstr "Пример"
+
+#: ../picard/ui/ui_options_naming.py:178
+msgid "File name:"
+msgstr "Имя файла:"
+
+#: ../picard/ui/ui_options_naming.py:179
+msgid "Multiple artist file name:"
+msgstr "Имя файла для сборников:"
 
-#: ../picard/ui/ui_tagsfromfilenames.py:58
 #: ../picard/ui/ui_options_naming.py:180
+#: ../picard/ui/ui_tagsfromfilenames.py:58
 msgid "&Preview"
 msgstr "&Предварительный просмотр"
 
@@ -468,11 +2041,22 @@ msgstr "&Предварительный просмотр"
 msgid "MusicBrainz Server"
 msgstr "Сервер MusicBrainz"
 
+#: ../picard/ui/ui_options_general.py:109
+#: ../picard/ui/ui_options_proxy.py:84
+msgid "Port:"
+msgstr "Порт:"
+
+#: ../picard/ui/ui_options_general.py:110
+#: ../picard/ui/ui_options_proxy.py:85
+msgid "Server address:"
+msgstr "Адрес сервера:"
+
 #: ../picard/ui/ui_options_general.py:111
 msgid "Account Information"
 msgstr "Сведения об учётной записи"
 
 #: ../picard/ui/ui_options_general.py:114
+#: ../picard/ui/options/general.py:29
 msgid "General"
 msgstr "Основные"
 
@@ -480,34 +2064,6 @@ msgstr "Основные"
 msgid "Automatically scan all new files"
 msgstr "Автоматически сканировать все новые файлы"
 
-#: ../picard/ui/ui_options_interface.py:46
-msgid "Miscellaneous"
-msgstr "Разное"
-
-#: ../picard/ui/ui_options_interface.py:47
-msgid "Show text labels under icons"
-msgstr "Показывать подписи под значками"
-
-#: ../picard/ui/ui_options_interface.py:48
-msgid "Allow selection of multiple directories"
-msgstr "Разрешить выбор нескольких каталогов"
-
-#: ../picard/ui/ui_options_interface.py:49
-msgid "Use advanced query syntax"
-msgstr "Использовать расширенный синтаксис запросов"
-
-#: ../picard/ui/itemviews.py:327
-msgid "&Releases"
-msgstr "&Релизы"
-
-#: ../picard/ui/itemviews.py:353
-msgid "&Plugins"
-msgstr "П&лагины"
-
-#: ../picard/ui/itemviews.py:523
-msgid "Clusters"
-msgstr "Кластеры"
-
 #: ../picard/ui/ui_options_matching.py:105
 msgid "Thresholds"
 msgstr "Ограничения"
@@ -528,6 +2084,68 @@ msgstr "Минимальное сходство при опознавании к
 msgid "Minimal similarity for PUID lookups:"
 msgstr "Минимальное сходство при опознавании PUID:"
 
+#: ../picard/ui/ui_options_metadata.py:100
+#: ../picard/ui/options/metadata.py:31
+msgid "Metadata"
+msgstr "Метаданные"
+
+#: ../picard/ui/ui_options_metadata.py:101
+msgid "Translate foreign artist names to English where possible"
+msgstr "По возможности переводить иностранные имена на английский"
+
+#: ../picard/ui/ui_options_metadata.py:102
+msgid "Use release relationships"
+msgstr "Использовать взаимосвязи релизов"
+
+#: ../picard/ui/ui_options_metadata.py:103
+msgid "Use track relationships"
+msgstr "Использовать взаимосвязи произведений"
+
+#: ../picard/ui/ui_options_metadata.py:104
+msgid "Use folksonomy tags as genre"
+msgstr "Использовать теги, выбранные сообществом, в качестве жанра"
+
+#: ../picard/ui/ui_options_metadata.py:105
+#, fuzzy
+msgid "Preferred release country:"
+msgstr "Тип релиза"
+
+#: ../picard/ui/ui_options_metadata.py:106
+msgid "Custom Fields"
+msgstr "Произвольные поля"
+
+#: ../picard/ui/ui_options_metadata.py:107
+msgid "Various artists:"
+msgstr "Сборники:"
+
+#: ../picard/ui/ui_options_metadata.py:108
+msgid "Non-album tracks:"
+msgstr "Произведения не из альбома:"
+
+#: ../picard/ui/ui_options_plugins.py:58
+#: ../picard/ui/options/plugins.py:30
+msgid "Plugins"
+msgstr "Плагины"
+
+#: ../picard/ui/ui_options_plugins.py:60
+#: ../picard/ui/options/plugins.py:79
+msgid "Author"
+msgstr "Автор"
+
+#: ../picard/ui/ui_options_plugins.py:61
+#: ../picard/util/tags.py:36
+msgid "Version"
+msgstr "Версия"
+
+#: ../picard/ui/ui_options_proxy.py:81
+#: ../picard/ui/options/proxy.py:28
+msgid "Web Proxy"
+msgstr "Прокси"
+
+#: ../picard/ui/ui_options_script.py:52
+msgid "Tagger Script"
+msgstr "Скрипт теггера"
+
 #: ../picard/ui/ui_options_tags.py:105
 msgid "Common"
 msgstr "Общее"
@@ -580,346 +2198,30 @@ msgstr "APE"
 msgid "Remove APEv2 tags from MP3 files"
 msgstr "Удалять APEv2 теги из MP3 файлов"
 
-#: ../picard/ui/ui_options_cdlookup_win32.py:56 ../picard/ui/ui_cdlookup.py:60
-#: ../picard/ui/ui_options_cdlookup.py:47
-msgid "CD Lookup"
-msgstr "Поиск CD"
+#: ../picard/ui/ui_tagsfromfilenames.py:56
+msgid "Convert File Names to Tags"
+msgstr "Преобразовать имена файлов в теги"
 
-#: ../picard/ui/ui_options_cdlookup_win32.py:57
-msgid "Default CD-ROM drive to use for lookups:"
-msgstr "Привод CD-ROM по умолчанию:"
+#: ../picard/ui/ui_tagsfromfilenames.py:57
+msgid "Replace underscores with spaces"
+msgstr "Заменять символы подчёркивания на пробелы"
 
-#: ../picard/ui/tageditor.py:65 ../picard/ui/ui_options_plugins.py:62
-#: ../picard/ui/multitageditor.py:37
-msgid "Details"
-msgstr "Подробности"
-
-#: ../picard/ui/tageditor.py:70 ../picard/ui/tageditor.py:241
-#: ../picard/ui/multitageditor.py:42 ../picard/ui/multitageditor.py:197
-#, python-format
-msgid "%d file"
-msgid_plural "%d files"
-msgstr[0] "%d файл"
-msgstr[1] "%d файла"
-msgstr[2] "%d файлов"
-
-#: ../picard/ui/tageditor.py:124 ../picard/ui/multitageditor.py:95
-#, python-format
-msgid "(different across %d file)"
-msgid_plural "(different across %d files)"
-msgstr[0] "(различается среди %d файла)"
-msgstr[1] "(различается среди %d файлов)"
-msgstr[2] "(различается среди %d файлов)"
-
-#: ../picard/ui/tageditor.py:127 ../picard/ui/multitageditor.py:98
-#, python-format
-msgid "(missing from %d file)"
-msgid_plural "(missing from %d files)"
-msgstr[0] "(отсутствует в %d файле)"
-msgstr[1] "(отсутствует в %d файлах)"
-msgstr[2] "(отсутствует в %d файлах)"
-
-#: ../picard/ui/tageditor.py:210 ../picard/ui/multitageditor.py:166
-msgid "Filename:"
-msgstr "Имя файла:"
-
-#: ../picard/ui/tageditor.py:212 ../picard/ui/multitageditor.py:168
-msgid "Format:"
-msgstr "Формат:"
-
-#: ../picard/ui/tageditor.py:221 ../picard/ui/multitageditor.py:177
-msgid "Size:"
-msgstr "Размер:"
-
-#: ../picard/ui/tageditor.py:227 ../picard/ui/multitageditor.py:183
-msgid "Bitrate:"
-msgstr "Битрейт:"
-
-#: ../picard/ui/tageditor.py:229 ../picard/ui/multitageditor.py:185
-msgid "Sample rate:"
-msgstr "Частота дискретизации:"
-
-#: ../picard/ui/tageditor.py:231 ../picard/ui/multitageditor.py:187
-msgid "Bits per sample:"
-msgstr "Битов на семпл:"
-
-#: ../picard/ui/tageditor.py:234 ../picard/ui/multitageditor.py:190
-msgid "Mono"
-msgstr "Моно"
-
-#: ../picard/ui/tageditor.py:235 ../picard/ui/multitageditor.py:191
-msgid "Stereo"
-msgstr "Стерео"
-
-#: ../picard/ui/tageditor.py:237 ../picard/ui/multitageditor.py:193
-msgid "Channels:"
-msgstr "Каналы:"
-
-#: ../picard/ui/ui_tageditor.py:115 ../picard/ui/ui_multitageditor.py:55
-#: ../picard/ui/ui_options_plugins.py:59 ../picard/ui/options/plugins.py:76
-msgid "Name"
-msgstr "Имя"
-
-#: ../picard/ui/ui_tageditor.py:116 ../picard/ui/ui_multitageditor.py:56
-msgid "Value"
-msgstr "Значение"
-
-#: ../picard/ui/ui_tageditor.py:117 ../picard/ui/ui_multitageditor.py:57
-msgid "&Add..."
-msgstr "&Добавить…"
-
-#: ../picard/ui/ui_tageditor.py:118
-msgid "&Edit..."
-msgstr "&Редактировать…"
-
-#: ../picard/ui/ui_tageditor.py:119
-msgid "&Delete"
-msgstr "&Удалить"
-
-#: ../picard/ui/ui_tageditor.py:120
-msgid "&Metadata"
-msgstr "&Метаданные"
-
-#: ../picard/ui/ui_tageditor.py:121
-msgid "A&rtwork"
-msgstr "&Обложка"
-
-#: ../picard/ui/ui_tageditor.py:122
-msgid "&Info"
-msgstr "&Информация"
-
-#: ../picard/ui/coverartbox.py:47
-msgid "Cover Art"
-msgstr "Обложка"
-
-#: ../picard/ui/coverartbox.py:95
-msgid "Buy the album on Amazon"
-msgstr "Купить этот альбом на Amazon"
-
-#: ../picard/ui/ui_puidsubmit.py:52
-msgid "Submit PUIDs"
-msgstr "Передать PUID’ы"
-
-#: ../picard/ui/ui_puidsubmit.py:53 ../picard/ui/ui_cdlookup.py:62
-msgid "OK"
-msgstr "OK"
-
-#: ../picard/ui/ui_puidsubmit.py:54 ../picard/ui/ui_cdlookup.py:64
-msgid "Cancel"
-msgstr "Отмена"
-
-#: ../picard/ui/puidsubmit.py:31 ../picard/ui/options/plugins.py:80
-msgid "File"
-msgstr "Файл"
-
-#: ../picard/ui/puidsubmit.py:31
-msgid "PUID"
-msgstr "PUID"
-
-#: ../picard/ui/puidsubmit.py:31
-msgid "Release"
-msgstr "Релиз"
-
-#: ../picard/ui/puidsubmit.py:31
-msgid "Release ID"
-msgstr "ID релиза"
-
-#: ../picard/ui/filebrowser.py:41
-#, fuzzy
-msgid "&Move Tagged Files Here"
-msgstr "П&ереносить файлы"
-
-#: ../picard/ui/filebrowser.py:44
-msgid "Show &Hidden Files"
-msgstr ""
-
-#: ../picard/ui/ui_cdlookup.py:61
-msgid "The following releases on MusicBrainz match the CD:"
-msgstr "Следующие релизы на MusicBrainz соответствуют CD:"
-
-#: ../picard/ui/ui_cdlookup.py:63
-msgid "    Lookup manually    "
-msgstr "    Опознать вручную    "
-
-#: ../picard/ui/ui_options.py:42
-msgid "Options"
-msgstr "Настройки"
-
-#: ../picard/ui/tagsfromfilenames.py:52 ../picard/ui/tagsfromfilenames.py:96
-msgid "File Name"
-msgstr "Имя файла"
-
-#: ../picard/ui/ui_options_cover.py:56
-msgid "Location"
-msgstr "Расположение"
-
-#: ../picard/ui/ui_options_cover.py:57
-msgid "Embed cover images into tags"
-msgstr "Добавлять обложки в теги"
-
-#: ../picard/ui/ui_options_cover.py:58
-msgid "Save cover images as separate files"
-msgstr "Сохранять обложки как отдельные файлы"
-
-#: ../picard/ui/ui_options_cover.py:59
-msgid "Overwrite the file if it already exists"
-msgstr "Перезаписывать файл, если он уже есть"
-
-#: ../picard/ui/ui_options_metadata.py:100
-msgid "Metadata"
-msgstr "Метаданные"
-
-#: ../picard/ui/ui_options_metadata.py:101
-msgid "Translate foreign artist names to English where possible"
-msgstr "По возможности переводить иностранные имена на английский"
-
-#: ../picard/ui/ui_options_metadata.py:102
-msgid "Use release relationships"
-msgstr "Использовать взаимосвязи релизов"
-
-#: ../picard/ui/ui_options_metadata.py:103
-msgid "Use track relationships"
-msgstr "Использовать взаимосвязи произведений"
-
-#: ../picard/ui/ui_options_metadata.py:104
-msgid "Use folksonomy tags as genre"
-msgstr "Использовать теги, выбранные сообществом, в качестве жанра"
-
-#: ../picard/ui/ui_options_metadata.py:105
-#, fuzzy
-msgid "Preferred release country:"
-msgstr "Страна релиза"
-
-#: ../picard/ui/ui_options_metadata.py:106
-msgid "Custom Fields"
-msgstr "Произвольные поля"
-
-#: ../picard/ui/ui_options_metadata.py:107
-msgid "Various artists:"
-msgstr "Сборники:"
-
-#: ../picard/ui/ui_options_metadata.py:108
-msgid "Non-album tracks:"
-msgstr "Произведения не из альбома:"
-
-#: ../picard/ui/ui_options_metadata.py:109
-#: ../picard/ui/ui_options_metadata.py:110
-#: ../picard/ui/ui_options_naming.py:168 ../picard/ui/ui_options_naming.py:169
-msgid "Default"
-msgstr "По умолчанию"
-
-#: ../picard/ui/ui_multitageditor.py:58
-msgid "Delete"
-msgstr "Удалить"
-
-#: ../picard/ui/logview.py:29
-msgid "Log"
-msgstr "Отчёт"
-
-#: ../picard/ui/ui_options_plugins.py:58
-msgid "Plugins"
-msgstr "Плагины"
-
-#: ../picard/ui/ui_options_plugins.py:60 ../picard/ui/options/plugins.py:79
-msgid "Author"
-msgstr "Автор"
-
-#: ../picard/ui/ui_options_plugins.py:61
-msgid "Version"
-msgstr "Версия"
-
-#: ../picard/ui/ui_options_naming.py:165
-msgid "Rename Files"
-msgstr "Переименовывать файлы"
-
-#: ../picard/ui/ui_options_naming.py:166
-msgid "Replace Windows-incompatible characters"
-msgstr "Заменять символы, не совместимые с Windows"
-
-#: ../picard/ui/ui_options_naming.py:167
-msgid "Replace non-ASCII characters"
-msgstr "Заменять не-ASCII символы"
-
-#: ../picard/ui/ui_options_naming.py:170 ../picard/ui/options/naming.py:90
-msgid "Multiple artist file naming format:"
-msgstr "Формат именования файлов сборников:"
-
-#: ../picard/ui/ui_options_naming.py:171 ../picard/ui/options/naming.py:86
-msgid "File naming format:"
-msgstr "Формат имён файлов:"
-
-#: ../picard/ui/ui_options_naming.py:172
-msgid "Move Files"
-msgstr "Переносить файлы"
-
-#: ../picard/ui/ui_options_naming.py:173
-msgid "Move tagged files to this directory:"
-msgstr "Переносить обработанные файлы в следующую директорию:"
-
-#: ../picard/ui/ui_options_naming.py:174
-msgid "Browse..."
-msgstr "Обзор…"
-
-#: ../picard/ui/ui_options_naming.py:175
-msgid "Move additional files:"
-msgstr "Переносить дополнительные файлы:"
-
-#: ../picard/ui/ui_options_naming.py:176
-msgid "Delete empty directories"
-msgstr "Удалять пустые каталоги"
-
-#: ../picard/ui/ui_options_naming.py:177
-msgid "Example"
-msgstr "Пример"
-
-#: ../picard/ui/ui_options_naming.py:178
-msgid "File name:"
-msgstr "Имя файла:"
-
-#: ../picard/ui/ui_options_naming.py:179
-msgid "Multiple artist file name:"
-msgstr "Имя файла для сборников:"
-
-#: ../picard/ui/ui_options_cdlookup.py:48
-msgid "CD-ROM device to use for lookups:"
-msgstr "Привод CD-ROM для опознавания:"
-
-#: ../picard/ui/options/scripting.py:84 ../picard/ui/options/naming.py:86
-#: ../picard/ui/options/naming.py:90 ../picard/ui/options/naming.py:93
-#: ../picard/ui/options/naming.py:95
-msgid "Script Error"
-msgstr "Ошибка скрипта"
+#: ../picard/ui/options/about.py:29
+msgid "About"
+msgstr "О программе"
 
 #. Replace this with your name to have it appear in the "About" dialog.
 #: ../picard/ui/options/about.py:48
 msgid "translator-credits"
 msgstr ""
 "Launchpad Contributions:\n"
-"  Oleg \"Rowaa[SR13]\" V. Volkov <https://launchpad.net/~rowaasr13>\n"
-"\n"
-"Launchpad Contributions:\n"
-"  Nkolay Parukhin https://launchpad.net/~parukhin\n"
 "  Oleg \"Rowaa[SR13]\" V. Volkov https://launchpad.net/~rowaasr13\n"
-"\n"
-"Launchpad Contributions:\n"
-"  Lesha Ogonkov https://launchpad.net/~ogonkov\n"
 "  Nkolay Parukhin https://launchpad.net/~parukhin\n"
-"  Oleg \"Rowaa[SR13]\" V. Volkov https://launchpad.net/~rowaasr13\n"
-"\n"
-"Launchpad Contributions:\n"
 "  Lesha Ogonkov https://launchpad.net/~ogonkov\n"
 "  Lukáš Lalinský https://launchpad.net/~luks\n"
 "  Nikolay Belikov https://launchpad.net/~cre8r\n"
-"  Nkolay Parukhin https://launchpad.net/~parukhin\n"
-"  Oleg \"Rowaa[SR13]\" V. Volkov https://launchpad.net/~rowaasr13\n"
-"\n"
-"Launchpad Contributions:\n"
 "  BasicXP https://launchpad.net/~x12ozmouse\n"
-"  Lesha Ogonkov https://launchpad.net/~ogonkov\n"
-"  Lukáš Lalinský https://launchpad.net/~luks\n"
-"  Nikolay Belikov https://launchpad.net/~cre8r\n"
-"  Nkolay Parukhin https://launchpad.net/~parukhin\n"
-"  Oleg \"Rowaa[SR13]\" V. Volkov https://launchpad.net/~rowaasr13"
+"  X-Pilot https://launchpad.net/~x-pilotteam"
 
 #. Replace LANG with language you are translatig to.
 #: ../picard/ui/options/about.py:51
@@ -930,32 +2232,62 @@ msgstr "<br/>Перевод на русский: %s"
 #: ../picard/ui/options/about.py:55
 #, fuzzy, python-format
 msgid ""
-"<p align=\"center\"><span style=\"font-size:15px;font-weight:bold;"
-"\">MusicBrainz Picard</span><br/>\n"
+"<p align=\"center\"><span style=\"font-size:15px;font-weight:bold;\">MusicBrainz Picard</span><br/>\n"
 "Version %(version)s</p>\n"
 "<p align=\"center\"><strong>Supported formats</strong><br/>%(formats)s</p>\n"
 "<p align=\"center\"><strong>Please donate</strong><br/>\n"
-"Thank you for using Picard. Picard relies on the MusicBrainz database, which "
-"is operated by the MetaBrainz Foundation with the help of thousands of "
-"volunteers. If you like this application please consider donating to the "
-"MetaBrainz Foundation to keep the service running.</p>\n"
-"<p align=\"center\"><a href=\"http://metabrainz.org/donate/index.html"
-"\">Donate now!</a></p>\n"
+"Thank you for using Picard. Picard relies on the MusicBrainz database, which is operated by the MetaBrainz Foundation with the help of thousands of volunteers. If you like this application please consider donating to the MetaBrainz Foundation to keep the service running.</p>\n"
+"<p align=\"center\"><a href=\"http://metabrainz.org/donate/index.html\">Donate now!</a></p>\n"
 "<p align=\"center\"><strong>Credits</strong><br/>\n"
-"<small>Copyright © 2004-2008 Robert Kaye, Lukáš Lalinský and others%"
-"(translator-credits)s</small></p>\n"
-"<p align=\"center\"><a href=\"http://musicbrainz.org/doc/PicardTagger"
-"\">http://musicbrainz.org/doc/PicardTagger</a></p>\n"
+"<small>Copyright © 2004-2008 Robert Kaye, Lukáš Lalinský and others%(translator-credits)s</small></p>\n"
+"<p align=\"center\"><a href=\"http://musicbrainz.org/doc/PicardTagger\">http://musicbrainz.org/doc/PicardTagger</a></p>\n"
 msgstr ""
-"<p align=\"center\"><span style=\"font-size:15px;font-weight:bold;"
-"\">MusicBrainz Picard</span><br/>\n"
+"<p align=\"center\"><span style=\"font-size:15px;font-weight:bold;\">MusicBrainz Picard</span><br/>\n"
 "Версия %(version)s</p>\n"
-"<p align=\"center\"><strong>Поддерживаемые форматы:</strong> %(formats)s</"
-"p>\n"
-"<p align=\"center\"><small>Копирайт © 2004-2007 Robert Kaye, Lukáš Lalinský "
-"и другие%(translator-credits)s</small></p>\n"
-"<p align=\"center\"><a href=\"http://musicbrainz.org/doc/PicardTagger"
-"\">http://musicbrainz.org/doc/PicardTagger</a></p>\n"
+"<p align=\"center\"><strong>Поддерживаемые форматы:</strong> %(formats)s</p>\n"
+"<p align=\"center\"><small>Копирайт © 2004-2007 Robert Kaye, Lukáš Lalinský и другие%(translator-credits)s</small></p>\n"
+"<p align=\"center\"><a href=\"http://musicbrainz.org/doc/PicardTagger\">http://musicbrainz.org/doc/PicardTagger</a></p>\n"
+
+#: ../picard/ui/options/advanced.py:26
+msgid "Advanced"
+msgstr "Расширенные"
+
+#: ../picard/ui/options/interface.py:31
+msgid "User Interface"
+msgstr "Интерфейс"
+
+#: ../picard/ui/options/interface.py:47
+msgid "System default"
+msgstr "Установленный в системе"
+
+#: ../picard/ui/options/interface.py:71
+#, fuzzy
+msgid "Language changed"
+msgstr "Язык"
+
+#: ../picard/ui/options/interface.py:71
+msgid "You have changed the interface language. You have to restart Picard in order for the change to take effect."
+msgstr ""
+
+#: ../picard/ui/options/matching.py:29
+msgid "Matching"
+msgstr "Соотнесение"
+
+#: ../picard/ui/options/metadata.py:52
+msgid "None"
+msgstr ""
+
+#: ../picard/ui/options/naming.py:33
+msgid "File Naming"
+msgstr "Имена файлов"
+
+#: ../picard/ui/options/naming.py:86
+#: ../picard/ui/options/naming.py:90
+#: ../picard/ui/options/naming.py:93
+#: ../picard/ui/options/naming.py:95
+#: ../picard/ui/options/scripting.py:84
+msgid "Script Error"
+msgstr "Ошибка скрипта"
 
 #: ../picard/ui/options/naming.py:93
 msgid "The file naming format must not be empty."
@@ -968,12 +2300,241 @@ msgstr "Формат именования файлов сборников:"
 
 #: ../picard/ui/options/naming.py:97
 msgid "Error"
-msgstr ""
+msgstr "Ошибка"
 
 #: ../picard/ui/options/naming.py:97
 msgid "The location to move files to must not be empty."
 msgstr ""
 
+#: ../picard/ui/options/scripting.py:63
+msgid "Scripting"
+msgstr "Скрипты"
+
+#: ../picard/ui/options/tags.py:29
+msgid "Tags"
+msgstr "Тэги"
+
+#: ../picard/util/tags.py:24
+msgid "Date"
+msgstr "Дата"
+
+#: ../picard/util/tags.py:25
+msgid "Album Artist"
+msgstr "Исполнитель альбома"
+
+#: ../picard/util/tags.py:26
+msgid "Track Number"
+msgstr "Номер дорожки"
+
+#: ../picard/util/tags.py:27
+msgid "Total Tracks"
+msgstr "Всего произведений"
+
+#: ../picard/util/tags.py:28
+msgid "Disc Number"
+msgstr "Номер диска"
+
+#: ../picard/util/tags.py:29
+msgid "Total Discs"
+msgstr "Всего дисков"
+
+#: ../picard/util/tags.py:30
+msgid "Album Artist Sort Order"
+msgstr "Порядок сортировки исполнителей альбомов"
+
+#: ../picard/util/tags.py:31
+msgid "Artist Sort Order"
+msgstr "Порядок сортировки исполнителей"
+
+#: ../picard/util/tags.py:32
+msgid "Title Sort Order"
+msgstr "Порядок сортировки произведений"
+
+#: ../picard/util/tags.py:33
+msgid "Album Sort Order"
+msgstr "Порядок сортировки альбома"
+
+#: ../picard/util/tags.py:34
+msgid "ASIN"
+msgstr "ASIN"
+
+#: ../picard/util/tags.py:35
+msgid "Grouping"
+msgstr "Группировка"
+
+#: ../picard/util/tags.py:37
+msgid "ISRC"
+msgstr "ISRC"
+
+#: ../picard/util/tags.py:38
+msgid "Mood"
+msgstr "Настроение"
+
+#: ../picard/util/tags.py:39
+msgid "BPM"
+msgstr "уд./мин."
+
+#: ../picard/util/tags.py:40
+msgid "Copyright"
+msgstr "Copyright"
+
+#: ../picard/util/tags.py:41
+msgid "Composer"
+msgstr "Композитор"
+
+#: ../picard/util/tags.py:42
+msgid "Conductor"
+msgstr "Дирижёр"
+
+#: ../picard/util/tags.py:43
+msgid "Lyricist"
+msgstr "Автор текста"
+
+#: ../picard/util/tags.py:44
+msgid "Arranger"
+msgstr "Аранжировщик"
+
+#: ../picard/util/tags.py:45
+msgid "Producer"
+msgstr "Продюсер"
+
+#: ../picard/util/tags.py:46
+msgid "Engineer"
+msgstr "Звукооператор"
+
+#: ../picard/util/tags.py:47
+msgid "Subtitle"
+msgstr "Подзаголовок"
+
+#: ../picard/util/tags.py:48
+msgid "Disc Subtitle"
+msgstr "Подзаголовок диска"
+
+#: ../picard/util/tags.py:49
+msgid "Remixer"
+msgstr "Ремиксер"
+
+#: ../picard/util/tags.py:50
+msgid "MusicBrainz Track Id"
+msgstr "MusicBrainz ID трека"
+
+#: ../picard/util/tags.py:51
+msgid "MusicBrainz Release Id"
+msgstr "MusicBrainz ID релиза"
+
+#: ../picard/util/tags.py:52
+msgid "MusicBrainz Artist Id"
+msgstr "MusicBrainz ID исполнителя"
+
+#: ../picard/util/tags.py:53
+msgid "MusicBrainz Release Artist Id"
+msgstr "MusicBrainz ID автора релиза"
+
+#: ../picard/util/tags.py:54
+msgid "MusicBrainz TRM Id"
+msgstr "MusicBrainz TRM ID"
+
+#: ../picard/util/tags.py:55
+#, fuzzy
+msgid "MusicBrainz Disc Id"
+msgstr "MusicBrainz ID исполнителя"
+
+#: ../picard/util/tags.py:56
+#, fuzzy
+msgid "MusicBrainz Sort Name"
+msgstr "Сервер MusicBrainz"
+
+#: ../picard/util/tags.py:57
+msgid "MusicIP PUID"
+msgstr "MusicIP PUID"
+
+#: ../picard/util/tags.py:58
+msgid "MusicIP Fingerprint"
+msgstr "MusicIP Fingerprint"
+
+#: ../picard/util/tags.py:59
+msgid "Disc Id"
+msgstr ""
+
+#: ../picard/util/tags.py:60
+msgid "Website"
+msgstr "Сайт"
+
+#: ../picard/util/tags.py:61
+msgid "Compilation"
+msgstr "Сборник"
+
+#: ../picard/util/tags.py:62
+msgid "Comment"
+msgstr "Комментарий"
+
+#: ../picard/util/tags.py:63
+msgid "Genre"
+msgstr "Жанр"
+
+#: ../picard/util/tags.py:64
+msgid "Encoded By"
+msgstr "Кодировано"
+
+#: ../picard/util/tags.py:65
+msgid "Performer"
+msgstr "Исполнитель"
+
+#: ../picard/util/tags.py:66
+msgid "Release Type"
+msgstr "Тип релиза"
+
+#: ../picard/util/tags.py:67
+msgid "Release Status"
+msgstr "Статус релиза"
+
+#: ../picard/util/tags.py:68
+#, fuzzy
+msgid "Release Country"
+msgstr "Тип релиза"
+
+#: ../picard/util/tags.py:69
+msgid "Record Label"
+msgstr "Звукозаписывающий лейбл"
+
+#: ../picard/util/tags.py:70
+msgid "Barcode"
+msgstr "Штрих-код"
+
+#: ../picard/util/tags.py:71
+msgid "Catalog Number"
+msgstr "Номер каталога"
+
+#: ../picard/util/tags.py:72
+#, fuzzy
+msgid "Format"
+msgstr "Формат:"
+
+#: ../picard/util/tags.py:73
+msgid "DJ-Mixer"
+msgstr "DJ-Микшер"
+
+#: ../picard/util/tags.py:74
+msgid "Media"
+msgstr "Медиа"
+
+#: ../picard/util/tags.py:75
+msgid "Lyrics"
+msgstr "Текст"
+
+#: ../picard/util/tags.py:76
+msgid "Mixer"
+msgstr "Микшер"
+
+#: ../picard/util/tags.py:77
+msgid "Language"
+msgstr "Язык"
+
+#: ../picard/util/tags.py:78
+#, fuzzy
+msgid "Script"
+msgstr "Скрипты"
+
 #: ../picard/util/webbrowser2.py:84
 msgid "Web Browser Error"
 msgstr "Ошибка браузера"
@@ -989,269 +2550,54 @@ msgstr ""
 "\n"
 "%s"
 
-#~ msgid "No matching tracks for file %s"
-#~ msgstr "Нет подходящих произведений для файла %s"
-
-#~ msgid "File %s identified!"
-#~ msgstr "Файл %s идентифицирован!"
-
-#~ msgid "Looking up the PUID for file %s..."
-#~ msgstr "Поиск PUID для файла %s…"
-
-#~ msgid "Looking up the metadata for file %s..."
-#~ msgstr "Поиск метаданных для файла %s…"
-
-#~ msgid "No matching releases for cluster %s"
-#~ msgstr "Нет подходящих релизов для кластера %s"
-
-#~ msgid "Cluster %s identified!"
-#~ msgstr "Кластер %s идентифицирован!"
-
-#~ msgid "Looking up the metadata for cluster %s..."
-#~ msgstr "Поиск метаданных для кластера %s…"
-
-#~ msgid "M3U Playlist (*.m3u)"
-#~ msgstr "M3U плейлист (*.m3u)"
-
-#~ msgid "PLS Playlist (*.pls)"
-#~ msgstr "PLS плейлист (*.pls)"
-
-#~ msgid "XSPF Playlist (*.xspf)"
-#~ msgstr "XSPF плейлист (*.xspf)"
-
-#~ msgid "Submitting PUIDs..."
-#~ msgstr "Идёт передача PUID’ов…"
-
-#~ msgid "PUIDs submission failed: %s"
-#~ msgstr "Передача PUID’ов не удалась: %s"
-
-#~ msgid "PUIDs successfully submitted!"
-#~ msgstr "PUID’ы успешно переданы!"
-
 #~ msgid "New Version"
 #~ msgstr "Новая версия"
-
 #~ msgid ""
 #~ "New version of Picard is available (%s). Would you like to download it "
 #~ "now?"
 #~ msgstr "Доступна новая версия Picard (%s). Не хотите ли её скачать?"
+#~ msgid "Delete"
+#~ msgstr "Удалить"
+#~ msgid "Maximal number of tags:"
+#~ msgstr "Максимальное число тегов:"
 
-#~ msgid "Couldn't find PUID for file %s"
-#~ msgstr "Невозможно найти PUID для файла %s"
-
-#~ msgid "Looking up the fingerprint for file %s..."
-#~ msgstr "Поиск отпечатка для файла %s…"
-
-#~ msgid "Creating fingerprint for file %s..."
-#~ msgstr "Создание отпечатка для файла %s…"
-
-#~ msgid "Length"
-#~ msgstr "Длина"
-
-#~ msgid "&Ok"
-#~ msgstr "&OK"
-
-#~ msgid "&Cancel"
-#~ msgstr "&Отмена"
-
-#~ msgid "About"
-#~ msgstr "О программе"
-
-#~ msgid "Advanced"
-#~ msgstr "Расширенные"
-
-#~ msgid "Matching"
-#~ msgstr "Соотнесение"
-
-#~ msgid "File Naming"
-#~ msgstr "Имена файлов"
-
-#~ msgid "Scripting"
-#~ msgstr "Скрипты"
-
-#~ msgid "Tags"
-#~ msgstr "Тэги"
-
-#~ msgid "User Interface"
-#~ msgstr "Интерфейс"
-
-#~ msgid "Date"
-#~ msgstr "Дата"
-
-#~ msgid "Album Artist"
-#~ msgstr "Исполнитель альбома"
-
-#~ msgid "Track Number"
-#~ msgstr "Номер дорожки"
-
-#~ msgid "Total Tracks"
-#~ msgstr "Всего произведений"
-
-#~ msgid "Disc Number"
-#~ msgstr "Номер диска"
-
-#~ msgid "Total Discs"
-#~ msgstr "Всего дисков"
-
-#~ msgid "Album Artist Sort Order"
-#~ msgstr "Порядок сортировки исполнителей альбомов"
-
-#~ msgid "Artist Sort Order"
-#~ msgstr "Порядок сортировки исполнителей"
-
-#~ msgid "Title Sort Order"
-#~ msgstr "Порядок сортировки произведений"
-
-#~ msgid "Album Sort Order"
-#~ msgstr "Порядок сортировки альбома"
-
-#~ msgid "ASIN"
-#~ msgstr "ASIN"
-
-#~ msgid "Grouping"
-#~ msgstr "Группировка"
-
-#~ msgid "ISRC"
-#~ msgstr "ISRC"
-
-#~ msgid "Mood"
-#~ msgstr "Настроение"
-
-#~ msgid "BPM"
-#~ msgstr "уд./мин."
-
-#~ msgid "Copyright"
-#~ msgstr "Copyright"
-
-#~ msgid "Composer"
-#~ msgstr "Композитор"
-
-#~ msgid "Conductor"
-#~ msgstr "Дирижёр"
-
-#~ msgid "Lyricist"
-#~ msgstr "Автор текста"
-
-#~ msgid "Arranger"
-#~ msgstr "Аранжировщик"
-
-#~ msgid "Producer"
-#~ msgstr "Продюсер"
-
-#~ msgid "Engineer"
-#~ msgstr "Звукооператор"
-
-#~ msgid "Subtitle"
-#~ msgstr "Подзаголовок"
-
-#~ msgid "Disc Subtitle"
-#~ msgstr "Подзаголовок диска"
-
-#~ msgid "Remixer"
-#~ msgstr "Ремиксер"
-
-#~ msgid "MusicBrainz Track Id"
-#~ msgstr "MusicBrainz ID трека"
-
-#~ msgid "MusicBrainz Release Id"
-#~ msgstr "MusicBrainz ID релиза"
-
-#~ msgid "MusicBrainz Artist Id"
-#~ msgstr "MusicBrainz ID исполнителя"
-
-#~ msgid "MusicBrainz Release Artist Id"
-#~ msgstr "MusicBrainz ID автора релиза"
-
-#~ msgid "MusicBrainz TRM Id"
-#~ msgstr "MusicBrainz TRM ID"
-
-#~ msgid "MusicIP PUID"
-#~ msgstr "MusicIP PUID"
-
-#~ msgid "MusicIP Fingerprint"
-#~ msgstr "MusicIP Fingerprint"
-
-#~ msgid "Website"
-#~ msgstr "Сайт"
-
-#~ msgid "Compilation"
-#~ msgstr "Сборник"
-
-#~ msgid "Comment"
-#~ msgstr "Комментарий"
-
-#~ msgid "Genre"
-#~ msgstr "Жанр"
-
-#~ msgid "Encoded By"
-#~ msgstr "Кодировано"
-
-#~ msgid "Performer"
-#~ msgstr "Исполнитель"
-
-#~ msgid "Release Type"
-#~ msgstr "Тип релиза"
-
-#~ msgid "Release Status"
-#~ msgstr "Статус релиза"
-
-#~ msgid "Record Label"
-#~ msgstr "Звукозаписывающий лейбл"
-
-#~ msgid "Barcode"
-#~ msgstr "Штрих-код"
-
-#~ msgid "Catalog Number"
-#~ msgstr "Номер каталога"
-
-#~ msgid "DJ-Mixer"
-#~ msgstr "DJ-Микшер"
-
-#~ msgid "Media"
-#~ msgstr "Медиа"
-
-#~ msgid "Lyrics"
-#~ msgstr "Текст"
-
-#~ msgid "Mixer"
-#~ msgstr "Микшер"
+#, fuzzy
+#~ msgid "Number of tracks on the album"
+#~ msgstr "Количество трэков"
 
+#, fuzzy
+#~ msgid "Proxy server to use"
+#~ msgstr "Использовать следующий сервер MusicBrainz"
 #~ msgid "Ctrl+T"
 #~ msgstr "Ctrl+T"
 
-#~ msgid "Toolbar"
-#~ msgstr "Панель инструментов"
+#, fuzzy
+#~ msgid "Album artist:"
+#~ msgstr "Исполнитель альбома"
 
+#, fuzzy
+#~ msgid "A&dd Directory..."
+#~ msgstr "Д&обавить папку…"
 #~ msgid "Are You Sure?"
 #~ msgstr "Вы уверены?"
-
 #~ msgid "&Save Files\tCtrl+S"
 #~ msgstr "Сохранить файлы (&S)\tCtrl+S"
-
 #~ msgid "Help"
 #~ msgstr "Справка"
-
 #~ msgid "Preferences"
 #~ msgstr "Настройки"
-
 #~ msgid "Time"
 #~ msgstr "Длина"
-
 #~ msgid "Albums"
 #~ msgstr "Альбомы"
-
 #~ msgid "Force Save"
 #~ msgstr "Принудительно сохранить"
-
 #~ msgid "Buy"
 #~ msgstr "Купить"
-
 #~ msgid "Welcome to Picard!"
 #~ msgstr "Добро пожаловать в Picard!"
-
 #~ msgid "Track Num"
 #~ msgstr "Номер трэка"
-
 #~ msgid ""
 #~ "Version %s\n"
 #~ "\n"
@@ -1278,107 +2624,76 @@ msgstr ""
 #~ "by a Helix Community grant.\n"
 #~ "\n"
 #~ "Поддерживаемые форматы: %s"
-
-#~ msgid "Colors"
-#~ msgstr "Цвета"
-
 #~ msgid "Font color"
 #~ msgstr "Цвет текста"
-
 #~ msgid "Directories"
 #~ msgstr "Директории"
-
 #~ msgid "Watch for new files"
 #~ msgstr "Следить за появлением новых файлов"
-
 #~ msgid "Watch this directory for new audio files"
 #~ msgstr "Следить за появлением новых файлов в следующей директории"
-
 #~ msgid "Encodings"
 #~ msgstr "Кодировки"
 
+#, fuzzy
+#~ msgid "all languages"
+#~ msgstr "Язык"
 #~ msgid "percent similar."
 #~ msgstr "процентов и выше."
-
 #~ msgid "Load recently used albums on startup"
 #~ msgstr "Автоматически загружать недавно использованные альбомы при запуске"
-
-#~ msgid "Language"
-#~ msgstr "Язык"
-
-#~ msgid "System default"
-#~ msgstr "Установленный в системе"
-
 #~ msgid "Allowed filename characters"
 #~ msgstr "Использовать в именах только символы из следующего списка"
-
 #~ msgid "Track name"
 #~ msgstr "Название трэка"
-
 #~ msgid "Zero padded track number"
 #~ msgstr "Номер трэка дополненный нулями"
-
 #~ msgid "File format (e.g. mp3, ogg, wav)"
 #~ msgstr "Формат файла (напр. mp3, ogg, wav)"
-
 #~ msgid "Album type (album, single, EP, etc.)"
 #~ msgstr "Тип альбома (альбом, сингл, EP, и т. д.)"
-
 #~ msgid "Album Status (official, promo, etc.)"
 #~ msgstr "Статус альбома (официальный, промо-версия, и т. д.)"
-
 #~ msgid "Album release month"
 #~ msgstr "Месяц выпуска альбома"
-
 #~ msgid "Album release day"
 #~ msgstr "День выпуска альбома"
-
 #~ msgid "Album release year"
 #~ msgstr "Год выпуска альбома"
-
 #~ msgid "Make it so!"
 #~ msgstr "Да будет так!"
-
 #~ msgid "ID3v2.4 only"
 #~ msgstr "только в ID3v2.4"
-
 #~ msgid "Save track/album"
 #~ msgstr "Сохранить трэк или альбом"
-
 #~ msgid "Artists"
 #~ msgstr "Артисты"
 
+#, fuzzy
+#~ msgid "Auto Tag"
+#~ msgstr "Редактирование тега"
 #~ msgid "New files (drag files to tag here)"
 #~ msgstr "Новые файлы (перетащите сюда файлы которые вы хотели бы обработать)"
-
 #~ msgid "updating album information"
 #~ msgstr "обновляется информация об альбоме"
-
 #~ msgid "CD Lookup error -- is there a CD in the CD-ROM drive?"
 #~ msgstr "Ошибка считывания CD -- вы вставили CD в привод?"
-
 #~ msgid "CD Lookup Failed"
 #~ msgstr "Считывание с CD завершилось неудачно"
-
 #~ msgid "Quick Start Guide"
 #~ msgstr "Краткое руководство"
-
 #~ msgid "Couldn't connect to the MusicBrainz server."
 #~ msgstr "Не удалось подключиться к серверу MusicBrainz."
-
 #~ msgid ""
 #~ "MusicBrainz Picard requires wxPython with UNICODE support.\n"
 #~ "Please download the appropriate toolkit from http://www.wxpython.org/"
 #~ msgstr ""
 #~ "Для MusicBrainz Picard требуется wxPython с поддержкой Unicode.↵\n"
 #~ "Пожалуйста скачайте соответствующий toolkit с http://www.wxpython.org/"
-
 #~ msgid "Unicode Required"
 #~ msgstr "Необходима поддержка Unicode"
-
 #~ msgid "Save error"
 #~ msgstr "Ошибка во время сохранения"
-
 #~ msgid ""
 #~ "The move files option is enabled, but the destination directory is not "
 #~ "specified or invalid.\n"
@@ -1390,172 +2705,109 @@ msgstr ""
 #~ "существует. Пожалуйста исправьте путь к директории или отключите "
 #~ "перемещение и попробуйте\n"
 #~ "выполнить операцию заново."
-
 #~ msgid "Select directory that contains music files"
 #~ msgstr "Выберите директорию с музыкальными файлами"
-
 #~ msgid "Reload album from main server"
 #~ msgstr "Загрузить альбом с основного сервера заново"
-
 #~ msgid "Select or drag a folder from below"
 #~ msgstr "Выберите или перетащите директорию из списка"
-
 #~ msgid "Drag files from below"
 #~ msgstr "Перетащите файлы из списка"
-
 #~ msgid "Release date"
 #~ msgstr "Дата выпуска"
-
 #~ msgid "%d%% similar"
 #~ msgstr "%d%% совпадение"
-
 #~ msgid ""
 #~ "The destination directory %s does not exist. Please pick a valid "
 #~ "directory."
 #~ msgstr ""
 #~ "Указанная директория %s не существует. Пожалуйста выберите существующую "
 #~ "директорию."
-
 #~ msgid "Select the encoding to use when reading and writing filenames"
 #~ msgstr "Выберите кодировку используемую для чтения и записи имён файлов"
 
+#, fuzzy
+#~ msgid "Automatically move clusters to albums that are at least"
+#~ msgstr "Автоматически сохранять трэки совпавшие на"
 #~ msgid "Automatically save recognized tracks that are at least"
 #~ msgstr "Автоматически сохранять трэки совпавшие на"
-
-#~ msgid "Czech"
-#~ msgstr "Чешский"
-
-#~ msgid "German"
-#~ msgstr "Немецкий"
-
-#~ msgid "English"
-#~ msgstr "Английский"
-
-#~ msgid "English (UK)"
-#~ msgstr "Английский (Великобритания)"
-
-#~ msgid "Spanish"
-#~ msgstr "Испанский"
-
-#~ msgid "Lithuanian"
-#~ msgstr "Литовкий"
-
-#~ msgid "Portuguese"
-#~ msgstr "Португальский"
-
-#~ msgid "Romanian"
-#~ msgstr "Румынский"
-
-#~ msgid "Russian"
-#~ msgstr "Русский"
-
-#~ msgid "Slovak"
-#~ msgstr "Словацкий"
-
 #~ msgid ""
 #~ "Note: This setting will take effect after you restart the application."
 #~ msgstr "Язык сменится только после перезапуска приложения."
-
 #~ msgid "Rename files when writing metadata tags"
 #~ msgstr "Переименовывать файлы при записи тэгов"
-
 #~ msgid "Naming Help"
 #~ msgstr "Справка по формату"
-
 #~ msgid ""
 #~ "You may use the following variables in the filenaming\n"
 #~ "specifications in the options dialog:"
 #~ msgstr ""
 #~ "В описании формата переименования в настройках вы можете\n"
 #~ "использовать следующие переменные:"
-
 #~ msgid "A %s in the naming specification will create a new subfolder."
 #~ msgstr "Символ %s в описании создаст новый подкаталог."
 
+#, fuzzy
+#~ msgid "Automatically select PUID collision tracks that are at least"
+#~ msgstr "Автоматически сохранять трэки совпавшие на"
 #~ msgid "Write ID3v1 tags to MP3 files (ID3v2 tags will always be written)"
 #~ msgstr "Записывать тэги ID3v1 в MP3-файлы (тэги ID3v2 записываются всегда)"
-
 #~ msgid "Remove track/album"
 #~ msgstr "Удалить трэк или альбом из списка"
-
 #~ msgid "Listen to track"
 #~ msgstr "Послушать трэк"
-
 #~ msgid "Album clusters"
 #~ msgstr "Альбомные кластеры"
-
 #~ msgid "%d of %d tracks linked"
 #~ msgstr "%d из %d трэков сопоставлено"
-
 #~ msgid "Matched track highlighting"
 #~ msgstr "Подсветка совпавших трэков"
-
 #~ msgid "Good match background color"
 #~ msgstr "Цвет фона файла с высоким процентом совпадения"
-
 #~ msgid "Bad match background color"
 #~ msgstr "Цвет фона файла с низким процентом совпадения"
-
 #~ msgid "When matching tracks to albums, accept tracks that are at least"
 #~ msgstr ""
 #~ "При сопоставлении трэков и альбомов принимать трэки которые совпадают на"
-
 #~ msgid "CD-ROM drive path to use for lookups"
 #~ msgstr "Путь к приводу CD-ROM, который будет использоваться для считывания"
-
 #~ msgid "Launch MB Tagger automatically for inserted Audio CDs"
 #~ msgstr "Автоматически запускать MB Tagger для вставляемых аудио CD"
-
 #~ msgid ""
 #~ "Failed to set the proper registy values to enable launching the tagger "
 #~ "after CD insertion. "
 #~ msgstr ""
 #~ "Не удалось установить настройки в реестре, необходимые для "
 #~ "автоматического запуска tagger'а после вставки CD. "
-
 #~ msgid "File format naming specification"
 #~ msgstr "Формат имени файла"
-
 #~ msgid "Various artist file format naming specification"
 #~ msgstr "Формат имени файла для альбомов с несколькими артистами"
-
 #~ msgid "Note: Leave blank to allow all possible characters"
 #~ msgstr ""
 #~ "Оставьте это поле пустым чтобы разрешить использование любых символов"
-
 #~ msgid "Track artist name"
 #~ msgstr "Имя артиста для текущего трэка"
-
 #~ msgid "Track artist sortname"
 #~ msgstr "Сортировочное имя артиста для текущего трэка"
-
 #~ msgid "The first character of the artist sortname"
 #~ msgstr "Первая буква сортировочного имени"
-
 #~ msgid "The first two characters of the artist sortname"
 #~ msgstr "Две первых буквы сортировочного имени артиста"
-
 #~ msgid "The first three characters of the artist sortname"
 #~ msgstr "Три первых буквы сортировочного имени артиста"
-
 #~ msgid "Naming specification help"
 #~ msgstr "Справка по формату переименования"
-
 #~ msgid "Various artist name"
 #~ msgstr "Имя артиста для альбомов с несколькими артистами"
-
 #~ msgid "Open file"
 #~ msgstr "Открыть файл"
-
 #~ msgid "Open directory"
 #~ msgstr "Открыть директорию"
-
 #~ msgid "Edit options"
 #~ msgstr "Поменять настройки"
-
 #~ msgid "Exit"
 #~ msgstr "Выход"
-
 #~ msgid ""
 #~ "The MusicBrainz Tagger requires wx.Widgets with UNICODE support.\n"
 #~ "Please download the appropriate toolkit from  http://www.wxwidgets.com"
@@ -1563,8 +2815,11 @@ msgstr ""
 #~ "MusicBrainz Tagger требуется для работы wx.Widgets с поддержкой UNICODE.\n"
 #~ "Пожалуйста скачайте соответствующий набор с http://www.wxwidgets.com"
 
+#, fuzzy
+#~ msgid "Unicode required"
+#~ msgstr "Необходима поддержка Unicode"
 #~ msgid "Sorry, there is no help file yet."
 #~ msgstr "Извините, справка пока не написана."
-
 #~ msgid "TRM analyzer thread priority"
 #~ msgstr "Проритет анализатора TRM"
+
diff --git a/po/sco.po b/po/sco.po
index ba4048f43..c18e6afba 100644
--- a/po/sco.po
+++ b/po/sco.po
@@ -7,35 +7,1266 @@ msgid ""
 msgstr ""
 "Project-Id-Version: picard\n"
 "Report-Msgid-Bugs-To: http://bugs.musicbrainz.org/\n"
-"POT-Creation-Date: 2008-12-01 18:20+0100\n"
-"PO-Revision-Date: 2008-08-11 09:03+0000\n"
-"Last-Translator: Frederik 'Freso' S. Olesen <Unknown>\n"
+"POT-Creation-Date: 2009-01-25 12:23+0100\n"
+"PO-Revision-Date: 2009-01-25 13:35+0100\n"
+"Last-Translator: Philipp Wolfer <phw@rubyforge.org>\n"
 "Language-Team: Scots <sco@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2008-12-01 17:02+0000\n"
+"X-Launchpad-Export-Date: 2009-01-24 23:28+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
-#: ../picard/album.py:108 ../picard/cluster.py:248
+#: ../picard/album.py:108
+#: ../picard/cluster.py:248
 msgid "Unmatched Files"
 msgstr ""
 
-#: ../picard/album.py:269
+#: ../picard/album.py:281
 #, python-format
 msgid "[couldn't load album %s]"
 msgstr "[cuidna lade album %s]"
 
-#: ../picard/album.py:305
+#: ../picard/album.py:317
 msgid "[loading album information]"
 msgstr "[lading album speirins]"
 
-#: ../picard/tagger.py:472
+#: ../picard/cluster.py:164
+#: ../picard/cluster.py:175
+#, fuzzy, python-format
+msgid "No matching releases for cluster %s"
+msgstr "Speirin for metadata o the [[slump]] %s..."
+
+#: ../picard/cluster.py:177
+#, python-format
+msgid "Cluster %s identified!"
+msgstr "[[Slump]] %s kannt!"
+
+#: ../picard/cluster.py:182
+#, python-format
+msgid "Looking up the metadata for cluster %s..."
+msgstr "Speirin for metadata o the [[slump]] %s..."
+
+#: ../picard/const.py:40
+msgid "CD"
+msgstr ""
+
+#: ../picard/const.py:41
+msgid "DVD"
+msgstr ""
+
+#: ../picard/const.py:42
+msgid "SACD"
+msgstr ""
+
+#: ../picard/const.py:43
+msgid "LaserDisc"
+msgstr ""
+
+#: ../picard/const.py:44
+msgid "MiniDisc"
+msgstr ""
+
+#: ../picard/const.py:45
+msgid "Vinyl"
+msgstr ""
+
+#: ../picard/const.py:46
+msgid "Cassette"
+msgstr ""
+
+#: ../picard/const.py:47
+msgid "Cartridge (4/8-tracks)"
+msgstr ""
+
+#: ../picard/const.py:48
+msgid "Reel-to-Reel"
+msgstr ""
+
+#: ../picard/const.py:49
+msgid "DAT"
+msgstr ""
+
+#: ../picard/const.py:50
+msgid "Digital Media"
+msgstr ""
+
+#: ../picard/const.py:51
+msgid "Wax Cylinder"
+msgstr ""
+
+#: ../picard/const.py:52
+msgid "Piano Roll"
+msgstr ""
+
+#: ../picard/const.py:53
+msgid "Other"
+msgstr ""
+
+#: ../picard/const.py:58
+msgid "Bangladesh"
+msgstr ""
+
+#: ../picard/const.py:59
+msgid "Belgium"
+msgstr ""
+
+#: ../picard/const.py:60
+msgid "Burkina Faso"
+msgstr ""
+
+#: ../picard/const.py:61
+msgid "Bulgaria"
+msgstr ""
+
+#: ../picard/const.py:62
+msgid "Barbados"
+msgstr ""
+
+#: ../picard/const.py:63
+msgid "Wallis and Futuna Islands"
+msgstr ""
+
+#: ../picard/const.py:64
+msgid "Bermuda"
+msgstr ""
+
+#: ../picard/const.py:65
+msgid "Brunei Darussalam"
+msgstr ""
+
+#: ../picard/const.py:66
+msgid "Bolivia"
+msgstr ""
+
+#: ../picard/const.py:67
+msgid "Bahrain"
+msgstr ""
+
+#: ../picard/const.py:68
+msgid "Burundi"
+msgstr ""
+
+#: ../picard/const.py:69
+msgid "Benin"
+msgstr ""
+
+#: ../picard/const.py:70
+msgid "Bhutan"
+msgstr ""
+
+#: ../picard/const.py:71
+msgid "Jamaica"
+msgstr ""
+
+#: ../picard/const.py:72
+msgid "Bouvet Island"
+msgstr ""
+
+#: ../picard/const.py:73
+msgid "Botswana"
+msgstr ""
+
+#: ../picard/const.py:74
+msgid "Samoa"
+msgstr ""
+
+#: ../picard/const.py:75
+msgid "Brazil"
+msgstr ""
+
+#: ../picard/const.py:76
+msgid "Bahamas"
+msgstr ""
+
+#: ../picard/const.py:77
+msgid "Belarus"
+msgstr ""
+
+#: ../picard/const.py:78
+msgid "Belize"
+msgstr ""
+
+#: ../picard/const.py:79
+msgid "Russian Federation"
+msgstr ""
+
+#: ../picard/const.py:80
+msgid "Rwanda"
+msgstr ""
+
+#: ../picard/const.py:81
+msgid "Reunion"
+msgstr ""
+
+#: ../picard/const.py:82
+msgid "Turkmenistan"
+msgstr ""
+
+#: ../picard/const.py:83
+msgid "Tajikistan"
+msgstr ""
+
+#: ../picard/const.py:84
+msgid "Romania"
+msgstr ""
+
+#: ../picard/const.py:85
+msgid "Tokela"
+msgstr ""
+
+#: ../picard/const.py:86
+msgid "Guinea-Bissa"
+msgstr ""
+
+#: ../picard/const.py:87
+msgid "Guam"
+msgstr ""
+
+#: ../picard/const.py:88
+msgid "Guatemala"
+msgstr ""
+
+#: ../picard/const.py:89
+msgid "Greece"
+msgstr ""
+
+#: ../picard/const.py:90
+msgid "Equatorial Guinea"
+msgstr ""
+
+#: ../picard/const.py:91
+msgid "Guadeloupe"
+msgstr ""
+
+#: ../picard/const.py:92
+msgid "Japan"
+msgstr ""
+
+#: ../picard/const.py:93
+msgid "Guyana"
+msgstr ""
+
+#: ../picard/const.py:94
+msgid "French Guiana"
+msgstr ""
+
+#: ../picard/const.py:95
+msgid "Georgia"
+msgstr ""
+
+#: ../picard/const.py:96
+msgid "Grenada"
+msgstr ""
+
+#: ../picard/const.py:97
+msgid "United Kingdom"
+msgstr ""
+
+#: ../picard/const.py:98
+msgid "Gabon"
+msgstr ""
+
+#: ../picard/const.py:99
+msgid "El Salvador"
+msgstr ""
+
+#: ../picard/const.py:100
+msgid "Guinea"
+msgstr ""
+
+#: ../picard/const.py:101
+msgid "Gambia"
+msgstr ""
+
+#: ../picard/const.py:102
+msgid "Greenland"
+msgstr ""
+
+#: ../picard/const.py:103
+msgid "Gibraltar"
+msgstr ""
+
+#: ../picard/const.py:104
+msgid "Ghana"
+msgstr ""
+
+#: ../picard/const.py:105
+msgid "Oman"
+msgstr ""
+
+#: ../picard/const.py:106
+msgid "Tunisia"
+msgstr ""
+
+#: ../picard/const.py:107
+msgid "Jordan"
+msgstr ""
+
+#: ../picard/const.py:108
+msgid "Haiti"
+msgstr ""
+
+#: ../picard/const.py:109
+msgid "Hungary"
+msgstr ""
+
+#: ../picard/const.py:110
+msgid "Hong Kong"
+msgstr ""
+
+#: ../picard/const.py:111
+msgid "Honduras"
+msgstr ""
+
+#: ../picard/const.py:112
+msgid "Heard and Mc Donald Islands"
+msgstr ""
+
+#: ../picard/const.py:113
+msgid "Venezuela"
+msgstr ""
+
+#: ../picard/const.py:114
+msgid "Puerto Rico"
+msgstr ""
+
+#: ../picard/const.py:115
+msgid "Pala"
+msgstr ""
+
+#: ../picard/const.py:116
+msgid "Portugal"
+msgstr ""
+
+#: ../picard/const.py:117
+msgid "Svalbard and Jan Mayen Islands"
+msgstr ""
+
+#: ../picard/const.py:118
+msgid "Paraguay"
+msgstr ""
+
+#: ../picard/const.py:119
+msgid "Iraq"
+msgstr ""
+
+#: ../picard/const.py:120
+msgid "Panama"
+msgstr ""
+
+#: ../picard/const.py:121
+msgid "French Polynesia"
+msgstr ""
+
+#: ../picard/const.py:122
+msgid "Papua New Guinea"
+msgstr ""
+
+#: ../picard/const.py:123
+msgid "Per"
+msgstr ""
+
+#: ../picard/const.py:124
+msgid "Pakistan"
+msgstr ""
+
+#: ../picard/const.py:125
+msgid "Philippines"
+msgstr ""
+
+#: ../picard/const.py:126
+msgid "Pitcairn"
+msgstr ""
+
+#: ../picard/const.py:127
+msgid "Poland"
+msgstr ""
+
+#: ../picard/const.py:128
+msgid "St. Pierre and Miquelon"
+msgstr ""
+
+#: ../picard/const.py:129
+msgid "Zambia"
+msgstr ""
+
+#: ../picard/const.py:130
+msgid "Western Sahara"
+msgstr ""
+
+#: ../picard/const.py:131
+msgid "Estonia"
+msgstr ""
+
+#: ../picard/const.py:132
+msgid "Egypt"
+msgstr ""
+
+#: ../picard/const.py:133
+msgid "South Africa"
+msgstr ""
+
+#: ../picard/const.py:134
+msgid "Ecuador"
+msgstr ""
+
+#: ../picard/const.py:135
+msgid "Italy"
+msgstr ""
+
+#: ../picard/const.py:136
+msgid "Viet Nam"
+msgstr ""
+
+#: ../picard/const.py:137
+msgid "Solomon Islands"
+msgstr ""
+
+#: ../picard/const.py:138
+msgid "Ethiopia"
+msgstr ""
+
+#: ../picard/const.py:139
+msgid "Somalia"
+msgstr ""
+
+#: ../picard/const.py:140
+msgid "Zimbabwe"
+msgstr ""
+
+#: ../picard/const.py:141
+msgid "Saudi Arabia"
+msgstr ""
+
+#: ../picard/const.py:142
+msgid "Spain"
+msgstr ""
+
+#: ../picard/const.py:143
+msgid "Eritrea"
+msgstr ""
+
+#: ../picard/const.py:144
+msgid "Moldova, Republic of"
+msgstr ""
+
+#: ../picard/const.py:145
+msgid "Madagascar"
+msgstr ""
+
+#: ../picard/const.py:146
+msgid "Morocco"
+msgstr ""
+
+#: ../picard/const.py:147
+msgid "Monaco"
+msgstr ""
+
+#: ../picard/const.py:148
+msgid "Uzbekistan"
+msgstr ""
+
+#: ../picard/const.py:149
+msgid "Myanmar"
+msgstr ""
+
+#: ../picard/const.py:150
+msgid "Mali"
+msgstr ""
+
+#: ../picard/const.py:151
+msgid "Maca"
+msgstr ""
+
+#: ../picard/const.py:152
+msgid "Mongolia"
+msgstr ""
+
+#: ../picard/const.py:153
+msgid "Marshall Islands"
+msgstr ""
+
+#: ../picard/const.py:154
+msgid "Macedonia, The Former Yugoslav Republic of"
+msgstr ""
+
+#: ../picard/const.py:155
+msgid "Mauritius"
+msgstr ""
+
+#: ../picard/const.py:156
+msgid "Malta"
+msgstr ""
+
+#: ../picard/const.py:157
+msgid "Malawi"
+msgstr ""
+
+#: ../picard/const.py:158
+msgid "Maldives"
+msgstr ""
+
+#: ../picard/const.py:159
+msgid "Martinique"
+msgstr ""
+
+#: ../picard/const.py:160
+msgid "Northern Mariana Islands"
+msgstr ""
+
+#: ../picard/const.py:161
+msgid "Montserrat"
+msgstr ""
+
+#: ../picard/const.py:162
+msgid "Mauritania"
+msgstr ""
+
+#: ../picard/const.py:163
+msgid "Uganda"
+msgstr ""
+
+#: ../picard/const.py:164
+msgid "Malaysia"
+msgstr ""
+
+#: ../picard/const.py:165
+msgid "Mexico"
+msgstr ""
+
+#: ../picard/const.py:166
+msgid "Israel"
+msgstr ""
+
+#: ../picard/const.py:167
+msgid "France"
+msgstr ""
+
+#: ../picard/const.py:168
+msgid "British Indian Ocean Territory"
+msgstr ""
+
+#: ../picard/const.py:169
+msgid "St. Helena"
+msgstr ""
+
+#: ../picard/const.py:170
+msgid "Finland"
+msgstr ""
+
+#: ../picard/const.py:171
+msgid "Fiji"
+msgstr ""
+
+#: ../picard/const.py:172
+msgid "Falkland Islands (Malvinas)"
+msgstr ""
+
+#: ../picard/const.py:173
+msgid "Micronesia, Federated States of"
+msgstr ""
+
+#: ../picard/const.py:174
+msgid "Faroe Islands"
+msgstr ""
+
+#: ../picard/const.py:175
+msgid "Nicaragua"
+msgstr ""
+
+#: ../picard/const.py:176
+msgid "Netherlands"
+msgstr ""
+
+#: ../picard/const.py:177
+msgid "Norway"
+msgstr ""
+
+#: ../picard/const.py:178
+msgid "Namibia"
+msgstr ""
+
+#: ../picard/const.py:179
+msgid "Vanuat"
+msgstr ""
+
+#: ../picard/const.py:180
+msgid "New Caledonia"
+msgstr ""
+
+#: ../picard/const.py:181
+msgid "Niger"
+msgstr ""
+
+#: ../picard/const.py:182
+msgid "Norfolk Island"
+msgstr ""
+
+#: ../picard/const.py:183
+msgid "Nigeria"
+msgstr ""
+
+#: ../picard/const.py:184
+msgid "New Zealand"
+msgstr ""
+
+#: ../picard/const.py:185
+msgid "Zaire"
+msgstr ""
+
+#: ../picard/const.py:186
+msgid "Nepal"
+msgstr ""
+
+#: ../picard/const.py:187
+msgid "Naur"
+msgstr ""
+
+#: ../picard/const.py:188
+msgid "Niue"
+msgstr ""
+
+#: ../picard/const.py:189
+msgid "Cook Islands"
+msgstr ""
+
+#: ../picard/const.py:190
+msgid "Cote d'Ivoire"
+msgstr ""
+
+#: ../picard/const.py:191
+msgid "Switzerland"
+msgstr ""
+
+#: ../picard/const.py:192
+msgid "Colombia"
+msgstr ""
+
+#: ../picard/const.py:193
+msgid "China"
+msgstr ""
+
+#: ../picard/const.py:194
+msgid "Cameroon"
+msgstr ""
+
+#: ../picard/const.py:195
+msgid "Chile"
+msgstr ""
+
+#: ../picard/const.py:196
+msgid "Cocos (Keeling) Islands"
+msgstr ""
+
+#: ../picard/const.py:197
+msgid "Canada"
+msgstr ""
+
+#: ../picard/const.py:198
+msgid "Congo"
+msgstr ""
+
+#: ../picard/const.py:199
+msgid "Central African Republic"
+msgstr ""
+
+#: ../picard/const.py:200
+msgid "Czech Republic"
+msgstr ""
+
+#: ../picard/const.py:201
+msgid "Cyprus"
+msgstr ""
+
+#: ../picard/const.py:202
+msgid "Christmas Island"
+msgstr ""
+
+#: ../picard/const.py:203
+msgid "Costa Rica"
+msgstr ""
+
+#: ../picard/const.py:204
+msgid "Cape Verde"
+msgstr ""
+
+#: ../picard/const.py:205
+msgid "Cuba"
+msgstr ""
+
+#: ../picard/const.py:206
+msgid "Swaziland"
+msgstr ""
+
+#: ../picard/const.py:207
+msgid "Syrian Arab Republic"
+msgstr ""
+
+#: ../picard/const.py:208
+msgid "Kyrgyzstan"
+msgstr ""
+
+#: ../picard/const.py:209
+msgid "Kenya"
+msgstr ""
+
+#: ../picard/const.py:210
+msgid "Suriname"
+msgstr ""
+
+#: ../picard/const.py:211
+msgid "Kiribati"
+msgstr ""
+
+#: ../picard/const.py:212
+msgid "Cambodia"
+msgstr ""
+
+#: ../picard/const.py:213
+msgid "Saint Kitts and Nevis"
+msgstr ""
+
+#: ../picard/const.py:214
+msgid "Comoros"
+msgstr ""
+
+#: ../picard/const.py:215
+msgid "Sao Tome and Principe"
+msgstr ""
+
+#: ../picard/const.py:216
+msgid "Slovenia"
+msgstr ""
+
+#: ../picard/const.py:217
+msgid "Kuwait"
+msgstr ""
+
+#: ../picard/const.py:218
+msgid "Senegal"
+msgstr ""
+
+#: ../picard/const.py:219
+msgid "San Marino"
+msgstr ""
+
+#: ../picard/const.py:220
+msgid "Sierra Leone"
+msgstr ""
+
+#: ../picard/const.py:221
+msgid "Seychelles"
+msgstr ""
+
+#: ../picard/const.py:222
+msgid "Kazakhstan"
+msgstr ""
+
+#: ../picard/const.py:223
+msgid "Cayman Islands"
+msgstr ""
+
+#: ../picard/const.py:224
+msgid "Singapore"
+msgstr ""
+
+#: ../picard/const.py:225
+msgid "Sweden"
+msgstr ""
+
+#: ../picard/const.py:226
+msgid "Sudan"
+msgstr ""
+
+#: ../picard/const.py:227
+msgid "Dominican Republic"
+msgstr ""
+
+#: ../picard/const.py:228
+msgid "Dominica"
+msgstr ""
+
+#: ../picard/const.py:229
+msgid "Djibouti"
+msgstr ""
+
+#: ../picard/const.py:230
+msgid "Denmark"
+msgstr ""
+
+#: ../picard/const.py:231
+msgid "Virgin Islands (British)"
+msgstr ""
+
+#: ../picard/const.py:232
+msgid "Germany"
+msgstr ""
+
+#: ../picard/const.py:233
+msgid "Yemen"
+msgstr ""
+
+#: ../picard/const.py:234
+msgid "Algeria"
+msgstr ""
+
+#: ../picard/const.py:235
+msgid "United States"
+msgstr ""
+
+#: ../picard/const.py:236
+msgid "Uruguay"
+msgstr ""
+
+#: ../picard/const.py:237
+msgid "Mayotte"
+msgstr ""
+
+#: ../picard/const.py:238
+msgid "United States Minor Outlying Islands"
+msgstr ""
+
+#: ../picard/const.py:239
+msgid "Lebanon"
+msgstr ""
+
+#: ../picard/const.py:240
+msgid "Saint Lucia"
+msgstr ""
+
+#: ../picard/const.py:241
+msgid "Lao People's Democratic Republic"
+msgstr ""
+
+#: ../picard/const.py:242
+msgid "Tuval"
+msgstr ""
+
+#: ../picard/const.py:243
+msgid "Taiwan"
+msgstr ""
+
+#: ../picard/const.py:244
+msgid "Trinidad and Tobago"
+msgstr ""
+
+#: ../picard/const.py:245
+msgid "Turkey"
+msgstr ""
+
+#: ../picard/const.py:246
+msgid "Sri Lanka"
+msgstr ""
+
+#: ../picard/const.py:247
+msgid "Liechtenstein"
+msgstr ""
+
+#: ../picard/const.py:248
+msgid "Latvia"
+msgstr ""
+
+#: ../picard/const.py:249
+msgid "Tonga"
+msgstr ""
+
+#: ../picard/const.py:250
+msgid "Lithuania"
+msgstr ""
+
+#: ../picard/const.py:251
+msgid "Luxembourg"
+msgstr ""
+
+#: ../picard/const.py:252
+msgid "Liberia"
+msgstr ""
+
+#: ../picard/const.py:253
+msgid "Lesotho"
+msgstr ""
+
+#: ../picard/const.py:254
+msgid "Thailand"
+msgstr ""
+
+#: ../picard/const.py:255
+msgid "French Southern Territories"
+msgstr ""
+
+#: ../picard/const.py:256
+msgid "Togo"
+msgstr ""
+
+#: ../picard/const.py:257
+msgid "Chad"
+msgstr ""
+
+#: ../picard/const.py:258
+msgid "Turks and Caicos Islands"
+msgstr ""
+
+#: ../picard/const.py:259
+msgid "Libyan Arab Jamahiriya"
+msgstr ""
+
+#: ../picard/const.py:260
+msgid "Vatican City State (Holy See)"
+msgstr ""
+
+#: ../picard/const.py:261
+msgid "Saint Vincent and The Grenadines"
+msgstr ""
+
+#: ../picard/const.py:262
+msgid "United Arab Emirates"
+msgstr ""
+
+#: ../picard/const.py:263
+msgid "Andorra"
+msgstr ""
+
+#: ../picard/const.py:264
+msgid "Antigua and Barbuda"
+msgstr ""
+
+#: ../picard/const.py:265
+msgid "Afghanistan"
+msgstr ""
+
+#: ../picard/const.py:266
+msgid "Anguilla"
+msgstr ""
+
+#: ../picard/const.py:267
+msgid "Virgin Islands (U.S.)"
+msgstr ""
+
+#: ../picard/const.py:268
+msgid "Iceland"
+msgstr ""
+
+#: ../picard/const.py:269
+msgid "Iran (Islamic Republic of)"
+msgstr ""
+
+#: ../picard/const.py:270
+msgid "Armenia"
+msgstr ""
+
+#: ../picard/const.py:271
+msgid "Albania"
+msgstr ""
+
+#: ../picard/const.py:272
+msgid "Angola"
+msgstr ""
+
+#: ../picard/const.py:273
+msgid "Netherlands Antilles"
+msgstr ""
+
+#: ../picard/const.py:274
+msgid "Antarctica"
+msgstr ""
+
+#: ../picard/const.py:275
+msgid "American Samoa"
+msgstr ""
+
+#: ../picard/const.py:276
+msgid "Argentina"
+msgstr ""
+
+#: ../picard/const.py:277
+msgid "Australia"
+msgstr ""
+
+#: ../picard/const.py:278
+msgid "Austria"
+msgstr ""
+
+#: ../picard/const.py:279
+msgid "Aruba"
+msgstr ""
+
+#: ../picard/const.py:280
+msgid "India"
+msgstr ""
+
+#: ../picard/const.py:281
+msgid "Tanzania, United Republic of"
+msgstr ""
+
+#: ../picard/const.py:282
+msgid "Azerbaijan"
+msgstr ""
+
+#: ../picard/const.py:283
+msgid "Ireland"
+msgstr ""
+
+#: ../picard/const.py:284
+msgid "Indonesia"
+msgstr ""
+
+#: ../picard/const.py:285
+msgid "Ukraine"
+msgstr ""
+
+#: ../picard/const.py:286
+msgid "Qatar"
+msgstr ""
+
+#: ../picard/const.py:287
+msgid "Mozambique"
+msgstr ""
+
+#: ../picard/const.py:288
+msgid "Bosnia and Herzegovina"
+msgstr ""
+
+#: ../picard/const.py:289
+msgid "Congo, The Democratic Republic of the"
+msgstr ""
+
+#: ../picard/const.py:290
+msgid "Serbia and Montenegro"
+msgstr ""
+
+#: ../picard/const.py:291
+msgid "Croatia"
+msgstr ""
+
+#: ../picard/const.py:292
+msgid "Korea (North), Democratic People's Republic of"
+msgstr ""
+
+#: ../picard/const.py:293
+msgid "Korea (South), Republic of"
+msgstr ""
+
+#: ../picard/const.py:294
+msgid "Slovakia"
+msgstr ""
+
+#: ../picard/const.py:295
+msgid "Soviet Union (historical, 1922-1991)"
+msgstr ""
+
+#: ../picard/const.py:296
+msgid "East Timor"
+msgstr ""
+
+#: ../picard/const.py:297
+msgid "Czechoslovakia (historical, 1918-1992)"
+msgstr ""
+
+#: ../picard/const.py:298
+msgid "Europe"
+msgstr ""
+
+#: ../picard/const.py:299
+msgid "East Germany (historical, 1949-1990)"
+msgstr ""
+
+#: ../picard/const.py:300
+msgid "[Unknown Country]"
+msgstr ""
+
+#: ../picard/const.py:301
+msgid "[Worldwide]"
+msgstr ""
+
+#: ../picard/const.py:302
+msgid "Yugoslavia (historical, 1918-1992)"
+msgstr ""
+
+#: ../picard/const.py:307
+msgid "Catalan"
+msgstr ""
+
+#: ../picard/const.py:308
+msgid "Czech"
+msgstr ""
+
+#: ../picard/const.py:309
+msgid "Welsh"
+msgstr ""
+
+#: ../picard/const.py:310
+msgid "Danish"
+msgstr ""
+
+#: ../picard/const.py:311
+msgid "German"
+msgstr ""
+
+#: ../picard/const.py:312
+msgid "English"
+msgstr ""
+
+#: ../picard/const.py:313
+msgid "English (Canada)"
+msgstr ""
+
+#: ../picard/const.py:314
+msgid "English (UK)"
+msgstr ""
+
+#: ../picard/const.py:315
+msgid "Spanish"
+msgstr ""
+
+#: ../picard/const.py:316
+msgid "Persian"
+msgstr ""
+
+#: ../picard/const.py:317
+msgid "Finnish"
+msgstr ""
+
+#: ../picard/const.py:318
+msgid "French"
+msgstr ""
+
+#: ../picard/const.py:319
+msgid "Frisian"
+msgstr ""
+
+#: ../picard/const.py:320
+msgid "Hebrew"
+msgstr ""
+
+#: ../picard/const.py:321
+msgid "Hungarian"
+msgstr ""
+
+#: ../picard/const.py:322
+msgid "Islandic"
+msgstr ""
+
+#: ../picard/const.py:323
+msgid "Italian"
+msgstr ""
+
+#: ../picard/const.py:324
+msgid "Kannada"
+msgstr ""
+
+#: ../picard/const.py:325
+msgid "Korean"
+msgstr ""
+
+#: ../picard/const.py:326
+msgid "Lithuanian"
+msgstr ""
+
+#: ../picard/const.py:327
+msgid "Norwegian Bokmal"
+msgstr ""
+
+#: ../picard/const.py:328
+msgid "Dutch"
+msgstr ""
+
+#: ../picard/const.py:329
+msgid "Polish"
+msgstr ""
+
+#: ../picard/const.py:330
+msgid "Portuguese"
+msgstr ""
+
+#: ../picard/const.py:331
+msgid "Brazilian Portuguese"
+msgstr ""
+
+#: ../picard/const.py:332
+msgid "Romanian"
+msgstr ""
+
+#: ../picard/const.py:333
+msgid "Russian"
+msgstr ""
+
+#: ../picard/const.py:334
+msgid "Scots"
+msgstr ""
+
+#: ../picard/const.py:335
+msgid "Slovak"
+msgstr ""
+
+#: ../picard/const.py:336
+msgid "Slovenian"
+msgstr ""
+
+#: ../picard/const.py:337
+msgid "Swedish"
+msgstr ""
+
+#: ../picard/const.py:338
+msgid "Chinese"
+msgstr ""
+
+#: ../picard/file.py:475
+#, python-format
+msgid "No matching tracks for file %s"
+msgstr ""
+
+#: ../picard/file.py:492
+#, python-format
+msgid "No matching tracks above the threshold for file %s"
+msgstr ""
+
+#: ../picard/file.py:495
+#, python-format
+msgid "File %s identified!"
+msgstr "File %s kannt!"
+
+#: ../picard/file.py:506
+#, python-format
+msgid "Looking up the PUID for file %s..."
+msgstr "Speirin for PUID o the file %s..."
+
+#: ../picard/file.py:511
+#, python-format
+msgid "Looking up the metadata for file %s..."
+msgstr "Speirin for metadata o the file %s..."
+
+#: ../picard/puidmanager.py:58
+msgid "Submitting PUIDs..."
+msgstr ""
+
+#: ../picard/puidmanager.py:64
+#, python-format
+msgid "PUIDs submission failed: %s"
+msgstr ""
+
+#: ../picard/puidmanager.py:66
+msgid "PUIDs successfully submitted!"
+msgstr ""
+
+#: ../picard/playlist.py:31
+msgid "M3U Playlist (*.m3u)"
+msgstr ""
+
+#: ../picard/playlist.py:32
+msgid "PLS Playlist (*.pls)"
+msgstr ""
+
+#: ../picard/playlist.py:33
+msgid "XSPF Playlist (*.xspf)"
+msgstr ""
+
+#: ../picard/tagger.py:476
 msgid "CD Lookup Error"
 msgstr ""
 
-#: ../picard/tagger.py:473
+#: ../picard/tagger.py:477
 #, python-format
 msgid ""
 "Error while reading CD:\n"
@@ -43,124 +1274,173 @@ msgid ""
 "%s"
 msgstr ""
 
-#: ../picard/ui/passworddialog.py:38
-#, python-format
-msgid ""
-"The server %s requires you to login. Please enter your username and password."
-msgstr ""
+#: ../picard/tagger.py:503
+#, fuzzy, python-format
+msgid "Couldn't find PUID for file %s"
+msgstr "Speirin for PUID o the file %s..."
 
-#: ../picard/ui/ui_options_script.py:52
-msgid "Tagger Script"
-msgstr ""
+#: ../picard/musicdns/__init__.py:98
+#, fuzzy, python-format
+msgid "Looking up the fingerprint for file %s..."
+msgstr "Speirin for metadata o the file %s..."
+
+#: ../picard/musicdns/__init__.py:117
+#, fuzzy, python-format
+msgid "Creating fingerprint for file %s..."
+msgstr "Speirin for PUID o the file %s..."
 
 #: ../picard/ui/cdlookup.py:31
 msgid "Score"
 msgstr ""
 
 #: ../picard/ui/cdlookup.py:31
+#: ../picard/ui/itemviews.py:82
+#: ../picard/util/tags.py:23
 msgid "Title"
 msgstr ""
 
-#: ../picard/ui/cdlookup.py:31 ../picard/ui/mainwindow.py:436
+#: ../picard/ui/cdlookup.py:31
+#: ../picard/ui/itemviews.py:84
+#: ../picard/ui/mainwindow.py:436
+#: ../picard/util/tags.py:22
 msgid "Artist"
 msgstr ""
 
-#: ../picard/ui/ui_metadata.py:121
-msgid "Lookup"
+#: ../picard/ui/coverartbox.py:47
+#: ../picard/ui/options/cover.py:29
+msgid "Cover Art"
 msgstr ""
 
-#: ../picard/ui/ui_metadata.py:122
-msgid "Title:"
+#: ../picard/ui/coverartbox.py:95
+msgid "Buy the album on Amazon"
 msgstr ""
 
-#: ../picard/ui/ui_metadata.py:123
-msgid "Date:"
+#: ../picard/ui/filebrowser.py:38
+#: ../picard/ui/mainwindow.py:302
+msgid "&Refresh"
 msgstr ""
 
-#: ../picard/ui/ui_metadata.py:124
-msgid "Artist:"
+#: ../picard/ui/filebrowser.py:41
+msgid "&Move Tagged Files Here"
 msgstr ""
 
-#: ../picard/ui/ui_metadata.py:125
-msgid "Track:"
+#: ../picard/ui/filebrowser.py:44
+msgid "Show &Hidden Files"
 msgstr ""
 
-#: ../picard/ui/ui_metadata.py:126
-msgid "0000-00-00; "
+#: ../picard/ui/itemviews.py:83
+msgid "Length"
 msgstr ""
 
-#: ../picard/ui/ui_metadata.py:127 ../picard/ui/tageditor.py:225
-#: ../picard/ui/multitageditor.py:181
+#: ../picard/ui/itemviews.py:327
+msgid "&Releases"
+msgstr ""
+
+#: ../picard/ui/itemviews.py:353
+msgid "&Plugins"
+msgstr ""
+
+#: ../picard/ui/itemviews.py:523
+msgid "Clusters"
+msgstr ""
+
+#: ../picard/ui/logview.py:29
+msgid "Log"
+msgstr ""
+
+#: ../picard/ui/puidsubmit.py:31
+#: ../picard/ui/options/plugins.py:80
+msgid "File"
+msgstr ""
+
+#: ../picard/ui/puidsubmit.py:31
+msgid "PUID"
+msgstr ""
+
+#: ../picard/ui/puidsubmit.py:31
+#: ../picard/ui/mainwindow.py:437
+msgid "Track"
+msgstr ""
+
+#: ../picard/ui/puidsubmit.py:31
+msgid "Release"
+msgstr ""
+
+#: ../picard/ui/puidsubmit.py:31
+msgid "Release ID"
+msgstr ""
+
+#: ../picard/ui/tageditor.py:65
+#: ../picard/ui/ui_options_plugins.py:62
+msgid "Details"
+msgstr ""
+
+#: ../picard/ui/tageditor.py:70
+#: ../picard/ui/tageditor.py:241
+#, python-format
+msgid "%d file"
+msgid_plural "%d files"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../picard/ui/tageditor.py:124
+#, python-format
+msgid "(different across %d file)"
+msgid_plural "(different across %d files)"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../picard/ui/tageditor.py:127
+#, python-format
+msgid "(missing from %d file)"
+msgid_plural "(missing from %d files)"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../picard/ui/tageditor.py:210
+msgid "Filename:"
+msgstr ""
+
+#: ../picard/ui/tageditor.py:212
+msgid "Format:"
+msgstr ""
+
+#: ../picard/ui/tageditor.py:221
+msgid "Size:"
+msgstr ""
+
+#: ../picard/ui/tageditor.py:225
+#: ../picard/ui/ui_metadata.py:127
 msgid "Length:"
 msgstr ""
 
-#: ../picard/ui/ui_metadata.py:128
-msgid "Album:"
+#: ../picard/ui/tageditor.py:227
+msgid "Bitrate:"
 msgstr ""
 
-#: ../picard/ui/ui_passworddialog.py:78
-msgid "Authentication required"
+#: ../picard/ui/tageditor.py:229
+msgid "Sample rate:"
 msgstr ""
 
-#: ../picard/ui/ui_passworddialog.py:79 ../picard/ui/ui_options_proxy.py:83
-#: ../picard/ui/ui_options_general.py:113
-msgid "Username:"
+#: ../picard/ui/tageditor.py:231
+msgid "Bits per sample:"
 msgstr ""
 
-#: ../picard/ui/ui_passworddialog.py:80 ../picard/ui/ui_options_proxy.py:82
-#: ../picard/ui/ui_options_general.py:112
-msgid "Password:"
+#: ../picard/ui/tageditor.py:234
+msgid "Mono"
 msgstr ""
 
-#: ../picard/ui/ui_passworddialog.py:81
-msgid "Save username and password"
+#: ../picard/ui/tageditor.py:235
+msgid "Stereo"
 msgstr ""
 
-#: ../picard/ui/ui_options_folksonomy.py:114
-#: ../picard/ui/ui_options_folksonomy_tags.py:114
-msgid "Folksonomy Tags"
+#: ../picard/ui/tageditor.py:237
+msgid "Channels:"
 msgstr ""
 
-#: ../picard/ui/ui_options_folksonomy.py:115
-#: ../picard/ui/ui_options_folksonomy_tags.py:115
-msgid "Ignore tags:"
-msgstr ""
-
-#: ../picard/ui/ui_options_folksonomy.py:116
-#: ../picard/ui/ui_options_folksonomy_tags.py:116
-msgid "Minimal tag usage:"
-msgstr ""
-
-#: ../picard/ui/ui_options_folksonomy.py:117
-#: ../picard/ui/ui_options_folksonomy_tags.py:117
-#: ../picard/ui/ui_options_matching.py:107
-#: ../picard/ui/ui_options_matching.py:108
-#: ../picard/ui/ui_options_matching.py:109
-#: ../picard/ui/ui_options_matching.py:113
-msgid " %"
-msgstr ""
-
-#: ../picard/ui/ui_options_folksonomy.py:118
-msgid "Maximum number of tags:"
-msgstr ""
-
-#: ../picard/ui/ui_options_folksonomy.py:119
-#: ../picard/ui/ui_options_folksonomy_tags.py:119
-msgid "Join multiple tags with:"
-msgstr ""
-
-#: ../picard/ui/ui_options_folksonomy.py:120
-#: ../picard/ui/ui_options_folksonomy_tags.py:120
-msgid " / "
-msgstr ""
-
-#: ../picard/ui/ui_options_folksonomy.py:121
-#: ../picard/ui/ui_options_folksonomy_tags.py:121
-msgid ", "
-msgstr ""
-
-#: ../picard/ui/ui_options_folksonomy_tags.py:118
-msgid "Maximal number of tags:"
+#: ../picard/ui/tagsfromfilenames.py:52
+#: ../picard/ui/tagsfromfilenames.py:96
+msgid "File Name"
 msgstr ""
 
 #: ../picard/ui/mainwindow.py:64
@@ -295,7 +1575,8 @@ msgstr "Rake"
 msgid "&CD Lookup..."
 msgstr ""
 
-#: ../picard/ui/mainwindow.py:272 ../picard/ui/mainwindow.py:273
+#: ../picard/ui/mainwindow.py:272
+#: ../picard/ui/mainwindow.py:273
 msgid "Lookup CD"
 msgstr ""
 
@@ -326,7 +1607,8 @@ msgstr ""
 msgid "&Lookup"
 msgstr ""
 
-#: ../picard/ui/mainwindow.py:291 ../picard/ui/mainwindow.py:292
+#: ../picard/ui/mainwindow.py:291
+#: ../picard/ui/mainwindow.py:292
 msgid "Lookup metadata"
 msgstr ""
 
@@ -339,10 +1621,6 @@ msgstr ""
 msgid "&Details..."
 msgstr ""
 
-#: ../picard/ui/mainwindow.py:302 ../picard/ui/filebrowser.py:38
-msgid "&Refresh"
-msgstr ""
-
 #: ../picard/ui/mainwindow.py:305
 msgid "Generate &Playlist..."
 msgstr ""
@@ -388,6 +1666,7 @@ msgid "&Tools"
 msgstr ""
 
 #: ../picard/ui/mainwindow.py:384
+#: ../picard/ui/util.py:33
 msgid "&Help"
 msgstr ""
 
@@ -400,13 +1679,10 @@ msgid "&Search Bar"
 msgstr ""
 
 #: ../picard/ui/mainwindow.py:435
+#: ../picard/util/tags.py:21
 msgid "Album"
 msgstr ""
 
-#: ../picard/ui/mainwindow.py:437 ../picard/ui/puidsubmit.py:31
-msgid "Track"
-msgstr ""
-
 #: ../picard/ui/mainwindow.py:476
 msgid "All Supported Formats"
 msgstr ""
@@ -421,37 +1697,288 @@ msgstr ""
 msgid "Playlist %s saved"
 msgstr ""
 
-#: ../picard/ui/mainwindow.py:638 ../picard/ui/mainwindow.py:647
+#: ../picard/ui/mainwindow.py:638
+#: ../picard/ui/mainwindow.py:647
 #, python-format
 msgid " (Error: %s)"
 msgstr ""
 
+#: ../picard/ui/ui_tageditor.py:115
+#: ../picard/ui/ui_options_plugins.py:59
+#: ../picard/ui/options/plugins.py:76
+msgid "Name"
+msgstr ""
+
+#: ../picard/ui/ui_tageditor.py:116
+msgid "Value"
+msgstr ""
+
+#: ../picard/ui/ui_tageditor.py:117
+msgid "&Add..."
+msgstr ""
+
+#: ../picard/ui/ui_tageditor.py:118
+msgid "&Edit..."
+msgstr ""
+
+#: ../picard/ui/ui_tageditor.py:119
+msgid "&Delete"
+msgstr ""
+
+#: ../picard/ui/ui_tageditor.py:120
+msgid "&Metadata"
+msgstr ""
+
+#: ../picard/ui/ui_tageditor.py:121
+msgid "A&rtwork"
+msgstr ""
+
+#: ../picard/ui/ui_tageditor.py:122
+msgid "&Info"
+msgstr ""
+
+#: ../picard/ui/passworddialog.py:38
+#, python-format
+msgid "The server %s requires you to login. Please enter your username and password."
+msgstr ""
+
+#: ../picard/ui/ui_cdlookup.py:60
+#: ../picard/ui/ui_options_cdlookup.py:47
+#: ../picard/ui/ui_options_cdlookup_win32.py:56
+#: ../picard/ui/options/cdlookup.py:35
+msgid "CD Lookup"
+msgstr ""
+
+#: ../picard/ui/ui_cdlookup.py:61
+msgid "The following releases on MusicBrainz match the CD:"
+msgstr ""
+
+#: ../picard/ui/ui_cdlookup.py:62
+#: ../picard/ui/ui_puidsubmit.py:53
+msgid "OK"
+msgstr ""
+
+#: ../picard/ui/ui_cdlookup.py:63
+msgid "    Lookup manually    "
+msgstr ""
+
+#: ../picard/ui/ui_cdlookup.py:64
+#: ../picard/ui/ui_puidsubmit.py:54
+msgid "Cancel"
+msgstr ""
+
+#: ../picard/ui/ui_passworddialog.py:78
+msgid "Authentication required"
+msgstr ""
+
+#: ../picard/ui/ui_passworddialog.py:79
+#: ../picard/ui/ui_options_general.py:113
+#: ../picard/ui/ui_options_proxy.py:83
+msgid "Username:"
+msgstr ""
+
+#: ../picard/ui/ui_passworddialog.py:80
+#: ../picard/ui/ui_options_general.py:112
+#: ../picard/ui/ui_options_proxy.py:82
+msgid "Password:"
+msgstr ""
+
+#: ../picard/ui/ui_passworddialog.py:81
+msgid "Save username and password"
+msgstr ""
+
 #: ../picard/ui/ui_edittagdialog.py:44
 msgid "Edit Tag"
 msgstr ""
 
-#: ../picard/ui/ui_options_proxy.py:81
-msgid "Web Proxy"
+#: ../picard/ui/ui_metadata.py:121
+msgid "Lookup"
 msgstr ""
 
-#: ../picard/ui/ui_options_proxy.py:84 ../picard/ui/ui_options_general.py:109
-msgid "Port:"
+#: ../picard/ui/ui_metadata.py:122
+msgid "Title:"
 msgstr ""
 
-#: ../picard/ui/ui_options_proxy.py:85 ../picard/ui/ui_options_general.py:110
-msgid "Server address:"
+#: ../picard/ui/ui_metadata.py:123
+msgid "Date:"
 msgstr ""
 
-#: ../picard/ui/ui_tagsfromfilenames.py:56
-msgid "Convert File Names to Tags"
+#: ../picard/ui/ui_metadata.py:124
+msgid "Artist:"
 msgstr ""
 
-#: ../picard/ui/ui_tagsfromfilenames.py:57
-msgid "Replace underscores with spaces"
+#: ../picard/ui/ui_metadata.py:125
+msgid "Track:"
+msgstr ""
+
+#: ../picard/ui/ui_metadata.py:126
+msgid "0000-00-00; "
+msgstr ""
+
+#: ../picard/ui/ui_metadata.py:128
+msgid "Album:"
+msgstr ""
+
+#: ../picard/ui/ui_options.py:42
+msgid "Options"
+msgstr ""
+
+#: ../picard/ui/ui_options_cdlookup.py:48
+msgid "CD-ROM device to use for lookups:"
+msgstr ""
+
+#: ../picard/ui/ui_options_cdlookup_win32.py:57
+msgid "Default CD-ROM drive to use for lookups:"
+msgstr ""
+
+#: ../picard/ui/ui_options_cover.py:56
+msgid "Location"
+msgstr ""
+
+#: ../picard/ui/ui_options_cover.py:57
+msgid "Embed cover images into tags"
+msgstr ""
+
+#: ../picard/ui/ui_options_cover.py:58
+msgid "Save cover images as separate files"
+msgstr ""
+
+#: ../picard/ui/ui_options_cover.py:59
+msgid "Overwrite the file if it already exists"
+msgstr ""
+
+#: ../picard/ui/util.py:31
+msgid "&Ok"
+msgstr ""
+
+#: ../picard/ui/util.py:32
+msgid "&Cancel"
+msgstr ""
+
+#: ../picard/ui/ui_puidsubmit.py:52
+msgid "Submit PUIDs"
+msgstr ""
+
+#: ../picard/ui/ui_options_folksonomy.py:114
+#: ../picard/ui/options/folksonomy.py:29
+msgid "Folksonomy Tags"
+msgstr ""
+
+#: ../picard/ui/ui_options_folksonomy.py:115
+msgid "Ignore tags:"
+msgstr ""
+
+#: ../picard/ui/ui_options_folksonomy.py:116
+msgid "Minimal tag usage:"
+msgstr ""
+
+#: ../picard/ui/ui_options_folksonomy.py:117
+#: ../picard/ui/ui_options_matching.py:107
+#: ../picard/ui/ui_options_matching.py:108
+#: ../picard/ui/ui_options_matching.py:109
+#: ../picard/ui/ui_options_matching.py:113
+msgid " %"
+msgstr ""
+
+#: ../picard/ui/ui_options_folksonomy.py:118
+msgid "Maximum number of tags:"
+msgstr ""
+
+#: ../picard/ui/ui_options_folksonomy.py:119
+msgid "Join multiple tags with:"
+msgstr ""
+
+#: ../picard/ui/ui_options_folksonomy.py:120
+msgid " / "
+msgstr ""
+
+#: ../picard/ui/ui_options_folksonomy.py:121
+msgid ", "
+msgstr ""
+
+#: ../picard/ui/ui_options_interface.py:50
+msgid "Miscellaneous"
+msgstr ""
+
+#: ../picard/ui/ui_options_interface.py:51
+msgid "Show text labels under icons"
+msgstr ""
+
+#: ../picard/ui/ui_options_interface.py:52
+msgid "Allow selection of multiple directories"
+msgstr ""
+
+#: ../picard/ui/ui_options_interface.py:53
+msgid "Use advanced query syntax"
+msgstr ""
+
+#: ../picard/ui/ui_options_interface.py:54
+msgid "User interface language:"
+msgstr ""
+
+#: ../picard/ui/ui_options_naming.py:165
+msgid "Rename Files"
+msgstr ""
+
+#: ../picard/ui/ui_options_naming.py:166
+msgid "Replace Windows-incompatible characters"
+msgstr ""
+
+#: ../picard/ui/ui_options_naming.py:167
+msgid "Replace non-ASCII characters"
+msgstr ""
+
+#: ../picard/ui/ui_options_naming.py:168
+#: ../picard/ui/ui_options_naming.py:169
+#: ../picard/ui/ui_options_metadata.py:109
+#: ../picard/ui/ui_options_metadata.py:110
+msgid "Default"
+msgstr ""
+
+#: ../picard/ui/ui_options_naming.py:170
+#: ../picard/ui/options/naming.py:90
+msgid "Multiple artist file naming format:"
+msgstr ""
+
+#: ../picard/ui/ui_options_naming.py:171
+#: ../picard/ui/options/naming.py:86
+msgid "File naming format:"
+msgstr ""
+
+#: ../picard/ui/ui_options_naming.py:172
+msgid "Move Files"
+msgstr ""
+
+#: ../picard/ui/ui_options_naming.py:173
+msgid "Move tagged files to this directory:"
+msgstr ""
+
+#: ../picard/ui/ui_options_naming.py:174
+msgid "Browse..."
+msgstr ""
+
+#: ../picard/ui/ui_options_naming.py:175
+msgid "Move additional files:"
+msgstr ""
+
+#: ../picard/ui/ui_options_naming.py:176
+msgid "Delete empty directories"
+msgstr ""
+
+#: ../picard/ui/ui_options_naming.py:177
+msgid "Example"
+msgstr ""
+
+#: ../picard/ui/ui_options_naming.py:178
+msgid "File name:"
+msgstr ""
+
+#: ../picard/ui/ui_options_naming.py:179
+msgid "Multiple artist file name:"
 msgstr ""
 
-#: ../picard/ui/ui_tagsfromfilenames.py:58
 #: ../picard/ui/ui_options_naming.py:180
+#: ../picard/ui/ui_tagsfromfilenames.py:58
 msgid "&Preview"
 msgstr ""
 
@@ -459,11 +1986,22 @@ msgstr ""
 msgid "MusicBrainz Server"
 msgstr ""
 
+#: ../picard/ui/ui_options_general.py:109
+#: ../picard/ui/ui_options_proxy.py:84
+msgid "Port:"
+msgstr ""
+
+#: ../picard/ui/ui_options_general.py:110
+#: ../picard/ui/ui_options_proxy.py:85
+msgid "Server address:"
+msgstr ""
+
 #: ../picard/ui/ui_options_general.py:111
 msgid "Account Information"
 msgstr ""
 
 #: ../picard/ui/ui_options_general.py:114
+#: ../picard/ui/options/general.py:29
 msgid "General"
 msgstr ""
 
@@ -471,34 +2009,6 @@ msgstr ""
 msgid "Automatically scan all new files"
 msgstr ""
 
-#: ../picard/ui/ui_options_interface.py:46
-msgid "Miscellaneous"
-msgstr ""
-
-#: ../picard/ui/ui_options_interface.py:47
-msgid "Show text labels under icons"
-msgstr ""
-
-#: ../picard/ui/ui_options_interface.py:48
-msgid "Allow selection of multiple directories"
-msgstr ""
-
-#: ../picard/ui/ui_options_interface.py:49
-msgid "Use advanced query syntax"
-msgstr ""
-
-#: ../picard/ui/itemviews.py:327
-msgid "&Releases"
-msgstr ""
-
-#: ../picard/ui/itemviews.py:353
-msgid "&Plugins"
-msgstr ""
-
-#: ../picard/ui/itemviews.py:523
-msgid "Clusters"
-msgstr ""
-
 #: ../picard/ui/ui_options_matching.py:105
 msgid "Thresholds"
 msgstr ""
@@ -519,6 +2029,67 @@ msgstr ""
 msgid "Minimal similarity for PUID lookups:"
 msgstr ""
 
+#: ../picard/ui/ui_options_metadata.py:100
+#: ../picard/ui/options/metadata.py:31
+msgid "Metadata"
+msgstr ""
+
+#: ../picard/ui/ui_options_metadata.py:101
+msgid "Translate foreign artist names to English where possible"
+msgstr ""
+
+#: ../picard/ui/ui_options_metadata.py:102
+msgid "Use release relationships"
+msgstr ""
+
+#: ../picard/ui/ui_options_metadata.py:103
+msgid "Use track relationships"
+msgstr ""
+
+#: ../picard/ui/ui_options_metadata.py:104
+msgid "Use folksonomy tags as genre"
+msgstr ""
+
+#: ../picard/ui/ui_options_metadata.py:105
+msgid "Preferred release country:"
+msgstr ""
+
+#: ../picard/ui/ui_options_metadata.py:106
+msgid "Custom Fields"
+msgstr ""
+
+#: ../picard/ui/ui_options_metadata.py:107
+msgid "Various artists:"
+msgstr ""
+
+#: ../picard/ui/ui_options_metadata.py:108
+msgid "Non-album tracks:"
+msgstr ""
+
+#: ../picard/ui/ui_options_plugins.py:58
+#: ../picard/ui/options/plugins.py:30
+msgid "Plugins"
+msgstr ""
+
+#: ../picard/ui/ui_options_plugins.py:60
+#: ../picard/ui/options/plugins.py:79
+msgid "Author"
+msgstr ""
+
+#: ../picard/ui/ui_options_plugins.py:61
+#: ../picard/util/tags.py:36
+msgid "Version"
+msgstr ""
+
+#: ../picard/ui/ui_options_proxy.py:81
+#: ../picard/ui/options/proxy.py:28
+msgid "Web Proxy"
+msgstr ""
+
+#: ../picard/ui/ui_options_script.py:52
+msgid "Tagger Script"
+msgstr ""
+
 #: ../picard/ui/ui_options_tags.py:105
 msgid "Common"
 msgstr ""
@@ -571,309 +2142,16 @@ msgstr ""
 msgid "Remove APEv2 tags from MP3 files"
 msgstr ""
 
-#: ../picard/ui/ui_options_cdlookup_win32.py:56 ../picard/ui/ui_cdlookup.py:60
-#: ../picard/ui/ui_options_cdlookup.py:47
-msgid "CD Lookup"
+#: ../picard/ui/ui_tagsfromfilenames.py:56
+msgid "Convert File Names to Tags"
 msgstr ""
 
-#: ../picard/ui/ui_options_cdlookup_win32.py:57
-msgid "Default CD-ROM drive to use for lookups:"
+#: ../picard/ui/ui_tagsfromfilenames.py:57
+msgid "Replace underscores with spaces"
 msgstr ""
 
-#: ../picard/ui/tageditor.py:65 ../picard/ui/ui_options_plugins.py:62
-#: ../picard/ui/multitageditor.py:37
-msgid "Details"
-msgstr ""
-
-#: ../picard/ui/tageditor.py:70 ../picard/ui/tageditor.py:241
-#: ../picard/ui/multitageditor.py:42 ../picard/ui/multitageditor.py:197
-#, python-format
-msgid "%d file"
-msgid_plural "%d files"
-msgstr[0] ""
-msgstr[1] ""
-
-#: ../picard/ui/tageditor.py:124 ../picard/ui/multitageditor.py:95
-#, python-format
-msgid "(different across %d file)"
-msgid_plural "(different across %d files)"
-msgstr[0] ""
-msgstr[1] ""
-
-#: ../picard/ui/tageditor.py:127 ../picard/ui/multitageditor.py:98
-#, python-format
-msgid "(missing from %d file)"
-msgid_plural "(missing from %d files)"
-msgstr[0] ""
-msgstr[1] ""
-
-#: ../picard/ui/tageditor.py:210 ../picard/ui/multitageditor.py:166
-msgid "Filename:"
-msgstr ""
-
-#: ../picard/ui/tageditor.py:212 ../picard/ui/multitageditor.py:168
-msgid "Format:"
-msgstr ""
-
-#: ../picard/ui/tageditor.py:221 ../picard/ui/multitageditor.py:177
-msgid "Size:"
-msgstr ""
-
-#: ../picard/ui/tageditor.py:227 ../picard/ui/multitageditor.py:183
-msgid "Bitrate:"
-msgstr ""
-
-#: ../picard/ui/tageditor.py:229 ../picard/ui/multitageditor.py:185
-msgid "Sample rate:"
-msgstr ""
-
-#: ../picard/ui/tageditor.py:231 ../picard/ui/multitageditor.py:187
-msgid "Bits per sample:"
-msgstr ""
-
-#: ../picard/ui/tageditor.py:234 ../picard/ui/multitageditor.py:190
-msgid "Mono"
-msgstr ""
-
-#: ../picard/ui/tageditor.py:235 ../picard/ui/multitageditor.py:191
-msgid "Stereo"
-msgstr ""
-
-#: ../picard/ui/tageditor.py:237 ../picard/ui/multitageditor.py:193
-msgid "Channels:"
-msgstr ""
-
-#: ../picard/ui/ui_tageditor.py:115 ../picard/ui/ui_multitageditor.py:55
-#: ../picard/ui/ui_options_plugins.py:59 ../picard/ui/options/plugins.py:76
-msgid "Name"
-msgstr ""
-
-#: ../picard/ui/ui_tageditor.py:116 ../picard/ui/ui_multitageditor.py:56
-msgid "Value"
-msgstr ""
-
-#: ../picard/ui/ui_tageditor.py:117 ../picard/ui/ui_multitageditor.py:57
-msgid "&Add..."
-msgstr ""
-
-#: ../picard/ui/ui_tageditor.py:118
-msgid "&Edit..."
-msgstr ""
-
-#: ../picard/ui/ui_tageditor.py:119
-msgid "&Delete"
-msgstr ""
-
-#: ../picard/ui/ui_tageditor.py:120
-msgid "&Metadata"
-msgstr ""
-
-#: ../picard/ui/ui_tageditor.py:121
-msgid "A&rtwork"
-msgstr ""
-
-#: ../picard/ui/ui_tageditor.py:122
-msgid "&Info"
-msgstr ""
-
-#: ../picard/ui/coverartbox.py:47
-msgid "Cover Art"
-msgstr ""
-
-#: ../picard/ui/coverartbox.py:95
-msgid "Buy the album on Amazon"
-msgstr ""
-
-#: ../picard/ui/ui_puidsubmit.py:52
-msgid "Submit PUIDs"
-msgstr ""
-
-#: ../picard/ui/ui_puidsubmit.py:53 ../picard/ui/ui_cdlookup.py:62
-msgid "OK"
-msgstr ""
-
-#: ../picard/ui/ui_puidsubmit.py:54 ../picard/ui/ui_cdlookup.py:64
-msgid "Cancel"
-msgstr ""
-
-#: ../picard/ui/puidsubmit.py:31 ../picard/ui/options/plugins.py:80
-msgid "File"
-msgstr ""
-
-#: ../picard/ui/puidsubmit.py:31
-msgid "PUID"
-msgstr ""
-
-#: ../picard/ui/puidsubmit.py:31
-msgid "Release"
-msgstr ""
-
-#: ../picard/ui/puidsubmit.py:31
-msgid "Release ID"
-msgstr ""
-
-#: ../picard/ui/filebrowser.py:41
-msgid "&Move Tagged Files Here"
-msgstr ""
-
-#: ../picard/ui/filebrowser.py:44
-msgid "Show &Hidden Files"
-msgstr ""
-
-#: ../picard/ui/ui_cdlookup.py:61
-msgid "The following releases on MusicBrainz match the CD:"
-msgstr ""
-
-#: ../picard/ui/ui_cdlookup.py:63
-msgid "    Lookup manually    "
-msgstr ""
-
-#: ../picard/ui/ui_options.py:42
-msgid "Options"
-msgstr ""
-
-#: ../picard/ui/tagsfromfilenames.py:52 ../picard/ui/tagsfromfilenames.py:96
-msgid "File Name"
-msgstr ""
-
-#: ../picard/ui/ui_options_cover.py:56
-msgid "Location"
-msgstr ""
-
-#: ../picard/ui/ui_options_cover.py:57
-msgid "Embed cover images into tags"
-msgstr ""
-
-#: ../picard/ui/ui_options_cover.py:58
-msgid "Save cover images as separate files"
-msgstr ""
-
-#: ../picard/ui/ui_options_cover.py:59
-msgid "Overwrite the file if it already exists"
-msgstr ""
-
-#: ../picard/ui/ui_options_metadata.py:100
-msgid "Metadata"
-msgstr ""
-
-#: ../picard/ui/ui_options_metadata.py:101
-msgid "Translate foreign artist names to English where possible"
-msgstr ""
-
-#: ../picard/ui/ui_options_metadata.py:102
-msgid "Use release relationships"
-msgstr ""
-
-#: ../picard/ui/ui_options_metadata.py:103
-msgid "Use track relationships"
-msgstr ""
-
-#: ../picard/ui/ui_options_metadata.py:104
-msgid "Use folksonomy tags as genre"
-msgstr ""
-
-#: ../picard/ui/ui_options_metadata.py:105
-msgid "Preferred release country:"
-msgstr ""
-
-#: ../picard/ui/ui_options_metadata.py:106
-msgid "Custom Fields"
-msgstr ""
-
-#: ../picard/ui/ui_options_metadata.py:107
-msgid "Various artists:"
-msgstr ""
-
-#: ../picard/ui/ui_options_metadata.py:108
-msgid "Non-album tracks:"
-msgstr ""
-
-#: ../picard/ui/ui_options_metadata.py:109
-#: ../picard/ui/ui_options_metadata.py:110
-#: ../picard/ui/ui_options_naming.py:168 ../picard/ui/ui_options_naming.py:169
-msgid "Default"
-msgstr ""
-
-#: ../picard/ui/ui_multitageditor.py:58
-msgid "Delete"
-msgstr ""
-
-#: ../picard/ui/logview.py:29
-msgid "Log"
-msgstr ""
-
-#: ../picard/ui/ui_options_plugins.py:58
-msgid "Plugins"
-msgstr ""
-
-#: ../picard/ui/ui_options_plugins.py:60 ../picard/ui/options/plugins.py:79
-msgid "Author"
-msgstr ""
-
-#: ../picard/ui/ui_options_plugins.py:61
-msgid "Version"
-msgstr ""
-
-#: ../picard/ui/ui_options_naming.py:165
-msgid "Rename Files"
-msgstr ""
-
-#: ../picard/ui/ui_options_naming.py:166
-msgid "Replace Windows-incompatible characters"
-msgstr ""
-
-#: ../picard/ui/ui_options_naming.py:167
-msgid "Replace non-ASCII characters"
-msgstr ""
-
-#: ../picard/ui/ui_options_naming.py:170 ../picard/ui/options/naming.py:90
-msgid "Multiple artist file naming format:"
-msgstr ""
-
-#: ../picard/ui/ui_options_naming.py:171 ../picard/ui/options/naming.py:86
-msgid "File naming format:"
-msgstr ""
-
-#: ../picard/ui/ui_options_naming.py:172
-msgid "Move Files"
-msgstr ""
-
-#: ../picard/ui/ui_options_naming.py:173
-msgid "Move tagged files to this directory:"
-msgstr ""
-
-#: ../picard/ui/ui_options_naming.py:174
-msgid "Browse..."
-msgstr ""
-
-#: ../picard/ui/ui_options_naming.py:175
-msgid "Move additional files:"
-msgstr ""
-
-#: ../picard/ui/ui_options_naming.py:176
-msgid "Delete empty directories"
-msgstr ""
-
-#: ../picard/ui/ui_options_naming.py:177
-msgid "Example"
-msgstr ""
-
-#: ../picard/ui/ui_options_naming.py:178
-msgid "File name:"
-msgstr ""
-
-#: ../picard/ui/ui_options_naming.py:179
-msgid "Multiple artist file name:"
-msgstr ""
-
-#: ../picard/ui/ui_options_cdlookup.py:48
-msgid "CD-ROM device to use for lookups:"
-msgstr ""
-
-#: ../picard/ui/options/scripting.py:84 ../picard/ui/options/naming.py:86
-#: ../picard/ui/options/naming.py:90 ../picard/ui/options/naming.py:93
-#: ../picard/ui/options/naming.py:95
-msgid "Script Error"
+#: ../picard/ui/options/about.py:29
+msgid "About"
 msgstr ""
 
 #. Replace this with your name to have it appear in the "About" dialog.
@@ -892,22 +2170,55 @@ msgstr ""
 #: ../picard/ui/options/about.py:55
 #, python-format
 msgid ""
-"<p align=\"center\"><span style=\"font-size:15px;font-weight:bold;"
-"\">MusicBrainz Picard</span><br/>\n"
+"<p align=\"center\"><span style=\"font-size:15px;font-weight:bold;\">MusicBrainz Picard</span><br/>\n"
 "Version %(version)s</p>\n"
 "<p align=\"center\"><strong>Supported formats</strong><br/>%(formats)s</p>\n"
 "<p align=\"center\"><strong>Please donate</strong><br/>\n"
-"Thank you for using Picard. Picard relies on the MusicBrainz database, which "
-"is operated by the MetaBrainz Foundation with the help of thousands of "
-"volunteers. If you like this application please consider donating to the "
-"MetaBrainz Foundation to keep the service running.</p>\n"
-"<p align=\"center\"><a href=\"http://metabrainz.org/donate/index.html"
-"\">Donate now!</a></p>\n"
+"Thank you for using Picard. Picard relies on the MusicBrainz database, which is operated by the MetaBrainz Foundation with the help of thousands of volunteers. If you like this application please consider donating to the MetaBrainz Foundation to keep the service running.</p>\n"
+"<p align=\"center\"><a href=\"http://metabrainz.org/donate/index.html\">Donate now!</a></p>\n"
 "<p align=\"center\"><strong>Credits</strong><br/>\n"
-"<small>Copyright © 2004-2008 Robert Kaye, Lukáš Lalinský and others%"
-"(translator-credits)s</small></p>\n"
-"<p align=\"center\"><a href=\"http://musicbrainz.org/doc/PicardTagger"
-"\">http://musicbrainz.org/doc/PicardTagger</a></p>\n"
+"<small>Copyright © 2004-2008 Robert Kaye, Lukáš Lalinský and others%(translator-credits)s</small></p>\n"
+"<p align=\"center\"><a href=\"http://musicbrainz.org/doc/PicardTagger\">http://musicbrainz.org/doc/PicardTagger</a></p>\n"
+msgstr ""
+
+#: ../picard/ui/options/advanced.py:26
+msgid "Advanced"
+msgstr ""
+
+#: ../picard/ui/options/interface.py:31
+msgid "User Interface"
+msgstr ""
+
+#: ../picard/ui/options/interface.py:47
+msgid "System default"
+msgstr ""
+
+#: ../picard/ui/options/interface.py:71
+msgid "Language changed"
+msgstr ""
+
+#: ../picard/ui/options/interface.py:71
+msgid "You have changed the interface language. You have to restart Picard in order for the change to take effect."
+msgstr ""
+
+#: ../picard/ui/options/matching.py:29
+msgid "Matching"
+msgstr ""
+
+#: ../picard/ui/options/metadata.py:52
+msgid "None"
+msgstr ""
+
+#: ../picard/ui/options/naming.py:33
+msgid "File Naming"
+msgstr ""
+
+#: ../picard/ui/options/naming.py:86
+#: ../picard/ui/options/naming.py:90
+#: ../picard/ui/options/naming.py:93
+#: ../picard/ui/options/naming.py:95
+#: ../picard/ui/options/scripting.py:84
+msgid "Script Error"
 msgstr ""
 
 #: ../picard/ui/options/naming.py:93
@@ -926,6 +2237,230 @@ msgstr ""
 msgid "The location to move files to must not be empty."
 msgstr ""
 
+#: ../picard/ui/options/scripting.py:63
+msgid "Scripting"
+msgstr ""
+
+#: ../picard/ui/options/tags.py:29
+msgid "Tags"
+msgstr ""
+
+#: ../picard/util/tags.py:24
+msgid "Date"
+msgstr ""
+
+#: ../picard/util/tags.py:25
+msgid "Album Artist"
+msgstr ""
+
+#: ../picard/util/tags.py:26
+msgid "Track Number"
+msgstr ""
+
+#: ../picard/util/tags.py:27
+msgid "Total Tracks"
+msgstr ""
+
+#: ../picard/util/tags.py:28
+msgid "Disc Number"
+msgstr ""
+
+#: ../picard/util/tags.py:29
+msgid "Total Discs"
+msgstr ""
+
+#: ../picard/util/tags.py:30
+msgid "Album Artist Sort Order"
+msgstr ""
+
+#: ../picard/util/tags.py:31
+msgid "Artist Sort Order"
+msgstr ""
+
+#: ../picard/util/tags.py:32
+msgid "Title Sort Order"
+msgstr ""
+
+#: ../picard/util/tags.py:33
+msgid "Album Sort Order"
+msgstr ""
+
+#: ../picard/util/tags.py:34
+msgid "ASIN"
+msgstr ""
+
+#: ../picard/util/tags.py:35
+msgid "Grouping"
+msgstr ""
+
+#: ../picard/util/tags.py:37
+msgid "ISRC"
+msgstr ""
+
+#: ../picard/util/tags.py:38
+msgid "Mood"
+msgstr ""
+
+#: ../picard/util/tags.py:39
+msgid "BPM"
+msgstr ""
+
+#: ../picard/util/tags.py:40
+msgid "Copyright"
+msgstr ""
+
+#: ../picard/util/tags.py:41
+msgid "Composer"
+msgstr ""
+
+#: ../picard/util/tags.py:42
+msgid "Conductor"
+msgstr ""
+
+#: ../picard/util/tags.py:43
+msgid "Lyricist"
+msgstr ""
+
+#: ../picard/util/tags.py:44
+msgid "Arranger"
+msgstr ""
+
+#: ../picard/util/tags.py:45
+msgid "Producer"
+msgstr ""
+
+#: ../picard/util/tags.py:46
+msgid "Engineer"
+msgstr ""
+
+#: ../picard/util/tags.py:47
+msgid "Subtitle"
+msgstr ""
+
+#: ../picard/util/tags.py:48
+msgid "Disc Subtitle"
+msgstr ""
+
+#: ../picard/util/tags.py:49
+msgid "Remixer"
+msgstr ""
+
+#: ../picard/util/tags.py:50
+msgid "MusicBrainz Track Id"
+msgstr ""
+
+#: ../picard/util/tags.py:51
+msgid "MusicBrainz Release Id"
+msgstr ""
+
+#: ../picard/util/tags.py:52
+msgid "MusicBrainz Artist Id"
+msgstr ""
+
+#: ../picard/util/tags.py:53
+msgid "MusicBrainz Release Artist Id"
+msgstr ""
+
+#: ../picard/util/tags.py:54
+msgid "MusicBrainz TRM Id"
+msgstr ""
+
+#: ../picard/util/tags.py:55
+msgid "MusicBrainz Disc Id"
+msgstr ""
+
+#: ../picard/util/tags.py:56
+msgid "MusicBrainz Sort Name"
+msgstr ""
+
+#: ../picard/util/tags.py:57
+msgid "MusicIP PUID"
+msgstr ""
+
+#: ../picard/util/tags.py:58
+msgid "MusicIP Fingerprint"
+msgstr ""
+
+#: ../picard/util/tags.py:59
+msgid "Disc Id"
+msgstr ""
+
+#: ../picard/util/tags.py:60
+msgid "Website"
+msgstr ""
+
+#: ../picard/util/tags.py:61
+msgid "Compilation"
+msgstr ""
+
+#: ../picard/util/tags.py:62
+msgid "Comment"
+msgstr ""
+
+#: ../picard/util/tags.py:63
+msgid "Genre"
+msgstr ""
+
+#: ../picard/util/tags.py:64
+msgid "Encoded By"
+msgstr ""
+
+#: ../picard/util/tags.py:65
+msgid "Performer"
+msgstr ""
+
+#: ../picard/util/tags.py:66
+msgid "Release Type"
+msgstr ""
+
+#: ../picard/util/tags.py:67
+msgid "Release Status"
+msgstr ""
+
+#: ../picard/util/tags.py:68
+msgid "Release Country"
+msgstr ""
+
+#: ../picard/util/tags.py:69
+msgid "Record Label"
+msgstr ""
+
+#: ../picard/util/tags.py:70
+msgid "Barcode"
+msgstr ""
+
+#: ../picard/util/tags.py:71
+msgid "Catalog Number"
+msgstr ""
+
+#: ../picard/util/tags.py:72
+msgid "Format"
+msgstr ""
+
+#: ../picard/util/tags.py:73
+msgid "DJ-Mixer"
+msgstr ""
+
+#: ../picard/util/tags.py:74
+msgid "Media"
+msgstr ""
+
+#: ../picard/util/tags.py:75
+msgid "Lyrics"
+msgstr ""
+
+#: ../picard/util/tags.py:76
+msgid "Mixer"
+msgstr ""
+
+#: ../picard/util/tags.py:77
+msgid "Language"
+msgstr ""
+
+#: ../picard/util/tags.py:78
+msgid "Script"
+msgstr ""
+
 #: ../picard/util/webbrowser2.py:84
 msgid "Web Browser Error"
 msgstr ""
@@ -938,17 +2473,3 @@ msgid ""
 "%s"
 msgstr ""
 
-#~ msgid "File %s identified!"
-#~ msgstr "File %s kannt!"
-
-#~ msgid "Looking up the PUID for file %s..."
-#~ msgstr "Speirin for PUID o the file %s..."
-
-#~ msgid "Looking up the metadata for file %s..."
-#~ msgstr "Speirin for metadata o the file %s..."
-
-#~ msgid "Cluster %s identified!"
-#~ msgstr "[[Slump]] %s kannt!"
-
-#~ msgid "Looking up the metadata for cluster %s..."
-#~ msgstr "Speirin for metadata o the [[slump]] %s..."
diff --git a/po/sk.po b/po/sk.po
index deb2db098..658076b75 100644
--- a/po/sk.po
+++ b/po/sk.po
@@ -6,36 +6,1308 @@ msgid ""
 msgstr ""
 "Project-Id-Version: 0.5.2\n"
 "Report-Msgid-Bugs-To: http://bugs.musicbrainz.org/\n"
-"POT-Creation-Date: 2008-12-01 18:20+0100\n"
-"PO-Revision-Date: 2008-07-27 22:01+0000\n"
-"Last-Translator: Lukáš Lalinský <lalinsky@gmail.com>\n"
+"POT-Creation-Date: 2009-01-25 12:23+0100\n"
+"PO-Revision-Date: 2009-01-25 13:36+0100\n"
+"Last-Translator: Philipp Wolfer <phw@rubyforge.org>\n"
 "Language-Team: Slovak <sk@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=3; plural=(n==1) ? 1 : (n>=2 && n<=4) ? 2 : 0;\n"
-"X-Launchpad-Export-Date: 2008-12-01 17:02+0000\n"
+"X-Launchpad-Export-Date: 2009-01-24 23:28+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 "Generated-By: pygettext.py 1.5\n"
 
-#: ../picard/album.py:108 ../picard/cluster.py:248
+#: ../picard/album.py:108
+#: ../picard/cluster.py:248
 msgid "Unmatched Files"
 msgstr ""
 
-#: ../picard/album.py:269
+#: ../picard/album.py:281
 #, python-format
 msgid "[couldn't load album %s]"
 msgstr ""
 
-#: ../picard/album.py:305
+#: ../picard/album.py:317
 msgid "[loading album information]"
 msgstr ""
 
-#: ../picard/tagger.py:472
+#: ../picard/cluster.py:164
+#: ../picard/cluster.py:175
+#, python-format
+msgid "No matching releases for cluster %s"
+msgstr ""
+
+#: ../picard/cluster.py:177
+#, fuzzy, python-format
+msgid "Cluster %s identified!"
+msgstr "Súbor %s identifikovaný!"
+
+#: ../picard/cluster.py:182
+#, fuzzy, python-format
+msgid "Looking up the metadata for cluster %s..."
+msgstr "Vyhľadávanie metadát k súboru %s ..."
+
+#: ../picard/const.py:40
+msgid "CD"
+msgstr ""
+
+#: ../picard/const.py:41
+msgid "DVD"
+msgstr ""
+
+#: ../picard/const.py:42
+msgid "SACD"
+msgstr ""
+
+#: ../picard/const.py:43
+msgid "LaserDisc"
+msgstr ""
+
+#: ../picard/const.py:44
+msgid "MiniDisc"
+msgstr ""
+
+#: ../picard/const.py:45
+msgid "Vinyl"
+msgstr ""
+
+#: ../picard/const.py:46
+msgid "Cassette"
+msgstr ""
+
+#: ../picard/const.py:47
+msgid "Cartridge (4/8-tracks)"
+msgstr ""
+
+#: ../picard/const.py:48
+msgid "Reel-to-Reel"
+msgstr ""
+
+#: ../picard/const.py:49
+msgid "DAT"
+msgstr ""
+
+#: ../picard/const.py:50
+msgid "Digital Media"
+msgstr ""
+
+#: ../picard/const.py:51
+msgid "Wax Cylinder"
+msgstr ""
+
+#: ../picard/const.py:52
+msgid "Piano Roll"
+msgstr ""
+
+#: ../picard/const.py:53
+#, fuzzy
+msgid "Other"
+msgstr "Neskôr"
+
+#: ../picard/const.py:58
+msgid "Bangladesh"
+msgstr ""
+
+#: ../picard/const.py:59
+msgid "Belgium"
+msgstr ""
+
+#: ../picard/const.py:60
+msgid "Burkina Faso"
+msgstr ""
+
+#: ../picard/const.py:61
+#, fuzzy
+msgid "Bulgaria"
+msgstr "Maďarčina"
+
+#: ../picard/const.py:62
+msgid "Barbados"
+msgstr ""
+
+#: ../picard/const.py:63
+msgid "Wallis and Futuna Islands"
+msgstr ""
+
+#: ../picard/const.py:64
+#, fuzzy
+msgid "Bermuda"
+msgstr "Nemčina"
+
+#: ../picard/const.py:65
+msgid "Brunei Darussalam"
+msgstr ""
+
+#: ../picard/const.py:66
+msgid "Bolivia"
+msgstr ""
+
+#: ../picard/const.py:67
+msgid "Bahrain"
+msgstr ""
+
+#: ../picard/const.py:68
+msgid "Burundi"
+msgstr ""
+
+#: ../picard/const.py:69
+msgid "Benin"
+msgstr ""
+
+#: ../picard/const.py:70
+msgid "Bhutan"
+msgstr ""
+
+#: ../picard/const.py:71
+msgid "Jamaica"
+msgstr ""
+
+#: ../picard/const.py:72
+msgid "Bouvet Island"
+msgstr ""
+
+#: ../picard/const.py:73
+msgid "Botswana"
+msgstr ""
+
+#: ../picard/const.py:74
+msgid "Samoa"
+msgstr ""
+
+#: ../picard/const.py:75
+msgid "Brazil"
+msgstr ""
+
+#: ../picard/const.py:76
+msgid "Bahamas"
+msgstr ""
+
+#: ../picard/const.py:77
+msgid "Belarus"
+msgstr ""
+
+#: ../picard/const.py:78
+msgid "Belize"
+msgstr ""
+
+#: ../picard/const.py:79
+msgid "Russian Federation"
+msgstr ""
+
+#: ../picard/const.py:80
+msgid "Rwanda"
+msgstr ""
+
+#: ../picard/const.py:81
+msgid "Reunion"
+msgstr ""
+
+#: ../picard/const.py:82
+msgid "Turkmenistan"
+msgstr ""
+
+#: ../picard/const.py:83
+msgid "Tajikistan"
+msgstr ""
+
+#: ../picard/const.py:84
+#, fuzzy
+msgid "Romania"
+msgstr "Rumunština"
+
+#: ../picard/const.py:85
+msgid "Tokela"
+msgstr ""
+
+#: ../picard/const.py:86
+msgid "Guinea-Bissa"
+msgstr ""
+
+#: ../picard/const.py:87
+msgid "Guam"
+msgstr ""
+
+#: ../picard/const.py:88
+msgid "Guatemala"
+msgstr ""
+
+#: ../picard/const.py:89
+msgid "Greece"
+msgstr ""
+
+#: ../picard/const.py:90
+msgid "Equatorial Guinea"
+msgstr ""
+
+#: ../picard/const.py:91
+msgid "Guadeloupe"
+msgstr ""
+
+#: ../picard/const.py:92
+msgid "Japan"
+msgstr ""
+
+#: ../picard/const.py:93
+msgid "Guyana"
+msgstr ""
+
+#: ../picard/const.py:94
+#, fuzzy
+msgid "French Guiana"
+msgstr "Francúzština"
+
+#: ../picard/const.py:95
+#, fuzzy
+msgid "Georgia"
+msgstr "Nemčina"
+
+#: ../picard/const.py:96
+msgid "Grenada"
+msgstr ""
+
+#: ../picard/const.py:97
+msgid "United Kingdom"
+msgstr ""
+
+#: ../picard/const.py:98
+msgid "Gabon"
+msgstr ""
+
+#: ../picard/const.py:99
+msgid "El Salvador"
+msgstr ""
+
+#: ../picard/const.py:100
+#, fuzzy
+msgid "Guinea"
+msgstr "Všeobecné"
+
+#: ../picard/const.py:101
+msgid "Gambia"
+msgstr ""
+
+#: ../picard/const.py:102
+msgid "Greenland"
+msgstr ""
+
+#: ../picard/const.py:103
+msgid "Gibraltar"
+msgstr ""
+
+#: ../picard/const.py:104
+msgid "Ghana"
+msgstr ""
+
+#: ../picard/const.py:105
+#, fuzzy
+msgid "Oman"
+msgstr "Nemčina"
+
+#: ../picard/const.py:106
+msgid "Tunisia"
+msgstr ""
+
+#: ../picard/const.py:107
+#, fuzzy
+msgid "Jordan"
+msgstr "Kórejština"
+
+#: ../picard/const.py:108
+msgid "Haiti"
+msgstr ""
+
+#: ../picard/const.py:109
+#, fuzzy
+msgid "Hungary"
+msgstr "Maďarčina"
+
+#: ../picard/const.py:110
+msgid "Hong Kong"
+msgstr ""
+
+#: ../picard/const.py:111
+msgid "Honduras"
+msgstr ""
+
+#: ../picard/const.py:112
+msgid "Heard and Mc Donald Islands"
+msgstr ""
+
+#: ../picard/const.py:113
+msgid "Venezuela"
+msgstr ""
+
+#: ../picard/const.py:114
+msgid "Puerto Rico"
+msgstr ""
+
+#: ../picard/const.py:115
+msgid "Pala"
+msgstr ""
+
+#: ../picard/const.py:116
+#, fuzzy
+msgid "Portugal"
+msgstr "Portugalčina"
+
+#: ../picard/const.py:117
+msgid "Svalbard and Jan Mayen Islands"
+msgstr ""
+
+#: ../picard/const.py:118
+msgid "Paraguay"
+msgstr ""
+
+#: ../picard/const.py:119
+msgid "Iraq"
+msgstr ""
+
+#: ../picard/const.py:120
+msgid "Panama"
+msgstr ""
+
+#: ../picard/const.py:121
+msgid "French Polynesia"
+msgstr ""
+
+#: ../picard/const.py:122
+msgid "Papua New Guinea"
+msgstr ""
+
+#: ../picard/const.py:123
+msgid "Per"
+msgstr ""
+
+#: ../picard/const.py:124
+msgid "Pakistan"
+msgstr ""
+
+#: ../picard/const.py:125
+msgid "Philippines"
+msgstr ""
+
+#: ../picard/const.py:126
+msgid "Pitcairn"
+msgstr ""
+
+#: ../picard/const.py:127
+msgid "Poland"
+msgstr ""
+
+#: ../picard/const.py:128
+msgid "St. Pierre and Miquelon"
+msgstr ""
+
+#: ../picard/const.py:129
+msgid "Zambia"
+msgstr ""
+
+#: ../picard/const.py:130
+msgid "Western Sahara"
+msgstr ""
+
+#: ../picard/const.py:131
+msgid "Estonia"
+msgstr ""
+
+#: ../picard/const.py:132
+msgid "Egypt"
+msgstr ""
+
+#: ../picard/const.py:133
+msgid "South Africa"
+msgstr ""
+
+#: ../picard/const.py:134
+msgid "Ecuador"
+msgstr ""
+
+#: ../picard/const.py:135
+#, fuzzy
+msgid "Italy"
+msgstr "Taliančina"
+
+#: ../picard/const.py:136
+#, fuzzy
+msgid "Viet Nam"
+msgstr "Názvy súborov"
+
+#: ../picard/const.py:137
+msgid "Solomon Islands"
+msgstr ""
+
+#: ../picard/const.py:138
+msgid "Ethiopia"
+msgstr ""
+
+#: ../picard/const.py:139
+#, fuzzy
+msgid "Somalia"
+msgstr "Rumunština"
+
+#: ../picard/const.py:140
+msgid "Zimbabwe"
+msgstr ""
+
+#: ../picard/const.py:141
+msgid "Saudi Arabia"
+msgstr ""
+
+#: ../picard/const.py:142
+#, fuzzy
+msgid "Spain"
+msgstr "Španielčina"
+
+#: ../picard/const.py:143
+msgid "Eritrea"
+msgstr ""
+
+#: ../picard/const.py:144
+msgid "Moldova, Republic of"
+msgstr ""
+
+#: ../picard/const.py:145
+msgid "Madagascar"
+msgstr ""
+
+#: ../picard/const.py:146
+msgid "Morocco"
+msgstr ""
+
+#: ../picard/const.py:147
+msgid "Monaco"
+msgstr ""
+
+#: ../picard/const.py:148
+msgid "Uzbekistan"
+msgstr ""
+
+#: ../picard/const.py:149
+msgid "Myanmar"
+msgstr ""
+
+#: ../picard/const.py:150
+msgid "Mali"
+msgstr ""
+
+#: ../picard/const.py:151
+msgid "Maca"
+msgstr ""
+
+#: ../picard/const.py:152
+msgid "Mongolia"
+msgstr ""
+
+#: ../picard/const.py:153
+msgid "Marshall Islands"
+msgstr ""
+
+#: ../picard/const.py:154
+msgid "Macedonia, The Former Yugoslav Republic of"
+msgstr ""
+
+#: ../picard/const.py:155
+msgid "Mauritius"
+msgstr ""
+
+#: ../picard/const.py:156
+msgid "Malta"
+msgstr ""
+
+#: ../picard/const.py:157
+msgid "Malawi"
+msgstr ""
+
+#: ../picard/const.py:158
+msgid "Maldives"
+msgstr ""
+
+#: ../picard/const.py:159
+msgid "Martinique"
+msgstr ""
+
+#: ../picard/const.py:160
+msgid "Northern Mariana Islands"
+msgstr ""
+
+#: ../picard/const.py:161
+msgid "Montserrat"
+msgstr ""
+
+#: ../picard/const.py:162
+msgid "Mauritania"
+msgstr ""
+
+#: ../picard/const.py:163
+msgid "Uganda"
+msgstr ""
+
+#: ../picard/const.py:164
+msgid "Malaysia"
+msgstr ""
+
+#: ../picard/const.py:165
+msgid "Mexico"
+msgstr ""
+
+#: ../picard/const.py:166
+msgid "Israel"
+msgstr ""
+
+#: ../picard/const.py:167
+#, fuzzy
+msgid "France"
+msgstr "Zrušiť"
+
+#: ../picard/const.py:168
+msgid "British Indian Ocean Territory"
+msgstr ""
+
+#: ../picard/const.py:169
+msgid "St. Helena"
+msgstr ""
+
+#: ../picard/const.py:170
+msgid "Finland"
+msgstr ""
+
+#: ../picard/const.py:171
+msgid "Fiji"
+msgstr ""
+
+#: ../picard/const.py:172
+msgid "Falkland Islands (Malvinas)"
+msgstr ""
+
+#: ../picard/const.py:173
+msgid "Micronesia, Federated States of"
+msgstr ""
+
+#: ../picard/const.py:174
+msgid "Faroe Islands"
+msgstr ""
+
+#: ../picard/const.py:175
+msgid "Nicaragua"
+msgstr ""
+
+#: ../picard/const.py:176
+msgid "Netherlands"
+msgstr ""
+
+#: ../picard/const.py:177
+msgid "Norway"
+msgstr ""
+
+#: ../picard/const.py:178
+msgid "Namibia"
+msgstr ""
+
+#: ../picard/const.py:179
+msgid "Vanuat"
+msgstr ""
+
+#: ../picard/const.py:180
+msgid "New Caledonia"
+msgstr ""
+
+#: ../picard/const.py:181
+msgid "Niger"
+msgstr ""
+
+#: ../picard/const.py:182
+msgid "Norfolk Island"
+msgstr ""
+
+#: ../picard/const.py:183
+msgid "Nigeria"
+msgstr ""
+
+#: ../picard/const.py:184
+msgid "New Zealand"
+msgstr ""
+
+#: ../picard/const.py:185
+msgid "Zaire"
+msgstr ""
+
+#: ../picard/const.py:186
+msgid "Nepal"
+msgstr ""
+
+#: ../picard/const.py:187
+msgid "Naur"
+msgstr ""
+
+#: ../picard/const.py:188
+msgid "Niue"
+msgstr ""
+
+#: ../picard/const.py:189
+msgid "Cook Islands"
+msgstr ""
+
+#: ../picard/const.py:190
+msgid "Cote d'Ivoire"
+msgstr ""
+
+#: ../picard/const.py:191
+msgid "Switzerland"
+msgstr ""
+
+#: ../picard/const.py:192
+msgid "Colombia"
+msgstr ""
+
+#: ../picard/const.py:193
+msgid "China"
+msgstr ""
+
+#: ../picard/const.py:194
+msgid "Cameroon"
+msgstr ""
+
+#: ../picard/const.py:195
+#, fuzzy
+msgid "Chile"
+msgstr "Súbor"
+
+#: ../picard/const.py:196
+msgid "Cocos (Keeling) Islands"
+msgstr ""
+
+#: ../picard/const.py:197
+msgid "Canada"
+msgstr ""
+
+#: ../picard/const.py:198
+msgid "Congo"
+msgstr ""
+
+#: ../picard/const.py:199
+msgid "Central African Republic"
+msgstr ""
+
+#: ../picard/const.py:200
+msgid "Czech Republic"
+msgstr ""
+
+#: ../picard/const.py:201
+msgid "Cyprus"
+msgstr ""
+
+#: ../picard/const.py:202
+msgid "Christmas Island"
+msgstr ""
+
+#: ../picard/const.py:203
+msgid "Costa Rica"
+msgstr ""
+
+#: ../picard/const.py:204
+msgid "Cape Verde"
+msgstr ""
+
+#: ../picard/const.py:205
+msgid "Cuba"
+msgstr ""
+
+#: ../picard/const.py:206
+msgid "Swaziland"
+msgstr ""
+
+#: ../picard/const.py:207
+msgid "Syrian Arab Republic"
+msgstr ""
+
+#: ../picard/const.py:208
+msgid "Kyrgyzstan"
+msgstr ""
+
+#: ../picard/const.py:209
+msgid "Kenya"
+msgstr ""
+
+#: ../picard/const.py:210
+msgid "Suriname"
+msgstr ""
+
+#: ../picard/const.py:211
+msgid "Kiribati"
+msgstr ""
+
+#: ../picard/const.py:212
+msgid "Cambodia"
+msgstr ""
+
+#: ../picard/const.py:213
+msgid "Saint Kitts and Nevis"
+msgstr ""
+
+#: ../picard/const.py:214
+#, fuzzy
+msgid "Comoros"
+msgstr "Farby"
+
+#: ../picard/const.py:215
+msgid "Sao Tome and Principe"
+msgstr ""
+
+#: ../picard/const.py:216
+#, fuzzy
+msgid "Slovenia"
+msgstr "Slovenčina"
+
+#: ../picard/const.py:217
+msgid "Kuwait"
+msgstr ""
+
+#: ../picard/const.py:218
+#, fuzzy
+msgid "Senegal"
+msgstr "Všeobecné"
+
+#: ../picard/const.py:219
+msgid "San Marino"
+msgstr ""
+
+#: ../picard/const.py:220
+msgid "Sierra Leone"
+msgstr ""
+
+#: ../picard/const.py:221
+msgid "Seychelles"
+msgstr ""
+
+#: ../picard/const.py:222
+msgid "Kazakhstan"
+msgstr ""
+
+#: ../picard/const.py:223
+msgid "Cayman Islands"
+msgstr ""
+
+#: ../picard/const.py:224
+msgid "Singapore"
+msgstr ""
+
+#: ../picard/const.py:225
+#, fuzzy
+msgid "Sweden"
+msgstr "Švédština"
+
+#: ../picard/const.py:226
+msgid "Sudan"
+msgstr ""
+
+#: ../picard/const.py:227
+msgid "Dominican Republic"
+msgstr ""
+
+#: ../picard/const.py:228
+#, fuzzy
+msgid "Dominica"
+msgstr "Rumunština"
+
+#: ../picard/const.py:229
+#, fuzzy
+msgid "Djibouti"
+msgstr "O programe"
+
+#: ../picard/const.py:230
+msgid "Denmark"
+msgstr ""
+
+#: ../picard/const.py:231
+msgid "Virgin Islands (British)"
+msgstr ""
+
+#: ../picard/const.py:232
+#, fuzzy
+msgid "Germany"
+msgstr "Nemčina"
+
+#: ../picard/const.py:233
+msgid "Yemen"
+msgstr ""
+
+#: ../picard/const.py:234
+msgid "Algeria"
+msgstr ""
+
+#: ../picard/const.py:235
+msgid "United States"
+msgstr ""
+
+#: ../picard/const.py:236
+msgid "Uruguay"
+msgstr ""
+
+#: ../picard/const.py:237
+msgid "Mayotte"
+msgstr ""
+
+#: ../picard/const.py:238
+msgid "United States Minor Outlying Islands"
+msgstr ""
+
+#: ../picard/const.py:239
+msgid "Lebanon"
+msgstr ""
+
+#: ../picard/const.py:240
+msgid "Saint Lucia"
+msgstr ""
+
+#: ../picard/const.py:241
+msgid "Lao People's Democratic Republic"
+msgstr ""
+
+#: ../picard/const.py:242
+msgid "Tuval"
+msgstr ""
+
+#: ../picard/const.py:243
+#, fuzzy
+msgid "Taiwan"
+msgstr "Taliančina"
+
+#: ../picard/const.py:244
+msgid "Trinidad and Tobago"
+msgstr ""
+
+#: ../picard/const.py:245
+msgid "Turkey"
+msgstr ""
+
+#: ../picard/const.py:246
+msgid "Sri Lanka"
+msgstr ""
+
+#: ../picard/const.py:247
+msgid "Liechtenstein"
+msgstr ""
+
+#: ../picard/const.py:248
+msgid "Latvia"
+msgstr ""
+
+#: ../picard/const.py:249
+msgid "Tonga"
+msgstr ""
+
+#: ../picard/const.py:250
+msgid "Lithuania"
+msgstr ""
+
+#: ../picard/const.py:251
+msgid "Luxembourg"
+msgstr ""
+
+#: ../picard/const.py:252
+msgid "Liberia"
+msgstr ""
+
+#: ../picard/const.py:253
+msgid "Lesotho"
+msgstr ""
+
+#: ../picard/const.py:254
+msgid "Thailand"
+msgstr ""
+
+#: ../picard/const.py:255
+msgid "French Southern Territories"
+msgstr ""
+
+#: ../picard/const.py:256
+msgid "Togo"
+msgstr ""
+
+#: ../picard/const.py:257
+msgid "Chad"
+msgstr ""
+
+#: ../picard/const.py:258
+msgid "Turks and Caicos Islands"
+msgstr ""
+
+#: ../picard/const.py:259
+msgid "Libyan Arab Jamahiriya"
+msgstr ""
+
+#: ../picard/const.py:260
+msgid "Vatican City State (Holy See)"
+msgstr ""
+
+#: ../picard/const.py:261
+msgid "Saint Vincent and The Grenadines"
+msgstr ""
+
+#: ../picard/const.py:262
+msgid "United Arab Emirates"
+msgstr ""
+
+#: ../picard/const.py:263
+msgid "Andorra"
+msgstr ""
+
+#: ../picard/const.py:264
+msgid "Antigua and Barbuda"
+msgstr ""
+
+#: ../picard/const.py:265
+msgid "Afghanistan"
+msgstr ""
+
+#: ../picard/const.py:266
+msgid "Anguilla"
+msgstr ""
+
+#: ../picard/const.py:267
+msgid "Virgin Islands (U.S.)"
+msgstr ""
+
+#: ../picard/const.py:268
+#, fuzzy
+msgid "Iceland"
+msgstr "Islandština"
+
+#: ../picard/const.py:269
+msgid "Iran (Islamic Republic of)"
+msgstr ""
+
+#: ../picard/const.py:270
+msgid "Armenia"
+msgstr ""
+
+#: ../picard/const.py:271
+msgid "Albania"
+msgstr ""
+
+#: ../picard/const.py:272
+msgid "Angola"
+msgstr ""
+
+#: ../picard/const.py:273
+msgid "Netherlands Antilles"
+msgstr ""
+
+#: ../picard/const.py:274
+msgid "Antarctica"
+msgstr ""
+
+#: ../picard/const.py:275
+msgid "American Samoa"
+msgstr ""
+
+#: ../picard/const.py:276
+msgid "Argentina"
+msgstr ""
+
+#: ../picard/const.py:277
+#, fuzzy
+msgid "Australia"
+msgstr "Taliančina"
+
+#: ../picard/const.py:278
+msgid "Austria"
+msgstr ""
+
+#: ../picard/const.py:279
+msgid "Aruba"
+msgstr ""
+
+#: ../picard/const.py:280
+#, fuzzy
+msgid "India"
+msgstr "Lokálne údaje"
+
+#: ../picard/const.py:281
+msgid "Tanzania, United Republic of"
+msgstr ""
+
+#: ../picard/const.py:282
+msgid "Azerbaijan"
+msgstr ""
+
+#: ../picard/const.py:283
+#, fuzzy
+msgid "Ireland"
+msgstr "Islandština"
+
+#: ../picard/const.py:284
+msgid "Indonesia"
+msgstr ""
+
+#: ../picard/const.py:285
+msgid "Ukraine"
+msgstr ""
+
+#: ../picard/const.py:286
+#, fuzzy
+msgid "Qatar"
+msgstr "Neskôr"
+
+#: ../picard/const.py:287
+msgid "Mozambique"
+msgstr ""
+
+#: ../picard/const.py:288
+msgid "Bosnia and Herzegovina"
+msgstr ""
+
+#: ../picard/const.py:289
+msgid "Congo, The Democratic Republic of the"
+msgstr ""
+
+#: ../picard/const.py:290
+msgid "Serbia and Montenegro"
+msgstr ""
+
+#: ../picard/const.py:291
+msgid "Croatia"
+msgstr ""
+
+#: ../picard/const.py:292
+msgid "Korea (North), Democratic People's Republic of"
+msgstr ""
+
+#: ../picard/const.py:293
+msgid "Korea (South), Republic of"
+msgstr ""
+
+#: ../picard/const.py:294
+#, fuzzy
+msgid "Slovakia"
+msgstr "Slovenčina"
+
+#: ../picard/const.py:295
+msgid "Soviet Union (historical, 1922-1991)"
+msgstr ""
+
+#: ../picard/const.py:296
+msgid "East Timor"
+msgstr ""
+
+#: ../picard/const.py:297
+msgid "Czechoslovakia (historical, 1918-1992)"
+msgstr ""
+
+#: ../picard/const.py:298
+msgid "Europe"
+msgstr ""
+
+#: ../picard/const.py:299
+msgid "East Germany (historical, 1949-1990)"
+msgstr ""
+
+#: ../picard/const.py:300
+msgid "[Unknown Country]"
+msgstr ""
+
+#: ../picard/const.py:301
+msgid "[Worldwide]"
+msgstr ""
+
+#: ../picard/const.py:302
+msgid "Yugoslavia (historical, 1918-1992)"
+msgstr ""
+
+#: ../picard/const.py:307
+#, fuzzy
+msgid "Catalan"
+msgstr "Taliančina"
+
+#: ../picard/const.py:308
+msgid "Czech"
+msgstr "Čeština"
+
+#: ../picard/const.py:309
+msgid "Welsh"
+msgstr ""
+
+#: ../picard/const.py:310
+#, fuzzy
+msgid "Danish"
+msgstr "Španielčina"
+
+#: ../picard/const.py:311
+msgid "German"
+msgstr "Nemčina"
+
+#: ../picard/const.py:312
+msgid "English"
+msgstr "Angličtina"
+
+#: ../picard/const.py:313
+#, fuzzy
+msgid "English (Canada)"
+msgstr "Angličtina (UK)"
+
+#: ../picard/const.py:314
+msgid "English (UK)"
+msgstr "Angličtina (UK)"
+
+#: ../picard/const.py:315
+msgid "Spanish"
+msgstr "Španielčina"
+
+#: ../picard/const.py:316
+#, fuzzy
+msgid "Persian"
+msgstr "Nemčina"
+
+#: ../picard/const.py:317
+msgid "Finnish"
+msgstr "Fínština"
+
+#: ../picard/const.py:318
+msgid "French"
+msgstr "Francúzština"
+
+#: ../picard/const.py:319
+msgid "Frisian"
+msgstr ""
+
+#: ../picard/const.py:320
+msgid "Hebrew"
+msgstr ""
+
+#: ../picard/const.py:321
+msgid "Hungarian"
+msgstr "Maďarčina"
+
+#: ../picard/const.py:322
+#, fuzzy
+msgid "Islandic"
+msgstr "Islandština"
+
+#: ../picard/const.py:323
+msgid "Italian"
+msgstr "Taliančina"
+
+#: ../picard/const.py:324
+msgid "Kannada"
+msgstr ""
+
+#: ../picard/const.py:325
+msgid "Korean"
+msgstr "Kórejština"
+
+#: ../picard/const.py:326
+msgid "Lithuanian"
+msgstr ""
+
+#: ../picard/const.py:327
+msgid "Norwegian Bokmal"
+msgstr "Nórština"
+
+#: ../picard/const.py:328
+msgid "Dutch"
+msgstr "Holandština"
+
+#: ../picard/const.py:329
+#, fuzzy
+msgid "Polish"
+msgstr "Angličtina"
+
+#: ../picard/const.py:330
+msgid "Portuguese"
+msgstr "Portugalčina"
+
+#: ../picard/const.py:331
+#, fuzzy
+msgid "Brazilian Portuguese"
+msgstr "Portugalčina"
+
+#: ../picard/const.py:332
+msgid "Romanian"
+msgstr "Rumunština"
+
+#: ../picard/const.py:333
+msgid "Russian"
+msgstr "Ruština"
+
+#: ../picard/const.py:334
+msgid "Scots"
+msgstr ""
+
+#: ../picard/const.py:335
+msgid "Slovak"
+msgstr "Slovenčina"
+
+#: ../picard/const.py:336
+#, fuzzy
+msgid "Slovenian"
+msgstr "Slovenčina"
+
+#: ../picard/const.py:337
+msgid "Swedish"
+msgstr "Švédština"
+
+#: ../picard/const.py:338
+msgid "Chinese"
+msgstr ""
+
+#: ../picard/file.py:475
+#, python-format
+msgid "No matching tracks for file %s"
+msgstr ""
+
+#: ../picard/file.py:492
+#, python-format
+msgid "No matching tracks above the threshold for file %s"
+msgstr ""
+
+#: ../picard/file.py:495
+#, python-format
+msgid "File %s identified!"
+msgstr "Súbor %s identifikovaný!"
+
+#: ../picard/file.py:506
+#, fuzzy, python-format
+msgid "Looking up the PUID for file %s..."
+msgstr "Prebieha vyhľadávanie PUID na súbore %s ..."
+
+#: ../picard/file.py:511
+#, fuzzy, python-format
+msgid "Looking up the metadata for file %s..."
+msgstr "Vyhľadávanie metadát k súboru %s ..."
+
+#: ../picard/puidmanager.py:58
+#, fuzzy
+msgid "Submitting PUIDs..."
+msgstr "Odoslať PUID"
+
+#: ../picard/puidmanager.py:64
+#, fuzzy, python-format
+msgid "PUIDs submission failed: %s"
+msgstr "PUID kolízia na súbore %s!"
+
+#: ../picard/puidmanager.py:66
+#, fuzzy
+msgid "PUIDs successfully submitted!"
+msgstr "PUID úspešne odoslané"
+
+#: ../picard/playlist.py:31
+msgid "M3U Playlist (*.m3u)"
+msgstr ""
+
+#: ../picard/playlist.py:32
+msgid "PLS Playlist (*.pls)"
+msgstr ""
+
+#: ../picard/playlist.py:33
+msgid "XSPF Playlist (*.xspf)"
+msgstr ""
+
+#: ../picard/tagger.py:476
 msgid "CD Lookup Error"
 msgstr ""
 
-#: ../picard/tagger.py:473
+#: ../picard/tagger.py:477
 #, python-format
 msgid ""
 "Error while reading CD:\n"
@@ -43,14 +1315,19 @@ msgid ""
 "%s"
 msgstr ""
 
-#: ../picard/ui/passworddialog.py:38
+#: ../picard/tagger.py:503
 #, python-format
-msgid ""
-"The server %s requires you to login. Please enter your username and password."
+msgid "Couldn't find PUID for file %s"
 msgstr ""
 
-#: ../picard/ui/ui_options_script.py:52
-msgid "Tagger Script"
+#: ../picard/musicdns/__init__.py:98
+#, fuzzy, python-format
+msgid "Looking up the fingerprint for file %s..."
+msgstr "Vyhľadávanie metadát k súboru %s ..."
+
+#: ../picard/musicdns/__init__.py:117
+#, python-format
+msgid "Creating fingerprint for file %s..."
 msgstr ""
 
 #: ../picard/ui/cdlookup.py:31
@@ -58,110 +1335,153 @@ msgid "Score"
 msgstr ""
 
 #: ../picard/ui/cdlookup.py:31
+#: ../picard/ui/itemviews.py:82
+#: ../picard/util/tags.py:23
 msgid "Title"
 msgstr ""
 
-#: ../picard/ui/cdlookup.py:31 ../picard/ui/mainwindow.py:436
+#: ../picard/ui/cdlookup.py:31
+#: ../picard/ui/itemviews.py:84
+#: ../picard/ui/mainwindow.py:436
+#: ../picard/util/tags.py:22
 msgid "Artist"
 msgstr "Umelec"
 
-#: ../picard/ui/ui_metadata.py:121
-msgid "Lookup"
-msgstr "Vyhľadať"
-
-#: ../picard/ui/ui_metadata.py:122
-msgid "Title:"
+#: ../picard/ui/coverartbox.py:47
+#: ../picard/ui/options/cover.py:29
+msgid "Cover Art"
 msgstr ""
 
-#: ../picard/ui/ui_metadata.py:123
-msgid "Date:"
+#: ../picard/ui/coverartbox.py:95
+msgid "Buy the album on Amazon"
 msgstr ""
 
-#: ../picard/ui/ui_metadata.py:124
-msgid "Artist:"
+#: ../picard/ui/filebrowser.py:38
+#: ../picard/ui/mainwindow.py:302
+msgid "&Refresh"
 msgstr ""
 
-#: ../picard/ui/ui_metadata.py:125
-msgid "Track:"
+#: ../picard/ui/filebrowser.py:41
+msgid "&Move Tagged Files Here"
 msgstr ""
 
-#: ../picard/ui/ui_metadata.py:126
-msgid "0000-00-00; "
+#: ../picard/ui/filebrowser.py:44
+msgid "Show &Hidden Files"
 msgstr ""
 
-#: ../picard/ui/ui_metadata.py:127 ../picard/ui/tageditor.py:225
-#: ../picard/ui/multitageditor.py:181
+#: ../picard/ui/itemviews.py:83
+msgid "Length"
+msgstr ""
+
+#: ../picard/ui/itemviews.py:327
+msgid "&Releases"
+msgstr ""
+
+#: ../picard/ui/itemviews.py:353
+msgid "&Plugins"
+msgstr ""
+
+#: ../picard/ui/itemviews.py:523
+msgid "Clusters"
+msgstr ""
+
+#: ../picard/ui/logview.py:29
+msgid "Log"
+msgstr ""
+
+#: ../picard/ui/puidsubmit.py:31
+#: ../picard/ui/options/plugins.py:80
+msgid "File"
+msgstr "Súbor"
+
+#: ../picard/ui/puidsubmit.py:31
+msgid "PUID"
+msgstr ""
+
+#: ../picard/ui/puidsubmit.py:31
+#: ../picard/ui/mainwindow.py:437
+msgid "Track"
+msgstr "Skladba"
+
+#: ../picard/ui/puidsubmit.py:31
+msgid "Release"
+msgstr ""
+
+#: ../picard/ui/puidsubmit.py:31
+msgid "Release ID"
+msgstr ""
+
+#: ../picard/ui/tageditor.py:65
+#: ../picard/ui/ui_options_plugins.py:62
+msgid "Details"
+msgstr "Podrobnosti"
+
+#: ../picard/ui/tageditor.py:70
+#: ../picard/ui/tageditor.py:241
+#, python-format
+msgid "%d file"
+msgid_plural "%d files"
+msgstr[0] "Otvoriť súbor"
+msgstr[1] "Otvoriť súbor"
+
+#: ../picard/ui/tageditor.py:124
+#, python-format
+msgid "(different across %d file)"
+msgid_plural "(different across %d files)"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../picard/ui/tageditor.py:127
+#, python-format
+msgid "(missing from %d file)"
+msgid_plural "(missing from %d files)"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../picard/ui/tageditor.py:210
+msgid "Filename:"
+msgstr ""
+
+#: ../picard/ui/tageditor.py:212
+msgid "Format:"
+msgstr ""
+
+#: ../picard/ui/tageditor.py:221
+msgid "Size:"
+msgstr ""
+
+#: ../picard/ui/tageditor.py:225
+#: ../picard/ui/ui_metadata.py:127
 msgid "Length:"
 msgstr ""
 
-#: ../picard/ui/ui_metadata.py:128
-msgid "Album:"
+#: ../picard/ui/tageditor.py:227
+msgid "Bitrate:"
 msgstr ""
 
-#: ../picard/ui/ui_passworddialog.py:78
-#, fuzzy
-msgid "Authentication required"
-msgstr "Je potrebné UNICODE"
-
-#: ../picard/ui/ui_passworddialog.py:79 ../picard/ui/ui_options_proxy.py:83
-#: ../picard/ui/ui_options_general.py:113
-msgid "Username:"
+#: ../picard/ui/tageditor.py:229
+msgid "Sample rate:"
 msgstr ""
 
-#: ../picard/ui/ui_passworddialog.py:80 ../picard/ui/ui_options_proxy.py:82
-#: ../picard/ui/ui_options_general.py:112
-msgid "Password:"
+#: ../picard/ui/tageditor.py:231
+msgid "Bits per sample:"
 msgstr ""
 
-#: ../picard/ui/ui_passworddialog.py:81
-msgid "Save username and password"
+#: ../picard/ui/tageditor.py:234
+msgid "Mono"
 msgstr ""
 
-#: ../picard/ui/ui_options_folksonomy.py:114
-#: ../picard/ui/ui_options_folksonomy_tags.py:114
-msgid "Folksonomy Tags"
+#: ../picard/ui/tageditor.py:235
+msgid "Stereo"
 msgstr ""
 
-#: ../picard/ui/ui_options_folksonomy.py:115
-#: ../picard/ui/ui_options_folksonomy_tags.py:115
-msgid "Ignore tags:"
+#: ../picard/ui/tageditor.py:237
+msgid "Channels:"
 msgstr ""
 
-#: ../picard/ui/ui_options_folksonomy.py:116
-#: ../picard/ui/ui_options_folksonomy_tags.py:116
-msgid "Minimal tag usage:"
-msgstr ""
-
-#: ../picard/ui/ui_options_folksonomy.py:117
-#: ../picard/ui/ui_options_folksonomy_tags.py:117
-#: ../picard/ui/ui_options_matching.py:107
-#: ../picard/ui/ui_options_matching.py:108
-#: ../picard/ui/ui_options_matching.py:109
-#: ../picard/ui/ui_options_matching.py:113
-msgid " %"
-msgstr ""
-
-#: ../picard/ui/ui_options_folksonomy.py:118
-msgid "Maximum number of tags:"
-msgstr ""
-
-#: ../picard/ui/ui_options_folksonomy.py:119
-#: ../picard/ui/ui_options_folksonomy_tags.py:119
-msgid "Join multiple tags with:"
-msgstr ""
-
-#: ../picard/ui/ui_options_folksonomy.py:120
-#: ../picard/ui/ui_options_folksonomy_tags.py:120
-msgid " / "
-msgstr ""
-
-#: ../picard/ui/ui_options_folksonomy.py:121
-#: ../picard/ui/ui_options_folksonomy_tags.py:121
-msgid ", "
-msgstr ""
-
-#: ../picard/ui/ui_options_folksonomy_tags.py:118
-msgid "Maximal number of tags:"
+#: ../picard/ui/tagsfromfilenames.py:52
+#: ../picard/ui/tagsfromfilenames.py:96
+msgid "File Name"
 msgstr ""
 
 #: ../picard/ui/mainwindow.py:64
@@ -297,7 +1617,8 @@ msgstr "Vyhľadať"
 msgid "&CD Lookup..."
 msgstr ""
 
-#: ../picard/ui/mainwindow.py:272 ../picard/ui/mainwindow.py:273
+#: ../picard/ui/mainwindow.py:272
+#: ../picard/ui/mainwindow.py:273
 msgid "Lookup CD"
 msgstr ""
 
@@ -328,7 +1649,8 @@ msgstr ""
 msgid "&Lookup"
 msgstr ""
 
-#: ../picard/ui/mainwindow.py:291 ../picard/ui/mainwindow.py:292
+#: ../picard/ui/mainwindow.py:291
+#: ../picard/ui/mainwindow.py:292
 msgid "Lookup metadata"
 msgstr ""
 
@@ -341,10 +1663,6 @@ msgstr ""
 msgid "&Details..."
 msgstr ""
 
-#: ../picard/ui/mainwindow.py:302 ../picard/ui/filebrowser.py:38
-msgid "&Refresh"
-msgstr ""
-
 #: ../picard/ui/mainwindow.py:305
 msgid "Generate &Playlist..."
 msgstr ""
@@ -390,6 +1708,7 @@ msgid "&Tools"
 msgstr ""
 
 #: ../picard/ui/mainwindow.py:384
+#: ../picard/ui/util.py:33
 msgid "&Help"
 msgstr "&Pomocník"
 
@@ -402,13 +1721,10 @@ msgid "&Search Bar"
 msgstr ""
 
 #: ../picard/ui/mainwindow.py:435
+#: ../picard/util/tags.py:21
 msgid "Album"
 msgstr "Album"
 
-#: ../picard/ui/mainwindow.py:437 ../picard/ui/puidsubmit.py:31
-msgid "Track"
-msgstr "Skladba"
-
 #: ../picard/ui/mainwindow.py:476
 msgid "All Supported Formats"
 msgstr ""
@@ -423,37 +1739,291 @@ msgstr ""
 msgid "Playlist %s saved"
 msgstr ""
 
-#: ../picard/ui/mainwindow.py:638 ../picard/ui/mainwindow.py:647
+#: ../picard/ui/mainwindow.py:638
+#: ../picard/ui/mainwindow.py:647
 #, python-format
 msgid " (Error: %s)"
 msgstr ""
 
+#: ../picard/ui/ui_tageditor.py:115
+#: ../picard/ui/ui_options_plugins.py:59
+#: ../picard/ui/options/plugins.py:76
+msgid "Name"
+msgstr ""
+
+#: ../picard/ui/ui_tageditor.py:116
+msgid "Value"
+msgstr ""
+
+#: ../picard/ui/ui_tageditor.py:117
+msgid "&Add..."
+msgstr ""
+
+#: ../picard/ui/ui_tageditor.py:118
+msgid "&Edit..."
+msgstr ""
+
+#: ../picard/ui/ui_tageditor.py:119
+msgid "&Delete"
+msgstr ""
+
+#: ../picard/ui/ui_tageditor.py:120
+msgid "&Metadata"
+msgstr ""
+
+#: ../picard/ui/ui_tageditor.py:121
+msgid "A&rtwork"
+msgstr ""
+
+#: ../picard/ui/ui_tageditor.py:122
+msgid "&Info"
+msgstr ""
+
+#: ../picard/ui/passworddialog.py:38
+#, python-format
+msgid "The server %s requires you to login. Please enter your username and password."
+msgstr ""
+
+#: ../picard/ui/ui_cdlookup.py:60
+#: ../picard/ui/ui_options_cdlookup.py:47
+#: ../picard/ui/ui_options_cdlookup_win32.py:56
+#: ../picard/ui/options/cdlookup.py:35
+msgid "CD Lookup"
+msgstr "Vyhľadanie CD"
+
+#: ../picard/ui/ui_cdlookup.py:61
+msgid "The following releases on MusicBrainz match the CD:"
+msgstr ""
+
+#: ../picard/ui/ui_cdlookup.py:62
+#: ../picard/ui/ui_puidsubmit.py:53
+msgid "OK"
+msgstr "OK"
+
+#: ../picard/ui/ui_cdlookup.py:63
+msgid "    Lookup manually    "
+msgstr ""
+
+#: ../picard/ui/ui_cdlookup.py:64
+#: ../picard/ui/ui_puidsubmit.py:54
+msgid "Cancel"
+msgstr "Zrušiť"
+
+#: ../picard/ui/ui_passworddialog.py:78
+#, fuzzy
+msgid "Authentication required"
+msgstr "Potrebné Unicode"
+
+#: ../picard/ui/ui_passworddialog.py:79
+#: ../picard/ui/ui_options_general.py:113
+#: ../picard/ui/ui_options_proxy.py:83
+msgid "Username:"
+msgstr ""
+
+#: ../picard/ui/ui_passworddialog.py:80
+#: ../picard/ui/ui_options_general.py:112
+#: ../picard/ui/ui_options_proxy.py:82
+msgid "Password:"
+msgstr ""
+
+#: ../picard/ui/ui_passworddialog.py:81
+msgid "Save username and password"
+msgstr ""
+
 #: ../picard/ui/ui_edittagdialog.py:44
 msgid "Edit Tag"
 msgstr ""
 
-#: ../picard/ui/ui_options_proxy.py:81
-msgid "Web Proxy"
-msgstr "Proxy"
+#: ../picard/ui/ui_metadata.py:121
+msgid "Lookup"
+msgstr "Vyhľadať"
 
-#: ../picard/ui/ui_options_proxy.py:84 ../picard/ui/ui_options_general.py:109
-msgid "Port:"
+#: ../picard/ui/ui_metadata.py:122
+msgid "Title:"
 msgstr ""
 
-#: ../picard/ui/ui_options_proxy.py:85 ../picard/ui/ui_options_general.py:110
-msgid "Server address:"
+#: ../picard/ui/ui_metadata.py:123
+msgid "Date:"
 msgstr ""
 
-#: ../picard/ui/ui_tagsfromfilenames.py:56
-msgid "Convert File Names to Tags"
+#: ../picard/ui/ui_metadata.py:124
+msgid "Artist:"
 msgstr ""
 
-#: ../picard/ui/ui_tagsfromfilenames.py:57
-msgid "Replace underscores with spaces"
+#: ../picard/ui/ui_metadata.py:125
+msgid "Track:"
+msgstr ""
+
+#: ../picard/ui/ui_metadata.py:126
+msgid "0000-00-00; "
+msgstr ""
+
+#: ../picard/ui/ui_metadata.py:128
+msgid "Album:"
+msgstr ""
+
+#: ../picard/ui/ui_options.py:42
+msgid "Options"
+msgstr ""
+
+#: ../picard/ui/ui_options_cdlookup.py:48
+msgid "CD-ROM device to use for lookups:"
+msgstr ""
+
+#: ../picard/ui/ui_options_cdlookup_win32.py:57
+msgid "Default CD-ROM drive to use for lookups:"
+msgstr ""
+
+#: ../picard/ui/ui_options_cover.py:56
+msgid "Location"
+msgstr ""
+
+#: ../picard/ui/ui_options_cover.py:57
+msgid "Embed cover images into tags"
+msgstr ""
+
+#: ../picard/ui/ui_options_cover.py:58
+msgid "Save cover images as separate files"
+msgstr ""
+
+#: ../picard/ui/ui_options_cover.py:59
+msgid "Overwrite the file if it already exists"
+msgstr ""
+
+#: ../picard/ui/util.py:31
+msgid "&Ok"
+msgstr ""
+
+#: ../picard/ui/util.py:32
+#, fuzzy
+msgid "&Cancel"
+msgstr "Zrušiť"
+
+#: ../picard/ui/ui_puidsubmit.py:52
+msgid "Submit PUIDs"
+msgstr "Odoslať PUID"
+
+#: ../picard/ui/ui_options_folksonomy.py:114
+#: ../picard/ui/options/folksonomy.py:29
+msgid "Folksonomy Tags"
+msgstr ""
+
+#: ../picard/ui/ui_options_folksonomy.py:115
+msgid "Ignore tags:"
+msgstr ""
+
+#: ../picard/ui/ui_options_folksonomy.py:116
+msgid "Minimal tag usage:"
+msgstr ""
+
+#: ../picard/ui/ui_options_folksonomy.py:117
+#: ../picard/ui/ui_options_matching.py:107
+#: ../picard/ui/ui_options_matching.py:108
+#: ../picard/ui/ui_options_matching.py:109
+#: ../picard/ui/ui_options_matching.py:113
+msgid " %"
+msgstr ""
+
+#: ../picard/ui/ui_options_folksonomy.py:118
+msgid "Maximum number of tags:"
+msgstr ""
+
+#: ../picard/ui/ui_options_folksonomy.py:119
+msgid "Join multiple tags with:"
+msgstr ""
+
+#: ../picard/ui/ui_options_folksonomy.py:120
+msgid " / "
+msgstr ""
+
+#: ../picard/ui/ui_options_folksonomy.py:121
+msgid ", "
+msgstr ""
+
+#: ../picard/ui/ui_options_interface.py:50
+msgid "Miscellaneous"
+msgstr ""
+
+#: ../picard/ui/ui_options_interface.py:51
+msgid "Show text labels under icons"
+msgstr ""
+
+#: ../picard/ui/ui_options_interface.py:52
+msgid "Allow selection of multiple directories"
+msgstr ""
+
+#: ../picard/ui/ui_options_interface.py:53
+msgid "Use advanced query syntax"
+msgstr ""
+
+#: ../picard/ui/ui_options_interface.py:54
+#, fuzzy
+msgid "User interface language:"
+msgstr "Jazyk prostredia"
+
+#: ../picard/ui/ui_options_naming.py:165
+msgid "Rename Files"
+msgstr ""
+
+#: ../picard/ui/ui_options_naming.py:166
+msgid "Replace Windows-incompatible characters"
+msgstr ""
+
+#: ../picard/ui/ui_options_naming.py:167
+msgid "Replace non-ASCII characters"
+msgstr ""
+
+#: ../picard/ui/ui_options_naming.py:168
+#: ../picard/ui/ui_options_naming.py:169
+#: ../picard/ui/ui_options_metadata.py:109
+#: ../picard/ui/ui_options_metadata.py:110
+msgid "Default"
+msgstr "Štandardné"
+
+#: ../picard/ui/ui_options_naming.py:170
+#: ../picard/ui/options/naming.py:90
+msgid "Multiple artist file naming format:"
+msgstr ""
+
+#: ../picard/ui/ui_options_naming.py:171
+#: ../picard/ui/options/naming.py:86
+msgid "File naming format:"
+msgstr ""
+
+#: ../picard/ui/ui_options_naming.py:172
+msgid "Move Files"
+msgstr ""
+
+#: ../picard/ui/ui_options_naming.py:173
+msgid "Move tagged files to this directory:"
+msgstr ""
+
+#: ../picard/ui/ui_options_naming.py:174
+msgid "Browse..."
+msgstr ""
+
+#: ../picard/ui/ui_options_naming.py:175
+msgid "Move additional files:"
+msgstr ""
+
+#: ../picard/ui/ui_options_naming.py:176
+msgid "Delete empty directories"
+msgstr ""
+
+#: ../picard/ui/ui_options_naming.py:177
+msgid "Example"
+msgstr ""
+
+#: ../picard/ui/ui_options_naming.py:178
+msgid "File name:"
+msgstr ""
+
+#: ../picard/ui/ui_options_naming.py:179
+msgid "Multiple artist file name:"
 msgstr ""
 
-#: ../picard/ui/ui_tagsfromfilenames.py:58
 #: ../picard/ui/ui_options_naming.py:180
+#: ../picard/ui/ui_tagsfromfilenames.py:58
 msgid "&Preview"
 msgstr ""
 
@@ -461,11 +2031,22 @@ msgstr ""
 msgid "MusicBrainz Server"
 msgstr ""
 
+#: ../picard/ui/ui_options_general.py:109
+#: ../picard/ui/ui_options_proxy.py:84
+msgid "Port:"
+msgstr ""
+
+#: ../picard/ui/ui_options_general.py:110
+#: ../picard/ui/ui_options_proxy.py:85
+msgid "Server address:"
+msgstr ""
+
 #: ../picard/ui/ui_options_general.py:111
 msgid "Account Information"
 msgstr ""
 
 #: ../picard/ui/ui_options_general.py:114
+#: ../picard/ui/options/general.py:29
 msgid "General"
 msgstr "Všeobecné"
 
@@ -473,34 +2054,6 @@ msgstr "Všeobecné"
 msgid "Automatically scan all new files"
 msgstr ""
 
-#: ../picard/ui/ui_options_interface.py:46
-msgid "Miscellaneous"
-msgstr ""
-
-#: ../picard/ui/ui_options_interface.py:47
-msgid "Show text labels under icons"
-msgstr ""
-
-#: ../picard/ui/ui_options_interface.py:48
-msgid "Allow selection of multiple directories"
-msgstr ""
-
-#: ../picard/ui/ui_options_interface.py:49
-msgid "Use advanced query syntax"
-msgstr ""
-
-#: ../picard/ui/itemviews.py:327
-msgid "&Releases"
-msgstr ""
-
-#: ../picard/ui/itemviews.py:353
-msgid "&Plugins"
-msgstr ""
-
-#: ../picard/ui/itemviews.py:523
-msgid "Clusters"
-msgstr ""
-
 #: ../picard/ui/ui_options_matching.py:105
 msgid "Thresholds"
 msgstr ""
@@ -521,6 +2074,68 @@ msgstr ""
 msgid "Minimal similarity for PUID lookups:"
 msgstr ""
 
+#: ../picard/ui/ui_options_metadata.py:100
+#: ../picard/ui/options/metadata.py:31
+msgid "Metadata"
+msgstr ""
+
+#: ../picard/ui/ui_options_metadata.py:101
+msgid "Translate foreign artist names to English where possible"
+msgstr ""
+
+#: ../picard/ui/ui_options_metadata.py:102
+msgid "Use release relationships"
+msgstr ""
+
+#: ../picard/ui/ui_options_metadata.py:103
+msgid "Use track relationships"
+msgstr ""
+
+#: ../picard/ui/ui_options_metadata.py:104
+msgid "Use folksonomy tags as genre"
+msgstr ""
+
+#: ../picard/ui/ui_options_metadata.py:105
+#, fuzzy
+msgid "Preferred release country:"
+msgstr "Dátum vydania"
+
+#: ../picard/ui/ui_options_metadata.py:106
+msgid "Custom Fields"
+msgstr ""
+
+#: ../picard/ui/ui_options_metadata.py:107
+msgid "Various artists:"
+msgstr ""
+
+#: ../picard/ui/ui_options_metadata.py:108
+msgid "Non-album tracks:"
+msgstr ""
+
+#: ../picard/ui/ui_options_plugins.py:58
+#: ../picard/ui/options/plugins.py:30
+msgid "Plugins"
+msgstr ""
+
+#: ../picard/ui/ui_options_plugins.py:60
+#: ../picard/ui/options/plugins.py:79
+msgid "Author"
+msgstr ""
+
+#: ../picard/ui/ui_options_plugins.py:61
+#: ../picard/util/tags.py:36
+msgid "Version"
+msgstr ""
+
+#: ../picard/ui/ui_options_proxy.py:81
+#: ../picard/ui/options/proxy.py:28
+msgid "Web Proxy"
+msgstr "Proxy"
+
+#: ../picard/ui/ui_options_script.py:52
+msgid "Tagger Script"
+msgstr ""
+
 #: ../picard/ui/ui_options_tags.py:105
 msgid "Common"
 msgstr ""
@@ -573,338 +2188,26 @@ msgstr ""
 msgid "Remove APEv2 tags from MP3 files"
 msgstr ""
 
-#: ../picard/ui/ui_options_cdlookup_win32.py:56 ../picard/ui/ui_cdlookup.py:60
-#: ../picard/ui/ui_options_cdlookup.py:47
-msgid "CD Lookup"
-msgstr "Vyhľadanie CD"
-
-#: ../picard/ui/ui_options_cdlookup_win32.py:57
-msgid "Default CD-ROM drive to use for lookups:"
+#: ../picard/ui/ui_tagsfromfilenames.py:56
+msgid "Convert File Names to Tags"
 msgstr ""
 
-#: ../picard/ui/tageditor.py:65 ../picard/ui/ui_options_plugins.py:62
-#: ../picard/ui/multitageditor.py:37
-msgid "Details"
-msgstr "Podrobnosti"
-
-#: ../picard/ui/tageditor.py:70 ../picard/ui/tageditor.py:241
-#: ../picard/ui/multitageditor.py:42 ../picard/ui/multitageditor.py:197
-#, python-format
-msgid "%d file"
-msgid_plural "%d files"
-msgstr[0] ""
-msgstr[1] ""
-msgstr[2] ""
-
-#: ../picard/ui/tageditor.py:124 ../picard/ui/multitageditor.py:95
-#, python-format
-msgid "(different across %d file)"
-msgid_plural "(different across %d files)"
-msgstr[0] ""
-msgstr[1] ""
-msgstr[2] ""
-
-#: ../picard/ui/tageditor.py:127 ../picard/ui/multitageditor.py:98
-#, python-format
-msgid "(missing from %d file)"
-msgid_plural "(missing from %d files)"
-msgstr[0] ""
-msgstr[1] ""
-msgstr[2] ""
-
-#: ../picard/ui/tageditor.py:210 ../picard/ui/multitageditor.py:166
-msgid "Filename:"
+#: ../picard/ui/ui_tagsfromfilenames.py:57
+msgid "Replace underscores with spaces"
 msgstr ""
 
-#: ../picard/ui/tageditor.py:212 ../picard/ui/multitageditor.py:168
-msgid "Format:"
-msgstr ""
-
-#: ../picard/ui/tageditor.py:221 ../picard/ui/multitageditor.py:177
-msgid "Size:"
-msgstr ""
-
-#: ../picard/ui/tageditor.py:227 ../picard/ui/multitageditor.py:183
-msgid "Bitrate:"
-msgstr ""
-
-#: ../picard/ui/tageditor.py:229 ../picard/ui/multitageditor.py:185
-msgid "Sample rate:"
-msgstr ""
-
-#: ../picard/ui/tageditor.py:231 ../picard/ui/multitageditor.py:187
-msgid "Bits per sample:"
-msgstr ""
-
-#: ../picard/ui/tageditor.py:234 ../picard/ui/multitageditor.py:190
-msgid "Mono"
-msgstr ""
-
-#: ../picard/ui/tageditor.py:235 ../picard/ui/multitageditor.py:191
-msgid "Stereo"
-msgstr ""
-
-#: ../picard/ui/tageditor.py:237 ../picard/ui/multitageditor.py:193
-msgid "Channels:"
-msgstr ""
-
-#: ../picard/ui/ui_tageditor.py:115 ../picard/ui/ui_multitageditor.py:55
-#: ../picard/ui/ui_options_plugins.py:59 ../picard/ui/options/plugins.py:76
-msgid "Name"
-msgstr ""
-
-#: ../picard/ui/ui_tageditor.py:116 ../picard/ui/ui_multitageditor.py:56
-msgid "Value"
-msgstr ""
-
-#: ../picard/ui/ui_tageditor.py:117 ../picard/ui/ui_multitageditor.py:57
-msgid "&Add..."
-msgstr ""
-
-#: ../picard/ui/ui_tageditor.py:118
-msgid "&Edit..."
-msgstr ""
-
-#: ../picard/ui/ui_tageditor.py:119
-msgid "&Delete"
-msgstr ""
-
-#: ../picard/ui/ui_tageditor.py:120
-msgid "&Metadata"
-msgstr ""
-
-#: ../picard/ui/ui_tageditor.py:121
-msgid "A&rtwork"
-msgstr ""
-
-#: ../picard/ui/ui_tageditor.py:122
-msgid "&Info"
-msgstr ""
-
-#: ../picard/ui/coverartbox.py:47
-msgid "Cover Art"
-msgstr ""
-
-#: ../picard/ui/coverartbox.py:95
-msgid "Buy the album on Amazon"
-msgstr ""
-
-#: ../picard/ui/ui_puidsubmit.py:52
-msgid "Submit PUIDs"
-msgstr "Odoslať PUID"
-
-#: ../picard/ui/ui_puidsubmit.py:53 ../picard/ui/ui_cdlookup.py:62
-msgid "OK"
-msgstr "OK"
-
-#: ../picard/ui/ui_puidsubmit.py:54 ../picard/ui/ui_cdlookup.py:64
-msgid "Cancel"
-msgstr "Zrušiť"
-
-#: ../picard/ui/puidsubmit.py:31 ../picard/ui/options/plugins.py:80
-msgid "File"
-msgstr "Súbor"
-
-#: ../picard/ui/puidsubmit.py:31
-msgid "PUID"
-msgstr ""
-
-#: ../picard/ui/puidsubmit.py:31
-msgid "Release"
-msgstr ""
-
-#: ../picard/ui/puidsubmit.py:31
-msgid "Release ID"
-msgstr ""
-
-#: ../picard/ui/filebrowser.py:41
-msgid "&Move Tagged Files Here"
-msgstr ""
-
-#: ../picard/ui/filebrowser.py:44
-msgid "Show &Hidden Files"
-msgstr ""
-
-#: ../picard/ui/ui_cdlookup.py:61
-msgid "The following releases on MusicBrainz match the CD:"
-msgstr ""
-
-#: ../picard/ui/ui_cdlookup.py:63
-msgid "    Lookup manually    "
-msgstr ""
-
-#: ../picard/ui/ui_options.py:42
-msgid "Options"
-msgstr ""
-
-#: ../picard/ui/tagsfromfilenames.py:52 ../picard/ui/tagsfromfilenames.py:96
-msgid "File Name"
-msgstr ""
-
-#: ../picard/ui/ui_options_cover.py:56
-msgid "Location"
-msgstr ""
-
-#: ../picard/ui/ui_options_cover.py:57
-msgid "Embed cover images into tags"
-msgstr ""
-
-#: ../picard/ui/ui_options_cover.py:58
-msgid "Save cover images as separate files"
-msgstr ""
-
-#: ../picard/ui/ui_options_cover.py:59
-msgid "Overwrite the file if it already exists"
-msgstr ""
-
-#: ../picard/ui/ui_options_metadata.py:100
-msgid "Metadata"
-msgstr ""
-
-#: ../picard/ui/ui_options_metadata.py:101
-msgid "Translate foreign artist names to English where possible"
-msgstr ""
-
-#: ../picard/ui/ui_options_metadata.py:102
-msgid "Use release relationships"
-msgstr ""
-
-#: ../picard/ui/ui_options_metadata.py:103
-msgid "Use track relationships"
-msgstr ""
-
-#: ../picard/ui/ui_options_metadata.py:104
-msgid "Use folksonomy tags as genre"
-msgstr ""
-
-#: ../picard/ui/ui_options_metadata.py:105
-msgid "Preferred release country:"
-msgstr ""
-
-#: ../picard/ui/ui_options_metadata.py:106
-msgid "Custom Fields"
-msgstr ""
-
-#: ../picard/ui/ui_options_metadata.py:107
-msgid "Various artists:"
-msgstr ""
-
-#: ../picard/ui/ui_options_metadata.py:108
-msgid "Non-album tracks:"
-msgstr ""
-
-#: ../picard/ui/ui_options_metadata.py:109
-#: ../picard/ui/ui_options_metadata.py:110
-#: ../picard/ui/ui_options_naming.py:168 ../picard/ui/ui_options_naming.py:169
-msgid "Default"
-msgstr "Štandardné"
-
-#: ../picard/ui/ui_multitageditor.py:58
-msgid "Delete"
-msgstr ""
-
-#: ../picard/ui/logview.py:29
-msgid "Log"
-msgstr ""
-
-#: ../picard/ui/ui_options_plugins.py:58
-msgid "Plugins"
-msgstr ""
-
-#: ../picard/ui/ui_options_plugins.py:60 ../picard/ui/options/plugins.py:79
-msgid "Author"
-msgstr ""
-
-#: ../picard/ui/ui_options_plugins.py:61
-msgid "Version"
-msgstr ""
-
-#: ../picard/ui/ui_options_naming.py:165
-msgid "Rename Files"
-msgstr ""
-
-#: ../picard/ui/ui_options_naming.py:166
-msgid "Replace Windows-incompatible characters"
-msgstr ""
-
-#: ../picard/ui/ui_options_naming.py:167
-msgid "Replace non-ASCII characters"
-msgstr ""
-
-#: ../picard/ui/ui_options_naming.py:170 ../picard/ui/options/naming.py:90
-msgid "Multiple artist file naming format:"
-msgstr ""
-
-#: ../picard/ui/ui_options_naming.py:171 ../picard/ui/options/naming.py:86
-msgid "File naming format:"
-msgstr ""
-
-#: ../picard/ui/ui_options_naming.py:172
-msgid "Move Files"
-msgstr ""
-
-#: ../picard/ui/ui_options_naming.py:173
-msgid "Move tagged files to this directory:"
-msgstr ""
-
-#: ../picard/ui/ui_options_naming.py:174
-msgid "Browse..."
-msgstr ""
-
-#: ../picard/ui/ui_options_naming.py:175
-msgid "Move additional files:"
-msgstr ""
-
-#: ../picard/ui/ui_options_naming.py:176
-msgid "Delete empty directories"
-msgstr ""
-
-#: ../picard/ui/ui_options_naming.py:177
-msgid "Example"
-msgstr ""
-
-#: ../picard/ui/ui_options_naming.py:178
-msgid "File name:"
-msgstr ""
-
-#: ../picard/ui/ui_options_naming.py:179
-msgid "Multiple artist file name:"
-msgstr ""
-
-#: ../picard/ui/ui_options_cdlookup.py:48
-msgid "CD-ROM device to use for lookups:"
-msgstr ""
-
-#: ../picard/ui/options/scripting.py:84 ../picard/ui/options/naming.py:86
-#: ../picard/ui/options/naming.py:90 ../picard/ui/options/naming.py:93
-#: ../picard/ui/options/naming.py:95
-msgid "Script Error"
-msgstr ""
+#: ../picard/ui/options/about.py:29
+msgid "About"
+msgstr "O programe"
 
 #. Replace this with your name to have it appear in the "About" dialog.
 #: ../picard/ui/options/about.py:48
 msgid "translator-credits"
 msgstr ""
 "Launchpad Contributions:\n"
-"  Lukáš Lalinský <https://launchpad.net/~luks>\n"
-"\n"
-"Launchpad Contributions:\n"
 "  Lukáš Lalinský https://launchpad.net/~luks\n"
 "  helix84 https://launchpad.net/~helix84\n"
-"\n"
-"Launchpad Contributions:\n"
-"  Lukáš Lalinský https://launchpad.net/~luks\n"
-"  Milan Krivda https://launchpad.net/~milan-krivda\n"
-"  helix84 https://launchpad.net/~helix84\n"
-"\n"
-"Launchpad Contributions:\n"
-"  Lukáš Lalinský https://launchpad.net/~luks\n"
-"  Milan Krivda https://launchpad.net/~milan-krivda\n"
-"  helix84 https://launchpad.net/~helix84\n"
-"\n"
-"Launchpad Contributions:\n"
-"  Lukáš Lalinský https://launchpad.net/~luks\n"
-"  helix84 https://launchpad.net/~helix84"
+"  Milan Krivda https://launchpad.net/~milan-krivda"
 
 #. Replace LANG with language you are translatig to.
 #: ../picard/ui/options/about.py:51
@@ -915,22 +2218,58 @@ msgstr ""
 #: ../picard/ui/options/about.py:55
 #, python-format
 msgid ""
-"<p align=\"center\"><span style=\"font-size:15px;font-weight:bold;"
-"\">MusicBrainz Picard</span><br/>\n"
+"<p align=\"center\"><span style=\"font-size:15px;font-weight:bold;\">MusicBrainz Picard</span><br/>\n"
 "Version %(version)s</p>\n"
 "<p align=\"center\"><strong>Supported formats</strong><br/>%(formats)s</p>\n"
 "<p align=\"center\"><strong>Please donate</strong><br/>\n"
-"Thank you for using Picard. Picard relies on the MusicBrainz database, which "
-"is operated by the MetaBrainz Foundation with the help of thousands of "
-"volunteers. If you like this application please consider donating to the "
-"MetaBrainz Foundation to keep the service running.</p>\n"
-"<p align=\"center\"><a href=\"http://metabrainz.org/donate/index.html"
-"\">Donate now!</a></p>\n"
+"Thank you for using Picard. Picard relies on the MusicBrainz database, which is operated by the MetaBrainz Foundation with the help of thousands of volunteers. If you like this application please consider donating to the MetaBrainz Foundation to keep the service running.</p>\n"
+"<p align=\"center\"><a href=\"http://metabrainz.org/donate/index.html\">Donate now!</a></p>\n"
 "<p align=\"center\"><strong>Credits</strong><br/>\n"
-"<small>Copyright © 2004-2008 Robert Kaye, Lukáš Lalinský and others%"
-"(translator-credits)s</small></p>\n"
-"<p align=\"center\"><a href=\"http://musicbrainz.org/doc/PicardTagger"
-"\">http://musicbrainz.org/doc/PicardTagger</a></p>\n"
+"<small>Copyright © 2004-2008 Robert Kaye, Lukáš Lalinský and others%(translator-credits)s</small></p>\n"
+"<p align=\"center\"><a href=\"http://musicbrainz.org/doc/PicardTagger\">http://musicbrainz.org/doc/PicardTagger</a></p>\n"
+msgstr ""
+
+#: ../picard/ui/options/advanced.py:26
+msgid "Advanced"
+msgstr "Rozšírené"
+
+#: ../picard/ui/options/interface.py:31
+#, fuzzy
+msgid "User Interface"
+msgstr "Jazyk prostredia"
+
+#: ../picard/ui/options/interface.py:47
+msgid "System default"
+msgstr "Jazyk systému"
+
+#: ../picard/ui/options/interface.py:71
+#, fuzzy
+msgid "Language changed"
+msgstr "Jazyk"
+
+#: ../picard/ui/options/interface.py:71
+msgid "You have changed the interface language. You have to restart Picard in order for the change to take effect."
+msgstr ""
+
+#: ../picard/ui/options/matching.py:29
+msgid "Matching"
+msgstr ""
+
+#: ../picard/ui/options/metadata.py:52
+msgid "None"
+msgstr ""
+
+#: ../picard/ui/options/naming.py:33
+#, fuzzy
+msgid "File Naming"
+msgstr "Názvy súborov"
+
+#: ../picard/ui/options/naming.py:86
+#: ../picard/ui/options/naming.py:90
+#: ../picard/ui/options/naming.py:93
+#: ../picard/ui/options/naming.py:95
+#: ../picard/ui/options/scripting.py:84
+msgid "Script Error"
 msgstr ""
 
 #: ../picard/ui/options/naming.py:93
@@ -949,6 +2288,254 @@ msgstr ""
 msgid "The location to move files to must not be empty."
 msgstr ""
 
+#: ../picard/ui/options/scripting.py:63
+msgid "Scripting"
+msgstr ""
+
+#: ../picard/ui/options/tags.py:29
+msgid "Tags"
+msgstr "Tagy"
+
+#: ../picard/util/tags.py:24
+#, fuzzy
+msgid "Date"
+msgstr "Neskôr"
+
+#: ../picard/util/tags.py:25
+#, fuzzy
+msgid "Album Artist"
+msgstr "Umelec"
+
+#: ../picard/util/tags.py:26
+#, fuzzy
+msgid "Track Number"
+msgstr "Číslo skladby"
+
+#: ../picard/util/tags.py:27
+#, fuzzy
+msgid "Total Tracks"
+msgstr "Skladby"
+
+#: ../picard/util/tags.py:28
+#, fuzzy
+msgid "Disc Number"
+msgstr "Číslo skladby"
+
+#: ../picard/util/tags.py:29
+msgid "Total Discs"
+msgstr ""
+
+#: ../picard/util/tags.py:30
+#, fuzzy
+msgid "Album Artist Sort Order"
+msgstr "Meno autora albumu (pre triedenie)"
+
+#: ../picard/util/tags.py:31
+msgid "Artist Sort Order"
+msgstr ""
+
+#: ../picard/util/tags.py:32
+msgid "Title Sort Order"
+msgstr ""
+
+#: ../picard/util/tags.py:33
+#, fuzzy
+msgid "Album Sort Order"
+msgstr "Zoskupenia albumov"
+
+#: ../picard/util/tags.py:34
+msgid "ASIN"
+msgstr ""
+
+#: ../picard/util/tags.py:35
+msgid "Grouping"
+msgstr ""
+
+#: ../picard/util/tags.py:37
+msgid "ISRC"
+msgstr ""
+
+#: ../picard/util/tags.py:38
+msgid "Mood"
+msgstr ""
+
+#: ../picard/util/tags.py:39
+msgid "BPM"
+msgstr ""
+
+#: ../picard/util/tags.py:40
+#, fuzzy
+msgid "Copyright"
+msgstr "Kopírovať"
+
+#: ../picard/util/tags.py:41
+#, fuzzy
+msgid "Composer"
+msgstr "Zavrieť"
+
+#: ../picard/util/tags.py:42
+msgid "Conductor"
+msgstr ""
+
+#: ../picard/util/tags.py:43
+msgid "Lyricist"
+msgstr ""
+
+#: ../picard/util/tags.py:44
+msgid "Arranger"
+msgstr ""
+
+#: ../picard/util/tags.py:45
+msgid "Producer"
+msgstr ""
+
+#: ../picard/util/tags.py:46
+msgid "Engineer"
+msgstr ""
+
+#: ../picard/util/tags.py:47
+msgid "Subtitle"
+msgstr ""
+
+#: ../picard/util/tags.py:48
+#, fuzzy
+msgid "Disc Subtitle"
+msgstr "Číslo skladby"
+
+#: ../picard/util/tags.py:49
+msgid "Remixer"
+msgstr ""
+
+#: ../picard/util/tags.py:50
+#, fuzzy
+msgid "MusicBrainz Track Id"
+msgstr "MusicBrainz účet"
+
+#: ../picard/util/tags.py:51
+#, fuzzy
+msgid "MusicBrainz Release Id"
+msgstr "Údaje z MusicBrainz"
+
+#: ../picard/util/tags.py:52
+#, fuzzy
+msgid "MusicBrainz Artist Id"
+msgstr "Údaje z MusicBrainz"
+
+#: ../picard/util/tags.py:53
+#, fuzzy
+msgid "MusicBrainz Release Artist Id"
+msgstr "Server MusicBrainz"
+
+#: ../picard/util/tags.py:54
+#, fuzzy
+msgid "MusicBrainz TRM Id"
+msgstr "Údaje z MusicBrainz"
+
+#: ../picard/util/tags.py:55
+#, fuzzy
+msgid "MusicBrainz Disc Id"
+msgstr "Údaje z MusicBrainz"
+
+#: ../picard/util/tags.py:56
+#, fuzzy
+msgid "MusicBrainz Sort Name"
+msgstr "Údaje z MusicBrainz"
+
+#: ../picard/util/tags.py:57
+msgid "MusicIP PUID"
+msgstr ""
+
+#: ../picard/util/tags.py:58
+#, fuzzy
+msgid "MusicIP Fingerprint"
+msgstr "Audio fingerprinting"
+
+#: ../picard/util/tags.py:59
+msgid "Disc Id"
+msgstr ""
+
+#: ../picard/util/tags.py:60
+msgid "Website"
+msgstr ""
+
+#: ../picard/util/tags.py:61
+msgid "Compilation"
+msgstr ""
+
+#: ../picard/util/tags.py:62
+msgid "Comment"
+msgstr ""
+
+#: ../picard/util/tags.py:63
+#, fuzzy
+msgid "Genre"
+msgstr "Všeobecné"
+
+#: ../picard/util/tags.py:64
+msgid "Encoded By"
+msgstr ""
+
+#: ../picard/util/tags.py:65
+msgid "Performer"
+msgstr ""
+
+#: ../picard/util/tags.py:66
+#, fuzzy
+msgid "Release Type"
+msgstr "Dátum vydania"
+
+#: ../picard/util/tags.py:67
+#, fuzzy
+msgid "Release Status"
+msgstr "Dátum vydania"
+
+#: ../picard/util/tags.py:68
+#, fuzzy
+msgid "Release Country"
+msgstr "Dátum vydania"
+
+#: ../picard/util/tags.py:69
+msgid "Record Label"
+msgstr ""
+
+#: ../picard/util/tags.py:70
+msgid "Barcode"
+msgstr ""
+
+#: ../picard/util/tags.py:71
+#, fuzzy
+msgid "Catalog Number"
+msgstr "Číslo skladby"
+
+#: ../picard/util/tags.py:72
+msgid "Format"
+msgstr ""
+
+#: ../picard/util/tags.py:73
+msgid "DJ-Mixer"
+msgstr ""
+
+#: ../picard/util/tags.py:74
+#, fuzzy
+msgid "Media"
+msgstr "Lokálne údaje"
+
+#: ../picard/util/tags.py:75
+msgid "Lyrics"
+msgstr ""
+
+#: ../picard/util/tags.py:76
+msgid "Mixer"
+msgstr ""
+
+#: ../picard/util/tags.py:77
+msgid "Language"
+msgstr "Jazyk"
+
+#: ../picard/util/tags.py:78
+msgid "Script"
+msgstr ""
+
 #: ../picard/util/webbrowser2.py:84
 msgid "Web Browser Error"
 msgstr ""
@@ -961,69 +2548,67 @@ msgid ""
 "%s"
 msgstr ""
 
-#~ msgid "File %s identified!"
-#~ msgstr "Súbor %s identifikovaný!"
+#, fuzzy
+#~ msgid "Anal&yze"
+#~ msgstr "Analyzovať"
 
-#~ msgid "About"
+#, fuzzy
+#~ msgid "Generate &Cuesheet..."
+#~ msgstr "Vygenerovať cuesheet"
+
+#, fuzzy
+#~ msgid "Auto Tag"
 #~ msgstr "O programe"
 
-#~ msgid "Advanced"
-#~ msgstr "Rozšírené"
-
-#~ msgid "Tags"
-#~ msgstr "Tagy"
-
+#, fuzzy
+#~ msgid "Edit &Tags..."
+#~ msgstr "Upraviť nastavenia..."
 #~ msgid "Automatically analyze all new files"
 #~ msgstr "Automaticky analyzovať všetky nové súbory"
 
+#, fuzzy
+#~ msgid "Album artist:"
+#~ msgstr "Umelec"
+
+#, fuzzy
+#~ msgid "&Advanced"
+#~ msgstr "Rozšírené"
+
+#, fuzzy
+#~ msgid "A&dd Directory..."
+#~ msgstr "Pridať ad&resár...\tCtrl+D"
 #~ msgid "Are You Sure?"
 #~ msgstr "Ste si istý?"
-
 #~ msgid "Add &Files...\tCtrl+O"
 #~ msgstr "Pridať &súbory...\tCtrl+O"
-
 #~ msgid "Add &Directory...\tCtrl+D"
 #~ msgstr "Pridať ad&resár...\tCtrl+D"
-
 #~ msgid "&Save Files\tCtrl+S"
 #~ msgstr "&Uložiť súbory\tCtrl+S"
-
 #~ msgid "C&opy\tCtrl+C"
 #~ msgstr "&Kopírovať\tCtrl+C"
-
 #~ msgid "Help"
 #~ msgstr "Pomocník"
-
 #~ msgid "Preferences"
 #~ msgstr "Nastavenia"
-
 #~ msgid "Error while saving cuesheet %s."
 #~ msgstr "Chyba pri ukladaní cuesheetu %s."
-
 #~ msgid "Cuesheet %s saved."
 #~ msgstr "Cuesheet %s uložený."
-
 #~ msgid "Time"
 #~ msgstr "Dĺžka"
-
 #~ msgid "Albums"
 #~ msgstr "Albumy"
-
 #~ msgid "Force Save"
 #~ msgstr "Vynútiť uloženie"
-
 #~ msgid "Buy"
 #~ msgstr "Kúpiť"
-
 #~ msgid "Welcome to Picard!"
 #~ msgstr "Vitajte v Picard-e!"
-
 #~ msgid "Track Num"
 #~ msgstr "Číslo skladby"
-
 #~ msgid "PUID Collision"
 #~ msgstr "PUID kolízia"
-
 #~ msgid ""
 #~ "Version %s\n"
 #~ "\n"
@@ -1050,121 +2635,76 @@ msgstr ""
 #~ "od Helix Community.\n"
 #~ "\n"
 #~ "Podporované formáty: %s"
-
-#~ msgid "Colors"
-#~ msgstr "Farby"
-
 #~ msgid "Font color"
 #~ msgstr "Farba písma"
-
 #~ msgid "Directories"
 #~ msgstr "Adresáre"
-
 #~ msgid "Watch for new files"
 #~ msgstr "Sledovať nové audio súbory"
-
 #~ msgid "Watch this directory for new audio files"
 #~ msgstr "Sledovať tento adresár pre nové audio súbory"
-
 #~ msgid "Encodings"
 #~ msgstr "Kódovania"
-
 #~ msgid "all languages"
 #~ msgstr "všetky jazyky"
-
 #~ msgid "percent similar."
 #~ msgstr "percent podobné."
-
 #~ msgid "Load recently used albums on startup"
 #~ msgstr "Načítať naposledy použité albumy pri štarte"
-
-#~ msgid "Language"
-#~ msgstr "Jazyk"
-
-#~ msgid "System default"
-#~ msgstr "Jazyk systému"
-
 #~ msgid "Allowed filename characters"
 #~ msgstr "Povolené znaky v názvoch súborov"
-
 #~ msgid "Use Windows-safe file names"
 #~ msgstr "Použiť názvy súborov bezpečné pre Windows"
-
 #~ msgid "Number of tracks on the album"
 #~ msgstr "Počet skladieb na albume"
-
 #~ msgid "Track name"
 #~ msgstr "Názov skladby"
-
 #~ msgid "Zero padded track number"
 #~ msgstr "Číslo skladby s nulou na začiatku"
-
 #~ msgid "File format (e.g. mp3, ogg, wav)"
 #~ msgstr "Formát súboru (napr.: mp3, ogg, wav)"
-
 #~ msgid "Album type (album, single, EP, etc.)"
 #~ msgstr "Typ albumu (album, single, EP, atď)"
-
 #~ msgid "Album Status (official, promo, etc.)"
 #~ msgstr "Status albumu (official, promo, atď)"
-
 #~ msgid "Album release month"
 #~ msgstr "Mesiac dátumu vydania"
-
 #~ msgid "Album release day"
 #~ msgstr "Deň dátumu vydania"
-
 #~ msgid "Album release year"
 #~ msgstr "Rok dátumu vydania"
-
 #~ msgid "Make it so!"
 #~ msgstr "OK"
-
 #~ msgid "Use proxy server to access the Internet"
 #~ msgstr "Použiť proxy server na pripojenie do Internetu"
-
 #~ msgid "Proxy server to use"
 #~ msgstr "Proxy server"
-
 #~ msgid "Proxy port"
 #~ msgstr "Proxy port"
-
 #~ msgid "ID3v2.4 only"
 #~ msgstr "iba ID3v2.4"
-
 #~ msgid "Save track/album"
 #~ msgstr "Uložiť skladbu/album"
-
 #~ msgid "Artists"
 #~ msgstr "Umelci"
-
 #~ msgid "New files (drag files to tag here)"
 #~ msgstr "Nové súbory (to vložte súbory na otagovanie)"
-
 #~ msgid "updating album information"
 #~ msgstr "obnovovanie informácií o albume"
-
 #~ msgid "Submitting PUID information to MusicBrainz server ..."
 #~ msgstr "Odosielanie PUID informácií MusicBrainz serveru ..."
-
 #~ msgid "Performing a PUID lookup on file %s ..."
 #~ msgstr "Prebieha vyhľadávanie PUID na súbore %s ..."
-
 #~ msgid "Are you sure you want to exit the application?"
 #~ msgstr "Ste si istý, že chcete ukončiť aplikáciu?"
-
 #~ msgid "CD Lookup error -- is there a CD in the CD-ROM drive?"
 #~ msgstr "Chyba pri vyhľadávaní CD -- je v CD-ROM mechanike CD?"
-
 #~ msgid "CD Lookup Failed"
 #~ msgstr "Vyhľadanie CD zlyhalo"
-
 #~ msgid "&Quick Start Guide"
 #~ msgstr "&Rýchly návod"
-
 #~ msgid "Quick Start Guide"
 #~ msgstr "Rýchly návod pre začiatočníkov"
-
 #~ msgid ""
 #~ "You have not specified an username and password. In order to contribute "
 #~ "data to MusicBrainz, you must have a MusicBrainz account.\n"
@@ -1176,29 +2716,22 @@ msgstr ""
 #~ "MusicBrainz, je potrebné mať založený účet.\n"
 #~ "Chcete založiť účet teraz? Pokiaľ už máte MusicBrainz účet, vyplňte vaše "
 #~ "uživateľské údaje v nastaveniach prosím. "
-
 #~ msgid "Couldn't connect to the MusicBrainz server."
 #~ msgstr "Nepodarilo sa pripojit k MusicBrainz serveru."
-
 #~ msgid "Connection error"
 #~ msgstr "Chyba pripojenia"
-
 #~ msgid ""
 #~ "MusicBrainz Picard requires wxPython with UNICODE support.\n"
 #~ "Please download the appropriate toolkit from http://www.wxpython.org/"
 #~ msgstr ""
 #~ "MusicBrainz Picard vyžaduje wxPython s podporou UNICODE.\n"
 #~ "Stianhnite vhodný balíček z http://www.wxpython.org/ prosím."
-
 #~ msgid "Unicode Required"
 #~ msgstr "Potrebné Unicode"
-
 #~ msgid "PUID collision on file %s!"
 #~ msgstr "PUID kolízia na súbore %s!"
-
 #~ msgid "Save error"
 #~ msgstr "Chyba pri ukladaní"
-
 #~ msgid ""
 #~ "The move files option is enabled, but the destination directory is not "
 #~ "specified or invalid.\n"
@@ -1209,7 +2742,6 @@ msgstr ""
 #~ "neplatný.\n"
 #~ "Opravte prosím nastavenie presúvania súborov alebo vyberte iný adresár a "
 #~ "skúste znova."
-
 #~ msgid ""
 #~ "Not all files could be saved. Please check for and examine tracks that "
 #~ "have an error icon in front of them. To retry saving the track, right "
@@ -1218,231 +2750,122 @@ msgstr ""
 #~ "Nie všetky súbory boli uložené. Skotrolujte, prosím, skladby ktoré majú "
 #~ "na začiatky chybovú ikonku. Pre opätovný pokus o uloženie skladby, "
 #~ "kliknite pravýmtlačítkom myši na skladby a vyberte 'Odstrániť chybu'"
-
 #~ msgid "Select directory that contains music files"
 #~ msgstr "Vyberte adresár obsahujúci audio súbory"
-
 #~ msgid "Reload album from main server"
 #~ msgstr "Obnoviť album z hlavného serveru"
-
 #~ msgid "Select or drag a folder from below"
 #~ msgstr "Vyberte alebo ťahajte adresár odtiaľto"
-
 #~ msgid "Drag files from below"
 #~ msgstr "Ťahajte súbory odtiaľto"
-
 #~ msgid "Release date"
 #~ msgstr "Dátum vydania"
-
 #~ msgid "%d%% similar"
 #~ msgstr "%d%% podobné"
-
-#~ msgid "Later"
-#~ msgstr "Neskôr"
-
 #~ msgid ""
 #~ "The destination directory %s does not exist. Please pick a valid "
 #~ "directory."
 #~ msgstr "Cieľový adresár %s neexistuje. Vyberte platný adresár, prosím."
-
 #~ msgid "Select the encoding to use when reading and writing filenames"
 #~ msgstr "Vyberte kódovanie pre čítanie a zápis názvov súborov"
-
 #~ msgid "Automatically move clusters to albums that are at least"
 #~ msgstr "Automaticky presunúť skupinu súborov na album pokiaľ sú aspoň"
-
 #~ msgid "Automatically save recognized tracks that are at least"
 #~ msgstr "Automaticky uložiť rozpoznané skladby pokiaľ sú aspoň"
-
-#~ msgid "Czech"
-#~ msgstr "Čeština"
-
-#~ msgid "German"
-#~ msgstr "Nemčina"
-
-#~ msgid "English"
-#~ msgstr "Angličtina"
-
-#~ msgid "English (UK)"
-#~ msgstr "Angličtina (UK)"
-
-#~ msgid "Spanish"
-#~ msgstr "Španielčina"
-
-#~ msgid "Finnish"
-#~ msgstr "Fínština"
-
-#~ msgid "French"
-#~ msgstr "Francúzština"
-
-#~ msgid "Hungarian"
-#~ msgstr "Maďarčina"
-
-#~ msgid "Icelandic"
-#~ msgstr "Islandština"
-
-#~ msgid "Italian"
-#~ msgstr "Taliančina"
-
-#~ msgid "Korean"
-#~ msgstr "Kórejština"
-
-#~ msgid "Dutch"
-#~ msgstr "Holandština"
-
-#~ msgid "Norwegian Bokmal"
-#~ msgstr "Nórština"
-
-#~ msgid "Portuguese"
-#~ msgstr "Portugalčina"
-
-#~ msgid "Romanian"
-#~ msgstr "Rumunština"
-
-#~ msgid "Russian"
-#~ msgstr "Ruština"
-
-#~ msgid "Slovak"
-#~ msgstr "Slovenčina"
-
-#~ msgid "Swedish"
-#~ msgstr "Švédština"
-
 #~ msgid ""
 #~ "Note: This setting will take effect after you restart the application."
 #~ msgstr ""
 #~ "Poznámka: Zmena tohoto nastavenia bude prevedená až po reštarte aplikácie."
-
 #~ msgid "Artist translation"
 #~ msgstr "Preklad mien autorov"
-
 #~ msgid "Rename files when writing metadata tags"
 #~ msgstr "Premenovať súbory pri zápise tagov"
-
 #~ msgid "Naming Help"
 #~ msgstr "Pomocník k názvom súborov"
-
 #~ msgid ""
 #~ "You may use the following variables in the filenaming\n"
 #~ "specifications in the options dialog:"
 #~ msgstr "V špecifikácií názvov súborov môžte použiť nasledujúce premenné:"
-
 #~ msgid "A %s in the naming specification will create a new subfolder."
 #~ msgstr "%s v špeficikácií názvov súborov vytvorý nový podadresár."
-
 #~ msgid "Audio fingerprinting options"
 #~ msgstr "Nastavenie audio fingerprintingu"
-
 #~ msgid "Automatically select PUID collision tracks that are at least"
 #~ msgstr "Automaticky vybrať skladby pri PUID kolízií, pokiaľ sú aspoň"
-
 #~ msgid "Write ID3v1 tags to MP3 files (ID3v2 tags will always be written)"
 #~ msgstr "Zapísať ID3v1 tagy do MP3 súborov (ID3v2 tagy budú zapísané vždy)"
-
 #~ msgid "Remove track/album"
 #~ msgstr "Odstrániť skladbu/album"
-
 #~ msgid "Listen to track"
 #~ msgstr "Prehrať skladbu"
-
 #~ msgid "Album clusters"
 #~ msgstr "Zoskupenia albumov"
-
 #~ msgid "Unmatched files for this album"
 #~ msgstr "Nerospoznané súbory pre tento album"
-
 #~ msgid "%d of %d tracks linked"
 #~ msgstr "%d z %d skladieb je prepojených"
-
 #~ msgid "Matched track highlighting"
 #~ msgstr "Zvýrazňovanie skladieb"
-
 #~ msgid "Good match background color"
 #~ msgstr "Farba pozadia pri dobrej zhode"
-
 #~ msgid "Bad match background color"
 #~ msgstr "Farba pozadia pri zlej zhode"
-
 #~ msgid "Move files option"
 #~ msgstr "Presúvanie súborov"
-
 #~ msgid "When matching tracks to albums, accept tracks that are at least"
 #~ msgstr "Automaticky priradiť skladby k albumom pokiaľ sú aspoň"
-
 #~ msgid "CD-ROM drive path to use for lookups"
 #~ msgstr "Cesta k CD-ROM mechanike na použitie pri vyhľadávaní"
-
 #~ msgid "Launch MB Tagger automatically for inserted Audio CDs"
 #~ msgstr "Spustit MB Tagger automaticky po vložení Audio CD"
-
 #~ msgid ""
 #~ "Failed to set the proper registy values to enable launching the tagger "
 #~ "after CD insertion. "
 #~ msgstr ""
 #~ "Nepodatilo sa nastaviť hodnoty registru na spúšťanie aplikácie po vložení "
 #~ "CD. "
-
 #~ msgid "Default CD setting failed"
 #~ msgstr "Nastavenie CD zlyhalo"
-
 #~ msgid "File format naming specification"
 #~ msgstr "Špecifikácia formátu názvu súboru"
-
 #~ msgid "Various artist file format naming specification"
 #~ msgstr "Špecifikácia formátu názvu súboru pre albumy s viacerými autormi"
-
 #~ msgid "Note: Leave blank to allow all possible characters"
 #~ msgstr "Poznámka: Nechajte prázdne pre povolenie všetkých znakov"
-
 #~ msgid "Track artist name"
 #~ msgstr "Meno autora skladby"
-
 #~ msgid "Track artist sortname"
 #~ msgstr "Meno autora skladby (pre triedenie)"
-
 #~ msgid "The first character of the artist sortname"
 #~ msgstr "Prvý znak z mena autora (pre triedenie)"
-
 #~ msgid "The first two characters of the artist sortname"
 #~ msgstr "Prvé dva znaky z mena autora (pre triedenie)"
-
 #~ msgid "The first three characters of the artist sortname"
 #~ msgstr "Prvé tri znaky z mena autora (pre triedenie)"
-
 #~ msgid "Naming specification help"
 #~ msgstr "Pomocník pri špecifikácií názvov"
-
 #~ msgid "Accept PUID matches that are at least"
 #~ msgstr "Akceptovať PUID zhody, ktoré sú aspoň"
-
 #~ msgid "Various artist name"
 #~ msgstr "Názov pre \"rôzni umelci\""
-
 #~ msgid "Open file"
 #~ msgstr "Otvoriť súbor"
-
 #~ msgid "Open directory"
 #~ msgstr "Otvoriť adresár"
-
 #~ msgid "Edit options"
 #~ msgstr "Upraviť nastavenia"
-
 #~ msgid "Exit"
 #~ msgstr "Koniec"
-
 #~ msgid ""
 #~ "The MusicBrainz Tagger requires wx.Widgets with UNICODE support.\n"
 #~ "Please download the appropriate toolkit from  http://www.wxwidgets.com"
 #~ msgstr ""
 #~ "MusicBrainz Tagger potrebuje wx.Widgets s podporou UNICODE.\n"
 #~ "Môžete ho získať na adrese http://www.wxpython.org/"
-
 #~ msgid "Sorry, there is no help file yet."
 #~ msgstr "Ľutujeme, zatiaľ nie je k dispozícií žiadna dokumentácia."
-
 #~ msgid "Use Internet Explorer settings for proxy support."
 #~ msgstr "Použiť nastavenie proxy z aplikácie Internet Explorer."
-
 #~ msgid ""
 #~ "If you use an automatic proxy configuration in Internet\n"
 #~ "Explorer, uncheck the box above and enter your\n"
@@ -1450,6 +2873,6 @@ msgstr ""
 #~ msgstr ""
 #~ "Pokiaľ používate v Internet Exploreri automatickú konfiguráciu proxy,\n"
 #~ "vyplňte prosím Váš proxy server a proxy port:"
-
 #~ msgid "TRM analyzer thread priority"
 #~ msgstr "Priorita vlákna TRM analyzéru"
+
diff --git a/po/sl.po b/po/sl.po
index e4d094d88..1ce4ddd1e 100644
--- a/po/sl.po
+++ b/po/sl.po
@@ -7,162 +7,1476 @@ msgid ""
 msgstr ""
 "Project-Id-Version: picard\n"
 "Report-Msgid-Bugs-To: http://bugs.musicbrainz.org/\n"
-"POT-Creation-Date: 2008-12-01 18:20+0100\n"
-"PO-Revision-Date: 2008-07-27 22:01+0000\n"
-"Last-Translator: Alan Pepelko <alan.pepelko@gmail.com>\n"
+"POT-Creation-Date: 2009-01-25 12:23+0100\n"
+"PO-Revision-Date: 2009-01-25 13:37+0100\n"
+"Last-Translator: Philipp Wolfer <phw@rubyforge.org>\n"
 "Language-Team: Slovenian <sl@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=4; plural=(n%100==1 ? 1 : n%100==2 ? 2 : n%100==3 || n"
-"%100==4 ? 3 : 0);\n"
-"X-Launchpad-Export-Date: 2008-12-01 17:02+0000\n"
+"Plural-Forms: nplurals=4; plural=(n%100==1 ? 1 : n%100==2 ? 2 : n%100==3 || n%100==4 ? 3 : 0);\n"
+"X-Launchpad-Export-Date: 2009-01-24 23:28+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
+"X-Poedit-Country: SLOVENIA\n"
+"X-Poedit-Language: Slovenian\n"
+"X-Poedit-SourceCharset: utf-8\n"
 
-#: ../picard/album.py:108 ../picard/cluster.py:248
+#: ../picard/album.py:108
+#: ../picard/cluster.py:248
 msgid "Unmatched Files"
-msgstr ""
+msgstr "Neujemajoče se datoteke"
 
-#: ../picard/album.py:269
+#: ../picard/album.py:281
 #, python-format
 msgid "[couldn't load album %s]"
 msgstr "[ne morem naložiti albuma %s]"
 
-#: ../picard/album.py:305
+#: ../picard/album.py:317
 msgid "[loading album information]"
 msgstr "[nalagam informacije o albumu]"
 
-#: ../picard/tagger.py:472
-msgid "CD Lookup Error"
+#: ../picard/cluster.py:164
+#: ../picard/cluster.py:175
+#, python-format
+msgid "No matching releases for cluster %s"
 msgstr ""
 
-#: ../picard/tagger.py:473
+#: ../picard/cluster.py:177
+#, python-format
+msgid "Cluster %s identified!"
+msgstr ""
+
+#: ../picard/cluster.py:182
+#, fuzzy, python-format
+msgid "Looking up the metadata for cluster %s..."
+msgstr "Iščem metapodatke za datoteko %s..."
+
+#: ../picard/const.py:40
+msgid "CD"
+msgstr ""
+
+#: ../picard/const.py:41
+msgid "DVD"
+msgstr ""
+
+#: ../picard/const.py:42
+msgid "SACD"
+msgstr ""
+
+#: ../picard/const.py:43
+msgid "LaserDisc"
+msgstr ""
+
+#: ../picard/const.py:44
+msgid "MiniDisc"
+msgstr ""
+
+#: ../picard/const.py:45
+msgid "Vinyl"
+msgstr ""
+
+#: ../picard/const.py:46
+msgid "Cassette"
+msgstr ""
+
+#: ../picard/const.py:47
+msgid "Cartridge (4/8-tracks)"
+msgstr ""
+
+#: ../picard/const.py:48
+msgid "Reel-to-Reel"
+msgstr ""
+
+#: ../picard/const.py:49
+msgid "DAT"
+msgstr ""
+
+#: ../picard/const.py:50
+#, fuzzy
+msgid "Digital Media"
+msgstr "Izvorni metapodatki"
+
+#: ../picard/const.py:51
+msgid "Wax Cylinder"
+msgstr ""
+
+#: ../picard/const.py:52
+msgid "Piano Roll"
+msgstr ""
+
+#: ../picard/const.py:53
+msgid "Other"
+msgstr ""
+
+#: ../picard/const.py:58
+msgid "Bangladesh"
+msgstr ""
+
+#: ../picard/const.py:59
+msgid "Belgium"
+msgstr ""
+
+#: ../picard/const.py:60
+msgid "Burkina Faso"
+msgstr ""
+
+#: ../picard/const.py:61
+msgid "Bulgaria"
+msgstr ""
+
+#: ../picard/const.py:62
+msgid "Barbados"
+msgstr ""
+
+#: ../picard/const.py:63
+msgid "Wallis and Futuna Islands"
+msgstr ""
+
+#: ../picard/const.py:64
+msgid "Bermuda"
+msgstr ""
+
+#: ../picard/const.py:65
+msgid "Brunei Darussalam"
+msgstr ""
+
+#: ../picard/const.py:66
+msgid "Bolivia"
+msgstr ""
+
+#: ../picard/const.py:67
+msgid "Bahrain"
+msgstr ""
+
+#: ../picard/const.py:68
+msgid "Burundi"
+msgstr ""
+
+#: ../picard/const.py:69
+msgid "Benin"
+msgstr ""
+
+#: ../picard/const.py:70
+msgid "Bhutan"
+msgstr ""
+
+#: ../picard/const.py:71
+msgid "Jamaica"
+msgstr ""
+
+#: ../picard/const.py:72
+msgid "Bouvet Island"
+msgstr ""
+
+#: ../picard/const.py:73
+msgid "Botswana"
+msgstr ""
+
+#: ../picard/const.py:74
+msgid "Samoa"
+msgstr ""
+
+#: ../picard/const.py:75
+msgid "Brazil"
+msgstr ""
+
+#: ../picard/const.py:76
+msgid "Bahamas"
+msgstr ""
+
+#: ../picard/const.py:77
+msgid "Belarus"
+msgstr ""
+
+#: ../picard/const.py:78
+msgid "Belize"
+msgstr ""
+
+#: ../picard/const.py:79
+msgid "Russian Federation"
+msgstr ""
+
+#: ../picard/const.py:80
+msgid "Rwanda"
+msgstr ""
+
+#: ../picard/const.py:81
+msgid "Reunion"
+msgstr ""
+
+#: ../picard/const.py:82
+msgid "Turkmenistan"
+msgstr ""
+
+#: ../picard/const.py:83
+msgid "Tajikistan"
+msgstr ""
+
+#: ../picard/const.py:84
+msgid "Romania"
+msgstr ""
+
+#: ../picard/const.py:85
+msgid "Tokela"
+msgstr ""
+
+#: ../picard/const.py:86
+msgid "Guinea-Bissa"
+msgstr ""
+
+#: ../picard/const.py:87
+msgid "Guam"
+msgstr ""
+
+#: ../picard/const.py:88
+msgid "Guatemala"
+msgstr ""
+
+#: ../picard/const.py:89
+msgid "Greece"
+msgstr ""
+
+#: ../picard/const.py:90
+msgid "Equatorial Guinea"
+msgstr ""
+
+#: ../picard/const.py:91
+msgid "Guadeloupe"
+msgstr ""
+
+#: ../picard/const.py:92
+msgid "Japan"
+msgstr ""
+
+#: ../picard/const.py:93
+msgid "Guyana"
+msgstr ""
+
+#: ../picard/const.py:94
+msgid "French Guiana"
+msgstr ""
+
+#: ../picard/const.py:95
+msgid "Georgia"
+msgstr ""
+
+#: ../picard/const.py:96
+msgid "Grenada"
+msgstr ""
+
+#: ../picard/const.py:97
+msgid "United Kingdom"
+msgstr ""
+
+#: ../picard/const.py:98
+msgid "Gabon"
+msgstr ""
+
+#: ../picard/const.py:99
+msgid "El Salvador"
+msgstr ""
+
+#: ../picard/const.py:100
+#, fuzzy
+msgid "Guinea"
+msgstr "Splošno"
+
+#: ../picard/const.py:101
+msgid "Gambia"
+msgstr ""
+
+#: ../picard/const.py:102
+msgid "Greenland"
+msgstr ""
+
+#: ../picard/const.py:103
+msgid "Gibraltar"
+msgstr ""
+
+#: ../picard/const.py:104
+msgid "Ghana"
+msgstr ""
+
+#: ../picard/const.py:105
+msgid "Oman"
+msgstr ""
+
+#: ../picard/const.py:106
+msgid "Tunisia"
+msgstr ""
+
+#: ../picard/const.py:107
+msgid "Jordan"
+msgstr ""
+
+#: ../picard/const.py:108
+msgid "Haiti"
+msgstr ""
+
+#: ../picard/const.py:109
+msgid "Hungary"
+msgstr ""
+
+#: ../picard/const.py:110
+msgid "Hong Kong"
+msgstr ""
+
+#: ../picard/const.py:111
+msgid "Honduras"
+msgstr ""
+
+#: ../picard/const.py:112
+msgid "Heard and Mc Donald Islands"
+msgstr ""
+
+#: ../picard/const.py:113
+msgid "Venezuela"
+msgstr ""
+
+#: ../picard/const.py:114
+msgid "Puerto Rico"
+msgstr ""
+
+#: ../picard/const.py:115
+msgid "Pala"
+msgstr ""
+
+#: ../picard/const.py:116
+#, fuzzy
+msgid "Portugal"
+msgstr "Vrata:"
+
+#: ../picard/const.py:117
+msgid "Svalbard and Jan Mayen Islands"
+msgstr ""
+
+#: ../picard/const.py:118
+msgid "Paraguay"
+msgstr ""
+
+#: ../picard/const.py:119
+msgid "Iraq"
+msgstr ""
+
+#: ../picard/const.py:120
+msgid "Panama"
+msgstr ""
+
+#: ../picard/const.py:121
+msgid "French Polynesia"
+msgstr ""
+
+#: ../picard/const.py:122
+msgid "Papua New Guinea"
+msgstr ""
+
+#: ../picard/const.py:123
+msgid "Per"
+msgstr ""
+
+#: ../picard/const.py:124
+msgid "Pakistan"
+msgstr ""
+
+#: ../picard/const.py:125
+msgid "Philippines"
+msgstr ""
+
+#: ../picard/const.py:126
+msgid "Pitcairn"
+msgstr ""
+
+#: ../picard/const.py:127
+msgid "Poland"
+msgstr ""
+
+#: ../picard/const.py:128
+msgid "St. Pierre and Miquelon"
+msgstr ""
+
+#: ../picard/const.py:129
+msgid "Zambia"
+msgstr ""
+
+#: ../picard/const.py:130
+msgid "Western Sahara"
+msgstr ""
+
+#: ../picard/const.py:131
+msgid "Estonia"
+msgstr ""
+
+#: ../picard/const.py:132
+msgid "Egypt"
+msgstr ""
+
+#: ../picard/const.py:133
+msgid "South Africa"
+msgstr ""
+
+#: ../picard/const.py:134
+msgid "Ecuador"
+msgstr ""
+
+#: ../picard/const.py:135
+msgid "Italy"
+msgstr ""
+
+#: ../picard/const.py:136
+#, fuzzy
+msgid "Viet Nam"
+msgstr "Ime datoteke"
+
+#: ../picard/const.py:137
+msgid "Solomon Islands"
+msgstr ""
+
+#: ../picard/const.py:138
+msgid "Ethiopia"
+msgstr ""
+
+#: ../picard/const.py:139
+msgid "Somalia"
+msgstr ""
+
+#: ../picard/const.py:140
+msgid "Zimbabwe"
+msgstr ""
+
+#: ../picard/const.py:141
+msgid "Saudi Arabia"
+msgstr ""
+
+#: ../picard/const.py:142
+#, fuzzy
+msgid "Spain"
+msgstr "&Skeniraj"
+
+#: ../picard/const.py:143
+msgid "Eritrea"
+msgstr ""
+
+#: ../picard/const.py:144
+msgid "Moldova, Republic of"
+msgstr ""
+
+#: ../picard/const.py:145
+msgid "Madagascar"
+msgstr ""
+
+#: ../picard/const.py:146
+msgid "Morocco"
+msgstr ""
+
+#: ../picard/const.py:147
+#, fuzzy
+msgid "Monaco"
+msgstr "Mono"
+
+#: ../picard/const.py:148
+msgid "Uzbekistan"
+msgstr ""
+
+#: ../picard/const.py:149
+msgid "Myanmar"
+msgstr ""
+
+#: ../picard/const.py:150
+msgid "Mali"
+msgstr ""
+
+#: ../picard/const.py:151
+msgid "Maca"
+msgstr ""
+
+#: ../picard/const.py:152
+#, fuzzy
+msgid "Mongolia"
+msgstr "Mono"
+
+#: ../picard/const.py:153
+msgid "Marshall Islands"
+msgstr ""
+
+#: ../picard/const.py:154
+msgid "Macedonia, The Former Yugoslav Republic of"
+msgstr ""
+
+#: ../picard/const.py:155
+msgid "Mauritius"
+msgstr ""
+
+#: ../picard/const.py:156
+#, fuzzy
+msgid "Malta"
+msgstr "Metapodatki"
+
+#: ../picard/const.py:157
+msgid "Malawi"
+msgstr ""
+
+#: ../picard/const.py:158
+msgid "Maldives"
+msgstr ""
+
+#: ../picard/const.py:159
+msgid "Martinique"
+msgstr ""
+
+#: ../picard/const.py:160
+msgid "Northern Mariana Islands"
+msgstr ""
+
+#: ../picard/const.py:161
+msgid "Montserrat"
+msgstr ""
+
+#: ../picard/const.py:162
+msgid "Mauritania"
+msgstr ""
+
+#: ../picard/const.py:163
+msgid "Uganda"
+msgstr ""
+
+#: ../picard/const.py:164
+msgid "Malaysia"
+msgstr ""
+
+#: ../picard/const.py:165
+msgid "Mexico"
+msgstr ""
+
+#: ../picard/const.py:166
+msgid "Israel"
+msgstr ""
+
+#: ../picard/const.py:167
+#, fuzzy
+msgid "France"
+msgstr "Prekliči"
+
+#: ../picard/const.py:168
+msgid "British Indian Ocean Territory"
+msgstr ""
+
+#: ../picard/const.py:169
+msgid "St. Helena"
+msgstr ""
+
+#: ../picard/const.py:170
+msgid "Finland"
+msgstr ""
+
+#: ../picard/const.py:171
+msgid "Fiji"
+msgstr ""
+
+#: ../picard/const.py:172
+msgid "Falkland Islands (Malvinas)"
+msgstr ""
+
+#: ../picard/const.py:173
+msgid "Micronesia, Federated States of"
+msgstr ""
+
+#: ../picard/const.py:174
+msgid "Faroe Islands"
+msgstr ""
+
+#: ../picard/const.py:175
+msgid "Nicaragua"
+msgstr ""
+
+#: ../picard/const.py:176
+msgid "Netherlands"
+msgstr ""
+
+#: ../picard/const.py:177
+msgid "Norway"
+msgstr ""
+
+#: ../picard/const.py:178
+msgid "Namibia"
+msgstr ""
+
+#: ../picard/const.py:179
+msgid "Vanuat"
+msgstr ""
+
+#: ../picard/const.py:180
+msgid "New Caledonia"
+msgstr ""
+
+#: ../picard/const.py:181
+msgid "Niger"
+msgstr ""
+
+#: ../picard/const.py:182
+msgid "Norfolk Island"
+msgstr ""
+
+#: ../picard/const.py:183
+msgid "Nigeria"
+msgstr ""
+
+#: ../picard/const.py:184
+#, fuzzy
+msgid "New Zealand"
+msgstr "Novi metapodatki"
+
+#: ../picard/const.py:185
+msgid "Zaire"
+msgstr ""
+
+#: ../picard/const.py:186
+msgid "Nepal"
+msgstr ""
+
+#: ../picard/const.py:187
+msgid "Naur"
+msgstr ""
+
+#: ../picard/const.py:188
+msgid "Niue"
+msgstr ""
+
+#: ../picard/const.py:189
+msgid "Cook Islands"
+msgstr ""
+
+#: ../picard/const.py:190
+msgid "Cote d'Ivoire"
+msgstr ""
+
+#: ../picard/const.py:191
+msgid "Switzerland"
+msgstr ""
+
+#: ../picard/const.py:192
+msgid "Colombia"
+msgstr ""
+
+#: ../picard/const.py:193
+msgid "China"
+msgstr ""
+
+#: ../picard/const.py:194
+msgid "Cameroon"
+msgstr ""
+
+#: ../picard/const.py:195
+#, fuzzy
+msgid "Chile"
+msgstr "Datoteka"
+
+#: ../picard/const.py:196
+msgid "Cocos (Keeling) Islands"
+msgstr ""
+
+#: ../picard/const.py:197
+msgid "Canada"
+msgstr ""
+
+#: ../picard/const.py:198
+#, fuzzy
+msgid "Congo"
+msgstr "Mono"
+
+#: ../picard/const.py:199
+msgid "Central African Republic"
+msgstr ""
+
+#: ../picard/const.py:200
+msgid "Czech Republic"
+msgstr ""
+
+#: ../picard/const.py:201
+msgid "Cyprus"
+msgstr ""
+
+#: ../picard/const.py:202
+msgid "Christmas Island"
+msgstr ""
+
+#: ../picard/const.py:203
+msgid "Costa Rica"
+msgstr ""
+
+#: ../picard/const.py:204
+msgid "Cape Verde"
+msgstr ""
+
+#: ../picard/const.py:205
+msgid "Cuba"
+msgstr ""
+
+#: ../picard/const.py:206
+msgid "Swaziland"
+msgstr ""
+
+#: ../picard/const.py:207
+msgid "Syrian Arab Republic"
+msgstr ""
+
+#: ../picard/const.py:208
+msgid "Kyrgyzstan"
+msgstr ""
+
+#: ../picard/const.py:209
+msgid "Kenya"
+msgstr ""
+
+#: ../picard/const.py:210
+msgid "Suriname"
+msgstr ""
+
+#: ../picard/const.py:211
+msgid "Kiribati"
+msgstr ""
+
+#: ../picard/const.py:212
+msgid "Cambodia"
+msgstr ""
+
+#: ../picard/const.py:213
+msgid "Saint Kitts and Nevis"
+msgstr ""
+
+#: ../picard/const.py:214
+#, fuzzy
+msgid "Comoros"
+msgstr "Običajno"
+
+#: ../picard/const.py:215
+msgid "Sao Tome and Principe"
+msgstr ""
+
+#: ../picard/const.py:216
+msgid "Slovenia"
+msgstr ""
+
+#: ../picard/const.py:217
+msgid "Kuwait"
+msgstr ""
+
+#: ../picard/const.py:218
+#, fuzzy
+msgid "Senegal"
+msgstr "Splošno"
+
+#: ../picard/const.py:219
+msgid "San Marino"
+msgstr ""
+
+#: ../picard/const.py:220
+msgid "Sierra Leone"
+msgstr ""
+
+#: ../picard/const.py:221
+msgid "Seychelles"
+msgstr ""
+
+#: ../picard/const.py:222
+msgid "Kazakhstan"
+msgstr ""
+
+#: ../picard/const.py:223
+msgid "Cayman Islands"
+msgstr ""
+
+#: ../picard/const.py:224
+msgid "Singapore"
+msgstr ""
+
+#: ../picard/const.py:225
+msgid "Sweden"
+msgstr ""
+
+#: ../picard/const.py:226
+#, fuzzy
+msgid "Sudan"
+msgstr "&Skeniraj"
+
+#: ../picard/const.py:227
+msgid "Dominican Republic"
+msgstr ""
+
+#: ../picard/const.py:228
+msgid "Dominica"
+msgstr ""
+
+#: ../picard/const.py:229
+#, fuzzy
+msgid "Djibouti"
+msgstr "&O programu ..."
+
+#: ../picard/const.py:230
+msgid "Denmark"
+msgstr ""
+
+#: ../picard/const.py:231
+msgid "Virgin Islands (British)"
+msgstr ""
+
+#: ../picard/const.py:232
+msgid "Germany"
+msgstr ""
+
+#: ../picard/const.py:233
+msgid "Yemen"
+msgstr ""
+
+#: ../picard/const.py:234
+msgid "Algeria"
+msgstr ""
+
+#: ../picard/const.py:235
+msgid "United States"
+msgstr ""
+
+#: ../picard/const.py:236
+msgid "Uruguay"
+msgstr ""
+
+#: ../picard/const.py:237
+msgid "Mayotte"
+msgstr ""
+
+#: ../picard/const.py:238
+msgid "United States Minor Outlying Islands"
+msgstr ""
+
+#: ../picard/const.py:239
+msgid "Lebanon"
+msgstr ""
+
+#: ../picard/const.py:240
+msgid "Saint Lucia"
+msgstr ""
+
+#: ../picard/const.py:241
+msgid "Lao People's Democratic Republic"
+msgstr ""
+
+#: ../picard/const.py:242
+msgid "Tuval"
+msgstr ""
+
+#: ../picard/const.py:243
+msgid "Taiwan"
+msgstr ""
+
+#: ../picard/const.py:244
+msgid "Trinidad and Tobago"
+msgstr ""
+
+#: ../picard/const.py:245
+msgid "Turkey"
+msgstr ""
+
+#: ../picard/const.py:246
+msgid "Sri Lanka"
+msgstr ""
+
+#: ../picard/const.py:247
+msgid "Liechtenstein"
+msgstr ""
+
+#: ../picard/const.py:248
+msgid "Latvia"
+msgstr ""
+
+#: ../picard/const.py:249
+msgid "Tonga"
+msgstr ""
+
+#: ../picard/const.py:250
+msgid "Lithuania"
+msgstr ""
+
+#: ../picard/const.py:251
+msgid "Luxembourg"
+msgstr ""
+
+#: ../picard/const.py:252
+msgid "Liberia"
+msgstr ""
+
+#: ../picard/const.py:253
+#, fuzzy
+msgid "Lesotho"
+msgstr "Dolžina:"
+
+#: ../picard/const.py:254
+msgid "Thailand"
+msgstr ""
+
+#: ../picard/const.py:255
+msgid "French Southern Territories"
+msgstr ""
+
+#: ../picard/const.py:256
+#, fuzzy
+msgid "Togo"
+msgstr "&Orodja"
+
+#: ../picard/const.py:257
+msgid "Chad"
+msgstr ""
+
+#: ../picard/const.py:258
+msgid "Turks and Caicos Islands"
+msgstr ""
+
+#: ../picard/const.py:259
+msgid "Libyan Arab Jamahiriya"
+msgstr ""
+
+#: ../picard/const.py:260
+msgid "Vatican City State (Holy See)"
+msgstr ""
+
+#: ../picard/const.py:261
+msgid "Saint Vincent and The Grenadines"
+msgstr ""
+
+#: ../picard/const.py:262
+msgid "United Arab Emirates"
+msgstr ""
+
+#: ../picard/const.py:263
+msgid "Andorra"
+msgstr ""
+
+#: ../picard/const.py:264
+msgid "Antigua and Barbuda"
+msgstr ""
+
+#: ../picard/const.py:265
+msgid "Afghanistan"
+msgstr ""
+
+#: ../picard/const.py:266
+msgid "Anguilla"
+msgstr ""
+
+#: ../picard/const.py:267
+msgid "Virgin Islands (U.S.)"
+msgstr ""
+
+#: ../picard/const.py:268
+msgid "Iceland"
+msgstr ""
+
+#: ../picard/const.py:269
+msgid "Iran (Islamic Republic of)"
+msgstr ""
+
+#: ../picard/const.py:270
+msgid "Armenia"
+msgstr ""
+
+#: ../picard/const.py:271
+msgid "Albania"
+msgstr ""
+
+#: ../picard/const.py:272
+msgid "Angola"
+msgstr ""
+
+#: ../picard/const.py:273
+msgid "Netherlands Antilles"
+msgstr ""
+
+#: ../picard/const.py:274
+msgid "Antarctica"
+msgstr ""
+
+#: ../picard/const.py:275
+msgid "American Samoa"
+msgstr ""
+
+#: ../picard/const.py:276
+msgid "Argentina"
+msgstr ""
+
+#: ../picard/const.py:277
+msgid "Australia"
+msgstr ""
+
+#: ../picard/const.py:278
+#, fuzzy
+msgid "Austria"
+msgstr "Avtor"
+
+#: ../picard/const.py:279
+msgid "Aruba"
+msgstr ""
+
+#: ../picard/const.py:280
+#, fuzzy
+msgid "India"
+msgstr "Metapodatki"
+
+#: ../picard/const.py:281
+msgid "Tanzania, United Republic of"
+msgstr ""
+
+#: ../picard/const.py:282
+msgid "Azerbaijan"
+msgstr ""
+
+#: ../picard/const.py:283
+msgid "Ireland"
+msgstr ""
+
+#: ../picard/const.py:284
+msgid "Indonesia"
+msgstr ""
+
+#: ../picard/const.py:285
+msgid "Ukraine"
+msgstr ""
+
+#: ../picard/const.py:286
+msgid "Qatar"
+msgstr ""
+
+#: ../picard/const.py:287
+msgid "Mozambique"
+msgstr ""
+
+#: ../picard/const.py:288
+msgid "Bosnia and Herzegovina"
+msgstr ""
+
+#: ../picard/const.py:289
+msgid "Congo, The Democratic Republic of the"
+msgstr ""
+
+#: ../picard/const.py:290
+msgid "Serbia and Montenegro"
+msgstr ""
+
+#: ../picard/const.py:291
+msgid "Croatia"
+msgstr ""
+
+#: ../picard/const.py:292
+msgid "Korea (North), Democratic People's Republic of"
+msgstr ""
+
+#: ../picard/const.py:293
+msgid "Korea (South), Republic of"
+msgstr ""
+
+#: ../picard/const.py:294
+msgid "Slovakia"
+msgstr ""
+
+#: ../picard/const.py:295
+msgid "Soviet Union (historical, 1922-1991)"
+msgstr ""
+
+#: ../picard/const.py:296
+msgid "East Timor"
+msgstr ""
+
+#: ../picard/const.py:297
+msgid "Czechoslovakia (historical, 1918-1992)"
+msgstr ""
+
+#: ../picard/const.py:298
+msgid "Europe"
+msgstr ""
+
+#: ../picard/const.py:299
+msgid "East Germany (historical, 1949-1990)"
+msgstr ""
+
+#: ../picard/const.py:300
+msgid "[Unknown Country]"
+msgstr ""
+
+#: ../picard/const.py:301
+msgid "[Worldwide]"
+msgstr ""
+
+#: ../picard/const.py:302
+msgid "Yugoslavia (historical, 1918-1992)"
+msgstr ""
+
+#: ../picard/const.py:307
+msgid "Catalan"
+msgstr ""
+
+#: ../picard/const.py:308
+msgid "Czech"
+msgstr ""
+
+#: ../picard/const.py:309
+msgid "Welsh"
+msgstr ""
+
+#: ../picard/const.py:310
+#, fuzzy
+msgid "Danish"
+msgstr "Podrobnosti"
+
+#: ../picard/const.py:311
+#, fuzzy
+msgid "German"
+msgstr "Splošno"
+
+#: ../picard/const.py:312
+msgid "English"
+msgstr ""
+
+#: ../picard/const.py:313
+msgid "English (Canada)"
+msgstr ""
+
+#: ../picard/const.py:314
+msgid "English (UK)"
+msgstr ""
+
+#: ../picard/const.py:315
+msgid "Spanish"
+msgstr ""
+
+#: ../picard/const.py:316
+#, fuzzy
+msgid "Persian"
+msgstr "Različica"
+
+#: ../picard/const.py:317
+msgid "Finnish"
+msgstr ""
+
+#: ../picard/const.py:318
+msgid "French"
+msgstr ""
+
+#: ../picard/const.py:319
+msgid "Frisian"
+msgstr ""
+
+#: ../picard/const.py:320
+msgid "Hebrew"
+msgstr ""
+
+#: ../picard/const.py:321
+msgid "Hungarian"
+msgstr ""
+
+#: ../picard/const.py:322
+msgid "Islandic"
+msgstr ""
+
+#: ../picard/const.py:323
+msgid "Italian"
+msgstr ""
+
+#: ../picard/const.py:324
+msgid "Kannada"
+msgstr ""
+
+#: ../picard/const.py:325
+msgid "Korean"
+msgstr ""
+
+#: ../picard/const.py:326
+msgid "Lithuanian"
+msgstr ""
+
+#: ../picard/const.py:327
+msgid "Norwegian Bokmal"
+msgstr ""
+
+#: ../picard/const.py:328
+msgid "Dutch"
+msgstr ""
+
+#: ../picard/const.py:329
+#, fuzzy
+msgid "Polish"
+msgstr "Vstavki"
+
+#: ../picard/const.py:330
+msgid "Portuguese"
+msgstr ""
+
+#: ../picard/const.py:331
+msgid "Brazilian Portuguese"
+msgstr ""
+
+#: ../picard/const.py:332
+msgid "Romanian"
+msgstr ""
+
+#: ../picard/const.py:333
+msgid "Russian"
+msgstr ""
+
+#: ../picard/const.py:334
+#, fuzzy
+msgid "Scots"
+msgstr "Točke"
+
+#: ../picard/const.py:335
+msgid "Slovak"
+msgstr ""
+
+#: ../picard/const.py:336
+msgid "Slovenian"
+msgstr ""
+
+#: ../picard/const.py:337
+msgid "Swedish"
+msgstr ""
+
+#: ../picard/const.py:338
+#, fuzzy
+msgid "Chinese"
+msgstr "Kanali:"
+
+#: ../picard/file.py:475
+#, python-format
+msgid "No matching tracks for file %s"
+msgstr ""
+
+#: ../picard/file.py:492
+#, python-format
+msgid "No matching tracks above the threshold for file %s"
+msgstr ""
+
+#: ../picard/file.py:495
+#, python-format
+msgid "File %s identified!"
+msgstr ""
+
+#: ../picard/file.py:506
+#, python-format
+msgid "Looking up the PUID for file %s..."
+msgstr "Iščem PUID za datoteko %s..."
+
+#: ../picard/file.py:511
+#, python-format
+msgid "Looking up the metadata for file %s..."
+msgstr "Iščem metapodatke za datoteko %s..."
+
+#: ../picard/puidmanager.py:58
+msgid "Submitting PUIDs..."
+msgstr "Pošiljam PUID-e..."
+
+#: ../picard/puidmanager.py:64
+#, python-format
+msgid "PUIDs submission failed: %s"
+msgstr "Pošiljanje PUID-ov neuspešno: %s"
+
+#: ../picard/puidmanager.py:66
+msgid "PUIDs successfully submitted!"
+msgstr "PUID-i so bili uspešno poslani!"
+
+#: ../picard/playlist.py:31
+msgid "M3U Playlist (*.m3u)"
+msgstr "Predvajalni seznam M3U (*.m3u)"
+
+#: ../picard/playlist.py:32
+msgid "PLS Playlist (*.pls)"
+msgstr "Predvajalni seznam PLS (*.pls)"
+
+#: ../picard/playlist.py:33
+msgid "XSPF Playlist (*.xspf)"
+msgstr "Predvajalni seznam XSPF (*.xspf)"
+
+#: ../picard/tagger.py:476
+msgid "CD Lookup Error"
+msgstr "Napaka pri pregledu CD-ja"
+
+#: ../picard/tagger.py:477
 #, python-format
 msgid ""
 "Error while reading CD:\n"
 "\n"
 "%s"
 msgstr ""
+"Napaka med branjem CD-ja:\n"
+"\n"
+"%s"
 
-#: ../picard/ui/passworddialog.py:38
+#: ../picard/tagger.py:503
 #, python-format
-msgid ""
-"The server %s requires you to login. Please enter your username and password."
-msgstr ""
+msgid "Couldn't find PUID for file %s"
+msgstr "Ne najdem PUID-a za datoteko %s"
 
-#: ../picard/ui/ui_options_script.py:52
-msgid "Tagger Script"
-msgstr ""
+#: ../picard/musicdns/__init__.py:98
+#, fuzzy, python-format
+msgid "Looking up the fingerprint for file %s..."
+msgstr "Iščem metapodatke za datoteko %s..."
+
+#: ../picard/musicdns/__init__.py:117
+#, fuzzy, python-format
+msgid "Creating fingerprint for file %s..."
+msgstr "Iščem PUID za datoteko %s..."
 
 #: ../picard/ui/cdlookup.py:31
 msgid "Score"
-msgstr ""
+msgstr "Točke"
 
 #: ../picard/ui/cdlookup.py:31
+#: ../picard/ui/itemviews.py:82
+#: ../picard/util/tags.py:23
 msgid "Title"
-msgstr ""
+msgstr "Naslov"
 
-#: ../picard/ui/cdlookup.py:31 ../picard/ui/mainwindow.py:436
+#: ../picard/ui/cdlookup.py:31
+#: ../picard/ui/itemviews.py:84
+#: ../picard/ui/mainwindow.py:436
+#: ../picard/util/tags.py:22
 msgid "Artist"
-msgstr ""
+msgstr "Izvajalec"
 
-#: ../picard/ui/ui_metadata.py:121
-msgid "Lookup"
-msgstr ""
+#: ../picard/ui/coverartbox.py:47
+#: ../picard/ui/options/cover.py:29
+msgid "Cover Art"
+msgstr "Naslovnica"
 
-#: ../picard/ui/ui_metadata.py:122
-msgid "Title:"
-msgstr ""
+#: ../picard/ui/coverartbox.py:95
+msgid "Buy the album on Amazon"
+msgstr "Kupite album na Amazonu"
 
-#: ../picard/ui/ui_metadata.py:123
-msgid "Date:"
-msgstr ""
+#: ../picard/ui/filebrowser.py:38
+#: ../picard/ui/mainwindow.py:302
+msgid "&Refresh"
+msgstr "&Osveži"
 
-#: ../picard/ui/ui_metadata.py:124
-msgid "Artist:"
-msgstr ""
+#: ../picard/ui/filebrowser.py:41
+msgid "&Move Tagged Files Here"
+msgstr "&Premakni"
 
-#: ../picard/ui/ui_metadata.py:125
-msgid "Track:"
-msgstr ""
+#: ../picard/ui/filebrowser.py:44
+msgid "Show &Hidden Files"
+msgstr "Prikaži &skrite datoteke"
 
-#: ../picard/ui/ui_metadata.py:126
-msgid "0000-00-00; "
-msgstr ""
+#: ../picard/ui/itemviews.py:83
+#, fuzzy
+msgid "Length"
+msgstr "Dolžina:"
 
-#: ../picard/ui/ui_metadata.py:127 ../picard/ui/tageditor.py:225
-#: ../picard/ui/multitageditor.py:181
+#: ../picard/ui/itemviews.py:327
+msgid "&Releases"
+msgstr "&Izdaje"
+
+#: ../picard/ui/itemviews.py:353
+msgid "&Plugins"
+msgstr "&Vstavki"
+
+#: ../picard/ui/itemviews.py:523
+msgid "Clusters"
+msgstr "Grozdi"
+
+#: ../picard/ui/logview.py:29
+msgid "Log"
+msgstr "Sistemski dnevnik"
+
+#: ../picard/ui/puidsubmit.py:31
+#: ../picard/ui/options/plugins.py:80
+msgid "File"
+msgstr "Datoteka"
+
+#: ../picard/ui/puidsubmit.py:31
+msgid "PUID"
+msgstr "PUID"
+
+#: ../picard/ui/puidsubmit.py:31
+#: ../picard/ui/mainwindow.py:437
+msgid "Track"
+msgstr "Skladba"
+
+#: ../picard/ui/puidsubmit.py:31
+msgid "Release"
+msgstr "Izdaja"
+
+#: ../picard/ui/puidsubmit.py:31
+msgid "Release ID"
+msgstr "ID izdaje"
+
+#: ../picard/ui/tageditor.py:65
+#: ../picard/ui/ui_options_plugins.py:62
+msgid "Details"
+msgstr "Podrobnosti"
+
+#: ../picard/ui/tageditor.py:70
+#: ../picard/ui/tageditor.py:241
+#, python-format
+msgid "%d file"
+msgid_plural "%d files"
+msgstr[0] "%d datotek"
+msgstr[1] "%d datoteka"
+msgstr[2] "%d datoteki"
+msgstr[3] "%d datoteke"
+
+#: ../picard/ui/tageditor.py:124
+#, python-format
+msgid "(different across %d file)"
+msgid_plural "(different across %d files)"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../picard/ui/tageditor.py:127
+#, python-format
+msgid "(missing from %d file)"
+msgid_plural "(missing from %d files)"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../picard/ui/tageditor.py:210
+msgid "Filename:"
+msgstr "Ime datoteke:"
+
+#: ../picard/ui/tageditor.py:212
+msgid "Format:"
+msgstr "Oblika:"
+
+#: ../picard/ui/tageditor.py:221
+msgid "Size:"
+msgstr "Velikost:"
+
+#: ../picard/ui/tageditor.py:225
+#: ../picard/ui/ui_metadata.py:127
 msgid "Length:"
-msgstr ""
+msgstr "Dolžina:"
 
-#: ../picard/ui/ui_metadata.py:128
-msgid "Album:"
-msgstr ""
+#: ../picard/ui/tageditor.py:227
+msgid "Bitrate:"
+msgstr "Bitna hitrost:"
 
-#: ../picard/ui/ui_passworddialog.py:78
-msgid "Authentication required"
-msgstr ""
+#: ../picard/ui/tageditor.py:229
+msgid "Sample rate:"
+msgstr "Vzorčna hitrost:"
 
-#: ../picard/ui/ui_passworddialog.py:79 ../picard/ui/ui_options_proxy.py:83
-#: ../picard/ui/ui_options_general.py:113
-msgid "Username:"
-msgstr "Uporabniško ime:"
+#: ../picard/ui/tageditor.py:231
+msgid "Bits per sample:"
+msgstr "Bitov na vzorec:"
 
-#: ../picard/ui/ui_passworddialog.py:80 ../picard/ui/ui_options_proxy.py:82
-#: ../picard/ui/ui_options_general.py:112
-msgid "Password:"
-msgstr ""
+#: ../picard/ui/tageditor.py:234
+msgid "Mono"
+msgstr "Mono"
 
-#: ../picard/ui/ui_passworddialog.py:81
-msgid "Save username and password"
-msgstr ""
+#: ../picard/ui/tageditor.py:235
+msgid "Stereo"
+msgstr "Stereo"
 
-#: ../picard/ui/ui_options_folksonomy.py:114
-#: ../picard/ui/ui_options_folksonomy_tags.py:114
-msgid "Folksonomy Tags"
-msgstr ""
+#: ../picard/ui/tageditor.py:237
+msgid "Channels:"
+msgstr "Kanali:"
 
-#: ../picard/ui/ui_options_folksonomy.py:115
-#: ../picard/ui/ui_options_folksonomy_tags.py:115
-msgid "Ignore tags:"
-msgstr ""
-
-#: ../picard/ui/ui_options_folksonomy.py:116
-#: ../picard/ui/ui_options_folksonomy_tags.py:116
-msgid "Minimal tag usage:"
-msgstr ""
-
-#: ../picard/ui/ui_options_folksonomy.py:117
-#: ../picard/ui/ui_options_folksonomy_tags.py:117
-#: ../picard/ui/ui_options_matching.py:107
-#: ../picard/ui/ui_options_matching.py:108
-#: ../picard/ui/ui_options_matching.py:109
-#: ../picard/ui/ui_options_matching.py:113
-msgid " %"
-msgstr ""
-
-#: ../picard/ui/ui_options_folksonomy.py:118
-msgid "Maximum number of tags:"
-msgstr ""
-
-#: ../picard/ui/ui_options_folksonomy.py:119
-#: ../picard/ui/ui_options_folksonomy_tags.py:119
-msgid "Join multiple tags with:"
-msgstr ""
-
-#: ../picard/ui/ui_options_folksonomy.py:120
-#: ../picard/ui/ui_options_folksonomy_tags.py:120
-msgid " / "
-msgstr ""
-
-#: ../picard/ui/ui_options_folksonomy.py:121
-#: ../picard/ui/ui_options_folksonomy_tags.py:121
-msgid ", "
-msgstr ""
-
-#: ../picard/ui/ui_options_folksonomy_tags.py:118
-msgid "Maximal number of tags:"
-msgstr ""
+#: ../picard/ui/tagsfromfilenames.py:52
+#: ../picard/ui/tagsfromfilenames.py:96
+msgid "File Name"
+msgstr "Ime datoteke"
 
 #: ../picard/ui/mainwindow.py:64
 msgid "MusicBrainz Picard"
@@ -178,7 +1492,7 @@ msgstr "Novi metapodatki"
 
 #: ../picard/ui/mainwindow.py:183
 msgid "&Options..."
-msgstr "&Možnosti..."
+msgstr "&Nastavitve..."
 
 #: ../picard/ui/mainwindow.py:186
 msgid "&Cut"
@@ -190,552 +1504,367 @@ msgstr "Ctrl+X"
 
 #: ../picard/ui/mainwindow.py:191
 msgid "&Paste"
-msgstr ""
+msgstr "&Prilepi"
 
 #: ../picard/ui/mainwindow.py:192
 msgid "Ctrl+V"
-msgstr ""
+msgstr "Ctrl+V"
 
 #: ../picard/ui/mainwindow.py:196
 msgid "&Help..."
-msgstr ""
+msgstr "&Pomoč ..."
 
 #: ../picard/ui/mainwindow.py:207
 msgid "&About..."
-msgstr ""
+msgstr "&O programu ..."
 
 #: ../picard/ui/mainwindow.py:210
 msgid "&Donate..."
-msgstr ""
+msgstr "&Doniraj ..."
 
 #: ../picard/ui/mainwindow.py:213
 msgid "&Report a Bug..."
-msgstr ""
+msgstr "Pošlji po&ročilo o napaki"
 
 #: ../picard/ui/mainwindow.py:216
 msgid "&Support Forum..."
-msgstr ""
+msgstr "&Forum podpore"
 
 #: ../picard/ui/mainwindow.py:219
 msgid "&Add Files..."
-msgstr ""
+msgstr "&Dodaj datoteke ..."
 
 #: ../picard/ui/mainwindow.py:220
 msgid "Add files to the tagger"
-msgstr ""
+msgstr "Dodaj datoteke označevalniku"
 
 #. Keyboard shortcut for "Add Files..."
 #: ../picard/ui/mainwindow.py:222
 msgid "Ctrl+O"
-msgstr ""
+msgstr "Ctrl+O"
 
 #: ../picard/ui/mainwindow.py:225
 msgid "A&dd Folder..."
-msgstr ""
+msgstr "D&odaj mapo ..."
 
 #: ../picard/ui/mainwindow.py:226
 msgid "Add a folder to the tagger"
-msgstr ""
+msgstr "Dodaj mapo označevalniku"
 
 #. Keyboard shortcut for "Add Directory..."
 #: ../picard/ui/mainwindow.py:228
 msgid "Ctrl+D"
-msgstr ""
+msgstr "Ctrl+D"
 
 #: ../picard/ui/mainwindow.py:232
 msgid "&Save"
-msgstr ""
+msgstr "&Shrani"
 
 #: ../picard/ui/mainwindow.py:233
 msgid "Save selected files"
-msgstr ""
+msgstr "Shrani izbrane datoteke"
 
 #. Keyboard shortcut for "Save"
 #: ../picard/ui/mainwindow.py:235
 msgid "Ctrl+S"
-msgstr ""
+msgstr "Ctrl+S"
 
 #: ../picard/ui/mainwindow.py:239
 msgid "S&ubmit PUIDs"
-msgstr ""
+msgstr "P&ošlji PUID-je"
 
 #: ../picard/ui/mainwindow.py:240
 msgid "Submit PUIDs to MusicBrainz"
-msgstr ""
+msgstr "Pošlji PUID-je na MusicBrainz"
 
 #: ../picard/ui/mainwindow.py:244
 msgid "E&xit"
-msgstr ""
+msgstr "I&zhod"
 
 #. Keyboard shortcut for "Exit"
 #: ../picard/ui/mainwindow.py:246
 msgid "Ctrl+Q"
-msgstr ""
+msgstr "Ctrl+Q"
 
 #: ../picard/ui/mainwindow.py:250
 msgid "&Remove"
-msgstr ""
+msgstr "Odst&rani"
 
 #: ../picard/ui/mainwindow.py:251
 msgid "Remove selected files/albums"
-msgstr ""
+msgstr "Odstrani izbrane datoteke oz. albume"
 
 #: ../picard/ui/mainwindow.py:256
 msgid "File &Browser"
-msgstr ""
+msgstr "&Brskalnik datotek"
 
 #: ../picard/ui/mainwindow.py:262
 msgid "&Cover Art"
-msgstr ""
+msgstr "Naslovni&ca"
 
 #: ../picard/ui/mainwindow.py:268
 msgid "Search"
-msgstr ""
+msgstr "Išči"
 
 #: ../picard/ui/mainwindow.py:271
 msgid "&CD Lookup..."
-msgstr ""
+msgstr "Pregled &CD-ja ..."
 
-#: ../picard/ui/mainwindow.py:272 ../picard/ui/mainwindow.py:273
+#: ../picard/ui/mainwindow.py:272
+#: ../picard/ui/mainwindow.py:273
 msgid "Lookup CD"
-msgstr ""
+msgstr "Preglej CD"
 
 #. Keyboard shortcut for "Lookup CD"
 #: ../picard/ui/mainwindow.py:275
 msgid "Ctrl+K"
-msgstr ""
+msgstr "Ctrl+K"
 
 #: ../picard/ui/mainwindow.py:278
 msgid "&Scan"
-msgstr ""
+msgstr "&Skeniraj"
 
 #. Keyboard shortcut for "Analyze"
 #: ../picard/ui/mainwindow.py:281
 msgid "Ctrl+Y"
-msgstr ""
+msgstr "Ctrl+Y"
 
 #: ../picard/ui/mainwindow.py:284
 msgid "Cl&uster"
-msgstr ""
+msgstr "Zdr&uži v grozde"
 
 #. Keyboard shortcut for "Cluster"
 #: ../picard/ui/mainwindow.py:287
 msgid "Ctrl+U"
-msgstr ""
+msgstr "Ctrl+U"
 
 #: ../picard/ui/mainwindow.py:290
 msgid "&Lookup"
-msgstr ""
+msgstr "&Pregled"
 
-#: ../picard/ui/mainwindow.py:291 ../picard/ui/mainwindow.py:292
+#: ../picard/ui/mainwindow.py:291
+#: ../picard/ui/mainwindow.py:292
 msgid "Lookup metadata"
-msgstr ""
+msgstr "Preglej metapodatke"
 
 #. Keyboard shortcut for "Lookup"
 #: ../picard/ui/mainwindow.py:295
 msgid "Ctrl+L"
-msgstr ""
+msgstr "Ctrl+L"
 
 #: ../picard/ui/mainwindow.py:298
 msgid "&Details..."
-msgstr ""
-
-#: ../picard/ui/mainwindow.py:302 ../picard/ui/filebrowser.py:38
-msgid "&Refresh"
-msgstr ""
+msgstr "Po&drobnosti ..."
 
 #: ../picard/ui/mainwindow.py:305
 msgid "Generate &Playlist..."
-msgstr ""
+msgstr "Generiraj seznam &predvajanja ..."
 
 #: ../picard/ui/mainwindow.py:308
 msgid "&Rename Files"
-msgstr ""
+msgstr "P&reimenuj datoteke"
 
 #: ../picard/ui/mainwindow.py:313
 msgid "&Move Files"
-msgstr ""
+msgstr "Pre&makni datoteke"
 
 #: ../picard/ui/mainwindow.py:318
 msgid "Save &Tags"
-msgstr ""
+msgstr "Shrani &oznake"
 
 #: ../picard/ui/mainwindow.py:323
 msgid "Tags From &File Names..."
-msgstr ""
+msgstr "&Oznake iz imen datotek"
 
 #: ../picard/ui/mainwindow.py:326
 msgid "View &Log..."
-msgstr ""
+msgstr "Pokaži dnevnik"
 
 #: ../picard/ui/mainwindow.py:349
 msgid "&File"
-msgstr ""
+msgstr "&Datoteka"
 
 #: ../picard/ui/mainwindow.py:357
 msgid "&Edit"
-msgstr ""
+msgstr "&Urejanje"
 
 #: ../picard/ui/mainwindow.py:363
 msgid "&View"
-msgstr ""
+msgstr "&Pogled"
 
 #: ../picard/ui/mainwindow.py:369
 msgid "&Options"
-msgstr ""
+msgstr "&Nastavitve"
 
 #: ../picard/ui/mainwindow.py:375
 msgid "&Tools"
-msgstr ""
+msgstr "&Orodja"
 
 #: ../picard/ui/mainwindow.py:384
+#: ../picard/ui/util.py:33
 msgid "&Help"
-msgstr ""
+msgstr "&Pomoč"
 
 #: ../picard/ui/mainwindow.py:404
 msgid "&Toolbar"
-msgstr ""
+msgstr "Orodna vrs&tica"
 
 #: ../picard/ui/mainwindow.py:430
 msgid "&Search Bar"
-msgstr ""
+msgstr "I&skalna vrstica"
 
 #: ../picard/ui/mainwindow.py:435
+#: ../picard/util/tags.py:21
 msgid "Album"
-msgstr ""
-
-#: ../picard/ui/mainwindow.py:437 ../picard/ui/puidsubmit.py:31
-msgid "Track"
-msgstr ""
+msgstr "Album"
 
 #: ../picard/ui/mainwindow.py:476
 msgid "All Supported Formats"
-msgstr ""
+msgstr "Vse podprte oblike"
 
 #: ../picard/ui/mainwindow.py:525
 #, python-format
 msgid "Saving playlist %s..."
-msgstr ""
+msgstr "Shranjujem seznam predvajanja %s ..."
 
 #: ../picard/ui/mainwindow.py:528
 #, python-format
 msgid "Playlist %s saved"
-msgstr ""
+msgstr "Seznam predvajanja %s shranjen"
 
-#: ../picard/ui/mainwindow.py:638 ../picard/ui/mainwindow.py:647
+#: ../picard/ui/mainwindow.py:638
+#: ../picard/ui/mainwindow.py:647
 #, python-format
 msgid " (Error: %s)"
-msgstr ""
+msgstr " (Napaka: %s)"
 
-#: ../picard/ui/ui_edittagdialog.py:44
-msgid "Edit Tag"
-msgstr ""
-
-#: ../picard/ui/ui_options_proxy.py:81
-msgid "Web Proxy"
-msgstr ""
-
-#: ../picard/ui/ui_options_proxy.py:84 ../picard/ui/ui_options_general.py:109
-msgid "Port:"
-msgstr "Vrata:"
-
-#: ../picard/ui/ui_options_proxy.py:85 ../picard/ui/ui_options_general.py:110
-msgid "Server address:"
-msgstr "Naslov strežnika:"
-
-#: ../picard/ui/ui_tagsfromfilenames.py:56
-msgid "Convert File Names to Tags"
-msgstr ""
-
-#: ../picard/ui/ui_tagsfromfilenames.py:57
-msgid "Replace underscores with spaces"
-msgstr ""
-
-#: ../picard/ui/ui_tagsfromfilenames.py:58
-#: ../picard/ui/ui_options_naming.py:180
-msgid "&Preview"
-msgstr ""
-
-#: ../picard/ui/ui_options_general.py:108
-msgid "MusicBrainz Server"
-msgstr ""
-
-#: ../picard/ui/ui_options_general.py:111
-msgid "Account Information"
-msgstr ""
-
-#: ../picard/ui/ui_options_general.py:114
-msgid "General"
-msgstr ""
-
-#: ../picard/ui/ui_options_general.py:115
-msgid "Automatically scan all new files"
-msgstr ""
-
-#: ../picard/ui/ui_options_interface.py:46
-msgid "Miscellaneous"
-msgstr ""
-
-#: ../picard/ui/ui_options_interface.py:47
-msgid "Show text labels under icons"
-msgstr ""
-
-#: ../picard/ui/ui_options_interface.py:48
-msgid "Allow selection of multiple directories"
-msgstr ""
-
-#: ../picard/ui/ui_options_interface.py:49
-msgid "Use advanced query syntax"
-msgstr ""
-
-#: ../picard/ui/itemviews.py:327
-msgid "&Releases"
-msgstr ""
-
-#: ../picard/ui/itemviews.py:353
-msgid "&Plugins"
-msgstr ""
-
-#: ../picard/ui/itemviews.py:523
-msgid "Clusters"
-msgstr ""
-
-#: ../picard/ui/ui_options_matching.py:105
-msgid "Thresholds"
-msgstr ""
-
-#: ../picard/ui/ui_options_matching.py:106
-msgid "Minimal similarity for matching files to tracks:"
-msgstr ""
-
-#: ../picard/ui/ui_options_matching.py:110
-msgid "Minimal similarity for file lookups:"
-msgstr ""
-
-#: ../picard/ui/ui_options_matching.py:111
-msgid "Minimal similarity for cluster lookups:"
-msgstr ""
-
-#: ../picard/ui/ui_options_matching.py:112
-msgid "Minimal similarity for PUID lookups:"
-msgstr ""
-
-#: ../picard/ui/ui_options_tags.py:105
-msgid "Common"
-msgstr ""
-
-#: ../picard/ui/ui_options_tags.py:106
-msgid "Clear existing tags before writing new tags"
-msgstr ""
-
-#: ../picard/ui/ui_options_tags.py:107
-msgid "Don't write tags to files"
-msgstr ""
-
-#: ../picard/ui/ui_options_tags.py:108
-msgid "ID3"
-msgstr ""
-
-#: ../picard/ui/ui_options_tags.py:109
-msgid "Write ID3v1 tags to the files"
-msgstr ""
-
-#: ../picard/ui/ui_options_tags.py:110
-msgid "Write ID3v2 version 2.3 tags (2.4 is default)"
-msgstr ""
-
-#: ../picard/ui/ui_options_tags.py:111
-msgid "Text encoding to use while writing ID3v2 tags:"
-msgstr ""
-
-#: ../picard/ui/ui_options_tags.py:112
-msgid "ISO-8859-1"
-msgstr ""
-
-#: ../picard/ui/ui_options_tags.py:113
-msgid "UTF-16"
-msgstr ""
-
-#: ../picard/ui/ui_options_tags.py:114
-msgid "UTF-8"
-msgstr ""
-
-#: ../picard/ui/ui_options_tags.py:115
-msgid "Remove ID3 tags from FLAC files"
-msgstr ""
-
-#: ../picard/ui/ui_options_tags.py:116
-msgid "APE"
-msgstr ""
-
-#: ../picard/ui/ui_options_tags.py:117
-msgid "Remove APEv2 tags from MP3 files"
-msgstr ""
-
-#: ../picard/ui/ui_options_cdlookup_win32.py:56 ../picard/ui/ui_cdlookup.py:60
-#: ../picard/ui/ui_options_cdlookup.py:47
-msgid "CD Lookup"
-msgstr ""
-
-#: ../picard/ui/ui_options_cdlookup_win32.py:57
-msgid "Default CD-ROM drive to use for lookups:"
-msgstr ""
-
-#: ../picard/ui/tageditor.py:65 ../picard/ui/ui_options_plugins.py:62
-#: ../picard/ui/multitageditor.py:37
-msgid "Details"
-msgstr ""
-
-#: ../picard/ui/tageditor.py:70 ../picard/ui/tageditor.py:241
-#: ../picard/ui/multitageditor.py:42 ../picard/ui/multitageditor.py:197
-#, python-format
-msgid "%d file"
-msgid_plural "%d files"
-msgstr[0] ""
-msgstr[1] ""
-
-#: ../picard/ui/tageditor.py:124 ../picard/ui/multitageditor.py:95
-#, python-format
-msgid "(different across %d file)"
-msgid_plural "(different across %d files)"
-msgstr[0] ""
-msgstr[1] ""
-
-#: ../picard/ui/tageditor.py:127 ../picard/ui/multitageditor.py:98
-#, python-format
-msgid "(missing from %d file)"
-msgid_plural "(missing from %d files)"
-msgstr[0] ""
-msgstr[1] ""
-
-#: ../picard/ui/tageditor.py:210 ../picard/ui/multitageditor.py:166
-msgid "Filename:"
-msgstr ""
-
-#: ../picard/ui/tageditor.py:212 ../picard/ui/multitageditor.py:168
-msgid "Format:"
-msgstr ""
-
-#: ../picard/ui/tageditor.py:221 ../picard/ui/multitageditor.py:177
-msgid "Size:"
-msgstr ""
-
-#: ../picard/ui/tageditor.py:227 ../picard/ui/multitageditor.py:183
-msgid "Bitrate:"
-msgstr ""
-
-#: ../picard/ui/tageditor.py:229 ../picard/ui/multitageditor.py:185
-msgid "Sample rate:"
-msgstr ""
-
-#: ../picard/ui/tageditor.py:231 ../picard/ui/multitageditor.py:187
-msgid "Bits per sample:"
-msgstr ""
-
-#: ../picard/ui/tageditor.py:234 ../picard/ui/multitageditor.py:190
-msgid "Mono"
-msgstr ""
-
-#: ../picard/ui/tageditor.py:235 ../picard/ui/multitageditor.py:191
-msgid "Stereo"
-msgstr ""
-
-#: ../picard/ui/tageditor.py:237 ../picard/ui/multitageditor.py:193
-msgid "Channels:"
-msgstr ""
-
-#: ../picard/ui/ui_tageditor.py:115 ../picard/ui/ui_multitageditor.py:55
-#: ../picard/ui/ui_options_plugins.py:59 ../picard/ui/options/plugins.py:76
+#: ../picard/ui/ui_tageditor.py:115
+#: ../picard/ui/ui_options_plugins.py:59
+#: ../picard/ui/options/plugins.py:76
 msgid "Name"
-msgstr ""
+msgstr "Ime"
 
-#: ../picard/ui/ui_tageditor.py:116 ../picard/ui/ui_multitageditor.py:56
+#: ../picard/ui/ui_tageditor.py:116
 msgid "Value"
-msgstr ""
+msgstr "Vrednost"
 
-#: ../picard/ui/ui_tageditor.py:117 ../picard/ui/ui_multitageditor.py:57
+#: ../picard/ui/ui_tageditor.py:117
 msgid "&Add..."
-msgstr ""
+msgstr "Dod&aj"
 
 #: ../picard/ui/ui_tageditor.py:118
 msgid "&Edit..."
-msgstr ""
+msgstr "&Urejanje"
 
 #: ../picard/ui/ui_tageditor.py:119
 msgid "&Delete"
-msgstr ""
+msgstr "&Izbriši"
 
 #: ../picard/ui/ui_tageditor.py:120
 msgid "&Metadata"
-msgstr ""
+msgstr "&Metapodatki"
 
 #: ../picard/ui/ui_tageditor.py:121
 msgid "A&rtwork"
-msgstr ""
+msgstr "P&latnica"
 
 #: ../picard/ui/ui_tageditor.py:122
 msgid "&Info"
-msgstr ""
+msgstr "&Info"
 
-#: ../picard/ui/coverartbox.py:47
-msgid "Cover Art"
-msgstr ""
+#: ../picard/ui/passworddialog.py:38
+#, python-format
+msgid "The server %s requires you to login. Please enter your username and password."
+msgstr "Strežnik %s zahteva, da se prijavite. Prosim, vnesite vaše uporabniško ime in geslo."
 
-#: ../picard/ui/coverartbox.py:95
-msgid "Buy the album on Amazon"
-msgstr ""
-
-#: ../picard/ui/ui_puidsubmit.py:52
-msgid "Submit PUIDs"
-msgstr ""
-
-#: ../picard/ui/ui_puidsubmit.py:53 ../picard/ui/ui_cdlookup.py:62
-msgid "OK"
-msgstr ""
-
-#: ../picard/ui/ui_puidsubmit.py:54 ../picard/ui/ui_cdlookup.py:64
-msgid "Cancel"
-msgstr ""
-
-#: ../picard/ui/puidsubmit.py:31 ../picard/ui/options/plugins.py:80
-msgid "File"
-msgstr ""
-
-#: ../picard/ui/puidsubmit.py:31
-msgid "PUID"
-msgstr ""
-
-#: ../picard/ui/puidsubmit.py:31
-msgid "Release"
-msgstr ""
-
-#: ../picard/ui/puidsubmit.py:31
-msgid "Release ID"
-msgstr ""
-
-#: ../picard/ui/filebrowser.py:41
-msgid "&Move Tagged Files Here"
-msgstr ""
-
-#: ../picard/ui/filebrowser.py:44
-msgid "Show &Hidden Files"
-msgstr ""
+#: ../picard/ui/ui_cdlookup.py:60
+#: ../picard/ui/ui_options_cdlookup.py:47
+#: ../picard/ui/ui_options_cdlookup_win32.py:56
+#: ../picard/ui/options/cdlookup.py:35
+msgid "CD Lookup"
+msgstr "Pregled CD-ja"
 
 #: ../picard/ui/ui_cdlookup.py:61
 msgid "The following releases on MusicBrainz match the CD:"
-msgstr ""
+msgstr "Naslednje izdaje na MusicBrainzu se ujemajo s CD-jem:"
+
+#: ../picard/ui/ui_cdlookup.py:62
+#: ../picard/ui/ui_puidsubmit.py:53
+msgid "OK"
+msgstr "V redu"
 
 #: ../picard/ui/ui_cdlookup.py:63
 msgid "    Lookup manually    "
-msgstr ""
+msgstr "    Preglej ročno    "
+
+#: ../picard/ui/ui_cdlookup.py:64
+#: ../picard/ui/ui_puidsubmit.py:54
+msgid "Cancel"
+msgstr "Prekliči"
+
+#: ../picard/ui/ui_passworddialog.py:78
+msgid "Authentication required"
+msgstr "Zahtevana je overitev"
+
+#: ../picard/ui/ui_passworddialog.py:79
+#: ../picard/ui/ui_options_general.py:113
+#: ../picard/ui/ui_options_proxy.py:83
+msgid "Username:"
+msgstr "Uporabniško ime:"
+
+#: ../picard/ui/ui_passworddialog.py:80
+#: ../picard/ui/ui_options_general.py:112
+#: ../picard/ui/ui_options_proxy.py:82
+msgid "Password:"
+msgstr "Geslo:"
+
+#: ../picard/ui/ui_passworddialog.py:81
+msgid "Save username and password"
+msgstr "Shrani uporabniško ime in geslo"
+
+#: ../picard/ui/ui_edittagdialog.py:44
+msgid "Edit Tag"
+msgstr "Uredi oznako"
+
+#: ../picard/ui/ui_metadata.py:121
+msgid "Lookup"
+msgstr "Preglej"
+
+#: ../picard/ui/ui_metadata.py:122
+msgid "Title:"
+msgstr "Naslov:"
+
+#: ../picard/ui/ui_metadata.py:123
+msgid "Date:"
+msgstr "Datum:"
+
+#: ../picard/ui/ui_metadata.py:124
+msgid "Artist:"
+msgstr "Izvajalec:"
+
+#: ../picard/ui/ui_metadata.py:125
+msgid "Track:"
+msgstr "Sled:"
+
+#: ../picard/ui/ui_metadata.py:126
+msgid "0000-00-00; "
+msgstr "0000-00-00; "
+
+#: ../picard/ui/ui_metadata.py:128
+msgid "Album:"
+msgstr "Album:"
 
 #: ../picard/ui/ui_options.py:42
 msgid "Options"
-msgstr "Možnosti"
+msgstr "Nastavitve"
 
-#: ../picard/ui/tagsfromfilenames.py:52 ../picard/ui/tagsfromfilenames.py:96
-msgid "File Name"
-msgstr ""
+#: ../picard/ui/ui_options_cdlookup.py:48
+msgid "CD-ROM device to use for lookups:"
+msgstr "CD-ROM naprava, ki se bo uporabljala za pregled:"
+
+#: ../picard/ui/ui_options_cdlookup_win32.py:57
+msgid "Default CD-ROM drive to use for lookups:"
+msgstr "Privzeti CD-ROM pogon, ki se bo uporabljal za pregled:"
 
 #: ../picard/ui/ui_options_cover.py:56
 msgid "Location"
@@ -743,23 +1872,208 @@ msgstr "Mesto"
 
 #: ../picard/ui/ui_options_cover.py:57
 msgid "Embed cover images into tags"
-msgstr "Vključi sliko platnic v oznake"
+msgstr "Vključi slike naslovnic v oznake"
 
 #: ../picard/ui/ui_options_cover.py:58
 msgid "Save cover images as separate files"
-msgstr "Shrani sliko platnic kot ločeno datoteko"
+msgstr "Shrani slike naslovnic kot ločene datoteke"
 
 #: ../picard/ui/ui_options_cover.py:59
 msgid "Overwrite the file if it already exists"
 msgstr "Prepiši datoteko, če že obstaja"
 
-#: ../picard/ui/ui_options_metadata.py:100
-msgid "Metadata"
+#: ../picard/ui/util.py:31
+msgid "&Ok"
 msgstr ""
 
+#: ../picard/ui/util.py:32
+#, fuzzy
+msgid "&Cancel"
+msgstr "Prekliči"
+
+#: ../picard/ui/ui_puidsubmit.py:52
+msgid "Submit PUIDs"
+msgstr "Pošlji PUID-je"
+
+#: ../picard/ui/ui_options_folksonomy.py:114
+#: ../picard/ui/options/folksonomy.py:29
+msgid "Folksonomy Tags"
+msgstr "Folksonomske oznake"
+
+#: ../picard/ui/ui_options_folksonomy.py:115
+msgid "Ignore tags:"
+msgstr "Ignoriraj oznake:"
+
+#: ../picard/ui/ui_options_folksonomy.py:116
+msgid "Minimal tag usage:"
+msgstr "Minimalna raba oznak:"
+
+#: ../picard/ui/ui_options_folksonomy.py:117
+#: ../picard/ui/ui_options_matching.py:107
+#: ../picard/ui/ui_options_matching.py:108
+#: ../picard/ui/ui_options_matching.py:109
+#: ../picard/ui/ui_options_matching.py:113
+msgid " %"
+msgstr " %"
+
+#: ../picard/ui/ui_options_folksonomy.py:118
+msgid "Maximum number of tags:"
+msgstr "Maksimalno število oznak:"
+
+#: ../picard/ui/ui_options_folksonomy.py:119
+msgid "Join multiple tags with:"
+msgstr "Združi večdelne oznake z:"
+
+#: ../picard/ui/ui_options_folksonomy.py:120
+msgid " / "
+msgstr " / "
+
+#: ../picard/ui/ui_options_folksonomy.py:121
+msgid ", "
+msgstr ", "
+
+#: ../picard/ui/ui_options_interface.py:50
+msgid "Miscellaneous"
+msgstr "Razno"
+
+#: ../picard/ui/ui_options_interface.py:51
+msgid "Show text labels under icons"
+msgstr "Pokaži označbe pod ikonami na orodni vrstici"
+
+#: ../picard/ui/ui_options_interface.py:52
+msgid "Allow selection of multiple directories"
+msgstr "Dovoli izbiro večdelnih imenikov"
+
+#: ../picard/ui/ui_options_interface.py:53
+msgid "Use advanced query syntax"
+msgstr "Uporabi napredno sintakso za poizvedbo"
+
+#: ../picard/ui/ui_options_interface.py:54
+#, fuzzy
+msgid "User interface language:"
+msgstr "Uporabniško ime:"
+
+#: ../picard/ui/ui_options_naming.py:165
+msgid "Rename Files"
+msgstr "Preimenuj datoteke"
+
+#: ../picard/ui/ui_options_naming.py:166
+msgid "Replace Windows-incompatible characters"
+msgstr "Zamenjaj znake, ki niso združljivi z zapisom operacijskega sistema Windows"
+
+#: ../picard/ui/ui_options_naming.py:167
+msgid "Replace non-ASCII characters"
+msgstr "Zamenjaj ne-ASCII oznake"
+
+#: ../picard/ui/ui_options_naming.py:168
+#: ../picard/ui/ui_options_naming.py:169
+#: ../picard/ui/ui_options_metadata.py:109
+#: ../picard/ui/ui_options_metadata.py:110
+msgid "Default"
+msgstr "Privzeto"
+
+#: ../picard/ui/ui_options_naming.py:170
+#: ../picard/ui/options/naming.py:90
+msgid "Multiple artist file naming format:"
+msgstr "Oblika imena datoteke za več izvajalcev:"
+
+#: ../picard/ui/ui_options_naming.py:171
+#: ../picard/ui/options/naming.py:86
+msgid "File naming format:"
+msgstr "Oblika imena datoteke:"
+
+#: ../picard/ui/ui_options_naming.py:172
+msgid "Move Files"
+msgstr "Premakni datoteke"
+
+#: ../picard/ui/ui_options_naming.py:173
+msgid "Move tagged files to this directory:"
+msgstr "Premakni datoteke z dodeljenimi oznakami v ta imenik:"
+
+#: ../picard/ui/ui_options_naming.py:174
+msgid "Browse..."
+msgstr "Prebrskaj ..."
+
+#: ../picard/ui/ui_options_naming.py:175
+msgid "Move additional files:"
+msgstr "Premakni dodatne datoteke:"
+
+#: ../picard/ui/ui_options_naming.py:176
+msgid "Delete empty directories"
+msgstr "Izbriši prazne imenike"
+
+#: ../picard/ui/ui_options_naming.py:177
+msgid "Example"
+msgstr "Primer"
+
+#: ../picard/ui/ui_options_naming.py:178
+msgid "File name:"
+msgstr "Ime datoteke:"
+
+#: ../picard/ui/ui_options_naming.py:179
+msgid "Multiple artist file name:"
+msgstr "Ime datoteke za več izvajalcev:"
+
+#: ../picard/ui/ui_options_naming.py:180
+#: ../picard/ui/ui_tagsfromfilenames.py:58
+msgid "&Preview"
+msgstr "&Predogled"
+
+#: ../picard/ui/ui_options_general.py:108
+msgid "MusicBrainz Server"
+msgstr "MusicBrainz strežnik"
+
+#: ../picard/ui/ui_options_general.py:109
+#: ../picard/ui/ui_options_proxy.py:84
+msgid "Port:"
+msgstr "Vrata:"
+
+#: ../picard/ui/ui_options_general.py:110
+#: ../picard/ui/ui_options_proxy.py:85
+msgid "Server address:"
+msgstr "Naslov strežnika:"
+
+#: ../picard/ui/ui_options_general.py:111
+msgid "Account Information"
+msgstr "Informacije o računu"
+
+#: ../picard/ui/ui_options_general.py:114
+#: ../picard/ui/options/general.py:29
+msgid "General"
+msgstr "Splošno"
+
+#: ../picard/ui/ui_options_general.py:115
+msgid "Automatically scan all new files"
+msgstr "Samodejno skeniraj vse nove datoteke"
+
+#: ../picard/ui/ui_options_matching.py:105
+msgid "Thresholds"
+msgstr "Pragovi"
+
+#: ../picard/ui/ui_options_matching.py:106
+msgid "Minimal similarity for matching files to tracks:"
+msgstr "Minimalna podobnost za ujemanje datotek s skladbami:"
+
+#: ../picard/ui/ui_options_matching.py:110
+msgid "Minimal similarity for file lookups:"
+msgstr "Minimalna podobnost za pregled datotek:"
+
+#: ../picard/ui/ui_options_matching.py:111
+msgid "Minimal similarity for cluster lookups:"
+msgstr "Minimalna podobnost za pregled grozdov:"
+
+#: ../picard/ui/ui_options_matching.py:112
+msgid "Minimal similarity for PUID lookups:"
+msgstr "Minimalna podobnost za pregled PUID-jev:"
+
+#: ../picard/ui/ui_options_metadata.py:100
+#: ../picard/ui/options/metadata.py:31
+msgid "Metadata"
+msgstr "Metapodatki"
+
 #: ../picard/ui/ui_options_metadata.py:101
 msgid "Translate foreign artist names to English where possible"
-msgstr ""
+msgstr "Kjer je mogoče, prevedi v angleščino zapise imen avtorjev v drugih pisavah"
 
 #: ../picard/ui/ui_options_metadata.py:102
 msgid "Use release relationships"
@@ -771,171 +2085,455 @@ msgstr ""
 
 #: ../picard/ui/ui_options_metadata.py:104
 msgid "Use folksonomy tags as genre"
-msgstr ""
+msgstr "Uporabi folksonoske oznake kot žanr"
 
 #: ../picard/ui/ui_options_metadata.py:105
 msgid "Preferred release country:"
-msgstr ""
+msgstr "Zaželena država izdaje:"
 
 #: ../picard/ui/ui_options_metadata.py:106
 msgid "Custom Fields"
-msgstr ""
+msgstr "Poljubna polja"
 
 #: ../picard/ui/ui_options_metadata.py:107
 msgid "Various artists:"
-msgstr ""
+msgstr "Različni izvajalci:"
 
 #: ../picard/ui/ui_options_metadata.py:108
 msgid "Non-album tracks:"
-msgstr ""
-
-#: ../picard/ui/ui_options_metadata.py:109
-#: ../picard/ui/ui_options_metadata.py:110
-#: ../picard/ui/ui_options_naming.py:168 ../picard/ui/ui_options_naming.py:169
-msgid "Default"
-msgstr ""
-
-#: ../picard/ui/ui_multitageditor.py:58
-msgid "Delete"
-msgstr ""
-
-#: ../picard/ui/logview.py:29
-msgid "Log"
-msgstr ""
+msgstr "Skladbe brez albuma:"
 
 #: ../picard/ui/ui_options_plugins.py:58
+#: ../picard/ui/options/plugins.py:30
 msgid "Plugins"
-msgstr ""
+msgstr "Vstavki"
 
-#: ../picard/ui/ui_options_plugins.py:60 ../picard/ui/options/plugins.py:79
+#: ../picard/ui/ui_options_plugins.py:60
+#: ../picard/ui/options/plugins.py:79
 msgid "Author"
-msgstr ""
+msgstr "Avtor"
 
 #: ../picard/ui/ui_options_plugins.py:61
+#: ../picard/util/tags.py:36
 msgid "Version"
-msgstr ""
+msgstr "Različica"
 
-#: ../picard/ui/ui_options_naming.py:165
-msgid "Rename Files"
-msgstr ""
+#: ../picard/ui/ui_options_proxy.py:81
+#: ../picard/ui/options/proxy.py:28
+msgid "Web Proxy"
+msgstr "Spletni proksi"
 
-#: ../picard/ui/ui_options_naming.py:166
-msgid "Replace Windows-incompatible characters"
-msgstr ""
+#: ../picard/ui/ui_options_script.py:52
+msgid "Tagger Script"
+msgstr "Skripta označevalnika"
 
-#: ../picard/ui/ui_options_naming.py:167
-msgid "Replace non-ASCII characters"
-msgstr ""
+#: ../picard/ui/ui_options_tags.py:105
+msgid "Common"
+msgstr "Običajno"
 
-#: ../picard/ui/ui_options_naming.py:170 ../picard/ui/options/naming.py:90
-msgid "Multiple artist file naming format:"
-msgstr ""
+#: ../picard/ui/ui_options_tags.py:106
+msgid "Clear existing tags before writing new tags"
+msgstr "Počisti obstoječe oznake pred zapisom novih"
 
-#: ../picard/ui/ui_options_naming.py:171 ../picard/ui/options/naming.py:86
-msgid "File naming format:"
-msgstr ""
+#: ../picard/ui/ui_options_tags.py:107
+msgid "Don't write tags to files"
+msgstr "Na zapisuj oznak v datoteke"
 
-#: ../picard/ui/ui_options_naming.py:172
-msgid "Move Files"
-msgstr ""
+#: ../picard/ui/ui_options_tags.py:108
+msgid "ID3"
+msgstr "ID3"
 
-#: ../picard/ui/ui_options_naming.py:173
-msgid "Move tagged files to this directory:"
-msgstr ""
+#: ../picard/ui/ui_options_tags.py:109
+msgid "Write ID3v1 tags to the files"
+msgstr "Zapiši ID3v1 oznake v datoteke"
 
-#: ../picard/ui/ui_options_naming.py:174
-msgid "Browse..."
-msgstr ""
+#: ../picard/ui/ui_options_tags.py:110
+msgid "Write ID3v2 version 2.3 tags (2.4 is default)"
+msgstr "Zapiši različico 2.3 ID3v2 oznak (različica 2.4 je privzeta)"
 
-#: ../picard/ui/ui_options_naming.py:175
-msgid "Move additional files:"
-msgstr ""
+#: ../picard/ui/ui_options_tags.py:111
+msgid "Text encoding to use while writing ID3v2 tags:"
+msgstr "Za zapis ID3v2 oznak uporabi nabor znakov:"
 
-#: ../picard/ui/ui_options_naming.py:176
-msgid "Delete empty directories"
-msgstr ""
+#: ../picard/ui/ui_options_tags.py:112
+msgid "ISO-8859-1"
+msgstr "ISO-8859-1"
 
-#: ../picard/ui/ui_options_naming.py:177
-msgid "Example"
-msgstr ""
+#: ../picard/ui/ui_options_tags.py:113
+msgid "UTF-16"
+msgstr "UTF-16"
 
-#: ../picard/ui/ui_options_naming.py:178
-msgid "File name:"
-msgstr ""
+#: ../picard/ui/ui_options_tags.py:114
+msgid "UTF-8"
+msgstr "UTF-8"
 
-#: ../picard/ui/ui_options_naming.py:179
-msgid "Multiple artist file name:"
-msgstr ""
+#: ../picard/ui/ui_options_tags.py:115
+msgid "Remove ID3 tags from FLAC files"
+msgstr "Odstrani ID3 oznake iz FLAC datotek"
 
-#: ../picard/ui/ui_options_cdlookup.py:48
-msgid "CD-ROM device to use for lookups:"
-msgstr ""
+#: ../picard/ui/ui_options_tags.py:116
+msgid "APE"
+msgstr "APE"
 
-#: ../picard/ui/options/scripting.py:84 ../picard/ui/options/naming.py:86
-#: ../picard/ui/options/naming.py:90 ../picard/ui/options/naming.py:93
-#: ../picard/ui/options/naming.py:95
-msgid "Script Error"
-msgstr ""
+#: ../picard/ui/ui_options_tags.py:117
+msgid "Remove APEv2 tags from MP3 files"
+msgstr "Odstrani APEv2 oznake iz MP3 datotek"
+
+#: ../picard/ui/ui_tagsfromfilenames.py:56
+msgid "Convert File Names to Tags"
+msgstr "Pretvori imena datotek v oznake"
+
+#: ../picard/ui/ui_tagsfromfilenames.py:57
+msgid "Replace underscores with spaces"
+msgstr "Zamenjaj podčrtaje s presledkom"
+
+#: ../picard/ui/options/about.py:29
+#, fuzzy
+msgid "About"
+msgstr "&O programu ..."
 
 #. Replace this with your name to have it appear in the "About" dialog.
 #: ../picard/ui/options/about.py:48
 msgid "translator-credits"
 msgstr ""
 "Launchpad Contributions:\n"
-"  Alan Pepelko https://launchpad.net/~alan-new\n"
-"\n"
-"Launchpad Contributions:\n"
-"  Alan Pepelko https://launchpad.net/~alan-new\n"
-"\n"
-"Launchpad Contributions:\n"
 "  Alan Pepelko https://launchpad.net/~alan-new"
 
 #. Replace LANG with language you are translatig to.
 #: ../picard/ui/options/about.py:51
 #, python-format
 msgid "<br/>Translated to LANG by %s"
-msgstr ""
+msgstr "<br/>V slovenščino prevedel %s"
 
 #: ../picard/ui/options/about.py:55
-#, python-format
+#, fuzzy, python-format
 msgid ""
-"<p align=\"center\"><span style=\"font-size:15px;font-weight:bold;"
-"\">MusicBrainz Picard</span><br/>\n"
+"<p align=\"center\"><span style=\"font-size:15px;font-weight:bold;\">MusicBrainz Picard</span><br/>\n"
 "Version %(version)s</p>\n"
 "<p align=\"center\"><strong>Supported formats</strong><br/>%(formats)s</p>\n"
 "<p align=\"center\"><strong>Please donate</strong><br/>\n"
-"Thank you for using Picard. Picard relies on the MusicBrainz database, which "
-"is operated by the MetaBrainz Foundation with the help of thousands of "
-"volunteers. If you like this application please consider donating to the "
-"MetaBrainz Foundation to keep the service running.</p>\n"
-"<p align=\"center\"><a href=\"http://metabrainz.org/donate/index.html"
-"\">Donate now!</a></p>\n"
+"Thank you for using Picard. Picard relies on the MusicBrainz database, which is operated by the MetaBrainz Foundation with the help of thousands of volunteers. If you like this application please consider donating to the MetaBrainz Foundation to keep the service running.</p>\n"
+"<p align=\"center\"><a href=\"http://metabrainz.org/donate/index.html\">Donate now!</a></p>\n"
 "<p align=\"center\"><strong>Credits</strong><br/>\n"
-"<small>Copyright © 2004-2008 Robert Kaye, Lukáš Lalinský and others%"
-"(translator-credits)s</small></p>\n"
-"<p align=\"center\"><a href=\"http://musicbrainz.org/doc/PicardTagger"
-"\">http://musicbrainz.org/doc/PicardTagger</a></p>\n"
+"<small>Copyright © 2004-2008 Robert Kaye, Lukáš Lalinský and others%(translator-credits)s</small></p>\n"
+"<p align=\"center\"><a href=\"http://musicbrainz.org/doc/PicardTagger\">http://musicbrainz.org/doc/PicardTagger</a></p>\n"
 msgstr ""
+"<p align=\"center\"><span style=\"font-size:15px;font-weight:bold;\">MusicBrainz Picard</span><br/>\n"
+"Različica %(version)s</p>\n"
+"<p align=\"center\"><strong>Podprti formati</strong><br/>%(formats)s</p>\n"
+"<p align=\"center\"><strong>Prosimo, donirajte</strong><br/>\n"
+"Hvala, ker uporabljate Picard. Picard sloni na podatkovni zbirki MusicBrainz, ki jo upravlja MetaBrainz Foundation s pomočjo več tisoč prostovoljcev. Če vam je program všeč, vas prosimo, da razmislite o donaciji fundaciji MetaBrainz Foundation.</p>\n"
+"<p align=\"center\"><a href=\"http://metabrainz.org/donate/index.html\">Donirajte sedaj!</a></p>\n"
+"<p align=\"center\"><strong>Zasluge</strong><br/>\n"
+"<small>Copyright © 2004-2008 Robert Kaye, Lukáš Lalinský in ostali%(translator-credits)s</small></p>\n"
+"<p align=\"center\"><a href=\"http://musicbrainz.org/doc/PicardTagger\">http://musicbrainz.org/doc/PicardTagger</a></p>\n"
+
+#: ../picard/ui/options/advanced.py:26
+msgid "Advanced"
+msgstr ""
+
+#: ../picard/ui/options/interface.py:31
+#, fuzzy
+msgid "User Interface"
+msgstr "Uporabniško ime:"
+
+#: ../picard/ui/options/interface.py:47
+msgid "System default"
+msgstr ""
+
+#: ../picard/ui/options/interface.py:71
+msgid "Language changed"
+msgstr ""
+
+#: ../picard/ui/options/interface.py:71
+msgid "You have changed the interface language. You have to restart Picard in order for the change to take effect."
+msgstr ""
+
+#: ../picard/ui/options/matching.py:29
+msgid "Matching"
+msgstr ""
+
+#: ../picard/ui/options/metadata.py:52
+msgid "None"
+msgstr ""
+
+#: ../picard/ui/options/naming.py:33
+#, fuzzy
+msgid "File Naming"
+msgstr "Ime datoteke"
+
+#: ../picard/ui/options/naming.py:86
+#: ../picard/ui/options/naming.py:90
+#: ../picard/ui/options/naming.py:93
+#: ../picard/ui/options/naming.py:95
+#: ../picard/ui/options/scripting.py:84
+msgid "Script Error"
+msgstr "Napaka skripte"
 
 #: ../picard/ui/options/naming.py:93
 msgid "The file naming format must not be empty."
-msgstr ""
+msgstr "Oblika imena datoteke ne sme biti prazna."
 
 #: ../picard/ui/options/naming.py:95
 msgid "The multiple artist file naming format must not be empty."
-msgstr ""
+msgstr "Oblika imena datotek za več izvajalcev ne sme biti prazna."
 
 #: ../picard/ui/options/naming.py:97
 msgid "Error"
-msgstr ""
+msgstr "Napaka"
 
 #: ../picard/ui/options/naming.py:97
 msgid "The location to move files to must not be empty."
+msgstr "Mesto za premik datotek ne sme biti prazno."
+
+#: ../picard/ui/options/scripting.py:63
+msgid "Scripting"
 msgstr ""
 
+#: ../picard/ui/options/tags.py:29
+msgid "Tags"
+msgstr ""
+
+#: ../picard/util/tags.py:24
+#, fuzzy
+msgid "Date"
+msgstr "Datum:"
+
+#: ../picard/util/tags.py:25
+#, fuzzy
+msgid "Album Artist"
+msgstr "Izvajalec"
+
+#: ../picard/util/tags.py:26
+msgid "Track Number"
+msgstr ""
+
+#: ../picard/util/tags.py:27
+#, fuzzy
+msgid "Total Tracks"
+msgstr "Skladbe brez albuma:"
+
+#: ../picard/util/tags.py:28
+msgid "Disc Number"
+msgstr ""
+
+#: ../picard/util/tags.py:29
+msgid "Total Discs"
+msgstr ""
+
+#: ../picard/util/tags.py:30
+msgid "Album Artist Sort Order"
+msgstr ""
+
+#: ../picard/util/tags.py:31
+msgid "Artist Sort Order"
+msgstr ""
+
+#: ../picard/util/tags.py:32
+msgid "Title Sort Order"
+msgstr ""
+
+#: ../picard/util/tags.py:33
+msgid "Album Sort Order"
+msgstr ""
+
+#: ../picard/util/tags.py:34
+msgid "ASIN"
+msgstr ""
+
+#: ../picard/util/tags.py:35
+msgid "Grouping"
+msgstr ""
+
+#: ../picard/util/tags.py:37
+msgid "ISRC"
+msgstr ""
+
+#: ../picard/util/tags.py:38
+#, fuzzy
+msgid "Mood"
+msgstr "Mono"
+
+#: ../picard/util/tags.py:39
+msgid "BPM"
+msgstr ""
+
+#: ../picard/util/tags.py:40
+msgid "Copyright"
+msgstr ""
+
+#: ../picard/util/tags.py:41
+msgid "Composer"
+msgstr ""
+
+#: ../picard/util/tags.py:42
+msgid "Conductor"
+msgstr ""
+
+#: ../picard/util/tags.py:43
+msgid "Lyricist"
+msgstr ""
+
+#: ../picard/util/tags.py:44
+msgid "Arranger"
+msgstr ""
+
+#: ../picard/util/tags.py:45
+msgid "Producer"
+msgstr ""
+
+#: ../picard/util/tags.py:46
+msgid "Engineer"
+msgstr ""
+
+#: ../picard/util/tags.py:47
+#, fuzzy
+msgid "Subtitle"
+msgstr "Naslov"
+
+#: ../picard/util/tags.py:48
+msgid "Disc Subtitle"
+msgstr ""
+
+#: ../picard/util/tags.py:49
+msgid "Remixer"
+msgstr ""
+
+#: ../picard/util/tags.py:50
+#, fuzzy
+msgid "MusicBrainz Track Id"
+msgstr "MusicBrainz Picard"
+
+#: ../picard/util/tags.py:51
+#, fuzzy
+msgid "MusicBrainz Release Id"
+msgstr "MusicBrainz Picard"
+
+#: ../picard/util/tags.py:52
+#, fuzzy
+msgid "MusicBrainz Artist Id"
+msgstr "MusicBrainz Picard"
+
+#: ../picard/util/tags.py:53
+#, fuzzy
+msgid "MusicBrainz Release Artist Id"
+msgstr "MusicBrainz Picard"
+
+#: ../picard/util/tags.py:54
+#, fuzzy
+msgid "MusicBrainz TRM Id"
+msgstr "MusicBrainz Picard"
+
+#: ../picard/util/tags.py:55
+#, fuzzy
+msgid "MusicBrainz Disc Id"
+msgstr "MusicBrainz Picard"
+
+#: ../picard/util/tags.py:56
+#, fuzzy
+msgid "MusicBrainz Sort Name"
+msgstr "MusicBrainz strežnik"
+
+#: ../picard/util/tags.py:57
+msgid "MusicIP PUID"
+msgstr ""
+
+#: ../picard/util/tags.py:58
+msgid "MusicIP Fingerprint"
+msgstr ""
+
+#: ../picard/util/tags.py:59
+msgid "Disc Id"
+msgstr ""
+
+#: ../picard/util/tags.py:60
+msgid "Website"
+msgstr ""
+
+#: ../picard/util/tags.py:61
+#, fuzzy
+msgid "Compilation"
+msgstr "Mesto"
+
+#: ../picard/util/tags.py:62
+#, fuzzy
+msgid "Comment"
+msgstr "Običajno"
+
+#: ../picard/util/tags.py:63
+#, fuzzy
+msgid "Genre"
+msgstr "Splošno"
+
+#: ../picard/util/tags.py:64
+msgid "Encoded By"
+msgstr ""
+
+#: ../picard/util/tags.py:65
+msgid "Performer"
+msgstr ""
+
+#: ../picard/util/tags.py:66
+#, fuzzy
+msgid "Release Type"
+msgstr "Izdaja"
+
+#: ../picard/util/tags.py:67
+#, fuzzy
+msgid "Release Status"
+msgstr "&Izdaje"
+
+#: ../picard/util/tags.py:68
+#, fuzzy
+msgid "Release Country"
+msgstr "ID izdaje"
+
+#: ../picard/util/tags.py:69
+msgid "Record Label"
+msgstr ""
+
+#: ../picard/util/tags.py:70
+msgid "Barcode"
+msgstr ""
+
+#: ../picard/util/tags.py:71
+msgid "Catalog Number"
+msgstr ""
+
+#: ../picard/util/tags.py:72
+#, fuzzy
+msgid "Format"
+msgstr "Oblika:"
+
+#: ../picard/util/tags.py:73
+msgid "DJ-Mixer"
+msgstr ""
+
+#: ../picard/util/tags.py:74
+#, fuzzy
+msgid "Media"
+msgstr "Metapodatki"
+
+#: ../picard/util/tags.py:75
+msgid "Lyrics"
+msgstr ""
+
+#: ../picard/util/tags.py:76
+msgid "Mixer"
+msgstr ""
+
+#: ../picard/util/tags.py:77
+msgid "Language"
+msgstr ""
+
+#: ../picard/util/tags.py:78
+#, fuzzy
+msgid "Script"
+msgstr "Napaka skripte"
+
 #: ../picard/util/webbrowser2.py:84
 msgid "Web Browser Error"
-msgstr ""
+msgstr "Napaka spletnega brskalnika"
 
 #: ../picard/util/webbrowser2.py:84
 #, python-format
@@ -944,30 +2542,15 @@ msgid ""
 "\n"
 "%s"
 msgstr ""
+"Napaka med zagonom spletnega brskalnika:\n"
+"\n"
+"%s"
 
-#~ msgid "Looking up the PUID for file %s..."
-#~ msgstr "Iščem PUID za datoteko %s..."
+#, fuzzy
+#~ msgid "New Version"
+#~ msgstr "Različica"
+#~ msgid "Delete"
+#~ msgstr "Izbriši"
+#~ msgid "Maximal number of tags:"
+#~ msgstr "Maksimalno število oznak:"
 
-#~ msgid "Looking up the metadata for file %s..."
-#~ msgstr "Iščem metapodatke za datoteko %s..."
-
-#~ msgid "M3U Playlist (*.m3u)"
-#~ msgstr "Predvajalni seznam M3U (*.m3u)"
-
-#~ msgid "PLS Playlist (*.pls)"
-#~ msgstr "Predvajalni seznam PLS (*.pls)"
-
-#~ msgid "XSPF Playlist (*.xspf)"
-#~ msgstr "Predvajalni seznam XSPF (*.xspf)"
-
-#~ msgid "Submitting PUIDs..."
-#~ msgstr "Pošiljam PUID-e..."
-
-#~ msgid "PUIDs submission failed: %s"
-#~ msgstr "Pošiljanje PUID-ov neuspešno: %s"
-
-#~ msgid "PUIDs successfully submitted!"
-#~ msgstr "PUID-i so bili uspešno poslani!"
-
-#~ msgid "Couldn't find PUID for file %s"
-#~ msgstr "Ne najdem PUID-a za datoteko %s"
diff --git a/po/sv.po b/po/sv.po
index a3584696b..4c26b1a8c 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -6,35 +6,1321 @@ msgid ""
 msgstr ""
 "Project-Id-Version: picard\n"
 "Report-Msgid-Bugs-To: http://bugs.musicbrainz.org/\n"
-"POT-Creation-Date: 2008-12-01 18:20+0100\n"
-"PO-Revision-Date: 2008-07-30 18:03+0000\n"
-"Last-Translator: Björn_Nilsson <bjorn_bjornbjorn@hotmail.com>\n"
+"POT-Creation-Date: 2009-01-25 12:23+0100\n"
+"PO-Revision-Date: 2009-01-25 13:38+0100\n"
+"Last-Translator: Philipp Wolfer <phw@rubyforge.org>\n"
 "Language-Team: Swedish <sv@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2008-12-01 17:02+0000\n"
+"X-Launchpad-Export-Date: 2009-01-24 23:28+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
-#: ../picard/album.py:108 ../picard/cluster.py:248
+#: ../picard/album.py:108
+#: ../picard/cluster.py:248
 msgid "Unmatched Files"
 msgstr "Omatchade filer"
 
-#: ../picard/album.py:269
+#: ../picard/album.py:281
 #, python-format
 msgid "[couldn't load album %s]"
 msgstr "[kunde inte hämta album (%s)]"
 
-#: ../picard/album.py:305
+#: ../picard/album.py:317
 msgid "[loading album information]"
 msgstr "[hämtar albuminformation]"
 
-#: ../picard/tagger.py:472
+#: ../picard/cluster.py:164
+#: ../picard/cluster.py:175
+#, python-format
+msgid "No matching releases for cluster %s"
+msgstr "Inga matchande utgåvor för kluster %s"
+
+#: ../picard/cluster.py:177
+#, python-format
+msgid "Cluster %s identified!"
+msgstr "Kluster %s identifierat!"
+
+#: ../picard/cluster.py:182
+#, python-format
+msgid "Looking up the metadata for cluster %s..."
+msgstr "Slår upp metadata för kluster %s..."
+
+#: ../picard/const.py:40
+msgid "CD"
+msgstr ""
+
+#: ../picard/const.py:41
+msgid "DVD"
+msgstr ""
+
+#: ../picard/const.py:42
+msgid "SACD"
+msgstr ""
+
+#: ../picard/const.py:43
+msgid "LaserDisc"
+msgstr ""
+
+#: ../picard/const.py:44
+msgid "MiniDisc"
+msgstr ""
+
+#: ../picard/const.py:45
+msgid "Vinyl"
+msgstr ""
+
+#: ../picard/const.py:46
+msgid "Cassette"
+msgstr ""
+
+#: ../picard/const.py:47
+msgid "Cartridge (4/8-tracks)"
+msgstr ""
+
+#: ../picard/const.py:48
+msgid "Reel-to-Reel"
+msgstr ""
+
+#: ../picard/const.py:49
+msgid "DAT"
+msgstr ""
+
+#: ../picard/const.py:50
+#, fuzzy
+msgid "Digital Media"
+msgstr "Ursprunglig metadata"
+
+#: ../picard/const.py:51
+msgid "Wax Cylinder"
+msgstr ""
+
+#: ../picard/const.py:52
+msgid "Piano Roll"
+msgstr ""
+
+#: ../picard/const.py:53
+#, fuzzy
+msgid "Other"
+msgstr "Senare"
+
+#: ../picard/const.py:58
+msgid "Bangladesh"
+msgstr ""
+
+#: ../picard/const.py:59
+msgid "Belgium"
+msgstr ""
+
+#: ../picard/const.py:60
+msgid "Burkina Faso"
+msgstr ""
+
+#: ../picard/const.py:61
+#, fuzzy
+msgid "Bulgaria"
+msgstr "Ungerska"
+
+#: ../picard/const.py:62
+msgid "Barbados"
+msgstr ""
+
+#: ../picard/const.py:63
+msgid "Wallis and Futuna Islands"
+msgstr ""
+
+#: ../picard/const.py:64
+#, fuzzy
+msgid "Bermuda"
+msgstr "Tyska"
+
+#: ../picard/const.py:65
+msgid "Brunei Darussalam"
+msgstr ""
+
+#: ../picard/const.py:66
+msgid "Bolivia"
+msgstr ""
+
+#: ../picard/const.py:67
+msgid "Bahrain"
+msgstr ""
+
+#: ../picard/const.py:68
+msgid "Burundi"
+msgstr ""
+
+#: ../picard/const.py:69
+msgid "Benin"
+msgstr ""
+
+#: ../picard/const.py:70
+msgid "Bhutan"
+msgstr ""
+
+#: ../picard/const.py:71
+msgid "Jamaica"
+msgstr ""
+
+#: ../picard/const.py:72
+msgid "Bouvet Island"
+msgstr ""
+
+#: ../picard/const.py:73
+msgid "Botswana"
+msgstr ""
+
+#: ../picard/const.py:74
+msgid "Samoa"
+msgstr ""
+
+#: ../picard/const.py:75
+msgid "Brazil"
+msgstr ""
+
+#: ../picard/const.py:76
+msgid "Bahamas"
+msgstr ""
+
+#: ../picard/const.py:77
+msgid "Belarus"
+msgstr ""
+
+#: ../picard/const.py:78
+msgid "Belize"
+msgstr ""
+
+#: ../picard/const.py:79
+msgid "Russian Federation"
+msgstr ""
+
+#: ../picard/const.py:80
+msgid "Rwanda"
+msgstr ""
+
+#: ../picard/const.py:81
+msgid "Reunion"
+msgstr ""
+
+#: ../picard/const.py:82
+msgid "Turkmenistan"
+msgstr ""
+
+#: ../picard/const.py:83
+msgid "Tajikistan"
+msgstr ""
+
+#: ../picard/const.py:84
+#, fuzzy
+msgid "Romania"
+msgstr "Rumänska"
+
+#: ../picard/const.py:85
+#, fuzzy
+msgid "Tokela"
+msgstr "Verktygsrad"
+
+#: ../picard/const.py:86
+msgid "Guinea-Bissa"
+msgstr ""
+
+#: ../picard/const.py:87
+msgid "Guam"
+msgstr ""
+
+#: ../picard/const.py:88
+msgid "Guatemala"
+msgstr ""
+
+#: ../picard/const.py:89
+msgid "Greece"
+msgstr ""
+
+#: ../picard/const.py:90
+msgid "Equatorial Guinea"
+msgstr ""
+
+#: ../picard/const.py:91
+msgid "Guadeloupe"
+msgstr ""
+
+#: ../picard/const.py:92
+msgid "Japan"
+msgstr ""
+
+#: ../picard/const.py:93
+msgid "Guyana"
+msgstr ""
+
+#: ../picard/const.py:94
+#, fuzzy
+msgid "French Guiana"
+msgstr "Franska"
+
+#: ../picard/const.py:95
+#, fuzzy
+msgid "Georgia"
+msgstr "Tyska"
+
+#: ../picard/const.py:96
+msgid "Grenada"
+msgstr ""
+
+#: ../picard/const.py:97
+msgid "United Kingdom"
+msgstr ""
+
+#: ../picard/const.py:98
+msgid "Gabon"
+msgstr ""
+
+#: ../picard/const.py:99
+msgid "El Salvador"
+msgstr ""
+
+#: ../picard/const.py:100
+#, fuzzy
+msgid "Guinea"
+msgstr "Allmänt"
+
+#: ../picard/const.py:101
+msgid "Gambia"
+msgstr ""
+
+#: ../picard/const.py:102
+msgid "Greenland"
+msgstr ""
+
+#: ../picard/const.py:103
+msgid "Gibraltar"
+msgstr ""
+
+#: ../picard/const.py:104
+msgid "Ghana"
+msgstr ""
+
+#: ../picard/const.py:105
+#, fuzzy
+msgid "Oman"
+msgstr "Tyska"
+
+#: ../picard/const.py:106
+msgid "Tunisia"
+msgstr ""
+
+#: ../picard/const.py:107
+#, fuzzy
+msgid "Jordan"
+msgstr "Koreanska"
+
+#: ../picard/const.py:108
+msgid "Haiti"
+msgstr ""
+
+#: ../picard/const.py:109
+#, fuzzy
+msgid "Hungary"
+msgstr "Ungerska"
+
+#: ../picard/const.py:110
+msgid "Hong Kong"
+msgstr ""
+
+#: ../picard/const.py:111
+msgid "Honduras"
+msgstr ""
+
+#: ../picard/const.py:112
+msgid "Heard and Mc Donald Islands"
+msgstr ""
+
+#: ../picard/const.py:113
+msgid "Venezuela"
+msgstr ""
+
+#: ../picard/const.py:114
+msgid "Puerto Rico"
+msgstr ""
+
+#: ../picard/const.py:115
+msgid "Pala"
+msgstr ""
+
+#: ../picard/const.py:116
+#, fuzzy
+msgid "Portugal"
+msgstr "Portugisiska"
+
+#: ../picard/const.py:117
+msgid "Svalbard and Jan Mayen Islands"
+msgstr ""
+
+#: ../picard/const.py:118
+msgid "Paraguay"
+msgstr ""
+
+#: ../picard/const.py:119
+msgid "Iraq"
+msgstr ""
+
+#: ../picard/const.py:120
+msgid "Panama"
+msgstr ""
+
+#: ../picard/const.py:121
+msgid "French Polynesia"
+msgstr ""
+
+#: ../picard/const.py:122
+msgid "Papua New Guinea"
+msgstr ""
+
+#: ../picard/const.py:123
+msgid "Per"
+msgstr ""
+
+#: ../picard/const.py:124
+msgid "Pakistan"
+msgstr ""
+
+#: ../picard/const.py:125
+msgid "Philippines"
+msgstr ""
+
+#: ../picard/const.py:126
+msgid "Pitcairn"
+msgstr ""
+
+#: ../picard/const.py:127
+msgid "Poland"
+msgstr ""
+
+#: ../picard/const.py:128
+msgid "St. Pierre and Miquelon"
+msgstr ""
+
+#: ../picard/const.py:129
+msgid "Zambia"
+msgstr ""
+
+#: ../picard/const.py:130
+msgid "Western Sahara"
+msgstr ""
+
+#: ../picard/const.py:131
+msgid "Estonia"
+msgstr ""
+
+#: ../picard/const.py:132
+msgid "Egypt"
+msgstr ""
+
+#: ../picard/const.py:133
+msgid "South Africa"
+msgstr ""
+
+#: ../picard/const.py:134
+msgid "Ecuador"
+msgstr ""
+
+#: ../picard/const.py:135
+#, fuzzy
+msgid "Italy"
+msgstr "Italienska"
+
+#: ../picard/const.py:136
+#, fuzzy
+msgid "Viet Nam"
+msgstr "Filnamn"
+
+#: ../picard/const.py:137
+msgid "Solomon Islands"
+msgstr ""
+
+#: ../picard/const.py:138
+msgid "Ethiopia"
+msgstr ""
+
+#: ../picard/const.py:139
+#, fuzzy
+msgid "Somalia"
+msgstr "Rumänska"
+
+#: ../picard/const.py:140
+msgid "Zimbabwe"
+msgstr ""
+
+#: ../picard/const.py:141
+msgid "Saudi Arabia"
+msgstr ""
+
+#: ../picard/const.py:142
+#, fuzzy
+msgid "Spain"
+msgstr "Spanska"
+
+#: ../picard/const.py:143
+msgid "Eritrea"
+msgstr ""
+
+#: ../picard/const.py:144
+msgid "Moldova, Republic of"
+msgstr ""
+
+#: ../picard/const.py:145
+msgid "Madagascar"
+msgstr ""
+
+#: ../picard/const.py:146
+msgid "Morocco"
+msgstr ""
+
+#: ../picard/const.py:147
+#, fuzzy
+msgid "Monaco"
+msgstr "Mono"
+
+#: ../picard/const.py:148
+msgid "Uzbekistan"
+msgstr ""
+
+#: ../picard/const.py:149
+msgid "Myanmar"
+msgstr ""
+
+#: ../picard/const.py:150
+msgid "Mali"
+msgstr ""
+
+#: ../picard/const.py:151
+msgid "Maca"
+msgstr ""
+
+#: ../picard/const.py:152
+#, fuzzy
+msgid "Mongolia"
+msgstr "Mono"
+
+#: ../picard/const.py:153
+msgid "Marshall Islands"
+msgstr ""
+
+#: ../picard/const.py:154
+msgid "Macedonia, The Former Yugoslav Republic of"
+msgstr ""
+
+#: ../picard/const.py:155
+msgid "Mauritius"
+msgstr ""
+
+#: ../picard/const.py:156
+#, fuzzy
+msgid "Malta"
+msgstr "Metadata"
+
+#: ../picard/const.py:157
+msgid "Malawi"
+msgstr ""
+
+#: ../picard/const.py:158
+msgid "Maldives"
+msgstr ""
+
+#: ../picard/const.py:159
+msgid "Martinique"
+msgstr ""
+
+#: ../picard/const.py:160
+msgid "Northern Mariana Islands"
+msgstr ""
+
+#: ../picard/const.py:161
+msgid "Montserrat"
+msgstr ""
+
+#: ../picard/const.py:162
+#, fuzzy
+msgid "Mauritania"
+msgstr "Litauiska"
+
+#: ../picard/const.py:163
+msgid "Uganda"
+msgstr ""
+
+#: ../picard/const.py:164
+msgid "Malaysia"
+msgstr ""
+
+#: ../picard/const.py:165
+msgid "Mexico"
+msgstr ""
+
+#: ../picard/const.py:166
+msgid "Israel"
+msgstr ""
+
+#: ../picard/const.py:167
+#, fuzzy
+msgid "France"
+msgstr "Avbryt"
+
+#: ../picard/const.py:168
+msgid "British Indian Ocean Territory"
+msgstr ""
+
+#: ../picard/const.py:169
+msgid "St. Helena"
+msgstr ""
+
+#: ../picard/const.py:170
+msgid "Finland"
+msgstr ""
+
+#: ../picard/const.py:171
+msgid "Fiji"
+msgstr ""
+
+#: ../picard/const.py:172
+msgid "Falkland Islands (Malvinas)"
+msgstr ""
+
+#: ../picard/const.py:173
+msgid "Micronesia, Federated States of"
+msgstr ""
+
+#: ../picard/const.py:174
+msgid "Faroe Islands"
+msgstr ""
+
+#: ../picard/const.py:175
+msgid "Nicaragua"
+msgstr ""
+
+#: ../picard/const.py:176
+msgid "Netherlands"
+msgstr ""
+
+#: ../picard/const.py:177
+msgid "Norway"
+msgstr ""
+
+#: ../picard/const.py:178
+msgid "Namibia"
+msgstr ""
+
+#: ../picard/const.py:179
+msgid "Vanuat"
+msgstr ""
+
+#: ../picard/const.py:180
+msgid "New Caledonia"
+msgstr ""
+
+#: ../picard/const.py:181
+#, fuzzy
+msgid "Niger"
+msgstr "Mixer"
+
+#: ../picard/const.py:182
+msgid "Norfolk Island"
+msgstr ""
+
+#: ../picard/const.py:183
+msgid "Nigeria"
+msgstr ""
+
+#: ../picard/const.py:184
+#, fuzzy
+msgid "New Zealand"
+msgstr "Ny metadata"
+
+#: ../picard/const.py:185
+msgid "Zaire"
+msgstr ""
+
+#: ../picard/const.py:186
+msgid "Nepal"
+msgstr ""
+
+#: ../picard/const.py:187
+msgid "Naur"
+msgstr ""
+
+#: ../picard/const.py:188
+msgid "Niue"
+msgstr ""
+
+#: ../picard/const.py:189
+msgid "Cook Islands"
+msgstr ""
+
+#: ../picard/const.py:190
+msgid "Cote d'Ivoire"
+msgstr ""
+
+#: ../picard/const.py:191
+msgid "Switzerland"
+msgstr ""
+
+#: ../picard/const.py:192
+msgid "Colombia"
+msgstr ""
+
+#: ../picard/const.py:193
+msgid "China"
+msgstr ""
+
+#: ../picard/const.py:194
+msgid "Cameroon"
+msgstr ""
+
+#: ../picard/const.py:195
+#, fuzzy
+msgid "Chile"
+msgstr "Fil"
+
+#: ../picard/const.py:196
+msgid "Cocos (Keeling) Islands"
+msgstr ""
+
+#: ../picard/const.py:197
+msgid "Canada"
+msgstr ""
+
+#: ../picard/const.py:198
+#, fuzzy
+msgid "Congo"
+msgstr "Mono"
+
+#: ../picard/const.py:199
+msgid "Central African Republic"
+msgstr ""
+
+#: ../picard/const.py:200
+msgid "Czech Republic"
+msgstr ""
+
+#: ../picard/const.py:201
+msgid "Cyprus"
+msgstr ""
+
+#: ../picard/const.py:202
+msgid "Christmas Island"
+msgstr ""
+
+#: ../picard/const.py:203
+msgid "Costa Rica"
+msgstr ""
+
+#: ../picard/const.py:204
+msgid "Cape Verde"
+msgstr ""
+
+#: ../picard/const.py:205
+msgid "Cuba"
+msgstr ""
+
+#: ../picard/const.py:206
+msgid "Swaziland"
+msgstr ""
+
+#: ../picard/const.py:207
+msgid "Syrian Arab Republic"
+msgstr ""
+
+#: ../picard/const.py:208
+msgid "Kyrgyzstan"
+msgstr ""
+
+#: ../picard/const.py:209
+msgid "Kenya"
+msgstr ""
+
+#: ../picard/const.py:210
+msgid "Suriname"
+msgstr ""
+
+#: ../picard/const.py:211
+msgid "Kiribati"
+msgstr ""
+
+#: ../picard/const.py:212
+msgid "Cambodia"
+msgstr ""
+
+#: ../picard/const.py:213
+msgid "Saint Kitts and Nevis"
+msgstr ""
+
+#: ../picard/const.py:214
+#, fuzzy
+msgid "Comoros"
+msgstr "Färger"
+
+#: ../picard/const.py:215
+msgid "Sao Tome and Principe"
+msgstr ""
+
+#: ../picard/const.py:216
+#, fuzzy
+msgid "Slovenia"
+msgstr "Slovakiska"
+
+#: ../picard/const.py:217
+msgid "Kuwait"
+msgstr ""
+
+#: ../picard/const.py:218
+#, fuzzy
+msgid "Senegal"
+msgstr "Allmänt"
+
+#: ../picard/const.py:219
+msgid "San Marino"
+msgstr ""
+
+#: ../picard/const.py:220
+msgid "Sierra Leone"
+msgstr ""
+
+#: ../picard/const.py:221
+msgid "Seychelles"
+msgstr ""
+
+#: ../picard/const.py:222
+msgid "Kazakhstan"
+msgstr ""
+
+#: ../picard/const.py:223
+msgid "Cayman Islands"
+msgstr ""
+
+#: ../picard/const.py:224
+msgid "Singapore"
+msgstr ""
+
+#: ../picard/const.py:225
+#, fuzzy
+msgid "Sweden"
+msgstr "Svenska"
+
+#: ../picard/const.py:226
+#, fuzzy
+msgid "Sudan"
+msgstr "&Skanna"
+
+#: ../picard/const.py:227
+msgid "Dominican Republic"
+msgstr ""
+
+#: ../picard/const.py:228
+#, fuzzy
+msgid "Dominica"
+msgstr "Rumänska"
+
+#: ../picard/const.py:229
+#, fuzzy
+msgid "Djibouti"
+msgstr "Om"
+
+#: ../picard/const.py:230
+msgid "Denmark"
+msgstr ""
+
+#: ../picard/const.py:231
+msgid "Virgin Islands (British)"
+msgstr ""
+
+#: ../picard/const.py:232
+#, fuzzy
+msgid "Germany"
+msgstr "Tyska"
+
+#: ../picard/const.py:233
+msgid "Yemen"
+msgstr ""
+
+#: ../picard/const.py:234
+msgid "Algeria"
+msgstr ""
+
+#: ../picard/const.py:235
+msgid "United States"
+msgstr ""
+
+#: ../picard/const.py:236
+msgid "Uruguay"
+msgstr ""
+
+#: ../picard/const.py:237
+msgid "Mayotte"
+msgstr ""
+
+#: ../picard/const.py:238
+msgid "United States Minor Outlying Islands"
+msgstr ""
+
+#: ../picard/const.py:239
+msgid "Lebanon"
+msgstr ""
+
+#: ../picard/const.py:240
+msgid "Saint Lucia"
+msgstr ""
+
+#: ../picard/const.py:241
+msgid "Lao People's Democratic Republic"
+msgstr ""
+
+#: ../picard/const.py:242
+msgid "Tuval"
+msgstr ""
+
+#: ../picard/const.py:243
+#, fuzzy
+msgid "Taiwan"
+msgstr "Italienska"
+
+#: ../picard/const.py:244
+msgid "Trinidad and Tobago"
+msgstr ""
+
+#: ../picard/const.py:245
+msgid "Turkey"
+msgstr ""
+
+#: ../picard/const.py:246
+msgid "Sri Lanka"
+msgstr ""
+
+#: ../picard/const.py:247
+msgid "Liechtenstein"
+msgstr ""
+
+#: ../picard/const.py:248
+msgid "Latvia"
+msgstr ""
+
+#: ../picard/const.py:249
+msgid "Tonga"
+msgstr ""
+
+#: ../picard/const.py:250
+#, fuzzy
+msgid "Lithuania"
+msgstr "Litauiska"
+
+#: ../picard/const.py:251
+msgid "Luxembourg"
+msgstr ""
+
+#: ../picard/const.py:252
+msgid "Liberia"
+msgstr ""
+
+#: ../picard/const.py:253
+#, fuzzy
+msgid "Lesotho"
+msgstr "Längd"
+
+#: ../picard/const.py:254
+msgid "Thailand"
+msgstr ""
+
+#: ../picard/const.py:255
+msgid "French Southern Territories"
+msgstr ""
+
+#: ../picard/const.py:256
+#, fuzzy
+msgid "Togo"
+msgstr "Ver&ktyg"
+
+#: ../picard/const.py:257
+msgid "Chad"
+msgstr ""
+
+#: ../picard/const.py:258
+msgid "Turks and Caicos Islands"
+msgstr ""
+
+#: ../picard/const.py:259
+msgid "Libyan Arab Jamahiriya"
+msgstr ""
+
+#: ../picard/const.py:260
+msgid "Vatican City State (Holy See)"
+msgstr ""
+
+#: ../picard/const.py:261
+msgid "Saint Vincent and The Grenadines"
+msgstr ""
+
+#: ../picard/const.py:262
+msgid "United Arab Emirates"
+msgstr ""
+
+#: ../picard/const.py:263
+msgid "Andorra"
+msgstr ""
+
+#: ../picard/const.py:264
+msgid "Antigua and Barbuda"
+msgstr ""
+
+#: ../picard/const.py:265
+msgid "Afghanistan"
+msgstr ""
+
+#: ../picard/const.py:266
+msgid "Anguilla"
+msgstr ""
+
+#: ../picard/const.py:267
+msgid "Virgin Islands (U.S.)"
+msgstr ""
+
+#: ../picard/const.py:268
+#, fuzzy
+msgid "Iceland"
+msgstr "Isländska"
+
+#: ../picard/const.py:269
+msgid "Iran (Islamic Republic of)"
+msgstr ""
+
+#: ../picard/const.py:270
+msgid "Armenia"
+msgstr ""
+
+#: ../picard/const.py:271
+msgid "Albania"
+msgstr ""
+
+#: ../picard/const.py:272
+msgid "Angola"
+msgstr ""
+
+#: ../picard/const.py:273
+msgid "Netherlands Antilles"
+msgstr ""
+
+#: ../picard/const.py:274
+msgid "Antarctica"
+msgstr ""
+
+#: ../picard/const.py:275
+msgid "American Samoa"
+msgstr ""
+
+#: ../picard/const.py:276
+msgid "Argentina"
+msgstr ""
+
+#: ../picard/const.py:277
+#, fuzzy
+msgid "Australia"
+msgstr "Italienska"
+
+#: ../picard/const.py:278
+#, fuzzy
+msgid "Austria"
+msgstr "Upphovsman"
+
+#: ../picard/const.py:279
+msgid "Aruba"
+msgstr ""
+
+#: ../picard/const.py:280
+#, fuzzy
+msgid "India"
+msgstr "Media"
+
+#: ../picard/const.py:281
+msgid "Tanzania, United Republic of"
+msgstr ""
+
+#: ../picard/const.py:282
+msgid "Azerbaijan"
+msgstr ""
+
+#: ../picard/const.py:283
+#, fuzzy
+msgid "Ireland"
+msgstr "Isländska"
+
+#: ../picard/const.py:284
+msgid "Indonesia"
+msgstr ""
+
+#: ../picard/const.py:285
+msgid "Ukraine"
+msgstr ""
+
+#: ../picard/const.py:286
+#, fuzzy
+msgid "Qatar"
+msgstr "Senare"
+
+#: ../picard/const.py:287
+msgid "Mozambique"
+msgstr ""
+
+#: ../picard/const.py:288
+msgid "Bosnia and Herzegovina"
+msgstr ""
+
+#: ../picard/const.py:289
+msgid "Congo, The Democratic Republic of the"
+msgstr ""
+
+#: ../picard/const.py:290
+msgid "Serbia and Montenegro"
+msgstr ""
+
+#: ../picard/const.py:291
+msgid "Croatia"
+msgstr ""
+
+#: ../picard/const.py:292
+msgid "Korea (North), Democratic People's Republic of"
+msgstr ""
+
+#: ../picard/const.py:293
+msgid "Korea (South), Republic of"
+msgstr ""
+
+#: ../picard/const.py:294
+#, fuzzy
+msgid "Slovakia"
+msgstr "Slovakiska"
+
+#: ../picard/const.py:295
+msgid "Soviet Union (historical, 1922-1991)"
+msgstr ""
+
+#: ../picard/const.py:296
+msgid "East Timor"
+msgstr ""
+
+#: ../picard/const.py:297
+msgid "Czechoslovakia (historical, 1918-1992)"
+msgstr ""
+
+#: ../picard/const.py:298
+msgid "Europe"
+msgstr ""
+
+#: ../picard/const.py:299
+msgid "East Germany (historical, 1949-1990)"
+msgstr ""
+
+#: ../picard/const.py:300
+msgid "[Unknown Country]"
+msgstr ""
+
+#: ../picard/const.py:301
+msgid "[Worldwide]"
+msgstr ""
+
+#: ../picard/const.py:302
+msgid "Yugoslavia (historical, 1918-1992)"
+msgstr ""
+
+#: ../picard/const.py:307
+#, fuzzy
+msgid "Catalan"
+msgstr "Italienska"
+
+#: ../picard/const.py:308
+msgid "Czech"
+msgstr "Tjeckiska"
+
+#: ../picard/const.py:309
+msgid "Welsh"
+msgstr ""
+
+#: ../picard/const.py:310
+#, fuzzy
+msgid "Danish"
+msgstr "Spanska"
+
+#: ../picard/const.py:311
+msgid "German"
+msgstr "Tyska"
+
+#: ../picard/const.py:312
+msgid "English"
+msgstr "Engelska"
+
+#: ../picard/const.py:313
+#, fuzzy
+msgid "English (Canada)"
+msgstr "Engelska (UK)"
+
+#: ../picard/const.py:314
+msgid "English (UK)"
+msgstr "Engelska (UK)"
+
+#: ../picard/const.py:315
+msgid "Spanish"
+msgstr "Spanska"
+
+#: ../picard/const.py:316
+#, fuzzy
+msgid "Persian"
+msgstr "Version"
+
+#: ../picard/const.py:317
+msgid "Finnish"
+msgstr "Finska"
+
+#: ../picard/const.py:318
+msgid "French"
+msgstr "Franska"
+
+#: ../picard/const.py:319
+msgid "Frisian"
+msgstr ""
+
+#: ../picard/const.py:320
+msgid "Hebrew"
+msgstr ""
+
+#: ../picard/const.py:321
+msgid "Hungarian"
+msgstr "Ungerska"
+
+#: ../picard/const.py:322
+#, fuzzy
+msgid "Islandic"
+msgstr "Isländska"
+
+#: ../picard/const.py:323
+msgid "Italian"
+msgstr "Italienska"
+
+#: ../picard/const.py:324
+msgid "Kannada"
+msgstr ""
+
+#: ../picard/const.py:325
+msgid "Korean"
+msgstr "Koreanska"
+
+#: ../picard/const.py:326
+msgid "Lithuanian"
+msgstr "Litauiska"
+
+#: ../picard/const.py:327
+msgid "Norwegian Bokmal"
+msgstr "Norska (Bokmål)"
+
+#: ../picard/const.py:328
+msgid "Dutch"
+msgstr "Nederländska"
+
+#: ../picard/const.py:329
+#, fuzzy
+msgid "Polish"
+msgstr "Insticksmoduler"
+
+#: ../picard/const.py:330
+msgid "Portuguese"
+msgstr "Portugisiska"
+
+#: ../picard/const.py:331
+#, fuzzy
+msgid "Brazilian Portuguese"
+msgstr "Portugisiska"
+
+#: ../picard/const.py:332
+msgid "Romanian"
+msgstr "Rumänska"
+
+#: ../picard/const.py:333
+msgid "Russian"
+msgstr "Ryska"
+
+#: ../picard/const.py:334
+#, fuzzy
+msgid "Scots"
+msgstr "Poäng"
+
+#: ../picard/const.py:335
+msgid "Slovak"
+msgstr "Slovakiska"
+
+#: ../picard/const.py:336
+#, fuzzy
+msgid "Slovenian"
+msgstr "Slovakiska"
+
+#: ../picard/const.py:337
+msgid "Swedish"
+msgstr "Svenska"
+
+#: ../picard/const.py:338
+#, fuzzy
+msgid "Chinese"
+msgstr "Kanaler:"
+
+#: ../picard/file.py:475
+#, python-format
+msgid "No matching tracks for file %s"
+msgstr "Inga matchande spår för fil %s"
+
+#: ../picard/file.py:492
+#, fuzzy, python-format
+msgid "No matching tracks above the threshold for file %s"
+msgstr "Inga matchande spår för fil %s"
+
+#: ../picard/file.py:495
+#, python-format
+msgid "File %s identified!"
+msgstr "Fil %s identifierad!"
+
+#: ../picard/file.py:506
+#, python-format
+msgid "Looking up the PUID for file %s..."
+msgstr "Slår upp PUID för fil %s..."
+
+#: ../picard/file.py:511
+#, python-format
+msgid "Looking up the metadata for file %s..."
+msgstr "Slår upp metadata för fil %s..."
+
+#: ../picard/puidmanager.py:58
+msgid "Submitting PUIDs..."
+msgstr "Skickar in PUID..."
+
+#: ../picard/puidmanager.py:64
+#, python-format
+msgid "PUIDs submission failed: %s"
+msgstr "Inrapportering av PUID misslyckades: %s"
+
+#: ../picard/puidmanager.py:66
+msgid "PUIDs successfully submitted!"
+msgstr "Inrapportering av PUID lyckades!"
+
+#: ../picard/playlist.py:31
+msgid "M3U Playlist (*.m3u)"
+msgstr "M3U-spellista (*.m3u)"
+
+#: ../picard/playlist.py:32
+msgid "PLS Playlist (*.pls)"
+msgstr "PLS-spellista (*.pls)"
+
+#: ../picard/playlist.py:33
+msgid "XSPF Playlist (*.xspf)"
+msgstr "XSPF-spellista (*.xspf)"
+
+#: ../picard/tagger.py:476
 msgid "CD Lookup Error"
 msgstr "Fel vid uppslagning av cd"
 
-#: ../picard/tagger.py:473
+#: ../picard/tagger.py:477
 #, python-format
 msgid ""
 "Error while reading CD:\n"
@@ -45,125 +1331,175 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../picard/ui/passworddialog.py:38
+#: ../picard/tagger.py:503
 #, python-format
-msgid ""
-"The server %s requires you to login. Please enter your username and password."
-msgstr ""
+msgid "Couldn't find PUID for file %s"
+msgstr "Kunde inte hitta PUID för fil %s"
 
-#: ../picard/ui/ui_options_script.py:52
-msgid "Tagger Script"
-msgstr "Skript för taggning"
+#: ../picard/musicdns/__init__.py:98
+#, python-format
+msgid "Looking up the fingerprint for file %s..."
+msgstr "Slår upp fingeravtrycket för fil %s..."
+
+#: ../picard/musicdns/__init__.py:117
+#, python-format
+msgid "Creating fingerprint for file %s..."
+msgstr "Skapar fingeravtryck för fil %s..."
 
 #: ../picard/ui/cdlookup.py:31
 msgid "Score"
 msgstr "Poäng"
 
 #: ../picard/ui/cdlookup.py:31
+#: ../picard/ui/itemviews.py:82
+#: ../picard/util/tags.py:23
 msgid "Title"
 msgstr "Titel"
 
-#: ../picard/ui/cdlookup.py:31 ../picard/ui/mainwindow.py:436
+#: ../picard/ui/cdlookup.py:31
+#: ../picard/ui/itemviews.py:84
+#: ../picard/ui/mainwindow.py:436
+#: ../picard/util/tags.py:22
 msgid "Artist"
 msgstr "Artist"
 
-#: ../picard/ui/ui_metadata.py:121
-msgid "Lookup"
-msgstr "Slå upp"
+#: ../picard/ui/coverartbox.py:47
+#: ../picard/ui/options/cover.py:29
+msgid "Cover Art"
+msgstr "Omslagsgrafik"
 
-#: ../picard/ui/ui_metadata.py:122
-msgid "Title:"
-msgstr "Titel:"
+#: ../picard/ui/coverartbox.py:95
+msgid "Buy the album on Amazon"
+msgstr "Köp albumet på Amazon"
 
-#: ../picard/ui/ui_metadata.py:123
-msgid "Date:"
-msgstr "Datum:"
+#: ../picard/ui/filebrowser.py:38
+#: ../picard/ui/mainwindow.py:302
+msgid "&Refresh"
+msgstr "&Uppdatera"
 
-#: ../picard/ui/ui_metadata.py:124
-msgid "Artist:"
-msgstr "Artist:"
+#: ../picard/ui/filebrowser.py:41
+#, fuzzy
+msgid "&Move Tagged Files Here"
+msgstr "&Flytta filer"
 
-#: ../picard/ui/ui_metadata.py:125
-msgid "Track:"
-msgstr "Spår:"
+#: ../picard/ui/filebrowser.py:44
+msgid "Show &Hidden Files"
+msgstr ""
 
-#: ../picard/ui/ui_metadata.py:126
-msgid "0000-00-00; "
-msgstr "0000-00-00; "
+#: ../picard/ui/itemviews.py:83
+msgid "Length"
+msgstr "Längd"
 
-#: ../picard/ui/ui_metadata.py:127 ../picard/ui/tageditor.py:225
-#: ../picard/ui/multitageditor.py:181
+#: ../picard/ui/itemviews.py:327
+msgid "&Releases"
+msgstr "&Utgåvor"
+
+#: ../picard/ui/itemviews.py:353
+msgid "&Plugins"
+msgstr "&Insticksmoduler"
+
+#: ../picard/ui/itemviews.py:523
+msgid "Clusters"
+msgstr "Kluster"
+
+#: ../picard/ui/logview.py:29
+msgid "Log"
+msgstr "Logg"
+
+#: ../picard/ui/puidsubmit.py:31
+#: ../picard/ui/options/plugins.py:80
+msgid "File"
+msgstr "Fil"
+
+#: ../picard/ui/puidsubmit.py:31
+msgid "PUID"
+msgstr "PUID"
+
+#: ../picard/ui/puidsubmit.py:31
+#: ../picard/ui/mainwindow.py:437
+msgid "Track"
+msgstr "Spår"
+
+#: ../picard/ui/puidsubmit.py:31
+msgid "Release"
+msgstr "Utgåva"
+
+#: ../picard/ui/puidsubmit.py:31
+msgid "Release ID"
+msgstr "Utgåve-id"
+
+#: ../picard/ui/tageditor.py:65
+#: ../picard/ui/ui_options_plugins.py:62
+msgid "Details"
+msgstr "Detaljer"
+
+#: ../picard/ui/tageditor.py:70
+#: ../picard/ui/tageditor.py:241
+#, python-format
+msgid "%d file"
+msgid_plural "%d files"
+msgstr[0] "%d fil"
+msgstr[1] "%d filer"
+
+#: ../picard/ui/tageditor.py:124
+#, python-format
+msgid "(different across %d file)"
+msgid_plural "(different across %d files)"
+msgstr[0] "(skiljer sig över %d fil)"
+msgstr[1] "(skiljer sig över %d filer)"
+
+#: ../picard/ui/tageditor.py:127
+#, python-format
+msgid "(missing from %d file)"
+msgid_plural "(missing from %d files)"
+msgstr[0] "(saknas från %d fil)"
+msgstr[1] "(saknas från %d filer)"
+
+#: ../picard/ui/tageditor.py:210
+msgid "Filename:"
+msgstr "Filnamn:"
+
+#: ../picard/ui/tageditor.py:212
+msgid "Format:"
+msgstr "Format:"
+
+#: ../picard/ui/tageditor.py:221
+msgid "Size:"
+msgstr "Storlek:"
+
+#: ../picard/ui/tageditor.py:225
+#: ../picard/ui/ui_metadata.py:127
 msgid "Length:"
 msgstr "Längd:"
 
-#: ../picard/ui/ui_metadata.py:128
-msgid "Album:"
-msgstr "Album:"
+#: ../picard/ui/tageditor.py:227
+msgid "Bitrate:"
+msgstr "Bitfrekvens:"
 
-#: ../picard/ui/ui_passworddialog.py:78
-msgid "Authentication required"
-msgstr ""
+#: ../picard/ui/tageditor.py:229
+msgid "Sample rate:"
+msgstr "Samplingsfrekvens:"
 
-#: ../picard/ui/ui_passworddialog.py:79 ../picard/ui/ui_options_proxy.py:83
-#: ../picard/ui/ui_options_general.py:113
-msgid "Username:"
-msgstr "Användarnamn:"
+#: ../picard/ui/tageditor.py:231
+msgid "Bits per sample:"
+msgstr "Bitar per sampling:"
 
-#: ../picard/ui/ui_passworddialog.py:80 ../picard/ui/ui_options_proxy.py:82
-#: ../picard/ui/ui_options_general.py:112
-msgid "Password:"
-msgstr "Lösenord:"
+#: ../picard/ui/tageditor.py:234
+msgid "Mono"
+msgstr "Mono"
 
-#: ../picard/ui/ui_passworddialog.py:81
-msgid "Save username and password"
-msgstr ""
+#: ../picard/ui/tageditor.py:235
+msgid "Stereo"
+msgstr "Stereo"
 
-#: ../picard/ui/ui_options_folksonomy.py:114
-#: ../picard/ui/ui_options_folksonomy_tags.py:114
-msgid "Folksonomy Tags"
-msgstr ""
+#: ../picard/ui/tageditor.py:237
+msgid "Channels:"
+msgstr "Kanaler:"
 
-#: ../picard/ui/ui_options_folksonomy.py:115
-#: ../picard/ui/ui_options_folksonomy_tags.py:115
-msgid "Ignore tags:"
-msgstr "Ignorera taggar:"
-
-#: ../picard/ui/ui_options_folksonomy.py:116
-#: ../picard/ui/ui_options_folksonomy_tags.py:116
-msgid "Minimal tag usage:"
-msgstr ""
-
-#: ../picard/ui/ui_options_folksonomy.py:117
-#: ../picard/ui/ui_options_folksonomy_tags.py:117
-#: ../picard/ui/ui_options_matching.py:107
-#: ../picard/ui/ui_options_matching.py:108
-#: ../picard/ui/ui_options_matching.py:109
-#: ../picard/ui/ui_options_matching.py:113
-msgid " %"
-msgstr " %"
-
-#: ../picard/ui/ui_options_folksonomy.py:118
-msgid "Maximum number of tags:"
-msgstr "Max antal taggar"
-
-#: ../picard/ui/ui_options_folksonomy.py:119
-#: ../picard/ui/ui_options_folksonomy_tags.py:119
-msgid "Join multiple tags with:"
-msgstr ""
-
-#: ../picard/ui/ui_options_folksonomy.py:120
-#: ../picard/ui/ui_options_folksonomy_tags.py:120
-msgid " / "
-msgstr " / "
-
-#: ../picard/ui/ui_options_folksonomy.py:121
-#: ../picard/ui/ui_options_folksonomy_tags.py:121
-msgid ", "
-msgstr ", "
-
-#: ../picard/ui/ui_options_folksonomy_tags.py:118
-msgid "Maximal number of tags:"
-msgstr "Max antal taggar"
+#: ../picard/ui/tagsfromfilenames.py:52
+#: ../picard/ui/tagsfromfilenames.py:96
+msgid "File Name"
+msgstr "Filnamn"
 
 #: ../picard/ui/mainwindow.py:64
 msgid "MusicBrainz Picard"
@@ -298,7 +1634,8 @@ msgstr "Sök"
 msgid "&CD Lookup..."
 msgstr ""
 
-#: ../picard/ui/mainwindow.py:272 ../picard/ui/mainwindow.py:273
+#: ../picard/ui/mainwindow.py:272
+#: ../picard/ui/mainwindow.py:273
 msgid "Lookup CD"
 msgstr "Slå upp cd"
 
@@ -329,7 +1666,8 @@ msgstr "Ctrl+U"
 msgid "&Lookup"
 msgstr ""
 
-#: ../picard/ui/mainwindow.py:291 ../picard/ui/mainwindow.py:292
+#: ../picard/ui/mainwindow.py:291
+#: ../picard/ui/mainwindow.py:292
 msgid "Lookup metadata"
 msgstr "Slå upp metadata"
 
@@ -342,10 +1680,6 @@ msgstr "Ctrl+L"
 msgid "&Details..."
 msgstr "&Detaljer..."
 
-#: ../picard/ui/mainwindow.py:302 ../picard/ui/filebrowser.py:38
-msgid "&Refresh"
-msgstr "&Uppdatera"
-
 #: ../picard/ui/mainwindow.py:305
 msgid "Generate &Playlist..."
 msgstr "Generera &spellista..."
@@ -391,6 +1725,7 @@ msgid "&Tools"
 msgstr "Ver&ktyg"
 
 #: ../picard/ui/mainwindow.py:384
+#: ../picard/ui/util.py:33
 msgid "&Help"
 msgstr "&Hjälp"
 
@@ -403,13 +1738,10 @@ msgid "&Search Bar"
 msgstr "&Sökrad"
 
 #: ../picard/ui/mainwindow.py:435
+#: ../picard/util/tags.py:21
 msgid "Album"
 msgstr "Album"
 
-#: ../picard/ui/mainwindow.py:437 ../picard/ui/puidsubmit.py:31
-msgid "Track"
-msgstr "Spår"
-
 #: ../picard/ui/mainwindow.py:476
 msgid "All Supported Formats"
 msgstr "Alla format som stöds"
@@ -424,37 +1756,289 @@ msgstr "Sparar spellista %s..."
 msgid "Playlist %s saved"
 msgstr "Spellista %s sparad"
 
-#: ../picard/ui/mainwindow.py:638 ../picard/ui/mainwindow.py:647
+#: ../picard/ui/mainwindow.py:638
+#: ../picard/ui/mainwindow.py:647
 #, python-format
 msgid " (Error: %s)"
 msgstr " (Fel: %s)"
 
+#: ../picard/ui/ui_tageditor.py:115
+#: ../picard/ui/ui_options_plugins.py:59
+#: ../picard/ui/options/plugins.py:76
+msgid "Name"
+msgstr "Namn"
+
+#: ../picard/ui/ui_tageditor.py:116
+msgid "Value"
+msgstr "Värde"
+
+#: ../picard/ui/ui_tageditor.py:117
+msgid "&Add..."
+msgstr "&Lägg till..."
+
+#: ../picard/ui/ui_tageditor.py:118
+msgid "&Edit..."
+msgstr "&Redigera..."
+
+#: ../picard/ui/ui_tageditor.py:119
+msgid "&Delete"
+msgstr "&Ta bort"
+
+#: ../picard/ui/ui_tageditor.py:120
+msgid "&Metadata"
+msgstr "&Metadata"
+
+#: ../picard/ui/ui_tageditor.py:121
+msgid "A&rtwork"
+msgstr "&Grafik"
+
+#: ../picard/ui/ui_tageditor.py:122
+msgid "&Info"
+msgstr "&Information"
+
+#: ../picard/ui/passworddialog.py:38
+#, python-format
+msgid "The server %s requires you to login. Please enter your username and password."
+msgstr ""
+
+#: ../picard/ui/ui_cdlookup.py:60
+#: ../picard/ui/ui_options_cdlookup.py:47
+#: ../picard/ui/ui_options_cdlookup_win32.py:56
+#: ../picard/ui/options/cdlookup.py:35
+msgid "CD Lookup"
+msgstr "Uppslagning av cd"
+
+#: ../picard/ui/ui_cdlookup.py:61
+msgid "The following releases on MusicBrainz match the CD:"
+msgstr "Följande utgåvor på MusicBrainz matchar cd:n:"
+
+#: ../picard/ui/ui_cdlookup.py:62
+#: ../picard/ui/ui_puidsubmit.py:53
+msgid "OK"
+msgstr "Ok"
+
+#: ../picard/ui/ui_cdlookup.py:63
+msgid "    Lookup manually    "
+msgstr "    Slå upp &manuellt    "
+
+#: ../picard/ui/ui_cdlookup.py:64
+#: ../picard/ui/ui_puidsubmit.py:54
+msgid "Cancel"
+msgstr "Avbryt"
+
+#: ../picard/ui/ui_passworddialog.py:78
+msgid "Authentication required"
+msgstr ""
+
+#: ../picard/ui/ui_passworddialog.py:79
+#: ../picard/ui/ui_options_general.py:113
+#: ../picard/ui/ui_options_proxy.py:83
+msgid "Username:"
+msgstr "Användarnamn:"
+
+#: ../picard/ui/ui_passworddialog.py:80
+#: ../picard/ui/ui_options_general.py:112
+#: ../picard/ui/ui_options_proxy.py:82
+msgid "Password:"
+msgstr "Lösenord:"
+
+#: ../picard/ui/ui_passworddialog.py:81
+msgid "Save username and password"
+msgstr ""
+
 #: ../picard/ui/ui_edittagdialog.py:44
 msgid "Edit Tag"
 msgstr "Redigera tagg"
 
-#: ../picard/ui/ui_options_proxy.py:81
-msgid "Web Proxy"
-msgstr "Webbproxy"
+#: ../picard/ui/ui_metadata.py:121
+msgid "Lookup"
+msgstr "Slå upp"
 
-#: ../picard/ui/ui_options_proxy.py:84 ../picard/ui/ui_options_general.py:109
-msgid "Port:"
-msgstr "Port:"
+#: ../picard/ui/ui_metadata.py:122
+msgid "Title:"
+msgstr "Titel:"
 
-#: ../picard/ui/ui_options_proxy.py:85 ../picard/ui/ui_options_general.py:110
-msgid "Server address:"
-msgstr "Serveradress:"
+#: ../picard/ui/ui_metadata.py:123
+msgid "Date:"
+msgstr "Datum:"
 
-#: ../picard/ui/ui_tagsfromfilenames.py:56
-msgid "Convert File Names to Tags"
-msgstr "Konvertera filnamn till taggar"
+#: ../picard/ui/ui_metadata.py:124
+msgid "Artist:"
+msgstr "Artist:"
 
-#: ../picard/ui/ui_tagsfromfilenames.py:57
-msgid "Replace underscores with spaces"
-msgstr "Ersätt understreck med mellanslag"
+#: ../picard/ui/ui_metadata.py:125
+msgid "Track:"
+msgstr "Spår:"
+
+#: ../picard/ui/ui_metadata.py:126
+msgid "0000-00-00; "
+msgstr "0000-00-00; "
+
+#: ../picard/ui/ui_metadata.py:128
+msgid "Album:"
+msgstr "Album:"
+
+#: ../picard/ui/ui_options.py:42
+msgid "Options"
+msgstr "Alternativ"
+
+#: ../picard/ui/ui_options_cdlookup.py:48
+msgid "CD-ROM device to use for lookups:"
+msgstr "Cd-romenhet för uppslagningar:"
+
+#: ../picard/ui/ui_options_cdlookup_win32.py:57
+msgid "Default CD-ROM drive to use for lookups:"
+msgstr "Standardenhet för uppslagning av cd:"
+
+#: ../picard/ui/ui_options_cover.py:56
+msgid "Location"
+msgstr "Plats"
+
+#: ../picard/ui/ui_options_cover.py:57
+msgid "Embed cover images into tags"
+msgstr "Bädda in omslagsbilder i taggar"
+
+#: ../picard/ui/ui_options_cover.py:58
+msgid "Save cover images as separate files"
+msgstr "Spara omslagsbilder som separata filer"
+
+#: ../picard/ui/ui_options_cover.py:59
+msgid "Overwrite the file if it already exists"
+msgstr "Skriv över filen om den redan existerar"
+
+#: ../picard/ui/util.py:31
+msgid "&Ok"
+msgstr "&Ok"
+
+#: ../picard/ui/util.py:32
+msgid "&Cancel"
+msgstr "&Avbryt"
+
+#: ../picard/ui/ui_puidsubmit.py:52
+msgid "Submit PUIDs"
+msgstr "Skicka in PUID"
+
+#: ../picard/ui/ui_options_folksonomy.py:114
+#: ../picard/ui/options/folksonomy.py:29
+msgid "Folksonomy Tags"
+msgstr ""
+
+#: ../picard/ui/ui_options_folksonomy.py:115
+msgid "Ignore tags:"
+msgstr "Ignorera taggar:"
+
+#: ../picard/ui/ui_options_folksonomy.py:116
+msgid "Minimal tag usage:"
+msgstr ""
+
+#: ../picard/ui/ui_options_folksonomy.py:117
+#: ../picard/ui/ui_options_matching.py:107
+#: ../picard/ui/ui_options_matching.py:108
+#: ../picard/ui/ui_options_matching.py:109
+#: ../picard/ui/ui_options_matching.py:113
+msgid " %"
+msgstr " %"
+
+#: ../picard/ui/ui_options_folksonomy.py:118
+msgid "Maximum number of tags:"
+msgstr "Max antal taggar"
+
+#: ../picard/ui/ui_options_folksonomy.py:119
+msgid "Join multiple tags with:"
+msgstr ""
+
+#: ../picard/ui/ui_options_folksonomy.py:120
+msgid " / "
+msgstr " / "
+
+#: ../picard/ui/ui_options_folksonomy.py:121
+msgid ", "
+msgstr ", "
+
+#: ../picard/ui/ui_options_interface.py:50
+msgid "Miscellaneous"
+msgstr "Blandat"
+
+#: ../picard/ui/ui_options_interface.py:51
+msgid "Show text labels under icons"
+msgstr "Visa textetiketter under ikoner"
+
+#: ../picard/ui/ui_options_interface.py:52
+msgid "Allow selection of multiple directories"
+msgstr "Tillåt markering av flera kataloger"
+
+#: ../picard/ui/ui_options_interface.py:53
+msgid "Use advanced query syntax"
+msgstr ""
+
+#: ../picard/ui/ui_options_interface.py:54
+#, fuzzy
+msgid "User interface language:"
+msgstr "Användargränssnitt"
+
+#: ../picard/ui/ui_options_naming.py:165
+msgid "Rename Files"
+msgstr "Byt namn på filer"
+
+#: ../picard/ui/ui_options_naming.py:166
+msgid "Replace Windows-incompatible characters"
+msgstr "Ersätt tecken som inte är kompatibla med Windows"
+
+#: ../picard/ui/ui_options_naming.py:167
+msgid "Replace non-ASCII characters"
+msgstr "Ersätt tecken som inte är ASCII"
+
+#: ../picard/ui/ui_options_naming.py:168
+#: ../picard/ui/ui_options_naming.py:169
+#: ../picard/ui/ui_options_metadata.py:109
+#: ../picard/ui/ui_options_metadata.py:110
+msgid "Default"
+msgstr "Standard"
+
+#: ../picard/ui/ui_options_naming.py:170
+#: ../picard/ui/options/naming.py:90
+msgid "Multiple artist file naming format:"
+msgstr "Format för filnamngivning med flera artister:"
+
+#: ../picard/ui/ui_options_naming.py:171
+#: ../picard/ui/options/naming.py:86
+msgid "File naming format:"
+msgstr "Format för filnamngivning:"
+
+#: ../picard/ui/ui_options_naming.py:172
+msgid "Move Files"
+msgstr "Flytta filer"
+
+#: ../picard/ui/ui_options_naming.py:173
+msgid "Move tagged files to this directory:"
+msgstr "Flytta taggade filer till denna katalog:"
+
+#: ../picard/ui/ui_options_naming.py:174
+msgid "Browse..."
+msgstr "Bläddra..."
+
+#: ../picard/ui/ui_options_naming.py:175
+msgid "Move additional files:"
+msgstr "Flytta ytterligare filer:"
+
+#: ../picard/ui/ui_options_naming.py:176
+msgid "Delete empty directories"
+msgstr "Ta bort tomma kataloger"
+
+#: ../picard/ui/ui_options_naming.py:177
+msgid "Example"
+msgstr "Exempel"
+
+#: ../picard/ui/ui_options_naming.py:178
+msgid "File name:"
+msgstr "Filnamn:"
+
+#: ../picard/ui/ui_options_naming.py:179
+msgid "Multiple artist file name:"
+msgstr "Filnamn med flera artister:"
 
-#: ../picard/ui/ui_tagsfromfilenames.py:58
 #: ../picard/ui/ui_options_naming.py:180
+#: ../picard/ui/ui_tagsfromfilenames.py:58
 msgid "&Preview"
 msgstr "&Förhandsgranska"
 
@@ -462,11 +2046,22 @@ msgstr "&Förhandsgranska"
 msgid "MusicBrainz Server"
 msgstr "MusicBrainz-server"
 
+#: ../picard/ui/ui_options_general.py:109
+#: ../picard/ui/ui_options_proxy.py:84
+msgid "Port:"
+msgstr "Port:"
+
+#: ../picard/ui/ui_options_general.py:110
+#: ../picard/ui/ui_options_proxy.py:85
+msgid "Server address:"
+msgstr "Serveradress:"
+
 #: ../picard/ui/ui_options_general.py:111
 msgid "Account Information"
 msgstr "Kontoinformation"
 
 #: ../picard/ui/ui_options_general.py:114
+#: ../picard/ui/options/general.py:29
 msgid "General"
 msgstr "Allmänt"
 
@@ -474,34 +2069,6 @@ msgstr "Allmänt"
 msgid "Automatically scan all new files"
 msgstr "Skanna automatiskt alla nya filer"
 
-#: ../picard/ui/ui_options_interface.py:46
-msgid "Miscellaneous"
-msgstr "Blandat"
-
-#: ../picard/ui/ui_options_interface.py:47
-msgid "Show text labels under icons"
-msgstr "Visa textetiketter under ikoner"
-
-#: ../picard/ui/ui_options_interface.py:48
-msgid "Allow selection of multiple directories"
-msgstr "Tillåt markering av flera kataloger"
-
-#: ../picard/ui/ui_options_interface.py:49
-msgid "Use advanced query syntax"
-msgstr ""
-
-#: ../picard/ui/itemviews.py:327
-msgid "&Releases"
-msgstr "&Utgåvor"
-
-#: ../picard/ui/itemviews.py:353
-msgid "&Plugins"
-msgstr "&Insticksmoduler"
-
-#: ../picard/ui/itemviews.py:523
-msgid "Clusters"
-msgstr "Kluster"
-
 #: ../picard/ui/ui_options_matching.py:105
 msgid "Thresholds"
 msgstr "Tröskelvärden"
@@ -522,6 +2089,68 @@ msgstr "Minsta överensstämmelse för uppslagning av kluster:"
 msgid "Minimal similarity for PUID lookups:"
 msgstr "Minsta överensstämmelse för uppslagning av PUID:"
 
+#: ../picard/ui/ui_options_metadata.py:100
+#: ../picard/ui/options/metadata.py:31
+msgid "Metadata"
+msgstr "Metadata"
+
+#: ../picard/ui/ui_options_metadata.py:101
+msgid "Translate foreign artist names to English where possible"
+msgstr "Översätt icke-anglosaxiska artistnamn till engelska när det är möjligt"
+
+#: ../picard/ui/ui_options_metadata.py:102
+msgid "Use release relationships"
+msgstr "Använd samband via utgåva"
+
+#: ../picard/ui/ui_options_metadata.py:103
+msgid "Use track relationships"
+msgstr "Använd samband via spår"
+
+#: ../picard/ui/ui_options_metadata.py:104
+msgid "Use folksonomy tags as genre"
+msgstr ""
+
+#: ../picard/ui/ui_options_metadata.py:105
+#, fuzzy
+msgid "Preferred release country:"
+msgstr "Utgivningstyp"
+
+#: ../picard/ui/ui_options_metadata.py:106
+msgid "Custom Fields"
+msgstr "Anpassade fält"
+
+#: ../picard/ui/ui_options_metadata.py:107
+msgid "Various artists:"
+msgstr "Diverse artister:"
+
+#: ../picard/ui/ui_options_metadata.py:108
+msgid "Non-album tracks:"
+msgstr "Spår utan album:"
+
+#: ../picard/ui/ui_options_plugins.py:58
+#: ../picard/ui/options/plugins.py:30
+msgid "Plugins"
+msgstr "Insticksmoduler"
+
+#: ../picard/ui/ui_options_plugins.py:60
+#: ../picard/ui/options/plugins.py:79
+msgid "Author"
+msgstr "Upphovsman"
+
+#: ../picard/ui/ui_options_plugins.py:61
+#: ../picard/util/tags.py:36
+msgid "Version"
+msgstr "Version"
+
+#: ../picard/ui/ui_options_proxy.py:81
+#: ../picard/ui/options/proxy.py:28
+msgid "Web Proxy"
+msgstr "Webbproxy"
+
+#: ../picard/ui/ui_options_script.py:52
+msgid "Tagger Script"
+msgstr "Skript för taggning"
+
 #: ../picard/ui/ui_options_tags.py:105
 msgid "Common"
 msgstr "Allmänt"
@@ -574,340 +2203,28 @@ msgstr "APE"
 msgid "Remove APEv2 tags from MP3 files"
 msgstr "Ta bort APEv2-taggar från MP3-filer"
 
-#: ../picard/ui/ui_options_cdlookup_win32.py:56 ../picard/ui/ui_cdlookup.py:60
-#: ../picard/ui/ui_options_cdlookup.py:47
-msgid "CD Lookup"
-msgstr "Uppslagning av cd"
+#: ../picard/ui/ui_tagsfromfilenames.py:56
+msgid "Convert File Names to Tags"
+msgstr "Konvertera filnamn till taggar"
 
-#: ../picard/ui/ui_options_cdlookup_win32.py:57
-msgid "Default CD-ROM drive to use for lookups:"
-msgstr "Standardenhet för uppslagning av cd:"
+#: ../picard/ui/ui_tagsfromfilenames.py:57
+msgid "Replace underscores with spaces"
+msgstr "Ersätt understreck med mellanslag"
 
-#: ../picard/ui/tageditor.py:65 ../picard/ui/ui_options_plugins.py:62
-#: ../picard/ui/multitageditor.py:37
-msgid "Details"
-msgstr "Detaljer"
-
-#: ../picard/ui/tageditor.py:70 ../picard/ui/tageditor.py:241
-#: ../picard/ui/multitageditor.py:42 ../picard/ui/multitageditor.py:197
-#, python-format
-msgid "%d file"
-msgid_plural "%d files"
-msgstr[0] "%d fil"
-msgstr[1] "%d filer"
-
-#: ../picard/ui/tageditor.py:124 ../picard/ui/multitageditor.py:95
-#, python-format
-msgid "(different across %d file)"
-msgid_plural "(different across %d files)"
-msgstr[0] "(skiljer sig över %d fil)"
-msgstr[1] "(skiljer sig över %d filer)"
-
-#: ../picard/ui/tageditor.py:127 ../picard/ui/multitageditor.py:98
-#, python-format
-msgid "(missing from %d file)"
-msgid_plural "(missing from %d files)"
-msgstr[0] "(saknas från %d fil)"
-msgstr[1] "(saknas från %d filer)"
-
-#: ../picard/ui/tageditor.py:210 ../picard/ui/multitageditor.py:166
-msgid "Filename:"
-msgstr "Filnamn:"
-
-#: ../picard/ui/tageditor.py:212 ../picard/ui/multitageditor.py:168
-msgid "Format:"
-msgstr "Format:"
-
-#: ../picard/ui/tageditor.py:221 ../picard/ui/multitageditor.py:177
-msgid "Size:"
-msgstr "Storlek:"
-
-#: ../picard/ui/tageditor.py:227 ../picard/ui/multitageditor.py:183
-msgid "Bitrate:"
-msgstr "Bitfrekvens:"
-
-#: ../picard/ui/tageditor.py:229 ../picard/ui/multitageditor.py:185
-msgid "Sample rate:"
-msgstr "Samplingsfrekvens:"
-
-#: ../picard/ui/tageditor.py:231 ../picard/ui/multitageditor.py:187
-msgid "Bits per sample:"
-msgstr "Bitar per sampling:"
-
-#: ../picard/ui/tageditor.py:234 ../picard/ui/multitageditor.py:190
-msgid "Mono"
-msgstr "Mono"
-
-#: ../picard/ui/tageditor.py:235 ../picard/ui/multitageditor.py:191
-msgid "Stereo"
-msgstr "Stereo"
-
-#: ../picard/ui/tageditor.py:237 ../picard/ui/multitageditor.py:193
-msgid "Channels:"
-msgstr "Kanaler:"
-
-#: ../picard/ui/ui_tageditor.py:115 ../picard/ui/ui_multitageditor.py:55
-#: ../picard/ui/ui_options_plugins.py:59 ../picard/ui/options/plugins.py:76
-msgid "Name"
-msgstr "Namn"
-
-#: ../picard/ui/ui_tageditor.py:116 ../picard/ui/ui_multitageditor.py:56
-msgid "Value"
-msgstr "Värde"
-
-#: ../picard/ui/ui_tageditor.py:117 ../picard/ui/ui_multitageditor.py:57
-msgid "&Add..."
-msgstr "&Lägg till..."
-
-#: ../picard/ui/ui_tageditor.py:118
-msgid "&Edit..."
-msgstr "&Redigera..."
-
-#: ../picard/ui/ui_tageditor.py:119
-msgid "&Delete"
-msgstr "&Ta bort"
-
-#: ../picard/ui/ui_tageditor.py:120
-msgid "&Metadata"
-msgstr "&Metadata"
-
-#: ../picard/ui/ui_tageditor.py:121
-msgid "A&rtwork"
-msgstr "&Grafik"
-
-#: ../picard/ui/ui_tageditor.py:122
-msgid "&Info"
-msgstr "&Information"
-
-#: ../picard/ui/coverartbox.py:47
-msgid "Cover Art"
-msgstr "Omslagsgrafik"
-
-#: ../picard/ui/coverartbox.py:95
-msgid "Buy the album on Amazon"
-msgstr "Köp albumet på Amazon"
-
-#: ../picard/ui/ui_puidsubmit.py:52
-msgid "Submit PUIDs"
-msgstr "Skicka in PUID"
-
-#: ../picard/ui/ui_puidsubmit.py:53 ../picard/ui/ui_cdlookup.py:62
-msgid "OK"
-msgstr "Ok"
-
-#: ../picard/ui/ui_puidsubmit.py:54 ../picard/ui/ui_cdlookup.py:64
-msgid "Cancel"
-msgstr "Avbryt"
-
-#: ../picard/ui/puidsubmit.py:31 ../picard/ui/options/plugins.py:80
-msgid "File"
-msgstr "Fil"
-
-#: ../picard/ui/puidsubmit.py:31
-msgid "PUID"
-msgstr "PUID"
-
-#: ../picard/ui/puidsubmit.py:31
-msgid "Release"
-msgstr "Utgåva"
-
-#: ../picard/ui/puidsubmit.py:31
-msgid "Release ID"
-msgstr "Utgåve-id"
-
-#: ../picard/ui/filebrowser.py:41
-#, fuzzy
-msgid "&Move Tagged Files Here"
-msgstr "&Flytta filer"
-
-#: ../picard/ui/filebrowser.py:44
-msgid "Show &Hidden Files"
-msgstr ""
-
-#: ../picard/ui/ui_cdlookup.py:61
-msgid "The following releases on MusicBrainz match the CD:"
-msgstr "Följande utgåvor på MusicBrainz matchar cd:n:"
-
-#: ../picard/ui/ui_cdlookup.py:63
-msgid "    Lookup manually    "
-msgstr "    Slå upp &manuellt    "
-
-#: ../picard/ui/ui_options.py:42
-msgid "Options"
-msgstr "Alternativ"
-
-#: ../picard/ui/tagsfromfilenames.py:52 ../picard/ui/tagsfromfilenames.py:96
-msgid "File Name"
-msgstr "Filnamn"
-
-#: ../picard/ui/ui_options_cover.py:56
-msgid "Location"
-msgstr "Plats"
-
-#: ../picard/ui/ui_options_cover.py:57
-msgid "Embed cover images into tags"
-msgstr "Bädda in omslagsbilder i taggar"
-
-#: ../picard/ui/ui_options_cover.py:58
-msgid "Save cover images as separate files"
-msgstr "Spara omslagsbilder som separata filer"
-
-#: ../picard/ui/ui_options_cover.py:59
-msgid "Overwrite the file if it already exists"
-msgstr "Skriv över filen om den redan existerar"
-
-#: ../picard/ui/ui_options_metadata.py:100
-msgid "Metadata"
-msgstr "Metadata"
-
-#: ../picard/ui/ui_options_metadata.py:101
-msgid "Translate foreign artist names to English where possible"
-msgstr "Översätt icke-anglosaxiska artistnamn till engelska när det är möjligt"
-
-#: ../picard/ui/ui_options_metadata.py:102
-msgid "Use release relationships"
-msgstr "Använd samband via utgåva"
-
-#: ../picard/ui/ui_options_metadata.py:103
-msgid "Use track relationships"
-msgstr "Använd samband via spår"
-
-#: ../picard/ui/ui_options_metadata.py:104
-msgid "Use folksonomy tags as genre"
-msgstr ""
-
-#: ../picard/ui/ui_options_metadata.py:105
-#, fuzzy
-msgid "Preferred release country:"
-msgstr "Utgivningsland"
-
-#: ../picard/ui/ui_options_metadata.py:106
-msgid "Custom Fields"
-msgstr "Anpassade fält"
-
-#: ../picard/ui/ui_options_metadata.py:107
-msgid "Various artists:"
-msgstr "Diverse artister:"
-
-#: ../picard/ui/ui_options_metadata.py:108
-msgid "Non-album tracks:"
-msgstr "Spår utan album:"
-
-#: ../picard/ui/ui_options_metadata.py:109
-#: ../picard/ui/ui_options_metadata.py:110
-#: ../picard/ui/ui_options_naming.py:168 ../picard/ui/ui_options_naming.py:169
-msgid "Default"
-msgstr "Standard"
-
-#: ../picard/ui/ui_multitageditor.py:58
-msgid "Delete"
-msgstr "Ta bort"
-
-#: ../picard/ui/logview.py:29
-msgid "Log"
-msgstr "Logg"
-
-#: ../picard/ui/ui_options_plugins.py:58
-msgid "Plugins"
-msgstr "Insticksmoduler"
-
-#: ../picard/ui/ui_options_plugins.py:60 ../picard/ui/options/plugins.py:79
-msgid "Author"
-msgstr "Upphovsman"
-
-#: ../picard/ui/ui_options_plugins.py:61
-msgid "Version"
-msgstr "Version"
-
-#: ../picard/ui/ui_options_naming.py:165
-msgid "Rename Files"
-msgstr "Byt namn på filer"
-
-#: ../picard/ui/ui_options_naming.py:166
-msgid "Replace Windows-incompatible characters"
-msgstr "Ersätt tecken som inte är kompatibla med Windows"
-
-#: ../picard/ui/ui_options_naming.py:167
-msgid "Replace non-ASCII characters"
-msgstr "Ersätt tecken som inte är ASCII"
-
-#: ../picard/ui/ui_options_naming.py:170 ../picard/ui/options/naming.py:90
-msgid "Multiple artist file naming format:"
-msgstr "Format för filnamngivning med flera artister:"
-
-#: ../picard/ui/ui_options_naming.py:171 ../picard/ui/options/naming.py:86
-msgid "File naming format:"
-msgstr "Format för filnamngivning:"
-
-#: ../picard/ui/ui_options_naming.py:172
-msgid "Move Files"
-msgstr "Flytta filer"
-
-#: ../picard/ui/ui_options_naming.py:173
-msgid "Move tagged files to this directory:"
-msgstr "Flytta taggade filer till denna katalog:"
-
-#: ../picard/ui/ui_options_naming.py:174
-msgid "Browse..."
-msgstr "Bläddra..."
-
-#: ../picard/ui/ui_options_naming.py:175
-msgid "Move additional files:"
-msgstr "Flytta ytterligare filer:"
-
-#: ../picard/ui/ui_options_naming.py:176
-msgid "Delete empty directories"
-msgstr "Ta bort tomma kataloger"
-
-#: ../picard/ui/ui_options_naming.py:177
-msgid "Example"
-msgstr "Exempel"
-
-#: ../picard/ui/ui_options_naming.py:178
-msgid "File name:"
-msgstr "Filnamn:"
-
-#: ../picard/ui/ui_options_naming.py:179
-msgid "Multiple artist file name:"
-msgstr "Filnamn med flera artister:"
-
-#: ../picard/ui/ui_options_cdlookup.py:48
-msgid "CD-ROM device to use for lookups:"
-msgstr "Cd-romenhet för uppslagningar:"
-
-#: ../picard/ui/options/scripting.py:84 ../picard/ui/options/naming.py:86
-#: ../picard/ui/options/naming.py:90 ../picard/ui/options/naming.py:93
-#: ../picard/ui/options/naming.py:95
-msgid "Script Error"
-msgstr "Skriptfel"
+#: ../picard/ui/options/about.py:29
+msgid "About"
+msgstr "Om"
 
 #. Replace this with your name to have it appear in the "About" dialog.
 #: ../picard/ui/options/about.py:48
 msgid "translator-credits"
 msgstr ""
 "Launchpad Contributions:\n"
-"  Daniel Nylander <https://launchpad.net/~yeager>\n"
-"\n"
-"Launchpad Contributions:\n"
-"  Daniel Nylander https://launchpad.net/~yeager\n"
-"\n"
-"Launchpad Contributions:\n"
 "  Daniel Nylander https://launchpad.net/~yeager\n"
 "  John Gustafsson https://launchpad.net/~jamminjohn\n"
 "  Zirro https://launchpad.net/~magne-andersson\n"
-"\n"
-"Launchpad Contributions:\n"
-"  Daniel Nylander https://launchpad.net/~yeager\n"
-"  John Gustafsson https://launchpad.net/~jamminjohn\n"
 "  Lukáš Lalinský https://launchpad.net/~luks\n"
-"  Zirro https://launchpad.net/~magne-andersson\n"
-"\n"
-"Launchpad Contributions:\n"
-"  Björn_Nilsson https://launchpad.net/~bjorn-bjornbjorn\n"
-"  Daniel Nylander https://launchpad.net/~yeager\n"
-"  John Gustafsson https://launchpad.net/~jamminjohn\n"
-"  Lukáš Lalinský https://launchpad.net/~luks\n"
-"  Zirro https://launchpad.net/~magne-andersson"
+"  Björn_Nilsson https://launchpad.net/~bjorn-bjornbjorn"
 
 #. Replace LANG with language you are translatig to.
 #: ../picard/ui/options/about.py:51
@@ -918,31 +2235,62 @@ msgstr "<br/>Översatt till svenska av %s"
 #: ../picard/ui/options/about.py:55
 #, fuzzy, python-format
 msgid ""
-"<p align=\"center\"><span style=\"font-size:15px;font-weight:bold;"
-"\">MusicBrainz Picard</span><br/>\n"
+"<p align=\"center\"><span style=\"font-size:15px;font-weight:bold;\">MusicBrainz Picard</span><br/>\n"
 "Version %(version)s</p>\n"
 "<p align=\"center\"><strong>Supported formats</strong><br/>%(formats)s</p>\n"
 "<p align=\"center\"><strong>Please donate</strong><br/>\n"
-"Thank you for using Picard. Picard relies on the MusicBrainz database, which "
-"is operated by the MetaBrainz Foundation with the help of thousands of "
-"volunteers. If you like this application please consider donating to the "
-"MetaBrainz Foundation to keep the service running.</p>\n"
-"<p align=\"center\"><a href=\"http://metabrainz.org/donate/index.html"
-"\">Donate now!</a></p>\n"
+"Thank you for using Picard. Picard relies on the MusicBrainz database, which is operated by the MetaBrainz Foundation with the help of thousands of volunteers. If you like this application please consider donating to the MetaBrainz Foundation to keep the service running.</p>\n"
+"<p align=\"center\"><a href=\"http://metabrainz.org/donate/index.html\">Donate now!</a></p>\n"
 "<p align=\"center\"><strong>Credits</strong><br/>\n"
-"<small>Copyright © 2004-2008 Robert Kaye, Lukáš Lalinský and others%"
-"(translator-credits)s</small></p>\n"
-"<p align=\"center\"><a href=\"http://musicbrainz.org/doc/PicardTagger"
-"\">http://musicbrainz.org/doc/PicardTagger</a></p>\n"
+"<small>Copyright © 2004-2008 Robert Kaye, Lukáš Lalinský and others%(translator-credits)s</small></p>\n"
+"<p align=\"center\"><a href=\"http://musicbrainz.org/doc/PicardTagger\">http://musicbrainz.org/doc/PicardTagger</a></p>\n"
 msgstr ""
-"<p align=\"center\"><span style=\"font-size:15px;font-weight:bold;"
-"\">MusicBrainz Picard</span><br/>\n"
+"<p align=\"center\"><span style=\"font-size:15px;font-weight:bold;\">MusicBrainz Picard</span><br/>\n"
 "Version %(version)s</p>\n"
 "<p align=\"center\"><strong>Format som stöds:</strong> %(formats)s</p>\n"
-"<p align=\"center\"><small>Upphovsrätt © 2004-2007 Robert Kaye, Lukáš "
-"Lalinský med flera%(translator-credits)s</small></p>\n"
-"<p align=\"center\"><a href=\"http://musicbrainz.org/doc/PicardTagger"
-"\">http://musicbrainz.org/doc/PicardTagger</a></p>\n"
+"<p align=\"center\"><small>Upphovsrätt © 2004-2007 Robert Kaye, Lukáš Lalinský med flera%(translator-credits)s</small></p>\n"
+"<p align=\"center\"><a href=\"http://musicbrainz.org/doc/PicardTagger\">http://musicbrainz.org/doc/PicardTagger</a></p>\n"
+
+#: ../picard/ui/options/advanced.py:26
+msgid "Advanced"
+msgstr "Avancerat"
+
+#: ../picard/ui/options/interface.py:31
+msgid "User Interface"
+msgstr "Användargränssnitt"
+
+#: ../picard/ui/options/interface.py:47
+msgid "System default"
+msgstr "Systemets standard"
+
+#: ../picard/ui/options/interface.py:71
+#, fuzzy
+msgid "Language changed"
+msgstr "Språk"
+
+#: ../picard/ui/options/interface.py:71
+msgid "You have changed the interface language. You have to restart Picard in order for the change to take effect."
+msgstr ""
+
+#: ../picard/ui/options/matching.py:29
+msgid "Matching"
+msgstr "Matchning"
+
+#: ../picard/ui/options/metadata.py:52
+msgid "None"
+msgstr ""
+
+#: ../picard/ui/options/naming.py:33
+msgid "File Naming"
+msgstr "Filnamngivning"
+
+#: ../picard/ui/options/naming.py:86
+#: ../picard/ui/options/naming.py:90
+#: ../picard/ui/options/naming.py:93
+#: ../picard/ui/options/naming.py:95
+#: ../picard/ui/options/scripting.py:84
+msgid "Script Error"
+msgstr "Skriptfel"
 
 #: ../picard/ui/options/naming.py:93
 msgid "The file naming format must not be empty."
@@ -961,6 +2309,235 @@ msgstr ""
 msgid "The location to move files to must not be empty."
 msgstr ""
 
+#: ../picard/ui/options/scripting.py:63
+msgid "Scripting"
+msgstr "Skriptning"
+
+#: ../picard/ui/options/tags.py:29
+msgid "Tags"
+msgstr "Taggar"
+
+#: ../picard/util/tags.py:24
+msgid "Date"
+msgstr "Datum"
+
+#: ../picard/util/tags.py:25
+msgid "Album Artist"
+msgstr "Albumartist"
+
+#: ../picard/util/tags.py:26
+msgid "Track Number"
+msgstr "Spårnummer"
+
+#: ../picard/util/tags.py:27
+msgid "Total Tracks"
+msgstr "Totalt antal spår"
+
+#: ../picard/util/tags.py:28
+msgid "Disc Number"
+msgstr "Skiva nummer"
+
+#: ../picard/util/tags.py:29
+msgid "Total Discs"
+msgstr "Totalt antal skivor"
+
+#: ../picard/util/tags.py:30
+msgid "Album Artist Sort Order"
+msgstr "Albumartist sorteringsordnad"
+
+#: ../picard/util/tags.py:31
+msgid "Artist Sort Order"
+msgstr "Artist sorteringsordnad"
+
+#: ../picard/util/tags.py:32
+msgid "Title Sort Order"
+msgstr "Titel sorteringsordnad"
+
+#: ../picard/util/tags.py:33
+msgid "Album Sort Order"
+msgstr "Album sorteringsordnad"
+
+#: ../picard/util/tags.py:34
+msgid "ASIN"
+msgstr "ASIN"
+
+#: ../picard/util/tags.py:35
+msgid "Grouping"
+msgstr "Gruppering"
+
+#: ../picard/util/tags.py:37
+msgid "ISRC"
+msgstr "ISRC"
+
+#: ../picard/util/tags.py:38
+msgid "Mood"
+msgstr "Stämning"
+
+#: ../picard/util/tags.py:39
+msgid "BPM"
+msgstr "BPM"
+
+#: ../picard/util/tags.py:40
+msgid "Copyright"
+msgstr "Upphovsrätt"
+
+#: ../picard/util/tags.py:41
+msgid "Composer"
+msgstr "Kompositör"
+
+#: ../picard/util/tags.py:42
+msgid "Conductor"
+msgstr "Dirigent"
+
+#: ../picard/util/tags.py:43
+msgid "Lyricist"
+msgstr "Textförfattare"
+
+#: ../picard/util/tags.py:44
+msgid "Arranger"
+msgstr "Arrangör"
+
+#: ../picard/util/tags.py:45
+msgid "Producer"
+msgstr "Producent"
+
+#: ../picard/util/tags.py:46
+msgid "Engineer"
+msgstr "Ljudtekniker"
+
+#: ../picard/util/tags.py:47
+msgid "Subtitle"
+msgstr "Undertitel"
+
+#: ../picard/util/tags.py:48
+msgid "Disc Subtitle"
+msgstr "Undertitel på skiva"
+
+#: ../picard/util/tags.py:49
+msgid "Remixer"
+msgstr "Remixer"
+
+#: ../picard/util/tags.py:50
+msgid "MusicBrainz Track Id"
+msgstr "MusicBrainz spår-id"
+
+#: ../picard/util/tags.py:51
+msgid "MusicBrainz Release Id"
+msgstr "MusicBrainz utgåve-id"
+
+#: ../picard/util/tags.py:52
+msgid "MusicBrainz Artist Id"
+msgstr "MusicBrainz artist-id"
+
+#: ../picard/util/tags.py:53
+msgid "MusicBrainz Release Artist Id"
+msgstr "MusicBrainz utgivningsartist-id"
+
+#: ../picard/util/tags.py:54
+msgid "MusicBrainz TRM Id"
+msgstr "MusicBrainz TRM-id"
+
+#: ../picard/util/tags.py:55
+#, fuzzy
+msgid "MusicBrainz Disc Id"
+msgstr "MusicBrainz artist-id"
+
+#: ../picard/util/tags.py:56
+#, fuzzy
+msgid "MusicBrainz Sort Name"
+msgstr "MusicBrainz-server"
+
+#: ../picard/util/tags.py:57
+msgid "MusicIP PUID"
+msgstr "MusicIP PUID"
+
+#: ../picard/util/tags.py:58
+msgid "MusicIP Fingerprint"
+msgstr ""
+
+#: ../picard/util/tags.py:59
+msgid "Disc Id"
+msgstr ""
+
+#: ../picard/util/tags.py:60
+msgid "Website"
+msgstr "Webbplats"
+
+#: ../picard/util/tags.py:61
+msgid "Compilation"
+msgstr "Samling"
+
+#: ../picard/util/tags.py:62
+msgid "Comment"
+msgstr "Kommentar"
+
+#: ../picard/util/tags.py:63
+msgid "Genre"
+msgstr "Genre"
+
+#: ../picard/util/tags.py:64
+msgid "Encoded By"
+msgstr "Kodad av"
+
+#: ../picard/util/tags.py:65
+msgid "Performer"
+msgstr "Uppträdande"
+
+#: ../picard/util/tags.py:66
+msgid "Release Type"
+msgstr "Utgivningstyp"
+
+#: ../picard/util/tags.py:67
+msgid "Release Status"
+msgstr "Utgivningsstatus"
+
+#: ../picard/util/tags.py:68
+#, fuzzy
+msgid "Release Country"
+msgstr "Utgivningstyp"
+
+#: ../picard/util/tags.py:69
+msgid "Record Label"
+msgstr "Skivbolag"
+
+#: ../picard/util/tags.py:70
+msgid "Barcode"
+msgstr "Streckkod"
+
+#: ../picard/util/tags.py:71
+msgid "Catalog Number"
+msgstr "Katalognummer"
+
+#: ../picard/util/tags.py:72
+#, fuzzy
+msgid "Format"
+msgstr "Format:"
+
+#: ../picard/util/tags.py:73
+msgid "DJ-Mixer"
+msgstr "DJ-mixer"
+
+#: ../picard/util/tags.py:74
+msgid "Media"
+msgstr "Media"
+
+#: ../picard/util/tags.py:75
+msgid "Lyrics"
+msgstr "Låttext"
+
+#: ../picard/util/tags.py:76
+msgid "Mixer"
+msgstr "Mixer"
+
+#: ../picard/util/tags.py:77
+msgid "Language"
+msgstr "Språk"
+
+#: ../picard/util/tags.py:78
+#, fuzzy
+msgid "Script"
+msgstr "Skriptning"
+
 #: ../picard/util/webbrowser2.py:84
 msgid "Web Browser Error"
 msgstr "Fel med webbläsare"
@@ -976,398 +2553,101 @@ msgstr ""
 "\n"
 "%s"
 
-#~ msgid "No matching tracks for file %s"
-#~ msgstr "Inga matchande spår för fil %s"
-
-#~ msgid "File %s identified!"
-#~ msgstr "Fil %s identifierad!"
-
-#~ msgid "Looking up the PUID for file %s..."
-#~ msgstr "Slår upp PUID för fil %s..."
-
-#~ msgid "Looking up the metadata for file %s..."
-#~ msgstr "Slår upp metadata för fil %s..."
-
-#~ msgid "No matching releases for cluster %s"
-#~ msgstr "Inga matchande utgåvor för kluster %s"
-
-#~ msgid "Cluster %s identified!"
-#~ msgstr "Kluster %s identifierat!"
-
-#~ msgid "Looking up the metadata for cluster %s..."
-#~ msgstr "Slår upp metadata för kluster %s..."
-
-#~ msgid "M3U Playlist (*.m3u)"
-#~ msgstr "M3U-spellista (*.m3u)"
-
-#~ msgid "PLS Playlist (*.pls)"
-#~ msgstr "PLS-spellista (*.pls)"
-
-#~ msgid "XSPF Playlist (*.xspf)"
-#~ msgstr "XSPF-spellista (*.xspf)"
-
-#~ msgid "Submitting PUIDs..."
-#~ msgstr "Skickar in PUID..."
-
-#~ msgid "PUIDs submission failed: %s"
-#~ msgstr "Inrapportering av PUID misslyckades: %s"
-
-#~ msgid "PUIDs successfully submitted!"
-#~ msgstr "Inrapportering av PUID lyckades!"
-
 #~ msgid "New Version"
 #~ msgstr "Ny version"
-
 #~ msgid ""
 #~ "New version of Picard is available (%s). Would you like to download it "
 #~ "now?"
 #~ msgstr ""
 #~ "En ny version av Picard finns tillgänglig (%s). Vill du hämta den nu?"
+#~ msgid "Delete"
+#~ msgstr "Ta bort"
+#~ msgid "Maximal number of tags:"
+#~ msgstr "Max antal taggar"
 
-#~ msgid "Couldn't find PUID for file %s"
-#~ msgstr "Kunde inte hitta PUID för fil %s"
-
-#~ msgid "Looking up the fingerprint for file %s..."
-#~ msgstr "Slår upp fingeravtrycket för fil %s..."
-
-#~ msgid "Creating fingerprint for file %s..."
-#~ msgstr "Skapar fingeravtryck för fil %s..."
-
-#~ msgid "Length"
-#~ msgstr "Längd"
-
-#~ msgid "&Ok"
-#~ msgstr "&Ok"
-
-#~ msgid "&Cancel"
-#~ msgstr "&Avbryt"
-
-#~ msgid "About"
-#~ msgstr "Om"
-
-#~ msgid "Advanced"
-#~ msgstr "Avancerat"
-
-#~ msgid "Matching"
-#~ msgstr "Matchning"
-
-#~ msgid "File Naming"
-#~ msgstr "Filnamngivning"
-
-#~ msgid "Scripting"
-#~ msgstr "Skriptning"
-
-#~ msgid "Tags"
-#~ msgstr "Taggar"
-
-#~ msgid "User Interface"
-#~ msgstr "Användargränssnitt"
-
-#~ msgid "Date"
-#~ msgstr "Datum"
-
-#~ msgid "Album Artist"
-#~ msgstr "Albumartist"
-
-#~ msgid "Track Number"
-#~ msgstr "Spårnummer"
-
-#~ msgid "Total Tracks"
-#~ msgstr "Totalt antal spår"
-
-#~ msgid "Disc Number"
-#~ msgstr "Skiva nummer"
-
-#~ msgid "Total Discs"
-#~ msgstr "Totalt antal skivor"
-
-#~ msgid "Album Artist Sort Order"
-#~ msgstr "Albumartist sorteringsordnad"
-
-#~ msgid "Artist Sort Order"
-#~ msgstr "Artist sorteringsordnad"
-
-#~ msgid "Title Sort Order"
-#~ msgstr "Titel sorteringsordnad"
-
-#~ msgid "Album Sort Order"
-#~ msgstr "Album sorteringsordnad"
-
-#~ msgid "ASIN"
-#~ msgstr "ASIN"
-
-#~ msgid "Grouping"
-#~ msgstr "Gruppering"
-
-#~ msgid "ISRC"
-#~ msgstr "ISRC"
-
-#~ msgid "Mood"
-#~ msgstr "Stämning"
-
-#~ msgid "BPM"
-#~ msgstr "BPM"
-
-#~ msgid "Copyright"
-#~ msgstr "Upphovsrätt"
-
-#~ msgid "Composer"
-#~ msgstr "Kompositör"
-
-#~ msgid "Conductor"
-#~ msgstr "Dirigent"
-
-#~ msgid "Lyricist"
-#~ msgstr "Textförfattare"
-
-#~ msgid "Arranger"
-#~ msgstr "Arrangör"
-
-#~ msgid "Producer"
-#~ msgstr "Producent"
-
-#~ msgid "Engineer"
-#~ msgstr "Ljudtekniker"
-
-#~ msgid "Subtitle"
-#~ msgstr "Undertitel"
-
-#~ msgid "Disc Subtitle"
-#~ msgstr "Undertitel på skiva"
-
-#~ msgid "Remixer"
-#~ msgstr "Remixer"
-
-#~ msgid "MusicBrainz Track Id"
-#~ msgstr "MusicBrainz spår-id"
-
-#~ msgid "MusicBrainz Release Id"
-#~ msgstr "MusicBrainz utgåve-id"
-
-#~ msgid "MusicBrainz Artist Id"
-#~ msgstr "MusicBrainz artist-id"
-
-#~ msgid "MusicBrainz Release Artist Id"
-#~ msgstr "MusicBrainz utgivningsartist-id"
-
-#~ msgid "MusicBrainz TRM Id"
-#~ msgstr "MusicBrainz TRM-id"
-
-#~ msgid "MusicIP PUID"
-#~ msgstr "MusicIP PUID"
-
-#~ msgid "Website"
-#~ msgstr "Webbplats"
-
-#~ msgid "Compilation"
-#~ msgstr "Samling"
-
-#~ msgid "Comment"
-#~ msgstr "Kommentar"
-
-#~ msgid "Genre"
-#~ msgstr "Genre"
-
-#~ msgid "Encoded By"
-#~ msgstr "Kodad av"
-
-#~ msgid "Performer"
-#~ msgstr "Uppträdande"
-
-#~ msgid "Release Type"
-#~ msgstr "Utgivningstyp"
-
-#~ msgid "Release Status"
-#~ msgstr "Utgivningsstatus"
-
-#~ msgid "Record Label"
-#~ msgstr "Skivbolag"
-
-#~ msgid "Barcode"
-#~ msgstr "Streckkod"
-
-#~ msgid "Catalog Number"
-#~ msgstr "Katalognummer"
-
-#~ msgid "DJ-Mixer"
-#~ msgstr "DJ-mixer"
-
-#~ msgid "Media"
-#~ msgstr "Media"
-
-#~ msgid "Lyrics"
-#~ msgstr "Låttext"
-
-#~ msgid "Mixer"
-#~ msgstr "Mixer"
-
+#, fuzzy
+#~ msgid "Anal&yze"
+#~ msgstr "Analysera"
 #~ msgid "Ctrl+T"
 #~ msgstr "Ctrl+T"
 
-#~ msgid "Toolbar"
-#~ msgstr "Verktygsrad"
+#, fuzzy
+#~ msgid "Album artist:"
+#~ msgstr "Albumartist"
 
+#, fuzzy
+#~ msgid "A&dd Directory..."
+#~ msgstr "Lägg till &katalog...\tCtrl+D"
 #~ msgid "Are You Sure?"
 #~ msgstr "Är du säker?"
-
 #~ msgid "Add &Files...\tCtrl+O"
 #~ msgstr "Lägg till &filer...\tCtrl+O"
-
 #~ msgid "Add &Directory...\tCtrl+D"
 #~ msgstr "Lägg till &katalog...\tCtrl+D"
-
 #~ msgid "&Save Files\tCtrl+S"
 #~ msgstr "&Spara filer\tCtrl+S"
-
 #~ msgid "C&opy\tCtrl+C"
 #~ msgstr "K&opiera\tCtrl+C"
-
 #~ msgid "Help"
 #~ msgstr "Hjälp"
-
 #~ msgid "Preferences"
 #~ msgstr "Inställningar"
-
 #~ msgid "Time"
 #~ msgstr "Tid"
-
 #~ msgid "Albums"
 #~ msgstr "Album"
-
 #~ msgid "Buy"
 #~ msgstr "Köp"
-
 #~ msgid "Welcome to Picard!"
 #~ msgstr "Välkommen till Picard!"
-
 #~ msgid "Track Num"
 #~ msgstr "Spårnummer"
-
-#~ msgid "Colors"
-#~ msgstr "Färger"
-
 #~ msgid "Font color"
 #~ msgstr "Typsnittsfärg"
-
 #~ msgid "Directories"
 #~ msgstr "Kataloger"
-
 #~ msgid "Encodings"
 #~ msgstr "Kodningar"
-
 #~ msgid "all languages"
 #~ msgstr "alla språk"
-
 #~ msgid "percent similar."
 #~ msgstr "procent liknande."
-
-#~ msgid "Language"
-#~ msgstr "Språk"
-
-#~ msgid "System default"
-#~ msgstr "Systemets standard"
-
 #~ msgid "Number of tracks on the album"
 #~ msgstr "Altal spår på albumet"
-
 #~ msgid "Track name"
 #~ msgstr "Spårnamn"
-
 #~ msgid "File format (e.g. mp3, ogg, wav)"
 #~ msgstr "Filformat (t.ex. mp3, ogg, wav)"
-
 #~ msgid "Album type (album, single, EP, etc.)"
 #~ msgstr "Albumtyp (album, single, EP, etc.)"
-
 #~ msgid "Album Status (official, promo, etc.)"
 #~ msgstr "Albumstatus (officiell, promo, etc.)"
-
 #~ msgid "Use proxy server to access the Internet"
 #~ msgstr "Använd proxyserver för att komma åt Internet"
-
 #~ msgid "Proxy server to use"
 #~ msgstr "Proxyserver att använda"
-
 #~ msgid "Proxy port"
 #~ msgstr "Proxyport"
-
 #~ msgid "ID3v2.4 only"
 #~ msgstr "Endast ID3v2.4"
-
 #~ msgid "Artists"
 #~ msgstr "Artister"
 
+#, fuzzy
+#~ msgid "Auto Tag"
+#~ msgstr "Redigera tagg"
+
+#, fuzzy
+#~ msgid "Edit &Tags..."
+#~ msgstr "Redigera tagg"
 #~ msgid "Are you sure you want to exit the application?"
 #~ msgstr "Är du säker på att du vill avsluta programmet?"
-
 #~ msgid "Connection error"
 #~ msgstr "Anslutningsfel"
-
 #~ msgid "%d%% similar"
 #~ msgstr "%d%% liknande"
-
 #~ msgid "Please donate to MusicBrainz!"
 #~ msgstr "Donera till MusicBrainz!"
-
-#~ msgid "Later"
-#~ msgstr "Senare"
-
-#~ msgid "Czech"
-#~ msgstr "Tjeckiska"
-
-#~ msgid "German"
-#~ msgstr "Tyska"
-
-#~ msgid "English"
-#~ msgstr "Engelska"
-
-#~ msgid "English (UK)"
-#~ msgstr "Engelska (UK)"
-
-#~ msgid "Spanish"
-#~ msgstr "Spanska"
-
-#~ msgid "Finnish"
-#~ msgstr "Finska"
-
-#~ msgid "French"
-#~ msgstr "Franska"
-
-#~ msgid "Hungarian"
-#~ msgstr "Ungerska"
-
-#~ msgid "Icelandic"
-#~ msgstr "Isländska"
-
-#~ msgid "Italian"
-#~ msgstr "Italienska"
-
-#~ msgid "Korean"
-#~ msgstr "Koreanska"
-
-#~ msgid "Lithuanian"
-#~ msgstr "Litauiska"
-
-#~ msgid "Dutch"
-#~ msgstr "Nederländska"
-
-#~ msgid "Norwegian Bokmal"
-#~ msgstr "Norska (Bokmål)"
-
-#~ msgid "Portuguese"
-#~ msgstr "Portugisiska"
-
-#~ msgid "Romanian"
-#~ msgstr "Rumänska"
-
-#~ msgid "Russian"
-#~ msgstr "Ryska"
-
-#~ msgid "Slovak"
-#~ msgstr "Slovakiska"
-
-#~ msgid "Swedish"
-#~ msgstr "Svenska"
-
 #~ msgid "Listen to track"
 #~ msgstr "Lyssna på spår"
+
diff --git a/po/zh_CN.po b/po/zh_CN.po
index 8ec4eff2e..fcaf06f70 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -7,35 +7,1287 @@ msgid ""
 msgstr ""
 "Project-Id-Version: picard\n"
 "Report-Msgid-Bugs-To: http://bugs.musicbrainz.org/\n"
-"POT-Creation-Date: 2008-12-01 18:20+0100\n"
-"PO-Revision-Date: 2008-09-15 13:34+0000\n"
-"Last-Translator: rainofchaos <rainofchaos@gmail.com>\n"
+"POT-Creation-Date: 2009-01-25 12:23+0100\n"
+"PO-Revision-Date: 2009-01-25 13:40+0100\n"
+"Last-Translator: Philipp Wolfer <phw@rubyforge.org>\n"
 "Language-Team: Simplified Chinese <zh_CN@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
-"X-Launchpad-Export-Date: 2008-12-01 17:01+0000\n"
+"X-Launchpad-Export-Date: 2009-01-24 23:28+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
-#: ../picard/album.py:108 ../picard/cluster.py:248
+#: ../picard/album.py:108
+#: ../picard/cluster.py:248
 msgid "Unmatched Files"
 msgstr ""
 
-#: ../picard/album.py:269
+#: ../picard/album.py:281
 #, python-format
 msgid "[couldn't load album %s]"
 msgstr ""
 
-#: ../picard/album.py:305
+#: ../picard/album.py:317
 msgid "[loading album information]"
 msgstr ""
 
-#: ../picard/tagger.py:472
+#: ../picard/cluster.py:164
+#: ../picard/cluster.py:175
+#, fuzzy, python-format
+msgid "No matching releases for cluster %s"
+msgstr "%s 群无匹配专辑"
+
+#: ../picard/cluster.py:177
+#, fuzzy, python-format
+msgid "Cluster %s identified!"
+msgstr "%s 群已坚定"
+
+#: ../picard/cluster.py:182
+#, fuzzy, python-format
+msgid "Looking up the metadata for cluster %s..."
+msgstr "正在搜索 %s 群的元数据..."
+
+#: ../picard/const.py:40
+msgid "CD"
+msgstr ""
+
+#: ../picard/const.py:41
+msgid "DVD"
+msgstr ""
+
+#: ../picard/const.py:42
+msgid "SACD"
+msgstr ""
+
+#: ../picard/const.py:43
+msgid "LaserDisc"
+msgstr ""
+
+#: ../picard/const.py:44
+msgid "MiniDisc"
+msgstr ""
+
+#: ../picard/const.py:45
+msgid "Vinyl"
+msgstr ""
+
+#: ../picard/const.py:46
+msgid "Cassette"
+msgstr ""
+
+#: ../picard/const.py:47
+msgid "Cartridge (4/8-tracks)"
+msgstr ""
+
+#: ../picard/const.py:48
+msgid "Reel-to-Reel"
+msgstr ""
+
+#: ../picard/const.py:49
+msgid "DAT"
+msgstr ""
+
+#: ../picard/const.py:50
+msgid "Digital Media"
+msgstr ""
+
+#: ../picard/const.py:51
+msgid "Wax Cylinder"
+msgstr ""
+
+#: ../picard/const.py:52
+msgid "Piano Roll"
+msgstr ""
+
+#: ../picard/const.py:53
+msgid "Other"
+msgstr ""
+
+#: ../picard/const.py:58
+msgid "Bangladesh"
+msgstr ""
+
+#: ../picard/const.py:59
+msgid "Belgium"
+msgstr ""
+
+#: ../picard/const.py:60
+msgid "Burkina Faso"
+msgstr ""
+
+#: ../picard/const.py:61
+msgid "Bulgaria"
+msgstr ""
+
+#: ../picard/const.py:62
+msgid "Barbados"
+msgstr ""
+
+#: ../picard/const.py:63
+msgid "Wallis and Futuna Islands"
+msgstr ""
+
+#: ../picard/const.py:64
+msgid "Bermuda"
+msgstr ""
+
+#: ../picard/const.py:65
+msgid "Brunei Darussalam"
+msgstr ""
+
+#: ../picard/const.py:66
+msgid "Bolivia"
+msgstr ""
+
+#: ../picard/const.py:67
+msgid "Bahrain"
+msgstr ""
+
+#: ../picard/const.py:68
+msgid "Burundi"
+msgstr ""
+
+#: ../picard/const.py:69
+msgid "Benin"
+msgstr ""
+
+#: ../picard/const.py:70
+msgid "Bhutan"
+msgstr ""
+
+#: ../picard/const.py:71
+msgid "Jamaica"
+msgstr ""
+
+#: ../picard/const.py:72
+msgid "Bouvet Island"
+msgstr ""
+
+#: ../picard/const.py:73
+msgid "Botswana"
+msgstr ""
+
+#: ../picard/const.py:74
+msgid "Samoa"
+msgstr ""
+
+#: ../picard/const.py:75
+msgid "Brazil"
+msgstr ""
+
+#: ../picard/const.py:76
+msgid "Bahamas"
+msgstr ""
+
+#: ../picard/const.py:77
+msgid "Belarus"
+msgstr ""
+
+#: ../picard/const.py:78
+msgid "Belize"
+msgstr ""
+
+#: ../picard/const.py:79
+msgid "Russian Federation"
+msgstr ""
+
+#: ../picard/const.py:80
+msgid "Rwanda"
+msgstr ""
+
+#: ../picard/const.py:81
+msgid "Reunion"
+msgstr ""
+
+#: ../picard/const.py:82
+msgid "Turkmenistan"
+msgstr ""
+
+#: ../picard/const.py:83
+msgid "Tajikistan"
+msgstr ""
+
+#: ../picard/const.py:84
+msgid "Romania"
+msgstr ""
+
+#: ../picard/const.py:85
+#, fuzzy
+msgid "Tokela"
+msgstr "工具条"
+
+#: ../picard/const.py:86
+msgid "Guinea-Bissa"
+msgstr ""
+
+#: ../picard/const.py:87
+msgid "Guam"
+msgstr ""
+
+#: ../picard/const.py:88
+msgid "Guatemala"
+msgstr ""
+
+#: ../picard/const.py:89
+msgid "Greece"
+msgstr ""
+
+#: ../picard/const.py:90
+msgid "Equatorial Guinea"
+msgstr ""
+
+#: ../picard/const.py:91
+msgid "Guadeloupe"
+msgstr ""
+
+#: ../picard/const.py:92
+msgid "Japan"
+msgstr ""
+
+#: ../picard/const.py:93
+msgid "Guyana"
+msgstr ""
+
+#: ../picard/const.py:94
+msgid "French Guiana"
+msgstr ""
+
+#: ../picard/const.py:95
+msgid "Georgia"
+msgstr ""
+
+#: ../picard/const.py:96
+msgid "Grenada"
+msgstr ""
+
+#: ../picard/const.py:97
+msgid "United Kingdom"
+msgstr ""
+
+#: ../picard/const.py:98
+msgid "Gabon"
+msgstr ""
+
+#: ../picard/const.py:99
+msgid "El Salvador"
+msgstr ""
+
+#: ../picard/const.py:100
+msgid "Guinea"
+msgstr ""
+
+#: ../picard/const.py:101
+msgid "Gambia"
+msgstr ""
+
+#: ../picard/const.py:102
+msgid "Greenland"
+msgstr ""
+
+#: ../picard/const.py:103
+msgid "Gibraltar"
+msgstr ""
+
+#: ../picard/const.py:104
+msgid "Ghana"
+msgstr ""
+
+#: ../picard/const.py:105
+msgid "Oman"
+msgstr ""
+
+#: ../picard/const.py:106
+msgid "Tunisia"
+msgstr ""
+
+#: ../picard/const.py:107
+msgid "Jordan"
+msgstr ""
+
+#: ../picard/const.py:108
+msgid "Haiti"
+msgstr ""
+
+#: ../picard/const.py:109
+msgid "Hungary"
+msgstr ""
+
+#: ../picard/const.py:110
+msgid "Hong Kong"
+msgstr ""
+
+#: ../picard/const.py:111
+msgid "Honduras"
+msgstr ""
+
+#: ../picard/const.py:112
+msgid "Heard and Mc Donald Islands"
+msgstr ""
+
+#: ../picard/const.py:113
+msgid "Venezuela"
+msgstr ""
+
+#: ../picard/const.py:114
+msgid "Puerto Rico"
+msgstr ""
+
+#: ../picard/const.py:115
+msgid "Pala"
+msgstr ""
+
+#: ../picard/const.py:116
+#, fuzzy
+msgid "Portugal"
+msgstr "端口："
+
+#: ../picard/const.py:117
+msgid "Svalbard and Jan Mayen Islands"
+msgstr ""
+
+#: ../picard/const.py:118
+msgid "Paraguay"
+msgstr ""
+
+#: ../picard/const.py:119
+msgid "Iraq"
+msgstr ""
+
+#: ../picard/const.py:120
+msgid "Panama"
+msgstr ""
+
+#: ../picard/const.py:121
+msgid "French Polynesia"
+msgstr ""
+
+#: ../picard/const.py:122
+msgid "Papua New Guinea"
+msgstr ""
+
+#: ../picard/const.py:123
+msgid "Per"
+msgstr ""
+
+#: ../picard/const.py:124
+msgid "Pakistan"
+msgstr ""
+
+#: ../picard/const.py:125
+msgid "Philippines"
+msgstr ""
+
+#: ../picard/const.py:126
+msgid "Pitcairn"
+msgstr ""
+
+#: ../picard/const.py:127
+msgid "Poland"
+msgstr ""
+
+#: ../picard/const.py:128
+msgid "St. Pierre and Miquelon"
+msgstr ""
+
+#: ../picard/const.py:129
+msgid "Zambia"
+msgstr ""
+
+#: ../picard/const.py:130
+msgid "Western Sahara"
+msgstr ""
+
+#: ../picard/const.py:131
+msgid "Estonia"
+msgstr ""
+
+#: ../picard/const.py:132
+msgid "Egypt"
+msgstr ""
+
+#: ../picard/const.py:133
+msgid "South Africa"
+msgstr ""
+
+#: ../picard/const.py:134
+msgid "Ecuador"
+msgstr ""
+
+#: ../picard/const.py:135
+msgid "Italy"
+msgstr ""
+
+#: ../picard/const.py:136
+#, fuzzy
+msgid "Viet Nam"
+msgstr "文件名"
+
+#: ../picard/const.py:137
+msgid "Solomon Islands"
+msgstr ""
+
+#: ../picard/const.py:138
+msgid "Ethiopia"
+msgstr ""
+
+#: ../picard/const.py:139
+msgid "Somalia"
+msgstr ""
+
+#: ../picard/const.py:140
+msgid "Zimbabwe"
+msgstr ""
+
+#: ../picard/const.py:141
+msgid "Saudi Arabia"
+msgstr ""
+
+#: ../picard/const.py:142
+msgid "Spain"
+msgstr ""
+
+#: ../picard/const.py:143
+msgid "Eritrea"
+msgstr ""
+
+#: ../picard/const.py:144
+msgid "Moldova, Republic of"
+msgstr ""
+
+#: ../picard/const.py:145
+msgid "Madagascar"
+msgstr ""
+
+#: ../picard/const.py:146
+msgid "Morocco"
+msgstr ""
+
+#: ../picard/const.py:147
+#, fuzzy
+msgid "Monaco"
+msgstr "单体声"
+
+#: ../picard/const.py:148
+msgid "Uzbekistan"
+msgstr ""
+
+#: ../picard/const.py:149
+msgid "Myanmar"
+msgstr ""
+
+#: ../picard/const.py:150
+msgid "Mali"
+msgstr ""
+
+#: ../picard/const.py:151
+msgid "Maca"
+msgstr ""
+
+#: ../picard/const.py:152
+#, fuzzy
+msgid "Mongolia"
+msgstr "单体声"
+
+#: ../picard/const.py:153
+msgid "Marshall Islands"
+msgstr ""
+
+#: ../picard/const.py:154
+msgid "Macedonia, The Former Yugoslav Republic of"
+msgstr ""
+
+#: ../picard/const.py:155
+msgid "Mauritius"
+msgstr ""
+
+#: ../picard/const.py:156
+#, fuzzy
+msgid "Malta"
+msgstr "元数据"
+
+#: ../picard/const.py:157
+msgid "Malawi"
+msgstr ""
+
+#: ../picard/const.py:158
+msgid "Maldives"
+msgstr ""
+
+#: ../picard/const.py:159
+msgid "Martinique"
+msgstr ""
+
+#: ../picard/const.py:160
+msgid "Northern Mariana Islands"
+msgstr ""
+
+#: ../picard/const.py:161
+msgid "Montserrat"
+msgstr ""
+
+#: ../picard/const.py:162
+msgid "Mauritania"
+msgstr ""
+
+#: ../picard/const.py:163
+msgid "Uganda"
+msgstr ""
+
+#: ../picard/const.py:164
+msgid "Malaysia"
+msgstr ""
+
+#: ../picard/const.py:165
+msgid "Mexico"
+msgstr ""
+
+#: ../picard/const.py:166
+msgid "Israel"
+msgstr ""
+
+#: ../picard/const.py:167
+#, fuzzy
+msgid "France"
+msgstr "取消"
+
+#: ../picard/const.py:168
+msgid "British Indian Ocean Territory"
+msgstr ""
+
+#: ../picard/const.py:169
+msgid "St. Helena"
+msgstr ""
+
+#: ../picard/const.py:170
+msgid "Finland"
+msgstr ""
+
+#: ../picard/const.py:171
+msgid "Fiji"
+msgstr ""
+
+#: ../picard/const.py:172
+msgid "Falkland Islands (Malvinas)"
+msgstr ""
+
+#: ../picard/const.py:173
+msgid "Micronesia, Federated States of"
+msgstr ""
+
+#: ../picard/const.py:174
+msgid "Faroe Islands"
+msgstr ""
+
+#: ../picard/const.py:175
+msgid "Nicaragua"
+msgstr ""
+
+#: ../picard/const.py:176
+msgid "Netherlands"
+msgstr ""
+
+#: ../picard/const.py:177
+msgid "Norway"
+msgstr ""
+
+#: ../picard/const.py:178
+msgid "Namibia"
+msgstr ""
+
+#: ../picard/const.py:179
+msgid "Vanuat"
+msgstr ""
+
+#: ../picard/const.py:180
+msgid "New Caledonia"
+msgstr ""
+
+#: ../picard/const.py:181
+#, fuzzy
+msgid "Niger"
+msgstr "混音者"
+
+#: ../picard/const.py:182
+msgid "Norfolk Island"
+msgstr ""
+
+#: ../picard/const.py:183
+msgid "Nigeria"
+msgstr ""
+
+#: ../picard/const.py:184
+msgid "New Zealand"
+msgstr ""
+
+#: ../picard/const.py:185
+msgid "Zaire"
+msgstr ""
+
+#: ../picard/const.py:186
+msgid "Nepal"
+msgstr ""
+
+#: ../picard/const.py:187
+msgid "Naur"
+msgstr ""
+
+#: ../picard/const.py:188
+msgid "Niue"
+msgstr ""
+
+#: ../picard/const.py:189
+msgid "Cook Islands"
+msgstr ""
+
+#: ../picard/const.py:190
+msgid "Cote d'Ivoire"
+msgstr ""
+
+#: ../picard/const.py:191
+msgid "Switzerland"
+msgstr ""
+
+#: ../picard/const.py:192
+msgid "Colombia"
+msgstr ""
+
+#: ../picard/const.py:193
+msgid "China"
+msgstr ""
+
+#: ../picard/const.py:194
+msgid "Cameroon"
+msgstr ""
+
+#: ../picard/const.py:195
+#, fuzzy
+msgid "Chile"
+msgstr "文件"
+
+#: ../picard/const.py:196
+msgid "Cocos (Keeling) Islands"
+msgstr ""
+
+#: ../picard/const.py:197
+msgid "Canada"
+msgstr ""
+
+#: ../picard/const.py:198
+#, fuzzy
+msgid "Congo"
+msgstr "单体声"
+
+#: ../picard/const.py:199
+msgid "Central African Republic"
+msgstr ""
+
+#: ../picard/const.py:200
+msgid "Czech Republic"
+msgstr ""
+
+#: ../picard/const.py:201
+msgid "Cyprus"
+msgstr ""
+
+#: ../picard/const.py:202
+msgid "Christmas Island"
+msgstr ""
+
+#: ../picard/const.py:203
+msgid "Costa Rica"
+msgstr ""
+
+#: ../picard/const.py:204
+msgid "Cape Verde"
+msgstr ""
+
+#: ../picard/const.py:205
+msgid "Cuba"
+msgstr ""
+
+#: ../picard/const.py:206
+msgid "Swaziland"
+msgstr ""
+
+#: ../picard/const.py:207
+msgid "Syrian Arab Republic"
+msgstr ""
+
+#: ../picard/const.py:208
+msgid "Kyrgyzstan"
+msgstr ""
+
+#: ../picard/const.py:209
+msgid "Kenya"
+msgstr ""
+
+#: ../picard/const.py:210
+msgid "Suriname"
+msgstr ""
+
+#: ../picard/const.py:211
+msgid "Kiribati"
+msgstr ""
+
+#: ../picard/const.py:212
+msgid "Cambodia"
+msgstr ""
+
+#: ../picard/const.py:213
+msgid "Saint Kitts and Nevis"
+msgstr ""
+
+#: ../picard/const.py:214
+#, fuzzy
+msgid "Comoros"
+msgstr "作曲者"
+
+#: ../picard/const.py:215
+msgid "Sao Tome and Principe"
+msgstr ""
+
+#: ../picard/const.py:216
+msgid "Slovenia"
+msgstr ""
+
+#: ../picard/const.py:217
+msgid "Kuwait"
+msgstr ""
+
+#: ../picard/const.py:218
+msgid "Senegal"
+msgstr ""
+
+#: ../picard/const.py:219
+msgid "San Marino"
+msgstr ""
+
+#: ../picard/const.py:220
+msgid "Sierra Leone"
+msgstr ""
+
+#: ../picard/const.py:221
+msgid "Seychelles"
+msgstr ""
+
+#: ../picard/const.py:222
+msgid "Kazakhstan"
+msgstr ""
+
+#: ../picard/const.py:223
+msgid "Cayman Islands"
+msgstr ""
+
+#: ../picard/const.py:224
+msgid "Singapore"
+msgstr ""
+
+#: ../picard/const.py:225
+msgid "Sweden"
+msgstr ""
+
+#: ../picard/const.py:226
+msgid "Sudan"
+msgstr ""
+
+#: ../picard/const.py:227
+msgid "Dominican Republic"
+msgstr ""
+
+#: ../picard/const.py:228
+msgid "Dominica"
+msgstr ""
+
+#: ../picard/const.py:229
+#, fuzzy
+msgid "Djibouti"
+msgstr "关于"
+
+#: ../picard/const.py:230
+msgid "Denmark"
+msgstr ""
+
+#: ../picard/const.py:231
+msgid "Virgin Islands (British)"
+msgstr ""
+
+#: ../picard/const.py:232
+msgid "Germany"
+msgstr ""
+
+#: ../picard/const.py:233
+msgid "Yemen"
+msgstr ""
+
+#: ../picard/const.py:234
+msgid "Algeria"
+msgstr ""
+
+#: ../picard/const.py:235
+msgid "United States"
+msgstr ""
+
+#: ../picard/const.py:236
+msgid "Uruguay"
+msgstr ""
+
+#: ../picard/const.py:237
+msgid "Mayotte"
+msgstr ""
+
+#: ../picard/const.py:238
+msgid "United States Minor Outlying Islands"
+msgstr ""
+
+#: ../picard/const.py:239
+msgid "Lebanon"
+msgstr ""
+
+#: ../picard/const.py:240
+msgid "Saint Lucia"
+msgstr ""
+
+#: ../picard/const.py:241
+msgid "Lao People's Democratic Republic"
+msgstr ""
+
+#: ../picard/const.py:242
+msgid "Tuval"
+msgstr ""
+
+#: ../picard/const.py:243
+msgid "Taiwan"
+msgstr ""
+
+#: ../picard/const.py:244
+msgid "Trinidad and Tobago"
+msgstr ""
+
+#: ../picard/const.py:245
+msgid "Turkey"
+msgstr ""
+
+#: ../picard/const.py:246
+msgid "Sri Lanka"
+msgstr ""
+
+#: ../picard/const.py:247
+msgid "Liechtenstein"
+msgstr ""
+
+#: ../picard/const.py:248
+msgid "Latvia"
+msgstr ""
+
+#: ../picard/const.py:249
+msgid "Tonga"
+msgstr ""
+
+#: ../picard/const.py:250
+msgid "Lithuania"
+msgstr ""
+
+#: ../picard/const.py:251
+msgid "Luxembourg"
+msgstr ""
+
+#: ../picard/const.py:252
+msgid "Liberia"
+msgstr ""
+
+#: ../picard/const.py:253
+#, fuzzy
+msgid "Lesotho"
+msgstr "时长"
+
+#: ../picard/const.py:254
+msgid "Thailand"
+msgstr ""
+
+#: ../picard/const.py:255
+msgid "French Southern Territories"
+msgstr ""
+
+#: ../picard/const.py:256
+#, fuzzy
+msgid "Togo"
+msgstr "工具(&T)"
+
+#: ../picard/const.py:257
+msgid "Chad"
+msgstr ""
+
+#: ../picard/const.py:258
+msgid "Turks and Caicos Islands"
+msgstr ""
+
+#: ../picard/const.py:259
+msgid "Libyan Arab Jamahiriya"
+msgstr ""
+
+#: ../picard/const.py:260
+msgid "Vatican City State (Holy See)"
+msgstr ""
+
+#: ../picard/const.py:261
+msgid "Saint Vincent and The Grenadines"
+msgstr ""
+
+#: ../picard/const.py:262
+msgid "United Arab Emirates"
+msgstr ""
+
+#: ../picard/const.py:263
+msgid "Andorra"
+msgstr ""
+
+#: ../picard/const.py:264
+msgid "Antigua and Barbuda"
+msgstr ""
+
+#: ../picard/const.py:265
+msgid "Afghanistan"
+msgstr ""
+
+#: ../picard/const.py:266
+msgid "Anguilla"
+msgstr ""
+
+#: ../picard/const.py:267
+msgid "Virgin Islands (U.S.)"
+msgstr ""
+
+#: ../picard/const.py:268
+msgid "Iceland"
+msgstr ""
+
+#: ../picard/const.py:269
+msgid "Iran (Islamic Republic of)"
+msgstr ""
+
+#: ../picard/const.py:270
+msgid "Armenia"
+msgstr ""
+
+#: ../picard/const.py:271
+msgid "Albania"
+msgstr ""
+
+#: ../picard/const.py:272
+msgid "Angola"
+msgstr ""
+
+#: ../picard/const.py:273
+msgid "Netherlands Antilles"
+msgstr ""
+
+#: ../picard/const.py:274
+msgid "Antarctica"
+msgstr ""
+
+#: ../picard/const.py:275
+msgid "American Samoa"
+msgstr ""
+
+#: ../picard/const.py:276
+msgid "Argentina"
+msgstr ""
+
+#: ../picard/const.py:277
+msgid "Australia"
+msgstr ""
+
+#: ../picard/const.py:278
+msgid "Austria"
+msgstr ""
+
+#: ../picard/const.py:279
+msgid "Aruba"
+msgstr ""
+
+#: ../picard/const.py:280
+#, fuzzy
+msgid "India"
+msgstr "元数据"
+
+#: ../picard/const.py:281
+msgid "Tanzania, United Republic of"
+msgstr ""
+
+#: ../picard/const.py:282
+msgid "Azerbaijan"
+msgstr ""
+
+#: ../picard/const.py:283
+msgid "Ireland"
+msgstr ""
+
+#: ../picard/const.py:284
+msgid "Indonesia"
+msgstr ""
+
+#: ../picard/const.py:285
+msgid "Ukraine"
+msgstr ""
+
+#: ../picard/const.py:286
+msgid "Qatar"
+msgstr ""
+
+#: ../picard/const.py:287
+msgid "Mozambique"
+msgstr ""
+
+#: ../picard/const.py:288
+msgid "Bosnia and Herzegovina"
+msgstr ""
+
+#: ../picard/const.py:289
+msgid "Congo, The Democratic Republic of the"
+msgstr ""
+
+#: ../picard/const.py:290
+msgid "Serbia and Montenegro"
+msgstr ""
+
+#: ../picard/const.py:291
+msgid "Croatia"
+msgstr ""
+
+#: ../picard/const.py:292
+msgid "Korea (North), Democratic People's Republic of"
+msgstr ""
+
+#: ../picard/const.py:293
+msgid "Korea (South), Republic of"
+msgstr ""
+
+#: ../picard/const.py:294
+msgid "Slovakia"
+msgstr ""
+
+#: ../picard/const.py:295
+msgid "Soviet Union (historical, 1922-1991)"
+msgstr ""
+
+#: ../picard/const.py:296
+msgid "East Timor"
+msgstr ""
+
+#: ../picard/const.py:297
+msgid "Czechoslovakia (historical, 1918-1992)"
+msgstr ""
+
+#: ../picard/const.py:298
+msgid "Europe"
+msgstr ""
+
+#: ../picard/const.py:299
+msgid "East Germany (historical, 1949-1990)"
+msgstr ""
+
+#: ../picard/const.py:300
+msgid "[Unknown Country]"
+msgstr ""
+
+#: ../picard/const.py:301
+msgid "[Worldwide]"
+msgstr ""
+
+#: ../picard/const.py:302
+msgid "Yugoslavia (historical, 1918-1992)"
+msgstr ""
+
+#: ../picard/const.py:307
+msgid "Catalan"
+msgstr ""
+
+#: ../picard/const.py:308
+msgid "Czech"
+msgstr ""
+
+#: ../picard/const.py:309
+msgid "Welsh"
+msgstr ""
+
+#: ../picard/const.py:310
+msgid "Danish"
+msgstr ""
+
+#: ../picard/const.py:311
+msgid "German"
+msgstr ""
+
+#: ../picard/const.py:312
+msgid "English"
+msgstr ""
+
+#: ../picard/const.py:313
+msgid "English (Canada)"
+msgstr ""
+
+#: ../picard/const.py:314
+msgid "English (UK)"
+msgstr ""
+
+#: ../picard/const.py:315
+msgid "Spanish"
+msgstr ""
+
+#: ../picard/const.py:316
+msgid "Persian"
+msgstr ""
+
+#: ../picard/const.py:317
+msgid "Finnish"
+msgstr ""
+
+#: ../picard/const.py:318
+msgid "French"
+msgstr ""
+
+#: ../picard/const.py:319
+msgid "Frisian"
+msgstr ""
+
+#: ../picard/const.py:320
+msgid "Hebrew"
+msgstr ""
+
+#: ../picard/const.py:321
+msgid "Hungarian"
+msgstr ""
+
+#: ../picard/const.py:322
+msgid "Islandic"
+msgstr ""
+
+#: ../picard/const.py:323
+msgid "Italian"
+msgstr ""
+
+#: ../picard/const.py:324
+msgid "Kannada"
+msgstr ""
+
+#: ../picard/const.py:325
+msgid "Korean"
+msgstr ""
+
+#: ../picard/const.py:326
+msgid "Lithuanian"
+msgstr ""
+
+#: ../picard/const.py:327
+msgid "Norwegian Bokmal"
+msgstr ""
+
+#: ../picard/const.py:328
+msgid "Dutch"
+msgstr ""
+
+#: ../picard/const.py:329
+#, fuzzy
+msgid "Polish"
+msgstr "插件"
+
+#: ../picard/const.py:330
+msgid "Portuguese"
+msgstr ""
+
+#: ../picard/const.py:331
+msgid "Brazilian Portuguese"
+msgstr ""
+
+#: ../picard/const.py:332
+msgid "Romanian"
+msgstr ""
+
+#: ../picard/const.py:333
+msgid "Russian"
+msgstr ""
+
+#: ../picard/const.py:334
+#, fuzzy
+msgid "Scots"
+msgstr "评分"
+
+#: ../picard/const.py:335
+msgid "Slovak"
+msgstr ""
+
+#: ../picard/const.py:336
+msgid "Slovenian"
+msgstr ""
+
+#: ../picard/const.py:337
+msgid "Swedish"
+msgstr ""
+
+#: ../picard/const.py:338
+#, fuzzy
+msgid "Chinese"
+msgstr "声道数："
+
+#: ../picard/file.py:475
+#, fuzzy, python-format
+msgid "No matching tracks for file %s"
+msgstr "无法匹配 %s 文件"
+
+#: ../picard/file.py:492
+#, fuzzy, python-format
+msgid "No matching tracks above the threshold for file %s"
+msgstr "无法匹配 %s 文件"
+
+#: ../picard/file.py:495
+#, fuzzy, python-format
+msgid "File %s identified!"
+msgstr "%s 文件已鉴定"
+
+#: ../picard/file.py:506
+#, fuzzy, python-format
+msgid "Looking up the PUID for file %s..."
+msgstr "搜索 %s 文件 PUID..."
+
+#: ../picard/file.py:511
+#, fuzzy, python-format
+msgid "Looking up the metadata for file %s..."
+msgstr "搜索 %s 文件元数据..."
+
+#: ../picard/puidmanager.py:58
+#, fuzzy
+msgid "Submitting PUIDs..."
+msgstr "正在提交PUID..."
+
+#: ../picard/puidmanager.py:64
+#, fuzzy, python-format
+msgid "PUIDs submission failed: %s"
+msgstr "无法提交PUID：%s"
+
+#: ../picard/puidmanager.py:66
+#, fuzzy
+msgid "PUIDs successfully submitted!"
+msgstr "已成功提交PUID"
+
+#: ../picard/playlist.py:31
+#, fuzzy
+msgid "M3U Playlist (*.m3u)"
+msgstr "PLS播放列表 (*.pls)"
+
+#: ../picard/playlist.py:32
+msgid "PLS Playlist (*.pls)"
+msgstr "PLS播放列表 (*.pls)"
+
+#: ../picard/playlist.py:33
+msgid "XSPF Playlist (*.xspf)"
+msgstr "XSPF播放列表 (*.xfps)"
+
+#: ../picard/tagger.py:476
 msgid "CD Lookup Error"
 msgstr ""
 
-#: ../picard/tagger.py:473
+#: ../picard/tagger.py:477
 #, python-format
 msgid ""
 "Error while reading CD:\n"
@@ -43,125 +1295,174 @@ msgid ""
 "%s"
 msgstr ""
 
-#: ../picard/ui/passworddialog.py:38
-#, python-format
-msgid ""
-"The server %s requires you to login. Please enter your username and password."
-msgstr ""
+#: ../picard/tagger.py:503
+#, fuzzy, python-format
+msgid "Couldn't find PUID for file %s"
+msgstr "无法找到 %s 文件的 PUID"
 
-#: ../picard/ui/ui_options_script.py:52
-msgid "Tagger Script"
-msgstr ""
+#: ../picard/musicdns/__init__.py:98
+#, fuzzy, python-format
+msgid "Looking up the fingerprint for file %s..."
+msgstr "正在搜索 %s 文件指纹..."
+
+#: ../picard/musicdns/__init__.py:117
+#, fuzzy, python-format
+msgid "Creating fingerprint for file %s..."
+msgstr "正在计算 %s 文件指纹..."
 
 #: ../picard/ui/cdlookup.py:31
 msgid "Score"
 msgstr "评分"
 
 #: ../picard/ui/cdlookup.py:31
+#: ../picard/ui/itemviews.py:82
+#: ../picard/util/tags.py:23
 msgid "Title"
 msgstr "标题"
 
-#: ../picard/ui/cdlookup.py:31 ../picard/ui/mainwindow.py:436
+#: ../picard/ui/cdlookup.py:31
+#: ../picard/ui/itemviews.py:84
+#: ../picard/ui/mainwindow.py:436
+#: ../picard/util/tags.py:22
 msgid "Artist"
 msgstr "艺人"
 
-#: ../picard/ui/ui_metadata.py:121
-msgid "Lookup"
-msgstr "查阅"
+#: ../picard/ui/coverartbox.py:47
+#: ../picard/ui/options/cover.py:29
+msgid "Cover Art"
+msgstr "封面图像"
 
-#: ../picard/ui/ui_metadata.py:122
-msgid "Title:"
-msgstr "标题："
-
-#: ../picard/ui/ui_metadata.py:123
-msgid "Date:"
-msgstr "日期："
-
-#: ../picard/ui/ui_metadata.py:124
-msgid "Artist:"
-msgstr "艺人："
-
-#: ../picard/ui/ui_metadata.py:125
-msgid "Track:"
+#: ../picard/ui/coverartbox.py:95
+msgid "Buy the album on Amazon"
 msgstr ""
 
-#: ../picard/ui/ui_metadata.py:126
-msgid "0000-00-00; "
+#: ../picard/ui/filebrowser.py:38
+#: ../picard/ui/mainwindow.py:302
+msgid "&Refresh"
+msgstr "刷新(&R)"
+
+#: ../picard/ui/filebrowser.py:41
+msgid "&Move Tagged Files Here"
 msgstr ""
 
-#: ../picard/ui/ui_metadata.py:127 ../picard/ui/tageditor.py:225
-#: ../picard/ui/multitageditor.py:181
+#: ../picard/ui/filebrowser.py:44
+msgid "Show &Hidden Files"
+msgstr ""
+
+#: ../picard/ui/itemviews.py:83
+msgid "Length"
+msgstr "时长"
+
+#: ../picard/ui/itemviews.py:327
+msgid "&Releases"
+msgstr ""
+
+#: ../picard/ui/itemviews.py:353
+msgid "&Plugins"
+msgstr "插件(&P)"
+
+#: ../picard/ui/itemviews.py:523
+msgid "Clusters"
+msgstr ""
+
+#: ../picard/ui/logview.py:29
+msgid "Log"
+msgstr ""
+
+#: ../picard/ui/puidsubmit.py:31
+#: ../picard/ui/options/plugins.py:80
+msgid "File"
+msgstr "文件"
+
+#: ../picard/ui/puidsubmit.py:31
+msgid "PUID"
+msgstr "PUID"
+
+#: ../picard/ui/puidsubmit.py:31
+#: ../picard/ui/mainwindow.py:437
+msgid "Track"
+msgstr "音轨"
+
+#: ../picard/ui/puidsubmit.py:31
+msgid "Release"
+msgstr ""
+
+#: ../picard/ui/puidsubmit.py:31
+msgid "Release ID"
+msgstr ""
+
+#: ../picard/ui/tageditor.py:65
+#: ../picard/ui/ui_options_plugins.py:62
+msgid "Details"
+msgstr ""
+
+#: ../picard/ui/tageditor.py:70
+#: ../picard/ui/tageditor.py:241
+#, python-format
+msgid "%d file"
+msgid_plural "%d files"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../picard/ui/tageditor.py:124
+#, python-format
+msgid "(different across %d file)"
+msgid_plural "(different across %d files)"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../picard/ui/tageditor.py:127
+#, python-format
+msgid "(missing from %d file)"
+msgid_plural "(missing from %d files)"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../picard/ui/tageditor.py:210
+msgid "Filename:"
+msgstr "文件名："
+
+#: ../picard/ui/tageditor.py:212
+msgid "Format:"
+msgstr ""
+
+#: ../picard/ui/tageditor.py:221
+msgid "Size:"
+msgstr ""
+
+#: ../picard/ui/tageditor.py:225
+#: ../picard/ui/ui_metadata.py:127
 msgid "Length:"
 msgstr "时长："
 
-#: ../picard/ui/ui_metadata.py:128
-msgid "Album:"
-msgstr "专辑："
+#: ../picard/ui/tageditor.py:227
+msgid "Bitrate:"
+msgstr "比特率："
 
-#: ../picard/ui/ui_passworddialog.py:78
-msgid "Authentication required"
+#: ../picard/ui/tageditor.py:229
+msgid "Sample rate:"
+msgstr "采样率"
+
+#: ../picard/ui/tageditor.py:231
+msgid "Bits per sample:"
 msgstr ""
 
-#: ../picard/ui/ui_passworddialog.py:79 ../picard/ui/ui_options_proxy.py:83
-#: ../picard/ui/ui_options_general.py:113
-msgid "Username:"
-msgstr "用户名："
+#: ../picard/ui/tageditor.py:234
+msgid "Mono"
+msgstr "单体声"
 
-#: ../picard/ui/ui_passworddialog.py:80 ../picard/ui/ui_options_proxy.py:82
-#: ../picard/ui/ui_options_general.py:112
-msgid "Password:"
-msgstr "密码："
+#: ../picard/ui/tageditor.py:235
+msgid "Stereo"
+msgstr "立体声"
 
-#: ../picard/ui/ui_passworddialog.py:81
-msgid "Save username and password"
-msgstr ""
+#: ../picard/ui/tageditor.py:237
+msgid "Channels:"
+msgstr "声道数："
 
-#: ../picard/ui/ui_options_folksonomy.py:114
-#: ../picard/ui/ui_options_folksonomy_tags.py:114
-msgid "Folksonomy Tags"
-msgstr ""
-
-#: ../picard/ui/ui_options_folksonomy.py:115
-#: ../picard/ui/ui_options_folksonomy_tags.py:115
-msgid "Ignore tags:"
-msgstr ""
-
-#: ../picard/ui/ui_options_folksonomy.py:116
-#: ../picard/ui/ui_options_folksonomy_tags.py:116
-msgid "Minimal tag usage:"
-msgstr ""
-
-#: ../picard/ui/ui_options_folksonomy.py:117
-#: ../picard/ui/ui_options_folksonomy_tags.py:117
-#: ../picard/ui/ui_options_matching.py:107
-#: ../picard/ui/ui_options_matching.py:108
-#: ../picard/ui/ui_options_matching.py:109
-#: ../picard/ui/ui_options_matching.py:113
-msgid " %"
-msgstr " %"
-
-#: ../picard/ui/ui_options_folksonomy.py:118
-msgid "Maximum number of tags:"
-msgstr ""
-
-#: ../picard/ui/ui_options_folksonomy.py:119
-#: ../picard/ui/ui_options_folksonomy_tags.py:119
-msgid "Join multiple tags with:"
-msgstr ""
-
-#: ../picard/ui/ui_options_folksonomy.py:120
-#: ../picard/ui/ui_options_folksonomy_tags.py:120
-msgid " / "
-msgstr ""
-
-#: ../picard/ui/ui_options_folksonomy.py:121
-#: ../picard/ui/ui_options_folksonomy_tags.py:121
-msgid ", "
-msgstr ""
-
-#: ../picard/ui/ui_options_folksonomy_tags.py:118
-msgid "Maximal number of tags:"
-msgstr ""
+#: ../picard/ui/tagsfromfilenames.py:52
+#: ../picard/ui/tagsfromfilenames.py:96
+msgid "File Name"
+msgstr "文件名"
 
 #: ../picard/ui/mainwindow.py:64
 msgid "MusicBrainz Picard"
@@ -296,7 +1597,8 @@ msgstr "搜索"
 msgid "&CD Lookup..."
 msgstr ""
 
-#: ../picard/ui/mainwindow.py:272 ../picard/ui/mainwindow.py:273
+#: ../picard/ui/mainwindow.py:272
+#: ../picard/ui/mainwindow.py:273
 msgid "Lookup CD"
 msgstr "查阅 CD"
 
@@ -327,7 +1629,8 @@ msgstr "Ctrl+U"
 msgid "&Lookup"
 msgstr ""
 
-#: ../picard/ui/mainwindow.py:291 ../picard/ui/mainwindow.py:292
+#: ../picard/ui/mainwindow.py:291
+#: ../picard/ui/mainwindow.py:292
 msgid "Lookup metadata"
 msgstr ""
 
@@ -340,10 +1643,6 @@ msgstr "Ctrl+L"
 msgid "&Details..."
 msgstr "细节(&D)"
 
-#: ../picard/ui/mainwindow.py:302 ../picard/ui/filebrowser.py:38
-msgid "&Refresh"
-msgstr "刷新(&R)"
-
 #: ../picard/ui/mainwindow.py:305
 msgid "Generate &Playlist..."
 msgstr ""
@@ -389,6 +1688,7 @@ msgid "&Tools"
 msgstr "工具(&T)"
 
 #: ../picard/ui/mainwindow.py:384
+#: ../picard/ui/util.py:33
 msgid "&Help"
 msgstr "帮助(&H)"
 
@@ -401,13 +1701,10 @@ msgid "&Search Bar"
 msgstr "搜索栏(&S)"
 
 #: ../picard/ui/mainwindow.py:435
+#: ../picard/util/tags.py:21
 msgid "Album"
 msgstr "专辑"
 
-#: ../picard/ui/mainwindow.py:437 ../picard/ui/puidsubmit.py:31
-msgid "Track"
-msgstr "音轨"
-
 #: ../picard/ui/mainwindow.py:476
 msgid "All Supported Formats"
 msgstr "全部支持的格式"
@@ -422,37 +1719,289 @@ msgstr ""
 msgid "Playlist %s saved"
 msgstr ""
 
-#: ../picard/ui/mainwindow.py:638 ../picard/ui/mainwindow.py:647
+#: ../picard/ui/mainwindow.py:638
+#: ../picard/ui/mainwindow.py:647
 #, python-format
 msgid " (Error: %s)"
 msgstr " (错误：%s)"
 
+#: ../picard/ui/ui_tageditor.py:115
+#: ../picard/ui/ui_options_plugins.py:59
+#: ../picard/ui/options/plugins.py:76
+msgid "Name"
+msgstr "名称"
+
+#: ../picard/ui/ui_tageditor.py:116
+msgid "Value"
+msgstr "值"
+
+#: ../picard/ui/ui_tageditor.py:117
+msgid "&Add..."
+msgstr "添加(%A)..."
+
+#: ../picard/ui/ui_tageditor.py:118
+msgid "&Edit..."
+msgstr "编辑(&E)..."
+
+#: ../picard/ui/ui_tageditor.py:119
+msgid "&Delete"
+msgstr "删除(&D)"
+
+#: ../picard/ui/ui_tageditor.py:120
+msgid "&Metadata"
+msgstr "元数据(&M)"
+
+#: ../picard/ui/ui_tageditor.py:121
+msgid "A&rtwork"
+msgstr "封面图像(&R)"
+
+#: ../picard/ui/ui_tageditor.py:122
+msgid "&Info"
+msgstr "信息(&I)"
+
+#: ../picard/ui/passworddialog.py:38
+#, python-format
+msgid "The server %s requires you to login. Please enter your username and password."
+msgstr ""
+
+#: ../picard/ui/ui_cdlookup.py:60
+#: ../picard/ui/ui_options_cdlookup.py:47
+#: ../picard/ui/ui_options_cdlookup_win32.py:56
+#: ../picard/ui/options/cdlookup.py:35
+msgid "CD Lookup"
+msgstr ""
+
+#: ../picard/ui/ui_cdlookup.py:61
+msgid "The following releases on MusicBrainz match the CD:"
+msgstr ""
+
+#: ../picard/ui/ui_cdlookup.py:62
+#: ../picard/ui/ui_puidsubmit.py:53
+msgid "OK"
+msgstr "确定"
+
+#: ../picard/ui/ui_cdlookup.py:63
+msgid "    Lookup manually    "
+msgstr ""
+
+#: ../picard/ui/ui_cdlookup.py:64
+#: ../picard/ui/ui_puidsubmit.py:54
+msgid "Cancel"
+msgstr "取消"
+
+#: ../picard/ui/ui_passworddialog.py:78
+msgid "Authentication required"
+msgstr ""
+
+#: ../picard/ui/ui_passworddialog.py:79
+#: ../picard/ui/ui_options_general.py:113
+#: ../picard/ui/ui_options_proxy.py:83
+msgid "Username:"
+msgstr "用户名："
+
+#: ../picard/ui/ui_passworddialog.py:80
+#: ../picard/ui/ui_options_general.py:112
+#: ../picard/ui/ui_options_proxy.py:82
+msgid "Password:"
+msgstr "密码："
+
+#: ../picard/ui/ui_passworddialog.py:81
+msgid "Save username and password"
+msgstr ""
+
 #: ../picard/ui/ui_edittagdialog.py:44
 msgid "Edit Tag"
 msgstr ""
 
-#: ../picard/ui/ui_options_proxy.py:81
-msgid "Web Proxy"
-msgstr "网络代理服务器"
+#: ../picard/ui/ui_metadata.py:121
+msgid "Lookup"
+msgstr "查阅"
 
-#: ../picard/ui/ui_options_proxy.py:84 ../picard/ui/ui_options_general.py:109
-msgid "Port:"
-msgstr "端口："
+#: ../picard/ui/ui_metadata.py:122
+msgid "Title:"
+msgstr "标题："
 
-#: ../picard/ui/ui_options_proxy.py:85 ../picard/ui/ui_options_general.py:110
-msgid "Server address:"
-msgstr "服务器地址："
+#: ../picard/ui/ui_metadata.py:123
+msgid "Date:"
+msgstr "日期："
 
-#: ../picard/ui/ui_tagsfromfilenames.py:56
-msgid "Convert File Names to Tags"
+#: ../picard/ui/ui_metadata.py:124
+msgid "Artist:"
+msgstr "艺人："
+
+#: ../picard/ui/ui_metadata.py:125
+msgid "Track:"
 msgstr ""
 
-#: ../picard/ui/ui_tagsfromfilenames.py:57
-msgid "Replace underscores with spaces"
+#: ../picard/ui/ui_metadata.py:126
+msgid "0000-00-00; "
 msgstr ""
 
-#: ../picard/ui/ui_tagsfromfilenames.py:58
+#: ../picard/ui/ui_metadata.py:128
+msgid "Album:"
+msgstr "专辑："
+
+#: ../picard/ui/ui_options.py:42
+msgid "Options"
+msgstr "选项"
+
+#: ../picard/ui/ui_options_cdlookup.py:48
+msgid "CD-ROM device to use for lookups:"
+msgstr ""
+
+#: ../picard/ui/ui_options_cdlookup_win32.py:57
+msgid "Default CD-ROM drive to use for lookups:"
+msgstr ""
+
+#: ../picard/ui/ui_options_cover.py:56
+msgid "Location"
+msgstr ""
+
+#: ../picard/ui/ui_options_cover.py:57
+msgid "Embed cover images into tags"
+msgstr ""
+
+#: ../picard/ui/ui_options_cover.py:58
+msgid "Save cover images as separate files"
+msgstr ""
+
+#: ../picard/ui/ui_options_cover.py:59
+msgid "Overwrite the file if it already exists"
+msgstr ""
+
+#: ../picard/ui/util.py:31
+msgid "&Ok"
+msgstr "确定(&O)"
+
+#: ../picard/ui/util.py:32
+msgid "&Cancel"
+msgstr "取消(&C)"
+
+#: ../picard/ui/ui_puidsubmit.py:52
+msgid "Submit PUIDs"
+msgstr ""
+
+#: ../picard/ui/ui_options_folksonomy.py:114
+#: ../picard/ui/options/folksonomy.py:29
+msgid "Folksonomy Tags"
+msgstr ""
+
+#: ../picard/ui/ui_options_folksonomy.py:115
+msgid "Ignore tags:"
+msgstr ""
+
+#: ../picard/ui/ui_options_folksonomy.py:116
+msgid "Minimal tag usage:"
+msgstr ""
+
+#: ../picard/ui/ui_options_folksonomy.py:117
+#: ../picard/ui/ui_options_matching.py:107
+#: ../picard/ui/ui_options_matching.py:108
+#: ../picard/ui/ui_options_matching.py:109
+#: ../picard/ui/ui_options_matching.py:113
+msgid " %"
+msgstr " %"
+
+#: ../picard/ui/ui_options_folksonomy.py:118
+msgid "Maximum number of tags:"
+msgstr ""
+
+#: ../picard/ui/ui_options_folksonomy.py:119
+msgid "Join multiple tags with:"
+msgstr ""
+
+#: ../picard/ui/ui_options_folksonomy.py:120
+msgid " / "
+msgstr ""
+
+#: ../picard/ui/ui_options_folksonomy.py:121
+msgid ", "
+msgstr ""
+
+#: ../picard/ui/ui_options_interface.py:50
+msgid "Miscellaneous"
+msgstr ""
+
+#: ../picard/ui/ui_options_interface.py:51
+msgid "Show text labels under icons"
+msgstr ""
+
+#: ../picard/ui/ui_options_interface.py:52
+msgid "Allow selection of multiple directories"
+msgstr ""
+
+#: ../picard/ui/ui_options_interface.py:53
+msgid "Use advanced query syntax"
+msgstr ""
+
+#: ../picard/ui/ui_options_interface.py:54
+#, fuzzy
+msgid "User interface language:"
+msgstr "用户界面"
+
+#: ../picard/ui/ui_options_naming.py:165
+msgid "Rename Files"
+msgstr ""
+
+#: ../picard/ui/ui_options_naming.py:166
+msgid "Replace Windows-incompatible characters"
+msgstr "将与 Windows 不相容的字符取代"
+
+#: ../picard/ui/ui_options_naming.py:167
+msgid "Replace non-ASCII characters"
+msgstr "将非 ASCII 字符取代"
+
+#: ../picard/ui/ui_options_naming.py:168
+#: ../picard/ui/ui_options_naming.py:169
+#: ../picard/ui/ui_options_metadata.py:109
+#: ../picard/ui/ui_options_metadata.py:110
+msgid "Default"
+msgstr ""
+
+#: ../picard/ui/ui_options_naming.py:170
+#: ../picard/ui/options/naming.py:90
+msgid "Multiple artist file naming format:"
+msgstr ""
+
+#: ../picard/ui/ui_options_naming.py:171
+#: ../picard/ui/options/naming.py:86
+msgid "File naming format:"
+msgstr ""
+
+#: ../picard/ui/ui_options_naming.py:172
+msgid "Move Files"
+msgstr ""
+
+#: ../picard/ui/ui_options_naming.py:173
+msgid "Move tagged files to this directory:"
+msgstr ""
+
+#: ../picard/ui/ui_options_naming.py:174
+msgid "Browse..."
+msgstr ""
+
+#: ../picard/ui/ui_options_naming.py:175
+msgid "Move additional files:"
+msgstr ""
+
+#: ../picard/ui/ui_options_naming.py:176
+msgid "Delete empty directories"
+msgstr "删除空文件夹"
+
+#: ../picard/ui/ui_options_naming.py:177
+msgid "Example"
+msgstr ""
+
+#: ../picard/ui/ui_options_naming.py:178
+msgid "File name:"
+msgstr "文件名："
+
+#: ../picard/ui/ui_options_naming.py:179
+msgid "Multiple artist file name:"
+msgstr "各艺人文件名："
+
 #: ../picard/ui/ui_options_naming.py:180
+#: ../picard/ui/ui_tagsfromfilenames.py:58
 msgid "&Preview"
 msgstr ""
 
@@ -460,11 +2009,22 @@ msgstr ""
 msgid "MusicBrainz Server"
 msgstr "MusicBrainz 服务器"
 
+#: ../picard/ui/ui_options_general.py:109
+#: ../picard/ui/ui_options_proxy.py:84
+msgid "Port:"
+msgstr "端口："
+
+#: ../picard/ui/ui_options_general.py:110
+#: ../picard/ui/ui_options_proxy.py:85
+msgid "Server address:"
+msgstr "服务器地址："
+
 #: ../picard/ui/ui_options_general.py:111
 msgid "Account Information"
 msgstr "账户信息"
 
 #: ../picard/ui/ui_options_general.py:114
+#: ../picard/ui/options/general.py:29
 msgid "General"
 msgstr ""
 
@@ -472,34 +2032,6 @@ msgstr ""
 msgid "Automatically scan all new files"
 msgstr ""
 
-#: ../picard/ui/ui_options_interface.py:46
-msgid "Miscellaneous"
-msgstr ""
-
-#: ../picard/ui/ui_options_interface.py:47
-msgid "Show text labels under icons"
-msgstr ""
-
-#: ../picard/ui/ui_options_interface.py:48
-msgid "Allow selection of multiple directories"
-msgstr ""
-
-#: ../picard/ui/ui_options_interface.py:49
-msgid "Use advanced query syntax"
-msgstr ""
-
-#: ../picard/ui/itemviews.py:327
-msgid "&Releases"
-msgstr ""
-
-#: ../picard/ui/itemviews.py:353
-msgid "&Plugins"
-msgstr "插件(&P)"
-
-#: ../picard/ui/itemviews.py:523
-msgid "Clusters"
-msgstr ""
-
 #: ../picard/ui/ui_options_matching.py:105
 msgid "Thresholds"
 msgstr ""
@@ -520,6 +2052,68 @@ msgstr ""
 msgid "Minimal similarity for PUID lookups:"
 msgstr ""
 
+#: ../picard/ui/ui_options_metadata.py:100
+#: ../picard/ui/options/metadata.py:31
+msgid "Metadata"
+msgstr "元数据"
+
+#: ../picard/ui/ui_options_metadata.py:101
+msgid "Translate foreign artist names to English where possible"
+msgstr "如有可能将艺人名翻译成英文"
+
+#: ../picard/ui/ui_options_metadata.py:102
+msgid "Use release relationships"
+msgstr "使用专辑关系"
+
+#: ../picard/ui/ui_options_metadata.py:103
+msgid "Use track relationships"
+msgstr ""
+
+#: ../picard/ui/ui_options_metadata.py:104
+msgid "Use folksonomy tags as genre"
+msgstr ""
+
+#: ../picard/ui/ui_options_metadata.py:105
+#, fuzzy
+msgid "Preferred release country:"
+msgstr "版本地区"
+
+#: ../picard/ui/ui_options_metadata.py:106
+msgid "Custom Fields"
+msgstr ""
+
+#: ../picard/ui/ui_options_metadata.py:107
+msgid "Various artists:"
+msgstr ""
+
+#: ../picard/ui/ui_options_metadata.py:108
+msgid "Non-album tracks:"
+msgstr ""
+
+#: ../picard/ui/ui_options_plugins.py:58
+#: ../picard/ui/options/plugins.py:30
+msgid "Plugins"
+msgstr "插件"
+
+#: ../picard/ui/ui_options_plugins.py:60
+#: ../picard/ui/options/plugins.py:79
+msgid "Author"
+msgstr ""
+
+#: ../picard/ui/ui_options_plugins.py:61
+#: ../picard/util/tags.py:36
+msgid "Version"
+msgstr ""
+
+#: ../picard/ui/ui_options_proxy.py:81
+#: ../picard/ui/options/proxy.py:28
+msgid "Web Proxy"
+msgstr "网络代理服务器"
+
+#: ../picard/ui/ui_options_script.py:52
+msgid "Tagger Script"
+msgstr ""
+
 #: ../picard/ui/ui_options_tags.py:105
 msgid "Common"
 msgstr "常规"
@@ -572,311 +2166,17 @@ msgstr "APE"
 msgid "Remove APEv2 tags from MP3 files"
 msgstr "将MP3文件中APEv2标签删掉"
 
-#: ../picard/ui/ui_options_cdlookup_win32.py:56 ../picard/ui/ui_cdlookup.py:60
-#: ../picard/ui/ui_options_cdlookup.py:47
-msgid "CD Lookup"
+#: ../picard/ui/ui_tagsfromfilenames.py:56
+msgid "Convert File Names to Tags"
 msgstr ""
 
-#: ../picard/ui/ui_options_cdlookup_win32.py:57
-msgid "Default CD-ROM drive to use for lookups:"
+#: ../picard/ui/ui_tagsfromfilenames.py:57
+msgid "Replace underscores with spaces"
 msgstr ""
 
-#: ../picard/ui/tageditor.py:65 ../picard/ui/ui_options_plugins.py:62
-#: ../picard/ui/multitageditor.py:37
-msgid "Details"
-msgstr ""
-
-#: ../picard/ui/tageditor.py:70 ../picard/ui/tageditor.py:241
-#: ../picard/ui/multitageditor.py:42 ../picard/ui/multitageditor.py:197
-#, python-format
-msgid "%d file"
-msgid_plural "%d files"
-msgstr[0] ""
-msgstr[1] ""
-
-#: ../picard/ui/tageditor.py:124 ../picard/ui/multitageditor.py:95
-#, python-format
-msgid "(different across %d file)"
-msgid_plural "(different across %d files)"
-msgstr[0] ""
-msgstr[1] ""
-
-#: ../picard/ui/tageditor.py:127 ../picard/ui/multitageditor.py:98
-#, python-format
-msgid "(missing from %d file)"
-msgid_plural "(missing from %d files)"
-msgstr[0] ""
-msgstr[1] ""
-
-#: ../picard/ui/tageditor.py:210 ../picard/ui/multitageditor.py:166
-msgid "Filename:"
-msgstr "文件名："
-
-#: ../picard/ui/tageditor.py:212 ../picard/ui/multitageditor.py:168
-msgid "Format:"
-msgstr ""
-
-#: ../picard/ui/tageditor.py:221 ../picard/ui/multitageditor.py:177
-msgid "Size:"
-msgstr ""
-
-#: ../picard/ui/tageditor.py:227 ../picard/ui/multitageditor.py:183
-msgid "Bitrate:"
-msgstr "比特率："
-
-#: ../picard/ui/tageditor.py:229 ../picard/ui/multitageditor.py:185
-msgid "Sample rate:"
-msgstr "采样率"
-
-#: ../picard/ui/tageditor.py:231 ../picard/ui/multitageditor.py:187
-msgid "Bits per sample:"
-msgstr ""
-
-#: ../picard/ui/tageditor.py:234 ../picard/ui/multitageditor.py:190
-msgid "Mono"
-msgstr "单体声"
-
-#: ../picard/ui/tageditor.py:235 ../picard/ui/multitageditor.py:191
-msgid "Stereo"
-msgstr "立体声"
-
-#: ../picard/ui/tageditor.py:237 ../picard/ui/multitageditor.py:193
-msgid "Channels:"
-msgstr "声道数："
-
-#: ../picard/ui/ui_tageditor.py:115 ../picard/ui/ui_multitageditor.py:55
-#: ../picard/ui/ui_options_plugins.py:59 ../picard/ui/options/plugins.py:76
-msgid "Name"
-msgstr "名称"
-
-#: ../picard/ui/ui_tageditor.py:116 ../picard/ui/ui_multitageditor.py:56
-msgid "Value"
-msgstr "值"
-
-#: ../picard/ui/ui_tageditor.py:117 ../picard/ui/ui_multitageditor.py:57
-msgid "&Add..."
-msgstr "添加(%A)..."
-
-#: ../picard/ui/ui_tageditor.py:118
-msgid "&Edit..."
-msgstr "编辑(&E)..."
-
-#: ../picard/ui/ui_tageditor.py:119
-msgid "&Delete"
-msgstr "删除(&D)"
-
-#: ../picard/ui/ui_tageditor.py:120
-msgid "&Metadata"
-msgstr "元数据(&M)"
-
-#: ../picard/ui/ui_tageditor.py:121
-msgid "A&rtwork"
-msgstr "封面图像(&R)"
-
-#: ../picard/ui/ui_tageditor.py:122
-msgid "&Info"
-msgstr "信息(&I)"
-
-#: ../picard/ui/coverartbox.py:47
-msgid "Cover Art"
-msgstr "封面图像"
-
-#: ../picard/ui/coverartbox.py:95
-msgid "Buy the album on Amazon"
-msgstr ""
-
-#: ../picard/ui/ui_puidsubmit.py:52
-msgid "Submit PUIDs"
-msgstr ""
-
-#: ../picard/ui/ui_puidsubmit.py:53 ../picard/ui/ui_cdlookup.py:62
-msgid "OK"
-msgstr "确定"
-
-#: ../picard/ui/ui_puidsubmit.py:54 ../picard/ui/ui_cdlookup.py:64
-msgid "Cancel"
-msgstr "取消"
-
-#: ../picard/ui/puidsubmit.py:31 ../picard/ui/options/plugins.py:80
-msgid "File"
-msgstr "文件"
-
-#: ../picard/ui/puidsubmit.py:31
-msgid "PUID"
-msgstr "PUID"
-
-#: ../picard/ui/puidsubmit.py:31
-msgid "Release"
-msgstr ""
-
-#: ../picard/ui/puidsubmit.py:31
-msgid "Release ID"
-msgstr ""
-
-#: ../picard/ui/filebrowser.py:41
-msgid "&Move Tagged Files Here"
-msgstr ""
-
-#: ../picard/ui/filebrowser.py:44
-msgid "Show &Hidden Files"
-msgstr ""
-
-#: ../picard/ui/ui_cdlookup.py:61
-msgid "The following releases on MusicBrainz match the CD:"
-msgstr ""
-
-#: ../picard/ui/ui_cdlookup.py:63
-msgid "    Lookup manually    "
-msgstr ""
-
-#: ../picard/ui/ui_options.py:42
-msgid "Options"
-msgstr "选项"
-
-#: ../picard/ui/tagsfromfilenames.py:52 ../picard/ui/tagsfromfilenames.py:96
-msgid "File Name"
-msgstr "文件名"
-
-#: ../picard/ui/ui_options_cover.py:56
-msgid "Location"
-msgstr ""
-
-#: ../picard/ui/ui_options_cover.py:57
-msgid "Embed cover images into tags"
-msgstr ""
-
-#: ../picard/ui/ui_options_cover.py:58
-msgid "Save cover images as separate files"
-msgstr ""
-
-#: ../picard/ui/ui_options_cover.py:59
-msgid "Overwrite the file if it already exists"
-msgstr ""
-
-#: ../picard/ui/ui_options_metadata.py:100
-msgid "Metadata"
-msgstr "元数据"
-
-#: ../picard/ui/ui_options_metadata.py:101
-msgid "Translate foreign artist names to English where possible"
-msgstr "如有可能将艺人名翻译成英文"
-
-#: ../picard/ui/ui_options_metadata.py:102
-msgid "Use release relationships"
-msgstr "使用专辑关系"
-
-#: ../picard/ui/ui_options_metadata.py:103
-msgid "Use track relationships"
-msgstr ""
-
-#: ../picard/ui/ui_options_metadata.py:104
-msgid "Use folksonomy tags as genre"
-msgstr ""
-
-#: ../picard/ui/ui_options_metadata.py:105
-#, fuzzy
-msgid "Preferred release country:"
-msgstr "版本地区"
-
-#: ../picard/ui/ui_options_metadata.py:106
-msgid "Custom Fields"
-msgstr ""
-
-#: ../picard/ui/ui_options_metadata.py:107
-msgid "Various artists:"
-msgstr ""
-
-#: ../picard/ui/ui_options_metadata.py:108
-msgid "Non-album tracks:"
-msgstr ""
-
-#: ../picard/ui/ui_options_metadata.py:109
-#: ../picard/ui/ui_options_metadata.py:110
-#: ../picard/ui/ui_options_naming.py:168 ../picard/ui/ui_options_naming.py:169
-msgid "Default"
-msgstr ""
-
-#: ../picard/ui/ui_multitageditor.py:58
-msgid "Delete"
-msgstr "删除"
-
-#: ../picard/ui/logview.py:29
-msgid "Log"
-msgstr ""
-
-#: ../picard/ui/ui_options_plugins.py:58
-msgid "Plugins"
-msgstr "插件"
-
-#: ../picard/ui/ui_options_plugins.py:60 ../picard/ui/options/plugins.py:79
-msgid "Author"
-msgstr ""
-
-#: ../picard/ui/ui_options_plugins.py:61
-msgid "Version"
-msgstr ""
-
-#: ../picard/ui/ui_options_naming.py:165
-msgid "Rename Files"
-msgstr ""
-
-#: ../picard/ui/ui_options_naming.py:166
-msgid "Replace Windows-incompatible characters"
-msgstr "将与 Windows 不相容的字符取代"
-
-#: ../picard/ui/ui_options_naming.py:167
-msgid "Replace non-ASCII characters"
-msgstr "将非 ASCII 字符取代"
-
-#: ../picard/ui/ui_options_naming.py:170 ../picard/ui/options/naming.py:90
-msgid "Multiple artist file naming format:"
-msgstr ""
-
-#: ../picard/ui/ui_options_naming.py:171 ../picard/ui/options/naming.py:86
-msgid "File naming format:"
-msgstr ""
-
-#: ../picard/ui/ui_options_naming.py:172
-msgid "Move Files"
-msgstr ""
-
-#: ../picard/ui/ui_options_naming.py:173
-msgid "Move tagged files to this directory:"
-msgstr ""
-
-#: ../picard/ui/ui_options_naming.py:174
-msgid "Browse..."
-msgstr ""
-
-#: ../picard/ui/ui_options_naming.py:175
-msgid "Move additional files:"
-msgstr ""
-
-#: ../picard/ui/ui_options_naming.py:176
-msgid "Delete empty directories"
-msgstr "删除空文件夹"
-
-#: ../picard/ui/ui_options_naming.py:177
-msgid "Example"
-msgstr ""
-
-#: ../picard/ui/ui_options_naming.py:178
-msgid "File name:"
-msgstr "文件名："
-
-#: ../picard/ui/ui_options_naming.py:179
-msgid "Multiple artist file name:"
-msgstr "各艺人文件名："
-
-#: ../picard/ui/ui_options_cdlookup.py:48
-msgid "CD-ROM device to use for lookups:"
-msgstr ""
-
-#: ../picard/ui/options/scripting.py:84 ../picard/ui/options/naming.py:86
-#: ../picard/ui/options/naming.py:90 ../picard/ui/options/naming.py:93
-#: ../picard/ui/options/naming.py:95
-msgid "Script Error"
-msgstr ""
+#: ../picard/ui/options/about.py:29
+msgid "About"
+msgstr "关于"
 
 #. Replace this with your name to have it appear in the "About" dialog.
 #: ../picard/ui/options/about.py:48
@@ -885,23 +2185,7 @@ msgstr ""
 "Launchpad Contributions:\n"
 "  Philip Jägenstedt https://launchpad.net/~philip-foolip\n"
 "  Yun https://launchpad.net/~yunheng\n"
-"\n"
-"Launchpad Contributions:\n"
-"  Lukáš Lalinský https://launchpad.net/~luks\n"
-"  Philip Jägenstedt https://launchpad.net/~philip-foolip\n"
-"  Yun https://launchpad.net/~yunheng\n"
-"\n"
-"Launchpad Contributions:\n"
 "  Justin Lei Kao https://launchpad.net/~leikao\n"
-"  Lukáš Lalinský https://launchpad.net/~luks\n"
-"  Philip Jägenstedt https://launchpad.net/~philip-foolip\n"
-"  Yun https://launchpad.net/~yunheng\n"
-"\n"
-"Launchpad Contributions:\n"
-"  Justin Lei Kao https://launchpad.net/~leikao\n"
-"  Lukáš Lalinský https://launchpad.net/~luks\n"
-"  Philip Jägenstedt https://launchpad.net/~foolip\n"
-"  Yun https://launchpad.net/~yunheng\n"
 "  rainofchaos https://launchpad.net/~rainofchaos"
 
 #. Replace LANG with language you are translatig to.
@@ -913,22 +2197,55 @@ msgstr "<br/>Translated to simplified Chinese by %s"
 #: ../picard/ui/options/about.py:55
 #, python-format
 msgid ""
-"<p align=\"center\"><span style=\"font-size:15px;font-weight:bold;"
-"\">MusicBrainz Picard</span><br/>\n"
+"<p align=\"center\"><span style=\"font-size:15px;font-weight:bold;\">MusicBrainz Picard</span><br/>\n"
 "Version %(version)s</p>\n"
 "<p align=\"center\"><strong>Supported formats</strong><br/>%(formats)s</p>\n"
 "<p align=\"center\"><strong>Please donate</strong><br/>\n"
-"Thank you for using Picard. Picard relies on the MusicBrainz database, which "
-"is operated by the MetaBrainz Foundation with the help of thousands of "
-"volunteers. If you like this application please consider donating to the "
-"MetaBrainz Foundation to keep the service running.</p>\n"
-"<p align=\"center\"><a href=\"http://metabrainz.org/donate/index.html"
-"\">Donate now!</a></p>\n"
+"Thank you for using Picard. Picard relies on the MusicBrainz database, which is operated by the MetaBrainz Foundation with the help of thousands of volunteers. If you like this application please consider donating to the MetaBrainz Foundation to keep the service running.</p>\n"
+"<p align=\"center\"><a href=\"http://metabrainz.org/donate/index.html\">Donate now!</a></p>\n"
 "<p align=\"center\"><strong>Credits</strong><br/>\n"
-"<small>Copyright © 2004-2008 Robert Kaye, Lukáš Lalinský and others%"
-"(translator-credits)s</small></p>\n"
-"<p align=\"center\"><a href=\"http://musicbrainz.org/doc/PicardTagger"
-"\">http://musicbrainz.org/doc/PicardTagger</a></p>\n"
+"<small>Copyright © 2004-2008 Robert Kaye, Lukáš Lalinský and others%(translator-credits)s</small></p>\n"
+"<p align=\"center\"><a href=\"http://musicbrainz.org/doc/PicardTagger\">http://musicbrainz.org/doc/PicardTagger</a></p>\n"
+msgstr ""
+
+#: ../picard/ui/options/advanced.py:26
+msgid "Advanced"
+msgstr "高级设置"
+
+#: ../picard/ui/options/interface.py:31
+msgid "User Interface"
+msgstr "用户界面"
+
+#: ../picard/ui/options/interface.py:47
+msgid "System default"
+msgstr ""
+
+#: ../picard/ui/options/interface.py:71
+msgid "Language changed"
+msgstr ""
+
+#: ../picard/ui/options/interface.py:71
+msgid "You have changed the interface language. You have to restart Picard in order for the change to take effect."
+msgstr ""
+
+#: ../picard/ui/options/matching.py:29
+msgid "Matching"
+msgstr ""
+
+#: ../picard/ui/options/metadata.py:52
+msgid "None"
+msgstr ""
+
+#: ../picard/ui/options/naming.py:33
+msgid "File Naming"
+msgstr "文件名格式"
+
+#: ../picard/ui/options/naming.py:86
+#: ../picard/ui/options/naming.py:90
+#: ../picard/ui/options/naming.py:93
+#: ../picard/ui/options/naming.py:95
+#: ../picard/ui/options/scripting.py:84
+msgid "Script Error"
 msgstr ""
 
 #: ../picard/ui/options/naming.py:93
@@ -947,6 +2264,260 @@ msgstr ""
 msgid "The location to move files to must not be empty."
 msgstr ""
 
+#: ../picard/ui/options/scripting.py:63
+#, fuzzy
+msgid "Scripting"
+msgstr "脚本"
+
+#: ../picard/ui/options/tags.py:29
+msgid "Tags"
+msgstr "标签"
+
+#: ../picard/util/tags.py:24
+msgid "Date"
+msgstr "日期"
+
+#: ../picard/util/tags.py:25
+msgid "Album Artist"
+msgstr "专辑艺人"
+
+#: ../picard/util/tags.py:26
+msgid "Track Number"
+msgstr "音轨号"
+
+#: ../picard/util/tags.py:27
+msgid "Total Tracks"
+msgstr ""
+
+#: ../picard/util/tags.py:28
+#, fuzzy
+msgid "Disc Number"
+msgstr "音轨号"
+
+#: ../picard/util/tags.py:29
+msgid "Total Discs"
+msgstr ""
+
+#: ../picard/util/tags.py:30
+#, fuzzy
+msgid "Album Artist Sort Order"
+msgstr "专辑艺人"
+
+#: ../picard/util/tags.py:31
+#, fuzzy
+msgid "Artist Sort Order"
+msgstr "艺人排序次序"
+
+#: ../picard/util/tags.py:32
+#, fuzzy
+msgid "Title Sort Order"
+msgstr "标题排序次序"
+
+#: ../picard/util/tags.py:33
+#, fuzzy
+msgid "Album Sort Order"
+msgstr "专辑排序次序"
+
+#: ../picard/util/tags.py:34
+msgid "ASIN"
+msgstr "ASIN"
+
+#: ../picard/util/tags.py:35
+msgid "Grouping"
+msgstr ""
+
+#: ../picard/util/tags.py:37
+msgid "ISRC"
+msgstr ""
+
+#: ../picard/util/tags.py:38
+msgid "Mood"
+msgstr "心情"
+
+#: ../picard/util/tags.py:39
+msgid "BPM"
+msgstr "BPM"
+
+#: ../picard/util/tags.py:40
+msgid "Copyright"
+msgstr "版权"
+
+#: ../picard/util/tags.py:41
+#, fuzzy
+msgid "Composer"
+msgstr "作曲者"
+
+#: ../picard/util/tags.py:42
+#, fuzzy
+msgid "Conductor"
+msgstr "指挥者"
+
+#: ../picard/util/tags.py:43
+#, fuzzy
+msgid "Lyricist"
+msgstr "歌词"
+
+#: ../picard/util/tags.py:44
+#, fuzzy
+msgid "Arranger"
+msgstr "编曲者"
+
+#: ../picard/util/tags.py:45
+#, fuzzy
+msgid "Producer"
+msgstr "制作者"
+
+#: ../picard/util/tags.py:46
+#, fuzzy
+msgid "Engineer"
+msgstr "工程师"
+
+#: ../picard/util/tags.py:47
+msgid "Subtitle"
+msgstr "副标题"
+
+#: ../picard/util/tags.py:48
+#, fuzzy
+msgid "Disc Subtitle"
+msgstr "副标题"
+
+#: ../picard/util/tags.py:49
+#, fuzzy
+msgid "Remixer"
+msgstr "混音者"
+
+#: ../picard/util/tags.py:50
+#, fuzzy
+msgid "MusicBrainz Track Id"
+msgstr "MusicBrainz Picard"
+
+#: ../picard/util/tags.py:51
+#, fuzzy
+msgid "MusicBrainz Release Id"
+msgstr "MusicBrainz Picard"
+
+#: ../picard/util/tags.py:52
+#, fuzzy
+msgid "MusicBrainz Artist Id"
+msgstr "MusicBrainz Picard"
+
+#: ../picard/util/tags.py:53
+#, fuzzy
+msgid "MusicBrainz Release Artist Id"
+msgstr "MusicBrainz Picard"
+
+#: ../picard/util/tags.py:54
+#, fuzzy
+msgid "MusicBrainz TRM Id"
+msgstr "MusicBrainz Picard"
+
+#: ../picard/util/tags.py:55
+#, fuzzy
+msgid "MusicBrainz Disc Id"
+msgstr "MusicBrainz Picard"
+
+#: ../picard/util/tags.py:56
+#, fuzzy
+msgid "MusicBrainz Sort Name"
+msgstr "MusicBrainz 服务器"
+
+#: ../picard/util/tags.py:57
+msgid "MusicIP PUID"
+msgstr ""
+
+#: ../picard/util/tags.py:58
+msgid "MusicIP Fingerprint"
+msgstr ""
+
+#: ../picard/util/tags.py:59
+msgid "Disc Id"
+msgstr ""
+
+#: ../picard/util/tags.py:60
+msgid "Website"
+msgstr "网站"
+
+#: ../picard/util/tags.py:61
+msgid "Compilation"
+msgstr "曲集"
+
+#: ../picard/util/tags.py:62
+msgid "Comment"
+msgstr "注释"
+
+#: ../picard/util/tags.py:63
+#, fuzzy
+msgid "Genre"
+msgstr "体裁"
+
+#: ../picard/util/tags.py:64
+#, fuzzy
+msgid "Encoded By"
+msgstr "编码者"
+
+#: ../picard/util/tags.py:65
+#, fuzzy
+msgid "Performer"
+msgstr "演奏者"
+
+#: ../picard/util/tags.py:66
+#, fuzzy
+msgid "Release Type"
+msgstr "版本类型"
+
+#: ../picard/util/tags.py:67
+#, fuzzy
+msgid "Release Status"
+msgstr "版本情况"
+
+#: ../picard/util/tags.py:68
+msgid "Release Country"
+msgstr "版本地区"
+
+#: ../picard/util/tags.py:69
+msgid "Record Label"
+msgstr "唱片公司"
+
+#: ../picard/util/tags.py:70
+msgid "Barcode"
+msgstr "条形码"
+
+#: ../picard/util/tags.py:71
+#, fuzzy
+msgid "Catalog Number"
+msgstr "音轨号"
+
+#: ../picard/util/tags.py:72
+msgid "Format"
+msgstr ""
+
+#: ../picard/util/tags.py:73
+#, fuzzy
+msgid "DJ-Mixer"
+msgstr "混音者"
+
+#: ../picard/util/tags.py:74
+#, fuzzy
+msgid "Media"
+msgstr "元数据"
+
+#: ../picard/util/tags.py:75
+msgid "Lyrics"
+msgstr "歌词"
+
+#: ../picard/util/tags.py:76
+msgid "Mixer"
+msgstr "混音者"
+
+#: ../picard/util/tags.py:77
+msgid "Language"
+msgstr ""
+
+#: ../picard/util/tags.py:78
+#, fuzzy
+msgid "Script"
+msgstr "脚本"
+
 #: ../picard/util/webbrowser2.py:84
 msgid "Web Browser Error"
 msgstr ""
@@ -962,80 +2533,15 @@ msgstr ""
 "\n"
 "%s"
 
-#~ msgid "PLS Playlist (*.pls)"
-#~ msgstr "PLS播放列表 (*.pls)"
+#, fuzzy
+#~ msgid "New Version"
+#~ msgstr "更新的版本"
 
-#~ msgid "XSPF Playlist (*.xspf)"
-#~ msgstr "XSPF播放列表 (*.xfps)"
+#, fuzzy
+#~ msgid ""
+#~ "New version of Picard is available (%s). Would you like to download it "
+#~ "now?"
+#~ msgstr "更新Picard版本已发表了(%s)。你现在想下载吗？"
+#~ msgid "Delete"
+#~ msgstr "删除"
 
-#~ msgid "Length"
-#~ msgstr "时长"
-
-#~ msgid "&Ok"
-#~ msgstr "确定(&O)"
-
-#~ msgid "&Cancel"
-#~ msgstr "取消(&C)"
-
-#~ msgid "About"
-#~ msgstr "关于"
-
-#~ msgid "Advanced"
-#~ msgstr "高级设置"
-
-#~ msgid "File Naming"
-#~ msgstr "文件名格式"
-
-#~ msgid "Tags"
-#~ msgstr "标签"
-
-#~ msgid "User Interface"
-#~ msgstr "用户界面"
-
-#~ msgid "Date"
-#~ msgstr "日期"
-
-#~ msgid "Album Artist"
-#~ msgstr "专辑艺人"
-
-#~ msgid "Track Number"
-#~ msgstr "音轨号"
-
-#~ msgid "ASIN"
-#~ msgstr "ASIN"
-
-#~ msgid "Mood"
-#~ msgstr "心情"
-
-#~ msgid "BPM"
-#~ msgstr "BPM"
-
-#~ msgid "Copyright"
-#~ msgstr "版权"
-
-#~ msgid "Subtitle"
-#~ msgstr "副标题"
-
-#~ msgid "Website"
-#~ msgstr "网站"
-
-#~ msgid "Compilation"
-#~ msgstr "曲集"
-
-#~ msgid "Comment"
-#~ msgstr "注释"
-
-#~ msgid "Record Label"
-#~ msgstr "唱片公司"
-
-#~ msgid "Barcode"
-#~ msgstr "条形码"
-
-#~ msgid "Lyrics"
-#~ msgstr "歌词"
-
-#~ msgid "Mixer"
-#~ msgstr "混音者"
-
-#~ msgid "Toolbar"
-#~ msgstr "工具条"
diff --git a/ui/options_interface.ui b/ui/options_interface.ui
index c78701ac6..295c295e6 100644
--- a/ui/options_interface.ui
+++ b/ui/options_interface.ui
@@ -5,8 +5,8 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>276</width>
-    <height>196</height>
+    <width>287</width>
+    <height>200</height>
    </rect>
   </property>
   <layout class="QVBoxLayout" >
@@ -37,6 +37,33 @@
         </property>
        </widget>
       </item>
+      <item>
+       <widget class="QLabel" name="label" >
+        <property name="text" >
+         <string>User interface language:</string>
+        </property>
+       </widget>
+      </item>
+      <item>
+       <layout class="QHBoxLayout" name="horizontalLayout" >
+        <item>
+         <widget class="QComboBox" name="ui_language" />
+        </item>
+        <item>
+         <spacer name="horizontalSpacer" >
+          <property name="orientation" >
+           <enum>Qt::Horizontal</enum>
+          </property>
+          <property name="sizeHint" stdset="0" >
+           <size>
+            <width>40</width>
+            <height>20</height>
+           </size>
+          </property>
+         </spacer>
+        </item>
+       </layout>
+      </item>
      </layout>
     </widget>
    </item>
@@ -45,7 +72,7 @@
      <property name="orientation" >
       <enum>Qt::Vertical</enum>
      </property>
-     <property name="sizeHint" >
+     <property name="sizeHint" stdset="0" >
       <size>
        <width>220</width>
        <height>61</height>