diff --git a/src/translations/cs.po b/src/translations/cs.po
index 0bcae922b..d3bff16b5 100644
--- a/src/translations/cs.po
+++ b/src/translations/cs.po
@@ -680,7 +680,7 @@ msgstr "Přidána dnes"
 msgid "Added within three months"
 msgstr "Přidána během tří měsíců"
 
-#: collection/collectionfilterwidget.cpp:229
+#: collection/collectionfilterwidget.cpp:241
 msgid "Advanced grouping..."
 msgstr "Pokročilé seskupování..."
 
@@ -692,7 +692,7 @@ msgstr "Po zkopírování..."
 msgid "Albu&m cover"
 msgstr "Obal alb&a"
 
-#: core/qtsystemtrayicon.cpp:259 collection/savedgroupingmanager.cpp:87
+#: core/qtsystemtrayicon.cpp:259 collection/savedgroupingmanager.cpp:88
 #: playlist/playlist.cpp:1169 organize/organizedialog.cpp:99
 #: ../build/src/ui_groupbydialog.h:186 ../build/src/ui_groupbydialog.h:208
 #: ../build/src/ui_groupbydialog.h:230 ../build/src/ui_albumcoversearcher.h:110
@@ -707,12 +707,12 @@ msgstr "Album"
 msgid "Album (ideal loudness for all tracks)"
 msgstr "Album (ideální hlasitost pro všechny skladby)"
 
-#: collection/savedgroupingmanager.cpp:90 ../build/src/ui_groupbydialog.h:187
+#: collection/savedgroupingmanager.cpp:91 ../build/src/ui_groupbydialog.h:187
 #: ../build/src/ui_groupbydialog.h:209 ../build/src/ui_groupbydialog.h:231
 msgid "Album - Disc"
 msgstr "Album - Disk"
 
-#: collection/savedgroupingmanager.cpp:84 playlist/playlist.cpp:1176
+#: collection/savedgroupingmanager.cpp:82 playlist/playlist.cpp:1176
 #: organize/organizedialog.cpp:102 ../build/src/ui_groupbydialog.h:185
 #: ../build/src/ui_groupbydialog.h:207 ../build/src/ui_groupbydialog.h:229
 #: ../build/src/ui_edittagdialog.h:685
@@ -839,7 +839,7 @@ msgstr "Opravdu chcete smazat nastavení \"%1\"?"
 msgid "Are you sure you want to reset this song's statistics?"
 msgstr "Opravdu chcete nastavit statistiku této písně znovu?"
 
-#: core/qtsystemtrayicon.cpp:257 collection/savedgroupingmanager.cpp:81
+#: core/qtsystemtrayicon.cpp:257 collection/savedgroupingmanager.cpp:85
 #: playlist/playlist.cpp:1168 organize/organizedialog.cpp:100
 #: ../build/src/ui_groupbydialog.h:184 ../build/src/ui_groupbydialog.h:206
 #: ../build/src/ui_groupbydialog.h:228 ../build/src/ui_albumcoversearcher.h:106
@@ -977,7 +977,7 @@ msgstr "Chování"
 msgid "Best"
 msgstr "Nejlepší"
 
-#: context/contextview.cpp:216 collection/savedgroupingmanager.cpp:132
+#: context/contextview.cpp:216 collection/savedgroupingmanager.cpp:136
 #: playlist/playlist.cpp:1186 organize/organizedialog.cpp:115
 #: ../build/src/ui_groupbydialog.h:201 ../build/src/ui_groupbydialog.h:223
 #: ../build/src/ui_groupbydialog.h:245 ../build/src/ui_edittagdialog.h:671
@@ -989,7 +989,7 @@ msgstr "Bitová hloubka"
 msgid "Bit rate"
 msgstr "Datový tok"
 
-#: context/contextview.cpp:217 collection/savedgroupingmanager.cpp:135
+#: context/contextview.cpp:217 collection/savedgroupingmanager.cpp:139
 #: playlist/playlist.cpp:1187 ../build/src/ui_groupbydialog.h:202
 #: ../build/src/ui_groupbydialog.h:224 ../build/src/ui_groupbydialog.h:246
 #: ../build/src/ui_transcoderoptionsaac.h:128
@@ -1215,7 +1215,7 @@ msgstr "Doplnit značky automaticky"
 msgid "Complete tags automatically..."
 msgstr "Doplnit značky automaticky..."
 
-#: collection/savedgroupingmanager.cpp:117 playlist/playlist.cpp:1177
+#: collection/savedgroupingmanager.cpp:118 playlist/playlist.cpp:1177
 #: organize/organizedialog.cpp:103 ../build/src/ui_groupbydialog.h:196
 #: ../build/src/ui_groupbydialog.h:218 ../build/src/ui_groupbydialog.h:240
 #: ../build/src/ui_edittagdialog.h:686
@@ -1592,7 +1592,7 @@ msgctxt "Refers to a disabled notification type in Notification settings."
 msgid "Disabled"
 msgstr "Zakázáno"
 
-#: collection/savedgroupingmanager.cpp:93 playlist/playlist.cpp:1171
+#: collection/savedgroupingmanager.cpp:106 playlist/playlist.cpp:1171
 #: organize/organizedialog.cpp:107 ../build/src/ui_groupbydialog.h:188
 #: ../build/src/ui_groupbydialog.h:210 ../build/src/ui_groupbydialog.h:232
 #: ../build/src/ui_edittagdialog.h:684
@@ -1997,7 +1997,7 @@ msgstr "Souborové cesty"
 msgid "File size"
 msgstr "Velikost souboru"
 
-#: collection/savedgroupingmanager.cpp:126 playlist/playlist.cpp:1192
+#: collection/savedgroupingmanager.cpp:127 playlist/playlist.cpp:1192
 #: ../build/src/ui_groupbydialog.h:199 ../build/src/ui_groupbydialog.h:221
 #: ../build/src/ui_groupbydialog.h:243 ../build/src/ui_edittagdialog.h:673
 msgid "File type"
@@ -2091,7 +2091,7 @@ msgstr ""
 msgid "Form"
 msgstr "Formulář"
 
-#: collection/savedgroupingmanager.cpp:96 ../build/src/ui_groupbydialog.h:189
+#: collection/savedgroupingmanager.cpp:130 ../build/src/ui_groupbydialog.h:189
 #: ../build/src/ui_groupbydialog.h:211 ../build/src/ui_groupbydialog.h:233
 msgid "Format"
 msgstr "Formát"
@@ -2134,7 +2134,7 @@ msgstr "Obecná nastavení"
 msgid "Genius Authentication"
 msgstr "Ověření Genius"
 
-#: collection/savedgroupingmanager.cpp:99 playlist/playlist.cpp:1175
+#: collection/savedgroupingmanager.cpp:115 playlist/playlist.cpp:1175
 #: organize/organizedialog.cpp:110 ../build/src/ui_groupbydialog.h:190
 #: ../build/src/ui_groupbydialog.h:212 ../build/src/ui_groupbydialog.h:234
 #: ../build/src/ui_edittagdialog.h:680
@@ -2235,18 +2235,18 @@ msgstr "Seskupit jako Žánr/Autor alba/Album"
 msgid "Group by Genre/Artist/Album"
 msgstr "Seskupovat podle žánru/umělce/alba"
 
-#: collection/savedgroupingmanager.cpp:123 playlist/playlist.cpp:1179
+#: collection/savedgroupingmanager.cpp:124 playlist/playlist.cpp:1179
 #: organize/organizedialog.cpp:105 ../build/src/ui_groupbydialog.h:198
 #: ../build/src/ui_groupbydialog.h:220 ../build/src/ui_groupbydialog.h:242
 #: ../build/src/ui_edittagdialog.h:682
 msgid "Grouping"
 msgstr "Seskupení"
 
-#: collection/collectionfilterwidget.cpp:250
+#: collection/collectionfilterwidget.cpp:262
 msgid "Grouping Name"
 msgstr "Název seskupení"
 
-#: collection/collectionfilterwidget.cpp:250
+#: collection/collectionfilterwidget.cpp:262
 msgid "Grouping name:"
 msgstr "Název seskupení:"
 
@@ -2516,7 +2516,7 @@ msgstr "Nahrává se zařízení MTP"
 msgid "Loading iPod database"
 msgstr "Nahrává se databáze iPod"
 
-#: collection/collectionmodel.cpp:214
+#: collection/collectionmodel.cpp:210
 msgid "Loading songs"
 msgstr "Nahrávají se písně"
 
@@ -2528,7 +2528,7 @@ msgstr "Nahrávají se skladby"
 msgid "Loading tracks info"
 msgstr "Nahrávají se informace o skladbě"
 
-#: collection/collectionmodel.cpp:207 ../build/src/ui_organizedialog.h:281
+#: collection/collectionmodel.cpp:203 ../build/src/ui_organizedialog.h:281
 msgid "Loading..."
 msgstr "Nahrává se..."
 
@@ -2810,7 +2810,7 @@ msgstr "Žádné krátké bloky"
 msgid "No song playing"
 msgstr "Žádná skladba se nepřehrává"
 
-#: collection/savedgroupingmanager.cpp:78 ../build/src/ui_groupbydialog.h:183
+#: collection/savedgroupingmanager.cpp:79 ../build/src/ui_groupbydialog.h:183
 #: ../build/src/ui_groupbydialog.h:205 ../build/src/ui_groupbydialog.h:227
 msgid "None"
 msgstr "Žádná"
@@ -2945,17 +2945,21 @@ msgstr ""
 msgid "Original tags"
 msgstr "Původní značky"
 
-#: collection/savedgroupingmanager.cpp:111 playlist/playlist.cpp:1174
+#: collection/savedgroupingmanager.cpp:112 playlist/playlist.cpp:1174
 #: organize/organizedialog.cpp:109 ../build/src/ui_groupbydialog.h:194
 #: ../build/src/ui_groupbydialog.h:216 ../build/src/ui_groupbydialog.h:238
 msgid "Original year"
 msgstr "Původní rok"
 
-#: collection/savedgroupingmanager.cpp:114 ../build/src/ui_groupbydialog.h:195
+#: collection/savedgroupingmanager.cpp:100 ../build/src/ui_groupbydialog.h:195
 #: ../build/src/ui_groupbydialog.h:217 ../build/src/ui_groupbydialog.h:239
 msgid "Original year - Album"
 msgstr "Původní rok - Album"
 
+#: collection/savedgroupingmanager.cpp:103
+msgid "Original year - Album - Disc"
+msgstr ""
+
 #: core/commandlineoptions.cpp:183
 msgid "Other options"
 msgstr "Další volby"
@@ -3013,7 +3017,7 @@ msgstr "Pozastavit přehrávání"
 msgid "Paused"
 msgstr "Pozastaveno"
 
-#: collection/savedgroupingmanager.cpp:120 playlist/playlist.cpp:1178
+#: collection/savedgroupingmanager.cpp:121 playlist/playlist.cpp:1178
 #: organize/organizedialog.cpp:104 ../build/src/ui_groupbydialog.h:197
 #: ../build/src/ui_groupbydialog.h:219 ../build/src/ui_groupbydialog.h:241
 #: ../build/src/ui_edittagdialog.h:691
@@ -3546,7 +3550,7 @@ msgstr "Bezpečně odebrat zařízení"
 msgid "Safely remove the device after copying"
 msgstr "Po dokončení kopírování bezpečně odebrat zařízení"
 
-#: collection/savedgroupingmanager.cpp:129 playlist/playlist.cpp:1185
+#: collection/savedgroupingmanager.cpp:133 playlist/playlist.cpp:1185
 #: organize/organizedialog.cpp:114 ../build/src/ui_groupbydialog.h:200
 #: ../build/src/ui_groupbydialog.h:222 ../build/src/ui_groupbydialog.h:244
 #: ../build/src/ui_edittagdialog.h:670
@@ -4456,10 +4460,10 @@ msgid "Ultra wide band (UWB)"
 msgstr "Ultra široké pásmo"
 
 #: core/song.cpp:538 context/contextalbumsmodel.cpp:357
-#: collection/collectionmodel.cpp:433 collection/collectionmodel.cpp:438
-#: collection/collectionmodel.cpp:442 collection/collectionmodel.cpp:446
-#: collection/collectionmodel.cpp:450 collection/collectionmodel.cpp:1407
-#: collection/savedgroupingmanager.cpp:137 playlist/playlistdelegates.cpp:353
+#: collection/collectionmodel.cpp:461 collection/collectionmodel.cpp:466
+#: collection/collectionmodel.cpp:470 collection/collectionmodel.cpp:474
+#: collection/collectionmodel.cpp:478 collection/collectionmodel.cpp:1589
+#: collection/savedgroupingmanager.cpp:143 playlist/playlistdelegates.cpp:353
 #: playlist/playlistmanager.cpp:554 playlist/playlistmanager.cpp:555
 #: dialogs/edittagdialog.cpp:494 dialogs/edittagdialog.cpp:542
 #: ../build/src/ui_scrobblersettingspage.h:393
@@ -4621,9 +4625,9 @@ msgstr "Použití nabídky pro přidání písně..."
 msgid "Variable bit rate"
 msgstr "Proměnlivý datový tok"
 
-#: collection/collectionmodel.cpp:347 playlist/playlistmanager.cpp:566
-#: covermanager/albumcovermanager.cpp:333 internet/internetsearchmodel.cpp:94
-#: internet/internetsearchmodel.cpp:106
+#: collection/collectionmodel.cpp:371 collection/collectionmodel.cpp:372
+#: playlist/playlistmanager.cpp:566 covermanager/albumcovermanager.cpp:333
+#: internet/internetsearchmodel.cpp:94 internet/internetsearchmodel.cpp:106
 msgid "Various artists"
 msgstr "Různí umělci"
 
@@ -4702,9 +4706,9 @@ msgstr "Pracovat v režimu offline (pouze ukládat přehrané skladby)"
 
 #: collection/collectionview.cpp:476
 msgid ""
-"Would you like to move the other songs in this album to Various Artists as "
+"Would you like to move the other songs on this album to Various Artists as "
 "well?"
-msgstr "Chcete další písně na tomto albu přesunout do Různí umělci?"
+msgstr ""
 
 #: core/mainwindow.cpp:2651
 msgid "Would you like to run a full rescan right now?"
@@ -4714,7 +4718,7 @@ msgstr "Chcete spustit toto úplné nové prohledání hned teď?"
 msgid "Write metadata when saving playlists"
 msgstr "Zapisovat metadata při ukládání seznamů skladeb"
 
-#: collection/savedgroupingmanager.cpp:102 playlist/playlist.cpp:1173
+#: collection/savedgroupingmanager.cpp:109 playlist/playlist.cpp:1173
 #: organize/organizedialog.cpp:108 ../build/src/ui_groupbydialog.h:191
 #: ../build/src/ui_groupbydialog.h:213 ../build/src/ui_groupbydialog.h:235
 #: ../build/src/ui_edittagdialog.h:690
@@ -4722,12 +4726,12 @@ msgstr "Zapisovat metadata při ukládání seznamů skladeb"
 msgid "Year"
 msgstr "Rok"
 
-#: collection/savedgroupingmanager.cpp:105 ../build/src/ui_groupbydialog.h:192
+#: collection/savedgroupingmanager.cpp:94 ../build/src/ui_groupbydialog.h:192
 #: ../build/src/ui_groupbydialog.h:214 ../build/src/ui_groupbydialog.h:236
 msgid "Year - Album"
 msgstr "Rok - Album"
 
-#: collection/savedgroupingmanager.cpp:108 ../build/src/ui_groupbydialog.h:193
+#: collection/savedgroupingmanager.cpp:97 ../build/src/ui_groupbydialog.h:193
 #: ../build/src/ui_groupbydialog.h:215 ../build/src/ui_groupbydialog.h:237
 msgid "Year - Album - Disc"
 msgstr "Rok - Album - Disk"
diff --git a/src/translations/de.po b/src/translations/de.po
index 93552351e..62053ee83 100644
--- a/src/translations/de.po
+++ b/src/translations/de.po
@@ -710,7 +710,7 @@ msgstr "Heute hinzugefügt"
 msgid "Added within three months"
 msgstr "In den letzten drei Monaten hinzugefügt"
 
-#: collection/collectionfilterwidget.cpp:229
+#: collection/collectionfilterwidget.cpp:241
 msgid "Advanced grouping..."
 msgstr "Erweiterte Sortierung …"
 
@@ -722,7 +722,7 @@ msgstr "Nach dem Kopieren …"
 msgid "Albu&m cover"
 msgstr "Albu&m cover"
 
-#: core/qtsystemtrayicon.cpp:259 collection/savedgroupingmanager.cpp:87
+#: core/qtsystemtrayicon.cpp:259 collection/savedgroupingmanager.cpp:88
 #: playlist/playlist.cpp:1169 organize/organizedialog.cpp:99
 #: ../build/src/ui_groupbydialog.h:186 ../build/src/ui_groupbydialog.h:208
 #: ../build/src/ui_groupbydialog.h:230 ../build/src/ui_albumcoversearcher.h:110
@@ -737,12 +737,12 @@ msgstr "Album"
 msgid "Album (ideal loudness for all tracks)"
 msgstr "Album (idealer Pegel für alle Titel)"
 
-#: collection/savedgroupingmanager.cpp:90 ../build/src/ui_groupbydialog.h:187
+#: collection/savedgroupingmanager.cpp:91 ../build/src/ui_groupbydialog.h:187
 #: ../build/src/ui_groupbydialog.h:209 ../build/src/ui_groupbydialog.h:231
 msgid "Album - Disc"
 msgstr "Album - Disc"
 
-#: collection/savedgroupingmanager.cpp:84 playlist/playlist.cpp:1176
+#: collection/savedgroupingmanager.cpp:82 playlist/playlist.cpp:1176
 #: organize/organizedialog.cpp:102 ../build/src/ui_groupbydialog.h:185
 #: ../build/src/ui_groupbydialog.h:207 ../build/src/ui_groupbydialog.h:229
 #: ../build/src/ui_edittagdialog.h:685
@@ -869,7 +869,7 @@ msgstr ""
 msgid "Are you sure you want to reset this song's statistics?"
 msgstr "Wollen Sie die Statistiken dieses Titels wirklich zurücksetzen?"
 
-#: core/qtsystemtrayicon.cpp:257 collection/savedgroupingmanager.cpp:81
+#: core/qtsystemtrayicon.cpp:257 collection/savedgroupingmanager.cpp:85
 #: playlist/playlist.cpp:1168 organize/organizedialog.cpp:100
 #: ../build/src/ui_groupbydialog.h:184 ../build/src/ui_groupbydialog.h:206
 #: ../build/src/ui_groupbydialog.h:228 ../build/src/ui_albumcoversearcher.h:106
@@ -1006,7 +1006,7 @@ msgstr "Verhalten"
 msgid "Best"
 msgstr "Optimal"
 
-#: context/contextview.cpp:216 collection/savedgroupingmanager.cpp:132
+#: context/contextview.cpp:216 collection/savedgroupingmanager.cpp:136
 #: playlist/playlist.cpp:1186 organize/organizedialog.cpp:115
 #: ../build/src/ui_groupbydialog.h:201 ../build/src/ui_groupbydialog.h:223
 #: ../build/src/ui_groupbydialog.h:245 ../build/src/ui_edittagdialog.h:671
@@ -1017,7 +1017,7 @@ msgstr "Bit-Tiefe"
 msgid "Bit rate"
 msgstr "Bitrate"
 
-#: context/contextview.cpp:217 collection/savedgroupingmanager.cpp:135
+#: context/contextview.cpp:217 collection/savedgroupingmanager.cpp:139
 #: playlist/playlist.cpp:1187 ../build/src/ui_groupbydialog.h:202
 #: ../build/src/ui_groupbydialog.h:224 ../build/src/ui_groupbydialog.h:246
 #: ../build/src/ui_transcoderoptionsaac.h:128
@@ -1243,7 +1243,7 @@ msgstr "Schlagworte automatisch vervollständigen"
 msgid "Complete tags automatically..."
 msgstr "Schlagworte automatisch vervollständigen …"
 
-#: collection/savedgroupingmanager.cpp:117 playlist/playlist.cpp:1177
+#: collection/savedgroupingmanager.cpp:118 playlist/playlist.cpp:1177
 #: organize/organizedialog.cpp:103 ../build/src/ui_groupbydialog.h:196
 #: ../build/src/ui_groupbydialog.h:218 ../build/src/ui_groupbydialog.h:240
 #: ../build/src/ui_edittagdialog.h:686
@@ -1621,7 +1621,7 @@ msgctxt "Refers to a disabled notification type in Notification settings."
 msgid "Disabled"
 msgstr "Deaktiviert"
 
-#: collection/savedgroupingmanager.cpp:93 playlist/playlist.cpp:1171
+#: collection/savedgroupingmanager.cpp:106 playlist/playlist.cpp:1171
 #: organize/organizedialog.cpp:107 ../build/src/ui_groupbydialog.h:188
 #: ../build/src/ui_groupbydialog.h:210 ../build/src/ui_groupbydialog.h:232
 #: ../build/src/ui_edittagdialog.h:684
@@ -2028,7 +2028,7 @@ msgstr "Dateipfade"
 msgid "File size"
 msgstr "Dateigröße"
 
-#: collection/savedgroupingmanager.cpp:126 playlist/playlist.cpp:1192
+#: collection/savedgroupingmanager.cpp:127 playlist/playlist.cpp:1192
 #: ../build/src/ui_groupbydialog.h:199 ../build/src/ui_groupbydialog.h:221
 #: ../build/src/ui_groupbydialog.h:243 ../build/src/ui_edittagdialog.h:673
 msgid "File type"
@@ -2122,7 +2122,7 @@ msgstr ""
 msgid "Form"
 msgstr "Formular"
 
-#: collection/savedgroupingmanager.cpp:96 ../build/src/ui_groupbydialog.h:189
+#: collection/savedgroupingmanager.cpp:130 ../build/src/ui_groupbydialog.h:189
 #: ../build/src/ui_groupbydialog.h:211 ../build/src/ui_groupbydialog.h:233
 msgid "Format"
 msgstr "Format"
@@ -2163,7 +2163,7 @@ msgstr "Allgemeine Einstellungen"
 msgid "Genius Authentication"
 msgstr "Genius Authentifizierung"
 
-#: collection/savedgroupingmanager.cpp:99 playlist/playlist.cpp:1175
+#: collection/savedgroupingmanager.cpp:115 playlist/playlist.cpp:1175
 #: organize/organizedialog.cpp:110 ../build/src/ui_groupbydialog.h:190
 #: ../build/src/ui_groupbydialog.h:212 ../build/src/ui_groupbydialog.h:234
 #: ../build/src/ui_edittagdialog.h:680
@@ -2262,18 +2262,18 @@ msgstr "Gruppe nach Genre/Album Künstler/Album"
 msgid "Group by Genre/Artist/Album"
 msgstr "Genre/Interpret/Album"
 
-#: collection/savedgroupingmanager.cpp:123 playlist/playlist.cpp:1179
+#: collection/savedgroupingmanager.cpp:124 playlist/playlist.cpp:1179
 #: organize/organizedialog.cpp:105 ../build/src/ui_groupbydialog.h:198
 #: ../build/src/ui_groupbydialog.h:220 ../build/src/ui_groupbydialog.h:242
 #: ../build/src/ui_edittagdialog.h:682
 msgid "Grouping"
 msgstr "Sortierung"
 
-#: collection/collectionfilterwidget.cpp:250
+#: collection/collectionfilterwidget.cpp:262
 msgid "Grouping Name"
 msgstr "Sortiername"
 
-#: collection/collectionfilterwidget.cpp:250
+#: collection/collectionfilterwidget.cpp:262
 msgid "Grouping name:"
 msgstr "Sortiername:"
 
@@ -2543,7 +2543,7 @@ msgstr "MTP-Gerät wird geladen"
 msgid "Loading iPod database"
 msgstr "iPod-Datenbank wird geladen"
 
-#: collection/collectionmodel.cpp:214
+#: collection/collectionmodel.cpp:210
 msgid "Loading songs"
 msgstr "Titel werden geladen"
 
@@ -2555,7 +2555,7 @@ msgstr "Titel werden geladen"
 msgid "Loading tracks info"
 msgstr "Titelinfo wird geladen"
 
-#: collection/collectionmodel.cpp:207 ../build/src/ui_organizedialog.h:281
+#: collection/collectionmodel.cpp:203 ../build/src/ui_organizedialog.h:281
 msgid "Loading..."
 msgstr "Wird geladen …"
 
@@ -2837,7 +2837,7 @@ msgstr "Keine kurzen Blöcke"
 msgid "No song playing"
 msgstr "Kein Lied wird gespielt"
 
-#: collection/savedgroupingmanager.cpp:78 ../build/src/ui_groupbydialog.h:183
+#: collection/savedgroupingmanager.cpp:79 ../build/src/ui_groupbydialog.h:183
 #: ../build/src/ui_groupbydialog.h:205 ../build/src/ui_groupbydialog.h:227
 msgid "None"
 msgstr "Nichts"
@@ -2974,17 +2974,21 @@ msgstr ""
 msgid "Original tags"
 msgstr "Ursprüngliche Schlagworte"
 
-#: collection/savedgroupingmanager.cpp:111 playlist/playlist.cpp:1174
+#: collection/savedgroupingmanager.cpp:112 playlist/playlist.cpp:1174
 #: organize/organizedialog.cpp:109 ../build/src/ui_groupbydialog.h:194
 #: ../build/src/ui_groupbydialog.h:216 ../build/src/ui_groupbydialog.h:238
 msgid "Original year"
 msgstr "Ursprüngliches Jahr"
 
-#: collection/savedgroupingmanager.cpp:114 ../build/src/ui_groupbydialog.h:195
+#: collection/savedgroupingmanager.cpp:100 ../build/src/ui_groupbydialog.h:195
 #: ../build/src/ui_groupbydialog.h:217 ../build/src/ui_groupbydialog.h:239
 msgid "Original year - Album"
 msgstr "Ursprüngliches Jahr - Album"
 
+#: collection/savedgroupingmanager.cpp:103
+msgid "Original year - Album - Disc"
+msgstr ""
+
 #: core/commandlineoptions.cpp:183
 msgid "Other options"
 msgstr "Weitere Optionen"
@@ -3042,7 +3046,7 @@ msgstr "Wiedergabe pausieren"
 msgid "Paused"
 msgstr "Pausiert"
 
-#: collection/savedgroupingmanager.cpp:120 playlist/playlist.cpp:1178
+#: collection/savedgroupingmanager.cpp:121 playlist/playlist.cpp:1178
 #: organize/organizedialog.cpp:104 ../build/src/ui_groupbydialog.h:197
 #: ../build/src/ui_groupbydialog.h:219 ../build/src/ui_groupbydialog.h:241
 #: ../build/src/ui_edittagdialog.h:691
@@ -3578,7 +3582,7 @@ msgstr "Gerät sicher entfernen"
 msgid "Safely remove the device after copying"
 msgstr "Das Gerät nach dem Kopiervorgang sicher entfernen"
 
-#: collection/savedgroupingmanager.cpp:129 playlist/playlist.cpp:1185
+#: collection/savedgroupingmanager.cpp:133 playlist/playlist.cpp:1185
 #: organize/organizedialog.cpp:114 ../build/src/ui_groupbydialog.h:200
 #: ../build/src/ui_groupbydialog.h:222 ../build/src/ui_groupbydialog.h:244
 #: ../build/src/ui_edittagdialog.h:670
@@ -4488,10 +4492,10 @@ msgid "Ultra wide band (UWB)"
 msgstr "Ulte Weit Band (UWB)"
 
 #: core/song.cpp:538 context/contextalbumsmodel.cpp:357
-#: collection/collectionmodel.cpp:433 collection/collectionmodel.cpp:438
-#: collection/collectionmodel.cpp:442 collection/collectionmodel.cpp:446
-#: collection/collectionmodel.cpp:450 collection/collectionmodel.cpp:1407
-#: collection/savedgroupingmanager.cpp:137 playlist/playlistdelegates.cpp:353
+#: collection/collectionmodel.cpp:461 collection/collectionmodel.cpp:466
+#: collection/collectionmodel.cpp:470 collection/collectionmodel.cpp:474
+#: collection/collectionmodel.cpp:478 collection/collectionmodel.cpp:1589
+#: collection/savedgroupingmanager.cpp:143 playlist/playlistdelegates.cpp:353
 #: playlist/playlistmanager.cpp:554 playlist/playlistmanager.cpp:555
 #: dialogs/edittagdialog.cpp:494 dialogs/edittagdialog.cpp:542
 #: ../build/src/ui_scrobblersettingspage.h:393
@@ -4652,9 +4656,9 @@ msgstr "Beim Hinzufügen eines Titels über das Kontextmenü …"
 msgid "Variable bit rate"
 msgstr "Variable Bitrate"
 
-#: collection/collectionmodel.cpp:347 playlist/playlistmanager.cpp:566
-#: covermanager/albumcovermanager.cpp:333 internet/internetsearchmodel.cpp:94
-#: internet/internetsearchmodel.cpp:106
+#: collection/collectionmodel.cpp:371 collection/collectionmodel.cpp:372
+#: playlist/playlistmanager.cpp:566 covermanager/albumcovermanager.cpp:333
+#: internet/internetsearchmodel.cpp:94 internet/internetsearchmodel.cpp:106
 msgid "Various artists"
 msgstr "Verschiedene Interpreten"
 
@@ -4734,11 +4738,9 @@ msgstr "Offline arbeiten (Nur im Speicher scrobbeln)"
 
 #: collection/collectionview.cpp:476
 msgid ""
-"Would you like to move the other songs in this album to Various Artists as "
+"Would you like to move the other songs on this album to Various Artists as "
 "well?"
 msgstr ""
-"Möchten Sie die anderen Titel dieses Albums ebenfalls unter »Verschiedene "
-"Interpreten« anzeigen?"
 
 #: core/mainwindow.cpp:2651
 msgid "Would you like to run a full rescan right now?"
@@ -4748,7 +4750,7 @@ msgstr "Möchten Sie jetzt Ihre Musiksammlung erneut einlesen?"
 msgid "Write metadata when saving playlists"
 msgstr "Metadaten schreiben, wenn Wiedergabelisten gespeichert werden"
 
-#: collection/savedgroupingmanager.cpp:102 playlist/playlist.cpp:1173
+#: collection/savedgroupingmanager.cpp:109 playlist/playlist.cpp:1173
 #: organize/organizedialog.cpp:108 ../build/src/ui_groupbydialog.h:191
 #: ../build/src/ui_groupbydialog.h:213 ../build/src/ui_groupbydialog.h:235
 #: ../build/src/ui_edittagdialog.h:690
@@ -4756,12 +4758,12 @@ msgstr "Metadaten schreiben, wenn Wiedergabelisten gespeichert werden"
 msgid "Year"
 msgstr "Jahr"
 
-#: collection/savedgroupingmanager.cpp:105 ../build/src/ui_groupbydialog.h:192
+#: collection/savedgroupingmanager.cpp:94 ../build/src/ui_groupbydialog.h:192
 #: ../build/src/ui_groupbydialog.h:214 ../build/src/ui_groupbydialog.h:236
 msgid "Year - Album"
 msgstr "Jahr – Album"
 
-#: collection/savedgroupingmanager.cpp:108 ../build/src/ui_groupbydialog.h:193
+#: collection/savedgroupingmanager.cpp:97 ../build/src/ui_groupbydialog.h:193
 #: ../build/src/ui_groupbydialog.h:215 ../build/src/ui_groupbydialog.h:237
 msgid "Year - Album - Disc"
 msgstr "Jahr - Album - Disc"
diff --git a/src/translations/es.po b/src/translations/es.po
index 610d5469e..ae6ee4a76 100644
--- a/src/translations/es.po
+++ b/src/translations/es.po
@@ -702,7 +702,7 @@ msgstr "Añadidas hoy"
 msgid "Added within three months"
 msgstr "Añadidas en los últimos tres meses"
 
-#: collection/collectionfilterwidget.cpp:229
+#: collection/collectionfilterwidget.cpp:241
 msgid "Advanced grouping..."
 msgstr "Agrupamiento avanzado…"
 
@@ -714,7 +714,7 @@ msgstr "Después de copiar…"
 msgid "Albu&m cover"
 msgstr "&Portada del álbum"
 
-#: core/qtsystemtrayicon.cpp:259 collection/savedgroupingmanager.cpp:87
+#: core/qtsystemtrayicon.cpp:259 collection/savedgroupingmanager.cpp:88
 #: playlist/playlist.cpp:1169 organize/organizedialog.cpp:99
 #: ../build/src/ui_groupbydialog.h:186 ../build/src/ui_groupbydialog.h:208
 #: ../build/src/ui_groupbydialog.h:230 ../build/src/ui_albumcoversearcher.h:110
@@ -729,12 +729,12 @@ msgstr "Álbum"
 msgid "Album (ideal loudness for all tracks)"
 msgstr "Álbum (volumen idóneo para todas las pistas)"
 
-#: collection/savedgroupingmanager.cpp:90 ../build/src/ui_groupbydialog.h:187
+#: collection/savedgroupingmanager.cpp:91 ../build/src/ui_groupbydialog.h:187
 #: ../build/src/ui_groupbydialog.h:209 ../build/src/ui_groupbydialog.h:231
 msgid "Album - Disc"
 msgstr "Álbum - Disco"
 
-#: collection/savedgroupingmanager.cpp:84 playlist/playlist.cpp:1176
+#: collection/savedgroupingmanager.cpp:82 playlist/playlist.cpp:1176
 #: organize/organizedialog.cpp:102 ../build/src/ui_groupbydialog.h:185
 #: ../build/src/ui_groupbydialog.h:207 ../build/src/ui_groupbydialog.h:229
 #: ../build/src/ui_edittagdialog.h:685
@@ -860,7 +860,7 @@ msgstr "¿Seguro que deseas eliminar el ajuste predefinido «%1»?"
 msgid "Are you sure you want to reset this song's statistics?"
 msgstr "¿Seguro que deseas restablecer las estadísticas de esta canción?"
 
-#: core/qtsystemtrayicon.cpp:257 collection/savedgroupingmanager.cpp:81
+#: core/qtsystemtrayicon.cpp:257 collection/savedgroupingmanager.cpp:85
 #: playlist/playlist.cpp:1168 organize/organizedialog.cpp:100
 #: ../build/src/ui_groupbydialog.h:184 ../build/src/ui_groupbydialog.h:206
 #: ../build/src/ui_groupbydialog.h:228 ../build/src/ui_albumcoversearcher.h:106
@@ -997,7 +997,7 @@ msgstr "Comportamiento"
 msgid "Best"
 msgstr "Mejor"
 
-#: context/contextview.cpp:216 collection/savedgroupingmanager.cpp:132
+#: context/contextview.cpp:216 collection/savedgroupingmanager.cpp:136
 #: playlist/playlist.cpp:1186 organize/organizedialog.cpp:115
 #: ../build/src/ui_groupbydialog.h:201 ../build/src/ui_groupbydialog.h:223
 #: ../build/src/ui_groupbydialog.h:245 ../build/src/ui_edittagdialog.h:671
@@ -1008,7 +1008,7 @@ msgstr "Resolución"
 msgid "Bit rate"
 msgstr "Bit_rate"
 
-#: context/contextview.cpp:217 collection/savedgroupingmanager.cpp:135
+#: context/contextview.cpp:217 collection/savedgroupingmanager.cpp:139
 #: playlist/playlist.cpp:1187 ../build/src/ui_groupbydialog.h:202
 #: ../build/src/ui_groupbydialog.h:224 ../build/src/ui_groupbydialog.h:246
 #: ../build/src/ui_transcoderoptionsaac.h:128
@@ -1235,7 +1235,7 @@ msgstr "Completar etiquetas automáticamente"
 msgid "Complete tags automatically..."
 msgstr "Completar etiquetas automáticamente"
 
-#: collection/savedgroupingmanager.cpp:117 playlist/playlist.cpp:1177
+#: collection/savedgroupingmanager.cpp:118 playlist/playlist.cpp:1177
 #: organize/organizedialog.cpp:103 ../build/src/ui_groupbydialog.h:196
 #: ../build/src/ui_groupbydialog.h:218 ../build/src/ui_groupbydialog.h:240
 #: ../build/src/ui_edittagdialog.h:686
@@ -1613,7 +1613,7 @@ msgctxt "Refers to a disabled notification type in Notification settings."
 msgid "Disabled"
 msgstr "Desactivado"
 
-#: collection/savedgroupingmanager.cpp:93 playlist/playlist.cpp:1171
+#: collection/savedgroupingmanager.cpp:106 playlist/playlist.cpp:1171
 #: organize/organizedialog.cpp:107 ../build/src/ui_groupbydialog.h:188
 #: ../build/src/ui_groupbydialog.h:210 ../build/src/ui_groupbydialog.h:232
 #: ../build/src/ui_edittagdialog.h:684
@@ -2021,7 +2021,7 @@ msgstr "Rutas de archivos"
 msgid "File size"
 msgstr "Tamaño del archivo"
 
-#: collection/savedgroupingmanager.cpp:126 playlist/playlist.cpp:1192
+#: collection/savedgroupingmanager.cpp:127 playlist/playlist.cpp:1192
 #: ../build/src/ui_groupbydialog.h:199 ../build/src/ui_groupbydialog.h:221
 #: ../build/src/ui_groupbydialog.h:243 ../build/src/ui_edittagdialog.h:673
 msgid "File type"
@@ -2115,7 +2115,7 @@ msgstr ""
 msgid "Form"
 msgstr "Formulario"
 
-#: collection/savedgroupingmanager.cpp:96 ../build/src/ui_groupbydialog.h:189
+#: collection/savedgroupingmanager.cpp:130 ../build/src/ui_groupbydialog.h:189
 #: ../build/src/ui_groupbydialog.h:211 ../build/src/ui_groupbydialog.h:233
 msgid "Format"
 msgstr "Formato"
@@ -2156,7 +2156,7 @@ msgstr "Configuración general"
 msgid "Genius Authentication"
 msgstr "Autentificación Genius"
 
-#: collection/savedgroupingmanager.cpp:99 playlist/playlist.cpp:1175
+#: collection/savedgroupingmanager.cpp:115 playlist/playlist.cpp:1175
 #: organize/organizedialog.cpp:110 ../build/src/ui_groupbydialog.h:190
 #: ../build/src/ui_groupbydialog.h:212 ../build/src/ui_groupbydialog.h:234
 #: ../build/src/ui_edittagdialog.h:680
@@ -2259,18 +2259,18 @@ msgstr "Agrupar por Género/Ártista del álbum/Álbum"
 msgid "Group by Genre/Artist/Album"
 msgstr "Agrupar por Género/Artista/Álbum"
 
-#: collection/savedgroupingmanager.cpp:123 playlist/playlist.cpp:1179
+#: collection/savedgroupingmanager.cpp:124 playlist/playlist.cpp:1179
 #: organize/organizedialog.cpp:105 ../build/src/ui_groupbydialog.h:198
 #: ../build/src/ui_groupbydialog.h:220 ../build/src/ui_groupbydialog.h:242
 #: ../build/src/ui_edittagdialog.h:682
 msgid "Grouping"
 msgstr "Agrupamiento"
 
-#: collection/collectionfilterwidget.cpp:250
+#: collection/collectionfilterwidget.cpp:262
 msgid "Grouping Name"
 msgstr "Nombre de agrupamiento"
 
-#: collection/collectionfilterwidget.cpp:250
+#: collection/collectionfilterwidget.cpp:262
 msgid "Grouping name:"
 msgstr "Nombre de agrupamiento:"
 
@@ -2540,7 +2540,7 @@ msgstr "Cargando el dispositivo MTP"
 msgid "Loading iPod database"
 msgstr "Cargando la base de datos del iPod"
 
-#: collection/collectionmodel.cpp:214
+#: collection/collectionmodel.cpp:210
 msgid "Loading songs"
 msgstr "Cargando pistas"
 
@@ -2552,7 +2552,7 @@ msgstr "Cargando pistas"
 msgid "Loading tracks info"
 msgstr "Cargando información de pistas"
 
-#: collection/collectionmodel.cpp:207 ../build/src/ui_organizedialog.h:281
+#: collection/collectionmodel.cpp:203 ../build/src/ui_organizedialog.h:281
 msgid "Loading..."
 msgstr "Cargando…"
 
@@ -2834,7 +2834,7 @@ msgstr "Sin bloques cortos"
 msgid "No song playing"
 msgstr "Nada en reproducción"
 
-#: collection/savedgroupingmanager.cpp:78 ../build/src/ui_groupbydialog.h:183
+#: collection/savedgroupingmanager.cpp:79 ../build/src/ui_groupbydialog.h:183
 #: ../build/src/ui_groupbydialog.h:205 ../build/src/ui_groupbydialog.h:227
 msgid "None"
 msgstr "Ninguno"
@@ -2971,17 +2971,21 @@ msgstr "Organizardo archivos"
 msgid "Original tags"
 msgstr "Etiquetas originales"
 
-#: collection/savedgroupingmanager.cpp:111 playlist/playlist.cpp:1174
+#: collection/savedgroupingmanager.cpp:112 playlist/playlist.cpp:1174
 #: organize/organizedialog.cpp:109 ../build/src/ui_groupbydialog.h:194
 #: ../build/src/ui_groupbydialog.h:216 ../build/src/ui_groupbydialog.h:238
 msgid "Original year"
 msgstr "Año original"
 
-#: collection/savedgroupingmanager.cpp:114 ../build/src/ui_groupbydialog.h:195
+#: collection/savedgroupingmanager.cpp:100 ../build/src/ui_groupbydialog.h:195
 #: ../build/src/ui_groupbydialog.h:217 ../build/src/ui_groupbydialog.h:239
 msgid "Original year - Album"
 msgstr "Año original - Álbum"
 
+#: collection/savedgroupingmanager.cpp:103
+msgid "Original year - Album - Disc"
+msgstr ""
+
 #: core/commandlineoptions.cpp:183
 msgid "Other options"
 msgstr "Otras opciones"
@@ -3039,7 +3043,7 @@ msgstr "Pausar la reproducción"
 msgid "Paused"
 msgstr "En pausa"
 
-#: collection/savedgroupingmanager.cpp:120 playlist/playlist.cpp:1178
+#: collection/savedgroupingmanager.cpp:121 playlist/playlist.cpp:1178
 #: organize/organizedialog.cpp:104 ../build/src/ui_groupbydialog.h:197
 #: ../build/src/ui_groupbydialog.h:219 ../build/src/ui_groupbydialog.h:241
 #: ../build/src/ui_edittagdialog.h:691
@@ -3571,7 +3575,7 @@ msgstr "Quitar dispositivo con seguridad"
 msgid "Safely remove the device after copying"
 msgstr "Quitar dispositivo con seguridad después de copiar"
 
-#: collection/savedgroupingmanager.cpp:129 playlist/playlist.cpp:1185
+#: collection/savedgroupingmanager.cpp:133 playlist/playlist.cpp:1185
 #: organize/organizedialog.cpp:114 ../build/src/ui_groupbydialog.h:200
 #: ../build/src/ui_groupbydialog.h:222 ../build/src/ui_groupbydialog.h:244
 #: ../build/src/ui_edittagdialog.h:670
@@ -4477,10 +4481,10 @@ msgid "Ultra wide band (UWB)"
 msgstr "Banda ultraancha (UWB)"
 
 #: core/song.cpp:538 context/contextalbumsmodel.cpp:357
-#: collection/collectionmodel.cpp:433 collection/collectionmodel.cpp:438
-#: collection/collectionmodel.cpp:442 collection/collectionmodel.cpp:446
-#: collection/collectionmodel.cpp:450 collection/collectionmodel.cpp:1407
-#: collection/savedgroupingmanager.cpp:137 playlist/playlistdelegates.cpp:353
+#: collection/collectionmodel.cpp:461 collection/collectionmodel.cpp:466
+#: collection/collectionmodel.cpp:470 collection/collectionmodel.cpp:474
+#: collection/collectionmodel.cpp:478 collection/collectionmodel.cpp:1589
+#: collection/savedgroupingmanager.cpp:143 playlist/playlistdelegates.cpp:353
 #: playlist/playlistmanager.cpp:554 playlist/playlistmanager.cpp:555
 #: dialogs/edittagdialog.cpp:494 dialogs/edittagdialog.cpp:542
 #: ../build/src/ui_scrobblersettingspage.h:393
@@ -4642,9 +4646,9 @@ msgstr "Al usar el menú para añadir una canción…"
 msgid "Variable bit rate"
 msgstr "Tasa de bits variable"
 
-#: collection/collectionmodel.cpp:347 playlist/playlistmanager.cpp:566
-#: covermanager/albumcovermanager.cpp:333 internet/internetsearchmodel.cpp:94
-#: internet/internetsearchmodel.cpp:106
+#: collection/collectionmodel.cpp:371 collection/collectionmodel.cpp:372
+#: playlist/playlistmanager.cpp:566 covermanager/albumcovermanager.cpp:333
+#: internet/internetsearchmodel.cpp:94 internet/internetsearchmodel.cpp:106
 msgid "Various artists"
 msgstr "Varios artistas"
 
@@ -4722,11 +4726,9 @@ msgstr "Trabajar fuera de línea (solo registros de reproducción en caché)"
 
 #: collection/collectionview.cpp:476
 msgid ""
-"Would you like to move the other songs in this album to Various Artists as "
+"Would you like to move the other songs on this album to Various Artists as "
 "well?"
 msgstr ""
-"¿Te gustaría mover también el resto de temas de este álbum a Varios "
-"artistas?"
 
 #: core/mainwindow.cpp:2651
 msgid "Would you like to run a full rescan right now?"
@@ -4736,7 +4738,7 @@ msgstr "¿Quieres ejecutar un nuevo análisis completo ahora?"
 msgid "Write metadata when saving playlists"
 msgstr "Escribir los metadatos al guardar las listas de reproducción"
 
-#: collection/savedgroupingmanager.cpp:102 playlist/playlist.cpp:1173
+#: collection/savedgroupingmanager.cpp:109 playlist/playlist.cpp:1173
 #: organize/organizedialog.cpp:108 ../build/src/ui_groupbydialog.h:191
 #: ../build/src/ui_groupbydialog.h:213 ../build/src/ui_groupbydialog.h:235
 #: ../build/src/ui_edittagdialog.h:690
@@ -4744,12 +4746,12 @@ msgstr "Escribir los metadatos al guardar las listas de reproducción"
 msgid "Year"
 msgstr "Año"
 
-#: collection/savedgroupingmanager.cpp:105 ../build/src/ui_groupbydialog.h:192
+#: collection/savedgroupingmanager.cpp:94 ../build/src/ui_groupbydialog.h:192
 #: ../build/src/ui_groupbydialog.h:214 ../build/src/ui_groupbydialog.h:236
 msgid "Year - Album"
 msgstr "Año - Álbum"
 
-#: collection/savedgroupingmanager.cpp:108 ../build/src/ui_groupbydialog.h:193
+#: collection/savedgroupingmanager.cpp:97 ../build/src/ui_groupbydialog.h:193
 #: ../build/src/ui_groupbydialog.h:215 ../build/src/ui_groupbydialog.h:237
 msgid "Year - Album - Disc"
 msgstr "Año - Álbum - Disco"
diff --git a/src/translations/fr.po b/src/translations/fr.po
index df7eab6c5..929089fb3 100644
--- a/src/translations/fr.po
+++ b/src/translations/fr.po
@@ -710,7 +710,7 @@ msgstr "Ajouté aujourd'hui"
 msgid "Added within three months"
 msgstr "Ajouté au cours des 3 derniers mois"
 
-#: collection/collectionfilterwidget.cpp:229
+#: collection/collectionfilterwidget.cpp:241
 msgid "Advanced grouping..."
 msgstr "Groupement avancé..."
 
@@ -722,7 +722,7 @@ msgstr "Après avoir copié..."
 msgid "Albu&m cover"
 msgstr "&Pochette de l'album"
 
-#: core/qtsystemtrayicon.cpp:259 collection/savedgroupingmanager.cpp:87
+#: core/qtsystemtrayicon.cpp:259 collection/savedgroupingmanager.cpp:88
 #: playlist/playlist.cpp:1169 organize/organizedialog.cpp:99
 #: ../build/src/ui_groupbydialog.h:186 ../build/src/ui_groupbydialog.h:208
 #: ../build/src/ui_groupbydialog.h:230 ../build/src/ui_albumcoversearcher.h:110
@@ -737,12 +737,12 @@ msgstr "Album"
 msgid "Album (ideal loudness for all tracks)"
 msgstr "Album (volume idéal pour toutes les pistes)"
 
-#: collection/savedgroupingmanager.cpp:90 ../build/src/ui_groupbydialog.h:187
+#: collection/savedgroupingmanager.cpp:91 ../build/src/ui_groupbydialog.h:187
 #: ../build/src/ui_groupbydialog.h:209 ../build/src/ui_groupbydialog.h:231
 msgid "Album - Disc"
 msgstr "Album - CD"
 
-#: collection/savedgroupingmanager.cpp:84 playlist/playlist.cpp:1176
+#: collection/savedgroupingmanager.cpp:82 playlist/playlist.cpp:1176
 #: organize/organizedialog.cpp:102 ../build/src/ui_groupbydialog.h:185
 #: ../build/src/ui_groupbydialog.h:207 ../build/src/ui_groupbydialog.h:229
 #: ../build/src/ui_edittagdialog.h:685
@@ -871,7 +871,7 @@ msgid "Are you sure you want to reset this song's statistics?"
 msgstr ""
 "Êtes vous sûr(e) de vouloir réinitialiser les statistiques de ce morceau ?"
 
-#: core/qtsystemtrayicon.cpp:257 collection/savedgroupingmanager.cpp:81
+#: core/qtsystemtrayicon.cpp:257 collection/savedgroupingmanager.cpp:85
 #: playlist/playlist.cpp:1168 organize/organizedialog.cpp:100
 #: ../build/src/ui_groupbydialog.h:184 ../build/src/ui_groupbydialog.h:206
 #: ../build/src/ui_groupbydialog.h:228 ../build/src/ui_albumcoversearcher.h:106
@@ -1009,7 +1009,7 @@ msgstr "Comportement"
 msgid "Best"
 msgstr "Meilleur"
 
-#: context/contextview.cpp:216 collection/savedgroupingmanager.cpp:132
+#: context/contextview.cpp:216 collection/savedgroupingmanager.cpp:136
 #: playlist/playlist.cpp:1186 organize/organizedialog.cpp:115
 #: ../build/src/ui_groupbydialog.h:201 ../build/src/ui_groupbydialog.h:223
 #: ../build/src/ui_groupbydialog.h:245 ../build/src/ui_edittagdialog.h:671
@@ -1020,7 +1020,7 @@ msgstr "Codage en bit"
 msgid "Bit rate"
 msgstr "Débit"
 
-#: context/contextview.cpp:217 collection/savedgroupingmanager.cpp:135
+#: context/contextview.cpp:217 collection/savedgroupingmanager.cpp:139
 #: playlist/playlist.cpp:1187 ../build/src/ui_groupbydialog.h:202
 #: ../build/src/ui_groupbydialog.h:224 ../build/src/ui_groupbydialog.h:246
 #: ../build/src/ui_transcoderoptionsaac.h:128
@@ -1250,7 +1250,7 @@ msgstr "Compléter les tags automatiquement"
 msgid "Complete tags automatically..."
 msgstr "Compléter les tags automatiquement..."
 
-#: collection/savedgroupingmanager.cpp:117 playlist/playlist.cpp:1177
+#: collection/savedgroupingmanager.cpp:118 playlist/playlist.cpp:1177
 #: organize/organizedialog.cpp:103 ../build/src/ui_groupbydialog.h:196
 #: ../build/src/ui_groupbydialog.h:218 ../build/src/ui_groupbydialog.h:240
 #: ../build/src/ui_edittagdialog.h:686
@@ -1629,7 +1629,7 @@ msgctxt "Refers to a disabled notification type in Notification settings."
 msgid "Disabled"
 msgstr "Désactivé"
 
-#: collection/savedgroupingmanager.cpp:93 playlist/playlist.cpp:1171
+#: collection/savedgroupingmanager.cpp:106 playlist/playlist.cpp:1171
 #: organize/organizedialog.cpp:107 ../build/src/ui_groupbydialog.h:188
 #: ../build/src/ui_groupbydialog.h:210 ../build/src/ui_groupbydialog.h:232
 #: ../build/src/ui_edittagdialog.h:684
@@ -2040,7 +2040,7 @@ msgstr "Emplacements des fichiers"
 msgid "File size"
 msgstr "Taille du fichier"
 
-#: collection/savedgroupingmanager.cpp:126 playlist/playlist.cpp:1192
+#: collection/savedgroupingmanager.cpp:127 playlist/playlist.cpp:1192
 #: ../build/src/ui_groupbydialog.h:199 ../build/src/ui_groupbydialog.h:221
 #: ../build/src/ui_groupbydialog.h:243 ../build/src/ui_edittagdialog.h:673
 msgid "File type"
@@ -2135,7 +2135,7 @@ msgstr ""
 msgid "Form"
 msgstr "Forme"
 
-#: collection/savedgroupingmanager.cpp:96 ../build/src/ui_groupbydialog.h:189
+#: collection/savedgroupingmanager.cpp:130 ../build/src/ui_groupbydialog.h:189
 #: ../build/src/ui_groupbydialog.h:211 ../build/src/ui_groupbydialog.h:233
 msgid "Format"
 msgstr "Format"
@@ -2176,7 +2176,7 @@ msgstr "Configuration générale"
 msgid "Genius Authentication"
 msgstr "Authentification Genius"
 
-#: collection/savedgroupingmanager.cpp:99 playlist/playlist.cpp:1175
+#: collection/savedgroupingmanager.cpp:115 playlist/playlist.cpp:1175
 #: organize/organizedialog.cpp:110 ../build/src/ui_groupbydialog.h:190
 #: ../build/src/ui_groupbydialog.h:212 ../build/src/ui_groupbydialog.h:234
 #: ../build/src/ui_edittagdialog.h:680
@@ -2275,18 +2275,18 @@ msgstr "Grouper par Genre/Artiste d'album/Album"
 msgid "Group by Genre/Artist/Album"
 msgstr "Grouper par Genre/Artiste/Album"
 
-#: collection/savedgroupingmanager.cpp:123 playlist/playlist.cpp:1179
+#: collection/savedgroupingmanager.cpp:124 playlist/playlist.cpp:1179
 #: organize/organizedialog.cpp:105 ../build/src/ui_groupbydialog.h:198
 #: ../build/src/ui_groupbydialog.h:220 ../build/src/ui_groupbydialog.h:242
 #: ../build/src/ui_edittagdialog.h:682
 msgid "Grouping"
 msgstr "Groupement"
 
-#: collection/collectionfilterwidget.cpp:250
+#: collection/collectionfilterwidget.cpp:262
 msgid "Grouping Name"
 msgstr "Nom du regroupement"
 
-#: collection/collectionfilterwidget.cpp:250
+#: collection/collectionfilterwidget.cpp:262
 msgid "Grouping name:"
 msgstr "Nom du regroupement :"
 
@@ -2555,7 +2555,7 @@ msgstr "Chargement du périphérique MTP"
 msgid "Loading iPod database"
 msgstr "Chargement de la base de données iPod"
 
-#: collection/collectionmodel.cpp:214
+#: collection/collectionmodel.cpp:210
 msgid "Loading songs"
 msgstr "Chargement des morceaux"
 
@@ -2567,7 +2567,7 @@ msgstr "Chargement des pistes"
 msgid "Loading tracks info"
 msgstr "Chargement des info des pistes"
 
-#: collection/collectionmodel.cpp:207 ../build/src/ui_organizedialog.h:281
+#: collection/collectionmodel.cpp:203 ../build/src/ui_organizedialog.h:281
 msgid "Loading..."
 msgstr "Chargement..."
 
@@ -2854,7 +2854,7 @@ msgstr "Aucun bloc court"
 msgid "No song playing"
 msgstr "Aucun morceau en cours de lecture"
 
-#: collection/savedgroupingmanager.cpp:78 ../build/src/ui_groupbydialog.h:183
+#: collection/savedgroupingmanager.cpp:79 ../build/src/ui_groupbydialog.h:183
 #: ../build/src/ui_groupbydialog.h:205 ../build/src/ui_groupbydialog.h:227
 msgid "None"
 msgstr "Aucun"
@@ -2992,17 +2992,21 @@ msgstr "Organisation des fichiers"
 msgid "Original tags"
 msgstr "Tags originaux"
 
-#: collection/savedgroupingmanager.cpp:111 playlist/playlist.cpp:1174
+#: collection/savedgroupingmanager.cpp:112 playlist/playlist.cpp:1174
 #: organize/organizedialog.cpp:109 ../build/src/ui_groupbydialog.h:194
 #: ../build/src/ui_groupbydialog.h:216 ../build/src/ui_groupbydialog.h:238
 msgid "Original year"
 msgstr "Année d'origine"
 
-#: collection/savedgroupingmanager.cpp:114 ../build/src/ui_groupbydialog.h:195
+#: collection/savedgroupingmanager.cpp:100 ../build/src/ui_groupbydialog.h:195
 #: ../build/src/ui_groupbydialog.h:217 ../build/src/ui_groupbydialog.h:239
 msgid "Original year - Album"
 msgstr "Année d'origine - Album"
 
+#: collection/savedgroupingmanager.cpp:103
+msgid "Original year - Album - Disc"
+msgstr ""
+
 #: core/commandlineoptions.cpp:183
 msgid "Other options"
 msgstr "Autres options"
@@ -3060,7 +3064,7 @@ msgstr "Mettre la lecture en pause"
 msgid "Paused"
 msgstr "En pause"
 
-#: collection/savedgroupingmanager.cpp:120 playlist/playlist.cpp:1178
+#: collection/savedgroupingmanager.cpp:121 playlist/playlist.cpp:1178
 #: organize/organizedialog.cpp:104 ../build/src/ui_groupbydialog.h:197
 #: ../build/src/ui_groupbydialog.h:219 ../build/src/ui_groupbydialog.h:241
 #: ../build/src/ui_edittagdialog.h:691
@@ -3599,7 +3603,7 @@ msgstr "Enlever le périphérique en toute sécurité"
 msgid "Safely remove the device after copying"
 msgstr "Enlever le périphérique en toute sécurité à la fin de la copie"
 
-#: collection/savedgroupingmanager.cpp:129 playlist/playlist.cpp:1185
+#: collection/savedgroupingmanager.cpp:133 playlist/playlist.cpp:1185
 #: organize/organizedialog.cpp:114 ../build/src/ui_groupbydialog.h:200
 #: ../build/src/ui_groupbydialog.h:222 ../build/src/ui_groupbydialog.h:244
 #: ../build/src/ui_edittagdialog.h:670
@@ -4511,10 +4515,10 @@ msgid "Ultra wide band (UWB)"
 msgstr "Très large bande (UWB)"
 
 #: core/song.cpp:538 context/contextalbumsmodel.cpp:357
-#: collection/collectionmodel.cpp:433 collection/collectionmodel.cpp:438
-#: collection/collectionmodel.cpp:442 collection/collectionmodel.cpp:446
-#: collection/collectionmodel.cpp:450 collection/collectionmodel.cpp:1407
-#: collection/savedgroupingmanager.cpp:137 playlist/playlistdelegates.cpp:353
+#: collection/collectionmodel.cpp:461 collection/collectionmodel.cpp:466
+#: collection/collectionmodel.cpp:470 collection/collectionmodel.cpp:474
+#: collection/collectionmodel.cpp:478 collection/collectionmodel.cpp:1589
+#: collection/savedgroupingmanager.cpp:143 playlist/playlistdelegates.cpp:353
 #: playlist/playlistmanager.cpp:554 playlist/playlistmanager.cpp:555
 #: dialogs/edittagdialog.cpp:494 dialogs/edittagdialog.cpp:542
 #: ../build/src/ui_scrobblersettingspage.h:393
@@ -4675,9 +4679,9 @@ msgstr "Utiliser le menu pour ajouter un morceau aura comme effet de..."
 msgid "Variable bit rate"
 msgstr "Débit variable"
 
-#: collection/collectionmodel.cpp:347 playlist/playlistmanager.cpp:566
-#: covermanager/albumcovermanager.cpp:333 internet/internetsearchmodel.cpp:94
-#: internet/internetsearchmodel.cpp:106
+#: collection/collectionmodel.cpp:371 collection/collectionmodel.cpp:372
+#: playlist/playlistmanager.cpp:566 covermanager/albumcovermanager.cpp:333
+#: internet/internetsearchmodel.cpp:94 internet/internetsearchmodel.cpp:106
 msgid "Various artists"
 msgstr "Compilations d'artistes"
 
@@ -4761,11 +4765,9 @@ msgstr "Travailler en mode hors connexion (uniquement scrobbles en cache)"
 
 #: collection/collectionview.cpp:476
 msgid ""
-"Would you like to move the other songs in this album to Various Artists as "
+"Would you like to move the other songs on this album to Various Artists as "
 "well?"
 msgstr ""
-"Voulez-vous aussi déplacer les autres morceaux de cet album dans la "
-"catégorie « Compilations d'artistes » ?"
 
 #: core/mainwindow.cpp:2651
 msgid "Would you like to run a full rescan right now?"
@@ -4777,7 +4779,7 @@ msgstr ""
 msgid "Write metadata when saving playlists"
 msgstr "Écrire des métadonnées lors de la sauvegarde des listes de lecture"
 
-#: collection/savedgroupingmanager.cpp:102 playlist/playlist.cpp:1173
+#: collection/savedgroupingmanager.cpp:109 playlist/playlist.cpp:1173
 #: organize/organizedialog.cpp:108 ../build/src/ui_groupbydialog.h:191
 #: ../build/src/ui_groupbydialog.h:213 ../build/src/ui_groupbydialog.h:235
 #: ../build/src/ui_edittagdialog.h:690
@@ -4785,12 +4787,12 @@ msgstr "Écrire des métadonnées lors de la sauvegarde des listes de lecture"
 msgid "Year"
 msgstr "Année"
 
-#: collection/savedgroupingmanager.cpp:105 ../build/src/ui_groupbydialog.h:192
+#: collection/savedgroupingmanager.cpp:94 ../build/src/ui_groupbydialog.h:192
 #: ../build/src/ui_groupbydialog.h:214 ../build/src/ui_groupbydialog.h:236
 msgid "Year - Album"
 msgstr "Année - Album"
 
-#: collection/savedgroupingmanager.cpp:108 ../build/src/ui_groupbydialog.h:193
+#: collection/savedgroupingmanager.cpp:97 ../build/src/ui_groupbydialog.h:193
 #: ../build/src/ui_groupbydialog.h:215 ../build/src/ui_groupbydialog.h:237
 msgid "Year - Album - Disc"
 msgstr "Année - Album - CD"
diff --git a/src/translations/hu.po b/src/translations/hu.po
index eb6be0796..c040c2246 100644
--- a/src/translations/hu.po
+++ b/src/translations/hu.po
@@ -686,7 +686,7 @@ msgstr "Hozzáadva ma"
 msgid "Added within three months"
 msgstr "Hozzáadva három hónapon belül"
 
-#: collection/collectionfilterwidget.cpp:229
+#: collection/collectionfilterwidget.cpp:241
 msgid "Advanced grouping..."
 msgstr "Egyedi csoportosítás…"
 
@@ -698,7 +698,7 @@ msgstr "Másolás után…"
 msgid "Albu&m cover"
 msgstr "&Albumborító"
 
-#: core/qtsystemtrayicon.cpp:259 collection/savedgroupingmanager.cpp:87
+#: core/qtsystemtrayicon.cpp:259 collection/savedgroupingmanager.cpp:88
 #: playlist/playlist.cpp:1169 organize/organizedialog.cpp:99
 #: ../build/src/ui_groupbydialog.h:186 ../build/src/ui_groupbydialog.h:208
 #: ../build/src/ui_groupbydialog.h:230 ../build/src/ui_albumcoversearcher.h:110
@@ -713,12 +713,12 @@ msgstr "Album"
 msgid "Album (ideal loudness for all tracks)"
 msgstr "Album (ideális hangerő minden számhoz)"
 
-#: collection/savedgroupingmanager.cpp:90 ../build/src/ui_groupbydialog.h:187
+#: collection/savedgroupingmanager.cpp:91 ../build/src/ui_groupbydialog.h:187
 #: ../build/src/ui_groupbydialog.h:209 ../build/src/ui_groupbydialog.h:231
 msgid "Album - Disc"
 msgstr "Album - Lemez"
 
-#: collection/savedgroupingmanager.cpp:84 playlist/playlist.cpp:1176
+#: collection/savedgroupingmanager.cpp:82 playlist/playlist.cpp:1176
 #: organize/organizedialog.cpp:102 ../build/src/ui_groupbydialog.h:185
 #: ../build/src/ui_groupbydialog.h:207 ../build/src/ui_groupbydialog.h:229
 #: ../build/src/ui_edittagdialog.h:685
@@ -844,7 +844,7 @@ msgstr "Biztos benne, hogy törli a \"%1\" beállítást?"
 msgid "Are you sure you want to reset this song's statistics?"
 msgstr "Biztos benne, hogy visszaállítja ennek a dalnak a statisztikáit?"
 
-#: core/qtsystemtrayicon.cpp:257 collection/savedgroupingmanager.cpp:81
+#: core/qtsystemtrayicon.cpp:257 collection/savedgroupingmanager.cpp:85
 #: playlist/playlist.cpp:1168 organize/organizedialog.cpp:100
 #: ../build/src/ui_groupbydialog.h:184 ../build/src/ui_groupbydialog.h:206
 #: ../build/src/ui_groupbydialog.h:228 ../build/src/ui_albumcoversearcher.h:106
@@ -981,7 +981,7 @@ msgstr "Működés"
 msgid "Best"
 msgstr "Legjobb"
 
-#: context/contextview.cpp:216 collection/savedgroupingmanager.cpp:132
+#: context/contextview.cpp:216 collection/savedgroupingmanager.cpp:136
 #: playlist/playlist.cpp:1186 organize/organizedialog.cpp:115
 #: ../build/src/ui_groupbydialog.h:201 ../build/src/ui_groupbydialog.h:223
 #: ../build/src/ui_groupbydialog.h:245 ../build/src/ui_edittagdialog.h:671
@@ -992,7 +992,7 @@ msgstr "Bitmélység"
 msgid "Bit rate"
 msgstr "Bitráta"
 
-#: context/contextview.cpp:217 collection/savedgroupingmanager.cpp:135
+#: context/contextview.cpp:217 collection/savedgroupingmanager.cpp:139
 #: playlist/playlist.cpp:1187 ../build/src/ui_groupbydialog.h:202
 #: ../build/src/ui_groupbydialog.h:224 ../build/src/ui_groupbydialog.h:246
 #: ../build/src/ui_transcoderoptionsaac.h:128
@@ -1222,7 +1222,7 @@ msgstr "Címkék automatikus kiegészítése"
 msgid "Complete tags automatically..."
 msgstr "Címkék automatikus kiegészítése"
 
-#: collection/savedgroupingmanager.cpp:117 playlist/playlist.cpp:1177
+#: collection/savedgroupingmanager.cpp:118 playlist/playlist.cpp:1177
 #: organize/organizedialog.cpp:103 ../build/src/ui_groupbydialog.h:196
 #: ../build/src/ui_groupbydialog.h:218 ../build/src/ui_groupbydialog.h:240
 #: ../build/src/ui_edittagdialog.h:686
@@ -1599,7 +1599,7 @@ msgctxt "Refers to a disabled notification type in Notification settings."
 msgid "Disabled"
 msgstr "Letiltva"
 
-#: collection/savedgroupingmanager.cpp:93 playlist/playlist.cpp:1171
+#: collection/savedgroupingmanager.cpp:106 playlist/playlist.cpp:1171
 #: organize/organizedialog.cpp:107 ../build/src/ui_groupbydialog.h:188
 #: ../build/src/ui_groupbydialog.h:210 ../build/src/ui_groupbydialog.h:232
 #: ../build/src/ui_edittagdialog.h:684
@@ -2004,7 +2004,7 @@ msgstr "Fájl útvonalak"
 msgid "File size"
 msgstr "Fájlméret"
 
-#: collection/savedgroupingmanager.cpp:126 playlist/playlist.cpp:1192
+#: collection/savedgroupingmanager.cpp:127 playlist/playlist.cpp:1192
 #: ../build/src/ui_groupbydialog.h:199 ../build/src/ui_groupbydialog.h:221
 #: ../build/src/ui_groupbydialog.h:243 ../build/src/ui_edittagdialog.h:673
 msgid "File type"
@@ -2098,7 +2098,7 @@ msgstr ""
 msgid "Form"
 msgstr "Űrlap"
 
-#: collection/savedgroupingmanager.cpp:96 ../build/src/ui_groupbydialog.h:189
+#: collection/savedgroupingmanager.cpp:130 ../build/src/ui_groupbydialog.h:189
 #: ../build/src/ui_groupbydialog.h:211 ../build/src/ui_groupbydialog.h:233
 msgid "Format"
 msgstr "Formátum"
@@ -2139,7 +2139,7 @@ msgstr "Általános beállítások"
 msgid "Genius Authentication"
 msgstr "Genius hitelesítés"
 
-#: collection/savedgroupingmanager.cpp:99 playlist/playlist.cpp:1175
+#: collection/savedgroupingmanager.cpp:115 playlist/playlist.cpp:1175
 #: organize/organizedialog.cpp:110 ../build/src/ui_groupbydialog.h:190
 #: ../build/src/ui_groupbydialog.h:212 ../build/src/ui_groupbydialog.h:234
 #: ../build/src/ui_edittagdialog.h:680
@@ -2238,18 +2238,18 @@ msgstr "Csoportosítás műfaj/albumelőadó/album szerint"
 msgid "Group by Genre/Artist/Album"
 msgstr "Csoportosítás műfaj/előadó/album szerint"
 
-#: collection/savedgroupingmanager.cpp:123 playlist/playlist.cpp:1179
+#: collection/savedgroupingmanager.cpp:124 playlist/playlist.cpp:1179
 #: organize/organizedialog.cpp:105 ../build/src/ui_groupbydialog.h:198
 #: ../build/src/ui_groupbydialog.h:220 ../build/src/ui_groupbydialog.h:242
 #: ../build/src/ui_edittagdialog.h:682
 msgid "Grouping"
 msgstr "Csoportosítás"
 
-#: collection/collectionfilterwidget.cpp:250
+#: collection/collectionfilterwidget.cpp:262
 msgid "Grouping Name"
 msgstr "Csoportosítás neve:"
 
-#: collection/collectionfilterwidget.cpp:250
+#: collection/collectionfilterwidget.cpp:262
 msgid "Grouping name:"
 msgstr "Csoportosítás neve:"
 
@@ -2517,7 +2517,7 @@ msgstr "MTP eszköz beolvasása"
 msgid "Loading iPod database"
 msgstr "iPod adatbázis betöltése"
 
-#: collection/collectionmodel.cpp:214
+#: collection/collectionmodel.cpp:210
 msgid "Loading songs"
 msgstr "Dalok betöltése"
 
@@ -2529,7 +2529,7 @@ msgstr "Számok betöltése"
 msgid "Loading tracks info"
 msgstr "Száminformációk betöltése"
 
-#: collection/collectionmodel.cpp:207 ../build/src/ui_organizedialog.h:281
+#: collection/collectionmodel.cpp:203 ../build/src/ui_organizedialog.h:281
 msgid "Loading..."
 msgstr "Betöltés..."
 
@@ -2811,7 +2811,7 @@ msgstr "Rövid blokkok nélkül"
 msgid "No song playing"
 msgstr "Nincs lejátszott dal"
 
-#: collection/savedgroupingmanager.cpp:78 ../build/src/ui_groupbydialog.h:183
+#: collection/savedgroupingmanager.cpp:79 ../build/src/ui_groupbydialog.h:183
 #: ../build/src/ui_groupbydialog.h:205 ../build/src/ui_groupbydialog.h:227
 msgid "None"
 msgstr "Egyik sem"
@@ -2947,17 +2947,21 @@ msgstr "Fájlok rendezése"
 msgid "Original tags"
 msgstr "Eredeti címkék"
 
-#: collection/savedgroupingmanager.cpp:111 playlist/playlist.cpp:1174
+#: collection/savedgroupingmanager.cpp:112 playlist/playlist.cpp:1174
 #: organize/organizedialog.cpp:109 ../build/src/ui_groupbydialog.h:194
 #: ../build/src/ui_groupbydialog.h:216 ../build/src/ui_groupbydialog.h:238
 msgid "Original year"
 msgstr "Eredeti megjelenés"
 
-#: collection/savedgroupingmanager.cpp:114 ../build/src/ui_groupbydialog.h:195
+#: collection/savedgroupingmanager.cpp:100 ../build/src/ui_groupbydialog.h:195
 #: ../build/src/ui_groupbydialog.h:217 ../build/src/ui_groupbydialog.h:239
 msgid "Original year - Album"
 msgstr "Eredeti megjelenés - Album"
 
+#: collection/savedgroupingmanager.cpp:103
+msgid "Original year - Album - Disc"
+msgstr ""
+
 #: core/commandlineoptions.cpp:183
 msgid "Other options"
 msgstr "Egyéb beállítások"
@@ -3015,7 +3019,7 @@ msgstr "Lejátszás szüneteltetése"
 msgid "Paused"
 msgstr "Szüneteltetve"
 
-#: collection/savedgroupingmanager.cpp:120 playlist/playlist.cpp:1178
+#: collection/savedgroupingmanager.cpp:121 playlist/playlist.cpp:1178
 #: organize/organizedialog.cpp:104 ../build/src/ui_groupbydialog.h:197
 #: ../build/src/ui_groupbydialog.h:219 ../build/src/ui_groupbydialog.h:241
 #: ../build/src/ui_edittagdialog.h:691
@@ -3551,7 +3555,7 @@ msgstr "Eszköz biztonságos eltávolítása"
 msgid "Safely remove the device after copying"
 msgstr "Eszköz biztonságos eltávolítása másolás után"
 
-#: collection/savedgroupingmanager.cpp:129 playlist/playlist.cpp:1185
+#: collection/savedgroupingmanager.cpp:133 playlist/playlist.cpp:1185
 #: organize/organizedialog.cpp:114 ../build/src/ui_groupbydialog.h:200
 #: ../build/src/ui_groupbydialog.h:222 ../build/src/ui_groupbydialog.h:244
 #: ../build/src/ui_edittagdialog.h:670
@@ -4456,10 +4460,10 @@ msgid "Ultra wide band (UWB)"
 msgstr "Ultra szélessávú (UWB)"
 
 #: core/song.cpp:538 context/contextalbumsmodel.cpp:357
-#: collection/collectionmodel.cpp:433 collection/collectionmodel.cpp:438
-#: collection/collectionmodel.cpp:442 collection/collectionmodel.cpp:446
-#: collection/collectionmodel.cpp:450 collection/collectionmodel.cpp:1407
-#: collection/savedgroupingmanager.cpp:137 playlist/playlistdelegates.cpp:353
+#: collection/collectionmodel.cpp:461 collection/collectionmodel.cpp:466
+#: collection/collectionmodel.cpp:470 collection/collectionmodel.cpp:474
+#: collection/collectionmodel.cpp:478 collection/collectionmodel.cpp:1589
+#: collection/savedgroupingmanager.cpp:143 playlist/playlistdelegates.cpp:353
 #: playlist/playlistmanager.cpp:554 playlist/playlistmanager.cpp:555
 #: dialogs/edittagdialog.cpp:494 dialogs/edittagdialog.cpp:542
 #: ../build/src/ui_scrobblersettingspage.h:393
@@ -4620,9 +4624,9 @@ msgstr "Dal felvételénél a menü használatával..."
 msgid "Variable bit rate"
 msgstr "Változó bitráta"
 
-#: collection/collectionmodel.cpp:347 playlist/playlistmanager.cpp:566
-#: covermanager/albumcovermanager.cpp:333 internet/internetsearchmodel.cpp:94
-#: internet/internetsearchmodel.cpp:106
+#: collection/collectionmodel.cpp:371 collection/collectionmodel.cpp:372
+#: playlist/playlistmanager.cpp:566 covermanager/albumcovermanager.cpp:333
+#: internet/internetsearchmodel.cpp:94 internet/internetsearchmodel.cpp:106
 msgid "Various artists"
 msgstr "Egyes előadók"
 
@@ -4700,10 +4704,9 @@ msgstr "Offline mód (mentés csak gyorsítótárba)"
 
 #: collection/collectionview.cpp:476
 msgid ""
-"Would you like to move the other songs in this album to Various Artists as "
+"Would you like to move the other songs on this album to Various Artists as "
 "well?"
 msgstr ""
-"Szeretné a többi dalt ebből az albumból áthelyezni a Vegyes előadók közé is?"
 
 #: core/mainwindow.cpp:2651
 msgid "Would you like to run a full rescan right now?"
@@ -4713,7 +4716,7 @@ msgstr "Akar futtatni egy teljes újraolvasást most?"
 msgid "Write metadata when saving playlists"
 msgstr "Lejátszólisták mentésekor metaadatok írása"
 
-#: collection/savedgroupingmanager.cpp:102 playlist/playlist.cpp:1173
+#: collection/savedgroupingmanager.cpp:109 playlist/playlist.cpp:1173
 #: organize/organizedialog.cpp:108 ../build/src/ui_groupbydialog.h:191
 #: ../build/src/ui_groupbydialog.h:213 ../build/src/ui_groupbydialog.h:235
 #: ../build/src/ui_edittagdialog.h:690
@@ -4721,12 +4724,12 @@ msgstr "Lejátszólisták mentésekor metaadatok írása"
 msgid "Year"
 msgstr "Év"
 
-#: collection/savedgroupingmanager.cpp:105 ../build/src/ui_groupbydialog.h:192
+#: collection/savedgroupingmanager.cpp:94 ../build/src/ui_groupbydialog.h:192
 #: ../build/src/ui_groupbydialog.h:214 ../build/src/ui_groupbydialog.h:236
 msgid "Year - Album"
 msgstr "Év - Album"
 
-#: collection/savedgroupingmanager.cpp:108 ../build/src/ui_groupbydialog.h:193
+#: collection/savedgroupingmanager.cpp:97 ../build/src/ui_groupbydialog.h:193
 #: ../build/src/ui_groupbydialog.h:215 ../build/src/ui_groupbydialog.h:237
 msgid "Year - Album - Disc"
 msgstr "Év - Album - Lemez"
diff --git a/src/translations/id.po b/src/translations/id.po
index ae44d8b68..2760fb095 100644
--- a/src/translations/id.po
+++ b/src/translations/id.po
@@ -681,7 +681,7 @@ msgstr "Ditambahkan hari ini"
 msgid "Added within three months"
 msgstr "Ditambahkan pada tiga bulan terakhir"
 
-#: collection/collectionfilterwidget.cpp:229
+#: collection/collectionfilterwidget.cpp:241
 msgid "Advanced grouping..."
 msgstr "Pengelompokkan lanjut..."
 
@@ -693,7 +693,7 @@ msgstr "Setelah menyalin..."
 msgid "Albu&m cover"
 msgstr "Sa&mpul album"
 
-#: core/qtsystemtrayicon.cpp:259 collection/savedgroupingmanager.cpp:87
+#: core/qtsystemtrayicon.cpp:259 collection/savedgroupingmanager.cpp:88
 #: playlist/playlist.cpp:1169 organize/organizedialog.cpp:99
 #: ../build/src/ui_groupbydialog.h:186 ../build/src/ui_groupbydialog.h:208
 #: ../build/src/ui_groupbydialog.h:230 ../build/src/ui_albumcoversearcher.h:110
@@ -708,12 +708,12 @@ msgstr "Album"
 msgid "Album (ideal loudness for all tracks)"
 msgstr "Album (kenyaringan ideal untuk semua trek)"
 
-#: collection/savedgroupingmanager.cpp:90 ../build/src/ui_groupbydialog.h:187
+#: collection/savedgroupingmanager.cpp:91 ../build/src/ui_groupbydialog.h:187
 #: ../build/src/ui_groupbydialog.h:209 ../build/src/ui_groupbydialog.h:231
 msgid "Album - Disc"
 msgstr "Album - Cakram"
 
-#: collection/savedgroupingmanager.cpp:84 playlist/playlist.cpp:1176
+#: collection/savedgroupingmanager.cpp:82 playlist/playlist.cpp:1176
 #: organize/organizedialog.cpp:102 ../build/src/ui_groupbydialog.h:185
 #: ../build/src/ui_groupbydialog.h:207 ../build/src/ui_groupbydialog.h:229
 #: ../build/src/ui_edittagdialog.h:685
@@ -839,7 +839,7 @@ msgstr "Apakah Anda yakin ingin menghapus prasetel \"%1\"?"
 msgid "Are you sure you want to reset this song's statistics?"
 msgstr "Apakah Anda yakin ingin mengeset-ulang statistik lagu ini?"
 
-#: core/qtsystemtrayicon.cpp:257 collection/savedgroupingmanager.cpp:81
+#: core/qtsystemtrayicon.cpp:257 collection/savedgroupingmanager.cpp:85
 #: playlist/playlist.cpp:1168 organize/organizedialog.cpp:100
 #: ../build/src/ui_groupbydialog.h:184 ../build/src/ui_groupbydialog.h:206
 #: ../build/src/ui_groupbydialog.h:228 ../build/src/ui_albumcoversearcher.h:106
@@ -976,7 +976,7 @@ msgstr "Perilaku"
 msgid "Best"
 msgstr "Terbaik"
 
-#: context/contextview.cpp:216 collection/savedgroupingmanager.cpp:132
+#: context/contextview.cpp:216 collection/savedgroupingmanager.cpp:136
 #: playlist/playlist.cpp:1186 organize/organizedialog.cpp:115
 #: ../build/src/ui_groupbydialog.h:201 ../build/src/ui_groupbydialog.h:223
 #: ../build/src/ui_groupbydialog.h:245 ../build/src/ui_edittagdialog.h:671
@@ -987,7 +987,7 @@ msgstr "Kedalaman bit"
 msgid "Bit rate"
 msgstr "Laju bit"
 
-#: context/contextview.cpp:217 collection/savedgroupingmanager.cpp:135
+#: context/contextview.cpp:217 collection/savedgroupingmanager.cpp:139
 #: playlist/playlist.cpp:1187 ../build/src/ui_groupbydialog.h:202
 #: ../build/src/ui_groupbydialog.h:224 ../build/src/ui_groupbydialog.h:246
 #: ../build/src/ui_transcoderoptionsaac.h:128
@@ -1211,7 +1211,7 @@ msgstr "Lengkapi tag secara otomatis"
 msgid "Complete tags automatically..."
 msgstr "Lengkapi tag secara otomatis..."
 
-#: collection/savedgroupingmanager.cpp:117 playlist/playlist.cpp:1177
+#: collection/savedgroupingmanager.cpp:118 playlist/playlist.cpp:1177
 #: organize/organizedialog.cpp:103 ../build/src/ui_groupbydialog.h:196
 #: ../build/src/ui_groupbydialog.h:218 ../build/src/ui_groupbydialog.h:240
 #: ../build/src/ui_edittagdialog.h:686
@@ -1588,7 +1588,7 @@ msgctxt "Refers to a disabled notification type in Notification settings."
 msgid "Disabled"
 msgstr "Nonfungsi"
 
-#: collection/savedgroupingmanager.cpp:93 playlist/playlist.cpp:1171
+#: collection/savedgroupingmanager.cpp:106 playlist/playlist.cpp:1171
 #: organize/organizedialog.cpp:107 ../build/src/ui_groupbydialog.h:188
 #: ../build/src/ui_groupbydialog.h:210 ../build/src/ui_groupbydialog.h:232
 #: ../build/src/ui_edittagdialog.h:684
@@ -1992,7 +1992,7 @@ msgstr "Lokasi berkas"
 msgid "File size"
 msgstr "Ukuran berkas"
 
-#: collection/savedgroupingmanager.cpp:126 playlist/playlist.cpp:1192
+#: collection/savedgroupingmanager.cpp:127 playlist/playlist.cpp:1192
 #: ../build/src/ui_groupbydialog.h:199 ../build/src/ui_groupbydialog.h:221
 #: ../build/src/ui_groupbydialog.h:243 ../build/src/ui_edittagdialog.h:673
 msgid "File type"
@@ -2086,7 +2086,7 @@ msgstr ""
 msgid "Form"
 msgstr "Form"
 
-#: collection/savedgroupingmanager.cpp:96 ../build/src/ui_groupbydialog.h:189
+#: collection/savedgroupingmanager.cpp:130 ../build/src/ui_groupbydialog.h:189
 #: ../build/src/ui_groupbydialog.h:211 ../build/src/ui_groupbydialog.h:233
 msgid "Format"
 msgstr "Format"
@@ -2127,7 +2127,7 @@ msgstr "Setelan umum"
 msgid "Genius Authentication"
 msgstr ""
 
-#: collection/savedgroupingmanager.cpp:99 playlist/playlist.cpp:1175
+#: collection/savedgroupingmanager.cpp:115 playlist/playlist.cpp:1175
 #: organize/organizedialog.cpp:110 ../build/src/ui_groupbydialog.h:190
 #: ../build/src/ui_groupbydialog.h:212 ../build/src/ui_groupbydialog.h:234
 #: ../build/src/ui_edittagdialog.h:680
@@ -2226,18 +2226,18 @@ msgstr "Grup berdasarkan Genre/Artis album/Album"
 msgid "Group by Genre/Artist/Album"
 msgstr "Grup berdasarkan Genre/Artis/Album"
 
-#: collection/savedgroupingmanager.cpp:123 playlist/playlist.cpp:1179
+#: collection/savedgroupingmanager.cpp:124 playlist/playlist.cpp:1179
 #: organize/organizedialog.cpp:105 ../build/src/ui_groupbydialog.h:198
 #: ../build/src/ui_groupbydialog.h:220 ../build/src/ui_groupbydialog.h:242
 #: ../build/src/ui_edittagdialog.h:682
 msgid "Grouping"
 msgstr "Pengelompokan"
 
-#: collection/collectionfilterwidget.cpp:250
+#: collection/collectionfilterwidget.cpp:262
 msgid "Grouping Name"
 msgstr "Nama Pengelompokan"
 
-#: collection/collectionfilterwidget.cpp:250
+#: collection/collectionfilterwidget.cpp:262
 msgid "Grouping name:"
 msgstr "Nama pengelompokan:"
 
@@ -2500,7 +2500,7 @@ msgstr "Memuat perangkat MTP"
 msgid "Loading iPod database"
 msgstr "Memuat basis data iPod"
 
-#: collection/collectionmodel.cpp:214
+#: collection/collectionmodel.cpp:210
 msgid "Loading songs"
 msgstr "Memuat lagu"
 
@@ -2512,7 +2512,7 @@ msgstr "Memuat trek"
 msgid "Loading tracks info"
 msgstr "Memuat info trek"
 
-#: collection/collectionmodel.cpp:207 ../build/src/ui_organizedialog.h:281
+#: collection/collectionmodel.cpp:203 ../build/src/ui_organizedialog.h:281
 msgid "Loading..."
 msgstr "Memuat..."
 
@@ -2794,7 +2794,7 @@ msgstr "Tanpa blok pendek"
 msgid "No song playing"
 msgstr "Tidak ada lagu yang berputar"
 
-#: collection/savedgroupingmanager.cpp:78 ../build/src/ui_groupbydialog.h:183
+#: collection/savedgroupingmanager.cpp:79 ../build/src/ui_groupbydialog.h:183
 #: ../build/src/ui_groupbydialog.h:205 ../build/src/ui_groupbydialog.h:227
 msgid "None"
 msgstr "Nihil"
@@ -2930,17 +2930,21 @@ msgstr ""
 msgid "Original tags"
 msgstr "Tag asli"
 
-#: collection/savedgroupingmanager.cpp:111 playlist/playlist.cpp:1174
+#: collection/savedgroupingmanager.cpp:112 playlist/playlist.cpp:1174
 #: organize/organizedialog.cpp:109 ../build/src/ui_groupbydialog.h:194
 #: ../build/src/ui_groupbydialog.h:216 ../build/src/ui_groupbydialog.h:238
 msgid "Original year"
 msgstr "Tahun asli"
 
-#: collection/savedgroupingmanager.cpp:114 ../build/src/ui_groupbydialog.h:195
+#: collection/savedgroupingmanager.cpp:100 ../build/src/ui_groupbydialog.h:195
 #: ../build/src/ui_groupbydialog.h:217 ../build/src/ui_groupbydialog.h:239
 msgid "Original year - Album"
 msgstr "Tahun asli - Album"
 
+#: collection/savedgroupingmanager.cpp:103
+msgid "Original year - Album - Disc"
+msgstr ""
+
 #: core/commandlineoptions.cpp:183
 msgid "Other options"
 msgstr "Opsi lainnya"
@@ -2998,7 +3002,7 @@ msgstr "Jeda pemutaran"
 msgid "Paused"
 msgstr "Jeda"
 
-#: collection/savedgroupingmanager.cpp:120 playlist/playlist.cpp:1178
+#: collection/savedgroupingmanager.cpp:121 playlist/playlist.cpp:1178
 #: organize/organizedialog.cpp:104 ../build/src/ui_groupbydialog.h:197
 #: ../build/src/ui_groupbydialog.h:219 ../build/src/ui_groupbydialog.h:241
 #: ../build/src/ui_edittagdialog.h:691
@@ -3522,7 +3526,7 @@ msgstr "Secara aman melepas perangkat"
 msgid "Safely remove the device after copying"
 msgstr "Secara aman melepas perangkat setelah menyalin"
 
-#: collection/savedgroupingmanager.cpp:129 playlist/playlist.cpp:1185
+#: collection/savedgroupingmanager.cpp:133 playlist/playlist.cpp:1185
 #: organize/organizedialog.cpp:114 ../build/src/ui_groupbydialog.h:200
 #: ../build/src/ui_groupbydialog.h:222 ../build/src/ui_groupbydialog.h:244
 #: ../build/src/ui_edittagdialog.h:670
@@ -4423,10 +4427,10 @@ msgid "Ultra wide band (UWB)"
 msgstr "Pita ultra lebar (UWB)"
 
 #: core/song.cpp:538 context/contextalbumsmodel.cpp:357
-#: collection/collectionmodel.cpp:433 collection/collectionmodel.cpp:438
-#: collection/collectionmodel.cpp:442 collection/collectionmodel.cpp:446
-#: collection/collectionmodel.cpp:450 collection/collectionmodel.cpp:1407
-#: collection/savedgroupingmanager.cpp:137 playlist/playlistdelegates.cpp:353
+#: collection/collectionmodel.cpp:461 collection/collectionmodel.cpp:466
+#: collection/collectionmodel.cpp:470 collection/collectionmodel.cpp:474
+#: collection/collectionmodel.cpp:478 collection/collectionmodel.cpp:1589
+#: collection/savedgroupingmanager.cpp:143 playlist/playlistdelegates.cpp:353
 #: playlist/playlistmanager.cpp:554 playlist/playlistmanager.cpp:555
 #: dialogs/edittagdialog.cpp:494 dialogs/edittagdialog.cpp:542
 #: ../build/src/ui_scrobblersettingspage.h:393
@@ -4587,9 +4591,9 @@ msgstr "Menggunakan menu untuk menambah lagu akan..."
 msgid "Variable bit rate"
 msgstr "Laju bit beragam"
 
-#: collection/collectionmodel.cpp:347 playlist/playlistmanager.cpp:566
-#: covermanager/albumcovermanager.cpp:333 internet/internetsearchmodel.cpp:94
-#: internet/internetsearchmodel.cpp:106
+#: collection/collectionmodel.cpp:371 collection/collectionmodel.cpp:372
+#: playlist/playlistmanager.cpp:566 covermanager/albumcovermanager.cpp:333
+#: internet/internetsearchmodel.cpp:94 internet/internetsearchmodel.cpp:106
 msgid "Various artists"
 msgstr "Artis beraga"
 
@@ -4668,11 +4672,9 @@ msgstr "Bekerja di modus offline (Hanya cache scrobble)"
 
 #: collection/collectionview.cpp:476
 msgid ""
-"Would you like to move the other songs in this album to Various Artists as "
+"Would you like to move the other songs on this album to Various Artists as "
 "well?"
 msgstr ""
-"Apakah Anda ingin memindahkan lagu lainnya di dalam album ini ke Artis "
-"Beragam?"
 
 #: core/mainwindow.cpp:2651
 msgid "Would you like to run a full rescan right now?"
@@ -4682,7 +4684,7 @@ msgstr "Apakah Anda ingin menjalankan pemindaian ulang menyeluruh sekarang?"
 msgid "Write metadata when saving playlists"
 msgstr "Tulis metadata saat menyimpan daftar putar"
 
-#: collection/savedgroupingmanager.cpp:102 playlist/playlist.cpp:1173
+#: collection/savedgroupingmanager.cpp:109 playlist/playlist.cpp:1173
 #: organize/organizedialog.cpp:108 ../build/src/ui_groupbydialog.h:191
 #: ../build/src/ui_groupbydialog.h:213 ../build/src/ui_groupbydialog.h:235
 #: ../build/src/ui_edittagdialog.h:690
@@ -4690,12 +4692,12 @@ msgstr "Tulis metadata saat menyimpan daftar putar"
 msgid "Year"
 msgstr "Tahun"
 
-#: collection/savedgroupingmanager.cpp:105 ../build/src/ui_groupbydialog.h:192
+#: collection/savedgroupingmanager.cpp:94 ../build/src/ui_groupbydialog.h:192
 #: ../build/src/ui_groupbydialog.h:214 ../build/src/ui_groupbydialog.h:236
 msgid "Year - Album"
 msgstr "Tahun - Album"
 
-#: collection/savedgroupingmanager.cpp:108 ../build/src/ui_groupbydialog.h:193
+#: collection/savedgroupingmanager.cpp:97 ../build/src/ui_groupbydialog.h:193
 #: ../build/src/ui_groupbydialog.h:215 ../build/src/ui_groupbydialog.h:237
 msgid "Year - Album - Disc"
 msgstr "Tahun - Album - Cakram"
diff --git a/src/translations/it.po b/src/translations/it.po
index 7d57dcb08..3382bc104 100644
--- a/src/translations/it.po
+++ b/src/translations/it.po
@@ -678,7 +678,7 @@ msgstr "Aggiunti oggi"
 msgid "Added within three months"
 msgstr "Aggiunti negli ultimi tre mesi"
 
-#: collection/collectionfilterwidget.cpp:229
+#: collection/collectionfilterwidget.cpp:241
 msgid "Advanced grouping..."
 msgstr "Raggruppamento avanzato..."
 
@@ -690,7 +690,7 @@ msgstr "Dopo la copia..."
 msgid "Albu&m cover"
 msgstr "Copertina dell'albu&m"
 
-#: core/qtsystemtrayicon.cpp:259 collection/savedgroupingmanager.cpp:87
+#: core/qtsystemtrayicon.cpp:259 collection/savedgroupingmanager.cpp:88
 #: playlist/playlist.cpp:1169 organize/organizedialog.cpp:99
 #: ../build/src/ui_groupbydialog.h:186 ../build/src/ui_groupbydialog.h:208
 #: ../build/src/ui_groupbydialog.h:230 ../build/src/ui_albumcoversearcher.h:110
@@ -705,12 +705,12 @@ msgstr "Album"
 msgid "Album (ideal loudness for all tracks)"
 msgstr "Album (volume ideale per tutte le tracce)"
 
-#: collection/savedgroupingmanager.cpp:90 ../build/src/ui_groupbydialog.h:187
+#: collection/savedgroupingmanager.cpp:91 ../build/src/ui_groupbydialog.h:187
 #: ../build/src/ui_groupbydialog.h:209 ../build/src/ui_groupbydialog.h:231
 msgid "Album - Disc"
 msgstr "Album - Disco"
 
-#: collection/savedgroupingmanager.cpp:84 playlist/playlist.cpp:1176
+#: collection/savedgroupingmanager.cpp:82 playlist/playlist.cpp:1176
 #: organize/organizedialog.cpp:102 ../build/src/ui_groupbydialog.h:185
 #: ../build/src/ui_groupbydialog.h:207 ../build/src/ui_groupbydialog.h:229
 #: ../build/src/ui_edittagdialog.h:685
@@ -837,7 +837,7 @@ msgstr "Sei sicuro di voler eliminare la preimpostazione \"%1\"?"
 msgid "Are you sure you want to reset this song's statistics?"
 msgstr "Sei sicuro di voler azzerare le statistiche del brano?"
 
-#: core/qtsystemtrayicon.cpp:257 collection/savedgroupingmanager.cpp:81
+#: core/qtsystemtrayicon.cpp:257 collection/savedgroupingmanager.cpp:85
 #: playlist/playlist.cpp:1168 organize/organizedialog.cpp:100
 #: ../build/src/ui_groupbydialog.h:184 ../build/src/ui_groupbydialog.h:206
 #: ../build/src/ui_groupbydialog.h:228 ../build/src/ui_albumcoversearcher.h:106
@@ -974,7 +974,7 @@ msgstr "Comportamento"
 msgid "Best"
 msgstr "Migliore"
 
-#: context/contextview.cpp:216 collection/savedgroupingmanager.cpp:132
+#: context/contextview.cpp:216 collection/savedgroupingmanager.cpp:136
 #: playlist/playlist.cpp:1186 organize/organizedialog.cpp:115
 #: ../build/src/ui_groupbydialog.h:201 ../build/src/ui_groupbydialog.h:223
 #: ../build/src/ui_groupbydialog.h:245 ../build/src/ui_edittagdialog.h:671
@@ -985,7 +985,7 @@ msgstr "Profondità di bit"
 msgid "Bit rate"
 msgstr "Bitrate"
 
-#: context/contextview.cpp:217 collection/savedgroupingmanager.cpp:135
+#: context/contextview.cpp:217 collection/savedgroupingmanager.cpp:139
 #: playlist/playlist.cpp:1187 ../build/src/ui_groupbydialog.h:202
 #: ../build/src/ui_groupbydialog.h:224 ../build/src/ui_groupbydialog.h:246
 #: ../build/src/ui_transcoderoptionsaac.h:128
@@ -1211,7 +1211,7 @@ msgstr "Completa automaticamente i tag"
 msgid "Complete tags automatically..."
 msgstr "Completa automaticamente i tag..."
 
-#: collection/savedgroupingmanager.cpp:117 playlist/playlist.cpp:1177
+#: collection/savedgroupingmanager.cpp:118 playlist/playlist.cpp:1177
 #: organize/organizedialog.cpp:103 ../build/src/ui_groupbydialog.h:196
 #: ../build/src/ui_groupbydialog.h:218 ../build/src/ui_groupbydialog.h:240
 #: ../build/src/ui_edittagdialog.h:686
@@ -1589,7 +1589,7 @@ msgctxt "Refers to a disabled notification type in Notification settings."
 msgid "Disabled"
 msgstr "Disabilitata"
 
-#: collection/savedgroupingmanager.cpp:93 playlist/playlist.cpp:1171
+#: collection/savedgroupingmanager.cpp:106 playlist/playlist.cpp:1171
 #: organize/organizedialog.cpp:107 ../build/src/ui_groupbydialog.h:188
 #: ../build/src/ui_groupbydialog.h:210 ../build/src/ui_groupbydialog.h:232
 #: ../build/src/ui_edittagdialog.h:684
@@ -1995,7 +1995,7 @@ msgstr "Percorsi dei file"
 msgid "File size"
 msgstr "Dimensione file"
 
-#: collection/savedgroupingmanager.cpp:126 playlist/playlist.cpp:1192
+#: collection/savedgroupingmanager.cpp:127 playlist/playlist.cpp:1192
 #: ../build/src/ui_groupbydialog.h:199 ../build/src/ui_groupbydialog.h:221
 #: ../build/src/ui_groupbydialog.h:243 ../build/src/ui_edittagdialog.h:673
 msgid "File type"
@@ -2090,7 +2090,7 @@ msgstr ""
 msgid "Form"
 msgstr "Modulo"
 
-#: collection/savedgroupingmanager.cpp:96 ../build/src/ui_groupbydialog.h:189
+#: collection/savedgroupingmanager.cpp:130 ../build/src/ui_groupbydialog.h:189
 #: ../build/src/ui_groupbydialog.h:211 ../build/src/ui_groupbydialog.h:233
 msgid "Format"
 msgstr "Formato"
@@ -2131,7 +2131,7 @@ msgstr "Impostazioni generali"
 msgid "Genius Authentication"
 msgstr ""
 
-#: collection/savedgroupingmanager.cpp:99 playlist/playlist.cpp:1175
+#: collection/savedgroupingmanager.cpp:115 playlist/playlist.cpp:1175
 #: organize/organizedialog.cpp:110 ../build/src/ui_groupbydialog.h:190
 #: ../build/src/ui_groupbydialog.h:212 ../build/src/ui_groupbydialog.h:234
 #: ../build/src/ui_edittagdialog.h:680
@@ -2231,18 +2231,18 @@ msgstr "Raggruppa in base a Genere/Artista dell'Album/Album"
 msgid "Group by Genre/Artist/Album"
 msgstr "Raggruppa per genere/artista/album"
 
-#: collection/savedgroupingmanager.cpp:123 playlist/playlist.cpp:1179
+#: collection/savedgroupingmanager.cpp:124 playlist/playlist.cpp:1179
 #: organize/organizedialog.cpp:105 ../build/src/ui_groupbydialog.h:198
 #: ../build/src/ui_groupbydialog.h:220 ../build/src/ui_groupbydialog.h:242
 #: ../build/src/ui_edittagdialog.h:682
 msgid "Grouping"
 msgstr "Gruppo"
 
-#: collection/collectionfilterwidget.cpp:250
+#: collection/collectionfilterwidget.cpp:262
 msgid "Grouping Name"
 msgstr "Nome raggruppamento"
 
-#: collection/collectionfilterwidget.cpp:250
+#: collection/collectionfilterwidget.cpp:262
 msgid "Grouping name:"
 msgstr "Nome raggruppamento:"
 
@@ -2508,7 +2508,7 @@ msgstr "Caricamento del dispositivo MTP"
 msgid "Loading iPod database"
 msgstr "Caricamento database dell'iPod"
 
-#: collection/collectionmodel.cpp:214
+#: collection/collectionmodel.cpp:210
 msgid "Loading songs"
 msgstr "Caricamento brani in corso"
 
@@ -2520,7 +2520,7 @@ msgstr "Caricamento delle tracce"
 msgid "Loading tracks info"
 msgstr "Caricamento informazioni della traccia"
 
-#: collection/collectionmodel.cpp:207 ../build/src/ui_organizedialog.h:281
+#: collection/collectionmodel.cpp:203 ../build/src/ui_organizedialog.h:281
 msgid "Loading..."
 msgstr "Caricamento in corso..."
 
@@ -2802,7 +2802,7 @@ msgstr "Nessun blocco corto"
 msgid "No song playing"
 msgstr "Nessuna canzone in riproduzione"
 
-#: collection/savedgroupingmanager.cpp:78 ../build/src/ui_groupbydialog.h:183
+#: collection/savedgroupingmanager.cpp:79 ../build/src/ui_groupbydialog.h:183
 #: ../build/src/ui_groupbydialog.h:205 ../build/src/ui_groupbydialog.h:227
 msgid "None"
 msgstr "Nessuna"
@@ -2939,17 +2939,21 @@ msgstr ""
 msgid "Original tags"
 msgstr "Tag originali"
 
-#: collection/savedgroupingmanager.cpp:111 playlist/playlist.cpp:1174
+#: collection/savedgroupingmanager.cpp:112 playlist/playlist.cpp:1174
 #: organize/organizedialog.cpp:109 ../build/src/ui_groupbydialog.h:194
 #: ../build/src/ui_groupbydialog.h:216 ../build/src/ui_groupbydialog.h:238
 msgid "Original year"
 msgstr "Anno originale"
 
-#: collection/savedgroupingmanager.cpp:114 ../build/src/ui_groupbydialog.h:195
+#: collection/savedgroupingmanager.cpp:100 ../build/src/ui_groupbydialog.h:195
 #: ../build/src/ui_groupbydialog.h:217 ../build/src/ui_groupbydialog.h:239
 msgid "Original year - Album"
 msgstr "Anno originale - Album"
 
+#: collection/savedgroupingmanager.cpp:103
+msgid "Original year - Album - Disc"
+msgstr ""
+
 #: core/commandlineoptions.cpp:183
 msgid "Other options"
 msgstr "Altre opzioni"
@@ -3007,7 +3011,7 @@ msgstr "Sospendi riproduzione"
 msgid "Paused"
 msgstr "In pausa"
 
-#: collection/savedgroupingmanager.cpp:120 playlist/playlist.cpp:1178
+#: collection/savedgroupingmanager.cpp:121 playlist/playlist.cpp:1178
 #: organize/organizedialog.cpp:104 ../build/src/ui_groupbydialog.h:197
 #: ../build/src/ui_groupbydialog.h:219 ../build/src/ui_groupbydialog.h:241
 #: ../build/src/ui_edittagdialog.h:691
@@ -3537,7 +3541,7 @@ msgstr "Rimuovi il dispositivo in sicurezza"
 msgid "Safely remove the device after copying"
 msgstr "Rimuovi il dispositivo in sicurezza al termine della copia"
 
-#: collection/savedgroupingmanager.cpp:129 playlist/playlist.cpp:1185
+#: collection/savedgroupingmanager.cpp:133 playlist/playlist.cpp:1185
 #: organize/organizedialog.cpp:114 ../build/src/ui_groupbydialog.h:200
 #: ../build/src/ui_groupbydialog.h:222 ../build/src/ui_groupbydialog.h:244
 #: ../build/src/ui_edittagdialog.h:670
@@ -4447,10 +4451,10 @@ msgid "Ultra wide band (UWB)"
 msgstr "Banda ultra larga (UWB)"
 
 #: core/song.cpp:538 context/contextalbumsmodel.cpp:357
-#: collection/collectionmodel.cpp:433 collection/collectionmodel.cpp:438
-#: collection/collectionmodel.cpp:442 collection/collectionmodel.cpp:446
-#: collection/collectionmodel.cpp:450 collection/collectionmodel.cpp:1407
-#: collection/savedgroupingmanager.cpp:137 playlist/playlistdelegates.cpp:353
+#: collection/collectionmodel.cpp:461 collection/collectionmodel.cpp:466
+#: collection/collectionmodel.cpp:470 collection/collectionmodel.cpp:474
+#: collection/collectionmodel.cpp:478 collection/collectionmodel.cpp:1589
+#: collection/savedgroupingmanager.cpp:143 playlist/playlistdelegates.cpp:353
 #: playlist/playlistmanager.cpp:554 playlist/playlistmanager.cpp:555
 #: dialogs/edittagdialog.cpp:494 dialogs/edittagdialog.cpp:542
 #: ../build/src/ui_scrobblersettingspage.h:393
@@ -4611,9 +4615,9 @@ msgstr "L'utilizzo del menu per aggiungere un brano..."
 msgid "Variable bit rate"
 msgstr "Bitrate variabile"
 
-#: collection/collectionmodel.cpp:347 playlist/playlistmanager.cpp:566
-#: covermanager/albumcovermanager.cpp:333 internet/internetsearchmodel.cpp:94
-#: internet/internetsearchmodel.cpp:106
+#: collection/collectionmodel.cpp:371 collection/collectionmodel.cpp:372
+#: playlist/playlistmanager.cpp:566 covermanager/albumcovermanager.cpp:333
+#: internet/internetsearchmodel.cpp:94 internet/internetsearchmodel.cpp:106
 msgid "Various artists"
 msgstr "Artisti vari"
 
@@ -4692,9 +4696,9 @@ msgstr "Lavora in modalità offline (solo scrobbles in cache)"
 
 #: collection/collectionview.cpp:476
 msgid ""
-"Would you like to move the other songs in this album to Various Artists as "
+"Would you like to move the other songs on this album to Various Artists as "
 "well?"
-msgstr "Vuoi spostare anche gli altri brani di questo album in Artisti vari?"
+msgstr ""
 
 #: core/mainwindow.cpp:2651
 msgid "Would you like to run a full rescan right now?"
@@ -4704,7 +4708,7 @@ msgstr "Vuoi eseguire subito una nuova scansione completa?"
 msgid "Write metadata when saving playlists"
 msgstr "Scrivi i metadata quando si salvano le playlist"
 
-#: collection/savedgroupingmanager.cpp:102 playlist/playlist.cpp:1173
+#: collection/savedgroupingmanager.cpp:109 playlist/playlist.cpp:1173
 #: organize/organizedialog.cpp:108 ../build/src/ui_groupbydialog.h:191
 #: ../build/src/ui_groupbydialog.h:213 ../build/src/ui_groupbydialog.h:235
 #: ../build/src/ui_edittagdialog.h:690
@@ -4712,12 +4716,12 @@ msgstr "Scrivi i metadata quando si salvano le playlist"
 msgid "Year"
 msgstr "Anno"
 
-#: collection/savedgroupingmanager.cpp:105 ../build/src/ui_groupbydialog.h:192
+#: collection/savedgroupingmanager.cpp:94 ../build/src/ui_groupbydialog.h:192
 #: ../build/src/ui_groupbydialog.h:214 ../build/src/ui_groupbydialog.h:236
 msgid "Year - Album"
 msgstr "Anno - Album"
 
-#: collection/savedgroupingmanager.cpp:108 ../build/src/ui_groupbydialog.h:193
+#: collection/savedgroupingmanager.cpp:97 ../build/src/ui_groupbydialog.h:193
 #: ../build/src/ui_groupbydialog.h:215 ../build/src/ui_groupbydialog.h:237
 msgid "Year - Album - Disc"
 msgstr "Anno - Album - Disco"
diff --git a/src/translations/ko.po b/src/translations/ko.po
index a16d0d94f..83a362a81 100644
--- a/src/translations/ko.po
+++ b/src/translations/ko.po
@@ -672,7 +672,7 @@ msgstr "오늘 추가됨"
 msgid "Added within three months"
 msgstr "3개월 이내에 추가됨"
 
-#: collection/collectionfilterwidget.cpp:229
+#: collection/collectionfilterwidget.cpp:241
 msgid "Advanced grouping..."
 msgstr "고급 그룹..."
 
@@ -684,7 +684,7 @@ msgstr "복사한 후..."
 msgid "Albu&m cover"
 msgstr "앨범아트(&M)"
 
-#: core/qtsystemtrayicon.cpp:259 collection/savedgroupingmanager.cpp:87
+#: core/qtsystemtrayicon.cpp:259 collection/savedgroupingmanager.cpp:88
 #: playlist/playlist.cpp:1169 organize/organizedialog.cpp:99
 #: ../build/src/ui_groupbydialog.h:186 ../build/src/ui_groupbydialog.h:208
 #: ../build/src/ui_groupbydialog.h:230 ../build/src/ui_albumcoversearcher.h:110
@@ -699,12 +699,12 @@ msgstr "앨범"
 msgid "Album (ideal loudness for all tracks)"
 msgstr "앨범(모든 트랙에 이상적인 음량)"
 
-#: collection/savedgroupingmanager.cpp:90 ../build/src/ui_groupbydialog.h:187
+#: collection/savedgroupingmanager.cpp:91 ../build/src/ui_groupbydialog.h:187
 #: ../build/src/ui_groupbydialog.h:209 ../build/src/ui_groupbydialog.h:231
 msgid "Album - Disc"
 msgstr "앨범 - 디스크"
 
-#: collection/savedgroupingmanager.cpp:84 playlist/playlist.cpp:1176
+#: collection/savedgroupingmanager.cpp:82 playlist/playlist.cpp:1176
 #: organize/organizedialog.cpp:102 ../build/src/ui_groupbydialog.h:185
 #: ../build/src/ui_groupbydialog.h:207 ../build/src/ui_groupbydialog.h:229
 #: ../build/src/ui_edittagdialog.h:685
@@ -830,7 +830,7 @@ msgstr "\"%1\" 사전 설정을 지우시겠습니까?"
 msgid "Are you sure you want to reset this song's statistics?"
 msgstr "이 곡의 통계를 초기화하시겠습니까?"
 
-#: core/qtsystemtrayicon.cpp:257 collection/savedgroupingmanager.cpp:81
+#: core/qtsystemtrayicon.cpp:257 collection/savedgroupingmanager.cpp:85
 #: playlist/playlist.cpp:1168 organize/organizedialog.cpp:100
 #: ../build/src/ui_groupbydialog.h:184 ../build/src/ui_groupbydialog.h:206
 #: ../build/src/ui_groupbydialog.h:228 ../build/src/ui_albumcoversearcher.h:106
@@ -967,7 +967,7 @@ msgstr "행동"
 msgid "Best"
 msgstr "최고"
 
-#: context/contextview.cpp:216 collection/savedgroupingmanager.cpp:132
+#: context/contextview.cpp:216 collection/savedgroupingmanager.cpp:136
 #: playlist/playlist.cpp:1186 organize/organizedialog.cpp:115
 #: ../build/src/ui_groupbydialog.h:201 ../build/src/ui_groupbydialog.h:223
 #: ../build/src/ui_groupbydialog.h:245 ../build/src/ui_edittagdialog.h:671
@@ -978,7 +978,7 @@ msgstr "비트 해상도"
 msgid "Bit rate"
 msgstr "비트 전송률"
 
-#: context/contextview.cpp:217 collection/savedgroupingmanager.cpp:135
+#: context/contextview.cpp:217 collection/savedgroupingmanager.cpp:139
 #: playlist/playlist.cpp:1187 ../build/src/ui_groupbydialog.h:202
 #: ../build/src/ui_groupbydialog.h:224 ../build/src/ui_groupbydialog.h:246
 #: ../build/src/ui_transcoderoptionsaac.h:128
@@ -1201,7 +1201,7 @@ msgstr "자동으로 태그 완성"
 msgid "Complete tags automatically..."
 msgstr "자동으로 태그 완성..."
 
-#: collection/savedgroupingmanager.cpp:117 playlist/playlist.cpp:1177
+#: collection/savedgroupingmanager.cpp:118 playlist/playlist.cpp:1177
 #: organize/organizedialog.cpp:103 ../build/src/ui_groupbydialog.h:196
 #: ../build/src/ui_groupbydialog.h:218 ../build/src/ui_groupbydialog.h:240
 #: ../build/src/ui_edittagdialog.h:686
@@ -1572,7 +1572,7 @@ msgctxt "Refers to a disabled notification type in Notification settings."
 msgid "Disabled"
 msgstr "사용 안 함"
 
-#: collection/savedgroupingmanager.cpp:93 playlist/playlist.cpp:1171
+#: collection/savedgroupingmanager.cpp:106 playlist/playlist.cpp:1171
 #: organize/organizedialog.cpp:107 ../build/src/ui_groupbydialog.h:188
 #: ../build/src/ui_groupbydialog.h:210 ../build/src/ui_groupbydialog.h:232
 #: ../build/src/ui_edittagdialog.h:684
@@ -1976,7 +1976,7 @@ msgstr "파일 경로"
 msgid "File size"
 msgstr "파일 크기"
 
-#: collection/savedgroupingmanager.cpp:126 playlist/playlist.cpp:1192
+#: collection/savedgroupingmanager.cpp:127 playlist/playlist.cpp:1192
 #: ../build/src/ui_groupbydialog.h:199 ../build/src/ui_groupbydialog.h:221
 #: ../build/src/ui_groupbydialog.h:243 ../build/src/ui_edittagdialog.h:673
 msgid "File type"
@@ -2069,7 +2069,7 @@ msgstr ""
 msgid "Form"
 msgstr "폼"
 
-#: collection/savedgroupingmanager.cpp:96 ../build/src/ui_groupbydialog.h:189
+#: collection/savedgroupingmanager.cpp:130 ../build/src/ui_groupbydialog.h:189
 #: ../build/src/ui_groupbydialog.h:211 ../build/src/ui_groupbydialog.h:233
 msgid "Format"
 msgstr "형식"
@@ -2110,7 +2110,7 @@ msgstr "일반 설정"
 msgid "Genius Authentication"
 msgstr ""
 
-#: collection/savedgroupingmanager.cpp:99 playlist/playlist.cpp:1175
+#: collection/savedgroupingmanager.cpp:115 playlist/playlist.cpp:1175
 #: organize/organizedialog.cpp:110 ../build/src/ui_groupbydialog.h:190
 #: ../build/src/ui_groupbydialog.h:212 ../build/src/ui_groupbydialog.h:234
 #: ../build/src/ui_edittagdialog.h:680
@@ -2209,18 +2209,18 @@ msgstr "장르/앨범 아티스트/앨범으로 그룹"
 msgid "Group by Genre/Artist/Album"
 msgstr "장르/아티스트/앨범으로 그룹"
 
-#: collection/savedgroupingmanager.cpp:123 playlist/playlist.cpp:1179
+#: collection/savedgroupingmanager.cpp:124 playlist/playlist.cpp:1179
 #: organize/organizedialog.cpp:105 ../build/src/ui_groupbydialog.h:198
 #: ../build/src/ui_groupbydialog.h:220 ../build/src/ui_groupbydialog.h:242
 #: ../build/src/ui_edittagdialog.h:682
 msgid "Grouping"
 msgstr "그룹"
 
-#: collection/collectionfilterwidget.cpp:250
+#: collection/collectionfilterwidget.cpp:262
 msgid "Grouping Name"
 msgstr "그룹 이름"
 
-#: collection/collectionfilterwidget.cpp:250
+#: collection/collectionfilterwidget.cpp:262
 msgid "Grouping name:"
 msgstr "그룹 이름:"
 
@@ -2479,7 +2479,7 @@ msgstr "MTP 장치 불러오는 중"
 msgid "Loading iPod database"
 msgstr "iPod 데이터베이스 불러오는 중"
 
-#: collection/collectionmodel.cpp:214
+#: collection/collectionmodel.cpp:210
 msgid "Loading songs"
 msgstr "노래 불러오는 중"
 
@@ -2491,7 +2491,7 @@ msgstr "트랙 불러오는 중"
 msgid "Loading tracks info"
 msgstr "트랙 정보 불러오는 중"
 
-#: collection/collectionmodel.cpp:207 ../build/src/ui_organizedialog.h:281
+#: collection/collectionmodel.cpp:203 ../build/src/ui_organizedialog.h:281
 msgid "Loading..."
 msgstr "불러오는 중..."
 
@@ -2771,7 +2771,7 @@ msgstr "짧은 블록 없음"
 msgid "No song playing"
 msgstr "재생 중인 곡 없음"
 
-#: collection/savedgroupingmanager.cpp:78 ../build/src/ui_groupbydialog.h:183
+#: collection/savedgroupingmanager.cpp:79 ../build/src/ui_groupbydialog.h:183
 #: ../build/src/ui_groupbydialog.h:205 ../build/src/ui_groupbydialog.h:227
 msgid "None"
 msgstr "없음"
@@ -2905,17 +2905,21 @@ msgstr ""
 msgid "Original tags"
 msgstr "원본 태그"
 
-#: collection/savedgroupingmanager.cpp:111 playlist/playlist.cpp:1174
+#: collection/savedgroupingmanager.cpp:112 playlist/playlist.cpp:1174
 #: organize/organizedialog.cpp:109 ../build/src/ui_groupbydialog.h:194
 #: ../build/src/ui_groupbydialog.h:216 ../build/src/ui_groupbydialog.h:238
 msgid "Original year"
 msgstr "원본 년도"
 
-#: collection/savedgroupingmanager.cpp:114 ../build/src/ui_groupbydialog.h:195
+#: collection/savedgroupingmanager.cpp:100 ../build/src/ui_groupbydialog.h:195
 #: ../build/src/ui_groupbydialog.h:217 ../build/src/ui_groupbydialog.h:239
 msgid "Original year - Album"
 msgstr "원본 년도 - 앨범"
 
+#: collection/savedgroupingmanager.cpp:103
+msgid "Original year - Album - Disc"
+msgstr ""
+
 #: core/commandlineoptions.cpp:183
 msgid "Other options"
 msgstr "기타 옵션"
@@ -2973,7 +2977,7 @@ msgstr "재생 일시 정지"
 msgid "Paused"
 msgstr "일시 정지됨"
 
-#: collection/savedgroupingmanager.cpp:120 playlist/playlist.cpp:1178
+#: collection/savedgroupingmanager.cpp:121 playlist/playlist.cpp:1178
 #: organize/organizedialog.cpp:104 ../build/src/ui_groupbydialog.h:197
 #: ../build/src/ui_groupbydialog.h:219 ../build/src/ui_groupbydialog.h:241
 #: ../build/src/ui_edittagdialog.h:691
@@ -3495,7 +3499,7 @@ msgstr "안전하게 장치 제거"
 msgid "Safely remove the device after copying"
 msgstr "복사 후 안전하게 장치 제거"
 
-#: collection/savedgroupingmanager.cpp:129 playlist/playlist.cpp:1185
+#: collection/savedgroupingmanager.cpp:133 playlist/playlist.cpp:1185
 #: organize/organizedialog.cpp:114 ../build/src/ui_groupbydialog.h:200
 #: ../build/src/ui_groupbydialog.h:222 ../build/src/ui_groupbydialog.h:244
 #: ../build/src/ui_edittagdialog.h:670
@@ -4375,10 +4379,10 @@ msgid "Ultra wide band (UWB)"
 msgstr "초광대역(UWB)"
 
 #: core/song.cpp:538 context/contextalbumsmodel.cpp:357
-#: collection/collectionmodel.cpp:433 collection/collectionmodel.cpp:438
-#: collection/collectionmodel.cpp:442 collection/collectionmodel.cpp:446
-#: collection/collectionmodel.cpp:450 collection/collectionmodel.cpp:1407
-#: collection/savedgroupingmanager.cpp:137 playlist/playlistdelegates.cpp:353
+#: collection/collectionmodel.cpp:461 collection/collectionmodel.cpp:466
+#: collection/collectionmodel.cpp:470 collection/collectionmodel.cpp:474
+#: collection/collectionmodel.cpp:478 collection/collectionmodel.cpp:1589
+#: collection/savedgroupingmanager.cpp:143 playlist/playlistdelegates.cpp:353
 #: playlist/playlistmanager.cpp:554 playlist/playlistmanager.cpp:555
 #: dialogs/edittagdialog.cpp:494 dialogs/edittagdialog.cpp:542
 #: ../build/src/ui_scrobblersettingspage.h:393
@@ -4537,9 +4541,9 @@ msgstr "메뉴에서 음악을 추가했을 때..."
 msgid "Variable bit rate"
 msgstr "가변 비트 전송률"
 
-#: collection/collectionmodel.cpp:347 playlist/playlistmanager.cpp:566
-#: covermanager/albumcovermanager.cpp:333 internet/internetsearchmodel.cpp:94
-#: internet/internetsearchmodel.cpp:106
+#: collection/collectionmodel.cpp:371 collection/collectionmodel.cpp:372
+#: playlist/playlistmanager.cpp:566 covermanager/albumcovermanager.cpp:333
+#: internet/internetsearchmodel.cpp:94 internet/internetsearchmodel.cpp:106
 msgid "Various artists"
 msgstr "편집 음반"
 
@@ -4616,9 +4620,9 @@ msgstr "오프라인 모드로 작업(스크로블을 캐시에만 추가)"
 
 #: collection/collectionview.cpp:476
 msgid ""
-"Would you like to move the other songs in this album to Various Artists as "
+"Would you like to move the other songs on this album to Various Artists as "
 "well?"
-msgstr "이 앨범의 다른 곡도 편집 음반으로 이동하시겠습니까?"
+msgstr ""
 
 #: core/mainwindow.cpp:2651
 msgid "Would you like to run a full rescan right now?"
@@ -4628,7 +4632,7 @@ msgstr "지금 전부 다시 검색하시겠습니까?"
 msgid "Write metadata when saving playlists"
 msgstr "재생 목록을 저장할 때 메타데이터 쓰기"
 
-#: collection/savedgroupingmanager.cpp:102 playlist/playlist.cpp:1173
+#: collection/savedgroupingmanager.cpp:109 playlist/playlist.cpp:1173
 #: organize/organizedialog.cpp:108 ../build/src/ui_groupbydialog.h:191
 #: ../build/src/ui_groupbydialog.h:213 ../build/src/ui_groupbydialog.h:235
 #: ../build/src/ui_edittagdialog.h:690
@@ -4636,12 +4640,12 @@ msgstr "재생 목록을 저장할 때 메타데이터 쓰기"
 msgid "Year"
 msgstr "년도"
 
-#: collection/savedgroupingmanager.cpp:105 ../build/src/ui_groupbydialog.h:192
+#: collection/savedgroupingmanager.cpp:94 ../build/src/ui_groupbydialog.h:192
 #: ../build/src/ui_groupbydialog.h:214 ../build/src/ui_groupbydialog.h:236
 msgid "Year - Album"
 msgstr "년도 - 앨범"
 
-#: collection/savedgroupingmanager.cpp:108 ../build/src/ui_groupbydialog.h:193
+#: collection/savedgroupingmanager.cpp:97 ../build/src/ui_groupbydialog.h:193
 #: ../build/src/ui_groupbydialog.h:215 ../build/src/ui_groupbydialog.h:237
 msgid "Year - Album - Disc"
 msgstr "년도 - 앨범 - 디스크"
diff --git a/src/translations/nb.po b/src/translations/nb.po
index 10a6897c4..ec01d87fd 100644
--- a/src/translations/nb.po
+++ b/src/translations/nb.po
@@ -675,7 +675,7 @@ msgstr "Lagt til i dag"
 msgid "Added within three months"
 msgstr "Lagt til innen tre måneder"
 
-#: collection/collectionfilterwidget.cpp:229
+#: collection/collectionfilterwidget.cpp:241
 msgid "Advanced grouping..."
 msgstr "Avansert gruppering…"
 
@@ -687,7 +687,7 @@ msgstr "Etter kopiering…"
 msgid "Albu&m cover"
 msgstr "Albu&m kover"
 
-#: core/qtsystemtrayicon.cpp:259 collection/savedgroupingmanager.cpp:87
+#: core/qtsystemtrayicon.cpp:259 collection/savedgroupingmanager.cpp:88
 #: playlist/playlist.cpp:1169 organize/organizedialog.cpp:99
 #: ../build/src/ui_groupbydialog.h:186 ../build/src/ui_groupbydialog.h:208
 #: ../build/src/ui_groupbydialog.h:230 ../build/src/ui_albumcoversearcher.h:110
@@ -702,12 +702,12 @@ msgstr "Album"
 msgid "Album (ideal loudness for all tracks)"
 msgstr "Album (ideell lydstyrkeutgjevning for alle spor)"
 
-#: collection/savedgroupingmanager.cpp:90 ../build/src/ui_groupbydialog.h:187
+#: collection/savedgroupingmanager.cpp:91 ../build/src/ui_groupbydialog.h:187
 #: ../build/src/ui_groupbydialog.h:209 ../build/src/ui_groupbydialog.h:231
 msgid "Album - Disc"
 msgstr "Album - Disc"
 
-#: collection/savedgroupingmanager.cpp:84 playlist/playlist.cpp:1176
+#: collection/savedgroupingmanager.cpp:82 playlist/playlist.cpp:1176
 #: organize/organizedialog.cpp:102 ../build/src/ui_groupbydialog.h:185
 #: ../build/src/ui_groupbydialog.h:207 ../build/src/ui_groupbydialog.h:229
 #: ../build/src/ui_edittagdialog.h:685
@@ -834,7 +834,7 @@ msgid "Are you sure you want to reset this song's statistics?"
 msgstr ""
 "Er du sikker på at du ønsker å nullstille statistikk for denne sangen?"
 
-#: core/qtsystemtrayicon.cpp:257 collection/savedgroupingmanager.cpp:81
+#: core/qtsystemtrayicon.cpp:257 collection/savedgroupingmanager.cpp:85
 #: playlist/playlist.cpp:1168 organize/organizedialog.cpp:100
 #: ../build/src/ui_groupbydialog.h:184 ../build/src/ui_groupbydialog.h:206
 #: ../build/src/ui_groupbydialog.h:228 ../build/src/ui_albumcoversearcher.h:106
@@ -971,7 +971,7 @@ msgstr "Adferd"
 msgid "Best"
 msgstr "Best"
 
-#: context/contextview.cpp:216 collection/savedgroupingmanager.cpp:132
+#: context/contextview.cpp:216 collection/savedgroupingmanager.cpp:136
 #: playlist/playlist.cpp:1186 organize/organizedialog.cpp:115
 #: ../build/src/ui_groupbydialog.h:201 ../build/src/ui_groupbydialog.h:223
 #: ../build/src/ui_groupbydialog.h:245 ../build/src/ui_edittagdialog.h:671
@@ -982,7 +982,7 @@ msgstr "Bit dybde"
 msgid "Bit rate"
 msgstr "Bitrate"
 
-#: context/contextview.cpp:217 collection/savedgroupingmanager.cpp:135
+#: context/contextview.cpp:217 collection/savedgroupingmanager.cpp:139
 #: playlist/playlist.cpp:1187 ../build/src/ui_groupbydialog.h:202
 #: ../build/src/ui_groupbydialog.h:224 ../build/src/ui_groupbydialog.h:246
 #: ../build/src/ui_transcoderoptionsaac.h:128
@@ -1206,7 +1206,7 @@ msgstr "Fyll ut etiketter automatisk"
 msgid "Complete tags automatically..."
 msgstr "Full ut etiketter automatisk…"
 
-#: collection/savedgroupingmanager.cpp:117 playlist/playlist.cpp:1177
+#: collection/savedgroupingmanager.cpp:118 playlist/playlist.cpp:1177
 #: organize/organizedialog.cpp:103 ../build/src/ui_groupbydialog.h:196
 #: ../build/src/ui_groupbydialog.h:218 ../build/src/ui_groupbydialog.h:240
 #: ../build/src/ui_edittagdialog.h:686
@@ -1583,7 +1583,7 @@ msgctxt "Refers to a disabled notification type in Notification settings."
 msgid "Disabled"
 msgstr "Avskrudd"
 
-#: collection/savedgroupingmanager.cpp:93 playlist/playlist.cpp:1171
+#: collection/savedgroupingmanager.cpp:106 playlist/playlist.cpp:1171
 #: organize/organizedialog.cpp:107 ../build/src/ui_groupbydialog.h:188
 #: ../build/src/ui_groupbydialog.h:210 ../build/src/ui_groupbydialog.h:232
 #: ../build/src/ui_edittagdialog.h:684
@@ -1987,7 +1987,7 @@ msgstr "Filstier"
 msgid "File size"
 msgstr "Filstørrelse"
 
-#: collection/savedgroupingmanager.cpp:126 playlist/playlist.cpp:1192
+#: collection/savedgroupingmanager.cpp:127 playlist/playlist.cpp:1192
 #: ../build/src/ui_groupbydialog.h:199 ../build/src/ui_groupbydialog.h:221
 #: ../build/src/ui_groupbydialog.h:243 ../build/src/ui_edittagdialog.h:673
 msgid "File type"
@@ -2081,7 +2081,7 @@ msgstr ""
 msgid "Form"
 msgstr "Skjema"
 
-#: collection/savedgroupingmanager.cpp:96 ../build/src/ui_groupbydialog.h:189
+#: collection/savedgroupingmanager.cpp:130 ../build/src/ui_groupbydialog.h:189
 #: ../build/src/ui_groupbydialog.h:211 ../build/src/ui_groupbydialog.h:233
 msgid "Format"
 msgstr "Format"
@@ -2122,7 +2122,7 @@ msgstr "Generelle innstillinger"
 msgid "Genius Authentication"
 msgstr ""
 
-#: collection/savedgroupingmanager.cpp:99 playlist/playlist.cpp:1175
+#: collection/savedgroupingmanager.cpp:115 playlist/playlist.cpp:1175
 #: organize/organizedialog.cpp:110 ../build/src/ui_groupbydialog.h:190
 #: ../build/src/ui_groupbydialog.h:212 ../build/src/ui_groupbydialog.h:234
 #: ../build/src/ui_edittagdialog.h:680
@@ -2221,18 +2221,18 @@ msgstr "Grupper etter sjanger/album artist/album"
 msgid "Group by Genre/Artist/Album"
 msgstr "Grupper etter sjanger/artist/album"
 
-#: collection/savedgroupingmanager.cpp:123 playlist/playlist.cpp:1179
+#: collection/savedgroupingmanager.cpp:124 playlist/playlist.cpp:1179
 #: organize/organizedialog.cpp:105 ../build/src/ui_groupbydialog.h:198
 #: ../build/src/ui_groupbydialog.h:220 ../build/src/ui_groupbydialog.h:242
 #: ../build/src/ui_edittagdialog.h:682
 msgid "Grouping"
 msgstr "Gruppering"
 
-#: collection/collectionfilterwidget.cpp:250
+#: collection/collectionfilterwidget.cpp:262
 msgid "Grouping Name"
 msgstr "Grupperingsnavn"
 
-#: collection/collectionfilterwidget.cpp:250
+#: collection/collectionfilterwidget.cpp:262
 msgid "Grouping name:"
 msgstr "Grupperingsnavn:"
 
@@ -2494,7 +2494,7 @@ msgstr "Åpner MTP-enhet"
 msgid "Loading iPod database"
 msgstr "Åpner iPod-database"
 
-#: collection/collectionmodel.cpp:214
+#: collection/collectionmodel.cpp:210
 msgid "Loading songs"
 msgstr "Åpner sanger"
 
@@ -2506,7 +2506,7 @@ msgstr "Åpner spor"
 msgid "Loading tracks info"
 msgstr "Henter informasjon om spor"
 
-#: collection/collectionmodel.cpp:207 ../build/src/ui_organizedialog.h:281
+#: collection/collectionmodel.cpp:203 ../build/src/ui_organizedialog.h:281
 msgid "Loading..."
 msgstr "Åpner…"
 
@@ -2786,7 +2786,7 @@ msgstr "Ikke korte blokker"
 msgid "No song playing"
 msgstr "Ingen sang spilles"
 
-#: collection/savedgroupingmanager.cpp:78 ../build/src/ui_groupbydialog.h:183
+#: collection/savedgroupingmanager.cpp:79 ../build/src/ui_groupbydialog.h:183
 #: ../build/src/ui_groupbydialog.h:205 ../build/src/ui_groupbydialog.h:227
 msgid "None"
 msgstr "Ingen"
@@ -2920,17 +2920,21 @@ msgstr ""
 msgid "Original tags"
 msgstr "Opprinnelige tagger"
 
-#: collection/savedgroupingmanager.cpp:111 playlist/playlist.cpp:1174
+#: collection/savedgroupingmanager.cpp:112 playlist/playlist.cpp:1174
 #: organize/organizedialog.cpp:109 ../build/src/ui_groupbydialog.h:194
 #: ../build/src/ui_groupbydialog.h:216 ../build/src/ui_groupbydialog.h:238
 msgid "Original year"
 msgstr "Opprinnelig år"
 
-#: collection/savedgroupingmanager.cpp:114 ../build/src/ui_groupbydialog.h:195
+#: collection/savedgroupingmanager.cpp:100 ../build/src/ui_groupbydialog.h:195
 #: ../build/src/ui_groupbydialog.h:217 ../build/src/ui_groupbydialog.h:239
 msgid "Original year - Album"
 msgstr "Opprinnelig år - album"
 
+#: collection/savedgroupingmanager.cpp:103
+msgid "Original year - Album - Disc"
+msgstr ""
+
 #: core/commandlineoptions.cpp:183
 msgid "Other options"
 msgstr "Andre innstillinger"
@@ -2988,7 +2992,7 @@ msgstr "Sett avspilling på pause"
 msgid "Paused"
 msgstr "På pause"
 
-#: collection/savedgroupingmanager.cpp:120 playlist/playlist.cpp:1178
+#: collection/savedgroupingmanager.cpp:121 playlist/playlist.cpp:1178
 #: organize/organizedialog.cpp:104 ../build/src/ui_groupbydialog.h:197
 #: ../build/src/ui_groupbydialog.h:219 ../build/src/ui_groupbydialog.h:241
 #: ../build/src/ui_edittagdialog.h:691
@@ -3513,7 +3517,7 @@ msgstr "Trygg fjerning av enhet"
 msgid "Safely remove the device after copying"
 msgstr "Kjør trygg fjerning av enhet etter kopiering"
 
-#: collection/savedgroupingmanager.cpp:129 playlist/playlist.cpp:1185
+#: collection/savedgroupingmanager.cpp:133 playlist/playlist.cpp:1185
 #: organize/organizedialog.cpp:114 ../build/src/ui_groupbydialog.h:200
 #: ../build/src/ui_groupbydialog.h:222 ../build/src/ui_groupbydialog.h:244
 #: ../build/src/ui_edittagdialog.h:670
@@ -4411,10 +4415,10 @@ msgid "Ultra wide band (UWB)"
 msgstr "Ultrabredt bånd (UWB)"
 
 #: core/song.cpp:538 context/contextalbumsmodel.cpp:357
-#: collection/collectionmodel.cpp:433 collection/collectionmodel.cpp:438
-#: collection/collectionmodel.cpp:442 collection/collectionmodel.cpp:446
-#: collection/collectionmodel.cpp:450 collection/collectionmodel.cpp:1407
-#: collection/savedgroupingmanager.cpp:137 playlist/playlistdelegates.cpp:353
+#: collection/collectionmodel.cpp:461 collection/collectionmodel.cpp:466
+#: collection/collectionmodel.cpp:470 collection/collectionmodel.cpp:474
+#: collection/collectionmodel.cpp:478 collection/collectionmodel.cpp:1589
+#: collection/savedgroupingmanager.cpp:143 playlist/playlistdelegates.cpp:353
 #: playlist/playlistmanager.cpp:554 playlist/playlistmanager.cpp:555
 #: dialogs/edittagdialog.cpp:494 dialogs/edittagdialog.cpp:542
 #: ../build/src/ui_scrobblersettingspage.h:393
@@ -4575,9 +4579,9 @@ msgstr "Bruk av menyen for å legge til et spor vil…"
 msgid "Variable bit rate"
 msgstr "Variabel bitrate"
 
-#: collection/collectionmodel.cpp:347 playlist/playlistmanager.cpp:566
-#: covermanager/albumcovermanager.cpp:333 internet/internetsearchmodel.cpp:94
-#: internet/internetsearchmodel.cpp:106
+#: collection/collectionmodel.cpp:371 collection/collectionmodel.cpp:372
+#: playlist/playlistmanager.cpp:566 covermanager/albumcovermanager.cpp:333
+#: internet/internetsearchmodel.cpp:94 internet/internetsearchmodel.cpp:106
 msgid "Various artists"
 msgstr "Diverse artister"
 
@@ -4654,10 +4658,9 @@ msgstr "Jobb i frakoblet modus (bare cache scrobbler)"
 
 #: collection/collectionview.cpp:476
 msgid ""
-"Would you like to move the other songs in this album to Various Artists as "
+"Would you like to move the other songs on this album to Various Artists as "
 "well?"
 msgstr ""
-"Ønsker du å også flytte resten av sangene fra albumet til diverse artister?"
 
 #: core/mainwindow.cpp:2651
 msgid "Would you like to run a full rescan right now?"
@@ -4667,7 +4670,7 @@ msgstr "Vil du søke gjennom hele samlingen på ny nå?"
 msgid "Write metadata when saving playlists"
 msgstr "Skrev metadata når spilleliste lagres"
 
-#: collection/savedgroupingmanager.cpp:102 playlist/playlist.cpp:1173
+#: collection/savedgroupingmanager.cpp:109 playlist/playlist.cpp:1173
 #: organize/organizedialog.cpp:108 ../build/src/ui_groupbydialog.h:191
 #: ../build/src/ui_groupbydialog.h:213 ../build/src/ui_groupbydialog.h:235
 #: ../build/src/ui_edittagdialog.h:690
@@ -4675,12 +4678,12 @@ msgstr "Skrev metadata når spilleliste lagres"
 msgid "Year"
 msgstr "År"
 
-#: collection/savedgroupingmanager.cpp:105 ../build/src/ui_groupbydialog.h:192
+#: collection/savedgroupingmanager.cpp:94 ../build/src/ui_groupbydialog.h:192
 #: ../build/src/ui_groupbydialog.h:214 ../build/src/ui_groupbydialog.h:236
 msgid "Year - Album"
 msgstr "År - album"
 
-#: collection/savedgroupingmanager.cpp:108 ../build/src/ui_groupbydialog.h:193
+#: collection/savedgroupingmanager.cpp:97 ../build/src/ui_groupbydialog.h:193
 #: ../build/src/ui_groupbydialog.h:215 ../build/src/ui_groupbydialog.h:237
 msgid "Year - Album - Disc"
 msgstr "År - album - disc"
diff --git a/src/translations/pl.po b/src/translations/pl.po
index 69f356c9b..63c4b9ccd 100644
--- a/src/translations/pl.po
+++ b/src/translations/pl.po
@@ -693,7 +693,7 @@ msgstr "Dodane dzisiaj"
 msgid "Added within three months"
 msgstr "Dodane w ciągu ostatnich trzech miesięcy"
 
-#: collection/collectionfilterwidget.cpp:229
+#: collection/collectionfilterwidget.cpp:241
 msgid "Advanced grouping..."
 msgstr "Zaawansowane grupowanie…"
 
@@ -705,7 +705,7 @@ msgstr "Po skopiowaniu…"
 msgid "Albu&m cover"
 msgstr "Okładka albu&mu"
 
-#: core/qtsystemtrayicon.cpp:259 collection/savedgroupingmanager.cpp:87
+#: core/qtsystemtrayicon.cpp:259 collection/savedgroupingmanager.cpp:88
 #: playlist/playlist.cpp:1169 organize/organizedialog.cpp:99
 #: ../build/src/ui_groupbydialog.h:186 ../build/src/ui_groupbydialog.h:208
 #: ../build/src/ui_groupbydialog.h:230 ../build/src/ui_albumcoversearcher.h:110
@@ -720,12 +720,12 @@ msgstr "Album"
 msgid "Album (ideal loudness for all tracks)"
 msgstr "Według albumu (najlepsza głośność dla wszystkich ścieżek)"
 
-#: collection/savedgroupingmanager.cpp:90 ../build/src/ui_groupbydialog.h:187
+#: collection/savedgroupingmanager.cpp:91 ../build/src/ui_groupbydialog.h:187
 #: ../build/src/ui_groupbydialog.h:209 ../build/src/ui_groupbydialog.h:231
 msgid "Album - Disc"
 msgstr "Album - Płyta"
 
-#: collection/savedgroupingmanager.cpp:84 playlist/playlist.cpp:1176
+#: collection/savedgroupingmanager.cpp:82 playlist/playlist.cpp:1176
 #: organize/organizedialog.cpp:102 ../build/src/ui_groupbydialog.h:185
 #: ../build/src/ui_groupbydialog.h:207 ../build/src/ui_groupbydialog.h:229
 #: ../build/src/ui_edittagdialog.h:685
@@ -851,7 +851,7 @@ msgstr "Na pewno chcesz usunąć ustawienie „%1”?"
 msgid "Are you sure you want to reset this song's statistics?"
 msgstr "Na pewno wyzerować statystyki tego utworu?"
 
-#: core/qtsystemtrayicon.cpp:257 collection/savedgroupingmanager.cpp:81
+#: core/qtsystemtrayicon.cpp:257 collection/savedgroupingmanager.cpp:85
 #: playlist/playlist.cpp:1168 organize/organizedialog.cpp:100
 #: ../build/src/ui_groupbydialog.h:184 ../build/src/ui_groupbydialog.h:206
 #: ../build/src/ui_groupbydialog.h:228 ../build/src/ui_albumcoversearcher.h:106
@@ -988,7 +988,7 @@ msgstr "Zachowanie"
 msgid "Best"
 msgstr "Najlepsza"
 
-#: context/contextview.cpp:216 collection/savedgroupingmanager.cpp:132
+#: context/contextview.cpp:216 collection/savedgroupingmanager.cpp:136
 #: playlist/playlist.cpp:1186 organize/organizedialog.cpp:115
 #: ../build/src/ui_groupbydialog.h:201 ../build/src/ui_groupbydialog.h:223
 #: ../build/src/ui_groupbydialog.h:245 ../build/src/ui_edittagdialog.h:671
@@ -999,7 +999,7 @@ msgstr "Rozdzielczość bitowa"
 msgid "Bit rate"
 msgstr "Przepływność"
 
-#: context/contextview.cpp:217 collection/savedgroupingmanager.cpp:135
+#: context/contextview.cpp:217 collection/savedgroupingmanager.cpp:139
 #: playlist/playlist.cpp:1187 ../build/src/ui_groupbydialog.h:202
 #: ../build/src/ui_groupbydialog.h:224 ../build/src/ui_groupbydialog.h:246
 #: ../build/src/ui_transcoderoptionsaac.h:128
@@ -1227,7 +1227,7 @@ msgstr "Automatycznie uzupełnij znaczniki"
 msgid "Complete tags automatically..."
 msgstr "Automatycznie uzupełnij znaczniki…"
 
-#: collection/savedgroupingmanager.cpp:117 playlist/playlist.cpp:1177
+#: collection/savedgroupingmanager.cpp:118 playlist/playlist.cpp:1177
 #: organize/organizedialog.cpp:103 ../build/src/ui_groupbydialog.h:196
 #: ../build/src/ui_groupbydialog.h:218 ../build/src/ui_groupbydialog.h:240
 #: ../build/src/ui_edittagdialog.h:686
@@ -1605,7 +1605,7 @@ msgctxt "Refers to a disabled notification type in Notification settings."
 msgid "Disabled"
 msgstr "Wyłączone"
 
-#: collection/savedgroupingmanager.cpp:93 playlist/playlist.cpp:1171
+#: collection/savedgroupingmanager.cpp:106 playlist/playlist.cpp:1171
 #: organize/organizedialog.cpp:107 ../build/src/ui_groupbydialog.h:188
 #: ../build/src/ui_groupbydialog.h:210 ../build/src/ui_groupbydialog.h:232
 #: ../build/src/ui_edittagdialog.h:684
@@ -2011,7 +2011,7 @@ msgstr "Ścieżki plików"
 msgid "File size"
 msgstr "Wielkość pliku"
 
-#: collection/savedgroupingmanager.cpp:126 playlist/playlist.cpp:1192
+#: collection/savedgroupingmanager.cpp:127 playlist/playlist.cpp:1192
 #: ../build/src/ui_groupbydialog.h:199 ../build/src/ui_groupbydialog.h:221
 #: ../build/src/ui_groupbydialog.h:243 ../build/src/ui_edittagdialog.h:673
 msgid "File type"
@@ -2106,7 +2106,7 @@ msgstr ""
 msgid "Form"
 msgstr "Forma"
 
-#: collection/savedgroupingmanager.cpp:96 ../build/src/ui_groupbydialog.h:189
+#: collection/savedgroupingmanager.cpp:130 ../build/src/ui_groupbydialog.h:189
 #: ../build/src/ui_groupbydialog.h:211 ../build/src/ui_groupbydialog.h:233
 msgid "Format"
 msgstr "Format"
@@ -2147,7 +2147,7 @@ msgstr "Ustawienia ogólne"
 msgid "Genius Authentication"
 msgstr "Uwierzytelnianie Geniusa"
 
-#: collection/savedgroupingmanager.cpp:99 playlist/playlist.cpp:1175
+#: collection/savedgroupingmanager.cpp:115 playlist/playlist.cpp:1175
 #: organize/organizedialog.cpp:110 ../build/src/ui_groupbydialog.h:190
 #: ../build/src/ui_groupbydialog.h:212 ../build/src/ui_groupbydialog.h:234
 #: ../build/src/ui_edittagdialog.h:680
@@ -2248,18 +2248,18 @@ msgstr "Gatunek/Artysta albumu/Album"
 msgid "Group by Genre/Artist/Album"
 msgstr "Gatunek/Artysta/Album"
 
-#: collection/savedgroupingmanager.cpp:123 playlist/playlist.cpp:1179
+#: collection/savedgroupingmanager.cpp:124 playlist/playlist.cpp:1179
 #: organize/organizedialog.cpp:105 ../build/src/ui_groupbydialog.h:198
 #: ../build/src/ui_groupbydialog.h:220 ../build/src/ui_groupbydialog.h:242
 #: ../build/src/ui_edittagdialog.h:682
 msgid "Grouping"
 msgstr "Grupowanie"
 
-#: collection/collectionfilterwidget.cpp:250
+#: collection/collectionfilterwidget.cpp:262
 msgid "Grouping Name"
 msgstr "Nazwa grupowania"
 
-#: collection/collectionfilterwidget.cpp:250
+#: collection/collectionfilterwidget.cpp:262
 msgid "Grouping name:"
 msgstr "Nazwa grupowania:"
 
@@ -2528,7 +2528,7 @@ msgstr "Wczytywanie urządzenia MTP"
 msgid "Loading iPod database"
 msgstr "Wczytywanie bazy danych iPoda"
 
-#: collection/collectionmodel.cpp:214
+#: collection/collectionmodel.cpp:210
 msgid "Loading songs"
 msgstr "Wczytywanie utworów"
 
@@ -2540,7 +2540,7 @@ msgstr "Wczytywanie ścieżek"
 msgid "Loading tracks info"
 msgstr "Wczytywanie informacji o utworze"
 
-#: collection/collectionmodel.cpp:207 ../build/src/ui_organizedialog.h:281
+#: collection/collectionmodel.cpp:203 ../build/src/ui_organizedialog.h:281
 msgid "Loading..."
 msgstr "Wczytywanie…"
 
@@ -2822,7 +2822,7 @@ msgstr "Bez krótkich bloków"
 msgid "No song playing"
 msgstr "Żaden utwór nie jest odtwarzany"
 
-#: collection/savedgroupingmanager.cpp:78 ../build/src/ui_groupbydialog.h:183
+#: collection/savedgroupingmanager.cpp:79 ../build/src/ui_groupbydialog.h:183
 #: ../build/src/ui_groupbydialog.h:205 ../build/src/ui_groupbydialog.h:227
 msgid "None"
 msgstr "Brak"
@@ -2958,17 +2958,21 @@ msgstr "Organizuję pliki"
 msgid "Original tags"
 msgstr "Oryginalne znaczniki"
 
-#: collection/savedgroupingmanager.cpp:111 playlist/playlist.cpp:1174
+#: collection/savedgroupingmanager.cpp:112 playlist/playlist.cpp:1174
 #: organize/organizedialog.cpp:109 ../build/src/ui_groupbydialog.h:194
 #: ../build/src/ui_groupbydialog.h:216 ../build/src/ui_groupbydialog.h:238
 msgid "Original year"
 msgstr "Oryginalny rok"
 
-#: collection/savedgroupingmanager.cpp:114 ../build/src/ui_groupbydialog.h:195
+#: collection/savedgroupingmanager.cpp:100 ../build/src/ui_groupbydialog.h:195
 #: ../build/src/ui_groupbydialog.h:217 ../build/src/ui_groupbydialog.h:239
 msgid "Original year - Album"
 msgstr "Oryginalny rok - Album"
 
+#: collection/savedgroupingmanager.cpp:103
+msgid "Original year - Album - Disc"
+msgstr ""
+
 #: core/commandlineoptions.cpp:183
 msgid "Other options"
 msgstr "Inne opcje"
@@ -3026,7 +3030,7 @@ msgstr "Wstrzymaj odtwarzanie"
 msgid "Paused"
 msgstr "Wstrzymane"
 
-#: collection/savedgroupingmanager.cpp:120 playlist/playlist.cpp:1178
+#: collection/savedgroupingmanager.cpp:121 playlist/playlist.cpp:1178
 #: organize/organizedialog.cpp:104 ../build/src/ui_groupbydialog.h:197
 #: ../build/src/ui_groupbydialog.h:219 ../build/src/ui_groupbydialog.h:241
 #: ../build/src/ui_edittagdialog.h:691
@@ -3564,7 +3568,7 @@ msgstr "Bezpiecznie usuń urządzenie"
 msgid "Safely remove the device after copying"
 msgstr "Bezpiecznie usuń urządzenie po skopiowaniu"
 
-#: collection/savedgroupingmanager.cpp:129 playlist/playlist.cpp:1185
+#: collection/savedgroupingmanager.cpp:133 playlist/playlist.cpp:1185
 #: organize/organizedialog.cpp:114 ../build/src/ui_groupbydialog.h:200
 #: ../build/src/ui_groupbydialog.h:222 ../build/src/ui_groupbydialog.h:244
 #: ../build/src/ui_edittagdialog.h:670
@@ -4466,10 +4470,10 @@ msgid "Ultra wide band (UWB)"
 msgstr "Ultraszerokie pasmo (UWB)"
 
 #: core/song.cpp:538 context/contextalbumsmodel.cpp:357
-#: collection/collectionmodel.cpp:433 collection/collectionmodel.cpp:438
-#: collection/collectionmodel.cpp:442 collection/collectionmodel.cpp:446
-#: collection/collectionmodel.cpp:450 collection/collectionmodel.cpp:1407
-#: collection/savedgroupingmanager.cpp:137 playlist/playlistdelegates.cpp:353
+#: collection/collectionmodel.cpp:461 collection/collectionmodel.cpp:466
+#: collection/collectionmodel.cpp:470 collection/collectionmodel.cpp:474
+#: collection/collectionmodel.cpp:478 collection/collectionmodel.cpp:1589
+#: collection/savedgroupingmanager.cpp:143 playlist/playlistdelegates.cpp:353
 #: playlist/playlistmanager.cpp:554 playlist/playlistmanager.cpp:555
 #: dialogs/edittagdialog.cpp:494 dialogs/edittagdialog.cpp:542
 #: ../build/src/ui_scrobblersettingspage.h:393
@@ -4630,9 +4634,9 @@ msgstr "Po dodaniu utworu z menu kontekstowego..."
 msgid "Variable bit rate"
 msgstr "Zmienna przepływność (VBR)"
 
-#: collection/collectionmodel.cpp:347 playlist/playlistmanager.cpp:566
-#: covermanager/albumcovermanager.cpp:333 internet/internetsearchmodel.cpp:94
-#: internet/internetsearchmodel.cpp:106
+#: collection/collectionmodel.cpp:371 collection/collectionmodel.cpp:372
+#: playlist/playlistmanager.cpp:566 covermanager/albumcovermanager.cpp:333
+#: internet/internetsearchmodel.cpp:94 internet/internetsearchmodel.cpp:106
 msgid "Various artists"
 msgstr "Różni artyści"
 
@@ -4715,11 +4719,9 @@ msgstr "Pracuj w trybie offline (tylko scrobble z pamięci podręcznej)"
 
 #: collection/collectionview.cpp:476
 msgid ""
-"Would you like to move the other songs in this album to Various Artists as "
+"Would you like to move the other songs on this album to Various Artists as "
 "well?"
 msgstr ""
-"Czy chciałbyś przenieść także inne utwory z tego albumu do „Różnych "
-"artystów”?"
 
 #: core/mainwindow.cpp:2651
 msgid "Would you like to run a full rescan right now?"
@@ -4729,7 +4731,7 @@ msgstr "Chcesz wykonać pełne skanowanie od nowa teraz?"
 msgid "Write metadata when saving playlists"
 msgstr "Zapisuj medatane podczas zapisywania list odtwarzania"
 
-#: collection/savedgroupingmanager.cpp:102 playlist/playlist.cpp:1173
+#: collection/savedgroupingmanager.cpp:109 playlist/playlist.cpp:1173
 #: organize/organizedialog.cpp:108 ../build/src/ui_groupbydialog.h:191
 #: ../build/src/ui_groupbydialog.h:213 ../build/src/ui_groupbydialog.h:235
 #: ../build/src/ui_edittagdialog.h:690
@@ -4737,12 +4739,12 @@ msgstr "Zapisuj medatane podczas zapisywania list odtwarzania"
 msgid "Year"
 msgstr "Rok"
 
-#: collection/savedgroupingmanager.cpp:105 ../build/src/ui_groupbydialog.h:192
+#: collection/savedgroupingmanager.cpp:94 ../build/src/ui_groupbydialog.h:192
 #: ../build/src/ui_groupbydialog.h:214 ../build/src/ui_groupbydialog.h:236
 msgid "Year - Album"
 msgstr "Rok - Album"
 
-#: collection/savedgroupingmanager.cpp:108 ../build/src/ui_groupbydialog.h:193
+#: collection/savedgroupingmanager.cpp:97 ../build/src/ui_groupbydialog.h:193
 #: ../build/src/ui_groupbydialog.h:215 ../build/src/ui_groupbydialog.h:237
 msgid "Year - Album - Disc"
 msgstr "Rok - Album - Płyta"
diff --git a/src/translations/ru.po b/src/translations/ru.po
index d891317a8..6ff4943ed 100644
--- a/src/translations/ru.po
+++ b/src/translations/ru.po
@@ -699,7 +699,7 @@ msgstr "Добавлено сегодня"
 msgid "Added within three months"
 msgstr "Добавлено за три месяца"
 
-#: collection/collectionfilterwidget.cpp:229
+#: collection/collectionfilterwidget.cpp:241
 msgid "Advanced grouping..."
 msgstr "Расширенная сортировка…"
 
@@ -711,7 +711,7 @@ msgstr "После копирования…"
 msgid "Albu&m cover"
 msgstr "О&бложка альбома"
 
-#: core/qtsystemtrayicon.cpp:259 collection/savedgroupingmanager.cpp:87
+#: core/qtsystemtrayicon.cpp:259 collection/savedgroupingmanager.cpp:88
 #: playlist/playlist.cpp:1169 organize/organizedialog.cpp:99
 #: ../build/src/ui_groupbydialog.h:186 ../build/src/ui_groupbydialog.h:208
 #: ../build/src/ui_groupbydialog.h:230 ../build/src/ui_albumcoversearcher.h:110
@@ -726,12 +726,12 @@ msgstr "Альбом"
 msgid "Album (ideal loudness for all tracks)"
 msgstr "Альбом (идеальная громкость всех треков)"
 
-#: collection/savedgroupingmanager.cpp:90 ../build/src/ui_groupbydialog.h:187
+#: collection/savedgroupingmanager.cpp:91 ../build/src/ui_groupbydialog.h:187
 #: ../build/src/ui_groupbydialog.h:209 ../build/src/ui_groupbydialog.h:231
 msgid "Album - Disc"
 msgstr "raАльбом - Диск"
 
-#: collection/savedgroupingmanager.cpp:84 playlist/playlist.cpp:1176
+#: collection/savedgroupingmanager.cpp:82 playlist/playlist.cpp:1176
 #: organize/organizedialog.cpp:102 ../build/src/ui_groupbydialog.h:185
 #: ../build/src/ui_groupbydialog.h:207 ../build/src/ui_groupbydialog.h:229
 #: ../build/src/ui_edittagdialog.h:685
@@ -857,7 +857,7 @@ msgstr "Вы действительно хотите удалить профил
 msgid "Are you sure you want to reset this song's statistics?"
 msgstr "Вы действительно хотите сбросить статистику этой песни?"
 
-#: core/qtsystemtrayicon.cpp:257 collection/savedgroupingmanager.cpp:81
+#: core/qtsystemtrayicon.cpp:257 collection/savedgroupingmanager.cpp:85
 #: playlist/playlist.cpp:1168 organize/organizedialog.cpp:100
 #: ../build/src/ui_groupbydialog.h:184 ../build/src/ui_groupbydialog.h:206
 #: ../build/src/ui_groupbydialog.h:228 ../build/src/ui_albumcoversearcher.h:106
@@ -994,7 +994,7 @@ msgstr "Поведение"
 msgid "Best"
 msgstr "Лучшее"
 
-#: context/contextview.cpp:216 collection/savedgroupingmanager.cpp:132
+#: context/contextview.cpp:216 collection/savedgroupingmanager.cpp:136
 #: playlist/playlist.cpp:1186 organize/organizedialog.cpp:115
 #: ../build/src/ui_groupbydialog.h:201 ../build/src/ui_groupbydialog.h:223
 #: ../build/src/ui_groupbydialog.h:245 ../build/src/ui_edittagdialog.h:671
@@ -1005,7 +1005,7 @@ msgstr "Разрядность"
 msgid "Bit rate"
 msgstr "Битрейт"
 
-#: context/contextview.cpp:217 collection/savedgroupingmanager.cpp:135
+#: context/contextview.cpp:217 collection/savedgroupingmanager.cpp:139
 #: playlist/playlist.cpp:1187 ../build/src/ui_groupbydialog.h:202
 #: ../build/src/ui_groupbydialog.h:224 ../build/src/ui_groupbydialog.h:246
 #: ../build/src/ui_transcoderoptionsaac.h:128
@@ -1230,7 +1230,7 @@ msgstr "Заполнить поля автоматически"
 msgid "Complete tags automatically..."
 msgstr "Заполнить теги автоматически..."
 
-#: collection/savedgroupingmanager.cpp:117 playlist/playlist.cpp:1177
+#: collection/savedgroupingmanager.cpp:118 playlist/playlist.cpp:1177
 #: organize/organizedialog.cpp:103 ../build/src/ui_groupbydialog.h:196
 #: ../build/src/ui_groupbydialog.h:218 ../build/src/ui_groupbydialog.h:240
 #: ../build/src/ui_edittagdialog.h:686
@@ -1608,7 +1608,7 @@ msgctxt "Refers to a disabled notification type in Notification settings."
 msgid "Disabled"
 msgstr "Отключено"
 
-#: collection/savedgroupingmanager.cpp:93 playlist/playlist.cpp:1171
+#: collection/savedgroupingmanager.cpp:106 playlist/playlist.cpp:1171
 #: organize/organizedialog.cpp:107 ../build/src/ui_groupbydialog.h:188
 #: ../build/src/ui_groupbydialog.h:210 ../build/src/ui_groupbydialog.h:232
 #: ../build/src/ui_edittagdialog.h:684
@@ -2012,7 +2012,7 @@ msgstr "Пути файлов"
 msgid "File size"
 msgstr "Размер файла"
 
-#: collection/savedgroupingmanager.cpp:126 playlist/playlist.cpp:1192
+#: collection/savedgroupingmanager.cpp:127 playlist/playlist.cpp:1192
 #: ../build/src/ui_groupbydialog.h:199 ../build/src/ui_groupbydialog.h:221
 #: ../build/src/ui_groupbydialog.h:243 ../build/src/ui_edittagdialog.h:673
 msgid "File type"
@@ -2106,7 +2106,7 @@ msgstr ""
 msgid "Form"
 msgstr "Форма"
 
-#: collection/savedgroupingmanager.cpp:96 ../build/src/ui_groupbydialog.h:189
+#: collection/savedgroupingmanager.cpp:130 ../build/src/ui_groupbydialog.h:189
 #: ../build/src/ui_groupbydialog.h:211 ../build/src/ui_groupbydialog.h:233
 msgid "Format"
 msgstr "Формат"
@@ -2147,7 +2147,7 @@ msgstr "Общие настройки"
 msgid "Genius Authentication"
 msgstr ""
 
-#: collection/savedgroupingmanager.cpp:99 playlist/playlist.cpp:1175
+#: collection/savedgroupingmanager.cpp:115 playlist/playlist.cpp:1175
 #: organize/organizedialog.cpp:110 ../build/src/ui_groupbydialog.h:190
 #: ../build/src/ui_groupbydialog.h:212 ../build/src/ui_groupbydialog.h:234
 #: ../build/src/ui_edittagdialog.h:680
@@ -2247,18 +2247,18 @@ msgstr "Группировать по жанр/исполнитель альбо
 msgid "Group by Genre/Artist/Album"
 msgstr "Группировать по жанр/исполнитель/альбом"
 
-#: collection/savedgroupingmanager.cpp:123 playlist/playlist.cpp:1179
+#: collection/savedgroupingmanager.cpp:124 playlist/playlist.cpp:1179
 #: organize/organizedialog.cpp:105 ../build/src/ui_groupbydialog.h:198
 #: ../build/src/ui_groupbydialog.h:220 ../build/src/ui_groupbydialog.h:242
 #: ../build/src/ui_edittagdialog.h:682
 msgid "Grouping"
 msgstr "Группа"
 
-#: collection/collectionfilterwidget.cpp:250
+#: collection/collectionfilterwidget.cpp:262
 msgid "Grouping Name"
 msgstr "Имя группы"
 
-#: collection/collectionfilterwidget.cpp:250
+#: collection/collectionfilterwidget.cpp:262
 msgid "Grouping name:"
 msgstr "Имя группы:"
 
@@ -2523,7 +2523,7 @@ msgstr "Загрузка устройства MTP"
 msgid "Loading iPod database"
 msgstr "Загрузка база данных iPod"
 
-#: collection/collectionmodel.cpp:214
+#: collection/collectionmodel.cpp:210
 msgid "Loading songs"
 msgstr "Загрузка песен"
 
@@ -2535,7 +2535,7 @@ msgstr "Загрузка композиций"
 msgid "Loading tracks info"
 msgstr "Загрузка информации о треках"
 
-#: collection/collectionmodel.cpp:207 ../build/src/ui_organizedialog.h:281
+#: collection/collectionmodel.cpp:203 ../build/src/ui_organizedialog.h:281
 msgid "Loading..."
 msgstr "Загрузка…"
 
@@ -2816,7 +2816,7 @@ msgstr "Без коротких блоков"
 msgid "No song playing"
 msgstr "Нет воспроизводимой песни"
 
-#: collection/savedgroupingmanager.cpp:78 ../build/src/ui_groupbydialog.h:183
+#: collection/savedgroupingmanager.cpp:79 ../build/src/ui_groupbydialog.h:183
 #: ../build/src/ui_groupbydialog.h:205 ../build/src/ui_groupbydialog.h:227
 msgid "None"
 msgstr "Ничего"
@@ -2952,17 +2952,21 @@ msgstr ""
 msgid "Original tags"
 msgstr "Исходные теги"
 
-#: collection/savedgroupingmanager.cpp:111 playlist/playlist.cpp:1174
+#: collection/savedgroupingmanager.cpp:112 playlist/playlist.cpp:1174
 #: organize/organizedialog.cpp:109 ../build/src/ui_groupbydialog.h:194
 #: ../build/src/ui_groupbydialog.h:216 ../build/src/ui_groupbydialog.h:238
 msgid "Original year"
 msgstr "Год выхода оригинала"
 
-#: collection/savedgroupingmanager.cpp:114 ../build/src/ui_groupbydialog.h:195
+#: collection/savedgroupingmanager.cpp:100 ../build/src/ui_groupbydialog.h:195
 #: ../build/src/ui_groupbydialog.h:217 ../build/src/ui_groupbydialog.h:239
 msgid "Original year - Album"
 msgstr "Год выхода оригинала - Альбом"
 
+#: collection/savedgroupingmanager.cpp:103
+msgid "Original year - Album - Disc"
+msgstr ""
+
 #: core/commandlineoptions.cpp:183
 msgid "Other options"
 msgstr "Другие настройки"
@@ -3020,7 +3024,7 @@ msgstr "Приостановить воспроизведение"
 msgid "Paused"
 msgstr "Приостановлен"
 
-#: collection/savedgroupingmanager.cpp:120 playlist/playlist.cpp:1178
+#: collection/savedgroupingmanager.cpp:121 playlist/playlist.cpp:1178
 #: organize/organizedialog.cpp:104 ../build/src/ui_groupbydialog.h:197
 #: ../build/src/ui_groupbydialog.h:219 ../build/src/ui_groupbydialog.h:241
 #: ../build/src/ui_edittagdialog.h:691
@@ -3546,7 +3550,7 @@ msgstr "Безопасно извлечь устройство"
 msgid "Safely remove the device after copying"
 msgstr "Безопасно извлечь устройство после копирования"
 
-#: collection/savedgroupingmanager.cpp:129 playlist/playlist.cpp:1185
+#: collection/savedgroupingmanager.cpp:133 playlist/playlist.cpp:1185
 #: organize/organizedialog.cpp:114 ../build/src/ui_groupbydialog.h:200
 #: ../build/src/ui_groupbydialog.h:222 ../build/src/ui_groupbydialog.h:244
 #: ../build/src/ui_edittagdialog.h:670
@@ -4446,10 +4450,10 @@ msgid "Ultra wide band (UWB)"
 msgstr "Ультраширокая полоса пропускания (UWB)"
 
 #: core/song.cpp:538 context/contextalbumsmodel.cpp:357
-#: collection/collectionmodel.cpp:433 collection/collectionmodel.cpp:438
-#: collection/collectionmodel.cpp:442 collection/collectionmodel.cpp:446
-#: collection/collectionmodel.cpp:450 collection/collectionmodel.cpp:1407
-#: collection/savedgroupingmanager.cpp:137 playlist/playlistdelegates.cpp:353
+#: collection/collectionmodel.cpp:461 collection/collectionmodel.cpp:466
+#: collection/collectionmodel.cpp:470 collection/collectionmodel.cpp:474
+#: collection/collectionmodel.cpp:478 collection/collectionmodel.cpp:1589
+#: collection/savedgroupingmanager.cpp:143 playlist/playlistdelegates.cpp:353
 #: playlist/playlistmanager.cpp:554 playlist/playlistmanager.cpp:555
 #: dialogs/edittagdialog.cpp:494 dialogs/edittagdialog.cpp:542
 #: ../build/src/ui_scrobblersettingspage.h:393
@@ -4610,9 +4614,9 @@ msgstr "После добавления песни через меню…"
 msgid "Variable bit rate"
 msgstr "Переменный битрейт"
 
-#: collection/collectionmodel.cpp:347 playlist/playlistmanager.cpp:566
-#: covermanager/albumcovermanager.cpp:333 internet/internetsearchmodel.cpp:94
-#: internet/internetsearchmodel.cpp:106
+#: collection/collectionmodel.cpp:371 collection/collectionmodel.cpp:372
+#: playlist/playlistmanager.cpp:566 covermanager/albumcovermanager.cpp:333
+#: internet/internetsearchmodel.cpp:94 internet/internetsearchmodel.cpp:106
 msgid "Various artists"
 msgstr "Различные исполнители"
 
@@ -4691,11 +4695,9 @@ msgstr "Работа в автономном режиме (только кэши
 
 #: collection/collectionview.cpp:476
 msgid ""
-"Would you like to move the other songs in this album to Various Artists as "
+"Would you like to move the other songs on this album to Various Artists as "
 "well?"
 msgstr ""
-"Хотите ли вы переместить и другие песни из этого альбома в «Различные "
-"исполнители»?"
 
 #: core/mainwindow.cpp:2651
 msgid "Would you like to run a full rescan right now?"
@@ -4705,7 +4707,7 @@ msgstr "Желаете запустить повторное сканирова
 msgid "Write metadata when saving playlists"
 msgstr "Записывать метаданные при сохранении плейлистов"
 
-#: collection/savedgroupingmanager.cpp:102 playlist/playlist.cpp:1173
+#: collection/savedgroupingmanager.cpp:109 playlist/playlist.cpp:1173
 #: organize/organizedialog.cpp:108 ../build/src/ui_groupbydialog.h:191
 #: ../build/src/ui_groupbydialog.h:213 ../build/src/ui_groupbydialog.h:235
 #: ../build/src/ui_edittagdialog.h:690
@@ -4713,12 +4715,12 @@ msgstr "Записывать метаданные при сохранении п
 msgid "Year"
 msgstr "Год"
 
-#: collection/savedgroupingmanager.cpp:105 ../build/src/ui_groupbydialog.h:192
+#: collection/savedgroupingmanager.cpp:94 ../build/src/ui_groupbydialog.h:192
 #: ../build/src/ui_groupbydialog.h:214 ../build/src/ui_groupbydialog.h:236
 msgid "Year - Album"
 msgstr "Год - Альбом"
 
-#: collection/savedgroupingmanager.cpp:108 ../build/src/ui_groupbydialog.h:193
+#: collection/savedgroupingmanager.cpp:97 ../build/src/ui_groupbydialog.h:193
 #: ../build/src/ui_groupbydialog.h:215 ../build/src/ui_groupbydialog.h:237
 msgid "Year - Album - Disc"
 msgstr "Год - Альбом - Диск"