diff --git a/static/skin/i18n/en.json b/static/skin/i18n/en.json
index 1e6c97ad..406e0def 100644
--- a/static/skin/i18n/en.json
+++ b/static/skin/i18n/en.json
@@ -44,4 +44,6 @@
 	, "torrent-download-link-text": "Torrent file"
 	, "torrent-download-alt-text": "download torrent"
 	, "library-opds-feed": "Library OPDS Feed"
+	, "filter-by-tag": "Filter by tag \"{{TAG}}\""
+	, "stop-filtering-by-tag": "Stop filtering by tag \"{{TAG}}\""
 }
diff --git a/static/skin/i18n/qqq.json b/static/skin/i18n/qqq.json
index 1a7fe6ff..62089d56 100644
--- a/static/skin/i18n/qqq.json
+++ b/static/skin/i18n/qqq.json
@@ -46,4 +46,6 @@
 	, "torrent-download-link-text": "Link text for downloading the torrent file"
 	, "torrent-download-alt-text": "Hint for the icon of torrent download"
 	, "library-opds-feed": "Hint for the library OPDS feed link"
+	, "filter-by-tag": "Hint for a link that would load results filtered by a single tag"
+	, "stop-filtering-by-tag": "Tooltip for the button that cancels filtering by tag"
 }
diff --git a/static/skin/i18n/test.json b/static/skin/i18n/test.json
index 46ccb830..cc4a2ace 100644
--- a/static/skin/i18n/test.json
+++ b/static/skin/i18n/test.json
@@ -33,4 +33,6 @@
 	, "torrent-download-link-text": "Torrent [I18N TESTING] file"
 	, "torrent-download-alt-text": "download [I18N TESTING] torrent"
 	, "library-opds-feed": "Library [I18N] OPDS [TESTING] Feed"
+	, "filter-by-tag": "Filter [I18N] by [TESTING] tag \"{{TAG}}\""
+	, "stop-filtering-by-tag": "[I18N] Stop filtering [TESTING] by tag \"{{TAG}}\""
 }
diff --git a/static/skin/index.js b/static/skin/index.js
index c87a4787..52328eb5 100644
--- a/static/skin/index.js
+++ b/static/skin/index.js
@@ -106,7 +106,7 @@
     function generateTagLink(tagValue) {
         tagValue = tagValue.toLowerCase();
         const humanFriendlyTagValue = humanFriendlyTitle(tagValue);
-        const tagMessage = `Filter by tag "${humanFriendlyTagValue}"`;
+        const tagMessage = $t("filter-by-tag", {TAG: humanFriendlyTagValue});
         return `<span class='tag__link' aria-label='${tagMessage}' title='${tagMessage}' data-tag=${tagValue}>${humanFriendlyTagValue}</span>`
     }
 
@@ -418,7 +418,7 @@
         tagElement.style.display = 'inline-block';
         const humanFriendlyTagValue = humanFriendlyTitle(tagValue);
         tagElement.innerHTML = `${humanFriendlyTagValue}`;
-        const tagMessage = `Stop filtering by tag "${humanFriendlyTagValue}"`;
+        const tagMessage = $t("stop-filtering-by-tag", {TAG: humanFriendlyTagValue});
         tagElement.setAttribute('aria-label', tagMessage);
         tagElement.setAttribute('title', tagMessage);
         if (resetFilter)
diff --git a/test/server.cpp b/test/server.cpp
index c7cd1755..21c79ba1 100644
--- a/test/server.cpp
+++ b/test/server.cpp
@@ -63,7 +63,7 @@ const ResourceCollection resources200Compressible{
   { DYNAMIC_CONTENT, "/ROOT%23%3F/skin/index.css" },
   { STATIC_CONTENT,  "/ROOT%23%3F/skin/index.css?cacheid=f0ee124c" },
   { DYNAMIC_CONTENT, "/ROOT%23%3F/skin/index.js" },
-  { STATIC_CONTENT,  "/ROOT%23%3F/skin/index.js?cacheid=7348b4df" },
+  { STATIC_CONTENT,  "/ROOT%23%3F/skin/index.js?cacheid=042058df" },
   { DYNAMIC_CONTENT, "/ROOT%23%3F/skin/iso6391To3.js" },
   { STATIC_CONTENT,  "/ROOT%23%3F/skin/iso6391To3.js?cacheid=ecde2bb3" },
   { DYNAMIC_CONTENT, "/ROOT%23%3F/skin/isotope.pkgd.min.js" },
@@ -284,7 +284,7 @@ R"EXPECTEDRESULT(      href="/ROOT%23%3F/skin/index.css?cacheid=f0ee124c"
     <script type="text/javascript" src="/ROOT%23%3F/skin/languages.js?cacheid=fe100348" defer></script>
     <script src="/ROOT%23%3F/skin/isotope.pkgd.min.js?cacheid=2e48d392" defer></script>
     <script src="/ROOT%23%3F/skin/iso6391To3.js?cacheid=ecde2bb3"></script>
-    <script type="text/javascript" src="/ROOT%23%3F/skin/index.js?cacheid=7348b4df" defer></script>
+    <script type="text/javascript" src="/ROOT%23%3F/skin/index.js?cacheid=042058df" defer></script>
       <img src="/ROOT%23%3F/skin/feed.png?cacheid=56a672b1"
 )EXPECTEDRESULT"
     },