Merge branch 'master' into develop

public/language/en-GB/topic.json

@@ -47,7 +47,7 @@
 	"wrote-ago": "wrote <a href=\"%1\" class=\"timeago text-muted\" title=\"%2\"></a>",
 	"wrote-on": "wrote on <a href=\"%1\" class=\"timeago text-muted\" title=\"%2\"></a>",
 	"replied-to-user-ago": "replied to <a component=\"post/parent\" data-topid=\"%1\" href=\"%2\">%3</a> <a href=\"%4\" class=\"timeago text-muted\" title=\"%5\"></a>",
-	"replied-to-user-on": "replied to <a component=\"post/parent\" data-topid=\"%1\" href=\"%2\">%3</a> on <a hrf=\"%4\" class=\"timeago text-muted\" title=\"%5\"></a>",
+	"replied-to-user-on": "replied to <a component=\"post/parent\" data-topid=\"%1\" href=\"%2\">%3</a> on <a href=\"%4\" class=\"timeago text-muted\" title=\"%5\"></a>",
 
 	"user-locked-topic-ago": "%1 locked this topic %2",
 	"user-locked-topic-on": "%1 locked this topic on %2",

src/views/admin/manage/admins-mods.tpl

@@ -55,7 +55,7 @@
 			</div>
 		</div>
 		<div class="mb-2">
-		<!-- IMPORT partials/breadcrumbs.tpl -->
+		<!-- IMPORT admin/partials/breadcrumbs.tpl -->
 		</div>
 		{{{ if !categoryMods.length }}}
 		<p class="alert alert-info">[[admin/manage/admins-mods:no-sub-categories]]</p>

src/views/admin/manage/categories.tpl

@@ -11,7 +11,7 @@
 			<button data-action="create" class="btn btn-primary btn-sm btn btn-primary btn-sm fw-semibold ff-secondary text-center text-nowrap">[[admin/manage/categories:add-category]]</button>
 		</div>
 	</div>
-	<div class="text-sm {{{if !breadcrumbs.length }}}hidden{{{ end }}}"><!-- IMPORT partials/breadcrumbs.tpl --></div>
+	<div class="text-sm {{{if !breadcrumbs.length }}}hidden{{{ end }}}"><!-- IMPORT admin/partials/breadcrumbs.tpl --></div>
 
 	<div component="category/no-matches" class="hidden">[[admin/manage/categories:no-matches]]</div>
 

src/views/admin/manage/uploads.tpl

@@ -12,7 +12,7 @@
 	</div>
 
 	<div class="">
-	<!-- IMPORT partials/breadcrumbs.tpl -->
+	<!-- IMPORT admin/partials/breadcrumbs.tpl -->
 	</div>
 
 	<div class="table-responsive">