diff --git a/po/af.po b/po/af.po
index d92062d19..fcb6d324b 100644
--- a/po/af.po
+++ b/po/af.po
@@ -6,8 +6,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: picard\n"
-"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2009-02-24 18:58+0100\n"
+"Report-Msgid-Bugs-To: http://bugs.musicbrainz.org/\n"
+"POT-Creation-Date: 2009-04-06 22:50+0200\n"
 "PO-Revision-Date: 2009-03-16 14:32+0000\n"
 "Last-Translator: Darryl Smith <semiintel@gmail.com>\n"
 "Language-Team: Afrikaans <af@li.org>\n"
@@ -18,16 +18,16 @@ msgstr ""
 "X-Launchpad-Export-Date: 2009-04-06 20:21+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
-#: ../picard/album.py:108 ../picard/cluster.py:248
+#: ../picard/album.py:109 ../picard/cluster.py:248
 msgid "Unmatched Files"
 msgstr ""
 
-#: ../picard/album.py:281
+#: ../picard/album.py:287
 #, python-format
 msgid "[could not load album %s]"
 msgstr ""
 
-#: ../picard/album.py:317
+#: ../picard/album.py:320
 msgid "[loading album information]"
 msgstr ""
 
@@ -587,7 +587,7 @@ msgid "Namibia"
 msgstr ""
 
 #: ../picard/const.py:182
-msgid "Vanuat"
+msgid "Vanuatu"
 msgstr ""
 
 #: ../picard/const.py:183
@@ -1031,223 +1031,235 @@ msgid "Congo, The Democratic Republic of the"
 msgstr ""
 
 #: ../picard/const.py:293
-msgid "Serbia and Montenegro"
+msgid "Serbia and Montenegro (historical, 2003-2006)"
 msgstr ""
 
 #: ../picard/const.py:294
-msgid "Croatia"
-msgstr ""
+#, fuzzy
+msgid "Serbia"
+msgstr "Nigeria"
 
 #: ../picard/const.py:295
-msgid "Korea (North), Democratic People's Republic of"
+msgid "Montenegro"
 msgstr ""
 
 #: ../picard/const.py:296
-msgid "Korea (South), Republic of"
+msgid "Croatia"
 msgstr ""
 
 #: ../picard/const.py:297
-msgid "Slovakia"
+msgid "Korea (North), Democratic People's Republic of"
 msgstr ""
 
 #: ../picard/const.py:298
-msgid "Soviet Union (historical, 1922-1991)"
+msgid "Korea (South), Republic of"
 msgstr ""
 
 #: ../picard/const.py:299
-msgid "East Timor"
+msgid "Slovakia"
 msgstr ""
 
 #: ../picard/const.py:300
-msgid "Czechoslovakia (historical, 1918-1992)"
+msgid "Soviet Union (historical, 1922-1991)"
 msgstr ""
 
 #: ../picard/const.py:301
-msgid "Europe"
+msgid "East Timor"
 msgstr ""
 
 #: ../picard/const.py:302
-msgid "East Germany (historical, 1949-1990)"
+msgid "Czechoslovakia (historical, 1918-1992)"
 msgstr ""
 
 #: ../picard/const.py:303
-msgid "[Unknown Country]"
+msgid "Europe"
 msgstr ""
 
 #: ../picard/const.py:304
-msgid "[Worldwide]"
+msgid "East Germany (historical, 1949-1990)"
 msgstr ""
 
 #: ../picard/const.py:305
+msgid "[Unknown Country]"
+msgstr ""
+
+#: ../picard/const.py:306
+msgid "[Worldwide]"
+msgstr ""
+
+#: ../picard/const.py:307
 msgid "Yugoslavia (historical, 1918-1992)"
 msgstr ""
 
-#: ../picard/const.py:310
-msgid "Catalan"
-msgstr ""
-
-#: ../picard/const.py:311
-msgid "Czech"
-msgstr ""
-
 #: ../picard/const.py:312
-msgid "Welsh"
+msgid "Afrikaans"
 msgstr ""
 
 #: ../picard/const.py:313
-msgid "Danish"
+msgid "Arabic"
 msgstr ""
 
 #: ../picard/const.py:314
-msgid "German"
+msgid "Catalan"
 msgstr ""
 
 #: ../picard/const.py:315
-msgid "English"
+msgid "Czech"
 msgstr ""
 
 #: ../picard/const.py:316
-msgid "English (Canada)"
+msgid "Welsh"
 msgstr ""
 
 #: ../picard/const.py:317
-msgid "English (UK)"
+msgid "Danish"
 msgstr ""
 
 #: ../picard/const.py:318
-msgid "Spanish"
+msgid "German"
 msgstr ""
 
 #: ../picard/const.py:319
-msgid "Persian"
+msgid "English"
 msgstr ""
 
 #: ../picard/const.py:320
-msgid "Finnish"
+msgid "English (Canada)"
 msgstr ""
 
 #: ../picard/const.py:321
-msgid "French"
+msgid "English (UK)"
 msgstr ""
 
 #: ../picard/const.py:322
-msgid "Frisian"
+msgid "Spanish"
 msgstr ""
 
 #: ../picard/const.py:323
-msgid "Hebrew"
+msgid "Persian"
 msgstr ""
 
 #: ../picard/const.py:324
-msgid "Hungarian"
+msgid "Finnish"
 msgstr ""
 
 #: ../picard/const.py:325
-msgid "Islandic"
+msgid "French"
 msgstr ""
 
 #: ../picard/const.py:326
-msgid "Italian"
+msgid "Frisian"
 msgstr ""
 
 #: ../picard/const.py:327
-msgid "Kannada"
+msgid "Hebrew"
 msgstr ""
 
 #: ../picard/const.py:328
-msgid "Korean"
+msgid "Hindi"
 msgstr ""
 
 #: ../picard/const.py:329
-msgid "Lithuanian"
+msgid "Hungarian"
 msgstr ""
 
 #: ../picard/const.py:330
-msgid "Norwegian Bokmal"
+msgid "Islandic"
 msgstr ""
 
 #: ../picard/const.py:331
-msgid "Dutch"
+msgid "Italian"
 msgstr ""
 
 #: ../picard/const.py:332
-msgid "Polish"
+msgid "Kannada"
 msgstr ""
 
 #: ../picard/const.py:333
-msgid "Portuguese"
+msgid "Korean"
 msgstr ""
 
 #: ../picard/const.py:334
-msgid "Brazilian Portuguese"
+msgid "Lithuanian"
 msgstr ""
 
 #: ../picard/const.py:335
-msgid "Romanian"
+msgid "Norwegian Bokmal"
 msgstr ""
 
 #: ../picard/const.py:336
-msgid "Russian"
+msgid "Dutch"
 msgstr ""
 
 #: ../picard/const.py:337
-msgid "Scots"
+msgid "Polish"
 msgstr ""
 
 #: ../picard/const.py:338
-msgid "Slovak"
+msgid "Portuguese"
 msgstr ""
 
 #: ../picard/const.py:339
-msgid "Slovenian"
+msgid "Brazilian Portuguese"
 msgstr ""
 
 #: ../picard/const.py:340
-msgid "Swedish"
+msgid "Romanian"
 msgstr ""
 
 #: ../picard/const.py:341
+msgid "Russian"
+msgstr ""
+
+#: ../picard/const.py:342
+msgid "Scots"
+msgstr ""
+
+#: ../picard/const.py:343
+msgid "Slovak"
+msgstr ""
+
+#: ../picard/const.py:344
+msgid "Slovenian"
+msgstr ""
+
+#: ../picard/const.py:345
+msgid "Swedish"
+msgstr ""
+
+#: ../picard/const.py:346
+msgid "Turkish"
+msgstr ""
+
+#: ../picard/const.py:347
 msgid "Chinese"
 msgstr ""
 
-#: ../picard/file.py:487
+#: ../picard/file.py:494
 #, python-format
 msgid "No matching tracks for file %s"
 msgstr ""
 
-#: ../picard/file.py:504
+#: ../picard/file.py:511
 #, python-format
 msgid "No matching tracks above the threshold for file %s"
 msgstr ""
 
-#: ../picard/file.py:507
+#: ../picard/file.py:514
 #, python-format
 msgid "File %s identified!"
 msgstr ""
 
-#: ../picard/file.py:518
+#: ../picard/file.py:525
 #, python-format
 msgid "Looking up the PUID for file %s..."
 msgstr ""
 
-#: ../picard/file.py:523
+#: ../picard/file.py:530
 #, 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 ""
@@ -1260,11 +1272,24 @@ msgstr ""
 msgid "XSPF Playlist (*.xspf)"
 msgstr ""
 
-#: ../picard/tagger.py:476
-msgid "CD Lookup Error"
+#: ../picard/puidmanager.py:62
+msgid "Submitting PUIDs..."
+msgstr ""
+
+#: ../picard/puidmanager.py:68
+#, python-format
+msgid "PUIDs submission failed: %s"
+msgstr ""
+
+#: ../picard/puidmanager.py:70
+msgid "PUIDs successfully submitted!"
 msgstr ""
 
 #: ../picard/tagger.py:477
+msgid "CD Lookup Error"
+msgstr ""
+
+#: ../picard/tagger.py:478
 #, python-format
 msgid ""
 "Error while reading CD:\n"
@@ -1272,7 +1297,7 @@ msgid ""
 "%s"
 msgstr ""
 
-#: ../picard/tagger.py:503
+#: ../picard/tagger.py:504
 #, python-format
 msgid "Could not find PUID for file %s"
 msgstr ""
@@ -1325,15 +1350,27 @@ msgstr ""
 msgid "Length"
 msgstr ""
 
-#: ../picard/ui/itemviews.py:327
+#: ../picard/ui/itemviews.py:289
+msgid "&Expand all"
+msgstr ""
+
+#: ../picard/ui/itemviews.py:291
+msgid "&Collapse all"
+msgstr ""
+
+#: ../picard/ui/itemviews.py:332
 msgid "&Releases"
 msgstr ""
 
-#: ../picard/ui/itemviews.py:353
+#: ../picard/ui/itemviews.py:349
+msgid "No release event"
+msgstr ""
+
+#: ../picard/ui/itemviews.py:359
 msgid "&Plugins"
 msgstr ""
 
-#: ../picard/ui/itemviews.py:523
+#: ../picard/ui/itemviews.py:533
 msgid "Clusters"
 msgstr ""
 
@@ -1341,95 +1378,6 @@ msgstr ""
 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:66 ../picard/ui/ui_options_plugins.py:62
-msgid "Details"
-msgstr ""
-
-#: ../picard/ui/tageditor.py:71 ../picard/ui/tageditor.py:264
-#, python-format
-msgid "%d file"
-msgid_plural "%d files"
-msgstr[0] ""
-msgstr[1] ""
-
-#: ../picard/ui/tageditor.py:131
-#, python-format
-msgid "(different across %d file)"
-msgid_plural "(different across %d files)"
-msgstr[0] ""
-msgstr[1] ""
-
-#: ../picard/ui/tageditor.py:134
-#, python-format
-msgid "(missing from %d file)"
-msgid_plural "(missing from %d files)"
-msgstr[0] ""
-msgstr[1] ""
-
-#: ../picard/ui/tageditor.py:233
-msgid "Filename:"
-msgstr ""
-
-#: ../picard/ui/tageditor.py:235
-msgid "Format:"
-msgstr ""
-
-#: ../picard/ui/tageditor.py:244
-msgid "Size:"
-msgstr ""
-
-#: ../picard/ui/tageditor.py:248 ../picard/ui/ui_metadata.py:127
-msgid "Length:"
-msgstr ""
-
-#: ../picard/ui/tageditor.py:250
-msgid "Bitrate:"
-msgstr ""
-
-#: ../picard/ui/tageditor.py:252
-msgid "Sample rate:"
-msgstr ""
-
-#: ../picard/ui/tageditor.py:254
-msgid "Bits per sample:"
-msgstr ""
-
-#: ../picard/ui/tageditor.py:257
-msgid "Mono"
-msgstr ""
-
-#: ../picard/ui/tageditor.py:258
-msgid "Stereo"
-msgstr ""
-
-#: ../picard/ui/tageditor.py:260
-msgid "Channels:"
-msgstr ""
-
-#: ../picard/ui/tagsfromfilenames.py:52 ../picard/ui/tagsfromfilenames.py:96
-msgid "File Name"
-msgstr ""
-
 #: ../picard/ui/mainwindow.py:64
 msgid "MusicBrainz Picard"
 msgstr ""
@@ -1666,6 +1614,10 @@ msgstr ""
 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 ""
@@ -1685,12 +1637,97 @@ msgstr ""
 msgid " (Error: %s)"
 msgstr ""
 
+#: ../picard/ui/puidsubmit.py:31 ../picard/ui/options/plugins.py:85
+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/passworddialog.py:38
 #, python-format
 msgid ""
 "The server %s requires you to login. Please enter your username and password."
 msgstr ""
 
+#: ../picard/ui/tageditor.py:66 ../picard/ui/ui_options_plugins.py:62
+msgid "Details"
+msgstr ""
+
+#: ../picard/ui/tageditor.py:71 ../picard/ui/tageditor.py:264
+#, python-format
+msgid "%d file"
+msgid_plural "%d files"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../picard/ui/tageditor.py:131
+#, python-format
+msgid "(different across %d file)"
+msgid_plural "(different across %d files)"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../picard/ui/tageditor.py:134
+#, python-format
+msgid "(missing from %d file)"
+msgid_plural "(missing from %d files)"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../picard/ui/tageditor.py:233
+msgid "Filename:"
+msgstr ""
+
+#: ../picard/ui/tageditor.py:235
+msgid "Format:"
+msgstr ""
+
+#: ../picard/ui/tageditor.py:244
+msgid "Size:"
+msgstr ""
+
+#: ../picard/ui/tageditor.py:248 ../picard/ui/ui_metadata.py:127
+msgid "Length:"
+msgstr ""
+
+#: ../picard/ui/tageditor.py:250
+msgid "Bitrate:"
+msgstr ""
+
+#: ../picard/ui/tageditor.py:252
+msgid "Sample rate:"
+msgstr ""
+
+#: ../picard/ui/tageditor.py:254
+msgid "Bits per sample:"
+msgstr ""
+
+#: ../picard/ui/tageditor.py:257
+msgid "Mono"
+msgstr ""
+
+#: ../picard/ui/tageditor.py:258
+msgid "Stereo"
+msgstr ""
+
+#: ../picard/ui/tageditor.py:260
+msgid "Channels:"
+msgstr ""
+
+#: ../picard/ui/tagsfromfilenames.py:54 ../picard/ui/tagsfromfilenames.py:99
+msgid "File Name"
+msgstr ""
+
 #: ../picard/ui/ui_cdlookup.py:60 ../picard/ui/ui_options_cdlookup.py:47
 #: ../picard/ui/ui_options_cdlookup_select.py:48
 #: ../picard/ui/options/cdlookup.py:36
@@ -1713,24 +1750,6 @@ msgstr ""
 msgid "Cancel"
 msgstr ""
 
-#: ../picard/ui/ui_passworddialog.py:78
-msgid "Authentication required"
-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"
-msgstr ""
-
 #: ../picard/ui/ui_edittagdialog.py:44
 msgid "Edit Tag"
 msgstr ""
@@ -1767,6 +1786,10 @@ msgstr ""
 msgid "Options"
 msgstr ""
 
+#: ../picard/ui/ui_puidsubmit.py:52
+msgid "Submit PUIDs"
+msgstr ""
+
 #: ../picard/ui/ui_options_cdlookup.py:48
 msgid "CD-ROM device to use for lookups:"
 msgstr ""
@@ -1791,6 +1814,22 @@ msgstr ""
 msgid "Overwrite the file if it already exists"
 msgstr ""
 
+#: ../picard/ui/ui_options_moving.py:53
+msgid "Move additional files:"
+msgstr ""
+
+#: ../picard/ui/ui_options_moving.py:54
+msgid "Browse..."
+msgstr ""
+
+#: ../picard/ui/ui_options_moving.py:55
+msgid "Delete empty directories"
+msgstr ""
+
+#: ../picard/ui/ui_options_moving.py:56
+msgid "Move files to this directory when saving:"
+msgstr ""
+
 #: ../picard/ui/util.py:31
 msgid "&Ok"
 msgstr ""
@@ -1799,44 +1838,40 @@ msgstr ""
 msgid "&Cancel"
 msgstr ""
 
-#: ../picard/ui/ui_puidsubmit.py:52
-msgid "Submit PUIDs"
-msgstr ""
-
-#: ../picard/ui/ui_tageditor.py:139 ../picard/ui/ui_options_plugins.py:59
-#: ../picard/ui/options/plugins.py:76
+#: ../picard/ui/ui_tageditor.py:128 ../picard/ui/ui_options_plugins.py:59
+#: ../picard/ui/options/plugins.py:81
 msgid "Name"
 msgstr ""
 
-#: ../picard/ui/ui_tageditor.py:140
+#: ../picard/ui/ui_tageditor.py:129
 msgid "Value"
 msgstr ""
 
-#: ../picard/ui/ui_tageditor.py:141
+#: ../picard/ui/ui_tageditor.py:130
 msgid "Rating:"
 msgstr ""
 
-#: ../picard/ui/ui_tageditor.py:142
+#: ../picard/ui/ui_tageditor.py:131
 msgid "&Add..."
 msgstr ""
 
-#: ../picard/ui/ui_tageditor.py:143
+#: ../picard/ui/ui_tageditor.py:132
 msgid "&Edit..."
 msgstr ""
 
-#: ../picard/ui/ui_tageditor.py:144
+#: ../picard/ui/ui_tageditor.py:133
 msgid "&Delete"
 msgstr ""
 
-#: ../picard/ui/ui_tageditor.py:145
+#: ../picard/ui/ui_tageditor.py:134
 msgid "&Metadata"
 msgstr ""
 
-#: ../picard/ui/ui_tageditor.py:146
+#: ../picard/ui/ui_tageditor.py:135
 msgid "A&rtwork"
 msgstr ""
 
-#: ../picard/ui/ui_tageditor.py:147
+#: ../picard/ui/ui_tageditor.py:136
 msgid "&Info"
 msgstr ""
 
@@ -1881,6 +1916,40 @@ msgstr ""
 msgid ", "
 msgstr ""
 
+#: ../picard/ui/ui_options_general.py:108
+msgid "MusicBrainz Server"
+msgstr ""
+
+#: ../picard/ui/ui_options_general.py:109 ../picard/ui/ui_options_proxy.py:72
+msgid "Port:"
+msgstr ""
+
+#: ../picard/ui/ui_options_general.py:110 ../picard/ui/ui_options_proxy.py:73
+msgid "Server address:"
+msgstr ""
+
+#: ../picard/ui/ui_options_general.py:111
+msgid "Account Information"
+msgstr ""
+
+#: ../picard/ui/ui_options_general.py:112 ../picard/ui/ui_options_proxy.py:70
+#: ../picard/ui/ui_passworddialog.py:80
+msgid "Password:"
+msgstr ""
+
+#: ../picard/ui/ui_options_general.py:113 ../picard/ui/ui_options_proxy.py:71
+#: ../picard/ui/ui_passworddialog.py:79
+msgid "Username:"
+msgstr ""
+
+#: ../picard/ui/ui_options_general.py:114 ../picard/ui/options/general.py:29
+msgid "General"
+msgstr ""
+
+#: ../picard/ui/ui_options_general.py:115
+msgid "Automatically scan all new files"
+msgstr ""
+
 #: ../picard/ui/ui_options_interface.py:50
 msgid "Miscellaneous"
 msgstr ""
@@ -1901,113 +1970,6 @@ msgstr ""
 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_options_naming.py:180
-#: ../picard/ui/ui_tagsfromfilenames.py:58
-msgid "&Preview"
-msgstr ""
-
-#: ../picard/ui/ui_options_proxy.py:81 ../picard/ui/options/proxy.py:28
-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_options_ratings.py:45
-msgid "Enable track ratings"
-msgstr ""
-
-#: ../picard/ui/ui_options_ratings.py:46
-msgid ""
-"Picard saves the ratings together with an e-mail address identifying the "
-"user who did the rating. That way different ratings for different users can "
-"be stored in the files. Please sepcify the e-mail you want to use to save "
-"your ratings."
-msgstr ""
-
-#: ../picard/ui/ui_options_ratings.py:47
-msgid "E-mail:"
-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 ../picard/ui/options/general.py:29
-msgid "General"
-msgstr ""
-
-#: ../picard/ui/ui_options_general.py:115
-msgid "Automatically scan all new files"
-msgstr ""
-
 #: ../picard/ui/ui_options_matching.py:105
 msgid "Thresholds"
 msgstr ""
@@ -2064,72 +2026,143 @@ msgstr ""
 msgid "Non-album tracks:"
 msgstr ""
 
-#: ../picard/ui/ui_options_plugins.py:58 ../picard/ui/options/plugins.py:30
+#: ../picard/ui/ui_options_metadata.py:109
+#: ../picard/ui/ui_options_metadata.py:110
+#: ../picard/ui/ui_options_renaming.py:155
+#: ../picard/ui/ui_options_renaming.py:158
+msgid "Default"
+msgstr ""
+
+#: ../picard/ui/ui_options_plugins.py:58 ../picard/ui/options/plugins.py:34
 msgid "Plugins"
 msgstr ""
 
-#: ../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:84
 msgid "Author"
 msgstr ""
 
-#: ../picard/ui/ui_options_plugins.py:61 ../picard/util/tags.py:36
+#: ../picard/ui/ui_options_plugins.py:61 ../picard/util/tags.py:37
 msgid "Version"
 msgstr ""
 
-#: ../picard/ui/ui_options_script.py:52
+#: ../picard/ui/ui_options_proxy.py:69 ../picard/ui/options/proxy.py:28
+msgid "Web Proxy"
+msgstr ""
+
+#: ../picard/ui/ui_options_ratings.py:45
+msgid "Enable track ratings"
+msgstr ""
+
+#: ../picard/ui/ui_options_ratings.py:46
+msgid ""
+"Picard saves the ratings together with an e-mail address identifying the "
+"user who did the rating. That way different ratings for different users can "
+"be stored in the files. Please sepcify the e-mail you want to use to save "
+"your ratings."
+msgstr ""
+
+#: ../picard/ui/ui_options_ratings.py:47
+msgid "E-mail:"
+msgstr ""
+
+#: ../picard/ui/ui_options_renaming.py:145
+msgid "Form"
+msgstr ""
+
+#: ../picard/ui/ui_options_renaming.py:146
+msgid "Rename files when saving"
+msgstr ""
+
+#: ../picard/ui/ui_options_renaming.py:147
+msgid "Replace non-ASCII characters"
+msgstr ""
+
+#: ../picard/ui/ui_options_renaming.py:148
+msgid "Replace Windows-incompatible characters"
+msgstr ""
+
+#: ../picard/ui/ui_options_renaming.py:149
+msgid "Name files like this"
+msgstr ""
+
+#: ../picard/ui/ui_options_renaming.py:156
+msgid "Name multiple artist albums differently"
+msgstr ""
+
+#: ../picard/ui/ui_options_renaming.py:157
+msgid "Copy from above"
+msgstr ""
+
+#: ../picard/ui/ui_options_renaming.py:159
+msgid "Examples"
+msgstr ""
+
+#: ../picard/ui/ui_options_script.py:43
 msgid "Tagger Script"
 msgstr ""
 
-#: ../picard/ui/ui_options_tags.py:85
-msgid "Common"
+#: ../picard/ui/ui_options_tags.py:97
+msgid "Do not write tags to files"
 msgstr ""
 
-#: ../picard/ui/ui_options_tags.py:86
-msgid "Clear existing tags before writing new tags"
+#: ../picard/ui/ui_options_tags.py:98
+msgid "Before tagging"
 msgstr ""
 
-#: ../picard/ui/ui_options_tags.py:87
-msgid "Don not write tags to files"
+#: ../picard/ui/ui_options_tags.py:99
+msgid "Clear existing tags"
 msgstr ""
 
-#: ../picard/ui/ui_options_tags.py:88
-msgid "ID3"
-msgstr ""
-
-#: ../picard/ui/ui_options_tags.py:89
-msgid "Write ID3v1 tags to the files"
-msgstr ""
-
-#: ../picard/ui/ui_options_tags.py:90
-msgid "Write ID3v2 version 2.3 tags (2.4 is default)"
-msgstr ""
-
-#: ../picard/ui/ui_options_tags.py:91
-msgid "Text encoding to use while writing ID3v2 tags:"
-msgstr ""
-
-#: ../picard/ui/ui_options_tags.py:92
-msgid "ISO-8859-1"
-msgstr ""
-
-#: ../picard/ui/ui_options_tags.py:93
-msgid "UTF-16"
-msgstr ""
-
-#: ../picard/ui/ui_options_tags.py:94
-msgid "UTF-8"
-msgstr ""
-
-#: ../picard/ui/ui_options_tags.py:95
+#: ../picard/ui/ui_options_tags.py:100
 msgid "Remove ID3 tags from FLAC files"
 msgstr ""
 
-#: ../picard/ui/ui_options_tags.py:96
-msgid "APE"
+#: ../picard/ui/ui_options_tags.py:101
+msgid "Remove APEv2 tags from MP3 files"
 msgstr ""
 
-#: ../picard/ui/ui_options_tags.py:97
-msgid "Remove APEv2 tags from MP3 files"
+#: ../picard/ui/ui_options_tags.py:102
+msgid "Tag compatibility"
+msgstr ""
+
+#: ../picard/ui/ui_options_tags.py:103
+msgid "ID3v2 version"
+msgstr ""
+
+#: ../picard/ui/ui_options_tags.py:104
+msgid "2.4"
+msgstr ""
+
+#: ../picard/ui/ui_options_tags.py:105
+msgid "2.3"
+msgstr ""
+
+#: ../picard/ui/ui_options_tags.py:106
+msgid "Also include ID3v1 tags in the files"
+msgstr ""
+
+#: ../picard/ui/ui_options_tags.py:107
+msgid "ID3v2 text encoding"
+msgstr ""
+
+#: ../picard/ui/ui_options_tags.py:108
+msgid "UTF-8"
+msgstr ""
+
+#: ../picard/ui/ui_options_tags.py:109
+msgid "UTF-16"
+msgstr ""
+
+#: ../picard/ui/ui_options_tags.py:110
+msgid "ISO-8859-1"
+msgstr ""
+
+#: ../picard/ui/ui_passworddialog.py:78
+msgid "Authentication required"
+msgstr ""
+
+#: ../picard/ui/ui_passworddialog.py:81
+msgid "Save username and password"
 msgstr ""
 
 #: ../picard/ui/ui_tagsfromfilenames.py:56
@@ -2140,6 +2173,10 @@ msgstr ""
 msgid "Replace underscores with spaces"
 msgstr ""
 
+#: ../picard/ui/ui_tagsfromfilenames.py:58
+msgid "&Preview"
+msgstr ""
+
 #: ../picard/ui/options/about.py:29
 msgid "About"
 msgstr ""
@@ -2160,8 +2197,8 @@ 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"
@@ -2169,14 +2206,13 @@ msgid ""
 "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\"><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/P"
-"icardTagger</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
@@ -2209,42 +2245,44 @@ msgstr ""
 msgid "None"
 msgstr ""
 
-#: ../picard/ui/options/naming.py:33
-msgid "File Naming"
+#: ../picard/ui/options/moving.py:33
+msgid "Moving files"
 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 ""
-
-#: ../picard/ui/options/naming.py:95
-msgid "The multiple artist file naming format must not be empty."
-msgstr ""
-
-#: ../picard/ui/options/naming.py:97
+#: ../picard/ui/options/moving.py:65
 msgid "Error"
 msgstr ""
 
-#: ../picard/ui/options/naming.py:97
+#: ../picard/ui/options/moving.py:65
 msgid "The location to move files to must not be empty."
 msgstr ""
 
-#: ../picard/ui/options/scripting.py:63
-msgid "Scripting"
+#: ../picard/ui/options/ratings.py:29
+msgid "Ratings"
 msgstr ""
 
 #: ../picard/ui/options/tags.py:29
 msgid "Tags"
 msgstr ""
 
-#: ../picard/ui/options/ratings.py:29
-msgid "Ratings"
+#: ../picard/ui/options/renaming.py:35
+msgid "File naming"
+msgstr ""
+
+#: ../picard/ui/options/renaming.py:123
+msgid "The file naming format must not be empty."
+msgstr ""
+
+#: ../picard/ui/options/renaming.py:133
+msgid "The multiple artist file naming format must not be empty."
+msgstr ""
+
+#: ../picard/ui/options/scripting.py:63
+msgid "Scripting"
+msgstr ""
+
+#: ../picard/ui/options/scripting.py:97
+msgid "Script Error"
 msgstr ""
 
 #: ../picard/util/tags.py:24
@@ -2252,214 +2290,218 @@ msgid "Date"
 msgstr ""
 
 #: ../picard/util/tags.py:25
-msgid "Album Artist"
+msgid "Original Release Date"
 msgstr ""
 
 #: ../picard/util/tags.py:26
-msgid "Track Number"
+msgid "Album Artist"
 msgstr ""
 
 #: ../picard/util/tags.py:27
-msgid "Total Tracks"
+msgid "Track Number"
 msgstr ""
 
 #: ../picard/util/tags.py:28
-msgid "Disc Number"
+msgid "Total Tracks"
 msgstr ""
 
 #: ../picard/util/tags.py:29
-msgid "Total Discs"
+msgid "Disc Number"
 msgstr ""
 
 #: ../picard/util/tags.py:30
-msgid "Album Artist Sort Order"
+msgid "Total Discs"
 msgstr ""
 
 #: ../picard/util/tags.py:31
-msgid "Artist Sort Order"
+msgid "Album Artist Sort Order"
 msgstr ""
 
 #: ../picard/util/tags.py:32
-msgid "Title Sort Order"
+msgid "Artist Sort Order"
 msgstr ""
 
 #: ../picard/util/tags.py:33
-msgid "Album Sort Order"
+msgid "Title Sort Order"
 msgstr ""
 
 #: ../picard/util/tags.py:34
-msgid "ASIN"
+msgid "Album Sort Order"
 msgstr ""
 
 #: ../picard/util/tags.py:35
+msgid "ASIN"
+msgstr ""
+
+#: ../picard/util/tags.py:36
 msgid "Grouping"
 msgstr ""
 
-#: ../picard/util/tags.py:37
+#: ../picard/util/tags.py:38
 msgid "ISRC"
 msgstr ""
 
-#: ../picard/util/tags.py:38
+#: ../picard/util/tags.py:39
 msgid "Mood"
 msgstr ""
 
-#: ../picard/util/tags.py:39
+#: ../picard/util/tags.py:40
 msgid "BPM"
 msgstr ""
 
-#: ../picard/util/tags.py:40
+#: ../picard/util/tags.py:41
 msgid "Copyright"
 msgstr ""
 
-#: ../picard/util/tags.py:41
+#: ../picard/util/tags.py:42
 msgid "Composer"
 msgstr ""
 
-#: ../picard/util/tags.py:42
+#: ../picard/util/tags.py:43
 msgid "Conductor"
 msgstr ""
 
-#: ../picard/util/tags.py:43
+#: ../picard/util/tags.py:44
 msgid "Lyricist"
 msgstr ""
 
-#: ../picard/util/tags.py:44
+#: ../picard/util/tags.py:45
 msgid "Arranger"
 msgstr ""
 
-#: ../picard/util/tags.py:45
+#: ../picard/util/tags.py:46
 msgid "Producer"
 msgstr ""
 
-#: ../picard/util/tags.py:46
+#: ../picard/util/tags.py:47
 msgid "Engineer"
 msgstr ""
 
-#: ../picard/util/tags.py:47
+#: ../picard/util/tags.py:48
 msgid "Subtitle"
 msgstr ""
 
-#: ../picard/util/tags.py:48
+#: ../picard/util/tags.py:49
 msgid "Disc Subtitle"
 msgstr ""
 
-#: ../picard/util/tags.py:49
+#: ../picard/util/tags.py:50
 msgid "Remixer"
 msgstr ""
 
-#: ../picard/util/tags.py:50
+#: ../picard/util/tags.py:51
 msgid "MusicBrainz Track Id"
 msgstr ""
 
-#: ../picard/util/tags.py:51
+#: ../picard/util/tags.py:52
 msgid "MusicBrainz Release Id"
 msgstr ""
 
-#: ../picard/util/tags.py:52
+#: ../picard/util/tags.py:53
 msgid "MusicBrainz Artist Id"
 msgstr ""
 
-#: ../picard/util/tags.py:53
+#: ../picard/util/tags.py:54
 msgid "MusicBrainz Release Artist Id"
 msgstr ""
 
-#: ../picard/util/tags.py:54
+#: ../picard/util/tags.py:55
 msgid "MusicBrainz TRM Id"
 msgstr ""
 
-#: ../picard/util/tags.py:55
+#: ../picard/util/tags.py:56
 msgid "MusicBrainz Disc Id"
 msgstr ""
 
-#: ../picard/util/tags.py:56
+#: ../picard/util/tags.py:57
 msgid "MusicBrainz Sort Name"
 msgstr ""
 
-#: ../picard/util/tags.py:57
+#: ../picard/util/tags.py:58
 msgid "MusicIP PUID"
 msgstr ""
 
-#: ../picard/util/tags.py:58
+#: ../picard/util/tags.py:59
 msgid "MusicIP Fingerprint"
 msgstr ""
 
-#: ../picard/util/tags.py:59
+#: ../picard/util/tags.py:60
 msgid "Disc Id"
 msgstr ""
 
-#: ../picard/util/tags.py:60
+#: ../picard/util/tags.py:61
 msgid "Website"
 msgstr "Webwerf"
 
-#: ../picard/util/tags.py:61
+#: ../picard/util/tags.py:62
 msgid "Compilation"
 msgstr "Kompilasie"
 
-#: ../picard/util/tags.py:62
+#: ../picard/util/tags.py:63
 msgid "Comment"
 msgstr "Aanmerking"
 
-#: ../picard/util/tags.py:63
+#: ../picard/util/tags.py:64
 msgid "Genre"
 msgstr ""
 
-#: ../picard/util/tags.py:64
+#: ../picard/util/tags.py:65
 msgid "Encoded By"
 msgstr ""
 
-#: ../picard/util/tags.py:65
+#: ../picard/util/tags.py:66
 msgid "Performer"
 msgstr ""
 
-#: ../picard/util/tags.py:66
+#: ../picard/util/tags.py:67
 msgid "Release Type"
 msgstr ""
 
-#: ../picard/util/tags.py:67
+#: ../picard/util/tags.py:68
 msgid "Release Status"
 msgstr ""
 
-#: ../picard/util/tags.py:68
+#: ../picard/util/tags.py:69
 msgid "Release Country"
 msgstr ""
 
-#: ../picard/util/tags.py:69
+#: ../picard/util/tags.py:70
 msgid "Record Label"
 msgstr ""
 
-#: ../picard/util/tags.py:70
+#: ../picard/util/tags.py:71
 msgid "Barcode"
 msgstr ""
 
-#: ../picard/util/tags.py:71
+#: ../picard/util/tags.py:72
 msgid "Catalog Number"
 msgstr ""
 
-#: ../picard/util/tags.py:72
+#: ../picard/util/tags.py:73
 msgid "Format"
 msgstr ""
 
-#: ../picard/util/tags.py:73
+#: ../picard/util/tags.py:74
 msgid "DJ-Mixer"
 msgstr ""
 
-#: ../picard/util/tags.py:74
+#: ../picard/util/tags.py:75
 msgid "Media"
 msgstr "Media"
 
-#: ../picard/util/tags.py:75
+#: ../picard/util/tags.py:76
 msgid "Lyrics"
 msgstr ""
 
-#: ../picard/util/tags.py:76
+#: ../picard/util/tags.py:77
 msgid "Mixer"
 msgstr ""
 
-#: ../picard/util/tags.py:77
+#: ../picard/util/tags.py:78
 msgid "Language"
 msgstr "Taal"
 
-#: ../picard/util/tags.py:78
+#: ../picard/util/tags.py:79
 msgid "Script"
 msgstr ""
 
diff --git a/po/ar.po b/po/ar.po
index 83843b205..689722934 100644
--- a/po/ar.po
+++ b/po/ar.po
@@ -6,8 +6,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: picard\n"
-"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2009-02-24 18:58+0100\n"
+"Report-Msgid-Bugs-To: http://bugs.musicbrainz.org/\n"
+"POT-Creation-Date: 2009-04-06 22:50+0200\n"
 "PO-Revision-Date: 2009-03-27 12:37+0000\n"
 "Last-Translator: MaXeR <Unknown>\n"
 "Language-Team: Arabic <ar@li.org>\n"
@@ -19,16 +19,16 @@ msgstr ""
 "X-Launchpad-Export-Date: 2009-04-06 20:20+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
-#: ../picard/album.py:108 ../picard/cluster.py:248
+#: ../picard/album.py:109 ../picard/cluster.py:248
 msgid "Unmatched Files"
 msgstr ""
 
-#: ../picard/album.py:281
+#: ../picard/album.py:287
 #, python-format
 msgid "[could not load album %s]"
 msgstr ""
 
-#: ../picard/album.py:317
+#: ../picard/album.py:320
 msgid "[loading album information]"
 msgstr ""
 
@@ -588,7 +588,7 @@ msgid "Namibia"
 msgstr "ناميبيا"
 
 #: ../picard/const.py:182
-msgid "Vanuat"
+msgid "Vanuatu"
 msgstr ""
 
 #: ../picard/const.py:183
@@ -1032,223 +1032,237 @@ msgid "Congo, The Democratic Republic of the"
 msgstr ""
 
 #: ../picard/const.py:293
-msgid "Serbia and Montenegro"
+msgid "Serbia and Montenegro (historical, 2003-2006)"
 msgstr ""
 
 #: ../picard/const.py:294
-msgid "Croatia"
-msgstr ""
+#, fuzzy
+msgid "Serbia"
+msgstr "جورجيا"
 
 #: ../picard/const.py:295
-msgid "Korea (North), Democratic People's Republic of"
+msgid "Montenegro"
 msgstr ""
 
 #: ../picard/const.py:296
-msgid "Korea (South), Republic of"
+msgid "Croatia"
 msgstr ""
 
 #: ../picard/const.py:297
-msgid "Slovakia"
+msgid "Korea (North), Democratic People's Republic of"
 msgstr ""
 
 #: ../picard/const.py:298
-msgid "Soviet Union (historical, 1922-1991)"
+msgid "Korea (South), Republic of"
 msgstr ""
 
 #: ../picard/const.py:299
-msgid "East Timor"
+msgid "Slovakia"
 msgstr ""
 
 #: ../picard/const.py:300
-msgid "Czechoslovakia (historical, 1918-1992)"
+msgid "Soviet Union (historical, 1922-1991)"
 msgstr ""
 
 #: ../picard/const.py:301
-msgid "Europe"
+msgid "East Timor"
 msgstr ""
 
 #: ../picard/const.py:302
-msgid "East Germany (historical, 1949-1990)"
+msgid "Czechoslovakia (historical, 1918-1992)"
 msgstr ""
 
 #: ../picard/const.py:303
-msgid "[Unknown Country]"
+msgid "Europe"
 msgstr ""
 
 #: ../picard/const.py:304
-msgid "[Worldwide]"
+msgid "East Germany (historical, 1949-1990)"
 msgstr ""
 
 #: ../picard/const.py:305
+msgid "[Unknown Country]"
+msgstr ""
+
+#: ../picard/const.py:306
+msgid "[Worldwide]"
+msgstr ""
+
+#: ../picard/const.py:307
 msgid "Yugoslavia (historical, 1918-1992)"
 msgstr ""
 
-#: ../picard/const.py:310
-msgid "Catalan"
-msgstr ""
-
-#: ../picard/const.py:311
-msgid "Czech"
-msgstr ""
-
 #: ../picard/const.py:312
-msgid "Welsh"
+msgid "Afrikaans"
 msgstr ""
 
 #: ../picard/const.py:313
-msgid "Danish"
+msgid "Arabic"
 msgstr ""
 
 #: ../picard/const.py:314
-msgid "German"
+msgid "Catalan"
 msgstr ""
 
 #: ../picard/const.py:315
-msgid "English"
+msgid "Czech"
 msgstr ""
 
 #: ../picard/const.py:316
-msgid "English (Canada)"
+msgid "Welsh"
 msgstr ""
 
 #: ../picard/const.py:317
-msgid "English (UK)"
+msgid "Danish"
 msgstr ""
 
 #: ../picard/const.py:318
-msgid "Spanish"
+msgid "German"
 msgstr ""
 
 #: ../picard/const.py:319
-msgid "Persian"
+msgid "English"
 msgstr ""
 
 #: ../picard/const.py:320
-msgid "Finnish"
+msgid "English (Canada)"
 msgstr ""
 
 #: ../picard/const.py:321
-msgid "French"
+msgid "English (UK)"
 msgstr ""
 
 #: ../picard/const.py:322
-msgid "Frisian"
+msgid "Spanish"
 msgstr ""
 
 #: ../picard/const.py:323
-msgid "Hebrew"
+msgid "Persian"
 msgstr ""
 
 #: ../picard/const.py:324
-msgid "Hungarian"
+msgid "Finnish"
 msgstr ""
 
 #: ../picard/const.py:325
-msgid "Islandic"
+msgid "French"
 msgstr ""
 
 #: ../picard/const.py:326
-msgid "Italian"
+msgid "Frisian"
 msgstr ""
 
 #: ../picard/const.py:327
-msgid "Kannada"
+msgid "Hebrew"
 msgstr ""
 
 #: ../picard/const.py:328
-msgid "Korean"
-msgstr ""
+#, fuzzy
+msgid "Hindi"
+msgstr "هاييتي"
 
 #: ../picard/const.py:329
-msgid "Lithuanian"
+msgid "Hungarian"
 msgstr ""
 
 #: ../picard/const.py:330
-msgid "Norwegian Bokmal"
+msgid "Islandic"
 msgstr ""
 
 #: ../picard/const.py:331
-msgid "Dutch"
+msgid "Italian"
 msgstr ""
 
 #: ../picard/const.py:332
-msgid "Polish"
+msgid "Kannada"
 msgstr ""
 
 #: ../picard/const.py:333
-msgid "Portuguese"
+msgid "Korean"
 msgstr ""
 
 #: ../picard/const.py:334
-msgid "Brazilian Portuguese"
+msgid "Lithuanian"
 msgstr ""
 
 #: ../picard/const.py:335
-msgid "Romanian"
+msgid "Norwegian Bokmal"
 msgstr ""
 
 #: ../picard/const.py:336
-msgid "Russian"
+msgid "Dutch"
 msgstr ""
 
 #: ../picard/const.py:337
-msgid "Scots"
+msgid "Polish"
 msgstr ""
 
 #: ../picard/const.py:338
-msgid "Slovak"
+msgid "Portuguese"
 msgstr ""
 
 #: ../picard/const.py:339
-msgid "Slovenian"
+msgid "Brazilian Portuguese"
 msgstr ""
 
 #: ../picard/const.py:340
-msgid "Swedish"
+msgid "Romanian"
 msgstr ""
 
 #: ../picard/const.py:341
+msgid "Russian"
+msgstr ""
+
+#: ../picard/const.py:342
+msgid "Scots"
+msgstr ""
+
+#: ../picard/const.py:343
+msgid "Slovak"
+msgstr ""
+
+#: ../picard/const.py:344
+msgid "Slovenian"
+msgstr ""
+
+#: ../picard/const.py:345
+msgid "Swedish"
+msgstr ""
+
+#: ../picard/const.py:346
+#, fuzzy
+msgid "Turkish"
+msgstr "تركمانستان"
+
+#: ../picard/const.py:347
 msgid "Chinese"
 msgstr ""
 
-#: ../picard/file.py:487
+#: ../picard/file.py:494
 #, python-format
 msgid "No matching tracks for file %s"
 msgstr ""
 
-#: ../picard/file.py:504
+#: ../picard/file.py:511
 #, python-format
 msgid "No matching tracks above the threshold for file %s"
 msgstr ""
 
-#: ../picard/file.py:507
+#: ../picard/file.py:514
 #, python-format
 msgid "File %s identified!"
 msgstr ""
 
-#: ../picard/file.py:518
+#: ../picard/file.py:525
 #, python-format
 msgid "Looking up the PUID for file %s..."
 msgstr ""
 
-#: ../picard/file.py:523
+#: ../picard/file.py:530
 #, 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 ""
@@ -1261,11 +1275,24 @@ msgstr ""
 msgid "XSPF Playlist (*.xspf)"
 msgstr ""
 
-#: ../picard/tagger.py:476
-msgid "CD Lookup Error"
+#: ../picard/puidmanager.py:62
+msgid "Submitting PUIDs..."
+msgstr ""
+
+#: ../picard/puidmanager.py:68
+#, python-format
+msgid "PUIDs submission failed: %s"
+msgstr ""
+
+#: ../picard/puidmanager.py:70
+msgid "PUIDs successfully submitted!"
 msgstr ""
 
 #: ../picard/tagger.py:477
+msgid "CD Lookup Error"
+msgstr ""
+
+#: ../picard/tagger.py:478
 #, python-format
 msgid ""
 "Error while reading CD:\n"
@@ -1273,7 +1300,7 @@ msgid ""
 "%s"
 msgstr ""
 
-#: ../picard/tagger.py:503
+#: ../picard/tagger.py:504
 #, python-format
 msgid "Could not find PUID for file %s"
 msgstr ""
@@ -1326,15 +1353,27 @@ msgstr ""
 msgid "Length"
 msgstr ""
 
-#: ../picard/ui/itemviews.py:327
+#: ../picard/ui/itemviews.py:289
+msgid "&Expand all"
+msgstr ""
+
+#: ../picard/ui/itemviews.py:291
+msgid "&Collapse all"
+msgstr ""
+
+#: ../picard/ui/itemviews.py:332
 msgid "&Releases"
 msgstr ""
 
-#: ../picard/ui/itemviews.py:353
+#: ../picard/ui/itemviews.py:349
+msgid "No release event"
+msgstr ""
+
+#: ../picard/ui/itemviews.py:359
 msgid "&Plugins"
 msgstr ""
 
-#: ../picard/ui/itemviews.py:523
+#: ../picard/ui/itemviews.py:533
 msgid "Clusters"
 msgstr ""
 
@@ -1342,95 +1381,6 @@ msgstr ""
 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:66 ../picard/ui/ui_options_plugins.py:62
-msgid "Details"
-msgstr ""
-
-#: ../picard/ui/tageditor.py:71 ../picard/ui/tageditor.py:264
-#, python-format
-msgid "%d file"
-msgid_plural "%d files"
-msgstr[0] ""
-msgstr[1] ""
-
-#: ../picard/ui/tageditor.py:131
-#, python-format
-msgid "(different across %d file)"
-msgid_plural "(different across %d files)"
-msgstr[0] ""
-msgstr[1] ""
-
-#: ../picard/ui/tageditor.py:134
-#, python-format
-msgid "(missing from %d file)"
-msgid_plural "(missing from %d files)"
-msgstr[0] ""
-msgstr[1] ""
-
-#: ../picard/ui/tageditor.py:233
-msgid "Filename:"
-msgstr ""
-
-#: ../picard/ui/tageditor.py:235
-msgid "Format:"
-msgstr ""
-
-#: ../picard/ui/tageditor.py:244
-msgid "Size:"
-msgstr ""
-
-#: ../picard/ui/tageditor.py:248 ../picard/ui/ui_metadata.py:127
-msgid "Length:"
-msgstr ""
-
-#: ../picard/ui/tageditor.py:250
-msgid "Bitrate:"
-msgstr ""
-
-#: ../picard/ui/tageditor.py:252
-msgid "Sample rate:"
-msgstr ""
-
-#: ../picard/ui/tageditor.py:254
-msgid "Bits per sample:"
-msgstr ""
-
-#: ../picard/ui/tageditor.py:257
-msgid "Mono"
-msgstr ""
-
-#: ../picard/ui/tageditor.py:258
-msgid "Stereo"
-msgstr ""
-
-#: ../picard/ui/tageditor.py:260
-msgid "Channels:"
-msgstr ""
-
-#: ../picard/ui/tagsfromfilenames.py:52 ../picard/ui/tagsfromfilenames.py:96
-msgid "File Name"
-msgstr ""
-
 #: ../picard/ui/mainwindow.py:64
 msgid "MusicBrainz Picard"
 msgstr ""
@@ -1667,6 +1617,10 @@ msgstr ""
 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 ""
@@ -1686,12 +1640,97 @@ msgstr ""
 msgid " (Error: %s)"
 msgstr ""
 
+#: ../picard/ui/puidsubmit.py:31 ../picard/ui/options/plugins.py:85
+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/passworddialog.py:38
 #, python-format
 msgid ""
 "The server %s requires you to login. Please enter your username and password."
 msgstr ""
 
+#: ../picard/ui/tageditor.py:66 ../picard/ui/ui_options_plugins.py:62
+msgid "Details"
+msgstr ""
+
+#: ../picard/ui/tageditor.py:71 ../picard/ui/tageditor.py:264
+#, python-format
+msgid "%d file"
+msgid_plural "%d files"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../picard/ui/tageditor.py:131
+#, python-format
+msgid "(different across %d file)"
+msgid_plural "(different across %d files)"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../picard/ui/tageditor.py:134
+#, python-format
+msgid "(missing from %d file)"
+msgid_plural "(missing from %d files)"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../picard/ui/tageditor.py:233
+msgid "Filename:"
+msgstr ""
+
+#: ../picard/ui/tageditor.py:235
+msgid "Format:"
+msgstr ""
+
+#: ../picard/ui/tageditor.py:244
+msgid "Size:"
+msgstr ""
+
+#: ../picard/ui/tageditor.py:248 ../picard/ui/ui_metadata.py:127
+msgid "Length:"
+msgstr ""
+
+#: ../picard/ui/tageditor.py:250
+msgid "Bitrate:"
+msgstr ""
+
+#: ../picard/ui/tageditor.py:252
+msgid "Sample rate:"
+msgstr ""
+
+#: ../picard/ui/tageditor.py:254
+msgid "Bits per sample:"
+msgstr ""
+
+#: ../picard/ui/tageditor.py:257
+msgid "Mono"
+msgstr ""
+
+#: ../picard/ui/tageditor.py:258
+msgid "Stereo"
+msgstr ""
+
+#: ../picard/ui/tageditor.py:260
+msgid "Channels:"
+msgstr ""
+
+#: ../picard/ui/tagsfromfilenames.py:54 ../picard/ui/tagsfromfilenames.py:99
+msgid "File Name"
+msgstr ""
+
 #: ../picard/ui/ui_cdlookup.py:60 ../picard/ui/ui_options_cdlookup.py:47
 #: ../picard/ui/ui_options_cdlookup_select.py:48
 #: ../picard/ui/options/cdlookup.py:36
@@ -1714,24 +1753,6 @@ msgstr ""
 msgid "Cancel"
 msgstr ""
 
-#: ../picard/ui/ui_passworddialog.py:78
-msgid "Authentication required"
-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"
-msgstr ""
-
 #: ../picard/ui/ui_edittagdialog.py:44
 msgid "Edit Tag"
 msgstr ""
@@ -1768,6 +1789,10 @@ msgstr ""
 msgid "Options"
 msgstr ""
 
+#: ../picard/ui/ui_puidsubmit.py:52
+msgid "Submit PUIDs"
+msgstr ""
+
 #: ../picard/ui/ui_options_cdlookup.py:48
 msgid "CD-ROM device to use for lookups:"
 msgstr ""
@@ -1792,6 +1817,22 @@ msgstr ""
 msgid "Overwrite the file if it already exists"
 msgstr ""
 
+#: ../picard/ui/ui_options_moving.py:53
+msgid "Move additional files:"
+msgstr ""
+
+#: ../picard/ui/ui_options_moving.py:54
+msgid "Browse..."
+msgstr ""
+
+#: ../picard/ui/ui_options_moving.py:55
+msgid "Delete empty directories"
+msgstr ""
+
+#: ../picard/ui/ui_options_moving.py:56
+msgid "Move files to this directory when saving:"
+msgstr ""
+
 #: ../picard/ui/util.py:31
 msgid "&Ok"
 msgstr ""
@@ -1800,44 +1841,40 @@ msgstr ""
 msgid "&Cancel"
 msgstr ""
 
-#: ../picard/ui/ui_puidsubmit.py:52
-msgid "Submit PUIDs"
-msgstr ""
-
-#: ../picard/ui/ui_tageditor.py:139 ../picard/ui/ui_options_plugins.py:59
-#: ../picard/ui/options/plugins.py:76
+#: ../picard/ui/ui_tageditor.py:128 ../picard/ui/ui_options_plugins.py:59
+#: ../picard/ui/options/plugins.py:81
 msgid "Name"
 msgstr ""
 
-#: ../picard/ui/ui_tageditor.py:140
+#: ../picard/ui/ui_tageditor.py:129
 msgid "Value"
 msgstr ""
 
-#: ../picard/ui/ui_tageditor.py:141
+#: ../picard/ui/ui_tageditor.py:130
 msgid "Rating:"
 msgstr ""
 
-#: ../picard/ui/ui_tageditor.py:142
+#: ../picard/ui/ui_tageditor.py:131
 msgid "&Add..."
 msgstr ""
 
-#: ../picard/ui/ui_tageditor.py:143
+#: ../picard/ui/ui_tageditor.py:132
 msgid "&Edit..."
 msgstr ""
 
-#: ../picard/ui/ui_tageditor.py:144
+#: ../picard/ui/ui_tageditor.py:133
 msgid "&Delete"
 msgstr ""
 
-#: ../picard/ui/ui_tageditor.py:145
+#: ../picard/ui/ui_tageditor.py:134
 msgid "&Metadata"
 msgstr ""
 
-#: ../picard/ui/ui_tageditor.py:146
+#: ../picard/ui/ui_tageditor.py:135
 msgid "A&rtwork"
 msgstr ""
 
-#: ../picard/ui/ui_tageditor.py:147
+#: ../picard/ui/ui_tageditor.py:136
 msgid "&Info"
 msgstr ""
 
@@ -1882,6 +1919,40 @@ msgstr ""
 msgid ", "
 msgstr ""
 
+#: ../picard/ui/ui_options_general.py:108
+msgid "MusicBrainz Server"
+msgstr ""
+
+#: ../picard/ui/ui_options_general.py:109 ../picard/ui/ui_options_proxy.py:72
+msgid "Port:"
+msgstr ""
+
+#: ../picard/ui/ui_options_general.py:110 ../picard/ui/ui_options_proxy.py:73
+msgid "Server address:"
+msgstr ""
+
+#: ../picard/ui/ui_options_general.py:111
+msgid "Account Information"
+msgstr ""
+
+#: ../picard/ui/ui_options_general.py:112 ../picard/ui/ui_options_proxy.py:70
+#: ../picard/ui/ui_passworddialog.py:80
+msgid "Password:"
+msgstr ""
+
+#: ../picard/ui/ui_options_general.py:113 ../picard/ui/ui_options_proxy.py:71
+#: ../picard/ui/ui_passworddialog.py:79
+msgid "Username:"
+msgstr ""
+
+#: ../picard/ui/ui_options_general.py:114 ../picard/ui/options/general.py:29
+msgid "General"
+msgstr ""
+
+#: ../picard/ui/ui_options_general.py:115
+msgid "Automatically scan all new files"
+msgstr ""
+
 #: ../picard/ui/ui_options_interface.py:50
 msgid "Miscellaneous"
 msgstr ""
@@ -1902,113 +1973,6 @@ msgstr ""
 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_options_naming.py:180
-#: ../picard/ui/ui_tagsfromfilenames.py:58
-msgid "&Preview"
-msgstr ""
-
-#: ../picard/ui/ui_options_proxy.py:81 ../picard/ui/options/proxy.py:28
-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_options_ratings.py:45
-msgid "Enable track ratings"
-msgstr ""
-
-#: ../picard/ui/ui_options_ratings.py:46
-msgid ""
-"Picard saves the ratings together with an e-mail address identifying the "
-"user who did the rating. That way different ratings for different users can "
-"be stored in the files. Please sepcify the e-mail you want to use to save "
-"your ratings."
-msgstr ""
-
-#: ../picard/ui/ui_options_ratings.py:47
-msgid "E-mail:"
-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 ../picard/ui/options/general.py:29
-msgid "General"
-msgstr ""
-
-#: ../picard/ui/ui_options_general.py:115
-msgid "Automatically scan all new files"
-msgstr ""
-
 #: ../picard/ui/ui_options_matching.py:105
 msgid "Thresholds"
 msgstr ""
@@ -2065,72 +2029,143 @@ msgstr ""
 msgid "Non-album tracks:"
 msgstr ""
 
-#: ../picard/ui/ui_options_plugins.py:58 ../picard/ui/options/plugins.py:30
+#: ../picard/ui/ui_options_metadata.py:109
+#: ../picard/ui/ui_options_metadata.py:110
+#: ../picard/ui/ui_options_renaming.py:155
+#: ../picard/ui/ui_options_renaming.py:158
+msgid "Default"
+msgstr ""
+
+#: ../picard/ui/ui_options_plugins.py:58 ../picard/ui/options/plugins.py:34
 msgid "Plugins"
 msgstr ""
 
-#: ../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:84
 msgid "Author"
 msgstr ""
 
-#: ../picard/ui/ui_options_plugins.py:61 ../picard/util/tags.py:36
+#: ../picard/ui/ui_options_plugins.py:61 ../picard/util/tags.py:37
 msgid "Version"
 msgstr ""
 
-#: ../picard/ui/ui_options_script.py:52
+#: ../picard/ui/ui_options_proxy.py:69 ../picard/ui/options/proxy.py:28
+msgid "Web Proxy"
+msgstr ""
+
+#: ../picard/ui/ui_options_ratings.py:45
+msgid "Enable track ratings"
+msgstr ""
+
+#: ../picard/ui/ui_options_ratings.py:46
+msgid ""
+"Picard saves the ratings together with an e-mail address identifying the "
+"user who did the rating. That way different ratings for different users can "
+"be stored in the files. Please sepcify the e-mail you want to use to save "
+"your ratings."
+msgstr ""
+
+#: ../picard/ui/ui_options_ratings.py:47
+msgid "E-mail:"
+msgstr ""
+
+#: ../picard/ui/ui_options_renaming.py:145
+msgid "Form"
+msgstr ""
+
+#: ../picard/ui/ui_options_renaming.py:146
+msgid "Rename files when saving"
+msgstr ""
+
+#: ../picard/ui/ui_options_renaming.py:147
+msgid "Replace non-ASCII characters"
+msgstr ""
+
+#: ../picard/ui/ui_options_renaming.py:148
+msgid "Replace Windows-incompatible characters"
+msgstr ""
+
+#: ../picard/ui/ui_options_renaming.py:149
+msgid "Name files like this"
+msgstr ""
+
+#: ../picard/ui/ui_options_renaming.py:156
+msgid "Name multiple artist albums differently"
+msgstr ""
+
+#: ../picard/ui/ui_options_renaming.py:157
+msgid "Copy from above"
+msgstr ""
+
+#: ../picard/ui/ui_options_renaming.py:159
+msgid "Examples"
+msgstr ""
+
+#: ../picard/ui/ui_options_script.py:43
 msgid "Tagger Script"
 msgstr ""
 
-#: ../picard/ui/ui_options_tags.py:85
-msgid "Common"
+#: ../picard/ui/ui_options_tags.py:97
+msgid "Do not write tags to files"
 msgstr ""
 
-#: ../picard/ui/ui_options_tags.py:86
-msgid "Clear existing tags before writing new tags"
+#: ../picard/ui/ui_options_tags.py:98
+msgid "Before tagging"
 msgstr ""
 
-#: ../picard/ui/ui_options_tags.py:87
-msgid "Don not write tags to files"
+#: ../picard/ui/ui_options_tags.py:99
+msgid "Clear existing tags"
 msgstr ""
 
-#: ../picard/ui/ui_options_tags.py:88
-msgid "ID3"
-msgstr ""
-
-#: ../picard/ui/ui_options_tags.py:89
-msgid "Write ID3v1 tags to the files"
-msgstr ""
-
-#: ../picard/ui/ui_options_tags.py:90
-msgid "Write ID3v2 version 2.3 tags (2.4 is default)"
-msgstr ""
-
-#: ../picard/ui/ui_options_tags.py:91
-msgid "Text encoding to use while writing ID3v2 tags:"
-msgstr ""
-
-#: ../picard/ui/ui_options_tags.py:92
-msgid "ISO-8859-1"
-msgstr ""
-
-#: ../picard/ui/ui_options_tags.py:93
-msgid "UTF-16"
-msgstr ""
-
-#: ../picard/ui/ui_options_tags.py:94
-msgid "UTF-8"
-msgstr ""
-
-#: ../picard/ui/ui_options_tags.py:95
+#: ../picard/ui/ui_options_tags.py:100
 msgid "Remove ID3 tags from FLAC files"
 msgstr ""
 
-#: ../picard/ui/ui_options_tags.py:96
-msgid "APE"
+#: ../picard/ui/ui_options_tags.py:101
+msgid "Remove APEv2 tags from MP3 files"
 msgstr ""
 
-#: ../picard/ui/ui_options_tags.py:97
-msgid "Remove APEv2 tags from MP3 files"
+#: ../picard/ui/ui_options_tags.py:102
+msgid "Tag compatibility"
+msgstr ""
+
+#: ../picard/ui/ui_options_tags.py:103
+msgid "ID3v2 version"
+msgstr ""
+
+#: ../picard/ui/ui_options_tags.py:104
+msgid "2.4"
+msgstr ""
+
+#: ../picard/ui/ui_options_tags.py:105
+msgid "2.3"
+msgstr ""
+
+#: ../picard/ui/ui_options_tags.py:106
+msgid "Also include ID3v1 tags in the files"
+msgstr ""
+
+#: ../picard/ui/ui_options_tags.py:107
+msgid "ID3v2 text encoding"
+msgstr ""
+
+#: ../picard/ui/ui_options_tags.py:108
+msgid "UTF-8"
+msgstr ""
+
+#: ../picard/ui/ui_options_tags.py:109
+msgid "UTF-16"
+msgstr ""
+
+#: ../picard/ui/ui_options_tags.py:110
+msgid "ISO-8859-1"
+msgstr ""
+
+#: ../picard/ui/ui_passworddialog.py:78
+msgid "Authentication required"
+msgstr ""
+
+#: ../picard/ui/ui_passworddialog.py:81
+msgid "Save username and password"
 msgstr ""
 
 #: ../picard/ui/ui_tagsfromfilenames.py:56
@@ -2141,6 +2176,10 @@ msgstr ""
 msgid "Replace underscores with spaces"
 msgstr ""
 
+#: ../picard/ui/ui_tagsfromfilenames.py:58
+msgid "&Preview"
+msgstr ""
+
 #: ../picard/ui/options/about.py:29
 msgid "About"
 msgstr ""
@@ -2161,8 +2200,8 @@ 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"
@@ -2170,14 +2209,13 @@ msgid ""
 "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\"><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/P"
-"icardTagger</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
@@ -2210,42 +2248,44 @@ msgstr ""
 msgid "None"
 msgstr ""
 
-#: ../picard/ui/options/naming.py:33
-msgid "File Naming"
+#: ../picard/ui/options/moving.py:33
+msgid "Moving files"
 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 ""
-
-#: ../picard/ui/options/naming.py:95
-msgid "The multiple artist file naming format must not be empty."
-msgstr ""
-
-#: ../picard/ui/options/naming.py:97
+#: ../picard/ui/options/moving.py:65
 msgid "Error"
 msgstr ""
 
-#: ../picard/ui/options/naming.py:97
+#: ../picard/ui/options/moving.py:65
 msgid "The location to move files to must not be empty."
 msgstr ""
 
-#: ../picard/ui/options/scripting.py:63
-msgid "Scripting"
+#: ../picard/ui/options/ratings.py:29
+msgid "Ratings"
 msgstr ""
 
 #: ../picard/ui/options/tags.py:29
 msgid "Tags"
 msgstr ""
 
-#: ../picard/ui/options/ratings.py:29
-msgid "Ratings"
+#: ../picard/ui/options/renaming.py:35
+msgid "File naming"
+msgstr ""
+
+#: ../picard/ui/options/renaming.py:123
+msgid "The file naming format must not be empty."
+msgstr ""
+
+#: ../picard/ui/options/renaming.py:133
+msgid "The multiple artist file naming format must not be empty."
+msgstr ""
+
+#: ../picard/ui/options/scripting.py:63
+msgid "Scripting"
+msgstr ""
+
+#: ../picard/ui/options/scripting.py:97
+msgid "Script Error"
 msgstr ""
 
 #: ../picard/util/tags.py:24
@@ -2253,214 +2293,218 @@ msgid "Date"
 msgstr ""
 
 #: ../picard/util/tags.py:25
-msgid "Album Artist"
+msgid "Original Release Date"
 msgstr ""
 
 #: ../picard/util/tags.py:26
-msgid "Track Number"
+msgid "Album Artist"
 msgstr ""
 
 #: ../picard/util/tags.py:27
-msgid "Total Tracks"
+msgid "Track Number"
 msgstr ""
 
 #: ../picard/util/tags.py:28
-msgid "Disc Number"
+msgid "Total Tracks"
 msgstr ""
 
 #: ../picard/util/tags.py:29
-msgid "Total Discs"
+msgid "Disc Number"
 msgstr ""
 
 #: ../picard/util/tags.py:30
-msgid "Album Artist Sort Order"
+msgid "Total Discs"
 msgstr ""
 
 #: ../picard/util/tags.py:31
-msgid "Artist Sort Order"
+msgid "Album Artist Sort Order"
 msgstr ""
 
 #: ../picard/util/tags.py:32
-msgid "Title Sort Order"
+msgid "Artist Sort Order"
 msgstr ""
 
 #: ../picard/util/tags.py:33
-msgid "Album Sort Order"
+msgid "Title Sort Order"
 msgstr ""
 
 #: ../picard/util/tags.py:34
-msgid "ASIN"
+msgid "Album Sort Order"
 msgstr ""
 
 #: ../picard/util/tags.py:35
+msgid "ASIN"
+msgstr ""
+
+#: ../picard/util/tags.py:36
 msgid "Grouping"
 msgstr ""
 
-#: ../picard/util/tags.py:37
+#: ../picard/util/tags.py:38
 msgid "ISRC"
 msgstr ""
 
-#: ../picard/util/tags.py:38
+#: ../picard/util/tags.py:39
 msgid "Mood"
 msgstr ""
 
-#: ../picard/util/tags.py:39
+#: ../picard/util/tags.py:40
 msgid "BPM"
 msgstr ""
 
-#: ../picard/util/tags.py:40
+#: ../picard/util/tags.py:41
 msgid "Copyright"
 msgstr ""
 
-#: ../picard/util/tags.py:41
+#: ../picard/util/tags.py:42
 msgid "Composer"
 msgstr ""
 
-#: ../picard/util/tags.py:42
+#: ../picard/util/tags.py:43
 msgid "Conductor"
 msgstr ""
 
-#: ../picard/util/tags.py:43
+#: ../picard/util/tags.py:44
 msgid "Lyricist"
 msgstr ""
 
-#: ../picard/util/tags.py:44
+#: ../picard/util/tags.py:45
 msgid "Arranger"
 msgstr ""
 
-#: ../picard/util/tags.py:45
+#: ../picard/util/tags.py:46
 msgid "Producer"
 msgstr ""
 
-#: ../picard/util/tags.py:46
+#: ../picard/util/tags.py:47
 msgid "Engineer"
 msgstr ""
 
-#: ../picard/util/tags.py:47
+#: ../picard/util/tags.py:48
 msgid "Subtitle"
 msgstr ""
 
-#: ../picard/util/tags.py:48
+#: ../picard/util/tags.py:49
 msgid "Disc Subtitle"
 msgstr ""
 
-#: ../picard/util/tags.py:49
+#: ../picard/util/tags.py:50
 msgid "Remixer"
 msgstr ""
 
-#: ../picard/util/tags.py:50
+#: ../picard/util/tags.py:51
 msgid "MusicBrainz Track Id"
 msgstr ""
 
-#: ../picard/util/tags.py:51
+#: ../picard/util/tags.py:52
 msgid "MusicBrainz Release Id"
 msgstr ""
 
-#: ../picard/util/tags.py:52
+#: ../picard/util/tags.py:53
 msgid "MusicBrainz Artist Id"
 msgstr ""
 
-#: ../picard/util/tags.py:53
+#: ../picard/util/tags.py:54
 msgid "MusicBrainz Release Artist Id"
 msgstr ""
 
-#: ../picard/util/tags.py:54
+#: ../picard/util/tags.py:55
 msgid "MusicBrainz TRM Id"
 msgstr ""
 
-#: ../picard/util/tags.py:55
+#: ../picard/util/tags.py:56
 msgid "MusicBrainz Disc Id"
 msgstr ""
 
-#: ../picard/util/tags.py:56
+#: ../picard/util/tags.py:57
 msgid "MusicBrainz Sort Name"
 msgstr ""
 
-#: ../picard/util/tags.py:57
+#: ../picard/util/tags.py:58
 msgid "MusicIP PUID"
 msgstr ""
 
-#: ../picard/util/tags.py:58
+#: ../picard/util/tags.py:59
 msgid "MusicIP Fingerprint"
 msgstr ""
 
-#: ../picard/util/tags.py:59
+#: ../picard/util/tags.py:60
 msgid "Disc Id"
 msgstr ""
 
-#: ../picard/util/tags.py:60
+#: ../picard/util/tags.py:61
 msgid "Website"
 msgstr ""
 
-#: ../picard/util/tags.py:61
+#: ../picard/util/tags.py:62
 msgid "Compilation"
 msgstr ""
 
-#: ../picard/util/tags.py:62
+#: ../picard/util/tags.py:63
 msgid "Comment"
 msgstr ""
 
-#: ../picard/util/tags.py:63
+#: ../picard/util/tags.py:64
 msgid "Genre"
 msgstr ""
 
-#: ../picard/util/tags.py:64
+#: ../picard/util/tags.py:65
 msgid "Encoded By"
 msgstr ""
 
-#: ../picard/util/tags.py:65
+#: ../picard/util/tags.py:66
 msgid "Performer"
 msgstr ""
 
-#: ../picard/util/tags.py:66
+#: ../picard/util/tags.py:67
 msgid "Release Type"
 msgstr ""
 
-#: ../picard/util/tags.py:67
+#: ../picard/util/tags.py:68
 msgid "Release Status"
 msgstr ""
 
-#: ../picard/util/tags.py:68
+#: ../picard/util/tags.py:69
 msgid "Release Country"
 msgstr ""
 
-#: ../picard/util/tags.py:69
+#: ../picard/util/tags.py:70
 msgid "Record Label"
 msgstr ""
 
-#: ../picard/util/tags.py:70
+#: ../picard/util/tags.py:71
 msgid "Barcode"
 msgstr ""
 
-#: ../picard/util/tags.py:71
+#: ../picard/util/tags.py:72
 msgid "Catalog Number"
 msgstr ""
 
-#: ../picard/util/tags.py:72
+#: ../picard/util/tags.py:73
 msgid "Format"
 msgstr ""
 
-#: ../picard/util/tags.py:73
+#: ../picard/util/tags.py:74
 msgid "DJ-Mixer"
 msgstr ""
 
-#: ../picard/util/tags.py:74
+#: ../picard/util/tags.py:75
 msgid "Media"
 msgstr ""
 
-#: ../picard/util/tags.py:75
+#: ../picard/util/tags.py:76
 msgid "Lyrics"
 msgstr ""
 
-#: ../picard/util/tags.py:76
+#: ../picard/util/tags.py:77
 msgid "Mixer"
 msgstr ""
 
-#: ../picard/util/tags.py:77
+#: ../picard/util/tags.py:78
 msgid "Language"
 msgstr ""
 
-#: ../picard/util/tags.py:78
+#: ../picard/util/tags.py:79
 msgid "Script"
 msgstr ""
 
diff --git a/po/ca.po b/po/ca.po
index dc6635910..bdbb8744a 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: 2009-02-24 18:58+0100\n"
+"POT-Creation-Date: 2009-04-06 22:50+0200\n"
 "PO-Revision-Date: 2009-01-25 12:46+0000\n"
 "Last-Translator: Philipp Wolfer <Unknown>\n"
 "Language-Team: Catalan <ca@li.org>\n"
@@ -18,16 +18,16 @@ msgstr ""
 "X-Launchpad-Export-Date: 2009-04-06 20:21+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
-#: ../picard/album.py:108 ../picard/cluster.py:248
+#: ../picard/album.py:109 ../picard/cluster.py:248
 msgid "Unmatched Files"
 msgstr "Arxius de inigualable"
 
-#: ../picard/album.py:281
+#: ../picard/album.py:287
 #, python-format
 msgid "[could not load album %s]"
 msgstr ""
 
-#: ../picard/album.py:317
+#: ../picard/album.py:320
 msgid "[loading album information]"
 msgstr "carregant informació del album"
 
@@ -587,7 +587,7 @@ msgid "Namibia"
 msgstr ""
 
 #: ../picard/const.py:182
-msgid "Vanuat"
+msgid "Vanuatu"
 msgstr ""
 
 #: ../picard/const.py:183
@@ -1031,223 +1031,234 @@ msgid "Congo, The Democratic Republic of the"
 msgstr ""
 
 #: ../picard/const.py:293
-msgid "Serbia and Montenegro"
+msgid "Serbia and Montenegro (historical, 2003-2006)"
 msgstr ""
 
 #: ../picard/const.py:294
-msgid "Croatia"
+msgid "Serbia"
 msgstr ""
 
 #: ../picard/const.py:295
-msgid "Korea (North), Democratic People's Republic of"
+msgid "Montenegro"
 msgstr ""
 
 #: ../picard/const.py:296
-msgid "Korea (South), Republic of"
+msgid "Croatia"
 msgstr ""
 
 #: ../picard/const.py:297
-msgid "Slovakia"
+msgid "Korea (North), Democratic People's Republic of"
 msgstr ""
 
 #: ../picard/const.py:298
-msgid "Soviet Union (historical, 1922-1991)"
+msgid "Korea (South), Republic of"
 msgstr ""
 
 #: ../picard/const.py:299
-msgid "East Timor"
+msgid "Slovakia"
 msgstr ""
 
 #: ../picard/const.py:300
-msgid "Czechoslovakia (historical, 1918-1992)"
+msgid "Soviet Union (historical, 1922-1991)"
 msgstr ""
 
 #: ../picard/const.py:301
-msgid "Europe"
+msgid "East Timor"
 msgstr ""
 
 #: ../picard/const.py:302
-msgid "East Germany (historical, 1949-1990)"
+msgid "Czechoslovakia (historical, 1918-1992)"
 msgstr ""
 
 #: ../picard/const.py:303
-msgid "[Unknown Country]"
+msgid "Europe"
 msgstr ""
 
 #: ../picard/const.py:304
-msgid "[Worldwide]"
+msgid "East Germany (historical, 1949-1990)"
 msgstr ""
 
 #: ../picard/const.py:305
+msgid "[Unknown Country]"
+msgstr ""
+
+#: ../picard/const.py:306
+msgid "[Worldwide]"
+msgstr ""
+
+#: ../picard/const.py:307
 msgid "Yugoslavia (historical, 1918-1992)"
 msgstr ""
 
-#: ../picard/const.py:310
-msgid "Catalan"
-msgstr ""
-
-#: ../picard/const.py:311
-msgid "Czech"
-msgstr ""
-
 #: ../picard/const.py:312
-msgid "Welsh"
+msgid "Afrikaans"
 msgstr ""
 
 #: ../picard/const.py:313
-msgid "Danish"
+msgid "Arabic"
 msgstr ""
 
 #: ../picard/const.py:314
-msgid "German"
+msgid "Catalan"
 msgstr ""
 
 #: ../picard/const.py:315
-msgid "English"
+msgid "Czech"
 msgstr ""
 
 #: ../picard/const.py:316
-msgid "English (Canada)"
+msgid "Welsh"
 msgstr ""
 
 #: ../picard/const.py:317
-msgid "English (UK)"
+msgid "Danish"
 msgstr ""
 
 #: ../picard/const.py:318
-msgid "Spanish"
+msgid "German"
 msgstr ""
 
 #: ../picard/const.py:319
-msgid "Persian"
+msgid "English"
 msgstr ""
 
 #: ../picard/const.py:320
-msgid "Finnish"
+msgid "English (Canada)"
 msgstr ""
 
 #: ../picard/const.py:321
-msgid "French"
+msgid "English (UK)"
 msgstr ""
 
 #: ../picard/const.py:322
-msgid "Frisian"
+msgid "Spanish"
 msgstr ""
 
 #: ../picard/const.py:323
-msgid "Hebrew"
+msgid "Persian"
 msgstr ""
 
 #: ../picard/const.py:324
-msgid "Hungarian"
+msgid "Finnish"
 msgstr ""
 
 #: ../picard/const.py:325
-msgid "Islandic"
+msgid "French"
 msgstr ""
 
 #: ../picard/const.py:326
-msgid "Italian"
+msgid "Frisian"
 msgstr ""
 
 #: ../picard/const.py:327
-msgid "Kannada"
+msgid "Hebrew"
 msgstr ""
 
 #: ../picard/const.py:328
-msgid "Korean"
+msgid "Hindi"
 msgstr ""
 
 #: ../picard/const.py:329
-msgid "Lithuanian"
+msgid "Hungarian"
 msgstr ""
 
 #: ../picard/const.py:330
-msgid "Norwegian Bokmal"
+msgid "Islandic"
 msgstr ""
 
 #: ../picard/const.py:331
-msgid "Dutch"
+msgid "Italian"
 msgstr ""
 
 #: ../picard/const.py:332
-msgid "Polish"
+msgid "Kannada"
 msgstr ""
 
 #: ../picard/const.py:333
-msgid "Portuguese"
+msgid "Korean"
 msgstr ""
 
 #: ../picard/const.py:334
-msgid "Brazilian Portuguese"
+msgid "Lithuanian"
 msgstr ""
 
 #: ../picard/const.py:335
-msgid "Romanian"
+msgid "Norwegian Bokmal"
 msgstr ""
 
 #: ../picard/const.py:336
-msgid "Russian"
+msgid "Dutch"
 msgstr ""
 
 #: ../picard/const.py:337
-msgid "Scots"
+msgid "Polish"
 msgstr ""
 
 #: ../picard/const.py:338
-msgid "Slovak"
+msgid "Portuguese"
 msgstr ""
 
 #: ../picard/const.py:339
-msgid "Slovenian"
+msgid "Brazilian Portuguese"
 msgstr ""
 
 #: ../picard/const.py:340
-msgid "Swedish"
+msgid "Romanian"
 msgstr ""
 
 #: ../picard/const.py:341
+msgid "Russian"
+msgstr ""
+
+#: ../picard/const.py:342
+msgid "Scots"
+msgstr ""
+
+#: ../picard/const.py:343
+msgid "Slovak"
+msgstr ""
+
+#: ../picard/const.py:344
+msgid "Slovenian"
+msgstr ""
+
+#: ../picard/const.py:345
+msgid "Swedish"
+msgstr ""
+
+#: ../picard/const.py:346
+msgid "Turkish"
+msgstr ""
+
+#: ../picard/const.py:347
 msgid "Chinese"
 msgstr ""
 
-#: ../picard/file.py:487
+#: ../picard/file.py:494
 #, python-format
 msgid "No matching tracks for file %s"
 msgstr "No s'han trobat pistes per el fitxer %s"
 
-#: ../picard/file.py:504
+#: ../picard/file.py:511
 #, python-format
 msgid "No matching tracks above the threshold for file %s"
 msgstr ""
 
-#: ../picard/file.py:507
+#: ../picard/file.py:514
 #, python-format
 msgid "File %s identified!"
 msgstr "Arxiu %s identificat!"
 
-#: ../picard/file.py:518
+#: ../picard/file.py:525
 #, python-format
 msgid "Looking up the PUID for file %s..."
 msgstr "Buscant el PUID per arxiu %s"
 
-#: ../picard/file.py:523
+#: ../picard/file.py:530
 #, 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 "PUIDs correctament presentat"
-
 #: ../picard/playlist.py:31
 msgid "M3U Playlist (*.m3u)"
 msgstr "M3U Llista de reproducció(*.m3u)"
@@ -1260,11 +1271,24 @@ msgstr "PLS Llista de reproducció (*.pls)"
 msgid "XSPF Playlist (*.xspf)"
 msgstr "XSPF Llista de reproducció (*.xspf)"
 
-#: ../picard/tagger.py:476
+#: ../picard/puidmanager.py:62
+msgid "Submitting PUIDs..."
+msgstr ""
+
+#: ../picard/puidmanager.py:68
+#, python-format
+msgid "PUIDs submission failed: %s"
+msgstr ""
+
+#: ../picard/puidmanager.py:70
+msgid "PUIDs successfully submitted!"
+msgstr "PUIDs correctament presentat"
+
+#: ../picard/tagger.py:477
 msgid "CD Lookup Error"
 msgstr "Error al buscar el CD"
 
-#: ../picard/tagger.py:477
+#: ../picard/tagger.py:478
 #, python-format
 msgid ""
 "Error while reading CD:\n"
@@ -1275,7 +1299,7 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../picard/tagger.py:503
+#: ../picard/tagger.py:504
 #, python-format
 msgid "Could not find PUID for file %s"
 msgstr ""
@@ -1328,15 +1352,27 @@ msgstr ""
 msgid "Length"
 msgstr "Longitud"
 
-#: ../picard/ui/itemviews.py:327
+#: ../picard/ui/itemviews.py:289
+msgid "&Expand all"
+msgstr ""
+
+#: ../picard/ui/itemviews.py:291
+msgid "&Collapse all"
+msgstr ""
+
+#: ../picard/ui/itemviews.py:332
 msgid "&Releases"
 msgstr ""
 
-#: ../picard/ui/itemviews.py:353
+#: ../picard/ui/itemviews.py:349
+msgid "No release event"
+msgstr ""
+
+#: ../picard/ui/itemviews.py:359
 msgid "&Plugins"
 msgstr "&Extensions"
 
-#: ../picard/ui/itemviews.py:523
+#: ../picard/ui/itemviews.py:533
 msgid "Clusters"
 msgstr ""
 
@@ -1344,95 +1380,6 @@ msgstr ""
 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:66 ../picard/ui/ui_options_plugins.py:62
-msgid "Details"
-msgstr ""
-
-#: ../picard/ui/tageditor.py:71 ../picard/ui/tageditor.py:264
-#, python-format
-msgid "%d file"
-msgid_plural "%d files"
-msgstr[0] ""
-msgstr[1] ""
-
-#: ../picard/ui/tageditor.py:131
-#, python-format
-msgid "(different across %d file)"
-msgid_plural "(different across %d files)"
-msgstr[0] ""
-msgstr[1] ""
-
-#: ../picard/ui/tageditor.py:134
-#, python-format
-msgid "(missing from %d file)"
-msgid_plural "(missing from %d files)"
-msgstr[0] ""
-msgstr[1] ""
-
-#: ../picard/ui/tageditor.py:233
-msgid "Filename:"
-msgstr ""
-
-#: ../picard/ui/tageditor.py:235
-msgid "Format:"
-msgstr ""
-
-#: ../picard/ui/tageditor.py:244
-msgid "Size:"
-msgstr ""
-
-#: ../picard/ui/tageditor.py:248 ../picard/ui/ui_metadata.py:127
-msgid "Length:"
-msgstr ""
-
-#: ../picard/ui/tageditor.py:250
-msgid "Bitrate:"
-msgstr ""
-
-#: ../picard/ui/tageditor.py:252
-msgid "Sample rate:"
-msgstr ""
-
-#: ../picard/ui/tageditor.py:254
-msgid "Bits per sample:"
-msgstr ""
-
-#: ../picard/ui/tageditor.py:257
-msgid "Mono"
-msgstr ""
-
-#: ../picard/ui/tageditor.py:258
-msgid "Stereo"
-msgstr ""
-
-#: ../picard/ui/tageditor.py:260
-msgid "Channels:"
-msgstr ""
-
-#: ../picard/ui/tagsfromfilenames.py:52 ../picard/ui/tagsfromfilenames.py:96
-msgid "File Name"
-msgstr ""
-
 #: ../picard/ui/mainwindow.py:64
 msgid "MusicBrainz Picard"
 msgstr ""
@@ -1669,6 +1616,10 @@ msgstr ""
 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 ""
@@ -1688,12 +1639,97 @@ msgstr ""
 msgid " (Error: %s)"
 msgstr ""
 
+#: ../picard/ui/puidsubmit.py:31 ../picard/ui/options/plugins.py:85
+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/passworddialog.py:38
 #, python-format
 msgid ""
 "The server %s requires you to login. Please enter your username and password."
 msgstr ""
 
+#: ../picard/ui/tageditor.py:66 ../picard/ui/ui_options_plugins.py:62
+msgid "Details"
+msgstr ""
+
+#: ../picard/ui/tageditor.py:71 ../picard/ui/tageditor.py:264
+#, python-format
+msgid "%d file"
+msgid_plural "%d files"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../picard/ui/tageditor.py:131
+#, python-format
+msgid "(different across %d file)"
+msgid_plural "(different across %d files)"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../picard/ui/tageditor.py:134
+#, python-format
+msgid "(missing from %d file)"
+msgid_plural "(missing from %d files)"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../picard/ui/tageditor.py:233
+msgid "Filename:"
+msgstr ""
+
+#: ../picard/ui/tageditor.py:235
+msgid "Format:"
+msgstr ""
+
+#: ../picard/ui/tageditor.py:244
+msgid "Size:"
+msgstr ""
+
+#: ../picard/ui/tageditor.py:248 ../picard/ui/ui_metadata.py:127
+msgid "Length:"
+msgstr ""
+
+#: ../picard/ui/tageditor.py:250
+msgid "Bitrate:"
+msgstr ""
+
+#: ../picard/ui/tageditor.py:252
+msgid "Sample rate:"
+msgstr ""
+
+#: ../picard/ui/tageditor.py:254
+msgid "Bits per sample:"
+msgstr ""
+
+#: ../picard/ui/tageditor.py:257
+msgid "Mono"
+msgstr ""
+
+#: ../picard/ui/tageditor.py:258
+msgid "Stereo"
+msgstr ""
+
+#: ../picard/ui/tageditor.py:260
+msgid "Channels:"
+msgstr ""
+
+#: ../picard/ui/tagsfromfilenames.py:54 ../picard/ui/tagsfromfilenames.py:99
+msgid "File Name"
+msgstr ""
+
 #: ../picard/ui/ui_cdlookup.py:60 ../picard/ui/ui_options_cdlookup.py:47
 #: ../picard/ui/ui_options_cdlookup_select.py:48
 #: ../picard/ui/options/cdlookup.py:36
@@ -1716,24 +1752,6 @@ msgstr ""
 msgid "Cancel"
 msgstr ""
 
-#: ../picard/ui/ui_passworddialog.py:78
-msgid "Authentication required"
-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"
-msgstr ""
-
 #: ../picard/ui/ui_edittagdialog.py:44
 msgid "Edit Tag"
 msgstr ""
@@ -1770,6 +1788,10 @@ msgstr ""
 msgid "Options"
 msgstr ""
 
+#: ../picard/ui/ui_puidsubmit.py:52
+msgid "Submit PUIDs"
+msgstr ""
+
 #: ../picard/ui/ui_options_cdlookup.py:48
 msgid "CD-ROM device to use for lookups:"
 msgstr ""
@@ -1794,6 +1816,22 @@ msgstr ""
 msgid "Overwrite the file if it already exists"
 msgstr ""
 
+#: ../picard/ui/ui_options_moving.py:53
+msgid "Move additional files:"
+msgstr ""
+
+#: ../picard/ui/ui_options_moving.py:54
+msgid "Browse..."
+msgstr ""
+
+#: ../picard/ui/ui_options_moving.py:55
+msgid "Delete empty directories"
+msgstr ""
+
+#: ../picard/ui/ui_options_moving.py:56
+msgid "Move files to this directory when saving:"
+msgstr ""
+
 #: ../picard/ui/util.py:31
 msgid "&Ok"
 msgstr ""
@@ -1802,44 +1840,40 @@ msgstr ""
 msgid "&Cancel"
 msgstr ""
 
-#: ../picard/ui/ui_puidsubmit.py:52
-msgid "Submit PUIDs"
-msgstr ""
-
-#: ../picard/ui/ui_tageditor.py:139 ../picard/ui/ui_options_plugins.py:59
-#: ../picard/ui/options/plugins.py:76
+#: ../picard/ui/ui_tageditor.py:128 ../picard/ui/ui_options_plugins.py:59
+#: ../picard/ui/options/plugins.py:81
 msgid "Name"
 msgstr ""
 
-#: ../picard/ui/ui_tageditor.py:140
+#: ../picard/ui/ui_tageditor.py:129
 msgid "Value"
 msgstr ""
 
-#: ../picard/ui/ui_tageditor.py:141
+#: ../picard/ui/ui_tageditor.py:130
 msgid "Rating:"
 msgstr ""
 
-#: ../picard/ui/ui_tageditor.py:142
+#: ../picard/ui/ui_tageditor.py:131
 msgid "&Add..."
 msgstr ""
 
-#: ../picard/ui/ui_tageditor.py:143
+#: ../picard/ui/ui_tageditor.py:132
 msgid "&Edit..."
 msgstr ""
 
-#: ../picard/ui/ui_tageditor.py:144
+#: ../picard/ui/ui_tageditor.py:133
 msgid "&Delete"
 msgstr ""
 
-#: ../picard/ui/ui_tageditor.py:145
+#: ../picard/ui/ui_tageditor.py:134
 msgid "&Metadata"
 msgstr ""
 
-#: ../picard/ui/ui_tageditor.py:146
+#: ../picard/ui/ui_tageditor.py:135
 msgid "A&rtwork"
 msgstr ""
 
-#: ../picard/ui/ui_tageditor.py:147
+#: ../picard/ui/ui_tageditor.py:136
 msgid "&Info"
 msgstr ""
 
@@ -1884,6 +1918,40 @@ msgstr ""
 msgid ", "
 msgstr ""
 
+#: ../picard/ui/ui_options_general.py:108
+msgid "MusicBrainz Server"
+msgstr ""
+
+#: ../picard/ui/ui_options_general.py:109 ../picard/ui/ui_options_proxy.py:72
+msgid "Port:"
+msgstr ""
+
+#: ../picard/ui/ui_options_general.py:110 ../picard/ui/ui_options_proxy.py:73
+msgid "Server address:"
+msgstr ""
+
+#: ../picard/ui/ui_options_general.py:111
+msgid "Account Information"
+msgstr ""
+
+#: ../picard/ui/ui_options_general.py:112 ../picard/ui/ui_options_proxy.py:70
+#: ../picard/ui/ui_passworddialog.py:80
+msgid "Password:"
+msgstr ""
+
+#: ../picard/ui/ui_options_general.py:113 ../picard/ui/ui_options_proxy.py:71
+#: ../picard/ui/ui_passworddialog.py:79
+msgid "Username:"
+msgstr ""
+
+#: ../picard/ui/ui_options_general.py:114 ../picard/ui/options/general.py:29
+msgid "General"
+msgstr ""
+
+#: ../picard/ui/ui_options_general.py:115
+msgid "Automatically scan all new files"
+msgstr ""
+
 #: ../picard/ui/ui_options_interface.py:50
 msgid "Miscellaneous"
 msgstr ""
@@ -1904,113 +1972,6 @@ msgstr ""
 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_options_naming.py:180
-#: ../picard/ui/ui_tagsfromfilenames.py:58
-msgid "&Preview"
-msgstr ""
-
-#: ../picard/ui/ui_options_proxy.py:81 ../picard/ui/options/proxy.py:28
-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_options_ratings.py:45
-msgid "Enable track ratings"
-msgstr ""
-
-#: ../picard/ui/ui_options_ratings.py:46
-msgid ""
-"Picard saves the ratings together with an e-mail address identifying the "
-"user who did the rating. That way different ratings for different users can "
-"be stored in the files. Please sepcify the e-mail you want to use to save "
-"your ratings."
-msgstr ""
-
-#: ../picard/ui/ui_options_ratings.py:47
-msgid "E-mail:"
-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 ../picard/ui/options/general.py:29
-msgid "General"
-msgstr ""
-
-#: ../picard/ui/ui_options_general.py:115
-msgid "Automatically scan all new files"
-msgstr ""
-
 #: ../picard/ui/ui_options_matching.py:105
 msgid "Thresholds"
 msgstr ""
@@ -2067,72 +2028,143 @@ msgstr ""
 msgid "Non-album tracks:"
 msgstr ""
 
-#: ../picard/ui/ui_options_plugins.py:58 ../picard/ui/options/plugins.py:30
+#: ../picard/ui/ui_options_metadata.py:109
+#: ../picard/ui/ui_options_metadata.py:110
+#: ../picard/ui/ui_options_renaming.py:155
+#: ../picard/ui/ui_options_renaming.py:158
+msgid "Default"
+msgstr ""
+
+#: ../picard/ui/ui_options_plugins.py:58 ../picard/ui/options/plugins.py:34
 msgid "Plugins"
 msgstr ""
 
-#: ../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:84
 msgid "Author"
 msgstr ""
 
-#: ../picard/ui/ui_options_plugins.py:61 ../picard/util/tags.py:36
+#: ../picard/ui/ui_options_plugins.py:61 ../picard/util/tags.py:37
 msgid "Version"
 msgstr ""
 
-#: ../picard/ui/ui_options_script.py:52
+#: ../picard/ui/ui_options_proxy.py:69 ../picard/ui/options/proxy.py:28
+msgid "Web Proxy"
+msgstr ""
+
+#: ../picard/ui/ui_options_ratings.py:45
+msgid "Enable track ratings"
+msgstr ""
+
+#: ../picard/ui/ui_options_ratings.py:46
+msgid ""
+"Picard saves the ratings together with an e-mail address identifying the "
+"user who did the rating. That way different ratings for different users can "
+"be stored in the files. Please sepcify the e-mail you want to use to save "
+"your ratings."
+msgstr ""
+
+#: ../picard/ui/ui_options_ratings.py:47
+msgid "E-mail:"
+msgstr ""
+
+#: ../picard/ui/ui_options_renaming.py:145
+msgid "Form"
+msgstr ""
+
+#: ../picard/ui/ui_options_renaming.py:146
+msgid "Rename files when saving"
+msgstr ""
+
+#: ../picard/ui/ui_options_renaming.py:147
+msgid "Replace non-ASCII characters"
+msgstr ""
+
+#: ../picard/ui/ui_options_renaming.py:148
+msgid "Replace Windows-incompatible characters"
+msgstr ""
+
+#: ../picard/ui/ui_options_renaming.py:149
+msgid "Name files like this"
+msgstr ""
+
+#: ../picard/ui/ui_options_renaming.py:156
+msgid "Name multiple artist albums differently"
+msgstr ""
+
+#: ../picard/ui/ui_options_renaming.py:157
+msgid "Copy from above"
+msgstr ""
+
+#: ../picard/ui/ui_options_renaming.py:159
+msgid "Examples"
+msgstr ""
+
+#: ../picard/ui/ui_options_script.py:43
 msgid "Tagger Script"
 msgstr ""
 
-#: ../picard/ui/ui_options_tags.py:85
-msgid "Common"
+#: ../picard/ui/ui_options_tags.py:97
+msgid "Do not write tags to files"
 msgstr ""
 
-#: ../picard/ui/ui_options_tags.py:86
-msgid "Clear existing tags before writing new tags"
+#: ../picard/ui/ui_options_tags.py:98
+msgid "Before tagging"
 msgstr ""
 
-#: ../picard/ui/ui_options_tags.py:87
-msgid "Don not write tags to files"
+#: ../picard/ui/ui_options_tags.py:99
+msgid "Clear existing tags"
 msgstr ""
 
-#: ../picard/ui/ui_options_tags.py:88
-msgid "ID3"
-msgstr ""
-
-#: ../picard/ui/ui_options_tags.py:89
-msgid "Write ID3v1 tags to the files"
-msgstr ""
-
-#: ../picard/ui/ui_options_tags.py:90
-msgid "Write ID3v2 version 2.3 tags (2.4 is default)"
-msgstr ""
-
-#: ../picard/ui/ui_options_tags.py:91
-msgid "Text encoding to use while writing ID3v2 tags:"
-msgstr ""
-
-#: ../picard/ui/ui_options_tags.py:92
-msgid "ISO-8859-1"
-msgstr ""
-
-#: ../picard/ui/ui_options_tags.py:93
-msgid "UTF-16"
-msgstr ""
-
-#: ../picard/ui/ui_options_tags.py:94
-msgid "UTF-8"
-msgstr ""
-
-#: ../picard/ui/ui_options_tags.py:95
+#: ../picard/ui/ui_options_tags.py:100
 msgid "Remove ID3 tags from FLAC files"
 msgstr ""
 
-#: ../picard/ui/ui_options_tags.py:96
-msgid "APE"
+#: ../picard/ui/ui_options_tags.py:101
+msgid "Remove APEv2 tags from MP3 files"
 msgstr ""
 
-#: ../picard/ui/ui_options_tags.py:97
-msgid "Remove APEv2 tags from MP3 files"
+#: ../picard/ui/ui_options_tags.py:102
+msgid "Tag compatibility"
+msgstr ""
+
+#: ../picard/ui/ui_options_tags.py:103
+msgid "ID3v2 version"
+msgstr ""
+
+#: ../picard/ui/ui_options_tags.py:104
+msgid "2.4"
+msgstr ""
+
+#: ../picard/ui/ui_options_tags.py:105
+msgid "2.3"
+msgstr ""
+
+#: ../picard/ui/ui_options_tags.py:106
+msgid "Also include ID3v1 tags in the files"
+msgstr ""
+
+#: ../picard/ui/ui_options_tags.py:107
+msgid "ID3v2 text encoding"
+msgstr ""
+
+#: ../picard/ui/ui_options_tags.py:108
+msgid "UTF-8"
+msgstr ""
+
+#: ../picard/ui/ui_options_tags.py:109
+msgid "UTF-16"
+msgstr ""
+
+#: ../picard/ui/ui_options_tags.py:110
+msgid "ISO-8859-1"
+msgstr ""
+
+#: ../picard/ui/ui_passworddialog.py:78
+msgid "Authentication required"
+msgstr ""
+
+#: ../picard/ui/ui_passworddialog.py:81
+msgid "Save username and password"
 msgstr ""
 
 #: ../picard/ui/ui_tagsfromfilenames.py:56
@@ -2143,6 +2175,10 @@ msgstr ""
 msgid "Replace underscores with spaces"
 msgstr ""
 
+#: ../picard/ui/ui_tagsfromfilenames.py:58
+msgid "&Preview"
+msgstr ""
+
 #: ../picard/ui/options/about.py:29
 msgid "About"
 msgstr ""
@@ -2167,8 +2203,8 @@ 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"
@@ -2176,14 +2212,13 @@ msgid ""
 "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\"><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/P"
-"icardTagger</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
@@ -2216,42 +2251,44 @@ msgstr ""
 msgid "None"
 msgstr ""
 
-#: ../picard/ui/options/naming.py:33
-msgid "File Naming"
+#: ../picard/ui/options/moving.py:33
+msgid "Moving files"
 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 ""
-
-#: ../picard/ui/options/naming.py:95
-msgid "The multiple artist file naming format must not be empty."
-msgstr ""
-
-#: ../picard/ui/options/naming.py:97
+#: ../picard/ui/options/moving.py:65
 msgid "Error"
 msgstr ""
 
-#: ../picard/ui/options/naming.py:97
+#: ../picard/ui/options/moving.py:65
 msgid "The location to move files to must not be empty."
 msgstr ""
 
-#: ../picard/ui/options/scripting.py:63
-msgid "Scripting"
+#: ../picard/ui/options/ratings.py:29
+msgid "Ratings"
 msgstr ""
 
 #: ../picard/ui/options/tags.py:29
 msgid "Tags"
 msgstr ""
 
-#: ../picard/ui/options/ratings.py:29
-msgid "Ratings"
+#: ../picard/ui/options/renaming.py:35
+msgid "File naming"
+msgstr ""
+
+#: ../picard/ui/options/renaming.py:123
+msgid "The file naming format must not be empty."
+msgstr ""
+
+#: ../picard/ui/options/renaming.py:133
+msgid "The multiple artist file naming format must not be empty."
+msgstr ""
+
+#: ../picard/ui/options/scripting.py:63
+msgid "Scripting"
+msgstr ""
+
+#: ../picard/ui/options/scripting.py:97
+msgid "Script Error"
 msgstr ""
 
 #: ../picard/util/tags.py:24
@@ -2259,214 +2296,218 @@ msgid "Date"
 msgstr ""
 
 #: ../picard/util/tags.py:25
-msgid "Album Artist"
+msgid "Original Release Date"
 msgstr ""
 
 #: ../picard/util/tags.py:26
-msgid "Track Number"
+msgid "Album Artist"
 msgstr ""
 
 #: ../picard/util/tags.py:27
-msgid "Total Tracks"
+msgid "Track Number"
 msgstr ""
 
 #: ../picard/util/tags.py:28
-msgid "Disc Number"
+msgid "Total Tracks"
 msgstr ""
 
 #: ../picard/util/tags.py:29
-msgid "Total Discs"
+msgid "Disc Number"
 msgstr ""
 
 #: ../picard/util/tags.py:30
-msgid "Album Artist Sort Order"
+msgid "Total Discs"
 msgstr ""
 
 #: ../picard/util/tags.py:31
-msgid "Artist Sort Order"
+msgid "Album Artist Sort Order"
 msgstr ""
 
 #: ../picard/util/tags.py:32
-msgid "Title Sort Order"
+msgid "Artist Sort Order"
 msgstr ""
 
 #: ../picard/util/tags.py:33
-msgid "Album Sort Order"
+msgid "Title Sort Order"
 msgstr ""
 
 #: ../picard/util/tags.py:34
-msgid "ASIN"
+msgid "Album Sort Order"
 msgstr ""
 
 #: ../picard/util/tags.py:35
+msgid "ASIN"
+msgstr ""
+
+#: ../picard/util/tags.py:36
 msgid "Grouping"
 msgstr ""
 
-#: ../picard/util/tags.py:37
+#: ../picard/util/tags.py:38
 msgid "ISRC"
 msgstr ""
 
-#: ../picard/util/tags.py:38
+#: ../picard/util/tags.py:39
 msgid "Mood"
 msgstr ""
 
-#: ../picard/util/tags.py:39
+#: ../picard/util/tags.py:40
 msgid "BPM"
 msgstr ""
 
-#: ../picard/util/tags.py:40
+#: ../picard/util/tags.py:41
 msgid "Copyright"
 msgstr ""
 
-#: ../picard/util/tags.py:41
+#: ../picard/util/tags.py:42
 msgid "Composer"
 msgstr ""
 
-#: ../picard/util/tags.py:42
+#: ../picard/util/tags.py:43
 msgid "Conductor"
 msgstr ""
 
-#: ../picard/util/tags.py:43
+#: ../picard/util/tags.py:44
 msgid "Lyricist"
 msgstr ""
 
-#: ../picard/util/tags.py:44
+#: ../picard/util/tags.py:45
 msgid "Arranger"
 msgstr ""
 
-#: ../picard/util/tags.py:45
+#: ../picard/util/tags.py:46
 msgid "Producer"
 msgstr ""
 
-#: ../picard/util/tags.py:46
+#: ../picard/util/tags.py:47
 msgid "Engineer"
 msgstr ""
 
-#: ../picard/util/tags.py:47
+#: ../picard/util/tags.py:48
 msgid "Subtitle"
 msgstr ""
 
-#: ../picard/util/tags.py:48
+#: ../picard/util/tags.py:49
 msgid "Disc Subtitle"
 msgstr ""
 
-#: ../picard/util/tags.py:49
+#: ../picard/util/tags.py:50
 msgid "Remixer"
 msgstr ""
 
-#: ../picard/util/tags.py:50
+#: ../picard/util/tags.py:51
 msgid "MusicBrainz Track Id"
 msgstr ""
 
-#: ../picard/util/tags.py:51
+#: ../picard/util/tags.py:52
 msgid "MusicBrainz Release Id"
 msgstr ""
 
-#: ../picard/util/tags.py:52
+#: ../picard/util/tags.py:53
 msgid "MusicBrainz Artist Id"
 msgstr ""
 
-#: ../picard/util/tags.py:53
+#: ../picard/util/tags.py:54
 msgid "MusicBrainz Release Artist Id"
 msgstr ""
 
-#: ../picard/util/tags.py:54
+#: ../picard/util/tags.py:55
 msgid "MusicBrainz TRM Id"
 msgstr ""
 
-#: ../picard/util/tags.py:55
+#: ../picard/util/tags.py:56
 msgid "MusicBrainz Disc Id"
 msgstr ""
 
-#: ../picard/util/tags.py:56
+#: ../picard/util/tags.py:57
 msgid "MusicBrainz Sort Name"
 msgstr ""
 
-#: ../picard/util/tags.py:57
+#: ../picard/util/tags.py:58
 msgid "MusicIP PUID"
 msgstr ""
 
-#: ../picard/util/tags.py:58
+#: ../picard/util/tags.py:59
 msgid "MusicIP Fingerprint"
 msgstr ""
 
-#: ../picard/util/tags.py:59
+#: ../picard/util/tags.py:60
 msgid "Disc Id"
 msgstr ""
 
-#: ../picard/util/tags.py:60
+#: ../picard/util/tags.py:61
 msgid "Website"
 msgstr ""
 
-#: ../picard/util/tags.py:61
+#: ../picard/util/tags.py:62
 msgid "Compilation"
 msgstr ""
 
-#: ../picard/util/tags.py:62
+#: ../picard/util/tags.py:63
 msgid "Comment"
 msgstr ""
 
-#: ../picard/util/tags.py:63
+#: ../picard/util/tags.py:64
 msgid "Genre"
 msgstr ""
 
-#: ../picard/util/tags.py:64
+#: ../picard/util/tags.py:65
 msgid "Encoded By"
 msgstr ""
 
-#: ../picard/util/tags.py:65
+#: ../picard/util/tags.py:66
 msgid "Performer"
 msgstr ""
 
-#: ../picard/util/tags.py:66
+#: ../picard/util/tags.py:67
 msgid "Release Type"
 msgstr ""
 
-#: ../picard/util/tags.py:67
+#: ../picard/util/tags.py:68
 msgid "Release Status"
 msgstr ""
 
-#: ../picard/util/tags.py:68
+#: ../picard/util/tags.py:69
 msgid "Release Country"
 msgstr ""
 
-#: ../picard/util/tags.py:69
+#: ../picard/util/tags.py:70
 msgid "Record Label"
 msgstr ""
 
-#: ../picard/util/tags.py:70
+#: ../picard/util/tags.py:71
 msgid "Barcode"
 msgstr ""
 
-#: ../picard/util/tags.py:71
+#: ../picard/util/tags.py:72
 msgid "Catalog Number"
 msgstr ""
 
-#: ../picard/util/tags.py:72
+#: ../picard/util/tags.py:73
 msgid "Format"
 msgstr ""
 
-#: ../picard/util/tags.py:73
+#: ../picard/util/tags.py:74
 msgid "DJ-Mixer"
 msgstr ""
 
-#: ../picard/util/tags.py:74
+#: ../picard/util/tags.py:75
 msgid "Media"
 msgstr ""
 
-#: ../picard/util/tags.py:75
+#: ../picard/util/tags.py:76
 msgid "Lyrics"
 msgstr ""
 
-#: ../picard/util/tags.py:76
+#: ../picard/util/tags.py:77
 msgid "Mixer"
 msgstr ""
 
-#: ../picard/util/tags.py:77
+#: ../picard/util/tags.py:78
 msgid "Language"
 msgstr ""
 
-#: ../picard/util/tags.py:78
+#: ../picard/util/tags.py:79
 msgid "Script"
 msgstr ""
 
diff --git a/po/cs.po b/po/cs.po
index e755aaccf..5b844b298 100644
--- a/po/cs.po
+++ b/po/cs.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: picard\n"
 "Report-Msgid-Bugs-To: http://bugs.musicbrainz.org/\n"
-"POT-Creation-Date: 2009-02-24 18:58+0100\n"
+"POT-Creation-Date: 2009-04-06 22:50+0200\n"
 "PO-Revision-Date: 2009-03-30 11:59+0000\n"
 "Last-Translator: Ondřej Vodáček <ondra.vodacek@email.cz>\n"
 "Language-Team: Czech <cs@li.org>\n"
@@ -17,16 +17,16 @@ msgstr ""
 "X-Launchpad-Export-Date: 2009-04-06 20:21+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
-#: ../picard/album.py:108 ../picard/cluster.py:248
+#: ../picard/album.py:109 ../picard/cluster.py:248
 msgid "Unmatched Files"
 msgstr "Nerozpoznané Soubory"
 
-#: ../picard/album.py:281
+#: ../picard/album.py:287
 #, python-format
 msgid "[could not load album %s]"
 msgstr "[nemohu nahrát album %s]"
 
-#: ../picard/album.py:317
+#: ../picard/album.py:320
 msgid "[loading album information]"
 msgstr "[Nahrávám informace o albu]"
 
@@ -586,7 +586,8 @@ msgid "Namibia"
 msgstr "Namibie"
 
 #: ../picard/const.py:182
-msgid "Vanuat"
+#, fuzzy
+msgid "Vanuatu"
 msgstr "Vanuatu"
 
 #: ../picard/const.py:183
@@ -1030,223 +1031,239 @@ msgid "Congo, The Democratic Republic of the"
 msgstr "Konžská republika"
 
 #: ../picard/const.py:293
-msgid "Serbia and Montenegro"
+#, fuzzy
+msgid "Serbia and Montenegro (historical, 2003-2006)"
 msgstr "Srbsko a Černá Hora"
 
 #: ../picard/const.py:294
+#, fuzzy
+msgid "Serbia"
+msgstr "Ázerbajdžán"
+
+#: ../picard/const.py:295
+#, fuzzy
+msgid "Montenegro"
+msgstr "Srbsko a Černá Hora"
+
+#: ../picard/const.py:296
 msgid "Croatia"
 msgstr "Chorvatsko"
 
-#: ../picard/const.py:295
+#: ../picard/const.py:297
 msgid "Korea (North), Democratic People's Republic of"
 msgstr "Korejská lidově demokratická republika (Severní)"
 
-#: ../picard/const.py:296
+#: ../picard/const.py:298
 msgid "Korea (South), Republic of"
 msgstr "Korejská republika (Jižní)"
 
-#: ../picard/const.py:297
+#: ../picard/const.py:299
 msgid "Slovakia"
 msgstr "Slovenská republika"
 
-#: ../picard/const.py:298
+#: ../picard/const.py:300
 msgid "Soviet Union (historical, 1922-1991)"
 msgstr "Sovětský svaz (historický, 1922-1991)"
 
-#: ../picard/const.py:299
+#: ../picard/const.py:301
 msgid "East Timor"
 msgstr "Východní Timor"
 
-#: ../picard/const.py:300
+#: ../picard/const.py:302
 msgid "Czechoslovakia (historical, 1918-1992)"
 msgstr "Československo"
 
-#: ../picard/const.py:301
+#: ../picard/const.py:303
 msgid "Europe"
 msgstr "Evropa"
 
-#: ../picard/const.py:302
+#: ../picard/const.py:304
 msgid "East Germany (historical, 1949-1990)"
 msgstr "Německá demokratická republika (historický, 1949-1990)"
 
-#: ../picard/const.py:303
+#: ../picard/const.py:305
 msgid "[Unknown Country]"
 msgstr "[Neznámá země]"
 
-#: ../picard/const.py:304
+#: ../picard/const.py:306
 msgid "[Worldwide]"
 msgstr "[Celosvětově]"
 
-#: ../picard/const.py:305
+#: ../picard/const.py:307
 msgid "Yugoslavia (historical, 1918-1992)"
 msgstr "Jugoslávie (historický, 1918-1992)"
 
-#: ../picard/const.py:310
+#: ../picard/const.py:312
+msgid "Afrikaans"
+msgstr ""
+
+#: ../picard/const.py:313
+msgid "Arabic"
+msgstr ""
+
+#: ../picard/const.py:314
 msgid "Catalan"
 msgstr "katalánština"
 
-#: ../picard/const.py:311
+#: ../picard/const.py:315
 msgid "Czech"
 msgstr "čeština"
 
-#: ../picard/const.py:312
+#: ../picard/const.py:316
 msgid "Welsh"
 msgstr "velština"
 
-#: ../picard/const.py:313
+#: ../picard/const.py:317
 msgid "Danish"
 msgstr "dánština"
 
-#: ../picard/const.py:314
+#: ../picard/const.py:318
 msgid "German"
 msgstr "němčina"
 
-#: ../picard/const.py:315
+#: ../picard/const.py:319
 msgid "English"
 msgstr "angličtina"
 
-#: ../picard/const.py:316
+#: ../picard/const.py:320
 msgid "English (Canada)"
 msgstr "angličtina (kanadská)"
 
-#: ../picard/const.py:317
+#: ../picard/const.py:321
 msgid "English (UK)"
 msgstr "angličtina (UK)"
 
-#: ../picard/const.py:318
+#: ../picard/const.py:322
 msgid "Spanish"
 msgstr "španělština"
 
-#: ../picard/const.py:319
+#: ../picard/const.py:323
 msgid "Persian"
 msgstr "perština"
 
-#: ../picard/const.py:320
+#: ../picard/const.py:324
 msgid "Finnish"
 msgstr "finština"
 
-#: ../picard/const.py:321
+#: ../picard/const.py:325
 msgid "French"
 msgstr "francouzština"
 
-#: ../picard/const.py:322
+#: ../picard/const.py:326
 msgid "Frisian"
 msgstr "fríština"
 
-#: ../picard/const.py:323
+#: ../picard/const.py:327
 msgid "Hebrew"
 msgstr "hebrejština"
 
-#: ../picard/const.py:324
+#: ../picard/const.py:328
+#, fuzzy
+msgid "Hindi"
+msgstr "Haiti"
+
+#: ../picard/const.py:329
 msgid "Hungarian"
 msgstr "maďarština"
 
-#: ../picard/const.py:325
+#: ../picard/const.py:330
 msgid "Islandic"
 msgstr "islandština"
 
-#: ../picard/const.py:326
+#: ../picard/const.py:331
 msgid "Italian"
 msgstr "italština"
 
-#: ../picard/const.py:327
+#: ../picard/const.py:332
 msgid "Kannada"
 msgstr "Kannadština"
 
-#: ../picard/const.py:328
+#: ../picard/const.py:333
 msgid "Korean"
 msgstr "korejština"
 
-#: ../picard/const.py:329
+#: ../picard/const.py:334
 msgid "Lithuanian"
 msgstr "litevština"
 
-#: ../picard/const.py:330
+#: ../picard/const.py:335
 msgid "Norwegian Bokmal"
 msgstr "norština bokmål"
 
-#: ../picard/const.py:331
+#: ../picard/const.py:336
 msgid "Dutch"
 msgstr "holandština"
 
-#: ../picard/const.py:332
+#: ../picard/const.py:337
 msgid "Polish"
 msgstr "polština"
 
-#: ../picard/const.py:333
+#: ../picard/const.py:338
 msgid "Portuguese"
 msgstr "portugalština"
 
-#: ../picard/const.py:334
+#: ../picard/const.py:339
 msgid "Brazilian Portuguese"
 msgstr "brazilská portugalština"
 
-#: ../picard/const.py:335
+#: ../picard/const.py:340
 msgid "Romanian"
 msgstr "rumunština"
 
-#: ../picard/const.py:336
+#: ../picard/const.py:341
 msgid "Russian"
 msgstr "ruština"
 
-#: ../picard/const.py:337
+#: ../picard/const.py:342
 msgid "Scots"
 msgstr "skotština"
 
-#: ../picard/const.py:338
+#: ../picard/const.py:343
 msgid "Slovak"
 msgstr "slovenština"
 
-#: ../picard/const.py:339
+#: ../picard/const.py:344
 msgid "Slovenian"
 msgstr "slovinština"
 
-#: ../picard/const.py:340
+#: ../picard/const.py:345
 msgid "Swedish"
 msgstr "švédština"
 
-#: ../picard/const.py:341
+#: ../picard/const.py:346
+#, fuzzy
+msgid "Turkish"
+msgstr "Turkmenistán"
+
+#: ../picard/const.py:347
 msgid "Chinese"
 msgstr "čínština"
 
-#: ../picard/file.py:487
+#: ../picard/file.py:494
 #, python-format
 msgid "No matching tracks for file %s"
 msgstr "Žádné odpovídající výsledky pro soubor %s"
 
-#: ../picard/file.py:504
+#: ../picard/file.py:511
 #, python-format
 msgid "No matching tracks above the threshold for file %s"
 msgstr "Žádné odpovídající skladby nad danou úrovní pro soubor %s"
 
-#: ../picard/file.py:507
+#: ../picard/file.py:514
 #, python-format
 msgid "File %s identified!"
 msgstr "Soubor %s identifikován!"
 
-#: ../picard/file.py:518
+#: ../picard/file.py:525
 #, python-format
 msgid "Looking up the PUID for file %s..."
 msgstr "Vyhledávám PUID pro soubor %s"
 
-#: ../picard/file.py:523
+#: ../picard/file.py:530
 #, 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)"
@@ -1259,11 +1276,24 @@ msgstr "PLS Playlist (*.pls)"
 msgid "XSPF Playlist (*.xspf)"
 msgstr "XSPF Playlist (*.xspf)"
 
-#: ../picard/tagger.py:476
+#: ../picard/puidmanager.py:62
+msgid "Submitting PUIDs..."
+msgstr "Posílám PUIDs"
+
+#: ../picard/puidmanager.py:68
+#, python-format
+msgid "PUIDs submission failed: %s"
+msgstr "Odeslání PUID %s selhalo"
+
+#: ../picard/puidmanager.py:70
+msgid "PUIDs successfully submitted!"
+msgstr "PUIDs úspěšně nahrány"
+
+#: ../picard/tagger.py:477
 msgid "CD Lookup Error"
 msgstr "Chyba při prohledávání CD/DVD"
 
-#: ../picard/tagger.py:477
+#: ../picard/tagger.py:478
 #, python-format
 msgid ""
 "Error while reading CD:\n"
@@ -1274,7 +1304,7 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../picard/tagger.py:503
+#: ../picard/tagger.py:504
 #, python-format
 msgid "Could not find PUID for file %s"
 msgstr "Nemohu najít PUID pro soubor %s"
@@ -1327,15 +1357,28 @@ msgstr "&Ukázat skryté soubory"
 msgid "Length"
 msgstr "Délka"
 
-#: ../picard/ui/itemviews.py:327
+#: ../picard/ui/itemviews.py:289
+msgid "&Expand all"
+msgstr ""
+
+#: ../picard/ui/itemviews.py:291
+msgid "&Collapse all"
+msgstr ""
+
+#: ../picard/ui/itemviews.py:332
 msgid "&Releases"
 msgstr "&Vydání"
 
-#: ../picard/ui/itemviews.py:353
+#: ../picard/ui/itemviews.py:349
+#, fuzzy
+msgid "No release event"
+msgstr "Měsíc vydání albumu"
+
+#: ../picard/ui/itemviews.py:359
 msgid "&Plugins"
 msgstr "&Pluginy"
 
-#: ../picard/ui/itemviews.py:523
+#: ../picard/ui/itemviews.py:533
 msgid "Clusters"
 msgstr "Klastry"
 
@@ -1343,98 +1386,6 @@ msgstr "Klastry"
 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/puidsubmit.py:31
-msgid "Release"
-msgstr "Vydání"
-
-#: ../picard/ui/puidsubmit.py:31
-msgid "Release ID"
-msgstr "ID vydání"
-
-#: ../picard/ui/tageditor.py:66 ../picard/ui/ui_options_plugins.py:62
-msgid "Details"
-msgstr "Podrobnosti"
-
-#: ../picard/ui/tageditor.py:71 ../picard/ui/tageditor.py:264
-#, 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:131
-#, 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:134
-#, 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:233
-msgid "Filename:"
-msgstr "Název souboru:"
-
-#: ../picard/ui/tageditor.py:235
-msgid "Format:"
-msgstr "Formát:"
-
-#: ../picard/ui/tageditor.py:244
-msgid "Size:"
-msgstr "Velikost:"
-
-#: ../picard/ui/tageditor.py:248 ../picard/ui/ui_metadata.py:127
-msgid "Length:"
-msgstr "Délka:"
-
-#: ../picard/ui/tageditor.py:250
-msgid "Bitrate:"
-msgstr "Bitový tok:"
-
-#: ../picard/ui/tageditor.py:252
-msgid "Sample rate:"
-msgstr "Vzorkovací frekvence:"
-
-#: ../picard/ui/tageditor.py:254
-msgid "Bits per sample:"
-msgstr "Bitů na vzorek"
-
-#: ../picard/ui/tageditor.py:257
-msgid "Mono"
-msgstr "Mono"
-
-#: ../picard/ui/tageditor.py:258
-msgid "Stereo"
-msgstr "Stereo"
-
-#: ../picard/ui/tageditor.py:260
-msgid "Channels:"
-msgstr "Kanály:"
-
-#: ../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"
 msgstr "MusicBrainz Picard"
@@ -1671,6 +1622,10 @@ msgstr "&Vyhledávácí pole"
 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"
@@ -1690,6 +1645,22 @@ msgstr "Playlist %s uložen."
 msgid " (Error: %s)"
 msgstr " (Chyba: %s)"
 
+#: ../picard/ui/puidsubmit.py:31 ../picard/ui/options/plugins.py:85
+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/passworddialog.py:38
 #, python-format
 msgid ""
@@ -1698,6 +1669,78 @@ msgstr ""
 "Server %s vyžaduje vaše přihlášení. Prosím zadejte vaše uživatelské jméno a "
 "heslo."
 
+#: ../picard/ui/tageditor.py:66 ../picard/ui/ui_options_plugins.py:62
+msgid "Details"
+msgstr "Podrobnosti"
+
+#: ../picard/ui/tageditor.py:71 ../picard/ui/tageditor.py:264
+#, 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:131
+#, 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:134
+#, 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:233
+msgid "Filename:"
+msgstr "Název souboru:"
+
+#: ../picard/ui/tageditor.py:235
+msgid "Format:"
+msgstr "Formát:"
+
+#: ../picard/ui/tageditor.py:244
+msgid "Size:"
+msgstr "Velikost:"
+
+#: ../picard/ui/tageditor.py:248 ../picard/ui/ui_metadata.py:127
+msgid "Length:"
+msgstr "Délka:"
+
+#: ../picard/ui/tageditor.py:250
+msgid "Bitrate:"
+msgstr "Bitový tok:"
+
+#: ../picard/ui/tageditor.py:252
+msgid "Sample rate:"
+msgstr "Vzorkovací frekvence:"
+
+#: ../picard/ui/tageditor.py:254
+msgid "Bits per sample:"
+msgstr "Bitů na vzorek"
+
+#: ../picard/ui/tageditor.py:257
+msgid "Mono"
+msgstr "Mono"
+
+#: ../picard/ui/tageditor.py:258
+msgid "Stereo"
+msgstr "Stereo"
+
+#: ../picard/ui/tageditor.py:260
+msgid "Channels:"
+msgstr "Kanály:"
+
+#: ../picard/ui/tagsfromfilenames.py:54 ../picard/ui/tagsfromfilenames.py:99
+msgid "File Name"
+msgstr "Název souboru"
+
 #: ../picard/ui/ui_cdlookup.py:60 ../picard/ui/ui_options_cdlookup.py:47
 #: ../picard/ui/ui_options_cdlookup_select.py:48
 #: ../picard/ui/options/cdlookup.py:36
@@ -1720,24 +1763,6 @@ msgstr "    Vyhledat Ručně    "
 msgid "Cancel"
 msgstr "Zrušit"
 
-#: ../picard/ui/ui_passworddialog.py:78
-msgid "Authentication required"
-msgstr "Je vyžadována autentizace"
-
-#: ../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/ui_passworddialog.py:80 ../picard/ui/ui_options_proxy.py:82
-#: ../picard/ui/ui_options_general.py:112
-msgid "Password:"
-msgstr "Heslo:"
-
-#: ../picard/ui/ui_passworddialog.py:81
-msgid "Save username and password"
-msgstr "Uložit uživatelské jméno a heslo"
-
 #: ../picard/ui/ui_edittagdialog.py:44
 msgid "Edit Tag"
 msgstr "Upravit tag"
@@ -1774,6 +1799,10 @@ msgstr "Album:"
 msgid "Options"
 msgstr "Nastavení:"
 
+#: ../picard/ui/ui_puidsubmit.py:52
+msgid "Submit PUIDs"
+msgstr "Odeslat PUIDs"
+
 #: ../picard/ui/ui_options_cdlookup.py:48
 msgid "CD-ROM device to use for lookups:"
 msgstr "CD/DVD zařízení pro identifikaci"
@@ -1798,6 +1827,23 @@ msgstr "Uložit obrázky alb jako samostatné soubory"
 msgid "Overwrite the file if it already exists"
 msgstr "Přepsat soubor, pokud existuje"
 
+#: ../picard/ui/ui_options_moving.py:53
+msgid "Move additional files:"
+msgstr ""
+
+#: ../picard/ui/ui_options_moving.py:54
+msgid "Browse..."
+msgstr "Procházet..."
+
+#: ../picard/ui/ui_options_moving.py:55
+msgid "Delete empty directories"
+msgstr "Smazat prázdné adresáře"
+
+#: ../picard/ui/ui_options_moving.py:56
+#, fuzzy
+msgid "Move files to this directory when saving:"
+msgstr "Přesunout otagované soubory do tohoto adresáře:"
+
 #: ../picard/ui/util.py:31
 msgid "&Ok"
 msgstr "&Ok"
@@ -1806,44 +1852,40 @@ msgstr "&Ok"
 msgid "&Cancel"
 msgstr "&Zrušit"
 
-#: ../picard/ui/ui_puidsubmit.py:52
-msgid "Submit PUIDs"
-msgstr "Odeslat PUIDs"
-
-#: ../picard/ui/ui_tageditor.py:139 ../picard/ui/ui_options_plugins.py:59
-#: ../picard/ui/options/plugins.py:76
+#: ../picard/ui/ui_tageditor.py:128 ../picard/ui/ui_options_plugins.py:59
+#: ../picard/ui/options/plugins.py:81
 msgid "Name"
 msgstr "Název"
 
-#: ../picard/ui/ui_tageditor.py:140
+#: ../picard/ui/ui_tageditor.py:129
 msgid "Value"
 msgstr "Hodnota"
 
-#: ../picard/ui/ui_tageditor.py:141
+#: ../picard/ui/ui_tageditor.py:130
 msgid "Rating:"
 msgstr "Hodnocení:"
 
-#: ../picard/ui/ui_tageditor.py:142
+#: ../picard/ui/ui_tageditor.py:131
 msgid "&Add..."
 msgstr "&Přidat..."
 
-#: ../picard/ui/ui_tageditor.py:143
+#: ../picard/ui/ui_tageditor.py:132
 msgid "&Edit..."
 msgstr "&Upravit..."
 
-#: ../picard/ui/ui_tageditor.py:144
+#: ../picard/ui/ui_tageditor.py:133
 msgid "&Delete"
 msgstr "&Smazat"
 
-#: ../picard/ui/ui_tageditor.py:145
+#: ../picard/ui/ui_tageditor.py:134
 msgid "&Metadata"
 msgstr "&Metadata"
 
-#: ../picard/ui/ui_tageditor.py:146
+#: ../picard/ui/ui_tageditor.py:135
 msgid "A&rtwork"
 msgstr ""
 
-#: ../picard/ui/ui_tageditor.py:147
+#: ../picard/ui/ui_tageditor.py:136
 msgid "&Info"
 msgstr "&Info"
 
@@ -1888,6 +1930,40 @@ msgstr " / "
 msgid ", "
 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:72
+msgid "Port:"
+msgstr "Port:"
+
+#: ../picard/ui/ui_options_general.py:110 ../picard/ui/ui_options_proxy.py:73
+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:112 ../picard/ui/ui_options_proxy.py:70
+#: ../picard/ui/ui_passworddialog.py:80
+msgid "Password:"
+msgstr "Heslo:"
+
+#: ../picard/ui/ui_options_general.py:113 ../picard/ui/ui_options_proxy.py:71
+#: ../picard/ui/ui_passworddialog.py:79
+msgid "Username:"
+msgstr "Uživatelské jméno:"
+
+#: ../picard/ui/ui_options_general.py:114 ../picard/ui/options/general.py:29
+msgid "General"
+msgstr "Obecné"
+
+#: ../picard/ui/ui_options_general.py:115
+msgid "Automatically scan all new files"
+msgstr "Automaticky skenovat nové soubory"
+
 #: ../picard/ui/ui_options_interface.py:50
 msgid "Miscellaneous"
 msgstr "Různé"
@@ -1908,113 +1984,6 @@ msgstr "Použít pokročilou dotazovací syntaxi"
 msgid "User interface language:"
 msgstr "Jazyk uživatelského rozhraní:"
 
-#: ../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 "Schéma pojmenování pro více umělců:"
-
-#: ../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 "Přesunout soubory"
-
-#: ../picard/ui/ui_options_naming.py:173
-msgid "Move tagged files to this directory:"
-msgstr "Přesunout otagované soubory do tohoto adresáře:"
-
-#: ../picard/ui/ui_options_naming.py:174
-msgid "Browse..."
-msgstr "Procházet..."
-
-#: ../picard/ui/ui_options_naming.py:175
-msgid "Move additional files:"
-msgstr ""
-
-#: ../picard/ui/ui_options_naming.py:176
-msgid "Delete empty directories"
-msgstr "Smazat prázdné adresáře"
-
-#: ../picard/ui/ui_options_naming.py:177
-msgid "Example"
-msgstr "Příklad"
-
-#: ../picard/ui/ui_options_naming.py:178
-msgid "File name:"
-msgstr "Jméno souboru:"
-
-#: ../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"
-
-#: ../picard/ui/ui_options_proxy.py:81 ../picard/ui/options/proxy.py:28
-msgid "Web Proxy"
-msgstr "Proxy"
-
-#: ../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 "Adresa serveru:"
-
-#: ../picard/ui/ui_options_ratings.py:45
-msgid "Enable track ratings"
-msgstr "Povolit hodnocení skladeb"
-
-#: ../picard/ui/ui_options_ratings.py:46
-msgid ""
-"Picard saves the ratings together with an e-mail address identifying the "
-"user who did the rating. That way different ratings for different users can "
-"be stored in the files. Please sepcify the e-mail you want to use to save "
-"your ratings."
-msgstr ""
-
-#: ../picard/ui/ui_options_ratings.py:47
-msgid "E-mail:"
-msgstr "E-mail:"
-
-#: ../picard/ui/ui_options_general.py:108
-msgid "MusicBrainz Server"
-msgstr "MusicBrainz Server"
-
-#: ../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é"
-
-#: ../picard/ui/ui_options_general.py:115
-msgid "Automatically scan all new files"
-msgstr "Automaticky skenovat nové soubory"
-
 #: ../picard/ui/ui_options_matching.py:105
 msgid "Thresholds"
 msgstr "Úrovně"
@@ -2071,74 +2040,152 @@ msgstr "Various artists:"
 msgid "Non-album tracks:"
 msgstr "Skladby neobažené v albech"
 
-#: ../picard/ui/ui_options_plugins.py:58 ../picard/ui/options/plugins.py:30
+#: ../picard/ui/ui_options_metadata.py:109
+#: ../picard/ui/ui_options_metadata.py:110
+#: ../picard/ui/ui_options_renaming.py:155
+#: ../picard/ui/ui_options_renaming.py:158
+msgid "Default"
+msgstr "Výchozí"
+
+#: ../picard/ui/ui_options_plugins.py:58 ../picard/ui/options/plugins.py:34
 msgid "Plugins"
 msgstr "Zásuvné moduly"
 
-#: ../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:84
 msgid "Author"
 msgstr "Autor"
 
-#: ../picard/ui/ui_options_plugins.py:61 ../picard/util/tags.py:36
+#: ../picard/ui/ui_options_plugins.py:61 ../picard/util/tags.py:37
 msgid "Version"
 msgstr "Verze"
 
-#: ../picard/ui/ui_options_script.py:52
+#: ../picard/ui/ui_options_proxy.py:69 ../picard/ui/options/proxy.py:28
+msgid "Web Proxy"
+msgstr "Proxy"
+
+#: ../picard/ui/ui_options_ratings.py:45
+msgid "Enable track ratings"
+msgstr "Povolit hodnocení skladeb"
+
+#: ../picard/ui/ui_options_ratings.py:46
+msgid ""
+"Picard saves the ratings together with an e-mail address identifying the "
+"user who did the rating. That way different ratings for different users can "
+"be stored in the files. Please sepcify the e-mail you want to use to save "
+"your ratings."
+msgstr ""
+
+#: ../picard/ui/ui_options_ratings.py:47
+msgid "E-mail:"
+msgstr "E-mail:"
+
+#: ../picard/ui/ui_options_renaming.py:145
+#, fuzzy
+msgid "Form"
+msgstr "Formát"
+
+#: ../picard/ui/ui_options_renaming.py:146
+#, fuzzy
+msgid "Rename files when saving"
+msgstr "Přejmenovat soubory"
+
+#: ../picard/ui/ui_options_renaming.py:147
+msgid "Replace non-ASCII characters"
+msgstr "Nahradit neASCII znaky"
+
+#: ../picard/ui/ui_options_renaming.py:148
+msgid "Replace Windows-incompatible characters"
+msgstr "Nahradit nekompatibilní znaky ve Windows"
+
+#: ../picard/ui/ui_options_renaming.py:149
+msgid "Name files like this"
+msgstr ""
+
+#: ../picard/ui/ui_options_renaming.py:156
+msgid "Name multiple artist albums differently"
+msgstr ""
+
+#: ../picard/ui/ui_options_renaming.py:157
+msgid "Copy from above"
+msgstr ""
+
+#: ../picard/ui/ui_options_renaming.py:159
+#, fuzzy
+msgid "Examples"
+msgstr "Příklad"
+
+#: ../picard/ui/ui_options_script.py:43
 msgid "Tagger Script"
 msgstr "Skripty pro tagger"
 
-#: ../picard/ui/ui_options_tags.py:85
-msgid "Common"
-msgstr "Obecné"
-
-#: ../picard/ui/ui_options_tags.py:86
-msgid "Clear existing tags before writing new tags"
-msgstr "Odstranit existující tagy před zapisovaním nových"
-
-#: ../picard/ui/ui_options_tags.py:87
-msgid "Don not write tags to files"
+#: ../picard/ui/ui_options_tags.py:97
+#, fuzzy
+msgid "Do not write tags to files"
 msgstr "Nezapisovat tagy do souborů"
 
-#: ../picard/ui/ui_options_tags.py:88
-msgid "ID3"
-msgstr "ID3"
+#: ../picard/ui/ui_options_tags.py:98
+msgid "Before tagging"
+msgstr ""
 
-#: ../picard/ui/ui_options_tags.py:89
-msgid "Write ID3v1 tags to the files"
-msgstr "Zapisovat ID3v1 tagy do souborů"
+#: ../picard/ui/ui_options_tags.py:99
+#, fuzzy
+msgid "Clear existing tags"
+msgstr "Odstranit existující tagy před zapisovaním nových"
 
-#: ../picard/ui/ui_options_tags.py:90
-msgid "Write ID3v2 version 2.3 tags (2.4 is default)"
-msgstr "Zapisovat ID3v2 tagy ve verzi 2.3 (2.4 je výchozí)"
-
-#: ../picard/ui/ui_options_tags.py:91
-msgid "Text encoding to use while writing ID3v2 tags:"
-msgstr "Kódování textu při zápisu ID3v2 tagů:"
-
-#: ../picard/ui/ui_options_tags.py:92
-msgid "ISO-8859-1"
-msgstr "ISO-8859-1"
-
-#: ../picard/ui/ui_options_tags.py:93
-msgid "UTF-16"
-msgstr "UTF-16"
-
-#: ../picard/ui/ui_options_tags.py:94
-msgid "UTF-8"
-msgstr "UTF-8"
-
-#: ../picard/ui/ui_options_tags.py:95
+#: ../picard/ui/ui_options_tags.py:100
 msgid "Remove ID3 tags from FLAC files"
 msgstr "Odebrat ID3 tagy ze souborů FLAC"
 
-#: ../picard/ui/ui_options_tags.py:96
-msgid "APE"
-msgstr "APE"
-
-#: ../picard/ui/ui_options_tags.py:97
+#: ../picard/ui/ui_options_tags.py:101
 msgid "Remove APEv2 tags from MP3 files"
 msgstr "Odebrat APEv2 tagy z MP3 souborů"
 
+#: ../picard/ui/ui_options_tags.py:102
+msgid "Tag compatibility"
+msgstr ""
+
+#: ../picard/ui/ui_options_tags.py:103
+#, fuzzy
+msgid "ID3v2 version"
+msgstr "jen pro ID3v2.4"
+
+#: ../picard/ui/ui_options_tags.py:104
+msgid "2.4"
+msgstr ""
+
+#: ../picard/ui/ui_options_tags.py:105
+msgid "2.3"
+msgstr ""
+
+#: ../picard/ui/ui_options_tags.py:106
+#, fuzzy
+msgid "Also include ID3v1 tags in the files"
+msgstr "Zapisovat ID3v1 tagy do souborů"
+
+#: ../picard/ui/ui_options_tags.py:107
+msgid "ID3v2 text encoding"
+msgstr ""
+
+#: ../picard/ui/ui_options_tags.py:108
+msgid "UTF-8"
+msgstr "UTF-8"
+
+#: ../picard/ui/ui_options_tags.py:109
+msgid "UTF-16"
+msgstr "UTF-16"
+
+#: ../picard/ui/ui_options_tags.py:110
+msgid "ISO-8859-1"
+msgstr "ISO-8859-1"
+
+#: ../picard/ui/ui_passworddialog.py:78
+msgid "Authentication required"
+msgstr "Je vyžadována autentizace"
+
+#: ../picard/ui/ui_passworddialog.py:81
+msgid "Save username and password"
+msgstr "Uložit uživatelské jméno a heslo"
+
 #: ../picard/ui/ui_tagsfromfilenames.py:56
 msgid "Convert File Names to Tags"
 msgstr "Převédst názvy souborů do tagů"
@@ -2147,6 +2194,10 @@ msgstr "Převédst názvy souborů do tagů"
 msgid "Replace underscores with spaces"
 msgstr "Nahradit podtržítka mezerami"
 
+#: ../picard/ui/ui_tagsfromfilenames.py:58
+msgid "&Preview"
+msgstr "Ná&hled"
+
 #: ../picard/ui/options/about.py:29
 msgid "About"
 msgstr "O programu"
@@ -2174,8 +2225,8 @@ 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"
@@ -2183,14 +2234,13 @@ msgid ""
 "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\"><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/P"
-"icardTagger</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
@@ -2223,257 +2273,266 @@ msgstr "Porovnávání"
 msgid "None"
 msgstr "Žádná"
 
-#: ../picard/ui/options/naming.py:33
-msgid "File Naming"
-msgstr "Pojmenování souborů"
+#: ../picard/ui/options/moving.py:33
+#, fuzzy
+msgid "Moving files"
+msgstr "Přesunout soubory"
 
-#: ../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 "Chyba skriptu"
-
-#: ../picard/ui/options/naming.py:93
-msgid "The file naming format must not be empty."
-msgstr "Schéma pojmenování nesmí být prázdné."
-
-#: ../picard/ui/options/naming.py:95
-msgid "The multiple artist file naming format must not be empty."
-msgstr "Formát pojmenování více umělců nesmí být prázdné."
-
-#: ../picard/ui/options/naming.py:97
+#: ../picard/ui/options/moving.py:65
 msgid "Error"
 msgstr "Chyba"
 
-#: ../picard/ui/options/naming.py:97
+#: ../picard/ui/options/moving.py:65
 msgid "The location to move files to must not be empty."
 msgstr "Umístění přesunu souborů nesmí být prázdné."
 
-#: ../picard/ui/options/scripting.py:63
-msgid "Scripting"
-msgstr "Skriptování"
+#: ../picard/ui/options/ratings.py:29
+msgid "Ratings"
+msgstr "Hodnocení"
 
 #: ../picard/ui/options/tags.py:29
 msgid "Tags"
 msgstr "Tagy"
 
-#: ../picard/ui/options/ratings.py:29
-msgid "Ratings"
-msgstr "Hodnocení"
+#: ../picard/ui/options/renaming.py:35
+#, fuzzy
+msgid "File naming"
+msgstr "Pojmenování souborů"
+
+#: ../picard/ui/options/renaming.py:123
+msgid "The file naming format must not be empty."
+msgstr "Schéma pojmenování nesmí být prázdné."
+
+#: ../picard/ui/options/renaming.py:133
+msgid "The multiple artist file naming format must not be empty."
+msgstr "Formát pojmenování více umělců nesmí být prázdné."
+
+#: ../picard/ui/options/scripting.py:63
+msgid "Scripting"
+msgstr "Skriptování"
+
+#: ../picard/ui/options/scripting.py:97
+msgid "Script Error"
+msgstr "Chyba skriptu"
 
 #: ../picard/util/tags.py:24
 msgid "Date"
 msgstr "Datum"
 
 #: ../picard/util/tags.py:25
+#, fuzzy
+msgid "Original Release Date"
+msgstr "Původní Metadata"
+
+#: ../picard/util/tags.py:26
 msgid "Album Artist"
 msgstr "Interpret alba"
 
-#: ../picard/util/tags.py:26
+#: ../picard/util/tags.py:27
 msgid "Track Number"
 msgstr "Číslo skladby"
 
-#: ../picard/util/tags.py:27
+#: ../picard/util/tags.py:28
 msgid "Total Tracks"
 msgstr "Celkem skladeb"
 
-#: ../picard/util/tags.py:28
+#: ../picard/util/tags.py:29
 msgid "Disc Number"
 msgstr "Číslo disku"
 
-#: ../picard/util/tags.py:29
+#: ../picard/util/tags.py:30
 msgid "Total Discs"
 msgstr "Počet disků"
 
-#: ../picard/util/tags.py:30
+#: ../picard/util/tags.py:31
 msgid "Album Artist Sort Order"
 msgstr "Seřazování podle umělce alba"
 
-#: ../picard/util/tags.py:31
+#: ../picard/util/tags.py:32
 msgid "Artist Sort Order"
 msgstr "Seřazování podle Umělce"
 
-#: ../picard/util/tags.py:32
+#: ../picard/util/tags.py:33
 msgid "Title Sort Order"
 msgstr "Seřazování podle názvu skladby"
 
-#: ../picard/util/tags.py:33
+#: ../picard/util/tags.py:34
 msgid "Album Sort Order"
 msgstr "Seřazování podle Alba"
 
-#: ../picard/util/tags.py:34
+#: ../picard/util/tags.py:35
 msgid "ASIN"
 msgstr "ASIN"
 
-#: ../picard/util/tags.py:35
+#: ../picard/util/tags.py:36
 msgid "Grouping"
 msgstr "Seskupování"
 
-#: ../picard/util/tags.py:37
+#: ../picard/util/tags.py:38
 msgid "ISRC"
 msgstr "ISRC"
 
-#: ../picard/util/tags.py:38
+#: ../picard/util/tags.py:39
 msgid "Mood"
 msgstr "Nálada"
 
-#: ../picard/util/tags.py:39
+#: ../picard/util/tags.py:40
 msgid "BPM"
 msgstr "BPM"
 
-#: ../picard/util/tags.py:40
+#: ../picard/util/tags.py:41
 msgid "Copyright"
 msgstr ""
 
-#: ../picard/util/tags.py:41
+#: ../picard/util/tags.py:42
 msgid "Composer"
 msgstr "Skladatel"
 
-#: ../picard/util/tags.py:42
+#: ../picard/util/tags.py:43
 msgid "Conductor"
 msgstr "Dirigent"
 
-#: ../picard/util/tags.py:43
+#: ../picard/util/tags.py:44
 msgid "Lyricist"
 msgstr "Textař"
 
-#: ../picard/util/tags.py:44
+#: ../picard/util/tags.py:45
 msgid "Arranger"
 msgstr "Aranžér"
 
-#: ../picard/util/tags.py:45
+#: ../picard/util/tags.py:46
 msgid "Producer"
 msgstr "Producent"
 
-#: ../picard/util/tags.py:46
+#: ../picard/util/tags.py:47
 msgid "Engineer"
 msgstr "Zvukový inženýr"
 
-#: ../picard/util/tags.py:47
+#: ../picard/util/tags.py:48
 msgid "Subtitle"
 msgstr "Podtitul"
 
-#: ../picard/util/tags.py:48
+#: ../picard/util/tags.py:49
 msgid "Disc Subtitle"
 msgstr "Podtitul disku"
 
-#: ../picard/util/tags.py:49
+#: ../picard/util/tags.py:50
 msgid "Remixer"
 msgstr "Remixér"
 
-#: ../picard/util/tags.py:50
+#: ../picard/util/tags.py:51
 msgid "MusicBrainz Track Id"
 msgstr "MusicBrainz Id skladby"
 
-#: ../picard/util/tags.py:51
+#: ../picard/util/tags.py:52
 msgid "MusicBrainz Release Id"
 msgstr "MusicBrainz Id vydání"
 
-#: ../picard/util/tags.py:52
+#: ../picard/util/tags.py:53
 msgid "MusicBrainz Artist Id"
 msgstr "MusicBrainz Id umělce"
 
-#: ../picard/util/tags.py:53
+#: ../picard/util/tags.py:54
 msgid "MusicBrainz Release Artist Id"
 msgstr "MusicBrainz Id umělce vydání"
 
-#: ../picard/util/tags.py:54
+#: ../picard/util/tags.py:55
 msgid "MusicBrainz TRM Id"
 msgstr ""
 
-#: ../picard/util/tags.py:55
+#: ../picard/util/tags.py:56
 msgid "MusicBrainz Disc Id"
 msgstr "MusicBrainz Id disku"
 
-#: ../picard/util/tags.py:56
+#: ../picard/util/tags.py:57
 msgid "MusicBrainz Sort Name"
 msgstr ""
 
-#: ../picard/util/tags.py:57
+#: ../picard/util/tags.py:58
 msgid "MusicIP PUID"
 msgstr "MusicIP PUID"
 
-#: ../picard/util/tags.py:58
+#: ../picard/util/tags.py:59
 msgid "MusicIP Fingerprint"
 msgstr "Otisk MusicIP"
 
-#: ../picard/util/tags.py:59
+#: ../picard/util/tags.py:60
 msgid "Disc Id"
 msgstr "Id disku"
 
-#: ../picard/util/tags.py:60
+#: ../picard/util/tags.py:61
 msgid "Website"
 msgstr "Webová stránka"
 
-#: ../picard/util/tags.py:61
+#: ../picard/util/tags.py:62
 msgid "Compilation"
 msgstr "Kompilace"
 
-#: ../picard/util/tags.py:62
+#: ../picard/util/tags.py:63
 msgid "Comment"
 msgstr "Komentář"
 
-#: ../picard/util/tags.py:63
+#: ../picard/util/tags.py:64
 msgid "Genre"
 msgstr "Žánr"
 
-#: ../picard/util/tags.py:64
+#: ../picard/util/tags.py:65
 msgid "Encoded By"
 msgstr "Enkódováno"
 
-#: ../picard/util/tags.py:65
+#: ../picard/util/tags.py:66
 msgid "Performer"
 msgstr "Interpret"
 
-#: ../picard/util/tags.py:66
+#: ../picard/util/tags.py:67
 msgid "Release Type"
 msgstr "Typ vydání"
 
-#: ../picard/util/tags.py:67
+#: ../picard/util/tags.py:68
 msgid "Release Status"
 msgstr "Stav vydání"
 
-#: ../picard/util/tags.py:68
+#: ../picard/util/tags.py:69
 msgid "Release Country"
 msgstr "Země vydání"
 
-#: ../picard/util/tags.py:69
+#: ../picard/util/tags.py:70
 msgid "Record Label"
 msgstr "Nahrávací společnost"
 
-#: ../picard/util/tags.py:70
+#: ../picard/util/tags.py:71
 msgid "Barcode"
 msgstr "Čárový kód"
 
-#: ../picard/util/tags.py:71
+#: ../picard/util/tags.py:72
 msgid "Catalog Number"
 msgstr "Katalogové číslo"
 
-#: ../picard/util/tags.py:72
+#: ../picard/util/tags.py:73
 msgid "Format"
 msgstr "Formát"
 
-#: ../picard/util/tags.py:73
+#: ../picard/util/tags.py:74
 msgid "DJ-Mixer"
 msgstr "Mixoval DJ"
 
-#: ../picard/util/tags.py:74
+#: ../picard/util/tags.py:75
 msgid "Media"
 msgstr "Médium"
 
-#: ../picard/util/tags.py:75
+#: ../picard/util/tags.py:76
 msgid "Lyrics"
 msgstr "Text písně"
 
-#: ../picard/util/tags.py:76
+#: ../picard/util/tags.py:77
 msgid "Mixer"
 msgstr "Mixér"
 
-#: ../picard/util/tags.py:77
+#: ../picard/util/tags.py:78
 msgid "Language"
 msgstr "Jazyk"
 
-#: ../picard/util/tags.py:78
+#: ../picard/util/tags.py:79
 msgid "Script"
 msgstr "Skript"
 
@@ -2492,19 +2551,44 @@ msgstr ""
 "\n"
 "%s"
 
-#, python-format
+#~ msgid "Multiple artist file naming format:"
+#~ msgstr "Schéma pojmenování pro více umělců:"
+
+#~ msgid "File naming format:"
+#~ msgstr "Schéma pojmenování souborů"
+
+#~ msgid "File name:"
+#~ msgstr "Jméno souboru:"
+
+#~ msgid "Multiple artist file name:"
+#~ msgstr "Název souboru pro více umělců"
+
+#~ msgid "Common"
+#~ msgstr "Obecné"
+
+#~ msgid "ID3"
+#~ msgstr "ID3"
+
+#~ msgid "Write ID3v2 version 2.3 tags (2.4 is default)"
+#~ msgstr "Zapisovat ID3v2 tagy ve verzi 2.3 (2.4 je výchozí)"
+
+#~ msgid "Text encoding to use while writing ID3v2 tags:"
+#~ msgstr "Kódování textu při zápisu ID3v2 tagů:"
+
+#~ msgid "APE"
+#~ msgstr "APE"
+
 #~ msgid "[couldn't load album %s]"
 #~ msgstr "[nemohu nahrát album %s]"
 
 #~ msgid "New Version"
 #~ msgstr "Nová verze"
 
-#, python-format
 #~ msgid ""
-#~ "New version of Picard is available (%s). Would you like to download it now?"
+#~ "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 ?"
 
-#, python-format
 #~ msgid "Couldn't find PUID for file %s"
 #~ msgstr "Nemohu najít PUID pro soubor %s"
 
@@ -2637,9 +2721,6 @@ msgstr ""
 #~ 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"
 
@@ -2658,9 +2739,6 @@ msgstr ""
 #~ msgid "Proxy port"
 #~ msgstr "Proxy port"
 
-#~ msgid "ID3v2.4 only"
-#~ msgstr "jen pro ID3v2.4"
-
 #~ msgid "Save track/album"
 #~ msgstr "Uložit skladbu/album"
 
diff --git a/po/cy.po b/po/cy.po
index 1a7485522..ad7136d05 100644
--- a/po/cy.po
+++ b/po/cy.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: picard\n"
 "Report-Msgid-Bugs-To: http://bugs.musicbrainz.org/\n"
-"POT-Creation-Date: 2009-02-24 18:58+0100\n"
+"POT-Creation-Date: 2009-04-06 22:50+0200\n"
 "PO-Revision-Date: 2009-02-11 11:50+0000\n"
 "Last-Translator: Sam Upton <midness@gmail.com>\n"
 "Language-Team: Welsh <cy@li.org>\n"
@@ -19,16 +19,16 @@ msgstr ""
 "X-Launchpad-Export-Date: 2009-04-06 20:21+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
-#: ../picard/album.py:108 ../picard/cluster.py:248
+#: ../picard/album.py:109 ../picard/cluster.py:248
 msgid "Unmatched Files"
 msgstr ""
 
-#: ../picard/album.py:281
+#: ../picard/album.py:287
 #, python-format
 msgid "[could not load album %s]"
 msgstr ""
 
-#: ../picard/album.py:317
+#: ../picard/album.py:320
 msgid "[loading album information]"
 msgstr ""
 
@@ -588,7 +588,7 @@ msgid "Namibia"
 msgstr ""
 
 #: ../picard/const.py:182
-msgid "Vanuat"
+msgid "Vanuatu"
 msgstr ""
 
 #: ../picard/const.py:183
@@ -1032,223 +1032,234 @@ msgid "Congo, The Democratic Republic of the"
 msgstr ""
 
 #: ../picard/const.py:293
-msgid "Serbia and Montenegro"
+msgid "Serbia and Montenegro (historical, 2003-2006)"
 msgstr ""
 
 #: ../picard/const.py:294
-msgid "Croatia"
+msgid "Serbia"
 msgstr ""
 
 #: ../picard/const.py:295
-msgid "Korea (North), Democratic People's Republic of"
+msgid "Montenegro"
 msgstr ""
 
 #: ../picard/const.py:296
-msgid "Korea (South), Republic of"
+msgid "Croatia"
 msgstr ""
 
 #: ../picard/const.py:297
-msgid "Slovakia"
+msgid "Korea (North), Democratic People's Republic of"
 msgstr ""
 
 #: ../picard/const.py:298
-msgid "Soviet Union (historical, 1922-1991)"
+msgid "Korea (South), Republic of"
 msgstr ""
 
 #: ../picard/const.py:299
-msgid "East Timor"
+msgid "Slovakia"
 msgstr ""
 
 #: ../picard/const.py:300
-msgid "Czechoslovakia (historical, 1918-1992)"
+msgid "Soviet Union (historical, 1922-1991)"
 msgstr ""
 
 #: ../picard/const.py:301
-msgid "Europe"
+msgid "East Timor"
 msgstr ""
 
 #: ../picard/const.py:302
-msgid "East Germany (historical, 1949-1990)"
+msgid "Czechoslovakia (historical, 1918-1992)"
 msgstr ""
 
 #: ../picard/const.py:303
-msgid "[Unknown Country]"
+msgid "Europe"
 msgstr ""
 
 #: ../picard/const.py:304
-msgid "[Worldwide]"
+msgid "East Germany (historical, 1949-1990)"
 msgstr ""
 
 #: ../picard/const.py:305
+msgid "[Unknown Country]"
+msgstr ""
+
+#: ../picard/const.py:306
+msgid "[Worldwide]"
+msgstr ""
+
+#: ../picard/const.py:307
 msgid "Yugoslavia (historical, 1918-1992)"
 msgstr ""
 
-#: ../picard/const.py:310
-msgid "Catalan"
-msgstr ""
-
-#: ../picard/const.py:311
-msgid "Czech"
-msgstr ""
-
 #: ../picard/const.py:312
-msgid "Welsh"
+msgid "Afrikaans"
 msgstr ""
 
 #: ../picard/const.py:313
-msgid "Danish"
+msgid "Arabic"
 msgstr ""
 
 #: ../picard/const.py:314
-msgid "German"
+msgid "Catalan"
 msgstr ""
 
 #: ../picard/const.py:315
-msgid "English"
+msgid "Czech"
 msgstr ""
 
 #: ../picard/const.py:316
-msgid "English (Canada)"
+msgid "Welsh"
 msgstr ""
 
 #: ../picard/const.py:317
-msgid "English (UK)"
+msgid "Danish"
 msgstr ""
 
 #: ../picard/const.py:318
-msgid "Spanish"
+msgid "German"
 msgstr ""
 
 #: ../picard/const.py:319
-msgid "Persian"
+msgid "English"
 msgstr ""
 
 #: ../picard/const.py:320
-msgid "Finnish"
+msgid "English (Canada)"
 msgstr ""
 
 #: ../picard/const.py:321
-msgid "French"
+msgid "English (UK)"
 msgstr ""
 
 #: ../picard/const.py:322
-msgid "Frisian"
+msgid "Spanish"
 msgstr ""
 
 #: ../picard/const.py:323
-msgid "Hebrew"
+msgid "Persian"
 msgstr ""
 
 #: ../picard/const.py:324
-msgid "Hungarian"
+msgid "Finnish"
 msgstr ""
 
 #: ../picard/const.py:325
-msgid "Islandic"
+msgid "French"
 msgstr ""
 
 #: ../picard/const.py:326
-msgid "Italian"
+msgid "Frisian"
 msgstr ""
 
 #: ../picard/const.py:327
-msgid "Kannada"
+msgid "Hebrew"
 msgstr ""
 
 #: ../picard/const.py:328
-msgid "Korean"
+msgid "Hindi"
 msgstr ""
 
 #: ../picard/const.py:329
-msgid "Lithuanian"
+msgid "Hungarian"
 msgstr ""
 
 #: ../picard/const.py:330
-msgid "Norwegian Bokmal"
+msgid "Islandic"
 msgstr ""
 
 #: ../picard/const.py:331
-msgid "Dutch"
+msgid "Italian"
 msgstr ""
 
 #: ../picard/const.py:332
-msgid "Polish"
+msgid "Kannada"
 msgstr ""
 
 #: ../picard/const.py:333
-msgid "Portuguese"
+msgid "Korean"
 msgstr ""
 
 #: ../picard/const.py:334
-msgid "Brazilian Portuguese"
+msgid "Lithuanian"
 msgstr ""
 
 #: ../picard/const.py:335
-msgid "Romanian"
+msgid "Norwegian Bokmal"
 msgstr ""
 
 #: ../picard/const.py:336
-msgid "Russian"
+msgid "Dutch"
 msgstr ""
 
 #: ../picard/const.py:337
-msgid "Scots"
+msgid "Polish"
 msgstr ""
 
 #: ../picard/const.py:338
-msgid "Slovak"
+msgid "Portuguese"
 msgstr ""
 
 #: ../picard/const.py:339
-msgid "Slovenian"
+msgid "Brazilian Portuguese"
 msgstr ""
 
 #: ../picard/const.py:340
-msgid "Swedish"
+msgid "Romanian"
 msgstr ""
 
 #: ../picard/const.py:341
+msgid "Russian"
+msgstr ""
+
+#: ../picard/const.py:342
+msgid "Scots"
+msgstr ""
+
+#: ../picard/const.py:343
+msgid "Slovak"
+msgstr ""
+
+#: ../picard/const.py:344
+msgid "Slovenian"
+msgstr ""
+
+#: ../picard/const.py:345
+msgid "Swedish"
+msgstr ""
+
+#: ../picard/const.py:346
+msgid "Turkish"
+msgstr ""
+
+#: ../picard/const.py:347
 msgid "Chinese"
 msgstr ""
 
-#: ../picard/file.py:487
+#: ../picard/file.py:494
 #, python-format
 msgid "No matching tracks for file %s"
 msgstr ""
 
-#: ../picard/file.py:504
+#: ../picard/file.py:511
 #, python-format
 msgid "No matching tracks above the threshold for file %s"
 msgstr ""
 
-#: ../picard/file.py:507
+#: ../picard/file.py:514
 #, python-format
 msgid "File %s identified!"
 msgstr ""
 
-#: ../picard/file.py:518
+#: ../picard/file.py:525
 #, python-format
 msgid "Looking up the PUID for file %s..."
 msgstr ""
 
-#: ../picard/file.py:523
+#: ../picard/file.py:530
 #, 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 ""
@@ -1261,11 +1272,24 @@ msgstr ""
 msgid "XSPF Playlist (*.xspf)"
 msgstr ""
 
-#: ../picard/tagger.py:476
-msgid "CD Lookup Error"
+#: ../picard/puidmanager.py:62
+msgid "Submitting PUIDs..."
+msgstr ""
+
+#: ../picard/puidmanager.py:68
+#, python-format
+msgid "PUIDs submission failed: %s"
+msgstr ""
+
+#: ../picard/puidmanager.py:70
+msgid "PUIDs successfully submitted!"
 msgstr ""
 
 #: ../picard/tagger.py:477
+msgid "CD Lookup Error"
+msgstr ""
+
+#: ../picard/tagger.py:478
 #, python-format
 msgid ""
 "Error while reading CD:\n"
@@ -1273,7 +1297,7 @@ msgid ""
 "%s"
 msgstr ""
 
-#: ../picard/tagger.py:503
+#: ../picard/tagger.py:504
 #, python-format
 msgid "Could not find PUID for file %s"
 msgstr ""
@@ -1326,15 +1350,27 @@ msgstr ""
 msgid "Length"
 msgstr ""
 
-#: ../picard/ui/itemviews.py:327
+#: ../picard/ui/itemviews.py:289
+msgid "&Expand all"
+msgstr ""
+
+#: ../picard/ui/itemviews.py:291
+msgid "&Collapse all"
+msgstr ""
+
+#: ../picard/ui/itemviews.py:332
 msgid "&Releases"
 msgstr ""
 
-#: ../picard/ui/itemviews.py:353
+#: ../picard/ui/itemviews.py:349
+msgid "No release event"
+msgstr ""
+
+#: ../picard/ui/itemviews.py:359
 msgid "&Plugins"
 msgstr ""
 
-#: ../picard/ui/itemviews.py:523
+#: ../picard/ui/itemviews.py:533
 msgid "Clusters"
 msgstr ""
 
@@ -1342,95 +1378,6 @@ msgstr ""
 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:66 ../picard/ui/ui_options_plugins.py:62
-msgid "Details"
-msgstr "Manylion"
-
-#: ../picard/ui/tageditor.py:71 ../picard/ui/tageditor.py:264
-#, python-format
-msgid "%d file"
-msgid_plural "%d files"
-msgstr[0] ""
-msgstr[1] ""
-
-#: ../picard/ui/tageditor.py:131
-#, python-format
-msgid "(different across %d file)"
-msgid_plural "(different across %d files)"
-msgstr[0] ""
-msgstr[1] ""
-
-#: ../picard/ui/tageditor.py:134
-#, python-format
-msgid "(missing from %d file)"
-msgid_plural "(missing from %d files)"
-msgstr[0] ""
-msgstr[1] ""
-
-#: ../picard/ui/tageditor.py:233
-msgid "Filename:"
-msgstr "Enw ffeil:"
-
-#: ../picard/ui/tageditor.py:235
-msgid "Format:"
-msgstr ""
-
-#: ../picard/ui/tageditor.py:244
-msgid "Size:"
-msgstr ""
-
-#: ../picard/ui/tageditor.py:248 ../picard/ui/ui_metadata.py:127
-msgid "Length:"
-msgstr ""
-
-#: ../picard/ui/tageditor.py:250
-msgid "Bitrate:"
-msgstr ""
-
-#: ../picard/ui/tageditor.py:252
-msgid "Sample rate:"
-msgstr ""
-
-#: ../picard/ui/tageditor.py:254
-msgid "Bits per sample:"
-msgstr ""
-
-#: ../picard/ui/tageditor.py:257
-msgid "Mono"
-msgstr ""
-
-#: ../picard/ui/tageditor.py:258
-msgid "Stereo"
-msgstr ""
-
-#: ../picard/ui/tageditor.py:260
-msgid "Channels:"
-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"
 msgstr ""
@@ -1667,6 +1614,10 @@ msgstr ""
 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 ""
@@ -1686,12 +1637,97 @@ msgstr ""
 msgid " (Error: %s)"
 msgstr ""
 
+#: ../picard/ui/puidsubmit.py:31 ../picard/ui/options/plugins.py:85
+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/passworddialog.py:38
 #, python-format
 msgid ""
 "The server %s requires you to login. Please enter your username and password."
 msgstr ""
 
+#: ../picard/ui/tageditor.py:66 ../picard/ui/ui_options_plugins.py:62
+msgid "Details"
+msgstr "Manylion"
+
+#: ../picard/ui/tageditor.py:71 ../picard/ui/tageditor.py:264
+#, python-format
+msgid "%d file"
+msgid_plural "%d files"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../picard/ui/tageditor.py:131
+#, python-format
+msgid "(different across %d file)"
+msgid_plural "(different across %d files)"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../picard/ui/tageditor.py:134
+#, python-format
+msgid "(missing from %d file)"
+msgid_plural "(missing from %d files)"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../picard/ui/tageditor.py:233
+msgid "Filename:"
+msgstr "Enw ffeil:"
+
+#: ../picard/ui/tageditor.py:235
+msgid "Format:"
+msgstr ""
+
+#: ../picard/ui/tageditor.py:244
+msgid "Size:"
+msgstr ""
+
+#: ../picard/ui/tageditor.py:248 ../picard/ui/ui_metadata.py:127
+msgid "Length:"
+msgstr ""
+
+#: ../picard/ui/tageditor.py:250
+msgid "Bitrate:"
+msgstr ""
+
+#: ../picard/ui/tageditor.py:252
+msgid "Sample rate:"
+msgstr ""
+
+#: ../picard/ui/tageditor.py:254
+msgid "Bits per sample:"
+msgstr ""
+
+#: ../picard/ui/tageditor.py:257
+msgid "Mono"
+msgstr ""
+
+#: ../picard/ui/tageditor.py:258
+msgid "Stereo"
+msgstr ""
+
+#: ../picard/ui/tageditor.py:260
+msgid "Channels:"
+msgstr ""
+
+#: ../picard/ui/tagsfromfilenames.py:54 ../picard/ui/tagsfromfilenames.py:99
+msgid "File Name"
+msgstr "Enw Ffeil"
+
 #: ../picard/ui/ui_cdlookup.py:60 ../picard/ui/ui_options_cdlookup.py:47
 #: ../picard/ui/ui_options_cdlookup_select.py:48
 #: ../picard/ui/options/cdlookup.py:36
@@ -1714,24 +1750,6 @@ msgstr ""
 msgid "Cancel"
 msgstr ""
 
-#: ../picard/ui/ui_passworddialog.py:78
-msgid "Authentication required"
-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"
-msgstr ""
-
 #: ../picard/ui/ui_edittagdialog.py:44
 msgid "Edit Tag"
 msgstr ""
@@ -1768,6 +1786,10 @@ msgstr ""
 msgid "Options"
 msgstr ""
 
+#: ../picard/ui/ui_puidsubmit.py:52
+msgid "Submit PUIDs"
+msgstr ""
+
 #: ../picard/ui/ui_options_cdlookup.py:48
 msgid "CD-ROM device to use for lookups:"
 msgstr ""
@@ -1792,6 +1814,22 @@ msgstr ""
 msgid "Overwrite the file if it already exists"
 msgstr ""
 
+#: ../picard/ui/ui_options_moving.py:53
+msgid "Move additional files:"
+msgstr ""
+
+#: ../picard/ui/ui_options_moving.py:54
+msgid "Browse..."
+msgstr ""
+
+#: ../picard/ui/ui_options_moving.py:55
+msgid "Delete empty directories"
+msgstr ""
+
+#: ../picard/ui/ui_options_moving.py:56
+msgid "Move files to this directory when saving:"
+msgstr ""
+
 #: ../picard/ui/util.py:31
 msgid "&Ok"
 msgstr ""
@@ -1800,44 +1838,40 @@ msgstr ""
 msgid "&Cancel"
 msgstr ""
 
-#: ../picard/ui/ui_puidsubmit.py:52
-msgid "Submit PUIDs"
-msgstr ""
-
-#: ../picard/ui/ui_tageditor.py:139 ../picard/ui/ui_options_plugins.py:59
-#: ../picard/ui/options/plugins.py:76
+#: ../picard/ui/ui_tageditor.py:128 ../picard/ui/ui_options_plugins.py:59
+#: ../picard/ui/options/plugins.py:81
 msgid "Name"
 msgstr ""
 
-#: ../picard/ui/ui_tageditor.py:140
+#: ../picard/ui/ui_tageditor.py:129
 msgid "Value"
 msgstr ""
 
-#: ../picard/ui/ui_tageditor.py:141
+#: ../picard/ui/ui_tageditor.py:130
 msgid "Rating:"
 msgstr ""
 
-#: ../picard/ui/ui_tageditor.py:142
+#: ../picard/ui/ui_tageditor.py:131
 msgid "&Add..."
 msgstr ""
 
-#: ../picard/ui/ui_tageditor.py:143
+#: ../picard/ui/ui_tageditor.py:132
 msgid "&Edit..."
 msgstr ""
 
-#: ../picard/ui/ui_tageditor.py:144
+#: ../picard/ui/ui_tageditor.py:133
 msgid "&Delete"
 msgstr ""
 
-#: ../picard/ui/ui_tageditor.py:145
+#: ../picard/ui/ui_tageditor.py:134
 msgid "&Metadata"
 msgstr ""
 
-#: ../picard/ui/ui_tageditor.py:146
+#: ../picard/ui/ui_tageditor.py:135
 msgid "A&rtwork"
 msgstr ""
 
-#: ../picard/ui/ui_tageditor.py:147
+#: ../picard/ui/ui_tageditor.py:136
 msgid "&Info"
 msgstr ""
 
@@ -1882,6 +1916,40 @@ msgstr ""
 msgid ", "
 msgstr ""
 
+#: ../picard/ui/ui_options_general.py:108
+msgid "MusicBrainz Server"
+msgstr ""
+
+#: ../picard/ui/ui_options_general.py:109 ../picard/ui/ui_options_proxy.py:72
+msgid "Port:"
+msgstr ""
+
+#: ../picard/ui/ui_options_general.py:110 ../picard/ui/ui_options_proxy.py:73
+msgid "Server address:"
+msgstr ""
+
+#: ../picard/ui/ui_options_general.py:111
+msgid "Account Information"
+msgstr ""
+
+#: ../picard/ui/ui_options_general.py:112 ../picard/ui/ui_options_proxy.py:70
+#: ../picard/ui/ui_passworddialog.py:80
+msgid "Password:"
+msgstr ""
+
+#: ../picard/ui/ui_options_general.py:113 ../picard/ui/ui_options_proxy.py:71
+#: ../picard/ui/ui_passworddialog.py:79
+msgid "Username:"
+msgstr ""
+
+#: ../picard/ui/ui_options_general.py:114 ../picard/ui/options/general.py:29
+msgid "General"
+msgstr ""
+
+#: ../picard/ui/ui_options_general.py:115
+msgid "Automatically scan all new files"
+msgstr ""
+
 #: ../picard/ui/ui_options_interface.py:50
 msgid "Miscellaneous"
 msgstr ""
@@ -1902,113 +1970,6 @@ msgstr ""
 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_options_naming.py:180
-#: ../picard/ui/ui_tagsfromfilenames.py:58
-msgid "&Preview"
-msgstr ""
-
-#: ../picard/ui/ui_options_proxy.py:81 ../picard/ui/options/proxy.py:28
-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_options_ratings.py:45
-msgid "Enable track ratings"
-msgstr ""
-
-#: ../picard/ui/ui_options_ratings.py:46
-msgid ""
-"Picard saves the ratings together with an e-mail address identifying the "
-"user who did the rating. That way different ratings for different users can "
-"be stored in the files. Please sepcify the e-mail you want to use to save "
-"your ratings."
-msgstr ""
-
-#: ../picard/ui/ui_options_ratings.py:47
-msgid "E-mail:"
-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 ../picard/ui/options/general.py:29
-msgid "General"
-msgstr ""
-
-#: ../picard/ui/ui_options_general.py:115
-msgid "Automatically scan all new files"
-msgstr ""
-
 #: ../picard/ui/ui_options_matching.py:105
 msgid "Thresholds"
 msgstr ""
@@ -2065,72 +2026,143 @@ msgstr ""
 msgid "Non-album tracks:"
 msgstr ""
 
-#: ../picard/ui/ui_options_plugins.py:58 ../picard/ui/options/plugins.py:30
+#: ../picard/ui/ui_options_metadata.py:109
+#: ../picard/ui/ui_options_metadata.py:110
+#: ../picard/ui/ui_options_renaming.py:155
+#: ../picard/ui/ui_options_renaming.py:158
+msgid "Default"
+msgstr ""
+
+#: ../picard/ui/ui_options_plugins.py:58 ../picard/ui/options/plugins.py:34
 msgid "Plugins"
 msgstr ""
 
-#: ../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:84
 msgid "Author"
 msgstr ""
 
-#: ../picard/ui/ui_options_plugins.py:61 ../picard/util/tags.py:36
+#: ../picard/ui/ui_options_plugins.py:61 ../picard/util/tags.py:37
 msgid "Version"
 msgstr ""
 
-#: ../picard/ui/ui_options_script.py:52
+#: ../picard/ui/ui_options_proxy.py:69 ../picard/ui/options/proxy.py:28
+msgid "Web Proxy"
+msgstr ""
+
+#: ../picard/ui/ui_options_ratings.py:45
+msgid "Enable track ratings"
+msgstr ""
+
+#: ../picard/ui/ui_options_ratings.py:46
+msgid ""
+"Picard saves the ratings together with an e-mail address identifying the "
+"user who did the rating. That way different ratings for different users can "
+"be stored in the files. Please sepcify the e-mail you want to use to save "
+"your ratings."
+msgstr ""
+
+#: ../picard/ui/ui_options_ratings.py:47
+msgid "E-mail:"
+msgstr ""
+
+#: ../picard/ui/ui_options_renaming.py:145
+msgid "Form"
+msgstr ""
+
+#: ../picard/ui/ui_options_renaming.py:146
+msgid "Rename files when saving"
+msgstr ""
+
+#: ../picard/ui/ui_options_renaming.py:147
+msgid "Replace non-ASCII characters"
+msgstr ""
+
+#: ../picard/ui/ui_options_renaming.py:148
+msgid "Replace Windows-incompatible characters"
+msgstr ""
+
+#: ../picard/ui/ui_options_renaming.py:149
+msgid "Name files like this"
+msgstr ""
+
+#: ../picard/ui/ui_options_renaming.py:156
+msgid "Name multiple artist albums differently"
+msgstr ""
+
+#: ../picard/ui/ui_options_renaming.py:157
+msgid "Copy from above"
+msgstr ""
+
+#: ../picard/ui/ui_options_renaming.py:159
+msgid "Examples"
+msgstr ""
+
+#: ../picard/ui/ui_options_script.py:43
 msgid "Tagger Script"
 msgstr ""
 
-#: ../picard/ui/ui_options_tags.py:85
-msgid "Common"
+#: ../picard/ui/ui_options_tags.py:97
+msgid "Do not write tags to files"
 msgstr ""
 
-#: ../picard/ui/ui_options_tags.py:86
-msgid "Clear existing tags before writing new tags"
+#: ../picard/ui/ui_options_tags.py:98
+msgid "Before tagging"
 msgstr ""
 
-#: ../picard/ui/ui_options_tags.py:87
-msgid "Don not write tags to files"
+#: ../picard/ui/ui_options_tags.py:99
+msgid "Clear existing tags"
 msgstr ""
 
-#: ../picard/ui/ui_options_tags.py:88
-msgid "ID3"
-msgstr ""
-
-#: ../picard/ui/ui_options_tags.py:89
-msgid "Write ID3v1 tags to the files"
-msgstr ""
-
-#: ../picard/ui/ui_options_tags.py:90
-msgid "Write ID3v2 version 2.3 tags (2.4 is default)"
-msgstr ""
-
-#: ../picard/ui/ui_options_tags.py:91
-msgid "Text encoding to use while writing ID3v2 tags:"
-msgstr ""
-
-#: ../picard/ui/ui_options_tags.py:92
-msgid "ISO-8859-1"
-msgstr ""
-
-#: ../picard/ui/ui_options_tags.py:93
-msgid "UTF-16"
-msgstr ""
-
-#: ../picard/ui/ui_options_tags.py:94
-msgid "UTF-8"
-msgstr ""
-
-#: ../picard/ui/ui_options_tags.py:95
+#: ../picard/ui/ui_options_tags.py:100
 msgid "Remove ID3 tags from FLAC files"
 msgstr ""
 
-#: ../picard/ui/ui_options_tags.py:96
-msgid "APE"
+#: ../picard/ui/ui_options_tags.py:101
+msgid "Remove APEv2 tags from MP3 files"
 msgstr ""
 
-#: ../picard/ui/ui_options_tags.py:97
-msgid "Remove APEv2 tags from MP3 files"
+#: ../picard/ui/ui_options_tags.py:102
+msgid "Tag compatibility"
+msgstr ""
+
+#: ../picard/ui/ui_options_tags.py:103
+msgid "ID3v2 version"
+msgstr ""
+
+#: ../picard/ui/ui_options_tags.py:104
+msgid "2.4"
+msgstr ""
+
+#: ../picard/ui/ui_options_tags.py:105
+msgid "2.3"
+msgstr ""
+
+#: ../picard/ui/ui_options_tags.py:106
+msgid "Also include ID3v1 tags in the files"
+msgstr ""
+
+#: ../picard/ui/ui_options_tags.py:107
+msgid "ID3v2 text encoding"
+msgstr ""
+
+#: ../picard/ui/ui_options_tags.py:108
+msgid "UTF-8"
+msgstr ""
+
+#: ../picard/ui/ui_options_tags.py:109
+msgid "UTF-16"
+msgstr ""
+
+#: ../picard/ui/ui_options_tags.py:110
+msgid "ISO-8859-1"
+msgstr ""
+
+#: ../picard/ui/ui_passworddialog.py:78
+msgid "Authentication required"
+msgstr ""
+
+#: ../picard/ui/ui_passworddialog.py:81
+msgid "Save username and password"
 msgstr ""
 
 #: ../picard/ui/ui_tagsfromfilenames.py:56
@@ -2141,6 +2173,10 @@ msgstr ""
 msgid "Replace underscores with spaces"
 msgstr ""
 
+#: ../picard/ui/ui_tagsfromfilenames.py:58
+msgid "&Preview"
+msgstr ""
+
 #: ../picard/ui/options/about.py:29
 msgid "About"
 msgstr ""
@@ -2167,8 +2203,8 @@ 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"
@@ -2176,14 +2212,13 @@ msgid ""
 "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\"><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/P"
-"icardTagger</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
@@ -2216,42 +2251,45 @@ msgstr ""
 msgid "None"
 msgstr ""
 
-#: ../picard/ui/options/naming.py:33
-msgid "File Naming"
+#: ../picard/ui/options/moving.py:33
+msgid "Moving files"
 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 ""
-
-#: ../picard/ui/options/naming.py:95
-msgid "The multiple artist file naming format must not be empty."
-msgstr ""
-
-#: ../picard/ui/options/naming.py:97
+#: ../picard/ui/options/moving.py:65
 msgid "Error"
 msgstr ""
 
-#: ../picard/ui/options/naming.py:97
+#: ../picard/ui/options/moving.py:65
 msgid "The location to move files to must not be empty."
 msgstr ""
 
-#: ../picard/ui/options/scripting.py:63
-msgid "Scripting"
+#: ../picard/ui/options/ratings.py:29
+msgid "Ratings"
 msgstr ""
 
 #: ../picard/ui/options/tags.py:29
 msgid "Tags"
 msgstr ""
 
-#: ../picard/ui/options/ratings.py:29
-msgid "Ratings"
+#: ../picard/ui/options/renaming.py:35
+#, fuzzy
+msgid "File naming"
+msgstr "Enw ffeil:"
+
+#: ../picard/ui/options/renaming.py:123
+msgid "The file naming format must not be empty."
+msgstr ""
+
+#: ../picard/ui/options/renaming.py:133
+msgid "The multiple artist file naming format must not be empty."
+msgstr ""
+
+#: ../picard/ui/options/scripting.py:63
+msgid "Scripting"
+msgstr ""
+
+#: ../picard/ui/options/scripting.py:97
+msgid "Script Error"
 msgstr ""
 
 #: ../picard/util/tags.py:24
@@ -2259,214 +2297,218 @@ msgid "Date"
 msgstr ""
 
 #: ../picard/util/tags.py:25
-msgid "Album Artist"
+msgid "Original Release Date"
 msgstr ""
 
 #: ../picard/util/tags.py:26
-msgid "Track Number"
+msgid "Album Artist"
 msgstr ""
 
 #: ../picard/util/tags.py:27
-msgid "Total Tracks"
+msgid "Track Number"
 msgstr ""
 
 #: ../picard/util/tags.py:28
-msgid "Disc Number"
+msgid "Total Tracks"
 msgstr ""
 
 #: ../picard/util/tags.py:29
-msgid "Total Discs"
+msgid "Disc Number"
 msgstr ""
 
 #: ../picard/util/tags.py:30
-msgid "Album Artist Sort Order"
+msgid "Total Discs"
 msgstr ""
 
 #: ../picard/util/tags.py:31
-msgid "Artist Sort Order"
+msgid "Album Artist Sort Order"
 msgstr ""
 
 #: ../picard/util/tags.py:32
-msgid "Title Sort Order"
+msgid "Artist Sort Order"
 msgstr ""
 
 #: ../picard/util/tags.py:33
-msgid "Album Sort Order"
+msgid "Title Sort Order"
 msgstr ""
 
 #: ../picard/util/tags.py:34
-msgid "ASIN"
+msgid "Album Sort Order"
 msgstr ""
 
 #: ../picard/util/tags.py:35
+msgid "ASIN"
+msgstr ""
+
+#: ../picard/util/tags.py:36
 msgid "Grouping"
 msgstr ""
 
-#: ../picard/util/tags.py:37
+#: ../picard/util/tags.py:38
 msgid "ISRC"
 msgstr ""
 
-#: ../picard/util/tags.py:38
+#: ../picard/util/tags.py:39
 msgid "Mood"
 msgstr ""
 
-#: ../picard/util/tags.py:39
+#: ../picard/util/tags.py:40
 msgid "BPM"
 msgstr ""
 
-#: ../picard/util/tags.py:40
+#: ../picard/util/tags.py:41
 msgid "Copyright"
 msgstr ""
 
-#: ../picard/util/tags.py:41
+#: ../picard/util/tags.py:42
 msgid "Composer"
 msgstr ""
 
-#: ../picard/util/tags.py:42
+#: ../picard/util/tags.py:43
 msgid "Conductor"
 msgstr ""
 
-#: ../picard/util/tags.py:43
+#: ../picard/util/tags.py:44
 msgid "Lyricist"
 msgstr ""
 
-#: ../picard/util/tags.py:44
+#: ../picard/util/tags.py:45
 msgid "Arranger"
 msgstr ""
 
-#: ../picard/util/tags.py:45
+#: ../picard/util/tags.py:46
 msgid "Producer"
 msgstr ""
 
-#: ../picard/util/tags.py:46
+#: ../picard/util/tags.py:47
 msgid "Engineer"
 msgstr ""
 
-#: ../picard/util/tags.py:47
+#: ../picard/util/tags.py:48
 msgid "Subtitle"
 msgstr ""
 
-#: ../picard/util/tags.py:48
+#: ../picard/util/tags.py:49
 msgid "Disc Subtitle"
 msgstr ""
 
-#: ../picard/util/tags.py:49
+#: ../picard/util/tags.py:50
 msgid "Remixer"
 msgstr ""
 
-#: ../picard/util/tags.py:50
+#: ../picard/util/tags.py:51
 msgid "MusicBrainz Track Id"
 msgstr ""
 
-#: ../picard/util/tags.py:51
+#: ../picard/util/tags.py:52
 msgid "MusicBrainz Release Id"
 msgstr ""
 
-#: ../picard/util/tags.py:52
+#: ../picard/util/tags.py:53
 msgid "MusicBrainz Artist Id"
 msgstr ""
 
-#: ../picard/util/tags.py:53
+#: ../picard/util/tags.py:54
 msgid "MusicBrainz Release Artist Id"
 msgstr ""
 
-#: ../picard/util/tags.py:54
+#: ../picard/util/tags.py:55
 msgid "MusicBrainz TRM Id"
 msgstr ""
 
-#: ../picard/util/tags.py:55
+#: ../picard/util/tags.py:56
 msgid "MusicBrainz Disc Id"
 msgstr ""
 
-#: ../picard/util/tags.py:56
+#: ../picard/util/tags.py:57
 msgid "MusicBrainz Sort Name"
 msgstr ""
 
-#: ../picard/util/tags.py:57
+#: ../picard/util/tags.py:58
 msgid "MusicIP PUID"
 msgstr ""
 
-#: ../picard/util/tags.py:58
+#: ../picard/util/tags.py:59
 msgid "MusicIP Fingerprint"
 msgstr ""
 
-#: ../picard/util/tags.py:59
+#: ../picard/util/tags.py:60
 msgid "Disc Id"
 msgstr ""
 
-#: ../picard/util/tags.py:60
+#: ../picard/util/tags.py:61
 msgid "Website"
 msgstr ""
 
-#: ../picard/util/tags.py:61
+#: ../picard/util/tags.py:62
 msgid "Compilation"
 msgstr ""
 
-#: ../picard/util/tags.py:62
+#: ../picard/util/tags.py:63
 msgid "Comment"
 msgstr ""
 
-#: ../picard/util/tags.py:63
+#: ../picard/util/tags.py:64
 msgid "Genre"
 msgstr ""
 
-#: ../picard/util/tags.py:64
+#: ../picard/util/tags.py:65
 msgid "Encoded By"
 msgstr ""
 
-#: ../picard/util/tags.py:65
+#: ../picard/util/tags.py:66
 msgid "Performer"
 msgstr ""
 
-#: ../picard/util/tags.py:66
+#: ../picard/util/tags.py:67
 msgid "Release Type"
 msgstr ""
 
-#: ../picard/util/tags.py:67
+#: ../picard/util/tags.py:68
 msgid "Release Status"
 msgstr ""
 
-#: ../picard/util/tags.py:68
+#: ../picard/util/tags.py:69
 msgid "Release Country"
 msgstr ""
 
-#: ../picard/util/tags.py:69
+#: ../picard/util/tags.py:70
 msgid "Record Label"
 msgstr ""
 
-#: ../picard/util/tags.py:70
+#: ../picard/util/tags.py:71
 msgid "Barcode"
 msgstr ""
 
-#: ../picard/util/tags.py:71
+#: ../picard/util/tags.py:72
 msgid "Catalog Number"
 msgstr ""
 
-#: ../picard/util/tags.py:72
+#: ../picard/util/tags.py:73
 msgid "Format"
 msgstr ""
 
-#: ../picard/util/tags.py:73
+#: ../picard/util/tags.py:74
 msgid "DJ-Mixer"
 msgstr ""
 
-#: ../picard/util/tags.py:74
+#: ../picard/util/tags.py:75
 msgid "Media"
 msgstr ""
 
-#: ../picard/util/tags.py:75
+#: ../picard/util/tags.py:76
 msgid "Lyrics"
 msgstr ""
 
-#: ../picard/util/tags.py:76
+#: ../picard/util/tags.py:77
 msgid "Mixer"
 msgstr ""
 
-#: ../picard/util/tags.py:77
+#: ../picard/util/tags.py:78
 msgid "Language"
 msgstr ""
 
-#: ../picard/util/tags.py:78
+#: ../picard/util/tags.py:79
 msgid "Script"
 msgstr ""
 
diff --git a/po/da.po b/po/da.po
index 356a97db2..87dfa9bc3 100644
--- a/po/da.po
+++ b/po/da.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: picard\n"
 "Report-Msgid-Bugs-To: http://bugs.musicbrainz.org/\n"
-"POT-Creation-Date: 2009-02-24 18:58+0100\n"
+"POT-Creation-Date: 2009-04-06 22:50+0200\n"
 "PO-Revision-Date: 2009-01-25 13:04+0000\n"
 "Last-Translator: Philipp Wolfer <Unknown>\n"
 "Language-Team: Danish <da@li.org>\n"
@@ -18,16 +18,16 @@ msgstr ""
 "X-Launchpad-Export-Date: 2009-04-06 20:21+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
-#: ../picard/album.py:108 ../picard/cluster.py:248
+#: ../picard/album.py:109 ../picard/cluster.py:248
 msgid "Unmatched Files"
 msgstr "ikke-matchede filer"
 
-#: ../picard/album.py:281
+#: ../picard/album.py:287
 #, python-format
 msgid "[could not load album %s]"
 msgstr ""
 
-#: ../picard/album.py:317
+#: ../picard/album.py:320
 msgid "[loading album information]"
 msgstr "[henter albuminformation]"
 
@@ -587,7 +587,7 @@ msgid "Namibia"
 msgstr ""
 
 #: ../picard/const.py:182
-msgid "Vanuat"
+msgid "Vanuatu"
 msgstr ""
 
 #: ../picard/const.py:183
@@ -1031,223 +1031,234 @@ msgid "Congo, The Democratic Republic of the"
 msgstr ""
 
 #: ../picard/const.py:293
-msgid "Serbia and Montenegro"
+msgid "Serbia and Montenegro (historical, 2003-2006)"
 msgstr ""
 
 #: ../picard/const.py:294
-msgid "Croatia"
+msgid "Serbia"
 msgstr ""
 
 #: ../picard/const.py:295
-msgid "Korea (North), Democratic People's Republic of"
+msgid "Montenegro"
 msgstr ""
 
 #: ../picard/const.py:296
-msgid "Korea (South), Republic of"
+msgid "Croatia"
 msgstr ""
 
 #: ../picard/const.py:297
-msgid "Slovakia"
+msgid "Korea (North), Democratic People's Republic of"
 msgstr ""
 
 #: ../picard/const.py:298
-msgid "Soviet Union (historical, 1922-1991)"
+msgid "Korea (South), Republic of"
 msgstr ""
 
 #: ../picard/const.py:299
-msgid "East Timor"
+msgid "Slovakia"
 msgstr ""
 
 #: ../picard/const.py:300
-msgid "Czechoslovakia (historical, 1918-1992)"
+msgid "Soviet Union (historical, 1922-1991)"
 msgstr ""
 
 #: ../picard/const.py:301
-msgid "Europe"
+msgid "East Timor"
 msgstr ""
 
 #: ../picard/const.py:302
-msgid "East Germany (historical, 1949-1990)"
+msgid "Czechoslovakia (historical, 1918-1992)"
 msgstr ""
 
 #: ../picard/const.py:303
-msgid "[Unknown Country]"
+msgid "Europe"
 msgstr ""
 
 #: ../picard/const.py:304
-msgid "[Worldwide]"
+msgid "East Germany (historical, 1949-1990)"
 msgstr ""
 
 #: ../picard/const.py:305
+msgid "[Unknown Country]"
+msgstr ""
+
+#: ../picard/const.py:306
+msgid "[Worldwide]"
+msgstr ""
+
+#: ../picard/const.py:307
 msgid "Yugoslavia (historical, 1918-1992)"
 msgstr ""
 
-#: ../picard/const.py:310
-msgid "Catalan"
-msgstr ""
-
-#: ../picard/const.py:311
-msgid "Czech"
-msgstr "Tjekkisk"
-
 #: ../picard/const.py:312
-msgid "Welsh"
+msgid "Afrikaans"
 msgstr ""
 
 #: ../picard/const.py:313
-msgid "Danish"
+msgid "Arabic"
 msgstr ""
 
 #: ../picard/const.py:314
-msgid "German"
-msgstr "Tysk"
+msgid "Catalan"
+msgstr ""
 
 #: ../picard/const.py:315
-msgid "English"
-msgstr "Engelsk"
+msgid "Czech"
+msgstr "Tjekkisk"
 
 #: ../picard/const.py:316
-msgid "English (Canada)"
+msgid "Welsh"
 msgstr ""
 
 #: ../picard/const.py:317
-msgid "English (UK)"
+msgid "Danish"
 msgstr ""
 
 #: ../picard/const.py:318
+msgid "German"
+msgstr "Tysk"
+
+#: ../picard/const.py:319
+msgid "English"
+msgstr "Engelsk"
+
+#: ../picard/const.py:320
+msgid "English (Canada)"
+msgstr ""
+
+#: ../picard/const.py:321
+msgid "English (UK)"
+msgstr ""
+
+#: ../picard/const.py:322
 msgid "Spanish"
 msgstr "Spansk"
 
-#: ../picard/const.py:319
+#: ../picard/const.py:323
 msgid "Persian"
 msgstr ""
 
-#: ../picard/const.py:320
+#: ../picard/const.py:324
 msgid "Finnish"
 msgstr "Finsk"
 
-#: ../picard/const.py:321
+#: ../picard/const.py:325
 msgid "French"
 msgstr "Fransk"
 
-#: ../picard/const.py:322
+#: ../picard/const.py:326
 msgid "Frisian"
 msgstr ""
 
-#: ../picard/const.py:323
+#: ../picard/const.py:327
 msgid "Hebrew"
 msgstr ""
 
-#: ../picard/const.py:324
-msgid "Hungarian"
-msgstr "Ungarsk"
-
-#: ../picard/const.py:325
-msgid "Islandic"
-msgstr ""
-
-#: ../picard/const.py:326
-msgid "Italian"
-msgstr "Italiensk"
-
-#: ../picard/const.py:327
-msgid "Kannada"
-msgstr ""
-
 #: ../picard/const.py:328
-msgid "Korean"
+msgid "Hindi"
 msgstr ""
 
 #: ../picard/const.py:329
-msgid "Lithuanian"
-msgstr ""
+msgid "Hungarian"
+msgstr "Ungarsk"
 
 #: ../picard/const.py:330
-msgid "Norwegian Bokmal"
+msgid "Islandic"
 msgstr ""
 
 #: ../picard/const.py:331
-msgid "Dutch"
-msgstr "Hollandsk"
+msgid "Italian"
+msgstr "Italiensk"
 
 #: ../picard/const.py:332
-msgid "Polish"
+msgid "Kannada"
 msgstr ""
 
 #: ../picard/const.py:333
-msgid "Portuguese"
-msgstr "Portugisisk"
+msgid "Korean"
+msgstr ""
 
 #: ../picard/const.py:334
-msgid "Brazilian Portuguese"
+msgid "Lithuanian"
 msgstr ""
 
 #: ../picard/const.py:335
-msgid "Romanian"
+msgid "Norwegian Bokmal"
 msgstr ""
 
 #: ../picard/const.py:336
-msgid "Russian"
-msgstr "Russisk"
+msgid "Dutch"
+msgstr "Hollandsk"
 
 #: ../picard/const.py:337
-msgid "Scots"
+msgid "Polish"
 msgstr ""
 
 #: ../picard/const.py:338
-msgid "Slovak"
-msgstr ""
+msgid "Portuguese"
+msgstr "Portugisisk"
 
 #: ../picard/const.py:339
-msgid "Slovenian"
+msgid "Brazilian Portuguese"
 msgstr ""
 
 #: ../picard/const.py:340
+msgid "Romanian"
+msgstr ""
+
+#: ../picard/const.py:341
+msgid "Russian"
+msgstr "Russisk"
+
+#: ../picard/const.py:342
+msgid "Scots"
+msgstr ""
+
+#: ../picard/const.py:343
+msgid "Slovak"
+msgstr ""
+
+#: ../picard/const.py:344
+msgid "Slovenian"
+msgstr ""
+
+#: ../picard/const.py:345
 msgid "Swedish"
 msgstr "Svensk"
 
-#: ../picard/const.py:341
+#: ../picard/const.py:346
+msgid "Turkish"
+msgstr ""
+
+#: ../picard/const.py:347
 msgid "Chinese"
 msgstr ""
 
-#: ../picard/file.py:487
+#: ../picard/file.py:494
 #, python-format
 msgid "No matching tracks for file %s"
 msgstr "Ingen matchende skæringer for fil %s"
 
-#: ../picard/file.py:504
+#: ../picard/file.py:511
 #, python-format
 msgid "No matching tracks above the threshold for file %s"
 msgstr ""
 
-#: ../picard/file.py:507
+#: ../picard/file.py:514
 #, python-format
 msgid "File %s identified!"
 msgstr "Filen %s identificeret!"
 
-#: ../picard/file.py:518
+#: ../picard/file.py:525
 #, python-format
 msgid "Looking up the PUID for file %s..."
 msgstr "Slår PUID til filen %s op..."
 
-#: ../picard/file.py:523
+#: ../picard/file.py:530
 #, 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)"
@@ -1260,11 +1271,24 @@ msgstr "PLS-spilleliste (*.pls)"
 msgid "XSPF Playlist (*.xspf)"
 msgstr "XSPF-spilleliste (*.xspf)"
 
-#: ../picard/tagger.py:476
+#: ../picard/puidmanager.py:62
+msgid "Submitting PUIDs..."
+msgstr "Sender PUID'er..."
+
+#: ../picard/puidmanager.py:68
+#, python-format
+msgid "PUIDs submission failed: %s"
+msgstr "Fejl ved sending af PUID'er: %s"
+
+#: ../picard/puidmanager.py:70
+msgid "PUIDs successfully submitted!"
+msgstr "PUID'er blev sendt!"
+
+#: ../picard/tagger.py:477
 msgid "CD Lookup Error"
 msgstr "Fejl under cd-opslag"
 
-#: ../picard/tagger.py:477
+#: ../picard/tagger.py:478
 #, python-format
 msgid ""
 "Error while reading CD:\n"
@@ -1275,7 +1299,7 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../picard/tagger.py:503
+#: ../picard/tagger.py:504
 #, python-format
 msgid "Could not find PUID for file %s"
 msgstr ""
@@ -1328,15 +1352,27 @@ msgstr ""
 msgid "Length"
 msgstr "Længde"
 
-#: ../picard/ui/itemviews.py:327
+#: ../picard/ui/itemviews.py:289
+msgid "&Expand all"
+msgstr ""
+
+#: ../picard/ui/itemviews.py:291
+msgid "&Collapse all"
+msgstr ""
+
+#: ../picard/ui/itemviews.py:332
 msgid "&Releases"
 msgstr ""
 
-#: ../picard/ui/itemviews.py:353
+#: ../picard/ui/itemviews.py:349
+msgid "No release event"
+msgstr ""
+
+#: ../picard/ui/itemviews.py:359
 msgid "&Plugins"
 msgstr ""
 
-#: ../picard/ui/itemviews.py:523
+#: ../picard/ui/itemviews.py:533
 msgid "Clusters"
 msgstr "Klynger"
 
@@ -1344,95 +1380,6 @@ msgstr "Klynger"
 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:66 ../picard/ui/ui_options_plugins.py:62
-msgid "Details"
-msgstr "Detaljer"
-
-#: ../picard/ui/tageditor.py:71 ../picard/ui/tageditor.py:264
-#, python-format
-msgid "%d file"
-msgid_plural "%d files"
-msgstr[0] "%d fil"
-msgstr[1] "%d filer"
-
-#: ../picard/ui/tageditor.py:131
-#, 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:134
-#, 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:233
-msgid "Filename:"
-msgstr "Filnavn:"
-
-#: ../picard/ui/tageditor.py:235
-msgid "Format:"
-msgstr "Format:"
-
-#: ../picard/ui/tageditor.py:244
-msgid "Size:"
-msgstr "Størrelse:"
-
-#: ../picard/ui/tageditor.py:248 ../picard/ui/ui_metadata.py:127
-msgid "Length:"
-msgstr "Længde:"
-
-#: ../picard/ui/tageditor.py:250
-msgid "Bitrate:"
-msgstr "Bitfrekvens:"
-
-#: ../picard/ui/tageditor.py:252
-msgid "Sample rate:"
-msgstr "Samplefrekvens:"
-
-#: ../picard/ui/tageditor.py:254
-msgid "Bits per sample:"
-msgstr ""
-
-#: ../picard/ui/tageditor.py:257
-msgid "Mono"
-msgstr "Mono"
-
-#: ../picard/ui/tageditor.py:258
-msgid "Stereo"
-msgstr "Stereo"
-
-#: ../picard/ui/tageditor.py:260
-msgid "Channels:"
-msgstr "Kanaler:"
-
-#: ../picard/ui/tagsfromfilenames.py:52 ../picard/ui/tagsfromfilenames.py:96
-msgid "File Name"
-msgstr "Filnavn"
-
 #: ../picard/ui/mainwindow.py:64
 msgid "MusicBrainz Picard"
 msgstr "MusicBrainz Picard"
@@ -1669,6 +1616,10 @@ msgstr "&Søgelinje"
 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"
@@ -1688,12 +1639,97 @@ msgstr "Spilleliste %s gemt"
 msgid " (Error: %s)"
 msgstr " (Fejl: %s)"
 
+#: ../picard/ui/puidsubmit.py:31 ../picard/ui/options/plugins.py:85
+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/passworddialog.py:38
 #, python-format
 msgid ""
 "The server %s requires you to login. Please enter your username and password."
 msgstr ""
 
+#: ../picard/ui/tageditor.py:66 ../picard/ui/ui_options_plugins.py:62
+msgid "Details"
+msgstr "Detaljer"
+
+#: ../picard/ui/tageditor.py:71 ../picard/ui/tageditor.py:264
+#, python-format
+msgid "%d file"
+msgid_plural "%d files"
+msgstr[0] "%d fil"
+msgstr[1] "%d filer"
+
+#: ../picard/ui/tageditor.py:131
+#, 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:134
+#, 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:233
+msgid "Filename:"
+msgstr "Filnavn:"
+
+#: ../picard/ui/tageditor.py:235
+msgid "Format:"
+msgstr "Format:"
+
+#: ../picard/ui/tageditor.py:244
+msgid "Size:"
+msgstr "Størrelse:"
+
+#: ../picard/ui/tageditor.py:248 ../picard/ui/ui_metadata.py:127
+msgid "Length:"
+msgstr "Længde:"
+
+#: ../picard/ui/tageditor.py:250
+msgid "Bitrate:"
+msgstr "Bitfrekvens:"
+
+#: ../picard/ui/tageditor.py:252
+msgid "Sample rate:"
+msgstr "Samplefrekvens:"
+
+#: ../picard/ui/tageditor.py:254
+msgid "Bits per sample:"
+msgstr ""
+
+#: ../picard/ui/tageditor.py:257
+msgid "Mono"
+msgstr "Mono"
+
+#: ../picard/ui/tageditor.py:258
+msgid "Stereo"
+msgstr "Stereo"
+
+#: ../picard/ui/tageditor.py:260
+msgid "Channels:"
+msgstr "Kanaler:"
+
+#: ../picard/ui/tagsfromfilenames.py:54 ../picard/ui/tagsfromfilenames.py:99
+msgid "File Name"
+msgstr "Filnavn"
+
 #: ../picard/ui/ui_cdlookup.py:60 ../picard/ui/ui_options_cdlookup.py:47
 #: ../picard/ui/ui_options_cdlookup_select.py:48
 #: ../picard/ui/options/cdlookup.py:36
@@ -1716,24 +1752,6 @@ msgstr "    Slå op manuelt    "
 msgid "Cancel"
 msgstr "Annuller"
 
-#: ../picard/ui/ui_passworddialog.py:78
-msgid "Authentication required"
-msgstr ""
-
-#: ../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"
-msgstr ""
-
 #: ../picard/ui/ui_edittagdialog.py:44
 msgid "Edit Tag"
 msgstr "Rediger tag"
@@ -1770,6 +1788,10 @@ msgstr "Album:"
 msgid "Options"
 msgstr "Indstillinger"
 
+#: ../picard/ui/ui_puidsubmit.py:52
+msgid "Submit PUIDs"
+msgstr "Send PUID'er"
+
 #: ../picard/ui/ui_options_cdlookup.py:48
 msgid "CD-ROM device to use for lookups:"
 msgstr "CD-ROM-drev der skal bruges til opslag:"
@@ -1794,6 +1816,23 @@ msgstr "Gem omslag som separate filer"
 msgid "Overwrite the file if it already exists"
 msgstr "Overskriv filen hvis den allerede eksisterer"
 
+#: ../picard/ui/ui_options_moving.py:53
+msgid "Move additional files:"
+msgstr ""
+
+#: ../picard/ui/ui_options_moving.py:54
+msgid "Browse..."
+msgstr "Gennemse..."
+
+#: ../picard/ui/ui_options_moving.py:55
+msgid "Delete empty directories"
+msgstr "Slet tomme mapper"
+
+#: ../picard/ui/ui_options_moving.py:56
+#, fuzzy
+msgid "Move files to this directory when saving:"
+msgstr "Flyt taggede filer til denne mappe:"
+
 #: ../picard/ui/util.py:31
 msgid "&Ok"
 msgstr "&OK"
@@ -1802,44 +1841,40 @@ msgstr "&OK"
 msgid "&Cancel"
 msgstr ""
 
-#: ../picard/ui/ui_puidsubmit.py:52
-msgid "Submit PUIDs"
-msgstr "Send PUID'er"
-
-#: ../picard/ui/ui_tageditor.py:139 ../picard/ui/ui_options_plugins.py:59
-#: ../picard/ui/options/plugins.py:76
+#: ../picard/ui/ui_tageditor.py:128 ../picard/ui/ui_options_plugins.py:59
+#: ../picard/ui/options/plugins.py:81
 msgid "Name"
 msgstr "Navn"
 
-#: ../picard/ui/ui_tageditor.py:140
+#: ../picard/ui/ui_tageditor.py:129
 msgid "Value"
 msgstr "Værdi"
 
-#: ../picard/ui/ui_tageditor.py:141
+#: ../picard/ui/ui_tageditor.py:130
 msgid "Rating:"
 msgstr ""
 
-#: ../picard/ui/ui_tageditor.py:142
+#: ../picard/ui/ui_tageditor.py:131
 msgid "&Add..."
 msgstr ""
 
-#: ../picard/ui/ui_tageditor.py:143
+#: ../picard/ui/ui_tageditor.py:132
 msgid "&Edit..."
 msgstr ""
 
-#: ../picard/ui/ui_tageditor.py:144
+#: ../picard/ui/ui_tageditor.py:133
 msgid "&Delete"
 msgstr ""
 
-#: ../picard/ui/ui_tageditor.py:145
+#: ../picard/ui/ui_tageditor.py:134
 msgid "&Metadata"
 msgstr "&Metadata"
 
-#: ../picard/ui/ui_tageditor.py:146
+#: ../picard/ui/ui_tageditor.py:135
 msgid "A&rtwork"
 msgstr "&Omslag"
 
-#: ../picard/ui/ui_tageditor.py:147
+#: ../picard/ui/ui_tageditor.py:136
 msgid "&Info"
 msgstr "&Info"
 
@@ -1884,6 +1919,40 @@ msgstr " / "
 msgid ", "
 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:72
+msgid "Port:"
+msgstr "Port:"
+
+#: ../picard/ui/ui_options_general.py:110 ../picard/ui/ui_options_proxy.py:73
+msgid "Server address:"
+msgstr "Serveradresse:"
+
+#: ../picard/ui/ui_options_general.py:111
+msgid "Account Information"
+msgstr "Kontoinformation"
+
+#: ../picard/ui/ui_options_general.py:112 ../picard/ui/ui_options_proxy.py:70
+#: ../picard/ui/ui_passworddialog.py:80
+msgid "Password:"
+msgstr "Adgangskode:"
+
+#: ../picard/ui/ui_options_general.py:113 ../picard/ui/ui_options_proxy.py:71
+#: ../picard/ui/ui_passworddialog.py:79
+msgid "Username:"
+msgstr "Brugernavn:"
+
+#: ../picard/ui/ui_options_general.py:114 ../picard/ui/options/general.py:29
+msgid "General"
+msgstr "Generelt"
+
+#: ../picard/ui/ui_options_general.py:115
+msgid "Automatically scan all new files"
+msgstr "Skan automatisk alle nye filer"
+
 #: ../picard/ui/ui_options_interface.py:50
 msgid "Miscellaneous"
 msgstr "Diverse"
@@ -1904,113 +1973,6 @@ msgstr "Brug avanceret forespørgselssyntaks"
 msgid "User interface language:"
 msgstr ""
 
-#: ../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_options_naming.py:180
-#: ../picard/ui/ui_tagsfromfilenames.py:58
-msgid "&Preview"
-msgstr "&Forhåndsvisning"
-
-#: ../picard/ui/ui_options_proxy.py:81 ../picard/ui/options/proxy.py:28
-msgid "Web Proxy"
-msgstr "Internetproxy"
-
-#: ../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 "Serveradresse:"
-
-#: ../picard/ui/ui_options_ratings.py:45
-msgid "Enable track ratings"
-msgstr ""
-
-#: ../picard/ui/ui_options_ratings.py:46
-msgid ""
-"Picard saves the ratings together with an e-mail address identifying the "
-"user who did the rating. That way different ratings for different users can "
-"be stored in the files. Please sepcify the e-mail you want to use to save "
-"your ratings."
-msgstr ""
-
-#: ../picard/ui/ui_options_ratings.py:47
-msgid "E-mail:"
-msgstr ""
-
-#: ../picard/ui/ui_options_general.py:108
-msgid "MusicBrainz Server"
-msgstr "MusicBrainz-server"
-
-#: ../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"
-
-#: ../picard/ui/ui_options_general.py:115
-msgid "Automatically scan all new files"
-msgstr "Skan automatisk alle nye filer"
-
 #: ../picard/ui/ui_options_matching.py:105
 msgid "Thresholds"
 msgstr "Grænser"
@@ -2067,74 +2029,152 @@ msgstr "Diverse kunstnere:"
 msgid "Non-album tracks:"
 msgstr "Skæringer uden album:"
 
-#: ../picard/ui/ui_options_plugins.py:58 ../picard/ui/options/plugins.py:30
+#: ../picard/ui/ui_options_metadata.py:109
+#: ../picard/ui/ui_options_metadata.py:110
+#: ../picard/ui/ui_options_renaming.py:155
+#: ../picard/ui/ui_options_renaming.py:158
+msgid "Default"
+msgstr "Standard"
+
+#: ../picard/ui/ui_options_plugins.py:58 ../picard/ui/options/plugins.py:34
 msgid "Plugins"
 msgstr "Udvidelsesmoduler"
 
-#: ../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:84
 msgid "Author"
 msgstr "Forfatter"
 
-#: ../picard/ui/ui_options_plugins.py:61 ../picard/util/tags.py:36
+#: ../picard/ui/ui_options_plugins.py:61 ../picard/util/tags.py:37
 msgid "Version"
 msgstr "Version"
 
-#: ../picard/ui/ui_options_script.py:52
+#: ../picard/ui/ui_options_proxy.py:69 ../picard/ui/options/proxy.py:28
+msgid "Web Proxy"
+msgstr "Internetproxy"
+
+#: ../picard/ui/ui_options_ratings.py:45
+msgid "Enable track ratings"
+msgstr ""
+
+#: ../picard/ui/ui_options_ratings.py:46
+msgid ""
+"Picard saves the ratings together with an e-mail address identifying the "
+"user who did the rating. That way different ratings for different users can "
+"be stored in the files. Please sepcify the e-mail you want to use to save "
+"your ratings."
+msgstr ""
+
+#: ../picard/ui/ui_options_ratings.py:47
+msgid "E-mail:"
+msgstr ""
+
+#: ../picard/ui/ui_options_renaming.py:145
+#, fuzzy
+msgid "Form"
+msgstr "Format:"
+
+#: ../picard/ui/ui_options_renaming.py:146
+#, fuzzy
+msgid "Rename files when saving"
+msgstr "Omdøb filer"
+
+#: ../picard/ui/ui_options_renaming.py:147
+msgid "Replace non-ASCII characters"
+msgstr "Erstat tegn der ikke er ASCII-tegn"
+
+#: ../picard/ui/ui_options_renaming.py:148
+msgid "Replace Windows-incompatible characters"
+msgstr "Erstat tegn der ikke er kompatible med Windows"
+
+#: ../picard/ui/ui_options_renaming.py:149
+msgid "Name files like this"
+msgstr ""
+
+#: ../picard/ui/ui_options_renaming.py:156
+msgid "Name multiple artist albums differently"
+msgstr ""
+
+#: ../picard/ui/ui_options_renaming.py:157
+msgid "Copy from above"
+msgstr ""
+
+#: ../picard/ui/ui_options_renaming.py:159
+#, fuzzy
+msgid "Examples"
+msgstr "Eksempel"
+
+#: ../picard/ui/ui_options_script.py:43
 msgid "Tagger Script"
 msgstr "Taggerscript"
 
-#: ../picard/ui/ui_options_tags.py:85
-msgid "Common"
-msgstr "Generelt"
+#: ../picard/ui/ui_options_tags.py:97
+#, fuzzy
+msgid "Do not write tags to files"
+msgstr "Skriv ikke tags til filer"
 
-#: ../picard/ui/ui_options_tags.py:86
-msgid "Clear existing tags before writing new tags"
+#: ../picard/ui/ui_options_tags.py:98
+msgid "Before tagging"
+msgstr ""
+
+#: ../picard/ui/ui_options_tags.py:99
+#, fuzzy
+msgid "Clear existing tags"
 msgstr "Ryd eksisterende tags før skrivning af nye mærker"
 
-#: ../picard/ui/ui_options_tags.py:87
-msgid "Don not write tags to files"
-msgstr ""
-
-#: ../picard/ui/ui_options_tags.py:88
-msgid "ID3"
-msgstr "ID3"
-
-#: ../picard/ui/ui_options_tags.py:89
-msgid "Write ID3v1 tags to the files"
-msgstr "Skriv ID3v1-mærker til filerne"
-
-#: ../picard/ui/ui_options_tags.py:90
-msgid "Write ID3v2 version 2.3 tags (2.4 is default)"
-msgstr "Skriv ID3v2 version 2.3-mærker (2.4 er standard)"
-
-#: ../picard/ui/ui_options_tags.py:91
-msgid "Text encoding to use while writing ID3v2 tags:"
-msgstr ""
-
-#: ../picard/ui/ui_options_tags.py:92
-msgid "ISO-8859-1"
-msgstr "ISO-8859-1"
-
-#: ../picard/ui/ui_options_tags.py:93
-msgid "UTF-16"
-msgstr "UTF-16"
-
-#: ../picard/ui/ui_options_tags.py:94
-msgid "UTF-8"
-msgstr "UTF-8"
-
-#: ../picard/ui/ui_options_tags.py:95
+#: ../picard/ui/ui_options_tags.py:100
 msgid "Remove ID3 tags from FLAC files"
 msgstr "Fjern ID3-tags fra FLAC-filer"
 
-#: ../picard/ui/ui_options_tags.py:96
-msgid "APE"
-msgstr "APE"
-
-#: ../picard/ui/ui_options_tags.py:97
+#: ../picard/ui/ui_options_tags.py:101
 msgid "Remove APEv2 tags from MP3 files"
 msgstr "Fjern APEv2-tags fra MP3-filer"
 
+#: ../picard/ui/ui_options_tags.py:102
+msgid "Tag compatibility"
+msgstr ""
+
+#: ../picard/ui/ui_options_tags.py:103
+#, fuzzy
+msgid "ID3v2 version"
+msgstr "Kun ID3v2.4"
+
+#: ../picard/ui/ui_options_tags.py:104
+msgid "2.4"
+msgstr ""
+
+#: ../picard/ui/ui_options_tags.py:105
+msgid "2.3"
+msgstr ""
+
+#: ../picard/ui/ui_options_tags.py:106
+#, fuzzy
+msgid "Also include ID3v1 tags in the files"
+msgstr "Skriv ID3v1-mærker til filerne"
+
+#: ../picard/ui/ui_options_tags.py:107
+msgid "ID3v2 text encoding"
+msgstr ""
+
+#: ../picard/ui/ui_options_tags.py:108
+msgid "UTF-8"
+msgstr "UTF-8"
+
+#: ../picard/ui/ui_options_tags.py:109
+msgid "UTF-16"
+msgstr "UTF-16"
+
+#: ../picard/ui/ui_options_tags.py:110
+msgid "ISO-8859-1"
+msgstr "ISO-8859-1"
+
+#: ../picard/ui/ui_passworddialog.py:78
+msgid "Authentication required"
+msgstr ""
+
+#: ../picard/ui/ui_passworddialog.py:81
+msgid "Save username and password"
+msgstr ""
+
 #: ../picard/ui/ui_tagsfromfilenames.py:56
 msgid "Convert File Names to Tags"
 msgstr "Omskriv filnavne til tags"
@@ -2143,6 +2183,10 @@ msgstr "Omskriv filnavne til tags"
 msgid "Replace underscores with spaces"
 msgstr "Erstat understreger med mellemrum"
 
+#: ../picard/ui/ui_tagsfromfilenames.py:58
+msgid "&Preview"
+msgstr "&Forhåndsvisning"
+
 #: ../picard/ui/options/about.py:29
 msgid "About"
 msgstr "Om"
@@ -2171,8 +2215,8 @@ msgstr "<br/>Oversat til dansk af %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"
@@ -2180,14 +2224,13 @@ msgid ""
 "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\"><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/P"
-"icardTagger</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
@@ -2220,257 +2263,266 @@ msgstr "Matchning"
 msgid "None"
 msgstr ""
 
-#: ../picard/ui/options/naming.py:33
-msgid "File Naming"
-msgstr "Filnavngivning"
+#: ../picard/ui/options/moving.py:33
+#, fuzzy
+msgid "Moving files"
+msgstr "Flyt filer"
 
-#: ../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."
-msgstr ""
-
-#: ../picard/ui/options/naming.py:95
-msgid "The multiple artist file naming format must not be empty."
-msgstr ""
-
-#: ../picard/ui/options/naming.py:97
+#: ../picard/ui/options/moving.py:65
 msgid "Error"
 msgstr ""
 
-#: ../picard/ui/options/naming.py:97
+#: ../picard/ui/options/moving.py:65
 msgid "The location to move files to must not be empty."
 msgstr ""
 
+#: ../picard/ui/options/ratings.py:29
+msgid "Ratings"
+msgstr ""
+
+#: ../picard/ui/options/tags.py:29
+msgid "Tags"
+msgstr "Tags"
+
+#: ../picard/ui/options/renaming.py:35
+#, fuzzy
+msgid "File naming"
+msgstr "Filnavngivning"
+
+#: ../picard/ui/options/renaming.py:123
+msgid "The file naming format must not be empty."
+msgstr ""
+
+#: ../picard/ui/options/renaming.py:133
+msgid "The multiple artist file naming format 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/ui/options/ratings.py:29
-msgid "Ratings"
-msgstr ""
+#: ../picard/ui/options/scripting.py:97
+msgid "Script Error"
+msgstr "Scriptfejl"
 
 #: ../picard/util/tags.py:24
 msgid "Date"
 msgstr "Dato"
 
 #: ../picard/util/tags.py:25
+#, fuzzy
+msgid "Original Release Date"
+msgstr "Oprindelig metadata"
+
+#: ../picard/util/tags.py:26
 msgid "Album Artist"
 msgstr "Albumkunstner"
 
-#: ../picard/util/tags.py:26
+#: ../picard/util/tags.py:27
 msgid "Track Number"
 msgstr "Skæringsnummer"
 
-#: ../picard/util/tags.py:27
+#: ../picard/util/tags.py:28
 msgid "Total Tracks"
 msgstr "Skæringer i alt"
 
-#: ../picard/util/tags.py:28
+#: ../picard/util/tags.py:29
 msgid "Disc Number"
 msgstr "Disknummer"
 
-#: ../picard/util/tags.py:29
+#: ../picard/util/tags.py:30
 msgid "Total Discs"
 msgstr "Diske i alt"
 
-#: ../picard/util/tags.py:30
+#: ../picard/util/tags.py:31
 msgid "Album Artist Sort Order"
 msgstr "Sorteringsrækkefølge for albumkunstnere"
 
-#: ../picard/util/tags.py:31
+#: ../picard/util/tags.py:32
 msgid "Artist Sort Order"
 msgstr "Sorteringsrækkefølge for kunstnere"
 
-#: ../picard/util/tags.py:32
+#: ../picard/util/tags.py:33
 msgid "Title Sort Order"
 msgstr "Sorteringsrækkefølge for titler"
 
-#: ../picard/util/tags.py:33
+#: ../picard/util/tags.py:34
 msgid "Album Sort Order"
 msgstr "Sorteringsrækkefølge for album"
 
-#: ../picard/util/tags.py:34
+#: ../picard/util/tags.py:35
 msgid "ASIN"
 msgstr "ASIN"
 
-#: ../picard/util/tags.py:35
+#: ../picard/util/tags.py:36
 msgid "Grouping"
 msgstr "Gruppering"
 
-#: ../picard/util/tags.py:37
+#: ../picard/util/tags.py:38
 msgid "ISRC"
 msgstr "ISRC"
 
-#: ../picard/util/tags.py:38
+#: ../picard/util/tags.py:39
 msgid "Mood"
 msgstr "Stemning"
 
-#: ../picard/util/tags.py:39
+#: ../picard/util/tags.py:40
 msgid "BPM"
 msgstr "BPM"
 
-#: ../picard/util/tags.py:40
+#: ../picard/util/tags.py:41
 msgid "Copyright"
 msgstr "Ophavsret"
 
-#: ../picard/util/tags.py:41
+#: ../picard/util/tags.py:42
 msgid "Composer"
 msgstr "Komponist"
 
-#: ../picard/util/tags.py:42
+#: ../picard/util/tags.py:43
 msgid "Conductor"
 msgstr "Dirigent"
 
-#: ../picard/util/tags.py:43
+#: ../picard/util/tags.py:44
 msgid "Lyricist"
 msgstr "Tekstforfatter"
 
-#: ../picard/util/tags.py:44
+#: ../picard/util/tags.py:45
 msgid "Arranger"
 msgstr "Arrangør"
 
-#: ../picard/util/tags.py:45
+#: ../picard/util/tags.py:46
 msgid "Producer"
 msgstr "Producer"
 
-#: ../picard/util/tags.py:46
+#: ../picard/util/tags.py:47
 msgid "Engineer"
 msgstr "Tekniker"
 
-#: ../picard/util/tags.py:47
+#: ../picard/util/tags.py:48
 msgid "Subtitle"
 msgstr "Undertitel"
 
-#: ../picard/util/tags.py:48
+#: ../picard/util/tags.py:49
 msgid "Disc Subtitle"
 msgstr "Diskundertitel"
 
-#: ../picard/util/tags.py:49
+#: ../picard/util/tags.py:50
 msgid "Remixer"
 msgstr "Remixer"
 
-#: ../picard/util/tags.py:50
+#: ../picard/util/tags.py:51
 msgid "MusicBrainz Track Id"
 msgstr "MusicBrainz skærings-id"
 
-#: ../picard/util/tags.py:51
+#: ../picard/util/tags.py:52
 msgid "MusicBrainz Release Id"
 msgstr "MusicBrainz udgivelses-id"
 
-#: ../picard/util/tags.py:52
+#: ../picard/util/tags.py:53
 msgid "MusicBrainz Artist Id"
 msgstr "MusicBrainz kunstner-id"
 
-#: ../picard/util/tags.py:53
+#: ../picard/util/tags.py:54
 msgid "MusicBrainz Release Artist Id"
 msgstr "MusicBrainz udgivelseskunster-id"
 
-#: ../picard/util/tags.py:54
+#: ../picard/util/tags.py:55
 msgid "MusicBrainz TRM Id"
 msgstr "MusicBrainz TRM-id"
 
-#: ../picard/util/tags.py:55
+#: ../picard/util/tags.py:56
 msgid "MusicBrainz Disc Id"
 msgstr ""
 
-#: ../picard/util/tags.py:56
+#: ../picard/util/tags.py:57
 msgid "MusicBrainz Sort Name"
 msgstr ""
 
-#: ../picard/util/tags.py:57
+#: ../picard/util/tags.py:58
 msgid "MusicIP PUID"
 msgstr "MusicIP PUID"
 
-#: ../picard/util/tags.py:58
+#: ../picard/util/tags.py:59
 msgid "MusicIP Fingerprint"
 msgstr "MusicIP-fingeraftryk"
 
-#: ../picard/util/tags.py:59
+#: ../picard/util/tags.py:60
 msgid "Disc Id"
 msgstr ""
 
-#: ../picard/util/tags.py:60
+#: ../picard/util/tags.py:61
 msgid "Website"
 msgstr "Websted"
 
-#: ../picard/util/tags.py:61
+#: ../picard/util/tags.py:62
 msgid "Compilation"
 msgstr "Opsamling"
 
-#: ../picard/util/tags.py:62
+#: ../picard/util/tags.py:63
 msgid "Comment"
 msgstr "Kommentar"
 
-#: ../picard/util/tags.py:63
+#: ../picard/util/tags.py:64
 msgid "Genre"
 msgstr "Genre"
 
-#: ../picard/util/tags.py:64
+#: ../picard/util/tags.py:65
 msgid "Encoded By"
 msgstr "Kodet af"
 
-#: ../picard/util/tags.py:65
+#: ../picard/util/tags.py:66
 msgid "Performer"
 msgstr "Optræder"
 
-#: ../picard/util/tags.py:66
+#: ../picard/util/tags.py:67
 msgid "Release Type"
 msgstr "Udgivelsestype"
 
-#: ../picard/util/tags.py:67
+#: ../picard/util/tags.py:68
 msgid "Release Status"
 msgstr "Udgivelsesstatus"
 
-#: ../picard/util/tags.py:68
+#: ../picard/util/tags.py:69
 msgid "Release Country"
 msgstr "Udgivelsesland"
 
-#: ../picard/util/tags.py:69
+#: ../picard/util/tags.py:70
 msgid "Record Label"
 msgstr "Pladeselskab"
 
-#: ../picard/util/tags.py:70
+#: ../picard/util/tags.py:71
 msgid "Barcode"
 msgstr "Stregkode"
 
-#: ../picard/util/tags.py:71
+#: ../picard/util/tags.py:72
 msgid "Catalog Number"
 msgstr "Katalognummer"
 
-#: ../picard/util/tags.py:72
+#: ../picard/util/tags.py:73
 msgid "Format"
 msgstr ""
 
-#: ../picard/util/tags.py:73
+#: ../picard/util/tags.py:74
 msgid "DJ-Mixer"
 msgstr "DJ-Mixer"
 
-#: ../picard/util/tags.py:74
+#: ../picard/util/tags.py:75
 msgid "Media"
 msgstr "Medie"
 
-#: ../picard/util/tags.py:75
+#: ../picard/util/tags.py:76
 msgid "Lyrics"
 msgstr "Sangtekst"
 
-#: ../picard/util/tags.py:76
+#: ../picard/util/tags.py:77
 msgid "Mixer"
 msgstr "Mixer"
 
-#: ../picard/util/tags.py:77
+#: ../picard/util/tags.py:78
 msgid "Language"
 msgstr "Sprog"
 
-#: ../picard/util/tags.py:78
+#: ../picard/util/tags.py:79
 msgid "Script"
 msgstr ""
 
@@ -2489,29 +2541,48 @@ msgstr ""
 "\n"
 "%s"
 
-#, python-format
+#~ msgid "Multiple artist file naming format:"
+#~ msgstr "Format for filnavngivning ved flere kunstnere:"
+
+#~ msgid "File naming format:"
+#~ msgstr "Filnavngivningsformat:"
+
+#~ msgid "File name:"
+#~ msgstr "Filnavn:"
+
+#~ msgid "Multiple artist file name:"
+#~ msgstr "Filnavn ved flere kunstnere:"
+
+#~ msgid "Common"
+#~ msgstr "Generelt"
+
+#~ msgid "ID3"
+#~ msgstr "ID3"
+
+#~ msgid "Write ID3v2 version 2.3 tags (2.4 is default)"
+#~ msgstr "Skriv ID3v2 version 2.3-mærker (2.4 er standard)"
+
+#~ msgid "APE"
+#~ msgstr "APE"
+
 #~ msgid "[couldn't load album %s]"
 #~ msgstr "[kunne ikke hente albummet %s]"
 
 #~ msgid "New Version"
 #~ msgstr "Ny version"
 
-#, python-format
 #~ msgid ""
-#~ "New version of Picard is available (%s). Would you like to download it now?"
+#~ "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?"
 
-#, python-format
 #~ msgid "Couldn't find PUID for file %s"
 #~ msgstr "Kunne ikke finde PUID for filen %s"
 
 #~ msgid "Automatically analyze all new files"
 #~ msgstr "Analysér automatisk alle nye filer"
 
-#~ msgid "Don't write tags to files"
-#~ msgstr "Skriv ikke tags til filer"
-
 #~ msgid "Delete"
 #~ msgstr "Slet"
 
@@ -2596,9 +2667,6 @@ msgstr ""
 #~ msgid "Proxy port"
 #~ msgstr "Mellemværtsport"
 
-#~ msgid "ID3v2.4 only"
-#~ msgstr "Kun ID3v2.4"
-
 #~ msgid "Save track/album"
 #~ msgstr "Gem skæring/album"
 
@@ -2642,7 +2710,8 @@ msgstr ""
 #~ msgstr "Donér venligst til MusicBrainz!"
 
 #~ msgid ""
-#~ "The destination directory %s does not exist. Please pick a valid directory."
+#~ "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"
@@ -2658,7 +2727,8 @@ msgstr ""
 #~ 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."
+#~ "Bemærk: Denne indstilling vil få effekt efter du har genstartet "
+#~ "programmet."
 
 #~ msgid "Artist translation"
 #~ msgstr "Kunstneroversættelse"
diff --git a/po/de.po b/po/de.po
index 45da0004f..714a9de0c 100644
--- a/po/de.po
+++ b/po/de.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: picard\n"
 "Report-Msgid-Bugs-To: http://bugs.musicbrainz.org/\n"
-"POT-Creation-Date: 2009-02-24 18:58+0100\n"
+"POT-Creation-Date: 2009-04-06 22:50+0200\n"
 "PO-Revision-Date: 2009-04-05 22:06+0000\n"
 "Last-Translator: Philipp Wolfer <Unknown>\n"
 "Language-Team: German <de@li.org>\n"
@@ -19,16 +19,16 @@ msgstr ""
 "X-Generator: Launchpad (build Unknown)\n"
 "Generated-By: pygettext.py 1.5\n"
 
-#: ../picard/album.py:108 ../picard/cluster.py:248
+#: ../picard/album.py:109 ../picard/cluster.py:248
 msgid "Unmatched Files"
 msgstr "nicht zugeordnete Dateien"
 
-#: ../picard/album.py:281
+#: ../picard/album.py:287
 #, python-format
 msgid "[could not load album %s]"
 msgstr "[konnte Album %s nicht laden]"
 
-#: ../picard/album.py:317
+#: ../picard/album.py:320
 msgid "[loading album information]"
 msgstr "[lade Albuminformationen]"
 
@@ -588,7 +588,8 @@ msgid "Namibia"
 msgstr "Namibia"
 
 #: ../picard/const.py:182
-msgid "Vanuat"
+#, fuzzy
+msgid "Vanuatu"
 msgstr "Vanuatu"
 
 #: ../picard/const.py:183
@@ -1032,223 +1033,239 @@ msgid "Congo, The Democratic Republic of the"
 msgstr "Demokratische Republik Kongo"
 
 #: ../picard/const.py:293
-msgid "Serbia and Montenegro"
+#, fuzzy
+msgid "Serbia and Montenegro (historical, 2003-2006)"
 msgstr "Serbien und Montenegro"
 
 #: ../picard/const.py:294
+#, fuzzy
+msgid "Serbia"
+msgstr "Aserbaidschan"
+
+#: ../picard/const.py:295
+#, fuzzy
+msgid "Montenegro"
+msgstr "Serbien und Montenegro"
+
+#: ../picard/const.py:296
 msgid "Croatia"
 msgstr "Kroatien"
 
-#: ../picard/const.py:295
+#: ../picard/const.py:297
 msgid "Korea (North), Democratic People's Republic of"
 msgstr "Korea (Nord), Demokratische Volksrepublik"
 
-#: ../picard/const.py:296
+#: ../picard/const.py:298
 msgid "Korea (South), Republic of"
 msgstr "Korea (Süd), Republik"
 
-#: ../picard/const.py:297
+#: ../picard/const.py:299
 msgid "Slovakia"
 msgstr "Slowakei"
 
-#: ../picard/const.py:298
+#: ../picard/const.py:300
 msgid "Soviet Union (historical, 1922-1991)"
 msgstr "Sowjetunion (historisch, 1922-1991)"
 
-#: ../picard/const.py:299
+#: ../picard/const.py:301
 msgid "East Timor"
 msgstr "Osttimor"
 
-#: ../picard/const.py:300
+#: ../picard/const.py:302
 msgid "Czechoslovakia (historical, 1918-1992)"
 msgstr "Tschechoslowakei (historisch, 1918-1992)"
 
-#: ../picard/const.py:301
+#: ../picard/const.py:303
 msgid "Europe"
 msgstr "Europa"
 
-#: ../picard/const.py:302
+#: ../picard/const.py:304
 msgid "East Germany (historical, 1949-1990)"
 msgstr "Deutsche Demokratische Republik (historisch, 1949-1990)"
 
-#: ../picard/const.py:303
+#: ../picard/const.py:305
 msgid "[Unknown Country]"
 msgstr "[Unbekanntes Land]"
 
-#: ../picard/const.py:304
+#: ../picard/const.py:306
 msgid "[Worldwide]"
 msgstr "[Weltweit]"
 
-#: ../picard/const.py:305
+#: ../picard/const.py:307
 msgid "Yugoslavia (historical, 1918-1992)"
 msgstr "Jugoslawien (historisch, 1918-1992)"
 
-#: ../picard/const.py:310
+#: ../picard/const.py:312
+msgid "Afrikaans"
+msgstr ""
+
+#: ../picard/const.py:313
+msgid "Arabic"
+msgstr ""
+
+#: ../picard/const.py:314
 msgid "Catalan"
 msgstr "Katalanisch"
 
-#: ../picard/const.py:311
+#: ../picard/const.py:315
 msgid "Czech"
 msgstr "Tschechisch"
 
-#: ../picard/const.py:312
+#: ../picard/const.py:316
 msgid "Welsh"
 msgstr "Walisisch"
 
-#: ../picard/const.py:313
+#: ../picard/const.py:317
 msgid "Danish"
 msgstr "Dänisch"
 
-#: ../picard/const.py:314
+#: ../picard/const.py:318
 msgid "German"
 msgstr "Deutsch"
 
-#: ../picard/const.py:315
+#: ../picard/const.py:319
 msgid "English"
 msgstr "Englisch"
 
-#: ../picard/const.py:316
+#: ../picard/const.py:320
 msgid "English (Canada)"
 msgstr "Englisch (Kanada)"
 
-#: ../picard/const.py:317
+#: ../picard/const.py:321
 msgid "English (UK)"
 msgstr "Englisch (UK)"
 
-#: ../picard/const.py:318
+#: ../picard/const.py:322
 msgid "Spanish"
 msgstr "Spanisch"
 
-#: ../picard/const.py:319
+#: ../picard/const.py:323
 msgid "Persian"
 msgstr "Persisch"
 
-#: ../picard/const.py:320
+#: ../picard/const.py:324
 msgid "Finnish"
 msgstr "Finnisch"
 
-#: ../picard/const.py:321
+#: ../picard/const.py:325
 msgid "French"
 msgstr "Französisch"
 
-#: ../picard/const.py:322
+#: ../picard/const.py:326
 msgid "Frisian"
 msgstr "Friesisch"
 
-#: ../picard/const.py:323
+#: ../picard/const.py:327
 msgid "Hebrew"
 msgstr "Hebräisch"
 
-#: ../picard/const.py:324
+#: ../picard/const.py:328
+#, fuzzy
+msgid "Hindi"
+msgstr "Haiti"
+
+#: ../picard/const.py:329
 msgid "Hungarian"
 msgstr "Ungarisch"
 
-#: ../picard/const.py:325
+#: ../picard/const.py:330
 msgid "Islandic"
 msgstr "Isländisch"
 
-#: ../picard/const.py:326
+#: ../picard/const.py:331
 msgid "Italian"
 msgstr "Italienisch"
 
-#: ../picard/const.py:327
+#: ../picard/const.py:332
 msgid "Kannada"
 msgstr "Kanaresisch"
 
-#: ../picard/const.py:328
+#: ../picard/const.py:333
 msgid "Korean"
 msgstr "Koreanisch"
 
-#: ../picard/const.py:329
+#: ../picard/const.py:334
 msgid "Lithuanian"
 msgstr "Litauisch"
 
-#: ../picard/const.py:330
+#: ../picard/const.py:335
 msgid "Norwegian Bokmal"
 msgstr "Norwegisches Bokmål"
 
-#: ../picard/const.py:331
+#: ../picard/const.py:336
 msgid "Dutch"
 msgstr "Niederländisch"
 
-#: ../picard/const.py:332
+#: ../picard/const.py:337
 msgid "Polish"
 msgstr "Polnisch"
 
-#: ../picard/const.py:333
+#: ../picard/const.py:338
 msgid "Portuguese"
 msgstr "Portugiesisch"
 
-#: ../picard/const.py:334
+#: ../picard/const.py:339
 msgid "Brazilian Portuguese"
 msgstr "brasilianisches Portugiesisch"
 
-#: ../picard/const.py:335
+#: ../picard/const.py:340
 msgid "Romanian"
 msgstr "Rumänisch"
 
-#: ../picard/const.py:336
+#: ../picard/const.py:341
 msgid "Russian"
 msgstr "Russisch"
 
-#: ../picard/const.py:337
+#: ../picard/const.py:342
 msgid "Scots"
 msgstr "Scots"
 
-#: ../picard/const.py:338
+#: ../picard/const.py:343
 msgid "Slovak"
 msgstr "Slowakisch"
 
-#: ../picard/const.py:339
+#: ../picard/const.py:344
 msgid "Slovenian"
 msgstr "Slowakisch"
 
-#: ../picard/const.py:340
+#: ../picard/const.py:345
 msgid "Swedish"
 msgstr "Schwedisch"
 
-#: ../picard/const.py:341
+#: ../picard/const.py:346
+#, fuzzy
+msgid "Turkish"
+msgstr "Turkmenistan"
+
+#: ../picard/const.py:347
 msgid "Chinese"
 msgstr "Chinesisch"
 
-#: ../picard/file.py:487
+#: ../picard/file.py:494
 #, python-format
 msgid "No matching tracks for file %s"
 msgstr "Keine passenden Titel für Datei %s"
 
-#: ../picard/file.py:504
+#: ../picard/file.py:511
 #, python-format
 msgid "No matching tracks above the threshold for file %s"
 msgstr "Keine passenden Titel oberhalb der Schwellenwerte für Datei %s"
 
-#: ../picard/file.py:507
+#: ../picard/file.py:514
 #, python-format
 msgid "File %s identified!"
 msgstr "Datei %s identifiziert!"
 
-#: ../picard/file.py:518
+#: ../picard/file.py:525
 #, python-format
 msgid "Looking up the PUID for file %s..."
 msgstr "Frage PUID für Datei %s ab..."
 
-#: ../picard/file.py:523
+#: ../picard/file.py:530
 #, 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)"
@@ -1261,11 +1278,24 @@ msgstr "PLS-Wiedergabeliste (*.pls)"
 msgid "XSPF Playlist (*.xspf)"
 msgstr "XSPF-Wiedergabeliste (*.xspf)"
 
-#: ../picard/tagger.py:476
+#: ../picard/puidmanager.py:62
+msgid "Submitting PUIDs..."
+msgstr "Übertrage PUIDs …"
+
+#: ../picard/puidmanager.py:68
+#, python-format
+msgid "PUIDs submission failed: %s"
+msgstr "Übertragung der PUIDs fehlgeschlagen: %s"
+
+#: ../picard/puidmanager.py:70
+msgid "PUIDs successfully submitted!"
+msgstr "PUIDs erfolgreich versandt."
+
+#: ../picard/tagger.py:477
 msgid "CD Lookup Error"
 msgstr "CD-Lookup-Fehler"
 
-#: ../picard/tagger.py:477
+#: ../picard/tagger.py:478
 #, python-format
 msgid ""
 "Error while reading CD:\n"
@@ -1275,7 +1305,7 @@ msgstr ""
 "Fehler beim Lesen der CD:\n"
 "%s"
 
-#: ../picard/tagger.py:503
+#: ../picard/tagger.py:504
 #, python-format
 msgid "Could not find PUID for file %s"
 msgstr "Konnnte PUID für Datei %s nicht laden."
@@ -1328,15 +1358,28 @@ msgstr "&Versteckte Dateien anzeigen"
 msgid "Length"
 msgstr "Dauer"
 
-#: ../picard/ui/itemviews.py:327
+#: ../picard/ui/itemviews.py:289
+msgid "&Expand all"
+msgstr ""
+
+#: ../picard/ui/itemviews.py:291
+msgid "&Collapse all"
+msgstr ""
+
+#: ../picard/ui/itemviews.py:332
 msgid "&Releases"
 msgstr "&Veröffentlichungen"
 
-#: ../picard/ui/itemviews.py:353
+#: ../picard/ui/itemviews.py:349
+#, fuzzy
+msgid "No release event"
+msgstr "Monat der Veröffentlichung des Albums"
+
+#: ../picard/ui/itemviews.py:359
 msgid "&Plugins"
 msgstr "&Plugins"
 
-#: ../picard/ui/itemviews.py:523
+#: ../picard/ui/itemviews.py:533
 msgid "Clusters"
 msgstr "Gruppen"
 
@@ -1344,95 +1387,6 @@ msgstr "Gruppen"
 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:66 ../picard/ui/ui_options_plugins.py:62
-msgid "Details"
-msgstr "Details"
-
-#: ../picard/ui/tageditor.py:71 ../picard/ui/tageditor.py:264
-#, python-format
-msgid "%d file"
-msgid_plural "%d files"
-msgstr[0] "%d Datei"
-msgstr[1] "%d Dateien"
-
-#: ../picard/ui/tageditor.py:131
-#, 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:134
-#, 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:233
-msgid "Filename:"
-msgstr "Dateiname:"
-
-#: ../picard/ui/tageditor.py:235
-msgid "Format:"
-msgstr "Format:"
-
-#: ../picard/ui/tageditor.py:244
-msgid "Size:"
-msgstr "Dateigröße:"
-
-#: ../picard/ui/tageditor.py:248 ../picard/ui/ui_metadata.py:127
-msgid "Length:"
-msgstr "Dauer:"
-
-#: ../picard/ui/tageditor.py:250
-msgid "Bitrate:"
-msgstr "Bitrate:"
-
-#: ../picard/ui/tageditor.py:252
-msgid "Sample rate:"
-msgstr "Abtastrate:"
-
-#: ../picard/ui/tageditor.py:254
-msgid "Bits per sample:"
-msgstr "Bits pro Sample:"
-
-#: ../picard/ui/tageditor.py:257
-msgid "Mono"
-msgstr "Mono"
-
-#: ../picard/ui/tageditor.py:258
-msgid "Stereo"
-msgstr "Stereo"
-
-#: ../picard/ui/tageditor.py:260
-msgid "Channels:"
-msgstr "Kanäle:"
-
-#: ../picard/ui/tagsfromfilenames.py:52 ../picard/ui/tagsfromfilenames.py:96
-msgid "File Name"
-msgstr "Dateiname"
-
 #: ../picard/ui/mainwindow.py:64
 msgid "MusicBrainz Picard"
 msgstr "MusicBrainz Picard"
@@ -1669,6 +1623,10 @@ msgstr "&Suchleiste"
 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"
@@ -1688,6 +1646,22 @@ msgstr "Wiedergabeliste %s gespeichert."
 msgid " (Error: %s)"
 msgstr " (Fehler: %s)"
 
+#: ../picard/ui/puidsubmit.py:31 ../picard/ui/options/plugins.py:85
+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/passworddialog.py:38
 #, python-format
 msgid ""
@@ -1696,6 +1670,75 @@ msgstr ""
 "Der Server %s erfordert eine Authentifizierung. Bitte geben Sie ihren "
 "Benutzernamen und ihr Passwort ein."
 
+#: ../picard/ui/tageditor.py:66 ../picard/ui/ui_options_plugins.py:62
+msgid "Details"
+msgstr "Details"
+
+#: ../picard/ui/tageditor.py:71 ../picard/ui/tageditor.py:264
+#, python-format
+msgid "%d file"
+msgid_plural "%d files"
+msgstr[0] "%d Datei"
+msgstr[1] "%d Dateien"
+
+#: ../picard/ui/tageditor.py:131
+#, 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:134
+#, 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:233
+msgid "Filename:"
+msgstr "Dateiname:"
+
+#: ../picard/ui/tageditor.py:235
+msgid "Format:"
+msgstr "Format:"
+
+#: ../picard/ui/tageditor.py:244
+msgid "Size:"
+msgstr "Dateigröße:"
+
+#: ../picard/ui/tageditor.py:248 ../picard/ui/ui_metadata.py:127
+msgid "Length:"
+msgstr "Dauer:"
+
+#: ../picard/ui/tageditor.py:250
+msgid "Bitrate:"
+msgstr "Bitrate:"
+
+#: ../picard/ui/tageditor.py:252
+msgid "Sample rate:"
+msgstr "Abtastrate:"
+
+#: ../picard/ui/tageditor.py:254
+msgid "Bits per sample:"
+msgstr "Bits pro Sample:"
+
+#: ../picard/ui/tageditor.py:257
+msgid "Mono"
+msgstr "Mono"
+
+#: ../picard/ui/tageditor.py:258
+msgid "Stereo"
+msgstr "Stereo"
+
+#: ../picard/ui/tageditor.py:260
+msgid "Channels:"
+msgstr "Kanäle:"
+
+#: ../picard/ui/tagsfromfilenames.py:54 ../picard/ui/tagsfromfilenames.py:99
+msgid "File Name"
+msgstr "Dateiname"
+
 #: ../picard/ui/ui_cdlookup.py:60 ../picard/ui/ui_options_cdlookup.py:47
 #: ../picard/ui/ui_options_cdlookup_select.py:48
 #: ../picard/ui/options/cdlookup.py:36
@@ -1718,24 +1761,6 @@ msgstr "    Manuell abfragen    "
 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_proxy.py:83
-#: ../picard/ui/ui_options_general.py:113
-msgid "Username:"
-msgstr "Benutzername:"
-
-#: ../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/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"
@@ -1772,6 +1797,10 @@ msgstr "Album:"
 msgid "Options"
 msgstr "Einstellungen"
 
+#: ../picard/ui/ui_puidsubmit.py:52
+msgid "Submit PUIDs"
+msgstr "PUIDs senden"
+
 #: ../picard/ui/ui_options_cdlookup.py:48
 msgid "CD-ROM device to use for lookups:"
 msgstr "Für Lookups zu benutzendes CD-Laufwerk:"
@@ -1796,6 +1825,23 @@ msgstr "Cover-Bilder als separate Dateien speichern"
 msgid "Overwrite the file if it already exists"
 msgstr "Überschreibe existierende Dateien"
 
+#: ../picard/ui/ui_options_moving.py:53
+msgid "Move additional files:"
+msgstr "Zusätzliche Dateien verschieben:"
+
+#: ../picard/ui/ui_options_moving.py:54
+msgid "Browse..."
+msgstr "Durchsuchen …"
+
+#: ../picard/ui/ui_options_moving.py:55
+msgid "Delete empty directories"
+msgstr "Leere Verzeichnisse löschen"
+
+#: ../picard/ui/ui_options_moving.py:56
+#, fuzzy
+msgid "Move files to this directory when saving:"
+msgstr "Getaggte Dateien in dieses Verzeichnis verschieben:"
+
 #: ../picard/ui/util.py:31
 msgid "&Ok"
 msgstr "&OK"
@@ -1804,44 +1850,40 @@ msgstr "&OK"
 msgid "&Cancel"
 msgstr "&Abbrechen"
 
-#: ../picard/ui/ui_puidsubmit.py:52
-msgid "Submit PUIDs"
-msgstr "PUIDs senden"
-
-#: ../picard/ui/ui_tageditor.py:139 ../picard/ui/ui_options_plugins.py:59
-#: ../picard/ui/options/plugins.py:76
+#: ../picard/ui/ui_tageditor.py:128 ../picard/ui/ui_options_plugins.py:59
+#: ../picard/ui/options/plugins.py:81
 msgid "Name"
 msgstr "Name"
 
-#: ../picard/ui/ui_tageditor.py:140
+#: ../picard/ui/ui_tageditor.py:129
 msgid "Value"
 msgstr "Wert"
 
-#: ../picard/ui/ui_tageditor.py:141
+#: ../picard/ui/ui_tageditor.py:130
 msgid "Rating:"
 msgstr "Bewertung:"
 
-#: ../picard/ui/ui_tageditor.py:142
+#: ../picard/ui/ui_tageditor.py:131
 msgid "&Add..."
 msgstr "&Hinzufügen …"
 
-#: ../picard/ui/ui_tageditor.py:143
+#: ../picard/ui/ui_tageditor.py:132
 msgid "&Edit..."
 msgstr "&Bearbeiten …"
 
-#: ../picard/ui/ui_tageditor.py:144
+#: ../picard/ui/ui_tageditor.py:133
 msgid "&Delete"
 msgstr "&Löschen"
 
-#: ../picard/ui/ui_tageditor.py:145
+#: ../picard/ui/ui_tageditor.py:134
 msgid "&Metadata"
 msgstr "Lokale &Metadaten"
 
-#: ../picard/ui/ui_tageditor.py:146
+#: ../picard/ui/ui_tageditor.py:135
 msgid "A&rtwork"
 msgstr "Cover-Bild"
 
-#: ../picard/ui/ui_tageditor.py:147
+#: ../picard/ui/ui_tageditor.py:136
 msgid "&Info"
 msgstr "&Info"
 
@@ -1886,6 +1928,40 @@ msgstr " / "
 msgid ", "
 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:72
+msgid "Port:"
+msgstr "Port:"
+
+#: ../picard/ui/ui_options_general.py:110 ../picard/ui/ui_options_proxy.py:73
+msgid "Server address:"
+msgstr "Serveradresse:"
+
+#: ../picard/ui/ui_options_general.py:111
+msgid "Account Information"
+msgstr "Anmeldedaten"
+
+#: ../picard/ui/ui_options_general.py:112 ../picard/ui/ui_options_proxy.py:70
+#: ../picard/ui/ui_passworddialog.py:80
+msgid "Password:"
+msgstr "Passwort:"
+
+#: ../picard/ui/ui_options_general.py:113 ../picard/ui/ui_options_proxy.py:71
+#: ../picard/ui/ui_passworddialog.py:79
+msgid "Username:"
+msgstr "Benutzername:"
+
+#: ../picard/ui/ui_options_general.py:114 ../picard/ui/options/general.py:29
+msgid "General"
+msgstr "Allgemein"
+
+#: ../picard/ui/ui_options_general.py:115
+msgid "Automatically scan all new files"
+msgstr "Analysiere alle neuen Dateien automatisch"
+
 #: ../picard/ui/ui_options_interface.py:50
 msgid "Miscellaneous"
 msgstr "Verschiedenes"
@@ -1906,118 +1982,6 @@ msgstr "Erweiterte Syntax für Suchanfragen verwenden"
 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_options_naming.py:180
-#: ../picard/ui/ui_tagsfromfilenames.py:58
-msgid "&Preview"
-msgstr "&Vorschau"
-
-#: ../picard/ui/ui_options_proxy.py:81 ../picard/ui/options/proxy.py:28
-msgid "Web Proxy"
-msgstr "Web-Proxy"
-
-#: ../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 "Serveradresse:"
-
-#: ../picard/ui/ui_options_ratings.py:45
-msgid "Enable track ratings"
-msgstr "Titelbewertungen aktivieren"
-
-#: ../picard/ui/ui_options_ratings.py:46
-msgid ""
-"Picard saves the ratings together with an e-mail address identifying the "
-"user who did the rating. That way different ratings for different users can "
-"be stored in the files. Please sepcify the e-mail you want to use to save "
-"your ratings."
-msgstr ""
-"Picard speichert die Bewertungen für einzelne Titel zusammen mit der E-Mail-"
-"Adresse des Benutzers, der die Bewertung vorgenommen hat. Auf diese Weise "
-"können für einen Titel die Bewertungen verschiedener Benutzer gespeichert "
-"werden. Bitte geben Sie die E-Mail-Adresse an, für die Sie Ihre Bewertungen "
-"speichern wollen."
-
-#: ../picard/ui/ui_options_ratings.py:47
-msgid "E-mail:"
-msgstr "E-Mail:"
-
-#: ../picard/ui/ui_options_general.py:108
-msgid "MusicBrainz Server"
-msgstr "MusicBrainz-Server"
-
-#: ../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"
-
-#: ../picard/ui/ui_options_general.py:115
-msgid "Automatically scan all new files"
-msgstr "Analysiere alle neuen Dateien automatisch"
-
 #: ../picard/ui/ui_options_matching.py:105
 msgid "Thresholds"
 msgstr "Schwellenwerte"
@@ -2074,74 +2038,157 @@ msgstr "Diverse Interpreten:"
 msgid "Non-album tracks:"
 msgstr "Titel ohne Album:"
 
-#: ../picard/ui/ui_options_plugins.py:58 ../picard/ui/options/plugins.py:30
+#: ../picard/ui/ui_options_metadata.py:109
+#: ../picard/ui/ui_options_metadata.py:110
+#: ../picard/ui/ui_options_renaming.py:155
+#: ../picard/ui/ui_options_renaming.py:158
+msgid "Default"
+msgstr "Standard"
+
+#: ../picard/ui/ui_options_plugins.py:58 ../picard/ui/options/plugins.py:34
 msgid "Plugins"
 msgstr "Plugins"
 
-#: ../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:84
 msgid "Author"
 msgstr "Autor"
 
-#: ../picard/ui/ui_options_plugins.py:61 ../picard/util/tags.py:36
+#: ../picard/ui/ui_options_plugins.py:61 ../picard/util/tags.py:37
 msgid "Version"
 msgstr "Version"
 
-#: ../picard/ui/ui_options_script.py:52
+#: ../picard/ui/ui_options_proxy.py:69 ../picard/ui/options/proxy.py:28
+msgid "Web Proxy"
+msgstr "Web-Proxy"
+
+#: ../picard/ui/ui_options_ratings.py:45
+msgid "Enable track ratings"
+msgstr "Titelbewertungen aktivieren"
+
+#: ../picard/ui/ui_options_ratings.py:46
+msgid ""
+"Picard saves the ratings together with an e-mail address identifying the "
+"user who did the rating. That way different ratings for different users can "
+"be stored in the files. Please sepcify the e-mail you want to use to save "
+"your ratings."
+msgstr ""
+"Picard speichert die Bewertungen für einzelne Titel zusammen mit der E-Mail-"
+"Adresse des Benutzers, der die Bewertung vorgenommen hat. Auf diese Weise "
+"können für einen Titel die Bewertungen verschiedener Benutzer gespeichert "
+"werden. Bitte geben Sie die E-Mail-Adresse an, für die Sie Ihre Bewertungen "
+"speichern wollen."
+
+#: ../picard/ui/ui_options_ratings.py:47
+msgid "E-mail:"
+msgstr "E-Mail:"
+
+#: ../picard/ui/ui_options_renaming.py:145
+#, fuzzy
+msgid "Form"
+msgstr "Format"
+
+#: ../picard/ui/ui_options_renaming.py:146
+#, fuzzy
+msgid "Rename files when saving"
+msgstr "Dateien beim Schreiben der Tags umbenennen"
+
+#: ../picard/ui/ui_options_renaming.py:147
+msgid "Replace non-ASCII characters"
+msgstr "Nicht-ASCII-Zeichen ersetzen"
+
+#: ../picard/ui/ui_options_renaming.py:148
+msgid "Replace Windows-incompatible characters"
+msgstr "Mit Windows inkompatible Zeichen ersetzen"
+
+#: ../picard/ui/ui_options_renaming.py:149
+msgid "Name files like this"
+msgstr ""
+
+#: ../picard/ui/ui_options_renaming.py:156
+msgid "Name multiple artist albums differently"
+msgstr ""
+
+#: ../picard/ui/ui_options_renaming.py:157
+msgid "Copy from above"
+msgstr ""
+
+#: ../picard/ui/ui_options_renaming.py:159
+#, fuzzy
+msgid "Examples"
+msgstr "Beispiel"
+
+#: ../picard/ui/ui_options_script.py:43
 msgid "Tagger Script"
 msgstr "Tagger-Skript"
 
-#: ../picard/ui/ui_options_tags.py:85
-msgid "Common"
-msgstr "Allgemein"
-
-#: ../picard/ui/ui_options_tags.py:86
-msgid "Clear existing tags before writing new tags"
-msgstr "Lösche existierende Tags vor dem Schreiben neuer Tags"
-
-#: ../picard/ui/ui_options_tags.py:87
-msgid "Don not write tags to files"
+#: ../picard/ui/ui_options_tags.py:97
+#, fuzzy
+msgid "Do not write tags to files"
 msgstr "Tags nicht in Dateien schreiben"
 
-#: ../picard/ui/ui_options_tags.py:88
-msgid "ID3"
-msgstr "ID3"
+#: ../picard/ui/ui_options_tags.py:98
+msgid "Before tagging"
+msgstr ""
 
-#: ../picard/ui/ui_options_tags.py:89
-msgid "Write ID3v1 tags to the files"
-msgstr "Schreibe ID3v1-Tags in Dateien"
+#: ../picard/ui/ui_options_tags.py:99
+#, fuzzy
+msgid "Clear existing tags"
+msgstr "Lösche existierende Tags vor dem Schreiben neuer Tags"
 
-#: ../picard/ui/ui_options_tags.py:90
-msgid "Write ID3v2 version 2.3 tags (2.4 is default)"
-msgstr "Schreibe ID3v2-Tags in Version 2.3 (2.4 ist Standard)"
-
-#: ../picard/ui/ui_options_tags.py:91
-msgid "Text encoding to use while writing ID3v2 tags:"
-msgstr "Zum Schreiben der ID3v2-Tags zu benutzende Textkodierung"
-
-#: ../picard/ui/ui_options_tags.py:92
-msgid "ISO-8859-1"
-msgstr "ISO-8859-1"
-
-#: ../picard/ui/ui_options_tags.py:93
-msgid "UTF-16"
-msgstr "UTF-16"
-
-#: ../picard/ui/ui_options_tags.py:94
-msgid "UTF-8"
-msgstr "UTF-8"
-
-#: ../picard/ui/ui_options_tags.py:95
+#: ../picard/ui/ui_options_tags.py:100
 msgid "Remove ID3 tags from FLAC files"
 msgstr "ID3-Tags aus FLAC-Dateien entfernen"
 
-#: ../picard/ui/ui_options_tags.py:96
-msgid "APE"
-msgstr "APE"
-
-#: ../picard/ui/ui_options_tags.py:97
+#: ../picard/ui/ui_options_tags.py:101
 msgid "Remove APEv2 tags from MP3 files"
 msgstr "APEv2-Tags aus MP3-Dateien entfernen"
 
+#: ../picard/ui/ui_options_tags.py:102
+msgid "Tag compatibility"
+msgstr ""
+
+#: ../picard/ui/ui_options_tags.py:103
+#, fuzzy
+msgid "ID3v2 version"
+msgstr "Nur ID3v2.4"
+
+#: ../picard/ui/ui_options_tags.py:104
+msgid "2.4"
+msgstr ""
+
+#: ../picard/ui/ui_options_tags.py:105
+msgid "2.3"
+msgstr ""
+
+#: ../picard/ui/ui_options_tags.py:106
+#, fuzzy
+msgid "Also include ID3v1 tags in the files"
+msgstr "Schreibe ID3v1-Tags in Dateien"
+
+#: ../picard/ui/ui_options_tags.py:107
+msgid "ID3v2 text encoding"
+msgstr ""
+
+#: ../picard/ui/ui_options_tags.py:108
+msgid "UTF-8"
+msgstr "UTF-8"
+
+#: ../picard/ui/ui_options_tags.py:109
+msgid "UTF-16"
+msgstr "UTF-16"
+
+#: ../picard/ui/ui_options_tags.py:110
+msgid "ISO-8859-1"
+msgstr "ISO-8859-1"
+
+#: ../picard/ui/ui_passworddialog.py:78
+msgid "Authentication required"
+msgstr "Authentifizierung erforderlich"
+
+#: ../picard/ui/ui_passworddialog.py:81
+msgid "Save username and password"
+msgstr "Benutzername und Passwort speichern"
+
 #: ../picard/ui/ui_tagsfromfilenames.py:56
 msgid "Convert File Names to Tags"
 msgstr "Tags aus Dateinamen ermitteln"
@@ -2150,6 +2197,10 @@ msgstr "Tags aus Dateinamen ermitteln"
 msgid "Replace underscores with spaces"
 msgstr "Unterstriche durch Leerzeichen ersetzen"
 
+#: ../picard/ui/ui_tagsfromfilenames.py:58
+msgid "&Preview"
+msgstr "&Vorschau"
+
 #: ../picard/ui/options/about.py:29
 msgid "About"
 msgstr "Über"
@@ -2184,8 +2235,8 @@ msgstr "<br/>Ins Deutsche übersetzt von %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"
@@ -2193,33 +2244,31 @@ msgid ""
 "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\"><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/P"
-"icardTagger</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><br/>%(formats)s</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\"><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ý und "
-"andere%(translator-credits)s</small></p>\n"
-"<p align=\"center\"><a "
-"href=\"http://musicbrainz.org/doc/PicardTagger\">http://musicbrainz.org/doc/P"
-"icardTagger</a></p>\n"
+"<small>Copyright © 2004-2008 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"
 
 #: ../picard/ui/options/advanced.py:26
 msgid "Advanced"
@@ -2253,258 +2302,267 @@ msgstr "Abgleich"
 msgid "None"
 msgstr "Keines"
 
-#: ../picard/ui/options/naming.py:33
-msgid "File Naming"
-msgstr "Dateibenennung"
+#: ../picard/ui/options/moving.py:33
+#, fuzzy
+msgid "Moving files"
+msgstr "Dateien verschieben"
 
-#: ../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 "Das Format des Dateinamens darf nicht leer sein."
-
-#: ../picard/ui/options/naming.py:95
-msgid "The multiple artist file naming format must not be empty."
-msgstr ""
-"Das Format des Dateinamens für diverse Interpreten darf nicht leer sein."
-
-#: ../picard/ui/options/naming.py:97
+#: ../picard/ui/options/moving.py:65
 msgid "Error"
 msgstr "Fehler"
 
-#: ../picard/ui/options/naming.py:97
+#: ../picard/ui/options/moving.py:65
 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/ratings.py:29
+msgid "Ratings"
+msgstr "Bewertungen"
 
 #: ../picard/ui/options/tags.py:29
 msgid "Tags"
 msgstr "Tags"
 
-#: ../picard/ui/options/ratings.py:29
-msgid "Ratings"
-msgstr "Bewertungen"
+#: ../picard/ui/options/renaming.py:35
+#, fuzzy
+msgid "File naming"
+msgstr "Dateibenennung"
+
+#: ../picard/ui/options/renaming.py:123
+msgid "The file naming format must not be empty."
+msgstr "Das Format des Dateinamens darf nicht leer sein."
+
+#: ../picard/ui/options/renaming.py:133
+msgid "The multiple artist file naming format must not be empty."
+msgstr ""
+"Das Format des Dateinamens für diverse Interpreten darf nicht leer sein."
+
+#: ../picard/ui/options/scripting.py:63
+msgid "Scripting"
+msgstr "Skripting"
+
+#: ../picard/ui/options/scripting.py:97
+msgid "Script Error"
+msgstr "Skript-Fehler"
 
 #: ../picard/util/tags.py:24
 msgid "Date"
 msgstr "Datum"
 
 #: ../picard/util/tags.py:25
+#, fuzzy
+msgid "Original Release Date"
+msgstr "Original-Metadaten"
+
+#: ../picard/util/tags.py:26
 msgid "Album Artist"
 msgstr "Albeninterpret"
 
-#: ../picard/util/tags.py:26
+#: ../picard/util/tags.py:27
 msgid "Track Number"
 msgstr "Titelnummer"
 
-#: ../picard/util/tags.py:27
+#: ../picard/util/tags.py:28
 msgid "Total Tracks"
 msgstr "Anzahl Titel"
 
-#: ../picard/util/tags.py:28
+#: ../picard/util/tags.py:29
 msgid "Disc Number"
 msgstr "Tonträger-Nummer"
 
-#: ../picard/util/tags.py:29
+#: ../picard/util/tags.py:30
 msgid "Total Discs"
 msgstr "Anzahl Tonträger"
 
-#: ../picard/util/tags.py:30
+#: ../picard/util/tags.py:31
 msgid "Album Artist Sort Order"
 msgstr "Sortiername des Albuminterpreten"
 
-#: ../picard/util/tags.py:31
+#: ../picard/util/tags.py:32
 msgid "Artist Sort Order"
 msgstr "Sortiername des Interpreten"
 
-#: ../picard/util/tags.py:32
+#: ../picard/util/tags.py:33
 msgid "Title Sort Order"
 msgstr "Sortiername des Titels"
 
-#: ../picard/util/tags.py:33
+#: ../picard/util/tags.py:34
 msgid "Album Sort Order"
 msgstr "Sortiername des Albums"
 
-#: ../picard/util/tags.py:34
+#: ../picard/util/tags.py:35
 msgid "ASIN"
 msgstr "ASIN"
 
-#: ../picard/util/tags.py:35
+#: ../picard/util/tags.py:36
 msgid "Grouping"
 msgstr "Gruppierung"
 
-#: ../picard/util/tags.py:37
+#: ../picard/util/tags.py:38
 msgid "ISRC"
 msgstr "ISRC"
 
-#: ../picard/util/tags.py:38
+#: ../picard/util/tags.py:39
 msgid "Mood"
 msgstr "Stimmung"
 
-#: ../picard/util/tags.py:39
+#: ../picard/util/tags.py:40
 msgid "BPM"
 msgstr "BPM"
 
-#: ../picard/util/tags.py:40
+#: ../picard/util/tags.py:41
 msgid "Copyright"
 msgstr "Copyright"
 
-#: ../picard/util/tags.py:41
+#: ../picard/util/tags.py:42
 msgid "Composer"
 msgstr "Komponist"
 
-#: ../picard/util/tags.py:42
+#: ../picard/util/tags.py:43
 msgid "Conductor"
 msgstr "Dirigent"
 
-#: ../picard/util/tags.py:43
+#: ../picard/util/tags.py:44
 msgid "Lyricist"
 msgstr "Texter"
 
-#: ../picard/util/tags.py:44
+#: ../picard/util/tags.py:45
 msgid "Arranger"
 msgstr "Arrangeur"
 
-#: ../picard/util/tags.py:45
+#: ../picard/util/tags.py:46
 msgid "Producer"
 msgstr "Produzent"
 
-#: ../picard/util/tags.py:46
+#: ../picard/util/tags.py:47
 msgid "Engineer"
 msgstr "Tontechniker"
 
-#: ../picard/util/tags.py:47
+#: ../picard/util/tags.py:48
 msgid "Subtitle"
 msgstr "Untertitel"
 
-#: ../picard/util/tags.py:48
+#: ../picard/util/tags.py:49
 msgid "Disc Subtitle"
 msgstr "Tonträger-Untertitel"
 
-#: ../picard/util/tags.py:49
+#: ../picard/util/tags.py:50
 msgid "Remixer"
 msgstr "Remixer"
 
-#: ../picard/util/tags.py:50
+#: ../picard/util/tags.py:51
 msgid "MusicBrainz Track Id"
 msgstr "MusicBrainz-Titel-ID"
 
-#: ../picard/util/tags.py:51
+#: ../picard/util/tags.py:52
 msgid "MusicBrainz Release Id"
 msgstr "MusicBrainz-Album-ID"
 
-#: ../picard/util/tags.py:52
+#: ../picard/util/tags.py:53
 msgid "MusicBrainz Artist Id"
 msgstr "MusicBrainz-Interpreten-ID"
 
-#: ../picard/util/tags.py:53
+#: ../picard/util/tags.py:54
 msgid "MusicBrainz Release Artist Id"
 msgstr "MusicBrainz-Albuminterpreten-ID"
 
-#: ../picard/util/tags.py:54
+#: ../picard/util/tags.py:55
 msgid "MusicBrainz TRM Id"
 msgstr "MusicBrainz-TRM-ID"
 
-#: ../picard/util/tags.py:55
+#: ../picard/util/tags.py:56
 msgid "MusicBrainz Disc Id"
 msgstr "MusicBrainz-Disc-ID"
 
-#: ../picard/util/tags.py:56
+#: ../picard/util/tags.py:57
 msgid "MusicBrainz Sort Name"
 msgstr "MusicBrainz-Sortiername"
 
-#: ../picard/util/tags.py:57
+#: ../picard/util/tags.py:58
 msgid "MusicIP PUID"
 msgstr "MusicIP-PUID"
 
-#: ../picard/util/tags.py:58
+#: ../picard/util/tags.py:59
 msgid "MusicIP Fingerprint"
 msgstr "MusicIP Fingerabdruck"
 
-#: ../picard/util/tags.py:59
+#: ../picard/util/tags.py:60
 msgid "Disc Id"
 msgstr "Disc-ID"
 
-#: ../picard/util/tags.py:60
+#: ../picard/util/tags.py:61
 msgid "Website"
 msgstr "Webseite"
 
-#: ../picard/util/tags.py:61
+#: ../picard/util/tags.py:62
 msgid "Compilation"
 msgstr "Kompilation"
 
-#: ../picard/util/tags.py:62
+#: ../picard/util/tags.py:63
 msgid "Comment"
 msgstr "Kommentar"
 
-#: ../picard/util/tags.py:63
+#: ../picard/util/tags.py:64
 msgid "Genre"
 msgstr "Genre"
 
-#: ../picard/util/tags.py:64
+#: ../picard/util/tags.py:65
 msgid "Encoded By"
 msgstr "Kodierer"
 
-#: ../picard/util/tags.py:65
+#: ../picard/util/tags.py:66
 msgid "Performer"
 msgstr "Interpret"
 
-#: ../picard/util/tags.py:66
+#: ../picard/util/tags.py:67
 msgid "Release Type"
 msgstr "Veröffentlichungstyp"
 
-#: ../picard/util/tags.py:67
+#: ../picard/util/tags.py:68
 msgid "Release Status"
 msgstr "Veröffentlichungsstatus"
 
-#: ../picard/util/tags.py:68
+#: ../picard/util/tags.py:69
 msgid "Release Country"
 msgstr "Veröffentlichungsland"
 
-#: ../picard/util/tags.py:69
+#: ../picard/util/tags.py:70
 msgid "Record Label"
 msgstr "Plattenlabel"
 
-#: ../picard/util/tags.py:70
+#: ../picard/util/tags.py:71
 msgid "Barcode"
 msgstr "Strichcode"
 
-#: ../picard/util/tags.py:71
+#: ../picard/util/tags.py:72
 msgid "Catalog Number"
 msgstr "Katalognummer"
 
-#: ../picard/util/tags.py:72
+#: ../picard/util/tags.py:73
 msgid "Format"
 msgstr "Format"
 
-#: ../picard/util/tags.py:73
+#: ../picard/util/tags.py:74
 msgid "DJ-Mixer"
 msgstr "DJ-Mixer"
 
-#: ../picard/util/tags.py:74
+#: ../picard/util/tags.py:75
 msgid "Media"
 msgstr "Medien"
 
-#: ../picard/util/tags.py:75
+#: ../picard/util/tags.py:76
 msgid "Lyrics"
 msgstr "Liedtext"
 
-#: ../picard/util/tags.py:76
+#: ../picard/util/tags.py:77
 msgid "Mixer"
 msgstr "Mixer"
 
-#: ../picard/util/tags.py:77
+#: ../picard/util/tags.py:78
 msgid "Language"
 msgstr "Sprache"
 
-#: ../picard/util/tags.py:78
+#: ../picard/util/tags.py:79
 msgid "Script"
 msgstr "Skript"
 
@@ -2523,21 +2581,49 @@ msgstr ""
 "\n"
 "%s"
 
-#, python-format
+#~ msgid "Rename Files"
+#~ msgstr "Dateien umbenennen"
+
+#~ msgid "Multiple artist file naming format:"
+#~ msgstr "Format des Dateinamens für diverse Interpreten:"
+
+#~ msgid "File naming format:"
+#~ msgstr "Format des Dateinamens:"
+
+#~ msgid "File name:"
+#~ msgstr "Dateiname:"
+
+#~ msgid "Multiple artist file name:"
+#~ msgstr "Dateiname für diverse Interpreten:"
+
+#~ msgid "Common"
+#~ msgstr "Allgemein"
+
+#~ msgid "ID3"
+#~ msgstr "ID3"
+
+#~ msgid "Write ID3v2 version 2.3 tags (2.4 is default)"
+#~ msgstr "Schreibe ID3v2-Tags in Version 2.3 (2.4 ist Standard)"
+
+#~ msgid "Text encoding to use while writing ID3v2 tags:"
+#~ msgstr "Zum Schreiben der ID3v2-Tags zu benutzende Textkodierung"
+
+#~ msgid "APE"
+#~ msgstr "APE"
+
 #~ msgid "[couldn't load album %s]"
 #~ msgstr "[konnte Album %s nicht laden]"
 
 #~ msgid "New Version"
 #~ msgstr "Neue Version"
 
-#, python-format
 #~ msgid ""
-#~ "New version of Picard is available (%s). Would you like to download it now?"
+#~ "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?"
+#~ "Eine neue Version von Picard ist verfügbar (%s). Wollen Sie die neue "
+#~ "Datei herunterladen?"
 
-#, python-format
 #~ msgid "Couldn't find PUID for file %s"
 #~ msgstr "Konnnte PUID für Datei %s nicht laden."
 
@@ -2676,9 +2762,6 @@ msgstr ""
 #~ 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"
 
@@ -2697,9 +2780,6 @@ msgstr ""
 #~ msgid "Proxy port"
 #~ msgstr "Proxy-Port"
 
-#~ msgid "ID3v2.4 only"
-#~ msgstr "Nur ID3v2.4"
-
 #~ msgid "Save track/album"
 #~ msgstr "Titel/Album speichern"
 
@@ -2734,15 +2814,17 @@ msgstr ""
 #~ 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"
-#~ "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. "
+#~ "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 ""
-#~ "Sie haben noch keinen Benutzernamen und kein Passwort angegeben. Um Daten zu "
-#~ "MusicBrainz beitragen zu können, müssen Sie einen Account haben.\n"
-#~ "Wollen Sie jetzt einen Account erstellen? Wenn Sie schon einen MusicBrainz "
-#~ "Account haben, geben Sie bitte Ihre Zugangsdaten in den Optionen an. "
+#~ "Sie haben noch keinen Benutzernamen und kein Passwort angegeben. Um Daten "
+#~ "zu MusicBrainz beitragen zu können, müssen Sie einen Account haben.\n"
+#~ "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."
@@ -2769,22 +2851,23 @@ msgstr ""
 #~ 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."
+#~ "Please fix the move option or the destination directory option and try "
+#~ "again."
 #~ msgstr ""
-#~ "Die \"Dateien verschieben\" Option ist aktiviert, aber das Zielverzeichnis "
-#~ "wurde nicht angegeben oder ist ungültig.\n"
-#~ "Bitte korrigieren Sie die Verschieben-Option oder die Zielverzeichnis-Option "
-#~ "und versuchen Sie es erneut."
+#~ "Die \"Dateien verschieben\" Option ist aktiviert, aber das "
+#~ "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 click the "
-#~ "track and select 'Clear Error'"
+#~ "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 ""
 #~ "Es konnten nicht alle Dateien gespeichert werden. Bitte überprüfen und "
-#~ "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\"."
+#~ "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"
@@ -2808,7 +2891,8 @@ msgstr ""
 #~ msgstr "Bitte spenden Sie and MusicBrainz!"
 
 #~ msgid ""
-#~ "The destination directory %s does not exist. Please pick a valid directory."
+#~ "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."
@@ -2830,9 +2914,6 @@ msgstr ""
 #~ 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"
 
@@ -2845,7 +2926,8 @@ msgstr ""
 
 #~ 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."
+#~ "Ein %s im Eingabefeld für den Dateinamen erzeugt ein neues "
+#~ "Unterverzeichnis."
 
 #~ msgid "Audio fingerprinting options"
 #~ msgstr "Audio-Fingerprinting Optionen"
@@ -2854,7 +2936,8 @@ msgstr ""
 #~ 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)"
+#~ msgstr ""
+#~ "Schreibe ID3v1-Tag in MP3 Dateien (ID3v2-Tag wird immer geschrieben)"
 
 #~ msgid "Remove track/album"
 #~ msgstr "Titel/Album entfernen"
@@ -2887,8 +2970,8 @@ msgstr ""
 #~ "der Community angewiesen, um sie weiter betreiben zu können.\n"
 #~ "Bitte spenden Sie 10$ an die MetaBrainz Foundation,\n"
 #~ "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."
+#~ "der Steuer absetzbar und helfen, diesen Service weiter zu betreiben und "
+#~ "zu entwickeln."
 
 #~ msgid "Matched track highlighting"
 #~ msgstr "Hervorheben übereinstimmender Titel"
@@ -2912,8 +2995,8 @@ msgstr ""
 #~ 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. "
+#~ "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. "
@@ -2971,7 +3054,8 @@ msgstr ""
 #~ "Please download the appropriate toolkit from  http://www.wxwidgets.com"
 #~ msgstr ""
 #~ "Der MusicBrainz Tagger benötigt wx.Widgets mit UNICODE Support.\n"
-#~ "Bitte downloaden Sie das entsprechende Toolkit von http://www.wxwidgets.com"
+#~ "Bitte downloaden Sie das entsprechende Toolkit von http://www.wxwidgets."
+#~ "com"
 
 #~ msgid "Sorry, there is no help file yet."
 #~ msgstr "Derzeit ist leider noch keine Hilfedatei vorhanden."
diff --git a/po/en.po b/po/en.po
index ed2a3ea83..25627a8c6 100644
--- a/po/en.po
+++ b/po/en.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: picard\n"
 "Report-Msgid-Bugs-To: http://bugs.musicbrainz.org/\n"
-"POT-Creation-Date: 2009-02-24 18:58+0100\n"
+"POT-Creation-Date: 2009-04-06 22:50+0200\n"
 "PO-Revision-Date: 2008-12-01 20:55+0000\n"
 "Last-Translator: Lukáš Lalinský <lalinsky@gmail.com>\n"
 "Language-Team: English <en@li.org>\n"
@@ -18,16 +18,16 @@ msgstr ""
 "X-Launchpad-Export-Date: 2009-04-06 20:21+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
-#: ../picard/album.py:108 ../picard/cluster.py:248
+#: ../picard/album.py:109 ../picard/cluster.py:248
 msgid "Unmatched Files"
 msgstr ""
 
-#: ../picard/album.py:281
+#: ../picard/album.py:287
 #, python-format
 msgid "[could not load album %s]"
 msgstr ""
 
-#: ../picard/album.py:317
+#: ../picard/album.py:320
 msgid "[loading album information]"
 msgstr ""
 
@@ -587,7 +587,7 @@ msgid "Namibia"
 msgstr ""
 
 #: ../picard/const.py:182
-msgid "Vanuat"
+msgid "Vanuatu"
 msgstr ""
 
 #: ../picard/const.py:183
@@ -1031,223 +1031,234 @@ msgid "Congo, The Democratic Republic of the"
 msgstr ""
 
 #: ../picard/const.py:293
-msgid "Serbia and Montenegro"
+msgid "Serbia and Montenegro (historical, 2003-2006)"
 msgstr ""
 
 #: ../picard/const.py:294
-msgid "Croatia"
+msgid "Serbia"
 msgstr ""
 
 #: ../picard/const.py:295
-msgid "Korea (North), Democratic People's Republic of"
+msgid "Montenegro"
 msgstr ""
 
 #: ../picard/const.py:296
-msgid "Korea (South), Republic of"
+msgid "Croatia"
 msgstr ""
 
 #: ../picard/const.py:297
-msgid "Slovakia"
+msgid "Korea (North), Democratic People's Republic of"
 msgstr ""
 
 #: ../picard/const.py:298
-msgid "Soviet Union (historical, 1922-1991)"
+msgid "Korea (South), Republic of"
 msgstr ""
 
 #: ../picard/const.py:299
-msgid "East Timor"
+msgid "Slovakia"
 msgstr ""
 
 #: ../picard/const.py:300
-msgid "Czechoslovakia (historical, 1918-1992)"
+msgid "Soviet Union (historical, 1922-1991)"
 msgstr ""
 
 #: ../picard/const.py:301
-msgid "Europe"
+msgid "East Timor"
 msgstr ""
 
 #: ../picard/const.py:302
-msgid "East Germany (historical, 1949-1990)"
+msgid "Czechoslovakia (historical, 1918-1992)"
 msgstr ""
 
 #: ../picard/const.py:303
-msgid "[Unknown Country]"
+msgid "Europe"
 msgstr ""
 
 #: ../picard/const.py:304
-msgid "[Worldwide]"
+msgid "East Germany (historical, 1949-1990)"
 msgstr ""
 
 #: ../picard/const.py:305
+msgid "[Unknown Country]"
+msgstr ""
+
+#: ../picard/const.py:306
+msgid "[Worldwide]"
+msgstr ""
+
+#: ../picard/const.py:307
 msgid "Yugoslavia (historical, 1918-1992)"
 msgstr ""
 
-#: ../picard/const.py:310
-msgid "Catalan"
-msgstr ""
-
-#: ../picard/const.py:311
-msgid "Czech"
-msgstr ""
-
 #: ../picard/const.py:312
-msgid "Welsh"
+msgid "Afrikaans"
 msgstr ""
 
 #: ../picard/const.py:313
-msgid "Danish"
+msgid "Arabic"
 msgstr ""
 
 #: ../picard/const.py:314
-msgid "German"
+msgid "Catalan"
 msgstr ""
 
 #: ../picard/const.py:315
-msgid "English"
+msgid "Czech"
 msgstr ""
 
 #: ../picard/const.py:316
-msgid "English (Canada)"
+msgid "Welsh"
 msgstr ""
 
 #: ../picard/const.py:317
-msgid "English (UK)"
+msgid "Danish"
 msgstr ""
 
 #: ../picard/const.py:318
-msgid "Spanish"
+msgid "German"
 msgstr ""
 
 #: ../picard/const.py:319
-msgid "Persian"
+msgid "English"
 msgstr ""
 
 #: ../picard/const.py:320
-msgid "Finnish"
+msgid "English (Canada)"
 msgstr ""
 
 #: ../picard/const.py:321
-msgid "French"
+msgid "English (UK)"
 msgstr ""
 
 #: ../picard/const.py:322
-msgid "Frisian"
+msgid "Spanish"
 msgstr ""
 
 #: ../picard/const.py:323
-msgid "Hebrew"
+msgid "Persian"
 msgstr ""
 
 #: ../picard/const.py:324
-msgid "Hungarian"
+msgid "Finnish"
 msgstr ""
 
 #: ../picard/const.py:325
-msgid "Islandic"
+msgid "French"
 msgstr ""
 
 #: ../picard/const.py:326
-msgid "Italian"
+msgid "Frisian"
 msgstr ""
 
 #: ../picard/const.py:327
-msgid "Kannada"
+msgid "Hebrew"
 msgstr ""
 
 #: ../picard/const.py:328
-msgid "Korean"
+msgid "Hindi"
 msgstr ""
 
 #: ../picard/const.py:329
-msgid "Lithuanian"
+msgid "Hungarian"
 msgstr ""
 
 #: ../picard/const.py:330
-msgid "Norwegian Bokmal"
+msgid "Islandic"
 msgstr ""
 
 #: ../picard/const.py:331
-msgid "Dutch"
+msgid "Italian"
 msgstr ""
 
 #: ../picard/const.py:332
-msgid "Polish"
+msgid "Kannada"
 msgstr ""
 
 #: ../picard/const.py:333
-msgid "Portuguese"
+msgid "Korean"
 msgstr ""
 
 #: ../picard/const.py:334
-msgid "Brazilian Portuguese"
+msgid "Lithuanian"
 msgstr ""
 
 #: ../picard/const.py:335
-msgid "Romanian"
+msgid "Norwegian Bokmal"
 msgstr ""
 
 #: ../picard/const.py:336
-msgid "Russian"
+msgid "Dutch"
 msgstr ""
 
 #: ../picard/const.py:337
-msgid "Scots"
+msgid "Polish"
 msgstr ""
 
 #: ../picard/const.py:338
-msgid "Slovak"
+msgid "Portuguese"
 msgstr ""
 
 #: ../picard/const.py:339
-msgid "Slovenian"
+msgid "Brazilian Portuguese"
 msgstr ""
 
 #: ../picard/const.py:340
-msgid "Swedish"
+msgid "Romanian"
 msgstr ""
 
 #: ../picard/const.py:341
+msgid "Russian"
+msgstr ""
+
+#: ../picard/const.py:342
+msgid "Scots"
+msgstr ""
+
+#: ../picard/const.py:343
+msgid "Slovak"
+msgstr ""
+
+#: ../picard/const.py:344
+msgid "Slovenian"
+msgstr ""
+
+#: ../picard/const.py:345
+msgid "Swedish"
+msgstr ""
+
+#: ../picard/const.py:346
+msgid "Turkish"
+msgstr ""
+
+#: ../picard/const.py:347
 msgid "Chinese"
 msgstr ""
 
-#: ../picard/file.py:487
+#: ../picard/file.py:494
 #, python-format
 msgid "No matching tracks for file %s"
 msgstr ""
 
-#: ../picard/file.py:504
+#: ../picard/file.py:511
 #, python-format
 msgid "No matching tracks above the threshold for file %s"
 msgstr ""
 
-#: ../picard/file.py:507
+#: ../picard/file.py:514
 #, python-format
 msgid "File %s identified!"
 msgstr ""
 
-#: ../picard/file.py:518
+#: ../picard/file.py:525
 #, python-format
 msgid "Looking up the PUID for file %s..."
 msgstr ""
 
-#: ../picard/file.py:523
+#: ../picard/file.py:530
 #, 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 ""
@@ -1260,11 +1271,24 @@ msgstr ""
 msgid "XSPF Playlist (*.xspf)"
 msgstr ""
 
-#: ../picard/tagger.py:476
-msgid "CD Lookup Error"
+#: ../picard/puidmanager.py:62
+msgid "Submitting PUIDs..."
+msgstr ""
+
+#: ../picard/puidmanager.py:68
+#, python-format
+msgid "PUIDs submission failed: %s"
+msgstr ""
+
+#: ../picard/puidmanager.py:70
+msgid "PUIDs successfully submitted!"
 msgstr ""
 
 #: ../picard/tagger.py:477
+msgid "CD Lookup Error"
+msgstr ""
+
+#: ../picard/tagger.py:478
 #, python-format
 msgid ""
 "Error while reading CD:\n"
@@ -1272,7 +1296,7 @@ msgid ""
 "%s"
 msgstr ""
 
-#: ../picard/tagger.py:503
+#: ../picard/tagger.py:504
 #, python-format
 msgid "Could not find PUID for file %s"
 msgstr ""
@@ -1325,15 +1349,27 @@ msgstr ""
 msgid "Length"
 msgstr ""
 
-#: ../picard/ui/itemviews.py:327
+#: ../picard/ui/itemviews.py:289
+msgid "&Expand all"
+msgstr ""
+
+#: ../picard/ui/itemviews.py:291
+msgid "&Collapse all"
+msgstr ""
+
+#: ../picard/ui/itemviews.py:332
 msgid "&Releases"
 msgstr ""
 
-#: ../picard/ui/itemviews.py:353
+#: ../picard/ui/itemviews.py:349
+msgid "No release event"
+msgstr ""
+
+#: ../picard/ui/itemviews.py:359
 msgid "&Plugins"
 msgstr ""
 
-#: ../picard/ui/itemviews.py:523
+#: ../picard/ui/itemviews.py:533
 msgid "Clusters"
 msgstr ""
 
@@ -1341,95 +1377,6 @@ msgstr ""
 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:66 ../picard/ui/ui_options_plugins.py:62
-msgid "Details"
-msgstr ""
-
-#: ../picard/ui/tageditor.py:71 ../picard/ui/tageditor.py:264
-#, python-format
-msgid "%d file"
-msgid_plural "%d files"
-msgstr[0] ""
-msgstr[1] ""
-
-#: ../picard/ui/tageditor.py:131
-#, python-format
-msgid "(different across %d file)"
-msgid_plural "(different across %d files)"
-msgstr[0] ""
-msgstr[1] ""
-
-#: ../picard/ui/tageditor.py:134
-#, python-format
-msgid "(missing from %d file)"
-msgid_plural "(missing from %d files)"
-msgstr[0] ""
-msgstr[1] ""
-
-#: ../picard/ui/tageditor.py:233
-msgid "Filename:"
-msgstr ""
-
-#: ../picard/ui/tageditor.py:235
-msgid "Format:"
-msgstr ""
-
-#: ../picard/ui/tageditor.py:244
-msgid "Size:"
-msgstr ""
-
-#: ../picard/ui/tageditor.py:248 ../picard/ui/ui_metadata.py:127
-msgid "Length:"
-msgstr ""
-
-#: ../picard/ui/tageditor.py:250
-msgid "Bitrate:"
-msgstr ""
-
-#: ../picard/ui/tageditor.py:252
-msgid "Sample rate:"
-msgstr ""
-
-#: ../picard/ui/tageditor.py:254
-msgid "Bits per sample:"
-msgstr ""
-
-#: ../picard/ui/tageditor.py:257
-msgid "Mono"
-msgstr ""
-
-#: ../picard/ui/tageditor.py:258
-msgid "Stereo"
-msgstr ""
-
-#: ../picard/ui/tageditor.py:260
-msgid "Channels:"
-msgstr ""
-
-#: ../picard/ui/tagsfromfilenames.py:52 ../picard/ui/tagsfromfilenames.py:96
-msgid "File Name"
-msgstr ""
-
 #: ../picard/ui/mainwindow.py:64
 msgid "MusicBrainz Picard"
 msgstr ""
@@ -1666,6 +1613,10 @@ msgstr ""
 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 ""
@@ -1685,12 +1636,97 @@ msgstr ""
 msgid " (Error: %s)"
 msgstr ""
 
+#: ../picard/ui/puidsubmit.py:31 ../picard/ui/options/plugins.py:85
+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/passworddialog.py:38
 #, python-format
 msgid ""
 "The server %s requires you to login. Please enter your username and password."
 msgstr ""
 
+#: ../picard/ui/tageditor.py:66 ../picard/ui/ui_options_plugins.py:62
+msgid "Details"
+msgstr ""
+
+#: ../picard/ui/tageditor.py:71 ../picard/ui/tageditor.py:264
+#, python-format
+msgid "%d file"
+msgid_plural "%d files"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../picard/ui/tageditor.py:131
+#, python-format
+msgid "(different across %d file)"
+msgid_plural "(different across %d files)"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../picard/ui/tageditor.py:134
+#, python-format
+msgid "(missing from %d file)"
+msgid_plural "(missing from %d files)"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../picard/ui/tageditor.py:233
+msgid "Filename:"
+msgstr ""
+
+#: ../picard/ui/tageditor.py:235
+msgid "Format:"
+msgstr ""
+
+#: ../picard/ui/tageditor.py:244
+msgid "Size:"
+msgstr ""
+
+#: ../picard/ui/tageditor.py:248 ../picard/ui/ui_metadata.py:127
+msgid "Length:"
+msgstr ""
+
+#: ../picard/ui/tageditor.py:250
+msgid "Bitrate:"
+msgstr ""
+
+#: ../picard/ui/tageditor.py:252
+msgid "Sample rate:"
+msgstr ""
+
+#: ../picard/ui/tageditor.py:254
+msgid "Bits per sample:"
+msgstr ""
+
+#: ../picard/ui/tageditor.py:257
+msgid "Mono"
+msgstr ""
+
+#: ../picard/ui/tageditor.py:258
+msgid "Stereo"
+msgstr ""
+
+#: ../picard/ui/tageditor.py:260
+msgid "Channels:"
+msgstr ""
+
+#: ../picard/ui/tagsfromfilenames.py:54 ../picard/ui/tagsfromfilenames.py:99
+msgid "File Name"
+msgstr ""
+
 #: ../picard/ui/ui_cdlookup.py:60 ../picard/ui/ui_options_cdlookup.py:47
 #: ../picard/ui/ui_options_cdlookup_select.py:48
 #: ../picard/ui/options/cdlookup.py:36
@@ -1713,24 +1749,6 @@ msgstr ""
 msgid "Cancel"
 msgstr ""
 
-#: ../picard/ui/ui_passworddialog.py:78
-msgid "Authentication required"
-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"
-msgstr ""
-
 #: ../picard/ui/ui_edittagdialog.py:44
 msgid "Edit Tag"
 msgstr ""
@@ -1767,6 +1785,10 @@ msgstr ""
 msgid "Options"
 msgstr ""
 
+#: ../picard/ui/ui_puidsubmit.py:52
+msgid "Submit PUIDs"
+msgstr ""
+
 #: ../picard/ui/ui_options_cdlookup.py:48
 msgid "CD-ROM device to use for lookups:"
 msgstr ""
@@ -1791,6 +1813,22 @@ msgstr ""
 msgid "Overwrite the file if it already exists"
 msgstr ""
 
+#: ../picard/ui/ui_options_moving.py:53
+msgid "Move additional files:"
+msgstr ""
+
+#: ../picard/ui/ui_options_moving.py:54
+msgid "Browse..."
+msgstr ""
+
+#: ../picard/ui/ui_options_moving.py:55
+msgid "Delete empty directories"
+msgstr ""
+
+#: ../picard/ui/ui_options_moving.py:56
+msgid "Move files to this directory when saving:"
+msgstr ""
+
 #: ../picard/ui/util.py:31
 msgid "&Ok"
 msgstr ""
@@ -1799,44 +1837,40 @@ msgstr ""
 msgid "&Cancel"
 msgstr ""
 
-#: ../picard/ui/ui_puidsubmit.py:52
-msgid "Submit PUIDs"
-msgstr ""
-
-#: ../picard/ui/ui_tageditor.py:139 ../picard/ui/ui_options_plugins.py:59
-#: ../picard/ui/options/plugins.py:76
+#: ../picard/ui/ui_tageditor.py:128 ../picard/ui/ui_options_plugins.py:59
+#: ../picard/ui/options/plugins.py:81
 msgid "Name"
 msgstr ""
 
-#: ../picard/ui/ui_tageditor.py:140
+#: ../picard/ui/ui_tageditor.py:129
 msgid "Value"
 msgstr ""
 
-#: ../picard/ui/ui_tageditor.py:141
+#: ../picard/ui/ui_tageditor.py:130
 msgid "Rating:"
 msgstr ""
 
-#: ../picard/ui/ui_tageditor.py:142
+#: ../picard/ui/ui_tageditor.py:131
 msgid "&Add..."
 msgstr ""
 
-#: ../picard/ui/ui_tageditor.py:143
+#: ../picard/ui/ui_tageditor.py:132
 msgid "&Edit..."
 msgstr ""
 
-#: ../picard/ui/ui_tageditor.py:144
+#: ../picard/ui/ui_tageditor.py:133
 msgid "&Delete"
 msgstr ""
 
-#: ../picard/ui/ui_tageditor.py:145
+#: ../picard/ui/ui_tageditor.py:134
 msgid "&Metadata"
 msgstr ""
 
-#: ../picard/ui/ui_tageditor.py:146
+#: ../picard/ui/ui_tageditor.py:135
 msgid "A&rtwork"
 msgstr ""
 
-#: ../picard/ui/ui_tageditor.py:147
+#: ../picard/ui/ui_tageditor.py:136
 msgid "&Info"
 msgstr ""
 
@@ -1881,6 +1915,40 @@ msgstr ""
 msgid ", "
 msgstr ""
 
+#: ../picard/ui/ui_options_general.py:108
+msgid "MusicBrainz Server"
+msgstr ""
+
+#: ../picard/ui/ui_options_general.py:109 ../picard/ui/ui_options_proxy.py:72
+msgid "Port:"
+msgstr ""
+
+#: ../picard/ui/ui_options_general.py:110 ../picard/ui/ui_options_proxy.py:73
+msgid "Server address:"
+msgstr ""
+
+#: ../picard/ui/ui_options_general.py:111
+msgid "Account Information"
+msgstr ""
+
+#: ../picard/ui/ui_options_general.py:112 ../picard/ui/ui_options_proxy.py:70
+#: ../picard/ui/ui_passworddialog.py:80
+msgid "Password:"
+msgstr ""
+
+#: ../picard/ui/ui_options_general.py:113 ../picard/ui/ui_options_proxy.py:71
+#: ../picard/ui/ui_passworddialog.py:79
+msgid "Username:"
+msgstr ""
+
+#: ../picard/ui/ui_options_general.py:114 ../picard/ui/options/general.py:29
+msgid "General"
+msgstr ""
+
+#: ../picard/ui/ui_options_general.py:115
+msgid "Automatically scan all new files"
+msgstr ""
+
 #: ../picard/ui/ui_options_interface.py:50
 msgid "Miscellaneous"
 msgstr ""
@@ -1901,113 +1969,6 @@ msgstr ""
 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_options_naming.py:180
-#: ../picard/ui/ui_tagsfromfilenames.py:58
-msgid "&Preview"
-msgstr ""
-
-#: ../picard/ui/ui_options_proxy.py:81 ../picard/ui/options/proxy.py:28
-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_options_ratings.py:45
-msgid "Enable track ratings"
-msgstr ""
-
-#: ../picard/ui/ui_options_ratings.py:46
-msgid ""
-"Picard saves the ratings together with an e-mail address identifying the "
-"user who did the rating. That way different ratings for different users can "
-"be stored in the files. Please sepcify the e-mail you want to use to save "
-"your ratings."
-msgstr ""
-
-#: ../picard/ui/ui_options_ratings.py:47
-msgid "E-mail:"
-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 ../picard/ui/options/general.py:29
-msgid "General"
-msgstr ""
-
-#: ../picard/ui/ui_options_general.py:115
-msgid "Automatically scan all new files"
-msgstr ""
-
 #: ../picard/ui/ui_options_matching.py:105
 msgid "Thresholds"
 msgstr ""
@@ -2064,72 +2025,143 @@ msgstr ""
 msgid "Non-album tracks:"
 msgstr ""
 
-#: ../picard/ui/ui_options_plugins.py:58 ../picard/ui/options/plugins.py:30
+#: ../picard/ui/ui_options_metadata.py:109
+#: ../picard/ui/ui_options_metadata.py:110
+#: ../picard/ui/ui_options_renaming.py:155
+#: ../picard/ui/ui_options_renaming.py:158
+msgid "Default"
+msgstr ""
+
+#: ../picard/ui/ui_options_plugins.py:58 ../picard/ui/options/plugins.py:34
 msgid "Plugins"
 msgstr ""
 
-#: ../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:84
 msgid "Author"
 msgstr ""
 
-#: ../picard/ui/ui_options_plugins.py:61 ../picard/util/tags.py:36
+#: ../picard/ui/ui_options_plugins.py:61 ../picard/util/tags.py:37
 msgid "Version"
 msgstr ""
 
-#: ../picard/ui/ui_options_script.py:52
+#: ../picard/ui/ui_options_proxy.py:69 ../picard/ui/options/proxy.py:28
+msgid "Web Proxy"
+msgstr ""
+
+#: ../picard/ui/ui_options_ratings.py:45
+msgid "Enable track ratings"
+msgstr ""
+
+#: ../picard/ui/ui_options_ratings.py:46
+msgid ""
+"Picard saves the ratings together with an e-mail address identifying the "
+"user who did the rating. That way different ratings for different users can "
+"be stored in the files. Please sepcify the e-mail you want to use to save "
+"your ratings."
+msgstr ""
+
+#: ../picard/ui/ui_options_ratings.py:47
+msgid "E-mail:"
+msgstr ""
+
+#: ../picard/ui/ui_options_renaming.py:145
+msgid "Form"
+msgstr ""
+
+#: ../picard/ui/ui_options_renaming.py:146
+msgid "Rename files when saving"
+msgstr ""
+
+#: ../picard/ui/ui_options_renaming.py:147
+msgid "Replace non-ASCII characters"
+msgstr ""
+
+#: ../picard/ui/ui_options_renaming.py:148
+msgid "Replace Windows-incompatible characters"
+msgstr ""
+
+#: ../picard/ui/ui_options_renaming.py:149
+msgid "Name files like this"
+msgstr ""
+
+#: ../picard/ui/ui_options_renaming.py:156
+msgid "Name multiple artist albums differently"
+msgstr ""
+
+#: ../picard/ui/ui_options_renaming.py:157
+msgid "Copy from above"
+msgstr ""
+
+#: ../picard/ui/ui_options_renaming.py:159
+msgid "Examples"
+msgstr ""
+
+#: ../picard/ui/ui_options_script.py:43
 msgid "Tagger Script"
 msgstr ""
 
-#: ../picard/ui/ui_options_tags.py:85
-msgid "Common"
+#: ../picard/ui/ui_options_tags.py:97
+msgid "Do not write tags to files"
 msgstr ""
 
-#: ../picard/ui/ui_options_tags.py:86
-msgid "Clear existing tags before writing new tags"
+#: ../picard/ui/ui_options_tags.py:98
+msgid "Before tagging"
 msgstr ""
 
-#: ../picard/ui/ui_options_tags.py:87
-msgid "Don not write tags to files"
+#: ../picard/ui/ui_options_tags.py:99
+msgid "Clear existing tags"
 msgstr ""
 
-#: ../picard/ui/ui_options_tags.py:88
-msgid "ID3"
-msgstr ""
-
-#: ../picard/ui/ui_options_tags.py:89
-msgid "Write ID3v1 tags to the files"
-msgstr ""
-
-#: ../picard/ui/ui_options_tags.py:90
-msgid "Write ID3v2 version 2.3 tags (2.4 is default)"
-msgstr ""
-
-#: ../picard/ui/ui_options_tags.py:91
-msgid "Text encoding to use while writing ID3v2 tags:"
-msgstr ""
-
-#: ../picard/ui/ui_options_tags.py:92
-msgid "ISO-8859-1"
-msgstr ""
-
-#: ../picard/ui/ui_options_tags.py:93
-msgid "UTF-16"
-msgstr ""
-
-#: ../picard/ui/ui_options_tags.py:94
-msgid "UTF-8"
-msgstr ""
-
-#: ../picard/ui/ui_options_tags.py:95
+#: ../picard/ui/ui_options_tags.py:100
 msgid "Remove ID3 tags from FLAC files"
 msgstr ""
 
-#: ../picard/ui/ui_options_tags.py:96
-msgid "APE"
+#: ../picard/ui/ui_options_tags.py:101
+msgid "Remove APEv2 tags from MP3 files"
 msgstr ""
 
-#: ../picard/ui/ui_options_tags.py:97
-msgid "Remove APEv2 tags from MP3 files"
+#: ../picard/ui/ui_options_tags.py:102
+msgid "Tag compatibility"
+msgstr ""
+
+#: ../picard/ui/ui_options_tags.py:103
+msgid "ID3v2 version"
+msgstr ""
+
+#: ../picard/ui/ui_options_tags.py:104
+msgid "2.4"
+msgstr ""
+
+#: ../picard/ui/ui_options_tags.py:105
+msgid "2.3"
+msgstr ""
+
+#: ../picard/ui/ui_options_tags.py:106
+msgid "Also include ID3v1 tags in the files"
+msgstr ""
+
+#: ../picard/ui/ui_options_tags.py:107
+msgid "ID3v2 text encoding"
+msgstr ""
+
+#: ../picard/ui/ui_options_tags.py:108
+msgid "UTF-8"
+msgstr ""
+
+#: ../picard/ui/ui_options_tags.py:109
+msgid "UTF-16"
+msgstr ""
+
+#: ../picard/ui/ui_options_tags.py:110
+msgid "ISO-8859-1"
+msgstr ""
+
+#: ../picard/ui/ui_passworddialog.py:78
+msgid "Authentication required"
+msgstr ""
+
+#: ../picard/ui/ui_passworddialog.py:81
+msgid "Save username and password"
 msgstr ""
 
 #: ../picard/ui/ui_tagsfromfilenames.py:56
@@ -2140,6 +2172,10 @@ msgstr ""
 msgid "Replace underscores with spaces"
 msgstr ""
 
+#: ../picard/ui/ui_tagsfromfilenames.py:58
+msgid "&Preview"
+msgstr ""
+
 #: ../picard/ui/options/about.py:29
 msgid "About"
 msgstr ""
@@ -2172,8 +2208,8 @@ 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"
@@ -2181,14 +2217,13 @@ msgid ""
 "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\"><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/P"
-"icardTagger</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
@@ -2221,42 +2256,44 @@ msgstr ""
 msgid "None"
 msgstr ""
 
-#: ../picard/ui/options/naming.py:33
-msgid "File Naming"
+#: ../picard/ui/options/moving.py:33
+msgid "Moving files"
 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 ""
-
-#: ../picard/ui/options/naming.py:95
-msgid "The multiple artist file naming format must not be empty."
-msgstr ""
-
-#: ../picard/ui/options/naming.py:97
+#: ../picard/ui/options/moving.py:65
 msgid "Error"
 msgstr ""
 
-#: ../picard/ui/options/naming.py:97
+#: ../picard/ui/options/moving.py:65
 msgid "The location to move files to must not be empty."
 msgstr ""
 
-#: ../picard/ui/options/scripting.py:63
-msgid "Scripting"
+#: ../picard/ui/options/ratings.py:29
+msgid "Ratings"
 msgstr ""
 
 #: ../picard/ui/options/tags.py:29
 msgid "Tags"
 msgstr ""
 
-#: ../picard/ui/options/ratings.py:29
-msgid "Ratings"
+#: ../picard/ui/options/renaming.py:35
+msgid "File naming"
+msgstr ""
+
+#: ../picard/ui/options/renaming.py:123
+msgid "The file naming format must not be empty."
+msgstr ""
+
+#: ../picard/ui/options/renaming.py:133
+msgid "The multiple artist file naming format must not be empty."
+msgstr ""
+
+#: ../picard/ui/options/scripting.py:63
+msgid "Scripting"
+msgstr ""
+
+#: ../picard/ui/options/scripting.py:97
+msgid "Script Error"
 msgstr ""
 
 #: ../picard/util/tags.py:24
@@ -2264,214 +2301,218 @@ msgid "Date"
 msgstr ""
 
 #: ../picard/util/tags.py:25
-msgid "Album Artist"
+msgid "Original Release Date"
 msgstr ""
 
 #: ../picard/util/tags.py:26
-msgid "Track Number"
+msgid "Album Artist"
 msgstr ""
 
 #: ../picard/util/tags.py:27
-msgid "Total Tracks"
+msgid "Track Number"
 msgstr ""
 
 #: ../picard/util/tags.py:28
-msgid "Disc Number"
+msgid "Total Tracks"
 msgstr ""
 
 #: ../picard/util/tags.py:29
-msgid "Total Discs"
+msgid "Disc Number"
 msgstr ""
 
 #: ../picard/util/tags.py:30
-msgid "Album Artist Sort Order"
+msgid "Total Discs"
 msgstr ""
 
 #: ../picard/util/tags.py:31
-msgid "Artist Sort Order"
+msgid "Album Artist Sort Order"
 msgstr ""
 
 #: ../picard/util/tags.py:32
-msgid "Title Sort Order"
+msgid "Artist Sort Order"
 msgstr ""
 
 #: ../picard/util/tags.py:33
-msgid "Album Sort Order"
+msgid "Title Sort Order"
 msgstr ""
 
 #: ../picard/util/tags.py:34
-msgid "ASIN"
+msgid "Album Sort Order"
 msgstr ""
 
 #: ../picard/util/tags.py:35
+msgid "ASIN"
+msgstr ""
+
+#: ../picard/util/tags.py:36
 msgid "Grouping"
 msgstr ""
 
-#: ../picard/util/tags.py:37
+#: ../picard/util/tags.py:38
 msgid "ISRC"
 msgstr ""
 
-#: ../picard/util/tags.py:38
+#: ../picard/util/tags.py:39
 msgid "Mood"
 msgstr ""
 
-#: ../picard/util/tags.py:39
+#: ../picard/util/tags.py:40
 msgid "BPM"
 msgstr ""
 
-#: ../picard/util/tags.py:40
+#: ../picard/util/tags.py:41
 msgid "Copyright"
 msgstr ""
 
-#: ../picard/util/tags.py:41
+#: ../picard/util/tags.py:42
 msgid "Composer"
 msgstr ""
 
-#: ../picard/util/tags.py:42
+#: ../picard/util/tags.py:43
 msgid "Conductor"
 msgstr ""
 
-#: ../picard/util/tags.py:43
+#: ../picard/util/tags.py:44
 msgid "Lyricist"
 msgstr ""
 
-#: ../picard/util/tags.py:44
+#: ../picard/util/tags.py:45
 msgid "Arranger"
 msgstr ""
 
-#: ../picard/util/tags.py:45
+#: ../picard/util/tags.py:46
 msgid "Producer"
 msgstr ""
 
-#: ../picard/util/tags.py:46
+#: ../picard/util/tags.py:47
 msgid "Engineer"
 msgstr ""
 
-#: ../picard/util/tags.py:47
+#: ../picard/util/tags.py:48
 msgid "Subtitle"
 msgstr ""
 
-#: ../picard/util/tags.py:48
+#: ../picard/util/tags.py:49
 msgid "Disc Subtitle"
 msgstr ""
 
-#: ../picard/util/tags.py:49
+#: ../picard/util/tags.py:50
 msgid "Remixer"
 msgstr ""
 
-#: ../picard/util/tags.py:50
+#: ../picard/util/tags.py:51
 msgid "MusicBrainz Track Id"
 msgstr ""
 
-#: ../picard/util/tags.py:51
+#: ../picard/util/tags.py:52
 msgid "MusicBrainz Release Id"
 msgstr ""
 
-#: ../picard/util/tags.py:52
+#: ../picard/util/tags.py:53
 msgid "MusicBrainz Artist Id"
 msgstr ""
 
-#: ../picard/util/tags.py:53
+#: ../picard/util/tags.py:54
 msgid "MusicBrainz Release Artist Id"
 msgstr ""
 
-#: ../picard/util/tags.py:54
+#: ../picard/util/tags.py:55
 msgid "MusicBrainz TRM Id"
 msgstr ""
 
-#: ../picard/util/tags.py:55
+#: ../picard/util/tags.py:56
 msgid "MusicBrainz Disc Id"
 msgstr ""
 
-#: ../picard/util/tags.py:56
+#: ../picard/util/tags.py:57
 msgid "MusicBrainz Sort Name"
 msgstr ""
 
-#: ../picard/util/tags.py:57
+#: ../picard/util/tags.py:58
 msgid "MusicIP PUID"
 msgstr ""
 
-#: ../picard/util/tags.py:58
+#: ../picard/util/tags.py:59
 msgid "MusicIP Fingerprint"
 msgstr ""
 
-#: ../picard/util/tags.py:59
+#: ../picard/util/tags.py:60
 msgid "Disc Id"
 msgstr ""
 
-#: ../picard/util/tags.py:60
+#: ../picard/util/tags.py:61
 msgid "Website"
 msgstr ""
 
-#: ../picard/util/tags.py:61
+#: ../picard/util/tags.py:62
 msgid "Compilation"
 msgstr ""
 
-#: ../picard/util/tags.py:62
+#: ../picard/util/tags.py:63
 msgid "Comment"
 msgstr ""
 
-#: ../picard/util/tags.py:63
+#: ../picard/util/tags.py:64
 msgid "Genre"
 msgstr ""
 
-#: ../picard/util/tags.py:64
+#: ../picard/util/tags.py:65
 msgid "Encoded By"
 msgstr ""
 
-#: ../picard/util/tags.py:65
+#: ../picard/util/tags.py:66
 msgid "Performer"
 msgstr ""
 
-#: ../picard/util/tags.py:66
+#: ../picard/util/tags.py:67
 msgid "Release Type"
 msgstr ""
 
-#: ../picard/util/tags.py:67
+#: ../picard/util/tags.py:68
 msgid "Release Status"
 msgstr ""
 
-#: ../picard/util/tags.py:68
+#: ../picard/util/tags.py:69
 msgid "Release Country"
 msgstr ""
 
-#: ../picard/util/tags.py:69
+#: ../picard/util/tags.py:70
 msgid "Record Label"
 msgstr ""
 
-#: ../picard/util/tags.py:70
+#: ../picard/util/tags.py:71
 msgid "Barcode"
 msgstr ""
 
-#: ../picard/util/tags.py:71
+#: ../picard/util/tags.py:72
 msgid "Catalog Number"
 msgstr ""
 
-#: ../picard/util/tags.py:72
+#: ../picard/util/tags.py:73
 msgid "Format"
 msgstr ""
 
-#: ../picard/util/tags.py:73
+#: ../picard/util/tags.py:74
 msgid "DJ-Mixer"
 msgstr ""
 
-#: ../picard/util/tags.py:74
+#: ../picard/util/tags.py:75
 msgid "Media"
 msgstr ""
 
-#: ../picard/util/tags.py:75
+#: ../picard/util/tags.py:76
 msgid "Lyrics"
 msgstr ""
 
-#: ../picard/util/tags.py:76
+#: ../picard/util/tags.py:77
 msgid "Mixer"
 msgstr ""
 
-#: ../picard/util/tags.py:77
+#: ../picard/util/tags.py:78
 msgid "Language"
 msgstr ""
 
-#: ../picard/util/tags.py:78
+#: ../picard/util/tags.py:79
 msgid "Script"
 msgstr ""
 
diff --git a/po/en_CA.po b/po/en_CA.po
index d2cd69094..b48dd3541 100644
--- a/po/en_CA.po
+++ b/po/en_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: 2009-02-24 18:58+0100\n"
+"POT-Creation-Date: 2009-04-06 22:50+0200\n"
 "PO-Revision-Date: 2009-01-25 13:15+0000\n"
 "Last-Translator: Philipp Wolfer <Unknown>\n"
 "Language-Team: English (Canada) <en_CA@li.org>\n"
@@ -18,16 +18,16 @@ msgstr ""
 "X-Launchpad-Export-Date: 2009-04-06 20:21+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
-#: ../picard/album.py:108 ../picard/cluster.py:248
+#: ../picard/album.py:109 ../picard/cluster.py:248
 msgid "Unmatched Files"
 msgstr "Unmatched Files"
 
-#: ../picard/album.py:281
+#: ../picard/album.py:287
 #, python-format
 msgid "[could not load album %s]"
 msgstr ""
 
-#: ../picard/album.py:317
+#: ../picard/album.py:320
 msgid "[loading album information]"
 msgstr "[loading album information]"
 
@@ -587,7 +587,7 @@ msgid "Namibia"
 msgstr ""
 
 #: ../picard/const.py:182
-msgid "Vanuat"
+msgid "Vanuatu"
 msgstr ""
 
 #: ../picard/const.py:183
@@ -1031,223 +1031,234 @@ msgid "Congo, The Democratic Republic of the"
 msgstr ""
 
 #: ../picard/const.py:293
-msgid "Serbia and Montenegro"
+msgid "Serbia and Montenegro (historical, 2003-2006)"
 msgstr ""
 
 #: ../picard/const.py:294
-msgid "Croatia"
+msgid "Serbia"
 msgstr ""
 
 #: ../picard/const.py:295
-msgid "Korea (North), Democratic People's Republic of"
+msgid "Montenegro"
 msgstr ""
 
 #: ../picard/const.py:296
-msgid "Korea (South), Republic of"
+msgid "Croatia"
 msgstr ""
 
 #: ../picard/const.py:297
-msgid "Slovakia"
+msgid "Korea (North), Democratic People's Republic of"
 msgstr ""
 
 #: ../picard/const.py:298
-msgid "Soviet Union (historical, 1922-1991)"
+msgid "Korea (South), Republic of"
 msgstr ""
 
 #: ../picard/const.py:299
-msgid "East Timor"
+msgid "Slovakia"
 msgstr ""
 
 #: ../picard/const.py:300
-msgid "Czechoslovakia (historical, 1918-1992)"
+msgid "Soviet Union (historical, 1922-1991)"
 msgstr ""
 
 #: ../picard/const.py:301
-msgid "Europe"
+msgid "East Timor"
 msgstr ""
 
 #: ../picard/const.py:302
-msgid "East Germany (historical, 1949-1990)"
+msgid "Czechoslovakia (historical, 1918-1992)"
 msgstr ""
 
 #: ../picard/const.py:303
-msgid "[Unknown Country]"
+msgid "Europe"
 msgstr ""
 
 #: ../picard/const.py:304
-msgid "[Worldwide]"
+msgid "East Germany (historical, 1949-1990)"
 msgstr ""
 
 #: ../picard/const.py:305
+msgid "[Unknown Country]"
+msgstr ""
+
+#: ../picard/const.py:306
+msgid "[Worldwide]"
+msgstr ""
+
+#: ../picard/const.py:307
 msgid "Yugoslavia (historical, 1918-1992)"
 msgstr ""
 
-#: ../picard/const.py:310
-msgid "Catalan"
-msgstr ""
-
-#: ../picard/const.py:311
-msgid "Czech"
-msgstr ""
-
 #: ../picard/const.py:312
-msgid "Welsh"
+msgid "Afrikaans"
 msgstr ""
 
 #: ../picard/const.py:313
-msgid "Danish"
+msgid "Arabic"
 msgstr ""
 
 #: ../picard/const.py:314
-msgid "German"
+msgid "Catalan"
 msgstr ""
 
 #: ../picard/const.py:315
-msgid "English"
+msgid "Czech"
 msgstr ""
 
 #: ../picard/const.py:316
-msgid "English (Canada)"
+msgid "Welsh"
 msgstr ""
 
 #: ../picard/const.py:317
-msgid "English (UK)"
+msgid "Danish"
 msgstr ""
 
 #: ../picard/const.py:318
-msgid "Spanish"
+msgid "German"
 msgstr ""
 
 #: ../picard/const.py:319
-msgid "Persian"
+msgid "English"
 msgstr ""
 
 #: ../picard/const.py:320
-msgid "Finnish"
+msgid "English (Canada)"
 msgstr ""
 
 #: ../picard/const.py:321
-msgid "French"
+msgid "English (UK)"
 msgstr ""
 
 #: ../picard/const.py:322
-msgid "Frisian"
+msgid "Spanish"
 msgstr ""
 
 #: ../picard/const.py:323
-msgid "Hebrew"
+msgid "Persian"
 msgstr ""
 
 #: ../picard/const.py:324
-msgid "Hungarian"
+msgid "Finnish"
 msgstr ""
 
 #: ../picard/const.py:325
-msgid "Islandic"
+msgid "French"
 msgstr ""
 
 #: ../picard/const.py:326
-msgid "Italian"
+msgid "Frisian"
 msgstr ""
 
 #: ../picard/const.py:327
-msgid "Kannada"
+msgid "Hebrew"
 msgstr ""
 
 #: ../picard/const.py:328
-msgid "Korean"
+msgid "Hindi"
 msgstr ""
 
 #: ../picard/const.py:329
-msgid "Lithuanian"
+msgid "Hungarian"
 msgstr ""
 
 #: ../picard/const.py:330
-msgid "Norwegian Bokmal"
+msgid "Islandic"
 msgstr ""
 
 #: ../picard/const.py:331
-msgid "Dutch"
+msgid "Italian"
 msgstr ""
 
 #: ../picard/const.py:332
-msgid "Polish"
+msgid "Kannada"
 msgstr ""
 
 #: ../picard/const.py:333
-msgid "Portuguese"
+msgid "Korean"
 msgstr ""
 
 #: ../picard/const.py:334
-msgid "Brazilian Portuguese"
+msgid "Lithuanian"
 msgstr ""
 
 #: ../picard/const.py:335
-msgid "Romanian"
+msgid "Norwegian Bokmal"
 msgstr ""
 
 #: ../picard/const.py:336
-msgid "Russian"
+msgid "Dutch"
 msgstr ""
 
 #: ../picard/const.py:337
-msgid "Scots"
+msgid "Polish"
 msgstr ""
 
 #: ../picard/const.py:338
-msgid "Slovak"
+msgid "Portuguese"
 msgstr ""
 
 #: ../picard/const.py:339
-msgid "Slovenian"
+msgid "Brazilian Portuguese"
 msgstr ""
 
 #: ../picard/const.py:340
-msgid "Swedish"
+msgid "Romanian"
 msgstr ""
 
 #: ../picard/const.py:341
+msgid "Russian"
+msgstr ""
+
+#: ../picard/const.py:342
+msgid "Scots"
+msgstr ""
+
+#: ../picard/const.py:343
+msgid "Slovak"
+msgstr ""
+
+#: ../picard/const.py:344
+msgid "Slovenian"
+msgstr ""
+
+#: ../picard/const.py:345
+msgid "Swedish"
+msgstr ""
+
+#: ../picard/const.py:346
+msgid "Turkish"
+msgstr ""
+
+#: ../picard/const.py:347
 msgid "Chinese"
 msgstr ""
 
-#: ../picard/file.py:487
+#: ../picard/file.py:494
 #, python-format
 msgid "No matching tracks for file %s"
 msgstr "No matching tracks for file %s"
 
-#: ../picard/file.py:504
+#: ../picard/file.py:511
 #, python-format
 msgid "No matching tracks above the threshold for file %s"
 msgstr ""
 
-#: ../picard/file.py:507
+#: ../picard/file.py:514
 #, python-format
 msgid "File %s identified!"
 msgstr "File %s identified!"
 
-#: ../picard/file.py:518
+#: ../picard/file.py:525
 #, python-format
 msgid "Looking up the PUID for file %s..."
 msgstr "Looking up the PUID for file %s..."
 
-#: ../picard/file.py:523
+#: ../picard/file.py:530
 #, 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)"
@@ -1260,11 +1271,24 @@ msgstr "PLS Playlist (*.pls)"
 msgid "XSPF Playlist (*.xspf)"
 msgstr "XSPF Playlist (*.xspf)"
 
-#: ../picard/tagger.py:476
+#: ../picard/puidmanager.py:62
+msgid "Submitting PUIDs..."
+msgstr "Submitting PUIDs..."
+
+#: ../picard/puidmanager.py:68
+#, python-format
+msgid "PUIDs submission failed: %s"
+msgstr "PUIDs submission failed: %s"
+
+#: ../picard/puidmanager.py:70
+msgid "PUIDs successfully submitted!"
+msgstr "PUIDs successfully submitted!"
+
+#: ../picard/tagger.py:477
 msgid "CD Lookup Error"
 msgstr "CD Lookup Error"
 
-#: ../picard/tagger.py:477
+#: ../picard/tagger.py:478
 #, python-format
 msgid ""
 "Error while reading CD:\n"
@@ -1275,7 +1299,7 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../picard/tagger.py:503
+#: ../picard/tagger.py:504
 #, python-format
 msgid "Could not find PUID for file %s"
 msgstr ""
@@ -1328,15 +1352,27 @@ msgstr ""
 msgid "Length"
 msgstr "Length"
 
-#: ../picard/ui/itemviews.py:327
+#: ../picard/ui/itemviews.py:289
+msgid "&Expand all"
+msgstr ""
+
+#: ../picard/ui/itemviews.py:291
+msgid "&Collapse all"
+msgstr ""
+
+#: ../picard/ui/itemviews.py:332
 msgid "&Releases"
 msgstr "&Releases"
 
-#: ../picard/ui/itemviews.py:353
+#: ../picard/ui/itemviews.py:349
+msgid "No release event"
+msgstr ""
+
+#: ../picard/ui/itemviews.py:359
 msgid "&Plugins"
 msgstr "&Plugins"
 
-#: ../picard/ui/itemviews.py:523
+#: ../picard/ui/itemviews.py:533
 msgid "Clusters"
 msgstr "Clusters"
 
@@ -1344,95 +1380,6 @@ msgstr "Clusters"
 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:66 ../picard/ui/ui_options_plugins.py:62
-msgid "Details"
-msgstr "Details"
-
-#: ../picard/ui/tageditor.py:71 ../picard/ui/tageditor.py:264
-#, python-format
-msgid "%d file"
-msgid_plural "%d files"
-msgstr[0] "%d file"
-msgstr[1] "%d files"
-
-#: ../picard/ui/tageditor.py:131
-#, 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:134
-#, 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:233
-msgid "Filename:"
-msgstr "Filename:"
-
-#: ../picard/ui/tageditor.py:235
-msgid "Format:"
-msgstr "Format:"
-
-#: ../picard/ui/tageditor.py:244
-msgid "Size:"
-msgstr "Size:"
-
-#: ../picard/ui/tageditor.py:248 ../picard/ui/ui_metadata.py:127
-msgid "Length:"
-msgstr "Length:"
-
-#: ../picard/ui/tageditor.py:250
-msgid "Bitrate:"
-msgstr "Bitrate:"
-
-#: ../picard/ui/tageditor.py:252
-msgid "Sample rate:"
-msgstr "Sample rate:"
-
-#: ../picard/ui/tageditor.py:254
-msgid "Bits per sample:"
-msgstr "Bits per sample:"
-
-#: ../picard/ui/tageditor.py:257
-msgid "Mono"
-msgstr "Mono"
-
-#: ../picard/ui/tageditor.py:258
-msgid "Stereo"
-msgstr "Stereo"
-
-#: ../picard/ui/tageditor.py:260
-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"
@@ -1669,6 +1616,10 @@ msgstr "&Search Bar"
 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"
@@ -1688,12 +1639,97 @@ msgstr "Playlist %s saved"
 msgid " (Error: %s)"
 msgstr " (Error: %s)"
 
+#: ../picard/ui/puidsubmit.py:31 ../picard/ui/options/plugins.py:85
+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/passworddialog.py:38
 #, python-format
 msgid ""
 "The server %s requires you to login. Please enter your username and password."
 msgstr ""
 
+#: ../picard/ui/tageditor.py:66 ../picard/ui/ui_options_plugins.py:62
+msgid "Details"
+msgstr "Details"
+
+#: ../picard/ui/tageditor.py:71 ../picard/ui/tageditor.py:264
+#, python-format
+msgid "%d file"
+msgid_plural "%d files"
+msgstr[0] "%d file"
+msgstr[1] "%d files"
+
+#: ../picard/ui/tageditor.py:131
+#, 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:134
+#, 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:233
+msgid "Filename:"
+msgstr "Filename:"
+
+#: ../picard/ui/tageditor.py:235
+msgid "Format:"
+msgstr "Format:"
+
+#: ../picard/ui/tageditor.py:244
+msgid "Size:"
+msgstr "Size:"
+
+#: ../picard/ui/tageditor.py:248 ../picard/ui/ui_metadata.py:127
+msgid "Length:"
+msgstr "Length:"
+
+#: ../picard/ui/tageditor.py:250
+msgid "Bitrate:"
+msgstr "Bitrate:"
+
+#: ../picard/ui/tageditor.py:252
+msgid "Sample rate:"
+msgstr "Sample rate:"
+
+#: ../picard/ui/tageditor.py:254
+msgid "Bits per sample:"
+msgstr "Bits per sample:"
+
+#: ../picard/ui/tageditor.py:257
+msgid "Mono"
+msgstr "Mono"
+
+#: ../picard/ui/tageditor.py:258
+msgid "Stereo"
+msgstr "Stereo"
+
+#: ../picard/ui/tageditor.py:260
+msgid "Channels:"
+msgstr "Channels:"
+
+#: ../picard/ui/tagsfromfilenames.py:54 ../picard/ui/tagsfromfilenames.py:99
+msgid "File Name"
+msgstr "File Name"
+
 #: ../picard/ui/ui_cdlookup.py:60 ../picard/ui/ui_options_cdlookup.py:47
 #: ../picard/ui/ui_options_cdlookup_select.py:48
 #: ../picard/ui/options/cdlookup.py:36
@@ -1716,24 +1752,6 @@ msgstr "    Lookup manually    "
 msgid "Cancel"
 msgstr "Cancel"
 
-#: ../picard/ui/ui_passworddialog.py:78
-msgid "Authentication required"
-msgstr ""
-
-#: ../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/ui_passworddialog.py:80 ../picard/ui/ui_options_proxy.py:82
-#: ../picard/ui/ui_options_general.py:112
-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"
@@ -1770,6 +1788,10 @@ msgstr "Album:"
 msgid "Options"
 msgstr "Options"
 
+#: ../picard/ui/ui_puidsubmit.py:52
+msgid "Submit PUIDs"
+msgstr "Submit PUIDs"
+
 #: ../picard/ui/ui_options_cdlookup.py:48
 msgid "CD-ROM device to use for lookups:"
 msgstr "CD-ROM device to use for lookups:"
@@ -1794,6 +1816,23 @@ msgstr "Save cover images as separate files"
 msgid "Overwrite the file if it already exists"
 msgstr "Overwrite the file if it already exists"
 
+#: ../picard/ui/ui_options_moving.py:53
+msgid "Move additional files:"
+msgstr "Move additional files:"
+
+#: ../picard/ui/ui_options_moving.py:54
+msgid "Browse..."
+msgstr "Browse..."
+
+#: ../picard/ui/ui_options_moving.py:55
+msgid "Delete empty directories"
+msgstr "Delete empty directories"
+
+#: ../picard/ui/ui_options_moving.py:56
+#, fuzzy
+msgid "Move files to this directory when saving:"
+msgstr "Move tagged files to this directory:"
+
 #: ../picard/ui/util.py:31
 msgid "&Ok"
 msgstr "&Ok"
@@ -1802,44 +1841,40 @@ msgstr "&Ok"
 msgid "&Cancel"
 msgstr "&Cancel"
 
-#: ../picard/ui/ui_puidsubmit.py:52
-msgid "Submit PUIDs"
-msgstr "Submit PUIDs"
-
-#: ../picard/ui/ui_tageditor.py:139 ../picard/ui/ui_options_plugins.py:59
-#: ../picard/ui/options/plugins.py:76
+#: ../picard/ui/ui_tageditor.py:128 ../picard/ui/ui_options_plugins.py:59
+#: ../picard/ui/options/plugins.py:81
 msgid "Name"
 msgstr "Name"
 
-#: ../picard/ui/ui_tageditor.py:140
+#: ../picard/ui/ui_tageditor.py:129
 msgid "Value"
 msgstr "Value"
 
-#: ../picard/ui/ui_tageditor.py:141
+#: ../picard/ui/ui_tageditor.py:130
 msgid "Rating:"
 msgstr ""
 
-#: ../picard/ui/ui_tageditor.py:142
+#: ../picard/ui/ui_tageditor.py:131
 msgid "&Add..."
 msgstr "&Add..."
 
-#: ../picard/ui/ui_tageditor.py:143
+#: ../picard/ui/ui_tageditor.py:132
 msgid "&Edit..."
 msgstr "&Edit..."
 
-#: ../picard/ui/ui_tageditor.py:144
+#: ../picard/ui/ui_tageditor.py:133
 msgid "&Delete"
 msgstr "&Delete"
 
-#: ../picard/ui/ui_tageditor.py:145
+#: ../picard/ui/ui_tageditor.py:134
 msgid "&Metadata"
 msgstr "&Metadata"
 
-#: ../picard/ui/ui_tageditor.py:146
+#: ../picard/ui/ui_tageditor.py:135
 msgid "A&rtwork"
 msgstr "A&rtwork"
 
-#: ../picard/ui/ui_tageditor.py:147
+#: ../picard/ui/ui_tageditor.py:136
 msgid "&Info"
 msgstr "&Info"
 
@@ -1884,6 +1919,40 @@ msgstr ""
 msgid ", "
 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:72
+msgid "Port:"
+msgstr "Port:"
+
+#: ../picard/ui/ui_options_general.py:110 ../picard/ui/ui_options_proxy.py:73
+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:112 ../picard/ui/ui_options_proxy.py:70
+#: ../picard/ui/ui_passworddialog.py:80
+msgid "Password:"
+msgstr "Password:"
+
+#: ../picard/ui/ui_options_general.py:113 ../picard/ui/ui_options_proxy.py:71
+#: ../picard/ui/ui_passworddialog.py:79
+msgid "Username:"
+msgstr "Username:"
+
+#: ../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_interface.py:50
 msgid "Miscellaneous"
 msgstr ""
@@ -1904,113 +1973,6 @@ msgstr ""
 msgid "User interface language:"
 msgstr ""
 
-#: ../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_options_naming.py:180
-#: ../picard/ui/ui_tagsfromfilenames.py:58
-msgid "&Preview"
-msgstr "&Preview"
-
-#: ../picard/ui/ui_options_proxy.py:81 ../picard/ui/options/proxy.py:28
-msgid "Web Proxy"
-msgstr "Web Proxy"
-
-#: ../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 "Server address:"
-
-#: ../picard/ui/ui_options_ratings.py:45
-msgid "Enable track ratings"
-msgstr ""
-
-#: ../picard/ui/ui_options_ratings.py:46
-msgid ""
-"Picard saves the ratings together with an e-mail address identifying the "
-"user who did the rating. That way different ratings for different users can "
-"be stored in the files. Please sepcify the e-mail you want to use to save "
-"your ratings."
-msgstr ""
-
-#: ../picard/ui/ui_options_ratings.py:47
-msgid "E-mail:"
-msgstr ""
-
-#: ../picard/ui/ui_options_general.py:108
-msgid "MusicBrainz Server"
-msgstr "MusicBrainz Server"
-
-#: ../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"
@@ -2067,74 +2029,152 @@ msgstr "Various artists:"
 msgid "Non-album tracks:"
 msgstr "Non-album tracks:"
 
-#: ../picard/ui/ui_options_plugins.py:58 ../picard/ui/options/plugins.py:30
+#: ../picard/ui/ui_options_metadata.py:109
+#: ../picard/ui/ui_options_metadata.py:110
+#: ../picard/ui/ui_options_renaming.py:155
+#: ../picard/ui/ui_options_renaming.py:158
+msgid "Default"
+msgstr "Default"
+
+#: ../picard/ui/ui_options_plugins.py:58 ../picard/ui/options/plugins.py:34
 msgid "Plugins"
 msgstr "Plugins"
 
-#: ../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:84
 msgid "Author"
 msgstr "Author"
 
-#: ../picard/ui/ui_options_plugins.py:61 ../picard/util/tags.py:36
+#: ../picard/ui/ui_options_plugins.py:61 ../picard/util/tags.py:37
 msgid "Version"
 msgstr "Version"
 
-#: ../picard/ui/ui_options_script.py:52
+#: ../picard/ui/ui_options_proxy.py:69 ../picard/ui/options/proxy.py:28
+msgid "Web Proxy"
+msgstr "Web Proxy"
+
+#: ../picard/ui/ui_options_ratings.py:45
+msgid "Enable track ratings"
+msgstr ""
+
+#: ../picard/ui/ui_options_ratings.py:46
+msgid ""
+"Picard saves the ratings together with an e-mail address identifying the "
+"user who did the rating. That way different ratings for different users can "
+"be stored in the files. Please sepcify the e-mail you want to use to save "
+"your ratings."
+msgstr ""
+
+#: ../picard/ui/ui_options_ratings.py:47
+msgid "E-mail:"
+msgstr ""
+
+#: ../picard/ui/ui_options_renaming.py:145
+#, fuzzy
+msgid "Form"
+msgstr "Format:"
+
+#: ../picard/ui/ui_options_renaming.py:146
+#, fuzzy
+msgid "Rename files when saving"
+msgstr "Rename Files"
+
+#: ../picard/ui/ui_options_renaming.py:147
+msgid "Replace non-ASCII characters"
+msgstr "Replace non-ASCII characters"
+
+#: ../picard/ui/ui_options_renaming.py:148
+msgid "Replace Windows-incompatible characters"
+msgstr "Replace Windows-incompatible characters"
+
+#: ../picard/ui/ui_options_renaming.py:149
+msgid "Name files like this"
+msgstr ""
+
+#: ../picard/ui/ui_options_renaming.py:156
+msgid "Name multiple artist albums differently"
+msgstr ""
+
+#: ../picard/ui/ui_options_renaming.py:157
+msgid "Copy from above"
+msgstr ""
+
+#: ../picard/ui/ui_options_renaming.py:159
+#, fuzzy
+msgid "Examples"
+msgstr "Example"
+
+#: ../picard/ui/ui_options_script.py:43
 msgid "Tagger Script"
 msgstr "Tagger Script"
 
-#: ../picard/ui/ui_options_tags.py:85
-msgid "Common"
-msgstr "Common"
+#: ../picard/ui/ui_options_tags.py:97
+#, fuzzy
+msgid "Do not write tags to files"
+msgstr "Don't write tags to files"
 
-#: ../picard/ui/ui_options_tags.py:86
-msgid "Clear existing tags before writing new tags"
-msgstr "Clear existing tags before writing new tags"
-
-#: ../picard/ui/ui_options_tags.py:87
-msgid "Don not write tags to files"
+#: ../picard/ui/ui_options_tags.py:98
+msgid "Before tagging"
 msgstr ""
 
-#: ../picard/ui/ui_options_tags.py:88
-msgid "ID3"
-msgstr "ID3"
+#: ../picard/ui/ui_options_tags.py:99
+#, fuzzy
+msgid "Clear existing tags"
+msgstr "Clear existing tags before writing new tags"
 
-#: ../picard/ui/ui_options_tags.py:89
-msgid "Write ID3v1 tags to the files"
-msgstr "Write ID3v1 tags to the files"
-
-#: ../picard/ui/ui_options_tags.py:90
-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:91
-msgid "Text encoding to use while writing ID3v2 tags:"
-msgstr "Text encoding to use while writing ID3v2 tags:"
-
-#: ../picard/ui/ui_options_tags.py:92
-msgid "ISO-8859-1"
-msgstr "ISO-8859-1"
-
-#: ../picard/ui/ui_options_tags.py:93
-msgid "UTF-16"
-msgstr "UTF-16"
-
-#: ../picard/ui/ui_options_tags.py:94
-msgid "UTF-8"
-msgstr "UTF-8"
-
-#: ../picard/ui/ui_options_tags.py:95
+#: ../picard/ui/ui_options_tags.py:100
 msgid "Remove ID3 tags from FLAC files"
 msgstr "Remove ID3 tags from FLAC files"
 
-#: ../picard/ui/ui_options_tags.py:96
-msgid "APE"
-msgstr "APE"
-
-#: ../picard/ui/ui_options_tags.py:97
+#: ../picard/ui/ui_options_tags.py:101
 msgid "Remove APEv2 tags from MP3 files"
 msgstr "Remove APEv2 tags from MP3 files"
 
+#: ../picard/ui/ui_options_tags.py:102
+msgid "Tag compatibility"
+msgstr ""
+
+#: ../picard/ui/ui_options_tags.py:103
+#, fuzzy
+msgid "ID3v2 version"
+msgstr "Version"
+
+#: ../picard/ui/ui_options_tags.py:104
+msgid "2.4"
+msgstr ""
+
+#: ../picard/ui/ui_options_tags.py:105
+msgid "2.3"
+msgstr ""
+
+#: ../picard/ui/ui_options_tags.py:106
+#, fuzzy
+msgid "Also include ID3v1 tags in the files"
+msgstr "Write ID3v1 tags to the files"
+
+#: ../picard/ui/ui_options_tags.py:107
+msgid "ID3v2 text encoding"
+msgstr ""
+
+#: ../picard/ui/ui_options_tags.py:108
+msgid "UTF-8"
+msgstr "UTF-8"
+
+#: ../picard/ui/ui_options_tags.py:109
+msgid "UTF-16"
+msgstr "UTF-16"
+
+#: ../picard/ui/ui_options_tags.py:110
+msgid "ISO-8859-1"
+msgstr "ISO-8859-1"
+
+#: ../picard/ui/ui_passworddialog.py:78
+msgid "Authentication required"
+msgstr ""
+
+#: ../picard/ui/ui_passworddialog.py:81
+msgid "Save username and password"
+msgstr ""
+
 #: ../picard/ui/ui_tagsfromfilenames.py:56
 msgid "Convert File Names to Tags"
 msgstr "Convert File Names to Tags"
@@ -2143,6 +2183,10 @@ msgstr "Convert File Names to Tags"
 msgid "Replace underscores with spaces"
 msgstr "Replace underscores with spaces"
 
+#: ../picard/ui/ui_tagsfromfilenames.py:58
+msgid "&Preview"
+msgstr "&Preview"
+
 #: ../picard/ui/options/about.py:29
 msgid "About"
 msgstr "About"
@@ -2168,8 +2212,8 @@ 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"
@@ -2177,14 +2221,13 @@ msgid ""
 "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\"><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/P"
-"icardTagger</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
@@ -2217,257 +2260,266 @@ msgstr "Matching"
 msgid "None"
 msgstr ""
 
-#: ../picard/ui/options/naming.py:33
-msgid "File Naming"
-msgstr "File Naming"
+#: ../picard/ui/options/moving.py:33
+#, fuzzy
+msgid "Moving files"
+msgstr "Move Files"
 
-#: ../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 ""
-
-#: ../picard/ui/options/naming.py:95
-msgid "The multiple artist file naming format must not be empty."
-msgstr ""
-
-#: ../picard/ui/options/naming.py:97
+#: ../picard/ui/options/moving.py:65
 msgid "Error"
 msgstr ""
 
-#: ../picard/ui/options/naming.py:97
+#: ../picard/ui/options/moving.py:65
 msgid "The location to move files to must not be empty."
 msgstr ""
 
+#: ../picard/ui/options/ratings.py:29
+msgid "Ratings"
+msgstr ""
+
+#: ../picard/ui/options/tags.py:29
+msgid "Tags"
+msgstr "Tags"
+
+#: ../picard/ui/options/renaming.py:35
+#, fuzzy
+msgid "File naming"
+msgstr "File Naming"
+
+#: ../picard/ui/options/renaming.py:123
+msgid "The file naming format must not be empty."
+msgstr ""
+
+#: ../picard/ui/options/renaming.py:133
+msgid "The multiple artist file naming format 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/ui/options/ratings.py:29
-msgid "Ratings"
-msgstr ""
+#: ../picard/ui/options/scripting.py:97
+msgid "Script Error"
+msgstr "Script Error"
 
 #: ../picard/util/tags.py:24
 msgid "Date"
 msgstr "Date"
 
 #: ../picard/util/tags.py:25
+#, fuzzy
+msgid "Original Release Date"
+msgstr "Original Metadata"
+
+#: ../picard/util/tags.py:26
 msgid "Album Artist"
 msgstr "Album Artist"
 
-#: ../picard/util/tags.py:26
+#: ../picard/util/tags.py:27
 msgid "Track Number"
 msgstr "Track Number"
 
-#: ../picard/util/tags.py:27
+#: ../picard/util/tags.py:28
 msgid "Total Tracks"
 msgstr "Total Tracks"
 
-#: ../picard/util/tags.py:28
+#: ../picard/util/tags.py:29
 msgid "Disc Number"
 msgstr "Disc Number"
 
-#: ../picard/util/tags.py:29
+#: ../picard/util/tags.py:30
 msgid "Total Discs"
 msgstr "Total Discs"
 
-#: ../picard/util/tags.py:30
+#: ../picard/util/tags.py:31
 msgid "Album Artist Sort Order"
 msgstr "Album Artist Sort Order"
 
-#: ../picard/util/tags.py:31
+#: ../picard/util/tags.py:32
 msgid "Artist Sort Order"
 msgstr "Artist Sort Order"
 
-#: ../picard/util/tags.py:32
+#: ../picard/util/tags.py:33
 msgid "Title Sort Order"
 msgstr "Title Sort Order"
 
-#: ../picard/util/tags.py:33
+#: ../picard/util/tags.py:34
 msgid "Album Sort Order"
 msgstr "Album Sort Order"
 
-#: ../picard/util/tags.py:34
+#: ../picard/util/tags.py:35
 msgid "ASIN"
 msgstr "ASIN"
 
-#: ../picard/util/tags.py:35
+#: ../picard/util/tags.py:36
 msgid "Grouping"
 msgstr "Grouping"
 
-#: ../picard/util/tags.py:37
+#: ../picard/util/tags.py:38
 msgid "ISRC"
 msgstr "ISRC"
 
-#: ../picard/util/tags.py:38
+#: ../picard/util/tags.py:39
 msgid "Mood"
 msgstr "Mood"
 
-#: ../picard/util/tags.py:39
+#: ../picard/util/tags.py:40
 msgid "BPM"
 msgstr "BPM"
 
-#: ../picard/util/tags.py:40
+#: ../picard/util/tags.py:41
 msgid "Copyright"
 msgstr "Copyright"
 
-#: ../picard/util/tags.py:41
+#: ../picard/util/tags.py:42
 msgid "Composer"
 msgstr "Composer"
 
-#: ../picard/util/tags.py:42
+#: ../picard/util/tags.py:43
 msgid "Conductor"
 msgstr "Conductor"
 
-#: ../picard/util/tags.py:43
+#: ../picard/util/tags.py:44
 msgid "Lyricist"
 msgstr "Lyricist"
 
-#: ../picard/util/tags.py:44
+#: ../picard/util/tags.py:45
 msgid "Arranger"
 msgstr "Arranger"
 
-#: ../picard/util/tags.py:45
+#: ../picard/util/tags.py:46
 msgid "Producer"
 msgstr "Producer"
 
-#: ../picard/util/tags.py:46
+#: ../picard/util/tags.py:47
 msgid "Engineer"
 msgstr "Engineer"
 
-#: ../picard/util/tags.py:47
+#: ../picard/util/tags.py:48
 msgid "Subtitle"
 msgstr "Subtitle"
 
-#: ../picard/util/tags.py:48
+#: ../picard/util/tags.py:49
 msgid "Disc Subtitle"
 msgstr "Disc Subtitle"
 
-#: ../picard/util/tags.py:49
+#: ../picard/util/tags.py:50
 msgid "Remixer"
 msgstr "Remixer"
 
-#: ../picard/util/tags.py:50
+#: ../picard/util/tags.py:51
 msgid "MusicBrainz Track Id"
 msgstr "MusicBrainz Track Id"
 
-#: ../picard/util/tags.py:51
+#: ../picard/util/tags.py:52
 msgid "MusicBrainz Release Id"
 msgstr "MusicBrainz Release Id"
 
-#: ../picard/util/tags.py:52
+#: ../picard/util/tags.py:53
 msgid "MusicBrainz Artist Id"
 msgstr "MusicBrainz Artist Id"
 
-#: ../picard/util/tags.py:53
+#: ../picard/util/tags.py:54
 msgid "MusicBrainz Release Artist Id"
 msgstr "MusicBrainz Release Artist Id"
 
-#: ../picard/util/tags.py:54
+#: ../picard/util/tags.py:55
 msgid "MusicBrainz TRM Id"
 msgstr "MusicBrainz TRM Id"
 
-#: ../picard/util/tags.py:55
+#: ../picard/util/tags.py:56
 msgid "MusicBrainz Disc Id"
 msgstr ""
 
-#: ../picard/util/tags.py:56
+#: ../picard/util/tags.py:57
 msgid "MusicBrainz Sort Name"
 msgstr ""
 
-#: ../picard/util/tags.py:57
+#: ../picard/util/tags.py:58
 msgid "MusicIP PUID"
 msgstr "MusicIP PUID"
 
-#: ../picard/util/tags.py:58
+#: ../picard/util/tags.py:59
 msgid "MusicIP Fingerprint"
 msgstr ""
 
-#: ../picard/util/tags.py:59
+#: ../picard/util/tags.py:60
 msgid "Disc Id"
 msgstr ""
 
-#: ../picard/util/tags.py:60
+#: ../picard/util/tags.py:61
 msgid "Website"
 msgstr "Website"
 
-#: ../picard/util/tags.py:61
+#: ../picard/util/tags.py:62
 msgid "Compilation"
 msgstr "Compilation"
 
-#: ../picard/util/tags.py:62
+#: ../picard/util/tags.py:63
 msgid "Comment"
 msgstr "Comment"
 
-#: ../picard/util/tags.py:63
+#: ../picard/util/tags.py:64
 msgid "Genre"
 msgstr "Genre"
 
-#: ../picard/util/tags.py:64
+#: ../picard/util/tags.py:65
 msgid "Encoded By"
 msgstr "Encoded By"
 
-#: ../picard/util/tags.py:65
+#: ../picard/util/tags.py:66
 msgid "Performer"
 msgstr "Performer"
 
-#: ../picard/util/tags.py:66
+#: ../picard/util/tags.py:67
 msgid "Release Type"
 msgstr "Release Type"
 
-#: ../picard/util/tags.py:67
+#: ../picard/util/tags.py:68
 msgid "Release Status"
 msgstr "Release Status"
 
-#: ../picard/util/tags.py:68
+#: ../picard/util/tags.py:69
 msgid "Release Country"
 msgstr "Release Country"
 
-#: ../picard/util/tags.py:69
+#: ../picard/util/tags.py:70
 msgid "Record Label"
 msgstr "Record Label"
 
-#: ../picard/util/tags.py:70
+#: ../picard/util/tags.py:71
 msgid "Barcode"
 msgstr "Barcode"
 
-#: ../picard/util/tags.py:71
+#: ../picard/util/tags.py:72
 msgid "Catalog Number"
 msgstr "Catalog Number"
 
-#: ../picard/util/tags.py:72
+#: ../picard/util/tags.py:73
 msgid "Format"
 msgstr ""
 
-#: ../picard/util/tags.py:73
+#: ../picard/util/tags.py:74
 msgid "DJ-Mixer"
 msgstr "DJ-Mixer"
 
-#: ../picard/util/tags.py:74
+#: ../picard/util/tags.py:75
 msgid "Media"
 msgstr "Media"
 
-#: ../picard/util/tags.py:75
+#: ../picard/util/tags.py:76
 msgid "Lyrics"
 msgstr "Lyrics"
 
-#: ../picard/util/tags.py:76
+#: ../picard/util/tags.py:77
 msgid "Mixer"
 msgstr "Mixer"
 
-#: ../picard/util/tags.py:77
+#: ../picard/util/tags.py:78
 msgid "Language"
 msgstr ""
 
-#: ../picard/util/tags.py:78
+#: ../picard/util/tags.py:79
 msgid "Script"
 msgstr ""
 
@@ -2486,28 +2538,51 @@ msgstr ""
 "\n"
 "%s"
 
-#, python-format
+#~ msgid "Multiple artist file naming format:"
+#~ msgstr "Multiple artist file naming format:"
+
+#~ msgid "File naming format:"
+#~ msgstr "File naming format:"
+
+#~ msgid "File name:"
+#~ msgstr "File name:"
+
+#~ msgid "Multiple artist file name:"
+#~ msgstr "Multiple artist file name:"
+
+#~ msgid "Common"
+#~ msgstr "Common"
+
+#~ msgid "ID3"
+#~ msgstr "ID3"
+
+#~ msgid "Write ID3v2 version 2.3 tags (2.4 is default)"
+#~ msgstr "Write ID3v2 version 2.3 tags (2.4 is default)"
+
+#~ msgid "Text encoding to use while writing ID3v2 tags:"
+#~ msgstr "Text encoding to use while writing ID3v2 tags:"
+
+#~ msgid "APE"
+#~ msgstr "APE"
+
 #~ msgid "[couldn't load album %s]"
 #~ msgstr "[couldn't load album %s]"
 
 #~ msgid "New Version"
 #~ msgstr "New Version"
 
-#, python-format
 #~ msgid ""
-#~ "New version of Picard is available (%s). Would you like to download it now?"
+#~ "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?"
+#~ "New version of Picard is available (%s). Would you like to download it "
+#~ "now?"
 
-#, python-format
 #~ msgid "Couldn't find PUID for file %s"
 #~ msgstr "Couldn't find PUID for file %s"
 
 #~ msgid "Ctrl+T"
 #~ msgstr "Ctrl+T"
 
-#~ msgid "Don't write tags to files"
-#~ msgstr "Don't write tags to files"
-
 #~ msgid "Delete"
 #~ msgstr "Delete"
diff --git a/po/en_GB.po b/po/en_GB.po
index 60b99edd5..aa14f4cab 100644
--- a/po/en_GB.po
+++ b/po/en_GB.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: 0.5.2\n"
 "Report-Msgid-Bugs-To: http://bugs.musicbrainz.org/\n"
-"POT-Creation-Date: 2009-02-24 18:58+0100\n"
+"POT-Creation-Date: 2009-04-06 22:50+0200\n"
 "PO-Revision-Date: 2009-03-23 12:15+0000\n"
 "Last-Translator: Philipp Wolfer <Unknown>\n"
 "Language-Team: British English <en_GB@li.org>\n"
@@ -18,16 +18,16 @@ msgstr ""
 "X-Generator: Launchpad (build Unknown)\n"
 "Generated-By: pygettext.py 1.5\n"
 
-#: ../picard/album.py:108 ../picard/cluster.py:248
+#: ../picard/album.py:109 ../picard/cluster.py:248
 msgid "Unmatched Files"
 msgstr "Unmatched Files"
 
-#: ../picard/album.py:281
+#: ../picard/album.py:287
 #, python-format
 msgid "[could not load album %s]"
 msgstr "[could not load album %s]"
 
-#: ../picard/album.py:317
+#: ../picard/album.py:320
 msgid "[loading album information]"
 msgstr "[loading album information]"
 
@@ -587,7 +587,8 @@ msgid "Namibia"
 msgstr "Namibia"
 
 #: ../picard/const.py:182
-msgid "Vanuat"
+#, fuzzy
+msgid "Vanuatu"
 msgstr "Vanuatu"
 
 #: ../picard/const.py:183
@@ -1031,223 +1032,239 @@ msgid "Congo, The Democratic Republic of the"
 msgstr "Congo, The Democratic Republic of the"
 
 #: ../picard/const.py:293
-msgid "Serbia and Montenegro"
+#, fuzzy
+msgid "Serbia and Montenegro (historical, 2003-2006)"
 msgstr "Serbia and Montenegro"
 
 #: ../picard/const.py:294
+#, fuzzy
+msgid "Serbia"
+msgstr "Azerbaijan"
+
+#: ../picard/const.py:295
+#, fuzzy
+msgid "Montenegro"
+msgstr "Serbia and Montenegro"
+
+#: ../picard/const.py:296
 msgid "Croatia"
 msgstr "Croatia"
 
-#: ../picard/const.py:295
+#: ../picard/const.py:297
 msgid "Korea (North), Democratic People's Republic of"
 msgstr "Korea (North), Democratic People's Republic of"
 
-#: ../picard/const.py:296
+#: ../picard/const.py:298
 msgid "Korea (South), Republic of"
 msgstr "Korea (South), Republic of"
 
-#: ../picard/const.py:297
+#: ../picard/const.py:299
 msgid "Slovakia"
 msgstr "Slovakia"
 
-#: ../picard/const.py:298
+#: ../picard/const.py:300
 msgid "Soviet Union (historical, 1922-1991)"
 msgstr "Soviet Union (historical, 1922-1991)"
 
-#: ../picard/const.py:299
+#: ../picard/const.py:301
 msgid "East Timor"
 msgstr "East Timor"
 
-#: ../picard/const.py:300
+#: ../picard/const.py:302
 msgid "Czechoslovakia (historical, 1918-1992)"
 msgstr "Czechoslovakia (historical, 1918-1992)"
 
-#: ../picard/const.py:301
+#: ../picard/const.py:303
 msgid "Europe"
 msgstr "Europe"
 
-#: ../picard/const.py:302
+#: ../picard/const.py:304
 msgid "East Germany (historical, 1949-1990)"
 msgstr "East Germany (historical, 1949-1990)"
 
-#: ../picard/const.py:303
+#: ../picard/const.py:305
 msgid "[Unknown Country]"
 msgstr "[Unknown Country]"
 
-#: ../picard/const.py:304
+#: ../picard/const.py:306
 msgid "[Worldwide]"
 msgstr "[Worldwide]"
 
-#: ../picard/const.py:305
+#: ../picard/const.py:307
 msgid "Yugoslavia (historical, 1918-1992)"
 msgstr "Yugoslavia (historical, 1918-1992)"
 
-#: ../picard/const.py:310
+#: ../picard/const.py:312
+msgid "Afrikaans"
+msgstr ""
+
+#: ../picard/const.py:313
+msgid "Arabic"
+msgstr ""
+
+#: ../picard/const.py:314
 msgid "Catalan"
 msgstr "Catalan"
 
-#: ../picard/const.py:311
+#: ../picard/const.py:315
 msgid "Czech"
 msgstr "Czech"
 
-#: ../picard/const.py:312
+#: ../picard/const.py:316
 msgid "Welsh"
 msgstr "Welsh"
 
-#: ../picard/const.py:313
+#: ../picard/const.py:317
 msgid "Danish"
 msgstr "Danish"
 
-#: ../picard/const.py:314
+#: ../picard/const.py:318
 msgid "German"
 msgstr "German"
 
-#: ../picard/const.py:315
+#: ../picard/const.py:319
 msgid "English"
 msgstr "English"
 
-#: ../picard/const.py:316
+#: ../picard/const.py:320
 msgid "English (Canada)"
 msgstr "English (Canada)"
 
-#: ../picard/const.py:317
+#: ../picard/const.py:321
 msgid "English (UK)"
 msgstr "English (UK)"
 
-#: ../picard/const.py:318
+#: ../picard/const.py:322
 msgid "Spanish"
 msgstr "Spanish"
 
-#: ../picard/const.py:319
+#: ../picard/const.py:323
 msgid "Persian"
 msgstr "Persian"
 
-#: ../picard/const.py:320
+#: ../picard/const.py:324
 msgid "Finnish"
 msgstr "Finnish"
 
-#: ../picard/const.py:321
+#: ../picard/const.py:325
 msgid "French"
 msgstr "French"
 
-#: ../picard/const.py:322
+#: ../picard/const.py:326
 msgid "Frisian"
 msgstr "Frisian"
 
-#: ../picard/const.py:323
+#: ../picard/const.py:327
 msgid "Hebrew"
 msgstr "Hebrew"
 
-#: ../picard/const.py:324
+#: ../picard/const.py:328
+#, fuzzy
+msgid "Hindi"
+msgstr "Haiti"
+
+#: ../picard/const.py:329
 msgid "Hungarian"
 msgstr "Hungarian"
 
-#: ../picard/const.py:325
+#: ../picard/const.py:330
 msgid "Islandic"
 msgstr "Icelandic"
 
-#: ../picard/const.py:326
+#: ../picard/const.py:331
 msgid "Italian"
 msgstr "Italian"
 
-#: ../picard/const.py:327
+#: ../picard/const.py:332
 msgid "Kannada"
 msgstr "Kannada"
 
-#: ../picard/const.py:328
+#: ../picard/const.py:333
 msgid "Korean"
 msgstr "Korean"
 
-#: ../picard/const.py:329
+#: ../picard/const.py:334
 msgid "Lithuanian"
 msgstr "Lithuanian"
 
-#: ../picard/const.py:330
+#: ../picard/const.py:335
 msgid "Norwegian Bokmal"
 msgstr "Norwegian Bokmal"
 
-#: ../picard/const.py:331
+#: ../picard/const.py:336
 msgid "Dutch"
 msgstr "Dutch"
 
-#: ../picard/const.py:332
+#: ../picard/const.py:337
 msgid "Polish"
 msgstr "Polish"
 
-#: ../picard/const.py:333
+#: ../picard/const.py:338
 msgid "Portuguese"
 msgstr "Portuguese"
 
-#: ../picard/const.py:334
+#: ../picard/const.py:339
 msgid "Brazilian Portuguese"
 msgstr "Brazilian Portuguese"
 
-#: ../picard/const.py:335
+#: ../picard/const.py:340
 msgid "Romanian"
 msgstr "Romanian"
 
-#: ../picard/const.py:336
+#: ../picard/const.py:341
 msgid "Russian"
 msgstr "Russian"
 
-#: ../picard/const.py:337
+#: ../picard/const.py:342
 msgid "Scots"
 msgstr "Scots"
 
-#: ../picard/const.py:338
+#: ../picard/const.py:343
 msgid "Slovak"
 msgstr "Slovak"
 
-#: ../picard/const.py:339
+#: ../picard/const.py:344
 msgid "Slovenian"
 msgstr "Slovenian"
 
-#: ../picard/const.py:340
+#: ../picard/const.py:345
 msgid "Swedish"
 msgstr "Swedish"
 
-#: ../picard/const.py:341
+#: ../picard/const.py:346
+#, fuzzy
+msgid "Turkish"
+msgstr "Turkmenistan"
+
+#: ../picard/const.py:347
 msgid "Chinese"
 msgstr "Chinese"
 
-#: ../picard/file.py:487
+#: ../picard/file.py:494
 #, python-format
 msgid "No matching tracks for file %s"
 msgstr "No matching tracks for file %s"
 
-#: ../picard/file.py:504
+#: ../picard/file.py:511
 #, 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:507
+#: ../picard/file.py:514
 #, python-format
 msgid "File %s identified!"
 msgstr "File %s identified!"
 
-#: ../picard/file.py:518
+#: ../picard/file.py:525
 #, python-format
 msgid "Looking up the PUID for file %s..."
 msgstr "Looking up the PUID for file %s..."
 
-#: ../picard/file.py:523
+#: ../picard/file.py:530
 #, 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)"
@@ -1260,11 +1277,24 @@ msgstr "PLS Playlist (*.pls)"
 msgid "XSPF Playlist (*.xspf)"
 msgstr "XSPF Playlist (*.xspf)"
 
-#: ../picard/tagger.py:476
+#: ../picard/puidmanager.py:62
+msgid "Submitting PUIDs..."
+msgstr "Submitting PUIDs..."
+
+#: ../picard/puidmanager.py:68
+#, python-format
+msgid "PUIDs submission failed: %s"
+msgstr "PUIDs submission failed: %s"
+
+#: ../picard/puidmanager.py:70
+msgid "PUIDs successfully submitted!"
+msgstr "PUIDs successfully submitted!"
+
+#: ../picard/tagger.py:477
 msgid "CD Lookup Error"
 msgstr "CD Lookup Error"
 
-#: ../picard/tagger.py:477
+#: ../picard/tagger.py:478
 #, python-format
 msgid ""
 "Error while reading CD:\n"
@@ -1275,7 +1305,7 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../picard/tagger.py:503
+#: ../picard/tagger.py:504
 #, python-format
 msgid "Could not find PUID for file %s"
 msgstr "Could not find PUID for file %s"
@@ -1328,15 +1358,28 @@ msgstr "Show &Hidden Files"
 msgid "Length"
 msgstr "Length"
 
-#: ../picard/ui/itemviews.py:327
+#: ../picard/ui/itemviews.py:289
+msgid "&Expand all"
+msgstr ""
+
+#: ../picard/ui/itemviews.py:291
+msgid "&Collapse all"
+msgstr ""
+
+#: ../picard/ui/itemviews.py:332
 msgid "&Releases"
 msgstr "&Releases"
 
-#: ../picard/ui/itemviews.py:353
+#: ../picard/ui/itemviews.py:349
+#, fuzzy
+msgid "No release event"
+msgstr "Album release month"
+
+#: ../picard/ui/itemviews.py:359
 msgid "&Plugins"
 msgstr "&Plugins"
 
-#: ../picard/ui/itemviews.py:523
+#: ../picard/ui/itemviews.py:533
 msgid "Clusters"
 msgstr "Clusters"
 
@@ -1344,95 +1387,6 @@ msgstr "Clusters"
 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:66 ../picard/ui/ui_options_plugins.py:62
-msgid "Details"
-msgstr "Details"
-
-#: ../picard/ui/tageditor.py:71 ../picard/ui/tageditor.py:264
-#, python-format
-msgid "%d file"
-msgid_plural "%d files"
-msgstr[0] "%d file"
-msgstr[1] "%d files"
-
-#: ../picard/ui/tageditor.py:131
-#, 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:134
-#, 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:233
-msgid "Filename:"
-msgstr "Filename:"
-
-#: ../picard/ui/tageditor.py:235
-msgid "Format:"
-msgstr "Format:"
-
-#: ../picard/ui/tageditor.py:244
-msgid "Size:"
-msgstr "Size:"
-
-#: ../picard/ui/tageditor.py:248 ../picard/ui/ui_metadata.py:127
-msgid "Length:"
-msgstr "Length:"
-
-#: ../picard/ui/tageditor.py:250
-msgid "Bitrate:"
-msgstr "Bitrate:"
-
-#: ../picard/ui/tageditor.py:252
-msgid "Sample rate:"
-msgstr "Sample rate:"
-
-#: ../picard/ui/tageditor.py:254
-msgid "Bits per sample:"
-msgstr "Bits per sample:"
-
-#: ../picard/ui/tageditor.py:257
-msgid "Mono"
-msgstr "Mono"
-
-#: ../picard/ui/tageditor.py:258
-msgid "Stereo"
-msgstr "Stereo"
-
-#: ../picard/ui/tageditor.py:260
-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"
@@ -1669,6 +1623,10 @@ msgstr "&Search Bar"
 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"
@@ -1688,6 +1646,22 @@ msgstr "Playlist %s saved"
 msgid " (Error: %s)"
 msgstr " (Error: %s)"
 
+#: ../picard/ui/puidsubmit.py:31 ../picard/ui/options/plugins.py:85
+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/passworddialog.py:38
 #, python-format
 msgid ""
@@ -1695,6 +1669,75 @@ msgid ""
 msgstr ""
 "The server %s requires you to login. Please enter your username and password."
 
+#: ../picard/ui/tageditor.py:66 ../picard/ui/ui_options_plugins.py:62
+msgid "Details"
+msgstr "Details"
+
+#: ../picard/ui/tageditor.py:71 ../picard/ui/tageditor.py:264
+#, python-format
+msgid "%d file"
+msgid_plural "%d files"
+msgstr[0] "%d file"
+msgstr[1] "%d files"
+
+#: ../picard/ui/tageditor.py:131
+#, 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:134
+#, 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:233
+msgid "Filename:"
+msgstr "Filename:"
+
+#: ../picard/ui/tageditor.py:235
+msgid "Format:"
+msgstr "Format:"
+
+#: ../picard/ui/tageditor.py:244
+msgid "Size:"
+msgstr "Size:"
+
+#: ../picard/ui/tageditor.py:248 ../picard/ui/ui_metadata.py:127
+msgid "Length:"
+msgstr "Length:"
+
+#: ../picard/ui/tageditor.py:250
+msgid "Bitrate:"
+msgstr "Bitrate:"
+
+#: ../picard/ui/tageditor.py:252
+msgid "Sample rate:"
+msgstr "Sample rate:"
+
+#: ../picard/ui/tageditor.py:254
+msgid "Bits per sample:"
+msgstr "Bits per sample:"
+
+#: ../picard/ui/tageditor.py:257
+msgid "Mono"
+msgstr "Mono"
+
+#: ../picard/ui/tageditor.py:258
+msgid "Stereo"
+msgstr "Stereo"
+
+#: ../picard/ui/tageditor.py:260
+msgid "Channels:"
+msgstr "Channels:"
+
+#: ../picard/ui/tagsfromfilenames.py:54 ../picard/ui/tagsfromfilenames.py:99
+msgid "File Name"
+msgstr "File Name"
+
 #: ../picard/ui/ui_cdlookup.py:60 ../picard/ui/ui_options_cdlookup.py:47
 #: ../picard/ui/ui_options_cdlookup_select.py:48
 #: ../picard/ui/options/cdlookup.py:36
@@ -1717,24 +1760,6 @@ msgstr "    Lookup manually    "
 msgid "Cancel"
 msgstr "Cancel"
 
-#: ../picard/ui/ui_passworddialog.py:78
-msgid "Authentication required"
-msgstr "Authentication required"
-
-#: ../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/ui_passworddialog.py:80 ../picard/ui/ui_options_proxy.py:82
-#: ../picard/ui/ui_options_general.py:112
-msgid "Password:"
-msgstr "Password:"
-
-#: ../picard/ui/ui_passworddialog.py:81
-msgid "Save username and password"
-msgstr "Save username and password"
-
 #: ../picard/ui/ui_edittagdialog.py:44
 msgid "Edit Tag"
 msgstr "Edit Tag"
@@ -1771,6 +1796,10 @@ msgstr "Album:"
 msgid "Options"
 msgstr "Options"
 
+#: ../picard/ui/ui_puidsubmit.py:52
+msgid "Submit PUIDs"
+msgstr "Submit PUIDs"
+
 #: ../picard/ui/ui_options_cdlookup.py:48
 msgid "CD-ROM device to use for lookups:"
 msgstr "CD-ROM device to use for lookups:"
@@ -1795,6 +1824,23 @@ msgstr "Save cover images as separate files"
 msgid "Overwrite the file if it already exists"
 msgstr "Overwrite the file if it already exists"
 
+#: ../picard/ui/ui_options_moving.py:53
+msgid "Move additional files:"
+msgstr "Move additional files:"
+
+#: ../picard/ui/ui_options_moving.py:54
+msgid "Browse..."
+msgstr "Browse..."
+
+#: ../picard/ui/ui_options_moving.py:55
+msgid "Delete empty directories"
+msgstr "Delete empty directories"
+
+#: ../picard/ui/ui_options_moving.py:56
+#, fuzzy
+msgid "Move files to this directory when saving:"
+msgstr "Move tagged files to this directory:"
+
 #: ../picard/ui/util.py:31
 msgid "&Ok"
 msgstr "&Ok"
@@ -1803,44 +1849,40 @@ msgstr "&Ok"
 msgid "&Cancel"
 msgstr "&Cancel"
 
-#: ../picard/ui/ui_puidsubmit.py:52
-msgid "Submit PUIDs"
-msgstr "Submit PUIDs"
-
-#: ../picard/ui/ui_tageditor.py:139 ../picard/ui/ui_options_plugins.py:59
-#: ../picard/ui/options/plugins.py:76
+#: ../picard/ui/ui_tageditor.py:128 ../picard/ui/ui_options_plugins.py:59
+#: ../picard/ui/options/plugins.py:81
 msgid "Name"
 msgstr "Name"
 
-#: ../picard/ui/ui_tageditor.py:140
+#: ../picard/ui/ui_tageditor.py:129
 msgid "Value"
 msgstr "Value"
 
-#: ../picard/ui/ui_tageditor.py:141
+#: ../picard/ui/ui_tageditor.py:130
 msgid "Rating:"
 msgstr "Rating:"
 
-#: ../picard/ui/ui_tageditor.py:142
+#: ../picard/ui/ui_tageditor.py:131
 msgid "&Add..."
 msgstr "&Add..."
 
-#: ../picard/ui/ui_tageditor.py:143
+#: ../picard/ui/ui_tageditor.py:132
 msgid "&Edit..."
 msgstr "&Edit..."
 
-#: ../picard/ui/ui_tageditor.py:144
+#: ../picard/ui/ui_tageditor.py:133
 msgid "&Delete"
 msgstr "&Delete"
 
-#: ../picard/ui/ui_tageditor.py:145
+#: ../picard/ui/ui_tageditor.py:134
 msgid "&Metadata"
 msgstr "&Metadata"
 
-#: ../picard/ui/ui_tageditor.py:146
+#: ../picard/ui/ui_tageditor.py:135
 msgid "A&rtwork"
 msgstr "A&rtwork"
 
-#: ../picard/ui/ui_tageditor.py:147
+#: ../picard/ui/ui_tageditor.py:136
 msgid "&Info"
 msgstr "&Info"
 
@@ -1885,6 +1927,40 @@ msgstr " / "
 msgid ", "
 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:72
+msgid "Port:"
+msgstr "Port:"
+
+#: ../picard/ui/ui_options_general.py:110 ../picard/ui/ui_options_proxy.py:73
+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:112 ../picard/ui/ui_options_proxy.py:70
+#: ../picard/ui/ui_passworddialog.py:80
+msgid "Password:"
+msgstr "Password:"
+
+#: ../picard/ui/ui_options_general.py:113 ../picard/ui/ui_options_proxy.py:71
+#: ../picard/ui/ui_passworddialog.py:79
+msgid "Username:"
+msgstr "Username:"
+
+#: ../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_interface.py:50
 msgid "Miscellaneous"
 msgstr "Miscellaneous"
@@ -1905,117 +1981,6 @@ msgstr "Use advanced query syntax"
 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 "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_naming.py:180
-#: ../picard/ui/ui_tagsfromfilenames.py:58
-msgid "&Preview"
-msgstr "&Preview"
-
-#: ../picard/ui/ui_options_proxy.py:81 ../picard/ui/options/proxy.py:28
-msgid "Web Proxy"
-msgstr "Web Proxy"
-
-#: ../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 "Server address:"
-
-#: ../picard/ui/ui_options_ratings.py:45
-msgid "Enable track ratings"
-msgstr "Enable track ratings"
-
-#: ../picard/ui/ui_options_ratings.py:46
-msgid ""
-"Picard saves the ratings together with an e-mail address identifying the "
-"user who did the rating. That way different ratings for different users can "
-"be stored in the files. Please sepcify the e-mail you want to use to save "
-"your ratings."
-msgstr ""
-"Picard saves the ratings together with an e-mail address identifying the "
-"user who did the rating. That way different ratings for different users can "
-"be stored in the files. Please specify the e-mail you want to use to save "
-"your ratings."
-
-#: ../picard/ui/ui_options_ratings.py:47
-msgid "E-mail:"
-msgstr "E-mail:"
-
-#: ../picard/ui/ui_options_general.py:108
-msgid "MusicBrainz Server"
-msgstr "MusicBrainz Server"
-
-#: ../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"
@@ -2072,74 +2037,156 @@ msgstr "Various artists:"
 msgid "Non-album tracks:"
 msgstr "Non-album tracks:"
 
-#: ../picard/ui/ui_options_plugins.py:58 ../picard/ui/options/plugins.py:30
+#: ../picard/ui/ui_options_metadata.py:109
+#: ../picard/ui/ui_options_metadata.py:110
+#: ../picard/ui/ui_options_renaming.py:155
+#: ../picard/ui/ui_options_renaming.py:158
+msgid "Default"
+msgstr "Default"
+
+#: ../picard/ui/ui_options_plugins.py:58 ../picard/ui/options/plugins.py:34
 msgid "Plugins"
 msgstr "Plugins"
 
-#: ../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:84
 msgid "Author"
 msgstr "Author"
 
-#: ../picard/ui/ui_options_plugins.py:61 ../picard/util/tags.py:36
+#: ../picard/ui/ui_options_plugins.py:61 ../picard/util/tags.py:37
 msgid "Version"
 msgstr "Version"
 
-#: ../picard/ui/ui_options_script.py:52
+#: ../picard/ui/ui_options_proxy.py:69 ../picard/ui/options/proxy.py:28
+msgid "Web Proxy"
+msgstr "Web Proxy"
+
+#: ../picard/ui/ui_options_ratings.py:45
+msgid "Enable track ratings"
+msgstr "Enable track ratings"
+
+#: ../picard/ui/ui_options_ratings.py:46
+msgid ""
+"Picard saves the ratings together with an e-mail address identifying the "
+"user who did the rating. That way different ratings for different users can "
+"be stored in the files. Please sepcify the e-mail you want to use to save "
+"your ratings."
+msgstr ""
+"Picard saves the ratings together with an e-mail address identifying the "
+"user who did the rating. That way different ratings for different users can "
+"be stored in the files. Please specify the e-mail you want to use to save "
+"your ratings."
+
+#: ../picard/ui/ui_options_ratings.py:47
+msgid "E-mail:"
+msgstr "E-mail:"
+
+#: ../picard/ui/ui_options_renaming.py:145
+#, fuzzy
+msgid "Form"
+msgstr "Format"
+
+#: ../picard/ui/ui_options_renaming.py:146
+#, fuzzy
+msgid "Rename files when saving"
+msgstr "Rename files when writing metadata tags"
+
+#: ../picard/ui/ui_options_renaming.py:147
+msgid "Replace non-ASCII characters"
+msgstr "Replace non-ASCII characters"
+
+#: ../picard/ui/ui_options_renaming.py:148
+msgid "Replace Windows-incompatible characters"
+msgstr "Replace Windows-incompatible characters"
+
+#: ../picard/ui/ui_options_renaming.py:149
+msgid "Name files like this"
+msgstr ""
+
+#: ../picard/ui/ui_options_renaming.py:156
+msgid "Name multiple artist albums differently"
+msgstr ""
+
+#: ../picard/ui/ui_options_renaming.py:157
+msgid "Copy from above"
+msgstr ""
+
+#: ../picard/ui/ui_options_renaming.py:159
+#, fuzzy
+msgid "Examples"
+msgstr "Example"
+
+#: ../picard/ui/ui_options_script.py:43
 msgid "Tagger Script"
 msgstr "Tagger Script"
 
-#: ../picard/ui/ui_options_tags.py:85
-msgid "Common"
-msgstr "Common"
-
-#: ../picard/ui/ui_options_tags.py:86
-msgid "Clear existing tags before writing new tags"
-msgstr "Clear existing tags before writing new tags"
-
-#: ../picard/ui/ui_options_tags.py:87
-msgid "Don not write tags to files"
+#: ../picard/ui/ui_options_tags.py:97
+#, fuzzy
+msgid "Do not write tags to files"
 msgstr "Do not write tags to files"
 
-#: ../picard/ui/ui_options_tags.py:88
-msgid "ID3"
-msgstr "ID3"
+#: ../picard/ui/ui_options_tags.py:98
+msgid "Before tagging"
+msgstr ""
 
-#: ../picard/ui/ui_options_tags.py:89
-msgid "Write ID3v1 tags to the files"
-msgstr "Write ID3v1 tags to the files"
+#: ../picard/ui/ui_options_tags.py:99
+#, fuzzy
+msgid "Clear existing tags"
+msgstr "Clear existing tags before writing new tags"
 
-#: ../picard/ui/ui_options_tags.py:90
-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:91
-msgid "Text encoding to use while writing ID3v2 tags:"
-msgstr "Text encoding to use while writing ID3v2 tags:"
-
-#: ../picard/ui/ui_options_tags.py:92
-msgid "ISO-8859-1"
-msgstr "ISO-8859-1"
-
-#: ../picard/ui/ui_options_tags.py:93
-msgid "UTF-16"
-msgstr "UTF-16"
-
-#: ../picard/ui/ui_options_tags.py:94
-msgid "UTF-8"
-msgstr "UTF-8"
-
-#: ../picard/ui/ui_options_tags.py:95
+#: ../picard/ui/ui_options_tags.py:100
 msgid "Remove ID3 tags from FLAC files"
 msgstr "Remove ID3 tags from FLAC files"
 
-#: ../picard/ui/ui_options_tags.py:96
-msgid "APE"
-msgstr "APE"
-
-#: ../picard/ui/ui_options_tags.py:97
+#: ../picard/ui/ui_options_tags.py:101
 msgid "Remove APEv2 tags from MP3 files"
 msgstr "Remove APEv2 tags from MP3 files"
 
+#: ../picard/ui/ui_options_tags.py:102
+msgid "Tag compatibility"
+msgstr ""
+
+#: ../picard/ui/ui_options_tags.py:103
+#, fuzzy
+msgid "ID3v2 version"
+msgstr "ID3v2.4 only"
+
+#: ../picard/ui/ui_options_tags.py:104
+msgid "2.4"
+msgstr ""
+
+#: ../picard/ui/ui_options_tags.py:105
+msgid "2.3"
+msgstr ""
+
+#: ../picard/ui/ui_options_tags.py:106
+#, fuzzy
+msgid "Also include ID3v1 tags in the files"
+msgstr "Write ID3v1 tags to the files"
+
+#: ../picard/ui/ui_options_tags.py:107
+msgid "ID3v2 text encoding"
+msgstr ""
+
+#: ../picard/ui/ui_options_tags.py:108
+msgid "UTF-8"
+msgstr "UTF-8"
+
+#: ../picard/ui/ui_options_tags.py:109
+msgid "UTF-16"
+msgstr "UTF-16"
+
+#: ../picard/ui/ui_options_tags.py:110
+msgid "ISO-8859-1"
+msgstr "ISO-8859-1"
+
+#: ../picard/ui/ui_passworddialog.py:78
+msgid "Authentication required"
+msgstr "Authentication required"
+
+#: ../picard/ui/ui_passworddialog.py:81
+msgid "Save username and password"
+msgstr "Save username and password"
+
 #: ../picard/ui/ui_tagsfromfilenames.py:56
 msgid "Convert File Names to Tags"
 msgstr "Convert File Names to Tags"
@@ -2148,6 +2195,10 @@ msgstr "Convert File Names to Tags"
 msgid "Replace underscores with spaces"
 msgstr "Replace underscores with spaces"
 
+#: ../picard/ui/ui_tagsfromfilenames.py:58
+msgid "&Preview"
+msgstr "&Preview"
+
 #: ../picard/ui/options/about.py:29
 msgid "About"
 msgstr "About"
@@ -2177,8 +2228,8 @@ msgstr "<br/>Translated to British English 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"
@@ -2186,17 +2237,16 @@ msgid ""
 "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\"><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/P"
-"icardTagger</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><br/>%(formats)s</p>\n"
 "<p align=\"center\"><strong>Please donate</strong><br/>\n"
@@ -2204,14 +2254,13 @@ msgstr ""
 "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\"><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/P"
-"icardTagger</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"
 
 #: ../picard/ui/options/advanced.py:26
 msgid "Advanced"
@@ -2245,257 +2294,266 @@ msgstr "Matching"
 msgid "None"
 msgstr "None"
 
-#: ../picard/ui/options/naming.py:33
-msgid "File Naming"
-msgstr "File Naming"
+#: ../picard/ui/options/moving.py:33
+#, fuzzy
+msgid "Moving files"
+msgstr "Move Files"
 
-#: ../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 "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 "The multiple artist file naming format must not be empty."
-
-#: ../picard/ui/options/naming.py:97
+#: ../picard/ui/options/moving.py:65
 msgid "Error"
 msgstr "Error"
 
-#: ../picard/ui/options/naming.py:97
+#: ../picard/ui/options/moving.py:65
 msgid "The location to move files to must not be empty."
 msgstr "The location to move files to must not be empty."
 
-#: ../picard/ui/options/scripting.py:63
-msgid "Scripting"
-msgstr "Scripting"
+#: ../picard/ui/options/ratings.py:29
+msgid "Ratings"
+msgstr "Ratings"
 
 #: ../picard/ui/options/tags.py:29
 msgid "Tags"
 msgstr "Tags"
 
-#: ../picard/ui/options/ratings.py:29
-msgid "Ratings"
-msgstr "Ratings"
+#: ../picard/ui/options/renaming.py:35
+#, fuzzy
+msgid "File naming"
+msgstr "File Naming"
+
+#: ../picard/ui/options/renaming.py:123
+msgid "The file naming format must not be empty."
+msgstr "The file naming format must not be empty."
+
+#: ../picard/ui/options/renaming.py:133
+msgid "The multiple artist file naming format must not be empty."
+msgstr "The multiple artist file naming format must not be empty."
+
+#: ../picard/ui/options/scripting.py:63
+msgid "Scripting"
+msgstr "Scripting"
+
+#: ../picard/ui/options/scripting.py:97
+msgid "Script Error"
+msgstr "Script Error"
 
 #: ../picard/util/tags.py:24
 msgid "Date"
 msgstr "Date"
 
 #: ../picard/util/tags.py:25
+#, fuzzy
+msgid "Original Release Date"
+msgstr "Original Metadata"
+
+#: ../picard/util/tags.py:26
 msgid "Album Artist"
 msgstr "Album Artist"
 
-#: ../picard/util/tags.py:26
+#: ../picard/util/tags.py:27
 msgid "Track Number"
 msgstr "Track Number"
 
-#: ../picard/util/tags.py:27
+#: ../picard/util/tags.py:28
 msgid "Total Tracks"
 msgstr "Total Tracks"
 
-#: ../picard/util/tags.py:28
+#: ../picard/util/tags.py:29
 msgid "Disc Number"
 msgstr "Disc Number"
 
-#: ../picard/util/tags.py:29
+#: ../picard/util/tags.py:30
 msgid "Total Discs"
 msgstr "Total Discs"
 
-#: ../picard/util/tags.py:30
+#: ../picard/util/tags.py:31
 msgid "Album Artist Sort Order"
 msgstr "Album Artist Sort Order"
 
-#: ../picard/util/tags.py:31
+#: ../picard/util/tags.py:32
 msgid "Artist Sort Order"
 msgstr "Artist Sort Order"
 
-#: ../picard/util/tags.py:32
+#: ../picard/util/tags.py:33
 msgid "Title Sort Order"
 msgstr "Title Sort Order"
 
-#: ../picard/util/tags.py:33
+#: ../picard/util/tags.py:34
 msgid "Album Sort Order"
 msgstr "Album Sort Order"
 
-#: ../picard/util/tags.py:34
+#: ../picard/util/tags.py:35
 msgid "ASIN"
 msgstr "ASIN"
 
-#: ../picard/util/tags.py:35
+#: ../picard/util/tags.py:36
 msgid "Grouping"
 msgstr "Grouping"
 
-#: ../picard/util/tags.py:37
+#: ../picard/util/tags.py:38
 msgid "ISRC"
 msgstr "ISRC"
 
-#: ../picard/util/tags.py:38
+#: ../picard/util/tags.py:39
 msgid "Mood"
 msgstr "Mood"
 
-#: ../picard/util/tags.py:39
+#: ../picard/util/tags.py:40
 msgid "BPM"
 msgstr "BPM"
 
-#: ../picard/util/tags.py:40
+#: ../picard/util/tags.py:41
 msgid "Copyright"
 msgstr "Copyright"
 
-#: ../picard/util/tags.py:41
+#: ../picard/util/tags.py:42
 msgid "Composer"
 msgstr "Composer"
 
-#: ../picard/util/tags.py:42
+#: ../picard/util/tags.py:43
 msgid "Conductor"
 msgstr "Conductor"
 
-#: ../picard/util/tags.py:43
+#: ../picard/util/tags.py:44
 msgid "Lyricist"
 msgstr "Lyricist"
 
-#: ../picard/util/tags.py:44
+#: ../picard/util/tags.py:45
 msgid "Arranger"
 msgstr "Arranger"
 
-#: ../picard/util/tags.py:45
+#: ../picard/util/tags.py:46
 msgid "Producer"
 msgstr "Producer"
 
-#: ../picard/util/tags.py:46
+#: ../picard/util/tags.py:47
 msgid "Engineer"
 msgstr "Engineer"
 
-#: ../picard/util/tags.py:47
+#: ../picard/util/tags.py:48
 msgid "Subtitle"
 msgstr "Subtitle"
 
-#: ../picard/util/tags.py:48
+#: ../picard/util/tags.py:49
 msgid "Disc Subtitle"
 msgstr "Disc Subtitle"
 
-#: ../picard/util/tags.py:49
+#: ../picard/util/tags.py:50
 msgid "Remixer"
 msgstr "Remixer"
 
-#: ../picard/util/tags.py:50
+#: ../picard/util/tags.py:51
 msgid "MusicBrainz Track Id"
 msgstr "MusicBrainz Track Id"
 
-#: ../picard/util/tags.py:51
+#: ../picard/util/tags.py:52
 msgid "MusicBrainz Release Id"
 msgstr "MusicBrainz Release Id"
 
-#: ../picard/util/tags.py:52
+#: ../picard/util/tags.py:53
 msgid "MusicBrainz Artist Id"
 msgstr "MusicBrainz Artist Id"
 
-#: ../picard/util/tags.py:53
+#: ../picard/util/tags.py:54
 msgid "MusicBrainz Release Artist Id"
 msgstr "MusicBrainz Release Artist Id"
 
-#: ../picard/util/tags.py:54
+#: ../picard/util/tags.py:55
 msgid "MusicBrainz TRM Id"
 msgstr "MusicBrainz TRM Id"
 
-#: ../picard/util/tags.py:55
+#: ../picard/util/tags.py:56
 msgid "MusicBrainz Disc Id"
 msgstr "MusicBrainz Disc Id"
 
-#: ../picard/util/tags.py:56
+#: ../picard/util/tags.py:57
 msgid "MusicBrainz Sort Name"
 msgstr "MusicBrainz Sort Name"
 
-#: ../picard/util/tags.py:57
+#: ../picard/util/tags.py:58
 msgid "MusicIP PUID"
 msgstr "MusicIP PUID"
 
-#: ../picard/util/tags.py:58
+#: ../picard/util/tags.py:59
 msgid "MusicIP Fingerprint"
 msgstr "MusicIP Fingerprint"
 
-#: ../picard/util/tags.py:59
+#: ../picard/util/tags.py:60
 msgid "Disc Id"
 msgstr "Disc Id"
 
-#: ../picard/util/tags.py:60
+#: ../picard/util/tags.py:61
 msgid "Website"
 msgstr "Website"
 
-#: ../picard/util/tags.py:61
+#: ../picard/util/tags.py:62
 msgid "Compilation"
 msgstr "Compilation"
 
-#: ../picard/util/tags.py:62
+#: ../picard/util/tags.py:63
 msgid "Comment"
 msgstr "Comment"
 
-#: ../picard/util/tags.py:63
+#: ../picard/util/tags.py:64
 msgid "Genre"
 msgstr "Genre"
 
-#: ../picard/util/tags.py:64
+#: ../picard/util/tags.py:65
 msgid "Encoded By"
 msgstr "Encoded By"
 
-#: ../picard/util/tags.py:65
+#: ../picard/util/tags.py:66
 msgid "Performer"
 msgstr "Performer"
 
-#: ../picard/util/tags.py:66
+#: ../picard/util/tags.py:67
 msgid "Release Type"
 msgstr "Release Type"
 
-#: ../picard/util/tags.py:67
+#: ../picard/util/tags.py:68
 msgid "Release Status"
 msgstr "Release Status"
 
-#: ../picard/util/tags.py:68
+#: ../picard/util/tags.py:69
 msgid "Release Country"
 msgstr "Release Country"
 
-#: ../picard/util/tags.py:69
+#: ../picard/util/tags.py:70
 msgid "Record Label"
 msgstr "Record Label"
 
-#: ../picard/util/tags.py:70
+#: ../picard/util/tags.py:71
 msgid "Barcode"
 msgstr "Barcode"
 
-#: ../picard/util/tags.py:71
+#: ../picard/util/tags.py:72
 msgid "Catalog Number"
 msgstr "Catalogue Number"
 
-#: ../picard/util/tags.py:72
+#: ../picard/util/tags.py:73
 msgid "Format"
 msgstr "Format"
 
-#: ../picard/util/tags.py:73
+#: ../picard/util/tags.py:74
 msgid "DJ-Mixer"
 msgstr "DJ-Mixer"
 
-#: ../picard/util/tags.py:74
+#: ../picard/util/tags.py:75
 msgid "Media"
 msgstr "Media"
 
-#: ../picard/util/tags.py:75
+#: ../picard/util/tags.py:76
 msgid "Lyrics"
 msgstr "Lyrics"
 
-#: ../picard/util/tags.py:76
+#: ../picard/util/tags.py:77
 msgid "Mixer"
 msgstr "Mixer"
 
-#: ../picard/util/tags.py:77
+#: ../picard/util/tags.py:78
 msgid "Language"
 msgstr "Language"
 
-#: ../picard/util/tags.py:78
+#: ../picard/util/tags.py:79
 msgid "Script"
 msgstr "Script"
 
@@ -2514,20 +2572,49 @@ msgstr ""
 "\n"
 "%s"
 
-#, python-format
+#~ msgid "Rename Files"
+#~ msgstr "Rename Files"
+
+#~ msgid "Multiple artist file naming format:"
+#~ msgstr "Multiple artist file naming format:"
+
+#~ msgid "File naming format:"
+#~ msgstr "File naming format:"
+
+#~ msgid "File name:"
+#~ msgstr "File name:"
+
+#~ msgid "Multiple artist file name:"
+#~ msgstr "Multiple artist file name:"
+
+#~ msgid "Common"
+#~ msgstr "Common"
+
+#~ msgid "ID3"
+#~ msgstr "ID3"
+
+#~ msgid "Write ID3v2 version 2.3 tags (2.4 is default)"
+#~ msgstr "Write ID3v2 version 2.3 tags (2.4 is default)"
+
+#~ msgid "Text encoding to use while writing ID3v2 tags:"
+#~ msgstr "Text encoding to use while writing ID3v2 tags:"
+
+#~ msgid "APE"
+#~ msgstr "APE"
+
 #~ msgid "[couldn't load album %s]"
 #~ msgstr "Could not load album (%s)"
 
 #~ msgid "New Version"
 #~ msgstr "New Version"
 
-#, python-format
 #~ msgid ""
-#~ "New version of Picard is available (%s). Would you like to download it now?"
+#~ "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?"
+#~ "New version of Picard is available (%s). Would you like to download it "
+#~ "now?"
 
-#, python-format
 #~ msgid "Couldn't find PUID for file %s"
 #~ msgstr "Couldn't find PUID for file %s"
 
@@ -2660,9 +2747,6 @@ msgstr ""
 #~ 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"
 
@@ -2681,9 +2765,6 @@ msgstr ""
 #~ msgid "Proxy port"
 #~ msgstr "Proxy port"
 
-#~ msgid "ID3v2.4 only"
-#~ msgstr "ID3v2.4 only"
-
 #~ msgid "Save track/album"
 #~ msgstr "Save track/album"
 
@@ -2718,15 +2799,17 @@ msgstr ""
 #~ 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"
-#~ "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. "
+#~ "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 ""
-#~ "You have not specified a 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 dialogue. "
+#~ "You have not specified a 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 "
+#~ "dialogue. "
 
 #~ msgid "Couldn't connect to the MusicBrainz server."
 #~ msgstr "Couldn't connect to the MusicBrainz server."
@@ -2753,20 +2836,22 @@ msgstr ""
 #~ 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."
+#~ "Please fix the move option or the destination directory option and try "
+#~ "again."
 #~ msgstr ""
 #~ "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."
+#~ "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 click the "
-#~ "track and select 'Clear Error'"
+#~ "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 ""
-#~ "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'"
+#~ "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"
@@ -2790,9 +2875,11 @@ msgstr ""
 #~ msgstr "Please donate to MusicBrainz!"
 
 #~ msgid ""
-#~ "The destination directory %s does not exist. Please pick a valid directory."
+#~ "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."
+#~ "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"
@@ -2811,9 +2898,6 @@ msgstr ""
 #~ 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"
 
@@ -2892,8 +2976,8 @@ msgstr ""
 #~ 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. "
+#~ "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. "
diff --git a/po/es.po b/po/es.po
index 809b61870..c58284c18 100644
--- a/po/es.po
+++ b/po/es.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: picard\n"
 "Report-Msgid-Bugs-To: http://bugs.musicbrainz.org/\n"
-"POT-Creation-Date: 2009-02-24 18:58+0100\n"
+"POT-Creation-Date: 2009-04-06 22:50+0200\n"
 "PO-Revision-Date: 2009-03-30 09:36+0000\n"
 "Last-Translator: Alvaro Gonzalez <andor@pierdelacabeza.com>\n"
 "Language-Team: Spanish <sp@li.org>\n"
@@ -18,16 +18,16 @@ msgstr ""
 "X-Generator: Launchpad (build Unknown)\n"
 "Generated-By: pygettext.py 1.5\n"
 
-#: ../picard/album.py:108 ../picard/cluster.py:248
+#: ../picard/album.py:109 ../picard/cluster.py:248
 msgid "Unmatched Files"
 msgstr "Archivos desagrupados"
 
-#: ../picard/album.py:281
+#: ../picard/album.py:287
 #, python-format
 msgid "[could not load album %s]"
 msgstr "[no se pudo cargar el álbum %s]"
 
-#: ../picard/album.py:317
+#: ../picard/album.py:320
 msgid "[loading album information]"
 msgstr "[cargando información del álbum]"
 
@@ -587,7 +587,8 @@ msgid "Namibia"
 msgstr "Namibia"
 
 #: ../picard/const.py:182
-msgid "Vanuat"
+#, fuzzy
+msgid "Vanuatu"
 msgstr "Vanuatu"
 
 #: ../picard/const.py:183
@@ -1031,223 +1032,239 @@ msgid "Congo, The Democratic Republic of the"
 msgstr "Congo, República Democrática del"
 
 #: ../picard/const.py:293
-msgid "Serbia and Montenegro"
+#, fuzzy
+msgid "Serbia and Montenegro (historical, 2003-2006)"
 msgstr "Servia y Montenegro"
 
 #: ../picard/const.py:294
+#, fuzzy
+msgid "Serbia"
+msgstr "Azerbaiyán"
+
+#: ../picard/const.py:295
+#, fuzzy
+msgid "Montenegro"
+msgstr "Servia y Montenegro"
+
+#: ../picard/const.py:296
 msgid "Croatia"
 msgstr "Croacia"
 
-#: ../picard/const.py:295
+#: ../picard/const.py:297
 msgid "Korea (North), Democratic People's Republic of"
 msgstr "Corea (República Democrática Popular de, [Corea del Norte])"
 
-#: ../picard/const.py:296
+#: ../picard/const.py:298
 msgid "Korea (South), Republic of"
 msgstr "Corea (República de, [Corea del Sur])"
 
-#: ../picard/const.py:297
+#: ../picard/const.py:299
 msgid "Slovakia"
 msgstr "Eslovaquia"
 
-#: ../picard/const.py:298
+#: ../picard/const.py:300
 msgid "Soviet Union (historical, 1922-1991)"
 msgstr "Unión Soviética (histórico, 1922-1991)"
 
-#: ../picard/const.py:299
+#: ../picard/const.py:301
 msgid "East Timor"
 msgstr "Timor oriental"
 
-#: ../picard/const.py:300
+#: ../picard/const.py:302
 msgid "Czechoslovakia (historical, 1918-1992)"
 msgstr "Checoslovaquia (histórico, 1918-1992)"
 
-#: ../picard/const.py:301
+#: ../picard/const.py:303
 msgid "Europe"
 msgstr "Europa"
 
-#: ../picard/const.py:302
+#: ../picard/const.py:304
 msgid "East Germany (historical, 1949-1990)"
 msgstr "Aleania Oriental (histórico, 1949-1990)"
 
-#: ../picard/const.py:303
+#: ../picard/const.py:305
 msgid "[Unknown Country]"
 msgstr "(País desconocido)"
 
-#: ../picard/const.py:304
+#: ../picard/const.py:306
 msgid "[Worldwide]"
 msgstr "(Mundo)"
 
-#: ../picard/const.py:305
+#: ../picard/const.py:307
 msgid "Yugoslavia (historical, 1918-1992)"
 msgstr "Yugoslavia (histórico, 1918-1992)"
 
-#: ../picard/const.py:310
+#: ../picard/const.py:312
+msgid "Afrikaans"
+msgstr ""
+
+#: ../picard/const.py:313
+msgid "Arabic"
+msgstr ""
+
+#: ../picard/const.py:314
 msgid "Catalan"
 msgstr "Catalán"
 
-#: ../picard/const.py:311
+#: ../picard/const.py:315
 msgid "Czech"
 msgstr "Checo"
 
-#: ../picard/const.py:312
+#: ../picard/const.py:316
 msgid "Welsh"
 msgstr "Galés"
 
-#: ../picard/const.py:313
+#: ../picard/const.py:317
 msgid "Danish"
 msgstr "Danés"
 
-#: ../picard/const.py:314
+#: ../picard/const.py:318
 msgid "German"
 msgstr "Alemán"
 
-#: ../picard/const.py:315
+#: ../picard/const.py:319
 msgid "English"
 msgstr "Inglés"
 
-#: ../picard/const.py:316
+#: ../picard/const.py:320
 msgid "English (Canada)"
 msgstr "Inglés (Canadá)"
 
-#: ../picard/const.py:317
+#: ../picard/const.py:321
 msgid "English (UK)"
 msgstr "Inglés (Reino Unido)"
 
-#: ../picard/const.py:318
+#: ../picard/const.py:322
 msgid "Spanish"
 msgstr "Español"
 
-#: ../picard/const.py:319
+#: ../picard/const.py:323
 msgid "Persian"
 msgstr "Farsi"
 
-#: ../picard/const.py:320
+#: ../picard/const.py:324
 msgid "Finnish"
 msgstr "Finlandés"
 
-#: ../picard/const.py:321
+#: ../picard/const.py:325
 msgid "French"
 msgstr "Francés"
 
-#: ../picard/const.py:322
+#: ../picard/const.py:326
 msgid "Frisian"
 msgstr "Frisón"
 
-#: ../picard/const.py:323
+#: ../picard/const.py:327
 msgid "Hebrew"
 msgstr "Hebreo"
 
-#: ../picard/const.py:324
+#: ../picard/const.py:328
+#, fuzzy
+msgid "Hindi"
+msgstr "Haití"
+
+#: ../picard/const.py:329
 msgid "Hungarian"
 msgstr "Húngaro"
 
-#: ../picard/const.py:325
+#: ../picard/const.py:330
 msgid "Islandic"
 msgstr "Islandés"
 
-#: ../picard/const.py:326
+#: ../picard/const.py:331
 msgid "Italian"
 msgstr "Italiano"
 
-#: ../picard/const.py:327
+#: ../picard/const.py:332
 msgid "Kannada"
 msgstr "Canarés"
 
-#: ../picard/const.py:328
+#: ../picard/const.py:333
 msgid "Korean"
 msgstr "Coreano"
 
-#: ../picard/const.py:329
+#: ../picard/const.py:334
 msgid "Lithuanian"
 msgstr "Lituano"
 
-#: ../picard/const.py:330
+#: ../picard/const.py:335
 msgid "Norwegian Bokmal"
 msgstr "Bokmal noruego"
 
-#: ../picard/const.py:331
+#: ../picard/const.py:336
 msgid "Dutch"
 msgstr "Danés"
 
-#: ../picard/const.py:332
+#: ../picard/const.py:337
 msgid "Polish"
 msgstr "Polaco"
 
-#: ../picard/const.py:333
+#: ../picard/const.py:338
 msgid "Portuguese"
 msgstr "Portugués"
 
-#: ../picard/const.py:334
+#: ../picard/const.py:339
 msgid "Brazilian Portuguese"
 msgstr "Portugués de Brasil"
 
-#: ../picard/const.py:335
+#: ../picard/const.py:340
 msgid "Romanian"
 msgstr "Rumano"
 
-#: ../picard/const.py:336
+#: ../picard/const.py:341
 msgid "Russian"
 msgstr "Ruso"
 
-#: ../picard/const.py:337
+#: ../picard/const.py:342
 msgid "Scots"
 msgstr "Escocés"
 
-#: ../picard/const.py:338
+#: ../picard/const.py:343
 msgid "Slovak"
 msgstr "Eslovako"
 
-#: ../picard/const.py:339
+#: ../picard/const.py:344
 msgid "Slovenian"
 msgstr "Esloveno"
 
-#: ../picard/const.py:340
+#: ../picard/const.py:345
 msgid "Swedish"
 msgstr "Sueco"
 
-#: ../picard/const.py:341
+#: ../picard/const.py:346
+#, fuzzy
+msgid "Turkish"
+msgstr "Turkmenistán"
+
+#: ../picard/const.py:347
 msgid "Chinese"
 msgstr "Chino"
 
-#: ../picard/file.py:487
+#: ../picard/file.py:494
 #, python-format
 msgid "No matching tracks for file %s"
 msgstr "No se han encontrado pistas concordantes para el archivo %s"
 
-#: ../picard/file.py:504
+#: ../picard/file.py:511
 #, python-format
 msgid "No matching tracks above the threshold for file %s"
 msgstr "No concuerdan pistas por encima del umbral para el archivo %s"
 
-#: ../picard/file.py:507
+#: ../picard/file.py:514
 #, python-format
 msgid "File %s identified!"
 msgstr "¡Archivo %s identificado!"
 
-#: ../picard/file.py:518
+#: ../picard/file.py:525
 #, python-format
 msgid "Looking up the PUID for file %s..."
 msgstr "Buscando PUID para el archivo %s..."
 
-#: ../picard/file.py:523
+#: ../picard/file.py:530
 #, 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)"
@@ -1260,11 +1277,24 @@ msgstr "Lista de Reproducción PLS (*.pls)"
 msgid "XSPF Playlist (*.xspf)"
 msgstr "Lista de Reproducción XSPF (*.xspf)"
 
-#: ../picard/tagger.py:476
+#: ../picard/puidmanager.py:62
+msgid "Submitting PUIDs..."
+msgstr "Enviando PUIDs..."
+
+#: ../picard/puidmanager.py:68
+#, python-format
+msgid "PUIDs submission failed: %s"
+msgstr "Envío de PUIDs fallido: %s"
+
+#: ../picard/puidmanager.py:70
+msgid "PUIDs successfully submitted!"
+msgstr "¡Los PUIDs han sido enviados con éxito!"
+
+#: ../picard/tagger.py:477
 msgid "CD Lookup Error"
 msgstr "Error buscando CD"
 
-#: ../picard/tagger.py:477
+#: ../picard/tagger.py:478
 #, python-format
 msgid ""
 "Error while reading CD:\n"
@@ -1275,7 +1305,7 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../picard/tagger.py:503
+#: ../picard/tagger.py:504
 #, python-format
 msgid "Could not find PUID for file %s"
 msgstr "No se pudo encontrar el archivo para PUID %s"
@@ -1328,15 +1358,28 @@ msgstr "Mostrar archivos &ocultos"
 msgid "Length"
 msgstr "Duración"
 
-#: ../picard/ui/itemviews.py:327
+#: ../picard/ui/itemviews.py:289
+msgid "&Expand all"
+msgstr ""
+
+#: ../picard/ui/itemviews.py:291
+msgid "&Collapse all"
+msgstr ""
+
+#: ../picard/ui/itemviews.py:332
 msgid "&Releases"
 msgstr "&Lanzamientos"
 
-#: ../picard/ui/itemviews.py:353
+#: ../picard/ui/itemviews.py:349
+#, fuzzy
+msgid "No release event"
+msgstr "Mes de liberación del álbum"
+
+#: ../picard/ui/itemviews.py:359
 msgid "&Plugins"
 msgstr "Com&plementos"
 
-#: ../picard/ui/itemviews.py:523
+#: ../picard/ui/itemviews.py:533
 msgid "Clusters"
 msgstr "Grupos"
 
@@ -1344,95 +1387,6 @@ msgstr "Grupos"
 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:66 ../picard/ui/ui_options_plugins.py:62
-msgid "Details"
-msgstr "Detalles"
-
-#: ../picard/ui/tageditor.py:71 ../picard/ui/tageditor.py:264
-#, python-format
-msgid "%d file"
-msgid_plural "%d files"
-msgstr[0] "%d fichero"
-msgstr[1] "%d ficheros"
-
-#: ../picard/ui/tageditor.py:131
-#, 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:134
-#, 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:233
-msgid "Filename:"
-msgstr "Nombre de fichero:"
-
-#: ../picard/ui/tageditor.py:235
-msgid "Format:"
-msgstr "Formato:"
-
-#: ../picard/ui/tageditor.py:244
-msgid "Size:"
-msgstr "Tamaño:"
-
-#: ../picard/ui/tageditor.py:248 ../picard/ui/ui_metadata.py:127
-msgid "Length:"
-msgstr "Duración:"
-
-#: ../picard/ui/tageditor.py:250
-msgid "Bitrate:"
-msgstr "Tasa de bits:"
-
-#: ../picard/ui/tageditor.py:252
-msgid "Sample rate:"
-msgstr "Tasa de muestreo:"
-
-#: ../picard/ui/tageditor.py:254
-msgid "Bits per sample:"
-msgstr "Bits por muestra:"
-
-#: ../picard/ui/tageditor.py:257
-msgid "Mono"
-msgstr "Mono"
-
-#: ../picard/ui/tageditor.py:258
-msgid "Stereo"
-msgstr "Estéreo"
-
-#: ../picard/ui/tageditor.py:260
-msgid "Channels:"
-msgstr "Canales:"
-
-#: ../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"
 msgstr "MusicBrainz Picard"
@@ -1669,6 +1623,10 @@ msgstr "Barra de bú&squeda"
 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"
@@ -1688,6 +1646,22 @@ msgstr "Lista de reproducción %s guardada"
 msgid " (Error: %s)"
 msgstr " (Error: %s)"
 
+#: ../picard/ui/puidsubmit.py:31 ../picard/ui/options/plugins.py:85
+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/passworddialog.py:38
 #, python-format
 msgid ""
@@ -1696,6 +1670,75 @@ msgstr ""
 "El servidor %s requiere autenticación. Por favor, introduce tu nombre de "
 "usuario y contraseña."
 
+#: ../picard/ui/tageditor.py:66 ../picard/ui/ui_options_plugins.py:62
+msgid "Details"
+msgstr "Detalles"
+
+#: ../picard/ui/tageditor.py:71 ../picard/ui/tageditor.py:264
+#, python-format
+msgid "%d file"
+msgid_plural "%d files"
+msgstr[0] "%d fichero"
+msgstr[1] "%d ficheros"
+
+#: ../picard/ui/tageditor.py:131
+#, 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:134
+#, 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:233
+msgid "Filename:"
+msgstr "Nombre de fichero:"
+
+#: ../picard/ui/tageditor.py:235
+msgid "Format:"
+msgstr "Formato:"
+
+#: ../picard/ui/tageditor.py:244
+msgid "Size:"
+msgstr "Tamaño:"
+
+#: ../picard/ui/tageditor.py:248 ../picard/ui/ui_metadata.py:127
+msgid "Length:"
+msgstr "Duración:"
+
+#: ../picard/ui/tageditor.py:250
+msgid "Bitrate:"
+msgstr "Tasa de bits:"
+
+#: ../picard/ui/tageditor.py:252
+msgid "Sample rate:"
+msgstr "Tasa de muestreo:"
+
+#: ../picard/ui/tageditor.py:254
+msgid "Bits per sample:"
+msgstr "Bits por muestra:"
+
+#: ../picard/ui/tageditor.py:257
+msgid "Mono"
+msgstr "Mono"
+
+#: ../picard/ui/tageditor.py:258
+msgid "Stereo"
+msgstr "Estéreo"
+
+#: ../picard/ui/tageditor.py:260
+msgid "Channels:"
+msgstr "Canales:"
+
+#: ../picard/ui/tagsfromfilenames.py:54 ../picard/ui/tagsfromfilenames.py:99
+msgid "File Name"
+msgstr "Nombre de fichero"
+
 #: ../picard/ui/ui_cdlookup.py:60 ../picard/ui/ui_options_cdlookup.py:47
 #: ../picard/ui/ui_options_cdlookup_select.py:48
 #: ../picard/ui/options/cdlookup.py:36
@@ -1718,24 +1761,6 @@ msgstr "    Buscar manualmente    "
 msgid "Cancel"
 msgstr "Cancelar"
 
-#: ../picard/ui/ui_passworddialog.py:78
-msgid "Authentication required"
-msgstr "Autenticación requerida"
-
-#: ../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/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/ui_passworddialog.py:81
-msgid "Save username and password"
-msgstr "Guardar usuario y contraseña"
-
 #: ../picard/ui/ui_edittagdialog.py:44
 msgid "Edit Tag"
 msgstr "Editar etiqueta"
@@ -1772,6 +1797,10 @@ msgstr "Álbum:"
 msgid "Options"
 msgstr "Opciones"
 
+#: ../picard/ui/ui_puidsubmit.py:52
+msgid "Submit PUIDs"
+msgstr "Enviar PUIDs"
+
 #: ../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:"
@@ -1796,6 +1825,23 @@ msgstr "Guardar carátulas de los álbums en ficheros separados"
 msgid "Overwrite the file if it already exists"
 msgstr "Sobrescribir el fichero si ya existe"
 
+#: ../picard/ui/ui_options_moving.py:53
+msgid "Move additional files:"
+msgstr "Mover ficheros adicionales:"
+
+#: ../picard/ui/ui_options_moving.py:54
+msgid "Browse..."
+msgstr "Explorar..."
+
+#: ../picard/ui/ui_options_moving.py:55
+msgid "Delete empty directories"
+msgstr "Eliminar carpetas vacías"
+
+#: ../picard/ui/ui_options_moving.py:56
+#, fuzzy
+msgid "Move files to this directory when saving:"
+msgstr "Mover ficheros etiquetados a ésta carpeta:"
+
 #: ../picard/ui/util.py:31
 msgid "&Ok"
 msgstr "&Ok"
@@ -1804,44 +1850,40 @@ msgstr "&Ok"
 msgid "&Cancel"
 msgstr "&Cancelar"
 
-#: ../picard/ui/ui_puidsubmit.py:52
-msgid "Submit PUIDs"
-msgstr "Enviar PUIDs"
-
-#: ../picard/ui/ui_tageditor.py:139 ../picard/ui/ui_options_plugins.py:59
-#: ../picard/ui/options/plugins.py:76
+#: ../picard/ui/ui_tageditor.py:128 ../picard/ui/ui_options_plugins.py:59
+#: ../picard/ui/options/plugins.py:81
 msgid "Name"
 msgstr "Nombre"
 
-#: ../picard/ui/ui_tageditor.py:140
+#: ../picard/ui/ui_tageditor.py:129
 msgid "Value"
 msgstr "Valor"
 
-#: ../picard/ui/ui_tageditor.py:141
+#: ../picard/ui/ui_tageditor.py:130
 msgid "Rating:"
 msgstr "Puntuación:"
 
-#: ../picard/ui/ui_tageditor.py:142
+#: ../picard/ui/ui_tageditor.py:131
 msgid "&Add..."
 msgstr "&Añadir..."
 
-#: ../picard/ui/ui_tageditor.py:143
+#: ../picard/ui/ui_tageditor.py:132
 msgid "&Edit..."
 msgstr "&Editar..."
 
-#: ../picard/ui/ui_tageditor.py:144
+#: ../picard/ui/ui_tageditor.py:133
 msgid "&Delete"
 msgstr "&Borrar"
 
-#: ../picard/ui/ui_tageditor.py:145
+#: ../picard/ui/ui_tageditor.py:134
 msgid "&Metadata"
 msgstr "&Metadatos"
 
-#: ../picard/ui/ui_tageditor.py:146
+#: ../picard/ui/ui_tageditor.py:135
 msgid "A&rtwork"
 msgstr "A&rte"
 
-#: ../picard/ui/ui_tageditor.py:147
+#: ../picard/ui/ui_tageditor.py:136
 msgid "&Info"
 msgstr "&Información"
 
@@ -1886,6 +1928,40 @@ msgstr " / "
 msgid ", "
 msgstr ", "
 
+#: ../picard/ui/ui_options_general.py:108
+msgid "MusicBrainz Server"
+msgstr "Servidor de MusicBrainz"
+
+#: ../picard/ui/ui_options_general.py:109 ../picard/ui/ui_options_proxy.py:72
+msgid "Port:"
+msgstr "Puerto:"
+
+#: ../picard/ui/ui_options_general.py:110 ../picard/ui/ui_options_proxy.py:73
+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:112 ../picard/ui/ui_options_proxy.py:70
+#: ../picard/ui/ui_passworddialog.py:80
+msgid "Password:"
+msgstr "Contraseña:"
+
+#: ../picard/ui/ui_options_general.py:113 ../picard/ui/ui_options_proxy.py:71
+#: ../picard/ui/ui_passworddialog.py:79
+msgid "Username:"
+msgstr "Nombre de usuario"
+
+#: ../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 "Analizar automáticamente los ficheros nuevos"
+
 #: ../picard/ui/ui_options_interface.py:50
 msgid "Miscellaneous"
 msgstr "Miscelaneo"
@@ -1906,118 +1982,6 @@ msgstr "Usar sintaxis avanzada de consultas"
 msgid "User interface language:"
 msgstr "Idioma de interfaz 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 "Nombre de archivo de múltiples artistas:"
-
-#: ../picard/ui/ui_options_naming.py:180
-#: ../picard/ui/ui_tagsfromfilenames.py:58
-msgid "&Preview"
-msgstr "&Previsualización"
-
-#: ../picard/ui/ui_options_proxy.py:81 ../picard/ui/options/proxy.py:28
-msgid "Web Proxy"
-msgstr "Web Proxy"
-
-#: ../picard/ui/ui_options_proxy.py:84 ../picard/ui/ui_options_general.py:109
-msgid "Port:"
-msgstr "Puerto:"
-
-#: ../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_options_ratings.py:45
-msgid "Enable track ratings"
-msgstr "Activar puntuaciones de pistas"
-
-#: ../picard/ui/ui_options_ratings.py:46
-msgid ""
-"Picard saves the ratings together with an e-mail address identifying the "
-"user who did the rating. That way different ratings for different users can "
-"be stored in the files. Please sepcify the e-mail you want to use to save "
-"your ratings."
-msgstr ""
-"Picard guarda junto con las puntuaciones una dirección de correo electrónico "
-"para identificar al usuario que hizo la valoración. De esa manera diferentes "
-"puntuaciones de distintos usuarios se pueden almacenar en los archivos. Por "
-"favor, especifique el correo electrónico que desea usar para guardar sus "
-"puntuaciones."
-
-#: ../picard/ui/ui_options_ratings.py:47
-msgid "E-mail:"
-msgstr "Correo-e:"
-
-#: ../picard/ui/ui_options_general.py:108
-msgid "MusicBrainz Server"
-msgstr "Servidor de MusicBrainz"
-
-#: ../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"
-
-#: ../picard/ui/ui_options_general.py:115
-msgid "Automatically scan all new files"
-msgstr "Analizar automáticamente los ficheros nuevos"
-
 #: ../picard/ui/ui_options_matching.py:105
 msgid "Thresholds"
 msgstr "Umbrales"
@@ -2044,8 +2008,7 @@ 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"
+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"
@@ -2075,74 +2038,157 @@ msgstr "Artistas varios:"
 msgid "Non-album tracks:"
 msgstr "Pistas sin álbum:"
 
-#: ../picard/ui/ui_options_plugins.py:58 ../picard/ui/options/plugins.py:30
+#: ../picard/ui/ui_options_metadata.py:109
+#: ../picard/ui/ui_options_metadata.py:110
+#: ../picard/ui/ui_options_renaming.py:155
+#: ../picard/ui/ui_options_renaming.py:158
+msgid "Default"
+msgstr "Por defecto"
+
+#: ../picard/ui/ui_options_plugins.py:58 ../picard/ui/options/plugins.py:34
 msgid "Plugins"
 msgstr "Complementos"
 
-#: ../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:84
 msgid "Author"
 msgstr "Autor"
 
-#: ../picard/ui/ui_options_plugins.py:61 ../picard/util/tags.py:36
+#: ../picard/ui/ui_options_plugins.py:61 ../picard/util/tags.py:37
 msgid "Version"
 msgstr "Versión"
 
-#: ../picard/ui/ui_options_script.py:52
+#: ../picard/ui/ui_options_proxy.py:69 ../picard/ui/options/proxy.py:28
+msgid "Web Proxy"
+msgstr "Web Proxy"
+
+#: ../picard/ui/ui_options_ratings.py:45
+msgid "Enable track ratings"
+msgstr "Activar puntuaciones de pistas"
+
+#: ../picard/ui/ui_options_ratings.py:46
+msgid ""
+"Picard saves the ratings together with an e-mail address identifying the "
+"user who did the rating. That way different ratings for different users can "
+"be stored in the files. Please sepcify the e-mail you want to use to save "
+"your ratings."
+msgstr ""
+"Picard guarda junto con las puntuaciones una dirección de correo electrónico "
+"para identificar al usuario que hizo la valoración. De esa manera diferentes "
+"puntuaciones de distintos usuarios se pueden almacenar en los archivos. Por "
+"favor, especifique el correo electrónico que desea usar para guardar sus "
+"puntuaciones."
+
+#: ../picard/ui/ui_options_ratings.py:47
+msgid "E-mail:"
+msgstr "Correo-e:"
+
+#: ../picard/ui/ui_options_renaming.py:145
+#, fuzzy
+msgid "Form"
+msgstr "Formato"
+
+#: ../picard/ui/ui_options_renaming.py:146
+#, fuzzy
+msgid "Rename files when saving"
+msgstr "Renombrar ficheros al escribir las etiquetas"
+
+#: ../picard/ui/ui_options_renaming.py:147
+msgid "Replace non-ASCII characters"
+msgstr "Reemplazar carácteres que no sean ASCII"
+
+#: ../picard/ui/ui_options_renaming.py:148
+msgid "Replace Windows-incompatible characters"
+msgstr "Sustituir carácteres incompatibles con Windows"
+
+#: ../picard/ui/ui_options_renaming.py:149
+msgid "Name files like this"
+msgstr ""
+
+#: ../picard/ui/ui_options_renaming.py:156
+msgid "Name multiple artist albums differently"
+msgstr ""
+
+#: ../picard/ui/ui_options_renaming.py:157
+msgid "Copy from above"
+msgstr ""
+
+#: ../picard/ui/ui_options_renaming.py:159
+#, fuzzy
+msgid "Examples"
+msgstr "Ejemplo"
+
+#: ../picard/ui/ui_options_script.py:43
 msgid "Tagger Script"
 msgstr "Script de etiquetador"
 
-#: ../picard/ui/ui_options_tags.py:85
-msgid "Common"
-msgstr "Común"
-
-#: ../picard/ui/ui_options_tags.py:86
-msgid "Clear existing tags before writing new tags"
-msgstr "Limpiar etiquetas existentes antes de escribir las etiquetas nuevas"
-
-#: ../picard/ui/ui_options_tags.py:87
-msgid "Don not write tags to files"
+#: ../picard/ui/ui_options_tags.py:97
+#, fuzzy
+msgid "Do not write tags to files"
 msgstr "No escriba etiquetas en los archivos"
 
-#: ../picard/ui/ui_options_tags.py:88
-msgid "ID3"
-msgstr "ID3"
+#: ../picard/ui/ui_options_tags.py:98
+msgid "Before tagging"
+msgstr ""
 
-#: ../picard/ui/ui_options_tags.py:89
-msgid "Write ID3v1 tags to the files"
-msgstr "Escribir etiquetas ID3v1 a los ficheros"
+#: ../picard/ui/ui_options_tags.py:99
+#, fuzzy
+msgid "Clear existing tags"
+msgstr "Limpiar etiquetas existentes antes de escribir las etiquetas nuevas"
 
-#: ../picard/ui/ui_options_tags.py:90
-msgid "Write ID3v2 version 2.3 tags (2.4 is default)"
-msgstr "Escribir etiquetas ID3v2 versión 2.3 (2.4 por omisión)"
-
-#: ../picard/ui/ui_options_tags.py:91
-msgid "Text encoding to use while writing ID3v2 tags:"
-msgstr "Codificación del texto a utilizar al escribir etiquetas ID3v2"
-
-#: ../picard/ui/ui_options_tags.py:92
-msgid "ISO-8859-1"
-msgstr "ISO-8859-1"
-
-#: ../picard/ui/ui_options_tags.py:93
-msgid "UTF-16"
-msgstr "UTF-16"
-
-#: ../picard/ui/ui_options_tags.py:94
-msgid "UTF-8"
-msgstr "UTF-8"
-
-#: ../picard/ui/ui_options_tags.py:95
+#: ../picard/ui/ui_options_tags.py:100
 msgid "Remove ID3 tags from FLAC files"
 msgstr "Eliminar etiquetas ID3 de los ficheros FLAC"
 
-#: ../picard/ui/ui_options_tags.py:96
-msgid "APE"
-msgstr "APE"
-
-#: ../picard/ui/ui_options_tags.py:97
+#: ../picard/ui/ui_options_tags.py:101
 msgid "Remove APEv2 tags from MP3 files"
 msgstr "Eliminar etiquetas APEv2 de los ficheros MP3"
 
+#: ../picard/ui/ui_options_tags.py:102
+msgid "Tag compatibility"
+msgstr ""
+
+#: ../picard/ui/ui_options_tags.py:103
+#, fuzzy
+msgid "ID3v2 version"
+msgstr "solamente ID3v2.4"
+
+#: ../picard/ui/ui_options_tags.py:104
+msgid "2.4"
+msgstr ""
+
+#: ../picard/ui/ui_options_tags.py:105
+msgid "2.3"
+msgstr ""
+
+#: ../picard/ui/ui_options_tags.py:106
+#, fuzzy
+msgid "Also include ID3v1 tags in the files"
+msgstr "Escribir etiquetas ID3v1 a los ficheros"
+
+#: ../picard/ui/ui_options_tags.py:107
+msgid "ID3v2 text encoding"
+msgstr ""
+
+#: ../picard/ui/ui_options_tags.py:108
+msgid "UTF-8"
+msgstr "UTF-8"
+
+#: ../picard/ui/ui_options_tags.py:109
+msgid "UTF-16"
+msgstr "UTF-16"
+
+#: ../picard/ui/ui_options_tags.py:110
+msgid "ISO-8859-1"
+msgstr "ISO-8859-1"
+
+#: ../picard/ui/ui_passworddialog.py:78
+msgid "Authentication required"
+msgstr "Autenticación requerida"
+
+#: ../picard/ui/ui_passworddialog.py:81
+msgid "Save username and password"
+msgstr "Guardar usuario y contraseña"
+
 #: ../picard/ui/ui_tagsfromfilenames.py:56
 msgid "Convert File Names to Tags"
 msgstr "Convertir nombres de ficheros a etiquetas"
@@ -2151,6 +2197,10 @@ msgstr "Convertir nombres de ficheros a etiquetas"
 msgid "Replace underscores with spaces"
 msgstr "Sustituir guiones bajos con espacios en blanco"
 
+#: ../picard/ui/ui_tagsfromfilenames.py:58
+msgid "&Preview"
+msgstr "&Previsualización"
+
 #: ../picard/ui/options/about.py:29
 msgid "About"
 msgstr "Acerca de"
@@ -2199,8 +2249,8 @@ msgstr "<br/>Traducido al castellano por %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"
@@ -2208,33 +2258,31 @@ msgid ""
 "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\"><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/P"
-"icardTagger</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><br/>%(formats)s</p>\n"
+"<p align=\"center\"><strong>Formatos soportados</strong><br/>%(formats)s</"
+"p>\n"
 "<p align=\"center\"><strong>Por favor, dona</strong><br/>\n"
 "Gracias por usar Picard. Picard se basa en la base de datos MusicBrainz que "
 "opera desde la MetaBrainz Foundation con la ayuda de miles de voluntarios. "
 "Si te gusta esta aplicación por favor, considera donar a la MetaBrainz "
 "Foundation para que este servicio continúe existiendo.</p>\n"
-"<p align=\"center\"><a "
-"href=\"http://metabrainz.org/donate/index.html\">¡Donar ahora!</a></p>\n"
+"<p align=\"center\"><a href=\"http://metabrainz.org/donate/index.html"
+"\">¡Donar ahora!</a></p>\n"
 "<p align=\"center\"><strong>Créditos</strong><br/>\n"
 "<small>Copyright © 2004-2008 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/P"
-"icardTagger</a></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"
@@ -2268,257 +2316,266 @@ msgstr "Emparejamiento"
 msgid "None"
 msgstr "Ninguno"
 
-#: ../picard/ui/options/naming.py:33
-msgid "File Naming"
-msgstr "Nombrando archivo"
+#: ../picard/ui/options/moving.py:33
+#, fuzzy
+msgid "Moving files"
+msgstr "Mover ficheros"
 
-#: ../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."
-msgstr "El formato de nombre de archivo no debe estar vacío."
-
-#: ../picard/ui/options/naming.py:95
-msgid "The multiple artist file naming format must not be empty."
-msgstr "El formato de nombre de múltiples artistas no debe estar vacío."
-
-#: ../picard/ui/options/naming.py:97
+#: ../picard/ui/options/moving.py:65
 msgid "Error"
 msgstr "Error"
 
-#: ../picard/ui/options/naming.py:97
+#: ../picard/ui/options/moving.py:65
 msgid "The location to move files to must not be empty."
 msgstr "El lugar a donde mover los archivos no debe estar vacío."
 
-#: ../picard/ui/options/scripting.py:63
-msgid "Scripting"
-msgstr "Escritura de guiones"
+#: ../picard/ui/options/ratings.py:29
+msgid "Ratings"
+msgstr "Puntuaciones"
 
 #: ../picard/ui/options/tags.py:29
 msgid "Tags"
 msgstr "Etiquetas"
 
-#: ../picard/ui/options/ratings.py:29
-msgid "Ratings"
-msgstr "Puntuaciones"
+#: ../picard/ui/options/renaming.py:35
+#, fuzzy
+msgid "File naming"
+msgstr "Nombrando archivo"
+
+#: ../picard/ui/options/renaming.py:123
+msgid "The file naming format must not be empty."
+msgstr "El formato de nombre de archivo no debe estar vacío."
+
+#: ../picard/ui/options/renaming.py:133
+msgid "The multiple artist file naming format must not be empty."
+msgstr "El formato de nombre de múltiples artistas no debe estar vacío."
+
+#: ../picard/ui/options/scripting.py:63
+msgid "Scripting"
+msgstr "Escritura de guiones"
+
+#: ../picard/ui/options/scripting.py:97
+msgid "Script Error"
+msgstr "Error de guión"
 
 #: ../picard/util/tags.py:24
 msgid "Date"
 msgstr "Fecha"
 
 #: ../picard/util/tags.py:25
+#, fuzzy
+msgid "Original Release Date"
+msgstr "Metadatos Originales"
+
+#: ../picard/util/tags.py:26
 msgid "Album Artist"
 msgstr "Intérprete del álbum"
 
-#: ../picard/util/tags.py:26
+#: ../picard/util/tags.py:27
 msgid "Track Number"
 msgstr "Número de pista"
 
-#: ../picard/util/tags.py:27
+#: ../picard/util/tags.py:28
 msgid "Total Tracks"
 msgstr "Total de pistas"
 
-#: ../picard/util/tags.py:28
+#: ../picard/util/tags.py:29
 msgid "Disc Number"
 msgstr "Número de disco"
 
-#: ../picard/util/tags.py:29
+#: ../picard/util/tags.py:30
 msgid "Total Discs"
 msgstr "Total de discos"
 
-#: ../picard/util/tags.py:30
+#: ../picard/util/tags.py:31
 msgid "Album Artist Sort Order"
 msgstr "Orden de artistas de álbumes"
 
-#: ../picard/util/tags.py:31
+#: ../picard/util/tags.py:32
 msgid "Artist Sort Order"
 msgstr "Ordenar por artista"
 
-#: ../picard/util/tags.py:32
+#: ../picard/util/tags.py:33
 msgid "Title Sort Order"
 msgstr "Ordenar por título"
 
-#: ../picard/util/tags.py:33
+#: ../picard/util/tags.py:34
 msgid "Album Sort Order"
 msgstr "Orden de álbumes"
 
-#: ../picard/util/tags.py:34
+#: ../picard/util/tags.py:35
 msgid "ASIN"
 msgstr "ASIN"
 
-#: ../picard/util/tags.py:35
+#: ../picard/util/tags.py:36
 msgid "Grouping"
 msgstr "Agrupación"
 
-#: ../picard/util/tags.py:37
+#: ../picard/util/tags.py:38
 msgid "ISRC"
 msgstr "ISRC"
 
-#: ../picard/util/tags.py:38
+#: ../picard/util/tags.py:39
 msgid "Mood"
 msgstr "Estado de ánimo"
 
-#: ../picard/util/tags.py:39
+#: ../picard/util/tags.py:40
 msgid "BPM"
 msgstr "BPM"
 
-#: ../picard/util/tags.py:40
+#: ../picard/util/tags.py:41
 msgid "Copyright"
 msgstr "Derechos de autor"
 
-#: ../picard/util/tags.py:41
+#: ../picard/util/tags.py:42
 msgid "Composer"
 msgstr "Editor"
 
-#: ../picard/util/tags.py:42
+#: ../picard/util/tags.py:43
 msgid "Conductor"
 msgstr "Conductor"
 
-#: ../picard/util/tags.py:43
+#: ../picard/util/tags.py:44
 msgid "Lyricist"
 msgstr "Letrista"
 
-#: ../picard/util/tags.py:44
+#: ../picard/util/tags.py:45
 msgid "Arranger"
 msgstr "Arreglista"
 
-#: ../picard/util/tags.py:45
+#: ../picard/util/tags.py:46
 msgid "Producer"
 msgstr "Productor"
 
-#: ../picard/util/tags.py:46
+#: ../picard/util/tags.py:47
 msgid "Engineer"
 msgstr "Ingeniero"
 
-#: ../picard/util/tags.py:47
+#: ../picard/util/tags.py:48
 msgid "Subtitle"
 msgstr "Subtítulo"
 
-#: ../picard/util/tags.py:48
+#: ../picard/util/tags.py:49
 msgid "Disc Subtitle"
 msgstr "Subtítulo de disco"
 
-#: ../picard/util/tags.py:49
+#: ../picard/util/tags.py:50
 msgid "Remixer"
 msgstr "Mezclador"
 
-#: ../picard/util/tags.py:50
+#: ../picard/util/tags.py:51
 msgid "MusicBrainz Track Id"
 msgstr "Id de pista en MusicBrainz"
 
-#: ../picard/util/tags.py:51
+#: ../picard/util/tags.py:52
 msgid "MusicBrainz Release Id"
 msgstr "Id de publicación en MusicBrainz"
 
-#: ../picard/util/tags.py:52
+#: ../picard/util/tags.py:53
 msgid "MusicBrainz Artist Id"
 msgstr "Id de artista en MusicBrainz"
 
-#: ../picard/util/tags.py:53
+#: ../picard/util/tags.py:54
 msgid "MusicBrainz Release Artist Id"
 msgstr "Id de publicación de artista en MusicBrainz"
 
-#: ../picard/util/tags.py:54
+#: ../picard/util/tags.py:55
 msgid "MusicBrainz TRM Id"
 msgstr "Id TRM en MusicBrainz"
 
-#: ../picard/util/tags.py:55
+#: ../picard/util/tags.py:56
 msgid "MusicBrainz Disc Id"
 msgstr "Id de disco en MusicBrainz"
 
-#: ../picard/util/tags.py:56
+#: ../picard/util/tags.py:57
 msgid "MusicBrainz Sort Name"
 msgstr "Orden de nombres en MusicBrainz"
 
-#: ../picard/util/tags.py:57
+#: ../picard/util/tags.py:58
 msgid "MusicIP PUID"
 msgstr "MusicIP PUID"
 
-#: ../picard/util/tags.py:58
+#: ../picard/util/tags.py:59
 msgid "MusicIP Fingerprint"
 msgstr "Huella de MusicIP"
 
-#: ../picard/util/tags.py:59
+#: ../picard/util/tags.py:60
 msgid "Disc Id"
 msgstr "Id de Disco"
 
-#: ../picard/util/tags.py:60
+#: ../picard/util/tags.py:61
 msgid "Website"
 msgstr "Sitio web"
 
-#: ../picard/util/tags.py:61
+#: ../picard/util/tags.py:62
 msgid "Compilation"
 msgstr "Compilación"
 
-#: ../picard/util/tags.py:62
+#: ../picard/util/tags.py:63
 msgid "Comment"
 msgstr "Comentario"
 
-#: ../picard/util/tags.py:63
+#: ../picard/util/tags.py:64
 msgid "Genre"
 msgstr "Género"
 
-#: ../picard/util/tags.py:64
+#: ../picard/util/tags.py:65
 msgid "Encoded By"
 msgstr "Codificado por"
 
-#: ../picard/util/tags.py:65
+#: ../picard/util/tags.py:66
 msgid "Performer"
 msgstr "Realizador"
 
-#: ../picard/util/tags.py:66
+#: ../picard/util/tags.py:67
 msgid "Release Type"
 msgstr "Tipo de lanzamiento"
 
-#: ../picard/util/tags.py:67
+#: ../picard/util/tags.py:68
 msgid "Release Status"
 msgstr "Estado de lanzamiento"
 
-#: ../picard/util/tags.py:68
+#: ../picard/util/tags.py:69
 msgid "Release Country"
 msgstr "País de lanzamiento"
 
-#: ../picard/util/tags.py:69
+#: ../picard/util/tags.py:70
 msgid "Record Label"
 msgstr "Disquera"
 
-#: ../picard/util/tags.py:70
+#: ../picard/util/tags.py:71
 msgid "Barcode"
 msgstr "Código de barras"
 
-#: ../picard/util/tags.py:71
+#: ../picard/util/tags.py:72
 msgid "Catalog Number"
 msgstr "Número de catálogo"
 
-#: ../picard/util/tags.py:72
+#: ../picard/util/tags.py:73
 msgid "Format"
 msgstr "Formato"
 
-#: ../picard/util/tags.py:73
+#: ../picard/util/tags.py:74
 msgid "DJ-Mixer"
 msgstr "DJ-Mezclador"
 
-#: ../picard/util/tags.py:74
+#: ../picard/util/tags.py:75
 msgid "Media"
 msgstr "Media"
 
-#: ../picard/util/tags.py:75
+#: ../picard/util/tags.py:76
 msgid "Lyrics"
 msgstr "Letras"
 
-#: ../picard/util/tags.py:76
+#: ../picard/util/tags.py:77
 msgid "Mixer"
 msgstr "Mezclador"
 
-#: ../picard/util/tags.py:77
+#: ../picard/util/tags.py:78
 msgid "Language"
 msgstr "Idioma"
 
-#: ../picard/util/tags.py:78
+#: ../picard/util/tags.py:79
 msgid "Script"
 msgstr "Script"
 
@@ -2537,20 +2594,49 @@ msgstr ""
 "\n"
 "%s"
 
-#, python-format
+#~ msgid "Rename Files"
+#~ msgstr "Renombrar ficheros"
+
+#~ msgid "Multiple artist file naming format:"
+#~ msgstr "Patrón para nombrar ficheros con artistas múltiples:"
+
+#~ msgid "File naming format:"
+#~ msgstr "Patrón para nombrar ficheros:"
+
+#~ msgid "File name:"
+#~ msgstr "Nombre de fichero:"
+
+#~ msgid "Multiple artist file name:"
+#~ msgstr "Nombre de archivo de múltiples artistas:"
+
+#~ msgid "Common"
+#~ msgstr "Común"
+
+#~ msgid "ID3"
+#~ msgstr "ID3"
+
+#~ msgid "Write ID3v2 version 2.3 tags (2.4 is default)"
+#~ msgstr "Escribir etiquetas ID3v2 versión 2.3 (2.4 por omisión)"
+
+#~ msgid "Text encoding to use while writing ID3v2 tags:"
+#~ msgstr "Codificación del texto a utilizar al escribir etiquetas ID3v2"
+
+#~ msgid "APE"
+#~ msgstr "APE"
+
 #~ msgid "[couldn't load album %s]"
 #~ msgstr "[no se pudo cargar el álbum (%s)]"
 
 #~ msgid "New Version"
 #~ msgstr "Nueva Versión"
 
-#, python-format
 #~ msgid ""
-#~ "New version of Picard is available (%s). Would you like to download it now?"
+#~ "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?"
+#~ "Una nueva versión de Picard está disponible (%s). ¿Desea descargarla "
+#~ "ahora?"
 
-#, python-format
 #~ msgid "Couldn't find PUID for file %s"
 #~ msgstr "No se ha podido encontrar el PUID para el fichero %s"
 
@@ -2688,9 +2774,6 @@ msgstr ""
 #~ 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"
 
@@ -2709,9 +2792,6 @@ msgstr ""
 #~ msgid "Proxy port"
 #~ msgstr "Puerto del proxy"
 
-#~ msgid "ID3v2.4 only"
-#~ msgstr "solamente ID3v2.4"
-
 #~ msgid "Save track/album"
 #~ msgstr "Guardar pista/álbum"
 
@@ -2734,7 +2814,8 @@ msgstr ""
 #~ 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?"
+#~ 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"
@@ -2746,16 +2827,17 @@ msgstr ""
 #~ 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"
-#~ "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. "
+#~ "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 ""
-#~ "Usted no ha especificado un usuario y contraseña. Debes tener una cuentacon "
-#~ "MusicBrainz para contribuir con datos.\n"
-#~ "¿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. "
+#~ "Usted no ha especificado un usuario y contraseña. Debes tener una "
+#~ "cuentacon MusicBrainz para contribuir con datos.\n"
+#~ "¿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."
@@ -2782,20 +2864,22 @@ msgstr ""
 #~ 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."
+#~ "Please fix the move option or the destination directory option and try "
+#~ "again."
 #~ msgstr ""
-#~ "La opción de mover los archivos está habilitada, pero el directorio destino "
-#~ "no se ha especificado ó es inválido.\n"
+#~ "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 click the "
-#~ "track and select 'Clear Error'"
+#~ "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 ""
-#~ "No se pudieron guardar todos los archivos. Por favor verifique y examine 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'"
+#~ "No se pudieron guardar todos los archivos. Por favor verifique y examine "
+#~ "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"
@@ -2819,13 +2903,16 @@ msgstr ""
 #~ msgstr "¡Por favor done a MusicBrainz!"
 
 #~ msgid ""
-#~ "The destination directory %s does not exist. Please pick a valid directory."
+#~ "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"
+#~ "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"
+#~ "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"
@@ -2836,14 +2923,12 @@ msgstr ""
 #~ 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"
+#~ "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"
 
@@ -2927,8 +3012,8 @@ msgstr ""
 #~ 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. "
+#~ "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 "
@@ -2985,9 +3070,10 @@ msgstr ""
 #~ "The MusicBrainz Tagger requires wx.Widgets with UNICODE support.\n"
 #~ "Please download the appropriate toolkit from  http://www.wxwidgets.com"
 #~ msgstr ""
-#~ "El Tagger de MusicBrainz necesita los wx.Widgets con soporte para UNICODE.\n"
-#~ "Por favor descarge el set de herramientas apropiado desde "
-#~ "http://www.wxwidgets.com"
+#~ "El Tagger de MusicBrainz necesita los wx.Widgets con soporte para "
+#~ "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"
diff --git a/po/fa.po b/po/fa.po
index 7b774c918..3a03f1afe 100644
--- a/po/fa.po
+++ b/po/fa.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: picard\n"
 "Report-Msgid-Bugs-To: http://bugs.musicbrainz.org/\n"
-"POT-Creation-Date: 2009-02-24 18:58+0100\n"
+"POT-Creation-Date: 2009-04-06 22:50+0200\n"
 "PO-Revision-Date: 2009-01-25 13:34+0000\n"
 "Last-Translator: Philipp Wolfer <Unknown>\n"
 "Language-Team: Persian <fa@li.org>\n"
@@ -18,16 +18,16 @@ msgstr ""
 "X-Launchpad-Export-Date: 2009-04-06 20:20+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
-#: ../picard/album.py:108 ../picard/cluster.py:248
+#: ../picard/album.py:109 ../picard/cluster.py:248
 msgid "Unmatched Files"
 msgstr ""
 
-#: ../picard/album.py:281
+#: ../picard/album.py:287
 #, python-format
 msgid "[could not load album %s]"
 msgstr ""
 
-#: ../picard/album.py:317
+#: ../picard/album.py:320
 msgid "[loading album information]"
 msgstr ""
 
@@ -587,7 +587,7 @@ msgid "Namibia"
 msgstr ""
 
 #: ../picard/const.py:182
-msgid "Vanuat"
+msgid "Vanuatu"
 msgstr ""
 
 #: ../picard/const.py:183
@@ -1031,223 +1031,234 @@ msgid "Congo, The Democratic Republic of the"
 msgstr ""
 
 #: ../picard/const.py:293
-msgid "Serbia and Montenegro"
+msgid "Serbia and Montenegro (historical, 2003-2006)"
 msgstr ""
 
 #: ../picard/const.py:294
-msgid "Croatia"
+msgid "Serbia"
 msgstr ""
 
 #: ../picard/const.py:295
-msgid "Korea (North), Democratic People's Republic of"
+msgid "Montenegro"
 msgstr ""
 
 #: ../picard/const.py:296
-msgid "Korea (South), Republic of"
+msgid "Croatia"
 msgstr ""
 
 #: ../picard/const.py:297
-msgid "Slovakia"
+msgid "Korea (North), Democratic People's Republic of"
 msgstr ""
 
 #: ../picard/const.py:298
-msgid "Soviet Union (historical, 1922-1991)"
+msgid "Korea (South), Republic of"
 msgstr ""
 
 #: ../picard/const.py:299
-msgid "East Timor"
+msgid "Slovakia"
 msgstr ""
 
 #: ../picard/const.py:300
-msgid "Czechoslovakia (historical, 1918-1992)"
+msgid "Soviet Union (historical, 1922-1991)"
 msgstr ""
 
 #: ../picard/const.py:301
-msgid "Europe"
+msgid "East Timor"
 msgstr ""
 
 #: ../picard/const.py:302
-msgid "East Germany (historical, 1949-1990)"
+msgid "Czechoslovakia (historical, 1918-1992)"
 msgstr ""
 
 #: ../picard/const.py:303
-msgid "[Unknown Country]"
+msgid "Europe"
 msgstr ""
 
 #: ../picard/const.py:304
-msgid "[Worldwide]"
+msgid "East Germany (historical, 1949-1990)"
 msgstr ""
 
 #: ../picard/const.py:305
+msgid "[Unknown Country]"
+msgstr ""
+
+#: ../picard/const.py:306
+msgid "[Worldwide]"
+msgstr ""
+
+#: ../picard/const.py:307
 msgid "Yugoslavia (historical, 1918-1992)"
 msgstr ""
 
-#: ../picard/const.py:310
-msgid "Catalan"
-msgstr ""
-
-#: ../picard/const.py:311
-msgid "Czech"
-msgstr ""
-
 #: ../picard/const.py:312
-msgid "Welsh"
+msgid "Afrikaans"
 msgstr ""
 
 #: ../picard/const.py:313
-msgid "Danish"
+msgid "Arabic"
 msgstr ""
 
 #: ../picard/const.py:314
-msgid "German"
+msgid "Catalan"
 msgstr ""
 
 #: ../picard/const.py:315
-msgid "English"
+msgid "Czech"
 msgstr ""
 
 #: ../picard/const.py:316
-msgid "English (Canada)"
+msgid "Welsh"
 msgstr ""
 
 #: ../picard/const.py:317
-msgid "English (UK)"
+msgid "Danish"
 msgstr ""
 
 #: ../picard/const.py:318
-msgid "Spanish"
+msgid "German"
 msgstr ""
 
 #: ../picard/const.py:319
-msgid "Persian"
+msgid "English"
 msgstr ""
 
 #: ../picard/const.py:320
-msgid "Finnish"
+msgid "English (Canada)"
 msgstr ""
 
 #: ../picard/const.py:321
-msgid "French"
+msgid "English (UK)"
 msgstr ""
 
 #: ../picard/const.py:322
-msgid "Frisian"
+msgid "Spanish"
 msgstr ""
 
 #: ../picard/const.py:323
-msgid "Hebrew"
+msgid "Persian"
 msgstr ""
 
 #: ../picard/const.py:324
-msgid "Hungarian"
+msgid "Finnish"
 msgstr ""
 
 #: ../picard/const.py:325
-msgid "Islandic"
+msgid "French"
 msgstr ""
 
 #: ../picard/const.py:326
-msgid "Italian"
+msgid "Frisian"
 msgstr ""
 
 #: ../picard/const.py:327
-msgid "Kannada"
+msgid "Hebrew"
 msgstr ""
 
 #: ../picard/const.py:328
-msgid "Korean"
+msgid "Hindi"
 msgstr ""
 
 #: ../picard/const.py:329
-msgid "Lithuanian"
+msgid "Hungarian"
 msgstr ""
 
 #: ../picard/const.py:330
-msgid "Norwegian Bokmal"
+msgid "Islandic"
 msgstr ""
 
 #: ../picard/const.py:331
-msgid "Dutch"
+msgid "Italian"
 msgstr ""
 
 #: ../picard/const.py:332
-msgid "Polish"
+msgid "Kannada"
 msgstr ""
 
 #: ../picard/const.py:333
-msgid "Portuguese"
+msgid "Korean"
 msgstr ""
 
 #: ../picard/const.py:334
-msgid "Brazilian Portuguese"
+msgid "Lithuanian"
 msgstr ""
 
 #: ../picard/const.py:335
-msgid "Romanian"
+msgid "Norwegian Bokmal"
 msgstr ""
 
 #: ../picard/const.py:336
-msgid "Russian"
+msgid "Dutch"
 msgstr ""
 
 #: ../picard/const.py:337
-msgid "Scots"
+msgid "Polish"
 msgstr ""
 
 #: ../picard/const.py:338
-msgid "Slovak"
+msgid "Portuguese"
 msgstr ""
 
 #: ../picard/const.py:339
-msgid "Slovenian"
+msgid "Brazilian Portuguese"
 msgstr ""
 
 #: ../picard/const.py:340
-msgid "Swedish"
+msgid "Romanian"
 msgstr ""
 
 #: ../picard/const.py:341
+msgid "Russian"
+msgstr ""
+
+#: ../picard/const.py:342
+msgid "Scots"
+msgstr ""
+
+#: ../picard/const.py:343
+msgid "Slovak"
+msgstr ""
+
+#: ../picard/const.py:344
+msgid "Slovenian"
+msgstr ""
+
+#: ../picard/const.py:345
+msgid "Swedish"
+msgstr ""
+
+#: ../picard/const.py:346
+msgid "Turkish"
+msgstr ""
+
+#: ../picard/const.py:347
 msgid "Chinese"
 msgstr ""
 
-#: ../picard/file.py:487
+#: ../picard/file.py:494
 #, python-format
 msgid "No matching tracks for file %s"
 msgstr ""
 
-#: ../picard/file.py:504
+#: ../picard/file.py:511
 #, python-format
 msgid "No matching tracks above the threshold for file %s"
 msgstr ""
 
-#: ../picard/file.py:507
+#: ../picard/file.py:514
 #, python-format
 msgid "File %s identified!"
 msgstr ""
 
-#: ../picard/file.py:518
+#: ../picard/file.py:525
 #, python-format
 msgid "Looking up the PUID for file %s..."
 msgstr ""
 
-#: ../picard/file.py:523
+#: ../picard/file.py:530
 #, 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 ""
@@ -1260,11 +1271,24 @@ msgstr ""
 msgid "XSPF Playlist (*.xspf)"
 msgstr ""
 
-#: ../picard/tagger.py:476
-msgid "CD Lookup Error"
+#: ../picard/puidmanager.py:62
+msgid "Submitting PUIDs..."
+msgstr ""
+
+#: ../picard/puidmanager.py:68
+#, python-format
+msgid "PUIDs submission failed: %s"
+msgstr ""
+
+#: ../picard/puidmanager.py:70
+msgid "PUIDs successfully submitted!"
 msgstr ""
 
 #: ../picard/tagger.py:477
+msgid "CD Lookup Error"
+msgstr ""
+
+#: ../picard/tagger.py:478
 #, python-format
 msgid ""
 "Error while reading CD:\n"
@@ -1272,7 +1296,7 @@ msgid ""
 "%s"
 msgstr ""
 
-#: ../picard/tagger.py:503
+#: ../picard/tagger.py:504
 #, python-format
 msgid "Could not find PUID for file %s"
 msgstr ""
@@ -1325,15 +1349,27 @@ msgstr ""
 msgid "Length"
 msgstr "طول‌"
 
-#: ../picard/ui/itemviews.py:327
+#: ../picard/ui/itemviews.py:289
+msgid "&Expand all"
+msgstr ""
+
+#: ../picard/ui/itemviews.py:291
+msgid "&Collapse all"
+msgstr ""
+
+#: ../picard/ui/itemviews.py:332
 msgid "&Releases"
 msgstr ""
 
-#: ../picard/ui/itemviews.py:353
+#: ../picard/ui/itemviews.py:349
+msgid "No release event"
+msgstr ""
+
+#: ../picard/ui/itemviews.py:359
 msgid "&Plugins"
 msgstr "&افزونه‌ها"
 
-#: ../picard/ui/itemviews.py:523
+#: ../picard/ui/itemviews.py:533
 msgid "Clusters"
 msgstr ""
 
@@ -1341,95 +1377,6 @@ msgstr ""
 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:66 ../picard/ui/ui_options_plugins.py:62
-msgid "Details"
-msgstr ""
-
-#: ../picard/ui/tageditor.py:71 ../picard/ui/tageditor.py:264
-#, python-format
-msgid "%d file"
-msgid_plural "%d files"
-msgstr[0] ""
-msgstr[1] ""
-
-#: ../picard/ui/tageditor.py:131
-#, python-format
-msgid "(different across %d file)"
-msgid_plural "(different across %d files)"
-msgstr[0] ""
-msgstr[1] ""
-
-#: ../picard/ui/tageditor.py:134
-#, python-format
-msgid "(missing from %d file)"
-msgid_plural "(missing from %d files)"
-msgstr[0] ""
-msgstr[1] ""
-
-#: ../picard/ui/tageditor.py:233
-msgid "Filename:"
-msgstr ""
-
-#: ../picard/ui/tageditor.py:235
-msgid "Format:"
-msgstr ""
-
-#: ../picard/ui/tageditor.py:244
-msgid "Size:"
-msgstr ""
-
-#: ../picard/ui/tageditor.py:248 ../picard/ui/ui_metadata.py:127
-msgid "Length:"
-msgstr ""
-
-#: ../picard/ui/tageditor.py:250
-msgid "Bitrate:"
-msgstr ""
-
-#: ../picard/ui/tageditor.py:252
-msgid "Sample rate:"
-msgstr ""
-
-#: ../picard/ui/tageditor.py:254
-msgid "Bits per sample:"
-msgstr ""
-
-#: ../picard/ui/tageditor.py:257
-msgid "Mono"
-msgstr ""
-
-#: ../picard/ui/tageditor.py:258
-msgid "Stereo"
-msgstr ""
-
-#: ../picard/ui/tageditor.py:260
-msgid "Channels:"
-msgstr ""
-
-#: ../picard/ui/tagsfromfilenames.py:52 ../picard/ui/tagsfromfilenames.py:96
-msgid "File Name"
-msgstr ""
-
 #: ../picard/ui/mainwindow.py:64
 msgid "MusicBrainz Picard"
 msgstr ""
@@ -1666,6 +1613,10 @@ msgstr ""
 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 ""
@@ -1685,12 +1636,97 @@ msgstr ""
 msgid " (Error: %s)"
 msgstr ""
 
+#: ../picard/ui/puidsubmit.py:31 ../picard/ui/options/plugins.py:85
+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/passworddialog.py:38
 #, python-format
 msgid ""
 "The server %s requires you to login. Please enter your username and password."
 msgstr ""
 
+#: ../picard/ui/tageditor.py:66 ../picard/ui/ui_options_plugins.py:62
+msgid "Details"
+msgstr ""
+
+#: ../picard/ui/tageditor.py:71 ../picard/ui/tageditor.py:264
+#, python-format
+msgid "%d file"
+msgid_plural "%d files"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../picard/ui/tageditor.py:131
+#, python-format
+msgid "(different across %d file)"
+msgid_plural "(different across %d files)"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../picard/ui/tageditor.py:134
+#, python-format
+msgid "(missing from %d file)"
+msgid_plural "(missing from %d files)"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../picard/ui/tageditor.py:233
+msgid "Filename:"
+msgstr ""
+
+#: ../picard/ui/tageditor.py:235
+msgid "Format:"
+msgstr ""
+
+#: ../picard/ui/tageditor.py:244
+msgid "Size:"
+msgstr ""
+
+#: ../picard/ui/tageditor.py:248 ../picard/ui/ui_metadata.py:127
+msgid "Length:"
+msgstr ""
+
+#: ../picard/ui/tageditor.py:250
+msgid "Bitrate:"
+msgstr ""
+
+#: ../picard/ui/tageditor.py:252
+msgid "Sample rate:"
+msgstr ""
+
+#: ../picard/ui/tageditor.py:254
+msgid "Bits per sample:"
+msgstr ""
+
+#: ../picard/ui/tageditor.py:257
+msgid "Mono"
+msgstr ""
+
+#: ../picard/ui/tageditor.py:258
+msgid "Stereo"
+msgstr ""
+
+#: ../picard/ui/tageditor.py:260
+msgid "Channels:"
+msgstr ""
+
+#: ../picard/ui/tagsfromfilenames.py:54 ../picard/ui/tagsfromfilenames.py:99
+msgid "File Name"
+msgstr ""
+
 #: ../picard/ui/ui_cdlookup.py:60 ../picard/ui/ui_options_cdlookup.py:47
 #: ../picard/ui/ui_options_cdlookup_select.py:48
 #: ../picard/ui/options/cdlookup.py:36
@@ -1713,24 +1749,6 @@ msgstr ""
 msgid "Cancel"
 msgstr ""
 
-#: ../picard/ui/ui_passworddialog.py:78
-msgid "Authentication required"
-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"
-msgstr ""
-
 #: ../picard/ui/ui_edittagdialog.py:44
 msgid "Edit Tag"
 msgstr ""
@@ -1767,6 +1785,10 @@ msgstr ""
 msgid "Options"
 msgstr ""
 
+#: ../picard/ui/ui_puidsubmit.py:52
+msgid "Submit PUIDs"
+msgstr ""
+
 #: ../picard/ui/ui_options_cdlookup.py:48
 msgid "CD-ROM device to use for lookups:"
 msgstr ""
@@ -1791,6 +1813,22 @@ msgstr ""
 msgid "Overwrite the file if it already exists"
 msgstr ""
 
+#: ../picard/ui/ui_options_moving.py:53
+msgid "Move additional files:"
+msgstr ""
+
+#: ../picard/ui/ui_options_moving.py:54
+msgid "Browse..."
+msgstr ""
+
+#: ../picard/ui/ui_options_moving.py:55
+msgid "Delete empty directories"
+msgstr ""
+
+#: ../picard/ui/ui_options_moving.py:56
+msgid "Move files to this directory when saving:"
+msgstr ""
+
 #: ../picard/ui/util.py:31
 msgid "&Ok"
 msgstr ""
@@ -1799,44 +1837,40 @@ msgstr ""
 msgid "&Cancel"
 msgstr ""
 
-#: ../picard/ui/ui_puidsubmit.py:52
-msgid "Submit PUIDs"
-msgstr ""
-
-#: ../picard/ui/ui_tageditor.py:139 ../picard/ui/ui_options_plugins.py:59
-#: ../picard/ui/options/plugins.py:76
+#: ../picard/ui/ui_tageditor.py:128 ../picard/ui/ui_options_plugins.py:59
+#: ../picard/ui/options/plugins.py:81
 msgid "Name"
 msgstr ""
 
-#: ../picard/ui/ui_tageditor.py:140
+#: ../picard/ui/ui_tageditor.py:129
 msgid "Value"
 msgstr ""
 
-#: ../picard/ui/ui_tageditor.py:141
+#: ../picard/ui/ui_tageditor.py:130
 msgid "Rating:"
 msgstr ""
 
-#: ../picard/ui/ui_tageditor.py:142
+#: ../picard/ui/ui_tageditor.py:131
 msgid "&Add..."
 msgstr ""
 
-#: ../picard/ui/ui_tageditor.py:143
+#: ../picard/ui/ui_tageditor.py:132
 msgid "&Edit..."
 msgstr ""
 
-#: ../picard/ui/ui_tageditor.py:144
+#: ../picard/ui/ui_tageditor.py:133
 msgid "&Delete"
 msgstr ""
 
-#: ../picard/ui/ui_tageditor.py:145
+#: ../picard/ui/ui_tageditor.py:134
 msgid "&Metadata"
 msgstr ""
 
-#: ../picard/ui/ui_tageditor.py:146
+#: ../picard/ui/ui_tageditor.py:135
 msgid "A&rtwork"
 msgstr ""
 
-#: ../picard/ui/ui_tageditor.py:147
+#: ../picard/ui/ui_tageditor.py:136
 msgid "&Info"
 msgstr ""
 
@@ -1881,6 +1915,40 @@ msgstr ""
 msgid ", "
 msgstr ""
 
+#: ../picard/ui/ui_options_general.py:108
+msgid "MusicBrainz Server"
+msgstr ""
+
+#: ../picard/ui/ui_options_general.py:109 ../picard/ui/ui_options_proxy.py:72
+msgid "Port:"
+msgstr ""
+
+#: ../picard/ui/ui_options_general.py:110 ../picard/ui/ui_options_proxy.py:73
+msgid "Server address:"
+msgstr ""
+
+#: ../picard/ui/ui_options_general.py:111
+msgid "Account Information"
+msgstr ""
+
+#: ../picard/ui/ui_options_general.py:112 ../picard/ui/ui_options_proxy.py:70
+#: ../picard/ui/ui_passworddialog.py:80
+msgid "Password:"
+msgstr ""
+
+#: ../picard/ui/ui_options_general.py:113 ../picard/ui/ui_options_proxy.py:71
+#: ../picard/ui/ui_passworddialog.py:79
+msgid "Username:"
+msgstr ""
+
+#: ../picard/ui/ui_options_general.py:114 ../picard/ui/options/general.py:29
+msgid "General"
+msgstr ""
+
+#: ../picard/ui/ui_options_general.py:115
+msgid "Automatically scan all new files"
+msgstr ""
+
 #: ../picard/ui/ui_options_interface.py:50
 msgid "Miscellaneous"
 msgstr ""
@@ -1901,113 +1969,6 @@ msgstr ""
 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_options_naming.py:180
-#: ../picard/ui/ui_tagsfromfilenames.py:58
-msgid "&Preview"
-msgstr ""
-
-#: ../picard/ui/ui_options_proxy.py:81 ../picard/ui/options/proxy.py:28
-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_options_ratings.py:45
-msgid "Enable track ratings"
-msgstr ""
-
-#: ../picard/ui/ui_options_ratings.py:46
-msgid ""
-"Picard saves the ratings together with an e-mail address identifying the "
-"user who did the rating. That way different ratings for different users can "
-"be stored in the files. Please sepcify the e-mail you want to use to save "
-"your ratings."
-msgstr ""
-
-#: ../picard/ui/ui_options_ratings.py:47
-msgid "E-mail:"
-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 ../picard/ui/options/general.py:29
-msgid "General"
-msgstr ""
-
-#: ../picard/ui/ui_options_general.py:115
-msgid "Automatically scan all new files"
-msgstr ""
-
 #: ../picard/ui/ui_options_matching.py:105
 msgid "Thresholds"
 msgstr ""
@@ -2064,72 +2025,143 @@ msgstr ""
 msgid "Non-album tracks:"
 msgstr ""
 
-#: ../picard/ui/ui_options_plugins.py:58 ../picard/ui/options/plugins.py:30
+#: ../picard/ui/ui_options_metadata.py:109
+#: ../picard/ui/ui_options_metadata.py:110
+#: ../picard/ui/ui_options_renaming.py:155
+#: ../picard/ui/ui_options_renaming.py:158
+msgid "Default"
+msgstr ""
+
+#: ../picard/ui/ui_options_plugins.py:58 ../picard/ui/options/plugins.py:34
 msgid "Plugins"
 msgstr ""
 
-#: ../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:84
 msgid "Author"
 msgstr ""
 
-#: ../picard/ui/ui_options_plugins.py:61 ../picard/util/tags.py:36
+#: ../picard/ui/ui_options_plugins.py:61 ../picard/util/tags.py:37
 msgid "Version"
 msgstr ""
 
-#: ../picard/ui/ui_options_script.py:52
+#: ../picard/ui/ui_options_proxy.py:69 ../picard/ui/options/proxy.py:28
+msgid "Web Proxy"
+msgstr ""
+
+#: ../picard/ui/ui_options_ratings.py:45
+msgid "Enable track ratings"
+msgstr ""
+
+#: ../picard/ui/ui_options_ratings.py:46
+msgid ""
+"Picard saves the ratings together with an e-mail address identifying the "
+"user who did the rating. That way different ratings for different users can "
+"be stored in the files. Please sepcify the e-mail you want to use to save "
+"your ratings."
+msgstr ""
+
+#: ../picard/ui/ui_options_ratings.py:47
+msgid "E-mail:"
+msgstr ""
+
+#: ../picard/ui/ui_options_renaming.py:145
+msgid "Form"
+msgstr ""
+
+#: ../picard/ui/ui_options_renaming.py:146
+msgid "Rename files when saving"
+msgstr ""
+
+#: ../picard/ui/ui_options_renaming.py:147
+msgid "Replace non-ASCII characters"
+msgstr ""
+
+#: ../picard/ui/ui_options_renaming.py:148
+msgid "Replace Windows-incompatible characters"
+msgstr ""
+
+#: ../picard/ui/ui_options_renaming.py:149
+msgid "Name files like this"
+msgstr ""
+
+#: ../picard/ui/ui_options_renaming.py:156
+msgid "Name multiple artist albums differently"
+msgstr ""
+
+#: ../picard/ui/ui_options_renaming.py:157
+msgid "Copy from above"
+msgstr ""
+
+#: ../picard/ui/ui_options_renaming.py:159
+msgid "Examples"
+msgstr ""
+
+#: ../picard/ui/ui_options_script.py:43
 msgid "Tagger Script"
 msgstr ""
 
-#: ../picard/ui/ui_options_tags.py:85
-msgid "Common"
+#: ../picard/ui/ui_options_tags.py:97
+msgid "Do not write tags to files"
 msgstr ""
 
-#: ../picard/ui/ui_options_tags.py:86
-msgid "Clear existing tags before writing new tags"
+#: ../picard/ui/ui_options_tags.py:98
+msgid "Before tagging"
 msgstr ""
 
-#: ../picard/ui/ui_options_tags.py:87
-msgid "Don not write tags to files"
+#: ../picard/ui/ui_options_tags.py:99
+msgid "Clear existing tags"
 msgstr ""
 
-#: ../picard/ui/ui_options_tags.py:88
-msgid "ID3"
-msgstr ""
-
-#: ../picard/ui/ui_options_tags.py:89
-msgid "Write ID3v1 tags to the files"
-msgstr ""
-
-#: ../picard/ui/ui_options_tags.py:90
-msgid "Write ID3v2 version 2.3 tags (2.4 is default)"
-msgstr ""
-
-#: ../picard/ui/ui_options_tags.py:91
-msgid "Text encoding to use while writing ID3v2 tags:"
-msgstr ""
-
-#: ../picard/ui/ui_options_tags.py:92
-msgid "ISO-8859-1"
-msgstr ""
-
-#: ../picard/ui/ui_options_tags.py:93
-msgid "UTF-16"
-msgstr ""
-
-#: ../picard/ui/ui_options_tags.py:94
-msgid "UTF-8"
-msgstr ""
-
-#: ../picard/ui/ui_options_tags.py:95
+#: ../picard/ui/ui_options_tags.py:100
 msgid "Remove ID3 tags from FLAC files"
 msgstr ""
 
-#: ../picard/ui/ui_options_tags.py:96
-msgid "APE"
+#: ../picard/ui/ui_options_tags.py:101
+msgid "Remove APEv2 tags from MP3 files"
 msgstr ""
 
-#: ../picard/ui/ui_options_tags.py:97
-msgid "Remove APEv2 tags from MP3 files"
+#: ../picard/ui/ui_options_tags.py:102
+msgid "Tag compatibility"
+msgstr ""
+
+#: ../picard/ui/ui_options_tags.py:103
+msgid "ID3v2 version"
+msgstr ""
+
+#: ../picard/ui/ui_options_tags.py:104
+msgid "2.4"
+msgstr ""
+
+#: ../picard/ui/ui_options_tags.py:105
+msgid "2.3"
+msgstr ""
+
+#: ../picard/ui/ui_options_tags.py:106
+msgid "Also include ID3v1 tags in the files"
+msgstr ""
+
+#: ../picard/ui/ui_options_tags.py:107
+msgid "ID3v2 text encoding"
+msgstr ""
+
+#: ../picard/ui/ui_options_tags.py:108
+msgid "UTF-8"
+msgstr ""
+
+#: ../picard/ui/ui_options_tags.py:109
+msgid "UTF-16"
+msgstr ""
+
+#: ../picard/ui/ui_options_tags.py:110
+msgid "ISO-8859-1"
+msgstr ""
+
+#: ../picard/ui/ui_passworddialog.py:78
+msgid "Authentication required"
+msgstr ""
+
+#: ../picard/ui/ui_passworddialog.py:81
+msgid "Save username and password"
 msgstr ""
 
 #: ../picard/ui/ui_tagsfromfilenames.py:56
@@ -2140,6 +2172,10 @@ msgstr ""
 msgid "Replace underscores with spaces"
 msgstr ""
 
+#: ../picard/ui/ui_tagsfromfilenames.py:58
+msgid "&Preview"
+msgstr ""
+
 #: ../picard/ui/options/about.py:29
 msgid "About"
 msgstr ""
@@ -2164,8 +2200,8 @@ 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"
@@ -2173,14 +2209,13 @@ msgid ""
 "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\"><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/P"
-"icardTagger</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
@@ -2213,42 +2248,44 @@ msgstr ""
 msgid "None"
 msgstr ""
 
-#: ../picard/ui/options/naming.py:33
-msgid "File Naming"
+#: ../picard/ui/options/moving.py:33
+msgid "Moving files"
 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 ""
-
-#: ../picard/ui/options/naming.py:95
-msgid "The multiple artist file naming format must not be empty."
-msgstr ""
-
-#: ../picard/ui/options/naming.py:97
+#: ../picard/ui/options/moving.py:65
 msgid "Error"
 msgstr ""
 
-#: ../picard/ui/options/naming.py:97
+#: ../picard/ui/options/moving.py:65
 msgid "The location to move files to must not be empty."
 msgstr ""
 
-#: ../picard/ui/options/scripting.py:63
-msgid "Scripting"
+#: ../picard/ui/options/ratings.py:29
+msgid "Ratings"
 msgstr ""
 
 #: ../picard/ui/options/tags.py:29
 msgid "Tags"
 msgstr ""
 
-#: ../picard/ui/options/ratings.py:29
-msgid "Ratings"
+#: ../picard/ui/options/renaming.py:35
+msgid "File naming"
+msgstr ""
+
+#: ../picard/ui/options/renaming.py:123
+msgid "The file naming format must not be empty."
+msgstr ""
+
+#: ../picard/ui/options/renaming.py:133
+msgid "The multiple artist file naming format must not be empty."
+msgstr ""
+
+#: ../picard/ui/options/scripting.py:63
+msgid "Scripting"
+msgstr ""
+
+#: ../picard/ui/options/scripting.py:97
+msgid "Script Error"
 msgstr ""
 
 #: ../picard/util/tags.py:24
@@ -2256,214 +2293,218 @@ msgid "Date"
 msgstr ""
 
 #: ../picard/util/tags.py:25
-msgid "Album Artist"
+msgid "Original Release Date"
 msgstr ""
 
 #: ../picard/util/tags.py:26
-msgid "Track Number"
+msgid "Album Artist"
 msgstr ""
 
 #: ../picard/util/tags.py:27
-msgid "Total Tracks"
+msgid "Track Number"
 msgstr ""
 
 #: ../picard/util/tags.py:28
-msgid "Disc Number"
+msgid "Total Tracks"
 msgstr ""
 
 #: ../picard/util/tags.py:29
-msgid "Total Discs"
+msgid "Disc Number"
 msgstr ""
 
 #: ../picard/util/tags.py:30
-msgid "Album Artist Sort Order"
+msgid "Total Discs"
 msgstr ""
 
 #: ../picard/util/tags.py:31
-msgid "Artist Sort Order"
+msgid "Album Artist Sort Order"
 msgstr ""
 
 #: ../picard/util/tags.py:32
-msgid "Title Sort Order"
+msgid "Artist Sort Order"
 msgstr ""
 
 #: ../picard/util/tags.py:33
-msgid "Album Sort Order"
+msgid "Title Sort Order"
 msgstr ""
 
 #: ../picard/util/tags.py:34
-msgid "ASIN"
+msgid "Album Sort Order"
 msgstr ""
 
 #: ../picard/util/tags.py:35
+msgid "ASIN"
+msgstr ""
+
+#: ../picard/util/tags.py:36
 msgid "Grouping"
 msgstr ""
 
-#: ../picard/util/tags.py:37
+#: ../picard/util/tags.py:38
 msgid "ISRC"
 msgstr ""
 
-#: ../picard/util/tags.py:38
+#: ../picard/util/tags.py:39
 msgid "Mood"
 msgstr ""
 
-#: ../picard/util/tags.py:39
+#: ../picard/util/tags.py:40
 msgid "BPM"
 msgstr ""
 
-#: ../picard/util/tags.py:40
+#: ../picard/util/tags.py:41
 msgid "Copyright"
 msgstr ""
 
-#: ../picard/util/tags.py:41
+#: ../picard/util/tags.py:42
 msgid "Composer"
 msgstr ""
 
-#: ../picard/util/tags.py:42
+#: ../picard/util/tags.py:43
 msgid "Conductor"
 msgstr ""
 
-#: ../picard/util/tags.py:43
+#: ../picard/util/tags.py:44
 msgid "Lyricist"
 msgstr ""
 
-#: ../picard/util/tags.py:44
+#: ../picard/util/tags.py:45
 msgid "Arranger"
 msgstr ""
 
-#: ../picard/util/tags.py:45
+#: ../picard/util/tags.py:46
 msgid "Producer"
 msgstr ""
 
-#: ../picard/util/tags.py:46
+#: ../picard/util/tags.py:47
 msgid "Engineer"
 msgstr ""
 
-#: ../picard/util/tags.py:47
+#: ../picard/util/tags.py:48
 msgid "Subtitle"
 msgstr ""
 
-#: ../picard/util/tags.py:48
+#: ../picard/util/tags.py:49
 msgid "Disc Subtitle"
 msgstr ""
 
-#: ../picard/util/tags.py:49
+#: ../picard/util/tags.py:50
 msgid "Remixer"
 msgstr ""
 
-#: ../picard/util/tags.py:50
+#: ../picard/util/tags.py:51
 msgid "MusicBrainz Track Id"
 msgstr ""
 
-#: ../picard/util/tags.py:51
+#: ../picard/util/tags.py:52
 msgid "MusicBrainz Release Id"
 msgstr ""
 
-#: ../picard/util/tags.py:52
+#: ../picard/util/tags.py:53
 msgid "MusicBrainz Artist Id"
 msgstr ""
 
-#: ../picard/util/tags.py:53
+#: ../picard/util/tags.py:54
 msgid "MusicBrainz Release Artist Id"
 msgstr ""
 
-#: ../picard/util/tags.py:54
+#: ../picard/util/tags.py:55
 msgid "MusicBrainz TRM Id"
 msgstr ""
 
-#: ../picard/util/tags.py:55
+#: ../picard/util/tags.py:56
 msgid "MusicBrainz Disc Id"
 msgstr ""
 
-#: ../picard/util/tags.py:56
+#: ../picard/util/tags.py:57
 msgid "MusicBrainz Sort Name"
 msgstr ""
 
-#: ../picard/util/tags.py:57
+#: ../picard/util/tags.py:58
 msgid "MusicIP PUID"
 msgstr ""
 
-#: ../picard/util/tags.py:58
+#: ../picard/util/tags.py:59
 msgid "MusicIP Fingerprint"
 msgstr ""
 
-#: ../picard/util/tags.py:59
+#: ../picard/util/tags.py:60
 msgid "Disc Id"
 msgstr ""
 
-#: ../picard/util/tags.py:60
+#: ../picard/util/tags.py:61
 msgid "Website"
 msgstr ""
 
-#: ../picard/util/tags.py:61
+#: ../picard/util/tags.py:62
 msgid "Compilation"
 msgstr ""
 
-#: ../picard/util/tags.py:62
+#: ../picard/util/tags.py:63
 msgid "Comment"
 msgstr ""
 
-#: ../picard/util/tags.py:63
+#: ../picard/util/tags.py:64
 msgid "Genre"
 msgstr ""
 
-#: ../picard/util/tags.py:64
+#: ../picard/util/tags.py:65
 msgid "Encoded By"
 msgstr ""
 
-#: ../picard/util/tags.py:65
+#: ../picard/util/tags.py:66
 msgid "Performer"
 msgstr ""
 
-#: ../picard/util/tags.py:66
+#: ../picard/util/tags.py:67
 msgid "Release Type"
 msgstr ""
 
-#: ../picard/util/tags.py:67
+#: ../picard/util/tags.py:68
 msgid "Release Status"
 msgstr ""
 
-#: ../picard/util/tags.py:68
+#: ../picard/util/tags.py:69
 msgid "Release Country"
 msgstr ""
 
-#: ../picard/util/tags.py:69
+#: ../picard/util/tags.py:70
 msgid "Record Label"
 msgstr ""
 
-#: ../picard/util/tags.py:70
+#: ../picard/util/tags.py:71
 msgid "Barcode"
 msgstr ""
 
-#: ../picard/util/tags.py:71
+#: ../picard/util/tags.py:72
 msgid "Catalog Number"
 msgstr ""
 
-#: ../picard/util/tags.py:72
+#: ../picard/util/tags.py:73
 msgid "Format"
 msgstr ""
 
-#: ../picard/util/tags.py:73
+#: ../picard/util/tags.py:74
 msgid "DJ-Mixer"
 msgstr ""
 
-#: ../picard/util/tags.py:74
+#: ../picard/util/tags.py:75
 msgid "Media"
 msgstr ""
 
-#: ../picard/util/tags.py:75
+#: ../picard/util/tags.py:76
 msgid "Lyrics"
 msgstr ""
 
-#: ../picard/util/tags.py:76
+#: ../picard/util/tags.py:77
 msgid "Mixer"
 msgstr ""
 
-#: ../picard/util/tags.py:77
+#: ../picard/util/tags.py:78
 msgid "Language"
 msgstr ""
 
-#: ../picard/util/tags.py:78
+#: ../picard/util/tags.py:79
 msgid "Script"
 msgstr ""
 
diff --git a/po/fi.po b/po/fi.po
index 7c53101ce..526999f83 100644
--- a/po/fi.po
+++ b/po/fi.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: picard\n"
 "Report-Msgid-Bugs-To: http://bugs.musicbrainz.org/\n"
-"POT-Creation-Date: 2009-02-24 18:58+0100\n"
+"POT-Creation-Date: 2009-04-06 22:50+0200\n"
 "PO-Revision-Date: 2009-04-01 06:15+0000\n"
 "Last-Translator: Juha Ekholm <Unknown>\n"
 "Language-Team: Finnish <fi@li.org>\n"
@@ -18,16 +18,16 @@ msgstr ""
 "X-Generator: Launchpad (build Unknown)\n"
 "Generated-By: pygettext.py 1.5\n"
 
-#: ../picard/album.py:108 ../picard/cluster.py:248
+#: ../picard/album.py:109 ../picard/cluster.py:248
 msgid "Unmatched Files"
 msgstr "Ryhmättömät tiedostot"
 
-#: ../picard/album.py:281
+#: ../picard/album.py:287
 #, python-format
 msgid "[could not load album %s]"
 msgstr ""
 
-#: ../picard/album.py:317
+#: ../picard/album.py:320
 msgid "[loading album information]"
 msgstr "[lataa julkaisun tietoja]"
 
@@ -587,7 +587,8 @@ msgid "Namibia"
 msgstr ""
 
 #: ../picard/const.py:182
-msgid "Vanuat"
+#, fuzzy
+msgid "Vanuatu"
 msgstr "Vanuatu"
 
 #: ../picard/const.py:183
@@ -1031,223 +1032,239 @@ msgid "Congo, The Democratic Republic of the"
 msgstr ""
 
 #: ../picard/const.py:293
-msgid "Serbia and Montenegro"
+#, fuzzy
+msgid "Serbia and Montenegro (historical, 2003-2006)"
 msgstr "Serbia ja Montenegro"
 
 #: ../picard/const.py:294
+#, fuzzy
+msgid "Serbia"
+msgstr "Persia"
+
+#: ../picard/const.py:295
+#, fuzzy
+msgid "Montenegro"
+msgstr "Serbia ja Montenegro"
+
+#: ../picard/const.py:296
 msgid "Croatia"
 msgstr "Kroatia"
 
-#: ../picard/const.py:295
+#: ../picard/const.py:297
 msgid "Korea (North), Democratic People's Republic of"
 msgstr ""
 
-#: ../picard/const.py:296
+#: ../picard/const.py:298
 msgid "Korea (South), Republic of"
 msgstr ""
 
-#: ../picard/const.py:297
+#: ../picard/const.py:299
 msgid "Slovakia"
 msgstr ""
 
-#: ../picard/const.py:298
+#: ../picard/const.py:300
 msgid "Soviet Union (historical, 1922-1991)"
 msgstr "Neuvostoliitto (historiallinen, 1922-1991)"
 
-#: ../picard/const.py:299
+#: ../picard/const.py:301
 msgid "East Timor"
 msgstr "Itä-Timor"
 
-#: ../picard/const.py:300
+#: ../picard/const.py:302
 msgid "Czechoslovakia (historical, 1918-1992)"
 msgstr "Tšekkoslovakia (historiallinen, 1918-1992)"
 
-#: ../picard/const.py:301
+#: ../picard/const.py:303
 msgid "Europe"
 msgstr ""
 
-#: ../picard/const.py:302
+#: ../picard/const.py:304
 msgid "East Germany (historical, 1949-1990)"
 msgstr ""
 
-#: ../picard/const.py:303
+#: ../picard/const.py:305
 msgid "[Unknown Country]"
 msgstr "[tuntematon maa]"
 
-#: ../picard/const.py:304
+#: ../picard/const.py:306
 msgid "[Worldwide]"
 msgstr ""
 
-#: ../picard/const.py:305
+#: ../picard/const.py:307
 msgid "Yugoslavia (historical, 1918-1992)"
 msgstr "Jugoslavia (historiallinen, 1918-1992)"
 
-#: ../picard/const.py:310
+#: ../picard/const.py:312
+msgid "Afrikaans"
+msgstr ""
+
+#: ../picard/const.py:313
+msgid "Arabic"
+msgstr ""
+
+#: ../picard/const.py:314
 msgid "Catalan"
 msgstr "Katalaani"
 
-#: ../picard/const.py:311
+#: ../picard/const.py:315
 msgid "Czech"
 msgstr "Tšekki"
 
-#: ../picard/const.py:312
+#: ../picard/const.py:316
 msgid "Welsh"
 msgstr "Kymri"
 
-#: ../picard/const.py:313
+#: ../picard/const.py:317
 msgid "Danish"
 msgstr "Tanska"
 
-#: ../picard/const.py:314
+#: ../picard/const.py:318
 msgid "German"
 msgstr "Saksa"
 
-#: ../picard/const.py:315
+#: ../picard/const.py:319
 msgid "English"
 msgstr "Englanti"
 
-#: ../picard/const.py:316
+#: ../picard/const.py:320
 msgid "English (Canada)"
 msgstr "Englanti (Kanada)"
 
-#: ../picard/const.py:317
+#: ../picard/const.py:321
 msgid "English (UK)"
 msgstr "Englanti (UK)"
 
-#: ../picard/const.py:318
+#: ../picard/const.py:322
 msgid "Spanish"
 msgstr "Espanja"
 
-#: ../picard/const.py:319
+#: ../picard/const.py:323
 msgid "Persian"
 msgstr "Persia"
 
-#: ../picard/const.py:320
+#: ../picard/const.py:324
 msgid "Finnish"
 msgstr "Suomi"
 
-#: ../picard/const.py:321
+#: ../picard/const.py:325
 msgid "French"
 msgstr "Ranska"
 
-#: ../picard/const.py:322
+#: ../picard/const.py:326
 msgid "Frisian"
 msgstr "Friisi"
 
-#: ../picard/const.py:323
+#: ../picard/const.py:327
 msgid "Hebrew"
 msgstr "Heprea"
 
-#: ../picard/const.py:324
+#: ../picard/const.py:328
+#, fuzzy
+msgid "Hindi"
+msgstr "Intia"
+
+#: ../picard/const.py:329
 msgid "Hungarian"
 msgstr "Unkari"
 
-#: ../picard/const.py:325
+#: ../picard/const.py:330
 msgid "Islandic"
 msgstr "Islanti"
 
-#: ../picard/const.py:326
+#: ../picard/const.py:331
 msgid "Italian"
 msgstr "Italia"
 
-#: ../picard/const.py:327
+#: ../picard/const.py:332
 msgid "Kannada"
 msgstr ""
 
-#: ../picard/const.py:328
+#: ../picard/const.py:333
 msgid "Korean"
 msgstr "Korea"
 
-#: ../picard/const.py:329
+#: ../picard/const.py:334
 msgid "Lithuanian"
 msgstr "Liettua"
 
-#: ../picard/const.py:330
+#: ../picard/const.py:335
 msgid "Norwegian Bokmal"
 msgstr "Norja (bokmål)"
 
-#: ../picard/const.py:331
+#: ../picard/const.py:336
 msgid "Dutch"
 msgstr "Hollanti"
 
-#: ../picard/const.py:332
+#: ../picard/const.py:337
 msgid "Polish"
 msgstr "Puola"
 
-#: ../picard/const.py:333
+#: ../picard/const.py:338
 msgid "Portuguese"
 msgstr "Portugali"
 
-#: ../picard/const.py:334
+#: ../picard/const.py:339
 msgid "Brazilian Portuguese"
 msgstr ""
 
-#: ../picard/const.py:335
+#: ../picard/const.py:340
 msgid "Romanian"
 msgstr "Romania"
 
-#: ../picard/const.py:336
+#: ../picard/const.py:341
 msgid "Russian"
 msgstr "Venäjä"
 
-#: ../picard/const.py:337
+#: ../picard/const.py:342
 msgid "Scots"
 msgstr "Skotti"
 
-#: ../picard/const.py:338
+#: ../picard/const.py:343
 msgid "Slovak"
 msgstr "Slovakki"
 
-#: ../picard/const.py:339
+#: ../picard/const.py:344
 msgid "Slovenian"
 msgstr "Slovenia"
 
-#: ../picard/const.py:340
+#: ../picard/const.py:345
 msgid "Swedish"
 msgstr "Ruotsi"
 
-#: ../picard/const.py:341
+#: ../picard/const.py:346
+#, fuzzy
+msgid "Turkish"
+msgstr "Turkki"
+
+#: ../picard/const.py:347
 msgid "Chinese"
 msgstr "Kiina"
 
-#: ../picard/file.py:487
+#: ../picard/file.py:494
 #, python-format
 msgid "No matching tracks for file %s"
 msgstr "Ei kappaletietoja tiedostolle %s"
 
-#: ../picard/file.py:504
+#: ../picard/file.py:511
 #, python-format
 msgid "No matching tracks above the threshold for file %s"
 msgstr ""
 
-#: ../picard/file.py:507
+#: ../picard/file.py:514
 #, python-format
 msgid "File %s identified!"
 msgstr "Tiedosto %s tunnistettu!"
 
-#: ../picard/file.py:518
+#: ../picard/file.py:525
 #, python-format
 msgid "Looking up the PUID for file %s..."
 msgstr "Etsii PUIDia tiedostolle %s..."
 
-#: ../picard/file.py:523
+#: ../picard/file.py:530
 #, 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)"
@@ -1260,11 +1277,24 @@ msgstr "PLS soittolista (*.pls)"
 msgid "XSPF Playlist (*.xspf)"
 msgstr "XSPF soittolista (*.xspf)"
 
-#: ../picard/tagger.py:476
+#: ../picard/puidmanager.py:62
+msgid "Submitting PUIDs..."
+msgstr "Lähettää PUIDeja..."
+
+#: ../picard/puidmanager.py:68
+#, python-format
+msgid "PUIDs submission failed: %s"
+msgstr "PUIDien lähetys epäonnistui: %s"
+
+#: ../picard/puidmanager.py:70
+msgid "PUIDs successfully submitted!"
+msgstr "PUIDien lähetys onnistui!"
+
+#: ../picard/tagger.py:477
 msgid "CD Lookup Error"
 msgstr "CD haku virhe"
 
-#: ../picard/tagger.py:477
+#: ../picard/tagger.py:478
 #, python-format
 msgid ""
 "Error while reading CD:\n"
@@ -1275,7 +1305,7 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../picard/tagger.py:503
+#: ../picard/tagger.py:504
 #, python-format
 msgid "Could not find PUID for file %s"
 msgstr ""
@@ -1328,15 +1358,28 @@ msgstr "Näytä &piilotetut tiedostot"
 msgid "Length"
 msgstr "Kesto"
 
-#: ../picard/ui/itemviews.py:327
+#: ../picard/ui/itemviews.py:289
+msgid "&Expand all"
+msgstr ""
+
+#: ../picard/ui/itemviews.py:291
+msgid "&Collapse all"
+msgstr ""
+
+#: ../picard/ui/itemviews.py:332
 msgid "&Releases"
 msgstr "&Julkaisut"
 
-#: ../picard/ui/itemviews.py:353
+#: ../picard/ui/itemviews.py:349
+#, fuzzy
+msgid "No release event"
+msgstr "Albumin julkaisu kuukausi"
+
+#: ../picard/ui/itemviews.py:359
 msgid "&Plugins"
 msgstr "&Liitännäiset"
 
-#: ../picard/ui/itemviews.py:523
+#: ../picard/ui/itemviews.py:533
 msgid "Clusters"
 msgstr "Ryhmät"
 
@@ -1344,95 +1387,6 @@ msgstr "Ryhmät"
 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:66 ../picard/ui/ui_options_plugins.py:62
-msgid "Details"
-msgstr "Tiedot"
-
-#: ../picard/ui/tageditor.py:71 ../picard/ui/tageditor.py:264
-#, python-format
-msgid "%d file"
-msgid_plural "%d files"
-msgstr[0] "%d tiedosto"
-msgstr[1] "%d tiedostot"
-
-#: ../picard/ui/tageditor.py:131
-#, 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:134
-#, 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:233
-msgid "Filename:"
-msgstr "Tiedostonimi:"
-
-#: ../picard/ui/tageditor.py:235
-msgid "Format:"
-msgstr "Tiedostomuoto:"
-
-#: ../picard/ui/tageditor.py:244
-msgid "Size:"
-msgstr "Koko:"
-
-#: ../picard/ui/tageditor.py:248 ../picard/ui/ui_metadata.py:127
-msgid "Length:"
-msgstr "Kesto:"
-
-#: ../picard/ui/tageditor.py:250
-msgid "Bitrate:"
-msgstr "Bittinopeus:"
-
-#: ../picard/ui/tageditor.py:252
-msgid "Sample rate:"
-msgstr "Äänitaajuus:"
-
-#: ../picard/ui/tageditor.py:254
-msgid "Bits per sample:"
-msgstr "Bittisyvyys:"
-
-#: ../picard/ui/tageditor.py:257
-msgid "Mono"
-msgstr "Mono"
-
-#: ../picard/ui/tageditor.py:258
-msgid "Stereo"
-msgstr "Stereo"
-
-#: ../picard/ui/tageditor.py:260
-msgid "Channels:"
-msgstr "Kanavia:"
-
-#: ../picard/ui/tagsfromfilenames.py:52 ../picard/ui/tagsfromfilenames.py:96
-msgid "File Name"
-msgstr "Tiedostonimi"
-
 #: ../picard/ui/mainwindow.py:64
 msgid "MusicBrainz Picard"
 msgstr "MusicBrainz Picard"
@@ -1669,6 +1623,10 @@ msgstr "&Hakurivi"
 msgid "Album"
 msgstr "Julkaisu"
 
+#: ../picard/ui/mainwindow.py:437 ../picard/ui/puidsubmit.py:31
+msgid "Track"
+msgstr "Kappale"
+
 #: ../picard/ui/mainwindow.py:476
 msgid "All Supported Formats"
 msgstr "Kaikki tuetut tiedostomuodot"
@@ -1688,6 +1646,22 @@ msgstr "Soittolista %s tallennettu"
 msgid " (Error: %s)"
 msgstr " (Virhe: %s)"
 
+#: ../picard/ui/puidsubmit.py:31 ../picard/ui/options/plugins.py:85
+msgid "File"
+msgstr "Tiedosto"
+
+#: ../picard/ui/puidsubmit.py:31
+msgid "PUID"
+msgstr "PUID"
+
+#: ../picard/ui/puidsubmit.py:31
+msgid "Release"
+msgstr "Julkaisu"
+
+#: ../picard/ui/puidsubmit.py:31
+msgid "Release ID"
+msgstr "Julkaisu ID"
+
 #: ../picard/ui/passworddialog.py:38
 #, python-format
 msgid ""
@@ -1695,6 +1669,75 @@ msgid ""
 msgstr ""
 "Serveri %s edellyttää kirjautumista. Syötä käyttäjätunnuksesi ja salasanasi."
 
+#: ../picard/ui/tageditor.py:66 ../picard/ui/ui_options_plugins.py:62
+msgid "Details"
+msgstr "Tiedot"
+
+#: ../picard/ui/tageditor.py:71 ../picard/ui/tageditor.py:264
+#, python-format
+msgid "%d file"
+msgid_plural "%d files"
+msgstr[0] "%d tiedosto"
+msgstr[1] "%d tiedostot"
+
+#: ../picard/ui/tageditor.py:131
+#, 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:134
+#, 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:233
+msgid "Filename:"
+msgstr "Tiedostonimi:"
+
+#: ../picard/ui/tageditor.py:235
+msgid "Format:"
+msgstr "Tiedostomuoto:"
+
+#: ../picard/ui/tageditor.py:244
+msgid "Size:"
+msgstr "Koko:"
+
+#: ../picard/ui/tageditor.py:248 ../picard/ui/ui_metadata.py:127
+msgid "Length:"
+msgstr "Kesto:"
+
+#: ../picard/ui/tageditor.py:250
+msgid "Bitrate:"
+msgstr "Bittinopeus:"
+
+#: ../picard/ui/tageditor.py:252
+msgid "Sample rate:"
+msgstr "Äänitaajuus:"
+
+#: ../picard/ui/tageditor.py:254
+msgid "Bits per sample:"
+msgstr "Bittisyvyys:"
+
+#: ../picard/ui/tageditor.py:257
+msgid "Mono"
+msgstr "Mono"
+
+#: ../picard/ui/tageditor.py:258
+msgid "Stereo"
+msgstr "Stereo"
+
+#: ../picard/ui/tageditor.py:260
+msgid "Channels:"
+msgstr "Kanavia:"
+
+#: ../picard/ui/tagsfromfilenames.py:54 ../picard/ui/tagsfromfilenames.py:99
+msgid "File Name"
+msgstr "Tiedostonimi"
+
 #: ../picard/ui/ui_cdlookup.py:60 ../picard/ui/ui_options_cdlookup.py:47
 #: ../picard/ui/ui_options_cdlookup_select.py:48
 #: ../picard/ui/options/cdlookup.py:36
@@ -1717,24 +1760,6 @@ msgstr "    Hae manuaalisesti    "
 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_proxy.py:83
-#: ../picard/ui/ui_options_general.py:113
-msgid "Username:"
-msgstr "Käyttäjätunnus:"
-
-#: ../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/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 "Muokkaa tagia"
@@ -1771,6 +1796,10 @@ msgstr "Julkaisu:"
 msgid "Options"
 msgstr "Asetukset"
 
+#: ../picard/ui/ui_puidsubmit.py:52
+msgid "Submit PUIDs"
+msgstr "Lähetä PUIDit"
+
 #: ../picard/ui/ui_options_cdlookup.py:48
 msgid "CD-ROM device to use for lookups:"
 msgstr "Hakuihin käytettävä CD-ROM asema:"
@@ -1795,6 +1824,23 @@ msgstr "Tallenna kansikuvat erillisinä tiedostoina"
 msgid "Overwrite the file if it already exists"
 msgstr "Korvaa jo olemassa oleva tiedosto"
 
+#: ../picard/ui/ui_options_moving.py:53
+msgid "Move additional files:"
+msgstr "Siirrä muut tiedostot:"
+
+#: ../picard/ui/ui_options_moving.py:54
+msgid "Browse..."
+msgstr "Selaa..."
+
+#: ../picard/ui/ui_options_moving.py:55
+msgid "Delete empty directories"
+msgstr "Poista tyhjät kansiot"
+
+#: ../picard/ui/ui_options_moving.py:56
+#, fuzzy
+msgid "Move files to this directory when saving:"
+msgstr "Siirrä tagatut tiedostot tähän kansioon:"
+
 #: ../picard/ui/util.py:31
 msgid "&Ok"
 msgstr "&OK"
@@ -1803,44 +1849,40 @@ msgstr "&OK"
 msgid "&Cancel"
 msgstr ""
 
-#: ../picard/ui/ui_puidsubmit.py:52
-msgid "Submit PUIDs"
-msgstr "Lähetä PUIDit"
-
-#: ../picard/ui/ui_tageditor.py:139 ../picard/ui/ui_options_plugins.py:59
-#: ../picard/ui/options/plugins.py:76
+#: ../picard/ui/ui_tageditor.py:128 ../picard/ui/ui_options_plugins.py:59
+#: ../picard/ui/options/plugins.py:81
 msgid "Name"
 msgstr "Nimi"
 
-#: ../picard/ui/ui_tageditor.py:140
+#: ../picard/ui/ui_tageditor.py:129
 msgid "Value"
 msgstr "Arvo"
 
-#: ../picard/ui/ui_tageditor.py:141
+#: ../picard/ui/ui_tageditor.py:130
 msgid "Rating:"
 msgstr ""
 
-#: ../picard/ui/ui_tageditor.py:142
+#: ../picard/ui/ui_tageditor.py:131
 msgid "&Add..."
 msgstr "&Lisää..."
 
-#: ../picard/ui/ui_tageditor.py:143
+#: ../picard/ui/ui_tageditor.py:132
 msgid "&Edit..."
 msgstr "&Muokkaa..."
 
-#: ../picard/ui/ui_tageditor.py:144
+#: ../picard/ui/ui_tageditor.py:133
 msgid "&Delete"
 msgstr "&Poista"
 
-#: ../picard/ui/ui_tageditor.py:145
+#: ../picard/ui/ui_tageditor.py:134
 msgid "&Metadata"
 msgstr "&Metadata"
 
-#: ../picard/ui/ui_tageditor.py:146
+#: ../picard/ui/ui_tageditor.py:135
 msgid "A&rtwork"
 msgstr "&Kansikuva"
 
-#: ../picard/ui/ui_tageditor.py:147
+#: ../picard/ui/ui_tageditor.py:136
 msgid "&Info"
 msgstr "T&iedot"
 
@@ -1885,6 +1927,40 @@ msgstr " / "
 msgid ", "
 msgstr ", "
 
+#: ../picard/ui/ui_options_general.py:108
+msgid "MusicBrainz Server"
+msgstr "MusicBrainz-palvelin"
+
+#: ../picard/ui/ui_options_general.py:109 ../picard/ui/ui_options_proxy.py:72
+msgid "Port:"
+msgstr "Portti:"
+
+#: ../picard/ui/ui_options_general.py:110 ../picard/ui/ui_options_proxy.py:73
+msgid "Server address:"
+msgstr "Palvelimen osoite:"
+
+#: ../picard/ui/ui_options_general.py:111
+msgid "Account Information"
+msgstr "Tilitiedot"
+
+#: ../picard/ui/ui_options_general.py:112 ../picard/ui/ui_options_proxy.py:70
+#: ../picard/ui/ui_passworddialog.py:80
+msgid "Password:"
+msgstr "Salasana:"
+
+#: ../picard/ui/ui_options_general.py:113 ../picard/ui/ui_options_proxy.py:71
+#: ../picard/ui/ui_passworddialog.py:79
+msgid "Username:"
+msgstr "Käyttäjätunnus:"
+
+#: ../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 automaattisesti uudet tiedostot"
+
 #: ../picard/ui/ui_options_interface.py:50
 msgid "Miscellaneous"
 msgstr "Sekalaiset"
@@ -1905,113 +1981,6 @@ msgstr "Käytä kehittynyttä syntaksia"
 msgid "User interface language:"
 msgstr ""
 
-#: ../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_options_naming.py:180
-#: ../picard/ui/ui_tagsfromfilenames.py:58
-msgid "&Preview"
-msgstr "&Esikatselu"
-
-#: ../picard/ui/ui_options_proxy.py:81 ../picard/ui/options/proxy.py:28
-msgid "Web Proxy"
-msgstr "Välityspalvelin"
-
-#: ../picard/ui/ui_options_proxy.py:84 ../picard/ui/ui_options_general.py:109
-msgid "Port:"
-msgstr "Portti:"
-
-#: ../picard/ui/ui_options_proxy.py:85 ../picard/ui/ui_options_general.py:110
-msgid "Server address:"
-msgstr "Palvelimen osoite:"
-
-#: ../picard/ui/ui_options_ratings.py:45
-msgid "Enable track ratings"
-msgstr ""
-
-#: ../picard/ui/ui_options_ratings.py:46
-msgid ""
-"Picard saves the ratings together with an e-mail address identifying the "
-"user who did the rating. That way different ratings for different users can "
-"be stored in the files. Please sepcify the e-mail you want to use to save "
-"your ratings."
-msgstr ""
-
-#: ../picard/ui/ui_options_ratings.py:47
-msgid "E-mail:"
-msgstr ""
-
-#: ../picard/ui/ui_options_general.py:108
-msgid "MusicBrainz Server"
-msgstr "MusicBrainz-palvelin"
-
-#: ../picard/ui/ui_options_general.py:111
-msgid "Account Information"
-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 automaattisesti uudet tiedostot"
-
 #: ../picard/ui/ui_options_matching.py:105
 msgid "Thresholds"
 msgstr "Kynnykset"
@@ -2068,74 +2037,152 @@ msgstr "Sekalaiset artistit:"
 msgid "Non-album tracks:"
 msgstr "Albumittomat kappaleet:"
 
-#: ../picard/ui/ui_options_plugins.py:58 ../picard/ui/options/plugins.py:30
+#: ../picard/ui/ui_options_metadata.py:109
+#: ../picard/ui/ui_options_metadata.py:110
+#: ../picard/ui/ui_options_renaming.py:155
+#: ../picard/ui/ui_options_renaming.py:158
+msgid "Default"
+msgstr "Oletus"
+
+#: ../picard/ui/ui_options_plugins.py:58 ../picard/ui/options/plugins.py:34
 msgid "Plugins"
 msgstr "Liitännäiset"
 
-#: ../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:84
 msgid "Author"
 msgstr "Tekijä"
 
-#: ../picard/ui/ui_options_plugins.py:61 ../picard/util/tags.py:36
+#: ../picard/ui/ui_options_plugins.py:61 ../picard/util/tags.py:37
 msgid "Version"
 msgstr "Versio"
 
-#: ../picard/ui/ui_options_script.py:52
+#: ../picard/ui/ui_options_proxy.py:69 ../picard/ui/options/proxy.py:28
+msgid "Web Proxy"
+msgstr "Välityspalvelin"
+
+#: ../picard/ui/ui_options_ratings.py:45
+msgid "Enable track ratings"
+msgstr ""
+
+#: ../picard/ui/ui_options_ratings.py:46
+msgid ""
+"Picard saves the ratings together with an e-mail address identifying the "
+"user who did the rating. That way different ratings for different users can "
+"be stored in the files. Please sepcify the e-mail you want to use to save "
+"your ratings."
+msgstr ""
+
+#: ../picard/ui/ui_options_ratings.py:47
+msgid "E-mail:"
+msgstr ""
+
+#: ../picard/ui/ui_options_renaming.py:145
+#, fuzzy
+msgid "Form"
+msgstr "Tiedostomuoto:"
+
+#: ../picard/ui/ui_options_renaming.py:146
+#, fuzzy
+msgid "Rename files when saving"
+msgstr "Nimeä tiedostot tageja kirjoitettaessa"
+
+#: ../picard/ui/ui_options_renaming.py:147
+msgid "Replace non-ASCII characters"
+msgstr "Korvaa ei-ASCII merkit"
+
+#: ../picard/ui/ui_options_renaming.py:148
+msgid "Replace Windows-incompatible characters"
+msgstr "Korvaa Windows-yhteensopimattomat merkit"
+
+#: ../picard/ui/ui_options_renaming.py:149
+msgid "Name files like this"
+msgstr ""
+
+#: ../picard/ui/ui_options_renaming.py:156
+msgid "Name multiple artist albums differently"
+msgstr ""
+
+#: ../picard/ui/ui_options_renaming.py:157
+msgid "Copy from above"
+msgstr ""
+
+#: ../picard/ui/ui_options_renaming.py:159
+#, fuzzy
+msgid "Examples"
+msgstr "Esimerkki"
+
+#: ../picard/ui/ui_options_script.py:43
 msgid "Tagger Script"
 msgstr "Tagger-skripti"
 
-#: ../picard/ui/ui_options_tags.py:85
-msgid "Common"
-msgstr "Yleiset"
+#: ../picard/ui/ui_options_tags.py:97
+#, fuzzy
+msgid "Do not write tags to files"
+msgstr "Älä kirjoita tageja tiedostoihin"
 
-#: ../picard/ui/ui_options_tags.py:86
-msgid "Clear existing tags before writing new tags"
-msgstr "Poista vanhat tagit ennen uusien kirjoittamista"
-
-#: ../picard/ui/ui_options_tags.py:87
-msgid "Don not write tags to files"
+#: ../picard/ui/ui_options_tags.py:98
+msgid "Before tagging"
 msgstr ""
 
-#: ../picard/ui/ui_options_tags.py:88
-msgid "ID3"
-msgstr "ID3"
+#: ../picard/ui/ui_options_tags.py:99
+#, fuzzy
+msgid "Clear existing tags"
+msgstr "Poista vanhat tagit ennen uusien kirjoittamista"
 
-#: ../picard/ui/ui_options_tags.py:89
-msgid "Write ID3v1 tags to the files"
-msgstr "Kirjoita ID3v1 tagit tiedostoihin"
-
-#: ../picard/ui/ui_options_tags.py:90
-msgid "Write ID3v2 version 2.3 tags (2.4 is default)"
-msgstr "Kirjoita ID3v2.3 tagit (ID3v2.4 on oletus)"
-
-#: ../picard/ui/ui_options_tags.py:91
-msgid "Text encoding to use while writing ID3v2 tags:"
-msgstr "ID3v2 tageissa käytössä oleva tekstikoodaus:"
-
-#: ../picard/ui/ui_options_tags.py:92
-msgid "ISO-8859-1"
-msgstr "ISO-8859-1"
-
-#: ../picard/ui/ui_options_tags.py:93
-msgid "UTF-16"
-msgstr "UTF-16"
-
-#: ../picard/ui/ui_options_tags.py:94
-msgid "UTF-8"
-msgstr "UTF-8"
-
-#: ../picard/ui/ui_options_tags.py:95
+#: ../picard/ui/ui_options_tags.py:100
 msgid "Remove ID3 tags from FLAC files"
 msgstr "Poista ID3 tagit FLAC tiedostoista"
 
-#: ../picard/ui/ui_options_tags.py:96
-msgid "APE"
-msgstr "APE"
-
-#: ../picard/ui/ui_options_tags.py:97
+#: ../picard/ui/ui_options_tags.py:101
 msgid "Remove APEv2 tags from MP3 files"
 msgstr "Poista APEv2 tagit MP3 tiedostoista"
 
+#: ../picard/ui/ui_options_tags.py:102
+msgid "Tag compatibility"
+msgstr ""
+
+#: ../picard/ui/ui_options_tags.py:103
+#, fuzzy
+msgid "ID3v2 version"
+msgstr "Vain ID3v2.4"
+
+#: ../picard/ui/ui_options_tags.py:104
+msgid "2.4"
+msgstr ""
+
+#: ../picard/ui/ui_options_tags.py:105
+msgid "2.3"
+msgstr ""
+
+#: ../picard/ui/ui_options_tags.py:106
+#, fuzzy
+msgid "Also include ID3v1 tags in the files"
+msgstr "Kirjoita ID3v1 tagit tiedostoihin"
+
+#: ../picard/ui/ui_options_tags.py:107
+msgid "ID3v2 text encoding"
+msgstr ""
+
+#: ../picard/ui/ui_options_tags.py:108
+msgid "UTF-8"
+msgstr "UTF-8"
+
+#: ../picard/ui/ui_options_tags.py:109
+msgid "UTF-16"
+msgstr "UTF-16"
+
+#: ../picard/ui/ui_options_tags.py:110
+msgid "ISO-8859-1"
+msgstr "ISO-8859-1"
+
+#: ../picard/ui/ui_passworddialog.py:78
+msgid "Authentication required"
+msgstr "Todennus vaaditaan"
+
+#: ../picard/ui/ui_passworddialog.py:81
+msgid "Save username and password"
+msgstr "Muista käyttäjätunnus ja salasana"
+
 #: ../picard/ui/ui_tagsfromfilenames.py:56
 msgid "Convert File Names to Tags"
 msgstr "Tagit tiedostonimestä"
@@ -2144,6 +2191,10 @@ msgstr "Tagit tiedostonimestä"
 msgid "Replace underscores with spaces"
 msgstr "Korvaa alaviivat välilyönneillä"
 
+#: ../picard/ui/ui_tagsfromfilenames.py:58
+msgid "&Preview"
+msgstr "&Esikatselu"
+
 #: ../picard/ui/options/about.py:29
 msgid "About"
 msgstr "Tietoja"
@@ -2176,8 +2227,8 @@ msgstr "<br/>Suomenkielisen käännöksen teki %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"
@@ -2185,33 +2236,31 @@ msgid ""
 "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\"><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/P"
-"icardTagger</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"
 "Versio %(version)s</p>\n"
-"<p align=\"center\"><strong>Tuetut "
-"tiedostomuodot</strong><br/>%(formats)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\"><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/P"
-"icardTagger</a></p>\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"
@@ -2243,257 +2292,266 @@ msgstr ""
 msgid "None"
 msgstr ""
 
-#: ../picard/ui/options/naming.py:33
-msgid "File Naming"
-msgstr ""
+#: ../picard/ui/options/moving.py:33
+#, fuzzy
+msgid "Moving files"
+msgstr "Siirrä tiedostot"
 
-#: ../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 "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 "Usean artistin uudelleennimeämis formaatti ei saa olla tyhjä."
-
-#: ../picard/ui/options/naming.py:97
+#: ../picard/ui/options/moving.py:65
 msgid "Error"
 msgstr "Virhe"
 
-#: ../picard/ui/options/naming.py:97
+#: ../picard/ui/options/moving.py:65
 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"
+#: ../picard/ui/options/ratings.py:29
+msgid "Ratings"
 msgstr ""
 
 #: ../picard/ui/options/tags.py:29
 msgid "Tags"
 msgstr "Tagit"
 
-#: ../picard/ui/options/ratings.py:29
-msgid "Ratings"
+#: ../picard/ui/options/renaming.py:35
+#, fuzzy
+msgid "File naming"
+msgstr "Tiedostonimi:"
+
+#: ../picard/ui/options/renaming.py:123
+msgid "The file naming format must not be empty."
+msgstr "Uudelleennimeämis formaatti ei saa olla tyhjä."
+
+#: ../picard/ui/options/renaming.py:133
+msgid "The multiple artist file naming format must not be empty."
+msgstr "Usean artistin uudelleennimeämis formaatti ei saa olla tyhjä."
+
+#: ../picard/ui/options/scripting.py:63
+msgid "Scripting"
 msgstr ""
 
+#: ../picard/ui/options/scripting.py:97
+msgid "Script Error"
+msgstr "Skripti virhe"
+
 #: ../picard/util/tags.py:24
 msgid "Date"
 msgstr ""
 
 #: ../picard/util/tags.py:25
+#, fuzzy
+msgid "Original Release Date"
+msgstr "Alkuperäinen metadata"
+
+#: ../picard/util/tags.py:26
 msgid "Album Artist"
 msgstr ""
 
-#: ../picard/util/tags.py:26
+#: ../picard/util/tags.py:27
 msgid "Track Number"
 msgstr ""
 
-#: ../picard/util/tags.py:27
+#: ../picard/util/tags.py:28
 msgid "Total Tracks"
 msgstr ""
 
-#: ../picard/util/tags.py:28
+#: ../picard/util/tags.py:29
 msgid "Disc Number"
 msgstr ""
 
-#: ../picard/util/tags.py:29
+#: ../picard/util/tags.py:30
 msgid "Total Discs"
 msgstr ""
 
-#: ../picard/util/tags.py:30
+#: ../picard/util/tags.py:31
 msgid "Album Artist Sort Order"
 msgstr ""
 
-#: ../picard/util/tags.py:31
+#: ../picard/util/tags.py:32
 msgid "Artist Sort Order"
 msgstr ""
 
-#: ../picard/util/tags.py:32
+#: ../picard/util/tags.py:33
 msgid "Title Sort Order"
 msgstr ""
 
-#: ../picard/util/tags.py:33
+#: ../picard/util/tags.py:34
 msgid "Album Sort Order"
 msgstr ""
 
-#: ../picard/util/tags.py:34
+#: ../picard/util/tags.py:35
 msgid "ASIN"
 msgstr "ASIN"
 
-#: ../picard/util/tags.py:35
+#: ../picard/util/tags.py:36
 msgid "Grouping"
 msgstr "Ryhmittely"
 
-#: ../picard/util/tags.py:37
+#: ../picard/util/tags.py:38
 msgid "ISRC"
 msgstr "ISRC"
 
-#: ../picard/util/tags.py:38
+#: ../picard/util/tags.py:39
 msgid "Mood"
 msgstr "Mieliala"
 
-#: ../picard/util/tags.py:39
+#: ../picard/util/tags.py:40
 msgid "BPM"
 msgstr ""
 
-#: ../picard/util/tags.py:40
+#: ../picard/util/tags.py:41
 msgid "Copyright"
 msgstr ""
 
-#: ../picard/util/tags.py:41
+#: ../picard/util/tags.py:42
 msgid "Composer"
 msgstr ""
 
-#: ../picard/util/tags.py:42
+#: ../picard/util/tags.py:43
 msgid "Conductor"
 msgstr "Kapellimestari"
 
-#: ../picard/util/tags.py:43
+#: ../picard/util/tags.py:44
 msgid "Lyricist"
 msgstr "Sanoittaja"
 
-#: ../picard/util/tags.py:44
+#: ../picard/util/tags.py:45
 msgid "Arranger"
 msgstr "Sovittaja"
 
-#: ../picard/util/tags.py:45
+#: ../picard/util/tags.py:46
 msgid "Producer"
 msgstr "Tuottaja"
 
-#: ../picard/util/tags.py:46
+#: ../picard/util/tags.py:47
 msgid "Engineer"
 msgstr "Insinööri"
 
-#: ../picard/util/tags.py:47
+#: ../picard/util/tags.py:48
 msgid "Subtitle"
 msgstr "Alaotsikko"
 
-#: ../picard/util/tags.py:48
+#: ../picard/util/tags.py:49
 msgid "Disc Subtitle"
 msgstr ""
 
-#: ../picard/util/tags.py:49
+#: ../picard/util/tags.py:50
 msgid "Remixer"
 msgstr "Remiksaaja"
 
-#: ../picard/util/tags.py:50
+#: ../picard/util/tags.py:51
 msgid "MusicBrainz Track Id"
 msgstr ""
 
-#: ../picard/util/tags.py:51
+#: ../picard/util/tags.py:52
 msgid "MusicBrainz Release Id"
 msgstr ""
 
-#: ../picard/util/tags.py:52
+#: ../picard/util/tags.py:53
 msgid "MusicBrainz Artist Id"
 msgstr ""
 
-#: ../picard/util/tags.py:53
+#: ../picard/util/tags.py:54
 msgid "MusicBrainz Release Artist Id"
 msgstr ""
 
-#: ../picard/util/tags.py:54
+#: ../picard/util/tags.py:55
 msgid "MusicBrainz TRM Id"
 msgstr ""
 
-#: ../picard/util/tags.py:55
+#: ../picard/util/tags.py:56
 msgid "MusicBrainz Disc Id"
 msgstr ""
 
-#: ../picard/util/tags.py:56
+#: ../picard/util/tags.py:57
 msgid "MusicBrainz Sort Name"
 msgstr ""
 
-#: ../picard/util/tags.py:57
+#: ../picard/util/tags.py:58
 msgid "MusicIP PUID"
 msgstr "MusicIP PUID"
 
-#: ../picard/util/tags.py:58
+#: ../picard/util/tags.py:59
 msgid "MusicIP Fingerprint"
 msgstr ""
 
-#: ../picard/util/tags.py:59
+#: ../picard/util/tags.py:60
 msgid "Disc Id"
 msgstr ""
 
-#: ../picard/util/tags.py:60
+#: ../picard/util/tags.py:61
 msgid "Website"
 msgstr "Verkkosivu"
 
-#: ../picard/util/tags.py:61
+#: ../picard/util/tags.py:62
 msgid "Compilation"
 msgstr "Kokoelmalevy"
 
-#: ../picard/util/tags.py:62
+#: ../picard/util/tags.py:63
 msgid "Comment"
 msgstr "Kommentti"
 
-#: ../picard/util/tags.py:63
+#: ../picard/util/tags.py:64
 msgid "Genre"
 msgstr ""
 
-#: ../picard/util/tags.py:64
+#: ../picard/util/tags.py:65
 msgid "Encoded By"
 msgstr ""
 
-#: ../picard/util/tags.py:65
+#: ../picard/util/tags.py:66
 msgid "Performer"
 msgstr "Esiintyjä"
 
-#: ../picard/util/tags.py:66
+#: ../picard/util/tags.py:67
 msgid "Release Type"
 msgstr ""
 
-#: ../picard/util/tags.py:67
+#: ../picard/util/tags.py:68
 msgid "Release Status"
 msgstr ""
 
-#: ../picard/util/tags.py:68
+#: ../picard/util/tags.py:69
 msgid "Release Country"
 msgstr ""
 
-#: ../picard/util/tags.py:69
+#: ../picard/util/tags.py:70
 msgid "Record Label"
 msgstr "Levymerkki"
 
-#: ../picard/util/tags.py:70
+#: ../picard/util/tags.py:71
 msgid "Barcode"
 msgstr "Viivakoodi"
 
-#: ../picard/util/tags.py:71
+#: ../picard/util/tags.py:72
 msgid "Catalog Number"
 msgstr ""
 
-#: ../picard/util/tags.py:72
+#: ../picard/util/tags.py:73
 msgid "Format"
 msgstr ""
 
-#: ../picard/util/tags.py:73
+#: ../picard/util/tags.py:74
 msgid "DJ-Mixer"
 msgstr "DJ-miksaaja"
 
-#: ../picard/util/tags.py:74
+#: ../picard/util/tags.py:75
 msgid "Media"
 msgstr ""
 
-#: ../picard/util/tags.py:75
+#: ../picard/util/tags.py:76
 msgid "Lyrics"
 msgstr "Sanoitukset"
 
-#: ../picard/util/tags.py:76
+#: ../picard/util/tags.py:77
 msgid "Mixer"
 msgstr "Miksaaja"
 
-#: ../picard/util/tags.py:77
+#: ../picard/util/tags.py:78
 msgid "Language"
 msgstr "Kieli"
 
-#: ../picard/util/tags.py:78
+#: ../picard/util/tags.py:79
 msgid "Script"
 msgstr ""
 
@@ -2512,20 +2570,45 @@ msgstr ""
 "\n"
 "%s"
 
-#, python-format
+#~ msgid "Rename Files"
+#~ msgstr "Uudelleennimeä tiedostot"
+
+#~ msgid "Multiple artist file naming format:"
+#~ msgstr "Usean artistin uudelleennimeämis formaatti:"
+
+#~ msgid "File naming format:"
+#~ msgstr "Uudelleennimeämis formaatti:"
+
+#~ msgid "Multiple artist file name:"
+#~ msgstr "Usean artistin tiedostonimi:"
+
+#~ msgid "Common"
+#~ msgstr "Yleiset"
+
+#~ msgid "ID3"
+#~ msgstr "ID3"
+
+#~ msgid "Write ID3v2 version 2.3 tags (2.4 is default)"
+#~ msgstr "Kirjoita ID3v2.3 tagit (ID3v2.4 on oletus)"
+
+#~ msgid "Text encoding to use while writing ID3v2 tags:"
+#~ msgstr "ID3v2 tageissa käytössä oleva tekstikoodaus:"
+
+#~ msgid "APE"
+#~ msgstr "APE"
+
 #~ msgid "[couldn't load album %s]"
 #~ msgstr "[julkaisun %s lataaminen epäonnistui]"
 
 #~ msgid "New Version"
 #~ msgstr "Uusi versio"
 
-#, python-format
 #~ msgid ""
-#~ "New version of Picard is available (%s). Would you like to download it now?"
+#~ "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?"
 
-#, python-format
 #~ msgid "Couldn't find PUID for file %s"
 #~ msgstr "Tiedostolle %s ei löytynyt PUIDia"
 
@@ -2535,9 +2618,6 @@ msgstr ""
 #~ msgid "Automatically analyze all new files"
 #~ msgstr "Analysoi kaikki uudet tiedostot"
 
-#~ msgid "Don't write tags to files"
-#~ msgstr "Älä kirjoita tageja tiedostoihin"
-
 #~ msgid "Delete"
 #~ msgstr "Poista"
 
@@ -2664,9 +2744,6 @@ msgstr ""
 #~ 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ä"
 
@@ -2685,9 +2762,6 @@ msgstr ""
 #~ msgid "Proxy port"
 #~ msgstr "Välityspalvelimen portti"
 
-#~ msgid "ID3v2.4 only"
-#~ msgstr "Vain ID3v2.4"
-
 #~ msgid "Save track/album"
 #~ msgstr "Tallenna kappale/albumi"
 
@@ -2722,10 +2796,11 @@ msgstr ""
 #~ 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"
-#~ "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. "
+#~ "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 ""
 #~ "Et ole valinnut käyttäjänimeä ja salasanaa. Jotta voit lähettää dataa "
 #~ "MusicBrainziin, tarvitset MusicBrainz tilin.\n"
@@ -2743,7 +2818,8 @@ msgstr ""
 #~ "Please download the appropriate toolkit from http://www.wxpython.org/"
 #~ msgstr ""
 #~ "MusicBrainz Picard tarvitsee wxPythonin jossa on UNICODE tuki.\n"
-#~ "Ole hyvä ja lataa kyseinen työkalupakki osoitteesta http://www.wxpython.org"
+#~ "Ole hyvä ja lataa kyseinen työkalupakki osoitteesta http://www.wxpython."
+#~ "org"
 
 #~ msgid "Unicode Required"
 #~ msgstr "Vaatii unicoden"
@@ -2757,19 +2833,20 @@ msgstr ""
 #~ 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."
+#~ "Please fix the move option or the destination directory option and try "
+#~ "again."
 #~ msgstr ""
-#~ "Tiedostoja ei voitu siirtää koska kohde kansiota ei ole valittu tai sitä ei "
-#~ "ole.\n"
+#~ "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 click the "
-#~ "track and select 'Clear Error'"
+#~ "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 ""
-#~ "Kaikkia tiedostoja ei voitu tallentaa. Tarkista kappaleet joiden edessä on "
-#~ "virhe ikoni. Koittaaksesi uudelleen, näpäytä hiiren oikealla napilla "
+#~ "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"
@@ -2794,7 +2871,8 @@ msgstr ""
 #~ msgstr "Ole hyvä ja lahjoita MusicBrainzille!"
 
 #~ msgid ""
-#~ "The destination directory %s does not exist. Please pick a valid directory."
+#~ "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"
@@ -2815,9 +2893,6 @@ msgstr ""
 #~ 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"
 
@@ -2896,8 +2971,8 @@ msgstr ""
 #~ msgstr "Käynnistä Picard automaattisesti audio CD:eille"
 
 #~ msgid ""
-#~ "Failed to set the proper registy values to enable launching the tagger after "
-#~ "CD insertion. "
+#~ "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"
@@ -2953,7 +3028,8 @@ msgstr ""
 #~ "Please download the appropriate toolkit from  http://www.wxwidgets.com"
 #~ msgstr ""
 #~ "MusicBrainz Picard tarvitsee wx.Widgetin jossa on Unicode tuki.\n"
-#~ "Ole hyvä ja lataa kyseinen työkalupakki osoitteesta http://www.wxwidgets.org"
+#~ "Ole hyvä ja lataa kyseinen työkalupakki osoitteesta http://www.wxwidgets."
+#~ "org"
 
 #~ 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 9bd2e6bc0..28a443bdc 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Picard VERSION\n"
 "Report-Msgid-Bugs-To: http://bugs.musicbrainz.org/\n"
-"POT-Creation-Date: 2009-02-24 18:58+0100\n"
+"POT-Creation-Date: 2009-04-06 22:50+0200\n"
 "PO-Revision-Date: 2009-03-23 12:05+0000\n"
 "Last-Translator: Philipp Wolfer <Unknown>\n"
 "Language-Team: French <fr@li.org>\n"
@@ -21,16 +21,16 @@ msgstr ""
 "X-Generator: Launchpad (build Unknown)\n"
 "Generated-By: pygettext.py 1.5\n"
 
-#: ../picard/album.py:108 ../picard/cluster.py:248
+#: ../picard/album.py:109 ../picard/cluster.py:248
 msgid "Unmatched Files"
 msgstr "Fichiers sans groupement"
 
-#: ../picard/album.py:281
+#: ../picard/album.py:287
 #, python-format
 msgid "[could not load album %s]"
 msgstr "[chargement de l'album %s impossible]"
 
-#: ../picard/album.py:317
+#: ../picard/album.py:320
 msgid "[loading album information]"
 msgstr "[chargement des informations de l'album]"
 
@@ -590,7 +590,7 @@ msgid "Namibia"
 msgstr "Namibie"
 
 #: ../picard/const.py:182
-msgid "Vanuat"
+msgid "Vanuatu"
 msgstr ""
 
 #: ../picard/const.py:183
@@ -1034,223 +1034,239 @@ msgid "Congo, The Democratic Republic of the"
 msgstr "République Démocratique du Congo"
 
 #: ../picard/const.py:293
-msgid "Serbia and Montenegro"
+#, fuzzy
+msgid "Serbia and Montenegro (historical, 2003-2006)"
 msgstr "Serbie Montenegro"
 
 #: ../picard/const.py:294
+#, fuzzy
+msgid "Serbia"
+msgstr "Azerbaïdjan"
+
+#: ../picard/const.py:295
+#, fuzzy
+msgid "Montenegro"
+msgstr "Serbie Montenegro"
+
+#: ../picard/const.py:296
 msgid "Croatia"
 msgstr "Croatie"
 
-#: ../picard/const.py:295
+#: ../picard/const.py:297
 msgid "Korea (North), Democratic People's Republic of"
 msgstr "Corée du Nord, République populaire démocratique de"
 
-#: ../picard/const.py:296
+#: ../picard/const.py:298
 msgid "Korea (South), Republic of"
 msgstr "Corée , République de"
 
-#: ../picard/const.py:297
+#: ../picard/const.py:299
 msgid "Slovakia"
 msgstr "Slovaquie"
 
-#: ../picard/const.py:298
+#: ../picard/const.py:300
 msgid "Soviet Union (historical, 1922-1991)"
 msgstr "Union soviétique (historiquement, 1922 à 1991)"
 
-#: ../picard/const.py:299
+#: ../picard/const.py:301
 msgid "East Timor"
 msgstr "Timor Oriental"
 
-#: ../picard/const.py:300
+#: ../picard/const.py:302
 msgid "Czechoslovakia (historical, 1918-1992)"
 msgstr ""
 
-#: ../picard/const.py:301
+#: ../picard/const.py:303
 msgid "Europe"
 msgstr "Europe"
 
-#: ../picard/const.py:302
+#: ../picard/const.py:304
 msgid "East Germany (historical, 1949-1990)"
 msgstr "Allemagne de l'est (historiquement, 1949 à 1990)"
 
-#: ../picard/const.py:303
+#: ../picard/const.py:305
 msgid "[Unknown Country]"
 msgstr "[Pays Inconnu]"
 
-#: ../picard/const.py:304
+#: ../picard/const.py:306
 msgid "[Worldwide]"
 msgstr "[Monde]"
 
-#: ../picard/const.py:305
+#: ../picard/const.py:307
 msgid "Yugoslavia (historical, 1918-1992)"
 msgstr "Yougoslave (historiquement, 1918 à 1992)"
 
-#: ../picard/const.py:310
-msgid "Catalan"
-msgstr "Catalan"
-
-#: ../picard/const.py:311
-msgid "Czech"
-msgstr "Tchèque"
-
 #: ../picard/const.py:312
-msgid "Welsh"
+msgid "Afrikaans"
 msgstr ""
 
 #: ../picard/const.py:313
+msgid "Arabic"
+msgstr ""
+
+#: ../picard/const.py:314
+msgid "Catalan"
+msgstr "Catalan"
+
+#: ../picard/const.py:315
+msgid "Czech"
+msgstr "Tchèque"
+
+#: ../picard/const.py:316
+msgid "Welsh"
+msgstr ""
+
+#: ../picard/const.py:317
 msgid "Danish"
 msgstr "Danois"
 
-#: ../picard/const.py:314
+#: ../picard/const.py:318
 msgid "German"
 msgstr "Allemand"
 
-#: ../picard/const.py:315
+#: ../picard/const.py:319
 msgid "English"
 msgstr "Anglais"
 
-#: ../picard/const.py:316
+#: ../picard/const.py:320
 msgid "English (Canada)"
 msgstr "Anglais (Canada)"
 
-#: ../picard/const.py:317
+#: ../picard/const.py:321
 msgid "English (UK)"
 msgstr "Anglais (Royaume Uni)"
 
-#: ../picard/const.py:318
+#: ../picard/const.py:322
 msgid "Spanish"
 msgstr "Espagnol"
 
-#: ../picard/const.py:319
+#: ../picard/const.py:323
 msgid "Persian"
 msgstr "Persan"
 
-#: ../picard/const.py:320
+#: ../picard/const.py:324
 msgid "Finnish"
 msgstr "Finnois"
 
-#: ../picard/const.py:321
+#: ../picard/const.py:325
 msgid "French"
 msgstr "Français"
 
-#: ../picard/const.py:322
+#: ../picard/const.py:326
 msgid "Frisian"
 msgstr ""
 
-#: ../picard/const.py:323
+#: ../picard/const.py:327
 msgid "Hebrew"
 msgstr ""
 
-#: ../picard/const.py:324
+#: ../picard/const.py:328
+#, fuzzy
+msgid "Hindi"
+msgstr "Haïti"
+
+#: ../picard/const.py:329
 msgid "Hungarian"
 msgstr "Hongrois"
 
-#: ../picard/const.py:325
+#: ../picard/const.py:330
 msgid "Islandic"
 msgstr ""
 
-#: ../picard/const.py:326
+#: ../picard/const.py:331
 msgid "Italian"
 msgstr "Italien"
 
-#: ../picard/const.py:327
+#: ../picard/const.py:332
 msgid "Kannada"
 msgstr ""
 
-#: ../picard/const.py:328
+#: ../picard/const.py:333
 msgid "Korean"
 msgstr "Coréen"
 
-#: ../picard/const.py:329
+#: ../picard/const.py:334
 msgid "Lithuanian"
 msgstr "Lituanien"
 
-#: ../picard/const.py:330
+#: ../picard/const.py:335
 msgid "Norwegian Bokmal"
 msgstr ""
 
-#: ../picard/const.py:331
+#: ../picard/const.py:336
 msgid "Dutch"
 msgstr "Hollandais"
 
-#: ../picard/const.py:332
+#: ../picard/const.py:337
 msgid "Polish"
 msgstr "Polonais"
 
-#: ../picard/const.py:333
+#: ../picard/const.py:338
 msgid "Portuguese"
 msgstr "portugais"
 
-#: ../picard/const.py:334
+#: ../picard/const.py:339
 msgid "Brazilian Portuguese"
 msgstr "Portugais brésilien"
 
-#: ../picard/const.py:335
+#: ../picard/const.py:340
 msgid "Romanian"
 msgstr "roumain"
 
-#: ../picard/const.py:336
+#: ../picard/const.py:341
 msgid "Russian"
 msgstr "russe"
 
-#: ../picard/const.py:337
+#: ../picard/const.py:342
 msgid "Scots"
 msgstr "Écossais"
 
-#: ../picard/const.py:338
+#: ../picard/const.py:343
 msgid "Slovak"
 msgstr "slovaque"
 
-#: ../picard/const.py:339
+#: ../picard/const.py:344
 msgid "Slovenian"
 msgstr "Slovène"
 
-#: ../picard/const.py:340
+#: ../picard/const.py:345
 msgid "Swedish"
 msgstr "suédois"
 
-#: ../picard/const.py:341
+#: ../picard/const.py:346
+#, fuzzy
+msgid "Turkish"
+msgstr "Turkménistan"
+
+#: ../picard/const.py:347
 msgid "Chinese"
 msgstr "Chinois"
 
-#: ../picard/file.py:487
+#: ../picard/file.py:494
 #, python-format
 msgid "No matching tracks for file %s"
 msgstr "Pas de piste correspondant au fichier %s"
 
-#: ../picard/file.py:504
+#: ../picard/file.py:511
 #, python-format
 msgid "No matching tracks above the threshold for file %s"
 msgstr "Pas de piste correspondant au-dessus du seuil pour le fichier %s"
 
-#: ../picard/file.py:507
+#: ../picard/file.py:514
 #, python-format
 msgid "File %s identified!"
 msgstr "Fichier %s identifié!"
 
-#: ../picard/file.py:518
+#: ../picard/file.py:525
 #, python-format
 msgid "Looking up the PUID for file %s..."
 msgstr "Recherche du PUID du fichier %s..."
 
-#: ../picard/file.py:523
+#: ../picard/file.py:530
 #, 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)"
@@ -1263,11 +1279,24 @@ msgstr "Liste de lecture PLS (*.pls)"
 msgid "XSPF Playlist (*.xspf)"
 msgstr "Liste de lecture XSPF (*.xspf)"
 
-#: ../picard/tagger.py:476
+#: ../picard/puidmanager.py:62
+msgid "Submitting PUIDs..."
+msgstr "Envoie des PUIDs ..."
+
+#: ../picard/puidmanager.py:68
+#, python-format
+msgid "PUIDs submission failed: %s"
+msgstr "Echec d'envoi du PUIDs : %s"
+
+#: ../picard/puidmanager.py:70
+msgid "PUIDs successfully submitted!"
+msgstr "PUID envoyés avec succès."
+
+#: ../picard/tagger.py:477
 msgid "CD Lookup Error"
 msgstr "Erreur de recherche du CD"
 
-#: ../picard/tagger.py:477
+#: ../picard/tagger.py:478
 #, python-format
 msgid ""
 "Error while reading CD:\n"
@@ -1278,7 +1307,7 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../picard/tagger.py:503
+#: ../picard/tagger.py:504
 #, python-format
 msgid "Could not find PUID for file %s"
 msgstr ""
@@ -1331,15 +1360,28 @@ msgstr "Affiche les fichiers &cachés"
 msgid "Length"
 msgstr "Durée"
 
-#: ../picard/ui/itemviews.py:327
+#: ../picard/ui/itemviews.py:289
+msgid "&Expand all"
+msgstr ""
+
+#: ../picard/ui/itemviews.py:291
+msgid "&Collapse all"
+msgstr ""
+
+#: ../picard/ui/itemviews.py:332
 msgid "&Releases"
 msgstr "&Sortie"
 
-#: ../picard/ui/itemviews.py:353
+#: ../picard/ui/itemviews.py:349
+#, fuzzy
+msgid "No release event"
+msgstr "Mois de sortie de l'album"
+
+#: ../picard/ui/itemviews.py:359
 msgid "&Plugins"
 msgstr "&Extensions"
 
-#: ../picard/ui/itemviews.py:523
+#: ../picard/ui/itemviews.py:533
 msgid "Clusters"
 msgstr "Groupements"
 
@@ -1347,95 +1389,6 @@ msgstr "Groupements"
 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:66 ../picard/ui/ui_options_plugins.py:62
-msgid "Details"
-msgstr "Détails"
-
-#: ../picard/ui/tageditor.py:71 ../picard/ui/tageditor.py:264
-#, python-format
-msgid "%d file"
-msgid_plural "%d files"
-msgstr[0] "%d fichier"
-msgstr[1] "%d fichiers"
-
-#: ../picard/ui/tageditor.py:131
-#, 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:134
-#, 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:233
-msgid "Filename:"
-msgstr "Nom de fichier :"
-
-#: ../picard/ui/tageditor.py:235
-msgid "Format:"
-msgstr "Format :"
-
-#: ../picard/ui/tageditor.py:244
-msgid "Size:"
-msgstr "Taille :"
-
-#: ../picard/ui/tageditor.py:248 ../picard/ui/ui_metadata.py:127
-msgid "Length:"
-msgstr "Durée :"
-
-#: ../picard/ui/tageditor.py:250
-msgid "Bitrate:"
-msgstr "Débit :"
-
-#: ../picard/ui/tageditor.py:252
-msgid "Sample rate:"
-msgstr "Taux d'échantillonage :"
-
-#: ../picard/ui/tageditor.py:254
-msgid "Bits per sample:"
-msgstr "Bits par échantillon:"
-
-#: ../picard/ui/tageditor.py:257
-msgid "Mono"
-msgstr "Mono"
-
-#: ../picard/ui/tageditor.py:258
-msgid "Stereo"
-msgstr "Stéréo"
-
-#: ../picard/ui/tageditor.py:260
-msgid "Channels:"
-msgstr "Canaux :"
-
-#: ../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"
 msgstr "MusicBrainz Picard"
@@ -1672,6 +1625,10 @@ msgstr "Barre de &recherche"
 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"
@@ -1691,6 +1648,22 @@ msgstr "Liste de lecture %s sauvegardée."
 msgid " (Error: %s)"
 msgstr " (Erreur : %s)"
 
+#: ../picard/ui/puidsubmit.py:31 ../picard/ui/options/plugins.py:85
+msgid "File"
+msgstr "Fichier"
+
+#: ../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 "ID de l'album"
+
 #: ../picard/ui/passworddialog.py:38
 #, python-format
 msgid ""
@@ -1699,6 +1672,75 @@ msgstr ""
 "Le serveur %s requiert une connexion. Veuillez entrer vos nom d'utilisateur "
 "et mot de passe."
 
+#: ../picard/ui/tageditor.py:66 ../picard/ui/ui_options_plugins.py:62
+msgid "Details"
+msgstr "Détails"
+
+#: ../picard/ui/tageditor.py:71 ../picard/ui/tageditor.py:264
+#, python-format
+msgid "%d file"
+msgid_plural "%d files"
+msgstr[0] "%d fichier"
+msgstr[1] "%d fichiers"
+
+#: ../picard/ui/tageditor.py:131
+#, 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:134
+#, 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:233
+msgid "Filename:"
+msgstr "Nom de fichier :"
+
+#: ../picard/ui/tageditor.py:235
+msgid "Format:"
+msgstr "Format :"
+
+#: ../picard/ui/tageditor.py:244
+msgid "Size:"
+msgstr "Taille :"
+
+#: ../picard/ui/tageditor.py:248 ../picard/ui/ui_metadata.py:127
+msgid "Length:"
+msgstr "Durée :"
+
+#: ../picard/ui/tageditor.py:250
+msgid "Bitrate:"
+msgstr "Débit :"
+
+#: ../picard/ui/tageditor.py:252
+msgid "Sample rate:"
+msgstr "Taux d'échantillonage :"
+
+#: ../picard/ui/tageditor.py:254
+msgid "Bits per sample:"
+msgstr "Bits par échantillon:"
+
+#: ../picard/ui/tageditor.py:257
+msgid "Mono"
+msgstr "Mono"
+
+#: ../picard/ui/tageditor.py:258
+msgid "Stereo"
+msgstr "Stéréo"
+
+#: ../picard/ui/tageditor.py:260
+msgid "Channels:"
+msgstr "Canaux :"
+
+#: ../picard/ui/tagsfromfilenames.py:54 ../picard/ui/tagsfromfilenames.py:99
+msgid "File Name"
+msgstr "Nom de fichier"
+
 #: ../picard/ui/ui_cdlookup.py:60 ../picard/ui/ui_options_cdlookup.py:47
 #: ../picard/ui/ui_options_cdlookup_select.py:48
 #: ../picard/ui/options/cdlookup.py:36
@@ -1721,24 +1763,6 @@ msgstr "    Recherche manuelle    "
 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_proxy.py:83
-#: ../picard/ui/ui_options_general.py:113
-msgid "Username:"
-msgstr "Nom d'utilisateur :"
-
-#: ../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/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"
@@ -1775,6 +1799,10 @@ msgstr "Album :"
 msgid "Options"
 msgstr "Options"
 
+#: ../picard/ui/ui_puidsubmit.py:52
+msgid "Submit PUIDs"
+msgstr "Soumettre les PUID"
+
 #: ../picard/ui/ui_options_cdlookup.py:48
 msgid "CD-ROM device to use for lookups:"
 msgstr "Lecteur de CD-ROM à utiliser pour les consultations"
@@ -1799,6 +1827,23 @@ 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_moving.py:53
+msgid "Move additional files:"
+msgstr "Déplacer des fichiers supplémentaires :"
+
+#: ../picard/ui/ui_options_moving.py:54
+msgid "Browse..."
+msgstr "Parcourir..."
+
+#: ../picard/ui/ui_options_moving.py:55
+msgid "Delete empty directories"
+msgstr "Supprimer les répertoires vides"
+
+#: ../picard/ui/ui_options_moving.py:56
+#, fuzzy
+msgid "Move files to this directory when saving:"
+msgstr "Les fichiers étiquettés seront déplacés dans ce répertoire"
+
 #: ../picard/ui/util.py:31
 msgid "&Ok"
 msgstr "&Ok"
@@ -1807,44 +1852,40 @@ msgstr "&Ok"
 msgid "&Cancel"
 msgstr "&Annuler"
 
-#: ../picard/ui/ui_puidsubmit.py:52
-msgid "Submit PUIDs"
-msgstr "Soumettre les PUID"
-
-#: ../picard/ui/ui_tageditor.py:139 ../picard/ui/ui_options_plugins.py:59
-#: ../picard/ui/options/plugins.py:76
+#: ../picard/ui/ui_tageditor.py:128 ../picard/ui/ui_options_plugins.py:59
+#: ../picard/ui/options/plugins.py:81
 msgid "Name"
 msgstr "Nom d'utilisateur"
 
-#: ../picard/ui/ui_tageditor.py:140
+#: ../picard/ui/ui_tageditor.py:129
 msgid "Value"
 msgstr "Valeur"
 
-#: ../picard/ui/ui_tageditor.py:141
+#: ../picard/ui/ui_tageditor.py:130
 msgid "Rating:"
 msgstr ""
 
-#: ../picard/ui/ui_tageditor.py:142
+#: ../picard/ui/ui_tageditor.py:131
 msgid "&Add..."
 msgstr "&Ajouter..."
 
-#: ../picard/ui/ui_tageditor.py:143
+#: ../picard/ui/ui_tageditor.py:132
 msgid "&Edit..."
 msgstr "Modifi&er..."
 
-#: ../picard/ui/ui_tageditor.py:144
+#: ../picard/ui/ui_tageditor.py:133
 msgid "&Delete"
 msgstr "&Supprimer"
 
-#: ../picard/ui/ui_tageditor.py:145
+#: ../picard/ui/ui_tageditor.py:134
 msgid "&Metadata"
 msgstr "&Meta-données"
 
-#: ../picard/ui/ui_tageditor.py:146
+#: ../picard/ui/ui_tageditor.py:135
 msgid "A&rtwork"
 msgstr "Pochette d'album"
 
-#: ../picard/ui/ui_tageditor.py:147
+#: ../picard/ui/ui_tageditor.py:136
 msgid "&Info"
 msgstr "&Info"
 
@@ -1889,6 +1930,40 @@ msgstr " / "
 msgid ", "
 msgstr ", "
 
+#: ../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:72
+msgid "Port:"
+msgstr "Port :"
+
+#: ../picard/ui/ui_options_general.py:110 ../picard/ui/ui_options_proxy.py:73
+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:112 ../picard/ui/ui_options_proxy.py:70
+#: ../picard/ui/ui_passworddialog.py:80
+msgid "Password:"
+msgstr "Mot de passe :"
+
+#: ../picard/ui/ui_options_general.py:113 ../picard/ui/ui_options_proxy.py:71
+#: ../picard/ui/ui_passworddialog.py:79
+msgid "Username:"
+msgstr "Nom d'utilisateur :"
+
+#: ../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_interface.py:50
 msgid "Miscellaneous"
 msgstr "Divers"
@@ -1909,113 +1984,6 @@ msgstr "Utilisez la syntaxe de requête avancée"
 msgid "User interface language:"
 msgstr "Langue de l'interface utilisateur :"
 
-#: ../picard/ui/ui_options_naming.py:165
-msgid "Rename Files"
-msgstr "Renommer les fichiers"
-
-#: ../picard/ui/ui_options_naming.py:166
-msgid "Replace Windows-incompatible characters"
-msgstr "Remplacer les caractères Windows non compatibles"
-
-#: ../picard/ui/ui_options_naming.py:167
-msgid "Replace non-ASCII characters"
-msgstr "Remplacer les caractères 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 "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
-msgid "File naming format:"
-msgstr "Format du nom de fichier :"
-
-#: ../picard/ui/ui_options_naming.py:172
-msgid "Move Files"
-msgstr "Déplacer les fichiers"
-
-#: ../picard/ui/ui_options_naming.py:173
-msgid "Move tagged files to this directory:"
-msgstr "Les fichiers étiquettés seront déplacés dans ce répertoire"
-
-#: ../picard/ui/ui_options_naming.py:174
-msgid "Browse..."
-msgstr "Parcourir..."
-
-#: ../picard/ui/ui_options_naming.py:175
-msgid "Move additional files:"
-msgstr "Déplacer des fichiers supplémentaires :"
-
-#: ../picard/ui/ui_options_naming.py:176
-msgid "Delete empty directories"
-msgstr "Supprimer les répertoires vides"
-
-#: ../picard/ui/ui_options_naming.py:177
-msgid "Example"
-msgstr "Exemple"
-
-#: ../picard/ui/ui_options_naming.py:178
-msgid "File name:"
-msgstr "Nom de fichier :"
-
-#: ../picard/ui/ui_options_naming.py:179
-msgid "Multiple artist file name:"
-msgstr "Nom des fichiers aux plusieurs artistes"
-
-#: ../picard/ui/ui_options_naming.py:180
-#: ../picard/ui/ui_tagsfromfilenames.py:58
-msgid "&Preview"
-msgstr "&Prévisualisation"
-
-#: ../picard/ui/ui_options_proxy.py:81 ../picard/ui/options/proxy.py:28
-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_options_ratings.py:45
-msgid "Enable track ratings"
-msgstr ""
-
-#: ../picard/ui/ui_options_ratings.py:46
-msgid ""
-"Picard saves the ratings together with an e-mail address identifying the "
-"user who did the rating. That way different ratings for different users can "
-"be stored in the files. Please sepcify the e-mail you want to use to save "
-"your ratings."
-msgstr ""
-
-#: ../picard/ui/ui_options_ratings.py:47
-msgid "E-mail:"
-msgstr ""
-
-#: ../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 ../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"
@@ -2073,75 +2041,152 @@ msgstr "Artistes divers :"
 msgid "Non-album tracks:"
 msgstr "Morceaux hors album :"
 
-#: ../picard/ui/ui_options_plugins.py:58 ../picard/ui/options/plugins.py:30
+#: ../picard/ui/ui_options_metadata.py:109
+#: ../picard/ui/ui_options_metadata.py:110
+#: ../picard/ui/ui_options_renaming.py:155
+#: ../picard/ui/ui_options_renaming.py:158
+msgid "Default"
+msgstr "Valeur par default"
+
+#: ../picard/ui/ui_options_plugins.py:58 ../picard/ui/options/plugins.py:34
 msgid "Plugins"
 msgstr "Plugins"
 
-#: ../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:84
 msgid "Author"
 msgstr "Auteur"
 
-#: ../picard/ui/ui_options_plugins.py:61 ../picard/util/tags.py:36
+#: ../picard/ui/ui_options_plugins.py:61 ../picard/util/tags.py:37
 msgid "Version"
 msgstr "Version"
 
-#: ../picard/ui/ui_options_script.py:52
+#: ../picard/ui/ui_options_proxy.py:69 ../picard/ui/options/proxy.py:28
+msgid "Web Proxy"
+msgstr "Proxy Web"
+
+#: ../picard/ui/ui_options_ratings.py:45
+msgid "Enable track ratings"
+msgstr ""
+
+#: ../picard/ui/ui_options_ratings.py:46
+msgid ""
+"Picard saves the ratings together with an e-mail address identifying the "
+"user who did the rating. That way different ratings for different users can "
+"be stored in the files. Please sepcify the e-mail you want to use to save "
+"your ratings."
+msgstr ""
+
+#: ../picard/ui/ui_options_ratings.py:47
+msgid "E-mail:"
+msgstr ""
+
+#: ../picard/ui/ui_options_renaming.py:145
+#, fuzzy
+msgid "Form"
+msgstr "Format"
+
+#: ../picard/ui/ui_options_renaming.py:146
+#, fuzzy
+msgid "Rename files when saving"
+msgstr "Renommer les fichiers lors de l'écriture des étiquettes"
+
+#: ../picard/ui/ui_options_renaming.py:147
+msgid "Replace non-ASCII characters"
+msgstr "Remplacer les caractères non ASCII"
+
+#: ../picard/ui/ui_options_renaming.py:148
+msgid "Replace Windows-incompatible characters"
+msgstr "Remplacer les caractères Windows non compatibles"
+
+#: ../picard/ui/ui_options_renaming.py:149
+msgid "Name files like this"
+msgstr ""
+
+#: ../picard/ui/ui_options_renaming.py:156
+msgid "Name multiple artist albums differently"
+msgstr ""
+
+#: ../picard/ui/ui_options_renaming.py:157
+msgid "Copy from above"
+msgstr ""
+
+#: ../picard/ui/ui_options_renaming.py:159
+#, fuzzy
+msgid "Examples"
+msgstr "Exemple"
+
+#: ../picard/ui/ui_options_script.py:43
 msgid "Tagger Script"
 msgstr "Script d'étiquetage"
 
-#: ../picard/ui/ui_options_tags.py:85
-msgid "Common"
-msgstr "Commun"
-
-#: ../picard/ui/ui_options_tags.py:86
-msgid "Clear existing tags before writing new tags"
-msgstr "Supprimer les étiquettes existantes avant écriture"
-
-#: ../picard/ui/ui_options_tags.py:87
-msgid "Don not write tags to files"
+#: ../picard/ui/ui_options_tags.py:97
+#, fuzzy
+msgid "Do not write tags to files"
 msgstr "Ne mettez pas de balises dans les fichiers"
 
-#: ../picard/ui/ui_options_tags.py:88
-msgid "ID3"
-msgstr "ID3"
-
-#: ../picard/ui/ui_options_tags.py:89
-msgid "Write ID3v1 tags to the files"
-msgstr "Ecrire les tags ID3v1 dans les fichiers"
-
-#: ../picard/ui/ui_options_tags.py:90
-msgid "Write ID3v2 version 2.3 tags (2.4 is default)"
+#: ../picard/ui/ui_options_tags.py:98
+msgid "Before tagging"
 msgstr ""
-"Utiliser la version 2.3 pour les étiquettes ID3v2 (au lieu de 2.4 par défaut)"
 
-#: ../picard/ui/ui_options_tags.py:91
-msgid "Text encoding to use while writing ID3v2 tags:"
-msgstr "Codage de texte pour écrire les étiquettes ID3v2 :"
+#: ../picard/ui/ui_options_tags.py:99
+#, fuzzy
+msgid "Clear existing tags"
+msgstr "Supprimer les étiquettes existantes avant écriture"
 
-#: ../picard/ui/ui_options_tags.py:92
-msgid "ISO-8859-1"
-msgstr "ISO-8859-1"
-
-#: ../picard/ui/ui_options_tags.py:93
-msgid "UTF-16"
-msgstr "UTF-16"
-
-#: ../picard/ui/ui_options_tags.py:94
-msgid "UTF-8"
-msgstr "UTF-8"
-
-#: ../picard/ui/ui_options_tags.py:95
+#: ../picard/ui/ui_options_tags.py:100
 msgid "Remove ID3 tags from FLAC files"
 msgstr "c"
 
-#: ../picard/ui/ui_options_tags.py:96
-msgid "APE"
-msgstr "APE"
-
-#: ../picard/ui/ui_options_tags.py:97
+#: ../picard/ui/ui_options_tags.py:101
 msgid "Remove APEv2 tags from MP3 files"
 msgstr "Supprimer les tags APEv2 des fichiers MP3"
 
+#: ../picard/ui/ui_options_tags.py:102
+msgid "Tag compatibility"
+msgstr ""
+
+#: ../picard/ui/ui_options_tags.py:103
+#, fuzzy
+msgid "ID3v2 version"
+msgstr "ID3v2.4 seulement"
+
+#: ../picard/ui/ui_options_tags.py:104
+msgid "2.4"
+msgstr ""
+
+#: ../picard/ui/ui_options_tags.py:105
+msgid "2.3"
+msgstr ""
+
+#: ../picard/ui/ui_options_tags.py:106
+#, fuzzy
+msgid "Also include ID3v1 tags in the files"
+msgstr "Ecrire les tags ID3v1 dans les fichiers"
+
+#: ../picard/ui/ui_options_tags.py:107
+msgid "ID3v2 text encoding"
+msgstr ""
+
+#: ../picard/ui/ui_options_tags.py:108
+msgid "UTF-8"
+msgstr "UTF-8"
+
+#: ../picard/ui/ui_options_tags.py:109
+msgid "UTF-16"
+msgstr "UTF-16"
+
+#: ../picard/ui/ui_options_tags.py:110
+msgid "ISO-8859-1"
+msgstr "ISO-8859-1"
+
+#: ../picard/ui/ui_passworddialog.py:78
+msgid "Authentication required"
+msgstr "Authentification requise"
+
+#: ../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_tagsfromfilenames.py:56
 msgid "Convert File Names to Tags"
 msgstr "Convertissez les noms de fichiers en balises"
@@ -2150,6 +2195,10 @@ msgstr "Convertissez les noms de fichiers en balises"
 msgid "Replace underscores with spaces"
 msgstr "Remplacer les underscores par des espaces"
 
+#: ../picard/ui/ui_tagsfromfilenames.py:58
+msgid "&Preview"
+msgstr "&Prévisualisation"
+
 #: ../picard/ui/options/about.py:29
 msgid "About"
 msgstr "A Propos"
@@ -2197,8 +2246,8 @@ msgstr "<br/>Traduit en Français par %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"
@@ -2206,17 +2255,16 @@ msgid ""
 "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\"><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/P"
-"icardTagger</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><br/>%(formats)s</p>\n"
 "<p align=\"center\"><strong>Veuillez faire un don</strong><br/>\n"
@@ -2224,15 +2272,13 @@ msgstr ""
 "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\"><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/P"
-"icardTagger</a></p>\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"
@@ -2266,258 +2312,267 @@ msgstr "Correspond"
 msgid "None"
 msgstr "Aucun"
 
-#: ../picard/ui/options/naming.py:33
-msgid "File Naming"
-msgstr "Nom des fichiers"
+#: ../picard/ui/options/moving.py:33
+#, fuzzy
+msgid "Moving files"
+msgstr "Déplacer les fichiers"
 
-#: ../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 "Le format des noms de fichiers ne doit pas être vide."
-
-#: ../picard/ui/options/naming.py:95
-msgid "The multiple artist file naming format must not be empty."
-msgstr ""
-"Le format des noms de fichiers aux plusieurs auteurs ne doit pas être vide."
-
-#: ../picard/ui/options/naming.py:97
+#: ../picard/ui/options/moving.py:65
 msgid "Error"
 msgstr "Erreur"
 
-#: ../picard/ui/options/naming.py:97
+#: ../picard/ui/options/moving.py:65
 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/ratings.py:29
+msgid "Ratings"
+msgstr ""
 
 #: ../picard/ui/options/tags.py:29
 msgid "Tags"
 msgstr "Étiquettes"
 
-#: ../picard/ui/options/ratings.py:29
-msgid "Ratings"
+#: ../picard/ui/options/renaming.py:35
+#, fuzzy
+msgid "File naming"
+msgstr "Nom des fichiers"
+
+#: ../picard/ui/options/renaming.py:123
+msgid "The file naming format must not be empty."
+msgstr "Le format des noms de fichiers ne doit pas être vide."
+
+#: ../picard/ui/options/renaming.py:133
+msgid "The multiple artist file naming format must not be empty."
 msgstr ""
+"Le format des noms de fichiers aux plusieurs auteurs ne doit pas être vide."
+
+#: ../picard/ui/options/scripting.py:63
+msgid "Scripting"
+msgstr "Scripts"
+
+#: ../picard/ui/options/scripting.py:97
+msgid "Script Error"
+msgstr "Erreur de script"
 
 #: ../picard/util/tags.py:24
 msgid "Date"
 msgstr "Date"
 
 #: ../picard/util/tags.py:25
+#, fuzzy
+msgid "Original Release Date"
+msgstr "Métadonnées d'origine"
+
+#: ../picard/util/tags.py:26
 msgid "Album Artist"
 msgstr "Artiste de l'album"
 
-#: ../picard/util/tags.py:26
+#: ../picard/util/tags.py:27
 msgid "Track Number"
 msgstr "Numéro de piste"
 
-#: ../picard/util/tags.py:27
+#: ../picard/util/tags.py:28
 msgid "Total Tracks"
 msgstr "Nombre total de pistes"
 
-#: ../picard/util/tags.py:28
+#: ../picard/util/tags.py:29
 msgid "Disc Number"
 msgstr "Numéro du disque"
 
-#: ../picard/util/tags.py:29
+#: ../picard/util/tags.py:30
 msgid "Total Discs"
 msgstr "Nombres de disques Total"
 
-#: ../picard/util/tags.py:30
+#: ../picard/util/tags.py:31
 msgid "Album Artist Sort Order"
 msgstr "Ordre de tri de l'artiste de l'album"
 
-#: ../picard/util/tags.py:31
+#: ../picard/util/tags.py:32
 msgid "Artist Sort Order"
 msgstr "Ordre de tri de l'artiste"
 
-#: ../picard/util/tags.py:32
+#: ../picard/util/tags.py:33
 msgid "Title Sort Order"
 msgstr "Ordre de tri du titre"
 
-#: ../picard/util/tags.py:33
+#: ../picard/util/tags.py:34
 msgid "Album Sort Order"
 msgstr "Ordre de tri de l'album"
 
-#: ../picard/util/tags.py:34
+#: ../picard/util/tags.py:35
 msgid "ASIN"
 msgstr "ASIN"
 
-#: ../picard/util/tags.py:35
+#: ../picard/util/tags.py:36
 msgid "Grouping"
 msgstr "Groupement"
 
-#: ../picard/util/tags.py:37
+#: ../picard/util/tags.py:38
 msgid "ISRC"
 msgstr "ISRC"
 
-#: ../picard/util/tags.py:38
+#: ../picard/util/tags.py:39
 msgid "Mood"
 msgstr "Humeur"
 
-#: ../picard/util/tags.py:39
+#: ../picard/util/tags.py:40
 msgid "BPM"
 msgstr "BPM"
 
-#: ../picard/util/tags.py:40
+#: ../picard/util/tags.py:41
 msgid "Copyright"
 msgstr "Droits d'auteur"
 
-#: ../picard/util/tags.py:41
+#: ../picard/util/tags.py:42
 msgid "Composer"
 msgstr "Compositeur"
 
-#: ../picard/util/tags.py:42
+#: ../picard/util/tags.py:43
 msgid "Conductor"
 msgstr "Chef d'orchestre"
 
-#: ../picard/util/tags.py:43
+#: ../picard/util/tags.py:44
 msgid "Lyricist"
 msgstr "Parolier"
 
-#: ../picard/util/tags.py:44
+#: ../picard/util/tags.py:45
 msgid "Arranger"
 msgstr "Arrangeur"
 
-#: ../picard/util/tags.py:45
+#: ../picard/util/tags.py:46
 msgid "Producer"
 msgstr "Producteur"
 
-#: ../picard/util/tags.py:46
+#: ../picard/util/tags.py:47
 msgid "Engineer"
 msgstr "Ingénieur"
 
-#: ../picard/util/tags.py:47
+#: ../picard/util/tags.py:48
 msgid "Subtitle"
 msgstr "Sous-titres"
 
-#: ../picard/util/tags.py:48
+#: ../picard/util/tags.py:49
 msgid "Disc Subtitle"
 msgstr "Sous-titre du disque"
 
-#: ../picard/util/tags.py:49
+#: ../picard/util/tags.py:50
 msgid "Remixer"
 msgstr "Remixeur"
 
-#: ../picard/util/tags.py:50
+#: ../picard/util/tags.py:51
 msgid "MusicBrainz Track Id"
 msgstr "Id de la piste MusicBrainz"
 
-#: ../picard/util/tags.py:51
+#: ../picard/util/tags.py:52
 msgid "MusicBrainz Release Id"
 msgstr "Id de l'album MusicBrainz"
 
-#: ../picard/util/tags.py:52
+#: ../picard/util/tags.py:53
 msgid "MusicBrainz Artist Id"
 msgstr "Id de l'artiste MusicBrainz"
 
-#: ../picard/util/tags.py:53
+#: ../picard/util/tags.py:54
 msgid "MusicBrainz Release Artist Id"
 msgstr ""
 
-#: ../picard/util/tags.py:54
+#: ../picard/util/tags.py:55
 msgid "MusicBrainz TRM Id"
 msgstr ""
 
-#: ../picard/util/tags.py:55
+#: ../picard/util/tags.py:56
 msgid "MusicBrainz Disc Id"
 msgstr "Id du disc MusicBrainz"
 
-#: ../picard/util/tags.py:56
+#: ../picard/util/tags.py:57
 msgid "MusicBrainz Sort Name"
 msgstr ""
 
-#: ../picard/util/tags.py:57
+#: ../picard/util/tags.py:58
 msgid "MusicIP PUID"
 msgstr "MusicIP PUID"
 
-#: ../picard/util/tags.py:58
+#: ../picard/util/tags.py:59
 msgid "MusicIP Fingerprint"
 msgstr ""
 
-#: ../picard/util/tags.py:59
+#: ../picard/util/tags.py:60
 msgid "Disc Id"
 msgstr "Id du disque"
 
-#: ../picard/util/tags.py:60
+#: ../picard/util/tags.py:61
 msgid "Website"
 msgstr "Site Web"
 
-#: ../picard/util/tags.py:61
+#: ../picard/util/tags.py:62
 msgid "Compilation"
 msgstr "Compilation"
 
-#: ../picard/util/tags.py:62
+#: ../picard/util/tags.py:63
 msgid "Comment"
 msgstr "Commentaire"
 
-#: ../picard/util/tags.py:63
+#: ../picard/util/tags.py:64
 msgid "Genre"
 msgstr "Genre"
 
-#: ../picard/util/tags.py:64
+#: ../picard/util/tags.py:65
 msgid "Encoded By"
 msgstr "Encodé par"
 
-#: ../picard/util/tags.py:65
+#: ../picard/util/tags.py:66
 msgid "Performer"
 msgstr "Interprète"
 
-#: ../picard/util/tags.py:66
+#: ../picard/util/tags.py:67
 msgid "Release Type"
 msgstr ""
 
-#: ../picard/util/tags.py:67
+#: ../picard/util/tags.py:68
 msgid "Release Status"
 msgstr ""
 
-#: ../picard/util/tags.py:68
+#: ../picard/util/tags.py:69
 msgid "Release Country"
 msgstr ""
 
-#: ../picard/util/tags.py:69
+#: ../picard/util/tags.py:70
 msgid "Record Label"
 msgstr "Label d' enregistrement"
 
-#: ../picard/util/tags.py:70
+#: ../picard/util/tags.py:71
 msgid "Barcode"
 msgstr "Code-barre"
 
-#: ../picard/util/tags.py:71
+#: ../picard/util/tags.py:72
 msgid "Catalog Number"
 msgstr "N° du catalogue"
 
-#: ../picard/util/tags.py:72
+#: ../picard/util/tags.py:73
 msgid "Format"
 msgstr "Format"
 
-#: ../picard/util/tags.py:73
+#: ../picard/util/tags.py:74
 msgid "DJ-Mixer"
 msgstr "DJ-Mixer"
 
-#: ../picard/util/tags.py:74
+#: ../picard/util/tags.py:75
 msgid "Media"
 msgstr "Média"
 
-#: ../picard/util/tags.py:75
+#: ../picard/util/tags.py:76
 msgid "Lyrics"
 msgstr "Paroles de chanson"
 
-#: ../picard/util/tags.py:76
+#: ../picard/util/tags.py:77
 msgid "Mixer"
 msgstr "Mixeur"
 
-#: ../picard/util/tags.py:77
+#: ../picard/util/tags.py:78
 msgid "Language"
 msgstr "Langue"
 
-#: ../picard/util/tags.py:78
+#: ../picard/util/tags.py:79
 msgid "Script"
 msgstr "Script"
 
@@ -2536,21 +2591,51 @@ msgstr ""
 "\n"
 "%s"
 
-#, python-format
+#~ msgid "Rename Files"
+#~ msgstr "Renommer les fichiers"
+
+#~ msgid "Multiple artist file naming format:"
+#~ msgstr "Format du nom de fichier pour les artistes multiples"
+
+#~ msgid "File naming format:"
+#~ msgstr "Format du nom de fichier :"
+
+#~ msgid "File name:"
+#~ msgstr "Nom de fichier :"
+
+#~ msgid "Multiple artist file name:"
+#~ msgstr "Nom des fichiers aux plusieurs artistes"
+
+#~ msgid "Common"
+#~ msgstr "Commun"
+
+#~ msgid "ID3"
+#~ msgstr "ID3"
+
+#~ 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)"
+
+#~ msgid "Text encoding to use while writing ID3v2 tags:"
+#~ msgstr "Codage de texte pour écrire les étiquettes ID3v2 :"
+
+#~ msgid "APE"
+#~ msgstr "APE"
+
 #~ msgid "[couldn't load album %s]"
 #~ msgstr "Chargement de l'album %s impossible"
 
 #~ msgid "New Version"
 #~ msgstr "Nouvelle Version"
 
-#, python-format
 #~ msgid ""
-#~ "New version of Picard is available (%s). Would you like to download it now?"
+#~ "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 ?"
 
-#, python-format
 #~ msgid "Couldn't find PUID for file %s"
 #~ msgstr "PUID du fichier %s introuvable"
 
@@ -2680,9 +2765,6 @@ msgstr ""
 #~ 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"
 
@@ -2698,9 +2780,6 @@ msgstr ""
 #~ msgid "Proxy port"
 #~ msgstr "Port du Proxy"
 
-#~ msgid "ID3v2.4 only"
-#~ msgstr "ID3v2.4 seulement"
-
 #~ msgid "Save track/album"
 #~ msgstr "Sauver piste/album"
 
@@ -2731,14 +2810,15 @@ msgstr ""
 #~ 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"
-#~ "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. "
+#~ "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 ""
-#~ "Vous n'avez pas indiqué votre nom d'utilisateur et votre mot de passe. Pour "
-#~ "contribuer à la banque de données MusicBrainz, vous devez avoir un compte "
-#~ "MusicBrainz.\n"
+#~ "Vous n'avez pas indiqué votre nom d'utilisateur et votre mot de passe. "
+#~ "Pour contribuer à la banque de données MusicBrainz, vous devez avoir un "
+#~ "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. "
 
@@ -2765,13 +2845,13 @@ msgstr ""
 #~ 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 click the "
-#~ "track and select 'Clear Error'"
+#~ "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 ""
-#~ "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'"
+#~ "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"
@@ -2795,15 +2875,16 @@ msgstr ""
 #~ msgstr "Merci de faire un don à MusicBrainz!"
 
 #~ msgid ""
-#~ "The destination directory %s does not exist. Please pick a valid directory."
+#~ "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"
+#~ "Sélectionnez l'encodage à utiliser pour la lecture et l'écriture des noms "
+#~ "de fichiers"
 
 #~ msgid "Automatically save recognized tracks that are at least"
 #~ msgstr "Sauvegarder automatiquement les pistes reconnues qui ont au moins"
@@ -2811,11 +2892,8 @@ msgstr ""
 #~ 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"
+#~ "Note: vous devez redémarrer l'application pour que tout changement de "
+#~ "cette option soit pris en compte."
 
 #~ msgid "Naming Help"
 #~ msgstr "Aide"
@@ -2867,8 +2945,8 @@ msgstr ""
 
 #~ 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"
+#~ "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"
@@ -2877,11 +2955,11 @@ msgstr ""
 #~ 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. "
+#~ "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. "
+#~ "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"
diff --git a/po/fy.po b/po/fy.po
index 010546bf4..f539f4d8d 100644
--- a/po/fy.po
+++ b/po/fy.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: picard\n"
 "Report-Msgid-Bugs-To: http://bugs.musicbrainz.org/\n"
-"POT-Creation-Date: 2009-02-24 18:58+0100\n"
+"POT-Creation-Date: 2009-04-06 22:50+0200\n"
 "PO-Revision-Date: 2009-01-25 13:55+0000\n"
 "Last-Translator: Philipp Wolfer <Unknown>\n"
 "Language-Team: Frisian <fy@li.org>\n"
@@ -18,16 +18,16 @@ msgstr ""
 "X-Launchpad-Export-Date: 2009-04-06 20:20+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
-#: ../picard/album.py:108 ../picard/cluster.py:248
+#: ../picard/album.py:109 ../picard/cluster.py:248
 msgid "Unmatched Files"
 msgstr ""
 
-#: ../picard/album.py:281
+#: ../picard/album.py:287
 #, python-format
 msgid "[could not load album %s]"
 msgstr ""
 
-#: ../picard/album.py:317
+#: ../picard/album.py:320
 msgid "[loading album information]"
 msgstr ""
 
@@ -587,7 +587,7 @@ msgid "Namibia"
 msgstr ""
 
 #: ../picard/const.py:182
-msgid "Vanuat"
+msgid "Vanuatu"
 msgstr ""
 
 #: ../picard/const.py:183
@@ -1031,223 +1031,234 @@ msgid "Congo, The Democratic Republic of the"
 msgstr ""
 
 #: ../picard/const.py:293
-msgid "Serbia and Montenegro"
+msgid "Serbia and Montenegro (historical, 2003-2006)"
 msgstr ""
 
 #: ../picard/const.py:294
-msgid "Croatia"
+msgid "Serbia"
 msgstr ""
 
 #: ../picard/const.py:295
-msgid "Korea (North), Democratic People's Republic of"
+msgid "Montenegro"
 msgstr ""
 
 #: ../picard/const.py:296
-msgid "Korea (South), Republic of"
+msgid "Croatia"
 msgstr ""
 
 #: ../picard/const.py:297
-msgid "Slovakia"
+msgid "Korea (North), Democratic People's Republic of"
 msgstr ""
 
 #: ../picard/const.py:298
-msgid "Soviet Union (historical, 1922-1991)"
+msgid "Korea (South), Republic of"
 msgstr ""
 
 #: ../picard/const.py:299
-msgid "East Timor"
+msgid "Slovakia"
 msgstr ""
 
 #: ../picard/const.py:300
-msgid "Czechoslovakia (historical, 1918-1992)"
+msgid "Soviet Union (historical, 1922-1991)"
 msgstr ""
 
 #: ../picard/const.py:301
-msgid "Europe"
+msgid "East Timor"
 msgstr ""
 
 #: ../picard/const.py:302
-msgid "East Germany (historical, 1949-1990)"
+msgid "Czechoslovakia (historical, 1918-1992)"
 msgstr ""
 
 #: ../picard/const.py:303
-msgid "[Unknown Country]"
+msgid "Europe"
 msgstr ""
 
 #: ../picard/const.py:304
-msgid "[Worldwide]"
+msgid "East Germany (historical, 1949-1990)"
 msgstr ""
 
 #: ../picard/const.py:305
+msgid "[Unknown Country]"
+msgstr ""
+
+#: ../picard/const.py:306
+msgid "[Worldwide]"
+msgstr ""
+
+#: ../picard/const.py:307
 msgid "Yugoslavia (historical, 1918-1992)"
 msgstr ""
 
-#: ../picard/const.py:310
-msgid "Catalan"
-msgstr ""
-
-#: ../picard/const.py:311
-msgid "Czech"
-msgstr "Tsjechysk"
-
 #: ../picard/const.py:312
-msgid "Welsh"
+msgid "Afrikaans"
 msgstr ""
 
 #: ../picard/const.py:313
-msgid "Danish"
+msgid "Arabic"
 msgstr ""
 
 #: ../picard/const.py:314
-msgid "German"
-msgstr "Dútsk"
+msgid "Catalan"
+msgstr ""
 
 #: ../picard/const.py:315
-msgid "English"
-msgstr "Ingelsk"
+msgid "Czech"
+msgstr "Tsjechysk"
 
 #: ../picard/const.py:316
-msgid "English (Canada)"
+msgid "Welsh"
 msgstr ""
 
 #: ../picard/const.py:317
+msgid "Danish"
+msgstr ""
+
+#: ../picard/const.py:318
+msgid "German"
+msgstr "Dútsk"
+
+#: ../picard/const.py:319
+msgid "English"
+msgstr "Ingelsk"
+
+#: ../picard/const.py:320
+msgid "English (Canada)"
+msgstr ""
+
+#: ../picard/const.py:321
 msgid "English (UK)"
 msgstr "Ingelsk (GB)"
 
-#: ../picard/const.py:318
+#: ../picard/const.py:322
 msgid "Spanish"
 msgstr "Spaansk"
 
-#: ../picard/const.py:319
+#: ../picard/const.py:323
 msgid "Persian"
 msgstr ""
 
-#: ../picard/const.py:320
+#: ../picard/const.py:324
 msgid "Finnish"
 msgstr "Finsk"
 
-#: ../picard/const.py:321
+#: ../picard/const.py:325
 msgid "French"
 msgstr "Frânsk"
 
-#: ../picard/const.py:322
+#: ../picard/const.py:326
 msgid "Frisian"
 msgstr ""
 
-#: ../picard/const.py:323
+#: ../picard/const.py:327
 msgid "Hebrew"
 msgstr ""
 
-#: ../picard/const.py:324
+#: ../picard/const.py:328
+msgid "Hindi"
+msgstr ""
+
+#: ../picard/const.py:329
 msgid "Hungarian"
 msgstr "Hongaarsk"
 
-#: ../picard/const.py:325
+#: ../picard/const.py:330
 msgid "Islandic"
 msgstr ""
 
-#: ../picard/const.py:326
+#: ../picard/const.py:331
 msgid "Italian"
 msgstr "Italjaansk"
 
-#: ../picard/const.py:327
+#: ../picard/const.py:332
 msgid "Kannada"
 msgstr ""
 
-#: ../picard/const.py:328
+#: ../picard/const.py:333
 msgid "Korean"
 msgstr "Koreaansk"
 
-#: ../picard/const.py:329
+#: ../picard/const.py:334
 msgid "Lithuanian"
 msgstr "Litousk"
 
-#: ../picard/const.py:330
+#: ../picard/const.py:335
 msgid "Norwegian Bokmal"
 msgstr ""
 
-#: ../picard/const.py:331
+#: ../picard/const.py:336
 msgid "Dutch"
 msgstr "Nederlânsk"
 
-#: ../picard/const.py:332
+#: ../picard/const.py:337
 msgid "Polish"
 msgstr ""
 
-#: ../picard/const.py:333
+#: ../picard/const.py:338
 msgid "Portuguese"
 msgstr "Portegeesk"
 
-#: ../picard/const.py:334
+#: ../picard/const.py:339
 msgid "Brazilian Portuguese"
 msgstr ""
 
-#: ../picard/const.py:335
+#: ../picard/const.py:340
 msgid "Romanian"
 msgstr "Roemeensk"
 
-#: ../picard/const.py:336
+#: ../picard/const.py:341
 msgid "Russian"
 msgstr "Russysk"
 
-#: ../picard/const.py:337
+#: ../picard/const.py:342
 msgid "Scots"
 msgstr ""
 
-#: ../picard/const.py:338
+#: ../picard/const.py:343
 msgid "Slovak"
 msgstr "Slowaaksk"
 
-#: ../picard/const.py:339
+#: ../picard/const.py:344
 msgid "Slovenian"
 msgstr ""
 
-#: ../picard/const.py:340
+#: ../picard/const.py:345
 msgid "Swedish"
 msgstr "Sweedsk"
 
-#: ../picard/const.py:341
+#: ../picard/const.py:346
+msgid "Turkish"
+msgstr ""
+
+#: ../picard/const.py:347
 msgid "Chinese"
 msgstr ""
 
-#: ../picard/file.py:487
+#: ../picard/file.py:494
 #, python-format
 msgid "No matching tracks for file %s"
 msgstr ""
 
-#: ../picard/file.py:504
+#: ../picard/file.py:511
 #, python-format
 msgid "No matching tracks above the threshold for file %s"
 msgstr ""
 
-#: ../picard/file.py:507
+#: ../picard/file.py:514
 #, python-format
 msgid "File %s identified!"
 msgstr ""
 
-#: ../picard/file.py:518
+#: ../picard/file.py:525
 #, python-format
 msgid "Looking up the PUID for file %s..."
 msgstr ""
 
-#: ../picard/file.py:523
+#: ../picard/file.py:530
 #, 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 ""
@@ -1260,11 +1271,24 @@ msgstr ""
 msgid "XSPF Playlist (*.xspf)"
 msgstr ""
 
-#: ../picard/tagger.py:476
-msgid "CD Lookup Error"
+#: ../picard/puidmanager.py:62
+msgid "Submitting PUIDs..."
+msgstr ""
+
+#: ../picard/puidmanager.py:68
+#, python-format
+msgid "PUIDs submission failed: %s"
+msgstr ""
+
+#: ../picard/puidmanager.py:70
+msgid "PUIDs successfully submitted!"
 msgstr ""
 
 #: ../picard/tagger.py:477
+msgid "CD Lookup Error"
+msgstr ""
+
+#: ../picard/tagger.py:478
 #, python-format
 msgid ""
 "Error while reading CD:\n"
@@ -1272,7 +1296,7 @@ msgid ""
 "%s"
 msgstr ""
 
-#: ../picard/tagger.py:503
+#: ../picard/tagger.py:504
 #, python-format
 msgid "Could not find PUID for file %s"
 msgstr ""
@@ -1325,15 +1349,28 @@ msgstr ""
 msgid "Length"
 msgstr ""
 
-#: ../picard/ui/itemviews.py:327
+#: ../picard/ui/itemviews.py:289
+msgid "&Expand all"
+msgstr ""
+
+#: ../picard/ui/itemviews.py:291
+msgid "&Collapse all"
+msgstr ""
+
+#: ../picard/ui/itemviews.py:332
 msgid "&Releases"
 msgstr ""
 
-#: ../picard/ui/itemviews.py:353
+#: ../picard/ui/itemviews.py:349
+#, fuzzy
+msgid "No release event"
+msgstr "Album útjefte moanne"
+
+#: ../picard/ui/itemviews.py:359
 msgid "&Plugins"
 msgstr ""
 
-#: ../picard/ui/itemviews.py:523
+#: ../picard/ui/itemviews.py:533
 msgid "Clusters"
 msgstr ""
 
@@ -1341,95 +1378,6 @@ msgstr ""
 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:66 ../picard/ui/ui_options_plugins.py:62
-msgid "Details"
-msgstr ""
-
-#: ../picard/ui/tageditor.py:71 ../picard/ui/tageditor.py:264
-#, python-format
-msgid "%d file"
-msgid_plural "%d files"
-msgstr[0] ""
-msgstr[1] ""
-
-#: ../picard/ui/tageditor.py:131
-#, python-format
-msgid "(different across %d file)"
-msgid_plural "(different across %d files)"
-msgstr[0] ""
-msgstr[1] ""
-
-#: ../picard/ui/tageditor.py:134
-#, python-format
-msgid "(missing from %d file)"
-msgid_plural "(missing from %d files)"
-msgstr[0] ""
-msgstr[1] ""
-
-#: ../picard/ui/tageditor.py:233
-msgid "Filename:"
-msgstr ""
-
-#: ../picard/ui/tageditor.py:235
-msgid "Format:"
-msgstr ""
-
-#: ../picard/ui/tageditor.py:244
-msgid "Size:"
-msgstr ""
-
-#: ../picard/ui/tageditor.py:248 ../picard/ui/ui_metadata.py:127
-msgid "Length:"
-msgstr ""
-
-#: ../picard/ui/tageditor.py:250
-msgid "Bitrate:"
-msgstr ""
-
-#: ../picard/ui/tageditor.py:252
-msgid "Sample rate:"
-msgstr ""
-
-#: ../picard/ui/tageditor.py:254
-msgid "Bits per sample:"
-msgstr ""
-
-#: ../picard/ui/tageditor.py:257
-msgid "Mono"
-msgstr ""
-
-#: ../picard/ui/tageditor.py:258
-msgid "Stereo"
-msgstr ""
-
-#: ../picard/ui/tageditor.py:260
-msgid "Channels:"
-msgstr ""
-
-#: ../picard/ui/tagsfromfilenames.py:52 ../picard/ui/tagsfromfilenames.py:96
-msgid "File Name"
-msgstr ""
-
 #: ../picard/ui/mainwindow.py:64
 msgid "MusicBrainz Picard"
 msgstr ""
@@ -1666,6 +1614,10 @@ msgstr ""
 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 ""
@@ -1685,12 +1637,97 @@ msgstr ""
 msgid " (Error: %s)"
 msgstr ""
 
+#: ../picard/ui/puidsubmit.py:31 ../picard/ui/options/plugins.py:85
+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/passworddialog.py:38
 #, python-format
 msgid ""
 "The server %s requires you to login. Please enter your username and password."
 msgstr ""
 
+#: ../picard/ui/tageditor.py:66 ../picard/ui/ui_options_plugins.py:62
+msgid "Details"
+msgstr ""
+
+#: ../picard/ui/tageditor.py:71 ../picard/ui/tageditor.py:264
+#, python-format
+msgid "%d file"
+msgid_plural "%d files"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../picard/ui/tageditor.py:131
+#, python-format
+msgid "(different across %d file)"
+msgid_plural "(different across %d files)"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../picard/ui/tageditor.py:134
+#, python-format
+msgid "(missing from %d file)"
+msgid_plural "(missing from %d files)"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../picard/ui/tageditor.py:233
+msgid "Filename:"
+msgstr ""
+
+#: ../picard/ui/tageditor.py:235
+msgid "Format:"
+msgstr ""
+
+#: ../picard/ui/tageditor.py:244
+msgid "Size:"
+msgstr ""
+
+#: ../picard/ui/tageditor.py:248 ../picard/ui/ui_metadata.py:127
+msgid "Length:"
+msgstr ""
+
+#: ../picard/ui/tageditor.py:250
+msgid "Bitrate:"
+msgstr ""
+
+#: ../picard/ui/tageditor.py:252
+msgid "Sample rate:"
+msgstr ""
+
+#: ../picard/ui/tageditor.py:254
+msgid "Bits per sample:"
+msgstr ""
+
+#: ../picard/ui/tageditor.py:257
+msgid "Mono"
+msgstr ""
+
+#: ../picard/ui/tageditor.py:258
+msgid "Stereo"
+msgstr ""
+
+#: ../picard/ui/tageditor.py:260
+msgid "Channels:"
+msgstr ""
+
+#: ../picard/ui/tagsfromfilenames.py:54 ../picard/ui/tagsfromfilenames.py:99
+msgid "File Name"
+msgstr ""
+
 #: ../picard/ui/ui_cdlookup.py:60 ../picard/ui/ui_options_cdlookup.py:47
 #: ../picard/ui/ui_options_cdlookup_select.py:48
 #: ../picard/ui/options/cdlookup.py:36
@@ -1713,24 +1750,6 @@ msgstr ""
 msgid "Cancel"
 msgstr "Ofbrekke"
 
-#: ../picard/ui/ui_passworddialog.py:78
-msgid "Authentication required"
-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"
-msgstr ""
-
 #: ../picard/ui/ui_edittagdialog.py:44
 msgid "Edit Tag"
 msgstr ""
@@ -1767,6 +1786,10 @@ msgstr ""
 msgid "Options"
 msgstr ""
 
+#: ../picard/ui/ui_puidsubmit.py:52
+msgid "Submit PUIDs"
+msgstr "PUIDs ferstjoere"
+
 #: ../picard/ui/ui_options_cdlookup.py:48
 msgid "CD-ROM device to use for lookups:"
 msgstr ""
@@ -1791,6 +1814,22 @@ msgstr ""
 msgid "Overwrite the file if it already exists"
 msgstr ""
 
+#: ../picard/ui/ui_options_moving.py:53
+msgid "Move additional files:"
+msgstr ""
+
+#: ../picard/ui/ui_options_moving.py:54
+msgid "Browse..."
+msgstr ""
+
+#: ../picard/ui/ui_options_moving.py:55
+msgid "Delete empty directories"
+msgstr ""
+
+#: ../picard/ui/ui_options_moving.py:56
+msgid "Move files to this directory when saving:"
+msgstr ""
+
 #: ../picard/ui/util.py:31
 msgid "&Ok"
 msgstr ""
@@ -1799,44 +1838,40 @@ msgstr ""
 msgid "&Cancel"
 msgstr ""
 
-#: ../picard/ui/ui_puidsubmit.py:52
-msgid "Submit PUIDs"
-msgstr "PUIDs ferstjoere"
-
-#: ../picard/ui/ui_tageditor.py:139 ../picard/ui/ui_options_plugins.py:59
-#: ../picard/ui/options/plugins.py:76
+#: ../picard/ui/ui_tageditor.py:128 ../picard/ui/ui_options_plugins.py:59
+#: ../picard/ui/options/plugins.py:81
 msgid "Name"
 msgstr ""
 
-#: ../picard/ui/ui_tageditor.py:140
+#: ../picard/ui/ui_tageditor.py:129
 msgid "Value"
 msgstr ""
 
-#: ../picard/ui/ui_tageditor.py:141
+#: ../picard/ui/ui_tageditor.py:130
 msgid "Rating:"
 msgstr ""
 
-#: ../picard/ui/ui_tageditor.py:142
+#: ../picard/ui/ui_tageditor.py:131
 msgid "&Add..."
 msgstr ""
 
-#: ../picard/ui/ui_tageditor.py:143
+#: ../picard/ui/ui_tageditor.py:132
 msgid "&Edit..."
 msgstr ""
 
-#: ../picard/ui/ui_tageditor.py:144
+#: ../picard/ui/ui_tageditor.py:133
 msgid "&Delete"
 msgstr ""
 
-#: ../picard/ui/ui_tageditor.py:145
+#: ../picard/ui/ui_tageditor.py:134
 msgid "&Metadata"
 msgstr ""
 
-#: ../picard/ui/ui_tageditor.py:146
+#: ../picard/ui/ui_tageditor.py:135
 msgid "A&rtwork"
 msgstr ""
 
-#: ../picard/ui/ui_tageditor.py:147
+#: ../picard/ui/ui_tageditor.py:136
 msgid "&Info"
 msgstr ""
 
@@ -1881,6 +1916,40 @@ msgstr ""
 msgid ", "
 msgstr ""
 
+#: ../picard/ui/ui_options_general.py:108
+msgid "MusicBrainz Server"
+msgstr ""
+
+#: ../picard/ui/ui_options_general.py:109 ../picard/ui/ui_options_proxy.py:72
+msgid "Port:"
+msgstr ""
+
+#: ../picard/ui/ui_options_general.py:110 ../picard/ui/ui_options_proxy.py:73
+msgid "Server address:"
+msgstr ""
+
+#: ../picard/ui/ui_options_general.py:111
+msgid "Account Information"
+msgstr ""
+
+#: ../picard/ui/ui_options_general.py:112 ../picard/ui/ui_options_proxy.py:70
+#: ../picard/ui/ui_passworddialog.py:80
+msgid "Password:"
+msgstr ""
+
+#: ../picard/ui/ui_options_general.py:113 ../picard/ui/ui_options_proxy.py:71
+#: ../picard/ui/ui_passworddialog.py:79
+msgid "Username:"
+msgstr ""
+
+#: ../picard/ui/ui_options_general.py:114 ../picard/ui/options/general.py:29
+msgid "General"
+msgstr "Algemien"
+
+#: ../picard/ui/ui_options_general.py:115
+msgid "Automatically scan all new files"
+msgstr ""
+
 #: ../picard/ui/ui_options_interface.py:50
 msgid "Miscellaneous"
 msgstr ""
@@ -1901,113 +1970,6 @@ msgstr ""
 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 "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_options_naming.py:180
-#: ../picard/ui/ui_tagsfromfilenames.py:58
-msgid "&Preview"
-msgstr ""
-
-#: ../picard/ui/ui_options_proxy.py:81 ../picard/ui/options/proxy.py:28
-msgid "Web Proxy"
-msgstr "Web Proxy"
-
-#: ../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_options_ratings.py:45
-msgid "Enable track ratings"
-msgstr ""
-
-#: ../picard/ui/ui_options_ratings.py:46
-msgid ""
-"Picard saves the ratings together with an e-mail address identifying the "
-"user who did the rating. That way different ratings for different users can "
-"be stored in the files. Please sepcify the e-mail you want to use to save "
-"your ratings."
-msgstr ""
-
-#: ../picard/ui/ui_options_ratings.py:47
-msgid "E-mail:"
-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 ../picard/ui/options/general.py:29
-msgid "General"
-msgstr "Algemien"
-
-#: ../picard/ui/ui_options_general.py:115
-msgid "Automatically scan all new files"
-msgstr ""
-
 #: ../picard/ui/ui_options_matching.py:105
 msgid "Thresholds"
 msgstr ""
@@ -2064,72 +2026,143 @@ msgstr ""
 msgid "Non-album tracks:"
 msgstr ""
 
-#: ../picard/ui/ui_options_plugins.py:58 ../picard/ui/options/plugins.py:30
+#: ../picard/ui/ui_options_metadata.py:109
+#: ../picard/ui/ui_options_metadata.py:110
+#: ../picard/ui/ui_options_renaming.py:155
+#: ../picard/ui/ui_options_renaming.py:158
+msgid "Default"
+msgstr "Standert"
+
+#: ../picard/ui/ui_options_plugins.py:58 ../picard/ui/options/plugins.py:34
 msgid "Plugins"
 msgstr ""
 
-#: ../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:84
 msgid "Author"
 msgstr ""
 
-#: ../picard/ui/ui_options_plugins.py:61 ../picard/util/tags.py:36
+#: ../picard/ui/ui_options_plugins.py:61 ../picard/util/tags.py:37
 msgid "Version"
 msgstr ""
 
-#: ../picard/ui/ui_options_script.py:52
+#: ../picard/ui/ui_options_proxy.py:69 ../picard/ui/options/proxy.py:28
+msgid "Web Proxy"
+msgstr "Web Proxy"
+
+#: ../picard/ui/ui_options_ratings.py:45
+msgid "Enable track ratings"
+msgstr ""
+
+#: ../picard/ui/ui_options_ratings.py:46
+msgid ""
+"Picard saves the ratings together with an e-mail address identifying the "
+"user who did the rating. That way different ratings for different users can "
+"be stored in the files. Please sepcify the e-mail you want to use to save "
+"your ratings."
+msgstr ""
+
+#: ../picard/ui/ui_options_ratings.py:47
+msgid "E-mail:"
+msgstr ""
+
+#: ../picard/ui/ui_options_renaming.py:145
+msgid "Form"
+msgstr ""
+
+#: ../picard/ui/ui_options_renaming.py:146
+msgid "Rename files when saving"
+msgstr ""
+
+#: ../picard/ui/ui_options_renaming.py:147
+msgid "Replace non-ASCII characters"
+msgstr ""
+
+#: ../picard/ui/ui_options_renaming.py:148
+msgid "Replace Windows-incompatible characters"
+msgstr ""
+
+#: ../picard/ui/ui_options_renaming.py:149
+msgid "Name files like this"
+msgstr ""
+
+#: ../picard/ui/ui_options_renaming.py:156
+msgid "Name multiple artist albums differently"
+msgstr ""
+
+#: ../picard/ui/ui_options_renaming.py:157
+msgid "Copy from above"
+msgstr ""
+
+#: ../picard/ui/ui_options_renaming.py:159
+msgid "Examples"
+msgstr ""
+
+#: ../picard/ui/ui_options_script.py:43
 msgid "Tagger Script"
 msgstr ""
 
-#: ../picard/ui/ui_options_tags.py:85
-msgid "Common"
+#: ../picard/ui/ui_options_tags.py:97
+msgid "Do not write tags to files"
 msgstr ""
 
-#: ../picard/ui/ui_options_tags.py:86
-msgid "Clear existing tags before writing new tags"
+#: ../picard/ui/ui_options_tags.py:98
+msgid "Before tagging"
 msgstr ""
 
-#: ../picard/ui/ui_options_tags.py:87
-msgid "Don not write tags to files"
+#: ../picard/ui/ui_options_tags.py:99
+msgid "Clear existing tags"
 msgstr ""
 
-#: ../picard/ui/ui_options_tags.py:88
-msgid "ID3"
-msgstr ""
-
-#: ../picard/ui/ui_options_tags.py:89
-msgid "Write ID3v1 tags to the files"
-msgstr ""
-
-#: ../picard/ui/ui_options_tags.py:90
-msgid "Write ID3v2 version 2.3 tags (2.4 is default)"
-msgstr ""
-
-#: ../picard/ui/ui_options_tags.py:91
-msgid "Text encoding to use while writing ID3v2 tags:"
-msgstr ""
-
-#: ../picard/ui/ui_options_tags.py:92
-msgid "ISO-8859-1"
-msgstr ""
-
-#: ../picard/ui/ui_options_tags.py:93
-msgid "UTF-16"
-msgstr ""
-
-#: ../picard/ui/ui_options_tags.py:94
-msgid "UTF-8"
-msgstr ""
-
-#: ../picard/ui/ui_options_tags.py:95
+#: ../picard/ui/ui_options_tags.py:100
 msgid "Remove ID3 tags from FLAC files"
 msgstr ""
 
-#: ../picard/ui/ui_options_tags.py:96
-msgid "APE"
+#: ../picard/ui/ui_options_tags.py:101
+msgid "Remove APEv2 tags from MP3 files"
 msgstr ""
 
-#: ../picard/ui/ui_options_tags.py:97
-msgid "Remove APEv2 tags from MP3 files"
+#: ../picard/ui/ui_options_tags.py:102
+msgid "Tag compatibility"
+msgstr ""
+
+#: ../picard/ui/ui_options_tags.py:103
+msgid "ID3v2 version"
+msgstr ""
+
+#: ../picard/ui/ui_options_tags.py:104
+msgid "2.4"
+msgstr ""
+
+#: ../picard/ui/ui_options_tags.py:105
+msgid "2.3"
+msgstr ""
+
+#: ../picard/ui/ui_options_tags.py:106
+msgid "Also include ID3v1 tags in the files"
+msgstr ""
+
+#: ../picard/ui/ui_options_tags.py:107
+msgid "ID3v2 text encoding"
+msgstr ""
+
+#: ../picard/ui/ui_options_tags.py:108
+msgid "UTF-8"
+msgstr ""
+
+#: ../picard/ui/ui_options_tags.py:109
+msgid "UTF-16"
+msgstr ""
+
+#: ../picard/ui/ui_options_tags.py:110
+msgid "ISO-8859-1"
+msgstr ""
+
+#: ../picard/ui/ui_passworddialog.py:78
+msgid "Authentication required"
+msgstr ""
+
+#: ../picard/ui/ui_passworddialog.py:81
+msgid "Save username and password"
 msgstr ""
 
 #: ../picard/ui/ui_tagsfromfilenames.py:56
@@ -2140,6 +2173,10 @@ msgstr ""
 msgid "Replace underscores with spaces"
 msgstr ""
 
+#: ../picard/ui/ui_tagsfromfilenames.py:58
+msgid "&Preview"
+msgstr ""
+
 #: ../picard/ui/options/about.py:29
 msgid "About"
 msgstr "Oer"
@@ -2165,8 +2202,8 @@ 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"
@@ -2174,14 +2211,13 @@ msgid ""
 "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\"><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/P"
-"icardTagger</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
@@ -2214,42 +2250,45 @@ msgstr ""
 msgid "None"
 msgstr ""
 
-#: ../picard/ui/options/naming.py:33
-msgid "File Naming"
-msgstr ""
+#: ../picard/ui/options/moving.py:33
+#, fuzzy
+msgid "Moving files"
+msgstr "Triemmen fersette opsje"
 
-#: ../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 ""
-
-#: ../picard/ui/options/naming.py:95
-msgid "The multiple artist file naming format must not be empty."
-msgstr ""
-
-#: ../picard/ui/options/naming.py:97
+#: ../picard/ui/options/moving.py:65
 msgid "Error"
 msgstr ""
 
-#: ../picard/ui/options/naming.py:97
+#: ../picard/ui/options/moving.py:65
 msgid "The location to move files to must not be empty."
 msgstr ""
 
-#: ../picard/ui/options/scripting.py:63
-msgid "Scripting"
+#: ../picard/ui/options/ratings.py:29
+msgid "Ratings"
 msgstr ""
 
 #: ../picard/ui/options/tags.py:29
 msgid "Tags"
 msgstr ""
 
-#: ../picard/ui/options/ratings.py:29
-msgid "Ratings"
+#: ../picard/ui/options/renaming.py:35
+msgid "File naming"
+msgstr ""
+
+#: ../picard/ui/options/renaming.py:123
+msgid "The file naming format must not be empty."
+msgstr ""
+
+#: ../picard/ui/options/renaming.py:133
+msgid "The multiple artist file naming format must not be empty."
+msgstr ""
+
+#: ../picard/ui/options/scripting.py:63
+msgid "Scripting"
+msgstr ""
+
+#: ../picard/ui/options/scripting.py:97
+msgid "Script Error"
 msgstr ""
 
 #: ../picard/util/tags.py:24
@@ -2257,214 +2296,219 @@ msgid "Date"
 msgstr ""
 
 #: ../picard/util/tags.py:25
+#, fuzzy
+msgid "Original Release Date"
+msgstr "Útjefte dei"
+
+#: ../picard/util/tags.py:26
 msgid "Album Artist"
 msgstr ""
 
-#: ../picard/util/tags.py:26
+#: ../picard/util/tags.py:27
 msgid "Track Number"
 msgstr ""
 
-#: ../picard/util/tags.py:27
+#: ../picard/util/tags.py:28
 msgid "Total Tracks"
 msgstr ""
 
-#: ../picard/util/tags.py:28
+#: ../picard/util/tags.py:29
 msgid "Disc Number"
 msgstr ""
 
-#: ../picard/util/tags.py:29
+#: ../picard/util/tags.py:30
 msgid "Total Discs"
 msgstr ""
 
-#: ../picard/util/tags.py:30
+#: ../picard/util/tags.py:31
 msgid "Album Artist Sort Order"
 msgstr ""
 
-#: ../picard/util/tags.py:31
+#: ../picard/util/tags.py:32
 msgid "Artist Sort Order"
 msgstr ""
 
-#: ../picard/util/tags.py:32
+#: ../picard/util/tags.py:33
 msgid "Title Sort Order"
 msgstr ""
 
-#: ../picard/util/tags.py:33
+#: ../picard/util/tags.py:34
 msgid "Album Sort Order"
 msgstr ""
 
-#: ../picard/util/tags.py:34
+#: ../picard/util/tags.py:35
 msgid "ASIN"
 msgstr ""
 
-#: ../picard/util/tags.py:35
+#: ../picard/util/tags.py:36
 msgid "Grouping"
 msgstr ""
 
-#: ../picard/util/tags.py:37
+#: ../picard/util/tags.py:38
 msgid "ISRC"
 msgstr ""
 
-#: ../picard/util/tags.py:38
+#: ../picard/util/tags.py:39
 msgid "Mood"
 msgstr ""
 
-#: ../picard/util/tags.py:39
+#: ../picard/util/tags.py:40
 msgid "BPM"
 msgstr ""
 
-#: ../picard/util/tags.py:40
+#: ../picard/util/tags.py:41
 msgid "Copyright"
 msgstr ""
 
-#: ../picard/util/tags.py:41
+#: ../picard/util/tags.py:42
 msgid "Composer"
 msgstr ""
 
-#: ../picard/util/tags.py:42
+#: ../picard/util/tags.py:43
 msgid "Conductor"
 msgstr ""
 
-#: ../picard/util/tags.py:43
+#: ../picard/util/tags.py:44
 msgid "Lyricist"
 msgstr ""
 
-#: ../picard/util/tags.py:44
+#: ../picard/util/tags.py:45
 msgid "Arranger"
 msgstr ""
 
-#: ../picard/util/tags.py:45
+#: ../picard/util/tags.py:46
 msgid "Producer"
 msgstr ""
 
-#: ../picard/util/tags.py:46
+#: ../picard/util/tags.py:47
 msgid "Engineer"
 msgstr ""
 
-#: ../picard/util/tags.py:47
+#: ../picard/util/tags.py:48
 msgid "Subtitle"
 msgstr ""
 
-#: ../picard/util/tags.py:48
+#: ../picard/util/tags.py:49
 msgid "Disc Subtitle"
 msgstr ""
 
-#: ../picard/util/tags.py:49
+#: ../picard/util/tags.py:50
 msgid "Remixer"
 msgstr ""
 
-#: ../picard/util/tags.py:50
+#: ../picard/util/tags.py:51
 msgid "MusicBrainz Track Id"
 msgstr ""
 
-#: ../picard/util/tags.py:51
+#: ../picard/util/tags.py:52
 msgid "MusicBrainz Release Id"
 msgstr ""
 
-#: ../picard/util/tags.py:52
+#: ../picard/util/tags.py:53
 msgid "MusicBrainz Artist Id"
 msgstr ""
 
-#: ../picard/util/tags.py:53
+#: ../picard/util/tags.py:54
 msgid "MusicBrainz Release Artist Id"
 msgstr ""
 
-#: ../picard/util/tags.py:54
+#: ../picard/util/tags.py:55
 msgid "MusicBrainz TRM Id"
 msgstr ""
 
-#: ../picard/util/tags.py:55
+#: ../picard/util/tags.py:56
 msgid "MusicBrainz Disc Id"
 msgstr ""
 
-#: ../picard/util/tags.py:56
+#: ../picard/util/tags.py:57
 msgid "MusicBrainz Sort Name"
 msgstr ""
 
-#: ../picard/util/tags.py:57
+#: ../picard/util/tags.py:58
 msgid "MusicIP PUID"
 msgstr ""
 
-#: ../picard/util/tags.py:58
+#: ../picard/util/tags.py:59
 msgid "MusicIP Fingerprint"
 msgstr ""
 
-#: ../picard/util/tags.py:59
+#: ../picard/util/tags.py:60
 msgid "Disc Id"
 msgstr ""
 
-#: ../picard/util/tags.py:60
+#: ../picard/util/tags.py:61
 msgid "Website"
 msgstr ""
 
-#: ../picard/util/tags.py:61
+#: ../picard/util/tags.py:62
 msgid "Compilation"
 msgstr ""
 
-#: ../picard/util/tags.py:62
+#: ../picard/util/tags.py:63
 msgid "Comment"
 msgstr ""
 
-#: ../picard/util/tags.py:63
+#: ../picard/util/tags.py:64
 msgid "Genre"
 msgstr ""
 
-#: ../picard/util/tags.py:64
+#: ../picard/util/tags.py:65
 msgid "Encoded By"
 msgstr ""
 
-#: ../picard/util/tags.py:65
+#: ../picard/util/tags.py:66
 msgid "Performer"
 msgstr ""
 
-#: ../picard/util/tags.py:66
+#: ../picard/util/tags.py:67
 msgid "Release Type"
 msgstr ""
 
-#: ../picard/util/tags.py:67
+#: ../picard/util/tags.py:68
 msgid "Release Status"
 msgstr ""
 
-#: ../picard/util/tags.py:68
+#: ../picard/util/tags.py:69
 msgid "Release Country"
 msgstr ""
 
-#: ../picard/util/tags.py:69
+#: ../picard/util/tags.py:70
 msgid "Record Label"
 msgstr ""
 
-#: ../picard/util/tags.py:70
+#: ../picard/util/tags.py:71
 msgid "Barcode"
 msgstr ""
 
-#: ../picard/util/tags.py:71
+#: ../picard/util/tags.py:72
 msgid "Catalog Number"
 msgstr ""
 
-#: ../picard/util/tags.py:72
+#: ../picard/util/tags.py:73
 msgid "Format"
 msgstr ""
 
-#: ../picard/util/tags.py:73
+#: ../picard/util/tags.py:74
 msgid "DJ-Mixer"
 msgstr ""
 
-#: ../picard/util/tags.py:74
+#: ../picard/util/tags.py:75
 msgid "Media"
 msgstr ""
 
-#: ../picard/util/tags.py:75
+#: ../picard/util/tags.py:76
 msgid "Lyrics"
 msgstr ""
 
-#: ../picard/util/tags.py:76
+#: ../picard/util/tags.py:77
 msgid "Mixer"
 msgstr ""
 
-#: ../picard/util/tags.py:77
+#: ../picard/util/tags.py:78
 msgid "Language"
 msgstr "Taal"
 
-#: ../picard/util/tags.py:78
+#: ../picard/util/tags.py:79
 msgid "Script"
 msgstr ""
 
@@ -2540,9 +2584,6 @@ msgstr ""
 #~ msgid "Track name"
 #~ msgstr "Nûmer namme"
 
-#~ msgid "Album release month"
-#~ msgstr "Album útjefte moanne"
-
 #~ msgid "Album release day"
 #~ msgstr "Album útjefte dei"
 
@@ -2570,9 +2611,6 @@ msgstr ""
 #~ 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"
 
@@ -2582,9 +2620,6 @@ msgstr ""
 #~ 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"
 
diff --git a/po/he.po b/po/he.po
index f452e561b..6596abd63 100644
--- a/po/he.po
+++ b/po/he.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: picard\n"
 "Report-Msgid-Bugs-To: http://bugs.musicbrainz.org/\n"
-"POT-Creation-Date: 2009-02-24 18:58+0100\n"
+"POT-Creation-Date: 2009-04-06 22:50+0200\n"
 "PO-Revision-Date: 2009-01-25 14:05+0000\n"
 "Last-Translator: Philipp Wolfer <Unknown>\n"
 "Language-Team: Hebrew <he@li.org>\n"
@@ -18,16 +18,16 @@ msgstr ""
 "X-Launchpad-Export-Date: 2009-04-06 20:21+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
-#: ../picard/album.py:108 ../picard/cluster.py:248
+#: ../picard/album.py:109 ../picard/cluster.py:248
 msgid "Unmatched Files"
 msgstr "קבצים לא תואמים"
 
-#: ../picard/album.py:281
+#: ../picard/album.py:287
 #, python-format
 msgid "[could not load album %s]"
 msgstr ""
 
-#: ../picard/album.py:317
+#: ../picard/album.py:320
 msgid "[loading album information]"
 msgstr "[טוען את נתוני האלבום]"
 
@@ -587,7 +587,7 @@ msgid "Namibia"
 msgstr ""
 
 #: ../picard/const.py:182
-msgid "Vanuat"
+msgid "Vanuatu"
 msgstr ""
 
 #: ../picard/const.py:183
@@ -1031,223 +1031,234 @@ msgid "Congo, The Democratic Republic of the"
 msgstr ""
 
 #: ../picard/const.py:293
-msgid "Serbia and Montenegro"
+msgid "Serbia and Montenegro (historical, 2003-2006)"
 msgstr ""
 
 #: ../picard/const.py:294
-msgid "Croatia"
+msgid "Serbia"
 msgstr ""
 
 #: ../picard/const.py:295
-msgid "Korea (North), Democratic People's Republic of"
+msgid "Montenegro"
 msgstr ""
 
 #: ../picard/const.py:296
-msgid "Korea (South), Republic of"
+msgid "Croatia"
 msgstr ""
 
 #: ../picard/const.py:297
-msgid "Slovakia"
+msgid "Korea (North), Democratic People's Republic of"
 msgstr ""
 
 #: ../picard/const.py:298
-msgid "Soviet Union (historical, 1922-1991)"
+msgid "Korea (South), Republic of"
 msgstr ""
 
 #: ../picard/const.py:299
-msgid "East Timor"
+msgid "Slovakia"
 msgstr ""
 
 #: ../picard/const.py:300
-msgid "Czechoslovakia (historical, 1918-1992)"
+msgid "Soviet Union (historical, 1922-1991)"
 msgstr ""
 
 #: ../picard/const.py:301
-msgid "Europe"
+msgid "East Timor"
 msgstr ""
 
 #: ../picard/const.py:302
-msgid "East Germany (historical, 1949-1990)"
+msgid "Czechoslovakia (historical, 1918-1992)"
 msgstr ""
 
 #: ../picard/const.py:303
-msgid "[Unknown Country]"
+msgid "Europe"
 msgstr ""
 
 #: ../picard/const.py:304
-msgid "[Worldwide]"
+msgid "East Germany (historical, 1949-1990)"
 msgstr ""
 
 #: ../picard/const.py:305
+msgid "[Unknown Country]"
+msgstr ""
+
+#: ../picard/const.py:306
+msgid "[Worldwide]"
+msgstr ""
+
+#: ../picard/const.py:307
 msgid "Yugoslavia (historical, 1918-1992)"
 msgstr ""
 
-#: ../picard/const.py:310
-msgid "Catalan"
-msgstr ""
-
-#: ../picard/const.py:311
-msgid "Czech"
-msgstr ""
-
 #: ../picard/const.py:312
-msgid "Welsh"
+msgid "Afrikaans"
 msgstr ""
 
 #: ../picard/const.py:313
-msgid "Danish"
+msgid "Arabic"
 msgstr ""
 
 #: ../picard/const.py:314
-msgid "German"
+msgid "Catalan"
 msgstr ""
 
 #: ../picard/const.py:315
-msgid "English"
+msgid "Czech"
 msgstr ""
 
 #: ../picard/const.py:316
-msgid "English (Canada)"
+msgid "Welsh"
 msgstr ""
 
 #: ../picard/const.py:317
-msgid "English (UK)"
+msgid "Danish"
 msgstr ""
 
 #: ../picard/const.py:318
-msgid "Spanish"
+msgid "German"
 msgstr ""
 
 #: ../picard/const.py:319
-msgid "Persian"
+msgid "English"
 msgstr ""
 
 #: ../picard/const.py:320
-msgid "Finnish"
+msgid "English (Canada)"
 msgstr ""
 
 #: ../picard/const.py:321
-msgid "French"
+msgid "English (UK)"
 msgstr ""
 
 #: ../picard/const.py:322
-msgid "Frisian"
+msgid "Spanish"
 msgstr ""
 
 #: ../picard/const.py:323
-msgid "Hebrew"
+msgid "Persian"
 msgstr ""
 
 #: ../picard/const.py:324
-msgid "Hungarian"
+msgid "Finnish"
 msgstr ""
 
 #: ../picard/const.py:325
-msgid "Islandic"
+msgid "French"
 msgstr ""
 
 #: ../picard/const.py:326
-msgid "Italian"
+msgid "Frisian"
 msgstr ""
 
 #: ../picard/const.py:327
-msgid "Kannada"
+msgid "Hebrew"
 msgstr ""
 
 #: ../picard/const.py:328
-msgid "Korean"
+msgid "Hindi"
 msgstr ""
 
 #: ../picard/const.py:329
-msgid "Lithuanian"
+msgid "Hungarian"
 msgstr ""
 
 #: ../picard/const.py:330
-msgid "Norwegian Bokmal"
+msgid "Islandic"
 msgstr ""
 
 #: ../picard/const.py:331
-msgid "Dutch"
+msgid "Italian"
 msgstr ""
 
 #: ../picard/const.py:332
-msgid "Polish"
+msgid "Kannada"
 msgstr ""
 
 #: ../picard/const.py:333
-msgid "Portuguese"
+msgid "Korean"
 msgstr ""
 
 #: ../picard/const.py:334
-msgid "Brazilian Portuguese"
+msgid "Lithuanian"
 msgstr ""
 
 #: ../picard/const.py:335
-msgid "Romanian"
+msgid "Norwegian Bokmal"
 msgstr ""
 
 #: ../picard/const.py:336
-msgid "Russian"
+msgid "Dutch"
 msgstr ""
 
 #: ../picard/const.py:337
-msgid "Scots"
+msgid "Polish"
 msgstr ""
 
 #: ../picard/const.py:338
-msgid "Slovak"
+msgid "Portuguese"
 msgstr ""
 
 #: ../picard/const.py:339
-msgid "Slovenian"
+msgid "Brazilian Portuguese"
 msgstr ""
 
 #: ../picard/const.py:340
-msgid "Swedish"
+msgid "Romanian"
 msgstr ""
 
 #: ../picard/const.py:341
+msgid "Russian"
+msgstr ""
+
+#: ../picard/const.py:342
+msgid "Scots"
+msgstr ""
+
+#: ../picard/const.py:343
+msgid "Slovak"
+msgstr ""
+
+#: ../picard/const.py:344
+msgid "Slovenian"
+msgstr ""
+
+#: ../picard/const.py:345
+msgid "Swedish"
+msgstr ""
+
+#: ../picard/const.py:346
+msgid "Turkish"
+msgstr ""
+
+#: ../picard/const.py:347
 msgid "Chinese"
 msgstr ""
 
-#: ../picard/file.py:487
+#: ../picard/file.py:494
 #, python-format
 msgid "No matching tracks for file %s"
 msgstr "לא נמצאו רצועות תואמות עבור הקובץ %s"
 
-#: ../picard/file.py:504
+#: ../picard/file.py:511
 #, python-format
 msgid "No matching tracks above the threshold for file %s"
 msgstr ""
 
-#: ../picard/file.py:507
+#: ../picard/file.py:514
 #, python-format
 msgid "File %s identified!"
 msgstr "הקובץ %s זוהה!"
 
-#: ../picard/file.py:518
+#: ../picard/file.py:525
 #, python-format
 msgid "Looking up the PUID for file %s..."
 msgstr "מחפש את ה-PUID עבור הקובץ %s..."
 
-#: ../picard/file.py:523
+#: ../picard/file.py:530
 #, 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)"
@@ -1260,11 +1271,24 @@ msgstr "רשימת השמעה PLS (*.pls)"
 msgid "XSPF Playlist (*.xspf)"
 msgstr "רשימת השמעה XSPF (*.xspf)"
 
-#: ../picard/tagger.py:476
+#: ../picard/puidmanager.py:62
+msgid "Submitting PUIDs..."
+msgstr "שולח מזהי PUID..."
+
+#: ../picard/puidmanager.py:68
+#, python-format
+msgid "PUIDs submission failed: %s"
+msgstr "שלחית מזהי ה-PUID נכשלה: %s"
+
+#: ../picard/puidmanager.py:70
+msgid "PUIDs successfully submitted!"
+msgstr "מזהי ה-PUID נשלחו בהצלחה!"
+
+#: ../picard/tagger.py:477
 msgid "CD Lookup Error"
 msgstr "שגיאת חיפוש תקליטור"
 
-#: ../picard/tagger.py:477
+#: ../picard/tagger.py:478
 #, python-format
 msgid ""
 "Error while reading CD:\n"
@@ -1275,7 +1299,7 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../picard/tagger.py:503
+#: ../picard/tagger.py:504
 #, python-format
 msgid "Could not find PUID for file %s"
 msgstr ""
@@ -1328,15 +1352,27 @@ msgstr ""
 msgid "Length"
 msgstr "משך"
 
-#: ../picard/ui/itemviews.py:327
+#: ../picard/ui/itemviews.py:289
+msgid "&Expand all"
+msgstr ""
+
+#: ../picard/ui/itemviews.py:291
+msgid "&Collapse all"
+msgstr ""
+
+#: ../picard/ui/itemviews.py:332
 msgid "&Releases"
 msgstr "ה&פצות"
 
-#: ../picard/ui/itemviews.py:353
+#: ../picard/ui/itemviews.py:349
+msgid "No release event"
+msgstr ""
+
+#: ../picard/ui/itemviews.py:359
 msgid "&Plugins"
 msgstr "&תוספים"
 
-#: ../picard/ui/itemviews.py:523
+#: ../picard/ui/itemviews.py:533
 msgid "Clusters"
 msgstr "אשכולות"
 
@@ -1344,95 +1380,6 @@ msgstr "אשכולות"
 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:66 ../picard/ui/ui_options_plugins.py:62
-msgid "Details"
-msgstr "פרטים"
-
-#: ../picard/ui/tageditor.py:71 ../picard/ui/tageditor.py:264
-#, python-format
-msgid "%d file"
-msgid_plural "%d files"
-msgstr[0] "קובץ %d"
-msgstr[1] "%d קבצים"
-
-#: ../picard/ui/tageditor.py:131
-#, python-format
-msgid "(different across %d file)"
-msgid_plural "(different across %d files)"
-msgstr[0] "(משתנה לאורך קובץ %d)"
-msgstr[1] "(משתנה לאורך %d קבצים)"
-
-#: ../picard/ui/tageditor.py:134
-#, python-format
-msgid "(missing from %d file)"
-msgid_plural "(missing from %d files)"
-msgstr[0] "(חסר מקובץ %d)"
-msgstr[1] "(חסר מ-%d קבצים)"
-
-#: ../picard/ui/tageditor.py:233
-msgid "Filename:"
-msgstr "שם הקובץ:"
-
-#: ../picard/ui/tageditor.py:235
-msgid "Format:"
-msgstr "תבנית:"
-
-#: ../picard/ui/tageditor.py:244
-msgid "Size:"
-msgstr "גודל:"
-
-#: ../picard/ui/tageditor.py:248 ../picard/ui/ui_metadata.py:127
-msgid "Length:"
-msgstr "משך:"
-
-#: ../picard/ui/tageditor.py:250
-msgid "Bitrate:"
-msgstr "קצב סיביות:"
-
-#: ../picard/ui/tageditor.py:252
-msgid "Sample rate:"
-msgstr "קצב דגימה:"
-
-#: ../picard/ui/tageditor.py:254
-msgid "Bits per sample:"
-msgstr "סיביות לדגימה:"
-
-#: ../picard/ui/tageditor.py:257
-msgid "Mono"
-msgstr "מונו"
-
-#: ../picard/ui/tageditor.py:258
-msgid "Stereo"
-msgstr "סטריאו"
-
-#: ../picard/ui/tageditor.py:260
-msgid "Channels:"
-msgstr "ערוצים:"
-
-#: ../picard/ui/tagsfromfilenames.py:52 ../picard/ui/tagsfromfilenames.py:96
-msgid "File Name"
-msgstr "שם הקובץ"
-
 #: ../picard/ui/mainwindow.py:64
 msgid "MusicBrainz Picard"
 msgstr "MusicBrainz Picard"
@@ -1669,6 +1616,10 @@ msgstr "סרגל ה&חיפוש"
 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 "כל סוגי הקבצים הנתמכים"
@@ -1688,12 +1639,97 @@ msgstr "רשימת ההשמעה %s נשמרה"
 msgid " (Error: %s)"
 msgstr " (שגיאה: %s)"
 
+#: ../picard/ui/puidsubmit.py:31 ../picard/ui/options/plugins.py:85
+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/passworddialog.py:38
 #, python-format
 msgid ""
 "The server %s requires you to login. Please enter your username and password."
 msgstr ""
 
+#: ../picard/ui/tageditor.py:66 ../picard/ui/ui_options_plugins.py:62
+msgid "Details"
+msgstr "פרטים"
+
+#: ../picard/ui/tageditor.py:71 ../picard/ui/tageditor.py:264
+#, python-format
+msgid "%d file"
+msgid_plural "%d files"
+msgstr[0] "קובץ %d"
+msgstr[1] "%d קבצים"
+
+#: ../picard/ui/tageditor.py:131
+#, python-format
+msgid "(different across %d file)"
+msgid_plural "(different across %d files)"
+msgstr[0] "(משתנה לאורך קובץ %d)"
+msgstr[1] "(משתנה לאורך %d קבצים)"
+
+#: ../picard/ui/tageditor.py:134
+#, python-format
+msgid "(missing from %d file)"
+msgid_plural "(missing from %d files)"
+msgstr[0] "(חסר מקובץ %d)"
+msgstr[1] "(חסר מ-%d קבצים)"
+
+#: ../picard/ui/tageditor.py:233
+msgid "Filename:"
+msgstr "שם הקובץ:"
+
+#: ../picard/ui/tageditor.py:235
+msgid "Format:"
+msgstr "תבנית:"
+
+#: ../picard/ui/tageditor.py:244
+msgid "Size:"
+msgstr "גודל:"
+
+#: ../picard/ui/tageditor.py:248 ../picard/ui/ui_metadata.py:127
+msgid "Length:"
+msgstr "משך:"
+
+#: ../picard/ui/tageditor.py:250
+msgid "Bitrate:"
+msgstr "קצב סיביות:"
+
+#: ../picard/ui/tageditor.py:252
+msgid "Sample rate:"
+msgstr "קצב דגימה:"
+
+#: ../picard/ui/tageditor.py:254
+msgid "Bits per sample:"
+msgstr "סיביות לדגימה:"
+
+#: ../picard/ui/tageditor.py:257
+msgid "Mono"
+msgstr "מונו"
+
+#: ../picard/ui/tageditor.py:258
+msgid "Stereo"
+msgstr "סטריאו"
+
+#: ../picard/ui/tageditor.py:260
+msgid "Channels:"
+msgstr "ערוצים:"
+
+#: ../picard/ui/tagsfromfilenames.py:54 ../picard/ui/tagsfromfilenames.py:99
+msgid "File Name"
+msgstr "שם הקובץ"
+
 #: ../picard/ui/ui_cdlookup.py:60 ../picard/ui/ui_options_cdlookup.py:47
 #: ../picard/ui/ui_options_cdlookup_select.py:48
 #: ../picard/ui/options/cdlookup.py:36
@@ -1716,24 +1752,6 @@ msgstr "    חיפוש ידני    "
 msgid "Cancel"
 msgstr "ביטול"
 
-#: ../picard/ui/ui_passworddialog.py:78
-msgid "Authentication required"
-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"
-msgstr ""
-
 #: ../picard/ui/ui_edittagdialog.py:44
 msgid "Edit Tag"
 msgstr "ערוך תגית"
@@ -1770,6 +1788,10 @@ msgstr "אלבום:"
 msgid "Options"
 msgstr "אפשרויות"
 
+#: ../picard/ui/ui_puidsubmit.py:52
+msgid "Submit PUIDs"
+msgstr "שלח מזהי PUID"
+
 #: ../picard/ui/ui_options_cdlookup.py:48
 msgid "CD-ROM device to use for lookups:"
 msgstr "התקן התקליטורים המשמש לחיפושים:"
@@ -1794,6 +1816,23 @@ msgstr "שמור את תמונות העטיפה כקבצים נפרדים"
 msgid "Overwrite the file if it already exists"
 msgstr "שכתב על הקובץ במידה והוא כבר קיים"
 
+#: ../picard/ui/ui_options_moving.py:53
+msgid "Move additional files:"
+msgstr "העבר קבצים נוספים:"
+
+#: ../picard/ui/ui_options_moving.py:54
+msgid "Browse..."
+msgstr "עיון..."
+
+#: ../picard/ui/ui_options_moving.py:55
+msgid "Delete empty directories"
+msgstr "מחק תיקיות ריקות"
+
+#: ../picard/ui/ui_options_moving.py:56
+#, fuzzy
+msgid "Move files to this directory when saving:"
+msgstr "העבר קבצים מתוייגים לתיקייה זו:"
+
 #: ../picard/ui/util.py:31
 msgid "&Ok"
 msgstr "&אישור"
@@ -1802,44 +1841,40 @@ msgstr "&אישור"
 msgid "&Cancel"
 msgstr "&ביטול"
 
-#: ../picard/ui/ui_puidsubmit.py:52
-msgid "Submit PUIDs"
-msgstr "שלח מזהי PUID"
-
-#: ../picard/ui/ui_tageditor.py:139 ../picard/ui/ui_options_plugins.py:59
-#: ../picard/ui/options/plugins.py:76
+#: ../picard/ui/ui_tageditor.py:128 ../picard/ui/ui_options_plugins.py:59
+#: ../picard/ui/options/plugins.py:81
 msgid "Name"
 msgstr "שם"
 
-#: ../picard/ui/ui_tageditor.py:140
+#: ../picard/ui/ui_tageditor.py:129
 msgid "Value"
 msgstr "ערך"
 
-#: ../picard/ui/ui_tageditor.py:141
+#: ../picard/ui/ui_tageditor.py:130
 msgid "Rating:"
 msgstr ""
 
-#: ../picard/ui/ui_tageditor.py:142
+#: ../picard/ui/ui_tageditor.py:131
 msgid "&Add..."
 msgstr "הו&ספה..."
 
-#: ../picard/ui/ui_tageditor.py:143
+#: ../picard/ui/ui_tageditor.py:132
 msgid "&Edit..."
 msgstr "ע&ריכה..."
 
-#: ../picard/ui/ui_tageditor.py:144
+#: ../picard/ui/ui_tageditor.py:133
 msgid "&Delete"
 msgstr "&מחק"
 
-#: ../picard/ui/ui_tageditor.py:145
+#: ../picard/ui/ui_tageditor.py:134
 msgid "&Metadata"
 msgstr "&נתוני-מטא"
 
-#: ../picard/ui/ui_tageditor.py:146
+#: ../picard/ui/ui_tageditor.py:135
 msgid "A&rtwork"
 msgstr "או&מנות"
 
-#: ../picard/ui/ui_tageditor.py:147
+#: ../picard/ui/ui_tageditor.py:136
 msgid "&Info"
 msgstr "&מידע"
 
@@ -1884,6 +1919,40 @@ msgstr " / "
 msgid ", "
 msgstr ", "
 
+#: ../picard/ui/ui_options_general.py:108
+msgid "MusicBrainz Server"
+msgstr "שרת MusicBrainz"
+
+#: ../picard/ui/ui_options_general.py:109 ../picard/ui/ui_options_proxy.py:72
+msgid "Port:"
+msgstr "פתחה:"
+
+#: ../picard/ui/ui_options_general.py:110 ../picard/ui/ui_options_proxy.py:73
+msgid "Server address:"
+msgstr "כתובת השרת:"
+
+#: ../picard/ui/ui_options_general.py:111
+msgid "Account Information"
+msgstr "פרטי החשבון"
+
+#: ../picard/ui/ui_options_general.py:112 ../picard/ui/ui_options_proxy.py:70
+#: ../picard/ui/ui_passworddialog.py:80
+msgid "Password:"
+msgstr "סיסמה:"
+
+#: ../picard/ui/ui_options_general.py:113 ../picard/ui/ui_options_proxy.py:71
+#: ../picard/ui/ui_passworddialog.py:79
+msgid "Username:"
+msgstr "שם משתמש:"
+
+#: ../picard/ui/ui_options_general.py:114 ../picard/ui/options/general.py:29
+msgid "General"
+msgstr "כללי"
+
+#: ../picard/ui/ui_options_general.py:115
+msgid "Automatically scan all new files"
+msgstr "סרוק אוטומטית את כל הקבצים החדשים"
+
 #: ../picard/ui/ui_options_interface.py:50
 msgid "Miscellaneous"
 msgstr "שונות"
@@ -1904,113 +1973,6 @@ msgstr "השתמש בתחביר שאילתות מתקדם"
 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 "&תצוגה מקדימה"
-
-#: ../picard/ui/ui_options_proxy.py:81 ../picard/ui/options/proxy.py:28
-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_options_ratings.py:45
-msgid "Enable track ratings"
-msgstr ""
-
-#: ../picard/ui/ui_options_ratings.py:46
-msgid ""
-"Picard saves the ratings together with an e-mail address identifying the "
-"user who did the rating. That way different ratings for different users can "
-"be stored in the files. Please sepcify the e-mail you want to use to save "
-"your ratings."
-msgstr ""
-
-#: ../picard/ui/ui_options_ratings.py:47
-msgid "E-mail:"
-msgstr ""
-
-#: ../picard/ui/ui_options_general.py:108
-msgid "MusicBrainz Server"
-msgstr "שרת MusicBrainz"
-
-#: ../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 "כללי"
-
-#: ../picard/ui/ui_options_general.py:115
-msgid "Automatically scan all new files"
-msgstr "סרוק אוטומטית את כל הקבצים החדשים"
-
 #: ../picard/ui/ui_options_matching.py:105
 msgid "Thresholds"
 msgstr "ערכי סף"
@@ -2067,74 +2029,152 @@ msgstr "מגוון אמנים:"
 msgid "Non-album tracks:"
 msgstr "רצועות ללא-אלבום:"
 
-#: ../picard/ui/ui_options_plugins.py:58 ../picard/ui/options/plugins.py:30
+#: ../picard/ui/ui_options_metadata.py:109
+#: ../picard/ui/ui_options_metadata.py:110
+#: ../picard/ui/ui_options_renaming.py:155
+#: ../picard/ui/ui_options_renaming.py:158
+msgid "Default"
+msgstr "ברירת מחדל"
+
+#: ../picard/ui/ui_options_plugins.py:58 ../picard/ui/options/plugins.py:34
 msgid "Plugins"
 msgstr "תוספים"
 
-#: ../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:84
 msgid "Author"
 msgstr "מחבר"
 
-#: ../picard/ui/ui_options_plugins.py:61 ../picard/util/tags.py:36
+#: ../picard/ui/ui_options_plugins.py:61 ../picard/util/tags.py:37
 msgid "Version"
 msgstr "גירסה"
 
-#: ../picard/ui/ui_options_script.py:52
+#: ../picard/ui/ui_options_proxy.py:69 ../picard/ui/options/proxy.py:28
+msgid "Web Proxy"
+msgstr "מתווך רשת"
+
+#: ../picard/ui/ui_options_ratings.py:45
+msgid "Enable track ratings"
+msgstr ""
+
+#: ../picard/ui/ui_options_ratings.py:46
+msgid ""
+"Picard saves the ratings together with an e-mail address identifying the "
+"user who did the rating. That way different ratings for different users can "
+"be stored in the files. Please sepcify the e-mail you want to use to save "
+"your ratings."
+msgstr ""
+
+#: ../picard/ui/ui_options_ratings.py:47
+msgid "E-mail:"
+msgstr ""
+
+#: ../picard/ui/ui_options_renaming.py:145
+#, fuzzy
+msgid "Form"
+msgstr "תבנית:"
+
+#: ../picard/ui/ui_options_renaming.py:146
+#, fuzzy
+msgid "Rename files when saving"
+msgstr "שנה את שמות הקבצים"
+
+#: ../picard/ui/ui_options_renaming.py:147
+msgid "Replace non-ASCII characters"
+msgstr "החלף תווים שאינם ASCII"
+
+#: ../picard/ui/ui_options_renaming.py:148
+msgid "Replace Windows-incompatible characters"
+msgstr "החלף תווים שאינם נתמכים על ידי Windows"
+
+#: ../picard/ui/ui_options_renaming.py:149
+msgid "Name files like this"
+msgstr ""
+
+#: ../picard/ui/ui_options_renaming.py:156
+msgid "Name multiple artist albums differently"
+msgstr ""
+
+#: ../picard/ui/ui_options_renaming.py:157
+msgid "Copy from above"
+msgstr ""
+
+#: ../picard/ui/ui_options_renaming.py:159
+#, fuzzy
+msgid "Examples"
+msgstr "דוגמה"
+
+#: ../picard/ui/ui_options_script.py:43
 msgid "Tagger Script"
 msgstr "סקריפט תיוג"
 
-#: ../picard/ui/ui_options_tags.py:85
-msgid "Common"
-msgstr "משותף"
+#: ../picard/ui/ui_options_tags.py:97
+#, fuzzy
+msgid "Do not write tags to files"
+msgstr "אל תכתוב תגיות לקבצים"
 
-#: ../picard/ui/ui_options_tags.py:86
-msgid "Clear existing tags before writing new tags"
-msgstr "נקה תגיות קיימות לפני כתיבת תגיות חדשות"
-
-#: ../picard/ui/ui_options_tags.py:87
-msgid "Don not write tags to files"
+#: ../picard/ui/ui_options_tags.py:98
+msgid "Before tagging"
 msgstr ""
 
-#: ../picard/ui/ui_options_tags.py:88
-msgid "ID3"
-msgstr "ID3"
+#: ../picard/ui/ui_options_tags.py:99
+#, fuzzy
+msgid "Clear existing tags"
+msgstr "נקה תגיות קיימות לפני כתיבת תגיות חדשות"
 
-#: ../picard/ui/ui_options_tags.py:89
-msgid "Write ID3v1 tags to the files"
-msgstr "כתוב תגיות ID3v1 לקבצים"
-
-#: ../picard/ui/ui_options_tags.py:90
-msgid "Write ID3v2 version 2.3 tags (2.4 is default)"
-msgstr "כתוב תגיות ID3v2 גירסה 2.3 (ברירת המחדל היא 2.4)"
-
-#: ../picard/ui/ui_options_tags.py:91
-msgid "Text encoding to use while writing ID3v2 tags:"
-msgstr "קידוד הטקסט בו יש להשתמש בעת כתיבת תגיות ID3v2:"
-
-#: ../picard/ui/ui_options_tags.py:92
-msgid "ISO-8859-1"
-msgstr "ISO-8859-1"
-
-#: ../picard/ui/ui_options_tags.py:93
-msgid "UTF-16"
-msgstr "UTF-16"
-
-#: ../picard/ui/ui_options_tags.py:94
-msgid "UTF-8"
-msgstr "UTF-8"
-
-#: ../picard/ui/ui_options_tags.py:95
+#: ../picard/ui/ui_options_tags.py:100
 msgid "Remove ID3 tags from FLAC files"
 msgstr "הסר תגיות ID3 מקבצי FLAC"
 
-#: ../picard/ui/ui_options_tags.py:96
-msgid "APE"
-msgstr "APE"
-
-#: ../picard/ui/ui_options_tags.py:97
+#: ../picard/ui/ui_options_tags.py:101
 msgid "Remove APEv2 tags from MP3 files"
 msgstr "הסר תגיות APEv2 מקבצי MP3"
 
+#: ../picard/ui/ui_options_tags.py:102
+msgid "Tag compatibility"
+msgstr ""
+
+#: ../picard/ui/ui_options_tags.py:103
+#, fuzzy
+msgid "ID3v2 version"
+msgstr "גירסה"
+
+#: ../picard/ui/ui_options_tags.py:104
+msgid "2.4"
+msgstr ""
+
+#: ../picard/ui/ui_options_tags.py:105
+msgid "2.3"
+msgstr ""
+
+#: ../picard/ui/ui_options_tags.py:106
+#, fuzzy
+msgid "Also include ID3v1 tags in the files"
+msgstr "כתוב תגיות ID3v1 לקבצים"
+
+#: ../picard/ui/ui_options_tags.py:107
+msgid "ID3v2 text encoding"
+msgstr ""
+
+#: ../picard/ui/ui_options_tags.py:108
+msgid "UTF-8"
+msgstr "UTF-8"
+
+#: ../picard/ui/ui_options_tags.py:109
+msgid "UTF-16"
+msgstr "UTF-16"
+
+#: ../picard/ui/ui_options_tags.py:110
+msgid "ISO-8859-1"
+msgstr "ISO-8859-1"
+
+#: ../picard/ui/ui_passworddialog.py:78
+msgid "Authentication required"
+msgstr ""
+
+#: ../picard/ui/ui_passworddialog.py:81
+msgid "Save username and password"
+msgstr ""
+
 #: ../picard/ui/ui_tagsfromfilenames.py:56
 msgid "Convert File Names to Tags"
 msgstr "המר את שמות הקבצים לתגיות"
@@ -2143,6 +2183,10 @@ msgstr "המר את שמות הקבצים לתגיות"
 msgid "Replace underscores with spaces"
 msgstr "החלף קווים תחתיים ברווחים"
 
+#: ../picard/ui/ui_tagsfromfilenames.py:58
+msgid "&Preview"
+msgstr "&תצוגה מקדימה"
+
 #: ../picard/ui/options/about.py:29
 msgid "About"
 msgstr "אודות"
@@ -2166,8 +2210,8 @@ msgstr "<br/>Translated to Hebrew 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"
@@ -2175,14 +2219,13 @@ msgid ""
 "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\"><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/P"
-"icardTagger</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
@@ -2215,257 +2258,266 @@ msgstr "תואמים"
 msgid "None"
 msgstr ""
 
-#: ../picard/ui/options/naming.py:33
-msgid "File Naming"
-msgstr "מתן שמות לקבצים"
+#: ../picard/ui/options/moving.py:33
+#, fuzzy
+msgid "Moving files"
+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 ""
-
-#: ../picard/ui/options/naming.py:95
-msgid "The multiple artist file naming format must not be empty."
-msgstr ""
-
-#: ../picard/ui/options/naming.py:97
+#: ../picard/ui/options/moving.py:65
 msgid "Error"
 msgstr ""
 
-#: ../picard/ui/options/naming.py:97
+#: ../picard/ui/options/moving.py:65
 msgid "The location to move files to must not be empty."
 msgstr ""
 
+#: ../picard/ui/options/ratings.py:29
+msgid "Ratings"
+msgstr ""
+
+#: ../picard/ui/options/tags.py:29
+msgid "Tags"
+msgstr "תגיות"
+
+#: ../picard/ui/options/renaming.py:35
+#, fuzzy
+msgid "File naming"
+msgstr "מתן שמות לקבצים"
+
+#: ../picard/ui/options/renaming.py:123
+msgid "The file naming format must not be empty."
+msgstr ""
+
+#: ../picard/ui/options/renaming.py:133
+msgid "The multiple artist file naming format must not be empty."
+msgstr ""
+
 #: ../picard/ui/options/scripting.py:63
 msgid "Scripting"
 msgstr "יצירת סקריפט"
 
-#: ../picard/ui/options/tags.py:29
-msgid "Tags"
-msgstr "תגיות"
-
-#: ../picard/ui/options/ratings.py:29
-msgid "Ratings"
-msgstr ""
+#: ../picard/ui/options/scripting.py:97
+msgid "Script Error"
+msgstr "שגיאת סקריפט"
 
 #: ../picard/util/tags.py:24
 msgid "Date"
 msgstr "תאריך"
 
 #: ../picard/util/tags.py:25
+#, fuzzy
+msgid "Original Release Date"
+msgstr "נתוני מטא מקוריים"
+
+#: ../picard/util/tags.py:26
 msgid "Album Artist"
 msgstr "יוצר האלבום"
 
-#: ../picard/util/tags.py:26
+#: ../picard/util/tags.py:27
 msgid "Track Number"
 msgstr "מספר הרצועה"
 
-#: ../picard/util/tags.py:27
+#: ../picard/util/tags.py:28
 msgid "Total Tracks"
 msgstr "סך כל הרצועות"
 
-#: ../picard/util/tags.py:28
+#: ../picard/util/tags.py:29
 msgid "Disc Number"
 msgstr "תקליטור מספר"
 
-#: ../picard/util/tags.py:29
+#: ../picard/util/tags.py:30
 msgid "Total Discs"
 msgstr "סך כל התקליטורים"
 
-#: ../picard/util/tags.py:30
+#: ../picard/util/tags.py:31
 msgid "Album Artist Sort Order"
 msgstr "צורת סידור אלבומי האומן"
 
-#: ../picard/util/tags.py:31
+#: ../picard/util/tags.py:32
 msgid "Artist Sort Order"
 msgstr "צורת סידור האומנים"
 
-#: ../picard/util/tags.py:32
+#: ../picard/util/tags.py:33
 msgid "Title Sort Order"
 msgstr "צורת סידור הכותרות"
 
-#: ../picard/util/tags.py:33
+#: ../picard/util/tags.py:34
 msgid "Album Sort Order"
 msgstr "צורת סידור האלבומים"
 
-#: ../picard/util/tags.py:34
+#: ../picard/util/tags.py:35
 msgid "ASIN"
 msgstr "ASIN"
 
-#: ../picard/util/tags.py:35
+#: ../picard/util/tags.py:36
 msgid "Grouping"
 msgstr "קיבוץ"
 
-#: ../picard/util/tags.py:37
+#: ../picard/util/tags.py:38
 msgid "ISRC"
 msgstr "ISRC"
 
-#: ../picard/util/tags.py:38
+#: ../picard/util/tags.py:39
 msgid "Mood"
 msgstr "אווירה"
 
-#: ../picard/util/tags.py:39
+#: ../picard/util/tags.py:40
 msgid "BPM"
 msgstr "BPM"
 
-#: ../picard/util/tags.py:40
+#: ../picard/util/tags.py:41
 msgid "Copyright"
 msgstr "זכויות יוצרים"
 
-#: ../picard/util/tags.py:41
+#: ../picard/util/tags.py:42
 msgid "Composer"
 msgstr "מלחין"
 
-#: ../picard/util/tags.py:42
+#: ../picard/util/tags.py:43
 msgid "Conductor"
 msgstr "מנצח"
 
-#: ../picard/util/tags.py:43
+#: ../picard/util/tags.py:44
 msgid "Lyricist"
 msgstr "כותב המילים"
 
-#: ../picard/util/tags.py:44
+#: ../picard/util/tags.py:45
 msgid "Arranger"
 msgstr "מסדר"
 
-#: ../picard/util/tags.py:45
+#: ../picard/util/tags.py:46
 msgid "Producer"
 msgstr "מפיק"
 
-#: ../picard/util/tags.py:46
+#: ../picard/util/tags.py:47
 msgid "Engineer"
 msgstr "מהנדס"
 
-#: ../picard/util/tags.py:47
+#: ../picard/util/tags.py:48
 msgid "Subtitle"
 msgstr "כתובית"
 
-#: ../picard/util/tags.py:48
+#: ../picard/util/tags.py:49
 msgid "Disc Subtitle"
 msgstr "כתובית התקליטור"
 
-#: ../picard/util/tags.py:49
+#: ../picard/util/tags.py:50
 msgid "Remixer"
 msgstr "מערבל"
 
-#: ../picard/util/tags.py:50
+#: ../picard/util/tags.py:51
 msgid "MusicBrainz Track Id"
 msgstr "מזהה רצועה ב-MusicBrainz"
 
-#: ../picard/util/tags.py:51
+#: ../picard/util/tags.py:52
 msgid "MusicBrainz Release Id"
 msgstr "מזהה מהדורה של MusicBrainz"
 
-#: ../picard/util/tags.py:52
+#: ../picard/util/tags.py:53
 msgid "MusicBrainz Artist Id"
 msgstr "מזהה אמן ב-MusicBrainz"
 
-#: ../picard/util/tags.py:53
+#: ../picard/util/tags.py:54
 msgid "MusicBrainz Release Artist Id"
 msgstr "מזהה מהדורת אמן ב-MusicBrainz"
 
-#: ../picard/util/tags.py:54
+#: ../picard/util/tags.py:55
 msgid "MusicBrainz TRM Id"
 msgstr "מזהה TRM ב-MusicBrainz"
 
-#: ../picard/util/tags.py:55
+#: ../picard/util/tags.py:56
 msgid "MusicBrainz Disc Id"
 msgstr ""
 
-#: ../picard/util/tags.py:56
+#: ../picard/util/tags.py:57
 msgid "MusicBrainz Sort Name"
 msgstr ""
 
-#: ../picard/util/tags.py:57
+#: ../picard/util/tags.py:58
 msgid "MusicIP PUID"
 msgstr "מזהה PUID של MusicIP"
 
-#: ../picard/util/tags.py:58
+#: ../picard/util/tags.py:59
 msgid "MusicIP Fingerprint"
 msgstr "טביעת אצבע של MusicIP"
 
-#: ../picard/util/tags.py:59
+#: ../picard/util/tags.py:60
 msgid "Disc Id"
 msgstr ""
 
-#: ../picard/util/tags.py:60
+#: ../picard/util/tags.py:61
 msgid "Website"
 msgstr "אתר הבית"
 
-#: ../picard/util/tags.py:61
+#: ../picard/util/tags.py:62
 msgid "Compilation"
 msgstr "אריזה (הידור)"
 
-#: ../picard/util/tags.py:62
+#: ../picard/util/tags.py:63
 msgid "Comment"
 msgstr "הערה"
 
-#: ../picard/util/tags.py:63
+#: ../picard/util/tags.py:64
 msgid "Genre"
 msgstr "סגנון"
 
-#: ../picard/util/tags.py:64
+#: ../picard/util/tags.py:65
 msgid "Encoded By"
 msgstr "קודד על ידי"
 
-#: ../picard/util/tags.py:65
+#: ../picard/util/tags.py:66
 msgid "Performer"
 msgstr "מבצע"
 
-#: ../picard/util/tags.py:66
+#: ../picard/util/tags.py:67
 msgid "Release Type"
 msgstr "סוג המהדורה"
 
-#: ../picard/util/tags.py:67
+#: ../picard/util/tags.py:68
 msgid "Release Status"
 msgstr "מצב המהדורה"
 
-#: ../picard/util/tags.py:68
+#: ../picard/util/tags.py:69
 msgid "Release Country"
 msgstr "מדינת המהדורה"
 
-#: ../picard/util/tags.py:69
+#: ../picard/util/tags.py:70
 msgid "Record Label"
 msgstr "מותג ההקלטות"
 
-#: ../picard/util/tags.py:70
+#: ../picard/util/tags.py:71
 msgid "Barcode"
 msgstr "ברקוד"
 
-#: ../picard/util/tags.py:71
+#: ../picard/util/tags.py:72
 msgid "Catalog Number"
 msgstr "מספר סידורי"
 
-#: ../picard/util/tags.py:72
+#: ../picard/util/tags.py:73
 msgid "Format"
 msgstr ""
 
-#: ../picard/util/tags.py:73
+#: ../picard/util/tags.py:74
 msgid "DJ-Mixer"
 msgstr "DJ-Mixer"
 
-#: ../picard/util/tags.py:74
+#: ../picard/util/tags.py:75
 msgid "Media"
 msgstr "מדיה"
 
-#: ../picard/util/tags.py:75
+#: ../picard/util/tags.py:76
 msgid "Lyrics"
 msgstr "מילות השיר"
 
-#: ../picard/util/tags.py:76
+#: ../picard/util/tags.py:77
 msgid "Mixer"
 msgstr "מערבל"
 
-#: ../picard/util/tags.py:77
+#: ../picard/util/tags.py:78
 msgid "Language"
 msgstr ""
 
-#: ../picard/util/tags.py:78
+#: ../picard/util/tags.py:79
 msgid "Script"
 msgstr ""
 
@@ -2484,25 +2536,47 @@ msgstr ""
 "\n"
 "%s"
 
-#, python-format
+#~ msgid "Multiple artist file naming format:"
+#~ msgstr "מבנה שמות הקבצים בעלי מספר אמנים:"
+
+#~ msgid "File naming format:"
+#~ msgstr "מבנה שם הקובץ:"
+
+#~ msgid "File name:"
+#~ msgstr "שם הקובץ:"
+
+#~ msgid "Multiple artist file name:"
+#~ msgstr "שם הקובץ בעל כמה אמנים:"
+
+#~ msgid "Common"
+#~ msgstr "משותף"
+
+#~ msgid "ID3"
+#~ msgstr "ID3"
+
+#~ msgid "Write ID3v2 version 2.3 tags (2.4 is default)"
+#~ msgstr "כתוב תגיות ID3v2 גירסה 2.3 (ברירת המחדל היא 2.4)"
+
+#~ msgid "Text encoding to use while writing ID3v2 tags:"
+#~ msgstr "קידוד הטקסט בו יש להשתמש בעת כתיבת תגיות ID3v2:"
+
+#~ msgid "APE"
+#~ msgstr "APE"
+
 #~ msgid "[couldn't load album %s]"
 #~ msgstr "[לא ניתן לטעון את האלבום %s]"
 
 #~ msgid "New Version"
 #~ msgstr "גירסה חדשה"
 
-#, python-format
 #~ msgid ""
-#~ "New version of Picard is available (%s). Would you like to download it now?"
+#~ "New version of Picard is available (%s). Would you like to download it "
+#~ "now?"
 #~ msgstr "קיימת גירסה חדשה של פיקארד (%s). האם ברצונך להוריד אותה כעת?"
 
-#, python-format
 #~ msgid "Couldn't find PUID for file %s"
 #~ msgstr "לא ניתן למצוא את ה-PUID עבור הקובץ %s"
 
-#~ msgid "Don't write tags to files"
-#~ msgstr "אל תכתוב תגיות לקבצים"
-
 #~ msgid "Delete"
 #~ msgstr "מחק"
 
diff --git a/po/hi.po b/po/hi.po
index 14acfd41c..13f1db941 100644
--- a/po/hi.po
+++ b/po/hi.po
@@ -6,8 +6,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: picard\n"
-"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2009-02-24 18:58+0100\n"
+"Report-Msgid-Bugs-To: http://bugs.musicbrainz.org/\n"
+"POT-Creation-Date: 2009-04-06 22:50+0200\n"
 "PO-Revision-Date: 2009-04-04 01:27+0000\n"
 "Last-Translator: Neetesh Biswas <Unknown>\n"
 "Language-Team: Hindi <hi@li.org>\n"
@@ -18,16 +18,16 @@ msgstr ""
 "X-Launchpad-Export-Date: 2009-04-06 20:20+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
-#: ../picard/album.py:108 ../picard/cluster.py:248
+#: ../picard/album.py:109 ../picard/cluster.py:248
 msgid "Unmatched Files"
 msgstr ""
 
-#: ../picard/album.py:281
+#: ../picard/album.py:287
 #, python-format
 msgid "[could not load album %s]"
 msgstr "[एलबम नहीं किया जा सका %s]"
 
-#: ../picard/album.py:317
+#: ../picard/album.py:320
 msgid "[loading album information]"
 msgstr ""
 
@@ -587,7 +587,7 @@ msgid "Namibia"
 msgstr ""
 
 #: ../picard/const.py:182
-msgid "Vanuat"
+msgid "Vanuatu"
 msgstr ""
 
 #: ../picard/const.py:183
@@ -1031,223 +1031,237 @@ msgid "Congo, The Democratic Republic of the"
 msgstr ""
 
 #: ../picard/const.py:293
-msgid "Serbia and Montenegro"
+msgid "Serbia and Montenegro (historical, 2003-2006)"
 msgstr ""
 
 #: ../picard/const.py:294
-msgid "Croatia"
-msgstr ""
+#, fuzzy
+msgid "Serbia"
+msgstr "जॉर्जिया"
 
 #: ../picard/const.py:295
-msgid "Korea (North), Democratic People's Republic of"
+msgid "Montenegro"
 msgstr ""
 
 #: ../picard/const.py:296
-msgid "Korea (South), Republic of"
+msgid "Croatia"
 msgstr ""
 
 #: ../picard/const.py:297
-msgid "Slovakia"
+msgid "Korea (North), Democratic People's Republic of"
 msgstr ""
 
 #: ../picard/const.py:298
-msgid "Soviet Union (historical, 1922-1991)"
+msgid "Korea (South), Republic of"
 msgstr ""
 
 #: ../picard/const.py:299
-msgid "East Timor"
+msgid "Slovakia"
 msgstr ""
 
 #: ../picard/const.py:300
-msgid "Czechoslovakia (historical, 1918-1992)"
+msgid "Soviet Union (historical, 1922-1991)"
 msgstr ""
 
 #: ../picard/const.py:301
-msgid "Europe"
+msgid "East Timor"
 msgstr ""
 
 #: ../picard/const.py:302
-msgid "East Germany (historical, 1949-1990)"
+msgid "Czechoslovakia (historical, 1918-1992)"
 msgstr ""
 
 #: ../picard/const.py:303
-msgid "[Unknown Country]"
+msgid "Europe"
 msgstr ""
 
 #: ../picard/const.py:304
-msgid "[Worldwide]"
+msgid "East Germany (historical, 1949-1990)"
 msgstr ""
 
 #: ../picard/const.py:305
+msgid "[Unknown Country]"
+msgstr ""
+
+#: ../picard/const.py:306
+msgid "[Worldwide]"
+msgstr ""
+
+#: ../picard/const.py:307
 msgid "Yugoslavia (historical, 1918-1992)"
 msgstr ""
 
-#: ../picard/const.py:310
-msgid "Catalan"
-msgstr ""
-
-#: ../picard/const.py:311
-msgid "Czech"
-msgstr ""
-
 #: ../picard/const.py:312
-msgid "Welsh"
+msgid "Afrikaans"
 msgstr ""
 
 #: ../picard/const.py:313
-msgid "Danish"
+msgid "Arabic"
 msgstr ""
 
 #: ../picard/const.py:314
-msgid "German"
+msgid "Catalan"
 msgstr ""
 
 #: ../picard/const.py:315
-msgid "English"
+msgid "Czech"
 msgstr ""
 
 #: ../picard/const.py:316
-msgid "English (Canada)"
+msgid "Welsh"
 msgstr ""
 
 #: ../picard/const.py:317
-msgid "English (UK)"
+msgid "Danish"
 msgstr ""
 
 #: ../picard/const.py:318
-msgid "Spanish"
+msgid "German"
 msgstr ""
 
 #: ../picard/const.py:319
-msgid "Persian"
+msgid "English"
 msgstr ""
 
 #: ../picard/const.py:320
-msgid "Finnish"
+msgid "English (Canada)"
 msgstr ""
 
 #: ../picard/const.py:321
-msgid "French"
+msgid "English (UK)"
 msgstr ""
 
 #: ../picard/const.py:322
-msgid "Frisian"
+msgid "Spanish"
 msgstr ""
 
 #: ../picard/const.py:323
-msgid "Hebrew"
+msgid "Persian"
 msgstr ""
 
 #: ../picard/const.py:324
-msgid "Hungarian"
+msgid "Finnish"
 msgstr ""
 
 #: ../picard/const.py:325
-msgid "Islandic"
+msgid "French"
 msgstr ""
 
 #: ../picard/const.py:326
-msgid "Italian"
+msgid "Frisian"
 msgstr ""
 
 #: ../picard/const.py:327
-msgid "Kannada"
+msgid "Hebrew"
 msgstr ""
 
 #: ../picard/const.py:328
-msgid "Korean"
-msgstr ""
+#, fuzzy
+msgid "Hindi"
+msgstr "हाइती"
 
 #: ../picard/const.py:329
-msgid "Lithuanian"
+msgid "Hungarian"
 msgstr ""
 
 #: ../picard/const.py:330
-msgid "Norwegian Bokmal"
+msgid "Islandic"
 msgstr ""
 
 #: ../picard/const.py:331
-msgid "Dutch"
+msgid "Italian"
 msgstr ""
 
 #: ../picard/const.py:332
-msgid "Polish"
+msgid "Kannada"
 msgstr ""
 
 #: ../picard/const.py:333
-msgid "Portuguese"
+msgid "Korean"
 msgstr ""
 
 #: ../picard/const.py:334
-msgid "Brazilian Portuguese"
+msgid "Lithuanian"
 msgstr ""
 
 #: ../picard/const.py:335
-msgid "Romanian"
+msgid "Norwegian Bokmal"
 msgstr ""
 
 #: ../picard/const.py:336
-msgid "Russian"
+msgid "Dutch"
 msgstr ""
 
 #: ../picard/const.py:337
-msgid "Scots"
+msgid "Polish"
 msgstr ""
 
 #: ../picard/const.py:338
-msgid "Slovak"
+msgid "Portuguese"
 msgstr ""
 
 #: ../picard/const.py:339
-msgid "Slovenian"
+msgid "Brazilian Portuguese"
 msgstr ""
 
 #: ../picard/const.py:340
-msgid "Swedish"
+msgid "Romanian"
 msgstr ""
 
 #: ../picard/const.py:341
+msgid "Russian"
+msgstr ""
+
+#: ../picard/const.py:342
+msgid "Scots"
+msgstr ""
+
+#: ../picard/const.py:343
+msgid "Slovak"
+msgstr ""
+
+#: ../picard/const.py:344
+msgid "Slovenian"
+msgstr ""
+
+#: ../picard/const.py:345
+msgid "Swedish"
+msgstr ""
+
+#: ../picard/const.py:346
+#, fuzzy
+msgid "Turkish"
+msgstr "तुर्कमेनिस्तान"
+
+#: ../picard/const.py:347
 msgid "Chinese"
 msgstr ""
 
-#: ../picard/file.py:487
+#: ../picard/file.py:494
 #, python-format
 msgid "No matching tracks for file %s"
 msgstr ""
 
-#: ../picard/file.py:504
+#: ../picard/file.py:511
 #, python-format
 msgid "No matching tracks above the threshold for file %s"
 msgstr ""
 
-#: ../picard/file.py:507
+#: ../picard/file.py:514
 #, python-format
 msgid "File %s identified!"
 msgstr ""
 
-#: ../picard/file.py:518
+#: ../picard/file.py:525
 #, python-format
 msgid "Looking up the PUID for file %s..."
 msgstr ""
 
-#: ../picard/file.py:523
+#: ../picard/file.py:530
 #, 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 ""
@@ -1260,11 +1274,24 @@ msgstr ""
 msgid "XSPF Playlist (*.xspf)"
 msgstr ""
 
-#: ../picard/tagger.py:476
-msgid "CD Lookup Error"
+#: ../picard/puidmanager.py:62
+msgid "Submitting PUIDs..."
+msgstr ""
+
+#: ../picard/puidmanager.py:68
+#, python-format
+msgid "PUIDs submission failed: %s"
+msgstr ""
+
+#: ../picard/puidmanager.py:70
+msgid "PUIDs successfully submitted!"
 msgstr ""
 
 #: ../picard/tagger.py:477
+msgid "CD Lookup Error"
+msgstr ""
+
+#: ../picard/tagger.py:478
 #, python-format
 msgid ""
 "Error while reading CD:\n"
@@ -1272,7 +1299,7 @@ msgid ""
 "%s"
 msgstr ""
 
-#: ../picard/tagger.py:503
+#: ../picard/tagger.py:504
 #, python-format
 msgid "Could not find PUID for file %s"
 msgstr ""
@@ -1325,15 +1352,27 @@ msgstr ""
 msgid "Length"
 msgstr ""
 
-#: ../picard/ui/itemviews.py:327
+#: ../picard/ui/itemviews.py:289
+msgid "&Expand all"
+msgstr ""
+
+#: ../picard/ui/itemviews.py:291
+msgid "&Collapse all"
+msgstr ""
+
+#: ../picard/ui/itemviews.py:332
 msgid "&Releases"
 msgstr ""
 
-#: ../picard/ui/itemviews.py:353
+#: ../picard/ui/itemviews.py:349
+msgid "No release event"
+msgstr ""
+
+#: ../picard/ui/itemviews.py:359
 msgid "&Plugins"
 msgstr ""
 
-#: ../picard/ui/itemviews.py:523
+#: ../picard/ui/itemviews.py:533
 msgid "Clusters"
 msgstr ""
 
@@ -1341,95 +1380,6 @@ msgstr ""
 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:66 ../picard/ui/ui_options_plugins.py:62
-msgid "Details"
-msgstr ""
-
-#: ../picard/ui/tageditor.py:71 ../picard/ui/tageditor.py:264
-#, python-format
-msgid "%d file"
-msgid_plural "%d files"
-msgstr[0] ""
-msgstr[1] ""
-
-#: ../picard/ui/tageditor.py:131
-#, python-format
-msgid "(different across %d file)"
-msgid_plural "(different across %d files)"
-msgstr[0] ""
-msgstr[1] ""
-
-#: ../picard/ui/tageditor.py:134
-#, python-format
-msgid "(missing from %d file)"
-msgid_plural "(missing from %d files)"
-msgstr[0] ""
-msgstr[1] ""
-
-#: ../picard/ui/tageditor.py:233
-msgid "Filename:"
-msgstr ""
-
-#: ../picard/ui/tageditor.py:235
-msgid "Format:"
-msgstr ""
-
-#: ../picard/ui/tageditor.py:244
-msgid "Size:"
-msgstr ""
-
-#: ../picard/ui/tageditor.py:248 ../picard/ui/ui_metadata.py:127
-msgid "Length:"
-msgstr ""
-
-#: ../picard/ui/tageditor.py:250
-msgid "Bitrate:"
-msgstr ""
-
-#: ../picard/ui/tageditor.py:252
-msgid "Sample rate:"
-msgstr ""
-
-#: ../picard/ui/tageditor.py:254
-msgid "Bits per sample:"
-msgstr ""
-
-#: ../picard/ui/tageditor.py:257
-msgid "Mono"
-msgstr ""
-
-#: ../picard/ui/tageditor.py:258
-msgid "Stereo"
-msgstr ""
-
-#: ../picard/ui/tageditor.py:260
-msgid "Channels:"
-msgstr ""
-
-#: ../picard/ui/tagsfromfilenames.py:52 ../picard/ui/tagsfromfilenames.py:96
-msgid "File Name"
-msgstr ""
-
 #: ../picard/ui/mainwindow.py:64
 msgid "MusicBrainz Picard"
 msgstr ""
@@ -1666,6 +1616,10 @@ msgstr ""
 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 ""
@@ -1685,12 +1639,97 @@ msgstr ""
 msgid " (Error: %s)"
 msgstr ""
 
+#: ../picard/ui/puidsubmit.py:31 ../picard/ui/options/plugins.py:85
+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/passworddialog.py:38
 #, python-format
 msgid ""
 "The server %s requires you to login. Please enter your username and password."
 msgstr ""
 
+#: ../picard/ui/tageditor.py:66 ../picard/ui/ui_options_plugins.py:62
+msgid "Details"
+msgstr ""
+
+#: ../picard/ui/tageditor.py:71 ../picard/ui/tageditor.py:264
+#, python-format
+msgid "%d file"
+msgid_plural "%d files"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../picard/ui/tageditor.py:131
+#, python-format
+msgid "(different across %d file)"
+msgid_plural "(different across %d files)"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../picard/ui/tageditor.py:134
+#, python-format
+msgid "(missing from %d file)"
+msgid_plural "(missing from %d files)"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../picard/ui/tageditor.py:233
+msgid "Filename:"
+msgstr ""
+
+#: ../picard/ui/tageditor.py:235
+msgid "Format:"
+msgstr ""
+
+#: ../picard/ui/tageditor.py:244
+msgid "Size:"
+msgstr ""
+
+#: ../picard/ui/tageditor.py:248 ../picard/ui/ui_metadata.py:127
+msgid "Length:"
+msgstr ""
+
+#: ../picard/ui/tageditor.py:250
+msgid "Bitrate:"
+msgstr ""
+
+#: ../picard/ui/tageditor.py:252
+msgid "Sample rate:"
+msgstr ""
+
+#: ../picard/ui/tageditor.py:254
+msgid "Bits per sample:"
+msgstr ""
+
+#: ../picard/ui/tageditor.py:257
+msgid "Mono"
+msgstr ""
+
+#: ../picard/ui/tageditor.py:258
+msgid "Stereo"
+msgstr ""
+
+#: ../picard/ui/tageditor.py:260
+msgid "Channels:"
+msgstr ""
+
+#: ../picard/ui/tagsfromfilenames.py:54 ../picard/ui/tagsfromfilenames.py:99
+msgid "File Name"
+msgstr ""
+
 #: ../picard/ui/ui_cdlookup.py:60 ../picard/ui/ui_options_cdlookup.py:47
 #: ../picard/ui/ui_options_cdlookup_select.py:48
 #: ../picard/ui/options/cdlookup.py:36
@@ -1713,24 +1752,6 @@ msgstr ""
 msgid "Cancel"
 msgstr ""
 
-#: ../picard/ui/ui_passworddialog.py:78
-msgid "Authentication required"
-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"
-msgstr ""
-
 #: ../picard/ui/ui_edittagdialog.py:44
 msgid "Edit Tag"
 msgstr ""
@@ -1767,6 +1788,10 @@ msgstr ""
 msgid "Options"
 msgstr ""
 
+#: ../picard/ui/ui_puidsubmit.py:52
+msgid "Submit PUIDs"
+msgstr ""
+
 #: ../picard/ui/ui_options_cdlookup.py:48
 msgid "CD-ROM device to use for lookups:"
 msgstr ""
@@ -1791,6 +1816,22 @@ msgstr ""
 msgid "Overwrite the file if it already exists"
 msgstr ""
 
+#: ../picard/ui/ui_options_moving.py:53
+msgid "Move additional files:"
+msgstr ""
+
+#: ../picard/ui/ui_options_moving.py:54
+msgid "Browse..."
+msgstr ""
+
+#: ../picard/ui/ui_options_moving.py:55
+msgid "Delete empty directories"
+msgstr ""
+
+#: ../picard/ui/ui_options_moving.py:56
+msgid "Move files to this directory when saving:"
+msgstr ""
+
 #: ../picard/ui/util.py:31
 msgid "&Ok"
 msgstr ""
@@ -1799,44 +1840,40 @@ msgstr ""
 msgid "&Cancel"
 msgstr ""
 
-#: ../picard/ui/ui_puidsubmit.py:52
-msgid "Submit PUIDs"
-msgstr ""
-
-#: ../picard/ui/ui_tageditor.py:139 ../picard/ui/ui_options_plugins.py:59
-#: ../picard/ui/options/plugins.py:76
+#: ../picard/ui/ui_tageditor.py:128 ../picard/ui/ui_options_plugins.py:59
+#: ../picard/ui/options/plugins.py:81
 msgid "Name"
 msgstr ""
 
-#: ../picard/ui/ui_tageditor.py:140
+#: ../picard/ui/ui_tageditor.py:129
 msgid "Value"
 msgstr ""
 
-#: ../picard/ui/ui_tageditor.py:141
+#: ../picard/ui/ui_tageditor.py:130
 msgid "Rating:"
 msgstr ""
 
-#: ../picard/ui/ui_tageditor.py:142
+#: ../picard/ui/ui_tageditor.py:131
 msgid "&Add..."
 msgstr ""
 
-#: ../picard/ui/ui_tageditor.py:143
+#: ../picard/ui/ui_tageditor.py:132
 msgid "&Edit..."
 msgstr ""
 
-#: ../picard/ui/ui_tageditor.py:144
+#: ../picard/ui/ui_tageditor.py:133
 msgid "&Delete"
 msgstr ""
 
-#: ../picard/ui/ui_tageditor.py:145
+#: ../picard/ui/ui_tageditor.py:134
 msgid "&Metadata"
 msgstr ""
 
-#: ../picard/ui/ui_tageditor.py:146
+#: ../picard/ui/ui_tageditor.py:135
 msgid "A&rtwork"
 msgstr ""
 
-#: ../picard/ui/ui_tageditor.py:147
+#: ../picard/ui/ui_tageditor.py:136
 msgid "&Info"
 msgstr ""
 
@@ -1881,6 +1918,40 @@ msgstr ""
 msgid ", "
 msgstr ""
 
+#: ../picard/ui/ui_options_general.py:108
+msgid "MusicBrainz Server"
+msgstr ""
+
+#: ../picard/ui/ui_options_general.py:109 ../picard/ui/ui_options_proxy.py:72
+msgid "Port:"
+msgstr ""
+
+#: ../picard/ui/ui_options_general.py:110 ../picard/ui/ui_options_proxy.py:73
+msgid "Server address:"
+msgstr ""
+
+#: ../picard/ui/ui_options_general.py:111
+msgid "Account Information"
+msgstr ""
+
+#: ../picard/ui/ui_options_general.py:112 ../picard/ui/ui_options_proxy.py:70
+#: ../picard/ui/ui_passworddialog.py:80
+msgid "Password:"
+msgstr ""
+
+#: ../picard/ui/ui_options_general.py:113 ../picard/ui/ui_options_proxy.py:71
+#: ../picard/ui/ui_passworddialog.py:79
+msgid "Username:"
+msgstr ""
+
+#: ../picard/ui/ui_options_general.py:114 ../picard/ui/options/general.py:29
+msgid "General"
+msgstr ""
+
+#: ../picard/ui/ui_options_general.py:115
+msgid "Automatically scan all new files"
+msgstr ""
+
 #: ../picard/ui/ui_options_interface.py:50
 msgid "Miscellaneous"
 msgstr ""
@@ -1901,113 +1972,6 @@ msgstr ""
 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_options_naming.py:180
-#: ../picard/ui/ui_tagsfromfilenames.py:58
-msgid "&Preview"
-msgstr ""
-
-#: ../picard/ui/ui_options_proxy.py:81 ../picard/ui/options/proxy.py:28
-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_options_ratings.py:45
-msgid "Enable track ratings"
-msgstr ""
-
-#: ../picard/ui/ui_options_ratings.py:46
-msgid ""
-"Picard saves the ratings together with an e-mail address identifying the "
-"user who did the rating. That way different ratings for different users can "
-"be stored in the files. Please sepcify the e-mail you want to use to save "
-"your ratings."
-msgstr ""
-
-#: ../picard/ui/ui_options_ratings.py:47
-msgid "E-mail:"
-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 ../picard/ui/options/general.py:29
-msgid "General"
-msgstr ""
-
-#: ../picard/ui/ui_options_general.py:115
-msgid "Automatically scan all new files"
-msgstr ""
-
 #: ../picard/ui/ui_options_matching.py:105
 msgid "Thresholds"
 msgstr ""
@@ -2064,72 +2028,143 @@ msgstr ""
 msgid "Non-album tracks:"
 msgstr ""
 
-#: ../picard/ui/ui_options_plugins.py:58 ../picard/ui/options/plugins.py:30
+#: ../picard/ui/ui_options_metadata.py:109
+#: ../picard/ui/ui_options_metadata.py:110
+#: ../picard/ui/ui_options_renaming.py:155
+#: ../picard/ui/ui_options_renaming.py:158
+msgid "Default"
+msgstr ""
+
+#: ../picard/ui/ui_options_plugins.py:58 ../picard/ui/options/plugins.py:34
 msgid "Plugins"
 msgstr ""
 
-#: ../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:84
 msgid "Author"
 msgstr ""
 
-#: ../picard/ui/ui_options_plugins.py:61 ../picard/util/tags.py:36
+#: ../picard/ui/ui_options_plugins.py:61 ../picard/util/tags.py:37
 msgid "Version"
 msgstr ""
 
-#: ../picard/ui/ui_options_script.py:52
+#: ../picard/ui/ui_options_proxy.py:69 ../picard/ui/options/proxy.py:28
+msgid "Web Proxy"
+msgstr ""
+
+#: ../picard/ui/ui_options_ratings.py:45
+msgid "Enable track ratings"
+msgstr ""
+
+#: ../picard/ui/ui_options_ratings.py:46
+msgid ""
+"Picard saves the ratings together with an e-mail address identifying the "
+"user who did the rating. That way different ratings for different users can "
+"be stored in the files. Please sepcify the e-mail you want to use to save "
+"your ratings."
+msgstr ""
+
+#: ../picard/ui/ui_options_ratings.py:47
+msgid "E-mail:"
+msgstr ""
+
+#: ../picard/ui/ui_options_renaming.py:145
+msgid "Form"
+msgstr ""
+
+#: ../picard/ui/ui_options_renaming.py:146
+msgid "Rename files when saving"
+msgstr ""
+
+#: ../picard/ui/ui_options_renaming.py:147
+msgid "Replace non-ASCII characters"
+msgstr ""
+
+#: ../picard/ui/ui_options_renaming.py:148
+msgid "Replace Windows-incompatible characters"
+msgstr ""
+
+#: ../picard/ui/ui_options_renaming.py:149
+msgid "Name files like this"
+msgstr ""
+
+#: ../picard/ui/ui_options_renaming.py:156
+msgid "Name multiple artist albums differently"
+msgstr ""
+
+#: ../picard/ui/ui_options_renaming.py:157
+msgid "Copy from above"
+msgstr ""
+
+#: ../picard/ui/ui_options_renaming.py:159
+msgid "Examples"
+msgstr ""
+
+#: ../picard/ui/ui_options_script.py:43
 msgid "Tagger Script"
 msgstr ""
 
-#: ../picard/ui/ui_options_tags.py:85
-msgid "Common"
+#: ../picard/ui/ui_options_tags.py:97
+msgid "Do not write tags to files"
 msgstr ""
 
-#: ../picard/ui/ui_options_tags.py:86
-msgid "Clear existing tags before writing new tags"
+#: ../picard/ui/ui_options_tags.py:98
+msgid "Before tagging"
 msgstr ""
 
-#: ../picard/ui/ui_options_tags.py:87
-msgid "Don not write tags to files"
+#: ../picard/ui/ui_options_tags.py:99
+msgid "Clear existing tags"
 msgstr ""
 
-#: ../picard/ui/ui_options_tags.py:88
-msgid "ID3"
-msgstr ""
-
-#: ../picard/ui/ui_options_tags.py:89
-msgid "Write ID3v1 tags to the files"
-msgstr ""
-
-#: ../picard/ui/ui_options_tags.py:90
-msgid "Write ID3v2 version 2.3 tags (2.4 is default)"
-msgstr ""
-
-#: ../picard/ui/ui_options_tags.py:91
-msgid "Text encoding to use while writing ID3v2 tags:"
-msgstr ""
-
-#: ../picard/ui/ui_options_tags.py:92
-msgid "ISO-8859-1"
-msgstr ""
-
-#: ../picard/ui/ui_options_tags.py:93
-msgid "UTF-16"
-msgstr ""
-
-#: ../picard/ui/ui_options_tags.py:94
-msgid "UTF-8"
-msgstr ""
-
-#: ../picard/ui/ui_options_tags.py:95
+#: ../picard/ui/ui_options_tags.py:100
 msgid "Remove ID3 tags from FLAC files"
 msgstr ""
 
-#: ../picard/ui/ui_options_tags.py:96
-msgid "APE"
+#: ../picard/ui/ui_options_tags.py:101
+msgid "Remove APEv2 tags from MP3 files"
 msgstr ""
 
-#: ../picard/ui/ui_options_tags.py:97
-msgid "Remove APEv2 tags from MP3 files"
+#: ../picard/ui/ui_options_tags.py:102
+msgid "Tag compatibility"
+msgstr ""
+
+#: ../picard/ui/ui_options_tags.py:103
+msgid "ID3v2 version"
+msgstr ""
+
+#: ../picard/ui/ui_options_tags.py:104
+msgid "2.4"
+msgstr ""
+
+#: ../picard/ui/ui_options_tags.py:105
+msgid "2.3"
+msgstr ""
+
+#: ../picard/ui/ui_options_tags.py:106
+msgid "Also include ID3v1 tags in the files"
+msgstr ""
+
+#: ../picard/ui/ui_options_tags.py:107
+msgid "ID3v2 text encoding"
+msgstr ""
+
+#: ../picard/ui/ui_options_tags.py:108
+msgid "UTF-8"
+msgstr ""
+
+#: ../picard/ui/ui_options_tags.py:109
+msgid "UTF-16"
+msgstr ""
+
+#: ../picard/ui/ui_options_tags.py:110
+msgid "ISO-8859-1"
+msgstr ""
+
+#: ../picard/ui/ui_passworddialog.py:78
+msgid "Authentication required"
+msgstr ""
+
+#: ../picard/ui/ui_passworddialog.py:81
+msgid "Save username and password"
 msgstr ""
 
 #: ../picard/ui/ui_tagsfromfilenames.py:56
@@ -2140,6 +2175,10 @@ msgstr ""
 msgid "Replace underscores with spaces"
 msgstr ""
 
+#: ../picard/ui/ui_tagsfromfilenames.py:58
+msgid "&Preview"
+msgstr ""
+
 #: ../picard/ui/options/about.py:29
 msgid "About"
 msgstr ""
@@ -2160,8 +2199,8 @@ 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"
@@ -2169,14 +2208,13 @@ msgid ""
 "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\"><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/P"
-"icardTagger</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
@@ -2209,42 +2247,44 @@ msgstr ""
 msgid "None"
 msgstr ""
 
-#: ../picard/ui/options/naming.py:33
-msgid "File Naming"
+#: ../picard/ui/options/moving.py:33
+msgid "Moving files"
 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 ""
-
-#: ../picard/ui/options/naming.py:95
-msgid "The multiple artist file naming format must not be empty."
-msgstr ""
-
-#: ../picard/ui/options/naming.py:97
+#: ../picard/ui/options/moving.py:65
 msgid "Error"
 msgstr ""
 
-#: ../picard/ui/options/naming.py:97
+#: ../picard/ui/options/moving.py:65
 msgid "The location to move files to must not be empty."
 msgstr ""
 
-#: ../picard/ui/options/scripting.py:63
-msgid "Scripting"
+#: ../picard/ui/options/ratings.py:29
+msgid "Ratings"
 msgstr ""
 
 #: ../picard/ui/options/tags.py:29
 msgid "Tags"
 msgstr ""
 
-#: ../picard/ui/options/ratings.py:29
-msgid "Ratings"
+#: ../picard/ui/options/renaming.py:35
+msgid "File naming"
+msgstr ""
+
+#: ../picard/ui/options/renaming.py:123
+msgid "The file naming format must not be empty."
+msgstr ""
+
+#: ../picard/ui/options/renaming.py:133
+msgid "The multiple artist file naming format must not be empty."
+msgstr ""
+
+#: ../picard/ui/options/scripting.py:63
+msgid "Scripting"
+msgstr ""
+
+#: ../picard/ui/options/scripting.py:97
+msgid "Script Error"
 msgstr ""
 
 #: ../picard/util/tags.py:24
@@ -2252,214 +2292,218 @@ msgid "Date"
 msgstr ""
 
 #: ../picard/util/tags.py:25
-msgid "Album Artist"
+msgid "Original Release Date"
 msgstr ""
 
 #: ../picard/util/tags.py:26
-msgid "Track Number"
+msgid "Album Artist"
 msgstr ""
 
 #: ../picard/util/tags.py:27
-msgid "Total Tracks"
+msgid "Track Number"
 msgstr ""
 
 #: ../picard/util/tags.py:28
-msgid "Disc Number"
+msgid "Total Tracks"
 msgstr ""
 
 #: ../picard/util/tags.py:29
-msgid "Total Discs"
+msgid "Disc Number"
 msgstr ""
 
 #: ../picard/util/tags.py:30
-msgid "Album Artist Sort Order"
+msgid "Total Discs"
 msgstr ""
 
 #: ../picard/util/tags.py:31
-msgid "Artist Sort Order"
+msgid "Album Artist Sort Order"
 msgstr ""
 
 #: ../picard/util/tags.py:32
-msgid "Title Sort Order"
+msgid "Artist Sort Order"
 msgstr ""
 
 #: ../picard/util/tags.py:33
-msgid "Album Sort Order"
+msgid "Title Sort Order"
 msgstr ""
 
 #: ../picard/util/tags.py:34
-msgid "ASIN"
+msgid "Album Sort Order"
 msgstr ""
 
 #: ../picard/util/tags.py:35
+msgid "ASIN"
+msgstr ""
+
+#: ../picard/util/tags.py:36
 msgid "Grouping"
 msgstr ""
 
-#: ../picard/util/tags.py:37
+#: ../picard/util/tags.py:38
 msgid "ISRC"
 msgstr ""
 
-#: ../picard/util/tags.py:38
+#: ../picard/util/tags.py:39
 msgid "Mood"
 msgstr ""
 
-#: ../picard/util/tags.py:39
+#: ../picard/util/tags.py:40
 msgid "BPM"
 msgstr ""
 
-#: ../picard/util/tags.py:40
+#: ../picard/util/tags.py:41
 msgid "Copyright"
 msgstr ""
 
-#: ../picard/util/tags.py:41
+#: ../picard/util/tags.py:42
 msgid "Composer"
 msgstr ""
 
-#: ../picard/util/tags.py:42
+#: ../picard/util/tags.py:43
 msgid "Conductor"
 msgstr ""
 
-#: ../picard/util/tags.py:43
+#: ../picard/util/tags.py:44
 msgid "Lyricist"
 msgstr ""
 
-#: ../picard/util/tags.py:44
+#: ../picard/util/tags.py:45
 msgid "Arranger"
 msgstr ""
 
-#: ../picard/util/tags.py:45
+#: ../picard/util/tags.py:46
 msgid "Producer"
 msgstr ""
 
-#: ../picard/util/tags.py:46
+#: ../picard/util/tags.py:47
 msgid "Engineer"
 msgstr ""
 
-#: ../picard/util/tags.py:47
+#: ../picard/util/tags.py:48
 msgid "Subtitle"
 msgstr ""
 
-#: ../picard/util/tags.py:48
+#: ../picard/util/tags.py:49
 msgid "Disc Subtitle"
 msgstr ""
 
-#: ../picard/util/tags.py:49
+#: ../picard/util/tags.py:50
 msgid "Remixer"
 msgstr ""
 
-#: ../picard/util/tags.py:50
+#: ../picard/util/tags.py:51
 msgid "MusicBrainz Track Id"
 msgstr ""
 
-#: ../picard/util/tags.py:51
+#: ../picard/util/tags.py:52
 msgid "MusicBrainz Release Id"
 msgstr ""
 
-#: ../picard/util/tags.py:52
+#: ../picard/util/tags.py:53
 msgid "MusicBrainz Artist Id"
 msgstr ""
 
-#: ../picard/util/tags.py:53
+#: ../picard/util/tags.py:54
 msgid "MusicBrainz Release Artist Id"
 msgstr ""
 
-#: ../picard/util/tags.py:54
+#: ../picard/util/tags.py:55
 msgid "MusicBrainz TRM Id"
 msgstr ""
 
-#: ../picard/util/tags.py:55
+#: ../picard/util/tags.py:56
 msgid "MusicBrainz Disc Id"
 msgstr ""
 
-#: ../picard/util/tags.py:56
+#: ../picard/util/tags.py:57
 msgid "MusicBrainz Sort Name"
 msgstr ""
 
-#: ../picard/util/tags.py:57
+#: ../picard/util/tags.py:58
 msgid "MusicIP PUID"
 msgstr ""
 
-#: ../picard/util/tags.py:58
+#: ../picard/util/tags.py:59
 msgid "MusicIP Fingerprint"
 msgstr ""
 
-#: ../picard/util/tags.py:59
+#: ../picard/util/tags.py:60
 msgid "Disc Id"
 msgstr ""
 
-#: ../picard/util/tags.py:60
+#: ../picard/util/tags.py:61
 msgid "Website"
 msgstr ""
 
-#: ../picard/util/tags.py:61
+#: ../picard/util/tags.py:62
 msgid "Compilation"
 msgstr ""
 
-#: ../picard/util/tags.py:62
+#: ../picard/util/tags.py:63
 msgid "Comment"
 msgstr ""
 
-#: ../picard/util/tags.py:63
+#: ../picard/util/tags.py:64
 msgid "Genre"
 msgstr ""
 
-#: ../picard/util/tags.py:64
+#: ../picard/util/tags.py:65
 msgid "Encoded By"
 msgstr ""
 
-#: ../picard/util/tags.py:65
+#: ../picard/util/tags.py:66
 msgid "Performer"
 msgstr ""
 
-#: ../picard/util/tags.py:66
+#: ../picard/util/tags.py:67
 msgid "Release Type"
 msgstr ""
 
-#: ../picard/util/tags.py:67
+#: ../picard/util/tags.py:68
 msgid "Release Status"
 msgstr ""
 
-#: ../picard/util/tags.py:68
+#: ../picard/util/tags.py:69
 msgid "Release Country"
 msgstr ""
 
-#: ../picard/util/tags.py:69
+#: ../picard/util/tags.py:70
 msgid "Record Label"
 msgstr ""
 
-#: ../picard/util/tags.py:70
+#: ../picard/util/tags.py:71
 msgid "Barcode"
 msgstr ""
 
-#: ../picard/util/tags.py:71
+#: ../picard/util/tags.py:72
 msgid "Catalog Number"
 msgstr ""
 
-#: ../picard/util/tags.py:72
+#: ../picard/util/tags.py:73
 msgid "Format"
 msgstr ""
 
-#: ../picard/util/tags.py:73
+#: ../picard/util/tags.py:74
 msgid "DJ-Mixer"
 msgstr ""
 
-#: ../picard/util/tags.py:74
+#: ../picard/util/tags.py:75
 msgid "Media"
 msgstr ""
 
-#: ../picard/util/tags.py:75
+#: ../picard/util/tags.py:76
 msgid "Lyrics"
 msgstr ""
 
-#: ../picard/util/tags.py:76
+#: ../picard/util/tags.py:77
 msgid "Mixer"
 msgstr ""
 
-#: ../picard/util/tags.py:77
+#: ../picard/util/tags.py:78
 msgid "Language"
 msgstr ""
 
-#: ../picard/util/tags.py:78
+#: ../picard/util/tags.py:79
 msgid "Script"
 msgstr ""
 
diff --git a/po/hu.po b/po/hu.po
index c4cc196a5..4a8b63eb9 100644
--- a/po/hu.po
+++ b/po/hu.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: picard\n"
 "Report-Msgid-Bugs-To: http://bugs.musicbrainz.org/\n"
-"POT-Creation-Date: 2009-02-24 18:58+0100\n"
+"POT-Creation-Date: 2009-04-06 22:50+0200\n"
 "PO-Revision-Date: 2009-01-25 14:11+0000\n"
 "Last-Translator: Philipp Wolfer <Unknown>\n"
 "Language-Team: Hungarian <hu@li.org>\n"
@@ -18,16 +18,16 @@ msgstr ""
 "X-Generator: Launchpad (build Unknown)\n"
 "Generated-By: pygettext.py 1.5\n"
 
-#: ../picard/album.py:108 ../picard/cluster.py:248
+#: ../picard/album.py:109 ../picard/cluster.py:248
 msgid "Unmatched Files"
 msgstr ""
 
-#: ../picard/album.py:281
+#: ../picard/album.py:287
 #, python-format
 msgid "[could not load album %s]"
 msgstr ""
 
-#: ../picard/album.py:317
+#: ../picard/album.py:320
 msgid "[loading album information]"
 msgstr ""
 
@@ -587,7 +587,7 @@ msgid "Namibia"
 msgstr ""
 
 #: ../picard/const.py:182
-msgid "Vanuat"
+msgid "Vanuatu"
 msgstr ""
 
 #: ../picard/const.py:183
@@ -1031,223 +1031,234 @@ msgid "Congo, The Democratic Republic of the"
 msgstr ""
 
 #: ../picard/const.py:293
-msgid "Serbia and Montenegro"
+msgid "Serbia and Montenegro (historical, 2003-2006)"
 msgstr ""
 
 #: ../picard/const.py:294
-msgid "Croatia"
+msgid "Serbia"
 msgstr ""
 
 #: ../picard/const.py:295
-msgid "Korea (North), Democratic People's Republic of"
+msgid "Montenegro"
 msgstr ""
 
 #: ../picard/const.py:296
-msgid "Korea (South), Republic of"
+msgid "Croatia"
 msgstr ""
 
 #: ../picard/const.py:297
-msgid "Slovakia"
+msgid "Korea (North), Democratic People's Republic of"
 msgstr ""
 
 #: ../picard/const.py:298
-msgid "Soviet Union (historical, 1922-1991)"
+msgid "Korea (South), Republic of"
 msgstr ""
 
 #: ../picard/const.py:299
-msgid "East Timor"
+msgid "Slovakia"
 msgstr ""
 
 #: ../picard/const.py:300
-msgid "Czechoslovakia (historical, 1918-1992)"
+msgid "Soviet Union (historical, 1922-1991)"
 msgstr ""
 
 #: ../picard/const.py:301
-msgid "Europe"
+msgid "East Timor"
 msgstr ""
 
 #: ../picard/const.py:302
-msgid "East Germany (historical, 1949-1990)"
+msgid "Czechoslovakia (historical, 1918-1992)"
 msgstr ""
 
 #: ../picard/const.py:303
-msgid "[Unknown Country]"
+msgid "Europe"
 msgstr ""
 
 #: ../picard/const.py:304
-msgid "[Worldwide]"
+msgid "East Germany (historical, 1949-1990)"
 msgstr ""
 
 #: ../picard/const.py:305
+msgid "[Unknown Country]"
+msgstr ""
+
+#: ../picard/const.py:306
+msgid "[Worldwide]"
+msgstr ""
+
+#: ../picard/const.py:307
 msgid "Yugoslavia (historical, 1918-1992)"
 msgstr ""
 
-#: ../picard/const.py:310
-msgid "Catalan"
-msgstr ""
-
-#: ../picard/const.py:311
-msgid "Czech"
-msgstr ""
-
 #: ../picard/const.py:312
-msgid "Welsh"
+msgid "Afrikaans"
 msgstr ""
 
 #: ../picard/const.py:313
-msgid "Danish"
+msgid "Arabic"
 msgstr ""
 
 #: ../picard/const.py:314
-msgid "German"
+msgid "Catalan"
 msgstr ""
 
 #: ../picard/const.py:315
-msgid "English"
+msgid "Czech"
 msgstr ""
 
 #: ../picard/const.py:316
-msgid "English (Canada)"
+msgid "Welsh"
 msgstr ""
 
 #: ../picard/const.py:317
-msgid "English (UK)"
+msgid "Danish"
 msgstr ""
 
 #: ../picard/const.py:318
-msgid "Spanish"
+msgid "German"
 msgstr ""
 
 #: ../picard/const.py:319
-msgid "Persian"
+msgid "English"
 msgstr ""
 
 #: ../picard/const.py:320
-msgid "Finnish"
+msgid "English (Canada)"
 msgstr ""
 
 #: ../picard/const.py:321
-msgid "French"
+msgid "English (UK)"
 msgstr ""
 
 #: ../picard/const.py:322
-msgid "Frisian"
+msgid "Spanish"
 msgstr ""
 
 #: ../picard/const.py:323
-msgid "Hebrew"
+msgid "Persian"
 msgstr ""
 
 #: ../picard/const.py:324
-msgid "Hungarian"
+msgid "Finnish"
 msgstr ""
 
 #: ../picard/const.py:325
-msgid "Islandic"
+msgid "French"
 msgstr ""
 
 #: ../picard/const.py:326
-msgid "Italian"
+msgid "Frisian"
 msgstr ""
 
 #: ../picard/const.py:327
-msgid "Kannada"
+msgid "Hebrew"
 msgstr ""
 
 #: ../picard/const.py:328
-msgid "Korean"
+msgid "Hindi"
 msgstr ""
 
 #: ../picard/const.py:329
-msgid "Lithuanian"
+msgid "Hungarian"
 msgstr ""
 
 #: ../picard/const.py:330
-msgid "Norwegian Bokmal"
+msgid "Islandic"
 msgstr ""
 
 #: ../picard/const.py:331
-msgid "Dutch"
+msgid "Italian"
 msgstr ""
 
 #: ../picard/const.py:332
-msgid "Polish"
+msgid "Kannada"
 msgstr ""
 
 #: ../picard/const.py:333
-msgid "Portuguese"
+msgid "Korean"
 msgstr ""
 
 #: ../picard/const.py:334
-msgid "Brazilian Portuguese"
+msgid "Lithuanian"
 msgstr ""
 
 #: ../picard/const.py:335
-msgid "Romanian"
+msgid "Norwegian Bokmal"
 msgstr ""
 
 #: ../picard/const.py:336
-msgid "Russian"
+msgid "Dutch"
 msgstr ""
 
 #: ../picard/const.py:337
-msgid "Scots"
+msgid "Polish"
 msgstr ""
 
 #: ../picard/const.py:338
-msgid "Slovak"
+msgid "Portuguese"
 msgstr ""
 
 #: ../picard/const.py:339
-msgid "Slovenian"
+msgid "Brazilian Portuguese"
 msgstr ""
 
 #: ../picard/const.py:340
-msgid "Swedish"
+msgid "Romanian"
 msgstr ""
 
 #: ../picard/const.py:341
+msgid "Russian"
+msgstr ""
+
+#: ../picard/const.py:342
+msgid "Scots"
+msgstr ""
+
+#: ../picard/const.py:343
+msgid "Slovak"
+msgstr ""
+
+#: ../picard/const.py:344
+msgid "Slovenian"
+msgstr ""
+
+#: ../picard/const.py:345
+msgid "Swedish"
+msgstr ""
+
+#: ../picard/const.py:346
+msgid "Turkish"
+msgstr ""
+
+#: ../picard/const.py:347
 msgid "Chinese"
 msgstr ""
 
-#: ../picard/file.py:487
+#: ../picard/file.py:494
 #, python-format
 msgid "No matching tracks for file %s"
 msgstr ""
 
-#: ../picard/file.py:504
+#: ../picard/file.py:511
 #, python-format
 msgid "No matching tracks above the threshold for file %s"
 msgstr ""
 
-#: ../picard/file.py:507
+#: ../picard/file.py:514
 #, python-format
 msgid "File %s identified!"
 msgstr ""
 
-#: ../picard/file.py:518
+#: ../picard/file.py:525
 #, python-format
 msgid "Looking up the PUID for file %s..."
 msgstr ""
 
-#: ../picard/file.py:523
+#: ../picard/file.py:530
 #, 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 ""
@@ -1260,11 +1271,24 @@ msgstr ""
 msgid "XSPF Playlist (*.xspf)"
 msgstr ""
 
-#: ../picard/tagger.py:476
-msgid "CD Lookup Error"
+#: ../picard/puidmanager.py:62
+msgid "Submitting PUIDs..."
+msgstr ""
+
+#: ../picard/puidmanager.py:68
+#, python-format
+msgid "PUIDs submission failed: %s"
+msgstr ""
+
+#: ../picard/puidmanager.py:70
+msgid "PUIDs successfully submitted!"
 msgstr ""
 
 #: ../picard/tagger.py:477
+msgid "CD Lookup Error"
+msgstr ""
+
+#: ../picard/tagger.py:478
 #, python-format
 msgid ""
 "Error while reading CD:\n"
@@ -1272,7 +1296,7 @@ msgid ""
 "%s"
 msgstr ""
 
-#: ../picard/tagger.py:503
+#: ../picard/tagger.py:504
 #, python-format
 msgid "Could not find PUID for file %s"
 msgstr ""
@@ -1325,15 +1349,28 @@ msgstr ""
 msgid "Length"
 msgstr ""
 
-#: ../picard/ui/itemviews.py:327
+#: ../picard/ui/itemviews.py:289
+msgid "&Expand all"
+msgstr ""
+
+#: ../picard/ui/itemviews.py:291
+msgid "&Collapse all"
+msgstr ""
+
+#: ../picard/ui/itemviews.py:332
 msgid "&Releases"
 msgstr ""
 
-#: ../picard/ui/itemviews.py:353
+#: ../picard/ui/itemviews.py:349
+#, fuzzy
+msgid "No release event"
+msgstr "Az album megjelenésének hónapja"
+
+#: ../picard/ui/itemviews.py:359
 msgid "&Plugins"
 msgstr ""
 
-#: ../picard/ui/itemviews.py:523
+#: ../picard/ui/itemviews.py:533
 msgid "Clusters"
 msgstr ""
 
@@ -1341,95 +1378,6 @@ msgstr ""
 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:66 ../picard/ui/ui_options_plugins.py:62
-msgid "Details"
-msgstr ""
-
-#: ../picard/ui/tageditor.py:71 ../picard/ui/tageditor.py:264
-#, python-format
-msgid "%d file"
-msgid_plural "%d files"
-msgstr[0] ""
-msgstr[1] ""
-
-#: ../picard/ui/tageditor.py:131
-#, python-format
-msgid "(different across %d file)"
-msgid_plural "(different across %d files)"
-msgstr[0] ""
-msgstr[1] ""
-
-#: ../picard/ui/tageditor.py:134
-#, python-format
-msgid "(missing from %d file)"
-msgid_plural "(missing from %d files)"
-msgstr[0] ""
-msgstr[1] ""
-
-#: ../picard/ui/tageditor.py:233
-msgid "Filename:"
-msgstr ""
-
-#: ../picard/ui/tageditor.py:235
-msgid "Format:"
-msgstr ""
-
-#: ../picard/ui/tageditor.py:244
-msgid "Size:"
-msgstr ""
-
-#: ../picard/ui/tageditor.py:248 ../picard/ui/ui_metadata.py:127
-msgid "Length:"
-msgstr ""
-
-#: ../picard/ui/tageditor.py:250
-msgid "Bitrate:"
-msgstr ""
-
-#: ../picard/ui/tageditor.py:252
-msgid "Sample rate:"
-msgstr ""
-
-#: ../picard/ui/tageditor.py:254
-msgid "Bits per sample:"
-msgstr ""
-
-#: ../picard/ui/tageditor.py:257
-msgid "Mono"
-msgstr ""
-
-#: ../picard/ui/tageditor.py:258
-msgid "Stereo"
-msgstr ""
-
-#: ../picard/ui/tageditor.py:260
-msgid "Channels:"
-msgstr ""
-
-#: ../picard/ui/tagsfromfilenames.py:52 ../picard/ui/tagsfromfilenames.py:96
-msgid "File Name"
-msgstr ""
-
 #: ../picard/ui/mainwindow.py:64
 msgid "MusicBrainz Picard"
 msgstr ""
@@ -1666,6 +1614,10 @@ msgstr ""
 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 ""
@@ -1685,12 +1637,97 @@ msgstr ""
 msgid " (Error: %s)"
 msgstr ""
 
+#: ../picard/ui/puidsubmit.py:31 ../picard/ui/options/plugins.py:85
+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/passworddialog.py:38
 #, python-format
 msgid ""
 "The server %s requires you to login. Please enter your username and password."
 msgstr ""
 
+#: ../picard/ui/tageditor.py:66 ../picard/ui/ui_options_plugins.py:62
+msgid "Details"
+msgstr ""
+
+#: ../picard/ui/tageditor.py:71 ../picard/ui/tageditor.py:264
+#, python-format
+msgid "%d file"
+msgid_plural "%d files"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../picard/ui/tageditor.py:131
+#, python-format
+msgid "(different across %d file)"
+msgid_plural "(different across %d files)"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../picard/ui/tageditor.py:134
+#, python-format
+msgid "(missing from %d file)"
+msgid_plural "(missing from %d files)"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../picard/ui/tageditor.py:233
+msgid "Filename:"
+msgstr ""
+
+#: ../picard/ui/tageditor.py:235
+msgid "Format:"
+msgstr ""
+
+#: ../picard/ui/tageditor.py:244
+msgid "Size:"
+msgstr ""
+
+#: ../picard/ui/tageditor.py:248 ../picard/ui/ui_metadata.py:127
+msgid "Length:"
+msgstr ""
+
+#: ../picard/ui/tageditor.py:250
+msgid "Bitrate:"
+msgstr ""
+
+#: ../picard/ui/tageditor.py:252
+msgid "Sample rate:"
+msgstr ""
+
+#: ../picard/ui/tageditor.py:254
+msgid "Bits per sample:"
+msgstr ""
+
+#: ../picard/ui/tageditor.py:257
+msgid "Mono"
+msgstr ""
+
+#: ../picard/ui/tageditor.py:258
+msgid "Stereo"
+msgstr ""
+
+#: ../picard/ui/tageditor.py:260
+msgid "Channels:"
+msgstr ""
+
+#: ../picard/ui/tagsfromfilenames.py:54 ../picard/ui/tagsfromfilenames.py:99
+msgid "File Name"
+msgstr ""
+
 #: ../picard/ui/ui_cdlookup.py:60 ../picard/ui/ui_options_cdlookup.py:47
 #: ../picard/ui/ui_options_cdlookup_select.py:48
 #: ../picard/ui/options/cdlookup.py:36
@@ -1713,24 +1750,6 @@ msgstr ""
 msgid "Cancel"
 msgstr "Mégsem"
 
-#: ../picard/ui/ui_passworddialog.py:78
-msgid "Authentication required"
-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"
-msgstr ""
-
 #: ../picard/ui/ui_edittagdialog.py:44
 msgid "Edit Tag"
 msgstr ""
@@ -1767,6 +1786,10 @@ msgstr ""
 msgid "Options"
 msgstr ""
 
+#: ../picard/ui/ui_puidsubmit.py:52
+msgid "Submit PUIDs"
+msgstr ""
+
 #: ../picard/ui/ui_options_cdlookup.py:48
 msgid "CD-ROM device to use for lookups:"
 msgstr ""
@@ -1791,6 +1814,22 @@ msgstr ""
 msgid "Overwrite the file if it already exists"
 msgstr ""
 
+#: ../picard/ui/ui_options_moving.py:53
+msgid "Move additional files:"
+msgstr ""
+
+#: ../picard/ui/ui_options_moving.py:54
+msgid "Browse..."
+msgstr ""
+
+#: ../picard/ui/ui_options_moving.py:55
+msgid "Delete empty directories"
+msgstr ""
+
+#: ../picard/ui/ui_options_moving.py:56
+msgid "Move files to this directory when saving:"
+msgstr ""
+
 #: ../picard/ui/util.py:31
 msgid "&Ok"
 msgstr ""
@@ -1799,44 +1838,40 @@ msgstr ""
 msgid "&Cancel"
 msgstr ""
 
-#: ../picard/ui/ui_puidsubmit.py:52
-msgid "Submit PUIDs"
-msgstr ""
-
-#: ../picard/ui/ui_tageditor.py:139 ../picard/ui/ui_options_plugins.py:59
-#: ../picard/ui/options/plugins.py:76
+#: ../picard/ui/ui_tageditor.py:128 ../picard/ui/ui_options_plugins.py:59
+#: ../picard/ui/options/plugins.py:81
 msgid "Name"
 msgstr ""
 
-#: ../picard/ui/ui_tageditor.py:140
+#: ../picard/ui/ui_tageditor.py:129
 msgid "Value"
 msgstr ""
 
-#: ../picard/ui/ui_tageditor.py:141
+#: ../picard/ui/ui_tageditor.py:130
 msgid "Rating:"
 msgstr ""
 
-#: ../picard/ui/ui_tageditor.py:142
+#: ../picard/ui/ui_tageditor.py:131
 msgid "&Add..."
 msgstr ""
 
-#: ../picard/ui/ui_tageditor.py:143
+#: ../picard/ui/ui_tageditor.py:132
 msgid "&Edit..."
 msgstr ""
 
-#: ../picard/ui/ui_tageditor.py:144
+#: ../picard/ui/ui_tageditor.py:133
 msgid "&Delete"
 msgstr ""
 
-#: ../picard/ui/ui_tageditor.py:145
+#: ../picard/ui/ui_tageditor.py:134
 msgid "&Metadata"
 msgstr ""
 
-#: ../picard/ui/ui_tageditor.py:146
+#: ../picard/ui/ui_tageditor.py:135
 msgid "A&rtwork"
 msgstr ""
 
-#: ../picard/ui/ui_tageditor.py:147
+#: ../picard/ui/ui_tageditor.py:136
 msgid "&Info"
 msgstr ""
 
@@ -1881,6 +1916,40 @@ msgstr ""
 msgid ", "
 msgstr ""
 
+#: ../picard/ui/ui_options_general.py:108
+msgid "MusicBrainz Server"
+msgstr ""
+
+#: ../picard/ui/ui_options_general.py:109 ../picard/ui/ui_options_proxy.py:72
+msgid "Port:"
+msgstr ""
+
+#: ../picard/ui/ui_options_general.py:110 ../picard/ui/ui_options_proxy.py:73
+msgid "Server address:"
+msgstr ""
+
+#: ../picard/ui/ui_options_general.py:111
+msgid "Account Information"
+msgstr ""
+
+#: ../picard/ui/ui_options_general.py:112 ../picard/ui/ui_options_proxy.py:70
+#: ../picard/ui/ui_passworddialog.py:80
+msgid "Password:"
+msgstr ""
+
+#: ../picard/ui/ui_options_general.py:113 ../picard/ui/ui_options_proxy.py:71
+#: ../picard/ui/ui_passworddialog.py:79
+msgid "Username:"
+msgstr ""
+
+#: ../picard/ui/ui_options_general.py:114 ../picard/ui/options/general.py:29
+msgid "General"
+msgstr "Általános"
+
+#: ../picard/ui/ui_options_general.py:115
+msgid "Automatically scan all new files"
+msgstr ""
+
 #: ../picard/ui/ui_options_interface.py:50
 msgid "Miscellaneous"
 msgstr ""
@@ -1901,113 +1970,6 @@ msgstr ""
 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 "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_options_naming.py:180
-#: ../picard/ui/ui_tagsfromfilenames.py:58
-msgid "&Preview"
-msgstr ""
-
-#: ../picard/ui/ui_options_proxy.py:81 ../picard/ui/options/proxy.py:28
-msgid "Web Proxy"
-msgstr "Web Proxy"
-
-#: ../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_options_ratings.py:45
-msgid "Enable track ratings"
-msgstr ""
-
-#: ../picard/ui/ui_options_ratings.py:46
-msgid ""
-"Picard saves the ratings together with an e-mail address identifying the "
-"user who did the rating. That way different ratings for different users can "
-"be stored in the files. Please sepcify the e-mail you want to use to save "
-"your ratings."
-msgstr ""
-
-#: ../picard/ui/ui_options_ratings.py:47
-msgid "E-mail:"
-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 ../picard/ui/options/general.py:29
-msgid "General"
-msgstr "Általános"
-
-#: ../picard/ui/ui_options_general.py:115
-msgid "Automatically scan all new files"
-msgstr ""
-
 #: ../picard/ui/ui_options_matching.py:105
 msgid "Thresholds"
 msgstr ""
@@ -2064,72 +2026,146 @@ msgstr ""
 msgid "Non-album tracks:"
 msgstr ""
 
-#: ../picard/ui/ui_options_plugins.py:58 ../picard/ui/options/plugins.py:30
+#: ../picard/ui/ui_options_metadata.py:109
+#: ../picard/ui/ui_options_metadata.py:110
+#: ../picard/ui/ui_options_renaming.py:155
+#: ../picard/ui/ui_options_renaming.py:158
+msgid "Default"
+msgstr "Alapértelmezett"
+
+#: ../picard/ui/ui_options_plugins.py:58 ../picard/ui/options/plugins.py:34
 msgid "Plugins"
 msgstr ""
 
-#: ../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:84
 msgid "Author"
 msgstr ""
 
-#: ../picard/ui/ui_options_plugins.py:61 ../picard/util/tags.py:36
+#: ../picard/ui/ui_options_plugins.py:61 ../picard/util/tags.py:37
 msgid "Version"
 msgstr ""
 
-#: ../picard/ui/ui_options_script.py:52
+#: ../picard/ui/ui_options_proxy.py:69 ../picard/ui/options/proxy.py:28
+msgid "Web Proxy"
+msgstr "Web Proxy"
+
+#: ../picard/ui/ui_options_ratings.py:45
+msgid "Enable track ratings"
+msgstr ""
+
+#: ../picard/ui/ui_options_ratings.py:46
+msgid ""
+"Picard saves the ratings together with an e-mail address identifying the "
+"user who did the rating. That way different ratings for different users can "
+"be stored in the files. Please sepcify the e-mail you want to use to save "
+"your ratings."
+msgstr ""
+
+#: ../picard/ui/ui_options_ratings.py:47
+msgid "E-mail:"
+msgstr ""
+
+#: ../picard/ui/ui_options_renaming.py:145
+msgid "Form"
+msgstr ""
+
+#: ../picard/ui/ui_options_renaming.py:146
+#, fuzzy
+msgid "Rename files when saving"
+msgstr "Fájlok átnevezése a tag-ek kiírásakor"
+
+#: ../picard/ui/ui_options_renaming.py:147
+msgid "Replace non-ASCII characters"
+msgstr ""
+
+#: ../picard/ui/ui_options_renaming.py:148
+msgid "Replace Windows-incompatible characters"
+msgstr ""
+
+#: ../picard/ui/ui_options_renaming.py:149
+msgid "Name files like this"
+msgstr ""
+
+#: ../picard/ui/ui_options_renaming.py:156
+msgid "Name multiple artist albums differently"
+msgstr ""
+
+#: ../picard/ui/ui_options_renaming.py:157
+msgid "Copy from above"
+msgstr ""
+
+#: ../picard/ui/ui_options_renaming.py:159
+msgid "Examples"
+msgstr ""
+
+#: ../picard/ui/ui_options_script.py:43
 msgid "Tagger Script"
 msgstr ""
 
-#: ../picard/ui/ui_options_tags.py:85
-msgid "Common"
+#: ../picard/ui/ui_options_tags.py:97
+msgid "Do not write tags to files"
 msgstr ""
 
-#: ../picard/ui/ui_options_tags.py:86
-msgid "Clear existing tags before writing new tags"
+#: ../picard/ui/ui_options_tags.py:98
+msgid "Before tagging"
+msgstr ""
+
+#: ../picard/ui/ui_options_tags.py:99
+#, fuzzy
+msgid "Clear existing tags"
 msgstr "A létező tag-ek törlése az új tag-ek írása előtt"
 
-#: ../picard/ui/ui_options_tags.py:87
-msgid "Don not write tags to files"
-msgstr ""
-
-#: ../picard/ui/ui_options_tags.py:88
-msgid "ID3"
-msgstr ""
-
-#: ../picard/ui/ui_options_tags.py:89
-msgid "Write ID3v1 tags to the files"
-msgstr ""
-
-#: ../picard/ui/ui_options_tags.py:90
-msgid "Write ID3v2 version 2.3 tags (2.4 is default)"
-msgstr "ID3v2 2.3 tag-ek írása (2.4 az alapértelmezett)"
-
-#: ../picard/ui/ui_options_tags.py:91
-msgid "Text encoding to use while writing ID3v2 tags:"
-msgstr ""
-
-#: ../picard/ui/ui_options_tags.py:92
-msgid "ISO-8859-1"
-msgstr ""
-
-#: ../picard/ui/ui_options_tags.py:93
-msgid "UTF-16"
-msgstr ""
-
-#: ../picard/ui/ui_options_tags.py:94
-msgid "UTF-8"
-msgstr ""
-
-#: ../picard/ui/ui_options_tags.py:95
+#: ../picard/ui/ui_options_tags.py:100
 msgid "Remove ID3 tags from FLAC files"
 msgstr ""
 
-#: ../picard/ui/ui_options_tags.py:96
-msgid "APE"
+#: ../picard/ui/ui_options_tags.py:101
+msgid "Remove APEv2 tags from MP3 files"
 msgstr ""
 
-#: ../picard/ui/ui_options_tags.py:97
-msgid "Remove APEv2 tags from MP3 files"
+#: ../picard/ui/ui_options_tags.py:102
+msgid "Tag compatibility"
+msgstr ""
+
+#: ../picard/ui/ui_options_tags.py:103
+#, fuzzy
+msgid "ID3v2 version"
+msgstr "Csak ID3v2.4"
+
+#: ../picard/ui/ui_options_tags.py:104
+msgid "2.4"
+msgstr ""
+
+#: ../picard/ui/ui_options_tags.py:105
+msgid "2.3"
+msgstr ""
+
+#: ../picard/ui/ui_options_tags.py:106
+msgid "Also include ID3v1 tags in the files"
+msgstr ""
+
+#: ../picard/ui/ui_options_tags.py:107
+msgid "ID3v2 text encoding"
+msgstr ""
+
+#: ../picard/ui/ui_options_tags.py:108
+msgid "UTF-8"
+msgstr ""
+
+#: ../picard/ui/ui_options_tags.py:109
+msgid "UTF-16"
+msgstr ""
+
+#: ../picard/ui/ui_options_tags.py:110
+msgid "ISO-8859-1"
+msgstr ""
+
+#: ../picard/ui/ui_passworddialog.py:78
+msgid "Authentication required"
+msgstr ""
+
+#: ../picard/ui/ui_passworddialog.py:81
+msgid "Save username and password"
 msgstr ""
 
 #: ../picard/ui/ui_tagsfromfilenames.py:56
@@ -2140,6 +2176,10 @@ msgstr ""
 msgid "Replace underscores with spaces"
 msgstr ""
 
+#: ../picard/ui/ui_tagsfromfilenames.py:58
+msgid "&Preview"
+msgstr ""
+
 #: ../picard/ui/options/about.py:29
 msgid "About"
 msgstr "Névjegy"
@@ -2164,8 +2204,8 @@ 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"
@@ -2173,14 +2213,13 @@ msgid ""
 "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\"><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/P"
-"icardTagger</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
@@ -2213,42 +2252,45 @@ msgstr ""
 msgid "None"
 msgstr ""
 
-#: ../picard/ui/options/naming.py:33
-msgid "File Naming"
-msgstr ""
+#: ../picard/ui/options/moving.py:33
+#, fuzzy
+msgid "Moving files"
+msgstr "Fájlok mozgatása"
 
-#: ../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 ""
-
-#: ../picard/ui/options/naming.py:95
-msgid "The multiple artist file naming format must not be empty."
-msgstr ""
-
-#: ../picard/ui/options/naming.py:97
+#: ../picard/ui/options/moving.py:65
 msgid "Error"
 msgstr ""
 
-#: ../picard/ui/options/naming.py:97
+#: ../picard/ui/options/moving.py:65
 msgid "The location to move files to must not be empty."
 msgstr ""
 
-#: ../picard/ui/options/scripting.py:63
-msgid "Scripting"
+#: ../picard/ui/options/ratings.py:29
+msgid "Ratings"
 msgstr ""
 
 #: ../picard/ui/options/tags.py:29
 msgid "Tags"
 msgstr "Fájl infók"
 
-#: ../picard/ui/options/ratings.py:29
-msgid "Ratings"
+#: ../picard/ui/options/renaming.py:35
+msgid "File naming"
+msgstr ""
+
+#: ../picard/ui/options/renaming.py:123
+msgid "The file naming format must not be empty."
+msgstr ""
+
+#: ../picard/ui/options/renaming.py:133
+msgid "The multiple artist file naming format must not be empty."
+msgstr ""
+
+#: ../picard/ui/options/scripting.py:63
+msgid "Scripting"
+msgstr ""
+
+#: ../picard/ui/options/scripting.py:97
+msgid "Script Error"
 msgstr ""
 
 #: ../picard/util/tags.py:24
@@ -2256,214 +2298,219 @@ msgid "Date"
 msgstr ""
 
 #: ../picard/util/tags.py:25
+#, fuzzy
+msgid "Original Release Date"
+msgstr "Release dátuma"
+
+#: ../picard/util/tags.py:26
 msgid "Album Artist"
 msgstr ""
 
-#: ../picard/util/tags.py:26
+#: ../picard/util/tags.py:27
 msgid "Track Number"
 msgstr ""
 
-#: ../picard/util/tags.py:27
+#: ../picard/util/tags.py:28
 msgid "Total Tracks"
 msgstr ""
 
-#: ../picard/util/tags.py:28
+#: ../picard/util/tags.py:29
 msgid "Disc Number"
 msgstr ""
 
-#: ../picard/util/tags.py:29
+#: ../picard/util/tags.py:30
 msgid "Total Discs"
 msgstr ""
 
-#: ../picard/util/tags.py:30
+#: ../picard/util/tags.py:31
 msgid "Album Artist Sort Order"
 msgstr ""
 
-#: ../picard/util/tags.py:31
+#: ../picard/util/tags.py:32
 msgid "Artist Sort Order"
 msgstr ""
 
-#: ../picard/util/tags.py:32
+#: ../picard/util/tags.py:33
 msgid "Title Sort Order"
 msgstr ""
 
-#: ../picard/util/tags.py:33
+#: ../picard/util/tags.py:34
 msgid "Album Sort Order"
 msgstr ""
 
-#: ../picard/util/tags.py:34
+#: ../picard/util/tags.py:35
 msgid "ASIN"
 msgstr ""
 
-#: ../picard/util/tags.py:35
+#: ../picard/util/tags.py:36
 msgid "Grouping"
 msgstr ""
 
-#: ../picard/util/tags.py:37
+#: ../picard/util/tags.py:38
 msgid "ISRC"
 msgstr ""
 
-#: ../picard/util/tags.py:38
+#: ../picard/util/tags.py:39
 msgid "Mood"
 msgstr ""
 
-#: ../picard/util/tags.py:39
+#: ../picard/util/tags.py:40
 msgid "BPM"
 msgstr ""
 
-#: ../picard/util/tags.py:40
+#: ../picard/util/tags.py:41
 msgid "Copyright"
 msgstr ""
 
-#: ../picard/util/tags.py:41
+#: ../picard/util/tags.py:42
 msgid "Composer"
 msgstr ""
 
-#: ../picard/util/tags.py:42
+#: ../picard/util/tags.py:43
 msgid "Conductor"
 msgstr ""
 
-#: ../picard/util/tags.py:43
+#: ../picard/util/tags.py:44
 msgid "Lyricist"
 msgstr ""
 
-#: ../picard/util/tags.py:44
+#: ../picard/util/tags.py:45
 msgid "Arranger"
 msgstr ""
 
-#: ../picard/util/tags.py:45
+#: ../picard/util/tags.py:46
 msgid "Producer"
 msgstr ""
 
-#: ../picard/util/tags.py:46
+#: ../picard/util/tags.py:47
 msgid "Engineer"
 msgstr ""
 
-#: ../picard/util/tags.py:47
+#: ../picard/util/tags.py:48
 msgid "Subtitle"
 msgstr ""
 
-#: ../picard/util/tags.py:48
+#: ../picard/util/tags.py:49
 msgid "Disc Subtitle"
 msgstr ""
 
-#: ../picard/util/tags.py:49
+#: ../picard/util/tags.py:50
 msgid "Remixer"
 msgstr ""
 
-#: ../picard/util/tags.py:50
+#: ../picard/util/tags.py:51
 msgid "MusicBrainz Track Id"
 msgstr ""
 
-#: ../picard/util/tags.py:51
+#: ../picard/util/tags.py:52
 msgid "MusicBrainz Release Id"
 msgstr ""
 
-#: ../picard/util/tags.py:52
+#: ../picard/util/tags.py:53
 msgid "MusicBrainz Artist Id"
 msgstr ""
 
-#: ../picard/util/tags.py:53
+#: ../picard/util/tags.py:54
 msgid "MusicBrainz Release Artist Id"
 msgstr ""
 
-#: ../picard/util/tags.py:54
+#: ../picard/util/tags.py:55
 msgid "MusicBrainz TRM Id"
 msgstr ""
 
-#: ../picard/util/tags.py:55
+#: ../picard/util/tags.py:56
 msgid "MusicBrainz Disc Id"
 msgstr ""
 
-#: ../picard/util/tags.py:56
+#: ../picard/util/tags.py:57
 msgid "MusicBrainz Sort Name"
 msgstr ""
 
-#: ../picard/util/tags.py:57
+#: ../picard/util/tags.py:58
 msgid "MusicIP PUID"
 msgstr ""
 
-#: ../picard/util/tags.py:58
+#: ../picard/util/tags.py:59
 msgid "MusicIP Fingerprint"
 msgstr ""
 
-#: ../picard/util/tags.py:59
+#: ../picard/util/tags.py:60
 msgid "Disc Id"
 msgstr ""
 
-#: ../picard/util/tags.py:60
+#: ../picard/util/tags.py:61
 msgid "Website"
 msgstr ""
 
-#: ../picard/util/tags.py:61
+#: ../picard/util/tags.py:62
 msgid "Compilation"
 msgstr ""
 
-#: ../picard/util/tags.py:62
+#: ../picard/util/tags.py:63
 msgid "Comment"
 msgstr ""
 
-#: ../picard/util/tags.py:63
+#: ../picard/util/tags.py:64
 msgid "Genre"
 msgstr ""
 
-#: ../picard/util/tags.py:64
+#: ../picard/util/tags.py:65
 msgid "Encoded By"
 msgstr ""
 
-#: ../picard/util/tags.py:65
+#: ../picard/util/tags.py:66
 msgid "Performer"
 msgstr ""
 
-#: ../picard/util/tags.py:66
+#: ../picard/util/tags.py:67
 msgid "Release Type"
 msgstr ""
 
-#: ../picard/util/tags.py:67
+#: ../picard/util/tags.py:68
 msgid "Release Status"
 msgstr ""
 
-#: ../picard/util/tags.py:68
+#: ../picard/util/tags.py:69
 msgid "Release Country"
 msgstr ""
 
-#: ../picard/util/tags.py:69
+#: ../picard/util/tags.py:70
 msgid "Record Label"
 msgstr ""
 
-#: ../picard/util/tags.py:70
+#: ../picard/util/tags.py:71
 msgid "Barcode"
 msgstr ""
 
-#: ../picard/util/tags.py:71
+#: ../picard/util/tags.py:72
 msgid "Catalog Number"
 msgstr ""
 
-#: ../picard/util/tags.py:72
+#: ../picard/util/tags.py:73
 msgid "Format"
 msgstr ""
 
-#: ../picard/util/tags.py:73
+#: ../picard/util/tags.py:74
 msgid "DJ-Mixer"
 msgstr ""
 
-#: ../picard/util/tags.py:74
+#: ../picard/util/tags.py:75
 msgid "Media"
 msgstr ""
 
-#: ../picard/util/tags.py:75
+#: ../picard/util/tags.py:76
 msgid "Lyrics"
 msgstr ""
 
-#: ../picard/util/tags.py:76
+#: ../picard/util/tags.py:77
 msgid "Mixer"
 msgstr ""
 
-#: ../picard/util/tags.py:77
+#: ../picard/util/tags.py:78
 msgid "Language"
 msgstr "Nyelv"
 
-#: ../picard/util/tags.py:78
+#: ../picard/util/tags.py:79
 msgid "Script"
 msgstr ""
 
@@ -2479,6 +2526,9 @@ msgid ""
 "%s"
 msgstr ""
 
+#~ msgid "Write ID3v2 version 2.3 tags (2.4 is default)"
+#~ msgstr "ID3v2 2.3 tag-ek írása (2.4 az alapértelmezett)"
+
 #~ msgid "Help"
 #~ msgstr "Segítség"
 
@@ -2569,9 +2619,6 @@ msgstr ""
 #~ 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"
 
@@ -2584,9 +2631,6 @@ msgstr ""
 #~ msgid "Proxy port"
 #~ msgstr "Proxy port"
 
-#~ msgid "ID3v2.4 only"
-#~ msgstr "Csak ID3v2.4"
-
 #~ msgid "Save track/album"
 #~ msgstr "Szám/album mentése"
 
@@ -2614,20 +2658,21 @@ msgstr ""
 #~ 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."
+#~ "Please fix the move option or the destination directory option and try "
+#~ "again."
 #~ msgstr ""
-#~ "A Fájlok mozgatása opció ki lett választva, de a célkönyvtár nincs megadva "
-#~ "vagy érvénytelen.\n"
+#~ "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 click the "
-#~ "track and select 'Clear Error'"
+#~ "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 ""
-#~ "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."
+#~ "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"
@@ -2641,15 +2686,14 @@ msgstr ""
 #~ 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!"
+#~ "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 ""
@@ -2661,9 +2705,6 @@ 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"
 
@@ -2679,7 +2720,8 @@ msgstr ""
 
 #~ 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)"
+#~ "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"
@@ -2705,9 +2747,6 @@ msgstr ""
 #~ 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"
 
@@ -2715,8 +2754,8 @@ msgstr ""
 #~ 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. "
+#~ "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. "
diff --git a/po/is.po b/po/is.po
index 69099dc0e..3de52de23 100644
--- a/po/is.po
+++ b/po/is.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: picard\n"
 "Report-Msgid-Bugs-To: http://bugs.musicbrainz.org/\n"
-"POT-Creation-Date: 2009-02-24 18:58+0100\n"
+"POT-Creation-Date: 2009-04-06 22:50+0200\n"
 "PO-Revision-Date: 2009-01-25 14:24+0000\n"
 "Last-Translator: Philipp Wolfer <Unknown>\n"
 "Language-Team: Icelandic <is@li.org>\n"
@@ -17,16 +17,16 @@ msgstr ""
 "X-Launchpad-Export-Date: 2009-04-06 20:20+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
-#: ../picard/album.py:108 ../picard/cluster.py:248
+#: ../picard/album.py:109 ../picard/cluster.py:248
 msgid "Unmatched Files"
 msgstr ""
 
-#: ../picard/album.py:281
+#: ../picard/album.py:287
 #, python-format
 msgid "[could not load album %s]"
 msgstr ""
 
-#: ../picard/album.py:317
+#: ../picard/album.py:320
 msgid "[loading album information]"
 msgstr ""
 
@@ -586,7 +586,7 @@ msgid "Namibia"
 msgstr ""
 
 #: ../picard/const.py:182
-msgid "Vanuat"
+msgid "Vanuatu"
 msgstr ""
 
 #: ../picard/const.py:183
@@ -1030,223 +1030,234 @@ msgid "Congo, The Democratic Republic of the"
 msgstr ""
 
 #: ../picard/const.py:293
-msgid "Serbia and Montenegro"
+msgid "Serbia and Montenegro (historical, 2003-2006)"
 msgstr ""
 
 #: ../picard/const.py:294
-msgid "Croatia"
+msgid "Serbia"
 msgstr ""
 
 #: ../picard/const.py:295
-msgid "Korea (North), Democratic People's Republic of"
+msgid "Montenegro"
 msgstr ""
 
 #: ../picard/const.py:296
-msgid "Korea (South), Republic of"
+msgid "Croatia"
 msgstr ""
 
 #: ../picard/const.py:297
-msgid "Slovakia"
+msgid "Korea (North), Democratic People's Republic of"
 msgstr ""
 
 #: ../picard/const.py:298
-msgid "Soviet Union (historical, 1922-1991)"
+msgid "Korea (South), Republic of"
 msgstr ""
 
 #: ../picard/const.py:299
-msgid "East Timor"
+msgid "Slovakia"
 msgstr ""
 
 #: ../picard/const.py:300
-msgid "Czechoslovakia (historical, 1918-1992)"
+msgid "Soviet Union (historical, 1922-1991)"
 msgstr ""
 
 #: ../picard/const.py:301
-msgid "Europe"
+msgid "East Timor"
 msgstr ""
 
 #: ../picard/const.py:302
-msgid "East Germany (historical, 1949-1990)"
+msgid "Czechoslovakia (historical, 1918-1992)"
 msgstr ""
 
 #: ../picard/const.py:303
-msgid "[Unknown Country]"
+msgid "Europe"
 msgstr ""
 
 #: ../picard/const.py:304
-msgid "[Worldwide]"
+msgid "East Germany (historical, 1949-1990)"
 msgstr ""
 
 #: ../picard/const.py:305
+msgid "[Unknown Country]"
+msgstr ""
+
+#: ../picard/const.py:306
+msgid "[Worldwide]"
+msgstr ""
+
+#: ../picard/const.py:307
 msgid "Yugoslavia (historical, 1918-1992)"
 msgstr ""
 
-#: ../picard/const.py:310
-msgid "Catalan"
-msgstr ""
-
-#: ../picard/const.py:311
-msgid "Czech"
-msgstr ""
-
 #: ../picard/const.py:312
-msgid "Welsh"
+msgid "Afrikaans"
 msgstr ""
 
 #: ../picard/const.py:313
-msgid "Danish"
+msgid "Arabic"
 msgstr ""
 
 #: ../picard/const.py:314
-msgid "German"
+msgid "Catalan"
 msgstr ""
 
 #: ../picard/const.py:315
-msgid "English"
+msgid "Czech"
 msgstr ""
 
 #: ../picard/const.py:316
-msgid "English (Canada)"
+msgid "Welsh"
 msgstr ""
 
 #: ../picard/const.py:317
-msgid "English (UK)"
+msgid "Danish"
 msgstr ""
 
 #: ../picard/const.py:318
-msgid "Spanish"
+msgid "German"
 msgstr ""
 
 #: ../picard/const.py:319
-msgid "Persian"
+msgid "English"
 msgstr ""
 
 #: ../picard/const.py:320
-msgid "Finnish"
+msgid "English (Canada)"
 msgstr ""
 
 #: ../picard/const.py:321
-msgid "French"
+msgid "English (UK)"
 msgstr ""
 
 #: ../picard/const.py:322
-msgid "Frisian"
+msgid "Spanish"
 msgstr ""
 
 #: ../picard/const.py:323
-msgid "Hebrew"
+msgid "Persian"
 msgstr ""
 
 #: ../picard/const.py:324
-msgid "Hungarian"
+msgid "Finnish"
 msgstr ""
 
 #: ../picard/const.py:325
-msgid "Islandic"
+msgid "French"
 msgstr ""
 
 #: ../picard/const.py:326
-msgid "Italian"
+msgid "Frisian"
 msgstr ""
 
 #: ../picard/const.py:327
-msgid "Kannada"
+msgid "Hebrew"
 msgstr ""
 
 #: ../picard/const.py:328
-msgid "Korean"
+msgid "Hindi"
 msgstr ""
 
 #: ../picard/const.py:329
-msgid "Lithuanian"
+msgid "Hungarian"
 msgstr ""
 
 #: ../picard/const.py:330
-msgid "Norwegian Bokmal"
+msgid "Islandic"
 msgstr ""
 
 #: ../picard/const.py:331
-msgid "Dutch"
+msgid "Italian"
 msgstr ""
 
 #: ../picard/const.py:332
-msgid "Polish"
+msgid "Kannada"
 msgstr ""
 
 #: ../picard/const.py:333
-msgid "Portuguese"
+msgid "Korean"
 msgstr ""
 
 #: ../picard/const.py:334
-msgid "Brazilian Portuguese"
+msgid "Lithuanian"
 msgstr ""
 
 #: ../picard/const.py:335
-msgid "Romanian"
+msgid "Norwegian Bokmal"
 msgstr ""
 
 #: ../picard/const.py:336
-msgid "Russian"
+msgid "Dutch"
 msgstr ""
 
 #: ../picard/const.py:337
-msgid "Scots"
+msgid "Polish"
 msgstr ""
 
 #: ../picard/const.py:338
-msgid "Slovak"
+msgid "Portuguese"
 msgstr ""
 
 #: ../picard/const.py:339
-msgid "Slovenian"
+msgid "Brazilian Portuguese"
 msgstr ""
 
 #: ../picard/const.py:340
-msgid "Swedish"
+msgid "Romanian"
 msgstr ""
 
 #: ../picard/const.py:341
+msgid "Russian"
+msgstr ""
+
+#: ../picard/const.py:342
+msgid "Scots"
+msgstr ""
+
+#: ../picard/const.py:343
+msgid "Slovak"
+msgstr ""
+
+#: ../picard/const.py:344
+msgid "Slovenian"
+msgstr ""
+
+#: ../picard/const.py:345
+msgid "Swedish"
+msgstr ""
+
+#: ../picard/const.py:346
+msgid "Turkish"
+msgstr ""
+
+#: ../picard/const.py:347
 msgid "Chinese"
 msgstr ""
 
-#: ../picard/file.py:487
+#: ../picard/file.py:494
 #, python-format
 msgid "No matching tracks for file %s"
 msgstr ""
 
-#: ../picard/file.py:504
+#: ../picard/file.py:511
 #, python-format
 msgid "No matching tracks above the threshold for file %s"
 msgstr ""
 
-#: ../picard/file.py:507
+#: ../picard/file.py:514
 #, python-format
 msgid "File %s identified!"
 msgstr "Skráin %s fundin!"
 
-#: ../picard/file.py:518
+#: ../picard/file.py:525
 #, python-format
 msgid "Looking up the PUID for file %s..."
 msgstr ""
 
-#: ../picard/file.py:523
+#: ../picard/file.py:530
 #, 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 ""
@@ -1259,11 +1270,24 @@ msgstr ""
 msgid "XSPF Playlist (*.xspf)"
 msgstr ""
 
-#: ../picard/tagger.py:476
-msgid "CD Lookup Error"
+#: ../picard/puidmanager.py:62
+msgid "Submitting PUIDs..."
+msgstr ""
+
+#: ../picard/puidmanager.py:68
+#, python-format
+msgid "PUIDs submission failed: %s"
+msgstr ""
+
+#: ../picard/puidmanager.py:70
+msgid "PUIDs successfully submitted!"
 msgstr ""
 
 #: ../picard/tagger.py:477
+msgid "CD Lookup Error"
+msgstr ""
+
+#: ../picard/tagger.py:478
 #, python-format
 msgid ""
 "Error while reading CD:\n"
@@ -1271,7 +1295,7 @@ msgid ""
 "%s"
 msgstr ""
 
-#: ../picard/tagger.py:503
+#: ../picard/tagger.py:504
 #, python-format
 msgid "Could not find PUID for file %s"
 msgstr ""
@@ -1324,15 +1348,28 @@ msgstr ""
 msgid "Length"
 msgstr ""
 
-#: ../picard/ui/itemviews.py:327
+#: ../picard/ui/itemviews.py:289
+msgid "&Expand all"
+msgstr ""
+
+#: ../picard/ui/itemviews.py:291
+msgid "&Collapse all"
+msgstr ""
+
+#: ../picard/ui/itemviews.py:332
 msgid "&Releases"
 msgstr ""
 
-#: ../picard/ui/itemviews.py:353
+#: ../picard/ui/itemviews.py:349
+#, fuzzy
+msgid "No release event"
+msgstr "Útgáfumánuður plötu"
+
+#: ../picard/ui/itemviews.py:359
 msgid "&Plugins"
 msgstr ""
 
-#: ../picard/ui/itemviews.py:523
+#: ../picard/ui/itemviews.py:533
 msgid "Clusters"
 msgstr ""
 
@@ -1340,95 +1377,6 @@ msgstr ""
 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:66 ../picard/ui/ui_options_plugins.py:62
-msgid "Details"
-msgstr ""
-
-#: ../picard/ui/tageditor.py:71 ../picard/ui/tageditor.py:264
-#, python-format
-msgid "%d file"
-msgid_plural "%d files"
-msgstr[0] ""
-msgstr[1] ""
-
-#: ../picard/ui/tageditor.py:131
-#, python-format
-msgid "(different across %d file)"
-msgid_plural "(different across %d files)"
-msgstr[0] ""
-msgstr[1] ""
-
-#: ../picard/ui/tageditor.py:134
-#, python-format
-msgid "(missing from %d file)"
-msgid_plural "(missing from %d files)"
-msgstr[0] ""
-msgstr[1] ""
-
-#: ../picard/ui/tageditor.py:233
-msgid "Filename:"
-msgstr ""
-
-#: ../picard/ui/tageditor.py:235
-msgid "Format:"
-msgstr ""
-
-#: ../picard/ui/tageditor.py:244
-msgid "Size:"
-msgstr ""
-
-#: ../picard/ui/tageditor.py:248 ../picard/ui/ui_metadata.py:127
-msgid "Length:"
-msgstr ""
-
-#: ../picard/ui/tageditor.py:250
-msgid "Bitrate:"
-msgstr ""
-
-#: ../picard/ui/tageditor.py:252
-msgid "Sample rate:"
-msgstr ""
-
-#: ../picard/ui/tageditor.py:254
-msgid "Bits per sample:"
-msgstr ""
-
-#: ../picard/ui/tageditor.py:257
-msgid "Mono"
-msgstr ""
-
-#: ../picard/ui/tageditor.py:258
-msgid "Stereo"
-msgstr ""
-
-#: ../picard/ui/tageditor.py:260
-msgid "Channels:"
-msgstr ""
-
-#: ../picard/ui/tagsfromfilenames.py:52 ../picard/ui/tagsfromfilenames.py:96
-msgid "File Name"
-msgstr ""
-
 #: ../picard/ui/mainwindow.py:64
 msgid "MusicBrainz Picard"
 msgstr ""
@@ -1665,6 +1613,10 @@ msgstr ""
 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 ""
@@ -1684,12 +1636,97 @@ msgstr ""
 msgid " (Error: %s)"
 msgstr ""
 
+#: ../picard/ui/puidsubmit.py:31 ../picard/ui/options/plugins.py:85
+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/passworddialog.py:38
 #, python-format
 msgid ""
 "The server %s requires you to login. Please enter your username and password."
 msgstr ""
 
+#: ../picard/ui/tageditor.py:66 ../picard/ui/ui_options_plugins.py:62
+msgid "Details"
+msgstr ""
+
+#: ../picard/ui/tageditor.py:71 ../picard/ui/tageditor.py:264
+#, python-format
+msgid "%d file"
+msgid_plural "%d files"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../picard/ui/tageditor.py:131
+#, python-format
+msgid "(different across %d file)"
+msgid_plural "(different across %d files)"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../picard/ui/tageditor.py:134
+#, python-format
+msgid "(missing from %d file)"
+msgid_plural "(missing from %d files)"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../picard/ui/tageditor.py:233
+msgid "Filename:"
+msgstr ""
+
+#: ../picard/ui/tageditor.py:235
+msgid "Format:"
+msgstr ""
+
+#: ../picard/ui/tageditor.py:244
+msgid "Size:"
+msgstr ""
+
+#: ../picard/ui/tageditor.py:248 ../picard/ui/ui_metadata.py:127
+msgid "Length:"
+msgstr ""
+
+#: ../picard/ui/tageditor.py:250
+msgid "Bitrate:"
+msgstr ""
+
+#: ../picard/ui/tageditor.py:252
+msgid "Sample rate:"
+msgstr ""
+
+#: ../picard/ui/tageditor.py:254
+msgid "Bits per sample:"
+msgstr ""
+
+#: ../picard/ui/tageditor.py:257
+msgid "Mono"
+msgstr ""
+
+#: ../picard/ui/tageditor.py:258
+msgid "Stereo"
+msgstr ""
+
+#: ../picard/ui/tageditor.py:260
+msgid "Channels:"
+msgstr ""
+
+#: ../picard/ui/tagsfromfilenames.py:54 ../picard/ui/tagsfromfilenames.py:99
+msgid "File Name"
+msgstr ""
+
 #: ../picard/ui/ui_cdlookup.py:60 ../picard/ui/ui_options_cdlookup.py:47
 #: ../picard/ui/ui_options_cdlookup_select.py:48
 #: ../picard/ui/options/cdlookup.py:36
@@ -1712,24 +1749,6 @@ msgstr ""
 msgid "Cancel"
 msgstr "Hætta við"
 
-#: ../picard/ui/ui_passworddialog.py:78
-msgid "Authentication required"
-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"
-msgstr ""
-
 #: ../picard/ui/ui_edittagdialog.py:44
 msgid "Edit Tag"
 msgstr ""
@@ -1766,6 +1785,10 @@ msgstr ""
 msgid "Options"
 msgstr ""
 
+#: ../picard/ui/ui_puidsubmit.py:52
+msgid "Submit PUIDs"
+msgstr "Senda inn PUID"
+
 #: ../picard/ui/ui_options_cdlookup.py:48
 msgid "CD-ROM device to use for lookups:"
 msgstr ""
@@ -1790,6 +1813,22 @@ msgstr ""
 msgid "Overwrite the file if it already exists"
 msgstr ""
 
+#: ../picard/ui/ui_options_moving.py:53
+msgid "Move additional files:"
+msgstr ""
+
+#: ../picard/ui/ui_options_moving.py:54
+msgid "Browse..."
+msgstr ""
+
+#: ../picard/ui/ui_options_moving.py:55
+msgid "Delete empty directories"
+msgstr ""
+
+#: ../picard/ui/ui_options_moving.py:56
+msgid "Move files to this directory when saving:"
+msgstr ""
+
 #: ../picard/ui/util.py:31
 msgid "&Ok"
 msgstr ""
@@ -1798,44 +1837,40 @@ msgstr ""
 msgid "&Cancel"
 msgstr ""
 
-#: ../picard/ui/ui_puidsubmit.py:52
-msgid "Submit PUIDs"
-msgstr "Senda inn PUID"
-
-#: ../picard/ui/ui_tageditor.py:139 ../picard/ui/ui_options_plugins.py:59
-#: ../picard/ui/options/plugins.py:76
+#: ../picard/ui/ui_tageditor.py:128 ../picard/ui/ui_options_plugins.py:59
+#: ../picard/ui/options/plugins.py:81
 msgid "Name"
 msgstr ""
 
-#: ../picard/ui/ui_tageditor.py:140
+#: ../picard/ui/ui_tageditor.py:129
 msgid "Value"
 msgstr ""
 
-#: ../picard/ui/ui_tageditor.py:141
+#: ../picard/ui/ui_tageditor.py:130
 msgid "Rating:"
 msgstr ""
 
-#: ../picard/ui/ui_tageditor.py:142
+#: ../picard/ui/ui_tageditor.py:131
 msgid "&Add..."
 msgstr ""
 
-#: ../picard/ui/ui_tageditor.py:143
+#: ../picard/ui/ui_tageditor.py:132
 msgid "&Edit..."
 msgstr ""
 
-#: ../picard/ui/ui_tageditor.py:144
+#: ../picard/ui/ui_tageditor.py:133
 msgid "&Delete"
 msgstr ""
 
-#: ../picard/ui/ui_tageditor.py:145
+#: ../picard/ui/ui_tageditor.py:134
 msgid "&Metadata"
 msgstr ""
 
-#: ../picard/ui/ui_tageditor.py:146
+#: ../picard/ui/ui_tageditor.py:135
 msgid "A&rtwork"
 msgstr ""
 
-#: ../picard/ui/ui_tageditor.py:147
+#: ../picard/ui/ui_tageditor.py:136
 msgid "&Info"
 msgstr ""
 
@@ -1880,6 +1915,40 @@ msgstr ""
 msgid ", "
 msgstr ""
 
+#: ../picard/ui/ui_options_general.py:108
+msgid "MusicBrainz Server"
+msgstr ""
+
+#: ../picard/ui/ui_options_general.py:109 ../picard/ui/ui_options_proxy.py:72
+msgid "Port:"
+msgstr ""
+
+#: ../picard/ui/ui_options_general.py:110 ../picard/ui/ui_options_proxy.py:73
+msgid "Server address:"
+msgstr ""
+
+#: ../picard/ui/ui_options_general.py:111
+msgid "Account Information"
+msgstr ""
+
+#: ../picard/ui/ui_options_general.py:112 ../picard/ui/ui_options_proxy.py:70
+#: ../picard/ui/ui_passworddialog.py:80
+msgid "Password:"
+msgstr ""
+
+#: ../picard/ui/ui_options_general.py:113 ../picard/ui/ui_options_proxy.py:71
+#: ../picard/ui/ui_passworddialog.py:79
+msgid "Username:"
+msgstr ""
+
+#: ../picard/ui/ui_options_general.py:114 ../picard/ui/options/general.py:29
+msgid "General"
+msgstr "Almennt"
+
+#: ../picard/ui/ui_options_general.py:115
+msgid "Automatically scan all new files"
+msgstr ""
+
 #: ../picard/ui/ui_options_interface.py:50
 msgid "Miscellaneous"
 msgstr ""
@@ -1900,113 +1969,6 @@ msgstr ""
 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 "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_options_naming.py:180
-#: ../picard/ui/ui_tagsfromfilenames.py:58
-msgid "&Preview"
-msgstr ""
-
-#: ../picard/ui/ui_options_proxy.py:81 ../picard/ui/options/proxy.py:28
-msgid "Web Proxy"
-msgstr "Vefsel"
-
-#: ../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_options_ratings.py:45
-msgid "Enable track ratings"
-msgstr ""
-
-#: ../picard/ui/ui_options_ratings.py:46
-msgid ""
-"Picard saves the ratings together with an e-mail address identifying the "
-"user who did the rating. That way different ratings for different users can "
-"be stored in the files. Please sepcify the e-mail you want to use to save "
-"your ratings."
-msgstr ""
-
-#: ../picard/ui/ui_options_ratings.py:47
-msgid "E-mail:"
-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 ../picard/ui/options/general.py:29
-msgid "General"
-msgstr "Almennt"
-
-#: ../picard/ui/ui_options_general.py:115
-msgid "Automatically scan all new files"
-msgstr ""
-
 #: ../picard/ui/ui_options_matching.py:105
 msgid "Thresholds"
 msgstr ""
@@ -2063,72 +2025,146 @@ msgstr ""
 msgid "Non-album tracks:"
 msgstr ""
 
-#: ../picard/ui/ui_options_plugins.py:58 ../picard/ui/options/plugins.py:30
+#: ../picard/ui/ui_options_metadata.py:109
+#: ../picard/ui/ui_options_metadata.py:110
+#: ../picard/ui/ui_options_renaming.py:155
+#: ../picard/ui/ui_options_renaming.py:158
+msgid "Default"
+msgstr "Sjálfgefið"
+
+#: ../picard/ui/ui_options_plugins.py:58 ../picard/ui/options/plugins.py:34
 msgid "Plugins"
 msgstr ""
 
-#: ../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:84
 msgid "Author"
 msgstr ""
 
-#: ../picard/ui/ui_options_plugins.py:61 ../picard/util/tags.py:36
+#: ../picard/ui/ui_options_plugins.py:61 ../picard/util/tags.py:37
 msgid "Version"
 msgstr ""
 
-#: ../picard/ui/ui_options_script.py:52
+#: ../picard/ui/ui_options_proxy.py:69 ../picard/ui/options/proxy.py:28
+msgid "Web Proxy"
+msgstr "Vefsel"
+
+#: ../picard/ui/ui_options_ratings.py:45
+msgid "Enable track ratings"
+msgstr ""
+
+#: ../picard/ui/ui_options_ratings.py:46
+msgid ""
+"Picard saves the ratings together with an e-mail address identifying the "
+"user who did the rating. That way different ratings for different users can "
+"be stored in the files. Please sepcify the e-mail you want to use to save "
+"your ratings."
+msgstr ""
+
+#: ../picard/ui/ui_options_ratings.py:47
+msgid "E-mail:"
+msgstr ""
+
+#: ../picard/ui/ui_options_renaming.py:145
+msgid "Form"
+msgstr ""
+
+#: ../picard/ui/ui_options_renaming.py:146
+#, fuzzy
+msgid "Rename files when saving"
+msgstr "Endurskíra skrár þegar upplýsingar eru skrifaðar"
+
+#: ../picard/ui/ui_options_renaming.py:147
+msgid "Replace non-ASCII characters"
+msgstr ""
+
+#: ../picard/ui/ui_options_renaming.py:148
+msgid "Replace Windows-incompatible characters"
+msgstr ""
+
+#: ../picard/ui/ui_options_renaming.py:149
+msgid "Name files like this"
+msgstr ""
+
+#: ../picard/ui/ui_options_renaming.py:156
+msgid "Name multiple artist albums differently"
+msgstr ""
+
+#: ../picard/ui/ui_options_renaming.py:157
+msgid "Copy from above"
+msgstr ""
+
+#: ../picard/ui/ui_options_renaming.py:159
+msgid "Examples"
+msgstr ""
+
+#: ../picard/ui/ui_options_script.py:43
 msgid "Tagger Script"
 msgstr ""
 
-#: ../picard/ui/ui_options_tags.py:85
-msgid "Common"
+#: ../picard/ui/ui_options_tags.py:97
+msgid "Do not write tags to files"
 msgstr ""
 
-#: ../picard/ui/ui_options_tags.py:86
-msgid "Clear existing tags before writing new tags"
+#: ../picard/ui/ui_options_tags.py:98
+msgid "Before tagging"
+msgstr ""
+
+#: ../picard/ui/ui_options_tags.py:99
+#, fuzzy
+msgid "Clear existing tags"
 msgstr "Hreinsa fyrri tög áður en ný eru skrifuð"
 
-#: ../picard/ui/ui_options_tags.py:87
-msgid "Don not write tags to files"
-msgstr ""
-
-#: ../picard/ui/ui_options_tags.py:88
-msgid "ID3"
-msgstr ""
-
-#: ../picard/ui/ui_options_tags.py:89
-msgid "Write ID3v1 tags to the files"
-msgstr ""
-
-#: ../picard/ui/ui_options_tags.py:90
-msgid "Write ID3v2 version 2.3 tags (2.4 is default)"
-msgstr "Skrifa ID3v2 útgáfu 2.3 tög (2.4 eru sjálfgefin)"
-
-#: ../picard/ui/ui_options_tags.py:91
-msgid "Text encoding to use while writing ID3v2 tags:"
-msgstr ""
-
-#: ../picard/ui/ui_options_tags.py:92
-msgid "ISO-8859-1"
-msgstr ""
-
-#: ../picard/ui/ui_options_tags.py:93
-msgid "UTF-16"
-msgstr ""
-
-#: ../picard/ui/ui_options_tags.py:94
-msgid "UTF-8"
-msgstr ""
-
-#: ../picard/ui/ui_options_tags.py:95
+#: ../picard/ui/ui_options_tags.py:100
 msgid "Remove ID3 tags from FLAC files"
 msgstr ""
 
-#: ../picard/ui/ui_options_tags.py:96
-msgid "APE"
+#: ../picard/ui/ui_options_tags.py:101
+msgid "Remove APEv2 tags from MP3 files"
 msgstr ""
 
-#: ../picard/ui/ui_options_tags.py:97
-msgid "Remove APEv2 tags from MP3 files"
+#: ../picard/ui/ui_options_tags.py:102
+msgid "Tag compatibility"
+msgstr ""
+
+#: ../picard/ui/ui_options_tags.py:103
+#, fuzzy
+msgid "ID3v2 version"
+msgstr "ID3v2.4 eingöngu"
+
+#: ../picard/ui/ui_options_tags.py:104
+msgid "2.4"
+msgstr ""
+
+#: ../picard/ui/ui_options_tags.py:105
+msgid "2.3"
+msgstr ""
+
+#: ../picard/ui/ui_options_tags.py:106
+msgid "Also include ID3v1 tags in the files"
+msgstr ""
+
+#: ../picard/ui/ui_options_tags.py:107
+msgid "ID3v2 text encoding"
+msgstr ""
+
+#: ../picard/ui/ui_options_tags.py:108
+msgid "UTF-8"
+msgstr ""
+
+#: ../picard/ui/ui_options_tags.py:109
+msgid "UTF-16"
+msgstr ""
+
+#: ../picard/ui/ui_options_tags.py:110
+msgid "ISO-8859-1"
+msgstr ""
+
+#: ../picard/ui/ui_passworddialog.py:78
+msgid "Authentication required"
+msgstr ""
+
+#: ../picard/ui/ui_passworddialog.py:81
+msgid "Save username and password"
 msgstr ""
 
 #: ../picard/ui/ui_tagsfromfilenames.py:56
@@ -2139,6 +2175,10 @@ msgstr ""
 msgid "Replace underscores with spaces"
 msgstr ""
 
+#: ../picard/ui/ui_tagsfromfilenames.py:58
+msgid "&Preview"
+msgstr ""
+
 #: ../picard/ui/options/about.py:29
 msgid "About"
 msgstr "Um"
@@ -2163,8 +2203,8 @@ 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"
@@ -2172,14 +2212,13 @@ msgid ""
 "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\"><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/P"
-"icardTagger</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
@@ -2212,42 +2251,45 @@ msgstr ""
 msgid "None"
 msgstr ""
 
-#: ../picard/ui/options/naming.py:33
-msgid "File Naming"
-msgstr ""
+#: ../picard/ui/options/moving.py:33
+#, fuzzy
+msgid "Moving files"
+msgstr "Stillingar"
 
-#: ../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 ""
-
-#: ../picard/ui/options/naming.py:95
-msgid "The multiple artist file naming format must not be empty."
-msgstr ""
-
-#: ../picard/ui/options/naming.py:97
+#: ../picard/ui/options/moving.py:65
 msgid "Error"
 msgstr ""
 
-#: ../picard/ui/options/naming.py:97
+#: ../picard/ui/options/moving.py:65
 msgid "The location to move files to must not be empty."
 msgstr ""
 
-#: ../picard/ui/options/scripting.py:63
-msgid "Scripting"
+#: ../picard/ui/options/ratings.py:29
+msgid "Ratings"
 msgstr ""
 
 #: ../picard/ui/options/tags.py:29
 msgid "Tags"
 msgstr "Tög"
 
-#: ../picard/ui/options/ratings.py:29
-msgid "Ratings"
+#: ../picard/ui/options/renaming.py:35
+msgid "File naming"
+msgstr ""
+
+#: ../picard/ui/options/renaming.py:123
+msgid "The file naming format must not be empty."
+msgstr ""
+
+#: ../picard/ui/options/renaming.py:133
+msgid "The multiple artist file naming format must not be empty."
+msgstr ""
+
+#: ../picard/ui/options/scripting.py:63
+msgid "Scripting"
+msgstr ""
+
+#: ../picard/ui/options/scripting.py:97
+msgid "Script Error"
 msgstr ""
 
 #: ../picard/util/tags.py:24
@@ -2255,214 +2297,219 @@ msgid "Date"
 msgstr ""
 
 #: ../picard/util/tags.py:25
+#, fuzzy
+msgid "Original Release Date"
+msgstr "Útgáfudagur"
+
+#: ../picard/util/tags.py:26
 msgid "Album Artist"
 msgstr ""
 
-#: ../picard/util/tags.py:26
+#: ../picard/util/tags.py:27
 msgid "Track Number"
 msgstr ""
 
-#: ../picard/util/tags.py:27
+#: ../picard/util/tags.py:28
 msgid "Total Tracks"
 msgstr ""
 
-#: ../picard/util/tags.py:28
+#: ../picard/util/tags.py:29
 msgid "Disc Number"
 msgstr ""
 
-#: ../picard/util/tags.py:29
+#: ../picard/util/tags.py:30
 msgid "Total Discs"
 msgstr ""
 
-#: ../picard/util/tags.py:30
+#: ../picard/util/tags.py:31
 msgid "Album Artist Sort Order"
 msgstr ""
 
-#: ../picard/util/tags.py:31
+#: ../picard/util/tags.py:32
 msgid "Artist Sort Order"
 msgstr ""
 
-#: ../picard/util/tags.py:32
+#: ../picard/util/tags.py:33
 msgid "Title Sort Order"
 msgstr ""
 
-#: ../picard/util/tags.py:33
+#: ../picard/util/tags.py:34
 msgid "Album Sort Order"
 msgstr ""
 
-#: ../picard/util/tags.py:34
+#: ../picard/util/tags.py:35
 msgid "ASIN"
 msgstr ""
 
-#: ../picard/util/tags.py:35
+#: ../picard/util/tags.py:36
 msgid "Grouping"
 msgstr ""
 
-#: ../picard/util/tags.py:37
+#: ../picard/util/tags.py:38
 msgid "ISRC"
 msgstr ""
 
-#: ../picard/util/tags.py:38
+#: ../picard/util/tags.py:39
 msgid "Mood"
 msgstr ""
 
-#: ../picard/util/tags.py:39
+#: ../picard/util/tags.py:40
 msgid "BPM"
 msgstr ""
 
-#: ../picard/util/tags.py:40
+#: ../picard/util/tags.py:41
 msgid "Copyright"
 msgstr ""
 
-#: ../picard/util/tags.py:41
+#: ../picard/util/tags.py:42
 msgid "Composer"
 msgstr ""
 
-#: ../picard/util/tags.py:42
+#: ../picard/util/tags.py:43
 msgid "Conductor"
 msgstr ""
 
-#: ../picard/util/tags.py:43
+#: ../picard/util/tags.py:44
 msgid "Lyricist"
 msgstr ""
 
-#: ../picard/util/tags.py:44
+#: ../picard/util/tags.py:45
 msgid "Arranger"
 msgstr ""
 
-#: ../picard/util/tags.py:45
+#: ../picard/util/tags.py:46
 msgid "Producer"
 msgstr ""
 
-#: ../picard/util/tags.py:46
+#: ../picard/util/tags.py:47
 msgid "Engineer"
 msgstr ""
 
-#: ../picard/util/tags.py:47
+#: ../picard/util/tags.py:48
 msgid "Subtitle"
 msgstr ""
 
-#: ../picard/util/tags.py:48
+#: ../picard/util/tags.py:49
 msgid "Disc Subtitle"
 msgstr ""
 
-#: ../picard/util/tags.py:49
+#: ../picard/util/tags.py:50
 msgid "Remixer"
 msgstr ""
 
-#: ../picard/util/tags.py:50
+#: ../picard/util/tags.py:51
 msgid "MusicBrainz Track Id"
 msgstr ""
 
-#: ../picard/util/tags.py:51
+#: ../picard/util/tags.py:52
 msgid "MusicBrainz Release Id"
 msgstr ""
 
-#: ../picard/util/tags.py:52
+#: ../picard/util/tags.py:53
 msgid "MusicBrainz Artist Id"
 msgstr ""
 
-#: ../picard/util/tags.py:53
+#: ../picard/util/tags.py:54
 msgid "MusicBrainz Release Artist Id"
 msgstr ""
 
-#: ../picard/util/tags.py:54
+#: ../picard/util/tags.py:55
 msgid "MusicBrainz TRM Id"
 msgstr ""
 
-#: ../picard/util/tags.py:55
+#: ../picard/util/tags.py:56
 msgid "MusicBrainz Disc Id"
 msgstr ""
 
-#: ../picard/util/tags.py:56
+#: ../picard/util/tags.py:57
 msgid "MusicBrainz Sort Name"
 msgstr ""
 
-#: ../picard/util/tags.py:57
+#: ../picard/util/tags.py:58
 msgid "MusicIP PUID"
 msgstr ""
 
-#: ../picard/util/tags.py:58
+#: ../picard/util/tags.py:59
 msgid "MusicIP Fingerprint"
 msgstr ""
 
-#: ../picard/util/tags.py:59
+#: ../picard/util/tags.py:60
 msgid "Disc Id"
 msgstr ""
 
-#: ../picard/util/tags.py:60
+#: ../picard/util/tags.py:61
 msgid "Website"
 msgstr ""
 
-#: ../picard/util/tags.py:61
+#: ../picard/util/tags.py:62
 msgid "Compilation"
 msgstr ""
 
-#: ../picard/util/tags.py:62
+#: ../picard/util/tags.py:63
 msgid "Comment"
 msgstr ""
 
-#: ../picard/util/tags.py:63
+#: ../picard/util/tags.py:64
 msgid "Genre"
 msgstr ""
 
-#: ../picard/util/tags.py:64
+#: ../picard/util/tags.py:65
 msgid "Encoded By"
 msgstr ""
 
-#: ../picard/util/tags.py:65
+#: ../picard/util/tags.py:66
 msgid "Performer"
 msgstr ""
 
-#: ../picard/util/tags.py:66
+#: ../picard/util/tags.py:67
 msgid "Release Type"
 msgstr ""
 
-#: ../picard/util/tags.py:67
+#: ../picard/util/tags.py:68
 msgid "Release Status"
 msgstr ""
 
-#: ../picard/util/tags.py:68
+#: ../picard/util/tags.py:69
 msgid "Release Country"
 msgstr ""
 
-#: ../picard/util/tags.py:69
+#: ../picard/util/tags.py:70
 msgid "Record Label"
 msgstr ""
 
-#: ../picard/util/tags.py:70
+#: ../picard/util/tags.py:71
 msgid "Barcode"
 msgstr ""
 
-#: ../picard/util/tags.py:71
+#: ../picard/util/tags.py:72
 msgid "Catalog Number"
 msgstr ""
 
-#: ../picard/util/tags.py:72
+#: ../picard/util/tags.py:73
 msgid "Format"
 msgstr ""
 
-#: ../picard/util/tags.py:73
+#: ../picard/util/tags.py:74
 msgid "DJ-Mixer"
 msgstr ""
 
-#: ../picard/util/tags.py:74
+#: ../picard/util/tags.py:75
 msgid "Media"
 msgstr ""
 
-#: ../picard/util/tags.py:75
+#: ../picard/util/tags.py:76
 msgid "Lyrics"
 msgstr ""
 
-#: ../picard/util/tags.py:76
+#: ../picard/util/tags.py:77
 msgid "Mixer"
 msgstr ""
 
-#: ../picard/util/tags.py:77
+#: ../picard/util/tags.py:78
 msgid "Language"
 msgstr "Tungumál"
 
-#: ../picard/util/tags.py:78
+#: ../picard/util/tags.py:79
 msgid "Script"
 msgstr ""
 
@@ -2478,6 +2525,9 @@ msgid ""
 "%s"
 msgstr ""
 
+#~ msgid "Write ID3v2 version 2.3 tags (2.4 is default)"
+#~ msgstr "Skrifa ID3v2 útgáfu 2.3 tög (2.4 eru sjálfgefin)"
+
 #~ msgid "Automatically analyze all new files"
 #~ msgstr "Skoða allar nýjar skrár"
 
@@ -2604,9 +2654,6 @@ msgstr ""
 #~ 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"
 
@@ -2625,9 +2672,6 @@ msgstr ""
 #~ 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"
 
@@ -2662,15 +2706,16 @@ msgstr ""
 #~ 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"
-#~ "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. "
+#~ "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 ""
-#~ "Þú hefur ekki skilgreint notendanafn og lykilorð. Til þess að bæta við 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. "
+#~ "Þú hefur ekki skilgreint notendanafn og lykilorð. Til þess að bæta við "
+#~ "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."
@@ -2694,19 +2739,22 @@ msgstr ""
 #~ 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."
+#~ "Please fix the move option or the destination directory option and try "
+#~ "again."
 #~ 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."
+#~ "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 click the "
-#~ "track and select 'Clear Error'"
+#~ "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 ""
-#~ "Gat ekki vistað allar skrár. Vinsamlegast athugið lög með villutákni fyrir "
-#~ "framan sig.\n"
-#~ "Til að reyna að vista aftur, hægrismellið á lagið og veljið 'Hreinsa Villu'"
+#~ "Gat ekki vistað allar skrár. Vinsamlegast athugið lög með villutákni "
+#~ "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"
@@ -2720,9 +2768,6 @@ msgstr ""
 #~ 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"
 
@@ -2730,7 +2775,8 @@ msgstr ""
 #~ msgstr "Vinsamlegast styrkið MusicBrainz!"
 
 #~ msgid ""
-#~ "The destination directory %s does not exist. Please pick a valid directory."
+#~ "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"
@@ -2749,9 +2795,6 @@ msgstr ""
 #~ 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"
 
@@ -2816,9 +2859,6 @@ msgstr ""
 #~ 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"
 
@@ -2829,8 +2869,8 @@ msgstr ""
 #~ 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. "
+#~ "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. "
diff --git a/po/it.po b/po/it.po
index 3ebf3157c..5590bcbc0 100644
--- a/po/it.po
+++ b/po/it.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: picard\n"
 "Report-Msgid-Bugs-To: http://bugs.musicbrainz.org/\n"
-"POT-Creation-Date: 2009-02-24 18:58+0100\n"
+"POT-Creation-Date: 2009-04-06 22:50+0200\n"
 "PO-Revision-Date: 2009-03-23 12:02+0000\n"
 "Last-Translator: Philipp Wolfer <Unknown>\n"
 "Language-Team: Italian <it@li.org>\n"
@@ -17,16 +17,16 @@ msgstr ""
 "X-Launchpad-Export-Date: 2009-04-06 20:20+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
-#: ../picard/album.py:108 ../picard/cluster.py:248
+#: ../picard/album.py:109 ../picard/cluster.py:248
 msgid "Unmatched Files"
 msgstr "File non riconosciuti"
 
-#: ../picard/album.py:281
+#: ../picard/album.py:287
 #, python-format
 msgid "[could not load album %s]"
 msgstr "[caricamento album %s fallito]"
 
-#: ../picard/album.py:317
+#: ../picard/album.py:320
 msgid "[loading album information]"
 msgstr "[caricamento informazioni album]"
 
@@ -586,7 +586,8 @@ msgid "Namibia"
 msgstr "Namibia"
 
 #: ../picard/const.py:182
-msgid "Vanuat"
+#, fuzzy
+msgid "Vanuatu"
 msgstr "Vanuat"
 
 #: ../picard/const.py:183
@@ -1030,223 +1031,239 @@ msgid "Congo, The Democratic Republic of the"
 msgstr "Congo, Repubblica Democratica del"
 
 #: ../picard/const.py:293
-msgid "Serbia and Montenegro"
+#, fuzzy
+msgid "Serbia and Montenegro (historical, 2003-2006)"
 msgstr "Serbia e Montenegro"
 
 #: ../picard/const.py:294
+#, fuzzy
+msgid "Serbia"
+msgstr "Azerbaigian"
+
+#: ../picard/const.py:295
+#, fuzzy
+msgid "Montenegro"
+msgstr "Serbia e Montenegro"
+
+#: ../picard/const.py:296
 msgid "Croatia"
 msgstr "Croazia"
 
-#: ../picard/const.py:295
+#: ../picard/const.py:297
 msgid "Korea (North), Democratic People's Republic of"
 msgstr "Corea del Nord, Repubblica Democratica Popolare della"
 
-#: ../picard/const.py:296
+#: ../picard/const.py:298
 msgid "Korea (South), Republic of"
 msgstr "Corea del Sud, Repubblica della"
 
-#: ../picard/const.py:297
+#: ../picard/const.py:299
 msgid "Slovakia"
 msgstr "Repubblica Slovacca"
 
-#: ../picard/const.py:298
+#: ../picard/const.py:300
 msgid "Soviet Union (historical, 1922-1991)"
 msgstr "Unione Sovietica (storica, 1922-1991)"
 
-#: ../picard/const.py:299
+#: ../picard/const.py:301
 msgid "East Timor"
 msgstr "Timor Est"
 
-#: ../picard/const.py:300
+#: ../picard/const.py:302
 msgid "Czechoslovakia (historical, 1918-1992)"
 msgstr "Cecoslovacchia"
 
-#: ../picard/const.py:301
+#: ../picard/const.py:303
 msgid "Europe"
 msgstr "Europa"
 
-#: ../picard/const.py:302
+#: ../picard/const.py:304
 msgid "East Germany (historical, 1949-1990)"
 msgstr "Germania Est (storica, 1949-1990)"
 
-#: ../picard/const.py:303
+#: ../picard/const.py:305
 msgid "[Unknown Country]"
 msgstr "[Paese sconosciuto]"
 
-#: ../picard/const.py:304
+#: ../picard/const.py:306
 msgid "[Worldwide]"
 msgstr "[Tutto il mondo]"
 
-#: ../picard/const.py:305
+#: ../picard/const.py:307
 msgid "Yugoslavia (historical, 1918-1992)"
 msgstr "Jugoslavia (storica, 1918-1992)"
 
-#: ../picard/const.py:310
+#: ../picard/const.py:312
+msgid "Afrikaans"
+msgstr ""
+
+#: ../picard/const.py:313
+msgid "Arabic"
+msgstr ""
+
+#: ../picard/const.py:314
 msgid "Catalan"
 msgstr "Catalano"
 
-#: ../picard/const.py:311
+#: ../picard/const.py:315
 msgid "Czech"
 msgstr "Ceco"
 
-#: ../picard/const.py:312
+#: ../picard/const.py:316
 msgid "Welsh"
 msgstr "Gallese"
 
-#: ../picard/const.py:313
+#: ../picard/const.py:317
 msgid "Danish"
 msgstr "Danese"
 
-#: ../picard/const.py:314
+#: ../picard/const.py:318
 msgid "German"
 msgstr "Tedesco"
 
-#: ../picard/const.py:315
+#: ../picard/const.py:319
 msgid "English"
 msgstr "Inglese"
 
-#: ../picard/const.py:316
+#: ../picard/const.py:320
 msgid "English (Canada)"
 msgstr "Inglese (Canada)"
 
-#: ../picard/const.py:317
+#: ../picard/const.py:321
 msgid "English (UK)"
 msgstr "Inglese (UK)"
 
-#: ../picard/const.py:318
+#: ../picard/const.py:322
 msgid "Spanish"
 msgstr "Spagnolo"
 
-#: ../picard/const.py:319
+#: ../picard/const.py:323
 msgid "Persian"
 msgstr "Persiano"
 
-#: ../picard/const.py:320
+#: ../picard/const.py:324
 msgid "Finnish"
 msgstr "Finlandese"
 
-#: ../picard/const.py:321
+#: ../picard/const.py:325
 msgid "French"
 msgstr "Francese"
 
-#: ../picard/const.py:322
+#: ../picard/const.py:326
 msgid "Frisian"
 msgstr "Frisone"
 
-#: ../picard/const.py:323
+#: ../picard/const.py:327
 msgid "Hebrew"
 msgstr "Ebraico"
 
-#: ../picard/const.py:324
+#: ../picard/const.py:328
+#, fuzzy
+msgid "Hindi"
+msgstr "Haiti"
+
+#: ../picard/const.py:329
 msgid "Hungarian"
 msgstr "Ungherese"
 
-#: ../picard/const.py:325
+#: ../picard/const.py:330
 msgid "Islandic"
 msgstr "Islandese"
 
-#: ../picard/const.py:326
+#: ../picard/const.py:331
 msgid "Italian"
 msgstr "Italiano"
 
-#: ../picard/const.py:327
+#: ../picard/const.py:332
 msgid "Kannada"
 msgstr "Kannada"
 
-#: ../picard/const.py:328
+#: ../picard/const.py:333
 msgid "Korean"
 msgstr "Coreano"
 
-#: ../picard/const.py:329
+#: ../picard/const.py:334
 msgid "Lithuanian"
 msgstr "Lituano"
 
-#: ../picard/const.py:330
+#: ../picard/const.py:335
 msgid "Norwegian Bokmal"
 msgstr "Norvegese Bokmal"
 
-#: ../picard/const.py:331
+#: ../picard/const.py:336
 msgid "Dutch"
 msgstr "Olandese"
 
-#: ../picard/const.py:332
+#: ../picard/const.py:337
 msgid "Polish"
 msgstr "Polacco"
 
-#: ../picard/const.py:333
+#: ../picard/const.py:338
 msgid "Portuguese"
 msgstr "Portoghese"
 
-#: ../picard/const.py:334
+#: ../picard/const.py:339
 msgid "Brazilian Portuguese"
 msgstr "Portoghese (Brasile)"
 
-#: ../picard/const.py:335
+#: ../picard/const.py:340
 msgid "Romanian"
 msgstr "Rumeno"
 
-#: ../picard/const.py:336
+#: ../picard/const.py:341
 msgid "Russian"
 msgstr "Russo"
 
-#: ../picard/const.py:337
+#: ../picard/const.py:342
 msgid "Scots"
 msgstr "Scots"
 
-#: ../picard/const.py:338
+#: ../picard/const.py:343
 msgid "Slovak"
 msgstr "Slovacco"
 
-#: ../picard/const.py:339
+#: ../picard/const.py:344
 msgid "Slovenian"
 msgstr "Sloveno"
 
-#: ../picard/const.py:340
+#: ../picard/const.py:345
 msgid "Swedish"
 msgstr "Svedese"
 
-#: ../picard/const.py:341
+#: ../picard/const.py:346
+#, fuzzy
+msgid "Turkish"
+msgstr "Turkmenistan"
+
+#: ../picard/const.py:347
 msgid "Chinese"
 msgstr "Cinese"
 
-#: ../picard/file.py:487
+#: ../picard/file.py:494
 #, python-format
 msgid "No matching tracks for file %s"
 msgstr "Nessuna traccia trovata per il file %s"
 
-#: ../picard/file.py:504
+#: ../picard/file.py:511
 #, python-format
 msgid "No matching tracks above the threshold for file %s"
 msgstr "Nessuna traccioa corrispondente sopra la soglia per il file %s"
 
-#: ../picard/file.py:507
+#: ../picard/file.py:514
 #, python-format
 msgid "File %s identified!"
 msgstr "Il file %s è stato identificato!"
 
-#: ../picard/file.py:518
+#: ../picard/file.py:525
 #, python-format
 msgid "Looking up the PUID for file %s..."
 msgstr "Sto cercando il file %s nel PUID"
 
-#: ../picard/file.py:523
+#: ../picard/file.py:530
 #, 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)"
@@ -1259,11 +1276,24 @@ msgstr "Lista di ascolto PLS (*.pls)"
 msgid "XSPF Playlist (*.xspf)"
 msgstr "Lista di ascolto XSPF (*.xspf)"
 
-#: ../picard/tagger.py:476
+#: ../picard/puidmanager.py:62
+msgid "Submitting PUIDs..."
+msgstr "Sto trasmettendo i PUIDS..."
+
+#: ../picard/puidmanager.py:68
+#, python-format
+msgid "PUIDs submission failed: %s"
+msgstr "L'invio dei PUID è fallito: %s"
+
+#: ../picard/puidmanager.py:70
+msgid "PUIDs successfully submitted!"
+msgstr "PUID correttamente inviati."
+
+#: ../picard/tagger.py:477
 msgid "CD Lookup Error"
 msgstr "Errore di controllo del CD"
 
-#: ../picard/tagger.py:477
+#: ../picard/tagger.py:478
 #, python-format
 msgid ""
 "Error while reading CD:\n"
@@ -1274,7 +1304,7 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../picard/tagger.py:503
+#: ../picard/tagger.py:504
 #, python-format
 msgid "Could not find PUID for file %s"
 msgstr "Non riesco a trovare il PUID per il file %s"
@@ -1327,15 +1357,28 @@ msgstr "Mostra i file &nascosti"
 msgid "Length"
 msgstr "Durata"
 
-#: ../picard/ui/itemviews.py:327
+#: ../picard/ui/itemviews.py:289
+msgid "&Expand all"
+msgstr ""
+
+#: ../picard/ui/itemviews.py:291
+msgid "&Collapse all"
+msgstr ""
+
+#: ../picard/ui/itemviews.py:332
 msgid "&Releases"
 msgstr "&Distibuzioni"
 
-#: ../picard/ui/itemviews.py:353
+#: ../picard/ui/itemviews.py:349
+#, fuzzy
+msgid "No release event"
+msgstr "Mese di uscita dell'album"
+
+#: ../picard/ui/itemviews.py:359
 msgid "&Plugins"
 msgstr "&Plugin"
 
-#: ../picard/ui/itemviews.py:523
+#: ../picard/ui/itemviews.py:533
 msgid "Clusters"
 msgstr "Frammenti"
 
@@ -1343,95 +1386,6 @@ msgstr "Frammenti"
 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:66 ../picard/ui/ui_options_plugins.py:62
-msgid "Details"
-msgstr "Dettagli"
-
-#: ../picard/ui/tageditor.py:71 ../picard/ui/tageditor.py:264
-#, python-format
-msgid "%d file"
-msgid_plural "%d files"
-msgstr[0] "file %d"
-msgstr[1] "file %d"
-
-#: ../picard/ui/tageditor.py:131
-#, 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:134
-#, 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:233
-msgid "Filename:"
-msgstr "Nome file:"
-
-#: ../picard/ui/tageditor.py:235
-msgid "Format:"
-msgstr "Formato:"
-
-#: ../picard/ui/tageditor.py:244
-msgid "Size:"
-msgstr "Dimesione:"
-
-#: ../picard/ui/tageditor.py:248 ../picard/ui/ui_metadata.py:127
-msgid "Length:"
-msgstr "Durata:"
-
-#: ../picard/ui/tageditor.py:250
-msgid "Bitrate:"
-msgstr "Bitrate:"
-
-#: ../picard/ui/tageditor.py:252
-msgid "Sample rate:"
-msgstr "Tasso di campionamento:"
-
-#: ../picard/ui/tageditor.py:254
-msgid "Bits per sample:"
-msgstr "Bits per sample:"
-
-#: ../picard/ui/tageditor.py:257
-msgid "Mono"
-msgstr "Mono"
-
-#: ../picard/ui/tageditor.py:258
-msgid "Stereo"
-msgstr "Stereo"
-
-#: ../picard/ui/tageditor.py:260
-msgid "Channels:"
-msgstr "Canali:"
-
-#: ../picard/ui/tagsfromfilenames.py:52 ../picard/ui/tagsfromfilenames.py:96
-msgid "File Name"
-msgstr "Nome file"
-
 #: ../picard/ui/mainwindow.py:64
 msgid "MusicBrainz Picard"
 msgstr "MusicBrainz Picard"
@@ -1668,6 +1622,10 @@ msgstr "&Barra di ricerca"
 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"
@@ -1687,12 +1645,97 @@ msgstr "La playlist %s è stata salvata."
 msgid " (Error: %s)"
 msgstr " (Errore %s)"
 
+#: ../picard/ui/puidsubmit.py:31 ../picard/ui/options/plugins.py:85
+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/passworddialog.py:38
 #, python-format
 msgid ""
 "The server %s requires you to login. Please enter your username and password."
 msgstr "Il server %s richiede il login. Inserire nome utente e password."
 
+#: ../picard/ui/tageditor.py:66 ../picard/ui/ui_options_plugins.py:62
+msgid "Details"
+msgstr "Dettagli"
+
+#: ../picard/ui/tageditor.py:71 ../picard/ui/tageditor.py:264
+#, python-format
+msgid "%d file"
+msgid_plural "%d files"
+msgstr[0] "file %d"
+msgstr[1] "file %d"
+
+#: ../picard/ui/tageditor.py:131
+#, 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:134
+#, 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:233
+msgid "Filename:"
+msgstr "Nome file:"
+
+#: ../picard/ui/tageditor.py:235
+msgid "Format:"
+msgstr "Formato:"
+
+#: ../picard/ui/tageditor.py:244
+msgid "Size:"
+msgstr "Dimesione:"
+
+#: ../picard/ui/tageditor.py:248 ../picard/ui/ui_metadata.py:127
+msgid "Length:"
+msgstr "Durata:"
+
+#: ../picard/ui/tageditor.py:250
+msgid "Bitrate:"
+msgstr "Bitrate:"
+
+#: ../picard/ui/tageditor.py:252
+msgid "Sample rate:"
+msgstr "Tasso di campionamento:"
+
+#: ../picard/ui/tageditor.py:254
+msgid "Bits per sample:"
+msgstr "Bits per sample:"
+
+#: ../picard/ui/tageditor.py:257
+msgid "Mono"
+msgstr "Mono"
+
+#: ../picard/ui/tageditor.py:258
+msgid "Stereo"
+msgstr "Stereo"
+
+#: ../picard/ui/tageditor.py:260
+msgid "Channels:"
+msgstr "Canali:"
+
+#: ../picard/ui/tagsfromfilenames.py:54 ../picard/ui/tagsfromfilenames.py:99
+msgid "File Name"
+msgstr "Nome file"
+
 #: ../picard/ui/ui_cdlookup.py:60 ../picard/ui/ui_options_cdlookup.py:47
 #: ../picard/ui/ui_options_cdlookup_select.py:48
 #: ../picard/ui/options/cdlookup.py:36
@@ -1715,24 +1758,6 @@ msgstr "    Cerca manualmente    "
 msgid "Cancel"
 msgstr "Annulla"
 
-#: ../picard/ui/ui_passworddialog.py:78
-msgid "Authentication required"
-msgstr "Richiesta autenticazione"
-
-#: ../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/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/ui_passworddialog.py:81
-msgid "Save username and password"
-msgstr "Salvare nome utente e password"
-
 #: ../picard/ui/ui_edittagdialog.py:44
 msgid "Edit Tag"
 msgstr "Modifica tag"
@@ -1769,6 +1794,10 @@ msgstr "Album:"
 msgid "Options"
 msgstr "Opzioni"
 
+#: ../picard/ui/ui_puidsubmit.py:52
+msgid "Submit PUIDs"
+msgstr "Sto inviando i PUID"
+
 #: ../picard/ui/ui_options_cdlookup.py:48
 msgid "CD-ROM device to use for lookups:"
 msgstr "Unità CD da usare per i controlli:"
@@ -1793,6 +1822,23 @@ msgstr "Salva l'immagine della copertina come file separato"
 msgid "Overwrite the file if it already exists"
 msgstr "Sovrascrivi il file se è già presente"
 
+#: ../picard/ui/ui_options_moving.py:53
+msgid "Move additional files:"
+msgstr "Sposta files aggiuntivi:"
+
+#: ../picard/ui/ui_options_moving.py:54
+msgid "Browse..."
+msgstr "Sfoglia..."
+
+#: ../picard/ui/ui_options_moving.py:55
+msgid "Delete empty directories"
+msgstr "Cancella cartelle vuote"
+
+#: ../picard/ui/ui_options_moving.py:56
+#, fuzzy
+msgid "Move files to this directory when saving:"
+msgstr "Sposta i files che hanno il tag in questa cartella:"
+
 #: ../picard/ui/util.py:31
 msgid "&Ok"
 msgstr "&Ok"
@@ -1801,44 +1847,40 @@ msgstr "&Ok"
 msgid "&Cancel"
 msgstr "A&nnulla"
 
-#: ../picard/ui/ui_puidsubmit.py:52
-msgid "Submit PUIDs"
-msgstr "Sto inviando i PUID"
-
-#: ../picard/ui/ui_tageditor.py:139 ../picard/ui/ui_options_plugins.py:59
-#: ../picard/ui/options/plugins.py:76
+#: ../picard/ui/ui_tageditor.py:128 ../picard/ui/ui_options_plugins.py:59
+#: ../picard/ui/options/plugins.py:81
 msgid "Name"
 msgstr "Nome"
 
-#: ../picard/ui/ui_tageditor.py:140
+#: ../picard/ui/ui_tageditor.py:129
 msgid "Value"
 msgstr "Valore"
 
-#: ../picard/ui/ui_tageditor.py:141
+#: ../picard/ui/ui_tageditor.py:130
 msgid "Rating:"
 msgstr ""
 
-#: ../picard/ui/ui_tageditor.py:142
+#: ../picard/ui/ui_tageditor.py:131
 msgid "&Add..."
 msgstr "&Aggiungi..."
 
-#: ../picard/ui/ui_tageditor.py:143
+#: ../picard/ui/ui_tageditor.py:132
 msgid "&Edit..."
 msgstr "&Modifica..."
 
-#: ../picard/ui/ui_tageditor.py:144
+#: ../picard/ui/ui_tageditor.py:133
 msgid "&Delete"
 msgstr "&Cancella"
 
-#: ../picard/ui/ui_tageditor.py:145
+#: ../picard/ui/ui_tageditor.py:134
 msgid "&Metadata"
 msgstr "&Metadati"
 
-#: ../picard/ui/ui_tageditor.py:146
+#: ../picard/ui/ui_tageditor.py:135
 msgid "A&rtwork"
 msgstr "A&rtwork"
 
-#: ../picard/ui/ui_tageditor.py:147
+#: ../picard/ui/ui_tageditor.py:136
 msgid "&Info"
 msgstr "&Info"
 
@@ -1883,6 +1925,40 @@ msgstr " / "
 msgid ", "
 msgstr ". "
 
+#: ../picard/ui/ui_options_general.py:108
+msgid "MusicBrainz Server"
+msgstr "Server MusicBrainz"
+
+#: ../picard/ui/ui_options_general.py:109 ../picard/ui/ui_options_proxy.py:72
+msgid "Port:"
+msgstr "Porta:"
+
+#: ../picard/ui/ui_options_general.py:110 ../picard/ui/ui_options_proxy.py:73
+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:112 ../picard/ui/ui_options_proxy.py:70
+#: ../picard/ui/ui_passworddialog.py:80
+msgid "Password:"
+msgstr "Parola d'accesso:"
+
+#: ../picard/ui/ui_options_general.py:113 ../picard/ui/ui_options_proxy.py:71
+#: ../picard/ui/ui_passworddialog.py:79
+msgid "Username:"
+msgstr "Nome utente:"
+
+#: ../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 "Analizza automaticamente tutti i file nuovi"
+
 #: ../picard/ui/ui_options_interface.py:50
 msgid "Miscellaneous"
 msgstr "Varie"
@@ -1903,113 +1979,6 @@ msgstr "Usa sintassi di richiesta avanzata"
 msgid "User interface language:"
 msgstr "Lingua dell'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_options_naming.py:180
-#: ../picard/ui/ui_tagsfromfilenames.py:58
-msgid "&Preview"
-msgstr "Ante&prima"
-
-#: ../picard/ui/ui_options_proxy.py:81 ../picard/ui/options/proxy.py:28
-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 "Indirizzo server:"
-
-#: ../picard/ui/ui_options_ratings.py:45
-msgid "Enable track ratings"
-msgstr ""
-
-#: ../picard/ui/ui_options_ratings.py:46
-msgid ""
-"Picard saves the ratings together with an e-mail address identifying the "
-"user who did the rating. That way different ratings for different users can "
-"be stored in the files. Please sepcify the e-mail you want to use to save "
-"your ratings."
-msgstr ""
-
-#: ../picard/ui/ui_options_ratings.py:47
-msgid "E-mail:"
-msgstr ""
-
-#: ../picard/ui/ui_options_general.py:108
-msgid "MusicBrainz Server"
-msgstr "Server MusicBrainz"
-
-#: ../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"
-
-#: ../picard/ui/ui_options_general.py:115
-msgid "Automatically scan all new files"
-msgstr "Analizza automaticamente tutti i file nuovi"
-
 #: ../picard/ui/ui_options_matching.py:105
 msgid "Thresholds"
 msgstr "Limiti"
@@ -2066,74 +2035,152 @@ msgstr "Artisti vari:"
 msgid "Non-album tracks:"
 msgstr "Tracce senza album:"
 
-#: ../picard/ui/ui_options_plugins.py:58 ../picard/ui/options/plugins.py:30
+#: ../picard/ui/ui_options_metadata.py:109
+#: ../picard/ui/ui_options_metadata.py:110
+#: ../picard/ui/ui_options_renaming.py:155
+#: ../picard/ui/ui_options_renaming.py:158
+msgid "Default"
+msgstr "Default"
+
+#: ../picard/ui/ui_options_plugins.py:58 ../picard/ui/options/plugins.py:34
 msgid "Plugins"
 msgstr "Plugin"
 
-#: ../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:84
 msgid "Author"
 msgstr "Autore"
 
-#: ../picard/ui/ui_options_plugins.py:61 ../picard/util/tags.py:36
+#: ../picard/ui/ui_options_plugins.py:61 ../picard/util/tags.py:37
 msgid "Version"
 msgstr "Versione"
 
-#: ../picard/ui/ui_options_script.py:52
+#: ../picard/ui/ui_options_proxy.py:69 ../picard/ui/options/proxy.py:28
+msgid "Web Proxy"
+msgstr "Proxy Web"
+
+#: ../picard/ui/ui_options_ratings.py:45
+msgid "Enable track ratings"
+msgstr ""
+
+#: ../picard/ui/ui_options_ratings.py:46
+msgid ""
+"Picard saves the ratings together with an e-mail address identifying the "
+"user who did the rating. That way different ratings for different users can "
+"be stored in the files. Please sepcify the e-mail you want to use to save "
+"your ratings."
+msgstr ""
+
+#: ../picard/ui/ui_options_ratings.py:47
+msgid "E-mail:"
+msgstr ""
+
+#: ../picard/ui/ui_options_renaming.py:145
+#, fuzzy
+msgid "Form"
+msgstr "Formato"
+
+#: ../picard/ui/ui_options_renaming.py:146
+#, fuzzy
+msgid "Rename files when saving"
+msgstr "Rinonima i file mentre etichetti con i metadata tag"
+
+#: ../picard/ui/ui_options_renaming.py:147
+msgid "Replace non-ASCII characters"
+msgstr "Sostituisci i caratteri non ASCII"
+
+#: ../picard/ui/ui_options_renaming.py:148
+msgid "Replace Windows-incompatible characters"
+msgstr "Sostituisci i caratteri non compatibili con Windows"
+
+#: ../picard/ui/ui_options_renaming.py:149
+msgid "Name files like this"
+msgstr ""
+
+#: ../picard/ui/ui_options_renaming.py:156
+msgid "Name multiple artist albums differently"
+msgstr ""
+
+#: ../picard/ui/ui_options_renaming.py:157
+msgid "Copy from above"
+msgstr ""
+
+#: ../picard/ui/ui_options_renaming.py:159
+#, fuzzy
+msgid "Examples"
+msgstr "Esempio"
+
+#: ../picard/ui/ui_options_script.py:43
 msgid "Tagger Script"
 msgstr "Script Tagger"
 
-#: ../picard/ui/ui_options_tags.py:85
-msgid "Common"
-msgstr "Comune"
-
-#: ../picard/ui/ui_options_tags.py:86
-msgid "Clear existing tags before writing new tags"
-msgstr "Cancella i tag esistenti prima di scrivere nuovi tag"
-
-#: ../picard/ui/ui_options_tags.py:87
-msgid "Don not write tags to files"
+#: ../picard/ui/ui_options_tags.py:97
+#, fuzzy
+msgid "Do not write tags to files"
 msgstr "Non scrivere i tag nei file"
 
-#: ../picard/ui/ui_options_tags.py:88
-msgid "ID3"
-msgstr "ID3"
+#: ../picard/ui/ui_options_tags.py:98
+msgid "Before tagging"
+msgstr ""
 
-#: ../picard/ui/ui_options_tags.py:89
-msgid "Write ID3v1 tags to the files"
-msgstr "Scrivi i tag ID3v1 nei file"
+#: ../picard/ui/ui_options_tags.py:99
+#, fuzzy
+msgid "Clear existing tags"
+msgstr "Cancella i tag esistenti prima di scrivere nuovi tag"
 
-#: ../picard/ui/ui_options_tags.py:90
-msgid "Write ID3v2 version 2.3 tags (2.4 is default)"
-msgstr "Scrivi i tag ID3v2 nella versione 2.3 (normalmente 2.4)"
-
-#: ../picard/ui/ui_options_tags.py:91
-msgid "Text encoding to use while writing ID3v2 tags:"
-msgstr "Codifica di testo da usare per scrivere i tag ID3v2"
-
-#: ../picard/ui/ui_options_tags.py:92
-msgid "ISO-8859-1"
-msgstr "ISO-8859-1"
-
-#: ../picard/ui/ui_options_tags.py:93
-msgid "UTF-16"
-msgstr "UTF-16"
-
-#: ../picard/ui/ui_options_tags.py:94
-msgid "UTF-8"
-msgstr "UTF-8"
-
-#: ../picard/ui/ui_options_tags.py:95
+#: ../picard/ui/ui_options_tags.py:100
 msgid "Remove ID3 tags from FLAC files"
 msgstr "Rimuovi i tag ID3 dai file FLAc"
 
-#: ../picard/ui/ui_options_tags.py:96
-msgid "APE"
-msgstr "APE"
-
-#: ../picard/ui/ui_options_tags.py:97
+#: ../picard/ui/ui_options_tags.py:101
 msgid "Remove APEv2 tags from MP3 files"
 msgstr "Rimuovi i tag APEv2 dai file MP3"
 
+#: ../picard/ui/ui_options_tags.py:102
+msgid "Tag compatibility"
+msgstr ""
+
+#: ../picard/ui/ui_options_tags.py:103
+#, fuzzy
+msgid "ID3v2 version"
+msgstr "Solo ID3v2.4"
+
+#: ../picard/ui/ui_options_tags.py:104
+msgid "2.4"
+msgstr ""
+
+#: ../picard/ui/ui_options_tags.py:105
+msgid "2.3"
+msgstr ""
+
+#: ../picard/ui/ui_options_tags.py:106
+#, fuzzy
+msgid "Also include ID3v1 tags in the files"
+msgstr "Scrivi i tag ID3v1 nei file"
+
+#: ../picard/ui/ui_options_tags.py:107
+msgid "ID3v2 text encoding"
+msgstr ""
+
+#: ../picard/ui/ui_options_tags.py:108
+msgid "UTF-8"
+msgstr "UTF-8"
+
+#: ../picard/ui/ui_options_tags.py:109
+msgid "UTF-16"
+msgstr "UTF-16"
+
+#: ../picard/ui/ui_options_tags.py:110
+msgid "ISO-8859-1"
+msgstr "ISO-8859-1"
+
+#: ../picard/ui/ui_passworddialog.py:78
+msgid "Authentication required"
+msgstr "Richiesta autenticazione"
+
+#: ../picard/ui/ui_passworddialog.py:81
+msgid "Save username and password"
+msgstr "Salvare nome utente e password"
+
 #: ../picard/ui/ui_tagsfromfilenames.py:56
 msgid "Convert File Names to Tags"
 msgstr "Converti i nomi dei file in tag"
@@ -2142,6 +2189,10 @@ msgstr "Converti i nomi dei file in tag"
 msgid "Replace underscores with spaces"
 msgstr "Sostituisci gli underscore con degli spazi"
 
+#: ../picard/ui/ui_tagsfromfilenames.py:58
+msgid "&Preview"
+msgstr "Ante&prima"
+
 #: ../picard/ui/options/about.py:29
 msgid "About"
 msgstr "Informazioni"
@@ -2180,8 +2231,8 @@ msgstr "<br/>Tradotto in italiano da %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"
@@ -2189,17 +2240,16 @@ msgid ""
 "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\"><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/P"
-"icardTagger</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><br/>%(formats)s</p>\n"
 "<p align=\"center\"><strong>Per favore, dona</strong><br/>\n"
@@ -2210,11 +2260,10 @@ msgstr ""
 "<p align=\"center\"><a href=\"http://metabrainz.org/donate/index.html\">Dona "
 "adesso!</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/P"
-"icardTagger</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"
 
 #: ../picard/ui/options/advanced.py:26
 msgid "Advanced"
@@ -2248,257 +2297,266 @@ msgstr "Confronto"
 msgid "None"
 msgstr "Nessuno"
 
-#: ../picard/ui/options/naming.py:33
-msgid "File Naming"
-msgstr "Assegnazione di nome al file"
+#: ../picard/ui/options/moving.py:33
+#, fuzzy
+msgid "Moving files"
+msgstr "Sposta files"
 
-#: ../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."
-msgstr "Il formato del nome non può essere vuoto."
-
-#: ../picard/ui/options/naming.py:95
-msgid "The multiple artist file naming format must not be empty."
-msgstr "Il formato del nome per artisti multipli non può essere vuoto."
-
-#: ../picard/ui/options/naming.py:97
+#: ../picard/ui/options/moving.py:65
 msgid "Error"
 msgstr "Errore"
 
-#: ../picard/ui/options/naming.py:97
+#: ../picard/ui/options/moving.py:65
 msgid "The location to move files to must not be empty."
 msgstr "La posizione dove spostare i file non può essere vuota"
 
-#: ../picard/ui/options/scripting.py:63
-msgid "Scripting"
-msgstr "Scripting"
+#: ../picard/ui/options/ratings.py:29
+msgid "Ratings"
+msgstr ""
 
 #: ../picard/ui/options/tags.py:29
 msgid "Tags"
 msgstr "Tag"
 
-#: ../picard/ui/options/ratings.py:29
-msgid "Ratings"
-msgstr ""
+#: ../picard/ui/options/renaming.py:35
+#, fuzzy
+msgid "File naming"
+msgstr "Assegnazione di nome al file"
+
+#: ../picard/ui/options/renaming.py:123
+msgid "The file naming format must not be empty."
+msgstr "Il formato del nome non può essere vuoto."
+
+#: ../picard/ui/options/renaming.py:133
+msgid "The multiple artist file naming format must not be empty."
+msgstr "Il formato del nome per artisti multipli non può essere vuoto."
+
+#: ../picard/ui/options/scripting.py:63
+msgid "Scripting"
+msgstr "Scripting"
+
+#: ../picard/ui/options/scripting.py:97
+msgid "Script Error"
+msgstr "Errore causato dallo script"
 
 #: ../picard/util/tags.py:24
 msgid "Date"
 msgstr "Data"
 
 #: ../picard/util/tags.py:25
+#, fuzzy
+msgid "Original Release Date"
+msgstr "Metadata originale"
+
+#: ../picard/util/tags.py:26
 msgid "Album Artist"
 msgstr "Artista"
 
-#: ../picard/util/tags.py:26
+#: ../picard/util/tags.py:27
 msgid "Track Number"
 msgstr "Brano numero"
 
-#: ../picard/util/tags.py:27
+#: ../picard/util/tags.py:28
 msgid "Total Tracks"
 msgstr "Tracce totali"
 
-#: ../picard/util/tags.py:28
+#: ../picard/util/tags.py:29
 msgid "Disc Number"
 msgstr "Disco numero"
 
-#: ../picard/util/tags.py:29
+#: ../picard/util/tags.py:30
 msgid "Total Discs"
 msgstr "Totale dischi"
 
-#: ../picard/util/tags.py:30
+#: ../picard/util/tags.py:31
 msgid "Album Artist Sort Order"
 msgstr "Ordina per Artista"
 
-#: ../picard/util/tags.py:31
+#: ../picard/util/tags.py:32
 msgid "Artist Sort Order"
 msgstr "Ordinamento artisti"
 
-#: ../picard/util/tags.py:32
+#: ../picard/util/tags.py:33
 msgid "Title Sort Order"
 msgstr "Ordinamento titoli"
 
-#: ../picard/util/tags.py:33
+#: ../picard/util/tags.py:34
 msgid "Album Sort Order"
 msgstr "Ordina per Album"
 
-#: ../picard/util/tags.py:34
+#: ../picard/util/tags.py:35
 msgid "ASIN"
 msgstr "ASIN"
 
-#: ../picard/util/tags.py:35
+#: ../picard/util/tags.py:36
 msgid "Grouping"
 msgstr "Raggruppamento"
 
-#: ../picard/util/tags.py:37
+#: ../picard/util/tags.py:38
 msgid "ISRC"
 msgstr "ISRC"
 
-#: ../picard/util/tags.py:38
+#: ../picard/util/tags.py:39
 msgid "Mood"
 msgstr "Modo"
 
-#: ../picard/util/tags.py:39
+#: ../picard/util/tags.py:40
 msgid "BPM"
 msgstr "BPM"
 
-#: ../picard/util/tags.py:40
+#: ../picard/util/tags.py:41
 msgid "Copyright"
 msgstr "Copyright"
 
-#: ../picard/util/tags.py:41
+#: ../picard/util/tags.py:42
 msgid "Composer"
 msgstr "Compositore"
 
-#: ../picard/util/tags.py:42
+#: ../picard/util/tags.py:43
 msgid "Conductor"
 msgstr "Conduttore"
 
-#: ../picard/util/tags.py:43
+#: ../picard/util/tags.py:44
 msgid "Lyricist"
 msgstr "Autore testo"
 
-#: ../picard/util/tags.py:44
+#: ../picard/util/tags.py:45
 msgid "Arranger"
 msgstr "Arrangiatore"
 
-#: ../picard/util/tags.py:45
+#: ../picard/util/tags.py:46
 msgid "Producer"
 msgstr "Produttore"
 
-#: ../picard/util/tags.py:46
+#: ../picard/util/tags.py:47
 msgid "Engineer"
 msgstr "Ingegnere"
 
-#: ../picard/util/tags.py:47
+#: ../picard/util/tags.py:48
 msgid "Subtitle"
 msgstr "Sottotitolo"
 
-#: ../picard/util/tags.py:48
+#: ../picard/util/tags.py:49
 msgid "Disc Subtitle"
 msgstr "Sottotitolo del Disco"
 
-#: ../picard/util/tags.py:49
+#: ../picard/util/tags.py:50
 msgid "Remixer"
 msgstr "Remixer"
 
-#: ../picard/util/tags.py:50
+#: ../picard/util/tags.py:51
 msgid "MusicBrainz Track Id"
 msgstr "Codice Id del Brano in Music Brainz"
 
-#: ../picard/util/tags.py:51
+#: ../picard/util/tags.py:52
 msgid "MusicBrainz Release Id"
 msgstr "Codice Id della Distribuzione di MusicBrainz"
 
-#: ../picard/util/tags.py:52
+#: ../picard/util/tags.py:53
 msgid "MusicBrainz Artist Id"
 msgstr "Codice Id dell'Artista in MusicBrainz"
 
-#: ../picard/util/tags.py:53
+#: ../picard/util/tags.py:54
 msgid "MusicBrainz Release Artist Id"
 msgstr "Codice Id dell'Artista nella Distribuzione di MusicBrainz"
 
-#: ../picard/util/tags.py:54
+#: ../picard/util/tags.py:55
 msgid "MusicBrainz TRM Id"
 msgstr "Codice Id del TRM in MusicBrainz"
 
-#: ../picard/util/tags.py:55
+#: ../picard/util/tags.py:56
 msgid "MusicBrainz Disc Id"
 msgstr "ID Disco MusicBrainz"
 
-#: ../picard/util/tags.py:56
+#: ../picard/util/tags.py:57
 msgid "MusicBrainz Sort Name"
 msgstr "Nome di ordinamento MusicBrainz"
 
-#: ../picard/util/tags.py:57
+#: ../picard/util/tags.py:58
 msgid "MusicIP PUID"
 msgstr "PUID MusicIP"
 
-#: ../picard/util/tags.py:58
+#: ../picard/util/tags.py:59
 msgid "MusicIP Fingerprint"
 msgstr "Codice Identificativo MusicIP"
 
-#: ../picard/util/tags.py:59
+#: ../picard/util/tags.py:60
 msgid "Disc Id"
 msgstr "ID Disco"
 
-#: ../picard/util/tags.py:60
+#: ../picard/util/tags.py:61
 msgid "Website"
 msgstr "Sito web"
 
-#: ../picard/util/tags.py:61
+#: ../picard/util/tags.py:62
 msgid "Compilation"
 msgstr "Compilation"
 
-#: ../picard/util/tags.py:62
+#: ../picard/util/tags.py:63
 msgid "Comment"
 msgstr "Commento"
 
-#: ../picard/util/tags.py:63
+#: ../picard/util/tags.py:64
 msgid "Genre"
 msgstr "Genere"
 
-#: ../picard/util/tags.py:64
+#: ../picard/util/tags.py:65
 msgid "Encoded By"
 msgstr "Codificato da"
 
-#: ../picard/util/tags.py:65
+#: ../picard/util/tags.py:66
 msgid "Performer"
 msgstr "Esecutore"
 
-#: ../picard/util/tags.py:66
+#: ../picard/util/tags.py:67
 msgid "Release Type"
 msgstr "Tipo di Distribuzione"
 
-#: ../picard/util/tags.py:67
+#: ../picard/util/tags.py:68
 msgid "Release Status"
 msgstr "Stato della Distribuzione"
 
-#: ../picard/util/tags.py:68
+#: ../picard/util/tags.py:69
 msgid "Release Country"
 msgstr "Paese della Distribuzione"
 
-#: ../picard/util/tags.py:69
+#: ../picard/util/tags.py:70
 msgid "Record Label"
 msgstr "Etichetta discografica"
 
-#: ../picard/util/tags.py:70
+#: ../picard/util/tags.py:71
 msgid "Barcode"
 msgstr "Codice a barre"
 
-#: ../picard/util/tags.py:71
+#: ../picard/util/tags.py:72
 msgid "Catalog Number"
 msgstr "Numero di Catalogo"
 
-#: ../picard/util/tags.py:72
+#: ../picard/util/tags.py:73
 msgid "Format"
 msgstr "Formato"
 
-#: ../picard/util/tags.py:73
+#: ../picard/util/tags.py:74
 msgid "DJ-Mixer"
 msgstr "Mixer da Dj"
 
-#: ../picard/util/tags.py:74
+#: ../picard/util/tags.py:75
 msgid "Media"
 msgstr "Supporti"
 
-#: ../picard/util/tags.py:75
+#: ../picard/util/tags.py:76
 msgid "Lyrics"
 msgstr "Testi"
 
-#: ../picard/util/tags.py:76
+#: ../picard/util/tags.py:77
 msgid "Mixer"
 msgstr "Mixer"
 
-#: ../picard/util/tags.py:77
+#: ../picard/util/tags.py:78
 msgid "Language"
 msgstr "Lingua"
 
-#: ../picard/util/tags.py:78
+#: ../picard/util/tags.py:79
 msgid "Script"
 msgstr "Script"
 
@@ -2517,16 +2575,45 @@ msgstr ""
 "\n"
 "%s"
 
+#~ msgid "Rename Files"
+#~ msgstr "Rinomina file"
+
+#~ msgid "Multiple artist file naming format:"
+#~ msgstr "Formato-file per interpreti diversi:"
+
+#~ msgid "File naming format:"
+#~ msgstr "Formato del nome del file:"
+
+#~ msgid "File name:"
+#~ msgstr "Nome file:"
+
+#~ msgid "Multiple artist file name:"
+#~ msgstr "Nome del file di Artisti vari"
+
+#~ msgid "Common"
+#~ msgstr "Comune"
+
+#~ msgid "ID3"
+#~ msgstr "ID3"
+
+#~ msgid "Write ID3v2 version 2.3 tags (2.4 is default)"
+#~ msgstr "Scrivi i tag ID3v2 nella versione 2.3 (normalmente 2.4)"
+
+#~ msgid "Text encoding to use while writing ID3v2 tags:"
+#~ msgstr "Codifica di testo da usare per scrivere i tag ID3v2"
+
+#~ msgid "APE"
+#~ msgstr "APE"
+
 #~ msgid "New Version"
 #~ msgstr "Nuova versione"
 
-#, python-format
 #~ msgid ""
-#~ "New version of Picard is available (%s). Would you like to download it now?"
+#~ "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?"
 
-#, python-format
 #~ msgid "Couldn't find PUID for file %s"
 #~ msgstr "Non riesco a trovare il PUID per il file %s"
 
@@ -2665,9 +2752,6 @@ msgstr ""
 #~ 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"
 
@@ -2686,9 +2770,6 @@ msgstr ""
 #~ msgid "Proxy port"
 #~ msgstr "Porta proxy"
 
-#~ msgid "ID3v2.4 only"
-#~ msgstr "Solo ID3v2.4"
-
 #~ msgid "Save track/album"
 #~ msgstr "Salva traccia/album"
 
@@ -2723,15 +2804,16 @@ msgstr ""
 #~ 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"
-#~ "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. "
+#~ "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 ""
 #~ "Non hai specificato un nome utente e una password. Prima di poter "
 #~ "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. "
+#~ "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"
@@ -2755,21 +2837,22 @@ msgstr ""
 #~ 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."
+#~ "Please fix the move option or the destination directory option and try "
+#~ "again."
 #~ msgstr ""
-#~ "L'opzione di spostare i file è abilitata, ma la cartella di destinazione non "
-#~ "è stata inserita oppure non è valida.\n"
+#~ "L'opzione di spostare i file è abilitata, ma la cartella di destinazione "
+#~ "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 click the "
-#~ "track and select 'Clear Error'"
+#~ "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 ""
-#~ "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\""
+#~ "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"
@@ -2793,10 +2876,11 @@ msgstr ""
 #~ msgstr "Dona a MusicBrainz!"
 
 #~ msgid ""
-#~ "The destination directory %s does not exist. Please pick a valid directory."
+#~ "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"
+#~ "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"
@@ -2813,9 +2897,6 @@ msgstr ""
 #~ 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"
 
@@ -2827,7 +2908,8 @@ msgstr ""
 #~ "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"
+#~ msgstr ""
+#~ "Un %s nella specifica della rinomina creerà una nuova sotto-cartella"
 
 #~ msgid "Audio fingerprinting options"
 #~ msgstr "Opzioni audio fingerprinting"
@@ -2837,7 +2919,8 @@ 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)"
+#~ msgstr ""
+#~ "Scrivi i tag ID3v1 nei file MP3 (i tag ID3v2 saranno sempre scritti)"
 
 #~ msgid "Remove track/album"
 #~ msgstr "Rimuovi traccia/album"
@@ -2897,11 +2980,11 @@ msgstr ""
 #~ 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. "
+#~ "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 "
+#~ "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"
diff --git a/po/kn.po b/po/kn.po
index 5b3ca65a7..e85e259be 100644
--- a/po/kn.po
+++ b/po/kn.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: picard\n"
 "Report-Msgid-Bugs-To: http://bugs.musicbrainz.org/\n"
-"POT-Creation-Date: 2009-02-24 18:58+0100\n"
+"POT-Creation-Date: 2009-04-06 22:50+0200\n"
 "PO-Revision-Date: 2008-12-01 22:26+0000\n"
 "Last-Translator: Jayasimha (ಜಯಸಿಂಹ) <jayasimha.p@netapp.com>\n"
 "Language-Team: Kannada <kn@li.org>\n"
@@ -18,16 +18,16 @@ msgstr ""
 "X-Launchpad-Export-Date: 2009-04-06 20:21+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
-#: ../picard/album.py:108 ../picard/cluster.py:248
+#: ../picard/album.py:109 ../picard/cluster.py:248
 msgid "Unmatched Files"
 msgstr "ಸರಿ ಹೊಂದದ ಕಡತ"
 
-#: ../picard/album.py:281
+#: ../picard/album.py:287
 #, python-format
 msgid "[could not load album %s]"
 msgstr ""
 
-#: ../picard/album.py:317
+#: ../picard/album.py:320
 msgid "[loading album information]"
 msgstr ""
 
@@ -587,7 +587,7 @@ msgid "Namibia"
 msgstr ""
 
 #: ../picard/const.py:182
-msgid "Vanuat"
+msgid "Vanuatu"
 msgstr ""
 
 #: ../picard/const.py:183
@@ -1031,223 +1031,234 @@ msgid "Congo, The Democratic Republic of the"
 msgstr ""
 
 #: ../picard/const.py:293
-msgid "Serbia and Montenegro"
+msgid "Serbia and Montenegro (historical, 2003-2006)"
 msgstr ""
 
 #: ../picard/const.py:294
-msgid "Croatia"
+msgid "Serbia"
 msgstr ""
 
 #: ../picard/const.py:295
-msgid "Korea (North), Democratic People's Republic of"
+msgid "Montenegro"
 msgstr ""
 
 #: ../picard/const.py:296
-msgid "Korea (South), Republic of"
+msgid "Croatia"
 msgstr ""
 
 #: ../picard/const.py:297
-msgid "Slovakia"
+msgid "Korea (North), Democratic People's Republic of"
 msgstr ""
 
 #: ../picard/const.py:298
-msgid "Soviet Union (historical, 1922-1991)"
+msgid "Korea (South), Republic of"
 msgstr ""
 
 #: ../picard/const.py:299
-msgid "East Timor"
+msgid "Slovakia"
 msgstr ""
 
 #: ../picard/const.py:300
-msgid "Czechoslovakia (historical, 1918-1992)"
+msgid "Soviet Union (historical, 1922-1991)"
 msgstr ""
 
 #: ../picard/const.py:301
-msgid "Europe"
+msgid "East Timor"
 msgstr ""
 
 #: ../picard/const.py:302
-msgid "East Germany (historical, 1949-1990)"
+msgid "Czechoslovakia (historical, 1918-1992)"
 msgstr ""
 
 #: ../picard/const.py:303
-msgid "[Unknown Country]"
+msgid "Europe"
 msgstr ""
 
 #: ../picard/const.py:304
-msgid "[Worldwide]"
+msgid "East Germany (historical, 1949-1990)"
 msgstr ""
 
 #: ../picard/const.py:305
+msgid "[Unknown Country]"
+msgstr ""
+
+#: ../picard/const.py:306
+msgid "[Worldwide]"
+msgstr ""
+
+#: ../picard/const.py:307
 msgid "Yugoslavia (historical, 1918-1992)"
 msgstr ""
 
-#: ../picard/const.py:310
-msgid "Catalan"
-msgstr ""
-
-#: ../picard/const.py:311
-msgid "Czech"
-msgstr ""
-
 #: ../picard/const.py:312
-msgid "Welsh"
+msgid "Afrikaans"
 msgstr ""
 
 #: ../picard/const.py:313
-msgid "Danish"
+msgid "Arabic"
 msgstr ""
 
 #: ../picard/const.py:314
-msgid "German"
+msgid "Catalan"
 msgstr ""
 
 #: ../picard/const.py:315
-msgid "English"
+msgid "Czech"
 msgstr ""
 
 #: ../picard/const.py:316
-msgid "English (Canada)"
+msgid "Welsh"
 msgstr ""
 
 #: ../picard/const.py:317
-msgid "English (UK)"
+msgid "Danish"
 msgstr ""
 
 #: ../picard/const.py:318
-msgid "Spanish"
+msgid "German"
 msgstr ""
 
 #: ../picard/const.py:319
-msgid "Persian"
+msgid "English"
 msgstr ""
 
 #: ../picard/const.py:320
-msgid "Finnish"
+msgid "English (Canada)"
 msgstr ""
 
 #: ../picard/const.py:321
-msgid "French"
+msgid "English (UK)"
 msgstr ""
 
 #: ../picard/const.py:322
-msgid "Frisian"
+msgid "Spanish"
 msgstr ""
 
 #: ../picard/const.py:323
-msgid "Hebrew"
+msgid "Persian"
 msgstr ""
 
 #: ../picard/const.py:324
-msgid "Hungarian"
+msgid "Finnish"
 msgstr ""
 
 #: ../picard/const.py:325
-msgid "Islandic"
+msgid "French"
 msgstr ""
 
 #: ../picard/const.py:326
-msgid "Italian"
+msgid "Frisian"
 msgstr ""
 
 #: ../picard/const.py:327
-msgid "Kannada"
+msgid "Hebrew"
 msgstr ""
 
 #: ../picard/const.py:328
-msgid "Korean"
+msgid "Hindi"
 msgstr ""
 
 #: ../picard/const.py:329
-msgid "Lithuanian"
+msgid "Hungarian"
 msgstr ""
 
 #: ../picard/const.py:330
-msgid "Norwegian Bokmal"
+msgid "Islandic"
 msgstr ""
 
 #: ../picard/const.py:331
-msgid "Dutch"
+msgid "Italian"
 msgstr ""
 
 #: ../picard/const.py:332
-msgid "Polish"
+msgid "Kannada"
 msgstr ""
 
 #: ../picard/const.py:333
-msgid "Portuguese"
+msgid "Korean"
 msgstr ""
 
 #: ../picard/const.py:334
-msgid "Brazilian Portuguese"
+msgid "Lithuanian"
 msgstr ""
 
 #: ../picard/const.py:335
-msgid "Romanian"
+msgid "Norwegian Bokmal"
 msgstr ""
 
 #: ../picard/const.py:336
-msgid "Russian"
+msgid "Dutch"
 msgstr ""
 
 #: ../picard/const.py:337
-msgid "Scots"
+msgid "Polish"
 msgstr ""
 
 #: ../picard/const.py:338
-msgid "Slovak"
+msgid "Portuguese"
 msgstr ""
 
 #: ../picard/const.py:339
-msgid "Slovenian"
+msgid "Brazilian Portuguese"
 msgstr ""
 
 #: ../picard/const.py:340
-msgid "Swedish"
+msgid "Romanian"
 msgstr ""
 
 #: ../picard/const.py:341
+msgid "Russian"
+msgstr ""
+
+#: ../picard/const.py:342
+msgid "Scots"
+msgstr ""
+
+#: ../picard/const.py:343
+msgid "Slovak"
+msgstr ""
+
+#: ../picard/const.py:344
+msgid "Slovenian"
+msgstr ""
+
+#: ../picard/const.py:345
+msgid "Swedish"
+msgstr ""
+
+#: ../picard/const.py:346
+msgid "Turkish"
+msgstr ""
+
+#: ../picard/const.py:347
 msgid "Chinese"
 msgstr ""
 
-#: ../picard/file.py:487
+#: ../picard/file.py:494
 #, python-format
 msgid "No matching tracks for file %s"
 msgstr "%s ಕಡತವು ಯಾವುದೇ ಸಂಗೀತ ಕೃತಿಯನ್ನು ಹೊಲುತ್ತಿಲ್ಲ"
 
-#: ../picard/file.py:504
+#: ../picard/file.py:511
 #, python-format
 msgid "No matching tracks above the threshold for file %s"
 msgstr ""
 
-#: ../picard/file.py:507
+#: ../picard/file.py:514
 #, python-format
 msgid "File %s identified!"
 msgstr "%s ಕಡತವನ್ನು ಗುರುತಿಸಲಾಗಿದೆ"
 
-#: ../picard/file.py:518
+#: ../picard/file.py:525
 #, python-format
 msgid "Looking up the PUID for file %s..."
 msgstr "%s ಕಡತದ ಪಿಯುಐಡಿ ಅನ್ನು ಹುಡುಕಲಾಗುತ್ತಿದೆ"
 
-#: ../picard/file.py:523
+#: ../picard/file.py:530
 #, 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 ""
@@ -1260,11 +1271,24 @@ msgstr ""
 msgid "XSPF Playlist (*.xspf)"
 msgstr ""
 
-#: ../picard/tagger.py:476
+#: ../picard/puidmanager.py:62
+msgid "Submitting PUIDs..."
+msgstr "ಪಿಯುಐಡಿಗಳನ್ನು ಸಲ್ಲಿಸಲಾಗುತ್ತಿದೆ..."
+
+#: ../picard/puidmanager.py:68
+#, python-format
+msgid "PUIDs submission failed: %s"
+msgstr "ಪಿಯುಐಡಿಗಳ ಸಲ್ಲಿಸುವಿಕೆಯಲ್ಲಿ ತೊಂದರೆಯಾಗಿದೆ: %s"
+
+#: ../picard/puidmanager.py:70
+msgid "PUIDs successfully submitted!"
+msgstr "ಪಿಯುಐಡಿಗಳನ್ನು ಯಶಸ್ವಿಯಾಗಿ ಸಲ್ಲಿಸಲಾಗಿದೆ!"
+
+#: ../picard/tagger.py:477
 msgid "CD Lookup Error"
 msgstr ""
 
-#: ../picard/tagger.py:477
+#: ../picard/tagger.py:478
 #, python-format
 msgid ""
 "Error while reading CD:\n"
@@ -1272,7 +1296,7 @@ msgid ""
 "%s"
 msgstr ""
 
-#: ../picard/tagger.py:503
+#: ../picard/tagger.py:504
 #, python-format
 msgid "Could not find PUID for file %s"
 msgstr ""
@@ -1325,15 +1349,27 @@ msgstr ""
 msgid "Length"
 msgstr "ಕಾಲಾವಧಿ"
 
-#: ../picard/ui/itemviews.py:327
+#: ../picard/ui/itemviews.py:289
+msgid "&Expand all"
+msgstr ""
+
+#: ../picard/ui/itemviews.py:291
+msgid "&Collapse all"
+msgstr ""
+
+#: ../picard/ui/itemviews.py:332
 msgid "&Releases"
 msgstr ""
 
-#: ../picard/ui/itemviews.py:353
+#: ../picard/ui/itemviews.py:349
+msgid "No release event"
+msgstr ""
+
+#: ../picard/ui/itemviews.py:359
 msgid "&Plugins"
 msgstr ""
 
-#: ../picard/ui/itemviews.py:523
+#: ../picard/ui/itemviews.py:533
 msgid "Clusters"
 msgstr ""
 
@@ -1341,95 +1377,6 @@ msgstr ""
 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:66 ../picard/ui/ui_options_plugins.py:62
-msgid "Details"
-msgstr ""
-
-#: ../picard/ui/tageditor.py:71 ../picard/ui/tageditor.py:264
-#, python-format
-msgid "%d file"
-msgid_plural "%d files"
-msgstr[0] ""
-msgstr[1] ""
-
-#: ../picard/ui/tageditor.py:131
-#, python-format
-msgid "(different across %d file)"
-msgid_plural "(different across %d files)"
-msgstr[0] ""
-msgstr[1] ""
-
-#: ../picard/ui/tageditor.py:134
-#, python-format
-msgid "(missing from %d file)"
-msgid_plural "(missing from %d files)"
-msgstr[0] ""
-msgstr[1] ""
-
-#: ../picard/ui/tageditor.py:233
-msgid "Filename:"
-msgstr ""
-
-#: ../picard/ui/tageditor.py:235
-msgid "Format:"
-msgstr ""
-
-#: ../picard/ui/tageditor.py:244
-msgid "Size:"
-msgstr ""
-
-#: ../picard/ui/tageditor.py:248 ../picard/ui/ui_metadata.py:127
-msgid "Length:"
-msgstr ""
-
-#: ../picard/ui/tageditor.py:250
-msgid "Bitrate:"
-msgstr ""
-
-#: ../picard/ui/tageditor.py:252
-msgid "Sample rate:"
-msgstr ""
-
-#: ../picard/ui/tageditor.py:254
-msgid "Bits per sample:"
-msgstr ""
-
-#: ../picard/ui/tageditor.py:257
-msgid "Mono"
-msgstr ""
-
-#: ../picard/ui/tageditor.py:258
-msgid "Stereo"
-msgstr ""
-
-#: ../picard/ui/tageditor.py:260
-msgid "Channels:"
-msgstr ""
-
-#: ../picard/ui/tagsfromfilenames.py:52 ../picard/ui/tagsfromfilenames.py:96
-msgid "File Name"
-msgstr ""
-
 #: ../picard/ui/mainwindow.py:64
 msgid "MusicBrainz Picard"
 msgstr ""
@@ -1666,6 +1613,10 @@ msgstr ""
 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 ""
@@ -1685,12 +1636,97 @@ msgstr ""
 msgid " (Error: %s)"
 msgstr ""
 
+#: ../picard/ui/puidsubmit.py:31 ../picard/ui/options/plugins.py:85
+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/passworddialog.py:38
 #, python-format
 msgid ""
 "The server %s requires you to login. Please enter your username and password."
 msgstr ""
 
+#: ../picard/ui/tageditor.py:66 ../picard/ui/ui_options_plugins.py:62
+msgid "Details"
+msgstr ""
+
+#: ../picard/ui/tageditor.py:71 ../picard/ui/tageditor.py:264
+#, python-format
+msgid "%d file"
+msgid_plural "%d files"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../picard/ui/tageditor.py:131
+#, python-format
+msgid "(different across %d file)"
+msgid_plural "(different across %d files)"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../picard/ui/tageditor.py:134
+#, python-format
+msgid "(missing from %d file)"
+msgid_plural "(missing from %d files)"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../picard/ui/tageditor.py:233
+msgid "Filename:"
+msgstr ""
+
+#: ../picard/ui/tageditor.py:235
+msgid "Format:"
+msgstr ""
+
+#: ../picard/ui/tageditor.py:244
+msgid "Size:"
+msgstr ""
+
+#: ../picard/ui/tageditor.py:248 ../picard/ui/ui_metadata.py:127
+msgid "Length:"
+msgstr ""
+
+#: ../picard/ui/tageditor.py:250
+msgid "Bitrate:"
+msgstr ""
+
+#: ../picard/ui/tageditor.py:252
+msgid "Sample rate:"
+msgstr ""
+
+#: ../picard/ui/tageditor.py:254
+msgid "Bits per sample:"
+msgstr ""
+
+#: ../picard/ui/tageditor.py:257
+msgid "Mono"
+msgstr ""
+
+#: ../picard/ui/tageditor.py:258
+msgid "Stereo"
+msgstr ""
+
+#: ../picard/ui/tageditor.py:260
+msgid "Channels:"
+msgstr ""
+
+#: ../picard/ui/tagsfromfilenames.py:54 ../picard/ui/tagsfromfilenames.py:99
+msgid "File Name"
+msgstr ""
+
 #: ../picard/ui/ui_cdlookup.py:60 ../picard/ui/ui_options_cdlookup.py:47
 #: ../picard/ui/ui_options_cdlookup_select.py:48
 #: ../picard/ui/options/cdlookup.py:36
@@ -1713,24 +1749,6 @@ msgstr ""
 msgid "Cancel"
 msgstr ""
 
-#: ../picard/ui/ui_passworddialog.py:78
-msgid "Authentication required"
-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"
-msgstr ""
-
 #: ../picard/ui/ui_edittagdialog.py:44
 msgid "Edit Tag"
 msgstr ""
@@ -1767,6 +1785,10 @@ msgstr ""
 msgid "Options"
 msgstr ""
 
+#: ../picard/ui/ui_puidsubmit.py:52
+msgid "Submit PUIDs"
+msgstr ""
+
 #: ../picard/ui/ui_options_cdlookup.py:48
 msgid "CD-ROM device to use for lookups:"
 msgstr ""
@@ -1791,6 +1813,22 @@ msgstr ""
 msgid "Overwrite the file if it already exists"
 msgstr ""
 
+#: ../picard/ui/ui_options_moving.py:53
+msgid "Move additional files:"
+msgstr ""
+
+#: ../picard/ui/ui_options_moving.py:54
+msgid "Browse..."
+msgstr ""
+
+#: ../picard/ui/ui_options_moving.py:55
+msgid "Delete empty directories"
+msgstr ""
+
+#: ../picard/ui/ui_options_moving.py:56
+msgid "Move files to this directory when saving:"
+msgstr ""
+
 #: ../picard/ui/util.py:31
 msgid "&Ok"
 msgstr ""
@@ -1799,44 +1837,40 @@ msgstr ""
 msgid "&Cancel"
 msgstr ""
 
-#: ../picard/ui/ui_puidsubmit.py:52
-msgid "Submit PUIDs"
-msgstr ""
-
-#: ../picard/ui/ui_tageditor.py:139 ../picard/ui/ui_options_plugins.py:59
-#: ../picard/ui/options/plugins.py:76
+#: ../picard/ui/ui_tageditor.py:128 ../picard/ui/ui_options_plugins.py:59
+#: ../picard/ui/options/plugins.py:81
 msgid "Name"
 msgstr ""
 
-#: ../picard/ui/ui_tageditor.py:140
+#: ../picard/ui/ui_tageditor.py:129
 msgid "Value"
 msgstr ""
 
-#: ../picard/ui/ui_tageditor.py:141
+#: ../picard/ui/ui_tageditor.py:130
 msgid "Rating:"
 msgstr ""
 
-#: ../picard/ui/ui_tageditor.py:142
+#: ../picard/ui/ui_tageditor.py:131
 msgid "&Add..."
 msgstr ""
 
-#: ../picard/ui/ui_tageditor.py:143
+#: ../picard/ui/ui_tageditor.py:132
 msgid "&Edit..."
 msgstr ""
 
-#: ../picard/ui/ui_tageditor.py:144
+#: ../picard/ui/ui_tageditor.py:133
 msgid "&Delete"
 msgstr ""
 
-#: ../picard/ui/ui_tageditor.py:145
+#: ../picard/ui/ui_tageditor.py:134
 msgid "&Metadata"
 msgstr ""
 
-#: ../picard/ui/ui_tageditor.py:146
+#: ../picard/ui/ui_tageditor.py:135
 msgid "A&rtwork"
 msgstr ""
 
-#: ../picard/ui/ui_tageditor.py:147
+#: ../picard/ui/ui_tageditor.py:136
 msgid "&Info"
 msgstr ""
 
@@ -1881,6 +1915,40 @@ msgstr ""
 msgid ", "
 msgstr ""
 
+#: ../picard/ui/ui_options_general.py:108
+msgid "MusicBrainz Server"
+msgstr ""
+
+#: ../picard/ui/ui_options_general.py:109 ../picard/ui/ui_options_proxy.py:72
+msgid "Port:"
+msgstr ""
+
+#: ../picard/ui/ui_options_general.py:110 ../picard/ui/ui_options_proxy.py:73
+msgid "Server address:"
+msgstr ""
+
+#: ../picard/ui/ui_options_general.py:111
+msgid "Account Information"
+msgstr ""
+
+#: ../picard/ui/ui_options_general.py:112 ../picard/ui/ui_options_proxy.py:70
+#: ../picard/ui/ui_passworddialog.py:80
+msgid "Password:"
+msgstr ""
+
+#: ../picard/ui/ui_options_general.py:113 ../picard/ui/ui_options_proxy.py:71
+#: ../picard/ui/ui_passworddialog.py:79
+msgid "Username:"
+msgstr ""
+
+#: ../picard/ui/ui_options_general.py:114 ../picard/ui/options/general.py:29
+msgid "General"
+msgstr ""
+
+#: ../picard/ui/ui_options_general.py:115
+msgid "Automatically scan all new files"
+msgstr ""
+
 #: ../picard/ui/ui_options_interface.py:50
 msgid "Miscellaneous"
 msgstr ""
@@ -1901,113 +1969,6 @@ msgstr ""
 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_options_naming.py:180
-#: ../picard/ui/ui_tagsfromfilenames.py:58
-msgid "&Preview"
-msgstr ""
-
-#: ../picard/ui/ui_options_proxy.py:81 ../picard/ui/options/proxy.py:28
-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_options_ratings.py:45
-msgid "Enable track ratings"
-msgstr ""
-
-#: ../picard/ui/ui_options_ratings.py:46
-msgid ""
-"Picard saves the ratings together with an e-mail address identifying the "
-"user who did the rating. That way different ratings for different users can "
-"be stored in the files. Please sepcify the e-mail you want to use to save "
-"your ratings."
-msgstr ""
-
-#: ../picard/ui/ui_options_ratings.py:47
-msgid "E-mail:"
-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 ../picard/ui/options/general.py:29
-msgid "General"
-msgstr ""
-
-#: ../picard/ui/ui_options_general.py:115
-msgid "Automatically scan all new files"
-msgstr ""
-
 #: ../picard/ui/ui_options_matching.py:105
 msgid "Thresholds"
 msgstr ""
@@ -2064,72 +2025,143 @@ msgstr ""
 msgid "Non-album tracks:"
 msgstr ""
 
-#: ../picard/ui/ui_options_plugins.py:58 ../picard/ui/options/plugins.py:30
+#: ../picard/ui/ui_options_metadata.py:109
+#: ../picard/ui/ui_options_metadata.py:110
+#: ../picard/ui/ui_options_renaming.py:155
+#: ../picard/ui/ui_options_renaming.py:158
+msgid "Default"
+msgstr ""
+
+#: ../picard/ui/ui_options_plugins.py:58 ../picard/ui/options/plugins.py:34
 msgid "Plugins"
 msgstr ""
 
-#: ../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:84
 msgid "Author"
 msgstr ""
 
-#: ../picard/ui/ui_options_plugins.py:61 ../picard/util/tags.py:36
+#: ../picard/ui/ui_options_plugins.py:61 ../picard/util/tags.py:37
 msgid "Version"
 msgstr ""
 
-#: ../picard/ui/ui_options_script.py:52
+#: ../picard/ui/ui_options_proxy.py:69 ../picard/ui/options/proxy.py:28
+msgid "Web Proxy"
+msgstr ""
+
+#: ../picard/ui/ui_options_ratings.py:45
+msgid "Enable track ratings"
+msgstr ""
+
+#: ../picard/ui/ui_options_ratings.py:46
+msgid ""
+"Picard saves the ratings together with an e-mail address identifying the "
+"user who did the rating. That way different ratings for different users can "
+"be stored in the files. Please sepcify the e-mail you want to use to save "
+"your ratings."
+msgstr ""
+
+#: ../picard/ui/ui_options_ratings.py:47
+msgid "E-mail:"
+msgstr ""
+
+#: ../picard/ui/ui_options_renaming.py:145
+msgid "Form"
+msgstr ""
+
+#: ../picard/ui/ui_options_renaming.py:146
+msgid "Rename files when saving"
+msgstr ""
+
+#: ../picard/ui/ui_options_renaming.py:147
+msgid "Replace non-ASCII characters"
+msgstr ""
+
+#: ../picard/ui/ui_options_renaming.py:148
+msgid "Replace Windows-incompatible characters"
+msgstr ""
+
+#: ../picard/ui/ui_options_renaming.py:149
+msgid "Name files like this"
+msgstr ""
+
+#: ../picard/ui/ui_options_renaming.py:156
+msgid "Name multiple artist albums differently"
+msgstr ""
+
+#: ../picard/ui/ui_options_renaming.py:157
+msgid "Copy from above"
+msgstr ""
+
+#: ../picard/ui/ui_options_renaming.py:159
+msgid "Examples"
+msgstr ""
+
+#: ../picard/ui/ui_options_script.py:43
 msgid "Tagger Script"
 msgstr ""
 
-#: ../picard/ui/ui_options_tags.py:85
-msgid "Common"
+#: ../picard/ui/ui_options_tags.py:97
+msgid "Do not write tags to files"
 msgstr ""
 
-#: ../picard/ui/ui_options_tags.py:86
-msgid "Clear existing tags before writing new tags"
+#: ../picard/ui/ui_options_tags.py:98
+msgid "Before tagging"
 msgstr ""
 
-#: ../picard/ui/ui_options_tags.py:87
-msgid "Don not write tags to files"
+#: ../picard/ui/ui_options_tags.py:99
+msgid "Clear existing tags"
 msgstr ""
 
-#: ../picard/ui/ui_options_tags.py:88
-msgid "ID3"
-msgstr ""
-
-#: ../picard/ui/ui_options_tags.py:89
-msgid "Write ID3v1 tags to the files"
-msgstr ""
-
-#: ../picard/ui/ui_options_tags.py:90
-msgid "Write ID3v2 version 2.3 tags (2.4 is default)"
-msgstr ""
-
-#: ../picard/ui/ui_options_tags.py:91
-msgid "Text encoding to use while writing ID3v2 tags:"
-msgstr ""
-
-#: ../picard/ui/ui_options_tags.py:92
-msgid "ISO-8859-1"
-msgstr ""
-
-#: ../picard/ui/ui_options_tags.py:93
-msgid "UTF-16"
-msgstr ""
-
-#: ../picard/ui/ui_options_tags.py:94
-msgid "UTF-8"
-msgstr ""
-
-#: ../picard/ui/ui_options_tags.py:95
+#: ../picard/ui/ui_options_tags.py:100
 msgid "Remove ID3 tags from FLAC files"
 msgstr ""
 
-#: ../picard/ui/ui_options_tags.py:96
-msgid "APE"
+#: ../picard/ui/ui_options_tags.py:101
+msgid "Remove APEv2 tags from MP3 files"
 msgstr ""
 
-#: ../picard/ui/ui_options_tags.py:97
-msgid "Remove APEv2 tags from MP3 files"
+#: ../picard/ui/ui_options_tags.py:102
+msgid "Tag compatibility"
+msgstr ""
+
+#: ../picard/ui/ui_options_tags.py:103
+msgid "ID3v2 version"
+msgstr ""
+
+#: ../picard/ui/ui_options_tags.py:104
+msgid "2.4"
+msgstr ""
+
+#: ../picard/ui/ui_options_tags.py:105
+msgid "2.3"
+msgstr ""
+
+#: ../picard/ui/ui_options_tags.py:106
+msgid "Also include ID3v1 tags in the files"
+msgstr ""
+
+#: ../picard/ui/ui_options_tags.py:107
+msgid "ID3v2 text encoding"
+msgstr ""
+
+#: ../picard/ui/ui_options_tags.py:108
+msgid "UTF-8"
+msgstr ""
+
+#: ../picard/ui/ui_options_tags.py:109
+msgid "UTF-16"
+msgstr ""
+
+#: ../picard/ui/ui_options_tags.py:110
+msgid "ISO-8859-1"
+msgstr ""
+
+#: ../picard/ui/ui_passworddialog.py:78
+msgid "Authentication required"
+msgstr ""
+
+#: ../picard/ui/ui_passworddialog.py:81
+msgid "Save username and password"
 msgstr ""
 
 #: ../picard/ui/ui_tagsfromfilenames.py:56
@@ -2140,6 +2172,10 @@ msgstr ""
 msgid "Replace underscores with spaces"
 msgstr ""
 
+#: ../picard/ui/ui_tagsfromfilenames.py:58
+msgid "&Preview"
+msgstr ""
+
 #: ../picard/ui/options/about.py:29
 msgid "About"
 msgstr ""
@@ -2163,8 +2199,8 @@ 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"
@@ -2172,14 +2208,13 @@ msgid ""
 "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\"><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/P"
-"icardTagger</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
@@ -2212,42 +2247,44 @@ msgstr ""
 msgid "None"
 msgstr ""
 
-#: ../picard/ui/options/naming.py:33
-msgid "File Naming"
+#: ../picard/ui/options/moving.py:33
+msgid "Moving files"
 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 ""
-
-#: ../picard/ui/options/naming.py:95
-msgid "The multiple artist file naming format must not be empty."
-msgstr ""
-
-#: ../picard/ui/options/naming.py:97
+#: ../picard/ui/options/moving.py:65
 msgid "Error"
 msgstr ""
 
-#: ../picard/ui/options/naming.py:97
+#: ../picard/ui/options/moving.py:65
 msgid "The location to move files to must not be empty."
 msgstr ""
 
-#: ../picard/ui/options/scripting.py:63
-msgid "Scripting"
+#: ../picard/ui/options/ratings.py:29
+msgid "Ratings"
 msgstr ""
 
 #: ../picard/ui/options/tags.py:29
 msgid "Tags"
 msgstr ""
 
-#: ../picard/ui/options/ratings.py:29
-msgid "Ratings"
+#: ../picard/ui/options/renaming.py:35
+msgid "File naming"
+msgstr ""
+
+#: ../picard/ui/options/renaming.py:123
+msgid "The file naming format must not be empty."
+msgstr ""
+
+#: ../picard/ui/options/renaming.py:133
+msgid "The multiple artist file naming format must not be empty."
+msgstr ""
+
+#: ../picard/ui/options/scripting.py:63
+msgid "Scripting"
+msgstr ""
+
+#: ../picard/ui/options/scripting.py:97
+msgid "Script Error"
 msgstr ""
 
 #: ../picard/util/tags.py:24
@@ -2255,214 +2292,219 @@ msgid "Date"
 msgstr ""
 
 #: ../picard/util/tags.py:25
+#, fuzzy
+msgid "Original Release Date"
+msgstr "ಮೊದಲಿನ ಮೆಟಾಡಾಟಾ"
+
+#: ../picard/util/tags.py:26
 msgid "Album Artist"
 msgstr ""
 
-#: ../picard/util/tags.py:26
+#: ../picard/util/tags.py:27
 msgid "Track Number"
 msgstr ""
 
-#: ../picard/util/tags.py:27
+#: ../picard/util/tags.py:28
 msgid "Total Tracks"
 msgstr ""
 
-#: ../picard/util/tags.py:28
+#: ../picard/util/tags.py:29
 msgid "Disc Number"
 msgstr ""
 
-#: ../picard/util/tags.py:29
+#: ../picard/util/tags.py:30
 msgid "Total Discs"
 msgstr ""
 
-#: ../picard/util/tags.py:30
+#: ../picard/util/tags.py:31
 msgid "Album Artist Sort Order"
 msgstr ""
 
-#: ../picard/util/tags.py:31
+#: ../picard/util/tags.py:32
 msgid "Artist Sort Order"
 msgstr ""
 
-#: ../picard/util/tags.py:32
+#: ../picard/util/tags.py:33
 msgid "Title Sort Order"
 msgstr ""
 
-#: ../picard/util/tags.py:33
+#: ../picard/util/tags.py:34
 msgid "Album Sort Order"
 msgstr ""
 
-#: ../picard/util/tags.py:34
+#: ../picard/util/tags.py:35
 msgid "ASIN"
 msgstr ""
 
-#: ../picard/util/tags.py:35
+#: ../picard/util/tags.py:36
 msgid "Grouping"
 msgstr ""
 
-#: ../picard/util/tags.py:37
+#: ../picard/util/tags.py:38
 msgid "ISRC"
 msgstr ""
 
-#: ../picard/util/tags.py:38
+#: ../picard/util/tags.py:39
 msgid "Mood"
 msgstr ""
 
-#: ../picard/util/tags.py:39
+#: ../picard/util/tags.py:40
 msgid "BPM"
 msgstr ""
 
-#: ../picard/util/tags.py:40
+#: ../picard/util/tags.py:41
 msgid "Copyright"
 msgstr ""
 
-#: ../picard/util/tags.py:41
+#: ../picard/util/tags.py:42
 msgid "Composer"
 msgstr ""
 
-#: ../picard/util/tags.py:42
+#: ../picard/util/tags.py:43
 msgid "Conductor"
 msgstr ""
 
-#: ../picard/util/tags.py:43
+#: ../picard/util/tags.py:44
 msgid "Lyricist"
 msgstr ""
 
-#: ../picard/util/tags.py:44
+#: ../picard/util/tags.py:45
 msgid "Arranger"
 msgstr ""
 
-#: ../picard/util/tags.py:45
+#: ../picard/util/tags.py:46
 msgid "Producer"
 msgstr ""
 
-#: ../picard/util/tags.py:46
+#: ../picard/util/tags.py:47
 msgid "Engineer"
 msgstr ""
 
-#: ../picard/util/tags.py:47
+#: ../picard/util/tags.py:48
 msgid "Subtitle"
 msgstr ""
 
-#: ../picard/util/tags.py:48
+#: ../picard/util/tags.py:49
 msgid "Disc Subtitle"
 msgstr ""
 
-#: ../picard/util/tags.py:49
+#: ../picard/util/tags.py:50
 msgid "Remixer"
 msgstr ""
 
-#: ../picard/util/tags.py:50
+#: ../picard/util/tags.py:51
 msgid "MusicBrainz Track Id"
 msgstr ""
 
-#: ../picard/util/tags.py:51
+#: ../picard/util/tags.py:52
 msgid "MusicBrainz Release Id"
 msgstr ""
 
-#: ../picard/util/tags.py:52
+#: ../picard/util/tags.py:53
 msgid "MusicBrainz Artist Id"
 msgstr ""
 
-#: ../picard/util/tags.py:53
+#: ../picard/util/tags.py:54
 msgid "MusicBrainz Release Artist Id"
 msgstr ""
 
-#: ../picard/util/tags.py:54
+#: ../picard/util/tags.py:55
 msgid "MusicBrainz TRM Id"
 msgstr ""
 
-#: ../picard/util/tags.py:55
+#: ../picard/util/tags.py:56
 msgid "MusicBrainz Disc Id"
 msgstr ""
 
-#: ../picard/util/tags.py:56
+#: ../picard/util/tags.py:57
 msgid "MusicBrainz Sort Name"
 msgstr ""
 
-#: ../picard/util/tags.py:57
+#: ../picard/util/tags.py:58
 msgid "MusicIP PUID"
 msgstr ""
 
-#: ../picard/util/tags.py:58
+#: ../picard/util/tags.py:59
 msgid "MusicIP Fingerprint"
 msgstr ""
 
-#: ../picard/util/tags.py:59
+#: ../picard/util/tags.py:60
 msgid "Disc Id"
 msgstr ""
 
-#: ../picard/util/tags.py:60
+#: ../picard/util/tags.py:61
 msgid "Website"
 msgstr ""
 
-#: ../picard/util/tags.py:61
+#: ../picard/util/tags.py:62
 msgid "Compilation"
 msgstr ""
 
-#: ../picard/util/tags.py:62
+#: ../picard/util/tags.py:63
 msgid "Comment"
 msgstr ""
 
-#: ../picard/util/tags.py:63
+#: ../picard/util/tags.py:64
 msgid "Genre"
 msgstr ""
 
-#: ../picard/util/tags.py:64
+#: ../picard/util/tags.py:65
 msgid "Encoded By"
 msgstr ""
 
-#: ../picard/util/tags.py:65
+#: ../picard/util/tags.py:66
 msgid "Performer"
 msgstr ""
 
-#: ../picard/util/tags.py:66
+#: ../picard/util/tags.py:67
 msgid "Release Type"
 msgstr ""
 
-#: ../picard/util/tags.py:67
+#: ../picard/util/tags.py:68
 msgid "Release Status"
 msgstr ""
 
-#: ../picard/util/tags.py:68
+#: ../picard/util/tags.py:69
 msgid "Release Country"
 msgstr ""
 
-#: ../picard/util/tags.py:69
+#: ../picard/util/tags.py:70
 msgid "Record Label"
 msgstr ""
 
-#: ../picard/util/tags.py:70
+#: ../picard/util/tags.py:71
 msgid "Barcode"
 msgstr ""
 
-#: ../picard/util/tags.py:71
+#: ../picard/util/tags.py:72
 msgid "Catalog Number"
 msgstr ""
 
-#: ../picard/util/tags.py:72
+#: ../picard/util/tags.py:73
 msgid "Format"
 msgstr ""
 
-#: ../picard/util/tags.py:73
+#: ../picard/util/tags.py:74
 msgid "DJ-Mixer"
 msgstr ""
 
-#: ../picard/util/tags.py:74
+#: ../picard/util/tags.py:75
 msgid "Media"
 msgstr ""
 
-#: ../picard/util/tags.py:75
+#: ../picard/util/tags.py:76
 msgid "Lyrics"
 msgstr ""
 
-#: ../picard/util/tags.py:76
+#: ../picard/util/tags.py:77
 msgid "Mixer"
 msgstr ""
 
-#: ../picard/util/tags.py:77
+#: ../picard/util/tags.py:78
 msgid "Language"
 msgstr ""
 
-#: ../picard/util/tags.py:78
+#: ../picard/util/tags.py:79
 msgid "Script"
 msgstr ""
 
@@ -2481,7 +2523,7 @@ msgstr ""
 #~ msgid "New Version"
 #~ msgstr "ಹೊಸ ಆವೃತ್ತಿ"
 
-#, python-format
 #~ msgid ""
-#~ "New version of Picard is available (%s). Would you like to download it now?"
+#~ "New version of Picard is available (%s). Would you like to download it "
+#~ "now?"
 #~ msgstr "ಪಿಕಾರ್ಡನ  ಹೊಸ ಆವೃತ್ತಿ ಲಭ್ಯವಿದೆ (%s). ಡೌನ್ಲೋಡ್ ಮಾಡಲು ಇಚ್ಚಿಸುವಿರಾ?"
diff --git a/po/ko.po b/po/ko.po
index f6e6aaa54..345415c75 100644
--- a/po/ko.po
+++ b/po/ko.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: 0.5.2\n"
 "Report-Msgid-Bugs-To: http://bugs.musicbrainz.org/\n"
-"POT-Creation-Date: 2009-02-24 18:58+0100\n"
+"POT-Creation-Date: 2009-04-06 22:50+0200\n"
 "PO-Revision-Date: 2009-01-25 14:47+0000\n"
 "Last-Translator: Philipp Wolfer <Unknown>\n"
 "Language-Team: British English <en_GB@li.org>\n"
@@ -18,16 +18,16 @@ msgstr ""
 "X-Generator: Launchpad (build Unknown)\n"
 "Generated-By: pygettext.py 1.5\n"
 
-#: ../picard/album.py:108 ../picard/cluster.py:248
+#: ../picard/album.py:109 ../picard/cluster.py:248
 msgid "Unmatched Files"
 msgstr ""
 
-#: ../picard/album.py:281
+#: ../picard/album.py:287
 #, python-format
 msgid "[could not load album %s]"
 msgstr ""
 
-#: ../picard/album.py:317
+#: ../picard/album.py:320
 msgid "[loading album information]"
 msgstr ""
 
@@ -587,7 +587,7 @@ msgid "Namibia"
 msgstr ""
 
 #: ../picard/const.py:182
-msgid "Vanuat"
+msgid "Vanuatu"
 msgstr ""
 
 #: ../picard/const.py:183
@@ -1031,223 +1031,234 @@ msgid "Congo, The Democratic Republic of the"
 msgstr ""
 
 #: ../picard/const.py:293
-msgid "Serbia and Montenegro"
+msgid "Serbia and Montenegro (historical, 2003-2006)"
 msgstr ""
 
 #: ../picard/const.py:294
-msgid "Croatia"
+msgid "Serbia"
 msgstr ""
 
 #: ../picard/const.py:295
-msgid "Korea (North), Democratic People's Republic of"
+msgid "Montenegro"
 msgstr ""
 
 #: ../picard/const.py:296
-msgid "Korea (South), Republic of"
+msgid "Croatia"
 msgstr ""
 
 #: ../picard/const.py:297
-msgid "Slovakia"
+msgid "Korea (North), Democratic People's Republic of"
 msgstr ""
 
 #: ../picard/const.py:298
-msgid "Soviet Union (historical, 1922-1991)"
+msgid "Korea (South), Republic of"
 msgstr ""
 
 #: ../picard/const.py:299
-msgid "East Timor"
+msgid "Slovakia"
 msgstr ""
 
 #: ../picard/const.py:300
-msgid "Czechoslovakia (historical, 1918-1992)"
+msgid "Soviet Union (historical, 1922-1991)"
 msgstr ""
 
 #: ../picard/const.py:301
-msgid "Europe"
+msgid "East Timor"
 msgstr ""
 
 #: ../picard/const.py:302
-msgid "East Germany (historical, 1949-1990)"
+msgid "Czechoslovakia (historical, 1918-1992)"
 msgstr ""
 
 #: ../picard/const.py:303
-msgid "[Unknown Country]"
+msgid "Europe"
 msgstr ""
 
 #: ../picard/const.py:304
-msgid "[Worldwide]"
+msgid "East Germany (historical, 1949-1990)"
 msgstr ""
 
 #: ../picard/const.py:305
+msgid "[Unknown Country]"
+msgstr ""
+
+#: ../picard/const.py:306
+msgid "[Worldwide]"
+msgstr ""
+
+#: ../picard/const.py:307
 msgid "Yugoslavia (historical, 1918-1992)"
 msgstr ""
 
-#: ../picard/const.py:310
-msgid "Catalan"
-msgstr ""
-
-#: ../picard/const.py:311
-msgid "Czech"
-msgstr "Czech"
-
 #: ../picard/const.py:312
-msgid "Welsh"
+msgid "Afrikaans"
 msgstr ""
 
 #: ../picard/const.py:313
-msgid "Danish"
+msgid "Arabic"
 msgstr ""
 
 #: ../picard/const.py:314
-msgid "German"
-msgstr "German"
+msgid "Catalan"
+msgstr ""
 
 #: ../picard/const.py:315
-msgid "English"
-msgstr "English"
+msgid "Czech"
+msgstr "Czech"
 
 #: ../picard/const.py:316
-msgid "English (Canada)"
+msgid "Welsh"
 msgstr ""
 
 #: ../picard/const.py:317
+msgid "Danish"
+msgstr ""
+
+#: ../picard/const.py:318
+msgid "German"
+msgstr "German"
+
+#: ../picard/const.py:319
+msgid "English"
+msgstr "English"
+
+#: ../picard/const.py:320
+msgid "English (Canada)"
+msgstr ""
+
+#: ../picard/const.py:321
 msgid "English (UK)"
 msgstr "English (UK)"
 
-#: ../picard/const.py:318
+#: ../picard/const.py:322
 msgid "Spanish"
 msgstr "Spanish"
 
-#: ../picard/const.py:319
+#: ../picard/const.py:323
 msgid "Persian"
 msgstr ""
 
-#: ../picard/const.py:320
+#: ../picard/const.py:324
 msgid "Finnish"
 msgstr "Finnish"
 
-#: ../picard/const.py:321
+#: ../picard/const.py:325
 msgid "French"
 msgstr "French"
 
-#: ../picard/const.py:322
+#: ../picard/const.py:326
 msgid "Frisian"
 msgstr ""
 
-#: ../picard/const.py:323
+#: ../picard/const.py:327
 msgid "Hebrew"
 msgstr ""
 
-#: ../picard/const.py:324
+#: ../picard/const.py:328
+msgid "Hindi"
+msgstr ""
+
+#: ../picard/const.py:329
 msgid "Hungarian"
 msgstr "Hungarian"
 
-#: ../picard/const.py:325
+#: ../picard/const.py:330
 msgid "Islandic"
 msgstr ""
 
-#: ../picard/const.py:326
+#: ../picard/const.py:331
 msgid "Italian"
 msgstr "Italian"
 
-#: ../picard/const.py:327
+#: ../picard/const.py:332
 msgid "Kannada"
 msgstr ""
 
-#: ../picard/const.py:328
+#: ../picard/const.py:333
 msgid "Korean"
 msgstr "Korean"
 
-#: ../picard/const.py:329
+#: ../picard/const.py:334
 msgid "Lithuanian"
 msgstr "Lithuanian"
 
-#: ../picard/const.py:330
+#: ../picard/const.py:335
 msgid "Norwegian Bokmal"
 msgstr "Norwegian Bokmal"
 
-#: ../picard/const.py:331
+#: ../picard/const.py:336
 msgid "Dutch"
 msgstr "Dutch"
 
-#: ../picard/const.py:332
+#: ../picard/const.py:337
 msgid "Polish"
 msgstr ""
 
-#: ../picard/const.py:333
+#: ../picard/const.py:338
 msgid "Portuguese"
 msgstr "Portuguese"
 
-#: ../picard/const.py:334
+#: ../picard/const.py:339
 msgid "Brazilian Portuguese"
 msgstr ""
 
-#: ../picard/const.py:335
+#: ../picard/const.py:340
 msgid "Romanian"
 msgstr "Romanian"
 
-#: ../picard/const.py:336
+#: ../picard/const.py:341
 msgid "Russian"
 msgstr "Russian"
 
-#: ../picard/const.py:337
+#: ../picard/const.py:342
 msgid "Scots"
 msgstr ""
 
-#: ../picard/const.py:338
+#: ../picard/const.py:343
 msgid "Slovak"
 msgstr "Slovak"
 
-#: ../picard/const.py:339
+#: ../picard/const.py:344
 msgid "Slovenian"
 msgstr ""
 
-#: ../picard/const.py:340
+#: ../picard/const.py:345
 msgid "Swedish"
 msgstr "Swedish"
 
-#: ../picard/const.py:341
+#: ../picard/const.py:346
+msgid "Turkish"
+msgstr ""
+
+#: ../picard/const.py:347
 msgid "Chinese"
 msgstr ""
 
-#: ../picard/file.py:487
+#: ../picard/file.py:494
 #, python-format
 msgid "No matching tracks for file %s"
 msgstr "일치하는 트랙의 파일 %s이 없습니다."
 
-#: ../picard/file.py:504
+#: ../picard/file.py:511
 #, python-format
 msgid "No matching tracks above the threshold for file %s"
 msgstr ""
 
-#: ../picard/file.py:507
+#: ../picard/file.py:514
 #, python-format
 msgid "File %s identified!"
 msgstr "File %s identified!"
 
-#: ../picard/file.py:518
+#: ../picard/file.py:525
 #, python-format
 msgid "Looking up the PUID for file %s..."
 msgstr ""
 
-#: ../picard/file.py:523
+#: ../picard/file.py:530
 #, 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 "M3U 재생목록(*.m3u)"
@@ -1260,11 +1271,24 @@ msgstr "PLS 재생목록(*.pls)"
 msgid "XSPF Playlist (*.xspf)"
 msgstr "XSPF 재생목록(*.XSPF)"
 
-#: ../picard/tagger.py:476
+#: ../picard/puidmanager.py:62
+msgid "Submitting PUIDs..."
+msgstr ""
+
+#: ../picard/puidmanager.py:68
+#, python-format
+msgid "PUIDs submission failed: %s"
+msgstr ""
+
+#: ../picard/puidmanager.py:70
+msgid "PUIDs successfully submitted!"
+msgstr ""
+
+#: ../picard/tagger.py:477
 msgid "CD Lookup Error"
 msgstr "CD 검색 실패"
 
-#: ../picard/tagger.py:477
+#: ../picard/tagger.py:478
 #, python-format
 msgid ""
 "Error while reading CD:\n"
@@ -1275,7 +1299,7 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../picard/tagger.py:503
+#: ../picard/tagger.py:504
 #, python-format
 msgid "Could not find PUID for file %s"
 msgstr ""
@@ -1328,15 +1352,27 @@ msgstr ""
 msgid "Length"
 msgstr "길이"
 
-#: ../picard/ui/itemviews.py:327
+#: ../picard/ui/itemviews.py:289
+msgid "&Expand all"
+msgstr ""
+
+#: ../picard/ui/itemviews.py:291
+msgid "&Collapse all"
+msgstr ""
+
+#: ../picard/ui/itemviews.py:332
 msgid "&Releases"
 msgstr ""
 
-#: ../picard/ui/itemviews.py:353
+#: ../picard/ui/itemviews.py:349
+msgid "No release event"
+msgstr ""
+
+#: ../picard/ui/itemviews.py:359
 msgid "&Plugins"
 msgstr ""
 
-#: ../picard/ui/itemviews.py:523
+#: ../picard/ui/itemviews.py:533
 msgid "Clusters"
 msgstr ""
 
@@ -1344,95 +1380,6 @@ msgstr ""
 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/puidsubmit.py:31
-msgid "Release"
-msgstr ""
-
-#: ../picard/ui/puidsubmit.py:31
-msgid "Release ID"
-msgstr ""
-
-#: ../picard/ui/tageditor.py:66 ../picard/ui/ui_options_plugins.py:62
-msgid "Details"
-msgstr ""
-
-#: ../picard/ui/tageditor.py:71 ../picard/ui/tageditor.py:264
-#, python-format
-msgid "%d file"
-msgid_plural "%d files"
-msgstr[0] ""
-msgstr[1] ""
-
-#: ../picard/ui/tageditor.py:131
-#, python-format
-msgid "(different across %d file)"
-msgid_plural "(different across %d files)"
-msgstr[0] ""
-msgstr[1] ""
-
-#: ../picard/ui/tageditor.py:134
-#, python-format
-msgid "(missing from %d file)"
-msgid_plural "(missing from %d files)"
-msgstr[0] ""
-msgstr[1] ""
-
-#: ../picard/ui/tageditor.py:233
-msgid "Filename:"
-msgstr "파일이름:"
-
-#: ../picard/ui/tageditor.py:235
-msgid "Format:"
-msgstr "형식:"
-
-#: ../picard/ui/tageditor.py:244
-msgid "Size:"
-msgstr "크기:"
-
-#: ../picard/ui/tageditor.py:248 ../picard/ui/ui_metadata.py:127
-msgid "Length:"
-msgstr "길이:"
-
-#: ../picard/ui/tageditor.py:250
-msgid "Bitrate:"
-msgstr "비트전송율"
-
-#: ../picard/ui/tageditor.py:252
-msgid "Sample rate:"
-msgstr ""
-
-#: ../picard/ui/tageditor.py:254
-msgid "Bits per sample:"
-msgstr ""
-
-#: ../picard/ui/tageditor.py:257
-msgid "Mono"
-msgstr "모노"
-
-#: ../picard/ui/tageditor.py:258
-msgid "Stereo"
-msgstr "스테레오"
-
-#: ../picard/ui/tageditor.py:260
-msgid "Channels:"
-msgstr "채널:"
-
-#: ../picard/ui/tagsfromfilenames.py:52 ../picard/ui/tagsfromfilenames.py:96
-msgid "File Name"
-msgstr "파일 이름"
-
 #: ../picard/ui/mainwindow.py:64
 msgid "MusicBrainz Picard"
 msgstr "MusicBrainz Picard"
@@ -1669,6 +1616,10 @@ msgstr "&검색 바"
 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 "모든 지원 되는 형식"
@@ -1688,12 +1639,97 @@ msgstr "재생목록 %s 저장했습니다."
 msgid " (Error: %s)"
 msgstr " (오류 : %s)"
 
+#: ../picard/ui/puidsubmit.py:31 ../picard/ui/options/plugins.py:85
+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/passworddialog.py:38
 #, python-format
 msgid ""
 "The server %s requires you to login. Please enter your username and password."
 msgstr ""
 
+#: ../picard/ui/tageditor.py:66 ../picard/ui/ui_options_plugins.py:62
+msgid "Details"
+msgstr ""
+
+#: ../picard/ui/tageditor.py:71 ../picard/ui/tageditor.py:264
+#, python-format
+msgid "%d file"
+msgid_plural "%d files"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../picard/ui/tageditor.py:131
+#, python-format
+msgid "(different across %d file)"
+msgid_plural "(different across %d files)"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../picard/ui/tageditor.py:134
+#, python-format
+msgid "(missing from %d file)"
+msgid_plural "(missing from %d files)"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../picard/ui/tageditor.py:233
+msgid "Filename:"
+msgstr "파일이름:"
+
+#: ../picard/ui/tageditor.py:235
+msgid "Format:"
+msgstr "형식:"
+
+#: ../picard/ui/tageditor.py:244
+msgid "Size:"
+msgstr "크기:"
+
+#: ../picard/ui/tageditor.py:248 ../picard/ui/ui_metadata.py:127
+msgid "Length:"
+msgstr "길이:"
+
+#: ../picard/ui/tageditor.py:250
+msgid "Bitrate:"
+msgstr "비트전송율"
+
+#: ../picard/ui/tageditor.py:252
+msgid "Sample rate:"
+msgstr ""
+
+#: ../picard/ui/tageditor.py:254
+msgid "Bits per sample:"
+msgstr ""
+
+#: ../picard/ui/tageditor.py:257
+msgid "Mono"
+msgstr "모노"
+
+#: ../picard/ui/tageditor.py:258
+msgid "Stereo"
+msgstr "스테레오"
+
+#: ../picard/ui/tageditor.py:260
+msgid "Channels:"
+msgstr "채널:"
+
+#: ../picard/ui/tagsfromfilenames.py:54 ../picard/ui/tagsfromfilenames.py:99
+msgid "File Name"
+msgstr "파일 이름"
+
 #: ../picard/ui/ui_cdlookup.py:60 ../picard/ui/ui_options_cdlookup.py:47
 #: ../picard/ui/ui_options_cdlookup_select.py:48
 #: ../picard/ui/options/cdlookup.py:36
@@ -1716,24 +1752,6 @@ msgstr "    설명서 찾기    "
 msgid "Cancel"
 msgstr "취소"
 
-#: ../picard/ui/ui_passworddialog.py:78
-msgid "Authentication required"
-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"
-msgstr ""
-
 #: ../picard/ui/ui_edittagdialog.py:44
 msgid "Edit Tag"
 msgstr "태그 편집"
@@ -1770,6 +1788,10 @@ msgstr "앨범"
 msgid "Options"
 msgstr "옵션"
 
+#: ../picard/ui/ui_puidsubmit.py:52
+msgid "Submit PUIDs"
+msgstr "Submit PUIDs"
+
 #: ../picard/ui/ui_options_cdlookup.py:48
 msgid "CD-ROM device to use for lookups:"
 msgstr ""
@@ -1794,6 +1816,22 @@ msgstr ""
 msgid "Overwrite the file if it already exists"
 msgstr ""
 
+#: ../picard/ui/ui_options_moving.py:53
+msgid "Move additional files:"
+msgstr ""
+
+#: ../picard/ui/ui_options_moving.py:54
+msgid "Browse..."
+msgstr ""
+
+#: ../picard/ui/ui_options_moving.py:55
+msgid "Delete empty directories"
+msgstr ""
+
+#: ../picard/ui/ui_options_moving.py:56
+msgid "Move files to this directory when saving:"
+msgstr ""
+
 #: ../picard/ui/util.py:31
 msgid "&Ok"
 msgstr "&확인"
@@ -1802,44 +1840,40 @@ msgstr "&확인"
 msgid "&Cancel"
 msgstr ""
 
-#: ../picard/ui/ui_puidsubmit.py:52
-msgid "Submit PUIDs"
-msgstr "Submit PUIDs"
-
-#: ../picard/ui/ui_tageditor.py:139 ../picard/ui/ui_options_plugins.py:59
-#: ../picard/ui/options/plugins.py:76
+#: ../picard/ui/ui_tageditor.py:128 ../picard/ui/ui_options_plugins.py:59
+#: ../picard/ui/options/plugins.py:81
 msgid "Name"
 msgstr "이름"
 
-#: ../picard/ui/ui_tageditor.py:140
+#: ../picard/ui/ui_tageditor.py:129
 msgid "Value"
 msgstr "값"
 
-#: ../picard/ui/ui_tageditor.py:141
+#: ../picard/ui/ui_tageditor.py:130
 msgid "Rating:"
 msgstr ""
 
-#: ../picard/ui/ui_tageditor.py:142
+#: ../picard/ui/ui_tageditor.py:131
 msgid "&Add..."
 msgstr ""
 
-#: ../picard/ui/ui_tageditor.py:143
+#: ../picard/ui/ui_tageditor.py:132
 msgid "&Edit..."
 msgstr ""
 
-#: ../picard/ui/ui_tageditor.py:144
+#: ../picard/ui/ui_tageditor.py:133
 msgid "&Delete"
 msgstr ""
 
-#: ../picard/ui/ui_tageditor.py:145
+#: ../picard/ui/ui_tageditor.py:134
 msgid "&Metadata"
 msgstr ""
 
-#: ../picard/ui/ui_tageditor.py:146
+#: ../picard/ui/ui_tageditor.py:135
 msgid "A&rtwork"
 msgstr ""
 
-#: ../picard/ui/ui_tageditor.py:147
+#: ../picard/ui/ui_tageditor.py:136
 msgid "&Info"
 msgstr ""
 
@@ -1884,6 +1918,40 @@ msgstr ""
 msgid ", "
 msgstr ""
 
+#: ../picard/ui/ui_options_general.py:108
+msgid "MusicBrainz Server"
+msgstr ""
+
+#: ../picard/ui/ui_options_general.py:109 ../picard/ui/ui_options_proxy.py:72
+msgid "Port:"
+msgstr ""
+
+#: ../picard/ui/ui_options_general.py:110 ../picard/ui/ui_options_proxy.py:73
+msgid "Server address:"
+msgstr "서버 주소:"
+
+#: ../picard/ui/ui_options_general.py:111
+msgid "Account Information"
+msgstr ""
+
+#: ../picard/ui/ui_options_general.py:112 ../picard/ui/ui_options_proxy.py:70
+#: ../picard/ui/ui_passworddialog.py:80
+msgid "Password:"
+msgstr "비밀번호:"
+
+#: ../picard/ui/ui_options_general.py:113 ../picard/ui/ui_options_proxy.py:71
+#: ../picard/ui/ui_passworddialog.py:79
+msgid "Username:"
+msgstr "사용자이름:"
+
+#: ../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 ""
+
 #: ../picard/ui/ui_options_interface.py:50
 msgid "Miscellaneous"
 msgstr ""
@@ -1904,113 +1972,6 @@ msgstr ""
 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_options_naming.py:180
-#: ../picard/ui/ui_tagsfromfilenames.py:58
-msgid "&Preview"
-msgstr "&미리보기"
-
-#: ../picard/ui/ui_options_proxy.py:81 ../picard/ui/options/proxy.py:28
-msgid "Web Proxy"
-msgstr "Web Proxy"
-
-#: ../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_options_ratings.py:45
-msgid "Enable track ratings"
-msgstr ""
-
-#: ../picard/ui/ui_options_ratings.py:46
-msgid ""
-"Picard saves the ratings together with an e-mail address identifying the "
-"user who did the rating. That way different ratings for different users can "
-"be stored in the files. Please sepcify the e-mail you want to use to save "
-"your ratings."
-msgstr ""
-
-#: ../picard/ui/ui_options_ratings.py:47
-msgid "E-mail:"
-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 ../picard/ui/options/general.py:29
-msgid "General"
-msgstr "General"
-
-#: ../picard/ui/ui_options_general.py:115
-msgid "Automatically scan all new files"
-msgstr ""
-
 #: ../picard/ui/ui_options_matching.py:105
 msgid "Thresholds"
 msgstr ""
@@ -2067,74 +2028,150 @@ msgstr "Various artists:"
 msgid "Non-album tracks:"
 msgstr "Non-album tracks:"
 
-#: ../picard/ui/ui_options_plugins.py:58 ../picard/ui/options/plugins.py:30
+#: ../picard/ui/ui_options_metadata.py:109
+#: ../picard/ui/ui_options_metadata.py:110
+#: ../picard/ui/ui_options_renaming.py:155
+#: ../picard/ui/ui_options_renaming.py:158
+msgid "Default"
+msgstr "초기화"
+
+#: ../picard/ui/ui_options_plugins.py:58 ../picard/ui/options/plugins.py:34
 msgid "Plugins"
 msgstr ""
 
-#: ../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:84
 msgid "Author"
 msgstr "작가"
 
-#: ../picard/ui/ui_options_plugins.py:61 ../picard/util/tags.py:36
+#: ../picard/ui/ui_options_plugins.py:61 ../picard/util/tags.py:37
 msgid "Version"
 msgstr "버전"
 
-#: ../picard/ui/ui_options_script.py:52
+#: ../picard/ui/ui_options_proxy.py:69 ../picard/ui/options/proxy.py:28
+msgid "Web Proxy"
+msgstr "Web Proxy"
+
+#: ../picard/ui/ui_options_ratings.py:45
+msgid "Enable track ratings"
+msgstr ""
+
+#: ../picard/ui/ui_options_ratings.py:46
+msgid ""
+"Picard saves the ratings together with an e-mail address identifying the "
+"user who did the rating. That way different ratings for different users can "
+"be stored in the files. Please sepcify the e-mail you want to use to save "
+"your ratings."
+msgstr ""
+
+#: ../picard/ui/ui_options_ratings.py:47
+msgid "E-mail:"
+msgstr ""
+
+#: ../picard/ui/ui_options_renaming.py:145
+#, fuzzy
+msgid "Form"
+msgstr "형식:"
+
+#: ../picard/ui/ui_options_renaming.py:146
+#, fuzzy
+msgid "Rename files when saving"
+msgstr "이름변경"
+
+#: ../picard/ui/ui_options_renaming.py:147
+msgid "Replace non-ASCII characters"
+msgstr ""
+
+#: ../picard/ui/ui_options_renaming.py:148
+msgid "Replace Windows-incompatible characters"
+msgstr ""
+
+#: ../picard/ui/ui_options_renaming.py:149
+msgid "Name files like this"
+msgstr ""
+
+#: ../picard/ui/ui_options_renaming.py:156
+msgid "Name multiple artist albums differently"
+msgstr ""
+
+#: ../picard/ui/ui_options_renaming.py:157
+msgid "Copy from above"
+msgstr ""
+
+#: ../picard/ui/ui_options_renaming.py:159
+#, fuzzy
+msgid "Examples"
+msgstr "예제"
+
+#: ../picard/ui/ui_options_script.py:43
 msgid "Tagger Script"
 msgstr ""
 
-#: ../picard/ui/ui_options_tags.py:85
-msgid "Common"
+#: ../picard/ui/ui_options_tags.py:97
+msgid "Do not write tags to files"
 msgstr ""
 
-#: ../picard/ui/ui_options_tags.py:86
-msgid "Clear existing tags before writing new tags"
+#: ../picard/ui/ui_options_tags.py:98
+msgid "Before tagging"
+msgstr ""
+
+#: ../picard/ui/ui_options_tags.py:99
+#, fuzzy
+msgid "Clear existing tags"
 msgstr "Clear existing tags before writing new tags"
 
-#: ../picard/ui/ui_options_tags.py:87
-msgid "Don not write tags to files"
-msgstr ""
-
-#: ../picard/ui/ui_options_tags.py:88
-msgid "ID3"
-msgstr "ID3"
-
-#: ../picard/ui/ui_options_tags.py:89
-msgid "Write ID3v1 tags to the files"
-msgstr ""
-
-#: ../picard/ui/ui_options_tags.py:90
-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:91
-msgid "Text encoding to use while writing ID3v2 tags:"
-msgstr ""
-
-#: ../picard/ui/ui_options_tags.py:92
-msgid "ISO-8859-1"
-msgstr "ISO-8859-1"
-
-#: ../picard/ui/ui_options_tags.py:93
-msgid "UTF-16"
-msgstr "UTF-16"
-
-#: ../picard/ui/ui_options_tags.py:94
-msgid "UTF-8"
-msgstr "UTF-8"
-
-#: ../picard/ui/ui_options_tags.py:95
+#: ../picard/ui/ui_options_tags.py:100
 msgid "Remove ID3 tags from FLAC files"
 msgstr "FLAC 파일로부터 ID3 태그를 제거합니다."
 
-#: ../picard/ui/ui_options_tags.py:96
-msgid "APE"
-msgstr ""
-
-#: ../picard/ui/ui_options_tags.py:97
+#: ../picard/ui/ui_options_tags.py:101
 msgid "Remove APEv2 tags from MP3 files"
 msgstr "MP3 파일로부터 APEv2 태그를 제거합니다."
 
+#: ../picard/ui/ui_options_tags.py:102
+msgid "Tag compatibility"
+msgstr ""
+
+#: ../picard/ui/ui_options_tags.py:103
+#, fuzzy
+msgid "ID3v2 version"
+msgstr "버전"
+
+#: ../picard/ui/ui_options_tags.py:104
+msgid "2.4"
+msgstr ""
+
+#: ../picard/ui/ui_options_tags.py:105
+msgid "2.3"
+msgstr ""
+
+#: ../picard/ui/ui_options_tags.py:106
+msgid "Also include ID3v1 tags in the files"
+msgstr ""
+
+#: ../picard/ui/ui_options_tags.py:107
+msgid "ID3v2 text encoding"
+msgstr ""
+
+#: ../picard/ui/ui_options_tags.py:108
+msgid "UTF-8"
+msgstr "UTF-8"
+
+#: ../picard/ui/ui_options_tags.py:109
+msgid "UTF-16"
+msgstr "UTF-16"
+
+#: ../picard/ui/ui_options_tags.py:110
+msgid "ISO-8859-1"
+msgstr "ISO-8859-1"
+
+#: ../picard/ui/ui_passworddialog.py:78
+msgid "Authentication required"
+msgstr ""
+
+#: ../picard/ui/ui_passworddialog.py:81
+msgid "Save username and password"
+msgstr ""
+
 #: ../picard/ui/ui_tagsfromfilenames.py:56
 msgid "Convert File Names to Tags"
 msgstr ""
@@ -2143,6 +2180,10 @@ msgstr ""
 msgid "Replace underscores with spaces"
 msgstr ""
 
+#: ../picard/ui/ui_tagsfromfilenames.py:58
+msgid "&Preview"
+msgstr "&미리보기"
+
 #: ../picard/ui/options/about.py:29
 msgid "About"
 msgstr "...에 대하여"
@@ -2169,8 +2210,8 @@ 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"
@@ -2178,14 +2219,13 @@ msgid ""
 "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\"><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/P"
-"icardTagger</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
@@ -2218,42 +2258,46 @@ msgstr ""
 msgid "None"
 msgstr ""
 
-#: ../picard/ui/options/naming.py:33
-msgid "File Naming"
-msgstr ""
+#: ../picard/ui/options/moving.py:33
+#, fuzzy
+msgid "Moving files"
+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 ""
-
-#: ../picard/ui/options/naming.py:95
-msgid "The multiple artist file naming format must not be empty."
-msgstr ""
-
-#: ../picard/ui/options/naming.py:97
+#: ../picard/ui/options/moving.py:65
 msgid "Error"
 msgstr ""
 
-#: ../picard/ui/options/naming.py:97
+#: ../picard/ui/options/moving.py:65
 msgid "The location to move files to must not be empty."
 msgstr ""
 
-#: ../picard/ui/options/scripting.py:63
-msgid "Scripting"
+#: ../picard/ui/options/ratings.py:29
+msgid "Ratings"
 msgstr ""
 
 #: ../picard/ui/options/tags.py:29
 msgid "Tags"
 msgstr "Tags"
 
-#: ../picard/ui/options/ratings.py:29
-msgid "Ratings"
+#: ../picard/ui/options/renaming.py:35
+#, fuzzy
+msgid "File naming"
+msgstr "파일이름:"
+
+#: ../picard/ui/options/renaming.py:123
+msgid "The file naming format must not be empty."
+msgstr ""
+
+#: ../picard/ui/options/renaming.py:133
+msgid "The multiple artist file naming format must not be empty."
+msgstr ""
+
+#: ../picard/ui/options/scripting.py:63
+msgid "Scripting"
+msgstr ""
+
+#: ../picard/ui/options/scripting.py:97
+msgid "Script Error"
 msgstr ""
 
 #: ../picard/util/tags.py:24
@@ -2261,214 +2305,219 @@ msgid "Date"
 msgstr ""
 
 #: ../picard/util/tags.py:25
+#, fuzzy
+msgid "Original Release Date"
+msgstr "원래 제목"
+
+#: ../picard/util/tags.py:26
 msgid "Album Artist"
 msgstr ""
 
-#: ../picard/util/tags.py:26
+#: ../picard/util/tags.py:27
 msgid "Track Number"
 msgstr ""
 
-#: ../picard/util/tags.py:27
+#: ../picard/util/tags.py:28
 msgid "Total Tracks"
 msgstr ""
 
-#: ../picard/util/tags.py:28
+#: ../picard/util/tags.py:29
 msgid "Disc Number"
 msgstr ""
 
-#: ../picard/util/tags.py:29
+#: ../picard/util/tags.py:30
 msgid "Total Discs"
 msgstr "모든 Discs"
 
-#: ../picard/util/tags.py:30
+#: ../picard/util/tags.py:31
 msgid "Album Artist Sort Order"
 msgstr ""
 
-#: ../picard/util/tags.py:31
+#: ../picard/util/tags.py:32
 msgid "Artist Sort Order"
 msgstr "가수별 정렬"
 
-#: ../picard/util/tags.py:32
+#: ../picard/util/tags.py:33
 msgid "Title Sort Order"
 msgstr "제목별 정렬"
 
-#: ../picard/util/tags.py:33
+#: ../picard/util/tags.py:34
 msgid "Album Sort Order"
 msgstr ""
 
-#: ../picard/util/tags.py:34
+#: ../picard/util/tags.py:35
 msgid "ASIN"
 msgstr ""
 
-#: ../picard/util/tags.py:35
+#: ../picard/util/tags.py:36
 msgid "Grouping"
 msgstr "그룹화"
 
-#: ../picard/util/tags.py:37
+#: ../picard/util/tags.py:38
 msgid "ISRC"
 msgstr ""
 
-#: ../picard/util/tags.py:38
+#: ../picard/util/tags.py:39
 msgid "Mood"
 msgstr ""
 
-#: ../picard/util/tags.py:39
+#: ../picard/util/tags.py:40
 msgid "BPM"
 msgstr ""
 
-#: ../picard/util/tags.py:40
+#: ../picard/util/tags.py:41
 msgid "Copyright"
 msgstr ""
 
-#: ../picard/util/tags.py:41
+#: ../picard/util/tags.py:42
 msgid "Composer"
 msgstr ""
 
-#: ../picard/util/tags.py:42
+#: ../picard/util/tags.py:43
 msgid "Conductor"
 msgstr ""
 
-#: ../picard/util/tags.py:43
+#: ../picard/util/tags.py:44
 msgid "Lyricist"
 msgstr ""
 
-#: ../picard/util/tags.py:44
+#: ../picard/util/tags.py:45
 msgid "Arranger"
 msgstr ""
 
-#: ../picard/util/tags.py:45
+#: ../picard/util/tags.py:46
 msgid "Producer"
 msgstr "제작자"
 
-#: ../picard/util/tags.py:46
+#: ../picard/util/tags.py:47
 msgid "Engineer"
 msgstr "기술자"
 
-#: ../picard/util/tags.py:47
+#: ../picard/util/tags.py:48
 msgid "Subtitle"
 msgstr "부제"
 
-#: ../picard/util/tags.py:48
+#: ../picard/util/tags.py:49
 msgid "Disc Subtitle"
 msgstr ""
 
-#: ../picard/util/tags.py:49
+#: ../picard/util/tags.py:50
 msgid "Remixer"
 msgstr ""
 
-#: ../picard/util/tags.py:50
+#: ../picard/util/tags.py:51
 msgid "MusicBrainz Track Id"
 msgstr ""
 
-#: ../picard/util/tags.py:51
+#: ../picard/util/tags.py:52
 msgid "MusicBrainz Release Id"
 msgstr ""
 
-#: ../picard/util/tags.py:52
+#: ../picard/util/tags.py:53
 msgid "MusicBrainz Artist Id"
 msgstr ""
 
-#: ../picard/util/tags.py:53
+#: ../picard/util/tags.py:54
 msgid "MusicBrainz Release Artist Id"
 msgstr ""
 
-#: ../picard/util/tags.py:54
+#: ../picard/util/tags.py:55
 msgid "MusicBrainz TRM Id"
 msgstr ""
 
-#: ../picard/util/tags.py:55
+#: ../picard/util/tags.py:56
 msgid "MusicBrainz Disc Id"
 msgstr ""
 
-#: ../picard/util/tags.py:56
+#: ../picard/util/tags.py:57
 msgid "MusicBrainz Sort Name"
 msgstr ""
 
-#: ../picard/util/tags.py:57
+#: ../picard/util/tags.py:58
 msgid "MusicIP PUID"
 msgstr ""
 
-#: ../picard/util/tags.py:58
+#: ../picard/util/tags.py:59
 msgid "MusicIP Fingerprint"
 msgstr ""
 
-#: ../picard/util/tags.py:59
+#: ../picard/util/tags.py:60
 msgid "Disc Id"
 msgstr ""
 
-#: ../picard/util/tags.py:60
+#: ../picard/util/tags.py:61
 msgid "Website"
 msgstr "웹주소"
 
-#: ../picard/util/tags.py:61
+#: ../picard/util/tags.py:62
 msgid "Compilation"
 msgstr ""
 
-#: ../picard/util/tags.py:62
+#: ../picard/util/tags.py:63
 msgid "Comment"
 msgstr "댓글"
 
-#: ../picard/util/tags.py:63
+#: ../picard/util/tags.py:64
 msgid "Genre"
 msgstr ""
 
-#: ../picard/util/tags.py:64
+#: ../picard/util/tags.py:65
 msgid "Encoded By"
 msgstr ""
 
-#: ../picard/util/tags.py:65
+#: ../picard/util/tags.py:66
 msgid "Performer"
 msgstr ""
 
-#: ../picard/util/tags.py:66
+#: ../picard/util/tags.py:67
 msgid "Release Type"
 msgstr ""
 
-#: ../picard/util/tags.py:67
+#: ../picard/util/tags.py:68
 msgid "Release Status"
 msgstr ""
 
-#: ../picard/util/tags.py:68
+#: ../picard/util/tags.py:69
 msgid "Release Country"
 msgstr ""
 
-#: ../picard/util/tags.py:69
+#: ../picard/util/tags.py:70
 msgid "Record Label"
 msgstr "레코드 라벨"
 
-#: ../picard/util/tags.py:70
+#: ../picard/util/tags.py:71
 msgid "Barcode"
 msgstr "바코드"
 
-#: ../picard/util/tags.py:71
+#: ../picard/util/tags.py:72
 msgid "Catalog Number"
 msgstr ""
 
-#: ../picard/util/tags.py:72
+#: ../picard/util/tags.py:73
 msgid "Format"
 msgstr ""
 
-#: ../picard/util/tags.py:73
+#: ../picard/util/tags.py:74
 msgid "DJ-Mixer"
 msgstr ""
 
-#: ../picard/util/tags.py:74
+#: ../picard/util/tags.py:75
 msgid "Media"
 msgstr ""
 
-#: ../picard/util/tags.py:75
+#: ../picard/util/tags.py:76
 msgid "Lyrics"
 msgstr ""
 
-#: ../picard/util/tags.py:76
+#: ../picard/util/tags.py:77
 msgid "Mixer"
 msgstr ""
 
-#: ../picard/util/tags.py:77
+#: ../picard/util/tags.py:78
 msgid "Language"
 msgstr "Language"
 
-#: ../picard/util/tags.py:78
+#: ../picard/util/tags.py:79
 msgid "Script"
 msgstr ""
 
@@ -2484,15 +2533,20 @@ msgid ""
 "%s"
 msgstr ""
 
+#~ msgid "ID3"
+#~ msgstr "ID3"
+
+#~ msgid "Write ID3v2 version 2.3 tags (2.4 is default)"
+#~ msgstr "Write ID3v2 version 2.3 tags (2.4 is default)"
+
 #~ msgid "New Version"
 #~ msgstr "새로운 버전"
 
-#, python-format
 #~ msgid ""
-#~ "New version of Picard is available (%s). Would you like to download it now?"
+#~ "New version of Picard is available (%s). Would you like to download it "
+#~ "now?"
 #~ msgstr "새로운 버전 (%s)을 지금 다운로드 하시겠습니까?"
 
-#, python-format
 #~ msgid "Couldn't find PUID for file %s"
 #~ msgstr "PUID %s 파일을 찾을 수 없습니다."
 
diff --git a/po/lt.po b/po/lt.po
index 7096b6cf0..18f7d6f04 100644
--- a/po/lt.po
+++ b/po/lt.po
@@ -6,28 +6,28 @@ msgid ""
 msgstr ""
 "Project-Id-Version: picard\n"
 "Report-Msgid-Bugs-To: http://bugs.musicbrainz.org/\n"
-"POT-Creation-Date: 2009-02-24 18:58+0100\n"
+"POT-Creation-Date: 2009-04-06 22:50+0200\n"
 "PO-Revision-Date: 2009-01-25 14:59+0000\n"
 "Last-Translator: Philipp Wolfer <Unknown>\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"
+"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-04-06 20:20+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
-#: ../picard/album.py:108 ../picard/cluster.py:248
+#: ../picard/album.py:109 ../picard/cluster.py:248
 msgid "Unmatched Files"
 msgstr ""
 
-#: ../picard/album.py:281
+#: ../picard/album.py:287
 #, python-format
 msgid "[could not load album %s]"
 msgstr ""
 
-#: ../picard/album.py:317
+#: ../picard/album.py:320
 msgid "[loading album information]"
 msgstr ""
 
@@ -587,7 +587,7 @@ msgid "Namibia"
 msgstr ""
 
 #: ../picard/const.py:182
-msgid "Vanuat"
+msgid "Vanuatu"
 msgstr ""
 
 #: ../picard/const.py:183
@@ -1031,223 +1031,234 @@ msgid "Congo, The Democratic Republic of the"
 msgstr ""
 
 #: ../picard/const.py:293
-msgid "Serbia and Montenegro"
+msgid "Serbia and Montenegro (historical, 2003-2006)"
 msgstr ""
 
 #: ../picard/const.py:294
-msgid "Croatia"
+msgid "Serbia"
 msgstr ""
 
 #: ../picard/const.py:295
-msgid "Korea (North), Democratic People's Republic of"
+msgid "Montenegro"
 msgstr ""
 
 #: ../picard/const.py:296
-msgid "Korea (South), Republic of"
+msgid "Croatia"
 msgstr ""
 
 #: ../picard/const.py:297
-msgid "Slovakia"
+msgid "Korea (North), Democratic People's Republic of"
 msgstr ""
 
 #: ../picard/const.py:298
-msgid "Soviet Union (historical, 1922-1991)"
+msgid "Korea (South), Republic of"
 msgstr ""
 
 #: ../picard/const.py:299
-msgid "East Timor"
+msgid "Slovakia"
 msgstr ""
 
 #: ../picard/const.py:300
-msgid "Czechoslovakia (historical, 1918-1992)"
+msgid "Soviet Union (historical, 1922-1991)"
 msgstr ""
 
 #: ../picard/const.py:301
-msgid "Europe"
+msgid "East Timor"
 msgstr ""
 
 #: ../picard/const.py:302
-msgid "East Germany (historical, 1949-1990)"
+msgid "Czechoslovakia (historical, 1918-1992)"
 msgstr ""
 
 #: ../picard/const.py:303
-msgid "[Unknown Country]"
+msgid "Europe"
 msgstr ""
 
 #: ../picard/const.py:304
-msgid "[Worldwide]"
+msgid "East Germany (historical, 1949-1990)"
 msgstr ""
 
 #: ../picard/const.py:305
+msgid "[Unknown Country]"
+msgstr ""
+
+#: ../picard/const.py:306
+msgid "[Worldwide]"
+msgstr ""
+
+#: ../picard/const.py:307
 msgid "Yugoslavia (historical, 1918-1992)"
 msgstr ""
 
-#: ../picard/const.py:310
-msgid "Catalan"
-msgstr ""
-
-#: ../picard/const.py:311
-msgid "Czech"
-msgstr ""
-
 #: ../picard/const.py:312
-msgid "Welsh"
+msgid "Afrikaans"
 msgstr ""
 
 #: ../picard/const.py:313
-msgid "Danish"
+msgid "Arabic"
 msgstr ""
 
 #: ../picard/const.py:314
-msgid "German"
+msgid "Catalan"
 msgstr ""
 
 #: ../picard/const.py:315
-msgid "English"
+msgid "Czech"
 msgstr ""
 
 #: ../picard/const.py:316
-msgid "English (Canada)"
+msgid "Welsh"
 msgstr ""
 
 #: ../picard/const.py:317
-msgid "English (UK)"
+msgid "Danish"
 msgstr ""
 
 #: ../picard/const.py:318
-msgid "Spanish"
+msgid "German"
 msgstr ""
 
 #: ../picard/const.py:319
-msgid "Persian"
+msgid "English"
 msgstr ""
 
 #: ../picard/const.py:320
-msgid "Finnish"
+msgid "English (Canada)"
 msgstr ""
 
 #: ../picard/const.py:321
-msgid "French"
+msgid "English (UK)"
 msgstr ""
 
 #: ../picard/const.py:322
-msgid "Frisian"
+msgid "Spanish"
 msgstr ""
 
 #: ../picard/const.py:323
-msgid "Hebrew"
+msgid "Persian"
 msgstr ""
 
 #: ../picard/const.py:324
-msgid "Hungarian"
+msgid "Finnish"
 msgstr ""
 
 #: ../picard/const.py:325
-msgid "Islandic"
+msgid "French"
 msgstr ""
 
 #: ../picard/const.py:326
-msgid "Italian"
+msgid "Frisian"
 msgstr ""
 
 #: ../picard/const.py:327
-msgid "Kannada"
+msgid "Hebrew"
 msgstr ""
 
 #: ../picard/const.py:328
-msgid "Korean"
+msgid "Hindi"
 msgstr ""
 
 #: ../picard/const.py:329
-msgid "Lithuanian"
+msgid "Hungarian"
 msgstr ""
 
 #: ../picard/const.py:330
-msgid "Norwegian Bokmal"
+msgid "Islandic"
 msgstr ""
 
 #: ../picard/const.py:331
-msgid "Dutch"
+msgid "Italian"
 msgstr ""
 
 #: ../picard/const.py:332
-msgid "Polish"
+msgid "Kannada"
 msgstr ""
 
 #: ../picard/const.py:333
-msgid "Portuguese"
+msgid "Korean"
 msgstr ""
 
 #: ../picard/const.py:334
-msgid "Brazilian Portuguese"
+msgid "Lithuanian"
 msgstr ""
 
 #: ../picard/const.py:335
-msgid "Romanian"
+msgid "Norwegian Bokmal"
 msgstr ""
 
 #: ../picard/const.py:336
-msgid "Russian"
+msgid "Dutch"
 msgstr ""
 
 #: ../picard/const.py:337
-msgid "Scots"
+msgid "Polish"
 msgstr ""
 
 #: ../picard/const.py:338
-msgid "Slovak"
+msgid "Portuguese"
 msgstr ""
 
 #: ../picard/const.py:339
-msgid "Slovenian"
+msgid "Brazilian Portuguese"
 msgstr ""
 
 #: ../picard/const.py:340
-msgid "Swedish"
+msgid "Romanian"
 msgstr ""
 
 #: ../picard/const.py:341
+msgid "Russian"
+msgstr ""
+
+#: ../picard/const.py:342
+msgid "Scots"
+msgstr ""
+
+#: ../picard/const.py:343
+msgid "Slovak"
+msgstr ""
+
+#: ../picard/const.py:344
+msgid "Slovenian"
+msgstr ""
+
+#: ../picard/const.py:345
+msgid "Swedish"
+msgstr ""
+
+#: ../picard/const.py:346
+msgid "Turkish"
+msgstr ""
+
+#: ../picard/const.py:347
 msgid "Chinese"
 msgstr ""
 
-#: ../picard/file.py:487
+#: ../picard/file.py:494
 #, python-format
 msgid "No matching tracks for file %s"
 msgstr ""
 
-#: ../picard/file.py:504
+#: ../picard/file.py:511
 #, python-format
 msgid "No matching tracks above the threshold for file %s"
 msgstr ""
 
-#: ../picard/file.py:507
+#: ../picard/file.py:514
 #, python-format
 msgid "File %s identified!"
 msgstr ""
 
-#: ../picard/file.py:518
+#: ../picard/file.py:525
 #, python-format
 msgid "Looking up the PUID for file %s..."
 msgstr ""
 
-#: ../picard/file.py:523
+#: ../picard/file.py:530
 #, 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 ""
@@ -1260,11 +1271,24 @@ msgstr ""
 msgid "XSPF Playlist (*.xspf)"
 msgstr ""
 
-#: ../picard/tagger.py:476
-msgid "CD Lookup Error"
+#: ../picard/puidmanager.py:62
+msgid "Submitting PUIDs..."
+msgstr ""
+
+#: ../picard/puidmanager.py:68
+#, python-format
+msgid "PUIDs submission failed: %s"
+msgstr ""
+
+#: ../picard/puidmanager.py:70
+msgid "PUIDs successfully submitted!"
 msgstr ""
 
 #: ../picard/tagger.py:477
+msgid "CD Lookup Error"
+msgstr ""
+
+#: ../picard/tagger.py:478
 #, python-format
 msgid ""
 "Error while reading CD:\n"
@@ -1272,7 +1296,7 @@ msgid ""
 "%s"
 msgstr ""
 
-#: ../picard/tagger.py:503
+#: ../picard/tagger.py:504
 #, python-format
 msgid "Could not find PUID for file %s"
 msgstr ""
@@ -1325,15 +1349,27 @@ msgstr ""
 msgid "Length"
 msgstr ""
 
-#: ../picard/ui/itemviews.py:327
+#: ../picard/ui/itemviews.py:289
+msgid "&Expand all"
+msgstr ""
+
+#: ../picard/ui/itemviews.py:291
+msgid "&Collapse all"
+msgstr ""
+
+#: ../picard/ui/itemviews.py:332
 msgid "&Releases"
 msgstr ""
 
-#: ../picard/ui/itemviews.py:353
+#: ../picard/ui/itemviews.py:349
+msgid "No release event"
+msgstr ""
+
+#: ../picard/ui/itemviews.py:359
 msgid "&Plugins"
 msgstr ""
 
-#: ../picard/ui/itemviews.py:523
+#: ../picard/ui/itemviews.py:533
 msgid "Clusters"
 msgstr ""
 
@@ -1341,95 +1377,6 @@ msgstr ""
 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:66 ../picard/ui/ui_options_plugins.py:62
-msgid "Details"
-msgstr ""
-
-#: ../picard/ui/tageditor.py:71 ../picard/ui/tageditor.py:264
-#, python-format
-msgid "%d file"
-msgid_plural "%d files"
-msgstr[0] ""
-msgstr[1] ""
-
-#: ../picard/ui/tageditor.py:131
-#, python-format
-msgid "(different across %d file)"
-msgid_plural "(different across %d files)"
-msgstr[0] ""
-msgstr[1] ""
-
-#: ../picard/ui/tageditor.py:134
-#, python-format
-msgid "(missing from %d file)"
-msgid_plural "(missing from %d files)"
-msgstr[0] ""
-msgstr[1] ""
-
-#: ../picard/ui/tageditor.py:233
-msgid "Filename:"
-msgstr ""
-
-#: ../picard/ui/tageditor.py:235
-msgid "Format:"
-msgstr ""
-
-#: ../picard/ui/tageditor.py:244
-msgid "Size:"
-msgstr ""
-
-#: ../picard/ui/tageditor.py:248 ../picard/ui/ui_metadata.py:127
-msgid "Length:"
-msgstr ""
-
-#: ../picard/ui/tageditor.py:250
-msgid "Bitrate:"
-msgstr ""
-
-#: ../picard/ui/tageditor.py:252
-msgid "Sample rate:"
-msgstr ""
-
-#: ../picard/ui/tageditor.py:254
-msgid "Bits per sample:"
-msgstr ""
-
-#: ../picard/ui/tageditor.py:257
-msgid "Mono"
-msgstr ""
-
-#: ../picard/ui/tageditor.py:258
-msgid "Stereo"
-msgstr ""
-
-#: ../picard/ui/tageditor.py:260
-msgid "Channels:"
-msgstr ""
-
-#: ../picard/ui/tagsfromfilenames.py:52 ../picard/ui/tagsfromfilenames.py:96
-msgid "File Name"
-msgstr ""
-
 #: ../picard/ui/mainwindow.py:64
 msgid "MusicBrainz Picard"
 msgstr ""
@@ -1666,6 +1613,10 @@ msgstr ""
 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 ""
@@ -1685,12 +1636,97 @@ msgstr ""
 msgid " (Error: %s)"
 msgstr ""
 
+#: ../picard/ui/puidsubmit.py:31 ../picard/ui/options/plugins.py:85
+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/passworddialog.py:38
 #, python-format
 msgid ""
 "The server %s requires you to login. Please enter your username and password."
 msgstr ""
 
+#: ../picard/ui/tageditor.py:66 ../picard/ui/ui_options_plugins.py:62
+msgid "Details"
+msgstr ""
+
+#: ../picard/ui/tageditor.py:71 ../picard/ui/tageditor.py:264
+#, python-format
+msgid "%d file"
+msgid_plural "%d files"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../picard/ui/tageditor.py:131
+#, python-format
+msgid "(different across %d file)"
+msgid_plural "(different across %d files)"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../picard/ui/tageditor.py:134
+#, python-format
+msgid "(missing from %d file)"
+msgid_plural "(missing from %d files)"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../picard/ui/tageditor.py:233
+msgid "Filename:"
+msgstr ""
+
+#: ../picard/ui/tageditor.py:235
+msgid "Format:"
+msgstr ""
+
+#: ../picard/ui/tageditor.py:244
+msgid "Size:"
+msgstr ""
+
+#: ../picard/ui/tageditor.py:248 ../picard/ui/ui_metadata.py:127
+msgid "Length:"
+msgstr ""
+
+#: ../picard/ui/tageditor.py:250
+msgid "Bitrate:"
+msgstr ""
+
+#: ../picard/ui/tageditor.py:252
+msgid "Sample rate:"
+msgstr ""
+
+#: ../picard/ui/tageditor.py:254
+msgid "Bits per sample:"
+msgstr ""
+
+#: ../picard/ui/tageditor.py:257
+msgid "Mono"
+msgstr ""
+
+#: ../picard/ui/tageditor.py:258
+msgid "Stereo"
+msgstr ""
+
+#: ../picard/ui/tageditor.py:260
+msgid "Channels:"
+msgstr ""
+
+#: ../picard/ui/tagsfromfilenames.py:54 ../picard/ui/tagsfromfilenames.py:99
+msgid "File Name"
+msgstr ""
+
 #: ../picard/ui/ui_cdlookup.py:60 ../picard/ui/ui_options_cdlookup.py:47
 #: ../picard/ui/ui_options_cdlookup_select.py:48
 #: ../picard/ui/options/cdlookup.py:36
@@ -1713,24 +1749,6 @@ msgstr ""
 msgid "Cancel"
 msgstr ""
 
-#: ../picard/ui/ui_passworddialog.py:78
-msgid "Authentication required"
-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"
-msgstr ""
-
 #: ../picard/ui/ui_edittagdialog.py:44
 msgid "Edit Tag"
 msgstr ""
@@ -1767,6 +1785,10 @@ msgstr ""
 msgid "Options"
 msgstr ""
 
+#: ../picard/ui/ui_puidsubmit.py:52
+msgid "Submit PUIDs"
+msgstr ""
+
 #: ../picard/ui/ui_options_cdlookup.py:48
 msgid "CD-ROM device to use for lookups:"
 msgstr ""
@@ -1791,6 +1813,22 @@ msgstr ""
 msgid "Overwrite the file if it already exists"
 msgstr ""
 
+#: ../picard/ui/ui_options_moving.py:53
+msgid "Move additional files:"
+msgstr ""
+
+#: ../picard/ui/ui_options_moving.py:54
+msgid "Browse..."
+msgstr ""
+
+#: ../picard/ui/ui_options_moving.py:55
+msgid "Delete empty directories"
+msgstr ""
+
+#: ../picard/ui/ui_options_moving.py:56
+msgid "Move files to this directory when saving:"
+msgstr ""
+
 #: ../picard/ui/util.py:31
 msgid "&Ok"
 msgstr ""
@@ -1799,44 +1837,40 @@ msgstr ""
 msgid "&Cancel"
 msgstr ""
 
-#: ../picard/ui/ui_puidsubmit.py:52
-msgid "Submit PUIDs"
-msgstr ""
-
-#: ../picard/ui/ui_tageditor.py:139 ../picard/ui/ui_options_plugins.py:59
-#: ../picard/ui/options/plugins.py:76
+#: ../picard/ui/ui_tageditor.py:128 ../picard/ui/ui_options_plugins.py:59
+#: ../picard/ui/options/plugins.py:81
 msgid "Name"
 msgstr ""
 
-#: ../picard/ui/ui_tageditor.py:140
+#: ../picard/ui/ui_tageditor.py:129
 msgid "Value"
 msgstr ""
 
-#: ../picard/ui/ui_tageditor.py:141
+#: ../picard/ui/ui_tageditor.py:130
 msgid "Rating:"
 msgstr ""
 
-#: ../picard/ui/ui_tageditor.py:142
+#: ../picard/ui/ui_tageditor.py:131
 msgid "&Add..."
 msgstr ""
 
-#: ../picard/ui/ui_tageditor.py:143
+#: ../picard/ui/ui_tageditor.py:132
 msgid "&Edit..."
 msgstr ""
 
-#: ../picard/ui/ui_tageditor.py:144
+#: ../picard/ui/ui_tageditor.py:133
 msgid "&Delete"
 msgstr ""
 
-#: ../picard/ui/ui_tageditor.py:145
+#: ../picard/ui/ui_tageditor.py:134
 msgid "&Metadata"
 msgstr ""
 
-#: ../picard/ui/ui_tageditor.py:146
+#: ../picard/ui/ui_tageditor.py:135
 msgid "A&rtwork"
 msgstr ""
 
-#: ../picard/ui/ui_tageditor.py:147
+#: ../picard/ui/ui_tageditor.py:136
 msgid "&Info"
 msgstr ""
 
@@ -1881,6 +1915,40 @@ msgstr ""
 msgid ", "
 msgstr ""
 
+#: ../picard/ui/ui_options_general.py:108
+msgid "MusicBrainz Server"
+msgstr ""
+
+#: ../picard/ui/ui_options_general.py:109 ../picard/ui/ui_options_proxy.py:72
+msgid "Port:"
+msgstr ""
+
+#: ../picard/ui/ui_options_general.py:110 ../picard/ui/ui_options_proxy.py:73
+msgid "Server address:"
+msgstr ""
+
+#: ../picard/ui/ui_options_general.py:111
+msgid "Account Information"
+msgstr ""
+
+#: ../picard/ui/ui_options_general.py:112 ../picard/ui/ui_options_proxy.py:70
+#: ../picard/ui/ui_passworddialog.py:80
+msgid "Password:"
+msgstr ""
+
+#: ../picard/ui/ui_options_general.py:113 ../picard/ui/ui_options_proxy.py:71
+#: ../picard/ui/ui_passworddialog.py:79
+msgid "Username:"
+msgstr ""
+
+#: ../picard/ui/ui_options_general.py:114 ../picard/ui/options/general.py:29
+msgid "General"
+msgstr "Bendra"
+
+#: ../picard/ui/ui_options_general.py:115
+msgid "Automatically scan all new files"
+msgstr ""
+
 #: ../picard/ui/ui_options_interface.py:50
 msgid "Miscellaneous"
 msgstr ""
@@ -1901,113 +1969,6 @@ msgstr ""
 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_options_naming.py:180
-#: ../picard/ui/ui_tagsfromfilenames.py:58
-msgid "&Preview"
-msgstr ""
-
-#: ../picard/ui/ui_options_proxy.py:81 ../picard/ui/options/proxy.py:28
-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_options_ratings.py:45
-msgid "Enable track ratings"
-msgstr ""
-
-#: ../picard/ui/ui_options_ratings.py:46
-msgid ""
-"Picard saves the ratings together with an e-mail address identifying the "
-"user who did the rating. That way different ratings for different users can "
-"be stored in the files. Please sepcify the e-mail you want to use to save "
-"your ratings."
-msgstr ""
-
-#: ../picard/ui/ui_options_ratings.py:47
-msgid "E-mail:"
-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 ../picard/ui/options/general.py:29
-msgid "General"
-msgstr "Bendra"
-
-#: ../picard/ui/ui_options_general.py:115
-msgid "Automatically scan all new files"
-msgstr ""
-
 #: ../picard/ui/ui_options_matching.py:105
 msgid "Thresholds"
 msgstr ""
@@ -2064,72 +2025,143 @@ msgstr ""
 msgid "Non-album tracks:"
 msgstr ""
 
-#: ../picard/ui/ui_options_plugins.py:58 ../picard/ui/options/plugins.py:30
+#: ../picard/ui/ui_options_metadata.py:109
+#: ../picard/ui/ui_options_metadata.py:110
+#: ../picard/ui/ui_options_renaming.py:155
+#: ../picard/ui/ui_options_renaming.py:158
+msgid "Default"
+msgstr ""
+
+#: ../picard/ui/ui_options_plugins.py:58 ../picard/ui/options/plugins.py:34
 msgid "Plugins"
 msgstr ""
 
-#: ../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:84
 msgid "Author"
 msgstr ""
 
-#: ../picard/ui/ui_options_plugins.py:61 ../picard/util/tags.py:36
+#: ../picard/ui/ui_options_plugins.py:61 ../picard/util/tags.py:37
 msgid "Version"
 msgstr ""
 
-#: ../picard/ui/ui_options_script.py:52
+#: ../picard/ui/ui_options_proxy.py:69 ../picard/ui/options/proxy.py:28
+msgid "Web Proxy"
+msgstr ""
+
+#: ../picard/ui/ui_options_ratings.py:45
+msgid "Enable track ratings"
+msgstr ""
+
+#: ../picard/ui/ui_options_ratings.py:46
+msgid ""
+"Picard saves the ratings together with an e-mail address identifying the "
+"user who did the rating. That way different ratings for different users can "
+"be stored in the files. Please sepcify the e-mail you want to use to save "
+"your ratings."
+msgstr ""
+
+#: ../picard/ui/ui_options_ratings.py:47
+msgid "E-mail:"
+msgstr ""
+
+#: ../picard/ui/ui_options_renaming.py:145
+msgid "Form"
+msgstr ""
+
+#: ../picard/ui/ui_options_renaming.py:146
+msgid "Rename files when saving"
+msgstr ""
+
+#: ../picard/ui/ui_options_renaming.py:147
+msgid "Replace non-ASCII characters"
+msgstr ""
+
+#: ../picard/ui/ui_options_renaming.py:148
+msgid "Replace Windows-incompatible characters"
+msgstr ""
+
+#: ../picard/ui/ui_options_renaming.py:149
+msgid "Name files like this"
+msgstr ""
+
+#: ../picard/ui/ui_options_renaming.py:156
+msgid "Name multiple artist albums differently"
+msgstr ""
+
+#: ../picard/ui/ui_options_renaming.py:157
+msgid "Copy from above"
+msgstr ""
+
+#: ../picard/ui/ui_options_renaming.py:159
+msgid "Examples"
+msgstr ""
+
+#: ../picard/ui/ui_options_script.py:43
 msgid "Tagger Script"
 msgstr ""
 
-#: ../picard/ui/ui_options_tags.py:85
-msgid "Common"
+#: ../picard/ui/ui_options_tags.py:97
+msgid "Do not write tags to files"
 msgstr ""
 
-#: ../picard/ui/ui_options_tags.py:86
-msgid "Clear existing tags before writing new tags"
+#: ../picard/ui/ui_options_tags.py:98
+msgid "Before tagging"
 msgstr ""
 
-#: ../picard/ui/ui_options_tags.py:87
-msgid "Don not write tags to files"
+#: ../picard/ui/ui_options_tags.py:99
+msgid "Clear existing tags"
 msgstr ""
 
-#: ../picard/ui/ui_options_tags.py:88
-msgid "ID3"
-msgstr ""
-
-#: ../picard/ui/ui_options_tags.py:89
-msgid "Write ID3v1 tags to the files"
-msgstr ""
-
-#: ../picard/ui/ui_options_tags.py:90
-msgid "Write ID3v2 version 2.3 tags (2.4 is default)"
-msgstr ""
-
-#: ../picard/ui/ui_options_tags.py:91
-msgid "Text encoding to use while writing ID3v2 tags:"
-msgstr ""
-
-#: ../picard/ui/ui_options_tags.py:92
-msgid "ISO-8859-1"
-msgstr ""
-
-#: ../picard/ui/ui_options_tags.py:93
-msgid "UTF-16"
-msgstr ""
-
-#: ../picard/ui/ui_options_tags.py:94
-msgid "UTF-8"
-msgstr ""
-
-#: ../picard/ui/ui_options_tags.py:95
+#: ../picard/ui/ui_options_tags.py:100
 msgid "Remove ID3 tags from FLAC files"
 msgstr ""
 
-#: ../picard/ui/ui_options_tags.py:96
-msgid "APE"
+#: ../picard/ui/ui_options_tags.py:101
+msgid "Remove APEv2 tags from MP3 files"
 msgstr ""
 
-#: ../picard/ui/ui_options_tags.py:97
-msgid "Remove APEv2 tags from MP3 files"
+#: ../picard/ui/ui_options_tags.py:102
+msgid "Tag compatibility"
+msgstr ""
+
+#: ../picard/ui/ui_options_tags.py:103
+msgid "ID3v2 version"
+msgstr ""
+
+#: ../picard/ui/ui_options_tags.py:104
+msgid "2.4"
+msgstr ""
+
+#: ../picard/ui/ui_options_tags.py:105
+msgid "2.3"
+msgstr ""
+
+#: ../picard/ui/ui_options_tags.py:106
+msgid "Also include ID3v1 tags in the files"
+msgstr ""
+
+#: ../picard/ui/ui_options_tags.py:107
+msgid "ID3v2 text encoding"
+msgstr ""
+
+#: ../picard/ui/ui_options_tags.py:108
+msgid "UTF-8"
+msgstr ""
+
+#: ../picard/ui/ui_options_tags.py:109
+msgid "UTF-16"
+msgstr ""
+
+#: ../picard/ui/ui_options_tags.py:110
+msgid "ISO-8859-1"
+msgstr ""
+
+#: ../picard/ui/ui_passworddialog.py:78
+msgid "Authentication required"
+msgstr ""
+
+#: ../picard/ui/ui_passworddialog.py:81
+msgid "Save username and password"
 msgstr ""
 
 #: ../picard/ui/ui_tagsfromfilenames.py:56
@@ -2140,6 +2172,10 @@ msgstr ""
 msgid "Replace underscores with spaces"
 msgstr ""
 
+#: ../picard/ui/ui_tagsfromfilenames.py:58
+msgid "&Preview"
+msgstr ""
+
 #: ../picard/ui/options/about.py:29
 msgid "About"
 msgstr "Apie"
@@ -2164,8 +2200,8 @@ 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"
@@ -2173,14 +2209,13 @@ msgid ""
 "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\"><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/P"
-"icardTagger</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
@@ -2213,42 +2248,44 @@ msgstr ""
 msgid "None"
 msgstr ""
 
-#: ../picard/ui/options/naming.py:33
-msgid "File Naming"
+#: ../picard/ui/options/moving.py:33
+msgid "Moving files"
 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 ""
-
-#: ../picard/ui/options/naming.py:95
-msgid "The multiple artist file naming format must not be empty."
-msgstr ""
-
-#: ../picard/ui/options/naming.py:97
+#: ../picard/ui/options/moving.py:65
 msgid "Error"
 msgstr ""
 
-#: ../picard/ui/options/naming.py:97
+#: ../picard/ui/options/moving.py:65
 msgid "The location to move files to must not be empty."
 msgstr ""
 
-#: ../picard/ui/options/scripting.py:63
-msgid "Scripting"
+#: ../picard/ui/options/ratings.py:29
+msgid "Ratings"
 msgstr ""
 
 #: ../picard/ui/options/tags.py:29
 msgid "Tags"
 msgstr ""
 
-#: ../picard/ui/options/ratings.py:29
-msgid "Ratings"
+#: ../picard/ui/options/renaming.py:35
+msgid "File naming"
+msgstr ""
+
+#: ../picard/ui/options/renaming.py:123
+msgid "The file naming format must not be empty."
+msgstr ""
+
+#: ../picard/ui/options/renaming.py:133
+msgid "The multiple artist file naming format must not be empty."
+msgstr ""
+
+#: ../picard/ui/options/scripting.py:63
+msgid "Scripting"
+msgstr ""
+
+#: ../picard/ui/options/scripting.py:97
+msgid "Script Error"
 msgstr ""
 
 #: ../picard/util/tags.py:24
@@ -2256,214 +2293,218 @@ msgid "Date"
 msgstr ""
 
 #: ../picard/util/tags.py:25
-msgid "Album Artist"
+msgid "Original Release Date"
 msgstr ""
 
 #: ../picard/util/tags.py:26
-msgid "Track Number"
+msgid "Album Artist"
 msgstr ""
 
 #: ../picard/util/tags.py:27
-msgid "Total Tracks"
+msgid "Track Number"
 msgstr ""
 
 #: ../picard/util/tags.py:28
-msgid "Disc Number"
+msgid "Total Tracks"
 msgstr ""
 
 #: ../picard/util/tags.py:29
-msgid "Total Discs"
+msgid "Disc Number"
 msgstr ""
 
 #: ../picard/util/tags.py:30
-msgid "Album Artist Sort Order"
+msgid "Total Discs"
 msgstr ""
 
 #: ../picard/util/tags.py:31
-msgid "Artist Sort Order"
+msgid "Album Artist Sort Order"
 msgstr ""
 
 #: ../picard/util/tags.py:32
-msgid "Title Sort Order"
+msgid "Artist Sort Order"
 msgstr ""
 
 #: ../picard/util/tags.py:33
-msgid "Album Sort Order"
+msgid "Title Sort Order"
 msgstr ""
 
 #: ../picard/util/tags.py:34
-msgid "ASIN"
+msgid "Album Sort Order"
 msgstr ""
 
 #: ../picard/util/tags.py:35
+msgid "ASIN"
+msgstr ""
+
+#: ../picard/util/tags.py:36
 msgid "Grouping"
 msgstr ""
 
-#: ../picard/util/tags.py:37
+#: ../picard/util/tags.py:38
 msgid "ISRC"
 msgstr ""
 
-#: ../picard/util/tags.py:38
+#: ../picard/util/tags.py:39
 msgid "Mood"
 msgstr ""
 
-#: ../picard/util/tags.py:39
+#: ../picard/util/tags.py:40
 msgid "BPM"
 msgstr ""
 
-#: ../picard/util/tags.py:40
+#: ../picard/util/tags.py:41
 msgid "Copyright"
 msgstr ""
 
-#: ../picard/util/tags.py:41
+#: ../picard/util/tags.py:42
 msgid "Composer"
 msgstr ""
 
-#: ../picard/util/tags.py:42
+#: ../picard/util/tags.py:43
 msgid "Conductor"
 msgstr ""
 
-#: ../picard/util/tags.py:43
+#: ../picard/util/tags.py:44
 msgid "Lyricist"
 msgstr ""
 
-#: ../picard/util/tags.py:44
+#: ../picard/util/tags.py:45
 msgid "Arranger"
 msgstr ""
 
-#: ../picard/util/tags.py:45
+#: ../picard/util/tags.py:46
 msgid "Producer"
 msgstr ""
 
-#: ../picard/util/tags.py:46
+#: ../picard/util/tags.py:47
 msgid "Engineer"
 msgstr ""
 
-#: ../picard/util/tags.py:47
+#: ../picard/util/tags.py:48
 msgid "Subtitle"
 msgstr ""
 
-#: ../picard/util/tags.py:48
+#: ../picard/util/tags.py:49
 msgid "Disc Subtitle"
 msgstr ""
 
-#: ../picard/util/tags.py:49
+#: ../picard/util/tags.py:50
 msgid "Remixer"
 msgstr ""
 
-#: ../picard/util/tags.py:50
+#: ../picard/util/tags.py:51
 msgid "MusicBrainz Track Id"
 msgstr ""
 
-#: ../picard/util/tags.py:51
+#: ../picard/util/tags.py:52
 msgid "MusicBrainz Release Id"
 msgstr ""
 
-#: ../picard/util/tags.py:52
+#: ../picard/util/tags.py:53
 msgid "MusicBrainz Artist Id"
 msgstr ""
 
-#: ../picard/util/tags.py:53
+#: ../picard/util/tags.py:54
 msgid "MusicBrainz Release Artist Id"
 msgstr ""
 
-#: ../picard/util/tags.py:54
+#: ../picard/util/tags.py:55
 msgid "MusicBrainz TRM Id"
 msgstr ""
 
-#: ../picard/util/tags.py:55
+#: ../picard/util/tags.py:56
 msgid "MusicBrainz Disc Id"
 msgstr ""
 
-#: ../picard/util/tags.py:56
+#: ../picard/util/tags.py:57
 msgid "MusicBrainz Sort Name"
 msgstr ""
 
-#: ../picard/util/tags.py:57
+#: ../picard/util/tags.py:58
 msgid "MusicIP PUID"
 msgstr ""
 
-#: ../picard/util/tags.py:58
+#: ../picard/util/tags.py:59
 msgid "MusicIP Fingerprint"
 msgstr ""
 
-#: ../picard/util/tags.py:59
+#: ../picard/util/tags.py:60
 msgid "Disc Id"
 msgstr ""
 
-#: ../picard/util/tags.py:60
+#: ../picard/util/tags.py:61
 msgid "Website"
 msgstr ""
 
-#: ../picard/util/tags.py:61
+#: ../picard/util/tags.py:62
 msgid "Compilation"
 msgstr ""
 
-#: ../picard/util/tags.py:62
+#: ../picard/util/tags.py:63
 msgid "Comment"
 msgstr ""
 
-#: ../picard/util/tags.py:63
+#: ../picard/util/tags.py:64
 msgid "Genre"
 msgstr ""
 
-#: ../picard/util/tags.py:64
+#: ../picard/util/tags.py:65
 msgid "Encoded By"
 msgstr ""
 
-#: ../picard/util/tags.py:65
+#: ../picard/util/tags.py:66
 msgid "Performer"
 msgstr ""
 
-#: ../picard/util/tags.py:66
+#: ../picard/util/tags.py:67
 msgid "Release Type"
 msgstr ""
 
-#: ../picard/util/tags.py:67
+#: ../picard/util/tags.py:68
 msgid "Release Status"
 msgstr ""
 
-#: ../picard/util/tags.py:68
+#: ../picard/util/tags.py:69
 msgid "Release Country"
 msgstr ""
 
-#: ../picard/util/tags.py:69
+#: ../picard/util/tags.py:70
 msgid "Record Label"
 msgstr ""
 
-#: ../picard/util/tags.py:70
+#: ../picard/util/tags.py:71
 msgid "Barcode"
 msgstr ""
 
-#: ../picard/util/tags.py:71
+#: ../picard/util/tags.py:72
 msgid "Catalog Number"
 msgstr ""
 
-#: ../picard/util/tags.py:72
+#: ../picard/util/tags.py:73
 msgid "Format"
 msgstr ""
 
-#: ../picard/util/tags.py:73
+#: ../picard/util/tags.py:74
 msgid "DJ-Mixer"
 msgstr ""
 
-#: ../picard/util/tags.py:74
+#: ../picard/util/tags.py:75
 msgid "Media"
 msgstr ""
 
-#: ../picard/util/tags.py:75
+#: ../picard/util/tags.py:76
 msgid "Lyrics"
 msgstr ""
 
-#: ../picard/util/tags.py:76
+#: ../picard/util/tags.py:77
 msgid "Mixer"
 msgstr ""
 
-#: ../picard/util/tags.py:77
+#: ../picard/util/tags.py:78
 msgid "Language"
 msgstr "Kalba"
 
-#: ../picard/util/tags.py:78
+#: ../picard/util/tags.py:79
 msgid "Script"
 msgstr ""
 
diff --git a/po/nb.po b/po/nb.po
index 84f743089..969dd9a51 100644
--- a/po/nb.po
+++ b/po/nb.po
@@ -5,7 +5,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: http://bugs.musicbrainz.org/\n"
-"POT-Creation-Date: 2009-02-24 18:58+0100\n"
+"POT-Creation-Date: 2009-04-06 22:50+0200\n"
 "PO-Revision-Date: 2009-01-25 15:05+0000\n"
 "Last-Translator: Philipp Wolfer <Unknown>\n"
 "Language-Team: Norwegian <no@li.org>\n"
@@ -17,16 +17,16 @@ msgstr ""
 "X-Generator: Launchpad (build Unknown)\n"
 "Generated-By: pygettext.py 1.5\n"
 
-#: ../picard/album.py:108 ../picard/cluster.py:248
+#: ../picard/album.py:109 ../picard/cluster.py:248
 msgid "Unmatched Files"
 msgstr ""
 
-#: ../picard/album.py:281
+#: ../picard/album.py:287
 #, python-format
 msgid "[could not load album %s]"
 msgstr ""
 
-#: ../picard/album.py:317
+#: ../picard/album.py:320
 msgid "[loading album information]"
 msgstr ""
 
@@ -586,7 +586,7 @@ msgid "Namibia"
 msgstr ""
 
 #: ../picard/const.py:182
-msgid "Vanuat"
+msgid "Vanuatu"
 msgstr ""
 
 #: ../picard/const.py:183
@@ -1030,223 +1030,234 @@ msgid "Congo, The Democratic Republic of the"
 msgstr ""
 
 #: ../picard/const.py:293
-msgid "Serbia and Montenegro"
+msgid "Serbia and Montenegro (historical, 2003-2006)"
 msgstr ""
 
 #: ../picard/const.py:294
-msgid "Croatia"
+msgid "Serbia"
 msgstr ""
 
 #: ../picard/const.py:295
-msgid "Korea (North), Democratic People's Republic of"
+msgid "Montenegro"
 msgstr ""
 
 #: ../picard/const.py:296
-msgid "Korea (South), Republic of"
+msgid "Croatia"
 msgstr ""
 
 #: ../picard/const.py:297
-msgid "Slovakia"
+msgid "Korea (North), Democratic People's Republic of"
 msgstr ""
 
 #: ../picard/const.py:298
-msgid "Soviet Union (historical, 1922-1991)"
+msgid "Korea (South), Republic of"
 msgstr ""
 
 #: ../picard/const.py:299
-msgid "East Timor"
+msgid "Slovakia"
 msgstr ""
 
 #: ../picard/const.py:300
-msgid "Czechoslovakia (historical, 1918-1992)"
+msgid "Soviet Union (historical, 1922-1991)"
 msgstr ""
 
 #: ../picard/const.py:301
-msgid "Europe"
+msgid "East Timor"
 msgstr ""
 
 #: ../picard/const.py:302
-msgid "East Germany (historical, 1949-1990)"
+msgid "Czechoslovakia (historical, 1918-1992)"
 msgstr ""
 
 #: ../picard/const.py:303
-msgid "[Unknown Country]"
+msgid "Europe"
 msgstr ""
 
 #: ../picard/const.py:304
-msgid "[Worldwide]"
+msgid "East Germany (historical, 1949-1990)"
 msgstr ""
 
 #: ../picard/const.py:305
+msgid "[Unknown Country]"
+msgstr ""
+
+#: ../picard/const.py:306
+msgid "[Worldwide]"
+msgstr ""
+
+#: ../picard/const.py:307
 msgid "Yugoslavia (historical, 1918-1992)"
 msgstr ""
 
-#: ../picard/const.py:310
-msgid "Catalan"
-msgstr ""
-
-#: ../picard/const.py:311
-msgid "Czech"
-msgstr "Tsjekkisk"
-
 #: ../picard/const.py:312
-msgid "Welsh"
+msgid "Afrikaans"
 msgstr ""
 
 #: ../picard/const.py:313
-msgid "Danish"
+msgid "Arabic"
 msgstr ""
 
 #: ../picard/const.py:314
-msgid "German"
-msgstr "Tysk"
+msgid "Catalan"
+msgstr ""
 
 #: ../picard/const.py:315
-msgid "English"
-msgstr "Engelsk"
+msgid "Czech"
+msgstr "Tsjekkisk"
 
 #: ../picard/const.py:316
-msgid "English (Canada)"
+msgid "Welsh"
 msgstr ""
 
 #: ../picard/const.py:317
+msgid "Danish"
+msgstr ""
+
+#: ../picard/const.py:318
+msgid "German"
+msgstr "Tysk"
+
+#: ../picard/const.py:319
+msgid "English"
+msgstr "Engelsk"
+
+#: ../picard/const.py:320
+msgid "English (Canada)"
+msgstr ""
+
+#: ../picard/const.py:321
 msgid "English (UK)"
 msgstr "Britisk Engelsk"
 
-#: ../picard/const.py:318
+#: ../picard/const.py:322
 msgid "Spanish"
 msgstr "Spansk"
 
-#: ../picard/const.py:319
+#: ../picard/const.py:323
 msgid "Persian"
 msgstr ""
 
-#: ../picard/const.py:320
+#: ../picard/const.py:324
 msgid "Finnish"
 msgstr "Finsk"
 
-#: ../picard/const.py:321
+#: ../picard/const.py:325
 msgid "French"
 msgstr "Fransk"
 
-#: ../picard/const.py:322
+#: ../picard/const.py:326
 msgid "Frisian"
 msgstr ""
 
-#: ../picard/const.py:323
+#: ../picard/const.py:327
 msgid "Hebrew"
 msgstr ""
 
-#: ../picard/const.py:324
+#: ../picard/const.py:328
+msgid "Hindi"
+msgstr ""
+
+#: ../picard/const.py:329
 msgid "Hungarian"
 msgstr "Ungarsk"
 
-#: ../picard/const.py:325
+#: ../picard/const.py:330
 msgid "Islandic"
 msgstr ""
 
-#: ../picard/const.py:326
+#: ../picard/const.py:331
 msgid "Italian"
 msgstr "Italiensk"
 
-#: ../picard/const.py:327
+#: ../picard/const.py:332
 msgid "Kannada"
 msgstr ""
 
-#: ../picard/const.py:328
+#: ../picard/const.py:333
 msgid "Korean"
 msgstr "Koreansk"
 
-#: ../picard/const.py:329
+#: ../picard/const.py:334
 msgid "Lithuanian"
 msgstr "Litauisk"
 
-#: ../picard/const.py:330
+#: ../picard/const.py:335
 msgid "Norwegian Bokmal"
 msgstr "Norsk (bokmål)"
 
-#: ../picard/const.py:331
+#: ../picard/const.py:336
 msgid "Dutch"
 msgstr "Nederlandsk"
 
-#: ../picard/const.py:332
+#: ../picard/const.py:337
 msgid "Polish"
 msgstr ""
 
-#: ../picard/const.py:333
+#: ../picard/const.py:338
 msgid "Portuguese"
 msgstr "Portugisisk"
 
-#: ../picard/const.py:334
+#: ../picard/const.py:339
 msgid "Brazilian Portuguese"
 msgstr ""
 
-#: ../picard/const.py:335
+#: ../picard/const.py:340
 msgid "Romanian"
 msgstr "Romansk"
 
-#: ../picard/const.py:336
+#: ../picard/const.py:341
 msgid "Russian"
 msgstr "Russisk"
 
-#: ../picard/const.py:337
+#: ../picard/const.py:342
 msgid "Scots"
 msgstr ""
 
-#: ../picard/const.py:338
+#: ../picard/const.py:343
 msgid "Slovak"
 msgstr "Slovakisk"
 
-#: ../picard/const.py:339
+#: ../picard/const.py:344
 msgid "Slovenian"
 msgstr ""
 
-#: ../picard/const.py:340
+#: ../picard/const.py:345
 msgid "Swedish"
 msgstr "Svensk"
 
-#: ../picard/const.py:341
+#: ../picard/const.py:346
+msgid "Turkish"
+msgstr ""
+
+#: ../picard/const.py:347
 msgid "Chinese"
 msgstr ""
 
-#: ../picard/file.py:487
+#: ../picard/file.py:494
 #, python-format
 msgid "No matching tracks for file %s"
 msgstr "Ingen treff for filen %s"
 
-#: ../picard/file.py:504
+#: ../picard/file.py:511
 #, python-format
 msgid "No matching tracks above the threshold for file %s"
 msgstr ""
 
-#: ../picard/file.py:507
+#: ../picard/file.py:514
 #, python-format
 msgid "File %s identified!"
 msgstr "Filen %s er identifisert!"
 
-#: ../picard/file.py:518
+#: ../picard/file.py:525
 #, python-format
 msgid "Looking up the PUID for file %s..."
 msgstr ""
 
-#: ../picard/file.py:523
+#: ../picard/file.py:530
 #, 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 "Innsending av PUID-er feilet: %s"
-
-#: ../picard/puidmanager.py:66
-msgid "PUIDs successfully submitted!"
-msgstr ""
-
 #: ../picard/playlist.py:31
 msgid "M3U Playlist (*.m3u)"
 msgstr "M3U-spilleliste (*.m3u)"
@@ -1259,11 +1270,24 @@ msgstr "PLS-spilleliste (*.pls)"
 msgid "XSPF Playlist (*.xspf)"
 msgstr "XSPF-spilleliste (*.xspf)"
 
-#: ../picard/tagger.py:476
-msgid "CD Lookup Error"
+#: ../picard/puidmanager.py:62
+msgid "Submitting PUIDs..."
+msgstr ""
+
+#: ../picard/puidmanager.py:68
+#, python-format
+msgid "PUIDs submission failed: %s"
+msgstr "Innsending av PUID-er feilet: %s"
+
+#: ../picard/puidmanager.py:70
+msgid "PUIDs successfully submitted!"
 msgstr ""
 
 #: ../picard/tagger.py:477
+msgid "CD Lookup Error"
+msgstr ""
+
+#: ../picard/tagger.py:478
 #, python-format
 msgid ""
 "Error while reading CD:\n"
@@ -1271,7 +1295,7 @@ msgid ""
 "%s"
 msgstr ""
 
-#: ../picard/tagger.py:503
+#: ../picard/tagger.py:504
 #, python-format
 msgid "Could not find PUID for file %s"
 msgstr ""
@@ -1324,15 +1348,28 @@ msgstr ""
 msgid "Length"
 msgstr "Lengde"
 
-#: ../picard/ui/itemviews.py:327
+#: ../picard/ui/itemviews.py:289
+msgid "&Expand all"
+msgstr ""
+
+#: ../picard/ui/itemviews.py:291
+msgid "&Collapse all"
+msgstr ""
+
+#: ../picard/ui/itemviews.py:332
 msgid "&Releases"
 msgstr ""
 
-#: ../picard/ui/itemviews.py:353
+#: ../picard/ui/itemviews.py:349
+#, fuzzy
+msgid "No release event"
+msgstr "Utgivelsesmåned"
+
+#: ../picard/ui/itemviews.py:359
 msgid "&Plugins"
 msgstr ""
 
-#: ../picard/ui/itemviews.py:523
+#: ../picard/ui/itemviews.py:533
 msgid "Clusters"
 msgstr ""
 
@@ -1340,95 +1377,6 @@ msgstr ""
 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:66 ../picard/ui/ui_options_plugins.py:62
-msgid "Details"
-msgstr ""
-
-#: ../picard/ui/tageditor.py:71 ../picard/ui/tageditor.py:264
-#, python-format
-msgid "%d file"
-msgid_plural "%d files"
-msgstr[0] ""
-msgstr[1] ""
-
-#: ../picard/ui/tageditor.py:131
-#, python-format
-msgid "(different across %d file)"
-msgid_plural "(different across %d files)"
-msgstr[0] ""
-msgstr[1] ""
-
-#: ../picard/ui/tageditor.py:134
-#, python-format
-msgid "(missing from %d file)"
-msgid_plural "(missing from %d files)"
-msgstr[0] ""
-msgstr[1] ""
-
-#: ../picard/ui/tageditor.py:233
-msgid "Filename:"
-msgstr ""
-
-#: ../picard/ui/tageditor.py:235
-msgid "Format:"
-msgstr "Format:"
-
-#: ../picard/ui/tageditor.py:244
-msgid "Size:"
-msgstr "Størrelse:"
-
-#: ../picard/ui/tageditor.py:248 ../picard/ui/ui_metadata.py:127
-msgid "Length:"
-msgstr "Lengde:"
-
-#: ../picard/ui/tageditor.py:250
-msgid "Bitrate:"
-msgstr "Bitrate:"
-
-#: ../picard/ui/tageditor.py:252
-msgid "Sample rate:"
-msgstr "Samplingsrate:"
-
-#: ../picard/ui/tageditor.py:254
-msgid "Bits per sample:"
-msgstr "Bits per sample:"
-
-#: ../picard/ui/tageditor.py:257
-msgid "Mono"
-msgstr "Mono"
-
-#: ../picard/ui/tageditor.py:258
-msgid "Stereo"
-msgstr "Stereo"
-
-#: ../picard/ui/tageditor.py:260
-msgid "Channels:"
-msgstr ""
-
-#: ../picard/ui/tagsfromfilenames.py:52 ../picard/ui/tagsfromfilenames.py:96
-msgid "File Name"
-msgstr ""
-
 #: ../picard/ui/mainwindow.py:64
 msgid "MusicBrainz Picard"
 msgstr ""
@@ -1665,6 +1613,10 @@ msgstr ""
 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"
@@ -1684,12 +1636,97 @@ msgstr ""
 msgid " (Error: %s)"
 msgstr " (Feil: %s)"
 
+#: ../picard/ui/puidsubmit.py:31 ../picard/ui/options/plugins.py:85
+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/passworddialog.py:38
 #, python-format
 msgid ""
 "The server %s requires you to login. Please enter your username and password."
 msgstr ""
 
+#: ../picard/ui/tageditor.py:66 ../picard/ui/ui_options_plugins.py:62
+msgid "Details"
+msgstr ""
+
+#: ../picard/ui/tageditor.py:71 ../picard/ui/tageditor.py:264
+#, python-format
+msgid "%d file"
+msgid_plural "%d files"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../picard/ui/tageditor.py:131
+#, python-format
+msgid "(different across %d file)"
+msgid_plural "(different across %d files)"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../picard/ui/tageditor.py:134
+#, python-format
+msgid "(missing from %d file)"
+msgid_plural "(missing from %d files)"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../picard/ui/tageditor.py:233
+msgid "Filename:"
+msgstr ""
+
+#: ../picard/ui/tageditor.py:235
+msgid "Format:"
+msgstr "Format:"
+
+#: ../picard/ui/tageditor.py:244
+msgid "Size:"
+msgstr "Størrelse:"
+
+#: ../picard/ui/tageditor.py:248 ../picard/ui/ui_metadata.py:127
+msgid "Length:"
+msgstr "Lengde:"
+
+#: ../picard/ui/tageditor.py:250
+msgid "Bitrate:"
+msgstr "Bitrate:"
+
+#: ../picard/ui/tageditor.py:252
+msgid "Sample rate:"
+msgstr "Samplingsrate:"
+
+#: ../picard/ui/tageditor.py:254
+msgid "Bits per sample:"
+msgstr "Bits per sample:"
+
+#: ../picard/ui/tageditor.py:257
+msgid "Mono"
+msgstr "Mono"
+
+#: ../picard/ui/tageditor.py:258
+msgid "Stereo"
+msgstr "Stereo"
+
+#: ../picard/ui/tageditor.py:260
+msgid "Channels:"
+msgstr ""
+
+#: ../picard/ui/tagsfromfilenames.py:54 ../picard/ui/tagsfromfilenames.py:99
+msgid "File Name"
+msgstr ""
+
 #: ../picard/ui/ui_cdlookup.py:60 ../picard/ui/ui_options_cdlookup.py:47
 #: ../picard/ui/ui_options_cdlookup_select.py:48
 #: ../picard/ui/options/cdlookup.py:36
@@ -1712,24 +1749,6 @@ msgstr "    Manuelt oppslag    "
 msgid "Cancel"
 msgstr "Avbryt"
 
-#: ../picard/ui/ui_passworddialog.py:78
-msgid "Authentication required"
-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"
-msgstr ""
-
 #: ../picard/ui/ui_edittagdialog.py:44
 msgid "Edit Tag"
 msgstr ""
@@ -1766,6 +1785,10 @@ msgstr ""
 msgid "Options"
 msgstr ""
 
+#: ../picard/ui/ui_puidsubmit.py:52
+msgid "Submit PUIDs"
+msgstr "Send PUID merker"
+
 #: ../picard/ui/ui_options_cdlookup.py:48
 msgid "CD-ROM device to use for lookups:"
 msgstr ""
@@ -1790,6 +1813,22 @@ msgstr "Lagre plateomslag som egne filer"
 msgid "Overwrite the file if it already exists"
 msgstr "Overskrive filen hvis den eksisterer?"
 
+#: ../picard/ui/ui_options_moving.py:53
+msgid "Move additional files:"
+msgstr ""
+
+#: ../picard/ui/ui_options_moving.py:54
+msgid "Browse..."
+msgstr ""
+
+#: ../picard/ui/ui_options_moving.py:55
+msgid "Delete empty directories"
+msgstr ""
+
+#: ../picard/ui/ui_options_moving.py:56
+msgid "Move files to this directory when saving:"
+msgstr ""
+
 #: ../picard/ui/util.py:31
 msgid "&Ok"
 msgstr "&Ok"
@@ -1798,44 +1837,40 @@ msgstr "&Ok"
 msgid "&Cancel"
 msgstr ""
 
-#: ../picard/ui/ui_puidsubmit.py:52
-msgid "Submit PUIDs"
-msgstr "Send PUID merker"
-
-#: ../picard/ui/ui_tageditor.py:139 ../picard/ui/ui_options_plugins.py:59
-#: ../picard/ui/options/plugins.py:76
+#: ../picard/ui/ui_tageditor.py:128 ../picard/ui/ui_options_plugins.py:59
+#: ../picard/ui/options/plugins.py:81
 msgid "Name"
 msgstr ""
 
-#: ../picard/ui/ui_tageditor.py:140
+#: ../picard/ui/ui_tageditor.py:129
 msgid "Value"
 msgstr "Verdi"
 
-#: ../picard/ui/ui_tageditor.py:141
+#: ../picard/ui/ui_tageditor.py:130
 msgid "Rating:"
 msgstr ""
 
-#: ../picard/ui/ui_tageditor.py:142
+#: ../picard/ui/ui_tageditor.py:131
 msgid "&Add..."
 msgstr ""
 
-#: ../picard/ui/ui_tageditor.py:143
+#: ../picard/ui/ui_tageditor.py:132
 msgid "&Edit..."
 msgstr ""
 
-#: ../picard/ui/ui_tageditor.py:144
+#: ../picard/ui/ui_tageditor.py:133
 msgid "&Delete"
 msgstr ""
 
-#: ../picard/ui/ui_tageditor.py:145
+#: ../picard/ui/ui_tageditor.py:134
 msgid "&Metadata"
 msgstr ""
 
-#: ../picard/ui/ui_tageditor.py:146
+#: ../picard/ui/ui_tageditor.py:135
 msgid "A&rtwork"
 msgstr ""
 
-#: ../picard/ui/ui_tageditor.py:147
+#: ../picard/ui/ui_tageditor.py:136
 msgid "&Info"
 msgstr ""
 
@@ -1880,6 +1915,40 @@ msgstr " / "
 msgid ", "
 msgstr ", "
 
+#: ../picard/ui/ui_options_general.py:108
+msgid "MusicBrainz Server"
+msgstr ""
+
+#: ../picard/ui/ui_options_general.py:109 ../picard/ui/ui_options_proxy.py:72
+msgid "Port:"
+msgstr ""
+
+#: ../picard/ui/ui_options_general.py:110 ../picard/ui/ui_options_proxy.py:73
+msgid "Server address:"
+msgstr "Tjeneradresse:"
+
+#: ../picard/ui/ui_options_general.py:111
+msgid "Account Information"
+msgstr "Kontoinformasjon"
+
+#: ../picard/ui/ui_options_general.py:112 ../picard/ui/ui_options_proxy.py:70
+#: ../picard/ui/ui_passworddialog.py:80
+msgid "Password:"
+msgstr ""
+
+#: ../picard/ui/ui_options_general.py:113 ../picard/ui/ui_options_proxy.py:71
+#: ../picard/ui/ui_passworddialog.py:79
+msgid "Username:"
+msgstr ""
+
+#: ../picard/ui/ui_options_general.py:114 ../picard/ui/options/general.py:29
+msgid "General"
+msgstr "Generelt"
+
+#: ../picard/ui/ui_options_general.py:115
+msgid "Automatically scan all new files"
+msgstr ""
+
 #: ../picard/ui/ui_options_interface.py:50
 msgid "Miscellaneous"
 msgstr ""
@@ -1900,113 +1969,6 @@ msgstr ""
 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 "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_options_naming.py:180
-#: ../picard/ui/ui_tagsfromfilenames.py:58
-msgid "&Preview"
-msgstr "&Forhåndsvis"
-
-#: ../picard/ui/ui_options_proxy.py:81 ../picard/ui/options/proxy.py:28
-msgid "Web Proxy"
-msgstr "Web Proxy"
-
-#: ../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 "Tjeneradresse:"
-
-#: ../picard/ui/ui_options_ratings.py:45
-msgid "Enable track ratings"
-msgstr ""
-
-#: ../picard/ui/ui_options_ratings.py:46
-msgid ""
-"Picard saves the ratings together with an e-mail address identifying the "
-"user who did the rating. That way different ratings for different users can "
-"be stored in the files. Please sepcify the e-mail you want to use to save "
-"your ratings."
-msgstr ""
-
-#: ../picard/ui/ui_options_ratings.py:47
-msgid "E-mail:"
-msgstr ""
-
-#: ../picard/ui/ui_options_general.py:108
-msgid "MusicBrainz Server"
-msgstr ""
-
-#: ../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"
-
-#: ../picard/ui/ui_options_general.py:115
-msgid "Automatically scan all new files"
-msgstr ""
-
 #: ../picard/ui/ui_options_matching.py:105
 msgid "Thresholds"
 msgstr "Terskler"
@@ -2063,74 +2025,152 @@ msgstr "Diverse artister:"
 msgid "Non-album tracks:"
 msgstr "Albumløse spor:"
 
-#: ../picard/ui/ui_options_plugins.py:58 ../picard/ui/options/plugins.py:30
+#: ../picard/ui/ui_options_metadata.py:109
+#: ../picard/ui/ui_options_metadata.py:110
+#: ../picard/ui/ui_options_renaming.py:155
+#: ../picard/ui/ui_options_renaming.py:158
+msgid "Default"
+msgstr "Standard"
+
+#: ../picard/ui/ui_options_plugins.py:58 ../picard/ui/options/plugins.py:34
 msgid "Plugins"
 msgstr ""
 
-#: ../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:84
 msgid "Author"
 msgstr "Forfatter"
 
-#: ../picard/ui/ui_options_plugins.py:61 ../picard/util/tags.py:36
+#: ../picard/ui/ui_options_plugins.py:61 ../picard/util/tags.py:37
 msgid "Version"
 msgstr "Versjon"
 
-#: ../picard/ui/ui_options_script.py:52
+#: ../picard/ui/ui_options_proxy.py:69 ../picard/ui/options/proxy.py:28
+msgid "Web Proxy"
+msgstr "Web Proxy"
+
+#: ../picard/ui/ui_options_ratings.py:45
+msgid "Enable track ratings"
+msgstr ""
+
+#: ../picard/ui/ui_options_ratings.py:46
+msgid ""
+"Picard saves the ratings together with an e-mail address identifying the "
+"user who did the rating. That way different ratings for different users can "
+"be stored in the files. Please sepcify the e-mail you want to use to save "
+"your ratings."
+msgstr ""
+
+#: ../picard/ui/ui_options_ratings.py:47
+msgid "E-mail:"
+msgstr ""
+
+#: ../picard/ui/ui_options_renaming.py:145
+#, fuzzy
+msgid "Form"
+msgstr "Format:"
+
+#: ../picard/ui/ui_options_renaming.py:146
+#, fuzzy
+msgid "Rename files when saving"
+msgstr "Endre også filnavn under skriving av metadata (tagging)"
+
+#: ../picard/ui/ui_options_renaming.py:147
+msgid "Replace non-ASCII characters"
+msgstr "Bytt ut ikke-ASCII tegn"
+
+#: ../picard/ui/ui_options_renaming.py:148
+msgid "Replace Windows-incompatible characters"
+msgstr "Bytt ut Windows-inkompatible tegn"
+
+#: ../picard/ui/ui_options_renaming.py:149
+msgid "Name files like this"
+msgstr ""
+
+#: ../picard/ui/ui_options_renaming.py:156
+msgid "Name multiple artist albums differently"
+msgstr ""
+
+#: ../picard/ui/ui_options_renaming.py:157
+msgid "Copy from above"
+msgstr ""
+
+#: ../picard/ui/ui_options_renaming.py:159
+#, fuzzy
+msgid "Examples"
+msgstr "Eksempel"
+
+#: ../picard/ui/ui_options_script.py:43
 msgid "Tagger Script"
 msgstr ""
 
-#: ../picard/ui/ui_options_tags.py:85
-msgid "Common"
-msgstr "Felles"
+#: ../picard/ui/ui_options_tags.py:97
+#, fuzzy
+msgid "Do not write tags to files"
+msgstr "Ikke skriv tagger til filer"
 
-#: ../picard/ui/ui_options_tags.py:86
-msgid "Clear existing tags before writing new tags"
+#: ../picard/ui/ui_options_tags.py:98
+msgid "Before tagging"
+msgstr ""
+
+#: ../picard/ui/ui_options_tags.py:99
+#, fuzzy
+msgid "Clear existing tags"
 msgstr "Fjern eksisterende metadata før nye data skrives"
 
-#: ../picard/ui/ui_options_tags.py:87
-msgid "Don not write tags to files"
-msgstr ""
-
-#: ../picard/ui/ui_options_tags.py:88
-msgid "ID3"
-msgstr "ID3"
-
-#: ../picard/ui/ui_options_tags.py:89
-msgid "Write ID3v1 tags to the files"
-msgstr "Skriv ID3v1 tagger til filene"
-
-#: ../picard/ui/ui_options_tags.py:90
-msgid "Write ID3v2 version 2.3 tags (2.4 is default)"
-msgstr "Skriv ID3v2 metadata i versjon 2.3 (2.4 er standard)"
-
-#: ../picard/ui/ui_options_tags.py:91
-msgid "Text encoding to use while writing ID3v2 tags:"
-msgstr ""
-
-#: ../picard/ui/ui_options_tags.py:92
-msgid "ISO-8859-1"
-msgstr "ISO-8859-1"
-
-#: ../picard/ui/ui_options_tags.py:93
-msgid "UTF-16"
-msgstr "UTF-16"
-
-#: ../picard/ui/ui_options_tags.py:94
-msgid "UTF-8"
-msgstr "UTF-8"
-
-#: ../picard/ui/ui_options_tags.py:95
+#: ../picard/ui/ui_options_tags.py:100
 msgid "Remove ID3 tags from FLAC files"
 msgstr ""
 
-#: ../picard/ui/ui_options_tags.py:96
-msgid "APE"
-msgstr "APE"
-
-#: ../picard/ui/ui_options_tags.py:97
+#: ../picard/ui/ui_options_tags.py:101
 msgid "Remove APEv2 tags from MP3 files"
 msgstr ""
 
+#: ../picard/ui/ui_options_tags.py:102
+msgid "Tag compatibility"
+msgstr ""
+
+#: ../picard/ui/ui_options_tags.py:103
+#, fuzzy
+msgid "ID3v2 version"
+msgstr "Bare ID3v2.4"
+
+#: ../picard/ui/ui_options_tags.py:104
+msgid "2.4"
+msgstr ""
+
+#: ../picard/ui/ui_options_tags.py:105
+msgid "2.3"
+msgstr ""
+
+#: ../picard/ui/ui_options_tags.py:106
+#, fuzzy
+msgid "Also include ID3v1 tags in the files"
+msgstr "Skriv ID3v1 tagger til filene"
+
+#: ../picard/ui/ui_options_tags.py:107
+msgid "ID3v2 text encoding"
+msgstr ""
+
+#: ../picard/ui/ui_options_tags.py:108
+msgid "UTF-8"
+msgstr "UTF-8"
+
+#: ../picard/ui/ui_options_tags.py:109
+msgid "UTF-16"
+msgstr "UTF-16"
+
+#: ../picard/ui/ui_options_tags.py:110
+msgid "ISO-8859-1"
+msgstr "ISO-8859-1"
+
+#: ../picard/ui/ui_passworddialog.py:78
+msgid "Authentication required"
+msgstr ""
+
+#: ../picard/ui/ui_passworddialog.py:81
+msgid "Save username and password"
+msgstr ""
+
 #: ../picard/ui/ui_tagsfromfilenames.py:56
 msgid "Convert File Names to Tags"
 msgstr ""
@@ -2139,6 +2179,10 @@ msgstr ""
 msgid "Replace underscores with spaces"
 msgstr "Erstatt understreker med mellomrom"
 
+#: ../picard/ui/ui_tagsfromfilenames.py:58
+msgid "&Preview"
+msgstr "&Forhåndsvis"
+
 #: ../picard/ui/options/about.py:29
 msgid "About"
 msgstr "Om..."
@@ -2169,8 +2213,8 @@ 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"
@@ -2178,14 +2222,13 @@ msgid ""
 "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\"><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/P"
-"icardTagger</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
@@ -2218,42 +2261,46 @@ msgstr ""
 msgid "None"
 msgstr ""
 
-#: ../picard/ui/options/naming.py:33
-msgid "File Naming"
-msgstr ""
+#: ../picard/ui/options/moving.py:33
+#, fuzzy
+msgid "Moving files"
+msgstr "Filflyttningsfeil"
 
-#: ../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 ""
-
-#: ../picard/ui/options/naming.py:95
-msgid "The multiple artist file naming format must not be empty."
-msgstr ""
-
-#: ../picard/ui/options/naming.py:97
+#: ../picard/ui/options/moving.py:65
 msgid "Error"
 msgstr ""
 
-#: ../picard/ui/options/naming.py:97
+#: ../picard/ui/options/moving.py:65
 msgid "The location to move files to must not be empty."
 msgstr ""
 
+#: ../picard/ui/options/ratings.py:29
+msgid "Ratings"
+msgstr ""
+
+#: ../picard/ui/options/tags.py:29
+msgid "Tags"
+msgstr "Metadata"
+
+#: ../picard/ui/options/renaming.py:35
+#, fuzzy
+msgid "File naming"
+msgstr "Filnavnformat:"
+
+#: ../picard/ui/options/renaming.py:123
+msgid "The file naming format must not be empty."
+msgstr ""
+
+#: ../picard/ui/options/renaming.py:133
+msgid "The multiple artist file naming format 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/ui/options/ratings.py:29
-msgid "Ratings"
+#: ../picard/ui/options/scripting.py:97
+msgid "Script Error"
 msgstr ""
 
 #: ../picard/util/tags.py:24
@@ -2261,214 +2308,219 @@ msgid "Date"
 msgstr ""
 
 #: ../picard/util/tags.py:25
+#, fuzzy
+msgid "Original Release Date"
+msgstr "Utgivelsesdato"
+
+#: ../picard/util/tags.py:26
 msgid "Album Artist"
 msgstr ""
 
-#: ../picard/util/tags.py:26
+#: ../picard/util/tags.py:27
 msgid "Track Number"
 msgstr ""
 
-#: ../picard/util/tags.py:27
+#: ../picard/util/tags.py:28
 msgid "Total Tracks"
 msgstr ""
 
-#: ../picard/util/tags.py:28
+#: ../picard/util/tags.py:29
 msgid "Disc Number"
 msgstr ""
 
-#: ../picard/util/tags.py:29
+#: ../picard/util/tags.py:30
 msgid "Total Discs"
 msgstr ""
 
-#: ../picard/util/tags.py:30
+#: ../picard/util/tags.py:31
 msgid "Album Artist Sort Order"
 msgstr ""
 
-#: ../picard/util/tags.py:31
+#: ../picard/util/tags.py:32
 msgid "Artist Sort Order"
 msgstr "Sorter etter artist"
 
-#: ../picard/util/tags.py:32
+#: ../picard/util/tags.py:33
 msgid "Title Sort Order"
 msgstr "Sorter etter tittel"
 
-#: ../picard/util/tags.py:33
+#: ../picard/util/tags.py:34
 msgid "Album Sort Order"
 msgstr ""
 
-#: ../picard/util/tags.py:34
+#: ../picard/util/tags.py:35
 msgid "ASIN"
 msgstr ""
 
-#: ../picard/util/tags.py:35
+#: ../picard/util/tags.py:36
 msgid "Grouping"
 msgstr "Gruppering"
 
-#: ../picard/util/tags.py:37
+#: ../picard/util/tags.py:38
 msgid "ISRC"
 msgstr "ISRC"
 
-#: ../picard/util/tags.py:38
+#: ../picard/util/tags.py:39
 msgid "Mood"
 msgstr "Stemning"
 
-#: ../picard/util/tags.py:39
+#: ../picard/util/tags.py:40
 msgid "BPM"
 msgstr "BPM"
 
-#: ../picard/util/tags.py:40
+#: ../picard/util/tags.py:41
 msgid "Copyright"
 msgstr ""
 
-#: ../picard/util/tags.py:41
+#: ../picard/util/tags.py:42
 msgid "Composer"
 msgstr ""
 
-#: ../picard/util/tags.py:42
+#: ../picard/util/tags.py:43
 msgid "Conductor"
 msgstr ""
 
-#: ../picard/util/tags.py:43
+#: ../picard/util/tags.py:44
 msgid "Lyricist"
 msgstr "Låtskriver"
 
-#: ../picard/util/tags.py:44
+#: ../picard/util/tags.py:45
 msgid "Arranger"
 msgstr "Arrangør"
 
-#: ../picard/util/tags.py:45
+#: ../picard/util/tags.py:46
 msgid "Producer"
 msgstr "Produsent"
 
-#: ../picard/util/tags.py:46
+#: ../picard/util/tags.py:47
 msgid "Engineer"
 msgstr ""
 
-#: ../picard/util/tags.py:47
+#: ../picard/util/tags.py:48
 msgid "Subtitle"
 msgstr "Undertekst"
 
-#: ../picard/util/tags.py:48
+#: ../picard/util/tags.py:49
 msgid "Disc Subtitle"
 msgstr ""
 
-#: ../picard/util/tags.py:49
+#: ../picard/util/tags.py:50
 msgid "Remixer"
 msgstr ""
 
-#: ../picard/util/tags.py:50
+#: ../picard/util/tags.py:51
 msgid "MusicBrainz Track Id"
 msgstr ""
 
-#: ../picard/util/tags.py:51
+#: ../picard/util/tags.py:52
 msgid "MusicBrainz Release Id"
 msgstr ""
 
-#: ../picard/util/tags.py:52
+#: ../picard/util/tags.py:53
 msgid "MusicBrainz Artist Id"
 msgstr ""
 
-#: ../picard/util/tags.py:53
+#: ../picard/util/tags.py:54
 msgid "MusicBrainz Release Artist Id"
 msgstr ""
 
-#: ../picard/util/tags.py:54
+#: ../picard/util/tags.py:55
 msgid "MusicBrainz TRM Id"
 msgstr ""
 
-#: ../picard/util/tags.py:55
+#: ../picard/util/tags.py:56
 msgid "MusicBrainz Disc Id"
 msgstr ""
 
-#: ../picard/util/tags.py:56
+#: ../picard/util/tags.py:57
 msgid "MusicBrainz Sort Name"
 msgstr ""
 
-#: ../picard/util/tags.py:57
+#: ../picard/util/tags.py:58
 msgid "MusicIP PUID"
 msgstr ""
 
-#: ../picard/util/tags.py:58
+#: ../picard/util/tags.py:59
 msgid "MusicIP Fingerprint"
 msgstr ""
 
-#: ../picard/util/tags.py:59
+#: ../picard/util/tags.py:60
 msgid "Disc Id"
 msgstr ""
 
-#: ../picard/util/tags.py:60
+#: ../picard/util/tags.py:61
 msgid "Website"
 msgstr ""
 
-#: ../picard/util/tags.py:61
+#: ../picard/util/tags.py:62
 msgid "Compilation"
 msgstr ""
 
-#: ../picard/util/tags.py:62
+#: ../picard/util/tags.py:63
 msgid "Comment"
 msgstr ""
 
-#: ../picard/util/tags.py:63
+#: ../picard/util/tags.py:64
 msgid "Genre"
 msgstr ""
 
-#: ../picard/util/tags.py:64
+#: ../picard/util/tags.py:65
 msgid "Encoded By"
 msgstr ""
 
-#: ../picard/util/tags.py:65
+#: ../picard/util/tags.py:66
 msgid "Performer"
 msgstr "Artist"
 
-#: ../picard/util/tags.py:66
+#: ../picard/util/tags.py:67
 msgid "Release Type"
 msgstr ""
 
-#: ../picard/util/tags.py:67
+#: ../picard/util/tags.py:68
 msgid "Release Status"
 msgstr ""
 
-#: ../picard/util/tags.py:68
+#: ../picard/util/tags.py:69
 msgid "Release Country"
 msgstr ""
 
-#: ../picard/util/tags.py:69
+#: ../picard/util/tags.py:70
 msgid "Record Label"
 msgstr ""
 
-#: ../picard/util/tags.py:70
+#: ../picard/util/tags.py:71
 msgid "Barcode"
 msgstr "Strekkode"
 
-#: ../picard/util/tags.py:71
+#: ../picard/util/tags.py:72
 msgid "Catalog Number"
 msgstr ""
 
-#: ../picard/util/tags.py:72
+#: ../picard/util/tags.py:73
 msgid "Format"
 msgstr ""
 
-#: ../picard/util/tags.py:73
+#: ../picard/util/tags.py:74
 msgid "DJ-Mixer"
 msgstr ""
 
-#: ../picard/util/tags.py:74
+#: ../picard/util/tags.py:75
 msgid "Media"
 msgstr ""
 
-#: ../picard/util/tags.py:75
+#: ../picard/util/tags.py:76
 msgid "Lyrics"
 msgstr "Tekster"
 
-#: ../picard/util/tags.py:76
+#: ../picard/util/tags.py:77
 msgid "Mixer"
 msgstr "Mikser"
 
-#: ../picard/util/tags.py:77
+#: ../picard/util/tags.py:78
 msgid "Language"
 msgstr "Språk"
 
-#: ../picard/util/tags.py:78
+#: ../picard/util/tags.py:79
 msgid "Script"
 msgstr ""
 
@@ -2484,25 +2536,37 @@ msgid ""
 "%s"
 msgstr ""
 
+#~ msgid "Multiple artist file naming format:"
+#~ msgstr "Filnavnformat for multiple artister:"
+
+#~ msgid "Common"
+#~ msgstr "Felles"
+
+#~ msgid "ID3"
+#~ msgstr "ID3"
+
+#~ msgid "Write ID3v2 version 2.3 tags (2.4 is default)"
+#~ msgstr "Skriv ID3v2 metadata i versjon 2.3 (2.4 er standard)"
+
+#~ msgid "APE"
+#~ msgstr "APE"
+
 #~ msgid "New Version"
 #~ msgstr "Ny versjon"
 
-#, python-format
 #~ msgid ""
-#~ "New version of Picard is available (%s). Would you like to download it now?"
+#~ "New version of Picard is available (%s). Would you like to download it "
+#~ "now?"
 #~ msgstr ""
-#~ "En ny versjon av Picard er tilgjengelig (%s). Ønsker du å laste ned denne nå?"
+#~ "En ny versjon av Picard er tilgjengelig (%s). Ønsker du å laste ned denne "
+#~ "nå?"
 
-#, python-format
 #~ msgid "Couldn't find PUID for file %s"
 #~ msgstr "Kunne ikke funne PUID for filen %s"
 
 #~ msgid "Automatically analyze all new files"
 #~ msgstr "Analysér automatisk alle nye filer"
 
-#~ msgid "Don't write tags to files"
-#~ msgstr "Ikke skriv tagger til filer"
-
 #~ msgid "Are You Sure?"
 #~ msgstr "Er du sikker?"
 
@@ -2626,9 +2690,6 @@ msgstr ""
 #~ msgid "Album Status (official, promo, etc.)"
 #~ msgstr "Albumsstatus (offisiell, promo, osv.)"
 
-#~ msgid "Album release month"
-#~ msgstr "Utgivelsesmåned"
-
 #~ msgid "Album release day"
 #~ msgstr "Utgivelsesdato"
 
@@ -2647,9 +2708,6 @@ msgstr ""
 #~ msgid "Proxy port"
 #~ msgstr "Proxyport"
 
-#~ msgid "ID3v2.4 only"
-#~ msgstr "Bare ID3v2.4"
-
 #~ msgid "Save track/album"
 #~ msgstr "Lagre spor/album"
 
@@ -2684,15 +2742,17 @@ msgstr ""
 #~ 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"
-#~ "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. "
+#~ "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 ""
 #~ "Inget brukernavn eller passord spesifisert! For å kunne legge til data og "
 #~ "sende PUID merker, må du ha brukernavn og passord.\n"
 #~ "Vil du lage en ny brukerkonto nå? Hvis du allerede har en MusicBrainz "
-#~ "brukerkonto, setter du inn brukerinformasjonen i vinduet for alternativer. "
+#~ "brukerkonto, setter du inn brukerinformasjonen i vinduet for "
+#~ "alternativer. "
 
 #~ msgid "Couldn't connect to the MusicBrainz server."
 #~ msgstr "Kunne ikke logge til MusicBrainz serveren."
@@ -2719,7 +2779,8 @@ msgstr ""
 #~ 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."
+#~ "Please fix the move option or the destination directory option and try "
+#~ "again."
 #~ msgstr ""
 #~ "Filflytting er på, men destinasjons mappen er ikke spesifisert eller er "
 #~ "ugyldig.\n"
@@ -2727,13 +2788,13 @@ msgstr ""
 #~ "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 click the "
-#~ "track and select 'Clear Error'"
+#~ "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 filene ble lagret. Sjekk sporene som har et feilmeldingsikon "
-#~ "foran. Høyreklikk sporet og velg 'Fjern feilmeldinger' for å prøve å lagre "
-#~ "det igjen."
+#~ "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"
@@ -2747,9 +2808,6 @@ msgstr ""
 #~ msgid "Drag files from below"
 #~ msgstr "Dra filer herfra"
 
-#~ msgid "Release date"
-#~ msgstr "Utgivelsesdato"
-
 #~ msgid "%d%% similar"
 #~ msgstr "%d%% lik"
 
@@ -2757,7 +2815,8 @@ msgstr ""
 #~ msgstr "Donere til MusicBrainz!"
 
 #~ msgid ""
-#~ "The destination directory %s does not exist. Please pick a valid directory."
+#~ "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"
@@ -2774,15 +2833,12 @@ msgstr ""
 #~ 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."
+#~ "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!"
 
@@ -2848,9 +2904,6 @@ msgstr ""
 #~ 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"
 
@@ -2861,11 +2914,11 @@ msgstr ""
 #~ msgstr "Start Picard automatisk ved innsetting av Lyddisker"
 
 #~ msgid ""
-#~ "Failed to set the proper registy values to enable launching the tagger after "
-#~ "CD insertion. "
+#~ "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. "
+#~ "Feil: Kunne ikke opprette riktig registerinformasjon for automatisk start "
+#~ "av tagger ved innsetting av CD. "
 
 #~ msgid "Default CD setting failed"
 #~ msgstr "Standard-diskinstillingen feilet"
diff --git a/po/nl.po b/po/nl.po
index 50f22ee4f..776c85e91 100644
--- a/po/nl.po
+++ b/po/nl.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: picard\n"
 "Report-Msgid-Bugs-To: http://bugs.musicbrainz.org/\n"
-"POT-Creation-Date: 2009-02-24 18:58+0100\n"
+"POT-Creation-Date: 2009-04-06 22:50+0200\n"
 "PO-Revision-Date: 2009-03-07 16:44+0000\n"
 "Last-Translator: S_joerdd <sjoerd@chilplaza.nl>\n"
 "Language-Team: Dutch <nl@li.org>\n"
@@ -19,16 +19,16 @@ msgstr ""
 "X-Generator: Launchpad (build Unknown)\n"
 "Generated-By: pygettext.py 1.5\n"
 
-#: ../picard/album.py:108 ../picard/cluster.py:248
+#: ../picard/album.py:109 ../picard/cluster.py:248
 msgid "Unmatched Files"
 msgstr "Niet-overeenkomende bestanden"
 
-#: ../picard/album.py:281
+#: ../picard/album.py:287
 #, python-format
 msgid "[could not load album %s]"
 msgstr ""
 
-#: ../picard/album.py:317
+#: ../picard/album.py:320
 msgid "[loading album information]"
 msgstr "[albuminformatie laden]"
 
@@ -588,7 +588,7 @@ msgid "Namibia"
 msgstr ""
 
 #: ../picard/const.py:182
-msgid "Vanuat"
+msgid "Vanuatu"
 msgstr ""
 
 #: ../picard/const.py:183
@@ -1032,223 +1032,237 @@ msgid "Congo, The Democratic Republic of the"
 msgstr ""
 
 #: ../picard/const.py:293
-msgid "Serbia and Montenegro"
+msgid "Serbia and Montenegro (historical, 2003-2006)"
 msgstr ""
 
 #: ../picard/const.py:294
-msgid "Croatia"
-msgstr ""
+#, fuzzy
+msgid "Serbia"
+msgstr "Georgië"
 
 #: ../picard/const.py:295
-msgid "Korea (North), Democratic People's Republic of"
+msgid "Montenegro"
 msgstr ""
 
 #: ../picard/const.py:296
-msgid "Korea (South), Republic of"
+msgid "Croatia"
 msgstr ""
 
 #: ../picard/const.py:297
-msgid "Slovakia"
+msgid "Korea (North), Democratic People's Republic of"
 msgstr ""
 
 #: ../picard/const.py:298
-msgid "Soviet Union (historical, 1922-1991)"
+msgid "Korea (South), Republic of"
 msgstr ""
 
 #: ../picard/const.py:299
-msgid "East Timor"
+msgid "Slovakia"
 msgstr ""
 
 #: ../picard/const.py:300
-msgid "Czechoslovakia (historical, 1918-1992)"
+msgid "Soviet Union (historical, 1922-1991)"
 msgstr ""
 
 #: ../picard/const.py:301
-msgid "Europe"
+msgid "East Timor"
 msgstr ""
 
 #: ../picard/const.py:302
-msgid "East Germany (historical, 1949-1990)"
+msgid "Czechoslovakia (historical, 1918-1992)"
 msgstr ""
 
 #: ../picard/const.py:303
-msgid "[Unknown Country]"
+msgid "Europe"
 msgstr ""
 
 #: ../picard/const.py:304
-msgid "[Worldwide]"
+msgid "East Germany (historical, 1949-1990)"
 msgstr ""
 
 #: ../picard/const.py:305
+msgid "[Unknown Country]"
+msgstr ""
+
+#: ../picard/const.py:306
+msgid "[Worldwide]"
+msgstr ""
+
+#: ../picard/const.py:307
 msgid "Yugoslavia (historical, 1918-1992)"
 msgstr ""
 
-#: ../picard/const.py:310
-msgid "Catalan"
-msgstr ""
-
-#: ../picard/const.py:311
-msgid "Czech"
-msgstr "Tjechisch"
-
 #: ../picard/const.py:312
-msgid "Welsh"
+msgid "Afrikaans"
 msgstr ""
 
 #: ../picard/const.py:313
-msgid "Danish"
+msgid "Arabic"
 msgstr ""
 
 #: ../picard/const.py:314
-msgid "German"
-msgstr "Duits"
+msgid "Catalan"
+msgstr ""
 
 #: ../picard/const.py:315
-msgid "English"
-msgstr "Engels"
+msgid "Czech"
+msgstr "Tjechisch"
 
 #: ../picard/const.py:316
-msgid "English (Canada)"
+msgid "Welsh"
 msgstr ""
 
 #: ../picard/const.py:317
+msgid "Danish"
+msgstr ""
+
+#: ../picard/const.py:318
+msgid "German"
+msgstr "Duits"
+
+#: ../picard/const.py:319
+msgid "English"
+msgstr "Engels"
+
+#: ../picard/const.py:320
+msgid "English (Canada)"
+msgstr ""
+
+#: ../picard/const.py:321
 msgid "English (UK)"
 msgstr "Engels (UK)"
 
-#: ../picard/const.py:318
+#: ../picard/const.py:322
 msgid "Spanish"
 msgstr "Spaans"
 
-#: ../picard/const.py:319
+#: ../picard/const.py:323
 msgid "Persian"
 msgstr ""
 
-#: ../picard/const.py:320
+#: ../picard/const.py:324
 msgid "Finnish"
 msgstr "Fins"
 
-#: ../picard/const.py:321
+#: ../picard/const.py:325
 msgid "French"
 msgstr "Frans"
 
-#: ../picard/const.py:322
+#: ../picard/const.py:326
 msgid "Frisian"
 msgstr ""
 
-#: ../picard/const.py:323
+#: ../picard/const.py:327
 msgid "Hebrew"
 msgstr ""
 
-#: ../picard/const.py:324
+#: ../picard/const.py:328
+#, fuzzy
+msgid "Hindi"
+msgstr "Haïti"
+
+#: ../picard/const.py:329
 msgid "Hungarian"
 msgstr "Hongaars"
 
-#: ../picard/const.py:325
+#: ../picard/const.py:330
 msgid "Islandic"
 msgstr ""
 
-#: ../picard/const.py:326
+#: ../picard/const.py:331
 msgid "Italian"
 msgstr "Italiaans"
 
-#: ../picard/const.py:327
+#: ../picard/const.py:332
 msgid "Kannada"
 msgstr ""
 
-#: ../picard/const.py:328
+#: ../picard/const.py:333
 msgid "Korean"
 msgstr "Koreaans"
 
-#: ../picard/const.py:329
+#: ../picard/const.py:334
 msgid "Lithuanian"
 msgstr "Litouws"
 
-#: ../picard/const.py:330
+#: ../picard/const.py:335
 msgid "Norwegian Bokmal"
 msgstr "Noors Bokmål"
 
-#: ../picard/const.py:331
+#: ../picard/const.py:336
 msgid "Dutch"
 msgstr "Nederlands"
 
-#: ../picard/const.py:332
+#: ../picard/const.py:337
 msgid "Polish"
 msgstr ""
 
-#: ../picard/const.py:333
+#: ../picard/const.py:338
 msgid "Portuguese"
 msgstr "Portugees"
 
-#: ../picard/const.py:334
+#: ../picard/const.py:339
 msgid "Brazilian Portuguese"
 msgstr ""
 
-#: ../picard/const.py:335
+#: ../picard/const.py:340
 msgid "Romanian"
 msgstr "Roemeens"
 
-#: ../picard/const.py:336
+#: ../picard/const.py:341
 msgid "Russian"
 msgstr "Russisch"
 
-#: ../picard/const.py:337
+#: ../picard/const.py:342
 msgid "Scots"
 msgstr ""
 
-#: ../picard/const.py:338
+#: ../picard/const.py:343
 msgid "Slovak"
 msgstr "Slovaaks"
 
-#: ../picard/const.py:339
+#: ../picard/const.py:344
 msgid "Slovenian"
 msgstr ""
 
-#: ../picard/const.py:340
+#: ../picard/const.py:345
 msgid "Swedish"
 msgstr "Zweeds"
 
-#: ../picard/const.py:341
+#: ../picard/const.py:346
+#, fuzzy
+msgid "Turkish"
+msgstr "Turkmenistan"
+
+#: ../picard/const.py:347
 msgid "Chinese"
 msgstr ""
 
-#: ../picard/file.py:487
+#: ../picard/file.py:494
 #, python-format
 msgid "No matching tracks for file %s"
 msgstr "Geen overeenkomende nummers voor bestand %s"
 
-#: ../picard/file.py:504
+#: ../picard/file.py:511
 #, python-format
 msgid "No matching tracks above the threshold for file %s"
 msgstr ""
 
-#: ../picard/file.py:507
+#: ../picard/file.py:514
 #, python-format
 msgid "File %s identified!"
 msgstr "Bestand %s geïdentificeerd!"
 
-#: ../picard/file.py:518
+#: ../picard/file.py:525
 #, python-format
 msgid "Looking up the PUID for file %s..."
 msgstr "Opzoeken van PUID voor bestand %s..."
 
-#: ../picard/file.py:523
+#: ../picard/file.py:530
 #, 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)"
@@ -1261,11 +1275,24 @@ msgstr "PLS afspeellijst (*.pls)"
 msgid "XSPF Playlist (*.xspf)"
 msgstr "XSPF afspeellijst (*.xspf)"
 
-#: ../picard/tagger.py:476
+#: ../picard/puidmanager.py:62
+msgid "Submitting PUIDs..."
+msgstr "PUID's versturen"
+
+#: ../picard/puidmanager.py:68
+#, python-format
+msgid "PUIDs submission failed: %s"
+msgstr "Versturen van PUID's mislukt: %s"
+
+#: ../picard/puidmanager.py:70
+msgid "PUIDs successfully submitted!"
+msgstr "PUID's met succes verstuurd!"
+
+#: ../picard/tagger.py:477
 msgid "CD Lookup Error"
 msgstr "Fout bij opzoeken van CD"
 
-#: ../picard/tagger.py:477
+#: ../picard/tagger.py:478
 #, python-format
 msgid ""
 "Error while reading CD:\n"
@@ -1276,7 +1303,7 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../picard/tagger.py:503
+#: ../picard/tagger.py:504
 #, python-format
 msgid "Could not find PUID for file %s"
 msgstr ""
@@ -1329,15 +1356,28 @@ msgstr "&Verborgen bestanden tonen"
 msgid "Length"
 msgstr "Lengte"
 
-#: ../picard/ui/itemviews.py:327
+#: ../picard/ui/itemviews.py:289
+msgid "&Expand all"
+msgstr ""
+
+#: ../picard/ui/itemviews.py:291
+msgid "&Collapse all"
+msgstr ""
+
+#: ../picard/ui/itemviews.py:332
 msgid "&Releases"
 msgstr "&Uitgaven"
 
-#: ../picard/ui/itemviews.py:353
+#: ../picard/ui/itemviews.py:349
+#, fuzzy
+msgid "No release event"
+msgstr "Releasemaand van album"
+
+#: ../picard/ui/itemviews.py:359
 msgid "&Plugins"
 msgstr "&Plugins"
 
-#: ../picard/ui/itemviews.py:523
+#: ../picard/ui/itemviews.py:533
 msgid "Clusters"
 msgstr "Clusters"
 
@@ -1345,95 +1385,6 @@ msgstr "Clusters"
 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:66 ../picard/ui/ui_options_plugins.py:62
-msgid "Details"
-msgstr "Details"
-
-#: ../picard/ui/tageditor.py:71 ../picard/ui/tageditor.py:264
-#, python-format
-msgid "%d file"
-msgid_plural "%d files"
-msgstr[0] "%d bestand"
-msgstr[1] "%d bestanden"
-
-#: ../picard/ui/tageditor.py:131
-#, 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:134
-#, 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:233
-msgid "Filename:"
-msgstr "Bestandsnaam:"
-
-#: ../picard/ui/tageditor.py:235
-msgid "Format:"
-msgstr "Indeling:"
-
-#: ../picard/ui/tageditor.py:244
-msgid "Size:"
-msgstr "Grootte:"
-
-#: ../picard/ui/tageditor.py:248 ../picard/ui/ui_metadata.py:127
-msgid "Length:"
-msgstr "Duur:"
-
-#: ../picard/ui/tageditor.py:250
-msgid "Bitrate:"
-msgstr "Bitrate:"
-
-#: ../picard/ui/tageditor.py:252
-msgid "Sample rate:"
-msgstr "Sample rate:"
-
-#: ../picard/ui/tageditor.py:254
-msgid "Bits per sample:"
-msgstr "Bits per sample:"
-
-#: ../picard/ui/tageditor.py:257
-msgid "Mono"
-msgstr "Mono"
-
-#: ../picard/ui/tageditor.py:258
-msgid "Stereo"
-msgstr "Stereo"
-
-#: ../picard/ui/tageditor.py:260
-msgid "Channels:"
-msgstr "Kanalen:"
-
-#: ../picard/ui/tagsfromfilenames.py:52 ../picard/ui/tagsfromfilenames.py:96
-msgid "File Name"
-msgstr "Bestandsnaam"
-
 #: ../picard/ui/mainwindow.py:64
 msgid "MusicBrainz Picard"
 msgstr "MusicBrainz Picard"
@@ -1670,6 +1621,10 @@ msgstr "&Zoekbalk"
 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"
@@ -1689,6 +1644,22 @@ msgstr "Afspeellijst %s opgeslagen"
 msgid " (Error: %s)"
 msgstr " (Fout: %s)"
 
+#: ../picard/ui/puidsubmit.py:31 ../picard/ui/options/plugins.py:85
+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/passworddialog.py:38
 #, python-format
 msgid ""
@@ -1697,6 +1668,75 @@ msgstr ""
 "Server %s vereist dat je bent ingelogd. Voor a.j.b. je loginnaam en "
 "wachtwoord in."
 
+#: ../picard/ui/tageditor.py:66 ../picard/ui/ui_options_plugins.py:62
+msgid "Details"
+msgstr "Details"
+
+#: ../picard/ui/tageditor.py:71 ../picard/ui/tageditor.py:264
+#, python-format
+msgid "%d file"
+msgid_plural "%d files"
+msgstr[0] "%d bestand"
+msgstr[1] "%d bestanden"
+
+#: ../picard/ui/tageditor.py:131
+#, 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:134
+#, 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:233
+msgid "Filename:"
+msgstr "Bestandsnaam:"
+
+#: ../picard/ui/tageditor.py:235
+msgid "Format:"
+msgstr "Indeling:"
+
+#: ../picard/ui/tageditor.py:244
+msgid "Size:"
+msgstr "Grootte:"
+
+#: ../picard/ui/tageditor.py:248 ../picard/ui/ui_metadata.py:127
+msgid "Length:"
+msgstr "Duur:"
+
+#: ../picard/ui/tageditor.py:250
+msgid "Bitrate:"
+msgstr "Bitrate:"
+
+#: ../picard/ui/tageditor.py:252
+msgid "Sample rate:"
+msgstr "Sample rate:"
+
+#: ../picard/ui/tageditor.py:254
+msgid "Bits per sample:"
+msgstr "Bits per sample:"
+
+#: ../picard/ui/tageditor.py:257
+msgid "Mono"
+msgstr "Mono"
+
+#: ../picard/ui/tageditor.py:258
+msgid "Stereo"
+msgstr "Stereo"
+
+#: ../picard/ui/tageditor.py:260
+msgid "Channels:"
+msgstr "Kanalen:"
+
+#: ../picard/ui/tagsfromfilenames.py:54 ../picard/ui/tagsfromfilenames.py:99
+msgid "File Name"
+msgstr "Bestandsnaam"
+
 #: ../picard/ui/ui_cdlookup.py:60 ../picard/ui/ui_options_cdlookup.py:47
 #: ../picard/ui/ui_options_cdlookup_select.py:48
 #: ../picard/ui/options/cdlookup.py:36
@@ -1719,24 +1759,6 @@ msgstr "    Handmatig opzoeken    "
 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_proxy.py:83
-#: ../picard/ui/ui_options_general.py:113
-msgid "Username:"
-msgstr "Gebruikersnaam:"
-
-#: ../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/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"
@@ -1773,6 +1795,10 @@ msgstr "Album:"
 msgid "Options"
 msgstr "Opties"
 
+#: ../picard/ui/ui_puidsubmit.py:52
+msgid "Submit PUIDs"
+msgstr "PUID's versturen"
+
 #: ../picard/ui/ui_options_cdlookup.py:48
 msgid "CD-ROM device to use for lookups:"
 msgstr "CD-ROM-apparaat voor opzoeken van CD's:"
@@ -1797,6 +1823,23 @@ msgstr "Omslagafbeeldingen als aparte bestanden opslaan"
 msgid "Overwrite the file if it already exists"
 msgstr "Overschrijven als het bestand al bestaat"
 
+#: ../picard/ui/ui_options_moving.py:53
+msgid "Move additional files:"
+msgstr "Extra bestanden verplaatsen..."
+
+#: ../picard/ui/ui_options_moving.py:54
+msgid "Browse..."
+msgstr "Bladeren..."
+
+#: ../picard/ui/ui_options_moving.py:55
+msgid "Delete empty directories"
+msgstr "Lege mappen verwijderen"
+
+#: ../picard/ui/ui_options_moving.py:56
+#, fuzzy
+msgid "Move files to this directory when saving:"
+msgstr "Getagde bestanden naar deze map verplaatsen"
+
 #: ../picard/ui/util.py:31
 msgid "&Ok"
 msgstr "&Ok"
@@ -1805,44 +1848,40 @@ msgstr "&Ok"
 msgid "&Cancel"
 msgstr "A&nnuleren"
 
-#: ../picard/ui/ui_puidsubmit.py:52
-msgid "Submit PUIDs"
-msgstr "PUID's versturen"
-
-#: ../picard/ui/ui_tageditor.py:139 ../picard/ui/ui_options_plugins.py:59
-#: ../picard/ui/options/plugins.py:76
+#: ../picard/ui/ui_tageditor.py:128 ../picard/ui/ui_options_plugins.py:59
+#: ../picard/ui/options/plugins.py:81
 msgid "Name"
 msgstr "Naam"
 
-#: ../picard/ui/ui_tageditor.py:140
+#: ../picard/ui/ui_tageditor.py:129
 msgid "Value"
 msgstr "Waarde"
 
-#: ../picard/ui/ui_tageditor.py:141
+#: ../picard/ui/ui_tageditor.py:130
 msgid "Rating:"
 msgstr ""
 
-#: ../picard/ui/ui_tageditor.py:142
+#: ../picard/ui/ui_tageditor.py:131
 msgid "&Add..."
 msgstr "&Toevoegen..."
 
-#: ../picard/ui/ui_tageditor.py:143
+#: ../picard/ui/ui_tageditor.py:132
 msgid "&Edit..."
 msgstr "&Bewerken..."
 
-#: ../picard/ui/ui_tageditor.py:144
+#: ../picard/ui/ui_tageditor.py:133
 msgid "&Delete"
 msgstr "&Verwijderen"
 
-#: ../picard/ui/ui_tageditor.py:145
+#: ../picard/ui/ui_tageditor.py:134
 msgid "&Metadata"
 msgstr "&Metadata"
 
-#: ../picard/ui/ui_tageditor.py:146
+#: ../picard/ui/ui_tageditor.py:135
 msgid "A&rtwork"
 msgstr "A&fbeeldingen"
 
-#: ../picard/ui/ui_tageditor.py:147
+#: ../picard/ui/ui_tageditor.py:136
 msgid "&Info"
 msgstr "&Info"
 
@@ -1887,6 +1926,40 @@ msgstr " / "
 msgid ", "
 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:72
+msgid "Port:"
+msgstr "Poort:"
+
+#: ../picard/ui/ui_options_general.py:110 ../picard/ui/ui_options_proxy.py:73
+msgid "Server address:"
+msgstr "Serveradres:"
+
+#: ../picard/ui/ui_options_general.py:111
+msgid "Account Information"
+msgstr "Account-informatie"
+
+#: ../picard/ui/ui_options_general.py:112 ../picard/ui/ui_options_proxy.py:70
+#: ../picard/ui/ui_passworddialog.py:80
+msgid "Password:"
+msgstr "Wachtwoord:"
+
+#: ../picard/ui/ui_options_general.py:113 ../picard/ui/ui_options_proxy.py:71
+#: ../picard/ui/ui_passworddialog.py:79
+msgid "Username:"
+msgstr "Gebruikersnaam:"
+
+#: ../picard/ui/ui_options_general.py:114 ../picard/ui/options/general.py:29
+msgid "General"
+msgstr "Algemeen"
+
+#: ../picard/ui/ui_options_general.py:115
+msgid "Automatically scan all new files"
+msgstr "Automatisch alle nieuwe bestanden analyseren"
+
 #: ../picard/ui/ui_options_interface.py:50
 msgid "Miscellaneous"
 msgstr "Diversen"
@@ -1907,113 +1980,6 @@ msgstr "Gebruik geavanceerde query-syntax"
 msgid "User interface language:"
 msgstr ""
 
-#: ../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_options_naming.py:180
-#: ../picard/ui/ui_tagsfromfilenames.py:58
-msgid "&Preview"
-msgstr "&Voorbeeldweergave"
-
-#: ../picard/ui/ui_options_proxy.py:81 ../picard/ui/options/proxy.py:28
-msgid "Web Proxy"
-msgstr "Webproxy"
-
-#: ../picard/ui/ui_options_proxy.py:84 ../picard/ui/ui_options_general.py:109
-msgid "Port:"
-msgstr "Poort:"
-
-#: ../picard/ui/ui_options_proxy.py:85 ../picard/ui/ui_options_general.py:110
-msgid "Server address:"
-msgstr "Serveradres:"
-
-#: ../picard/ui/ui_options_ratings.py:45
-msgid "Enable track ratings"
-msgstr ""
-
-#: ../picard/ui/ui_options_ratings.py:46
-msgid ""
-"Picard saves the ratings together with an e-mail address identifying the "
-"user who did the rating. That way different ratings for different users can "
-"be stored in the files. Please sepcify the e-mail you want to use to save "
-"your ratings."
-msgstr ""
-
-#: ../picard/ui/ui_options_ratings.py:47
-msgid "E-mail:"
-msgstr ""
-
-#: ../picard/ui/ui_options_general.py:108
-msgid "MusicBrainz Server"
-msgstr "MusicBrainz server"
-
-#: ../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"
-
-#: ../picard/ui/ui_options_general.py:115
-msgid "Automatically scan all new files"
-msgstr "Automatisch alle nieuwe bestanden analyseren"
-
 #: ../picard/ui/ui_options_matching.py:105
 msgid "Thresholds"
 msgstr "Drempels"
@@ -2070,74 +2036,152 @@ msgstr "Compilatie:"
 msgid "Non-album tracks:"
 msgstr "Niet-album tracks:"
 
-#: ../picard/ui/ui_options_plugins.py:58 ../picard/ui/options/plugins.py:30
+#: ../picard/ui/ui_options_metadata.py:109
+#: ../picard/ui/ui_options_metadata.py:110
+#: ../picard/ui/ui_options_renaming.py:155
+#: ../picard/ui/ui_options_renaming.py:158
+msgid "Default"
+msgstr "Standaard"
+
+#: ../picard/ui/ui_options_plugins.py:58 ../picard/ui/options/plugins.py:34
 msgid "Plugins"
 msgstr "Plugins"
 
-#: ../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:84
 msgid "Author"
 msgstr "Auteur"
 
-#: ../picard/ui/ui_options_plugins.py:61 ../picard/util/tags.py:36
+#: ../picard/ui/ui_options_plugins.py:61 ../picard/util/tags.py:37
 msgid "Version"
 msgstr "Versie"
 
-#: ../picard/ui/ui_options_script.py:52
+#: ../picard/ui/ui_options_proxy.py:69 ../picard/ui/options/proxy.py:28
+msgid "Web Proxy"
+msgstr "Webproxy"
+
+#: ../picard/ui/ui_options_ratings.py:45
+msgid "Enable track ratings"
+msgstr ""
+
+#: ../picard/ui/ui_options_ratings.py:46
+msgid ""
+"Picard saves the ratings together with an e-mail address identifying the "
+"user who did the rating. That way different ratings for different users can "
+"be stored in the files. Please sepcify the e-mail you want to use to save "
+"your ratings."
+msgstr ""
+
+#: ../picard/ui/ui_options_ratings.py:47
+msgid "E-mail:"
+msgstr ""
+
+#: ../picard/ui/ui_options_renaming.py:145
+#, fuzzy
+msgid "Form"
+msgstr "Indeling:"
+
+#: ../picard/ui/ui_options_renaming.py:146
+#, fuzzy
+msgid "Rename files when saving"
+msgstr "Hernoem bestanden tijdens het schrijven van de metadata tags"
+
+#: ../picard/ui/ui_options_renaming.py:147
+msgid "Replace non-ASCII characters"
+msgstr "Niet-ASCII karakters vervangen"
+
+#: ../picard/ui/ui_options_renaming.py:148
+msgid "Replace Windows-incompatible characters"
+msgstr "Windows-incompatible karakters vervangen"
+
+#: ../picard/ui/ui_options_renaming.py:149
+msgid "Name files like this"
+msgstr ""
+
+#: ../picard/ui/ui_options_renaming.py:156
+msgid "Name multiple artist albums differently"
+msgstr ""
+
+#: ../picard/ui/ui_options_renaming.py:157
+msgid "Copy from above"
+msgstr ""
+
+#: ../picard/ui/ui_options_renaming.py:159
+#, fuzzy
+msgid "Examples"
+msgstr "Voorbeeld"
+
+#: ../picard/ui/ui_options_script.py:43
 msgid "Tagger Script"
 msgstr "Taggerscript"
 
-#: ../picard/ui/ui_options_tags.py:85
-msgid "Common"
-msgstr "Gezamelijk"
+#: ../picard/ui/ui_options_tags.py:97
+#, fuzzy
+msgid "Do not write tags to files"
+msgstr "Geen tags naar bestanden schrijven"
 
-#: ../picard/ui/ui_options_tags.py:86
-msgid "Clear existing tags before writing new tags"
-msgstr "Bestaande tags wissen voor het schrijven van nieuwe tags"
-
-#: ../picard/ui/ui_options_tags.py:87
-msgid "Don not write tags to files"
+#: ../picard/ui/ui_options_tags.py:98
+msgid "Before tagging"
 msgstr ""
 
-#: ../picard/ui/ui_options_tags.py:88
-msgid "ID3"
-msgstr "ID3"
+#: ../picard/ui/ui_options_tags.py:99
+#, fuzzy
+msgid "Clear existing tags"
+msgstr "Bestaande tags wissen voor het schrijven van nieuwe tags"
 
-#: ../picard/ui/ui_options_tags.py:89
-msgid "Write ID3v1 tags to the files"
-msgstr "ID3v1 tags in de bestanden opslaan"
-
-#: ../picard/ui/ui_options_tags.py:90
-msgid "Write ID3v2 version 2.3 tags (2.4 is default)"
-msgstr "ID3v2 versie 2.3 tags schrijven (2.4 is standaard)"
-
-#: ../picard/ui/ui_options_tags.py:91
-msgid "Text encoding to use while writing ID3v2 tags:"
-msgstr "Te gebruiken tekstcodering voor het schrijven van ID3 tags"
-
-#: ../picard/ui/ui_options_tags.py:92
-msgid "ISO-8859-1"
-msgstr "ISO-8859-1"
-
-#: ../picard/ui/ui_options_tags.py:93
-msgid "UTF-16"
-msgstr "UTF-16"
-
-#: ../picard/ui/ui_options_tags.py:94
-msgid "UTF-8"
-msgstr "UTF-8"
-
-#: ../picard/ui/ui_options_tags.py:95
+#: ../picard/ui/ui_options_tags.py:100
 msgid "Remove ID3 tags from FLAC files"
 msgstr "ID3 tags uit FLAC files verwijderen"
 
-#: ../picard/ui/ui_options_tags.py:96
-msgid "APE"
-msgstr "APE"
-
-#: ../picard/ui/ui_options_tags.py:97
+#: ../picard/ui/ui_options_tags.py:101
 msgid "Remove APEv2 tags from MP3 files"
 msgstr "APEv2 tags uit MP3-bestanden verwijderen"
 
+#: ../picard/ui/ui_options_tags.py:102
+msgid "Tag compatibility"
+msgstr ""
+
+#: ../picard/ui/ui_options_tags.py:103
+#, fuzzy
+msgid "ID3v2 version"
+msgstr "Alleen ID3v2.4"
+
+#: ../picard/ui/ui_options_tags.py:104
+msgid "2.4"
+msgstr ""
+
+#: ../picard/ui/ui_options_tags.py:105
+msgid "2.3"
+msgstr ""
+
+#: ../picard/ui/ui_options_tags.py:106
+#, fuzzy
+msgid "Also include ID3v1 tags in the files"
+msgstr "ID3v1 tags in de bestanden opslaan"
+
+#: ../picard/ui/ui_options_tags.py:107
+msgid "ID3v2 text encoding"
+msgstr ""
+
+#: ../picard/ui/ui_options_tags.py:108
+msgid "UTF-8"
+msgstr "UTF-8"
+
+#: ../picard/ui/ui_options_tags.py:109
+msgid "UTF-16"
+msgstr "UTF-16"
+
+#: ../picard/ui/ui_options_tags.py:110
+msgid "ISO-8859-1"
+msgstr "ISO-8859-1"
+
+#: ../picard/ui/ui_passworddialog.py:78
+msgid "Authentication required"
+msgstr "Aanmelding vereist"
+
+#: ../picard/ui/ui_passworddialog.py:81
+msgid "Save username and password"
+msgstr "Sla loginnaam en wachtwoord op"
+
 #: ../picard/ui/ui_tagsfromfilenames.py:56
 msgid "Convert File Names to Tags"
 msgstr "Bestandsnamen naar tags converteren"
@@ -2146,6 +2190,10 @@ msgstr "Bestandsnamen naar tags converteren"
 msgid "Replace underscores with spaces"
 msgstr "Underscores vervangen door spaties"
 
+#: ../picard/ui/ui_tagsfromfilenames.py:58
+msgid "&Preview"
+msgstr "&Voorbeeldweergave"
+
 #: ../picard/ui/options/about.py:29
 msgid "About"
 msgstr "Info"
@@ -2179,8 +2227,8 @@ msgstr "<br/>Nederlandse vertaling door %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"
@@ -2188,14 +2236,13 @@ msgid ""
 "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\"><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/P"
-"icardTagger</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
@@ -2228,257 +2275,266 @@ msgstr "Overeenkomend"
 msgid "None"
 msgstr ""
 
-#: ../picard/ui/options/naming.py:33
-msgid "File Naming"
-msgstr "Naamgeving"
+#: ../picard/ui/options/moving.py:33
+#, fuzzy
+msgid "Moving files"
+msgstr "Bestanden verplaatsen"
 
-#: ../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 "De bestandsnaamindeling mag niet leeg zijn."
-
-#: ../picard/ui/options/naming.py:95
-msgid "The multiple artist file naming format must not be empty."
-msgstr ""
-
-#: ../picard/ui/options/naming.py:97
+#: ../picard/ui/options/moving.py:65
 msgid "Error"
 msgstr "Fout"
 
-#: ../picard/ui/options/naming.py:97
+#: ../picard/ui/options/moving.py:65
 msgid "The location to move files to must not be empty."
 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/ratings.py:29
+msgid "Ratings"
+msgstr ""
 
 #: ../picard/ui/options/tags.py:29
 msgid "Tags"
 msgstr "Tags"
 
-#: ../picard/ui/options/ratings.py:29
-msgid "Ratings"
+#: ../picard/ui/options/renaming.py:35
+#, fuzzy
+msgid "File naming"
+msgstr "Naamgeving"
+
+#: ../picard/ui/options/renaming.py:123
+msgid "The file naming format must not be empty."
+msgstr "De bestandsnaamindeling mag niet leeg zijn."
+
+#: ../picard/ui/options/renaming.py:133
+msgid "The multiple artist file naming format must not be empty."
 msgstr ""
 
+#: ../picard/ui/options/scripting.py:63
+msgid "Scripting"
+msgstr "Scripting"
+
+#: ../picard/ui/options/scripting.py:97
+msgid "Script Error"
+msgstr "Scriptfout"
+
 #: ../picard/util/tags.py:24
 msgid "Date"
 msgstr "Datum"
 
 #: ../picard/util/tags.py:25
+#, fuzzy
+msgid "Original Release Date"
+msgstr "Oorspronkelijke metadata"
+
+#: ../picard/util/tags.py:26
 msgid "Album Artist"
 msgstr "Albumartiest"
 
-#: ../picard/util/tags.py:26
+#: ../picard/util/tags.py:27
 msgid "Track Number"
 msgstr "Tracknummer"
 
-#: ../picard/util/tags.py:27
+#: ../picard/util/tags.py:28
 msgid "Total Tracks"
 msgstr "Totaal aantal tracks"
 
-#: ../picard/util/tags.py:28
+#: ../picard/util/tags.py:29
 msgid "Disc Number"
 msgstr "Schijfnummer"
 
-#: ../picard/util/tags.py:29
+#: ../picard/util/tags.py:30
 msgid "Total Discs"
 msgstr "Totaal aantal schijven"
 
-#: ../picard/util/tags.py:30
+#: ../picard/util/tags.py:31
 msgid "Album Artist Sort Order"
 msgstr "Sorteervolgorde van albumartiest"
 
-#: ../picard/util/tags.py:31
+#: ../picard/util/tags.py:32
 msgid "Artist Sort Order"
 msgstr "Sorteervolgorde van artiest"
 
-#: ../picard/util/tags.py:32
+#: ../picard/util/tags.py:33
 msgid "Title Sort Order"
 msgstr "Sorteervolgorde van titel"
 
-#: ../picard/util/tags.py:33
+#: ../picard/util/tags.py:34
 msgid "Album Sort Order"
 msgstr "Sorteervolgorde van album"
 
-#: ../picard/util/tags.py:34
+#: ../picard/util/tags.py:35
 msgid "ASIN"
 msgstr "ASIN"
 
-#: ../picard/util/tags.py:35
+#: ../picard/util/tags.py:36
 msgid "Grouping"
 msgstr "Groeperen"
 
-#: ../picard/util/tags.py:37
+#: ../picard/util/tags.py:38
 msgid "ISRC"
 msgstr "ISRC"
 
-#: ../picard/util/tags.py:38
+#: ../picard/util/tags.py:39
 msgid "Mood"
 msgstr "Stemming"
 
-#: ../picard/util/tags.py:39
+#: ../picard/util/tags.py:40
 msgid "BPM"
 msgstr "BPM"
 
-#: ../picard/util/tags.py:40
+#: ../picard/util/tags.py:41
 msgid "Copyright"
 msgstr "Copyright"
 
-#: ../picard/util/tags.py:41
+#: ../picard/util/tags.py:42
 msgid "Composer"
 msgstr "Componist"
 
-#: ../picard/util/tags.py:42
+#: ../picard/util/tags.py:43
 msgid "Conductor"
 msgstr "Dirigent"
 
-#: ../picard/util/tags.py:43
+#: ../picard/util/tags.py:44
 msgid "Lyricist"
 msgstr "Tekstschrijver"
 
-#: ../picard/util/tags.py:44
+#: ../picard/util/tags.py:45
 msgid "Arranger"
 msgstr "Arrangement door"
 
-#: ../picard/util/tags.py:45
+#: ../picard/util/tags.py:46
 msgid "Producer"
 msgstr "Producer"
 
-#: ../picard/util/tags.py:46
+#: ../picard/util/tags.py:47
 msgid "Engineer"
 msgstr "Technicus"
 
-#: ../picard/util/tags.py:47
+#: ../picard/util/tags.py:48
 msgid "Subtitle"
 msgstr "Bij-titel"
 
-#: ../picard/util/tags.py:48
+#: ../picard/util/tags.py:49
 msgid "Disc Subtitle"
 msgstr "Schijf bij-titel"
 
-#: ../picard/util/tags.py:49
+#: ../picard/util/tags.py:50
 msgid "Remixer"
 msgstr "Remixer"
 
-#: ../picard/util/tags.py:50
+#: ../picard/util/tags.py:51
 msgid "MusicBrainz Track Id"
 msgstr "MusicBrainz track ID"
 
-#: ../picard/util/tags.py:51
+#: ../picard/util/tags.py:52
 msgid "MusicBrainz Release Id"
 msgstr "MusicBrainz release ID"
 
-#: ../picard/util/tags.py:52
+#: ../picard/util/tags.py:53
 msgid "MusicBrainz Artist Id"
 msgstr "MusicBrainz artiest ID"
 
-#: ../picard/util/tags.py:53
+#: ../picard/util/tags.py:54
 msgid "MusicBrainz Release Artist Id"
 msgstr "MusicBrainz releaseartiest ID"
 
-#: ../picard/util/tags.py:54
+#: ../picard/util/tags.py:55
 msgid "MusicBrainz TRM Id"
 msgstr "MusicBrainz TRM ID"
 
-#: ../picard/util/tags.py:55
+#: ../picard/util/tags.py:56
 msgid "MusicBrainz Disc Id"
 msgstr ""
 
-#: ../picard/util/tags.py:56
+#: ../picard/util/tags.py:57
 msgid "MusicBrainz Sort Name"
 msgstr ""
 
-#: ../picard/util/tags.py:57
+#: ../picard/util/tags.py:58
 msgid "MusicIP PUID"
 msgstr "MusicIP PUID"
 
-#: ../picard/util/tags.py:58
+#: ../picard/util/tags.py:59
 msgid "MusicIP Fingerprint"
 msgstr "MusicIP vingerafdruk"
 
-#: ../picard/util/tags.py:59
+#: ../picard/util/tags.py:60
 msgid "Disc Id"
 msgstr ""
 
-#: ../picard/util/tags.py:60
+#: ../picard/util/tags.py:61
 msgid "Website"
 msgstr "Website"
 
-#: ../picard/util/tags.py:61
+#: ../picard/util/tags.py:62
 msgid "Compilation"
 msgstr "Compilatie"
 
-#: ../picard/util/tags.py:62
+#: ../picard/util/tags.py:63
 msgid "Comment"
 msgstr "Opmerking"
 
-#: ../picard/util/tags.py:63
+#: ../picard/util/tags.py:64
 msgid "Genre"
 msgstr "Genre"
 
-#: ../picard/util/tags.py:64
+#: ../picard/util/tags.py:65
 msgid "Encoded By"
 msgstr "Geëncodeerd door"
 
-#: ../picard/util/tags.py:65
+#: ../picard/util/tags.py:66
 msgid "Performer"
 msgstr "Uitvoerend artiest"
 
-#: ../picard/util/tags.py:66
+#: ../picard/util/tags.py:67
 msgid "Release Type"
 msgstr "Releasetype"
 
-#: ../picard/util/tags.py:67
+#: ../picard/util/tags.py:68
 msgid "Release Status"
 msgstr "Releasestatus"
 
-#: ../picard/util/tags.py:68
+#: ../picard/util/tags.py:69
 msgid "Release Country"
 msgstr "Releaseland"
 
-#: ../picard/util/tags.py:69
+#: ../picard/util/tags.py:70
 msgid "Record Label"
 msgstr "Platenlabel"
 
-#: ../picard/util/tags.py:70
+#: ../picard/util/tags.py:71
 msgid "Barcode"
 msgstr "Streepjescode"
 
-#: ../picard/util/tags.py:71
+#: ../picard/util/tags.py:72
 msgid "Catalog Number"
 msgstr "Catalogusnummer"
 
-#: ../picard/util/tags.py:72
+#: ../picard/util/tags.py:73
 msgid "Format"
 msgstr ""
 
-#: ../picard/util/tags.py:73
+#: ../picard/util/tags.py:74
 msgid "DJ-Mixer"
 msgstr "DJ-Mixer"
 
-#: ../picard/util/tags.py:74
+#: ../picard/util/tags.py:75
 msgid "Media"
 msgstr "Medium"
 
-#: ../picard/util/tags.py:75
+#: ../picard/util/tags.py:76
 msgid "Lyrics"
 msgstr "Songteksten"
 
-#: ../picard/util/tags.py:76
+#: ../picard/util/tags.py:77
 msgid "Mixer"
 msgstr "Mixer"
 
-#: ../picard/util/tags.py:77
+#: ../picard/util/tags.py:78
 msgid "Language"
 msgstr "Taal"
 
-#: ../picard/util/tags.py:78
+#: ../picard/util/tags.py:79
 msgid "Script"
 msgstr ""
 
@@ -2497,29 +2553,55 @@ msgstr ""
 "\n"
 "%s"
 
-#, python-format
+#~ msgid "Rename Files"
+#~ msgstr "Bestanden hernoemen"
+
+#~ msgid "Multiple artist file naming format:"
+#~ msgstr "Bestandnaamsopmaak voor meedere artiesten:"
+
+#~ msgid "File naming format:"
+#~ msgstr "Bestandnaamsopmaak"
+
+#~ msgid "File name:"
+#~ msgstr "Bestandsnaam:"
+
+#~ msgid "Multiple artist file name:"
+#~ msgstr "Bestandsnaam voor meerdere artiesten:"
+
+#~ msgid "Common"
+#~ msgstr "Gezamelijk"
+
+#~ msgid "ID3"
+#~ msgstr "ID3"
+
+#~ msgid "Write ID3v2 version 2.3 tags (2.4 is default)"
+#~ msgstr "ID3v2 versie 2.3 tags schrijven (2.4 is standaard)"
+
+#~ msgid "Text encoding to use while writing ID3v2 tags:"
+#~ msgstr "Te gebruiken tekstcodering voor het schrijven van ID3 tags"
+
+#~ msgid "APE"
+#~ msgstr "APE"
+
 #~ msgid "[couldn't load album %s]"
 #~ msgstr "[kon album %s niet laden]"
 
 #~ msgid "New Version"
 #~ msgstr "Nieuwe versie"
 
-#, python-format
 #~ msgid ""
-#~ "New version of Picard is available (%s). Would you like to download it now?"
+#~ "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?"
 
-#, python-format
 #~ msgid "Reading directory %s ..."
 #~ msgstr "Lezen van map %s ..."
 
-#, python-format
 #~ msgid "Saving file %s ..."
 #~ msgstr "Opslaan van bestand %s ..."
 
-#, python-format
 #~ msgid "Couldn't find PUID for file %s"
 #~ msgstr "Kon geen PUID vinden voor bestand %s"
 
@@ -2532,13 +2614,9 @@ msgstr ""
 #~ msgid "Generate &Cuesheet..."
 #~ msgstr "&Cuesheet genereren"
 
-#, python-format
 #~ msgid "Details - %s"
 #~ msgstr "Details - %s"
 
-#~ msgid "Don't write tags to files"
-#~ msgstr "Geen tags naar bestanden schrijven"
-
 #~ msgid "000; "
 #~ msgstr "000; "
 
@@ -2636,7 +2714,8 @@ msgstr ""
 #~ msgstr "Controleren op nieuwe bestanden"
 
 #~ msgid "Watch this directory for new audio files"
-#~ msgstr "Controleer of nieuwe geluidsbestanden worden toegevoegd aan deze map"
+#~ msgstr ""
+#~ "Controleer of nieuwe geluidsbestanden worden toegevoegd aan deze map"
 
 #~ msgid "Encodings"
 #~ msgstr "Coderingen"
@@ -2674,9 +2753,6 @@ msgstr ""
 #~ 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"
 
@@ -2695,9 +2771,6 @@ msgstr ""
 #~ msgid "Proxy port"
 #~ msgstr "Proxypoort"
 
-#~ msgid "ID3v2.4 only"
-#~ msgstr "Alleen ID3v2.4"
-
 #~ msgid "Save track/album"
 #~ msgstr "Sla track/album op"
 
@@ -2733,15 +2806,17 @@ msgstr ""
 #~ 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"
-#~ "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. "
+#~ "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 ""
-#~ "U heeft geen gebruikersnaam en wachtwoord ingevoerd. Om gegevens te kunnen "
-#~ "versturen naar MusicBrainz dient U een MusicBrainz account te hebben.\n"
-#~ "Wilt u nu een nieuwe account aanmaken? Als u al een account heeft, vul dan "
-#~ "aub uw gegevens in bij Opties. "
+#~ "U heeft geen gebruikersnaam en wachtwoord ingevoerd. Om gegevens te "
+#~ "kunnen versturen naar MusicBrainz dient U een MusicBrainz account te "
+#~ "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."
@@ -2768,20 +2843,21 @@ msgstr ""
 #~ 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."
+#~ "Please fix the move option or the destination directory option and try "
+#~ "again."
 #~ 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 click the "
-#~ "track and select 'Clear Error'"
+#~ "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 ""
-#~ "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."
+#~ "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"
@@ -2805,7 +2881,8 @@ msgstr ""
 #~ msgstr "Maak a.u.b. wat geld over naar MusicBrainz!"
 
 #~ msgid ""
-#~ "The destination directory %s does not exist. Please pick a valid directory."
+#~ "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"
@@ -2828,9 +2905,6 @@ msgstr ""
 #~ 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"
 
@@ -2912,11 +2986,11 @@ msgstr ""
 #~ msgstr "Start Picard automatisch voor ingevoerde CD's"
 
 #~ msgid ""
-#~ "Failed to set the proper registy values to enable launching the tagger after "
-#~ "CD insertion. "
+#~ "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. "
+#~ "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"
@@ -2984,9 +3058,10 @@ msgstr ""
 #~ "Explorer, uncheck the box above and enter your\n"
 #~ "proxy server and proxy port below:"
 #~ msgstr ""
-#~ "Als U in Internet Explorer een automatische proxyconfiguratie gebruikt, vink "
-#~ "dan\n"
-#~ "het bovenstaande vakje uit en voer hieronder de proxyserver en proxypoort in:"
+#~ "Als U in Internet Explorer een automatische proxyconfiguratie gebruikt, "
+#~ "vink dan\n"
+#~ "het bovenstaande vakje uit en voer hieronder de proxyserver en proxypoort "
+#~ "in:"
 
 #~ msgid ""
 #~ "NOTE: This application can automatically authenticate the\n"
diff --git a/po/picard.pot b/po/picard.pot
index 72e84076e..d682d52a4 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: 2009-02-24 18:58+0100\n"
+"POT-Creation-Date: 2009-04-06 22:50+0200\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"
@@ -17,16 +17,16 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\n"
 
-#: ../picard/album.py:108 ../picard/cluster.py:248
+#: ../picard/album.py:109 ../picard/cluster.py:248
 msgid "Unmatched Files"
 msgstr ""
 
-#: ../picard/album.py:281
+#: ../picard/album.py:287
 #, python-format
 msgid "[could not load album %s]"
 msgstr ""
 
-#: ../picard/album.py:317
+#: ../picard/album.py:320
 msgid "[loading album information]"
 msgstr ""
 
@@ -586,7 +586,7 @@ msgid "Namibia"
 msgstr ""
 
 #: ../picard/const.py:182
-msgid "Vanuat"
+msgid "Vanuatu"
 msgstr ""
 
 #: ../picard/const.py:183
@@ -1030,223 +1030,234 @@ msgid "Congo, The Democratic Republic of the"
 msgstr ""
 
 #: ../picard/const.py:293
-msgid "Serbia and Montenegro"
+msgid "Serbia and Montenegro (historical, 2003-2006)"
 msgstr ""
 
 #: ../picard/const.py:294
-msgid "Croatia"
+msgid "Serbia"
 msgstr ""
 
 #: ../picard/const.py:295
-msgid "Korea (North), Democratic People's Republic of"
+msgid "Montenegro"
 msgstr ""
 
 #: ../picard/const.py:296
-msgid "Korea (South), Republic of"
+msgid "Croatia"
 msgstr ""
 
 #: ../picard/const.py:297
-msgid "Slovakia"
+msgid "Korea (North), Democratic People's Republic of"
 msgstr ""
 
 #: ../picard/const.py:298
-msgid "Soviet Union (historical, 1922-1991)"
+msgid "Korea (South), Republic of"
 msgstr ""
 
 #: ../picard/const.py:299
-msgid "East Timor"
+msgid "Slovakia"
 msgstr ""
 
 #: ../picard/const.py:300
-msgid "Czechoslovakia (historical, 1918-1992)"
+msgid "Soviet Union (historical, 1922-1991)"
 msgstr ""
 
 #: ../picard/const.py:301
-msgid "Europe"
+msgid "East Timor"
 msgstr ""
 
 #: ../picard/const.py:302
-msgid "East Germany (historical, 1949-1990)"
+msgid "Czechoslovakia (historical, 1918-1992)"
 msgstr ""
 
 #: ../picard/const.py:303
-msgid "[Unknown Country]"
+msgid "Europe"
 msgstr ""
 
 #: ../picard/const.py:304
-msgid "[Worldwide]"
+msgid "East Germany (historical, 1949-1990)"
 msgstr ""
 
 #: ../picard/const.py:305
+msgid "[Unknown Country]"
+msgstr ""
+
+#: ../picard/const.py:306
+msgid "[Worldwide]"
+msgstr ""
+
+#: ../picard/const.py:307
 msgid "Yugoslavia (historical, 1918-1992)"
 msgstr ""
 
-#: ../picard/const.py:310
-msgid "Catalan"
-msgstr ""
-
-#: ../picard/const.py:311
-msgid "Czech"
-msgstr ""
-
 #: ../picard/const.py:312
-msgid "Welsh"
+msgid "Afrikaans"
 msgstr ""
 
 #: ../picard/const.py:313
-msgid "Danish"
+msgid "Arabic"
 msgstr ""
 
 #: ../picard/const.py:314
-msgid "German"
+msgid "Catalan"
 msgstr ""
 
 #: ../picard/const.py:315
-msgid "English"
+msgid "Czech"
 msgstr ""
 
 #: ../picard/const.py:316
-msgid "English (Canada)"
+msgid "Welsh"
 msgstr ""
 
 #: ../picard/const.py:317
-msgid "English (UK)"
+msgid "Danish"
 msgstr ""
 
 #: ../picard/const.py:318
-msgid "Spanish"
+msgid "German"
 msgstr ""
 
 #: ../picard/const.py:319
-msgid "Persian"
+msgid "English"
 msgstr ""
 
 #: ../picard/const.py:320
-msgid "Finnish"
+msgid "English (Canada)"
 msgstr ""
 
 #: ../picard/const.py:321
-msgid "French"
+msgid "English (UK)"
 msgstr ""
 
 #: ../picard/const.py:322
-msgid "Frisian"
+msgid "Spanish"
 msgstr ""
 
 #: ../picard/const.py:323
-msgid "Hebrew"
+msgid "Persian"
 msgstr ""
 
 #: ../picard/const.py:324
-msgid "Hungarian"
+msgid "Finnish"
 msgstr ""
 
 #: ../picard/const.py:325
-msgid "Islandic"
+msgid "French"
 msgstr ""
 
 #: ../picard/const.py:326
-msgid "Italian"
+msgid "Frisian"
 msgstr ""
 
 #: ../picard/const.py:327
-msgid "Kannada"
+msgid "Hebrew"
 msgstr ""
 
 #: ../picard/const.py:328
-msgid "Korean"
+msgid "Hindi"
 msgstr ""
 
 #: ../picard/const.py:329
-msgid "Lithuanian"
+msgid "Hungarian"
 msgstr ""
 
 #: ../picard/const.py:330
-msgid "Norwegian Bokmal"
+msgid "Islandic"
 msgstr ""
 
 #: ../picard/const.py:331
-msgid "Dutch"
+msgid "Italian"
 msgstr ""
 
 #: ../picard/const.py:332
-msgid "Polish"
+msgid "Kannada"
 msgstr ""
 
 #: ../picard/const.py:333
-msgid "Portuguese"
+msgid "Korean"
 msgstr ""
 
 #: ../picard/const.py:334
-msgid "Brazilian Portuguese"
+msgid "Lithuanian"
 msgstr ""
 
 #: ../picard/const.py:335
-msgid "Romanian"
+msgid "Norwegian Bokmal"
 msgstr ""
 
 #: ../picard/const.py:336
-msgid "Russian"
+msgid "Dutch"
 msgstr ""
 
 #: ../picard/const.py:337
-msgid "Scots"
+msgid "Polish"
 msgstr ""
 
 #: ../picard/const.py:338
-msgid "Slovak"
+msgid "Portuguese"
 msgstr ""
 
 #: ../picard/const.py:339
-msgid "Slovenian"
+msgid "Brazilian Portuguese"
 msgstr ""
 
 #: ../picard/const.py:340
-msgid "Swedish"
+msgid "Romanian"
 msgstr ""
 
 #: ../picard/const.py:341
+msgid "Russian"
+msgstr ""
+
+#: ../picard/const.py:342
+msgid "Scots"
+msgstr ""
+
+#: ../picard/const.py:343
+msgid "Slovak"
+msgstr ""
+
+#: ../picard/const.py:344
+msgid "Slovenian"
+msgstr ""
+
+#: ../picard/const.py:345
+msgid "Swedish"
+msgstr ""
+
+#: ../picard/const.py:346
+msgid "Turkish"
+msgstr ""
+
+#: ../picard/const.py:347
 msgid "Chinese"
 msgstr ""
 
-#: ../picard/file.py:487
+#: ../picard/file.py:494
 #, python-format
 msgid "No matching tracks for file %s"
 msgstr ""
 
-#: ../picard/file.py:504
+#: ../picard/file.py:511
 #, python-format
 msgid "No matching tracks above the threshold for file %s"
 msgstr ""
 
-#: ../picard/file.py:507
+#: ../picard/file.py:514
 #, python-format
 msgid "File %s identified!"
 msgstr ""
 
-#: ../picard/file.py:518
+#: ../picard/file.py:525
 #, python-format
 msgid "Looking up the PUID for file %s..."
 msgstr ""
 
-#: ../picard/file.py:523
+#: ../picard/file.py:530
 #, 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 ""
@@ -1259,11 +1270,24 @@ msgstr ""
 msgid "XSPF Playlist (*.xspf)"
 msgstr ""
 
-#: ../picard/tagger.py:476
-msgid "CD Lookup Error"
+#: ../picard/puidmanager.py:62
+msgid "Submitting PUIDs..."
+msgstr ""
+
+#: ../picard/puidmanager.py:68
+#, python-format
+msgid "PUIDs submission failed: %s"
+msgstr ""
+
+#: ../picard/puidmanager.py:70
+msgid "PUIDs successfully submitted!"
 msgstr ""
 
 #: ../picard/tagger.py:477
+msgid "CD Lookup Error"
+msgstr ""
+
+#: ../picard/tagger.py:478
 #, python-format
 msgid ""
 "Error while reading CD:\n"
@@ -1271,7 +1295,7 @@ msgid ""
 "%s"
 msgstr ""
 
-#: ../picard/tagger.py:503
+#: ../picard/tagger.py:504
 #, python-format
 msgid "Could not find PUID for file %s"
 msgstr ""
@@ -1324,15 +1348,27 @@ msgstr ""
 msgid "Length"
 msgstr ""
 
-#: ../picard/ui/itemviews.py:327
+#: ../picard/ui/itemviews.py:289
+msgid "&Expand all"
+msgstr ""
+
+#: ../picard/ui/itemviews.py:291
+msgid "&Collapse all"
+msgstr ""
+
+#: ../picard/ui/itemviews.py:332
 msgid "&Releases"
 msgstr ""
 
-#: ../picard/ui/itemviews.py:353
+#: ../picard/ui/itemviews.py:349
+msgid "No release event"
+msgstr ""
+
+#: ../picard/ui/itemviews.py:359
 msgid "&Plugins"
 msgstr ""
 
-#: ../picard/ui/itemviews.py:523
+#: ../picard/ui/itemviews.py:533
 msgid "Clusters"
 msgstr ""
 
@@ -1340,95 +1376,6 @@ msgstr ""
 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:66 ../picard/ui/ui_options_plugins.py:62
-msgid "Details"
-msgstr ""
-
-#: ../picard/ui/tageditor.py:71 ../picard/ui/tageditor.py:264
-#, python-format
-msgid "%d file"
-msgid_plural "%d files"
-msgstr[0] ""
-msgstr[1] ""
-
-#: ../picard/ui/tageditor.py:131
-#, python-format
-msgid "(different across %d file)"
-msgid_plural "(different across %d files)"
-msgstr[0] ""
-msgstr[1] ""
-
-#: ../picard/ui/tageditor.py:134
-#, python-format
-msgid "(missing from %d file)"
-msgid_plural "(missing from %d files)"
-msgstr[0] ""
-msgstr[1] ""
-
-#: ../picard/ui/tageditor.py:233
-msgid "Filename:"
-msgstr ""
-
-#: ../picard/ui/tageditor.py:235
-msgid "Format:"
-msgstr ""
-
-#: ../picard/ui/tageditor.py:244
-msgid "Size:"
-msgstr ""
-
-#: ../picard/ui/tageditor.py:248 ../picard/ui/ui_metadata.py:127
-msgid "Length:"
-msgstr ""
-
-#: ../picard/ui/tageditor.py:250
-msgid "Bitrate:"
-msgstr ""
-
-#: ../picard/ui/tageditor.py:252
-msgid "Sample rate:"
-msgstr ""
-
-#: ../picard/ui/tageditor.py:254
-msgid "Bits per sample:"
-msgstr ""
-
-#: ../picard/ui/tageditor.py:257
-msgid "Mono"
-msgstr ""
-
-#: ../picard/ui/tageditor.py:258
-msgid "Stereo"
-msgstr ""
-
-#: ../picard/ui/tageditor.py:260
-msgid "Channels:"
-msgstr ""
-
-#: ../picard/ui/tagsfromfilenames.py:52 ../picard/ui/tagsfromfilenames.py:96
-msgid "File Name"
-msgstr ""
-
 #: ../picard/ui/mainwindow.py:64
 msgid "MusicBrainz Picard"
 msgstr ""
@@ -1665,6 +1612,10 @@ msgstr ""
 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 ""
@@ -1684,12 +1635,97 @@ msgstr ""
 msgid " (Error: %s)"
 msgstr ""
 
+#: ../picard/ui/puidsubmit.py:31 ../picard/ui/options/plugins.py:85
+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/passworddialog.py:38
 #, python-format
 msgid ""
 "The server %s requires you to login. Please enter your username and password."
 msgstr ""
 
+#: ../picard/ui/tageditor.py:66 ../picard/ui/ui_options_plugins.py:62
+msgid "Details"
+msgstr ""
+
+#: ../picard/ui/tageditor.py:71 ../picard/ui/tageditor.py:264
+#, python-format
+msgid "%d file"
+msgid_plural "%d files"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../picard/ui/tageditor.py:131
+#, python-format
+msgid "(different across %d file)"
+msgid_plural "(different across %d files)"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../picard/ui/tageditor.py:134
+#, python-format
+msgid "(missing from %d file)"
+msgid_plural "(missing from %d files)"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../picard/ui/tageditor.py:233
+msgid "Filename:"
+msgstr ""
+
+#: ../picard/ui/tageditor.py:235
+msgid "Format:"
+msgstr ""
+
+#: ../picard/ui/tageditor.py:244
+msgid "Size:"
+msgstr ""
+
+#: ../picard/ui/tageditor.py:248 ../picard/ui/ui_metadata.py:127
+msgid "Length:"
+msgstr ""
+
+#: ../picard/ui/tageditor.py:250
+msgid "Bitrate:"
+msgstr ""
+
+#: ../picard/ui/tageditor.py:252
+msgid "Sample rate:"
+msgstr ""
+
+#: ../picard/ui/tageditor.py:254
+msgid "Bits per sample:"
+msgstr ""
+
+#: ../picard/ui/tageditor.py:257
+msgid "Mono"
+msgstr ""
+
+#: ../picard/ui/tageditor.py:258
+msgid "Stereo"
+msgstr ""
+
+#: ../picard/ui/tageditor.py:260
+msgid "Channels:"
+msgstr ""
+
+#: ../picard/ui/tagsfromfilenames.py:54 ../picard/ui/tagsfromfilenames.py:99
+msgid "File Name"
+msgstr ""
+
 #: ../picard/ui/ui_cdlookup.py:60 ../picard/ui/ui_options_cdlookup.py:47
 #: ../picard/ui/ui_options_cdlookup_select.py:48
 #: ../picard/ui/options/cdlookup.py:36
@@ -1712,24 +1748,6 @@ msgstr ""
 msgid "Cancel"
 msgstr ""
 
-#: ../picard/ui/ui_passworddialog.py:78
-msgid "Authentication required"
-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"
-msgstr ""
-
 #: ../picard/ui/ui_edittagdialog.py:44
 msgid "Edit Tag"
 msgstr ""
@@ -1766,6 +1784,10 @@ msgstr ""
 msgid "Options"
 msgstr ""
 
+#: ../picard/ui/ui_puidsubmit.py:52
+msgid "Submit PUIDs"
+msgstr ""
+
 #: ../picard/ui/ui_options_cdlookup.py:48
 msgid "CD-ROM device to use for lookups:"
 msgstr ""
@@ -1790,6 +1812,22 @@ msgstr ""
 msgid "Overwrite the file if it already exists"
 msgstr ""
 
+#: ../picard/ui/ui_options_moving.py:53
+msgid "Move additional files:"
+msgstr ""
+
+#: ../picard/ui/ui_options_moving.py:54
+msgid "Browse..."
+msgstr ""
+
+#: ../picard/ui/ui_options_moving.py:55
+msgid "Delete empty directories"
+msgstr ""
+
+#: ../picard/ui/ui_options_moving.py:56
+msgid "Move files to this directory when saving:"
+msgstr ""
+
 #: ../picard/ui/util.py:31
 msgid "&Ok"
 msgstr ""
@@ -1798,44 +1836,40 @@ msgstr ""
 msgid "&Cancel"
 msgstr ""
 
-#: ../picard/ui/ui_puidsubmit.py:52
-msgid "Submit PUIDs"
-msgstr ""
-
-#: ../picard/ui/ui_tageditor.py:139 ../picard/ui/ui_options_plugins.py:59
-#: ../picard/ui/options/plugins.py:76
+#: ../picard/ui/ui_tageditor.py:128 ../picard/ui/ui_options_plugins.py:59
+#: ../picard/ui/options/plugins.py:81
 msgid "Name"
 msgstr ""
 
-#: ../picard/ui/ui_tageditor.py:140
+#: ../picard/ui/ui_tageditor.py:129
 msgid "Value"
 msgstr ""
 
-#: ../picard/ui/ui_tageditor.py:141
+#: ../picard/ui/ui_tageditor.py:130
 msgid "Rating:"
 msgstr ""
 
-#: ../picard/ui/ui_tageditor.py:142
+#: ../picard/ui/ui_tageditor.py:131
 msgid "&Add..."
 msgstr ""
 
-#: ../picard/ui/ui_tageditor.py:143
+#: ../picard/ui/ui_tageditor.py:132
 msgid "&Edit..."
 msgstr ""
 
-#: ../picard/ui/ui_tageditor.py:144
+#: ../picard/ui/ui_tageditor.py:133
 msgid "&Delete"
 msgstr ""
 
-#: ../picard/ui/ui_tageditor.py:145
+#: ../picard/ui/ui_tageditor.py:134
 msgid "&Metadata"
 msgstr ""
 
-#: ../picard/ui/ui_tageditor.py:146
+#: ../picard/ui/ui_tageditor.py:135
 msgid "A&rtwork"
 msgstr ""
 
-#: ../picard/ui/ui_tageditor.py:147
+#: ../picard/ui/ui_tageditor.py:136
 msgid "&Info"
 msgstr ""
 
@@ -1880,6 +1914,40 @@ msgstr ""
 msgid ", "
 msgstr ""
 
+#: ../picard/ui/ui_options_general.py:108
+msgid "MusicBrainz Server"
+msgstr ""
+
+#: ../picard/ui/ui_options_general.py:109 ../picard/ui/ui_options_proxy.py:72
+msgid "Port:"
+msgstr ""
+
+#: ../picard/ui/ui_options_general.py:110 ../picard/ui/ui_options_proxy.py:73
+msgid "Server address:"
+msgstr ""
+
+#: ../picard/ui/ui_options_general.py:111
+msgid "Account Information"
+msgstr ""
+
+#: ../picard/ui/ui_options_general.py:112 ../picard/ui/ui_options_proxy.py:70
+#: ../picard/ui/ui_passworddialog.py:80
+msgid "Password:"
+msgstr ""
+
+#: ../picard/ui/ui_options_general.py:113 ../picard/ui/ui_options_proxy.py:71
+#: ../picard/ui/ui_passworddialog.py:79
+msgid "Username:"
+msgstr ""
+
+#: ../picard/ui/ui_options_general.py:114 ../picard/ui/options/general.py:29
+msgid "General"
+msgstr ""
+
+#: ../picard/ui/ui_options_general.py:115
+msgid "Automatically scan all new files"
+msgstr ""
+
 #: ../picard/ui/ui_options_interface.py:50
 msgid "Miscellaneous"
 msgstr ""
@@ -1900,113 +1968,6 @@ msgstr ""
 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_options_naming.py:180
-#: ../picard/ui/ui_tagsfromfilenames.py:58
-msgid "&Preview"
-msgstr ""
-
-#: ../picard/ui/ui_options_proxy.py:81 ../picard/ui/options/proxy.py:28
-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_options_ratings.py:45
-msgid "Enable track ratings"
-msgstr ""
-
-#: ../picard/ui/ui_options_ratings.py:46
-msgid ""
-"Picard saves the ratings together with an e-mail address identifying the "
-"user who did the rating. That way different ratings for different users can "
-"be stored in the files. Please sepcify the e-mail you want to use to save "
-"your ratings."
-msgstr ""
-
-#: ../picard/ui/ui_options_ratings.py:47
-msgid "E-mail:"
-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 ../picard/ui/options/general.py:29
-msgid "General"
-msgstr ""
-
-#: ../picard/ui/ui_options_general.py:115
-msgid "Automatically scan all new files"
-msgstr ""
-
 #: ../picard/ui/ui_options_matching.py:105
 msgid "Thresholds"
 msgstr ""
@@ -2063,72 +2024,143 @@ msgstr ""
 msgid "Non-album tracks:"
 msgstr ""
 
-#: ../picard/ui/ui_options_plugins.py:58 ../picard/ui/options/plugins.py:30
+#: ../picard/ui/ui_options_metadata.py:109
+#: ../picard/ui/ui_options_metadata.py:110
+#: ../picard/ui/ui_options_renaming.py:155
+#: ../picard/ui/ui_options_renaming.py:158
+msgid "Default"
+msgstr ""
+
+#: ../picard/ui/ui_options_plugins.py:58 ../picard/ui/options/plugins.py:34
 msgid "Plugins"
 msgstr ""
 
-#: ../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:84
 msgid "Author"
 msgstr ""
 
-#: ../picard/ui/ui_options_plugins.py:61 ../picard/util/tags.py:36
+#: ../picard/ui/ui_options_plugins.py:61 ../picard/util/tags.py:37
 msgid "Version"
 msgstr ""
 
-#: ../picard/ui/ui_options_script.py:52
+#: ../picard/ui/ui_options_proxy.py:69 ../picard/ui/options/proxy.py:28
+msgid "Web Proxy"
+msgstr ""
+
+#: ../picard/ui/ui_options_ratings.py:45
+msgid "Enable track ratings"
+msgstr ""
+
+#: ../picard/ui/ui_options_ratings.py:46
+msgid ""
+"Picard saves the ratings together with an e-mail address identifying the "
+"user who did the rating. That way different ratings for different users can "
+"be stored in the files. Please sepcify the e-mail you want to use to save "
+"your ratings."
+msgstr ""
+
+#: ../picard/ui/ui_options_ratings.py:47
+msgid "E-mail:"
+msgstr ""
+
+#: ../picard/ui/ui_options_renaming.py:145
+msgid "Form"
+msgstr ""
+
+#: ../picard/ui/ui_options_renaming.py:146
+msgid "Rename files when saving"
+msgstr ""
+
+#: ../picard/ui/ui_options_renaming.py:147
+msgid "Replace non-ASCII characters"
+msgstr ""
+
+#: ../picard/ui/ui_options_renaming.py:148
+msgid "Replace Windows-incompatible characters"
+msgstr ""
+
+#: ../picard/ui/ui_options_renaming.py:149
+msgid "Name files like this"
+msgstr ""
+
+#: ../picard/ui/ui_options_renaming.py:156
+msgid "Name multiple artist albums differently"
+msgstr ""
+
+#: ../picard/ui/ui_options_renaming.py:157
+msgid "Copy from above"
+msgstr ""
+
+#: ../picard/ui/ui_options_renaming.py:159
+msgid "Examples"
+msgstr ""
+
+#: ../picard/ui/ui_options_script.py:43
 msgid "Tagger Script"
 msgstr ""
 
-#: ../picard/ui/ui_options_tags.py:85
-msgid "Common"
+#: ../picard/ui/ui_options_tags.py:97
+msgid "Do not write tags to files"
 msgstr ""
 
-#: ../picard/ui/ui_options_tags.py:86
-msgid "Clear existing tags before writing new tags"
+#: ../picard/ui/ui_options_tags.py:98
+msgid "Before tagging"
 msgstr ""
 
-#: ../picard/ui/ui_options_tags.py:87
-msgid "Don not write tags to files"
+#: ../picard/ui/ui_options_tags.py:99
+msgid "Clear existing tags"
 msgstr ""
 
-#: ../picard/ui/ui_options_tags.py:88
-msgid "ID3"
-msgstr ""
-
-#: ../picard/ui/ui_options_tags.py:89
-msgid "Write ID3v1 tags to the files"
-msgstr ""
-
-#: ../picard/ui/ui_options_tags.py:90
-msgid "Write ID3v2 version 2.3 tags (2.4 is default)"
-msgstr ""
-
-#: ../picard/ui/ui_options_tags.py:91
-msgid "Text encoding to use while writing ID3v2 tags:"
-msgstr ""
-
-#: ../picard/ui/ui_options_tags.py:92
-msgid "ISO-8859-1"
-msgstr ""
-
-#: ../picard/ui/ui_options_tags.py:93
-msgid "UTF-16"
-msgstr ""
-
-#: ../picard/ui/ui_options_tags.py:94
-msgid "UTF-8"
-msgstr ""
-
-#: ../picard/ui/ui_options_tags.py:95
+#: ../picard/ui/ui_options_tags.py:100
 msgid "Remove ID3 tags from FLAC files"
 msgstr ""
 
-#: ../picard/ui/ui_options_tags.py:96
-msgid "APE"
+#: ../picard/ui/ui_options_tags.py:101
+msgid "Remove APEv2 tags from MP3 files"
 msgstr ""
 
-#: ../picard/ui/ui_options_tags.py:97
-msgid "Remove APEv2 tags from MP3 files"
+#: ../picard/ui/ui_options_tags.py:102
+msgid "Tag compatibility"
+msgstr ""
+
+#: ../picard/ui/ui_options_tags.py:103
+msgid "ID3v2 version"
+msgstr ""
+
+#: ../picard/ui/ui_options_tags.py:104
+msgid "2.4"
+msgstr ""
+
+#: ../picard/ui/ui_options_tags.py:105
+msgid "2.3"
+msgstr ""
+
+#: ../picard/ui/ui_options_tags.py:106
+msgid "Also include ID3v1 tags in the files"
+msgstr ""
+
+#: ../picard/ui/ui_options_tags.py:107
+msgid "ID3v2 text encoding"
+msgstr ""
+
+#: ../picard/ui/ui_options_tags.py:108
+msgid "UTF-8"
+msgstr ""
+
+#: ../picard/ui/ui_options_tags.py:109
+msgid "UTF-16"
+msgstr ""
+
+#: ../picard/ui/ui_options_tags.py:110
+msgid "ISO-8859-1"
+msgstr ""
+
+#: ../picard/ui/ui_passworddialog.py:78
+msgid "Authentication required"
+msgstr ""
+
+#: ../picard/ui/ui_passworddialog.py:81
+msgid "Save username and password"
 msgstr ""
 
 #: ../picard/ui/ui_tagsfromfilenames.py:56
@@ -2139,6 +2171,10 @@ msgstr ""
 msgid "Replace underscores with spaces"
 msgstr ""
 
+#: ../picard/ui/ui_tagsfromfilenames.py:58
+msgid "&Preview"
+msgstr ""
+
 #: ../picard/ui/options/about.py:29
 msgid "About"
 msgstr ""
@@ -2205,42 +2241,44 @@ msgstr ""
 msgid "None"
 msgstr ""
 
-#: ../picard/ui/options/naming.py:33
-msgid "File Naming"
+#: ../picard/ui/options/moving.py:33
+msgid "Moving files"
 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 ""
-
-#: ../picard/ui/options/naming.py:95
-msgid "The multiple artist file naming format must not be empty."
-msgstr ""
-
-#: ../picard/ui/options/naming.py:97
+#: ../picard/ui/options/moving.py:65
 msgid "Error"
 msgstr ""
 
-#: ../picard/ui/options/naming.py:97
+#: ../picard/ui/options/moving.py:65
 msgid "The location to move files to must not be empty."
 msgstr ""
 
-#: ../picard/ui/options/scripting.py:63
-msgid "Scripting"
+#: ../picard/ui/options/ratings.py:29
+msgid "Ratings"
 msgstr ""
 
 #: ../picard/ui/options/tags.py:29
 msgid "Tags"
 msgstr ""
 
-#: ../picard/ui/options/ratings.py:29
-msgid "Ratings"
+#: ../picard/ui/options/renaming.py:35
+msgid "File naming"
+msgstr ""
+
+#: ../picard/ui/options/renaming.py:123
+msgid "The file naming format must not be empty."
+msgstr ""
+
+#: ../picard/ui/options/renaming.py:133
+msgid "The multiple artist file naming format must not be empty."
+msgstr ""
+
+#: ../picard/ui/options/scripting.py:63
+msgid "Scripting"
+msgstr ""
+
+#: ../picard/ui/options/scripting.py:97
+msgid "Script Error"
 msgstr ""
 
 #: ../picard/util/tags.py:24
@@ -2248,214 +2286,218 @@ msgid "Date"
 msgstr ""
 
 #: ../picard/util/tags.py:25
-msgid "Album Artist"
+msgid "Original Release Date"
 msgstr ""
 
 #: ../picard/util/tags.py:26
-msgid "Track Number"
+msgid "Album Artist"
 msgstr ""
 
 #: ../picard/util/tags.py:27
-msgid "Total Tracks"
+msgid "Track Number"
 msgstr ""
 
 #: ../picard/util/tags.py:28
-msgid "Disc Number"
+msgid "Total Tracks"
 msgstr ""
 
 #: ../picard/util/tags.py:29
-msgid "Total Discs"
+msgid "Disc Number"
 msgstr ""
 
 #: ../picard/util/tags.py:30
-msgid "Album Artist Sort Order"
+msgid "Total Discs"
 msgstr ""
 
 #: ../picard/util/tags.py:31
-msgid "Artist Sort Order"
+msgid "Album Artist Sort Order"
 msgstr ""
 
 #: ../picard/util/tags.py:32
-msgid "Title Sort Order"
+msgid "Artist Sort Order"
 msgstr ""
 
 #: ../picard/util/tags.py:33
-msgid "Album Sort Order"
+msgid "Title Sort Order"
 msgstr ""
 
 #: ../picard/util/tags.py:34
-msgid "ASIN"
+msgid "Album Sort Order"
 msgstr ""
 
 #: ../picard/util/tags.py:35
+msgid "ASIN"
+msgstr ""
+
+#: ../picard/util/tags.py:36
 msgid "Grouping"
 msgstr ""
 
-#: ../picard/util/tags.py:37
+#: ../picard/util/tags.py:38
 msgid "ISRC"
 msgstr ""
 
-#: ../picard/util/tags.py:38
+#: ../picard/util/tags.py:39
 msgid "Mood"
 msgstr ""
 
-#: ../picard/util/tags.py:39
+#: ../picard/util/tags.py:40
 msgid "BPM"
 msgstr ""
 
-#: ../picard/util/tags.py:40
+#: ../picard/util/tags.py:41
 msgid "Copyright"
 msgstr ""
 
-#: ../picard/util/tags.py:41
+#: ../picard/util/tags.py:42
 msgid "Composer"
 msgstr ""
 
-#: ../picard/util/tags.py:42
+#: ../picard/util/tags.py:43
 msgid "Conductor"
 msgstr ""
 
-#: ../picard/util/tags.py:43
+#: ../picard/util/tags.py:44
 msgid "Lyricist"
 msgstr ""
 
-#: ../picard/util/tags.py:44
+#: ../picard/util/tags.py:45
 msgid "Arranger"
 msgstr ""
 
-#: ../picard/util/tags.py:45
+#: ../picard/util/tags.py:46
 msgid "Producer"
 msgstr ""
 
-#: ../picard/util/tags.py:46
+#: ../picard/util/tags.py:47
 msgid "Engineer"
 msgstr ""
 
-#: ../picard/util/tags.py:47
+#: ../picard/util/tags.py:48
 msgid "Subtitle"
 msgstr ""
 
-#: ../picard/util/tags.py:48
+#: ../picard/util/tags.py:49
 msgid "Disc Subtitle"
 msgstr ""
 
-#: ../picard/util/tags.py:49
+#: ../picard/util/tags.py:50
 msgid "Remixer"
 msgstr ""
 
-#: ../picard/util/tags.py:50
+#: ../picard/util/tags.py:51
 msgid "MusicBrainz Track Id"
 msgstr ""
 
-#: ../picard/util/tags.py:51
+#: ../picard/util/tags.py:52
 msgid "MusicBrainz Release Id"
 msgstr ""
 
-#: ../picard/util/tags.py:52
+#: ../picard/util/tags.py:53
 msgid "MusicBrainz Artist Id"
 msgstr ""
 
-#: ../picard/util/tags.py:53
+#: ../picard/util/tags.py:54
 msgid "MusicBrainz Release Artist Id"
 msgstr ""
 
-#: ../picard/util/tags.py:54
+#: ../picard/util/tags.py:55
 msgid "MusicBrainz TRM Id"
 msgstr ""
 
-#: ../picard/util/tags.py:55
+#: ../picard/util/tags.py:56
 msgid "MusicBrainz Disc Id"
 msgstr ""
 
-#: ../picard/util/tags.py:56
+#: ../picard/util/tags.py:57
 msgid "MusicBrainz Sort Name"
 msgstr ""
 
-#: ../picard/util/tags.py:57
+#: ../picard/util/tags.py:58
 msgid "MusicIP PUID"
 msgstr ""
 
-#: ../picard/util/tags.py:58
+#: ../picard/util/tags.py:59
 msgid "MusicIP Fingerprint"
 msgstr ""
 
-#: ../picard/util/tags.py:59
+#: ../picard/util/tags.py:60
 msgid "Disc Id"
 msgstr ""
 
-#: ../picard/util/tags.py:60
+#: ../picard/util/tags.py:61
 msgid "Website"
 msgstr ""
 
-#: ../picard/util/tags.py:61
+#: ../picard/util/tags.py:62
 msgid "Compilation"
 msgstr ""
 
-#: ../picard/util/tags.py:62
+#: ../picard/util/tags.py:63
 msgid "Comment"
 msgstr ""
 
-#: ../picard/util/tags.py:63
+#: ../picard/util/tags.py:64
 msgid "Genre"
 msgstr ""
 
-#: ../picard/util/tags.py:64
+#: ../picard/util/tags.py:65
 msgid "Encoded By"
 msgstr ""
 
-#: ../picard/util/tags.py:65
+#: ../picard/util/tags.py:66
 msgid "Performer"
 msgstr ""
 
-#: ../picard/util/tags.py:66
+#: ../picard/util/tags.py:67
 msgid "Release Type"
 msgstr ""
 
-#: ../picard/util/tags.py:67
+#: ../picard/util/tags.py:68
 msgid "Release Status"
 msgstr ""
 
-#: ../picard/util/tags.py:68
+#: ../picard/util/tags.py:69
 msgid "Release Country"
 msgstr ""
 
-#: ../picard/util/tags.py:69
+#: ../picard/util/tags.py:70
 msgid "Record Label"
 msgstr ""
 
-#: ../picard/util/tags.py:70
+#: ../picard/util/tags.py:71
 msgid "Barcode"
 msgstr ""
 
-#: ../picard/util/tags.py:71
+#: ../picard/util/tags.py:72
 msgid "Catalog Number"
 msgstr ""
 
-#: ../picard/util/tags.py:72
+#: ../picard/util/tags.py:73
 msgid "Format"
 msgstr ""
 
-#: ../picard/util/tags.py:73
+#: ../picard/util/tags.py:74
 msgid "DJ-Mixer"
 msgstr ""
 
-#: ../picard/util/tags.py:74
+#: ../picard/util/tags.py:75
 msgid "Media"
 msgstr ""
 
-#: ../picard/util/tags.py:75
+#: ../picard/util/tags.py:76
 msgid "Lyrics"
 msgstr ""
 
-#: ../picard/util/tags.py:76
+#: ../picard/util/tags.py:77
 msgid "Mixer"
 msgstr ""
 
-#: ../picard/util/tags.py:77
+#: ../picard/util/tags.py:78
 msgid "Language"
 msgstr ""
 
-#: ../picard/util/tags.py:78
+#: ../picard/util/tags.py:79
 msgid "Script"
 msgstr ""
 
diff --git a/po/pl.po b/po/pl.po
index 91a9a7ae7..1c1e9550f 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: picard\n"
 "Report-Msgid-Bugs-To: http://bugs.musicbrainz.org/\n"
-"POT-Creation-Date: 2009-02-24 18:58+0100\n"
+"POT-Creation-Date: 2009-04-06 22:50+0200\n"
 "PO-Revision-Date: 2009-03-30 13:52+0000\n"
 "Last-Translator: Maurycy Żarczyński <rajcaa@gmail.com>\n"
 "Language-Team: Polish <pl@li.org>\n"
@@ -18,16 +18,16 @@ msgstr ""
 "X-Launchpad-Export-Date: 2009-04-06 20:21+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
-#: ../picard/album.py:108 ../picard/cluster.py:248
+#: ../picard/album.py:109 ../picard/cluster.py:248
 msgid "Unmatched Files"
 msgstr "Niepasujące pliki"
 
-#: ../picard/album.py:281
+#: ../picard/album.py:287
 #, python-format
 msgid "[could not load album %s]"
 msgstr ""
 
-#: ../picard/album.py:317
+#: ../picard/album.py:320
 msgid "[loading album information]"
 msgstr "[wczytywanie informacji o albumie]"
 
@@ -587,7 +587,8 @@ msgid "Namibia"
 msgstr "Namibia"
 
 #: ../picard/const.py:182
-msgid "Vanuat"
+#, fuzzy
+msgid "Vanuatu"
 msgstr "Vanuatu"
 
 #: ../picard/const.py:183
@@ -1031,223 +1032,239 @@ msgid "Congo, The Democratic Republic of the"
 msgstr "Demokratyczna Republika Konga"
 
 #: ../picard/const.py:293
-msgid "Serbia and Montenegro"
+#, fuzzy
+msgid "Serbia and Montenegro (historical, 2003-2006)"
 msgstr "Serbia i Czarnogóra"
 
 #: ../picard/const.py:294
+#, fuzzy
+msgid "Serbia"
+msgstr "Azerbejdżan"
+
+#: ../picard/const.py:295
+#, fuzzy
+msgid "Montenegro"
+msgstr "Serbia i Czarnogóra"
+
+#: ../picard/const.py:296
 msgid "Croatia"
 msgstr "Chorwacja"
 
-#: ../picard/const.py:295
+#: ../picard/const.py:297
 msgid "Korea (North), Democratic People's Republic of"
 msgstr "Korea Północna"
 
-#: ../picard/const.py:296
+#: ../picard/const.py:298
 msgid "Korea (South), Republic of"
 msgstr "Korea Południowa"
 
-#: ../picard/const.py:297
+#: ../picard/const.py:299
 msgid "Slovakia"
 msgstr "Słowacja"
 
-#: ../picard/const.py:298
+#: ../picard/const.py:300
 msgid "Soviet Union (historical, 1922-1991)"
 msgstr ""
 
-#: ../picard/const.py:299
+#: ../picard/const.py:301
 msgid "East Timor"
 msgstr "Timor Wschodni"
 
-#: ../picard/const.py:300
+#: ../picard/const.py:302
 msgid "Czechoslovakia (historical, 1918-1992)"
 msgstr ""
 
-#: ../picard/const.py:301
+#: ../picard/const.py:303
 msgid "Europe"
 msgstr "Europa"
 
-#: ../picard/const.py:302
+#: ../picard/const.py:304
 msgid "East Germany (historical, 1949-1990)"
 msgstr ""
 
-#: ../picard/const.py:303
+#: ../picard/const.py:305
 msgid "[Unknown Country]"
 msgstr ""
 
-#: ../picard/const.py:304
+#: ../picard/const.py:306
 msgid "[Worldwide]"
 msgstr ""
 
-#: ../picard/const.py:305
+#: ../picard/const.py:307
 msgid "Yugoslavia (historical, 1918-1992)"
 msgstr ""
 
-#: ../picard/const.py:310
+#: ../picard/const.py:312
+msgid "Afrikaans"
+msgstr ""
+
+#: ../picard/const.py:313
+msgid "Arabic"
+msgstr ""
+
+#: ../picard/const.py:314
 msgid "Catalan"
 msgstr "Kataloński"
 
-#: ../picard/const.py:311
+#: ../picard/const.py:315
 msgid "Czech"
 msgstr "Czeski"
 
-#: ../picard/const.py:312
+#: ../picard/const.py:316
 msgid "Welsh"
 msgstr "Walijski"
 
-#: ../picard/const.py:313
+#: ../picard/const.py:317
 msgid "Danish"
 msgstr "Duński"
 
-#: ../picard/const.py:314
+#: ../picard/const.py:318
 msgid "German"
 msgstr "Niemiecki"
 
-#: ../picard/const.py:315
+#: ../picard/const.py:319
 msgid "English"
 msgstr "angielski"
 
-#: ../picard/const.py:316
+#: ../picard/const.py:320
 msgid "English (Canada)"
 msgstr "angieski (Kanada)"
 
-#: ../picard/const.py:317
+#: ../picard/const.py:321
 msgid "English (UK)"
 msgstr "angielski (Wielka Brytania)"
 
-#: ../picard/const.py:318
+#: ../picard/const.py:322
 msgid "Spanish"
 msgstr "Hiszpański"
 
-#: ../picard/const.py:319
+#: ../picard/const.py:323
 msgid "Persian"
 msgstr ""
 
-#: ../picard/const.py:320
+#: ../picard/const.py:324
 msgid "Finnish"
 msgstr "Fiński"
 
-#: ../picard/const.py:321
+#: ../picard/const.py:325
 msgid "French"
 msgstr "Francuski"
 
-#: ../picard/const.py:322
+#: ../picard/const.py:326
 msgid "Frisian"
 msgstr ""
 
-#: ../picard/const.py:323
+#: ../picard/const.py:327
 msgid "Hebrew"
 msgstr "Hebrajski"
 
-#: ../picard/const.py:324
+#: ../picard/const.py:328
+#, fuzzy
+msgid "Hindi"
+msgstr "Haiti"
+
+#: ../picard/const.py:329
 msgid "Hungarian"
 msgstr "Węgierski"
 
-#: ../picard/const.py:325
+#: ../picard/const.py:330
 msgid "Islandic"
 msgstr "islandzki"
 
-#: ../picard/const.py:326
+#: ../picard/const.py:331
 msgid "Italian"
 msgstr "Włoski"
 
-#: ../picard/const.py:327
+#: ../picard/const.py:332
 msgid "Kannada"
 msgstr ""
 
-#: ../picard/const.py:328
+#: ../picard/const.py:333
 msgid "Korean"
 msgstr "Koreański"
 
-#: ../picard/const.py:329
+#: ../picard/const.py:334
 msgid "Lithuanian"
 msgstr "Litewski"
 
-#: ../picard/const.py:330
+#: ../picard/const.py:335
 msgid "Norwegian Bokmal"
 msgstr "norweski (Bokamal)"
 
-#: ../picard/const.py:331
+#: ../picard/const.py:336
 msgid "Dutch"
 msgstr "Duński"
 
-#: ../picard/const.py:332
+#: ../picard/const.py:337
 msgid "Polish"
 msgstr "Polski"
 
-#: ../picard/const.py:333
+#: ../picard/const.py:338
 msgid "Portuguese"
 msgstr "Portugalski"
 
-#: ../picard/const.py:334
+#: ../picard/const.py:339
 msgid "Brazilian Portuguese"
 msgstr ""
 
-#: ../picard/const.py:335
+#: ../picard/const.py:340
 msgid "Romanian"
 msgstr "Rumuński"
 
-#: ../picard/const.py:336
+#: ../picard/const.py:341
 msgid "Russian"
 msgstr "Rosyjski"
 
-#: ../picard/const.py:337
+#: ../picard/const.py:342
 msgid "Scots"
 msgstr ""
 
-#: ../picard/const.py:338
+#: ../picard/const.py:343
 msgid "Slovak"
 msgstr "słowacki"
 
-#: ../picard/const.py:339
+#: ../picard/const.py:344
 msgid "Slovenian"
 msgstr "Słoweński"
 
-#: ../picard/const.py:340
+#: ../picard/const.py:345
 msgid "Swedish"
 msgstr "Szwedzki"
 
-#: ../picard/const.py:341
+#: ../picard/const.py:346
+#, fuzzy
+msgid "Turkish"
+msgstr "Turkmenistan"
+
+#: ../picard/const.py:347
 msgid "Chinese"
 msgstr "Chiński"
 
-#: ../picard/file.py:487
+#: ../picard/file.py:494
 #, python-format
 msgid "No matching tracks for file %s"
 msgstr "Brak pasujących utworów dla pliku %s"
 
-#: ../picard/file.py:504
+#: ../picard/file.py:511
 #, python-format
 msgid "No matching tracks above the threshold for file %s"
 msgstr ""
 
-#: ../picard/file.py:507
+#: ../picard/file.py:514
 #, python-format
 msgid "File %s identified!"
 msgstr "Plik %s zidentyfikowany!"
 
-#: ../picard/file.py:518
+#: ../picard/file.py:525
 #, python-format
 msgid "Looking up the PUID for file %s..."
 msgstr "Sprawdzanie PUIDu dla pliku %s..."
 
-#: ../picard/file.py:523
+#: ../picard/file.py:530
 #, 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)"
@@ -1260,11 +1277,24 @@ msgstr "Playlista PLS (*.pls)"
 msgid "XSPF Playlist (*.xspf)"
 msgstr "Playlista XSPF (*.xspf)"
 
-#: ../picard/tagger.py:476
+#: ../picard/puidmanager.py:62
+msgid "Submitting PUIDs..."
+msgstr "Dodawanie PUIDów..."
+
+#: ../picard/puidmanager.py:68
+#, python-format
+msgid "PUIDs submission failed: %s"
+msgstr "Wysłanie PUIDów zakończone niepowodzeniem: %s"
+
+#: ../picard/puidmanager.py:70
+msgid "PUIDs successfully submitted!"
+msgstr "Dodano PUIDy!"
+
+#: ../picard/tagger.py:477
 msgid "CD Lookup Error"
 msgstr "Błąd sprawdzania CD"
 
-#: ../picard/tagger.py:477
+#: ../picard/tagger.py:478
 #, python-format
 msgid ""
 "Error while reading CD:\n"
@@ -1275,7 +1305,7 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../picard/tagger.py:503
+#: ../picard/tagger.py:504
 #, python-format
 msgid "Could not find PUID for file %s"
 msgstr "Nie udało się znaleźć PUIDu dla pliku %s"
@@ -1328,15 +1358,28 @@ msgstr "Pokaż &ukryte pliki"
 msgid "Length"
 msgstr "Długość"
 
-#: ../picard/ui/itemviews.py:327
+#: ../picard/ui/itemviews.py:289
+msgid "&Expand all"
+msgstr ""
+
+#: ../picard/ui/itemviews.py:291
+msgid "&Collapse all"
+msgstr ""
+
+#: ../picard/ui/itemviews.py:332
 msgid "&Releases"
 msgstr "&Wydania"
 
-#: ../picard/ui/itemviews.py:353
+#: ../picard/ui/itemviews.py:349
+#, fuzzy
+msgid "No release event"
+msgstr "Miesiąc wydania albumu"
+
+#: ../picard/ui/itemviews.py:359
 msgid "&Plugins"
 msgstr "&Wtyczki"
 
-#: ../picard/ui/itemviews.py:523
+#: ../picard/ui/itemviews.py:533
 msgid "Clusters"
 msgstr "Zbiór"
 
@@ -1344,98 +1387,6 @@ msgstr "Zbiór"
 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:66 ../picard/ui/ui_options_plugins.py:62
-msgid "Details"
-msgstr "Szczegóły"
-
-#: ../picard/ui/tageditor.py:71 ../picard/ui/tageditor.py:264
-#, 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:131
-#, 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:134
-#, 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:233
-msgid "Filename:"
-msgstr "Nazwa pliku:"
-
-#: ../picard/ui/tageditor.py:235
-msgid "Format:"
-msgstr "Format:"
-
-#: ../picard/ui/tageditor.py:244
-msgid "Size:"
-msgstr "Rozmiar:"
-
-#: ../picard/ui/tageditor.py:248 ../picard/ui/ui_metadata.py:127
-msgid "Length:"
-msgstr "Długość:"
-
-#: ../picard/ui/tageditor.py:250
-msgid "Bitrate:"
-msgstr "Szybkość transmisji:"
-
-#: ../picard/ui/tageditor.py:252
-msgid "Sample rate:"
-msgstr "Próbkowanie:"
-
-#: ../picard/ui/tageditor.py:254
-msgid "Bits per sample:"
-msgstr "Bitów na próbkę:"
-
-#: ../picard/ui/tageditor.py:257
-msgid "Mono"
-msgstr "Mono"
-
-#: ../picard/ui/tageditor.py:258
-msgid "Stereo"
-msgstr "Stereo"
-
-#: ../picard/ui/tageditor.py:260
-msgid "Channels:"
-msgstr "Kanały:"
-
-#: ../picard/ui/tagsfromfilenames.py:52 ../picard/ui/tagsfromfilenames.py:96
-msgid "File Name"
-msgstr "Nazwa pliku"
-
 #: ../picard/ui/mainwindow.py:64
 msgid "MusicBrainz Picard"
 msgstr "MusicBrainz Picard"
@@ -1672,6 +1623,10 @@ msgstr "Pasek &wyszukiwania"
 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"
@@ -1691,12 +1646,99 @@ msgstr "Lista odtwarzania %s zapisana"
 msgid " (Error: %s)"
 msgstr " (Błąd: %s)"
 
+#: ../picard/ui/puidsubmit.py:31 ../picard/ui/options/plugins.py:85
+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/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."
+msgstr "Serwer %s wymaga logowania. Wprowadź swoją nazwę użytkownika i hasło."
+
+#: ../picard/ui/tageditor.py:66 ../picard/ui/ui_options_plugins.py:62
+msgid "Details"
+msgstr "Szczegóły"
+
+#: ../picard/ui/tageditor.py:71 ../picard/ui/tageditor.py:264
+#, 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:131
+#, 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:134
+#, 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:233
+msgid "Filename:"
+msgstr "Nazwa pliku:"
+
+#: ../picard/ui/tageditor.py:235
+msgid "Format:"
+msgstr "Format:"
+
+#: ../picard/ui/tageditor.py:244
+msgid "Size:"
+msgstr "Rozmiar:"
+
+#: ../picard/ui/tageditor.py:248 ../picard/ui/ui_metadata.py:127
+msgid "Length:"
+msgstr "Długość:"
+
+#: ../picard/ui/tageditor.py:250
+msgid "Bitrate:"
+msgstr "Szybkość transmisji:"
+
+#: ../picard/ui/tageditor.py:252
+msgid "Sample rate:"
+msgstr "Próbkowanie:"
+
+#: ../picard/ui/tageditor.py:254
+msgid "Bits per sample:"
+msgstr "Bitów na próbkę:"
+
+#: ../picard/ui/tageditor.py:257
+msgid "Mono"
+msgstr "Mono"
+
+#: ../picard/ui/tageditor.py:258
+msgid "Stereo"
+msgstr "Stereo"
+
+#: ../picard/ui/tageditor.py:260
+msgid "Channels:"
+msgstr "Kanały:"
+
+#: ../picard/ui/tagsfromfilenames.py:54 ../picard/ui/tagsfromfilenames.py:99
+msgid "File Name"
+msgstr "Nazwa pliku"
 
 #: ../picard/ui/ui_cdlookup.py:60 ../picard/ui/ui_options_cdlookup.py:47
 #: ../picard/ui/ui_options_cdlookup_select.py:48
@@ -1720,24 +1762,6 @@ msgstr "    Sprawdź ręcznie    "
 msgid "Cancel"
 msgstr "Anuluj"
 
-#: ../picard/ui/ui_passworddialog.py:78
-msgid "Authentication required"
-msgstr "Wymagane uwierzytelnienie"
-
-#: ../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/ui_passworddialog.py:80 ../picard/ui/ui_options_proxy.py:82
-#: ../picard/ui/ui_options_general.py:112
-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"
@@ -1774,6 +1798,10 @@ msgstr "Album:"
 msgid "Options"
 msgstr "Opcje"
 
+#: ../picard/ui/ui_puidsubmit.py:52
+msgid "Submit PUIDs"
+msgstr "Wyślij PUIDy"
+
 #: ../picard/ui/ui_options_cdlookup.py:48
 msgid "CD-ROM device to use for lookups:"
 msgstr "Urządzenie CD-ROM do sprawdzania:"
@@ -1798,6 +1826,23 @@ msgstr "Zapisz okładki jako oddzielne pliki"
 msgid "Overwrite the file if it already exists"
 msgstr "Nadpisz plik jeżeli istnieje"
 
+#: ../picard/ui/ui_options_moving.py:53
+msgid "Move additional files:"
+msgstr "Przenieś dodatkowe pliki:"
+
+#: ../picard/ui/ui_options_moving.py:54
+msgid "Browse..."
+msgstr "Przeglądaj..."
+
+#: ../picard/ui/ui_options_moving.py:55
+msgid "Delete empty directories"
+msgstr "Usuń puste katalogi"
+
+#: ../picard/ui/ui_options_moving.py:56
+#, fuzzy
+msgid "Move files to this directory when saving:"
+msgstr "Przenieś otagowane pliki do tego folderu"
+
 #: ../picard/ui/util.py:31
 msgid "&Ok"
 msgstr "&OK"
@@ -1806,44 +1851,40 @@ msgstr "&OK"
 msgid "&Cancel"
 msgstr "&Anuluj"
 
-#: ../picard/ui/ui_puidsubmit.py:52
-msgid "Submit PUIDs"
-msgstr "Wyślij PUIDy"
-
-#: ../picard/ui/ui_tageditor.py:139 ../picard/ui/ui_options_plugins.py:59
-#: ../picard/ui/options/plugins.py:76
+#: ../picard/ui/ui_tageditor.py:128 ../picard/ui/ui_options_plugins.py:59
+#: ../picard/ui/options/plugins.py:81
 msgid "Name"
 msgstr "Nazwa"
 
-#: ../picard/ui/ui_tageditor.py:140
+#: ../picard/ui/ui_tageditor.py:129
 msgid "Value"
 msgstr "Wartość"
 
-#: ../picard/ui/ui_tageditor.py:141
+#: ../picard/ui/ui_tageditor.py:130
 msgid "Rating:"
 msgstr ""
 
-#: ../picard/ui/ui_tageditor.py:142
+#: ../picard/ui/ui_tageditor.py:131
 msgid "&Add..."
 msgstr "&Dodaj..."
 
-#: ../picard/ui/ui_tageditor.py:143
+#: ../picard/ui/ui_tageditor.py:132
 msgid "&Edit..."
 msgstr "&Edycja"
 
-#: ../picard/ui/ui_tageditor.py:144
+#: ../picard/ui/ui_tageditor.py:133
 msgid "&Delete"
 msgstr "&Usuń"
 
-#: ../picard/ui/ui_tageditor.py:145
+#: ../picard/ui/ui_tageditor.py:134
 msgid "&Metadata"
 msgstr "&Metadane"
 
-#: ../picard/ui/ui_tageditor.py:146
+#: ../picard/ui/ui_tageditor.py:135
 msgid "A&rtwork"
 msgstr "G&rafika"
 
-#: ../picard/ui/ui_tageditor.py:147
+#: ../picard/ui/ui_tageditor.py:136
 msgid "&Info"
 msgstr "&Informacje"
 
@@ -1888,6 +1929,40 @@ msgstr " / "
 msgid ", "
 msgstr ", "
 
+#: ../picard/ui/ui_options_general.py:108
+msgid "MusicBrainz Server"
+msgstr "Serwer MusicBrainz"
+
+#: ../picard/ui/ui_options_general.py:109 ../picard/ui/ui_options_proxy.py:72
+msgid "Port:"
+msgstr "Port:"
+
+#: ../picard/ui/ui_options_general.py:110 ../picard/ui/ui_options_proxy.py:73
+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:112 ../picard/ui/ui_options_proxy.py:70
+#: ../picard/ui/ui_passworddialog.py:80
+msgid "Password:"
+msgstr "Hasło:"
+
+#: ../picard/ui/ui_options_general.py:113 ../picard/ui/ui_options_proxy.py:71
+#: ../picard/ui/ui_passworddialog.py:79
+msgid "Username:"
+msgstr "Użytkownik:"
+
+#: ../picard/ui/ui_options_general.py:114 ../picard/ui/options/general.py:29
+msgid "General"
+msgstr "Ogólne"
+
+#: ../picard/ui/ui_options_general.py:115
+msgid "Automatically scan all new files"
+msgstr "Automatycznie analizuj nowe pliki"
+
 #: ../picard/ui/ui_options_interface.py:50
 msgid "Miscellaneous"
 msgstr "Różne"
@@ -1908,117 +1983,6 @@ msgstr "Użyj zaawansowanej składni w wyszukiwaniu"
 msgid "User interface language:"
 msgstr "Język interfejsu:"
 
-#: ../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_options_naming.py:180
-#: ../picard/ui/ui_tagsfromfilenames.py:58
-msgid "&Preview"
-msgstr "&Podgląd"
-
-#: ../picard/ui/ui_options_proxy.py:81 ../picard/ui/options/proxy.py:28
-msgid "Web Proxy"
-msgstr "Serwer Proxy"
-
-#: ../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 "Adres serwera:"
-
-#: ../picard/ui/ui_options_ratings.py:45
-msgid "Enable track ratings"
-msgstr ""
-
-#: ../picard/ui/ui_options_ratings.py:46
-msgid ""
-"Picard saves the ratings together with an e-mail address identifying the "
-"user who did the rating. That way different ratings for different users can "
-"be stored in the files. Please sepcify the e-mail you want to use to save "
-"your ratings."
-msgstr ""
-"Picard zapisuje oceny wraz z e-mailem identyfikującym użytkownika, który "
-"dokonał oceny. Tym sposobem różne oceny od różnych użytkowników mogą zostać "
-"zachowane w plikach. Podaj e-mail, którego chcesz używać do zapisywana "
-"swoich ocen."
-
-#: ../picard/ui/ui_options_ratings.py:47
-msgid "E-mail:"
-msgstr "E-mail"
-
-#: ../picard/ui/ui_options_general.py:108
-msgid "MusicBrainz Server"
-msgstr "Serwer MusicBrainz"
-
-#: ../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"
-
-#: ../picard/ui/ui_options_general.py:115
-msgid "Automatically scan all new files"
-msgstr "Automatycznie analizuj nowe pliki"
-
 #: ../picard/ui/ui_options_matching.py:105
 msgid "Thresholds"
 msgstr "Progi"
@@ -2045,8 +2009,7 @@ 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"
+msgstr "Przetłumacz nazwy zagranicznych wykonawców na angielski, jeśli możliwe"
 
 #: ../picard/ui/ui_options_metadata.py:102
 msgid "Use release relationships"
@@ -2076,74 +2039,156 @@ msgstr "Różni wykonawcy:"
 msgid "Non-album tracks:"
 msgstr "Utwory spoza albumu:"
 
-#: ../picard/ui/ui_options_plugins.py:58 ../picard/ui/options/plugins.py:30
+#: ../picard/ui/ui_options_metadata.py:109
+#: ../picard/ui/ui_options_metadata.py:110
+#: ../picard/ui/ui_options_renaming.py:155
+#: ../picard/ui/ui_options_renaming.py:158
+msgid "Default"
+msgstr "Domyślnie"
+
+#: ../picard/ui/ui_options_plugins.py:58 ../picard/ui/options/plugins.py:34
 msgid "Plugins"
 msgstr "Wtyczki"
 
-#: ../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:84
 msgid "Author"
 msgstr "Autor"
 
-#: ../picard/ui/ui_options_plugins.py:61 ../picard/util/tags.py:36
+#: ../picard/ui/ui_options_plugins.py:61 ../picard/util/tags.py:37
 msgid "Version"
 msgstr "Wersja"
 
-#: ../picard/ui/ui_options_script.py:52
+#: ../picard/ui/ui_options_proxy.py:69 ../picard/ui/options/proxy.py:28
+msgid "Web Proxy"
+msgstr "Serwer Proxy"
+
+#: ../picard/ui/ui_options_ratings.py:45
+msgid "Enable track ratings"
+msgstr ""
+
+#: ../picard/ui/ui_options_ratings.py:46
+msgid ""
+"Picard saves the ratings together with an e-mail address identifying the "
+"user who did the rating. That way different ratings for different users can "
+"be stored in the files. Please sepcify the e-mail you want to use to save "
+"your ratings."
+msgstr ""
+"Picard zapisuje oceny wraz z e-mailem identyfikującym użytkownika, który "
+"dokonał oceny. Tym sposobem różne oceny od różnych użytkowników mogą zostać "
+"zachowane w plikach. Podaj e-mail, którego chcesz używać do zapisywana "
+"swoich ocen."
+
+#: ../picard/ui/ui_options_ratings.py:47
+msgid "E-mail:"
+msgstr "E-mail"
+
+#: ../picard/ui/ui_options_renaming.py:145
+#, fuzzy
+msgid "Form"
+msgstr "Format"
+
+#: ../picard/ui/ui_options_renaming.py:146
+#, fuzzy
+msgid "Rename files when saving"
+msgstr "Zmień nazwy plików podczas zapisywania metadanych"
+
+#: ../picard/ui/ui_options_renaming.py:147
+msgid "Replace non-ASCII characters"
+msgstr "Zamień znaki nie-ASCII"
+
+#: ../picard/ui/ui_options_renaming.py:148
+msgid "Replace Windows-incompatible characters"
+msgstr "Zamień znaki niekompatybilne z Windowsem"
+
+#: ../picard/ui/ui_options_renaming.py:149
+msgid "Name files like this"
+msgstr ""
+
+#: ../picard/ui/ui_options_renaming.py:156
+msgid "Name multiple artist albums differently"
+msgstr ""
+
+#: ../picard/ui/ui_options_renaming.py:157
+msgid "Copy from above"
+msgstr ""
+
+#: ../picard/ui/ui_options_renaming.py:159
+#, fuzzy
+msgid "Examples"
+msgstr "Przykład"
+
+#: ../picard/ui/ui_options_script.py:43
 msgid "Tagger Script"
 msgstr "Skrypt taggera"
 
-#: ../picard/ui/ui_options_tags.py:85
-msgid "Common"
-msgstr "Typowe"
+#: ../picard/ui/ui_options_tags.py:97
+#, fuzzy
+msgid "Do not write tags to files"
+msgstr "Nie zapisuj tagów do plików"
 
-#: ../picard/ui/ui_options_tags.py:86
-msgid "Clear existing tags before writing new tags"
-msgstr "Wyczyść istniejące tagi przed zapisem nowych"
-
-#: ../picard/ui/ui_options_tags.py:87
-msgid "Don not write tags to files"
+#: ../picard/ui/ui_options_tags.py:98
+msgid "Before tagging"
 msgstr ""
 
-#: ../picard/ui/ui_options_tags.py:88
-msgid "ID3"
-msgstr "ID3"
+#: ../picard/ui/ui_options_tags.py:99
+#, fuzzy
+msgid "Clear existing tags"
+msgstr "Wyczyść istniejące tagi przed zapisem nowych"
 
-#: ../picard/ui/ui_options_tags.py:89
-msgid "Write ID3v1 tags to the files"
-msgstr "Zapisuj tagi ID3v1 do plików"
-
-#: ../picard/ui/ui_options_tags.py:90
-msgid "Write ID3v2 version 2.3 tags (2.4 is default)"
-msgstr "Zapisuj tagi ID3v2 wersja 2.3 (domyślnie 2.4)"
-
-#: ../picard/ui/ui_options_tags.py:91
-msgid "Text encoding to use while writing ID3v2 tags:"
-msgstr "Kodowanie tekstu używane przy zapisie do tagów ID3v2:"
-
-#: ../picard/ui/ui_options_tags.py:92
-msgid "ISO-8859-1"
-msgstr "ISO-8859-1"
-
-#: ../picard/ui/ui_options_tags.py:93
-msgid "UTF-16"
-msgstr "UTF-16"
-
-#: ../picard/ui/ui_options_tags.py:94
-msgid "UTF-8"
-msgstr "UTF-8"
-
-#: ../picard/ui/ui_options_tags.py:95
+#: ../picard/ui/ui_options_tags.py:100
 msgid "Remove ID3 tags from FLAC files"
 msgstr "Usuwaj tagi ID3 z plików FLAC"
 
-#: ../picard/ui/ui_options_tags.py:96
-msgid "APE"
-msgstr "APE"
-
-#: ../picard/ui/ui_options_tags.py:97
+#: ../picard/ui/ui_options_tags.py:101
 msgid "Remove APEv2 tags from MP3 files"
 msgstr "Usuwaj tagi APEv2 z plików MP3"
 
+#: ../picard/ui/ui_options_tags.py:102
+msgid "Tag compatibility"
+msgstr ""
+
+#: ../picard/ui/ui_options_tags.py:103
+#, fuzzy
+msgid "ID3v2 version"
+msgstr "Tylko ID3v2.4"
+
+#: ../picard/ui/ui_options_tags.py:104
+msgid "2.4"
+msgstr ""
+
+#: ../picard/ui/ui_options_tags.py:105
+msgid "2.3"
+msgstr ""
+
+#: ../picard/ui/ui_options_tags.py:106
+#, fuzzy
+msgid "Also include ID3v1 tags in the files"
+msgstr "Zapisuj tagi ID3v1 do plików"
+
+#: ../picard/ui/ui_options_tags.py:107
+msgid "ID3v2 text encoding"
+msgstr ""
+
+#: ../picard/ui/ui_options_tags.py:108
+msgid "UTF-8"
+msgstr "UTF-8"
+
+#: ../picard/ui/ui_options_tags.py:109
+msgid "UTF-16"
+msgstr "UTF-16"
+
+#: ../picard/ui/ui_options_tags.py:110
+msgid "ISO-8859-1"
+msgstr "ISO-8859-1"
+
+#: ../picard/ui/ui_passworddialog.py:78
+msgid "Authentication required"
+msgstr "Wymagane uwierzytelnienie"
+
+#: ../picard/ui/ui_passworddialog.py:81
+msgid "Save username and password"
+msgstr "Zapisz nazwę użytkownika i hasło"
+
 #: ../picard/ui/ui_tagsfromfilenames.py:56
 msgid "Convert File Names to Tags"
 msgstr "Konwetuj nazwy plików do tagów"
@@ -2152,6 +2197,10 @@ msgstr "Konwetuj nazwy plików do tagów"
 msgid "Replace underscores with spaces"
 msgstr "Zamień podkreślenia na spacje"
 
+#: ../picard/ui/ui_tagsfromfilenames.py:58
+msgid "&Preview"
+msgstr "&Podgląd"
+
 #: ../picard/ui/options/about.py:29
 msgid "About"
 msgstr "O programie"
@@ -2188,8 +2237,8 @@ msgstr "<br/>Przetłumaczono na język LANG przez %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"
@@ -2197,17 +2246,16 @@ msgid ""
 "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\"><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/P"
-"icardTagger</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>Wspierane formaty</strong><br/>%(formats)s</p>\n"
 "<p align=\"center\"><strong>Wesprzyj projekt</strong><br/>\n"
@@ -2215,14 +2263,13 @@ msgstr ""
 "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\"><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/P"
-"icardTagger</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"
 
 #: ../picard/ui/options/advanced.py:26
 msgid "Advanced"
@@ -2254,257 +2301,266 @@ msgstr "Zgodność"
 msgid "None"
 msgstr ""
 
-#: ../picard/ui/options/naming.py:33
-msgid "File Naming"
-msgstr ""
+#: ../picard/ui/options/moving.py:33
+#, fuzzy
+msgid "Moving files"
+msgstr "Przenieś pliki"
 
-#: ../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 "Format nazewnictwa nie może być pusty"
-
-#: ../picard/ui/options/naming.py:95
-msgid "The multiple artist file naming format must not be empty."
-msgstr "Format nazewnictwa dla wielu wykonawców nie może być pusty"
-
-#: ../picard/ui/options/naming.py:97
+#: ../picard/ui/options/moving.py:65
 msgid "Error"
 msgstr "Błąd"
 
-#: ../picard/ui/options/naming.py:97
+#: ../picard/ui/options/moving.py:65
 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/ratings.py:29
+msgid "Ratings"
+msgstr ""
 
 #: ../picard/ui/options/tags.py:29
 msgid "Tags"
 msgstr "Tagi"
 
-#: ../picard/ui/options/ratings.py:29
-msgid "Ratings"
-msgstr ""
+#: ../picard/ui/options/renaming.py:35
+#, fuzzy
+msgid "File naming"
+msgstr "Nazwa pliku:"
+
+#: ../picard/ui/options/renaming.py:123
+msgid "The file naming format must not be empty."
+msgstr "Format nazewnictwa nie może być pusty"
+
+#: ../picard/ui/options/renaming.py:133
+msgid "The multiple artist file naming format must not be empty."
+msgstr "Format nazewnictwa dla wielu wykonawców nie może być pusty"
+
+#: ../picard/ui/options/scripting.py:63
+msgid "Scripting"
+msgstr "Skryptowanie"
+
+#: ../picard/ui/options/scripting.py:97
+msgid "Script Error"
+msgstr "Błąd skryptu"
 
 #: ../picard/util/tags.py:24
 msgid "Date"
 msgstr "Data"
 
 #: ../picard/util/tags.py:25
+#, fuzzy
+msgid "Original Release Date"
+msgstr "Oryginalne Metadane"
+
+#: ../picard/util/tags.py:26
 msgid "Album Artist"
 msgstr "Wykonawca albumu"
 
-#: ../picard/util/tags.py:26
+#: ../picard/util/tags.py:27
 msgid "Track Number"
 msgstr "Numer utworu"
 
-#: ../picard/util/tags.py:27
+#: ../picard/util/tags.py:28
 msgid "Total Tracks"
 msgstr "Łącznie utworów"
 
-#: ../picard/util/tags.py:28
+#: ../picard/util/tags.py:29
 msgid "Disc Number"
 msgstr "Numer płyty"
 
-#: ../picard/util/tags.py:29
+#: ../picard/util/tags.py:30
 msgid "Total Discs"
 msgstr "Łącznie płyt"
 
-#: ../picard/util/tags.py:30
+#: ../picard/util/tags.py:31
 msgid "Album Artist Sort Order"
 msgstr "Nazwa wykonawcy albumu (posortowane)"
 
-#: ../picard/util/tags.py:31
+#: ../picard/util/tags.py:32
 msgid "Artist Sort Order"
 msgstr "Sortowanie wedlug artystów"
 
-#: ../picard/util/tags.py:32
+#: ../picard/util/tags.py:33
 msgid "Title Sort Order"
 msgstr "Sortowanie według tytułów"
 
-#: ../picard/util/tags.py:33
+#: ../picard/util/tags.py:34
 msgid "Album Sort Order"
 msgstr "Sortowanie według albumów"
 
-#: ../picard/util/tags.py:34
+#: ../picard/util/tags.py:35
 msgid "ASIN"
 msgstr "ASIN"
 
-#: ../picard/util/tags.py:35
+#: ../picard/util/tags.py:36
 msgid "Grouping"
 msgstr "Grupowanie"
 
-#: ../picard/util/tags.py:37
+#: ../picard/util/tags.py:38
 msgid "ISRC"
 msgstr "ISRC"
 
-#: ../picard/util/tags.py:38
+#: ../picard/util/tags.py:39
 msgid "Mood"
 msgstr "Nastrój"
 
-#: ../picard/util/tags.py:39
+#: ../picard/util/tags.py:40
 msgid "BPM"
 msgstr "Uderzenia na minutę"
 
-#: ../picard/util/tags.py:40
+#: ../picard/util/tags.py:41
 msgid "Copyright"
 msgstr "Prawa autorskie"
 
-#: ../picard/util/tags.py:41
+#: ../picard/util/tags.py:42
 msgid "Composer"
 msgstr "Kompozytor"
 
-#: ../picard/util/tags.py:42
+#: ../picard/util/tags.py:43
 msgid "Conductor"
 msgstr "Dyrygent"
 
-#: ../picard/util/tags.py:43
+#: ../picard/util/tags.py:44
 msgid "Lyricist"
 msgstr "Autor tekstu"
 
-#: ../picard/util/tags.py:44
+#: ../picard/util/tags.py:45
 msgid "Arranger"
 msgstr "Aranżer"
 
-#: ../picard/util/tags.py:45
+#: ../picard/util/tags.py:46
 msgid "Producer"
 msgstr "Producent"
 
-#: ../picard/util/tags.py:46
+#: ../picard/util/tags.py:47
 msgid "Engineer"
 msgstr "Inżynier"
 
-#: ../picard/util/tags.py:47
+#: ../picard/util/tags.py:48
 msgid "Subtitle"
 msgstr "Podtytuł"
 
-#: ../picard/util/tags.py:48
+#: ../picard/util/tags.py:49
 msgid "Disc Subtitle"
 msgstr "Podtytuł płyty"
 
-#: ../picard/util/tags.py:49
+#: ../picard/util/tags.py:50
 msgid "Remixer"
 msgstr "Remixer"
 
-#: ../picard/util/tags.py:50
+#: ../picard/util/tags.py:51
 msgid "MusicBrainz Track Id"
 msgstr "Id ścieżki w MusicBrainz"
 
-#: ../picard/util/tags.py:51
+#: ../picard/util/tags.py:52
 msgid "MusicBrainz Release Id"
 msgstr ""
 
-#: ../picard/util/tags.py:52
+#: ../picard/util/tags.py:53
 msgid "MusicBrainz Artist Id"
 msgstr "Id artysty w MusicBrainz"
 
-#: ../picard/util/tags.py:53
+#: ../picard/util/tags.py:54
 msgid "MusicBrainz Release Artist Id"
 msgstr ""
 
-#: ../picard/util/tags.py:54
+#: ../picard/util/tags.py:55
 msgid "MusicBrainz TRM Id"
 msgstr ""
 
-#: ../picard/util/tags.py:55
+#: ../picard/util/tags.py:56
 msgid "MusicBrainz Disc Id"
 msgstr "Id dysku w MusicBrainz"
 
-#: ../picard/util/tags.py:56
+#: ../picard/util/tags.py:57
 msgid "MusicBrainz Sort Name"
 msgstr ""
 
-#: ../picard/util/tags.py:57
+#: ../picard/util/tags.py:58
 msgid "MusicIP PUID"
 msgstr ""
 
-#: ../picard/util/tags.py:58
+#: ../picard/util/tags.py:59
 msgid "MusicIP Fingerprint"
 msgstr ""
 
-#: ../picard/util/tags.py:59
+#: ../picard/util/tags.py:60
 msgid "Disc Id"
 msgstr "Id dysku"
 
-#: ../picard/util/tags.py:60
+#: ../picard/util/tags.py:61
 msgid "Website"
 msgstr "Strona www"
 
-#: ../picard/util/tags.py:61
+#: ../picard/util/tags.py:62
 msgid "Compilation"
 msgstr "Składanka"
 
-#: ../picard/util/tags.py:62
+#: ../picard/util/tags.py:63
 msgid "Comment"
 msgstr "Komentarz"
 
-#: ../picard/util/tags.py:63
+#: ../picard/util/tags.py:64
 msgid "Genre"
 msgstr "Gatunek"
 
-#: ../picard/util/tags.py:64
+#: ../picard/util/tags.py:65
 msgid "Encoded By"
 msgstr "Zakodowane przez"
 
-#: ../picard/util/tags.py:65
+#: ../picard/util/tags.py:66
 msgid "Performer"
 msgstr "Wykonawca"
 
-#: ../picard/util/tags.py:66
+#: ../picard/util/tags.py:67
 msgid "Release Type"
 msgstr "Rodzaj wydania"
 
-#: ../picard/util/tags.py:67
+#: ../picard/util/tags.py:68
 msgid "Release Status"
 msgstr "Status wydania"
 
-#: ../picard/util/tags.py:68
+#: ../picard/util/tags.py:69
 msgid "Release Country"
 msgstr "Kraj wydania albumu"
 
-#: ../picard/util/tags.py:69
+#: ../picard/util/tags.py:70
 msgid "Record Label"
 msgstr "Wytwórnia"
 
-#: ../picard/util/tags.py:70
+#: ../picard/util/tags.py:71
 msgid "Barcode"
 msgstr "Kod kreskowy"
 
-#: ../picard/util/tags.py:71
+#: ../picard/util/tags.py:72
 msgid "Catalog Number"
 msgstr "Numer katalogowy"
 
-#: ../picard/util/tags.py:72
+#: ../picard/util/tags.py:73
 msgid "Format"
 msgstr "Format"
 
-#: ../picard/util/tags.py:73
+#: ../picard/util/tags.py:74
 msgid "DJ-Mixer"
 msgstr "DJ-Mixer"
 
-#: ../picard/util/tags.py:74
+#: ../picard/util/tags.py:75
 msgid "Media"
 msgstr "Multimedia"
 
-#: ../picard/util/tags.py:75
+#: ../picard/util/tags.py:76
 msgid "Lyrics"
 msgstr "Teksty utworów"
 
-#: ../picard/util/tags.py:76
+#: ../picard/util/tags.py:77
 msgid "Mixer"
 msgstr "Mikser"
 
-#: ../picard/util/tags.py:77
+#: ../picard/util/tags.py:78
 msgid "Language"
 msgstr "Język"
 
-#: ../picard/util/tags.py:78
+#: ../picard/util/tags.py:79
 msgid "Script"
 msgstr "Skrypt"
 
@@ -2523,43 +2579,62 @@ msgstr ""
 "\n"
 "%s"
 
-#, python-format
+#~ msgid "Rename Files"
+#~ msgstr "Zmień nazwy plików"
+
+#~ msgid "Multiple artist file naming format:"
+#~ msgstr "Schemat nazywania plików przy wielu wykonawcach:"
+
+#~ msgid "File naming format:"
+#~ msgstr "Schemat nazywania plików:"
+
+#~ msgid "Multiple artist file name:"
+#~ msgstr "Wiele nazw wykonawców:"
+
+#~ msgid "Common"
+#~ msgstr "Typowe"
+
+#~ msgid "ID3"
+#~ msgstr "ID3"
+
+#~ msgid "Write ID3v2 version 2.3 tags (2.4 is default)"
+#~ msgstr "Zapisuj tagi ID3v2 wersja 2.3 (domyślnie 2.4)"
+
+#~ msgid "Text encoding to use while writing ID3v2 tags:"
+#~ msgstr "Kodowanie tekstu używane przy zapisie do tagów ID3v2:"
+
+#~ msgid "APE"
+#~ msgstr "APE"
+
 #~ msgid "[couldn't load album %s]"
 #~ msgstr "[nie można wczytać albumu %s]"
 
 #~ msgid "New Version"
 #~ msgstr "Nowa wersja"
 
-#, python-format
 #~ msgid ""
-#~ "New version of Picard is available (%s). Would you like to download it now?"
+#~ "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?"
 
-#, python-format
 #~ msgid "Reading directory %s ..."
 #~ msgstr "Wczytywanie katalogu %s..."
 
-#, python-format
 #~ msgid "Saving file %s ..."
 #~ msgstr "Zapisywanie pliku %s..."
 
-#, python-format
 #~ msgid "Couldn't find PUID for file %s"
 #~ msgstr "Brak PUID dla pliku %s"
 
 #~ msgid "Ctrl+T"
 #~ msgstr "Ctrl+T"
 
-#, python-format
 #~ msgid "Details - %s"
 #~ msgstr "Szczegóły - %s"
 
 #~ msgid "Automatically analyze all new files"
 #~ msgstr "Automatycznie analizuj nowe pliki"
 
-#~ msgid "Don't write tags to files"
-#~ msgstr "Nie zapisuj tagów do plików"
-
 #~ msgid "000; "
 #~ msgstr "000; "
 
@@ -2699,9 +2774,6 @@ msgstr ""
 #~ 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"
 
@@ -2720,9 +2792,6 @@ msgstr ""
 #~ msgid "Proxy port"
 #~ msgstr "Port proxy"
 
-#~ msgid "ID3v2.4 only"
-#~ msgstr "Tylko ID3v2.4"
-
 #~ msgid "Save track/album"
 #~ msgstr "Zapisz utwór/album"
 
@@ -2757,10 +2826,11 @@ msgstr ""
 #~ 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"
-#~ "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. "
+#~ "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 ""
 #~ "Nie podano nazwy użytkownika i hasła. By móc dodawać dane do MusicBrainz, "
 #~ "trzeba mieć konto na serwerze MusicBrainz.\n"
@@ -2789,20 +2859,21 @@ msgstr ""
 #~ 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."
+#~ "Please fix the move option or the destination directory option and try "
+#~ "again."
 #~ msgstr ""
-#~ "Opcja przenoszenia jest włączona, lecz nie wybrano docelowego katalogu lub "
-#~ "jest on błędny.\n"
+#~ "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 click the "
-#~ "track and select 'Clear Error'"
+#~ "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 ""
 #~ "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'"
+#~ "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."
@@ -2826,7 +2897,8 @@ msgstr ""
 #~ msgstr "Prosimy o wsparcie MusicBrainz!"
 
 #~ msgid ""
-#~ "The destination directory %s does not exist. Please pick a valid directory."
+#~ "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"
@@ -2841,14 +2913,12 @@ msgstr ""
 #~ msgid ""
 #~ "Note: This setting will take effect after you restart the application."
 #~ msgstr ""
-#~ "Uwaga: te ustawienia zostaną zastosowane po ponownym uruchomieniu aplikacji."
+#~ "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"
 
@@ -2869,7 +2939,8 @@ msgstr ""
 #~ 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)"
+#~ msgstr ""
+#~ "Zapisuj tagi ID3v1 do plików MP# (tagi ID3v2 będą zawsze zapisywane)"
 
 #~ msgid "Remove track/album"
 #~ msgstr "Usuń"
@@ -2927,8 +2998,8 @@ msgstr ""
 #~ 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. "
+#~ "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. "
diff --git a/po/pt.po b/po/pt.po
index e826b4bf3..64f24e3c6 100644
--- a/po/pt.po
+++ b/po/pt.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: picard\n"
 "Report-Msgid-Bugs-To: http://bugs.musicbrainz.org/\n"
-"POT-Creation-Date: 2009-02-24 18:58+0100\n"
+"POT-Creation-Date: 2009-04-06 22:50+0200\n"
 "PO-Revision-Date: 2009-03-08 19:12+0000\n"
 "Last-Translator: Tiago Silva <Unknown>\n"
 "Language-Team: Portuguese <pt@li.org>\n"
@@ -17,16 +17,16 @@ msgstr ""
 "X-Launchpad-Export-Date: 2009-04-06 20:21+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
-#: ../picard/album.py:108 ../picard/cluster.py:248
+#: ../picard/album.py:109 ../picard/cluster.py:248
 msgid "Unmatched Files"
 msgstr ""
 
-#: ../picard/album.py:281
+#: ../picard/album.py:287
 #, python-format
 msgid "[could not load album %s]"
 msgstr ""
 
-#: ../picard/album.py:317
+#: ../picard/album.py:320
 msgid "[loading album information]"
 msgstr "[a carregar a informação do álbum]"
 
@@ -586,7 +586,7 @@ msgid "Namibia"
 msgstr "Namíbia"
 
 #: ../picard/const.py:182
-msgid "Vanuat"
+msgid "Vanuatu"
 msgstr ""
 
 #: ../picard/const.py:183
@@ -1030,223 +1030,237 @@ msgid "Congo, The Democratic Republic of the"
 msgstr ""
 
 #: ../picard/const.py:293
-msgid "Serbia and Montenegro"
+msgid "Serbia and Montenegro (historical, 2003-2006)"
 msgstr ""
 
 #: ../picard/const.py:294
-msgid "Croatia"
-msgstr ""
+#, fuzzy
+msgid "Serbia"
+msgstr "Geórgia"
 
 #: ../picard/const.py:295
-msgid "Korea (North), Democratic People's Republic of"
+msgid "Montenegro"
 msgstr ""
 
 #: ../picard/const.py:296
-msgid "Korea (South), Republic of"
+msgid "Croatia"
 msgstr ""
 
 #: ../picard/const.py:297
-msgid "Slovakia"
+msgid "Korea (North), Democratic People's Republic of"
 msgstr ""
 
 #: ../picard/const.py:298
-msgid "Soviet Union (historical, 1922-1991)"
+msgid "Korea (South), Republic of"
 msgstr ""
 
 #: ../picard/const.py:299
-msgid "East Timor"
+msgid "Slovakia"
 msgstr ""
 
 #: ../picard/const.py:300
-msgid "Czechoslovakia (historical, 1918-1992)"
+msgid "Soviet Union (historical, 1922-1991)"
 msgstr ""
 
 #: ../picard/const.py:301
-msgid "Europe"
+msgid "East Timor"
 msgstr ""
 
 #: ../picard/const.py:302
-msgid "East Germany (historical, 1949-1990)"
+msgid "Czechoslovakia (historical, 1918-1992)"
 msgstr ""
 
 #: ../picard/const.py:303
-msgid "[Unknown Country]"
+msgid "Europe"
 msgstr ""
 
 #: ../picard/const.py:304
-msgid "[Worldwide]"
+msgid "East Germany (historical, 1949-1990)"
 msgstr ""
 
 #: ../picard/const.py:305
+msgid "[Unknown Country]"
+msgstr ""
+
+#: ../picard/const.py:306
+msgid "[Worldwide]"
+msgstr ""
+
+#: ../picard/const.py:307
 msgid "Yugoslavia (historical, 1918-1992)"
 msgstr ""
 
-#: ../picard/const.py:310
-msgid "Catalan"
-msgstr ""
-
-#: ../picard/const.py:311
-msgid "Czech"
-msgstr "Checo"
-
 #: ../picard/const.py:312
-msgid "Welsh"
+msgid "Afrikaans"
 msgstr ""
 
 #: ../picard/const.py:313
-msgid "Danish"
+msgid "Arabic"
 msgstr ""
 
 #: ../picard/const.py:314
-msgid "German"
-msgstr "Alemão"
+msgid "Catalan"
+msgstr ""
 
 #: ../picard/const.py:315
-msgid "English"
-msgstr "Inglês"
+msgid "Czech"
+msgstr "Checo"
 
 #: ../picard/const.py:316
-msgid "English (Canada)"
+msgid "Welsh"
 msgstr ""
 
 #: ../picard/const.py:317
+msgid "Danish"
+msgstr ""
+
+#: ../picard/const.py:318
+msgid "German"
+msgstr "Alemão"
+
+#: ../picard/const.py:319
+msgid "English"
+msgstr "Inglês"
+
+#: ../picard/const.py:320
+msgid "English (Canada)"
+msgstr ""
+
+#: ../picard/const.py:321
 msgid "English (UK)"
 msgstr "Inglês (UK)"
 
-#: ../picard/const.py:318
+#: ../picard/const.py:322
 msgid "Spanish"
 msgstr "Espanhol"
 
-#: ../picard/const.py:319
+#: ../picard/const.py:323
 msgid "Persian"
 msgstr ""
 
-#: ../picard/const.py:320
+#: ../picard/const.py:324
 msgid "Finnish"
 msgstr "Finlandês"
 
-#: ../picard/const.py:321
+#: ../picard/const.py:325
 msgid "French"
 msgstr "Francês"
 
-#: ../picard/const.py:322
+#: ../picard/const.py:326
 msgid "Frisian"
 msgstr ""
 
-#: ../picard/const.py:323
+#: ../picard/const.py:327
 msgid "Hebrew"
 msgstr ""
 
-#: ../picard/const.py:324
+#: ../picard/const.py:328
+#, fuzzy
+msgid "Hindi"
+msgstr "Índia"
+
+#: ../picard/const.py:329
 msgid "Hungarian"
 msgstr "Húngaro"
 
-#: ../picard/const.py:325
+#: ../picard/const.py:330
 msgid "Islandic"
 msgstr ""
 
-#: ../picard/const.py:326
+#: ../picard/const.py:331
 msgid "Italian"
 msgstr "Italiano"
 
-#: ../picard/const.py:327
+#: ../picard/const.py:332
 msgid "Kannada"
 msgstr ""
 
-#: ../picard/const.py:328
+#: ../picard/const.py:333
 msgid "Korean"
 msgstr "Coreano"
 
-#: ../picard/const.py:329
+#: ../picard/const.py:334
 msgid "Lithuanian"
 msgstr "Lituano"
 
-#: ../picard/const.py:330
+#: ../picard/const.py:335
 msgid "Norwegian Bokmal"
 msgstr "Norueguês Bokmal"
 
-#: ../picard/const.py:331
+#: ../picard/const.py:336
 msgid "Dutch"
 msgstr "Holandês"
 
-#: ../picard/const.py:332
+#: ../picard/const.py:337
 msgid "Polish"
 msgstr ""
 
-#: ../picard/const.py:333
+#: ../picard/const.py:338
 msgid "Portuguese"
 msgstr "Português"
 
-#: ../picard/const.py:334
+#: ../picard/const.py:339
 msgid "Brazilian Portuguese"
 msgstr ""
 
-#: ../picard/const.py:335
+#: ../picard/const.py:340
 msgid "Romanian"
 msgstr "Romeno"
 
-#: ../picard/const.py:336
+#: ../picard/const.py:341
 msgid "Russian"
 msgstr "Russo"
 
-#: ../picard/const.py:337
+#: ../picard/const.py:342
 msgid "Scots"
 msgstr ""
 
-#: ../picard/const.py:338
+#: ../picard/const.py:343
 msgid "Slovak"
 msgstr "Eslovaco"
 
-#: ../picard/const.py:339
+#: ../picard/const.py:344
 msgid "Slovenian"
 msgstr ""
 
-#: ../picard/const.py:340
+#: ../picard/const.py:345
 msgid "Swedish"
 msgstr "Sueco"
 
-#: ../picard/const.py:341
+#: ../picard/const.py:346
+#, fuzzy
+msgid "Turkish"
+msgstr "Turquia"
+
+#: ../picard/const.py:347
 msgid "Chinese"
 msgstr ""
 
-#: ../picard/file.py:487
+#: ../picard/file.py:494
 #, python-format
 msgid "No matching tracks for file %s"
 msgstr ""
 
-#: ../picard/file.py:504
+#: ../picard/file.py:511
 #, python-format
 msgid "No matching tracks above the threshold for file %s"
 msgstr ""
 
-#: ../picard/file.py:507
+#: ../picard/file.py:514
 #, python-format
 msgid "File %s identified!"
 msgstr "Ficheiro %s identificado!"
 
-#: ../picard/file.py:518
+#: ../picard/file.py:525
 #, python-format
 msgid "Looking up the PUID for file %s..."
 msgstr ""
 
-#: ../picard/file.py:523
+#: ../picard/file.py:530
 #, 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 "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)"
@@ -1259,11 +1273,24 @@ msgstr "Lista de Reprodução PLS (*.pls)"
 msgid "XSPF Playlist (*.xspf)"
 msgstr "Lista de Reprodução XSPF (*.xspf)"
 
-#: ../picard/tagger.py:476
+#: ../picard/puidmanager.py:62
+msgid "Submitting PUIDs..."
+msgstr ""
+
+#: ../picard/puidmanager.py:68
+#, python-format
+msgid "PUIDs submission failed: %s"
+msgstr "O envio de PUIDs falhou: %s"
+
+#: ../picard/puidmanager.py:70
+msgid "PUIDs successfully submitted!"
+msgstr "Os PUIDs foram enviados com sucesso!"
+
+#: ../picard/tagger.py:477
 msgid "CD Lookup Error"
 msgstr "Erro ao Procurar CD"
 
-#: ../picard/tagger.py:477
+#: ../picard/tagger.py:478
 #, python-format
 msgid ""
 "Error while reading CD:\n"
@@ -1271,7 +1298,7 @@ msgid ""
 "%s"
 msgstr ""
 
-#: ../picard/tagger.py:503
+#: ../picard/tagger.py:504
 #, python-format
 msgid "Could not find PUID for file %s"
 msgstr ""
@@ -1324,15 +1351,28 @@ msgstr ""
 msgid "Length"
 msgstr ""
 
-#: ../picard/ui/itemviews.py:327
+#: ../picard/ui/itemviews.py:289
+msgid "&Expand all"
+msgstr ""
+
+#: ../picard/ui/itemviews.py:291
+msgid "&Collapse all"
+msgstr ""
+
+#: ../picard/ui/itemviews.py:332
 msgid "&Releases"
 msgstr ""
 
-#: ../picard/ui/itemviews.py:353
+#: ../picard/ui/itemviews.py:349
+#, fuzzy
+msgid "No release event"
+msgstr "Mês de lançamento do álbum"
+
+#: ../picard/ui/itemviews.py:359
 msgid "&Plugins"
 msgstr ""
 
-#: ../picard/ui/itemviews.py:523
+#: ../picard/ui/itemviews.py:533
 msgid "Clusters"
 msgstr ""
 
@@ -1340,95 +1380,6 @@ msgstr ""
 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:66 ../picard/ui/ui_options_plugins.py:62
-msgid "Details"
-msgstr ""
-
-#: ../picard/ui/tageditor.py:71 ../picard/ui/tageditor.py:264
-#, python-format
-msgid "%d file"
-msgid_plural "%d files"
-msgstr[0] ""
-msgstr[1] ""
-
-#: ../picard/ui/tageditor.py:131
-#, python-format
-msgid "(different across %d file)"
-msgid_plural "(different across %d files)"
-msgstr[0] ""
-msgstr[1] ""
-
-#: ../picard/ui/tageditor.py:134
-#, python-format
-msgid "(missing from %d file)"
-msgid_plural "(missing from %d files)"
-msgstr[0] ""
-msgstr[1] ""
-
-#: ../picard/ui/tageditor.py:233
-msgid "Filename:"
-msgstr ""
-
-#: ../picard/ui/tageditor.py:235
-msgid "Format:"
-msgstr ""
-
-#: ../picard/ui/tageditor.py:244
-msgid "Size:"
-msgstr ""
-
-#: ../picard/ui/tageditor.py:248 ../picard/ui/ui_metadata.py:127
-msgid "Length:"
-msgstr ""
-
-#: ../picard/ui/tageditor.py:250
-msgid "Bitrate:"
-msgstr ""
-
-#: ../picard/ui/tageditor.py:252
-msgid "Sample rate:"
-msgstr ""
-
-#: ../picard/ui/tageditor.py:254
-msgid "Bits per sample:"
-msgstr ""
-
-#: ../picard/ui/tageditor.py:257
-msgid "Mono"
-msgstr ""
-
-#: ../picard/ui/tageditor.py:258
-msgid "Stereo"
-msgstr ""
-
-#: ../picard/ui/tageditor.py:260
-msgid "Channels:"
-msgstr ""
-
-#: ../picard/ui/tagsfromfilenames.py:52 ../picard/ui/tagsfromfilenames.py:96
-msgid "File Name"
-msgstr ""
-
 #: ../picard/ui/mainwindow.py:64
 msgid "MusicBrainz Picard"
 msgstr "MusicBrainz Picard"
@@ -1665,6 +1616,10 @@ msgstr ""
 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 ""
@@ -1684,12 +1639,97 @@ msgstr ""
 msgid " (Error: %s)"
 msgstr " (Erro: %s)"
 
+#: ../picard/ui/puidsubmit.py:31 ../picard/ui/options/plugins.py:85
+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/passworddialog.py:38
 #, python-format
 msgid ""
 "The server %s requires you to login. Please enter your username and password."
 msgstr ""
 
+#: ../picard/ui/tageditor.py:66 ../picard/ui/ui_options_plugins.py:62
+msgid "Details"
+msgstr ""
+
+#: ../picard/ui/tageditor.py:71 ../picard/ui/tageditor.py:264
+#, python-format
+msgid "%d file"
+msgid_plural "%d files"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../picard/ui/tageditor.py:131
+#, python-format
+msgid "(different across %d file)"
+msgid_plural "(different across %d files)"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../picard/ui/tageditor.py:134
+#, python-format
+msgid "(missing from %d file)"
+msgid_plural "(missing from %d files)"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../picard/ui/tageditor.py:233
+msgid "Filename:"
+msgstr ""
+
+#: ../picard/ui/tageditor.py:235
+msgid "Format:"
+msgstr ""
+
+#: ../picard/ui/tageditor.py:244
+msgid "Size:"
+msgstr ""
+
+#: ../picard/ui/tageditor.py:248 ../picard/ui/ui_metadata.py:127
+msgid "Length:"
+msgstr ""
+
+#: ../picard/ui/tageditor.py:250
+msgid "Bitrate:"
+msgstr ""
+
+#: ../picard/ui/tageditor.py:252
+msgid "Sample rate:"
+msgstr ""
+
+#: ../picard/ui/tageditor.py:254
+msgid "Bits per sample:"
+msgstr ""
+
+#: ../picard/ui/tageditor.py:257
+msgid "Mono"
+msgstr ""
+
+#: ../picard/ui/tageditor.py:258
+msgid "Stereo"
+msgstr ""
+
+#: ../picard/ui/tageditor.py:260
+msgid "Channels:"
+msgstr ""
+
+#: ../picard/ui/tagsfromfilenames.py:54 ../picard/ui/tagsfromfilenames.py:99
+msgid "File Name"
+msgstr ""
+
 #: ../picard/ui/ui_cdlookup.py:60 ../picard/ui/ui_options_cdlookup.py:47
 #: ../picard/ui/ui_options_cdlookup_select.py:48
 #: ../picard/ui/options/cdlookup.py:36
@@ -1712,24 +1752,6 @@ msgstr ""
 msgid "Cancel"
 msgstr "Cancelar"
 
-#: ../picard/ui/ui_passworddialog.py:78
-msgid "Authentication required"
-msgstr ""
-
-#: ../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"
-msgstr ""
-
 #: ../picard/ui/ui_edittagdialog.py:44
 msgid "Edit Tag"
 msgstr ""
@@ -1766,6 +1788,10 @@ msgstr ""
 msgid "Options"
 msgstr "Opções"
 
+#: ../picard/ui/ui_puidsubmit.py:52
+msgid "Submit PUIDs"
+msgstr "Enviar PUIDs"
+
 #: ../picard/ui/ui_options_cdlookup.py:48
 msgid "CD-ROM device to use for lookups:"
 msgstr ""
@@ -1790,6 +1816,22 @@ msgstr "Salvar as imagens de capas como ficheiros separados"
 msgid "Overwrite the file if it already exists"
 msgstr ""
 
+#: ../picard/ui/ui_options_moving.py:53
+msgid "Move additional files:"
+msgstr ""
+
+#: ../picard/ui/ui_options_moving.py:54
+msgid "Browse..."
+msgstr ""
+
+#: ../picard/ui/ui_options_moving.py:55
+msgid "Delete empty directories"
+msgstr ""
+
+#: ../picard/ui/ui_options_moving.py:56
+msgid "Move files to this directory when saving:"
+msgstr ""
+
 #: ../picard/ui/util.py:31
 msgid "&Ok"
 msgstr ""
@@ -1798,44 +1840,40 @@ msgstr ""
 msgid "&Cancel"
 msgstr ""
 
-#: ../picard/ui/ui_puidsubmit.py:52
-msgid "Submit PUIDs"
-msgstr "Enviar PUIDs"
-
-#: ../picard/ui/ui_tageditor.py:139 ../picard/ui/ui_options_plugins.py:59
-#: ../picard/ui/options/plugins.py:76
+#: ../picard/ui/ui_tageditor.py:128 ../picard/ui/ui_options_plugins.py:59
+#: ../picard/ui/options/plugins.py:81
 msgid "Name"
 msgstr ""
 
-#: ../picard/ui/ui_tageditor.py:140
+#: ../picard/ui/ui_tageditor.py:129
 msgid "Value"
 msgstr ""
 
-#: ../picard/ui/ui_tageditor.py:141
+#: ../picard/ui/ui_tageditor.py:130
 msgid "Rating:"
 msgstr ""
 
-#: ../picard/ui/ui_tageditor.py:142
+#: ../picard/ui/ui_tageditor.py:131
 msgid "&Add..."
 msgstr ""
 
-#: ../picard/ui/ui_tageditor.py:143
+#: ../picard/ui/ui_tageditor.py:132
 msgid "&Edit..."
 msgstr ""
 
-#: ../picard/ui/ui_tageditor.py:144
+#: ../picard/ui/ui_tageditor.py:133
 msgid "&Delete"
 msgstr ""
 
-#: ../picard/ui/ui_tageditor.py:145
+#: ../picard/ui/ui_tageditor.py:134
 msgid "&Metadata"
 msgstr ""
 
-#: ../picard/ui/ui_tageditor.py:146
+#: ../picard/ui/ui_tageditor.py:135
 msgid "A&rtwork"
 msgstr ""
 
-#: ../picard/ui/ui_tageditor.py:147
+#: ../picard/ui/ui_tageditor.py:136
 msgid "&Info"
 msgstr ""
 
@@ -1880,6 +1918,40 @@ msgstr ""
 msgid ", "
 msgstr ""
 
+#: ../picard/ui/ui_options_general.py:108
+msgid "MusicBrainz Server"
+msgstr ""
+
+#: ../picard/ui/ui_options_general.py:109 ../picard/ui/ui_options_proxy.py:72
+msgid "Port:"
+msgstr "Porto:"
+
+#: ../picard/ui/ui_options_general.py:110 ../picard/ui/ui_options_proxy.py:73
+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:112 ../picard/ui/ui_options_proxy.py:70
+#: ../picard/ui/ui_passworddialog.py:80
+msgid "Password:"
+msgstr "Senha:"
+
+#: ../picard/ui/ui_options_general.py:113 ../picard/ui/ui_options_proxy.py:71
+#: ../picard/ui/ui_passworddialog.py:79
+msgid "Username:"
+msgstr "Nome de Utilizador:"
+
+#: ../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 ""
+
 #: ../picard/ui/ui_options_interface.py:50
 msgid "Miscellaneous"
 msgstr ""
@@ -1900,113 +1972,6 @@ msgstr ""
 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 "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_options_naming.py:180
-#: ../picard/ui/ui_tagsfromfilenames.py:58
-msgid "&Preview"
-msgstr ""
-
-#: ../picard/ui/ui_options_proxy.py:81 ../picard/ui/options/proxy.py:28
-msgid "Web Proxy"
-msgstr "Proxy Web"
-
-#: ../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_options_ratings.py:45
-msgid "Enable track ratings"
-msgstr ""
-
-#: ../picard/ui/ui_options_ratings.py:46
-msgid ""
-"Picard saves the ratings together with an e-mail address identifying the "
-"user who did the rating. That way different ratings for different users can "
-"be stored in the files. Please sepcify the e-mail you want to use to save "
-"your ratings."
-msgstr ""
-
-#: ../picard/ui/ui_options_ratings.py:47
-msgid "E-mail:"
-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 ../picard/ui/options/general.py:29
-msgid "General"
-msgstr "Geral"
-
-#: ../picard/ui/ui_options_general.py:115
-msgid "Automatically scan all new files"
-msgstr ""
-
 #: ../picard/ui/ui_options_matching.py:105
 msgid "Thresholds"
 msgstr ""
@@ -2063,72 +2028,147 @@ msgstr "Vários artistas:"
 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
+#: ../picard/ui/ui_options_metadata.py:109
+#: ../picard/ui/ui_options_metadata.py:110
+#: ../picard/ui/ui_options_renaming.py:155
+#: ../picard/ui/ui_options_renaming.py:158
+msgid "Default"
+msgstr "Por omissão"
+
+#: ../picard/ui/ui_options_plugins.py:58 ../picard/ui/options/plugins.py:34
 msgid "Plugins"
 msgstr ""
 
-#: ../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:84
 msgid "Author"
 msgstr ""
 
-#: ../picard/ui/ui_options_plugins.py:61 ../picard/util/tags.py:36
+#: ../picard/ui/ui_options_plugins.py:61 ../picard/util/tags.py:37
 msgid "Version"
 msgstr ""
 
-#: ../picard/ui/ui_options_script.py:52
+#: ../picard/ui/ui_options_proxy.py:69 ../picard/ui/options/proxy.py:28
+msgid "Web Proxy"
+msgstr "Proxy Web"
+
+#: ../picard/ui/ui_options_ratings.py:45
+msgid "Enable track ratings"
+msgstr ""
+
+#: ../picard/ui/ui_options_ratings.py:46
+msgid ""
+"Picard saves the ratings together with an e-mail address identifying the "
+"user who did the rating. That way different ratings for different users can "
+"be stored in the files. Please sepcify the e-mail you want to use to save "
+"your ratings."
+msgstr ""
+
+#: ../picard/ui/ui_options_ratings.py:47
+msgid "E-mail:"
+msgstr ""
+
+#: ../picard/ui/ui_options_renaming.py:145
+#, fuzzy
+msgid "Form"
+msgstr "Formato"
+
+#: ../picard/ui/ui_options_renaming.py:146
+#, fuzzy
+msgid "Rename files when saving"
+msgstr "Renomear ficheiros ao escrever as etiquetas de metadados"
+
+#: ../picard/ui/ui_options_renaming.py:147
+msgid "Replace non-ASCII characters"
+msgstr ""
+
+#: ../picard/ui/ui_options_renaming.py:148
+msgid "Replace Windows-incompatible characters"
+msgstr ""
+
+#: ../picard/ui/ui_options_renaming.py:149
+msgid "Name files like this"
+msgstr ""
+
+#: ../picard/ui/ui_options_renaming.py:156
+msgid "Name multiple artist albums differently"
+msgstr ""
+
+#: ../picard/ui/ui_options_renaming.py:157
+msgid "Copy from above"
+msgstr ""
+
+#: ../picard/ui/ui_options_renaming.py:159
+msgid "Examples"
+msgstr ""
+
+#: ../picard/ui/ui_options_script.py:43
 msgid "Tagger Script"
 msgstr ""
 
-#: ../picard/ui/ui_options_tags.py:85
-msgid "Common"
+#: ../picard/ui/ui_options_tags.py:97
+msgid "Do not write tags to files"
 msgstr ""
 
-#: ../picard/ui/ui_options_tags.py:86
-msgid "Clear existing tags before writing new tags"
+#: ../picard/ui/ui_options_tags.py:98
+msgid "Before tagging"
+msgstr ""
+
+#: ../picard/ui/ui_options_tags.py:99
+#, fuzzy
+msgid "Clear existing tags"
 msgstr "Limpar etiquetas existentes antes de escrever as novas etiquetas"
 
-#: ../picard/ui/ui_options_tags.py:87
-msgid "Don not write tags to files"
-msgstr ""
-
-#: ../picard/ui/ui_options_tags.py:88
-msgid "ID3"
-msgstr ""
-
-#: ../picard/ui/ui_options_tags.py:89
-msgid "Write ID3v1 tags to the files"
-msgstr ""
-
-#: ../picard/ui/ui_options_tags.py:90
-msgid "Write ID3v2 version 2.3 tags (2.4 is default)"
-msgstr "Escrever etiquetas ID3v2 versão 2.3 (2.4 é a versão por omissão)"
-
-#: ../picard/ui/ui_options_tags.py:91
-msgid "Text encoding to use while writing ID3v2 tags:"
-msgstr ""
-
-#: ../picard/ui/ui_options_tags.py:92
-msgid "ISO-8859-1"
-msgstr ""
-
-#: ../picard/ui/ui_options_tags.py:93
-msgid "UTF-16"
-msgstr ""
-
-#: ../picard/ui/ui_options_tags.py:94
-msgid "UTF-8"
-msgstr ""
-
-#: ../picard/ui/ui_options_tags.py:95
+#: ../picard/ui/ui_options_tags.py:100
 msgid "Remove ID3 tags from FLAC files"
 msgstr ""
 
-#: ../picard/ui/ui_options_tags.py:96
-msgid "APE"
+#: ../picard/ui/ui_options_tags.py:101
+msgid "Remove APEv2 tags from MP3 files"
 msgstr ""
 
-#: ../picard/ui/ui_options_tags.py:97
-msgid "Remove APEv2 tags from MP3 files"
+#: ../picard/ui/ui_options_tags.py:102
+msgid "Tag compatibility"
+msgstr ""
+
+#: ../picard/ui/ui_options_tags.py:103
+#, fuzzy
+msgid "ID3v2 version"
+msgstr "ID3v2.4 apenas"
+
+#: ../picard/ui/ui_options_tags.py:104
+msgid "2.4"
+msgstr ""
+
+#: ../picard/ui/ui_options_tags.py:105
+msgid "2.3"
+msgstr ""
+
+#: ../picard/ui/ui_options_tags.py:106
+msgid "Also include ID3v1 tags in the files"
+msgstr ""
+
+#: ../picard/ui/ui_options_tags.py:107
+msgid "ID3v2 text encoding"
+msgstr ""
+
+#: ../picard/ui/ui_options_tags.py:108
+msgid "UTF-8"
+msgstr ""
+
+#: ../picard/ui/ui_options_tags.py:109
+msgid "UTF-16"
+msgstr ""
+
+#: ../picard/ui/ui_options_tags.py:110
+msgid "ISO-8859-1"
+msgstr ""
+
+#: ../picard/ui/ui_passworddialog.py:78
+msgid "Authentication required"
+msgstr ""
+
+#: ../picard/ui/ui_passworddialog.py:81
+msgid "Save username and password"
 msgstr ""
 
 #: ../picard/ui/ui_tagsfromfilenames.py:56
@@ -2139,6 +2179,10 @@ msgstr ""
 msgid "Replace underscores with spaces"
 msgstr ""
 
+#: ../picard/ui/ui_tagsfromfilenames.py:58
+msgid "&Preview"
+msgstr ""
+
 #: ../picard/ui/options/about.py:29
 msgid "About"
 msgstr "Sobre"
@@ -2168,8 +2212,8 @@ 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"
@@ -2177,14 +2221,13 @@ msgid ""
 "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\"><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/P"
-"icardTagger</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
@@ -2217,42 +2260,45 @@ msgstr ""
 msgid "None"
 msgstr ""
 
-#: ../picard/ui/options/naming.py:33
-msgid "File Naming"
-msgstr ""
+#: ../picard/ui/options/moving.py:33
+#, fuzzy
+msgid "Moving files"
+msgstr "Opção mover ficheiros"
 
-#: ../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 ""
-
-#: ../picard/ui/options/naming.py:95
-msgid "The multiple artist file naming format must not be empty."
-msgstr ""
-
-#: ../picard/ui/options/naming.py:97
+#: ../picard/ui/options/moving.py:65
 msgid "Error"
 msgstr ""
 
-#: ../picard/ui/options/naming.py:97
+#: ../picard/ui/options/moving.py:65
 msgid "The location to move files to must not be empty."
 msgstr ""
 
-#: ../picard/ui/options/scripting.py:63
-msgid "Scripting"
+#: ../picard/ui/options/ratings.py:29
+msgid "Ratings"
 msgstr ""
 
 #: ../picard/ui/options/tags.py:29
 msgid "Tags"
 msgstr "Etiquetas"
 
-#: ../picard/ui/options/ratings.py:29
-msgid "Ratings"
+#: ../picard/ui/options/renaming.py:35
+msgid "File naming"
+msgstr ""
+
+#: ../picard/ui/options/renaming.py:123
+msgid "The file naming format must not be empty."
+msgstr ""
+
+#: ../picard/ui/options/renaming.py:133
+msgid "The multiple artist file naming format must not be empty."
+msgstr ""
+
+#: ../picard/ui/options/scripting.py:63
+msgid "Scripting"
+msgstr ""
+
+#: ../picard/ui/options/scripting.py:97
+msgid "Script Error"
 msgstr ""
 
 #: ../picard/util/tags.py:24
@@ -2260,214 +2306,219 @@ msgid "Date"
 msgstr ""
 
 #: ../picard/util/tags.py:25
+#, fuzzy
+msgid "Original Release Date"
+msgstr "Data de lançamento"
+
+#: ../picard/util/tags.py:26
 msgid "Album Artist"
 msgstr ""
 
-#: ../picard/util/tags.py:26
+#: ../picard/util/tags.py:27
 msgid "Track Number"
 msgstr ""
 
-#: ../picard/util/tags.py:27
+#: ../picard/util/tags.py:28
 msgid "Total Tracks"
 msgstr ""
 
-#: ../picard/util/tags.py:28
+#: ../picard/util/tags.py:29
 msgid "Disc Number"
 msgstr ""
 
-#: ../picard/util/tags.py:29
+#: ../picard/util/tags.py:30
 msgid "Total Discs"
 msgstr ""
 
-#: ../picard/util/tags.py:30
+#: ../picard/util/tags.py:31
 msgid "Album Artist Sort Order"
 msgstr ""
 
-#: ../picard/util/tags.py:31
+#: ../picard/util/tags.py:32
 msgid "Artist Sort Order"
 msgstr ""
 
-#: ../picard/util/tags.py:32
+#: ../picard/util/tags.py:33
 msgid "Title Sort Order"
 msgstr ""
 
-#: ../picard/util/tags.py:33
+#: ../picard/util/tags.py:34
 msgid "Album Sort Order"
 msgstr ""
 
-#: ../picard/util/tags.py:34
+#: ../picard/util/tags.py:35
 msgid "ASIN"
 msgstr ""
 
-#: ../picard/util/tags.py:35
+#: ../picard/util/tags.py:36
 msgid "Grouping"
 msgstr ""
 
-#: ../picard/util/tags.py:37
+#: ../picard/util/tags.py:38
 msgid "ISRC"
 msgstr ""
 
-#: ../picard/util/tags.py:38
+#: ../picard/util/tags.py:39
 msgid "Mood"
 msgstr ""
 
-#: ../picard/util/tags.py:39
+#: ../picard/util/tags.py:40
 msgid "BPM"
 msgstr ""
 
-#: ../picard/util/tags.py:40
+#: ../picard/util/tags.py:41
 msgid "Copyright"
 msgstr ""
 
-#: ../picard/util/tags.py:41
+#: ../picard/util/tags.py:42
 msgid "Composer"
 msgstr ""
 
-#: ../picard/util/tags.py:42
+#: ../picard/util/tags.py:43
 msgid "Conductor"
 msgstr ""
 
-#: ../picard/util/tags.py:43
+#: ../picard/util/tags.py:44
 msgid "Lyricist"
 msgstr ""
 
-#: ../picard/util/tags.py:44
+#: ../picard/util/tags.py:45
 msgid "Arranger"
 msgstr ""
 
-#: ../picard/util/tags.py:45
+#: ../picard/util/tags.py:46
 msgid "Producer"
 msgstr ""
 
-#: ../picard/util/tags.py:46
+#: ../picard/util/tags.py:47
 msgid "Engineer"
 msgstr ""
 
-#: ../picard/util/tags.py:47
+#: ../picard/util/tags.py:48
 msgid "Subtitle"
 msgstr ""
 
-#: ../picard/util/tags.py:48
+#: ../picard/util/tags.py:49
 msgid "Disc Subtitle"
 msgstr ""
 
-#: ../picard/util/tags.py:49
+#: ../picard/util/tags.py:50
 msgid "Remixer"
 msgstr ""
 
-#: ../picard/util/tags.py:50
+#: ../picard/util/tags.py:51
 msgid "MusicBrainz Track Id"
 msgstr ""
 
-#: ../picard/util/tags.py:51
+#: ../picard/util/tags.py:52
 msgid "MusicBrainz Release Id"
 msgstr ""
 
-#: ../picard/util/tags.py:52
+#: ../picard/util/tags.py:53
 msgid "MusicBrainz Artist Id"
 msgstr ""
 
-#: ../picard/util/tags.py:53
+#: ../picard/util/tags.py:54
 msgid "MusicBrainz Release Artist Id"
 msgstr ""
 
-#: ../picard/util/tags.py:54
+#: ../picard/util/tags.py:55
 msgid "MusicBrainz TRM Id"
 msgstr ""
 
-#: ../picard/util/tags.py:55
+#: ../picard/util/tags.py:56
 msgid "MusicBrainz Disc Id"
 msgstr ""
 
-#: ../picard/util/tags.py:56
+#: ../picard/util/tags.py:57
 msgid "MusicBrainz Sort Name"
 msgstr ""
 
-#: ../picard/util/tags.py:57
+#: ../picard/util/tags.py:58
 msgid "MusicIP PUID"
 msgstr ""
 
-#: ../picard/util/tags.py:58
+#: ../picard/util/tags.py:59
 msgid "MusicIP Fingerprint"
 msgstr ""
 
-#: ../picard/util/tags.py:59
+#: ../picard/util/tags.py:60
 msgid "Disc Id"
 msgstr ""
 
-#: ../picard/util/tags.py:60
+#: ../picard/util/tags.py:61
 msgid "Website"
 msgstr ""
 
-#: ../picard/util/tags.py:61
+#: ../picard/util/tags.py:62
 msgid "Compilation"
 msgstr "Compilação"
 
-#: ../picard/util/tags.py:62
+#: ../picard/util/tags.py:63
 msgid "Comment"
 msgstr "Comentário"
 
-#: ../picard/util/tags.py:63
+#: ../picard/util/tags.py:64
 msgid "Genre"
 msgstr ""
 
-#: ../picard/util/tags.py:64
+#: ../picard/util/tags.py:65
 msgid "Encoded By"
 msgstr ""
 
-#: ../picard/util/tags.py:65
+#: ../picard/util/tags.py:66
 msgid "Performer"
 msgstr ""
 
-#: ../picard/util/tags.py:66
+#: ../picard/util/tags.py:67
 msgid "Release Type"
 msgstr ""
 
-#: ../picard/util/tags.py:67
+#: ../picard/util/tags.py:68
 msgid "Release Status"
 msgstr ""
 
-#: ../picard/util/tags.py:68
+#: ../picard/util/tags.py:69
 msgid "Release Country"
 msgstr ""
 
-#: ../picard/util/tags.py:69
+#: ../picard/util/tags.py:70
 msgid "Record Label"
 msgstr ""
 
-#: ../picard/util/tags.py:70
+#: ../picard/util/tags.py:71
 msgid "Barcode"
 msgstr ""
 
-#: ../picard/util/tags.py:71
+#: ../picard/util/tags.py:72
 msgid "Catalog Number"
 msgstr ""
 
-#: ../picard/util/tags.py:72
+#: ../picard/util/tags.py:73
 msgid "Format"
 msgstr "Formato"
 
-#: ../picard/util/tags.py:73
+#: ../picard/util/tags.py:74
 msgid "DJ-Mixer"
 msgstr ""
 
-#: ../picard/util/tags.py:74
+#: ../picard/util/tags.py:75
 msgid "Media"
 msgstr ""
 
-#: ../picard/util/tags.py:75
+#: ../picard/util/tags.py:76
 msgid "Lyrics"
 msgstr "Letras"
 
-#: ../picard/util/tags.py:76
+#: ../picard/util/tags.py:77
 msgid "Mixer"
 msgstr ""
 
-#: ../picard/util/tags.py:77
+#: ../picard/util/tags.py:78
 msgid "Language"
 msgstr "Idioma"
 
-#: ../picard/util/tags.py:78
+#: ../picard/util/tags.py:79
 msgid "Script"
 msgstr ""
 
@@ -2483,12 +2534,15 @@ msgid ""
 "%s"
 msgstr ""
 
+#~ msgid "Write ID3v2 version 2.3 tags (2.4 is default)"
+#~ msgstr "Escrever etiquetas ID3v2 versão 2.3 (2.4 é a versão por omissão)"
+
 #~ msgid "New Version"
 #~ msgstr "Nova Versão"
 
-#, python-format
 #~ msgid ""
-#~ "New version of Picard is available (%s). Would you like to download it now?"
+#~ "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?"
 
@@ -2618,9 +2672,6 @@ msgstr ""
 #~ 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"
 
@@ -2639,9 +2690,6 @@ msgstr ""
 #~ msgid "Proxy port"
 #~ msgstr "Porto proxy"
 
-#~ msgid "ID3v2.4 only"
-#~ msgstr "ID3v2.4 apenas"
-
 #~ msgid "Save track/album"
 #~ msgstr "Salvar faixa/álbum"
 
@@ -2676,15 +2724,16 @@ msgstr ""
 #~ 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"
-#~ "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. "
+#~ "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 ""
 #~ "Voçê não especificou um nome de utilizador e senha. De modo a contribuir "
 #~ "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. "
+#~ "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."
@@ -2708,7 +2757,8 @@ msgstr ""
 #~ 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."
+#~ "Please fix the move option or the destination directory option and try "
+#~ "again."
 #~ msgstr ""
 #~ "A opção de mover ficheiros está activada, mas a directoria de destino não "
 #~ "foi especificada ou é inválida.\n"
@@ -2716,9 +2766,9 @@ msgstr ""
 #~ "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 click the "
-#~ "track and select 'Clear Error'"
+#~ "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 ""
 #~ "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 "
@@ -2736,9 +2786,6 @@ msgstr ""
 #~ msgid "Drag files from below"
 #~ msgstr "Arraste ficheiros debaixo"
 
-#~ msgid "Release date"
-#~ msgstr "Data de lançamento"
-
 #~ msgid "%d%% similar"
 #~ msgstr "%d%% similar"
 
@@ -2746,13 +2793,15 @@ msgstr ""
 #~ msgstr "Por favor contribua ao MusicBrainz!"
 
 #~ msgid ""
-#~ "The destination directory %s does not exist. Please pick a valid directory."
+#~ "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"
+#~ 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"
@@ -2767,9 +2816,6 @@ msgstr ""
 #~ 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"
 
@@ -2788,7 +2834,8 @@ msgstr ""
 
 #~ msgid "Automatically select PUID collision tracks that are at least"
 #~ msgstr ""
-#~ "Seleccionar automaticamente faixas com uma colisão PUID que sejam pelo menos"
+#~ "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 ""
@@ -2838,9 +2885,6 @@ msgstr ""
 #~ 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"
 
@@ -2851,8 +2895,8 @@ msgstr ""
 #~ 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. "
+#~ "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. "
diff --git a/po/pt_BR.po b/po/pt_BR.po
index b36c5bf84..4572ba7a0 100644
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: picard\n"
 "Report-Msgid-Bugs-To: http://bugs.musicbrainz.org/\n"
-"POT-Creation-Date: 2009-02-24 18:58+0100\n"
+"POT-Creation-Date: 2009-04-06 22:50+0200\n"
 "PO-Revision-Date: 2009-04-02 02:27+0000\n"
 "Last-Translator: Rosiney Gomes Pereira <rosiney.gp@gmail.com>\n"
 "Language-Team: Portuguese (Brazil) <pt_BR@li.org>\n"
@@ -18,16 +18,16 @@ msgstr ""
 "X-Launchpad-Export-Date: 2009-04-06 20:21+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
-#: ../picard/album.py:108 ../picard/cluster.py:248
+#: ../picard/album.py:109 ../picard/cluster.py:248
 msgid "Unmatched Files"
 msgstr "Arquivos não identificados"
 
-#: ../picard/album.py:281
+#: ../picard/album.py:287
 #, python-format
 msgid "[could not load album %s]"
 msgstr "[não foi possível carregar o álbum %s]"
 
-#: ../picard/album.py:317
+#: ../picard/album.py:320
 msgid "[loading album information]"
 msgstr "[carregando informações do álbum]"
 
@@ -587,7 +587,8 @@ msgid "Namibia"
 msgstr "Namibia"
 
 #: ../picard/const.py:182
-msgid "Vanuat"
+#, fuzzy
+msgid "Vanuatu"
 msgstr "Vanuat"
 
 #: ../picard/const.py:183
@@ -1031,223 +1032,239 @@ msgid "Congo, The Democratic Republic of the"
 msgstr "Congo, República Democrática do"
 
 #: ../picard/const.py:293
-msgid "Serbia and Montenegro"
+#, fuzzy
+msgid "Serbia and Montenegro (historical, 2003-2006)"
 msgstr "Sérvia e Montenegro"
 
 #: ../picard/const.py:294
+#, fuzzy
+msgid "Serbia"
+msgstr "Azerbaijão"
+
+#: ../picard/const.py:295
+#, fuzzy
+msgid "Montenegro"
+msgstr "Sérvia e Montenegro"
+
+#: ../picard/const.py:296
 msgid "Croatia"
 msgstr "Croácia"
 
-#: ../picard/const.py:295
+#: ../picard/const.py:297
 msgid "Korea (North), Democratic People's Republic of"
 msgstr "Coreia (Norte), República das Pessoas Democraticas da"
 
-#: ../picard/const.py:296
+#: ../picard/const.py:298
 msgid "Korea (South), Republic of"
 msgstr "Coreia (sul), República da"
 
-#: ../picard/const.py:297
+#: ../picard/const.py:299
 msgid "Slovakia"
 msgstr "Eslováquia"
 
-#: ../picard/const.py:298
+#: ../picard/const.py:300
 msgid "Soviet Union (historical, 1922-1991)"
 msgstr "União Soviética (Histórica, 1922-1991)"
 
-#: ../picard/const.py:299
+#: ../picard/const.py:301
 msgid "East Timor"
 msgstr "Timor Leste"
 
-#: ../picard/const.py:300
+#: ../picard/const.py:302
 msgid "Czechoslovakia (historical, 1918-1992)"
 msgstr "Checoslováquia (Historica, 1918-1992)"
 
-#: ../picard/const.py:301
+#: ../picard/const.py:303
 msgid "Europe"
 msgstr "Europa"
 
-#: ../picard/const.py:302
+#: ../picard/const.py:304
 msgid "East Germany (historical, 1949-1990)"
 msgstr "Alemanha Oriental (Histórica, 1949-1990)"
 
-#: ../picard/const.py:303
+#: ../picard/const.py:305
 msgid "[Unknown Country]"
 msgstr "[País Desconhecido]"
 
-#: ../picard/const.py:304
+#: ../picard/const.py:306
 msgid "[Worldwide]"
 msgstr "[Mundialmente]"
 
-#: ../picard/const.py:305
+#: ../picard/const.py:307
 msgid "Yugoslavia (historical, 1918-1992)"
 msgstr "Jugoslávia (Histórica, 1918-1992)"
 
-#: ../picard/const.py:310
+#: ../picard/const.py:312
+msgid "Afrikaans"
+msgstr ""
+
+#: ../picard/const.py:313
+msgid "Arabic"
+msgstr ""
+
+#: ../picard/const.py:314
 msgid "Catalan"
 msgstr "Catalão"
 
-#: ../picard/const.py:311
+#: ../picard/const.py:315
 msgid "Czech"
 msgstr "Tcheco"
 
-#: ../picard/const.py:312
+#: ../picard/const.py:316
 msgid "Welsh"
 msgstr "Galês"
 
-#: ../picard/const.py:313
+#: ../picard/const.py:317
 msgid "Danish"
 msgstr "Dinamarquês"
 
-#: ../picard/const.py:314
+#: ../picard/const.py:318
 msgid "German"
 msgstr "Alemão"
 
-#: ../picard/const.py:315
+#: ../picard/const.py:319
 msgid "English"
 msgstr "Inglês"
 
-#: ../picard/const.py:316
+#: ../picard/const.py:320
 msgid "English (Canada)"
 msgstr "Inglês (Canadá)"
 
-#: ../picard/const.py:317
+#: ../picard/const.py:321
 msgid "English (UK)"
 msgstr "Inglês Britânico"
 
-#: ../picard/const.py:318
+#: ../picard/const.py:322
 msgid "Spanish"
 msgstr "Espanhol"
 
-#: ../picard/const.py:319
+#: ../picard/const.py:323
 msgid "Persian"
 msgstr "Persa"
 
-#: ../picard/const.py:320
+#: ../picard/const.py:324
 msgid "Finnish"
 msgstr "Finlandês"
 
-#: ../picard/const.py:321
+#: ../picard/const.py:325
 msgid "French"
 msgstr "Francês"
 
-#: ../picard/const.py:322
+#: ../picard/const.py:326
 msgid "Frisian"
 msgstr "Frísio"
 
-#: ../picard/const.py:323
+#: ../picard/const.py:327
 msgid "Hebrew"
 msgstr "Hebreu"
 
-#: ../picard/const.py:324
+#: ../picard/const.py:328
+#, fuzzy
+msgid "Hindi"
+msgstr "Haiti"
+
+#: ../picard/const.py:329
 msgid "Hungarian"
 msgstr "Húngaro"
 
-#: ../picard/const.py:325
+#: ../picard/const.py:330
 msgid "Islandic"
 msgstr "Islandic"
 
-#: ../picard/const.py:326
+#: ../picard/const.py:331
 msgid "Italian"
 msgstr "Italiano"
 
-#: ../picard/const.py:327
+#: ../picard/const.py:332
 msgid "Kannada"
 msgstr "Kannada"
 
-#: ../picard/const.py:328
+#: ../picard/const.py:333
 msgid "Korean"
 msgstr "Coreano"
 
-#: ../picard/const.py:329
+#: ../picard/const.py:334
 msgid "Lithuanian"
 msgstr "Lituano"
 
-#: ../picard/const.py:330
+#: ../picard/const.py:335
 msgid "Norwegian Bokmal"
 msgstr "Norueguês (Bokmal)"
 
-#: ../picard/const.py:331
+#: ../picard/const.py:336
 msgid "Dutch"
 msgstr "Holandês"
 
-#: ../picard/const.py:332
+#: ../picard/const.py:337
 msgid "Polish"
 msgstr "Polonês"
 
-#: ../picard/const.py:333
+#: ../picard/const.py:338
 msgid "Portuguese"
 msgstr "Português"
 
-#: ../picard/const.py:334
+#: ../picard/const.py:339
 msgid "Brazilian Portuguese"
 msgstr "Português brasileiro"
 
-#: ../picard/const.py:335
+#: ../picard/const.py:340
 msgid "Romanian"
 msgstr "Romeno"
 
-#: ../picard/const.py:336
+#: ../picard/const.py:341
 msgid "Russian"
 msgstr "Russo"
 
-#: ../picard/const.py:337
+#: ../picard/const.py:342
 msgid "Scots"
 msgstr "Escocês"
 
-#: ../picard/const.py:338
+#: ../picard/const.py:343
 msgid "Slovak"
 msgstr "Eslovaco"
 
-#: ../picard/const.py:339
+#: ../picard/const.py:344
 msgid "Slovenian"
 msgstr "Esloveno"
 
-#: ../picard/const.py:340
+#: ../picard/const.py:345
 msgid "Swedish"
 msgstr "Sueco"
 
-#: ../picard/const.py:341
+#: ../picard/const.py:346
+#, fuzzy
+msgid "Turkish"
+msgstr "Turcomenistão"
+
+#: ../picard/const.py:347
 msgid "Chinese"
 msgstr "Chinês"
 
-#: ../picard/file.py:487
+#: ../picard/file.py:494
 #, python-format
 msgid "No matching tracks for file %s"
 msgstr "Nenhuma faixa identificada para o arquivo %s"
 
-#: ../picard/file.py:504
+#: ../picard/file.py:511
 #, python-format
 msgid "No matching tracks above the threshold for file %s"
 msgstr ""
 
-#: ../picard/file.py:507
+#: ../picard/file.py:514
 #, python-format
 msgid "File %s identified!"
 msgstr "Arquivo %s identificado!"
 
-#: ../picard/file.py:518
+#: ../picard/file.py:525
 #, python-format
 msgid "Looking up the PUID for file %s..."
 msgstr "Procurando o PUID do arquivo %s..."
 
-#: ../picard/file.py:523
+#: ../picard/file.py:530
 #, 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)"
@@ -1260,11 +1277,24 @@ msgstr "Lista de reprodução PLS (*.pls)"
 msgid "XSPF Playlist (*.xspf)"
 msgstr "Lista de reprodução XSPF (*.xspf)"
 
-#: ../picard/tagger.py:476
+#: ../picard/puidmanager.py:62
+msgid "Submitting PUIDs..."
+msgstr "Enviando PUIDs..."
+
+#: ../picard/puidmanager.py:68
+#, python-format
+msgid "PUIDs submission failed: %s"
+msgstr "Falha ao enviar PUIDs: %s"
+
+#: ../picard/puidmanager.py:70
+msgid "PUIDs successfully submitted!"
+msgstr "PUIDs enviados com sucesso!"
+
+#: ../picard/tagger.py:477
 msgid "CD Lookup Error"
 msgstr "Erro ao procurar CD"
 
-#: ../picard/tagger.py:477
+#: ../picard/tagger.py:478
 #, python-format
 msgid ""
 "Error while reading CD:\n"
@@ -1275,7 +1305,7 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../picard/tagger.py:503
+#: ../picard/tagger.py:504
 #, python-format
 msgid "Could not find PUID for file %s"
 msgstr "Não foi possível encontrar um PUID para o arquivo %s"
@@ -1328,15 +1358,28 @@ msgstr "Mostrar arquivos &ocultos"
 msgid "Length"
 msgstr "Duração"
 
-#: ../picard/ui/itemviews.py:327
+#: ../picard/ui/itemviews.py:289
+msgid "&Expand all"
+msgstr ""
+
+#: ../picard/ui/itemviews.py:291
+msgid "&Collapse all"
+msgstr ""
+
+#: ../picard/ui/itemviews.py:332
 msgid "&Releases"
 msgstr "&Lançamentos"
 
-#: ../picard/ui/itemviews.py:353
+#: ../picard/ui/itemviews.py:349
+#, fuzzy
+msgid "No release event"
+msgstr "Mês de lançamento do álbum"
+
+#: ../picard/ui/itemviews.py:359
 msgid "&Plugins"
 msgstr "&Plugins"
 
-#: ../picard/ui/itemviews.py:523
+#: ../picard/ui/itemviews.py:533
 msgid "Clusters"
 msgstr "Agrupados"
 
@@ -1344,95 +1387,6 @@ msgstr "Agrupados"
 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:66 ../picard/ui/ui_options_plugins.py:62
-msgid "Details"
-msgstr "Detalhes"
-
-#: ../picard/ui/tageditor.py:71 ../picard/ui/tageditor.py:264
-#, python-format
-msgid "%d file"
-msgid_plural "%d files"
-msgstr[0] "%d arquivo"
-msgstr[1] "%d arquivos"
-
-#: ../picard/ui/tageditor.py:131
-#, 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:134
-#, 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:233
-msgid "Filename:"
-msgstr "Nome do arquivo:"
-
-#: ../picard/ui/tageditor.py:235
-msgid "Format:"
-msgstr "Formato:"
-
-#: ../picard/ui/tageditor.py:244
-msgid "Size:"
-msgstr "Tamanho:"
-
-#: ../picard/ui/tageditor.py:248 ../picard/ui/ui_metadata.py:127
-msgid "Length:"
-msgstr "Duração:"
-
-#: ../picard/ui/tageditor.py:250
-msgid "Bitrate:"
-msgstr "Taxa de bits:"
-
-#: ../picard/ui/tageditor.py:252
-msgid "Sample rate:"
-msgstr "Taxa de amostragem:"
-
-#: ../picard/ui/tageditor.py:254
-msgid "Bits per sample:"
-msgstr "Bits por amostragem:"
-
-#: ../picard/ui/tageditor.py:257
-msgid "Mono"
-msgstr "Mono"
-
-#: ../picard/ui/tageditor.py:258
-msgid "Stereo"
-msgstr "Estéreo"
-
-#: ../picard/ui/tageditor.py:260
-msgid "Channels:"
-msgstr "Canais:"
-
-#: ../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"
 msgstr "MusicBrainz Picard"
@@ -1669,6 +1623,10 @@ msgstr "Barra de &pesquisa"
 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"
@@ -1688,6 +1646,22 @@ msgstr "Lista de reprodução %s salva"
 msgid " (Error: %s)"
 msgstr " (Erro: %s)"
 
+#: ../picard/ui/puidsubmit.py:31 ../picard/ui/options/plugins.py:85
+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/passworddialog.py:38
 #, python-format
 msgid ""
@@ -1695,6 +1669,75 @@ msgid ""
 msgstr ""
 "O servidor %s requer login. Por favor digite seu nome de usuário e senha."
 
+#: ../picard/ui/tageditor.py:66 ../picard/ui/ui_options_plugins.py:62
+msgid "Details"
+msgstr "Detalhes"
+
+#: ../picard/ui/tageditor.py:71 ../picard/ui/tageditor.py:264
+#, python-format
+msgid "%d file"
+msgid_plural "%d files"
+msgstr[0] "%d arquivo"
+msgstr[1] "%d arquivos"
+
+#: ../picard/ui/tageditor.py:131
+#, 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:134
+#, 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:233
+msgid "Filename:"
+msgstr "Nome do arquivo:"
+
+#: ../picard/ui/tageditor.py:235
+msgid "Format:"
+msgstr "Formato:"
+
+#: ../picard/ui/tageditor.py:244
+msgid "Size:"
+msgstr "Tamanho:"
+
+#: ../picard/ui/tageditor.py:248 ../picard/ui/ui_metadata.py:127
+msgid "Length:"
+msgstr "Duração:"
+
+#: ../picard/ui/tageditor.py:250
+msgid "Bitrate:"
+msgstr "Taxa de bits:"
+
+#: ../picard/ui/tageditor.py:252
+msgid "Sample rate:"
+msgstr "Taxa de amostragem:"
+
+#: ../picard/ui/tageditor.py:254
+msgid "Bits per sample:"
+msgstr "Bits por amostragem:"
+
+#: ../picard/ui/tageditor.py:257
+msgid "Mono"
+msgstr "Mono"
+
+#: ../picard/ui/tageditor.py:258
+msgid "Stereo"
+msgstr "Estéreo"
+
+#: ../picard/ui/tageditor.py:260
+msgid "Channels:"
+msgstr "Canais:"
+
+#: ../picard/ui/tagsfromfilenames.py:54 ../picard/ui/tagsfromfilenames.py:99
+msgid "File Name"
+msgstr "Nome do arquivo"
+
 #: ../picard/ui/ui_cdlookup.py:60 ../picard/ui/ui_options_cdlookup.py:47
 #: ../picard/ui/ui_options_cdlookup_select.py:48
 #: ../picard/ui/options/cdlookup.py:36
@@ -1717,24 +1760,6 @@ msgstr "    Procurar manualmente    "
 msgid "Cancel"
 msgstr "Cancelar"
 
-#: ../picard/ui/ui_passworddialog.py:78
-msgid "Authentication required"
-msgstr "Autenticação requerida"
-
-#: ../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/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"
-msgstr "Salvar nome de usuário e senha"
-
 #: ../picard/ui/ui_edittagdialog.py:44
 msgid "Edit Tag"
 msgstr "Editar tag"
@@ -1771,6 +1796,10 @@ msgstr "Álbum:"
 msgid "Options"
 msgstr "Opções"
 
+#: ../picard/ui/ui_puidsubmit.py:52
+msgid "Submit PUIDs"
+msgstr "Enviar PUIDs"
+
 #: ../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:"
@@ -1795,6 +1824,23 @@ 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_moving.py:53
+msgid "Move additional files:"
+msgstr "Mover arquivos adicionais:"
+
+#: ../picard/ui/ui_options_moving.py:54
+msgid "Browse..."
+msgstr "Procurar..."
+
+#: ../picard/ui/ui_options_moving.py:55
+msgid "Delete empty directories"
+msgstr "Apagar pastas vazias"
+
+#: ../picard/ui/ui_options_moving.py:56
+#, fuzzy
+msgid "Move files to this directory when saving:"
+msgstr "Mover arquivos para esta pasta ao escrever tags:"
+
 #: ../picard/ui/util.py:31
 msgid "&Ok"
 msgstr "&Ok"
@@ -1803,44 +1849,40 @@ msgstr "&Ok"
 msgid "&Cancel"
 msgstr "&Cancelar"
 
-#: ../picard/ui/ui_puidsubmit.py:52
-msgid "Submit PUIDs"
-msgstr "Enviar PUIDs"
-
-#: ../picard/ui/ui_tageditor.py:139 ../picard/ui/ui_options_plugins.py:59
-#: ../picard/ui/options/plugins.py:76
+#: ../picard/ui/ui_tageditor.py:128 ../picard/ui/ui_options_plugins.py:59
+#: ../picard/ui/options/plugins.py:81
 msgid "Name"
 msgstr "Nome"
 
-#: ../picard/ui/ui_tageditor.py:140
+#: ../picard/ui/ui_tageditor.py:129
 msgid "Value"
 msgstr "Valor"
 
-#: ../picard/ui/ui_tageditor.py:141
+#: ../picard/ui/ui_tageditor.py:130
 msgid "Rating:"
 msgstr "Classificação:"
 
-#: ../picard/ui/ui_tageditor.py:142
+#: ../picard/ui/ui_tageditor.py:131
 msgid "&Add..."
 msgstr "&Adicionar..."
 
-#: ../picard/ui/ui_tageditor.py:143
+#: ../picard/ui/ui_tageditor.py:132
 msgid "&Edit..."
 msgstr "&Editar..."
 
-#: ../picard/ui/ui_tageditor.py:144
+#: ../picard/ui/ui_tageditor.py:133
 msgid "&Delete"
 msgstr "&Apagar"
 
-#: ../picard/ui/ui_tageditor.py:145
+#: ../picard/ui/ui_tageditor.py:134
 msgid "&Metadata"
 msgstr "&Metadados"
 
-#: ../picard/ui/ui_tageditor.py:146
+#: ../picard/ui/ui_tageditor.py:135
 msgid "A&rtwork"
 msgstr "&Capa"
 
-#: ../picard/ui/ui_tageditor.py:147
+#: ../picard/ui/ui_tageditor.py:136
 msgid "&Info"
 msgstr "&Informação"
 
@@ -1885,6 +1927,40 @@ msgstr " / "
 msgid ", "
 msgstr ", "
 
+#: ../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:72
+msgid "Port:"
+msgstr "Porta:"
+
+#: ../picard/ui/ui_options_general.py:110 ../picard/ui/ui_options_proxy.py:73
+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:112 ../picard/ui/ui_options_proxy.py:70
+#: ../picard/ui/ui_passworddialog.py:80
+msgid "Password:"
+msgstr "Senha:"
+
+#: ../picard/ui/ui_options_general.py:113 ../picard/ui/ui_options_proxy.py:71
+#: ../picard/ui/ui_passworddialog.py:79
+msgid "Username:"
+msgstr "Nome de usuário:"
+
+#: ../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_interface.py:50
 msgid "Miscellaneous"
 msgstr "Diversos"
@@ -1905,118 +1981,6 @@ msgstr "Usar sintaxe de consulta avançada"
 msgid "User interface language:"
 msgstr "Interface de linguagem do usuário:"
 
-#: ../picard/ui/ui_options_naming.py:165
-msgid "Rename Files"
-msgstr "Renomear arquivos"
-
-#: ../picard/ui/ui_options_naming.py:166
-msgid "Replace Windows-incompatible characters"
-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"
-
-#: ../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
-msgid "File naming format:"
-msgstr "Formato para nomear arquivos:"
-
-#: ../picard/ui/ui_options_naming.py:172
-msgid "Move Files"
-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 tags:"
-
-#: ../picard/ui/ui_options_naming.py:174
-msgid "Browse..."
-msgstr "Procurar..."
-
-#: ../picard/ui/ui_options_naming.py:175
-msgid "Move additional files:"
-msgstr "Mover arquivos adicionais:"
-
-#: ../picard/ui/ui_options_naming.py:176
-msgid "Delete empty directories"
-msgstr "Apagar pastas vazias"
-
-#: ../picard/ui/ui_options_naming.py:177
-msgid "Example"
-msgstr "Exemplo"
-
-#: ../picard/ui/ui_options_naming.py:178
-msgid "File name:"
-msgstr "Nome do arquivo:"
-
-#: ../picard/ui/ui_options_naming.py:179
-msgid "Multiple artist file name:"
-msgstr "Nome do arquivo para vários artistas:"
-
-#: ../picard/ui/ui_options_naming.py:180
-#: ../picard/ui/ui_tagsfromfilenames.py:58
-msgid "&Preview"
-msgstr "&Visualizar"
-
-#: ../picard/ui/ui_options_proxy.py:81 ../picard/ui/options/proxy.py:28
-msgid "Web Proxy"
-msgstr "Proxy"
-
-#: ../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_options_ratings.py:45
-msgid "Enable track ratings"
-msgstr "Abilitar classificação de faixas"
-
-#: ../picard/ui/ui_options_ratings.py:46
-msgid ""
-"Picard saves the ratings together with an e-mail address identifying the "
-"user who did the rating. That way different ratings for different users can "
-"be stored in the files. Please sepcify the e-mail you want to use to save "
-"your ratings."
-msgstr ""
-"Picard salva as classificações junto com um endereço de e-mail, "
-"identificando o usuário que fez a classificação. Dessa forma diferentes "
-"classificações de diferentes usuários podem ser armazenadas em seus "
-"arquivos. Por favor especifique o e-mail que você usa para salvar suas "
-"modificações."
-
-#: ../picard/ui/ui_options_ratings.py:47
-msgid "E-mail:"
-msgstr "E-mail:"
-
-#: ../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çõ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"
@@ -2074,74 +2038,157 @@ msgstr "Vários artistas:"
 msgid "Non-album tracks:"
 msgstr "Faixas sem álbum:"
 
-#: ../picard/ui/ui_options_plugins.py:58 ../picard/ui/options/plugins.py:30
+#: ../picard/ui/ui_options_metadata.py:109
+#: ../picard/ui/ui_options_metadata.py:110
+#: ../picard/ui/ui_options_renaming.py:155
+#: ../picard/ui/ui_options_renaming.py:158
+msgid "Default"
+msgstr "Padrão"
+
+#: ../picard/ui/ui_options_plugins.py:58 ../picard/ui/options/plugins.py:34
 msgid "Plugins"
 msgstr "Plugins"
 
-#: ../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:84
 msgid "Author"
 msgstr "Autor"
 
-#: ../picard/ui/ui_options_plugins.py:61 ../picard/util/tags.py:36
+#: ../picard/ui/ui_options_plugins.py:61 ../picard/util/tags.py:37
 msgid "Version"
 msgstr "Versão"
 
-#: ../picard/ui/ui_options_script.py:52
+#: ../picard/ui/ui_options_proxy.py:69 ../picard/ui/options/proxy.py:28
+msgid "Web Proxy"
+msgstr "Proxy"
+
+#: ../picard/ui/ui_options_ratings.py:45
+msgid "Enable track ratings"
+msgstr "Abilitar classificação de faixas"
+
+#: ../picard/ui/ui_options_ratings.py:46
+msgid ""
+"Picard saves the ratings together with an e-mail address identifying the "
+"user who did the rating. That way different ratings for different users can "
+"be stored in the files. Please sepcify the e-mail you want to use to save "
+"your ratings."
+msgstr ""
+"Picard salva as classificações junto com um endereço de e-mail, "
+"identificando o usuário que fez a classificação. Dessa forma diferentes "
+"classificações de diferentes usuários podem ser armazenadas em seus "
+"arquivos. Por favor especifique o e-mail que você usa para salvar suas "
+"modificações."
+
+#: ../picard/ui/ui_options_ratings.py:47
+msgid "E-mail:"
+msgstr "E-mail:"
+
+#: ../picard/ui/ui_options_renaming.py:145
+#, fuzzy
+msgid "Form"
+msgstr "Formato"
+
+#: ../picard/ui/ui_options_renaming.py:146
+#, fuzzy
+msgid "Rename files when saving"
+msgstr "Renomear arquivos ao escrever as etiquetas de metadados"
+
+#: ../picard/ui/ui_options_renaming.py:147
+msgid "Replace non-ASCII characters"
+msgstr "Substituir caracteres não-ASCII"
+
+#: ../picard/ui/ui_options_renaming.py:148
+msgid "Replace Windows-incompatible characters"
+msgstr "Substituir caracteres incompatíveis com o Windows"
+
+#: ../picard/ui/ui_options_renaming.py:149
+msgid "Name files like this"
+msgstr ""
+
+#: ../picard/ui/ui_options_renaming.py:156
+msgid "Name multiple artist albums differently"
+msgstr ""
+
+#: ../picard/ui/ui_options_renaming.py:157
+msgid "Copy from above"
+msgstr ""
+
+#: ../picard/ui/ui_options_renaming.py:159
+#, fuzzy
+msgid "Examples"
+msgstr "Exemplo"
+
+#: ../picard/ui/ui_options_script.py:43
 msgid "Tagger Script"
 msgstr "Script de tags"
 
-#: ../picard/ui/ui_options_tags.py:85
-msgid "Common"
-msgstr "Comum"
-
-#: ../picard/ui/ui_options_tags.py:86
-msgid "Clear existing tags before writing new tags"
-msgstr "Limpar tags existentes antes de escrever as novas"
-
-#: ../picard/ui/ui_options_tags.py:87
-msgid "Don not write tags to files"
+#: ../picard/ui/ui_options_tags.py:97
+#, fuzzy
+msgid "Do not write tags to files"
 msgstr "Não escrever tags em arquivos"
 
-#: ../picard/ui/ui_options_tags.py:88
-msgid "ID3"
-msgstr "ID3"
+#: ../picard/ui/ui_options_tags.py:98
+msgid "Before tagging"
+msgstr ""
 
-#: ../picard/ui/ui_options_tags.py:89
-msgid "Write ID3v1 tags to the files"
-msgstr "Escrever tags ID3v1 nos arquivos"
+#: ../picard/ui/ui_options_tags.py:99
+#, fuzzy
+msgid "Clear existing tags"
+msgstr "Limpar tags existentes antes de escrever as novas"
 
-#: ../picard/ui/ui_options_tags.py:90
-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:91
-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:92
-msgid "ISO-8859-1"
-msgstr "ISO-8859-1"
-
-#: ../picard/ui/ui_options_tags.py:93
-msgid "UTF-16"
-msgstr "UTF-16"
-
-#: ../picard/ui/ui_options_tags.py:94
-msgid "UTF-8"
-msgstr "UTF-8"
-
-#: ../picard/ui/ui_options_tags.py:95
+#: ../picard/ui/ui_options_tags.py:100
 msgid "Remove ID3 tags from FLAC files"
 msgstr "Remover tags ID3 de arquivos FLAC"
 
-#: ../picard/ui/ui_options_tags.py:96
-msgid "APE"
-msgstr "APE"
-
-#: ../picard/ui/ui_options_tags.py:97
+#: ../picard/ui/ui_options_tags.py:101
 msgid "Remove APEv2 tags from MP3 files"
 msgstr "Remover tags APEv2 de arquivos MP3"
 
+#: ../picard/ui/ui_options_tags.py:102
+msgid "Tag compatibility"
+msgstr ""
+
+#: ../picard/ui/ui_options_tags.py:103
+#, fuzzy
+msgid "ID3v2 version"
+msgstr "Somente ID3v2.4"
+
+#: ../picard/ui/ui_options_tags.py:104
+msgid "2.4"
+msgstr ""
+
+#: ../picard/ui/ui_options_tags.py:105
+msgid "2.3"
+msgstr ""
+
+#: ../picard/ui/ui_options_tags.py:106
+#, fuzzy
+msgid "Also include ID3v1 tags in the files"
+msgstr "Escrever tags ID3v1 nos arquivos"
+
+#: ../picard/ui/ui_options_tags.py:107
+msgid "ID3v2 text encoding"
+msgstr ""
+
+#: ../picard/ui/ui_options_tags.py:108
+msgid "UTF-8"
+msgstr "UTF-8"
+
+#: ../picard/ui/ui_options_tags.py:109
+msgid "UTF-16"
+msgstr "UTF-16"
+
+#: ../picard/ui/ui_options_tags.py:110
+msgid "ISO-8859-1"
+msgstr "ISO-8859-1"
+
+#: ../picard/ui/ui_passworddialog.py:78
+msgid "Authentication required"
+msgstr "Autenticação requerida"
+
+#: ../picard/ui/ui_passworddialog.py:81
+msgid "Save username and password"
+msgstr "Salvar nome de usuário e senha"
+
 #: ../picard/ui/ui_tagsfromfilenames.py:56
 msgid "Convert File Names to Tags"
 msgstr "Converter nomes de arquivo para tags"
@@ -2150,6 +2197,10 @@ msgstr "Converter nomes de arquivo para tags"
 msgid "Replace underscores with spaces"
 msgstr "Substituir _ (underscore) por espaços"
 
+#: ../picard/ui/ui_tagsfromfilenames.py:58
+msgid "&Preview"
+msgstr "&Visualizar"
+
 #: ../picard/ui/options/about.py:29
 msgid "About"
 msgstr "Sobre"
@@ -2181,8 +2232,8 @@ msgstr "<br/>Traduzido para PT-BR por %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"
@@ -2190,20 +2241,19 @@ msgid ""
 "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\"><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/P"
-"icardTagger</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"
 "Versão%(version)s</p>\n"
-"<p align=\"center\"><strong>Formatos "
-"suportados</strong><br/>%(formats)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 "
@@ -2212,11 +2262,10 @@ msgstr ""
 "<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/P"
-"icardTagger</a></p>\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"
@@ -2250,257 +2299,266 @@ msgstr "Compatibilidade"
 msgid "None"
 msgstr "Nenhum"
 
-#: ../picard/ui/options/naming.py:33
-msgid "File Naming"
-msgstr "Nomear Arquivo"
+#: ../picard/ui/options/moving.py:33
+#, fuzzy
+msgid "Moving files"
+msgstr "Mover arquivos"
 
-#: ../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 "O formato para nomear arquivos não pode estar vazio."
-
-#: ../picard/ui/options/naming.py:95
-msgid "The multiple artist file naming format must not be empty."
-msgstr "O formato para nomear vários artistas não pode estar vazio."
-
-#: ../picard/ui/options/naming.py:97
+#: ../picard/ui/options/moving.py:65
 msgid "Error"
 msgstr "Erro"
 
-#: ../picard/ui/options/naming.py:97
+#: ../picard/ui/options/moving.py:65
 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/ratings.py:29
+msgid "Ratings"
+msgstr "Classificação"
 
 #: ../picard/ui/options/tags.py:29
 msgid "Tags"
 msgstr "Etiquetas"
 
-#: ../picard/ui/options/ratings.py:29
-msgid "Ratings"
-msgstr "Classificação"
+#: ../picard/ui/options/renaming.py:35
+#, fuzzy
+msgid "File naming"
+msgstr "Nomear Arquivo"
+
+#: ../picard/ui/options/renaming.py:123
+msgid "The file naming format must not be empty."
+msgstr "O formato para nomear arquivos não pode estar vazio."
+
+#: ../picard/ui/options/renaming.py:133
+msgid "The multiple artist file naming format must not be empty."
+msgstr "O formato para nomear vários artistas não pode estar vazio."
+
+#: ../picard/ui/options/scripting.py:63
+msgid "Scripting"
+msgstr "Scripts"
+
+#: ../picard/ui/options/scripting.py:97
+msgid "Script Error"
+msgstr "Erro de script"
 
 #: ../picard/util/tags.py:24
 msgid "Date"
 msgstr "Data"
 
 #: ../picard/util/tags.py:25
+#, fuzzy
+msgid "Original Release Date"
+msgstr "Metadados originais"
+
+#: ../picard/util/tags.py:26
 msgid "Album Artist"
 msgstr "Artista do Álbum"
 
-#: ../picard/util/tags.py:26
+#: ../picard/util/tags.py:27
 msgid "Track Number"
 msgstr "Número da Faixa"
 
-#: ../picard/util/tags.py:27
+#: ../picard/util/tags.py:28
 msgid "Total Tracks"
 msgstr "Total de Faixas"
 
-#: ../picard/util/tags.py:28
+#: ../picard/util/tags.py:29
 msgid "Disc Number"
 msgstr "Número do Disco"
 
-#: ../picard/util/tags.py:29
+#: ../picard/util/tags.py:30
 msgid "Total Discs"
 msgstr "Total de Discos"
 
-#: ../picard/util/tags.py:30
+#: ../picard/util/tags.py:31
 msgid "Album Artist Sort Order"
 msgstr "Modo de Ordenação do Artista do Álbum"
 
-#: ../picard/util/tags.py:31
+#: ../picard/util/tags.py:32
 msgid "Artist Sort Order"
 msgstr "Modo de Ordenação do Artista"
 
-#: ../picard/util/tags.py:32
+#: ../picard/util/tags.py:33
 msgid "Title Sort Order"
 msgstr "Modo de Ordenação do Título"
 
-#: ../picard/util/tags.py:33
+#: ../picard/util/tags.py:34
 msgid "Album Sort Order"
 msgstr "Modo de Ordenação do Álbum"
 
-#: ../picard/util/tags.py:34
+#: ../picard/util/tags.py:35
 msgid "ASIN"
 msgstr "ASIN"
 
-#: ../picard/util/tags.py:35
+#: ../picard/util/tags.py:36
 msgid "Grouping"
 msgstr "Agrupando"
 
-#: ../picard/util/tags.py:37
+#: ../picard/util/tags.py:38
 msgid "ISRC"
 msgstr "ISRC"
 
-#: ../picard/util/tags.py:38
+#: ../picard/util/tags.py:39
 msgid "Mood"
 msgstr "Modo"
 
-#: ../picard/util/tags.py:39
+#: ../picard/util/tags.py:40
 msgid "BPM"
 msgstr "BPM"
 
-#: ../picard/util/tags.py:40
+#: ../picard/util/tags.py:41
 msgid "Copyright"
 msgstr "Direitos Autorais"
 
-#: ../picard/util/tags.py:41
+#: ../picard/util/tags.py:42
 msgid "Composer"
 msgstr "Compositor"
 
-#: ../picard/util/tags.py:42
+#: ../picard/util/tags.py:43
 msgid "Conductor"
 msgstr "Regente"
 
-#: ../picard/util/tags.py:43
+#: ../picard/util/tags.py:44
 msgid "Lyricist"
 msgstr "Letrista"
 
-#: ../picard/util/tags.py:44
+#: ../picard/util/tags.py:45
 msgid "Arranger"
 msgstr "Arranjador"
 
-#: ../picard/util/tags.py:45
+#: ../picard/util/tags.py:46
 msgid "Producer"
 msgstr "Produtor"
 
-#: ../picard/util/tags.py:46
+#: ../picard/util/tags.py:47
 msgid "Engineer"
 msgstr "Engenheiro"
 
-#: ../picard/util/tags.py:47
+#: ../picard/util/tags.py:48
 msgid "Subtitle"
 msgstr "Subtítulo"
 
-#: ../picard/util/tags.py:48
+#: ../picard/util/tags.py:49
 msgid "Disc Subtitle"
 msgstr "Subtitulo do Disco"
 
-#: ../picard/util/tags.py:49
+#: ../picard/util/tags.py:50
 msgid "Remixer"
 msgstr "Mixagem"
 
-#: ../picard/util/tags.py:50
+#: ../picard/util/tags.py:51
 msgid "MusicBrainz Track Id"
 msgstr "Id MusicBrainz da Faixa"
 
-#: ../picard/util/tags.py:51
+#: ../picard/util/tags.py:52
 msgid "MusicBrainz Release Id"
 msgstr "Id MusicBrainz do Álbum"
 
-#: ../picard/util/tags.py:52
+#: ../picard/util/tags.py:53
 msgid "MusicBrainz Artist Id"
 msgstr "Id MusicBrainz do Artista"
 
-#: ../picard/util/tags.py:53
+#: ../picard/util/tags.py:54
 msgid "MusicBrainz Release Artist Id"
 msgstr "Id MusicBrainz do Artista"
 
-#: ../picard/util/tags.py:54
+#: ../picard/util/tags.py:55
 msgid "MusicBrainz TRM Id"
 msgstr "Id MusicBrainz do TRM"
 
-#: ../picard/util/tags.py:55
+#: ../picard/util/tags.py:56
 msgid "MusicBrainz Disc Id"
 msgstr "MusicBrainz Disco Id"
 
-#: ../picard/util/tags.py:56
+#: ../picard/util/tags.py:57
 msgid "MusicBrainz Sort Name"
 msgstr "MusicBrainz Organizar Nome"
 
-#: ../picard/util/tags.py:57
+#: ../picard/util/tags.py:58
 msgid "MusicIP PUID"
 msgstr "PUID MusicIP"
 
-#: ../picard/util/tags.py:58
+#: ../picard/util/tags.py:59
 msgid "MusicIP Fingerprint"
 msgstr "MusicIP Fingerprint"
 
-#: ../picard/util/tags.py:59
+#: ../picard/util/tags.py:60
 msgid "Disc Id"
 msgstr "Disco Id"
 
-#: ../picard/util/tags.py:60
+#: ../picard/util/tags.py:61
 msgid "Website"
 msgstr "Página"
 
-#: ../picard/util/tags.py:61
+#: ../picard/util/tags.py:62
 msgid "Compilation"
 msgstr "Compilação"
 
-#: ../picard/util/tags.py:62
+#: ../picard/util/tags.py:63
 msgid "Comment"
 msgstr "Comentários"
 
-#: ../picard/util/tags.py:63
+#: ../picard/util/tags.py:64
 msgid "Genre"
 msgstr "Gênero"
 
-#: ../picard/util/tags.py:64
+#: ../picard/util/tags.py:65
 msgid "Encoded By"
 msgstr "Codificado por"
 
-#: ../picard/util/tags.py:65
+#: ../picard/util/tags.py:66
 msgid "Performer"
 msgstr "Intérprete"
 
-#: ../picard/util/tags.py:66
+#: ../picard/util/tags.py:67
 msgid "Release Type"
 msgstr "Tipo de Lançamento"
 
-#: ../picard/util/tags.py:67
+#: ../picard/util/tags.py:68
 msgid "Release Status"
 msgstr "Estado do Lançamento"
 
-#: ../picard/util/tags.py:68
+#: ../picard/util/tags.py:69
 msgid "Release Country"
 msgstr "País de Lançamento"
 
-#: ../picard/util/tags.py:69
+#: ../picard/util/tags.py:70
 msgid "Record Label"
 msgstr "Gravadora"
 
-#: ../picard/util/tags.py:70
+#: ../picard/util/tags.py:71
 msgid "Barcode"
 msgstr "Código de barras"
 
-#: ../picard/util/tags.py:71
+#: ../picard/util/tags.py:72
 msgid "Catalog Number"
 msgstr "Número de Catálogo"
 
-#: ../picard/util/tags.py:72
+#: ../picard/util/tags.py:73
 msgid "Format"
 msgstr "Formato"
 
-#: ../picard/util/tags.py:73
+#: ../picard/util/tags.py:74
 msgid "DJ-Mixer"
 msgstr "DJ-Mixer"
 
-#: ../picard/util/tags.py:74
+#: ../picard/util/tags.py:75
 msgid "Media"
 msgstr "Mídia"
 
-#: ../picard/util/tags.py:75
+#: ../picard/util/tags.py:76
 msgid "Lyrics"
 msgstr "Letras"
 
-#: ../picard/util/tags.py:76
+#: ../picard/util/tags.py:77
 msgid "Mixer"
 msgstr "Mixer"
 
-#: ../picard/util/tags.py:77
+#: ../picard/util/tags.py:78
 msgid "Language"
 msgstr "Linguagem"
 
-#: ../picard/util/tags.py:78
+#: ../picard/util/tags.py:79
 msgid "Script"
 msgstr "Script"
 
@@ -2519,19 +2577,47 @@ msgstr ""
 "\n"
 "%s"
 
-#, python-format
+#~ msgid "Rename Files"
+#~ msgstr "Renomear arquivos"
+
+#~ msgid "Multiple artist file naming format:"
+#~ msgstr "Formato para nomear vários artistas:"
+
+#~ msgid "File naming format:"
+#~ msgstr "Formato para nomear arquivos:"
+
+#~ msgid "File name:"
+#~ msgstr "Nome do arquivo:"
+
+#~ msgid "Multiple artist file name:"
+#~ msgstr "Nome do arquivo para vários artistas:"
+
+#~ msgid "Common"
+#~ msgstr "Comum"
+
+#~ msgid "ID3"
+#~ msgstr "ID3"
+
+#~ msgid "Write ID3v2 version 2.3 tags (2.4 is default)"
+#~ msgstr "Escrever tags ID3v2 versão 2.3 (2.4 é a padrão)"
+
+#~ msgid "Text encoding to use while writing ID3v2 tags:"
+#~ msgstr "Codificação de texto a ser usada quando escrever tags ID3v2:"
+
+#~ msgid "APE"
+#~ msgstr "APE"
+
 #~ msgid "[couldn't load album %s]"
 #~ msgstr "[não foi possível carregar o álbum %s]"
 
 #~ msgid "New Version"
 #~ msgstr "Nova Versão"
 
-#, python-format
 #~ msgid ""
-#~ "New version of Picard is available (%s). Would you like to download it now?"
+#~ "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?"
 
-#, python-format
 #~ msgid "Couldn't find PUID for file %s"
 #~ msgstr "Não foi possível encontrar um PUID para o arquivo %s"
 
@@ -2667,9 +2753,6 @@ msgstr ""
 #~ 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"
 
@@ -2688,9 +2771,6 @@ msgstr ""
 #~ msgid "Proxy port"
 #~ msgstr "Porta proxy"
 
-#~ msgid "ID3v2.4 only"
-#~ msgstr "Somente ID3v2.4"
-
 #~ msgid "Save track/album"
 #~ msgstr "Salvar faixa/álbum"
 
@@ -2725,16 +2805,17 @@ msgstr ""
 #~ 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"
-#~ "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. "
+#~ "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 ""
 #~ "Você não especificou um usuário e senha. Para poder contribuir com dados "
 #~ "para o MusicBrainz, você precisa ter uma conta do MusicBrainz.\n"
 #~ "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. "
+#~ "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."
@@ -2758,7 +2839,8 @@ msgstr ""
 #~ 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."
+#~ "Please fix the move option or the destination directory option and try "
+#~ "again."
 #~ msgstr ""
 #~ "A opção de mover arquivos está ativa, mas a pasta de destino não foi "
 #~ "especificada ou é inválida.\n"
@@ -2766,13 +2848,13 @@ msgstr ""
 #~ "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 click the "
-#~ "track and select 'Clear Error'"
+#~ "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 ""
-#~ "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'"
+#~ "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"
@@ -2796,7 +2878,8 @@ msgstr ""
 #~ msgstr "Por favor faça um donativo ao MusicBrainz!"
 
 #~ msgid ""
-#~ "The destination directory %s does not exist. Please pick a valid directory."
+#~ "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."
 
@@ -2813,14 +2896,12 @@ msgstr ""
 
 #~ 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."
+#~ 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"
 
@@ -2839,7 +2920,8 @@ msgstr ""
 
 #~ msgid "Automatically select PUID collision tracks that are at least"
 #~ msgstr ""
-#~ "Selecionar automaticamente faixas com uma colisão PUID que sejam pelo menos"
+#~ "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 ""
@@ -2903,11 +2985,11 @@ msgstr ""
 #~ 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. "
+#~ "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. "
+#~ "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"
@@ -2916,7 +2998,8 @@ msgstr ""
 #~ 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"
+#~ 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"
diff --git a/po/ro.po b/po/ro.po
index 3c43a801c..5d00f75b1 100644
--- a/po/ro.po
+++ b/po/ro.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: picard\n"
 "Report-Msgid-Bugs-To: http://bugs.musicbrainz.org/\n"
-"POT-Creation-Date: 2009-02-24 18:58+0100\n"
+"POT-Creation-Date: 2009-04-06 22:50+0200\n"
 "PO-Revision-Date: 2009-01-25 15:15+0000\n"
 "Last-Translator: Philipp Wolfer <Unknown>\n"
 "Language-Team: Romanian <ro@li.org>\n"
@@ -19,16 +19,16 @@ msgstr ""
 "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:109 ../picard/cluster.py:248
 msgid "Unmatched Files"
 msgstr "Fișiere neașezate"
 
-#: ../picard/album.py:281
+#: ../picard/album.py:287
 #, python-format
 msgid "[could not load album %s]"
 msgstr ""
 
-#: ../picard/album.py:317
+#: ../picard/album.py:320
 msgid "[loading album information]"
 msgstr "[se încarcă informațiile albumului]"
 
@@ -588,7 +588,7 @@ msgid "Namibia"
 msgstr ""
 
 #: ../picard/const.py:182
-msgid "Vanuat"
+msgid "Vanuatu"
 msgstr ""
 
 #: ../picard/const.py:183
@@ -1032,223 +1032,234 @@ msgid "Congo, The Democratic Republic of the"
 msgstr ""
 
 #: ../picard/const.py:293
-msgid "Serbia and Montenegro"
+msgid "Serbia and Montenegro (historical, 2003-2006)"
 msgstr ""
 
 #: ../picard/const.py:294
-msgid "Croatia"
+msgid "Serbia"
 msgstr ""
 
 #: ../picard/const.py:295
-msgid "Korea (North), Democratic People's Republic of"
+msgid "Montenegro"
 msgstr ""
 
 #: ../picard/const.py:296
-msgid "Korea (South), Republic of"
+msgid "Croatia"
 msgstr ""
 
 #: ../picard/const.py:297
-msgid "Slovakia"
+msgid "Korea (North), Democratic People's Republic of"
 msgstr ""
 
 #: ../picard/const.py:298
-msgid "Soviet Union (historical, 1922-1991)"
+msgid "Korea (South), Republic of"
 msgstr ""
 
 #: ../picard/const.py:299
-msgid "East Timor"
+msgid "Slovakia"
 msgstr ""
 
 #: ../picard/const.py:300
-msgid "Czechoslovakia (historical, 1918-1992)"
+msgid "Soviet Union (historical, 1922-1991)"
 msgstr ""
 
 #: ../picard/const.py:301
-msgid "Europe"
+msgid "East Timor"
 msgstr ""
 
 #: ../picard/const.py:302
-msgid "East Germany (historical, 1949-1990)"
+msgid "Czechoslovakia (historical, 1918-1992)"
 msgstr ""
 
 #: ../picard/const.py:303
-msgid "[Unknown Country]"
+msgid "Europe"
 msgstr ""
 
 #: ../picard/const.py:304
-msgid "[Worldwide]"
+msgid "East Germany (historical, 1949-1990)"
 msgstr ""
 
 #: ../picard/const.py:305
+msgid "[Unknown Country]"
+msgstr ""
+
+#: ../picard/const.py:306
+msgid "[Worldwide]"
+msgstr ""
+
+#: ../picard/const.py:307
 msgid "Yugoslavia (historical, 1918-1992)"
 msgstr ""
 
-#: ../picard/const.py:310
-msgid "Catalan"
-msgstr ""
-
-#: ../picard/const.py:311
-msgid "Czech"
-msgstr "Cehă"
-
 #: ../picard/const.py:312
-msgid "Welsh"
+msgid "Afrikaans"
 msgstr ""
 
 #: ../picard/const.py:313
-msgid "Danish"
+msgid "Arabic"
 msgstr ""
 
 #: ../picard/const.py:314
-msgid "German"
-msgstr "Germană"
+msgid "Catalan"
+msgstr ""
 
 #: ../picard/const.py:315
-msgid "English"
-msgstr "Engleză"
+msgid "Czech"
+msgstr "Cehă"
 
 #: ../picard/const.py:316
-msgid "English (Canada)"
+msgid "Welsh"
 msgstr ""
 
 #: ../picard/const.py:317
+msgid "Danish"
+msgstr ""
+
+#: ../picard/const.py:318
+msgid "German"
+msgstr "Germană"
+
+#: ../picard/const.py:319
+msgid "English"
+msgstr "Engleză"
+
+#: ../picard/const.py:320
+msgid "English (Canada)"
+msgstr ""
+
+#: ../picard/const.py:321
 msgid "English (UK)"
 msgstr "Engleză (britanică)"
 
-#: ../picard/const.py:318
+#: ../picard/const.py:322
 msgid "Spanish"
 msgstr "Spaniolă"
 
-#: ../picard/const.py:319
+#: ../picard/const.py:323
 msgid "Persian"
 msgstr ""
 
-#: ../picard/const.py:320
+#: ../picard/const.py:324
 msgid "Finnish"
 msgstr "Finlandeză"
 
-#: ../picard/const.py:321
+#: ../picard/const.py:325
 msgid "French"
 msgstr "Franceză"
 
-#: ../picard/const.py:322
+#: ../picard/const.py:326
 msgid "Frisian"
 msgstr ""
 
-#: ../picard/const.py:323
+#: ../picard/const.py:327
 msgid "Hebrew"
 msgstr ""
 
-#: ../picard/const.py:324
+#: ../picard/const.py:328
+msgid "Hindi"
+msgstr ""
+
+#: ../picard/const.py:329
 msgid "Hungarian"
 msgstr "Maghiară"
 
-#: ../picard/const.py:325
+#: ../picard/const.py:330
 msgid "Islandic"
 msgstr ""
 
-#: ../picard/const.py:326
+#: ../picard/const.py:331
 msgid "Italian"
 msgstr "Italiană"
 
-#: ../picard/const.py:327
+#: ../picard/const.py:332
 msgid "Kannada"
 msgstr ""
 
-#: ../picard/const.py:328
+#: ../picard/const.py:333
 msgid "Korean"
 msgstr "Koreană"
 
-#: ../picard/const.py:329
+#: ../picard/const.py:334
 msgid "Lithuanian"
 msgstr "Lituaniană"
 
-#: ../picard/const.py:330
+#: ../picard/const.py:335
 msgid "Norwegian Bokmal"
 msgstr "Norvegiană (Bokmal)"
 
-#: ../picard/const.py:331
+#: ../picard/const.py:336
 msgid "Dutch"
 msgstr "Olandeză"
 
-#: ../picard/const.py:332
+#: ../picard/const.py:337
 msgid "Polish"
 msgstr ""
 
-#: ../picard/const.py:333
+#: ../picard/const.py:338
 msgid "Portuguese"
 msgstr "Portugheză"
 
-#: ../picard/const.py:334
+#: ../picard/const.py:339
 msgid "Brazilian Portuguese"
 msgstr ""
 
-#: ../picard/const.py:335
+#: ../picard/const.py:340
 msgid "Romanian"
 msgstr "Română"
 
-#: ../picard/const.py:336
+#: ../picard/const.py:341
 msgid "Russian"
 msgstr "Rusă"
 
-#: ../picard/const.py:337
+#: ../picard/const.py:342
 msgid "Scots"
 msgstr ""
 
-#: ../picard/const.py:338
+#: ../picard/const.py:343
 msgid "Slovak"
 msgstr "Slovacă"
 
-#: ../picard/const.py:339
+#: ../picard/const.py:344
 msgid "Slovenian"
 msgstr ""
 
-#: ../picard/const.py:340
+#: ../picard/const.py:345
 msgid "Swedish"
 msgstr "Suedeză"
 
-#: ../picard/const.py:341
+#: ../picard/const.py:346
+msgid "Turkish"
+msgstr ""
+
+#: ../picard/const.py:347
 msgid "Chinese"
 msgstr ""
 
-#: ../picard/file.py:487
+#: ../picard/file.py:494
 #, python-format
 msgid "No matching tracks for file %s"
 msgstr ""
 
-#: ../picard/file.py:504
+#: ../picard/file.py:511
 #, python-format
 msgid "No matching tracks above the threshold for file %s"
 msgstr ""
 
-#: ../picard/file.py:507
+#: ../picard/file.py:514
 #, python-format
 msgid "File %s identified!"
 msgstr "Fişierul %s a fost identificat!"
 
-#: ../picard/file.py:518
+#: ../picard/file.py:525
 #, python-format
 msgid "Looking up the PUID for file %s..."
 msgstr ""
 
-#: ../picard/file.py:523
+#: ../picard/file.py:530
 #, 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 ""
@@ -1261,11 +1272,24 @@ msgstr ""
 msgid "XSPF Playlist (*.xspf)"
 msgstr ""
 
-#: ../picard/tagger.py:476
+#: ../picard/puidmanager.py:62
+msgid "Submitting PUIDs..."
+msgstr ""
+
+#: ../picard/puidmanager.py:68
+#, python-format
+msgid "PUIDs submission failed: %s"
+msgstr ""
+
+#: ../picard/puidmanager.py:70
+msgid "PUIDs successfully submitted!"
+msgstr ""
+
+#: ../picard/tagger.py:477
 msgid "CD Lookup Error"
 msgstr "Eroare la căutarea discului"
 
-#: ../picard/tagger.py:477
+#: ../picard/tagger.py:478
 #, python-format
 msgid ""
 "Error while reading CD:\n"
@@ -1276,7 +1300,7 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../picard/tagger.py:503
+#: ../picard/tagger.py:504
 #, python-format
 msgid "Could not find PUID for file %s"
 msgstr ""
@@ -1329,15 +1353,28 @@ msgstr "Afișează fișierele ascunse"
 msgid "Length"
 msgstr ""
 
-#: ../picard/ui/itemviews.py:327
+#: ../picard/ui/itemviews.py:289
+msgid "&Expand all"
+msgstr ""
+
+#: ../picard/ui/itemviews.py:291
+msgid "&Collapse all"
+msgstr ""
+
+#: ../picard/ui/itemviews.py:332
 msgid "&Releases"
 msgstr "Albume"
 
-#: ../picard/ui/itemviews.py:353
+#: ../picard/ui/itemviews.py:349
+#, fuzzy
+msgid "No release event"
+msgstr "Luna de lansare a albumului"
+
+#: ../picard/ui/itemviews.py:359
 msgid "&Plugins"
 msgstr "&Module"
 
-#: ../picard/ui/itemviews.py:523
+#: ../picard/ui/itemviews.py:533
 msgid "Clusters"
 msgstr "Grupaje"
 
@@ -1345,98 +1382,6 @@ msgstr "Grupaje"
 msgid "Log"
 msgstr "Jurnal"
 
-#: ../picard/ui/puidsubmit.py:31 ../picard/ui/options/plugins.py:80
-msgid "File"
-msgstr "Fișier"
-
-#: ../picard/ui/puidsubmit.py:31
-msgid "PUID"
-msgstr "PUID"
-
-#: ../picard/ui/puidsubmit.py:31 ../picard/ui/mainwindow.py:437
-msgid "Track"
-msgstr "Piesă"
-
-#: ../picard/ui/puidsubmit.py:31
-msgid "Release"
-msgstr "Album"
-
-#: ../picard/ui/puidsubmit.py:31
-msgid "Release ID"
-msgstr "Identificator Album"
-
-#: ../picard/ui/tageditor.py:66 ../picard/ui/ui_options_plugins.py:62
-msgid "Details"
-msgstr "Detalii"
-
-#: ../picard/ui/tageditor.py:71 ../picard/ui/tageditor.py:264
-#, 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/tageditor.py:131
-#, 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:134
-#, 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:233
-msgid "Filename:"
-msgstr "Nume fișier:"
-
-#: ../picard/ui/tageditor.py:235
-msgid "Format:"
-msgstr "Format:"
-
-#: ../picard/ui/tageditor.py:244
-msgid "Size:"
-msgstr "Mărime:"
-
-#: ../picard/ui/tageditor.py:248 ../picard/ui/ui_metadata.py:127
-msgid "Length:"
-msgstr "Durată:"
-
-#: ../picard/ui/tageditor.py:250
-msgid "Bitrate:"
-msgstr "Rata de biți:"
-
-#: ../picard/ui/tageditor.py:252
-msgid "Sample rate:"
-msgstr "Rata de eșantionare:"
-
-#: ../picard/ui/tageditor.py:254
-msgid "Bits per sample:"
-msgstr "Biți pe eșantion:"
-
-#: ../picard/ui/tageditor.py:257
-msgid "Mono"
-msgstr "Mono"
-
-#: ../picard/ui/tageditor.py:258
-msgid "Stereo"
-msgstr "Stereo"
-
-#: ../picard/ui/tageditor.py:260
-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 "MusicBrainz Picard"
@@ -1673,6 +1618,10 @@ msgstr "Bara de &căutare"
 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 "Toate formatele cunoscute"
@@ -1692,12 +1641,100 @@ msgstr "Am salvat playlistul %s"
 msgid " (Error: %s)"
 msgstr " (Eroare: %s)"
 
+#: ../picard/ui/puidsubmit.py:31 ../picard/ui/options/plugins.py:85
+msgid "File"
+msgstr "Fișier"
+
+#: ../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 "Identificator Album"
+
 #: ../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/tageditor.py:66 ../picard/ui/ui_options_plugins.py:62
+msgid "Details"
+msgstr "Detalii"
+
+#: ../picard/ui/tageditor.py:71 ../picard/ui/tageditor.py:264
+#, 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/tageditor.py:131
+#, 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:134
+#, 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:233
+msgid "Filename:"
+msgstr "Nume fișier:"
+
+#: ../picard/ui/tageditor.py:235
+msgid "Format:"
+msgstr "Format:"
+
+#: ../picard/ui/tageditor.py:244
+msgid "Size:"
+msgstr "Mărime:"
+
+#: ../picard/ui/tageditor.py:248 ../picard/ui/ui_metadata.py:127
+msgid "Length:"
+msgstr "Durată:"
+
+#: ../picard/ui/tageditor.py:250
+msgid "Bitrate:"
+msgstr "Rata de biți:"
+
+#: ../picard/ui/tageditor.py:252
+msgid "Sample rate:"
+msgstr "Rata de eșantionare:"
+
+#: ../picard/ui/tageditor.py:254
+msgid "Bits per sample:"
+msgstr "Biți pe eșantion:"
+
+#: ../picard/ui/tageditor.py:257
+msgid "Mono"
+msgstr "Mono"
+
+#: ../picard/ui/tageditor.py:258
+msgid "Stereo"
+msgstr "Stereo"
+
+#: ../picard/ui/tageditor.py:260
+msgid "Channels:"
+msgstr "Canale:"
+
+#: ../picard/ui/tagsfromfilenames.py:54 ../picard/ui/tagsfromfilenames.py:99
+msgid "File Name"
+msgstr "Numele fișierului"
+
 #: ../picard/ui/ui_cdlookup.py:60 ../picard/ui/ui_options_cdlookup.py:47
 #: ../picard/ui/ui_options_cdlookup_select.py:48
 #: ../picard/ui/options/cdlookup.py:36
@@ -1720,24 +1757,6 @@ msgstr "    Caută manual    "
 msgid "Cancel"
 msgstr "Renunță"
 
-#: ../picard/ui/ui_passworddialog.py:78
-msgid "Authentication required"
-msgstr "Autentificare necesară"
-
-#: ../picard/ui/ui_passworddialog.py:79 ../picard/ui/ui_options_proxy.py:83
-#: ../picard/ui/ui_options_general.py:113
-msgid "Username:"
-msgstr "Utilizator:"
-
-#: ../picard/ui/ui_passworddialog.py:80 ../picard/ui/ui_options_proxy.py:82
-#: ../picard/ui/ui_options_general.py:112
-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"
@@ -1774,6 +1793,10 @@ msgstr "Album:"
 msgid "Options"
 msgstr "Opțiuni"
 
+#: ../picard/ui/ui_puidsubmit.py:52
+msgid "Submit PUIDs"
+msgstr "Transmite PUID-urile"
+
 #: ../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:"
@@ -1798,6 +1821,23 @@ msgstr "Salvează coperțile ca fișiere separate"
 msgid "Overwrite the file if it already exists"
 msgstr "Supra-scrie fișierul dacă există deja"
 
+#: ../picard/ui/ui_options_moving.py:53
+msgid "Move additional files:"
+msgstr "Mută și aceste fișiere:"
+
+#: ../picard/ui/ui_options_moving.py:54
+msgid "Browse..."
+msgstr "Navigare..."
+
+#: ../picard/ui/ui_options_moving.py:55
+msgid "Delete empty directories"
+msgstr "Șterge dosarele rămase goale"
+
+#: ../picard/ui/ui_options_moving.py:56
+#, fuzzy
+msgid "Move files to this directory when saving:"
+msgstr "Mută fișierele etichetate în acest dosar:"
+
 #: ../picard/ui/util.py:31
 msgid "&Ok"
 msgstr ""
@@ -1806,44 +1846,40 @@ msgstr ""
 msgid "&Cancel"
 msgstr ""
 
-#: ../picard/ui/ui_puidsubmit.py:52
-msgid "Submit PUIDs"
-msgstr "Transmite PUID-urile"
-
-#: ../picard/ui/ui_tageditor.py:139 ../picard/ui/ui_options_plugins.py:59
-#: ../picard/ui/options/plugins.py:76
+#: ../picard/ui/ui_tageditor.py:128 ../picard/ui/ui_options_plugins.py:59
+#: ../picard/ui/options/plugins.py:81
 msgid "Name"
 msgstr "Nume"
 
-#: ../picard/ui/ui_tageditor.py:140
+#: ../picard/ui/ui_tageditor.py:129
 msgid "Value"
 msgstr "Valoare"
 
-#: ../picard/ui/ui_tageditor.py:141
+#: ../picard/ui/ui_tageditor.py:130
 msgid "Rating:"
 msgstr ""
 
-#: ../picard/ui/ui_tageditor.py:142
+#: ../picard/ui/ui_tageditor.py:131
 msgid "&Add..."
 msgstr "&Adăugare..."
 
-#: ../picard/ui/ui_tageditor.py:143
+#: ../picard/ui/ui_tageditor.py:132
 msgid "&Edit..."
 msgstr "&Editare..."
 
-#: ../picard/ui/ui_tageditor.py:144
+#: ../picard/ui/ui_tageditor.py:133
 msgid "&Delete"
 msgstr "Ș&terge"
 
-#: ../picard/ui/ui_tageditor.py:145
+#: ../picard/ui/ui_tageditor.py:134
 msgid "&Metadata"
 msgstr "&Metadate"
 
-#: ../picard/ui/ui_tageditor.py:146
+#: ../picard/ui/ui_tageditor.py:135
 msgid "A&rtwork"
 msgstr "Cope&rți"
 
-#: ../picard/ui/ui_tageditor.py:147
+#: ../picard/ui/ui_tageditor.py:136
 msgid "&Info"
 msgstr "&Informații"
 
@@ -1888,6 +1924,40 @@ msgstr " / "
 msgid ", "
 msgstr ", "
 
+#: ../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:72
+msgid "Port:"
+msgstr "Port:"
+
+#: ../picard/ui/ui_options_general.py:110 ../picard/ui/ui_options_proxy.py:73
+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:112 ../picard/ui/ui_options_proxy.py:70
+#: ../picard/ui/ui_passworddialog.py:80
+msgid "Password:"
+msgstr "Parolă:"
+
+#: ../picard/ui/ui_options_general.py:113 ../picard/ui/ui_options_proxy.py:71
+#: ../picard/ui/ui_passworddialog.py:79
+msgid "Username:"
+msgstr "Utilizator:"
+
+#: ../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_interface.py:50
 msgid "Miscellaneous"
 msgstr "Diverse"
@@ -1908,113 +1978,6 @@ msgstr "Folosește sintaxa avansată de căutare"
 msgid "User interface language:"
 msgstr ""
 
-#: ../picard/ui/ui_options_naming.py:165
-msgid "Rename Files"
-msgstr "Redenumește fișiere"
-
-#: ../picard/ui/ui_options_naming.py:166
-msgid "Replace Windows-incompatible characters"
-msgstr "Înlocuiește caracterele incompatibile cu Windows"
-
-#: ../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_proxy.py:81 ../picard/ui/options/proxy.py:28
-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 "Port:"
-
-#: ../picard/ui/ui_options_proxy.py:85 ../picard/ui/ui_options_general.py:110
-msgid "Server address:"
-msgstr "Adresa serverului:"
-
-#: ../picard/ui/ui_options_ratings.py:45
-msgid "Enable track ratings"
-msgstr ""
-
-#: ../picard/ui/ui_options_ratings.py:46
-msgid ""
-"Picard saves the ratings together with an e-mail address identifying the "
-"user who did the rating. That way different ratings for different users can "
-"be stored in the files. Please sepcify the e-mail you want to use to save "
-"your ratings."
-msgstr ""
-
-#: ../picard/ui/ui_options_ratings.py:47
-msgid "E-mail:"
-msgstr ""
-
-#: ../picard/ui/ui_options_general.py:108
-msgid "MusicBrainz Server"
-msgstr "Serverul MusicBrainz"
-
-#: ../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"
@@ -2072,74 +2035,152 @@ msgstr "Artiști multipli:"
 msgid "Non-album tracks:"
 msgstr "Piese fără album:"
 
-#: ../picard/ui/ui_options_plugins.py:58 ../picard/ui/options/plugins.py:30
+#: ../picard/ui/ui_options_metadata.py:109
+#: ../picard/ui/ui_options_metadata.py:110
+#: ../picard/ui/ui_options_renaming.py:155
+#: ../picard/ui/ui_options_renaming.py:158
+msgid "Default"
+msgstr "Implicit"
+
+#: ../picard/ui/ui_options_plugins.py:58 ../picard/ui/options/plugins.py:34
 msgid "Plugins"
 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:84
 msgid "Author"
 msgstr "Autor"
 
-#: ../picard/ui/ui_options_plugins.py:61 ../picard/util/tags.py:36
+#: ../picard/ui/ui_options_plugins.py:61 ../picard/util/tags.py:37
 msgid "Version"
 msgstr "Versiune"
 
-#: ../picard/ui/ui_options_script.py:52
+#: ../picard/ui/ui_options_proxy.py:69 ../picard/ui/options/proxy.py:28
+msgid "Web Proxy"
+msgstr "Proxy de rețea"
+
+#: ../picard/ui/ui_options_ratings.py:45
+msgid "Enable track ratings"
+msgstr ""
+
+#: ../picard/ui/ui_options_ratings.py:46
+msgid ""
+"Picard saves the ratings together with an e-mail address identifying the "
+"user who did the rating. That way different ratings for different users can "
+"be stored in the files. Please sepcify the e-mail you want to use to save "
+"your ratings."
+msgstr ""
+
+#: ../picard/ui/ui_options_ratings.py:47
+msgid "E-mail:"
+msgstr ""
+
+#: ../picard/ui/ui_options_renaming.py:145
+#, fuzzy
+msgid "Form"
+msgstr "Format:"
+
+#: ../picard/ui/ui_options_renaming.py:146
+#, fuzzy
+msgid "Rename files when saving"
+msgstr "Redenumeşte fişierele când sunt etichetate cu metadate"
+
+#: ../picard/ui/ui_options_renaming.py:147
+msgid "Replace non-ASCII characters"
+msgstr "Înlocuiește caracterele non-ASCII"
+
+#: ../picard/ui/ui_options_renaming.py:148
+msgid "Replace Windows-incompatible characters"
+msgstr "Înlocuiește caracterele incompatibile cu Windows"
+
+#: ../picard/ui/ui_options_renaming.py:149
+msgid "Name files like this"
+msgstr ""
+
+#: ../picard/ui/ui_options_renaming.py:156
+msgid "Name multiple artist albums differently"
+msgstr ""
+
+#: ../picard/ui/ui_options_renaming.py:157
+msgid "Copy from above"
+msgstr ""
+
+#: ../picard/ui/ui_options_renaming.py:159
+#, fuzzy
+msgid "Examples"
+msgstr "Exemplu"
+
+#: ../picard/ui/ui_options_script.py:43
 msgid "Tagger Script"
 msgstr "Scripturi de etichetare"
 
-#: ../picard/ui/ui_options_tags.py:85
-msgid "Common"
-msgstr "General"
+#: ../picard/ui/ui_options_tags.py:97
+#, fuzzy
+msgid "Do not write tags to files"
+msgstr "Nu scrie tag-urile în fișiere"
 
-#: ../picard/ui/ui_options_tags.py:86
-msgid "Clear existing tags before writing new tags"
-msgstr "Șterge tag-urile existente înainte de rescriere"
-
-#: ../picard/ui/ui_options_tags.py:87
-msgid "Don not write tags to files"
+#: ../picard/ui/ui_options_tags.py:98
+msgid "Before tagging"
 msgstr ""
 
-#: ../picard/ui/ui_options_tags.py:88
-msgid "ID3"
-msgstr "ID3"
+#: ../picard/ui/ui_options_tags.py:99
+#, fuzzy
+msgid "Clear existing tags"
+msgstr "Șterge tag-urile existente înainte de rescriere"
 
-#: ../picard/ui/ui_options_tags.py:89
-msgid "Write ID3v1 tags to the files"
-msgstr "Scrie tag-uri ID3v1 în fișiere"
-
-#: ../picard/ui/ui_options_tags.py:90
-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_tags.py:91
-msgid "Text encoding to use while writing ID3v2 tags:"
-msgstr "Encoding text folosit la scrierea tag-urilor ID3v2"
-
-#: ../picard/ui/ui_options_tags.py:92
-msgid "ISO-8859-1"
-msgstr "ISO-8859-1"
-
-#: ../picard/ui/ui_options_tags.py:93
-msgid "UTF-16"
-msgstr "UTF-16"
-
-#: ../picard/ui/ui_options_tags.py:94
-msgid "UTF-8"
-msgstr "UTF-8"
-
-#: ../picard/ui/ui_options_tags.py:95
+#: ../picard/ui/ui_options_tags.py:100
 msgid "Remove ID3 tags from FLAC files"
 msgstr "Șterge tag-urile ID3 din fișierel FLAC"
 
-#: ../picard/ui/ui_options_tags.py:96
-msgid "APE"
-msgstr "APE"
-
-#: ../picard/ui/ui_options_tags.py:97
+#: ../picard/ui/ui_options_tags.py:101
 msgid "Remove APEv2 tags from MP3 files"
 msgstr "Șterge tag-urile APEv2 din fișierele MP3"
 
+#: ../picard/ui/ui_options_tags.py:102
+msgid "Tag compatibility"
+msgstr ""
+
+#: ../picard/ui/ui_options_tags.py:103
+#, fuzzy
+msgid "ID3v2 version"
+msgstr "doar ID3v2.4"
+
+#: ../picard/ui/ui_options_tags.py:104
+msgid "2.4"
+msgstr ""
+
+#: ../picard/ui/ui_options_tags.py:105
+msgid "2.3"
+msgstr ""
+
+#: ../picard/ui/ui_options_tags.py:106
+#, fuzzy
+msgid "Also include ID3v1 tags in the files"
+msgstr "Scrie tag-uri ID3v1 în fișiere"
+
+#: ../picard/ui/ui_options_tags.py:107
+msgid "ID3v2 text encoding"
+msgstr ""
+
+#: ../picard/ui/ui_options_tags.py:108
+msgid "UTF-8"
+msgstr "UTF-8"
+
+#: ../picard/ui/ui_options_tags.py:109
+msgid "UTF-16"
+msgstr "UTF-16"
+
+#: ../picard/ui/ui_options_tags.py:110
+msgid "ISO-8859-1"
+msgstr "ISO-8859-1"
+
+#: ../picard/ui/ui_passworddialog.py:78
+msgid "Authentication required"
+msgstr "Autentificare necesară"
+
+#: ../picard/ui/ui_passworddialog.py:81
+msgid "Save username and password"
+msgstr "Păstrează numele și parola"
+
 #: ../picard/ui/ui_tagsfromfilenames.py:56
 msgid "Convert File Names to Tags"
 msgstr "Transformă numele fișierelor în tag-uri"
@@ -2148,6 +2189,10 @@ msgstr "Transformă numele fișierelor în tag-uri"
 msgid "Replace underscores with spaces"
 msgstr "Înlocuiește liniuța de subliniere cu spațiu"
 
+#: ../picard/ui/ui_tagsfromfilenames.py:58
+msgid "&Preview"
+msgstr "&Previzualizează"
+
 #: ../picard/ui/options/about.py:29
 msgid "About"
 msgstr "Despre noi"
@@ -2174,8 +2219,8 @@ msgstr "<br/>Tradus în românește de %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"
@@ -2183,17 +2228,16 @@ msgid ""
 "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\"><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/P"
-"icardTagger</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"
 "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"
@@ -2201,14 +2245,13 @@ msgstr ""
 "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\"><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/P"
-"icardTagger</a></p>\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"
@@ -2240,257 +2283,266 @@ msgstr ""
 msgid "None"
 msgstr ""
 
-#: ../picard/ui/options/naming.py:33
-msgid "File Naming"
-msgstr ""
+#: ../picard/ui/options/moving.py:33
+#, fuzzy
+msgid "Moving files"
+msgstr "Mutare fișiere"
 
-#: ../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 "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 "Formatul numelor de fișiere cu artiști multipli nu poate fi gol."
-
-#: ../picard/ui/options/naming.py:97
+#: ../picard/ui/options/moving.py:65
 msgid "Error"
 msgstr "Eroare"
 
-#: ../picard/ui/options/naming.py:97
+#: ../picard/ui/options/moving.py:65
 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"
+#: ../picard/ui/options/ratings.py:29
+msgid "Ratings"
 msgstr ""
 
 #: ../picard/ui/options/tags.py:29
 msgid "Tags"
 msgstr "Etichete"
 
-#: ../picard/ui/options/ratings.py:29
-msgid "Ratings"
+#: ../picard/ui/options/renaming.py:35
+#, fuzzy
+msgid "File naming"
+msgstr "Nume fișier:"
+
+#: ../picard/ui/options/renaming.py:123
+msgid "The file naming format must not be empty."
+msgstr "Formatul numelor de fișiere nu poate fi gol."
+
+#: ../picard/ui/options/renaming.py:133
+msgid "The multiple artist file naming format must not be empty."
+msgstr "Formatul numelor de fișiere cu artiști multipli nu poate fi gol."
+
+#: ../picard/ui/options/scripting.py:63
+msgid "Scripting"
 msgstr ""
 
+#: ../picard/ui/options/scripting.py:97
+msgid "Script Error"
+msgstr "Eroare în script"
+
 #: ../picard/util/tags.py:24
 msgid "Date"
 msgstr ""
 
 #: ../picard/util/tags.py:25
+#, fuzzy
+msgid "Original Release Date"
+msgstr "Metadate originale"
+
+#: ../picard/util/tags.py:26
 msgid "Album Artist"
 msgstr ""
 
-#: ../picard/util/tags.py:26
+#: ../picard/util/tags.py:27
 msgid "Track Number"
 msgstr ""
 
-#: ../picard/util/tags.py:27
+#: ../picard/util/tags.py:28
 msgid "Total Tracks"
 msgstr ""
 
-#: ../picard/util/tags.py:28
+#: ../picard/util/tags.py:29
 msgid "Disc Number"
 msgstr ""
 
-#: ../picard/util/tags.py:29
+#: ../picard/util/tags.py:30
 msgid "Total Discs"
 msgstr ""
 
-#: ../picard/util/tags.py:30
+#: ../picard/util/tags.py:31
 msgid "Album Artist Sort Order"
 msgstr ""
 
-#: ../picard/util/tags.py:31
+#: ../picard/util/tags.py:32
 msgid "Artist Sort Order"
 msgstr ""
 
-#: ../picard/util/tags.py:32
+#: ../picard/util/tags.py:33
 msgid "Title Sort Order"
 msgstr ""
 
-#: ../picard/util/tags.py:33
+#: ../picard/util/tags.py:34
 msgid "Album Sort Order"
 msgstr ""
 
-#: ../picard/util/tags.py:34
+#: ../picard/util/tags.py:35
 msgid "ASIN"
 msgstr ""
 
-#: ../picard/util/tags.py:35
+#: ../picard/util/tags.py:36
 msgid "Grouping"
 msgstr ""
 
-#: ../picard/util/tags.py:37
+#: ../picard/util/tags.py:38
 msgid "ISRC"
 msgstr ""
 
-#: ../picard/util/tags.py:38
+#: ../picard/util/tags.py:39
 msgid "Mood"
 msgstr ""
 
-#: ../picard/util/tags.py:39
+#: ../picard/util/tags.py:40
 msgid "BPM"
 msgstr ""
 
-#: ../picard/util/tags.py:40
+#: ../picard/util/tags.py:41
 msgid "Copyright"
 msgstr ""
 
-#: ../picard/util/tags.py:41
+#: ../picard/util/tags.py:42
 msgid "Composer"
 msgstr ""
 
-#: ../picard/util/tags.py:42
+#: ../picard/util/tags.py:43
 msgid "Conductor"
 msgstr ""
 
-#: ../picard/util/tags.py:43
+#: ../picard/util/tags.py:44
 msgid "Lyricist"
 msgstr ""
 
-#: ../picard/util/tags.py:44
+#: ../picard/util/tags.py:45
 msgid "Arranger"
 msgstr ""
 
-#: ../picard/util/tags.py:45
+#: ../picard/util/tags.py:46
 msgid "Producer"
 msgstr ""
 
-#: ../picard/util/tags.py:46
+#: ../picard/util/tags.py:47
 msgid "Engineer"
 msgstr ""
 
-#: ../picard/util/tags.py:47
+#: ../picard/util/tags.py:48
 msgid "Subtitle"
 msgstr ""
 
-#: ../picard/util/tags.py:48
+#: ../picard/util/tags.py:49
 msgid "Disc Subtitle"
 msgstr ""
 
-#: ../picard/util/tags.py:49
+#: ../picard/util/tags.py:50
 msgid "Remixer"
 msgstr ""
 
-#: ../picard/util/tags.py:50
+#: ../picard/util/tags.py:51
 msgid "MusicBrainz Track Id"
 msgstr ""
 
-#: ../picard/util/tags.py:51
+#: ../picard/util/tags.py:52
 msgid "MusicBrainz Release Id"
 msgstr ""
 
-#: ../picard/util/tags.py:52
+#: ../picard/util/tags.py:53
 msgid "MusicBrainz Artist Id"
 msgstr ""
 
-#: ../picard/util/tags.py:53
+#: ../picard/util/tags.py:54
 msgid "MusicBrainz Release Artist Id"
 msgstr ""
 
-#: ../picard/util/tags.py:54
+#: ../picard/util/tags.py:55
 msgid "MusicBrainz TRM Id"
 msgstr ""
 
-#: ../picard/util/tags.py:55
+#: ../picard/util/tags.py:56
 msgid "MusicBrainz Disc Id"
 msgstr ""
 
-#: ../picard/util/tags.py:56
+#: ../picard/util/tags.py:57
 msgid "MusicBrainz Sort Name"
 msgstr ""
 
-#: ../picard/util/tags.py:57
+#: ../picard/util/tags.py:58
 msgid "MusicIP PUID"
 msgstr ""
 
-#: ../picard/util/tags.py:58
+#: ../picard/util/tags.py:59
 msgid "MusicIP Fingerprint"
 msgstr ""
 
-#: ../picard/util/tags.py:59
+#: ../picard/util/tags.py:60
 msgid "Disc Id"
 msgstr ""
 
-#: ../picard/util/tags.py:60
+#: ../picard/util/tags.py:61
 msgid "Website"
 msgstr ""
 
-#: ../picard/util/tags.py:61
+#: ../picard/util/tags.py:62
 msgid "Compilation"
 msgstr ""
 
-#: ../picard/util/tags.py:62
+#: ../picard/util/tags.py:63
 msgid "Comment"
 msgstr ""
 
-#: ../picard/util/tags.py:63
+#: ../picard/util/tags.py:64
 msgid "Genre"
 msgstr ""
 
-#: ../picard/util/tags.py:64
+#: ../picard/util/tags.py:65
 msgid "Encoded By"
 msgstr ""
 
-#: ../picard/util/tags.py:65
+#: ../picard/util/tags.py:66
 msgid "Performer"
 msgstr ""
 
-#: ../picard/util/tags.py:66
+#: ../picard/util/tags.py:67
 msgid "Release Type"
 msgstr ""
 
-#: ../picard/util/tags.py:67
+#: ../picard/util/tags.py:68
 msgid "Release Status"
 msgstr ""
 
-#: ../picard/util/tags.py:68
+#: ../picard/util/tags.py:69
 msgid "Release Country"
 msgstr ""
 
-#: ../picard/util/tags.py:69
+#: ../picard/util/tags.py:70
 msgid "Record Label"
 msgstr ""
 
-#: ../picard/util/tags.py:70
+#: ../picard/util/tags.py:71
 msgid "Barcode"
 msgstr ""
 
-#: ../picard/util/tags.py:71
+#: ../picard/util/tags.py:72
 msgid "Catalog Number"
 msgstr ""
 
-#: ../picard/util/tags.py:72
+#: ../picard/util/tags.py:73
 msgid "Format"
 msgstr ""
 
-#: ../picard/util/tags.py:73
+#: ../picard/util/tags.py:74
 msgid "DJ-Mixer"
 msgstr ""
 
-#: ../picard/util/tags.py:74
+#: ../picard/util/tags.py:75
 msgid "Media"
 msgstr ""
 
-#: ../picard/util/tags.py:75
+#: ../picard/util/tags.py:76
 msgid "Lyrics"
 msgstr ""
 
-#: ../picard/util/tags.py:76
+#: ../picard/util/tags.py:77
 msgid "Mixer"
 msgstr ""
 
-#: ../picard/util/tags.py:77
+#: ../picard/util/tags.py:78
 msgid "Language"
 msgstr "Limba"
 
-#: ../picard/util/tags.py:78
+#: ../picard/util/tags.py:79
 msgid "Script"
 msgstr ""
 
@@ -2509,16 +2561,39 @@ msgstr ""
 "\n"
 "%s"
 
-#, python-format
+#~ msgid "Rename Files"
+#~ msgstr "Redenumește fișiere"
+
+#~ msgid "Multiple artist file naming format:"
+#~ msgstr "Numele fișierelor cu artiști multipli:"
+
+#~ msgid "File naming format:"
+#~ msgstr "Formatul numelor de fișier:"
+
+#~ msgid "Multiple artist file name:"
+#~ msgstr "Nume de fișier cu artiști multipli:"
+
+#~ msgid "Common"
+#~ msgstr "General"
+
+#~ msgid "ID3"
+#~ msgstr "ID3"
+
+#~ msgid "Write ID3v2 version 2.3 tags (2.4 is default)"
+#~ msgstr "Scrie tag-uri ID3v2 versiunea 2.3 (altfel sunt 2.4)"
+
+#~ msgid "Text encoding to use while writing ID3v2 tags:"
+#~ msgstr "Encoding text folosit la scrierea tag-urilor ID3v2"
+
+#~ msgid "APE"
+#~ msgstr "APE"
+
 #~ msgid "[couldn't load album %s]"
 #~ msgstr "[nu pot încărca albumul %s]"
 
 #~ msgid "Automatically analyze all new files"
 #~ msgstr "Analizează automat toate fişierelor noi"
 
-#~ msgid "Don't write tags to files"
-#~ msgstr "Nu scrie tag-urile în fișiere"
-
 #~ msgid "Delete"
 #~ msgstr "Șterge"
 
@@ -2645,9 +2720,6 @@ msgstr ""
 #~ 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"
 
@@ -2666,9 +2738,6 @@ msgstr ""
 #~ msgid "Proxy port"
 #~ msgstr "Portul proxy-ului"
 
-#~ msgid "ID3v2.4 only"
-#~ msgstr "doar ID3v2.4"
-
 #~ msgid "Save track/album"
 #~ msgstr "Salvează piesa/albumul"
 
@@ -2703,15 +2772,16 @@ msgstr ""
 #~ 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"
-#~ "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. "
+#~ "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 ""
-#~ "Nu aţi specificat un nume de utilizator şi o parolă. Pentru a contribui 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. "
+#~ "Nu aţi specificat un nume de utilizator şi o parolă. Pentru a contribui "
+#~ "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."
@@ -2735,20 +2805,21 @@ msgstr ""
 #~ 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."
+#~ "Please fix the move option or the destination directory option and try "
+#~ "again."
 #~ msgstr ""
-#~ "Opţiunea de mutare a fişierelor este activată, dar directorul destinaţie e "
-#~ "nespecificat sau inexistent.\n"
-#~ "Vă rugăm corectaţi opţiunea de mutare sau directorul destinaţi şi încercaţi "
-#~ "din nou."
+#~ "Opţiunea de mutare a fişierelor este activată, dar directorul destinaţie "
+#~ "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 click the "
-#~ "track and select 'Clear Error'"
+#~ "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 ""
-#~ "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, "
+#~ "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"
@@ -2773,7 +2844,8 @@ msgstr ""
 #~ msgstr "Vă rugăm să faceţi o donaţie pentru MusicBrainz!"
 
 #~ msgid ""
-#~ "The destination directory %s does not exist. Please pick a valid directory."
+#~ "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."
 
@@ -2794,9 +2866,6 @@ msgstr ""
 #~ 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"
 
@@ -2818,7 +2887,8 @@ msgstr ""
 
 #~ 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)"
+#~ "Scrie etichete ID3v1 în fişierele MP3 (etichetele ID3v2 sunt scrise "
+#~ "oricum)"
 
 #~ msgid "Remove track/album"
 #~ msgstr "Elimină piesa/albumul"
@@ -2877,8 +2947,8 @@ msgstr ""
 #~ 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. "
+#~ "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. "
@@ -2893,7 +2963,8 @@ msgstr ""
 #~ 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."
+#~ msgstr ""
+#~ "Notă: Lăsaţi câmpul gol pentru a permite toate caracterele posibile."
 
 #~ msgid "Track artist name"
 #~ msgstr "Numele artistului asociat piesei"
diff --git a/po/ru.po b/po/ru.po
index d3233c9c9..a33709544 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: picard\n"
 "Report-Msgid-Bugs-To: http://bugs.musicbrainz.org/\n"
-"POT-Creation-Date: 2009-02-24 18:58+0100\n"
+"POT-Creation-Date: 2009-04-06 22:50+0200\n"
 "PO-Revision-Date: 2009-03-30 08:31+0000\n"
 "Last-Translator: Oleg \"Rowaa[SR13]\" V. Volkov <Unknown>\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"
+"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-04-06 20:21+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 "X-Poedit-Country: RUSSIAN FEDERATION\n"
@@ -22,16 +22,16 @@ msgstr ""
 "Generated-By: pygettext.py 1.5\n"
 "X-Poedit-Language: Russian\n"
 
-#: ../picard/album.py:108 ../picard/cluster.py:248
+#: ../picard/album.py:109 ../picard/cluster.py:248
 msgid "Unmatched Files"
 msgstr "Неопознанные файлы"
 
-#: ../picard/album.py:281
+#: ../picard/album.py:287
 #, python-format
 msgid "[could not load album %s]"
 msgstr "[не удается загрузить альбом %s]"
 
-#: ../picard/album.py:317
+#: ../picard/album.py:320
 msgid "[loading album information]"
 msgstr "[загружается информация об альбоме]"
 
@@ -591,7 +591,8 @@ msgid "Namibia"
 msgstr "Намибия"
 
 #: ../picard/const.py:182
-msgid "Vanuat"
+#, fuzzy
+msgid "Vanuatu"
 msgstr "Вануату"
 
 #: ../picard/const.py:183
@@ -1035,223 +1036,239 @@ msgid "Congo, The Democratic Republic of the"
 msgstr "Демократическая Республика Конго"
 
 #: ../picard/const.py:293
-msgid "Serbia and Montenegro"
+#, fuzzy
+msgid "Serbia and Montenegro (historical, 2003-2006)"
 msgstr "Сербия и Черногория"
 
 #: ../picard/const.py:294
+#, fuzzy
+msgid "Serbia"
+msgstr "Азербайджан"
+
+#: ../picard/const.py:295
+#, fuzzy
+msgid "Montenegro"
+msgstr "Сербия и Черногория"
+
+#: ../picard/const.py:296
 msgid "Croatia"
 msgstr "Хорватия"
 
-#: ../picard/const.py:295
+#: ../picard/const.py:297
 msgid "Korea (North), Democratic People's Republic of"
 msgstr "Корейская Народная Демократиеская Республика"
 
-#: ../picard/const.py:296
+#: ../picard/const.py:298
 msgid "Korea (South), Republic of"
 msgstr "Южная Корея"
 
-#: ../picard/const.py:297
+#: ../picard/const.py:299
 msgid "Slovakia"
 msgstr "Словакия"
 
-#: ../picard/const.py:298
+#: ../picard/const.py:300
 msgid "Soviet Union (historical, 1922-1991)"
 msgstr "СССР (бывший, 1922-1991)"
 
-#: ../picard/const.py:299
+#: ../picard/const.py:301
 msgid "East Timor"
 msgstr "Восточный Тимор"
 
-#: ../picard/const.py:300
+#: ../picard/const.py:302
 msgid "Czechoslovakia (historical, 1918-1992)"
 msgstr "Чехословакия (бывшая, 1918-1992)"
 
-#: ../picard/const.py:301
+#: ../picard/const.py:303
 msgid "Europe"
 msgstr "Европа"
 
-#: ../picard/const.py:302
+#: ../picard/const.py:304
 msgid "East Germany (historical, 1949-1990)"
 msgstr "Восточная Германия (бывшая, 1949-1990)"
 
-#: ../picard/const.py:303
+#: ../picard/const.py:305
 msgid "[Unknown Country]"
 msgstr "[Неизвестное государство]"
 
-#: ../picard/const.py:304
+#: ../picard/const.py:306
 msgid "[Worldwide]"
 msgstr "[Всемирно]"
 
-#: ../picard/const.py:305
+#: ../picard/const.py:307
 msgid "Yugoslavia (historical, 1918-1992)"
 msgstr "Югославия (бывшая, 1918-1992)"
 
-#: ../picard/const.py:310
+#: ../picard/const.py:312
+msgid "Afrikaans"
+msgstr ""
+
+#: ../picard/const.py:313
+msgid "Arabic"
+msgstr ""
+
+#: ../picard/const.py:314
 msgid "Catalan"
 msgstr "Каталанский"
 
-#: ../picard/const.py:311
+#: ../picard/const.py:315
 msgid "Czech"
 msgstr "Чешский"
 
-#: ../picard/const.py:312
+#: ../picard/const.py:316
 msgid "Welsh"
 msgstr "Уэльский"
 
-#: ../picard/const.py:313
+#: ../picard/const.py:317
 msgid "Danish"
 msgstr "Датский"
 
-#: ../picard/const.py:314
+#: ../picard/const.py:318
 msgid "German"
 msgstr "Немецкий"
 
-#: ../picard/const.py:315
+#: ../picard/const.py:319
 msgid "English"
 msgstr "Английский"
 
-#: ../picard/const.py:316
+#: ../picard/const.py:320
 msgid "English (Canada)"
 msgstr "Английский (Канадский)"
 
-#: ../picard/const.py:317
+#: ../picard/const.py:321
 msgid "English (UK)"
 msgstr "Английский (Великобритания)"
 
-#: ../picard/const.py:318
+#: ../picard/const.py:322
 msgid "Spanish"
 msgstr "Испанский"
 
-#: ../picard/const.py:319
+#: ../picard/const.py:323
 msgid "Persian"
 msgstr "Персидский"
 
-#: ../picard/const.py:320
+#: ../picard/const.py:324
 msgid "Finnish"
 msgstr "Финский"
 
-#: ../picard/const.py:321
+#: ../picard/const.py:325
 msgid "French"
 msgstr "Французский"
 
-#: ../picard/const.py:322
+#: ../picard/const.py:326
 msgid "Frisian"
 msgstr "Фризский"
 
-#: ../picard/const.py:323
+#: ../picard/const.py:327
 msgid "Hebrew"
 msgstr "Иврит"
 
-#: ../picard/const.py:324
+#: ../picard/const.py:328
+#, fuzzy
+msgid "Hindi"
+msgstr "Гаити"
+
+#: ../picard/const.py:329
 msgid "Hungarian"
 msgstr "Венгерский"
 
-#: ../picard/const.py:325
+#: ../picard/const.py:330
 msgid "Islandic"
 msgstr "Исландский"
 
-#: ../picard/const.py:326
+#: ../picard/const.py:331
 msgid "Italian"
 msgstr "Итальянский"
 
-#: ../picard/const.py:327
+#: ../picard/const.py:332
 msgid "Kannada"
 msgstr "Каннада"
 
-#: ../picard/const.py:328
+#: ../picard/const.py:333
 msgid "Korean"
 msgstr "Корейский"
 
-#: ../picard/const.py:329
+#: ../picard/const.py:334
 msgid "Lithuanian"
 msgstr "Литовкий"
 
-#: ../picard/const.py:330
+#: ../picard/const.py:335
 msgid "Norwegian Bokmal"
 msgstr "Букмол"
 
-#: ../picard/const.py:331
+#: ../picard/const.py:336
 msgid "Dutch"
 msgstr "Голландский"
 
-#: ../picard/const.py:332
+#: ../picard/const.py:337
 msgid "Polish"
 msgstr "Польский"
 
-#: ../picard/const.py:333
+#: ../picard/const.py:338
 msgid "Portuguese"
 msgstr "Португальский"
 
-#: ../picard/const.py:334
+#: ../picard/const.py:339
 msgid "Brazilian Portuguese"
 msgstr "Португальский (Бразилия)"
 
-#: ../picard/const.py:335
+#: ../picard/const.py:340
 msgid "Romanian"
 msgstr "Румынский"
 
-#: ../picard/const.py:336
+#: ../picard/const.py:341
 msgid "Russian"
 msgstr "Русский"
 
-#: ../picard/const.py:337
+#: ../picard/const.py:342
 msgid "Scots"
 msgstr "Шотландский"
 
-#: ../picard/const.py:338
+#: ../picard/const.py:343
 msgid "Slovak"
 msgstr "Словацкий"
 
-#: ../picard/const.py:339
+#: ../picard/const.py:344
 msgid "Slovenian"
 msgstr "Словенский"
 
-#: ../picard/const.py:340
+#: ../picard/const.py:345
 msgid "Swedish"
 msgstr "Шведский"
 
-#: ../picard/const.py:341
+#: ../picard/const.py:346
+#, fuzzy
+msgid "Turkish"
+msgstr "Туркменистан"
+
+#: ../picard/const.py:347
 msgid "Chinese"
 msgstr "Китайский"
 
-#: ../picard/file.py:487
+#: ../picard/file.py:494
 #, python-format
 msgid "No matching tracks for file %s"
 msgstr "Нет подходящих произведений для файла %s"
 
-#: ../picard/file.py:504
+#: ../picard/file.py:511
 #, python-format
 msgid "No matching tracks above the threshold for file %s"
 msgstr "Не найдены треки, удовлетворяющие условиям для файла %s"
 
-#: ../picard/file.py:507
+#: ../picard/file.py:514
 #, python-format
 msgid "File %s identified!"
 msgstr "Файл %s идентифицирован!"
 
-#: ../picard/file.py:518
+#: ../picard/file.py:525
 #, python-format
 msgid "Looking up the PUID for file %s..."
 msgstr "Поиск PUID для файла %s…"
 
-#: ../picard/file.py:523
+#: ../picard/file.py:530
 #, 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)"
@@ -1264,11 +1281,24 @@ msgstr "PLS плейлист (*.pls)"
 msgid "XSPF Playlist (*.xspf)"
 msgstr "XSPF плейлист (*.xspf)"
 
-#: ../picard/tagger.py:476
+#: ../picard/puidmanager.py:62
+msgid "Submitting PUIDs..."
+msgstr "Идёт передача PUID’ов…"
+
+#: ../picard/puidmanager.py:68
+#, python-format
+msgid "PUIDs submission failed: %s"
+msgstr "Передача PUID’ов не удалась: %s"
+
+#: ../picard/puidmanager.py:70
+msgid "PUIDs successfully submitted!"
+msgstr "PUID’ы успешно переданы!"
+
+#: ../picard/tagger.py:477
 msgid "CD Lookup Error"
 msgstr "Ошибка опознавания CD"
 
-#: ../picard/tagger.py:477
+#: ../picard/tagger.py:478
 #, python-format
 msgid ""
 "Error while reading CD:\n"
@@ -1279,7 +1309,7 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../picard/tagger.py:503
+#: ../picard/tagger.py:504
 #, python-format
 msgid "Could not find PUID for file %s"
 msgstr "Не удается найти PUID для файла %s"
@@ -1332,15 +1362,28 @@ msgstr "Показать &скрытые файлы"
 msgid "Length"
 msgstr "Длина"
 
-#: ../picard/ui/itemviews.py:327
+#: ../picard/ui/itemviews.py:289
+msgid "&Expand all"
+msgstr ""
+
+#: ../picard/ui/itemviews.py:291
+msgid "&Collapse all"
+msgstr ""
+
+#: ../picard/ui/itemviews.py:332
 msgid "&Releases"
 msgstr "&Релизы"
 
-#: ../picard/ui/itemviews.py:353
+#: ../picard/ui/itemviews.py:349
+#, fuzzy
+msgid "No release event"
+msgstr "Месяц выпуска альбома"
+
+#: ../picard/ui/itemviews.py:359
 msgid "&Plugins"
 msgstr "П&лагины"
 
-#: ../picard/ui/itemviews.py:523
+#: ../picard/ui/itemviews.py:533
 msgid "Clusters"
 msgstr "Кластеры"
 
@@ -1348,98 +1391,6 @@ msgstr "Кластеры"
 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:66 ../picard/ui/ui_options_plugins.py:62
-msgid "Details"
-msgstr "Подробности"
-
-#: ../picard/ui/tageditor.py:71 ../picard/ui/tageditor.py:264
-#, python-format
-msgid "%d file"
-msgid_plural "%d files"
-msgstr[0] "%d файл"
-msgstr[1] "%d файла"
-msgstr[2] "%d файлов"
-
-#: ../picard/ui/tageditor.py:131
-#, 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:134
-#, 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:233
-msgid "Filename:"
-msgstr "Имя файла:"
-
-#: ../picard/ui/tageditor.py:235
-msgid "Format:"
-msgstr "Формат:"
-
-#: ../picard/ui/tageditor.py:244
-msgid "Size:"
-msgstr "Размер:"
-
-#: ../picard/ui/tageditor.py:248 ../picard/ui/ui_metadata.py:127
-msgid "Length:"
-msgstr "Длительность:"
-
-#: ../picard/ui/tageditor.py:250
-msgid "Bitrate:"
-msgstr "Битрейт:"
-
-#: ../picard/ui/tageditor.py:252
-msgid "Sample rate:"
-msgstr "Частота дискретизации:"
-
-#: ../picard/ui/tageditor.py:254
-msgid "Bits per sample:"
-msgstr "Битов на семпл:"
-
-#: ../picard/ui/tageditor.py:257
-msgid "Mono"
-msgstr "Моно"
-
-#: ../picard/ui/tageditor.py:258
-msgid "Stereo"
-msgstr "Стерео"
-
-#: ../picard/ui/tageditor.py:260
-msgid "Channels:"
-msgstr "Каналы:"
-
-#: ../picard/ui/tagsfromfilenames.py:52 ../picard/ui/tagsfromfilenames.py:96
-msgid "File Name"
-msgstr "Имя файла"
-
 #: ../picard/ui/mainwindow.py:64
 msgid "MusicBrainz Picard"
 msgstr "MusicBrainz Picard"
@@ -1676,6 +1627,10 @@ msgstr "&Панель поиска"
 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 "Все поддерживаемые форматы"
@@ -1695,6 +1650,22 @@ msgstr "Плейлист %s сохранен"
 msgid " (Error: %s)"
 msgstr " (Ошибка: %s)"
 
+#: ../picard/ui/puidsubmit.py:31 ../picard/ui/options/plugins.py:85
+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/passworddialog.py:38
 #, python-format
 msgid ""
@@ -1703,6 +1674,78 @@ msgstr ""
 "Сервер %s требует вашей авторизации. Пожалуйста введите имя пользователя и "
 "пароль"
 
+#: ../picard/ui/tageditor.py:66 ../picard/ui/ui_options_plugins.py:62
+msgid "Details"
+msgstr "Подробности"
+
+#: ../picard/ui/tageditor.py:71 ../picard/ui/tageditor.py:264
+#, python-format
+msgid "%d file"
+msgid_plural "%d files"
+msgstr[0] "%d файл"
+msgstr[1] "%d файла"
+msgstr[2] "%d файлов"
+
+#: ../picard/ui/tageditor.py:131
+#, 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:134
+#, 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:233
+msgid "Filename:"
+msgstr "Имя файла:"
+
+#: ../picard/ui/tageditor.py:235
+msgid "Format:"
+msgstr "Формат:"
+
+#: ../picard/ui/tageditor.py:244
+msgid "Size:"
+msgstr "Размер:"
+
+#: ../picard/ui/tageditor.py:248 ../picard/ui/ui_metadata.py:127
+msgid "Length:"
+msgstr "Длительность:"
+
+#: ../picard/ui/tageditor.py:250
+msgid "Bitrate:"
+msgstr "Битрейт:"
+
+#: ../picard/ui/tageditor.py:252
+msgid "Sample rate:"
+msgstr "Частота дискретизации:"
+
+#: ../picard/ui/tageditor.py:254
+msgid "Bits per sample:"
+msgstr "Битов на семпл:"
+
+#: ../picard/ui/tageditor.py:257
+msgid "Mono"
+msgstr "Моно"
+
+#: ../picard/ui/tageditor.py:258
+msgid "Stereo"
+msgstr "Стерео"
+
+#: ../picard/ui/tageditor.py:260
+msgid "Channels:"
+msgstr "Каналы:"
+
+#: ../picard/ui/tagsfromfilenames.py:54 ../picard/ui/tagsfromfilenames.py:99
+msgid "File Name"
+msgstr "Имя файла"
+
 #: ../picard/ui/ui_cdlookup.py:60 ../picard/ui/ui_options_cdlookup.py:47
 #: ../picard/ui/ui_options_cdlookup_select.py:48
 #: ../picard/ui/options/cdlookup.py:36
@@ -1725,24 +1768,6 @@ msgstr "    Опознать вручную    "
 msgid "Cancel"
 msgstr "Отмена"
 
-#: ../picard/ui/ui_passworddialog.py:78
-msgid "Authentication required"
-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"
-msgstr "Сохранить имя пользователя и пароль"
-
 #: ../picard/ui/ui_edittagdialog.py:44
 msgid "Edit Tag"
 msgstr "Редактирование тега"
@@ -1779,6 +1804,10 @@ msgstr "Альбом:"
 msgid "Options"
 msgstr "Настройки"
 
+#: ../picard/ui/ui_puidsubmit.py:52
+msgid "Submit PUIDs"
+msgstr "Передать PUID’ы"
+
 #: ../picard/ui/ui_options_cdlookup.py:48
 msgid "CD-ROM device to use for lookups:"
 msgstr "Привод CD-ROM для опознавания:"
@@ -1803,6 +1832,23 @@ msgstr "Сохранять обложки как отдельные файлы"
 msgid "Overwrite the file if it already exists"
 msgstr "Перезаписывать файл, если он уже есть"
 
+#: ../picard/ui/ui_options_moving.py:53
+msgid "Move additional files:"
+msgstr "Переносить дополнительные файлы:"
+
+#: ../picard/ui/ui_options_moving.py:54
+msgid "Browse..."
+msgstr "Обзор…"
+
+#: ../picard/ui/ui_options_moving.py:55
+msgid "Delete empty directories"
+msgstr "Удалять пустые каталоги"
+
+#: ../picard/ui/ui_options_moving.py:56
+#, fuzzy
+msgid "Move files to this directory when saving:"
+msgstr "Переносить обработанные файлы в следующую директорию:"
+
 #: ../picard/ui/util.py:31
 msgid "&Ok"
 msgstr "&OK"
@@ -1811,44 +1857,40 @@ msgstr "&OK"
 msgid "&Cancel"
 msgstr "&Отмена"
 
-#: ../picard/ui/ui_puidsubmit.py:52
-msgid "Submit PUIDs"
-msgstr "Передать PUID’ы"
-
-#: ../picard/ui/ui_tageditor.py:139 ../picard/ui/ui_options_plugins.py:59
-#: ../picard/ui/options/plugins.py:76
+#: ../picard/ui/ui_tageditor.py:128 ../picard/ui/ui_options_plugins.py:59
+#: ../picard/ui/options/plugins.py:81
 msgid "Name"
 msgstr "Имя"
 
-#: ../picard/ui/ui_tageditor.py:140
+#: ../picard/ui/ui_tageditor.py:129
 msgid "Value"
 msgstr "Значение"
 
-#: ../picard/ui/ui_tageditor.py:141
+#: ../picard/ui/ui_tageditor.py:130
 msgid "Rating:"
 msgstr "Рейтинг:"
 
-#: ../picard/ui/ui_tageditor.py:142
+#: ../picard/ui/ui_tageditor.py:131
 msgid "&Add..."
 msgstr "&Добавить…"
 
-#: ../picard/ui/ui_tageditor.py:143
+#: ../picard/ui/ui_tageditor.py:132
 msgid "&Edit..."
 msgstr "&Редактировать…"
 
-#: ../picard/ui/ui_tageditor.py:144
+#: ../picard/ui/ui_tageditor.py:133
 msgid "&Delete"
 msgstr "&Удалить"
 
-#: ../picard/ui/ui_tageditor.py:145
+#: ../picard/ui/ui_tageditor.py:134
 msgid "&Metadata"
 msgstr "&Метаданные"
 
-#: ../picard/ui/ui_tageditor.py:146
+#: ../picard/ui/ui_tageditor.py:135
 msgid "A&rtwork"
 msgstr "&Обложка"
 
-#: ../picard/ui/ui_tageditor.py:147
+#: ../picard/ui/ui_tageditor.py:136
 msgid "&Info"
 msgstr "&Информация"
 
@@ -1893,6 +1935,40 @@ msgstr " / "
 msgid ", "
 msgstr ", "
 
+#: ../picard/ui/ui_options_general.py:108
+msgid "MusicBrainz Server"
+msgstr "Сервер MusicBrainz"
+
+#: ../picard/ui/ui_options_general.py:109 ../picard/ui/ui_options_proxy.py:72
+msgid "Port:"
+msgstr "Порт:"
+
+#: ../picard/ui/ui_options_general.py:110 ../picard/ui/ui_options_proxy.py:73
+msgid "Server address:"
+msgstr "Адрес сервера:"
+
+#: ../picard/ui/ui_options_general.py:111
+msgid "Account Information"
+msgstr "Сведения об учётной записи"
+
+#: ../picard/ui/ui_options_general.py:112 ../picard/ui/ui_options_proxy.py:70
+#: ../picard/ui/ui_passworddialog.py:80
+msgid "Password:"
+msgstr "Пароль:"
+
+#: ../picard/ui/ui_options_general.py:113 ../picard/ui/ui_options_proxy.py:71
+#: ../picard/ui/ui_passworddialog.py:79
+msgid "Username:"
+msgstr "Имя пользователя:"
+
+#: ../picard/ui/ui_options_general.py:114 ../picard/ui/options/general.py:29
+msgid "General"
+msgstr "Основные"
+
+#: ../picard/ui/ui_options_general.py:115
+msgid "Automatically scan all new files"
+msgstr "Автоматически сканировать все новые файлы"
+
 #: ../picard/ui/ui_options_interface.py:50
 msgid "Miscellaneous"
 msgstr "Разное"
@@ -1913,117 +1989,6 @@ msgstr "Использовать расширенный синтаксис за
 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 "&Предварительный просмотр"
-
-#: ../picard/ui/ui_options_proxy.py:81 ../picard/ui/options/proxy.py:28
-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_options_ratings.py:45
-msgid "Enable track ratings"
-msgstr "Включить рейтинги композиций"
-
-#: ../picard/ui/ui_options_ratings.py:46
-msgid ""
-"Picard saves the ratings together with an e-mail address identifying the "
-"user who did the rating. That way different ratings for different users can "
-"be stored in the files. Please sepcify the e-mail you want to use to save "
-"your ratings."
-msgstr ""
-"Picard сохраняет рейтинг вместе с адресом e-mail, идентифицирующим "
-"пользователя, выставившего рейтинг. Таким образом в файлах могут храниться "
-"разные рейтинги для разных пользователей. Пожалуйста, укажите e-mail, "
-"который вы желаете использовать для сохранения своих рейтингов."
-
-#: ../picard/ui/ui_options_ratings.py:47
-msgid "E-mail:"
-msgstr "E-mail:"
-
-#: ../picard/ui/ui_options_general.py:108
-msgid "MusicBrainz Server"
-msgstr "Сервер MusicBrainz"
-
-#: ../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 "Основные"
-
-#: ../picard/ui/ui_options_general.py:115
-msgid "Automatically scan all new files"
-msgstr "Автоматически сканировать все новые файлы"
-
 #: ../picard/ui/ui_options_matching.py:105
 msgid "Thresholds"
 msgstr "Ограничения"
@@ -2080,74 +2045,156 @@ msgstr "Сборники:"
 msgid "Non-album tracks:"
 msgstr "Произведения не из альбома:"
 
-#: ../picard/ui/ui_options_plugins.py:58 ../picard/ui/options/plugins.py:30
+#: ../picard/ui/ui_options_metadata.py:109
+#: ../picard/ui/ui_options_metadata.py:110
+#: ../picard/ui/ui_options_renaming.py:155
+#: ../picard/ui/ui_options_renaming.py:158
+msgid "Default"
+msgstr "По умолчанию"
+
+#: ../picard/ui/ui_options_plugins.py:58 ../picard/ui/options/plugins.py:34
 msgid "Plugins"
 msgstr "Плагины"
 
-#: ../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:84
 msgid "Author"
 msgstr "Автор"
 
-#: ../picard/ui/ui_options_plugins.py:61 ../picard/util/tags.py:36
+#: ../picard/ui/ui_options_plugins.py:61 ../picard/util/tags.py:37
 msgid "Version"
 msgstr "Версия"
 
-#: ../picard/ui/ui_options_script.py:52
+#: ../picard/ui/ui_options_proxy.py:69 ../picard/ui/options/proxy.py:28
+msgid "Web Proxy"
+msgstr "Прокси"
+
+#: ../picard/ui/ui_options_ratings.py:45
+msgid "Enable track ratings"
+msgstr "Включить рейтинги композиций"
+
+#: ../picard/ui/ui_options_ratings.py:46
+msgid ""
+"Picard saves the ratings together with an e-mail address identifying the "
+"user who did the rating. That way different ratings for different users can "
+"be stored in the files. Please sepcify the e-mail you want to use to save "
+"your ratings."
+msgstr ""
+"Picard сохраняет рейтинг вместе с адресом e-mail, идентифицирующим "
+"пользователя, выставившего рейтинг. Таким образом в файлах могут храниться "
+"разные рейтинги для разных пользователей. Пожалуйста, укажите e-mail, "
+"который вы желаете использовать для сохранения своих рейтингов."
+
+#: ../picard/ui/ui_options_ratings.py:47
+msgid "E-mail:"
+msgstr "E-mail:"
+
+#: ../picard/ui/ui_options_renaming.py:145
+#, fuzzy
+msgid "Form"
+msgstr "Формат"
+
+#: ../picard/ui/ui_options_renaming.py:146
+#, fuzzy
+msgid "Rename files when saving"
+msgstr "Переименовывать файлы при записи тэгов"
+
+#: ../picard/ui/ui_options_renaming.py:147
+msgid "Replace non-ASCII characters"
+msgstr "Заменять не-ASCII символы"
+
+#: ../picard/ui/ui_options_renaming.py:148
+msgid "Replace Windows-incompatible characters"
+msgstr "Заменять символы, не совместимые с Windows"
+
+#: ../picard/ui/ui_options_renaming.py:149
+msgid "Name files like this"
+msgstr ""
+
+#: ../picard/ui/ui_options_renaming.py:156
+msgid "Name multiple artist albums differently"
+msgstr ""
+
+#: ../picard/ui/ui_options_renaming.py:157
+msgid "Copy from above"
+msgstr ""
+
+#: ../picard/ui/ui_options_renaming.py:159
+#, fuzzy
+msgid "Examples"
+msgstr "Пример"
+
+#: ../picard/ui/ui_options_script.py:43
 msgid "Tagger Script"
 msgstr "Скрипт теггера"
 
-#: ../picard/ui/ui_options_tags.py:85
-msgid "Common"
-msgstr "Общее"
-
-#: ../picard/ui/ui_options_tags.py:86
-msgid "Clear existing tags before writing new tags"
-msgstr "Удалять существующие тэги перед записью новых"
-
-#: ../picard/ui/ui_options_tags.py:87
-msgid "Don not write tags to files"
+#: ../picard/ui/ui_options_tags.py:97
+#, fuzzy
+msgid "Do not write tags to files"
 msgstr "Не писать теги в файлах"
 
-#: ../picard/ui/ui_options_tags.py:88
-msgid "ID3"
-msgstr "ID3"
+#: ../picard/ui/ui_options_tags.py:98
+msgid "Before tagging"
+msgstr ""
 
-#: ../picard/ui/ui_options_tags.py:89
-msgid "Write ID3v1 tags to the files"
-msgstr "Записывать ID3v1 теги в файлы"
+#: ../picard/ui/ui_options_tags.py:99
+#, fuzzy
+msgid "Clear existing tags"
+msgstr "Удалять существующие тэги перед записью новых"
 
-#: ../picard/ui/ui_options_tags.py:90
-msgid "Write ID3v2 version 2.3 tags (2.4 is default)"
-msgstr "Записывать тэги ID3v2 версии 2.3 (по умолчанию записываются 2.4)"
-
-#: ../picard/ui/ui_options_tags.py:91
-msgid "Text encoding to use while writing ID3v2 tags:"
-msgstr "Использовать следующую кодировку при записи тэгов ID3v2:"
-
-#: ../picard/ui/ui_options_tags.py:92
-msgid "ISO-8859-1"
-msgstr "ISO-8859-1"
-
-#: ../picard/ui/ui_options_tags.py:93
-msgid "UTF-16"
-msgstr "UTF-16"
-
-#: ../picard/ui/ui_options_tags.py:94
-msgid "UTF-8"
-msgstr "UTF-8"
-
-#: ../picard/ui/ui_options_tags.py:95
+#: ../picard/ui/ui_options_tags.py:100
 msgid "Remove ID3 tags from FLAC files"
 msgstr "Удалять ID3 теги из FLAC файлов"
 
-#: ../picard/ui/ui_options_tags.py:96
-msgid "APE"
-msgstr "APE"
-
-#: ../picard/ui/ui_options_tags.py:97
+#: ../picard/ui/ui_options_tags.py:101
 msgid "Remove APEv2 tags from MP3 files"
 msgstr "Удалять APEv2 теги из MP3 файлов"
 
+#: ../picard/ui/ui_options_tags.py:102
+msgid "Tag compatibility"
+msgstr ""
+
+#: ../picard/ui/ui_options_tags.py:103
+#, fuzzy
+msgid "ID3v2 version"
+msgstr "только в ID3v2.4"
+
+#: ../picard/ui/ui_options_tags.py:104
+msgid "2.4"
+msgstr ""
+
+#: ../picard/ui/ui_options_tags.py:105
+msgid "2.3"
+msgstr ""
+
+#: ../picard/ui/ui_options_tags.py:106
+#, fuzzy
+msgid "Also include ID3v1 tags in the files"
+msgstr "Записывать ID3v1 теги в файлы"
+
+#: ../picard/ui/ui_options_tags.py:107
+msgid "ID3v2 text encoding"
+msgstr ""
+
+#: ../picard/ui/ui_options_tags.py:108
+msgid "UTF-8"
+msgstr "UTF-8"
+
+#: ../picard/ui/ui_options_tags.py:109
+msgid "UTF-16"
+msgstr "UTF-16"
+
+#: ../picard/ui/ui_options_tags.py:110
+msgid "ISO-8859-1"
+msgstr "ISO-8859-1"
+
+#: ../picard/ui/ui_passworddialog.py:78
+msgid "Authentication required"
+msgstr "Требуется аутентификация"
+
+#: ../picard/ui/ui_passworddialog.py:81
+msgid "Save username and password"
+msgstr "Сохранить имя пользователя и пароль"
+
 #: ../picard/ui/ui_tagsfromfilenames.py:56
 msgid "Convert File Names to Tags"
 msgstr "Преобразовать имена файлов в теги"
@@ -2156,6 +2203,10 @@ msgstr "Преобразовать имена файлов в теги"
 msgid "Replace underscores with spaces"
 msgstr "Заменять символы подчёркивания на пробелы"
 
+#: ../picard/ui/ui_tagsfromfilenames.py:58
+msgid "&Preview"
+msgstr "&Предварительный просмотр"
+
 #: ../picard/ui/options/about.py:29
 msgid "About"
 msgstr "О программе"
@@ -2195,8 +2246,8 @@ msgstr "<br/>Перевод на русский: %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"
@@ -2204,35 +2255,32 @@ msgid ""
 "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\"><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/P"
-"icardTagger</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><br/>%(formats)s</p>\n"
+"<p align=\"center\"><strong>Поддерживаемые форматы</strong><br/>%(formats)s</"
+"p>\n"
 "<p align=\"center\"><strong>Пожалуйста пожертвуйте</strong><br/>\n"
 "Спасибо вам за использование Picard'а. Picard зависит от базы данных "
 "MusicBrainz, которая функционирует благодаря MetaBrainz Foundation при "
 "помощи тысяч добровольцев. Если вам нравится эта программа, пожалуйста "
 "подумайте о пожертвовании в MetaBrainz Foundation, чтобы сервис продолжал "
 "работу.</p>\n"
-"<p align=\"center\"><a "
-"href=\"http://metabrainz.org/donate/index.html\">Пожертвовать "
-"сейчас!</a></p>\n"
+"<p align=\"center\"><a href=\"http://metabrainz.org/donate/index.html"
+"\">Пожертвовать сейчас!</a></p>\n"
 "<p align=\"center\"><strong>Авторы</strong><br/>\n"
-"<small>Copyright © 2004-2008 Robert Kaye, Lukáš Lalinský и "
-"другие%(translator-credits)s</small></p>\n"
-"<p align=\"center\"><a "
-"href=\"http://musicbrainz.org/doc/PicardTagger\">http://musicbrainz.org/doc/P"
-"icardTagger</a></p>\n"
+"<small>Copyright © 2004-2008 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"
@@ -2266,257 +2314,266 @@ msgstr "Соотнесение"
 msgid "None"
 msgstr "Пустой"
 
-#: ../picard/ui/options/naming.py:33
-msgid "File Naming"
-msgstr "Имена файлов"
+#: ../picard/ui/options/moving.py:33
+#, fuzzy
+msgid "Moving files"
+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 "Формат переименования файла не может быть пустым."
-
-#: ../picard/ui/options/naming.py:95
-msgid "The multiple artist file naming format must not be empty."
-msgstr "Формат множественных исполнителей не может быть пустым"
-
-#: ../picard/ui/options/naming.py:97
+#: ../picard/ui/options/moving.py:65
 msgid "Error"
 msgstr "Ошибка"
 
-#: ../picard/ui/options/naming.py:97
+#: ../picard/ui/options/moving.py:65
 msgid "The location to move files to must not be empty."
 msgstr "Местоположение для перемещаемых файлов не может быть пустым."
 
-#: ../picard/ui/options/scripting.py:63
-msgid "Scripting"
-msgstr "Скрипты"
+#: ../picard/ui/options/ratings.py:29
+msgid "Ratings"
+msgstr "Рейтинги"
 
 #: ../picard/ui/options/tags.py:29
 msgid "Tags"
 msgstr "Тэги"
 
-#: ../picard/ui/options/ratings.py:29
-msgid "Ratings"
-msgstr "Рейтинги"
+#: ../picard/ui/options/renaming.py:35
+#, fuzzy
+msgid "File naming"
+msgstr "Имена файлов"
+
+#: ../picard/ui/options/renaming.py:123
+msgid "The file naming format must not be empty."
+msgstr "Формат переименования файла не может быть пустым."
+
+#: ../picard/ui/options/renaming.py:133
+msgid "The multiple artist file naming format must not be empty."
+msgstr "Формат множественных исполнителей не может быть пустым"
+
+#: ../picard/ui/options/scripting.py:63
+msgid "Scripting"
+msgstr "Скрипты"
+
+#: ../picard/ui/options/scripting.py:97
+msgid "Script Error"
+msgstr "Ошибка скрипта"
 
 #: ../picard/util/tags.py:24
 msgid "Date"
 msgstr "Дата"
 
 #: ../picard/util/tags.py:25
+#, fuzzy
+msgid "Original Release Date"
+msgstr "Исходные метаданные"
+
+#: ../picard/util/tags.py:26
 msgid "Album Artist"
 msgstr "Исполнитель альбома"
 
-#: ../picard/util/tags.py:26
+#: ../picard/util/tags.py:27
 msgid "Track Number"
 msgstr "Номер дорожки"
 
-#: ../picard/util/tags.py:27
+#: ../picard/util/tags.py:28
 msgid "Total Tracks"
 msgstr "Всего произведений"
 
-#: ../picard/util/tags.py:28
+#: ../picard/util/tags.py:29
 msgid "Disc Number"
 msgstr "Номер диска"
 
-#: ../picard/util/tags.py:29
+#: ../picard/util/tags.py:30
 msgid "Total Discs"
 msgstr "Всего дисков"
 
-#: ../picard/util/tags.py:30
+#: ../picard/util/tags.py:31
 msgid "Album Artist Sort Order"
 msgstr "Порядок сортировки исполнителей альбомов"
 
-#: ../picard/util/tags.py:31
+#: ../picard/util/tags.py:32
 msgid "Artist Sort Order"
 msgstr "Порядок сортировки исполнителей"
 
-#: ../picard/util/tags.py:32
+#: ../picard/util/tags.py:33
 msgid "Title Sort Order"
 msgstr "Порядок сортировки произведений"
 
-#: ../picard/util/tags.py:33
+#: ../picard/util/tags.py:34
 msgid "Album Sort Order"
 msgstr "Порядок сортировки альбома"
 
-#: ../picard/util/tags.py:34
+#: ../picard/util/tags.py:35
 msgid "ASIN"
 msgstr "ASIN"
 
-#: ../picard/util/tags.py:35
+#: ../picard/util/tags.py:36
 msgid "Grouping"
 msgstr "Группировка"
 
-#: ../picard/util/tags.py:37
+#: ../picard/util/tags.py:38
 msgid "ISRC"
 msgstr "ISRC"
 
-#: ../picard/util/tags.py:38
+#: ../picard/util/tags.py:39
 msgid "Mood"
 msgstr "Настроение"
 
-#: ../picard/util/tags.py:39
+#: ../picard/util/tags.py:40
 msgid "BPM"
 msgstr "уд./мин."
 
-#: ../picard/util/tags.py:40
+#: ../picard/util/tags.py:41
 msgid "Copyright"
 msgstr "Copyright"
 
-#: ../picard/util/tags.py:41
+#: ../picard/util/tags.py:42
 msgid "Composer"
 msgstr "Композитор"
 
-#: ../picard/util/tags.py:42
+#: ../picard/util/tags.py:43
 msgid "Conductor"
 msgstr "Дирижёр"
 
-#: ../picard/util/tags.py:43
+#: ../picard/util/tags.py:44
 msgid "Lyricist"
 msgstr "Автор текста"
 
-#: ../picard/util/tags.py:44
+#: ../picard/util/tags.py:45
 msgid "Arranger"
 msgstr "Аранжировщик"
 
-#: ../picard/util/tags.py:45
+#: ../picard/util/tags.py:46
 msgid "Producer"
 msgstr "Продюсер"
 
-#: ../picard/util/tags.py:46
+#: ../picard/util/tags.py:47
 msgid "Engineer"
 msgstr "Звукооператор"
 
-#: ../picard/util/tags.py:47
+#: ../picard/util/tags.py:48
 msgid "Subtitle"
 msgstr "Подзаголовок"
 
-#: ../picard/util/tags.py:48
+#: ../picard/util/tags.py:49
 msgid "Disc Subtitle"
 msgstr "Подзаголовок диска"
 
-#: ../picard/util/tags.py:49
+#: ../picard/util/tags.py:50
 msgid "Remixer"
 msgstr "Ремиксер"
 
-#: ../picard/util/tags.py:50
+#: ../picard/util/tags.py:51
 msgid "MusicBrainz Track Id"
 msgstr "MusicBrainz ID трека"
 
-#: ../picard/util/tags.py:51
+#: ../picard/util/tags.py:52
 msgid "MusicBrainz Release Id"
 msgstr "MusicBrainz ID релиза"
 
-#: ../picard/util/tags.py:52
+#: ../picard/util/tags.py:53
 msgid "MusicBrainz Artist Id"
 msgstr "MusicBrainz ID исполнителя"
 
-#: ../picard/util/tags.py:53
+#: ../picard/util/tags.py:54
 msgid "MusicBrainz Release Artist Id"
 msgstr "MusicBrainz ID автора релиза"
 
-#: ../picard/util/tags.py:54
+#: ../picard/util/tags.py:55
 msgid "MusicBrainz TRM Id"
 msgstr "MusicBrainz TRM ID"
 
-#: ../picard/util/tags.py:55
+#: ../picard/util/tags.py:56
 msgid "MusicBrainz Disc Id"
 msgstr "Номер диска в базе MusicBrainz"
 
-#: ../picard/util/tags.py:56
+#: ../picard/util/tags.py:57
 msgid "MusicBrainz Sort Name"
 msgstr "Название в базе MusicBrainz"
 
-#: ../picard/util/tags.py:57
+#: ../picard/util/tags.py:58
 msgid "MusicIP PUID"
 msgstr "MusicIP PUID"
 
-#: ../picard/util/tags.py:58
+#: ../picard/util/tags.py:59
 msgid "MusicIP Fingerprint"
 msgstr "MusicIP Fingerprint"
 
-#: ../picard/util/tags.py:59
+#: ../picard/util/tags.py:60
 msgid "Disc Id"
 msgstr "Номер диска"
 
-#: ../picard/util/tags.py:60
+#: ../picard/util/tags.py:61
 msgid "Website"
 msgstr "Сайт"
 
-#: ../picard/util/tags.py:61
+#: ../picard/util/tags.py:62
 msgid "Compilation"
 msgstr "Сборник"
 
-#: ../picard/util/tags.py:62
+#: ../picard/util/tags.py:63
 msgid "Comment"
 msgstr "Комментарий"
 
-#: ../picard/util/tags.py:63
+#: ../picard/util/tags.py:64
 msgid "Genre"
 msgstr "Жанр"
 
-#: ../picard/util/tags.py:64
+#: ../picard/util/tags.py:65
 msgid "Encoded By"
 msgstr "Кодировано"
 
-#: ../picard/util/tags.py:65
+#: ../picard/util/tags.py:66
 msgid "Performer"
 msgstr "Исполнитель"
 
-#: ../picard/util/tags.py:66
+#: ../picard/util/tags.py:67
 msgid "Release Type"
 msgstr "Тип релиза"
 
-#: ../picard/util/tags.py:67
+#: ../picard/util/tags.py:68
 msgid "Release Status"
 msgstr "Статус релиза"
 
-#: ../picard/util/tags.py:68
+#: ../picard/util/tags.py:69
 msgid "Release Country"
 msgstr "Страна релиза"
 
-#: ../picard/util/tags.py:69
+#: ../picard/util/tags.py:70
 msgid "Record Label"
 msgstr "Звукозаписывающий лейбл"
 
-#: ../picard/util/tags.py:70
+#: ../picard/util/tags.py:71
 msgid "Barcode"
 msgstr "Штрих-код"
 
-#: ../picard/util/tags.py:71
+#: ../picard/util/tags.py:72
 msgid "Catalog Number"
 msgstr "Номер каталога"
 
-#: ../picard/util/tags.py:72
+#: ../picard/util/tags.py:73
 msgid "Format"
 msgstr "Формат"
 
-#: ../picard/util/tags.py:73
+#: ../picard/util/tags.py:74
 msgid "DJ-Mixer"
 msgstr "DJ-Микшер"
 
-#: ../picard/util/tags.py:74
+#: ../picard/util/tags.py:75
 msgid "Media"
 msgstr "Медиа"
 
-#: ../picard/util/tags.py:75
+#: ../picard/util/tags.py:76
 msgid "Lyrics"
 msgstr "Текст"
 
-#: ../picard/util/tags.py:76
+#: ../picard/util/tags.py:77
 msgid "Mixer"
 msgstr "Микшер"
 
-#: ../picard/util/tags.py:77
+#: ../picard/util/tags.py:78
 msgid "Language"
 msgstr "Язык"
 
-#: ../picard/util/tags.py:78
+#: ../picard/util/tags.py:79
 msgid "Script"
 msgstr "Сценарий"
 
@@ -2535,19 +2592,47 @@ msgstr ""
 "\n"
 "%s"
 
-#, python-format
+#~ msgid "Rename Files"
+#~ msgstr "Переименовывать файлы"
+
+#~ msgid "Multiple artist file naming format:"
+#~ msgstr "Формат именования файлов сборников:"
+
+#~ msgid "File naming format:"
+#~ msgstr "Формат имён файлов:"
+
+#~ msgid "File name:"
+#~ msgstr "Имя файла:"
+
+#~ msgid "Multiple artist file name:"
+#~ msgstr "Имя файла для сборников:"
+
+#~ msgid "Common"
+#~ msgstr "Общее"
+
+#~ msgid "ID3"
+#~ msgstr "ID3"
+
+#~ msgid "Write ID3v2 version 2.3 tags (2.4 is default)"
+#~ msgstr "Записывать тэги ID3v2 версии 2.3 (по умолчанию записываются 2.4)"
+
+#~ msgid "Text encoding to use while writing ID3v2 tags:"
+#~ msgstr "Использовать следующую кодировку при записи тэгов ID3v2:"
+
+#~ msgid "APE"
+#~ msgstr "APE"
+
 #~ msgid "[couldn't load album %s]"
 #~ msgstr "[не удалось загрузить альбом %s]"
 
 #~ msgid "New Version"
 #~ msgstr "Новая версия"
 
-#, python-format
 #~ msgid ""
-#~ "New version of Picard is available (%s). Would you like to download it now?"
+#~ "New version of Picard is available (%s). Would you like to download it "
+#~ "now?"
 #~ msgstr "Доступна новая версия Picard (%s). Не хотите ли её скачать?"
 
-#, python-format
 #~ msgid "Couldn't find PUID for file %s"
 #~ msgstr "Невозможно найти PUID для файла %s"
 
@@ -2656,9 +2741,6 @@ msgstr ""
 #~ msgid "Album Status (official, promo, etc.)"
 #~ msgstr "Статус альбома (официальный, промо-версия, и т. д.)"
 
-#~ msgid "Album release month"
-#~ msgstr "Месяц выпуска альбома"
-
 #~ msgid "Album release day"
 #~ msgstr "День выпуска альбома"
 
@@ -2668,9 +2750,6 @@ msgstr ""
 #~ msgid "Make it so!"
 #~ msgstr "Да будет так!"
 
-#~ msgid "ID3v2.4 only"
-#~ msgstr "только в ID3v2.4"
-
 #~ msgid "Save track/album"
 #~ msgstr "Сохранить трэк или альбом"
 
@@ -2711,12 +2790,13 @@ msgstr ""
 #~ 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."
+#~ "Please fix the move option or the destination directory option and try "
+#~ "again."
 #~ msgstr ""
-#~ "Перемещение файлов после обработки включено, но директория для перемещения "
-#~ "не указана или не\n"
-#~ "существует. Пожалуйста исправьте путь к директории или отключите перемещение "
-#~ "и попробуйте\n"
+#~ "Перемещение файлов после обработки включено, но директория для "
+#~ "перемещения не указана или не\n"
+#~ "существует. Пожалуйста исправьте путь к директории или отключите "
+#~ "перемещение и попробуйте\n"
 #~ "выполнить операцию заново."
 
 #~ msgid "Select directory that contains music files"
@@ -2738,7 +2818,8 @@ msgstr ""
 #~ msgstr "%d%% совпадение"
 
 #~ msgid ""
-#~ "The destination directory %s does not exist. Please pick a valid directory."
+#~ "The destination directory %s does not exist. Please pick a valid "
+#~ "directory."
 #~ msgstr ""
 #~ "Указанная директория %s не существует. Пожалуйста выберите существующую "
 #~ "директорию."
@@ -2753,9 +2834,6 @@ msgstr ""
 #~ "Note: This setting will take effect after you restart the application."
 #~ msgstr "Язык сменится только после перезапуска приложения."
 
-#~ msgid "Rename files when writing metadata tags"
-#~ msgstr "Переименовывать файлы при записи тэгов"
-
 #~ msgid "Naming Help"
 #~ msgstr "Справка по формату"
 
@@ -2804,11 +2882,11 @@ msgstr ""
 #~ msgstr "Автоматически запускать MB Tagger для вставляемых аудио CD"
 
 #~ msgid ""
-#~ "Failed to set the proper registy values to enable launching the tagger after "
-#~ "CD insertion. "
+#~ "Failed to set the proper registy values to enable launching the tagger "
+#~ "after CD insertion. "
 #~ msgstr ""
-#~ "Не удалось установить настройки в реестре, необходимые для автоматического "
-#~ "запуска tagger'а после вставки CD. "
+#~ "Не удалось установить настройки в реестре, необходимые для "
+#~ "автоматического запуска tagger'а после вставки CD. "
 
 #~ msgid "File format naming specification"
 #~ msgstr "Формат имени файла"
diff --git a/po/sco.po b/po/sco.po
index 8c0ae4a09..dbcda94f4 100644
--- a/po/sco.po
+++ b/po/sco.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: picard\n"
 "Report-Msgid-Bugs-To: http://bugs.musicbrainz.org/\n"
-"POT-Creation-Date: 2009-02-24 18:58+0100\n"
+"POT-Creation-Date: 2009-04-06 22:50+0200\n"
 "PO-Revision-Date: 2008-12-01 23:28+0000\n"
 "Last-Translator: Lukáš Lalinský <lalinsky@gmail.com>\n"
 "Language-Team: Scots <sco@li.org>\n"
@@ -18,16 +18,16 @@ msgstr ""
 "X-Launchpad-Export-Date: 2009-04-06 20:21+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
-#: ../picard/album.py:108 ../picard/cluster.py:248
+#: ../picard/album.py:109 ../picard/cluster.py:248
 msgid "Unmatched Files"
 msgstr ""
 
-#: ../picard/album.py:281
+#: ../picard/album.py:287
 #, python-format
 msgid "[could not load album %s]"
 msgstr ""
 
-#: ../picard/album.py:317
+#: ../picard/album.py:320
 msgid "[loading album information]"
 msgstr "[lading album speirins]"
 
@@ -587,7 +587,7 @@ msgid "Namibia"
 msgstr ""
 
 #: ../picard/const.py:182
-msgid "Vanuat"
+msgid "Vanuatu"
 msgstr ""
 
 #: ../picard/const.py:183
@@ -1031,223 +1031,234 @@ msgid "Congo, The Democratic Republic of the"
 msgstr ""
 
 #: ../picard/const.py:293
-msgid "Serbia and Montenegro"
+msgid "Serbia and Montenegro (historical, 2003-2006)"
 msgstr ""
 
 #: ../picard/const.py:294
-msgid "Croatia"
+msgid "Serbia"
 msgstr ""
 
 #: ../picard/const.py:295
-msgid "Korea (North), Democratic People's Republic of"
+msgid "Montenegro"
 msgstr ""
 
 #: ../picard/const.py:296
-msgid "Korea (South), Republic of"
+msgid "Croatia"
 msgstr ""
 
 #: ../picard/const.py:297
-msgid "Slovakia"
+msgid "Korea (North), Democratic People's Republic of"
 msgstr ""
 
 #: ../picard/const.py:298
-msgid "Soviet Union (historical, 1922-1991)"
+msgid "Korea (South), Republic of"
 msgstr ""
 
 #: ../picard/const.py:299
-msgid "East Timor"
+msgid "Slovakia"
 msgstr ""
 
 #: ../picard/const.py:300
-msgid "Czechoslovakia (historical, 1918-1992)"
+msgid "Soviet Union (historical, 1922-1991)"
 msgstr ""
 
 #: ../picard/const.py:301
-msgid "Europe"
+msgid "East Timor"
 msgstr ""
 
 #: ../picard/const.py:302
-msgid "East Germany (historical, 1949-1990)"
+msgid "Czechoslovakia (historical, 1918-1992)"
 msgstr ""
 
 #: ../picard/const.py:303
-msgid "[Unknown Country]"
+msgid "Europe"
 msgstr ""
 
 #: ../picard/const.py:304
-msgid "[Worldwide]"
+msgid "East Germany (historical, 1949-1990)"
 msgstr ""
 
 #: ../picard/const.py:305
+msgid "[Unknown Country]"
+msgstr ""
+
+#: ../picard/const.py:306
+msgid "[Worldwide]"
+msgstr ""
+
+#: ../picard/const.py:307
 msgid "Yugoslavia (historical, 1918-1992)"
 msgstr ""
 
-#: ../picard/const.py:310
-msgid "Catalan"
-msgstr ""
-
-#: ../picard/const.py:311
-msgid "Czech"
-msgstr ""
-
 #: ../picard/const.py:312
-msgid "Welsh"
+msgid "Afrikaans"
 msgstr ""
 
 #: ../picard/const.py:313
-msgid "Danish"
+msgid "Arabic"
 msgstr ""
 
 #: ../picard/const.py:314
-msgid "German"
+msgid "Catalan"
 msgstr ""
 
 #: ../picard/const.py:315
-msgid "English"
+msgid "Czech"
 msgstr ""
 
 #: ../picard/const.py:316
-msgid "English (Canada)"
+msgid "Welsh"
 msgstr ""
 
 #: ../picard/const.py:317
-msgid "English (UK)"
+msgid "Danish"
 msgstr ""
 
 #: ../picard/const.py:318
-msgid "Spanish"
+msgid "German"
 msgstr ""
 
 #: ../picard/const.py:319
-msgid "Persian"
+msgid "English"
 msgstr ""
 
 #: ../picard/const.py:320
-msgid "Finnish"
+msgid "English (Canada)"
 msgstr ""
 
 #: ../picard/const.py:321
-msgid "French"
+msgid "English (UK)"
 msgstr ""
 
 #: ../picard/const.py:322
-msgid "Frisian"
+msgid "Spanish"
 msgstr ""
 
 #: ../picard/const.py:323
-msgid "Hebrew"
+msgid "Persian"
 msgstr ""
 
 #: ../picard/const.py:324
-msgid "Hungarian"
+msgid "Finnish"
 msgstr ""
 
 #: ../picard/const.py:325
-msgid "Islandic"
+msgid "French"
 msgstr ""
 
 #: ../picard/const.py:326
-msgid "Italian"
+msgid "Frisian"
 msgstr ""
 
 #: ../picard/const.py:327
-msgid "Kannada"
+msgid "Hebrew"
 msgstr ""
 
 #: ../picard/const.py:328
-msgid "Korean"
+msgid "Hindi"
 msgstr ""
 
 #: ../picard/const.py:329
-msgid "Lithuanian"
+msgid "Hungarian"
 msgstr ""
 
 #: ../picard/const.py:330
-msgid "Norwegian Bokmal"
+msgid "Islandic"
 msgstr ""
 
 #: ../picard/const.py:331
-msgid "Dutch"
+msgid "Italian"
 msgstr ""
 
 #: ../picard/const.py:332
-msgid "Polish"
+msgid "Kannada"
 msgstr ""
 
 #: ../picard/const.py:333
-msgid "Portuguese"
+msgid "Korean"
 msgstr ""
 
 #: ../picard/const.py:334
-msgid "Brazilian Portuguese"
+msgid "Lithuanian"
 msgstr ""
 
 #: ../picard/const.py:335
-msgid "Romanian"
+msgid "Norwegian Bokmal"
 msgstr ""
 
 #: ../picard/const.py:336
-msgid "Russian"
+msgid "Dutch"
 msgstr ""
 
 #: ../picard/const.py:337
-msgid "Scots"
+msgid "Polish"
 msgstr ""
 
 #: ../picard/const.py:338
-msgid "Slovak"
+msgid "Portuguese"
 msgstr ""
 
 #: ../picard/const.py:339
-msgid "Slovenian"
+msgid "Brazilian Portuguese"
 msgstr ""
 
 #: ../picard/const.py:340
-msgid "Swedish"
+msgid "Romanian"
 msgstr ""
 
 #: ../picard/const.py:341
+msgid "Russian"
+msgstr ""
+
+#: ../picard/const.py:342
+msgid "Scots"
+msgstr ""
+
+#: ../picard/const.py:343
+msgid "Slovak"
+msgstr ""
+
+#: ../picard/const.py:344
+msgid "Slovenian"
+msgstr ""
+
+#: ../picard/const.py:345
+msgid "Swedish"
+msgstr ""
+
+#: ../picard/const.py:346
+msgid "Turkish"
+msgstr ""
+
+#: ../picard/const.py:347
 msgid "Chinese"
 msgstr ""
 
-#: ../picard/file.py:487
+#: ../picard/file.py:494
 #, python-format
 msgid "No matching tracks for file %s"
 msgstr ""
 
-#: ../picard/file.py:504
+#: ../picard/file.py:511
 #, python-format
 msgid "No matching tracks above the threshold for file %s"
 msgstr ""
 
-#: ../picard/file.py:507
+#: ../picard/file.py:514
 #, python-format
 msgid "File %s identified!"
 msgstr "File %s kannt!"
 
-#: ../picard/file.py:518
+#: ../picard/file.py:525
 #, python-format
 msgid "Looking up the PUID for file %s..."
 msgstr "Speirin for PUID o the file %s..."
 
-#: ../picard/file.py:523
+#: ../picard/file.py:530
 #, 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 ""
@@ -1260,11 +1271,24 @@ msgstr ""
 msgid "XSPF Playlist (*.xspf)"
 msgstr ""
 
-#: ../picard/tagger.py:476
-msgid "CD Lookup Error"
+#: ../picard/puidmanager.py:62
+msgid "Submitting PUIDs..."
+msgstr ""
+
+#: ../picard/puidmanager.py:68
+#, python-format
+msgid "PUIDs submission failed: %s"
+msgstr ""
+
+#: ../picard/puidmanager.py:70
+msgid "PUIDs successfully submitted!"
 msgstr ""
 
 #: ../picard/tagger.py:477
+msgid "CD Lookup Error"
+msgstr ""
+
+#: ../picard/tagger.py:478
 #, python-format
 msgid ""
 "Error while reading CD:\n"
@@ -1272,7 +1296,7 @@ msgid ""
 "%s"
 msgstr ""
 
-#: ../picard/tagger.py:503
+#: ../picard/tagger.py:504
 #, python-format
 msgid "Could not find PUID for file %s"
 msgstr ""
@@ -1325,15 +1349,27 @@ msgstr ""
 msgid "Length"
 msgstr ""
 
-#: ../picard/ui/itemviews.py:327
+#: ../picard/ui/itemviews.py:289
+msgid "&Expand all"
+msgstr ""
+
+#: ../picard/ui/itemviews.py:291
+msgid "&Collapse all"
+msgstr ""
+
+#: ../picard/ui/itemviews.py:332
 msgid "&Releases"
 msgstr ""
 
-#: ../picard/ui/itemviews.py:353
+#: ../picard/ui/itemviews.py:349
+msgid "No release event"
+msgstr ""
+
+#: ../picard/ui/itemviews.py:359
 msgid "&Plugins"
 msgstr ""
 
-#: ../picard/ui/itemviews.py:523
+#: ../picard/ui/itemviews.py:533
 msgid "Clusters"
 msgstr ""
 
@@ -1341,95 +1377,6 @@ msgstr ""
 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:66 ../picard/ui/ui_options_plugins.py:62
-msgid "Details"
-msgstr ""
-
-#: ../picard/ui/tageditor.py:71 ../picard/ui/tageditor.py:264
-#, python-format
-msgid "%d file"
-msgid_plural "%d files"
-msgstr[0] ""
-msgstr[1] ""
-
-#: ../picard/ui/tageditor.py:131
-#, python-format
-msgid "(different across %d file)"
-msgid_plural "(different across %d files)"
-msgstr[0] ""
-msgstr[1] ""
-
-#: ../picard/ui/tageditor.py:134
-#, python-format
-msgid "(missing from %d file)"
-msgid_plural "(missing from %d files)"
-msgstr[0] ""
-msgstr[1] ""
-
-#: ../picard/ui/tageditor.py:233
-msgid "Filename:"
-msgstr ""
-
-#: ../picard/ui/tageditor.py:235
-msgid "Format:"
-msgstr ""
-
-#: ../picard/ui/tageditor.py:244
-msgid "Size:"
-msgstr ""
-
-#: ../picard/ui/tageditor.py:248 ../picard/ui/ui_metadata.py:127
-msgid "Length:"
-msgstr ""
-
-#: ../picard/ui/tageditor.py:250
-msgid "Bitrate:"
-msgstr ""
-
-#: ../picard/ui/tageditor.py:252
-msgid "Sample rate:"
-msgstr ""
-
-#: ../picard/ui/tageditor.py:254
-msgid "Bits per sample:"
-msgstr ""
-
-#: ../picard/ui/tageditor.py:257
-msgid "Mono"
-msgstr ""
-
-#: ../picard/ui/tageditor.py:258
-msgid "Stereo"
-msgstr ""
-
-#: ../picard/ui/tageditor.py:260
-msgid "Channels:"
-msgstr ""
-
-#: ../picard/ui/tagsfromfilenames.py:52 ../picard/ui/tagsfromfilenames.py:96
-msgid "File Name"
-msgstr ""
-
 #: ../picard/ui/mainwindow.py:64
 msgid "MusicBrainz Picard"
 msgstr ""
@@ -1666,6 +1613,10 @@ msgstr ""
 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 ""
@@ -1685,12 +1636,97 @@ msgstr ""
 msgid " (Error: %s)"
 msgstr ""
 
+#: ../picard/ui/puidsubmit.py:31 ../picard/ui/options/plugins.py:85
+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/passworddialog.py:38
 #, python-format
 msgid ""
 "The server %s requires you to login. Please enter your username and password."
 msgstr ""
 
+#: ../picard/ui/tageditor.py:66 ../picard/ui/ui_options_plugins.py:62
+msgid "Details"
+msgstr ""
+
+#: ../picard/ui/tageditor.py:71 ../picard/ui/tageditor.py:264
+#, python-format
+msgid "%d file"
+msgid_plural "%d files"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../picard/ui/tageditor.py:131
+#, python-format
+msgid "(different across %d file)"
+msgid_plural "(different across %d files)"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../picard/ui/tageditor.py:134
+#, python-format
+msgid "(missing from %d file)"
+msgid_plural "(missing from %d files)"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../picard/ui/tageditor.py:233
+msgid "Filename:"
+msgstr ""
+
+#: ../picard/ui/tageditor.py:235
+msgid "Format:"
+msgstr ""
+
+#: ../picard/ui/tageditor.py:244
+msgid "Size:"
+msgstr ""
+
+#: ../picard/ui/tageditor.py:248 ../picard/ui/ui_metadata.py:127
+msgid "Length:"
+msgstr ""
+
+#: ../picard/ui/tageditor.py:250
+msgid "Bitrate:"
+msgstr ""
+
+#: ../picard/ui/tageditor.py:252
+msgid "Sample rate:"
+msgstr ""
+
+#: ../picard/ui/tageditor.py:254
+msgid "Bits per sample:"
+msgstr ""
+
+#: ../picard/ui/tageditor.py:257
+msgid "Mono"
+msgstr ""
+
+#: ../picard/ui/tageditor.py:258
+msgid "Stereo"
+msgstr ""
+
+#: ../picard/ui/tageditor.py:260
+msgid "Channels:"
+msgstr ""
+
+#: ../picard/ui/tagsfromfilenames.py:54 ../picard/ui/tagsfromfilenames.py:99
+msgid "File Name"
+msgstr ""
+
 #: ../picard/ui/ui_cdlookup.py:60 ../picard/ui/ui_options_cdlookup.py:47
 #: ../picard/ui/ui_options_cdlookup_select.py:48
 #: ../picard/ui/options/cdlookup.py:36
@@ -1713,24 +1749,6 @@ msgstr ""
 msgid "Cancel"
 msgstr ""
 
-#: ../picard/ui/ui_passworddialog.py:78
-msgid "Authentication required"
-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"
-msgstr ""
-
 #: ../picard/ui/ui_edittagdialog.py:44
 msgid "Edit Tag"
 msgstr ""
@@ -1767,6 +1785,10 @@ msgstr ""
 msgid "Options"
 msgstr ""
 
+#: ../picard/ui/ui_puidsubmit.py:52
+msgid "Submit PUIDs"
+msgstr ""
+
 #: ../picard/ui/ui_options_cdlookup.py:48
 msgid "CD-ROM device to use for lookups:"
 msgstr ""
@@ -1791,6 +1813,22 @@ msgstr ""
 msgid "Overwrite the file if it already exists"
 msgstr ""
 
+#: ../picard/ui/ui_options_moving.py:53
+msgid "Move additional files:"
+msgstr ""
+
+#: ../picard/ui/ui_options_moving.py:54
+msgid "Browse..."
+msgstr ""
+
+#: ../picard/ui/ui_options_moving.py:55
+msgid "Delete empty directories"
+msgstr ""
+
+#: ../picard/ui/ui_options_moving.py:56
+msgid "Move files to this directory when saving:"
+msgstr ""
+
 #: ../picard/ui/util.py:31
 msgid "&Ok"
 msgstr ""
@@ -1799,44 +1837,40 @@ msgstr ""
 msgid "&Cancel"
 msgstr ""
 
-#: ../picard/ui/ui_puidsubmit.py:52
-msgid "Submit PUIDs"
-msgstr ""
-
-#: ../picard/ui/ui_tageditor.py:139 ../picard/ui/ui_options_plugins.py:59
-#: ../picard/ui/options/plugins.py:76
+#: ../picard/ui/ui_tageditor.py:128 ../picard/ui/ui_options_plugins.py:59
+#: ../picard/ui/options/plugins.py:81
 msgid "Name"
 msgstr ""
 
-#: ../picard/ui/ui_tageditor.py:140
+#: ../picard/ui/ui_tageditor.py:129
 msgid "Value"
 msgstr ""
 
-#: ../picard/ui/ui_tageditor.py:141
+#: ../picard/ui/ui_tageditor.py:130
 msgid "Rating:"
 msgstr ""
 
-#: ../picard/ui/ui_tageditor.py:142
+#: ../picard/ui/ui_tageditor.py:131
 msgid "&Add..."
 msgstr ""
 
-#: ../picard/ui/ui_tageditor.py:143
+#: ../picard/ui/ui_tageditor.py:132
 msgid "&Edit..."
 msgstr ""
 
-#: ../picard/ui/ui_tageditor.py:144
+#: ../picard/ui/ui_tageditor.py:133
 msgid "&Delete"
 msgstr ""
 
-#: ../picard/ui/ui_tageditor.py:145
+#: ../picard/ui/ui_tageditor.py:134
 msgid "&Metadata"
 msgstr ""
 
-#: ../picard/ui/ui_tageditor.py:146
+#: ../picard/ui/ui_tageditor.py:135
 msgid "A&rtwork"
 msgstr ""
 
-#: ../picard/ui/ui_tageditor.py:147
+#: ../picard/ui/ui_tageditor.py:136
 msgid "&Info"
 msgstr ""
 
@@ -1881,6 +1915,40 @@ msgstr ""
 msgid ", "
 msgstr ""
 
+#: ../picard/ui/ui_options_general.py:108
+msgid "MusicBrainz Server"
+msgstr ""
+
+#: ../picard/ui/ui_options_general.py:109 ../picard/ui/ui_options_proxy.py:72
+msgid "Port:"
+msgstr ""
+
+#: ../picard/ui/ui_options_general.py:110 ../picard/ui/ui_options_proxy.py:73
+msgid "Server address:"
+msgstr ""
+
+#: ../picard/ui/ui_options_general.py:111
+msgid "Account Information"
+msgstr ""
+
+#: ../picard/ui/ui_options_general.py:112 ../picard/ui/ui_options_proxy.py:70
+#: ../picard/ui/ui_passworddialog.py:80
+msgid "Password:"
+msgstr ""
+
+#: ../picard/ui/ui_options_general.py:113 ../picard/ui/ui_options_proxy.py:71
+#: ../picard/ui/ui_passworddialog.py:79
+msgid "Username:"
+msgstr ""
+
+#: ../picard/ui/ui_options_general.py:114 ../picard/ui/options/general.py:29
+msgid "General"
+msgstr ""
+
+#: ../picard/ui/ui_options_general.py:115
+msgid "Automatically scan all new files"
+msgstr ""
+
 #: ../picard/ui/ui_options_interface.py:50
 msgid "Miscellaneous"
 msgstr ""
@@ -1901,113 +1969,6 @@ msgstr ""
 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_options_naming.py:180
-#: ../picard/ui/ui_tagsfromfilenames.py:58
-msgid "&Preview"
-msgstr ""
-
-#: ../picard/ui/ui_options_proxy.py:81 ../picard/ui/options/proxy.py:28
-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_options_ratings.py:45
-msgid "Enable track ratings"
-msgstr ""
-
-#: ../picard/ui/ui_options_ratings.py:46
-msgid ""
-"Picard saves the ratings together with an e-mail address identifying the "
-"user who did the rating. That way different ratings for different users can "
-"be stored in the files. Please sepcify the e-mail you want to use to save "
-"your ratings."
-msgstr ""
-
-#: ../picard/ui/ui_options_ratings.py:47
-msgid "E-mail:"
-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 ../picard/ui/options/general.py:29
-msgid "General"
-msgstr ""
-
-#: ../picard/ui/ui_options_general.py:115
-msgid "Automatically scan all new files"
-msgstr ""
-
 #: ../picard/ui/ui_options_matching.py:105
 msgid "Thresholds"
 msgstr ""
@@ -2064,72 +2025,143 @@ msgstr ""
 msgid "Non-album tracks:"
 msgstr ""
 
-#: ../picard/ui/ui_options_plugins.py:58 ../picard/ui/options/plugins.py:30
+#: ../picard/ui/ui_options_metadata.py:109
+#: ../picard/ui/ui_options_metadata.py:110
+#: ../picard/ui/ui_options_renaming.py:155
+#: ../picard/ui/ui_options_renaming.py:158
+msgid "Default"
+msgstr ""
+
+#: ../picard/ui/ui_options_plugins.py:58 ../picard/ui/options/plugins.py:34
 msgid "Plugins"
 msgstr ""
 
-#: ../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:84
 msgid "Author"
 msgstr ""
 
-#: ../picard/ui/ui_options_plugins.py:61 ../picard/util/tags.py:36
+#: ../picard/ui/ui_options_plugins.py:61 ../picard/util/tags.py:37
 msgid "Version"
 msgstr ""
 
-#: ../picard/ui/ui_options_script.py:52
+#: ../picard/ui/ui_options_proxy.py:69 ../picard/ui/options/proxy.py:28
+msgid "Web Proxy"
+msgstr ""
+
+#: ../picard/ui/ui_options_ratings.py:45
+msgid "Enable track ratings"
+msgstr ""
+
+#: ../picard/ui/ui_options_ratings.py:46
+msgid ""
+"Picard saves the ratings together with an e-mail address identifying the "
+"user who did the rating. That way different ratings for different users can "
+"be stored in the files. Please sepcify the e-mail you want to use to save "
+"your ratings."
+msgstr ""
+
+#: ../picard/ui/ui_options_ratings.py:47
+msgid "E-mail:"
+msgstr ""
+
+#: ../picard/ui/ui_options_renaming.py:145
+msgid "Form"
+msgstr ""
+
+#: ../picard/ui/ui_options_renaming.py:146
+msgid "Rename files when saving"
+msgstr ""
+
+#: ../picard/ui/ui_options_renaming.py:147
+msgid "Replace non-ASCII characters"
+msgstr ""
+
+#: ../picard/ui/ui_options_renaming.py:148
+msgid "Replace Windows-incompatible characters"
+msgstr ""
+
+#: ../picard/ui/ui_options_renaming.py:149
+msgid "Name files like this"
+msgstr ""
+
+#: ../picard/ui/ui_options_renaming.py:156
+msgid "Name multiple artist albums differently"
+msgstr ""
+
+#: ../picard/ui/ui_options_renaming.py:157
+msgid "Copy from above"
+msgstr ""
+
+#: ../picard/ui/ui_options_renaming.py:159
+msgid "Examples"
+msgstr ""
+
+#: ../picard/ui/ui_options_script.py:43
 msgid "Tagger Script"
 msgstr ""
 
-#: ../picard/ui/ui_options_tags.py:85
-msgid "Common"
+#: ../picard/ui/ui_options_tags.py:97
+msgid "Do not write tags to files"
 msgstr ""
 
-#: ../picard/ui/ui_options_tags.py:86
-msgid "Clear existing tags before writing new tags"
+#: ../picard/ui/ui_options_tags.py:98
+msgid "Before tagging"
 msgstr ""
 
-#: ../picard/ui/ui_options_tags.py:87
-msgid "Don not write tags to files"
+#: ../picard/ui/ui_options_tags.py:99
+msgid "Clear existing tags"
 msgstr ""
 
-#: ../picard/ui/ui_options_tags.py:88
-msgid "ID3"
-msgstr ""
-
-#: ../picard/ui/ui_options_tags.py:89
-msgid "Write ID3v1 tags to the files"
-msgstr ""
-
-#: ../picard/ui/ui_options_tags.py:90
-msgid "Write ID3v2 version 2.3 tags (2.4 is default)"
-msgstr ""
-
-#: ../picard/ui/ui_options_tags.py:91
-msgid "Text encoding to use while writing ID3v2 tags:"
-msgstr ""
-
-#: ../picard/ui/ui_options_tags.py:92
-msgid "ISO-8859-1"
-msgstr ""
-
-#: ../picard/ui/ui_options_tags.py:93
-msgid "UTF-16"
-msgstr ""
-
-#: ../picard/ui/ui_options_tags.py:94
-msgid "UTF-8"
-msgstr ""
-
-#: ../picard/ui/ui_options_tags.py:95
+#: ../picard/ui/ui_options_tags.py:100
 msgid "Remove ID3 tags from FLAC files"
 msgstr ""
 
-#: ../picard/ui/ui_options_tags.py:96
-msgid "APE"
+#: ../picard/ui/ui_options_tags.py:101
+msgid "Remove APEv2 tags from MP3 files"
 msgstr ""
 
-#: ../picard/ui/ui_options_tags.py:97
-msgid "Remove APEv2 tags from MP3 files"
+#: ../picard/ui/ui_options_tags.py:102
+msgid "Tag compatibility"
+msgstr ""
+
+#: ../picard/ui/ui_options_tags.py:103
+msgid "ID3v2 version"
+msgstr ""
+
+#: ../picard/ui/ui_options_tags.py:104
+msgid "2.4"
+msgstr ""
+
+#: ../picard/ui/ui_options_tags.py:105
+msgid "2.3"
+msgstr ""
+
+#: ../picard/ui/ui_options_tags.py:106
+msgid "Also include ID3v1 tags in the files"
+msgstr ""
+
+#: ../picard/ui/ui_options_tags.py:107
+msgid "ID3v2 text encoding"
+msgstr ""
+
+#: ../picard/ui/ui_options_tags.py:108
+msgid "UTF-8"
+msgstr ""
+
+#: ../picard/ui/ui_options_tags.py:109
+msgid "UTF-16"
+msgstr ""
+
+#: ../picard/ui/ui_options_tags.py:110
+msgid "ISO-8859-1"
+msgstr ""
+
+#: ../picard/ui/ui_passworddialog.py:78
+msgid "Authentication required"
+msgstr ""
+
+#: ../picard/ui/ui_passworddialog.py:81
+msgid "Save username and password"
 msgstr ""
 
 #: ../picard/ui/ui_tagsfromfilenames.py:56
@@ -2140,6 +2172,10 @@ msgstr ""
 msgid "Replace underscores with spaces"
 msgstr ""
 
+#: ../picard/ui/ui_tagsfromfilenames.py:58
+msgid "&Preview"
+msgstr ""
+
 #: ../picard/ui/options/about.py:29
 msgid "About"
 msgstr ""
@@ -2164,8 +2200,8 @@ 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"
@@ -2173,14 +2209,13 @@ msgid ""
 "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\"><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/P"
-"icardTagger</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
@@ -2213,42 +2248,44 @@ msgstr ""
 msgid "None"
 msgstr ""
 
-#: ../picard/ui/options/naming.py:33
-msgid "File Naming"
+#: ../picard/ui/options/moving.py:33
+msgid "Moving files"
 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 ""
-
-#: ../picard/ui/options/naming.py:95
-msgid "The multiple artist file naming format must not be empty."
-msgstr ""
-
-#: ../picard/ui/options/naming.py:97
+#: ../picard/ui/options/moving.py:65
 msgid "Error"
 msgstr ""
 
-#: ../picard/ui/options/naming.py:97
+#: ../picard/ui/options/moving.py:65
 msgid "The location to move files to must not be empty."
 msgstr ""
 
-#: ../picard/ui/options/scripting.py:63
-msgid "Scripting"
+#: ../picard/ui/options/ratings.py:29
+msgid "Ratings"
 msgstr ""
 
 #: ../picard/ui/options/tags.py:29
 msgid "Tags"
 msgstr ""
 
-#: ../picard/ui/options/ratings.py:29
-msgid "Ratings"
+#: ../picard/ui/options/renaming.py:35
+msgid "File naming"
+msgstr ""
+
+#: ../picard/ui/options/renaming.py:123
+msgid "The file naming format must not be empty."
+msgstr ""
+
+#: ../picard/ui/options/renaming.py:133
+msgid "The multiple artist file naming format must not be empty."
+msgstr ""
+
+#: ../picard/ui/options/scripting.py:63
+msgid "Scripting"
+msgstr ""
+
+#: ../picard/ui/options/scripting.py:97
+msgid "Script Error"
 msgstr ""
 
 #: ../picard/util/tags.py:24
@@ -2256,214 +2293,218 @@ msgid "Date"
 msgstr ""
 
 #: ../picard/util/tags.py:25
-msgid "Album Artist"
+msgid "Original Release Date"
 msgstr ""
 
 #: ../picard/util/tags.py:26
-msgid "Track Number"
+msgid "Album Artist"
 msgstr ""
 
 #: ../picard/util/tags.py:27
-msgid "Total Tracks"
+msgid "Track Number"
 msgstr ""
 
 #: ../picard/util/tags.py:28
-msgid "Disc Number"
+msgid "Total Tracks"
 msgstr ""
 
 #: ../picard/util/tags.py:29
-msgid "Total Discs"
+msgid "Disc Number"
 msgstr ""
 
 #: ../picard/util/tags.py:30
-msgid "Album Artist Sort Order"
+msgid "Total Discs"
 msgstr ""
 
 #: ../picard/util/tags.py:31
-msgid "Artist Sort Order"
+msgid "Album Artist Sort Order"
 msgstr ""
 
 #: ../picard/util/tags.py:32
-msgid "Title Sort Order"
+msgid "Artist Sort Order"
 msgstr ""
 
 #: ../picard/util/tags.py:33
-msgid "Album Sort Order"
+msgid "Title Sort Order"
 msgstr ""
 
 #: ../picard/util/tags.py:34
-msgid "ASIN"
+msgid "Album Sort Order"
 msgstr ""
 
 #: ../picard/util/tags.py:35
+msgid "ASIN"
+msgstr ""
+
+#: ../picard/util/tags.py:36
 msgid "Grouping"
 msgstr ""
 
-#: ../picard/util/tags.py:37
+#: ../picard/util/tags.py:38
 msgid "ISRC"
 msgstr ""
 
-#: ../picard/util/tags.py:38
+#: ../picard/util/tags.py:39
 msgid "Mood"
 msgstr ""
 
-#: ../picard/util/tags.py:39
+#: ../picard/util/tags.py:40
 msgid "BPM"
 msgstr ""
 
-#: ../picard/util/tags.py:40
+#: ../picard/util/tags.py:41
 msgid "Copyright"
 msgstr ""
 
-#: ../picard/util/tags.py:41
+#: ../picard/util/tags.py:42
 msgid "Composer"
 msgstr ""
 
-#: ../picard/util/tags.py:42
+#: ../picard/util/tags.py:43
 msgid "Conductor"
 msgstr ""
 
-#: ../picard/util/tags.py:43
+#: ../picard/util/tags.py:44
 msgid "Lyricist"
 msgstr ""
 
-#: ../picard/util/tags.py:44
+#: ../picard/util/tags.py:45
 msgid "Arranger"
 msgstr ""
 
-#: ../picard/util/tags.py:45
+#: ../picard/util/tags.py:46
 msgid "Producer"
 msgstr ""
 
-#: ../picard/util/tags.py:46
+#: ../picard/util/tags.py:47
 msgid "Engineer"
 msgstr ""
 
-#: ../picard/util/tags.py:47
+#: ../picard/util/tags.py:48
 msgid "Subtitle"
 msgstr ""
 
-#: ../picard/util/tags.py:48
+#: ../picard/util/tags.py:49
 msgid "Disc Subtitle"
 msgstr ""
 
-#: ../picard/util/tags.py:49
+#: ../picard/util/tags.py:50
 msgid "Remixer"
 msgstr ""
 
-#: ../picard/util/tags.py:50
+#: ../picard/util/tags.py:51
 msgid "MusicBrainz Track Id"
 msgstr ""
 
-#: ../picard/util/tags.py:51
+#: ../picard/util/tags.py:52
 msgid "MusicBrainz Release Id"
 msgstr ""
 
-#: ../picard/util/tags.py:52
+#: ../picard/util/tags.py:53
 msgid "MusicBrainz Artist Id"
 msgstr ""
 
-#: ../picard/util/tags.py:53
+#: ../picard/util/tags.py:54
 msgid "MusicBrainz Release Artist Id"
 msgstr ""
 
-#: ../picard/util/tags.py:54
+#: ../picard/util/tags.py:55
 msgid "MusicBrainz TRM Id"
 msgstr ""
 
-#: ../picard/util/tags.py:55
+#: ../picard/util/tags.py:56
 msgid "MusicBrainz Disc Id"
 msgstr ""
 
-#: ../picard/util/tags.py:56
+#: ../picard/util/tags.py:57
 msgid "MusicBrainz Sort Name"
 msgstr ""
 
-#: ../picard/util/tags.py:57
+#: ../picard/util/tags.py:58
 msgid "MusicIP PUID"
 msgstr ""
 
-#: ../picard/util/tags.py:58
+#: ../picard/util/tags.py:59
 msgid "MusicIP Fingerprint"
 msgstr ""
 
-#: ../picard/util/tags.py:59
+#: ../picard/util/tags.py:60
 msgid "Disc Id"
 msgstr ""
 
-#: ../picard/util/tags.py:60
+#: ../picard/util/tags.py:61
 msgid "Website"
 msgstr ""
 
-#: ../picard/util/tags.py:61
+#: ../picard/util/tags.py:62
 msgid "Compilation"
 msgstr ""
 
-#: ../picard/util/tags.py:62
+#: ../picard/util/tags.py:63
 msgid "Comment"
 msgstr ""
 
-#: ../picard/util/tags.py:63
+#: ../picard/util/tags.py:64
 msgid "Genre"
 msgstr ""
 
-#: ../picard/util/tags.py:64
+#: ../picard/util/tags.py:65
 msgid "Encoded By"
 msgstr ""
 
-#: ../picard/util/tags.py:65
+#: ../picard/util/tags.py:66
 msgid "Performer"
 msgstr ""
 
-#: ../picard/util/tags.py:66
+#: ../picard/util/tags.py:67
 msgid "Release Type"
 msgstr ""
 
-#: ../picard/util/tags.py:67
+#: ../picard/util/tags.py:68
 msgid "Release Status"
 msgstr ""
 
-#: ../picard/util/tags.py:68
+#: ../picard/util/tags.py:69
 msgid "Release Country"
 msgstr ""
 
-#: ../picard/util/tags.py:69
+#: ../picard/util/tags.py:70
 msgid "Record Label"
 msgstr ""
 
-#: ../picard/util/tags.py:70
+#: ../picard/util/tags.py:71
 msgid "Barcode"
 msgstr ""
 
-#: ../picard/util/tags.py:71
+#: ../picard/util/tags.py:72
 msgid "Catalog Number"
 msgstr ""
 
-#: ../picard/util/tags.py:72
+#: ../picard/util/tags.py:73
 msgid "Format"
 msgstr ""
 
-#: ../picard/util/tags.py:73
+#: ../picard/util/tags.py:74
 msgid "DJ-Mixer"
 msgstr ""
 
-#: ../picard/util/tags.py:74
+#: ../picard/util/tags.py:75
 msgid "Media"
 msgstr ""
 
-#: ../picard/util/tags.py:75
+#: ../picard/util/tags.py:76
 msgid "Lyrics"
 msgstr ""
 
-#: ../picard/util/tags.py:76
+#: ../picard/util/tags.py:77
 msgid "Mixer"
 msgstr ""
 
-#: ../picard/util/tags.py:77
+#: ../picard/util/tags.py:78
 msgid "Language"
 msgstr ""
 
-#: ../picard/util/tags.py:78
+#: ../picard/util/tags.py:79
 msgid "Script"
 msgstr ""
 
@@ -2479,6 +2520,5 @@ msgid ""
 "%s"
 msgstr ""
 
-#, python-format
 #~ msgid "[couldn't load album %s]"
 #~ msgstr "[cuidna lade album %s]"
diff --git a/po/sk.po b/po/sk.po
index 0cc26ae4e..716161c5b 100644
--- a/po/sk.po
+++ b/po/sk.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: 0.5.2\n"
 "Report-Msgid-Bugs-To: http://bugs.musicbrainz.org/\n"
-"POT-Creation-Date: 2009-02-24 18:58+0100\n"
+"POT-Creation-Date: 2009-04-06 22:50+0200\n"
 "PO-Revision-Date: 2009-01-25 15:37+0000\n"
 "Last-Translator: Philipp Wolfer <Unknown>\n"
 "Language-Team: Slovak <sk@li.org>\n"
@@ -18,16 +18,16 @@ msgstr ""
 "X-Generator: Launchpad (build Unknown)\n"
 "Generated-By: pygettext.py 1.5\n"
 
-#: ../picard/album.py:108 ../picard/cluster.py:248
+#: ../picard/album.py:109 ../picard/cluster.py:248
 msgid "Unmatched Files"
 msgstr ""
 
-#: ../picard/album.py:281
+#: ../picard/album.py:287
 #, python-format
 msgid "[could not load album %s]"
 msgstr ""
 
-#: ../picard/album.py:317
+#: ../picard/album.py:320
 msgid "[loading album information]"
 msgstr ""
 
@@ -587,7 +587,7 @@ msgid "Namibia"
 msgstr ""
 
 #: ../picard/const.py:182
-msgid "Vanuat"
+msgid "Vanuatu"
 msgstr ""
 
 #: ../picard/const.py:183
@@ -1031,223 +1031,234 @@ msgid "Congo, The Democratic Republic of the"
 msgstr ""
 
 #: ../picard/const.py:293
-msgid "Serbia and Montenegro"
+msgid "Serbia and Montenegro (historical, 2003-2006)"
 msgstr ""
 
 #: ../picard/const.py:294
-msgid "Croatia"
+msgid "Serbia"
 msgstr ""
 
 #: ../picard/const.py:295
-msgid "Korea (North), Democratic People's Republic of"
+msgid "Montenegro"
 msgstr ""
 
 #: ../picard/const.py:296
-msgid "Korea (South), Republic of"
+msgid "Croatia"
 msgstr ""
 
 #: ../picard/const.py:297
-msgid "Slovakia"
+msgid "Korea (North), Democratic People's Republic of"
 msgstr ""
 
 #: ../picard/const.py:298
-msgid "Soviet Union (historical, 1922-1991)"
+msgid "Korea (South), Republic of"
 msgstr ""
 
 #: ../picard/const.py:299
-msgid "East Timor"
+msgid "Slovakia"
 msgstr ""
 
 #: ../picard/const.py:300
-msgid "Czechoslovakia (historical, 1918-1992)"
+msgid "Soviet Union (historical, 1922-1991)"
 msgstr ""
 
 #: ../picard/const.py:301
-msgid "Europe"
+msgid "East Timor"
 msgstr ""
 
 #: ../picard/const.py:302
-msgid "East Germany (historical, 1949-1990)"
+msgid "Czechoslovakia (historical, 1918-1992)"
 msgstr ""
 
 #: ../picard/const.py:303
-msgid "[Unknown Country]"
+msgid "Europe"
 msgstr ""
 
 #: ../picard/const.py:304
-msgid "[Worldwide]"
+msgid "East Germany (historical, 1949-1990)"
 msgstr ""
 
 #: ../picard/const.py:305
+msgid "[Unknown Country]"
+msgstr ""
+
+#: ../picard/const.py:306
+msgid "[Worldwide]"
+msgstr ""
+
+#: ../picard/const.py:307
 msgid "Yugoslavia (historical, 1918-1992)"
 msgstr ""
 
-#: ../picard/const.py:310
-msgid "Catalan"
-msgstr ""
-
-#: ../picard/const.py:311
-msgid "Czech"
-msgstr "Čeština"
-
 #: ../picard/const.py:312
-msgid "Welsh"
+msgid "Afrikaans"
 msgstr ""
 
 #: ../picard/const.py:313
-msgid "Danish"
+msgid "Arabic"
 msgstr ""
 
 #: ../picard/const.py:314
-msgid "German"
-msgstr "Nemčina"
+msgid "Catalan"
+msgstr ""
 
 #: ../picard/const.py:315
-msgid "English"
-msgstr "Angličtina"
+msgid "Czech"
+msgstr "Čeština"
 
 #: ../picard/const.py:316
-msgid "English (Canada)"
+msgid "Welsh"
 msgstr ""
 
 #: ../picard/const.py:317
+msgid "Danish"
+msgstr ""
+
+#: ../picard/const.py:318
+msgid "German"
+msgstr "Nemčina"
+
+#: ../picard/const.py:319
+msgid "English"
+msgstr "Angličtina"
+
+#: ../picard/const.py:320
+msgid "English (Canada)"
+msgstr ""
+
+#: ../picard/const.py:321
 msgid "English (UK)"
 msgstr "Angličtina (UK)"
 
-#: ../picard/const.py:318
+#: ../picard/const.py:322
 msgid "Spanish"
 msgstr "Španielčina"
 
-#: ../picard/const.py:319
+#: ../picard/const.py:323
 msgid "Persian"
 msgstr ""
 
-#: ../picard/const.py:320
+#: ../picard/const.py:324
 msgid "Finnish"
 msgstr "Fínština"
 
-#: ../picard/const.py:321
+#: ../picard/const.py:325
 msgid "French"
 msgstr "Francúzština"
 
-#: ../picard/const.py:322
+#: ../picard/const.py:326
 msgid "Frisian"
 msgstr ""
 
-#: ../picard/const.py:323
+#: ../picard/const.py:327
 msgid "Hebrew"
 msgstr ""
 
-#: ../picard/const.py:324
+#: ../picard/const.py:328
+msgid "Hindi"
+msgstr ""
+
+#: ../picard/const.py:329
 msgid "Hungarian"
 msgstr "Maďarčina"
 
-#: ../picard/const.py:325
+#: ../picard/const.py:330
 msgid "Islandic"
 msgstr ""
 
-#: ../picard/const.py:326
+#: ../picard/const.py:331
 msgid "Italian"
 msgstr "Taliančina"
 
-#: ../picard/const.py:327
+#: ../picard/const.py:332
 msgid "Kannada"
 msgstr ""
 
-#: ../picard/const.py:328
+#: ../picard/const.py:333
 msgid "Korean"
 msgstr "Kórejština"
 
-#: ../picard/const.py:329
+#: ../picard/const.py:334
 msgid "Lithuanian"
 msgstr ""
 
-#: ../picard/const.py:330
+#: ../picard/const.py:335
 msgid "Norwegian Bokmal"
 msgstr "Nórština"
 
-#: ../picard/const.py:331
+#: ../picard/const.py:336
 msgid "Dutch"
 msgstr "Holandština"
 
-#: ../picard/const.py:332
+#: ../picard/const.py:337
 msgid "Polish"
 msgstr ""
 
-#: ../picard/const.py:333
+#: ../picard/const.py:338
 msgid "Portuguese"
 msgstr "Portugalčina"
 
-#: ../picard/const.py:334
+#: ../picard/const.py:339
 msgid "Brazilian Portuguese"
 msgstr ""
 
-#: ../picard/const.py:335
+#: ../picard/const.py:340
 msgid "Romanian"
 msgstr "Rumunština"
 
-#: ../picard/const.py:336
+#: ../picard/const.py:341
 msgid "Russian"
 msgstr "Ruština"
 
-#: ../picard/const.py:337
+#: ../picard/const.py:342
 msgid "Scots"
 msgstr ""
 
-#: ../picard/const.py:338
+#: ../picard/const.py:343
 msgid "Slovak"
 msgstr "Slovenčina"
 
-#: ../picard/const.py:339
+#: ../picard/const.py:344
 msgid "Slovenian"
 msgstr ""
 
-#: ../picard/const.py:340
+#: ../picard/const.py:345
 msgid "Swedish"
 msgstr "Švédština"
 
-#: ../picard/const.py:341
+#: ../picard/const.py:346
+msgid "Turkish"
+msgstr ""
+
+#: ../picard/const.py:347
 msgid "Chinese"
 msgstr ""
 
-#: ../picard/file.py:487
+#: ../picard/file.py:494
 #, python-format
 msgid "No matching tracks for file %s"
 msgstr ""
 
-#: ../picard/file.py:504
+#: ../picard/file.py:511
 #, python-format
 msgid "No matching tracks above the threshold for file %s"
 msgstr ""
 
-#: ../picard/file.py:507
+#: ../picard/file.py:514
 #, python-format
 msgid "File %s identified!"
 msgstr "Súbor %s identifikovaný!"
 
-#: ../picard/file.py:518
+#: ../picard/file.py:525
 #, python-format
 msgid "Looking up the PUID for file %s..."
 msgstr ""
 
-#: ../picard/file.py:523
+#: ../picard/file.py:530
 #, 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 ""
@@ -1260,11 +1271,24 @@ msgstr ""
 msgid "XSPF Playlist (*.xspf)"
 msgstr ""
 
-#: ../picard/tagger.py:476
-msgid "CD Lookup Error"
+#: ../picard/puidmanager.py:62
+msgid "Submitting PUIDs..."
+msgstr ""
+
+#: ../picard/puidmanager.py:68
+#, python-format
+msgid "PUIDs submission failed: %s"
+msgstr ""
+
+#: ../picard/puidmanager.py:70
+msgid "PUIDs successfully submitted!"
 msgstr ""
 
 #: ../picard/tagger.py:477
+msgid "CD Lookup Error"
+msgstr ""
+
+#: ../picard/tagger.py:478
 #, python-format
 msgid ""
 "Error while reading CD:\n"
@@ -1272,7 +1296,7 @@ msgid ""
 "%s"
 msgstr ""
 
-#: ../picard/tagger.py:503
+#: ../picard/tagger.py:504
 #, python-format
 msgid "Could not find PUID for file %s"
 msgstr ""
@@ -1325,15 +1349,28 @@ msgstr ""
 msgid "Length"
 msgstr ""
 
-#: ../picard/ui/itemviews.py:327
+#: ../picard/ui/itemviews.py:289
+msgid "&Expand all"
+msgstr ""
+
+#: ../picard/ui/itemviews.py:291
+msgid "&Collapse all"
+msgstr ""
+
+#: ../picard/ui/itemviews.py:332
 msgid "&Releases"
 msgstr ""
 
-#: ../picard/ui/itemviews.py:353
+#: ../picard/ui/itemviews.py:349
+#, fuzzy
+msgid "No release event"
+msgstr "Mesiac dátumu vydania"
+
+#: ../picard/ui/itemviews.py:359
 msgid "&Plugins"
 msgstr ""
 
-#: ../picard/ui/itemviews.py:523
+#: ../picard/ui/itemviews.py:533
 msgid "Clusters"
 msgstr ""
 
@@ -1341,95 +1378,6 @@ msgstr ""
 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:66 ../picard/ui/ui_options_plugins.py:62
-msgid "Details"
-msgstr "Podrobnosti"
-
-#: ../picard/ui/tageditor.py:71 ../picard/ui/tageditor.py:264
-#, python-format
-msgid "%d file"
-msgid_plural "%d files"
-msgstr[0] "Otvoriť súbor"
-msgstr[1] "Otvoriť súbor"
-
-#: ../picard/ui/tageditor.py:131
-#, python-format
-msgid "(different across %d file)"
-msgid_plural "(different across %d files)"
-msgstr[0] ""
-msgstr[1] ""
-
-#: ../picard/ui/tageditor.py:134
-#, python-format
-msgid "(missing from %d file)"
-msgid_plural "(missing from %d files)"
-msgstr[0] ""
-msgstr[1] ""
-
-#: ../picard/ui/tageditor.py:233
-msgid "Filename:"
-msgstr ""
-
-#: ../picard/ui/tageditor.py:235
-msgid "Format:"
-msgstr ""
-
-#: ../picard/ui/tageditor.py:244
-msgid "Size:"
-msgstr ""
-
-#: ../picard/ui/tageditor.py:248 ../picard/ui/ui_metadata.py:127
-msgid "Length:"
-msgstr ""
-
-#: ../picard/ui/tageditor.py:250
-msgid "Bitrate:"
-msgstr ""
-
-#: ../picard/ui/tageditor.py:252
-msgid "Sample rate:"
-msgstr ""
-
-#: ../picard/ui/tageditor.py:254
-msgid "Bits per sample:"
-msgstr ""
-
-#: ../picard/ui/tageditor.py:257
-msgid "Mono"
-msgstr ""
-
-#: ../picard/ui/tageditor.py:258
-msgid "Stereo"
-msgstr ""
-
-#: ../picard/ui/tageditor.py:260
-msgid "Channels:"
-msgstr ""
-
-#: ../picard/ui/tagsfromfilenames.py:52 ../picard/ui/tagsfromfilenames.py:96
-msgid "File Name"
-msgstr ""
-
 #: ../picard/ui/mainwindow.py:64
 msgid "MusicBrainz Picard"
 msgstr ""
@@ -1666,6 +1614,10 @@ msgstr ""
 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 ""
@@ -1685,12 +1637,97 @@ msgstr ""
 msgid " (Error: %s)"
 msgstr ""
 
+#: ../picard/ui/puidsubmit.py:31 ../picard/ui/options/plugins.py:85
+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/passworddialog.py:38
 #, python-format
 msgid ""
 "The server %s requires you to login. Please enter your username and password."
 msgstr ""
 
+#: ../picard/ui/tageditor.py:66 ../picard/ui/ui_options_plugins.py:62
+msgid "Details"
+msgstr "Podrobnosti"
+
+#: ../picard/ui/tageditor.py:71 ../picard/ui/tageditor.py:264
+#, python-format
+msgid "%d file"
+msgid_plural "%d files"
+msgstr[0] "Otvoriť súbor"
+msgstr[1] "Otvoriť súbor"
+
+#: ../picard/ui/tageditor.py:131
+#, python-format
+msgid "(different across %d file)"
+msgid_plural "(different across %d files)"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../picard/ui/tageditor.py:134
+#, python-format
+msgid "(missing from %d file)"
+msgid_plural "(missing from %d files)"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../picard/ui/tageditor.py:233
+msgid "Filename:"
+msgstr ""
+
+#: ../picard/ui/tageditor.py:235
+msgid "Format:"
+msgstr ""
+
+#: ../picard/ui/tageditor.py:244
+msgid "Size:"
+msgstr ""
+
+#: ../picard/ui/tageditor.py:248 ../picard/ui/ui_metadata.py:127
+msgid "Length:"
+msgstr ""
+
+#: ../picard/ui/tageditor.py:250
+msgid "Bitrate:"
+msgstr ""
+
+#: ../picard/ui/tageditor.py:252
+msgid "Sample rate:"
+msgstr ""
+
+#: ../picard/ui/tageditor.py:254
+msgid "Bits per sample:"
+msgstr ""
+
+#: ../picard/ui/tageditor.py:257
+msgid "Mono"
+msgstr ""
+
+#: ../picard/ui/tageditor.py:258
+msgid "Stereo"
+msgstr ""
+
+#: ../picard/ui/tageditor.py:260
+msgid "Channels:"
+msgstr ""
+
+#: ../picard/ui/tagsfromfilenames.py:54 ../picard/ui/tagsfromfilenames.py:99
+msgid "File Name"
+msgstr ""
+
 #: ../picard/ui/ui_cdlookup.py:60 ../picard/ui/ui_options_cdlookup.py:47
 #: ../picard/ui/ui_options_cdlookup_select.py:48
 #: ../picard/ui/options/cdlookup.py:36
@@ -1713,24 +1750,6 @@ msgstr ""
 msgid "Cancel"
 msgstr "Zrušiť"
 
-#: ../picard/ui/ui_passworddialog.py:78
-msgid "Authentication required"
-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"
-msgstr ""
-
 #: ../picard/ui/ui_edittagdialog.py:44
 msgid "Edit Tag"
 msgstr ""
@@ -1767,6 +1786,10 @@ msgstr ""
 msgid "Options"
 msgstr ""
 
+#: ../picard/ui/ui_puidsubmit.py:52
+msgid "Submit PUIDs"
+msgstr "Odoslať PUID"
+
 #: ../picard/ui/ui_options_cdlookup.py:48
 msgid "CD-ROM device to use for lookups:"
 msgstr ""
@@ -1791,6 +1814,22 @@ msgstr ""
 msgid "Overwrite the file if it already exists"
 msgstr ""
 
+#: ../picard/ui/ui_options_moving.py:53
+msgid "Move additional files:"
+msgstr ""
+
+#: ../picard/ui/ui_options_moving.py:54
+msgid "Browse..."
+msgstr ""
+
+#: ../picard/ui/ui_options_moving.py:55
+msgid "Delete empty directories"
+msgstr ""
+
+#: ../picard/ui/ui_options_moving.py:56
+msgid "Move files to this directory when saving:"
+msgstr ""
+
 #: ../picard/ui/util.py:31
 msgid "&Ok"
 msgstr ""
@@ -1799,44 +1838,40 @@ msgstr ""
 msgid "&Cancel"
 msgstr ""
 
-#: ../picard/ui/ui_puidsubmit.py:52
-msgid "Submit PUIDs"
-msgstr "Odoslať PUID"
-
-#: ../picard/ui/ui_tageditor.py:139 ../picard/ui/ui_options_plugins.py:59
-#: ../picard/ui/options/plugins.py:76
+#: ../picard/ui/ui_tageditor.py:128 ../picard/ui/ui_options_plugins.py:59
+#: ../picard/ui/options/plugins.py:81
 msgid "Name"
 msgstr ""
 
-#: ../picard/ui/ui_tageditor.py:140
+#: ../picard/ui/ui_tageditor.py:129
 msgid "Value"
 msgstr ""
 
-#: ../picard/ui/ui_tageditor.py:141
+#: ../picard/ui/ui_tageditor.py:130
 msgid "Rating:"
 msgstr ""
 
-#: ../picard/ui/ui_tageditor.py:142
+#: ../picard/ui/ui_tageditor.py:131
 msgid "&Add..."
 msgstr ""
 
-#: ../picard/ui/ui_tageditor.py:143
+#: ../picard/ui/ui_tageditor.py:132
 msgid "&Edit..."
 msgstr ""
 
-#: ../picard/ui/ui_tageditor.py:144
+#: ../picard/ui/ui_tageditor.py:133
 msgid "&Delete"
 msgstr ""
 
-#: ../picard/ui/ui_tageditor.py:145
+#: ../picard/ui/ui_tageditor.py:134
 msgid "&Metadata"
 msgstr ""
 
-#: ../picard/ui/ui_tageditor.py:146
+#: ../picard/ui/ui_tageditor.py:135
 msgid "A&rtwork"
 msgstr ""
 
-#: ../picard/ui/ui_tageditor.py:147
+#: ../picard/ui/ui_tageditor.py:136
 msgid "&Info"
 msgstr ""
 
@@ -1881,6 +1916,40 @@ msgstr ""
 msgid ", "
 msgstr ""
 
+#: ../picard/ui/ui_options_general.py:108
+msgid "MusicBrainz Server"
+msgstr ""
+
+#: ../picard/ui/ui_options_general.py:109 ../picard/ui/ui_options_proxy.py:72
+msgid "Port:"
+msgstr ""
+
+#: ../picard/ui/ui_options_general.py:110 ../picard/ui/ui_options_proxy.py:73
+msgid "Server address:"
+msgstr ""
+
+#: ../picard/ui/ui_options_general.py:111
+msgid "Account Information"
+msgstr ""
+
+#: ../picard/ui/ui_options_general.py:112 ../picard/ui/ui_options_proxy.py:70
+#: ../picard/ui/ui_passworddialog.py:80
+msgid "Password:"
+msgstr ""
+
+#: ../picard/ui/ui_options_general.py:113 ../picard/ui/ui_options_proxy.py:71
+#: ../picard/ui/ui_passworddialog.py:79
+msgid "Username:"
+msgstr ""
+
+#: ../picard/ui/ui_options_general.py:114 ../picard/ui/options/general.py:29
+msgid "General"
+msgstr "Všeobecné"
+
+#: ../picard/ui/ui_options_general.py:115
+msgid "Automatically scan all new files"
+msgstr ""
+
 #: ../picard/ui/ui_options_interface.py:50
 msgid "Miscellaneous"
 msgstr ""
@@ -1901,113 +1970,6 @@ msgstr ""
 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 "Š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_options_naming.py:180
-#: ../picard/ui/ui_tagsfromfilenames.py:58
-msgid "&Preview"
-msgstr ""
-
-#: ../picard/ui/ui_options_proxy.py:81 ../picard/ui/options/proxy.py:28
-msgid "Web Proxy"
-msgstr "Proxy"
-
-#: ../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_options_ratings.py:45
-msgid "Enable track ratings"
-msgstr ""
-
-#: ../picard/ui/ui_options_ratings.py:46
-msgid ""
-"Picard saves the ratings together with an e-mail address identifying the "
-"user who did the rating. That way different ratings for different users can "
-"be stored in the files. Please sepcify the e-mail you want to use to save "
-"your ratings."
-msgstr ""
-
-#: ../picard/ui/ui_options_ratings.py:47
-msgid "E-mail:"
-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 ../picard/ui/options/general.py:29
-msgid "General"
-msgstr "Všeobecné"
-
-#: ../picard/ui/ui_options_general.py:115
-msgid "Automatically scan all new files"
-msgstr ""
-
 #: ../picard/ui/ui_options_matching.py:105
 msgid "Thresholds"
 msgstr ""
@@ -2064,72 +2026,146 @@ msgstr ""
 msgid "Non-album tracks:"
 msgstr ""
 
-#: ../picard/ui/ui_options_plugins.py:58 ../picard/ui/options/plugins.py:30
+#: ../picard/ui/ui_options_metadata.py:109
+#: ../picard/ui/ui_options_metadata.py:110
+#: ../picard/ui/ui_options_renaming.py:155
+#: ../picard/ui/ui_options_renaming.py:158
+msgid "Default"
+msgstr "Štandardné"
+
+#: ../picard/ui/ui_options_plugins.py:58 ../picard/ui/options/plugins.py:34
 msgid "Plugins"
 msgstr ""
 
-#: ../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:84
 msgid "Author"
 msgstr ""
 
-#: ../picard/ui/ui_options_plugins.py:61 ../picard/util/tags.py:36
+#: ../picard/ui/ui_options_plugins.py:61 ../picard/util/tags.py:37
 msgid "Version"
 msgstr ""
 
-#: ../picard/ui/ui_options_script.py:52
+#: ../picard/ui/ui_options_proxy.py:69 ../picard/ui/options/proxy.py:28
+msgid "Web Proxy"
+msgstr "Proxy"
+
+#: ../picard/ui/ui_options_ratings.py:45
+msgid "Enable track ratings"
+msgstr ""
+
+#: ../picard/ui/ui_options_ratings.py:46
+msgid ""
+"Picard saves the ratings together with an e-mail address identifying the "
+"user who did the rating. That way different ratings for different users can "
+"be stored in the files. Please sepcify the e-mail you want to use to save "
+"your ratings."
+msgstr ""
+
+#: ../picard/ui/ui_options_ratings.py:47
+msgid "E-mail:"
+msgstr ""
+
+#: ../picard/ui/ui_options_renaming.py:145
+msgid "Form"
+msgstr ""
+
+#: ../picard/ui/ui_options_renaming.py:146
+#, fuzzy
+msgid "Rename files when saving"
+msgstr "Premenovať súbory pri zápise tagov"
+
+#: ../picard/ui/ui_options_renaming.py:147
+msgid "Replace non-ASCII characters"
+msgstr ""
+
+#: ../picard/ui/ui_options_renaming.py:148
+msgid "Replace Windows-incompatible characters"
+msgstr ""
+
+#: ../picard/ui/ui_options_renaming.py:149
+msgid "Name files like this"
+msgstr ""
+
+#: ../picard/ui/ui_options_renaming.py:156
+msgid "Name multiple artist albums differently"
+msgstr ""
+
+#: ../picard/ui/ui_options_renaming.py:157
+msgid "Copy from above"
+msgstr ""
+
+#: ../picard/ui/ui_options_renaming.py:159
+msgid "Examples"
+msgstr ""
+
+#: ../picard/ui/ui_options_script.py:43
 msgid "Tagger Script"
 msgstr ""
 
-#: ../picard/ui/ui_options_tags.py:85
-msgid "Common"
+#: ../picard/ui/ui_options_tags.py:97
+msgid "Do not write tags to files"
 msgstr ""
 
-#: ../picard/ui/ui_options_tags.py:86
-msgid "Clear existing tags before writing new tags"
+#: ../picard/ui/ui_options_tags.py:98
+msgid "Before tagging"
+msgstr ""
+
+#: ../picard/ui/ui_options_tags.py:99
+#, fuzzy
+msgid "Clear existing tags"
 msgstr "Odstrániť existujúce tagy pre zapisovaním nových"
 
-#: ../picard/ui/ui_options_tags.py:87
-msgid "Don not write tags to files"
-msgstr ""
-
-#: ../picard/ui/ui_options_tags.py:88
-msgid "ID3"
-msgstr ""
-
-#: ../picard/ui/ui_options_tags.py:89
-msgid "Write ID3v1 tags to the files"
-msgstr ""
-
-#: ../picard/ui/ui_options_tags.py:90
-msgid "Write ID3v2 version 2.3 tags (2.4 is default)"
-msgstr "Zapísať ID3v2 tagy vo verzií 2.3 (2.4 je štandard)"
-
-#: ../picard/ui/ui_options_tags.py:91
-msgid "Text encoding to use while writing ID3v2 tags:"
-msgstr ""
-
-#: ../picard/ui/ui_options_tags.py:92
-msgid "ISO-8859-1"
-msgstr ""
-
-#: ../picard/ui/ui_options_tags.py:93
-msgid "UTF-16"
-msgstr ""
-
-#: ../picard/ui/ui_options_tags.py:94
-msgid "UTF-8"
-msgstr ""
-
-#: ../picard/ui/ui_options_tags.py:95
+#: ../picard/ui/ui_options_tags.py:100
 msgid "Remove ID3 tags from FLAC files"
 msgstr ""
 
-#: ../picard/ui/ui_options_tags.py:96
-msgid "APE"
+#: ../picard/ui/ui_options_tags.py:101
+msgid "Remove APEv2 tags from MP3 files"
 msgstr ""
 
-#: ../picard/ui/ui_options_tags.py:97
-msgid "Remove APEv2 tags from MP3 files"
+#: ../picard/ui/ui_options_tags.py:102
+msgid "Tag compatibility"
+msgstr ""
+
+#: ../picard/ui/ui_options_tags.py:103
+#, fuzzy
+msgid "ID3v2 version"
+msgstr "iba ID3v2.4"
+
+#: ../picard/ui/ui_options_tags.py:104
+msgid "2.4"
+msgstr ""
+
+#: ../picard/ui/ui_options_tags.py:105
+msgid "2.3"
+msgstr ""
+
+#: ../picard/ui/ui_options_tags.py:106
+msgid "Also include ID3v1 tags in the files"
+msgstr ""
+
+#: ../picard/ui/ui_options_tags.py:107
+msgid "ID3v2 text encoding"
+msgstr ""
+
+#: ../picard/ui/ui_options_tags.py:108
+msgid "UTF-8"
+msgstr ""
+
+#: ../picard/ui/ui_options_tags.py:109
+msgid "UTF-16"
+msgstr ""
+
+#: ../picard/ui/ui_options_tags.py:110
+msgid "ISO-8859-1"
+msgstr ""
+
+#: ../picard/ui/ui_passworddialog.py:78
+msgid "Authentication required"
+msgstr ""
+
+#: ../picard/ui/ui_passworddialog.py:81
+msgid "Save username and password"
 msgstr ""
 
 #: ../picard/ui/ui_tagsfromfilenames.py:56
@@ -2140,6 +2176,10 @@ msgstr ""
 msgid "Replace underscores with spaces"
 msgstr ""
 
+#: ../picard/ui/ui_tagsfromfilenames.py:58
+msgid "&Preview"
+msgstr ""
+
 #: ../picard/ui/options/about.py:29
 msgid "About"
 msgstr "O programe"
@@ -2167,8 +2207,8 @@ 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"
@@ -2176,14 +2216,13 @@ msgid ""
 "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\"><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/P"
-"icardTagger</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
@@ -2216,42 +2255,45 @@ msgstr ""
 msgid "None"
 msgstr ""
 
-#: ../picard/ui/options/naming.py:33
-msgid "File Naming"
-msgstr ""
+#: ../picard/ui/options/moving.py:33
+#, fuzzy
+msgid "Moving files"
+msgstr "Presúvanie 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
-msgid "The file naming format must not be empty."
-msgstr ""
-
-#: ../picard/ui/options/naming.py:95
-msgid "The multiple artist file naming format must not be empty."
-msgstr ""
-
-#: ../picard/ui/options/naming.py:97
+#: ../picard/ui/options/moving.py:65
 msgid "Error"
 msgstr ""
 
-#: ../picard/ui/options/naming.py:97
+#: ../picard/ui/options/moving.py:65
 msgid "The location to move files to must not be empty."
 msgstr ""
 
-#: ../picard/ui/options/scripting.py:63
-msgid "Scripting"
+#: ../picard/ui/options/ratings.py:29
+msgid "Ratings"
 msgstr ""
 
 #: ../picard/ui/options/tags.py:29
 msgid "Tags"
 msgstr "Tagy"
 
-#: ../picard/ui/options/ratings.py:29
-msgid "Ratings"
+#: ../picard/ui/options/renaming.py:35
+msgid "File naming"
+msgstr ""
+
+#: ../picard/ui/options/renaming.py:123
+msgid "The file naming format must not be empty."
+msgstr ""
+
+#: ../picard/ui/options/renaming.py:133
+msgid "The multiple artist file naming format must not be empty."
+msgstr ""
+
+#: ../picard/ui/options/scripting.py:63
+msgid "Scripting"
+msgstr ""
+
+#: ../picard/ui/options/scripting.py:97
+msgid "Script Error"
 msgstr ""
 
 #: ../picard/util/tags.py:24
@@ -2259,214 +2301,219 @@ msgid "Date"
 msgstr ""
 
 #: ../picard/util/tags.py:25
+#, fuzzy
+msgid "Original Release Date"
+msgstr "Dátum vydania"
+
+#: ../picard/util/tags.py:26
 msgid "Album Artist"
 msgstr ""
 
-#: ../picard/util/tags.py:26
+#: ../picard/util/tags.py:27
 msgid "Track Number"
 msgstr ""
 
-#: ../picard/util/tags.py:27
+#: ../picard/util/tags.py:28
 msgid "Total Tracks"
 msgstr ""
 
-#: ../picard/util/tags.py:28
+#: ../picard/util/tags.py:29
 msgid "Disc Number"
 msgstr ""
 
-#: ../picard/util/tags.py:29
+#: ../picard/util/tags.py:30
 msgid "Total Discs"
 msgstr ""
 
-#: ../picard/util/tags.py:30
+#: ../picard/util/tags.py:31
 msgid "Album Artist Sort Order"
 msgstr ""
 
-#: ../picard/util/tags.py:31
+#: ../picard/util/tags.py:32
 msgid "Artist Sort Order"
 msgstr ""
 
-#: ../picard/util/tags.py:32
+#: ../picard/util/tags.py:33
 msgid "Title Sort Order"
 msgstr ""
 
-#: ../picard/util/tags.py:33
+#: ../picard/util/tags.py:34
 msgid "Album Sort Order"
 msgstr ""
 
-#: ../picard/util/tags.py:34
+#: ../picard/util/tags.py:35
 msgid "ASIN"
 msgstr ""
 
-#: ../picard/util/tags.py:35
+#: ../picard/util/tags.py:36
 msgid "Grouping"
 msgstr ""
 
-#: ../picard/util/tags.py:37
+#: ../picard/util/tags.py:38
 msgid "ISRC"
 msgstr ""
 
-#: ../picard/util/tags.py:38
+#: ../picard/util/tags.py:39
 msgid "Mood"
 msgstr ""
 
-#: ../picard/util/tags.py:39
+#: ../picard/util/tags.py:40
 msgid "BPM"
 msgstr ""
 
-#: ../picard/util/tags.py:40
+#: ../picard/util/tags.py:41
 msgid "Copyright"
 msgstr ""
 
-#: ../picard/util/tags.py:41
+#: ../picard/util/tags.py:42
 msgid "Composer"
 msgstr ""
 
-#: ../picard/util/tags.py:42
+#: ../picard/util/tags.py:43
 msgid "Conductor"
 msgstr ""
 
-#: ../picard/util/tags.py:43
+#: ../picard/util/tags.py:44
 msgid "Lyricist"
 msgstr ""
 
-#: ../picard/util/tags.py:44
+#: ../picard/util/tags.py:45
 msgid "Arranger"
 msgstr ""
 
-#: ../picard/util/tags.py:45
+#: ../picard/util/tags.py:46
 msgid "Producer"
 msgstr ""
 
-#: ../picard/util/tags.py:46
+#: ../picard/util/tags.py:47
 msgid "Engineer"
 msgstr ""
 
-#: ../picard/util/tags.py:47
+#: ../picard/util/tags.py:48
 msgid "Subtitle"
 msgstr ""
 
-#: ../picard/util/tags.py:48
+#: ../picard/util/tags.py:49
 msgid "Disc Subtitle"
 msgstr ""
 
-#: ../picard/util/tags.py:49
+#: ../picard/util/tags.py:50
 msgid "Remixer"
 msgstr ""
 
-#: ../picard/util/tags.py:50
+#: ../picard/util/tags.py:51
 msgid "MusicBrainz Track Id"
 msgstr ""
 
-#: ../picard/util/tags.py:51
+#: ../picard/util/tags.py:52
 msgid "MusicBrainz Release Id"
 msgstr ""
 
-#: ../picard/util/tags.py:52
+#: ../picard/util/tags.py:53
 msgid "MusicBrainz Artist Id"
 msgstr ""
 
-#: ../picard/util/tags.py:53
+#: ../picard/util/tags.py:54
 msgid "MusicBrainz Release Artist Id"
 msgstr ""
 
-#: ../picard/util/tags.py:54
+#: ../picard/util/tags.py:55
 msgid "MusicBrainz TRM Id"
 msgstr ""
 
-#: ../picard/util/tags.py:55
+#: ../picard/util/tags.py:56
 msgid "MusicBrainz Disc Id"
 msgstr ""
 
-#: ../picard/util/tags.py:56
+#: ../picard/util/tags.py:57
 msgid "MusicBrainz Sort Name"
 msgstr ""
 
-#: ../picard/util/tags.py:57
+#: ../picard/util/tags.py:58
 msgid "MusicIP PUID"
 msgstr ""
 
-#: ../picard/util/tags.py:58
+#: ../picard/util/tags.py:59
 msgid "MusicIP Fingerprint"
 msgstr ""
 
-#: ../picard/util/tags.py:59
+#: ../picard/util/tags.py:60
 msgid "Disc Id"
 msgstr ""
 
-#: ../picard/util/tags.py:60
+#: ../picard/util/tags.py:61
 msgid "Website"
 msgstr ""
 
-#: ../picard/util/tags.py:61
+#: ../picard/util/tags.py:62
 msgid "Compilation"
 msgstr ""
 
-#: ../picard/util/tags.py:62
+#: ../picard/util/tags.py:63
 msgid "Comment"
 msgstr ""
 
-#: ../picard/util/tags.py:63
+#: ../picard/util/tags.py:64
 msgid "Genre"
 msgstr ""
 
-#: ../picard/util/tags.py:64
+#: ../picard/util/tags.py:65
 msgid "Encoded By"
 msgstr ""
 
-#: ../picard/util/tags.py:65
+#: ../picard/util/tags.py:66
 msgid "Performer"
 msgstr ""
 
-#: ../picard/util/tags.py:66
+#: ../picard/util/tags.py:67
 msgid "Release Type"
 msgstr ""
 
-#: ../picard/util/tags.py:67
+#: ../picard/util/tags.py:68
 msgid "Release Status"
 msgstr ""
 
-#: ../picard/util/tags.py:68
+#: ../picard/util/tags.py:69
 msgid "Release Country"
 msgstr ""
 
-#: ../picard/util/tags.py:69
+#: ../picard/util/tags.py:70
 msgid "Record Label"
 msgstr ""
 
-#: ../picard/util/tags.py:70
+#: ../picard/util/tags.py:71
 msgid "Barcode"
 msgstr ""
 
-#: ../picard/util/tags.py:71
+#: ../picard/util/tags.py:72
 msgid "Catalog Number"
 msgstr ""
 
-#: ../picard/util/tags.py:72
+#: ../picard/util/tags.py:73
 msgid "Format"
 msgstr ""
 
-#: ../picard/util/tags.py:73
+#: ../picard/util/tags.py:74
 msgid "DJ-Mixer"
 msgstr ""
 
-#: ../picard/util/tags.py:74
+#: ../picard/util/tags.py:75
 msgid "Media"
 msgstr ""
 
-#: ../picard/util/tags.py:75
+#: ../picard/util/tags.py:76
 msgid "Lyrics"
 msgstr ""
 
-#: ../picard/util/tags.py:76
+#: ../picard/util/tags.py:77
 msgid "Mixer"
 msgstr ""
 
-#: ../picard/util/tags.py:77
+#: ../picard/util/tags.py:78
 msgid "Language"
 msgstr "Jazyk"
 
-#: ../picard/util/tags.py:78
+#: ../picard/util/tags.py:79
 msgid "Script"
 msgstr ""
 
@@ -2482,6 +2529,9 @@ msgid ""
 "%s"
 msgstr ""
 
+#~ msgid "Write ID3v2 version 2.3 tags (2.4 is default)"
+#~ msgstr "Zapísať ID3v2 tagy vo verzií 2.3 (2.4 je štandard)"
+
 #~ msgid "Automatically analyze all new files"
 #~ msgstr "Automaticky analyzovať všetky nové súbory"
 
@@ -2608,9 +2658,6 @@ msgstr ""
 #~ 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"
 
@@ -2629,9 +2676,6 @@ msgstr ""
 #~ msgid "Proxy port"
 #~ msgstr "Proxy port"
 
-#~ msgid "ID3v2.4 only"
-#~ msgstr "iba ID3v2.4"
-
 #~ msgid "Save track/album"
 #~ msgstr "Uložiť skladbu/album"
 
@@ -2666,10 +2710,11 @@ msgstr ""
 #~ 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"
-#~ "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. "
+#~ "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 ""
 #~ "Nezadali ste svoje uživateľské meno a heslo. Na prispievanie údajov do "
 #~ "MusicBrainz, je potrebné mať založený účet.\n"
@@ -2701,7 +2746,8 @@ msgstr ""
 #~ 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."
+#~ "Please fix the move option or the destination directory option and try "
+#~ "again."
 #~ msgstr ""
 #~ "Presúvanie súborov je zapnuté, ale cieľový adresár nie je zadaný alebo je "
 #~ "neplatný.\n"
@@ -2709,13 +2755,13 @@ msgstr ""
 #~ "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 click the "
-#~ "track and select 'Clear Error'"
+#~ "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 ""
-#~ "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'"
+#~ "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"
@@ -2729,14 +2775,12 @@ msgstr ""
 #~ 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 ""
-#~ "The destination directory %s does not exist. Please pick a valid directory."
+#~ "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"
@@ -2756,9 +2800,6 @@ msgstr ""
 #~ 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"
 
@@ -2803,9 +2844,6 @@ msgstr ""
 #~ 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ň"
 
@@ -2816,8 +2854,8 @@ msgstr ""
 #~ 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. "
+#~ "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. "
diff --git a/po/sl.po b/po/sl.po
index 298081f0d..34e9d3e60 100644
--- a/po/sl.po
+++ b/po/sl.po
@@ -7,31 +7,31 @@ msgid ""
 msgstr ""
 "Project-Id-Version: picard\n"
 "Report-Msgid-Bugs-To: http://bugs.musicbrainz.org/\n"
-"POT-Creation-Date: 2009-02-24 18:58+0100\n"
+"POT-Creation-Date: 2009-04-06 22:50+0200\n"
 "PO-Revision-Date: 2009-03-29 09:53+0000\n"
 "Last-Translator: Alan Pepelko <alan.pepelko@gmail.com>\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"
+"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-04-06 20:21+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:109 ../picard/cluster.py:248
 msgid "Unmatched Files"
 msgstr "Neujemajoče se datoteke"
 
-#: ../picard/album.py:281
+#: ../picard/album.py:287
 #, python-format
 msgid "[could not load album %s]"
 msgstr "[ni mogoče naložiti albuma %s]"
 
-#: ../picard/album.py:317
+#: ../picard/album.py:320
 msgid "[loading album information]"
 msgstr "[nalaganje informacij o albumu]"
 
@@ -591,7 +591,8 @@ msgid "Namibia"
 msgstr "Namibija"
 
 #: ../picard/const.py:182
-msgid "Vanuat"
+#, fuzzy
+msgid "Vanuatu"
 msgstr "Vanuatu"
 
 #: ../picard/const.py:183
@@ -1035,223 +1036,239 @@ msgid "Congo, The Democratic Republic of the"
 msgstr "Kongo, Demokratična republika"
 
 #: ../picard/const.py:293
-msgid "Serbia and Montenegro"
+#, fuzzy
+msgid "Serbia and Montenegro (historical, 2003-2006)"
 msgstr "Srbija in Črna gora"
 
 #: ../picard/const.py:294
+#, fuzzy
+msgid "Serbia"
+msgstr "Azerbajdžan"
+
+#: ../picard/const.py:295
+#, fuzzy
+msgid "Montenegro"
+msgstr "Srbija in Črna gora"
+
+#: ../picard/const.py:296
 msgid "Croatia"
 msgstr "Hrvaška"
 
-#: ../picard/const.py:295
+#: ../picard/const.py:297
 msgid "Korea (North), Democratic People's Republic of"
 msgstr "Koreja, Demokratična ljudska republika"
 
-#: ../picard/const.py:296
+#: ../picard/const.py:298
 msgid "Korea (South), Republic of"
 msgstr "Koreja, Republika"
 
-#: ../picard/const.py:297
+#: ../picard/const.py:299
 msgid "Slovakia"
 msgstr "Slovaška"
 
-#: ../picard/const.py:298
+#: ../picard/const.py:300
 msgid "Soviet Union (historical, 1922-1991)"
 msgstr "Sovjetska zveza (zgodovinska, 1922-1991)"
 
-#: ../picard/const.py:299
+#: ../picard/const.py:301
 msgid "East Timor"
 msgstr "Vzhodni Timor"
 
-#: ../picard/const.py:300
+#: ../picard/const.py:302
 msgid "Czechoslovakia (historical, 1918-1992)"
 msgstr "Čehoslovaška (zgodovinska, 1918-1992)"
 
-#: ../picard/const.py:301
+#: ../picard/const.py:303
 msgid "Europe"
 msgstr "Evropa"
 
-#: ../picard/const.py:302
+#: ../picard/const.py:304
 msgid "East Germany (historical, 1949-1990)"
 msgstr "Vzhodna Nemčija (zgodovinska, 1949-1990)"
 
-#: ../picard/const.py:303
+#: ../picard/const.py:305
 msgid "[Unknown Country]"
 msgstr "[neznana država]"
 
-#: ../picard/const.py:304
+#: ../picard/const.py:306
 msgid "[Worldwide]"
 msgstr "[svetovno]"
 
-#: ../picard/const.py:305
+#: ../picard/const.py:307
 msgid "Yugoslavia (historical, 1918-1992)"
 msgstr "Jugoslavija (zgodovinska, 1918-1992)"
 
-#: ../picard/const.py:310
+#: ../picard/const.py:312
+msgid "Afrikaans"
+msgstr ""
+
+#: ../picard/const.py:313
+msgid "Arabic"
+msgstr ""
+
+#: ../picard/const.py:314
 msgid "Catalan"
 msgstr "katalonščina"
 
-#: ../picard/const.py:311
+#: ../picard/const.py:315
 msgid "Czech"
 msgstr "češčina"
 
-#: ../picard/const.py:312
+#: ../picard/const.py:316
 msgid "Welsh"
 msgstr "valižanščina"
 
-#: ../picard/const.py:313
+#: ../picard/const.py:317
 msgid "Danish"
 msgstr "danščina"
 
-#: ../picard/const.py:314
+#: ../picard/const.py:318
 msgid "German"
 msgstr "nemščina"
 
-#: ../picard/const.py:315
+#: ../picard/const.py:319
 msgid "English"
 msgstr "angleščina"
 
-#: ../picard/const.py:316
+#: ../picard/const.py:320
 msgid "English (Canada)"
 msgstr "angleščina (Kanada)"
 
-#: ../picard/const.py:317
+#: ../picard/const.py:321
 msgid "English (UK)"
 msgstr "angleščina (Združeno kraljestvo)"
 
-#: ../picard/const.py:318
+#: ../picard/const.py:322
 msgid "Spanish"
 msgstr "španščina"
 
-#: ../picard/const.py:319
+#: ../picard/const.py:323
 msgid "Persian"
 msgstr "perzijščina"
 
-#: ../picard/const.py:320
+#: ../picard/const.py:324
 msgid "Finnish"
 msgstr "finščina"
 
-#: ../picard/const.py:321
+#: ../picard/const.py:325
 msgid "French"
 msgstr "francoščina"
 
-#: ../picard/const.py:322
+#: ../picard/const.py:326
 msgid "Frisian"
 msgstr "frizijščina"
 
-#: ../picard/const.py:323
+#: ../picard/const.py:327
 msgid "Hebrew"
 msgstr "hebrejščina"
 
-#: ../picard/const.py:324
+#: ../picard/const.py:328
+#, fuzzy
+msgid "Hindi"
+msgstr "Haiti"
+
+#: ../picard/const.py:329
 msgid "Hungarian"
 msgstr "madžarščina"
 
-#: ../picard/const.py:325
+#: ../picard/const.py:330
 msgid "Islandic"
 msgstr "islandščina"
 
-#: ../picard/const.py:326
+#: ../picard/const.py:331
 msgid "Italian"
 msgstr "italijanščina"
 
-#: ../picard/const.py:327
+#: ../picard/const.py:332
 msgid "Kannada"
 msgstr "kannadščina"
 
-#: ../picard/const.py:328
+#: ../picard/const.py:333
 msgid "Korean"
 msgstr "korejščina"
 
-#: ../picard/const.py:329
+#: ../picard/const.py:334
 msgid "Lithuanian"
 msgstr "litvijščina"
 
-#: ../picard/const.py:330
+#: ../picard/const.py:335
 msgid "Norwegian Bokmal"
 msgstr ""
 
-#: ../picard/const.py:331
+#: ../picard/const.py:336
 msgid "Dutch"
 msgstr "nizozemščina"
 
-#: ../picard/const.py:332
+#: ../picard/const.py:337
 msgid "Polish"
 msgstr "poljščina"
 
-#: ../picard/const.py:333
+#: ../picard/const.py:338
 msgid "Portuguese"
 msgstr "portugalščina"
 
-#: ../picard/const.py:334
+#: ../picard/const.py:339
 msgid "Brazilian Portuguese"
 msgstr "brazilska portugalščina"
 
-#: ../picard/const.py:335
+#: ../picard/const.py:340
 msgid "Romanian"
 msgstr "romunščina"
 
-#: ../picard/const.py:336
+#: ../picard/const.py:341
 msgid "Russian"
 msgstr "ruščina"
 
-#: ../picard/const.py:337
+#: ../picard/const.py:342
 msgid "Scots"
 msgstr "škotščina"
 
-#: ../picard/const.py:338
+#: ../picard/const.py:343
 msgid "Slovak"
 msgstr "slovaščina"
 
-#: ../picard/const.py:339
+#: ../picard/const.py:344
 msgid "Slovenian"
 msgstr "slovenščina"
 
-#: ../picard/const.py:340
+#: ../picard/const.py:345
 msgid "Swedish"
 msgstr "švedščina"
 
-#: ../picard/const.py:341
+#: ../picard/const.py:346
+#, fuzzy
+msgid "Turkish"
+msgstr "Turkmenistan"
+
+#: ../picard/const.py:347
 msgid "Chinese"
 msgstr "kitajščina"
 
-#: ../picard/file.py:487
+#: ../picard/file.py:494
 #, python-format
 msgid "No matching tracks for file %s"
 msgstr "Ni ujemajočih se sledi za datoteko %s"
 
-#: ../picard/file.py:504
+#: ../picard/file.py:511
 #, python-format
 msgid "No matching tracks above the threshold for file %s"
 msgstr "Ni ujemajočih se sledi nad pragom za datoteko %s"
 
-#: ../picard/file.py:507
+#: ../picard/file.py:514
 #, python-format
 msgid "File %s identified!"
 msgstr "Datoteka %s identificirana!"
 
-#: ../picard/file.py:518
+#: ../picard/file.py:525
 #, python-format
 msgid "Looking up the PUID for file %s..."
 msgstr "Iskanje PUID-a za datoteko %s ..."
 
-#: ../picard/file.py:523
+#: ../picard/file.py:530
 #, python-format
 msgid "Looking up the metadata for file %s..."
 msgstr "Iskanje metapodatkov za datoteko %s ..."
 
-#: ../picard/puidmanager.py:58
-msgid "Submitting PUIDs..."
-msgstr "Pošiljanje PUID-ov ..."
-
-#: ../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)"
@@ -1264,11 +1281,24 @@ msgstr "Predvajalni seznam PLS (*.pls)"
 msgid "XSPF Playlist (*.xspf)"
 msgstr "Predvajalni seznam XSPF (*.xspf)"
 
-#: ../picard/tagger.py:476
+#: ../picard/puidmanager.py:62
+msgid "Submitting PUIDs..."
+msgstr "Pošiljanje PUID-ov ..."
+
+#: ../picard/puidmanager.py:68
+#, python-format
+msgid "PUIDs submission failed: %s"
+msgstr "Pošiljanje PUID-ov neuspešno: %s"
+
+#: ../picard/puidmanager.py:70
+msgid "PUIDs successfully submitted!"
+msgstr "PUID-i so bili uspešno poslani!"
+
+#: ../picard/tagger.py:477
 msgid "CD Lookup Error"
 msgstr "Napaka pri pregledu CD-ja"
 
-#: ../picard/tagger.py:477
+#: ../picard/tagger.py:478
 #, python-format
 msgid ""
 "Error while reading CD:\n"
@@ -1279,7 +1309,7 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../picard/tagger.py:503
+#: ../picard/tagger.py:504
 #, python-format
 msgid "Could not find PUID for file %s"
 msgstr "Ni mogoče najti PUID-a za datoteko %s"
@@ -1332,15 +1362,27 @@ msgstr "Prikaži &skrite datoteke"
 msgid "Length"
 msgstr "Dolžina"
 
-#: ../picard/ui/itemviews.py:327
+#: ../picard/ui/itemviews.py:289
+msgid "&Expand all"
+msgstr ""
+
+#: ../picard/ui/itemviews.py:291
+msgid "&Collapse all"
+msgstr ""
+
+#: ../picard/ui/itemviews.py:332
 msgid "&Releases"
 msgstr "&Izdaje"
 
-#: ../picard/ui/itemviews.py:353
+#: ../picard/ui/itemviews.py:349
+msgid "No release event"
+msgstr ""
+
+#: ../picard/ui/itemviews.py:359
 msgid "&Plugins"
 msgstr "&Vstavki"
 
-#: ../picard/ui/itemviews.py:523
+#: ../picard/ui/itemviews.py:533
 msgid "Clusters"
 msgstr "Skupki"
 
@@ -1348,99 +1390,6 @@ msgstr "Skupki"
 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:66 ../picard/ui/ui_options_plugins.py:62
-msgid "Details"
-msgstr "Podrobnosti"
-
-#: ../picard/ui/tageditor.py:71 ../picard/ui/tageditor.py:264
-#, 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:131
-#, python-format
-msgid "(different across %d file)"
-msgid_plural "(different across %d files)"
-msgstr[0] "različen skozi %d datoteko"
-msgstr[1] "različen skozi %d datoteki"
-msgstr[2] "različen skozi %d datoteke"
-msgstr[3] "različen skozi %d datotek"
-
-#: ../picard/ui/tageditor.py:134
-#, python-format
-msgid "(missing from %d file)"
-msgid_plural "(missing from %d files)"
-msgstr[0] ""
-msgstr[1] ""
-
-#: ../picard/ui/tageditor.py:233
-msgid "Filename:"
-msgstr "Ime datoteke:"
-
-#: ../picard/ui/tageditor.py:235
-msgid "Format:"
-msgstr "Oblika:"
-
-#: ../picard/ui/tageditor.py:244
-msgid "Size:"
-msgstr "Velikost:"
-
-#: ../picard/ui/tageditor.py:248 ../picard/ui/ui_metadata.py:127
-msgid "Length:"
-msgstr "Dolžina:"
-
-#: ../picard/ui/tageditor.py:250
-msgid "Bitrate:"
-msgstr "Bitna hitrost:"
-
-#: ../picard/ui/tageditor.py:252
-msgid "Sample rate:"
-msgstr "Vzorčna hitrost:"
-
-#: ../picard/ui/tageditor.py:254
-msgid "Bits per sample:"
-msgstr "Bitov na vzorec:"
-
-#: ../picard/ui/tageditor.py:257
-msgid "Mono"
-msgstr "Mono"
-
-#: ../picard/ui/tageditor.py:258
-msgid "Stereo"
-msgstr "Stereo"
-
-#: ../picard/ui/tageditor.py:260
-msgid "Channels:"
-msgstr "Kanali:"
-
-#: ../picard/ui/tagsfromfilenames.py:52 ../picard/ui/tagsfromfilenames.py:96
-msgid "File Name"
-msgstr "Ime datoteke"
-
 #: ../picard/ui/mainwindow.py:64
 msgid "MusicBrainz Picard"
 msgstr "MusicBrainz Picard"
@@ -1677,6 +1626,10 @@ msgstr "I&skalna vrstica"
 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 "Vse podprte oblike"
@@ -1696,6 +1649,22 @@ msgstr "Seznam predvajanja %s shranjen"
 msgid " (Error: %s)"
 msgstr " (Napaka: %s)"
 
+#: ../picard/ui/puidsubmit.py:31 ../picard/ui/options/plugins.py:85
+msgid "File"
+msgstr "Datoteka"
+
+#: ../picard/ui/puidsubmit.py:31
+msgid "PUID"
+msgstr "PUID"
+
+#: ../picard/ui/puidsubmit.py:31
+msgid "Release"
+msgstr "Izdaja"
+
+#: ../picard/ui/puidsubmit.py:31
+msgid "Release ID"
+msgstr "ID izdaje"
+
 #: ../picard/ui/passworddialog.py:38
 #, python-format
 msgid ""
@@ -1704,6 +1673,79 @@ msgstr ""
 "Strežnik %s zahteva, da se prijavite. Prosim, vnesite vaše uporabniško ime "
 "in geslo."
 
+#: ../picard/ui/tageditor.py:66 ../picard/ui/ui_options_plugins.py:62
+msgid "Details"
+msgstr "Podrobnosti"
+
+#: ../picard/ui/tageditor.py:71 ../picard/ui/tageditor.py:264
+#, 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:131
+#, python-format
+msgid "(different across %d file)"
+msgid_plural "(different across %d files)"
+msgstr[0] "različen skozi %d datoteko"
+msgstr[1] "različen skozi %d datoteki"
+msgstr[2] "različen skozi %d datoteke"
+msgstr[3] "različen skozi %d datotek"
+
+#: ../picard/ui/tageditor.py:134
+#, python-format
+msgid "(missing from %d file)"
+msgid_plural "(missing from %d files)"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../picard/ui/tageditor.py:233
+msgid "Filename:"
+msgstr "Ime datoteke:"
+
+#: ../picard/ui/tageditor.py:235
+msgid "Format:"
+msgstr "Oblika:"
+
+#: ../picard/ui/tageditor.py:244
+msgid "Size:"
+msgstr "Velikost:"
+
+#: ../picard/ui/tageditor.py:248 ../picard/ui/ui_metadata.py:127
+msgid "Length:"
+msgstr "Dolžina:"
+
+#: ../picard/ui/tageditor.py:250
+msgid "Bitrate:"
+msgstr "Bitna hitrost:"
+
+#: ../picard/ui/tageditor.py:252
+msgid "Sample rate:"
+msgstr "Vzorčna hitrost:"
+
+#: ../picard/ui/tageditor.py:254
+msgid "Bits per sample:"
+msgstr "Bitov na vzorec:"
+
+#: ../picard/ui/tageditor.py:257
+msgid "Mono"
+msgstr "Mono"
+
+#: ../picard/ui/tageditor.py:258
+msgid "Stereo"
+msgstr "Stereo"
+
+#: ../picard/ui/tageditor.py:260
+msgid "Channels:"
+msgstr "Kanali:"
+
+#: ../picard/ui/tagsfromfilenames.py:54 ../picard/ui/tagsfromfilenames.py:99
+msgid "File Name"
+msgstr "Ime datoteke"
+
 #: ../picard/ui/ui_cdlookup.py:60 ../picard/ui/ui_options_cdlookup.py:47
 #: ../picard/ui/ui_options_cdlookup_select.py:48
 #: ../picard/ui/options/cdlookup.py:36
@@ -1726,24 +1768,6 @@ msgstr "    Preglej ročno    "
 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_proxy.py:83
-#: ../picard/ui/ui_options_general.py:113
-msgid "Username:"
-msgstr "Uporabniško ime:"
-
-#: ../picard/ui/ui_passworddialog.py:80 ../picard/ui/ui_options_proxy.py:82
-#: ../picard/ui/ui_options_general.py:112
-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"
@@ -1780,6 +1804,10 @@ msgstr "Album:"
 msgid "Options"
 msgstr "Nastavitve"
 
+#: ../picard/ui/ui_puidsubmit.py:52
+msgid "Submit PUIDs"
+msgstr "Pošlji PUID-je"
+
 #: ../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:"
@@ -1804,6 +1832,23 @@ msgstr "Shrani slike naslovnic kot ločene datoteke"
 msgid "Overwrite the file if it already exists"
 msgstr "Prepiši datoteko, če že obstaja"
 
+#: ../picard/ui/ui_options_moving.py:53
+msgid "Move additional files:"
+msgstr "Premakni dodatne datoteke:"
+
+#: ../picard/ui/ui_options_moving.py:54
+msgid "Browse..."
+msgstr "Prebrskaj ..."
+
+#: ../picard/ui/ui_options_moving.py:55
+msgid "Delete empty directories"
+msgstr "Izbriši prazne imenike"
+
+#: ../picard/ui/ui_options_moving.py:56
+#, fuzzy
+msgid "Move files to this directory when saving:"
+msgstr "Premakni datoteke z dodeljenimi oznakami v ta imenik:"
+
 #: ../picard/ui/util.py:31
 msgid "&Ok"
 msgstr "&V redu"
@@ -1812,44 +1857,40 @@ msgstr "&V redu"
 msgid "&Cancel"
 msgstr ""
 
-#: ../picard/ui/ui_puidsubmit.py:52
-msgid "Submit PUIDs"
-msgstr "Pošlji PUID-je"
-
-#: ../picard/ui/ui_tageditor.py:139 ../picard/ui/ui_options_plugins.py:59
-#: ../picard/ui/options/plugins.py:76
+#: ../picard/ui/ui_tageditor.py:128 ../picard/ui/ui_options_plugins.py:59
+#: ../picard/ui/options/plugins.py:81
 msgid "Name"
 msgstr "Ime"
 
-#: ../picard/ui/ui_tageditor.py:140
+#: ../picard/ui/ui_tageditor.py:129
 msgid "Value"
 msgstr "Vrednost"
 
-#: ../picard/ui/ui_tageditor.py:141
+#: ../picard/ui/ui_tageditor.py:130
 msgid "Rating:"
 msgstr ""
 
-#: ../picard/ui/ui_tageditor.py:142
+#: ../picard/ui/ui_tageditor.py:131
 msgid "&Add..."
 msgstr "Dod&aj"
 
-#: ../picard/ui/ui_tageditor.py:143
+#: ../picard/ui/ui_tageditor.py:132
 msgid "&Edit..."
 msgstr "&Urejanje"
 
-#: ../picard/ui/ui_tageditor.py:144
+#: ../picard/ui/ui_tageditor.py:133
 msgid "&Delete"
 msgstr "&Izbriši"
 
-#: ../picard/ui/ui_tageditor.py:145
+#: ../picard/ui/ui_tageditor.py:134
 msgid "&Metadata"
 msgstr "&Metapodatki"
 
-#: ../picard/ui/ui_tageditor.py:146
+#: ../picard/ui/ui_tageditor.py:135
 msgid "A&rtwork"
 msgstr "P&latnica"
 
-#: ../picard/ui/ui_tageditor.py:147
+#: ../picard/ui/ui_tageditor.py:136
 msgid "&Info"
 msgstr "&Info"
 
@@ -1894,6 +1935,40 @@ msgstr " / "
 msgid ", "
 msgstr ", "
 
+#: ../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:72
+msgid "Port:"
+msgstr "Vrata:"
+
+#: ../picard/ui/ui_options_general.py:110 ../picard/ui/ui_options_proxy.py:73
+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:112 ../picard/ui/ui_options_proxy.py:70
+#: ../picard/ui/ui_passworddialog.py:80
+msgid "Password:"
+msgstr "Geslo:"
+
+#: ../picard/ui/ui_options_general.py:113 ../picard/ui/ui_options_proxy.py:71
+#: ../picard/ui/ui_passworddialog.py:79
+msgid "Username:"
+msgstr "Uporabniško ime:"
+
+#: ../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_interface.py:50
 msgid "Miscellaneous"
 msgstr "Razno"
@@ -1914,114 +1989,6 @@ msgstr "Uporabi napredno sintakso za poizvedbo"
 msgid "User interface language:"
 msgstr "Jezik uporabniškega vmesnika:"
 
-#: ../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_proxy.py:81 ../picard/ui/options/proxy.py:28
-msgid "Web Proxy"
-msgstr "Spletni proksi"
-
-#: ../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_options_ratings.py:45
-msgid "Enable track ratings"
-msgstr ""
-
-#: ../picard/ui/ui_options_ratings.py:46
-msgid ""
-"Picard saves the ratings together with an e-mail address identifying the "
-"user who did the rating. That way different ratings for different users can "
-"be stored in the files. Please sepcify the e-mail you want to use to save "
-"your ratings."
-msgstr ""
-
-#: ../picard/ui/ui_options_ratings.py:47
-msgid "E-mail:"
-msgstr "E-pošta:"
-
-#: ../picard/ui/ui_options_general.py:108
-msgid "MusicBrainz Server"
-msgstr "MusicBrainz strežnik"
-
-#: ../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"
@@ -2079,74 +2046,153 @@ msgstr "Različni izvajalci:"
 msgid "Non-album tracks:"
 msgstr "Skladbe brez albuma:"
 
-#: ../picard/ui/ui_options_plugins.py:58 ../picard/ui/options/plugins.py:30
+#: ../picard/ui/ui_options_metadata.py:109
+#: ../picard/ui/ui_options_metadata.py:110
+#: ../picard/ui/ui_options_renaming.py:155
+#: ../picard/ui/ui_options_renaming.py:158
+msgid "Default"
+msgstr "Privzeto"
+
+#: ../picard/ui/ui_options_plugins.py:58 ../picard/ui/options/plugins.py:34
 msgid "Plugins"
 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:84
 msgid "Author"
 msgstr "Avtor"
 
-#: ../picard/ui/ui_options_plugins.py:61 ../picard/util/tags.py:36
+#: ../picard/ui/ui_options_plugins.py:61 ../picard/util/tags.py:37
 msgid "Version"
 msgstr "Različica"
 
-#: ../picard/ui/ui_options_script.py:52
+#: ../picard/ui/ui_options_proxy.py:69 ../picard/ui/options/proxy.py:28
+msgid "Web Proxy"
+msgstr "Spletni proksi"
+
+#: ../picard/ui/ui_options_ratings.py:45
+msgid "Enable track ratings"
+msgstr ""
+
+#: ../picard/ui/ui_options_ratings.py:46
+msgid ""
+"Picard saves the ratings together with an e-mail address identifying the "
+"user who did the rating. That way different ratings for different users can "
+"be stored in the files. Please sepcify the e-mail you want to use to save "
+"your ratings."
+msgstr ""
+
+#: ../picard/ui/ui_options_ratings.py:47
+msgid "E-mail:"
+msgstr "E-pošta:"
+
+#: ../picard/ui/ui_options_renaming.py:145
+#, fuzzy
+msgid "Form"
+msgstr "Format"
+
+#: ../picard/ui/ui_options_renaming.py:146
+#, fuzzy
+msgid "Rename files when saving"
+msgstr "Preimenuj datoteke"
+
+#: ../picard/ui/ui_options_renaming.py:147
+msgid "Replace non-ASCII characters"
+msgstr "Zamenjaj ne-ASCII oznake"
+
+#: ../picard/ui/ui_options_renaming.py:148
+msgid "Replace Windows-incompatible characters"
+msgstr ""
+"Zamenjaj znake, ki niso združljivi z zapisom operacijskega sistema Windows"
+
+#: ../picard/ui/ui_options_renaming.py:149
+msgid "Name files like this"
+msgstr ""
+
+#: ../picard/ui/ui_options_renaming.py:156
+msgid "Name multiple artist albums differently"
+msgstr ""
+
+#: ../picard/ui/ui_options_renaming.py:157
+msgid "Copy from above"
+msgstr ""
+
+#: ../picard/ui/ui_options_renaming.py:159
+#, fuzzy
+msgid "Examples"
+msgstr "Primer"
+
+#: ../picard/ui/ui_options_script.py:43
 msgid "Tagger Script"
 msgstr "Skripta označevalnika"
 
-#: ../picard/ui/ui_options_tags.py:85
-msgid "Common"
-msgstr "Običajno"
-
-#: ../picard/ui/ui_options_tags.py:86
-msgid "Clear existing tags before writing new tags"
-msgstr "Počisti obstoječe oznake pred zapisom novih"
-
-#: ../picard/ui/ui_options_tags.py:87
-msgid "Don not write tags to files"
+#: ../picard/ui/ui_options_tags.py:97
+#, fuzzy
+msgid "Do not write tags to files"
 msgstr "Ne zapisuj oznak v datoteke"
 
-#: ../picard/ui/ui_options_tags.py:88
-msgid "ID3"
-msgstr "ID3"
+#: ../picard/ui/ui_options_tags.py:98
+msgid "Before tagging"
+msgstr ""
 
-#: ../picard/ui/ui_options_tags.py:89
-msgid "Write ID3v1 tags to the files"
-msgstr "Zapiši ID3v1 oznake v datoteke"
+#: ../picard/ui/ui_options_tags.py:99
+#, fuzzy
+msgid "Clear existing tags"
+msgstr "Počisti obstoječe oznake pred zapisom novih"
 
-#: ../picard/ui/ui_options_tags.py:90
-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_tags.py:91
-msgid "Text encoding to use while writing ID3v2 tags:"
-msgstr "Za zapis ID3v2 oznak uporabi nabor znakov:"
-
-#: ../picard/ui/ui_options_tags.py:92
-msgid "ISO-8859-1"
-msgstr "ISO-8859-1"
-
-#: ../picard/ui/ui_options_tags.py:93
-msgid "UTF-16"
-msgstr "UTF-16"
-
-#: ../picard/ui/ui_options_tags.py:94
-msgid "UTF-8"
-msgstr "UTF-8"
-
-#: ../picard/ui/ui_options_tags.py:95
+#: ../picard/ui/ui_options_tags.py:100
 msgid "Remove ID3 tags from FLAC files"
 msgstr "Odstrani ID3 oznake iz FLAC datotek"
 
-#: ../picard/ui/ui_options_tags.py:96
-msgid "APE"
-msgstr "APE"
-
-#: ../picard/ui/ui_options_tags.py:97
+#: ../picard/ui/ui_options_tags.py:101
 msgid "Remove APEv2 tags from MP3 files"
 msgstr "Odstrani APEv2 oznake iz MP3 datotek"
 
+#: ../picard/ui/ui_options_tags.py:102
+msgid "Tag compatibility"
+msgstr ""
+
+#: ../picard/ui/ui_options_tags.py:103
+#, fuzzy
+msgid "ID3v2 version"
+msgstr "Različica"
+
+#: ../picard/ui/ui_options_tags.py:104
+msgid "2.4"
+msgstr ""
+
+#: ../picard/ui/ui_options_tags.py:105
+msgid "2.3"
+msgstr ""
+
+#: ../picard/ui/ui_options_tags.py:106
+#, fuzzy
+msgid "Also include ID3v1 tags in the files"
+msgstr "Zapiši ID3v1 oznake v datoteke"
+
+#: ../picard/ui/ui_options_tags.py:107
+msgid "ID3v2 text encoding"
+msgstr ""
+
+#: ../picard/ui/ui_options_tags.py:108
+msgid "UTF-8"
+msgstr "UTF-8"
+
+#: ../picard/ui/ui_options_tags.py:109
+msgid "UTF-16"
+msgstr "UTF-16"
+
+#: ../picard/ui/ui_options_tags.py:110
+msgid "ISO-8859-1"
+msgstr "ISO-8859-1"
+
+#: ../picard/ui/ui_passworddialog.py:78
+msgid "Authentication required"
+msgstr "Zahtevana je overitev"
+
+#: ../picard/ui/ui_passworddialog.py:81
+msgid "Save username and password"
+msgstr "Shrani uporabniško ime in geslo"
+
 #: ../picard/ui/ui_tagsfromfilenames.py:56
 msgid "Convert File Names to Tags"
 msgstr "Pretvori imena datotek v oznake"
@@ -2155,6 +2201,10 @@ msgstr "Pretvori imena datotek v oznake"
 msgid "Replace underscores with spaces"
 msgstr "Zamenjaj podčrtaje s presledkom"
 
+#: ../picard/ui/ui_tagsfromfilenames.py:58
+msgid "&Preview"
+msgstr "&Predogled"
+
 #: ../picard/ui/options/about.py:29
 msgid "About"
 msgstr "O"
@@ -2179,8 +2229,8 @@ msgstr "<br/>V slovenščino prevedel %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"
@@ -2188,17 +2238,16 @@ msgid ""
 "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\"><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/P"
-"icardTagger</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"
 "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"
@@ -2206,14 +2255,13 @@ msgstr ""
 "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\"><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/P"
-"icardTagger</a></p>\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"
@@ -2245,257 +2293,266 @@ msgstr "Ujemanje"
 msgid "None"
 msgstr "Nič"
 
-#: ../picard/ui/options/naming.py:33
-msgid "File Naming"
-msgstr "Imenovanje datotek"
+#: ../picard/ui/options/moving.py:33
+#, fuzzy
+msgid "Moving files"
+msgstr "Premakni 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 "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 "Oblika imena datotek za več izvajalcev ne sme biti prazna."
-
-#: ../picard/ui/options/naming.py:97
+#: ../picard/ui/options/moving.py:65
 msgid "Error"
 msgstr "Napaka"
 
-#: ../picard/ui/options/naming.py:97
+#: ../picard/ui/options/moving.py:65
 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"
+#: ../picard/ui/options/ratings.py:29
+msgid "Ratings"
 msgstr ""
 
 #: ../picard/ui/options/tags.py:29
 msgid "Tags"
 msgstr "Oznake"
 
-#: ../picard/ui/options/ratings.py:29
-msgid "Ratings"
+#: ../picard/ui/options/renaming.py:35
+#, fuzzy
+msgid "File naming"
+msgstr "Imenovanje datotek"
+
+#: ../picard/ui/options/renaming.py:123
+msgid "The file naming format must not be empty."
+msgstr "Oblika imena datoteke ne sme biti prazna."
+
+#: ../picard/ui/options/renaming.py:133
+msgid "The multiple artist file naming format must not be empty."
+msgstr "Oblika imena datotek za več izvajalcev ne sme biti prazna."
+
+#: ../picard/ui/options/scripting.py:63
+msgid "Scripting"
 msgstr ""
 
+#: ../picard/ui/options/scripting.py:97
+msgid "Script Error"
+msgstr "Napaka skripte"
+
 #: ../picard/util/tags.py:24
 msgid "Date"
 msgstr "Datum"
 
 #: ../picard/util/tags.py:25
+#, fuzzy
+msgid "Original Release Date"
+msgstr "Izvorni metapodatki"
+
+#: ../picard/util/tags.py:26
 msgid "Album Artist"
 msgstr "Izvajalec albuma"
 
-#: ../picard/util/tags.py:26
+#: ../picard/util/tags.py:27
 msgid "Track Number"
 msgstr "Številka sledi"
 
-#: ../picard/util/tags.py:27
+#: ../picard/util/tags.py:28
 msgid "Total Tracks"
 msgstr "Skupaj sledi"
 
-#: ../picard/util/tags.py:28
+#: ../picard/util/tags.py:29
 msgid "Disc Number"
 msgstr "Številka diska"
 
-#: ../picard/util/tags.py:29
+#: ../picard/util/tags.py:30
 msgid "Total Discs"
 msgstr "Skupaj diskov"
 
-#: ../picard/util/tags.py:30
+#: ../picard/util/tags.py:31
 msgid "Album Artist Sort Order"
 msgstr ""
 
-#: ../picard/util/tags.py:31
+#: ../picard/util/tags.py:32
 msgid "Artist Sort Order"
 msgstr ""
 
-#: ../picard/util/tags.py:32
+#: ../picard/util/tags.py:33
 msgid "Title Sort Order"
 msgstr ""
 
-#: ../picard/util/tags.py:33
+#: ../picard/util/tags.py:34
 msgid "Album Sort Order"
 msgstr ""
 
-#: ../picard/util/tags.py:34
+#: ../picard/util/tags.py:35
 msgid "ASIN"
 msgstr "ASIN"
 
-#: ../picard/util/tags.py:35
+#: ../picard/util/tags.py:36
 msgid "Grouping"
 msgstr "Združevanje"
 
-#: ../picard/util/tags.py:37
+#: ../picard/util/tags.py:38
 msgid "ISRC"
 msgstr "ISRC"
 
-#: ../picard/util/tags.py:38
+#: ../picard/util/tags.py:39
 msgid "Mood"
 msgstr "Počutje"
 
-#: ../picard/util/tags.py:39
+#: ../picard/util/tags.py:40
 msgid "BPM"
 msgstr "BPM"
 
-#: ../picard/util/tags.py:40
+#: ../picard/util/tags.py:41
 msgid "Copyright"
 msgstr "Avtorske pravice"
 
-#: ../picard/util/tags.py:41
+#: ../picard/util/tags.py:42
 msgid "Composer"
 msgstr "Skladatelj"
 
-#: ../picard/util/tags.py:42
+#: ../picard/util/tags.py:43
 msgid "Conductor"
 msgstr "Dirigent"
 
-#: ../picard/util/tags.py:43
+#: ../picard/util/tags.py:44
 msgid "Lyricist"
 msgstr "Pisec besedila"
 
-#: ../picard/util/tags.py:44
+#: ../picard/util/tags.py:45
 msgid "Arranger"
 msgstr "Aranžer"
 
-#: ../picard/util/tags.py:45
+#: ../picard/util/tags.py:46
 msgid "Producer"
 msgstr "Producent"
 
-#: ../picard/util/tags.py:46
+#: ../picard/util/tags.py:47
 msgid "Engineer"
 msgstr ""
 
-#: ../picard/util/tags.py:47
+#: ../picard/util/tags.py:48
 msgid "Subtitle"
 msgstr "Podnaslov"
 
-#: ../picard/util/tags.py:48
+#: ../picard/util/tags.py:49
 msgid "Disc Subtitle"
 msgstr "Podnaslov diska"
 
-#: ../picard/util/tags.py:49
+#: ../picard/util/tags.py:50
 msgid "Remixer"
 msgstr "Remikser"
 
-#: ../picard/util/tags.py:50
+#: ../picard/util/tags.py:51
 msgid "MusicBrainz Track Id"
 msgstr "MusicBrainz ID sledi"
 
-#: ../picard/util/tags.py:51
+#: ../picard/util/tags.py:52
 msgid "MusicBrainz Release Id"
 msgstr "MusicBrainz ID izdaje"
 
-#: ../picard/util/tags.py:52
+#: ../picard/util/tags.py:53
 msgid "MusicBrainz Artist Id"
 msgstr "MusicBrainz ID izvajalca"
 
-#: ../picard/util/tags.py:53
+#: ../picard/util/tags.py:54
 msgid "MusicBrainz Release Artist Id"
 msgstr "MusicBrainz ID izvajalca izdaje"
 
-#: ../picard/util/tags.py:54
+#: ../picard/util/tags.py:55
 msgid "MusicBrainz TRM Id"
 msgstr ""
 
-#: ../picard/util/tags.py:55
+#: ../picard/util/tags.py:56
 msgid "MusicBrainz Disc Id"
 msgstr "MusicBrainz ID diska"
 
-#: ../picard/util/tags.py:56
+#: ../picard/util/tags.py:57
 msgid "MusicBrainz Sort Name"
 msgstr ""
 
-#: ../picard/util/tags.py:57
+#: ../picard/util/tags.py:58
 msgid "MusicIP PUID"
 msgstr "MusicIP PUID"
 
-#: ../picard/util/tags.py:58
+#: ../picard/util/tags.py:59
 msgid "MusicIP Fingerprint"
 msgstr "MusicIP prstni odtis"
 
-#: ../picard/util/tags.py:59
+#: ../picard/util/tags.py:60
 msgid "Disc Id"
 msgstr "ID diska"
 
-#: ../picard/util/tags.py:60
+#: ../picard/util/tags.py:61
 msgid "Website"
 msgstr "spletna stran"
 
-#: ../picard/util/tags.py:61
+#: ../picard/util/tags.py:62
 msgid "Compilation"
 msgstr "Kompilacija"
 
-#: ../picard/util/tags.py:62
+#: ../picard/util/tags.py:63
 msgid "Comment"
 msgstr "Komentar"
 
-#: ../picard/util/tags.py:63
+#: ../picard/util/tags.py:64
 msgid "Genre"
 msgstr "Žanr"
 
-#: ../picard/util/tags.py:64
+#: ../picard/util/tags.py:65
 msgid "Encoded By"
 msgstr "Zakodiral"
 
-#: ../picard/util/tags.py:65
+#: ../picard/util/tags.py:66
 msgid "Performer"
 msgstr ""
 
-#: ../picard/util/tags.py:66
+#: ../picard/util/tags.py:67
 msgid "Release Type"
 msgstr "Tip izdaje"
 
-#: ../picard/util/tags.py:67
+#: ../picard/util/tags.py:68
 msgid "Release Status"
 msgstr "Status izdaje"
 
-#: ../picard/util/tags.py:68
+#: ../picard/util/tags.py:69
 msgid "Release Country"
 msgstr "Država izdaje"
 
-#: ../picard/util/tags.py:69
+#: ../picard/util/tags.py:70
 msgid "Record Label"
 msgstr "Založba"
 
-#: ../picard/util/tags.py:70
+#: ../picard/util/tags.py:71
 msgid "Barcode"
 msgstr "Barkoda"
 
-#: ../picard/util/tags.py:71
+#: ../picard/util/tags.py:72
 msgid "Catalog Number"
 msgstr "Kataložna številka"
 
-#: ../picard/util/tags.py:72
+#: ../picard/util/tags.py:73
 msgid "Format"
 msgstr "Format"
 
-#: ../picard/util/tags.py:73
+#: ../picard/util/tags.py:74
 msgid "DJ-Mixer"
 msgstr ""
 
-#: ../picard/util/tags.py:74
+#: ../picard/util/tags.py:75
 msgid "Media"
 msgstr "Nosilec"
 
-#: ../picard/util/tags.py:75
+#: ../picard/util/tags.py:76
 msgid "Lyrics"
 msgstr "Besedila skladbe"
 
-#: ../picard/util/tags.py:76
+#: ../picard/util/tags.py:77
 msgid "Mixer"
 msgstr "Mikser"
 
-#: ../picard/util/tags.py:77
+#: ../picard/util/tags.py:78
 msgid "Language"
 msgstr "Jezik"
 
-#: ../picard/util/tags.py:78
+#: ../picard/util/tags.py:79
 msgid "Script"
 msgstr ""
 
@@ -2514,11 +2571,36 @@ msgstr ""
 "\n"
 "%s"
 
-#, python-format
+#~ msgid "Multiple artist file naming format:"
+#~ msgstr "Oblika imena datoteke za več izvajalcev:"
+
+#~ msgid "File naming format:"
+#~ msgstr "Oblika imena datoteke:"
+
+#~ msgid "File name:"
+#~ msgstr "Ime datoteke:"
+
+#~ msgid "Multiple artist file name:"
+#~ msgstr "Ime datoteke za več izvajalcev:"
+
+#~ msgid "Common"
+#~ msgstr "Običajno"
+
+#~ msgid "ID3"
+#~ msgstr "ID3"
+
+#~ 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)"
+
+#~ msgid "Text encoding to use while writing ID3v2 tags:"
+#~ msgstr "Za zapis ID3v2 oznak uporabi nabor znakov:"
+
+#~ msgid "APE"
+#~ msgstr "APE"
+
 #~ msgid "[couldn't load album %s]"
 #~ msgstr "[ne morem naložiti albuma %s]"
 
-#, python-format
 #~ 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 6825c8437..99165f4f9 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: picard\n"
 "Report-Msgid-Bugs-To: http://bugs.musicbrainz.org/\n"
-"POT-Creation-Date: 2009-02-24 18:58+0100\n"
+"POT-Creation-Date: 2009-04-06 22:50+0200\n"
 "PO-Revision-Date: 2009-01-25 15:50+0000\n"
 "Last-Translator: Philipp Wolfer <Unknown>\n"
 "Language-Team: Swedish <sv@li.org>\n"
@@ -17,16 +17,16 @@ msgstr ""
 "X-Launchpad-Export-Date: 2009-04-06 20:21+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
-#: ../picard/album.py:108 ../picard/cluster.py:248
+#: ../picard/album.py:109 ../picard/cluster.py:248
 msgid "Unmatched Files"
 msgstr "Omatchade filer"
 
-#: ../picard/album.py:281
+#: ../picard/album.py:287
 #, python-format
 msgid "[could not load album %s]"
 msgstr ""
 
-#: ../picard/album.py:317
+#: ../picard/album.py:320
 msgid "[loading album information]"
 msgstr "[hämtar albuminformation]"
 
@@ -586,7 +586,7 @@ msgid "Namibia"
 msgstr ""
 
 #: ../picard/const.py:182
-msgid "Vanuat"
+msgid "Vanuatu"
 msgstr ""
 
 #: ../picard/const.py:183
@@ -1030,223 +1030,234 @@ msgid "Congo, The Democratic Republic of the"
 msgstr ""
 
 #: ../picard/const.py:293
-msgid "Serbia and Montenegro"
+msgid "Serbia and Montenegro (historical, 2003-2006)"
 msgstr ""
 
 #: ../picard/const.py:294
-msgid "Croatia"
+msgid "Serbia"
 msgstr ""
 
 #: ../picard/const.py:295
-msgid "Korea (North), Democratic People's Republic of"
+msgid "Montenegro"
 msgstr ""
 
 #: ../picard/const.py:296
-msgid "Korea (South), Republic of"
+msgid "Croatia"
 msgstr ""
 
 #: ../picard/const.py:297
-msgid "Slovakia"
+msgid "Korea (North), Democratic People's Republic of"
 msgstr ""
 
 #: ../picard/const.py:298
-msgid "Soviet Union (historical, 1922-1991)"
+msgid "Korea (South), Republic of"
 msgstr ""
 
 #: ../picard/const.py:299
-msgid "East Timor"
+msgid "Slovakia"
 msgstr ""
 
 #: ../picard/const.py:300
-msgid "Czechoslovakia (historical, 1918-1992)"
+msgid "Soviet Union (historical, 1922-1991)"
 msgstr ""
 
 #: ../picard/const.py:301
-msgid "Europe"
+msgid "East Timor"
 msgstr ""
 
 #: ../picard/const.py:302
-msgid "East Germany (historical, 1949-1990)"
+msgid "Czechoslovakia (historical, 1918-1992)"
 msgstr ""
 
 #: ../picard/const.py:303
-msgid "[Unknown Country]"
+msgid "Europe"
 msgstr ""
 
 #: ../picard/const.py:304
-msgid "[Worldwide]"
+msgid "East Germany (historical, 1949-1990)"
 msgstr ""
 
 #: ../picard/const.py:305
+msgid "[Unknown Country]"
+msgstr ""
+
+#: ../picard/const.py:306
+msgid "[Worldwide]"
+msgstr ""
+
+#: ../picard/const.py:307
 msgid "Yugoslavia (historical, 1918-1992)"
 msgstr ""
 
-#: ../picard/const.py:310
-msgid "Catalan"
-msgstr ""
-
-#: ../picard/const.py:311
-msgid "Czech"
-msgstr "Tjeckiska"
-
 #: ../picard/const.py:312
-msgid "Welsh"
+msgid "Afrikaans"
 msgstr ""
 
 #: ../picard/const.py:313
-msgid "Danish"
+msgid "Arabic"
 msgstr ""
 
 #: ../picard/const.py:314
-msgid "German"
-msgstr "Tyska"
+msgid "Catalan"
+msgstr ""
 
 #: ../picard/const.py:315
-msgid "English"
-msgstr "Engelska"
+msgid "Czech"
+msgstr "Tjeckiska"
 
 #: ../picard/const.py:316
-msgid "English (Canada)"
+msgid "Welsh"
 msgstr ""
 
 #: ../picard/const.py:317
+msgid "Danish"
+msgstr ""
+
+#: ../picard/const.py:318
+msgid "German"
+msgstr "Tyska"
+
+#: ../picard/const.py:319
+msgid "English"
+msgstr "Engelska"
+
+#: ../picard/const.py:320
+msgid "English (Canada)"
+msgstr ""
+
+#: ../picard/const.py:321
 msgid "English (UK)"
 msgstr "Engelska (UK)"
 
-#: ../picard/const.py:318
+#: ../picard/const.py:322
 msgid "Spanish"
 msgstr "Spanska"
 
-#: ../picard/const.py:319
+#: ../picard/const.py:323
 msgid "Persian"
 msgstr ""
 
-#: ../picard/const.py:320
+#: ../picard/const.py:324
 msgid "Finnish"
 msgstr "Finska"
 
-#: ../picard/const.py:321
+#: ../picard/const.py:325
 msgid "French"
 msgstr "Franska"
 
-#: ../picard/const.py:322
+#: ../picard/const.py:326
 msgid "Frisian"
 msgstr ""
 
-#: ../picard/const.py:323
+#: ../picard/const.py:327
 msgid "Hebrew"
 msgstr ""
 
-#: ../picard/const.py:324
+#: ../picard/const.py:328
+msgid "Hindi"
+msgstr ""
+
+#: ../picard/const.py:329
 msgid "Hungarian"
 msgstr "Ungerska"
 
-#: ../picard/const.py:325
+#: ../picard/const.py:330
 msgid "Islandic"
 msgstr ""
 
-#: ../picard/const.py:326
+#: ../picard/const.py:331
 msgid "Italian"
 msgstr "Italienska"
 
-#: ../picard/const.py:327
+#: ../picard/const.py:332
 msgid "Kannada"
 msgstr ""
 
-#: ../picard/const.py:328
+#: ../picard/const.py:333
 msgid "Korean"
 msgstr "Koreanska"
 
-#: ../picard/const.py:329
+#: ../picard/const.py:334
 msgid "Lithuanian"
 msgstr "Litauiska"
 
-#: ../picard/const.py:330
+#: ../picard/const.py:335
 msgid "Norwegian Bokmal"
 msgstr "Norska (Bokmål)"
 
-#: ../picard/const.py:331
+#: ../picard/const.py:336
 msgid "Dutch"
 msgstr "Nederländska"
 
-#: ../picard/const.py:332
+#: ../picard/const.py:337
 msgid "Polish"
 msgstr ""
 
-#: ../picard/const.py:333
+#: ../picard/const.py:338
 msgid "Portuguese"
 msgstr "Portugisiska"
 
-#: ../picard/const.py:334
+#: ../picard/const.py:339
 msgid "Brazilian Portuguese"
 msgstr ""
 
-#: ../picard/const.py:335
+#: ../picard/const.py:340
 msgid "Romanian"
 msgstr "Rumänska"
 
-#: ../picard/const.py:336
+#: ../picard/const.py:341
 msgid "Russian"
 msgstr "Ryska"
 
-#: ../picard/const.py:337
+#: ../picard/const.py:342
 msgid "Scots"
 msgstr ""
 
-#: ../picard/const.py:338
+#: ../picard/const.py:343
 msgid "Slovak"
 msgstr "Slovakiska"
 
-#: ../picard/const.py:339
+#: ../picard/const.py:344
 msgid "Slovenian"
 msgstr ""
 
-#: ../picard/const.py:340
+#: ../picard/const.py:345
 msgid "Swedish"
 msgstr "Svenska"
 
-#: ../picard/const.py:341
+#: ../picard/const.py:346
+msgid "Turkish"
+msgstr ""
+
+#: ../picard/const.py:347
 msgid "Chinese"
 msgstr ""
 
-#: ../picard/file.py:487
+#: ../picard/file.py:494
 #, python-format
 msgid "No matching tracks for file %s"
 msgstr "Inga matchande spår för fil %s"
 
-#: ../picard/file.py:504
+#: ../picard/file.py:511
 #, python-format
 msgid "No matching tracks above the threshold for file %s"
 msgstr ""
 
-#: ../picard/file.py:507
+#: ../picard/file.py:514
 #, python-format
 msgid "File %s identified!"
 msgstr "Fil %s identifierad!"
 
-#: ../picard/file.py:518
+#: ../picard/file.py:525
 #, python-format
 msgid "Looking up the PUID for file %s..."
 msgstr "Slår upp PUID för fil %s..."
 
-#: ../picard/file.py:523
+#: ../picard/file.py:530
 #, 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)"
@@ -1259,11 +1270,24 @@ msgstr "PLS-spellista (*.pls)"
 msgid "XSPF Playlist (*.xspf)"
 msgstr "XSPF-spellista (*.xspf)"
 
-#: ../picard/tagger.py:476
+#: ../picard/puidmanager.py:62
+msgid "Submitting PUIDs..."
+msgstr "Skickar in PUID..."
+
+#: ../picard/puidmanager.py:68
+#, python-format
+msgid "PUIDs submission failed: %s"
+msgstr "Inrapportering av PUID misslyckades: %s"
+
+#: ../picard/puidmanager.py:70
+msgid "PUIDs successfully submitted!"
+msgstr "Inrapportering av PUID lyckades!"
+
+#: ../picard/tagger.py:477
 msgid "CD Lookup Error"
 msgstr "Fel vid uppslagning av cd"
 
-#: ../picard/tagger.py:477
+#: ../picard/tagger.py:478
 #, python-format
 msgid ""
 "Error while reading CD:\n"
@@ -1274,7 +1298,7 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../picard/tagger.py:503
+#: ../picard/tagger.py:504
 #, python-format
 msgid "Could not find PUID for file %s"
 msgstr ""
@@ -1327,15 +1351,27 @@ msgstr ""
 msgid "Length"
 msgstr "Längd"
 
-#: ../picard/ui/itemviews.py:327
+#: ../picard/ui/itemviews.py:289
+msgid "&Expand all"
+msgstr ""
+
+#: ../picard/ui/itemviews.py:291
+msgid "&Collapse all"
+msgstr ""
+
+#: ../picard/ui/itemviews.py:332
 msgid "&Releases"
 msgstr "&Utgåvor"
 
-#: ../picard/ui/itemviews.py:353
+#: ../picard/ui/itemviews.py:349
+msgid "No release event"
+msgstr ""
+
+#: ../picard/ui/itemviews.py:359
 msgid "&Plugins"
 msgstr "&Insticksmoduler"
 
-#: ../picard/ui/itemviews.py:523
+#: ../picard/ui/itemviews.py:533
 msgid "Clusters"
 msgstr "Kluster"
 
@@ -1343,95 +1379,6 @@ msgstr "Kluster"
 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:66 ../picard/ui/ui_options_plugins.py:62
-msgid "Details"
-msgstr "Detaljer"
-
-#: ../picard/ui/tageditor.py:71 ../picard/ui/tageditor.py:264
-#, python-format
-msgid "%d file"
-msgid_plural "%d files"
-msgstr[0] "%d fil"
-msgstr[1] "%d filer"
-
-#: ../picard/ui/tageditor.py:131
-#, 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:134
-#, 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:233
-msgid "Filename:"
-msgstr "Filnamn:"
-
-#: ../picard/ui/tageditor.py:235
-msgid "Format:"
-msgstr "Format:"
-
-#: ../picard/ui/tageditor.py:244
-msgid "Size:"
-msgstr "Storlek:"
-
-#: ../picard/ui/tageditor.py:248 ../picard/ui/ui_metadata.py:127
-msgid "Length:"
-msgstr "Längd:"
-
-#: ../picard/ui/tageditor.py:250
-msgid "Bitrate:"
-msgstr "Bitfrekvens:"
-
-#: ../picard/ui/tageditor.py:252
-msgid "Sample rate:"
-msgstr "Samplingsfrekvens:"
-
-#: ../picard/ui/tageditor.py:254
-msgid "Bits per sample:"
-msgstr "Bitar per sampling:"
-
-#: ../picard/ui/tageditor.py:257
-msgid "Mono"
-msgstr "Mono"
-
-#: ../picard/ui/tageditor.py:258
-msgid "Stereo"
-msgstr "Stereo"
-
-#: ../picard/ui/tageditor.py:260
-msgid "Channels:"
-msgstr "Kanaler:"
-
-#: ../picard/ui/tagsfromfilenames.py:52 ../picard/ui/tagsfromfilenames.py:96
-msgid "File Name"
-msgstr "Filnamn"
-
 #: ../picard/ui/mainwindow.py:64
 msgid "MusicBrainz Picard"
 msgstr "MusicBrainz Picard"
@@ -1668,6 +1615,10 @@ msgstr "&Sökrad"
 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"
@@ -1687,12 +1638,97 @@ msgstr "Spellista %s sparad"
 msgid " (Error: %s)"
 msgstr " (Fel: %s)"
 
+#: ../picard/ui/puidsubmit.py:31 ../picard/ui/options/plugins.py:85
+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/passworddialog.py:38
 #, python-format
 msgid ""
 "The server %s requires you to login. Please enter your username and password."
 msgstr ""
 
+#: ../picard/ui/tageditor.py:66 ../picard/ui/ui_options_plugins.py:62
+msgid "Details"
+msgstr "Detaljer"
+
+#: ../picard/ui/tageditor.py:71 ../picard/ui/tageditor.py:264
+#, python-format
+msgid "%d file"
+msgid_plural "%d files"
+msgstr[0] "%d fil"
+msgstr[1] "%d filer"
+
+#: ../picard/ui/tageditor.py:131
+#, 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:134
+#, 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:233
+msgid "Filename:"
+msgstr "Filnamn:"
+
+#: ../picard/ui/tageditor.py:235
+msgid "Format:"
+msgstr "Format:"
+
+#: ../picard/ui/tageditor.py:244
+msgid "Size:"
+msgstr "Storlek:"
+
+#: ../picard/ui/tageditor.py:248 ../picard/ui/ui_metadata.py:127
+msgid "Length:"
+msgstr "Längd:"
+
+#: ../picard/ui/tageditor.py:250
+msgid "Bitrate:"
+msgstr "Bitfrekvens:"
+
+#: ../picard/ui/tageditor.py:252
+msgid "Sample rate:"
+msgstr "Samplingsfrekvens:"
+
+#: ../picard/ui/tageditor.py:254
+msgid "Bits per sample:"
+msgstr "Bitar per sampling:"
+
+#: ../picard/ui/tageditor.py:257
+msgid "Mono"
+msgstr "Mono"
+
+#: ../picard/ui/tageditor.py:258
+msgid "Stereo"
+msgstr "Stereo"
+
+#: ../picard/ui/tageditor.py:260
+msgid "Channels:"
+msgstr "Kanaler:"
+
+#: ../picard/ui/tagsfromfilenames.py:54 ../picard/ui/tagsfromfilenames.py:99
+msgid "File Name"
+msgstr "Filnamn"
+
 #: ../picard/ui/ui_cdlookup.py:60 ../picard/ui/ui_options_cdlookup.py:47
 #: ../picard/ui/ui_options_cdlookup_select.py:48
 #: ../picard/ui/options/cdlookup.py:36
@@ -1715,24 +1751,6 @@ msgstr "    Slå upp &manuellt    "
 msgid "Cancel"
 msgstr "Avbryt"
 
-#: ../picard/ui/ui_passworddialog.py:78
-msgid "Authentication required"
-msgstr ""
-
-#: ../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/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/ui_passworddialog.py:81
-msgid "Save username and password"
-msgstr ""
-
 #: ../picard/ui/ui_edittagdialog.py:44
 msgid "Edit Tag"
 msgstr "Redigera tagg"
@@ -1769,6 +1787,10 @@ msgstr "Album:"
 msgid "Options"
 msgstr "Alternativ"
 
+#: ../picard/ui/ui_puidsubmit.py:52
+msgid "Submit PUIDs"
+msgstr "Skicka in PUID"
+
 #: ../picard/ui/ui_options_cdlookup.py:48
 msgid "CD-ROM device to use for lookups:"
 msgstr "Cd-romenhet för uppslagningar:"
@@ -1793,6 +1815,23 @@ msgstr "Spara omslagsbilder som separata filer"
 msgid "Overwrite the file if it already exists"
 msgstr "Skriv över filen om den redan existerar"
 
+#: ../picard/ui/ui_options_moving.py:53
+msgid "Move additional files:"
+msgstr "Flytta ytterligare filer:"
+
+#: ../picard/ui/ui_options_moving.py:54
+msgid "Browse..."
+msgstr "Bläddra..."
+
+#: ../picard/ui/ui_options_moving.py:55
+msgid "Delete empty directories"
+msgstr "Ta bort tomma kataloger"
+
+#: ../picard/ui/ui_options_moving.py:56
+#, fuzzy
+msgid "Move files to this directory when saving:"
+msgstr "Flytta taggade filer till denna katalog:"
+
 #: ../picard/ui/util.py:31
 msgid "&Ok"
 msgstr "&Ok"
@@ -1801,44 +1840,40 @@ msgstr "&Ok"
 msgid "&Cancel"
 msgstr "&Avbryt"
 
-#: ../picard/ui/ui_puidsubmit.py:52
-msgid "Submit PUIDs"
-msgstr "Skicka in PUID"
-
-#: ../picard/ui/ui_tageditor.py:139 ../picard/ui/ui_options_plugins.py:59
-#: ../picard/ui/options/plugins.py:76
+#: ../picard/ui/ui_tageditor.py:128 ../picard/ui/ui_options_plugins.py:59
+#: ../picard/ui/options/plugins.py:81
 msgid "Name"
 msgstr "Namn"
 
-#: ../picard/ui/ui_tageditor.py:140
+#: ../picard/ui/ui_tageditor.py:129
 msgid "Value"
 msgstr "Värde"
 
-#: ../picard/ui/ui_tageditor.py:141
+#: ../picard/ui/ui_tageditor.py:130
 msgid "Rating:"
 msgstr ""
 
-#: ../picard/ui/ui_tageditor.py:142
+#: ../picard/ui/ui_tageditor.py:131
 msgid "&Add..."
 msgstr "&Lägg till..."
 
-#: ../picard/ui/ui_tageditor.py:143
+#: ../picard/ui/ui_tageditor.py:132
 msgid "&Edit..."
 msgstr "&Redigera..."
 
-#: ../picard/ui/ui_tageditor.py:144
+#: ../picard/ui/ui_tageditor.py:133
 msgid "&Delete"
 msgstr "&Ta bort"
 
-#: ../picard/ui/ui_tageditor.py:145
+#: ../picard/ui/ui_tageditor.py:134
 msgid "&Metadata"
 msgstr "&Metadata"
 
-#: ../picard/ui/ui_tageditor.py:146
+#: ../picard/ui/ui_tageditor.py:135
 msgid "A&rtwork"
 msgstr "&Grafik"
 
-#: ../picard/ui/ui_tageditor.py:147
+#: ../picard/ui/ui_tageditor.py:136
 msgid "&Info"
 msgstr "&Information"
 
@@ -1883,6 +1918,40 @@ msgstr " / "
 msgid ", "
 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:72
+msgid "Port:"
+msgstr "Port:"
+
+#: ../picard/ui/ui_options_general.py:110 ../picard/ui/ui_options_proxy.py:73
+msgid "Server address:"
+msgstr "Serveradress:"
+
+#: ../picard/ui/ui_options_general.py:111
+msgid "Account Information"
+msgstr "Kontoinformation"
+
+#: ../picard/ui/ui_options_general.py:112 ../picard/ui/ui_options_proxy.py:70
+#: ../picard/ui/ui_passworddialog.py:80
+msgid "Password:"
+msgstr "Lösenord:"
+
+#: ../picard/ui/ui_options_general.py:113 ../picard/ui/ui_options_proxy.py:71
+#: ../picard/ui/ui_passworddialog.py:79
+msgid "Username:"
+msgstr "Användarnamn:"
+
+#: ../picard/ui/ui_options_general.py:114 ../picard/ui/options/general.py:29
+msgid "General"
+msgstr "Allmänt"
+
+#: ../picard/ui/ui_options_general.py:115
+msgid "Automatically scan all new files"
+msgstr "Skanna automatiskt alla nya filer"
+
 #: ../picard/ui/ui_options_interface.py:50
 msgid "Miscellaneous"
 msgstr "Blandat"
@@ -1903,113 +1972,6 @@ msgstr ""
 msgid "User interface language:"
 msgstr ""
 
-#: ../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_options_naming.py:180
-#: ../picard/ui/ui_tagsfromfilenames.py:58
-msgid "&Preview"
-msgstr "&Förhandsgranska"
-
-#: ../picard/ui/ui_options_proxy.py:81 ../picard/ui/options/proxy.py:28
-msgid "Web Proxy"
-msgstr "Webbproxy"
-
-#: ../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 "Serveradress:"
-
-#: ../picard/ui/ui_options_ratings.py:45
-msgid "Enable track ratings"
-msgstr ""
-
-#: ../picard/ui/ui_options_ratings.py:46
-msgid ""
-"Picard saves the ratings together with an e-mail address identifying the "
-"user who did the rating. That way different ratings for different users can "
-"be stored in the files. Please sepcify the e-mail you want to use to save "
-"your ratings."
-msgstr ""
-
-#: ../picard/ui/ui_options_ratings.py:47
-msgid "E-mail:"
-msgstr ""
-
-#: ../picard/ui/ui_options_general.py:108
-msgid "MusicBrainz Server"
-msgstr "MusicBrainz-server"
-
-#: ../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"
-
-#: ../picard/ui/ui_options_general.py:115
-msgid "Automatically scan all new files"
-msgstr "Skanna automatiskt alla nya filer"
-
 #: ../picard/ui/ui_options_matching.py:105
 msgid "Thresholds"
 msgstr "Tröskelvärden"
@@ -2036,8 +1998,7 @@ 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"
+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"
@@ -2067,74 +2028,152 @@ msgstr "Diverse artister:"
 msgid "Non-album tracks:"
 msgstr "Spår utan album:"
 
-#: ../picard/ui/ui_options_plugins.py:58 ../picard/ui/options/plugins.py:30
+#: ../picard/ui/ui_options_metadata.py:109
+#: ../picard/ui/ui_options_metadata.py:110
+#: ../picard/ui/ui_options_renaming.py:155
+#: ../picard/ui/ui_options_renaming.py:158
+msgid "Default"
+msgstr "Standard"
+
+#: ../picard/ui/ui_options_plugins.py:58 ../picard/ui/options/plugins.py:34
 msgid "Plugins"
 msgstr "Insticksmoduler"
 
-#: ../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:84
 msgid "Author"
 msgstr "Upphovsman"
 
-#: ../picard/ui/ui_options_plugins.py:61 ../picard/util/tags.py:36
+#: ../picard/ui/ui_options_plugins.py:61 ../picard/util/tags.py:37
 msgid "Version"
 msgstr "Version"
 
-#: ../picard/ui/ui_options_script.py:52
+#: ../picard/ui/ui_options_proxy.py:69 ../picard/ui/options/proxy.py:28
+msgid "Web Proxy"
+msgstr "Webbproxy"
+
+#: ../picard/ui/ui_options_ratings.py:45
+msgid "Enable track ratings"
+msgstr ""
+
+#: ../picard/ui/ui_options_ratings.py:46
+msgid ""
+"Picard saves the ratings together with an e-mail address identifying the "
+"user who did the rating. That way different ratings for different users can "
+"be stored in the files. Please sepcify the e-mail you want to use to save "
+"your ratings."
+msgstr ""
+
+#: ../picard/ui/ui_options_ratings.py:47
+msgid "E-mail:"
+msgstr ""
+
+#: ../picard/ui/ui_options_renaming.py:145
+#, fuzzy
+msgid "Form"
+msgstr "Format:"
+
+#: ../picard/ui/ui_options_renaming.py:146
+#, fuzzy
+msgid "Rename files when saving"
+msgstr "Byt namn på filer"
+
+#: ../picard/ui/ui_options_renaming.py:147
+msgid "Replace non-ASCII characters"
+msgstr "Ersätt tecken som inte är ASCII"
+
+#: ../picard/ui/ui_options_renaming.py:148
+msgid "Replace Windows-incompatible characters"
+msgstr "Ersätt tecken som inte är kompatibla med Windows"
+
+#: ../picard/ui/ui_options_renaming.py:149
+msgid "Name files like this"
+msgstr ""
+
+#: ../picard/ui/ui_options_renaming.py:156
+msgid "Name multiple artist albums differently"
+msgstr ""
+
+#: ../picard/ui/ui_options_renaming.py:157
+msgid "Copy from above"
+msgstr ""
+
+#: ../picard/ui/ui_options_renaming.py:159
+#, fuzzy
+msgid "Examples"
+msgstr "Exempel"
+
+#: ../picard/ui/ui_options_script.py:43
 msgid "Tagger Script"
 msgstr "Skript för taggning"
 
-#: ../picard/ui/ui_options_tags.py:85
-msgid "Common"
-msgstr "Allmänt"
+#: ../picard/ui/ui_options_tags.py:97
+#, fuzzy
+msgid "Do not write tags to files"
+msgstr "Skriv inte taggar till filer"
 
-#: ../picard/ui/ui_options_tags.py:86
-msgid "Clear existing tags before writing new tags"
-msgstr "Rensa existerande taggar innan skrivning av nya taggar"
-
-#: ../picard/ui/ui_options_tags.py:87
-msgid "Don not write tags to files"
+#: ../picard/ui/ui_options_tags.py:98
+msgid "Before tagging"
 msgstr ""
 
-#: ../picard/ui/ui_options_tags.py:88
-msgid "ID3"
-msgstr "ID3"
+#: ../picard/ui/ui_options_tags.py:99
+#, fuzzy
+msgid "Clear existing tags"
+msgstr "Rensa existerande taggar innan skrivning av nya taggar"
 
-#: ../picard/ui/ui_options_tags.py:89
-msgid "Write ID3v1 tags to the files"
-msgstr "Skriv ID3v1-taggar till filerna"
-
-#: ../picard/ui/ui_options_tags.py:90
-msgid "Write ID3v2 version 2.3 tags (2.4 is default)"
-msgstr "Skriv ID3v2-taggar version 2.3 (2.4 är standard)"
-
-#: ../picard/ui/ui_options_tags.py:91
-msgid "Text encoding to use while writing ID3v2 tags:"
-msgstr "Textuppsättning för skrivning av ID3v2-taggar:"
-
-#: ../picard/ui/ui_options_tags.py:92
-msgid "ISO-8859-1"
-msgstr "ISO-8859-1"
-
-#: ../picard/ui/ui_options_tags.py:93
-msgid "UTF-16"
-msgstr "UTF-16"
-
-#: ../picard/ui/ui_options_tags.py:94
-msgid "UTF-8"
-msgstr "UTF-8"
-
-#: ../picard/ui/ui_options_tags.py:95
+#: ../picard/ui/ui_options_tags.py:100
 msgid "Remove ID3 tags from FLAC files"
 msgstr "Ta bort ID3-taggar från FLAC-filer"
 
-#: ../picard/ui/ui_options_tags.py:96
-msgid "APE"
-msgstr "APE"
-
-#: ../picard/ui/ui_options_tags.py:97
+#: ../picard/ui/ui_options_tags.py:101
 msgid "Remove APEv2 tags from MP3 files"
 msgstr "Ta bort APEv2-taggar från MP3-filer"
 
+#: ../picard/ui/ui_options_tags.py:102
+msgid "Tag compatibility"
+msgstr ""
+
+#: ../picard/ui/ui_options_tags.py:103
+#, fuzzy
+msgid "ID3v2 version"
+msgstr "Endast ID3v2.4"
+
+#: ../picard/ui/ui_options_tags.py:104
+msgid "2.4"
+msgstr ""
+
+#: ../picard/ui/ui_options_tags.py:105
+msgid "2.3"
+msgstr ""
+
+#: ../picard/ui/ui_options_tags.py:106
+#, fuzzy
+msgid "Also include ID3v1 tags in the files"
+msgstr "Skriv ID3v1-taggar till filerna"
+
+#: ../picard/ui/ui_options_tags.py:107
+msgid "ID3v2 text encoding"
+msgstr ""
+
+#: ../picard/ui/ui_options_tags.py:108
+msgid "UTF-8"
+msgstr "UTF-8"
+
+#: ../picard/ui/ui_options_tags.py:109
+msgid "UTF-16"
+msgstr "UTF-16"
+
+#: ../picard/ui/ui_options_tags.py:110
+msgid "ISO-8859-1"
+msgstr "ISO-8859-1"
+
+#: ../picard/ui/ui_passworddialog.py:78
+msgid "Authentication required"
+msgstr ""
+
+#: ../picard/ui/ui_passworddialog.py:81
+msgid "Save username and password"
+msgstr ""
+
 #: ../picard/ui/ui_tagsfromfilenames.py:56
 msgid "Convert File Names to Tags"
 msgstr "Konvertera filnamn till taggar"
@@ -2143,6 +2182,10 @@ msgstr "Konvertera filnamn till taggar"
 msgid "Replace underscores with spaces"
 msgstr "Ersätt understreck med mellanslag"
 
+#: ../picard/ui/ui_tagsfromfilenames.py:58
+msgid "&Preview"
+msgstr "&Förhandsgranska"
+
 #: ../picard/ui/options/about.py:29
 msgid "About"
 msgstr "Om"
@@ -2175,8 +2218,8 @@ msgstr "<br/>Översatt till svenska 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"
@@ -2184,14 +2227,13 @@ msgid ""
 "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\"><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/P"
-"icardTagger</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
@@ -2224,257 +2266,266 @@ msgstr "Matchning"
 msgid "None"
 msgstr ""
 
-#: ../picard/ui/options/naming.py:33
-msgid "File Naming"
-msgstr "Filnamngivning"
+#: ../picard/ui/options/moving.py:33
+#, fuzzy
+msgid "Moving files"
+msgstr "Flytta filer"
 
-#: ../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."
-msgstr ""
-
-#: ../picard/ui/options/naming.py:95
-msgid "The multiple artist file naming format must not be empty."
-msgstr ""
-
-#: ../picard/ui/options/naming.py:97
+#: ../picard/ui/options/moving.py:65
 msgid "Error"
 msgstr ""
 
-#: ../picard/ui/options/naming.py:97
+#: ../picard/ui/options/moving.py:65
 msgid "The location to move files to must not be empty."
 msgstr ""
 
+#: ../picard/ui/options/ratings.py:29
+msgid "Ratings"
+msgstr ""
+
+#: ../picard/ui/options/tags.py:29
+msgid "Tags"
+msgstr "Taggar"
+
+#: ../picard/ui/options/renaming.py:35
+#, fuzzy
+msgid "File naming"
+msgstr "Filnamngivning"
+
+#: ../picard/ui/options/renaming.py:123
+msgid "The file naming format must not be empty."
+msgstr ""
+
+#: ../picard/ui/options/renaming.py:133
+msgid "The multiple artist file naming format 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/ui/options/ratings.py:29
-msgid "Ratings"
-msgstr ""
+#: ../picard/ui/options/scripting.py:97
+msgid "Script Error"
+msgstr "Skriptfel"
 
 #: ../picard/util/tags.py:24
 msgid "Date"
 msgstr "Datum"
 
 #: ../picard/util/tags.py:25
+#, fuzzy
+msgid "Original Release Date"
+msgstr "Ursprunglig metadata"
+
+#: ../picard/util/tags.py:26
 msgid "Album Artist"
 msgstr "Albumartist"
 
-#: ../picard/util/tags.py:26
+#: ../picard/util/tags.py:27
 msgid "Track Number"
 msgstr "Spårnummer"
 
-#: ../picard/util/tags.py:27
+#: ../picard/util/tags.py:28
 msgid "Total Tracks"
 msgstr "Totalt antal spår"
 
-#: ../picard/util/tags.py:28
+#: ../picard/util/tags.py:29
 msgid "Disc Number"
 msgstr "Skiva nummer"
 
-#: ../picard/util/tags.py:29
+#: ../picard/util/tags.py:30
 msgid "Total Discs"
 msgstr "Totalt antal skivor"
 
-#: ../picard/util/tags.py:30
+#: ../picard/util/tags.py:31
 msgid "Album Artist Sort Order"
 msgstr "Albumartist sorteringsordnad"
 
-#: ../picard/util/tags.py:31
+#: ../picard/util/tags.py:32
 msgid "Artist Sort Order"
 msgstr "Artist sorteringsordnad"
 
-#: ../picard/util/tags.py:32
+#: ../picard/util/tags.py:33
 msgid "Title Sort Order"
 msgstr "Titel sorteringsordnad"
 
-#: ../picard/util/tags.py:33
+#: ../picard/util/tags.py:34
 msgid "Album Sort Order"
 msgstr "Album sorteringsordnad"
 
-#: ../picard/util/tags.py:34
+#: ../picard/util/tags.py:35
 msgid "ASIN"
 msgstr "ASIN"
 
-#: ../picard/util/tags.py:35
+#: ../picard/util/tags.py:36
 msgid "Grouping"
 msgstr "Gruppering"
 
-#: ../picard/util/tags.py:37
+#: ../picard/util/tags.py:38
 msgid "ISRC"
 msgstr "ISRC"
 
-#: ../picard/util/tags.py:38
+#: ../picard/util/tags.py:39
 msgid "Mood"
 msgstr "Stämning"
 
-#: ../picard/util/tags.py:39
+#: ../picard/util/tags.py:40
 msgid "BPM"
 msgstr "BPM"
 
-#: ../picard/util/tags.py:40
+#: ../picard/util/tags.py:41
 msgid "Copyright"
 msgstr "Upphovsrätt"
 
-#: ../picard/util/tags.py:41
+#: ../picard/util/tags.py:42
 msgid "Composer"
 msgstr "Kompositör"
 
-#: ../picard/util/tags.py:42
+#: ../picard/util/tags.py:43
 msgid "Conductor"
 msgstr "Dirigent"
 
-#: ../picard/util/tags.py:43
+#: ../picard/util/tags.py:44
 msgid "Lyricist"
 msgstr "Textförfattare"
 
-#: ../picard/util/tags.py:44
+#: ../picard/util/tags.py:45
 msgid "Arranger"
 msgstr "Arrangör"
 
-#: ../picard/util/tags.py:45
+#: ../picard/util/tags.py:46
 msgid "Producer"
 msgstr "Producent"
 
-#: ../picard/util/tags.py:46
+#: ../picard/util/tags.py:47
 msgid "Engineer"
 msgstr "Ljudtekniker"
 
-#: ../picard/util/tags.py:47
+#: ../picard/util/tags.py:48
 msgid "Subtitle"
 msgstr "Undertitel"
 
-#: ../picard/util/tags.py:48
+#: ../picard/util/tags.py:49
 msgid "Disc Subtitle"
 msgstr "Undertitel på skiva"
 
-#: ../picard/util/tags.py:49
+#: ../picard/util/tags.py:50
 msgid "Remixer"
 msgstr "Remixer"
 
-#: ../picard/util/tags.py:50
+#: ../picard/util/tags.py:51
 msgid "MusicBrainz Track Id"
 msgstr "MusicBrainz spår-id"
 
-#: ../picard/util/tags.py:51
+#: ../picard/util/tags.py:52
 msgid "MusicBrainz Release Id"
 msgstr "MusicBrainz utgåve-id"
 
-#: ../picard/util/tags.py:52
+#: ../picard/util/tags.py:53
 msgid "MusicBrainz Artist Id"
 msgstr "MusicBrainz artist-id"
 
-#: ../picard/util/tags.py:53
+#: ../picard/util/tags.py:54
 msgid "MusicBrainz Release Artist Id"
 msgstr "MusicBrainz utgivningsartist-id"
 
-#: ../picard/util/tags.py:54
+#: ../picard/util/tags.py:55
 msgid "MusicBrainz TRM Id"
 msgstr "MusicBrainz TRM-id"
 
-#: ../picard/util/tags.py:55
+#: ../picard/util/tags.py:56
 msgid "MusicBrainz Disc Id"
 msgstr ""
 
-#: ../picard/util/tags.py:56
+#: ../picard/util/tags.py:57
 msgid "MusicBrainz Sort Name"
 msgstr ""
 
-#: ../picard/util/tags.py:57
+#: ../picard/util/tags.py:58
 msgid "MusicIP PUID"
 msgstr "MusicIP PUID"
 
-#: ../picard/util/tags.py:58
+#: ../picard/util/tags.py:59
 msgid "MusicIP Fingerprint"
 msgstr ""
 
-#: ../picard/util/tags.py:59
+#: ../picard/util/tags.py:60
 msgid "Disc Id"
 msgstr ""
 
-#: ../picard/util/tags.py:60
+#: ../picard/util/tags.py:61
 msgid "Website"
 msgstr "Webbplats"
 
-#: ../picard/util/tags.py:61
+#: ../picard/util/tags.py:62
 msgid "Compilation"
 msgstr "Samling"
 
-#: ../picard/util/tags.py:62
+#: ../picard/util/tags.py:63
 msgid "Comment"
 msgstr "Kommentar"
 
-#: ../picard/util/tags.py:63
+#: ../picard/util/tags.py:64
 msgid "Genre"
 msgstr "Genre"
 
-#: ../picard/util/tags.py:64
+#: ../picard/util/tags.py:65
 msgid "Encoded By"
 msgstr "Kodad av"
 
-#: ../picard/util/tags.py:65
+#: ../picard/util/tags.py:66
 msgid "Performer"
 msgstr "Uppträdande"
 
-#: ../picard/util/tags.py:66
+#: ../picard/util/tags.py:67
 msgid "Release Type"
 msgstr "Utgivningstyp"
 
-#: ../picard/util/tags.py:67
+#: ../picard/util/tags.py:68
 msgid "Release Status"
 msgstr "Utgivningsstatus"
 
-#: ../picard/util/tags.py:68
+#: ../picard/util/tags.py:69
 msgid "Release Country"
 msgstr "Utgivningsland"
 
-#: ../picard/util/tags.py:69
+#: ../picard/util/tags.py:70
 msgid "Record Label"
 msgstr "Skivbolag"
 
-#: ../picard/util/tags.py:70
+#: ../picard/util/tags.py:71
 msgid "Barcode"
 msgstr "Streckkod"
 
-#: ../picard/util/tags.py:71
+#: ../picard/util/tags.py:72
 msgid "Catalog Number"
 msgstr "Katalognummer"
 
-#: ../picard/util/tags.py:72
+#: ../picard/util/tags.py:73
 msgid "Format"
 msgstr ""
 
-#: ../picard/util/tags.py:73
+#: ../picard/util/tags.py:74
 msgid "DJ-Mixer"
 msgstr "DJ-mixer"
 
-#: ../picard/util/tags.py:74
+#: ../picard/util/tags.py:75
 msgid "Media"
 msgstr "Media"
 
-#: ../picard/util/tags.py:75
+#: ../picard/util/tags.py:76
 msgid "Lyrics"
 msgstr "Låttext"
 
-#: ../picard/util/tags.py:76
+#: ../picard/util/tags.py:77
 msgid "Mixer"
 msgstr "Mixer"
 
-#: ../picard/util/tags.py:77
+#: ../picard/util/tags.py:78
 msgid "Language"
 msgstr "Språk"
 
-#: ../picard/util/tags.py:78
+#: ../picard/util/tags.py:79
 msgid "Script"
 msgstr ""
 
@@ -2493,29 +2544,51 @@ msgstr ""
 "\n"
 "%s"
 
-#, python-format
+#~ msgid "Multiple artist file naming format:"
+#~ msgstr "Format för filnamngivning med flera artister:"
+
+#~ msgid "File naming format:"
+#~ msgstr "Format för filnamngivning:"
+
+#~ msgid "File name:"
+#~ msgstr "Filnamn:"
+
+#~ msgid "Multiple artist file name:"
+#~ msgstr "Filnamn med flera artister:"
+
+#~ msgid "Common"
+#~ msgstr "Allmänt"
+
+#~ msgid "ID3"
+#~ msgstr "ID3"
+
+#~ msgid "Write ID3v2 version 2.3 tags (2.4 is default)"
+#~ msgstr "Skriv ID3v2-taggar version 2.3 (2.4 är standard)"
+
+#~ msgid "Text encoding to use while writing ID3v2 tags:"
+#~ msgstr "Textuppsättning för skrivning av ID3v2-taggar:"
+
+#~ msgid "APE"
+#~ msgstr "APE"
+
 #~ msgid "[couldn't load album %s]"
 #~ msgstr "[kunde inte hämta album (%s)]"
 
 #~ msgid "New Version"
 #~ msgstr "Ny version"
 
-#, python-format
 #~ msgid ""
-#~ "New version of Picard is available (%s). Would you like to download it now?"
+#~ "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?"
 
-#, python-format
 #~ msgid "Couldn't find PUID for file %s"
 #~ msgstr "Kunde inte hitta PUID för fil %s"
 
 #~ msgid "Ctrl+T"
 #~ msgstr "Ctrl+T"
 
-#~ msgid "Don't write tags to files"
-#~ msgstr "Skriv inte taggar till filer"
-
 #~ msgid "Delete"
 #~ msgstr "Ta bort"
 
@@ -2594,9 +2667,6 @@ msgstr ""
 #~ msgid "Proxy port"
 #~ msgstr "Proxyport"
 
-#~ msgid "ID3v2.4 only"
-#~ msgstr "Endast ID3v2.4"
-
 #~ msgid "Artists"
 #~ msgstr "Artister"
 
diff --git a/po/tr.po b/po/tr.po
index 7d793f0b8..bbde898d4 100644
--- a/po/tr.po
+++ b/po/tr.po
@@ -6,8 +6,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: picard\n"
-"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2009-02-24 18:58+0100\n"
+"Report-Msgid-Bugs-To: http://bugs.musicbrainz.org/\n"
+"POT-Creation-Date: 2009-04-06 22:50+0200\n"
 "PO-Revision-Date: 2009-03-27 14:22+0000\n"
 "Last-Translator: ym <Unknown>\n"
 "Language-Team: Turkish <tr@li.org>\n"
@@ -18,16 +18,16 @@ msgstr ""
 "X-Launchpad-Export-Date: 2009-04-06 20:20+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
-#: ../picard/album.py:108 ../picard/cluster.py:248
+#: ../picard/album.py:109 ../picard/cluster.py:248
 msgid "Unmatched Files"
 msgstr "Eşlenmeyen Dosyalar"
 
-#: ../picard/album.py:281
+#: ../picard/album.py:287
 #, python-format
 msgid "[could not load album %s]"
 msgstr "[%s albüm bilgisi yüklenemedi]"
 
-#: ../picard/album.py:317
+#: ../picard/album.py:320
 msgid "[loading album information]"
 msgstr "[albüm bilgisi yükleniyor]"
 
@@ -587,7 +587,8 @@ msgid "Namibia"
 msgstr "Namibya"
 
 #: ../picard/const.py:182
-msgid "Vanuat"
+#, fuzzy
+msgid "Vanuatu"
 msgstr "Vanuat"
 
 #: ../picard/const.py:183
@@ -1031,223 +1032,239 @@ msgid "Congo, The Democratic Republic of the"
 msgstr "Kongo Cumhuriyeti, Demokratik"
 
 #: ../picard/const.py:293
-msgid "Serbia and Montenegro"
+#, fuzzy
+msgid "Serbia and Montenegro (historical, 2003-2006)"
 msgstr "Sırbistan-Karadağ"
 
 #: ../picard/const.py:294
+#, fuzzy
+msgid "Serbia"
+msgstr "Azerbaycan"
+
+#: ../picard/const.py:295
+#, fuzzy
+msgid "Montenegro"
+msgstr "Sırbistan-Karadağ"
+
+#: ../picard/const.py:296
 msgid "Croatia"
 msgstr "Hırvatistan"
 
-#: ../picard/const.py:295
+#: ../picard/const.py:297
 msgid "Korea (North), Democratic People's Republic of"
 msgstr "Kore (Kuzey) Demokratik Halk Cumhuriyeti"
 
-#: ../picard/const.py:296
+#: ../picard/const.py:298
 msgid "Korea (South), Republic of"
 msgstr "Kore (Güney) Cumhuriyeti"
 
-#: ../picard/const.py:297
+#: ../picard/const.py:299
 msgid "Slovakia"
 msgstr "Slovakya"
 
-#: ../picard/const.py:298
+#: ../picard/const.py:300
 msgid "Soviet Union (historical, 1922-1991)"
 msgstr "Sovyetler Birliği (tarihî, 1922-1991)"
 
-#: ../picard/const.py:299
+#: ../picard/const.py:301
 msgid "East Timor"
 msgstr "Doğu Timor"
 
-#: ../picard/const.py:300
+#: ../picard/const.py:302
 msgid "Czechoslovakia (historical, 1918-1992)"
 msgstr "Çekoslavakya (tarihî, 1918-1992)"
 
-#: ../picard/const.py:301
+#: ../picard/const.py:303
 msgid "Europe"
 msgstr "Avrupa"
 
-#: ../picard/const.py:302
+#: ../picard/const.py:304
 msgid "East Germany (historical, 1949-1990)"
 msgstr "Doğu Almanya (tarihî, 1949-1990)"
 
-#: ../picard/const.py:303
+#: ../picard/const.py:305
 msgid "[Unknown Country]"
 msgstr "[Bilinmeyen Ülke]"
 
-#: ../picard/const.py:304
+#: ../picard/const.py:306
 msgid "[Worldwide]"
 msgstr "[Dünya Çapında]"
 
-#: ../picard/const.py:305
+#: ../picard/const.py:307
 msgid "Yugoslavia (historical, 1918-1992)"
 msgstr "Yugoslavya (tarihî, 1918-1992)"
 
-#: ../picard/const.py:310
+#: ../picard/const.py:312
+msgid "Afrikaans"
+msgstr ""
+
+#: ../picard/const.py:313
+msgid "Arabic"
+msgstr ""
+
+#: ../picard/const.py:314
 msgid "Catalan"
 msgstr "Katalanca"
 
-#: ../picard/const.py:311
+#: ../picard/const.py:315
 msgid "Czech"
 msgstr "Çekçe"
 
-#: ../picard/const.py:312
+#: ../picard/const.py:316
 msgid "Welsh"
 msgstr "Galce"
 
-#: ../picard/const.py:313
+#: ../picard/const.py:317
 msgid "Danish"
 msgstr "Danca"
 
-#: ../picard/const.py:314
+#: ../picard/const.py:318
 msgid "German"
 msgstr "Almanca"
 
-#: ../picard/const.py:315
+#: ../picard/const.py:319
 msgid "English"
 msgstr "İngilizce"
 
-#: ../picard/const.py:316
+#: ../picard/const.py:320
 msgid "English (Canada)"
 msgstr "İngilizce (Kanada)"
 
-#: ../picard/const.py:317
+#: ../picard/const.py:321
 msgid "English (UK)"
 msgstr "İngilizce (İngiliz)"
 
-#: ../picard/const.py:318
+#: ../picard/const.py:322
 msgid "Spanish"
 msgstr "İspanyolca"
 
-#: ../picard/const.py:319
+#: ../picard/const.py:323
 msgid "Persian"
 msgstr "Farsça"
 
-#: ../picard/const.py:320
+#: ../picard/const.py:324
 msgid "Finnish"
 msgstr "Fince"
 
-#: ../picard/const.py:321
+#: ../picard/const.py:325
 msgid "French"
 msgstr "Fransızca"
 
-#: ../picard/const.py:322
+#: ../picard/const.py:326
 msgid "Frisian"
 msgstr "Frizce"
 
-#: ../picard/const.py:323
+#: ../picard/const.py:327
 msgid "Hebrew"
 msgstr "İbranice"
 
-#: ../picard/const.py:324
+#: ../picard/const.py:328
+#, fuzzy
+msgid "Hindi"
+msgstr "Haiti"
+
+#: ../picard/const.py:329
 msgid "Hungarian"
 msgstr "Macarca"
 
-#: ../picard/const.py:325
+#: ../picard/const.py:330
 msgid "Islandic"
 msgstr "İzlandaca"
 
-#: ../picard/const.py:326
+#: ../picard/const.py:331
 msgid "Italian"
 msgstr "İtalyanca"
 
-#: ../picard/const.py:327
+#: ../picard/const.py:332
 msgid "Kannada"
 msgstr "Kannada"
 
-#: ../picard/const.py:328
+#: ../picard/const.py:333
 msgid "Korean"
 msgstr "Korece"
 
-#: ../picard/const.py:329
+#: ../picard/const.py:334
 msgid "Lithuanian"
 msgstr "Litvanyaca"
 
-#: ../picard/const.py:330
+#: ../picard/const.py:335
 msgid "Norwegian Bokmal"
 msgstr "Norveççe Bokmal"
 
-#: ../picard/const.py:331
+#: ../picard/const.py:336
 msgid "Dutch"
 msgstr "Hollandaca"
 
-#: ../picard/const.py:332
+#: ../picard/const.py:337
 msgid "Polish"
 msgstr "Lehçe"
 
-#: ../picard/const.py:333
+#: ../picard/const.py:338
 msgid "Portuguese"
 msgstr "Portekizce"
 
-#: ../picard/const.py:334
+#: ../picard/const.py:339
 msgid "Brazilian Portuguese"
 msgstr "Brezilya Portekizcesi"
 
-#: ../picard/const.py:335
+#: ../picard/const.py:340
 msgid "Romanian"
 msgstr "Rumence"
 
-#: ../picard/const.py:336
+#: ../picard/const.py:341
 msgid "Russian"
 msgstr "Rusça"
 
-#: ../picard/const.py:337
+#: ../picard/const.py:342
 msgid "Scots"
 msgstr "İskoç İngilizcesi"
 
-#: ../picard/const.py:338
+#: ../picard/const.py:343
 msgid "Slovak"
 msgstr "Slovakça"
 
-#: ../picard/const.py:339
+#: ../picard/const.py:344
 msgid "Slovenian"
 msgstr "Slovence"
 
-#: ../picard/const.py:340
+#: ../picard/const.py:345
 msgid "Swedish"
 msgstr "İsveççe"
 
-#: ../picard/const.py:341
+#: ../picard/const.py:346
+#, fuzzy
+msgid "Turkish"
+msgstr "Türkmenistan"
+
+#: ../picard/const.py:347
 msgid "Chinese"
 msgstr "Çince"
 
-#: ../picard/file.py:487
+#: ../picard/file.py:494
 #, python-format
 msgid "No matching tracks for file %s"
 msgstr "Dosya hiçbir parça ile eşlenemedi: %s"
 
-#: ../picard/file.py:504
+#: ../picard/file.py:511
 #, python-format
 msgid "No matching tracks above the threshold for file %s"
 msgstr "Dosya verilen sınır üzerinde hiçbir parça ile eşlenemedi: %s"
 
-#: ../picard/file.py:507
+#: ../picard/file.py:514
 #, python-format
 msgid "File %s identified!"
 msgstr "Dosya tanımlandı!: %s"
 
-#: ../picard/file.py:518
+#: ../picard/file.py:525
 #, python-format
 msgid "Looking up the PUID for file %s..."
 msgstr "Dosya için PUID aranıyor...: %s"
 
-#: ../picard/file.py:523
+#: ../picard/file.py:530
 #, python-format
 msgid "Looking up the metadata for file %s..."
 msgstr "Dosya için metadata aranıyor...: %s"
 
-#: ../picard/puidmanager.py:58
-msgid "Submitting PUIDs..."
-msgstr "PUIDler gönderiliyor..."
-
-#: ../picard/puidmanager.py:64
-#, python-format
-msgid "PUIDs submission failed: %s"
-msgstr "PUIDlerin gönderilmesi başarısız: %s"
-
-#: ../picard/puidmanager.py:66
-msgid "PUIDs successfully submitted!"
-msgstr "PUIDlerin gönderilmesi başırılı!"
-
 #: ../picard/playlist.py:31
 msgid "M3U Playlist (*.m3u)"
 msgstr "M3U Çalma Listesi (*.m3u)"
@@ -1260,11 +1277,24 @@ msgstr "PLS Çalma Listesi (*.pls)"
 msgid "XSPF Playlist (*.xspf)"
 msgstr "XSPF Çalma Listesi (*.xspf)"
 
-#: ../picard/tagger.py:476
+#: ../picard/puidmanager.py:62
+msgid "Submitting PUIDs..."
+msgstr "PUIDler gönderiliyor..."
+
+#: ../picard/puidmanager.py:68
+#, python-format
+msgid "PUIDs submission failed: %s"
+msgstr "PUIDlerin gönderilmesi başarısız: %s"
+
+#: ../picard/puidmanager.py:70
+msgid "PUIDs successfully submitted!"
+msgstr "PUIDlerin gönderilmesi başırılı!"
+
+#: ../picard/tagger.py:477
 msgid "CD Lookup Error"
 msgstr "CD Arama Hatası"
 
-#: ../picard/tagger.py:477
+#: ../picard/tagger.py:478
 #, python-format
 msgid ""
 "Error while reading CD:\n"
@@ -1275,7 +1305,7 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../picard/tagger.py:503
+#: ../picard/tagger.py:504
 #, python-format
 msgid "Could not find PUID for file %s"
 msgstr "Dosya için PUID bulunamadı: %s"
@@ -1328,15 +1358,27 @@ msgstr "&Gizli Dosyaları Göster"
 msgid "Length"
 msgstr "Süre"
 
-#: ../picard/ui/itemviews.py:327
+#: ../picard/ui/itemviews.py:289
+msgid "&Expand all"
+msgstr ""
+
+#: ../picard/ui/itemviews.py:291
+msgid "&Collapse all"
+msgstr ""
+
+#: ../picard/ui/itemviews.py:332
 msgid "&Releases"
 msgstr "&Sürümler"
 
-#: ../picard/ui/itemviews.py:353
+#: ../picard/ui/itemviews.py:349
+msgid "No release event"
+msgstr ""
+
+#: ../picard/ui/itemviews.py:359
 msgid "&Plugins"
 msgstr "&Eklentiler"
 
-#: ../picard/ui/itemviews.py:523
+#: ../picard/ui/itemviews.py:533
 msgid "Clusters"
 msgstr "Kümeler"
 
@@ -1344,92 +1386,6 @@ msgstr "Kümeler"
 msgid "Log"
 msgstr "Günlük"
 
-#: ../picard/ui/puidsubmit.py:31 ../picard/ui/options/plugins.py:80
-msgid "File"
-msgstr "Dosya"
-
-#: ../picard/ui/puidsubmit.py:31
-msgid "PUID"
-msgstr "PUID"
-
-#: ../picard/ui/puidsubmit.py:31 ../picard/ui/mainwindow.py:437
-msgid "Track"
-msgstr "Parça"
-
-#: ../picard/ui/puidsubmit.py:31
-msgid "Release"
-msgstr "Sürüm"
-
-#: ../picard/ui/puidsubmit.py:31
-msgid "Release ID"
-msgstr "Sürüm ID"
-
-#: ../picard/ui/tageditor.py:66 ../picard/ui/ui_options_plugins.py:62
-msgid "Details"
-msgstr "Detaylar"
-
-#: ../picard/ui/tageditor.py:71 ../picard/ui/tageditor.py:264
-#, python-format
-msgid "%d file"
-msgid_plural "%d files"
-msgstr[0] "%d dosya"
-
-#: ../picard/ui/tageditor.py:131
-#, python-format
-msgid "(different across %d file)"
-msgid_plural "(different across %d files)"
-msgstr[0] "(%d dosyada farklı)"
-
-#: ../picard/ui/tageditor.py:134
-#, python-format
-msgid "(missing from %d file)"
-msgid_plural "(missing from %d files)"
-msgstr[0] "(%d dosyada eksik)"
-
-#: ../picard/ui/tageditor.py:233
-msgid "Filename:"
-msgstr "Dosya adı:"
-
-#: ../picard/ui/tageditor.py:235
-msgid "Format:"
-msgstr "Biçim:"
-
-#: ../picard/ui/tageditor.py:244
-msgid "Size:"
-msgstr "Boyut:"
-
-#: ../picard/ui/tageditor.py:248 ../picard/ui/ui_metadata.py:127
-msgid "Length:"
-msgstr "Süre:"
-
-#: ../picard/ui/tageditor.py:250
-msgid "Bitrate:"
-msgstr "Bit oranı:"
-
-#: ../picard/ui/tageditor.py:252
-msgid "Sample rate:"
-msgstr "Örnek oranı:"
-
-#: ../picard/ui/tageditor.py:254
-msgid "Bits per sample:"
-msgstr "Örnek başına bit sayısı:"
-
-#: ../picard/ui/tageditor.py:257
-msgid "Mono"
-msgstr "Mono"
-
-#: ../picard/ui/tageditor.py:258
-msgid "Stereo"
-msgstr "Stereo"
-
-#: ../picard/ui/tageditor.py:260
-msgid "Channels:"
-msgstr "Kanallar:"
-
-#: ../picard/ui/tagsfromfilenames.py:52 ../picard/ui/tagsfromfilenames.py:96
-msgid "File Name"
-msgstr "Dosya Adı"
-
 #: ../picard/ui/mainwindow.py:64
 msgid "MusicBrainz Picard"
 msgstr "MusicBrainz Picard"
@@ -1666,6 +1622,10 @@ msgstr "Ara&ma Çubuğu"
 msgid "Album"
 msgstr "Albüm"
 
+#: ../picard/ui/mainwindow.py:437 ../picard/ui/puidsubmit.py:31
+msgid "Track"
+msgstr "Parça"
+
 #: ../picard/ui/mainwindow.py:476
 msgid "All Supported Formats"
 msgstr "Desteklenen Tüm Türler"
@@ -1685,6 +1645,22 @@ msgstr "Çalma listesi kaydedildi: %s"
 msgid " (Error: %s)"
 msgstr " (Hata: %s)"
 
+#: ../picard/ui/puidsubmit.py:31 ../picard/ui/options/plugins.py:85
+msgid "File"
+msgstr "Dosya"
+
+#: ../picard/ui/puidsubmit.py:31
+msgid "PUID"
+msgstr "PUID"
+
+#: ../picard/ui/puidsubmit.py:31
+msgid "Release"
+msgstr "Sürüm"
+
+#: ../picard/ui/puidsubmit.py:31
+msgid "Release ID"
+msgstr "Sürüm ID"
+
 #: ../picard/ui/passworddialog.py:38
 #, python-format
 msgid ""
@@ -1693,6 +1669,72 @@ msgstr ""
 "%s sunucusuna giriş yapmanız gerekmekte. Lütfen kullanıcı adınızı ve "
 "şifrenizi giriniz."
 
+#: ../picard/ui/tageditor.py:66 ../picard/ui/ui_options_plugins.py:62
+msgid "Details"
+msgstr "Detaylar"
+
+#: ../picard/ui/tageditor.py:71 ../picard/ui/tageditor.py:264
+#, python-format
+msgid "%d file"
+msgid_plural "%d files"
+msgstr[0] "%d dosya"
+
+#: ../picard/ui/tageditor.py:131
+#, python-format
+msgid "(different across %d file)"
+msgid_plural "(different across %d files)"
+msgstr[0] "(%d dosyada farklı)"
+
+#: ../picard/ui/tageditor.py:134
+#, python-format
+msgid "(missing from %d file)"
+msgid_plural "(missing from %d files)"
+msgstr[0] "(%d dosyada eksik)"
+
+#: ../picard/ui/tageditor.py:233
+msgid "Filename:"
+msgstr "Dosya adı:"
+
+#: ../picard/ui/tageditor.py:235
+msgid "Format:"
+msgstr "Biçim:"
+
+#: ../picard/ui/tageditor.py:244
+msgid "Size:"
+msgstr "Boyut:"
+
+#: ../picard/ui/tageditor.py:248 ../picard/ui/ui_metadata.py:127
+msgid "Length:"
+msgstr "Süre:"
+
+#: ../picard/ui/tageditor.py:250
+msgid "Bitrate:"
+msgstr "Bit oranı:"
+
+#: ../picard/ui/tageditor.py:252
+msgid "Sample rate:"
+msgstr "Örnek oranı:"
+
+#: ../picard/ui/tageditor.py:254
+msgid "Bits per sample:"
+msgstr "Örnek başına bit sayısı:"
+
+#: ../picard/ui/tageditor.py:257
+msgid "Mono"
+msgstr "Mono"
+
+#: ../picard/ui/tageditor.py:258
+msgid "Stereo"
+msgstr "Stereo"
+
+#: ../picard/ui/tageditor.py:260
+msgid "Channels:"
+msgstr "Kanallar:"
+
+#: ../picard/ui/tagsfromfilenames.py:54 ../picard/ui/tagsfromfilenames.py:99
+msgid "File Name"
+msgstr "Dosya Adı"
+
 #: ../picard/ui/ui_cdlookup.py:60 ../picard/ui/ui_options_cdlookup.py:47
 #: ../picard/ui/ui_options_cdlookup_select.py:48
 #: ../picard/ui/options/cdlookup.py:36
@@ -1715,24 +1757,6 @@ msgstr "    Manuel arama    "
 msgid "Cancel"
 msgstr "İptal"
 
-#: ../picard/ui/ui_passworddialog.py:78
-msgid "Authentication required"
-msgstr "Kimlik denetimi gerekli"
-
-#: ../picard/ui/ui_passworddialog.py:79 ../picard/ui/ui_options_proxy.py:83
-#: ../picard/ui/ui_options_general.py:113
-msgid "Username:"
-msgstr "Kullanıcı Adı:"
-
-#: ../picard/ui/ui_passworddialog.py:80 ../picard/ui/ui_options_proxy.py:82
-#: ../picard/ui/ui_options_general.py:112
-msgid "Password:"
-msgstr "Şifre:"
-
-#: ../picard/ui/ui_passworddialog.py:81
-msgid "Save username and password"
-msgstr "Kullanıcı adı ve şifreyi kaydet"
-
 #: ../picard/ui/ui_edittagdialog.py:44
 msgid "Edit Tag"
 msgstr "Etiketi Düzenle"
@@ -1769,6 +1793,10 @@ msgstr "Albüm:"
 msgid "Options"
 msgstr "Seçenekler:"
 
+#: ../picard/ui/ui_puidsubmit.py:52
+msgid "Submit PUIDs"
+msgstr "PUIDleri Gönder"
+
 #: ../picard/ui/ui_options_cdlookup.py:48
 msgid "CD-ROM device to use for lookups:"
 msgstr "Aramalar için kullanılacak CD-ROM cihazı:"
@@ -1793,6 +1821,23 @@ msgstr "Kapak resimlerini ayrı dosya olarak kaydet"
 msgid "Overwrite the file if it already exists"
 msgstr "Varolan dosyaların üzerine yaz"
 
+#: ../picard/ui/ui_options_moving.py:53
+msgid "Move additional files:"
+msgstr "Ayrıca taşınacak dosyalar:"
+
+#: ../picard/ui/ui_options_moving.py:54
+msgid "Browse..."
+msgstr "Gözat..."
+
+#: ../picard/ui/ui_options_moving.py:55
+msgid "Delete empty directories"
+msgstr "Boş dizinleri sil"
+
+#: ../picard/ui/ui_options_moving.py:56
+#, fuzzy
+msgid "Move files to this directory when saving:"
+msgstr "Etiketlendirilen dosyaların taşınacağı dizin:"
+
 #: ../picard/ui/util.py:31
 msgid "&Ok"
 msgstr "&Tamam"
@@ -1801,44 +1846,40 @@ msgstr "&Tamam"
 msgid "&Cancel"
 msgstr "İ&ptal"
 
-#: ../picard/ui/ui_puidsubmit.py:52
-msgid "Submit PUIDs"
-msgstr "PUIDleri Gönder"
-
-#: ../picard/ui/ui_tageditor.py:139 ../picard/ui/ui_options_plugins.py:59
-#: ../picard/ui/options/plugins.py:76
+#: ../picard/ui/ui_tageditor.py:128 ../picard/ui/ui_options_plugins.py:59
+#: ../picard/ui/options/plugins.py:81
 msgid "Name"
 msgstr "İsim"
 
-#: ../picard/ui/ui_tageditor.py:140
+#: ../picard/ui/ui_tageditor.py:129
 msgid "Value"
 msgstr "Değer"
 
-#: ../picard/ui/ui_tageditor.py:141
+#: ../picard/ui/ui_tageditor.py:130
 msgid "Rating:"
 msgstr "Derecelendirme:"
 
-#: ../picard/ui/ui_tageditor.py:142
+#: ../picard/ui/ui_tageditor.py:131
 msgid "&Add..."
 msgstr "&Ekle..."
 
-#: ../picard/ui/ui_tageditor.py:143
+#: ../picard/ui/ui_tageditor.py:132
 msgid "&Edit..."
 msgstr "Dü&zenle..."
 
-#: ../picard/ui/ui_tageditor.py:144
+#: ../picard/ui/ui_tageditor.py:133
 msgid "&Delete"
 msgstr "&Sil"
 
-#: ../picard/ui/ui_tageditor.py:145
+#: ../picard/ui/ui_tageditor.py:134
 msgid "&Metadata"
 msgstr "&Metadata"
 
-#: ../picard/ui/ui_tageditor.py:146
+#: ../picard/ui/ui_tageditor.py:135
 msgid "A&rtwork"
 msgstr "Kapak &Resmi"
 
-#: ../picard/ui/ui_tageditor.py:147
+#: ../picard/ui/ui_tageditor.py:136
 msgid "&Info"
 msgstr "&Bilgi"
 
@@ -1883,6 +1924,40 @@ msgstr " / "
 msgid ", "
 msgstr ", "
 
+#: ../picard/ui/ui_options_general.py:108
+msgid "MusicBrainz Server"
+msgstr "MusicBrainz Sunucusu"
+
+#: ../picard/ui/ui_options_general.py:109 ../picard/ui/ui_options_proxy.py:72
+msgid "Port:"
+msgstr "Bağlantı Noktası:"
+
+#: ../picard/ui/ui_options_general.py:110 ../picard/ui/ui_options_proxy.py:73
+msgid "Server address:"
+msgstr "Sunucu adresi:"
+
+#: ../picard/ui/ui_options_general.py:111
+msgid "Account Information"
+msgstr "Hesap Bilgileri"
+
+#: ../picard/ui/ui_options_general.py:112 ../picard/ui/ui_options_proxy.py:70
+#: ../picard/ui/ui_passworddialog.py:80
+msgid "Password:"
+msgstr "Şifre:"
+
+#: ../picard/ui/ui_options_general.py:113 ../picard/ui/ui_options_proxy.py:71
+#: ../picard/ui/ui_passworddialog.py:79
+msgid "Username:"
+msgstr "Kullanıcı Adı:"
+
+#: ../picard/ui/ui_options_general.py:114 ../picard/ui/options/general.py:29
+msgid "General"
+msgstr "Genel"
+
+#: ../picard/ui/ui_options_general.py:115
+msgid "Automatically scan all new files"
+msgstr "Bütün yeni dosyaları otomatik olarak tara"
+
 #: ../picard/ui/ui_options_interface.py:50
 msgid "Miscellaneous"
 msgstr "Muhtelif"
@@ -1903,118 +1978,6 @@ msgstr "Gelişmiş sorgu biçimini kullan"
 msgid "User interface language:"
 msgstr "Kullanıcı arayüzü dili:"
 
-#: ../picard/ui/ui_options_naming.py:165
-msgid "Rename Files"
-msgstr "Dosyaları Adlandır"
-
-#: ../picard/ui/ui_options_naming.py:166
-msgid "Replace Windows-incompatible characters"
-msgstr "Windows ile uyumsuz olan karakterleri değiştir"
-
-#: ../picard/ui/ui_options_naming.py:167
-msgid "Replace non-ASCII characters"
-msgstr "ASCII olmayan karakterleri değiştir"
-
-#: ../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 "Varsayılan"
-
-#: ../picard/ui/ui_options_naming.py:170 ../picard/ui/options/naming.py:90
-msgid "Multiple artist file naming format:"
-msgstr "Çoklu sanatçı dosya isimlendirme biçimi:"
-
-#: ../picard/ui/ui_options_naming.py:171 ../picard/ui/options/naming.py:86
-msgid "File naming format:"
-msgstr "Dosya isimlendirme biçimi:"
-
-#: ../picard/ui/ui_options_naming.py:172
-msgid "Move Files"
-msgstr "Dosyaları Taşı"
-
-#: ../picard/ui/ui_options_naming.py:173
-msgid "Move tagged files to this directory:"
-msgstr "Etiketlendirilen dosyaların taşınacağı dizin:"
-
-#: ../picard/ui/ui_options_naming.py:174
-msgid "Browse..."
-msgstr "Gözat..."
-
-#: ../picard/ui/ui_options_naming.py:175
-msgid "Move additional files:"
-msgstr "Ayrıca taşınacak dosyalar:"
-
-#: ../picard/ui/ui_options_naming.py:176
-msgid "Delete empty directories"
-msgstr "Boş dizinleri sil"
-
-#: ../picard/ui/ui_options_naming.py:177
-msgid "Example"
-msgstr "Örnek"
-
-#: ../picard/ui/ui_options_naming.py:178
-msgid "File name:"
-msgstr "Dosya adı:"
-
-#: ../picard/ui/ui_options_naming.py:179
-msgid "Multiple artist file name:"
-msgstr "Çoklu sanatçı dosya adı:"
-
-#: ../picard/ui/ui_options_naming.py:180
-#: ../picard/ui/ui_tagsfromfilenames.py:58
-msgid "&Preview"
-msgstr "&Önizleme"
-
-#: ../picard/ui/ui_options_proxy.py:81 ../picard/ui/options/proxy.py:28
-msgid "Web Proxy"
-msgstr "Ağ Vekili"
-
-#: ../picard/ui/ui_options_proxy.py:84 ../picard/ui/ui_options_general.py:109
-msgid "Port:"
-msgstr "Bağlantı Noktası:"
-
-#: ../picard/ui/ui_options_proxy.py:85 ../picard/ui/ui_options_general.py:110
-msgid "Server address:"
-msgstr "Sunucu adresi:"
-
-#: ../picard/ui/ui_options_ratings.py:45
-msgid "Enable track ratings"
-msgstr "Parça derecelendirmelerini aktive et"
-
-#: ../picard/ui/ui_options_ratings.py:46
-msgid ""
-"Picard saves the ratings together with an e-mail address identifying the "
-"user who did the rating. That way different ratings for different users can "
-"be stored in the files. Please sepcify the e-mail you want to use to save "
-"your ratings."
-msgstr ""
-"Picard, derecelendirmeyi kimin yaptığının belirlenebilmesi için, "
-"derecelendirmeleri e-posta adresiyle beraber kaydeder. Bu yolla farklı "
-"kullanıcıların farklı derecelendirmeleri dosyalarda kaydedilebilir. Lütfen "
-"derecelendirmelerinizi kayıt ederken kullanmak istediğiniz e-posta "
-"adresinizi giriniz."
-
-#: ../picard/ui/ui_options_ratings.py:47
-msgid "E-mail:"
-msgstr "E-posta:"
-
-#: ../picard/ui/ui_options_general.py:108
-msgid "MusicBrainz Server"
-msgstr "MusicBrainz Sunucusu"
-
-#: ../picard/ui/ui_options_general.py:111
-msgid "Account Information"
-msgstr "Hesap Bilgileri"
-
-#: ../picard/ui/ui_options_general.py:114 ../picard/ui/options/general.py:29
-msgid "General"
-msgstr "Genel"
-
-#: ../picard/ui/ui_options_general.py:115
-msgid "Automatically scan all new files"
-msgstr "Bütün yeni dosyaları otomatik olarak tara"
-
 #: ../picard/ui/ui_options_matching.py:105
 msgid "Thresholds"
 msgstr "Sınırlar"
@@ -2071,74 +2034,157 @@ msgstr "Farklı Sanatçılar"
 msgid "Non-album tracks:"
 msgstr "Albümsüz parçalar:"
 
-#: ../picard/ui/ui_options_plugins.py:58 ../picard/ui/options/plugins.py:30
+#: ../picard/ui/ui_options_metadata.py:109
+#: ../picard/ui/ui_options_metadata.py:110
+#: ../picard/ui/ui_options_renaming.py:155
+#: ../picard/ui/ui_options_renaming.py:158
+msgid "Default"
+msgstr "Varsayılan"
+
+#: ../picard/ui/ui_options_plugins.py:58 ../picard/ui/options/plugins.py:34
 msgid "Plugins"
 msgstr "Eklentiler"
 
-#: ../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:84
 msgid "Author"
 msgstr "Yazar"
 
-#: ../picard/ui/ui_options_plugins.py:61 ../picard/util/tags.py:36
+#: ../picard/ui/ui_options_plugins.py:61 ../picard/util/tags.py:37
 msgid "Version"
 msgstr "Versiyon"
 
-#: ../picard/ui/ui_options_script.py:52
+#: ../picard/ui/ui_options_proxy.py:69 ../picard/ui/options/proxy.py:28
+msgid "Web Proxy"
+msgstr "Ağ Vekili"
+
+#: ../picard/ui/ui_options_ratings.py:45
+msgid "Enable track ratings"
+msgstr "Parça derecelendirmelerini aktive et"
+
+#: ../picard/ui/ui_options_ratings.py:46
+msgid ""
+"Picard saves the ratings together with an e-mail address identifying the "
+"user who did the rating. That way different ratings for different users can "
+"be stored in the files. Please sepcify the e-mail you want to use to save "
+"your ratings."
+msgstr ""
+"Picard, derecelendirmeyi kimin yaptığının belirlenebilmesi için, "
+"derecelendirmeleri e-posta adresiyle beraber kaydeder. Bu yolla farklı "
+"kullanıcıların farklı derecelendirmeleri dosyalarda kaydedilebilir. Lütfen "
+"derecelendirmelerinizi kayıt ederken kullanmak istediğiniz e-posta "
+"adresinizi giriniz."
+
+#: ../picard/ui/ui_options_ratings.py:47
+msgid "E-mail:"
+msgstr "E-posta:"
+
+#: ../picard/ui/ui_options_renaming.py:145
+#, fuzzy
+msgid "Form"
+msgstr "Biçim"
+
+#: ../picard/ui/ui_options_renaming.py:146
+#, fuzzy
+msgid "Rename files when saving"
+msgstr "Dosyaları Adlandır"
+
+#: ../picard/ui/ui_options_renaming.py:147
+msgid "Replace non-ASCII characters"
+msgstr "ASCII olmayan karakterleri değiştir"
+
+#: ../picard/ui/ui_options_renaming.py:148
+msgid "Replace Windows-incompatible characters"
+msgstr "Windows ile uyumsuz olan karakterleri değiştir"
+
+#: ../picard/ui/ui_options_renaming.py:149
+msgid "Name files like this"
+msgstr ""
+
+#: ../picard/ui/ui_options_renaming.py:156
+msgid "Name multiple artist albums differently"
+msgstr ""
+
+#: ../picard/ui/ui_options_renaming.py:157
+msgid "Copy from above"
+msgstr ""
+
+#: ../picard/ui/ui_options_renaming.py:159
+#, fuzzy
+msgid "Examples"
+msgstr "Örnek"
+
+#: ../picard/ui/ui_options_script.py:43
 msgid "Tagger Script"
 msgstr "Etiketleyici Betiği"
 
-#: ../picard/ui/ui_options_tags.py:85
-msgid "Common"
-msgstr "Genel"
-
-#: ../picard/ui/ui_options_tags.py:86
-msgid "Clear existing tags before writing new tags"
-msgstr "Yeni etiketleri yazmadan önce eskileri sil"
-
-#: ../picard/ui/ui_options_tags.py:87
-msgid "Don not write tags to files"
+#: ../picard/ui/ui_options_tags.py:97
+#, fuzzy
+msgid "Do not write tags to files"
 msgstr "Etiketleri dosyalara yazma"
 
-#: ../picard/ui/ui_options_tags.py:88
-msgid "ID3"
-msgstr "ID3"
+#: ../picard/ui/ui_options_tags.py:98
+msgid "Before tagging"
+msgstr ""
 
-#: ../picard/ui/ui_options_tags.py:89
-msgid "Write ID3v1 tags to the files"
-msgstr "Dosyalara ID3v1 etiketlerini yaz"
+#: ../picard/ui/ui_options_tags.py:99
+#, fuzzy
+msgid "Clear existing tags"
+msgstr "Yeni etiketleri yazmadan önce eskileri sil"
 
-#: ../picard/ui/ui_options_tags.py:90
-msgid "Write ID3v2 version 2.3 tags (2.4 is default)"
-msgstr "ID3v2 versiyon 2.3 etiketleri yaz (varsayılan 2.4)"
-
-#: ../picard/ui/ui_options_tags.py:91
-msgid "Text encoding to use while writing ID3v2 tags:"
-msgstr "ID3v2 etiketlerini yazarken kullanılacak kodlama:"
-
-#: ../picard/ui/ui_options_tags.py:92
-msgid "ISO-8859-1"
-msgstr "ISO-8859-1"
-
-#: ../picard/ui/ui_options_tags.py:93
-msgid "UTF-16"
-msgstr "UTF-16"
-
-#: ../picard/ui/ui_options_tags.py:94
-msgid "UTF-8"
-msgstr "UTF-8"
-
-#: ../picard/ui/ui_options_tags.py:95
+#: ../picard/ui/ui_options_tags.py:100
 msgid "Remove ID3 tags from FLAC files"
 msgstr "FLAC dosyalarından ID3 etiketlerini sil"
 
-#: ../picard/ui/ui_options_tags.py:96
-msgid "APE"
-msgstr "APE"
-
-#: ../picard/ui/ui_options_tags.py:97
+#: ../picard/ui/ui_options_tags.py:101
 msgid "Remove APEv2 tags from MP3 files"
 msgstr "MP3 dosyalarından APEv2 etiketlerini sil"
 
+#: ../picard/ui/ui_options_tags.py:102
+msgid "Tag compatibility"
+msgstr ""
+
+#: ../picard/ui/ui_options_tags.py:103
+#, fuzzy
+msgid "ID3v2 version"
+msgstr "Versiyon"
+
+#: ../picard/ui/ui_options_tags.py:104
+msgid "2.4"
+msgstr ""
+
+#: ../picard/ui/ui_options_tags.py:105
+msgid "2.3"
+msgstr ""
+
+#: ../picard/ui/ui_options_tags.py:106
+#, fuzzy
+msgid "Also include ID3v1 tags in the files"
+msgstr "Dosyalara ID3v1 etiketlerini yaz"
+
+#: ../picard/ui/ui_options_tags.py:107
+msgid "ID3v2 text encoding"
+msgstr ""
+
+#: ../picard/ui/ui_options_tags.py:108
+msgid "UTF-8"
+msgstr "UTF-8"
+
+#: ../picard/ui/ui_options_tags.py:109
+msgid "UTF-16"
+msgstr "UTF-16"
+
+#: ../picard/ui/ui_options_tags.py:110
+msgid "ISO-8859-1"
+msgstr "ISO-8859-1"
+
+#: ../picard/ui/ui_passworddialog.py:78
+msgid "Authentication required"
+msgstr "Kimlik denetimi gerekli"
+
+#: ../picard/ui/ui_passworddialog.py:81
+msgid "Save username and password"
+msgstr "Kullanıcı adı ve şifreyi kaydet"
+
 #: ../picard/ui/ui_tagsfromfilenames.py:56
 msgid "Convert File Names to Tags"
 msgstr "Dosya İsimlerinden Etiketlendir"
@@ -2147,6 +2193,10 @@ msgstr "Dosya İsimlerinden Etiketlendir"
 msgid "Replace underscores with spaces"
 msgstr "Altçizgileri boşlukla değiştir"
 
+#: ../picard/ui/ui_tagsfromfilenames.py:58
+msgid "&Preview"
+msgstr "&Önizleme"
+
 #: ../picard/ui/options/about.py:29
 msgid "About"
 msgstr "Hakkında"
@@ -2167,8 +2217,8 @@ msgstr "<br/>TÜRKÇE çeviri: %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"
@@ -2176,33 +2226,31 @@ msgid ""
 "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\"><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/P"
-"icardTagger</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"
 "Versiyon %(version)s</p>\n"
 "<p align=\"center\"><strong>Desteklenen türler</strong><br/>%(formats)s</p>\n"
 "<p align=\"center\"><strong>Lütfen bağışta bulunun</strong><br/>\n"
 "Picard'ı kullandığınız için teşekkürler. Picard,  binlerce gönüllü "
 "yardımıyla MetaBrainz Foundation tarafından işletilen MusicBrainz "
 "veritabanına dayanmaktadır. Eğer bu programı beğendiyseniz, servisin ayakta "
-"kalabilmesi için, lütfen MetaBrainz Foundation şirketine bağışta "
-"bulununuz.</p>\n"
-"<p align=\"center\"><a "
-"href=\"http://metabrainz.org/donate/index.html\">Bağış yap!</a></p>\n"
+"kalabilmesi için, lütfen MetaBrainz Foundation şirketine bağışta bulununuz.</"
+"p>\n"
+"<p align=\"center\"><a href=\"http://metabrainz.org/donate/index.html"
+"\">Bağış yap!</a></p>\n"
 "<p align=\"center\"><strong>Krediler</strong><br/>\n"
 "<small>(Telif Hakkı) Copyright © 2004-2008 Robert Kaye, Lukáš Lalinský ve "
 "diğerleri%(translator-credits)s</small></p>\n"
-"<p align=\"center\"><a "
-"href=\"http://musicbrainz.org/doc/PicardTagger\">http://musicbrainz.org/doc/P"
-"icardTagger</a></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"
@@ -2236,257 +2284,266 @@ msgstr "Eşleme"
 msgid "None"
 msgstr "Yok"
 
-#: ../picard/ui/options/naming.py:33
-msgid "File Naming"
-msgstr "Dosya Adlandırma"
+#: ../picard/ui/options/moving.py:33
+#, fuzzy
+msgid "Moving files"
+msgstr "Dosyaları Taşı"
 
-#: ../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 "Betik Hatası"
-
-#: ../picard/ui/options/naming.py:93
-msgid "The file naming format must not be empty."
-msgstr "Dosya adlandırma biçimi boş olmamalı."
-
-#: ../picard/ui/options/naming.py:95
-msgid "The multiple artist file naming format must not be empty."
-msgstr "Çoklu sanatçı dosya adlandırması biçimi boş olmamalı."
-
-#: ../picard/ui/options/naming.py:97
+#: ../picard/ui/options/moving.py:65
 msgid "Error"
 msgstr "Hata"
 
-#: ../picard/ui/options/naming.py:97
+#: ../picard/ui/options/moving.py:65
 msgid "The location to move files to must not be empty."
 msgstr "Dosyaların taşınacağı yer boş olmamalı."
 
-#: ../picard/ui/options/scripting.py:63
-msgid "Scripting"
-msgstr "Betikleme"
+#: ../picard/ui/options/ratings.py:29
+msgid "Ratings"
+msgstr "Derecelendirmeler"
 
 #: ../picard/ui/options/tags.py:29
 msgid "Tags"
 msgstr "Etiketler"
 
-#: ../picard/ui/options/ratings.py:29
-msgid "Ratings"
-msgstr "Derecelendirmeler"
+#: ../picard/ui/options/renaming.py:35
+#, fuzzy
+msgid "File naming"
+msgstr "Dosya Adlandırma"
+
+#: ../picard/ui/options/renaming.py:123
+msgid "The file naming format must not be empty."
+msgstr "Dosya adlandırma biçimi boş olmamalı."
+
+#: ../picard/ui/options/renaming.py:133
+msgid "The multiple artist file naming format must not be empty."
+msgstr "Çoklu sanatçı dosya adlandırması biçimi boş olmamalı."
+
+#: ../picard/ui/options/scripting.py:63
+msgid "Scripting"
+msgstr "Betikleme"
+
+#: ../picard/ui/options/scripting.py:97
+msgid "Script Error"
+msgstr "Betik Hatası"
 
 #: ../picard/util/tags.py:24
 msgid "Date"
 msgstr "Tarih"
 
 #: ../picard/util/tags.py:25
+#, fuzzy
+msgid "Original Release Date"
+msgstr "Orijinal Metadata"
+
+#: ../picard/util/tags.py:26
 msgid "Album Artist"
 msgstr "Albüm Sanatçısı"
 
-#: ../picard/util/tags.py:26
+#: ../picard/util/tags.py:27
 msgid "Track Number"
 msgstr "Parça Numarası"
 
-#: ../picard/util/tags.py:27
+#: ../picard/util/tags.py:28
 msgid "Total Tracks"
 msgstr "Toplam Parça"
 
-#: ../picard/util/tags.py:28
+#: ../picard/util/tags.py:29
 msgid "Disc Number"
 msgstr "Disk Numarası"
 
-#: ../picard/util/tags.py:29
+#: ../picard/util/tags.py:30
 msgid "Total Discs"
 msgstr "Toplam Disk"
 
-#: ../picard/util/tags.py:30
+#: ../picard/util/tags.py:31
 msgid "Album Artist Sort Order"
 msgstr "Albüm Sanatçısı Sıralama Düzeni"
 
-#: ../picard/util/tags.py:31
+#: ../picard/util/tags.py:32
 msgid "Artist Sort Order"
 msgstr "Sanatçı Sıralama Düzeni"
 
-#: ../picard/util/tags.py:32
+#: ../picard/util/tags.py:33
 msgid "Title Sort Order"
 msgstr "Parça Adı Sıralama Düzeni"
 
-#: ../picard/util/tags.py:33
+#: ../picard/util/tags.py:34
 msgid "Album Sort Order"
 msgstr "Albüm Sıralama Düzeni"
 
-#: ../picard/util/tags.py:34
+#: ../picard/util/tags.py:35
 msgid "ASIN"
 msgstr "ASIN"
 
-#: ../picard/util/tags.py:35
+#: ../picard/util/tags.py:36
 msgid "Grouping"
 msgstr "Gruplama"
 
-#: ../picard/util/tags.py:37
+#: ../picard/util/tags.py:38
 msgid "ISRC"
 msgstr "ISRC"
 
-#: ../picard/util/tags.py:38
+#: ../picard/util/tags.py:39
 msgid "Mood"
 msgstr "Ruh Hâli"
 
-#: ../picard/util/tags.py:39
+#: ../picard/util/tags.py:40
 msgid "BPM"
 msgstr "BPM"
 
-#: ../picard/util/tags.py:40
+#: ../picard/util/tags.py:41
 msgid "Copyright"
 msgstr "Telif Hakkı"
 
-#: ../picard/util/tags.py:41
+#: ../picard/util/tags.py:42
 msgid "Composer"
 msgstr "Besteci"
 
-#: ../picard/util/tags.py:42
+#: ../picard/util/tags.py:43
 msgid "Conductor"
 msgstr "Orkestra Şefi"
 
-#: ../picard/util/tags.py:43
+#: ../picard/util/tags.py:44
 msgid "Lyricist"
 msgstr "Söz Yazarı"
 
-#: ../picard/util/tags.py:44
+#: ../picard/util/tags.py:45
 msgid "Arranger"
 msgstr "Düzenleyen"
 
-#: ../picard/util/tags.py:45
+#: ../picard/util/tags.py:46
 msgid "Producer"
 msgstr "Yapımcı"
 
-#: ../picard/util/tags.py:46
+#: ../picard/util/tags.py:47
 msgid "Engineer"
 msgstr "Mühendis"
 
-#: ../picard/util/tags.py:47
+#: ../picard/util/tags.py:48
 msgid "Subtitle"
 msgstr "Altbaşlık"
 
-#: ../picard/util/tags.py:48
+#: ../picard/util/tags.py:49
 msgid "Disc Subtitle"
 msgstr "Disk Altbaşlığı"
 
-#: ../picard/util/tags.py:49
+#: ../picard/util/tags.py:50
 msgid "Remixer"
 msgstr "Remiks yapan"
 
-#: ../picard/util/tags.py:50
+#: ../picard/util/tags.py:51
 msgid "MusicBrainz Track Id"
 msgstr "MusicBrainz Parça Id"
 
-#: ../picard/util/tags.py:51
+#: ../picard/util/tags.py:52
 msgid "MusicBrainz Release Id"
 msgstr "MusicBrainz Albüm Id"
 
-#: ../picard/util/tags.py:52
+#: ../picard/util/tags.py:53
 msgid "MusicBrainz Artist Id"
 msgstr "MusicBrainz Sanatçı Id"
 
-#: ../picard/util/tags.py:53
+#: ../picard/util/tags.py:54
 msgid "MusicBrainz Release Artist Id"
 msgstr "MusicBrainz Albüm Sanatçısı Id"
 
-#: ../picard/util/tags.py:54
+#: ../picard/util/tags.py:55
 msgid "MusicBrainz TRM Id"
 msgstr "MusicBrainz TRM Id"
 
-#: ../picard/util/tags.py:55
+#: ../picard/util/tags.py:56
 msgid "MusicBrainz Disc Id"
 msgstr "MusicBrainz Disk Id"
 
-#: ../picard/util/tags.py:56
+#: ../picard/util/tags.py:57
 msgid "MusicBrainz Sort Name"
 msgstr "MusicBrainz Sıralama İsmi"
 
-#: ../picard/util/tags.py:57
+#: ../picard/util/tags.py:58
 msgid "MusicIP PUID"
 msgstr "MusicIP PUID"
 
-#: ../picard/util/tags.py:58
+#: ../picard/util/tags.py:59
 msgid "MusicIP Fingerprint"
 msgstr "MusicIP Parmakizi"
 
-#: ../picard/util/tags.py:59
+#: ../picard/util/tags.py:60
 msgid "Disc Id"
 msgstr "Disk Id"
 
-#: ../picard/util/tags.py:60
+#: ../picard/util/tags.py:61
 msgid "Website"
 msgstr "Websitesi"
 
-#: ../picard/util/tags.py:61
+#: ../picard/util/tags.py:62
 msgid "Compilation"
 msgstr "Derleme"
 
-#: ../picard/util/tags.py:62
+#: ../picard/util/tags.py:63
 msgid "Comment"
 msgstr "Yorum"
 
-#: ../picard/util/tags.py:63
+#: ../picard/util/tags.py:64
 msgid "Genre"
 msgstr "Tarz"
 
-#: ../picard/util/tags.py:64
+#: ../picard/util/tags.py:65
 msgid "Encoded By"
 msgstr "Kodlayan"
 
-#: ../picard/util/tags.py:65
+#: ../picard/util/tags.py:66
 msgid "Performer"
 msgstr "İcracı"
 
-#: ../picard/util/tags.py:66
+#: ../picard/util/tags.py:67
 msgid "Release Type"
 msgstr "Sürüm Tipi"
 
-#: ../picard/util/tags.py:67
+#: ../picard/util/tags.py:68
 msgid "Release Status"
 msgstr "Sürüm Statüsü"
 
-#: ../picard/util/tags.py:68
+#: ../picard/util/tags.py:69
 msgid "Release Country"
 msgstr "Yayımlanan Ülke"
 
-#: ../picard/util/tags.py:69
+#: ../picard/util/tags.py:70
 msgid "Record Label"
 msgstr "Etiket"
 
-#: ../picard/util/tags.py:70
+#: ../picard/util/tags.py:71
 msgid "Barcode"
 msgstr "Barkod"
 
-#: ../picard/util/tags.py:71
+#: ../picard/util/tags.py:72
 msgid "Catalog Number"
 msgstr "Katalog Numarası"
 
-#: ../picard/util/tags.py:72
+#: ../picard/util/tags.py:73
 msgid "Format"
 msgstr "Biçim"
 
-#: ../picard/util/tags.py:73
+#: ../picard/util/tags.py:74
 msgid "DJ-Mixer"
 msgstr "DJ-Mikser"
 
-#: ../picard/util/tags.py:74
+#: ../picard/util/tags.py:75
 msgid "Media"
 msgstr "Medya"
 
-#: ../picard/util/tags.py:75
+#: ../picard/util/tags.py:76
 msgid "Lyrics"
 msgstr "Sözler"
 
-#: ../picard/util/tags.py:76
+#: ../picard/util/tags.py:77
 msgid "Mixer"
 msgstr "Mikser"
 
-#: ../picard/util/tags.py:77
+#: ../picard/util/tags.py:78
 msgid "Language"
 msgstr "Dil"
 
-#: ../picard/util/tags.py:78
+#: ../picard/util/tags.py:79
 msgid "Script"
 msgstr "Betik"
 
@@ -2504,3 +2561,30 @@ msgstr ""
 "Web tarayıcısı yüklenirken hata oluştu:\n"
 "\n"
 "%s"
+
+#~ msgid "Multiple artist file naming format:"
+#~ msgstr "Çoklu sanatçı dosya isimlendirme biçimi:"
+
+#~ msgid "File naming format:"
+#~ msgstr "Dosya isimlendirme biçimi:"
+
+#~ msgid "File name:"
+#~ msgstr "Dosya adı:"
+
+#~ msgid "Multiple artist file name:"
+#~ msgstr "Çoklu sanatçı dosya adı:"
+
+#~ msgid "Common"
+#~ msgstr "Genel"
+
+#~ msgid "ID3"
+#~ msgstr "ID3"
+
+#~ msgid "Write ID3v2 version 2.3 tags (2.4 is default)"
+#~ msgstr "ID3v2 versiyon 2.3 etiketleri yaz (varsayılan 2.4)"
+
+#~ msgid "Text encoding to use while writing ID3v2 tags:"
+#~ msgstr "ID3v2 etiketlerini yazarken kullanılacak kodlama:"
+
+#~ msgid "APE"
+#~ msgstr "APE"
diff --git a/po/zh_CN.po b/po/zh_CN.po
index af32992da..9419ced97 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: picard\n"
 "Report-Msgid-Bugs-To: http://bugs.musicbrainz.org/\n"
-"POT-Creation-Date: 2009-02-24 18:58+0100\n"
+"POT-Creation-Date: 2009-04-06 22:50+0200\n"
 "PO-Revision-Date: 2009-01-25 15:50+0000\n"
 "Last-Translator: Philipp Wolfer <Unknown>\n"
 "Language-Team: Simplified Chinese <zh_CN@li.org>\n"
@@ -18,16 +18,16 @@ msgstr ""
 "X-Launchpad-Export-Date: 2009-04-06 20:21+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
-#: ../picard/album.py:108 ../picard/cluster.py:248
+#: ../picard/album.py:109 ../picard/cluster.py:248
 msgid "Unmatched Files"
 msgstr ""
 
-#: ../picard/album.py:281
+#: ../picard/album.py:287
 #, python-format
 msgid "[could not load album %s]"
 msgstr ""
 
-#: ../picard/album.py:317
+#: ../picard/album.py:320
 msgid "[loading album information]"
 msgstr ""
 
@@ -587,7 +587,7 @@ msgid "Namibia"
 msgstr ""
 
 #: ../picard/const.py:182
-msgid "Vanuat"
+msgid "Vanuatu"
 msgstr ""
 
 #: ../picard/const.py:183
@@ -1031,223 +1031,234 @@ msgid "Congo, The Democratic Republic of the"
 msgstr ""
 
 #: ../picard/const.py:293
-msgid "Serbia and Montenegro"
+msgid "Serbia and Montenegro (historical, 2003-2006)"
 msgstr ""
 
 #: ../picard/const.py:294
-msgid "Croatia"
+msgid "Serbia"
 msgstr ""
 
 #: ../picard/const.py:295
-msgid "Korea (North), Democratic People's Republic of"
+msgid "Montenegro"
 msgstr ""
 
 #: ../picard/const.py:296
-msgid "Korea (South), Republic of"
+msgid "Croatia"
 msgstr ""
 
 #: ../picard/const.py:297
-msgid "Slovakia"
+msgid "Korea (North), Democratic People's Republic of"
 msgstr ""
 
 #: ../picard/const.py:298
-msgid "Soviet Union (historical, 1922-1991)"
+msgid "Korea (South), Republic of"
 msgstr ""
 
 #: ../picard/const.py:299
-msgid "East Timor"
+msgid "Slovakia"
 msgstr ""
 
 #: ../picard/const.py:300
-msgid "Czechoslovakia (historical, 1918-1992)"
+msgid "Soviet Union (historical, 1922-1991)"
 msgstr ""
 
 #: ../picard/const.py:301
-msgid "Europe"
+msgid "East Timor"
 msgstr ""
 
 #: ../picard/const.py:302
-msgid "East Germany (historical, 1949-1990)"
+msgid "Czechoslovakia (historical, 1918-1992)"
 msgstr ""
 
 #: ../picard/const.py:303
-msgid "[Unknown Country]"
+msgid "Europe"
 msgstr ""
 
 #: ../picard/const.py:304
-msgid "[Worldwide]"
+msgid "East Germany (historical, 1949-1990)"
 msgstr ""
 
 #: ../picard/const.py:305
+msgid "[Unknown Country]"
+msgstr ""
+
+#: ../picard/const.py:306
+msgid "[Worldwide]"
+msgstr ""
+
+#: ../picard/const.py:307
 msgid "Yugoslavia (historical, 1918-1992)"
 msgstr ""
 
-#: ../picard/const.py:310
-msgid "Catalan"
-msgstr ""
-
-#: ../picard/const.py:311
-msgid "Czech"
-msgstr ""
-
 #: ../picard/const.py:312
-msgid "Welsh"
+msgid "Afrikaans"
 msgstr ""
 
 #: ../picard/const.py:313
-msgid "Danish"
+msgid "Arabic"
 msgstr ""
 
 #: ../picard/const.py:314
-msgid "German"
+msgid "Catalan"
 msgstr ""
 
 #: ../picard/const.py:315
-msgid "English"
+msgid "Czech"
 msgstr ""
 
 #: ../picard/const.py:316
-msgid "English (Canada)"
+msgid "Welsh"
 msgstr ""
 
 #: ../picard/const.py:317
-msgid "English (UK)"
+msgid "Danish"
 msgstr ""
 
 #: ../picard/const.py:318
-msgid "Spanish"
+msgid "German"
 msgstr ""
 
 #: ../picard/const.py:319
-msgid "Persian"
+msgid "English"
 msgstr ""
 
 #: ../picard/const.py:320
-msgid "Finnish"
+msgid "English (Canada)"
 msgstr ""
 
 #: ../picard/const.py:321
-msgid "French"
+msgid "English (UK)"
 msgstr ""
 
 #: ../picard/const.py:322
-msgid "Frisian"
+msgid "Spanish"
 msgstr ""
 
 #: ../picard/const.py:323
-msgid "Hebrew"
+msgid "Persian"
 msgstr ""
 
 #: ../picard/const.py:324
-msgid "Hungarian"
+msgid "Finnish"
 msgstr ""
 
 #: ../picard/const.py:325
-msgid "Islandic"
+msgid "French"
 msgstr ""
 
 #: ../picard/const.py:326
-msgid "Italian"
+msgid "Frisian"
 msgstr ""
 
 #: ../picard/const.py:327
-msgid "Kannada"
+msgid "Hebrew"
 msgstr ""
 
 #: ../picard/const.py:328
-msgid "Korean"
+msgid "Hindi"
 msgstr ""
 
 #: ../picard/const.py:329
-msgid "Lithuanian"
+msgid "Hungarian"
 msgstr ""
 
 #: ../picard/const.py:330
-msgid "Norwegian Bokmal"
+msgid "Islandic"
 msgstr ""
 
 #: ../picard/const.py:331
-msgid "Dutch"
+msgid "Italian"
 msgstr ""
 
 #: ../picard/const.py:332
-msgid "Polish"
+msgid "Kannada"
 msgstr ""
 
 #: ../picard/const.py:333
-msgid "Portuguese"
+msgid "Korean"
 msgstr ""
 
 #: ../picard/const.py:334
-msgid "Brazilian Portuguese"
+msgid "Lithuanian"
 msgstr ""
 
 #: ../picard/const.py:335
-msgid "Romanian"
+msgid "Norwegian Bokmal"
 msgstr ""
 
 #: ../picard/const.py:336
-msgid "Russian"
+msgid "Dutch"
 msgstr ""
 
 #: ../picard/const.py:337
-msgid "Scots"
+msgid "Polish"
 msgstr ""
 
 #: ../picard/const.py:338
-msgid "Slovak"
+msgid "Portuguese"
 msgstr ""
 
 #: ../picard/const.py:339
-msgid "Slovenian"
+msgid "Brazilian Portuguese"
 msgstr ""
 
 #: ../picard/const.py:340
-msgid "Swedish"
+msgid "Romanian"
 msgstr ""
 
 #: ../picard/const.py:341
+msgid "Russian"
+msgstr ""
+
+#: ../picard/const.py:342
+msgid "Scots"
+msgstr ""
+
+#: ../picard/const.py:343
+msgid "Slovak"
+msgstr ""
+
+#: ../picard/const.py:344
+msgid "Slovenian"
+msgstr ""
+
+#: ../picard/const.py:345
+msgid "Swedish"
+msgstr ""
+
+#: ../picard/const.py:346
+msgid "Turkish"
+msgstr ""
+
+#: ../picard/const.py:347
 msgid "Chinese"
 msgstr ""
 
-#: ../picard/file.py:487
+#: ../picard/file.py:494
 #, python-format
 msgid "No matching tracks for file %s"
 msgstr ""
 
-#: ../picard/file.py:504
+#: ../picard/file.py:511
 #, python-format
 msgid "No matching tracks above the threshold for file %s"
 msgstr ""
 
-#: ../picard/file.py:507
+#: ../picard/file.py:514
 #, python-format
 msgid "File %s identified!"
 msgstr ""
 
-#: ../picard/file.py:518
+#: ../picard/file.py:525
 #, python-format
 msgid "Looking up the PUID for file %s..."
 msgstr ""
 
-#: ../picard/file.py:523
+#: ../picard/file.py:530
 #, 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 ""
@@ -1260,11 +1271,24 @@ msgstr "PLS播放列表 (*.pls)"
 msgid "XSPF Playlist (*.xspf)"
 msgstr "XSPF播放列表 (*.xfps)"
 
-#: ../picard/tagger.py:476
-msgid "CD Lookup Error"
+#: ../picard/puidmanager.py:62
+msgid "Submitting PUIDs..."
+msgstr ""
+
+#: ../picard/puidmanager.py:68
+#, python-format
+msgid "PUIDs submission failed: %s"
+msgstr ""
+
+#: ../picard/puidmanager.py:70
+msgid "PUIDs successfully submitted!"
 msgstr ""
 
 #: ../picard/tagger.py:477
+msgid "CD Lookup Error"
+msgstr ""
+
+#: ../picard/tagger.py:478
 #, python-format
 msgid ""
 "Error while reading CD:\n"
@@ -1272,7 +1296,7 @@ msgid ""
 "%s"
 msgstr ""
 
-#: ../picard/tagger.py:503
+#: ../picard/tagger.py:504
 #, python-format
 msgid "Could not find PUID for file %s"
 msgstr ""
@@ -1325,15 +1349,27 @@ msgstr ""
 msgid "Length"
 msgstr "时长"
 
-#: ../picard/ui/itemviews.py:327
+#: ../picard/ui/itemviews.py:289
+msgid "&Expand all"
+msgstr ""
+
+#: ../picard/ui/itemviews.py:291
+msgid "&Collapse all"
+msgstr ""
+
+#: ../picard/ui/itemviews.py:332
 msgid "&Releases"
 msgstr ""
 
-#: ../picard/ui/itemviews.py:353
+#: ../picard/ui/itemviews.py:349
+msgid "No release event"
+msgstr ""
+
+#: ../picard/ui/itemviews.py:359
 msgid "&Plugins"
 msgstr "插件(&P)"
 
-#: ../picard/ui/itemviews.py:523
+#: ../picard/ui/itemviews.py:533
 msgid "Clusters"
 msgstr ""
 
@@ -1341,95 +1377,6 @@ msgstr ""
 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:66 ../picard/ui/ui_options_plugins.py:62
-msgid "Details"
-msgstr ""
-
-#: ../picard/ui/tageditor.py:71 ../picard/ui/tageditor.py:264
-#, python-format
-msgid "%d file"
-msgid_plural "%d files"
-msgstr[0] ""
-msgstr[1] ""
-
-#: ../picard/ui/tageditor.py:131
-#, python-format
-msgid "(different across %d file)"
-msgid_plural "(different across %d files)"
-msgstr[0] ""
-msgstr[1] ""
-
-#: ../picard/ui/tageditor.py:134
-#, python-format
-msgid "(missing from %d file)"
-msgid_plural "(missing from %d files)"
-msgstr[0] ""
-msgstr[1] ""
-
-#: ../picard/ui/tageditor.py:233
-msgid "Filename:"
-msgstr "文件名："
-
-#: ../picard/ui/tageditor.py:235
-msgid "Format:"
-msgstr ""
-
-#: ../picard/ui/tageditor.py:244
-msgid "Size:"
-msgstr ""
-
-#: ../picard/ui/tageditor.py:248 ../picard/ui/ui_metadata.py:127
-msgid "Length:"
-msgstr "时长："
-
-#: ../picard/ui/tageditor.py:250
-msgid "Bitrate:"
-msgstr "比特率："
-
-#: ../picard/ui/tageditor.py:252
-msgid "Sample rate:"
-msgstr "采样率"
-
-#: ../picard/ui/tageditor.py:254
-msgid "Bits per sample:"
-msgstr ""
-
-#: ../picard/ui/tageditor.py:257
-msgid "Mono"
-msgstr "单体声"
-
-#: ../picard/ui/tageditor.py:258
-msgid "Stereo"
-msgstr "立体声"
-
-#: ../picard/ui/tageditor.py:260
-msgid "Channels:"
-msgstr "声道数："
-
-#: ../picard/ui/tagsfromfilenames.py:52 ../picard/ui/tagsfromfilenames.py:96
-msgid "File Name"
-msgstr "文件名"
-
 #: ../picard/ui/mainwindow.py:64
 msgid "MusicBrainz Picard"
 msgstr "MusicBrainz Picard"
@@ -1666,6 +1613,10 @@ msgstr "搜索栏(&S)"
 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 "全部支持的格式"
@@ -1685,12 +1636,97 @@ msgstr ""
 msgid " (Error: %s)"
 msgstr " (错误：%s)"
 
+#: ../picard/ui/puidsubmit.py:31 ../picard/ui/options/plugins.py:85
+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/passworddialog.py:38
 #, python-format
 msgid ""
 "The server %s requires you to login. Please enter your username and password."
 msgstr ""
 
+#: ../picard/ui/tageditor.py:66 ../picard/ui/ui_options_plugins.py:62
+msgid "Details"
+msgstr ""
+
+#: ../picard/ui/tageditor.py:71 ../picard/ui/tageditor.py:264
+#, python-format
+msgid "%d file"
+msgid_plural "%d files"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../picard/ui/tageditor.py:131
+#, python-format
+msgid "(different across %d file)"
+msgid_plural "(different across %d files)"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../picard/ui/tageditor.py:134
+#, python-format
+msgid "(missing from %d file)"
+msgid_plural "(missing from %d files)"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../picard/ui/tageditor.py:233
+msgid "Filename:"
+msgstr "文件名："
+
+#: ../picard/ui/tageditor.py:235
+msgid "Format:"
+msgstr ""
+
+#: ../picard/ui/tageditor.py:244
+msgid "Size:"
+msgstr ""
+
+#: ../picard/ui/tageditor.py:248 ../picard/ui/ui_metadata.py:127
+msgid "Length:"
+msgstr "时长："
+
+#: ../picard/ui/tageditor.py:250
+msgid "Bitrate:"
+msgstr "比特率："
+
+#: ../picard/ui/tageditor.py:252
+msgid "Sample rate:"
+msgstr "采样率"
+
+#: ../picard/ui/tageditor.py:254
+msgid "Bits per sample:"
+msgstr ""
+
+#: ../picard/ui/tageditor.py:257
+msgid "Mono"
+msgstr "单体声"
+
+#: ../picard/ui/tageditor.py:258
+msgid "Stereo"
+msgstr "立体声"
+
+#: ../picard/ui/tageditor.py:260
+msgid "Channels:"
+msgstr "声道数："
+
+#: ../picard/ui/tagsfromfilenames.py:54 ../picard/ui/tagsfromfilenames.py:99
+msgid "File Name"
+msgstr "文件名"
+
 #: ../picard/ui/ui_cdlookup.py:60 ../picard/ui/ui_options_cdlookup.py:47
 #: ../picard/ui/ui_options_cdlookup_select.py:48
 #: ../picard/ui/options/cdlookup.py:36
@@ -1713,24 +1749,6 @@ msgstr ""
 msgid "Cancel"
 msgstr "取消"
 
-#: ../picard/ui/ui_passworddialog.py:78
-msgid "Authentication required"
-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"
-msgstr ""
-
 #: ../picard/ui/ui_edittagdialog.py:44
 msgid "Edit Tag"
 msgstr ""
@@ -1767,6 +1785,10 @@ msgstr "专辑："
 msgid "Options"
 msgstr "选项"
 
+#: ../picard/ui/ui_puidsubmit.py:52
+msgid "Submit PUIDs"
+msgstr ""
+
 #: ../picard/ui/ui_options_cdlookup.py:48
 msgid "CD-ROM device to use for lookups:"
 msgstr ""
@@ -1791,6 +1813,22 @@ msgstr ""
 msgid "Overwrite the file if it already exists"
 msgstr ""
 
+#: ../picard/ui/ui_options_moving.py:53
+msgid "Move additional files:"
+msgstr ""
+
+#: ../picard/ui/ui_options_moving.py:54
+msgid "Browse..."
+msgstr ""
+
+#: ../picard/ui/ui_options_moving.py:55
+msgid "Delete empty directories"
+msgstr "删除空文件夹"
+
+#: ../picard/ui/ui_options_moving.py:56
+msgid "Move files to this directory when saving:"
+msgstr ""
+
 #: ../picard/ui/util.py:31
 msgid "&Ok"
 msgstr "确定(&O)"
@@ -1799,44 +1837,40 @@ msgstr "确定(&O)"
 msgid "&Cancel"
 msgstr "取消(&C)"
 
-#: ../picard/ui/ui_puidsubmit.py:52
-msgid "Submit PUIDs"
-msgstr ""
-
-#: ../picard/ui/ui_tageditor.py:139 ../picard/ui/ui_options_plugins.py:59
-#: ../picard/ui/options/plugins.py:76
+#: ../picard/ui/ui_tageditor.py:128 ../picard/ui/ui_options_plugins.py:59
+#: ../picard/ui/options/plugins.py:81
 msgid "Name"
 msgstr "名称"
 
-#: ../picard/ui/ui_tageditor.py:140
+#: ../picard/ui/ui_tageditor.py:129
 msgid "Value"
 msgstr "值"
 
-#: ../picard/ui/ui_tageditor.py:141
+#: ../picard/ui/ui_tageditor.py:130
 msgid "Rating:"
 msgstr ""
 
-#: ../picard/ui/ui_tageditor.py:142
+#: ../picard/ui/ui_tageditor.py:131
 msgid "&Add..."
 msgstr "添加(%A)..."
 
-#: ../picard/ui/ui_tageditor.py:143
+#: ../picard/ui/ui_tageditor.py:132
 msgid "&Edit..."
 msgstr "编辑(&E)..."
 
-#: ../picard/ui/ui_tageditor.py:144
+#: ../picard/ui/ui_tageditor.py:133
 msgid "&Delete"
 msgstr "删除(&D)"
 
-#: ../picard/ui/ui_tageditor.py:145
+#: ../picard/ui/ui_tageditor.py:134
 msgid "&Metadata"
 msgstr "元数据(&M)"
 
-#: ../picard/ui/ui_tageditor.py:146
+#: ../picard/ui/ui_tageditor.py:135
 msgid "A&rtwork"
 msgstr "封面图像(&R)"
 
-#: ../picard/ui/ui_tageditor.py:147
+#: ../picard/ui/ui_tageditor.py:136
 msgid "&Info"
 msgstr "信息(&I)"
 
@@ -1881,6 +1915,40 @@ msgstr ""
 msgid ", "
 msgstr ""
 
+#: ../picard/ui/ui_options_general.py:108
+msgid "MusicBrainz Server"
+msgstr "MusicBrainz 服务器"
+
+#: ../picard/ui/ui_options_general.py:109 ../picard/ui/ui_options_proxy.py:72
+msgid "Port:"
+msgstr "端口："
+
+#: ../picard/ui/ui_options_general.py:110 ../picard/ui/ui_options_proxy.py:73
+msgid "Server address:"
+msgstr "服务器地址："
+
+#: ../picard/ui/ui_options_general.py:111
+msgid "Account Information"
+msgstr "账户信息"
+
+#: ../picard/ui/ui_options_general.py:112 ../picard/ui/ui_options_proxy.py:70
+#: ../picard/ui/ui_passworddialog.py:80
+msgid "Password:"
+msgstr "密码："
+
+#: ../picard/ui/ui_options_general.py:113 ../picard/ui/ui_options_proxy.py:71
+#: ../picard/ui/ui_passworddialog.py:79
+msgid "Username:"
+msgstr "用户名："
+
+#: ../picard/ui/ui_options_general.py:114 ../picard/ui/options/general.py:29
+msgid "General"
+msgstr ""
+
+#: ../picard/ui/ui_options_general.py:115
+msgid "Automatically scan all new files"
+msgstr ""
+
 #: ../picard/ui/ui_options_interface.py:50
 msgid "Miscellaneous"
 msgstr ""
@@ -1901,113 +1969,6 @@ msgstr ""
 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 ""
-
-#: ../picard/ui/ui_options_proxy.py:81 ../picard/ui/options/proxy.py:28
-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_options_ratings.py:45
-msgid "Enable track ratings"
-msgstr ""
-
-#: ../picard/ui/ui_options_ratings.py:46
-msgid ""
-"Picard saves the ratings together with an e-mail address identifying the "
-"user who did the rating. That way different ratings for different users can "
-"be stored in the files. Please sepcify the e-mail you want to use to save "
-"your ratings."
-msgstr ""
-
-#: ../picard/ui/ui_options_ratings.py:47
-msgid "E-mail:"
-msgstr ""
-
-#: ../picard/ui/ui_options_general.py:108
-msgid "MusicBrainz Server"
-msgstr "MusicBrainz 服务器"
-
-#: ../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 ""
-
-#: ../picard/ui/ui_options_general.py:115
-msgid "Automatically scan all new files"
-msgstr ""
-
 #: ../picard/ui/ui_options_matching.py:105
 msgid "Thresholds"
 msgstr ""
@@ -2064,74 +2025,147 @@ msgstr ""
 msgid "Non-album tracks:"
 msgstr ""
 
-#: ../picard/ui/ui_options_plugins.py:58 ../picard/ui/options/plugins.py:30
+#: ../picard/ui/ui_options_metadata.py:109
+#: ../picard/ui/ui_options_metadata.py:110
+#: ../picard/ui/ui_options_renaming.py:155
+#: ../picard/ui/ui_options_renaming.py:158
+msgid "Default"
+msgstr ""
+
+#: ../picard/ui/ui_options_plugins.py:58 ../picard/ui/options/plugins.py:34
 msgid "Plugins"
 msgstr "插件"
 
-#: ../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:84
 msgid "Author"
 msgstr ""
 
-#: ../picard/ui/ui_options_plugins.py:61 ../picard/util/tags.py:36
+#: ../picard/ui/ui_options_plugins.py:61 ../picard/util/tags.py:37
 msgid "Version"
 msgstr ""
 
-#: ../picard/ui/ui_options_script.py:52
+#: ../picard/ui/ui_options_proxy.py:69 ../picard/ui/options/proxy.py:28
+msgid "Web Proxy"
+msgstr "网络代理服务器"
+
+#: ../picard/ui/ui_options_ratings.py:45
+msgid "Enable track ratings"
+msgstr ""
+
+#: ../picard/ui/ui_options_ratings.py:46
+msgid ""
+"Picard saves the ratings together with an e-mail address identifying the "
+"user who did the rating. That way different ratings for different users can "
+"be stored in the files. Please sepcify the e-mail you want to use to save "
+"your ratings."
+msgstr ""
+
+#: ../picard/ui/ui_options_ratings.py:47
+msgid "E-mail:"
+msgstr ""
+
+#: ../picard/ui/ui_options_renaming.py:145
+msgid "Form"
+msgstr ""
+
+#: ../picard/ui/ui_options_renaming.py:146
+msgid "Rename files when saving"
+msgstr ""
+
+#: ../picard/ui/ui_options_renaming.py:147
+msgid "Replace non-ASCII characters"
+msgstr "将非 ASCII 字符取代"
+
+#: ../picard/ui/ui_options_renaming.py:148
+msgid "Replace Windows-incompatible characters"
+msgstr "将与 Windows 不相容的字符取代"
+
+#: ../picard/ui/ui_options_renaming.py:149
+msgid "Name files like this"
+msgstr ""
+
+#: ../picard/ui/ui_options_renaming.py:156
+msgid "Name multiple artist albums differently"
+msgstr ""
+
+#: ../picard/ui/ui_options_renaming.py:157
+msgid "Copy from above"
+msgstr ""
+
+#: ../picard/ui/ui_options_renaming.py:159
+msgid "Examples"
+msgstr ""
+
+#: ../picard/ui/ui_options_script.py:43
 msgid "Tagger Script"
 msgstr ""
 
-#: ../picard/ui/ui_options_tags.py:85
-msgid "Common"
-msgstr "常规"
-
-#: ../picard/ui/ui_options_tags.py:86
-msgid "Clear existing tags before writing new tags"
-msgstr ""
-
-#: ../picard/ui/ui_options_tags.py:87
-msgid "Don not write tags to files"
-msgstr ""
-
-#: ../picard/ui/ui_options_tags.py:88
-msgid "ID3"
-msgstr ""
-
-#: ../picard/ui/ui_options_tags.py:89
-msgid "Write ID3v1 tags to the files"
+#: ../picard/ui/ui_options_tags.py:97
+#, fuzzy
+msgid "Do not write tags to files"
 msgstr "使用ID3v1标签"
 
-#: ../picard/ui/ui_options_tags.py:90
-msgid "Write ID3v2 version 2.3 tags (2.4 is default)"
+#: ../picard/ui/ui_options_tags.py:98
+msgid "Before tagging"
 msgstr ""
 
-#: ../picard/ui/ui_options_tags.py:91
-msgid "Text encoding to use while writing ID3v2 tags:"
+#: ../picard/ui/ui_options_tags.py:99
+msgid "Clear existing tags"
 msgstr ""
 
-#: ../picard/ui/ui_options_tags.py:92
-msgid "ISO-8859-1"
-msgstr "ISO-8859-1"
-
-#: ../picard/ui/ui_options_tags.py:93
-msgid "UTF-16"
-msgstr ""
-
-#: ../picard/ui/ui_options_tags.py:94
-msgid "UTF-8"
-msgstr ""
-
-#: ../picard/ui/ui_options_tags.py:95
+#: ../picard/ui/ui_options_tags.py:100
 msgid "Remove ID3 tags from FLAC files"
 msgstr "将FLAC文件中ID3标签删掉"
 
-#: ../picard/ui/ui_options_tags.py:96
-msgid "APE"
-msgstr "APE"
-
-#: ../picard/ui/ui_options_tags.py:97
+#: ../picard/ui/ui_options_tags.py:101
 msgid "Remove APEv2 tags from MP3 files"
 msgstr "将MP3文件中APEv2标签删掉"
 
+#: ../picard/ui/ui_options_tags.py:102
+msgid "Tag compatibility"
+msgstr ""
+
+#: ../picard/ui/ui_options_tags.py:103
+msgid "ID3v2 version"
+msgstr ""
+
+#: ../picard/ui/ui_options_tags.py:104
+msgid "2.4"
+msgstr ""
+
+#: ../picard/ui/ui_options_tags.py:105
+msgid "2.3"
+msgstr ""
+
+#: ../picard/ui/ui_options_tags.py:106
+#, fuzzy
+msgid "Also include ID3v1 tags in the files"
+msgstr "使用ID3v1标签"
+
+#: ../picard/ui/ui_options_tags.py:107
+msgid "ID3v2 text encoding"
+msgstr ""
+
+#: ../picard/ui/ui_options_tags.py:108
+msgid "UTF-8"
+msgstr ""
+
+#: ../picard/ui/ui_options_tags.py:109
+msgid "UTF-16"
+msgstr ""
+
+#: ../picard/ui/ui_options_tags.py:110
+msgid "ISO-8859-1"
+msgstr "ISO-8859-1"
+
+#: ../picard/ui/ui_passworddialog.py:78
+msgid "Authentication required"
+msgstr ""
+
+#: ../picard/ui/ui_passworddialog.py:81
+msgid "Save username and password"
+msgstr ""
+
 #: ../picard/ui/ui_tagsfromfilenames.py:56
 msgid "Convert File Names to Tags"
 msgstr ""
@@ -2140,6 +2174,10 @@ msgstr ""
 msgid "Replace underscores with spaces"
 msgstr ""
 
+#: ../picard/ui/ui_tagsfromfilenames.py:58
+msgid "&Preview"
+msgstr ""
+
 #: ../picard/ui/options/about.py:29
 msgid "About"
 msgstr "关于"
@@ -2171,8 +2209,8 @@ 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"
@@ -2180,14 +2218,13 @@ msgid ""
 "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\"><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/P"
-"icardTagger</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
@@ -2220,42 +2257,45 @@ msgstr ""
 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"
+#: ../picard/ui/options/moving.py:33
+msgid "Moving files"
 msgstr ""
 
-#: ../picard/ui/options/naming.py:93
-msgid "The file naming format must not be empty."
-msgstr ""
-
-#: ../picard/ui/options/naming.py:95
-msgid "The multiple artist file naming format must not be empty."
-msgstr ""
-
-#: ../picard/ui/options/naming.py:97
+#: ../picard/ui/options/moving.py:65
 msgid "Error"
 msgstr ""
 
-#: ../picard/ui/options/naming.py:97
+#: ../picard/ui/options/moving.py:65
 msgid "The location to move files to must not be empty."
 msgstr ""
 
-#: ../picard/ui/options/scripting.py:63
-msgid "Scripting"
+#: ../picard/ui/options/ratings.py:29
+msgid "Ratings"
 msgstr ""
 
 #: ../picard/ui/options/tags.py:29
 msgid "Tags"
 msgstr "标签"
 
-#: ../picard/ui/options/ratings.py:29
-msgid "Ratings"
+#: ../picard/ui/options/renaming.py:35
+#, fuzzy
+msgid "File naming"
+msgstr "文件名格式"
+
+#: ../picard/ui/options/renaming.py:123
+msgid "The file naming format must not be empty."
+msgstr ""
+
+#: ../picard/ui/options/renaming.py:133
+msgid "The multiple artist file naming format must not be empty."
+msgstr ""
+
+#: ../picard/ui/options/scripting.py:63
+msgid "Scripting"
+msgstr ""
+
+#: ../picard/ui/options/scripting.py:97
+msgid "Script Error"
 msgstr ""
 
 #: ../picard/util/tags.py:24
@@ -2263,214 +2303,218 @@ msgid "Date"
 msgstr "日期"
 
 #: ../picard/util/tags.py:25
+msgid "Original Release Date"
+msgstr ""
+
+#: ../picard/util/tags.py:26
 msgid "Album Artist"
 msgstr "专辑艺人"
 
-#: ../picard/util/tags.py:26
+#: ../picard/util/tags.py:27
 msgid "Track Number"
 msgstr "音轨号"
 
-#: ../picard/util/tags.py:27
+#: ../picard/util/tags.py:28
 msgid "Total Tracks"
 msgstr ""
 
-#: ../picard/util/tags.py:28
+#: ../picard/util/tags.py:29
 msgid "Disc Number"
 msgstr ""
 
-#: ../picard/util/tags.py:29
+#: ../picard/util/tags.py:30
 msgid "Total Discs"
 msgstr ""
 
-#: ../picard/util/tags.py:30
+#: ../picard/util/tags.py:31
 msgid "Album Artist Sort Order"
 msgstr ""
 
-#: ../picard/util/tags.py:31
+#: ../picard/util/tags.py:32
 msgid "Artist Sort Order"
 msgstr ""
 
-#: ../picard/util/tags.py:32
+#: ../picard/util/tags.py:33
 msgid "Title Sort Order"
 msgstr ""
 
-#: ../picard/util/tags.py:33
+#: ../picard/util/tags.py:34
 msgid "Album Sort Order"
 msgstr ""
 
-#: ../picard/util/tags.py:34
+#: ../picard/util/tags.py:35
 msgid "ASIN"
 msgstr "ASIN"
 
-#: ../picard/util/tags.py:35
+#: ../picard/util/tags.py:36
 msgid "Grouping"
 msgstr ""
 
-#: ../picard/util/tags.py:37
+#: ../picard/util/tags.py:38
 msgid "ISRC"
 msgstr ""
 
-#: ../picard/util/tags.py:38
+#: ../picard/util/tags.py:39
 msgid "Mood"
 msgstr "心情"
 
-#: ../picard/util/tags.py:39
+#: ../picard/util/tags.py:40
 msgid "BPM"
 msgstr "BPM"
 
-#: ../picard/util/tags.py:40
+#: ../picard/util/tags.py:41
 msgid "Copyright"
 msgstr "版权"
 
-#: ../picard/util/tags.py:41
+#: ../picard/util/tags.py:42
 msgid "Composer"
 msgstr ""
 
-#: ../picard/util/tags.py:42
+#: ../picard/util/tags.py:43
 msgid "Conductor"
 msgstr ""
 
-#: ../picard/util/tags.py:43
+#: ../picard/util/tags.py:44
 msgid "Lyricist"
 msgstr ""
 
-#: ../picard/util/tags.py:44
+#: ../picard/util/tags.py:45
 msgid "Arranger"
 msgstr ""
 
-#: ../picard/util/tags.py:45
+#: ../picard/util/tags.py:46
 msgid "Producer"
 msgstr ""
 
-#: ../picard/util/tags.py:46
+#: ../picard/util/tags.py:47
 msgid "Engineer"
 msgstr ""
 
-#: ../picard/util/tags.py:47
+#: ../picard/util/tags.py:48
 msgid "Subtitle"
 msgstr "副标题"
 
-#: ../picard/util/tags.py:48
+#: ../picard/util/tags.py:49
 msgid "Disc Subtitle"
 msgstr ""
 
-#: ../picard/util/tags.py:49
+#: ../picard/util/tags.py:50
 msgid "Remixer"
 msgstr ""
 
-#: ../picard/util/tags.py:50
+#: ../picard/util/tags.py:51
 msgid "MusicBrainz Track Id"
 msgstr ""
 
-#: ../picard/util/tags.py:51
+#: ../picard/util/tags.py:52
 msgid "MusicBrainz Release Id"
 msgstr ""
 
-#: ../picard/util/tags.py:52
+#: ../picard/util/tags.py:53
 msgid "MusicBrainz Artist Id"
 msgstr ""
 
-#: ../picard/util/tags.py:53
+#: ../picard/util/tags.py:54
 msgid "MusicBrainz Release Artist Id"
 msgstr ""
 
-#: ../picard/util/tags.py:54
+#: ../picard/util/tags.py:55
 msgid "MusicBrainz TRM Id"
 msgstr ""
 
-#: ../picard/util/tags.py:55
+#: ../picard/util/tags.py:56
 msgid "MusicBrainz Disc Id"
 msgstr ""
 
-#: ../picard/util/tags.py:56
+#: ../picard/util/tags.py:57
 msgid "MusicBrainz Sort Name"
 msgstr ""
 
-#: ../picard/util/tags.py:57
+#: ../picard/util/tags.py:58
 msgid "MusicIP PUID"
 msgstr ""
 
-#: ../picard/util/tags.py:58
+#: ../picard/util/tags.py:59
 msgid "MusicIP Fingerprint"
 msgstr ""
 
-#: ../picard/util/tags.py:59
+#: ../picard/util/tags.py:60
 msgid "Disc Id"
 msgstr ""
 
-#: ../picard/util/tags.py:60
+#: ../picard/util/tags.py:61
 msgid "Website"
 msgstr "网站"
 
-#: ../picard/util/tags.py:61
+#: ../picard/util/tags.py:62
 msgid "Compilation"
 msgstr "曲集"
 
-#: ../picard/util/tags.py:62
+#: ../picard/util/tags.py:63
 msgid "Comment"
 msgstr "注释"
 
-#: ../picard/util/tags.py:63
+#: ../picard/util/tags.py:64
 msgid "Genre"
 msgstr ""
 
-#: ../picard/util/tags.py:64
+#: ../picard/util/tags.py:65
 msgid "Encoded By"
 msgstr ""
 
-#: ../picard/util/tags.py:65
+#: ../picard/util/tags.py:66
 msgid "Performer"
 msgstr ""
 
-#: ../picard/util/tags.py:66
+#: ../picard/util/tags.py:67
 msgid "Release Type"
 msgstr ""
 
-#: ../picard/util/tags.py:67
+#: ../picard/util/tags.py:68
 msgid "Release Status"
 msgstr ""
 
-#: ../picard/util/tags.py:68
+#: ../picard/util/tags.py:69
 msgid "Release Country"
 msgstr "版本地区"
 
-#: ../picard/util/tags.py:69
+#: ../picard/util/tags.py:70
 msgid "Record Label"
 msgstr "唱片公司"
 
-#: ../picard/util/tags.py:70
+#: ../picard/util/tags.py:71
 msgid "Barcode"
 msgstr "条形码"
 
-#: ../picard/util/tags.py:71
+#: ../picard/util/tags.py:72
 msgid "Catalog Number"
 msgstr ""
 
-#: ../picard/util/tags.py:72
+#: ../picard/util/tags.py:73
 msgid "Format"
 msgstr ""
 
-#: ../picard/util/tags.py:73
+#: ../picard/util/tags.py:74
 msgid "DJ-Mixer"
 msgstr ""
 
-#: ../picard/util/tags.py:74
+#: ../picard/util/tags.py:75
 msgid "Media"
 msgstr ""
 
-#: ../picard/util/tags.py:75
+#: ../picard/util/tags.py:76
 msgid "Lyrics"
 msgstr "歌词"
 
-#: ../picard/util/tags.py:76
+#: ../picard/util/tags.py:77
 msgid "Mixer"
 msgstr "混音者"
 
-#: ../picard/util/tags.py:77
+#: ../picard/util/tags.py:78
 msgid "Language"
 msgstr ""
 
-#: ../picard/util/tags.py:78
+#: ../picard/util/tags.py:79
 msgid "Script"
 msgstr ""
 
@@ -2489,5 +2533,17 @@ msgstr ""
 "\n"
 "%s"
 
+#~ msgid "File name:"
+#~ msgstr "文件名："
+
+#~ msgid "Multiple artist file name:"
+#~ msgstr "各艺人文件名："
+
+#~ msgid "Common"
+#~ msgstr "常规"
+
+#~ msgid "APE"
+#~ msgstr "APE"
+
 #~ msgid "Delete"
 #~ msgstr "删除"