From 8fc4225b2965da81adcbd1687d0ff5a4d6ac2030 Mon Sep 17 00:00:00 2001
From: Damien Elmes <gpg@ankiweb.net>
Date: Thu, 21 Mar 2024 10:16:42 +0700
Subject: [PATCH] Update translations, and full sync -> one-way sync

---
 ftl/core-repo              | 2 +-
 ftl/core/sync.ftl          | 2 +-
 ftl/qt-repo                | 2 +-
 rslib/src/error/network.rs | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/ftl/core-repo b/ftl/core-repo
index 2b36588b2..974341121 160000
--- a/ftl/core-repo
+++ b/ftl/core-repo
@@ -1 +1 @@
-Subproject commit 2b36588b2df0bb7a142eb726a7bacc8c49c66ef1
+Subproject commit 97434112144df131e310f5b73b83d999cff92cc3
diff --git a/ftl/core/sync.ftl b/ftl/core/sync.ftl
index 3240fc0ec..79594bb78 100644
--- a/ftl/core/sync.ftl
+++ b/ftl/core/sync.ftl
@@ -40,7 +40,7 @@ sync-password-label = Password:
 sync-account-required =
     <h1>Account Required</h1>
     A free account is required to keep your collection synchronized. Please <a href="{ $link }">sign up</a> for an account, then enter your details below.
-sync-sanity-check-failed = Please use the Check Database function, then sync again. If problems persist, please force a full sync in the preferences screen.
+sync-sanity-check-failed = Please use the Check Database function, then sync again. If problems persist, please force a one-way sync in the preferences screen.
 sync-clock-off = Unable to sync - your clock is not set to the correct time.
 sync-upload-too-large =
     Your collection file is too large to send to AnkiWeb. You can reduce its
diff --git a/ftl/qt-repo b/ftl/qt-repo
index c49d5865c..56fe7543e 160000
--- a/ftl/qt-repo
+++ b/ftl/qt-repo
@@ -1 +1 @@
-Subproject commit c49d5865cda463eb893a49a29aefb9b73bcafc16
+Subproject commit 56fe7543ea2744ec97bf4dbcf71ab9c9f712ab52
diff --git a/rslib/src/error/network.rs b/rslib/src/error/network.rs
index 35b4c8568..469978cff 100644
--- a/rslib/src/error/network.rs
+++ b/rslib/src/error/network.rs
@@ -155,7 +155,7 @@ fn guess_reqwest_error(mut info: String) -> AnkiError {
         if info.contains("invalid type") {
             info = format!(
                 "{} {} {}\n\n{}",
-                "Please force a full sync in the Preferences screen to bring your devices into sync.",
+                "Please force a one-way sync in the Preferences screen to bring your devices into sync.",
                 "Then, please use the Check Database feature, and sync to your other devices.",
                 "If problems persist, please post on the support forum.",
                 info,