Merge remote-tracking branch 'upstream/main' into disable-parameter-edits

CONTRIBUTORS

@@ -247,6 +247,9 @@ Hanna Nilsén <hanni614@student.liu.se>
 Elias Johansson Lara <elias.johanssonlara@gmail.com>
 Toby Penner <tobypenner01@gmail.com>
 Danilo Spillebeen <spillebeendanilo@gmail.com>
+Matbe766 <matildabergstrom01@gmail.com>
+Amanda Sternberg <mandis.sternberg@gmail.com>
+
 
 ********************
 

ftl/core/deck-config.ftl

@@ -382,7 +382,7 @@ deck-config-which-deck = Which deck would you like to display options for?
 ## Messages related to the FSRS scheduler
 
 deck-config-updating-cards = Updating cards: { $current_cards_count }/{ $total_cards_count }...
-deck-config-invalid-parameters = The provided FSRS parameters are invalid. Leave them blank to use the default parameters.
+deck-config-invalid-parameters = The provided FSRS parameters are invalid. Leave them blank to use the default values.
 deck-config-manual-parameter-edit-warning = The parameters should only be modified using the optimize button. Manually editing them is heavily advised against.
 deck-config-not-enough-history = Insufficient review history to perform this operation.
 deck-config-must-have-400-reviews =

ftl/core/launcher.ftl

@@ -1,9 +1,10 @@
 launcher-title = Anki Launcher
+launcher-press-enter-to-install = Press the Enter/Return key on your keyboard to install or update Anki.
 launcher-press-enter-to-start = Press enter to start Anki.
 launcher-anki-will-start-shortly = Anki will start shortly.
 launcher-you-can-close-this-window = You can close this window.
 launcher-updating-anki = Updating Anki...
-launcher-latest-anki = Latest Anki (just press Enter)
+launcher-latest-anki = Install Latest Anki (default)
 launcher-choose-a-version = Choose a version
 launcher-sync-project-changes = Sync project changes
 launcher-keep-existing-version = Keep existing version ({ $current })
@@ -13,7 +14,7 @@ launcher-on = on
 launcher-off = off
 launcher-cache-downloads = Cache downloads: { $state }
 launcher-download-mirror = Download mirror: { $state }
-launcher-uninstall = Uninstall
+launcher-uninstall = Uninstall Anki
 launcher-invalid-input = Invalid input. Please try again.
 launcher-latest-releases = Latest releases: { $releases }
 launcher-enter-the-version-you-want = Enter the version you want to install:

qt/aqt/sync.py

@@ -209,11 +209,20 @@ def on_full_sync_timer(mw: aqt.main.AnkiQt, label: str) -> None:
         return
     sync_progress = progress.full_sync
 
+    # If we've reached total, show the "checking" label
     if sync_progress.transferred == sync_progress.total:
         label = tr.sync_checking()
+
+    total = sync_progress.total
+    transferred = sync_progress.transferred
+
+    # Scale both to kilobytes with floor division
+    max_for_bar = total // 1024
+    value_for_bar = transferred // 1024
+
     mw.progress.update(
-        value=sync_progress.transferred,
+        value=value_for_bar,
-        max=sync_progress.total,
+        max=max_for_bar,
         process=False,
         label=label,
     )

qt/launcher/src/main.rs

@@ -173,6 +173,8 @@ fn run() -> Result<()> {
 
     ensure_os_supported()?;
 
+    println!("{}\n", state.tr.launcher_press_enter_to_install());
+
     check_versions(&mut state);
 
     main_menu_loop(&state)?;

rslib/src/scheduler/fsrs/error.rs

@@ -13,13 +13,7 @@ impl From<FSRSError> for AnkiError {
             FSRSError::OptimalNotFound => AnkiError::FsrsUnableToDetermineDesiredRetention,
             FSRSError::Interrupted => AnkiError::Interrupted,
             FSRSError::InvalidParameters => AnkiError::FsrsParamsInvalid,
-            FSRSError::InvalidInput => AnkiError::InvalidInput {
+            FSRSError::InvalidInput => AnkiError::FsrsParamsInvalid,
-                source: InvalidInputError {
-                    message: "invalid params provided".to_string(),
-                    source: None,
-                    backtrace: None,
-                },
-            },
             FSRSError::InvalidDeckSize => AnkiError::InvalidInput {
                 source: InvalidInputError {
                     message: "no cards to simulate".to_string(),