[mb-commits] branch, beta, updated. Update .pot files

MusicBrainz Git Server <[email protected]>
Newsgroups gmane.comp.audio.musicbrainz.cvs
Message-ID <E1TTeSP-0000LR-Aj@wiley>
The branch, beta has been updated
       via  http://git.musicbrainz.org/gitweb/?p=musicbrainz-server/core.git;a=commit;h=8e63a3a25949fa11bc1d637f89859a66c4e6bd3c (commit)
       via  http://git.musicbrainz.org/gitweb/?p=musicbrainz-server/core.git;a=commit;h=49b724423a8b2c82e44f68defda1c3186dc17353 (commit)
      from  http://git.musicbrainz.org/gitweb/?p=musicbrainz-server/core.git;a=commit;h=252cdc27763dbf920cf6209b483a26e41fc6ac47 (commit)

Summary of changes:
 po/Makefile       |    2 +-
 po/mb_server.pot  |  538 ++++++++++++++++++++++++++++-------------------------
 po/statistics.pot |  210 +++++++++++----------
 3 files changed, 391 insertions(+), 359 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 8e63a3a25949fa11bc1d637f89859a66c4e6bd3c
Author: Ian McEwen <[email protected]>
Date:   Wed Oct 31 12:57:55 2012 -0700

    Update .pot files

diff --git a/po/mb_server.pot b/po/mb_server.pot
index 7e318c6..c4fef98 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: 2012-10-06 20:26-0700\n"
+"POT-Creation-Date: 2012-10-31 12:53-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/work/add_iswc.tt:8
+#: ../root/components/forms.tt:239
 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/work/add_iswc.tt:7
+#: ../root/components/forms.tt:238
 msgid "\"DDD\" is a nine digit work identifier."
 msgstr ""
 
@@ -161,7 +161,7 @@ msgstr ""
 msgid "(none)"
 msgstr ""
 
-#: ../root/elections/show.tt:121
+#: ../root/elections/show.tt:124
 msgid "(private)"
 msgstr ""
 
@@ -195,7 +195,7 @@ msgstr ""
 msgid "(was medium {position}: {name} on release {release})"
 msgstr ""
 
-#: ../root/recording/layout.tt:19 ../root/work/layout.tt:22
+#: ../root/recording/layout.tt:19
 msgid "({delete_uri|remove})"
 msgstr ""
 
@@ -271,7 +271,7 @@ msgid ""
 "granularity, you may want to {uri|search the database} instead."
 msgstr ""
 
-#: ../root/components/common-macros.tt:719
+#: ../root/components/common-macros.tt:726
 #: ../root/release/edit/tracklist.tt:144
 msgid "<strong>Error</strong>:"
 msgstr ""
@@ -293,7 +293,7 @@ msgid ""
 "updating a page!"
 msgstr ""
 
-#: ../root/components/common-macros.tt:732
+#: ../root/components/common-macros.tt:739
 msgid "<strong>Note</strong>:"
 msgstr ""
 
@@ -317,7 +317,7 @@ msgid ""
 "you wish to continue with the merge."
 msgstr ""
 
-#: ../root/components/common-macros.tt:726 ../root/recording/edit.tt:41
+#: ../root/components/common-macros.tt:733 ../root/recording/edit.tt:41
 #: ../root/release/edit/tracklist.tt:131
 msgid "<strong>Warning</strong>:"
 msgstr ""
@@ -371,7 +371,7 @@ msgid "About"
 msgstr ""
 
 #: ../root/edit/search_macros.tt:239 ../root/edit/vote.tt:20
-#: ../root/elections/show.tt:73 ../lib/MusicBrainz/Server/Data/Vote.pm:186
+#: ../root/elections/show.tt:76 ../lib/MusicBrainz/Server/Data/Vote.pm:186
 msgid "Abstain"
 msgstr ""
 
@@ -383,7 +383,7 @@ msgstr ""
 msgid "Accept edit"
 msgstr ""
 
-#: ../root/components/common-macros.tt:585
+#: ../root/components/common-macros.tt:592
 msgid "Accept upon expiration"
 msgstr ""
 
@@ -422,7 +422,7 @@ msgstr ""
 msgid "Add Artist Alias"
 msgstr ""
 
-#: ../root/components/forms.tt:285 ../root/components/forms.tt:289
+#: ../root/components/forms.tt:301 ../root/components/forms.tt:305
 #: ../root/release/edit/tracklist.tt:84 ../root/release/edit/tracklist.tt:89
 msgid "Add Artist Credit"
 msgstr ""
@@ -446,11 +446,6 @@ msgstr ""
 msgid "Add ISRC"
 msgstr ""
 
-#: ../root/work/add_iswc.tt:1 ../root/work/add_iswc.tt:2
-#: ../root/work/layout.tt:38
-msgid "Add ISWC"
-msgstr ""
-
 #: ../root/layout/menu.tt:206 ../root/release/edit/information.tt:102
 #: ../root/release/edit/information.tt:104
 msgid "Add Label"
@@ -556,7 +551,7 @@ msgstr ""
 msgid "Add an edit note"
 msgstr ""
 
-#: ../root/components/common-macros.tt:790
+#: ../root/components/common-macros.tt:797
 msgid "Add annotation"
 msgstr ""
 
@@ -606,6 +601,10 @@ msgstr ""
 msgid "Add new recording"
 msgstr ""
 
+#: ../root/edit/index.tt:84
+msgid "Add note"
+msgstr ""
+
 #: ../root/edit/index.tt:82
 msgid "Add note and vote"
 msgstr ""
@@ -614,18 +613,18 @@ msgstr ""
 msgid "Add recording"
 msgstr ""
 
-#: ../root/release/edit_relationships.tt:267
+#: ../root/release/edit_relationships.tt:268
 msgid "Add related work"
 msgstr ""
 
-#: ../root/release/edit_relationships.tt:251
+#: ../root/release/edit_relationships.tt:252
 #: ../root/scripts/text_strings.tt:92
 #: ../lib/MusicBrainz/Server/Edit/Historic/AddLink.pm:10
 #: ../lib/MusicBrainz/Server/Edit/Relationship/Create.pm:23
 msgid "Add relationship"
 msgstr ""
 
-#: ../root/artist/layout.tt:68 ../root/label/layout.tt:56
+#: ../root/artist/layout.tt:68 ../root/label/layout.tt:57
 #: ../root/release_group/layout.tt:28
 #: ../lib/MusicBrainz/Server/Edit/Historic/AddRelease.pm:17
 #: ../lib/MusicBrainz/Server/Edit/Release/Create.pm:29
@@ -680,7 +679,7 @@ msgstr ""
 msgid "Add work alias"
 msgstr ""
 
-#: ../root/components/forms.tt:114
+#: ../root/components/forms.tt:115
 msgid "Add {item}"
 msgstr ""
 
@@ -799,7 +798,7 @@ msgstr ""
 msgid "Allow other users to see this collection"
 msgstr ""
 
-#: ../root/components/common-macros.tt:630
+#: ../root/components/common-macros.tt:637
 msgid "Already expired"
 msgstr ""
 
@@ -853,8 +852,8 @@ msgstr ""
 msgid "An error occured: "
 msgstr ""
 
-#: ../root/release/edit_relationships.tt:162
-#: ../root/release/edit_relationships.tt:234
+#: ../root/release/edit_relationships.tt:163
+#: ../root/release/edit_relationships.tt:235
 msgid "An error occurred while creating the work."
 msgstr ""
 
@@ -1028,11 +1027,6 @@ msgid ""
 "{recording} by {artist}?"
 msgstr ""
 
-#: ../root/iswc/delete.tt:5
-msgid ""
-"Are you sure you wish to remove the ISWC <code>{iswc}</code> from {work}?"
-msgstr ""
-
 #: ../root/release/remove_cover_art.tt:4
 msgid ""
 "Are you sure you wish to remove the below cover art from {release} by "
@@ -1043,7 +1037,7 @@ msgstr ""
 msgid "Are you sure you wish to remove the label {label} from MusicBrainz?"
 msgstr ""
 
-#: ../root/recording/delete.tt:8
+#: ../root/recording/delete.tt:9
 msgid ""
 "Are you sure you wish to remove the recording {recording} from MusicBrainz?"
 msgstr ""
@@ -1068,8 +1062,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:504
-#: ../root/components/common-macros.tt:556
+#: ../root/collection/index.tt:11 ../root/components/common-macros.tt:511
+#: ../root/components/common-macros.tt:563
 #: ../root/components/results-generic.tt:6
 #: ../root/edit/details/add_medium.tt:49
 #: ../root/edit/details/edit_medium.tt:49
@@ -1134,7 +1128,7 @@ msgstr ""
 msgid "Artist Subscriptions"
 msgstr ""
 
-#: ../root/components/forms.tt:265
+#: ../root/components/forms.tt:281
 msgid "Artist as credited"
 msgstr ""
 
@@ -1154,7 +1148,7 @@ msgstr ""
 msgid "Artist credits:"
 msgstr ""
 
-#: ../root/components/forms.tt:249 ../root/release/edit/tracklist.tt:44
+#: ../root/components/forms.tt:265 ../root/release/edit/tracklist.tt:44
 msgid "Artist in MusicBrainz"
 msgstr ""
 
@@ -1176,7 +1170,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:492 ../root/components/forms.tt:145
+#: ../root/components/common-macros.tt:499 ../root/components/forms.tt:147
 #: ../root/edit/details/add_artist_alias.tt:3
 #: ../root/edit/details/add_artist_annotation.tt:3
 #: ../root/edit/details/add_artist.tt:3
@@ -1303,7 +1297,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:108
+#: ../root/release/edit_relationships.tt:109
 msgid "Attributes:"
 msgstr ""
 
@@ -1399,15 +1393,15 @@ msgid ""
 "release on an existing release, select it below."
 msgstr ""
 
-#: ../root/release/edit_relationships.tt:343
+#: ../root/release/edit_relationships.tt:342
 msgid "Batch-add a relationship to recordings"
 msgstr ""
 
-#: ../root/release/edit_relationships.tt:348
+#: ../root/release/edit_relationships.tt:354
 msgid "Batch-add a relationship to works"
 msgstr ""
 
-#: ../root/release/edit_relationships.tt:353
+#: ../root/release/edit_relationships.tt:348
 msgid "Batch-create new works"
 msgstr ""
 
@@ -1452,7 +1446,7 @@ msgstr ""
 msgid "Began:"
 msgstr ""
 
-#: ../root/search/lib/inline-results-artist.tt:10
+#: ../root/search/lib/inline-results-artist.tt:12
 #: ../root/search/results-label.tt:12
 msgid "Begin"
 msgstr ""
@@ -1462,7 +1456,7 @@ msgid "Begin Date"
 msgstr ""
 
 #: ../root/alias/edit_form.tt:25 ../root/artist/edit_form.tt:52
-#: ../root/components/common-macros.tt:803
+#: ../root/components/common-macros.tt:810
 #: ../root/edit/details/add_artist_alias.tt:36
 #: ../root/edit/details/add_label_alias.tt:36
 #: ../root/edit/details/add_label.tt:27
@@ -1476,7 +1470,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:130
+#: ../root/release/edit_relationships.tt:131
 msgid "Begin date:"
 msgstr ""
 
@@ -1508,7 +1502,7 @@ msgstr ""
 msgid "Blog"
 msgstr ""
 
-#: ../root/components/common-macros.tt:803 ../root/scripts/text_strings.tt:73
+#: ../root/components/common-macros.tt:810 ../root/scripts/text_strings.tt:73
 msgid "Born:"
 msgstr ""
 
@@ -1643,15 +1637,15 @@ msgstr ""
 msgid "Can be approved"
 msgstr ""
 
-#: ../root/artist/merge.tt:22 ../root/components/common-macros.tt:571
+#: ../root/artist/merge.tt:22 ../root/components/common-macros.tt:578
 #: ../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:148
 #: ../root/release/edit/recordings.tt:429
-#: ../root/release/edit_relationships.tt:170
-#: ../root/release/edit_relationships.tt:240
+#: ../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
@@ -1663,7 +1657,7 @@ msgstr ""
 msgid "Cancel Edit"
 msgstr ""
 
-#: ../root/components/common-macros.tt:514
+#: ../root/components/common-macros.tt:521
 msgid "Cancel creating relationship with {name}"
 msgstr ""
 
@@ -1672,7 +1666,7 @@ msgstr ""
 msgid "Cancel edit"
 msgstr ""
 
-#: ../root/elections/show.tt:97
+#: ../root/elections/show.tt:100
 msgid "Cancel the election"
 msgstr ""
 
@@ -1972,7 +1966,7 @@ msgstr ""
 msgid "Contact Us"
 msgstr ""
 
-#: ../root/components/forms.tt:223
+#: ../root/components/forms.tt:225
 msgid "Copy"
 msgstr ""
 
@@ -1991,7 +1985,8 @@ msgstr ""
 #: ../root/edit/details/historic/add_release.tt:76
 #: ../root/otherlookup/results-release.tt:10 ../root/recording/index.tt:15
 #: ../root/release_group/index.tt:16 ../root/release_group/releases-list.tt:23
-#: ../root/release/merge.tt:32 ../root/search/lib/inline-results-release.tt:12
+#: ../root/release/merge.tt:32 ../root/search/lib/inline-results-artist.tt:11
+#: ../root/search/lib/inline-results-release.tt:12
 #: ../root/tracklist/index.tt:32
 msgid "Country"
 msgstr ""
@@ -2048,7 +2043,7 @@ msgstr ""
 msgid "Create a new relationship attribute"
 msgstr ""
 
-#: ../root/release/edit_relationships.tt:92
+#: ../root/release/edit_relationships.tt:93
 msgid "Create a new work"
 msgstr ""
 
@@ -2064,15 +2059,15 @@ msgstr ""
 msgid "Create collection"
 msgstr ""
 
-#: ../root/components/common-macros.tt:572
+#: ../root/components/common-macros.tt:579
 msgid "Create relationship"
 msgstr ""
 
-#: ../root/components/common-macros.tt:514
+#: ../root/components/common-macros.tt:521
 msgid "Create relationship with {other}"
 msgstr ""
 
-#: ../root/release/edit_relationships.tt:242
+#: ../root/release/edit_relationships.tt:243
 msgid "Create work"
 msgstr ""
 
@@ -2080,6 +2075,12 @@ msgstr ""
 msgid "Created"
 msgstr ""
 
+#: ../root/release/edit_relationships.tt:135
+#: ../root/release/edit_relationships.tt:144
+#: ../lib/MusicBrainz/Server/Plugin/FormRenderer.pm:249
+msgid "DD"
+msgstr ""
+
 #: ../root/layout/menu.tt:113
 msgid "Data Licenses"
 msgstr ""
@@ -2106,7 +2107,7 @@ msgstr ""
 #: ../root/collection/index.tt:14
 #: ../root/edit/details/edit_release_events.tt:5
 #: ../root/edit/details/historic/add_release.tt:75
-#: ../root/elections/show.tt:110 ../root/release_group/index.tt:15
+#: ../root/elections/show.tt:113 ../root/release_group/index.tt:15
 #: ../root/release_group/releases-list.tt:22 ../root/release/lookup.tt:11
 #: ../root/release/merge.tt:31 ../root/tracklist/index.tt:31
 msgid "Date"
@@ -2181,8 +2182,7 @@ msgstr ""
 #: ../root/edit/details/remove_relationship_type.tt:15
 #: ../root/relationship/linkattributetype/form.tt:15
 #: ../root/relationship/linktype/form.tt:18
-#: ../root/relationship/linktype/tree.tt:14 ../root/url/edit.tt:19
-#: ../root/url/index.tt:10
+#: ../root/relationship/linktype/tree.tt:14
 msgid "Description:"
 msgstr ""
 
@@ -2215,7 +2215,7 @@ msgstr ""
 msgid "Development"
 msgstr ""
 
-#: ../root/components/common-macros.tt:807
+#: ../root/components/common-macros.tt:814
 msgid "Died:"
 msgstr ""
 
@@ -2241,7 +2241,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:193
+#: ../root/release/edit_relationships.tt:194
 #: ../root/release_group/edit_form.tt:9 ../root/work/edit_form.tt:8
 msgid "Disambiguation:"
 msgstr ""
@@ -2342,7 +2342,7 @@ msgstr ""
 msgid "Discs entered as separate releases"
 msgstr ""
 
-#: ../root/components/common-macros.tt:807 ../root/scripts/text_strings.tt:74
+#: ../root/components/common-macros.tt:814 ../root/scripts/text_strings.tt:74
 msgid "Dissolved:"
 msgstr ""
 
@@ -2372,7 +2372,7 @@ msgstr ""
 msgid "Donation Check"
 msgstr ""
 
-#: ../root/release/edit_relationships.tt:173
+#: ../root/release/edit_relationships.tt:174
 #: ../root/release/edit/tracklist.tt:160 ../root/scripts/text_strings.tt:29
 msgid "Done"
 msgstr ""
@@ -2499,7 +2499,7 @@ msgstr ""
 msgid "Edit Relationship Types"
 msgstr ""
 
-#: ../root/release/edit_relationships.tt:317
+#: ../root/release/edit_relationships.tt:315
 msgid "Edit Relationships: {release}"
 msgstr ""
 
@@ -2530,7 +2530,7 @@ msgstr ""
 msgid "Edit User"
 msgstr ""
 
-#: ../root/work/edit.tt:15
+#: ../root/work/edit.tt:16
 msgid "Edit Work"
 msgstr ""
 
@@ -2542,7 +2542,7 @@ msgstr ""
 msgid "Edit Work Annotation"
 msgstr ""
 
-#: ../root/components/common-macros.tt:790
+#: ../root/components/common-macros.tt:797
 msgid "Edit annotation"
 msgstr ""
 
@@ -2569,7 +2569,7 @@ msgid "Edit label annotation"
 msgstr ""
 
 #: ../root/edit/cancel.tt:19 ../root/forms/edit-note.tt:13
-#: ../root/release/edit_relationships.tt:226
+#: ../root/release/edit_relationships.tt:227
 msgid "Edit note:"
 msgstr ""
 
@@ -2629,10 +2629,10 @@ msgid "Edited"
 msgstr ""
 
 #: ../root/account/preferences.tt:49 ../root/artist/layout.tt:57
-#: ../root/label/layout.tt:51 ../root/layout/menu.tt:200
+#: ../root/label/layout.tt:52 ../root/layout/menu.tt:200
 #: ../root/recording/layout.tt:31 ../root/release_group/layout.tt:23
 #: ../root/release/sidebar.tt:77 ../root/url/layout.tt:4
-#: ../root/work/layout.tt:35
+#: ../root/work/layout.tt:31
 msgid "Editing"
 msgstr ""
 
@@ -2640,10 +2640,10 @@ msgstr ""
 msgid "Editing FAQ"
 msgstr ""
 
-#: ../root/artist/layout.tt:109 ../root/label/layout.tt:82
+#: ../root/artist/layout.tt:109 ../root/label/layout.tt:83
 #: ../root/recording/layout.tt:55 ../root/release_group/layout.tt:56
 #: ../root/release/sidebar.tt:102 ../root/url/layout.tt:16
-#: ../root/work/layout.tt:59
+#: ../root/work/layout.tt:55
 msgid "Editing history"
 msgstr ""
 
@@ -2772,7 +2772,7 @@ msgstr ""
 msgid "Enable {autoed|auto-editor} privileges for this edit."
 msgstr ""
 
-#: ../root/cdtoc/info.tt:34 ../root/search/lib/inline-results-artist.tt:11
+#: ../root/cdtoc/info.tt:34 ../root/search/lib/inline-results-artist.tt:13
 #: ../root/search/results-label.tt:13
 msgid "End"
 msgstr ""
@@ -2786,7 +2786,7 @@ msgid "End date"
 msgstr ""
 
 #: ../root/alias/edit_form.tt:26 ../root/artist/edit_form.tt:53
-#: ../root/components/common-macros.tt:807
+#: ../root/components/common-macros.tt:814
 #: ../root/edit/details/add_artist_alias.tt:42
 #: ../root/edit/details/add_label_alias.tt:42
 #: ../root/edit/details/add_label.tt:34
@@ -2800,7 +2800,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:139
+#: ../root/release/edit_relationships.tt:140
 msgid "End date:"
 msgstr ""
 
@@ -2870,7 +2870,7 @@ msgid_plural "Errors:"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../root/components/common-macros.tt:149
+#: ../root/components/common-macros.tt:157
 msgid "Error: Unknown Type"
 msgstr ""
 
@@ -2902,7 +2902,7 @@ msgstr ""
 msgid "Expired"
 msgstr ""
 
-#: ../root/components/common-macros.tt:611
+#: ../root/components/common-macros.tt:618
 msgid ""
 "Expires in <span class=\"tooltip\" title=\"{exactdate}\">{num} day</span>"
 msgid_plural ""
@@ -2910,7 +2910,7 @@ msgid_plural ""
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../root/components/common-macros.tt:617
+#: ../root/components/common-macros.tt:624
 msgid ""
 "Expires in <span class=\"tooltip\" title=\"{exactdate}\">{num} hour</span>"
 msgid_plural ""
@@ -2918,7 +2918,7 @@ msgid_plural ""
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../root/components/common-macros.tt:623
+#: ../root/components/common-macros.tt:630
 msgid ""
 "Expires in <span class=\"tooltip\" title=\"{exactdate}\">{num} minute</span>"
 msgid_plural ""
@@ -3051,7 +3051,7 @@ msgid_plural "Found {n} results for \"{q}\""
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../root/components/common-macros.tt:803 ../root/label/layout.tt:14
+#: ../root/components/common-macros.tt:810 ../root/label/layout.tt:14
 #: ../root/scripts/text_strings.tt:74
 msgid "Founded:"
 msgstr ""
@@ -3089,6 +3089,10 @@ msgstr ""
 msgid "Full TOC:"
 msgstr ""
 
+#: ../root/search/lib/inline-results-artist.tt:10
+msgid "Gender"
+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
@@ -3147,8 +3151,8 @@ msgstr ""
 msgid "Guess Sort Name"
 msgstr ""
 
-#: ../root/components/forms.tt:165 ../root/components/forms.tt:167
-#: ../root/components/forms.tt:188 ../root/release/edit/tracklist.tt:468
+#: ../root/components/forms.tt:167 ../root/components/forms.tt:169
+#: ../root/components/forms.tt:190 ../root/release/edit/tracklist.tt:468
 #: ../root/release/edit/tracklist.tt:486
 msgid "Guess case"
 msgstr ""
@@ -3173,7 +3177,7 @@ msgstr ""
 msgid "Hide Credits"
 msgstr ""
 
-#: ../root/components/common-macros.tt:578
+#: ../root/components/common-macros.tt:585
 #: ../lib/MusicBrainz/Server/Controller/Edit.pm:182
 msgid "High"
 msgstr ""
@@ -3264,7 +3268,7 @@ msgid "ISRCs with multiple recordings"
 msgstr ""
 
 #: ../root/artist/works-list.tt:12 ../root/search/results-work.tt:11
-#: ../root/work/merge.tt:14
+#: ../root/work/edit_form.tt:11 ../root/work/merge.tt:14
 msgid "ISWC"
 msgstr ""
 
@@ -3282,10 +3286,14 @@ msgstr ""
 
 #: ../root/edit/details/add_work.tt:23 ../root/edit/details/edit_work.tt:19
 #: ../root/edit/details/remove_iswc.tt:3 ../root/otherlookup/form.tt:3
-#: ../root/work/add_iswc.tt:12 ../root/work/layout.tt:19
+#: ../root/work/layout.tt:19
 msgid "ISWC:"
 msgstr ""
 
+#: ../root/work/edit_form.tt:11
+msgid "ISWCs:"
+msgstr ""
+
 #: ../root/release/edit/missing_entities.tt:80
 msgid ""
 "If none of these artists match the artist you intended, you can still create "
@@ -3314,7 +3322,7 @@ msgid ""
 "the same name."
 msgstr ""
 
-#: ../root/main/500.tt:55
+#: ../root/main/500.tt:60
 msgid ""
 "If the problem persists, please {report|report a bug} and include any error "
 "message that is shown above."
@@ -3511,6 +3519,10 @@ msgstr ""
 msgid "Instrument Tree"
 msgstr ""
 
+#: ../root/main/500.tt:47
+msgid "Interface language:"
+msgstr ""
+
 #: ../root/main/500.tt:1 ../root/main/500.tt:3
 msgid "Internal Server Error"
 msgstr ""
@@ -3547,7 +3559,7 @@ msgstr ""
 msgid "Javascript needs to be enabled."
 msgstr ""
 
-#: ../root/components/forms.tt:272 ../root/release/edit/tracklist.tt:46
+#: ../root/components/forms.tt:288 ../root/release/edit/tracklist.tt:46
 #: ../root/scripts/text_strings.tt:26
 msgid "Join phrase"
 msgstr ""
@@ -3560,15 +3572,15 @@ msgstr ""
 msgid "Keep me logged in"
 msgstr ""
 
-#: ../root/components/forms.tt:173 ../root/components/forms.tt:197
+#: ../root/components/forms.tt:175 ../root/components/forms.tt:199
 #: ../root/release/edit/tracklist.tt:479
 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:504
-#: ../root/components/common-macros.tt:557
+#: ../root/collection/index.tt:16 ../root/components/common-macros.tt:511
+#: ../root/components/common-macros.tt:564
 #: ../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
@@ -3614,7 +3626,7 @@ msgstr ""
 msgid "Label ratings"
 msgstr ""
 
-#: ../root/components/common-macros.tt:492
+#: ../root/components/common-macros.tt:499
 #: ../root/edit/details/add_label_alias.tt:3
 #: ../root/edit/details/add_label_annotation.tt:3
 #: ../root/edit/details/add_label.tt:3
@@ -3779,14 +3791,14 @@ msgstr ""
 msgid "Log Out"
 msgstr ""
 
-#: ../root/components/common-macros.tt:435
+#: ../root/components/common-macros.tt:442
 msgid "Log in"
 msgstr ""
 
-#: ../root/artist/layout.tt:112 ../root/label/layout.tt:84
+#: ../root/artist/layout.tt:112 ../root/label/layout.tt:85
 #: ../root/recording/layout.tt:57 ../root/release_group/layout.tt:58
 #: ../root/release/sidebar.tt:105 ../root/url/layout.tt:18
-#: ../root/work/layout.tt:61
+#: ../root/work/layout.tt:57
 msgid "Log in to edit"
 msgstr ""
 
@@ -3825,13 +3837,13 @@ msgstr ""
 msgid "Lost Username"
 msgstr ""
 
-#: ../root/components/common-macros.tt:578
+#: ../root/components/common-macros.tt:585
 #: ../lib/MusicBrainz/Server/Controller/Edit.pm:182
 msgid "Low"
 msgstr ""
 
-#: ../root/release/edit_relationships.tt:101
-#: ../root/release/edit_relationships.tt:211 ../root/work/edit_form.tt:10
+#: ../root/release/edit_relationships.tt:102
+#: ../root/release/edit_relationships.tt:212 ../root/work/edit_form.tt:10
 #: ../root/work/layout.tt:11
 msgid "Lyrics Language:"
 msgstr ""
@@ -3840,6 +3852,12 @@ msgstr ""
 msgid "MBID:"
 msgstr ""
 
+#: ../root/release/edit_relationships.tt:134
+#: ../root/release/edit_relationships.tt:143
+#: ../lib/MusicBrainz/Server/Plugin/FormRenderer.pm:248
+msgid "MM"
+msgstr ""
+
 #: ../root/layout/menu.tt:154 ../root/main/index.tt:10
 msgid "Magic MP3 Tagger"
 msgstr ""
@@ -3870,7 +3888,7 @@ msgstr ""
 msgid "Matching CDs"
 msgstr ""
 
-#: ../root/cdtoc/lookup.tt:38 ../root/components/common-macros.tt:765
+#: ../root/cdtoc/lookup.tt:38 ../root/components/common-macros.tt:772
 #: ../root/scripts/text_strings.tt:90
 #: ../root/search/lib/inline-results-recording.tt:16
 #: ../lib/MusicBrainz/Server/Edit/Medium.pm:7
@@ -3957,7 +3975,7 @@ msgstr ""
 msgid "Merge attributes:"
 msgstr ""
 
-#: ../root/label/layout.tt:65
+#: ../root/label/layout.tt:66
 msgid "Merge label"
 msgstr ""
 
@@ -3995,7 +4013,7 @@ msgstr ""
 msgid "Merge strategy:"
 msgstr ""
 
-#: ../root/work/layout.tt:42
+#: ../root/work/layout.tt:38
 msgid "Merge work"
 msgstr ""
 
@@ -4449,7 +4467,7 @@ msgstr ""
 
 #: ../root/cdtoc/attach_filter_artist.tt:41
 #: ../root/cdtoc/attach_filter_release.tt:79
-#: ../root/search/lib/inline-results-artist.tt:37
+#: ../root/search/lib/inline-results-artist.tt:43
 #: ../root/search/lib/inline-results-recording.tt:73
 #: ../root/search/lib/inline-results-release.tt:45
 #: ../root/search/results-editor.tt:22 ../root/search/results-label.tt:40
@@ -4491,7 +4509,7 @@ msgstr ""
 msgid "None"
 msgstr ""
 
-#: ../root/components/common-macros.tt:578
+#: ../root/components/common-macros.tt:585
 #: ../lib/MusicBrainz/Server/Controller/Edit.pm:182
 msgid "Normal"
 msgstr ""
@@ -4591,7 +4609,7 @@ msgid ""
 msgstr ""
 
 #: ../root/release/edit_relationships.tt:44
-#: ../root/release/edit_relationships.tt:180
+#: ../root/release/edit_relationships.tt:181
 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."
@@ -4621,14 +4639,14 @@ msgid "Open Edits"
 msgstr ""
 
 #: ../root/artist/layout.tt:107 ../root/edit/list_header.tt:15
-#: ../root/label/layout.tt:80 ../root/recording/layout.tt:53
+#: ../root/label/layout.tt:81 ../root/recording/layout.tt:53
 #: ../root/release_group/layout.tt:54 ../root/release/sidebar.tt:100
-#: ../root/url/layout.tt:14 ../root/work/layout.tt:57
+#: ../root/url/layout.tt:14 ../root/work/layout.tt:53
 msgid "Open edits"
 msgstr ""
 
-#: ../root/components/common-macros.tt:442
-#: ../root/components/common-macros.tt:447
+#: ../root/components/common-macros.tt:449
+#: ../root/components/common-macros.tt:454
 msgid "Open in tagger"
 msgstr ""
 
@@ -4769,7 +4787,7 @@ msgid ""
 "other editors know a bit more about you."
 msgstr ""
 
-#: ../root/main/500.tt:60
+#: ../root/main/500.tt:65
 msgid "Please be sure to include the stack trace and request data shown above!"
 msgstr ""
 
@@ -4834,6 +4852,13 @@ msgstr ""
 msgid "Please make a selection"
 msgstr ""
 
+#: ../root/recording/delete.tt:5
+msgid ""
+"Please make sure you're not removing a legitimate {doc_standalone|standalone "
+"recording}. If this recording duplicates another, please {doc_merge|merge "
+"rather than delete}."
+msgstr ""
+
 #: ../root/layout/merge-helper.tt:24
 msgid ""
 "Please navigate to the pages of other entities you wish to merge and select "
@@ -4911,12 +4936,6 @@ msgid ""
 "entering this edit."
 msgstr ""
 
-#: ../root/recording/delete.tt:5
-msgid ""
-"Please review the {doc_remove|remove recording edit-type} documentation "
-"before entering this edit."
-msgstr ""
-
 #: ../root/release/delete.tt:4
 msgid ""
 "Please review the {doc_remove|remove release edit-type} documentation before "
@@ -4957,11 +4976,11 @@ msgstr ""
 msgid "Please slow down and then try again"
 msgstr ""
 
-#: ../root/components/forms.tt:185
+#: ../root/components/forms.tt:187
 msgid "Please use the Guess Case button to fix common style errors."
 msgstr ""
 
-#: ../root/components/forms.tt:219
+#: ../root/components/forms.tt:221
 msgid "Please use the Sort Name button to guess the sort name."
 msgstr ""
 
@@ -5022,7 +5041,7 @@ msgstr ""
 msgid "Preferences"
 msgstr ""
 
-#: ../root/annotation/edit.tt:27 ../root/components/forms.tt:238
+#: ../root/annotation/edit.tt:27 ../root/components/forms.tt:254
 #: ../root/release/edit/tracklist.tt:37
 msgid "Preview"
 msgstr ""
@@ -5146,9 +5165,9 @@ msgid ""
 "works."
 msgstr ""
 
-#: ../root/components/common-macros.tt:504
-#: ../root/components/common-macros.tt:558 ../root/edit/search_macros.tt:284
-#: ../root/release/edit_relationships.tt:368
+#: ../root/components/common-macros.tt:511
+#: ../root/components/common-macros.tt:565 ../root/edit/search_macros.tt:284
+#: ../root/release/edit_relationships.tt:365
 #: ../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
@@ -5180,7 +5199,7 @@ msgstr ""
 msgid "Recording “{name}” by {artist}"
 msgstr ""
 
-#: ../root/components/common-macros.tt:492
+#: ../root/components/common-macros.tt:499
 #: ../root/edit/details/add_recording_annotation.tt:3
 #: ../root/edit/details/add_standalone_recording.tt:3
 #: ../root/edit/details/edit_recording.tt:8
@@ -5238,7 +5257,7 @@ msgstr ""
 msgid "Reject edit"
 msgstr ""
 
-#: ../root/components/common-macros.tt:585
+#: ../root/components/common-macros.tt:592
 msgid "Reject upon expiration"
 msgstr ""
 
@@ -5246,7 +5265,7 @@ msgstr ""
 msgid "Relate recording to work"
 msgstr ""
 
-#: ../root/components/common-macros.tt:535
+#: ../root/components/common-macros.tt:542
 msgid "Relate to ..."
 msgstr ""
 
@@ -5254,7 +5273,7 @@ msgstr ""
 msgid "Relate to <abbr title=\"Uniform Resource Locator\">URL</abbr>"
 msgstr ""
 
-#: ../root/release/edit_relationships.tt:370
+#: ../root/release/edit_relationships.tt:369
 msgid "Related Works"
 msgstr ""
 
@@ -5328,13 +5347,13 @@ msgstr ""
 #: ../root/release_group/relationships.tt:1
 #: ../root/release_group/relationships.tt:2 ../root/release/index.tt:66
 #: ../root/release/relationships.tt:1 ../root/release/relationships.tt:2
-#: ../root/release/tabs.tt:1 ../root/url/index.tt:15
+#: ../root/release/tabs.tt:1 ../root/url/index.tt:9
 #: ../root/url/relationships.tt:2 ../root/work/index.tt:10
 #: ../root/work/relationships.tt:1 ../root/work/relationships.tt:3
 msgid "Relationships"
 msgstr ""
 
-#: ../root/release/edit_relationships.tt:322
+#: ../root/release/edit_relationships.tt:320
 msgid ""
 "Relationships highlighted <span class=\"rel-edit\">yellow</span> will be "
 "edited, relationships highlighted <span class=\"rel-remove\">red</span> will "
@@ -5349,8 +5368,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:504
-#: ../root/components/common-macros.tt:560
+#: ../root/collection/index.tt:10 ../root/components/common-macros.tt:511
+#: ../root/components/common-macros.tt:567
 #: ../root/edit/details/edit_release_events.tt:4
 #: ../root/edit/search_macros.tt:284 ../root/release_group/index.tt:12
 #: ../root/release_group/releases-list.tt:16 ../root/release/lookup.tt:9
@@ -5377,8 +5396,8 @@ msgstr ""
 msgid "Release Events:"
 msgstr ""
 
-#: ../root/components/common-macros.tt:504
-#: ../root/components/common-macros.tt:559 ../root/edit/search_macros.tt:284
+#: ../root/components/common-macros.tt:511
+#: ../root/components/common-macros.tt:566 ../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
@@ -5472,7 +5491,7 @@ msgstr ""
 msgid "Release group “{name}” by {artist}"
 msgstr ""
 
-#: ../root/components/common-macros.tt:492
+#: ../root/components/common-macros.tt:499
 #: ../root/edit/details/add_release_group_annotation.tt:3
 #: ../root/edit/details/add_release.tt:20
 #: ../root/edit/details/change_release_group.tt:7
@@ -5514,7 +5533,7 @@ msgstr ""
 msgid "Release “{name}” by {artist}"
 msgstr ""
 
-#: ../root/cdtoc/lookup.tt:71 ../root/components/common-macros.tt:492
+#: ../root/cdtoc/lookup.tt:71 ../root/components/common-macros.tt:499
 #: ../root/edit/details/add_cover_art.tt:5
 #: ../root/edit/details/add_medium.tt:4
 #: ../root/edit/details/add_release_annotation.tt:4
@@ -5711,7 +5730,7 @@ msgstr ""
 msgid "Remove Artist Alias"
 msgstr ""
 
-#: ../root/components/forms.tt:259 ../root/release/edit/tracklist.tt:73
+#: ../root/components/forms.tt:275 ../root/release/edit/tracklist.tt:73
 msgid "Remove Artist Credit"
 msgstr ""
 
@@ -5727,10 +5746,6 @@ msgstr ""
 msgid "Remove ISRC “{isrc}”"
 msgstr ""
 
-#: ../root/iswc/delete.tt:1 ../root/iswc/delete.tt:3
-msgid "Remove ISWC “{iswc}”"
-msgstr ""
-
 #: ../root/label/delete.tt:2 ../root/release/edit/information.tt:93
 msgid "Remove Label"
 msgstr ""
@@ -5798,7 +5813,7 @@ msgstr ""
 msgid "Remove from {collection}"
 msgstr ""
 
-#: ../root/label/layout.tt:68
+#: ../root/label/layout.tt:69
 #: ../lib/MusicBrainz/Server/Edit/Label/Delete.pm:12
 msgid "Remove label"
 msgstr ""
@@ -5957,7 +5972,7 @@ 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:782 ../root/components/search.tt:11
+#: ../root/components/common-macros.tt:789 ../root/components/search.tt:11
 #: ../root/edit/search_macros.tt:101 ../root/layout/menu.tt:180
 #: ../root/layout.tt:67 ../root/otherlookup/form.tt:18
 #: ../root/release/edit/tracklist.tt:223 ../root/scripts/text_strings.tt:30
@@ -6033,7 +6048,7 @@ msgstr ""
 msgid "Search the database for this CD"
 msgstr ""
 
-#: ../root/components/common-macros.tt:781
+#: ../root/components/common-macros.tt:788
 msgid "Search the documentation..."
 msgstr ""
 
@@ -6045,7 +6060,7 @@ msgstr ""
 msgid "Searching..."
 msgstr ""
 
-#: ../root/elections/show.tt:61
+#: ../root/elections/show.tt:64
 msgid "Second this candidate"
 msgstr ""
 
@@ -6435,7 +6450,7 @@ msgstr ""
 msgid "Sorry, “{id}” is not a valid documentation page."
 msgstr ""
 
-#: ../root/components/forms.tt:222
+#: ../root/components/forms.tt:224
 #: ../root/search/lib/inline-results-artist.tt:8
 #: ../root/search/results-label.tt:9
 msgid "Sort Name"
@@ -6564,7 +6579,7 @@ msgstr ""
 msgid "Submit votes &amp; edit notes"
 msgstr ""
 
-#: ../root/artist/layout.tt:123 ../root/label/layout.tt:94
+#: ../root/artist/layout.tt:123 ../root/label/layout.tt:95
 msgid "Subscribe"
 msgstr ""
 
@@ -6589,7 +6604,7 @@ msgid "Subscribed entities"
 msgstr ""
 
 #: ../root/artist/layout.tt:125 ../root/artist/subscribers.tt:1
-#: ../root/artist/subscribers.tt:2 ../root/label/layout.tt:96
+#: ../root/artist/subscribers.tt:2 ../root/label/layout.tt:97
 #: ../root/label/subscribers.tt:1 ../root/label/subscribers.tt:2
 #: ../root/user/profile/layout.tt:12 ../root/user/subscribers.tt:1
 #: ../root/user/subscribers.tt:2
@@ -6600,7 +6615,7 @@ msgstr ""
 msgid "Subscribers:"
 msgstr ""
 
-#: ../root/artist/layout.tt:117 ../root/label/layout.tt:88
+#: ../root/artist/layout.tt:117 ../root/label/layout.tt:89
 #: ../root/layout/menu.tt:43 ../root/user/profile/layout.tt:12
 msgid "Subscriptions"
 msgstr ""
@@ -6672,7 +6687,7 @@ msgstr ""
 msgid "Tag this collection"
 msgstr ""
 
-#: ../root/label/layout.tt:46 ../root/label/tags.tt:3
+#: ../root/label/layout.tt:47 ../root/label/tags.tt:3
 msgid "Tag this label"
 msgstr ""
 
@@ -6688,7 +6703,7 @@ msgstr ""
 msgid "Tag this release group"
 msgstr ""
 
-#: ../root/work/layout.tt:30 ../root/work/tags.tt:3
+#: ../root/work/layout.tt:26 ../root/work/tags.tt:3
 msgid "Tag this work"
 msgstr ""
 
@@ -6698,8 +6713,8 @@ 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:443
-#: ../root/components/common-macros.tt:448
+#: ../root/components/common-macros.tt:450
+#: ../root/components/common-macros.tt:455
 #: ../root/otherlookup/results-release.tt:13 ../root/release_group/index.tt:21
 #: ../root/release_group/releases-list.tt:30
 #: ../root/search/lib/inline-results-recording.tt:13
@@ -7140,39 +7155,39 @@ msgstr ""
 msgid "This collection has no tags."
 msgstr ""
 
-#: ../root/components/common-macros.tt:591
+#: ../root/components/common-macros.tt:598
 msgid ""
 "This edit failed because it affected high quality data and did not receive "
 "any votes."
 msgstr ""
 
-#: ../root/components/common-macros.tt:591
+#: ../root/components/common-macros.tt:598
 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:591
+#: ../root/components/common-macros.tt:598
 msgid "This edit failed because there were insufficient \"yes\" votes."
 msgstr ""
 
-#: ../root/components/common-macros.tt:591
+#: ../root/components/common-macros.tt:598
 msgid ""
 "This edit failed due to an internal error and may need to be entered again."
 msgstr ""
 
-#: ../root/components/common-macros.tt:591
+#: ../root/components/common-macros.tt:598
 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:591
+#: ../root/components/common-macros.tt:598
 msgid "This edit has been successfully applied."
 msgstr ""
 
-#: ../root/components/common-macros.tt:591
+#: ../root/components/common-macros.tt:598
 msgid "This edit is open and awaiting votes before it can be applied."
 msgstr ""
 
@@ -7186,20 +7201,20 @@ msgid ""
 "set the release artist to Various Artists."
 msgstr ""
 
-#: ../root/components/common-macros.tt:591
+#: ../root/components/common-macros.tt:598
 msgid "This edit was cancelled."
 msgstr ""
 
-#: ../root/components/common-macros.tt:591
+#: ../root/components/common-macros.tt:598
 msgid "This edit was recently cancelled."
 msgstr ""
 
-#: ../root/components/common-macros.tt:224
+#: ../root/components/common-macros.tt:232
 #: ../lib/MusicBrainz/Server/Plugin/Diff.pm:118
 msgid "This entity has been removed, and cannot be displayed correctly."
 msgstr ""
 
-#: ../root/components/common-macros.tt:224
+#: ../root/components/common-macros.tt:232
 msgid "This entity will be created when edits are entered."
 msgstr ""
 
@@ -7320,7 +7335,7 @@ msgstr ""
 msgid "This person is deceased."
 msgstr ""
 
-#: ../root/recording/delete.tt:17
+#: ../root/recording/delete.tt:18
 msgid ""
 "This recording cannot be removed because it is still on use in tracklists."
 msgstr ""
@@ -7339,7 +7354,7 @@ msgstr ""
 
 #: ../root/edit/relationship/create.tt:108
 #: ../root/edit/relationship/edit.tt:139
-#: ../root/release/edit_relationships.tt:151
+#: ../root/release/edit_relationships.tt:152
 msgid "This relationship has ended."
 msgstr ""
 
@@ -7661,11 +7676,11 @@ msgid ""
 "continue?"
 msgstr ""
 
-#: ../root/components/common-macros.tt:409
+#: ../root/components/common-macros.tt:417
 msgid "This user is automated."
 msgstr ""
 
-#: ../root/components/common-macros.tt:408
+#: ../root/components/common-macros.tt:416
 msgid "This user is new to MusicBrainz."
 msgstr ""
 
@@ -7734,7 +7749,7 @@ msgstr ""
 msgid "Title:"
 msgstr ""
 
-#: ../root/release/edit_relationships.tt:327
+#: ../root/release/edit_relationships.tt:325
 msgid ""
 "To <span class=\"rel-edit\">edit</span> a relationship, click on its name (e."
 "g. \"composer\")."
@@ -7764,13 +7779,13 @@ msgstr ""
 msgid "To edit types, please edit the release group."
 msgstr ""
 
-#: ../root/elections/show.tt:88
+#: ../root/elections/show.tt:91
 msgid "To find out if you can vote for this candidate, please {url|log in}."
 msgstr ""
 
-#: ../root/release/edit_relationships.tt:359
+#: ../root/release/edit_relationships.tt:327
 msgid ""
-"To use these tools, select some recordings or works using the checkboxes."
+"To use the batch tools, select some recordings or works using the checkboxes."
 msgstr ""
 
 #: ../root/watch/list.tt:36
@@ -7784,10 +7799,6 @@ msgstr ""
 msgid "To:"
 msgstr ""
 
-#: ../root/release/edit_relationships.tt:331
-msgid "Tools:"
-msgstr ""
-
 #: ../root/cdstub/browse.tt:2 ../root/cdstub/browse.tt:3
 #: ../root/layout/menu.tt:194
 msgid "Top CD Stubs"
@@ -7980,7 +7991,7 @@ msgstr ""
 
 #: ../root/artist/browse_various.tt:15 ../root/artist/works-list.tt:13
 #: ../root/components/aliases.tt:10 ../root/edit/search_macros.tt:284
-#: ../root/iswc/index.tt:19 ../root/release/edit_relationships.tt:61
+#: ../root/iswc/index.tt:19 ../root/release/edit_relationships.tt:62
 #: ../root/release_group/merge.tt:14 ../root/release/lookup.tt:13
 #: ../root/report/artist_list.tt:6 ../root/report/duplicate_artists.tt:27
 #: ../root/search/lib/inline-results-artist.tt:9
@@ -8018,7 +8029,7 @@ msgstr ""
 #: ../root/label/layout.tt:9 ../root/release/cover_art_fields.tt:3
 #: ../root/release/cover_art.tt:13 ../root/release/edit/information.tt:43
 #: ../root/release/edit/information.tt:47
-#: ../root/release/edit_relationships.tt:200
+#: ../root/release/edit_relationships.tt:201
 #: ../root/release_group/layout.tt:12 ../root/release/sidebar.tt:38
 #: ../root/search/form.tt:5 ../root/work/edit_form.tt:9
 #: ../root/work/layout.tt:15
@@ -8033,7 +8044,7 @@ msgstr ""
 msgid "Types:"
 msgstr ""
 
-#: ../root/components/common-macros.tt:504 ../root/report/artist_url_list.tt:5
+#: ../root/components/common-macros.tt:511 ../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
@@ -8057,9 +8068,9 @@ msgstr ""
 msgid "URL Relationships"
 msgstr ""
 
-#: ../root/components/common-macros.tt:492 ../root/edit/details/edit_url.tt:9
+#: ../root/components/common-macros.tt:499 ../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:47
+#: ../root/edit/relationship/create_url.tt:52 ../root/main/500.tt:52
 #: ../root/url/edit.tt:18 ../root/url/index.tt:5
 msgid "URL:"
 msgstr ""
@@ -8089,7 +8100,7 @@ msgstr ""
 msgid "Unlinked Pseudo-Releases"
 msgstr ""
 
-#: ../root/artist/layout.tt:121 ../root/label/layout.tt:92
+#: ../root/artist/layout.tt:121 ../root/label/layout.tt:93
 #: ../root/user/subscriptions/subscriptions.tt:57
 msgid "Unsubscribe"
 msgstr ""
@@ -8130,7 +8141,7 @@ msgstr ""
 msgid "Update collection"
 msgstr ""
 
-#: ../root/components/forms.tt:176 ../root/components/forms.tt:200
+#: ../root/components/forms.tt:178 ../root/components/forms.tt:202
 #: ../root/release/edit/tracklist.tt:482
 msgid "Uppercase roman numerals"
 msgstr ""
@@ -8143,7 +8154,7 @@ msgstr ""
 msgid "Usage Count"
 msgstr ""
 
-#: ../root/components/common-macros.tt:514
+#: ../root/components/common-macros.tt:521
 msgid "Use in a relationship"
 msgstr ""
 
@@ -8157,7 +8168,7 @@ msgstr ""
 msgid "Use suggested recording"
 msgstr ""
 
-#: ../root/components/forms.tt:235
+#: ../root/components/forms.tt:251
 msgid ""
 "Use the following fields to enter collaborations, see the <a href="
 "\"{url}\">Artist Credit</a> documentation for more information."
@@ -8232,7 +8243,7 @@ msgstr ""
 msgid "View all relationships"
 msgstr ""
 
-#: ../root/annotation/common.tt:21 ../root/components/common-macros.tt:796
+#: ../root/annotation/common.tt:21 ../root/components/common-macros.tt:803
 msgid "View annotation history"
 msgstr ""
 
@@ -8256,15 +8267,15 @@ msgstr ""
 msgid "View transclusion history"
 msgstr ""
 
-#: ../root/elections/show.tt:109
+#: ../root/elections/show.tt:112
 msgid "Vote"
 msgstr ""
 
-#: ../root/elections/show.tt:72
+#: ../root/elections/show.tt:75
 msgid "Vote NO"
 msgstr ""
 
-#: ../root/elections/show.tt:71
+#: ../root/elections/show.tt:74
 msgid "Vote YES"
 msgstr ""
 
@@ -8280,7 +8291,7 @@ msgstr ""
 msgid "Voted down"
 msgstr ""
 
-#: ../root/elections/show.tt:108
+#: ../root/elections/show.tt:111
 msgid "Voter"
 msgstr ""
 
@@ -8296,7 +8307,7 @@ msgstr ""
 msgid "Votes against:"
 msgstr ""
 
-#: ../root/elections/show.tt:103
+#: ../root/elections/show.tt:106
 msgid "Votes cast"
 msgstr ""
 
@@ -8308,7 +8319,7 @@ msgstr ""
 msgid "Votes for:"
 msgstr ""
 
-#: ../root/elections/show.tt:55
+#: ../root/elections/show.tt:58
 msgid "Voting"
 msgstr ""
 
@@ -8316,11 +8327,11 @@ msgstr ""
 msgid "Voting FAQ"
 msgstr ""
 
-#: ../root/elections/show.tt:85
+#: ../root/elections/show.tt:88
 msgid "Voting is closed."
 msgstr ""
 
-#: ../root/elections/show.tt:83
+#: ../root/elections/show.tt:86
 msgid ""
 "Voting is not yet open. If you would like to support this candidate, you can "
 "second their nomination. If you do not support this candidate, please note "
@@ -8346,7 +8357,7 @@ msgstr ""
 #: ../root/release/edit_relationships.tt:18
 msgid ""
 "Warning: This relationship has pending edits. <a target=\"_blank\" data-bind="
-"\"attr: {href: relationship().openEdits}\">Click here</a> to view these "
+"\"attr: {href: relationship().openEdits()}\">Click here</a> to view these "
 "edits and make sure they do not conflict with your own."
 msgstr ""
 
@@ -8442,12 +8453,18 @@ msgid ""
 "page."
 msgstr ""
 
-#: ../root/main/500.tt:52
+#: ../root/main/500.tt:57
 msgid ""
 "We're terribly sorry for this problem. Please wait a few minutes and repeat "
 "your request &mdash; the problem may go away."
 msgstr ""
 
+#: ../root/scripts/text_strings.tt:120
+msgid ""
+"We're very sorry, an error occurred during submission. The server may be "
+"under heavy load; please wait a moment and try again."
+msgstr ""
+
 #: ../root/account/lost_username_sent.tt:5
 msgid ""
 "We've sent you information about your MusicBrainz account. If you don't "
@@ -8509,8 +8526,8 @@ msgstr ""
 msgid "WikiDoc:"
 msgstr ""
 
-#: ../root/artist/works-list.tt:9 ../root/components/common-macros.tt:504
-#: ../root/components/common-macros.tt:561 ../root/edit/search_macros.tt:284
+#: ../root/artist/works-list.tt:9 ../root/components/common-macros.tt:511
+#: ../root/components/common-macros.tt:568 ../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
@@ -8522,7 +8539,7 @@ msgstr ""
 msgid "Work Details"
 msgstr ""
 
-#: ../root/release/edit_relationships.tt:186
+#: ../root/release/edit_relationships.tt:187
 msgid "Work Name:"
 msgstr ""
 
@@ -8530,7 +8547,7 @@ msgstr ""
 msgid "Work Not Found"
 msgstr ""
 
-#: ../root/release/edit_relationships.tt:97
+#: ../root/release/edit_relationships.tt:98
 msgid "Work Type:"
 msgstr ""
 
@@ -8546,7 +8563,7 @@ msgstr ""
 msgid "Work type:"
 msgstr ""
 
-#: ../root/components/common-macros.tt:492
+#: ../root/components/common-macros.tt:499
 #: ../root/edit/details/add_work_alias.tt:3
 #: ../root/edit/details/add_work_annotation.tt:3
 #: ../root/edit/details/add_work.tt:3
@@ -8582,6 +8599,12 @@ msgstr ""
 msgid "XML:"
 msgstr ""
 
+#: ../root/release/edit_relationships.tt:133
+#: ../root/release/edit_relationships.tt:142
+#: ../lib/MusicBrainz/Server/Plugin/FormRenderer.pm:247
+msgid "YYYY"
+msgstr ""
+
 #: ../root/artist/browse_various.tt:13 ../root/artist/index.tt:60
 #: ../root/release_group/merge.tt:15 ../root/search/results-freedb.tt:18
 msgid "Year"
@@ -8636,7 +8659,7 @@ msgid ""
 "entered in standard <code>CCXXXYYNNNNNN</code> format:"
 msgstr ""
 
-#: ../root/work/add_iswc.tt:3
+#: ../root/components/forms.tt:234
 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:"
@@ -8775,11 +8798,11 @@ msgid ""
 "use by other relationships."
 msgstr ""
 
-#: ../root/elections/show.tt:79
+#: ../root/elections/show.tt:82
 msgid "You cannot vote for this candidate, because you are not an auto-editor."
 msgstr ""
 
-#: ../root/elections/show.tt:81
+#: ../root/elections/show.tt:84
 msgid ""
 "You cannot vote for this candidate, because you proposed / seconded them."
 msgstr ""
@@ -8908,12 +8931,12 @@ msgstr ""
 msgid "[ Unknown ]"
 msgstr ""
 
-#: ../root/components/common-macros.tt:224
+#: ../root/components/common-macros.tt:232
 msgid "[removed]"
 msgstr ""
 
 #: ../root/artist/layout.tt:36 ../root/label/layout.tt:30
-#: ../root/search/lib/inline-results-artist.tt:25
+#: ../root/search/lib/inline-results-artist.tt:31
 #: ../root/search/results-label.tt:28
 msgid "[unknown]"
 msgstr ""
@@ -8944,7 +8967,7 @@ msgstr ""
 msgid "appears on:"
 msgstr ""
 
-#: ../root/components/common-macros.tt:149
+#: ../root/components/common-macros.tt:157
 msgid "artists"
 msgstr ""
 
@@ -8964,7 +8987,7 @@ msgstr ""
 msgid "between"
 msgstr ""
 
-#: ../root/components/common-macros.tt:409
+#: ../root/components/common-macros.tt:417
 msgid "bot"
 msgstr ""
 
@@ -8994,7 +9017,7 @@ msgstr ""
 msgid "do not match"
 msgstr ""
 
-#: ../root/components/common-macros.tt:149
+#: ../root/components/common-macros.tt:157
 msgid "editors"
 msgstr ""
 
@@ -9002,24 +9025,24 @@ msgstr ""
 msgid "edits"
 msgstr ""
 
-#: ../root/components/common-macros.tt:661
+#: ../root/components/common-macros.tt:668
 msgid "ended"
 msgstr ""
 
-#: ../root/components/common-macros.tt:648 ../root/edit/details/macros.tt:28
+#: ../root/components/common-macros.tt:655 ../root/edit/details/macros.tt:28
 msgid "from {begin_date} until {end_date}"
 msgstr ""
 
-#: ../root/components/common-macros.tt:654 ../root/edit/details/macros.tt:28
+#: ../root/components/common-macros.tt:661 ../root/edit/details/macros.tt:28
 msgid "from {date} to ????"
 msgstr ""
 
-#: ../root/components/common-macros.tt:656 ../root/edit/details/macros.tt:28
+#: ../root/components/common-macros.tt:663 ../root/edit/details/macros.tt:28
 msgid "from {date} to present"
 msgstr ""
 
-#: ../root/release/edit_relationships.tt:67
-#: ../root/release/edit_relationships.tt:109
+#: ../root/release/edit_relationships.tt:68
+#: ../root/release/edit_relationships.tt:110
 msgid "help"
 msgstr ""
 
@@ -9027,11 +9050,11 @@ msgstr ""
 msgid "import"
 msgstr ""
 
-#: ../root/components/common-macros.tt:645 ../root/edit/details/macros.tt:28
+#: ../root/components/common-macros.tt:652 ../root/edit/details/macros.tt:28
 msgid "in {date}"
 msgstr ""
 
-#: ../root/components/common-macros.tt:323
+#: ../root/components/common-macros.tt:331
 #: ../root/components/rdfa-macros.tt:718 ../root/components/rdfa-macros.tt:731
 msgid "info"
 msgstr ""
@@ -9076,11 +9099,11 @@ msgstr ""
 msgid "is not"
 msgstr ""
 
-#: ../root/components/common-macros.tt:149
+#: ../root/components/common-macros.tt:157
 msgid "labels"
 msgstr ""
 
-#: ../root/components/common-macros.tt:408
+#: ../root/components/common-macros.tt:416
 msgid "limited user"
 msgstr ""
 
@@ -9125,7 +9148,7 @@ msgstr ""
 msgid "on"
 msgstr ""
 
-#: ../root/components/common-macros.tt:643 ../root/edit/details/macros.tt:28
+#: ../root/components/common-macros.tt:650 ../root/edit/details/macros.tt:28
 msgid "on {date}"
 msgstr ""
 
@@ -9150,6 +9173,10 @@ msgid_plural "plus {n} other private collections"
 msgstr[0] ""
 msgstr[1] ""
 
+#: ../root/artist/edit_form.tt:66
+msgid "preview:"
+msgstr ""
+
 #: ../root/edit/search_macros.tt:19
 msgid "randomly"
 msgstr ""
@@ -9159,15 +9186,15 @@ msgstr ""
 msgid "recording"
 msgstr ""
 
-#: ../root/components/common-macros.tt:149
+#: ../root/components/common-macros.tt:157
 msgid "recordings"
 msgstr ""
 
-#: ../root/components/common-macros.tt:149
+#: ../root/components/common-macros.tt:157
 msgid "release groups"
 msgstr ""
 
-#: ../root/components/common-macros.tt:149
+#: ../root/components/common-macros.tt:157
 msgid "releases"
 msgstr ""
 
@@ -9220,7 +9247,7 @@ msgstr ""
 msgid "track"
 msgstr ""
 
-#: ../root/components/common-macros.tt:149
+#: ../root/components/common-macros.tt:157
 msgid "tracks"
 msgstr ""
 
@@ -9228,11 +9255,11 @@ msgstr ""
 msgid "unsubscribe"
 msgstr ""
 
-#: ../root/components/common-macros.tt:659 ../root/edit/details/macros.tt:28
+#: ../root/components/common-macros.tt:666 ../root/edit/details/macros.tt:28
 msgid "until {date}"
 msgstr ""
 
-#: ../root/components/common-macros.tt:149
+#: ../root/components/common-macros.tt:157
 msgid "works"
 msgstr ""
 
@@ -9241,7 +9268,7 @@ msgid ""
 "{about|More Information} &mdash; {faq|FAQs} &mdash; {contact|Contact Us}"
 msgstr ""
 
-#: ../root/components/common-macros.tt:122
+#: ../root/components/common-macros.tt:130
 msgid "{almost_last_list_item} and {last_list_item}"
 msgstr ""
 
@@ -9255,7 +9282,7 @@ msgstr ""
 msgid "{artist} - {name}"
 msgstr ""
 
-#: ../root/components/common-macros.tt:193
+#: ../root/components/common-macros.tt:201
 msgid "{artist} as {name}"
 msgstr ""
 
@@ -9281,7 +9308,7 @@ msgstr ""
 msgid "{collection} by {owner}"
 msgstr ""
 
-#: ../root/components/common-macros.tt:133
+#: ../root/components/common-macros.tt:141
 msgid "{commas_only_list_item}, {rest}"
 msgstr ""
 
@@ -9327,7 +9354,7 @@ msgid ""
 "before you can approve it."
 msgstr ""
 
-#: ../root/components/common-macros.tt:233
+#: ../root/components/common-macros.tt:241
 #: ../root/components/relationships.tt:18
 msgid "{entity} by {artist}"
 msgstr ""
@@ -9340,7 +9367,7 @@ msgstr ""
 msgid "{format} {position} {name} on {release} by {artist}"
 msgstr ""
 
-#: ../root/components/common-macros.tt:131
+#: ../root/components/common-macros.tt:139
 msgid "{last_list_item}"
 msgstr ""
 
@@ -9352,7 +9379,7 @@ msgstr ""
 msgid "{link} has no relationships."
 msgstr ""
 
-#: ../root/components/common-macros.tt:124
+#: ../root/components/common-macros.tt:132
 msgid "{list_item}, {rest}"
 msgstr ""
 
@@ -9472,13 +9499,13 @@ msgid_plural "{num}&nbsp;years ago"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../root/release/edit_relationships.tt:336
+#: ../root/release/edit_relationships.tt:334
 msgid "{n} recording selected"
 msgid_plural "{n} recordings selected"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../root/release/edit_relationships.tt:337
+#: ../root/release/edit_relationships.tt:335
 msgid "{n} work selected"
 msgid_plural "{n} works selected"
 msgstr[0] ""
@@ -9519,7 +9546,7 @@ msgstr ""
 msgid "{type} “{work}”"
 msgstr ""
 
-#: ../root/components/common-macros.tt:526
+#: ../root/components/common-macros.tt:533
 msgid "{uri|Relate to URL}"
 msgstr ""
 
@@ -9719,10 +9746,6 @@ msgstr ""
 msgid "This ISRC does not exist"
 msgstr ""
 
-#: ../lib/MusicBrainz/Server/Controller/ISWC.pm:57
-msgid "This ISWC does not exist"
-msgstr ""
-
 #: ../lib/MusicBrainz/Server/Controller/Recording.pm:243
 msgid "This ISRC already exists for this recording"
 msgstr ""
@@ -9732,11 +9755,11 @@ msgstr ""
 msgid "'{types}' is not a valid pair of types for relationships."
 msgstr ""
 
-#: ../lib/MusicBrainz/Server/Controller/RelationshipEditor.pm:42
+#: ../lib/MusicBrainz/Server/Controller/RelationshipEditor.pm:44
 msgid "There were errors in your submission. Please fix them and try again."
 msgstr ""
 
-#: ../lib/MusicBrainz/Server/Controller/RelationshipEditor.pm:49
+#: ../lib/MusicBrainz/Server/Controller/RelationshipEditor.pm:51
 msgid "Invalid submission."
 msgstr ""
 
@@ -9771,10 +9794,6 @@ msgstr ""
 msgid "Invalid TOC"
 msgstr ""
 
-#: ../lib/MusicBrainz/Server/Controller/Work.pm:125
-msgid "This ISWC already exists for this work"
-msgstr ""
-
 #: ../lib/MusicBrainz/Server/Data/CDStub.pm:104
 msgid "No title provided"
 msgstr ""
@@ -10109,7 +10128,7 @@ msgstr ""
 msgid "Edit release group"
 msgstr ""
 
-#: ../lib/MusicBrainz/Server/Edit/URL/Edit.pm:83
+#: ../lib/MusicBrainz/Server/Edit/URL/Edit.pm:80
 msgid "This URL has already been merged into another URL"
 msgstr ""
 
@@ -10134,7 +10153,6 @@ msgid "No votes"
 msgstr ""
 
 #: ../lib/MusicBrainz/Server/Edit/Utils.pm:254
-#: ../lib/MusicBrainz/Server/Entity/AutoEditorElection.pm:103
 msgid "Cancelled"
 msgstr ""
 
@@ -10179,47 +10197,69 @@ msgid "This operator is not supported"
 msgstr ""
 
 #: ../lib/MusicBrainz/Server/Entity/AutoEditorElection.pm:89
-#: ../lib/MusicBrainz/Server/Entity/AutoEditorElection.pm:98
+msgctxt "autoeditor election status"
 msgid "Awaiting 1st seconder"
 msgstr ""
 
 #: ../lib/MusicBrainz/Server/Entity/AutoEditorElection.pm:90
-#: ../lib/MusicBrainz/Server/Entity/AutoEditorElection.pm:99
+msgctxt "autoeditor election status"
 msgid "Awaiting 2nd seconder"
 msgstr ""
 
 #: ../lib/MusicBrainz/Server/Entity/AutoEditorElection.pm:91
 #, perl-brace-format
+msgctxt "autoeditor election status"
 msgid "Voting open since {date}"
 msgstr ""
 
 #: ../lib/MusicBrainz/Server/Entity/AutoEditorElection.pm:92
 #, perl-brace-format
+msgctxt "autoeditor election status"
 msgid "Accepted at {date}"
 msgstr ""
 
 #: ../lib/MusicBrainz/Server/Entity/AutoEditorElection.pm:93
 #, perl-brace-format
+msgctxt "autoeditor election status"
 msgid "Declined at {date}"
 msgstr ""
 
 #: ../lib/MusicBrainz/Server/Entity/AutoEditorElection.pm:94
 #, perl-brace-format
+msgctxt "autoeditor election status"
 msgid "Cancelled at {date}"
 msgstr ""
 
+#: ../lib/MusicBrainz/Server/Entity/AutoEditorElection.pm:98
+msgctxt "autoeditor election status (short)"
+msgid "Awaiting 1st seconder"
+msgstr ""
+
+#: ../lib/MusicBrainz/Server/Entity/AutoEditorElection.pm:99
+msgctxt "autoeditor election status (short)"
+msgid "Awaiting 2nd seconder"
+msgstr ""
+
 #: ../lib/MusicBrainz/Server/Entity/AutoEditorElection.pm:100
+msgctxt "autoeditor election status (short)"
 msgid "Voting open"
 msgstr ""
 
 #: ../lib/MusicBrainz/Server/Entity/AutoEditorElection.pm:101
+msgctxt "autoeditor election status (short)"
 msgid "Accepted"
 msgstr ""
 
 #: ../lib/MusicBrainz/Server/Entity/AutoEditorElection.pm:102
+msgctxt "autoeditor election status (short)"
 msgid "Declined"
 msgstr ""
 
+#: ../lib/MusicBrainz/Server/Entity/AutoEditorElection.pm:103
+msgctxt "autoeditor election status (short)"
+msgid "Cancelled"
+msgstr ""
+
 #: ../lib/MusicBrainz/Server/Entity/Barcode.pm:25
 msgid "[none]"
 msgstr ""
@@ -10245,7 +10285,7 @@ msgstr ""
 msgid "This alias can only be a primary alias if a locale is selected"
 msgstr ""
 
-#: ../lib/MusicBrainz/Server/Form/CDStub.pm:60
+#: ../lib/MusicBrainz/Server/Form/CDStub.pm:59
 msgid "Must be a valid barcode"
 msgstr ""
 
@@ -10535,18 +10575,6 @@ msgctxt "script optgroup"
 msgid "Other"
 msgstr ""
 
-#: ../lib/MusicBrainz/Server/Plugin/FormRenderer.pm:247
-msgid "YYYY"
-msgstr ""
-
-#: ../lib/MusicBrainz/Server/Plugin/FormRenderer.pm:248
-msgid "MM"
-msgstr ""
-
-#: ../lib/MusicBrainz/Server/Plugin/FormRenderer.pm:249
-msgid "DD"
-msgstr ""
-
 #: ../lib/MusicBrainz/Server/Release.pm:57
 msgid "(Special case)"
 msgstr ""
diff --git a/po/statistics.pot b/po/statistics.pot
index d7f8884..3a98bb9 100644
--- a/po/statistics.pot
+++ b/po/statistics.pot
@@ -8,425 +8,429 @@ msgstr ""
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: DB:statistic_event/description:2006-08-15
+#: DB:statistics.statistic_event/description:2006-08-15
 msgid "A rift in the MusicBrainz community leads to a Great Dispute."
 msgstr ""
 
-#: DB:statistic_event/description:2003-01-21
+#: DB:statistics.statistic_event/description:2003-01-21
 msgid ""
 "Added support for improved TRM collision handling in the classic tagger."
 msgstr ""
 
-#: DB:statistic_event/title:2005-04-10
+#: DB:statistics.statistic_event/title:2005-04-10
 msgid "Advanced relationships"
 msgstr ""
 
-#: DB:statistic_event/description:2005-04-10
+#: DB:statistics.statistic_event/description:2005-04-10
 msgid ""
 "Advanced relationships that allow users to connect basic data entities is "
 "relased and unused TRMs pruned from the database. Inline editing is turned "
 "off by default, causing a drop in voting activity."
 msgstr ""
 
-#: DB:statistic_event/title:2005-05-22
+#: DB:statistics.statistic_event/title:2005-05-22
 msgid "Album languages"
 msgstr ""
 
-#: DB:statistic_event/description:2005-05-22
+#: DB:statistics.statistic_event/description:2005-05-22
 msgid ""
 "Album languages, guess case improvements and revamps edit forms released."
 msgstr ""
 
-#: DB:statistic_event/title:2004-02-24
+#: DB:statistics.statistic_event/title:2004-02-24
 msgid "Amazon Coverart"
 msgstr ""
 
-#: DB:statistic_event/description:2008-09-01
+#: DB:statistics.statistic_event/description:2008-09-01
 msgid ""
 "Amazon betas <a href=\"http://soundunwound.com\">SoundUnwound</a> with data "
 "from MusicBrainz."
 msgstr ""
 
-#: DB:statistic_event/title:2008-09-01
+#: DB:statistics.statistic_event/title:2008-09-01
 msgid "Amazon betas SoundUnwound"
 msgstr ""
 
-#: DB:statistic_event/description:2004-02-24
+#: DB:statistics.statistic_event/description:2004-02-24
 msgid "Amazon coverart support released."
 msgstr ""
 
-#: DB:statistic_event/description:2006-07-12
+#: DB:statistics.statistic_event/description:2006-07-12
 msgid "An improved release editor and a new site design are released."
 msgstr ""
 
-#: DB:statistic_event/description:2004-11-14
+#: DB:statistics.statistic_event/description:2004-11-14
 msgid "Annotation support released."
 msgstr ""
 
-#: DB:statistic_event/title:2004-11-14
+#: DB:statistics.statistic_event/title:2004-11-14
 msgid "Annotations"
 msgstr ""
 
-#: DB:statistic_event/title:2003-06-22
+#: DB:statistics.statistic_event/title:2003-06-22
 msgid "Artist subscriptions"
 msgstr ""
 
-#: DB:statistic_event/description:2005-02-13
+#: DB:statistics.statistic_event/description:2005-02-13
 msgid ""
 "Artist subscriptions made public and various smaller user centric "
 "improvements are released."
 msgstr ""
 
-#: DB:statistic_event/description:2003-06-22
+#: DB:statistics.statistic_event/description:2003-06-22
 msgid "Artist subscriptions."
 msgstr ""
 
-#: DB:statistic_event/title:2008-07-30
+#: DB:statistics.statistic_event/title:2008-07-30
 msgid "BBC dynamic artist pages"
 msgstr ""
 
-#: DB:statistic_event/description:2008-07-30
+#: DB:statistics.statistic_event/description:2008-07-30
 msgid "BBC launches the dynamic artist pages based on MusicBrainz data."
 msgstr ""
 
-#: DB:statistic_event/title:2007-06-28
+#: DB:statistics.statistic_event/title:2007-06-28
 msgid "BBC partners with MetaBrainz"
 msgstr ""
 
-#: DB:statistic_event/description:2003-03-02
-#: DB:statistic_event/description:2003-06-30
-#: DB:statistic_event/description:2003-07-25
-#: DB:statistic_event/description:2003-09-04
+#: DB:statistics.statistic_event/description:2003-03-02
+#: DB:statistics.statistic_event/description:2003-06-30
+#: DB:statistics.statistic_event/description:2003-07-25
+#: DB:statistics.statistic_event/description:2003-09-04
 msgid "Bug fix/cleanup release."
 msgstr ""
 
-#: DB:statistic_event/title:2003-06-30 DB:statistic_event/title:2003-07-25
-#: DB:statistic_event/title:2003-09-04
+#: DB:statistics.statistic_event/title:2003-06-30
+#: DB:statistics.statistic_event/title:2003-07-25
+#: DB:statistics.statistic_event/title:2003-09-04
 msgid "Bug fixes"
 msgstr ""
 
-#: DB:statistic_event/description:2004-03-09
+#: DB:statistics.statistic_event/description:2004-03-09
 msgid "Caching (memcached) and bugs fixed."
 msgstr ""
 
-#: DB:statistic_event/title:2004-03-09
+#: DB:statistics.statistic_event/title:2004-03-09
 msgid "Caching/bug fixes"
 msgstr ""
 
-#: DB:statistic_event/title:2003-03-02 DB:statistic_event/title:2003-06-07
-#: DB:statistic_event/title:2003-06-15
+#: DB:statistics.statistic_event/title:2003-03-02
+#: DB:statistics.statistic_event/title:2003-06-07
+#: DB:statistics.statistic_event/title:2003-06-15
 msgid "Cleanup"
 msgstr ""
 
-#: DB:statistic_event/description:2003-06-07
-#: DB:statistic_event/description:2003-06-15
+#: DB:statistics.statistic_event/description:2003-06-07
+#: DB:statistics.statistic_event/description:2003-06-15
 msgid "Cleanup release."
 msgstr ""
 
-#: DB:statistic_event/title:2008-11-24
+#: DB:statistics.statistic_event/title:2008-11-24
 msgid "Collection, Ratings, CDStubs"
 msgstr ""
 
-#: DB:statistic_event/description:2008-11-24
+#: DB:statistics.statistic_event/description:2008-11-24
 msgid "Collection, Ratings, CDStubs, LastUpdate released."
 msgstr ""
 
-#: DB:statistic_event/title:2003-03-29
+#: DB:statistics.statistic_event/title:2003-03-29
 msgid "Dedicated database server"
 msgstr ""
 
-#: DB:statistic_event/description:2004-05-09
+#: DB:statistics.statistic_event/description:2004-05-09
 msgid ""
 "Edit display improvements, turned off RDF dumps, new install scripts "
 "released."
 msgstr ""
 
-#: DB:statistic_event/title:2003-11-10
+#: DB:statistics.statistic_event/title:2003-11-10
 msgid "Edit search"
 msgstr ""
 
-#: DB:statistic_event/description:2007-12-07
+#: DB:statistics.statistic_event/description:2007-12-07
 msgid ""
 "Editor ojnkpjg runs a script setting track times from DiscID values, "
 "creating a huge spike in edits."
 msgstr ""
 
-#: DB:statistic_event/description:2007-10-17
+#: DB:statistics.statistic_event/description:2007-10-17
 msgid "Folksonomy tagging, editor subscriptions are released."
 msgstr ""
 
-#: DB:statistic_event/description:2004-10-10
+#: DB:statistics.statistic_event/description:2004-10-10
 msgid ""
 "FreeDB auto import feature turned off and autoeditor elections released. "
 "Unused TRMs pruned from the database."
 msgstr ""
 
-#: DB:statistic_event/title:2004-10-10
+#: DB:statistics.statistic_event/title:2004-10-10
 msgid "FreeDB off/Autoeditors"
 msgstr ""
 
-#: DB:statistic_event/title:2006-08-15
+#: DB:statistics.statistic_event/title:2006-08-15
 msgid "Great Dispute"
 msgstr ""
 
-#: DB:statistic_event/title:2009-06-17
+#: DB:statistics.statistic_event/title:2009-06-17
 msgid "Imported CD Baby catalog as CD Stubs"
 msgstr ""
 
-#: DB:statistic_event/description:2009-06-17
+#: DB:statistics.statistic_event/description:2009-06-17
 msgid ""
 "Imported the metadata from the CD Baby catalog into our CD Stubs collection."
 msgstr ""
 
-#: DB:statistic_event/title:2004-07-24
+#: DB:statistics.statistic_event/title:2004-07-24
 msgid "Improve voting"
 msgstr ""
 
-#: DB:statistic_event/title:2003-04-05
+#: DB:statistics.statistic_event/title:2003-04-05
 msgid "Improved search"
 msgstr ""
 
-#: DB:statistic_event/description:2003-04-05
+#: DB:statistics.statistic_event/description:2003-04-05
 msgid "Improved search/cleanup."
 msgstr ""
 
-#: DB:statistic_event/description:2011-05-12
+#: DB:statistics.statistic_event/description:2011-05-12
 msgid "In preparation for NGS, editing is turned off until release."
 msgstr ""
 
-#: DB:statistic_event/description:2011-05-02
+#: DB:statistics.statistic_event/description:2011-05-02
 msgid ""
 "In preparation for NGS, editors are encouraged to avoid editing until "
 "release unless entirely necessary."
 msgstr ""
 
-#: DB:statistic_event/title:2006-03-05
+#: DB:statistics.statistic_event/title:2006-03-05
 msgid "Indexed search/XML WS"
 msgstr ""
 
-#: DB:statistic_event/description:2006-03-05
+#: DB:statistics.statistic_event/description:2006-03-05
 msgid "Indexes search and a new XML based Web Service are released."
 msgstr ""
 
-#: DB:statistic_event/title:2004-01-17
+#: DB:statistics.statistic_event/title:2004-01-17
 msgid "Inline edits"
 msgstr ""
 
-#: DB:statistic_event/description:2004-01-17
+#: DB:statistics.statistic_event/description:2004-01-17
 msgid "Inline edits, new reports, improved data import scripts."
 msgstr ""
 
-#: DB:statistic_event/title:2004-05-09
+#: DB:statistics.statistic_event/title:2004-05-09
 msgid "Install scripts"
 msgstr ""
 
-#: DB:statistic_event/description:2009-12-14
+#: DB:statistics.statistic_event/description:2009-12-14
 msgid "Kuno Woudt begins working for MusicBrainz full-time."
 msgstr ""
 
-#: DB:statistic_event/title:2009-12-14
+#: DB:statistics.statistic_event/title:2009-12-14
 msgid "Kuno Woudt hired as full-time developer"
 msgstr ""
 
-#: DB:statistic_event/title:2007-04-01
+#: DB:statistics.statistic_event/title:2007-04-01
 msgid "Labels/data quality"
 msgstr ""
 
-#: DB:statistic_event/title:2007-11-07
+#: DB:statistics.statistic_event/title:2007-11-07
 msgid "Last.fm"
 msgstr ""
 
-#: DB:statistic_event/description:2007-11-07
+#: DB:statistics.statistic_event/description:2007-11-07
 msgid "Last.fm signs up with MetaBrainz and starts using MusicBrainz data."
 msgstr ""
 
-#: DB:statistic_event/description:2003-11-10
-#: DB:statistic_event/description:2003-12-28
+#: DB:statistics.statistic_event/description:2003-11-10
+#: DB:statistics.statistic_event/description:2003-12-28
 msgid ""
 "Link to MusicBrainz feature, release events and edit suggestions released."
 msgstr ""
 
-#: DB:statistic_event/description:2007-01-20
+#: DB:statistics.statistic_event/description:2007-01-20
 msgid "Linkara Musica becomes first commercial customer of MetaBrainz."
 msgstr ""
 
-#: DB:statistic_event/title:2003-12-28
+#: DB:statistics.statistic_event/title:2003-12-28
 msgid "Linking"
 msgstr ""
 
-#: DB:statistic_event/title:2005-10-23
+#: DB:statistics.statistic_event/title:2005-10-23
 msgid "Menus/Client scripting"
 msgstr ""
 
-#: DB:statistic_event/description:2008-04-21
+#: DB:statistics.statistic_event/description:2008-04-21
 msgid "MetaBrainz accepts three students for Google Summer of Code."
 msgstr ""
 
-#: DB:statistic_event/title:2008-09-23
+#: DB:statistics.statistic_event/title:2008-09-23
 msgid "MetaBrainz hires Oliver Charles"
 msgstr ""
 
-#: DB:statistic_event/title:2005-04-19
+#: DB:statistics.statistic_event/title:2005-04-19
 msgid "MetaBrainz launched"
 msgstr ""
 
-#: DB:statistic_event/title:2007-01-20
+#: DB:statistics.statistic_event/title:2007-01-20
 msgid "MetaBrainz signs first customer"
 msgstr ""
 
-#: DB:statistic_event/description:2008-04-01
+#: DB:statistics.statistic_event/description:2008-04-01
 msgid "MetaWeb comes MusicBrainz data user."
 msgstr ""
 
-#: DB:statistic_event/title:2008-04-01
+#: DB:statistics.statistic_event/title:2008-04-01
 msgid "MetaWeb signed"
 msgstr ""
 
-#: DB:statistic_event/title:2006-02-27
+#: DB:statistics.statistic_event/title:2006-02-27
 msgid "MusicBrainz Move"
 msgstr ""
 
-#: DB:statistic_event/description:2010-02-08
+#: DB:statistics.statistic_event/description:2010-02-08
 msgid "MusicBrainz Server source code moved to Git from Subversion."
 msgstr ""
 
-#: DB:statistic_event/description:2003-03-29
+#: DB:statistics.statistic_event/description:2003-03-29
 msgid "MusicBrainz gets its first dedicated database server."
 msgstr ""
 
-#: DB:statistic_event/description:2006-02-27
+#: DB:statistics.statistic_event/description:2006-02-27
 msgid "MusicBrainz moved to Digital West Networks in San Luis Obispo."
 msgstr ""
 
-#: DB:statistic_event/description:2006-03-12
+#: DB:statistics.statistic_event/description:2006-03-12
 msgid ""
 "MusicBrainz partners with MusicIP and starts using MusicDNS's PUID acoustic "
 "fingerprints. Picard becomes the official MusicBrainz tagger with PUID "
 "support, which causes edit activity to decrease."
 msgstr ""
 
-#: DB:statistic_event/title:2006-03-12
+#: DB:statistics.statistic_event/title:2006-03-12
 msgid "MusicIP PUID"
 msgstr ""
 
-#: DB:statistic_event/title:2011-05-12
+#: DB:statistics.statistic_event/title:2011-05-12
 msgid "NGS No-Editing Phase"
 msgstr ""
 
-#: DB:statistic_event/title:2011-05-02
+#: DB:statistics.statistic_event/title:2011-05-02
 msgid "NGS Reduced Editing Phase"
 msgstr ""
 
-#: DB:statistic_event/title:2011-05-18
+#: DB:statistics.statistic_event/title:2011-05-18
 msgid "NGS Release"
 msgstr ""
 
-#: DB:statistic_event/description:2011-05-18
+#: DB:statistics.statistic_event/description:2011-05-18
 msgid "NGS, a MusicBrainz major rewrite, is released!"
 msgstr ""
 
-#: DB:statistic_event/title:2003-10-13
+#: DB:statistics.statistic_event/title:2003-10-13
 msgid "Non album tracks"
 msgstr ""
 
-#: DB:statistic_event/description:2003-10-13
+#: DB:statistics.statistic_event/description:2003-10-13
 msgid "Non album tracks are released."
 msgstr ""
 
-#: DB:statistic_event/description:2008-09-23
+#: DB:statistics.statistic_event/description:2008-09-23
 msgid "Oliver Charles becomes employee #1 of MetaBrainz Foundation."
 msgstr ""
 
-#: DB:statistic_event/description:2010-06-18
+#: DB:statistics.statistic_event/description:2010-06-18
 msgid "Oliver Charles begins working for MusicBrainz full-time."
 msgstr ""
 
-#: DB:statistic_event/title:2010-06-18
+#: DB:statistics.statistic_event/title:2010-06-18
 msgid "Oliver Charles joins MusicBrainz full-time"
 msgstr ""
 
-#: DB:statistic_event/title:2009-05-24
+#: DB:statistics.statistic_event/title:2009-05-24
 msgid "Release Groups, ISRCs, CDStub searching"
 msgstr ""
 
-#: DB:statistic_event/title:2003-10-19 DB:statistic_event/title:2006-07-12
+#: DB:statistics.statistic_event/title:2003-10-19
+#: DB:statistics.statistic_event/title:2006-07-12
 msgid "Release editor"
 msgstr ""
 
-#: DB:statistic_event/description:2003-10-19
+#: DB:statistics.statistic_event/description:2003-10-19
 msgid "Release editor and Guess Case released."
 msgstr ""
 
-#: DB:statistic_event/description:2009-05-24
+#: DB:statistics.statistic_event/description:2009-05-24
 msgid ""
 "Release groups, ISRC support, CDStub searching and search fixes released."
 msgstr ""
 
-#: DB:statistic_event/title:2006-01-08
+#: DB:statistics.statistic_event/title:2006-01-08
 msgid "SG5 Fixes"
 msgstr ""
 
-#: DB:statistic_event/title:2006-12-17
+#: DB:statistics.statistic_event/title:2006-12-17
 msgid "Search improvements"
 msgstr ""
 
-#: DB:statistic_event/title:2008-04-21
+#: DB:statistics.statistic_event/title:2008-04-21
 msgid "SoC 2008"
 msgstr ""
 
-#: DB:statistic_event/description:2006-01-08
+#: DB:statistics.statistic_event/description:2006-01-08
 msgid ""
 "Style Guideline 5 workaround introduced and unused TRMs pruned from the "
 "database."
 msgstr ""
 
-#: DB:statistic_event/description:2007-04-01
+#: DB:statistics.statistic_event/description:2007-04-01
 msgid "Support for Labels and data quality are released."
 msgstr ""
 
-#: DB:statistic_event/title:2003-01-21
+#: DB:statistics.statistic_event/title:2003-01-21
 msgid "TRM collisions"
 msgstr ""
 
-#: DB:statistic_event/title:2007-10-17 ../root/statistics/view_js.tt:170
+#: DB:statistics.statistic_event/title:2007-10-17
+#: ../root/statistics/view_js.tt:170
 msgid "Tags"
 msgstr ""
 
-#: DB:statistic_event/description:2007-06-28
+#: DB:statistics.statistic_event/description:2007-06-28
 msgid ""
 "The BBC becomes a MetaBrainz customer and starts using MusicBrainz data."
 msgstr ""
 
-#: DB:statistic_event/description:2005-04-19
+#: DB:statistics.statistic_event/description:2005-04-19
 msgid ""
 "The MetaBrainz Foundation, the legal home for MusicBrainz is announced to "
 "the public."
 msgstr ""
 
-#: DB:statistic_event/description:2006-12-17
+#: DB:statistics.statistic_event/description:2006-12-17
 msgid "The search features and web service improvements are released."
 msgstr ""
 
-#: DB:statistic_event/description:2005-10-23
+#: DB:statistics.statistic_event/description:2005-10-23
 msgid ""
 "Top menu navigation improved, duplicate artists, album edit all, track time "
 "editing features\n"
 "\treleased."
 msgstr ""
 
-#: DB:statistic_event/title:2007-12-07
+#: DB:statistics.statistic_event/title:2007-12-07
 msgid "Track times set from DiscIDs"
 msgstr ""
 
-#: DB:statistic_event/title:2005-02-13
+#: DB:statistics.statistic_event/title:2005-02-13
 msgid "User improvements"
 msgstr ""
 
-#: DB:statistic_event/description:2004-07-24
+#: DB:statistics.statistic_event/description:2004-07-24
 msgid "Voting logic was improved, web based autoeditor elections released."
 msgstr ""
 
-#: DB:statistic_event/title:2010-02-08
+#: DB:statistics.statistic_event/title:2010-02-08
 msgid "mb_server now hosted on Git"
 msgstr ""
 

commit 49b724423a8b2c82e44f68defda1c3186dc17353
Author: Ian McEwen <[email protected]>
Date:   Wed Oct 31 12:53:24 2012 -0700

    i18n: N_ functions didn't get re-added to the Makefile, evidently

diff --git a/po/Makefile b/po/Makefile
index e976617..b2d0196 100644
--- a/po/Makefile
+++ b/po/Makefile
@@ -35,7 +35,7 @@ mb_server.pot: $(POTFILES) $(TT) $(wildcard extract_pot_templates)
 	@echo "- Update templates .pot"; 
 	@find ../root -path ../root/statistics -prune -o -type f -name \*.tt -print | sort | ./extract_pot_templates | msguniq -s > mb_server.pot;
 	@echo "- Update code .pot"
-	@xgettext --from-code utf-8 --keyword=__ --keyword=l --keyword=lp:1,2c --keyword=N_l --keyword=ln:1,2 --keyword=__x --keyword=__nx:1,2 --keyword=__n:1,2 -Lperl -o mb_server.pot --add-comments=translators -j $(POTFILES)
+	@xgettext --from-code utf-8 --keyword=__ --keyword=l --keyword=lp:1,2c --keyword=N_lp:1,2c --keyword=N_l --keyword=ln:1,2 --keyword=N_ln:1,2 --keyword=__x --keyword=__nx:1,2 --keyword=__n:1,2 -Lperl -o mb_server.pot --add-comments=translators -j $(POTFILES)
 
 statistics.pot: $(STATTT) $(wildcard extract_pot_db) $(wildcard extract_pot_templates)
 	@echo "Rebuilding the statistics.pot file";

-----------------------------------------------------------------------


hooks/post-receive
-- 
mb_server

_______________________________________________
MusicBrainz-commits mailing list
[email protected]
http://lists.musicbrainz.org/mailman/listinfo/musicbrainz-commits
lmpx.com only provides a reader for public news (NNTP) servers. It is not affiliated with the servers or forums shown here and is not responsible for the content of articles, which is written by their respective authors.