1 files changed, 15 insertions, 17 deletions

diff --git a/src/strings-default.yaml b/src/strings-default.yaml
index 909ae043..b79dd67f 100644
--- a/src/strings-default.yaml
+++ b/src/strings-default.yaml
@@ -1285,6 +1285,11 @@ artistPage:
 
     album:
       _: "{ALBUM}"
+
+      withCredit: "{ALBUM} {CREDIT}"
+      credit:
+        by: "by {ARTISTS}"
+
       withDate: "{ALBUM} ({DATE})"
       withDuration: "{ALBUM} ({DURATION})"
       withDate.withDuration: "{ALBUM} ({DATE}; {DURATION})"
@@ -1313,15 +1318,13 @@ artistPage:
       #   thing may be described with a word or two, and that's shown
       #   in the list.
 
-      withAnnotation: "{ENTRY} ({ANNOTATION})"
+      withAnnotation: "{ENTRY} — {ANNOTATION}"
 
-      # withArtists:
-      #   This lists co-artists or co-contributors, depending on how
-      #   the artist themselves was credited.
+      # withCitation:
+      #   For commentary entries and the like. These are usually longer
+      #   than typical annotations.
 
-      withArtists: "{ENTRY} (with {ARTISTS})"
-
-      withArtists.withAnnotation: "{ENTRY} ({ANNOTATION}; with {ARTISTS})"
+      withCitation: "{ENTRY} ({CITATION})"
 
       # rerelease:
       #   Tracks which aren't the original release don't display co-
@@ -1330,28 +1333,24 @@ artistPage:
 
       rerelease:
         _: "{ENTRY} ({RERELEASE})"
+        withAnnotation: "{ENTRY} ({RERELEASE}) — {ANNOTATION}"
         term: "rerelease"
 
         firstRelease: >-
           First released on {ALBUM}
 
         notCreditedOnFirstRelease: >-
-          Note that {ARTIST} is not credited on this track's first release.
+          {ARTIST} isn't credited on this track's first release.
 
       firstRelease:
         _: "{ENTRY} ({FIRST_RELEASE})"
+        withAnnotation: "{ENTRY} ({FIRST_RELEASE}) — {ANNOTATION}"
         term: "first release"
 
         rerelease: >-
           Also released on {ALBUM}
 
-      # track:
-      #   The string without duration is used in both the artist's
-      #   track credits list as well as their commentary list.
-
-      track:
-        _: "{TRACK}"
-        withDuration: "({DURATION}) {TRACK}"
+      track: "{TRACK}"
 
       # album:
       #   The artist info page doesn't display if the artist is
@@ -1366,8 +1365,7 @@ artistPage:
         bannerArt: "(banner art)"
         commentary: "(album commentary)"
 
-      flash:
-        _: "{FLASH}"
+      flash: "{FLASH}"
 
       artwork.accent:
         withLabel: >-