fix: EndOfBookOptions fails to compile

ActivityManager.h forward-declares Activity but holds
std::unique_ptr<Activity> members. Instantiating that unique_ptr's
destructor requires the complete type, so any TU including
ActivityManager.h without Activity.h fails to compile.

Include Activity.h directly. Adding it to ActivityManager.h instead does
not work: Activity.h depends on HomeMenuItem, which ActivityManager.h
defines.

.gitignore

@@ -2,6 +2,8 @@
 .idea
 .DS_Store
 .vscode
+open-x4-sdk
+fs_
 lib/EpdFont/fontsrc
 lib/I18n/I18nKeys.h
 lib/I18n/I18nStrings.h
@@ -23,9 +25,3 @@ lib/EpdFont/scripts/output/
 # (worktrees, scheduled-task locks, settings.local, scout CLEANUP.md) out.
 .claude/*
 !.claude/skills/
-/managed_components
-/.dummy
-dependencies.lock
-sdkconfig.default
-sdkconfig.defaults
-CMakeLists.txt

USER_GUIDE.md

@@ -28,8 +28,10 @@ Welcome to the **CrossPoint** firmware. This guide outlines the hardware control
       - [3.6.5 OPDS Servers (Multiple Libraries)](#365-opds-servers-multiple-libraries)
       - [3.6.6 Web Settings (Wi-Fi + OPDS)](#366-web-settings-wi-fi--opds)
       - [3.6.7 KOReader Sync Quick Setup](#367-koreader-sync-quick-setup)
-        - [Option A: Free Public Server (`sync.koreader.rocks`)](#option-a-free-public-server-synckoreaderrocks)
-        - [Option B: Self-Hosted Server (Docker Compose)](#option-b-self-hosted-server-docker-compose)
+        - [Option A: CrossPoint Sync Server (`sync.crosspointreader.com`, default)](#option-a-crosspoint-sync-server-synccrosspointreadercom-default)
+        - [Option B: Legacy Public KOReader Server (`sync.koreader.rocks`)](#option-b-legacy-public-koreader-server-synckoreaderrocks)
+        - [Option C: Self-Hosted Server (Docker Compose)](#option-c-self-hosted-server-docker-compose)
+        - [Syncing While Reading](#syncing-while-reading)
     - [3.7 Sleep Screen](#37-sleep-screen)
       - [Cover settings](#cover-settings)
       - [Custom images](#custom-images)
@@ -297,7 +299,7 @@ The Settings screen allows you to configure the device's behavior. There are a f
 
 - **Wi-Fi Networks**: Connect to Wi-Fi networks for file transfers and firmware updates.
 
-- **KOReader Sync**: Options for setting up KOReader for syncing book progress.
+- **KOReader Sync**: Options for setting up KOReader for syncing book progress. **Smart sync** is the default for new configurations and auto-resolves simple push/pull decisions. Existing credential files retain **Ask every time** when migrated; you can switch Sync Behavior at any time if you prefer manual confirmation.
 
 - **OPDS Servers**: Manage one or more OPDS [(Open Publication Distribution System)](https://en.wikipedia.org/wiki/Open_Publication_Distribution_System) libraries for browsing and downloading books. See [OPDS Servers (Multiple Libraries)](#365-opds-servers-multiple-libraries) below.
 
@@ -360,9 +362,37 @@ Behavior notes:
 CrossPoint can sync reading progress with KOReader-compatible sync servers.
 It also interoperates with KOReader apps/devices when they use the same server and credentials.
 
-##### Option A: Free Public Server (`sync.koreader.rocks`)
+##### Option A: CrossPoint Sync Server (`sync.crosspointreader.com`, default)
 
-1. Register a user once (only if needed):
+When **Sync Server URL** is left empty, CrossPoint uses the free CrossPoint sync server at `https://sync.crosspointreader.com`. It speaks the standard KOReader sync protocol (so KOReader apps can use it too) and additionally stores an exact spine/page position for lossless CrossPoint-to-CrossPoint sync.
+
+1. On each CrossPoint device:
+
+   - Go to **Settings -> System -> KOReader Sync**.
+
+   - Set **Username** and **Password** (enter the plain password; CrossPoint computes MD5 internally, and use the same values on all devices).
+
+   - Leave **Sync Server URL** empty (or set it to `https://sync.crosspointreader.com`).
+
+   - On the first device, run **Sign Up** once to create the account directly from the device. On every other device, just run **Authenticate**.
+
+Accounts are per server. Existing `sync.koreader.rocks` credentials do not exist on the CrossPoint server; either sign up again with the same username/password or use Option B to keep using the legacy server.
+
+##### Option B: Legacy Public KOReader Server (`sync.koreader.rocks`)
+
+Use this if you already sync KOReader devices against the official public server.
+
+1. On each CrossPoint device:
+
+   - Go to **Settings -> System -> KOReader Sync**.
+
+   - Set **Sync Server URL** to `https://sync.koreader.rocks` (required; an empty URL now points at the CrossPoint server instead).
+
+   - Set **Username** and **Password** to your existing KOReader Sync credentials.
+
+   - Run **Authenticate**.
+
+2. If you do not have an account yet, run **Sign Up** on the device, or register once with curl:
 
 ```bash
 USERNAME="user"
@@ -375,27 +405,9 @@ curl -i "https://sync.koreader.rocks/users/create" \
   --data "{\"username\":\"$USERNAME\",\"password\":\"$PASSWORD_MD5\"}"
 ```
 
-Already have KOReader Sync credentials? Skip registration; basic sync only requires using the same existing username/password on all devices.
-
 When this returns `HTTP 402` with `{"code":2002,"message":"Username is already registered."}`, pick a different username or use that existing account.
 
-2. On each CrossPoint device:
-   
-   - Go to **Settings -> System -> KOReader Sync**.
-   
-   - Set **Username** and **Password** (enter the plain password; CrossPoint computes MD5 internally, and use the same values on all devices).
-   
-   - Set **Sync Server URL** to `https://sync.koreader.rocks`, or leave it empty (both use the same default KOReader sync server).
-   
-   - Run **Authenticate**.
-
-3. While reading, press **Confirm** to open the reader menu, then select **Sync Progress**.
-   
-   - Choose **Apply Remote** to jump to remote progress.
-   
-   - Choose **Upload Local** to push current progress.
-
-##### Option B: Self-Hosted Server (Docker Compose)
+##### Option C: Self-Hosted Server (Docker Compose)
 
 1. Start a sync server:
 
@@ -468,11 +480,12 @@ If this returns `HTTP 402` with `{"code":2002,"message":"Username is already reg
 
 If you use the HTTPS listener, use `https://<server-ip>:7200` (`curl -k` only for self-signed certificate testing).
 
-5. While reading, press **Confirm** to open the reader menu, then select **Sync Progress**.
+##### Syncing While Reading
 
-   - Choose **Apply Remote** to jump to remote progress.
+Once any of the options above is set up, press **Confirm** while reading to open the reader menu, then select **Sync Progress**. Alternatively, set **Settings -> Controls -> Long-press Menu** to **KOSync** and hold Confirm to launch sync directly.
 
-   - Choose **Upload Local** to push current progress.
+- With **Sync Behavior** set to **Ask every time**, choose **Apply Remote** to jump to remote progress or **Upload Local** to push current progress.
+- With **Sync Behavior** set to **Smart sync**, CrossPoint auto-resolves simple cases: upload when no remote progress exists, confirm and leave both unchanged when local and remote progress are already synchronized, upload when local progress is further ahead, or apply remote when remote progress is further ahead.
 
 ### 3.7 Sleep Screen
 

lib/EpdFont/FontDecompressor.cpp

@@ -369,11 +369,6 @@ int FontDecompressor::prewarmCache(const EpdFontData* fontData, const char* utf8
   }
   stats.pageBufferBytes += totalBytes;
   stats.pageGlyphsBytes += glyphCount * sizeof(PageGlyphEntry);
-  // MEMFIX-PORT: page-slot address landmark for the heap map; portable
-  // Landmark for the heap block map: page slots are the largest flash-font
-  // allocations and otherwise show up as anonymous ~4-20 KB used blocks.
-  LOG_DBG("FDC", "page slot buffer=%p bytes=%u glyphs=%u", static_cast<void*>(slot.buffer), (unsigned)totalBytes,
-          (unsigned)glyphCount);
 
   slot.fontData = fontData;
   slot.glyphCount = glyphCount;

lib/EpdFont/SdCardFont.cpp

@@ -68,22 +68,6 @@ bool collectUniqueCodepoints(const char* text, uint32_t* codepoints, uint32_t& c
 const char* asCStr(const std::string& s) { return s.c_str(); }
 const char* asCStr(const char* s) { return s; }
 
-// Keep-if-fits buffer reuse: only reallocate when the needed size exceeds the
-// current capacity. Freeing + reallocating slightly different sizes every page
-// turn punches non-coalescing holes in the heap (the freed block rarely fits the
-// next page's need), eroding the largest contiguous block all session. With
-// reuse, capacities converge on the book's max page after a few turns and page
-// turns stop touching the allocator. Only three small instantiations exist
-// (interval/glyph/byte arrays), so template bloat is negligible.
-template <typename T, typename CapT>
-bool ensureArrayCapacity(T*& buf, CapT& capacity, const uint32_t needed) {
-  if (buf && capacity >= needed) return true;
-  delete[] buf;
-  buf = new (std::nothrow) T[needed > 0 ? needed : 1];
-  capacity = buf ? static_cast<CapT>(needed) : 0;
-  return buf != nullptr;
-}
-
 }  // namespace
 
 SdCardFont::~SdCardFont() { freeAll(); }
@@ -99,9 +83,6 @@ void SdCardFont::freeStyleMiniData(PerStyle& s) {
   s.miniBitmap = nullptr;
   s.miniIntervalCount = 0;
   s.miniGlyphCount = 0;
-  s.miniIntervalCapacity = 0;
-  s.miniGlyphCapacity = 0;
-  s.miniBitmapCapacity = 0;
   freeStyleMiniKern(s);
   memset(&s.miniData, 0, sizeof(s.miniData));
   s.epdFont.data = &s.stubData;
@@ -128,9 +109,6 @@ void SdCardFont::freeStyleMiniKern(PerStyle& s) {
   s.miniKernRightEntryCount = 0;
   s.miniKernLeftClassCount = 0;
   s.miniKernRightClassCount = 0;
-  s.miniKernLeftCapacity = 0;
-  s.miniKernRightCapacity = 0;
-  s.miniKernMatrixCapacity = 0;
 }
 
 void SdCardFont::freeStyleAll(PerStyle& s) {
@@ -333,13 +311,13 @@ bool SdCardFont::buildMiniKernMatrix(PerStyle& s, const uint32_t* codepoints, ui
     if (miniLookupKernClass(s.kernRightClasses, s.header.kernRightEntryCount, codepoints[i]) != 0) miniRightCount++;
   }
 
-  // Step 4: size the three mini buffers (reused across pages when they fit; the
-  // per-page sizes vary by a few entries, which as free+realloc churn was punching
-  // non-coalescing holes in the heap every page turn).
+  // Step 4: allocate the three mini buffers. The matrix is <1KB in practice
+  // (<30 × <30 × 1 byte) so fragmentation is a non-issue.
   const uint32_t matrixBytes = static_cast<uint32_t>(numLeft) * numRight;
-  if (!ensureArrayCapacity(s.miniKernLeftClasses, s.miniKernLeftCapacity, miniLeftCount) ||
-      !ensureArrayCapacity(s.miniKernRightClasses, s.miniKernRightCapacity, miniRightCount) ||
-      !ensureArrayCapacity(s.miniKernMatrix, s.miniKernMatrixCapacity, matrixBytes)) {
+  s.miniKernLeftClasses = new (std::nothrow) EpdKernClassEntry[miniLeftCount];
+  s.miniKernRightClasses = new (std::nothrow) EpdKernClassEntry[miniRightCount];
+  s.miniKernMatrix = new (std::nothrow) int8_t[matrixBytes];
+  if (!s.miniKernLeftClasses || !s.miniKernRightClasses || !s.miniKernMatrix) {
     LOG_ERR("SDCF", "Failed to allocate mini kern (%u+%u+%u bytes)", miniLeftCount * 3u, miniRightCount * 3u,
             matrixBytes);
     freeStyleMiniKern(s);
@@ -815,19 +793,12 @@ int SdCardFont::prewarmStyle(uint8_t styleIdx, const uint32_t* codepoints, uint3
     return missed;
   }
 
-  // Build mini intervals from sorted codepoints. Reset counts and fall back to the
-  // stub until the rebuild completes, but KEEP the existing buffers (keep-if-fits
-  // reuse) — the free-and-realloc-per-page pattern here was a primary fragmenter.
-  s.miniIntervalCount = 0;
-  s.miniGlyphCount = 0;
-  s.miniKernLeftEntryCount = 0;
-  s.miniKernRightEntryCount = 0;
-  s.miniKernLeftClassCount = 0;
-  s.miniKernRightClassCount = 0;
-  memset(&s.miniData, 0, sizeof(s.miniData));
-  s.epdFont.data = &s.stubData;
+  // Build mini intervals from sorted codepoints
+  freeStyleMiniData(s);
 
-  if (!ensureArrayCapacity(s.miniIntervals, s.miniIntervalCapacity, validCount)) {
+  uint32_t intervalCapacity = validCount;
+  s.miniIntervals = new (std::nothrow) EpdUnicodeInterval[intervalCapacity];
+  if (!s.miniIntervals) {
     LOG_ERR("SDCF", "Failed to allocate mini intervals for style %u", styleIdx);
     delete[] mappings;
     return static_cast<int>(cpCount);
@@ -845,14 +816,15 @@ int SdCardFont::prewarmStyle(uint8_t styleIdx, const uint32_t* codepoints, uint3
     }
   }
 
-  // Mini glyph array (reused across pages when it fits)
-  if (!ensureArrayCapacity(s.miniGlyphs, s.miniGlyphCapacity, validCount)) {
+  // Allocate mini glyph array
+  s.miniGlyphCount = validCount;
+  s.miniGlyphs = new (std::nothrow) EpdGlyph[s.miniGlyphCount];
+  if (!s.miniGlyphs) {
     LOG_ERR("SDCF", "Failed to allocate mini glyphs for style %u", styleIdx);
     delete[] mappings;
     freeStyleMiniData(s);
     return static_cast<int>(cpCount);
   }
-  s.miniGlyphCount = validCount;
 
   // Build sorted read order for sequential I/O
   uint32_t* readOrder = new (std::nothrow) uint32_t[validCount];
@@ -919,7 +891,8 @@ int SdCardFont::prewarmStyle(uint8_t styleIdx, const uint32_t* codepoints, uint3
       totalBitmapSize += s.miniGlyphs[i].dataLength;
     }
 
-    if (!ensureArrayCapacity(s.miniBitmap, s.miniBitmapCapacity, totalBitmapSize)) {
+    s.miniBitmap = new (std::nothrow) uint8_t[totalBitmapSize > 0 ? totalBitmapSize : 1];
+    if (!s.miniBitmap) {
       LOG_ERR("SDCF", "Failed to allocate mini bitmap (%u bytes) for style %u", totalBitmapSize, styleIdx);
       delete[] readOrder;
       delete[] mappings;
@@ -1406,33 +1379,6 @@ const EpdGlyph* SdCardFont::onGlyphMiss(void* ctx, uint32_t codepoint) {
   return &self->overflow_[slot].glyph;
 }
 
-size_t SdCardFont::reportMemory() const {
-  size_t total = 0;
-  for (uint8_t si = 0; si < MAX_STYLES; ++si) {
-    const auto& s = styles_[si];
-    if (!s.present) continue;
-    size_t fixed = 0;  // loaded once per family: interval/kern/lig tables
-    if (s.fullIntervals) fixed += s.header.intervalCount * sizeof(EpdUnicodeInterval);
-    if (s.bmpIntervals) fixed += s.header.intervalCount * sizeof(PerStyle::BmpInterval16);
-    if (s.kernLeftClasses) fixed += s.header.kernLeftEntryCount * sizeof(EpdKernClassEntry);
-    if (s.kernRightClasses) fixed += s.header.kernRightEntryCount * sizeof(EpdKernClassEntry);
-    if (s.ligaturePairs) fixed += s.header.ligaturePairCount * sizeof(EpdLigaturePair);
-    // kept-if-fits mini arenas: capacity (not count) is what stays resident
-    size_t mini = s.miniIntervalCapacity * sizeof(EpdUnicodeInterval) + s.miniGlyphCapacity * sizeof(EpdGlyph) +
-                  s.miniBitmapCapacity + s.miniKernLeftCapacity * sizeof(EpdKernClassEntry) +
-                  s.miniKernRightCapacity * sizeof(EpdKernClassEntry) + s.miniKernMatrixCapacity;
-    const size_t adv = advanceTableSize_[si] * sizeof(AdvanceEntry);
-    LOG_DBG("SDCF", "mem style%u: fixed=%u mini=%u adv=%u", si, (unsigned)fixed, (unsigned)mini, (unsigned)adv);
-    total += fixed + mini + adv;
-  }
-  size_t overflowBytes = 0;
-  for (uint32_t i = 0; i < overflowCount_; ++i) {
-    if (overflow_[i].bitmap) overflowBytes += overflow_[i].glyph.dataLength;
-  }
-  total += overflowBytes + overflowCount_ * sizeof(OverflowEntry);
-  return total;
-}
-
 bool SdCardFont::isOverflowGlyph(const EpdGlyph* glyph) const {
   for (uint32_t i = 0; i < overflowCount_; i++) {
     if (&overflow_[i].glyph == glyph) return true;

lib/EpdFont/SdCardFont.h

@@ -104,11 +104,6 @@ class SdCardFont {
     uint32_t uniqueGlyphs = 0;
     uint32_t bitmapBytes = 0;
   };
-  // MEMFIX-PORT: SD font resident-bytes audit; portable
-  // Log per-style resident heap (full tables + kept-if-fits mini arenas +
-  // advance tables + overflow bitmaps) and return the total in bytes. Pure
-  // accounting — no allocation, no state change.
-  size_t reportMemory() const;
   void logStats(const char* label = "SDCF");
   void resetStats();
   const Stats& getStats() const { return stats_; }
@@ -173,22 +168,13 @@ class SdCardFont {
     // Stub EpdFontData returned when not prewarmed
     EpdFontData stubData{};
 
-    // Mini EpdFontData built during prewarm. Buffers are kept-if-fits across pages
-    // (capacities below track allocated sizes): freeing and reallocating slightly
-    // different sizes on every page turn was a primary heap fragmenter — each page's
-    // freed hole rarely fit the next page's need, so maxAlloc eroded all session.
-    // After a few pages the capacities converge on the book's max and page turns
-    // stop allocating entirely. freeStyleMiniData() still releases everything (and
-    // zeroes capacities) for style eviction / font unload.
+    // Mini EpdFontData built during prewarm
     EpdFontData miniData{};
     EpdUnicodeInterval* miniIntervals = nullptr;
     EpdGlyph* miniGlyphs = nullptr;
     uint8_t* miniBitmap = nullptr;
     uint32_t miniIntervalCount = 0;
     uint32_t miniGlyphCount = 0;
-    uint32_t miniIntervalCapacity = 0;
-    uint32_t miniGlyphCapacity = 0;
-    uint32_t miniBitmapCapacity = 0;
 
     // Per-page mini kern matrix (built by buildMiniKernMatrix on each full
     // prewarm). miniKernLeftClasses/miniKernRightClasses map ONLY the codepoints
@@ -203,10 +189,6 @@ class SdCardFont {
     uint8_t miniKernLeftClassCount = 0;
     uint8_t miniKernRightClassCount = 0;
     int8_t* miniKernMatrix = nullptr;
-    // Kept-if-fits capacities, same rationale as the mini glyph buffers above.
-    uint16_t miniKernLeftCapacity = 0;
-    uint16_t miniKernRightCapacity = 0;
-    uint32_t miniKernMatrixCapacity = 0;
 
     // The EpdFont whose data pointer we manage
     EpdFont epdFont{&stubData};

lib/EpdFont/SdCardFontManager.cpp

@@ -88,14 +88,6 @@ void SdCardFontManager::unloadAll(GfxRenderer& renderer) {
   loadedPointSize_ = 0;
 }
 
-size_t SdCardFontManager::reportMemory() const {
-  size_t total = 0;
-  for (const auto& lf : loaded_) {
-    if (lf.font) total += lf.font->reportMemory();
-  }
-  return total;
-}
-
 int SdCardFontManager::getFontId(const std::string& familyName) const {
   if (familyName != loadedFamilyName_ || loaded_.empty()) return 0;
   return loaded_.front().fontId;

lib/EpdFont/SdCardFontManager.h

@@ -32,10 +32,6 @@ class SdCardFontManager {
   // Get name of currently loaded family (empty if none).
   const std::string& currentFamilyName() const { return loadedFamilyName_; };
 
-  // MEMFIX-PORT: font manager audit passthrough; portable
-  // Sum of loaded fonts' resident heap (see SdCardFont::reportMemory).
-  size_t reportMemory() const;
-
   // Point size that was actually loaded.
   // 0 if nothing loaded.
   uint8_t currentPointSize() const { return loadedPointSize_; };

lib/Epub/Epub.h

@@ -44,18 +44,6 @@ class Epub {
   }
   ~Epub() = default;
   std::string& getBasePath() { return contentBasePath; }
-  // MEMFIX-PORT: epub resident-bytes audit accessor; portable
-  // Approximate resident heap of the open book (audit): path strings, the CSS
-  // file list, and the parsed stylesheet. BookMetadataCache is file-backed
-  // (counts + HalFile handles) and contributes little.
-  size_t residentBytes() const {
-    size_t total = sizeof(Epub) + tocNcxItem.capacity() + tocNavItem.capacity() + filepath.capacity() +
-                   contentBasePath.capacity() + cachePath.capacity();
-    for (const auto& f : cssFiles) total += sizeof(f) + (f.capacity() > 15 ? f.capacity() : 0);
-    if (cssParser) total += cssParser->residentBytes();
-    return total;
-  }
-  size_t cssRuleCount() const { return cssParser ? cssParser->ruleCount() : 0; }
   bool load(bool buildIfMissing = true, bool skipLoadingCss = false);
   bool clearCache() const;
   void setupCacheDir() const;

lib/Epub/Epub/Page.cpp

@@ -173,10 +173,6 @@ std::unique_ptr<Page> Page::deserialize(HalFile& file) {
 
   uint16_t count;
   serialization::readPod(file, count);
-  // Reserve up front: growth-by-doubling needs old + new capacity live at once and
-  // reallocates repeatedly — a field crash (bad_alloc -> abort under -fno-exceptions)
-  // hit exactly this append path on a heavily fragmented heap.
-  page->elements.reserve(count);
 
   for (uint16_t i = 0; i < count; i++) {
     uint8_t tag;

lib/Epub/Epub/ParsedText.cpp

@@ -287,7 +287,30 @@ void ParsedText::addWord(std::string word, const EpdFontFamily::Style fontStyle,
     effectiveNoSpaceBefore = true;
   }
 
+  const auto ensureTokenCapacity = [&](const size_t additionalTokens) {
+    if (additionalTokens == 0) return;
+    const size_t requiredSize = words.size() + additionalTokens;
+    if (words.capacity() >= requiredSize) return;
+
+    size_t newCapacity = words.capacity();
+    if (newCapacity < 16) {
+      newCapacity = 16;
+    }
+    while (newCapacity < requiredSize) {
+      newCapacity *= 2;
+    }
+
+    words.reserve(newCapacity);
+    wordStyles.reserve(newCapacity);
+    wordContinues.reserve(newCapacity);
+    wordNoSpaceBefore.reserve(newCapacity);
+    wordIsFocusSuffix.reserve(newCapacity);
+  };
+
   if (auto breakOffsets = cjkCharacterBreakByteOffsets(word); !breakOffsets.empty()) {
+    // CJK-heavy paragraphs can push hundreds of tiny tokens quickly when CSS toggles
+    // inline styles. Reserve once up front to avoid repeated vector growth reallocations.
+    ensureTokenCapacity(breakOffsets.size() + 1);
     bool firstToken = true;
     size_t tokenStart = 0;
     for (const size_t breakOffset : breakOffsets) {
@@ -326,29 +349,8 @@ void ParsedText::addWord(std::string word, const EpdFontFamily::Style fontStyle,
 
   // --- FOCUS READING LOGIC BELOW ---
 
-  // Pre-reserve capacity to prevent mid-word heap reallocations.
-  size_t maxPossibleNewTokens = word.length();
-  size_t requiredSize = words.size() + maxPossibleNewTokens;
-
-  if (words.capacity() < requiredSize) {
-    // Emulate standard geometric growth (doubling) to ensure we don't reallocate on every word.
-    size_t newCapacity = words.capacity() * 2;
-
-    // Ensure the doubled capacity is actually enough for this specific word
-    if (newCapacity < requiredSize) {
-      newCapacity = requiredSize;
-    }
-    // Set a sensible minimum starting size so the first few words don't trigger tiny reallocations
-    if (newCapacity < 16) {
-      newCapacity = 16;
-    }
-
-    words.reserve(newCapacity);
-    wordStyles.reserve(newCapacity);
-    wordContinues.reserve(newCapacity);
-    wordNoSpaceBefore.reserve(newCapacity);
-    wordIsFocusSuffix.reserve(newCapacity);
-  }
+  // Worst case: a segment boundary on each byte (highly punctuated UTF-8 text).
+  ensureTokenCapacity(word.length());
 
   // Lambda helper to process and push individual sub-segments of the string
   // Use std::string_view to avoid heap allocations when slicing

lib/Epub/Epub/Section.h

@@ -72,7 +72,6 @@ class Section {
   // Builds write here and are swapped over filePath only on commit, so a prior
   // partial/finalized file stays readable while a rebuild is in progress.
   std::string binTmpPath() const { return filePath + ".part"; }
-
   std::unique_ptr<Page> loadPageAt(int page) const;
   // Read a page already laid out by the in-progress build (page < build LUT size), from
   // the partially-written tmp .bin without disturbing the build's write cursor.
@@ -132,20 +131,6 @@ class Section {
   // (covers finalized sections and partials from a previous session).
   std::optional<uint16_t> findAnchor(const std::string& anchor) const;
 
-  // MEMFIX-PORT: section resident-bytes audit accessor; portable
-  // Approximate resident heap for the audit log. Steady state (no build) a
-  // Section holds little beyond itself; during a build the page LUT and path
-  // strings dominate (the parser's internal footprint is not walked here).
-  size_t residentBytes() const {
-    size_t total = sizeof(Section) + filePath.capacity();
-    if (build_) {
-      total += sizeof(BuildContext) + build_->lut.capacity() * sizeof(PageLutEntry) +
-               build_->parsePath.capacity() + build_->contentBase.capacity() + build_->imageBasePath.capacity() +
-               build_->htmlPath.capacity() + build_->tmpHtmlPath.capacity();
-    }
-    return total;
-  }
-
   // True if this spine's unzipped HTML is already cached, so a build won't pay the (multi-second on a
   // giant spine) zip inflation. Lets the reader skip the indexing popup on a fast reopen/rebuild.
   bool hasHtmlCache() const;

lib/Epub/Epub/css/CssParser.cpp

@@ -431,6 +431,11 @@ CssStyle CssParser::parseDeclarations(std::string_view declBlock) {
 // Rule processing
 
 void CssParser::processRuleBlockWithStyle(std::string_view selectorGroup, const CssStyle& style) {
+  // Skip rules that don't define any supported properties to save RAM.
+  if (!style.defined.anySet()) {
+    return;
+  }
+
   // Check if we've reached the rule limit before processing
   if (rulesBySelector_.size() >= MAX_RULES) {
     LOG_DBG("CSS", "Reached max rules limit (%zu), stopping CSS parsing", MAX_RULES);

lib/Epub/Epub/css/CssParser.h

@@ -33,7 +33,7 @@
 class CssParser {
  public:
   // Bump when CSS cache format or rules change; section caches are invalidated when this changes
-  static constexpr uint8_t CSS_CACHE_VERSION = 7;
+  static constexpr uint8_t CSS_CACHE_VERSION = 8;
 
   explicit CssParser(std::string cachePath) : cachePath(std::move(cachePath)) {}
   ~CssParser() = default;
@@ -67,20 +67,6 @@ class CssParser {
    */
   [[nodiscard]] static CssStyle parseInlineStyle(std::string_view styleValue);
 
-  // MEMFIX-PORT: stylesheet resident-bytes audit accessor; portable
-  // Approximate resident heap of the parsed stylesheet, for the audit log.
-  // unordered_map cost model: bucket array + one node per rule (libstdc++ node
-  // overhead ~= 2 pointers + hash) + key string capacity when it exceeds SSO.
-  size_t residentBytes() const {
-    size_t total = rulesBySelector_.bucket_count() * sizeof(void*);
-    for (const auto& kv : rulesBySelector_) {
-      total += sizeof(void*) * 2 + sizeof(size_t);  // node overhead
-      total += sizeof(kv);
-      if (kv.first.capacity() > 15) total += kv.first.capacity();  // beyond SSO
-    }
-    return total;
-  }
-
   /**
    * Check if any rules have been loaded
    */

lib/Epub/Epub/parsers/ChapterHtmlSlimParser.cpp

@@ -22,6 +22,17 @@
 constexpr size_t MIN_SIZE_FOR_POPUP = 10 * 1024;  // 10KB
 constexpr size_t PARSE_BUFFER_SIZE = 1024;
 
+// This number comes from PR #73
+// If we have > 750 words buffered up, perform the layout and consume out all but the last line
+// There should be enough here to build out 1-2 full pages and doing this will free up a lot of
+// memory.
+// Spotted when reading Intermezzo, there are some really long text blocks in there.
+constexpr size_t TEXT_BLOCK_SOFT_FLUSH_WORDS = 750;
+
+// When CSS is enabled, flush earlier to save RAM. 320 is still more than enough to build a CJK
+// page at font size 14
+constexpr size_t TEXT_BLOCK_SOFT_FLUSH_WORDS_WITH_CSS = 320;
+
 // Hard cap on the number of anchor IDs recorded per chapter. Legitimate navigation
 // anchors (TOC entries, footnotes, cross-references) rarely exceed a few hundred per
 // chapter. A runaway count usually means a converter injected machine-generated IDs on
@@ -1155,12 +1166,14 @@ void XMLCALL ChapterHtmlSlimParser::characterData(void* userData, const XML_Char
     self->partWordBuffer[self->partWordBufferIndex++] = s[i];
   }
 
-  // If we have > 750 words buffered up, perform the layout and consume out all but the last line
-  // There should be enough here to build out 1-2 full pages and doing this will free up a lot of
-  // memory.
-  // Spotted when reading Intermezzo, there are some really long text blocks in there.
-  if (self->currentTextBlock->size() > 750) {
-    LOG_DBG("EHP", "Text block too long, splitting into multiple pages");
+  // Keep token growth bounded: CSS-heavy spans can fragment text into many tiny
+  // words, so flush earlier when embedded CSS is active. We still keep the
+  // "exclude last line" behavior to preserve paragraph flow across chunks.
+  const size_t blockWordCount = self->currentTextBlock->size();
+  const size_t softFlushThreshold =
+      self->embeddedStyle ? TEXT_BLOCK_SOFT_FLUSH_WORDS_WITH_CSS : TEXT_BLOCK_SOFT_FLUSH_WORDS;
+  if (blockWordCount > softFlushThreshold) {
+    LOG_DBG("EHP", "Text block soft flush (%u words)", static_cast<unsigned>(blockWordCount));
     const int horizontalInset = self->currentTextBlock->getBlockStyle().totalHorizontalInset();
     const uint16_t effectiveWidth = (horizontalInset < self->viewportWidth)
                                         ? static_cast<uint16_t>(self->viewportWidth - horizontalInset)

lib/GfxRenderer/FontCacheManager.cpp

@@ -62,14 +62,7 @@ void FontCacheManager::resetStats() {
 bool FontCacheManager::isScanning() const { return scanMode_ == ScanMode::Scanning; }
 
 void FontCacheManager::recordText(const char* text, int fontId, EpdFontFamily::Style style) {
-  if (!text) return;
-  const size_t remaining = (scanTextLen_ < SCAN_TEXT_CAPACITY - 1) ? (SCAN_TEXT_CAPACITY - 1 - scanTextLen_) : 0;
-  if (remaining > 0) {
-    const size_t textLen = strnlen(text, remaining);
-    memcpy(scanText_ + scanTextLen_, text, textLen);
-    scanTextLen_ += textLen;
-    scanText_[scanTextLen_] = '\0';
-  }
+  scanText_ += text;
   if (scanFontId_ < 0) scanFontId_ = fontId;
   const uint8_t baseStyle = static_cast<uint8_t>(style) & 0x03;
   const unsigned char* p = reinterpret_cast<const unsigned char*>(text);
@@ -87,15 +80,15 @@ FontCacheManager::PrewarmScope::PrewarmScope(FontCacheManager& manager) : manage
   manager_->scanMode_ = ScanMode::Scanning;
   manager_->clearCache();
   manager_->resetStats();
-  manager_->scanTextLen_ = 0;
-  manager_->scanText_[0] = '\0';
+  manager_->scanText_.clear();
+  manager_->scanText_.reserve(2048);  // Pre-allocate to avoid heap fragmentation from repeated concat
   memset(manager_->scanStyleCounts_, 0, sizeof(manager_->scanStyleCounts_));
   manager_->scanFontId_ = -1;
 }
 
 void FontCacheManager::PrewarmScope::endScanAndPrewarm() {
   manager_->scanMode_ = ScanMode::None;
-  if (manager_->scanTextLen_ == 0) return;
+  if (manager_->scanText_.empty()) return;
 
   // Build style bitmask from all styles that appeared during the scan
   uint8_t styleMask = 0;
@@ -104,10 +97,11 @@ void FontCacheManager::PrewarmScope::endScanAndPrewarm() {
   }
   if (styleMask == 0) styleMask = 1;  // default to regular
 
-  manager_->prewarmCache(manager_->scanFontId_, manager_->scanText_, styleMask);
+  manager_->prewarmCache(manager_->scanFontId_, manager_->scanText_.c_str(), styleMask);
 
-  manager_->scanTextLen_ = 0;
-  manager_->scanText_[0] = '\0';
+  // Free scan string memory
+  manager_->scanText_.clear();
+  manager_->scanText_.shrink_to_fit();
 }
 
 FontCacheManager::PrewarmScope::~PrewarmScope() {

lib/GfxRenderer/FontCacheManager.h

@@ -2,9 +2,9 @@
 
 #include <EpdFontFamily.h>
 
-#include <cstddef>
 #include <cstdint>
 #include <map>
+#include <string>
 
 class FontDecompressor;
 class SdCardFont;
@@ -51,9 +51,7 @@ class FontCacheManager {
 
   enum class ScanMode : uint8_t { None, Scanning };
   ScanMode scanMode_ = ScanMode::None;
-  static constexpr size_t SCAN_TEXT_CAPACITY = 2048;
-  char scanText_[SCAN_TEXT_CAPACITY] = {};
-  size_t scanTextLen_ = 0;
+  std::string scanText_;
   uint32_t scanStyleCounts_[4] = {};
   int scanFontId_ = -1;
 };

lib/GfxRenderer/GfxRenderer.cpp

@@ -1451,20 +1451,6 @@ void GfxRenderer::displayBuffer(const HalDisplay::RefreshMode refreshMode) const
   display.displayBuffer(refreshMode, fadingFix);
 }
 
-void GfxRenderer::displayBufferAsync(const HalDisplay::RefreshMode refreshMode) const {
-  // The async path has no turn-off-screen hook, which the sunlight fading fix
-  // relies on; keep those users on the blocking path.
-  if (fadingFix) {
-    display.displayBuffer(refreshMode, fadingFix);
-    return;
-  }
-  display.displayBufferAsync(refreshMode);
-}
-
-void GfxRenderer::waitRefreshComplete() const { display.waitRefreshComplete(); }
-
-bool GfxRenderer::supportsAsyncRefresh() const { return !fadingFix && display.supportsAsyncRefresh(); }
-
 std::string GfxRenderer::truncatedText(const int fontId, const char* text, const int maxWidth,
                                        const EpdFontFamily::Style style) const {
   if (!text || maxWidth <= 0) return "";

lib/GfxRenderer/GfxRenderer.h

@@ -135,17 +135,6 @@ class GfxRenderer {
   int getScreenWidth() const;
   int getScreenHeight() const;
   void displayBuffer(HalDisplay::RefreshMode refreshMode = HalDisplay::FAST_REFRESH) const;
-  // Non-blocking refresh: starts the waveform and returns so CPU work (e.g.
-  // grayscale strip rendering) can overlap the panel's refresh time. The
-  // framebuffer must stay untouched until waitRefreshComplete(). Falls back to
-  // a blocking refresh when fadingFix is enabled or the panel lacks deferral
-  // support. See HalDisplay::displayBufferAsync for the baseline contract.
-  void displayBufferAsync(HalDisplay::RefreshMode refreshMode = HalDisplay::FAST_REFRESH) const;
-  void waitRefreshComplete() const;
-  // True when displayBufferAsync() genuinely overlaps: panel defers and
-  // fadingFix isn't forcing the blocking path. Callers can skip overlap
-  // scaffolding (e.g. whole-plane grayscale buffers) when false.
-  bool supportsAsyncRefresh() const;
   // EXPERIMENTAL: Windowed update - display only a rectangular region
   // void displayWindow(int x, int y, int width, int height) const;
   void invertScreen() const;

lib/I18n/translations/arabic.yaml

@@ -0,0 +1,394 @@
+_language_name: "العربية"
+_language_code: "AR"
+_order: "28"
+
+STR_CROSSPOINT: "CrossPoint"
+STR_BOOTING: "جاري بدء التشغيل"
+STR_SLEEPING: "وضع السكون"
+STR_ENTERING_SLEEP: "جاري الدخول في وضع السكون"
+STR_BROWSE_FILES: "تصفح الملفات"
+STR_FILE_TRANSFER: "نقل الملفات"
+STR_SETTINGS_TITLE: "الإعدادات"
+STR_CONTINUE_READING: "متابعة القراءة"
+STR_NO_OPEN_BOOK: "لا يوجد كتاب مفتوح"
+STR_START_READING: "ابدأ القراءة أدناه"
+STR_NO_FILES_FOUND: "لم يتم العثور على ملفات"
+STR_SELECT_CHAPTER: "اختر الفصل"
+STR_NO_CHAPTERS: "لا توجد فصول"
+STR_END_OF_BOOK: "نهاية الكتاب"
+STR_EMPTY_CHAPTER: "فصل فارغ"
+STR_INDEXING: "جاري الفهرسة"
+STR_INDEX_FAILED: "فشلت الفهرسة - كتاب غير صالح"
+STR_MEMORY_ERROR: "خطأ في الذاكرة"
+STR_PAGE_LOAD_ERROR: "خطأ في تحميل الصفحة"
+STR_EMPTY_FILE: "ملف فارغ"
+STR_OUT_OF_BOUNDS: "خارج النطاق"
+STR_LOADING: "جاري التحميل..."
+STR_LOADING_POPUP: "جاري التحميل"
+STR_WIFI_NETWORKS: "شبكات Wi-Fi"
+STR_NO_NETWORKS: "لم يتم العثور على شبكات"
+STR_NETWORKS_FOUND: "تم العثور على %zu شبكة"
+STR_SCANNING: "جاري البحث..."
+STR_FINDING_SAVED_WIFI: "جاري البحث عن شبكة Wi-Fi محفوظة..."
+STR_CONNECTING: "جاري الاتصال..."
+STR_CONNECTING_SAVED_WIFI: "جاري الاتصال بشبكة Wi-Fi محفوظة..."
+STR_SHOW_NETWORKS: "عرض"
+STR_CONNECTED: "تم الاتصال!"
+STR_CONNECTION_FAILED: "فشل الاتصال"
+STR_FORGET_NETWORK: "نسيان هذه الشبكة؟"
+STR_SAVE_PASSWORD: "حفظ كلمة المرور للمرة القادمة؟"
+STR_PRESS_OK_SCAN: "اضغط موافق لإعادة البحث"
+STR_JOIN_NETWORK: "الانضمام إلى شبكة"
+STR_CREATE_HOTSPOT: "إنشاء نقطة اتصال"
+STR_JOIN_DESC: "الاتصال بشبكة Wi-Fi موجودة"
+STR_HOTSPOT_DESC: "إنشاء شبكة Wi-Fi يمكن للآخرين الانضمام إليها"
+STR_STARTING_HOTSPOT: "جاري تشغيل نقطة الاتصال..."
+STR_HOTSPOT_MODE: "وضع نقطة الاتصال"
+STR_CONNECT_WIFI_HINT: "قم بتوصيل جهازك بشبكة Wi-Fi هذه"
+STR_OPEN_URL_HINT: "افتح هذا العنوان في المتصفح"
+STR_OR_HTTP_PREFIX: "أو http://"
+STR_SCAN_QR_HINT: "أو امسح رمز QR بهاتفك:"
+STR_CALIBRE_WIRELESS: "اتصال Calibre اللاسلكي"
+STR_NETWORK_LEGEND: "* = مشفرة | + = محفوظة"
+STR_MAC_ADDRESS: "عنوان MAC:"
+STR_CHECKING_WIFI: "جاري فحص Wi-Fi..."
+STR_ENTER_WIFI_PASSWORD: "أدخل كلمة مرور الشبكة"
+STR_ADD_HIDDEN_NETWORK: "إضافة شبكة مخفية..."
+STR_ENTER_WIFI_SSID: "أدخل اسم الشبكة (SSID)"
+STR_TO_PREFIX: "إلى "
+STR_CALIBRE_RECEIVING: "جاري الاستلام: "
+STR_CALIBRE_RECEIVED: "تم الاستلام: "
+STR_CALIBRE_INSTRUCTION_1: "1) قم بتثبيت إضافة CrossPoint Reader"
+STR_CALIBRE_INSTRUCTION_2: "2) اتصل بنفس شبكة Wi-Fi"
+STR_CALIBRE_INSTRUCTION_3: "3) في Calibre: اختر \"إرسال إلى الجهاز\""
+STR_CALIBRE_INSTRUCTION_4: "اترك هذه الشاشة مفتوحة أثناء الإرسال"
+STR_CAT_DISPLAY: "الشاشة"
+STR_CAT_READER: "القراءة"
+STR_CAT_CONTROLS: "الأزرار"
+STR_CAT_SYSTEM: "النظام"
+STR_SLEEP_SCREEN: "شاشة السكون"
+STR_QUICK_RESUME_TIMEOUT: "استئناف سريع بعد المهلة"
+STR_SLEEP_COVER_MODE: "عرض الغلاف في وضع السكون"
+STR_HIDE_BATTERY: "إخفاء نسبة البطارية"
+STR_EXTRA_SPACING: "تباعد إضافي بين الفقرات"
+STR_TEXT_AA: "تنعيم حواف النص"
+STR_IMAGES: "الصور"
+STR_IMAGES_DISPLAY: "عرض"
+STR_IMAGES_PLACEHOLDER: "عنصر نائب"
+STR_IMAGES_SUPPRESS: "إخفاء"
+STR_EOB_HOME: "الرئيسية"
+STR_EOB_CONTINUE_WITH: "المتابعة إلى"
+STR_SHORT_PWR_BTN: "ضغطة قصيرة على زر التشغيل"
+STR_ORIENTATION: "اتجاه القراءة"
+STR_SIDE_BTN_LAYOUT: "تخطيط الأزرار الجانبية (أثناء القراءة)"
+STR_FRONT_BTN_FOLLOW_ORIENTATION: "تدوير الأزرار الأمامية مع الشاشة"
+STR_LONG_PRESS_BEHAVIOR: "سلوك الضغطة الطويلة"
+STR_LONG_PRESS_BEHAVIOR_OFF: "إيقاف"
+STR_LONG_PRESS_BEHAVIOR_SKIP: "تخطي الفصل"
+STR_LONG_PRESS_BEHAVIOR_ORIENTATION: "تغيير الاتجاه"
+STR_LONG_PRESS_MENU: "قائمة الضغطة الطويلة"
+STR_FONT_PREVIEW_TEXT: "نص حكيم له سر قاطع وذو شأن عظيم مكتوب على ثوب أخضر ومغلف بجلد أزرق"
+STR_FONT_FAMILY: "خط القراءة"
+STR_FONT_SIZE: "حجم الخط"
+STR_LINE_SPACING: "تباعد الأسطر"
+STR_SCREEN_MARGIN: "هوامش شاشة القراءة"
+STR_PARA_ALIGNMENT: "محاذاة الفقرات"
+STR_HYPHENATION: "تقسيم الكلمات"
+STR_TIME_TO_SLEEP: "مهلة الدخول في السكون"
+STR_SHOW_HIDDEN_FILES: "عرض الملفات المخفية"
+STR_REMOVE_READ_FROM_RECENTS: "إزالة الكتب المقروءة من قائمة الكتب الأخيرة"
+STR_MOVE_FINISHED_TO_READ: "نقل الكتب المنتهية إلى مجلد المقروءة"
+STR_REFRESH_FREQ: "معدل تحديث الشاشة"
+STR_KOREADER_SYNC: "مزامنة KOReader"
+STR_CHECK_UPDATES: "التحقق من التحديثات"
+STR_LANGUAGE: "اللغة"
+STR_CLEAR_READING_CACHE: "مسح ذاكرة القراءة المؤقتة"
+STR_USERNAME: "اسم المستخدم"
+STR_PASSWORD: "كلمة المرور"
+STR_SYNC_SERVER_URL: "عنوان خادم المزامنة"
+STR_DOCUMENT_MATCHING: "مطابقة المستندات"
+STR_SEND_METADATA: "إرسال البيانات الوصفية للمستند"
+STR_AUTHENTICATE: "تسجيل الدخول"
+STR_KOREADER_USERNAME: "اسم مستخدم KOReader"
+STR_KOREADER_PASSWORD: "كلمة مرور KOReader"
+STR_FILENAME: "اسم الملف"
+STR_BINARY: "ثنائي"
+STR_SET_CREDENTIALS_FIRST: "أدخل بيانات الاعتماد أولا"
+STR_WIFI_CONN_FAILED: "فشل الاتصال بالشبكة"
+STR_AUTHENTICATING: "جاري التحقق..."
+STR_AUTH_SUCCESS: "تم تسجيل الدخول بنجاح!"
+STR_KOREADER_AUTH: "تسجيل الدخول إلى KOReader"
+STR_SYNC_READY: "مزامنة KOReader جاهزة للاستخدام"
+STR_AUTH_FAILED: "فشل تسجيل الدخول"
+STR_DONE: "تم"
+STR_CLEAR_CACHE_WARNING_1: "سيؤدي هذا إلى مسح جميع بيانات الكتب المخزنة."
+STR_CLEAR_CACHE_WARNING_2: "سيتم فقدان كل تقدم القراءة!"
+STR_CLEAR_CACHE_WARNING_3: "ستحتاج الكتب إلى إعادة فهرسة"
+STR_CLEAR_CACHE_WARNING_4: "عند فتحها مرة أخرى."
+STR_CLEARING_CACHE: "جاري مسح الذاكرة المؤقتة..."
+STR_CACHE_CLEARED: "تم مسح الذاكرة المؤقتة"
+STR_ITEMS_REMOVED: "عناصر تمت إزالتها"
+STR_FAILED_LOWER: "فشل"
+STR_CLEAR_CACHE_FAILED: "فشل مسح الذاكرة المؤقتة"
+STR_CHECK_SERIAL_OUTPUT: "راجع مخرجات المنفذ التسلسلي للتفاصيل"
+STR_DARK: "داكن"
+STR_LIGHT: "فاتح"
+STR_CUSTOM: "مخصص"
+STR_COVER: "الغلاف"
+STR_NONE_OPT: "بدون"
+STR_FIT: "ملاءمة"
+STR_CROP: "قص"
+STR_NEVER: "أبدا"
+STR_IN_READER: "أثناء القراءة"
+STR_ALWAYS: "دائما"
+STR_IGNORE: "تجاهل"
+STR_SLEEP: "سكون"
+STR_PAGE_TURN: "تقليب الصفحة"
+STR_FORCE_REFRESH: "تحديث الشاشة"
+STR_PORTRAIT: "عمودي"
+STR_LANDSCAPE_CW: "أفقي (يمين)"
+STR_INVERTED: "عكس الألوان"
+STR_ORIENTATION_INVERTED: "عمودي 180°"
+STR_LANDSCAPE_CCW: "أفقي (يسار)"
+STR_PREV_NEXT: "السابق/التالي"
+STR_NEXT_PREV: "التالي/السابق"
+STR_KOSYNC: "KOSync"
+STR_BOOKMARK_OPTION: "إشارة مرجعية"
+STR_DISABLED: "معطل"
+STR_NOTO_SERIF: "Noto Serif"
+STR_NOTO_SANS: "Noto Sans"
+STR_SMALL: "صغير"
+STR_MEDIUM: "متوسط"
+STR_LARGE: "كبير"
+STR_X_LARGE: "كبير جدا"
+STR_TIGHT: "ضيق"
+STR_NORMAL: "عادي"
+STR_WIDE: "واسع"
+STR_JUSTIFY: "ضبط الطرفين"
+STR_ALIGN_LEFT: "يسار"
+STR_CENTER: "وسط"
+STR_ALIGN_RIGHT: "يمين"
+STR_PAGES_1: "صفحة واحدة"
+STR_PAGES_5: "5 صفحات"
+STR_PAGES_10: "10 صفحات"
+STR_PAGES_15: "15 صفحة"
+STR_PAGES_30: "30 صفحة"
+STR_UPDATE: "تحديث"
+STR_CHECKING_UPDATE: "جاري التحقق من التحديثات..."
+STR_NEW_UPDATE: "يتوفر تحديث جديد!"
+STR_CURRENT_VERSION: "الإصدار الحالي: "
+STR_NEW_VERSION: "الإصدار الجديد: "
+STR_UPDATING: "جاري التحديث..."
+STR_NO_UPDATE: "لا يتوفر تحديث"
+STR_UPDATE_FAILED: "فشل التحديث"
+STR_UPDATE_COMPLETE: "اكتمل التحديث"
+STR_POWER_ON_HINT: "اضغط مطولا على زر التشغيل لتشغيل الجهاز من جديد"
+STR_RESTARTING_HINT: "جاري إعادة التشغيل... إذا لم يعمل الجهاز، اضغط مطولا على زر التشغيل لعدة ثوان."
+STR_NO_ENTRIES: "لم يتم العثور على عناصر"
+STR_DOWNLOADING: "جاري التنزيل..."
+STR_DOWNLOAD_FAILED: "فشل التنزيل"
+STR_ERROR_MSG: "خطأ:"
+STR_UNNAMED: "بدون اسم"
+STR_HOLD_OPEN_TO_DELETE: "اضغط مطولا على فتح للحذف"
+STR_NO_SERVER_URL: "لم يتم تحديد عنوان الخادم"
+STR_FETCH_FEED_FAILED: "فشل جلب القائمة"
+STR_PARSE_FEED_FAILED: "فشل تحليل القائمة"
+STR_NEXT_PAGE: "الصفحة التالية"
+STR_PREV_PAGE: "الصفحة السابقة"
+STR_NETWORK_PREFIX: "الشبكة: "
+STR_IP_ADDRESS_PREFIX: "عنوان IP: "
+STR_ERROR_GENERAL_FAILURE: "خطأ: فشل عام"
+STR_ERROR_NETWORK_NOT_FOUND: "خطأ: الشبكة غير موجودة"
+STR_ERROR_CONNECTION_TIMEOUT: "خطأ: انتهت مهلة الاتصال"
+STR_SD_CARD: "بطاقة SD"
+STR_BACK: "رجوع »"
+STR_EXIT: "خروج »"
+STR_HOME: "الرئيسية »"
+STR_SELECT: "اختيار"
+STR_SELECTED: "محدد"
+STR_TOGGLE: "تبديل"
+STR_TOGGLE_BOOKMARK: "إضافة/إزالة إشارة مرجعية"
+STR_CONFIRM: "تأكيد"
+STR_CANCEL: "إلغاء"
+STR_CONNECT: "اتصال"
+STR_OPEN: "فتح"
+STR_DOWNLOAD: "تنزيل"
+STR_RETRY: "إعادة المحاولة"
+STR_YES: "نعم"
+STR_NO: "لا"
+STR_SHOW: "عرض"
+STR_HIDE: "إخفاء"
+STR_STATE_ON: "تشغيل"
+STR_STATE_OFF: "إيقاف"
+STR_NOT_SET: "غير محدد"
+STR_DIR_LEFT: "يسار"
+STR_DIR_RIGHT: "يمين"
+STR_DIR_UP: "أعلى"
+STR_DIR_DOWN: "أسفل"
+STR_OK_BUTTON: "موافق"
+STR_SLEEP_COVER_FILTER: "مرشح غلاف شاشة السكون"
+STR_FILTER_CONTRAST: "التباين"
+STR_CUSTOMISE_STATUS_BAR: "تخصيص شريط الحالة"
+STR_CHAPTER_PAGE_COUNT: "عدد صفحات الفصل"
+STR_BOOK_PROGRESS_PERCENTAGE: "نسبة التقدم في الكتاب"
+STR_PROGRESS_BAR: "شريط التقدم"
+STR_PROGRESS_BAR_THICKNESS: "سمك شريط التقدم"
+STR_PROGRESS_BAR_THIN: "رفيع"
+STR_PROGRESS_BAR_MEDIUM: "متوسط"
+STR_PROGRESS_BAR_THICK: "سميك"
+STR_BOOK: "الكتاب"
+STR_CHAPTER: "الفصل"
+STR_EXAMPLE_CHAPTER: "الفصل 21"
+STR_EXAMPLE_BOOK: "عنوان الكتاب"
+STR_PREVIEW: "معاينة"
+STR_TITLE: "العنوان"
+STR_BATTERY: "البطارية"
+STR_XTC_STATUS_BAR: "شريط حالة XTC"
+STR_BOTTOM: "أسفل"
+STR_TOP: "أعلى"
+STR_CLOCK: "الساعة"
+STR_CLOCK_UTC_OFFSET: "فرق التوقيت عن UTC"
+STR_CLOCK_FORMAT: "تنسيق الساعة"
+STR_CLOCK_FORMAT_24H: "24 ساعة"
+STR_CLOCK_FORMAT_12H: "12 ساعة"
+STR_CURRENT_TIME: "الوقت الحالي:"
+STR_NEXT_FIELD: "التالي"
+STR_CLOCK_SYNC: "مزامنة الساعة"
+STR_CLOCK_SYNC_NOW: "مزامنة الساعة الآن"
+STR_CLOCK_SYNCING: "جاري المزامنة عبر NTP..."
+STR_CLOCK_SYNC_OK: "تمت مزامنة الساعة"
+STR_CLOCK_SYNC_FAIL: "فشلت المزامنة"
+STR_CLOCK_SYNC_NO_WIFI: "لا يوجد اتصال Wi-Fi"
+STR_CLOCK_SYNC_NO_WIFI_HINT: "اتصل بشبكة Wi-Fi أولا، ثم حاول مرة أخرى."
+STR_CLOCK_SYNCED: "تمت مزامنة الساعة"
+STR_UI_THEME: "مظهر الواجهة"
+STR_THEME_CLASSIC: "كلاسيكي"
+STR_THEME_LYRA: "Lyra"
+STR_THEME_ROUNDEDRAFF: "RoundedRaff"
+STR_THEME_LYRA_EXTENDED: "Lyra موسع"
+STR_SUNLIGHT_FADING_FIX: "إصلاح بهتان الشاشة في الشمس"
+STR_REMAP_FRONT_BUTTONS: "تغيير وظائف الأزرار الأمامية"
+STR_BOOKMARKS: "الإشارات المرجعية"
+STR_BOOKMARK_ADDED: "تمت إضافة الإشارة المرجعية."
+STR_BOOKMARK_REMOVED: "تمت إزالة الإشارة المرجعية."
+STR_OPDS_BROWSER: "متصفح OPDS"
+STR_SEARCH: "بحث"
+STR_COVER_CUSTOM: "الغلاف + مخصص"
+STR_QUICK_RESUME: "استئناف سريع"
+STR_MENU_RECENT_BOOKS: "الكتب الأخيرة"
+STR_REMOVE_FROM_RECENTS: "إزالة من الكتب الأخيرة؟"
+STR_NO_RECENT_BOOKS: "لا توجد كتب أخيرة"
+STR_CALIBRE_DESC: "استخدم النقل اللاسلكي من Calibre"
+STR_FORGET_AND_REMOVE: "نسيان الشبكة وحذف كلمة المرور المحفوظة؟"
+STR_FORGET_BUTTON: "نسيان"
+STR_CALIBRE_STARTING: "جاري تشغيل Calibre..."
+STR_CALIBRE_SETUP: "الإعداد"
+STR_CALIBRE_STATUS: "الحالة"
+STR_CLEAR_BUTTON: "مسح"
+STR_DEFAULT_VALUE: "افتراضي"
+STR_REMAP_PROMPT: "اضغط زرا أماميا لكل وظيفة"
+STR_UNASSIGNED: "غير معين"
+STR_ALREADY_ASSIGNED: "معين مسبقا"
+STR_REMAP_RESET_HINT: "الزر الجانبي العلوي: استعادة التخطيط الافتراضي"
+STR_REMAP_CANCEL_HINT: "الزر الجانبي السفلي: إلغاء التغيير"
+STR_HW_BACK_LABEL: "رجوع (الزر 1)"
+STR_HW_CONFIRM_LABEL: "تأكيد (الزر 2)"
+STR_HW_LEFT_LABEL: "يسار (الزر 3)"
+STR_HW_RIGHT_LABEL: "يمين (الزر 4)"
+STR_GO_TO_PERCENT: "الانتقال إلى نسبة %"
+STR_GO_HOME_BUTTON: "العودة إلى الرئيسية"
+STR_SYNC_PROGRESS: "مزامنة التقدم"
+STR_DELETE_CACHE: "حذف ذاكرة الكتاب المؤقتة"
+STR_DELETE: "حذف"
+STR_CONFIRM_DELETE_BOOKMARK: "حذف هذه الإشارة المرجعية؟"
+STR_DISPLAY_QR: "عرض الصفحة كرمز QR"
+STR_CHAPTER_PREFIX: "الفصل: "
+STR_PAGES_SEPARATOR: " صفحات  |  "
+STR_BOOK_PREFIX: "الكتاب: "
+STR_CALIBRE_URL_HINT: "في Calibre، أضف /opds إلى العنوان"
+STR_SYNCING_TIME: "جاري مزامنة الوقت..."
+STR_CALC_HASH: "جاري حساب بصمة المستند..."
+STR_HASH_FAILED: "فشل حساب بصمة المستند"
+STR_FETCH_PROGRESS: "جاري جلب التقدم من الخادم..."
+STR_UPLOAD_PROGRESS: "جاري رفع التقدم..."
+STR_NO_CREDENTIALS_MSG: "لم يتم إعداد بيانات الاعتماد"
+STR_KOREADER_SETUP_HINT: "قم بإعداد حساب KOReader في الإعدادات"
+STR_PROGRESS_FOUND: "تم العثور على تقدم سابق!"
+STR_REMOTE_LABEL: "الخادم:"
+STR_LOCAL_LABEL: "الجهاز:"
+STR_PAGE_OVERALL_FORMAT: "صفحة %d، %.2f%% إجمالا"
+STR_PAGE_TOTAL_OVERALL_FORMAT: "صفحة %d من %d، %.2f%% إجمالا"
+STR_DEVICE_FROM_FORMAT: "  من: %s"
+STR_APPLY_REMOTE: "استخدام تقدم الخادم"
+STR_UPLOAD_LOCAL: "رفع التقدم المحلي"
+STR_NO_REMOTE_MSG: "لا يوجد تقدم على الخادم"
+STR_UPLOAD_PROMPT: "رفع الموضع الحالي؟"
+STR_UPLOAD_SUCCESS: "تم رفع التقدم!"
+STR_SYNC_FAILED_MSG: "فشلت المزامنة"
+STR_SAVE_PROGRESS_FAILED: "تعذر حفظ التقدم"
+STR_SECTION_PREFIX: "القسم "
+STR_UPLOAD: "رفع"
+STR_BOOK_S_STYLE: "تنسيق الكتاب الأصلي"
+STR_EMBEDDED_STYLE: "التنسيق المضمن"
+STR_FOCUS_READING: "قراءة مركزة"
+STR_OPDS_SERVER_URL: "عنوان خادم OPDS"
+STR_PWR_BTN_FOOTNOTE_BACK: "عودة سريعة من الحواشي"
+STR_SET_SLEEP_COVER: "تعيين الغلاف"
+STR_FOOTNOTES: "الحواشي"
+STR_NO_FOOTNOTES: "لا توجد حواش في هذه الصفحة"
+STR_LINK: "[رابط]"
+STR_SCREENSHOT_BUTTON: "التقاط لقطة شاشة"
+STR_SLEEP_TIMER_VALUE_FORMAT: "%u دقيقة"
+STR_SLEEP_NEVER: "أبدا"
+STR_STEP_HINT_FRONT: "الأزرار الأمامية:"
+STR_STEP_HINT_SIDE: "الأزرار الجانبية:"
+STR_ADD_SERVER: "إضافة خادم"
+STR_SERVER_NAME: "اسم الخادم"
+STR_NO_SERVERS: "لم يتم إعداد خوادم OPDS"
+STR_DELETE_SERVER: "حذف الخادم"
+STR_OPDS_SERVERS: "خوادم OPDS"
+STR_AUTO_TURN_ENABLED: "التقليب التلقائي مفعل: "
+STR_AUTO_TURN_PAGES_PER_MIN: "التقليب التلقائي (صفحات في الدقيقة)"
+STR_MANAGE_FONTS: "إدارة الخطوط"
+STR_FONT_BROWSER: "متصفح الخطوط"
+STR_LOADING_FONT_LIST: "جاري تحميل قائمة الخطوط..."
+STR_NO_FONTS_AVAILABLE: "لا تتوفر خطوط"
+STR_FONT_INSTALLED: "تم تثبيت الخط!"
+STR_FONT_INSTALL_FAILED: "فشل تثبيت الخط"
+STR_INSTALLED: "مثبت"
+STR_DOWNLOAD_ALL: "تنزيل الكل"
+STR_UPDATE_ALL: "تحديث الكل"
+STR_UPDATE_AVAILABLE: "تحديث"
+STR_CRASH_TITLE: "تعطل النظام"
+STR_CRASH_DESCRIPTION: "تم حفظ تقرير مفصل في الملف crash_report.txt. يرجى إرفاق هذا الملف عند الإبلاغ عن المشكلة."
+STR_CRASH_REASON: "سبب التعطل:"
+STR_CRASH_NO_REASON: "(لم يتم تسجيل سبب)"
+STR_TILT_PAGE_TURN: "تقليب الصفحة بالإمالة"
+STR_KB_HINT_MOVE_CURSOR: "اضغط زر اليمين أو اليسار لتحريك المؤشر"
+STR_KB_HINT_RETURN_CURSOR: "اضغط زر اليسار للعودة إلى موضع المؤشر"
+STR_KB_HINT_HIDE_PASSWORD: "اضغط مطولا على زر اليمين ثم اضغط [***] لإخفاء كلمة المرور"
+STR_KB_HINT_SHOW_PASSWORD: "اضغط مطولا على زر اليمين ثم اضغط [abc] لإظهار كلمة المرور"
+STR_KB_HINT_TOGGLE_HIDE_PASSWORD: "اضغط [***] لإخفاء كلمة المرور"
+STR_KB_HINT_TOGGLE_SHOW_PASSWORD: "اضغط [abc] لإظهار كلمة المرور"
+STR_KB_HINT_EDIT_ENTRY: "اضغط مطولا على زر الأعلى للتعديل"
+STR_KB_TIPS: "نصائح:"
+STR_KB_HINT_RETURN_KEYBOARD: "اضغط زر الأسفل للعودة إلى لوحة المفاتيح"
+STR_KB_HINT_EXIT_URL_MODE: "اضغط ABC للخروج من وضع URL"
+STR_KB_HINT_CLEAR_TEXT: "اضغط مطولا على DEL لمسح كل النص"
+STR_KB_HINT_SECONDARY_CHAR: "اضغط مطولا على زر الاختيار للحرف الثانوي"
+STR_KB_HINT_UPPER_SECONDARY: "اضغط مطولا على زر الاختيار للحرف الكبير أو الثانوي"
+STR_KB_HINT_LOWER_SECONDARY: "اضغط مطولا على زر الاختيار للحرف الصغير أو الثانوي"
+STR_KB_HINT_URL_SNIPPETS: "اضغط URL للاختصارات"
+STR_SD_FIRMWARE_UPDATE: "تحديث البرنامج الثابت من بطاقة SD"
+STR_SELECT_FIRMWARE_FILE: "اختر ملف البرنامج الثابت (.bin)"
+STR_NO_BIN_FILES: "لم يتم العثور على ملفات .bin"
+STR_VALIDATING_FIRMWARE: "جاري التحقق من البرنامج الثابت..."
+STR_INVALID_FIRMWARE: "ملف برنامج ثابت غير صالح"
+STR_FIRMWARE_TOO_LARGE: "البرنامج الثابت أكبر من القسم المخصص له"
+STR_FIRMWARE_TOO_SMALL: "ملف البرنامج الثابت صغير جدا"
+STR_FIRMWARE_UPDATE_PROMPT: "تحديث البرنامج الثابت؟"
+STR_FIRMWARE_FILE_OPEN_FAILED: "تعذر فتح الملف"
+STR_FIRMWARE_WRITE_FAILED: "فشلت كتابة البرنامج الثابت"
+STR_FIRMWARE_UPDATE_DO_NOT_POWER_OFF: "لا تطفئ الجهاز!"
+STR_RECOVERY_MODE: "وضع الاستعادة"
+STR_RECOVERY_MODE_HINT: "ضع الملف firmware.bin في المجلد الرئيسي لبطاقة SD ثم اختره"

lib/I18n/translations/belarusian.yaml

@@ -298,6 +298,11 @@ STR_SLEEP_TIMER_VALUE_FORMAT: "%u хв"
 STR_SLEEP_NEVER: "Ніколі"
 STR_STEP_HINT_FRONT: "Пярэднія кнопкі:"
 STR_STEP_HINT_SIDE: "Бакавыя кнопкі:"
+STR_OPDS_DOWNLOAD_FOLDER: "Папка для спампоўкі"
+STR_OPDS_FILENAME_FORMAT: "Фармат назвы файла"
+STR_FMT_AUTHOR_TITLE: "Аўтар - Назва"
+STR_FMT_TITLE_AUTHOR: "Назва - Аўтар"
+STR_FMT_TITLE: "Назва"
 STR_AUTO_TURN_ENABLED: "Аўтаперагортванне: "
 STR_AUTO_TURN_PAGES_PER_MIN: "Аўтаперагортванне (старонак за хвіліну)"
 STR_TILT_PAGE_TURN: "Перагортванне нахілам"

lib/I18n/translations/bosnian.yaml

@@ -0,0 +1,393 @@
+_language_name: "Bosanski"
+_language_code: "BS"
+_order: "29"
+STR_CROSSPOINT: "CrossPoint"
+STR_BOOTING: "POKRETANJE"
+STR_SLEEPING: "REŽIM MIROVANJA"
+STR_ENTERING_SLEEP: "Prelazak u režim mirovanja"
+STR_BROWSE_FILES: "Pregled datoteka"
+STR_FILE_TRANSFER: "Prijenos datoteka"
+STR_SETTINGS_TITLE: "Postavke"
+STR_CONTINUE_READING: "Nastavi čitanje"
+STR_NO_OPEN_BOOK: "Nema otvorene knjige"
+STR_START_READING: "Počni čitati ispod"
+STR_NO_FILES_FOUND: "Nema pronađenih datoteka"
+STR_SELECT_CHAPTER: "Odaberi poglavlje"
+STR_NO_CHAPTERS: "Nema poglavlja"
+STR_END_OF_BOOK: "Kraj knjige"
+STR_EMPTY_CHAPTER: "Prazno poglavlje"
+STR_INDEXING: "Indeksiranje"
+STR_INDEX_FAILED: "Indeksiranje nije uspjelo - nevažeća knjiga"
+STR_MEMORY_ERROR: "Greška memorije"
+STR_PAGE_LOAD_ERROR: "Greška pri učitavanju stranice"
+STR_EMPTY_FILE: "Prazna datoteka"
+STR_OUT_OF_BOUNDS: "Izvan granica"
+STR_LOADING: "Učitavanje..."
+STR_LOADING_POPUP: "Učitavanje"
+STR_WIFI_NETWORKS: "Wi-Fi mreže"
+STR_NO_NETWORKS: "Nema pronađenih mreža"
+STR_NETWORKS_FOUND: "%zu pronađenih mreža"
+STR_SCANNING: "Skeniranje..."
+STR_FINDING_SAVED_WIFI: "Traženje sačuvanog Wi-Fi-a..."
+STR_CONNECTING: "Povezivanje..."
+STR_CONNECTING_SAVED_WIFI: "Povezivanje na sačuvani Wi-Fi..."
+STR_SHOW_NETWORKS: "Prikaži"
+STR_CONNECTED: "Povezano!"
+STR_CONNECTION_FAILED: "Povezivanje nije uspjelo"
+STR_FORGET_NETWORK: "Zaboraviti mrežu?"
+STR_SAVE_PASSWORD: "Sačuvati lozinku za sljedeći put?"
+STR_PRESS_OK_SCAN: "Pritisni OK za ponovno skeniranje"
+STR_JOIN_NETWORK: "Pridruži se mreži"
+STR_CREATE_HOTSPOT: "Kreiraj hotspot"
+STR_JOIN_DESC: "Poveži se na postojeću Wi-Fi mrežu"
+STR_HOTSPOT_DESC: "Kreiraj Wi-Fi mrežu kojoj se drugi mogu pridružiti"
+STR_STARTING_HOTSPOT: "Pokretanje hotspota..."
+STR_HOTSPOT_MODE: "Hotspot način rada"
+STR_CONNECT_WIFI_HINT: "Poveži svoj uređaj na ovu Wi-Fi mrežu"
+STR_OPEN_URL_HINT: "Otvori ovaj URL u svom pregledniku"
+STR_OR_HTTP_PREFIX: "ili http://"
+STR_SCAN_QR_HINT: "ili skeniraj QR kod svojim telefonom:"
+STR_CALIBRE_WIRELESS: "Calibre bežično"
+STR_NETWORK_LEGEND: "* = Šifrovano | + = Sačuvano"
+STR_MAC_ADDRESS: "MAC adresa:"
+STR_CHECKING_WIFI: "Provjera Wi-Fi-a..."
+STR_ENTER_WIFI_PASSWORD: "Unesi Wi-Fi lozinku"
+STR_ADD_HIDDEN_NETWORK: "Dodaj skrivenu mrežu..."
+STR_ENTER_WIFI_SSID: "Unesi naziv mreže (SSID)"
+STR_TO_PREFIX: "na "
+STR_CALIBRE_RECEIVING: "Primanje: "
+STR_CALIBRE_RECEIVED: "Primljeno: "
+STR_CALIBRE_INSTRUCTION_1: "1) Instaliraj CrossPoint Reader dodatak"
+STR_CALIBRE_INSTRUCTION_2: "2) Budi na istoj Wi-Fi mreži"
+STR_CALIBRE_INSTRUCTION_3: "3) U Calibreu: \"Pošalji na uređaj\""
+STR_CALIBRE_INSTRUCTION_4: "\"Drži ovaj ekran otvorenim tokom slanja\""
+STR_CAT_DISPLAY: "Ekran"
+STR_CAT_READER: "Čitač"
+STR_CAT_CONTROLS: "Kontrole"
+STR_CAT_SYSTEM: "Sistem"
+STR_SLEEP_SCREEN: "Ekran mirovanja"
+STR_QUICK_RESUME_TIMEOUT: "Brzi nastavak nakon isteka vremena"
+STR_SLEEP_COVER_MODE: "Način prikaza korica na ekranu mirovanja"
+STR_HIDE_BATTERY: "Sakrij % baterije"
+STR_EXTRA_SPACING: "Dodatni razmak između paragrafa"
+STR_TEXT_AA: "Zaglađivanje teksta"
+STR_IMAGES: "Slike"
+STR_IMAGES_DISPLAY: "Prikaz"
+STR_IMAGES_PLACEHOLDER: "Rezervisano mjesto"
+STR_IMAGES_SUPPRESS: "Sakrij"
+STR_EOB_HOME: "Početna"
+STR_EOB_CONTINUE_WITH: "Nastavi sa"
+STR_SHORT_PWR_BTN: "Kratak klik dugmeta napajanja"
+STR_ORIENTATION: "Orijentacija čitanja"
+STR_SIDE_BTN_LAYOUT: "Raspored bočnih dugmadi (čitač)"
+STR_FRONT_BTN_FOLLOW_ORIENTATION: "Orijentiši prednja dugmad"
+STR_LONG_PRESS_BEHAVIOR: "Ponašanje dugog pritiska dugmeta"
+STR_LONG_PRESS_BEHAVIOR_OFF: "ISKLJUČENO"
+STR_LONG_PRESS_BEHAVIOR_SKIP: "Preskakanje poglavlja"
+STR_LONG_PRESS_BEHAVIOR_ORIENTATION: "Promjena orijentacije"
+STR_LONG_PRESS_MENU: "Meni dugog pritiska"
+STR_FONT_PREVIEW_TEXT: "Brza smeđa lisica preskače lijenog psa"
+STR_FONT_FAMILY: "Porodica fonta čitača"
+STR_FONT_SIZE: "Veličina fonta čitača"
+STR_LINE_SPACING: "Razmak između redova čitača"
+STR_SCREEN_MARGIN: "Margina ekrana čitača"
+STR_PARA_ALIGNMENT: "Poravnanje paragrafa čitača"
+STR_HYPHENATION: "Rastavljanje riječi"
+STR_TIME_TO_SLEEP: "Vrijeme do mirovanja"
+STR_SHOW_HIDDEN_FILES: "Prikaži skrivene datoteke"
+STR_REMOVE_READ_FROM_RECENTS: "Ukloni pročitane knjige sa liste nedavnih"
+STR_MOVE_FINISHED_TO_READ: "Premjesti završene knjige u fasciklu Read"
+STR_REFRESH_FREQ: "Učestalost osvježavanja"
+STR_KOREADER_SYNC: "KOReader sinhronizacija"
+STR_CHECK_UPDATES: "Provjeri ažuriranja"
+STR_LANGUAGE: "Jezik"
+STR_CLEAR_READING_CACHE: "Očisti keš čitanja"
+STR_USERNAME: "Korisničko ime"
+STR_PASSWORD: "Lozinka"
+STR_SYNC_SERVER_URL: "URL servera za sinhronizaciju"
+STR_DOCUMENT_MATCHING: "Podudaranje dokumenata"
+STR_SEND_METADATA: "Pošalji metapodatke dokumenta"
+STR_AUTHENTICATE: "Autentifikuj"
+STR_KOREADER_USERNAME: "KOReader korisničko ime"
+STR_KOREADER_PASSWORD: "KOReader lozinka"
+STR_FILENAME: "Naziv datoteke"
+STR_BINARY: "Binarno"
+STR_SET_CREDENTIALS_FIRST: "Prvo postavi vjerodajnice"
+STR_WIFI_CONN_FAILED: "Wi-Fi povezivanje nije uspjelo"
+STR_AUTHENTICATING: "Autentifikacija..."
+STR_AUTH_SUCCESS: "Uspješno autentifikovano!"
+STR_KOREADER_AUTH: "KOReader autentifikacija"
+STR_SYNC_READY: "KOReader sinhronizacija je spremna za upotrebu"
+STR_AUTH_FAILED: "Autentifikacija nije uspjela"
+STR_DONE: "Gotovo"
+STR_CLEAR_CACHE_WARNING_1: "Ovo će očistiti sve keširane podatke knjiga."
+STR_CLEAR_CACHE_WARNING_2: "Sav napredak čitanja će biti izgubljen!"
+STR_CLEAR_CACHE_WARNING_3: "Knjige će morati biti ponovo indeksirane"
+STR_CLEAR_CACHE_WARNING_4: "kada se ponovo otvore."
+STR_CLEARING_CACHE: "Čišćenje keša..."
+STR_CACHE_CLEARED: "Keš očišćen"
+STR_ITEMS_REMOVED: "stavki uklonjeno"
+STR_FAILED_LOWER: "nije uspjelo"
+STR_CLEAR_CACHE_FAILED: "Čišćenje keša nije uspjelo"
+STR_CHECK_SERIAL_OUTPUT: "Provjeri serijski izlaz za detalje"
+STR_DARK: "Tamno"
+STR_LIGHT: "Svijetlo"
+STR_CUSTOM: "Prilagođeno"
+STR_COVER: "Korice"
+STR_NONE_OPT: "Ništa"
+STR_FIT: "Prilagodi"
+STR_CROP: "Isjeci"
+STR_NEVER: "Nikad"
+STR_IN_READER: "U čitaču"
+STR_ALWAYS: "Uvijek"
+STR_IGNORE: "Ignoriši"
+STR_SLEEP: "Mirovanje"
+STR_PAGE_TURN: "Okretanje stranice"
+STR_FORCE_REFRESH: "Osvježi ekran"
+STR_PORTRAIT: "Uspravno"
+STR_LANDSCAPE_CW: "Položeno (u smjeru kazaljke na satu)"
+STR_INVERTED: "Obrnuto"
+STR_ORIENTATION_INVERTED: "Uspravno 180°"
+STR_LANDSCAPE_CCW: "Položeno (suprotno smjeru kazaljke na satu)"
+STR_PREV_NEXT: "Prethodno/Sljedeće"
+STR_NEXT_PREV: "Sljedeće/Prethodno"
+STR_KOSYNC: "KOSync"
+STR_BOOKMARK_OPTION: "Obilježivač"
+STR_DISABLED: "Onemogućeno"
+STR_NOTO_SERIF: "Noto Serif"
+STR_NOTO_SANS: "Noto Sans"
+STR_SMALL: "Malo"
+STR_MEDIUM: "Srednje"
+STR_LARGE: "Veliko"
+STR_X_LARGE: "Vrlo veliko"
+STR_TIGHT: "Usko"
+STR_NORMAL: "Normalno"
+STR_WIDE: "Široko"
+STR_JUSTIFY: "Poravnaj obostrano"
+STR_ALIGN_LEFT: "Lijevo"
+STR_CENTER: "Centrirano"
+STR_ALIGN_RIGHT: "Desno"
+STR_PAGES_1: "1 stranica"
+STR_PAGES_5: "5 stranica"
+STR_PAGES_10: "10 stranica"
+STR_PAGES_15: "15 stranica"
+STR_PAGES_30: "30 stranica"
+STR_UPDATE: "Ažuriraj"
+STR_CHECKING_UPDATE: "Provjera ažuriranja..."
+STR_NEW_UPDATE: "Dostupno je novo ažuriranje!"
+STR_CURRENT_VERSION: "Trenutna verzija: "
+STR_NEW_VERSION: "Nova verzija: "
+STR_UPDATING: "Ažuriranje..."
+STR_NO_UPDATE: "Nema dostupnih ažuriranja"
+STR_UPDATE_FAILED: "Ažuriranje nije uspjelo"
+STR_UPDATE_COMPLETE: "Ažuriranje završeno"
+STR_POWER_ON_HINT: "Pritisni i drži dugme napajanja da ponovo uključiš"
+STR_RESTARTING_HINT: "Ponovno pokretanje... Ako se uređaj ne pokrene ponovo, drži dugme napajanja nekoliko sekundi."
+STR_NO_ENTRIES: "Nema pronađenih unosa"
+STR_DOWNLOADING: "Preuzimanje..."
+STR_DOWNLOAD_FAILED: "Preuzimanje nije uspjelo"
+STR_ERROR_MSG: "Greška:"
+STR_UNNAMED: "Neimenovano"
+STR_HOLD_OPEN_TO_DELETE: "Drži Otvori za brisanje"
+STR_NO_SERVER_URL: "Nije podešen URL servera"
+STR_FETCH_FEED_FAILED: "Dohvatanje feeda nije uspjelo"
+STR_PARSE_FEED_FAILED: "Obrada feeda nije uspjela"
+STR_NEXT_PAGE: "Sljedeća stranica »"
+STR_PREV_PAGE: "« Prethodna stranica"
+STR_NETWORK_PREFIX: "Mreža: "
+STR_IP_ADDRESS_PREFIX: "IP adresa: "
+STR_ERROR_GENERAL_FAILURE: "Greška: Opšta greška"
+STR_ERROR_NETWORK_NOT_FOUND: "Greška: Mreža nije pronađena"
+STR_ERROR_CONNECTION_TIMEOUT: "Greška: Isteklo vrijeme veze"
+STR_SD_CARD: "SD kartica"
+STR_BACK: "« Nazad"
+STR_EXIT: "« Izlaz"
+STR_HOME: "« Početna"
+STR_SELECT: "Odaberi"
+STR_SELECTED: "Odabrano"
+STR_TOGGLE: "Promijeni"
+STR_TOGGLE_BOOKMARK: "Promijeni obilježivač"
+STR_CONFIRM: "Potvrdi"
+STR_CANCEL: "Otkaži"
+STR_CONNECT: "Poveži"
+STR_OPEN: "Otvori"
+STR_DOWNLOAD: "Preuzmi"
+STR_RETRY: "Pokušaj ponovo"
+STR_YES: "Da"
+STR_NO: "Ne"
+STR_SHOW: "Prikaži"
+STR_HIDE: "Sakrij"
+STR_STATE_ON: "UKLJUČENO"
+STR_STATE_OFF: "ISKLJUČENO"
+STR_NOT_SET: "Nije postavljeno"
+STR_DIR_LEFT: "Lijevo"
+STR_DIR_RIGHT: "Desno"
+STR_DIR_UP: "Gore"
+STR_DIR_DOWN: "Dolje"
+STR_OK_BUTTON: "OK"
+STR_SLEEP_COVER_FILTER: "Filter korica ekrana mirovanja"
+STR_FILTER_CONTRAST: "Kontrast"
+STR_CUSTOMISE_STATUS_BAR: "Prilagodi statusnu traku"
+STR_CHAPTER_PAGE_COUNT: "Broj stranica poglavlja"
+STR_BOOK_PROGRESS_PERCENTAGE: "Procenat napretka knjige"
+STR_PROGRESS_BAR: "Traka napretka"
+STR_PROGRESS_BAR_THICKNESS: "Debljina trake napretka"
+STR_PROGRESS_BAR_THIN: "Tanka"
+STR_PROGRESS_BAR_MEDIUM: "Srednja"
+STR_PROGRESS_BAR_THICK: "Debela"
+STR_BOOK: "Knjiga"
+STR_CHAPTER: "Poglavlje"
+STR_EXAMPLE_CHAPTER: "Poglavlje 21"
+STR_EXAMPLE_BOOK: "Naslov knjige"
+STR_PREVIEW: "Pregled"
+STR_TITLE: "Naslov"
+STR_BATTERY: "Baterija"
+STR_XTC_STATUS_BAR: "XTC statusna traka"
+STR_BOTTOM: "Dolje"
+STR_TOP: "Gore"
+STR_CLOCK: "Sat"
+STR_CLOCK_UTC_OFFSET: "UTC odstupanje sata"
+STR_CLOCK_FORMAT: "Format sata"
+STR_CLOCK_FORMAT_24H: "24-časovni"
+STR_CLOCK_FORMAT_12H: "12-časovni"
+STR_CURRENT_TIME: "Trenutno vrijeme:"
+STR_NEXT_FIELD: "Sljedeće"
+STR_CLOCK_SYNC: "Sinhronizuj sat"
+STR_CLOCK_SYNC_NOW: "Sinhronizuj sat sada"
+STR_CLOCK_SYNCING: "Sinhronizacija sa NTP-a..."
+STR_CLOCK_SYNC_OK: "Sat sinhronizovan"
+STR_CLOCK_SYNC_FAIL: "Sinhronizacija nije uspjela"
+STR_CLOCK_SYNC_NO_WIFI: "Wi-Fi nije povezan"
+STR_CLOCK_SYNC_NO_WIFI_HINT: "Prvo se poveži na Wi-Fi, pa pokušaj ponovo."
+STR_CLOCK_SYNCED: "Sat sinhronizovan"
+STR_UI_THEME: "Tema korisničkog interfejsa"
+STR_THEME_CLASSIC: "Klasična"
+STR_THEME_LYRA: "Lyra"
+STR_THEME_ROUNDEDRAFF: "RoundedRaff"
+STR_THEME_LYRA_EXTENDED: "Lyra proširena"
+STR_SUNLIGHT_FADING_FIX: "Ispravka blijeđenja na suncu"
+STR_REMAP_FRONT_BUTTONS: "Premapiraj prednja dugmad"
+STR_BOOKMARKS: "Obilježivači"
+STR_BOOKMARK_ADDED: "Obilježivač dodan."
+STR_BOOKMARK_REMOVED: "Obilježivač uklonjen."
+STR_OPDS_BROWSER: "OPDS pregledač"
+STR_SEARCH: "Pretraga"
+STR_COVER_CUSTOM: "Korice + Prilagođeno"
+STR_QUICK_RESUME: "Brzi nastavak"
+STR_MENU_RECENT_BOOKS: "Nedavne knjige"
+STR_REMOVE_FROM_RECENTS: "Ukloniti iz nedavnih knjiga?"
+STR_NO_RECENT_BOOKS: "Nema nedavnih knjiga"
+STR_CALIBRE_DESC: "Koristi Calibre bežični prijenos uređaja"
+STR_FORGET_AND_REMOVE: "Zaboraviti mrežu i ukloniti sačuvanu lozinku?"
+STR_FORGET_BUTTON: "Zaboravi"
+STR_CALIBRE_STARTING: "Pokretanje Calibrea..."
+STR_CALIBRE_SETUP: "Podešavanje"
+STR_CALIBRE_STATUS: "Status"
+STR_CLEAR_BUTTON: "Očisti"
+STR_DEFAULT_VALUE: "Zadano"
+STR_REMAP_PROMPT: "Pritisni prednje dugme za svaku ulogu"
+STR_UNASSIGNED: "Nedodijeljeno"
+STR_ALREADY_ASSIGNED: "Već dodijeljeno"
+STR_REMAP_RESET_HINT: "Bočno dugme Gore: Vrati na zadani raspored"
+STR_REMAP_CANCEL_HINT: "Bočno dugme Dolje: Otkaži premapiranje"
+STR_HW_BACK_LABEL: "Nazad (1. dugme)"
+STR_HW_CONFIRM_LABEL: "Potvrdi (2. dugme)"
+STR_HW_LEFT_LABEL: "Lijevo (3. dugme)"
+STR_HW_RIGHT_LABEL: "Desno (4. dugme)"
+STR_GO_TO_PERCENT: "Idi na %"
+STR_GO_HOME_BUTTON: "Idi na početnu"
+STR_SYNC_PROGRESS: "Sinhronizuj napredak"
+STR_DELETE_CACHE: "Obriši keš knjige"
+STR_DELETE: "Obriši"
+STR_CONFIRM_DELETE_BOOKMARK: "Obrisati ovaj obilježivač?"
+STR_DISPLAY_QR: "Prikaži stranicu kao QR"
+STR_CHAPTER_PREFIX: "Poglavlje: "
+STR_PAGES_SEPARATOR: " stranica  |  "
+STR_BOOK_PREFIX: "Knjiga: "
+STR_CALIBRE_URL_HINT: "Za Calibre, dodaj /opds na svoj URL"
+STR_SYNCING_TIME: "Sinhronizacija vremena..."
+STR_CALC_HASH: "Izračunavanje heša dokumenta..."
+STR_HASH_FAILED: "Izračunavanje heša dokumenta nije uspjelo"
+STR_FETCH_PROGRESS: "Dohvatanje udaljenog napretka..."
+STR_UPLOAD_PROGRESS: "Slanje napretka..."
+STR_NO_CREDENTIALS_MSG: "Nisu podešene vjerodajnice"
+STR_KOREADER_SETUP_HINT: "Podesi KOReader nalog u Postavkama"
+STR_PROGRESS_FOUND: "Napredak pronađen!"
+STR_REMOTE_LABEL: "Udaljeno:"
+STR_LOCAL_LABEL: "Lokalno:"
+STR_PAGE_OVERALL_FORMAT: "Stranica %d, %.2f%% ukupno"
+STR_PAGE_TOTAL_OVERALL_FORMAT: "Stranica %d/%d, %.2f%% ukupno"
+STR_DEVICE_FROM_FORMAT: "  Sa: %s"
+STR_APPLY_REMOTE: "Primijeni udaljeni napredak"
+STR_UPLOAD_LOCAL: "Pošalji lokalni napredak"
+STR_NO_REMOTE_MSG: "Nije pronađen udaljeni napredak"
+STR_UPLOAD_PROMPT: "Poslati trenutnu poziciju?"
+STR_UPLOAD_SUCCESS: "Napredak poslan!"
+STR_SYNC_FAILED_MSG: "Sinhronizacija nije uspjela"
+STR_SAVE_PROGRESS_FAILED: "Napredak nije mogao biti sačuvan"
+STR_SECTION_PREFIX: "Sekcija "
+STR_UPLOAD: "Pošalji"
+STR_BOOK_S_STYLE: "Stil knjige"
+STR_EMBEDDED_STYLE: "Ugrađeni stil"
+STR_FOCUS_READING: "Fokusirano čitanje"
+STR_OPDS_SERVER_URL: "URL OPDS servera"
+STR_PWR_BTN_FOOTNOTE_BACK: "Brzi povratak iz fusnota"
+STR_SET_SLEEP_COVER: "Postavi korice"
+STR_FOOTNOTES: "Fusnote"
+STR_NO_FOOTNOTES: "Nema fusnota na ovoj stranici"
+STR_LINK: "[link]"
+STR_SCREENSHOT_BUTTON: "Snimi ekran"
+STR_SLEEP_TIMER_VALUE_FORMAT: "%u min"
+STR_SLEEP_NEVER: "Nikad"
+STR_STEP_HINT_FRONT: "Prednja dugmad:"
+STR_STEP_HINT_SIDE: "Bočna dugmad:"
+STR_ADD_SERVER: "Dodaj server"
+STR_SERVER_NAME: "Naziv servera"
+STR_NO_SERVERS: "Nema podešenih OPDS servera"
+STR_DELETE_SERVER: "Obriši server"
+STR_OPDS_SERVERS: "OPDS serveri"
+STR_AUTO_TURN_ENABLED: "Automatsko okretanje omogućeno: "
+STR_AUTO_TURN_PAGES_PER_MIN: "Automatsko okretanje (stranica po minuti)"
+STR_MANAGE_FONTS: "Upravljaj fontovima"
+STR_FONT_BROWSER: "Pregledač fontova"
+STR_LOADING_FONT_LIST: "Učitavanje liste fontova..."
+STR_NO_FONTS_AVAILABLE: "Nema dostupnih fontova"
+STR_FONT_INSTALLED: "Font instaliran!"
+STR_FONT_INSTALL_FAILED: "Instalacija fonta nije uspjela"
+STR_INSTALLED: "Instalirano"
+STR_DOWNLOAD_ALL: "Preuzmi sve"
+STR_UPDATE_ALL: "Ažuriraj sve"
+STR_UPDATE_AVAILABLE: "Ažuriranje"
+STR_CRASH_TITLE: "Sistemski pad"
+STR_CRASH_DESCRIPTION: "Detaljan izvještaj je sačuvan u crash_report.txt. Molimo priloži ovu datoteku u svoj izvještaj o grešci."
+STR_CRASH_REASON: "Razlog pada:"
+STR_CRASH_NO_REASON: "(Razlog nije zabilježen)"
+STR_TILT_PAGE_TURN: "Okretanje stranice naginjanjem"
+STR_KB_HINT_MOVE_CURSOR: "Pritisni LIJEVO ili DESNO za pomjeranje kursora"
+STR_KB_HINT_RETURN_CURSOR: "Pritisni LIJEVO za povratak na poziciju kursora"
+STR_KB_HINT_HIDE_PASSWORD: "Drži DESNO pa pritisni [***] za skrivanje lozinke"
+STR_KB_HINT_SHOW_PASSWORD: "Drži DESNO pa pritisni [abc] za prikaz lozinke"
+STR_KB_HINT_TOGGLE_HIDE_PASSWORD: "Pritisni [***] za skrivanje lozinke"
+STR_KB_HINT_TOGGLE_SHOW_PASSWORD: "Pritisni [abc] za prikaz lozinke"
+STR_KB_HINT_EDIT_ENTRY: "Drži GORE za uređivanje unosa"
+STR_KB_TIPS: "Savjeti:"
+STR_KB_HINT_RETURN_KEYBOARD: "Pritisni DOLJE za povratak na tastaturu"
+STR_KB_HINT_EXIT_URL_MODE: "Pritisni ABC za izlazak iz URL načina"
+STR_KB_HINT_CLEAR_TEXT: "Drži DEL za brisanje cijelog teksta"
+STR_KB_HINT_SECONDARY_CHAR: "Drži SELECT za sekundarni znak"
+STR_KB_HINT_UPPER_SECONDARY: "Drži SELECT za VELIKA SLOVA ili sekundarni znak"
+STR_KB_HINT_LOWER_SECONDARY: "Drži SELECT za mala slova ili sekundarni znak"
+STR_KB_HINT_URL_SNIPPETS: "Pritisni URL za isječke"
+STR_SD_FIRMWARE_UPDATE: "Ažuriranje firmvera sa SD kartice"
+STR_SELECT_FIRMWARE_FILE: "Odaberi datoteku firmvera (.bin)"
+STR_NO_BIN_FILES: "Nema pronađenih .bin datoteka"
+STR_VALIDATING_FIRMWARE: "Provjera firmvera..."
+STR_INVALID_FIRMWARE: "Nevažeća datoteka firmvera"
+STR_FIRMWARE_TOO_LARGE: "Firmver je prevelik za particiju"
+STR_FIRMWARE_TOO_SMALL: "Datoteka firmvera je premala"
+STR_FIRMWARE_UPDATE_PROMPT: "Ažurirati firmver?"
+STR_FIRMWARE_FILE_OPEN_FAILED: "Datoteka se ne može otvoriti"
+STR_FIRMWARE_WRITE_FAILED: "Upisivanje firmvera nije uspjelo"
+STR_FIRMWARE_UPDATE_DO_NOT_POWER_OFF: "Ne isključuj napajanje!"
+STR_RECOVERY_MODE: "Način oporavka"
+STR_RECOVERY_MODE_HINT: "Stavi firmware.bin u korijenski direktorij SD kartice i odaberi ga"

lib/I18n/translations/catalan.yaml

@@ -347,6 +347,11 @@ STR_SERVER_NAME: "Nom del servidor"
 STR_NO_SERVERS: "No hi ha servidors OPDS configurats"
 STR_DELETE_SERVER: "Suprimeix el servidor"
 STR_OPDS_SERVERS: "Servidors OPDS"
+STR_OPDS_DOWNLOAD_FOLDER: "Carpeta de baixades"
+STR_OPDS_FILENAME_FORMAT: "Format del nom de fitxer"
+STR_FMT_AUTHOR_TITLE: "Autor - Títol"
+STR_FMT_TITLE_AUTHOR: "Títol - Autor"
+STR_FMT_TITLE: "Títol"
 STR_MANAGE_FONTS: "Gestiona les fonts"
 STR_FONT_BROWSER: "Navegador de fonts"
 STR_LOADING_FONT_LIST: "S'està carregant la llista de fonts..."

lib/I18n/translations/czech.yaml

@@ -270,6 +270,11 @@ STR_BOOK_S_STYLE: "Styl knihy"
 STR_EMBEDDED_STYLE: "Vložený styl"
 STR_FOCUS_READING: "Soustředěné čtení"
 STR_OPDS_SERVER_URL: "URL serveru OPDS"
+STR_OPDS_DOWNLOAD_FOLDER: "Složka pro stahování"
+STR_OPDS_FILENAME_FORMAT: "Formát názvu souboru"
+STR_FMT_AUTHOR_TITLE: "Autor - Název"
+STR_FMT_TITLE_AUTHOR: "Název - Autor"
+STR_FMT_TITLE: "Název"
 STR_SCREENSHOT_BUTTON: "Udělat snímek obrazovky"
 STR_SLEEP_TIMER_VALUE_FORMAT: "%u min"
 STR_SLEEP_NEVER: "Nikdy"

lib/I18n/translations/danish.yaml

@@ -300,6 +300,11 @@ STR_SLEEP_TIMER_VALUE_FORMAT: "%u min"
 STR_SLEEP_NEVER: "Aldrig"
 STR_STEP_HINT_FRONT: "Frontknapper:"
 STR_STEP_HINT_SIDE: "Sideknapper:"
+STR_OPDS_DOWNLOAD_FOLDER: "Downloadmappe"
+STR_OPDS_FILENAME_FORMAT: "Filnavnsformat"
+STR_FMT_AUTHOR_TITLE: "Forfatter - Titel"
+STR_FMT_TITLE_AUTHOR: "Titel - Forfatter"
+STR_FMT_TITLE: "Titel"
 STR_SCREENSHOT_BUTTON: "Tag skærmbillede"
 STR_AUTO_TURN_ENABLED: "Automatisk sidevendning aktiveret: "
 STR_AUTO_TURN_PAGES_PER_MIN: "Automatisk vending (sider per minut)"

lib/I18n/translations/dutch.yaml

@@ -300,6 +300,11 @@ STR_SLEEP_TIMER_VALUE_FORMAT: "%u min"
 STR_SLEEP_NEVER: "Nooit"
 STR_STEP_HINT_FRONT: "Voorknoppen:"
 STR_STEP_HINT_SIDE: "Zijknoppen:"
+STR_OPDS_DOWNLOAD_FOLDER: "Downloadmap"
+STR_OPDS_FILENAME_FORMAT: "Bestandsnaamformaat"
+STR_FMT_AUTHOR_TITLE: "Auteur - Titel"
+STR_FMT_TITLE_AUTHOR: "Titel - Auteur"
+STR_FMT_TITLE: "Titel"
 STR_SCREENSHOT_BUTTON: "Screenshot maken"
 STR_AUTO_TURN_ENABLED: "Automatisch omslaan ingeschakeld: "
 STR_AUTO_TURN_PAGES_PER_MIN: "Autom. omslaan (pagina's per minuut)"

lib/I18n/translations/english.yaml

@@ -10,6 +10,7 @@ STR_BROWSE_FILES: "Browse Files"
 STR_FILE_TRANSFER: "File Transfer"
 STR_SETTINGS_TITLE: "Settings"
 STR_CONTINUE_READING: "Continue Reading"
+STR_RESUME: "Resume"
 STR_NO_OPEN_BOOK: "No open book"
 STR_START_READING: "Start reading below"
 STR_NO_FILES_FOUND: "No files found"
@@ -108,7 +109,15 @@ STR_PASSWORD: "Password"
 STR_SYNC_SERVER_URL: "Sync Server URL"
 STR_DOCUMENT_MATCHING: "Document Matching"
 STR_SEND_METADATA: "Send Document Metadata"
+STR_SYNC_BEHAVIOR: "Sync Behavior"
+STR_ASK_EVERY_TIME: "Ask every time"
+STR_SMART_SYNC: "Smart sync"
 STR_AUTHENTICATE: "Authenticate"
+STR_SIGN_UP: "Sign Up"
+STR_CREATING_ACCOUNT: "Creating account..."
+STR_ACCOUNT_CREATED: "Account created"
+STR_SIGNUP_FAILED: "Sign up failed"
+STR_USERNAME_TAKEN: "Username is already registered"
 STR_KOREADER_USERNAME: "KOReader Username"
 STR_KOREADER_PASSWORD: "KOReader Password"
 STR_FILENAME: "Filename"
@@ -295,25 +304,6 @@ STR_HW_BACK_LABEL: "Back (1st button)"
 STR_HW_CONFIRM_LABEL: "Confirm (2nd button)"
 STR_HW_LEFT_LABEL: "Left (3rd button)"
 STR_HW_RIGHT_LABEL: "Right (4th button)"
-STR_BLUETOOTH: "Bluetooth"
-STR_TOGGLE_BLUETOOTH: "Toggle Bluetooth"
-STR_BT_SCAN_PAIR: "Scan & Pair"
-STR_BT_NO_DEVICES: "No devices found"
-STR_BT_FREE_HINT1: "Set Free2/3 to Reader Mode and"
-STR_BT_FREE_HINT2: "Volume Function to pair"
-STR_BT_DISCONNECT: "Disconnect"
-STR_BT_CONNECTED_TO: "Connected: %s"
-STR_BT_NOT_CONNECTED: "Not connected"
-STR_BT_PAIRED_DEVICES: "Paired Devices"
-STR_BT_NO_PAIRED: "No paired devices"
-STR_BT_MAP_BUTTONS: "Map Remote Buttons"
-STR_BT_PRESS_REMOTE: "Press a button on your remote"
-STR_BT_CONNECTING_POPUP: "BT Connecting..."
-STR_BT_PAUSED_LOW_MEM_POPUP: "BT paused (low memory)"
-STR_STATE_PAUSED: "PAUSED"
-STR_BT_PAGE_FORWARD: "Page Forward"
-STR_BT_PAGE_BACK: "Page Back"
-STR_BT_FORGET_PROMPT: "Hold Confirm to forget"
 STR_GO_TO_PERCENT: "Go to %"
 STR_GO_HOME_BUTTON: "Go Home"
 STR_SYNC_PROGRESS: "Sync Progress"
@@ -343,6 +333,7 @@ STR_UPLOAD_LOCAL: "Upload local progress"
 STR_NO_REMOTE_MSG: "No remote progress found"
 STR_UPLOAD_PROMPT: "Upload current position?"
 STR_UPLOAD_SUCCESS: "Progress uploaded!"
+STR_ALREADY_SYNCED: "Already synced"
 STR_SYNC_FAILED_MSG: "Sync failed"
 STR_SAVE_PROGRESS_FAILED: "Could not save progress"
 STR_SECTION_PREFIX: "Section "
@@ -352,6 +343,7 @@ STR_EMBEDDED_STYLE: "Embedded Style"
 STR_FOCUS_READING: "Focus Reading"
 STR_OPDS_SERVER_URL: "OPDS Server URL"
 STR_PWR_BTN_FOOTNOTE_BACK: "Quick-return from footnotes"
+STR_BACK_SHORT_TO_FILE_BROWSER: "Short Back to File Browser"
 STR_SET_SLEEP_COVER: "Set Cover"
 STR_FOOTNOTES: "Footnotes"
 STR_NO_FOOTNOTES: "No footnotes on this page"
@@ -366,6 +358,12 @@ STR_SERVER_NAME: "Server Name"
 STR_NO_SERVERS: "No OPDS servers configured"
 STR_DELETE_SERVER: "Delete Server"
 STR_OPDS_SERVERS: "OPDS Servers"
+STR_OPDS_DOWNLOAD_FOLDER: "Download folder"
+STR_OPDS_FILENAME_FORMAT: "Filename format"
+STR_FMT_AUTHOR_TITLE: "Author - Title"
+STR_FMT_TITLE_AUTHOR: "Title - Author"
+STR_FMT_TITLE: "Title"
+STR_OPDS_SD_ROOT: "SD root"
 STR_AUTO_TURN_ENABLED: "Auto Turn Enabled: "
 STR_AUTO_TURN_PAGES_PER_MIN: "Auto Turn (Pages Per Minute)"
 STR_MANAGE_FONTS: "Manage Fonts"

lib/I18n/translations/finnish.yaml

@@ -268,6 +268,11 @@ STR_BOOK_S_STYLE: "Kirjan tyyli"
 STR_EMBEDDED_STYLE: "Upotettu tyyli"
 STR_FOCUS_READING: "Keskittynyt lukeminen"
 STR_OPDS_SERVER_URL: "OPDS-palvelimen osoite"
+STR_OPDS_DOWNLOAD_FOLDER: "Latauskansio"
+STR_OPDS_FILENAME_FORMAT: "Tiedostonimen muoto"
+STR_FMT_AUTHOR_TITLE: "Tekijä - Nimi"
+STR_FMT_TITLE_AUTHOR: "Nimi - Tekijä"
+STR_FMT_TITLE: "Nimi"
 STR_SCREENSHOT_BUTTON: "Ota kuvakaappaus"
 STR_SLEEP_TIMER_VALUE_FORMAT: "%u min"
 STR_SLEEP_NEVER: "Ei koskaan"

lib/I18n/translations/french.yaml

@@ -301,6 +301,11 @@ STR_SLEEP_TIMER_VALUE_FORMAT: "%u min"
 STR_SLEEP_NEVER: "Jamais"
 STR_STEP_HINT_FRONT: "Boutons avant :"
 STR_STEP_HINT_SIDE: "Boutons latéraux :"
+STR_OPDS_DOWNLOAD_FOLDER: "Dossier de téléchargement"
+STR_OPDS_FILENAME_FORMAT: "Format du nom de fichier"
+STR_FMT_AUTHOR_TITLE: "Auteur - Titre"
+STR_FMT_TITLE_AUTHOR: "Titre - Auteur"
+STR_FMT_TITLE: "Titre"
 STR_SCREENSHOT_BUTTON: "Capture d'écran"
 STR_AUTO_TURN_ENABLED: "Tourne-page auto : "
 STR_AUTO_TURN_PAGES_PER_MIN: "Tourne-page auto (pages par minute)"

lib/I18n/translations/german.yaml

@@ -315,6 +315,7 @@ STR_BOOK_S_STYLE: "Buch-Stil"
 STR_EMBEDDED_STYLE: "Eingebetteter Stil"
 STR_FOCUS_READING: "Fokus-Lesen"
 STR_OPDS_SERVER_URL: "OPDS-Server-URL"
+STR_BACK_SHORT_TO_FILE_BROWSER: "Kurz zurück drücken zum Datei-Browser"
 STR_SET_SLEEP_COVER: "Wähle Cover"
 STR_SCREENSHOT_BUTTON: "Screenshot aufnehmen"
 STR_FOOTNOTES: "Fußnoten"
@@ -329,6 +330,11 @@ STR_SERVER_NAME: "Servername"
 STR_NO_SERVERS: "Keine OPDS-Server konfiguriert"
 STR_DELETE_SERVER: "Server entfernen"
 STR_OPDS_SERVERS: "OPDS-Server"
+STR_OPDS_DOWNLOAD_FOLDER: "Download-Ordner"
+STR_OPDS_FILENAME_FORMAT: "Dateinamenformat"
+STR_FMT_AUTHOR_TITLE: "Autor - Titel"
+STR_FMT_TITLE_AUTHOR: "Titel - Autor"
+STR_FMT_TITLE: "Titel"
 STR_AUTO_TURN_ENABLED: "Auto-Umblättern aktiv: "
 STR_AUTO_TURN_PAGES_PER_MIN: "Auto-Umblättern (Seiten/Min.)"
 STR_IMAGES: "Bilder"

lib/I18n/translations/hebrew.yaml

@@ -306,6 +306,11 @@ STR_NO_SERVERS: "לא הוגדרו שרתי OPDS"
 STR_DELETE_SERVER: "מחק שרת"
 STR_DELETE_CONFIRM: "למחוק שרת זה?"
 STR_OPDS_SERVERS: "שרתי OPDS"
+STR_OPDS_DOWNLOAD_FOLDER: "תיקיית הורדות"
+STR_OPDS_FILENAME_FORMAT: "תבנית שם קובץ"
+STR_FMT_AUTHOR_TITLE: "מחבר - כותרת"
+STR_FMT_TITLE_AUTHOR: "כותרת - מחבר"
+STR_FMT_TITLE: "כותרת"
 STR_AUTO_TURN_ENABLED: "דפדוף אוטומטי פועל: "
 STR_AUTO_TURN_PAGES_PER_MIN: "דפדוף אוטומטי (דפים בדקה)"
 STR_MANAGE_FONTS: "ניהול גופנים"

lib/I18n/translations/hungarian.yaml

@@ -299,6 +299,11 @@ STR_SLEEP_TIMER_VALUE_FORMAT: "%u perc"
 STR_SLEEP_NEVER: "Soha"
 STR_STEP_HINT_FRONT: "Elülső gombok:"
 STR_STEP_HINT_SIDE: "Oldalsó gombok:"
+STR_OPDS_DOWNLOAD_FOLDER: "Letöltési mappa"
+STR_OPDS_FILENAME_FORMAT: "Fájlnév formátuma"
+STR_FMT_AUTHOR_TITLE: "Szerző - Cím"
+STR_FMT_TITLE_AUTHOR: "Cím - Szerző"
+STR_FMT_TITLE: "Cím"
 STR_SCREENSHOT_BUTTON: "Képernyőkép készítése"
 STR_AUTO_TURN_ENABLED: "Automatikus lapozás bekapcsolva: "
 STR_AUTO_TURN_PAGES_PER_MIN: "Automatikus lapozás (oldal/perc)"

lib/I18n/translations/italian.yaml

@@ -315,6 +315,11 @@ STR_SERVER_NAME: "Nome server"
 STR_NO_SERVERS: "Nessun server OPDS configurato"
 STR_DELETE_SERVER: "Elimina server"
 STR_OPDS_SERVERS: "Server OPDS"
+STR_OPDS_DOWNLOAD_FOLDER: "Cartella download"
+STR_OPDS_FILENAME_FORMAT: "Formato nome file"
+STR_FMT_AUTHOR_TITLE: "Autore - Titolo"
+STR_FMT_TITLE_AUTHOR: "Titolo - Autore"
+STR_FMT_TITLE: "Titolo"
 STR_AUTO_TURN_ENABLED: "Volta pagina automatico: "
 STR_AUTO_TURN_PAGES_PER_MIN: "Volta pagina automatico (pag/min)"
 STR_MANAGE_FONTS: "Gestisci font"

lib/I18n/translations/kazakh.yaml

@@ -296,6 +296,11 @@ STR_SLEEP_TIMER_VALUE_FORMAT: "%u мин"
 STR_SLEEP_NEVER: "Ешқашан"
 STR_STEP_HINT_FRONT: "Алдыңғы түймелер:"
 STR_STEP_HINT_SIDE: "Бүйір түймелері:"
+STR_OPDS_DOWNLOAD_FOLDER: "Жүктеп алу қалтасы"
+STR_OPDS_FILENAME_FORMAT: "Файл атауының пішімі"
+STR_FMT_AUTHOR_TITLE: "Автор - Атауы"
+STR_FMT_TITLE_AUTHOR: "Атауы - Автор"
+STR_FMT_TITLE: "Атауы"
 STR_SCREENSHOT_BUTTON: "Скриншот түсіру"
 STR_AUTO_TURN_ENABLED: "Автоматты бет аудару қосулы: "
 STR_AUTO_TURN_PAGES_PER_MIN: "Автоматты бет аудару (минутына бет саны)"

lib/I18n/translations/lithuanian.yaml

@@ -297,6 +297,11 @@ STR_SLEEP_TIMER_VALUE_FORMAT: "%u min."
 STR_SLEEP_NEVER: "Niekada"
 STR_STEP_HINT_FRONT: "Priekiniai mygtukai:"
 STR_STEP_HINT_SIDE: "Šoniniai mygtukai:"
+STR_OPDS_DOWNLOAD_FOLDER: "Atsisiuntimų aplankas"
+STR_OPDS_FILENAME_FORMAT: "Failo pavadinimo formatas"
+STR_FMT_AUTHOR_TITLE: "Autorius - Pavadinimas"
+STR_FMT_TITLE_AUTHOR: "Pavadinimas - Autorius"
+STR_FMT_TITLE: "Pavadinimas"
 STR_SCREENSHOT_BUTTON: "Ekrano nuotrauka"
 STR_AUTO_TURN_ENABLED: "Auto-vertimas: "
 STR_AUTO_TURN_PAGES_PER_MIN: "Auto-vertimas (psl/min)"

lib/I18n/translations/norwegian.yaml

@@ -0,0 +1,385 @@
+_language_name: "Norsk bokmål"
+_language_code: "NB"
+_order: "26"
+
+STR_CROSSPOINT: "CrossPoint"
+STR_BOOTING: "STARTER"
+STR_SLEEPING: "HVILER"
+STR_ENTERING_SLEEP: "Går i hvilemodus"
+STR_BROWSE_FILES: "Bla i filer"
+STR_FILE_TRANSFER: "Filoverføring"
+STR_SETTINGS_TITLE: "Innstillinger"
+STR_CONTINUE_READING: "Fortsett å lese"
+STR_NO_OPEN_BOOK: "Ingen åpen bok"
+STR_START_READING: "Start å lese nedenfor"
+STR_NO_FILES_FOUND: "Ingen filer funnet"
+STR_SELECT_CHAPTER: "Velg kapittel"
+STR_NO_CHAPTERS: "Ingen kapitler"
+STR_END_OF_BOOK: "Slutten av boken"
+STR_EMPTY_CHAPTER: "Tomt kapittel"
+STR_INDEXING: "Indekserer"
+STR_MEMORY_ERROR: "Minnefeil"
+STR_PAGE_LOAD_ERROR: "Feil ved sidelasting"
+STR_EMPTY_FILE: "Tom fil"
+STR_OUT_OF_BOUNDS: "Utenfor område"
+STR_LOADING: "Laster..."
+STR_LOADING_POPUP: "Laster"
+STR_WIFI_NETWORKS: "WiFi-nettverk"
+STR_NO_NETWORKS: "Ingen nettverk funnet"
+STR_NETWORKS_FOUND: "%zu nettverk funnet"
+STR_SCANNING: "Skanner..."
+STR_CONNECTING: "Kobler til..."
+STR_CONNECTED: "Tilkoblet!"
+STR_CONNECTION_FAILED: "Tilkobling mislyktes"
+STR_FORGET_NETWORK: "Glem nettverk?"
+STR_SAVE_PASSWORD: "Lagre passord til neste gang?"
+STR_PRESS_OK_SCAN: "Trykk OK for å skanne på nytt"
+STR_JOIN_NETWORK: "Koble til et nettverk"
+STR_CREATE_HOTSPOT: "Opprett hotspot"
+STR_JOIN_DESC: "Koble til et eksisterende WiFi-nettverk"
+STR_HOTSPOT_DESC: "Opprett et WiFi-nettverk andre kan koble seg til"
+STR_STARTING_HOTSPOT: "Starter hotspot..."
+STR_HOTSPOT_MODE: "Hotspot-modus"
+STR_CONNECT_WIFI_HINT: "Koble enheten din til dette WiFi-nettverket"
+STR_OPEN_URL_HINT: "Åpne denne URL-en i nettleseren din"
+STR_OR_HTTP_PREFIX: "eller http://"
+STR_SCAN_QR_HINT: "eller skann QR-kode med telefonen din:"
+STR_CALIBRE_WIRELESS: "Calibre Wireless"
+STR_NETWORK_LEGEND: "* = Kryptert | + = Lagret"
+STR_MAC_ADDRESS: "MAC-adresse:"
+STR_CHECKING_WIFI: "Sjekker WiFi..."
+STR_ENTER_WIFI_PASSWORD: "Skriv inn WiFi-passord"
+STR_TO_PREFIX: "til "
+STR_CALIBRE_RECEIVING: "Mottar: "
+STR_CALIBRE_RECEIVED: "Mottatt: "
+STR_CALIBRE_INSTRUCTION_1: "1) Installer CrossPoint Reader-plugin"
+STR_CALIBRE_INSTRUCTION_2: "2) Vær på samme WiFi-nettverk"
+STR_CALIBRE_INSTRUCTION_3: "3) I Calibre: \"Send til enhet\""
+STR_CALIBRE_INSTRUCTION_4: "\"Hold denne skjermen åpen mens du sender\""
+STR_CAT_DISPLAY: "Skjerm"
+STR_CAT_READER: "Leser"
+STR_CAT_CONTROLS: "Betjening"
+STR_CAT_SYSTEM: "System"
+STR_SLEEP_SCREEN: "Hvileskjerm"
+STR_QUICK_RESUME_TIMEOUT: "Hurtig gjenopptak ved tidsavbrudd"
+STR_SLEEP_COVER_MODE: "Omslagsmodus for hvileskjerm"
+STR_HIDE_BATTERY: "Skjul batteri %"
+STR_EXTRA_SPACING: "Ekstra avsnittsavstand"
+STR_TEXT_AA: "Tekstutjevning"
+STR_IMAGES: "Bilder"
+STR_IMAGES_DISPLAY: "Vis"
+STR_IMAGES_PLACEHOLDER: "Plassholder"
+STR_IMAGES_SUPPRESS: "Skjul"
+STR_SHORT_PWR_BTN: "Kort trykk på av/på-knapp"
+STR_ORIENTATION: "Leseretning"
+STR_SIDE_BTN_LAYOUT: "Sideknapp-oppsett (leser)"
+STR_FRONT_BTN_FOLLOW_ORIENTATION: "Orienter frontknapper"
+STR_LONG_PRESS_BEHAVIOR: "Atferd ved langt trykk"
+STR_LONG_PRESS_BEHAVIOR_OFF: "AV"
+STR_LONG_PRESS_BEHAVIOR_SKIP: "Kapittelhopp"
+STR_LONG_PRESS_BEHAVIOR_ORIENTATION: "Endre orientering"
+STR_LONG_PRESS_MENU: "Langt trykk på Meny"
+STR_FONT_PREVIEW_TEXT: "Høvdingens kjære squaw får litt pizza i Mexico by"
+STR_FONT_FAMILY: "Skrifttype i leser"
+STR_FONT_SIZE: "Skriftstørrelse i leser"
+STR_LINE_SPACING: "Linjeavstand i leser"
+STR_SCREEN_MARGIN: "Skjermmarg i leser"
+STR_PARA_ALIGNMENT: "Avsnittsjustering i leser"
+STR_HYPHENATION: "Orddeling"
+STR_TIME_TO_SLEEP: "Tid før hvile"
+STR_SHOW_HIDDEN_FILES: "Vis skjulte filer"
+STR_REMOVE_READ_FROM_RECENTS: "Fjern leste bøker fra Nylig-listen"
+STR_MOVE_FINISHED_TO_READ: "Flytt fullførte bøker til Read-mappen"
+STR_REFRESH_FREQ: "Oppdateringsfrekvens"
+STR_KOREADER_SYNC: "KOReader Sync"
+STR_CHECK_UPDATES: "Se etter oppdateringer"
+STR_LANGUAGE: "Språk"
+STR_CLEAR_READING_CACHE: "Tøm lesebuffer"
+STR_USERNAME: "Brukernavn"
+STR_PASSWORD: "Passord"
+STR_SYNC_SERVER_URL: "URL til synk-server"
+STR_DOCUMENT_MATCHING: "Dokumentgjenkjenning"
+STR_AUTHENTICATE: "Godkjenn"
+STR_KOREADER_USERNAME: "KOReader-brukernavn"
+STR_KOREADER_PASSWORD: "KOReader-passord"
+STR_FILENAME: "Filnavn"
+STR_BINARY: "Binær"
+STR_SET_CREDENTIALS_FIRST: "Angi påloggingsinfo først"
+STR_WIFI_CONN_FAILED: "WiFi-tilkobling mislyktes"
+STR_AUTHENTICATING: "Godkjenner..."
+STR_AUTH_SUCCESS: "Godkjenning vellykket!"
+STR_KOREADER_AUTH: "KOReader-godkjenning"
+STR_SYNC_READY: "KOReader-synk er klar til bruk"
+STR_AUTH_FAILED: "Godkjenning mislyktes"
+STR_DONE: "Ferdig"
+STR_CLEAR_CACHE_WARNING_1: "Dette tømmer alle bufrede bokdata."
+STR_CLEAR_CACHE_WARNING_2: "All lesefremdrift går tapt!"
+STR_CLEAR_CACHE_WARNING_3: "Bøker må indekseres på nytt"
+STR_CLEAR_CACHE_WARNING_4: "når de åpnes igjen."
+STR_CLEARING_CACHE: "Tømmer buffer..."
+STR_CACHE_CLEARED: "Buffer tømt"
+STR_ITEMS_REMOVED: "elementer fjernet"
+STR_FAILED_LOWER: "mislyktes"
+STR_CLEAR_CACHE_FAILED: "Kunne ikke tømme buffer"
+STR_CHECK_SERIAL_OUTPUT: "Sjekk seriell utdata for detaljer"
+STR_DARK: "Mørk"
+STR_LIGHT: "Lys"
+STR_CUSTOM: "Egendefinert"
+STR_COVER: "Omslag"
+STR_NONE_OPT: "Ingen"
+STR_FIT: "Tilpass"
+STR_CROP: "Beskjær"
+STR_NEVER: "Aldri"
+STR_IN_READER: "I leseren"
+STR_ALWAYS: "Alltid"
+STR_IGNORE: "Ignorer"
+STR_SLEEP: "Hvile"
+STR_PAGE_TURN: "Bla om"
+STR_FORCE_REFRESH: "Oppdater skjerm"
+STR_PORTRAIT: "Stående"
+STR_LANDSCAPE_CW: "Liggende med klokken"
+STR_INVERTED: "Opp ned"
+STR_ORIENTATION_INVERTED: "Portrett 180°"
+STR_LANDSCAPE_CCW: "Liggende mot klokken"
+STR_PREV_NEXT: "Forrige/Neste"
+STR_NEXT_PREV: "Neste/Forrige"
+STR_KOSYNC: "KOSync"
+STR_BOOKMARK_OPTION: "Bokmerke"
+STR_DISABLED: "Deaktivert"
+STR_NOTO_SERIF: "Noto Serif"
+STR_NOTO_SANS: "Noto Sans"
+STR_SMALL: "Liten"
+STR_MEDIUM: "Middels"
+STR_LARGE: "Stor"
+STR_X_LARGE: "Ekstra stor"
+STR_TIGHT: "Tett"
+STR_NORMAL: "Normal"
+STR_WIDE: "Bred"
+STR_JUSTIFY: "Blokkjustert"
+STR_ALIGN_LEFT: "Venstre"
+STR_CENTER: "Midtstilt"
+STR_ALIGN_RIGHT: "Høyre"
+STR_PAGES_1: "1 side"
+STR_PAGES_5: "5 sider"
+STR_PAGES_10: "10 sider"
+STR_PAGES_15: "15 sider"
+STR_PAGES_30: "30 sider"
+STR_UPDATE: "Oppdater"
+STR_CHECKING_UPDATE: "Ser etter oppdatering..."
+STR_NEW_UPDATE: "Ny oppdatering tilgjengelig!"
+STR_CURRENT_VERSION: "Nåværende versjon: "
+STR_NEW_VERSION: "Ny versjon: "
+STR_UPDATING: "Oppdaterer..."
+STR_NO_UPDATE: "Ingen oppdatering tilgjengelig"
+STR_UPDATE_FAILED: "Oppdatering mislyktes"
+STR_UPDATE_COMPLETE: "Oppdatering fullført"
+STR_POWER_ON_HINT: "Trykk og hold av/på-knappen for å slå på igjen"
+STR_RESTARTING_HINT: "Starter på nytt... Hvis enheten ikke starter, hold av/på-knappen i noen sekunder."
+STR_NO_ENTRIES: "Ingen oppføringer funnet"
+STR_DOWNLOADING: "Laster ned..."
+STR_DOWNLOAD_FAILED: "Nedlasting mislyktes"
+STR_ERROR_MSG: "Feil:"
+STR_UNNAMED: "Uten navn"
+STR_HOLD_OPEN_TO_DELETE: "Hold Åpne for å slette"
+STR_NO_SERVER_URL: "Ingen server-URL konfigurert"
+STR_FETCH_FEED_FAILED: "Kunne ikke hente feed"
+STR_PARSE_FEED_FAILED: "Kunne ikke tolke feed"
+STR_NEXT_PAGE: "Neste side »"
+STR_PREV_PAGE: "« Forrige side"
+STR_NETWORK_PREFIX: "Nettverk: "
+STR_IP_ADDRESS_PREFIX: "IP-adresse: "
+STR_ERROR_GENERAL_FAILURE: "Feil: Generell feil"
+STR_ERROR_NETWORK_NOT_FOUND: "Feil: Nettverk ikke funnet"
+STR_ERROR_CONNECTION_TIMEOUT: "Feil: Tidsavbrudd for tilkobling"
+STR_SD_CARD: "SD-kort"
+STR_BACK: "« Tilbake"
+STR_EXIT: "« Avslutt"
+STR_HOME: "« Hjem"
+STR_SELECT: "Velg"
+STR_SELECTED: "Valgt"
+STR_TOGGLE: "Veksle"
+STR_TOGGLE_BOOKMARK: "Veksle bokmerke"
+STR_CONFIRM: "Bekreft"
+STR_CANCEL: "Avbryt"
+STR_CONNECT: "Koble til"
+STR_OPEN: "Åpne"
+STR_DOWNLOAD: "Last ned"
+STR_RETRY: "Prøv igjen"
+STR_YES: "Ja"
+STR_NO: "Nei"
+STR_SHOW: "Vis"
+STR_HIDE: "Skjul"
+STR_STATE_ON: "PÅ"
+STR_STATE_OFF: "AV"
+STR_NOT_SET: "Ikke angitt"
+STR_DIR_LEFT: "Venstre"
+STR_DIR_RIGHT: "Høyre"
+STR_DIR_UP: "Opp"
+STR_DIR_DOWN: "Ned"
+STR_OK_BUTTON: "OK"
+STR_SLEEP_COVER_FILTER: "Omslagsfilter for hvileskjerm"
+STR_FILTER_CONTRAST: "Kontrast"
+STR_CUSTOMISE_STATUS_BAR: "Tilpass statuslinje"
+STR_CHAPTER_PAGE_COUNT: "Sideantall i kapittel"
+STR_BOOK_PROGRESS_PERCENTAGE: "Bokfremdrift i prosent"
+STR_PROGRESS_BAR: "Fremdriftslinje"
+STR_PROGRESS_BAR_THICKNESS: "Tykkelse på fremdriftslinje"
+STR_PROGRESS_BAR_THIN: "Tynn"
+STR_PROGRESS_BAR_MEDIUM: "Middels"
+STR_PROGRESS_BAR_THICK: "Tykk"
+STR_BOOK: "Bok"
+STR_CHAPTER: "Kapittel"
+STR_EXAMPLE_CHAPTER: "Kapittel 21"
+STR_EXAMPLE_BOOK: "Boktittel"
+STR_PREVIEW: "Forhåndsvisning"
+STR_TITLE: "Tittel"
+STR_BATTERY: "Batteri"
+STR_XTC_STATUS_BAR: "XTC-statuslinje"
+STR_BOTTOM: "Nederst"
+STR_TOP: "Øverst"
+STR_CLOCK: "Klokke"
+STR_CLOCK_UTC_OFFSET: "UTC-forskyvning for klokke"
+STR_CLOCK_FORMAT: "Klokkeformat"
+STR_CLOCK_FORMAT_24H: "24-timers"
+STR_CLOCK_FORMAT_12H: "12-timers"
+STR_CURRENT_TIME: "Nåværende tid:"
+STR_NEXT_FIELD: "Neste"
+STR_CLOCK_SYNC: "Synkroniser klokke"
+STR_CLOCK_SYNC_NOW: "Synkroniser klokke nå"
+STR_CLOCK_SYNCING: "Synkroniserer fra NTP..."
+STR_CLOCK_SYNC_OK: "Klokke synkronisert"
+STR_CLOCK_SYNC_FAIL: "Synkronisering mislyktes"
+STR_CLOCK_SYNC_NO_WIFI: "WiFi ikke tilkoblet"
+STR_CLOCK_SYNC_NO_WIFI_HINT: "Koble til WiFi først, og prøv igjen."
+STR_CLOCK_SYNCED: "Klokke synkronisert"
+STR_UI_THEME: "Grensesnittstema"
+STR_THEME_CLASSIC: "Klassisk"
+STR_THEME_LYRA: "Lyra"
+STR_THEME_ROUNDEDRAFF: "RoundedRaff"
+STR_THEME_LYRA_EXTENDED: "Lyra Extended"
+STR_SUNLIGHT_FADING_FIX: "Retting for soluttoning"
+STR_REMAP_FRONT_BUTTONS: "Tilordne frontknapper på nytt"
+STR_BOOKMARKS: "Bokmerker"
+STR_BOOKMARK_ADDED: "Bokmerke lagt til."
+STR_BOOKMARK_REMOVED: "Bokmerke fjernet."
+STR_OPDS_BROWSER: "OPDS-leser"
+STR_SEARCH: "Søk"
+STR_COVER_CUSTOM: "Omslag + Egendefinert"
+STR_QUICK_RESUME: "Hurtig gjenopptak"
+STR_MENU_RECENT_BOOKS: "Nylige bøker"
+STR_REMOVE_FROM_RECENTS: "Fjern fra Nylige bøker?"
+STR_NO_RECENT_BOOKS: "Ingen nylige bøker"
+STR_CALIBRE_DESC: "Bruk trådløs enhetsoverføring med Calibre"
+STR_FORGET_AND_REMOVE: "Glem nettverk og fjern lagret passord?"
+STR_FORGET_BUTTON: "Glem"
+STR_CALIBRE_STARTING: "Starter Calibre..."
+STR_CALIBRE_SETUP: "Oppsett"
+STR_CALIBRE_STATUS: "Status"
+STR_CLEAR_BUTTON: "Tøm"
+STR_DEFAULT_VALUE: "Standard"
+STR_REMAP_PROMPT: "Trykk en frontknapp for hver rolle"
+STR_UNASSIGNED: "Ikke tilordnet"
+STR_ALREADY_ASSIGNED: "Allerede tilordnet"
+STR_REMAP_RESET_HINT: "Sideknapp opp: Nullstill til standardoppsett"
+STR_REMAP_CANCEL_HINT: "Sideknapp ned: Avbryt omtilordning"
+STR_HW_BACK_LABEL: "Tilbake (1. knapp)"
+STR_HW_CONFIRM_LABEL: "Bekreft (2. knapp)"
+STR_HW_LEFT_LABEL: "Venstre (3. knapp)"
+STR_HW_RIGHT_LABEL: "Høyre (4. knapp)"
+STR_GO_TO_PERCENT: "Gå til %"
+STR_GO_HOME_BUTTON: "Hjem"
+STR_SYNC_PROGRESS: "Synkroniser fremdrift"
+STR_DELETE_CACHE: "Slett bokbuffer"
+STR_DELETE: "Slett"
+STR_CONFIRM_DELETE_BOOKMARK: "Slette dette bokmerket?"
+STR_DISPLAY_QR: "Vis side som QR"
+STR_CHAPTER_PREFIX: "Kapittel: "
+STR_PAGES_SEPARATOR: " sider  |  "
+STR_BOOK_PREFIX: "Bok: "
+STR_CALIBRE_URL_HINT: "For Calibre, legg til /opds i URL-en din"
+STR_PERCENT_STEP_HINT: "Venstre/Høyre: 1%  Opp/Ned: 10%"
+STR_SYNCING_TIME: "Synkroniserer tid..."
+STR_CALC_HASH: "Beregner dokument-hash..."
+STR_HASH_FAILED: "Kunne ikke beregne dokument-hash"
+STR_FETCH_PROGRESS: "Henter ekstern fremdrift..."
+STR_UPLOAD_PROGRESS: "Laster opp fremdrift..."
+STR_NO_CREDENTIALS_MSG: "Ingen påloggingsinfo angitt"
+STR_KOREADER_SETUP_HINT: "Sett opp KOReader-konto i Innstillinger"
+STR_PROGRESS_FOUND: "Fremdrift funnet!"
+STR_REMOTE_LABEL: "Ekstern:"
+STR_LOCAL_LABEL: "Lokal:"
+STR_PAGE_OVERALL_FORMAT: "Side %d, %.2f%% totalt"
+STR_PAGE_TOTAL_OVERALL_FORMAT: "Side %d/%d, %.2f%% totalt"
+STR_DEVICE_FROM_FORMAT: "  Fra: %s"
+STR_APPLY_REMOTE: "Bruk ekstern fremdrift"
+STR_UPLOAD_LOCAL: "Last opp lokal fremdrift"
+STR_NO_REMOTE_MSG: "Ingen ekstern fremdrift funnet"
+STR_UPLOAD_PROMPT: "Last opp nåværende posisjon?"
+STR_UPLOAD_SUCCESS: "Fremdrift lastet opp!"
+STR_SYNC_FAILED_MSG: "Synkronisering mislyktes"
+STR_SAVE_PROGRESS_FAILED: "Kunne ikke lagre fremdrift"
+STR_SECTION_PREFIX: "Del "
+STR_UPLOAD: "Last opp"
+STR_BOOK_S_STYLE: "Bokens stil"
+STR_EMBEDDED_STYLE: "Innebygd stil"
+STR_FOCUS_READING: "Fokuslesing"
+STR_OPDS_SERVER_URL: "OPDS-server-URL"
+STR_PWR_BTN_FOOTNOTE_BACK: "Hurtig retur fra fotnoter"
+STR_SET_SLEEP_COVER: "Velg omslag"
+STR_FOOTNOTES: "Fotnoter"
+STR_NO_FOOTNOTES: "Ingen fotnoter på denne siden"
+STR_LINK: "[lenke]"
+STR_SCREENSHOT_BUTTON: "Ta skjermbilde"
+STR_SLEEP_TIMER_VALUE_FORMAT: "%u min"
+STR_SLEEP_NEVER: "Aldri"
+STR_SLEEP_TIMER_STEP_HINT: "Venstre/Høyre: 1 min  Opp/Ned: 5 min"
+STR_ADD_SERVER: "Legg til server"
+STR_SERVER_NAME: "Servernavn"
+STR_NO_SERVERS: "Ingen OPDS-servere konfigurert"
+STR_DELETE_SERVER: "Slett server"
+STR_OPDS_SERVERS: "OPDS-servere"
+STR_AUTO_TURN_ENABLED: "Automatisk bla aktivert: "
+STR_AUTO_TURN_PAGES_PER_MIN: "Automatisk bla (sider per minutt)"
+STR_MANAGE_FONTS: "Administrer skrifttyper"
+STR_FONT_BROWSER: "Bla i skrifttyper"
+STR_LOADING_FONT_LIST: "Laster skrifttypeliste..."
+STR_NO_FONTS_AVAILABLE: "Ingen skrifttyper tilgjengelig"
+STR_FONT_INSTALLED: "Skrifttype installert!"
+STR_FONT_INSTALL_FAILED: "Installasjon av skrifttype mislyktes"
+STR_INSTALLED: "Installert"
+STR_DOWNLOAD_ALL: "Last ned alle"
+STR_UPDATE_ALL: "Oppdater alle"
+STR_UPDATE_AVAILABLE: "Oppdater"
+STR_CRASH_TITLE: "Systemkrasj"
+STR_CRASH_DESCRIPTION: "En detaljert rapport ble lagret i crash_report.txt. Legg ved denne filen i feilrapporten din."
+STR_CRASH_REASON: "Krasjårsak:"
+STR_CRASH_NO_REASON: "(Ingen årsak ble registrert)"
+STR_TILT_PAGE_TURN: "Vipp for å bla"
+STR_KB_HINT_MOVE_CURSOR: "Trykk VENSTRE eller HØYRE for å flytte markøren"
+STR_KB_HINT_RETURN_CURSOR: "Trykk VENSTRE for å gå tilbake til markørposisjonen"
+STR_KB_HINT_HIDE_PASSWORD: "Hold HØYRE og trykk [***] for å skjule passord"
+STR_KB_HINT_SHOW_PASSWORD: "Hold HØYRE og trykk [abc] for å vise passord"
+STR_KB_HINT_TOGGLE_HIDE_PASSWORD: "Trykk [***] for å skjule passord"
+STR_KB_HINT_TOGGLE_SHOW_PASSWORD: "Trykk [abc] for å vise passord"
+STR_KB_HINT_EDIT_ENTRY: "Hold OPP for å redigere oppføring"
+STR_KB_TIPS: "Tips:"
+STR_KB_HINT_RETURN_KEYBOARD: "Trykk NED for å gå tilbake til tastaturet"
+STR_KB_HINT_EXIT_URL_MODE: "Trykk ABC for å avslutte URL-modus"
+STR_KB_HINT_CLEAR_TEXT: "Hold DEL for å slette all tekst"
+STR_KB_HINT_SECONDARY_CHAR: "Hold VELG for sekundærtegn"
+STR_KB_HINT_UPPER_SECONDARY: "Hold VELG for STORE BOKSTAVER eller sekundærtegn"
+STR_KB_HINT_LOWER_SECONDARY: "Hold VELG for små bokstaver eller sekundærtegn"
+STR_KB_HINT_URL_SNIPPETS: "Trykk URL for tekstbiter"
+STR_SD_FIRMWARE_UPDATE: "Fastvareoppdatering fra SD-kort"
+STR_SELECT_FIRMWARE_FILE: "Velg fastvarefil (.bin)"
+STR_NO_BIN_FILES: "Ingen .bin-filer funnet"
+STR_VALIDATING_FIRMWARE: "Validerer fastvare..."
+STR_INVALID_FIRMWARE: "Ugyldig fastvarefil"
+STR_FIRMWARE_TOO_LARGE: "Fastvaren er for stor for partisjonen"
+STR_FIRMWARE_TOO_SMALL: "Fastvarefilen er for liten"
+STR_FIRMWARE_UPDATE_PROMPT: "Oppdatere fastvare?"
+STR_FIRMWARE_FILE_OPEN_FAILED: "Kan ikke åpne filen"
+STR_FIRMWARE_WRITE_FAILED: "Skriving av fastvare mislyktes"
+STR_FIRMWARE_UPDATE_DO_NOT_POWER_OFF: "Ikke slå av!"
+STR_RECOVERY_MODE: "Gjenopprettingsmodus"
+STR_RECOVERY_MODE_HINT: "Legg firmware.bin i roten av SD-kortet og velg den"

lib/I18n/translations/polish.yaml

@@ -316,6 +316,11 @@ STR_SERVER_NAME: "Nazwa serwera"
 STR_NO_SERVERS: "Brak skonfigurowanych serwerów OPDS"
 STR_DELETE_SERVER: "Usuń serwer"
 STR_OPDS_SERVERS: "Serwery OPDS"
+STR_OPDS_DOWNLOAD_FOLDER: "Folder pobierania"
+STR_OPDS_FILENAME_FORMAT: "Format nazwy pliku"
+STR_FMT_AUTHOR_TITLE: "Autor - Tytuł"
+STR_FMT_TITLE_AUTHOR: "Tytuł - Autor"
+STR_FMT_TITLE: "Tytuł"
 STR_AUTO_TURN_ENABLED: "Auto-kartkowanie: "
 STR_AUTO_TURN_PAGES_PER_MIN: "Auto-kartkowanie (str./min)"
 STR_DOWNLOAD_FONTS: "Pobierz czcionki"

lib/I18n/translations/portuguese-BR.yaml

@@ -339,6 +339,11 @@ STR_SERVER_NAME: "Nome do Servidor"
 STR_NO_SERVERS: "Nenhum servidor OPDS configurado"
 STR_DELETE_SERVER: "Excluir Servidor"
 STR_OPDS_SERVERS: "Servidores OPDS"
+STR_OPDS_DOWNLOAD_FOLDER: "Pasta de downloads"
+STR_OPDS_FILENAME_FORMAT: "Formato do nome do arquivo"
+STR_FMT_AUTHOR_TITLE: "Autor - Título"
+STR_FMT_TITLE_AUTHOR: "Título - Autor"
+STR_FMT_TITLE: "Título"
 STR_AUTO_TURN_ENABLED: "Virada automática ativada: "
 STR_AUTO_TURN_PAGES_PER_MIN: "Virada automática (páginas por minuto)"
 STR_MANAGE_FONTS: "Gerenciar fontes"

lib/I18n/translations/romanian.yaml

@@ -300,6 +300,11 @@ STR_SLEEP_TIMER_VALUE_FORMAT: "%u min"
 STR_SLEEP_NEVER: "Niciodată"
 STR_STEP_HINT_FRONT: "Butoane frontale:"
 STR_STEP_HINT_SIDE: "Butoane laterale:"
+STR_OPDS_DOWNLOAD_FOLDER: "Dosar descărcări"
+STR_OPDS_FILENAME_FORMAT: "Format nume fișier"
+STR_FMT_AUTHOR_TITLE: "Autor - Titlu"
+STR_FMT_TITLE_AUTHOR: "Titlu - Autor"
+STR_FMT_TITLE: "Titlu"
 STR_SCREENSHOT_BUTTON: "Captură ecran"
 STR_AUTO_TURN_ENABLED: "Răsfoire automată: "
 STR_AUTO_TURN_PAGES_PER_MIN: "Pagini pe minut"

lib/I18n/translations/russian.yaml

@@ -339,6 +339,11 @@ STR_SERVER_NAME: "Имя сервера"
 STR_NO_SERVERS: "Нет настроенных серверов OPDS"
 STR_DELETE_SERVER: "Удалить сервер"
 STR_OPDS_SERVERS: "Серверы OPDS"
+STR_OPDS_DOWNLOAD_FOLDER: "Папка загрузок"
+STR_OPDS_FILENAME_FORMAT: "Формат имени файла"
+STR_FMT_AUTHOR_TITLE: "Автор - Название"
+STR_FMT_TITLE_AUTHOR: "Название - Автор"
+STR_FMT_TITLE: "Название"
 STR_AUTO_TURN_ENABLED: "Автоперелистывание: "
 STR_AUTO_TURN_PAGES_PER_MIN: "Автоперелистывание (стр./мин)"
 STR_MANAGE_FONTS: "Управление шрифтами"

lib/I18n/translations/slovak.yaml

@@ -335,6 +335,11 @@ STR_SERVER_NAME: "Názov servera"
 STR_NO_SERVERS: "Nie sú nakonfigurované žiadne OPDS servery"
 STR_DELETE_SERVER: "Odstrániť server"
 STR_OPDS_SERVERS: "OPDS servery"
+STR_OPDS_DOWNLOAD_FOLDER: "Priečinok sťahovania"
+STR_OPDS_FILENAME_FORMAT: "Formát názvu súboru"
+STR_FMT_AUTHOR_TITLE: "Autor - Názov"
+STR_FMT_TITLE_AUTHOR: "Názov - Autor"
+STR_FMT_TITLE: "Názov"
 STR_AUTO_TURN_ENABLED: "Automatické otáčanie strán zapnuté: "
 STR_AUTO_TURN_PAGES_PER_MIN: "Automatické otáčanie (strán za minútu)"
 STR_MANAGE_FONTS: "Správa písiem"

lib/I18n/translations/slovenian.yaml

@@ -297,6 +297,11 @@ STR_SLEEP_TIMER_VALUE_FORMAT: "%u min"
 STR_SLEEP_NEVER: "Nikoli"
 STR_STEP_HINT_FRONT: "Sprednji gumbi:"
 STR_STEP_HINT_SIDE: "Stranski gumbi:"
+STR_OPDS_DOWNLOAD_FOLDER: "Mapa za prenose"
+STR_OPDS_FILENAME_FORMAT: "Oblika imena datoteke"
+STR_FMT_AUTHOR_TITLE: "Avtor - Naslov"
+STR_FMT_TITLE_AUTHOR: "Naslov - Avtor"
+STR_FMT_TITLE: "Naslov"
 STR_SCREENSHOT_BUTTON: "Naredi posnetek zaslona"
 STR_AUTO_TURN_ENABLED: "Samodejno obračanje: "
 STR_AUTO_TURN_PAGES_PER_MIN: "Samodejno obračanje (strani na minuto)"

lib/I18n/translations/spanish.yaml

@@ -345,6 +345,11 @@ STR_SERVER_NAME: "Nombre de servidor"
 STR_NO_SERVERS: "No se configuraron servidores OPDS"
 STR_DELETE_SERVER: "Borrar servidor"
 STR_OPDS_SERVERS: "Servidores OPDS"
+STR_OPDS_DOWNLOAD_FOLDER: "Carpeta de descargas"
+STR_OPDS_FILENAME_FORMAT: "Formato del nombre de archivo"
+STR_FMT_AUTHOR_TITLE: "Autor - Título"
+STR_FMT_TITLE_AUTHOR: "Título - Autor"
+STR_FMT_TITLE: "Título"
 STR_AUTO_TURN_ENABLED: "Avance activado: "
 STR_AUTO_TURN_PAGES_PER_MIN: "Avance auto. (pág./min)"
 STR_MANAGE_FONTS: "Gestionar tipografías"

lib/I18n/translations/swedish.yaml

@@ -342,6 +342,11 @@ STR_SERVER_NAME: "Servernamn"
 STR_NO_SERVERS: "Inga OPDS-servrar konfigurerade"
 STR_DELETE_SERVER: "Ta bort server"
 STR_OPDS_SERVERS: "OPDS-servrar"
+STR_OPDS_DOWNLOAD_FOLDER: "Hämtningsmapp"
+STR_OPDS_FILENAME_FORMAT: "Filnamnsformat"
+STR_FMT_AUTHOR_TITLE: "Författare - Titel"
+STR_FMT_TITLE_AUTHOR: "Titel - Författare"
+STR_FMT_TITLE: "Titel"
 STR_AUTO_TURN_ENABLED: "Automatisk vändning aktiverad: "
 STR_AUTO_TURN_PAGES_PER_MIN: "Automatisk vändning (sidor per minut)"
 STR_MANAGE_FONTS: "Hantera teckensnitt"

lib/I18n/translations/turkish.yaml

@@ -68,10 +68,10 @@ STR_SHORT_PWR_BTN: "Kısa Güç Tuşu Tıklaması"
 STR_ORIENTATION: "Okuma Yönü"
 STR_SIDE_BTN_LAYOUT: "Yan Tuş Dizilimi (okuyucu)"
 STR_FRONT_BTN_FOLLOW_ORIENTATION: "Ön düğmeleri yönlendir"
-STR_LONG_PRESS_BEHAVIOR: "Long-press button behavior"
-STR_LONG_PRESS_BEHAVIOR_OFF: "OFF"
-STR_LONG_PRESS_BEHAVIOR_SKIP: "Chapter skip"
-STR_LONG_PRESS_BEHAVIOR_ORIENTATION: "Orientation change"
+STR_LONG_PRESS_BEHAVIOR: "Uzun basma tuş davranışı"
+STR_LONG_PRESS_BEHAVIOR_OFF: "KAPALI"
+STR_LONG_PRESS_BEHAVIOR_SKIP: "Bölüm atlama"
+STR_LONG_PRESS_BEHAVIOR_ORIENTATION: "Yön değiştirme"
 STR_FONT_PREVIEW_TEXT: "Pijamalı hasta yağız şoföre çabucak güvendi"
 STR_FONT_FAMILY: "Okuyucu Yazı Tipi Ailesi"
 STR_FONT_SIZE: "Arayüz Yazı Boyutu"
@@ -291,6 +291,11 @@ STR_SLEEP_TIMER_VALUE_FORMAT: "%u dak"
 STR_SLEEP_NEVER: "Asla"
 STR_STEP_HINT_FRONT: "Ön tuşlar:"
 STR_STEP_HINT_SIDE: "Yan tuşlar:"
+STR_OPDS_DOWNLOAD_FOLDER: "İndirme klasörü"
+STR_OPDS_FILENAME_FORMAT: "Dosya adı biçimi"
+STR_FMT_AUTHOR_TITLE: "Yazar - Başlık"
+STR_FMT_TITLE_AUTHOR: "Başlık - Yazar"
+STR_FMT_TITLE: "Başlık"
 STR_NO_FILES_FOUND: "Dosya bulunamadı"
 STR_NO_FOOTNOTES: "Bu sayfada dipnot yok"
 STR_PREVIEW: "Önizleme"
@@ -306,3 +311,89 @@ STR_TITLE: "Başlık"
 STR_TILT_PAGE_TURN: "Eğerek sayfa çevirme"
 STR_ADD_HIDDEN_NETWORK: "Gizli ağ ekle..."
 STR_ENTER_WIFI_SSID: "Ağ adını girin (SSID)"
+STR_ADD_SERVER: "Sunucu Ekle"
+STR_BOOKMARKS: "Yer İmleri"
+STR_BOOKMARK_ADDED: "Yer imi eklendi."
+STR_BOOKMARK_OPTION: "Yer İmi"
+STR_BOTTOM: "Alt"
+STR_CLOCK: "Saat"
+STR_CLOCK_FORMAT: "Saat Biçimi"
+STR_CLOCK_FORMAT_12H: "12 saat"
+STR_CLOCK_FORMAT_24H: "24 saat"
+STR_CLOCK_SYNC: "Saati Eşitle"
+STR_CLOCK_SYNCED: "Saat Eşitlendi"
+STR_CLOCK_SYNCING: "NTP'den eşitleniyor..."
+STR_CLOCK_SYNC_FAIL: "Eşitleme başarısız"
+STR_CLOCK_SYNC_NOW: "Saati şimdi eşitle"
+STR_CLOCK_SYNC_NO_WIFI: "Wi-Fi bağlı değil"
+STR_CLOCK_SYNC_NO_WIFI_HINT: "Önce Wi-Fi'ye bağlanın, sonra tekrar deneyin."
+STR_CLOCK_SYNC_OK: "Saat eşitlendi"
+STR_CLOCK_UTC_OFFSET: "Saat UTC Farkı"
+STR_CONFIRM_DELETE_BOOKMARK: "Bu yer imi silinsin mi?"
+STR_CONNECTING_SAVED_WIFI: "Kayıtlı Wi-Fi'ye bağlanılıyor..."
+STR_CRASH_DESCRIPTION: "Ayrıntılı rapor crash_report.txt dosyasına kaydedildi. Lütfen hata bildiriminize bu dosyayı ekleyin."
+STR_CRASH_NO_REASON: "(Neden kaydedilmedi)"
+STR_CRASH_REASON: "Çökme nedeni:"
+STR_CRASH_TITLE: "Sistem Çökmesi"
+STR_CURRENT_TIME: "Şu anki saat:"
+STR_DELETE_SERVER: "Sunucuyu Sil"
+STR_DISABLED: "Devre dışı"
+STR_DOWNLOAD_ALL: "Tümünü İndir"
+STR_EOB_CONTINUE_WITH: "Şununla devam et"
+STR_EOB_HOME: "Ana Ekran"
+STR_FINDING_SAVED_WIFI: "Kayıtlı Wi-Fi aranıyor..."
+STR_FIRMWARE_FILE_OPEN_FAILED: "Dosya açılamıyor"
+STR_FIRMWARE_TOO_LARGE: "Firmware, bölümlemeye sığmıyor"
+STR_FIRMWARE_TOO_SMALL: "Firmware dosyası çok küçük"
+STR_FIRMWARE_UPDATE_DO_NOT_POWER_OFF: "Cihazı kapatmayın!"
+STR_FIRMWARE_UPDATE_PROMPT: "Firmware güncellensin mi?"
+STR_FIRMWARE_WRITE_FAILED: "Firmware yazılamadı"
+STR_FONT_BROWSER: "Yazı Tipi Tarayıcısı"
+STR_FONT_INSTALLED: "Yazı tipi yüklendi!"
+STR_FONT_INSTALL_FAILED: "Yazı tipi yüklenemedi"
+STR_FORCE_REFRESH: "Ekranı Yenile"
+STR_INDEX_FAILED: "Endeksleme başarısız - geçersiz kitap"
+STR_INSTALLED: "Yüklü"
+STR_INVALID_FIRMWARE: "Geçersiz firmware dosyası"
+STR_KB_HINT_CLEAR_TEXT: "Tüm metni silmek için DEL tuşunu basılı tutun"
+STR_KB_HINT_EDIT_ENTRY: "Girdiyi düzenlemek için UP tuşunu basılı tutun"
+STR_KB_HINT_EXIT_URL_MODE: "URL modundan çıkmak için ABC'ye basın"
+STR_KB_HINT_HIDE_PASSWORD: "Şifreyi gizlemek için RIGHT'ı basılı tutup [***] tuşuna basın"
+STR_KB_HINT_LOWER_SECONDARY: "Küçük harf veya ikincil karakter için SELECT'i basılı tutun"
+STR_KB_HINT_MOVE_CURSOR: "İmleci taşımak için LEFT veya RIGHT'a basın"
+STR_KB_HINT_RETURN_CURSOR: "İmleç konumuna dönmek için LEFT'e basın"
+STR_KB_HINT_RETURN_KEYBOARD: "Klavyeye dönmek için DOWN'a basın"
+STR_KB_HINT_SECONDARY_CHAR: "İkincil karakter için SELECT'i basılı tutun"
+STR_KB_HINT_SHOW_PASSWORD: "Şifreyi göstermek için RIGHT'ı basılı tutup [abc] tuşuna basın"
+STR_KB_HINT_TOGGLE_HIDE_PASSWORD: "Şifreyi gizlemek için [***] tuşuna basın"
+STR_KB_HINT_TOGGLE_SHOW_PASSWORD: "Şifreyi göstermek için [abc] tuşuna basın"
+STR_KB_HINT_UPPER_SECONDARY: "BÜYÜK harf veya ikincil karakter için SELECT'i basılı tutun"
+STR_KB_HINT_URL_SNIPPETS: "Hazır kalıplar için URL'ye basın"
+STR_KB_TIPS: "İpuçları:"
+STR_KOSYNC: "KOSync"
+STR_LOADING_FONT_LIST: "Yazı tipi listesi yükleniyor..."
+STR_LONG_PRESS_MENU: "Uzun Basma Menüsü"
+STR_MANAGE_FONTS: "Yazı Tiplerini Yönet"
+STR_NEXT_FIELD: "Sonraki"
+STR_NEXT_PAGE: "Sonraki Sayfa »"
+STR_NO_BIN_FILES: ".bin dosyası bulunamadı"
+STR_NO_FONTS_AVAILABLE: "Kullanılabilir yazı tipi yok"
+STR_NO_SERVERS: "Yapılandırılmış OPDS sunucusu yok"
+STR_OPDS_SERVERS: "OPDS Sunucuları"
+STR_PREV_PAGE: "« Önceki Sayfa"
+STR_PWR_BTN_FOOTNOTE_BACK: "Dipnottan hızlı dönüş"
+STR_RECOVERY_MODE: "Kurtarma Modu"
+STR_RECOVERY_MODE_HINT: "firmware.bin dosyasını SD kartın köküne koyup seçin"
+STR_RESTARTING_HINT: "Yeniden başlatılıyor... Cihaz yeniden başlamazsa güç düğmesini birkaç saniye basılı tutun."
+STR_SD_FIRMWARE_UPDATE: "SD Karttan Firmware Güncelleme"
+STR_SEARCH: "Ara"
+STR_SELECT_FIRMWARE_FILE: "Firmware dosyası seçin (.bin)"
+STR_SERVER_NAME: "Sunucu Adı"
+STR_SET_SLEEP_COVER: "Kapak Ayarla"
+STR_SHOW_NETWORKS: "Göster"
+STR_THEME_ROUNDEDRAFF: "RoundedRaff"
+STR_TOP: "Üst"
+STR_UPDATE_ALL: "Tümünü Güncelle"
+STR_UPDATE_AVAILABLE: "Güncelle"
+STR_VALIDATING_FIRMWARE: "Firmware doğrulanıyor..."
+STR_XTC_STATUS_BAR: "XTC Durum Çubuğu"

lib/I18n/translations/ukrainian.yaml

@@ -336,6 +336,11 @@ STR_SERVER_NAME: "Назва сервера"
 STR_NO_SERVERS: "Не налаштовано жодного сервера OPDS"
 STR_DELETE_SERVER: "Видалити сервер"
 STR_OPDS_SERVERS: "Сервери OPDS"
+STR_OPDS_DOWNLOAD_FOLDER: "Папка завантажень"
+STR_OPDS_FILENAME_FORMAT: "Формат імені файлу"
+STR_FMT_AUTHOR_TITLE: "Автор - Назва"
+STR_FMT_TITLE_AUTHOR: "Назва - Автор"
+STR_FMT_TITLE: "Назва"
 STR_AUTO_TURN_ENABLED: "Автоперегортання увімк: "
 STR_AUTO_TURN_PAGES_PER_MIN: "Автоперегортання (ст/хв)"
 STR_MANAGE_FONTS: "Керування шрифтами"

lib/I18n/translations/valencian.yaml

@@ -348,6 +348,11 @@ STR_SERVER_NAME: "Nom del servidor"
 STR_NO_SERVERS: "No hi ha servidors OPDS configurats"
 STR_DELETE_SERVER: "Elimina el servidor"
 STR_OPDS_SERVERS: "Servidors OPDS"
+STR_OPDS_DOWNLOAD_FOLDER: "Carpeta de baixades"
+STR_OPDS_FILENAME_FORMAT: "Format del nom de fitxer"
+STR_FMT_AUTHOR_TITLE: "Autor - Títol"
+STR_FMT_TITLE_AUTHOR: "Títol - Autor"
+STR_FMT_TITLE: "Títol"
 STR_MANAGE_FONTS: "Gestiona les fonts"
 STR_FONT_BROWSER: "Navegador de fonts"
 STR_LOADING_FONT_LIST: "S'està carregant la llista de fonts..."

lib/I18n/translations/vietnamese.yaml

@@ -335,6 +335,11 @@ STR_SERVER_NAME: "Tên máy chủ"
 STR_NO_SERVERS: "Chưa cấu hình máy chủ OPDS"
 STR_DELETE_SERVER: "Xóa máy chủ"
 STR_OPDS_SERVERS: "Máy chủ OPDS"
+STR_OPDS_DOWNLOAD_FOLDER: "Thư mục tải xuống"
+STR_OPDS_FILENAME_FORMAT: "Định dạng tên tệp"
+STR_FMT_AUTHOR_TITLE: "Tác giả - Tựa đề"
+STR_FMT_TITLE_AUTHOR: "Tựa đề - Tác giả"
+STR_FMT_TITLE: "Tựa đề"
 STR_AUTO_TURN_ENABLED: "Tự lật trang: "
 STR_AUTO_TURN_PAGES_PER_MIN: "Tự lật (số trang mỗi phút)"
 STR_MANAGE_FONTS: "Quản lý phông chữ"

lib/KOReaderSync/KOReaderCredentialStore.cpp

@@ -5,16 +5,27 @@
 #include <ObfuscationUtils.h>
 
 namespace {
-// Default sync server URL
-constexpr char DEFAULT_SERVER_URL[] = "https://sync.koreader.rocks:443";
+// Default sync server URL. crosspoint-sync speaks the full KOSync protocol, so
+// pointing at any other kosync server (e.g. https://sync.koreader.rocks:443)
+// still works via the custom server URL setting.
+constexpr char DEFAULT_SERVER_URL[] = "https://sync.crosspointreader.com";
+
+// Default before config version 2. Configs saved without a version stamp and an
+// empty serverUrl were implicitly syncing here — they get pinned on upgrade.
+constexpr char LEGACY_DEFAULT_SERVER_URL[] = "https://sync.koreader.rocks:443";
+
+// Bumped when a change to defaults would alter behavior for existing configs.
+constexpr uint8_t CONFIG_VERSION = 2;
 }  // namespace
 
 void KOReaderCredentialStore::toJson(JsonDocument& doc) const {
+  doc["cfgVersion"] = CONFIG_VERSION;
   doc["username"] = getUsername();
   doc["password_obf"] = obfuscation::obfuscateToBase64(getPassword());
   doc["serverUrl"] = getServerUrl();
   doc["matchMethod"] = static_cast<uint8_t>(getMatchMethod());
   doc["sendMetadata"] = getSendMetadata();
+  doc["syncBehavior"] = static_cast<uint8_t>(getSyncBehavior());
 }
 
 bool KOReaderCredentialStore::fromJson(JsonVariantConst doc) {
@@ -26,6 +37,19 @@ bool KOReaderCredentialStore::fromJson(JsonVariantConst doc) {
   setCredentials(user, pass);
   setServerUrl(doc["serverUrl"] | "");
 
+  // The default server changed in config v2 (sync.koreader.rocks -> crosspoint-sync).
+  // A pre-v2 config with credentials and no explicit URL was actively syncing
+  // against the old default — pin that URL so the upgrade doesn't switch servers
+  // out from under the user. Fresh setups get the new default.
+  const uint8_t cfgVersion = doc["cfgVersion"] | (uint8_t)1;
+  if (cfgVersion < CONFIG_VERSION) {
+    if (getServerUrl().empty() && hasCredentials()) {
+      LOG_DBG("KRS", "Pre-v2 config used the old default server; pinning %s", LEGACY_DEFAULT_SERVER_URL);
+      setServerUrl(LEGACY_DEFAULT_SERVER_URL);
+    }
+    needsResave = true;  // stamp cfgVersion so this migration runs once
+  }
+
   uint8_t method = doc["matchMethod"] | (uint8_t)0;
   if (method <= static_cast<uint8_t>(DocumentMatchMethod::BINARY)) {
     setMatchMethod(static_cast<DocumentMatchMethod>(method));
@@ -35,6 +59,18 @@ bool KOReaderCredentialStore::fromJson(JsonVariantConst doc) {
   }
   setSendMetadata(doc["sendMetadata"] | false);
 
+  const JsonVariantConst behaviorValue = doc["syncBehavior"];
+  const bool missingBehavior = behaviorValue.isNull();
+  uint8_t behavior = behaviorValue | static_cast<uint8_t>(KOReaderSyncBehavior::ASK_EVERY_TIME);
+  if (behavior <= static_cast<uint8_t>(KOReaderSyncBehavior::SMART)) {
+    setSyncBehavior(static_cast<KOReaderSyncBehavior>(behavior));
+    needsResave = needsResave || missingBehavior;
+  } else {
+    LOG_DBG("KRS", "Invalid syncBehavior %u in JSON, resetting to ASK_EVERY_TIME", behavior);
+    setSyncBehavior(KOReaderSyncBehavior::ASK_EVERY_TIME);
+    needsResave = true;
+  }
+
   if (needsResave) {
     LOG_DBG("KRS", "Resaved KOReader credentials to update format");
     saveToFile();
@@ -105,3 +141,11 @@ void KOReaderCredentialStore::setSendMetadata(bool enabled) {
   sendMetadata = enabled;
   LOG_DBG("KRS", "Set send metadata: %s", enabled ? "true" : "false");
 }
+
+void KOReaderCredentialStore::setSyncBehavior(KOReaderSyncBehavior behavior) {
+  if (static_cast<uint8_t>(behavior) > static_cast<uint8_t>(KOReaderSyncBehavior::SMART)) {
+    behavior = KOReaderSyncBehavior::ASK_EVERY_TIME;
+  }
+  syncBehavior = behavior;
+  LOG_DBG("KRS", "Set sync behavior: %s", behavior == KOReaderSyncBehavior::SMART ? "Smart" : "Ask");
+}

lib/KOReaderSync/KOReaderCredentialStore.h

@@ -11,6 +11,12 @@ enum class DocumentMatchMethod : uint8_t {
   BINARY = 1,    // Match by partial MD5 of file content (more accurate, but files must be identical)
 };
 
+// How manual "Sync Progress" resolves differences after fetching remote progress.
+enum class KOReaderSyncBehavior : uint8_t {
+  ASK_EVERY_TIME = 0,  // Preserve legacy behavior: always show Apply/Upload choices.
+  SMART = 1,           // Auto-resolve simple cases using furthest progress.
+};
+
 /**
  * Singleton class for storing KOReader sync credentials on the SD card.
  * Passwords are XOR-obfuscated with the device's unique hardware MAC address
@@ -25,6 +31,7 @@ class KOReaderCredentialStore : public PersistableStore<KOReaderCredentialStore>
   std::string serverUrl;                                            // Custom sync server URL (empty = default)
   DocumentMatchMethod matchMethod = DocumentMatchMethod::FILENAME;  // Default to filename for compatibility
   bool sendMetadata = false;                                        // Send document metadata with progress sync
+  KOReaderSyncBehavior syncBehavior = KOReaderSyncBehavior::SMART;
 
   // Private constructor for singleton
   KOReaderCredentialStore() = default;
@@ -65,6 +72,10 @@ class KOReaderCredentialStore : public PersistableStore<KOReaderCredentialStore>
   // Send metadata setting
   void setSendMetadata(bool enabled);
   bool getSendMetadata() const { return sendMetadata; }
+
+  // Sync behavior
+  void setSyncBehavior(KOReaderSyncBehavior behavior);
+  KOReaderSyncBehavior getSyncBehavior() const { return syncBehavior; }
 };
 
 // Helper macro to access credential store

lib/KOReaderSync/KOReaderSyncClient.cpp

@@ -22,21 +22,7 @@ constexpr char DEVICE_ID[] = "crosspoint-reader";
 // footprint is smaller than mbedTLS's old ~48KB peak, but keep a conservative
 // floor. Check both total free heap and largest contiguous block so fragmented
 // heap does not fall through into a failed TLS allocation path.
-// MEMFIX-PORT: TLS heap gate; portable
-// Field data (July 2026): launching sync from a reader session lands at
-// 51.9-58.2 KB free / 42-53 KB maxAlloc after WiFi comes up. wolfSSL handles
-// allocation failure by returning MEMORY_E (no abort under -fno-exceptions),
-// so an optimistic attempt degrades to the same clean "sync failed" as the
-// gate — the gate only needs to keep out states where a doomed handshake
-// would waste tens of seconds, not guarantee success.
-//
-// Free and largest-block have separate requirements: with SP ECC
-// (WOLFSSL_HAVE_SP_ECC) the handshake's crypto uses fixed 256-bit arrays, so
-// the largest single TLS allocation is the ~17 KB wolfSSL record buffer, not
-// a run of fast-math bignums. A handshake was measured succeeding inside a
-// 43 KB largest block; requiring 50 KB contiguous refused syncs that fit.
-constexpr uint32_t MIN_FREE_FOR_TLS = 50000;
-constexpr uint32_t MIN_BLOCK_FOR_TLS = 20000;
+constexpr uint32_t MIN_HEAP_FOR_TLS = 55000;
 
 // Apply the shared KOSync auth headers after begin(). x-auth-* is the native
 // KOSync scheme; Basic auth is added for Calibre-Web-Automated compatibility.
@@ -53,9 +39,9 @@ void applyAuthHeaders(freeink::SecureHttpClient& http) {
 bool insufficientHeap() {
   const uint32_t freeHeap = ESP.getFreeHeap();
   const uint32_t maxAllocHeap = ESP.getMaxAllocHeap();
-  if (freeHeap < MIN_FREE_FOR_TLS || maxAllocHeap < MIN_BLOCK_FOR_TLS) {
-    LOG_ERR("KOSync", "Insufficient heap for TLS handshake: %u bytes free (need %u), %u max alloc (need %u)", freeHeap,
-            MIN_FREE_FOR_TLS, maxAllocHeap, MIN_BLOCK_FOR_TLS);
+  if (freeHeap < MIN_HEAP_FOR_TLS || maxAllocHeap < MIN_HEAP_FOR_TLS) {
+    LOG_ERR("KOSync", "Insufficient heap for TLS handshake: %u bytes free, %u max alloc (need %u)", freeHeap,
+            maxAllocHeap, MIN_HEAP_FOR_TLS);
     return true;
   }
   return false;
@@ -92,6 +78,43 @@ KOReaderSyncClient::Error KOReaderSyncClient::authenticate() {
   return SERVER_ERROR;
 }
 
+KOReaderSyncClient::Error KOReaderSyncClient::createUser() {
+  lastHttpCode = 0;
+  if (!KOREADER_STORE.hasCredentials()) {
+    LOG_DBG("KOSync", "No credentials configured");
+    return NO_CREDENTIALS;
+  }
+
+  const std::string url = KOREADER_STORE.getBaseUrl() + "/users/create";
+  LOG_DBG("KOSync", "Creating account: %s (heap: %u)", url.c_str(), (unsigned)ESP.getFreeHeap());
+  if (insufficientHeap()) return LOW_MEMORY;
+
+  JsonDocument doc;
+  doc["username"] = KOREADER_STORE.getUsername();
+  doc["password"] = KOREADER_STORE.getMd5Password();
+  std::string body;
+  serializeJson(doc, body);
+
+  freeink::SecureHttpClient http;
+  http.setInsecure();
+  if (!http.begin(url)) {
+    LOG_ERR("KOSync", "Bad URL: %s", url.c_str());
+    return NETWORK_ERROR;
+  }
+  http.addHeader("Accept", "application/vnd.koreader.v1+json");
+  http.addHeader("Content-Type", "application/json");
+  const int httpCode = http.sendRequest("POST", body);
+  http.end();
+  lastHttpCode = httpCode;
+
+  LOG_DBG("KOSync", "Create user response: %d", httpCode);
+
+  if (httpCode <= 0) return NETWORK_ERROR;
+  if (httpCode == 200 || httpCode == 201) return OK;
+  if (httpCode == 402) return USER_EXISTS;
+  return SERVER_ERROR;
+}
+
 KOReaderSyncClient::Error KOReaderSyncClient::getProgress(const std::string& documentHash,
                                                           KOReaderProgress& outProgress) {
   lastHttpCode = 0;
@@ -138,6 +161,24 @@ KOReaderSyncClient::Error KOReaderSyncClient::getProgress(const std::string& doc
     outProgress.deviceId = doc["device_id"].as<std::string>();
     outProgress.timestamp = doc["timestamp"].as<int64_t>();
 
+    // Extended crosspoint-sync field; absent on plain kosync servers.
+    outProgress.position.reset();
+    const JsonObjectConst pos = doc["position"].as<JsonObjectConst>();
+    if (!pos.isNull()) {
+      KOReaderRichPosition rich;
+      rich.pctQ = pos["pctQ"].as<uint32_t>();
+      rich.spineIndex = pos["spine"].as<uint16_t>();
+      rich.pageNumber = pos["page"].as<uint16_t>();
+      const uint16_t pages = pos["pages"].as<uint16_t>();
+      rich.totalPages = pages > 0 ? pages : 1;
+      const uint16_t para = pos["para"].as<uint16_t>();
+      if (para > 0) rich.paragraphIndex = para;
+      rich.xpath = pos["xpath"].as<const char*>() ? pos["xpath"].as<const char*>() : "";
+      LOG_DBG("KOSync", "Got rich position: spine=%u page=%u/%u para=%u", rich.spineIndex, rich.pageNumber,
+              rich.totalPages, para);
+      outProgress.position = std::move(rich);
+    }
+
     LOG_DBG("KOSync", "Got progress: %.2f%% at %s", outProgress.percentage * 100, outProgress.progress.c_str());
     return OK;
   }
@@ -172,6 +213,18 @@ KOReaderSyncClient::Error KOReaderSyncClient::updateProgress(const KOReaderProgr
   doc["percentage"] = progress.percentage;
   doc["device"] = DEVICE_NAME;
   doc["device_id"] = DEVICE_ID;
+  if (progress.position.has_value()) {
+    // Extended crosspoint-sync field; kosync servers ignore unknown keys.
+    const auto& p = *progress.position;
+    auto pos = doc["position"].to<JsonObject>();
+    pos["pctQ"] = p.pctQ;
+    pos["spine"] = p.spineIndex;
+    pos["page"] = p.pageNumber;
+    pos["pages"] = p.totalPages;
+    if (p.paragraphIndex.has_value()) pos["para"] = *p.paragraphIndex;
+    // Server rejects the whole position object if xpath exceeds 120 bytes.
+    if (!p.xpath.empty() && p.xpath.size() <= 120) pos["xpath"] = p.xpath;
+  }
 
   std::string body;
   serializeJson(doc, body);

lib/KOReaderSync/KOReaderSyncClient.h

@@ -14,6 +14,21 @@ struct KOReaderMetadata {
   std::string authors;   // Author(s) from EPUB metadata
 };
 
+/**
+ * Rich CrossPoint position sent alongside progress uploads. Maps 1:1 onto the
+ * crosspoint-sync extended `position` object (see crosspoint-sync docs/API.md).
+ * The official KOSync server ignores unknown fields; crosspoint-sync stores it
+ * so CrossPoint<->CrossPoint sync is lossless instead of xpath-approximated.
+ */
+struct KOReaderRichPosition {
+  uint32_t pctQ = 0;                       // Percentage quantized 0..1,000,000 (authoritative)
+  uint16_t spineIndex = 0;                 // Spine (chapter) index
+  uint16_t pageNumber = 0;                 // Page within spine (layout-dependent hint)
+  uint16_t totalPages = 1;                 // Spine page count (layout-dependent hint)
+  std::optional<uint16_t> paragraphIndex;  // Synthetic 1-based paragraph index
+  std::string xpath;                       // KOReader-style xpath (server cap: 120 bytes)
+};
+
 /**
  * Progress data from KOReader sync server.
  */
@@ -25,6 +40,7 @@ struct KOReaderProgress {
   std::string deviceId;                          // Device ID
   int64_t timestamp;                             // Unix timestamp of last update
   std::optional<KOReaderMetadata> metadata;      // Optional document metadata
+  std::optional<KOReaderRichPosition> position;  // Optional rich position (crosspoint-sync servers only)
 };
 
 /**
@@ -43,7 +59,17 @@ struct KOReaderProgress {
  */
 class KOReaderSyncClient {
  public:
-  enum Error { OK = 0, NO_CREDENTIALS, NETWORK_ERROR, AUTH_FAILED, SERVER_ERROR, JSON_ERROR, NOT_FOUND, LOW_MEMORY };
+  enum Error {
+    OK = 0,
+    NO_CREDENTIALS,
+    NETWORK_ERROR,
+    AUTH_FAILED,
+    SERVER_ERROR,
+    JSON_ERROR,
+    NOT_FOUND,
+    LOW_MEMORY,
+    USER_EXISTS
+  };
 
   /**
    * Authenticate with the sync server (validate credentials).
@@ -51,6 +77,14 @@ class KOReaderSyncClient {
    */
   static Error authenticate();
 
+  /**
+   * Register a new account on the sync server using the stored credentials
+   * (POST /users/create with the MD5 auth key — the server never sees the
+   * plain password).
+   * @return OK on success, USER_EXISTS if the username is taken
+   */
+  static Error createUser();
+
   /**
    * Get reading progress for a document.
    * @param documentHash The document hash (from KOReaderDocumentId)

lib/KOReaderSync/ProgressMapper.cpp

@@ -724,6 +724,59 @@ SavedProgressPosition ProgressMapper::toSavedProgress(const std::shared_ptr<Epub
   return result;
 }
 
+std::optional<CrossPointPosition> ProgressMapper::fromRichPosition(const std::shared_ptr<Epub>& epub,
+                                                                   const KOReaderRichPosition& rich,
+                                                                   GfxRenderer& renderer) {
+  const int spineCount = epub->getSpineItemsCount();
+  if (static_cast<int>(rich.spineIndex) >= spineCount) {
+    LOG_DBG("PM", "Rich position spine %u out of range (%d spine items)", rich.spineIndex, spineCount);
+    return std::nullopt;
+  }
+
+  CrossPointPosition result{};
+  result.spineIndex = rich.spineIndex;
+
+  Section tempSection(epub, result.spineIndex, renderer);
+  const auto cachedCount = tempSection.getCachedPageCount();
+  if (!cachedCount || *cachedCount <= 0) {
+    // No local layout for the target spine yet; the percentage/xpath mapping
+    // handles density estimation better than a blind copy of remote pages.
+    LOG_DBG("PM", "Rich position spine %u has no cached page count", rich.spineIndex);
+    return std::nullopt;
+  }
+  result.totalPages = *cachedCount;
+
+  const int remotePages = rich.totalPages > 0 ? rich.totalPages : 1;
+  if (result.totalPages == remotePages) {
+    // Identical layout (same render settings) — the page transfers losslessly.
+    result.pageNumber = std::min<int>(rich.pageNumber, result.totalPages - 1);
+    LOG_DBG("PM", "Rich position exact: spine=%d page=%d/%d", result.spineIndex, result.pageNumber, result.totalPages);
+    return result;
+  }
+
+  // Layout differs; the paragraph LUT is the most accurate anchor we have.
+  if (rich.paragraphIndex.has_value()) {
+    const auto lutPage = tempSection.getPageForParagraphIndex(*rich.paragraphIndex);
+    if (lutPage.has_value()) {
+      result.paragraphIndex = *rich.paragraphIndex;
+      result.hasParagraphIndex = true;
+      result.pageNumber = std::min<int>(*lutPage, result.totalPages - 1);
+      LOG_DBG("PM", "Rich position para %u -> spine=%d page=%d/%d", *rich.paragraphIndex, result.spineIndex,
+              result.pageNumber, result.totalPages);
+      return result;
+    }
+  }
+
+  // Fall back to the intra-spine page fraction.
+  const float intra =
+      (remotePages > 1) ? static_cast<float>(rich.pageNumber) / static_cast<float>(remotePages - 1) : 0.0f;
+  result.pageNumber = std::max(
+      0, std::min(static_cast<int>(intra * static_cast<float>(result.totalPages - 1) + 0.5f), result.totalPages - 1));
+  LOG_DBG("PM", "Rich position scaled: spine=%d remote %u/%d -> page=%d/%d", result.spineIndex, rich.pageNumber,
+          remotePages, result.pageNumber, result.totalPages);
+  return result;
+}
+
 CrossPointPosition ProgressMapper::toCrossPoint(const std::shared_ptr<Epub>& epub, const SavedProgressPosition& koPos,
                                                 GfxRenderer& renderer, int currentSpineIndex,
                                                 int totalPagesInCurrentSpine, int fallbackTotalPages) {

lib/KOReaderSync/ProgressMapper.h

@@ -3,8 +3,11 @@
 #include <GfxRenderer.h>
 
 #include <memory>
+#include <optional>
 #include <string>
 
+#include "KOReaderSyncClient.h"
+
 /**
  * CrossPoint position representation.
  */
@@ -65,6 +68,20 @@ class ProgressMapper {
                                          GfxRenderer& renderer, int currentSpineIndex = -1,
                                          int totalPagesInCurrentSpine = 0, int fallbackTotalPages = 0);
 
+  /**
+   * Convert a rich CrossPoint position (downloaded from a crosspoint-sync
+   * server) directly to a CrossPoint position, without XPath approximation.
+   * When the local layout matches the uploader's (same spine page count) the
+   * page transfers losslessly; otherwise the paragraph LUT or the intra-spine
+   * page fraction is used.
+   *
+   * @return The position, or std::nullopt when the rich position cannot be
+   *         applied (spine out of range, no section cache) and the caller
+   *         should fall back to toCrossPoint().
+   */
+  static std::optional<CrossPointPosition> fromRichPosition(const std::shared_ptr<Epub>& epub,
+                                                            const KOReaderRichPosition& rich, GfxRenderer& renderer);
+
  private:
   /**
    * Generate a fallback XPath by streaming the spine item's XHTML and resolving

lib/hal/HalDisplay.cpp

@@ -65,18 +65,6 @@ void HalDisplay::displayBuffer(HalDisplay::RefreshMode mode, bool turnOffScreen)
   einkDisplay.displayBuffer(convertRefreshMode(mode), turnOffScreen);
 }
 
-void HalDisplay::displayBufferAsync(HalDisplay::RefreshMode mode) {
-  if (gpio.deviceIsX3() && mode == RefreshMode::HALF_REFRESH) {
-    einkDisplay.requestResync(1);
-  }
-
-  einkDisplay.displayBufferAsyncNoShadow(convertRefreshMode(mode));
-}
-
-void HalDisplay::waitRefreshComplete() { einkDisplay.waitRefreshComplete(); }
-
-bool HalDisplay::supportsAsyncRefresh() const { return einkDisplay.supportsAsyncRefresh(); }
-
 void HalDisplay::refreshDisplay(HalDisplay::RefreshMode mode, bool turnOffScreen) {
   if (gpio.deviceIsX3() && mode == RefreshMode::HALF_REFRESH) {
     einkDisplay.requestResync(1);

lib/hal/HalDisplay.h

@@ -39,17 +39,6 @@ class HalDisplay {
                             bool fromProgmem = false) const;
 
   void displayBuffer(RefreshMode mode = RefreshMode::FAST_REFRESH, bool turnOffScreen = false);
-  // Non-blocking refresh (shadow-free): starts the panel waveform and returns
-  // while the panel refreshes on its own. The framebuffer must stay untouched
-  // until waitRefreshComplete(), and the caller must rebuild the differential
-  // baseline before the next differential update (the tiled grayscale cleanup
-  // does). Panels without deferral fall back to a blocking refresh.
-  void displayBufferAsync(RefreshMode mode = RefreshMode::FAST_REFRESH);
-  // Block until a pending deferred refresh completes (no-op when none is).
-  void waitRefreshComplete();
-  // True when displayBufferAsync() genuinely overlaps (panel driver defers);
-  // false where it falls back to a blocking refresh.
-  bool supportsAsyncRefresh() const;
   void refreshDisplay(RefreshMode mode = RefreshMode::FAST_REFRESH, bool turnOffScreen = false);
 
   // Power management

lib/hal/HalGPIO.cpp

@@ -225,29 +225,17 @@ unsigned long HalGPIO::getHeldTime() const { return inputMgr.getHeldTime(); }
 
 unsigned long HalGPIO::getPowerButtonHeldTime() const { return inputMgr.getPowerButtonHeldTime(); }
 
-void HalGPIO::startDeepSleep() {
-  // Ensure that the power button has been released to avoid immediately turning back on if you're holding it
-  while (inputMgr.isPressed(BTN_POWER)) {
-    delay(50);
-    inputMgr.update();
-  }
-  // Arm the wakeup trigger *after* the button is released
-  esp_deep_sleep_enable_gpio_wakeup(1ULL << InputManager::POWER_BUTTON_PIN, ESP_GPIO_WAKEUP_GPIO_LOW);
-  // Enter Deep Sleep
-  esp_deep_sleep_start();
-}
-
-void HalGPIO::verifyPowerButtonWakeup(uint16_t requiredDurationMs, bool shortPressAllowed) {
+bool HalGPIO::verifyPowerButtonWakeup(uint16_t requiredDurationMs, bool shortPressAllowed) {
   if (shortPressAllowed) {
     // Fast path - no duration check needed
-    return;
+    return true;
   }
   // TODO: Intermittent edge case remains: a single tap followed by another single tap
   // can still power on the device. Tighten wake debounce/state handling here.
 
-  // Calibrate: subtract boot time already elapsed, assuming button held since boot
-  const uint16_t calibration = millis();
-  const uint16_t calibratedDuration = (calibration < requiredDurationMs) ? (requiredDurationMs - calibration) : 1;
+  // Calibrate: subtract boot time already elapsed, assuming button held since boot.
+  const unsigned long calibration = millis();
+  const unsigned long calibratedDuration = (calibration < requiredDurationMs) ? (requiredDurationMs - calibration) : 1;
 
   const auto start = millis();
   inputMgr.update();
@@ -262,11 +250,12 @@ void HalGPIO::verifyPowerButtonWakeup(uint16_t requiredDurationMs, bool shortPre
       inputMgr.update();
     } while (inputMgr.isPressed(BTN_POWER) && inputMgr.getPowerButtonHeldTime() < calibratedDuration);
     if (inputMgr.getPowerButtonHeldTime() < calibratedDuration) {
-      startDeepSleep();
+      return false;
     }
   } else {
-    startDeepSleep();
+    return false;
   }
+  return true;
 }
 
 bool HalGPIO::isUsbConnected() const {

lib/hal/HalGPIO.h

@@ -72,13 +72,10 @@ class HalGPIO {
   unsigned long getHeldTime() const;
   unsigned long getPowerButtonHeldTime() const;
 
-  // Setup wake up GPIO and enter deep sleep
-  void startDeepSleep();
-
   // Verify power button was held long enough after wakeup.
-  // If verification fails, enters deep sleep and does not return.
+  // Returns true if verification succeeded, false if device should return to sleep.
   // Should only be called when wakeup reason is PowerButton.
-  void verifyPowerButtonWakeup(uint16_t requiredDurationMs, bool shortPressAllowed);
+  bool verifyPowerButtonWakeup(uint16_t requiredDurationMs, bool shortPressAllowed);
 
   // Check if USB is connected
   bool isUsbConnected() const;

platformio.ini

@@ -13,10 +13,7 @@ framework = arduino
 monitor_speed = 115200
 upload_speed = 921600
 check_tool = cppcheck
-; missingInclude (project headers) is suppressed alongside missingIncludeSystem: on a
-; fresh CI checkout cppcheck has no resolved include paths, so it reports every
-; project header as missing (~470 information-level lines) and fails the job.
-check_flags = --enable=all --suppress=missingIncludeSystem --suppress=missingInclude --suppress=unusedFunction --suppress=unmatchedSuppression --suppress=*:*/.pio/* --inline-suppr
+check_flags = --enable=all --suppress=missingIncludeSystem --suppress=unusedFunction --suppress=unmatchedSuppression --suppress=*:*/.pio/* --inline-suppr
 check_skip_packages = yes
 
 board_upload.flash_size = 16MB
@@ -45,14 +42,7 @@ build_flags =
   -DWOLFSSL_OPTIONS_H
   -DWOLFSSL_CLIENT_EXAMPLE
   -DWOLFSSL_TLS13
-# MEMFIX-PORT: single-precision ECC (sp_c32.c). Without it every P-256 operation
-# (TLS 1.3 key_share keygen, ECDHE, ECDSA cert verify) runs on fast-math bignums
-# that WOLFSSL_SMALL_STACK heap-allocates at FP_MAX_BITS size -- tens of KB of
-# temporaries, which OOMs (MP_MEM) at the ~50KB free heap a reading session
-# leaves. SP uses fixed 256-bit arrays: a few KB, and several times faster.
-# SP_SMALL trades the large precomputed point tables for smaller flash.
-  -DWOLFSSL_HAVE_SP_ECC
-  -DWOLFSSL_SP_SMALL
+  -DWOLFSSL_SP_RISCV32
   -DHAVE_TLS_EXTENSIONS
   -DHAVE_SUPPORTED_CURVES
   -DHAVE_HKDF
@@ -63,16 +53,6 @@ build_flags =
   -Wno-bidi-chars
   -Wl,--wrap=panic_print_backtrace,--wrap=panic_abort,--wrap=bootloader_common_check_efuse_blk_validity
   -fno-exceptions
-# FreeInk panel profiles: compile both X3 (792x528/UC8253) and X4 (800x480/SSD1677);
-# the firmware picks the active one at runtime via HalDisplay setDisplayX3().
-  -DFREEINK_DEVICE_X3=1
-  -DFREEINK_DEVICE_X4=1
-# BLE HID page-turner host (BleKeyboardHost). NimBLE role/bond config is baked into
-# the prebuilt arduino-esp32 framework's sdkconfig.h, so we don't redefine it here
-# (doing so only warns and has no effect). The host only compiles when
-# FREEINK_CAP_BLE_HID_HOST is set on the env (below); with the capability off,
-# BleKeyboardHost links stubs and pulls in zero NimBLE code.
-  -DFREEINK_BLE_HID_SHOW_UNNAMED_DEVICES=0
 
 build_unflags =
   -std=gnu++11
@@ -83,63 +63,6 @@ board_build.flash_mode = dio
 board_build.flash_size = 16MB
 board_build.partitions = partitions.csv
 
-; Shrink the NimBLE footprint for a 1-connection HID host moving 3-6 byte reports.
-; Field-measured: begin() costs ~52 KB with these trims vs ~68 KB with the prebuilt
-; framework defaults — and that 15 KB is the difference between the stack landing
-; above the reader's render shed floor (stable coexistence) and below it (a
-; guaranteed shed/restart flap). Rebuilds the Arduino core libs on first build
-; (slower once, cached after; needs the CMake pin in platformio.local.ini on macOS).
-custom_sdkconfig =
-  CONFIG_BT_NIMBLE_ROLE_PERIPHERAL=n
-  CONFIG_BT_NIMBLE_ROLE_BROADCASTER=n
-  CONFIG_BT_NIMBLE_MAX_CONNECTIONS=1
-  CONFIG_BT_NIMBLE_MAX_CCCDS=2
-  CONFIG_BT_NIMBLE_ATT_PREFERRED_MTU=23
-  CONFIG_BT_NIMBLE_MSYS_1_BLOCK_COUNT=6
-  CONFIG_BT_NIMBLE_MSYS_2_BLOCK_COUNT=6      ; was 24 x 320 B
-  CONFIG_BT_NIMBLE_ACL_BUF_COUNT=6           ; was 24 x 255 B
-  CONFIG_BT_NIMBLE_HCI_EVT_HI_BUF_COUNT=12   ; was 30 x 70 B; only scan bursts need many
-  ; IDF 5.5 sizes the HCI transport pools under TRANSPORT_* names; pin both spellings.
-  CONFIG_BT_NIMBLE_TRANSPORT_ACL_FROM_LL_COUNT=6
-  CONFIG_BT_NIMBLE_TRANSPORT_EVT_COUNT=12
-  CONFIG_BT_NIMBLE_ATT_MAX_PREP_ENTRIES=4    ; was 64; a HID host never does prepared writes
-  CONFIG_BT_CTRL_BLE_MAX_ACT=3               ; was 6; need conn + scan + initiate only
-  CONFIG_BT_CTRL_BLE_ADV_REPORT_FLOW_CTRL_NUM=50   ; was 100; pairing-time scan only
-  CONFIG_BT_CTRL_ADV_DUP_FILT_MAX=10               ; was 30
-  ; MEMFIX-PORT: task stack right-sizing (~7 KB); NOTE develop has no
-  ; custom_sdkconfig block — port via sdkconfig.defaults or equivalent.
-  ; Task stack right-sizing from measured high-water marks (heap block map +
-  ; per-task stack audit, July 2026): esp_timer used ~0.8 KB of 8 KB across
-  ; every capture incl. BLE sessions; the FreeRTOS timer service used ~0.5 KB
-  ; of 4 KB. Neither runs TLS or app code. ~7 KB back to the heap.
-  CONFIG_ESP_TIMER_TASK_STACK_SIZE=4096
-  CONFIG_FREERTOS_TIMER_TASK_STACK_DEPTH=2560
-  ; Move the WiFi stack's non-critical hot paths out of IRAM into flash.
-  ; On the C3, IRAM and DRAM share one SRAM pool, so the ~25-30 KB this
-  ; frees lands directly in the heap — paid for with lower WiFi throughput
-  ; during transfers (occasional sync/OTA use, not streaming: acceptable).
-  ; IRAM cost is static, so the heap gain applies even with WiFi off.
-  CONFIG_ESP_WIFI_IRAM_OPT=n
-  CONFIG_ESP_WIFI_RX_IRAM_OPT=n
-  ; Keep the Arduino wrappers for the removed cloud components (below) out of
-  ; the core source list; all other bundled libraries default to enabled.
-  CONFIG_ARDUINO_SELECTIVE_COMPILATION=y
-  CONFIG_ARDUINO_SELECTIVE_RainMaker=n
-  CONFIG_ARDUINO_SELECTIVE_Insights=n
-
-; Drop unused cloud components from the core rebuild. esp_insights/rainmaker
-; require embedded server certs the lib builder can't generate
-; ("https_server.crt.S not found"); this firmware uses none of them.
-custom_component_remove =
-  espressif/esp_insights
-  espressif/esp_rainmaker
-  espressif/esp_diagnostics
-  espressif/esp_diag_data_store
-  espressif/esp_schedule
-  espressif/esp_rcp_update
-  espressif/esp_secure_cert_mgr
-  espressif/cbor
-
 extra_scripts =
   pre:scripts/patch_wolfssl.py
   pre:scripts/build_html.py
@@ -154,16 +77,11 @@ lib_deps =
   InputManager=symlink://freeink-sdk/libs/hardware/InputManager
   EInkDisplay=symlink://freeink-sdk/libs/display/FreeInkDisplay
   SDCardManager=symlink://freeink-sdk/libs/hardware/SDCardManager
-  ; FreeInk HAL support libs the above depend on (BoardConfig pin maps, etc.).
   BoardConfig=symlink://freeink-sdk/libs/hardware/BoardConfig
   PowerManager=symlink://freeink-sdk/libs/hardware/PowerManager
-  Rtc=symlink://freeink-sdk/libs/hardware/Rtc
-  Imu=symlink://freeink-sdk/libs/hardware/Imu
   SecureNet=symlink://freeink-sdk/libs/network/SecureNet
   FreeInkUI=symlink://freeink-sdk/libs/ui/FreeInkUI
   Icons=symlink://freeink-sdk/libs/assets/Icons
-  BleKeyboardHost=symlink://freeink-sdk/libs/network/BleKeyboardHost
-  h2zero/NimBLE-Arduino @ ^2.3.8
   bblanchon/ArduinoJson @ 7.4.2
   ricmoo/QRCode @ 0.0.1
   bitbank2/PNGdec @ 1.1.6
@@ -181,9 +99,6 @@ build_flags =
   ; CROSSPOINT_VERSION is set by scripts/git_branch.py (includes branch + short SHA)
   -DENABLE_SERIAL_LOG
   -DLOG_LEVEL=2 ; Set log level to debug for development builds
-  -DFREEINK_CAP_BLE_HID_HOST=1 ; BLE HID page-turner host (NimBLE)
-  -DFREEINK_BLE_HID_SCAN_DEBUG=1 ; verbose BLE scan lifecycle/advertisement logs for bring-up
-  -DFREEINK_BLE_HID_REPORT_DEBUG=1 ; raw HID report hex dumps + report-map hints (bring-up)
 
 
 [env:gh_release]
@@ -193,7 +108,6 @@ build_flags =
   -DCROSSPOINT_VERSION=\"${crosspoint.version}\"
   -DENABLE_SERIAL_LOG
   -DLOG_LEVEL=1 ; Set log level to info for release builds
-  -DFREEINK_CAP_BLE_HID_HOST=1 ; BLE HID page-turner host (NimBLE)
 
 [env:gh_release_rc]
 extends = base
@@ -202,7 +116,6 @@ build_flags =
   -DCROSSPOINT_VERSION=\"${crosspoint.version}-rc+${sysenv.CROSSPOINT_RC_HASH}\"
   -DENABLE_SERIAL_LOG
   -DLOG_LEVEL=1 ; Set log level to info for release candidate builds
-  -DFREEINK_CAP_BLE_HID_HOST=1 ; BLE HID page-turner host (NimBLE)
 
 [env:slim]
 extends = base

scripts/patch_wolfssl.py

@@ -12,12 +12,8 @@ OVERRIDES = f"""
 #ifndef HAVE_FFDHE_2048
 #define HAVE_FFDHE_2048
 #endif
-/* MEMFIX-PORT: 8192 handles up to RSA-4096 keys (the public-CA maximum,
-   ISRG Root X1 included) with half the per-bignum heap of 16384: with
-   WOLFSSL_SMALL_STACK each fast-math temp is FP_MAX_BITS/8 * 2 bytes on the
-   heap, and TLS cert verification allocates dozens at once. */
 #undef FP_MAX_BITS
-#define FP_MAX_BITS 8192
+#define FP_MAX_BITS 16384
 """
 
 

src/BleInput.cpp

@@ -1,121 +0,0 @@
-#include "BleInput.h"
-
-#include <GfxRenderer.h>
-#include <HalPowerManager.h>
-#include <I18n.h>
-
-#include <cstdio>
-#include <cstring>
-
-#include "MappedInputManager.h"
-#include "components/UITheme.h"
-
-namespace bleinput {
-
-namespace {
-volatile bool g_startInProgress = false;
-}
-
-// NimBLE controller init/deinit hang (interrupt WDT) if run at the 10 MHz low-power
-// frequency, so force normal CPU speed around both. Centralized here so every caller
-// (boot restore, settings toggle, reader toggle, sleep) is covered automatically.
-bool ensureStarted() {
-  g_startInProgress = true;
-  HalPowerManager::Lock powerLock;
-  const bool ok = BleHid.begin(kHostName);
-  g_startInProgress = false;
-  return ok;
-}
-
-bool startInProgress() { return g_startInProgress; }
-
-// Full teardown (NimBLE deinit), not just a link drop, so the BLE stack's RAM is
-// returned to the heap — otherwise memory-hungry work like EPUB inflate can't
-// allocate even after the user turns Bluetooth off.
-void stop() {
-  HalPowerManager::Lock powerLock;
-  BleHid.end();
-}
-
-bool encodeKey(const freeink::KeyEvent& ev, uint8_t& kind, uint8_t& value) {
-  if (ev.special != freeink::SpecialKey::None) {
-    kind = 0;
-    value = static_cast<uint8_t>(ev.special);
-    return true;
-  }
-  if (ev.keycode != 0) {
-    kind = 1;
-    value = ev.keycode;
-    return true;
-  }
-  return false;
-}
-
-namespace {
-const char* specialName(uint8_t value) {
-  switch (static_cast<freeink::SpecialKey>(value)) {
-    case freeink::SpecialKey::Enter:
-      return "Enter";
-    case freeink::SpecialKey::Backspace:
-      return "Backspace";
-    case freeink::SpecialKey::Tab:
-      return "Tab";
-    case freeink::SpecialKey::Escape:
-      return "Escape";
-    case freeink::SpecialKey::Delete:
-      return "Delete";
-    case freeink::SpecialKey::Left:
-      return "Left";
-    case freeink::SpecialKey::Right:
-      return "Right";
-    case freeink::SpecialKey::Up:
-      return "Up";
-    case freeink::SpecialKey::Down:
-      return "Down";
-    case freeink::SpecialKey::Home:
-      return "Home";
-    case freeink::SpecialKey::End:
-      return "End";
-    case freeink::SpecialKey::PageUp:
-      return "Page Up";
-    case freeink::SpecialKey::PageDown:
-      return "Page Down";
-    default:
-      return nullptr;
-  }
-}
-}  // namespace
-
-void showConnectingUntilLinked(const GfxRenderer& renderer, const MappedInputManager& input) {
-  if (!BleHid.isRunning() || BleHid.isConnected()) return;
-  // drawPopup refreshes the panel itself, so draw once and let e-ink hold it while we
-  // pump the host. Holds until the remote links, the user presses a button to bail, or
-  // a generous timeout (a remote that slept after a disconnect needs a button to wake).
-  GUI.drawPopup(renderer, tr(STR_BT_CONNECTING_POPUP));
-  const unsigned long deadline = millis() + 10000;
-  while (!BleHid.isConnected() && millis() < deadline) {
-    BleHid.poll();
-    input.update();
-    if (input.wasAnyPressed()) break;
-    delay(50);
-  }
-  // Note: the caller must redraw to clear the popup. For grayscale reader pages the
-  // caller should also request a ghost-cleanup (HALF) refresh first — a plain fast/
-  // partial refresh ghosts badly over the BW popup (see Activity::requestGhostCleanup).
-}
-
-void describeKey(uint8_t kind, uint8_t value, char* out, size_t outLen) {
-  if (!out || outLen == 0) return;
-  if (kind == 0) {
-    const char* name = specialName(value);
-    if (name) {
-      strncpy(out, name, outLen - 1);
-      out[outLen - 1] = '\0';
-      return;
-    }
-  }
-  // Printable ASCII usage handled as a generic key code; show the raw value.
-  snprintf(out, outLen, "Key 0x%02X", static_cast<unsigned>(value));
-}
-
-}  // namespace bleinput

src/BleInput.h

@@ -1,62 +0,0 @@
-#pragma once
-
-// CrossPoint <-> FreeInk BLE HID host glue.
-//
-// Thin, capability-safe helpers around freeink::BleKeyboardHost (the `BleHid`
-// singleton). When FREEINK_CAP_BLE_HID_HOST is compiled out the SDK links stubs,
-// so every call here is still valid and simply no-ops / returns false — callers
-// need no #ifdefs.
-//
-// The (kind, value) pair produced by encodeKey() is the stable identity stored in
-// CrossPointSettings::bleKeyMap. Page-turner remotes emit "special" keys
-// (PageUp/PageDown/arrows); plain keyboards emit usage codes. We deliberately
-// ignore modifiers and the printable char for matching (page turners don't use
-// modifiers), keeping the persisted entry a trivial two-byte comparison.
-
-#include <BleKeyboardHost.h>
-
-#include <cstdint>
-
-class GfxRenderer;
-class MappedInputManager;
-
-namespace bleinput {
-
-// Advertised central name shown to peripherals during pairing.
-inline constexpr const char* kHostName = "CrossPoint";
-
-// Heap floor for starting the NimBLE stack (measured begin() cost: ~52-57 KB).
-// The reader now lends the framebuffer to section builds, so BLE startup no
-// longer needs to reserve the old full build headroom. Keep a modest margin and
-// let the render/build shed paths handle genuinely tight moments.
-inline constexpr size_t kStartMinFreeHeap = 56 * 1024;
-
-// Lower floor for the Bluetooth settings screen, where the user has explicitly asked
-// for BLE right now (scanning/pairing is dead without the stack). No page renders or
-// section builds run there, so the reader-sized reserve above doesn't apply — only
-// NimBLE's own ~57 KB plus working margin.
-inline constexpr size_t kStartMinFreeHeapExplicit = 70 * 1024;
-
-// Start the BLE HID host (idempotent). Returns false if BLE is compiled out or
-// NimBLE init failed. Safe to call repeatedly.
-bool ensureStarted();
-bool startInProgress();
-
-// Drop the active link (e.g. before deep sleep or when the user disables BT).
-void stop();
-
-// Encode a decoded key event into the stable (kind, value) identity used by the
-// settings map. kind: 0 = SpecialKey, 1 = HID usage. Returns false when the event
-// carries no usable identity (no special key and no usage code).
-bool encodeKey(const freeink::KeyEvent& ev, uint8_t& kind, uint8_t& value);
-
-// Human-readable name for a stored (kind, value) identity, for the mapping UI.
-// Writes a null-terminated string into out (e.g. "Page Down", "Key 0x4B").
-void describeKey(uint8_t kind, uint8_t value, char* out, size_t outLen);
-
-// Draw a "BT Connecting..." popup and pump the BLE host until the bonded remote
-// links, the user presses a button to dismiss, or a timeout. No-op if BLE isn't
-// running or is already connected. The caller must redraw afterward to clear it.
-void showConnectingUntilLinked(const GfxRenderer& renderer, const MappedInputManager& input);
-
-}  // namespace bleinput

src/CrossPointSettings.h

@@ -29,8 +29,8 @@ class CrossPointSettings {
     LIGHT = 1,
     CUSTOM = 2,
     COVER = 3,
-    BLANK = 4,
-    COVER_CUSTOM = 5,
+    COVER_CUSTOM = 4,
+    BLANK = 5,
     QUICK_RESUME = 6,
     SLEEP_SCREEN_MODE_COUNT
   };
@@ -225,22 +225,6 @@ class CrossPointSettings {
   uint8_t frontButtonConfirm = FRONT_HW_CONFIRM;
   uint8_t frontButtonLeft = FRONT_HW_LEFT;
   uint8_t frontButtonRight = FRONT_HW_RIGHT;
-  // --- Bluetooth (BLE HID page-turner) ---
-  // Master on/off for the BLE HID host. Persisted; auto-restored on boot/wake.
-  // Managed by BluetoothSettingsActivity and the in-reader "Toggle Bluetooth" menu item.
-  uint8_t bluetoothEnabled = 0;
-  // Remote-button mapping table: each slot binds a decoded BLE key identity to a
-  // logical MappedInputManager::Button. Fixed-capacity POD (no heap), persisted
-  // manually in JsonSettingsIO (like the front-button remap). 0xFF = empty/unassigned.
-  // Headroom for several buttons plus optional presets and rolling-code remotes
-  // (some buttons emit more than one code). Each entry is 3 bytes.
-  static constexpr uint8_t BLE_MAP_CAPACITY = 10;
-  struct BleKeyMapEntry {
-    uint8_t keyKind = 0xFF;  // 0 = SpecialKey, 1 = HID usage code; 0xFF = empty slot
-    uint8_t keyValue = 0;    // (uint8_t)freeink::SpecialKey, or the raw HID usage id
-    uint8_t button = 0xFF;   // (uint8_t)MappedInputManager::Button; 0xFF = unassigned
-  };
-  BleKeyMapEntry bleKeyMap[BLE_MAP_CAPACITY] = {};
   // Reader font settings
   uint8_t fontFamily = NOTOSERIF;
   uint8_t fontSize = MEDIUM;
@@ -254,6 +238,14 @@ class CrossPointSettings {
 
   // Reader screen margin settings
   uint8_t screenMargin = 5;
+  // OPDS download destination folder ("" = SD root). Global; edited from the
+  // OPDS server list. Persisted via a category-less SettingInfo::String in
+  // SettingsList.h, so it stays out of the on-device Settings screen.
+  char opdsDownloadFolder[64] = "";
+  // On-disk filename format for OPDS downloads (0=Author-Title default, 1=Title-Author,
+  // 2=Title). See OpdsFilenameFormat. Persisted via a category-less SettingInfo::Enum,
+  // edited from the OPDS server list; hidden from the on-device Settings screen.
+  uint8_t opdsFilenameFormat = 0;
   // Hide battery percentage
   uint8_t hideBatteryPercentage = HIDE_NEVER;
   // Long-press page turn button behavior
@@ -279,6 +271,8 @@ class CrossPointSettings {
   uint8_t removeReadBooksFromRecents = 0;
   // Move epub to /Read/ folder on SD card when finished (0 = disabled, 1 = enabled)
   uint8_t moveFinishedToReadFolder = 0;
+  // Short press Back goes to file browser instead of home (0 = disabled, 1 = enabled)
+  uint8_t backShortToFileBrowser = 0;
   // Image rendering mode in EPUB reader
   uint8_t imageRendering = IMAGES_DISPLAY;
   // Tilt-based page turning (X3 only — requires QMI8658 IMU)

src/HeapMap.cpp

@@ -1,85 +0,0 @@
-#include "HeapMap.h"
-
-#include <Arduino.h>
-#include <Logging.h>
-#include <Memory.h>
-#include <esp_heap_caps.h>
-
-#include <cstdio>
-
-#include "rom/ets_sys.h"
-
-// heap_caps_dump walks each heap inside a critical section (interrupts
-// masked), so its output can neither go through the UART-0 ROM path we can't
-// see nor be flow-controlled toward the CDC (the CDC ring drains in an
-// interrupt handler — waiting deadlocks into the interrupt WDT,
-// field-verified). Instead the ROM putc parses each line into a compact
-// record; the captured table is logged after the dump with interrupts live.
-namespace heapmap {
-namespace {
-struct BlockRec {
-  uint32_t addr;
-  uint32_t size;
-  bool free;
-};
-constexpr uint16_t kMaxRecs = 1400;
-BlockRec* g_recs = nullptr;  // borrowed buffer, valid only during capture
-uint16_t g_recCount = 0;
-bool g_overflowed = false;
-char g_line[96];
-uint8_t g_lineLen = 0;
-
-void captInterpolatePutc(char c) {
-  if (c != '\n') {
-    if (g_lineLen < sizeof(g_line) - 1) g_line[g_lineLen++] = c;
-    return;
-  }
-  g_line[g_lineLen] = '\0';
-  g_lineLen = 0;
-  // e.g. "Block 0x3fcc69bc data, size: 89424 bytes, Free: Yes"
-  unsigned addr = 0, size = 0;
-  char freeWord[4] = {0};
-  if (sscanf(g_line, "Block 0x%x data, size: %u bytes, Free: %3s", &addr, &size, freeWord) == 3) {
-    if (g_recs && g_recCount < kMaxRecs) {
-      g_recs[g_recCount++] = {addr, size, freeWord[0] == 'Y'};
-    } else {
-      g_overflowed = true;
-    }
-  }
-}
-}  // namespace
-
-void dump() {
-  auto recBuf = makeUniqueNoThrow<BlockRec[]>(kMaxRecs);
-  if (!recBuf) {
-    LOG_ERR("MEM", "heap map skipped: no room for capture buffer");
-    return;
-  }
-  g_recs = recBuf.get();
-  g_recCount = 0;
-  g_overflowed = false;
-  g_lineLen = 0;
-  // Capture (interrupts masked inside the dump): parse into records, never
-  // wait. Log the table afterward with the system live. NOTE: the capture
-  // buffer itself appears in the map as a used block of ~17.4 KB — it frees
-  // on return (observer effect, do not chase it as a leak/splitter).
-  ets_install_putc1(&captInterpolatePutc);
-  heap_caps_dump(MALLOC_CAP_8BIT);
-  ets_install_uart_printf();
-  g_recs = nullptr;
-
-  LOG_DBG("MEM", "---- heap block map: %u blocks%s ----", g_recCount, g_overflowed ? " (TRUNCATED)" : "");
-  uint32_t dustCount = 0, dustBytes = 0;
-  for (uint16_t i = 0; i < g_recCount; ++i) {
-    const auto& r = recBuf[i];
-    if (r.free || r.size >= 256) {
-      LOG_DBG("MEM", "%s 0x%08x %u", r.free ? "FREE" : "used", r.addr, r.size);
-    } else {
-      dustCount++;
-      dustBytes += r.size;
-    }
-  }
-  LOG_DBG("MEM", "dust: %u used blocks < 256B totaling %u bytes", dustCount, dustBytes);
-  LOG_DBG("MEM", "---- end heap block map ----");
-}
-}  // namespace heapmap

src/HeapMap.h

@@ -1,10 +0,0 @@
-#pragma once
-
-// MEMFIX-PORT: heap block map (on-demand via CMD:MEMMAP + reader one-shot); portable, no BLE dependency
-namespace heapmap {
-// Capture-and-log the DRAM heap block map (address/size/free per block,
-// sub-256B used blocks rolled up as "dust"). Safe to call from the main loop;
-// ~60-100 LOG_DBG lines. See HeapMap.cpp for why capture-then-log is the only
-// shape that works (heap_caps_dump runs with interrupts masked).
-void dump();
-}  // namespace heapmap

src/JsonSettingsIO.cpp

@@ -7,13 +7,11 @@
 
 #include <algorithm>
 #include <cstring>
-#include <iterator>
 #include <string>
 
 #include "BookmarkEntry.h"
 #include "CrossPointSettings.h"
 #include "CrossPointState.h"
-#include "MappedInputManager.h"
 #include "OpdsServerStore.h"
 #include "RecentBooksStore.h"
 #include "SettingsList.h"
@@ -145,16 +143,6 @@ bool JsonSettingsIO::saveSettings(const CrossPointSettings& s, const char* path)
   doc["frontButtonConfirm"] = s.frontButtonConfirm;
   doc["frontButtonLeft"] = s.frontButtonLeft;
   doc["frontButtonRight"] = s.frontButtonRight;
-  // Bluetooth — managed by BluetoothSettingsActivity, not in SettingsList.
-  doc["bluetoothEnabled"] = s.bluetoothEnabled;
-  JsonArray bleMap = doc["bleKeyMap"].to<JsonArray>();
-  for (const auto& e : s.bleKeyMap) {
-    if (e.keyKind == 0xFF || e.button == 0xFF) continue;  // skip empty/unassigned slots
-    JsonObject o = bleMap.add<JsonObject>();
-    o["k"] = e.keyKind;
-    o["v"] = e.keyValue;
-    o["b"] = e.button;
-  }
   // Font family — uses dynamic getter/setter in SettingsList so the generic loop skips it.
   doc["fontFamily"] = s.fontFamily;
   // SD card font family name — not in SettingsList, save manually
@@ -252,23 +240,6 @@ bool JsonSettingsIO::loadSettings(CrossPointSettings& s, const char* json, bool*
       clamp(doc["frontButtonRight"] | (uint8_t)S::FRONT_HW_RIGHT, S::FRONT_BUTTON_HARDWARE_COUNT, S::FRONT_HW_RIGHT);
   CrossPointSettings::validateFrontButtonMapping(s);
 
-  // Bluetooth — managed by BluetoothSettingsActivity, not in SettingsList.
-  s.bluetoothEnabled = clamp(doc["bluetoothEnabled"] | (uint8_t)0, 2, 0);
-  std::fill(std::begin(s.bleKeyMap), std::end(s.bleKeyMap), CrossPointSettings::BleKeyMapEntry{});  // reset to empty
-  JsonArrayConst bleMap = doc["bleKeyMap"];
-  if (!bleMap.isNull()) {
-    uint8_t slot = 0;
-    for (JsonObjectConst o : bleMap) {
-      if (slot >= CrossPointSettings::BLE_MAP_CAPACITY) break;
-      const uint8_t button = o["b"] | (uint8_t)0xFF;
-      if (button >= MappedInputManager::kButtonCount) continue;  // drop invalid mappings
-      s.bleKeyMap[slot].keyKind = o["k"] | (uint8_t)0xFF;
-      s.bleKeyMap[slot].keyValue = o["v"] | (uint8_t)0;
-      s.bleKeyMap[slot].button = button;
-      slot++;
-    }
-  }
-
   // Font family — uses dynamic getter/setter in SettingsList so the generic loop skips it.
   const uint8_t storedFontFamily = doc["fontFamily"] | (uint8_t)0;
   s.fontFamily = clamp(storedFontFamily, CrossPointSettings::BUILTIN_FONT_COUNT, 0);

src/MappedInputManager.cpp

@@ -2,7 +2,6 @@
 
 #include <GfxRenderer.h>
 
-#include "BleInput.h"
 #include "CrossPointSettings.h"
 
 bool MappedInputManager::isNavDirectionSwapped() const {
@@ -75,105 +74,17 @@ bool MappedInputManager::mapButton(const Button button, bool (HalGPIO::*fn)(uint
   return false;
 }
 
-bool MappedInputManager::bleEdge(const bool* arr, const Button button) const {
-  // Mirror mapButton()'s composite navigation handling so a BLE key bound to a
-  // physical direction also satisfies the derived NavNext / NavPrevious logical
-  // buttons (used by list navigation), respecting the orientation axis flip.
-  switch (button) {
-    case Button::NavNext:
-      return isNavDirectionSwapped() ? (arr[(int)Button::Up] || arr[(int)Button::Left])
-                                     : (arr[(int)Button::Down] || arr[(int)Button::Right]);
-    case Button::NavPrevious:
-      return isNavDirectionSwapped() ? (arr[(int)Button::Down] || arr[(int)Button::Right])
-                                     : (arr[(int)Button::Up] || arr[(int)Button::Left]);
-    default:
-      return arr[(int)button];
-  }
-}
+bool MappedInputManager::wasPressed(const Button button) const { return mapButton(button, &HalGPIO::wasPressed); }
 
-bool MappedInputManager::wasPressed(const Button button) const {
-  return mapButton(button, &HalGPIO::wasPressed) || bleEdge(blePressEdge, button);
-}
+bool MappedInputManager::wasReleased(const Button button) const { return mapButton(button, &HalGPIO::wasReleased); }
 
-bool MappedInputManager::wasReleased(const Button button) const {
-  return mapButton(button, &HalGPIO::wasReleased) || bleEdge(bleReleaseEdge, button);
-}
-
-bool MappedInputManager::isPressed(const Button button) const {
-  // A BLE tap is momentary: report "pressed" only on the press-edge frame.
-  return mapButton(button, &HalGPIO::isPressed) || bleEdge(blePressEdge, button);
-}
-
-void MappedInputManager::setBleCaptureMode(const bool on) {
-  bleCaptureMode = on;
-  bleHasCaptured = false;
-  if (on) {
-    // Clear any stale overlay so a held remote key doesn't leak into the UI.
-    for (uint8_t i = 0; i < kButtonCount; i++) {
-      blePressEdge[i] = false;
-      bleReleaseEdge[i] = false;
-    }
-  }
-}
-
-bool MappedInputManager::takeCapturedBleKey(uint8_t& kind, uint8_t& value) {
-  if (!bleHasCaptured) return false;
-  kind = bleCapturedKind;
-  value = bleCapturedValue;
-  bleHasCaptured = false;
-  return true;
-}
-
-void MappedInputManager::pollBle() {
-  bleActivityThisFrame = false;
-  // Age last frame's press edges into this frame's release edges (the FreeInk host
-  // surfaces presses + synthetic repeats but never releases), then clear presses. A
-  // pending release also counts as BLE activity this frame so getHeldTime() reports
-  // zero on the release frame too (page-turn handlers often fire on release).
-  for (uint8_t i = 0; i < kButtonCount; i++) {
-    bleReleaseEdge[i] = blePressEdge[i];
-    blePressEdge[i] = false;
-    if (bleReleaseEdge[i]) bleActivityThisFrame = true;
-  }
-
-  freeink::KeyEvent ev;
-  while (BleHid.popKey(ev)) {
-    uint8_t kind = 0xFF;
-    uint8_t value = 0;
-    if (!bleinput::encodeKey(ev, kind, value)) continue;
-
-    if (bleCaptureMode) {
-      bleCapturedKind = kind;
-      bleCapturedValue = value;
-      bleHasCaptured = true;
-      continue;
-    }
-
-    // Resolve the key identity against the persisted mapping table.
-    for (const auto& e : SETTINGS.bleKeyMap) {
-      if (e.button == 0xFF || e.keyKind != kind || e.keyValue != value) continue;
-      if (e.button < kButtonCount) {
-        blePressEdge[e.button] = true;
-        bleActivityThisFrame = true;
-      }
-      break;
-    }
-  }
-}
+bool MappedInputManager::isPressed(const Button button) const { return mapButton(button, &HalGPIO::isPressed); }
 
 bool MappedInputManager::wasAnyPressed() const { return gpio.wasAnyPressed(); }
 
 bool MappedInputManager::wasAnyReleased() const { return gpio.wasAnyReleased(); }
 
-unsigned long MappedInputManager::getHeldTime() const {
-  // A BLE-mapped key is a momentary tap with no physical hold (we don't model BLE
-  // press-and-hold). gpio.getHeldTime() returns the *last physical* button's hold
-  // duration, which is stale — if a BLE edge drove input this frame, reporting that
-  // stale value makes a tap look like a long-press (e.g. page tap -> chapter skip).
-  // Report zero in that case so BLE taps are always treated as short presses.
-  if (bleActivityThisFrame) return 0;
-  return gpio.getHeldTime();
-}
+unsigned long MappedInputManager::getHeldTime() const { return gpio.getHeldTime(); }
 
 MappedInputManager::Labels MappedInputManager::mapLabels(const char* back, const char* confirm, const char* previous,
                                                          const char* next) const {

src/MappedInputManager.h

@@ -7,9 +7,6 @@ class GfxRenderer;
 class MappedInputManager {
  public:
   enum class Button { Back, Confirm, Left, Right, Up, Down, Power, PageBack, PageForward, NavNext, NavPrevious };
-  // Number of values in Button (Back..NavPrevious). Used to size the BLE overlay and
-  // to clamp persisted BLE mappings. Keep in sync with the enum above.
-  static constexpr uint8_t kButtonCount = 11;
 
   struct Labels {
     const char* btn1;
@@ -31,23 +28,6 @@ class MappedInputManager {
   // Returns the raw front button index that was pressed this frame (or -1 if none).
   int getPressedFrontButton() const;
 
-  // --- BLE page-turner overlay -------------------------------------------------
-  // Drain decoded key events from the FreeInk BLE HID host and translate the ones
-  // bound in SETTINGS.bleKeyMap into per-frame logical-button edges that OR into
-  // wasPressed()/isPressed()/wasReleased(). Call once per main-loop iteration,
-  // right after gpio.update() and BleHid.poll(). No-ops when BLE is compiled out.
-  void pollBle();
-  // True when a mapped BLE key produced an edge this frame — keeps the inactivity
-  // / auto-sleep timer alive while a remote is the only input device in use.
-  bool bleHadActivityThisFrame() const { return bleActivityThisFrame; }
-  // Capture mode: while on, pollBle() stops mapping events and instead stashes the
-  // raw decoded key identity so the button-mapping UI can read it without racing the
-  // live mapping over the single popKey() queue.
-  void setBleCaptureMode(bool on);
-  // Pop a captured (kind, value) key identity grabbed while in capture mode.
-  // Returns false when nothing has been captured since the last call.
-  bool takeCapturedBleKey(uint8_t& kind, uint8_t& value);
-
   // True when the control axis is flipped relative to the physical buttons: the user opted into
   // orientation-following front buttons AND the screen is *currently rendered* rotated (INVERTED /
   // LANDSCAPE_CCW). Keyed on the live renderer orientation rather than the persisted reader setting,
@@ -64,17 +44,4 @@ class MappedInputManager {
   const GfxRenderer& renderer;
 
   bool mapButton(Button button, bool (HalGPIO::*fn)(uint8_t) const) const;
-  // OR-in the BLE overlay for a logical button, mirroring mapButton()'s composite
-  // handling of NavNext/NavPrevious so a remote key bound to Up/Down/Left/Right also
-  // drives list navigation.
-  bool bleEdge(const bool* arr, Button button) const;
-
-  // Per-frame BLE overlay, indexed by (uint8_t)Button.
-  bool blePressEdge[kButtonCount] = {};    // press edge this frame   -> wasPressed / isPressed
-  bool bleReleaseEdge[kButtonCount] = {};  // release edge this frame  -> wasReleased
-  bool bleActivityThisFrame = false;
-  bool bleCaptureMode = false;
-  bool bleHasCaptured = false;
-  uint8_t bleCapturedKind = 0xFF;
-  uint8_t bleCapturedValue = 0;
 };

src/SdCardFontSystem.h

@@ -32,10 +32,6 @@ class SdCardFontSystem {
   /// Non-const access to the registry (for FontInstaller).
   SdCardFontRegistry& registry() { return registry_; }
 
-  // MEMFIX-PORT: font system audit passthrough; portable
-  /// Resident heap held by loaded SD fonts (audit; see SdCardFont::reportMemory).
-  size_t reportFontMemory() const { return manager_.reportMemory(); }
-
   /// Mark the registry as needing re-discovery.
   /// Thread-safe: can be called from the web server task.
   void markRegistryDirty() { registryDirty_.store(true, std::memory_order_release); }

src/SettingsList.h

@@ -181,6 +181,8 @@ inline std::vector<SettingInfo> getSettingsList(const SdCardFontRegistry* regist
             "shortPwrBtn", StrId::STR_CAT_CONTROLS),
         SettingInfo::Toggle(StrId::STR_PWR_BTN_FOOTNOTE_BACK, &CrossPointSettings::pwrBtnFootnoteBack,
                             "pwrBtnFootnoteBack", StrId::STR_CAT_CONTROLS),
+        SettingInfo::Toggle(StrId::STR_BACK_SHORT_TO_FILE_BROWSER, &CrossPointSettings::backShortToFileBrowser,
+                            "backShortToFileBrowser", StrId::STR_CAT_CONTROLS),
 
         // --- System ---
         SettingInfo::Value(
@@ -194,6 +196,16 @@ inline std::vector<SettingInfo> getSettingsList(const SdCardFontRegistry* regist
         SettingInfo::Toggle(StrId::STR_MOVE_FINISHED_TO_READ, &CrossPointSettings::moveFinishedToReadFolder,
                             "moveFinishedToReadFolder", StrId::STR_CAT_SYSTEM),
 
+        // OPDS download folder: persisted + web-exposed, but category-less so it
+        // is hidden from the on-device Settings screen (edited via OPDS UI).
+        SettingInfo::String(StrId::STR_OPDS_DOWNLOAD_FOLDER, &SETTINGS.opdsDownloadFolder[0],
+                            sizeof(SETTINGS.opdsDownloadFolder), "opdsDownloadFolder"),
+        // OPDS download filename format: persisted + web-exposed, category-less so it
+        // is hidden from the on-device Settings screen (cycled from the OPDS UI).
+        SettingInfo::Enum(StrId::STR_OPDS_FILENAME_FORMAT, &CrossPointSettings::opdsFilenameFormat,
+                          {StrId::STR_FMT_AUTHOR_TITLE, StrId::STR_FMT_TITLE_AUTHOR, StrId::STR_FMT_TITLE},
+                          "opdsFilenameFormat"),
+
         // --- KOReader Sync (web-only, uses KOReaderCredentialStore) ---
         SettingInfo::DynamicString(
             StrId::STR_KOREADER_USERNAME, [] { return KOREADER_STORE.getUsername(); },
@@ -232,6 +244,14 @@ inline std::vector<SettingInfo> getSettingsList(const SdCardFontRegistry* regist
               KOREADER_STORE.saveToFile();
             },
             "koSendMetadata", StrId::STR_KOREADER_SYNC),
+        SettingInfo::DynamicEnum(
+            StrId::STR_SYNC_BEHAVIOR, {StrId::STR_ASK_EVERY_TIME, StrId::STR_SMART_SYNC},
+            [] { return static_cast<uint8_t>(KOREADER_STORE.getSyncBehavior()); },
+            [](uint8_t v) {
+              KOREADER_STORE.setSyncBehavior(static_cast<KOReaderSyncBehavior>(v));
+              KOREADER_STORE.saveToFile();
+            },
+            "koSyncBehavior", StrId::STR_KOREADER_SYNC),
         // --- Status Bar Settings (web-only, uses StatusBarSettingsActivity) ---
         SettingInfo::Toggle(StrId::STR_CHAPTER_PAGE_COUNT, &CrossPointSettings::statusBarChapterPageCount,
                             "statusBarChapterPageCount", StrId::STR_CUSTOMISE_STATUS_BAR),

src/SilentRestart.h

@@ -6,7 +6,3 @@
 
 void silentRestart();          // home screen
 void silentRestartToReader();  // currently-open EPUB (APP_STATE.openEpubPath)
-// True when this boot itself came from a silent restart. Callers that restart
-// as a last-resort defrag must check this so a failure that survives the
-// restart degrades to an error instead of a reboot loop.
-bool bootWasSilentRestart();

src/activities/Activity.h

@@ -44,17 +44,6 @@ class Activity {
   virtual bool skipLoopDelay() { return false; }
   virtual bool preventAutoSleep() { return false; }
   virtual bool isReaderActivity() const { return false; }
-  // True if this activity needs the BLE stack resident (beyond the readers, which are
-  // covered by isReaderActivity()). The Bluetooth settings screen overrides this so
-  // pairing/scanning works there. Everywhere else BLE is torn down to free heap.
-  virtual bool keepsBluetoothAlive() const { return false; }
-  // True while the current activity is doing heap-heavy work that must finish
-  // before the BLE stack (~52 KB) may start.
-  virtual bool deferBluetoothStart() const { return false; }
-  // Ask the activity to make its next render a full ghost-cleanup (HALF) refresh rather
-  // than a fast/partial one. Used after drawing a transient popup over grayscale content
-  // (e.g. the "BT Connecting..." popup over a reader page) so it clears without ghosting.
-  virtual void requestGhostCleanup() {}
   virtual ScreenshotInfo getScreenshotInfo() const { return {}; }
 
   // Start a new activity without destroying the current one

src/activities/ActivityManager.cpp

@@ -256,25 +256,6 @@ bool ActivityManager::isReaderActivity() const {
          (currentActivity && currentActivity->isReaderActivity());
 }
 
-bool ActivityManager::currentKeepsBluetoothAlive() const {
-  return currentActivity && currentActivity->keepsBluetoothAlive();
-}
-
-void ActivityManager::requestGhostCleanup() {
-  if (currentActivity) currentActivity->requestGhostCleanup();
-}
-
-bool ActivityManager::bluetoothShouldBeActive() const {
-  const auto wants = [](const auto& activity) {
-    return activity && (activity->isReaderActivity() || activity->keepsBluetoothAlive());
-  };
-  return std::any_of(stackActivities.begin(), stackActivities.end(), wants) || wants(currentActivity);
-}
-
-bool ActivityManager::bluetoothStartDeferred() const {
-  return currentActivity && currentActivity->deferBluetoothStart();
-}
-
 bool ActivityManager::skipLoopDelay() const { return currentActivity && currentActivity->skipLoopDelay(); }
 
 ScreenshotInfo ActivityManager::getScreenshotInfo() const {

src/activities/ActivityManager.h

@@ -102,16 +102,6 @@ class ActivityManager {
 
   bool preventAutoSleep() const;
   bool isReaderActivity() const;
-  bool currentKeepsBluetoothAlive() const;
-  // True if BLE should be resident for the current context: any reader (page-turner
-  // input) or the Bluetooth settings screen (pairing) is on the stack.
-  bool bluetoothShouldBeActive() const;
-  // True while the CURRENT activity is mid heap-heavy work that must complete before
-  // NimBLE may start (see Activity::deferBluetoothStart). Current only, not the
-  // stack: a reader stacked under a menu has its loop() paused, so its build never
-  // advances — a stack-wide check would hold BLE off for as long as the menu stays
-  // open.
-  bool bluetoothStartDeferred() const;
   bool skipLoopDelay() const;
   ScreenshotInfo getScreenshotInfo() const;
 
@@ -119,9 +109,6 @@ class ActivityManager {
   // Otherwise, it will be deferred until the end of the current loop iteration.
   void requestUpdate(bool immediate = false);
 
-  // Ask the current activity to make its next render a ghost-cleanup (HALF) refresh.
-  void requestGhostCleanup();
-
   // Trigger a render and block until it completes.
   // Must NOT be called from the render task or while holding a RenderLock.
   void requestUpdateAndWait();

src/activities/browser/OpdsBookBrowserActivity.cpp

@@ -2,11 +2,13 @@
 
 #include <Arduino.h>
 #include <GfxRenderer.h>
+#include <HalStorage.h>
 #include <I18n.h>
 #include <Logging.h>
 #include <OpdsStream.h>
 #include <WiFi.h>
 
+#include "CrossPointSettings.h"
 #include "MappedInputManager.h"
 #include "SilentRestart.h"
 #include "activities/network/WifiSelectionActivity.h"
@@ -15,6 +17,7 @@
 #include "fontIds.h"
 #include "network/HttpDownloader.h"
 #include "util/BookCacheUtils.h"
+#include "util/OpdsFilename.h"
 #include "util/StringUtils.h"
 #include "util/UrlUtils.h"
 
@@ -279,8 +282,26 @@ void OpdsBookBrowserActivity::downloadBook(const OpdsEntry& book) {
   // Build full download URL relative to the current feed, not the root server URL
   const std::string feedUrl = UrlUtils::buildUrl(server.url, currentPath);
   std::string downloadUrl = UrlUtils::buildUrl(feedUrl, book.href);
-  std::string filename =
-      "/" + StringUtils::sanitizeFilename((book.author.empty() ? "" : book.author + " - ") + book.title) + ".epub";
+  // opdsDownloadFolder is already a null-terminated char[64]; use it directly —
+  // no std::string copy. exists()/mkdir() take const char*.
+  const char* folder = SETTINGS.opdsDownloadFolder;  // "" => SD root
+  bool haveFolder = folder[0] != '\0';
+  if (haveFolder && !Storage.exists(folder) && !Storage.mkdir(folder)) {
+    // exists()-guard first: mkdir's return-on-existing is unconfirmed, and every
+    // existing caller checks exists() before mkdir. On real failure, fall back
+    // to SD root so the download is never lost.
+    LOG_ERR("OPDS", "mkdir failed for %s, using SD root", folder);
+    haveFolder = false;
+  }
+
+  // downloadToFile() needs a std::string, and titles are unbounded (a fixed
+  // char[] would truncate). Cold path (a multi-second download follows), so one
+  // reserve'd, in-place-appended owning string is the right call.
+  std::string filename;
+  filename.reserve(96);
+  if (haveFolder) filename += folder;
+  filename += '/';
+  filename += opdsBookFilename(book.author, book.title, static_cast<OpdsFilenameFormat>(SETTINGS.opdsFilenameFormat));
   LOG_DBG("OPDS", "Downloading: %s -> %s", downloadUrl.c_str(), filename.c_str());
 
   int lastRenderedPercent = -1;

src/activities/home/HomeActivity.cpp

@@ -179,6 +179,17 @@ void HomeActivity::loop() {
     requestUpdate();
   });
 
+  if (mappedInput.wasPressed(MappedInputManager::Button::Back)) backPressSeen = true;
+
+  // Back is otherwise unused on the home menu: open the most recently read
+  // book directly (recentBooks is most-recent-first and already pruned of
+  // files missing from the SD card). backPressSeen guards against the stale
+  // release of the Back press that closed the previous activity.
+  if (mappedInput.wasReleased(MappedInputManager::Button::Back) && backPressSeen && !recentBooks.empty()) {
+    onSelectBook(recentBooks[0].path);
+    return;
+  }
+
   if (mappedInput.wasReleased(MappedInputManager::Button::Confirm)) {
     if (selectorIndex < recentBooks.size()) {
       onSelectBook(recentBooks[selectorIndex].path);
@@ -256,7 +267,8 @@ void HomeActivity::render(RenderLock&&) {
       [&menuItems](int index) { return std::string(menuItems[index]); },
       [&menuIcons](int index) { return menuIcons[index]; });
 
-  const auto labels = mappedInput.mapLabels("", tr(STR_SELECT), tr(STR_DIR_UP), tr(STR_DIR_DOWN));
+  const auto labels = mappedInput.mapLabels(recentBooks.empty() ? "" : tr(STR_RESUME), tr(STR_SELECT), tr(STR_DIR_UP),
+                                            tr(STR_DIR_DOWN));
   GUI.drawButtonHints(renderer, labels.btn1, labels.btn2, labels.btn3, labels.btn4);
 
   renderer.displayBuffer();

src/activities/home/HomeActivity.h

@@ -18,6 +18,9 @@ class HomeActivity final : public Activity {
   bool hasOpdsServers = false;
   bool coverRendered = false;      // Track if cover has been rendered once
   bool coverBufferStored = false;  // Track if cover buffer is stored
+  // Home can be entered while Back is still held (e.g. leaving Settings with
+  // Back): ignore that stale release until a fresh press is seen here.
+  bool backPressSeen = false;
   uint8_t* coverBuffer = nullptr;  // HomeActivity's own buffer for cover image
   size_t coverBufferSize = 0;      // Bytes allocated to coverBuffer
   // Logical rect last passed to drawRecentBookCover. The cover snapshot only

src/activities/network/CrossPointWebServerActivity.cpp

@@ -18,8 +18,6 @@
 #include "fontIds.h"
 #include "util/QrUtils.h"
 
-#include "BleInput.h"
-
 namespace {
 // AP Mode configuration
 constexpr const char* AP_SSID = "CrossPoint-Reader";
@@ -143,12 +141,6 @@ void CrossPointWebServerActivity::onNetworkModeSelected(const NetworkMode mode)
   if (mode == NetworkMode::JOIN_NETWORK) {
     // STA mode - launch WiFi selection
     LOG_DBG("WEBACT", "Turning on WiFi (STA mode)...");
-    // Free the BLE stack BEFORE bringing WiFi up (matches WifiSelectionActivity):
-    // the C3 shares one radio and heap between the stacks, and the WiFi driver
-    // sizes its RX/TX buffer pools at init — initializing it with NimBLE's ~50 KB
-    // still resident leaves WiFi permanently starved even after the lifecycle
-    // stops BLE a loop later. No-op when BLE is already off.
-    bleinput::stop();
     WiFi.mode(WIFI_STA);
 
     state = WebServerActivityState::WIFI_SELECTION;
@@ -201,13 +193,6 @@ void CrossPointWebServerActivity::startAccessPoint() {
   LOG_DBG("WEBACT", "Starting Access Point mode...");
   LOG_DBG("WEBACT", "Free heap before AP start: %d bytes", ESP.getFreeHeap());
 
-  // Free the BLE stack BEFORE bringing WiFi up (matches WifiSelectionActivity):
-  // the C3 shares one radio and heap between the stacks, and the WiFi driver
-  // sizes its RX/TX buffer pools at init — initializing it with NimBLE's ~50 KB
-  // still resident leaves WiFi permanently starved even after the lifecycle
-  // stops BLE a loop later. No-op when BLE is already off.
-  bleinput::stop();
-
   // Configure and start the AP
   WiFi.mode(WIFI_AP);
   delay(100);

src/activities/network/WifiSelectionActivity.cpp

@@ -8,7 +8,6 @@
 
 #include <algorithm>
 
-#include "BleInput.h"
 #include "CrossPointSettings.h"
 #include "MappedInputManager.h"
 #include "WifiCredentialStore.h"
@@ -98,11 +97,6 @@ void WifiSelectionActivity::startWifiScan(const bool autoScan) {
   networks.clear();
   requestUpdate();
 
-  // Free the BLE stack before bringing WiFi up: the C3 has one radio and the two
-  // stacks can't both fit in heap. Reachable from the reader via KOReader sync, where
-  // BLE is still resident; a no-op when BLE is already off (launched from Settings).
-  bleinput::stop();
-
   // Set WiFi mode to station
   WiFi.mode(WIFI_STA);
   WiFi.disconnect();
@@ -355,7 +349,6 @@ void WifiSelectionActivity::attemptConnection() {
   connectionError.clear();
   requestUpdate();
 
-  bleinput::stop();        // free the BLE stack before WiFi (shared C3 radio, tight heap)
   WiFi.persistent(false);  // Credentials are managed by WifiCredentialStore; suppress SDK NVS auto-connect
   WiFi.mode(WIFI_STA);
   WiFi.disconnect(true, true);  // Abort any in-progress SDK auto-connect and clear NVS-saved SSID

src/activities/reader/EndOfBookOptions.cpp

@@ -6,6 +6,10 @@
 
 #include "CrossPointSettings.h"
 #include "ReaderUtils.h"
+// ReaderUtils.h pulls in ActivityManager.h, which only forward-declares Activity while holding
+// std::unique_ptr<Activity> members. Destroying that unique_ptr needs the complete type, so the
+// definition must be visible here.
+#include "activities/Activity.h"
 #include "components/UITheme.h"
 #include "fontIds.h"
 #include "util/ButtonNavigator.h"

src/activities/reader/EpubReaderActivity.cpp

@@ -17,7 +17,6 @@
 #include <iterator>
 #include <limits>
 
-#include "BleInput.h"
 #include "BookmarkEntry.h"
 #include "CrossPointSettings.h"
 #include "CrossPointState.h"
@@ -33,15 +32,10 @@
 #include "QrDisplayActivity.h"
 #include "ReaderUtils.h"
 #include "RecentBooksStore.h"
-#include "SilentRestart.h"
 #include "components/UITheme.h"
 #include "fontIds.h"
 #include "util/BookmarkUtil.h"
 #include "util/ScreenshotUtil.h"
-#include "SdCardFontSystem.h"
-#include <esp_heap_caps.h>
-#include "rom/ets_sys.h"
-#include "HeapMap.h"
 
 namespace {
 // pagesPerRefresh now comes from SETTINGS.getRefreshFrequency()
@@ -71,55 +65,6 @@ bool isInReadFolder(const std::string& path) {
   return path.size() > n && path.compare(0, n, READ_FOLDER) == 0 && path[n] == '/';
 }
 
-class FrameBufferBuildLoan {
- public:
-  explicit FrameBufferBuildLoan(GfxRenderer& renderer) : renderer_(renderer) {}
-  ~FrameBufferBuildLoan() {
-    if (active_ && !restore()) {
-      ESP.restart();
-    }
-  }
-
-  void release() {
-    if (active_ || !renderer_.hasFrameBuffer()) return;
-    if (bleinput::startInProgress()) {
-      LOG_INF("ERS", "Framebuffer loan waiting for BLE start to settle");
-      const uint32_t deadline = millis() + 1000;
-      while (bleinput::startInProgress() && millis() < deadline) {
-        delay(5);
-      }
-    }
-    renderer_.releaseFrameBufferForBuild();
-    active_ = true;
-    LOG_DBG("ERS", "Framebuffer lent for section build (ble=%u heap=%u maxAlloc=%u)", BleHid.isRunning() ? 1 : 0,
-            (unsigned)ESP.getFreeHeap(), (unsigned)ESP.getMaxAllocHeap());
-  }
-
-  bool restore() {
-    if (!active_) return true;
-    active_ = false;
-    if (renderer_.restoreFrameBufferAfterBuild()) {
-      LOG_DBG("ERS", "Framebuffer restored after section build");
-      return true;
-    }
-    if (BleHid.isRunning()) {
-      LOG_INF("ERS", "Framebuffer restore needs heap; freeing BLE and retrying (heap=%u maxAlloc=%u)",
-              (unsigned)ESP.getFreeHeap(), (unsigned)ESP.getMaxAllocHeap());
-      bleinput::stop();
-      if (renderer_.restoreFrameBufferAfterBuild()) {
-        LOG_DBG("ERS", "Framebuffer restored after freeing BLE");
-        return true;
-      }
-    }
-    LOG_ERR("ERS", "Framebuffer restore failed after section build");
-    return false;
-  }
-
- private:
-  GfxRenderer& renderer_;
-  bool active_ = false;
-};
-
 struct ProgressRange {
   float start;
   float end;
@@ -212,8 +157,6 @@ void EpubReaderActivity::onEnter() {
 
   ImageBlock::clearSessionRenderFailures();
 
-  statusBarBleConnected = BleHid.isConnected();
-
   // Configure screen orientation based on settings
   // NOTE: This affects layout math and must be applied before any render calls.
   ReaderUtils::applyOrientation(renderer, SETTINGS.orientation);
@@ -314,32 +257,6 @@ void EpubReaderActivity::openReaderMenu() {
                          });
 }
 
-bool EpubReaderActivity::buildTickHeapGate() {
-  const size_t freeHeap = ESP.getFreeHeap();
-  const size_t maxBlock = ESP.getMaxAllocHeap();
-  if (freeHeap >= BACKGROUND_BUILD_MIN_FREE_HEAP && maxBlock >= BACKGROUND_BUILD_MIN_MAX_ALLOC) {
-    return true;
-  }
-  const size_t lendableFrameBuffer = renderer.hasFrameBuffer() ? renderer.getBufferSize() : 0;
-  if (lendableFrameBuffer > 0 && freeHeap + lendableFrameBuffer >= BACKGROUND_BUILD_MIN_FREE_HEAP &&
-      maxBlock + lendableFrameBuffer >= BACKGROUND_BUILD_MIN_MAX_ALLOC) {
-    return true;
-  }
-  // Below the floors. If the BLE stack is what's squeezing the heap, shed it — the
-  // established policy on this branch is that builds and resident BLE don't coexist,
-  // and this was the one build path without that protection (field crash: a tick's
-  // parse allocation aborted at maxAlloc ~11 KB with BLE resident). The lifecycle's
-  // build-pending deferral keeps BLE down until the window is caught up, then
-  // restarts it behind the start floor. Without BLE resident, just wait: page-turn
-  // transients free up between turns and the tick retries every loop pass.
-  if (BleHid.isRunning()) {
-    LOG_INF("ERS", "Background build needs heap (free=%u maxAlloc=%u); freeing BLE RAM", (unsigned)freeHeap,
-            (unsigned)maxBlock);
-    bleinput::stop();
-  }
-  return false;
-}
-
 void EpubReaderActivity::loop() {
   if (!epub) {
     // Should never happen
@@ -347,48 +264,6 @@ void EpubReaderActivity::loop() {
     return;
   }
 
-  // Swap the "BT connecting" status bar placeholder back to the chapter/book
-  // title the moment the connection completes (and back on disconnect). Skips
-  // while a render is in flight or the framebuffer is lent to a build; the
-  // next page render shows the right state anyway.
-  if (SETTINGS.bluetoothEnabled && section && renderer.hasFrameBuffer() && !RenderLock::peek()) {
-    const bool connected = BleHid.isConnected();
-    if (connected != statusBarBleConnected) {
-      statusBarBleConnected = connected;
-      renderStatusBar();
-      renderer.displayBuffer(HalDisplay::FAST_REFRESH);
-    }
-  }
-
-  // Idle glyph prewarm for the likely next page (currentPage + 1). The scan
-  // pass draws nothing (FCM scan mode suppresses pixels), so the displayed
-  // framebuffer is untouched; endScanAndPrewarm loads only glyphs not already
-  // cached. Debounced past rapid page-flipping, one attempt per position, and
-  // deferred while a render/build owns the CPU or the heap is at the render
-  // floor. Cross-chapter prewarm is deliberately out of scope (next spine's
-  // section isn't loaded).
-  constexpr unsigned long IDLE_PREWARM_DEBOUNCE_MS = 400;
-  if (section && !section->isBuilding() && !RenderLock::peek() && renderer.hasFrameBuffer() &&
-      lastRenderCompleteMs != 0 && millis() - lastRenderCompleteMs > IDLE_PREWARM_DEBOUNCE_MS &&
-      ESP.getFreeHeap() > RENDER_MIN_FREE_HEAP &&
-      (idlePrewarmSpine != currentSpineIndex || idlePrewarmPage != section->currentPage)) {
-    idlePrewarmSpine = currentSpineIndex;
-    idlePrewarmPage = section->currentPage;
-    const int nextPage = section->currentPage + 1;
-    if (nextPage < static_cast<int>(section->pageCount)) {
-      RenderLock lock;  // the page table must not change under the scan
-      if (const auto p = section->loadPage(nextPage)) {
-        if (auto* fcm = renderer.getFontCacheManager()) {
-          const auto t0 = millis();
-          auto scope = fcm->createPrewarmScope();
-          p->render(renderer, SETTINGS.getReaderFontId(), 0, 0);  // scan only, no pixels
-          scope.endScanAndPrewarm();
-          LOG_DBG("ERS", "Idle prewarm: page %d in %lums", nextPage, millis() - t0);
-        }
-      }
-    }
-  }
-
   // Lazily resume a partial's extension build once the reader nears its watermark. Far from
   // it the rebuild is all cost (whole-chapter re-layout from page 0) and no benefit this
   // session, so reopening a partial deliberately does NOT start it (see the deferral in
@@ -424,8 +299,7 @@ void EpubReaderActivity::loop() {
   // "far enough ahead" and stall the build at 0 pages -- then the first turn past the
   // watermark re-parses the whole chapter synchronously. Keep ticking until it finalizes.
   if (section && section->isBuilding() && !RenderLock::peek() &&
-      (section->isPartial() || static_cast<int>(section->pageCount) < section->currentPage + BUILD_WINDOW_AHEAD) &&
-      buildTickHeapGate()) {
+      (section->isPartial() || static_cast<int>(section->pageCount) < section->currentPage + BUILD_WINDOW_AHEAD)) {
     RenderLock lock;
     // Re-check under the lock: render() (which also holds the RenderLock) may have finalized the
     // build between the outer isBuilding() check and acquiring the lock here, in which case
@@ -433,8 +307,6 @@ void EpubReaderActivity::loop() {
     // mutation, so it flags this as always true.
     // cppcheck-suppress knownConditionTrueFalse
     if (section->isBuilding()) {
-      FrameBufferBuildLoan buildLoan(renderer);
-      buildLoan.release();
       if (!section->buildSomeMore(BACKGROUND_BUILD_PAGES_PER_TICK)) {
         LOG_ERR("ERS", "Background section build failed");
         section.reset();
@@ -444,9 +316,6 @@ void EpubReaderActivity::loop() {
         // real page count, so re-render at the remapped page. No-op for an unchanged resume.
         requestUpdate();
       }
-      if (!buildLoan.restore()) {
-        ESP.restart();
-      }
     }
   }
 
@@ -579,20 +448,15 @@ void EpubReaderActivity::loop() {
     }
   }
 
-  // Long press BACK (1s+) goes to file selection
-  if (mappedInput.isPressed(MappedInputManager::Button::Back) && mappedInput.getHeldTime() >= ReaderUtils::GO_HOME_MS) {
-    activityManager.goToFileBrowser(epub ? epub->getPath() : "");
-    return;
-  }
-
-  // Short press BACK goes directly to home (or restores position if viewing footnote)
-  if (mappedInput.wasReleased(MappedInputManager::Button::Back) &&
-      mappedInput.getHeldTime() < ReaderUtils::GO_HOME_MS) {
-    if (footnoteDepth > 0) {
+  // Short press Back restores position when viewing a footnote (takes priority over navigation)
+  if (footnoteDepth > 0 && mappedInput.wasReleased(MappedInputManager::Button::Back) &&
+      mappedInput.getHeldTime() < ReaderUtils::GO_BACK_OR_HOME_MS) {
     restoreSavedPosition();
     return;
   }
-    onGoHome();
+
+  if (ReaderUtils::handleBackNavigation(mappedInput, activityManager, epub ? epub->getPath().c_str() : "",
+                                        {this, [](void* ctx) { static_cast<EpubReaderActivity*>(ctx)->onGoHome(); }})) {
     return;
   }
 
@@ -1048,17 +912,6 @@ void EpubReaderActivity::render(RenderLock&& lock) {
     return;
   }
 
-  FrameBufferBuildLoan buildLoan(renderer);
-
-  // If BLE leaves the reader below the render floor, lend the framebuffer before
-  // deserializing/loading the page instead of tearing BLE down immediately. The
-  // restore path still frees BLE if the framebuffer cannot be reallocated.
-  if (BleHid.isRunning() && ESP.getFreeHeap() < RENDER_MIN_FREE_HEAP) {
-    LOG_INF("ERS", "Render heap %u below floor %u; lending framebuffer", (unsigned)ESP.getFreeHeap(),
-            (unsigned)RENDER_MIN_FREE_HEAP);
-    buildLoan.release();
-  }
-
   const auto showPendingSyncSaveError = [this]() {
     if (!pendingSyncSaveError) return;
     pendingSyncSaveError = false;
@@ -1068,11 +921,7 @@ void EpubReaderActivity::render(RenderLock&& lock) {
   // A section build failure (e.g. an invalid/corrupt EPUB that fails XML parsing) leaves the
   // "Indexing" popup on screen with no way forward. Surface an explicit error instead of hanging.
   // clearScreen first so the error popup doesn't overlay the stale "Indexing" popup.
-  const auto showBuildError = [this, &buildLoan]() {
-    if (!buildLoan.restore()) {
-      ESP.restart();
-      return;
-    }
+  const auto showBuildError = [this]() {
     renderer.clearScreen();
     GUI.drawPopup(renderer, tr(STR_INDEX_FAILED));
     automaticPageTurnActive = false;
@@ -1157,44 +1006,6 @@ void EpubReaderActivity::render(RenderLock&& lock) {
         LOG_DBG("ERS", "Cache not found, building...");
       }
 
-      // The layout code (line-break DP arrays, CSS lookups, glyph buffers) allocates freely
-      // and abort()s on OOM under -fno-exceptions, so a starved heap must be handled BEFORE
-      // the build: pre-flight the floor and take the recovery path up front instead of
-      // crashing mid-parse. Field data: builds succeed at ~46 KB free with BLE resident;
-      // abort() observed at ~11 KB free.
-      const size_t lendableFrameBuffer = renderer.hasFrameBuffer() ? renderer.getBufferSize() : 0;
-      const bool heapTooLow = ESP.getFreeHeap() + lendableFrameBuffer < BUILD_MIN_FREE_HEAP;
-      if (heapTooLow) {
-        LOG_ERR("ERS", "Pre-build heap %u (+fb %u) below floor %u; entering build recovery",
-                (unsigned)ESP.getFreeHeap(), (unsigned)lendableFrameBuffer, (unsigned)BUILD_MIN_FREE_HEAP);
-      }
-
-      // Building a section needs a large contiguous inflate (deflate) window that the
-      // resident NimBLE stack fragments out of existence (~16 KB max block with BT on).
-      // On build failure (or a pre-flight floor miss) with BT enabled: free the BLE stack
-      // and retry. The chapter is cached afterwards, so this recovery runs at most once
-      // per uncached chapter.
-      // Deliberately do NOT restart BLE inline: this render still has its own allocations
-      // to make. The main-loop lifecycle restarts BLE later, behind its activity,
-      // render-lock, framebuffer, and heap gates.
-      const auto retryWithBleFreed = [&](auto&& buildFn) {
-        LOG_INF("ERS", "Section build needs heap; freeing BLE RAM and retrying");
-        bleinput::stop();
-        return buildFn();
-      };
-
-      // Even with BLE freed, the build can fail when this session's parse churn has
-      // fragmented the heap beyond in-place recovery. A silent restart is the only
-      // real defrag on this heap (no compaction); it resumes into this book and
-      // rebuilds the section on a fresh heap. Guarded by bootWasSilentRestart() so a
-      // build that fails again after the restart degrades to the error popup below
-      // instead of reboot-looping.
-      const auto silentRestartDefrag = [&]() {
-        if (bootWasSilentRestart()) return;
-        LOG_ERR("ERS", "Section build failed after BLE recovery; silent restart to defrag heap");
-        silentRestartToReader();
-      };
-
       // Jumps that need the final pagination or the anchor map -- explicit page jumps,
       // fragment anchors, percent jumps, and cross-setting progress repositioning -- can't
       // resolve their landing page until the whole chapter is laid out, so they take the full
@@ -1221,18 +1032,10 @@ void EpubReaderActivity::render(RenderLock&& lock) {
         // Lend the framebuffer's 48 KB to the blocking full build; restored
         // (white) at scope exit, and the page render below redraws everything.
         GfxRenderer::FrameBufferLoan loan(renderer);
-        const auto buildSection = [&]() {
-          return section->createSectionFile(SETTINGS.getReaderFontId(), SETTINGS.getReaderLineCompression(),
+        if (!section->createSectionFile(SETTINGS.getReaderFontId(), SETTINGS.getReaderLineCompression(),
                                         SETTINGS.extraParagraphSpacing, SETTINGS.paragraphAlignment, viewportWidth,
                                         viewportHeight, SETTINGS.hyphenationEnabled, SETTINGS.embeddedStyle,
-                                            SETTINGS.imageRendering, SETTINGS.focusReadingEnabled, popupFn);
-        };
-        bool built = !heapTooLow && buildSection();
-        if (!built && SETTINGS.bluetoothEnabled) {
-          built = retryWithBleFreed(buildSection);
-        }
-        if (!built) {
-          silentRestartDefrag();
+                                        SETTINGS.imageRendering, SETTINGS.focusReadingEnabled, popupFn)) {
           LOG_ERR("ERS", "Failed to persist page data to SD");
           section.reset();
           loan.end();  // restore before anything draws
@@ -1290,21 +1093,10 @@ void EpubReaderActivity::render(RenderLock&& lock) {
           // background buildSomeMore chunks in loop() do NOT get the loan: they
           // deliberately interleave with page renders. Restored before render.
           GfxRenderer::FrameBufferLoan loan(renderer);
-          // startBuild does the zip inflate (the big contiguous allocation), so it gets
-          // the BLE free-and-retry fallback too; it cleans up fully on failure, making a
-          // retry safe.
-          const auto beginBuild = [&]() {
-            return section->startBuild(SETTINGS.getReaderFontId(), SETTINGS.getReaderLineCompression(),
+          if (!section->startBuild(SETTINGS.getReaderFontId(), SETTINGS.getReaderLineCompression(),
                                    SETTINGS.extraParagraphSpacing, SETTINGS.paragraphAlignment, viewportWidth,
                                    viewportHeight, SETTINGS.hyphenationEnabled, SETTINGS.embeddedStyle,
-                                       SETTINGS.imageRendering, SETTINGS.focusReadingEnabled);
-          };
-          bool started = !heapTooLow && beginBuild();
-          if (!started && SETTINGS.bluetoothEnabled) {
-            started = retryWithBleFreed(beginBuild);
-          }
-          if (!started) {
-            silentRestartDefrag();
+                                   SETTINGS.imageRendering, SETTINGS.focusReadingEnabled)) {
             LOG_ERR("ERS", "Failed to start section build");
             section.reset();
             loan.end();  // restore before anything draws (showBuildError renders a popup)
@@ -1379,7 +1171,6 @@ void EpubReaderActivity::render(RenderLock&& lock) {
   }
   while (section->isPartial() && section->currentPage >= static_cast<int>(section->pageCount)) {
     // Start a build to extend a partial toward the requested page.
-    buildLoan.release();
     if (!section->isBuilding() &&
         !section->startBuild(SETTINGS.getReaderFontId(), SETTINGS.getReaderLineCompression(),
                              SETTINGS.extraParagraphSpacing, SETTINGS.paragraphAlignment, viewportWidth, viewportHeight,
@@ -1402,7 +1193,6 @@ void EpubReaderActivity::render(RenderLock&& lock) {
   }
   // For an in-progress incremental build, make sure the page we're about to show has been laid out.
   if (section->isBuilding()) {
-    buildLoan.release();
     while (!section->isBuildComplete() && section->currentPage >= static_cast<int>(section->pageCount)) {
       if (!section->buildSomeMore(BUILD_PAGES_PER_CHUNK)) {
         LOG_ERR("ERS", "Failed during incremental section build");
@@ -1413,14 +1203,6 @@ void EpubReaderActivity::render(RenderLock&& lock) {
     }
   }
 
-  const auto restoreFramebufferForDraw = [&buildLoan]() {
-    if (!buildLoan.restore()) {
-      ESP.restart();
-      return false;
-    }
-    return true;
-  };
-
   // The requested page is now as built as it will get. If it still lands past the end,
   // clamp to the last real page: the UINT16_MAX "last page" sentinel from backward chapter
   // navigation, an explicit jump beyond a finished chapter, or a stale saved position.
@@ -1435,10 +1217,10 @@ void EpubReaderActivity::render(RenderLock&& lock) {
   // a plain resume / unchanged pagination). If still building, this defers to loop() on completion.
   applyDeferredReposition();
 
+  renderer.clearScreen();
+
   if (section->pageCount == 0) {
     LOG_DBG("ERS", "No pages to render");
-    if (!restoreFramebufferForDraw()) return;
-    renderer.clearScreen();
     renderer.drawCenteredText(UI_12_FONT_ID, 300, tr(STR_EMPTY_CHAPTER), true, EpdFontFamily::BOLD);
     renderStatusBar();
     renderer.displayBuffer();
@@ -1449,8 +1231,6 @@ void EpubReaderActivity::render(RenderLock&& lock) {
 
   if (section->currentPage < 0 || section->currentPage >= section->pageCount) {
     LOG_DBG("ERS", "Page out of bounds: %d (max %d)", section->currentPage, section->pageCount);
-    if (!restoreFramebufferForDraw()) return;
-    renderer.clearScreen();
     renderer.drawCenteredText(UI_12_FONT_ID, 300, tr(STR_OUT_OF_BOUNDS), true, EpdFontFamily::BOLD);
     renderStatusBar();
     renderer.displayBuffer();
@@ -1479,7 +1259,6 @@ void EpubReaderActivity::render(RenderLock&& lock) {
       if (giveUp) {
         LOG_ERR("ERS", "Page load retry limit reached, aborting");
         pageLoadRetryCount = 0;  // Reset so a later user-initiated navigation can try afresh
-        if (!restoreFramebufferForDraw()) return;
         renderer.clearScreen();
         renderer.drawCenteredText(UI_12_FONT_ID, 300, tr(STR_PAGE_LOAD_ERROR), true, EpdFontFamily::BOLD);
         renderer.displayBuffer();
@@ -1495,48 +1274,9 @@ void EpubReaderActivity::render(RenderLock&& lock) {
     // Collect footnotes from the loaded page
     currentPageFootnotes = std::move(p->footnotes);
 
-    if (!restoreFramebufferForDraw()) return;
-    renderer.clearScreen();
-
     const auto start = millis();
     renderContents(std::move(p), orientedMarginTop, orientedMarginRight, orientedMarginBottom, orientedMarginLeft);
     LOG_DBG("ERS", "Rendered page in %dms", millis() - start);
-    lastRenderCompleteMs = millis();
-    // Fragmentation tracker: free vs largest block after every page. A falling
-    // maxAlloc/free ratio across pages points at whichever allocation pattern the
-    // preceding lines show (mini rebuilds, kern reloads, BLE churn).
-    LOG_DBG("MEM", "post-render: free=%u maxAlloc=%u", (unsigned)ESP.getFreeHeap(), (unsigned)ESP.getMaxAllocHeap());
-    {
-      // MEMFIX-PORT: per-render heap owner audit + one-shot block map; portable
-      // Heap audit: attribute resident heap to its owners so margin work is
-      // measurement-driven. `other` = IDF/Arduino baseline + SdFat + epub
-      // metadata + BLE (when on) + anything not yet instrumented.
-      const size_t fontBytes = sdFontSystem.reportFontMemory();
-      const size_t sectionBytes = section ? section->residentBytes() : 0;
-      const size_t epubBytes = epub ? epub->residentBytes() : 0;
-      const size_t fbBytes = renderer.hasFrameBuffer() ? renderer.getBufferSize() : 0;
-      const uint32_t heapTotal = ESP.getHeapSize();
-      const uint32_t heapFree = ESP.getFreeHeap();
-      LOG_DBG("MEM",
-              "audit: total=%u free=%u maxAlloc=%u fb=%u fonts=%u section=%u epub=%u cssRules=%u building=%d ble=%d "
-              "other=%d",
-              heapTotal, heapFree, (unsigned)ESP.getMaxAllocHeap(), (unsigned)fbBytes, (unsigned)fontBytes,
-              (unsigned)sectionBytes, (unsigned)epubBytes, (unsigned)(epub ? epub->cssRuleCount() : 0),
-              section && section->isBuilding() ? 1 : 0, BleHid.isRunning() ? 1 : 0,
-              (int)(heapTotal - heapFree - fbBytes - fontBytes - sectionBytes - epubBytes));
-      // One-shot heap block map for fragmentation analysis: dumps every block
-      // (address/size/free) once per boot, at the first settled (non-building)
-      // audit, so mid-heap long-lived allocations identify themselves. ~2-4 s
-      // of serial output; debug builds only.
-      static bool heapMapDumped = false;
-      if (!heapMapDumped && !(section && section->isBuilding())) {
-        heapMapDumped = true;
-        // Landmarks: known owners' addresses, so map blocks self-identify.
-        LOG_DBG("MEM", "landmark framebuffer=%p section=%p epub=%p activity=%p", renderer.getFrameBuffer(),
-                static_cast<void*>(section.get()), static_cast<void*>(epub.get()), static_cast<void*>(this));
-        heapmap::dump();
-      }
-    }
   }
   // Only persist when the position actually changed. render() also runs on menu,
   // bookmark and screenshot re-renders, and writeAtomic is several FAT ops for 6 bytes.
@@ -1606,11 +1346,6 @@ void EpubReaderActivity::renderContents(std::unique_ptr<Page> page, const int or
   const bool pageHasImagesNeedingDecode = pageHasImages && page->hasImagesNeedingDecode();
   const bool needsTextGrayscale = SETTINGS.textAntiAliasing;
   const bool needsAnyGrayscale = needsTextGrayscale || pageHasImages;
-  const bool tiledGrayscale = needsAnyGrayscale && renderer.supportsStripGrayscale();
-  // Whole-plane buffering only pays when the BW refresh genuinely runs async
-  // underneath it; on blocking panels it would just spend ~50 KB for the
-  // identical serial timing.
-  const bool overlapRefresh = tiledGrayscale && renderer.supportsAsyncRefresh();
   auto renderGrayscalePass = [&]() {
     if (needsTextGrayscale) {
       page->render(renderer, fontId, orientedMarginLeft, orientedMarginTop);
@@ -1656,93 +1391,28 @@ void EpubReaderActivity::renderContents(std::unique_ptr<Page> page, const int or
     // regardless of residue.
     pagesUntilFullRefresh = 1;
   } else {
-    // Deferred when a tiled grayscale pass follows: the plane rendering below
-    // then overlaps the panel's refresh time instead of following it.
-    ReaderUtils::displayWithRefreshCycle(renderer, pagesUntilFullRefresh, /*async=*/overlapRefresh);
+    ReaderUtils::displayWithRefreshCycle(renderer, pagesUntilFullRefresh);
   }
   const auto tDisplay = millis();
 
-  // Tiled grayscale: render each plane band-by-band, leaving the BW
-  // framebuffer intact so no full-frame storeBwBuffer is needed; controller
-  // RAM is re-synced from the live framebuffer afterward. The page is
-  // re-rendered ceil(H/STRIP_ROWS) times per plane, but renderCharImpl culls
-  // out-of-band glyphs before decode so the cost stays close to one render.
-  // Both text (drawPixel) and images (DirectPixelWriter) honor the active
-  // strip target. When the BW refresh above went out async, the plane
-  // rendering below overlaps the panel's refresh time; only the controller
-  // RAM writes wait for BUSY.
-  if (tiledGrayscale) {
+  // Tiled grayscale: render each plane band-by-band into a small scratch and
+  // stream straight to the controller, leaving the BW framebuffer intact so no
+  // full-frame storeBwBuffer is needed; controller RAM is re-synced from the
+  // live framebuffer afterward. The page is re-rendered ceil(H/STRIP_ROWS) times
+  // per plane, but renderCharImpl culls out-of-band glyphs before decode so the
+  // cost stays close to one render. Both text (drawPixel) and images
+  // (DirectPixelWriter) honor the active strip target.
+  if (needsAnyGrayscale && renderer.supportsStripGrayscale()) {
     constexpr int STRIP_ROWS = 80;
     const int gh = renderer.getDisplayHeight();
     const int gwBytes = renderer.getDisplayWidthBytes();
-    const size_t planeBytes = static_cast<size_t>(gwBytes) * gh;
 
-    // Render one plane band-by-band into a whole-plane buffer without touching
-    // the controller, so it can run while the refresh is still in flight.
-    auto renderPlaneToBuffer = [&](const bool lsbPlane, uint8_t* buf) {
-      renderer.setRenderMode(lsbPlane ? GfxRenderer::GRAYSCALE_LSB : GfxRenderer::GRAYSCALE_MSB);
-      for (int y = 0; y < gh; y += STRIP_ROWS) {
-        const int rows = (gh - y < STRIP_ROWS) ? (gh - y) : STRIP_ROWS;
-        renderer.beginStripTarget(buf + static_cast<size_t>(y) * gwBytes, y, rows);
-        renderer.clearScreen(0x00);
-        renderGrayscalePass();
-        renderer.endStripTarget();
-      }
-    };
-
-    // Tiered on heap pressure: two plane buffers hide both plane renders
-    // inside the refresh wait; one hides the LSB render (its buffer is reused
-    // for MSB after streaming); none falls back to the strip-scratch flow with
-    // no overlap. The MSB buffer is only attempted when it leaves ~60 KB free
-    // so the pass never starves concurrent allocations (BLE especially).
-    // Blocking panels skip the buffers entirely (nothing to overlap).
-    auto lsbPlaneBuf = overlapRefresh ? makeUniqueNoThrow<uint8_t[]>(planeBytes) : nullptr;
-    auto msbPlaneBuf = (lsbPlaneBuf && ESP.getFreeHeap() >= planeBytes + 60000)
-                           ? makeUniqueNoThrow<uint8_t[]>(planeBytes)
-                           : nullptr;
-
-    if (lsbPlaneBuf) {
-      renderPlaneToBuffer(true, lsbPlaneBuf.get());
-      if (msbPlaneBuf) renderPlaneToBuffer(false, msbPlaneBuf.get());
-      const auto tGrayRender = millis();
-
-      renderer.waitRefreshComplete();
-      const auto tWait = millis();
-
-      renderer.writeGrayscalePlaneStrip(true, lsbPlaneBuf.get(), 0, gh);
-      if (msbPlaneBuf) {
-        renderer.writeGrayscalePlaneStrip(false, msbPlaneBuf.get(), 0, gh);
-      } else {
-        renderPlaneToBuffer(false, lsbPlaneBuf.get());
-        renderer.writeGrayscalePlaneStrip(false, lsbPlaneBuf.get(), 0, gh);
-      }
-      const auto tGrayWrite = millis();
-
-      renderer.setRenderMode(GfxRenderer::BW);
-      renderer.displayGrayBuffer();
-      const auto tGrayDisplay = millis();
-
-      // BW framebuffer is intact; re-sync controller RAM for the next
-      // differential page turn directly from it.
-      renderer.cleanupGrayscaleWithFrameBuffer();
-      const auto tEnd = millis();
-
-      LOG_DBG("ERS",
-              "Page render (tiled async): prewarm=%lums bw_render=%lums display=%lums gray_render=%lums "
-              "wait=%lums gray_write=%lums gray_display=%lums cleanup=%lums total=%lums (planes buffered: %d)",
-              tPrewarm - t0, tBwRender - tPrewarm, tDisplay - tBwRender, tGrayRender - tDisplay, tWait - tGrayRender,
-              tGrayWrite - tWait, tGrayDisplay - tGrayWrite, tEnd - tGrayDisplay, tEnd - t0, msbPlaneBuf ? 2 : 1);
-    } else {
-      // Per-strip scratch tier: blocking panels and the OOM fallback. The
-      // strip writes below need the panel idle, so wait out any pending async
-      // refresh first (no-op on blocking panels).
     auto scratch = makeUniqueNoThrow<uint8_t[]>(static_cast<size_t>(gwBytes) * STRIP_ROWS);
-      renderer.waitRefreshComplete();
     if (!scratch) {
       LOG_ERR("ERS", "OOM: grayscale strip scratch (%d bytes); skipping AA this page", gwBytes * STRIP_ROWS);
     } else {
-        // Bands may be streamed in any order: X4 windows each via setRamArea,
-        // X3 via PTL.
+      // Bands may be streamed in any order: X4 windows each via setRamArea, X3
+      // via PTL.
       renderer.setRenderMode(GfxRenderer::GRAYSCALE_LSB);
       for (int y = 0; y < gh; y += STRIP_ROWS) {
         const int rows = (gh - y < STRIP_ROWS) ? (gh - y) : STRIP_ROWS;
@@ -1782,7 +1452,6 @@ void EpubReaderActivity::renderContents(std::unique_ptr<Page> page, const int or
               tPrewarm - t0, tBwRender - tPrewarm, tDisplay - tBwRender, tGrayLsb - tDisplay, tGrayMsb - tGrayLsb,
               tGrayDisplay - tGrayMsb, tCleanup - tGrayDisplay, tEnd - t0);
     }
-    }
   } else {
     // Fallback path for a controller without strip support. grayscale rendering
     // TODO: Only do this if font supports it
@@ -1869,15 +1538,8 @@ void EpubReaderActivity::renderStatusBar() const {
     title = epub->getTitle();
   }
 
-  if (SETTINGS.bluetoothEnabled && !BleHid.isConnected()) {
-    // Take over the title slot entirely while connecting; the watcher in
-    // loop() redraws the bar on the connect/disconnect flip, restoring the
-    // chapter/book title.
-    title = tr(STR_BT_CONNECTING_POPUP);
-  }
-
   GUI.drawStatusBar(renderer, bookProgress, currentPage, pageCount, title, 0, textYOffset, true, currentPageBookmarked,
-                    section->isBuilding(), BleHid.isConnected());
+                    section->isBuilding());
 }
 
 void EpubReaderActivity::navigateToHref(const std::string& hrefStr, const bool savePosition) {

src/activities/reader/EpubReaderActivity.h

@@ -41,18 +41,6 @@ class EpubReaderActivity final : public Activity {
   bool showBookmarkMessage = false;
   bool ignoreNextConfirmRelease = false;
   bool currentPageBookmarked = false;
-  // BLE connection state the status bar last rendered with; loop() watches for
-  // a flip and redraws the bar so the "BT connecting" placeholder swaps back
-  // to the chapter/book title the moment the connection completes (and
-  // returns on disconnect) instead of waiting for the next page turn.
-  bool statusBarBleConnected = false;
-  // Idle-time glyph prewarm: after a page settles, scan the LIKELY next page
-  // (scan mode draws nothing) and load its missing glyphs from SD during idle,
-  // so the next turn's in-render prewarm is a cache hit instead of ~100 ms of
-  // SD reads on the page-turn critical path. One attempt per position.
-  int idlePrewarmSpine = -1;
-  int idlePrewarmPage = -1;
-  unsigned long lastRenderCompleteMs = 0;
   bool bookmarkRemoved = false;  // true when last toggle removed (controls popup text)
   std::vector<BookmarkEntry> cachedBookmarks;
   // Tracks whether this book is currently removed from Recent Books by the
@@ -75,21 +63,6 @@ class EpubReaderActivity final : public Activity {
   SavedPosition savedPositions[MAX_FOOTNOTE_DEPTH] = {};
   int footnoteDepth = 0;
 
-  // Heap floor for entering a section build. The layout code allocates freely (line-break DP
-  // arrays sized by word count, CSS rule lookups, glyph buffers) and under -fno-exceptions an
-  // OOM there abort()s the firmware instead of failing cleanly -- so a starved heap must be
-  // handled *before* the build, not after. Field data: builds succeed at ~46 KB free with BLE
-  // resident; abort() observed at ~11 KB free. CSS styling already degrades below 48 KB
-  // (MIN_FREE_HEAP_FOR_CSS), so 40 KB trades a few early BLE teardowns for not crashing.
-  static constexpr size_t BUILD_MIN_FREE_HEAP = 40 * 1024;
-
-  // Heap floor for rendering a page at all. Page deserialization (TextBlock word
-  // vectors/strings) and glyph caching allocate through throwing paths that abort()
-  // on OOM; below this floor render() sheds the BLE stack (~52 KB back, and it
-  // restores a large contiguous block) before touching the page. Field data: a
-  // session with no shed ground to <2.2 KB free and aborted on a page load.
-  static constexpr size_t RENDER_MIN_FREE_HEAP = 24 * 1024;
-
   // Viewport of the last render(), captured so loop()'s lazy partial-extension start
   // builds with IDENTICAL layout parameters to the pages already rendered (a mismatch
   // would paginate differently than the partial being extended). 0 = no render yet.
@@ -113,28 +86,6 @@ class EpubReaderActivity final : public Activity {
   // background build chunk never noticeably delays input or a pending render.
   static constexpr int BUILD_PAGES_PER_CHUNK = 8;
   static constexpr int BACKGROUND_BUILD_PAGES_PER_TICK = 2;
-
-  // Skip background build ticks below this free-heap floor. The parse path grows
-  // word vectors of heap strings — throwing allocations that abort() on OOM under
-  // -fno-exceptions (field crash: bad_alloc in ParsedText::addWord during a
-  // background tick with the BLE stack resident). The tick is deferrable work:
-  // page-turn transients free up between turns and the build resumes; the render
-  // path still builds the page it actually needs regardless of this floor.
-  // Calibrated BETWEEN the measured states: steady reading with BLE resident runs at
-  // ~29.4 KB free / ~16.4 KB largest block (ticks are safe there — a 2-page parse
-  // transient is a few KB), while the field crash happened at 34.7 KB free with an
-  // ~11 KB largest block. A first cut at 32 KB/16 KB sat just ABOVE the healthy
-  // steady state, guaranteeing a pointless BLE shed the moment any build work was
-  // pending (the maxAlloc floor fired on a 12-byte shortfall).
-  static constexpr size_t BACKGROUND_BUILD_MIN_FREE_HEAP = 26 * 1024;
-  // Fragmentation floor for the same gate: free heap says how much memory exists;
-  // maxAlloc says whether any single allocation can actually have it.
-  static constexpr size_t BACKGROUND_BUILD_MIN_MAX_ALLOC = 13 * 1024;
-  // Gate for a background build tick: true when the heap can take parse allocations.
-  // When BLE is what's squeezing the heap, sheds it (build-pending deferral in the
-  // lifecycle then holds restarts off until the window is caught up) instead of
-  // stalling the build forever below the floors.
-  bool buildTickHeapGate();
   // How many pages to keep laid out ahead of the reader for a still-building section. A page
   // turn is ~1s on e-ink and a page builds in ~30ms, so the reader can't out-click the builder
   // -- a tiny buffer is enough. The background build stops once the watermark is this far
@@ -195,7 +146,6 @@ class EpubReaderActivity final : public Activity {
   // it from page 0. Reverts to normal power behavior the moment the build finishes.
   bool skipLoopDelay() override { return section && section->isBuilding(); }
   bool isReaderActivity() const override { return true; }
-  void requestGhostCleanup() override { pagesUntilFullRefresh = 1; }
   ScreenshotInfo getScreenshotInfo() const override;
   CrossPointPosition getCurrentPosition() const;
 };

src/activities/reader/EpubReaderMenuActivity.cpp

@@ -2,12 +2,8 @@
 
 #include <GfxRenderer.h>
 #include <I18n.h>
-#include <Logging.h>
 
-#include "BleInput.h"
-#include "CrossPointSettings.h"
 #include "MappedInputManager.h"
-#include "SilentRestart.h"
 #include "components/UITheme.h"
 #include "fontIds.h"
 
@@ -26,7 +22,7 @@ EpubReaderMenuActivity::EpubReaderMenuActivity(GfxRenderer& renderer, MappedInpu
 std::vector<EpubReaderMenuActivity::MenuItem> EpubReaderMenuActivity::buildMenuItems(bool hasFootnotes,
                                                                                      bool hasBookmarks) {
   std::vector<MenuItem> items;
-  items.reserve(13);
+  items.reserve(12);
   items.push_back({MenuAction::SELECT_CHAPTER, StrId::STR_SELECT_CHAPTER});
   if (hasFootnotes) {
     items.push_back({MenuAction::FOOTNOTES, StrId::STR_FOOTNOTES});
@@ -40,7 +36,6 @@ std::vector<EpubReaderMenuActivity::MenuItem> EpubReaderMenuActivity::buildMenuI
   items.push_back({MenuAction::GO_TO_PERCENT, StrId::STR_GO_TO_PERCENT});
   items.push_back({MenuAction::SCREENSHOT, StrId::STR_SCREENSHOT_BUTTON});
   items.push_back({MenuAction::DISPLAY_QR, StrId::STR_DISPLAY_QR});
-  items.push_back({MenuAction::TOGGLE_BLUETOOTH, StrId::STR_TOGGLE_BLUETOOTH});
   items.push_back({MenuAction::GO_HOME, StrId::STR_GO_HOME_BUTTON});
   items.push_back({MenuAction::SYNC, StrId::STR_SYNC_PROGRESS});
   items.push_back({MenuAction::DELETE_CACHE, StrId::STR_DELETE_CACHE});
@@ -90,24 +85,6 @@ void EpubReaderMenuActivity::loop() {
       return;
     }
 
-    if (selectedAction == MenuAction::TOGGLE_BLUETOOTH) {
-      // Just flip the preference and stay in the menu. The main-loop lifecycle check
-      // brings the BLE stack up/down to match, so start/stop has a single owner.
-      SETTINGS.bluetoothEnabled = SETTINGS.bluetoothEnabled ? 0 : 1;
-      SETTINGS.saveToFile();
-      // Turning BT on below the lifecycle's heap floor would otherwise wait
-      // until the heap happens to recover -- which a long session's fragmentation never
-      // gives back. The user asked for BT *now*: silent-restart into this book to
-      // defrag (fresh boot is ~118 KB free, comfortably above the floor), and BT
-      // auto-starts on the way back in.
-      if (SETTINGS.bluetoothEnabled && !BleHid.isRunning() && ESP.getFreeHeap() < bleinput::kStartMinFreeHeap) {
-        LOG_INF("ERM", "BT enabled below heap floor (%u); silent restart to defrag", ESP.getFreeHeap());
-        silentRestartToReader();
-      }
-      requestUpdate();
-      return;
-    }
-
     setResult(MenuResult{static_cast<int>(selectedAction), pendingOrientation, selectedPageTurnOption});
     finish();
     return;
@@ -159,12 +136,6 @@ void EpubReaderMenuActivity::render(RenderLock&&) {
         } else if (value == MenuAction::AUTO_PAGE_TURN) {
           // Render current page turn value on the right edge of the content area.
           return pageTurnLabels[selectedPageTurnOption];
-        } else if (value == MenuAction::TOGGLE_BLUETOOTH) {
-          if (SETTINGS.bluetoothEnabled) {
-            if (!BleHid.isRunning()) return tr(STR_CONNECTING);
-            return BleHid.isConnected() ? tr(STR_STATE_ON) : tr(STR_CONNECTING);
-          }
-          return tr(STR_STATE_OFF);
         } else {
           return "";
         }

src/activities/reader/EpubReaderMenuActivity.h

@@ -24,8 +24,7 @@ class EpubReaderMenuActivity final : public Activity {
     DISPLAY_QR,
     GO_HOME,
     SYNC,
-    DELETE_CACHE,
-    TOGGLE_BLUETOOTH
+    DELETE_CACHE
   };
 
   explicit EpubReaderMenuActivity(GfxRenderer& renderer, MappedInputManager& mappedInput, const std::string& title,

src/activities/reader/KOReaderSyncActivity.cpp

@@ -10,6 +10,7 @@
 
 #include <algorithm>
 #include <cassert>
+#include <cmath>
 
 #include "Epub/Section.h"
 #include "EpubReaderUtils.h"
@@ -24,6 +25,19 @@
 #include "fontIds.h"
 
 namespace {
+std::string calculateDocumentHashForMethod(const std::string& path, const DocumentMatchMethod method) {
+  return method == DocumentMatchMethod::FILENAME ? KOReaderDocumentId::calculateFromFilename(path)
+                                                 : KOReaderDocumentId::calculate(path);
+}
+
+DocumentMatchMethod alternateMatchMethod(const DocumentMatchMethod method) {
+  return method == DocumentMatchMethod::FILENAME ? DocumentMatchMethod::BINARY : DocumentMatchMethod::FILENAME;
+}
+
+const char* matchMethodName(const DocumentMatchMethod method) {
+  return method == DocumentMatchMethod::FILENAME ? "filename" : "binary";
+}
+
 void syncTimeWithNTP() {
   // Stop SNTP if already running (can't reconfigure while running)
   if (esp_sntp_enabled()) {
@@ -84,6 +98,21 @@ void KOReaderSyncActivity::saveProgressAndReturn(int spineIndex, int page) {
 
 void KOReaderSyncActivity::returnToReader() { activityManager.goToReader(epubPath); }
 
+bool KOReaderSyncActivity::smartSyncEnabled() const {
+  return KOREADER_STORE.getSyncBehavior() == KOReaderSyncBehavior::SMART;
+}
+
+void KOReaderSyncActivity::markAutoReturn() { autoReturnAt = millis() + AUTO_RETURN_DELAY_MS; }
+
+void KOReaderSyncActivity::completeAlreadySynced() {
+  {
+    RenderLock lock(*this);
+    state = SYNC_COMPLETE;
+  }
+  markAutoReturn();
+  requestUpdate(true);
+}
+
 void KOReaderSyncActivity::onWifiSelectionComplete(const bool success) {
   if (!success) {
     LOG_DBG("KOSync", "WiFi connection failed, exiting");
@@ -113,12 +142,8 @@ void KOReaderSyncActivity::onWifiSelectionComplete(const bool success) {
 }
 
 void KOReaderSyncActivity::performSync() {
-  // Calculate document hash based on user's preferred method
-  if (KOREADER_STORE.getMatchMethod() == DocumentMatchMethod::FILENAME) {
-    documentHash = KOReaderDocumentId::calculateFromFilename(epubPath);
-  } else {
-    documentHash = KOReaderDocumentId::calculate(epubPath);
-  }
+  const DocumentMatchMethod primaryMethod = KOREADER_STORE.getMatchMethod();
+  documentHash = calculateDocumentHashForMethod(epubPath, primaryMethod);
   if (documentHash.empty()) {
     {
       RenderLock lock(*this);
@@ -128,8 +153,9 @@ void KOReaderSyncActivity::performSync() {
     requestUpdate(true);
     return;
   }
+  const std::string primaryHash = documentHash;
 
-  LOG_DBG("KOSync", "Document hash: %s", documentHash.c_str());
+  LOG_DBG("KOSync", "Document hash (%s): %s", matchMethodName(primaryMethod), documentHash.c_str());
 
   {
     RenderLock lock(*this);
@@ -137,10 +163,42 @@ void KOReaderSyncActivity::performSync() {
   }
   requestUpdateAndWait();
 
-  // Fetch remote progress
-  const auto result = KOReaderSyncClient::getProgress(documentHash, remoteProgress);
+  // Fetch remote progress. In smart mode, also probe the alternate document-id
+  // method and use the furthest remote state we can find. This avoids a stale
+  // local upload when another KOReader device synced the same book with a
+  // different document matching method.
+  auto result = KOReaderSyncClient::getProgress(documentHash, remoteProgress);
+  LOG_DBG("KOSync", "Primary remote (%s): result=%d http=%d doc=%s local=%.6f remote=%.6f xpath=%s",
+          matchMethodName(primaryMethod), result, KOReaderSyncClient::lastHttpCode, documentHash.c_str(),
+          localProgress.percentage, remoteProgress.percentage, remoteProgress.progress.c_str());
+
+  if (smartSyncEnabled()) {
+    const DocumentMatchMethod altMethod = alternateMatchMethod(primaryMethod);
+    const std::string altHash = calculateDocumentHashForMethod(epubPath, altMethod);
+    if (!altHash.empty() && altHash != documentHash) {
+      KOReaderProgress altProgress;
+      const auto altResult = KOReaderSyncClient::getProgress(altHash, altProgress);
+      LOG_DBG("KOSync", "Alternate remote (%s): result=%d http=%d doc=%s local=%.6f remote=%.6f xpath=%s",
+              matchMethodName(altMethod), altResult, KOReaderSyncClient::lastHttpCode, altHash.c_str(),
+              localProgress.percentage, altProgress.percentage, altProgress.progress.c_str());
+
+      if (altResult == KOReaderSyncClient::OK &&
+          (result == KOReaderSyncClient::NOT_FOUND || altProgress.percentage > remoteProgress.percentage)) {
+        documentHash = altHash;
+        remoteProgress = std::move(altProgress);
+        result = KOReaderSyncClient::OK;
+      }
+    }
+  }
 
   if (result == KOReaderSyncClient::NOT_FOUND) {
+    if (smartSyncEnabled()) {
+      LOG_DBG("KOSync", "Smart sync: no remote progress found for known document hashes; uploading local %.6f",
+              localProgress.percentage);
+      performUpload();
+      return;
+    }
+
     // No remote progress - offer to upload
     {
       RenderLock lock(*this);
@@ -174,8 +232,42 @@ void KOReaderSyncActivity::performSync() {
     return;
   }
 
+  // Prefer the exact spine/page from a crosspoint-sync rich position (lossless
+  // CrossPoint<->CrossPoint sync); fall back to the approximate XPath mapping
+  // for plain kosync servers or when the rich position cannot be applied.
+  std::optional<CrossPointPosition> richMapped;
+  if (remoteProgress.position.has_value()) {
+    richMapped = ProgressMapper::fromRichPosition(epub, *remoteProgress.position, renderer);
+  }
+  if (richMapped.has_value()) {
+    remotePosition = *richMapped;
+  } else {
     SavedProgressPosition koPos = {remoteProgress.progress, remoteProgress.percentage};
     remotePosition = ProgressMapper::toCrossPoint(epub, koPos, renderer, currentSpineIndex, totalPagesInSpine);
+  }
+
+  if (smartSyncEnabled()) {
+    static constexpr float SAME_PROGRESS_EPSILON = 0.001f;  // 0.1 percentage points
+    const float delta = localProgress.percentage - remoteProgress.percentage;
+    LOG_DBG("KOSync", "Smart decision: doc=%s local=%.6f remote=%.6f delta=%.6f remoteXpath=%s mapped=%d/%d",
+            documentHash.c_str(), localProgress.percentage, remoteProgress.percentage, delta,
+            remoteProgress.progress.c_str(), remotePosition.spineIndex, remotePosition.pageNumber);
+    if (std::fabs(delta) <= SAME_PROGRESS_EPSILON) {
+      completeAlreadySynced();
+      return;
+    }
+
+    if (delta > 0) {
+      // Alternate hashes are only probes for newer remote state. Keep uploads
+      // on the user's configured matching method so its primary record heals.
+      documentHash = primaryHash;
+      performUpload();
+      return;
+    }
+
+    saveProgressAndReturn(remotePosition.spineIndex, remotePosition.pageNumber);
+    return;
+  }
 
   // localProgress was pre-computed in EpubReaderActivity before the Epub was released.
   {
@@ -206,17 +298,45 @@ void KOReaderSyncActivity::performUpload() {
   progress.progress = localProgress.xpath;
   progress.percentage = localProgress.percentage;
 
+  // Rich CrossPoint position for crosspoint-sync servers (lossless
+  // CrossPoint<->CrossPoint sync); plain kosync servers ignore the extra field.
+  {
+    KOReaderRichPosition pos;
+    const float pct = localProgress.percentage < 0.0f   ? 0.0f
+                      : localProgress.percentage > 1.0f ? 1.0f
+                                                        : localProgress.percentage;
+    pos.pctQ = static_cast<uint32_t>(pct * 1000000.0f + 0.5f);
+    pos.spineIndex = static_cast<uint16_t>(currentSpineIndex);
+    pos.pageNumber = static_cast<uint16_t>(currentPage);
+    pos.totalPages = static_cast<uint16_t>(totalPagesInSpine > 0 ? totalPagesInSpine : 1);
+    pos.paragraphIndex = currentParagraphIndex;
+    pos.xpath = localProgress.xpath;
+    progress.position = std::move(pos);
+  }
+
   // Optionally include document metadata (KOReader PR #15306)
   if (KOREADER_STORE.getSendMetadata()) {
+    // The Epub is released before the sync network calls and is only reloaded on the
+    // remote-progress path (performSync). When uploading from NO_REMOTE_PROGRESS the
+    // Epub is still null, so reload it here and guard the title/author reads to avoid
+    // dereferencing a null Epub. Filename is derived from the path and is always safe.
+    ensureEpubLoaded();
     KOReaderMetadata meta;
-    // Extract filename from path
     const auto lastSlash = epubPath.rfind('/');
     meta.filename = (lastSlash != std::string::npos) ? epubPath.substr(lastSlash + 1) : epubPath;
+    if (epub) {
       meta.title = epub->getTitle();
       meta.authors = epub->getAuthor();
+    } else {
+      LOG_ERR("KOSync", "Epub unavailable for metadata; sending filename only");
+    }
     progress.metadata = std::move(meta);
   }
 
+  // Release the Epub before the network call so the TLS handshake has enough free heap
+  // (consistent with the release-before-sync pattern in performSync); nothing below needs it.
+  epub.reset();
+
   const auto result = KOReaderSyncClient::updateProgress(progress);
 
   // Drop the radio while user reads the result; full teardown happens at silent reboot.
@@ -236,6 +356,7 @@ void KOReaderSyncActivity::performUpload() {
     RenderLock lock(*this);
     state = UPLOAD_COMPLETE;
   }
+  markAutoReturn();
   requestUpdate(true);
 }
 
@@ -379,10 +500,12 @@ void KOReaderSyncActivity::render(RenderLock&&) {
     return;
   }
 
-  if (state == UPLOAD_COMPLETE) {
-    UITheme::drawCenteredText(renderer, screen, UI_10_FONT_ID, top, tr(STR_UPLOAD_SUCCESS), true, EpdFontFamily::BOLD);
+  if (state == UPLOAD_COMPLETE || state == SYNC_COMPLETE) {
+    UITheme::drawCenteredText(renderer, screen, UI_10_FONT_ID, top,
+                              state == UPLOAD_COMPLETE ? tr(STR_UPLOAD_SUCCESS) : tr(STR_ALREADY_SYNCED), true,
+                              EpdFontFamily::BOLD);
 
-    const auto labels = mappedInput.mapLabels(tr(STR_BACK), "", "", "");
+    const auto labels = mappedInput.mapLabels(tr(STR_BACK), tr(STR_DONE), "", "");
     GUI.drawButtonHints(renderer, labels.btn1, labels.btn2, labels.btn3, labels.btn4);
     renderer.displayBuffer();
     return;
@@ -400,8 +523,13 @@ void KOReaderSyncActivity::render(RenderLock&&) {
 }
 
 void KOReaderSyncActivity::loop() {
-  if (state == NO_CREDENTIALS || state == SYNC_FAILED || state == UPLOAD_COMPLETE) {
-    if (mappedInput.wasReleased(MappedInputManager::Button::Back)) {
+  if (state == NO_CREDENTIALS || state == SYNC_FAILED || state == UPLOAD_COMPLETE || state == SYNC_COMPLETE) {
+    if (autoReturnAt != 0 && millis() >= autoReturnAt) {
+      returnToReader();
+      return;
+    }
+    if (mappedInput.wasReleased(MappedInputManager::Button::Back) ||
+        mappedInput.wasReleased(MappedInputManager::Button::Confirm)) {
       returnToReader();
     }
     return;

src/activities/reader/KOReaderSyncActivity.h

@@ -40,7 +40,7 @@ class KOReaderSyncActivity final : public Activity {
   void onExit() override;
   void loop() override;
   void render(RenderLock&&) override;
-  bool preventAutoSleep() override { return state == CONNECTING || state == SYNCING; }
+  bool preventAutoSleep() override { return state == CONNECTING || state == SYNCING || state == UPLOADING; }
 
  private:
   enum State {
@@ -50,6 +50,7 @@ class KOReaderSyncActivity final : public Activity {
     SHOWING_RESULT,
     UPLOADING,
     UPLOAD_COMPLETE,
+    SYNC_COMPLETE,
     NO_REMOTE_PROGRESS,
     SYNC_FAILED,
     NO_CREDENTIALS
@@ -78,6 +79,10 @@ class KOReaderSyncActivity final : public Activity {
   // Selection in result screen (0=Apply, 1=Upload)
   int selectedOption = 0;
 
+  // Timed return for successful smart-sync terminal states.
+  unsigned long autoReturnAt = 0;
+  static constexpr unsigned long AUTO_RETURN_DELAY_MS = 1200;
+
   // Tracks whether this session activated WiFi. Set in onEnter past the credentials
   // check; checked in onExit to decide whether to silent-reboot. Can't rely on
   // WiFi.getMode() because performUpload() calls esp_wifi_stop() on the way out,
@@ -87,6 +92,9 @@ class KOReaderSyncActivity final : public Activity {
   void onWifiSelectionComplete(bool success);
   void performSync();
   void performUpload();
+  bool smartSyncEnabled() const;
+  void markAutoReturn();
+  void completeAlreadySynced();
   void ensureEpubLoaded();
   void saveProgressAndReturn(int spineIndex, int page);
   void returnToReader();

src/activities/reader/ReaderActivity.h

@@ -31,6 +31,5 @@ class ReaderActivity final : public Activity {
   explicit ReaderActivity(GfxRenderer& renderer, MappedInputManager& mappedInput, std::string initialBookPath)
       : Activity("Reader", renderer, mappedInput), initialBookPath(std::move(initialBookPath)) {}
   void onEnter() override;
-  bool isReaderActivity() const override { return false; }
-  bool deferBluetoothStart() const override { return true; }
+  bool isReaderActivity() const override { return true; }
 };

src/activities/reader/ReaderUtils.h

@@ -6,10 +6,12 @@
 #include <Logging.h>
 
 #include "MappedInputManager.h"
+#include "activities/ActivityManager.h"
 
 namespace ReaderUtils {
 
 constexpr unsigned long GO_HOME_MS = 1000;
+constexpr unsigned long GO_BACK_OR_HOME_MS = GO_HOME_MS;
 constexpr unsigned long SKIP_HOLD_MS = 700;
 constexpr unsigned long BOOKMARK_HOLD_MS = 400;
 constexpr unsigned long BOOKMARK_MESSAGE_DURATION_MS = 2500;
@@ -59,21 +61,12 @@ inline PageTurnResult detectPageTurn(const MappedInputManager& input) {
   return {prev, next, tiltPrev || tiltNext};
 }
 
-// One helper, blocking or deferred: the async form starts the refresh and
-// returns so the caller can overlap CPU work with the panel's refresh time.
-// Async callers must not touch the framebuffer until
-// renderer.waitRefreshComplete() and must rebuild the differential baseline
-// before the next page turn (the tiled grayscale cleanup does).
-inline void displayWithRefreshCycle(const GfxRenderer& renderer, int& pagesUntilFullRefresh, bool async = false) {
-  const auto mode = (pagesUntilFullRefresh <= 1) ? HalDisplay::HALF_REFRESH : HalDisplay::FAST_REFRESH;
-  if (async) {
-    renderer.displayBufferAsync(mode);
-  } else {
-    renderer.displayBuffer(mode);
-  }
+inline void displayWithRefreshCycle(const GfxRenderer& renderer, int& pagesUntilFullRefresh) {
   if (pagesUntilFullRefresh <= 1) {
+    renderer.displayBuffer(HalDisplay::HALF_REFRESH);
     pagesUntilFullRefresh = SETTINGS.getRefreshFrequency();
   } else {
+    renderer.displayBuffer();
     pagesUntilFullRefresh--;
   }
 }
@@ -105,4 +98,37 @@ void renderAntiAliased(GfxRenderer& renderer, RenderFn&& renderFn) {
   renderer.restoreBwBuffer();
 }
 
+struct BackNavCallback {
+  void* ctx;
+  void (*fn)(void*);
+};
+
+// Returns true if the back button was consumed (caller should return).
+// Long press (>= GO_BACK_OR_HOME_MS):
+// - default: go to file browser
+// - with backShortToFileBrowser: go home
+// Short press (< GO_BACK_OR_HOME_MS):
+// - default: go home
+// - with backShortToFileBrowser: go to file browser.
+inline bool handleBackNavigation(const MappedInputManager& mappedInput, ActivityManager& activityManager,
+                                 const char* filePath, BackNavCallback goHome) {
+  if (mappedInput.isPressed(MappedInputManager::Button::Back) && mappedInput.getHeldTime() >= GO_BACK_OR_HOME_MS) {
+    if (SETTINGS.backShortToFileBrowser) {
+      goHome.fn(goHome.ctx);
+    } else {
+      activityManager.goToFileBrowser(filePath);
+    }
+    return true;
+  }
+  if (mappedInput.wasReleased(MappedInputManager::Button::Back) && mappedInput.getHeldTime() < GO_BACK_OR_HOME_MS) {
+    if (SETTINGS.backShortToFileBrowser) {
+      activityManager.goToFileBrowser(filePath);
+    } else {
+      goHome.fn(goHome.ctx);
+    }
+    return true;
+  }
+  return false;
+}
+
 }  // namespace ReaderUtils

src/activities/reader/TxtReaderActivity.cpp

@@ -60,16 +60,8 @@ void TxtReaderActivity::onExit() {
 }
 
 void TxtReaderActivity::loop() {
-  // Long press BACK (1s+) goes to file selection
-  if (mappedInput.isPressed(MappedInputManager::Button::Back) && mappedInput.getHeldTime() >= ReaderUtils::GO_HOME_MS) {
-    activityManager.goToFileBrowser(txt ? txt->getPath() : "");
-    return;
-  }
-
-  // Short press BACK goes directly to home
-  if (mappedInput.wasReleased(MappedInputManager::Button::Back) &&
-      mappedInput.getHeldTime() < ReaderUtils::GO_HOME_MS) {
-    onGoHome();
+  if (ReaderUtils::handleBackNavigation(mappedInput, activityManager, txt ? txt->getPath().c_str() : "",
+                                        {this, [](void* ctx) { static_cast<TxtReaderActivity*>(ctx)->onGoHome(); }})) {
     return;
   }
 

src/activities/reader/TxtReaderActivity.h

@@ -49,6 +49,5 @@ class TxtReaderActivity final : public Activity {
   void loop() override;
   void render(RenderLock&&) override;
   bool isReaderActivity() const override { return true; }
-  void requestGhostCleanup() override { pagesUntilFullRefresh = 1; }
   ScreenshotInfo getScreenshotInfo() const override;
 };

src/activities/reader/XtcReaderActivity.cpp

@@ -101,16 +101,8 @@ void XtcReaderActivity::loop() {
     openChapterSelection();
   }
 
-  // Long press BACK (1s+) goes to file selection
-  if (mappedInput.isPressed(MappedInputManager::Button::Back) && mappedInput.getHeldTime() >= ReaderUtils::GO_HOME_MS) {
-    activityManager.goToFileBrowser(xtc ? xtc->getPath() : "");
-    return;
-  }
-
-  // Short press BACK goes directly to home
-  if (mappedInput.wasReleased(MappedInputManager::Button::Back) &&
-      mappedInput.getHeldTime() < ReaderUtils::GO_HOME_MS) {
-    onGoHome();
+  if (ReaderUtils::handleBackNavigation(mappedInput, activityManager, xtc ? xtc->getPath().c_str() : "",
+                                        {this, [](void* ctx) { static_cast<XtcReaderActivity*>(ctx)->onGoHome(); }})) {
     return;
   }
 

src/activities/reader/XtcReaderActivity.h

@@ -46,6 +46,5 @@ class XtcReaderActivity final : public Activity {
   void loop() override;
   void render(RenderLock&&) override;
   bool isReaderActivity() const override { return true; }
-  void requestGhostCleanup() override { pagesUntilFullRefresh = 1; }
   ScreenshotInfo getScreenshotInfo() const override;
 };

src/activities/settings/BleButtonMapActivity.cpp

@@ -1,167 +0,0 @@
-#include "BleButtonMapActivity.h"
-
-#include <GfxRenderer.h>
-
-#include <algorithm>
-#include <cstdio>
-#include <iterator>
-
-#include "BleInput.h"
-#include "CrossPointSettings.h"
-#include "components/UITheme.h"
-#include "fontIds.h"
-
-// Logical functions offered for binding. Page navigation + confirm cover Free2 /
-// Free3; the directions are included so a remote can also drive menu navigation.
-const BleButtonMapActivity::Fn BleButtonMapActivity::kFunctions[] = {
-    {MappedInputManager::Button::PageForward, StrId::STR_BT_PAGE_FORWARD},
-    {MappedInputManager::Button::PageBack, StrId::STR_BT_PAGE_BACK},
-    {MappedInputManager::Button::Confirm, StrId::STR_CONFIRM},
-    {MappedInputManager::Button::Back, StrId::STR_BACK},
-    {MappedInputManager::Button::Up, StrId::STR_DIR_UP},
-    {MappedInputManager::Button::Down, StrId::STR_DIR_DOWN},
-    {MappedInputManager::Button::Left, StrId::STR_DIR_LEFT},
-    {MappedInputManager::Button::Right, StrId::STR_DIR_RIGHT},
-};
-const uint8_t BleButtonMapActivity::kFunctionCount = static_cast<uint8_t>(sizeof(kFunctions) / sizeof(kFunctions[0]));
-
-void BleButtonMapActivity::onEnter() {
-  Activity::onEnter();
-  step = Step::WaitForKey;
-  capturedKind = 0xFF;
-  functionIndex = 0;
-  // Start every mapping session from a clean slate: the user re-maps each remote
-  // button once, so a button can't be left bound to a stale action and there's no
-  // separate "clear mappings" step to remember.
-  std::fill(std::begin(SETTINGS.bleKeyMap), std::end(SETTINGS.bleKeyMap), CrossPointSettings::BleKeyMapEntry{});
-  SETTINGS.saveToFile();
-  mappedInput.setBleCaptureMode(true);
-  requestUpdate();
-}
-
-void BleButtonMapActivity::onExit() {
-  mappedInput.setBleCaptureMode(false);
-  Activity::onExit();
-}
-
-bool BleButtonMapActivity::assignCapturedKey(MappedInputManager::Button button) {
-  const uint8_t btn = static_cast<uint8_t>(button);
-  // Mutated via std::replace_if below and through `slot`; cppcheck's CI parse
-  // (no include paths) can't see the writes and suggests const.
-  // cppcheck-suppress constVariableReference
-  auto& map = SETTINGS.bleKeyMap;
-  using Entry = CrossPointSettings::BleKeyMapEntry;
-  const uint8_t kind = capturedKind;
-  const uint8_t value = capturedValue;
-
-  // One key per action: drop any other key currently bound to this action so the same
-  // action can't be triggered by two different remote buttons.
-  std::replace_if(
-      std::begin(map), std::end(map),
-      [&](const Entry& e) { return e.button == btn && !(e.keyKind == kind && e.keyValue == value); }, Entry{});
-
-  // Reuse the slot already bound to this key, else the first free slot.
-  auto* slot = std::find_if(std::begin(map), std::end(map), [&](const Entry& e) {
-    return e.button != 0xFF && e.keyKind == kind && e.keyValue == value;
-  });
-  if (slot == std::end(map)) {
-    slot = std::find_if(std::begin(map), std::end(map),
-                        [](const Entry& e) { return e.button == 0xFF || e.keyKind == 0xFF; });
-  }
-  if (slot == std::end(map)) return false;  // table full
-
-  slot->keyKind = kind;
-  slot->keyValue = value;
-  slot->button = btn;
-  SETTINGS.saveToFile();
-  return true;
-}
-
-void BleButtonMapActivity::loop() {
-  // Front Back button exits the mapping screen at any step.
-  if (mappedInput.wasPressed(MappedInputManager::Button::Back)) {
-    finish();
-    return;
-  }
-
-  if (step == Step::WaitForKey) {
-    uint8_t kind = 0xFF;
-    uint8_t value = 0;
-    if (mappedInput.takeCapturedBleKey(kind, value)) {
-      capturedKind = kind;
-      capturedValue = value;
-      functionIndex = 0;
-      step = Step::SelectFunction;
-      requestUpdate();
-    }
-    return;
-  }
-
-  // Step::SelectFunction — pick a logical function for the captured key.
-  buttonNavigator.onNext([this] {
-    functionIndex = ButtonNavigator::nextIndex(functionIndex, kFunctionCount);
-    requestUpdate();
-  });
-  buttonNavigator.onPrevious([this] {
-    functionIndex = ButtonNavigator::previousIndex(functionIndex, kFunctionCount);
-    requestUpdate();
-  });
-
-  if (mappedInput.wasPressed(MappedInputManager::Button::Confirm)) {
-    assignCapturedKey(kFunctions[functionIndex].button);
-    // Back to capturing so the user can map (or re-map) the next remote button.
-    step = Step::WaitForKey;
-    capturedKind = 0xFF;
-    requestUpdate();
-  }
-}
-
-void BleButtonMapActivity::render(RenderLock&&) {
-  renderer.clearScreen();
-
-  const auto& metrics = UITheme::getInstance().getMetrics();
-  const auto pageWidth = renderer.getScreenWidth();
-  const auto pageHeight = renderer.getScreenHeight();
-
-  GUI.drawHeader(renderer, Rect{0, metrics.topPadding, pageWidth, metrics.headerHeight}, tr(STR_BT_MAP_BUTTONS));
-
-  const int topOffset = metrics.topPadding + metrics.headerHeight + metrics.tabBarHeight + metrics.verticalSpacing;
-  const int contentHeight = pageHeight - topOffset - metrics.buttonHintsHeight - metrics.verticalSpacing;
-
-  if (step == Step::WaitForKey) {
-    GUI.drawSubHeader(renderer, Rect{0, metrics.topPadding + metrics.headerHeight, pageWidth, metrics.tabBarHeight},
-                      tr(STR_BT_PRESS_REMOTE));
-    // Show the current mappings so the user sees progress.
-    int row = 0;
-    for (const auto& e : SETTINGS.bleKeyMap) {
-      if (e.button == 0xFF) continue;
-      char keyName[24];
-      bleinput::describeKey(e.keyKind, e.keyValue, keyName, sizeof(keyName));
-      const char* fnName = "";
-      for (uint8_t i = 0; i < kFunctionCount; i++) {
-        if (static_cast<uint8_t>(kFunctions[i].button) == e.button) {
-          fnName = I18N.get(kFunctions[i].label);
-          break;
-        }
-      }
-      char line[64];
-      snprintf(line, sizeof(line), "%s  ->  %s", keyName, fnName);
-      GUI.drawHelpText(renderer, Rect{0, topOffset + row * 22, pageWidth, 20}, line);
-      row++;
-    }
-  } else {
-    char captured[24];
-    bleinput::describeKey(capturedKind, capturedValue, captured, sizeof(captured));
-    GUI.drawSubHeader(renderer, Rect{0, metrics.topPadding + metrics.headerHeight, pageWidth, metrics.tabBarHeight},
-                      captured);
-    GUI.drawList(
-        renderer, Rect{0, topOffset, pageWidth, contentHeight}, kFunctionCount, functionIndex,
-        [this](int i) { return std::string(I18N.get(kFunctions[i].label)); }, nullptr, nullptr, nullptr, false);
-  }
-
-  const char* confirm = step == Step::WaitForKey ? "" : tr(STR_SELECT);
-  const auto labels = mappedInput.mapLabels(tr(STR_BACK), confirm, tr(STR_DIR_UP), tr(STR_DIR_DOWN));
-  GUI.drawButtonHints(renderer, labels.btn1, labels.btn2, labels.btn3, labels.btn4);
-
-  renderer.displayBuffer();
-}

src/activities/settings/BleButtonMapActivity.h

@@ -1,47 +0,0 @@
-#pragma once
-
-#include <I18n.h>
-
-#include <cstdint>
-
-#include "MappedInputManager.h"
-#include "activities/Activity.h"
-#include "util/ButtonNavigator.h"
-
-// Capture-then-assign mapping for BLE page-turner buttons. The user presses a
-// button on the remote; we capture its decoded key identity (via the
-// MappedInputManager BLE capture mode) and let them bind it to a logical button.
-// Repeat to map each remote button; Back exits. Mirrors ButtonRemapActivity's
-// flow, but the input source is the BLE host instead of the front buttons.
-class BleButtonMapActivity final : public Activity {
- public:
-  explicit BleButtonMapActivity(GfxRenderer& renderer, MappedInputManager& mappedInput)
-      : Activity("BleButtonMap", renderer, mappedInput) {}
-
-  void onEnter() override;
-  void onExit() override;
-  void loop() override;
-  void render(RenderLock&&) override;
-
- private:
-  // Logical functions a remote button can be bound to.
-  struct Fn {
-    MappedInputManager::Button button;
-    StrId label;
-  };
-  static const Fn kFunctions[];
-  static const uint8_t kFunctionCount;
-
-  enum class Step { WaitForKey, SelectFunction };
-  Step step = Step::WaitForKey;
-
-  uint8_t capturedKind = 0xFF;
-  uint8_t capturedValue = 0;
-  int functionIndex = 0;
-
-  ButtonNavigator buttonNavigator;
-
-  // Bind the captured key to the chosen logical button in SETTINGS.bleKeyMap and
-  // persist. Returns false when the table is full and the key is new.
-  bool assignCapturedKey(MappedInputManager::Button button);
-};

src/activities/settings/BluetoothSettingsActivity.cpp

@@ -1,314 +0,0 @@
-#include "BluetoothSettingsActivity.h"
-
-#include <BleKeyboardHost.h>
-#include <GfxRenderer.h>
-#include <Logging.h>
-
-#include <cstdio>
-
-#include "BleButtonMapActivity.h"
-#include "BleInput.h"
-#include "CrossPointSettings.h"
-#include "MappedInputManager.h"
-#include "components/UITheme.h"
-#include "fontIds.h"
-
-namespace {
-constexpr unsigned long kBannerMs = 2000;
-constexpr uint32_t kScanMs = 8000;
-constexpr unsigned long kForgetHoldMs = 1200;  // hold Confirm this long in the Paired view to forget
-}  // namespace
-
-void BluetoothSettingsActivity::onEnter() {
-  Activity::onEnter();
-  view = View::Menu;
-  menuIndex = 0;
-  rebuildMenuRows();
-  requestUpdate();
-}
-
-void BluetoothSettingsActivity::onExit() {
-  if (BleHid.isScanning()) BleHid.stopScan();
-  Activity::onExit();
-}
-
-void BluetoothSettingsActivity::setBanner(const char* text) {
-  banner = text ? text : "";
-  bannerUntil = millis() + kBannerMs;
-}
-
-void BluetoothSettingsActivity::rebuildMenuRows() {
-  menuRows.clear();
-  menuRows.reserve(8);
-  menuRows.push_back({Action::ToggleBt, StrId::STR_BLUETOOTH});
-  if (SETTINGS.bluetoothEnabled) {
-    menuRows.push_back({Action::Scan, StrId::STR_BT_SCAN_PAIR});
-    if (BleHid.isConnected()) menuRows.push_back({Action::Disconnect, StrId::STR_BT_DISCONNECT});
-    menuRows.push_back({Action::PairedDevices, StrId::STR_BT_PAIRED_DEVICES});
-    menuRows.push_back({Action::MapButtons, StrId::STR_BT_MAP_BUTTONS});
-  }
-  if (menuIndex >= static_cast<int>(menuRows.size())) menuIndex = 0;
-}
-
-void BluetoothSettingsActivity::startScanView() {
-  LOG_INF("BLEUI", "scan view: begin running=%d scanning=%d devices=%u paired=%u", BleHid.isRunning(),
-          BleHid.isScanning(), BleHid.deviceCount(), BleHid.pairedCount());
-  view = View::Scan;
-  scanIndex = 0;
-  awaitingConnect = false;
-  lastLoggedScanState = false;
-  lastLoggedDeviceCount = 0xFF;
-  // The main-loop lifecycle owns steady-state start/stop, but a scan needs the stack
-  // this instant — entering this screen can precede the lifecycle's next tick, or its
-  // heap gate may have deferred the start. ensureStarted() is idempotent, and with
-  // this screen on top the lifecycle keeps the stack up (keepsBluetoothAlive).
-  if (!BleHid.isRunning() && !bleinput::ensureStarted()) {
-    LOG_ERR("BLEUI", "scan: BLE start failed (heap=%u)", ESP.getFreeHeap());
-  }
-  BleHid.startScan(kScanMs);
-  LOG_INF("BLEUI", "scan view: startScan requested scanning=%d devices=%u", BleHid.isScanning(), BleHid.deviceCount());
-  requestUpdate();
-}
-
-void BluetoothSettingsActivity::handleMenuConfirm() {
-  if (menuRows.empty()) return;
-  const Action action = menuRows[menuIndex].action;
-  switch (action) {
-    case Action::ToggleBt:
-      // Flip the preference only; the main-loop lifecycle check starts/stops the BLE
-      // stack to match (and shows the "BT Connecting..." popup). Single owner.
-      SETTINGS.bluetoothEnabled = SETTINGS.bluetoothEnabled ? 0 : 1;
-      SETTINGS.saveToFile();
-      rebuildMenuRows();
-      requestUpdate();
-      break;
-    case Action::Scan:
-      startScanView();
-      break;
-    case Action::Disconnect:
-      BleHid.disconnect();
-      setBanner(tr(STR_BT_NOT_CONNECTED));
-      rebuildMenuRows();
-      requestUpdate();
-      break;
-    case Action::PairedDevices:
-      view = View::Paired;
-      pairedIndex = 0;
-      requestUpdate();
-      break;
-    case Action::MapButtons:
-      startActivityForResult(std::make_unique<BleButtonMapActivity>(renderer, mappedInput),
-                             [this](const ActivityResult&) {
-                               rebuildMenuRows();
-                               requestUpdate();
-                             });
-      break;
-  }
-}
-
-void BluetoothSettingsActivity::loop() {
-  // Clear an expired status banner.
-  if (bannerUntil > 0 && millis() > bannerUntil) {
-    banner.clear();
-    bannerUntil = 0;
-    requestUpdate();
-  }
-
-  // Watch for an async connect result (from either the scan list or the paired list).
-  if (awaitingConnect) {
-    char reason[48];
-    if (BleHid.isConnected()) {
-      awaitingConnect = false;
-      BleHid.releaseScanResults();
-      view = View::Menu;
-      rebuildMenuRows();
-      char buf[64];
-      snprintf(buf, sizeof(buf), tr(STR_BT_CONNECTED_TO), BleHid.connectedName());
-      setBanner(buf);
-      requestUpdate();
-    } else if (BleHid.takeConnectFailure(reason, sizeof(reason))) {
-      awaitingConnect = false;
-      setBanner(reason);
-      requestUpdate();
-    }
-  }
-
-  // Back returns to the menu from a sub-view, or leaves the screen from the menu.
-  if (mappedInput.wasPressed(MappedInputManager::Button::Back)) {
-    if (view == View::Menu) {
-      finish();
-    } else {
-      if (BleHid.isScanning()) BleHid.stopScan();
-      view = View::Menu;
-      rebuildMenuRows();
-      requestUpdate();
-    }
-    return;
-  }
-
-  // Navigation within the active list.
-  const int count = view == View::Menu   ? static_cast<int>(menuRows.size())
-                    : view == View::Scan ? BleHid.deviceCount()
-                                         : BleHid.pairedCount();
-  int* idx = view == View::Menu ? &menuIndex : view == View::Scan ? &scanIndex : &pairedIndex;
-  buttonNavigator.onNext([this, count, idx] {
-    if (count > 0) *idx = ButtonNavigator::nextIndex(*idx, count);
-    requestUpdate();
-  });
-  buttonNavigator.onPrevious([this, count, idx] {
-    if (count > 0) *idx = ButtonNavigator::previousIndex(*idx, count);
-    requestUpdate();
-  });
-
-  // Paired view: tap Confirm to connect, hold Confirm to forget. Uses release for
-  // connect so a hold can fire forget without also connecting on the same press.
-  if (view == View::Paired) {
-    if (mappedInput.isPressed(MappedInputManager::Button::Confirm)) {
-      if (!pairedActionTaken && mappedInput.getHeldTime() >= kForgetHoldMs && pairedIndex < BleHid.pairedCount()) {
-        const auto& p = BleHid.paired(static_cast<uint8_t>(pairedIndex));
-        BleHid.forget(p.addr);
-        if (pairedIndex > 0) pairedIndex--;
-        setBanner(tr(STR_FORGET_BUTTON));
-        pairedActionTaken = true;
-        rebuildMenuRows();
-        requestUpdate();
-      }
-    } else if (mappedInput.wasReleased(MappedInputManager::Button::Confirm)) {
-      if (!pairedActionTaken && !awaitingConnect && pairedIndex < BleHid.pairedCount()) {
-        const auto& p = BleHid.paired(static_cast<uint8_t>(pairedIndex));
-        awaitingConnect = true;
-        setBanner(tr(STR_CONNECTING));
-        BleHid.connect(p.addr);
-        requestUpdate();
-      }
-      pairedActionTaken = false;
-    }
-    return;
-  }
-
-  if (mappedInput.wasPressed(MappedInputManager::Button::Confirm)) {
-    if (view == View::Menu) {
-      handleMenuConfirm();
-    } else if (view == View::Scan) {
-      const int scanCount = BleHid.deviceCount();
-      if (!awaitingConnect && scanCount == 0 && !BleHid.isScanning()) {
-        LOG_INF("BLEUI", "scan view: restart scan requested");
-        if (!BleHid.isRunning() && !bleinput::ensureStarted()) {
-          LOG_ERR("BLEUI", "scan restart: BLE start failed (heap=%u)", ESP.getFreeHeap());
-        }
-        BleHid.startScan(kScanMs);
-        LOG_INF("BLEUI", "scan view: restart scan state scanning=%d devices=%u", BleHid.isScanning(),
-                BleHid.deviceCount());
-        requestUpdate();
-      } else if (!awaitingConnect && scanIndex < scanCount) {
-        if (BleHid.isScanning()) BleHid.stopScan();
-        const auto& d = BleHid.device(static_cast<uint8_t>(scanIndex));
-        LOG_INF("BLEUI", "scan view: connect addr=%s name='%s' rssi=%d type=%u hid=%d conn=%d", d.addr, d.name, d.rssi,
-                d.addrType, d.hid, d.connectable);
-        awaitingConnect = true;
-        setBanner(tr(STR_CONNECTING));
-        BleHid.connect(d.addr);
-        requestUpdate();
-      }
-    }
-    return;
-  }
-
-  // The scan list changes as devices are discovered — keep repainting while active.
-  if (view == View::Scan) {
-    const bool scanning = BleHid.isScanning();
-    const uint8_t deviceCount = BleHid.deviceCount();
-    if (scanning != lastLoggedScanState || deviceCount != lastLoggedDeviceCount) {
-      LOG_INF("BLEUI", "scan view: state scanning=%d devices=%u", scanning, deviceCount);
-      lastLoggedScanState = scanning;
-      lastLoggedDeviceCount = deviceCount;
-    }
-    if (scanning) requestUpdate();
-  }
-}
-
-std::string BluetoothSettingsActivity::deviceLabel(int index) const {
-  if (index >= BleHid.deviceCount()) return "";
-  const auto& d = BleHid.device(static_cast<uint8_t>(index));
-  return std::string(d.name);
-}
-
-std::string BluetoothSettingsActivity::pairedLabel(int index) const {
-  if (index >= BleHid.pairedCount()) return "";
-  const auto& p = BleHid.paired(static_cast<uint8_t>(index));
-  return std::string(p.name);
-}
-
-void BluetoothSettingsActivity::render(RenderLock&&) {
-  renderer.clearScreen();
-
-  const auto& metrics = UITheme::getInstance().getMetrics();
-  const auto pageWidth = renderer.getScreenWidth();
-  const auto pageHeight = renderer.getScreenHeight();
-
-  const char* title = tr(STR_BLUETOOTH);
-  GUI.drawHeader(renderer, Rect{0, metrics.topPadding, pageWidth, metrics.headerHeight}, title);
-
-  // Sub-header: connection status.
-  const char* status = BleHid.isConnected() ? BleHid.connectedName() : tr(STR_BT_NOT_CONNECTED);
-  GUI.drawSubHeader(renderer, Rect{0, metrics.topPadding + metrics.headerHeight, pageWidth, metrics.tabBarHeight},
-                    status);
-
-  const int topOffset = metrics.topPadding + metrics.headerHeight + metrics.tabBarHeight + metrics.verticalSpacing;
-  const int contentHeight = pageHeight - topOffset - metrics.buttonHintsHeight - metrics.verticalSpacing;
-  const Rect listRect{0, topOffset, pageWidth, contentHeight};
-
-  if (view == View::Menu) {
-    GUI.drawList(
-        renderer, listRect, static_cast<int>(menuRows.size()), menuIndex,
-        [this](int i) { return std::string(I18N.get(menuRows[i].label)); }, nullptr, nullptr,
-        [this](int i) -> std::string {
-          if (menuRows[i].action == Action::ToggleBt)
-            return SETTINGS.bluetoothEnabled ? tr(STR_STATE_ON) : tr(STR_STATE_OFF);
-          return "";
-        },
-        true);
-  } else if (view == View::Scan) {
-    // Free2/3 remotes only advertise in the right slider mode — tell the user how.
-    GUI.drawHelpText(renderer, Rect{0, topOffset, pageWidth, 16}, tr(STR_BT_FREE_HINT1));
-    GUI.drawHelpText(renderer, Rect{0, topOffset + 16, pageWidth, 16}, tr(STR_BT_FREE_HINT2));
-    const int scanTop = topOffset + 38;
-    const int count = BleHid.deviceCount();
-    if (count == 0) {
-      GUI.drawHelpText(renderer, Rect{0, scanTop, pageWidth, 24},
-                       BleHid.isScanning() ? tr(STR_SCANNING) : tr(STR_BT_NO_DEVICES));
-    } else {
-      GUI.drawList(
-          renderer, Rect{0, scanTop, pageWidth, contentHeight - 38}, count, scanIndex,
-          [this](int i) { return deviceLabel(i); }, nullptr, nullptr, nullptr, false);
-    }
-  } else {  // Paired
-    const int count = BleHid.pairedCount();
-    if (count == 0) {
-      GUI.drawHelpText(renderer, Rect{0, topOffset + metrics.verticalSpacing, pageWidth, 24}, tr(STR_BT_NO_PAIRED));
-    } else {
-      GUI.drawList(
-          renderer, listRect, count, pairedIndex, [this](int i) { return pairedLabel(i); }, nullptr, nullptr, nullptr,
-          false);
-    }
-  }
-
-  // Transient banner above the hints.
-  if (!banner.empty()) {
-    GUI.drawHelpText(renderer, Rect{0, pageHeight - metrics.buttonHintsHeight - 22, pageWidth, 20}, banner.c_str());
-  }
-
-  // In the paired list, Confirm connects and a hold forgets — surface the hold hint.
-  if (view == View::Paired && BleHid.pairedCount() > 0 && banner.empty()) {
-    GUI.drawHelpText(renderer, Rect{0, pageHeight - metrics.buttonHintsHeight - 22, pageWidth, 20},
-                     tr(STR_BT_FORGET_PROMPT));
-  }
-
-  // Button hints differ by view (Menu selects; Scan and Paired both connect).
-  const bool scanCanRestart = view == View::Scan && BleHid.deviceCount() == 0 && !BleHid.isScanning();
-  const char* confirm = view == View::Menu ? tr(STR_SELECT) : scanCanRestart ? "Scan" : tr(STR_CONNECT);
-  const auto labels = mappedInput.mapLabels(tr(STR_BACK), confirm, tr(STR_DIR_UP), tr(STR_DIR_DOWN));
-  GUI.drawButtonHints(renderer, labels.btn1, labels.btn2, labels.btn3, labels.btn4);
-
-  renderer.displayBuffer();
-}

src/activities/settings/BluetoothSettingsActivity.h

@@ -1,65 +0,0 @@
-#pragma once
-
-#include <I18n.h>
-
-#include <string>
-#include <vector>
-
-#include "activities/Activity.h"
-#include "util/ButtonNavigator.h"
-
-// Bluetooth page-turner settings. One screen with three views:
-//   Menu   — enable/disable BT, scan & pair, disconnect, map buttons, presets.
-//   Scan   — live list of discovered BLE HID devices; Confirm connects.
-//   Paired — bonded devices; Confirm forgets the selected one.
-// All BLE access goes through the FreeInk BleHid singleton; everything no-ops
-// gracefully when BLE is compiled out (BleHid.begin() returns false).
-class BluetoothSettingsActivity final : public Activity {
- public:
-  explicit BluetoothSettingsActivity(GfxRenderer& renderer, MappedInputManager& mappedInput)
-      : Activity("BluetoothSettings", renderer, mappedInput) {}
-
-  void onEnter() override;
-  void onExit() override;
-  void loop() override;
-  void render(RenderLock&&) override;
-  bool keepsBluetoothAlive() const override { return true; }
-
- private:
-  enum class View { Menu, Scan, Paired };
-
-  // Menu row actions.
-  enum class Action { ToggleBt, Scan, Disconnect, MapButtons, PairedDevices };
-  struct MenuRow {
-    Action action;
-    StrId label;
-  };
-
-  View view = View::Menu;
-  std::vector<MenuRow> menuRows;
-  int menuIndex = 0;
-  int scanIndex = 0;
-  int pairedIndex = 0;
-
-  ButtonNavigator buttonNavigator;
-
-  // Transient status banner (connect result, forget confirmation, etc.).
-  std::string banner;
-  unsigned long bannerUntil = 0;
-
-  // Set when a connect() has been issued and we're waiting for the async result.
-  bool awaitingConnect = false;
-  // Guards the Paired view's hold-to-forget so it fires once per hold and suppresses
-  // the tap-to-connect on the same press.
-  bool pairedActionTaken = false;
-  bool lastLoggedScanState = false;
-  uint8_t lastLoggedDeviceCount = 0xFF;
-
-  void rebuildMenuRows();
-  void handleMenuConfirm();
-  void startScanView();
-  void setBanner(const char* text);
-
-  std::string deviceLabel(int index) const;  // scan list row text
-  std::string pairedLabel(int index) const;  // paired list row text
-};

src/activities/settings/FontDownloadActivity.cpp

@@ -17,8 +17,6 @@
 #include "fontIds.h"
 #include "network/HttpDownloader.h"
 
-#include "BleInput.h"
-
 FontDownloadActivity::FontDownloadActivity(GfxRenderer& renderer, MappedInputManager& mappedInput)
     : Activity("FontDownload", renderer, mappedInput), fontInstaller_(sdFontSystem.registry()) {}
 
@@ -26,12 +24,6 @@ FontDownloadActivity::FontDownloadActivity(GfxRenderer& renderer, MappedInputMan
 
 void FontDownloadActivity::onEnter() {
   Activity::onEnter();
-  // Free the BLE stack BEFORE bringing WiFi up (matches WifiSelectionActivity):
-  // the C3 shares one radio and heap between the stacks, and the WiFi driver
-  // sizes its RX/TX buffer pools at init — initializing it with NimBLE's ~50 KB
-  // still resident leaves WiFi permanently starved even after the lifecycle
-  // stops BLE a loop later. No-op when BLE is already off.
-  bleinput::stop();
   WiFi.mode(WIFI_STA);
   startActivityForResult(std::make_unique<WifiSelectionActivity>(renderer, mappedInput),
                          [this](const ActivityResult& result) { onWifiSelectionComplete(!result.isCancelled); });

src/activities/settings/KOReaderAuthActivity.cpp

@@ -26,7 +26,7 @@ void KOReaderAuthActivity::onWifiSelectionComplete(const bool success) {
   {
     RenderLock lock(*this);
     state = AUTHENTICATING;
-    statusMessage = tr(STR_AUTHENTICATING);
+    statusMessage = mode == Mode::SIGN_UP ? tr(STR_CREATING_ACCOUNT) : tr(STR_AUTHENTICATING);
   }
   requestUpdate();
 
@@ -34,16 +34,17 @@ void KOReaderAuthActivity::onWifiSelectionComplete(const bool success) {
 }
 
 void KOReaderAuthActivity::performAuthentication() {
-  const auto result = KOReaderSyncClient::authenticate();
+  const auto result = mode == Mode::SIGN_UP ? KOReaderSyncClient::createUser() : KOReaderSyncClient::authenticate();
 
   {
     RenderLock lock(*this);
     if (result == KOReaderSyncClient::OK) {
       state = SUCCESS;
-      statusMessage = tr(STR_AUTH_SUCCESS);
+      statusMessage = mode == Mode::SIGN_UP ? tr(STR_ACCOUNT_CREATED) : tr(STR_AUTH_SUCCESS);
     } else {
       state = FAILED;
-      errorMessage = KOReaderSyncClient::errorString(result);
+      errorMessage =
+          result == KOReaderSyncClient::USER_EXISTS ? tr(STR_USERNAME_TAKEN) : KOReaderSyncClient::errorString(result);
     }
   }
   requestUpdate();
@@ -80,17 +81,21 @@ void KOReaderAuthActivity::render(RenderLock&&) {
   const auto pageWidth = renderer.getScreenWidth();
   const auto pageHeight = renderer.getScreenHeight();
 
-  GUI.drawHeader(renderer, Rect{0, metrics.topPadding, pageWidth, metrics.headerHeight}, tr(STR_KOREADER_AUTH));
+  GUI.drawHeader(renderer, Rect{0, metrics.topPadding, pageWidth, metrics.headerHeight},
+                 mode == Mode::SIGN_UP ? tr(STR_SIGN_UP) : tr(STR_KOREADER_AUTH));
   const auto height = renderer.getLineHeight(UI_10_FONT_ID);
   const auto top = (pageHeight - height) / 2;
 
   if (state == AUTHENTICATING) {
     renderer.drawCenteredText(UI_10_FONT_ID, top, statusMessage.c_str());
   } else if (state == SUCCESS) {
-    renderer.drawCenteredText(UI_10_FONT_ID, top, tr(STR_AUTH_SUCCESS), true, EpdFontFamily::BOLD);
+    renderer.drawCenteredText(UI_10_FONT_ID, top,
+                              mode == Mode::SIGN_UP ? tr(STR_ACCOUNT_CREATED) : tr(STR_AUTH_SUCCESS), true,
+                              EpdFontFamily::BOLD);
     renderer.drawCenteredText(UI_10_FONT_ID, top + height + 10, tr(STR_SYNC_READY));
   } else if (state == FAILED) {
-    renderer.drawCenteredText(UI_10_FONT_ID, top, tr(STR_AUTH_FAILED), true, EpdFontFamily::BOLD);
+    renderer.drawCenteredText(UI_10_FONT_ID, top, mode == Mode::SIGN_UP ? tr(STR_SIGNUP_FAILED) : tr(STR_AUTH_FAILED),
+                              true, EpdFontFamily::BOLD);
     renderer.drawCenteredText(UI_10_FONT_ID, top + height + 10, errorMessage.c_str());
   }
 

src/activities/settings/KOReaderAuthActivity.h

@@ -5,13 +5,16 @@
 #include "activities/Activity.h"
 
 /**
- * Activity for testing KOReader credentials.
- * Connects to WiFi and authenticates with the KOReader sync server.
+ * Activity for testing KOReader credentials, or — in sign-up mode — creating a
+ * new account on the sync server with the entered username/password.
+ * Connects to WiFi, then authenticates or registers.
  */
 class KOReaderAuthActivity final : public Activity {
  public:
-  explicit KOReaderAuthActivity(GfxRenderer& renderer, MappedInputManager& mappedInput)
-      : Activity("KOReaderAuth", renderer, mappedInput) {}
+  enum class Mode { AUTHENTICATE, SIGN_UP };
+
+  explicit KOReaderAuthActivity(GfxRenderer& renderer, MappedInputManager& mappedInput, Mode mode = Mode::AUTHENTICATE)
+      : Activity("KOReaderAuth", renderer, mappedInput), mode(mode) {}
 
   void onEnter() override;
   void onExit() override;
@@ -22,6 +25,7 @@ class KOReaderAuthActivity final : public Activity {
  private:
   enum State { WIFI_SELECTION, CONNECTING, AUTHENTICATING, SUCCESS, FAILED };
 
+  Mode mode = Mode::AUTHENTICATE;
   State state = WIFI_SELECTION;
   std::string statusMessage;
   std::string errorMessage;

src/activities/settings/KOReaderSettingsActivity.cpp

@@ -13,9 +13,10 @@
 #include "fontIds.h"
 
 namespace {
-constexpr int MENU_ITEMS = 6;
+constexpr int MENU_ITEMS = 8;
 const StrId menuNames[MENU_ITEMS] = {StrId::STR_USERNAME,          StrId::STR_PASSWORD,      StrId::STR_SYNC_SERVER_URL,
-                                     StrId::STR_DOCUMENT_MATCHING, StrId::STR_SEND_METADATA, StrId::STR_AUTHENTICATE};
+                                     StrId::STR_DOCUMENT_MATCHING, StrId::STR_SEND_METADATA, StrId::STR_SYNC_BEHAVIOR,
+                                     StrId::STR_SIGN_UP,           StrId::STR_AUTHENTICATE};
 }  // namespace
 
 void KOReaderSettingsActivity::onEnter() {
@@ -103,6 +104,22 @@ void KOReaderSettingsActivity::handleSelection() {
     KOREADER_STORE.saveToFile();
     requestUpdate();
   } else if (selectedIndex == 5) {
+    // Sync behavior - toggle between Ask and Smart
+    const auto current = KOREADER_STORE.getSyncBehavior();
+    const auto newBehavior = (current == KOReaderSyncBehavior::ASK_EVERY_TIME) ? KOReaderSyncBehavior::SMART
+                                                                               : KOReaderSyncBehavior::ASK_EVERY_TIME;
+    KOREADER_STORE.setSyncBehavior(newBehavior);
+    KOREADER_STORE.saveToFile();
+    requestUpdate();
+  } else if (selectedIndex == 6) {
+    // Sign Up - create a new account on the sync server with the entered credentials
+    if (!KOREADER_STORE.hasCredentials()) {
+      return;
+    }
+    startActivityForResult(
+        std::make_unique<KOReaderAuthActivity>(renderer, mappedInput, KOReaderAuthActivity::Mode::SIGN_UP),
+        [](const ActivityResult&) {});
+  } else if (selectedIndex == 7) {
     // Authenticate
     if (!KOREADER_STORE.hasCredentials()) {
       // Can't authenticate without credentials - just show message briefly
@@ -136,13 +153,25 @@ void KOReaderSettingsActivity::render(RenderLock&&) {
           return KOREADER_STORE.getPassword().empty() ? std::string(tr(STR_NOT_SET)) : std::string("******");
         } else if (index == 2) {
           auto serverUrl = KOREADER_STORE.getServerUrl();
-          return serverUrl.empty() ? std::string(tr(STR_DEFAULT_VALUE)) : serverUrl;
+          if (!serverUrl.empty()) {
+            return serverUrl;
+          }
+          // Show which server the default actually is, scheme stripped for space
+          std::string defaultUrl = KOREADER_STORE.getBaseUrl();
+          const auto schemeEnd = defaultUrl.find("://");
+          if (schemeEnd != std::string::npos) {
+            defaultUrl.erase(0, schemeEnd + 3);
+          }
+          return std::string(tr(STR_DEFAULT_VALUE)) + ": " + defaultUrl;
         } else if (index == 3) {
           return KOREADER_STORE.getMatchMethod() == DocumentMatchMethod::FILENAME ? std::string(tr(STR_FILENAME))
                                                                                   : std::string(tr(STR_BINARY));
         } else if (index == 4) {
           return KOREADER_STORE.getSendMetadata() ? std::string(tr(STR_STATE_ON)) : std::string(tr(STR_STATE_OFF));
         } else if (index == 5) {
+          return KOREADER_STORE.getSyncBehavior() == KOReaderSyncBehavior::SMART ? std::string(tr(STR_SMART_SYNC))
+                                                                                 : std::string(tr(STR_ASK_EVERY_TIME));
+        } else if (index == 6 || index == 7) {
           return KOREADER_STORE.hasCredentials() ? "" : std::string("[") + tr(STR_SET_CREDENTIALS_FIRST) + "]";
         }
         return std::string(tr(STR_NOT_SET));