From 6cc2c0431e33e921a8429930cb1d5cc36044de6f Mon Sep 17 00:00:00 2001
From: Ville Nummela <ville.nummela@jolla.com>
Date: Fri, 13 Jan 2023 07:41:55 +0200
Subject: [PATCH 1/2] [sailfish-utilities] Move more info links outside of
 translated texts. JB#59782

Signed-off-by: Ville Nummela <ville.nummela@jolla.com>
---
 qml/plugins/CleanPackageCache.qml | 7 +++++--
 qml/plugins/CleanTracker.qml      | 7 +++++--
 2 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/qml/plugins/CleanPackageCache.qml b/qml/plugins/CleanPackageCache.qml
index 41002a1..062bd24 100644
--- a/qml/plugins/CleanPackageCache.qml
+++ b/qml/plugins/CleanPackageCache.qml
@@ -7,11 +7,14 @@ ActionItem {
     title: qsTrId("sailfish-tools-he-packace_cache")
     //% "Clean"
     actionName: qsTrId("sailfish-tools-bt-clean")
+    //: Text surrounded by %1 and %2 becomes a hyperlink: %1 is replaced by <a href="..."> and %2 by </a>.
     //% "Package cache cleaning can be tried if there are "
     //% "problems with store, e.g. 'Critical problem with the app registry' error. "
     //% "More information can be found "
-    //% "<a href='https://together.jolla.com/question/7988/problem-with-store-unable-to-install/'>here</a>."
-    description: qsTrId("sailfish-utilities-me-clean-pkg-cache-desc")
+    //% "%1here%2."
+    description: qsTrId("sailfish-utilities-me-clean-pkg-cache-desc-url")
+        .arg("<a href='https://together.jolla.com/question/7988/problem-with-store-unable-to-install/'>")
+        .arg("</a>")
     requiresReboot: true
 
     function action(on_reply, on_error) {
diff --git a/qml/plugins/CleanTracker.qml b/qml/plugins/CleanTracker.qml
index 7960d47..c8a5d63 100644
--- a/qml/plugins/CleanTracker.qml
+++ b/qml/plugins/CleanTracker.qml
@@ -7,12 +7,15 @@ ActionItem {
     title: qsTrId("sailfish-tools-he-tracker_database")
     //% "Clean"
     actionName: qsTrId("sailfish-tools-bt-clean")
+    //: Text surrounded by %1 and %2 becomes a hyperlink: %1 is replaced by <a href="..."> and %2 by </a>.
     //% "Tracker dabatabase cleaning can help in cases with "
     //% "missing images, audio files etc. Processes using tracker "
     //% "will be closed, tracker reindexing will be started. "
     //% "More information can be found "
-    //% "<a href='https://together.jolla.com/question/4337/refresh-tracker/'>here</a>."
-    description: qsTrId("sailfish-utilities-me-clean-tracker-db-desc")
+    //% "%1here%2."
+    description: qsTrId("sailfish-utilities-me-clean-tracker-db-desc-url")
+        .arg("<a href='https://together.jolla.com/question/4337/refresh-tracker/'>")
+        .arg("</a>")
     deviceLockRequired: false
 
     function action(on_reply, on_error) {

From b5b079605b78a69ebdf184b67235f1b2e9335cda Mon Sep 17 00:00:00 2001
From: Ville Nummela <ville.nummela@jolla.com>
Date: Fri, 13 Jan 2023 07:44:19 +0200
Subject: [PATCH 2/2] [sailfish-utilities] Use DSO as target for more info
 links. Fixes JB#59782

TJC is in read only mode, in DSO we can update the docs.

Signed-off-by: Ville Nummela <ville.nummela@jolla.com>
---
 qml/plugins/CleanPackageCache.qml | 2 +-
 qml/plugins/CleanTracker.qml      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/qml/plugins/CleanPackageCache.qml b/qml/plugins/CleanPackageCache.qml
index 062bd24..4861e46 100644
--- a/qml/plugins/CleanPackageCache.qml
+++ b/qml/plugins/CleanPackageCache.qml
@@ -13,7 +13,7 @@ ActionItem {
     //% "More information can be found "
     //% "%1here%2."
     description: qsTrId("sailfish-utilities-me-clean-pkg-cache-desc-url")
-        .arg("<a href='https://together.jolla.com/question/7988/problem-with-store-unable-to-install/'>")
+        .arg("<a href='https://docs.sailfishos.org/Support/Help_Articles/Tips_and_Tricks/#fix-the-package-cache'>")
         .arg("</a>")
     requiresReboot: true
 
diff --git a/qml/plugins/CleanTracker.qml b/qml/plugins/CleanTracker.qml
index c8a5d63..e445606 100644
--- a/qml/plugins/CleanTracker.qml
+++ b/qml/plugins/CleanTracker.qml
@@ -14,7 +14,7 @@ ActionItem {
     //% "More information can be found "
     //% "%1here%2."
     description: qsTrId("sailfish-utilities-me-clean-tracker-db-desc-url")
-        .arg("<a href='https://together.jolla.com/question/4337/refresh-tracker/'>")
+        .arg("<a href='https://docs.sailfishos.org/Support/Help_Articles/Tips_and_Tricks/#refresh-the-tracker-database'>")
         .arg("</a>")
     deviceLockRequired: false