From cf4b3cd68f3822d59d6186fee49bac2563d79475 Mon Sep 17 00:00:00 2001
From: krateng <git.noreply@krateng.ch>
Date: Fri, 22 Apr 2022 20:59:55 +0200
Subject: [PATCH] =?UTF-8?q?Commit=201291=20=F0=9F=87=A8=F0=9F=87=AD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 dev/releases/branch.yml               | 1 +
 maloja/web/jinja/admin_overview.jinja | 1 +
 maloja/web/jinja/admin_setup.jinja    | 4 ++--
 3 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/dev/releases/branch.yml b/dev/releases/branch.yml
index 8d3ef64..d4f6fb3 100644
--- a/dev/releases/branch.yml
+++ b/dev/releases/branch.yml
@@ -2,3 +2,4 @@
 - "[Architecture] Added proper exception framework to native API"
 - "[Feature] Implemented track title and artist name editing from web interface"
 - "[Feature] Implemented track and artist merging from web interface"
+- "[Feature] Implemented scrobble reparsing from web interface"
diff --git a/maloja/web/jinja/admin_overview.jinja b/maloja/web/jinja/admin_overview.jinja
index cd6e2b9..6e084f2 100644
--- a/maloja/web/jinja/admin_overview.jinja
+++ b/maloja/web/jinja/admin_overview.jinja
@@ -66,6 +66,7 @@
 	<ul>
 		<li>manually scrobble from track pages</li>
 		<li>delete scrobbles</li>
+		<li>reparse scrobbles</li>
 		<li>edit tracks and artists</li>
 		<li>merge tracks and artists</li>
 		<li>upload artist and track art by dropping a file on the existing image on an artist or track page</li>
diff --git a/maloja/web/jinja/admin_setup.jinja b/maloja/web/jinja/admin_setup.jinja
index e6313f1..7e00ad6 100644
--- a/maloja/web/jinja/admin_setup.jinja
+++ b/maloja/web/jinja/admin_setup.jinja
@@ -71,7 +71,7 @@
 		<tr>	<td>album</td>			<td><i>Album title - optional</i></td>	</tr>
 		<tr>	<td>albumartists</td>	<td><i>List of album artists - optional</i></td>	</tr>
 		<tr>	<td>duration</td>		<td><i>Duration of play in seconds - optional</i></td>	</tr>
-		<tr>	<td>length</td>			<td><i>Full length of the trackin seconds - optional</i></td>	</tr>
+		<tr>	<td>length</td>			<td><i>Full length of the track in seconds - optional</i></td>	</tr>
 		<tr>	<td>time</td>			<td><i>UNIX timestamp - optional, defaults to time of request</i></td>	</tr>
 		<tr>	<td>fix</td>			<td><i>Set this to false to skip server-side metadata fixing - optional</i></td>	</tr>
 
@@ -85,7 +85,7 @@
 	<h2>Import your Last.FM data</h2>
 
 	Switching from Last.fm? <a class="textlink" href="https://benjaminbenben.com/lastfm-to-csv/">Download all your data</a> and run the command <span class="stats">maloja import <i>(the file you just downloaded)</i></span>.<br/>
-	You can also try out <a href="https://github.com/FoxxMD/multi-scrobbler">Multi-Scrobbler</a> to import scrobbles from a wider range of sources.
+	You can also try out <a class="textlink" href="https://github.com/FoxxMD/multi-scrobbler">Multi-Scrobbler</a> to import scrobbles from a wider range of sources.
 	<br/><br/>
 
 	<h2>Set up some rules</h2>