[mb-commits] branch, beta, updated. Update .pot file.
MusicBrainz Git Server <[email protected]> Mon, 04 Feb 2013 01:36:59 +0000
| Newsgroups | gmane.comp.audio.musicbrainz.cvs |
|---|---|
| Message-ID | <E1U2AzT-0007ap-58@wiley> |
The branch, beta has been updated
via http://git.musicbrainz.org/gitweb/?p=musicbrainz-server/core.git;a=commit;h=b4e0abfd115826c57092a8ddaa7172ff2322a337 (commit)
from http://git.musicbrainz.org/gitweb/?p=musicbrainz-server/core.git;a=commit;h=fa49d05aa2df78d04cbf8b85dddc97b74dcaac78 (commit)
Summary of changes:
po/mb_server.pot | 680 ++++++++++++++++++++++++++++--------------------------
1 files changed, 347 insertions(+), 333 deletions(-)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit b4e0abfd115826c57092a8ddaa7172ff2322a337
Author: Ian McEwen <[email protected]>
Date: Sun Feb 3 21:21:23 2013 -0700
Update .pot file.
diff --git a/po/mb_server.pot b/po/mb_server.pot
index 055dfde..a0709aa 100644
--- a/po/mb_server.pot
+++ b/po/mb_server.pot
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-01-15 15:16-0700\n"
+"POT-Creation-Date: 2013-02-03 21:20-0700\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <[email protected]>\n"
@@ -29,7 +29,7 @@ msgid ""
"it} first and then reset your password. "
msgstr ""
-#: ../root/components/forms.tt:239
+#: ../root/components/forms.tt:238
msgid "\"C\" is a single check digit."
msgstr ""
@@ -38,7 +38,7 @@ msgid ""
"\"CC\" is the appropriate for the registrant two-character country code."
msgstr ""
-#: ../root/components/forms.tt:238
+#: ../root/components/forms.tt:237
msgid "\"DDD\" is a nine digit work identifier."
msgstr ""
@@ -65,7 +65,7 @@ msgstr ""
#: ../root/edit/details/edit_medium.tt:228
#: ../root/edit/details/historic/add_release.tt:49 ../root/freedb/show.tt:10
#: ../root/freedb/show.tt:62 ../root/recording/index.tt:9
-#: ../root/release/edit/tracklist.tt:265 ../root/release/edit/tracklist.tt:426
+#: ../root/release/edit/tracklist.tt:263 ../root/release/edit/tracklist.tt:415
msgid "#"
msgstr ""
@@ -97,7 +97,7 @@ msgstr ""
msgid "(<span class=\"comment\">primary</span>)"
msgstr ""
-#: ../root/user/profile.tt:28
+#: ../root/user/profile.tt:27
msgid "(<strong>unverified!</strong>)"
msgstr ""
@@ -118,7 +118,7 @@ msgstr ""
msgid "(ended)"
msgstr ""
-#: ../root/user/profile.tt:20
+#: ../root/user/profile.tt:19
msgid "(hidden)"
msgstr ""
@@ -143,13 +143,13 @@ msgstr ""
#: ../root/edit/details/add_relationship_type.tt:9
#: ../root/edit/details/historic/add_release_annotation.tt:21
-#: ../root/edit/details/remove_cover_art.tt:16
-#: ../root/edit/details/remove_cover_art.tt:28
+#: ../root/edit/details/remove_cover_art.tt:15
+#: ../root/edit/details/remove_cover_art.tt:27
#: ../root/layout/sidebar/sidebar-tags.tt:26
#: ../root/relationship/linktype/tree.tt:12
#: ../root/relationship/linktype/tree.tt:13
#: ../root/relationship/linktype/tree.tt:14 ../root/scripts/text_strings.tt:23
-#: ../root/user/profile.tt:39
+#: ../root/user/profile.tt:38
msgid "(none)"
msgstr ""
@@ -175,7 +175,7 @@ msgstr ""
msgid "(unknown)"
msgstr ""
-#: ../root/user/profile.tt:24
+#: ../root/user/profile.tt:23
msgid "(verified at {date})"
msgstr ""
@@ -202,7 +202,7 @@ msgstr ""
msgid ", "
msgstr ""
-#: ../root/user/profile.tt:101
+#: ../root/user/profile.tt:100
msgid "0"
msgstr ""
@@ -212,7 +212,7 @@ msgid_plural "{n} unanimous votes"
msgstr[0] ""
msgstr[1] ""
-#: ../root/user/profile.tt:231 ../root/user/profile.tt:235
+#: ../root/user/profile.tt:229 ../root/user/profile.tt:233
msgid "100%"
msgstr ""
@@ -244,15 +244,15 @@ msgstr ""
msgid "<em>no changelog specified</em>"
msgstr ""
-#: ../root/edit/edit_header.tt:66
+#: ../root/edit/edit_header.tt:60
msgid "<strong>Approved:</strong> {date}"
msgstr ""
-#: ../root/edit/edit_header.tt:64
+#: ../root/edit/edit_header.tt:58
msgid "<strong>Closed:</strong> <em>Cancelling</em>"
msgstr ""
-#: ../root/edit/edit_header.tt:68
+#: ../root/edit/edit_header.tt:62
msgid "<strong>Closed:</strong> {date}"
msgstr ""
@@ -263,8 +263,8 @@ msgid ""
"granularity, you may want to {uri|search the database} instead."
msgstr ""
-#: ../root/components/common-macros.tt:736
-#: ../root/release/edit/tracklist.tt:144
+#: ../root/components/common-macros.tt:744
+#: ../root/release/edit/tracklist.tt:142
msgid "<strong>Error</strong>:"
msgstr ""
@@ -285,7 +285,7 @@ msgid ""
"updating a page!"
msgstr ""
-#: ../root/components/common-macros.tt:749
+#: ../root/components/common-macros.tt:757
msgid "<strong>Note</strong>:"
msgstr ""
@@ -309,8 +309,8 @@ msgid ""
"you wish to continue with the merge."
msgstr ""
-#: ../root/components/common-macros.tt:743 ../root/recording/edit.tt:41
-#: ../root/release/edit/tracklist.tt:131
+#: ../root/components/common-macros.tt:751 ../root/recording/edit.tt:41
+#: ../root/release/edit/tracklist.tt:129
msgid "<strong>Warning</strong>:"
msgstr ""
@@ -377,15 +377,15 @@ msgstr ""
msgid "Accept"
msgstr ""
-#: ../root/edit/index.tt:68
+#: ../root/edit/index.tt:64
msgid "Accept edit"
msgstr ""
-#: ../root/components/common-macros.tt:599
+#: ../root/components/common-macros.tt:597
msgid "Accept upon expiration"
msgstr ""
-#: ../root/user/profile.tt:148
+#: ../root/user/profile.tt:146
msgctxt "edit descriptor"
msgid "Accepted"
msgstr ""
@@ -421,8 +421,8 @@ msgstr ""
msgid "Add Artist Alias"
msgstr ""
-#: ../root/components/forms.tt:301 ../root/components/forms.tt:305
-#: ../root/release/edit/tracklist.tt:84 ../root/release/edit/tracklist.tt:89
+#: ../root/components/forms.tt:299 ../root/components/forms.tt:303
+#: ../root/release/edit/tracklist.tt:83 ../root/release/edit/tracklist.tt:88
msgid "Add Artist Credit"
msgstr ""
@@ -440,8 +440,8 @@ msgctxt "header"
msgid "Add Cover Art"
msgstr ""
-#: ../root/release/edit/tracklist.tt:167 ../root/release/edit/tracklist.tt:293
-#: ../root/release/edit/tracklist.tt:495
+#: ../root/release/edit/tracklist.tt:165 ../root/release/edit/tracklist.tt:291
+#: ../root/release/edit/tracklist.tt:483
msgid "Add Disc"
msgstr ""
@@ -581,7 +581,7 @@ msgstr ""
msgid "Add an edit note"
msgstr ""
-#: ../root/components/common-macros.tt:807
+#: ../root/components/common-macros.tt:815
msgid "Add annotation"
msgstr ""
@@ -631,11 +631,11 @@ msgstr ""
msgid "Add new recording"
msgstr ""
-#: ../root/edit/index.tt:84
+#: ../root/edit/index.tt:80
msgid "Add note"
msgstr ""
-#: ../root/edit/index.tt:82
+#: ../root/edit/index.tt:78
msgid "Add note and vote"
msgstr ""
@@ -643,11 +643,11 @@ msgstr ""
msgid "Add recording"
msgstr ""
-#: ../root/release/edit_relationships.tt:268
+#: ../root/release/edit_relationships.tt:272
msgid "Add related work"
msgstr ""
-#: ../root/release/edit_relationships.tt:252
+#: ../root/release/edit_relationships.tt:256
#: ../root/scripts/text_strings.tt:92
#: ../lib/MusicBrainz/Server/Edit/Historic/AddLink.pm:10
#: ../lib/MusicBrainz/Server/Edit/Relationship/Create.pm:23
@@ -674,7 +674,7 @@ msgstr ""
msgid "Add selected recordings for merging"
msgstr ""
-#: ../root/artist/releases.tt:13 ../root/label/index.tt:11
+#: ../root/artist/releases.tt:13 ../root/label/index.tt:19
#: ../root/release_group/index.tt:78
msgid "Add selected releases for merging"
msgstr ""
@@ -695,7 +695,7 @@ msgstr ""
msgid "Add to {collection}"
msgstr ""
-#: ../root/release/edit/tracklist.tt:457
+#: ../root/release/edit/tracklist.tt:446
msgid "Add track(s)"
msgstr ""
@@ -709,11 +709,11 @@ msgstr ""
msgid "Add work alias"
msgstr ""
-#: ../root/components/forms.tt:115
+#: ../root/components/forms.tt:122 ../root/components/forms.tt:123
msgid "Add {item}"
msgstr ""
-#: ../root/release/edit/tracklist.tt:454
+#: ../root/release/edit/tracklist.tt:443
msgid "Add {num} track(s)"
msgstr ""
@@ -757,7 +757,7 @@ msgstr ""
msgid "Administration flags"
msgstr ""
-#: ../root/user/profile.tt:61
+#: ../root/user/profile.tt:60
msgid "Age:"
msgstr ""
@@ -828,7 +828,7 @@ msgstr ""
msgid "Allow other users to see this collection"
msgstr ""
-#: ../root/components/common-macros.tt:644
+#: ../root/components/common-macros.tt:642
msgid "Already expired"
msgstr ""
@@ -885,12 +885,12 @@ msgstr[1] ""
msgid "An error occured while loading this edit"
msgstr ""
-#: ../root/release/edit/tracklist.tt:118
+#: ../root/release/edit/tracklist.tt:116
msgid "An error occured: "
msgstr ""
-#: ../root/release/edit_relationships.tt:163
-#: ../root/release/edit_relationships.tt:235
+#: ../root/release/edit_relationships.tt:167
+#: ../root/release/edit_relationships.tt:239
msgid "An error occurred while creating the work."
msgstr ""
@@ -965,7 +965,7 @@ msgstr ""
msgid "Approve"
msgstr ""
-#: ../root/edit/edit_header.tt:81 ../root/edit/info.tt:17
+#: ../root/edit/edit_header.tt:75 ../root/edit/info.tt:17
msgid "Approve edit"
msgstr ""
@@ -1085,8 +1085,8 @@ msgstr ""
#: ../root/artist/relationships.tt:16 ../root/cdstub/browse.tt:9
#: ../root/cdstub/cdstub.tt:7 ../root/cdtoc/attach_filter_release.tt:48
#: ../root/cdtoc/list.tt:7 ../root/cdtoc/lookup.tt:39
-#: ../root/collection/index.tt:11 ../root/components/common-macros.tt:518
-#: ../root/components/common-macros.tt:570
+#: ../root/collection/index.tt:11 ../root/components/common-macros.tt:516
+#: ../root/components/common-macros.tt:568
#: ../root/components/results-generic.tt:6
#: ../root/edit/details/add_medium.tt:49
#: ../root/edit/details/edit_medium.tt:49
@@ -1095,8 +1095,8 @@ msgstr ""
#: ../root/edit/details/historic/change_track_artist.tt:8
#: ../root/edit/search_macros.tt:284 ../root/freedb/show.tt:64
#: ../root/isrc/index.tt:17 ../root/otherlookup/results-release.tt:8
-#: ../root/puid/index.tt:11 ../root/release/edit/tracklist.tt:267
-#: ../root/release/edit/tracklist.tt:431 ../root/release_group/merge.tt:13
+#: ../root/puid/index.tt:11 ../root/release/edit/tracklist.tt:265
+#: ../root/release/edit/tracklist.tt:420 ../root/release_group/merge.tt:13
#: ../root/release_group/releases-list.tt:18 ../root/release/index.tt:18
#: ../root/release/lookup.tt:10 ../root/release/merge.tt:28
#: ../root/report/artist_list.tt:5 ../root/report/artist_url_list.tt:6
@@ -1151,7 +1151,7 @@ msgstr ""
msgid "Artist Subscriptions"
msgstr ""
-#: ../root/components/forms.tt:281
+#: ../root/components/forms.tt:279
msgid "Artist as credited"
msgstr ""
@@ -1171,7 +1171,7 @@ msgstr ""
msgid "Artist credits:"
msgstr ""
-#: ../root/components/forms.tt:265 ../root/release/edit/tracklist.tt:44
+#: ../root/components/forms.tt:264 ../root/release/edit/tracklist.tt:44
msgid "Artist in MusicBrainz"
msgstr ""
@@ -1193,7 +1193,7 @@ msgstr ""
#: ../root/cdstub/edit_form.tt:6 ../root/cdstub/import.tt:7
#: ../root/cdtoc/attach_filter_artist.tt:8 ../root/cdtoc/lookup.tt:61
-#: ../root/components/common-macros.tt:506 ../root/components/forms.tt:147
+#: ../root/components/common-macros.tt:504 ../root/components/forms.tt:146
#: ../root/edit/details/add_artist_alias.tt:3
#: ../root/edit/details/add_artist_annotation.tt:3
#: ../root/edit/details/add_artist.tt:3
@@ -1216,7 +1216,7 @@ msgstr ""
#: ../root/edit/details/remove_artist_alias.tt:3
#: ../root/edit/details/remove_artist.tt:3 ../root/recording/layout.tt:10
#: ../root/release/edit/missing_entities.tt:52
-#: ../root/release/edit/tracklist.tt:215 ../root/release_group/layout.tt:18
+#: ../root/release/edit/tracklist.tt:213 ../root/release_group/layout.tt:18
#: ../root/taglookup/form.tt:4
msgid "Artist:"
msgstr ""
@@ -1325,7 +1325,7 @@ msgstr ""
#: ../root/edit/relationship/create_url.tt:56
#: ../root/edit/relationship/edit.tt:100
#: ../root/relationship/linktype/form.tt:30
-#: ../root/release/edit_relationships.tt:109
+#: ../root/release/edit_relationships.tt:113
msgid "Attributes:"
msgstr ""
@@ -1357,7 +1357,7 @@ msgid ""
"well as the ability to instantly approve other users' edits."
msgstr ""
-#: ../root/user/profile.tt:152
+#: ../root/user/profile.tt:150
msgid "Auto-edits"
msgstr ""
@@ -1421,15 +1421,15 @@ msgid ""
"release on an existing release, select it below."
msgstr ""
-#: ../root/release/edit_relationships.tt:342
+#: ../root/release/edit_relationships.tt:346
msgid "Batch-add a relationship to recordings"
msgstr ""
-#: ../root/release/edit_relationships.tt:354
+#: ../root/release/edit_relationships.tt:358
msgid "Batch-add a relationship to works"
msgstr ""
-#: ../root/release/edit_relationships.tt:348
+#: ../root/release/edit_relationships.tt:352
msgid "Batch-create new works"
msgstr ""
@@ -1484,7 +1484,7 @@ msgid "Begin Date"
msgstr ""
#: ../root/alias/edit_form.tt:31 ../root/artist/edit_form.tt:52
-#: ../root/components/common-macros.tt:820
+#: ../root/components/common-macros.tt:828
#: ../root/edit/details/add_artist_alias.tt:36
#: ../root/edit/details/add_label_alias.tt:36
#: ../root/edit/details/add_label.tt:27
@@ -1498,7 +1498,7 @@ msgstr ""
#: ../root/edit/details/remove_work_alias.tt:29
#: ../root/edit/relationship/create.tt:94
#: ../root/edit/relationship/edit.tt:125 ../root/label/edit_form.tt:52
-#: ../root/release/edit_relationships.tt:131
+#: ../root/release/edit_relationships.tt:135
msgid "Begin date:"
msgstr ""
@@ -1518,7 +1518,7 @@ msgid ""
msgstr ""
#: ../root/account/edit.tt:28 ../root/admin/edit_user.tt:35
-#: ../root/user/profile.tt:114
+#: ../root/user/profile.tt:112
msgid "Bio:"
msgstr ""
@@ -1530,7 +1530,7 @@ msgstr ""
msgid "Blog"
msgstr ""
-#: ../root/components/common-macros.tt:820 ../root/scripts/text_strings.tt:73
+#: ../root/components/common-macros.tt:828 ../root/scripts/text_strings.tt:73
msgid "Born:"
msgstr ""
@@ -1646,7 +1646,7 @@ msgstr ""
msgid "CD stub details"
msgstr ""
-#: ../root/release/edit/tracklist.tt:174
+#: ../root/release/edit/tracklist.tt:172
msgid "CD stub import"
msgstr ""
@@ -1665,18 +1665,18 @@ msgstr ""
msgid "Can be approved"
msgstr ""
-#: ../root/artist/merge.tt:22 ../root/components/common-macros.tt:585
+#: ../root/artist/merge.tt:22 ../root/components/common-macros.tt:583
#: ../root/components/filter-form.tt:23 ../root/elections/nominate.tt:10
#: ../root/label/merge.tt:19 ../root/layout/merge-helper.tt:34
#: ../root/recording/merge.tt:24 ../root/release/edit/duplicates.tt:45
#: ../root/release/edit/editnote.tt:40 ../root/release/edit/information.tt:121
#: ../root/release/edit/missing_entities.tt:164
#: ../root/release/edit/recordings.tt:433
-#: ../root/release/edit_relationships.tt:171
-#: ../root/release/edit_relationships.tt:241
-#: ../root/release/edit/tracklist.tt:162 ../root/release/edit/tracklist.tt:294
-#: ../root/release/edit/tracklist.tt:494 ../root/release_group/merge.tt:44
-#: ../root/release/merge.tt:154 ../root/scripts/text_strings.tt:27
+#: ../root/release/edit_relationships.tt:175
+#: ../root/release/edit_relationships.tt:245
+#: ../root/release/edit/tracklist.tt:160 ../root/release/edit/tracklist.tt:292
+#: ../root/release/edit/tracklist.tt:482 ../root/release_group/merge.tt:44
+#: ../root/release/merge.tt:156 ../root/scripts/text_strings.tt:27
#: ../root/work/merge.tt:64
msgid "Cancel"
msgstr ""
@@ -1685,11 +1685,11 @@ msgstr ""
msgid "Cancel Edit"
msgstr ""
-#: ../root/components/common-macros.tt:528
+#: ../root/components/common-macros.tt:526
msgid "Cancel creating relationship with {name}"
msgstr ""
-#: ../root/edit/cancel.tt:24 ../root/edit/edit_header.tt:85
+#: ../root/edit/cancel.tt:24 ../root/edit/edit_header.tt:79
#: ../root/edit/info.tt:21
msgid "Cancel edit"
msgstr ""
@@ -1898,7 +1898,7 @@ msgstr ""
msgid "Collaborator"
msgstr ""
-#: ../root/release/edit/tracklist.tt:364
+#: ../root/release/edit/tracklist.tt:357
msgid "Collapse Disc"
msgstr ""
@@ -1934,7 +1934,7 @@ msgstr ""
#: ../root/cdstub/edit_form.tt:8 ../root/edit/details/add_cover_art.tt:11
#: ../root/edit/details/edit_cover_art.tt:17
-#: ../root/edit/details/remove_cover_art.tt:27
+#: ../root/edit/details/remove_cover_art.tt:26
#: ../root/release/cover_art_fields.tt:10
msgid "Comment:"
msgstr ""
@@ -1990,7 +1990,7 @@ msgstr ""
msgid "Continue reading at Wikipedia..."
msgstr ""
-#: ../root/components/forms.tt:225
+#: ../root/components/forms.tt:224
msgid "Copy"
msgstr ""
@@ -2024,7 +2024,7 @@ msgstr ""
#: ../root/edit/details/edit_release_label.tt:44
#: ../root/edit/details/edit_release.tt:42 ../root/label/edit_form.tt:38
#: ../root/label/layout.tt:41 ../root/release/edit/information.tt:70
-#: ../root/release/sidebar.tt:21 ../root/user/profile.tt:73
+#: ../root/release/sidebar.tt:21 ../root/user/profile.tt:72
msgid "Country:"
msgstr ""
@@ -2032,7 +2032,7 @@ msgstr ""
msgid "Cover Art"
msgstr ""
-#: ../root/layout.tt:159
+#: ../root/layout.tt:158
msgid ""
"Cover Art provided by the {caa|Cover Art Archive}. Hosted by {host|Digital "
"West}. Sponsored by: {url1|Google}, {url2|OSUOSL} and {more|others...}. "
@@ -2067,7 +2067,7 @@ msgstr ""
msgid "Create a new relationship attribute"
msgstr ""
-#: ../root/release/edit_relationships.tt:93
+#: ../root/release/edit_relationships.tt:95
msgid "Create a new work"
msgstr ""
@@ -2083,15 +2083,15 @@ msgstr ""
msgid "Create collection"
msgstr ""
-#: ../root/components/common-macros.tt:586
+#: ../root/components/common-macros.tt:584
msgid "Create relationship"
msgstr ""
-#: ../root/components/common-macros.tt:528
+#: ../root/components/common-macros.tt:526
msgid "Create relationship with {other}"
msgstr ""
-#: ../root/release/edit_relationships.tt:243
+#: ../root/release/edit_relationships.tt:247
msgid "Create work"
msgstr ""
@@ -2099,8 +2099,8 @@ msgstr ""
msgid "Created"
msgstr ""
-#: ../root/release/edit_relationships.tt:135
-#: ../root/release/edit_relationships.tt:144
+#: ../root/release/edit_relationships.tt:139
+#: ../root/release/edit_relationships.tt:148
#: ../lib/MusicBrainz/Server/Plugin/FormRenderer.pm:249
msgid "DD"
msgstr ""
@@ -2223,7 +2223,7 @@ msgstr ""
msgid "Details"
msgstr ""
-#: ../root/release/edit/tracklist.tt:198
+#: ../root/release/edit/tracklist.tt:196
msgid "Detect track durations"
msgstr ""
@@ -2239,7 +2239,7 @@ msgstr ""
msgid "Development"
msgstr ""
-#: ../root/components/common-macros.tt:824
+#: ../root/components/common-macros.tt:832
msgid "Died:"
msgstr ""
@@ -2261,7 +2261,7 @@ msgstr ""
#: ../root/edit/details/edit_work.tt:15 ../root/label/edit_form.tt:36
#: ../root/recording/edit_form.tt:9 ../root/release/edit/information.tt:117
#: ../root/release/edit/missing_entities.tt:24
-#: ../root/release/edit_relationships.tt:194
+#: ../root/release/edit_relationships.tt:198
#: ../root/release_group/edit_form.tt:9 ../root/work/edit_form.tt:8
msgid "Disambiguation:"
msgstr ""
@@ -2321,12 +2321,12 @@ msgstr ""
msgid "Disc IDs with superfluous data tracks"
msgstr ""
-#: ../root/release/edit/tracklist.tt:381
+#: ../root/release/edit/tracklist.tt:374
msgid "Disc title"
msgstr ""
#: ../root/release/edit/recordings.tt:255
-#: ../root/release/edit/tracklist.tt:354
+#: ../root/release/edit/tracklist.tt:348
msgid "Disc {num}"
msgstr ""
@@ -2382,7 +2382,7 @@ msgstr ""
msgid "Discs entered as separate releases"
msgstr ""
-#: ../root/components/common-macros.tt:824 ../root/scripts/text_strings.tt:74
+#: ../root/components/common-macros.tt:832 ../root/scripts/text_strings.tt:74
msgid "Dissolved:"
msgstr ""
@@ -2412,8 +2412,8 @@ msgstr ""
msgid "Donation Check"
msgstr ""
-#: ../root/release/edit_relationships.tt:174
-#: ../root/release/edit/tracklist.tt:160 ../root/scripts/text_strings.tt:29
+#: ../root/release/edit_relationships.tt:178
+#: ../root/release/edit/tracklist.tt:158 ../root/scripts/text_strings.tt:29
msgid "Done"
msgstr ""
@@ -2450,7 +2450,7 @@ msgstr ""
msgid "Edit #{id}"
msgstr ""
-#: ../root/edit/edit_header.tt:75 ../root/edit/edit_header.tt:90
+#: ../root/edit/edit_header.tt:69 ../root/edit/edit_header.tt:84
msgid "Edit #{id} - {name}"
msgstr ""
@@ -2503,7 +2503,7 @@ msgid "Edit Not Found"
msgstr ""
#: ../root/forms/edit-note.tt:2
-#: ../lib/MusicBrainz/Server/Wizard/ReleaseEditor.pm:80
+#: ../lib/MusicBrainz/Server/Wizard/ReleaseEditor.pm:81
msgid "Edit Note"
msgstr ""
@@ -2539,7 +2539,7 @@ msgstr ""
msgid "Edit Relationship Types"
msgstr ""
-#: ../root/release/edit_relationships.tt:315
+#: ../root/release/edit_relationships.tt:319
msgid "Edit Relationships: {release}"
msgstr ""
@@ -2582,7 +2582,7 @@ msgstr ""
msgid "Edit Work Annotation"
msgstr ""
-#: ../root/components/common-macros.tt:807
+#: ../root/components/common-macros.tt:815
msgid "Edit annotation"
msgstr ""
@@ -2595,7 +2595,7 @@ msgstr ""
msgid "Edit artist annotation"
msgstr ""
-#: ../root/edit/edit_header.tt:96
+#: ../root/edit/edit_header.tt:90
msgid "Edit by {editor}"
msgstr ""
@@ -2609,11 +2609,11 @@ msgid "Edit label annotation"
msgstr ""
#: ../root/edit/cancel.tt:19 ../root/forms/edit-note.tt:13
-#: ../root/release/edit_relationships.tt:227
+#: ../root/release/edit_relationships.tt:231
msgid "Edit note:"
msgstr ""
-#: ../root/edit/index.tt:79
+#: ../root/edit/index.tt:75
msgid "Edit notes"
msgstr ""
@@ -2720,7 +2720,7 @@ msgstr ""
msgid "Edits"
msgstr ""
-#: ../root/user/profile.tt:143
+#: ../root/user/profile.tt:141
msgid "Edits ({view_url|view})"
msgstr ""
@@ -2796,7 +2796,7 @@ msgstr ""
#: ../root/account/edit.tt:17 ../root/account/lost_password.tt:15
#: ../root/account/lost_username.tt:11 ../root/account/register.tt:31
-#: ../root/admin/edit_user.tt:32 ../root/user/profile.tt:15
+#: ../root/admin/edit_user.tt:32 ../root/user/profile.tt:14
msgid "Email:"
msgstr ""
@@ -2804,7 +2804,7 @@ msgstr ""
msgid "Emphasis:"
msgstr ""
-#: ../root/release/edit/tracklist.tt:195
+#: ../root/release/edit/tracklist.tt:193
msgid "Enable vinyl track numbers"
msgstr ""
@@ -2826,7 +2826,7 @@ msgid "End date"
msgstr ""
#: ../root/alias/edit_form.tt:32 ../root/artist/edit_form.tt:53
-#: ../root/components/common-macros.tt:824
+#: ../root/components/common-macros.tt:832
#: ../root/edit/details/add_artist_alias.tt:42
#: ../root/edit/details/add_label_alias.tt:42
#: ../root/edit/details/add_label.tt:34
@@ -2840,7 +2840,7 @@ msgstr ""
#: ../root/edit/details/remove_work_alias.tt:33
#: ../root/edit/relationship/create.tt:99
#: ../root/edit/relationship/edit.tt:130 ../root/label/edit_form.tt:53
-#: ../root/release/edit_relationships.tt:140
+#: ../root/release/edit_relationships.tt:144
msgid "End date:"
msgstr ""
@@ -2850,13 +2850,13 @@ msgstr ""
msgid "Ended:"
msgstr ""
-#: ../root/release/edit/tracklist.tt:181
+#: ../root/release/edit/tracklist.tt:179
msgid "Enter a tracklist below:"
msgstr ""
-#: ../root/components/forms.tt:24 ../root/release/add_cover_art.tt:59
+#: ../root/components/forms.tt:24 ../root/release/add_cover_art.tt:61
#: ../root/release/edit/editnote.tt:42
-#: ../root/release/edit_relationships.tt:407
+#: ../root/release/edit_relationships.tt:411
msgid "Enter edit"
msgstr ""
@@ -2922,15 +2922,15 @@ msgstr ""
msgid "Even just providing a URL or two is helpful!"
msgstr ""
-#: ../root/release/edit/tracklist.tt:173
+#: ../root/release/edit/tracklist.tt:171
msgid "Existing tracklist"
msgstr ""
-#: ../root/release/edit/tracklist.tt:249
+#: ../root/release/edit/tracklist.tt:247
msgid "Expand"
msgstr ""
-#: ../root/release/edit/tracklist.tt:361
+#: ../root/release/edit/tracklist.tt:355
msgid "Expand Disc"
msgstr ""
@@ -2946,7 +2946,7 @@ msgstr ""
msgid "Expired"
msgstr ""
-#: ../root/components/common-macros.tt:625
+#: ../root/components/common-macros.tt:623
msgid ""
"Expires in <span class=\"tooltip\" title=\"{exactdate}\">{num} day</span>"
msgid_plural ""
@@ -2954,7 +2954,7 @@ msgid_plural ""
msgstr[0] ""
msgstr[1] ""
-#: ../root/components/common-macros.tt:631
+#: ../root/components/common-macros.tt:629
msgid ""
"Expires in <span class=\"tooltip\" title=\"{exactdate}\">{num} hour</span>"
msgid_plural ""
@@ -2962,7 +2962,7 @@ msgid_plural ""
msgstr[0] ""
msgstr[1] ""
-#: ../root/components/common-macros.tt:637
+#: ../root/components/common-macros.tt:635
msgid ""
"Expires in <span class=\"tooltip\" title=\"{exactdate}\">{num} minute</span>"
msgid_plural ""
@@ -2974,23 +2974,19 @@ msgstr[1] ""
msgid "External links"
msgstr ""
-#: ../root/release/edit/information.tt:44
-msgid "Extra Types:"
-msgstr ""
-
#: ../root/layout/menu.tt:248 ../root/main/index.tt:23
msgid "FAQs"
msgstr ""
-#: ../root/user/profile.tt:160
+#: ../root/user/profile.tt:158
msgid "Failed"
msgstr ""
-#: ../root/edit/details/remove_cover_art.tt:22 ../root/taglookup/form.tt:9
+#: ../root/edit/details/remove_cover_art.tt:21 ../root/taglookup/form.tt:9
msgid "Filename:"
msgstr ""
-#: ../root/components/common-macros.tt:791
+#: ../root/components/common-macros.tt:799
msgid "Filter"
msgstr ""
@@ -3032,7 +3028,7 @@ msgstr ""
#: ../root/cdtoc/list.tt:5 ../root/collection/index.tt:12
#: ../root/edit/details/edit_release_events.tt:10
#: ../root/edit/details/historic/add_release.tt:80
-#: ../root/release/edit/tracklist.tt:377 ../root/release_group/index.tt:16
+#: ../root/release/edit/tracklist.tt:370 ../root/release_group/index.tt:16
#: ../root/release_group/releases-list.tt:20 ../root/release/lookup.tt:12
#: ../root/release/merge.tt:29
msgid "Format"
@@ -3105,7 +3101,7 @@ msgid_plural "Found {n} results for \"{q}\""
msgstr[0] ""
msgstr[1] ""
-#: ../root/components/common-macros.tt:820 ../root/label/layout.tt:14
+#: ../root/components/common-macros.tt:828 ../root/label/layout.tt:14
#: ../root/scripts/text_strings.tt:74
msgid "Founded:"
msgstr ""
@@ -3126,7 +3122,7 @@ msgstr ""
msgid "FreeDB ID:"
msgstr ""
-#: ../root/release/edit/tracklist.tt:175
+#: ../root/release/edit/tracklist.tt:173
msgid "FreeDB import"
msgstr ""
@@ -3150,11 +3146,11 @@ msgstr ""
#: ../root/account/edit.tt:19 ../root/artist/edit_form.tt:42
#: ../root/artist/index.tt:5 ../root/artist/layout.tt:12
#: ../root/edit/details/add_artist.tt:31
-#: ../root/edit/details/edit_artist.tt:30 ../root/user/profile.tt:67
+#: ../root/edit/details/edit_artist.tt:30 ../root/user/profile.tt:66
msgid "Gender:"
msgstr ""
-#: ../root/user/profile.tt:12
+#: ../root/user/profile.tt:11
msgid "General Information"
msgstr ""
@@ -3201,22 +3197,22 @@ msgstr ""
msgid "Guess Sort Name"
msgstr ""
-#: ../root/components/forms.tt:169 ../root/components/forms.tt:190
-#: ../root/release/edit/tracklist.tt:486
+#: ../root/components/forms.tt:168 ../root/components/forms.tt:189
+#: ../root/release/edit/tracklist.tt:474
msgctxt "button/menu"
msgid "Guess case"
msgstr ""
-#: ../root/components/forms.tt:167 ../root/release/edit/tracklist.tt:468
+#: ../root/components/forms.tt:166 ../root/release/edit/tracklist.tt:456
msgctxt "header"
msgid "Guess case"
msgstr ""
-#: ../root/release/edit/tracklist.tt:385
+#: ../root/release/edit/tracklist.tt:378
msgid "Guess case disc title"
msgstr ""
-#: ../root/release/edit/tracklist.tt:333
+#: ../root/release/edit/tracklist.tt:329
msgid "Guess case track"
msgstr ""
@@ -3232,8 +3228,8 @@ msgstr ""
msgid "Hide Credits"
msgstr ""
-#: ../root/components/common-macros.tt:592
-#: ../lib/MusicBrainz/Server/Controller/Edit.pm:182
+#: ../root/components/common-macros.tt:590
+#: ../lib/MusicBrainz/Server/Controller/Edit.pm:187
msgid "High"
msgstr ""
@@ -3242,10 +3238,14 @@ msgstr ""
msgid "Historic"
msgstr ""
-#: ../root/user/profile.tt:90
+#: ../root/user/profile.tt:89
msgid "Homepage:"
msgstr ""
+#: ../root/main/500.tt:47
+msgid "Host:"
+msgstr ""
+
#: ../root/edit/list_header.tt:31
msgid "How editing works"
msgstr ""
@@ -3377,7 +3377,7 @@ msgid ""
"the same name."
msgstr ""
-#: ../root/main/500.tt:60
+#: ../root/main/500.tt:65
msgid ""
"If the problem persists, please {report|report a bug} and include any error "
"message that is shown above."
@@ -3550,7 +3550,7 @@ msgstr ""
msgid "Instrument Tree"
msgstr ""
-#: ../root/main/500.tt:47
+#: ../root/main/500.tt:52
msgid "Interface language:"
msgstr ""
@@ -3558,7 +3558,7 @@ msgstr ""
msgid "Internal Server Error"
msgstr ""
-#: ../root/user/profile.tt:46
+#: ../root/user/profile.tt:45
msgid "Internal/Bot"
msgstr ""
@@ -3590,7 +3590,7 @@ msgstr ""
msgid "Javascript needs to be enabled."
msgstr ""
-#: ../root/components/forms.tt:288 ../root/release/edit/tracklist.tt:46
+#: ../root/components/forms.tt:286 ../root/release/edit/tracklist.tt:46
#: ../root/scripts/text_strings.tt:26
msgid "Join phrase"
msgstr ""
@@ -3603,15 +3603,15 @@ msgstr ""
msgid "Keep me logged in"
msgstr ""
-#: ../root/components/forms.tt:175 ../root/components/forms.tt:199
-#: ../root/release/edit/tracklist.tt:479
+#: ../root/components/forms.tt:174 ../root/components/forms.tt:198
+#: ../root/release/edit/tracklist.tt:467
msgid "Keep uppercase words uppercased"
msgstr ""
#: ../root/cdtoc/attach_artist_releases.tt:37
#: ../root/cdtoc/attach_filter_release.tt:51 ../root/cdtoc/list.tt:10
-#: ../root/collection/index.tt:16 ../root/components/common-macros.tt:518
-#: ../root/components/common-macros.tt:571
+#: ../root/collection/index.tt:16 ../root/components/common-macros.tt:516
+#: ../root/components/common-macros.tt:569
#: ../root/edit/details/edit_release_events.tt:7
#: ../root/edit/details/historic/add_release.tt:77
#: ../root/edit/search_macros.tt:284 ../root/label/edits.tt:19
@@ -3657,7 +3657,7 @@ msgstr ""
msgid "Label ratings"
msgstr ""
-#: ../root/components/common-macros.tt:506
+#: ../root/components/common-macros.tt:504
#: ../root/edit/details/add_label_alias.tt:3
#: ../root/edit/details/add_label_annotation.tt:3
#: ../root/edit/details/add_label.tt:3
@@ -3705,15 +3705,15 @@ msgstr ""
msgid "Languages Known:"
msgstr ""
-#: ../root/user/profile.tt:120
+#: ../root/user/profile.tt:118
msgid "Languages:"
msgstr ""
-#: ../root/user/profile.tt:168
+#: ../root/user/profile.tt:166
msgid "Last 24 hours"
msgstr ""
-#: ../root/user/profile.tt:198
+#: ../root/user/profile.tt:196
msgid "Last 28 days"
msgstr ""
@@ -3745,7 +3745,7 @@ msgstr ""
#: ../root/edit/details/historic/add_release.tt:52 ../root/freedb/show.tt:12
#: ../root/freedb/show.tt:65 ../root/isrc/index.tt:18 ../root/puid/index.tt:12
#: ../root/recording/index.tt:11 ../root/release/discids.tt:10
-#: ../root/release/edit/tracklist.tt:268 ../root/release/edit/tracklist.tt:433
+#: ../root/release/edit/tracklist.tt:266 ../root/release/edit/tracklist.tt:422
#: ../root/release/index.tt:21 ../root/report/isrc_with_many_recordings.tt:26
#: ../root/search/lib/inline-results-recording.tt:8
#: ../root/tracklist/index.tt:15
@@ -3768,7 +3768,7 @@ msgid ""
"contribute}."
msgstr ""
-#: ../root/user/profile.tt:49
+#: ../root/user/profile.tt:48
msgid "Limited User"
msgstr ""
@@ -3868,13 +3868,13 @@ msgstr ""
msgid "Lost Username"
msgstr ""
-#: ../root/components/common-macros.tt:592
-#: ../lib/MusicBrainz/Server/Controller/Edit.pm:182
+#: ../root/components/common-macros.tt:590
+#: ../lib/MusicBrainz/Server/Controller/Edit.pm:187
msgid "Low"
msgstr ""
-#: ../root/release/edit_relationships.tt:102
-#: ../root/release/edit_relationships.tt:212 ../root/work/edit_form.tt:10
+#: ../root/release/edit_relationships.tt:106
+#: ../root/release/edit_relationships.tt:216 ../root/work/edit_form.tt:10
#: ../root/work/layout.tt:11
msgid "Lyrics Language:"
msgstr ""
@@ -3883,8 +3883,8 @@ msgstr ""
msgid "MBID:"
msgstr ""
-#: ../root/release/edit_relationships.tt:134
-#: ../root/release/edit_relationships.tt:143
+#: ../root/release/edit_relationships.tt:138
+#: ../root/release/edit_relationships.tt:147
#: ../lib/MusicBrainz/Server/Plugin/FormRenderer.pm:248
msgid "MM"
msgstr ""
@@ -3907,7 +3907,14 @@ msgstr ""
msgid "Make a donation now!"
msgstr ""
-#: ../root/release/edit/tracklist.tt:172
+#: ../root/release/merge.tt:138
+msgid ""
+"Make sure all mediums in the releases being merged are in the correct "
+"position. For example, to merge a medium into medium 2 of a release, it "
+"will need to be set as medium 2 of the release being merged."
+msgstr ""
+
+#: ../root/release/edit/tracklist.tt:170
msgid "Manual entry"
msgstr ""
@@ -3919,7 +3926,7 @@ msgstr ""
msgid "Matching CDs"
msgstr ""
-#: ../root/cdtoc/lookup.tt:38 ../root/components/common-macros.tt:782
+#: ../root/cdtoc/lookup.tt:38 ../root/components/common-macros.tt:790
#: ../root/scripts/text_strings.tt:90
#: ../root/search/lib/inline-results-recording.tt:16
#: ../lib/MusicBrainz/Server/Edit/Medium.pm:7
@@ -3960,7 +3967,7 @@ msgstr ""
msgid "Mediums:"
msgstr ""
-#: ../root/user/profile.tt:79
+#: ../root/user/profile.tt:78
msgid "Member since:"
msgstr ""
@@ -4080,11 +4087,11 @@ msgstr ""
msgid "Move Disc ID"
msgstr ""
-#: ../root/release/edit/tracklist.tt:400
+#: ../root/release/edit/tracklist.tt:392
msgid "Move disc down"
msgstr ""
-#: ../root/release/edit/tracklist.tt:403
+#: ../root/release/edit/tracklist.tt:394
msgid "Move disc up"
msgstr ""
@@ -4093,11 +4100,11 @@ msgstr ""
msgid "Move release to another release group"
msgstr ""
-#: ../root/release/edit/tracklist.tt:310
+#: ../root/release/edit/tracklist.tt:308
msgid "Move track down"
msgstr ""
-#: ../root/release/edit/tracklist.tt:313
+#: ../root/release/edit/tracklist.tt:310
msgid "Move track up"
msgstr ""
@@ -4203,7 +4210,7 @@ msgstr ""
msgid "My Vote"
msgstr ""
-#: ../root/edit/index.tt:35
+#: ../root/edit/index.tt:31
msgid "My vote:"
msgstr ""
@@ -4276,6 +4283,10 @@ msgstr ""
msgid "New Artist Credit"
msgstr ""
+#: ../root/release/add_cover_art.tt:39
+msgid "New Image Goes Here"
+msgstr ""
+
#: ../root/relationship/linkattributetype/create.tt:1
#: ../root/relationship/linkattributetype/create.tt:3
msgid "New Relationship Attribute"
@@ -4355,7 +4366,7 @@ msgstr ""
#: ../root/release/edit/information.tt:122
#: ../root/release/edit/missing_entities.tt:166
#: ../root/release/edit/recordings.tt:435
-#: ../root/release/edit/tracklist.tt:497
+#: ../root/release/edit/tracklist.tt:485
msgid "Next »"
msgstr ""
@@ -4457,7 +4468,7 @@ msgstr ""
msgid "No releases found"
msgstr ""
-#: ../root/collection/index.tt:52
+#: ../root/collection/index.tt:54
msgid "No releases found in collection."
msgstr ""
@@ -4477,7 +4488,7 @@ msgstr ""
msgid "No releases with this tag were found."
msgstr ""
-#: ../root/release/edit/tracklist.tt:114 ../root/scripts/text_strings.tt:38
+#: ../root/release/edit/tracklist.tt:112 ../root/scripts/text_strings.tt:38
msgid "No results"
msgstr ""
@@ -4535,12 +4546,12 @@ msgstr ""
msgid "None"
msgstr ""
-#: ../root/components/common-macros.tt:592
-#: ../lib/MusicBrainz/Server/Controller/Edit.pm:182
+#: ../root/components/common-macros.tt:590
+#: ../lib/MusicBrainz/Server/Controller/Edit.pm:187
msgid "Normal"
msgstr ""
-#: ../root/user/profile.tt:52
+#: ../root/user/profile.tt:51
msgid "Normal User"
msgstr ""
@@ -4573,7 +4584,7 @@ msgstr ""
msgid "Now loading recording associations..."
msgstr ""
-#: ../root/release/edit/tracklist.tt:286 ../root/release/edit/tracklist.tt:417
+#: ../root/release/edit/tracklist.tt:284 ../root/release/edit/tracklist.tt:406
msgid "Now loading tracklist..."
msgstr ""
@@ -4639,7 +4650,7 @@ msgid ""
msgstr ""
#: ../root/release/edit_relationships.tt:44
-#: ../root/release/edit_relationships.tt:181
+#: ../root/release/edit_relationships.tt:185
msgid ""
"Only use this option after you've tried searching for the work(s) you want "
"to create, and are certain they do not already exist on MusicBrainz."
@@ -4659,7 +4670,7 @@ msgstr ""
msgid "Oops, something went wrong!"
msgstr ""
-#: ../root/user/profile.tt:164 ../lib/MusicBrainz/Server/Edit/Utils.pm:250
+#: ../root/user/profile.tt:162 ../lib/MusicBrainz/Server/Edit/Utils.pm:250
msgid "Open"
msgstr ""
@@ -4676,7 +4687,7 @@ msgid "Open edits"
msgstr ""
#: ../root/components/common-macros.tt:456
-#: ../root/components/common-macros.tt:461
+#: ../root/components/common-macros.tt:460
msgid "Open in tagger"
msgstr ""
@@ -4685,7 +4696,7 @@ msgid "Opened:"
msgstr ""
#: ../root/release/edit/recordings.tt:395
-#: ../root/release/edit/tracklist.tt:156 ../root/release/edit/tracklist.tt:186
+#: ../root/release/edit/tracklist.tt:154 ../root/release/edit/tracklist.tt:184
msgid "Options"
msgstr ""
@@ -4709,7 +4720,7 @@ msgstr ""
msgid "Other release groups"
msgstr ""
-#: ../root/user/profile.tt:201
+#: ../root/user/profile.tt:199
msgid "Overall"
msgstr ""
@@ -4783,11 +4794,11 @@ msgstr ""
msgid "Parent:"
msgstr ""
-#: ../root/release/edit/tracklist.tt:161
+#: ../root/release/edit/tracklist.tt:159
msgid "Parse Tracks"
msgstr ""
-#: ../root/release/edit/tracklist.tt:189
+#: ../root/release/edit/tracklist.tt:187
msgid "Parse track artists"
msgstr ""
@@ -4817,7 +4828,7 @@ msgid ""
"other editors know a bit more about you."
msgstr ""
-#: ../root/main/500.tt:65
+#: ../root/main/500.tt:70
msgid "Please be sure to include the stack trace and request data shown above!"
msgstr ""
@@ -4992,11 +5003,11 @@ msgstr ""
msgid "Please slow down and then try again"
msgstr ""
-#: ../root/components/forms.tt:187
+#: ../root/components/forms.tt:186
msgid "Please use the Guess Case button to fix common style errors."
msgstr ""
-#: ../root/components/forms.tt:221
+#: ../root/components/forms.tt:220
msgid "Please use the Sort Name button to guess the sort name."
msgstr ""
@@ -5057,7 +5068,7 @@ msgstr ""
msgid "Preferences"
msgstr ""
-#: ../root/annotation/edit.tt:27 ../root/components/forms.tt:254
+#: ../root/annotation/edit.tt:27 ../root/components/forms.tt:253
#: ../root/release/edit/tracklist.tt:37
msgid "Preview"
msgstr ""
@@ -5076,6 +5087,7 @@ msgstr ""
#: ../root/edit/details/add_release_group.tt:28
#: ../root/edit/details/edit_release_group.tt:19
+#: ../root/release/edit/information.tt:43
#: ../root/release_group/edit_form.tt:10
msgid "Primary Type:"
msgstr ""
@@ -5157,7 +5169,7 @@ msgstr[1] ""
#: ../root/artist/browse_various.tt:16 ../root/artist/index.tt:67
#: ../root/artist/recordings-list.tt:27 ../root/artist/works-list.tt:16
-#: ../root/layout/sidebar/sidebar-rating.tt:1
+#: ../root/collection/index.tt:18 ../root/layout/sidebar/sidebar-rating.tt:1
#: ../root/release_group/merge.tt:16 ../root/release/index.tt:20
#: ../root/tracklist/index.tt:14 ../root/work/merge.tt:17
msgid "Rating"
@@ -5181,9 +5193,9 @@ msgid ""
"works."
msgstr ""
-#: ../root/components/common-macros.tt:518
-#: ../root/components/common-macros.tt:572 ../root/edit/search_macros.tt:284
-#: ../root/release/edit_relationships.tt:365
+#: ../root/components/common-macros.tt:516
+#: ../root/components/common-macros.tt:570 ../root/edit/search_macros.tt:284
+#: ../root/release/edit_relationships.tt:369
#: ../root/report/isrc_with_many_recordings.tt:25
#: ../root/report/recording_list.tt:6 ../root/scripts/text_strings.tt:104
#: ../lib/MusicBrainz/Server/Edit/Recording.pm:7
@@ -5215,7 +5227,7 @@ msgstr ""
msgid "Recording “{name}” by {artist}"
msgstr ""
-#: ../root/components/common-macros.tt:506
+#: ../root/components/common-macros.tt:504
#: ../root/edit/details/add_recording_annotation.tt:3
#: ../root/edit/details/add_standalone_recording.tt:3
#: ../root/edit/details/edit_recording.tt:8
@@ -5231,7 +5243,7 @@ msgstr ""
#: ../root/artist/header.tt:1 ../root/artist/recordings.tt:1
#: ../root/artist/recordings.tt:4 ../root/report/index.tt:67
#: ../root/tag/header.tt:1 ../root/tag/index.tt:3 ../root/user/tag.tt:4
-#: ../lib/MusicBrainz/Server/Wizard/ReleaseEditor.pm:65
+#: ../lib/MusicBrainz/Server/Wizard/ReleaseEditor.pm:66
msgid "Recordings"
msgstr ""
@@ -5269,11 +5281,11 @@ msgstr ""
msgid "Reject"
msgstr ""
-#: ../root/edit/index.tt:69
+#: ../root/edit/index.tt:65
msgid "Reject edit"
msgstr ""
-#: ../root/components/common-macros.tt:599
+#: ../root/components/common-macros.tt:597
msgid "Reject upon expiration"
msgstr ""
@@ -5281,7 +5293,7 @@ msgstr ""
msgid "Relate recording to work"
msgstr ""
-#: ../root/components/common-macros.tt:549
+#: ../root/components/common-macros.tt:547
msgid "Relate to ..."
msgstr ""
@@ -5289,7 +5301,7 @@ msgstr ""
msgid "Relate to <abbr title=\"Uniform Resource Locator\">URL</abbr>"
msgstr ""
-#: ../root/release/edit_relationships.tt:369
+#: ../root/release/edit_relationships.tt:373
msgid "Related Works"
msgstr ""
@@ -5369,7 +5381,7 @@ msgstr ""
msgid "Relationships"
msgstr ""
-#: ../root/release/edit_relationships.tt:320
+#: ../root/release/edit_relationships.tt:324
msgid ""
"Relationships highlighted <span class=\"rel-edit\">yellow</span> will be "
"edited, relationships highlighted <span class=\"rel-remove\">red</span> will "
@@ -5384,8 +5396,8 @@ msgstr ""
#: ../root/cdtoc/attach_artist_releases.tt:34
#: ../root/cdtoc/attach_filter_release.tt:47 ../root/cdtoc/lookup.tt:37
-#: ../root/collection/index.tt:10 ../root/components/common-macros.tt:518
-#: ../root/components/common-macros.tt:574
+#: ../root/collection/index.tt:10 ../root/components/common-macros.tt:516
+#: ../root/components/common-macros.tt:572
#: ../root/edit/details/edit_release_events.tt:4
#: ../root/edit/search_macros.tt:284 ../root/release_group/index.tt:15
#: ../root/release_group/releases-list.tt:16 ../root/release/lookup.tt:9
@@ -5416,8 +5428,8 @@ msgstr ""
msgid "Release Events:"
msgstr ""
-#: ../root/components/common-macros.tt:518
-#: ../root/components/common-macros.tt:573 ../root/edit/search_macros.tt:284
+#: ../root/components/common-macros.tt:516
+#: ../root/components/common-macros.tt:571 ../root/edit/search_macros.tt:284
#: ../root/report/release_group_list.tt:6
#: ../root/search/results-release_group.tt:8
#: ../root/search/results-release-group.tt:8
@@ -5433,7 +5445,7 @@ msgstr ""
msgid "Release Group Not Found"
msgstr ""
-#: ../root/release/edit_relationships.tt:392
+#: ../root/release/edit_relationships.tt:396
msgid "Release Group Relationships"
msgstr ""
@@ -5465,7 +5477,7 @@ msgstr ""
msgid "Release Quality"
msgstr ""
-#: ../root/release/edit_relationships.tt:386
+#: ../root/release/edit_relationships.tt:390
msgid "Release Relationships"
msgstr ""
@@ -5511,7 +5523,7 @@ msgstr ""
msgid "Release group “{name}” by {artist}"
msgstr ""
-#: ../root/components/common-macros.tt:506
+#: ../root/components/common-macros.tt:504
#: ../root/edit/details/add_release_group_annotation.tt:3
#: ../root/edit/details/add_release.tt:20
#: ../root/edit/details/change_release_group.tt:7
@@ -5542,10 +5554,6 @@ msgstr ""
msgid "Release information"
msgstr ""
-#: ../root/user/ratings.tt:1
-msgid "Release ratings"
-msgstr ""
-
#: ../root/cdtoc/attach_filter_release.tt:28 ../root/cdtoc/move_search.tt:13
msgid "Release title:"
msgstr ""
@@ -5554,7 +5562,7 @@ msgstr ""
msgid "Release “{name}” by {artist}"
msgstr ""
-#: ../root/cdtoc/lookup.tt:71 ../root/components/common-macros.tt:506
+#: ../root/cdtoc/lookup.tt:71 ../root/components/common-macros.tt:504
#: ../root/edit/details/add_cover_art.tt:5
#: ../root/edit/details/add_medium.tt:4
#: ../root/edit/details/add_release_annotation.tt:4
@@ -5572,7 +5580,7 @@ msgstr ""
#: ../root/edit/details/remove_release.tt:3
#: ../root/edit/details/reorder_cover_art.tt:5
#: ../root/edit/details/reorder_mediums.tt:4
-#: ../root/release/edit/tracklist.tt:210 ../root/taglookup/form.tt:5
+#: ../root/release/edit/tracklist.tt:208 ../root/taglookup/form.tt:5
msgid "Release:"
msgstr ""
@@ -5580,7 +5588,7 @@ msgstr ""
#: ../root/artist/browse_various.tt:17 ../root/artist/header.tt:1
#: ../root/artist/index.tt:68 ../root/artist/releases.tt:1
#: ../root/artist/releases.tt:4 ../root/label/header.tt:1
-#: ../root/label/index.tt:6 ../root/recording/header.tt:1
+#: ../root/label/index.tt:14 ../root/recording/header.tt:1
#: ../root/release_group/merge.tt:17 ../root/report/index.tt:40
#: ../root/tag/header.tt:1 ../root/tag/index.tt:3
#: ../root/user/collections.tt:10 ../root/user/tag.tt:4
@@ -5746,7 +5754,7 @@ msgstr ""
msgid "Remove Artist Alias"
msgstr ""
-#: ../root/components/forms.tt:275 ../root/release/edit/tracklist.tt:73
+#: ../root/components/forms.tt:274 ../root/release/edit/tracklist.tt:73
msgid "Remove Artist Credit"
msgstr ""
@@ -5822,7 +5830,7 @@ msgstr ""
msgid "Remove collection"
msgstr ""
-#: ../root/release/edit/tracklist.tt:407
+#: ../root/release/edit/tracklist.tt:397
msgid "Remove disc"
msgstr ""
@@ -5860,7 +5868,7 @@ msgstr ""
msgid "Remove selected entities"
msgstr ""
-#: ../root/collection/index.tt:47
+#: ../root/collection/index.tt:49
msgid "Remove selected releases from collection"
msgstr ""
@@ -5868,7 +5876,7 @@ msgstr ""
msgid "Remove this collection"
msgstr ""
-#: ../root/release/edit/tracklist.tt:338
+#: ../root/release/edit/tracklist.tt:333
#: ../lib/MusicBrainz/Server/Edit/Historic/RemoveTrack.pm:10
msgid "Remove track"
msgstr ""
@@ -5882,7 +5890,8 @@ msgstr ""
msgid "Remove your rating"
msgstr ""
-#: ../root/components/forms.tt:108 ../root/components/forms.tt:109
+#: ../root/components/forms.tt:107 ../root/components/forms.tt:115
+#: ../root/components/forms.tt:116
msgid "Remove {item}"
msgstr ""
@@ -5940,7 +5949,7 @@ msgstr ""
msgid "Reset Password"
msgstr ""
-#: ../root/release/edit/tracklist.tt:444 ../root/release/edit/tracklist.tt:445
+#: ../root/release/edit/tracklist.tt:433 ../root/release/edit/tracklist.tt:434
msgid "Reset track numbers"
msgstr ""
@@ -5982,10 +5991,6 @@ msgstr ""
msgid "Save"
msgstr ""
-#: ../root/layout.tt:155
-msgid "Schwag"
-msgstr ""
-
#: ../root/search/lib/inline-results-artist.tt:6
#: ../root/search/lib/inline-results-recording.tt:6
#: ../root/search/lib/inline-results-release.tt:7
@@ -6007,10 +6012,10 @@ msgstr ""
#: ../root/cdtoc/attach_filter_artist.tt:10
#: ../root/cdtoc/attach_filter_release.tt:30 ../root/cdtoc/lookup.tt:63
#: ../root/cdtoc/lookup.tt:73 ../root/cdtoc/move_search.tt:15
-#: ../root/components/common-macros.tt:799 ../root/components/search.tt:11
+#: ../root/components/common-macros.tt:807 ../root/components/search.tt:11
#: ../root/edit/search_macros.tt:101 ../root/layout/menu.tt:186
#: ../root/layout.tt:74 ../root/otherlookup/form.tt:18
-#: ../root/release/edit/tracklist.tt:223 ../root/scripts/text_strings.tt:30
+#: ../root/release/edit/tracklist.tt:221 ../root/scripts/text_strings.tt:30
#: ../root/search/form.tt:42 ../root/search/index.tt:1
#: ../root/search/index.tt:3 ../root/taglookup/form.tt:13
msgid "Search"
@@ -6083,7 +6088,7 @@ msgstr ""
msgid "Search the database for this CD"
msgstr ""
-#: ../root/components/common-macros.tt:798
+#: ../root/components/common-macros.tt:806
msgid "Search the documentation..."
msgstr ""
@@ -6091,7 +6096,7 @@ msgstr ""
msgid "Search:"
msgstr ""
-#: ../root/release/edit/tracklist.tt:109 ../root/scripts/text_strings.tt:40
+#: ../root/release/edit/tracklist.tt:107 ../root/scripts/text_strings.tt:40
msgid "Searching..."
msgstr ""
@@ -6101,6 +6106,7 @@ msgstr ""
#: ../root/edit/details/add_release_group.tt:35
#: ../root/edit/details/edit_release_group.tt:23
+#: ../root/release/edit/information.tt:44
#: ../root/release_group/edit_form.tt:11
msgid "Secondary Types:"
msgstr ""
@@ -6136,7 +6142,7 @@ msgstr ""
msgid "Select"
msgstr ""
-#: ../root/release/edit/tracklist.tt:99
+#: ../root/release/edit/tracklist.tt:97
msgid ""
"Select a disc from the search results below and then click \"Add Disc\"."
msgstr ""
@@ -6499,7 +6505,7 @@ msgstr ""
msgid "Sorry, “{id}” is not a valid documentation page."
msgstr ""
-#: ../root/components/forms.tt:224
+#: ../root/components/forms.tt:223
#: ../root/search/lib/inline-results-artist.tt:8
#: ../root/search/results-label.tt:9
msgid "Sort Name"
@@ -6563,7 +6569,7 @@ msgstr ""
msgid "Start over"
msgstr ""
-#: ../root/layout/menu.tt:131 ../root/user/profile.tt:139
+#: ../root/layout/menu.tt:131 ../root/user/profile.tt:137
msgid "Statistics"
msgstr ""
@@ -6660,7 +6666,7 @@ msgstr ""
msgid "Subscribers"
msgstr ""
-#: ../root/user/profile.tt:97
+#: ../root/user/profile.tt:96
msgid "Subscribers:"
msgstr ""
@@ -6677,7 +6683,7 @@ msgstr ""
msgid "Summary:"
msgstr ""
-#: ../root/release/edit/tracklist.tt:448 ../root/release/edit/tracklist.tt:449
+#: ../root/release/edit/tracklist.tt:437 ../root/release/edit/tracklist.tt:438
msgid "Swap track titles with artist credits"
msgstr ""
@@ -6762,8 +6768,6 @@ msgstr ""
#: ../root/cdtoc/attach_artist_releases.tt:41
#: ../root/cdtoc/attach_filter_release.tt:55 ../root/cdtoc/list.tt:14
-#: ../root/components/common-macros.tt:457
-#: ../root/components/common-macros.tt:462
#: ../root/otherlookup/results-release.tt:13 ../root/release_group/index.tt:24
#: ../root/release_group/releases-list.tt:30
#: ../root/search/lib/inline-results-recording.tt:13
@@ -6791,7 +6795,7 @@ msgstr ""
msgid "Technical flags"
msgstr ""
-#: ../root/edit/index.tt:65
+#: ../root/edit/index.tt:61
msgid "Testing features"
msgstr ""
@@ -6815,7 +6819,7 @@ msgid ""
"release, so we are unable to allow any more uploads."
msgstr ""
-#: ../root/user/profile.tt:81
+#: ../root/user/profile.tt:80
msgid "The Dawn of the Project"
msgstr ""
@@ -6900,7 +6904,7 @@ msgstr ""
msgid "The date you've entered is not valid."
msgstr ""
-#: ../root/user/profile.tt:83
+#: ../root/user/profile.tt:82
msgid "The early days of the project"
msgstr ""
@@ -6959,13 +6963,13 @@ msgstr ""
msgid "The reason for this was unknown."
msgstr ""
-#: ../root/release/merge.tt:140
+#: ../root/release/merge.tt:142
msgid ""
"The recording artists do not match! Perhaps you meant to use the \"append "
"mediums\" merge strategy?"
msgstr ""
-#: ../root/release/merge.tt:141
+#: ../root/release/merge.tt:143
msgid ""
"The recordings that will be merged if you continue with the current merge "
"strategy include the following, whose artists differ:"
@@ -7208,39 +7212,39 @@ msgstr ""
msgid "This collection has no tags."
msgstr ""
-#: ../root/components/common-macros.tt:605
+#: ../root/components/common-macros.tt:603
msgid ""
"This edit failed because it affected high quality data and did not receive "
"any votes."
msgstr ""
-#: ../root/components/common-macros.tt:605
+#: ../root/components/common-macros.tt:603
msgid ""
"This edit failed because the data it was changing was modified after this "
"edit was created. This may happen when the same edit is entered in twice; "
"one will pass but the other will fail."
msgstr ""
-#: ../root/components/common-macros.tt:605
+#: ../root/components/common-macros.tt:603
msgid "This edit failed because there were insufficient \"yes\" votes."
msgstr ""
-#: ../root/components/common-macros.tt:605
+#: ../root/components/common-macros.tt:603
msgid ""
"This edit failed due to an internal error and may need to be entered again."
msgstr ""
-#: ../root/components/common-macros.tt:605
+#: ../root/components/common-macros.tt:603
msgid ""
"This edit failed either because an entity it was modifying no longer exists, "
"or the entity can not be modified in this manner anymore."
msgstr ""
-#: ../root/components/common-macros.tt:605
+#: ../root/components/common-macros.tt:603
msgid "This edit has been successfully applied."
msgstr ""
-#: ../root/components/common-macros.tt:605
+#: ../root/components/common-macros.tt:603
msgid "This edit is open and awaiting votes before it can be applied."
msgstr ""
@@ -7254,11 +7258,11 @@ msgid ""
"set the release artist to Various Artists."
msgstr ""
-#: ../root/components/common-macros.tt:605
+#: ../root/components/common-macros.tt:603
msgid "This edit was cancelled."
msgstr ""
-#: ../root/components/common-macros.tt:605
+#: ../root/components/common-macros.tt:603
msgid "This edit was recently cancelled."
msgstr ""
@@ -7337,7 +7341,7 @@ msgid ""
"and/or relationships attributed to it."
msgstr ""
-#: ../root/label/index.tt:14
+#: ../root/label/index.tt:22
msgid "This label does not have any releases."
msgstr ""
@@ -7345,6 +7349,13 @@ msgstr ""
msgid "This label has ended."
msgstr ""
+#: ../root/label/index.tt:6
+msgid ""
+"This label has no relationships or releases and will be removed "
+"automatically in the next few days. If this is not intended, please add more "
+"data to this label."
+msgstr ""
+
#: ../root/label/tags.tt:2
msgid "This label has no tags."
msgstr ""
@@ -7407,7 +7418,7 @@ msgstr ""
#: ../root/edit/relationship/create.tt:108
#: ../root/edit/relationship/edit.tt:139
-#: ../root/release/edit_relationships.tt:152
+#: ../root/release/edit_relationships.tt:156
msgid "This relationship has ended."
msgstr ""
@@ -7718,7 +7729,7 @@ msgid ""
"This requires that corresponding mediums have the same number of tracks."
msgstr ""
-#: ../root/user/profile.tt:186
+#: ../root/user/profile.tt:184
msgid "This table shows a summary of votes cast by this editor."
msgstr ""
@@ -7789,8 +7800,8 @@ msgstr ""
#: ../root/edit/details/edit_medium.tt:48
#: ../root/edit/details/edit_medium.tt:122 ../root/isrc/index.tt:16
#: ../root/iswc/index.tt:16 ../root/puid/index.tt:10
-#: ../root/recording/index.tt:10 ../root/release/edit/tracklist.tt:266
-#: ../root/release/edit/tracklist.tt:428 ../root/release/index.tt:15
+#: ../root/recording/index.tt:10 ../root/release/edit/tracklist.tt:264
+#: ../root/release/edit/tracklist.tt:417 ../root/release/index.tt:15
#: ../root/search/results-freedb.tt:14 ../root/tracklist/index.tt:10
#: ../root/tracklist/index.tt:29
#: ../lib/MusicBrainz/Server/Form/ReleaseEditor/Information.pm:13
@@ -7802,13 +7813,13 @@ msgstr ""
msgid "Title:"
msgstr ""
-#: ../root/release/edit_relationships.tt:325
+#: ../root/release/edit_relationships.tt:329
msgid ""
"To <span class=\"rel-edit\">edit</span> a relationship, click on its name (e."
"g. \"composer\")."
msgstr ""
-#: ../root/edit/index.tt:66
+#: ../root/edit/index.tt:62
msgid ""
"To aid in testing, the following features have been made available on "
"testing servers:"
@@ -7822,7 +7833,7 @@ msgstr ""
msgid "To begin browsing, please select a letter above."
msgstr ""
-#: ../root/release/edit/tracklist.tt:168
+#: ../root/release/edit/tracklist.tt:166
msgid ""
"To create a new tracklist, use an existing tracklist or import a disc from a "
"CD stub or FreeDB, select the appropriate tab."
@@ -7836,7 +7847,7 @@ msgstr ""
msgid "To find out if you can vote for this candidate, please {url|log in}."
msgstr ""
-#: ../root/release/edit_relationships.tt:327
+#: ../root/release/edit_relationships.tt:331
msgid ""
"To use the batch tools, select some recordings or works using the checkboxes."
msgstr ""
@@ -7847,7 +7858,7 @@ msgid ""
"them and select 'Watch this artist for new releases' from the sidebar."
msgstr ""
-#: ../root/edit/details/historic/move_disc_id.tt:19
+#: ../root/edit/details/historic/move_disc_id.tt:24
#: ../root/edit/details/move_disc_id.tt:15
msgid "To:"
msgstr ""
@@ -7931,16 +7942,16 @@ msgstr ""
msgid "Track"
msgstr ""
-#: ../root/release/edit/tracklist.tt:152 ../root/release/edit/tracklist.tt:394
-#: ../root/release/edit/tracklist.tt:395
+#: ../root/release/edit/tracklist.tt:150 ../root/release/edit/tracklist.tt:386
+#: ../root/release/edit/tracklist.tt:387
msgid "Track Parser"
msgstr ""
-#: ../root/release/edit_relationships.tt:329
+#: ../root/release/edit_relationships.tt:333
msgid "Track Relationships"
msgstr ""
-#: ../root/release/edit/tracklist.tt:219
+#: ../root/release/edit/tracklist.tt:217
msgid "Track count:"
msgstr ""
@@ -7957,7 +7968,7 @@ msgstr ""
msgid "Track lengths:"
msgstr ""
-#: ../root/release/edit/tracklist.tt:192
+#: ../root/release/edit/tracklist.tt:190
msgid "Track names start with a number"
msgstr ""
@@ -7981,7 +7992,7 @@ msgstr ""
#: ../root/cdtoc/set_durations.tt:10 ../root/release/edit/recordings.tt:257
#: ../root/release/index.tt:4 ../root/tracklist/index.tt:1
#: ../root/tracklist/index.tt:2
-#: ../lib/MusicBrainz/Server/Wizard/ReleaseEditor.pm:58
+#: ../lib/MusicBrainz/Server/Wizard/ReleaseEditor.pm:59
msgid "Tracklist"
msgstr ""
@@ -8077,9 +8088,8 @@ msgstr ""
#: ../root/edit/relationship/create_url.tt:44
#: ../root/edit/relationship/edit.tt:69 ../root/label/edit_form.tt:37
#: ../root/label/layout.tt:9 ../root/release/cover_art_fields.tt:3
-#: ../root/release/edit/information.tt:43
#: ../root/release/edit/information.tt:47
-#: ../root/release/edit_relationships.tt:201
+#: ../root/release/edit_relationships.tt:205
#: ../root/release_group/layout.tt:20 ../root/release/sidebar.tt:38
#: ../root/search/form.tt:5 ../root/work/edit_form.tt:9
#: ../root/work/layout.tt:15
@@ -8098,7 +8108,7 @@ msgstr ""
msgid "Types:"
msgstr ""
-#: ../root/components/common-macros.tt:518 ../root/report/artist_url_list.tt:5
+#: ../root/components/common-macros.tt:516 ../root/report/artist_url_list.tt:5
#: ../root/report/bad_amazon_urls.tt:21 ../root/report/label_url_list.tt:5
#: ../root/report/release_group_url_list.tt:5
#: ../root/report/release_url_list.tt:5 ../root/scripts/text_strings.tt:107
@@ -8122,9 +8132,9 @@ msgstr ""
msgid "URL Relationships"
msgstr ""
-#: ../root/components/common-macros.tt:506 ../root/edit/details/edit_url.tt:9
+#: ../root/components/common-macros.tt:504 ../root/edit/details/edit_url.tt:9
#: ../root/edit/details/edit_url.tt:15
-#: ../root/edit/relationship/create_url.tt:52 ../root/main/500.tt:52
+#: ../root/edit/relationship/create_url.tt:52 ../root/main/500.tt:57
#: ../root/url/edit.tt:18 ../root/url/index.tt:5
msgid "URL:"
msgstr ""
@@ -8195,8 +8205,8 @@ msgstr ""
msgid "Update collection"
msgstr ""
-#: ../root/components/forms.tt:178 ../root/components/forms.tt:202
-#: ../root/release/edit/tracklist.tt:482
+#: ../root/components/forms.tt:177 ../root/components/forms.tt:201
+#: ../root/release/edit/tracklist.tt:470
msgid "Uppercase roman numerals"
msgstr ""
@@ -8208,7 +8218,7 @@ msgstr ""
msgid "Usage Count"
msgstr ""
-#: ../root/components/common-macros.tt:528
+#: ../root/components/common-macros.tt:526
msgid "Use in a relationship"
msgstr ""
@@ -8222,21 +8232,21 @@ msgstr ""
msgid "Use suggested recording"
msgstr ""
-#: ../root/components/forms.tt:251
+#: ../root/components/forms.tt:250
msgid ""
"Use the following fields to enter collaborations, see the <a href="
"\"{url}\">Artist Credit</a> documentation for more information."
msgstr ""
-#: ../root/release/edit/tracklist.tt:233
+#: ../root/release/edit/tracklist.tt:231
msgid "Use the following fields to search for a CD stub."
msgstr ""
-#: ../root/release/edit/tracklist.tt:240
+#: ../root/release/edit/tracklist.tt:238
msgid "Use the following fields to search for a FreeDB entry."
msgstr ""
-#: ../root/release/edit/tracklist.tt:205
+#: ../root/release/edit/tracklist.tt:203
msgid "Use the following fields to search for an existing tracklist."
msgstr ""
@@ -8244,7 +8254,7 @@ msgstr ""
msgid "Use {doc|advanced query syntax}"
msgstr ""
-#: ../root/user/profile.tt:49
+#: ../root/user/profile.tt:48
msgid ""
"User accounts must be more than 2 weeks old, have a confirmed email address, "
"and more than 10 accepted edits in order to vote on others' edits."
@@ -8254,7 +8264,7 @@ msgstr ""
msgid "User permissions"
msgstr ""
-#: ../root/user/profile.tt:43
+#: ../root/user/profile.tt:42
msgid "User type:"
msgstr ""
@@ -8297,7 +8307,7 @@ msgstr ""
msgid "View all relationships"
msgstr ""
-#: ../root/annotation/common.tt:21 ../root/components/common-macros.tt:813
+#: ../root/annotation/common.tt:21 ../root/components/common-macros.tt:821
msgid "View annotation history"
msgstr ""
@@ -8337,11 +8347,15 @@ msgstr ""
msgid "Vote on Edits"
msgstr ""
+#: ../root/scripts/text_strings.tt:121
+msgid "Vote on all edits:"
+msgstr ""
+
#: ../root/edit/index.tt:26
msgid "Vote tally:"
msgstr ""
-#: ../root/user/profile.tt:156
+#: ../root/user/profile.tt:154
msgid "Voted down"
msgstr ""
@@ -8353,7 +8367,7 @@ msgstr ""
msgid "Votes"
msgstr ""
-#: ../root/user/profile.tt:190
+#: ../root/user/profile.tt:188
msgid "Votes ({view_url|view})"
msgstr ""
@@ -8513,7 +8527,7 @@ msgid ""
"page."
msgstr ""
-#: ../root/main/500.tt:57
+#: ../root/main/500.tt:62
msgid ""
"We're terribly sorry for this problem. Please wait a few minutes and repeat "
"your request — the problem may go away."
@@ -8590,8 +8604,8 @@ msgstr ""
msgid "Wikipedia"
msgstr ""
-#: ../root/artist/works-list.tt:9 ../root/components/common-macros.tt:518
-#: ../root/components/common-macros.tt:575 ../root/edit/search_macros.tt:284
+#: ../root/artist/works-list.tt:9 ../root/components/common-macros.tt:516
+#: ../root/components/common-macros.tt:573 ../root/edit/search_macros.tt:284
#: ../root/scripts/text_strings.tt:108 ../root/work/edits.tt:19
#: ../root/work/header.tt:13 ../root/work/merge.tt:11
#: ../lib/MusicBrainz/Server/Edit/Work.pm:7
@@ -8603,7 +8617,7 @@ msgstr ""
msgid "Work Details"
msgstr ""
-#: ../root/release/edit_relationships.tt:187
+#: ../root/release/edit_relationships.tt:191
msgid "Work Name:"
msgstr ""
@@ -8611,7 +8625,7 @@ msgstr ""
msgid "Work Not Found"
msgstr ""
-#: ../root/release/edit_relationships.tt:98
+#: ../root/release/edit_relationships.tt:102
msgid "Work Type:"
msgstr ""
@@ -8619,7 +8633,7 @@ msgstr ""
msgid "Work information"
msgstr ""
-#: ../root/user/ratings_summary.tt:3
+#: ../root/user/ratings_summary.tt:3 ../root/user/ratings.tt:1
msgid "Work ratings"
msgstr ""
@@ -8627,7 +8641,7 @@ msgstr ""
msgid "Work type:"
msgstr ""
-#: ../root/components/common-macros.tt:506
+#: ../root/components/common-macros.tt:504
#: ../root/edit/details/add_work_alias.tt:3
#: ../root/edit/details/add_work_annotation.tt:3
#: ../root/edit/details/add_work.tt:3
@@ -8663,8 +8677,8 @@ msgstr ""
msgid "XML:"
msgstr ""
-#: ../root/release/edit_relationships.tt:133
-#: ../root/release/edit_relationships.tt:142
+#: ../root/release/edit_relationships.tt:137
+#: ../root/release/edit_relationships.tt:146
#: ../lib/MusicBrainz/Server/Plugin/FormRenderer.pm:247
msgid "YYYY"
msgstr ""
@@ -8727,7 +8741,7 @@ msgid ""
"entered in standard <code>CCXXXYYNNNNNN</code> format:"
msgstr ""
-#: ../root/components/forms.tt:234
+#: ../root/components/forms.tt:233
msgid ""
"You are about to add an ISWC to {work}. The ISWC must be entered in standard "
"<code>T-DDD.DDD.DDD-C</code> format:"
@@ -8813,7 +8827,7 @@ msgstr ""
msgid "You are not currently able to add notes to this edit. ({url|Details})"
msgstr ""
-#: ../root/edit/index.tt:58
+#: ../root/edit/index.tt:54
msgid "You are not currently able to vote on this edit. ({url|Details})"
msgstr ""
@@ -8893,7 +8907,7 @@ msgid ""
"recording."
msgstr ""
-#: ../root/release/edit/tracklist.tt:132
+#: ../root/release/edit/tracklist.tt:130
msgid "You have used the {valink|Various Artists} special purpose artist on:"
msgstr ""
@@ -8917,7 +8931,7 @@ msgid ""
"want to {edit|start editing}!"
msgstr ""
-#: ../root/edit/index.tt:74
+#: ../root/edit/index.tt:70
msgid "You must be logged in to vote on edits"
msgstr ""
@@ -9043,7 +9057,7 @@ msgstr ""
msgid "auto-edits"
msgstr ""
-#: ../root/edit/edit_header.tt:50
+#: ../root/components/common-macros.tt:647
msgid "automatically applied"
msgstr ""
@@ -9064,7 +9078,7 @@ msgstr ""
#: ../root/release/edit/recordings.tt:222
#: ../root/release/edit/recordings.tt:342
#: ../root/release/edit/recordings.tt:350
-#: ../root/release/edit/tracklist.tt:255
+#: ../root/release/edit/tracklist.tt:253
msgid "by"
msgstr ""
@@ -9072,7 +9086,7 @@ msgstr ""
msgid "by {artist}"
msgstr ""
-#: ../root/release/edit/tracklist.tt:326
+#: ../root/release/edit/tracklist.tt:322
msgid "credits"
msgstr ""
@@ -9097,24 +9111,24 @@ msgstr ""
msgid "edits"
msgstr ""
-#: ../root/components/common-macros.tt:675
+#: ../root/components/common-macros.tt:681
msgid "ended"
msgstr ""
-#: ../root/components/common-macros.tt:662 ../root/edit/details/macros.tt:28
+#: ../root/components/common-macros.tt:668 ../root/edit/details/macros.tt:28
msgid "from {begin_date} until {end_date}"
msgstr ""
-#: ../root/components/common-macros.tt:668 ../root/edit/details/macros.tt:28
+#: ../root/components/common-macros.tt:674 ../root/edit/details/macros.tt:28
msgid "from {date} to ????"
msgstr ""
-#: ../root/components/common-macros.tt:670 ../root/edit/details/macros.tt:28
+#: ../root/components/common-macros.tt:676 ../root/edit/details/macros.tt:28
msgid "from {date} to present"
msgstr ""
#: ../root/release/edit_relationships.tt:68
-#: ../root/release/edit_relationships.tt:110
+#: ../root/release/edit_relationships.tt:114
msgid "help"
msgstr ""
@@ -9122,7 +9136,7 @@ msgstr ""
msgid "import"
msgstr ""
-#: ../root/components/common-macros.tt:659 ../root/edit/details/macros.tt:28
+#: ../root/components/common-macros.tt:665 ../root/edit/details/macros.tt:28
msgid "in {date}"
msgstr ""
@@ -9200,7 +9214,7 @@ msgstr ""
msgid "newest first"
msgstr ""
-#: ../root/user/profile.tt:55
+#: ../root/user/profile.tt:54
msgid "nominate for auto-editor"
msgstr ""
@@ -9220,7 +9234,7 @@ msgstr ""
msgid "on"
msgstr ""
-#: ../root/components/common-macros.tt:657 ../root/edit/details/macros.tt:28
+#: ../root/components/common-macros.tt:663 ../root/edit/details/macros.tt:28
msgid "on {date}"
msgstr ""
@@ -9270,7 +9284,7 @@ msgstr ""
msgid "releases"
msgstr ""
-#: ../root/user/profile.tt:32
+#: ../root/user/profile.tt:31
msgid "resend verification email"
msgstr ""
@@ -9288,7 +9302,7 @@ msgid_plural "see all versions of this release, {count} available"
msgstr[0] ""
msgstr[1] ""
-#: ../root/user/profile.tt:36
+#: ../root/user/profile.tt:35
msgid "send email"
msgstr ""
@@ -9300,7 +9314,7 @@ msgstr ""
msgid "space"
msgstr ""
-#: ../root/user/profile.tt:108
+#: ../root/user/profile.tt:107
msgid "subscribe"
msgstr ""
@@ -9323,11 +9337,11 @@ msgstr ""
msgid "tracks"
msgstr ""
-#: ../root/user/profile.tt:106
+#: ../root/user/profile.tt:105
msgid "unsubscribe"
msgstr ""
-#: ../root/components/common-macros.tt:673 ../root/edit/details/macros.tt:28
+#: ../root/components/common-macros.tt:679 ../root/edit/details/macros.tt:28
msgid "until {date}"
msgstr ""
@@ -9384,13 +9398,13 @@ msgstr ""
msgid "{commas_only_list_item}, {rest}"
msgstr ""
-#: ../root/user/profile.tt:99
+#: ../root/user/profile.tt:98
msgid "{count} ({url|view list})"
msgstr ""
-#: ../root/user/profile.tt:149 ../root/user/profile.tt:153
-#: ../root/user/profile.tt:157 ../root/user/profile.tt:161
-#: ../root/user/profile.tt:165 ../root/user/profile.tt:169
+#: ../root/user/profile.tt:147 ../root/user/profile.tt:151
+#: ../root/user/profile.tt:155 ../root/user/profile.tt:159
+#: ../root/user/profile.tt:163 ../root/user/profile.tt:167
msgid "{count} ({view_url|view})"
msgstr ""
@@ -9400,7 +9414,7 @@ msgid_plural "{count} private ratings not listed."
msgstr[0] ""
msgstr[1] ""
-#: ../root/user/profile.tt:45
+#: ../root/user/profile.tt:44
msgid "{doc|Auto-Editor}"
msgstr ""
@@ -9408,11 +9422,11 @@ msgstr ""
msgid "{doc|Disc ID}:"
msgstr ""
-#: ../root/user/profile.tt:47
+#: ../root/user/profile.tt:46
msgid "{doc|Relationship Editor}"
msgstr ""
-#: ../root/user/profile.tt:48
+#: ../root/user/profile.tt:47
msgid "{doc|Transclusion Editor}"
msgstr ""
@@ -9489,13 +9503,13 @@ msgstr[1] ""
#: ../root/components/common-macros.tt:53
msgid "{num} day"
-msgid_plural "{num} days"
+msgid_plural "{num} days"
msgstr[0] ""
msgstr[1] ""
#: ../root/components/common-macros.tt:67
msgid "{num} day ago"
-msgid_plural "{num} days ago"
+msgid_plural "{num} days ago"
msgstr[0] ""
msgstr[1] ""
@@ -9519,13 +9533,13 @@ msgstr[1] ""
#: ../root/components/common-macros.tt:53
msgid "{num} month"
-msgid_plural "{num} months"
+msgid_plural "{num} months"
msgstr[0] ""
msgstr[1] ""
#: ../root/components/common-macros.tt:67
msgid "{num} month ago"
-msgid_plural "{num} months ago"
+msgid_plural "{num} months ago"
msgstr[0] ""
msgstr[1] ""
@@ -9561,29 +9575,29 @@ msgstr[1] ""
#: ../root/components/common-macros.tt:53
msgid "{num} year"
-msgid_plural "{num} years"
+msgid_plural "{num} years"
msgstr[0] ""
msgstr[1] ""
#: ../root/components/common-macros.tt:67
msgid "{num} year ago"
-msgid_plural "{num} years ago"
+msgid_plural "{num} years ago"
msgstr[0] ""
msgstr[1] ""
-#: ../root/release/edit_relationships.tt:334
+#: ../root/release/edit_relationships.tt:338
msgid "{n} recording selected"
msgid_plural "{n} recordings selected"
msgstr[0] ""
msgstr[1] ""
-#: ../root/release/edit_relationships.tt:335
+#: ../root/release/edit_relationships.tt:339
msgid "{n} work selected"
msgid_plural "{n} works selected"
msgstr[0] ""
msgstr[1] ""
-#: ../root/user/profile.tt:214 ../root/user/profile.tt:218
+#: ../root/user/profile.tt:212 ../root/user/profile.tt:216
msgid "{percentage}%"
msgstr ""
@@ -9618,7 +9632,7 @@ msgstr ""
msgid "{type} “{work}”"
msgstr ""
-#: ../root/components/common-macros.tt:540
+#: ../root/components/common-macros.tt:538
msgid "{uri|Relate to URL}"
msgstr ""
@@ -9648,20 +9662,20 @@ msgid ""
"that the artist has been entered correctly."
msgstr ""
-#: ../root/release/edit/tracklist.tt:136
+#: ../root/release/edit/tracklist.tt:134
msgid ""
"{valink|Various Artists} should very rarely be used on tracks, make sure "
"that the artists on these tracks have been entered correctly."
msgstr ""
-#: ../root/edit/edit_header.tt:50 ../root/edit/index.tt:28
+#: ../root/components/common-macros.tt:647
msgid "{yes} yes : {no} no"
msgstr ""
#: ../root/release/edit/duplicates.tt:46 ../root/release/edit/editnote.tt:41
#: ../root/release/edit/missing_entities.tt:165
#: ../root/release/edit/recordings.tt:434
-#: ../root/release/edit/tracklist.tt:496
+#: ../root/release/edit/tracklist.tt:484
msgid "« Previous"
msgstr ""
@@ -9748,11 +9762,11 @@ msgid ""
"org</a>."
msgstr ""
-#: ../lib/MusicBrainz/Server/Controller/Artist.pm:522
+#: ../lib/MusicBrainz/Server/Controller/Artist.pm:521
msgid "You cannot merge a special purpose artist into another artist"
msgstr ""
-#: ../lib/MusicBrainz/Server/Controller/Artist.pm:527
+#: ../lib/MusicBrainz/Server/Controller/Artist.pm:526
msgid "You cannot merge into Deleted Artist"
msgstr ""
@@ -9765,30 +9779,30 @@ msgstr ""
msgid "The required TOC parameter was invalid or not present"
msgstr ""
-#: ../lib/MusicBrainz/Server/Controller/CDTOC.pm:146
-#: ../lib/MusicBrainz/Server/Controller/CDTOC.pm:312
+#: ../lib/MusicBrainz/Server/Controller/CDTOC.pm:144
+#: ../lib/MusicBrainz/Server/Controller/CDTOC.pm:309
msgid "The provided CD TOC is not valid"
msgstr ""
-#: ../lib/MusicBrainz/Server/Controller/CDTOC.pm:159
-#: ../lib/MusicBrainz/Server/Controller/CDTOC.pm:326
+#: ../lib/MusicBrainz/Server/Controller/CDTOC.pm:157
+#: ../lib/MusicBrainz/Server/Controller/CDTOC.pm:323
msgid "The provided medium id is not valid"
msgstr ""
-#: ../lib/MusicBrainz/Server/Controller/CDTOC.pm:165
+#: ../lib/MusicBrainz/Server/Controller/CDTOC.pm:163
msgid "This CDTOC is already attached to this medium"
msgstr ""
-#: ../lib/MusicBrainz/Server/Controller/CDTOC.pm:174
-#: ../lib/MusicBrainz/Server/Controller/CDTOC.pm:334
+#: ../lib/MusicBrainz/Server/Controller/CDTOC.pm:172
+#: ../lib/MusicBrainz/Server/Controller/CDTOC.pm:331
msgid "The selected medium cannot have disc IDs"
msgstr ""
-#: ../lib/MusicBrainz/Server/Controller/CDTOC.pm:202
+#: ../lib/MusicBrainz/Server/Controller/CDTOC.pm:199
msgid "The provided artist id is not valid"
msgstr ""
-#: ../lib/MusicBrainz/Server/Controller/Edit.pm:182
+#: ../lib/MusicBrainz/Server/Controller/Edit.pm:187
msgid "Default"
msgstr ""
@@ -9843,7 +9857,7 @@ msgstr ""
msgid "This release is already in the selected release group"
msgstr ""
-#: ../lib/MusicBrainz/Server/Controller/Release.pm:629
+#: ../lib/MusicBrainz/Server/Controller/Release.pm:628
msgid ""
"This merge strategy is not applicable to the releases you have selected."
msgstr ""
@@ -10143,7 +10157,7 @@ msgstr ""
msgid "Remove relationship type"
msgstr ""
-#: ../lib/MusicBrainz/Server/Edit/Release/AddCoverArt.pm:19
+#: ../lib/MusicBrainz/Server/Edit/Release/AddCoverArt.pm:20
msgid "Add cover art"
msgstr ""
@@ -10167,7 +10181,7 @@ msgstr ""
msgid "Edit barcodes"
msgstr ""
-#: ../lib/MusicBrainz/Server/Edit/Release/EditCoverArt.pm:20
+#: ../lib/MusicBrainz/Server/Edit/Release/EditCoverArt.pm:21
msgid "Edit cover art"
msgstr ""
@@ -10175,7 +10189,7 @@ msgstr ""
msgid "Edit release label"
msgstr ""
-#: ../lib/MusicBrainz/Server/Edit/Release/RemoveCoverArt.pm:18
+#: ../lib/MusicBrainz/Server/Edit/Release/RemoveCoverArt.pm:19
msgid "Remove cover art"
msgstr ""
@@ -10725,11 +10739,11 @@ msgid ""
"purposes."
msgstr ""
-#: ../lib/MusicBrainz/Server/Wizard/ReleaseEditor.pm:51
+#: ../lib/MusicBrainz/Server/Wizard/ReleaseEditor.pm:52
msgid "Release Information"
msgstr ""
-#: ../lib/MusicBrainz/Server/Wizard/ReleaseEditor.pm:72
+#: ../lib/MusicBrainz/Server/Wizard/ReleaseEditor.pm:73
msgid "Add Missing Entities"
msgstr ""
-----------------------------------------------------------------------
hooks/post-receive
--
mb_server
_______________________________________________
MusicBrainz-commits mailing list
[email protected]
http://lists.musicbrainz.org/mailman/listinfo/musicbrainz-commits