Skip to content

Commit

Permalink
Merge branch 'master' into beta
Browse files Browse the repository at this point in the history
* master:
  Update translations from Transifex
  Update POT files using the production database
  Convert 0 linkTypeIDs to null for the relationship dialog (#2868)
  EntityLink: replace captureMessage with captureException
  Template renderer: set component, url tags for Sentry
  Unset the Sentry user in the template renderer
  • Loading branch information
mwiencek committed Feb 27, 2023
2 parents becc80c + b1cacb8 commit 3bfab06
Show file tree
Hide file tree
Showing 26 changed files with 434 additions and 394 deletions.
55 changes: 30 additions & 25 deletions po/mb_server.de.po
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@ msgid ""
msgstr ""
"Project-Id-Version: MusicBrainz\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2023-02-22 20:37-0600\n"
"POT-Creation-Date: 2023-02-27 12:59-0600\n"
"PO-Revision-Date: 2011-01-30 16:57+0000\n"
"Last-Translator: Till Berger <till@mellthas.de>, 2017,2021\n"
"Language-Team: German (http://www.transifex.com/musicbrainz/musicbrainz/language/de/)\n"
Expand Down Expand Up @@ -2911,8 +2911,8 @@ msgstr "Schrift:"
#: ../root/otherlookup/OtherLookupForm.js:46 ../root/search/SearchIndex.js:30
#: ../root/search/SearchIndex.js:32
#: ../root/search/components/SearchForm.js:100
#: ../root/static/scripts/common/components/Autocomplete2.js:815
#: ../root/static/scripts/common/components/Autocomplete2.js:835
#: ../root/static/scripts/common/components/Autocomplete2.js:810
#: ../root/static/scripts/common/components/Autocomplete2.js:830
#: ../root/static/scripts/common/components/SearchIcon.js:16
#: ../root/taglookup/Form.js:56
msgid "Search"
Expand Down Expand Up @@ -4159,7 +4159,7 @@ msgstr "Bearbeitungen"
#: ../root/release/edit/tracklist.tt:83 ../root/release/edit/tracklist.tt:316
#: ../root/release/edit/tracklist.tt:491 ../root/release/edit/tracklist.tt:506
#: ../root/static/scripts/edit/components/GuessCaseOptions.js:123
#: ../root/static/scripts/relationship-editor/components/RelationshipDialogContent.js:558
#: ../root/static/scripts/relationship-editor/components/RelationshipDialogContent.js:892
msgid "help"
msgstr "Hilfe"

Expand Down Expand Up @@ -5439,7 +5439,7 @@ msgstr "ISRC entfernen"

#: ../lib/MusicBrainz/Server/Edit/Relationship.pm:18
#: ../root/edit/details/ReorderRelationships.js:22
#: ../root/static/scripts/relationship-editor/components/RelationshipDialogContent.js:938
#: ../root/static/scripts/relationship-editor/components/RelationshipDialogContent.js:943
msgid "Relationship"
msgstr "Beziehung"

Expand Down Expand Up @@ -6974,7 +6974,7 @@ msgstr "Freier Text"
#: ../root/edit/details/EditRelationshipType.js:297
#: ../root/edit/details/RemoveRelationshipType.js:119
#: ../root/relationship/linktype/RelationshipTypeIndex.js:46
#: ../root/static/scripts/relationship-editor/components/RelationshipDialogContent.js:553
#: ../root/static/scripts/relationship-editor/components/RelationshipDialogContent.js:544
#: ../root/utility/tableColumns.js:656
msgid "Attributes"
msgstr "Eigenschaften"
Expand Down Expand Up @@ -7406,7 +7406,7 @@ msgstr "Dieses Gebiet hat keinerlei Beziehungen zu Aufnahmen."
#: ../root/components/EntityTabs.js:93 ../root/label/LabelRelationships.js:32
#: ../root/relationship/RelationshipsHeader.js:39
#: ../root/static/scripts/common/components/Relationships.js:91
#: ../root/static/scripts/relationship-editor/components/RelationshipEditor.js:620
#: ../root/static/scripts/relationship-editor/components/RelationshipEditor.js:638
msgid "Relationships"
msgstr "Beziehungen"

Expand Down Expand Up @@ -8296,7 +8296,7 @@ msgid "as “{credit}”"
msgstr "als „{credit}”"

#: ../root/components/RelationshipsTable.js:140
#: ../root/static/scripts/relationship-editor/components/RelationshipPhraseGroup.js:273
#: ../root/static/scripts/relationship-editor/components/RelationshipPhraseGroup.js:281
msgid "See all {num} relationships"
msgstr ""

Expand Down Expand Up @@ -11180,7 +11180,7 @@ msgid "Internal Server Error"
msgstr "Interner Server-Fehler"

#: ../root/main/error/Error500.js:40
#: ../root/static/scripts/relationship-editor/components/RelationshipEditor.js:534
#: ../root/static/scripts/relationship-editor/components/RelationshipEditor.js:552
msgid "Oops, something went wrong!"
msgstr "Ohje! Da ist etwas schiefgegangen."

Expand Down Expand Up @@ -11699,7 +11699,7 @@ msgstr "{entity0}-{entity1}"

#: ../root/relationship/linktype/RelationshipTypeIndex.js:126
#: ../root/static/scripts/edit/externalLinks.js:744
#: ../root/static/scripts/relationship-editor/components/DialogLinkType.js:68
#: ../root/static/scripts/relationship-editor/components/DialogLinkType.js:71
msgid "This relationship type is deprecated and should not be used."
msgstr "Dieser Beziehungstyp ist veraltet und sollte nicht verwendet werden."

Expand Down Expand Up @@ -13844,7 +13844,7 @@ msgid "Try with indexed search instead."
msgstr "Versuch’s nochmal mit der indexierten Suche."

#: ../root/static/scripts/common/MB/Control/Autocomplete.js:126
#: ../root/static/scripts/common/components/Autocomplete2.js:805
#: ../root/static/scripts/common/components/Autocomplete2.js:800
msgid "Type to search, or paste an MBID"
msgstr "Suchbegriff eingeben oder MBID einfügen"

Expand Down Expand Up @@ -14993,8 +14993,8 @@ msgid "Please select a link type for the URL you’ve entered."
msgstr "Wähle bitte einen Linktyp für die von dir eingegebene URL aus."

#: ../root/static/scripts/edit/externalLinks.js:754
#: ../root/static/scripts/relationship-editor/components/RelationshipDialogContent.js:986
#: ../root/static/scripts/relationship-editor/components/RelationshipEditor.js:507
#: ../root/static/scripts/relationship-editor/components/RelationshipDialogContent.js:993
#: ../root/static/scripts/relationship-editor/components/RelationshipEditor.js:525
msgid "This relationship already exists."
msgstr "Diese Beziehung besteht bereits,"

Expand Down Expand Up @@ -15054,6 +15054,7 @@ msgid "This URL is not allowed for works."
msgstr ""

#: ../root/static/scripts/edit/externalLinks.js:1113
#: ../root/static/scripts/relationship-editor/components/DialogLinkType.js:319
msgid "{description} ({url|more documentation})"
msgstr "{description} ({url|more documentation})"

Expand Down Expand Up @@ -15199,24 +15200,28 @@ msgid ""
"down-arrow buttons)."
msgstr ""

#: ../root/static/scripts/relationship-editor/components/DialogLinkType.js:62
#: ../root/static/scripts/relationship-editor/components/DialogLinkType.js:65
msgid ""
"Please select a subtype of the currently selected relationship type. The "
"selected relationship type is only used for grouping subtypes."
msgstr "Bitte wähle einen Untertyp des derzeit ausgewählten Beziehungstyps aus. Der ausgewählte Beziehungstyp ist nur zum Gruppieren von Untertypen gedacht."

#: ../root/static/scripts/relationship-editor/components/DialogLinkType.js:84
#: ../root/static/scripts/relationship-editor/components/DialogLinkType.js:87
msgid "This relationship type is not allowed with the current series type."
msgstr ""

#: ../root/static/scripts/relationship-editor/components/DialogLinkType.js:122
#: ../root/static/scripts/relationship-editor/components/DialogLinkType.js:125
msgid "Type or click to search"
msgstr ""

#: ../root/static/scripts/relationship-editor/components/DialogLinkType.js:284
#: ../root/static/scripts/relationship-editor/components/DialogLinkType.js:291
msgid "Relationship type"
msgstr ""

#: ../root/static/scripts/relationship-editor/components/DialogLinkType.js:306
msgid "Please select a relationship type. ({url|more documentation})"
msgstr ""

#: ../root/static/scripts/relationship-editor/components/DialogPreview.js:156
msgid "Old order"
msgstr ""
Expand Down Expand Up @@ -15265,17 +15270,17 @@ msgstr "Objekte in einer Beziehung dürfen nicht identisch sein."
msgid "Related type"
msgstr ""

#: ../root/static/scripts/relationship-editor/components/RelationshipDialogContent.js:903
#: ../root/static/scripts/relationship-editor/components/RelationshipDialogContent.js:908
msgid ""
"Warning: This relationship has pending edits. {show|Click here} to view "
"these edits and make sure they do not conflict with your own."
msgstr "Warnung: Diese Beziehung hat ausstehende Bearbeitungen. {show|Klicke hier}, um diese Bearbeitungen anzusehen und sicherzustellen, dass sie nicht mit deinen eigenen in Konflikt stehen."

#: ../root/static/scripts/relationship-editor/components/RelationshipDialogContent.js:1006
#: ../root/static/scripts/relationship-editor/components/RelationshipDialogContent.js:1013
msgid "This will add a relationship to all checked recordings."
msgstr "Dies fügt eine Beziehung zu allen ausgewählten Aufnahmen hinzu."

#: ../root/static/scripts/relationship-editor/components/RelationshipDialogContent.js:1009
#: ../root/static/scripts/relationship-editor/components/RelationshipDialogContent.js:1016
msgid "This will add a relationship to all checked works."
msgstr "Dies fügt eine Beziehung zu allen ausgewählten Werken hinzu."

Expand Down Expand Up @@ -15355,18 +15360,18 @@ msgstr "Noch eine Serie hinzufügen"
msgid "Add another work"
msgstr "Noch ein Werk hinzufügen"

#: ../root/static/scripts/relationship-editor/components/RelationshipPhraseGroup.js:164
#: ../root/static/scripts/relationship-editor/components/RelationshipPhraseGroup.js:170
#: ../root/static/scripts/relationship-editor/components/RelationshipTargetTypeGroups.js:54
#: ../root/static/scripts/release/components/RelationshipEditorBatchTools.js:70
#: ../root/static/scripts/release/components/TrackRelationshipEditor.js:382
msgid "Add Relationship"
msgstr ""

#: ../root/static/scripts/relationship-editor/components/RelationshipPhraseGroup.js:241
#: ../root/static/scripts/relationship-editor/components/RelationshipPhraseGroup.js:270
msgid "no type"
msgstr "kein Typ"

#: ../root/static/scripts/relationship-editor/components/RelationshipPhraseGroup.js:301
#: ../root/static/scripts/relationship-editor/components/RelationshipPhraseGroup.js:309
msgid "These relationships have a specific ordering"
msgstr "Diese Beziehungen haben eine bestimmte Reihenfolge"

Expand Down Expand Up @@ -15492,12 +15497,12 @@ msgid ""
"to create, and are certain they do not already exist on MusicBrainz."
msgstr "Benutze diese Option nur, wenn du vorher versucht hast, nach dem/den Werk(en) zu suchen, die du erstellen möchtest, und dir sicher bist, dass sie nicht bereits in MusicBrainz eingetragen sind."

#: ../root/static/scripts/release/components/BatchCreateWorksDialog.js:272
#: ../root/static/scripts/release/components/BatchCreateWorksDialog.js:274
#: ../root/static/scripts/release/components/RelationshipEditorBatchTools.js:94
msgid "To use this tool, select some recordings using the checkboxes below."
msgstr ""

#: ../root/static/scripts/release/components/BatchCreateWorksDialog.js:283
#: ../root/static/scripts/release/components/BatchCreateWorksDialog.js:285
msgid "Batch-create new works"
msgstr "Mehrere Werke auf einmal erstellen"

Expand Down
Loading

0 comments on commit 3bfab06

Please sign in to comment.